Updating liguros repo

102 files changed, 320 insertions, 138 deletions

diff --git a/dev-python/blosc/blosc-1.9.1-r1.ebuild b/dev-python/blosc/blosc-1.9.1-r1.ebuild
index 6aaa989ab2b3..d4b09c796c1e 100644
--- a/dev-python/blosc/blosc-1.9.1-r1.ebuild
+++ b/dev-python/blosc/blosc-1.9.1-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/elementpath/elementpath-1.4.5.ebuild b/dev-python/elementpath/elementpath-1.4.5.ebuild
index 545914f1a7b0..d0249e37d45d 100644
--- a/dev-python/elementpath/elementpath-1.4.5.ebuild
+++ b/dev-python/elementpath/elementpath-1.4.5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 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"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/lxml/Manifest b/dev-python/lxml/Manifest
index 12b46204a577..8baa79ff5470 100644
--- a/dev-python/lxml/Manifest
+++ b/dev-python/lxml/Manifest
@@ -1,2 +1,3 @@
 DIST lxml-4.5.0.tar.gz 942013 BLAKE2B 24535fb74c58baff26c47c4bfe4ade0155044b30d099f1990c11406eca34e6bb8255631e5b30172adcf95fc61d1ab9d0384dbf9910c7694beed11cbb99595008 SHA512 b4b4692cffb7b8d074e72033711e17df2529d0747c4d086926855bb5a39478e7aea2bc195d201ca3c252822b231dbe47aaedc647e50bbd6b24754668beaa60ca
 DIST lxml-4.5.1.tar.gz 942377 BLAKE2B 3b7434b50d7f81628f17adf0c65e38c826304674495160a216c3051d86ddd9924f2854cf35453ba8270ca461c4c5429698a002853642f9e52206de1443c6b6f0 SHA512 0f16cdcb8aa7f8c98d3fb625d6713b422c14f0d4e7348cda38eb0776f0cfa637faaabc14dc63f8052f2741c908de6f71cfcb6471d5286c09780816b46cbfb439
