Adding metadata

49 files changed, 23 insertions, 546 deletions

diff --git a/dev-python/alembic/alembic-1.5.8.ebuild b/dev-python/alembic/alembic-1.5.8.ebuild
index 8b64ac35c093..cdbe2d605e9b 100644
--- a/dev-python/alembic/alembic-1.5.8.ebuild
+++ b/dev-python/alembic/alembic-1.5.8.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="doc"
 
 RDEPEND="
diff --git a/dev-python/aws-xray-sdk-python/aws-xray-sdk-python-2.7.0.ebuild b/dev-python/aws-xray-sdk-python/aws-xray-sdk-python-2.7.0.ebuild
index fb35340f7400..0652e6c4ba87 100644
--- a/dev-python/aws-xray-sdk-python/aws-xray-sdk-python-2.7.0.ebuild
+++ b/dev-python/aws-xray-sdk-python/aws-xray-sdk-python-2.7.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-python/cryptography/cryptography-3.4.7.ebuild b/dev-python/cryptography/cryptography-3.4.7.ebuild
index 527bdd474cbc..088d848a5058 100644
--- a/dev-python/cryptography/cryptography-3.4.7.ebuild
+++ b/dev-python/cryptography/cryptography-3.4.7.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
 
 LICENSE="|| ( Apache-2.0 BSD )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc ~x86"
 IUSE="libressl"
 
 RDEPEND="
diff --git a/dev-python/dbusmock/Manifest b/dev-python/dbusmock/Manifest
index a9f8cad4ab5e..6e1d7c44eca0 100644
--- a/dev-python/dbusmock/Manifest
+++ b/dev-python/dbusmock/Manifest
@@ -1,2 +1 @@
-DIST python-dbusmock-0.22.0.tar.gz 68626 BLAKE2B 51b897ad95bc547afe6cd59abed243dcaecd3c6ce8c47825f3a2eeaf7364c5aba04d23247c876f748b071f30753a86da954493bc63f0ae503085974e7e769658 SHA512 2c3430f4178a16acc376ce582f4a1a9bbe8b917efcd7eee58dab85ee3addf60ba355ae9e7b318ec2cdf7ca771183c37d16520a1e5bcab8414c66e2d2a36d26fe
 DIST python-dbusmock-0.23.0.tar.gz 79928 BLAKE2B a004bbc93cd4dd3ab5919e28bde18e7b015546e43b789826010ccfd2000075babf933bc53b72bc4369458ac6c37845b534b0e36e594afc4bfd298d9ac37495c7 SHA512 b464c376b1489bc2a9967d08fd1e4e8943e372f46eef46d1cebf316f4afd1f2bf55d02abc3b82b7052c685fe1ff9ba22734a58aa75945706a26ae9d71e5d807e
diff --git a/dev-python/dbusmock/dbusmock-0.22.0.ebuild b/dev-python/dbusmock/dbusmock-0.22.0.ebuild
deleted file mode 100644
index ed2db69be79e..000000000000
--- a/dev-python/dbusmock/dbusmock-0.22.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1
-
-MY_PN="python-${PN}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Easily create mock objects on D-Bus for software testing"
-HOMEPAGE="https://github.com/martinpitt/python-dbusmock"
-SRC_URI="https://github.com/martinpitt/${MY_PN}/releases/download/${PV}/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 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
-
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/dbusmock/dbusmock-0.23.0.ebuild b/dev-python/dbusmock/dbusmock-0.23.0.ebuild
index 2e16a47248b3..bf38e8ef84af 100644
--- a/dev-python/dbusmock/dbusmock-0.23.0.ebuild
+++ b/dev-python/dbusmock/dbusmock-0.23.0.ebuild
@@ -18,7 +18,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
 
 RDEPEND="
 	dev-python/dbus-python[${PYTHON_USEDEP}]
