gentoo auto-resync : 30:08:2022 - 22:49:20

author: V3n3RiX <venerix@koprulu.sector> 2022-08-30 22:49:20 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2022-08-30 22:49:20 +0100
commit: 6cef603bfc4353c863a1a0b460a0aa882d2dc51c (patch)
tree: 1df444f2d99f097ae87a3481221283e70dec2163 /dev-python
parent: b33c907ab2c29be7bd04369bc2e3f5dd0b109697 (diff)
115 files changed, 302 insertions, 2856 deletions
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 0ee92d7961f4..0103606bdfc3 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/aiodns/Manifest b/dev-python/aiodns/Manifest
index 173709b11403..485f9afccdc0 100644
--- a/dev-python/aiodns/Manifest
+++ b/dev-python/aiodns/Manifest
@@ -1,5 +1,4 @@
 AUX aiodns-3.0.0-py3.10-tests.patch 757 BLAKE2B 1b5040841b3ced3b83b330e0033f54ee6ee97a8d025f22d87674f5fca9858e48febbf25c6b3441ba5b27ef9cb15f841e65f25ed999b9f536559ec50e1f010bbc SHA512 85219c885ee70871fb43f53e2ec52c164b08b63e120ee5ca5bc4531ea71155b6d81f5a813f056eabf7f4da2b425b12df6b5649cc7a9ba98d0ca9473043ee1829
 DIST aiodns-3.0.0.tar.gz 6743 BLAKE2B 2a3c61156069fa598df58191b35383da3e054396cdeb1bc8916cc0414bb6efc89d45789883a5b4f33e3a08a6ee544356b02d6c697c096deae3398f0ff4d3c316 SHA512 8c1016f3b0cb461e70e9a55034f9ad3b3db705a845bf20bb6503c7a5d592b4c5d2e8ddc60b375c5fafdc559dc4566736f4c93f26710be2dcbd181284ef039825
-EBUILD aiodns-3.0.0-r1.ebuild 762 BLAKE2B 6859d0c7e611679135f461e4e8d1ca3d2f7b809f9a14fb25f6c03e4dafd5c7ff8d9eabc5ac12590bc491ec44f36008c5f0176ccf7657cbce961a6016a552a071 SHA512 55ea509800684fb7d38c0e9387c82020b064a3149e4d4583772b7833a07408e3096798dffe61c340e09c53a33bb9c3b41205e4e490f40757fe437f1cd4d9a551
-EBUILD aiodns-3.0.0.ebuild 754 BLAKE2B 033e9b64c372f9de617da381d0fd005f5d5074dba184c0d1a20a293ba8972639c2501968411ed80aed6c4c48e07c67fdcc43ccab3bfaa0a02f3317e83aefa487 SHA512 38b21e170aa27d72b54f9ab84a91185231016d02bfab6f1b270c3f6cbe92eedaddc9ce3ff5d8b63adf64e84d942556b98d7cb2d21e038ae18c53dae739131fa5
+EBUILD aiodns-3.0.0-r1.ebuild 761 BLAKE2B 2181f6ec41bd6af477664481e87b77e14828624a23a2f134a526429f30b9437d828f181fa05fbafa94bd00c78cf5674a63a3046dae7a769f46b48e7d43f3de91 SHA512 47ffe95aa14b71750dab6fbca3daa75b6ed881fe4ae3d054e65ecf70d9da13801e20317585e5a7d46b33bf213bb96aee9d8ec302f09d263b5f6a35ac9216d643
 MISC metadata.xml 466 BLAKE2B 6f6f9859ea69490be57bf7c6581e3b51b8b0f3563cc013e072bcc221a81eaf7ade938e935a730c125452c0c6c8ac45d8c91ce1748cfa3ea1df3db55fa4c59d31 SHA512 101ea2c67fcd9b0c9496892422f7eac07d1c381f1fead1706c96fafdf5c2bb48f3c3b6912a166ee20a8b54be12e2989367674813c98aba0fd896f63110c8ee1c
diff --git a/dev-python/aiodns/aiodns-3.0.0-r1.ebuild b/dev-python/aiodns/aiodns-3.0.0-r1.ebuild
index 3b55866582f3..d74d584f1420 100644
--- a/dev-python/aiodns/aiodns-3.0.0-r1.ebuild
+++ b/dev-python/aiodns/aiodns-3.0.0-r1.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"
 
 # Tests fail with network-sandbox, since they try to resolve google.com
 PROPERTIES="test_network"
diff --git a/dev-python/aiodns/aiodns-3.0.0.ebuild b/dev-python/aiodns/aiodns-3.0.0.ebuild
deleted file mode 100644
index c693ea13d3be..000000000000
--- a/dev-python/aiodns/aiodns-3.0.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Simple DNS resolver for asyncio"
-HOMEPAGE="https://github.com/saghul/aiodns/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~riscv ~x86"
-IUSE=""
-# Tests fail with network-sandbox, since they try to resolve google.com
-PROPERTIES="test_network"
-RESTRICT="test"
-
-RDEPEND=">=dev-python/pycares-3[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	# https://github.com/saghul/aiodns/commit/146286601fe80eb4ede8126769e79b5d5e63f64e
-	"${FILESDIR}/${P}-py3.10-tests.patch"
-)
-
-python_test() {
-	"${EPYTHON}" tests.py -v || die
-}
diff --git a/dev-python/attrs/Manifest b/dev-python/attrs/Manifest
index 032cf6c80b12..4d5a620ed0ed 100644
--- a/dev-python/attrs/Manifest
+++ b/dev-python/attrs/Manifest
@@ -1,5 +1,5 @@
 DIST attrs-21.4.0.tar.gz 201839 BLAKE2B f8e9ca1385efe6f5b9bf468f622f0bf5390830c5f3c3526821446113146a61460b17e8750ea763f6da50221a8aa65f5f1ff98a6ddf69b1a87344508ca6495560 SHA512 5a52776eb505c8a354912fa037a9710e49830fa6ad37272cb6d8c3298f4179a5b237e36cd7db3b1c9af19fbf0194ad6b83c3db9a473f9349769180073273ba65
 DIST attrs-22.1.0.tar.gz 201288 BLAKE2B 5da48b3cbcd99cdcc531a0859be264a4d209778caa53bd95480a103549b816c8a805079e1555fce38eb33f8bd3d5b7bfa6f814ef2b60dc405bda6686c7746f0b SHA512 447637bc82b31d565479e364869b996eaf7b67e526ad97f79ba1c27f287bbb25a2c40663e35437bc19037f605fac9322bd35f303f2769f0eb2ee673900551885
 EBUILD attrs-21.4.0-r1.ebuild 1848 BLAKE2B 468fba46dc9ced05a124eda67ab30bc0a7ea8bf1c5a55de545c1cf96cf26a682b6d1e36b6bcbe9d88276c67dd5dccfcb85aef2c88ce753d8b6d760d979008a59 SHA512 bcef30cfb380189d1427302221d3a531e32390f4375c504ce38b360ad0adc0ede60d50ae1db0feef0735a2902f77d559ab98a4ac41db1cb6ecbfdeaa2b395d62
-EBUILD attrs-22.1.0.ebuild 986 BLAKE2B b439cd727ee835f869605315314969da4dbc8f070777a5fb28b688a73448c3f61604bda4df36e97dc6d73367c82cd5647b3b3378fb114f410f2784ffdcadb266 SHA512 c13402f110da41b000c1b0789a3b108aaad9eb511434260734a3c089a6577b3b3cf1fd54cb9ea02bde171b299ea7f5b3a3d9cccd632e53d2d97ac63eab32b67c
+EBUILD attrs-22.1.0.ebuild 978 BLAKE2B 2678cdb3afb816653417d08eb791cb84772b202abe8288b16b97102e694351bc9ea06827e3b9e65efec48197e9a791101245b09f21ad39799779a1297291f908 SHA512 f78754082e480c1c19cccc56705669f6247ee627bbad7de37ca2595bf6830f0c3850f1142de5cbf66ee8f2afec972873760d0b44c4f674b2933d14e3444d1fb3
 MISC metadata.xml 521 BLAKE2B 566735fbcb7141b4e2bf3130847bdde2850c803d5fe981540f728273231484984e5ebf3fed549cf9485763a8d9b8d102ccf984660a34541286621341e8aea64d SHA512 1b4999c797e93fd228652d1b6bd52dfc1a5e7b0828d2e70cdcf8dc859641c2c15f5353e1b9cf1b1f19dee8af75c521b26e651a7f4709e7729425d7dcc45137f1
diff --git a/dev-python/attrs/attrs-22.1.0.ebuild b/dev-python/attrs/attrs-22.1.0.ebuild
index 5b4849b65fb5..379ad9561767 100644
--- a/dev-python/attrs/attrs-22.1.0.ebuild
+++ b/dev-python/attrs/attrs-22.1.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	dev-python/zope-interface[${PYTHON_USEDEP}]
diff --git a/dev-python/cfn-lint/Manifest b/dev-python/cfn-lint/Manifest
index e598de2eecda..cf743bc3c270 100644
--- a/dev-python/cfn-lint/Manifest
+++ b/dev-python/cfn-lint/Manifest
@@ -1,11 +1,7 @@
-DIST cfn-lint-0.61.3.gh.tar.gz 9528542 BLAKE2B 27f5c82c09a7c1dde520189647480032faf808089083ca45a9a2a24e4c158cb8e62ee6ae2f906d6c68021cc34b654ff46c9402876e09dd3330115dead5db44a8 SHA512 db5369a12d88754f6241b4ef529b53d142a80bfcb0c58ac7ec03217e7e4cb7e53f3fde1dde45dfdac82ab3fde4b885bb40dae3076b85edf34ca68cc73dc5aeb1
-DIST cfn-lint-0.61.4.gh.tar.gz 9556069 BLAKE2B 71572546d7e523c11214e32130a7d52461580e487b514846137e6592cb7a1786414556e4bea191aa2e4dddaf338c24e8ea9001e617221ea74b03bd0ea900a5a9 SHA512 fd85af770b5b519c9de4df0acbbaa66a8a7f61efd210a793c2e28ad9e6d6ed2d8b3042ca41d7743b2bc4dc0446b42ea2929cba454fdbf097a482a7c268e04000
 DIST cfn-lint-0.61.5.gh.tar.gz 9580886 BLAKE2B 0e83a604bc8761cd6007039cc28d90e471ef3cd3c542e7ce977d290638bcbff2b196c5d3c5f23b8d6db064b867ab594360dedb86494aba955c065c7cbad8b519 SHA512 14a1c282f1d87ce5ddd231f92e01a4edd85a62802f2335ba95470acaa0d8deb0306433124f3d1bea6c965ebfe5b30145431087a71cb1e8b953bf94b5d691bcbf
 DIST cfn-lint-0.62.0.gh.tar.gz 9610430 BLAKE2B fdeed685abab1bb701698b02ba961d0460c2fbf631ee6c8c51d17e8087bdbd2a26d366afd6916ff118e047bc1e45e0ac4124cf5140b7dede5cb116e5e49bec3e SHA512 830f3929330cbb6d3ae74c9d172c4540272def94bae4f5a0d181fd41688479bf9e9a82ccb9ccea20b823b8580743722a8cb551d790cab92322c7e472e679d28a
 DIST cfn-lint-0.63.0.gh.tar.gz 9613588 BLAKE2B 96f36310b9201e39a03fb9ca4e102feed68bd71c6af10f48875055d8e5ce42dff61772d5ba702b3f390a49c5e10077a70eb86206145c132d03f6998ea3f26f4a SHA512 daa8412254234d36b3e65a27fc93dc6af2283830afa6de58c979759b7dc02ec220ebf18b1d116f38356a368223efec787135b36aaac4d2a6444ec6820a0303fb
-EBUILD cfn-lint-0.61.3.ebuild 1638 BLAKE2B aac7fa1a1a77be545e0198503a3557beff145ac1eff3615039ba66a994189f6de72f6062d2a6829199cb071bd03a3b23234992a293546178dc59af5bfc77ef74 SHA512 9eef4abcf551f313e508f2c3f1ffdae56142b2aa933942c0e9733d7e80a9d8324edd870d03a225683586a06fbd3a78dda5f95e81aac648e7864dcfc785797225
-EBUILD cfn-lint-0.61.4.ebuild 1640 BLAKE2B ab0b276a17eb6e1736a03f89d00a70a55840063177efdb4ca391f399acb5dea04480b4a31bf9bba12c607f35381d95b44dd6e346141d9e7e084eb4d48fe829e7 SHA512 ebc9ee814224010bf27a5e9675de5e1eed72073441da99ef9b8a3f8c17041eb6855d0951d97aa9e7f6f3d5aab758d594cdb3c93d9d990b4dac990e0fb9434a9a
-EBUILD cfn-lint-0.61.5.ebuild 1640 BLAKE2B ab0b276a17eb6e1736a03f89d00a70a55840063177efdb4ca391f399acb5dea04480b4a31bf9bba12c607f35381d95b44dd6e346141d9e7e084eb4d48fe829e7 SHA512 ebc9ee814224010bf27a5e9675de5e1eed72073441da99ef9b8a3f8c17041eb6855d0951d97aa9e7f6f3d5aab758d594cdb3c93d9d990b4dac990e0fb9434a9a
+EBUILD cfn-lint-0.61.5.ebuild 1638 BLAKE2B aac7fa1a1a77be545e0198503a3557beff145ac1eff3615039ba66a994189f6de72f6062d2a6829199cb071bd03a3b23234992a293546178dc59af5bfc77ef74 SHA512 9eef4abcf551f313e508f2c3f1ffdae56142b2aa933942c0e9733d7e80a9d8324edd870d03a225683586a06fbd3a78dda5f95e81aac648e7864dcfc785797225
 EBUILD cfn-lint-0.62.0.ebuild 1640 BLAKE2B ab0b276a17eb6e1736a03f89d00a70a55840063177efdb4ca391f399acb5dea04480b4a31bf9bba12c607f35381d95b44dd6e346141d9e7e084eb4d48fe829e7 SHA512 ebc9ee814224010bf27a5e9675de5e1eed72073441da99ef9b8a3f8c17041eb6855d0951d97aa9e7f6f3d5aab758d594cdb3c93d9d990b4dac990e0fb9434a9a
 EBUILD cfn-lint-0.63.0.ebuild 1640 BLAKE2B ab0b276a17eb6e1736a03f89d00a70a55840063177efdb4ca391f399acb5dea04480b4a31bf9bba12c607f35381d95b44dd6e346141d9e7e084eb4d48fe829e7 SHA512 ebc9ee814224010bf27a5e9675de5e1eed72073441da99ef9b8a3f8c17041eb6855d0951d97aa9e7f6f3d5aab758d594cdb3c93d9d990b4dac990e0fb9434a9a
 MISC metadata.xml 583 BLAKE2B 9f73e2b92e5cfa2ad59f5c8e5d91bdd3aa9eba3fa722b93b388cffea42020db7e7441bab5749432812934a4514d3e9104e6d897e1d115afa5ed237757bd48c03 SHA512 1866a349855ae4e248498b7aabd6ce4c4e10ea58731df4bfa13500f61dc041da6dbd7420e7d6a78fad46d5cf00bd7ef2d0c4c7d6819a21b3a5031b0d49588a19
diff --git a/dev-python/cfn-lint/cfn-lint-0.61.3.ebuild b/dev-python/cfn-lint/cfn-lint-0.61.3.ebuild
deleted file mode 100644
index efe7cae9474b..000000000000
--- a/dev-python/cfn-lint/cfn-lint-0.61.3.ebuild
+++ /dev/null
@@ -1,54 +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://github.com/aws-cloudformation/cfn-lint/
-	https://pypi.org/project/cfn-lint/
-"
-SRC_URI="
-	https://github.com/aws-cloudformation/cfn-lint/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/aws-sam-translator-1.47.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}]
-"
-
-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.61.4.ebuild b/dev-python/cfn-lint/cfn-lint-0.61.4.ebuild
deleted file mode 100644
index 57fd1d8c6029..000000000000
--- a/dev-python/cfn-lint/cfn-lint-0.61.4.ebuild
+++ /dev/null
@@ -1,54 +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://github.com/aws-cloudformation/cfn-lint/
-	https://pypi.org/project/cfn-lint/
-"
-SRC_URI="
-	https://github.com/aws-cloudformation/cfn-lint/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-
-RDEPEND="
-	>=dev-python/aws-sam-translator-1.47.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}]
-"
-
-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.61.5.ebuild b/dev-python/cfn-lint/cfn-lint-0.61.5.ebuild
index 57fd1d8c6029..efe7cae9474b 100644
--- a/dev-python/cfn-lint/cfn-lint-0.61.5.ebuild
+++ b/dev-python/cfn-lint/cfn-lint-0.61.5.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/aws-sam-translator-1.47.0[${PYTHON_USEDEP}]
diff --git a/dev-python/cython/Manifest b/dev-python/cython/Manifest
index 1786a2556875..066ea0a9c37a 100644
--- a/dev-python/cython/Manifest
+++ b/dev-python/cython/Manifest
@@ -4,5 +4,5 @@ AUX cython-0.29.23-test_exceptions-py310.patch 656 BLAKE2B 6c650c85d01b8bf367528
 DIST cython-0.29.30.gh.tar.gz 2105561 BLAKE2B c995bc710d2c397b8d6e4edee0f989e43969a51efb29b83643149d8c4110ae0331a35b9cc2ec7a45a43fea19ab8d63f1ef934f92d451c62d057e0e04ec79a871 SHA512 f6b07adfa1ebe9d52dfb72857ffd40b35d8777914299de101c7b96ee2d64cdd85ac0374ed41b382881b1f3ce535a9af9419dfabee9a4781a3f818125292627d4
 DIST cython-0.29.32.gh.tar.gz 2110417 BLAKE2B 008ffe325c87d165bf45afb2ff92db5286f611bbe425d0e9f18b530202135ca21f5f5ab564a4d0c6251ec2479ea0fd19207274a255fb1faf8863d3b067d17ae9 SHA512 55462792fa70d8edf60aa470627ab494918d7297fd7d282a7a54da76ee5a180233108404a1c8f3d79f6408f19b6e4f46b36e59fd47c38ede24f061f374437b6f
 EBUILD cython-0.29.30.ebuild 1989 BLAKE2B c7049236014402dbdef080cbf67490ba4433e72c441bdab344830a4753ad670a9cdde23db9fa31a05ef578883d01eb5d083cd28b291a48f202c394f4d9ab964b SHA512 33ea0512476696c3ae4e960912c88e2ec8e180d57348f7a361eecea94c7a58768acbbb124e732189fd1f2c40d9eb97ec0513fc980537ffa280064348c6389d66
-EBUILD cython-0.29.32.ebuild 1997 BLAKE2B 492efdda99a00989c1aa04b431ea6c8a5ca323a5ac493b1915204d682f097f1bc7a0ae421b4b96336267aa36b9f6d227260826e3dbfe978186da507da3fe8dc7 SHA512 278aa29f46e02782f01be6523adef658a42e5345cb77abc69d270095f90e686b1113462486fd28991dbe27b59765354e55880ce074c3bcbffea9efeddee80a43
+EBUILD cython-0.29.32.ebuild 1995 BLAKE2B 5ba1e342514b21cf9137f3dada67ffd0240d4844ed627d3e84481942f744475860d9e25a3fbf5b18c4e8974d397070ac954f2611ef30cb60596b232d243b7165 SHA512 6d3853b692c3727b65ac9f73fdb329d02bd99d500eb34c7c0c23d91d0d4841435c6a16e1d04b36609c4f3ce29bb4caaf4b71fad2126e2ab44327e514bd520fc0
 MISC metadata.xml 606 BLAKE2B 1ee3fc75852383aa0618afeb7521c3ae0e95b518c85b2c58ff958905092cf68017d313a09d25031a50b649f9dd1b452e751036f2552df9d91447baaeff0a8f0b SHA512 b7917c2e417cee9e59c8011246f7223f5095c87f0294ea140dbfc8fda0b09cf61c9f055380a9d3f74a07e71bb49d75f219d6224ea95f1f4d4b451e5688c13f78
diff --git a/dev-python/cython/cython-0.29.32.ebuild b/dev-python/cython/cython-0.29.32.ebuild
index 666f40d9818e..f0cd5c37bb92 100644
--- a/dev-python/cython/cython-0.29.32.ebuild
+++ b/dev-python/cython/cython-0.29.32.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE="emacs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/dj-database-url/Manifest b/dev-python/dj-database-url/Manifest
index a3bc678537f7..71b30c41102b 100644
--- a/dev-python/dj-database-url/Manifest
+++ b/dev-python/dj-database-url/Manifest
@@ -1,5 +1,3 @@
-DIST dj-database-url-0.5.0.gh.tar.gz 6309 BLAKE2B 72647f8651d595b4020161b15364836b8483bf8a12ec72e434bc9d0583878ee9f4e4c76110581f285adddac3e7c2d7bc071f720a7fde91c84c3ea53b6c979300 SHA512 541d5177bff0fcc21372d2d9dc699ba11de1b1cabf10d61fb9f1e844a6dd4d46df5c7fdb6ccb4505cf984e41d7a2ae4e3af5e7d05072b0ed6982499eac5aac66
 DIST dj-database-url-1.0.0.gh.tar.gz 11355 BLAKE2B 9ea50eb2646367333556133020a59f332cb69e05fb392f328558f77cb03ffa968cf62241f3823e28600799a1399ac1335b90477a26a4931b0df7b695b502e9be SHA512 35ca0c05910812e10bf63b061afb434ac7c562e3d994b6e452250fe4ec95983fe8353aec0df9c7638a990684e612863ddada5be48485a1db3120e110f6d0fa94
-EBUILD dj-database-url-0.5.0-r1.ebuild 600 BLAKE2B c646cba05e301646b5caeb739ff0303a798aebc74a7138b4169fa486d30ef6cf2cb5931f8cb307330aeb80a83b2e1895cf296a5ee09684006c8a7f1024c605f2 SHA512 81b8af28ca78737c0b190566a9f113b5c7450fa900d5492a879f0755d45d7be7f674590a7c33572ecf1e3a6e28b2f847f85150d1a1e182aa4f778f57b518c7d7
-EBUILD dj-database-url-1.0.0.ebuild 654 BLAKE2B 0da0bb086aa0c39499f59d81e270b903ad6f997621c30f827a2724fc048726dd4184c1ca57939e1552c92cb740d8e60267920e383d83cd0e3a9de7a9fd268131 SHA512 00757c36e3d74cb94fb98a68867550530da8827a27e0dccec9fa10c3a8e692d7da3838181f7989d9928519a56a5e364eb6344469efa09105c4b082c7a9da3540
+EBUILD dj-database-url-1.0.0.ebuild 650 BLAKE2B 43251066036bae24f726be99225f4a8a7fea284f539741d5b461d0a2598d37aed207dc64bf47ae206817d1ec05964a6607ca5a3757303a50b14818b8d317bf76 SHA512 f6521432982152f0e6dfeaaa5d7c1e859f713f8d978fbfc8a678353db0327bbb0048dbd9e98dfde689dba91aeb75088f95d20a66b8d2955ca612fc666d56feaa
 MISC metadata.xml 407 BLAKE2B 0a3736cc0034297f64b77b9b795e8cd339ed58c5b213e730f1d3dccabe7cde10570222626b2b520bc0e51a0195cd99baf4ebf7028cc73b7e507603874b1f4143 SHA512 ec842e583cd4e0b632731e395f6e70e519077bfeaeb58bb88b9ad297368443fc06a182c120635eeb1dedb76b166829c6f414925d3061e55d49d7053a72c739eb
diff --git a/dev-python/dj-database-url/dj-database-url-0.5.0-r1.ebuild b/dev-python/dj-database-url/dj-database-url-0.5.0-r1.ebuild
deleted file mode 100644
index 739d089e618b..000000000000
--- a/dev-python/dj-database-url/dj-database-url-0.5.0-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Use Database URLs in your Django Application"
-HOMEPAGE="
-	https://github.com/jazzband/dj-database-url/
-	https://pypi.org/project/dj-database-url/
-"
-SRC_URI="
-	https://github.com/jazzband/dj-database-url/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
-
-distutils_enable_tests unittest
diff --git a/dev-python/dj-database-url/dj-database-url-1.0.0.ebuild b/dev-python/dj-database-url/dj-database-url-1.0.0.ebuild
index c30f6849ca02..b9cc3df3422c 100644
--- a/dev-python/dj-database-url/dj-database-url-1.0.0.ebuild
+++ b/dev-python/dj-database-url/dj-database-url-1.0.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/django[${PYTHON_USEDEP}]
diff --git a/dev-python/doc8/Manifest b/dev-python/doc8/Manifest
index 0b28136d18c3..12d139941425 100644
--- a/dev-python/doc8/Manifest
+++ b/dev-python/doc8/Manifest
@@ -1,5 +1,3 @@
-DIST doc8-0.11.2.tar.gz 25898 BLAKE2B 097c6d6b82fe4acf7cfc43ff7860334f0a53df3ca39def33de4b9f04553acab785fe339d8126dd5ae56a7d45c846c575b9c689eed47bc47302b89fd5bfabfe3a SHA512 f607251c3ae792b3210893b2074bb34aad866a54645c4244ef53e156a4c3af9cfb61ddb93617d153510cc6868be7f04409eac47f66f91d4d0b9400bb7aca0eb1
 DIST doc8-1.0.0.tar.gz 26058 BLAKE2B 0113a4738804a9ed0446ae26b18f0f7da9dd3c4a90c598e03c78d3124f5db42dbc38f1f17af05ef60cb645a8b18bcb20aeb2f5cc00c44814afd572d92b2d0301 SHA512 98ad904a994536de80d6e89a221e3d7159d5188a0f57d07961f646e0591f81790f06c624ef90c32e28ff89ecf9e39b2b052363995aaece6a4e30f643c37964b9
-EBUILD doc8-0.11.2.ebuild 832 BLAKE2B b08861a20be43f2ff1164e4b0c74f58abdc30308de47d84d20d6f6ad845110f0e720731d1b18872b8889328b2ca619615258707db797daed6388d1dd2c0038b4 SHA512 3084ec1911d0852a2191e4a09aa13108f218aa441299eb7a9abc07427b951b4ddab069b1b51007dad4b44d5e3da899809bc3505ae876f0cbcf294403ea302868
-EBUILD doc8-1.0.0.ebuild 835 BLAKE2B af83e97ec07baf0275e240135a273d8a434bd9ac351ec1cf95f1e74968a1c6ee9902ffe6c67fb8ee8794f80ec9260b110fa0a661b8d5c4969d0a1dae121780f8 SHA512 20237ac28bb047139f793dff0aee190054bc73843f8df005817ffbea2440c115daaf8c09b3848d39d875799503b9e1b058bbadf6e48129898af0f8d86c74bf65
+EBUILD doc8-1.0.0.ebuild 832 BLAKE2B b08861a20be43f2ff1164e4b0c74f58abdc30308de47d84d20d6f6ad845110f0e720731d1b18872b8889328b2ca619615258707db797daed6388d1dd2c0038b4 SHA512 3084ec1911d0852a2191e4a09aa13108f218aa441299eb7a9abc07427b951b4ddab069b1b51007dad4b44d5e3da899809bc3505ae876f0cbcf294403ea302868
 MISC metadata.xml 447 BLAKE2B 8be26ccdf9fd1e34e05eccee3abb8182d95438b7eb0f6dda03757e1d4a0f2b1c34861f81b9e8bbbb6634f141dc7867ecdf83022b05df6abe322716d78eafc9a4 SHA512 824cb036e31a498764941d78ebd744d2edaa2cd7a3282dbd5f2c16cbcb0adab12a80b0200528c40e01fc6dde851d1abed5b3d5fc2b27577a02cdfad5fa90663d
