Adding metadata

author: Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> 2022-04-27 00:37:54 +0000
committer: Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> 2022-04-27 00:37:54 +0000
commit: c59726f73d452c764efc0aeca13eb981cf11cf67 (patch)
tree: 590fcf4aa145563289adfb41ec09ebf37254acf3 /dev-python
parent: 6dcf197a8c97b0dc222865d2e3fcff37b27f066e (diff)
download: baldeagleos-repo-c59726f73d452c764efc0aeca13eb981cf11cf67.tar.gz
baldeagleos-repo-c59726f73d452c764efc0aeca13eb981cf11cf67.tar.xz
baldeagleos-repo-c59726f73d452c764efc0aeca13eb981cf11cf67.zip
123 files changed, 252 insertions, 2945 deletions
diff --git a/dev-python/Arpeggio/Arpeggio-2.0.0.ebuild b/dev-python/Arpeggio/Arpeggio-2.0.0.ebuild
index 35733b8714f4..54c943a9042e 100644
--- a/dev-python/Arpeggio/Arpeggio-2.0.0.ebuild
+++ b/dev-python/Arpeggio/Arpeggio-2.0.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 DEPEND="
 	test? (
diff --git a/dev-python/autobahn/autobahn-22.3.2.ebuild b/dev-python/autobahn/autobahn-22.3.2.ebuild
index 9b7c7ac13093..4fb5ed02281a 100644
--- a/dev-python/autobahn/autobahn-22.3.2.ebuild
+++ b/dev-python/autobahn/autobahn-22.3.2.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/${MY_P}"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 IUSE="test xbr"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/aws-sam-translator/aws-sam-translator-1.45.0.ebuild b/dev-python/aws-sam-translator/aws-sam-translator-1.45.0.ebuild
index 8d673ecf7a8a..ca021c25c99c 100644
--- a/dev-python/aws-sam-translator/aws-sam-translator-1.45.0.ebuild
+++ b/dev-python/aws-sam-translator/aws-sam-translator-1.45.0.ebuild
@@ -21,7 +21,7 @@ S="${WORKDIR}/serverless-application-model-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/boto3-1.17[${PYTHON_USEDEP}]
diff --git a/dev-python/backoff/Manifest b/dev-python/backoff/Manifest
index 3ed6164fd3ba..07b2a0bf598e 100644
--- a/dev-python/backoff/Manifest
+++ b/dev-python/backoff/Manifest
@@ -1,2 +1,3 @@
 DIST backoff-1.11.0.gh.tar.gz 17566 BLAKE2B 4afed5284eb3cbedf54e06fcd89861701613357c672ebabe2611a4bc28c3a6e4539e206cee24bb6a646f7c16c033f16ef56be3b21867aad760b71410749383b7 SHA512 0f5e176bf9d093a72068cf6e55ada8da3e8ec67b85b4fba2d697117dcb3c563a429ff53c5fe17b4a20a8b5ee0420930b789478bd89de5949b628158263413a60
 DIST backoff-1.11.1.gh.tar.gz 17581 BLAKE2B ca940270859ad78cd29d33cfd3c17605f5b42c2c745b7e7a41d53b2d6ef4bee78dd9e8f15c80387da31679aac6d30404c0988013a890ff34bd55e91716c0eff8 SHA512 7ba0e579d2a4a4bb5046ddc0d1f4b5b58ae2969a10a10a3c657e7dd9b8fd0cd6bc56fec18c28c8fb49101521b3840fe31c65e103977ea5f52f3671a07def97d4
+DIST backoff-2.0.0.gh.tar.gz 19327 BLAKE2B a53d97c8f27b05a2cf0fac9d7ffd5c964f7f58c8c1d6957bb495502c4dd2742fb3dc7c9a6e31f9aabc8982d548926a93e23aa1a60bada4cb3ac9f0968647face SHA512 34e37b3ff45e92311e7d040b05783e094cafc5d1d32c7e2cb8ef89cb9c0ca1a7ca2b16ba596c3b1c4a308d1780d790c9b077411eb8d48d6c5c86f2d6ea82f475
diff --git a/dev-python/backoff/backoff-2.0.0.ebuild b/dev-python/backoff/backoff-2.0.0.ebuild
new file mode 100644
index 000000000000..f275ea10057f
--- /dev/null
+++ b/dev-python/backoff/backoff-2.0.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Function decoration for backoff and retry"
+HOMEPAGE="
+	https://github.com/litl/backoff/
+	https://pypi.org/project/backoff/
+"
+SRC_URI="
+	https://github.com/litl/backoff/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DOCS=( README.rst )
+
+BDEPEND="
+	test? (
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/responses[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 7a649d301eb2..7793455efc0c 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -1,15 +1,3 @@
-DIST boto3-1.21.22.tar.gz 479768 BLAKE2B 3ae647a4c06cb9f7c4c32216dba439ce8bbf346fccf5a8651c08b398bcb7fdb0a4ac81c8d311625d0f50634b90c2f8a02160a19435db836ad05edf0d998a148d SHA512 583a49907339fdb8bb1deaec7683dad6bd0c2836a05cc317a8fc97a17e7b79fd114677fd6342cf6f96b1140bf1bcf9ca0fb1fd3af1c86600e6cfba5bbbf21ec2
-DIST boto3-1.21.27.tar.gz 482968 BLAKE2B f8dbabe73377a861cf1d3d2e9388f7ba91f2047d8ce792b44a10693e5b0575924b3abbd8ec2b72d0c3b9a553bb088fc17dc4cd23b571f375db45737376931a46 SHA512 54bb43022ba12fc7b5c54872632cd46c07c6f167246917b5413cdd30de6c327bc625410cdfe62f4ff257ad7c42da762d2bcec5515367e214131259ddc69a9061
-DIST boto3-1.21.32.tar.gz 485694 BLAKE2B da6fa6f38b234af9e67bfeb8182751f1ac533a2aea72d8d407aea21554501f598c9da71f3c30dd952248c1ab244c849b779a329fc941d05b53325fe46de2aba4 SHA512 d65cffa91ae1a29e69e4bac2fc0af704987e9bca914f3f905e00c383bc92127c6e41beed71e9445e3f484c6dadde2372aca69f550af600abbb42731275c53eda
-DIST boto3-1.21.35.tar.gz 486835 BLAKE2B 167070bf09785bac17083cef3caf144cf11a4266c4476af2f6e19b06c81f2d2bcee42b8c7de1d1c9ac178c025bcac08366b2c7cb072cdb663910d45f7e8369fa SHA512 fe73111a46fb27d9c77abec3a13c5267243b2fcc3f89c01d9036f6ca9f362d029c9cbfbb6c1df11b302a9fb0468453fc1b91ee3dac4853bab6662f1ebfa211b2
-DIST boto3-1.21.36.tar.gz 487111 BLAKE2B c812e80a2bd81f2feda25b9e43444d1587eb2706ab4372a71f6aad5051020dc2439c639e04f37322ab0c1a396c22c5dc45e773cf73518886d3aab9980633f45c SHA512 1530cd11471ddfdd6a77a250fc5af7546a760cc281b327be6b67b7e49ab40cdc440d4fbe8a72387009b2c2c3dc2e6d7baaa3b1dec3d5d4d276db89e1312e55cf
-DIST boto3-1.21.37.tar.gz 487557 BLAKE2B 1c716a07279ce2c1020faee9e2e81b2bde3ed6e4c56668fa76eabc03c7c0818f8dc3ac0fcef66d4007d892e1f227e8642757b6fa5d6e1e18184ad17a30a0e404 SHA512 512e7859e700a98aa3112e21bbd7653e39e7e21bc8f3ef623254322f18869bc9b8a65612a3a9133847c189c59b1e2480225b71bdebd38b2e42cf4820d7ab6972
-DIST boto3-1.21.38.tar.gz 487786 BLAKE2B c247f51e3a7a7f9c531ab18d0fa93b90881c869631bffe35be5482a463a6580e733915d4f966d5700cf6bd822676416e9431f261fd237cb9dd85440308399e2d SHA512 a1b09de7a1dbede4000d500d96028a9ae70c60aa0cc1fc74201d52bc76a83dc27937d422592985e22b3dd1b98359255e837f66f51bae59f2104b379bfa7e49b3
-DIST boto3-1.21.39.tar.gz 488120 BLAKE2B 7fc998ec59d19fd6ea0377443920e30bcacdce5f185200757a13758e5e5229a7bbd959cd6854d9520f8ca6737af9f1adba887f3caef50fb7bbc9a2a38df9b472 SHA512 7c949773e0791d170158f7a8cc47559dcd9b2b6fbe422325b12b7d90649244e0475a6c35cfa15e00f1a0f49d2e581ba27d78320514e4ab8e8533bfb8510b37eb
-DIST boto3-1.21.41.tar.gz 488529 BLAKE2B a07662e4499ea6e833ee7a207dbf84522369ae0609ee7ac305fb8afca572114a938a1c0a23d75404c86c6afc2a516148a565e9ff607898566beb9b552fa44c3e SHA512 620fea69e84de1c6e705a33b00ba137f8550e0590492e13ece24bdf8ba6439be58e31821404a6dded02873a69256568d5061bf9de19ab75c37630865dcf97373
 DIST boto3-1.21.42.tar.gz 488786 BLAKE2B eba75a62e2460aeb2ea66641fadb52448314e639af3d3ecb09f2ab48336bfdc78be868a5d710ba295732a65518eaef882a162df4d25cb8cb344aa27ab3f2ecbb SHA512 3ee8a299cad05e4317916286028608f3d289e6c2c3b04606dca8ede9ba7f3e8931321f33c91c40bd9c4aa15a2cab21245de5c26f6637139fa716149fbcac9c2c
-DIST boto3-1.21.43.tar.gz 489557 BLAKE2B ad297963b34d176f686f09da408bbd7f236413fa0c1c88231285ab5c742402ad3c4c8e9da463d6de463e4b9e80f8b30f13999bb990435208cc38123fb4720d41 SHA512 b0c800b4d55d0cf6c1af6f2c55ca1e702ff16d2f40a1eda63b5c100e396c8d5fadc99eb6db41e92a8a86f174009758b31f59d7b5e0d3f17dd532f5c3303b374c
-DIST boto3-1.21.44.tar.gz 490125 BLAKE2B 37a18fe2beff3a232f17b809bf19519800b6481f7f2cf727a45ab965d9dee27978ce1efc192fab70925776757c77573eb2703815958dcf8be9388e0fe8081502 SHA512 4ed06c2adf3187d7cbda5ef481883289a83137bd6065c56a61d0b2d452845f55c74ff8bd62f3558463b83abbfccb4c29638d1774c7076539b3e6ec088eefbb6b
-DIST boto3-1.21.45.tar.gz 491080 BLAKE2B 32692caeb34f9b8bd515b4cd9fa406b9537912abd24c5f5446ff10adf1a038a423e3c1c17fe6469c51cc35067a128064dcee715de81c46b4b118ddd9fb4a89ff SHA512 538fb81c06e1e14e78d39123c531558f0c2a2206ee0f0c9a282b3a86e179ff76682db206cca5c53d4e3b6deb6ded6f8843ad0d398f8584afca1be042782ba004
 DIST boto3-1.21.46.tar.gz 491253 BLAKE2B f55d30087e4f29e3d8ba577d798cd4e4c5fe1f710ac172d6684f005047a422855a6fad91aaaac76e3f33260cbac35be81c8177a80bea913283bcbe7bacb3750f SHA512 0d219b1af786583318a078413a3b30999b2aaad985db72eafe2b63f0068996f0d13b7a48464909cc753d5f9098ea583336ef4887839db5375ebdfcedad3dbffa
 DIST boto3-1.22.0.tar.gz 492175 BLAKE2B cce4b21c0f4de7e70b1c9e402d9e19ccda26e7fc6eab07686c378ae8a9a72a7cf3bb3e2927282e21cd167ca395d63e1fbdfb31d385e5e7a2591c48367c80517c SHA512 b4c51a26e95344ec6e4b876d88148c9603ae7807105ffd0564d928f611c278729f00efd38baff4b31154b358b17ae72c6b90698aef9c013b601bc70d543e2ffb
diff --git a/dev-python/boto3/boto3-1.21.22.ebuild b/dev-python/boto3/boto3-1.21.22.ebuild
deleted file mode 100644
index 0f0535243225..000000000000
--- a/dev-python/boto3/boto3-1.21.22.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="https://github.com/boto/boto3"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	epytest tests/{functional,unit} \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
diff --git a/dev-python/boto3/boto3-1.21.27.ebuild b/dev-python/boto3/boto3-1.21.27.ebuild
deleted file mode 100644
index 80278b309f54..000000000000
--- a/dev-python/boto3/boto3-1.21.27.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="https://github.com/boto/boto3"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	epytest tests/{functional,unit} \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
diff --git a/dev-python/boto3/boto3-1.21.32.ebuild b/dev-python/boto3/boto3-1.21.32.ebuild
deleted file mode 100644
index 80278b309f54..000000000000
--- a/dev-python/boto3/boto3-1.21.32.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="https://github.com/boto/boto3"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	epytest tests/{functional,unit} \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
diff --git a/dev-python/boto3/boto3-1.21.35.ebuild b/dev-python/boto3/boto3-1.21.35.ebuild
deleted file mode 100644
index 80278b309f54..000000000000
--- a/dev-python/boto3/boto3-1.21.35.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="https://github.com/boto/boto3"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	epytest tests/{functional,unit} \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
diff --git a/dev-python/boto3/boto3-1.21.36.ebuild b/dev-python/boto3/boto3-1.21.36.ebuild
deleted file mode 100644
index 80278b309f54..000000000000
--- a/dev-python/boto3/boto3-1.21.36.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="https://github.com/boto/boto3"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	epytest tests/{functional,unit} \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
diff --git a/dev-python/boto3/boto3-1.21.37.ebuild b/dev-python/boto3/boto3-1.21.37.ebuild
deleted file mode 100644
index 80278b309f54..000000000000
--- a/dev-python/boto3/boto3-1.21.37.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="https://github.com/boto/boto3"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	epytest tests/{functional,unit} \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
diff --git a/dev-python/boto3/boto3-1.21.38.ebuild b/dev-python/boto3/boto3-1.21.38.ebuild
deleted file mode 100644
index 80278b309f54..000000000000
--- a/dev-python/boto3/boto3-1.21.38.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="https://github.com/boto/boto3"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	epytest tests/{functional,unit} \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
diff --git a/dev-python/boto3/boto3-1.21.39.ebuild b/dev-python/boto3/boto3-1.21.39.ebuild
deleted file mode 100644
index 80278b309f54..000000000000
--- a/dev-python/boto3/boto3-1.21.39.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="https://github.com/boto/boto3"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	epytest tests/{functional,unit} \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
diff --git a/dev-python/boto3/boto3-1.21.41.ebuild b/dev-python/boto3/boto3-1.21.41.ebuild
deleted file mode 100644
index 80278b309f54..000000000000
--- a/dev-python/boto3/boto3-1.21.41.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="https://github.com/boto/boto3"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	epytest tests/{functional,unit} \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
diff --git a/dev-python/boto3/boto3-1.21.42.ebuild b/dev-python/boto3/boto3-1.21.42.ebuild
index 80278b309f54..0f0535243225 100644
--- a/dev-python/boto3/boto3-1.21.42.ebuild
+++ b/dev-python/boto3/boto3-1.21.42.ebuild
@@ -19,7 +19,7 @@ if [[ "${PV}" == "9999" ]]; then
 	BOTOCORE_PV=${PV}
 else
 	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 
 	# botocore is x.(y+3).z
 	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
diff --git a/dev-python/boto3/boto3-1.21.43.ebuild b/dev-python/boto3/boto3-1.21.43.ebuild
deleted file mode 100644
index 80278b309f54..000000000000
--- a/dev-python/boto3/boto3-1.21.43.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="https://github.com/boto/boto3"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	epytest tests/{functional,unit} \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
diff --git a/dev-python/boto3/boto3-1.21.44.ebuild b/dev-python/boto3/boto3-1.21.44.ebuild
deleted file mode 100644
index 80278b309f54..000000000000
--- a/dev-python/boto3/boto3-1.21.44.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="https://github.com/boto/boto3"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	epytest tests/{functional,unit} \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
diff --git a/dev-python/boto3/boto3-1.21.45.ebuild b/dev-python/boto3/boto3-1.21.45.ebuild
deleted file mode 100644
index 80278b309f54..000000000000
--- a/dev-python/boto3/boto3-1.21.45.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="https://github.com/boto/boto3"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	epytest tests/{functional,unit} \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index 71de0c92b478..4f8ef0435c61 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -1,15 +1,3 @@
-DIST botocore-1.24.22.tar.gz 8839717 BLAKE2B 7b3843900da913561ab2a99f7371139cd8fd89a2eb52a90b33f8fb4c0449ff23a00f56347a2916b271346acf2c0721af0a9695bff3663888aa87c790705ce4c3 SHA512 070222b5eca46fa5463620af63816bc8813c717a56b4c41294556130390959ac14570a1256542f145a5b36727ced9657b386fcd5f538d64912c8a9f049673bd6
-DIST botocore-1.24.27.tar.gz 8856607 BLAKE2B aa149a79106bc6e9460d2b69b032b20d0fcd9b0a4d7dda04ac656e0681aff378267f5c6bde4e64432f309ad4ed89ff8cae50b0dc92f01086f8fbe433e5347ad3 SHA512 1cdeb2926bfdd54eb6805295982891cb02005c01ee74e3394d8680e486fd924f73322fb9ae56730deaf360b0e60c9fd482759d597eadb3dc180cb099beff487c
-DIST botocore-1.24.32.tar.gz 8884956 BLAKE2B c899ed9b540663fc16e937d98c4c4383b5b0b9c36a976a6b872019bee46edb6db4b9fbe9cf5cebfa5fd1f43d37d21213c90a93802e6d95e4218693269021f5fe SHA512 06142282ff93918052fc6d4832061c65088a5ce8a9fdbfb587be4a1575edf1ed160c58159f25446c7717a841e9ddff00b0a95dd5926a738ffb166b70b42da71f
-DIST botocore-1.24.35.tar.gz 8891601 BLAKE2B b6a56efa73a3f76f51764c4c649d38f2e596fb262624bc5931904318b68a773790f6e4e358cf42567aad0de4e97099699935e6da4c21be66a782f7005fbc15bf SHA512 3c0a7c935798a6dcdd419080a31050301f795ff67b8262673ee4ca09d8344f222ce4b1b7bfff3459089bbcb59c42041281ed8005c1533c34c24542d9a45c353c
-DIST botocore-1.24.36.tar.gz 8899058 BLAKE2B c11df5acef305116433aeb4c4b999b8bdeba278506ac066bae3572f578cd2877827cc8a45d74f57fd10c5e87fdd46f39b951ec4d5bd15f0c484194640813080a SHA512 49256c288b74126595521eabcab750a58a05d07ecf5243ce0626961963326099c3fa3cb571664fb72c0f835624bd79e55e4940c9fc4b03b2b1dc7fd7d3a71213
-DIST botocore-1.24.37.tar.gz 8898823 BLAKE2B 5e5495ba399e910479c0172eb4c572a5c0371db720906586c88dc59d8bfc58a50699b05125e1e554a8571b64654604447be1e1a4bfdc2b992272101060638908 SHA512 412a656e879b09bf9f82d02e291e988499106dce1f589b1048adf2145774a5dd9a9ca5f18d2b6eaedd895e384cbf1836c7b6bdc0867a83c7b863bddea77727f4
-DIST botocore-1.24.38.tar.gz 8900705 BLAKE2B 1f1504856d5908df7d8af9f92847d1d7ac9d8ce0258a63bcea4b593aaae4d87e71da45becadb5873eab53ceea6916e4c6a4931efd797b0474e7bfe4f0b60eb46 SHA512 1cf7cf2acc7773ab9f5c4d01eca24191f6d27e3eddd98abd33348bf171bcaa2708e8c9a03ceb2676060a1f906d66e6982fe3bce3b78ed878abc30434812327c0
-DIST botocore-1.24.39.tar.gz 8901325 BLAKE2B ffdafe7b34c7114de12044d14dd9ba58f01b21455f51a527da55450840f7f74cfaee56babb105b18634b06293ef91427534ea08b47d223285046bd718cc6cc7a SHA512 13c24f4e305bc16441682f483b0478730f5487388d73e14fc3750e22fd3c4c1c958146264721f365b00d1cddd4222e7c0b5d0be26df171ba4e95091327a340c8
-DIST botocore-1.24.41.tar.gz 8906754 BLAKE2B ff2e19dca96137f7e6335ad41ce645d132989ddafecfe8be780166b697bd9fff18eaeddd7a88d4b76cf2aa95c1822f88590940d674ea82e97c14d7bdf6c1d5de SHA512 071fb09c50b3eacbb68ddc5831bb8fceef92e5cb8aad9e4b74b1ab65528edbefc83d0bc86271d87aea97d923813ab1613fe342be0815df7a350edf602dae49bd
 DIST botocore-1.24.42.tar.gz 8907476 BLAKE2B 11cdce9d9c69835b1e57757d67d561f24932698dcaf9fc20e1add319889992b9c57c91ab5e9495027b9b96b6782698b29801d3f3815e8bfb47a67197c91448b5 SHA512 c7339cf03b121289eccc8dfe24c16ab28cba121ec1cd1883eaf2b29cd57b5e84d4e4b3a0bfcb8b4cbd0d213976af30630b2bda22e336edbaf208f5edd7823571
-DIST botocore-1.24.43.tar.gz 8913464 BLAKE2B b974ba0a5cc7c1176acab80baf329a11a78f440fe5a6d2b95ffab52d0973aa14c5dc88cfc1e17bf320492013d0f660ea80707c7ea7af384bf56882c31d5a82cd SHA512 aceb7182cbd4895149f751ff68e836b6bca439833213a7cffb20ea86101a60ccccb49941ab8ce5300449f9b2fbfcd42ff523c95eb220890cb060cf2b5de3c4cf
-DIST botocore-1.24.44.tar.gz 8915208 BLAKE2B eecbe7089e2aab77a90cedb87f729e1bd2f2074ec8218d3ebad314ab884806703d8a907c448e35586bafcc71fae0d0991e8656fdc1f937cc18bb503b4a807f93 SHA512 3850ea97e93b6cba211bd42e75ea1499ae09ea9c2acc576c229ca8ae4786779e2ff6ea283443d0d9fc6e856174cbf1bc402cbf87e946ce57f67569b448caf56a
-DIST botocore-1.24.45.tar.gz 8920603 BLAKE2B a71ba9d90edbbdc278890241cfce72753e5d3662298cb7a09e4314da1fa4af8fe33629c10160549b0d0832aef859b5bfeb449c3b559daad531d4e1e23afd2c43 SHA512 e7756bf7913bf5dce81d089674e2375ae5447c434b5ecc29c8b5b824d6cb19fe7f03e81cde46703a43356e5e8e2f45793ad521d0c0c7f3d29a810f01be50b087
 DIST botocore-1.24.46.tar.gz 8922345 BLAKE2B f9caf235e902be9e4e15e9a570e67cac328eb7e53668e7e12ba8e6caa4c9ed53e22115231d58fdf8d782ff3ab618e5485438dce7c454918a5d53341e5e5967ac SHA512 ccdbd6e6617a68f810c5491f37a6e94ffe015b30dfea8b01c2543b58c81573358b69af702df2fcf3efb7dd2c4b715e86957c4d60b8f0a0a51279e921dfe02993
 DIST botocore-1.25.0.tar.gz 8925642 BLAKE2B 7f7b89e59801564284cd5e22958bb590aeb821c38682c7dd6163fd31b1c181ae67412b3d8cde351a48a63c2e762923d6bb2bb051e9a367468eb77db228e1c3ad SHA512 43f3edcd6868b37933b24486091097dd6dfc51f51773bea3e3cff1fce5eef5f8b3df6d09b8815c858f5c8d7e87e8ed14cf13f236e72c851e4f98d52ad85e4afc
diff --git a/dev-python/botocore/botocore-1.24.22.ebuild b/dev-python/botocore/botocore-1.24.22.ebuild
deleted file mode 100644
index 96074109f08d..000000000000
--- a/dev-python/botocore/botocore-1.24.22.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="https://github.com/boto/botocore"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	<dev-python/jmespath-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
-)
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-
-	# unbundle deps
-	rm -r botocore/vendored || die
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# rely on bundled six
-		tests/functional/test_six_imports.py::test_no_bare_six_imports
-		tests/functional/test_six_threading.py::test_six_thread_safety
-	)
-
-	epytest tests/{functional,unit} \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
diff --git a/dev-python/botocore/botocore-1.24.27.ebuild b/dev-python/botocore/botocore-1.24.27.ebuild
deleted file mode 100644
index 5fe8ae8c2f96..000000000000
--- a/dev-python/botocore/botocore-1.24.27.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="https://github.com/boto/botocore"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	<dev-python/jmespath-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
-)
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-
-	# unbundle deps
-	rm -r botocore/vendored || die
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# rely on bundled six
-		tests/functional/test_six_imports.py::test_no_bare_six_imports
-		tests/functional/test_six_threading.py::test_six_thread_safety
-	)
-
-	epytest tests/{functional,unit} \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
diff --git a/dev-python/botocore/botocore-1.24.32.ebuild b/dev-python/botocore/botocore-1.24.32.ebuild
deleted file mode 100644
index 5fe8ae8c2f96..000000000000
--- a/dev-python/botocore/botocore-1.24.32.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="https://github.com/boto/botocore"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	<dev-python/jmespath-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
-)
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-
-	# unbundle deps
-	rm -r botocore/vendored || die
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# rely on bundled six
-		tests/functional/test_six_imports.py::test_no_bare_six_imports
-		tests/functional/test_six_threading.py::test_six_thread_safety
-	)
-
-	epytest tests/{functional,unit} \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
diff --git a/dev-python/botocore/botocore-1.24.35.ebuild b/dev-python/botocore/botocore-1.24.35.ebuild
deleted file mode 100644
index 5fe8ae8c2f96..000000000000
--- a/dev-python/botocore/botocore-1.24.35.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="https://github.com/boto/botocore"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	<dev-python/jmespath-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
-)
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-
-	# unbundle deps
-	rm -r botocore/vendored || die
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# rely on bundled six
-		tests/functional/test_six_imports.py::test_no_bare_six_imports
-		tests/functional/test_six_threading.py::test_six_thread_safety
-	)
-
-	epytest tests/{functional,unit} \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
diff --git a/dev-python/botocore/botocore-1.24.36.ebuild b/dev-python/botocore/botocore-1.24.36.ebuild
deleted file mode 100644
index 5fe8ae8c2f96..000000000000
--- a/dev-python/botocore/botocore-1.24.36.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="https://github.com/boto/botocore"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	<dev-python/jmespath-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
-)
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-
-	# unbundle deps
-	rm -r botocore/vendored || die
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# rely on bundled six
-		tests/functional/test_six_imports.py::test_no_bare_six_imports
-		tests/functional/test_six_threading.py::test_six_thread_safety
-	)
-
-	epytest tests/{functional,unit} \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
diff --git a/dev-python/botocore/botocore-1.24.37.ebuild b/dev-python/botocore/botocore-1.24.37.ebuild
deleted file mode 100644
index 5fe8ae8c2f96..000000000000
--- a/dev-python/botocore/botocore-1.24.37.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="https://github.com/boto/botocore"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	<dev-python/jmespath-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
-)
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-
-	# unbundle deps
-	rm -r botocore/vendored || die
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# rely on bundled six
-		tests/functional/test_six_imports.py::test_no_bare_six_imports
-		tests/functional/test_six_threading.py::test_six_thread_safety
-	)
-
-	epytest tests/{functional,unit} \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
diff --git a/dev-python/botocore/botocore-1.24.38.ebuild b/dev-python/botocore/botocore-1.24.38.ebuild
deleted file mode 100644
index 5fe8ae8c2f96..000000000000
--- a/dev-python/botocore/botocore-1.24.38.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="https://github.com/boto/botocore"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	<dev-python/jmespath-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
-)
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-
-	# unbundle deps
-	rm -r botocore/vendored || die
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# rely on bundled six
-		tests/functional/test_six_imports.py::test_no_bare_six_imports
-		tests/functional/test_six_threading.py::test_six_thread_safety
-	)
-
-	epytest tests/{functional,unit} \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
diff --git a/dev-python/botocore/botocore-1.24.39.ebuild b/dev-python/botocore/botocore-1.24.39.ebuild
deleted file mode 100644
index 5fe8ae8c2f96..000000000000
--- a/dev-python/botocore/botocore-1.24.39.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="https://github.com/boto/botocore"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	<dev-python/jmespath-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
-)
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-
-	# unbundle deps
-	rm -r botocore/vendored || die
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# rely on bundled six
-		tests/functional/test_six_imports.py::test_no_bare_six_imports
-		tests/functional/test_six_threading.py::test_six_thread_safety
-	)
-
-	epytest tests/{functional,unit} \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
diff --git a/dev-python/botocore/botocore-1.24.41.ebuild b/dev-python/botocore/botocore-1.24.41.ebuild
deleted file mode 100644
index 5fe8ae8c2f96..000000000000
--- a/dev-python/botocore/botocore-1.24.41.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="https://github.com/boto/botocore"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	<dev-python/jmespath-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
-)
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-
-	# unbundle deps
-	rm -r botocore/vendored || die
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# rely on bundled six
-		tests/functional/test_six_imports.py::test_no_bare_six_imports
-		tests/functional/test_six_threading.py::test_six_thread_safety
-	)
-
-	epytest tests/{functional,unit} \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
diff --git a/dev-python/botocore/botocore-1.24.42.ebuild b/dev-python/botocore/botocore-1.24.42.ebuild
index 5fe8ae8c2f96..96074109f08d 100644
--- a/dev-python/botocore/botocore-1.24.42.ebuild
+++ b/dev-python/botocore/botocore-1.24.42.ebuild
@@ -18,7 +18,7 @@ if [[ "${PV}" == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 RDEPEND="
diff --git a/dev-python/botocore/botocore-1.24.43.ebuild b/dev-python/botocore/botocore-1.24.43.ebuild
deleted file mode 100644
index 5fe8ae8c2f96..000000000000
--- a/dev-python/botocore/botocore-1.24.43.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="https://github.com/boto/botocore"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	<dev-python/jmespath-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
-)
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-
-	# unbundle deps
-	rm -r botocore/vendored || die
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# rely on bundled six
-		tests/functional/test_six_imports.py::test_no_bare_six_imports
-		tests/functional/test_six_threading.py::test_six_thread_safety
-	)
-
-	epytest tests/{functional,unit} \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
diff --git a/dev-python/botocore/botocore-1.24.44.ebuild b/dev-python/botocore/botocore-1.24.44.ebuild
deleted file mode 100644
index 5fe8ae8c2f96..000000000000
--- a/dev-python/botocore/botocore-1.24.44.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="https://github.com/boto/botocore"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	<dev-python/jmespath-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
-)
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-
-	# unbundle deps
-	rm -r botocore/vendored || die
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# rely on bundled six
-		tests/functional/test_six_imports.py::test_no_bare_six_imports
-		tests/functional/test_six_threading.py::test_six_thread_safety
-	)
-
-	epytest tests/{functional,unit} \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
diff --git a/dev-python/botocore/botocore-1.24.45.ebuild b/dev-python/botocore/botocore-1.24.45.ebuild
deleted file mode 100644
index 5fe8ae8c2f96..000000000000
--- a/dev-python/botocore/botocore-1.24.45.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="https://github.com/boto/botocore"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	<dev-python/jmespath-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
-)
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-
-	# unbundle deps
-	rm -r botocore/vendored || die
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# rely on bundled six
-		tests/functional/test_six_imports.py::test_no_bare_six_imports
-		tests/functional/test_six_threading.py::test_six_thread_safety
-	)
-
-	epytest tests/{functional,unit} \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
diff --git a/dev-python/cfn-lint/cfn-lint-0.59.0.ebuild b/dev-python/cfn-lint/cfn-lint-0.59.0.ebuild
index 71a884c0621e..b9e10b4d9bd2 100644
--- a/dev-python/cfn-lint/cfn-lint-0.59.0.ebuild
+++ b/dev-python/cfn-lint/cfn-lint-0.59.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/aws-sam-translator-1.45.0[${PYTHON_USEDEP}]
diff --git a/dev-python/click/click-8.1.2.ebuild b/dev-python/click/click-8.1.2.ebuild
index 36a359870730..eeccfb40c185 100644
--- a/dev-python/click/click-8.1.2.ebuild
+++ b/dev-python/click/click-8.1.2.ebuild
@@ -27,7 +27,8 @@ distutils_enable_sphinx docs \
 	'>=dev-python/docutils-0.14' \
 	dev-python/pallets-sphinx-themes \
 	dev-python/sphinxcontrib-log_cabinet \
