Adding metadata

58 files changed, 30 insertions, 970 deletions

diff --git a/dev-python/astroid/Manifest b/dev-python/astroid/Manifest
index 9ebe6a5f9d23..cb4816dedd91 100644
--- a/dev-python/astroid/Manifest
+++ b/dev-python/astroid/Manifest
@@ -1,4 +1,3 @@
-DIST astroid-2.4.2.tar.gz 310972 BLAKE2B 23ebe5ef418ce19b64eb1c0f8d711c3f0d86ae32cff112d9a99db48d20a34c73cfa97c96229fd0f0f1169720d24e2cfd0b5a327c29ea0fc0f54a57ede45fcebe SHA512 f5d759c07a13e06d3d071faacff2dc775924566aaef8bdb6e526c4ebf723b6b561f5824b711b33e33a2a69df0a2ff4cbf0f4302c9a0d55610e031e81c4a4be91
 DIST astroid-2.5.1.tar.gz 312511 BLAKE2B 85d85c045579f6bf42a4640da95836e760d1d89edaefdf94209a2fdc7f2686a27abcb1c0710cad658473a0a1516df5ad80f10c6b7c2a4f14dea36af94aa9ae5b SHA512 a0aaa95257961235abbbbc021cdb48da760f8b1856bbc0a7a8b98c53c69045cee4bfe575182a631f994765819e373b33b3a6eca052573128e8b36f2c23c250de
 DIST astroid-2.5.2.tar.gz 312789 BLAKE2B 53b286a8772fea1df149aff19f56c0d86154e616a04f4e3e459e029bd4ae54e7f41c55873e0c310c4e36b0901a39bf88d92a7748a7a46baa000f386a0d154c05 SHA512 391d6b0981b4332fd074a568d33838cbd5d71e7200a3a7ba27bc96641d12be4a6452def0bb615a54e1fa6d1f1f6863a39d56cf3e503aba42ea0d0fdddbbb9102
 DIST astroid-2.5.tar.gz 304788 BLAKE2B 3d9304dcfff72aa8172fe88b5ee53b723b47b3e602b7c30cae15a61d0cff7d578ccfde4885b56c09c8254ca3fe185fcf297bf85184d68798eb51f1860c516db6 SHA512 eba7e757a12f89a74bff579731a157fda3c8d8dd1b5a4369791d47f7f6e321b23e167260d0988d389428222c8c98929e66ad26f379ff937e274dcd1abdb3b3d2
diff --git a/dev-python/astroid/astroid-2.4.2-r1.ebuild b/dev-python/astroid/astroid-2.4.2-r1.ebuild
deleted file mode 100644
index 42b28e5c39a0..000000000000
--- a/dev-python/astroid/astroid-2.4.2-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Abstract Syntax Tree for logilab packages"
-HOMEPAGE="https://github.com/PyCQA/astroid https://pypi.org/project/astroid/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# Version specified in __pkginfo__.py.
-RDEPEND="
-	dev-python/lazy-object-proxy[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	>=dev-python/wrapt-1.11.2[${PYTHON_USEDEP}]
-	>=dev-python/typed-ast-1.4.0[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/astroid-2.4.2-no-pytest-runner.patch
-	"${FILESDIR}"/astroid-2.4.2-py39.patch
-)
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	sed -r -e 's:"(wrapt|six|lazy_object_proxy)(~|=)=.+":"\1":' \
-		-i astroid/__pkginfo__.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local deselect=(
-		# no clue why it's broken
-		--deselect
-		tests/unittest_modutils.py::GetModulePartTest::test_knownValues_get_builtin_module_part
-	)
-	[[ ${EPYTHON} == python3.9 ]] && deselect+=(
-		--deselect
-		tests/unittest_brain.py::TypingBrain::test_namedtuple_few_args
-		--deselect
-		tests/unittest_brain.py::TypingBrain::test_namedtuple_few_fields
-		--deselect
-		tests/unittest_brain.py::TypingBrain::test_namedtuple_inference_nonliteral
-		--deselect
-		tests/unittest_inference.py::test_dataclasses_subscript_inference_recursion_error
-	)
-
-	pytest -vv "${deselect[@]}" || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/astroid/astroid-2.5.1.ebuild b/dev-python/astroid/astroid-2.5.1.ebuild
index 74cc91cc4ec4..03ebfcdad6ed 100644
--- a/dev-python/astroid/astroid-2.5.1.ebuild
+++ b/dev-python/astroid/astroid-2.5.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/astroid/files/astroid-2.4.2-py39.patch b/dev-python/astroid/files/astroid-2.4.2-py39.patch
deleted file mode 100644
index 0f838b7214a4..000000000000
--- a/dev-python/astroid/files/astroid-2.4.2-py39.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 3ffe25f8e3cdb30f0dcfb68f4373370828894727 Mon Sep 17 00:00:00 2001
-From: Karthikeyan Singaravelan <tir.karthi@gmail.com>
-Date: Tue, 4 Aug 2020 10:11:44 +0000
-Subject: [PATCH] Skip test for | in dictionaries due to PEP-584 in Python 3.9+
-
----
- tests/unittest_inference.py | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/tests/unittest_inference.py b/tests/unittest_inference.py
-index 76c7e879..b7bc732d 100644
---- a/tests/unittest_inference.py
-+++ b/tests/unittest_inference.py
-@@ -2455,7 +2455,6 @@ def test_binary_op_type_errors(self):
-         1 ** (lambda x: x) #@
-         {} * {} #@
-         {} - {} #@
--        {} | {} #@
-         {} >> {} #@
-         [] + () #@
-         () + [] #@
-@@ -2500,7 +2499,6 @@ def __radd__(self, other):
-             msg.format(op="**", lhs="int", rhs="function"),
-             msg.format(op="*", lhs="dict", rhs="dict"),
-             msg.format(op="-", lhs="dict", rhs="dict"),
--            msg.format(op="|", lhs="dict", rhs="dict"),
-             msg.format(op=">>", lhs="dict", rhs="dict"),
-             msg.format(op="+", lhs="list", rhs="tuple"),
-             msg.format(op="+", lhs="tuple", rhs="list"),
-@@ -2515,6 +2513,12 @@ def __radd__(self, other):
-             msg.format(op="+=", lhs="int", rhs="A"),
-             msg.format(op="+=", lhs="int", rhs="list"),
-         ]
-+
-+        # PEP-584 supports | for dictionary union
-+        if sys.version_info < (3, 9):
-+            ast_nodes.append(extract_node("{} | {} #@"))
-+            expected.append(msg.format(op="|", lhs="dict", rhs="dict"))
-+
-         for node, expected_value in zip(ast_nodes, expected):
-             errors = node.type_errors()
-             self.assertEqual(len(errors), 1)
diff --git a/dev-python/clang-python/clang-python-11.1.0.ebuild b/dev-python/clang-python/clang-python-11.1.0.ebuild
index 84a0731ade28..79dd59fdcdf5 100644
--- a/dev-python/clang-python/clang-python-11.1.0.ebuild
+++ b/dev-python/clang-python/clang-python-11.1.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~x86"
 IUSE="test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/coverage/coverage-5.5.ebuild b/dev-python/coverage/coverage-5.5.ebuild