diff --git a/dev-python/doc8/doc8-0.11.2.ebuild b/dev-python/doc8/doc8-0.11.2.ebuild
deleted file mode 100644
index 7b24f1a2ba35..000000000000
--- a/dev-python/doc8/doc8-0.11.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Style checker for Sphinx (or other) RST documentation"
-HOMEPAGE="
-	https://pypi.org/project/doc8/
-	https://github.com/pycqa/doc8/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
-
-RDEPEND="
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	>=dev-python/restructuredtext-lint-0.7[${PYTHON_USEDEP}]
-	dev-python/stevedore[${PYTHON_USEDEP}]
-	dev-python/tomli[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/doc8/doc8-1.0.0.ebuild b/dev-python/doc8/doc8-1.0.0.ebuild
index 9e86c190ebaa..7b24f1a2ba35 100644
--- a/dev-python/doc8/doc8-1.0.0.ebuild
+++ b/dev-python/doc8/doc8-1.0.0.ebuild
@@ -17,7 +17,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/docutils[${PYTHON_USEDEP}]
diff --git a/dev-python/fsspec/Manifest b/dev-python/fsspec/Manifest
index 12e281fd7894..fc1bd56aa55f 100644
--- a/dev-python/fsspec/Manifest
+++ b/dev-python/fsspec/Manifest
@@ -1,5 +1,3 @@
-DIST filesystem_spec-2022.5.0.gh.tar.gz 337607 BLAKE2B 80f22e6c1ca0ec4194b41a85171d466792812c456129a05c286d8c46de950aeed4cd7a0ee01082e9dbfee5b89ca1a36441f961d7e61be816eb783cad8bca0979 SHA512 687dd0e7018e04d719f7c11e2238afe06f4e8d5eb7193e24dd000dbd79e5c52bed5fde919de47b0dab2d66e9ba93f28370a32f2458a6771e728b0ece68609504
 DIST filesystem_spec-2022.7.1.gh.tar.gz 338526 BLAKE2B ef19c41a4e9fe3fb1a5146967bab505c26590aa4c074152523b705d8cac5eeb6e30834e1adbbb1669f5bbb58891cabd3960208cdfa9f619e0bbc5cbfe5f4ef55 SHA512 07178bf22e07091935256296b303e273c03e2ddc15a5aa1110f84c27cadaf9c650204e37c472cb10280e92f24b01fa8b16fe32db21a30d14d232c5a11e05a45c
-EBUILD fsspec-2022.5.0-r1.ebuild 1368 BLAKE2B 2ebce7153de30d870b270b903ca1b837bf437f97c804b0f69d104d920026de5a986ce9e8a62e4c33acc090d632c5da1d0d394c8555cc303bc87d6476d9690571 SHA512 e2f20c7c1eab0e5286f57f16654636b68599e7011caea8ce38a8152617bdcaac20220e9240cde7a266b6f5ee5968beb60998117c785aa97731e013e84a88e869
-EBUILD fsspec-2022.7.1.ebuild 1370 BLAKE2B e0b00d994b41327f60e7a8fb8f89a751f7a699eaa01c9169c23b46b82833e05a3bca1933ccdca18527abedefbcecb4514771416e49f9002f9bb9dc36f9248f6d SHA512 0c26a6736d1598fd4305a82408031b1af5251d10b59c6c87f8464d1af88723537f05af1dac4fb71ca76cfe1710828c360d65642a6ebae5e56ac57b433d08e636
+EBUILD fsspec-2022.7.1.ebuild 1368 BLAKE2B 2ebce7153de30d870b270b903ca1b837bf437f97c804b0f69d104d920026de5a986ce9e8a62e4c33acc090d632c5da1d0d394c8555cc303bc87d6476d9690571 SHA512 e2f20c7c1eab0e5286f57f16654636b68599e7011caea8ce38a8152617bdcaac20220e9240cde7a266b6f5ee5968beb60998117c785aa97731e013e84a88e869
 MISC metadata.xml 374 BLAKE2B 6c0b18a0ad3b85713ae6f618ac0646ed63f08549bd7d1ed5bd94b80d89d79efaf2f97ce913a0a7d6e54e77cc602994416520a22deadcc71e484cf7ca22bc6dde SHA512 5bf051387d6bcffb3022d023f60ee8f76ca277bb8d626dda988a0baaf1d1e3a71e872d8316607ee7e269e579b5a17c23ab93c56fade533150171d3ce44e4bb71
diff --git a/dev-python/fsspec/fsspec-2022.5.0-r1.ebuild b/dev-python/fsspec/fsspec-2022.5.0-r1.ebuild
deleted file mode 100644
index dfe2219250f2..000000000000
--- a/dev-python/fsspec/fsspec-2022.5.0-r1.ebuild
+++ /dev/null
@@ -1,58 +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..11} )
-
-inherit distutils-r1
-
-MY_P=filesystem_spec-${PV}
-DESCRIPTION="A specification that python filesystems should adhere to"
-HOMEPAGE="
-	https://github.com/fsspec/filesystem_spec/
-	https://pypi.org/project/fsspec/
-"
-SRC_URI="
-	https://github.com/fsspec/filesystem_spec/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
-
-BDEPEND="
-	test? (
-		dev-python/aiohttp[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/tqdm[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)
-"
-
-distutils_enable_tests pytest
-
-src_test() {
-	git config --global user.email "you@example.com" || die
-	git config --global user.name "Your Name" || die
-	distutils-r1_src_test
-}
-
-EPYTEST_DESELECT=(
-	fsspec/tests/test_spec.py::test_find
-)
-
-EPYTEST_IGNORE=(
-	# sftp and smb require server started via docker
-	fsspec/implementations/tests/test_dbfs.py
-	fsspec/implementations/tests/test_sftp.py
-	fsspec/implementations/tests/test_smb.py
-	# unhappy about dev-python/fuse-python (?)
-	fsspec/tests/test_fuse.py
-)
diff --git a/dev-python/fsspec/fsspec-2022.7.1.ebuild b/dev-python/fsspec/fsspec-2022.7.1.ebuild
index dba46d7fc2e2..dfe2219250f2 100644
--- a/dev-python/fsspec/fsspec-2022.7.1.ebuild
+++ b/dev-python/fsspec/fsspec-2022.7.1.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/geventhttpclient/Manifest b/dev-python/geventhttpclient/Manifest
index 09826b938e2e..3d0985e6b25f 100644
--- a/dev-python/geventhttpclient/Manifest
+++ b/dev-python/geventhttpclient/Manifest
@@ -1,5 +1,3 @@
-DIST geventhttpclient-1.5.5.tar.gz 59566 BLAKE2B f43ffe9880eefe77f19adc00bcef612df057f96e256f50ca4081658d7e0d01deca2473da3d2055dbc1cb98fc4f7f0a7442809fdcab635c43042792e2601efdb9 SHA512 89efe008099935ac8715ddf09c13e70c1a3552da50c495522b2a62e1ff51a407808e6b797f8fd3b0863a3a59e5b03e604bda8b1027c0326da75cb1fddb5d0fa3
 DIST geventhttpclient-2.0.tar.gz 73677 BLAKE2B b466f7153e646b3d9af0b301789aaa92df28dad505c375ec7fdcfb8d888d8942edba3f4c776ef4fc252756fb2a37bbee7d61c4a1e912c8c7d716a57fd49fee0e SHA512 1f53cf8636e6baba4cb0d8d7b233f903efec2d74413cfb2d768bff94f3a9b91ae59444981a1399b010e73120c390b52b1449424571c7ee9bdad818e5ce72ae8c
-EBUILD geventhttpclient-1.5.5.ebuild 1534 BLAKE2B b42a12cbdc746525bc8ee97435587a605210e069cd9f3c7ee1678ef02d24027a54fdc64e9b9dd3822b6990041ebbafe470dc8da843e01a6a4bbce4e2eed72611 SHA512 350c2123443fdf1b0efa575ed5a9b71a54971ed773f560f85324e9721aaef8e23ac0e5688942ea0f3b41431bebdc7b4968b519c11af66af8723c8f8a99f20797
-EBUILD geventhttpclient-2.0.ebuild 1541 BLAKE2B 133d5086e2ac682cc5d41f6153f9579f4337ce70f6c5fe9844e38e5c86f5ef379b39a22480ff3a8c01df0c39b1fdc00ff7730d9719f322c756af3fbaa782e3ff SHA512 765b80365d81f20eded6be8ac7d3ef6dffe4dce45e938aa596c0e01a083501fb22c151500b3d10ed15d7e11e45f93e2f65333718ae00e70dbe017fcaa5870b8f
+EBUILD geventhttpclient-2.0.ebuild 1537 BLAKE2B 1ef76232051fb2b29c2feefd2861a279ef6230f10c8d51a7653fb02d1d584b5d8d5766b301530b0df460bb873459a9482f02fb3538d982901a858c63746d4727 SHA512 830b8b365c850876e18de556f426e3ad061cff7c126b916dd662ee6ace14d1a83b733c0238fa33060e557f9a3ce78a5b4d3fc0b7ad15e7e160029852f50f6908
 MISC metadata.xml 580 BLAKE2B 24b9860ee1f361f1ced81967a404c4cf773e415c053ac83ff0b2bb97bcbbaa5cbba4e7faddcb615379d3057d2c3c28d59f9c8a0a36135edf9165615610ecce45 SHA512 5c3a892358d1fc3594d08c3551b441eaa2e38c60cd06952a62631a4ac687ab730be559ecfb17f9ab7878d0052b4ff7e03d6d49fd1a277bff71c1ef4fc369daf8
diff --git a/dev-python/geventhttpclient/geventhttpclient-1.5.5.ebuild b/dev-python/geventhttpclient/geventhttpclient-1.5.5.ebuild
deleted file mode 100644
index 2f7a10174e94..000000000000
--- a/dev-python/geventhttpclient/geventhttpclient-1.5.5.ebuild
+++ /dev/null
@@ -1,52 +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 high performance, concurrent HTTP client library for Python using gevent"
-HOMEPAGE="
-	https://github.com/geventhttpclient/geventhttpclient/
-	https://pypi.org/project/geventhttpclient/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	app-arch/brotli[python,${PYTHON_USEDEP}]
-	dev-python/certifi[${PYTHON_USEDEP}]
-	dev-python/gevent[events(+),${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# Avoid ModuleNotFoundError for tests we skip later
-	sed -i '/^import dpkt.ssl/d' src/geventhttpclient/tests/test_ssl.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# These SNI tests require dpkt which is not in the tree
-		src/geventhttpclient/tests/test_ssl.py::test_implicit_sni_from_host_in_ssl
-		src/geventhttpclient/tests/test_ssl.py::test_implicit_sni_from_header_in_ssl
-		src/geventhttpclient/tests/test_ssl.py::test_explicit_sni_in_ssl
-	)
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	# Skip tests which require internet access
-	epytest -m "not online"
-}
diff --git a/dev-python/geventhttpclient/geventhttpclient-2.0.ebuild b/dev-python/geventhttpclient/geventhttpclient-2.0.ebuild
index 5850080039c3..350f1a9322de 100644
--- a/dev-python/geventhttpclient/geventhttpclient-2.0.ebuild
+++ b/dev-python/geventhttpclient/geventhttpclient-2.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	app-arch/brotli[python,${PYTHON_USEDEP}]
diff --git a/dev-python/hidapi/Manifest b/dev-python/hidapi/Manifest
new file mode 100644
index 000000000000..81ae00b50540
--- /dev/null
+++ b/dev-python/hidapi/Manifest
@@ -0,0 +1,3 @@
+DIST hidapi-0.12.0.post2.tar.gz 125008 BLAKE2B 6792d8a4bbd80da19b3dd1fde47061e3a0f00678059e36598da4a34142cbfe1e732854c2a372a869891be79e1131a7cef138913556159574f10b8b08439bfefe SHA512 dee9f1f07e4f297b935c8e3fbe798471f449f6a101d68131db23d24ccfb5ce445cc3b0e7305606d3630443a817aa75a27093109078735168a59d21614606f0a0
+EBUILD hidapi-0.12.0.2.ebuild 701 BLAKE2B 9858592d4a703f4893765781562db912da7fa63d72657547e7dad2d9d4e7de9ba4b8842ce7f7593b68039a3a63c0b6f08e3a1569921b4f7e2128b9130e8d0ed7 SHA512 f80b3144faf230931f1dc18ffa92541ce99b559f52d36cbf519dc30e8a0199126c8c76560702e72d78fdb676213908cc6ff243624022f78770ec41d564974ac1
+MISC metadata.xml 391 BLAKE2B 29af920e7a546041fbd5e3fb8c28c07500eb7b306d2101716f2ce2190f76fa60c98f116b8e63a99e83d539a989ac49f64edd5b6c4d16be8849f98a0bd0f1d79f SHA512 06933868b65e5840d1bbd3913c2d863c92b18e9521e98f2a77813eb8da5e3b3c66f5571883fe2ccb6e717ef87df5f2e4992e0c12c9ff44d5c2fd1195dd8dd08a
diff --git a/dev-python/hidapi/hidapi-0.12.0.2.ebuild b/dev-python/hidapi/hidapi-0.12.0.2.ebuild
new file mode 100644
index 000000000000..5aa029943585
--- /dev/null
+++ b/dev-python/hidapi/hidapi-0.12.0.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="A Cython interface to HIDAPI library"
+HOMEPAGE="https://github.com/trezor/cython-hidapi"
+MY_PV=$(ver_rs 3 .post)
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${PN}-${MY_PV}.tar.gz"
+
+LICENSE="|| ( BSD GPL-3 )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+DEPEND=">=dev-libs/hidapi-$(ver_cut 1-3)"
+RDEPEND="${DEPEND}"
+BDEPEND="dev-python/cython[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+python_configure_all() {
+	DISTUTILS_ARGS=( --with-system-hidapi )
+}
+
+python_test() {
+	epytest tests.py
+}
diff --git a/dev-python/hidapi/metadata.xml b/dev-python/hidapi/metadata.xml
new file mode 100644
index 000000000000..59255f6b605d
--- /dev/null
+++ b/dev-python/hidapi/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>sultan@gentoo.org</email>
+    <name>Stephan Hartmann</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">trezor/cython-hidapi</remote-id>
+    <remote-id type="pypi">hidapi</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/jsonschema/Manifest b/dev-python/jsonschema/Manifest
index e5ced25b9991..0dd669de5050 100644
--- a/dev-python/jsonschema/Manifest
+++ b/dev-python/jsonschema/Manifest
@@ -3,7 +3,6 @@ DIST jsonschema-4.10.2.tar.gz 285395 BLAKE2B 2e40fc5e8b93922c12110f1983f933a0745
 DIST jsonschema-4.12.1.tar.gz 287475 BLAKE2B 78f4e6fa120eef9ac3fead84fa28b16a8f4c212c570785f0f6f08fcec1a58c51f7cc756ba9a7272e71e3877e80e5e17e2e4d8fbcf503a20c27232dcb4b918085 SHA512 ae95bf3dccb7365af1814255a5aecc11044c3ee579921e935e7c3f955596fdf8d32bbdd0fa2693ea701792a8a29053cf25ef3ab9b08ffb66a6859059a877888f
 DIST jsonschema-4.13.0.tar.gz 288024 BLAKE2B 1d3a08626c2c24b5a35f69500fdafcb7acdda1f6c4830b0e601776118c760774626c85516e0e4b99e31cfedab6b6e2ac7dde9b1ff57f726b236aa45daff34701 SHA512 11de8bbdd0723f7ebf8dacabcdb9ad59e909ebf096c3864259cbd151281f3306cb1cd2b76a74c84e84cdb8cb5263e62d7e63e2b0f4d55065dc50e7e2c7de29ad
 DIST jsonschema-4.14.0.tar.gz 288641 BLAKE2B d2da24ce7da041238060d20fe6aa1a86be9a6f0b7986d7def641b4c09a39b196d10e40808d8f2ec80f8e43ad9f54bf2df2ff127624f5a7cceef6d4800cd2a9bc SHA512 b999db155ba6b4a3fd1c3650182d519c49d4f12c3ed64c6806e7dffd97e4c8c7ea129f0b6c5965b7e61a8e5589e12d554f2f7fd8ce90029bcd25ce97cd5ed72f
-DIST jsonschema-4.7.2.tar.gz 278495 BLAKE2B 55c25847e210e0bdd3bec672b4b6a4eb1a2e2ec5167c115c34a2d0b2de079a00eaff8d901386b475fc26660887090896e78e3a38c1805f5b767fa1eece740e3b SHA512 c624d7bf317ca20fd8cdd248ec7d7679fde907ab304f1a092fc7a172464f43e41904d3f88df57e1351043b978448f51166a09af3625f00a9ad4d7353033b80af
 DIST jsonschema-4.8.0.tar.gz 279424 BLAKE2B 9e8936bde13841f9edf42ffe214ce8d1aaae8b9be4c3040871f228399a31b4292e8cfbf4bf4261822ca1b88622cb69cdf0d55bd2cc51bf191f6e364e9bfb94f8 SHA512 75a7593eb8b0163ba428f507ed4fd9fa6d51567f284776af96f4d79cb507a69666cc048034bfa3a401f960295779e935562dde4e97cf3f7b3b4571bc28b9dde7
 DIST jsonschema-4.9.0.tar.gz 281100 BLAKE2B 5a1c387fc33735ffd39342f3e62600aea721a51be0995d10aa1726e8e4c3bf93694a7844410c0b245c699880d6642a6903525b3637883f5e662086b53deb0948 SHA512 73fc9958f37802c4558ea6893386810784d2b577c04423b7090fce4cd052e3af078f0b0c46b2b16f96bb49820047f1ec5d96cf6c6cb822fca1d988cf1d70209f
 DIST jsonschema-4.9.1.tar.gz 281177 BLAKE2B 210308d140b39f5a5506a3561b8eaa211fbc9a0eb0576975125fa998bf9a507221b5ab75bd4d0f5bcd6d2e3b70a1a07ef4bcfb1d0b88b29a218b074b7d5649a1 SHA512 d63b927c183077d0fe6978536416523229be0ce3a393e6cbc12fd9229bfa45ba035fd721a7722042d7cb6bcf4c720485d7ff877aae93cd62c9c48b984e802267
@@ -12,8 +11,7 @@ EBUILD jsonschema-4.10.2.ebuild 1581 BLAKE2B 5367c715bb5a95a1fe41b14db8feecf81bc
 EBUILD jsonschema-4.12.1.ebuild 1597 BLAKE2B 8c683db7166917b40283069726e3fbeee0bd7377cdbc653f9fa78c54d11e1fc38423da5c2da0f56cc6851029a14d756f8b44b6adde5657e6494d58a22d306b00 SHA512 7c261b89468f12bc7e5f8c3ce38ed437d5fb7c1fc0847b26ccd65764c0244a0c43c58c6e9c9fb49703c7858bbf22c28bd66c8699adf3fe2e4249eb08200b335c
 EBUILD jsonschema-4.13.0.ebuild 1597 BLAKE2B 8c683db7166917b40283069726e3fbeee0bd7377cdbc653f9fa78c54d11e1fc38423da5c2da0f56cc6851029a14d756f8b44b6adde5657e6494d58a22d306b00 SHA512 7c261b89468f12bc7e5f8c3ce38ed437d5fb7c1fc0847b26ccd65764c0244a0c43c58c6e9c9fb49703c7858bbf22c28bd66c8699adf3fe2e4249eb08200b335c
 EBUILD jsonschema-4.14.0.ebuild 1630 BLAKE2B e2cab72bfdc72e91b82528da0aa2420260e506a3200b6d9463edf67687e5ad660cd4fa4467a68dd3cda9989ce3c56f960e29a7ad45a0872d4baae333ce206ddc SHA512 4236c2dc7d91f200dc4625b385013711bba71fbeafb1aca42be7caba353152e051073813dd2e9067933185294660e3c79ac48fd88f7f52d367c7a337af26311b
-EBUILD jsonschema-4.7.2.ebuild 1470 BLAKE2B 83d64bd08bf75a1a8a37dc993658b3f235a6a83ec0c35b5ab25ac165cafc4a8e5d70855fdecef07b40d788ca699d9a01514a2e1a3050d7d457ea71c2527fdcb0 SHA512 16dfb19e0f76c4895172f529ed19c1e467fc7101543c913f467832c2cd45fbd23f7e8e59a07301b07381c3e8e86f68b0930555dde52973af3622e7b3e65862cf
-EBUILD jsonschema-4.8.0.ebuild 1478 BLAKE2B ca4c9fc3507787d0880ead2ac0b3c02029921dfb886988359b914df10ce43b2c8c197bb55c8174425304f7dc6487a19209816f766e1b8c3b8bea531527fd4bb7 SHA512 39e4857634efcb651dc31e69bb56ed96242416262af07a6898c08647e5cc9f6fa2001e84942e4e3793b0596d89b02e5d89c9e60077e29707e559bd00edb834ee
+EBUILD jsonschema-4.8.0.ebuild 1470 BLAKE2B 83d64bd08bf75a1a8a37dc993658b3f235a6a83ec0c35b5ab25ac165cafc4a8e5d70855fdecef07b40d788ca699d9a01514a2e1a3050d7d457ea71c2527fdcb0 SHA512 16dfb19e0f76c4895172f529ed19c1e467fc7101543c913f467832c2cd45fbd23f7e8e59a07301b07381c3e8e86f68b0930555dde52973af3622e7b3e65862cf
 EBUILD jsonschema-4.9.0.ebuild 1504 BLAKE2B aa9b279331f3b6a70a45689ae877831c2fc4adf91faa5322fb67807bd2bb2181f74ce0de649da5e7df813934409b5d9b0ead05af3c4eba4d7f52cf98b295dfd8 SHA512 e13292a358daf85b43d82abe65a0123ac4971dcaaf50f70cde560a62e93d2227ec6064f97088a2c112cacb8ad18a3b636c000b54897e4e1ab3de0ab475362f60
 EBUILD jsonschema-4.9.1.ebuild 1517 BLAKE2B 638e98b819941fb6ad421fe985c93f81ad6d8ebc4e54877caa2fd01cbe750fa6a3e69e4ada2f33191d45a2e643d0d4663642044f14fef9a4336f9092eed89936 SHA512 6deaf29c9731b4a0669e45d85358e46a5c8e7eef4cce2941cf0ebb07076dfb47e32ca37fcdfa5d055e40c799f20f3a53f0f2e1afa21b7d11af0fb72ef708ddd4
 MISC metadata.xml 703 BLAKE2B 240a82a967bf7e2c200a2359dc691cbfa119fbc415f41c594c981a0da551a779b9d6afd6f8aadc7daab074579d6964455cf8bc8de36f01e986d344d1082095c5 SHA512 88cf98273ec371942846bba05ec8cc38939b1ff1a4f35e16f5764d09e67830e6f86b741ccb11ca487071eef205d193f5d0ca5ab156eb429c89d10c90778594b4
diff --git a/dev-python/jsonschema/jsonschema-4.7.2.ebuild b/dev-python/jsonschema/jsonschema-4.7.2.ebuild
deleted file mode 100644
index 43d7b3070a9c..000000000000
--- a/dev-python/jsonschema/jsonschema-4.7.2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( pypy3 python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="An implementation of JSON-Schema validation for Python"
-HOMEPAGE="
-	https://pypi.org/project/jsonschema/
-	https://github.com/python-jsonschema/jsonschema/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/attrs-17.4.0[${PYTHON_USEDEP}]
-	>=dev-python/pyrsistent-0.18.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_resources-1.4.0[${PYTHON_USEDEP}]
-	' 3.8)
-"
-BDEPEND="
-	dev-python/hatch-vcs[${PYTHON_USEDEP}]
-"
-
-# formatter deps
-RDEPEND+="
-	dev-python/fqdn[${PYTHON_USEDEP}]
-	dev-python/idna[${PYTHON_USEDEP}]
-	dev-python/isoduration[${PYTHON_USEDEP}]
-	>=dev-python/jsonpointer-1.13[${PYTHON_USEDEP}]
-	dev-python/rfc3339-validator[${PYTHON_USEDEP}]
-	dev-python/rfc3986-validator[${PYTHON_USEDEP}]
-	dev-python/rfc3987[${PYTHON_USEDEP}]
-	dev-python/uri_template[${PYTHON_USEDEP}]
-	>=dev-python/webcolors-1.11[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# requires pip, does not make much sense for the users
-	jsonschema/tests/test_cli.py::TestCLIIntegration::test_license
-	# wtf?
-	jsonschema/tests/test_deprecations.py::TestDeprecations::test_version
-)
diff --git a/dev-python/jsonschema/jsonschema-4.8.0.ebuild b/dev-python/jsonschema/jsonschema-4.8.0.ebuild
index fb6400dc457c..43d7b3070a9c 100644
--- a/dev-python/jsonschema/jsonschema-4.8.0.ebuild
+++ b/dev-python/jsonschema/jsonschema-4.8.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/attrs-17.4.0[${PYTHON_USEDEP}]
diff --git a/dev-python/pep517/Manifest b/dev-python/pep517/Manifest
index 05d254384333..285c5f95d04f 100644
--- a/dev-python/pep517/Manifest
+++ b/dev-python/pep517/Manifest
@@ -1,5 +1,3 @@
-DIST pep517-0.12.0.gh.tar.gz 24726 BLAKE2B 7d022ab88c68b7254df5d922db2f571e2bab2ee58b8a2ed0ce1adeadf89f22f11f6a609b558133acfed5342a9cf6a398d805949bdfb485a4abf272e2b9322e05 SHA512 6b224759733c1f5e346909788233b0acf49c60a0b6ef2d99d953b2e7bb570b2913fd0b133d5bc6884ec3de98adf2e41fa9506fed344b8fd76cc58dfcd1778e80
 DIST pep517-0.13.0.gh.tar.gz 23816 BLAKE2B d1bab5fe1a629384dcd264c0ea3d42d6b11de3530441de5de49516543630293b9a8023c8a55b291a7a415f8c90d4077f156cd036ed7fd477339d1210bfe47059 SHA512 dc534e73ea8659994041a39c8bfc92ee0a81b164c2d1ee383e3549d830f513fc89227d1bda3f749352532d0610e450de6b2be956aa4387f4b2f272d9f8aec0a0
-EBUILD pep517-0.12.0-r1.ebuild 881 BLAKE2B 80005aae79fef6121b9be5be0cac1b26635fe36950ced7a02b15b846e2ea439cb7abc15af5c7de8fc8ac92bf569cd1fd52f22679326cea2431190af6b3657169 SHA512 ed97b6579ad6951b60d8c8d61e119ff4bab027a99be5919b3ecf976e4d514758e86bbf575fc1b58c58756d5d867ac4bec68b49940479e42a788e76b759d16e9d
-EBUILD pep517-0.13.0.ebuild 889 BLAKE2B fd0b1475568d1ef9ac22995c5caa8e56d35bcb8821e77bd5608133bd86b59dd6746ed65691031fca0702f0259cc7877caeed4f2c5f57247b0552c72ee142de25 SHA512 28f5892e1ede80ff2e87ff2cc9881c9e5b260710bdf10403b326d5d508ab6ffab1891a1f5a2fa47d55a05222e00d04f012a848d49e902ca26663d63673652d42
+EBUILD pep517-0.13.0.ebuild 881 BLAKE2B 80005aae79fef6121b9be5be0cac1b26635fe36950ced7a02b15b846e2ea439cb7abc15af5c7de8fc8ac92bf569cd1fd52f22679326cea2431190af6b3657169 SHA512 ed97b6579ad6951b60d8c8d61e119ff4bab027a99be5919b3ecf976e4d514758e86bbf575fc1b58c58756d5d867ac4bec68b49940479e42a788e76b759d16e9d
 MISC metadata.xml 363 BLAKE2B 76892bc62d90df3a74962adaf0d9a33f75a3fd885feffde7ceaa5d1e4964704aea5ae07a88376b32b923ba0462eea4ff7b3f68a2deb97dacc897ac02d12012e8 SHA512 30f31bd6740e4fad66e1f6c3a9ae1a6572575d814f90c76eab3e5d82be3aa99ab2444e131592e9b92ea4774b5864b71f3d9f38bb7424fbaf63cd3dc642ee1fc6
diff --git a/dev-python/pep517/pep517-0.12.0-r1.ebuild b/dev-python/pep517/pep517-0.12.0-r1.ebuild
deleted file mode 100644
index 1aa58f9baf68..000000000000
--- a/dev-python/pep517/pep517-0.12.0-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{8..11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Wrappers to build Python packages using PEP 517 hooks"
-HOMEPAGE="
-	https://pypi.org/project/pep517/
-	https://github.com/pypa/pep517/
-	https://pep517.readthedocs.io/
-"
-SRC_URI="
-	https://github.com/pypa/pep517/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/tomli[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/testpath[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	# require Internet
-	tests/test_meta.py
-)
-
-src_prepare() {
-	sed -i -e '/--flake8/d' pytest.ini || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/pep517/pep517-0.13.0.ebuild b/dev-python/pep517/pep517-0.13.0.ebuild
index 80a7a6488acf..1aa58f9baf68 100644
--- a/dev-python/pep517/pep517-0.13.0.ebuild
+++ b/dev-python/pep517/pep517-0.13.0.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/tomli[${PYTHON_USEDEP}]
diff --git a/dev-python/pip/Manifest b/dev-python/pip/Manifest
index bc3703b9f67b..1a087ab9c216 100644
--- a/dev-python/pip/Manifest
+++ b/dev-python/pip/Manifest
@@ -1,16 +1,8 @@
 AUX pip-20.0.2-disable-system-install.patch 1298 BLAKE2B a384ee2114e59b8bc719fc14270cf6efbe8914854c404395beb1126db3278683b940e8fcfee83423d78e2aed6521e0bc57566ab0f5618f473262bbd9b7b0bffa SHA512 d2772105d4f4f880606e1e8ab3381af6768a96604a5fdcaa155dd42f8eea731c3a1b733b027d3e591d81f962ba14758b19da4a2c6c12946cd9a9d77c51ca4e78
-AUX pip-21.3-no-coverage.patch 1820 BLAKE2B f515e324f043fa8548f9add2fecf1f4d09c2487d695c429f870a6cd1ee9a228717c4fb152faa99a74d75d3b1998a5e7e93f710e2acd096f107f23091875f1f11 SHA512 b386e8116009f43013fe600d1f3928931a6595105bdd782266eeab85ba0f5a0743c7ccfbf2cab018d2ee0646b832573c56aad009e4b074dd805011d0a810348d
-AUX pip-22.2-no-coverage.patch 1833 BLAKE2B 8111b66a8e97b0415b1fe9314f8c1fcf49c1fffaf94b966bd484b1cb27b400c4eadd99fb3df1e67eb9a41983932e08a9bbebb135c9323255654fec121f802c6a SHA512 0f530065040f052a6806ce5220fc5447f92ac230e3047cd2d56674857a22bbfd489fff4b72d2f095a0c42f74a10b35444471f0cb5cf31e72d2eb7f71f355c9a9
 AUX pip-22.2.1-no-coverage.patch 1805 BLAKE2B 790a6736194d3ad7cadbb7965978f19c251a65b98b67c64726072f2baa24831f3e3788fdba560c247cde948183c6589b6edf18d5861468801e5729ba53c42995 SHA512 5fd775c0a1cb0f88c6c632a90294f11788916371b7d4bb8b378ed1530b461a9788f289a06d6619e66fcb45dd08a7063a749a608c5f12a778db84dfcbb5e79cba
-DIST pip-22.1.2.gh.tar.gz 9346675 BLAKE2B f709f8977d467d5a3170884bb75cd2f74a2f40801ae02a3725d442e18e4073f9c4a39cd1c9d2ce3949eb888be69d151f67d0cf2d0cbad7e2ec1ec6e78150b5c7 SHA512 7dd13150023f1cca8f5e01da7688ae418b5d0b36364efcfc15374a5147c7cabd46ff1d34e6499bc8e182dc0d34a366f5fe21d8ab4de4d112d269a97200401305
-DIST pip-22.2.1.gh.tar.gz 9279141 BLAKE2B 61906027e36c8b3b82f3d17a59cbc995864622184c7f4099e9dfbb5082d1953dff72551558b8fe0d463d7defcd8b9403a978e4a8c7d79af5cd6b9dbbbcc9c7b5 SHA512 77996ce7e1aa4b5aab0c55dfee5e9bfe9f5f09f33cb796ce78bba7365f37ce9f1cce4eeaf5fdbeddde0819ecc6a30ffdafa6b7e25f93c672fcc8646303a7946e
 DIST pip-22.2.2.gh.tar.gz 9279218 BLAKE2B 2179b0d3f5f05bbd678f1785b4dbc0613078c09c83b45faa62d766182dfeb564095abda809ed99f45644abcb06c125efc528aeaed3ad40ab1c9e8972e33ccbb2 SHA512 bd59e28b55475b77a8f11ea771cbad3b2602ff974e219f9a55288963a9522c9279a5b00fde40fb65cfebefae0e905d3da3c06fe50b402aa5326b25f70a98a015
-DIST pip-22.2.gh.tar.gz 9278410 BLAKE2B e32fe63e81593a0ec9c0110af0f07f1a47ddd3d6c660c11e9eb9142c251b7f45e3a1cc343193b123364a6a3a69490add7d4ebb368aac027c448f00f7cd163d7c SHA512 2ff3f9c2dc84c65c14c978e8c58cd3cee6cfff9753655c726763d6d7780d147479f32c47873d402ad9e0821fef940b971a7df93fabd6b998f07dea5af1251c9b
 DIST setuptools-62.3.2-py3-none-any.whl 1225929 BLAKE2B 608952e201f749ebf557e3962ba9856d5bdcbc534f3a25598cab0d6c53282cfb3b9f007ba135497a8addf49db4c02bc4387c486d95a4529d01ce4114154ec28a SHA512 366d69dc44e326dd7549cdacd8dec481a14dce4feef4338adc38b9de5c4c338f04d61696e13ce8603be1315f2e8734100f92d3fe4b4b11843e19f550c9631978
 DIST virtualenv-16.7.12.gh.tar.gz 8906590 BLAKE2B a1f206769e4e5797562906162e492e44c4a72720e4f88a0362dc802ce2df20c65aaab6a72dce2238445601a10fae59bd90cd362217994d30911f105afd71c5fa SHA512 0278b33fb19f6553e70ad3dcffa6ea1a455ff435b216ac9b4fadff216b2932714faa2bb6027af3058010111d8511a5c2fcd424f31c9645be361603971f111c8e
 DIST wheel-0.36.2-py2.py3-none-any.whl 35046 BLAKE2B bc4e8dab7c74eea34d3b4a813b7eaf6295a99a396a861b6cdd76f743043e89140bad132bdd13e385e8945ce02e0798e1d3ac73fc1b23bde5b2a83e4bb4dd5cdc SHA512 6bb5119b4d3704fe1e3c1eaaa3124edab13f61b46f8a0a8e75974fac4e5b25d8b53606071a03a8d8990ad1cfe2ab247ddea260098df2c0c35ae965be47080284
-EBUILD pip-22.1.2-r1.ebuild 4244 BLAKE2B eb572300446fe1697e4201024ba005d25edfcfec50c4102c2053b8b586af60ea261db2898e48b7e8b4f07d9deb289f5f6719918f66132ad078ba7a35756be7e2 SHA512 737f505103c8e2401cae1ba09f25407c598379bf085d28d9761abf93d4451d67c5aa08a8f446b5a03da2bf3ac68afb2f1bb6e57e0c8fec3b8fef4cd63a0b5b1d
-EBUILD pip-22.2-r1.ebuild 4440 BLAKE2B 28cf5c72f782107f7d322d418b503067a21217d8552580051641438883ecb18235b761bdc1e9574817e77bc5523104197dd0fe3472ed676d65619593b5726932 SHA512 c37dd2ce831728511b4cbc08b87076f1112cf23815eea1cc0cf959721d7d697ebe65bf458c27ed777475d54d58ee0d00fa9190c6829e06ae666e775e6fe03c03
-EBUILD pip-22.2.1-r1.ebuild 4510 BLAKE2B 60e0a608797cac42cc03cba07ef99733e5e9631e8044876a7e929394fde697edb89a95291ddd0d5db4ae7456458ec3ec15dcdf6fe2c1ab976488365d1e22daf3 SHA512 79bd859969f22b8cc20d38b3a152d93249848b3110c714bb95e4e14fa347fe77d3ee92422a46fca0a1008fb23f0959fd8985b9aa0c67fae473be8a05eb5a9b31
-EBUILD pip-22.2.2.ebuild 4510 BLAKE2B 60e0a608797cac42cc03cba07ef99733e5e9631e8044876a7e929394fde697edb89a95291ddd0d5db4ae7456458ec3ec15dcdf6fe2c1ab976488365d1e22daf3 SHA512 79bd859969f22b8cc20d38b3a152d93249848b3110c714bb95e4e14fa347fe77d3ee92422a46fca0a1008fb23f0959fd8985b9aa0c67fae473be8a05eb5a9b31
+EBUILD pip-22.2.2.ebuild 4502 BLAKE2B c30eb4f85a0f4744716d44354b665ff26283721e673f2c82778a3e40212ab9725d981ea393db90af03fec30ae9fe19b83d4d9f45ce5bb46ce612d903b35f5d6b SHA512 fd9b89048d1fcfdae23be6edd635bb462924ee64891e459b1747125641eb90a64d9aa0fb60bf6ce284a74767befea02c704432fdbd9d002586847337497152cc
 MISC metadata.xml 392 BLAKE2B 94ea3de1220cb9ca64ae1186597789cc83a54adfe44695932c07dd5065df0e5f9ee5078a495e3a12563b36809d781d8ab86bb6c92c485c023199d92547b74f27 SHA512 603199f6547105f3bb64f4fcaf004e9ef62fa2e0f8ec6eab56078119684b0f5119161e0f164fe02b2cf6dd6b115588c9ef77d727eeb6d138e281f1cb0bcb5de9
diff --git a/dev-python/pip/files/pip-21.3-no-coverage.patch b/dev-python/pip/files/pip-21.3-no-coverage.patch
deleted file mode 100644
index 8292f97f9488..000000000000
--- a/dev-python/pip/files/pip-21.3-no-coverage.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 8473691148031ed4db5bd8870fbeef9484b9c831 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Sat, 23 Oct 2021 08:11:11 +0200
-Subject: [PATCH] Disable coverage testing support inside test venvs
-
----
- tests/conftest.py | 15 ---------------
- 1 file changed, 15 deletions(-)
-
-diff --git a/tests/conftest.py b/tests/conftest.py
-index 076aeaf19..77c41dc15 100644
---- a/tests/conftest.py
-+++ b/tests/conftest.py
-@@ -340,13 +340,6 @@ def wheel_install(tmpdir_factory: pytest.TempdirFactory, common_wheels: Path) ->
-     return _common_wheel_editable_install(tmpdir_factory, common_wheels, "wheel")
- 
- 
--@pytest.fixture(scope="session")
--def coverage_install(
--    tmpdir_factory: pytest.TempdirFactory, common_wheels: Path
--) -> Path:
--    return _common_wheel_editable_install(tmpdir_factory, common_wheels, "coverage")
--
--
- def install_egg_link(
-     venv: VirtualEnvironment, project_name: str, egg_info_dir: Path
- ) -> None:
-@@ -362,7 +355,6 @@ def virtualenv_template(
-     tmpdir_factory: pytest.TempdirFactory,
-     pip_src: Path,
-     setuptools_install: Path,
--    coverage_install: Path,
- ) -> Iterator[VirtualEnvironment]:
- 
-     venv_type: VirtualEnvironmentType
-@@ -389,13 +381,6 @@ def virtualenv_template(
-         [venv.bin / "python", "setup.py", "-q", "develop"], cwd=pip_editable
-     )
- 
--    # Install coverage and pth file for executing it in any spawned processes
--    # in this virtual environment.
--    install_egg_link(venv, "coverage", coverage_install)
--    # zz prefix ensures the file is after easy-install.pth.
--    with open(venv.site / "zz-coverage-helper.pth", "a") as f:
--        f.write("import coverage; coverage.process_startup()")
--
-     # Drop (non-relocatable) launchers.
-     for exe in os.listdir(venv.bin):
-         if not (
--- 
-2.33.1
-
diff --git a/dev-python/pip/files/pip-22.2-no-coverage.patch b/dev-python/pip/files/pip-22.2-no-coverage.patch
deleted file mode 100644
index 20a5fa4beabf..000000000000
--- a/dev-python/pip/files/pip-22.2-no-coverage.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 75292c12ee2062f7d035b326b652ba6cffb8480d Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Sat, 23 Oct 2021 08:11:11 +0200
-Subject: [PATCH] Disable coverage testing support inside test venvs
-
----
- tests/conftest.py | 15 ---------------
- 1 file changed, 15 deletions(-)
-
-diff --git a/tests/conftest.py b/tests/conftest.py
-index 210ff0f4e..e5c0d2ef0 100644
---- a/tests/conftest.py
-+++ b/tests/conftest.py
-@@ -382,13 +382,6 @@ def wheel_install(tmpdir_factory: pytest.TempPathFactory, common_wheels: Path) -
-     return _common_wheel_editable_install(tmpdir_factory, common_wheels, "wheel")
- 
- 
--@pytest.fixture(scope="session")
--def coverage_install(
--    tmpdir_factory: pytest.TempPathFactory, common_wheels: Path
--) -> Path:
--    return _common_wheel_editable_install(tmpdir_factory, common_wheels, "coverage")
--
--
- def install_egg_link(
-     venv: VirtualEnvironment, project_name: str, egg_info_dir: Path
- ) -> None:
-@@ -404,7 +397,6 @@ def virtualenv_template(
-     tmpdir_factory: pytest.TempPathFactory,
-     pip_src: Path,
-     setuptools_install: Path,
--    coverage_install: Path,
- ) -> Iterator[VirtualEnvironment]:
- 
-     venv_type: VirtualEnvironmentType
-@@ -431,13 +423,6 @@ def virtualenv_template(
-         [os.fspath(venv.bin / "python"), "setup.py", "-q", "develop"], cwd=pip_editable
-     )
- 
--    # Install coverage and pth file for executing it in any spawned processes
--    # in this virtual environment.
--    install_egg_link(venv, "coverage", coverage_install)
--    # zz prefix ensures the file is after easy-install.pth.
--    with open(venv.site / "zz-coverage-helper.pth", "a") as f:
--        f.write("import coverage; coverage.process_startup()")
--
-     # Drop (non-relocatable) launchers.
-     for exe in os.listdir(venv.bin):
-         if not (
--- 
-2.35.1
-
diff --git a/dev-python/pip/pip-22.1.2-r1.ebuild b/dev-python/pip/pip-22.1.2-r1.ebuild
deleted file mode 100644
index 92328155e736..000000000000
--- a/dev-python/pip/pip-22.1.2-r1.ebuild
+++ /dev/null
@@ -1,130 +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_TESTED=( python3_{8..10} )
-PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" python3_11 pypy3 )
-PYTHON_REQ_USE="ssl(+),threads(+)"
-
-inherit bash-completion-r1 distutils-r1 multiprocessing
-
-# setuptools & wheel .whl files are required for testing,
-# the exact version is not very important.
-SETUPTOOLS_WHL="setuptools-62.3.2-py3-none-any.whl"
-WHEEL_WHL="wheel-0.36.2-py2.py3-none-any.whl"
-# upstream still requires virtualenv-16 for testing, we are now fetching
-# it directly to avoid blockers with virtualenv-20
-VENV_PV=16.7.12
-
-DESCRIPTION="The PyPA recommended tool for installing Python packages"
-HOMEPAGE="
-	https://pip.pypa.io/en/stable/
-	https://pypi.org/project/pip/
-	https://github.com/pypa/pip/
-"
-SRC_URI="
-	https://github.com/pypa/${PN}/archive/${PV}.tar.gz -> ${P}.gh.tar.gz
-	test? (
-		https://files.pythonhosted.org/packages/py3/s/setuptools/${SETUPTOOLS_WHL}
-		https://files.pythonhosted.org/packages/py2.py3/w/wheel/${WHEEL_WHL}
-		https://github.com/pypa/virtualenv/archive/${VENV_PV}.tar.gz
-			-> virtualenv-${VENV_PV}.gh.tar.gz
-	)
-"
-
-LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-SLOT="0"
-IUSE="vanilla"
-
-RDEPEND="
-	>=dev-python/setuptools-39.2.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	${RDEPEND}
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/freezegun[${PYTHON_USEDEP}]
-			dev-python/pretend[${PYTHON_USEDEP}]
-			dev-python/pytest-xdist[${PYTHON_USEDEP}]
-			dev-python/scripttest[${PYTHON_USEDEP}]
-			dev-python/tomli-w[${PYTHON_USEDEP}]
-			dev-python/werkzeug[${PYTHON_USEDEP}]
-			dev-python/wheel[${PYTHON_USEDEP}]
-			!alpha? ( !arm? ( !hppa? ( !ia64? ( !s390? ( !sparc? (
-				dev-python/cryptography[${PYTHON_USEDEP}]
-			) ) ) ) ) )
-		' "${PYTHON_TESTED[@]}")
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	local PATCHES=(
-		"${FILESDIR}/pip-21.3-no-coverage.patch"
-	)
-	if ! use vanilla; then
-		PATCHES+=( "${FILESDIR}/pip-20.0.2-disable-system-install.patch" )
-	fi
-
-	distutils-r1_python_prepare_all
-
-	if use test; then
-		mkdir tests/data/common_wheels/ || die
-		cp "${DISTDIR}"/{${SETUPTOOLS_WHL},${WHEEL_WHL}} \
-			tests/data/common_wheels/ || die
-	fi
-}
-
-python_compile_all() {
-	# 'pip completion' command embeds full $0 into completion script, which confuses
-	# 'complete' and causes QA warning when running as "${PYTHON} -m pip".
-	# This trick sets correct $0 while still calling just installed pip.
-	local pipcmd='import sys; sys.argv[0] = "pip"; __file__ = ""; from pip._internal.cli.main import main; sys.exit(main())'
-	"${EPYTHON}" -c "${pipcmd}" completion --bash > completion.bash || die
-	"${EPYTHON}" -c "${pipcmd}" completion --zsh > completion.zsh || die
-}
-
-python_test() {
-	if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then
-		einfo "Skipping tests on ${EPYTHON} since virtualenv-16 is broken"
-		return 0
-	fi
-
-	local EPYTEST_DESELECT=(
-		tests/functional/test_install.py::test_double_install_fail
-		tests/functional/test_list.py::test_multiple_exclude_and_normalization
-		# Internet
-		tests/functional/test_install.py::test_install_editable_with_prefix_setup_cfg
-		tests/functional/test_install.py::test_editable_install__local_dir_no_setup_py_with_pyproject
-		tests/functional/test_install.py::test_editable_install__local_dir_setup_requires_with_pyproject
-	)
-
-	if ! has_version "dev-python/cryptography[${PYTHON_USEDEP}]"; then
-		EPYTEST_DESELECT+=(
-			tests/functional/test_install.py::test_install_sends_client_cert
-			tests/functional/test_install_config.py::test_do_not_prompt_for_authentication
-			tests/functional/test_install_config.py::test_prompt_for_authentication
-			tests/functional/test_install_config.py::test_prompt_for_keyring_if_needed
-		)
-	fi
-
-	local -x GENTOO_PIP_TESTING=1
-	local -x PYTHONPATH="${WORKDIR}/virtualenv-${VENV_PV}"
-	local -x SETUPTOOLS_USE_DISTUTILS=stdlib
-	local -x PIP_DISABLE_PIP_VERSION_CHECK=1
-	epytest -m "not network" -n "$(makeopts_jobs)"
-}
-
-python_install_all() {
-	local DOCS=( AUTHORS.txt docs/html/**/*.rst )
-	distutils-r1_python_install_all
-
-	newbashcomp completion.bash pip
-
-	insinto /usr/share/zsh/site-functions
-	newins completion.zsh _pip
-}
diff --git a/dev-python/pip/pip-22.2-r1.ebuild b/dev-python/pip/pip-22.2-r1.ebuild
deleted file mode 100644
index 67d8b8ae610c..000000000000
--- a/dev-python/pip/pip-22.2-r1.ebuild
+++ /dev/null
@@ -1,134 +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_TESTED=( python3_{8..10} )
-PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" python3_11 pypy3 )
-PYTHON_REQ_USE="ssl(+),threads(+)"
-
-inherit bash-completion-r1 distutils-r1 multiprocessing
-
-# setuptools & wheel .whl files are required for testing,
-# the exact version is not very important.
-SETUPTOOLS_WHL="setuptools-62.3.2-py3-none-any.whl"
-WHEEL_WHL="wheel-0.36.2-py2.py3-none-any.whl"
-# upstream still requires virtualenv-16 for testing, we are now fetching
-# it directly to avoid blockers with virtualenv-20
-VENV_PV=16.7.12
-
-DESCRIPTION="The PyPA recommended tool for installing Python packages"
-HOMEPAGE="
-	https://pip.pypa.io/en/stable/
-	https://pypi.org/project/pip/
-	https://github.com/pypa/pip/
-"
-SRC_URI="
-	https://github.com/pypa/${PN}/archive/${PV}.tar.gz -> ${P}.gh.tar.gz
-	test? (
-		https://files.pythonhosted.org/packages/py3/s/setuptools/${SETUPTOOLS_WHL}
-		https://files.pythonhosted.org/packages/py2.py3/w/wheel/${WHEEL_WHL}
-		https://github.com/pypa/virtualenv/archive/${VENV_PV}.tar.gz
-			-> virtualenv-${VENV_PV}.gh.tar.gz
-	)
-"
-
-LICENSE="MIT"
-# bundled deps
-LICENSE+=" Apache-2.0 BSD BSD-2 ISC LGPL-2.1+ MPL-2.0 PSF-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-SLOT="0"
-IUSE="vanilla"
-
-RDEPEND="
-	>=dev-python/setuptools-39.2.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	${RDEPEND}
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/freezegun[${PYTHON_USEDEP}]
-			dev-python/pretend[${PYTHON_USEDEP}]
-			dev-python/pytest-xdist[${PYTHON_USEDEP}]
-			dev-python/scripttest[${PYTHON_USEDEP}]
-			dev-python/tomli-w[${PYTHON_USEDEP}]
-			dev-python/werkzeug[${PYTHON_USEDEP}]
-			dev-python/wheel[${PYTHON_USEDEP}]
-			!alpha? ( !arm? ( !hppa? ( !ia64? ( !s390? ( !sparc? (
-				dev-python/cryptography[${PYTHON_USEDEP}]
-			) ) ) ) ) )
-		' "${PYTHON_TESTED[@]}")
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	local PATCHES=(
-		"${FILESDIR}/pip-22.2-no-coverage.patch"
-	)
-	if ! use vanilla; then
-		PATCHES+=( "${FILESDIR}/pip-20.0.2-disable-system-install.patch" )
-	fi
-
-	distutils-r1_python_prepare_all
-
-	if use test; then
-		mkdir tests/data/common_wheels/ || die
-		cp "${DISTDIR}"/{${SETUPTOOLS_WHL},${WHEEL_WHL}} \
-			tests/data/common_wheels/ || die
-	fi
-}
-
-python_compile_all() {
-	# 'pip completion' command embeds full $0 into completion script, which confuses
-	# 'complete' and causes QA warning when running as "${PYTHON} -m pip".
-	# This trick sets correct $0 while still calling just installed pip.
-	local pipcmd='import sys; sys.argv[0] = "pip"; __file__ = ""; from pip._internal.cli.main import main; sys.exit(main())'
-	"${EPYTHON}" -c "${pipcmd}" completion --bash > completion.bash || die
-	"${EPYTHON}" -c "${pipcmd}" completion --zsh > completion.zsh || die
-}
-
-python_test() {
-	if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then
-		einfo "Skipping tests on ${EPYTHON} since virtualenv-16 is broken"
-		return 0
-	fi
-
-	local EPYTEST_DESELECT=(
-		tests/functional/test_inspect.py::test_inspect_basic
-		tests/functional/test_install.py::test_double_install_fail
-		tests/functional/test_list.py::test_multiple_exclude_and_normalization
-		# Internet
-		tests/functional/test_install.py::test_install_dry_run
-		tests/functional/test_install.py::test_install_editable_with_prefix_setup_cfg
-		tests/functional/test_install.py::test_editable_install__local_dir_no_setup_py_with_pyproject
-		tests/functional/test_install.py::test_editable_install__local_dir_setup_requires_with_pyproject
-	)
-
-	if ! has_version "dev-python/cryptography[${PYTHON_USEDEP}]"; then
-		EPYTEST_DESELECT+=(
-			tests/functional/test_install.py::test_install_sends_client_cert
-			tests/functional/test_install_config.py::test_do_not_prompt_for_authentication
-			tests/functional/test_install_config.py::test_prompt_for_authentication
-			tests/functional/test_install_config.py::test_prompt_for_keyring_if_needed
-		)
-	fi
-
-	local -x GENTOO_PIP_TESTING=1
-	local -x PYTHONPATH="${WORKDIR}/virtualenv-${VENV_PV}"
-	local -x SETUPTOOLS_USE_DISTUTILS=stdlib
-	local -x PIP_DISABLE_PIP_VERSION_CHECK=1
-	epytest -m "not network" -n "$(makeopts_jobs)"
-}
-
-python_install_all() {
-	local DOCS=( AUTHORS.txt docs/html/**/*.rst )
-	distutils-r1_python_install_all
-
-	newbashcomp completion.bash pip
-
-	insinto /usr/share/zsh/site-functions
-	newins completion.zsh _pip
-}
diff --git a/dev-python/pip/pip-22.2.1-r1.ebuild b/dev-python/pip/pip-22.2.1-r1.ebuild
deleted file mode 100644
index 8d3b6ef3e28e..000000000000
--- a/dev-python/pip/pip-22.2.1-r1.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# please bump dev-python/ensurepip-wheels along with this package!
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_TESTED=( python3_{8..10} )
-PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" python3_11 pypy3 )
-PYTHON_REQ_USE="ssl(+),threads(+)"
-
-inherit bash-completion-r1 distutils-r1 multiprocessing
-
-# setuptools & wheel .whl files are required for testing,
-# the exact version is not very important.
-SETUPTOOLS_WHL="setuptools-62.3.2-py3-none-any.whl"
-WHEEL_WHL="wheel-0.36.2-py2.py3-none-any.whl"
-# upstream still requires virtualenv-16 for testing, we are now fetching
-# it directly to avoid blockers with virtualenv-20
-VENV_PV=16.7.12
-
-DESCRIPTION="The PyPA recommended tool for installing Python packages"
-HOMEPAGE="
-	https://pip.pypa.io/en/stable/
-	https://pypi.org/project/pip/
-	https://github.com/pypa/pip/
-"
-SRC_URI="
-	https://github.com/pypa/${PN}/archive/${PV}.tar.gz -> ${P}.gh.tar.gz
-	test? (
-		https://files.pythonhosted.org/packages/py3/s/setuptools/${SETUPTOOLS_WHL}
-		https://files.pythonhosted.org/packages/py2.py3/w/wheel/${WHEEL_WHL}
-		https://github.com/pypa/virtualenv/archive/${VENV_PV}.tar.gz
-			-> virtualenv-${VENV_PV}.gh.tar.gz
-	)
-"
-
-LICENSE="MIT"
-# bundled deps
-LICENSE+=" Apache-2.0 BSD BSD-2 ISC LGPL-2.1+ MPL-2.0 PSF-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-SLOT="0"
-IUSE="vanilla"
-
-RDEPEND="
-	>=dev-python/setuptools-39.2.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	${RDEPEND}
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/freezegun[${PYTHON_USEDEP}]
-			dev-python/pretend[${PYTHON_USEDEP}]
-			dev-python/pytest-xdist[${PYTHON_USEDEP}]
-			dev-python/scripttest[${PYTHON_USEDEP}]
-			dev-python/tomli-w[${PYTHON_USEDEP}]
-			dev-python/werkzeug[${PYTHON_USEDEP}]
-			dev-python/wheel[${PYTHON_USEDEP}]
-			!alpha? ( !arm? ( !hppa? ( !ia64? ( !s390? ( !sparc? (
-				dev-python/cryptography[${PYTHON_USEDEP}]
-			) ) ) ) ) )
-		' "${PYTHON_TESTED[@]}")
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	local PATCHES=(
-		"${FILESDIR}/pip-22.2.1-no-coverage.patch"
-	)
-	if ! use vanilla; then
-		PATCHES+=( "${FILESDIR}/pip-20.0.2-disable-system-install.patch" )
-	fi
-
-	distutils-r1_python_prepare_all
-
-	if use test; then
-		mkdir tests/data/common_wheels/ || die
-		cp "${DISTDIR}"/{${SETUPTOOLS_WHL},${WHEEL_WHL}} \
-			tests/data/common_wheels/ || die
-	fi
-}
-
-python_compile_all() {
-	# 'pip completion' command embeds full $0 into completion script, which confuses
-	# 'complete' and causes QA warning when running as "${PYTHON} -m pip".
-	# This trick sets correct $0 while still calling just installed pip.
-	local pipcmd='import sys; sys.argv[0] = "pip"; __file__ = ""; from pip._internal.cli.main import main; sys.exit(main())'
-	"${EPYTHON}" -c "${pipcmd}" completion --bash > completion.bash || die
-	"${EPYTHON}" -c "${pipcmd}" completion --zsh > completion.zsh || die
-}
-
-python_test() {
-	if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then
-		einfo "Skipping tests on ${EPYTHON} since virtualenv-16 is broken"
-		return 0
-	fi
-
-	local EPYTEST_DESELECT=(
-		tests/functional/test_inspect.py::test_inspect_basic
-		tests/functional/test_install.py::test_double_install_fail
-		tests/functional/test_list.py::test_multiple_exclude_and_normalization
-		# Internet
-		tests/functional/test_install.py::test_install_dry_run
-		tests/functional/test_install.py::test_install_editable_with_prefix_setup_cfg
-		tests/functional/test_install.py::test_editable_install__local_dir_no_setup_py_with_pyproject
-		tests/functional/test_install.py::test_editable_install__local_dir_setup_requires_with_pyproject
-	)
-
-	if ! has_version "dev-python/cryptography[${PYTHON_USEDEP}]"; then
-		EPYTEST_DESELECT+=(
-			tests/functional/test_install.py::test_install_sends_client_cert
-			tests/functional/test_install_config.py::test_do_not_prompt_for_authentication
-			tests/functional/test_install_config.py::test_prompt_for_authentication
-			tests/functional/test_install_config.py::test_prompt_for_keyring_if_needed
-		)
-	fi
-
-	local -x GENTOO_PIP_TESTING=1
-	local -x PYTHONPATH="${WORKDIR}/virtualenv-${VENV_PV}"
-	local -x SETUPTOOLS_USE_DISTUTILS=stdlib
-	local -x PIP_DISABLE_PIP_VERSION_CHECK=1
-	epytest -m "not network" -n "$(makeopts_jobs)"
-}
-
-python_install_all() {
-	local DOCS=( AUTHORS.txt docs/html/**/*.rst )
-	distutils-r1_python_install_all
-
-	newbashcomp completion.bash pip
-
-	insinto /usr/share/zsh/site-functions
-	newins completion.zsh _pip
-}
diff --git a/dev-python/pip/pip-22.2.2.ebuild b/dev-python/pip/pip-22.2.2.ebuild
index 8d3b6ef3e28e..1cfe45d40d06 100644
--- a/dev-python/pip/pip-22.2.2.ebuild
+++ b/dev-python/pip/pip-22.2.2.ebuild
@@ -39,7 +39,7 @@ SRC_URI="
 LICENSE="MIT"
 # bundled deps
 LICENSE+=" Apache-2.0 BSD BSD-2 ISC LGPL-2.1+ MPL-2.0 PSF-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 SLOT="0"
 IUSE="vanilla"
 
diff --git a/dev-python/pyflakes/Manifest b/dev-python/pyflakes/Manifest
index 7e75d915e3e3..87ea0d0de3bf 100644
--- a/dev-python/pyflakes/Manifest
+++ b/dev-python/pyflakes/Manifest
@@ -1,5 +1,5 @@
 DIST pyflakes-2.4.0.tar.gz 69101 BLAKE2B 852e50f3545138947761f9a8413fd6463bb9a28977c008feb1c3a81afb3854501b8fd3c05840d9d75bc6ebf505b545e62c047b87780b0bc764fd4225ea6a1e21 SHA512 f4c6512eb811511c897623f52c4f88e50275a3292582d7dd34462e90e39fecce939818cb92e750eebdd66eab25b91c23540104fc4530c42621d7cfeb1d33c577
 DIST pyflakes-2.5.0.tar.gz 66388 BLAKE2B 2511700c208a2eabe8f71597b2fa0bd69b6a1fb9fc1428fbb21ab7fad801bb3ad38f72f9a0c98f654828cc2f183a75c1c208e554c876bf77fe91c9c88b93e25e SHA512 e47303c4b445e0c010dfc96244b6fa991bd1870072c61cc7acd309947af3d81581276b012b56b7db0d8df3f91a4216a5ec502720c149f5707d5d1d28654aeeb4
 EBUILD pyflakes-2.4.0-r1.ebuild 646 BLAKE2B 2e0ee3052b051da22d04063d5e4dc1d447c3b7aaf216e621a92f2ebb299921140bdc0fc4340c9239a704d92b283aa4a4cc6a6c9e83864c3d10635685471fb739 SHA512 7b6ff841ee877cc5c294e8aec54fff885ebec6253ee479b998057b13a678063fa09125a2e1f84a141df0f8d09ed2cfabe44ef770ad2fd035a4104cac6681901f
-EBUILD pyflakes-2.5.0.ebuild 654 BLAKE2B 602cd444cf16a769b48b36ba5259743291400c601db9c1899c105eca68aebf193892916194d8a8d73d974349387967339397775485f5701ddff571c243c781aa SHA512 528ea96b18f0461d636a86d67cbee7fe847f95f986c74044adcbdb0b734cf0a4a7298cf7e63ea5803903fba56048d7678133b033aad2cec7d2afbdc6c21eea78
+EBUILD pyflakes-2.5.0.ebuild 646 BLAKE2B bf195d66989eeaa10865c6874ec80a409e819f34506b623c13ee9a96e366589fa19854c27b22b147f787302aa4cbd47128eab319dbc505fb15e38d29067ff41b SHA512 afc8d7df411d73469e9731c13320d45740849a66dff787f3e2ffb4047c3e704e5645ef86c82d4d9c5c77808610701f5e53b1348fc378d4dd923fd9c4f8256394
 MISC metadata.xml 763 BLAKE2B e15bc4240e0cc54bd0d7ecca523bcc43c5ae6ebd4f195815f7b2c3494e0366f1cc6feadbc63fce82390ed414e8f52a7bdf15f5c56909ab39879814ff1b178558 SHA512 bb8e0b6f746c99e5185a8bca736f0af36068ae0de45d1bde9663f0e732770366ac20f2116ddd9d7a85239146cf5d7b8fbbfc5c225d7bca4650001f86468a0142
diff --git a/dev-python/pyflakes/pyflakes-2.5.0.ebuild b/dev-python/pyflakes/pyflakes-2.5.0.ebuild
index 6c7451e4c1f0..a2b67fbebe46 100644
--- a/dev-python/pyflakes/pyflakes-2.5.0.ebuild
+++ b/dev-python/pyflakes/pyflakes-2.5.0.ebuild
@@ -17,6 +17,6 @@ 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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 distutils_enable_tests unittest
diff --git a/dev-python/pykerberos/Manifest b/dev-python/pykerberos/Manifest
index 67b9ad90f625..4b3cc145a365 100644
--- a/dev-python/pykerberos/Manifest
+++ b/dev-python/pykerberos/Manifest
@@ -1,3 +1,5 @@
+AUX pykerberos-1.3.1-python3.10.patch 1099 BLAKE2B afe1d4639bd3773f075453a4549c270450a5c89671b650e9ee76219abec84b6c1dd2fcc1b2b77db6937d5303f89e562deda1405a3963221259bec3ce506def5f SHA512 dae8c3f6419ecc22ec9f3385053275bd13f9468721c1a419c9166153e49251d5499582f184f2dbaa7a194a591436229d9bcbe558cedf46237dc5cc15929faa05
 DIST PyKerberos-1.3.1.tar.gz 41954 BLAKE2B b95a3473c5803ebcb461db7f2589caa03e92f4cb3ba3a4890a31db99b687aa4c77ae4e58f09ae2339a1fd8acf6fe9ab5797e3b7178dfeb2ee7a95bb851fff402 SHA512 dcadc5c3b095d8bba947a745ac84cc558d7eebad139a0e86260891966786506a7a62600fde93fa14683971e436da8cc5cd3795817b20ba45ce7e39f8c05deb53
+EBUILD pykerberos-1.3.1-r1.ebuild 1343 BLAKE2B 27d679f15b188de4f215fec035d05f541928a18305ff9494a256a22bf8d2f1970ef87df5fb7700a487ba08f069ef125893fb6fe3f55a37ba75ce6fdf505d5cbf SHA512 6a9a973a59c3ef9b04f29f1847b52a71a7ff9b15a726195a283377cd6007244a0e418fb9a404c1cd978e1ccaea2b608db034d97779919bd63096276713178a33
 EBUILD pykerberos-1.3.1.ebuild 1283 BLAKE2B 19ecf428a0c437ddd2fb5786cc67913c884625be7c9eb220a6a40ec03a503f4cc2dd62e8940a644a99da808512bc1444da38b65bb109bdeeee48601ce689cb90 SHA512 9fa37d66f2c00937a1b23aa675d4faf15c65cb3dbb36e9821965140f65d257bc8d0ad866d1333050f6f9bba8712d301471046765da61dcadaa1e0bf43e696d8b
 MISC metadata.xml 372 BLAKE2B c666d6e6558e8c2ef8ec75b2125883e113dda896f01a9129c4e1fc0508946ad5a9e94f06cfd9deed11636779f1476c2e652dc445b6d8c3309056f6867d044eff SHA512 3db0bcddfd8d31b06fec3d1e3384b991a1018a5e491a61491aec3c3d3017d56c761f6078d12a533f8ad7c4094896be60e942f8e90409526eab40c1596f0a1aa1
diff --git a/dev-python/pykerberos/files/pykerberos-1.3.1-python3.10.patch b/dev-python/pykerberos/files/pykerberos-1.3.1-python3.10.patch
new file mode 100644
index 000000000000..7e760187de56
--- /dev/null
+++ b/dev-python/pykerberos/files/pykerberos-1.3.1-python3.10.patch
@@ -0,0 +1,33 @@
+https://bugs.gentoo.org/867421
+https://github.com/apple/ccs-pykerberos/pull/89
+
+From 1e1666af51bb11ea5c6dd442415ce765073737c3 Mon Sep 17 00:00:00 2001
+From: stevenpackardblp <77253966+stevenpackardblp@users.noreply.github.com>
+Date: Sun, 24 Oct 2021 23:03:41 -0400
+Subject: [PATCH] Use Py_ssize_t type
+
+Python 3.10 requires that the `Py_ssize_t` type is used for string lengths instead of `int`.
+--- a/src/kerberos.c
++++ b/src/kerberos.c
+@@ -14,6 +14,7 @@
+  * limitations under the License.
+  **/
+ 
++#define PY_SSIZE_T_CLEAN
+ #include <Python.h>
+ 
+ #include "kerberosbasic.h"
+@@ -244,9 +245,9 @@ static PyObject *channelBindings(PyObject *self, PyObject *args, PyObject* keywd
+     char *initiator_address = NULL;
+     char *acceptor_address = NULL;
+     char *application_data = NULL;
+-    int initiator_length = 0;
+-    int acceptor_length = 0;
+-    int application_length = 0;
++    Py_ssize_t initiator_length = 0;
++    Py_ssize_t acceptor_length = 0;
++    Py_ssize_t application_length = 0;
+ 
+     PyObject *pychan_bindings = NULL;
+     struct gss_channel_bindings_struct *input_chan_bindings;
+
diff --git a/dev-python/pykerberos/pykerberos-1.3.1-r1.ebuild b/dev-python/pykerberos/pykerberos-1.3.1-r1.ebuild
new file mode 100644
index 000000000000..cc46bbefeab8
--- /dev/null
+++ b/dev-python/pykerberos/pykerberos-1.3.1-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+MY_P=PyKerberos-${PV}
+DESCRIPTION="A high-level Python wrapper for Kerberos/GSSAPI operations"
+HOMEPAGE="
+	https://www.calendarserver.org/PyKerberos.html
+	https://github.com/apple/ccs-pykerberos/
+	https://pypi.org/project/kerberos/"
+SRC_URI="
+	https://github.com/apple/ccs-pykerberos/archive/${MY_P}.tar.gz"
+S=${WORKDIR}/ccs-pykerberos-${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~riscv ~x86"
+# test environment is non-trivial to set up, so just use docker
+# (see python_test below)
+# also for alpha/beta Python releases support:
+# https://github.com/apple/ccs-pykerberos/pull/83/commits/5f1130a1305b5f6e7d7d8b41067c4713f0c8950f
+RESTRICT="test"
+
+RDEPEND="app-crypt/mit-krb5"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.3.1-python3.10.patch
+)
+
+python_test() {
+	set -- docker run \
+		-v "${PWD}:/app" \
+		-w /app \
+		-e PYENV=$("${EPYTHON}" -c 'import sys; print(sys.version.split()[0])') \
+		-e KERBEROS_USERNAME=administrator \
+		-e KERBEROS_PASSWORD=Password01 \
+		-e KERBEROS_REALM=example.com \
+		-e KERBEROS_PORT=80 \
+		ubuntu:16.04 \
+		/bin/bash .travis.sh
+	echo "${@}" >&2
+	"${@}" || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/pykwalify/Manifest b/dev-python/pykwalify/Manifest
index 2cdeac8f16c9..20296ea2b77d 100644
--- a/dev-python/pykwalify/Manifest
+++ b/dev-python/pykwalify/Manifest
@@ -1,5 +1,4 @@
 AUX pykwalify-1.4.0-S.patch 862 BLAKE2B d92c4e8d4d85d28f6df574bfe2f1ab0aa82c32ba8ce2b4a2d6ecdc21fe1db4056351b6aa6dde04d897525ce596ed492781bd7dcf0fba2ca5970a3af79a9abf3b SHA512 f7d9189993cd73a0412ef01fcb01a99fcbc61edc6863a1997333de085294b9c5772d026f7ab8f16703568404f2ff76bb1aeed760d7908c7865e0891ad5752dc9
 DIST pykwalify-1.8.0.tar.gz 62462 BLAKE2B 1593f5e3e15188929574ece60bf6818438258bf024d105ae26323a97a202ac69001a15ca6daaa430970af3659c49da745bcf1f77c23ac72bed2ddca14440d943 SHA512 c77d3072995bb3f61336e725227eeece1dafe2182513e5f67eedeeca3437825b53ac691a991055aad8298db252e2012bc9a61c23d766335fcfbb10a3b587b45d
-EBUILD pykwalify-1.8.0-r1.ebuild 764 BLAKE2B 6f0e97da5005b02d032e3e78c5a15ca720ba4309e2137b7685c198ea1d99cfb7343548a0228e3a3a0c63b8118ad25bc0bf516de4af21fffec4b0bfad78ff5aba SHA512 9598368b799f0a977b69210c43f72e487c8eb9226e45d1ee13a51c8533c2acdd3ec2a6b31152b7a1e24716f691aa31f7b09b8504663ce9d055762d2faf0bd6dd
-EBUILD pykwalify-1.8.0-r2.ebuild 799 BLAKE2B eafef580274fca4ad19053d65840f786f99f26a4fe465bd78fa39a873794b622e2813e75a20d7fca2983b96d3cef3d438cda4fa5b75bc65ea73dc54ead6d2342 SHA512 fe7d3ab7eb99d2527947cae7ab75a37cf6bba2801ade17c7d3e1002cb2efad0795763bc2bd52d1b8fdb4f8a2b2d4a5e80af5d0ad0cb8688bcaf16773590c7881
+EBUILD pykwalify-1.8.0-r2.ebuild 797 BLAKE2B 2ebf9eb9f7427e1050c110e7bd3c7d9a91358b5cc13a01c36bdc7bf40064e5fbe911215892e4c82a5d8922a849fc8aa4d9ecc45978821066765dfb0161874a17 SHA512 51b38900d9848a01e8de7d67ba15a9656b30578e2089cd1d73dfa0ccd90c93cb885a5496649d1c125139005112177ced9ede305f1433b86f8167e4d2f9a8e3eb
 MISC metadata.xml 394 BLAKE2B e7262ef0692f68f8fd8c2d8b45cc7a18efc5c2759a7998d3c065f17450d2f4de09d4432961c7327f68fbd52cd61a9183122f19fc829a9c93a6a40b36ac3d9952 SHA512 0d96c9c00d4cd4a64afd790df32cc1536afaeb952d6172a7c3efd227c9686c7fe743e30f94c218e73ef5911c59b23aa40a9e5f19ded5474987d79e7337fcc6b1
diff --git a/dev-python/pykwalify/pykwalify-1.8.0-r1.ebuild b/dev-python/pykwalify/pykwalify-1.8.0-r1.ebuild
deleted file mode 100644
index ceda616a7cf4..000000000000
--- a/dev-python/pykwalify/pykwalify-1.8.0-r1.ebuild
+++ /dev/null
@@ -1,33 +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="Python lib/cli for JSON/YAML schema validation"
-HOMEPAGE="https://pypi.org/project/pykwalify/ https://github.com/Grokzen/pykwalify"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/docopt-0.6.2[${PYTHON_USEDEP}]
-	>=dev-python/ruamel-yaml-0.16.0[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.8.0[${PYTHON_USEDEP}]
-"
-DEPEND="
-	test? (
-		dev-python/testfixtures[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.4.0-S.patch
-)
diff --git a/dev-python/pykwalify/pykwalify-1.8.0-r2.ebuild b/dev-python/pykwalify/pykwalify-1.8.0-r2.ebuild
index f03443ce87ad..39a0d9e9e697 100644
--- a/dev-python/pykwalify/pykwalify-1.8.0-r2.ebuild
+++ b/dev-python/pykwalify/pykwalify-1.8.0-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/docopt-0.6.2[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-httpserver/Manifest b/dev-python/pytest-httpserver/Manifest
index b775481987fc..5bf5a939f95f 100644
--- a/dev-python/pytest-httpserver/Manifest
+++ b/dev-python/pytest-httpserver/Manifest
@@ -1,5 +1,3 @@
-DIST pytest-httpserver-1.0.4.gh.tar.gz 78911 BLAKE2B 425f72438797b55a84662f580dd9bfc1d6dd8a0513587e72b6e1de7e669eee75c777fdd6c2cfcbc92273737dd47568b48a22f12e8a40952f82a599f30705a604 SHA512 e80754910117736fd172d7bd5e5fc41721fab8adc705b72f0ee4cd866c878ed267ad3819645fd567e3af2c9e53deecb3749f1a873d72ff9e234c4fdd7f7cabea
 DIST pytest-httpserver-1.0.5.gh.tar.gz 80395 BLAKE2B 68c075032c57f25854d390f73bf61b7efbe18f78d7f0b2a2a3be10d586ca9cc3ce4a1b390a2ba0da1e88558513782388069c419dae4908a0581e8d583f452bee SHA512 8275475bb044d54769e906571520fafbb9f6fa32fc003f4a00f72b9ff9930e4b80ee84564df1521569cc2a15f5d371c6315129263bc167d0621141004d509a25
-EBUILD pytest-httpserver-1.0.4-r2.ebuild 776 BLAKE2B 47322761db09937087458097a27ce0c1aa4eba77cd8b013d9e089c3f6ac548063d17f81b975c244b8a7386f89ec9a1339e426541b7c9fdb512372621cdc98d5c SHA512 0b4c28de701285c4084a54aefa43c44c45fc8f51607469f8fa1145e79dc9f338660388b743af251ce6f0e4d3ff4c0e217c9cc784ce4439a16c4fc9b4c4bd970a
-EBUILD pytest-httpserver-1.0.5.ebuild 773 BLAKE2B dc67bc66e43bf96032ba707467ccf5cc1d6b4887635086dc82fdae5590c7977d7670e89d44b592b48e4d732e4ab60782eeb5fac7132a595f265cca61ad0b1267 SHA512 ce78bb8f6e74b6f8e62db9a70176dafd46595e6719de79434700c4add3be6a7b3fc3385fe85553335af9cd362c97698d7aa5278099725e96408988b48bc8b22f
+EBUILD pytest-httpserver-1.0.5.ebuild 771 BLAKE2B 28e023ec39114a662c965a349ce49497c3d5728ed7135acdfcfc7ea4374ef273670d83ad46a94e4bb61d70d8eb121d2b8b7b8d3c6486c9e192f87f6d90b29c2e SHA512 d56a4522d74cc97f7521b59fb4e291ff987538582d00c7b96a9d0352416ab6bc483fcfb8552fde5e72542ff70bf97594ca8f46e617c5ee195d6d6c3eace898b3
 MISC metadata.xml 411 BLAKE2B f74c6327167acc706faa9d9e60e2f964e476f33cf33b525287850dcd46e1fd35d6a770d495c929b36bc288c6e2a08d32077bd5265c522598477bb61c4abdd367 SHA512 a536367a8872d3d722f7671d6824d05d1912e9ba53a25ade91bab5cfa4dca3cb2e3f669c7a70416c68a200f1272c5709509b37133886f0d64816b096918fb4f0
diff --git a/dev-python/pytest-httpserver/pytest-httpserver-1.0.4-r2.ebuild b/dev-python/pytest-httpserver/pytest-httpserver-1.0.4-r2.ebuild
deleted file mode 100644
index c978183c74f7..000000000000
--- a/dev-python/pytest-httpserver/pytest-httpserver-1.0.4-r2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{8..11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="HTTP server for pytest to test HTTP clients"
-HOMEPAGE="https://github.com/csernazs/pytest-httpserver"
-SRC_URI="https://github.com/csernazs/pytest-httpserver/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="dev-python/werkzeug[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/requests[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	sed -i -e '/^include = \[/,/\]/d' pyproject.toml || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	epytest -p no:localserver
-}
diff --git a/dev-python/pytest-httpserver/pytest-httpserver-1.0.5.ebuild b/dev-python/pytest-httpserver/pytest-httpserver-1.0.5.ebuild
index 38988531c5f2..434d89778a4f 100644
--- a/dev-python/pytest-httpserver/pytest-httpserver-1.0.5.ebuild
+++ b/dev-python/pytest-httpserver/pytest-httpserver-1.0.5.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="dev-python/werkzeug[${PYTHON_USEDEP}]"
 BDEPEND="
diff --git a/dev-python/pytest-shell-utilities/Manifest b/dev-python/pytest-shell-utilities/Manifest
index e25c449f6613..fbc27147c4fb 100644
--- a/dev-python/pytest-shell-utilities/Manifest
+++ b/dev-python/pytest-shell-utilities/Manifest
@@ -1,5 +1,3 @@
-DIST pytest-shell-utilities-1.5.0.gh.tar.gz 92287 BLAKE2B 015f78838eaff93438cbd7cd395926ac8f61653f6d27275ca87b379e5f27d60165157880e41e603823c17e639dcff91ac4f5fda1e904ad505bb9db0a577b800c SHA512 00cb5fa6979e09c90ba82928a135f644dd4056fd004f6bee8d216ca63e2cf4549f944930bf16e7a124f26a79c1b696d18ecf210bee3273343b9a90f9126f340e
 DIST pytest-shell-utilities-1.6.0.gh.tar.gz 92343 BLAKE2B 39239aff1d7d4970a706926ea9f4c7808f8c12760d8f1ccaff760d8320024bba7373a25bb2ad8db2e0a6fee1f8ef4dd5b85b4e7eb1fb6e2aab64711686acf25e SHA512 e979f5bbf34de99c1dac33b4cb27265a210852d39792cd7660b717e43de0baaf47785d57ade226f08de43ef9d83600b4e46f70ceed341c7fccde554f7a838b8e
-EBUILD pytest-shell-utilities-1.5.0.ebuild 1059 BLAKE2B f952a1730a3315233009193fb9a1d480bf5067a0d6b1a65facd6e2abb936486a8f4e756d828e7c90543a2ef6481e039e960f32d8c545f0ddf83e69d8c152e77a SHA512 3839b6e62221d30f0386d2b70c87d61c1f21865b0236195e653230b11ba47f97624376d7b64f0b8b2ae5c6ade347a7f71015e9e11a3bd9d417d0a62e4ee0bd05
-EBUILD pytest-shell-utilities-1.6.0.ebuild 1061 BLAKE2B c68a5f83c1e58dd6f621b3c9e6b785aba71dfb1a1a4305183434b3a568577ddfd1012be6d7ce2e3a483e1b523eadd8c07ee60e12731adcddf72b875d4de13508 SHA512 bc28ee81b3da0beff6baf0c4d7e6f6619c571267a0b2d1ba057e5ddc769a4a921683444f9b5678ff863a04a7fce3a8a0a2ee970ff94472fc3b2364b84ea023f1
+EBUILD pytest-shell-utilities-1.6.0.ebuild 1059 BLAKE2B 3773f293ae220cb02022b176a9b8ecb40db0882a24a83dafc3bb20127b9bee34d51ab852bec57a95dc0dee7cf535b5eca86627b3893a8cc6257040b434180180 SHA512 0d4156a4b0617307a36e8c03f298f1103f6298cf3db4cad2a3417825fb6c92cd6e1f52bce7d4cf9c19fe5ccdbeb0d4a4aa82b849a491559b777f148717216d30
 MISC metadata.xml 436 BLAKE2B 8cb927224ae6ac36a59818b60f8b4ef4a8d1cc4ca284934f50fbcc957ac25a417307c533d6d3728f38e98977ace3cdb106b9b62abe10a9b843a42ecdb30c97e4 SHA512 505a9f97a74581b9c7f59862186db14ab2f543cadbd05424e32541f31ff0c88295b4ed0b6dfbfa53dec1208d16275fcf99cc72c6a51c95e7f07e5392804a09cd
diff --git a/dev-python/pytest-shell-utilities/pytest-shell-utilities-1.5.0.ebuild b/dev-python/pytest-shell-utilities/pytest-shell-utilities-1.5.0.ebuild
deleted file mode 100644
index 8baa0cbc0b49..000000000000
--- a/dev-python/pytest-shell-utilities/pytest-shell-utilities-1.5.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="pytest plugin: fixtures and code to help with running shell commands on tests"
-HOMEPAGE="
-	https://pypi.org/project/pytest-shell-utilities/
-	https://github.com/saltstack/pytest-shell-utilities/
-"
-SRC_URI="
-	https://github.com/saltstack/pytest-shell-utilities/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/pytest-6.0.0[${PYTHON_USEDEP}]
-	dev-python/attrs[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	dev-python/typing-extensions[${PYTHON_USEDEP}]
-	dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}]
-	dev-python/pytest-skip-markers[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-subtests[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/pytest-shell-utilities/pytest-shell-utilities-1.6.0.ebuild b/dev-python/pytest-shell-utilities/pytest-shell-utilities-1.6.0.ebuild
index 84d66d2dc910..da59796fdb8c 100644
--- a/dev-python/pytest-shell-utilities/pytest-shell-utilities-1.6.0.ebuild
+++ b/dev-python/pytest-shell-utilities/pytest-shell-utilities-1.6.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/pytest-6.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/python-nbxmpp/Manifest b/dev-python/python-nbxmpp/Manifest
index f6bcf1b5ca48..ffebd69b363e 100644
--- a/dev-python/python-nbxmpp/Manifest
+++ b/dev-python/python-nbxmpp/Manifest
@@ -1,11 +1,7 @@
-DIST python-nbxmpp-3.1.0.tar.bz2 128551 BLAKE2B bbff0bd92b12addb73e661136531df7629baa7936a1d52a86a17b59047681d30744dbc3618143a0b4ff5460bb64ad01a70b1bfb018f32bd78cfd9dc848f18668 SHA512 6676da4a21915305952118b9d35d91f3b420a23f1f3bc1fa22ee885face3f9b4474417f58e4a2c6446fec48ff632822ab83343e104df480d33d75f1b46cf8fec
 DIST python-nbxmpp-3.1.1.tar.bz2 128913 BLAKE2B 938701b95d3b41638d2e9173d52ce69737bc7160b1113bbbb54e958ee0269a2d209d146a67c7caaf8f4e7aa394549360ecb3ad4c3a1a731b329b10cbc9654109 SHA512 9571d890112da8380d55894e52279bfb002151432d6c8103ce62f5ab08b198f847c50cb2c1c4a7502cbefff8c3c77cbb0e86ca24355af86136b0caceb0d75c0f
-DIST python-nbxmpp-3.2.0.tar.bz2 129023 BLAKE2B e61cfba5f88511981e1df768d594bc86c576ef1f4b7f88d0d49bb4b86adbcf36bb7821a2332cb2427007dc10134390a24e02b6cbd791331d93cf1f48c5fe8d7b SHA512 6eae6de22829c669ca17b2eaa68f53e161374d491b2f5bf7626ccdd966b0c857388852ff4c08f3d9d7391735b9633a832c7570e332f29dd038485de998d19f54
 DIST python-nbxmpp-3.2.1.tar.bz2 129362 BLAKE2B bbbeb5751fc5751cffe73c9a54c3330de9a1b48041c7a7964cefdfedbf8ae2966c8f5adaa7153386eebea44568af38ec1964d612b8baf48d6f318c83705e18d8 SHA512 3ebe1169475fcd65875cb2e6079f802a7f98717957e26e7dfcab5a71b1f94e967145a430f6d959a01b39842317d858c3b6275bcd909bf65f70699536e298b6e4
 DIST python-nbxmpp-nbxmpp-2.0.6.tar.bz2 122203 BLAKE2B 925604002f4363f1e0b72f05c13742f4652ba565a9faa48faf8d47688f480a7f1d7585c593b0dcf07bded8c4aa3a1d02e9697742a07b9e815daec062dfb93104 SHA512 a536b25c8a6298892a51adef4b64b75ffab88ce02fb08fc07ecd1cfe2bc794262d4d58a93248439723e6e0544485da7351bb98189b0e422a1f77b01c6f6d238e
 EBUILD python-nbxmpp-2.0.6.ebuild 771 BLAKE2B d26169a1d21a1d512f27711653642514b64c644f6dc786d5b701e1651df0e3e3ccae11a25ab77641a8ea6244df6ed3f9bb28cd0224018859171d6a5aded3ad73 SHA512 df49ab8432177b1c35b72b8015a9f7f5184a8cca6172271c840f4c4c15a937d463946a16ce863787a2050e14b5e54ab81c2738565e002e9d9dc11c5eeeade72b
-EBUILD python-nbxmpp-3.1.0.ebuild 745 BLAKE2B fb76ccda9625fcfedcda1be5f950ed12b0bde5901fb7989b25055c1cf08e738b52473eb972d2b336230b08c2d013b0b7fd012daff7851517be5ee77f4c2b70dc SHA512 262c7f37244669ef510b105db6034712673d5234ce3cbf9faef7c2786c41e07f31c84d3c301447c77dea6eef82c903f4ce260e61ce7790992426c62462af7fd6
-EBUILD python-nbxmpp-3.1.1.ebuild 747 BLAKE2B 6ccf123262480eefb28bc977c298400bd530322ac9f078d1ccd0b774b5e2601efe1d5d883ce13af849528ab0ad33ee5c9593fa28c9d426caee25a9c8afce5e69 SHA512 b7b830733f566e9297804782c9d1d50a9641e6ff7ccac0e1ded9b3812b9e8e164ab580fb3978b3744520247888868e1bea6839b85b3994c2a9b8f4f57c0695a3
-EBUILD python-nbxmpp-3.2.0.ebuild 747 BLAKE2B 6ccf123262480eefb28bc977c298400bd530322ac9f078d1ccd0b774b5e2601efe1d5d883ce13af849528ab0ad33ee5c9593fa28c9d426caee25a9c8afce5e69 SHA512 b7b830733f566e9297804782c9d1d50a9641e6ff7ccac0e1ded9b3812b9e8e164ab580fb3978b3744520247888868e1bea6839b85b3994c2a9b8f4f57c0695a3
+EBUILD python-nbxmpp-3.1.1.ebuild 745 BLAKE2B fb76ccda9625fcfedcda1be5f950ed12b0bde5901fb7989b25055c1cf08e738b52473eb972d2b336230b08c2d013b0b7fd012daff7851517be5ee77f4c2b70dc SHA512 262c7f37244669ef510b105db6034712673d5234ce3cbf9faef7c2786c41e07f31c84d3c301447c77dea6eef82c903f4ce260e61ce7790992426c62462af7fd6
 EBUILD python-nbxmpp-3.2.1.ebuild 747 BLAKE2B 6ccf123262480eefb28bc977c298400bd530322ac9f078d1ccd0b774b5e2601efe1d5d883ce13af849528ab0ad33ee5c9593fa28c9d426caee25a9c8afce5e69 SHA512 b7b830733f566e9297804782c9d1d50a9641e6ff7ccac0e1ded9b3812b9e8e164ab580fb3978b3744520247888868e1bea6839b85b3994c2a9b8f4f57c0695a3
 MISC metadata.xml 426 BLAKE2B 2772501445c7b3f8db801d5d6c52c6004cc6c67527b30cfcd5f48b54c3e483f1ace9307632f0da179cc4462e3ffde741b66af38c76e248004ff7238a591a15bf SHA512 0f456e67e255e045d97f969ed16c7e304d07a6b9a60d938dded30e78235a2ef984f5883c08f655e14084a8d76f54cd578c3d1eb387f0cc4d8502a5188dac987d
diff --git a/dev-python/python-nbxmpp/python-nbxmpp-3.1.0.ebuild b/dev-python/python-nbxmpp/python-nbxmpp-3.1.0.ebuild
deleted file mode 100644
index fafffe2d9512..000000000000
--- a/dev-python/python-nbxmpp/python-nbxmpp-3.1.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library to use Jabber/XMPP networks in a non-blocking way"
-HOMEPAGE="
-	https://dev.gajim.org/gajim/python-nbxmpp/
-	https://pypi.org/project/nbxmpp/
-"
-SRC_URI="
-	https://dev.gajim.org/gajim/python-nbxmpp/-/archive/${PV}/${P}.tar.bz2
-"
-
-SLOT="0"
-LICENSE="GPL-3"
-KEYWORDS="amd64 ~arm64 ~riscv x86"
-
-RDEPEND="
-	dev-libs/gobject-introspection
-	net-libs/libsoup[introspection]
-	dev-python/idna[${PYTHON_USEDEP}]
-	dev-python/precis-i18n[${PYTHON_USEDEP}]
-	dev-python/pygobject[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests unittest
diff --git a/dev-python/python-nbxmpp/python-nbxmpp-3.1.1.ebuild b/dev-python/python-nbxmpp/python-nbxmpp-3.1.1.ebuild
index 20ab63a80429..fafffe2d9512 100644
--- a/dev-python/python-nbxmpp/python-nbxmpp-3.1.1.ebuild
+++ b/dev-python/python-nbxmpp/python-nbxmpp-3.1.1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 SLOT="0"
 LICENSE="GPL-3"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~riscv x86"
 
 RDEPEND="
 	dev-libs/gobject-introspection
diff --git a/dev-python/python-nbxmpp/python-nbxmpp-3.2.0.ebuild b/dev-python/python-nbxmpp/python-nbxmpp-3.2.0.ebuild
deleted file mode 100644
index 20ab63a80429..000000000000
--- a/dev-python/python-nbxmpp/python-nbxmpp-3.2.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library to use Jabber/XMPP networks in a non-blocking way"
-HOMEPAGE="
-	https://dev.gajim.org/gajim/python-nbxmpp/
-	https://pypi.org/project/nbxmpp/
-"
-SRC_URI="
-	https://dev.gajim.org/gajim/python-nbxmpp/-/archive/${PV}/${P}.tar.bz2
-"
-
-SLOT="0"
-LICENSE="GPL-3"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-
-RDEPEND="
-	dev-libs/gobject-introspection
-	net-libs/libsoup[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/rdflib/Manifest b/dev-python/rdflib/Manifest
index 6406e259ba43..2bcdd64bf54d 100644
--- a/dev-python/rdflib/Manifest
+++ b/dev-python/rdflib/Manifest
@@ -1,5 +1,3 @@
-DIST rdflib-6.1.1.tar.gz 1587670 BLAKE2B f13831124a8f292f0481f5ee9995b6b7ba82992cbe51abb0067703b2acee9f13ce5a62379636ac9f36823afa5b841799c1f26358efb6c12eca2df333611d5488 SHA512 049608dc37dba929eac1e40431885d319311f27be9fddc292d768e3703927e61a646a73137e4a1eaa16836cfba4606ea2cfd8fe3a86cfbf10e3271cee2ee251f
 DIST rdflib-6.2.0.gh.tar.gz 4886953 BLAKE2B 74044b0cbaf6c1ba6f2a43347112118dcf92b5237afdd49782ca6d637df092379ff2d81eaec254ad0bf25057f8c0cd44c82a35a89d4ce7b21c8e222de9aef16a SHA512 8177c50e9c2d48859a061dfee24c3560b8f979bc306b3d940a9251ec130e3a324bbad474f4fa7ced5e11522d3bd4e13931461bf106f31177fd972806968d8245
-EBUILD rdflib-6.1.1.ebuild 1394 BLAKE2B f25e7f9deb40dc790efdcfdfd251e3120167b5820663ad7f7cc95df73cac7406328b89c431b16c631d0680d1395d1bbb0c935aa863d8f2b85f85acf09b69c032 SHA512 4eb944c0fb47f966da9dbeefe2899d2500e611c90b09d8c4ee942f2f236ea7870b2a4a7dba542fbdea66df83210ca2ae7fd42a15b514cab2acdba3a21b3e81a8
-EBUILD rdflib-6.2.0.ebuild 4051 BLAKE2B 9c6f2d0ebdf783b857ca719647e5ddc0150fe1099d8e7791add30e1552aebb3e65c33f5fcc9ddae881d46cb29a0465ddd2aca7b7698d009959dcfa3aaf62c4b9 SHA512 b3d270d6b5bede3870bed14190d2da5806482a3e6ad63278c3259af2ea8beff66c56d9f1f01a0e43adad931bfea16fa3a5afb3e6bc79a2b22ba167f1ef37abd5
+EBUILD rdflib-6.2.0.ebuild 4044 BLAKE2B 489894f14113eee3d49a6be8dc48e6db440b1279099d18e3d0955fca9a423fbb8bc5eacbca34f7e1b4e599833ab79b5aefb73b14f888c8d1ae5b5d6b737b29f5 SHA512 63736ac30b617a46f5d0e42f761fb55eef36cbbe9bcb15dfbc07891bf9abcc6f12bac9fde120353078eeff6b9d9a7be126a137638855eca348988405a79d5024
 MISC metadata.xml 400 BLAKE2B eea3d3a69375a70a1c4a93cebf48169032f9d7cc6ba5df0422bad8c0f4e1caa10721a42b66cfb0dad2ab85aff38f826a0790b4d2dbac90be16e88ecf507d9025 SHA512 d8b94c9c8c037f40db80a44d235ada552851c3b979f496462e19a909eb2b46f606c23458b20869060b596969015616d065b2df0f5b24d2b3d7224afa6089e8e7
diff --git a/dev-python/rdflib/rdflib-6.1.1.ebuild b/dev-python/rdflib/rdflib-6.1.1.ebuild
deleted file mode 100644
index ce98ab1a025b..000000000000
--- a/dev-python/rdflib/rdflib-6.1.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
-
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="sqlite?,threads(+)"
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1 optfeature
-
-DESCRIPTION="RDF library containing a triple store and parser/serializer"
-HOMEPAGE="https://github.com/RDFLib/rdflib https://pypi.org/project/rdflib/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
-IUSE="examples sqlite"
-
-RDEPEND="
-	dev-python/isodate[${PYTHON_USEDEP}]
-	dev-python/html5lib[${PYTHON_USEDEP}]
-	dev-python/pyparsing[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/berkeleydb[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests --install pytest
-
-EPYTEST_IGNORE=(
-	# Uses network
-	test/test_so_69984830.py
-)
-
-python_prepare_all() {
-	# these tests require internet access
-	sed -e '/doctest/d' -i setup.cfg || die
-	rm test/{test_sparql_service.py,test_graph.py,jsonld/test_onedotone.py} || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
-
-pkg_postinst() {
-	optfeature "support for sys-libs/db (Berkeley DB for MySQL)" dev-python/berkeleydb
-}
diff --git a/dev-python/rdflib/rdflib-6.2.0.ebuild b/dev-python/rdflib/rdflib-6.2.0.ebuild
index e41b3e6e638d..5ba8dc94bc51 100644
--- a/dev-python/rdflib/rdflib-6.2.0.ebuild
+++ b/dev-python/rdflib/rdflib-6.2.0.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
 IUSE="examples sqlite"
 
 RDEPEND="
diff --git a/dev-python/regex/Manifest b/dev-python/regex/Manifest
index d7a57b9a4e01..9b414fb9601d 100644
--- a/dev-python/regex/Manifest
+++ b/dev-python/regex/Manifest
@@ -1,9 +1,7 @@
 AUX regex-2021.4.4-pypy3-fix-test_empty_array.patch 1103 BLAKE2B 2498de0ebaa68fcb99653a40bfbb9a1009519a79244fa3193ca43b9b8b3ef714f066fdac68f32d7f24c275690cb24bd1deca6b30120519b99a3402db7b4d4d48 SHA512 d55643d7ca251f465d14d8cffab60e6f2c8fb18ec6f9032a5318fab17a8b8e5ae5c98d22e0eff28aacd5bb8ec2ff606022921f73f3c9f7e54ee0853de262cfa7
 AUX regex-2021.4.4-pypy3-fix-test_issue_18468.patch 1078 BLAKE2B 3545ee5167790fbb1d068afdac3f6dbba28ea92d6c1d4ef31b60a8406061deb8609d7fd9a659b45715d4af0f2deb1da0ef9865aebe58919c2b392e2a1a833cae SHA512 182628709ef0f373037acf197c2ade3215684b2c805a96a600a3dfcb092e6fd134c261330ed76c7c248e72f439e464ccde432444bfe4a9610bd36c777bf45c9d
 DIST regex-2022.7.25.tar.gz 385022 BLAKE2B 64c2ff2e9a41d6d559ed199e978b7eb453ffe872d3cbe3d14f31ed6f7df546aa33079ce1d8279b815a35a18d9ea75da6f0beb38e4df576037995518a38db688a SHA512 1179239e8e2a1ff55150b6c2e483f2d2b795a7f5cb400310c315a59aad19590d410cc9c1a862c66be2ca93b24b387a4c4fa0a5467d497a9bc5ffc79dac7cb0ff
-DIST regex-2022.7.9.tar.gz 383431 BLAKE2B 9773b3e5c516d79ec6b37d288addb0638016716093ec49d8cdc4a2132fc16ea76c4a21fd02cc6bc6547fd0dd76bb0ec9984bb7f41eb88e4f89623a8d4a5be40d SHA512 0c8b78fc10e5ba4e95a3603a4958efb610168b63a490715c2556243af7bab4d04e6eab6cad6bc98816cfa94209404806ede28cf48643d7e92c9b8323c2b0c5e2
 DIST regex-2022.8.17.tar.gz 385777 BLAKE2B c4425e01fea5c25b9ad77e645d3671d65e747a6ee9bd7b8c1870396b4bd989c3a3ec73c33b72eb5e00f24b8e9fff2cef8c229280d2b98a13df7dd8a07bd1b2c9 SHA512 6a305c00a6355dfb9293876292e7d22de58cc00f15d7beadfaf49b49b5ef512404ad5d689f4b90f6302c5246610cb08ebd8ad6a4739818a43c6eb84fc5bc6421
-EBUILD regex-2022.7.25.ebuild 897 BLAKE2B 409dbb1b548b25d5ac390fdd799e88f54255462fe43a054bb079396a58d2124f06b619c9f97bd95e09a84fec93ed76f0904ace13a81f40ba34ab54fedc885e30 SHA512 0c57dc92862339020b9caf9e727f75f577fbcc3710dfbc8657ba403d7791e2a7a42e0866d6fe82640b2d674167c60ac51e259dd03ed2acf8260435f0b352fbfd
-EBUILD regex-2022.7.9.ebuild 889 BLAKE2B 2f4739ef643cd8ce3dce81e94160c6943bfb5f5309f62306bad54dbdf0ff0035fdac591d776c5da341060b4da89d12396b54e2436855bb85e4e449c454e6552d SHA512 e95dc22617b73dcd0e01504dd8e974f09260c79f0935fe9cc9d6a2842640556ed1f34d619fdf31917ae2d466dda860ed02fb9539178c5700ed26ec1132c738b0
+EBUILD regex-2022.7.25.ebuild 889 BLAKE2B 2f4739ef643cd8ce3dce81e94160c6943bfb5f5309f62306bad54dbdf0ff0035fdac591d776c5da341060b4da89d12396b54e2436855bb85e4e449c454e6552d SHA512 e95dc22617b73dcd0e01504dd8e974f09260c79f0935fe9cc9d6a2842640556ed1f34d619fdf31917ae2d466dda860ed02fb9539178c5700ed26ec1132c738b0
 EBUILD regex-2022.8.17.ebuild 897 BLAKE2B 409dbb1b548b25d5ac390fdd799e88f54255462fe43a054bb079396a58d2124f06b619c9f97bd95e09a84fec93ed76f0904ace13a81f40ba34ab54fedc885e30 SHA512 0c57dc92862339020b9caf9e727f75f577fbcc3710dfbc8657ba403d7791e2a7a42e0866d6fe82640b2d674167c60ac51e259dd03ed2acf8260435f0b352fbfd
 MISC metadata.xml 385 BLAKE2B 90c9075dcf3be9bd447746b249c438f50bc84a7c6c63051e808c5feb19b2c6208f85a681e449a025fe43cd0d5b2ab541752966b04b787052d78b92d5230d8e62 SHA512 f554035e72bcfff83e693f3651198f09fd354babfbadd5fef26dca3015ef8cc00c47072648794123c69bbd12c637eeaf9e9471680bab847ec701da2146462817
diff --git a/dev-python/regex/regex-2022.7.25.ebuild b/dev-python/regex/regex-2022.7.25.ebuild
index d864a4bd8ea3..df6875fb35c8 100644
--- a/dev-python/regex/regex-2022.7.25.ebuild
+++ b/dev-python/regex/regex-2022.7.25.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 IUSE="doc"
 
 PATCHES=(
diff --git a/dev-python/regex/regex-2022.7.9.ebuild b/dev-python/regex/regex-2022.7.9.ebuild
deleted file mode 100644
index df6875fb35c8..000000000000
--- a/dev-python/regex/regex-2022.7.9.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Alternative regular expression module to replace re"
-HOMEPAGE="
-	https://bitbucket.org/mrabarnett/mrab-regex/
-	https://pypi.org/project/regex/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-IUSE="doc"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2021.4.4-pypy3-fix-test_empty_array.patch"
-	"${FILESDIR}/${PN}-2021.4.4-pypy3-fix-test_issue_18468.patch"
-)
-
-distutils_enable_tests unittest
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/Features.html )
-	local DOCS=( README.rst docs/*.rst )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/rope/Manifest b/dev-python/rope/Manifest
index 3d3108476e6d..2284b66477ac 100644
--- a/dev-python/rope/Manifest
+++ b/dev-python/rope/Manifest
@@ -1,7 +1,5 @@
 DIST rope-1.1.1.tar.gz 274610 BLAKE2B 52354453305ee58db70f86392f7ec27179e1e4a9ec677fb8875bb9ca24663e6dae26e1bac4a1ad62143fe3a419a7a1e1fd0b7d2f03ef556143d2b060b23300af SHA512 aaf664a63ef00e3c844d6999338fe6a3384ddecfe95ef9b7eb213e5c37c9f78f7d2ea59aa7e612487bac5eaaaf7fc8ba499c0d43c740f99a7b3be64c9d7f6e07
-DIST rope-1.2.0.tar.gz 289239 BLAKE2B 314cf382e76a448dcddff0b9c52ae437cde032b54f1c9edbb05c1d47832ecc7a0b35b8eb14cf48ef5b296011a273cf3e21c5433a70e2627c11f2cdeca885e1a3 SHA512 d34a47a6453a85fcaa253287224b7b5265e08d2cba46377d17502f78642d3468d074b43d4916758c2225f98e676080af2b7896ad6194e0ee0234661343259fd1
 DIST rope-1.3.0.tar.gz 286846 BLAKE2B f8b122a276812638eee76cc235e91e013696f6047c450729edde1b4a5bfdd1d6aa7d1e9ac46048e8205a1f544ee82f740e0f7b20f10769a9a28065a8b9caee6b SHA512 45036cfb3abbe6b00306268f62804d787a633ef8981b23553d57ea18087bfbec33be6346bb59393bb6c3b48020a2da87f759668a57ec8e809ba3666aff0dfd2c
 EBUILD rope-1.1.1.ebuild 571 BLAKE2B 9ff4cef2258e69d043c2b4fb2140959f1c17418c731b5bd294aceb693015f7c8dd063565762019479cad2f8b4b912b9e8e565e86e61841f78d385936193f79b5 SHA512 93d08ddb4b985b5b749ad5fe47756dbfeb3b7c43bc25655d52d96a27c18a85bd5ccd2e979b73f40f9d92c9dabbaf195d7d3edd5970631458627fca780923a66e
-EBUILD rope-1.2.0.ebuild 922 BLAKE2B d530036ac11b8d1cf36e7c1cdd4035cfb5a426b89ee40875006e043a11269d52e331050e1ba54f02abf0a820edaf163431fae9c71f386ba2c11eeaee1815750d SHA512 8e1d1d718ebbaedb56bc46c5113b24ca4773bd1e3f8ad7926658fbe9ef812c8adaea9678ca0ad4e9af612a316a9d6d39421ab2b0cfd2ff339687085d7a8ad1d5
-EBUILD rope-1.3.0.ebuild 923 BLAKE2B f7a62177405535b3b867bf15c9d947a89621b7f46f19153824cdc4faf116c686ac1a27ac74b9a0506f8c1de74769a63d8a9fc50e1bea7a742e8b9439c5926ffd SHA512 b0dec73b8bb520d95026ba92c730ababa70e08b2b84f9ee4e84792620c6d393bd22df39f79082b3249fb636930b62e3d76ed7d72bc546d1a843976f4ec72ddce
+EBUILD rope-1.3.0.ebuild 922 BLAKE2B d530036ac11b8d1cf36e7c1cdd4035cfb5a426b89ee40875006e043a11269d52e331050e1ba54f02abf0a820edaf163431fae9c71f386ba2c11eeaee1815750d SHA512 8e1d1d718ebbaedb56bc46c5113b24ca4773bd1e3f8ad7926658fbe9ef812c8adaea9678ca0ad4e9af612a316a9d6d39421ab2b0cfd2ff339687085d7a8ad1d5
 MISC metadata.xml 452 BLAKE2B 6bee424d801bad8728f10ec3a1618e3a48776a7b0af2a04efafd07e6ae5ac8e0b88253ebc35e457c791e820f8c3b1dabde73aabbfd3636cac5e169e8aca75aa7 SHA512 4f88e1157e4838f321b6f208ba6b89fbf2b7a72ea6e038cdd6cf3e9e211c2788dda137e3adf76072c1d52026c554750193d9938054670dd995a91db24ea8da76
diff --git a/dev-python/rope/rope-1.2.0.ebuild b/dev-python/rope/rope-1.2.0.ebuild
deleted file mode 100644
index ffa603ad1c4c..000000000000
--- a/dev-python/rope/rope-1.2.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python refactoring library"
-HOMEPAGE="
-	https://pypi.org/project/rope/
-	https://github.com/python-rope/rope/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="doc"
-
-RDEPEND="
-	dev-python/pytoolconfig[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/build[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# our venv style confuses this comparison
-	ropetest/contrib/autoimport/utilstest.py::test_get_package_source_typing
-	ropetest/contrib/autoimport/utilstest.py::test_get_package_tuple_typing
-	ropetest/contrib/autoimport/utilstest.py::test_get_package_tuple_compiled
-)
diff --git a/dev-python/rope/rope-1.3.0.ebuild b/dev-python/rope/rope-1.3.0.ebuild
index 67e1183ee5b0..ffa603ad1c4c 100644
--- a/dev-python/rope/rope-1.3.0.ebuild
+++ b/dev-python/rope/rope-1.3.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="doc"
 
 RDEPEND="
diff --git a/dev-python/scipy/Manifest b/dev-python/scipy/Manifest
index 0e54167e5499..32a33962decf 100644
--- a/dev-python/scipy/Manifest
+++ b/dev-python/scipy/Manifest
@@ -1,9 +1,11 @@
 AUX scipy-1.9.9999-meson-options-lapack.patch 1013 BLAKE2B 04cb7b3bc281ef06fe4360f31ea6befe91134bc68ce2a981df704f52814487503d35100bf7fd429d854d0716eaac20f5d55aadad02a4d48eeed8ad55955232b6 SHA512 6d8f6e4c6399f5e8a641a87168b1e2abd31b69a23f90582cba5d8d22d46de0c89d7b0719a25f3cf4e6cd9f81c9ebe0c94d1ba8b6c6b0209020491603b1f548aa
 DIST scipy-1.8.1.tar.gz 38196215 BLAKE2B 180ae646adba2031a4bf99cd4feefe652b8e340110b3b2872e61aa1083054aadf369c7e3b3e3fd8fb71fcd831c95841d2dadd1c71e35e5f7d95800e5551173f0 SHA512 f6fc71c209991fe82baa4b10d8ade0deb1057f6f5942a91dfb7ae45f3eb78a4535efa2861badf5e2d37239fa99dbd99de760aa7e4854b95991ade0263004e7ea
 DIST scipy-1.9.0.tar.gz 42016757 BLAKE2B ca25b3ad44091230c5ecdfa832b382a1f5449565aa460b169a886505e7583399d316fe48f420d45b9993e6522d46fbbd6405e08fcfb8dc02ed5febb2e09749e7 SHA512 03d38f3298e2ca2dcc376acb09593f47a007f2b166508b91cd6f3e3cc417fa3579084aaa806365afee8679b473340b0eba86b36def957da45be404c4b6607675
+DIST scipy-1.9.1.tar.gz 42019478 BLAKE2B aa7f9e8f354d2c73cfeb0e349562279ec323e6c16641c82c47080108d21f385acb1431c1f072e454a043f56e8fd708778fc34c0eddaceedca979f40b6b11e358 SHA512 1378a24c59b66e2818929acd015fe5408cdd57926d96b7b909d5eb7e2bb6bae942e8fe802f107c8b0901af9873b8e24461624ca0917867e24bb50c7d28e09e71
 DIST scipy-html-1.8.1.zip 37060661 BLAKE2B 2fa617c58eb47463f8a61f9798b32c6da255d26b8e86c1558e427a715093f5a29ced3847ab6ecfe88ce1017664f36ac3e9fa9bbf72ede7e0fd3812b5f41fe933 SHA512 95153dc1f404aa64898a700c94c0deea3ca842c3152167d0987edabcf4a8eba16b6c8e6bc38a6775a849dc621e6a21434baf53d1669b1865fa5049cffa4387ac
 DIST scipy-ref-1.8.1.pdf 35025868 BLAKE2B 9221755d2dc69b8623271f75ff3078a0a4410fe9ff69ee317b40bf145af7da21a7f5f4b6b67820d8bb2878f83b7014f1ea7c2f0e026afb716da0479d394505e2 SHA512 8f27dcb9dd1030e15266389af21a1475ecfec5ea777fb2dbcf8db8d3398ac6e45c7040b8d6dbaffd29be3920925427be7c55efdc8094d670c857edfdab7f7728
 EBUILD scipy-1.8.1.ebuild 5275 BLAKE2B 0b2f1bb8c37c253aae87941aa9cb15352d82ff5bc34089ae7cf93cad7d264b0ceaecd7f8f0ff02670d24282a61032eaa52bf16de03e1d25d8a18fbfe7d63c981 SHA512 d7ed5f3bc61e27f898937387f88cd934147149ba40ccc01b160571db97074ccba2eb68510899bb4ee70083e47cf3e2c5c6e53435f56933cc5652e9b21a231763
 EBUILD scipy-1.9.0-r1.ebuild 2287 BLAKE2B 01f8dbe3bc789af389da8f7eb4853f3f1c84329368f7baa8542ec3da0ea8f13abcb7ea9b7048ade6c8978ed877abe7b305711123046000c6bead9eec9d2774a4 SHA512 9a328fa90b73836e297f975e9a67faf359a581ba5021c91fedc99d1054704fe8f63e1bb199e15749fd54f2f3f5641ca7f13ecf3b0955b2870ee32edbe99f0fb9
+EBUILD scipy-1.9.1.ebuild 2287 BLAKE2B 01f8dbe3bc789af389da8f7eb4853f3f1c84329368f7baa8542ec3da0ea8f13abcb7ea9b7048ade6c8978ed877abe7b305711123046000c6bead9eec9d2774a4 SHA512 9a328fa90b73836e297f975e9a67faf359a581ba5021c91fedc99d1054704fe8f63e1bb199e15749fd54f2f3f5641ca7f13ecf3b0955b2870ee32edbe99f0fb9
 EBUILD scipy-1.9.9999.ebuild 2280 BLAKE2B ad4992fccf9ef6846cd6f86b8e85167083e89c6964499bb7d2f387e9a3175cfff38b332db102abad8e7f6a9cba16e5930657eaa6f6e1b92877542e2823569a6b SHA512 d972371e51db239801917a6d83e79d67a028586ca5523f0c4c58373f0cef529a99b3a2b667696a422653febb4c50cc7297e7db4d5ae13fffd76a6f8b178d8fad
 MISC metadata.xml 1148 BLAKE2B bd532eb47b00da1ff18e9bb5be287ef32136412fd7542e92a522c9d3d9d9663d2312b74fd2fc6d4239e4fc581c8e881ac6e682fcfd14b0debb08210237878398 SHA512 a913d7013caece759f2fd36f8814589a512e7650afca19edf444694b1fceeeda02f0bffb4ced81a46a376b2d6d54b292257a236549418aecf20d99e70715babb
diff --git a/dev-python/scipy/scipy-1.9.1.ebuild b/dev-python/scipy/scipy-1.9.1.ebuild
new file mode 100644
index 000000000000..3968a54a22ab
--- /dev/null
+++ b/dev-python/scipy/scipy-1.9.1.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=meson-python
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit fortran-2 distutils-r1 multiprocessing
+
+DESCRIPTION="Scientific algorithms library for Python"
+HOMEPAGE="
+	https://scipy.org/
+	https://github.com/scipy/scipy/
+	https://pypi.org/project/scipy/
+"
+
+if [[ ${PV} == *9999* ]] ; then
+	inherit git-r3
+
+	# Need submodules, so git for now.
+	EGIT_REPO_URI="https://github.com/scipy/scipy"
+	EGIT_BRANCH="maintenance/$(ver_cut 1-2).x"
+	EGIT_SUBMODULES=( '*' )
+else
+	# Upstream is often behind with doc updates
+	DOC_PV=1.8.1
+	MY_PV=${PV/_rc/rc}
+	MY_P=${PN}-${MY_PV}
+
+	SRC_URI="
+		mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz
+		doc? (
+			https://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-html-${DOC_PV}.zip
+			https://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-ref-${DOC_PV}.pdf
+		)"
+	S="${WORKDIR}"/${MY_P}
+
+	if [[ ${PV} != *rc* ]] ; then
+		KEYWORDS="~amd64 ~arm64 -hppa ~ppc64 ~riscv"
+	fi
+fi
+
+LICENSE="BSD LGPL-2"
+SLOT="0"
+IUSE="doc"
+
+# umfpack is technically optional but it's preferred to have it available.
+DEPEND="
+	>=dev-python/numpy-1.18.5[lapack,${PYTHON_USEDEP}]
+	sci-libs/arpack:=
+	sci-libs/umfpack
+	virtual/cblas
+	>=virtual/lapack-3.8
+"
+RDEPEND="
+	${DEPEND}
+	dev-python/pillow[${PYTHON_USEDEP}]
+"
+# TODO: restore pythran optionality?
+BDEPEND="
+	dev-lang/swig
+	>=dev-python/cython-0.29.18[${PYTHON_USEDEP}]
+	dev-python/pybind11[${PYTHON_USEDEP}]
+	dev-python/pythran[${PYTHON_USEDEP}]
+	>=dev-util/meson-0.62.2
+	dev-util/patchelf
+	virtual/pkgconfig
+	doc? ( app-arch/unzip )
+	test? ( dev-python/pytest-xdist[${PYTHON_USEDEP}] )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.9.9999-meson-options-lapack.patch
+)
+
+EPYTEST_DESELECT=(
+	linalg/tests/test_decomp.py::TestSchur::test_sort
+	linalg/tests/test_solvers.py::test_solve_discrete_are
+)
+
+distutils_enable_tests pytest
+
+src_unpack() {
+	default
+
+	if use doc; then
+		unzip -qo "${DISTDIR}"/${PN}-html-${DOC_PV}.zip -d html || die
+	fi
+}
+
+python_test() {
+	cd "${T}" || die
+
+	epytest -n "$(makeopts_jobs)" --pyargs scipy
+}
+
+python_install_all() {
+	use doc && \
+		local DOCS=( "${DISTDIR}"/${PN}-ref-${DOC_PV}.pdf ) \
+		local HTML_DOCS=( "${WORKDIR}"/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/sentry-sdk/Manifest b/dev-python/sentry-sdk/Manifest
index c0b16374a6f5..5e5be56ac28f 100644
--- a/dev-python/sentry-sdk/Manifest
+++ b/dev-python/sentry-sdk/Manifest
@@ -1,15 +1,3 @@
-DIST sentry-sdk-1.8.0.gh.tar.gz 286488 BLAKE2B d47f33a1c83cfffa6e4a801a6fdfde132d4cfe1b734e464c4db60e97abf53ebe503c53c3edd89d1a84e655a348a4463a75c3475d4824d03cd9b95733b13b5532 SHA512 aa3be96dbc55265f17371d8f20f8b3116b4310cbc1d078b62beeb1fd90bdbb840db85c25309e16f793a188d373c6dbcfd11a104db21b60221a5fb06d8deacc2d
-DIST sentry-sdk-1.9.0.gh.tar.gz 290271 BLAKE2B fcb4c45c129faf23a1177167e2bdd567a7ff228abbaa782676abb16c29e9c4cccef89f67ae5cd28c4f2b25e6687152fdc5eab0c7d981021a8df16374dc4e1fec SHA512 4f287bad8e9dd8eaad8f8a31d7335ccf6bfe72cc0ba8c0b26abcbd7e326bad886709d001976966a7b917f39e1ca249fa881abf29778cfd4bd65c63f05a6f6ef2
-DIST sentry-sdk-1.9.1.gh.tar.gz 270398 BLAKE2B 66ee16816d312b38df737c5ecb0ecc4a2189c932c162bbedf165f2a153029e95c389372a4638d5f71f669ac780710769e4708c3e7673573d1b1e79a29cbf93c9 SHA512 5997252aeee900125e42d7275627359ca5382707162b93e45b238c11a181ac724fea327fa1b29deed63dbf800463d10c9d2a8e8943c32b907e4eac055e399297
-DIST sentry-sdk-1.9.2.gh.tar.gz 270400 BLAKE2B 690e62c1b4f64677442ac46b15973173d96d587b71786f5c2e0a9e8d15aec7978b86b247a52ff15b6d0dc9665f8eafa4b1ad458d3aa3fca3447e7c9946503c69 SHA512 189916cf8b931df73eaa252bbc2f3beb53bf56529d50ebe79affd04e9684ffa89e1f66ec651b7dca6fbd5de641333ddd6f65512978ee06c2abb73617bd6f3ea2
-DIST sentry-sdk-1.9.3.gh.tar.gz 270453 BLAKE2B e971c89ccdbe3831e49cf48db4673c54f4110878e45e92bf5f8142a876b8382fc714e9e3fc124c36495c8cda24efabad9486fc0cdb939a034c931a718e21c501 SHA512 4a31507635cbe3932ecb548273f32cfd6098d5ed4eed2771a37b79f98a4c97f12d50b89f63f357424355d5657bc2bdb3e49f0984db4e9c9ee7ee31b984d0367e
-DIST sentry-sdk-1.9.4.gh.tar.gz 271140 BLAKE2B 07ba10c72ec61c1bd6a54899712b5880ddf4c4f67ae9f127184d0251e93ae0a7374441ba77eb54c871684152613db55a582ca98f787884ef834f658d743abccd SHA512 2b0089b29da002e6236b93033f36bc0a6ba08d4643021f6bc2e30807a84867030dad088e1ff6b917f5b9dbc2da06305c3e58cdd9f9c10009df5063640cb8796a
 DIST sentry-sdk-1.9.5.gh.tar.gz 272096 BLAKE2B 179be647b92a74a1836f26add33e4b98007d19eff7454eb4968a2029003b7c1601d2eecad162a109508942b2f65086db32df6191c7f7986b5ab831295a8d3775 SHA512 d909ea9552a845b7022fdbbd06e3c49b2f136ca66771f20cb74b82f9eda7f63bee6c095eddefad7623a224bb9d6bf2b775c3c9405a0b55cd520952c3fe67c22d
-EBUILD sentry-sdk-1.8.0.ebuild 3121 BLAKE2B 25145b97825561a60fa688b36d438779a415a9dd11bd980fd9002e4e261acb8b520a3bc9e44377043a7e997c009def08e3e6356798a2a4f770ff0f2ec3dfa65d SHA512 6f11b9544ea00ee6a5db89158bc2d01e8a2880e5f6ac797dc791bf99286eef97829b498dfa2a87f0108f75d537983e359c1109bf6d2bed7a083745c69ae7decf
-EBUILD sentry-sdk-1.9.0.ebuild 3205 BLAKE2B cc50ae93fdb72f81c15ac975cb7359056feba2eb1f67b77335892f784be8f859bc5125fc341f370eaa4b1b3526387fb12246046b1b0d9db52d364f796c440236 SHA512 e78cbc57645b20a02a691cca4849f9728d95eaa10fc55ac035111b50b24b1d8766875a66db0306256b446c2a47a797d2d890ed11ffc1246e6cea43e243b97379
-EBUILD sentry-sdk-1.9.1.ebuild 3205 BLAKE2B cc50ae93fdb72f81c15ac975cb7359056feba2eb1f67b77335892f784be8f859bc5125fc341f370eaa4b1b3526387fb12246046b1b0d9db52d364f796c440236 SHA512 e78cbc57645b20a02a691cca4849f9728d95eaa10fc55ac035111b50b24b1d8766875a66db0306256b446c2a47a797d2d890ed11ffc1246e6cea43e243b97379
-EBUILD sentry-sdk-1.9.2.ebuild 3205 BLAKE2B cc50ae93fdb72f81c15ac975cb7359056feba2eb1f67b77335892f784be8f859bc5125fc341f370eaa4b1b3526387fb12246046b1b0d9db52d364f796c440236 SHA512 e78cbc57645b20a02a691cca4849f9728d95eaa10fc55ac035111b50b24b1d8766875a66db0306256b446c2a47a797d2d890ed11ffc1246e6cea43e243b97379
-EBUILD sentry-sdk-1.9.3.ebuild 3205 BLAKE2B cc50ae93fdb72f81c15ac975cb7359056feba2eb1f67b77335892f784be8f859bc5125fc341f370eaa4b1b3526387fb12246046b1b0d9db52d364f796c440236 SHA512 e78cbc57645b20a02a691cca4849f9728d95eaa10fc55ac035111b50b24b1d8766875a66db0306256b446c2a47a797d2d890ed11ffc1246e6cea43e243b97379
-EBUILD sentry-sdk-1.9.4.ebuild 3205 BLAKE2B cc50ae93fdb72f81c15ac975cb7359056feba2eb1f67b77335892f784be8f859bc5125fc341f370eaa4b1b3526387fb12246046b1b0d9db52d364f796c440236 SHA512 e78cbc57645b20a02a691cca4849f9728d95eaa10fc55ac035111b50b24b1d8766875a66db0306256b446c2a47a797d2d890ed11ffc1246e6cea43e243b97379
-EBUILD sentry-sdk-1.9.5.ebuild 3205 BLAKE2B cc50ae93fdb72f81c15ac975cb7359056feba2eb1f67b77335892f784be8f859bc5125fc341f370eaa4b1b3526387fb12246046b1b0d9db52d364f796c440236 SHA512 e78cbc57645b20a02a691cca4849f9728d95eaa10fc55ac035111b50b24b1d8766875a66db0306256b446c2a47a797d2d890ed11ffc1246e6cea43e243b97379
+EBUILD sentry-sdk-1.9.5.ebuild 3201 BLAKE2B 371fb9d17f8f843c34c17857d68818de5e04c40267a1009ccb98fc2bcabcb67d80d9da36bab08962224936bcfa1c230be10ab88758a0bc4713f4ec68ad28b2a0 SHA512 fb5f857923833a77c952da761c6b4b8ab88037c981f5468913c83d22ce119026814f57b9902e72b21ab21ddbf83b12e60e707c340ed91aa5a39b5269515e3dd8
 MISC metadata.xml 510 BLAKE2B e00011699ac2cc83f1923e1f6fa813ede7eab8c57f9ce9d9fca04e721b089db1c5f2bdffaa7b9856f56b433abd9189125e07ffd3f329e4fa8d098e28a4f2d7bd SHA512 bafb77a102d94fe050cb526b298fb8cfd56775cb4d07eda280f6356fbec6fbe5df5c9ebd459d9d4457cd027c2e0d7c349e053fa6070b52f0d2989f6ec600b87d
diff --git a/dev-python/sentry-sdk/sentry-sdk-1.8.0.ebuild b/dev-python/sentry-sdk/sentry-sdk-1.8.0.ebuild
deleted file mode 100644
index 8d3070afda33..000000000000
--- a/dev-python/sentry-sdk/sentry-sdk-1.8.0.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python client for Sentry"
-HOMEPAGE="
-	https://sentry.io/
-	https://github.com/getsentry/sentry-python/
-	https://pypi.org/project/sentry-sdk/
-"
-SRC_URI="
-	https://github.com/getsentry/sentry-python/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/sentry-python-${PV}"
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
-
-RDEPEND="
-	dev-python/urllib3[${PYTHON_USEDEP}]
-	dev-python/certifi[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/asttokens[${PYTHON_USEDEP}]
-		dev-python/django[${PYTHON_USEDEP}]
-		dev-python/executing[${PYTHON_USEDEP}]
-		dev-python/fakeredis[${PYTHON_USEDEP}]
-		dev-python/flask-login[${PYTHON_USEDEP}]
-		dev-python/gevent[${PYTHON_USEDEP}]
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/pyrsistent[${PYTHON_USEDEP}]
-		dev-python/pytest-aiohttp[${PYTHON_USEDEP}]
-		dev-python/pytest-django[${PYTHON_USEDEP}]
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-		dev-python/pytest-localserver[${PYTHON_USEDEP}]
-		dev-python/werkzeug[${PYTHON_USEDEP}]
-		dev-python/zope-event[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/eventlet[${PYTHON_USEDEP}]
-		' python3_{8..9})
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	# tests require Internet access
-	tests/integrations/httpx/test_httpx.py
-	tests/integrations/requests/test_requests.py
-	tests/integrations/stdlib/test_httplib.py
-	tests/integrations/flask/test_flask.py
-	tests/integrations/django/test_basic.py
-	# wtf is it supposed to do?!
-	tests/integrations/gcp/test_gcp.py
-	# broken by rq-1.10.1 (optional dep)
-	tests/integrations/rq/test_rq.py
-	# fastapi is not packaged
-	tests/integrations/asgi/test_fastapi.py
-	# TODO
-	tests/integrations/bottle
-	# requires python-multipart (TODO: package it)
-	tests/integrations/starlette
-)
-
-EPYTEST_DESELECT=(
-	# hangs
-	'tests/test_transport.py::test_transport_works'
-	# TODO
-	'tests/test_basics.py::test_auto_enabling_integrations_catches_import_error'
-	tests/test_client.py::test_databag_depth_stripping
-	tests/test_client.py::test_databag_string_stripping
-	tests/test_client.py::test_databag_breadth_stripping
-	tests/integrations/asgi/test_asgi.py::test_auto_session_tracking_with_aggregates
-	tests/integrations/asgi/test_asgi.py::test_websocket
-	tests/integrations/aiohttp/test_aiohttp.py::test_transaction_style
-	tests/integrations/aiohttp/test_aiohttp.py::test_traces_sampler_gets_request_object_in_sampling_context
-	# incompatible version?
-	tests/integrations/falcon/test_falcon.py
-	tests/integrations/sqlalchemy/test_sqlalchemy.py::test_too_large_event_truncated
-	# test_circular_references: apparently fragile
-	'tests/integrations/threading/test_threading.py::test_circular_references'
-	# test for new feature, fails with IndexError
-	tests/integrations/wsgi/test_wsgi.py::test_session_mode_defaults_to_request_mode_in_wsgi_handler
-	# TODO
-	tests/integrations/wsgi/test_wsgi.py::test_auto_session_tracking_with_aggregates
-)
diff --git a/dev-python/sentry-sdk/sentry-sdk-1.9.0.ebuild b/dev-python/sentry-sdk/sentry-sdk-1.9.0.ebuild
deleted file mode 100644
index 9d1e2042e8f2..000000000000
--- a/dev-python/sentry-sdk/sentry-sdk-1.9.0.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python client for Sentry"
-HOMEPAGE="
-	https://sentry.io/
-	https://github.com/getsentry/sentry-python/
-	https://pypi.org/project/sentry-sdk/
-"
-SRC_URI="
-	https://github.com/getsentry/sentry-python/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/sentry-python-${PV}"
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-RDEPEND="
-	dev-python/urllib3[${PYTHON_USEDEP}]
-	dev-python/certifi[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/asttokens[${PYTHON_USEDEP}]
-		dev-python/django[${PYTHON_USEDEP}]
-		dev-python/executing[${PYTHON_USEDEP}]
-		dev-python/fakeredis[${PYTHON_USEDEP}]
-		dev-python/flask-login[${PYTHON_USEDEP}]
-		dev-python/gevent[${PYTHON_USEDEP}]
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/pyrsistent[${PYTHON_USEDEP}]
-		dev-python/pytest-aiohttp[${PYTHON_USEDEP}]
-		dev-python/pytest-django[${PYTHON_USEDEP}]
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-		dev-python/pytest-localserver[${PYTHON_USEDEP}]
-		dev-python/werkzeug[${PYTHON_USEDEP}]
-		dev-python/zope-event[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/eventlet[${PYTHON_USEDEP}]
-		' python3_{8..9})
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	# tests require Internet access
-	tests/integrations/httpx/test_httpx.py
-	tests/integrations/requests/test_requests.py
-	tests/integrations/stdlib/test_httplib.py
-	tests/integrations/flask/test_flask.py
-	tests/integrations/django/test_basic.py
-	# wtf is it supposed to do?!
-	tests/integrations/gcp/test_gcp.py
-	# broken by rq-1.10.1 (optional dep)
-	tests/integrations/rq/test_rq.py
-	# fastapi is not packaged
-	tests/integrations/asgi/test_fastapi.py
-	# TODO
-	tests/integrations/bottle
-	# requires python-multipart (TODO: package it)
-	tests/integrations/starlette
-)
-
-EPYTEST_DESELECT=(
-	# hangs
-	'tests/test_transport.py::test_transport_works'
-	# TODO
-	'tests/test_basics.py::test_auto_enabling_integrations_catches_import_error'
-	tests/test_client.py::test_databag_depth_stripping
-	tests/test_client.py::test_databag_string_stripping
-	tests/test_client.py::test_databag_breadth_stripping
-	tests/integrations/asgi/test_asgi.py::test_auto_session_tracking_with_aggregates
-	tests/integrations/asgi/test_asgi.py::test_websocket
-	tests/integrations/aiohttp/test_aiohttp.py::test_transaction_style
-	tests/integrations/aiohttp/test_aiohttp.py::test_traces_sampler_gets_request_object_in_sampling_context
-	# incompatible version?
-	tests/integrations/falcon/test_falcon.py
-	tests/integrations/sqlalchemy/test_sqlalchemy.py::test_too_large_event_truncated
-	# test_circular_references: apparently fragile
-	'tests/integrations/threading/test_threading.py::test_circular_references'
-	# test for new feature, fails with IndexError
-	tests/integrations/wsgi/test_wsgi.py::test_session_mode_defaults_to_request_mode_in_wsgi_handler
-	# TODO
-	tests/integrations/wsgi/test_wsgi.py::test_auto_session_tracking_with_aggregates
-	tests/integrations/wsgi/test_wsgi.py::test_profile_sent_when_profiling_enabled
-)
diff --git a/dev-python/sentry-sdk/sentry-sdk-1.9.1.ebuild b/dev-python/sentry-sdk/sentry-sdk-1.9.1.ebuild
deleted file mode 100644
index 9d1e2042e8f2..000000000000
--- a/dev-python/sentry-sdk/sentry-sdk-1.9.1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python client for Sentry"
-HOMEPAGE="
-	https://sentry.io/
-	https://github.com/getsentry/sentry-python/
-	https://pypi.org/project/sentry-sdk/
-"
-SRC_URI="
-	https://github.com/getsentry/sentry-python/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/sentry-python-${PV}"
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-RDEPEND="
-	dev-python/urllib3[${PYTHON_USEDEP}]
-	dev-python/certifi[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/asttokens[${PYTHON_USEDEP}]
-		dev-python/django[${PYTHON_USEDEP}]
-		dev-python/executing[${PYTHON_USEDEP}]
-		dev-python/fakeredis[${PYTHON_USEDEP}]
-		dev-python/flask-login[${PYTHON_USEDEP}]
-		dev-python/gevent[${PYTHON_USEDEP}]
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/pyrsistent[${PYTHON_USEDEP}]
-		dev-python/pytest-aiohttp[${PYTHON_USEDEP}]
-		dev-python/pytest-django[${PYTHON_USEDEP}]
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-		dev-python/pytest-localserver[${PYTHON_USEDEP}]
-		dev-python/werkzeug[${PYTHON_USEDEP}]
-		dev-python/zope-event[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/eventlet[${PYTHON_USEDEP}]
-		' python3_{8..9})
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	# tests require Internet access
-	tests/integrations/httpx/test_httpx.py
-	tests/integrations/requests/test_requests.py
-	tests/integrations/stdlib/test_httplib.py
-	tests/integrations/flask/test_flask.py
-	tests/integrations/django/test_basic.py
-	# wtf is it supposed to do?!
-	tests/integrations/gcp/test_gcp.py
-	# broken by rq-1.10.1 (optional dep)
-	tests/integrations/rq/test_rq.py
-	# fastapi is not packaged
-	tests/integrations/asgi/test_fastapi.py
-	# TODO
-	tests/integrations/bottle
-	# requires python-multipart (TODO: package it)
-	tests/integrations/starlette
-)
-
-EPYTEST_DESELECT=(
-	# hangs
-	'tests/test_transport.py::test_transport_works'
-	# TODO
-	'tests/test_basics.py::test_auto_enabling_integrations_catches_import_error'
-	tests/test_client.py::test_databag_depth_stripping
-	tests/test_client.py::test_databag_string_stripping
-	tests/test_client.py::test_databag_breadth_stripping
-	tests/integrations/asgi/test_asgi.py::test_auto_session_tracking_with_aggregates
-	tests/integrations/asgi/test_asgi.py::test_websocket
-	tests/integrations/aiohttp/test_aiohttp.py::test_transaction_style
-	tests/integrations/aiohttp/test_aiohttp.py::test_traces_sampler_gets_request_object_in_sampling_context
-	# incompatible version?
-	tests/integrations/falcon/test_falcon.py
-	tests/integrations/sqlalchemy/test_sqlalchemy.py::test_too_large_event_truncated
-	# test_circular_references: apparently fragile
-	'tests/integrations/threading/test_threading.py::test_circular_references'
-	# test for new feature, fails with IndexError
-	tests/integrations/wsgi/test_wsgi.py::test_session_mode_defaults_to_request_mode_in_wsgi_handler
-	# TODO
-	tests/integrations/wsgi/test_wsgi.py::test_auto_session_tracking_with_aggregates
-	tests/integrations/wsgi/test_wsgi.py::test_profile_sent_when_profiling_enabled
-)
diff --git a/dev-python/sentry-sdk/sentry-sdk-1.9.2.ebuild b/dev-python/sentry-sdk/sentry-sdk-1.9.2.ebuild
deleted file mode 100644
index 9d1e2042e8f2..000000000000
--- a/dev-python/sentry-sdk/sentry-sdk-1.9.2.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python client for Sentry"
-HOMEPAGE="
-	https://sentry.io/
-	https://github.com/getsentry/sentry-python/
-	https://pypi.org/project/sentry-sdk/
-"
-SRC_URI="
-	https://github.com/getsentry/sentry-python/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/sentry-python-${PV}"
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-RDEPEND="
-	dev-python/urllib3[${PYTHON_USEDEP}]
-	dev-python/certifi[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/asttokens[${PYTHON_USEDEP}]
-		dev-python/django[${PYTHON_USEDEP}]
-		dev-python/executing[${PYTHON_USEDEP}]
-		dev-python/fakeredis[${PYTHON_USEDEP}]
-		dev-python/flask-login[${PYTHON_USEDEP}]
-		dev-python/gevent[${PYTHON_USEDEP}]
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/pyrsistent[${PYTHON_USEDEP}]
-		dev-python/pytest-aiohttp[${PYTHON_USEDEP}]
-		dev-python/pytest-django[${PYTHON_USEDEP}]
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-		dev-python/pytest-localserver[${PYTHON_USEDEP}]
-		dev-python/werkzeug[${PYTHON_USEDEP}]
-		dev-python/zope-event[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/eventlet[${PYTHON_USEDEP}]
-		' python3_{8..9})
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	# tests require Internet access
-	tests/integrations/httpx/test_httpx.py
-	tests/integrations/requests/test_requests.py
-	tests/integrations/stdlib/test_httplib.py
-	tests/integrations/flask/test_flask.py
-	tests/integrations/django/test_basic.py
-	# wtf is it supposed to do?!
-	tests/integrations/gcp/test_gcp.py
-	# broken by rq-1.10.1 (optional dep)
-	tests/integrations/rq/test_rq.py
-	# fastapi is not packaged
-	tests/integrations/asgi/test_fastapi.py
-	# TODO
-	tests/integrations/bottle
-	# requires python-multipart (TODO: package it)
-	tests/integrations/starlette
-)
-
-EPYTEST_DESELECT=(
-	# hangs
-	'tests/test_transport.py::test_transport_works'
-	# TODO
-	'tests/test_basics.py::test_auto_enabling_integrations_catches_import_error'
-	tests/test_client.py::test_databag_depth_stripping
-	tests/test_client.py::test_databag_string_stripping
-	tests/test_client.py::test_databag_breadth_stripping
-	tests/integrations/asgi/test_asgi.py::test_auto_session_tracking_with_aggregates
-	tests/integrations/asgi/test_asgi.py::test_websocket
-	tests/integrations/aiohttp/test_aiohttp.py::test_transaction_style
-	tests/integrations/aiohttp/test_aiohttp.py::test_traces_sampler_gets_request_object_in_sampling_context
-	# incompatible version?
-	tests/integrations/falcon/test_falcon.py
-	tests/integrations/sqlalchemy/test_sqlalchemy.py::test_too_large_event_truncated
-	# test_circular_references: apparently fragile
-	'tests/integrations/threading/test_threading.py::test_circular_references'
-	# test for new feature, fails with IndexError
-	tests/integrations/wsgi/test_wsgi.py::test_session_mode_defaults_to_request_mode_in_wsgi_handler
-	# TODO
-	tests/integrations/wsgi/test_wsgi.py::test_auto_session_tracking_with_aggregates
-	tests/integrations/wsgi/test_wsgi.py::test_profile_sent_when_profiling_enabled
-)
diff --git a/dev-python/sentry-sdk/sentry-sdk-1.9.3.ebuild b/dev-python/sentry-sdk/sentry-sdk-1.9.3.ebuild
deleted file mode 100644
index 9d1e2042e8f2..000000000000
--- a/dev-python/sentry-sdk/sentry-sdk-1.9.3.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python client for Sentry"
-HOMEPAGE="
-	https://sentry.io/
-	https://github.com/getsentry/sentry-python/
-	https://pypi.org/project/sentry-sdk/
-"
-SRC_URI="
-	https://github.com/getsentry/sentry-python/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/sentry-python-${PV}"
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-RDEPEND="
-	dev-python/urllib3[${PYTHON_USEDEP}]
-	dev-python/certifi[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/asttokens[${PYTHON_USEDEP}]
-		dev-python/django[${PYTHON_USEDEP}]
-		dev-python/executing[${PYTHON_USEDEP}]
-		dev-python/fakeredis[${PYTHON_USEDEP}]
-		dev-python/flask-login[${PYTHON_USEDEP}]
-		dev-python/gevent[${PYTHON_USEDEP}]
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/pyrsistent[${PYTHON_USEDEP}]
-		dev-python/pytest-aiohttp[${PYTHON_USEDEP}]
-		dev-python/pytest-django[${PYTHON_USEDEP}]
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-		dev-python/pytest-localserver[${PYTHON_USEDEP}]
-		dev-python/werkzeug[${PYTHON_USEDEP}]
-		dev-python/zope-event[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/eventlet[${PYTHON_USEDEP}]
-		' python3_{8..9})
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	# tests require Internet access
-	tests/integrations/httpx/test_httpx.py
-	tests/integrations/requests/test_requests.py
-	tests/integrations/stdlib/test_httplib.py
-	tests/integrations/flask/test_flask.py
-	tests/integrations/django/test_basic.py
-	# wtf is it supposed to do?!
-	tests/integrations/gcp/test_gcp.py
-	# broken by rq-1.10.1 (optional dep)
-	tests/integrations/rq/test_rq.py
-	# fastapi is not packaged
-	tests/integrations/asgi/test_fastapi.py
-	# TODO
-	tests/integrations/bottle
-	# requires python-multipart (TODO: package it)
-	tests/integrations/starlette
-)
-
-EPYTEST_DESELECT=(
-	# hangs
-	'tests/test_transport.py::test_transport_works'
-	# TODO
-	'tests/test_basics.py::test_auto_enabling_integrations_catches_import_error'
-	tests/test_client.py::test_databag_depth_stripping
-	tests/test_client.py::test_databag_string_stripping
-	tests/test_client.py::test_databag_breadth_stripping
-	tests/integrations/asgi/test_asgi.py::test_auto_session_tracking_with_aggregates
-	tests/integrations/asgi/test_asgi.py::test_websocket
-	tests/integrations/aiohttp/test_aiohttp.py::test_transaction_style
-	tests/integrations/aiohttp/test_aiohttp.py::test_traces_sampler_gets_request_object_in_sampling_context
-	# incompatible version?
-	tests/integrations/falcon/test_falcon.py
-	tests/integrations/sqlalchemy/test_sqlalchemy.py::test_too_large_event_truncated
-	# test_circular_references: apparently fragile
-	'tests/integrations/threading/test_threading.py::test_circular_references'
-	# test for new feature, fails with IndexError
-	tests/integrations/wsgi/test_wsgi.py::test_session_mode_defaults_to_request_mode_in_wsgi_handler
-	# TODO
-	tests/integrations/wsgi/test_wsgi.py::test_auto_session_tracking_with_aggregates
-	tests/integrations/wsgi/test_wsgi.py::test_profile_sent_when_profiling_enabled
-)
diff --git a/dev-python/sentry-sdk/sentry-sdk-1.9.4.ebuild b/dev-python/sentry-sdk/sentry-sdk-1.9.4.ebuild
deleted file mode 100644
index 9d1e2042e8f2..000000000000
--- a/dev-python/sentry-sdk/sentry-sdk-1.9.4.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python client for Sentry"
-HOMEPAGE="
-	https://sentry.io/
-	https://github.com/getsentry/sentry-python/
-	https://pypi.org/project/sentry-sdk/
-"
-SRC_URI="
-	https://github.com/getsentry/sentry-python/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/sentry-python-${PV}"
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-RDEPEND="
-	dev-python/urllib3[${PYTHON_USEDEP}]
-	dev-python/certifi[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/asttokens[${PYTHON_USEDEP}]
-		dev-python/django[${PYTHON_USEDEP}]
-		dev-python/executing[${PYTHON_USEDEP}]
-		dev-python/fakeredis[${PYTHON_USEDEP}]
-		dev-python/flask-login[${PYTHON_USEDEP}]
-		dev-python/gevent[${PYTHON_USEDEP}]
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/pyrsistent[${PYTHON_USEDEP}]
-		dev-python/pytest-aiohttp[${PYTHON_USEDEP}]
-		dev-python/pytest-django[${PYTHON_USEDEP}]
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-		dev-python/pytest-localserver[${PYTHON_USEDEP}]
-		dev-python/werkzeug[${PYTHON_USEDEP}]
-		dev-python/zope-event[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/eventlet[${PYTHON_USEDEP}]
-		' python3_{8..9})
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	# tests require Internet access
-	tests/integrations/httpx/test_httpx.py
-	tests/integrations/requests/test_requests.py
-	tests/integrations/stdlib/test_httplib.py
-	tests/integrations/flask/test_flask.py
-	tests/integrations/django/test_basic.py
-	# wtf is it supposed to do?!
-	tests/integrations/gcp/test_gcp.py
-	# broken by rq-1.10.1 (optional dep)
-	tests/integrations/rq/test_rq.py
-	# fastapi is not packaged
-	tests/integrations/asgi/test_fastapi.py
-	# TODO
-	tests/integrations/bottle
-	# requires python-multipart (TODO: package it)
-	tests/integrations/starlette
-)
-
-EPYTEST_DESELECT=(
-	# hangs
-	'tests/test_transport.py::test_transport_works'
-	# TODO
-	'tests/test_basics.py::test_auto_enabling_integrations_catches_import_error'
-	tests/test_client.py::test_databag_depth_stripping
-	tests/test_client.py::test_databag_string_stripping
-	tests/test_client.py::test_databag_breadth_stripping
-	tests/integrations/asgi/test_asgi.py::test_auto_session_tracking_with_aggregates
-	tests/integrations/asgi/test_asgi.py::test_websocket
-	tests/integrations/aiohttp/test_aiohttp.py::test_transaction_style
-	tests/integrations/aiohttp/test_aiohttp.py::test_traces_sampler_gets_request_object_in_sampling_context
-	# incompatible version?
-	tests/integrations/falcon/test_falcon.py
-	tests/integrations/sqlalchemy/test_sqlalchemy.py::test_too_large_event_truncated
-	# test_circular_references: apparently fragile
-	'tests/integrations/threading/test_threading.py::test_circular_references'
-	# test for new feature, fails with IndexError
-	tests/integrations/wsgi/test_wsgi.py::test_session_mode_defaults_to_request_mode_in_wsgi_handler
-	# TODO
-	tests/integrations/wsgi/test_wsgi.py::test_auto_session_tracking_with_aggregates
-	tests/integrations/wsgi/test_wsgi.py::test_profile_sent_when_profiling_enabled
-)
diff --git a/dev-python/sentry-sdk/sentry-sdk-1.9.5.ebuild b/dev-python/sentry-sdk/sentry-sdk-1.9.5.ebuild
index 9d1e2042e8f2..8d721fb6bb59 100644
--- a/dev-python/sentry-sdk/sentry-sdk-1.9.5.ebuild
+++ b/dev-python/sentry-sdk/sentry-sdk-1.9.5.ebuild
@@ -22,7 +22,7 @@ S="${WORKDIR}/sentry-python-${PV}"
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	dev-python/urllib3[${PYTHON_USEDEP}]
diff --git a/dev-python/setproctitle/Manifest b/dev-python/setproctitle/Manifest
index b447371eace8..59b9689ea20c 100644
--- a/dev-python/setproctitle/Manifest
+++ b/dev-python/setproctitle/Manifest
@@ -1,9 +1,3 @@
-DIST setproctitle-1.2.3.tar.gz 23618 BLAKE2B 58bafb30a9b0da9cd552c7ed1ccd197a2ee7a3c70ae02773e6a857e4f16069126d2507f30206c83a24d84d030a1fc9306d024f4e5b988f73d95df049fa9c055f SHA512 ae94e3f5e1dd10e80488f81250e979a6a15c7c3ae399bf557612b9b1edbdcb8aec4e68a7f44ff7375a399ab53d6319dfb5c5c4a1e3a0bb824c40f6921c9d9c6b
-DIST setproctitle-1.3.0.tar.gz 26778 BLAKE2B 620df2c342fd76ff762135eed88b4d6d921c1c85c7865e3921c95e968de07b10cccf86e2d62297fdfb91aa5b44e9e9fb7c496aa2fdbbe039eecda668b079328e SHA512 41f0557b73ed41323c8d71d87d143ccd78f980c01027e76c7e6ff4cf375cb8cda55f01a5c4a3cd12fea3459070382b84fd1346995696df7a3e1cc03ff8e71b4e
-DIST setproctitle-1.3.1.tar.gz 27010 BLAKE2B c29f2acc1c02a375227b4f249340d979a4922d1ebf8e6f17f2e5a202ad2e41affe9d0ff8aed0345ebb534a00868896036e15a985c6d21ebbbb341afaa951ae8d SHA512 c21d87555cc258a779dbc5574ef0c58b4fdcd0cc28410a931f05974d9714f2bd9a57fbec4fa1cf16aef21ea50cd900a52eb85974c399b451bc357671d1490dc4
 DIST setproctitle-1.3.2.tar.gz 27173 BLAKE2B 252ca0a4f71e1413e2474d6c4e9cebacb1642f8c7883709d03341ce1468441509dc54eb9d4191f2aefb65c9e76e130f76a51303a272bd34a6db781d3b2a86e92 SHA512 9c6d1748685e8b62f9542f73481a587dbe7b6ca157fdcecdd8d2f66bbb71169bf31e47da51867aa0ec9b620c39677ab9a936a7537769714bdc99ef0355c743e0
-EBUILD setproctitle-1.2.3.ebuild 659 BLAKE2B 270ee12849c70a5cb3084c5d92a6cb71fb3ca89ffac5c2ba8fdb6dc48101bbba5eeeced0ed193dbb69a2b1c65eb05c12c27020762366df07cd5e3437ebf0ab43 SHA512 16413006711e1e2b0b75fd61e69f9465a8447be899539d0835166afc84806628ee55c734dbd0c6b82e3d6828cce9d1b14286513185656489148e58766117b7f3
-EBUILD setproctitle-1.3.0.ebuild 667 BLAKE2B fd89e7117b365e7b7c78a75b639a3d91d822ac7139802453f33a1334c4d226a2174dd6e3bc7a9d93b4c3c9bcc0f378016abdf5efdeee9aa1812613b9857e23ea SHA512 2388372fa488683f375663b4970ab6671db34f1f05601089a8f87cf4d08e2b766430ac19057b050c121624dc41766733523c6a1dff11e79a086aa13f525e8f30
-EBUILD setproctitle-1.3.1.ebuild 667 BLAKE2B fd89e7117b365e7b7c78a75b639a3d91d822ac7139802453f33a1334c4d226a2174dd6e3bc7a9d93b4c3c9bcc0f378016abdf5efdeee9aa1812613b9857e23ea SHA512 2388372fa488683f375663b4970ab6671db34f1f05601089a8f87cf4d08e2b766430ac19057b050c121624dc41766733523c6a1dff11e79a086aa13f525e8f30
-EBUILD setproctitle-1.3.2.ebuild 667 BLAKE2B fd89e7117b365e7b7c78a75b639a3d91d822ac7139802453f33a1334c4d226a2174dd6e3bc7a9d93b4c3c9bcc0f378016abdf5efdeee9aa1812613b9857e23ea SHA512 2388372fa488683f375663b4970ab6671db34f1f05601089a8f87cf4d08e2b766430ac19057b050c121624dc41766733523c6a1dff11e79a086aa13f525e8f30
+EBUILD setproctitle-1.3.2.ebuild 659 BLAKE2B 270ee12849c70a5cb3084c5d92a6cb71fb3ca89ffac5c2ba8fdb6dc48101bbba5eeeced0ed193dbb69a2b1c65eb05c12c27020762366df07cd5e3437ebf0ab43 SHA512 16413006711e1e2b0b75fd61e69f9465a8447be899539d0835166afc84806628ee55c734dbd0c6b82e3d6828cce9d1b14286513185656489148e58766117b7f3
 MISC metadata.xml 381 BLAKE2B 3d670d00f8ea402ac4ddb3a4f92f341f9a983a6dbd7d077523a7ecfea4bcd6ba398e7ccc5866ac2650a765b25a0e83b735293963598ef404af1f106cc629d378 SHA512 49e506f7044fe2ad49ffe16c7070da7fba8768f3e79b4c32e539a65ea94c73c19c7592021434a4ac7e10b7f401c255ae276ce8caa599a14dadb9e512765202da
diff --git a/dev-python/setproctitle/setproctitle-1.2.3.ebuild b/dev-python/setproctitle/setproctitle-1.2.3.ebuild
deleted file mode 100644
index a66f942b8d4f..000000000000
--- a/dev-python/setproctitle/setproctitle-1.2.3.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..11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Allow customization of the process title"
-HOMEPAGE="
-	https://github.com/dvarrazzo/py-setproctitle/
-	https://pypi.org/project/setproctitle/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-distutils_enable_tests pytest
diff --git a/dev-python/setproctitle/setproctitle-1.3.0.ebuild b/dev-python/setproctitle/setproctitle-1.3.0.ebuild
deleted file mode 100644
index 13ace7223215..000000000000
--- a/dev-python/setproctitle/setproctitle-1.3.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..11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Allow customization of the process title"
-HOMEPAGE="
-	https://github.com/dvarrazzo/py-setproctitle/
-	https://pypi.org/project/setproctitle/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-distutils_enable_tests pytest
diff --git a/dev-python/setproctitle/setproctitle-1.3.1.ebuild b/dev-python/setproctitle/setproctitle-1.3.1.ebuild
deleted file mode 100644
index 13ace7223215..000000000000
--- a/dev-python/setproctitle/setproctitle-1.3.1.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..11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Allow customization of the process title"
-HOMEPAGE="
-	https://github.com/dvarrazzo/py-setproctitle/
-	https://pypi.org/project/setproctitle/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-distutils_enable_tests pytest
diff --git a/dev-python/setproctitle/setproctitle-1.3.2.ebuild b/dev-python/setproctitle/setproctitle-1.3.2.ebuild
index 13ace7223215..a66f942b8d4f 100644
--- a/dev-python/setproctitle/setproctitle-1.3.2.ebuild
+++ b/dev-python/setproctitle/setproctitle-1.3.2.ebuild
@@ -17,6 +17,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 distutils_enable_tests pytest
diff --git a/dev-python/snakeoil/Manifest b/dev-python/snakeoil/Manifest
index 949d7e7db202..f62b71494144 100644
--- a/dev-python/snakeoil/Manifest
+++ b/dev-python/snakeoil/Manifest
@@ -1,8 +1,6 @@
 DIST snakeoil-0.9.10.tar.gz 264409 BLAKE2B ef4cff92b1110f3b0912a2899732a29de041ea0e1d5338bbee9b84cbd1e9b4231b66be8fbf98bb14e59360294de9652b816b1de904dc948a3ebcd3e429bd03ba SHA512 dfdf3c96a9e65d6353e9251bb4c9c761d9c6084185119f7e653efc27868e5dd41ece0c54307e306d14effd9c2fcfd3ec15407df3f15f2d4ecfe16ae00c6d7e00
 DIST snakeoil-0.9.12.tar.gz 265877 BLAKE2B dda01bbe16b1cd9f0d6c064f6ce165291d96217c9f722a9b32b7443f96a266278c84297d24ee46aa32ffc6b17f0f6c6f41010868c0d54ff33de8fcc404bb76a9 SHA512 8178c7e7dba2366629a3b016cc662152d70347a4167dfb425f5d659a19c17e3d478a5d4f3098e8b2b82d9effbf3e54b269e1e73c0306d537989f4ab7bda4b577
-DIST snakeoil-0.9.5.tar.gz 266086 BLAKE2B 635d2d821e47a92a668b2e95364d6587f0f74c21438356e708d6b16ed6c027df39a28f73d261d8ae06eb32de471124cd5ba5df0fc899f59dad5f7d2363391e00 SHA512 0762d90932bdf995160b3410e224660dae2cce327cdc30d5093ca9e3d16d3e910f88e409a87d2d7da211b850f7d0b7d9c70f053462dd9a651e4202b8ca018105
 EBUILD snakeoil-0.9.10.ebuild 825 BLAKE2B c94cb5a6d09b99771c812c30890443764648314aa0d37a21337a8dce638fdd6fed533999dc0a02a9b48fe5d03650514cd312af0c24a1720844c58d09d6561838 SHA512 711bbe4c753a29073728f49bd8ae173f5410d157541874a09dd4fc7323cb05f22f668834e41db70bd62b498a3e3b3c448ae6a353131ca5fd63083c6502ff55b1
-EBUILD snakeoil-0.9.12.ebuild 828 BLAKE2B 6068e7a9dec6ecf1db9b60526434d38954ce822e6f308777cd0319e2afdc61012d0f85e88b18f1457263655e9a98c200f372f314dcfca73fe1f1ecb95fd09a7b SHA512 9f8f6253202940133db2a22687a78e1a168822cb74ff0683d76f48d2e0f95a5b13acadc70f45b6ab023d3fff699dbe4b858caabd09bce581e43ea2485472b480
-EBUILD snakeoil-0.9.5.ebuild 759 BLAKE2B 4b2243550b1524e10ac0aa8d29191332f1a8a348813f0a151ef6d305dcefc1f5b692acf288ace186e78d079145caa96bb2b384fb180616c37695d352ec36369f SHA512 d82ee34150f8871540f7a8a56ba592d33a6feb94368166267a85b9655d217bf015db279b7fb1a8b1b18678c8f758c015b050d53489a4b8e2f88f07809e0896f7
+EBUILD snakeoil-0.9.12.ebuild 820 BLAKE2B 99f25344b62f708ac74ce1095ef93e72a3a01a1530d679aae81c3a54aa06a7ccc8352a7bfe67c8636e23e32ab17a6f51e9901d9d06cc8159b975066dafab3b96 SHA512 b4f47f4f2a428aad4c89fc0640869aec465e9fb8d81f0b26185d35e73f29eaac898cf3f564791ee626718a3c5d6c4aa714f8dda5b1004e859c68d2bbd1600884
 EBUILD snakeoil-9999.ebuild 828 BLAKE2B 6068e7a9dec6ecf1db9b60526434d38954ce822e6f308777cd0319e2afdc61012d0f85e88b18f1457263655e9a98c200f372f314dcfca73fe1f1ecb95fd09a7b SHA512 9f8f6253202940133db2a22687a78e1a168822cb74ff0683d76f48d2e0f95a5b13acadc70f45b6ab023d3fff699dbe4b858caabd09bce581e43ea2485472b480
 MISC metadata.xml 587 BLAKE2B 900b8c54a2f534b722e6b7bac5784911e475422dfa222b49cc3eb8dff316de2f619cfdbd93ef0093ad66d4f14c465f8ecad59b073a75a0cc7e1eb44f250fea1c SHA512 3599db4056b8d2b7807f677f43f2830eaf7f94124ec483da8a3386c3789b6526c8204f823c1a366ecfd08207195bfd26e31156759afeccb313b0d841181b0963
diff --git a/dev-python/snakeoil/snakeoil-0.9.12.ebuild b/dev-python/snakeoil/snakeoil-0.9.12.ebuild
index e6a030dcee73..1d7e0e67de55 100644
--- a/dev-python/snakeoil/snakeoil-0.9.12.ebuild
+++ b/dev-python/snakeoil/snakeoil-0.9.12.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/pkgcore/snakeoil.git"
 	inherit git-r3
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 fi
 
diff --git a/dev-python/snakeoil/snakeoil-0.9.5.ebuild b/dev-python/snakeoil/snakeoil-0.9.5.ebuild
deleted file mode 100644
index 4c6cfdc00b8b..000000000000
--- a/dev-python/snakeoil/snakeoil-0.9.5.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..9} )
-PYTHON_REQ_USE="threads(+)"
-inherit distutils-r1
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/pkgcore/snakeoil.git"
-	inherit git-r3
-else
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-macos"
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-fi
-
-DESCRIPTION="misc common functionality and useful optimizations"
-HOMEPAGE="https://github.com/pkgcore/snakeoil"
-
-LICENSE="BSD BSD-2 MIT"
-SLOT="0"
-
-RDEPEND="
-	dev-python/lazy-object-proxy[${PYTHON_USEDEP}]"
-
-[[ ${PV} == 9999 ]] && BDEPEND+=" dev-python/cython[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
diff --git a/dev-python/sphinx-autodoc-typehints/Manifest b/dev-python/sphinx-autodoc-typehints/Manifest
index 83a4c0b4b095..e4ffc705f25e 100644
--- a/dev-python/sphinx-autodoc-typehints/Manifest
+++ b/dev-python/sphinx-autodoc-typehints/Manifest
@@ -1,9 +1,3 @@
-DIST sphinx-autodoc-typehints-1.18.3.gh.tar.gz 26457 BLAKE2B 343a6ffcbca40f28a66c67266431f3a9b2292bd0d991de4287b9adf9e02b7d8fb24094646caa55790f32cd9081abca525f310367335d60fa1b7ea3bc9623bb1c SHA512 549bdfad8f5c07f5edb1c6cdeaff39df22cc7bfa475c70b5c54ff46b311d14c9f3682bf68663d852b95ebff8fd1b71038fc077495d99d870ae2efbf72ec99a42
-DIST sphinx-autodoc-typehints-1.19.0.gh.tar.gz 26950 BLAKE2B 4e530c0b16500d8489bed7f50518b1bc30fdc824d41eb6cc66786096c09c910deb92ac580438395e3b71fd2d3b64690986cb035ff2d784e26918a42bdc73d8fc SHA512 d9459aca1091da0fa446d7ce72ef83c172775b66081d87431c14fd9cfda42770dbd08450ff193e3accffe0eb11efde22804e4ffff20a8e0e9072a05bc34a99e9
-DIST sphinx-autodoc-typehints-1.19.1.gh.tar.gz 26942 BLAKE2B a2b16292eeaf87cb4879bf54727874952b61b596c6226679ba472a0e138fc09f82aaeffabf0f83eca56d2b2df609ed0355e1f3ab5dffd8119c1eccc755bbb16d SHA512 16227301bb0e3035163734c852068d7d06ff03c1e577963bdbcffb5b24b1ededc7feb16025fdcf8611182bdbbc7b071288f5d1d42cb0115bef6f9652898e3a8a
 DIST sphinx-autodoc-typehints-1.19.2.gh.tar.gz 26983 BLAKE2B 694edbf94bac05670adad992cfdc7e1146228af7b888a97c4f8e2394623ef3e42251ba0f3c22985517b2a251996cc41a305ea5497b2369363bc00d4bb3d24da7 SHA512 c35c7ed3f0698651be5ba4dd2232912d1f6d9d30e08153527df3fe16001266abc80cd1b11e3a41ccf92140c6baea98105e9bccd9466e65664dcf008f9a944634
-EBUILD sphinx-autodoc-typehints-1.18.3.ebuild 1066 BLAKE2B e43ac460f86ddb31256e3e303b3837f542d0b2b296eb3b917f877dfdd426b542b779d6ca0e4036e80d6689e8de3bda3c2259923400bdf6dc9a46faa6fa6ab012 SHA512 d841abad7e984d33a332262f92eade154363aec0f1fa9588381e6ab9c1c6f0e193f05ccc5d5f9755df52429f096238f2c1b51e2040ae24cca027a5d3fe8492c1
-EBUILD sphinx-autodoc-typehints-1.19.0.ebuild 1073 BLAKE2B b7579a2dbe8747265b60eed1d96627561447d2631279c5793f6eee56dfba83e74f21c21eaca4585de78380722da1ad567945c4053b058891172a2b91645f80e2 SHA512 a68916030b5b9a2b0b4e14ff548ba23a3f4df1baa7e0633436b91fdf4a1ba5b4d1a7d937fc44ed637c262192a1c437d4e78b698b6c1294967e078d955cdb3c58
-EBUILD sphinx-autodoc-typehints-1.19.1.ebuild 1073 BLAKE2B b7579a2dbe8747265b60eed1d96627561447d2631279c5793f6eee56dfba83e74f21c21eaca4585de78380722da1ad567945c4053b058891172a2b91645f80e2 SHA512 a68916030b5b9a2b0b4e14ff548ba23a3f4df1baa7e0633436b91fdf4a1ba5b4d1a7d937fc44ed637c262192a1c437d4e78b698b6c1294967e078d955cdb3c58
-EBUILD sphinx-autodoc-typehints-1.19.2.ebuild 1073 BLAKE2B b7579a2dbe8747265b60eed1d96627561447d2631279c5793f6eee56dfba83e74f21c21eaca4585de78380722da1ad567945c4053b058891172a2b91645f80e2 SHA512 a68916030b5b9a2b0b4e14ff548ba23a3f4df1baa7e0633436b91fdf4a1ba5b4d1a7d937fc44ed637c262192a1c437d4e78b698b6c1294967e078d955cdb3c58
+EBUILD sphinx-autodoc-typehints-1.19.2.ebuild 1066 BLAKE2B e43ac460f86ddb31256e3e303b3837f542d0b2b296eb3b917f877dfdd426b542b779d6ca0e4036e80d6689e8de3bda3c2259923400bdf6dc9a46faa6fa6ab012 SHA512 d841abad7e984d33a332262f92eade154363aec0f1fa9588381e6ab9c1c6f0e193f05ccc5d5f9755df52429f096238f2c1b51e2040ae24cca027a5d3fe8492c1
 MISC metadata.xml 807 BLAKE2B 368714db91017473456e0854b7e2024ac6d24b4ba3d5ae2a44697546c4f96185a44ecc9da8dc816d9661f5815d7d31751d2d87d599c748d06db3f1dde32a141c SHA512 04882668dfa68354aa8ee5860db11963153fb29d9c26b3367fcef63da4ebbccf049909946e73fd06250bf784dcb783b1bc70fb29b9aaa1fcb19be9fcf470ebbe
diff --git a/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.18.3.ebuild b/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.18.3.ebuild
deleted file mode 100644
index 8ef083efe1aa..000000000000
--- a/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.18.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
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Type hints support for the Sphinx autodoc extension"
-HOMEPAGE="
-	https://github.com/tox-dev/sphinx-autodoc-typehints/
-	https://pypi.org/project/sphinx-autodoc-typehints/
-"
-SRC_URI="
-	https://github.com/tox-dev/sphinx-autodoc-typehints/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-SLOT="0"
-
-RDEPEND="
-	>=dev-python/sphinx-4.5[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/nptyping-2.1.1[${PYTHON_USEDEP}]
-		dev-python/sphobjinv[${PYTHON_USEDEP}]
-		>=dev-python/typing-extensions-4.1[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# this package is addicted to Internet
-	tests/test_sphinx_autodoc_typehints.py::test_format_annotation
-)
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.19.0.ebuild b/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.19.0.ebuild
deleted file mode 100644
index 9eca6f1f4db5..000000000000
--- a/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.19.0.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
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Type hints support for the Sphinx autodoc extension"
-HOMEPAGE="
-	https://github.com/tox-dev/sphinx-autodoc-typehints/
-	https://pypi.org/project/sphinx-autodoc-typehints/
-"
-SRC_URI="
-	https://github.com/tox-dev/sphinx-autodoc-typehints/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-SLOT="0"
-
-RDEPEND="
-	>=dev-python/sphinx-4.5[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/nptyping-2.1.1[${PYTHON_USEDEP}]
-		dev-python/sphobjinv[${PYTHON_USEDEP}]
-		>=dev-python/typing-extensions-4.1[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# this package is addicted to Internet
-	tests/test_sphinx_autodoc_typehints.py::test_format_annotation
-)
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.19.1.ebuild b/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.19.1.ebuild
deleted file mode 100644
index 9eca6f1f4db5..000000000000
--- a/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.19.1.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
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Type hints support for the Sphinx autodoc extension"
-HOMEPAGE="
-	https://github.com/tox-dev/sphinx-autodoc-typehints/
-	https://pypi.org/project/sphinx-autodoc-typehints/
-"
-SRC_URI="
-	https://github.com/tox-dev/sphinx-autodoc-typehints/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-SLOT="0"
-
-RDEPEND="
-	>=dev-python/sphinx-4.5[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/nptyping-2.1.1[${PYTHON_USEDEP}]
-		dev-python/sphobjinv[${PYTHON_USEDEP}]
-		>=dev-python/typing-extensions-4.1[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# this package is addicted to Internet
-	tests/test_sphinx_autodoc_typehints.py::test_format_annotation
-)
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.19.2.ebuild b/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.19.2.ebuild
index 9eca6f1f4db5..8ef083efe1aa 100644
--- a/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.19.2.ebuild
+++ b/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.19.2.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 "
 
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 SLOT="0"
 
 RDEPEND="
diff --git a/dev-python/sphinx-gallery/Manifest b/dev-python/sphinx-gallery/Manifest
index a70553cf16f5..433fd154a4e5 100644
--- a/dev-python/sphinx-gallery/Manifest
+++ b/dev-python/sphinx-gallery/Manifest
@@ -1,7 +1,3 @@
-DIST sphinx-gallery-0.10.1.tar.gz 6546135 BLAKE2B 1f4ead74b848f28944820a77717183d845d1fba7459d11fa9bece16c5cd83742e012cce6906f8f5cd357e5c7db01107b6c7c32e2f7d5b7ce46dcd8d6a4b36e9c SHA512 da3b35907782846a58402fddf2a7f507eba76cd708725ff0ba097ec7bda6e9029252c9fb4df6d192aa7f64c6873465d4ff5e634b5c4cc6c4294e0d38c6db2f02
-DIST sphinx-gallery-0.11.0.tar.gz 395136 BLAKE2B 4380484cb37baeb749469f810cbaf24f51a4f83a24a6ff868d1b8872f58db7b189575e8023926b70c576b029b895e18c3de070d69d20a87c70db5d959ebe8915 SHA512 8c97c9bea3bdeb400715bf7ad36e277c01efd5a5d9a85eaeac397eb1f7066112eaf8ef46cc42226275e50e030bfb1010d7516db70e415fbde953f051f4c3cbf4
 DIST sphinx-gallery-0.11.1.tar.gz 393927 BLAKE2B c4c56e7bc7bfc519cd172cd104cfee902524c70de7fe76cc816d8f4612cbdf1a0786e3d5f83ea74ce7c1726eeaea5db45682efa3d873efeac49d94ab1393b9ac SHA512 514139213516851fe09aac4168d8fff72e5ce62eecdb0864f58e45d5fe6eab58b8fda749b72ae98f94b2bf8ac1a917396195d8a4d1750ec1563b30b879b12b8d
-EBUILD sphinx-gallery-0.10.1.ebuild 1055 BLAKE2B 4b03d191760f92eb3bc2563a11d05f7f41d45f4f5372eb11fd88d41eecf5c545b98ae57d91d2346f5682a92052a75e57a250843a3cee765d069f0aad8909059e SHA512 ec79ae83df2361599eab7f3b0509719c720c64db56b57b6d8fbadd79b6e233d1948a312b95b95038c41fee6907a1a3c014d921860abe06f5a840c3d9b16e3875
-EBUILD sphinx-gallery-0.11.0.ebuild 1089 BLAKE2B 0e1d57d8c7088773d566537bd4e3e9f4102e77a9e779f9f864d67c3592c017c3ba74339e114e1485aa53ee65425187da96ad4db1a622f1ffa49b95dfdb8b3da0 SHA512 bf92876c1f8aa236742812f997f5ef3bceb5c5e3478f2a25dc7a2889d3d7987ff64f6d1f89e81ee8be34f7cf568fe3964d2ec0d9b1a542b6cc585ca2fe2dcf67
-EBUILD sphinx-gallery-0.11.1.ebuild 1089 BLAKE2B 0e1d57d8c7088773d566537bd4e3e9f4102e77a9e779f9f864d67c3592c017c3ba74339e114e1485aa53ee65425187da96ad4db1a622f1ffa49b95dfdb8b3da0 SHA512 bf92876c1f8aa236742812f997f5ef3bceb5c5e3478f2a25dc7a2889d3d7987ff64f6d1f89e81ee8be34f7cf568fe3964d2ec0d9b1a542b6cc585ca2fe2dcf67
+EBUILD sphinx-gallery-0.11.1.ebuild 1086 BLAKE2B 03bd71af69990bf3d30a0312d9595fcafe8e960efa8052ce598b80687e8b7dfb9856cc7e765be09e7c8fefc99e9fe5e01dad4978511952e26a9c8c87d927809b SHA512 05d2aaec682daa834f66bbfe3b831792248a77130ba57826351346b5320b458f434dc864d82e12d476f644982935e91bb9fcab0a586a793613d01f635e482a35
 MISC metadata.xml 424 BLAKE2B 4e5cd1e912fd5934c7221d3e5cc60b2894eca6b994384f6ceb8397ce9c5312be1e9869b57f9dd7f3ac66501b20e6fd6abd2f33b5d19b93d3a12f7158ba08e7c6 SHA512 17acc19bf43dbbf1a377949576252f77fd334ddd8a3bec593d2339db5a44e4fde831f9ce47be97318bf72e30a062608f883e48cf572904b3476fde0df33adb09
diff --git a/dev-python/sphinx-gallery/sphinx-gallery-0.10.1.ebuild b/dev-python/sphinx-gallery/sphinx-gallery-0.10.1.ebuild
deleted file mode 100644
index cd6c79e83ffa..000000000000
--- a/dev-python/sphinx-gallery/sphinx-gallery-0.10.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Sphinx extension to automatically generate an examples gallery"
-HOMEPAGE="
-	https://sphinx-gallery.github.io/
-	https://github.com/sphinx-gallery/sphinx-gallery"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	dev-python/matplotlib[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/sphinx[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/joblib[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e 's:--cov-report= --cov=sphinx_gallery::' setup.cfg || die
-	distutils-r1_src_prepare
-}
-
-EPYTEST_DESELECT=(
-	# Internet
-	sphinx_gallery/tests/test_docs_resolv.py::test_embed_code_links_get_data
-	sphinx_gallery/tests/test_full.py::test_run_sphinx
-	sphinx_gallery/tests/test_full.py::test_embed_links_and_styles
-)
diff --git a/dev-python/sphinx-gallery/sphinx-gallery-0.11.0.ebuild b/dev-python/sphinx-gallery/sphinx-gallery-0.11.0.ebuild
deleted file mode 100644
index 74dea626257b..000000000000
--- a/dev-python/sphinx-gallery/sphinx-gallery-0.11.0.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
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-inherit distutils-r1
-
-DESCRIPTION="Sphinx extension to automatically generate an examples gallery"
-HOMEPAGE="
-	https://sphinx-gallery.github.io/
-	https://github.com/sphinx-gallery/sphinx-gallery"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	dev-python/matplotlib[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/sphinx[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/joblib[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e 's:--cov-report= --cov=sphinx_gallery::' setup.cfg || die
-	distutils-r1_src_prepare
-}
-
-EPYTEST_DESELECT=(
-	# Internet
-	sphinx_gallery/tests/test_docs_resolv.py::test_embed_code_links_get_data
-	sphinx_gallery/tests/test_full.py::test_run_sphinx
-	sphinx_gallery/tests/test_full.py::test_embed_links_and_styles
-)
diff --git a/dev-python/sphinx-gallery/sphinx-gallery-0.11.1.ebuild b/dev-python/sphinx-gallery/sphinx-gallery-0.11.1.ebuild
index 74dea626257b..b181df5174f7 100644
--- a/dev-python/sphinx-gallery/sphinx-gallery-0.11.1.ebuild
+++ b/dev-python/sphinx-gallery/sphinx-gallery-0.11.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 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-python/sphinx-issues/Manifest b/dev-python/sphinx-issues/Manifest
index 4f6ff5bc2272..1420bbe7e1fd 100644
--- a/dev-python/sphinx-issues/Manifest
+++ b/dev-python/sphinx-issues/Manifest
@@ -1,4 +1,3 @@
 DIST sphinx-issues-3.0.1.tar.gz 12320 BLAKE2B 770aa19a443bacd489157244f087fdb99740d5eae2f45246ab0fd0596260f249dcf7fb0642acf0a925d1a1def08f6d944a2ec67017334843b636623b05df8327 SHA512 dd64e1611eb58fc455bedb1658473fd71e4deab1371d8a42e6fa7fe3b128a991251add12e463b9a5826fd4eb5aa12e9a117dcf953feeb8df980a7951e43d8baa
-EBUILD sphinx-issues-3.0.1-r1.ebuild 805 BLAKE2B 4cc1232f7ff63e206f52e2fa3c0a3e8b99c64e5571b3cf2c30dbd543d53a621b2f408fd1b2c5c0318ff0ba9e96dd0569e141f2bd85c22a08e53bb70eb4ee8041 SHA512 690dad07d6cca64467315db976758efdcf0a201c08789a245aedee9bf22a68da65f061c0a1c8c7f345c7e03dfbabea8932aa138fe312e5ff82daf672630e9991
-EBUILD sphinx-issues-3.0.1.ebuild 645 BLAKE2B 379662d629cc43b62e8b4d7c727166496e201318718fe560f68de98ec865f12d6c09c430988a76fa1057c93407767283e41515df64f5e285654093f81f60c76c SHA512 a51e4a999f57bb0ff7d3ee5ee1fb36c37db73c9356a03d0f4ae591361460b2c05a7caa937711b68701ff803529aa287c138af736d80ce543f0d970f011acd3b9
+EBUILD sphinx-issues-3.0.1-r1.ebuild 797 BLAKE2B 5255dffbec5f23887289b7b97966622cfa405fbf8fd6140e4a5314b0aef6ac8dc923f37a2f34e60eaf4cade7fb46bb05554b0d1a03ce6ec4c4b391dde4016f65 SHA512 e27da5182536457360993b33d7d2124da889961a2f053f10a7757790d4b27a54c0faa2ab8de5a19c7f2b2d3a3caa92845a36673225a37367e849a3c1adf8009e
 MISC metadata.xml 484 BLAKE2B 7fad72573c26a9a59e9fea1805e085ad0f1833f4f34a24cb942671b5f30024d816f3f50060c92f3222e88591728f386682a93591a118bfcb74e1c8969a7da50a SHA512 16d56d729665f82a962aa82ea236abd5c98b2e9fa1172390984560680eb39a14758174959aa4ec90806b1b9c286cbb257f8c7c886b9cb52cbfcc30e925be42cf
diff --git a/dev-python/sphinx-issues/sphinx-issues-3.0.1-r1.ebuild b/dev-python/sphinx-issues/sphinx-issues-3.0.1-r1.ebuild
index 46bb5f21d67e..3c4712060618 100644
--- a/dev-python/sphinx-issues/sphinx-issues-3.0.1-r1.ebuild
+++ b/dev-python/sphinx-issues/sphinx-issues-3.0.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/sloria/${PN}/archive/${PV}.tar.gz -> ${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 ~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"
 
 RDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/sphinx-issues/sphinx-issues-3.0.1.ebuild b/dev-python/sphinx-issues/sphinx-issues-3.0.1.ebuild
deleted file mode 100644
index 124033e2da6b..000000000000
--- a/dev-python/sphinx-issues/sphinx-issues-3.0.1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 2019-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="Sphinx extension for linking to your project's issue tracker"
-HOMEPAGE="https://github.com/sloria/sphinx-issues"
-SRC_URI="https://github.com/sloria/${PN}/archive/${PV}.tar.gz -> ${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 ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
-
-RDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
diff --git a/dev-python/sphinx/Manifest b/dev-python/sphinx/Manifest
index 093e4e7a8d55..2d3f520ce3f1 100644
--- a/dev-python/sphinx/Manifest
+++ b/dev-python/sphinx/Manifest
@@ -1,9 +1,7 @@
 AUX sphinx-3.2.1-doc-link.patch 604 BLAKE2B f23f8f9a0a48b170e2b6daaeded1e65aebe830da463d4e30f2405b511cb72dde12767d0113b2d1efdce821c16837d700c71c60de38d20950ca5d6579f19a80ff SHA512 3088ba8768b4ba9e6a187e4c52fcc226efd5125fd01526b4a724504f4c445d69d6964fe79c1325ff7f58edcefc7f3489393ab085ea0458d94c44b186aa16e2f1
 AUX sphinx-4.3.2-doc-link.patch 745 BLAKE2B 94f190d63168be99c4719a917f0a1210c56284c278c3909d9de34a319b4d5afa2337133509c06f87e53d5ae488efd88b0f79542719e8870c137f160732c25189 SHA512 aed97412a49212856ea6ccb392c2aa210862ec25d49c4b81a7ff17bd2d0cfe4811d80f4047622f7b23473e31aad968c34098b590045c1d0592b19f4cb6ec8b3c
 DIST Sphinx-4.5.0.tar.gz 6698212 BLAKE2B e6c46d35492c3d3068c4f97e497d33973ca86b40934578804fcec901fa89d2c52b45a7546b835b873846dd16936c1bd34a7b053aec8206c688d974671155fd56 SHA512 b44d2a81ed67adaefe16a07ae0cf053b5e6c775023aaa6c57d7b3950f171deac410e8004f787b151c3c2fc350650aa69a4dc2dc7239d1fd3d351e5194617cb2c
-DIST sphinx-5.1.0.gh.tar.gz 6766298 BLAKE2B d12ef1ec0edd931a597457d868e8fc3b68675df266d8bb626021fa098aacd6027af925275ccf482b7a0d1c8d3cf4c872fca96359f433017274d66bbdcc0d7efa SHA512 595f6f75703d0849393043f24ac216e0bc726a6bf9a23964f8c024e42f2558e2c4f184752835e4016da85391d494fd20bb526d7d379fa9198ac97ff5eca605a2
 DIST sphinx-5.1.1.gh.tar.gz 6766329 BLAKE2B ff385abe35d4a700cbb3cd8acc72313f7c923d48b38934cc35ea6128ef6c16eb6a33604daea25f81f60b65951b4623f62cd4c1a482b2c5e7285ce0ddb6226c80 SHA512 23261cabbcc73072134c22e7fb36f4c7911f4284cea9cc7be6006e500d9de65727f43214fb4427d307845cc684b9a569960ed276320855283a33b9542a2a6918
 EBUILD sphinx-4.5.0-r1.ebuild 4293 BLAKE2B 4bef871b4129b6048a45ca8bf8752a45543191caf84c18e80d826fc8d8c87c012cae76279ec25c9656b5e2e5f3801f15744e122d187514f1a41638efcca794b9 SHA512 331f455811a822b44a398eca904857fc6db2f91f447468029a855d87a5d72378caf9e504cd168511e24896425820c833c5cc10c6dfac005f952471f5808c1d80
-EBUILD sphinx-5.1.0.ebuild 3952 BLAKE2B bb5c2275de2ab18a564e742d5a1110d5d3c3b42c9892826eaed7cc421260e9bb7006e3bd43025882d92a93d57ff3b838745f544d44ca241bc46ae0e7d128542d SHA512 b1b476e9fe5c9e0159373e4149d807a8ae55117d82e381f29b64ec7d238c63c34585d0c045ed3e0da35dd7b822541d9a8827de65fda72cb936f9ce5e051a4e8c
-EBUILD sphinx-5.1.1.ebuild 3960 BLAKE2B ca9a8adcb1824eb0e8997932a1fb4a2c135a2071330c54be679e5be4ae3c9da4591f4452f8abaa9ce3423d7fc890775cff991f56206a9671161c5cb093c06c57 SHA512 f1c521c029d45df26789e750cbf567e94b293db1fb0b359363e787768e3b44d872e5f7454aacdd2e4e748a4dfb30158a7dc262300389e95f471f68ff862fdb48
+EBUILD sphinx-5.1.1.ebuild 3952 BLAKE2B bb5c2275de2ab18a564e742d5a1110d5d3c3b42c9892826eaed7cc421260e9bb7006e3bd43025882d92a93d57ff3b838745f544d44ca241bc46ae0e7d128542d SHA512 b1b476e9fe5c9e0159373e4149d807a8ae55117d82e381f29b64ec7d238c63c34585d0c045ed3e0da35dd7b822541d9a8827de65fda72cb936f9ce5e051a4e8c
 MISC metadata.xml 568 BLAKE2B ddb7175070df6da4088813cc6b66f25bb4364e2619b1e7da94370f7ce8e73b68b12f618412f81e6be57fcb0c60c10e3913f26a6a578b0f9defa7b9ee8091fcde SHA512 d32b37cbe88f5e3db0c6968bc7aa22c7edfb3794bf7c62facd17e7ae1f4f0fbfc7c9f5512230cce16ed32e2ebb70c23dfe9b36ce38785c5f5b76585410313214
diff --git a/dev-python/sphinx/sphinx-5.1.0.ebuild b/dev-python/sphinx/sphinx-5.1.0.ebuild
deleted file mode 100644
index 2680fb049358..000000000000
--- a/dev-python/sphinx/sphinx-5.1.0.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Python documentation generator"
-HOMEPAGE="
-	https://www.sphinx-doc.org/
-	https://github.com/sphinx-doc/sphinx/
-	https://pypi.org/project/Sphinx/
-"
-SRC_URI="
-	https://github.com/sphinx-doc/sphinx/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="doc latex"
-
-RDEPEND="
-	<dev-python/alabaster-0.8[${PYTHON_USEDEP}]
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	<dev-python/docutils-0.20[${PYTHON_USEDEP}]
-	dev-python/imagesize[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.3[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.5.0[${PYTHON_USEDEP}]
-	>=dev-python/snowballstemmer-1.1[${PYTHON_USEDEP}]
-	dev-python/sphinxcontrib-applehelp[${PYTHON_USEDEP}]
-	dev-python/sphinxcontrib-devhelp[${PYTHON_USEDEP}]
-	dev-python/sphinxcontrib-jsmath[${PYTHON_USEDEP}]
-	>=dev-python/sphinxcontrib-htmlhelp-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/sphinxcontrib-serializinghtml-1.1.5[${PYTHON_USEDEP}]
-	dev-python/sphinxcontrib-qthelp[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-4.4[${PYTHON_USEDEP}]
-	' 3.8 3.9)
-	latex? (
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-luatex
-		app-text/dvipng
-	)
-	!dev-python/namespace-sphinxcontrib
-"
-BDEPEND="
-	doc? (
-		dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
-		media-gfx/graphviz
-	)
-	test? (
-		dev-python/html5lib[${PYTHON_USEDEP}]
-		virtual/imagemagick-tools[jpeg,png,svg]
-		dev-texlive/texlive-fontsextra
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-luatex
-		app-text/dvipng
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/sphinx-3.2.1-doc-link.patch"
-	"${FILESDIR}/sphinx-4.3.2-doc-link.patch"
-)
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# disable internet access
-	sed -i -e 's:^intersphinx_mapping:disabled_&:' \
-		doc/conf.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		esetup.py build_sphinx
-		HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
-	fi
-}
-
-python_test() {
-	mkdir -p "${BUILD_DIR}/sphinx_tempdir" || die
-	local -x SPHINX_TEST_TEMPDIR="${BUILD_DIR}/sphinx_tempdir"
-
-	local EPYTEST_DESELECT=(
-		# these tests require Internet access
-		tests/test_build_latex.py::test_latex_images
-		tests/test_build_linkcheck.py::test_defaults
-		tests/test_build_linkcheck.py::test_defaults_json
-		tests/test_build_linkcheck.py::test_anchors_ignored
-		# TODO
-		tests/test_ext_autodoc_autoclass.py::test_classes
-		tests/test_ext_autodoc_autofunction.py::test_classes
-		tests/test_ext_inheritance_diagram.py::test_import_classes
-	)
-	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
-		tests/test_ext_autodoc.py::test_autodoc_inherited_members_None
-		tests/test_ext_autodoc.py::test_automethod_for_builtin
-		tests/test_ext_autodoc.py::test_cython
-		tests/test_ext_autodoc.py::test_partialfunction
-		tests/test_ext_autodoc_autoclass.py::test_autodoc_process_bases
-		tests/test_ext_autodoc_autoclass.py::test_show_inheritance_for_decendants_of_generic_type
-		tests/test_ext_autodoc_autoclass.py::test_show_inheritance_for_subclass_of_generic_type
-		tests/test_ext_autodoc_autofunction.py::test_builtin_function
-		tests/test_ext_autodoc_autofunction.py::test_methoddescriptor
-		tests/test_ext_autodoc_automodule.py::test_automodule_inherited_members
-		tests/test_ext_autosummary.py::test_autosummary_generate_content_for_module
-		tests/test_ext_autosummary.py::test_autosummary_generate_content_for_module_skipped
-		tests/test_util_inspect.py::test_isattributedescriptor
-		tests/test_util_typing.py::test_stringify_type_hints_pep_585
-	)
-
-	epytest
-}
diff --git a/dev-python/sphinx/sphinx-5.1.1.ebuild b/dev-python/sphinx/sphinx-5.1.1.ebuild
index ed132f4e10f4..2680fb049358 100644
--- a/dev-python/sphinx/sphinx-5.1.1.ebuild
+++ b/dev-python/sphinx/sphinx-5.1.1.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="doc latex"
 
 RDEPEND="
diff --git a/dev-python/sphinxcontrib-doxylink/Manifest b/dev-python/sphinxcontrib-doxylink/Manifest
index 99c2bd6a67c2..9cb64df10533 100644
--- a/dev-python/sphinxcontrib-doxylink/Manifest
+++ b/dev-python/sphinxcontrib-doxylink/Manifest
@@ -1,7 +1,3 @@
-DIST sphinxcontrib-doxylink-1.12.0.gh.tar.gz 22589 BLAKE2B 322fdd0968147abc480a88247ee724daa8c4da4519ff97280af1d81e9f36d4636aca358f5bb1ba08e5ff0f138cf8446194d1fe819a9d18a227eb463b20ee5738 SHA512 7626fad06613a614b5d6efdea088825732571c7ed45f6f2d69f34e0aede020df0930716cb34ca14260891a29aa152019c7bfae8aad729039642ea1c6bbf7d09e
-DIST sphinxcontrib-doxylink-1.12.1.gh.tar.gz 22622 BLAKE2B 2818dc9e155156e60a23183ac35e72b51f316e5e3a8f08379236a141436bbca4fee2ad534a391495dbe9bbc7c0d9f32526f5646592d16c1610121c36275a4c27 SHA512 164c523d6fb081d2ee70fa249901eb0fa3233d20a2ba73b52c4f7bf5f31c3f088c0420e39ace36c66a65fceccc137d6d62c28f7b7b58f3fbf96a3f2f73372fc8
 DIST sphinxcontrib-doxylink-1.12.2.gh.tar.gz 23556 BLAKE2B 8d71de83ec304bbf2a74f414c46d157367fc950dc52bab7f685fba24520985fb06daf8bf760d49d73d7a2418da346bf6c84a493b24edef4ab53c5c09799f7c2e SHA512 e90594031067eed0eec1c7aad9c7d2ba7d9a4ce2012a905f6631947a7135659483d52a6261b923d3fa21fcde59ae8bf24c168507c8e95296e0539595e9589ed2
-EBUILD sphinxcontrib-doxylink-1.12.0.ebuild 1059 BLAKE2B 798ed1bcffcb23faffb634d7abbb27289989f0923ff76641f6ed15edca7ed2fa3eaf3917bf15592d93ee6d70ef24cef00cf125309635f7285a6bf1948ff88497 SHA512 09b4ca6a2fd0143e7c529540498918afdabbfac99cefa4a7bfe01c3419724249a99b013956bf4137098367d7bf68462bb5e1482c8458e1760a9ccb9636d7a1ce
-EBUILD sphinxcontrib-doxylink-1.12.1.ebuild 1092 BLAKE2B 62e65daf67508b9d1aa3a53d18b999504ee7a2c77d6f1a518cec1107c4306c2b93b60996806c89e3cafd4335f36e1d74eda4a5680fb553eb04d45d3634897e79 SHA512 e8dda95622862a60f30bab64a177d9546cc6624a88b5d50c3160e78e3a9d020ca18054f0898d366332e8858594c47bb50d0fd048b78e66633ea5e91688ca46c1
-EBUILD sphinxcontrib-doxylink-1.12.2.ebuild 1092 BLAKE2B 62e65daf67508b9d1aa3a53d18b999504ee7a2c77d6f1a518cec1107c4306c2b93b60996806c89e3cafd4335f36e1d74eda4a5680fb553eb04d45d3634897e79 SHA512 e8dda95622862a60f30bab64a177d9546cc6624a88b5d50c3160e78e3a9d020ca18054f0898d366332e8858594c47bb50d0fd048b78e66633ea5e91688ca46c1
+EBUILD sphinxcontrib-doxylink-1.12.2.ebuild 1090 BLAKE2B 53bf620cfc6b651d2d2867e61077af028784b206758f71c326a1519c6860fbc65f0b942c25d6932b5231c706ff1b2c3b3c06bee3ef4d5ad104a4a2eca2b5f850 SHA512 64ab74473d85309a4a90f2be5988132f65f7c18158e5c8938a63f8a43cf90a24943972e34109e4fbd372362a37d757903095cc41b83bc063948e15717a8f0890
 MISC metadata.xml 620 BLAKE2B e76f6c16f0f8280d0d7a99975a0dad33a76f93a634d99114df5eacf047e434c7356cb501c4021cdee1b17c3e7dd00e7ce4720d70c1ddddcf561c4e622b528549 SHA512 89afb14c72168f5a919347726c1445a205d5839925ead8b3969cc84f062caca0a666cc141f541c21d642f95c3c40fdfe677e3f1cce78aa1a5f6445e140ae7978
diff --git a/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.12.0.ebuild b/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.12.0.ebuild
deleted file mode 100644
index 0f214cf2d915..000000000000
--- a/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.12.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-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} )
-
-inherit distutils-r1
-
-DESCRIPTION="Extension to link to external Doxygen API documentation"
-HOMEPAGE="
-	https://pypi.org/project/sphinxcontrib-doxylink/
-	https://pythonhosted.org/sphinxcontrib-doxylink/
-	https://github.com/sphinx-contrib/doxylink/
-"
-SRC_URI="
-	https://github.com/sphinx-contrib/doxylink/archive/refs/tags/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/doxylink-${PV}"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/sphinx-1.6[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-3.0.8[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.8.2[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		app-doc/doxygen
-		>=dev-python/testfixtures-6.18.5[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx doc
-
-python_test() {
-	distutils_write_namespace sphinxcontrib
-	cd "${T}" || die
-	epytest "${S}"/tests
-}
diff --git a/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.12.1.ebuild b/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.12.1.ebuild
deleted file mode 100644
index a6360df99206..000000000000
--- a/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.12.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-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} )
-
-inherit distutils-r1
-
-DESCRIPTION="Extension to link to external Doxygen API documentation"
-HOMEPAGE="
-	https://pypi.org/project/sphinxcontrib-doxylink/
-	https://pythonhosted.org/sphinxcontrib-doxylink/
-	https://github.com/sphinx-contrib/doxylink/
-"
-SRC_URI="
-	https://github.com/sphinx-contrib/doxylink/archive/refs/tags/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/doxylink-${PV}"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/sphinx-1.6[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-3.0.8[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.8.2[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		app-doc/doxygen
-		>=dev-python/testfixtures-6.18.5[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx doc \
-	dev-python/sphinx_rtd_theme
-
-python_test() {
-	distutils_write_namespace sphinxcontrib
-	cd "${T}" || die
-	epytest "${S}"/tests
-}
diff --git a/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.12.2.ebuild b/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.12.2.ebuild
index a6360df99206..a0fc49e91aa3 100644
--- a/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.12.2.ebuild
+++ b/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.12.2.ebuild
@@ -22,7 +22,7 @@ S="${WORKDIR}/doxylink-${PV}"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/sphinx-1.6[${PYTHON_USEDEP}]
diff --git a/dev-python/spyder-kernels/Manifest b/dev-python/spyder-kernels/Manifest
index 5251239f00bc..97e986ac3de9 100644
--- a/dev-python/spyder-kernels/Manifest
+++ b/dev-python/spyder-kernels/Manifest
@@ -1,7 +1,5 @@
-DIST spyder-kernels-2.3.1.gh.tar.gz 89715 BLAKE2B 567101be14bc759a995b5753ecf129a1e3fb466a16e4d84d55cf19223d8e3bbd439bf519376bd0dfad13b076fcd29aa3f4f7ab66dfa2525f300e7842b7aa2bc7 SHA512 e8831204f242b68a8aff29f3e66c78f38a8b09542d651754c557af7333e7e3d9fa85ac1dd048972cd1f7eadedee3017afd5b2d012b1473b261603e9990ee12af
 DIST spyder-kernels-2.3.2.gh.tar.gz 90754 BLAKE2B 1725ab6a72c31eab7befa1b86406e92eedbc19f7afe72d78c9713cf96a57dcfd950408d11c5e4c769b5f670dd021e047c047deff446d3d609913a3f7a8118640 SHA512 d63ee48e6934679b353dd5a5d42e5faaa4b9a3a7dab8f9e00e5e08526894af23e5dc6c78fc6ce190f181ede6fd32e72d9e1c9a8bc078234d4a7a1bb19923384d
 DIST spyder-kernels-2.3.3.gh.tar.gz 91175 BLAKE2B 351852cd0eae2186f799ac329d2840ca1d427876b987a5eb0a5965020b1be38f1bf82ddd771648aa7d8e6027a1c1b1f3596fbe792fbf8e4b868bba8cbd6190db SHA512 764b935d3dffa531afc092e40aecc3d456261704703744e692a54ddf4ae22b80729912845dcc5c1b5546156efbacdc50aba84c19f9a8aa03435166cd4a4621e6
-EBUILD spyder-kernels-2.3.1-r2.ebuild 2299 BLAKE2B 7cfdb3e34e291f0fd4a533f566ae00bd2c51aa853b6ba082c33ee45c202e23f89fca53071d7c77c21e3d55037555ac23f8cd4d35917b51119d5ef5597b0f2178 SHA512 a9ec26bc612831e27953263b2b303f686a4eb667009a55029c7f75ea14e3e29b9a6cfaef59cf6504bb0cb34f29790b15dead7e2fa6c07020946f837aaaa6dabb
 EBUILD spyder-kernels-2.3.2.ebuild 2299 BLAKE2B 7cfdb3e34e291f0fd4a533f566ae00bd2c51aa853b6ba082c33ee45c202e23f89fca53071d7c77c21e3d55037555ac23f8cd4d35917b51119d5ef5597b0f2178 SHA512 a9ec26bc612831e27953263b2b303f686a4eb667009a55029c7f75ea14e3e29b9a6cfaef59cf6504bb0cb34f29790b15dead7e2fa6c07020946f837aaaa6dabb
 EBUILD spyder-kernels-2.3.3.ebuild 2347 BLAKE2B b77555bb0aed56fa85c7982e606173247b7873dc7acf5526b1c0db343500dc77e6f8f86be5fdbefcd60216d8d9e95ff67db10ddd7edc82ef8e234eb962968239 SHA512 af1bd8ff9097ef7b4af2c521bfd49429145d89b3c9e42e675b9969281280605bf494eccdf23594464c5ff774d713767acc9250725b63031d173bdfcdb52a82ed
 MISC metadata.xml 545 BLAKE2B 52be79edfbfdd86e7f895c53d088399b649901b76c7b69cf6363dfba6954971ce75b14624c2fc4254810112e32721e215255d59035f70850e1c1073f9784e65b SHA512 62ad725aab52d7071ccd5297bd15fcdd5e02e97854fc412a43b5c97b7995c77661251994850616743ce39eee0d0673b3bd4189b00876ed6124bf1871f6fb100c
diff --git a/dev-python/spyder-kernels/spyder-kernels-2.3.1-r2.ebuild b/dev-python/spyder-kernels/spyder-kernels-2.3.1-r2.ebuild
deleted file mode 100644
index 0745e08a1548..000000000000
--- a/dev-python/spyder-kernels/spyder-kernels-2.3.1-r2.ebuild
+++ /dev/null
@@ -1,73 +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="Kernels used by spyder on its ipython console"
-HOMEPAGE="
-	https://github.com/spyder-ide/spyder-kernels/
-	https://pypi.org/project/spyder-kernels/
-"
-SRC_URI="
-	https://github.com/spyder-ide/spyder-kernels/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/cloudpickle[${PYTHON_USEDEP}]
-	<dev-python/ipykernel-7[${PYTHON_USEDEP}]
-	>=dev-python/ipykernel-6.9.2[${PYTHON_USEDEP}]
-	>=dev-python/ipython-7.31.1[${PYTHON_USEDEP}]
-	<dev-python/jupyter_client-8[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_client-7.3.4[${PYTHON_USEDEP}]
-	dev-python/matplotlib-inline[${PYTHON_USEDEP}]
-	>=dev-python/pyzmq-22.1.0[${PYTHON_USEDEP}]
-	>=dev-python/wurlitzer-1.0.3[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		dev-python/cython[${PYTHON_USEDEP}]
-		dev-python/dask[${PYTHON_USEDEP}]
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pandas[${PYTHON_USEDEP}]
-		dev-python/scipy[${PYTHON_USEDEP}]
-		dev-python/xarray[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# we no longer package distributed
-	spyder_kernels/console/tests/test_console_kernel.py::test_dask_multiprocessing
-	# RuntimeError: There is no current event loop in thread 'MainThread'.
-	# https://bugs.gentoo.org/834893
-	spyder_kernels/console/tests/test_console_kernel.py::test_cwd_in_sys_path
-	spyder_kernels/console/tests/test_console_kernel.py::test_multiprocessing
-	spyder_kernels/console/tests/test_console_kernel.py::test_multiprocessing_2
-	spyder_kernels/console/tests/test_console_kernel.py::test_runfile
-	spyder_kernels/console/tests/test_console_kernel.py::test_np_threshold
-	spyder_kernels/console/tests/test_console_kernel.py::test_turtle_launch
-	spyder_kernels/console/tests/test_console_kernel.py::test_matplotlib_inline
-)
-
-python_prepare_all() {
-	# No additional test failures with ipython-8: 843251
-	sed -i -e "/ipython/s:,<8::" setup.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/spyder/Manifest b/dev-python/spyder/Manifest
index 677397deff47..e752d321a0fc 100644
--- a/dev-python/spyder/Manifest
+++ b/dev-python/spyder/Manifest
@@ -1,9 +1,9 @@
 AUX spyder-5.0.0-build.patch 1147 BLAKE2B 68e62f6bd7a021d82f1da8d86c16e2289faac7f760f9bb5dc975053c7f8bb409c79b90eeaf06c5121ca5833442b61929cc640e4f25e6cc27f6118f0fa8f27b5e SHA512 e88cbbeca42ac2720f4e0888df9432d912d3907af267d3fe6a5e658d18d1242c998a70dee88fa0efe9edfcf87a46a40cf75685037d75fce1d596b708acc32096
 AUX spyder-5.2.0-doc-theme-renamed.patch 356 BLAKE2B 666ba289498026ab0679776b8af8f6efe7561a9a736ff19b32eaefcac87d142a55a055556c09f94373869711e81a35ef90832fbfe68acc6cee0f2023742de0be SHA512 396944e6f242bf3b6a27ac9d47f0cc07fd99a55c50f174dbee2fccd1f0b3edf355347bf6291943c3003f55996304d96ce2d2fe45ae7c4291e8425bff73a3a861
-DIST spyder-5.3.1.tar.gz 24415110 BLAKE2B 368179c6ba6d355ca56fe3eb3ed8b24be3e986f1f2d0284f0f5739bdecb21225bce10802883b54dd888da54515bd8477adf6c0d3e38a3c549bb10407534254b0 SHA512 2501ddc45df11671b1a318eb33b50788b334ab10fbafb97a9491775a0efcc6a57814672068ab84314f9cb43961d6fabd9b906fb164cd58c77b6d6ecf0d6621e6
 DIST spyder-5.3.2.gh.tar.gz 24441566 BLAKE2B dae46baf1a2673ee7449d1060302a726963424c946c9a0188ab85401c9a457fe818039ce3217ccd94ee3976b3e1a4dbb4379945862dee039ebd01ca41077846f SHA512 d1e9a83ddad6e637bef9cacc8261e9097684996661f730ff2813c2bdd72b1d58e9ae75f8a54730088761750eee6ae3d622f25fb9d0e6bca70325906cf4fc9348
+DIST spyder-5.3.3.gh.tar.gz 24443628 BLAKE2B 767b3e1d59ce650d2df0d229d94eef53bc4c7b52f5d40fd62748efeb3a756a773110aa17442403a1b37777dd39fc367164ad54cd8f767d4311caa8d3e8bf05da SHA512 7d521f8367953849233538cbfd74f1fd98da87e69dbed8076718e81cd09ae66aca84523c4ecdf0e8aeb60644791754df19f09dd244ce11e3f7decc97bb050e02
+DIST spyder-docs-9156f446a9225446a2a752ecb669cc3db30094a8.gh.tar.gz 90029977 BLAKE2B 7254da77f6d9dd24d9feb8af684d064bb92400acf1561f8a2b9423c63984c22fb3ab384174f87525c3cdb0612590fb97010e9cd1a21ae1e36ffc6d6f9babe973 SHA512 1a9609baea12059fad1e65b84c1db98e15cb3d65e1c60660a1f1ebeab5723b118d6e995a4e4219391d8aafb640da20e2a4984746e9c66893dd0cef2ea3f082f9
 DIST spyder-docs-d43d6cd46b6eb7675ec690b0dff573ca03f2e301.gh.tar.gz 90037375 BLAKE2B 2faf8d2d07b10aec750534c73ebcfc9146533db4223908ecabafb214d7e0a85416aaaf4359f95768572bbd8806f13bd707124f9585299527af5bd5bc735293d4 SHA512 00f12af5298f5b90eaf9a4ea8706b5bb29445ca344b5117801dbac54508eefa29c807e0d4f36524fb5d8b6208204533dc657da63849cadaf13f4aa3652612cb1
-DIST spyder-docs-d43d6cd46b6eb7675ec690b0dff573ca03f2e301.tar.gz 90037375 BLAKE2B 2faf8d2d07b10aec750534c73ebcfc9146533db4223908ecabafb214d7e0a85416aaaf4359f95768572bbd8806f13bd707124f9585299527af5bd5bc735293d4 SHA512 00f12af5298f5b90eaf9a4ea8706b5bb29445ca344b5117801dbac54508eefa29c807e0d4f36524fb5d8b6208204533dc657da63849cadaf13f4aa3652612cb1
-EBUILD spyder-5.3.1-r1.ebuild 7575 BLAKE2B 70df83b94e59f4a805bee4db29ab529f04853e3435ba813407d83be4c558463b6ed810298fb2a08ecd0d84729cd0e2e3173b0999ccbf3c89d26f0507d256501d SHA512 336b7f8532442c36078719b88bec0d0fb0da1619b319100482034e9edbf57dbec375b264d2a81b2d08bd7874f1bc5519d451199ba841bc8632cc71d7375081df
 EBUILD spyder-5.3.2.ebuild 7390 BLAKE2B 1cd5ff8d3a151e81e4aeb18f6e6de150f407c828f1391b4b4e563f6adedb909320f5ca6ab32b9ea497cb3f8e9534dffa5e90eafc06d053e2319f99a380469441 SHA512 e065b06bd5b005c26dc9227b8192d7c26f8861fbd9a33136be75368a7561086e92b1146d1867a09f21f65deba92c107a92115bf2ffd1d1ff8a771eddcab52953
+EBUILD spyder-5.3.3.ebuild 7390 BLAKE2B d1456020cddbfed8589609056f6f363b0c3c0bbd43bc0d1a3be9186597b17fbc609981d0c7c248b5ce210937377e4532487ea0729a4b7fdc559dd55b809a0499 SHA512 b71a9ce568276cd0426cfaad9886bdb7dfd7450b7eb7f6beeb6f2e058d009d9269571d78f3c354230203790e86e45079da56d91b9a3447101cd19cdd88fe2474
 MISC metadata.xml 1316 BLAKE2B 996e794aec3c0a7f3b192fb9a66ebe7afaddc3f1ef2057d36a007770becf3d11ec0d05cf30a520cfb8537c1ae34bc9d89e8bc54224def1f4f2f4b30c657ead53 SHA512 b3cd21a16e51414d22b0f102f88da30ca1c3e596eb032ee7bde3c0d7b396659485c2565f0ed79c437eaca07b535fa3305796386e6023606ad1896edf7d347493
diff --git a/dev-python/spyder/spyder-5.3.1-r1.ebuild b/dev-python/spyder/spyder-5.3.3.ebuild
index 15fb63a0e467..09784e580309 100644
--- a/dev-python/spyder/spyder-5.3.1-r1.ebuild
+++ b/dev-python/spyder/spyder-5.3.3.ebuild
@@ -9,7 +9,7 @@ DISTUTILS_USE_PEP517=setuptools
 inherit optfeature xdg distutils-r1
 
 # Commit of documentation to fetch
-DOCS_PV="d43d6cd46b6eb7675ec690b0dff573ca03f2e301"
+DOCS_PV="9156f446a9225446a2a752ecb669cc3db30094a8"
 
 DESCRIPTION="The Scientific Python Development Environment"
 HOMEPAGE="
@@ -18,8 +18,8 @@ HOMEPAGE="
 	https://pypi.org/project/spyder/
 "
 SRC_URI="
-	https://github.com/spyder-ide/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/spyder-ide/${PN}-docs/archive/${DOCS_PV}.tar.gz -> ${PN}-docs-${DOCS_PV}.tar.gz
+	https://github.com/spyder-ide/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz
+	https://github.com/spyder-ide/${PN}-docs/archive/${DOCS_PV}.tar.gz -> ${PN}-docs-${DOCS_PV}.gh.tar.gz
 "
 
 LICENSE="MIT"
@@ -54,12 +54,12 @@ RDEPEND="
 	<dev-python/qdarkstyle-3.1[${PYTHON_USEDEP}]
 	>=dev-python/qstylizer-0.1.10[${PYTHON_USEDEP}]
 	>=dev-python/qtawesome-1.0.2[${PYTHON_USEDEP}]
-	>=dev-python/qtconsole-5.3.0[${PYTHON_USEDEP}]
+	>=dev-python/qtconsole-5.3.2[${PYTHON_USEDEP}]
 	<dev-python/qtconsole-5.4.0[${PYTHON_USEDEP}]
 	>=dev-python/QtPy-2.1.0[${PYTHON_USEDEP},svg,webengine]
 	>=sci-libs/rtree-0.9.7[${PYTHON_USEDEP}]
 	>=dev-python/sphinx-0.6.6[${PYTHON_USEDEP}]
-	>=dev-python/spyder-kernels-2.3.1[${PYTHON_USEDEP}]
+	>=dev-python/spyder-kernels-2.3.3[${PYTHON_USEDEP}]
 	<dev-python/spyder-kernels-2.4.0[${PYTHON_USEDEP}]
 	>=dev-python/textdistance-4.2.0[${PYTHON_USEDEP}]
 	>=dev-python/three-merge-0.1.1[${PYTHON_USEDEP}]
@@ -132,15 +132,6 @@ python_prepare_all() {
 	# ebuilds handle the version requirements to speed things up and prevent
 	# issues such as Bug 803269.
 	sed -i \
-		-e '/pyqt5/d' \
-		-e '/pyqtwebengine/d' \
-		-e '/python-lsp-server/d' \
-		-e '/parso/d' \
-		-e '/jedi/d' \
-		-e '/pylint/d' \
-		-e '/ipython/d' \
-			requirements/conda.txt || die
-	sed -i \
 		-e "/'pyqt5[ 0-9<=>.,]*',/d" \
 		-e "/'pyqtwebengine[ 0-9<=>.,]*',/d" \
 		-e "/'python-lsp-server\[all\][ 0-9<=>.,]*',/d" \
diff --git a/dev-python/virtualenv/Manifest b/dev-python/virtualenv/Manifest
index f498148b0531..13cc511d552b 100644
--- a/dev-python/virtualenv/Manifest
+++ b/dev-python/virtualenv/Manifest
@@ -1,7 +1,3 @@
-DIST virtualenv-20.16.0.tar.gz 12217565 BLAKE2B 534d665b56191c2e804306677b6771d3d0fa6104c476f8f17fbf40c2f8a3b7ccf6ffa9f8dec4d8de515f610f2ffc7b5d67bc99d82be4c0cc73990e5664a1d1e3 SHA512 f34827ec0e1b7325ee23b53b5fa2c36c1377d3fe7265b7187cf43592f74b37d66747abf69f0f33850212bf3aa69c98147cfffc37b311b98a1127f7ac5d9c69e4
-DIST virtualenv-20.16.2.tar.gz 12217706 BLAKE2B 1dff9c8697eb80cf590819c451790599977d52dcfe2935c7d9e355aeb34c9b3bd4f6d97bb051c7a02ba95878717fac82766a0370124d21a4c89fee42a31bbb31 SHA512 3998ea1e70a56d859be808059249251ca944216998a48af70db731cf5655624c12078d94caa5827ab41326cfd702319d3a486fbc0fe424369e07df39c9cd8ce9
 DIST virtualenv-20.16.3.tar.gz 12219368 BLAKE2B 00a7d38db3e9d929e5f01eb020436cf5b917a10bca876ef4abe7a07f5e86a1b1930ed42acbac96d80375a78b660a70872ba6048c673a4ad4d51cafb7824d8f6d SHA512 d3a90bab9862ea2a70e1dc429dff98a729425858a2153281cba4ecaf13107e6c3a43781e8c96b1f2a6c1ddd797de86bcfee8129a698e45d20eed76432efba5a6
-EBUILD virtualenv-20.16.0.ebuild 4823 BLAKE2B c3b6c2db1b4af3874580109b4eef27d2d119ee1ad969a9d463f58d8d9b66acf61fc8d979317fb50b57175d64fcbd8d38bb37a9250603a6c5fc0f0e5d26fce576 SHA512 f2f561f5026c45862771a459f5d1176a8b7bcffb5dbfdaa08fc946d7d1ceda62096015f44409cc21e8758a9a967ebb8957c31e9e2e05f002f318a6643cb22596
-EBUILD virtualenv-20.16.2.ebuild 4831 BLAKE2B 2b51a3445b2ebf8570a8af6a4a49e746854c44f3060bdad926dc20e657aca800aff09b345faf25e23bf991d7b7fbbc3f8bb9fe73b6645186a798fe38b42825e8 SHA512 cb68375357095304a6f52c6a0fea22b54c7531e4091f709a9363c202dab2804c7c018b343a7a938c97ac728124d229946280a34946c5077839b12974ed43fd79
-EBUILD virtualenv-20.16.3.ebuild 4839 BLAKE2B 30c1c06aa24da5da51446ba58d9775ab6021d3af1934bf14599941e4c812595f9873897bef133e6018e601db64625c2cd8d730cbadd08bf619f4858d75f41e08 SHA512 6d3474150863394fae062f5d3b5da0281ac9002bd2c17c72b332f63e5ea141c10a176090c482a746464b43b3563d5e96a4dd4fbfacd08e8ac9e1e00e92a69367
+EBUILD virtualenv-20.16.3.ebuild 4831 BLAKE2B cba04409dcadfcf6c9b740b8b2fa86fc9df4556976a59ae709ec9a4ecf6313c82aa8dd33bc0c21fddf9b60c52315cb41df2d0beee85d2f0e22c7d766fb6fe882 SHA512 f18f48920f7115b97b7ce4bc2a1f179a47f5a52956b4ad0190c15e1181a987e0cf2a8de4347016d4e7ba593790ad6125d763f20250fc5fe0f6c46631b74163fe
 MISC metadata.xml 406 BLAKE2B 97fee04c2662c5c36b6e16538284def46eb2454424770f42edf2567ed804ca15c4e969c714c57573f897b0946246577ab6e35204ed1f3f1735713d8ab5d24667 SHA512 356d42db463b63a3b3a55c1e98eb661de0a10aa6a5fde4f8b3f888ec73020c6679e86efd8dbb0b3e4a5a720af95e658612ba460fe548e081a90beec75fb9c1b2
diff --git a/dev-python/virtualenv/virtualenv-20.16.0.ebuild b/dev-python/virtualenv/virtualenv-20.16.0.ebuild
deleted file mode 100644
index ecf092aab2ba..000000000000
--- a/dev-python/virtualenv/virtualenv-20.16.0.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Virtual Python Environment builder"
-HOMEPAGE="
-	https://virtualenv.pypa.io/en/stable/
-	https://pypi.org/project/virtualenv/
-	https://github.com/pypa/virtualenv/
-"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-SLOT="0"
-
-RDEPEND="
-	>=dev-python/distlib-0.3.1[${PYTHON_USEDEP}]
-	>=dev-python/filelock-3[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-2[${PYTHON_USEDEP}]
-	>=dev-python/setuptools-41[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-"
-# coverage is used somehow magically in virtualenv, maybe it actually
-# tests something useful
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/flaky[${PYTHON_USEDEP}]
-		>=dev-python/pip-20.0.2[${PYTHON_USEDEP}]
-		>=dev-python/pytest-freezegun-0.4.1[${PYTHON_USEDEP}]
-		>=dev-python/pytest-mock-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/pytest-timeout-1.3.4[${PYTHON_USEDEP}]
-		dev-python/wheel[${PYTHON_USEDEP}]
-		>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
-	)
-"
-
-# (unpackaged deps)
-#distutils_enable_sphinx docs \
-#	dev-python/sphinx-argparse \
-#	dev-python/sphinx_rtd_theme \
-#	dev-python/towncrier
-distutils_enable_tests pytest
-
-src_configure() {
-	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		tests/unit/activation/test_xonsh.py
-		tests/unit/seed/embed/test_bootstrap_link_via_app_data.py::test_seed_link_via_app_data
-		tests/unit/create/test_creator.py::test_cross_major
-		# tests failing without python2 installed
-		"tests/unit/create/test_creator.py::test_py_pyc_missing[True-False]"
-		"tests/unit/create/test_creator.py::test_py_pyc_missing[False-False]"
-	)
-	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
-		'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-isolated]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-global]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-isolated]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-global]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[root-venv-copies-isolated]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[root-venv-copies-global]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[venv-venv-copies-isolated]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[venv-venv-copies-global]'
-		'tests/unit/create/test_creator.py::test_zip_importer_can_import_setuptools'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.10-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.10--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.10-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.10--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3--bin-]'
-	)
-	[[ ${EPYTHON} == python3.11 ]] && EPYTEST_DESELECT+=(
-		# TODO
-		tests/unit/discovery/py_info/test_py_info.py::test_py_info_setuptools
-		tests/unit/discovery/py_info/test_py_info.py::test_custom_venv_install_scheme_is_prefered
-	)
-
-	epytest
-}
-
-pkg_postinst() {
-	elog "Please note that while virtualenv package no longer supports"
-	elog "Python 2.7, you can still create py2.7 virtualenvs via:"
-	elog "  $ virtualenv -p 2.7 ..."
-}
diff --git a/dev-python/virtualenv/virtualenv-20.16.2.ebuild b/dev-python/virtualenv/virtualenv-20.16.2.ebuild
deleted file mode 100644
index 8018e0d0a409..000000000000
--- a/dev-python/virtualenv/virtualenv-20.16.2.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Virtual Python Environment builder"
-HOMEPAGE="
-	https://virtualenv.pypa.io/en/stable/
-	https://pypi.org/project/virtualenv/
-	https://github.com/pypa/virtualenv/
-"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-SLOT="0"
-
-RDEPEND="
-	>=dev-python/distlib-0.3.1[${PYTHON_USEDEP}]
-	>=dev-python/filelock-3[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-2[${PYTHON_USEDEP}]
-	>=dev-python/setuptools-41[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-"
-# coverage is used somehow magically in virtualenv, maybe it actually
-# tests something useful
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/flaky[${PYTHON_USEDEP}]
-		>=dev-python/pip-20.0.2[${PYTHON_USEDEP}]
-		>=dev-python/pytest-freezegun-0.4.1[${PYTHON_USEDEP}]
-		>=dev-python/pytest-mock-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/pytest-timeout-1.3.4[${PYTHON_USEDEP}]
-		dev-python/wheel[${PYTHON_USEDEP}]
-		>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
-	)
-"
-
-# (unpackaged deps)
-#distutils_enable_sphinx docs \
-#	dev-python/sphinx-argparse \
-#	dev-python/sphinx_rtd_theme \
-#	dev-python/towncrier
-distutils_enable_tests pytest
-
-src_configure() {
-	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		tests/unit/activation/test_xonsh.py
-		tests/unit/seed/embed/test_bootstrap_link_via_app_data.py::test_seed_link_via_app_data
-		tests/unit/create/test_creator.py::test_cross_major
-		# tests failing without python2 installed
-		"tests/unit/create/test_creator.py::test_py_pyc_missing[True-False]"
-		"tests/unit/create/test_creator.py::test_py_pyc_missing[False-False]"
-	)
-	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
-		'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-isolated]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-global]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-isolated]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-global]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[root-venv-copies-isolated]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[root-venv-copies-global]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[venv-venv-copies-isolated]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[venv-venv-copies-global]'
-		'tests/unit/create/test_creator.py::test_zip_importer_can_import_setuptools'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.10-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.10--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.10-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.10--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3--bin-]'
-	)
-	[[ ${EPYTHON} == python3.11 ]] && EPYTEST_DESELECT+=(
-		# TODO
-		tests/unit/discovery/py_info/test_py_info.py::test_py_info_setuptools
-		tests/unit/discovery/py_info/test_py_info.py::test_custom_venv_install_scheme_is_prefered
-	)
-
-	epytest
-}
-
-pkg_postinst() {
-	elog "Please note that while virtualenv package no longer supports"
-	elog "Python 2.7, you can still create py2.7 virtualenvs via:"
-	elog "  $ virtualenv -p 2.7 ..."
-}
diff --git a/dev-python/virtualenv/virtualenv-20.16.3.ebuild b/dev-python/virtualenv/virtualenv-20.16.3.ebuild
index fe3fd6720779..f3f1dcc67007 100644
--- a/dev-python/virtualenv/virtualenv-20.16.3.ebuild
+++ b/dev-python/virtualenv/virtualenv-20.16.3.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 SLOT="0"
 
 RDEPEND="
diff --git a/dev-python/werkzeug/Manifest b/dev-python/werkzeug/Manifest
index fd7ac0f9d47a..8c0567ab6ef6 100644
--- a/dev-python/werkzeug/Manifest
+++ b/dev-python/werkzeug/Manifest
@@ -1,7 +1,5 @@
 DIST werkzeug-2.2.0.gh.tar.gz 839619 BLAKE2B b6eae91d9a44d030517be5da13c448cf4a2778db7cde61ce36add8dea6f2ac251b31e71d128c4156f44083a4c1b77e546a7e6c55787d8beb93c49538d45b51fd SHA512 2de05269ccd3d83728d435d2f155887a5fd3f3bda9b71c32ffd64b089116c80e89319870fa082f1c6feeeb797b665521b9692ce6c87dcb48b7fa49b2fc63516b
-DIST werkzeug-2.2.1.gh.tar.gz 840062 BLAKE2B da7c59eb182e2318c291a6d346a2a444cc054726dd3cf47617b82440383a4c1068b4a31adb6f44d1b965e2efbacf7469c1845d3666fe24288e976bc25794ebcf SHA512 466d164f8a5861cd36eaaf3674a8bb6640593981007d1d6bced1abbdaf8c6a39666601960ebfb2dc35b7c9c17a961ea07bf919cd646c282d27fd5e0f36cc3035
 DIST werkzeug-2.2.2.gh.tar.gz 844463 BLAKE2B 84da3dd89375d6925e7e7018701339ddfd2b608acf6b3f126bd56c2020056511de6ab157de9024069d1342f9bce4b481ba91a06089fff1a3b31f4a851af7f935 SHA512 cded6c7e0b00871366b70a41de45e31323c0fc09300413d0efca98f5a2f8207026fd77c7e5670fde727da377fd02b9b636f390a2524d2b5778e9e3bdbdfe3e3a
 EBUILD werkzeug-2.2.0.ebuild 1770 BLAKE2B a5d65d70e8ca4835a38cc6ffe29c6d10b5f8a0a20ca6a0a23edaaa50981fc8c8dc45008e640ebc33fd2f87a765c521b33f0420f0c6f496e116fd463730e7bad0 SHA512 b3e51e66bc53924f8d3f2e61a08a0d4a6ef8c4434440607a34dfae70109f26f86918b2071d99a6df7f86d64429d48b6ea15bc28b4b912425866c88467b7332b4
-EBUILD werkzeug-2.2.1.ebuild 1778 BLAKE2B e011d2b1360a53bf091ad9e2f524e8cd117fa7bcd3dc2104d8b16c08ceedd5c97d2fd5d9c8b8214d725740e07abb95bbd3ed827fe8d18428f3bc40063f211619 SHA512 e944bbccbe63a1c8cfabc5087668332037e474cf01267c5517b988392fb192fc805c406d20bb0f72a932a28bf7e60c0bae65789889758d3fb0cb0586e97dddb5
-EBUILD werkzeug-2.2.2.ebuild 1778 BLAKE2B e011d2b1360a53bf091ad9e2f524e8cd117fa7bcd3dc2104d8b16c08ceedd5c97d2fd5d9c8b8214d725740e07abb95bbd3ed827fe8d18428f3bc40063f211619 SHA512 e944bbccbe63a1c8cfabc5087668332037e474cf01267c5517b988392fb192fc805c406d20bb0f72a932a28bf7e60c0bae65789889758d3fb0cb0586e97dddb5
+EBUILD werkzeug-2.2.2.ebuild 1770 BLAKE2B d060cd8e06d36352772d0f7405544a00a8bdf08afc567ec07448444baf833d1bd2c3a63340d2c624018214361c42ef0cb82cdd96cb74261a724f8980e6264109 SHA512 0c9ef5e65b8d125ca6a0a97369249449215cb5e36c8c0cae3f56f703efb304a51e809ece64b9b330e285ce66a6dda1ebde99c6df8982823531be0d7316cf189a
 MISC metadata.xml 368 BLAKE2B 81932229098620395623f9149ac974f19fae9b65ad09943ee5c5d8d03c1e37e76061291c959fe5f004f531a244b3bb335c2a43dd66949c0be43493e45674d0e3 SHA512 67e5b5fea8052c0723820125271ea031ad984e0fe2af21d2423fc559bdc51dfe1d40f2fa5fe11e6d2b8b32216e716900080b859aad146c079ad2b390dd9844cf
diff --git a/dev-python/werkzeug/werkzeug-2.2.1.ebuild b/dev-python/werkzeug/werkzeug-2.2.1.ebuild
deleted file mode 100644
index 1d31830ca31d..000000000000
--- a/dev-python/werkzeug/werkzeug-2.2.1.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
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Collection of various utilities for WSGI applications"
-HOMEPAGE="
-	https://palletsprojects.com/p/werkzeug/
-	https://pypi.org/project/Werkzeug/
-	https://github.com/pallets/werkzeug/
-"
-SRC_URI="
-	https://github.com/pallets/werkzeug/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	>=dev-python/markupsafe-2.1.1[${PYTHON_USEDEP}]
-"
-# NOTE: remove the loong mask after greenlet gains support for loong
-# see https://github.com/python-greenlet/greenlet/pull/257
-BDEPEND="
-	test? (
-		dev-python/ephemeral-port-reserve[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		dev-python/pytest-xprocess[${PYTHON_USEDEP}]
-		dev-python/watchdog[${PYTHON_USEDEP}]
-		!alpha? ( !arm? ( !hppa? ( !ia64? ( !s390? (
-			$(python_gen_cond_dep '
-				dev-python/cryptography[${PYTHON_USEDEP}]
-			' python3_{8..11} pypy3 # TODO: add py3.11 when ported
-			)
-		) ) ) ) )
-		!hppa? ( !ia64? ( !loong? (
-			$(python_gen_cond_dep '
-				dev-python/greenlet[${PYTHON_USEDEP}]
-			' python3_{8..10})
-		) ) )
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=()
-	if ! has_version "dev-python/cryptography[${PYTHON_USEDEP}]"; then
-		EPYTEST_DESELECT+=(
-			"tests/test_serving.py::test_server[https]"
-			tests/test_serving.py::test_ssl_dev_cert
-			tests/test_serving.py::test_ssl_object
-		)
-	fi
-
-	# the default portage tempdir is too long for AF_UNIX sockets
-	local -x TMPDIR=/tmp
-	epytest -p no:django -p no:httpbin tests
-}
diff --git a/dev-python/werkzeug/werkzeug-2.2.2.ebuild b/dev-python/werkzeug/werkzeug-2.2.2.ebuild
index 1d31830ca31d..5d9b899de3ef 100644
--- a/dev-python/werkzeug/werkzeug-2.2.2.ebuild
+++ b/dev-python/werkzeug/werkzeug-2.2.2.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/markupsafe-2.1.1[${PYTHON_USEDEP}]
author	V3n3RiX <venerix@koprulu.sector>	2022-08-30 22:49:20 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2022-08-30 22:49:20 +0100
commit	6cef603bfc4353c863a1a0b460a0aa882d2dc51c (patch)
tree	1df444f2d99f097ae87a3481221283e70dec2163 /dev-python
parent	b33c907ab2c29be7bd04369bc2e3f5dd0b109697 (diff)