diff --git a/dev-python/dulwich/dulwich-0.20.20.ebuild b/dev-python/dulwich/dulwich-0.20.20.ebuild
index 7d8903aac1ad..e46ec698f9fa 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 4e1bf9bd081d..dc55013df24c 100644
--- a/dev-python/elementpath/Manifest
+++ b/dev-python/elementpath/Manifest
@@ -1,2 +1 @@
-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.2.0.ebuild b/dev-python/elementpath/elementpath-2.2.0.ebuild
deleted file mode 100644
index 4d595bed7294..000000000000
--- a/dev-python/elementpath/elementpath-2.2.0.ebuild
+++ /dev/null
@@ -1,28 +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="
-	https://github.com/sissaschool/elementpath/archive/v${PV}.tar.gz
-		-> ${P}.gh.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.1.ebuild b/dev-python/elementpath/elementpath-2.2.1.ebuild
index 12c101755ccd..4d595bed7294 100644
--- a/dev-python/elementpath/elementpath-2.2.1.ebuild
+++ b/dev-python/elementpath/elementpath-2.2.1.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/fakeredis/Manifest b/dev-python/fakeredis/Manifest
index d7e1c8f036c8..b360bc563ea5 100644
--- a/dev-python/fakeredis/Manifest
+++ b/dev-python/fakeredis/Manifest
@@ -1,2 +1 @@
-DIST fakeredis-1.4.5.gh.tar.gz 66197 BLAKE2B f0f36d1e209673f7722849e835c2a33fac9f7e8bfb1294ecf2e69478295f14af514d0fc4a5732a20ce099333b136d682591fef031ce90d6262fa8c9025cbfa2e SHA512 e16ae5c5947a924b0c9c40ae68efebad5cccea9f88d1b5c3f1677e1ccb8c1fa75dbafc9b413c2359b774f3043c387ff91ecd4e2e21204036883175944338d59b
 DIST fakeredis-1.5.0.gh.tar.gz 66371 BLAKE2B da9a961b9e163ba8221193c9c353f17bd23a710bd105b4fc6b9249a857828ece0b3551e3890818b0519f96aa9691166658332c25b796b22827f0951d3f50cebf SHA512 5bd4965c36abada4b937b635318d58e88ba76d30ff577b0f9b9134a94a3407a8c0e92d953e6b5299cabfe11ebe5a785e9d75406e8a07a4257674be64f6b8cffb
