Adding metadata

30 files changed, 85 insertions, 252 deletions

diff --git a/dev-python/attrs/attrs-21.3.0.ebuild b/dev-python/attrs/attrs-21.3.0.ebuild
index 9cbff3d98401..7dd5e2193233 100644
--- a/dev-python/attrs/attrs-21.3.0.ebuild
+++ b/dev-python/attrs/attrs-21.3.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/zope-interface[${PYTHON_USEDEP}]"
diff --git a/dev-python/black/black-21.12_beta0.ebuild b/dev-python/black/black-21.12_beta0.ebuild
index 65ec0d7d75c8..c906ce071c1c 100644
--- a/dev-python/black/black-21.12_beta0.ebuild
+++ b/dev-python/black/black-21.12_beta0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~sparc x86 ~x64-macos"
 
 RDEPEND="
 	>=dev-python/click-8.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/cloudpickle/cloudpickle-2.0.0.ebuild b/dev-python/cloudpickle/cloudpickle-2.0.0.ebuild
index cf8d0692256c..aaf985d765b9 100644
--- a/dev-python/cloudpickle/cloudpickle-2.0.0.ebuild
+++ b/dev-python/cloudpickle/cloudpickle-2.0.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/coverage/Manifest b/dev-python/coverage/Manifest
index 9214bd7ed5b3..6b01ac2d16e5 100644
--- a/dev-python/coverage/Manifest
+++ b/dev-python/coverage/Manifest
@@ -1,2 +1 @@
-DIST coverage-6.1.2.tar.gz 677391 BLAKE2B eb9b129282446ed536765fcbd8b31f863be315c8eb27087473608b1412014e5807a26b8bcbdeea98f7a89481198bb7475dc775e68fee53ca297d16332edb7ea8 SHA512 41b5bc881eba97308ff702024dd1873fe527c941fe1b45c36a6210819e0b6b9e6dcdf0ad31659e88ea25a3ebd84e90858694f54d2d7585c61b319edb9afbf07e
 DIST coverage-6.2.tar.gz 678664 BLAKE2B 98fe2e5d85db042d95a791838b121a4aeb0edc09f15e5454943d6d1ca3cafdbf0127e8683ddcb5c1f6372b18205bf92e24a803533f19d1bdd5e0477b669cf99f SHA512 e8ef5f2483b2e6d12f0f9801d63a0cd0b81395ea0c88b3cdaf6f6758e1fc1b381f803b0f58345c94007de175d0c2a24559dec93f51db8786f801a2a2d48d6b8f