index b9fede937a18..a810ab5ec183 100644
--- a/dev-python/coverage/coverage-5.5.ebuild
+++ b/dev-python/coverage/coverage-5.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 #IUSE="test"
 # The tests are impossible to appease.  Please run them externally
 # via tox.  Or fix the ebuild if you have hours of time to spend
diff --git a/dev-python/cython/cython-0.29.22.ebuild b/dev-python/cython/cython-0.29.22.ebuild
index e67ae3d183c7..f239e1d2dd2e 100644
--- a/dev-python/cython/cython-0.29.22.ebuild
+++ b/dev-python/cython/cython-0.29.22.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/cython/cython/archive/${PV}.tar.gz -> ${P}.gh.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE="emacs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/defusedxml/defusedxml-0.7.1.ebuild b/dev-python/defusedxml/defusedxml-0.7.1.ebuild
index 1fc90ad2630b..5a9f73d2cbc9 100644
--- a/dev-python/defusedxml/defusedxml-0.7.1.ebuild
+++ b/dev-python/defusedxml/defusedxml-0.7.1.ebuild
@@ -17,7 +17,7 @@ S=${WORKDIR}/${P/_/.}
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="examples"
 
 distutils_enable_tests setup.py
diff --git a/dev-python/dulwich/dulwich-0.20.20.ebuild b/dev-python/dulwich/dulwich-0.20.20.ebuild
index 5df0eba1b963..5b1ee9888728 100644
--- a/dev-python/dulwich/dulwich-0.20.20.ebuild
+++ b/dev-python/dulwich/dulwich-0.20.20.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2+ Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/elementpath/Manifest b/dev-python/elementpath/Manifest
index f180862956dd..4e1bf9bd081d 100644
--- a/dev-python/elementpath/Manifest
+++ b/dev-python/elementpath/Manifest
@@ -1,3 +1,2 @@
-DIST elementpath-2.1.4.tar.gz 208691 BLAKE2B 8317c8fa90d7feaff76357c19ed8373644d60985b1d53a1e0a702e26bf80887523a0f1dcf601800ac1618e8f681b3898b5d56fb4edbbffaacbb4a0efe58f67b1 SHA512 d965bd58254e601000da5be309ab18d3f5964cbc1224092e5e38b4523eb3ac2f7ae6e71fa6c3698b40b13484ed1d07bf93c80d45a9b3ad04f69f63bd18a42975
 DIST elementpath-2.2.0.gh.tar.gz 222412 BLAKE2B ac05a3ef816713377ec304962732c60f587972e903541748f0f4958aab0456da9aafbccf66d981b852a98d63b37224499af89125e34dae3fec6094f793f823b3 SHA512 db9950fc1d02d3207db73ad0066d681a8e3b293817e2b4fe0c133eff9e8d822f72d2fca4cd631802765d3ee82c2cae69beeae1332b427adac90bca61978d47a9
 DIST elementpath-2.2.1.gh.tar.gz 228166 BLAKE2B 0fb0f338a28d155056bd551dc00e634a00a820945e8147ac8a1eb4811aca9e25c563e9011f1a0de9d2aad5761322fb8d9167b64cc5653bbc4012d0631c81fb05 SHA512 eadeb7fbdaa5470c39a59c8f02047aa8f8e76bfa03087bf2a3206f3fad57ae78da82ccee1de5e6c13207c9e22ca5a45de4c1b4b42c62f8141c8f2bacece02ebf