diff --git a/dev-python/fakeredis/fakeredis-1.4.5.ebuild b/dev-python/fakeredis/fakeredis-1.4.5.ebuild
deleted file mode 100644
index 539606007e85..000000000000
--- a/dev-python/fakeredis/fakeredis-1.4.5.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} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Fake implementation of redis API for testing purposes"
-HOMEPAGE="
-	https://github.com/jamesls/fakeredis/
-	https://pypi.org/project/fakeredis/"
-SRC_URI="
-	https://github.com/jamesls/fakeredis/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~sparc x86"
-
-RDEPEND="
-	dev-python/redis-py[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/sortedcontainers[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local excludes=(
-		# tests for use with aioredis, not packaged in ::gentoo
-		--ignore test/test_aioredis.py
-		# tests requiring lupa (lua support)
-		-k 'not test_eval and not test_lua and not test_script'
-	)
-
-	pytest -vv "${excludes[@]}" || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/fakeredis/fakeredis-1.5.0.ebuild b/dev-python/fakeredis/fakeredis-1.5.0.ebuild
index 42900d2fc8f6..327af242d52b 100644
--- a/dev-python/fakeredis/fakeredis-1.5.0.ebuild
+++ b/dev-python/fakeredis/fakeredis-1.5.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND="
 	dev-python/redis-py[${PYTHON_USEDEP}]
diff --git a/dev-python/fs/Manifest b/dev-python/fs/Manifest
index c3865b175e9a..e9e14df3abdc 100644
--- a/dev-python/fs/Manifest
+++ b/dev-python/fs/Manifest
@@ -1,2 +1 @@
-DIST fs-2.4.12.tar.gz 165536 BLAKE2B 9212ffc1f2d5c315091116770e045e4c5365690d61ca34c3f4a9ce82764c4ba5be6af886e62c8baaf57ab461539a02aa042d50a9dcf314b0894710953571d37f SHA512 8b4727ea21cb9e1b69e31688c46f0732bb1536490549e353c1f88ab0c794b867c5212d1003b094cc86f562108ab4a7ee9dbc7e9aa5dc1349371de583277eb93d
 DIST fs-2.4.13.tar.gz 176958 BLAKE2B 154761ddc4db087abdb294ec82ac5b18c46e05f04e783559f3b4d65cde21b9444100130c29d1051a3d2b177f5c9ef7299806fcce1ab3a4b0770b4f1c156abd71 SHA512 c07bf6a8d373a11019709ada392153dbf953399631fa388433f9b7b73d9ae1072ea70b8ed9896752161a4737a399520f030b7875dc23137f418268c5acc24f48
diff --git a/dev-python/fs/fs-2.4.12.ebuild b/dev-python/fs/fs-2.4.12.ebuild
deleted file mode 100644
index 06cda57d0daf..000000000000
--- a/dev-python/fs/fs-2.4.12.ebuild
+++ /dev/null
@@ -1,47 +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} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1 optfeature
-
-MY_PN="pyfilesystem2"
-DESCRIPTION="Filesystem abstraction layer"
-HOMEPAGE="
-	https://pypi.org/project/fs/
-	https://docs.pyfilesystem.org
-	https://www.willmcgugan.com/tag/fs/
-"
-# Tests from the PyPI tarball are broken
-# https://github.com/PyFilesystem/pyfilesystem2/issues/364
-SRC_URI="https://github.com/PyFilesystem/pyfilesystem2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/appdirs-1.4.3[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		${RDEPEND}
-		dev-python/pyftpdlib[${PYTHON_USEDEP}]
-		dev-python/psutil[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source dev-python/sphinx_rtd_theme
-distutils_enable_tests pytest
-
-pkg_postinst() {
-	optfeature "S3 support" dev-python/boto
-	optfeature "SFTP support" dev-python/paramiko
-	optfeature "Browser support" dev-python/wxpython
-}
diff --git a/dev-python/fs/fs-2.4.13.ebuild b/dev-python/fs/fs-2.4.13.ebuild
index ab06bfe8b193..9761ac58490a 100644
--- a/dev-python/fs/fs-2.4.13.ebuild
+++ b/dev-python/fs/fs-2.4.13.ebuild
@@ -22,7 +22,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="MIT"
 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"
 
 RDEPEND="
 	>=dev-python/appdirs-1.4.3[${PYTHON_USEDEP}]
diff --git a/dev-python/gitdb/Manifest b/dev-python/gitdb/Manifest
index f1772a0df7f4..271f5f22ee7e 100644
--- a/dev-python/gitdb/Manifest
+++ b/dev-python/gitdb/Manifest
@@ -1,3 +1 @@
-DIST gitdb-4.0.5.tar.gz 392815 BLAKE2B ab0c557f1233ec6f454769c3d72d982c876cf7b8f67d8b36f9ed8a6a2ee4a04a7a22e1a7453aad0d128436e679940ffea9b2c1e6d433083634b47ffff08b396c SHA512 a3f562928a863121c4051663a0674aa94937527b2fc40a7f392d2913d4d1443bda278e2f7cf362d499389691d24a2d965ab89a6533d42a157db3ab629a377e83
-DIST gitdb-4.0.6.tar.gz 394670 BLAKE2B 579579981a4597fa540d7f2987fb24b81ee64066349ed479816ce010a94358af9d0821b8abb10886a5b6fdb56e158c398688690d9570495f041f974e3964b5a6 SHA512 b9cf964390cf18894c02e8854ef5099ef239bf4a43ae8659bf3def22a0fc35814c7416fd8b8312d9d0a170e5e0ea84380edbcac47cc435dc9ec1d98cf7f6463f
 DIST gitdb-4.0.7.tar.gz 394664 BLAKE2B 4a4586ac276c719110e7ad9ddccca8c0f45cca42f6740d990a974b043a749148088c495ad1939794382ff4094afa712cfa7f17619f371423f1b7a10e65ce72d2 SHA512 db63a613ee59249a3fccbd09fc0eca5747b166180bb5885737f849e339e81dfacd04f65e438fef241cf013cde33fe8c99a569c1599b2b5defd37b50e87dbdb0a
diff --git a/dev-python/gitdb/gitdb-4.0.5-r1.ebuild b/dev-python/gitdb/gitdb-4.0.5-r1.ebuild
deleted file mode 100644
index 6bfaf22c9f04..000000000000
--- a/dev-python/gitdb/gitdb-4.0.5-r1.ebuild
+++ /dev/null
@@ -1,62 +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
-
-DESCRIPTION="GitDB is a pure-Python git object database"
-HOMEPAGE="
-	https://github.com/gitpython-developers/gitdb
-	https://pypi.org/project/gitdb/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-
-RDEPEND="
-	>=dev-python/smmap-3.0.1[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-vcs/git
-	)"
-
-distutils_enable_tests nose
-
-src_prepare() {
-	# remove unnecessary version restriction
-	# https://github.com/gitpython-developers/gitdb/issues/67
-	sed -i -e '/smmap/s:,<4::' setup.py || die
-	distutils-r1_src_prepare
-}
-
-src_test() {
-	local i
-
-	mkdir "${T}"/repo || die
-	cd "${T}"/repo || die
-
-	for (( i = 0; i < 2500; ++i )); do
-		echo "${i}" > file"${i}" || die
-	done
-
-	git init || die
-	git config user.email "you@example.com" || die
-	git config user.name "Your Name" || die
-	git add -A || die
-	git commit -q -m ".." || die
-	git clone --bare "${T}"/repo "${T}"/repo.git || die
-	cd "${S}" || die
-
-	distutils-r1_src_test
-}
-
-python_test() {
-	#TRAVIS=1 disables performance tests which rely on the gitdb repo
-	local -x TRAVIS=1
-	local -x GITDB_TEST_GIT_REPO_BASE="${T}"/repo.git
-	nosetests -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/gitdb/gitdb-4.0.6.ebuild b/dev-python/gitdb/gitdb-4.0.6.ebuild
deleted file mode 100644
index 3426010c6c86..000000000000
--- a/dev-python/gitdb/gitdb-4.0.6.ebuild
+++ /dev/null
@@ -1,62 +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
-
-DESCRIPTION="GitDB is a pure-Python git object database"
-HOMEPAGE="
-	https://github.com/gitpython-developers/gitdb
-	https://pypi.org/project/gitdb/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-
-RDEPEND="
-	>=dev-python/smmap-3.0.1[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-vcs/git
-	)"
-
-distutils_enable_tests nose
-
-src_prepare() {
-	# remove unnecessary version restriction
-	# https://github.com/gitpython-developers/gitdb/issues/67
-	sed -i -e '/smmap/s:,<4::' setup.py || die
-	distutils-r1_src_prepare
-}
-
-src_test() {
-	local i
-
-	mkdir "${T}"/repo || die
-	cd "${T}"/repo || die
-
-	for (( i = 0; i < 2500; ++i )); do
-		echo "${i}" > file"${i}" || die
-	done
-
-	git init || die
-	git config user.email "you@example.com" || die
-	git config user.name "Your Name" || die
-	git add -A || die
-	git commit -q -m ".." || die
-	git clone --bare "${T}"/repo "${T}"/repo.git || die
-	cd "${S}" || die
-
-	distutils-r1_src_test
-}
-
-python_test() {
-	#TRAVIS=1 disables performance tests which rely on the gitdb repo
-	local -x TRAVIS=1
-	local -x GITDB_TEST_GIT_REPO_BASE="${T}"/repo.git
-	nosetests -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/gitdb/gitdb-4.0.7.ebuild b/dev-python/gitdb/gitdb-4.0.7.ebuild
index 3426010c6c86..6bfaf22c9f04 100644
--- a/dev-python/gitdb/gitdb-4.0.7.ebuild
+++ b/dev-python/gitdb/gitdb-4.0.7.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 
 RDEPEND="
 	>=dev-python/smmap-3.0.1[${PYTHON_USEDEP}]"
diff --git a/dev-python/jaraco-functools/Manifest b/dev-python/jaraco-functools/Manifest
index d3c83688b3ac..850828f50a47 100644
--- a/dev-python/jaraco-functools/Manifest
+++ b/dev-python/jaraco-functools/Manifest
@@ -1,2 +1 @@
-DIST jaraco.functools-3.2.1.tar.gz 16888 BLAKE2B 87dbc4a68f508a3c3169496c3f57d9844e90a6523b5526e486bbdcb1de996fb31025100e25929c0527ed27dd57ff67c90020d7cddfd70ead2a78e69ec8f65f8b SHA512 279dbb9307f864e3616f9b91ce5d55068df166a30695c0f81bcfae0bc2a1e0df5fdccd157210df3dd73ad73a6a955c1344ec441f925a651cd13a7f460e7a88e1
 DIST jaraco.functools-3.3.0.tar.gz 17116 BLAKE2B 3e1bf63f72d67e55fdf5cfd8d2e12899b7862ebe6cf426be94154f479cf01a69f01b1af152a574c4fb93766b324b6050748464a17a26a27591396d59ed79cb38 SHA512 fc7c5a11a3411692066f4437d76ace7e8a00af2152256ea9f730254b577e74163342298d5b33d472c744cbad5dd316b56345d05aa93ef6f82bc92d6aadb2f2ec
diff --git a/dev-python/jaraco-functools/jaraco-functools-3.2.1.ebuild b/dev-python/jaraco-functools/jaraco-functools-3.2.1.ebuild
deleted file mode 100644
index cc23de852275..000000000000
--- a/dev-python/jaraco-functools/jaraco-functools-3.2.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-MY_PN="${PN/-/.}"
-DESCRIPTION="Additional functions used by other projects by developer jaraco"
-HOMEPAGE="https://github.com/jaraco/jaraco.functools"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos"
-
-RDEPEND="
-	dev-python/more-itertools[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/toml[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/jaraco-classes[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs \
-	">=dev-python/jaraco-packaging-3.2" \
-	">=dev-python/rst-linker-1.9"
-distutils_enable_tests pytest
diff --git a/dev-python/jaraco-functools/jaraco-functools-3.3.0.ebuild b/dev-python/jaraco-functools/jaraco-functools-3.3.0.ebuild
index 8712374a1b9b..cc23de852275 100644
--- a/dev-python/jaraco-functools/jaraco-functools-3.3.0.ebuild
+++ b/dev-python/jaraco-functools/jaraco-functools-3.3.0.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-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"
 
 RDEPEND="
 	dev-python/more-itertools[${PYTHON_USEDEP}]
diff --git a/dev-python/keyring/Manifest b/dev-python/keyring/Manifest
index 27164662851a..44ba7445b5cc 100644
--- a/dev-python/keyring/Manifest
+++ b/dev-python/keyring/Manifest
@@ -1,2 +1 @@
-DIST keyring-23.0.0.tar.gz 48218 BLAKE2B a71e86e91b874d2b82477ebcd93687592864095bc20bbda898b934e6f888e2ef666d462fe27ffc5fcbafb909c44b8e816c46d138865c53afcb12dd5d04a7c761 SHA512 4fd83ab0e73bc748b593bdcc2d8df608c7ef4ad9b64b58db611995eb3cb98d1bd5b5a312ab15f7322f33359fe12bd1b02eed1dbaae50455abb9e84e367976c4e
 DIST keyring-23.0.1.tar.gz 48614 BLAKE2B dd56b92464934a7596bba97c5a1990eb2b3bf33da2eb469aa028ad346c09fa14687cc9214cb48ed82c0f32fc4fcf779391a00a5c9fffdff25f31e7f70f2bd731 SHA512 9f779e419049aef699c67dcb93277f336a2063b42394a4ff2350b8e72b81fe6763f6a6fbe8f358e90bf31540513095e2e56b83742841ee567e5d46b91995c063
diff --git a/dev-python/keyring/keyring-23.0.0.ebuild b/dev-python/keyring/keyring-23.0.0.ebuild
deleted file mode 100644
index f64cbb69bb5c..000000000000
--- a/dev-python/keyring/keyring-23.0.0.ebuild
+++ /dev/null
@@ -1,41 +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="Provides access to the system keyring service"
-HOMEPAGE="https://github.com/jaraco/keyring"
-SRC_URI="https://github.com/jaraco/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="PSF-2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos"
-
-RDEPEND="
-	dev-python/secretstorage[${PYTHON_USEDEP}]
-	dev-python/entrypoints[${PYTHON_USEDEP}]
-	dev-python/jeepney[${PYTHON_USEDEP}]
-	dev-python/importlib_metadata[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs \
-	dev-python/jaraco-packaging \
-	dev-python/rst-linker
-
-python_prepare_all() {
-	rm tests/backends/test_kwallet.py || die
-
-	distutils-r1_python_prepare_all
-
-	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-}
diff --git a/dev-python/keyring/keyring-23.0.1.ebuild b/dev-python/keyring/keyring-23.0.1.ebuild
index fe39db7aefa3..e1f1f1a3f7f0 100644
--- a/dev-python/keyring/keyring-23.0.1.ebuild
+++ b/dev-python/keyring/keyring-23.0.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/jaraco/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 SLOT="0"
 LICENSE="PSF-2"
-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"
 
 RDEPEND="
 	dev-python/secretstorage[${PYTHON_USEDEP}]
diff --git a/dev-python/numpy/numpy-1.20.2.ebuild b/dev-python/numpy/numpy-1.20.2.ebuild
index 2bc7c7f5a44c..72bd11d733bb 100644
--- a/dev-python/numpy/numpy-1.20.2.ebuild
+++ b/dev-python/numpy/numpy-1.20.2.ebuild
@@ -24,7 +24,7 @@ SRC_URI="
 	)"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc lapack"
 
 RDEPEND="
diff --git a/dev-python/polib/Manifest b/dev-python/polib/Manifest
index a651ba65cdfa..4c0382fecbf6 100644
--- a/dev-python/polib/Manifest
+++ b/dev-python/polib/Manifest
@@ -1,2 +1 @@
-DIST polib-1.1.0.tar.gz 158484 BLAKE2B 41766f00e3928eacf3c98406b6acce224f0d0cb44d79326c834db900ed8b91181911ab7e26845a737057dd07c067a784d0b06278952708c17888db42d8c1e303 SHA512 74681585b4d7252e107acd7d73f49f7e91c90adcd180722d39d35c40ec158434798af0124a16788cf564c73b84f52a040aefeb58355a1a3cd85848c3f6a5e67f
 DIST polib-1.1.1.tar.gz 154644 BLAKE2B 3dfbaf2fa73d286a60a1fff3e50d8703cf62917b7da0c8b783aaec49b8dcfb927b03b0fe0b411b5f90c2ac89298ea027beb2f0d00ad582a65628d8351397ddab SHA512 38de5fbdbc9ef879a4d55b9fe4f86a3aca3fb90dbb671745bd2b126be443598b8b18fe53afd116c3a4d3efc7a42b5ed05d75569bb5b2ef0bd2ced6e13eda95ad
diff --git a/dev-python/polib/polib-1.1.0-r1.ebuild b/dev-python/polib/polib-1.1.0-r1.ebuild
deleted file mode 100644
index 7ac2ce5c72e6..000000000000
--- a/dev-python/polib/polib-1.1.0-r1.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
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="A library to manipulate gettext files (.po and .mo files)"
-HOMEPAGE="https://github.com/izimobil/polib https://polib.readthedocs.io/en/latest/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86"
-IUSE="doc"
-
-DEPEND="doc? ( dev-python/sphinx )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.0.7-BE-test.patch
-)
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	"${PYTHON}" tests/tests.py || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	local DOCS=( CHANGELOG README.rst )
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/polib/polib-1.1.1.ebuild b/dev-python/polib/polib-1.1.1.ebuild
index 84de463c33c8..a51dfd3224f3 100644
--- a/dev-python/polib/polib-1.1.1.ebuild
+++ b/dev-python/polib/polib-1.1.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 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86"
 
 distutils_enable_sphinx docs
 
diff --git a/dev-python/pyflakes/Manifest b/dev-python/pyflakes/Manifest
index 7f792e8b2d72..ece199317032 100644
--- a/dev-python/pyflakes/Manifest
+++ b/dev-python/pyflakes/Manifest
@@ -1,3 +1,2 @@
 DIST pyflakes-2.2.0.tar.gz 65307 BLAKE2B e48e0cb0497f90b6482c0fd08c182d766ab50755fe348352df510841f4ad43f7c1d6486753ce774603a3624f49c9b0165ad930bb1451ef30cf2e828d732e0652 SHA512 6a411efef261874c216b71bcb095412448a8cbeefdf7fa5577d4f4edd48a4a740a4433665e87e5dda2c08fd9ee3bfb7f134f56c7523e1303243edfa92b0ccb35
-DIST pyflakes-2.3.0.tar.gz 68452 BLAKE2B b108dc79ce916e1d1c05b13a167b11bf5350672f5513d6642c0c9f6b46a46d558acf1cb5035f6d987a10087242f2e1040d271c4270d1f510156883d37a7c658e SHA512 e65e534139b7739e742eaa07e8803387f20bba0332247688c864ef8fab74d5851c68e9705cecae158c8d178ddbb08d54aea7ce77910979be1cc3fea57687fce4
 DIST pyflakes-2.3.1.tar.gz 68567 BLAKE2B 0eee1eb87bf1dcae68afcdb250644aa8a1189ca3d8d22608e25727bf01b94465cceb6c65be669b18779434c8879594dd92cfb3a108b7aff584cfda788f6e2f4f SHA512 85d3a2737d31ed4b5f4c2e3621759a5951d1320f95d74313fec09fa551648105b3ab84db94f7bffe5b77623e4adbea1d8ad12b9ce2fee7e81c41581a3ea81cc6
diff --git a/dev-python/pyflakes/pyflakes-2.3.0.ebuild b/dev-python/pyflakes/pyflakes-2.3.0.ebuild
deleted file mode 100644
index 36fc625c3f19..000000000000
--- a/dev-python/pyflakes/pyflakes-2.3.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-# Uses pkg_resources
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Passive checker for Python programs"
-HOMEPAGE="https://github.com/PyCQA/pyflakes https://pypi.org/project/pyflakes/"
-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 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-distutils_enable_tests unittest
diff --git a/dev-python/pyflakes/pyflakes-2.3.1.ebuild b/dev-python/pyflakes/pyflakes-2.3.1.ebuild
index 51a322a0d6b5..36fc625c3f19 100644
--- a/dev-python/pyflakes/pyflakes-2.3.1.ebuild
+++ b/dev-python/pyflakes/pyflakes-2.3.1.ebuild
@@ -15,6 +15,6 @@ 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 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 distutils_enable_tests unittest
diff --git a/dev-python/pyproject2setuppy/Manifest b/dev-python/pyproject2setuppy/Manifest
index 60afb166ac14..55d93472b900 100644
--- a/dev-python/pyproject2setuppy/Manifest
+++ b/dev-python/pyproject2setuppy/Manifest
@@ -1,3 +1,2 @@
-DIST pyproject2setuppy-10.tar.gz 10221 BLAKE2B d9309cd7fe44a5f2f32311033df14e3e9c6391859a063a3c7afd25df69143dc93b0d8ccd03b908f0bf0badfce394f04f46177a30e7dc94043a5405017d9da711 SHA512 e6f94c29e5bde9c884fd14bba7d28a5313f363fbb7af3d2e5f2d55d718340c14cf26a5b28956eaf6c47a74b6b498b88e9a0fe0a2bd504370dbcb1553765da0f4
 DIST pyproject2setuppy-11.tar.gz 10420 BLAKE2B 64eaf9d9855c767a821c876292613a360d631a21d5e45715dbf63c2f0704135110eb6d7fa0f6eb9ec6eb52dc17c621b89ad709170b099fc71a26c9b754c61566 SHA512 8b4f9e933301c4f724242f47877a0c436434c3d8303a3d3288b09f5814e9f7dbe8d2039e8c040b5e1d5b21d7ac44e58287e9573e9f0fe9827b5db1bef1e4b169
 DIST pyproject2setuppy-12.tar.gz 10729 BLAKE2B 06988e45c42822db8f0bd65d3c88bc9c0481956c6b86bcce4b98ad7a17cbabd3d66b9037c5fb11a0926922109dbf0f9640d390f0bcfcb43ae63c46f47ecf4933 SHA512 d3612ffcdc16b851a1b3bd96ff4b3484dd91a210c4617fdedebf8ddb1df9842b58ef6a68d2d66e9888cb9819b3baf3b522f46c0e9286956916471a4d0dc80b94
diff --git a/dev-python/pyproject2setuppy/pyproject2setuppy-10.ebuild b/dev-python/pyproject2setuppy/pyproject2setuppy-10.ebuild
deleted file mode 100644
index 254e09e10885..000000000000
--- a/dev-python/pyproject2setuppy/pyproject2setuppy-10.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=manual
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Cheap setup.py hack to install flit & poetry-based projects"
-HOMEPAGE="https://github.com/mgorny/pyproject2setuppy"
-SRC_URI="
-	https://github.com/mgorny/pyproject2setuppy/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-RDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]"
-BDEPEND="${RDEPEND}
-	test? (
-		dev-python/wheel[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pyproject2setuppy/pyproject2setuppy-11.ebuild b/dev-python/pyproject2setuppy/pyproject2setuppy-11.ebuild
index 37fe81665a72..254e09e10885 100644
--- a/dev-python/pyproject2setuppy/pyproject2setuppy-11.ebuild
+++ b/dev-python/pyproject2setuppy/pyproject2setuppy-11.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="BSD-2"
 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"
 
 RDEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/pypugjs/pypugjs-5.9.9.ebuild b/dev-python/pypugjs/pypugjs-5.9.9.ebuild
index fa966be38011..ef460fdea78f 100644
--- a/dev-python/pypugjs/pypugjs-5.9.9.ebuild
+++ b/dev-python/pypugjs/pypugjs-5.9.9.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/kakulukia/pypugjs/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm64"
 
 IUSE=""
 RDEPEND="
diff --git a/dev-python/pytest-subtests/pytest-subtests-0.4.0.ebuild b/dev-python/pytest-subtests/pytest-subtests-0.4.0.ebuild
index 1ed523020173..210877a5b16e 100644
--- a/dev-python/pytest-subtests/pytest-subtests-0.4.0.ebuild
+++ b/dev-python/pytest-subtests/pytest-subtests-0.4.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc ~x86"
 
 RDEPEND="
 	>=dev-python/pytest-5.3.0[${PYTHON_USEDEP}]
diff --git a/dev-python/rfc3339-validator/Manifest b/dev-python/rfc3339-validator/Manifest
index fd72cb08590a..e80583483d3f 100644
--- a/dev-python/rfc3339-validator/Manifest
+++ b/dev-python/rfc3339-validator/Manifest
@@ -1,2 +1 @@
-DIST rfc3339-validator-0.1.2.tar.gz 7429 BLAKE2B 9c08ae6ebe12af043ebad82a716e359f323f318d44e1f23a41759773e1927f90d6dde95566ca3c9463db6ffc9f2c3a31925ee4668f7fbe1defc78e09949ac391 SHA512 42164f8258025b056a6c5584c1c5e76f4c4fddead1a18199cd5b115a5a576d8863676d741e5e9a12bd4b41cbf55e722632a57dc3f76688ff0ad886615286c567
 DIST rfc3339-validator-0.1.3.tar.gz 7439 BLAKE2B 8991906720f3c7fe08edbc2994693b354338e70bb361e2ceebe168e8f8195a061c2cd716e365a7713c1a21658517e4f2028f9b619513408252a46ef589868c02 SHA512 d89679fb9fabcfa75cf3955744facb235201c0c3ccc4bcfd53b553c5403967226282b68e628d0dd74bb4abe553da6c3734912c63f3a5e16875e57a872c78231d
diff --git a/dev-python/rfc3339-validator/files/rfc3339-validator-0.1.2-remove-pytest-runner.patch b/dev-python/rfc3339-validator/files/rfc3339-validator-0.1.2-remove-pytest-runner.patch
deleted file mode 100644
index 00c1cefe239b..000000000000
--- a/dev-python/rfc3339-validator/files/rfc3339-validator-0.1.2-remove-pytest-runner.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/requirements_dev.txt b/requirements_dev.txt
-index c4f59fc..f8da57f 100644
---- a/requirements_dev.txt
-+++ b/requirements_dev.txt
-@@ -7,6 +7,5 @@ coverage==4.5.4
- twine==1.14.0
- 
- pytest==4.6.5
--pytest-runner==5.1
- hypothesis==4.41.3
- strict_rfc3339==0.7
-diff --git a/setup.py b/setup.py
-index ada5c92..fb0df5a 100644
---- a/setup.py
-+++ b/setup.py
-@@ -14,7 +14,7 @@ requirements = [
- 
- setup_requirements = []
- 
--test_requirements = ['pytest>=3', 'pytest-runner']
-+test_requirements = ['pytest>=3']
- 
- setup(
-     author="Nicolas Aimetti",
diff --git a/dev-python/rfc3339-validator/rfc3339-validator-0.1.2.ebuild b/dev-python/rfc3339-validator/rfc3339-validator-0.1.2.ebuild
deleted file mode 100644
index ee94ab6263c8..000000000000
--- a/dev-python/rfc3339-validator/rfc3339-validator-0.1.2.ebuild
+++ /dev/null
@@ -1,27 +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="A pure python RFC3339 validator"
-HOMEPAGE="https://github.com/naimetti/rfc3339-validator"
-SRC_URI="https://github.com/naimetti/rfc3339-validator/archive/v0.1.2.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]
-	dev-python/strict-rfc3339[${PYTHON_USEDEP}]"
-BDEPEND="${RDEPEND}
-	test? ( dev-python/hypothesis[${PYTHON_USEDEP}] )
-"
-
-PATCHES=(
-	"${FILESDIR}/rfc3339-validator-0.1.2-remove-pytest-runner.patch"
-)
-
-distutils_enable_tests pytest
diff --git a/dev-python/rfc3339-validator/rfc3339-validator-0.1.3.ebuild b/dev-python/rfc3339-validator/rfc3339-validator-0.1.3.ebuild
index 855041508035..e0ebe2990b18 100644
--- a/dev-python/rfc3339-validator/rfc3339-validator-0.1.3.ebuild
+++ b/dev-python/rfc3339-validator/rfc3339-validator-0.1.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 
 RDEPEND="dev-python/six[${PYTHON_USEDEP}]
 	dev-python/strict-rfc3339[${PYTHON_USEDEP}]"
diff --git a/dev-python/setuptools_trial/setuptools_trial-0.6.0-r1.ebuild b/dev-python/setuptools_trial/setuptools_trial-0.6.0-r1.ebuild
index e9179f4fc969..0815ca9b2340 100644
--- a/dev-python/setuptools_trial/setuptools_trial-0.6.0-r1.ebuild
+++ b/dev-python/setuptools_trial/setuptools_trial-0.6.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/snakeoil/snakeoil-0.9.6.ebuild b/dev-python/snakeoil/snakeoil-0.9.6.ebuild
index ffeb4c05e2c1..a02a848ce628 100644
--- a/dev-python/snakeoil/snakeoil-0.9.6.ebuild
+++ b/dev-python/snakeoil/snakeoil-0.9.6.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/pkgcore/snakeoil.git"
 	inherit git-r3
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 fi
 
diff --git a/dev-python/sphinx-prompt/Manifest b/dev-python/sphinx-prompt/Manifest
index 008095bc4195..4ce92bdad848 100644
--- a/dev-python/sphinx-prompt/Manifest
+++ b/dev-python/sphinx-prompt/Manifest
@@ -1,2 +1 @@
-DIST sphinx-prompt-1.3.0.tar.gz 7511 BLAKE2B 3e327b93fdfba48684983b0524fddc2c70f5ca997364e58cddb4e1d1078f51fc73e0102b969c49fa6cb27154624cd0220ea244eb13a0f64444a4e252bfe3f9ca SHA512 21dad50833ee1e00493c208b844caa41420fc2874c48fcb9ce20168a4872f8dc0a654eeea6ca6159d5ff6bbac3de15c2633c2f5abd826ac352c3f0ced37f6146
 DIST sphinx-prompt-1.4.0.tar.gz 9072 BLAKE2B c3ee936bb05eb39fcabd85260ef65b66c9a3fbf64d1b1e188ba889a3777d32fd90c6857d88191f5d9521b25ae46bc6ffc1777c18ace7e0aa0d96f266548ae7be SHA512 e79deb7164fe76f5f4a82855030d5eadd1966d87c0785d2a7a743205301ae0809398823e2a3558c3759774b3ee38c974638daf0b58ce565ef5b298f593ffd18d
diff --git a/dev-python/sphinx-prompt/sphinx-prompt-1.3.0.ebuild b/dev-python/sphinx-prompt/sphinx-prompt-1.3.0.ebuild
deleted file mode 100644
index 1e07708f9100..000000000000
--- a/dev-python/sphinx-prompt/sphinx-prompt-1.3.0.ebuild
+++ /dev/null
@@ -1,21 +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="Sphinx directive to add unselectable prompt"
-HOMEPAGE="https://github.com/sbrunner/sphinx-prompt/"
-SRC_URI="https://github.com/sbrunner/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
-
-RDEPEND="
-	dev-python/sphinx[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/sphinx-prompt/sphinx-prompt-1.4.0.ebuild b/dev-python/sphinx-prompt/sphinx-prompt-1.4.0.ebuild
index e6f4f78da047..baac87ba0166 100644
--- a/dev-python/sphinx-prompt/sphinx-prompt-1.4.0.ebuild
+++ b/dev-python/sphinx-prompt/sphinx-prompt-1.4.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/sbrunner/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
 
 RDEPEND="
 	dev-python/sphinx[${PYTHON_USEDEP}]
diff --git a/dev-python/txrequests/txrequests-0.9.6.ebuild b/dev-python/txrequests/txrequests-0.9.6.ebuild
index 621b8a37d5f9..d0f59664f834 100644
--- a/dev-python/txrequests/txrequests-0.9.6.ebuild
+++ b/dev-python/txrequests/txrequests-0.9.6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 
 RDEPEND="
 	>=dev-python/requests-1.2.0[${PYTHON_USEDEP}]
diff --git a/dev-python/unidiff/unidiff-0.6.0.ebuild b/dev-python/unidiff/unidiff-0.6.0.ebuild
index 1a6342b9f8fb..2933b82e4738 100644
--- a/dev-python/unidiff/unidiff-0.6.0.ebuild
+++ b/dev-python/unidiff/unidiff-0.6.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm64"
 IUSE="test"
 RESTRICT="!test? ( test )"