+DIST lxml-4.5.2.tar.gz 943480 BLAKE2B 11130d2507ff0d61637d7fef2f4b28c5fbbbfe8864504c8f3a231899be4db14e6be65edc6e780719686605663b0c5f76f161beb509dc58d16ee3a9158a7db59c SHA512 146dcb4414b7f0815c5930048d9dc89711bf0a3ee091c89f4475265cdd6f1690a20f82ec24a282a43cff8854f9b960f0cd4430cff79a7506d39ac1baf7770695
diff --git a/dev-python/lxml/lxml-4.5.2.ebuild b/dev-python/lxml/lxml-4.5.2.ebuild
new file mode 100644
index 000000000000..13ca5bc33f3f
--- /dev/null
+++ b/dev-python/lxml/lxml-4.5.2.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} pypy3 )
+
+inherit distutils-r1 eutils toolchain-funcs
+
+DESCRIPTION="A Pythonic binding for the libxml2 and libxslt libraries"
+HOMEPAGE="https://lxml.de/ https://pypi.org/project/lxml/ https://github.com/lxml/lxml"
+SRC_URI="https://github.com/lxml/lxml/archive/${P}.tar.gz"
+S=${WORKDIR}/lxml-${P}
+
+LICENSE="BSD ElementTree GPL-2 PSF-2"
+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 ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc examples +threads test"
+RESTRICT="!test? ( test )"
+
+# Note: lib{xml2,xslt} are used as C libraries, not Python modules.
+RDEPEND="
+	>=dev-libs/libxml2-2.9.5
+	>=dev-libs/libxslt-1.1.28"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	dev-python/cython[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/cssselect[${PYTHON_USEDEP}] )
+	"
+
+DISTUTILS_IN_SOURCE_BUILD=1
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.5.0-tests-pypy.patch
+)
+
+python_prepare_all() {
+	# avoid replacing PYTHONPATH in tests.
+	sed -i -e '/sys\.path/d' test.py || die
+
+	# don't use some random SDK on Darwin
+	sed -i -e '/_ldflags =/s/=.*isysroot.*darwin.*None/= None/' \
+		setupinfo.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	if ! python_is_python3; then
+		local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
+	fi
+	tc-export PKG_CONFIG
+	distutils-r1_python_compile
+}
+
+python_test() {
+	cp -r -l src/lxml/tests "${BUILD_DIR}"/lib/lxml/ || die
+	cp -r -l src/lxml/html/tests "${BUILD_DIR}"/lib/lxml/html/ || die
+	ln -s "${S}"/doc "${BUILD_DIR}"/ || die
+
+	"${EPYTHON}" test.py -vv --all-levels -p || die "Test ${test} fails with ${EPYTHON}"
+}
+
+python_install_all() {
+	if use doc; then
+		local DOCS=( README.rst *.txt doc/*.txt )
+		local HTML_DOCS=( doc/html/. )
+	fi
+	if use examples; then
+		dodoc -r samples
+	fi
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "Support for BeautifulSoup as a parser backend" dev-python/beautifulsoup
+	optfeature "Translates CSS selectors to XPath 1.0 expressions" dev-python/cssselect
+}
diff --git a/dev-python/phonenumbers/Manifest b/dev-python/phonenumbers/Manifest
index 9c79eb17e89a..8ff26e2c079d 100644
--- a/dev-python/phonenumbers/Manifest
+++ b/dev-python/phonenumbers/Manifest
@@ -1,3 +1 @@
-DIST phonenumbers-8.10.22.tar.gz 2307815 BLAKE2B 397711a4cca97be68986cbb21ab971710c213a74fbb0e2c79de67b98ab44c3e25e95f6bfc2c469c1abfaf0d1c3848114a0be47d08650c7ac57a01240b7a79270 SHA512 f7c540276324a373bc0caa9aa3b87da31b98bfd24fbffab2f9137f0c6f72bba88022d9820193dfe482ee621fc3c90126bd93cb51bb4715dcbd1c3fa689e055b5
-DIST phonenumbers-8.12.2.tar.gz 2397674 BLAKE2B 8101aa4e42d53d9c4734f0e3e1085ba814d75b53228a5da3efd7310faa0c5e0da419b5a9f127e4ed2554fa06db5007ec7eb430800ec7cbde69c3c8944e45a99f SHA512 16b8562afe94fb14104c266b12db063cf6c9dbda9ae2301a044cfb2e708845f1857b5ecb986e409c67c16e2fb7e4df527906c4d43c302e14df698607deb078a3
 DIST phonenumbers-8.12.4.tar.gz 2269009 BLAKE2B 102630893595fa34f8e5bf3dc5122f43393e26ada216df02e843a40345aa40df83aa6fbf115d71e986a7e57e6a55bd6fd4eb4af14c4872bfe717cb0ec5be604c SHA512 5d93de2b7b6e974593659fb8909c05f2f6f8c29766deea914472b01dde38abdfc9f4f6ee8c718e2ad11e840070b350b623cb9ca58368f24cf1e03804712fa38d
diff --git a/dev-python/phonenumbers/phonenumbers-8.10.22.ebuild b/dev-python/phonenumbers/phonenumbers-8.10.22.ebuild
deleted file mode 100644
index a220686c780e..000000000000
--- a/dev-python/phonenumbers/phonenumbers-8.10.22.ebuild
+++ /dev/null
@@ -1,26 +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} )
-
-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"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-DOCS="README.md"
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/phonenumbers/phonenumbers-8.12.2.ebuild b/dev-python/phonenumbers/phonenumbers-8.12.2.ebuild
deleted file mode 100644
index ddeb720dd441..000000000000
--- a/dev-python/phonenumbers/phonenumbers-8.12.2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6..8} )
-
-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"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-DOCS="README.md"
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/pytest-aiohttp/metadata.xml b/dev-python/pytest-aiohttp/metadata.xml
index 4440f7dda3d1..81d220de5034 100644
--- a/dev-python/pytest-aiohttp/metadata.xml
+++ b/dev-python/pytest-aiohttp/metadata.xml
@@ -4,6 +4,7 @@
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">aio-libs/pytest-aiohttp</remote-id>
 		<remote-id type="pypi">pytest-aiohttp</remote-id>
diff --git a/dev-python/pytest-aiohttp/pytest-aiohttp-0.3.0-r1.ebuild b/dev-python/pytest-aiohttp/pytest-aiohttp-0.3.0-r1.ebuild
index f0fc3c7317b0..115b9ed56859 100644
--- a/dev-python/pytest-aiohttp/pytest-aiohttp-0.3.0-r1.ebuild
+++ b/dev-python/pytest-aiohttp/pytest-aiohttp-0.3.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-python/pytest-asyncio/metadata.xml b/dev-python/pytest-asyncio/metadata.xml
index 50567d15b867..20429c3d3fc5 100644
--- a/dev-python/pytest-asyncio/metadata.xml
+++ b/dev-python/pytest-asyncio/metadata.xml
@@ -4,5 +4,6 @@
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 	</maintainer>
+	<stabilize-allarches/>
 	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/dev-python/pytest-asyncio/pytest-asyncio-0.12.0.ebuild b/dev-python/pytest-asyncio/pytest-asyncio-0.12.0.ebuild
index ac428024c56c..eb948aa71ad4 100644
--- a/dev-python/pytest-asyncio/pytest-asyncio-0.12.0.ebuild
+++ b/dev-python/pytest-asyncio/pytest-asyncio-0.12.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/pytest-dev/pytest-asyncio/archive/v${PV}.tar.gz -> $
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 
 RDEPEND="
 	>=dev-python/pytest-5.4.0"
diff --git a/dev-python/pytest-django/metadata.xml b/dev-python/pytest-django/metadata.xml
index d3e9c6e5617b..10c77499b3e5 100644
--- a/dev-python/pytest-django/metadata.xml
+++ b/dev-python/pytest-django/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">pytest-django</remote-id>
 		<remote-id type="github">pytest-dev/pytest-django</remote-id>
diff --git a/dev-python/pytest-django/pytest-django-3.9.0.ebuild b/dev-python/pytest-django/pytest-django-3.9.0.ebuild
index 9c4a38beff7d..8643926ecc9c 100644
--- a/dev-python/pytest-django/pytest-django-3.9.0.ebuild
+++ b/dev-python/pytest-django/pytest-django-3.9.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://pypi.org/project/pytest-django/ https://pytest-django.readthed
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
-KEYWORDS="~amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 SLOT="0"
 
 RDEPEND="
diff --git a/dev-python/pytest-freezegun/pytest-freezegun-0.4.1.ebuild b/dev-python/pytest-freezegun/pytest-freezegun-0.4.1.ebuild
index c769dd9c8e78..47759c3e888b 100644
--- a/dev-python/pytest-freezegun/pytest-freezegun-0.4.1.ebuild
+++ b/dev-python/pytest-freezegun/pytest-freezegun-0.4.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 RDEPEND="
 	dev-python/freezegun[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-localserver/metadata.xml b/dev-python/pytest-localserver/metadata.xml
index 0bfaaaed1928..e2d76247e428 100644
--- a/dev-python/pytest-localserver/metadata.xml
+++ b/dev-python/pytest-localserver/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">pytest-localserver</remote-id>
 	</upstream>
diff --git a/dev-python/pytest-localserver/pytest-localserver-0.5.0-r1.ebuild b/dev-python/pytest-localserver/pytest-localserver-0.5.0-r1.ebuild
index d0574f22ec59..de0ff5cf6c7b 100644
--- a/dev-python/pytest-localserver/pytest-localserver-0.5.0-r1.ebuild
+++ b/dev-python/pytest-localserver/pytest-localserver-0.5.0-r1.ebuild
@@ -14,7 +14,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 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 sparc x86"
 
 RDEPEND=">=dev-python/werkzeug-0.10[${PYTHON_USEDEP}]"
 BDEPEND="
diff --git a/dev-python/pytest-mock/metadata.xml b/dev-python/pytest-mock/metadata.xml
index d07ec7fc66c4..681a58a3129a 100644
--- a/dev-python/pytest-mock/metadata.xml
+++ b/dev-python/pytest-mock/metadata.xml
@@ -5,6 +5,7 @@
 		<remote-id type="pypi">pytest-mock</remote-id>
 		<remote-id type="github">pytest-dev/pytest-mock</remote-id>
 	</upstream>
+	<stabilize-allarches/>
 	<maintainer type="person">
 		<email>zmedico@gentoo.org</email>
 	</maintainer>
diff --git a/dev-python/pytest-mock/pytest-mock-3.1.1.ebuild b/dev-python/pytest-mock/pytest-mock-3.1.1.ebuild
index 145bc659f1e9..5d108b7f6827 100644
--- a/dev-python/pytest-mock/pytest-mock-3.1.1.ebuild
+++ b/dev-python/pytest-mock/pytest-mock-3.1.1.ebuild
@@ -14,7 +14,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 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86"
 IUSE=""
 
 RDEPEND=">=dev-python/pytest-5[${PYTHON_USEDEP}]"
diff --git a/dev-python/pytest-shutil/metadata.xml b/dev-python/pytest-shutil/metadata.xml
index b2b44bb99ca1..9c6db4c7ab47 100644
--- a/dev-python/pytest-shutil/metadata.xml
+++ b/dev-python/pytest-shutil/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<maintainer>
 			<email>eeaston@gmail.com</email>
diff --git a/dev-python/pytest-shutil/pytest-shutil-1.7.0-r1.ebuild b/dev-python/pytest-shutil/pytest-shutil-1.7.0-r1.ebuild
index dcafa45325e0..739edfa62ca7 100644
--- a/dev-python/pytest-shutil/pytest-shutil-1.7.0-r1.ebuild
+++ b/dev-python/pytest-shutil/pytest-shutil-1.7.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pytest-timeout/metadata.xml b/dev-python/pytest-timeout/metadata.xml
index 6d57906f82b5..5554b9882f02 100644
--- a/dev-python/pytest-timeout/metadata.xml
+++ b/dev-python/pytest-timeout/metadata.xml
@@ -5,6 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">pytest-timeout</remote-id>
   </upstream>
diff --git a/dev-python/pytest-timeout/pytest-timeout-1.3.4.ebuild b/dev-python/pytest-timeout/pytest-timeout-1.3.4.ebuild
index 64babfd23018..bbad0c154fcf 100644
--- a/dev-python/pytest-timeout/pytest-timeout-1.3.4.ebuild
+++ b/dev-python/pytest-timeout/pytest-timeout-1.3.4.ebuild
@@ -14,7 +14,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 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pytest/pytest-5.4.3.ebuild b/dev-python/pytest/pytest-5.4.3.ebuild
index 4c72e2791f5e..ccf148d84c1f 100644
--- a/dev-python/pytest/pytest-5.4.3.ebuild
+++ b/dev-python/pytest/pytest-5.4.3.ebuild
@@ -14,7 +14,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 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/python-augeas/metadata.xml b/dev-python/python-augeas/metadata.xml
index da1ac8ae4ee4..46d2e6b0b637 100644
--- a/dev-python/python-augeas/metadata.xml
+++ b/dev-python/python-augeas/metadata.xml
@@ -4,6 +4,7 @@
   <maintainer type="person">
     <email>prometheanfire@gentoo.org</email>
   </maintainer>
+  <!-- ffi : not suitable for ALLARCHES -->
   <upstream>
     <remote-id type="pypi">python-augeas</remote-id>
     <remote-id type="github">hercules-team/python-augeas</remote-id>
diff --git a/dev-python/python-augeas/python-augeas-1.1.0.ebuild b/dev-python/python-augeas/python-augeas-1.1.0.ebuild
index b0bbb160fc25..7aaf992fbcaa 100644
--- a/dev-python/python-augeas/python-augeas-1.1.0.ebuild
+++ b/dev-python/python-augeas/python-augeas-1.1.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 RDEPEND="app-admin/augeas
 	>=dev-python/cffi-1.0.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/python-gnupg/metadata.xml b/dev-python/python-gnupg/metadata.xml
index 55a0782869eb..1f17a7447442 100644
--- a/dev-python/python-gnupg/metadata.xml
+++ b/dev-python/python-gnupg/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<longdescription>
 		This project implements a Python library, which takes care of the internal details
 		and allows its users to generate and manage keys,
diff --git a/dev-python/python-gnupg/python-gnupg-0.4.6.ebuild b/dev-python/python-gnupg/python-gnupg-0.4.6.ebuild
index b20e829162cb..d81a0ce28b22 100644
--- a/dev-python/python-gnupg/python-gnupg-0.4.6.ebuild
+++ b/dev-python/python-gnupg/python-gnupg-0.4.6.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="
 "
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 LICENSE="BSD"
 SLOT="0"
 
diff --git a/dev-python/python-magic/metadata.xml b/dev-python/python-magic/metadata.xml
index 35ac56ba5109..699795e12afd 100644
--- a/dev-python/python-magic/metadata.xml
+++ b/dev-python/python-magic/metadata.xml
@@ -9,6 +9,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">python-magic</remote-id>
     <remote-id type="github">ahupp/python-magic</remote-id>
diff --git a/dev-python/python-magic/python-magic-0.4.18.ebuild b/dev-python/python-magic/python-magic-0.4.18.ebuild
index c710d78be121..0577931aee79 100644
--- a/dev-python/python-magic/python-magic-0.4.18.ebuild
+++ b/dev-python/python-magic/python-magic-0.4.18.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/ahupp/python-magic/archive/${PV}.tar.gz -> ${P}.gh.t
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ppc ~ppc64 sparc x86 ~amd64-linux"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/python-mimeparse/metadata.xml b/dev-python/python-mimeparse/metadata.xml
index ff4eac1a85b8..06607dfb8564 100644
--- a/dev-python/python-mimeparse/metadata.xml
+++ b/dev-python/python-mimeparse/metadata.xml
@@ -5,6 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">python-mimeparse</remote-id>
     <remote-id type="github">dbtsai/python-mimeparse</remote-id>
diff --git a/dev-python/python-mimeparse/python-mimeparse-1.6.0-r1.ebuild b/dev-python/python-mimeparse/python-mimeparse-1.6.0-r1.ebuild
index 5f4d04cc79d4..e88366c25ada 100644
--- a/dev-python/python-mimeparse/python-mimeparse-1.6.0-r1.ebuild
+++ b/dev-python/python-mimeparse/python-mimeparse-1.6.0-r1.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 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 python_test() {
diff --git a/dev-python/python-musicbrainz-ngs/metadata.xml b/dev-python/python-musicbrainz-ngs/metadata.xml
index 650320521f8b..f4791a721910 100644
--- a/dev-python/python-musicbrainz-ngs/metadata.xml
+++ b/dev-python/python-musicbrainz-ngs/metadata.xml
@@ -14,6 +14,7 @@
 		With this library you can retrieve all kinds of music metadata from the MusicBrainz database.
 		The library can retrieve and submit both, the XML and JSON based webservice and provides the data in native Python.
 	</longdescription>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">alastair/python-musicbrainz-ngs</remote-id>
 	</upstream>
diff --git a/dev-python/python-musicbrainz-ngs/python-musicbrainz-ngs-0.7.1.ebuild b/dev-python/python-musicbrainz-ngs/python-musicbrainz-ngs-0.7.1.ebuild
index e3219d17cc98..d4d897c6847e 100644
--- a/dev-python/python-musicbrainz-ngs/python-musicbrainz-ngs-0.7.1.ebuild
+++ b/dev-python/python-musicbrainz-ngs/python-musicbrainz-ngs-0.7.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/alastair/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_PN}$
 
 LICENSE="BSD-2 ISC"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="examples"
 
 S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-python/python-stdnum/Manifest b/dev-python/python-stdnum/Manifest
index dc8ed2447838..257d9988cc66 100644
--- a/dev-python/python-stdnum/Manifest
+++ b/dev-python/python-stdnum/Manifest
@@ -1,2 +1 @@
-DIST python-stdnum-1.12.tar.gz 882778 BLAKE2B 49b0b83b8a76cf8963b35729b8acb1bb7f6cc8071cfee5490ba8f60fb2b74df28e11e65d9dafe6c717d297382628fe924ab5e193d8a39597cc214b98f12fa5dd SHA512 7eefc997494f538cddda8a6ca60d60c52e35f53023edd69b540c3f1aded00d795741ef429f84be6637e737e031b0ca771d4c1a060c94c90d7aa4144cdb0a536f
 DIST python-stdnum-1.13.tar.gz 893897 BLAKE2B e901a0b56d8ca4bcc25eade617af80bffce8f4b49a94dadefa7cf252edf567d01267256d3eaee77f01e41a99c0ffb26c80de1092f6437efdea2f115a9e997c80 SHA512 91bc476c0fec49627b772c43f031bcdfea044385256817d76a2fcff3aa76f26e85d308aab5262a682d54f67a1851907074b21d260e687f81c733326c40a0e0cf
diff --git a/dev-python/python-stdnum/metadata.xml b/dev-python/python-stdnum/metadata.xml
index a82254f51776..83e821b32edd 100644
--- a/dev-python/python-stdnum/metadata.xml
+++ b/dev-python/python-stdnum/metadata.xml
@@ -5,9 +5,6 @@
 		<email>cedk@gentoo.org</email>
 		<name>Cédric Krier</name>
 	</maintainer>
-	<longdescription lang="en">
-		A module to handle standardized numbers and codes
-	</longdescription>
 	<use>
 		<flag name="vies">Enable VIES</flag>
 	</use>
diff --git a/dev-python/python-stdnum/python-stdnum-1.12.ebuild b/dev-python/python-stdnum/python-stdnum-1.12.ebuild
deleted file mode 100644
index ccf5764af038..000000000000
--- a/dev-python/python-stdnum/python-stdnum-1.12.ebuild
+++ /dev/null
@@ -1,28 +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} )
-
-inherit distutils-r1
-
-DESCRIPTION="A module to handle standardized numbers and codes"
-HOMEPAGE="https://arthurdejong.org/python-stdnum/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="vies test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="vies? ( || ( dev-python/zeep dev-python/suds ) )"
-DEPEND="${DEPEND}
-	dev-python/setuptools
-	test? ( dev-python/nose )"
-
-DOCS=( ChangeLog NEWS README )
-
-python_test() {
-	nosetests -v || die
-}
diff --git a/dev-python/pytz/pytz-2020.1.ebuild b/dev-python/pytz/pytz-2020.1.ebuild
index bb3fba0df7a6..802b437f99de 100644
--- a/dev-python/pytz/pytz-2020.1.ebuild
+++ b/dev-python/pytz/pytz-2020.1.ebuild
@@ -14,7 +14,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 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-python/readme_renderer/metadata.xml b/dev-python/readme_renderer/metadata.xml
index 9b9b1e5023c5..425b5185d9ff 100644
--- a/dev-python/readme_renderer/metadata.xml
+++ b/dev-python/readme_renderer/metadata.xml
@@ -5,6 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">readme_renderer</remote-id>
     <remote-id type="github">pypa/readme_renderer</remote-id>
diff --git a/dev-python/readme_renderer/readme_renderer-26.0.ebuild b/dev-python/readme_renderer/readme_renderer-26.0.ebuild
index 0c920278102f..fcacfe519262 100644
--- a/dev-python/readme_renderer/readme_renderer-26.0.ebuild
+++ b/dev-python/readme_renderer/readme_renderer-26.0.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 ~ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 sparc x86"
 
 RDEPEND="
 	>=dev-python/bleach-2.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/readthedocs-sphinx-ext/metadata.xml b/dev-python/readthedocs-sphinx-ext/metadata.xml
index 36d2114697c0..1bb5cfb5de01 100644
--- a/dev-python/readthedocs-sphinx-ext/metadata.xml
+++ b/dev-python/readthedocs-sphinx-ext/metadata.xml
@@ -5,5 +5,6 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
 	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-1.0.4.ebuild b/dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-1.0.4.ebuild
index c7a7c240b8a1..567b537bd0d8 100644
--- a/dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-1.0.4.ebuild
+++ b/dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-1.0.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${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"
 
 RDEPEND="
 	>=dev-python/jinja-2.9[${PYTHON_USEDEP}]
diff --git a/dev-python/regex/regex-2020.4.4.ebuild b/dev-python/regex/regex-2020.4.4.ebuild
index 44c501e0bde3..df84ba0ce0e7 100644
--- a/dev-python/regex/regex-2020.4.4.ebuild
+++ b/dev-python/regex/regex-2020.4.4.ebuild
@@ -13,7 +13,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 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE="doc"
 
 PATCHES=(
diff --git a/dev-python/requests-mock/metadata.xml b/dev-python/requests-mock/metadata.xml
index b16ae78f1ada..df6b777b2db1 100644
--- a/dev-python/requests-mock/metadata.xml
+++ b/dev-python/requests-mock/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">requests-mock</remote-id>
 		<remote-id type="github">jamielennox/requests-mock</remote-id>
diff --git a/dev-python/requests-mock/requests-mock-1.8.0.ebuild b/dev-python/requests-mock/requests-mock-1.8.0.ebuild
index 42274f9c5c61..cbd54d1e0fa7 100644
--- a/dev-python/requests-mock/requests-mock-1.8.0.ebuild
+++ b/dev-python/requests-mock/requests-mock-1.8.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 
 RDEPEND="
 	>=dev-python/requests-2.3[${PYTHON_USEDEP}]
diff --git a/dev-python/responses/metadata.xml b/dev-python/responses/metadata.xml
index a68196fa3597..8d9f1043641d 100644
--- a/dev-python/responses/metadata.xml
+++ b/dev-python/responses/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">responses</remote-id>
 		<remote-id type="github">getsentry/responses</remote-id>
diff --git a/dev-python/responses/responses-0.10.14.ebuild b/dev-python/responses/responses-0.10.14.ebuild
index 98543821590c..aa7f8d6ba7e1 100644
--- a/dev-python/responses/responses-0.10.14.ebuild
+++ b/dev-python/responses/responses-0.10.14.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/restructuredtext-lint/metadata.xml b/dev-python/restructuredtext-lint/metadata.xml
index 39a5ef85787f..d82979bb7b1c 100644
--- a/dev-python/restructuredtext-lint/metadata.xml
+++ b/dev-python/restructuredtext-lint/metadata.xml
@@ -5,6 +5,7 @@
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">restructuredtext_lint</remote-id>
 	</upstream>
diff --git a/dev-python/restructuredtext-lint/restructuredtext-lint-1.3.0.ebuild b/dev-python/restructuredtext-lint/restructuredtext-lint-1.3.0.ebuild
index 242393a065d7..6e6ed25ed5f2 100644
--- a/dev-python/restructuredtext-lint/restructuredtext-lint-1.3.0.ebuild
+++ b/dev-python/restructuredtext-lint/restructuredtext-lint-1.3.0.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_P}-${PV}"
 
 LICENSE="Unlicense"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/retry-decorator/metadata.xml b/dev-python/retry-decorator/metadata.xml
index 1a09d0aea7e3..4ec7e0ee4253 100644
--- a/dev-python/retry-decorator/metadata.xml
+++ b/dev-python/retry-decorator/metadata.xml
@@ -5,6 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="github">pnpnpn/retry-decorator</remote-id>
   </upstream>
diff --git a/dev-python/retry-decorator/retry-decorator-1.1.1.ebuild b/dev-python/retry-decorator/retry-decorator-1.1.1.ebuild
index 8b25b6b0f21a..d3f2b05d7ed7 100644
--- a/dev-python/retry-decorator/retry-decorator-1.1.1.ebuild
+++ b/dev-python/retry-decorator/retry-decorator-1.1.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/pnpnpn/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 arm x86"
+KEYWORDS="amd64 arm x86"
 
 DOCS=( README.rst )
 
diff --git a/dev-python/rst-linker/metadata.xml b/dev-python/rst-linker/metadata.xml
index da82767a2185..58dc748a3e13 100644
--- a/dev-python/rst-linker/metadata.xml
+++ b/dev-python/rst-linker/metadata.xml
@@ -5,6 +5,7 @@
 		<email>sbraz@gentoo.org</email>
 		<name>Louis Sautier</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">rst.linker</remote-id>
 		<remote-id type="github">jaraco/rst.linker</remote-id>
diff --git a/dev-python/rst-linker/rst-linker-2.0.0.ebuild b/dev-python/rst-linker/rst-linker-2.0.0.ebuild
index 50473ae3f811..fd3f73e3d1f0 100644
--- a/dev-python/rst-linker/rst-linker-2.0.0.ebuild
+++ b/dev-python/rst-linker/rst-linker-2.0.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/scikit-build/scikit-build-0.11.1.ebuild b/dev-python/scikit-build/scikit-build-0.11.1.ebuild
index 8b6abb1d53b5..3bd6a0f748de 100644
--- a/dev-python/scikit-build/scikit-build-0.11.1.ebuild
+++ b/dev-python/scikit-build/scikit-build-0.11.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm64 ~ppc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
 
 RDEPEND="
 	dev-python/distro[${PYTHON_USEDEP}]
diff --git a/dev-python/scrypt/scrypt-0.8.15.ebuild b/dev-python/scrypt/scrypt-0.8.15.ebuild
index f7787cd374b2..d7752a024388 100644
--- a/dev-python/scrypt/scrypt-0.8.15.ebuild
+++ b/dev-python/scrypt/scrypt-0.8.15.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://github.com/holgern/py-scrypt/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
 SLOT="0"
 IUSE="libressl"
 
diff --git a/dev-python/secretstorage/metadata.xml b/dev-python/secretstorage/metadata.xml
index c25b03991500..575776d9e016 100644
--- a/dev-python/secretstorage/metadata.xml
+++ b/dev-python/secretstorage/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">SecretStorage</remote-id>
 		<remote-id type="github">mitya57/secretstorage</remote-id>
diff --git a/dev-python/secretstorage/secretstorage-3.1.2.ebuild b/dev-python/secretstorage/secretstorage-3.1.2.ebuild
index 16c2b55f5472..a7f6e63fccda 100644
--- a/dev-python/secretstorage/secretstorage-3.1.2.ebuild
+++ b/dev-python/secretstorage/secretstorage-3.1.2.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/cryptography[${PYTHON_USEDEP}]
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index eccc5922da1f..74a623d3abc2 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -4,3 +4,4 @@ DIST setuptools-46.4.0.zip 865912 BLAKE2B 452d36132f5648c79c7e1616a93ff6a39ab2f6
 DIST setuptools-47.1.1.zip 870277 BLAKE2B 0ba55f2b51011d4f98a554a959227dba83a79e7369a3cd54450a1d18cb378bf7cfaffc1aa25b0ee11760e917d6f74891f0a63e43478893ca4327e0f5135267dc SHA512 053ffd4c26bf0cf1894754b1ed922be03c6fa2cb54a41e3d28a7d8f7a2fdf2ccebbca4e0bafa16eed476923ef70cf4294ed36df6e77603b2fae0a09b684132c4
 DIST setuptools-47.3.1.zip 869963 BLAKE2B cecc4d43ce09708c2454c20064baf8b5597aff29bf069a859ec7d6a91588456455df611f962cb90650b23ba269bbedcb81dff568b4498431cfa20f46ece828dd SHA512 05d8ac5e1612f0c22d9f51b5dbb22cdd1edfd9c15e97c5f31f6dee8d660e6ca19720cee5169158d0179baa87518766fda1cd2e4d5c69f683e973a9ff08155d48
 DIST setuptools-49.1.0.zip 2170689 BLAKE2B fa5f9a8955ac4206396c653a3c6b5926aeb7f6f4052de7b67698ad39edd3d49c7bad13bc65720b5a40a906d06eaf3e6918cfbc20a2a59e100f75400c2caa17df SHA512 a5734742a6d2409f41c62f29dea35c58f480756ef8a66f70aaa607a6927a64487f92d20def6791860ee508e713b44d800e41e2cf8b5abcffd7e1ed1058374efe
+DIST setuptools-49.1.1.zip 2173825 BLAKE2B 44a23a2bb8613b2dcf2368997c7d89ffbd957d7004c1872bbb64631955e5e8ed2f14a49d16fff4c384c42d56b486eb2ee07f2a3e3e72add97502f39309a17fee SHA512 d33c291edb64d015530e3bd66666a612539896018c5f6b6eff65719339ec75967c4f6200be36a60955f885ebc4cb86f9acd5f52d8fd2e1fb1e4919488a986603
diff --git a/dev-python/setuptools/setuptools-49.1.1.ebuild b/dev-python/setuptools/setuptools-49.1.1.ebuild
new file mode 100644
index 000000000000..3f1c94d2fb6d
--- /dev/null
+++ b/dev-python/setuptools/setuptools-49.1.1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Collection of extensions to Distutils"
+HOMEPAGE="https://github.com/pypa/setuptools https://pypi.org/project/setuptools/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
+
+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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	app-arch/unzip
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pip[${PYTHON_USEDEP}]
+		>=dev-python/pytest-3.7.0[${PYTHON_USEDEP}]
+		dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
+		dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
+		dev-python/wheel[${PYTHON_USEDEP}]
+	)
+"
+PDEPEND="
+	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]"
+
+# Force in-source build because build system modifies sources.
+DISTUTILS_IN_SOURCE_BUILD=1
+
+DOCS=( {CHANGES,README}.rst docs/{easy_install.txt,pkg_resources.txt,setuptools.txt} )
+
+python_prepare_all() {
+	# disable tests requiring a network connection
+	rm setuptools/tests/test_packageindex.py || die
+
+	# don't run integration tests
+	rm setuptools/tests/test_integration.py || die
+
+	# xpass-es for me on py3
+	#sed -e '/xfail.*710/s:(:(six.PY2, :' \
+	#	-i setuptools/tests/test_archive_util.py || die
+
+	# avoid pointless dep on flake8
+	sed -i -e 's:--flake8::' -e 's:--cov::' pytest.ini || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	distutils_install_for_testing
+	# test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
+	# It tries to sandbox the test in a tempdir
+	HOME="${PWD}" pytest -vv ${PN} || die "Tests failed under ${EPYTHON}"
+}
+
+python_install() {
+	export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
+	distutils-r1_python_install
+}
diff --git a/dev-python/setuptools_scm/setuptools_scm-4.1.2.ebuild b/dev-python/setuptools_scm/setuptools_scm-4.1.2.ebuild
index bc5b3d0b25a9..c00fd3c90d9f 100644
--- a/dev-python/setuptools_scm/setuptools_scm-4.1.2.ebuild
+++ b/dev-python/setuptools_scm/setuptools_scm-4.1.2.ebuild
@@ -14,7 +14,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 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/setuptools_scm_git_archive/metadata.xml b/dev-python/setuptools_scm_git_archive/metadata.xml
index 99bb4564b618..3784e55986d4 100644
--- a/dev-python/setuptools_scm_git_archive/metadata.xml
+++ b/dev-python/setuptools_scm_git_archive/metadata.xml
@@ -5,5 +5,6 @@
 		<email>pacho@gentoo.org</email>
 		<name>Pacho Ramos</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/dev-python/setuptools_scm_git_archive/setuptools_scm_git_archive-1.1.ebuild b/dev-python/setuptools_scm_git_archive/setuptools_scm_git_archive-1.1.ebuild
index e187d19e5ea0..152a88835a2e 100644
--- a/dev-python/setuptools_scm_git_archive/setuptools_scm_git_archive-1.1.ebuild
+++ b/dev-python/setuptools_scm_git_archive/setuptools_scm_git_archive-1.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/Changaco/setuptools_scm_git_archive/archive/${PV}.ta
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/dev-python/simpleeval/metadata.xml b/dev-python/simpleeval/metadata.xml
index 5da8325e66bd..bc0cffed74e7 100644
--- a/dev-python/simpleeval/metadata.xml
+++ b/dev-python/simpleeval/metadata.xml
@@ -8,6 +8,7 @@
 	<longdescription lang="en">
 		A simple, safe single expression evaluator library.
 	</longdescription>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">simpleeval</remote-id>
 		<remote-id type="github">danthedeckie/simpleeval</remote-id>
diff --git a/dev-python/simpleeval/simpleeval-0.9.10.ebuild b/dev-python/simpleeval/simpleeval-0.9.10.ebuild
index 44b583bf782b..406fe902d731 100644
--- a/dev-python/simpleeval/simpleeval-0.9.10.ebuild
+++ b/dev-python/simpleeval/simpleeval-0.9.10.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/s/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-python/socketpool/metadata.xml b/dev-python/socketpool/metadata.xml
index 6a7870287d93..85647b203816 100644
--- a/dev-python/socketpool/metadata.xml
+++ b/dev-python/socketpool/metadata.xml
@@ -5,6 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">socketpool</remote-id>
     <remote-id type="github">benoitc/socketpool</remote-id>
diff --git a/dev-python/socketpool/socketpool-0.5.3-r3.ebuild b/dev-python/socketpool/socketpool-0.5.3-r3.ebuild
index b3454edf19d2..877684aeb05c 100644
--- a/dev-python/socketpool/socketpool-0.5.3-r3.ebuild
+++ b/dev-python/socketpool/socketpool-0.5.3-r3.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="A simple Python socket pool"
 HOMEPAGE="https://github.com/benoitc/socketpool/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
 IUSE="eventlet examples gevent"
 LICENSE="|| ( MIT public-domain )"
 SLOT="0"
diff --git a/dev-python/sortedcontainers/sortedcontainers-2.2.1.ebuild b/dev-python/sortedcontainers/sortedcontainers-2.2.1.ebuild
index b012078b6af1..618843659555 100644
--- a/dev-python/sortedcontainers/sortedcontainers-2.2.1.ebuild
+++ b/dev-python/sortedcontainers/sortedcontainers-2.2.1.ebuild
@@ -18,7 +18,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/soupsieve/metadata.xml b/dev-python/soupsieve/metadata.xml
index 8739fec819c7..4d1d294cd22c 100644
--- a/dev-python/soupsieve/metadata.xml
+++ b/dev-python/soupsieve/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">soupsieve</remote-id>
 		<remote-id type="github">facelessuser/soupsieve</remote-id>
diff --git a/dev-python/soupsieve/soupsieve-2.0.1.ebuild b/dev-python/soupsieve/soupsieve-2.0.1.ebuild
index bc7d0fd6f292..76a1517833f3 100644
--- a/dev-python/soupsieve/soupsieve-2.0.1.ebuild
+++ b/dev-python/soupsieve/soupsieve-2.0.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="test"
 RESTRICT+=" !test? ( test )"
 
diff --git a/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.4.3-r1.ebuild b/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.4.3-r1.ebuild
index 753ef35d3449..a05d04aae2a6 100644
--- a/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.4.3-r1.ebuild
+++ b/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.4.3-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${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"
 IUSE=""
 
 PDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]"
diff --git a/dev-python/sphinxcontrib-github-alt/metadata.xml b/dev-python/sphinxcontrib-github-alt/metadata.xml
index f77365a6d425..d446b4906ae1 100644
--- a/dev-python/sphinxcontrib-github-alt/metadata.xml
+++ b/dev-python/sphinxcontrib-github-alt/metadata.xml
@@ -5,6 +5,7 @@
 		<email>sci@gentoo.org</email>
 		<name>Gentoo Science Project</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">jupyter/sphinxcontrib_github_alt</remote-id>
 		<remote-id type="pypi">sphinxcontrib_github_alt</remote-id>
diff --git a/dev-python/sphinxcontrib-github-alt/sphinxcontrib-github-alt-1.1-r2.ebuild b/dev-python/sphinxcontrib-github-alt/sphinxcontrib-github-alt-1.1-r2.ebuild
index 9e73c8a3891a..c5637fb5d8ae 100644
--- a/dev-python/sphinxcontrib-github-alt/sphinxcontrib-github-alt-1.1-r2.ebuild
+++ b/dev-python/sphinxcontrib-github-alt/sphinxcontrib-github-alt-1.1-r2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/jupyter/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa x86"
 
 RDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]"
 BDEPEND=${RDEPEND}
diff --git a/dev-python/sphinxcontrib-httpdomain/metadata.xml b/dev-python/sphinxcontrib-httpdomain/metadata.xml
index 28ff8a60ac0a..3383b11c11f6 100644
--- a/dev-python/sphinxcontrib-httpdomain/metadata.xml
+++ b/dev-python/sphinxcontrib-httpdomain/metadata.xml
@@ -5,6 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">sphinxcontrib-httpdomain</remote-id>
     <remote-id type="bitbucket">birkenfeld/sphinx-contrib</remote-id>
diff --git a/dev-python/sphinxcontrib-httpdomain/sphinxcontrib-httpdomain-1.7.0.ebuild b/dev-python/sphinxcontrib-httpdomain/sphinxcontrib-httpdomain-1.7.0.ebuild
index e32ceb4b4b6e..7db673b1b09d 100644
--- a/dev-python/sphinxcontrib-httpdomain/sphinxcontrib-httpdomain-1.7.0.ebuild
+++ b/dev-python/sphinxcontrib-httpdomain/sphinxcontrib-httpdomain-1.7.0.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN#sphinxcontrib-}-${PV}"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/sphinx[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinxcontrib-serializinghtml/metadata.xml b/dev-python/sphinxcontrib-serializinghtml/metadata.xml
index d58db490b19d..87163d59bfe9 100644
--- a/dev-python/sphinxcontrib-serializinghtml/metadata.xml
+++ b/dev-python/sphinxcontrib-serializinghtml/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">sphinxcontrib-serializinghtml</remote-id>
 	</upstream>
diff --git a/dev-python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-1.1.4.ebuild b/dev-python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-1.1.4.ebuild
index b4f1ac0f75ee..127ed1ee7e54 100644
--- a/dev-python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-1.1.4.ebuild
+++ b/dev-python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-1.1.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 
 RDEPEND="dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]"
 PDEPEND="
diff --git a/dev-python/sphinxcontrib-spelling/metadata.xml b/dev-python/sphinxcontrib-spelling/metadata.xml
index 7570288eed92..87b6e1c9c784 100644
--- a/dev-python/sphinxcontrib-spelling/metadata.xml
+++ b/dev-python/sphinxcontrib-spelling/metadata.xml
@@ -4,6 +4,7 @@
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">sphinxcontrib-spelling</remote-id>
 		<remote-id type="bitbucket">dhellmann/sphinxcontrib-spelling</remote-id>
diff --git a/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-5.1.0.ebuild b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-5.1.0.ebuild
index e1ae889909ca..4eef4eb94bf6 100644
--- a/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-5.1.0.ebuild
+++ b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-5.1.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 arm ~arm64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.2.2.ebuild b/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.2.2.ebuild
index c1e9063d535d..298a43160ac9 100644
--- a/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.2.2.ebuild
+++ b/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.2.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/sphinx-doc/sphinxcontrib-websupport/archive/${PV}.ta
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
 
 RDEPEND="
 	>=dev-python/six-1.5[${PYTHON_USEDEP}]
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.3.17.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.3.17.ebuild
index a75288603a42..c8bafb40a592 100644
--- a/dev-python/sqlalchemy/sqlalchemy-1.3.17.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-1.3.17.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
 
 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 ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 IUSE="examples +sqlite test"
 
 REQUIRED_USE="test? ( sqlite )"
diff --git a/dev-python/sshtunnel/metadata.xml b/dev-python/sshtunnel/metadata.xml
index 40edd4d0c872..df348ff5160c 100644
--- a/dev-python/sshtunnel/metadata.xml
+++ b/dev-python/sshtunnel/metadata.xml
@@ -5,5 +5,6 @@
 		<email>titanofold@gentoo.org</email>
 		<name>Aaron W. Swenson</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/dev-python/stevedore/Manifest b/dev-python/stevedore/Manifest
index cad34e96020a..dac723d94840 100644
--- a/dev-python/stevedore/Manifest
+++ b/dev-python/stevedore/Manifest
@@ -1,2 +1,3 @@
 DIST stevedore-1.31.0.tar.gz 505482 BLAKE2B c69ecf61b32ab996f23aa913a9f226f64164b94e9420da8b7dd5a8ba568a228bd2f536052ab9378167fd2fe2e0d8d7b42515580a966eeffb5beeaf55dbba69ad SHA512 07b641b63766eddd094690acad81c1417a9721d785f81ca11da0ec2afed455d1beedfea5be4dcfd833d9379d650b193e26207ec0411d274bdf399ea2acd321a0
 DIST stevedore-2.0.1.tar.gz 505248 BLAKE2B 2fee9467b70aa605ca89060e839a2c00deec571f15f014cb8118710e9221fef65ec15172d727dbafb5d5e2adf15ce0e94919804e2ec7ee72ae9e47afe2a6b88f SHA512 1efe46983975b1a0f176f847874c68dd91538fc3c029facbbf0f96891894176e0eeaf28c19e674baa9e9dae024deabae0555c846e36211a9be6cbba5e2ecd710
+DIST stevedore-3.0.0.tar.gz 510351 BLAKE2B c73a6baaa4179f8bd45bae92491fa6f87d63594fa245f58f297526a277c7b40f5548526029144da4f18f0df71dcbbdc3620d7dd635db700ad98b597b797c4648 SHA512 5970d13b7986e0f0e0cb6dc30eef8a4a75c6d7122bbf7123f71a9d66bcbd16725a50345217552206506960df1eadbf4e0c04fa6f2cfc25362ed347ebff25d5b6
diff --git a/dev-python/stevedore/stevedore-3.0.0.ebuild b/dev-python/stevedore/stevedore-3.0.0.ebuild
new file mode 100644
index 000000000000..59c0193fbb34
--- /dev/null
+++ b/dev-python/stevedore/stevedore-3.0.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Manage dynamic plugins for Python applications"
+HOMEPAGE="https://github.com/openstack/stevedore https://pypi.org/project/stevedore/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_metadata-1.7.0[${PYTHON_USEDEP}]
+	' python3_{6,7})
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	test? (
+		dev-python/testtools[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
+distutils_enable_sphinx 'doc/source' \
+	'>=dev-python/openstackdocstheme-1.18.1' \
+	'>=dev-python/reno-2.5.0' \
+	'>=dev-python/sphinx-2.0.0'
+
+python_prepare_all() {
+	# Delete spurious data in requirements.txt
+	sed -e '/^pbr/d' -i requirements.txt || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/subunit/subunit-1.4.0.ebuild b/dev-python/subunit/subunit-1.4.0.ebuild
index 5a5855e2c22e..e8e3de46c001 100644
--- a/dev-python/subunit/subunit-1.4.0.ebuild
+++ b/dev-python/subunit/subunit-1.4.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
 
 LICENSE="Apache-2.0 BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
 IUSE="static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/tappy/metadata.xml b/dev-python/tappy/metadata.xml
index 87ee7447c8b4..e477739a28e7 100644
--- a/dev-python/tappy/metadata.xml
+++ b/dev-python/tappy/metadata.xml
@@ -4,6 +4,7 @@
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 	</maintainer>
+	<stabilize-allarches/>
 	<use>
 		<flag name='yaml'>Pull dependencies needed to support YAML
 			blocks associated with test results.</flag>
diff --git a/dev-python/tappy/tappy-3.0.ebuild b/dev-python/tappy/tappy-3.0.ebuild
index 337da3b2d0b6..eadd7f6683bc 100644
--- a/dev-python/tappy/tappy-3.0.ebuild
+++ b/dev-python/tappy/tappy-3.0.ebuild
@@ -15,7 +15,7 @@ S=${WORKDIR}/${MY_PN}-${PV}
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="yaml"
 
 RDEPEND="
diff --git a/dev-python/testtools/metadata.xml b/dev-python/testtools/metadata.xml
index 15f67fc48bf8..bf5a1eaea256 100644
--- a/dev-python/testtools/metadata.xml
+++ b/dev-python/testtools/metadata.xml
@@ -9,6 +9,7 @@
     <email>openstack@gentoo.org</email>
     <name>Openstack</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">testtools</remote-id>
     <remote-id type="github">testing-cabal/testtools</remote-id>
diff --git a/dev-python/testtools/testtools-2.4.0.ebuild b/dev-python/testtools/testtools-2.4.0.ebuild
index 41097304bed4..0046a6e88530 100644
--- a/dev-python/testtools/testtools-2.4.0.ebuild
+++ b/dev-python/testtools/testtools-2.4.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/extras-1.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/toml/metadata.xml b/dev-python/toml/metadata.xml
index 58692bb02b1c..47f82444f5a2 100644
--- a/dev-python/toml/metadata.xml
+++ b/dev-python/toml/metadata.xml
@@ -5,6 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="github">uiri/toml</remote-id>
   </upstream>
diff --git a/dev-python/toml/toml-0.10.1.ebuild b/dev-python/toml/toml-0.10.1.ebuild
index f4f8bdf13905..e17ce0ef4b9c 100644
--- a/dev-python/toml/toml-0.10.1.ebuild
+++ b/dev-python/toml/toml-0.10.1.ebuild
@@ -17,7 +17,7 @@ IUSE="test"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 
 BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
diff --git a/dev-python/transitions/metadata.xml b/dev-python/transitions/metadata.xml
index b37717a667e3..fa8f71e381e3 100644
--- a/dev-python/transitions/metadata.xml
+++ b/dev-python/transitions/metadata.xml
@@ -11,6 +11,7 @@
 		It is an abstract machine that can be in exactly one of a
 		finite number of states at any given time.
 	</longdescription>
+	<stabilize-allarches/>
 	<upstream>
 		<bugs-to>https://github.com/pytransitions/transitions/issues</bugs-to>
 		<remote-id type="github">pytransitions/transitions</remote-id>
diff --git a/dev-python/typing/Manifest b/dev-python/typing/Manifest
index 64205e5cdf8e..909e775b628b 100644
--- a/dev-python/typing/Manifest
+++ b/dev-python/typing/Manifest
@@ -1 +1,2 @@
 DIST typing-3.7.4.1.tar.gz 77982 BLAKE2B e770b1c028142a70799732159b295d3bd5c4911619fd5f200567f8b27813d86de643e9b79aa45fba8590c1e2a6c96c1411dabd0707190a237a79f6f11851e1e0 SHA512 5f5080bf66b1de094b7984ed3d1de22651de8ca018ffde927dfa67fe65b13f91602a877faa24e73d44558638b609be276b924b894d63999bb93b0657a2d5ec6e
+DIST typing-3.7.4.2.tar.gz 78588 BLAKE2B 0e5174d3bee9315cf011f461c7baaaa4cc2bbd7b27d9148bb17df1c2160e4e79298761b75381b8871395acd2be4490f2ad2bfbae55c69708e94c73a48de6cc6a SHA512 69c172efcfd9a284528007dc0c7df290aed8317d2225c1200eba35138ff1d55503d6c6aa70b4b246b45ac5fbeca82f48efa784cc095a3b0dacefd481fa0b0266
diff --git a/dev-python/typing/typing-3.7.4.2.ebuild b/dev-python/typing/typing-3.7.4.2.ebuild
new file mode 100644
index 000000000000..2910bb8fc386
--- /dev/null
+++ b/dev-python/typing/typing-3.7.4.2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Type Hints for Python"
+HOMEPAGE="https://docs.python.org/3/library/typing.html https://pypi.org/project/typing/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	# broken on PyPy, unclear if CPython behavior is not a bug
+	# https://github.com/python/typing/issues/671
+	sed -i -e 's:test_new_no_args:_&:' python2/test_typing.py || die
+}
+
+python_test() {
+	if python_is_python3; then
+		cd "${S}"/src || die
+	else
+		cd "${S}"/python2 || die
+	fi
+
+	"${EPYTHON}" test_typing.py -v || die "tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/tzlocal/metadata.xml b/dev-python/tzlocal/metadata.xml
index a2caed25bc2a..4b46d88d6c45 100644
--- a/dev-python/tzlocal/metadata.xml
+++ b/dev-python/tzlocal/metadata.xml
@@ -5,6 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">tzlocal</remote-id>
     <remote-id type="github">regebro/tzlocal</remote-id>
diff --git a/dev-python/tzlocal/tzlocal-2.1.ebuild b/dev-python/tzlocal/tzlocal-2.1.ebuild
index 7a96f8fc69f5..6bda305afd91 100644
--- a/dev-python/tzlocal/tzlocal-2.1.ebuild
+++ b/dev-python/tzlocal/tzlocal-2.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/regebro/tzlocal/archive/${PV}.tar.gz -> ${P}.gh.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE=""
 
 RDEPEND="dev-python/pytz[${PYTHON_USEDEP}]"
diff --git a/dev-python/u-msgpack/u-msgpack-2.6.0.ebuild b/dev-python/u-msgpack/u-msgpack-2.6.0.ebuild
index 535f0483d107..74629fa79f8d 100644
--- a/dev-python/u-msgpack/u-msgpack-2.6.0.ebuild
+++ b/dev-python/u-msgpack/u-msgpack-2.6.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/dev-python/ujson/ujson-3.0.0.ebuild b/dev-python/ujson/ujson-3.0.0.ebuild
index 4cb2eb8ecc3d..bb229f966044 100644
--- a/dev-python/ujson/ujson-3.0.0.ebuild
+++ b/dev-python/ujson/ujson-3.0.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 arm ~arm64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/urllib3/metadata.xml b/dev-python/urllib3/metadata.xml
index 3360d05d94eb..4912e8d3eca4 100644
--- a/dev-python/urllib3/metadata.xml
+++ b/dev-python/urllib3/metadata.xml
@@ -5,6 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <use>
     <flag name="brotli">Enable support for brotli compression</flag>
   </use>
diff --git a/dev-python/urllib3/urllib3-1.25.9.ebuild b/dev-python/urllib3/urllib3-1.25.9.ebuild
index 13f413e8d83d..c87a3daf125b 100644
--- a/dev-python/urllib3/urllib3-1.25.9.ebuild
+++ b/dev-python/urllib3/urllib3-1.25.9.ebuild
@@ -14,7 +14,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 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
 IUSE="brotli test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/vdf/metadata.xml b/dev-python/vdf/metadata.xml
index a4e3a71fefc3..5571a30af241 100644
--- a/dev-python/vdf/metadata.xml
+++ b/dev-python/vdf/metadata.xml
@@ -5,6 +5,7 @@
 		<email>marecki@gentoo.org</email>
 		<name>Marek Szuba</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">ValvePython/vdf</remote-id>
 		<remote-id type="pypi">vdf</remote-id>
diff --git a/dev-python/vdf/vdf-3.2-r1.ebuild b/dev-python/vdf/vdf-3.2-r1.ebuild
index 2c3eaf316de0..b6e5d4b670c0 100644
--- a/dev-python/vdf/vdf-3.2-r1.ebuild
+++ b/dev-python/vdf/vdf-3.2-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://codeload.github.com/ValvePython/${PN}/tar.gz/v${PV} -> ${P}.tar
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.2-mock_from_stdlib.patch
diff --git a/dev-python/virtualenv/virtualenv-20.0.26.ebuild b/dev-python/virtualenv/virtualenv-20.0.26.ebuild
index f661496fa575..a8a3d84852f0 100644
--- a/dev-python/virtualenv/virtualenv-20.0.26.ebuild
+++ b/dev-python/virtualenv/virtualenv-20.0.26.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 SLOT="0"
 IUSE="test"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/xmlschema/xmlschema-1.1.3.ebuild b/dev-python/xmlschema/xmlschema-1.1.3.ebuild
index 8a05f1851e64..627c81fd350c 100644
--- a/dev-python/xmlschema/xmlschema-1.1.3.ebuild
+++ b/dev-python/xmlschema/xmlschema-1.1.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 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"
 IUSE="test"
 RESTRICT="!test? ( test )"