diff --git a/dev-python/elementpath/elementpath-2.1.4.ebuild b/dev-python/elementpath/elementpath-2.1.4.ebuild
deleted file mode 100644
index 3356f8987c5a..000000000000
--- a/dev-python/elementpath/elementpath-2.1.4.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="XPath 1.0/2.0 parsers and selectors for ElementTree and lxml"
-HOMEPAGE="https://github.com/sissaschool/elementpath
-	https://pypi.org/project/elementpath/"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	test? (
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/xmlschema[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests unittest
diff --git a/dev-python/elementpath/elementpath-2.2.0.ebuild b/dev-python/elementpath/elementpath-2.2.0.ebuild
index 12c101755ccd..4d595bed7294 100644
--- a/dev-python/elementpath/elementpath-2.2.0.ebuild
+++ b/dev-python/elementpath/elementpath-2.2.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/google-api-core/Manifest b/dev-python/google-api-core/Manifest
index ed9b55794238..ed78cdf9a666 100644
--- a/dev-python/google-api-core/Manifest
+++ b/dev-python/google-api-core/Manifest
@@ -1,4 +1,2 @@
-DIST google-api-core-1.26.0.tar.gz 132817 BLAKE2B f077e5f7a50de69ef3707d3e9a54f3b4948c458ee1eda058778fda618b202e7fd5fb7a116b9b153bf77bdbda858a91616e2f201d2aac45d8654a44001f52c71f SHA512 2e35f231936d06a6c05dbc4930da881e17c53d10224ed394d7deec9fcc45647ccb3dc72316912c31300bc5d3776467d6aab160660695c9919f28fdf73bfd2ffe
 DIST google-api-core-1.26.1.tar.gz 132880 BLAKE2B f1872c1240b0b40385fce0496c676c2408501600710ec51cdcbfa8c5f0f15858ef62860f33022bd9ceaffbca25ec83cc1879b7ec7c3a3b119e5e3cc4ac043a0f SHA512 138bd10895006885761f34932bf8f4b0776c2f3a2c2038d97d1837d961088b4a19cbd84321a493b81cad4727374949e87c59b7f649507a7cb356e6457a94cb1f
-DIST google-api-core-1.26.2.tar.gz 133082 BLAKE2B ea574b5ef08406c2452b6e9b5acf055f675bb1a0b966d7adc83c830f761d2ac5fe53d2ea6fa6d47e75b1fa1dcbf144836f4865b7f1ab0688aee20d54df214b01 SHA512 da58f871cbe95d5dc040a50da192750afee9804145aa0fba07434d085f799bf8c18ac29fd1c733ffe76c9109be7e76323b0c307d48d74fcd0d73e51e5120ccce
 DIST google-api-core-1.26.3.tar.gz 133409 BLAKE2B ca3c63769f87cc79483d5ac52646cb044fa21e4f702a945994aeffad71b5be6bd1105e7aa3ec489c943d8adb1148f1c5eb868d64d71f0bcc4a6084ff470acf05 SHA512 8a7753ee30f6f3bb78265b083d8fb80a48021ab32c849ddadaf969263e5a63bfaeb3010b584440d5c5f1c4e0dcd4e8fcd4df16321ccb03d3c0932e19502bbe4c
diff --git a/dev-python/google-api-core/google-api-core-1.26.0.ebuild b/dev-python/google-api-core/google-api-core-1.26.0.ebuild
deleted file mode 100644
index a5544ef85c49..000000000000
--- a/dev-python/google-api-core/google-api-core-1.26.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1
-
-DESCRIPTION="Core Library for Google Client Libraries"
-HOMEPAGE="https://github.com/googleapis/python-api-core
-	https://googleapis.dev/python/google-api-core/latest"
-SRC_URI="https://github.com/googleapis/${PN//google/python}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${P//google/python}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-RDEPEND="
-	dev-python/namespace-google[${PYTHON_USEDEP}]
-	dev-python/protobuf-python[${PYTHON_USEDEP}]
-	dev-python/googleapis-common-protos[${PYTHON_USEDEP}]
-	>=dev-python/google-auth-1.21.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.18.0[${PYTHON_USEDEP}]
-	<dev-python/requests-3[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/grpcio[${PYTHON_USEDEP}]
-		dev-python/rsa[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests --install pytest
-
-python_install_all() {
-	distutils-r1_python_install_all
-	find "${D}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/google-api-core/google-api-core-1.26.1-r1.ebuild b/dev-python/google-api-core/google-api-core-1.26.1-r1.ebuild
index 1f2741cdc81a..4bb106b3b6c8 100644
--- a/dev-python/google-api-core/google-api-core-1.26.1-r1.ebuild
+++ b/dev-python/google-api-core/google-api-core-1.26.1-r1.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${P//google/python}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 RDEPEND="
 	dev-python/namespace-google[${PYTHON_USEDEP}]
diff --git a/dev-python/google-api-core/google-api-core-1.26.1.ebuild b/dev-python/google-api-core/google-api-core-1.26.1.ebuild
deleted file mode 100644
index 0d247aad2687..000000000000
--- a/dev-python/google-api-core/google-api-core-1.26.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1
-
-DESCRIPTION="Core Library for Google Client Libraries"
-HOMEPAGE="https://github.com/googleapis/python-api-core
-	https://googleapis.dev/python/google-api-core/latest"
-SRC_URI="https://github.com/googleapis/${PN//google/python}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${P//google/python}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-RDEPEND="
-	dev-python/namespace-google[${PYTHON_USEDEP}]
-	dev-python/protobuf-python[${PYTHON_USEDEP}]
-	dev-python/googleapis-common-protos[${PYTHON_USEDEP}]
-	>=dev-python/google-auth-1.21.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.18.0[${PYTHON_USEDEP}]
-	<dev-python/requests-3[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/grpcio[${PYTHON_USEDEP}]
-		dev-python/rsa[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests --install pytest
-
-python_install_all() {
-	distutils-r1_python_install_all
-	find "${D}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/google-api-core/google-api-core-1.26.2.ebuild b/dev-python/google-api-core/google-api-core-1.26.2.ebuild
deleted file mode 100644
index 1f2741cdc81a..000000000000
--- a/dev-python/google-api-core/google-api-core-1.26.2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1
-
-DESCRIPTION="Core Library for Google Client Libraries"
-HOMEPAGE="https://github.com/googleapis/python-api-core
-	https://googleapis.dev/python/google-api-core/latest"
-SRC_URI="https://github.com/googleapis/${PN//google/python}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${P//google/python}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-RDEPEND="
-	dev-python/namespace-google[${PYTHON_USEDEP}]
-	dev-python/protobuf-python[${PYTHON_USEDEP}]
-	dev-python/googleapis-common-protos[${PYTHON_USEDEP}]
-	>=dev-python/google-auth-1.21.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.18.0[${PYTHON_USEDEP}]
-	<dev-python/requests-3[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/grpcio[${PYTHON_USEDEP}]
-		dev-python/rsa[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests --install pytest
-
-python_install_all() {
-	distutils-r1_python_install_all
-	find "${D}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/importlib_resources/importlib_resources-5.1.2.ebuild b/dev-python/importlib_resources/importlib_resources-5.1.2.ebuild
index fffe22b3efdc..26a7481f2650 100644
--- a/dev-python/importlib_resources/importlib_resources-5.1.2.ebuild
+++ b/dev-python/importlib_resources/importlib_resources-5.1.2.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 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-python/incremental/incremental-21.3.0.ebuild b/dev-python/incremental/incremental-21.3.0.ebuild
index 79f144e99bef..a7e00b08da56 100644
--- a/dev-python/incremental/incremental-21.3.0.ebuild
+++ b/dev-python/incremental/incremental-21.3.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE=""
 
 RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/inflect/inflect-5.3.0.ebuild b/dev-python/inflect/inflect-5.3.0.ebuild
index e978ce90ce44..1c281fe381ea 100644
--- a/dev-python/inflect/inflect-5.3.0.ebuild
+++ b/dev-python/inflect/inflect-5.3.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv s390 sparc x86 ~x64-macos"
 
 BDEPEND="
 	>=dev-python/setuptools_scm-3.4.1[${PYTHON_USEDEP}]
diff --git a/dev-python/jsonpatch/jsonpatch-1.32.ebuild b/dev-python/jsonpatch/jsonpatch-1.32.ebuild
index 09e65df63639..061171242f04 100644
--- a/dev-python/jsonpatch/jsonpatch-1.32.ebuild
+++ b/dev-python/jsonpatch/jsonpatch-1.32.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/python-json-patch-${PV}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/lit/lit-11.1.0.ebuild b/dev-python/lit/lit-11.1.0.ebuild
index 29b0f59dd358..02f3512d1667 100644
--- a/dev-python/lit/lit-11.1.0.ebuild
+++ b/dev-python/lit/lit-11.1.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~ppc64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ~ppc64 ~riscv x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/minimock/Manifest b/dev-python/minimock/Manifest
index 5cf22c444ed4..30aa149a6444 100644
--- a/dev-python/minimock/Manifest
+++ b/dev-python/minimock/Manifest
@@ -1,2 +1 @@
-DIST MiniMock-1.2.8.tar.gz 13217 BLAKE2B 333957307ed6c596bfc20ed18d4e40039208d589c1a9190e388c7dc3be53489994b2f45e8140f54850e4129a5a69c0fc361e3c4cb1d63a3bac579a7b86004856 SHA512 91133251a6e6b1acc11e6ac4f24404807134f8a7fca49d5f7365d7fdfc6bdd1527e7382da8d866669408b1ad30331a176026dd31bcb0c3b7367b7f778fc61ca7
 DIST minimock-1.3.0.tar.gz 13828 BLAKE2B ed60d9725ada7173f88cdd64d76e3674fbeff352f4ead919f2a3a94ec871189051da29da5ee285b4d663eee143da847c95e35286cf33a587abb7fe95e02a4824 SHA512 de7feef7fee044ba45a52d7c83905d082ad2ed2c3d12b294a6995086b377a22317730326946d048b19063758f158a9bee7bbb6a79c9ae0b4ba7a93e4a21ea196
diff --git a/dev-python/minimock/minimock-1.2.8-r1.ebuild b/dev-python/minimock/minimock-1.2.8-r1.ebuild
deleted file mode 100644
index b35eb35cff2c..000000000000
--- a/dev-python/minimock/minimock-1.2.8-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-inherit distutils-r1
-
-MY_PN="MiniMock"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="The simplest possible mock library"
-HOMEPAGE="https://pypi.org/project/MiniMock/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ppc x86"
-
-DOCS=( docs/changelog.rst docs/index.rst )
-
-python_test() {
-	"${PYTHON}" -m doctest -v minimock.py || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/minimock/minimock-1.3.0.ebuild b/dev-python/minimock/minimock-1.3.0.ebuild
index 21a43f12e175..d29b7ba2bb67 100644
--- a/dev-python/minimock/minimock-1.3.0.ebuild
+++ b/dev-python/minimock/minimock-1.3.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/lowks/minimock/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+KEYWORDS="amd64 arm ~arm64 ppc x86"
 
 DOCS=( CHANGELOG.txt README.rst )
 
diff --git a/dev-python/miniupnpc/miniupnpc-2.2.2.ebuild b/dev-python/miniupnpc/miniupnpc-2.2.2.ebuild
index d423a072368c..e79d718cf9e0 100644
--- a/dev-python/miniupnpc/miniupnpc-2.2.2.ebuild
+++ b/dev-python/miniupnpc/miniupnpc-2.2.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ppc ppc64 ~x86"
 IUSE=""
 
 RDEPEND=">=net-libs/miniupnpc-${PV}:0="
diff --git a/dev-python/os-testr/Manifest b/dev-python/os-testr/Manifest
deleted file mode 100644
index fe0efc44a008..000000000000
--- a/dev-python/os-testr/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST os-testr-2.0.0.tar.gz 46787 BLAKE2B ff1b862c24d1f88d0794ad9139a0d57e6da5d57404ad3c659a18d84316b0cb603ec5c3455cf89fd12183dabc060537f6b077cd09a9fe1f785c6cd56fc0c596b4 SHA512 0ee6a144a75f7742aaf6859161f7918fb908a6783180a022a8698ce4dffeac50bf453c208b47ec784687d88a55739fff822483f404f246f222c24245ed6845ea
diff --git a/dev-python/os-testr/metadata.xml b/dev-python/os-testr/metadata.xml
deleted file mode 100644
index df6ee5480ab1..000000000000
--- a/dev-python/os-testr/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
-  <email>prometheanfire@gentoo.org</email>
-  <name>Matthew Thode</name>
- </maintainer>
- <upstream>
-  <remote-id type="pypi">os-testr</remote-id>
-  <remote-id type="github">openstack/os-testr</remote-id>
- </upstream>
- <origin>gentoo-staging</origin>
- <stabilize-allarches/>
-</pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/os-testr/os-testr-2.0.0.ebuild b/dev-python/os-testr/os-testr-2.0.0.ebuild
deleted file mode 100644
index 86ebe20ca98f..000000000000
--- a/dev-python/os-testr/os-testr-2.0.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="A testr wrapper to provide functionality for OpenStack projects"
-HOMEPAGE="https://pypi.org/project/os-testr/ https://github.com/openstack/os-testr"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-	>=dev-python/subunit-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]"
-DEPEND="
-	${CDEPEND}
-	test? ( ${RDEPEND}
-		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
-		!~dev-python/coverage-4.1[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/ddt-1.0.1[${PYTHON_USEDEP}]
-		>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	)"
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/prettytable/prettytable-2.1.0.ebuild b/dev-python/prettytable/prettytable-2.1.0.ebuild
index 9c35b72da251..1146d962b265 100644
--- a/dev-python/prettytable/prettytable-2.1.0.ebuild
+++ b/dev-python/prettytable/prettytable-2.1.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc64 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/wcwidth[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-xprocess/Manifest b/dev-python/pytest-xprocess/Manifest
index 8c017e33ec98..eaba8baa9d20 100644
--- a/dev-python/pytest-xprocess/Manifest
+++ b/dev-python/pytest-xprocess/Manifest
@@ -1,2 +1 @@
-DIST pytest-xprocess-0.17.0.tar.gz 19186 BLAKE2B 071063267d88d8ddd56c3b8ab7b2e6bebae321ac741e63336721cd13045688cef56909737c73b5cec27805b4f7dd93cdd7f467071966b3d864d0a1f270e821d0 SHA512 c85bb7bd8373b5b5119083fca46b8f173efe3b6f6cde5db8365e567e717f47f6f9230d2cf5ecfddb014aedd628aee75023f4da3077fa3ffb26b3c7bfc61d57c9
 DIST pytest-xprocess-0.17.1.tar.gz 19758 BLAKE2B 1db4ba7e606caff4591a752cd2a7e368a910ab9b7a28151b1e9c8bdc0f8184a1fa66b23ceb898f1cd7dfbca05b19aeca9a557ab5d3069b8c32ddd9f6f6e75cf6 SHA512 68ee3c8e958f7121d72aca81c32edb7598eb99c3cf6c38fb9c8577ac4860e8241e1da16a44e825204977d6ffa4459fe2742b2ef3b906071a64cd0fcc14920be1
diff --git a/dev-python/pytest-xprocess/pytest-xprocess-0.17.0.ebuild b/dev-python/pytest-xprocess/pytest-xprocess-0.17.0.ebuild
deleted file mode 100644
index be74ca926bf6..000000000000
--- a/dev-python/pytest-xprocess/pytest-xprocess-0.17.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Manage external processes across test runs"
-HOMEPAGE="https://pypi.org/project/pytest-xprocess/ https://github.com/pytest-dev/pytest-xprocess"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	dev-python/pytest[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pytest-xprocess/pytest-xprocess-0.17.1.ebuild b/dev-python/pytest-xprocess/pytest-xprocess-0.17.1.ebuild
index b75b4bf9bcc5..ecc5d081025c 100644
--- a/dev-python/pytest-xprocess/pytest-xprocess-0.17.1.ebuild
+++ b/dev-python/pytest-xprocess/pytest-xprocess-0.17.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/pytest[${PYTHON_USEDEP}]
diff --git a/dev-python/setuptools_scm/Manifest b/dev-python/setuptools_scm/Manifest
index 6f3ebe084fa9..a62460144a2e 100644
--- a/dev-python/setuptools_scm/Manifest
+++ b/dev-python/setuptools_scm/Manifest
@@ -1,3 +1 @@
-DIST setuptools_scm-5.0.1.tar.gz 51679 BLAKE2B 33f43b437b675291ded4408dd5e68ffbf4615938f963516c0047ead023b2f2a50b28a0d91c7c72a8bdff678d9b8b292aeec36bf418b43f8d039f13560b1fbeb6 SHA512 055403539a26caeb119f3d6623e7b32ef52ccc11a39757fdd9b265ba191265346be5a062a5926a381ba47bbd1a666ffa632653ee6055050689cc38fe0f90cd0f
-DIST setuptools_scm-5.0.2.tar.gz 52273 BLAKE2B a4166b293f26161be8748f0c4b819dba0c03186a95d0c06b6fd6fdee7910de60e034ab81f6f1d89f7a1b47381441deb8a38d05421aef3287b35705bbddee33ee SHA512 1e92d03e2d8473425c146a885eb641e98895c43afebcd3c66c1455ace2d81f187b87681072f8aacc5e8be166577f00138cc7c53e4b7d77cb1b598f835b72b010
 DIST setuptools_scm-6.0.1.tar.gz 51433 BLAKE2B 7045eec0c1a43d6c93c94e0b2799f0d000cda509fa0df9ee9a638b95383f07fe430b07c3bf72fdc4809563ac289521976956f728a4b2984921fa31532bb7ed8b SHA512 db27653c57f674ec62689247680adace3779216249f1b09a35e8a0233a1ec1acb9ae89b52acd439f7062da2ba1a45b8c0d6d81333ddda0764447c30698ddb314
diff --git a/dev-python/setuptools_scm/setuptools_scm-5.0.1.ebuild b/dev-python/setuptools_scm/setuptools_scm-5.0.1.ebuild
deleted file mode 100644
index 5bd2452742a4..000000000000
--- a/dev-python/setuptools_scm/setuptools_scm-5.0.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Manage versions by scm tags via setuptools"
-HOMEPAGE="
-	https://github.com/pypa/setuptools_scm/
-	https://pypi.org/project/setuptools-scm/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	!!<dev-python/setuptools_scm-2
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/toml[${PYTHON_USEDEP}]
-		dev-vcs/git
-		!sparc? ( dev-vcs/mercurial ) )"
-
-python_prepare_all() {
-	# network access
-	sed -i -e 's:test_pip_download:_&:' testing/test_regressions.py || die
-	# all fetch specific setuptools versions
-	rm testing/test_setuptools_support.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	distutils_install_for_testing
-	pytest -v -v -x || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/setuptools_scm/setuptools_scm-5.0.2.ebuild b/dev-python/setuptools_scm/setuptools_scm-5.0.2.ebuild
deleted file mode 100644
index f1080aa8c611..000000000000
--- a/dev-python/setuptools_scm/setuptools_scm-5.0.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Manage versions by scm tags via setuptools"
-HOMEPAGE="
-	https://github.com/pypa/setuptools_scm/
-	https://pypi.org/project/setuptools-scm/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-BDEPEND="
-	!!<dev-python/setuptools_scm-2
-	test? (
-		dev-python/toml[${PYTHON_USEDEP}]
-		dev-vcs/git
-		!sparc? ( dev-vcs/mercurial ) )"
-
-distutils_enable_tests --install pytest
-
-python_prepare_all() {
-	# network access
-	sed -i -e 's:test_pip_download:_&:' testing/test_regressions.py || die
-	# all fetch specific setuptools versions
-	rm testing/test_setuptools_support.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/setuptools_scm/setuptools_scm-6.0.1.ebuild b/dev-python/setuptools_scm/setuptools_scm-6.0.1.ebuild
index f1080aa8c611..255339e6c551 100644
--- a/dev-python/setuptools_scm/setuptools_scm-6.0.1.ebuild
+++ b/dev-python/setuptools_scm/setuptools_scm-6.0.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 BDEPEND="
 	!!<dev-python/setuptools_scm-2
diff --git a/dev-python/ssl-fetch/ssl-fetch-0.4.ebuild b/dev-python/ssl-fetch/ssl-fetch-0.4.ebuild
index b5d60831a589..260b5d110325 100644
--- a/dev-python/ssl-fetch/ssl-fetch-0.4.ebuild
+++ b/dev-python/ssl-fetch/ssl-fetch-0.4.ebuild
@@ -1,31 +1,23 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
 DISTUTILS_USE_SETUPTOOLS=no
-
 inherit distutils-r1
 
-DESCRIPTION="A small convenience library for fetching files securely"
+DESCRIPTION="Small convenience library for fetching files securely"
 HOMEPAGE="https://github.com/dol-sen/ssl-fetch"
 SRC_URI="https://dev.gentoo.org/~dolsen/releases/ssl-fetch/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE=""
-
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos"
 
-DEPEND=""
-
-RDEPEND="${DEPEND}
-	>=dev-python/requests-1.2.1[${PYTHON_USEDEP}]
-	"
+RDEPEND=">=dev-python/requests-1.2.1[${PYTHON_USEDEP}]"
 
 pkg_postinst() {
-	echo
 	elog "This is beta software."
 	elog "The APIs it installs should be considered unstable"
 	elog "and are subject to change in these early versions."
@@ -33,5 +25,4 @@ pkg_postinst() {
 	elog "Please file any enhancement requests, or bugs"
 	elog "at https://github.com/dol-sen/ssl-fetch/issues"
 	elog "I am also on IRC @ #gentoo-portage, #gentoo-keys,... of the Freenode network"
-	echo
 }
diff --git a/dev-python/ssl-fetch/ssl-fetch-9999.ebuild b/dev-python/ssl-fetch/ssl-fetch-9999.ebuild
index ad090c655f2c..ef2bef6261b3 100644
--- a/dev-python/ssl-fetch/ssl-fetch-9999.ebuild
+++ b/dev-python/ssl-fetch/ssl-fetch-9999.ebuild
@@ -1,40 +1,28 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
 DISTUTILS_USE_SETUPTOOLS=no
-
-EGIT_BRANCH="master"
-
 inherit distutils-r1 git-r3
 
-DESCRIPTION="A small convenience library for fetching files securely"
+DESCRIPTION="Small convenience library for fetching files securely"
 HOMEPAGE="https://github.com/dol-sen/ssl-fetch"
-SRC_URI=""
 EGIT_REPO_URI="https://github.com/dol-sen/ssl-fetch.git"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE=""
-
 KEYWORDS=""
 
-DEPEND=""
-
-RDEPEND="${DEPEND}
-	>=dev-python/requests-1.2.1[${PYTHON_USEDEP}]
-	"
+RDEPEND=">=dev-python/requests-1.2.1[${PYTHON_USEDEP}]"
 
 pkg_postinst() {
-	echo
 	elog "This is experimental software."
 	elog "The APIs it installs should be considered unstable"
 	elog "and are subject to change."
-	echo
+	elog
 	elog "Please file any enhancement requests, or bugs"
 	elog "at https://github.com/dol-sen/ssl-fetch/issues"
 	elog "I am also on IRC @ #gentoo-portage, #gentoo-keys,... of the freenode network"
-	echo
 }
diff --git a/dev-python/testrepository/Manifest b/dev-python/testrepository/Manifest
deleted file mode 100644
index 013694ad9220..000000000000
--- a/dev-python/testrepository/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST testrepository-0.0.20.tar.gz 84956 BLAKE2B 9b9a8e0c21754fe8ba019b58024f137e72b4341cb368fb48dc48039f512b232ca4f03f16c2596aa34b428d69097db939e5776417a7d26f5a8508c8f0c1f1a5bf SHA512 df14500e2b27b6f39d9d4c4f42961efd63dfe25186e561eb1678952a8ab9311f17c36b78819fea33e0ac879c47a33d45c31ff58be017609c8a6157905ee712d6
diff --git a/dev-python/testrepository/files/testrepository-0.0.20-test-backport.patch b/dev-python/testrepository/files/testrepository-0.0.20-test-backport.patch
deleted file mode 100644
index 7622c0abfa43..000000000000
--- a/dev-python/testrepository/files/testrepository-0.0.20-test-backport.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From 8f8ab15fafdad6db850c84772323b32375b09285 Mon Sep 17 00:00:00 2001
-From: Robert Collins <robertc@robertcollins.net>
-Date: Tue, 10 Mar 2015 15:21:49 +1300
-Subject: [PATCH] Fixup tests with latest testtools.
-
-Testtools has started chunking exceptions (which is perhaps good,
-perhaps bad) - but we shouldn't depend on the exact behaviour in it
-for our tests.
----
- NEWS                                    |  6 ++++++
- testrepository/tests/test_repository.py | 14 ++++++++++----
- 2 files changed, 16 insertions(+), 4 deletions(-)
-
-diff --git a/NEWS b/NEWS
-index e258b11..536308c 100644
---- a/NEWS
-+++ b/NEWS
-@@ -5,6 +5,12 @@ testrepository release notes
- NEXT (In development)
- +++++++++++++++++++++
- 
-+CHANGES
-+-------
-+
-+* Isolate the testrepository test suite from the chunking (or otherwise)
-+  behaviour of testtools' exception handlers. (Robert Collins)
-+
- 0.0.20
- ++++++
- 
-diff --git a/testrepository/tests/test_repository.py b/testrepository/tests/test_repository.py
-index e2e5e05..4a8667b 100644
---- a/testrepository/tests/test_repository.py
-+++ b/testrepository/tests/test_repository.py
-@@ -28,6 +28,7 @@
- from testresources import TestResource
- from testtools import (
-     clone_test_with_new_id,
-+    content,
-     PlaceHolder,
-     )
- import testtools
-@@ -103,19 +104,24 @@ class Case(ResourcedTestCase):
-     def passing(self):
-         pass
- 
--    def failing(self):
--        self.fail("oops")
--
-     def unexpected_success(self):
-         self.expectFailure("unexpected success", self.assertTrue, True)
- 
- 
-+class FailingCase:
-+
-+    def run(self, result):
-+        result.startTest(self)
-+        result.addError(
-+            self, None, details={'traceback': content.text_content("")})
-+        result.stopTest(self)
-+
- def make_test(id, should_pass):
-     """Make a test."""
-     if should_pass:
-         case = Case("passing")
-     else:
--        case = Case("failing")
-+        case = FailingCase()
-     return clone_test_with_new_id(case, id)
- 
- 
diff --git a/dev-python/testrepository/files/testrepository-0.0.20-test-backport1.patch b/dev-python/testrepository/files/testrepository-0.0.20-test-backport1.patch
deleted file mode 100644
index 193b91e1cd3d..000000000000
--- a/dev-python/testrepository/files/testrepository-0.0.20-test-backport1.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From d3d6cac4fd42f2067c0dd81be748853f81c348fc Mon Sep 17 00:00:00 2001
-From: Robert Collins <robertc@robertcollins.net>
-Date: Sun, 12 Jul 2015 21:37:34 +1200
-Subject: [PATCH] Fix 3.3+ tests with nested classnames.
-
----
- testrepository/tests/ui/test_cli.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/testrepository/tests/ui/test_cli.py b/testrepository/tests/ui/test_cli.py
-index 9ba11ad..e1f9b44 100644
---- a/testrepository/tests/ui/test_cli.py
-+++ b/testrepository/tests/ui/test_cli.py
-@@ -157,7 +157,7 @@ def method(self):
-         self.assertThat(ui._stdout.buffer.getvalue().decode('utf8'),
-             DocTestMatches("""\
- ======================================================================
--FAIL: testrepository.tests.ui.test_cli.Case.method
-+FAIL: testrepository.tests.ui.test_cli...Case.method
- ----------------------------------------------------------------------
- ...Traceback (most recent call last):...
-   File "...test_cli.py", line ..., in method
diff --git a/dev-python/testrepository/files/testrepository-0.0.20-test-backport2.patch b/dev-python/testrepository/files/testrepository-0.0.20-test-backport2.patch
deleted file mode 100644
index a0614b671e1a..000000000000
--- a/dev-python/testrepository/files/testrepository-0.0.20-test-backport2.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From e2f84ae6b2bcf89221613056d0c45dd308f46d62 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Jelmer=20Vernoo=C4=B3?= <jelmer@jelmer.uk>
-Date: Thu, 5 Apr 2018 01:02:40 +0100
-Subject: [PATCH] Fix the testrepository tests with newer versions of
- testtools.
-
----
- testrepository/tests/commands/test_failing.py | 2 +-
- testrepository/tests/test_repository.py       | 7 ++++---
- 2 files changed, 5 insertions(+), 4 deletions(-)
-
-diff --git a/testrepository/tests/commands/test_failing.py b/testrepository/tests/commands/test_failing.py
-index 56c97ef..4e52f6a 100644
---- a/testrepository/tests/commands/test_failing.py
-+++ b/testrepository/tests/commands/test_failing.py
-@@ -90,7 +90,7 @@ class TestCommand(ResourcedTestCase):
-         finally:
-             log.stopTestRun()
-         self.assertEqual(
--            log._events, [
-+            [tuple(ev) for ev in log._events], [
-             ('startTestRun',),
-             ('status', 'failing', 'inprogress', None, True, None, None, False,
-              None, None, Wildcard),
-diff --git a/testrepository/tests/test_repository.py b/testrepository/tests/test_repository.py
-index 4a8667b..28d99bc 100644
---- a/testrepository/tests/test_repository.py
-+++ b/testrepository/tests/test_repository.py
-@@ -113,9 +113,10 @@ class FailingCase:
-     def run(self, result):
-         result.startTest(self)
-         result.addError(
--            self, None, details={'traceback': content.text_content("")})
-+            self, None, details={'traceback': content.text_content("tb")})
-         result.stopTest(self)
- 
-+
- def make_test(id, should_pass):
-     """Make a test."""
-     if should_pass:
-@@ -409,7 +410,7 @@ class TestRepositoryContract(ResourcedTestCase):
-         finally:
-             log.stopTestRun()
-         self.assertEqual(
--            log._events, [
-+            [tuple(ev) for ev in log._events], [
-             ('startTestRun',),
-             ('status',
-              'testrepository.tests.test_repository.Case.method',
-@@ -465,7 +466,7 @@ class TestRepositoryContract(ResourcedTestCase):
-         finally:
-             log.stopTestRun()
-         self.assertEqual(
--            log._events,
-+            [tuple(ev) for ev in log._events],
-             [
-             ('startTestRun',),
-             ('status',
--- 
-2.18.0
-
diff --git a/dev-python/testrepository/metadata.xml b/dev-python/testrepository/metadata.xml
deleted file mode 100644
index f2cef40b659e..000000000000
--- a/dev-python/testrepository/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
-  <email>prometheanfire@gentoo.org</email>
-  <name>Matthew Thode</name>
- </maintainer>
- <maintainer type="project">
-  <email>openstack@gentoo.org</email>
-  <name>Openstack</name>
- </maintainer>
- <upstream>
-  <remote-id type="pypi">testrepository</remote-id>
-  <remote-id type="launchpad">testscenarios</remote-id>
- </upstream>
- <origin>gentoo-staging</origin>
-</pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/testrepository/testrepository-0.0.20.ebuild b/dev-python/testrepository/testrepository-0.0.20.ebuild
deleted file mode 100644
index 8c7e4a941379..000000000000
--- a/dev-python/testrepository/testrepository-0.0.20.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="A repository of test results"
-HOMEPAGE="https://launchpad.net/testscenarios"
-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 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-	>=dev-python/testtools-0.9.30[${PYTHON_USEDEP}]
-	dev-python/fixtures[${PYTHON_USEDEP}]"
-#bzr is listed but presumably req'd for a live repo test run
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND}
-		dev-python/testresources[${PYTHON_USEDEP}]
-		dev-python/testscenarios[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-	)"
-
-# Required for test phase
-DISTUTILS_IN_SOURCE_BUILD=1
-
-PATCHES=(
-	"${FILESDIR}"/${P}-test-backport.patch
-	"${FILESDIR}"/${P}-test-backport1.patch
-	"${FILESDIR}"/${P}-test-backport2.patch
-)
-
-python_test() {
-	# some errors appear to have crept in the suite undert py3 since addition.
-	# Python2.7 now passes all.
-
-	${PYTHON} testr init || die
-	${PYTHON} testr run || die
-}
diff --git a/dev-python/tox/Manifest b/dev-python/tox/Manifest
index 567c199053c4..67828445f2a6 100644
--- a/dev-python/tox/Manifest
+++ b/dev-python/tox/Manifest
@@ -1,2 +1 @@
-DIST tox-3.22.0.tar.gz 302088 BLAKE2B f9ef6feb9fa438b668f6a1b6f8846845f1cfcb0826ffacc04c52dfe0a968a7df2542acc8f4a1e69c634a7866672dbb78ab8f04ba7d6e94f88b40f6c3dd042571 SHA512 d96c31c9faa4d76a6181ce332e70ec9ccfb0a6b96feff45793393f3fd2d08668fc6f14da9164947c4b93f371fab3b9d23c87b38dac89ece18e87494ac3a7caac
 DIST tox-3.23.0.tar.gz 303091 BLAKE2B 609e74ea354ca5daf45c848000961782fcef59da07f815292355d72f3e5dd078e3b5909a65521a4a1032fa2bb9481fdab0e620f4882b33aa377de9764296761c SHA512 fb96cbbdbd36399036d348716f1181285184985922e0dc61b610b36e53ea79e2d8a77190aad893650bcba86ef4c57ff0f2de2813becb2a12fe0d1aa36bb27ad3
diff --git a/dev-python/tox/tox-3.22.0.ebuild b/dev-python/tox/tox-3.22.0.ebuild
deleted file mode 100644
index 4fab301e0cea..000000000000
--- a/dev-python/tox/tox-3.22.0.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="virtualenv-based automation of test activities"
-HOMEPAGE="https://tox.readthedocs.io https://github.com/tox-dev/tox https://pypi.org/project/tox/"
-SRC_URI="https://github.com/tox-dev/tox/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86"
-# doc disabled because of missing deps in tree
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/filelock[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-1.1[${PYTHON_USEDEP}]
-	' python3_{5,6,7} pypy3)
-	dev-python/packaging[${PYTHON_USEDEP}]
-	>=dev-python/pluggy-0.12[${PYTHON_USEDEP}]
-	dev-python/pip[${PYTHON_USEDEP}]
-	dev-python/py[${PYTHON_USEDEP}]
-	>=dev-python/six-1.14[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]
-	>=dev-python/virtualenv-16.0.0[${PYTHON_USEDEP}]"
-# TODO: figure out how to make tests work without the package being
-# installed first.
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		>=dev-python/flaky-3.4.0[${PYTHON_USEDEP}]
-		>=dev-python/freezegun-0.3.11[${PYTHON_USEDEP}]
-		>=dev-python/pytest-4.0.0[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)"
-
-src_configure() {
-	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-}
-
-python_test() {
-	local deselect=(
-		# broken without Internet
-		tests/unit/session/test_provision.py::test_provision_non_canonical_dep
-		tests/integration/test_provision_int.py::test_provision_interrupt_child
-
-		# expects python2 to exist
-		tests/unit/interpreters/test_interpreters.py::test_tox_get_python_executable
-
-		# broken without tox installed first
-		# TODO: figure out how to make importlib_metadata work
-		tests/unit/test_z_cmdline.py::test_tox_console_script
-		tests/unit/test_z_cmdline.py::test_tox_quickstart_script
-	)
-
-	[[ ${EPYTHON} != pypy3 ]] && deselect+=(
-		# TODO?
-		tests/unit/interpreters/test_interpreters.py::test_find_alias_on_path
-
-		# broken without tox installed first
-		# TODO: why it can't import itself?
-		tests/integration/test_parallel_interrupt.py::test_parallel_interrupt
-	)
-
-	distutils_install_for_testing --via-root
-	pytest -vv --no-network ${deselect[@]/#/--deselect } || die "Testsuite failed under ${EPYTHON}"
-}
diff --git a/dev-python/tox/tox-3.23.0.ebuild b/dev-python/tox/tox-3.23.0.ebuild
index 1ed45c6fdaaf..4fab301e0cea 100644
--- a/dev-python/tox/tox-3.23.0.ebuild
+++ b/dev-python/tox/tox-3.23.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/tox-dev/tox/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86"
 # doc disabled because of missing deps in tree
 IUSE="test"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/tqdm/Manifest b/dev-python/tqdm/Manifest
index 5292b795f009..fb6585fc6c58 100644
--- a/dev-python/tqdm/Manifest
+++ b/dev-python/tqdm/Manifest
@@ -1,2 +1 @@
-DIST tqdm-4.58.0.tar.gz 167844 BLAKE2B 9a28aa91b330714f6f4d178ca793f9bc1ce5988417b38dc5a9af06c36b8949d0f23de846bc1fb87f7dac2a3b09028c4d216659f84a8ce2125de0a7870d8bc4b4 SHA512 a97a7fc1d5a181d326e91bd017cf9737fd2322f375b8efe5e53c8e49c7986edcdea39086f5057a6d2584a16e2a45b5a679055ba08c83d813fff0a61050b71b45
 DIST tqdm-4.59.0.tar.gz 168620 BLAKE2B 0e3467c777d36bcfaa9f004a587bff70f171cfd7ecdca46d3a6f894afa3694873b7c50c860da31b0147f3233bb419e0c74762797d64e79b938bea813f8a38b92 SHA512 be7ffe2f5e28dd2c653fdafd26cdfab6c89f1fd257420f9ab47460230318183b4934370261d7d5939d05f55b907e2d3982cbef078d372d9a4167e1df42c895a8
diff --git a/dev-python/tqdm/tqdm-4.58.0.ebuild b/dev-python/tqdm/tqdm-4.58.0.ebuild
deleted file mode 100644
index e98fff6f8208..000000000000
--- a/dev-python/tqdm/tqdm-4.58.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/tqdm/tqdm"
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos"
-fi
-
-DESCRIPTION="Add a progress meter to your loops in a second"
-HOMEPAGE="https://github.com/tqdm/tqdm"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="examples"
-
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-python_test() {
-	# Skip unpredictable performance tests
-	pytest -vv --ignore 'tests/tests_perf.py' ||
-		die "Tests failed with ${EPYTHON}"
-}
-
-python_install() {
-	doman "${BUILD_DIR}"/lib/tqdm/tqdm.1
-	rm "${BUILD_DIR}"/lib/tqdm/tqdm.1 || die
-	distutils-r1_python_install
-}
-
-python_install_all() {
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/tqdm/tqdm-4.59.0.ebuild b/dev-python/tqdm/tqdm-4.59.0.ebuild
index 5caf7e58ff9e..e98fff6f8208 100644
--- a/dev-python/tqdm/tqdm-4.59.0.ebuild
+++ b/dev-python/tqdm/tqdm-4.59.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/tqdm/tqdm"
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos"
 fi
 
 DESCRIPTION="Add a progress meter to your loops in a second"
diff --git a/dev-python/xmlschema/Manifest b/dev-python/xmlschema/Manifest
index a727783d5f0b..e625809ca4dd 100644
--- a/dev-python/xmlschema/Manifest
+++ b/dev-python/xmlschema/Manifest
@@ -1,3 +1 @@
-DIST xmlschema-1.5.1.tar.gz 349788 BLAKE2B a46aa6619594de4db31158f26def3dc070629cc29112aa02555c2479f57883d7d5afb82cbc65e4193d607b2572049ff7da8cf3cb14850b0a6f3166ae87d86928 SHA512 5e8b3adbf8c5b4ac6a85a2d9b62212870cdc6639634f9adf9d16499d86b9cc73fd1fc6ba496f14d840ecefc60f175c62f077a62bab68bd057150889d5ae0a872
-DIST xmlschema-1.5.2.tar.gz 350754 BLAKE2B e00a25e12ebef613f4d89522e059fcbd41f28920da62bcf8782e6c345b44133072dd578ef547d51e547ed92e5424fc9a885f1c789544f83d5cfe1743fcbe2f30 SHA512 8ab6de10c40aa96f57c4dbb37af2256ec46b28a844f3ad7a44f6184ff38687581c7f038ef87374f49fb204f48053c4693a98fa79059e9074745e0d2a6f353bce
 DIST xmlschema-1.5.3.tar.gz 350684 BLAKE2B 5dfcd2e00339caa834195729cce1604d17e5aa4705150649e22bebe3dc7b3ac6ace5dccbc7b6313c5cadb5ca29992853191afff2f76f05d18c10294131a904cf SHA512 3d86dc407d3181bf5c34b2d6aead9995eca1b7210b39ce3cb95c5655fa0cac0bbcc9f15c6ac016aca69a23f19befbe0525d6f13644b68fde348dcd0fd03bfa73
diff --git a/dev-python/xmlschema/xmlschema-1.5.1.ebuild b/dev-python/xmlschema/xmlschema-1.5.1.ebuild
deleted file mode 100644
index 73108f2dd7a5..000000000000
--- a/dev-python/xmlschema/xmlschema-1.5.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="An XML Schema validator and decoder"
-HOMEPAGE="https://github.com/sissaschool/xmlschema https://pypi.org/project/xmlschema/"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/elementpath-2.1.2[${PYTHON_USEDEP}]"
-BDEPEND="${RDEPEND}
-	test? (
-		dev-python/jinja[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	"${EPYTHON}" tests/test_all.py -v ||
-		die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/xmlschema/xmlschema-1.5.2.ebuild b/dev-python/xmlschema/xmlschema-1.5.2.ebuild
deleted file mode 100644
index 644806d1a94e..000000000000
--- a/dev-python/xmlschema/xmlschema-1.5.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="An XML Schema validator and decoder"
-HOMEPAGE="https://github.com/sissaschool/xmlschema https://pypi.org/project/xmlschema/"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/elementpath-2.1.2[${PYTHON_USEDEP}]"
-BDEPEND="${RDEPEND}
-	test? (
-		dev-python/jinja[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	"${EPYTHON}" tests/test_all.py -v ||
-		die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/xmlschema/xmlschema-1.5.3.ebuild b/dev-python/xmlschema/xmlschema-1.5.3.ebuild
index 644806d1a94e..73108f2dd7a5 100644
--- a/dev-python/xmlschema/xmlschema-1.5.3.ebuild
+++ b/dev-python/xmlschema/xmlschema-1.5.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/zipp/Manifest b/dev-python/zipp/Manifest
index fec8424a6d7f..a0af4c9ace85 100644
--- a/dev-python/zipp/Manifest
+++ b/dev-python/zipp/Manifest
@@ -1,2 +1 @@
-DIST zipp-3.4.0.tar.gz 15638 BLAKE2B c06f68b9a23e6ba560cf7b703150e4b14d8bbeb5c8712c54257f587de9a44eb853804495eaecff2ad17261304da9b9433951cbb9b17e3f35446406e4e4fe517d SHA512 c791e72f05a92110037cbee7153103e47ec536994d9e86cdecb34c602839c0bf5e6e4ab4ce56d6a44c7eb4f7a555ba531df8c986e302654c624f59e2217bf10f
 DIST zipp-3.4.1.tar.gz 16545 BLAKE2B 5ebdc4d1e932d72502866701db8b0f352aca3194890d9ed340722bb2a65c4e3be0f6bb54f49567e4fd46faaec3379d0c1d668e1a55f63bea6c57e4ef0c2f9e01 SHA512 2ba50109efd0ceea9eb1d57e2d839f522b5a78a8dae344d6da54b79305dd46bff23f1116f562127290152c0b100369439c17fe9dc3fb14d0b42beaa48348ebe6
diff --git a/dev-python/zipp/zipp-3.4.0.ebuild b/dev-python/zipp/zipp-3.4.0.ebuild
deleted file mode 100644
index a45027719338..000000000000
--- a/dev-python/zipp/zipp-3.4.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Backport of pathlib-compatible object wrapper for zip files"
-HOMEPAGE="https://github.com/jaraco/zipp"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-macos"
-
-BDEPEND="
-	dev-python/toml[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm-3.4.2[${PYTHON_USEDEP}]
-	test? ( dev-python/jaraco-itertools[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_sphinx docs \
-	">=dev-python/jaraco-packaging-3.2" \
-	">=dev-python/rst-linker-1.9"
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# Skip a potentially flaky performance test
-	sed -i -e '/^import func_timeout\|^ *@func_timeout\.func_set_timeout/d' \
-		-e 's/test_implied_dirs_performance/_&/' test_zipp.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# Ignoring zipp.py from ${S} avoids ImportPathMismatchError with Python < 3.8
-	# by ensuring only zipp from ${BUILD_DIR} is loaded
-	pytest --ignore zipp.py -vv || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/zipp/zipp-3.4.1.ebuild b/dev-python/zipp/zipp-3.4.1.ebuild
index e15c71075e31..71770bfa1dcc 100644
--- a/dev-python/zipp/zipp-3.4.1.ebuild
+++ b/dev-python/zipp/zipp-3.4.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-macos"
 
 BDEPEND="
 	dev-python/toml[${PYTHON_USEDEP}]