diff --git a/dev-python/coverage/coverage-6.1.2.ebuild b/dev-python/coverage/coverage-6.1.2.ebuild
deleted file mode 100644
index e32ed8012f48..000000000000
--- a/dev-python/coverage/coverage-6.1.2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-PYTHON_REQ_USE="threads(+),sqlite(+)"
-inherit distutils-r1
-
-DESCRIPTION="Code coverage measurement for Python"
-HOMEPAGE="https://coverage.readthedocs.io/en/latest/ https://pypi.org/project/coverage/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~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
-# on something utterly useless.
-RESTRICT="test"
-
-#BDEPEND="
-#	test? (
-#		dev-python/PyContracts[${PYTHON_USEDEP}]
-#		dev-python/flaky[${PYTHON_USEDEP}]
-#		dev-python/hypothesis[${PYTHON_USEDEP}]
-#		dev-python/mock[${PYTHON_USEDEP}]
-#		dev-python/pytest[${PYTHON_USEDEP}]
-#		>=dev-python/unittest-mixins-1.4[${PYTHON_USEDEP}]
-#	)
-#"
-
-src_prepare() {
-	# avoid the dep on xdist, run tests verbosely
-	sed -i -e '/^addopts/s:-n3:-v:' setup.cfg || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	distutils_install_for_testing
-
-	"${EPYTHON}" igor.py zip_mods || die
-	"${EPYTHON}" igor.py test_with_tracer py || die
-
-	# No C extensions under pypy
-	if [[ ${EPYTHON} != pypy* ]]; then
-		cp -l -- "${TEST_DIR}"/lib/*/coverage/*.so coverage/ || die
-		"${EPYTHON}" igor.py test_with_tracer c || die
-	fi
-
-	# clean up leftover "egg1" directory
-	rm -rf build/lib/egg1 || die
-}
diff --git a/dev-python/coverage/coverage-6.2.ebuild b/dev-python/coverage/coverage-6.2.ebuild
index 414fb7f31fa1..d4f6cf935eaa 100644
--- a/dev-python/coverage/coverage-6.2.ebuild
+++ b/dev-python/coverage/coverage-6.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~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/eradicate/eradicate-2.0.0.ebuild b/dev-python/eradicate/eradicate-2.0.0.ebuild
index 6106389c2b1e..c428d0ca89c8 100644
--- a/dev-python/eradicate/eradicate-2.0.0.ebuild
+++ b/dev-python/eradicate/eradicate-2.0.0.ebuild
@@ -16,6 +16,6 @@ SRC_URI="https://github.com/myint/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 x86"
 
 distutils_enable_tests unittest
diff --git a/dev-python/keyring/Manifest b/dev-python/keyring/Manifest
index fe302b0b00cd..f7059690758f 100644
--- a/dev-python/keyring/Manifest
+++ b/dev-python/keyring/Manifest
@@ -1,3 +1,2 @@
-DIST keyring-23.2.1.tar.gz 44522 BLAKE2B 79ba1fb530cecad84ba94e9a27f32196367af92952946c07581d68d5e89fac93d9b7a33cad8d1a95ae9ffe1568ddc189cd17decea7113debb022dafba4472bfd SHA512 205f74d9457f65952b1cada1a829bb97318cb80689b410eedb49def3577234f715ec6420d7d12833255ef5098040d0a5186be47fa6b8c6db6036406c3ee2e246
 DIST keyring-23.3.0.tar.gz 44669 BLAKE2B 3f6cd3ff558b0a792d405c1c8175bf68c8463f26662d74c1f439e28d7914ef7f26c6091c64ef372e78028eeda04d2a5bcbe253477632b2e53d92d36ade43d47a SHA512 39264abf585949da444fdacbb1195c981157e151d1d14373c5afe0f6547f8da46b2da3e14f47e363bbccd69ee90bc182c287bd963d8b99301a5e919e511426cf
 DIST keyring-23.4.0.tar.gz 44557 BLAKE2B 1115ecfca9f7d7cd5d28168d9d4198e329217ace82a32fe4db1b40aa96e6a352face46f4e8877407618e701713a8f1347810a24706bbe1872bff758f71ae34f5 SHA512 214041375a1bddda099042168f0f4c5ea4cf24c347a0693ab3efd7eb7a0ab2c36abff33f3d83168cfe5ae5dd971e0f3de4548fb0651e435009766aec740e64eb
diff --git a/dev-python/keyring/keyring-23.2.1.ebuild b/dev-python/keyring/keyring-23.2.1.ebuild
deleted file mode 100644
index d9fa9834cdcb..000000000000
--- a/dev-python/keyring/keyring-23.2.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{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 ppc ppc64 ~riscv 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
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-EPYTEST_DESELECT=(
-	# this test fails if importlib-metadata returns more than one
-	# entry, i.e. when keyring is installed already
-	tests/test_packaging.py::test_entry_point
-)
-
-EPYTEST_IGNORE=(
-	# apparently does not unlock the keyring properly
-	tests/backends/test_libsecret.py
-	# hangs
-	tests/backends/test_kwallet.py
-)
diff --git a/dev-python/keyring/keyring-23.3.0.ebuild b/dev-python/keyring/keyring-23.3.0.ebuild
index 9c1e19561532..d9fa9834cdcb 100644
--- a/dev-python/keyring/keyring-23.3.0.ebuild
+++ b/dev-python/keyring/keyring-23.3.0.ebuild
@@ -12,7 +12,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 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ppc ppc64 ~riscv sparc x86 ~x64-macos"
 
 RDEPEND="
 	dev-python/secretstorage[${PYTHON_USEDEP}]
diff --git a/dev-python/mando/mando-0.6.4-r1.ebuild b/dev-python/mando/mando-0.6.4-r1.ebuild
index 10500a32a278..4ac2b571b94b 100644
--- a/dev-python/mando/mando-0.6.4-r1.ebuild
+++ b/dev-python/mando/mando-0.6.4-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/rubik/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 x86"
 IUSE="examples"
 
 RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
diff --git a/dev-python/nbval/nbval-0.9.6.ebuild b/dev-python/nbval/nbval-0.9.6.ebuild
index 48dca31918ef..88303ddbf214 100644
--- a/dev-python/nbval/nbval-0.9.6.ebuild
+++ b/dev-python/nbval/nbval-0.9.6.ebuild
@@ -25,13 +25,14 @@ RDEPEND="
 "
 BDEPEND="test? ( dev-python/sympy[${PYTHON_USEDEP}] )"
 
-distutils_enable_tests pytest
+distutils_enable_tests --install pytest
 
 python_test() {
+	distutils_install_for_testing
 	local deselect=(
 		--deselect tests/test_ignore.py::test_conf_ignore_stderr
 		--deselect tests/test_timeouts.py::test_timeouts
 	)
 
-	pytest -vv "${deselect[@]}" || die "Tests failed with ${EPYTHON}"
+	epytest "${deselect[@]}"
 }
diff --git a/dev-python/phonenumbers/Manifest b/dev-python/phonenumbers/Manifest
index aac89dfc8886..7ae4e3089b2e 100644
--- a/dev-python/phonenumbers/Manifest
+++ b/dev-python/phonenumbers/Manifest
@@ -1,4 +1,3 @@
-DIST phonenumbers-8.12.37.tar.gz 2268402 BLAKE2B 7f227f37cf435c5aa00f860d6af9a349aba766ff0d9293d43eed96b9e0a3a27fff2d7f644b8dc8a9911baba340ba07dee4aaa33f864688678f5289c828db955e SHA512 ab71f3def97168926bb9114da8ea20eceb92177a7df22b201f0dcd5aea79e1d099f04d2075383b01137f831117433f52d9ef3e7d11df34c07b49bffd7d06682a
 DIST phonenumbers-8.12.38.tar.gz 2268865 BLAKE2B 491e8e881a2c938c77053a16c7af6e01bf19eb83d1abc94e08eb23dd8ed6d3e864509d98a95f0300dff66a242cae01c6b158e0e1d5085334b4cb2de1e3b6bb1e SHA512 e5ff96fa803180f0843959db7337b9a2c23fe1ba60e4de50b2d679430b160c16a47f1a666c06ae9e8b35980a42fface89a55d866d824ce6db61cef8220ac0e1b
 DIST phonenumbers-8.12.39.tar.gz 2268929 BLAKE2B b89250a8f2df77302bd57ead7bc2d3c1bc3dfb87d246f235e5c53f40fb6cbe6f7b525f3af3f6412bb6a44858aba4def492c3e3bbc25a0e129cf021ad27633ac1 SHA512 018c33a0d602cc4d4e4a6a154d2fcf15cd036a1d247e5bc79ff0e6932a7ca6ef452a193b2e6d090cfe43a3347d374b183d203763247c9653f9ea1af3a7d980d1
 DIST phonenumbers-8.12.40.tar.gz 2269926 BLAKE2B 87163e927719441430ba9665085245a7664feed9bda66995d7d27203eda3d729e8b50409745efe2eaffb656b2998b952c6ee7a05576cd6144e7d52d23773089f SHA512 38fb914a23b0a683f0ef77da33360a594cf9c198e1b0143271d9615bd97089097bab5f4718f837bbbd89f8010ce2641a3b56b165b2c64845a8d2979af859fb7e
diff --git a/dev-python/phonenumbers/phonenumbers-8.12.37.ebuild b/dev-python/phonenumbers/phonenumbers-8.12.37.ebuild
deleted file mode 100644
index b584689d82f2..000000000000
--- a/dev-python/phonenumbers/phonenumbers-8.12.37.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="Python port of Google's libphonenumber"
-HOMEPAGE="https://github.com/daviddrysdale/python-phonenumbers"
-SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-DOCS=(README.md)
-
-distutils_enable_tests setup.py
diff --git a/dev-python/phonenumbers/phonenumbers-8.12.38.ebuild b/dev-python/phonenumbers/phonenumbers-8.12.38.ebuild
index 717843f08927..b584689d82f2 100644
--- a/dev-python/phonenumbers/phonenumbers-8.12.38.ebuild
+++ b/dev-python/phonenumbers/phonenumbers-8.12.38.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DOCS=(README.md)
 
diff --git a/dev-python/pip/pip-21.3.1-r1.ebuild b/dev-python/pip/pip-21.3.1-r1.ebuild
index 892a8046b578..aab618a25419 100644
--- a/dev-python/pip/pip-21.3.1-r1.ebuild
+++ b/dev-python/pip/pip-21.3.1-r1.ebuild
@@ -32,7 +32,7 @@ SRC_URI="
 "
 
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc x86"
 SLOT="0"
 IUSE="test vanilla"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/pycparser/Manifest b/dev-python/pycparser/Manifest
index c619d5054644..9a45f69b12df 100644
--- a/dev-python/pycparser/Manifest
+++ b/dev-python/pycparser/Manifest
@@ -1,2 +1 @@
-DIST pycparser-2.20.tar.gz 161330 BLAKE2B 9a114e4b73e6c3c495bd78c393957146ec425eb5b15d72266cbf424f15e8d2e2e6402ef36d60a9dff41b393aab80fe1356befd25549517f398e129836a76b037 SHA512 ff0853c9f981b43b4f2e879350715c07b02cf9dab223d4980d8fe0a3138c98041b5f848a9355ae4f1cb45e7f137c03a88843008e18d77af9250e0d9c55f5ca1b
 DIST pycparser-2.21.tar.gz 170877 BLAKE2B ae6bf42dfc552bf1e3bfb5430cdb0c15b5e011ec53cbd03e0e2507c08a1a78690cefce2de134bd984caccc5dbde90661cb4c18df5c289217967213aac4d52404 SHA512 e61fbdde484d1cf74d4b27bdde40cf2da4b7028ca8ecd37c83d77473dab707d457321aecaf97da3b114c1d58a4eb200290b76f9c958044b57e5fed949895b5f0
diff --git a/dev-python/pycparser/pycparser-2.20-r1.ebuild b/dev-python/pycparser/pycparser-2.20-r1.ebuild
deleted file mode 100644
index fa152badd306..000000000000
--- a/dev-python/pycparser/pycparser-2.20-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="C parser and AST generator written in Python"
-HOMEPAGE="https://github.com/eliben/pycparser"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="dev-python/ply:=[${PYTHON_USEDEP}]"
-BDEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	# remove the original files to guarantee their regen
-	rm pycparser/{c_ast,lextab,yacctab}.py || die
-
-	# kill sys.path manipulations to force the tests to use built files
-	sed -i -e '/sys\.path/d' tests/*.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	distutils-r1_python_compile
-
-	# note: tables built by py3.5+ are incompatible with older versions
-	# because of 100 group limit of 're' module -- just generate them
-	# separately optimized for each target instead
-	pushd "${BUILD_DIR}"/lib/pycparser > /dev/null || die
-	"${PYTHON}" _build_tables.py || die
-	popd > /dev/null || die
-}
-
-python_test() {
-	# Skip tests if cpp is not in PATH
-	type -P cpp >/dev/null || return 0
-	# change workdir to avoid '.' import
-	cd tests || die
-	"${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	# setup.py generates {c_ast,lextab,yacctab}.py with bytecode disabled.
-	python_optimize
-}
diff --git a/dev-python/pycparser/pycparser-2.21.ebuild b/dev-python/pycparser/pycparser-2.21.ebuild
index 1591ca2b1900..1aecf00a1f61 100644
--- a/dev-python/pycparser/pycparser-2.21.ebuild
+++ b/dev-python/pycparser/pycparser-2.21.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 ~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"
 
 RDEPEND="dev-python/ply:=[${PYTHON_USEDEP}]"
 BDEPEND="${RDEPEND}
diff --git a/dev-python/pylama/pylama-8.3.6.ebuild b/dev-python/pylama/pylama-8.3.6.ebuild
index b245477a2a98..96b780a1f56b 100644
--- a/dev-python/pylama/pylama-8.3.6.ebuild
+++ b/dev-python/pylama/pylama-8.3.6.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/klen/pylama/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~mips ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~x86"
 
 RDEPEND="
 	>=dev-python/mccabe-0.6.1[${PYTHON_USEDEP}]
diff --git a/dev-python/radon/radon-5.1.0.ebuild b/dev-python/radon/radon-5.1.0.ebuild
index abfeab4b9dc1..80826cb903a6 100644
--- a/dev-python/radon/radon-5.1.0.ebuild
+++ b/dev-python/radon/radon-5.1.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 x86"
 
 RDEPEND="
 	dev-python/colorama[${PYTHON_USEDEP}]
diff --git a/dev-python/rpy/Manifest b/dev-python/rpy/Manifest
index ccb5384eeb5c..b7a72bff3330 100644
--- a/dev-python/rpy/Manifest
+++ b/dev-python/rpy/Manifest
@@ -1 +1,2 @@
 DIST rpy2-3.4.2.tar.gz 186064 BLAKE2B 5c800f546240cc33e6341973adae813edcdaa88e90ea0274e97075bc4516ced20828ccc6010ae23aead0b227639158240dae9b678790e0d28f974f10e9ac0e5f SHA512 e754d082bf392de582829bc078b512a071d0c0aa79ce3ed3692ad88b3816863b520a4ef9bbeaccbb2a7284685e470f345ba103e3db78a1c95187c0b554565314
+DIST rpy2-3.4.5.tar.gz 194433 BLAKE2B 588c1c270d69b0214e77e586c4c66e78ae8912b6c10a2fe082be64dc75dff574fa0ab6d5bc500b8ff6a199de8540f508467bf0210f1c66b779857dee767262ab SHA512 296056e1c64a4555a1ccef74cfb580674034155a42b8e7c83feb8bb7d7a6d80b8e2f2966df53a6ed8612718ad169755a7994c5635dda1d1c8af1b549a5863935
diff --git a/dev-python/rpy/rpy-3.4.5.ebuild b/dev-python/rpy/rpy-3.4.5.ebuild
new file mode 100644
index 000000000000..260cb455954f
--- /dev/null
+++ b/dev-python/rpy/rpy-3.4.5.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+PYTHON_REQ_USE="sqlite"
+inherit distutils-r1 virtualx
+
+MYSLOT=2
+MY_PN=${PN}${MYSLOT}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Python interface to the R Programming Language"
+HOMEPAGE="https://rpy.sourceforge.net/
+	https://pypi.org/project/rpy2/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="AGPL-3 GPL-2 LGPL-2.1 MPL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+# ggplot2 is a test dep but not in portage
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-lang/R-3.2
+	dev-python/cffi[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	>=dev-python/pandas-0.13.1[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/tzlocal[${PYTHON_USEDEP}]"
+PDEPEND="dev-python/ipython[${PYTHON_USEDEP}]"
+
+python_test() {
+	cd "${BUILD_DIR}"/lib || die
+	virtx "${EPYTHON}" -m 'rpy2.tests'
+}
diff --git a/dev-python/scipy/scipy-1.7.3.ebuild b/dev-python/scipy/scipy-1.7.3.ebuild
index 32468b151545..4429ee1fe7fa 100644
--- a/dev-python/scipy/scipy-1.7.3.ebuild
+++ b/dev-python/scipy/scipy-1.7.3.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="BSD LGPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 -hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="amd64 arm arm64 -hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="doc +pythran sparse"
 
 DEPEND="
diff --git a/dev-python/tomli-w/tomli-w-1.0.0.ebuild b/dev-python/tomli-w/tomli-w-1.0.0.ebuild
index 0e0e8bb51411..f736f3e1ae22 100644
--- a/dev-python/tomli-w/tomli-w-1.0.0.ebuild
+++ b/dev-python/tomli-w/tomli-w-1.0.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc x86"
 
 BDEPEND="
 	test? ( dev-python/tomli[${PYTHON_USEDEP}] )"
diff --git a/dev-python/twine/Manifest b/dev-python/twine/Manifest
index b09b75184438..5a6fee3e87f8 100644
--- a/dev-python/twine/Manifest
+++ b/dev-python/twine/Manifest
@@ -1,3 +1,2 @@
-DIST twine-3.4.2.tar.gz 212266 BLAKE2B 602bb72f4be1c0d28341fb3378a5d55737c14555495640ae3414a1c8e7ca0c06b2c2ce3c358130251c02f0a51b61eb362a1e999c3945d4d1d7afd7bcd4d17807 SHA512 3f6d8992294a35e2a26be64f56c88d31af63b05f3f477d545bc82d928ca1b9939d23fa489eca5232502a49def77d489eaf6a29663d150f78b5cdb99749ff9b50
 DIST twine-3.6.0.tar.gz 211971 BLAKE2B 763f021e374c86749bca77ca67a5fe534acf333464d6cc2f978de4625abc09b7574aa31de927300983eb6feb801e77a169f11deb4edc5036df73943778f5844d SHA512 41da4d89ac69c692a98545aefffd9afd4c7b0287179807906504b4121bf9257095b227ec2966d98983939fa76fb8509f6ffa2577c0e7b4c7f43f614f44745460
 DIST twine-3.7.0.tar.gz 212591 BLAKE2B 116d96a058cb53e0626747aaeae40c63fd6ece4ed8ef537c3890f99226f34827b65e5e894f5f04a24999d5ca2bcf182505e08075c4ff8b979d7be71e05f645ef SHA512 d7ddfdfcbaa7a5e3eba3657a06da090eeecbf373646e64d659f420fae4ba10c16c2c02e85bdf9c1f050b86177f19c85aa20183ad9d546cb053a11d60db0851f3
diff --git a/dev-python/twine/twine-3.4.2.ebuild b/dev-python/twine/twine-3.4.2.ebuild
deleted file mode 100644
index 14adf022d8d4..000000000000
--- a/dev-python/twine/twine-3.4.2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Collection of utilities for publishing packages on PyPI"
-HOMEPAGE="https://twine.readthedocs.io/ https://github.com/pypa/twine https://pypi.org/project/twine/"
-SRC_URI="https://github.com/pypa/twine/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ppc ppc64 ~riscv sparc x86 ~x64-macos"
-
-RDEPEND="
-	>=dev-python/colorama-0.4.3[${PYTHON_USEDEP}]
-	>=dev-python/importlib_metadata-3.6[${PYTHON_USEDEP}]
-	>=dev-python/keyring-15.1[${PYTHON_USEDEP}]
-	>=dev-python/pkginfo-1.4.2[${PYTHON_USEDEP}]
-	>=dev-python/readme_renderer-21.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.20.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-toolbelt-0.8.0[${PYTHON_USEDEP}]
-	>=dev-python/rfc3986-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/tqdm-4.14[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/jaraco-envs[${PYTHON_USEDEP}]
-		dev-python/jaraco-functools[${PYTHON_USEDEP}]
-		dev-python/munch[${PYTHON_USEDEP}]
-		dev-python/portend[${PYTHON_USEDEP}]
-		dev-python/pretend[${PYTHON_USEDEP}]
-		dev-python/pypiserver[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests --install pytest
-
-python_prepare_all() {
-	# requires internet
-	rm -f tests/test_integration.py || die
-	# pytest-socket dep relevant only to test_integration, and upstream
-	# disables it anyway
-	sed -i -e '/--disable-socket/d' pytest.ini || die
-	sed -i -e '/--cov/d' pytest.ini || die
-
-	distutils-r1_python_prepare_all
-	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-}
diff --git a/dev-python/twine/twine-3.6.0.ebuild b/dev-python/twine/twine-3.6.0.ebuild
index 0291661105c7..14adf022d8d4 100644
--- a/dev-python/twine/twine-3.6.0.ebuild
+++ b/dev-python/twine/twine-3.6.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/pypa/twine/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ppc ppc64 ~riscv sparc x86 ~x64-macos"
 
 RDEPEND="
 	>=dev-python/colorama-0.4.3[${PYTHON_USEDEP}]
diff --git a/dev-python/yapf/Manifest b/dev-python/yapf/Manifest
index ca4e15ddca9b..ef9dc5172a8c 100644
--- a/dev-python/yapf/Manifest
+++ b/dev-python/yapf/Manifest
@@ -1 +1,2 @@
 DIST yapf-0.31.0.tar.gz 176856 BLAKE2B 080867363df59615d1df77ef51645cd68d931251807da83c5b9d8737a89b01e8dee7457a2b524a76ad2eb21b859ad78168a30f706ef70c3b07bcb94a98990752 SHA512 5f376e985e182aab289c41e4071fd98c0784e5292974e2efcc4beaaca68cb83068b297e228a46f51f0d9370634dbd32948bdbd03e6b65c76b43efba0fe0d3454
+DIST yapf-0.32.0.tar.gz 178621 BLAKE2B b2132e3fffb96113700e322bba3f49ded0fe417de901522793564d5830951e9f2017c576fb89c5e423f4f547c95659040c2a4fc923887d9fb941e219b21f0cf6 SHA512 c1a05a04f7558a5b51899c29010bedc105c4a4bad4b5358a903a22a39f451e03369d2b4e670ecb44a857a8fef2bf438d9da0afcbdd3a336cf037bbf480d19878
diff --git a/dev-python/yapf/yapf-0.32.0.ebuild b/dev-python/yapf/yapf-0.32.0.ebuild
new file mode 100644
index 000000000000..256f4a7d829c
--- /dev/null
+++ b/dev-python/yapf/yapf-0.32.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 2018-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 formatter for Python files"
+HOMEPAGE="https://github.com/google/yapf"
+SRC_URI="https://github.com/google/yapf/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	test? ( dev-python/toml[${PYTHON_USEDEP}] )"
+
+python_test() {
+	"${EPYTHON}" -m unittest discover -v -p '*_test.py' ||
+		die "Tests failed with ${EPYTHON}"
+}