-	dev-python/sphinx-issues
+	dev-python/sphinx-issues \
+	dev-python/sphinx-tabs
 distutils_enable_tests pytest
 
 python_install_all() {
diff --git a/dev-python/cryptography/Manifest b/dev-python/cryptography/Manifest
index 6bf9071c9760..2b03fb552341 100644
--- a/dev-python/cryptography/Manifest
+++ b/dev-python/cryptography/Manifest
@@ -5,6 +5,7 @@ DIST asn1-0.8.7.crate 26288 BLAKE2B 702fdd34d5489b74cad023969c8873c6d469bd58376f
 DIST asn1_derive-0.4.2.crate 3085 BLAKE2B f1cb33bd274db523dd8d66a687816574f8276dcf955b88a3a5a98d05eb0c9b8f0448b569c9dcdea8f428d35468f761cbbd81302ea0ecb4ad51345398d454f7a2 SHA512 4f8a9049a72068dde63066f74bb4308a11720421243cc5243e476c95e24e0a418b26eb1f4d7e1c1d0c3fb79dbb2817f58a5d95c5d257b4367f92f84c7dd7af59
 DIST asn1_derive-0.8.7.crate 4305 BLAKE2B cc1fe4a8c27730e65164daaed5d2d346364f08a47439e012f670db82190dba50cfbdf720cb253d7a057cb4b560b8ce73c557c639e90856e27d632995643dc45f SHA512 44c36d43761d8890354d40c0fe6f5b700bd9d90867ba258437d325fc6e2549921255b47107a2fb556f462194e468f0cb6d27f7bd644e2ffba8d98b0b8d84ee1a
 DIST autocfg-1.0.1.crate 12908 BLAKE2B 40c53cab298e4f26634c3acff3ece6a3371188d91dbf377ed664eabedcde20536edaa93daf406618f37edde019f049a6e7b9a47f627344587dbd126bee2b5e3a SHA512 630b348acb98b012e97804e6325d03c89abc22f2157762c59144c04e6c733daf550bdc7f0fe0b9f3b50e15dae8c1c3c4bdfce3d805b02f0fc987311f5332419b
+DIST autocfg-1.1.0.crate 13272 BLAKE2B 7724055c337d562103f191f4e36cab469e578f0c51cc24d33624dea155d108a07578703766341fd6a4cc1ef52acda406e7dba1650d59115f18261281e5b40203 SHA512 df972c09abbdc0b6cb6bb55b1e29c7fed706ece38a62613d9e275bac46a19574a7f96f0152cccb0239efea04ee90083a146b58b15307696c4c81878cd12de28f
 DIST base64-0.13.0.crate 62070 BLAKE2B b957f65cdb1e28baeca0cefc92fa98be797409b7dabd15e0e88db6cdfb89779b662cba9f2270fbf3b7b66948fdc46c118b8040a78ab72049c48a928fa802bee0 SHA512 991a72999839daa232f508c5b24e7d3225e8a26db8d1d0e747881b115af9e408b92374e163b31e0b0d324c1c2e57e8e38d66861b61eb0a1dba87bb5871940151
 DIST bitflags-1.2.1.crate 16745 BLAKE2B 0fa6d3ce44aad7616d5cd02aad8c1d0b0fed4022650eb43067c4a72e6fc88da05442674fa51826e4858a47c9de233e1ba2229820af094197cd11bb416ceffb2b SHA512 ad89b3798845e23737a620bba581c2ff1ff3e15bac12555c765e201d2c0b90ecea0cdbc5b5b1a3fa9858c385e8e041f8226f5acfae5bbbe9925643fff2bf3f0b
 DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62
@@ -12,8 +13,8 @@ DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b
 DIST chrono-0.4.19.crate 155663 BLAKE2B c92c273fb6475bbb2546dfb75eaa23321bc8f9a5fa8a7c652f527649b96ff8718fa932f52b500b02a4acae7837df5bdb14f69cb821d4962be2790dbd1d023a54 SHA512 a119349bfc2243a249f1d18b1ae548a04b30fecb75913a56f26d1ff8c0eb53097a2674d9141e2094018191cbbc1620843fbddaf52999824e077c1157f0907980
 DIST cryptography-3.3.2.tar.gz 539883 BLAKE2B e35de90362b24170c4025f67914e60c16fbf37fce6bcd5d6f3fe32e5a9bb60de8edbebcb1ff0450fabc9c244d4b1a4618c720b630f28c747fea17e9bf008f01f SHA512 55f6ee13342b3209b1fcb310f4c4d33d22856ee785cb2347e6ad36c34e9b42f6e0d5bece8e458b09663a5b78e34c4567fe7a211b51ca71f55ccc93e3f62dc5e4
 DIST cryptography-3.4.8.tar.gz 35746288 BLAKE2B 750a265a5b518fdc992bf8a402792ff849129286751185f931ea82ebf4c9d3dabfed680ec2eb1c73d4c773ef2feac6186e251365921fbc67044b89bc040d311e SHA512 4007cb3a4312bd8053491741474309e9f39c21fe37e66b6a832ae837cf2e9330b71caa9bfc6d6692764336684c26809cb794521800b7f6dadce4367a588117ff
-DIST cryptography-3fd9d5a8424eef3e08260a622ae3644777ac5339.tar.gz 35828220 BLAKE2B 46fd713e51061e51fdd9767caac8cad17e95c4f3491586b2e454f2ea5e9ae0cf89b857c1a4d8d7e6caaff21d0907da655b6fc1e8789d790f55fe15bab30d70b0 SHA512 d0802cae1c3134942e444d79471376588cca24b2cb18e8684b2ed6dc4ab4607079215df048913d3aa895ac65ea612eb1b2604f695d0539c778f696a1409e331b
 DIST cryptography-df06889f348d7c3b7e9c35e4e5a1b1480f0b2c5a.tar.gz 35823566 BLAKE2B 31e6720761672e36548d47a5b2ba1f1a1a2032c5400655868be3d5575ef6d3b0e87a7f13607c9ffe69a8b240952e8a5ae8c440b2c850fcf9a29b057e2222f1a5 SHA512 158c0238e61d9bba927a5edfd55db741bec88e51873816391816c33f92309d29d6e34580c98419bb0b42be5cd122892696b8e08a452a4f056ead7402c831f51d
+DIST cryptography-e0f6f38433e3a1cb57509dec1bec9107cbbe827d.tar.gz 35849818 BLAKE2B 4b7c411d7d765617fbf875f4b34677cbacccd3229af6df45d62bc19f00fae91cf42b1d0f9cc95a6bf5ba203dbfc9cb69676e01ff0c2a01b273f719b8de2a4a90 SHA512 72942b467c741057ae99892e57cea2da4bd0d7012d43ffe090b390b7eee016964f5ba0bf005b1aefbe108bc430d8b82390e12f148a5497bb02250f0217b71006
 DIST cryptography_vectors-3.3.2.tar.gz 35168168 BLAKE2B 3991a16556ae5be0d153cfe302dd9a860918a80bd0bdef7104f3c170ba63941c4b1ff74750bc12329422a6061161cb6452bea60e191d85c0d79e0852566c6c0b SHA512 18590adb96a6f04b8a41d4346b126b8adfc854cbcec85f8c1c0a23b1b363f215b37da60ea94a481b8fd7752f07fba515b08fc18faf2e29fb858e133129971f7c
 DIST ctor-0.1.20.crate 9328 BLAKE2B bc2f4ce53f6b7d6a2fb441317a3f91b8852c541261f95f0b7d12adb35ec1c943810242ce71e514445479c5d225b735cd50fa4dfb514e6b121be753555ab3c30c SHA512 877f4663f8079a368d198a3351e98551c6d8123dd5e53b812529b77b09f1c08296e6df817d7429e4c70a73a6203fd98bce5ec2ce7b09baabe4f348bd54a9c0dd
 DIST ghost-0.1.2.crate 12777 BLAKE2B 34293c1ec8412ef207627ca2a041f2dd8822c2d8990df8e0f17ffdfc865a1662991a80680c484ddef505758578177d358c2e56003003a2cb685f07a41d6a9feb SHA512 4258fdfab59946a4955f053cf0b73f964d5bdf25ac9357ef8f4cb21948299fb749bf0c0e89a9c1e95a8606e74c6b3a3630fb4f6316815d83882a9531e3b78b5a
@@ -25,14 +26,19 @@ DIST inventory-0.1.10.crate 11572 BLAKE2B 8b5044c9996fd53f726652617ad7f25e3c57e5
 DIST inventory-impl-0.1.10.crate 6228 BLAKE2B 4aa7cddfc306e192ca635e5d32fa9cc61d59824f24bbc67ad6b6996578ca0fecf8e7d04e970720b9261eaef2977dd0773ac1eed35ddffe6c075a6d92007fc276 SHA512 860cb40c77d269b8f8c71db96ee71917a33f8d9b7ed5f24e06e38d0adc5e93dad73ee6688627798cabc7536c42c519788d74ee3bc8abb13b754f7e70be663a32
 DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
 DIST libc-0.2.107.crate 554639 BLAKE2B 583cc24943707bbd53823f15fddfececd7acadb5a4d7dc5d0eb07d7b4d851b93500f1e4081b70c6ce3cc76700bdd6c4173ba710fdd52af7776ec7f31aefa3714 SHA512 df1586889c97d45c95f47495f8285c273c143f1861e632b326345ee66da63c227c064d9e12a6a1b48cfb866c70010a4ad407fed120a1a808da7a345777a8f909
+DIST libc-0.2.124.crate 577742 BLAKE2B d39356e89647df6a0468c2fe7ec351955afcddd38064fb64215833c716bc16636001b6d377d21cf31b773c3f392d19ec5c665d450e81ce09a55bfd6a080c82ca SHA512 19fed1eeac7ffbbe36ecb5beb3816b5244d3017b72376e84e532f253e07ee7bc310f6f636aed46174653232fcdb532c2506bc070bef31699db20572df0c45de3
 DIST libc-0.2.94.crate 511713 BLAKE2B 6ad3fe9aa5ea5fb06a7b2beeb68fa245e5ed7d19aa7e4b21c9e2ab73da11a9249913e604f0f87fbcc82676cceee16f14403cd2f27ae462730e1682c539666283 SHA512 316717d2e46b57c200d67d0ebb4fb162cb1f0b688895b9eb6075924cda3be8ba7fae85319692682178b6fc5cb2764e8b3a9d3e7ce234fd8a21a0a9c453ca174c
 DIST lock_api-0.4.4.crate 20356 BLAKE2B 1b4a648467eba49232df5c595d7c5a0444018269a67db1768c7711d9d1a903a1dd00f99d8654c30186a470c035abdcec9994c8b1a347fc559c684b1792ec7f49 SHA512 655c8a1503b6e7f833b4c62109e1c5005727054847bff81e17d4159f91c02ac97512da0673ab227d17bc9ed0342fe3476247daf74cbc9a0b470e68c648ba706e
 DIST lock_api-0.4.5.crate 25199 BLAKE2B c91adefaa0dc3efa786957794b67cf219f5159909179282c13c7e3b68d73a0acebac29438cfcb39b75cbe87bc181e981ab4ff2776134621d8ea92e7a6aaf966a SHA512 d6cd948a4183a73e8b91b9167d551e72dd75820c76123fb0839f8389c7872d2c46dbcf5785d7600ecc4e27f3d214f476585b9c39e85f70500eb8d012e5ff9535
+DIST lock_api-0.4.7.crate 25371 BLAKE2B 9ed08433ffa70af60193dcf307287991a3154f0ef16b485f32a6c83e64962661a6e08ef83a6b217d6cbf5bd964c0638d8ed86b290087677c1fb3218321c4bbf8 SHA512 b1a5227fd131edaa70e017f7ddb43af8b4efa58488007b898ca1dfc818a3a441b732b7adbf1270e72a68ee5d2a99a5d48f33b2bca8e2cf78694953d20d27636d
 DIST num-integer-0.1.44.crate 22216 BLAKE2B e1c08427e006cde6f2084adadb6086e87e6d6f8bb8dfa757a8228aa671e862a366e4bd8ca5e0500008c18bab128aead9bd5b1e53568a4f40afadcaf3882ee98f SHA512 d07e27ede02a1d007373935fd91e57a26e0e84ae14bbe24be66763baae6850788bd64ad2598d2bde4f4fad6c8a4675c40bfe0927164b16b9b69de5e9a83d9771
 DIST num-traits-0.2.14.crate 45476 BLAKE2B ae310d9d5640acc3e45e1e5d1d2f519539795922c0058ee940c94c94b6654b39358b7c18dd23a276f2c1b16a30dd4de4cbc8575bcda6a5c11e70665d670e6439 SHA512 c3028eca9f7b718de0db3a36cf3e462bdba43562d52c9b809ed4cc0aa6af403aea542d6d4da743cd1dd541397815a3c5a84cef4d6e40122994e4be6a62319b2e
+DIST once_cell-1.10.0.crate 30414 BLAKE2B 4161622dc9dab4748a1b96777da263523f23329808506faea7938160f0d5ca07b5edd31f385b14b88dd2fc34c58063df4d40a34a479573750a369512dc956992 SHA512 f6b5ce5e68923296d2041f83ac037f10ad7b9e94fc607c71332e8ee942a02c29534c2073cecdb132c7e1d91428e9d9687fbf05393ca0abbf7e15db50bb3b74ab
 DIST once_cell-1.8.0.crate 28925 BLAKE2B 7681b1a7497b5711e663773c1a7e076f333c06c10d3f289079a781c36f050c1620cc279742ea8e5b15ec48f3d6038a6079bbda7fee3ae8e1128bd916d53ed43a SHA512 88e55c9433225ce85a08353168c87fca2237615482160a5c28f3ac17f06d48c63e0c21b5f7ef81f82ca133436e371802ea099453844f1c111003bcb6ba89e827
 DIST ouroboros-0.13.0.crate 5929 BLAKE2B ff54f4ed318f7a1875612a4ed5762c60de516f43825f0ecf23e5343958e5c8af68ae4aecc1daf913e58d21183ac037af047be015ef1e5c227ab4750e763ed4ab SHA512 3f5bbf3b9bcb7c8e8f5723ead9d7bc205137973efe7ffe474db707264c4b65e4645d9b9de87e515a1e55831f64d4be719ff7059cf8ed899a71548e3fbfcb0b42
+DIST ouroboros-0.15.0.crate 6177 BLAKE2B 70989f764e3b83cf3f3ed598290540370a305a9b5e22f76954117a19c9bb0ccd4723892c0cbccd361a13e4961c49b3383a3f216b368d70de9d4908da87db1f72 SHA512 20e1dd42bd5789d3822c7f7d862f69c11695c19475cd943ce049b33184e231dac32d89745cf57a2db822f5f2967ee84b29320f40708612610e336aedb0c08be8
 DIST ouroboros_macro-0.13.0.crate 15755 BLAKE2B 16b65a6417ef147d15083c51c96b382a96a71fae124f1baae91432c5de7585edf7ca3f3f8e35b303d3e3c17a411f740d1dccc3382d541c0e7ded22bda81a838e SHA512 976a548c0691f04f797f10a89da2ac4e1d84efca2876308a9b69d8513bfcfcbd5e07cdb62584b80ba83d5839e14b072bf331ecbd1c20fd65e1c2d731f947ce05
+DIST ouroboros_macro-0.15.0.crate 16239 BLAKE2B 6e40a0bd4f04dfe5f1b93f2ff0f9d169792e8f5c9c57089061f488b4d0907d0b45c63d0ccfe2ee7e0989c7009d96760bb4c873afa688e1359db09c1ee8ce0a68 SHA512 78003e89f1a062957d66261474392b32d67a75ab1933b2dadf9c6a8c8ecd29d184ef4a1f25cadd7e1afb23aa58dacf69ca6969c327405be5dc97b8fbc09568ae
 DIST parking_lot-0.11.1.crate 39854 BLAKE2B 5a097d7016811de4ca7d21e8a811a96b2e857b5224b176cf7a3bc160c0a0678c9100423e3c096c5056e2df3a4dcba17a590cc64eb1d648355c153c5cdf9db228 SHA512 17e394ac8b62656177a12fcfd246d9bb59be468a5ac174e4d6d8b4ffd0411497d3ce943ca5deab184cebf5c1bbca97b4273f79bf210c78d7f4b6f5e9d68026a2
 DIST parking_lot-0.11.2.crate 39869 BLAKE2B 67c555e87b68f5763a7790563fd8d542e126bcb77f91267f3b76c51fd73060a2c32dcb91f9d0db7ea772e555d91576c8d7ff48053a9c35fbd3b749d2459a660c SHA512 526b176363dffa59501c18324bb723a3846ef5b0ff9bf1d890e40ad10e7023284f7c8012eda87520eaa94515ee828d9ef52692a9ed590a55e176383d6d472f9e
 DIST parking_lot_core-0.8.3.crate 32147 BLAKE2B 5218cfbff706c4388fef31c885c7a5d53566005775a3c440c6a2890efb189a4edfe8e99f6499cac36038846628a915ac988c15e1ebab1b3a3ffb53a64631dc19 SHA512 1dba5a7e68ee007918fb210ff308f7382ed1c54d2fe6db36a8246453434246b71e6795db107c83ca39c2bddf5e4a27da7978a464b53d41e150e744d81e75b341
@@ -40,33 +46,45 @@ DIST parking_lot_core-0.8.5.crate 32466 BLAKE2B 44d9cb65444ea93fded7e216e3bdbe22
 DIST paste-0.1.18.crate 12259 BLAKE2B ed72b93a27166b0989743c2528d4a41f4b87ffdd0c588557d11a5f37f85d5b8f03ced86150af6209f9fa8d0f6efee705769b26a2f4dc3363f35cc3ac12c0e6ad SHA512 a4d9c75f6f358d6c86eb0a66cdf22eedec180db37358ca2870a992e215d5b389b7991837d8f2769742ac1b093674cb4352ef9d6754a249253472fbcb3a81c001
 DIST paste-impl-0.1.18.crate 9451 BLAKE2B e465c4c7eef44d02eb1b61b5290090513607b452f4adc11487947b7047ddc44905d7a02df827feb2142f0e74583afdd9648c1c66086f10e1bd861b663200bf8c SHA512 c635efee46cb251b76ee9427432f81a0d944cdf1d0a95693d824c6085e7dea7e1e3f48c692ae27946f69e4e78d8080220058acf98e5c8a78482007349f8a7a4b
 DIST pem-1.0.1.crate 9669 BLAKE2B fd75f3a45125e1510a65edbec9125c8b33fc4db6aecd8e375ba29e9d55ac67d81f51b8c780888ec0f47e9b7df18b42394db8bdbb597e85767a5098b78575a19b SHA512 1464c572b6b100294b0992c5cee6cb12774d4b7199436580f502960bfdbacac0f8824915d2c7bac8c4d998ba87b1551a1f3c2b68eb298df62c261766b5d0cb5f
+DIST pem-1.0.2.crate 10305 BLAKE2B 17c3457a90807bdcc75795161e244a7c531449d0679212394a76601c2bc1b353d8c18d34c5cccae3a728387c834a23011b17a8a1bace15a1aae26de30adb1c8a SHA512 548498cdd2ba114b6f0905949fdb5880c667e6f300fdc96dc1e9abcea275ac281b85ce88830ca4478cd3318994a3c9528ba3a5597262bf8cf2da8cab8674cd0d
 DIST proc-macro-error-1.0.4.crate 25293 BLAKE2B ef918c5efaf2545ab38787c8d0c07315af00431139e4dff66346bf798e3a429f91d12a79776c150412fdda0b158a72badd5e1044ac4d6917f8482d4b5a7110b7 SHA512 8a47bc9d3e24e9561d1e384d8f5a633284c2cf9b5e6733c5f9d1dbfe1870ccc8e2152482852e50b551cecb68e009148585b910ffb0508a7b4875598eaf8657db
 DIST proc-macro-error-attr-1.0.4.crate 7971 BLAKE2B 98e2925881c2be186e22c2c439697e91d43f807eb61a5d13e3b0b4321ed50a74f3d699942c04b89b6fea0f156bb5d19ebcf22f9cd4b98a7e6917c437600ed823 SHA512 2606afa9ec78d7dad4500c98d3a5ecbd02c6b53ab829c742bed7f57b322a95238ab4e01cf268746815f1424fd9b02eddfa30e72f98c66106f57765f3d3116495
 DIST proc-macro-hack-0.5.19.crate 15556 BLAKE2B 98c22fc3e5f5fa8b6f44d15de42b6ffcc82ba3f98a07ffa48bcbc5d3abcfca6af136c5d0d8c7f1ca34261ed8f8c9c17a394231f97a4c342c81aa7f8b9e74b203 SHA512 9e4cbec41056438287f5b23086264c86e2f0cdc193064006556736377b2954229de13a585149b9995002c9aee3334ee2a80ae4afdcc96cabe7ed2bf718476952
 DIST proc-macro2-1.0.26.crate 38233 BLAKE2B e44a5d98fbf75130c0eeb8fad6d025ce66fe41cc5ef882f418bd8c9e5d228d712020e309dad68e2f862e5f9216a1103fd6e69953e17c213166467b335f604802 SHA512 e6d39cc0d5ec644e3fb424347bde0a82a8ce8549745a1a827bf4dc21f6248471935b5499c3b6d1b7a129f0ddc560754254c528ac39fb1fce2ec3bd9520afc3e2
 DIST proc-macro2-1.0.32.crate 41003 BLAKE2B e8da70dae2ee75aa2c344602e55cbbf9ee5316ff6182c870b64f9fe4b33e60b9fb1a22137acf357615331f2e4079ab1e8964a2cb0234fa439d1b3d8d514c2eff SHA512 8631714c226c8a6fb330a529f42214216057eca85cfa63afd3de8600d2638e2be45efa54155ce73625883bcbabc2c56cb865ad9dda04e2c7092d955caed48abf
+DIST proc-macro2-1.0.37.crate 41378 BLAKE2B 330ba71c59bb7a6718fe650fc10a37bc690fb0ba4871c198bded83d13a12cdd7b1334a2e2c8fa7a48104b26625c1b07d65b0ecf91f9c2f13b8e898e80baae286 SHA512 cedb3433c6dfff39b404f8939c67e98303bb89a47e2cfb9659eeda1ca3e3d167800dca482374501632ab6d2283105dbd7560a157b48a351b2d3da059f946be55
 DIST pyo3-0.13.2.crate 281372 BLAKE2B 22ffcd9fa239efc205e5efcefb6ffbe99a979209aca357174e461826ae8edc1824da820df04bd8af4d07afd550b6a03fce75bc24e83970e7d2ec8cdc0aa17dca SHA512 3d4198a60e9c3abc619e5cac7198288bde294a789b6f84ec87a411d5eaad93d5d55043e8ec218cb0aa09a7289be7fd5bfa0b74be188e2b67c6c646cc2aec66d3
 DIST pyo3-0.15.1.crate 370722 BLAKE2B b755c93d8dca8e778b886ed1d16e83ddca483d0f6c932b3241edb2e1211306cb0257d2a6bc31ba4298335f277898e59aad67e9f675ed4ad9a2bb9d596400bda3 SHA512 9168911db76f2c9629615c997accfc4234bf91cc72293dcdb3db14b4e93f93af9df3b3aa7900384121719aeda4a0b6dd68c0cb380bfe5424724b0be5303c02e6
+DIST pyo3-0.15.2.crate 371382 BLAKE2B 79b813eca0818bf79e0e1c118c952219f16f1fe22a0ab1aaaac0499a5048ebbc27326bdd2d96054e410ef116866250464aa4e4d8e91bb733f915f77536bf0f05 SHA512 81595bf2b5d2b3a4e79750f0779c142fe7c3e7185f9ffa68a83fce30062ae6812d7af71bee425206552c95839ad7473408f658ff936d4a1f58fd1ac922822582
 DIST pyo3-build-config-0.15.1.crate 22095 BLAKE2B 47803b389f30f15f487daf96d32e374ebc83b1b41ddee1d2dcadd1a0fbaef40c4c1af2312b86ec085637e3192b1bd213c93b5f4e8dee173d81e510f480fa6953 SHA512 a9aae6bb4a4a56f7857262276bf1c95510912a367e32470b871f2fe2d6adbffd87247ed2e3b5fa2dfd273a3b0e139d92f25f3228e15c6d8c206c6ba919f38a9c
+DIST pyo3-build-config-0.15.2.crate 22235 BLAKE2B 35355ee30242b7e95426920e7f108fd7f32aa86f2949bb388139ed84ac0a8da2adbc05a5ecaf3beb89525d0c7a4e25ca8e33e9f35e324cbd970f6b4dbe5fbfdf SHA512 e05e68bc54bc7287d3fb037251767dcbcb512e3cae29948507deb7e0ca18ec4d7fd5d598f1dca1a595b6edcd5395fb443189fe56724e67ef68422bf050b10324
 DIST pyo3-macros-0.13.2.crate 5434 BLAKE2B 881b49ad2f6dbf0f60f7d9d648beb1b2f10266ede0f2d893e4bf0fa574563933f3540f93eabfa31ff2a73970e1a86d0ec1103ce7c0dc565670ad16bd99d10986 SHA512 3847c60f9e3f7150f46e68164fd35582994597eefcc70542ecf95afc7411785cea5b0eedd978b1c4baf2067ff8f2cdd93778affc82e11dcb264c09ba6ea0d788
 DIST pyo3-macros-0.15.1.crate 7555 BLAKE2B c7d87c150678efbb5dd6ef98da9997676ef3e7f8628a79f01a3ecbf94cc8b2d0752573d894fd769fb8791f30bcfd03a5c9f76cce73c00be90c1488faed63198d SHA512 1969b5ec6dd26ff2d534fe43143e44b91b66e05c61281b64f96fda47ff7826f625c658412d7587520df7455a67cd970a9aa49c7544ffb70a425314a0cff65060
+DIST pyo3-macros-0.15.2.crate 7596 BLAKE2B f8ab6ba53354705617ad88a2db693e38596d563f14e5481141b913595f367cf43fdb438c077c89b22a60fb0cccba7d67e79f9528af25c626ec7d8ba2c2ae3825 SHA512 4a40fae4362aa811996d9ff94ff7bfb645396eccffe13fbfc1fff70ada80db56f1a03630cadffca4ff6e156f04c052e82e059d72541d720abbf0ab18f2a7057e
 DIST pyo3-macros-backend-0.13.2.crate 33106 BLAKE2B df7d9cbb06932c7d01f809bb5cc9230a680f0da7f1231a1c509a7338713722a1a35e456faa81a36d21a16612a1c611b6ce5d018c87210b59e4153ba0addab568 SHA512 ee136e214a6f06b6dccec378d6a73a318408cd55795ffb00c18428b40cca1e2f45c3a98e85c82c68f0f2715b8187237f2bb3dd1e94b95288e2bed1bf6a6d042e
 DIST pyo3-macros-backend-0.15.1.crate 46111 BLAKE2B fabde516114a001e7f9ec1a1f422c5819ad5bceb4db36ecf2ef5dfde397d4d3c7dc7a8acf11cafde4156594e90a4f95d51dbefa43ee8bc172441d3f81eb299b2 SHA512 6c62fd1bc50666f63f9854947e9d88ae385159d90d026e0179d91aa151fef8403b23f55eab6f3340b1455b23d411083780c49198afacc267b49a52ee9c4999a4
+DIST pyo3-macros-backend-0.15.2.crate 46112 BLAKE2B f3efd72d375f709efca7366f702837222b3bde498a89750a9184437ac495cab031f12f83a062329ea3907e264ec0782523656e15cbe3eb03bc0535fe438a3e4d SHA512 5c3be99d863764376c3f66de304de8b36548cd99fae8ac40c548b3d467b6bdfcd683c53b4cd1aba26b1730c6b9214c36b1723a5d1299265734e67ea791918c82
 DIST quote-1.0.10.crate 29960 BLAKE2B fbd4e3e0e0f452e64b30399fdfaef318cead505d05f0c61db61a7aa3cd5a3300220b4ba2656603f88bc0b535390ab4d0ec101a919ace1d442a3e979f08e8d48f SHA512 08613679b564ea7d750117d3a2907ba957d5d595bdfa8016344f99a232c72c6b08acb882dff45c34c9e4c8f93f879fb308b36125572722aac04fbc6bb0c666f0
+DIST quote-1.0.18.crate 28911 BLAKE2B 623872402cb185a57e2ffb1bfe4105c49c152c33c44c8054af59df7bb193d14416ea2caa7b28b3f9b9ae6985bec7fc7825bc946e2e41915d2744c887a51559b6 SHA512 3fa537aa96a8970104411471b0e4b7b9339583d552c1d9297737a59ef5301af41da105b92aeace87376e1395e379153f6551bfcfe9c740e6945064426f5f6f84
 DIST quote-1.0.9.crate 25042 BLAKE2B 26ef31e89fd2f0cc21ff65f8072f30c7977ac634d2536cf9845a0894d6659f62a96cd0a6ee48f7706036c2c1b898ef8c9167bd62714ad0c9cba4fb02f30922af SHA512 dd6cdaea183b85400531ef01e56657edbec0d8f7c27898c1e591b72dff755fa5875b33ca320bd65be0e9aecfc6a61ec119a4bd1291e9f2057fca642ab5b198c8
 DIST redox_syscall-0.2.10.crate 23582 BLAKE2B 7253dd96415e7b70df488c208d86c250c670b1245ac6573a59085faabbde9e33fabfacd233e7d737e365493db14008c180274b41ea0a4af5f6f98eec666a873f SHA512 ef012eb4bffe32119e50ecdbef4cc31f6e84a344e94f026484fe4e2c904f94053a8b6249fb6bd8ada31b3ecfbf0096085283bb68aeb62b1b01b57f35794aee92
+DIST redox_syscall-0.2.13.crate 23759 BLAKE2B b59c3e923b7bddc84285377eca86e649c21ee7dd61924245d43c6554124adf689f9b92841ca64876b34797249698511b322f6e8e639d71e45e1ae9da5f8b7834 SHA512 6551f503ba52c4edc0cb4a418ff212188ddc7be80dcb39eaf3bfb82faa9a76cdf359f604d6b32be6c6a335b54180c9399a0e32670333a5a08351957308486100
 DIST redox_syscall-0.2.8.crate 23697 BLAKE2B 5a084a48e06ab0dc69f64b05058b78d994040da6c42f04c8b615b1977fa3e813cd5a531ab33402402914362301670709679aaaa321e8904424c38d35c284b7ec SHA512 250556a7683254c9daf22887b39abb010eb9d4fe08b944e52bc6595ef6d8acfed76e5f43931fe20c84bdb3743772fb62a0be154ecfb6e66c2facb4c73546eacf
 DIST regex-1.5.4.crate 236581 BLAKE2B 6efaf69d1a99dc3a2e04b2d1a96b036f631e9a0ad0d3aa57263febd47f7ec12765526f06f9c52a5497bf0d9b455f1d1b39e011adc4c28530c44b65c8a453efc0 SHA512 1a9208358c4ab87c19ec91bcf5c1e35dede46f3a0c0097061b7b53fa77a1e5ad38090d243aab274956f09c491e5fbe3b3b35a91db079b82a2dde2fd9fbad4c19
 DIST regex-syntax-0.6.25.crate 293293 BLAKE2B d5ca0dbc26b03c6a1818026f9a69cd226ec934e7c64094d0ebe843052b648617ffae7aa3a074f8da46d03c46996d8b547d8916576342000bd9711089b3e57d73 SHA512 a3d31f82aadc6be1796f76c03152ff24f37fe42d6ce27fb98e2f55ab102f86502bc37ccd563f6e0eba61aab20d002184c618517b678b3b93cb8f0497cc046ca5
 DIST scopeguard-1.1.0.crate 11470 BLAKE2B f774eb90b7d3ffb2efba47518e9d1dead4017ab4b38a4bd74914daa84a5af4bf9eb63da0496e3924499d79cd0439c37447aeda4a21226f95645bddcd6becfabe SHA512 368fa5726df8f42b599993681579a9ffd0196480ee3cd0f9f671e8493f3bedd1e1779bdf2beb329e77e0005fa09b816e3385f309490c0f2781568db275d4d17d
 DIST smallvec-1.6.1.crate 26444 BLAKE2B ca6c50a63acdd93a2131654d99e50545a6e2d08eb3e2bd57d4a8ee073d90c08195ee442745a8d62a68179ce7bb8e229b7ff8c6fcf46372a9844bc9280b7c85cb SHA512 9e6061c8211a4485ab54eb541adf40748e1fc3fdfab0849e38e5fd34fc6cc69ae78bd065b788692385a6b8157b031c2fe373900e13d3e56e94fc08d574edaaad
 DIST smallvec-1.7.0.crate 27459 BLAKE2B a740a4b7448a4c8d1bef59cfb6dc9a52145e40eeb38028c64c880f31800cd3a4cb8be17394742239dfa7fb692c749f9edf70e6df02abd7a1bff288eec38ba24e SHA512 d061e0059cd6bd1636424374848aa1d4edd21f75605844a7855ff5d343dbdb71e6eb14bd70de7947ae7ab58f04ff096a5e77aa9a1ac14cef59f657685c846156
+DIST smallvec-1.8.0.crate 27992 BLAKE2B d02897eb4d3901805be86cafd5d3dc6768b31c2ee4d0a9d7eb455e2a21be2864ea83589f4ffde102dbbafb66e3c197707af770b5ef184b8e244d992189644b84 SHA512 17687cfa6aaf95a1df063adc3a412a7c41918a0d003eaac90f7d9e859fb8fa1d652eedee17a4cb3aaae9b33a2043f89e796519e3a7a3992b292f04049bf80b0c
 DIST stable_deref_trait-1.2.0.crate 8054 BLAKE2B 287a65c3e5b47213544a43e57c60a54add60b4c2e3c8d042407d860cc950ba7ca01a2e67ce56aed6744992b61ec1f9aed3321e3d88482e33129548b7d51df205 SHA512 a13cfb22723f1f2cf089b2d07d657846f50c37bc0438d1a76096bea30214cad226b7a422c21f9e191ce87071da8a141d61882aedf9e0203a5fffdfda86a5fb03
 DIST syn-1.0.72.crate 232500 BLAKE2B 8f71f7fb66426f78eec3439688b0468fbef582c8ca912781f19607acd9e8371f2230b305a96f613c16f7299e66fdb2395dc037e1093d3897864bd2bf50ab3d7e SHA512 f01e2ef74fc3f84a753c1c379c24e3c63f3c575d72ab865f8e7d51f4dee4293ac8197b4e123ebaa942e9199bf0a0d8194e57a5aa6314bee6951d3d458dfc3da9
 DIST syn-1.0.81.crate 234144 BLAKE2B 7258c4a0ad0eb0c807912c297233eeb195d22b44cb2078e13e43eb90f1c82ecda6f7672ab072832ce130ccb953c1bb23c8440a3df77b714f462fe39cc6e6e1a3 SHA512 288ddaf4dc5ad2fdb3bc36800d94b53e2bfe9ac74a61a5d158bfcad3728955bebac6a900a5881c7d4abde4f3759515a1dd877e1421c226b85aff99a5ee649390
+DIST syn-1.0.91.crate 235996 BLAKE2B b7b555b2dbfc837417ed69c358338819500f1e8ba11c2183a4d216efe2c2d7eddd165415516d50ffb5413b97452f186263e13299b01bccd6ad6e405f6d2a3f4f SHA512 28fe28a9d4e9ab3610850c1704be6f384e9fff191b1a5e11f9766bdada81a3e7426cbc776bbd63ea6710320c7416a622506d4a8d607d978af506d381658d4bff
 DIST unicode-xid-0.2.2.crate 14955 BLAKE2B 6c6da49ac08dbd8b3248272224d6bff96b9cd1f36029b1937a58a0b929c3a48326053305ed49e73edd70f572f5abbc4817cedc899c69e3457805ad056669f6af SHA512 92ffd0dd34e3ca235ecf110b38c447d3ec1faa23d76c112457f28d432f92fa6b5f428bc5e1bfd278f361f55426dd96e19ecb0d3eff6cf250892f069c52bd89a8
 DIST unindent-0.1.7.crate 8346 BLAKE2B cbf76fd18e49332e61275ab204cef1fc4dee58091307f8cbe2107d3a8441551055541583f1d643d4d15f9cc17a8405f540f0c53548f5b2379dd70791a03640cb SHA512 d3f4543f97f1386f63306a206074de1d10077ae968ea6eb6638545eeaf8cef662e1c84a15788e9df640eeb6af4cbc187721ec01af43984e4eeb2dfb0423c6d70
+DIST unindent-0.1.8.crate 8326 BLAKE2B 3123c6b540b152d89cc7a9a76ff1315549f973c6a26adc6ca1b40518973fcc95a9f8da94d1c52ee551f2870181a265aac7e4339a3d46ba5280021b49ad842df2 SHA512 7752f4a29306b3c43f768bc400d610d1537457b22cceae8a5ebba31c857e219dc433a10a676d3cf94316a7cd6c7013c8960c825c6f1f9db5a3c2edd0a60591a8
 DIST version_check-0.9.3.crate 12547 BLAKE2B 85761c300a8d755e0b376191ef0604728ae641261fdb10682a3134a828eadc4a33216426d286bcdbd8d0c5fcfe6ca8ba20ed078c4f53066b959739a0e73daec0 SHA512 4b3b428214a0322af536a18e6f050438398766af6589389f20a804121a6721962ba411e2dcfded60aaa74313128fb0e831bea31378e2695c29b29bdc24d7cbfd
+DIST version_check-0.9.4.crate 14895 BLAKE2B fa1fa4008af165bfc1fdbe560488afd9d232cfafee94104fbcc4cbc52f234849bff9ddfa88109a1ac682f6d9c1d86b0459893d223f64e65adc08966aaf93dc89 SHA512 b172dc9a3759a4a683ffc39b9a40b03b9974b626a088217de87090466cef695226557c226cf3e469b2b25ee7297b7eb0d7719878cab42457f80146a81943c0c8
 DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
diff --git a/dev-python/cryptography/cryptography-36.0.1.ebuild b/dev-python/cryptography/cryptography-37.0.0.ebuild
index b999434b01b8..ec8ec08e6020 100644
--- a/dev-python/cryptography/cryptography-36.0.1.ebuild
+++ b/dev-python/cryptography/cryptography-37.0.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2021 Liguros Authors
+# Copyright 2021-2022 Liguros Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=8
 
 CARGO_OPTIONAL=yes
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
+PYTHON_COMPAT=( python3_{7,8,9,10} )
 PYTHON_REQ_USE="threads(+)"
 
 CRATES="
@@ -11,7 +11,7 @@ Inflector-0.11.4
 aliasable-0.1.3
 asn1-0.8.7
 asn1_derive-0.8.7
-autocfg-1.0.1
+autocfg-1.1.0
 base64-0.13.0
 bitflags-1.3.2
 cfg-if-1.0.0
@@ -20,44 +20,43 @@ indoc-0.3.6
 indoc-impl-0.3.6
 instant-0.1.12
 lazy_static-1.4.0
-libc-0.2.107
-lock_api-0.4.5
+libc-0.2.124
+lock_api-0.4.7
 num-integer-0.1.44
 num-traits-0.2.14
-once_cell-1.8.0
-ouroboros-0.13.0
-ouroboros_macro-0.13.0
+once_cell-1.10.0
+ouroboros-0.15.0
+ouroboros_macro-0.15.0
 parking_lot-0.11.2
 parking_lot_core-0.8.5
 paste-0.1.18
 paste-impl-0.1.18
-pem-1.0.1
+pem-1.0.2
 proc-macro-error-1.0.4
 proc-macro-error-attr-1.0.4
 proc-macro-hack-0.5.19
-proc-macro2-1.0.32
-pyo3-0.15.1
-pyo3-build-config-0.15.1
-pyo3-macros-0.15.1
-pyo3-macros-backend-0.15.1
-quote-1.0.10
-redox_syscall-0.2.10
-regex-1.5.4
-regex-syntax-0.6.25
+proc-macro2-1.0.37
+pyo3-0.15.2
+pyo3-build-config-0.15.2
+pyo3-macros-0.15.2
+pyo3-macros-backend-0.15.2
+quote-1.0.18
+redox_syscall-0.2.13
 scopeguard-1.1.0
-smallvec-1.7.0
+smallvec-1.8.0
 stable_deref_trait-1.2.0
-syn-1.0.81
+syn-1.0.91
 unicode-xid-0.2.2
-unindent-0.1.7
-version_check-0.9.3
+unindent-0.1.8
+version_check-0.9.4
 winapi-0.3.9
 winapi-i686-pc-windows-gnu-0.4.0
 winapi-x86_64-pc-windows-gnu-0.4.0
 "
+
 inherit cargo distutils-r1 multiprocessing
 
-GIT_TAG="3fd9d5a8424eef3e08260a622ae3644777ac5339"
+GIT_TAG="e0f6f38433e3a1cb57509dec1bec9107cbbe827d"
 DESCRIPTION="Library providing cryptographic recipes and primitives"
 HOMEPAGE="https://github.com/pyca/cryptography/ https://pypi.org/project/cryptography/"
 SRC_URI="https://github.com/pyca/cryptography/archive/${GIT_TAG}.tar.gz -> ${PN}-${GIT_TAG}.tar.gz
@@ -81,7 +80,7 @@ RDEPEND="
 "
 BDEPEND="
 	${DEPEND}
-	dev-python/setuptools_rust[${PYTHON_USEDEP}]
+	dev-python/setuptools-rust[${PYTHON_USEDEP}]
 	test? (
 		>=dev-python/hypothesis-1.11.4[${PYTHON_USEDEP}]
 		dev-python/iso8601[${PYTHON_USEDEP}]
@@ -118,6 +117,7 @@ src_prepare() {
 }
 
 python_test() {
-	local -x PYTHONPATH="${PYTHONPATH}:${S}/vectors"
+	#local -x PYTHONPATH="${PYTHONPATH}:${S}/vectors"
+	local -x PYTHONPATH="${PYTHONPATH}:${WORKDIR}/cryptography_vectors-${PV}"
 	epytest -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
 }
diff --git a/dev-python/dill/dill-0.3.4-r1.ebuild b/dev-python/dill/dill-0.3.4-r1.ebuild
index 373104b5cbbe..d7d802517012 100644
--- a/dev-python/dill/dill-0.3.4-r1.ebuild
+++ b/dev-python/dill/dill-0.3.4-r1.ebuild
@@ -18,7 +18,7 @@ S=${WORKDIR}/${PN}-${P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 python_test() {
 	local fail= t
diff --git a/dev-python/dill/dill-0.3.4.ebuild b/dev-python/dill/dill-0.3.4.ebuild
deleted file mode 100644
index ab9b3b6b62d3..000000000000
--- a/dev-python/dill/dill-0.3.4.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Serialize all of python (almost)"
-HOMEPAGE="https://pypi.org/project/dill/"
-SRC_URI="
-	https://github.com/uqfoundation/dill/archive/${P}.tar.gz
-		-> ${P}.gh.tar.gz"
-S=${WORKDIR}/${PN}-${P}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc x86 ~amd64-linux ~x86-linux"
-
-python_test() {
-	local fail= t
-	for t in tests/test_*.py; do
-		ebegin "\t${t}"
-		"${EPYTHON}" "${t}"
-		eend || fail=1
-	done
-
-	[[ ${fail} ]] && die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/etuples/etuples-0.3.5.ebuild b/dev-python/etuples/etuples-0.3.5.ebuild
index 6489aa591267..e5ffbd357dd4 100644
--- a/dev-python/etuples/etuples-0.3.5.ebuild
+++ b/dev-python/etuples/etuples-0.3.5.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/cons[${PYTHON_USEDEP}]
diff --git a/dev-python/fonttools/Manifest b/dev-python/fonttools/Manifest
index 07ed79e7d6be..07910863c4f0 100644
--- a/dev-python/fonttools/Manifest
+++ b/dev-python/fonttools/Manifest
@@ -5,3 +5,4 @@ DIST fonttools-4.32.0.tar.gz 2966840 BLAKE2B 67a79c8c2e26f9f72fcf6ea4ab5ee3712d3
 DIST fonttools-4.33.0.tar.gz 3525052 BLAKE2B 5ea275adbfbf6e01222f6eba8f5eef7afe533b9692e6a7a2fb644fb68dec632ab2962d6b7f6b4ff876676e8314aadbfc04a005ea7a389904e398723feaa756d0 SHA512 147f6d41d1a6b27ebe6973cb91a90384291ad8c7b75b71c3b814908012530066b79f4c39bdd6da9e98614ef61b1cc19803756aba73e4da7ce2e82147390f0023
 DIST fonttools-4.33.1.tar.gz 3526591 BLAKE2B c720e9159602168bc2f435f96e9b470e95a748e3e61aac717659e01e5998c8ead825056fe6114cb40be47ab1ebcd7dc6f3152cccd87aec5b49134147694aa3eb SHA512 14e4da0e146d4b88ab6375ad7c912f1ec6f437386e2d676bbffcd5a84be980151ed4f77f69bf618843b321106ca763af564cf05dfb6fa11888f02adfde7d74b2
 DIST fonttools-4.33.2.tar.gz 3526700 BLAKE2B faa8db2d5ba80a7cb2cd4fb82045aa821f72d296c3b0994f266c69bc1f38b9c46a24208612d539e3576d75371d95d49d9a103fed8ab7604ebf0df50ec8f25d2f SHA512 dd032f9f8d9167aa8d83137006062a5d293aeb4116cd2b24a9d5d3d750887876214a6b6e9fe54efd569cada64164c76f242b234569d86b45e5f279d6c1a5db95
+DIST fonttools-4.33.3.tar.gz 3526937 BLAKE2B 26539f76ac1919e572633695aca7a95f7f715ef18bd7d36de22e5491124ce36d3907f1e7b167d23685bca437f0bf7cf99159cd918ab2b1a450b716166d30fc37 SHA512 403e19cda46d67dea9f517e58c2e95ed04c53e6832919d85df9db4538431252e5ec4554e22410fd45cba634998de1576cf55d50f56de5ad497a108dcec4ed56a
diff --git a/dev-python/fonttools/fonttools-4.33.3.ebuild b/dev-python/fonttools/fonttools-4.33.3.ebuild
new file mode 100644
index 000000000000..503be4ab964a
--- /dev/null
+++ b/dev-python/fonttools/fonttools-4.33.3.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Library for manipulating TrueType, OpenType, AFM and Type1 fonts"
+HOMEPAGE="https://github.com/fonttools/fonttools/"
+SRC_URI="https://github.com/fonttools/fonttools/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+RDEPEND=">=dev-python/fs-2.4.9[${PYTHON_USEDEP}]"
+BDEPEND="${RDEPEND}
+	dev-python/cython[${PYTHON_USEDEP}]
+	test? (
+		app-arch/brotli[python,${PYTHON_USEDEP}]
+		app-arch/zopfli
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# When dev-python/pytest-shutil is installed, we get weird import errors.
+	# This is due to incomplete nesting in the Tests/ tree:
+	#
+	#   Tests/feaLib/__init__.py
+	#   Tests/ufoLib/__init__.py
+	#   Tests/svgLib/path/__init__.py
+	#   Tests/otlLib/__init__.py
+	#   Tests/varLib/__init__.py
+	#
+	# This tree requires an __init__.py in Tests/svgLib/ too, bug #701148.
+	touch Tests/svgLib/__init__.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+src_configure() {
+	export FONTTOOLS_WITH_CYTHON=1
+}
+
+src_test() {
+	# virtualx used when matplotlib is installed causing plot module tests to run
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	epytest Tests fontTools || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.44.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.44.0.ebuild
index a9fed2cd012a..f24ce8e4cad6 100644
--- a/dev-python/google-api-python-client/google-api-python-client-2.44.0.ebuild
+++ b/dev-python/google-api-python-client/google-api-python-client-2.44.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 RDEPEND="
 	>=dev-python/httplib2-0.15[${PYTHON_USEDEP}]
diff --git a/dev-python/ipyparallel/ipyparallel-8.2.1.ebuild b/dev-python/ipyparallel/ipyparallel-8.2.1.ebuild
index 88b8e8960ead..32efc1d5d92c 100644
--- a/dev-python/ipyparallel/ipyparallel-8.2.1.ebuild
+++ b/dev-python/ipyparallel/ipyparallel-8.2.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc ~x86"
 
 RDEPEND="
 	dev-python/entrypoints[${PYTHON_USEDEP}]
diff --git a/dev-python/itsdangerous/Manifest b/dev-python/itsdangerous/Manifest
index 5e96ddf5332d..72ae768d2a28 100644
--- a/dev-python/itsdangerous/Manifest
+++ b/dev-python/itsdangerous/Manifest
@@ -1,3 +1,2 @@
 DIST itsdangerous-1.1.0.tar.gz 53219 BLAKE2B 6ad74dacb9728e77d57ac5e364e79e3cc749be206fa03e82a407cdd77b5b72ddb4861bf181772915e684539e6404c6a45f6081c7c8e17a33a2d532b4fc3fed80 SHA512 61bab3fce5f87a3b5fc8fad61e735a63df6aa039416ee3494e1c99a2a1162b4fb72793bc5dc949de0985724c40121810b159513606c4c3976a7666dba3a1b93d
-DIST itsdangerous-2.1.1.tar.gz 56217 BLAKE2B 8b35b32ce0d9a5432079199165f9d7a43dee80775737bfde637820a86c6c2c4cf122914958d4e88466446b75deaf4dfe995c9cda64c254793056e5773136d07d SHA512 54ec17e540fc7c39e5880c044c1ce222260b1141355cc341dc96eefbfd8f12e3018eadd531081a00aa719736b9af437bafe147dd5fee456d8b4478f7107aacdb
 DIST itsdangerous-2.1.2.tar.gz 56143 BLAKE2B 4c36cb26bcc6b6821b92b88b0254711ebe00bfda2193cecf0a7eb1fd514806f366fc0b4dc587a383003ec1272a2bc732418a46b44fa711beaedc06c379635ddc SHA512 e4d870a33992b309ed778f403c0c1e098983a693d1165260748bf36385ebfadb583811e05ddd48001a33cf6a4e963b7dd8a8c68919c5b4b86f63621d8869e259
diff --git a/dev-python/itsdangerous/itsdangerous-2.1.1.ebuild b/dev-python/itsdangerous/itsdangerous-2.1.1.ebuild
deleted file mode 100644
index 8ebcf8f195e7..000000000000
--- a/dev-python/itsdangerous/itsdangerous-2.1.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_{7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Various helpers to pass trusted data to untrusted environments and back"
-HOMEPAGE="https://pythonhosted.org/itsdangerous/ https://pypi.org/project/itsdangerous/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-BDEPEND="
-	test? ( dev-python/freezegun[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests pytest
diff --git a/dev-python/itsdangerous/itsdangerous-2.1.2.ebuild b/dev-python/itsdangerous/itsdangerous-2.1.2.ebuild
index d6080ac456fb..5937138f7ed8 100644
--- a/dev-python/itsdangerous/itsdangerous-2.1.2.ebuild
+++ b/dev-python/itsdangerous/itsdangerous-2.1.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/jinja/Manifest b/dev-python/jinja/Manifest
index 9d7b28b760f1..592c3324db60 100644
--- a/dev-python/jinja/Manifest
+++ b/dev-python/jinja/Manifest
@@ -1,4 +1,2 @@
 DIST jinja-2.11.3.tar.gz 258057 BLAKE2B 4735464d044718ce1e6b2663ecb1b238b38fbf0f37ed683257775fe9e853186c089b98494209e511be5aa96bf6df8f6d472be132b6184a7d9213e182099c0433 SHA512 f8e2951edf780d7b44ac74d36579c89b0a5c076b4250faf643ae7e3ff6a431fedaabed640e5efb496cda1a79a4057bf312ae652484c8d4631d521689eb0adbc1
-DIST jinja-3.0.3.tar.gz 273634 BLAKE2B 3f72840f3f895471896b918b0d3173aa7b40a077fe78a014064e66ac74c3d1ef1ae811723a84ea56d32edde23ee26ab6091bd5ce7ee4e46a9693f34d2538b491 SHA512 8a364620a4660add0593f4b252a2f20423aa3017193dffe6e8aa80710444da0cae5e6c4b77247d39f33e90185f475714fb892f6b5f01d3055a88b0f669a748be
-DIST jinja-3.1.0.tar.gz 271851 BLAKE2B de55a518aa63e3c6ca88bd107709172f73fcb9419c75254b2c23c531b598af7860a303e7da6e61f03cf18edf6935c92f5c12c8b91a7f4eb955c64f472a506b02 SHA512 1bd75c752f8e1c45f05f881598c257a6a357658892307e1352dd4752f45ede9b23f0ce3c16909e1885243199c2b845357c3ea33af8d6848fe346c29eeaf22b60
 DIST jinja-3.1.1.tar.gz 272001 BLAKE2B 4787ee89d7e10cea24d3bf2810e391d5c17c00ffee8fd2f9244a9e24b219bc126e4111cc6b788107cbc07dd96732a2d1fc51dd87506545dc8beb7fdce5cd89b1 SHA512 285b3a2e09fbf891ce1d18e2692e400a9fe9d8968a36be50229972d9bdbb590bbea099cd26443de0fbe5ed7a2c6419eb211bfdac15c27a61b8db903e88855478
diff --git a/dev-python/jinja/jinja-3.0.3.ebuild b/dev-python/jinja/jinja-3.0.3.ebuild
deleted file mode 100644
index a941e600456e..000000000000
--- a/dev-python/jinja/jinja-3.0.3.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="A full-featured template engine for Python"
-HOMEPAGE="https://jinja.palletsprojects.com/ https://pypi.org/project/Jinja2/"
-# pypi tarball is missing tests
-SRC_URI="https://github.com/pallets/jinja/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
-IUSE="examples"
-
-RDEPEND="
-	>=dev-python/markupsafe-2.0.0[${PYTHON_USEDEP}]
-	!dev-python/jinja:compat"
-
-distutils_enable_sphinx docs \
-	dev-python/sphinx-issues \
-	dev-python/pallets-sphinx-themes
-distutils_enable_tests pytest
-
-# XXX: handle Babel better?
-
-src_prepare() {
-	# avoid unnecessary dep on extra sphinxcontrib modules
-	sed -i '/sphinxcontrib.log_cabinet/ d' docs/conf.py || die
-
-	distutils-r1_src_prepare
-}
-
-python_install_all() {
-	if use examples ; then
-		docinto examples
-		dodoc -r examples/.
-	fi
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	if ! has_version dev-python/Babel; then
-		elog "For i18n support, please emerge dev-python/Babel."
-	fi
-}
diff --git a/dev-python/jinja/jinja-3.1.0.ebuild b/dev-python/jinja/jinja-3.1.0.ebuild
deleted file mode 100644
index dbe37d7a260d..000000000000
--- a/dev-python/jinja/jinja-3.1.0.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_{7,8,9,10} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="A full-featured template engine for Python"
-HOMEPAGE="https://jinja.palletsprojects.com/ https://pypi.org/project/Jinja2/"
-SRC_URI="https://github.com/pallets/jinja/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
-IUSE="examples"
-
-RDEPEND="
-	>=dev-python/markupsafe-2.0.0[${PYTHON_USEDEP}]
-"
-
-distutils_enable_sphinx docs \
-	dev-python/sphinx-issues \
-	dev-python/pallets-sphinx-themes
-distutils_enable_tests pytest
-
-# XXX: handle Babel better?
-
-src_prepare() {
-	# avoid unnecessary dep on extra sphinxcontrib modules
-	sed -i '/sphinxcontrib.log_cabinet/ d' docs/conf.py || die
-
-	distutils-r1_src_prepare
-}
-
-python_install_all() {
-	if use examples ; then
-		docinto examples
-		dodoc -r examples/.
-	fi
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	if ! has_version dev-python/Babel; then
-		elog "For i18n support, please emerge dev-python/Babel."
-	fi
-}
diff --git a/dev-python/jinja/jinja-3.1.1.ebuild b/dev-python/jinja/jinja-3.1.1.ebuild
index dbe37d7a260d..bd622d1a31db 100644
--- a/dev-python/jinja/jinja-3.1.1.ebuild
+++ b/dev-python/jinja/jinja-3.1.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/pallets/jinja/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~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"
 IUSE="examples"
 
 RDEPEND="
diff --git a/dev-python/jsonschema/jsonschema-4.4.0-r2.ebuild b/dev-python/jsonschema/jsonschema-4.4.0-r2.ebuild
index 9809217fd0ab..a11eb691eba5 100644
--- a/dev-python/jsonschema/jsonschema-4.4.0-r2.ebuild
+++ b/dev-python/jsonschema/jsonschema-4.4.0-r2.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 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/attrs[${PYTHON_USEDEP}]
diff --git a/dev-python/jupyter_server/jupyter_server-1.15.6.ebuild b/dev-python/jupyter_server/jupyter_server-1.15.6.ebuild
index ca2f92a49ff3..c26b0025a5c8 100644
--- a/dev-python/jupyter_server/jupyter_server-1.15.6.ebuild
+++ b/dev-python/jupyter_server/jupyter_server-1.15.6.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc ~x86"
 
 RDEPEND="
 	dev-python/jinja[${PYTHON_USEDEP}]
diff --git a/dev-python/mypy/mypy-0.942.ebuild b/dev-python/mypy/mypy-0.942.ebuild
index 5c68592bbdad..b9af19ed2679 100644
--- a/dev-python/mypy/mypy-0.942.ebuild
+++ b/dev-python/mypy/mypy-0.942.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/python/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc ~x86"
 
 # stubgen collides with this package: https://bugs.gentoo.org/585594
 RDEPEND="
diff --git a/dev-python/parver/parver-0.3.1-r1.ebuild b/dev-python/parver/parver-0.3.1-r1.ebuild
index c0a9daf4517c..7b4ea6f541c0 100644
--- a/dev-python/parver/parver-0.3.1-r1.ebuild
+++ b/dev-python/parver/parver-0.3.1-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/RazerM/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 RDEPEND="
 	>=dev-python/Arpeggio-1.7[${PYTHON_USEDEP}]
diff --git a/dev-python/pikepdf/pikepdf-5.1.2.ebuild b/dev-python/pikepdf/pikepdf-5.1.2.ebuild
index f743dc29b4ed..b901b27953dc 100644
--- a/dev-python/pikepdf/pikepdf-5.1.2.ebuild
+++ b/dev-python/pikepdf/pikepdf-5.1.2.ebuild
@@ -19,7 +19,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 DEPEND="
 	>=app-text/qpdf-10.6.2:0=
diff --git a/dev-python/pygit2/pygit2-1.9.1.ebuild b/dev-python/pygit2/pygit2-1.9.1.ebuild
index 5b60559e5d9f..677d583ba170 100644
--- a/dev-python/pygit2/pygit2-1.9.1.ebuild
+++ b/dev-python/pygit2/pygit2-1.9.1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="GPL-2-with-linking-exception"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="
 	=dev-libs/libgit2-1.4*:=
diff --git a/dev-python/pylint/Manifest b/dev-python/pylint/Manifest
index 8a07ce5ee5c9..ea1cfcdcf74e 100644
--- a/dev-python/pylint/Manifest
+++ b/dev-python/pylint/Manifest
@@ -1,8 +1,3 @@
 DIST pylint-2.12.2.gh.tar.gz 1032702 BLAKE2B de7dce04159b332baa5c23f4034ee249e49f9239c5c9190213a51a84a47ac2129f8a2265e1ad9c01ab448ec58f4f36653c6de5b0be6bfdf6aa286c8887313759 SHA512 0d2b9b785371af0a1c809271153abbab58f50455b34f12370461ded2c4f3d62656e4c0391adff48e179b95da945a2f44e762863e2b7d63808976bf5f684e20d2
-DIST pylint-2.13.0.gh.tar.gz 1114326 BLAKE2B 2d99ae38474a13ecf0b306b2de445b93ef39c4ed286abdbc62e08580b34ea22615983bded024f87eb4ad5e9cfdd12edbab6e7bf841d4e7827c945e798f31771f SHA512 7ca5fdf6d5835886ae01937fad56319cc9b71248d7a8aa6c6d92ba4bf5d35340ec0a16c1b2029d1ca5170f8c3abd29b1d6915a415d5df3c0949f4f9c0d6a690c
-DIST pylint-2.13.1.gh.tar.gz 1116054 BLAKE2B 633636f97e284a8a93c598261b90019ea359fd61cf2e833936749a6a650098772c46008f465b118634cfa3cc8d873d9bbdd7d4b0e54621e47b7c33a33938b01d SHA512 9e5f6f2578d240a4984e00fd9e9a33a39bac4855060054f96c4414d8e1c6c16cd6a27d4d5e82fde52f91b2d25595d638e66e928c82aa3eb72a37c61f7aa6e038
-DIST pylint-2.13.2.gh.tar.gz 1116482 BLAKE2B da35c9f39781bbd796e2ec055b41c44211588d7da360fd27f81eef57a3f5c65e27931ca927b41692627c9914f5c28e3262c0f34a45c38b20aa1b83710ab1d1f1 SHA512 15274658cf3067ffa6635a94f2c75d8854b3843be45ea5dc5896bc12583b156428858baeed19eed4bfab35489326d70d0cce1375354d9ec97d00cfd895fc4a47
-DIST pylint-2.13.3.gh.tar.gz 1116747 BLAKE2B 9ab6ff4746f78472de9c248754d102e55e8cb60d3ead8c5079cfe851b2b7c8e16afc9b0be02041cf24e789784200b90751ad0bcf172eb6d4edd88463863d18ac SHA512 0bda6d89219ad6f7f64f1361f95b85a34e3bc70f9f18f71eaa3d69deb47ab6fc056000c13a11c8c5644f0a9789eac2a5c262ddcf96302aeebfa16aa2e3b3086c
-DIST pylint-2.13.4.gh.tar.gz 1117488 BLAKE2B a660c15c41b529d932a21d438c7cf0f3b97683d6b1452f4383193f97dd22ba6e216a7dc8c3677cb1cb0ab5b76ddb936afa2d87df38d41950e2249bd8867bf44d SHA512 2c0c60908f89bf7a2552f65e0b4957ee6223f5429a6c2ec997aaf75572b11e4247e159da744937dbc7752ebd5eab0a0c873d129983de09ea0954f35f47a1f524
 DIST pylint-2.13.5.gh.tar.gz 1118551 BLAKE2B 70ee4254aa140aba16adfe67aeb896d9c455843dfa945d335b5ba48e85c9d2d8f057223bc74bd4c0c0bfa2d343a9f78e783705b885caaee6895fcddf7ce23ccb SHA512 e399239fbea58260b17f226dddb63f1e6a2f12cdd601a4e73913a169d23fe2b6085e776bf8144e2c5a555dfdc1b28a5818a4103969d504b638b6b41ee296d182
 DIST pylint-2.13.7.gh.tar.gz 1120083 BLAKE2B c45d6ec65c11d3682bf3279969f3e45b827b2bbcebbfeb05a31df3a93bb943bf9643a5d467c1e2eebf717577032571a48db1ce84e1c81d72000808ec302aaf1b SHA512 ec0b2ef565239ab3e577c5c2d22c1c8df8b8bb0858c34b6606f649484d69a25c1f51ca61a3da66833d9a713e8a686dc32b940e574650577bdcc4e13d76acc2e5
diff --git a/dev-python/pylint/pylint-2.13.0.ebuild b/dev-python/pylint/pylint-2.13.0.ebuild
deleted file mode 100644
index e3b141591789..000000000000
--- a/dev-python/pylint/pylint-2.13.0.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Python code static checker"
-HOMEPAGE="
-	
-	https://pypi.org/project/pylint/
-	https://github.com/pycqa/pylint/
-"
-SRC_URI="
-	https://github.com/pycqa/pylint/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~riscv ~x86"
-IUSE="examples"
-
-# Make sure to check https://github.com/PyCQA/pylint/blob/main/setup.cfg#L43 on bumps
-# Adjust dep bounds!
-RDEPEND="
-	<dev-python/astroid-2.12[${PYTHON_USEDEP}]
-	>=dev-python/astroid-2.11.0[${PYTHON_USEDEP}]
-	>=dev-python/dill-0.2[${PYTHON_USEDEP}]
-	>=dev-python/isort-4.2.5[${PYTHON_USEDEP}]
-	<dev-python/isort-6[${PYTHON_USEDEP}]
-	>=dev-python/mccabe-0.6[${PYTHON_USEDEP}]
-	<dev-python/mccabe-0.8[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/tomli-1.1.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	' 3.8 3.9)
-"
-BDEPEND="
-	test? (
-		>=dev-python/GitPython-3[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.4.4-sphinx-theme.patch"
-)
-
-distutils_enable_sphinx doc --no-autodoc
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# No need to run the benchmarks
-		tests/benchmark/test_baseline_benchmarks.py
-
-		# TODO
-		'tests/test_functional.py::test_functional[forgotten_debug_statement_py37]'
-		'tests/test_functional.py::test_functional[dataclass_with_field]'
-		tests/checkers/unittest_typecheck.py::TestTypeChecker::test_nomember_on_c_extension_error_msg
-		tests/checkers/unittest_typecheck.py::TestTypeChecker::test_nomember_on_c_extension_info_msg
-	)
-	# Specify the test directory explicitly to avoid import file mismatches
-	epytest tests
-}
-
-python_install_all() {
-	if use examples ; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		docinto examples
-		dodoc -r examples/.
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pylint/pylint-2.13.1.ebuild b/dev-python/pylint/pylint-2.13.1.ebuild
deleted file mode 100644
index 53dbd8e9c99b..000000000000
--- a/dev-python/pylint/pylint-2.13.1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Python code static checker"
-HOMEPAGE="
-	
-	https://pypi.org/project/pylint/
-	https://github.com/pycqa/pylint/
-"
-SRC_URI="
-	https://github.com/pycqa/pylint/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~m68k ~ppc ~riscv ~x86"
-IUSE="examples"
-
-# Make sure to check https://github.com/PyCQA/pylint/blob/main/setup.cfg#L43 on bumps
-# Adjust dep bounds!
-RDEPEND="
-	<dev-python/astroid-2.12[${PYTHON_USEDEP}]
-	>=dev-python/astroid-2.11.0[${PYTHON_USEDEP}]
-	>=dev-python/dill-0.2[${PYTHON_USEDEP}]
-	>=dev-python/isort-4.2.5[${PYTHON_USEDEP}]
-	<dev-python/isort-6[${PYTHON_USEDEP}]
-	>=dev-python/mccabe-0.6[${PYTHON_USEDEP}]
-	<dev-python/mccabe-0.8[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/tomli-1.1.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	' 3.8 3.9)
-"
-BDEPEND="
-	test? (
-		>=dev-python/GitPython-3[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.4.4-sphinx-theme.patch"
-)
-
-distutils_enable_sphinx doc --no-autodoc
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# No need to run the benchmarks
-		tests/benchmark/test_baseline_benchmarks.py
-
-		# TODO
-		'tests/test_functional.py::test_functional[forgotten_debug_statement_py37]'
-		'tests/test_functional.py::test_functional[dataclass_with_field]'
-		tests/checkers/unittest_typecheck.py::TestTypeChecker::test_nomember_on_c_extension_error_msg
-		tests/checkers/unittest_typecheck.py::TestTypeChecker::test_nomember_on_c_extension_info_msg
-	)
-	# Specify the test directory explicitly to avoid import file mismatches
-	epytest tests
-}
-
-python_install_all() {
-	if use examples ; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		docinto examples
-		dodoc -r examples/.
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pylint/pylint-2.13.2.ebuild b/dev-python/pylint/pylint-2.13.2.ebuild
deleted file mode 100644
index 53dbd8e9c99b..000000000000
--- a/dev-python/pylint/pylint-2.13.2.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Python code static checker"
-HOMEPAGE="
-	
-	https://pypi.org/project/pylint/
-	https://github.com/pycqa/pylint/
-"
-SRC_URI="
-	https://github.com/pycqa/pylint/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~m68k ~ppc ~riscv ~x86"
-IUSE="examples"
-
-# Make sure to check https://github.com/PyCQA/pylint/blob/main/setup.cfg#L43 on bumps
-# Adjust dep bounds!
-RDEPEND="
-	<dev-python/astroid-2.12[${PYTHON_USEDEP}]
-	>=dev-python/astroid-2.11.0[${PYTHON_USEDEP}]
-	>=dev-python/dill-0.2[${PYTHON_USEDEP}]
-	>=dev-python/isort-4.2.5[${PYTHON_USEDEP}]
-	<dev-python/isort-6[${PYTHON_USEDEP}]
-	>=dev-python/mccabe-0.6[${PYTHON_USEDEP}]
-	<dev-python/mccabe-0.8[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/tomli-1.1.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	' 3.8 3.9)
-"
-BDEPEND="
-	test? (
-		>=dev-python/GitPython-3[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.4.4-sphinx-theme.patch"
-)
-
-distutils_enable_sphinx doc --no-autodoc
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# No need to run the benchmarks
-		tests/benchmark/test_baseline_benchmarks.py
-
-		# TODO
-		'tests/test_functional.py::test_functional[forgotten_debug_statement_py37]'
-		'tests/test_functional.py::test_functional[dataclass_with_field]'
-		tests/checkers/unittest_typecheck.py::TestTypeChecker::test_nomember_on_c_extension_error_msg
-		tests/checkers/unittest_typecheck.py::TestTypeChecker::test_nomember_on_c_extension_info_msg
-	)
-	# Specify the test directory explicitly to avoid import file mismatches
-	epytest tests
-}
-
-python_install_all() {
-	if use examples ; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		docinto examples
-		dodoc -r examples/.
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pylint/pylint-2.13.3.ebuild b/dev-python/pylint/pylint-2.13.3.ebuild
deleted file mode 100644
index 53dbd8e9c99b..000000000000
--- a/dev-python/pylint/pylint-2.13.3.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Python code static checker"
-HOMEPAGE="
-	
-	https://pypi.org/project/pylint/
-	https://github.com/pycqa/pylint/
-"
-SRC_URI="
-	https://github.com/pycqa/pylint/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~m68k ~ppc ~riscv ~x86"
-IUSE="examples"
-
-# Make sure to check https://github.com/PyCQA/pylint/blob/main/setup.cfg#L43 on bumps
-# Adjust dep bounds!
-RDEPEND="
-	<dev-python/astroid-2.12[${PYTHON_USEDEP}]
-	>=dev-python/astroid-2.11.0[${PYTHON_USEDEP}]
-	>=dev-python/dill-0.2[${PYTHON_USEDEP}]
-	>=dev-python/isort-4.2.5[${PYTHON_USEDEP}]
-	<dev-python/isort-6[${PYTHON_USEDEP}]
-	>=dev-python/mccabe-0.6[${PYTHON_USEDEP}]
-	<dev-python/mccabe-0.8[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/tomli-1.1.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	' 3.8 3.9)
-"
-BDEPEND="
-	test? (
-		>=dev-python/GitPython-3[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.4.4-sphinx-theme.patch"
-)
-
-distutils_enable_sphinx doc --no-autodoc
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# No need to run the benchmarks
-		tests/benchmark/test_baseline_benchmarks.py
-
-		# TODO
-		'tests/test_functional.py::test_functional[forgotten_debug_statement_py37]'
-		'tests/test_functional.py::test_functional[dataclass_with_field]'
-		tests/checkers/unittest_typecheck.py::TestTypeChecker::test_nomember_on_c_extension_error_msg
-		tests/checkers/unittest_typecheck.py::TestTypeChecker::test_nomember_on_c_extension_info_msg
-	)
-	# Specify the test directory explicitly to avoid import file mismatches
-	epytest tests
-}
-
-python_install_all() {
-	if use examples ; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		docinto examples
-		dodoc -r examples/.
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pylint/pylint-2.13.4.ebuild b/dev-python/pylint/pylint-2.13.4.ebuild
deleted file mode 100644
index 2417e9131774..000000000000
--- a/dev-python/pylint/pylint-2.13.4.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Python code static checker"
-HOMEPAGE="
-	https://pypi.org/project/pylint/
-	https://github.com/PyCQA/pylint/
-"
-SRC_URI="
-	https://github.com/pycqa/pylint/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~m68k ~ppc ~riscv ~x86"
-IUSE="examples"
-
-# Make sure to check https://github.com/PyCQA/pylint/blob/main/setup.cfg#L43 on bumps
-# Adjust dep bounds!
-RDEPEND="
-	<dev-python/astroid-2.12[${PYTHON_USEDEP}]
-	>=dev-python/astroid-2.11.0[${PYTHON_USEDEP}]
-	>=dev-python/dill-0.2[${PYTHON_USEDEP}]
-	>=dev-python/isort-4.2.5[${PYTHON_USEDEP}]
-	<dev-python/isort-6[${PYTHON_USEDEP}]
-	>=dev-python/mccabe-0.6[${PYTHON_USEDEP}]
-	<dev-python/mccabe-0.8[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/tomli-1.1.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	' 3.8 3.9)
-"
-BDEPEND="
-	test? (
-		>=dev-python/GitPython-3[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.4.4-sphinx-theme.patch"
-)
-
-distutils_enable_sphinx doc --no-autodoc
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# No need to run the benchmarks
-		tests/benchmark/test_baseline_benchmarks.py
-
-		# TODO
-		'tests/test_functional.py::test_functional[forgotten_debug_statement_py37]'
-		'tests/test_functional.py::test_functional[dataclass_with_field]'
-		tests/checkers/unittest_typecheck.py::TestTypeChecker::test_nomember_on_c_extension_error_msg
-		tests/checkers/unittest_typecheck.py::TestTypeChecker::test_nomember_on_c_extension_info_msg
-	)
-	# Specify the test directory explicitly to avoid import file mismatches
-	epytest tests
-}
-
-python_install_all() {
-	if use examples ; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		docinto examples
-		dodoc -r examples/.
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pylint/pylint-2.13.5.ebuild b/dev-python/pylint/pylint-2.13.5.ebuild
index cfad99782942..c62bf9a3e9ef 100644
--- a/dev-python/pylint/pylint-2.13.5.ebuild
+++ b/dev-python/pylint/pylint-2.13.5.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="examples"
 
 # Make sure to check https://github.com/PyCQA/pylint/blob/main/setup.cfg#L43 on bumps
diff --git a/dev-python/pyspnego/pyspnego-0.5.1.ebuild b/dev-python/pyspnego/pyspnego-0.5.1.ebuild
index e203c081a8e2..ad9c91204c66 100644
--- a/dev-python/pyspnego/pyspnego-0.5.1.ebuild
+++ b/dev-python/pyspnego/pyspnego-0.5.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 
 RDEPEND="
 	dev-python/cryptography[${PYTHON_USEDEP}]
diff --git a/dev-python/python-dbusmock/Manifest b/dev-python/python-dbusmock/Manifest
index dffc6b84c0b8..27325f82fb16 100644
--- a/dev-python/python-dbusmock/Manifest
+++ b/dev-python/python-dbusmock/Manifest
@@ -1,3 +1 @@
-DIST python-dbusmock-0.26.1.tar.gz 87707 BLAKE2B 9f4761ab5f227e78dd5343f3ddd4b83d0494e77d3b381f719890447998baab8096b3bf817259b080dda78619f8407ad532044cb60aaf7a5280459f423754df0f SHA512 dcb46f6dbd17471e2135c0d8fb63cbaecbc9445ae7bf74691abb03b93d5283ab41ea71071ece03870aaac19eaedd546f01c0839116421047f1ac77619f2c73f3
-DIST python-dbusmock-0.27.0.tar.gz 89469 BLAKE2B b6fcdb5ded2b4f50d4c3edafecf028df57c3aae6e2a1e87d78c41f879f495d06ab097be0996b7b1781aebd4235a5ce7c6b58f48f5c74e2d4c2b49a3439ce9cae SHA512 4f3a7326b27d7b86d9a77019c419209077021a88994b8e5ae302686fcaa8b7c7736644ab26d9e3b5a2157634eb56a0b2dbe304a092d93104c94a13a43d53b5a1
 DIST python-dbusmock-0.27.5.tar.gz 89775 BLAKE2B 316bb1ae06c894702d54b7a54d0c422a877c50fb7e8aa4a1bb3c9ac342acdec8f6adaafea86afa5aa041414a283fdd284e27b58728efa234fb8bcbbf92b25f27 SHA512 6e5f5eddfc949c610b64a766434988c142397893e088b8522e6895e31383ec3c14d2f053f9aab17f00137e883a01bf95be35326f7ca97ee8c9780d6704e7d1dc
diff --git a/dev-python/python-dbusmock/python-dbusmock-0.26.1.ebuild b/dev-python/python-dbusmock/python-dbusmock-0.26.1.ebuild
deleted file mode 100644
index 95ce308573ca..000000000000
--- a/dev-python/python-dbusmock/python-dbusmock-0.26.1.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=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Easily create mock objects on D-Bus for software testing"
-HOMEPAGE="https://github.com/martinpitt/python-dbusmock"
-SRC_URI="
-	https://github.com/martinpitt/python-dbusmock/releases/download/${PV}/${P}.tar.gz
-"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
-
-RDEPEND="
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	# needed for unittest discovery
-	> tests/__init__.py || die
-	# linter tests, fragile to newer linter versions
-	rm tests/test_code.py || die
-
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/python-dbusmock/python-dbusmock-0.27.0.ebuild b/dev-python/python-dbusmock/python-dbusmock-0.27.0.ebuild
deleted file mode 100644
index 5f76b17147fd..000000000000
--- a/dev-python/python-dbusmock/python-dbusmock-0.27.0.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=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Easily create mock objects on D-Bus for software testing"
-HOMEPAGE="https://github.com/martinpitt/python-dbusmock"
-SRC_URI="
-	https://github.com/martinpitt/python-dbusmock/releases/download/${PV}/${P}.tar.gz
-"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-RDEPEND="
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	# needed for unittest discovery
-	> tests/__init__.py || die
-	# linter tests, fragile to newer linter versions
-	rm tests/test_code.py || die
-
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/python-dbusmock/python-dbusmock-0.27.5.ebuild b/dev-python/python-dbusmock/python-dbusmock-0.27.5.ebuild
index 5f76b17147fd..95ce308573ca 100644
--- a/dev-python/python-dbusmock/python-dbusmock-0.27.5.ebuild
+++ b/dev-python/python-dbusmock/python-dbusmock-0.27.5.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 
 RDEPEND="
 	dev-python/dbus-python[${PYTHON_USEDEP}]
diff --git a/dev-python/python-evdev/python-evdev-1.5.0.ebuild b/dev-python/python-evdev/python-evdev-1.5.0.ebuild
index d34dc3ddbeb3..3f039b5a4c00 100644
--- a/dev-python/python-evdev/python-evdev-1.5.0.ebuild
+++ b/dev-python/python-evdev/python-evdev-1.5.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/python-nbxmpp/python-nbxmpp-2.0.6.ebuild b/dev-python/python-nbxmpp/python-nbxmpp-2.0.6.ebuild
index 6199ea20c989..d5596a28bf13 100644
--- a/dev-python/python-nbxmpp/python-nbxmpp-2.0.6.ebuild
+++ b/dev-python/python-nbxmpp/python-nbxmpp-2.0.6.ebuild
@@ -18,7 +18,7 @@ S=${WORKDIR}/${MY_P}
 
 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/rich/Manifest b/dev-python/rich/Manifest
index 05d735f645c2..4c0fcbcbc139 100644
--- a/dev-python/rich/Manifest
+++ b/dev-python/rich/Manifest
@@ -1,4 +1,2 @@
-DIST rich-12.0.0.gh.tar.gz 14727980 BLAKE2B b9f7761ab1084765f804fd22f9fb18e659f91b917bb452217752683f6d61320d2703eee28de3be3bd70009fc06d04165528393c4c0ec32a49b1dc7e94989a224 SHA512 4e47e48709180ef844bcf1cd516b22de8a4f22c5121ca0582a2cff7297d97afe63232926d518cd2bf4d6d1a7cea362ab12e71eedacce6b6d378ef1a1528d9e4c
-DIST rich-12.0.1.gh.tar.gz 14857207 BLAKE2B 8e6419904ef0ba91d4b15059630f63769a28323600cb212f07c2a239201489e2078b8c4c792f486bde75efd9d09afe832fa2e2235ac91433ee24b33fcda02e68 SHA512 61077663b46a7e615b29df3b75b15ef97979c804abd283cc26f217ee8128b74a514fd7b92831d1d8928f768d2ec8230d8cd1da733106b424704a3187ee18ce95
-DIST rich-12.1.0.gh.tar.gz 14883003 BLAKE2B f11642b5a90934e95dd7d71707617c8a3a1680644dafa9535f86ed5648f14389cddd968c329d4d94649c15123dd00045e0e9e7bb3314be3e6bbc72ba67c100e1 SHA512 6144af9b8843592d586e1c54d5bd97b6974a2510746319c7c0e961f04515ab837088bde2d0876e1a3d33eff40f4dfd8babc3c3f8123f6a4472b7a3eca580d131
 DIST rich-12.2.0.gh.tar.gz 14884722 BLAKE2B fb3720724d2441cddd85ac22249aa232bd31f664019f9eb02e10fda913b98c0220a4fadff47fc0f6884ff77b7ee9f98a96e036fb76d0492e0c040d752a9e9c79 SHA512 8f8108557ca21e41b35c03242d203c229f7af0d7abf5b394fc894e71ae098bbc14e046b166e5452d7a9f9d7d6e8cc0e13784d64cd721d2f7acec9f624d14db77
+DIST rich-12.3.0.gh.tar.gz 14889665 BLAKE2B baa098e25768b4b84a269547c7726d281f67e333c0993513223dfdda7023001ea78b6edd10218726ae888e7216e18c6c4d5b9711268d083dfd0a41c3162658c9 SHA512 6df0ac70ffac7aca5726c9ea29c6eeada1ff955539842a1352eaa7f7e95c4c7ec57f4e2eaca6808e522d7e455efa80df2ccc3e20188f4646ad0e18294b59f744
diff --git a/dev-python/rich/rich-12.0.0.ebuild b/dev-python/rich/rich-12.0.0.ebuild
deleted file mode 100644
index 2432dd98d98e..000000000000
--- a/dev-python/rich/rich-12.0.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Python library for renrering rich text, tables, etc. to the terminal"
-HOMEPAGE="https://github.com/Textualize/rich"
-SRC_URI="
-	https://github.com/Textualize/${PN}/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ppc ppc64 ~riscv sparc x86"
-
-RDEPEND="
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/commonmark[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# check for exact color render string, which changes across pygments bumps
-		tests/test_syntax.py::test_python_render
-		tests/test_syntax.py::test_python_render_simple
-		tests/test_syntax.py::test_python_render_indent_guides
-	)
-	epytest -p no:pytest-qt
-}
-
-pkg_postinst() {
-	optfeature "integration with HTML widgets for Jupyter" dev-python/ipywidgets
-}
diff --git a/dev-python/rich/rich-12.0.1.ebuild b/dev-python/rich/rich-12.0.1.ebuild
deleted file mode 100644
index e7518f2f5ef7..000000000000
--- a/dev-python/rich/rich-12.0.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Python library for renrering rich text, tables, etc. to the terminal"
-HOMEPAGE="https://github.com/Textualize/rich"
-SRC_URI="
-	https://github.com/Textualize/${PN}/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-RDEPEND="
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/commonmark[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# check for exact color render string, which changes across pygments bumps
-		tests/test_syntax.py::test_python_render
-		tests/test_syntax.py::test_python_render_simple
-		tests/test_syntax.py::test_python_render_indent_guides
-	)
-	epytest -p no:pytest-qt
-}
-
-pkg_postinst() {
-	optfeature "integration with HTML widgets for Jupyter" dev-python/ipywidgets
-}
diff --git a/dev-python/rich/rich-12.2.0.ebuild b/dev-python/rich/rich-12.2.0.ebuild
index 07183118e458..6944cc760958 100644
--- a/dev-python/rich/rich-12.2.0.ebuild
+++ b/dev-python/rich/rich-12.2.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/colorama[${PYTHON_USEDEP}]
diff --git a/dev-python/rich/rich-12.1.0.ebuild b/dev-python/rich/rich-12.3.0.ebuild
index cbce1bff92d9..c2ac2f3746bd 100644
--- a/dev-python/rich/rich-12.1.0.ebuild
+++ b/dev-python/rich/rich-12.3.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND="
 	dev-python/colorama[${PYTHON_USEDEP}]
@@ -30,6 +30,11 @@ RDEPEND="
 
 distutils_enable_tests pytest
 
+EPYTEST_DESELECT=(
+	# broken with =dev-python/pygments-2.12.0
+	tests/test_console.py::test_size_can_fall_back_to_std_descriptors
+)
+
 python_test() {
 	local -x COLUMNS=80
 	epytest -p no:pytest-qt
diff --git a/dev-python/sphinxcontrib-apidoc/sphinxcontrib-apidoc-0.3.0.ebuild b/dev-python/sphinxcontrib-apidoc/sphinxcontrib-apidoc-0.3.0.ebuild
deleted file mode 100644
index c94c1927a435..000000000000
--- a/dev-python/sphinxcontrib-apidoc/sphinxcontrib-apidoc-0.3.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="Sphinx extension for running sphinx-apidoc on each build"
-HOMEPAGE="https://pypi.org/project/sphinxcontrib-apidoc/ https://github.com/sphinx-contrib/apidoc"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-BDEPEND="dev-python/pbr[${PYTHON_USEDEP}]"
-RDEPEND="${BDEPEND}
-	dev-python/sphinx[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-python_install_all() {
-	distutils-r1_python_install_all
-	find "${D}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/sphinxcontrib-applehelp/metadata.xml b/dev-python/sphinxcontrib-applehelp/metadata.xml
index 853174b8f2ab..ea8988e8af6a 100644
--- a/dev-python/sphinxcontrib-applehelp/metadata.xml
+++ b/dev-python/sphinxcontrib-applehelp/metadata.xml
@@ -7,4 +7,5 @@
  </maintainer>
  
  <origin>gentoo-staging</origin>
+ <stabilize-allarches/>
 </pkgmetadata>
 \ No newline at end of file
diff --git a/dev-python/sphinxcontrib-applehelp/sphinxcontrib-applehelp-1.0.2-r1.ebuild b/dev-python/sphinxcontrib-applehelp/sphinxcontrib-applehelp-1.0.2-r1.ebuild
index d262ce847690..fcfc9740edf2 100644
--- a/dev-python/sphinxcontrib-applehelp/sphinxcontrib-applehelp-1.0.2-r1.ebuild
+++ b/dev-python/sphinxcontrib-applehelp/sphinxcontrib-applehelp-1.0.2-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 
 PDEPEND="
 	>=dev-python/sphinx-2.0[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinxcontrib-applehelp/sphinxcontrib-applehelp-1.0.2.ebuild b/dev-python/sphinxcontrib-applehelp/sphinxcontrib-applehelp-1.0.2.ebuild
deleted file mode 100644
index 3a8ede5dc727..000000000000
--- a/dev-python/sphinxcontrib-applehelp/sphinxcontrib-applehelp-1.0.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Sphinx extension which outputs Apple help book"
-HOMEPAGE="https://www.sphinx-doc.org
-	https://github.com/sphinx-doc/sphinxcontrib-applehelp"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-
-RDEPEND="dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]"
-PDEPEND="
-	>=dev-python/sphinx-2.0[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? ( ${PDEPEND} )"
-
-distutils_enable_tests pytest
-
-python_install_all() {
-	distutils-r1_python_install_all
-	find "${ED}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/sphinxcontrib-asyncio/sphinxcontrib-asyncio-0.2.0-r2.ebuild b/dev-python/sphinxcontrib-asyncio/sphinxcontrib-asyncio-0.2.0-r2.ebuild
deleted file mode 100644
index 15e651bc1cc8..000000000000
--- a/dev-python/sphinxcontrib-asyncio/sphinxcontrib-asyncio-0.2.0-r2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="sphinx extension to support coroutines in markup"
-HOMEPAGE="https://github.com/aio-libs/sphinxcontrib-asyncio"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]
-	dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]"
-
-distutils_enable_sphinx docs
-
-src_prepare() {
-	# fix for sphinx >= 4.0
-	sed -e 's/PyModulelevel/PyFunction/g' \
-		-e 's/PyClassmember/PyClassMethod/g' \
-		-i sphinxcontrib/asyncio.py || die
-	default
-}
-
-python_install() {
-	rm "${BUILD_DIR}"/lib/sphinxcontrib/__init__.py || die
-	distutils-r1_python_install --skip-build
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	# clean up pth files bug #623852
-	find "${ED}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/sphinxcontrib-asyncio/sphinxcontrib-asyncio-0.2.0-r3.ebuild b/dev-python/sphinxcontrib-asyncio/sphinxcontrib-asyncio-0.2.0-r3.ebuild
index c28f00aa9f0f..e888c9f6d1cc 100644
--- a/dev-python/sphinxcontrib-asyncio/sphinxcontrib-asyncio-0.2.0-r3.ebuild
+++ b/dev-python/sphinxcontrib-asyncio/sphinxcontrib-asyncio-0.2.0-r3.ebuild
@@ -14,7 +14,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 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/sphinx[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinxcontrib-bibtex/Manifest b/dev-python/sphinxcontrib-bibtex/Manifest
index 3aa28c8d2a8c..6b2af5ac532d 100644
--- a/dev-python/sphinxcontrib-bibtex/Manifest
+++ b/dev-python/sphinxcontrib-bibtex/Manifest
@@ -1,3 +1 @@
-DIST sphinxcontrib-bibtex-2.3.0.tar.gz 100159 BLAKE2B 96c9ebf48f11354ea3978a053828f9290457aff4fa1f0bb3d9f94bfe6fb5d5463f83bb12004f22bf8e34a517393848482a27d6754c682d25a0de64c3c7d06ecc SHA512 84652cfc7ad19ad5cdc1dba9a8aa7f835c5c95850a8e941067fd79b6b271733a63a1ba457a59e18156737888c2f42350b7fe0cf2d55ea478629b74b00d14f908
-DIST sphinxcontrib-bibtex-2.4.1.tar.gz 108355 BLAKE2B 2ebe53186b7bbf6ef5e09f05e3586b3a2d126978ef87a023f577cb9768621ceea8eaba8be3d03f55d3c7cd0cd7682c598cf141468129866fb7ac9f08ed0e9245 SHA512 9f323379d2626837dc199ac6c63c555eef8a9fa7c1b215f68d5f2c2769ff4027a027c1a46abe9b09aadf87144ddb22e08aaa47838183a82ff0e12fbd91a5334a
 DIST sphinxcontrib-bibtex-2.4.2.tar.gz 284061 BLAKE2B 06d9a868da621cca522c45998ce5f28a5aafc501127760c494e9e796d807800cccf3ee0cace7f4b824a00a76e8dd80e77d0ac5e037f2eaebbeec2ce4ea2ead70 SHA512 52d47bf0a20ef13f29b712bbe66cbcb98bd9531b8032a847375ff23180368decc3f89c2323b9ccff77c9bc9fdada63c521a81da6b701533973fcf627c2672e82
diff --git a/dev-python/sphinxcontrib-bibtex/sphinxcontrib-bibtex-2.3.0.ebuild b/dev-python/sphinxcontrib-bibtex/sphinxcontrib-bibtex-2.3.0.ebuild
deleted file mode 100644
index 2c05f82fb4ca..000000000000
--- a/dev-python/sphinxcontrib-bibtex/sphinxcontrib-bibtex-2.3.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="Sphinx extensions for BibTeX style citations"
-HOMEPAGE="https://github.com/mcmtroffaes/sphinxcontrib-bibtex"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/pybtex[${PYTHON_USEDEP}]
-	dev-python/pybtex-docutils[${PYTHON_USEDEP}]
-	dev-python/sphinx[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx doc
-
-python_install_all() {
-	distutils-r1_python_install_all
-	find "${D}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/sphinxcontrib-bibtex/sphinxcontrib-bibtex-2.4.1.ebuild b/dev-python/sphinxcontrib-bibtex/sphinxcontrib-bibtex-2.4.1.ebuild
deleted file mode 100644
index 733b34c9420f..000000000000
--- a/dev-python/sphinxcontrib-bibtex/sphinxcontrib-bibtex-2.4.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="Sphinx extensions for BibTeX style citations"
-HOMEPAGE="https://github.com/mcmtroffaes/sphinxcontrib-bibtex"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/pybtex[${PYTHON_USEDEP}]
-	dev-python/pybtex-docutils[${PYTHON_USEDEP}]
-	dev-python/sphinx[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests --install pytest
-distutils_enable_sphinx doc
-
-python_prepare_all() {
-	# pybtex.plugin.PluginNotFound: plugin pybtex.style.names.last not found
-	# This particular style seems to be removed?
-	rm test/test_citation.py test/test_footcite.py test/test_style.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	find "${D}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/sphinxcontrib-blockdiag/Manifest b/dev-python/sphinxcontrib-blockdiag/Manifest
index 37574458ef74..020f13fd66c7 100644
--- a/dev-python/sphinxcontrib-blockdiag/Manifest
+++ b/dev-python/sphinxcontrib-blockdiag/Manifest
@@ -1,2 +1 @@
 DIST sphinxcontrib-blockdiag-2.0.0.gh.tar.gz 11903 BLAKE2B 9301fe05ff936836e8e648a507b7e2e5fd8cada58252fd46b274a4bb3e6b51b00b7696ceee712d12bd590c40c5ae1235e0b532ef55ffc2e78b2986cdae64a0f2 SHA512 305ad9b27bbb44480c69139cc0ae9cd8e47c6ad95da5b14a964c703a17e62ab9b342ff567e8312e403549a794f6381fe4c4d444ccb7a8e41410d1a3754ffb3f1
-DIST sphinxcontrib-blockdiag-2.0.0.tar.gz 11903 BLAKE2B 9301fe05ff936836e8e648a507b7e2e5fd8cada58252fd46b274a4bb3e6b51b00b7696ceee712d12bd590c40c5ae1235e0b532ef55ffc2e78b2986cdae64a0f2 SHA512 305ad9b27bbb44480c69139cc0ae9cd8e47c6ad95da5b14a964c703a17e62ab9b342ff567e8312e403549a794f6381fe4c4d444ccb7a8e41410d1a3754ffb3f1
diff --git a/dev-python/sphinxcontrib-blockdiag/metadata.xml b/dev-python/sphinxcontrib-blockdiag/metadata.xml
index 7ad11570cc7d..a0d4c5913ba0 100644
--- a/dev-python/sphinxcontrib-blockdiag/metadata.xml
+++ b/dev-python/sphinxcontrib-blockdiag/metadata.xml
@@ -6,4 +6,5 @@
  </maintainer>
  
  <origin>gentoo-staging</origin>
+ <stabilize-allarches/>
 </pkgmetadata>
 \ No newline at end of file
diff --git a/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-2.0.0-r1.ebuild b/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-2.0.0-r1.ebuild
index 9e89a11ba759..7aebec79110a 100644
--- a/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-2.0.0-r1.ebuild
+++ b/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-2.0.0-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/sphinx-2.0[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-2.0.0.ebuild b/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-2.0.0.ebuild
deleted file mode 100644
index 03b55c671881..000000000000
--- a/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-2.0.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="A sphinx extension for embedding block diagrams using blockdiag"
-HOMEPAGE="https://github.com/blockdiag/sphinxcontrib-blockdiag"
-SRC_URI="https://github.com/blockdiag/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
-
-RDEPEND="
-	>=dev-python/sphinx-2.0[${PYTHON_USEDEP}]
-	>=dev-python/blockdiag-1.5.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/reportlab[${PYTHON_USEDEP}]
-		dev-python/sphinx-testing[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests nose
-
-RDEPEND+="
-	dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	sed -i -e /build-base/d setup.cfg || die
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	find "${ED}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/sphinxcontrib-devhelp/metadata.xml b/dev-python/sphinxcontrib-devhelp/metadata.xml
index 853174b8f2ab..ea8988e8af6a 100644
--- a/dev-python/sphinxcontrib-devhelp/metadata.xml
+++ b/dev-python/sphinxcontrib-devhelp/metadata.xml
@@ -7,4 +7,5 @@
  </maintainer>
  
  <origin>gentoo-staging</origin>
+ <stabilize-allarches/>
 </pkgmetadata>
 \ No newline at end of file
diff --git a/dev-python/sphinxcontrib-devhelp/sphinxcontrib-devhelp-1.0.2-r1.ebuild b/dev-python/sphinxcontrib-devhelp/sphinxcontrib-devhelp-1.0.2-r1.ebuild
index b170e5c4eec9..87794035ab42 100644
--- a/dev-python/sphinxcontrib-devhelp/sphinxcontrib-devhelp-1.0.2-r1.ebuild
+++ b/dev-python/sphinxcontrib-devhelp/sphinxcontrib-devhelp-1.0.2-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 
 PDEPEND="
 	>=dev-python/sphinx-2.0[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinxcontrib-devhelp/sphinxcontrib-devhelp-1.0.2.ebuild b/dev-python/sphinxcontrib-devhelp/sphinxcontrib-devhelp-1.0.2.ebuild
deleted file mode 100644
index 2e37d0de6b04..000000000000
--- a/dev-python/sphinxcontrib-devhelp/sphinxcontrib-devhelp-1.0.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Sphinx extension which outputs Devhelp documents"
-HOMEPAGE="https://www.sphinx-doc.org
-	https://github.com/sphinx-doc/sphinxcontrib-devhelp"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-
-RDEPEND="dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]"
-PDEPEND="
-	>=dev-python/sphinx-2.0[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? ( ${PDEPEND} )"
-
-distutils_enable_tests pytest
-
-python_install_all() {
-	distutils-r1_python_install_all
-	find "${ED}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.11.1-r1.ebuild b/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.11.1-r1.ebuild
index 962ca8636ef1..d1c10d03f9ef 100644
--- a/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.11.1-r1.ebuild
+++ b/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.11.1-r1.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.0[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinxcontrib-htmlhelp/metadata.xml b/dev-python/sphinxcontrib-htmlhelp/metadata.xml
index 853174b8f2ab..ea8988e8af6a 100644
--- a/dev-python/sphinxcontrib-htmlhelp/metadata.xml
+++ b/dev-python/sphinxcontrib-htmlhelp/metadata.xml
@@ -7,4 +7,5 @@
  </maintainer>
  
  <origin>gentoo-staging</origin>
+ <stabilize-allarches/>
 </pkgmetadata>
 \ No newline at end of file
diff --git a/dev-python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-2.0.0-r1.ebuild b/dev-python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-2.0.0-r1.ebuild
index 5968a8ecb1a8..a4426ae3900f 100644
--- a/dev-python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-2.0.0-r1.ebuild
+++ b/dev-python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-2.0.0-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 
 PDEPEND="
 	>=dev-python/sphinx-2.0[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-2.0.0.ebuild b/dev-python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-2.0.0.ebuild
deleted file mode 100644
index 88285d2a7bf6..000000000000
--- a/dev-python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-2.0.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Sphinx extension which outputs HTML help book"
-HOMEPAGE="https://www.sphinx-doc.org/
-	https://github.com/sphinx-doc/sphinxcontrib-htmlhelp/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-
-RDEPEND="dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]"
-PDEPEND="
-	>=dev-python/sphinx-2.0[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		${PDEPEND}
-		dev-python/html5lib[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-python_install_all() {
-	distutils-r1_python_install_all
-	find "${ED}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/sphinxcontrib-httpdomain/sphinxcontrib-httpdomain-1.8.0.ebuild b/dev-python/sphinxcontrib-httpdomain/sphinxcontrib-httpdomain-1.8.0.ebuild
index 90e263e1d733..f2b710513649 100644
--- a/dev-python/sphinxcontrib-httpdomain/sphinxcontrib-httpdomain-1.8.0.ebuild
+++ b/dev-python/sphinxcontrib-httpdomain/sphinxcontrib-httpdomain-1.8.0.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/httpdomain-${PV}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc ~x86"
 
 RDEPEND="
 	dev-python/sphinx[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinxcontrib-jsmath/metadata.xml b/dev-python/sphinxcontrib-jsmath/metadata.xml
index 853174b8f2ab..ea8988e8af6a 100644
--- a/dev-python/sphinxcontrib-jsmath/metadata.xml
+++ b/dev-python/sphinxcontrib-jsmath/metadata.xml
@@ -7,4 +7,5 @@
  </maintainer>
  
  <origin>gentoo-staging</origin>
+ <stabilize-allarches/>
 </pkgmetadata>
 \ No newline at end of file
diff --git a/dev-python/sphinxcontrib-jsmath/sphinxcontrib-jsmath-1.0.1-r1.ebuild b/dev-python/sphinxcontrib-jsmath/sphinxcontrib-jsmath-1.0.1-r1.ebuild
deleted file mode 100644
index 8359473eb791..000000000000
--- a/dev-python/sphinxcontrib-jsmath/sphinxcontrib-jsmath-1.0.1-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Sphinx extension which renders display math in HTML via JavaScript"
-HOMEPAGE="https://www.sphinx-doc.org
-	https://github.com/sphinx-doc/sphinxcontrib-jsmath"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-
-RDEPEND="dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]"
-PDEPEND="
-	>=dev-python/sphinx-2.0[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? ( ${PDEPEND} )"
-
-distutils_enable_tests pytest
-
-python_install_all() {
-	distutils-r1_python_install_all
-	find "${ED}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/sphinxcontrib-jsmath/sphinxcontrib-jsmath-1.0.1-r2.ebuild b/dev-python/sphinxcontrib-jsmath/sphinxcontrib-jsmath-1.0.1-r2.ebuild
index f89017fa6d4d..a189356a9481 100644
--- a/dev-python/sphinxcontrib-jsmath/sphinxcontrib-jsmath-1.0.1-r2.ebuild
+++ b/dev-python/sphinxcontrib-jsmath/sphinxcontrib-jsmath-1.0.1-r2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 
 PDEPEND="
 	>=dev-python/sphinx-2.0[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinxcontrib-log_cabinet/sphinxcontrib-log_cabinet-1.0.1-r1.ebuild b/dev-python/sphinxcontrib-log_cabinet/sphinxcontrib-log_cabinet-1.0.1-r1.ebuild
index 80956bdb6ff7..d79f1ab0f386 100644
--- a/dev-python/sphinxcontrib-log_cabinet/sphinxcontrib-log_cabinet-1.0.1-r1.ebuild
+++ b/dev-python/sphinxcontrib-log_cabinet/sphinxcontrib-log_cabinet-1.0.1-r1.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${P/_/-}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
 
 python_compile() {
 	distutils-r1_python_compile
diff --git a/dev-python/sphinxcontrib-log_cabinet/sphinxcontrib-log_cabinet-1.0.1.ebuild b/dev-python/sphinxcontrib-log_cabinet/sphinxcontrib-log_cabinet-1.0.1.ebuild
deleted file mode 100644
index 89c17c296f9a..000000000000
--- a/dev-python/sphinxcontrib-log_cabinet/sphinxcontrib-log_cabinet-1.0.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Organize changelog directives in Sphinx docs"
-HOMEPAGE="https://github.com/davidism/sphinxcontrib-log-cabinet"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P/_/-}.tar.gz"
-S="${WORKDIR}/${P/_/-}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]"
-
-python_install_all() {
-	distutils-r1_python_install_all
-	find "${ED}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/sphinxcontrib-newsfeed/sphinxcontrib-newsfeed-0.1.4-r1.ebuild b/dev-python/sphinxcontrib-newsfeed/sphinxcontrib-newsfeed-0.1.4-r1.ebuild
index 0a63ed195e5f..a14f8694224c 100644
--- a/dev-python/sphinxcontrib-newsfeed/sphinxcontrib-newsfeed-0.1.4-r1.ebuild
+++ b/dev-python/sphinxcontrib-newsfeed/sphinxcontrib-newsfeed-0.1.4-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="examples"
 
 RDEPEND="
diff --git a/dev-python/sphinxcontrib-newsfeed/sphinxcontrib-newsfeed-0.1.4.ebuild b/dev-python/sphinxcontrib-newsfeed/sphinxcontrib-newsfeed-0.1.4.ebuild
deleted file mode 100644
index 92a6a21aa659..000000000000
--- a/dev-python/sphinxcontrib-newsfeed/sphinxcontrib-newsfeed-0.1.4.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="News Feed extension for Sphinx"
-HOMEPAGE="https://github.com/prometheusresearch/sphinxcontrib-newsfeed"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-IUSE="examples"
-
-RDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]
-	dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]"
-
-python_install_all() {
-	distutils-r1_python_install_all
-	find "${ED}" -name '*.pth' -delete || die
-	if use examples; then
-		docinto examples
-		dodoc -r demo/.
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/dev-python/sphinxcontrib-openapi/sphinxcontrib-openapi-0.7.0.ebuild b/dev-python/sphinxcontrib-openapi/sphinxcontrib-openapi-0.7.0.ebuild
index 60ffa4ca198b..3f2ab1d4f8f6 100644
--- a/dev-python/sphinxcontrib-openapi/sphinxcontrib-openapi-0.7.0.ebuild
+++ b/dev-python/sphinxcontrib-openapi/sphinxcontrib-openapi-0.7.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc ~x86"
 
 RDEPEND="
 	dev-python/sphinx[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinxcontrib-programoutput/sphinxcontrib-programoutput-0.17-r1.ebuild b/dev-python/sphinxcontrib-programoutput/sphinxcontrib-programoutput-0.17-r1.ebuild
index d61583ece137..1bb60ee39e6d 100644
--- a/dev-python/sphinxcontrib-programoutput/sphinxcontrib-programoutput-0.17-r1.ebuild
+++ b/dev-python/sphinxcontrib-programoutput/sphinxcontrib-programoutput-0.17-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/sphinx[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinxcontrib-programoutput/sphinxcontrib-programoutput-0.17.ebuild b/dev-python/sphinxcontrib-programoutput/sphinxcontrib-programoutput-0.17.ebuild
deleted file mode 100644
index 8726a459a513..000000000000
--- a/dev-python/sphinxcontrib-programoutput/sphinxcontrib-programoutput-0.17.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
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Extension to sphinx to include program output"
-HOMEPAGE="
-	https://github.com/NextThought/sphinxcontrib-programoutput/
-	https://pypi.org/project/sphinxcontrib-programoutput/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]
-	dev-python/sphinx[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-distutils_enable_tests pytest
-distutils_enable_sphinx doc
-
-python_install_all() {
-	distutils-r1_python_install_all
-	find "${ED}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/sphinxcontrib-qthelp/metadata.xml b/dev-python/sphinxcontrib-qthelp/metadata.xml
index 853174b8f2ab..ea8988e8af6a 100644
--- a/dev-python/sphinxcontrib-qthelp/metadata.xml
+++ b/dev-python/sphinxcontrib-qthelp/metadata.xml
@@ -7,4 +7,5 @@
  </maintainer>
  
  <origin>gentoo-staging</origin>
+ <stabilize-allarches/>
 </pkgmetadata>
 \ No newline at end of file
diff --git a/dev-python/sphinxcontrib-qthelp/sphinxcontrib-qthelp-1.0.3-r1.ebuild b/dev-python/sphinxcontrib-qthelp/sphinxcontrib-qthelp-1.0.3-r1.ebuild
index 25a372425d6a..8dca1955bdd2 100644
--- a/dev-python/sphinxcontrib-qthelp/sphinxcontrib-qthelp-1.0.3-r1.ebuild
+++ b/dev-python/sphinxcontrib-qthelp/sphinxcontrib-qthelp-1.0.3-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 
 PDEPEND="
 	>=dev-python/sphinx-2.0[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinxcontrib-qthelp/sphinxcontrib-qthelp-1.0.3.ebuild b/dev-python/sphinxcontrib-qthelp/sphinxcontrib-qthelp-1.0.3.ebuild
deleted file mode 100644
index dbdff78e9df2..000000000000
--- a/dev-python/sphinxcontrib-qthelp/sphinxcontrib-qthelp-1.0.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Sphinx extension which outputs QtHelp documents"
-HOMEPAGE="https://www.sphinx-doc.org
-	https://github.com/sphinx-doc/sphinxcontrib-qthelp"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-
-RDEPEND="dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]"
-PDEPEND="
-	>=dev-python/sphinx-2.0[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? ( ${PDEPEND} )"
-
-distutils_enable_tests pytest
-
-python_install_all() {
-	distutils-r1_python_install_all
-	find "${ED}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-1.1.5-r1.ebuild b/dev-python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-1.1.5-r1.ebuild
index 56049729e4d7..4654e5180002 100644
--- a/dev-python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-1.1.5-r1.ebuild
+++ b/dev-python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-1.1.5-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 
 PDEPEND="
 	>=dev-python/sphinx-2.0[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-1.1.5.ebuild b/dev-python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-1.1.5.ebuild
deleted file mode 100644
index 4b5f63ae0d63..000000000000
--- a/dev-python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-1.1.5.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Sphinx extension which outputs outputs serialized HTML files"
-HOMEPAGE="https://www.sphinx-doc.org
-	https://github.com/sphinx-doc/sphinxcontrib-serializinghtml"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-
-RDEPEND="dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]"
-PDEPEND="
-	>=dev-python/sphinx-2.0[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? ( ${PDEPEND} )"
-
-distutils_enable_tests pytest
-
-python_install_all() {
-	distutils-r1_python_install_all
-	find "${ED}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.2.4-r1.ebuild b/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.2.4-r1.ebuild
index 635cf38b33b8..0f74ca732991 100644
--- a/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.2.4-r1.ebuild
+++ b/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.2.4-r1.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
 
 RDEPEND="
 	>=dev-python/six-1.5[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.2.4.ebuild b/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.2.4.ebuild
deleted file mode 100644
index a6f6c5630ab6..000000000000
--- a/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.2.4.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Sphinx websupport extension"
-HOMEPAGE="https://www.sphinx-doc.org
-	https://github.com/sphinx-doc/sphinxcontrib-websupport"
-# pypi tarball is missing templates
-SRC_URI="https://github.com/sphinx-doc/sphinxcontrib-websupport/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
-
-RDEPEND="
-	>=dev-python/six-1.5[${PYTHON_USEDEP}]
-	dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]
-	dev-python/sphinxcontrib-serializinghtml[${PYTHON_USEDEP}]"
-# avoid circular dependency with sphinx
-PDEPEND="
-	>=dev-python/sphinx-1.5.3[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		${PDEPEND}
-		>=dev-python/sqlalchemy-0.9[${PYTHON_USEDEP}]
-		>=dev-python/whoosh-2.0[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# breaks tests
-	sed -i -e '/pkg_resources/d' \
-		sphinxcontrib/websupport/__init__.py || die
-	distutils-r1_src_prepare
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	find "${ED}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/sphobjinv/Manifest b/dev-python/sphobjinv/Manifest
index b0eb5d837d52..5af733c4cae2 100644
--- a/dev-python/sphobjinv/Manifest
+++ b/dev-python/sphobjinv/Manifest
@@ -1,2 +1 @@
-DIST sphobjinv-2.2.1.tar.gz 1150428 BLAKE2B 13bec53b00d14466aad652fb822ba32156d4ee3141f2df5bf55eaf77d03627c98c48dd142757ac43fe7dbf00716a85ee4c03060dfcf89e1d9aca4cd2589df5b0 SHA512 9247fc38e5d49adab0921f31e4ad1a8b2ca260c7a921b5fb9db7f800ee484335449031b0f51f81149ff71edba6cc93ab14a683ff6cdce2494322d05474e9a2c7
 DIST sphobjinv-2.2.2.tar.gz 1188094 BLAKE2B f693254f3746b0e5cb6cc863be381f41d26465eab2e1494c29f30f1a72374e8d03dfa5c433958dfa1dcbaa0a7da1ff454c42da5c09011fa67264c26e3623a302 SHA512 36e7667b071f30d4ca066422b21d298c5691321d813ba6ad9eb7a69cd4107ceb18365ee2f95865fad64ab872428b035661a3f513df2e4aab1124b48f49c7280b
diff --git a/dev-python/sphobjinv/sphobjinv-2.2.1.ebuild b/dev-python/sphobjinv/sphobjinv-2.2.1.ebuild
deleted file mode 100644
index fe4377f5a884..000000000000
--- a/dev-python/sphobjinv/sphobjinv-2.2.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Sphinx objects.inv Inspection/Manipulation Tool"
-HOMEPAGE="
-	https://github.com/bskinn/sphobjinv/
-	https://pypi.org/project/sphobjinv/
-"
-SRC_URI="https://github.com/bskinn/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
-SLOT="0"
-
-RDEPEND="
-	>=dev-python/attrs-19.2[${PYTHON_USEDEP}]
-	dev-python/certifi[${PYTHON_USEDEP}]
-	dev-python/fuzzywuzzy[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/dictdiffer[${PYTHON_USEDEP}]
-		dev-python/pytest-check[${PYTHON_USEDEP}]
-		dev-python/pytest-ordering[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		>=dev-python/stdio-mgr-1.0.1[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/timeout-decorator[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx doc/source \
-	dev-python/sphinx_rtd_theme \
-	dev-python/sphinx-issues \
-	dev-python/sphinxcontrib-programoutput
-
-src_prepare() {
-	# --strict option is deprecated in pytest>6
-	sed -i -e '/addopts/d' tox.ini || die
-	sed -e '/CLI_TEST_TIMEOUT/s/2/20/' -i tests/test_cli.py || die
-
-	# remove bundled deps
-	rm -r src/sphobjinv/_vendored || die
-	sed -i -e 's:sphobjinv[.]_vendored[.]::' src/sphobjinv/*.py || die
-
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/sphobjinv/sphobjinv-2.2.2.ebuild b/dev-python/sphobjinv/sphobjinv-2.2.2.ebuild
index 6347f3af729c..9862efc16fd0 100644
--- a/dev-python/sphobjinv/sphobjinv-2.2.2.ebuild
+++ b/dev-python/sphobjinv/sphobjinv-2.2.2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 "
 
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 SLOT="0"
 
 RDEPEND="
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.4.35.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.35.ebuild
index 3bc07d870bc8..0ff69efed15f 100644
--- a/dev-python/sqlalchemy/sqlalchemy-1.4.35.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-1.4.35.ebuild
@@ -23,7 +23,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="examples +sqlite test"
 
 BDEPEND="
diff --git a/dev-python/svg-path/svg-path-6.0.ebuild b/dev-python/svg-path/svg-path-6.0.ebuild
index 1d83900ffe40..25b9ae94808b 100644
--- a/dev-python/svg-path/svg-path-6.0.ebuild
+++ b/dev-python/svg-path/svg-path-6.0.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/tifffile/Manifest b/dev-python/tifffile/Manifest
index 070c89c268dd..d9f7e01a597b 100644
--- a/dev-python/tifffile/Manifest
+++ b/dev-python/tifffile/Manifest
@@ -1,4 +1,5 @@
 DIST tifffile-2022.3.16.gh.tar.gz 263653 BLAKE2B fcd30e2fd38a12438332badb17e937ab095a8088f9c878b84166a67c7486f436a76d39832df22362f7a74de5da537602da82c982fb4dc0699fba1603adefdcef SHA512 8069a87b241cbb11b3efa8ff679106f2f11ff9045d790fb1612076a60b87791f30afffb55b57d19b70ab4441935f418ad91fb0956ab572890704023e63dea84a
 DIST tifffile-2022.3.25.gh.tar.gz 265082 BLAKE2B dd5f3705cb7203fe943b97a5ed5c000b44abf48ec748f38a1468e27e82bd980e4100dd14af5cfd6af5bdee9d0036c5dce37efca1e515f2eb283c0e221150915a SHA512 dc9018991989ca4b89be6f315aaa45ff2fb94c504dd4c1790af1ec68e05a1da85560f5098df2f460b726cea0d4b0e4fc3f12d493dc1a1db8e2cc35d86f547ddf
 DIST tifffile-2022.4.22.gh.tar.gz 280049 BLAKE2B d1d45e7a28c83ca52708aea64c5b7fffdab61405bf9aa2f87d1c3ef347e4057f3081e4f5b6df9de70ad35ec3dd9a17f30a763124338549bda0d93207c59bc7b5 SHA512 75488d9f15c98e8f9824ac4e538f7d2d75dbf06479ea1aee0a7f33bca71be0b3beeb32d3e8a4dcf5e09349ff415faff17d20ce312e43c80209d5c78cf8554c50
+DIST tifffile-2022.4.26.gh.tar.gz 283249 BLAKE2B 740cbee481bac327e63e4d574edc8667a7fab7b53311fcba719a8930ee5827fc8fb4888c881e20453c34635211105447fca12e0d3ce6cfcad5f38efc89c35b09 SHA512 f1e38ae821559c2807c6f299eae43255ec8a164119cb1a5ba2bf80b281b83ba7c629504efa2a2d36ef26edf14577dd7234c1c9bba8168503e4298dafe4fbc743
 DIST tifffile-2022.4.8.gh.tar.gz 266725 BLAKE2B 3ac30337c1c7f26e32335a6d7756b4bf2d961f1e96badbc4ca8e9e5ee344513c61900d507f4098e4f5181b2c95134d0a74b646ce611cf9d3d3b5cc644ed70809 SHA512 1d12ca48dcc9fd8de5f3aa28cdd64a7735493b957d174f8ae49cb8a918075e6b50d4034ad9507d3b9ddd8ed1c595ec9fdace0986421b1993371cfe045698d578
diff --git a/dev-python/tifffile/tifffile-2022.4.26.ebuild b/dev-python/tifffile/tifffile-2022.4.26.ebuild
new file mode 100644
index 000000000000..3afef0f99871
--- /dev/null
+++ b/dev-python/tifffile/tifffile-2022.4.26.ebuild
@@ -0,0 +1,53 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Read and write TIFF files"
+HOMEPAGE="
+	https://pypi.org/project/tifffile/
+	https://github.com/cgohlke/tifffile/
+	https://www.lfd.uci.edu/~gohlke/
+"
+SRC_URI="
+	https://github.com/cgohlke/tifffile/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/numpy-1.19.2[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/dask[${PYTHON_USEDEP}]
+		>=dev-python/fsspec-2021.5.0[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/xarray[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# Internet
+	tests/test_tifffile.py::test_class_omexml
+	tests/test_tifffile.py::test_class_omexml_fail
+	tests/test_tifffile.py::test_class_omexml_modulo
+	tests/test_tifffile.py::test_class_omexml_attributes
+	tests/test_tifffile.py::test_class_omexml_multiimage
+	tests/test_tifffile.py::test_write_ome
+	tests/test_tifffile.py::test_write_ome_manual
+	# requires tons of free space
+	tests/test_tifffile.py::test_write_3gb
+	tests/test_tifffile.py::test_write_bigtiff
+	'tests/test_tifffile.py::test_write_imagej_raw'
+)
diff --git a/dev-python/uri_template/uri_template-1.2.0.ebuild b/dev-python/uri_template/uri_template-1.2.0.ebuild
index a5bcd88c6851..7be2a2f6df35 100644
--- a/dev-python/uri_template/uri_template-1.2.0.ebuild
+++ b/dev-python/uri_template/uri_template-1.2.0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
 
 python_test() {
 	"${EPYTHON}" "test.py" || die "Tests fail with ${EPYTHON}."
diff --git a/dev-python/watchdog/watchdog-2.1.7.ebuild b/dev-python/watchdog/watchdog-2.1.7.ebuild
index a66e423619a4..065396f4ad31 100644
--- a/dev-python/watchdog/watchdog-2.1.7.ebuild
+++ b/dev-python/watchdog/watchdog-2.1.7.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ~ppc64 ~riscv ~s390 sparc ~x86"
 
 RDEPEND="
 	dev-python/pyyaml[${PYTHON_USEDEP}]
author	Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net>	2022-04-27 00:37:54 +0000
committer	Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net>	2022-04-27 00:37:54 +0000
commit	c59726f73d452c764efc0aeca13eb981cf11cf67 (patch)
tree	590fcf4aa145563289adfb41ec09ebf37254acf3 /dev-python
parent	6dcf197a8c97b0dc222865d2e3fcff37b27f066e (diff)
download	baldeagleos-repo-c59726f73d452c764efc0aeca13eb981cf11cf67.tar.gz baldeagleos-repo-c59726f73d452c764efc0aeca13eb981cf11cf67.tar.xz baldeagleos-repo-c59726f73d452c764efc0aeca13eb981cf11cf67.zip