Adding metadata

69 files changed, 282 insertions, 426 deletions

diff --git a/dev-python/Babel/Babel-2.9.1.ebuild b/dev-python/Babel/Babel-2.9.1.ebuild
index 8737377e7315..d852781aa19c 100644
--- a/dev-python/Babel/Babel-2.9.1.ebuild
+++ b/dev-python/Babel/Babel-2.9.1.ebuild
@@ -5,7 +5,6 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
 PYTHON_REQ_USE="threads(+)"
-DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
 
diff --git a/dev-python/PyRSS2Gen/PyRSS2Gen-1.1-r1.ebuild b/dev-python/PyRSS2Gen/PyRSS2Gen-1.1-r1.ebuild
index fee6c51ef8b2..b9c17e2dd2de 100644
--- a/dev-python/PyRSS2Gen/PyRSS2Gen-1.1-r1.ebuild
+++ b/dev-python/PyRSS2Gen/PyRSS2Gen-1.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/dev-python/QtPy/QtPy-1.9.0-r2.ebuild b/dev-python/QtPy/QtPy-1.9.0-r2.ebuild
index f0679d11bb57..81f25208b388 100644
--- a/dev-python/QtPy/QtPy-1.9.0-r2.ebuild
+++ b/dev-python/QtPy/QtPy-1.9.0-r2.ebuild
@@ -29,6 +29,7 @@ RDEPEND="
 # is available and all tests are run.
 BDEPEND="
 	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
 		dev-python/PyQt5[${PYTHON_USEDEP},bluetooth,dbus,declarative,designer,gui,help,location,multimedia,network,networkauth,opengl,positioning,printsupport,sensors,serialport,sql,ssl,svg,testlib,webchannel,webkit,websockets,widgets,x11extras,xml(+),xmlpatterns]
 		dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
 	)"
diff --git a/dev-python/alabaster/alabaster-0.7.12.ebuild b/dev-python/alabaster/alabaster-0.7.12.ebuild
index f033278761d1..73cc1e9d43e3 100644
--- a/dev-python/alabaster/alabaster-0.7.12.ebuild
+++ b/dev-python/alabaster/alabaster-0.7.12.ebuild
@@ -4,7 +4,6 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-DISTUTILS_USE_SETUPTOOLS=bdepend
 
 inherit distutils-r1
 
@@ -13,5 +12,5 @@ HOMEPAGE="https://github.com/bitprophet/alabaster"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-solaris"
 SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-solaris"
diff --git a/dev-python/boto3/boto3-1.17.74.ebuild b/dev-python/boto3/boto3-1.17.74.ebuild
index 44a93990e955..511fc98f5fff 100644
--- a/dev-python/boto3/boto3-1.17.74.ebuild
+++ b/dev-python/boto3/boto3-1.17.74.ebuild
@@ -17,7 +17,7 @@ if [[ "${PV}" == "9999" ]]; then
 	BOTOCORE_PV=${PV}
 else
 	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 	# botocore is x.(y+3).z
 	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
diff --git a/dev-python/botocore/botocore-1.20.74.ebuild b/dev-python/botocore/botocore-1.20.74.ebuild
index ccbbb69fab47..ca62b7dad65f 100644
--- a/dev-python/botocore/botocore-1.20.74.ebuild
+++ b/dev-python/botocore/botocore-1.20.74.ebuild
@@ -16,7 +16,7 @@ if [[ "${PV}" == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 
 RDEPEND="
diff --git a/dev-python/cfn-python-lint/Manifest b/dev-python/cfn-python-lint/Manifest
index 16480d9935b4..d2160d438d81 100644
--- a/dev-python/cfn-python-lint/Manifest
+++ b/dev-python/cfn-python-lint/Manifest
@@ -1,3 +1,4 @@
+DIST cfn-lint-0.49.2.tar.gz 7012647 BLAKE2B 1508c7c2c400ea4fdd878961a00d79b6c464de70f6ff5269069c73d4c524317e37e9431fba0a686da16958b7c575d4d3629a83c31c3f89d81a68f5c320355b14 SHA512 7e7b97d727b06649b2a56b67f1251c24df2646c9759821a7525842796a81e834f560fe5a09431220ead9fd68ad0fa9978a65bb1d9bdeab907aba0a76095fd712
 DIST cfn-python-lint-0.48.3.tar.gz 6758651 BLAKE2B a8aeaffb0791789b25c94c630532ced223432f9902cf60664e4b111d162b4379d6307eda5c8f8074f7d2917ff25f44657016894b2140c8ea1dbf3259b24dde38 SHA512 ab1555719edb9b3541bfe60ce2701cca9e2ab9f4627c1b46ab8f4920477531f56f14f393b3575525da81b6aefd087b6c3cac516bdd6eb1db0f31304d7c63e1cb
 DIST cfn-python-lint-0.49.0.tar.gz 6797106 BLAKE2B aa60c3e5eb246c45997af57f934d2710b56c4966babb61f56cc538c49606e3befd130f6a4298b124d38401927ae40127e699fba6a1f69ee177c07c9bf5d880e4 SHA512 4b656cda70de686aa3bb404908eac6ff66cabc0ebb064d5ccbe554a10551e8a5a7a308e3480826ec52b87549a8626f2a9cbbf51bd44613d94344db8dcd4443a7
 DIST cfn-python-lint-0.49.1.tar.gz 6906770 BLAKE2B 3115e610a73f072f56f0ed45ab8c88f7a906115437081d8974a135b3a9fbfcec4f677bdc108fa0ed37814caa6f0cc1e22fa7892d715c658e9ef05c8299f377a6 SHA512 4ceda24495aa43ad84ca7e63aa566521aab339f01308f5754372289a7f595d6805d6b1ac9bf637ba20a05bf17b93f8a06d5d1fd4dca3b8955094f54a62e28313
diff --git a/dev-python/cfn-python-lint/cfn-python-lint-0.49.2.ebuild b/dev-python/cfn-python-lint/cfn-python-lint-0.49.2.ebuild
new file mode 100644
index 000000000000..7602d69e05bf
--- /dev/null
+++ b/dev-python/cfn-python-lint/cfn-python-lint-0.49.2.ebuild
@@ -0,0 +1,57 @@
+# 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
+
+# TODO: pkgmove to cfn-lint
+MY_P=${P/-python}
+DESCRIPTION="CloudFormation Linter"
+HOMEPAGE="https://pypi.org/project/cfn-lint/ https://github.com/aws-cloudformation/cfn-lint/"
+SRC_URI="
+	https://github.com/aws-cloudformation/cfn-lint/archive/v${PV}.tar.gz
+		-> ${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/aws-sam-translator-1.35.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/importlib_resources[${PYTHON_USEDEP}]
+	' python3_6)
+	dev-python/jsonpatch[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
+	dev-python/junit-xml[${PYTHON_USEDEP}]
+	dev-python/networkx[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-5.4[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.15.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.11[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests --install unittest
+
+PATCHES=(
+	"${FILESDIR}/cfn-python-lint-0.30.1-tests.patch"
+)
+
+src_prepare() {
+	# unpin the deps
+	sed -e 's:~=[0-9.]*::' -i setup.py || die
+	# requires git checkout
+	sed -e 's:test_update_docs:_&:' \
+		-i test/unit/module/maintenance/test_update_documentation.py || die
+	# requires Internet
+	sed -e 's:test_update_resource_specs_python:_&:' \
+		-i test/unit/module/maintenance/test_update_resource_specs.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/chai/chai-1.1.2.ebuild b/dev-python/chai/chai-1.1.2.ebuild
index 1f8fafb106be..127ba948d733 100644
--- a/dev-python/chai/chai-1.1.2.ebuild
+++ b/dev-python/chai/chai-1.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/dev-python/cssselect/cssselect-1.1.0-r1.ebuild b/dev-python/cssselect/cssselect-1.1.0-r1.ebuild
index f857c06526c2..c469b4d52c90 100644
--- a/dev-python/cssselect/cssselect-1.1.0-r1.ebuild
+++ b/dev-python/cssselect/cssselect-1.1.0-r1.ebuild
@@ -16,11 +16,8 @@ SRC_URI="https://github.com/scrapy/cssselect/archive/v${PV}.tar.gz -> ${P}.tar.g
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
+BDEPEND="
 	test? ( dev-python/lxml[${PYTHON_USEDEP}] )"
 
 distutils_enable_sphinx docs
diff --git a/dev-python/ddt/ddt-1.4.2.ebuild b/dev-python/ddt/ddt-1.4.2.ebuild
index d9eb33249427..272ca3643d61 100644
--- a/dev-python/ddt/ddt-1.4.2.ebuild
+++ b/dev-python/ddt/ddt-1.4.2.ebuild
@@ -18,7 +18,6 @@ SRC_URI="
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~ppc64 ~sparc x86"
-IUSE="test"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/dulwich/Manifest b/dev-python/dulwich/Manifest
index 3f15b3903be0..381177121b79 100644
--- a/dev-python/dulwich/Manifest
+++ b/dev-python/dulwich/Manifest
@@ -1,6 +1,2 @@
-DIST dulwich-0.20.15.tar.gz 391841 BLAKE2B 8db19f84154dff0851fd16bc534d92b506c93a93d7180079bc9829a2c81bbb25b04b234770e62ddab82440973d0702b8523896a9db90d771d8cc915b6321cdaa SHA512 a4e746099a90ea2d7eb5f0309508a4f625d41732bdda78997fab07b38ea2ecbd2c2aed08c8ef05b1b73fe3e2ba9b8c8cbf02270f8edbc6235d66cdee0317365c
-DIST dulwich-0.20.18.tar.gz 392023 BLAKE2B 891a02380eae06f2a6331825f6380917c0fd43b418149c30f640566f76b49996f79c7295215d3cf006af86d8ed5bd1465696bcbe402dcfd6b68748043eb4e376 SHA512 ae4311c5d460d7859728c9e9fa9e1888f228488a5cc427a637a7e3d1ae0de3effb1136500b13e0706da38158a245147b0996392b157e67d928caa339416bdf7c
-DIST dulwich-0.20.19.tar.gz 393004 BLAKE2B 89a63943a150ccd15549898689af68769b7f0cf25065e6cf9c9c5addb0fb3635fbc5c0fd23c79d2facdaf3086fd5e853e7ac3f9690f7fe40e0b561f0709651e9 SHA512 07a6b127fc1170a929b22cb04e34a0653131d175d3813fccc9e47e6d250bfa217bb0a2557d5e7fda6edcc5376809e6593dbd0fa52eb73360ba9c3dcdac69c81a
 DIST dulwich-0.20.20.tar.gz 397197 BLAKE2B 941cb09c0537ec9ab96fc65cac12f94cc74b549eb2a8a516def96f66a8d31ad602ae4253910a24efe7254411dd4723832481b0df3189a9cb8708e3bbd512eb6f SHA512 ca83bfe3566981830bdc91d2e4ed039625fa6780dcabf74e0e91c9d89001e06dd04c8a10e8dfaf5c5ad67081d77fc9e996e2e3e1a0589954faae09162c545b02
 DIST dulwich-0.20.21.tar.gz 399232 BLAKE2B d2768a4cc83ab2dad3b569c7c97c93ffea0293eb10ce269a7edfc7d5a6dc15d31d7637332d6968d40e67dcd2d76d6f9366f6d2e30527a666bc76fab32c5bab91 SHA512 1dc3042ef7ed0320b8e998d78c98e5d181981f665a708547b715ed5a16869f5c0c76b6228bf1e58cb957923ea9643ae2ae7cfca970056bc5230db18c5a110985
-DIST dulwich-0.20.6.tar.gz 388660 BLAKE2B 1a193d03e0f21a9fdd125617823742b87e9bea74c73734da10eb79f1ecbec0263cb90224f78413c724db8998f4d06ff6c448e7a6d50ce760ba1545f3321b95d8 SHA512 2f11ce9a1c716fb4242f1f93fce92f756bd93ed8f0951fc2e6b3fb18b0a495b0f372966149fca587efcafc0eaf00e9fbfcfd957442a96cc2004eb66cb7f0773e
diff --git a/dev-python/dulwich/dulwich-0.20.15.ebuild b/dev-python/dulwich/dulwich-0.20.15.ebuild
deleted file mode 100644
index 20e2043860f0..000000000000
--- a/dev-python/dulwich/dulwich-0.20.15.ebuild
+++ /dev/null
@@ -1,56 +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  # tests use setuptools, setup uses if found
-
-inherit distutils-r1
-
-DESCRIPTION="Pure-Python implementation of the Git file formats and protocols"
-HOMEPAGE="
-	https://github.com/dulwich/dulwich/
-	https://pypi.org/project/dulwich/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-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"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/certifi[${PYTHON_USEDEP}]
-	dev-python/urllib3[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		${RDEPEND}
-		!hppa? ( !ia64? (
-			dev-python/gevent[${PYTHON_USEDEP}]
-			dev-python/geventhttpclient[${PYTHON_USEDEP}]
-		) )
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/fastimport[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_sphinx docs
-
-python_test() {
-	# remove interference from the tests that do stuff like user.name
-	unset GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_AUTHOR_DATE \
-		GIT_COMMITTER_NAME GIT_COMMITTER_EMAIL GIT_COMMITTER_DATE EMAIL
-	# Do not use make check which rebuilds the extension and uses -Werror,
-	# causing unexpected failures.
-	"${EPYTHON}" -m unittest -v dulwich.tests.test_suite \
-		|| die "tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	if use examples; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		dodoc -r examples
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/dulwich/dulwich-0.20.18.ebuild b/dev-python/dulwich/dulwich-0.20.18.ebuild
deleted file mode 100644
index 55d4c6c5854f..000000000000
--- a/dev-python/dulwich/dulwich-0.20.18.ebuild
+++ /dev/null
@@ -1,56 +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  # tests use setuptools, setup uses if found
-
-inherit distutils-r1
-
-DESCRIPTION="Pure-Python implementation of the Git file formats and protocols"
-HOMEPAGE="
-	https://github.com/dulwich/dulwich/
-	https://pypi.org/project/dulwich/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-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"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/certifi[${PYTHON_USEDEP}]
-	dev-python/urllib3[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		${RDEPEND}
-		!hppa? ( !ia64? (
-			dev-python/gevent[${PYTHON_USEDEP}]
-			dev-python/geventhttpclient[${PYTHON_USEDEP}]
-		) )
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/fastimport[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_sphinx docs
-
-python_test() {
-	# remove interference from the tests that do stuff like user.name
-	unset GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_AUTHOR_DATE \
-		GIT_COMMITTER_NAME GIT_COMMITTER_EMAIL GIT_COMMITTER_DATE EMAIL
-	# Do not use make check which rebuilds the extension and uses -Werror,
-	# causing unexpected failures.
-	"${EPYTHON}" -m unittest -v dulwich.tests.test_suite \
-		|| die "tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	if use examples; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		dodoc -r examples
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/dulwich/dulwich-0.20.19.ebuild b/dev-python/dulwich/dulwich-0.20.19.ebuild
deleted file mode 100644
index 20e2043860f0..000000000000
--- a/dev-python/dulwich/dulwich-0.20.19.ebuild
+++ /dev/null
@@ -1,56 +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  # tests use setuptools, setup uses if found
-
-inherit distutils-r1
-
-DESCRIPTION="Pure-Python implementation of the Git file formats and protocols"
-HOMEPAGE="
-	https://github.com/dulwich/dulwich/
-	https://pypi.org/project/dulwich/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-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"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/certifi[${PYTHON_USEDEP}]
-	dev-python/urllib3[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		${RDEPEND}
-		!hppa? ( !ia64? (
-			dev-python/gevent[${PYTHON_USEDEP}]
-			dev-python/geventhttpclient[${PYTHON_USEDEP}]
-		) )
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/fastimport[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_sphinx docs
-
-python_test() {
-	# remove interference from the tests that do stuff like user.name
-	unset GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_AUTHOR_DATE \
-		GIT_COMMITTER_NAME GIT_COMMITTER_EMAIL GIT_COMMITTER_DATE EMAIL
-	# Do not use make check which rebuilds the extension and uses -Werror,
-	# causing unexpected failures.
-	"${EPYTHON}" -m unittest -v dulwich.tests.test_suite \
-		|| die "tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	if use examples; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		dodoc -r examples
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/dulwich/dulwich-0.20.6.ebuild b/dev-python/dulwich/dulwich-0.20.6.ebuild
deleted file mode 100644
index 70013fb2acc5..000000000000
--- a/dev-python/dulwich/dulwich-0.20.6.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-DISTUTILS_USE_SETUPTOOLS=rdepend  # tests use setuptools, setup uses if found
-
-inherit distutils-r1
-
-DESCRIPTION="Pure-Python implementation of the Git file formats and protocols"
-HOMEPAGE="https://github.com/jelmer/dulwich/ https://pypi.org/project/dulwich/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-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"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/certifi[${PYTHON_USEDEP}]
-	dev-python/urllib3[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		${RDEPEND}
-		!hppa? ( !ia64? (
-			dev-python/gevent[${PYTHON_USEDEP}]
-			dev-python/geventhttpclient[${PYTHON_USEDEP}]
-		) )
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/fastimport[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_sphinx docs
-
-python_test() {
-	# remove interference from the tests that do stuff like user.name
-	unset GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_AUTHOR_DATE \
-		GIT_COMMITTER_NAME GIT_COMMITTER_EMAIL GIT_COMMITTER_DATE EMAIL
-	# Do not use make check which rebuilds the extension and uses -Werror,
-	# causing unexpected failures.
-	"${EPYTHON}" -m unittest -v dulwich.tests.test_suite \
-		|| die "tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	if use examples; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		dodoc -r examples
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/elementpath/elementpath-2.2.2.ebuild b/dev-python/elementpath/elementpath-2.2.2.ebuild
index 1c6b1056786e..447480f6aafb 100644
--- a/dev-python/elementpath/elementpath-2.2.2.ebuild
+++ b/dev-python/elementpath/elementpath-2.2.2.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"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/flask-restful/Manifest b/dev-python/flask-restful/Manifest
index 57f2e49019e5..3766d56af29d 100644
--- a/dev-python/flask-restful/Manifest
+++ b/dev-python/flask-restful/Manifest
@@ -1 +1,2 @@
 DIST flask-restful-0.3.8.tar.gz 114588 BLAKE2B a18eac613300102bb5a5ca78cea1e6f81f3de21d8bd2e6c72f2f1a559e8b4228175cc7d372b68f131267cd8bc759e354e5782e527d1e992579210348cd2b78dd SHA512 15172114fcedc2f4286cf5f583d95e42c8c8ce6553f9a44e57124f2b1417bf9f094dcb5154a6933ebebc8022f39d4d7969d29d38576111f9d5b45f630b36a66c
+DIST flask-restful-0.3.9.gh.tar.gz 118195 BLAKE2B a4f18c3faf06a7c9b628657aafbab4b9492793d9a61ab60a3e4d8112e0fb5e120cff2f2dae87915e44915838572ae0ca1737025ad5f906c2a953afc4b1f49c6f SHA512 34bea8ed6e9de3ad1c2ca63e7af67ed2a175f84c433b08ff643f91d88feda0e3c1c3967deb2fe5ad308b05f373b10c08245edf65ed97a7c5a3683aa900e9edf2
diff --git a/dev-python/flask-restful/flask-restful-0.3.9.ebuild b/dev-python/flask-restful/flask-restful-0.3.9.ebuild
new file mode 100644
index 000000000000..c36abdef65a4
--- /dev/null
+++ b/dev-python/flask-restful/flask-restful-0.3.9.ebuild
@@ -0,0 +1,43 @@
+# 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="Simple framework for creating REST APIs"
+HOMEPAGE="
+	https://flask-restful.readthedocs.io/en/latest/
+	https://github.com/flask-restful/flask-restful/"
+SRC_URI="
+	https://github.com/flask-restful/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="examples"
+
+RDEPEND="
+	>=dev-python/aniso8601-0.82[${PYTHON_USEDEP}]
+	>=dev-python/flask-0.8[${PYTHON_USEDEP}]
+	>=dev-python/six-1.3.0[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs
+distutils_enable_tests nose
+
+python_install_all() {
+	use examples && dodoc -r examples
+	local DOCS=( AUTHORS.md CHANGES.md CONTRIBUTING.md README.md )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/flask/flask-2.0.0.ebuild b/dev-python/flask/flask-2.0.0.ebuild
index 53a3ec4d9461..b0d77840ee0e 100644
--- a/dev-python/flask/flask-2.0.0.ebuild
+++ b/dev-python/flask/flask-2.0.0.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/dev-python/guzzle_sphinx_theme/guzzle_sphinx_theme-0.7.11-r1.ebuild b/dev-python/guzzle_sphinx_theme/guzzle_sphinx_theme-0.7.11-r1.ebuild
index 14541455f012..643ca7e092b9 100644
--- a/dev-python/guzzle_sphinx_theme/guzzle_sphinx_theme-0.7.11-r1.ebuild
+++ b/dev-python/guzzle_sphinx_theme/guzzle_sphinx_theme-0.7.11-r1.ebuild
@@ -13,6 +13,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND=">=dev-python/sphinx-1.2[${PYTHON_USEDEP}]"
diff --git a/dev-python/h11/h11-0.12.0.ebuild b/dev-python/h11/h11-0.12.0.ebuild
index e41b88d68b4a..1e7458723f84 100644
--- a/dev-python/h11/h11-0.12.0.ebuild
+++ b/dev-python/h11/h11-0.12.0.ebuild
@@ -13,6 +13,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/httpcore/httpcore-0.13.3.ebuild b/dev-python/httpcore/httpcore-0.13.3.ebuild
index 750ea87db93b..ace637059321 100644
--- a/dev-python/httpcore/httpcore-0.13.3.ebuild
+++ b/dev-python/httpcore/httpcore-0.13.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/encode/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
 
 RDEPEND="
 	<dev-python/h11-0.13[${PYTHON_USEDEP}]
diff --git a/dev-python/httpretty/httpretty-1.1.1.ebuild b/dev-python/httpretty/httpretty-1.1.1.ebuild
index 9ea5b043ede3..b40c31825a29 100644
--- a/dev-python/httpretty/httpretty-1.1.1.ebuild
+++ b/dev-python/httpretty/httpretty-1.1.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
 
 RDEPEND="
 	dev-python/urllib3[${PYTHON_USEDEP}]"
diff --git a/dev-python/httpx/httpx-0.18.1.ebuild b/dev-python/httpx/httpx-0.18.1.ebuild
index deda8ea38ce6..217d220c651e 100644
--- a/dev-python/httpx/httpx-0.18.1.ebuild
+++ b/dev-python/httpx/httpx-0.18.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/encode/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
 
 RDEPEND="
 	dev-python/certifi[${PYTHON_USEDEP}]
diff --git a/dev-python/huawei-lte-api/Manifest b/dev-python/huawei-lte-api/Manifest
index 3cb8cdf775b5..563e78f1e5f6 100644
--- a/dev-python/huawei-lte-api/Manifest
+++ b/dev-python/huawei-lte-api/Manifest
@@ -1 +1,2 @@
 DIST huawei-lte-api-1.4.17.tar.gz 29441 BLAKE2B 75615092a1d8ee598a99e9ae7a0567e11a72fad21a8304005364bd21e4ecb9bf9efa9a2d5c8de86c6d7442ec12f06079819c20ca9e2e4646255ede961b1a1275 SHA512 bf4a6a43d02b56f0aa799e2936d7fd0afa88da4dc18c152c635b0ccb87a7ca9afcf1fcdee3a37d7ab232d5cd4688e24499ad35a1969d97db405b818cf17d33c4
+DIST huawei-lte-api-1.4.18.tar.gz 29701 BLAKE2B 0e242f2f2208646c9f3291dab8397a80934bce3757fb79b58fdcee389a087788962cfaea3350d7b95e53ff3e0f1fbefdf7ea6714266872fc1591848a4fb84462 SHA512 4750fcc84fff46c76f42715e6668d402b9057f8dd826276ad0682e9bac76742c86566794d4aaab7aa9ebf17d06246c4d4cc9385ee1fff9642ff5c995491fc646
diff --git a/dev-python/huawei-lte-api/huawei-lte-api-1.4.18.ebuild b/dev-python/huawei-lte-api/huawei-lte-api-1.4.18.ebuild
new file mode 100644
index 000000000000..61f02b76253a
--- /dev/null
+++ b/dev-python/huawei-lte-api/huawei-lte-api-1.4.18.ebuild
@@ -0,0 +1,30 @@
+# 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
+
+DESCRIPTION="API For huawei LAN/WAN LTE Modems"
+HOMEPAGE="https://github.com/Salamek/huawei-lte-api"
+SRC_URI="https://github.com/Salamek/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="dev-python/dicttoxml[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/xmltodict[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	# https://github.com/Salamek/huawei-lte-api/issues/86
+	sed "s:'pytest-runner'::" -i setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+distutils_enable_tests pytest
diff --git a/dev-python/huawei-lte-api/metadata.xml b/dev-python/huawei-lte-api/metadata.xml
index ec595c9e67d8..e6e2eb784aea 100644
--- a/dev-python/huawei-lte-api/metadata.xml
+++ b/dev-python/huawei-lte-api/metadata.xml
@@ -5,6 +5,10 @@
   <email>ago@gentoo.org</email>
   <name>Agostino Sarubbo</name>
  </maintainer>
+ <maintainer type="project">
+  <email>python@gentoo.org</email>
+  <name>Python</name>
+ </maintainer>
  <upstream>
   <remote-id type="github">Salamek/huawei-lte-api</remote-id>
   <remote-id type="pypi">huawei-lte-api</remote-id>
diff --git a/dev-python/imagesize/metadata.xml b/dev-python/imagesize/metadata.xml
index 303ba1098886..1b1503fff026 100644
--- a/dev-python/imagesize/metadata.xml
+++ b/dev-python/imagesize/metadata.xml
@@ -3,6 +3,7 @@
 <pkgmetadata>
  <maintainer type="project">
   <email>python@gentoo.org</email>
+  <name>Python</name>
  </maintainer>
  <upstream>
   <remote-id type="pypi">imagesize</remote-id>
diff --git a/dev-python/itsdangerous/Manifest b/dev-python/itsdangerous/Manifest
index 8dcac31d3e5d..44c3b13242e3 100644
--- a/dev-python/itsdangerous/Manifest
+++ b/dev-python/itsdangerous/Manifest
@@ -1,2 +1,3 @@
 DIST itsdangerous-1.1.0.tar.gz 53219 BLAKE2B 6ad74dacb9728e77d57ac5e364e79e3cc749be206fa03e82a407cdd77b5b72ddb4861bf181772915e684539e6404c6a45f6081c7c8e17a33a2d532b4fc3fed80 SHA512 61bab3fce5f87a3b5fc8fad61e735a63df6aa039416ee3494e1c99a2a1162b4fb72793bc5dc949de0985724c40121810b159513606c4c3976a7666dba3a1b93d
 DIST itsdangerous-2.0.0.tar.gz 59128 BLAKE2B 0d7eda7e38a3c87a87d1e6fb8522bf7b95354168ac0db6fb1c621f7961c4f0b8382e382d03829a4c18949baf533b9b67904569783990f94fbd3384570cfebf87 SHA512 cc838aff218ff9b119b8f4b4d09b83204990880abdd25e4c33e83f98d521601f272c245d8ac4aa6efde8bf4d443318d7400fb1a0ea8debbd9641ab65de9d47ba
+DIST itsdangerous-2.0.1.tar.gz 59336 BLAKE2B 53661c31c6ac8b3db68287f52367ecf53d871c2abd8bed077b5a2039b29da96cdb1b9c717d1382d831b63aa79c421fece1afd6799f31b85df46ed4627e69f792 SHA512 bc1e51eb861c13b4e3c4c1c655a3b6f28e326d70db23679269d2bea84f0f8f94afd4fccecb745cf40f5a5956a14a336dfa42f0f5149666ae43061feb1366302b
diff --git a/dev-python/itsdangerous/itsdangerous-1.1.0-r1.ebuild b/dev-python/itsdangerous/itsdangerous-1.1.0-r1.ebuild
index f9a3a2dee7ad..ea56632d0aac 100644
--- a/dev-python/itsdangerous/itsdangerous-1.1.0-r1.ebuild
+++ b/dev-python/itsdangerous/itsdangerous-1.1.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,8 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/freezegun[${PYTHON_USEDEP}] )"
+BDEPEND="
+	test? ( dev-python/freezegun[${PYTHON_USEDEP}] )
+"
 
 distutils_enable_tests pytest
diff --git a/dev-python/itsdangerous/itsdangerous-2.0.1.ebuild b/dev-python/itsdangerous/itsdangerous-2.0.1.ebuild
new file mode 100644
index 000000000000..d7113fac7973
--- /dev/null
+++ b/dev-python/itsdangerous/itsdangerous-2.0.1.ebuild
@@ -0,0 +1,21 @@
+# 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
+
+DESCRIPTION="Various helpers to pass trusted data to untrusted environments and back"
+HOMEPAGE="https://pythonhosted.org/itsdangerous/ https://pypi.org/project/itsdangerous/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+BDEPEND="
+	test? ( dev-python/freezegun[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
diff --git a/dev-python/jdcal/jdcal-1.4.1.ebuild b/dev-python/jdcal/jdcal-1.4.1.ebuild
index 869bec32505a..4fbfa464e083 100644
--- a/dev-python/jdcal/jdcal-1.4.1.ebuild
+++ b/dev-python/jdcal/jdcal-1.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/dev-python/jellyfish/jellyfish-0.8.2.ebuild b/dev-python/jellyfish/jellyfish-0.8.2.ebuild
index 0fb4ce2a4c4d..d20ac25f1c0c 100644
--- a/dev-python/jellyfish/jellyfish-0.8.2.ebuild
+++ b/dev-python/jellyfish/jellyfish-0.8.2.ebuild
@@ -14,7 +14,7 @@ LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
 
-DEPEND="
+BDEPEND="
 	test? (
 		dev-python/unicodecsv[${PYTHON_USEDEP}]
 	)
@@ -26,5 +26,5 @@ distutils_enable_tests pytest
 python_test() {
 	cp -r testdata "${BUILD_DIR}" || die
 	cd "${BUILD_DIR}" || die
-	pytest -vv lib/jellyfish/test.py || die "tests failed with ${EPYTHON}"
+	epytest lib/jellyfish/test.py
 }
diff --git a/dev-python/jinja/Manifest b/dev-python/jinja/Manifest
index 01547bef62c9..49c8eee8dbac 100644
--- a/dev-python/jinja/Manifest
+++ b/dev-python/jinja/Manifest
@@ -1,2 +1,3 @@
 DIST jinja-2.11.3.tar.gz 258057 BLAKE2B 4735464d044718ce1e6b2663ecb1b238b38fbf0f37ed683257775fe9e853186c089b98494209e511be5aa96bf6df8f6d472be132b6184a7d9213e182099c0433 SHA512 f8e2951edf780d7b44ac74d36579c89b0a5c076b4250faf643ae7e3ff6a431fedaabed640e5efb496cda1a79a4057bf312ae652484c8d4631d521689eb0adbc1
 DIST jinja-3.0.0.tar.gz 271882 BLAKE2B 7013d74802534273c62db275d95f05f203af97f52fdf9f9be9ec89522e2fce2d4cd0dc00611ad1442680da9ec624dd4ca8be375f021bc9572ef736801fb4b0d0 SHA512 54841f5fc07349eb01002156fb148e8e5905574dcb6e0d51bef2f340c8b94f2b50964b94e09d888d8cd6aa834de3a495301bf2b3cdf3282bce1b04129ea6d69e
+DIST jinja-3.0.1.tar.gz 272329 BLAKE2B 71aff8e78c49a522ef78d418be1b3b104dc149dd623b75aed3022f979930c8d6071c2adc3693a6110425469d6092e84a7721ac9d7907a8dc0c8414ccdf7c9049 SHA512 da3238bbab9f5966df933dd0511faf010d799aebf06d17b9352f412417ceea842145ee970a0ddd84f49a3ef1f7fbca29f62a14ee75c136a083168311eda89ddd
diff --git a/dev-python/jinja/jinja-3.0.1.ebuild b/dev-python/jinja/jinja-3.0.1.ebuild
new file mode 100644
index 000000000000..f249e431a823
--- /dev/null
+++ b/dev-python/jinja/jinja-3.0.1.ebuild
@@ -0,0 +1,52 @@
+# 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 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="A full-featured template engine for Python"
+HOMEPAGE="https://jinja.palletsprojects.com/ https://pypi.org/project/Jinja2/"
+# pypi tarball is missing tests
+SRC_URI="https://github.com/pallets/jinja/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
+IUSE="examples"
+
+RDEPEND="
+	>=dev-python/markupsafe-2.0.0[${PYTHON_USEDEP}]
+	!dev-python/jinja:compat"
+
+distutils_enable_sphinx docs \
+	dev-python/sphinx-issues \
+	dev-python/pallets-sphinx-themes
+distutils_enable_tests pytest
+
+# XXX: handle Babel better?
+
+src_prepare() {
+	# avoid unnecessary dep on extra sphinxcontrib modules
+	sed -i '/sphinxcontrib.log_cabinet/ d' docs/conf.py || die
+
+	distutils-r1_src_prepare
+}
+
+python_install_all() {
+	if use examples ; then
+		docinto examples
+		dodoc -r examples/.
+	fi
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	if ! has_version dev-python/Babel; then
+		elog "For i18n support, please emerge dev-python/Babel."
+	fi
+}
diff --git a/dev-python/jmespath/jmespath-0.10.0.ebuild b/dev-python/jmespath/jmespath-0.10.0.ebuild
index 9cc25fd6ac25..ef9031c8a4c4 100644
--- a/dev-python/jmespath/jmespath-0.10.0.ebuild
+++ b/dev-python/jmespath/jmespath-0.10.0.ebuild
@@ -17,6 +17,6 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 
 distutils_enable_tests nose
diff --git a/dev-python/lxml/Manifest b/dev-python/lxml/Manifest
index cfd6f208adff..c59350fa14fc 100644
--- a/dev-python/lxml/Manifest
+++ b/dev-python/lxml/Manifest
@@ -1,2 +1 @@
-DIST lxml-4.6.2.tar.gz 948652 BLAKE2B df6ec7e183df48c0edc6cce0fbdd6ab78eb8d1b7e8fb81a76bd9f4a24f05923c757d5b21f508be9be50c7bb187927c4e3a66146d480f2d40efc05388d26d3bf5 SHA512 81dcf5cade7b05c0e831beae7cdfbdb21e876fa55b23da98b89cbfa7960a4737efc13346ea3ade22a2448f20e036173cf5e32d43df6656c3231bfba07981f9ed
 DIST lxml-4.6.3.tar.gz 948931 BLAKE2B 373248827cb6bc0698b632ef60978adb2b8f7c37444fa1804567f08eb669018dc38fadf52422262fd96280e88c59578d244e4c5a1ed55609af55c010b3bf2b09 SHA512 50e42d6269dc45b4c0ab3285c49307f8bee87fcc4b9e0f531e1ee37bcf83c5938b7e361f906a3158fac8df89a79b932dd64a8839455e45f45f3a5f0ba73ff6a5
diff --git a/dev-python/lxml/lxml-4.6.2-r1.ebuild b/dev-python/lxml/lxml-4.6.2-r1.ebuild
deleted file mode 100644
index f547fb284800..000000000000
--- a/dev-python/lxml/lxml-4.6.2-r1.ebuild
+++ /dev/null
@@ -1,101 +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 optfeature 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 ~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}]
-	doc? (
-		$(python_gen_any_dep '
-			dev-python/docutils[${PYTHON_USEDEP}]
-			dev-python/pygments[${PYTHON_USEDEP}]
-			dev-python/sphinx[${PYTHON_USEDEP}]
-			dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
-		')
-	)
-	test? ( dev-python/cssselect[${PYTHON_USEDEP}] )
-	"
-
-DISTUTILS_IN_SOURCE_BUILD=1
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.6.0-tests-pypy.patch
-)
-
-python_check_deps() {
-	use doc || return 0
-	has_version "dev-python/docutils[${PYTHON_USEDEP}]" &&
-	has_version "dev-python/pygments[${PYTHON_USEDEP}]" &&
-	has_version "dev-python/sphinx[${PYTHON_USEDEP}]" &&
-	has_version "dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]"
-}
-
-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_compile_all() {
-	use doc && emake html
-}
-
-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/lxml/lxml-4.6.3.ebuild b/dev-python/lxml/lxml-4.6.3.ebuild
index f547fb284800..01ae69c35719 100644
--- a/dev-python/lxml/lxml-4.6.3.ebuild
+++ b/dev-python/lxml/lxml-4.6.3.ebuild
@@ -20,13 +20,12 @@ RESTRICT="!test? ( test )"
 
 # Note: lib{xml2,xslt} are used as C libraries, not Python modules.
 RDEPEND="
-	>=dev-libs/libxml2-2.9.5
+	<dev-libs/libxml2-2.9.12
 	>=dev-libs/libxslt-1.1.28"
 DEPEND="${RDEPEND}"
 BDEPEND="
 	virtual/pkgconfig
 	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
 	doc? (
 		$(python_gen_any_dep '
 			dev-python/docutils[${PYTHON_USEDEP}]
diff --git a/dev-python/namespace-sphinxcontrib/metadata.xml b/dev-python/namespace-sphinxcontrib/metadata.xml
index 7ad11570cc7d..853174b8f2ab 100644
--- a/dev-python/namespace-sphinxcontrib/metadata.xml
+++ b/dev-python/namespace-sphinxcontrib/metadata.xml
@@ -3,6 +3,7 @@
 <pkgmetadata>
  <maintainer type="project">
   <email>python@gentoo.org</email>
+  <name>Python</name>
  </maintainer>
  
  <origin>gentoo-staging</origin>
diff --git a/dev-python/natsort/natsort-7.1.1.ebuild b/dev-python/natsort/natsort-7.1.1.ebuild
index 55ec3d633c08..0ba48f54f0e0 100644
--- a/dev-python/natsort/natsort-7.1.1.ebuild
+++ b/dev-python/natsort/natsort-7.1.1.ebuild
@@ -4,7 +4,6 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
 
@@ -16,7 +15,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 ~arm64 ~ia64 x86"
 
-DEPEND="
+BDEPEND="
 	test? (
 		dev-python/hypothesis[${PYTHON_USEDEP}]
 		dev-python/pytest-mock[${PYTHON_USEDEP}]
diff --git a/dev-python/pygal/files/2.4.0-fix-tests.patch b/dev-python/pygal/files/2.4.0-fix-tests.patch
new file mode 100644
index 000000000000..6ae07df3427b
--- /dev/null
+++ b/dev-python/pygal/files/2.4.0-fix-tests.patch
@@ -0,0 +1,17 @@
+diff --git a/pygal/test/conftest.py b/pygal/test/conftest.py
+index ea36010..6fe40cb 100644
+--- a/pygal/test/conftest.py
++++ b/pygal/test/conftest.py
+@@ -48,9 +48,9 @@ def pytest_generate_tests(metafunc):
+     if hasattr(sys, 'pypy_version_info'):
+         etree.to_etree()
+
+-    if "Chart" in metafunc.funcargnames:
++    if "Chart" in metafunc.fixturenames:
+         metafunc.parametrize("Chart", pygal.CHARTS)
+-    if "datas" in metafunc.funcargnames:
++    if "datas" in metafunc.fixturenames:
+         metafunc.parametrize(
+             "datas", [[("Serie %d" % i, get_data(i)) for i in range(s)]
+                       for s in (5, 1, 0)]
+--
diff --git a/dev-python/pygal/pygal-2.4.0-r1.ebuild b/dev-python/pygal/pygal-2.4.0-r2.ebuild
index 8f9a6fa27f0c..05edb6fd6cf1 100644
--- a/dev-python/pygal/pygal-2.4.0-r1.ebuild
+++ b/dev-python/pygal/pygal-2.4.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,15 +19,12 @@ KEYWORDS="amd64 x86"
 
 RDEPEND="
 	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	media-gfx/cairosvg[${PYTHON_USEDEP}]
-"
+	media-gfx/cairosvg[${PYTHON_USEDEP}]"
+
 BDEPEND="
-	test? (
-		dev-python/pyquery[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
+	test? ( dev-python/pyquery[${PYTHON_USEDEP}] )"
+
+PATCHES=( "${FILESDIR}/${PV}-fix-tests.patch" )
 
 # CHANGELOG is a symlink to docs/changelog.rst
 DOCS=( docs/changelog.rst README.md )
diff --git a/dev-python/pyjwt/pyjwt-2.1.0.ebuild b/dev-python/pyjwt/pyjwt-2.1.0.ebuild
index 71f6f394fbf6..914865c6782b 100644
--- a/dev-python/pyjwt/pyjwt-2.1.0.ebuild
+++ b/dev-python/pyjwt/pyjwt-2.1.0.ebuild
@@ -18,7 +18,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="!dev-python/python-jwt"
-DEPEND="
+BDEPEND="
 	test? (
 		>=dev-python/cryptography-3.3.1[${PYTHON_USEDEP}]
 	)"
diff --git a/dev-python/pylibacl/pylibacl-0.6.0.ebuild b/dev-python/pylibacl/pylibacl-0.6.0.ebuild
index 63ac486aac64..c38c3b72c088 100644
--- a/dev-python/pylibacl/pylibacl-0.6.0.ebuild
+++ b/dev-python/pylibacl/pylibacl-0.6.0.ebuild
@@ -23,6 +23,7 @@ KEYWORDS="~alpha amd64 arm ~ia64 ~mips ppc ppc64 sparc x86"
 RDEPEND="sys-apps/acl"
 DEPEND=${RDEPEND}
 
+distutils_enable_sphinx doc
 distutils_enable_tests pytest
 
 python_test() {
diff --git a/dev-python/pymssql/pymssql-2.2.1.ebuild b/dev-python/pymssql/pymssql-2.2.1.ebuild
index f4f083082cbd..c8530b26239f 100644
--- a/dev-python/pymssql/pymssql-2.2.1.ebuild
+++ b/dev-python/pymssql/pymssql-2.2.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ppc ppc64 ~s390 ~sparc ~x86"
 IUSE="test"
 
 # tests need a running instance of freetds
diff --git a/dev-python/pyotp/Manifest b/dev-python/pyotp/Manifest
index 123a1afe57de..4d772d5cc534 100644
--- a/dev-python/pyotp/Manifest
+++ b/dev-python/pyotp/Manifest
@@ -1,3 +1 @@
-DIST pyotp-2.4.1.tar.gz 15232 BLAKE2B 0690364209bbbfc7bdaddc0204168a584696b98d974b203513ce8f6ffef9751ed1c9d19b7f875631805cf704ca494b2412eb731b0415fdedbae7f57ece630981 SHA512 4bd60ecef1ae22207732a539e5b46c3ca35fa6158da552e537aa522bfe2a2e0743f7426c437cd93cc9901ce5b834cbd9d9e4481eb95478871367f1d5373b67af
-DIST pyotp-2.5.1.tar.gz 15503 BLAKE2B 73cbfb37f0d795b5d7a538e7b973c0281f161226559df1a8db20d4df5121c0efbe8dc8b0bed806903a83dace3388efca6c1ec84a6b7ef21becbd020c04074ffc SHA512 628bcc4c18c469dff9007cbe2f4a9b55a2100e1845e3196fbf2f55fd37b6c95a0d4d5df7a31f8df3e84b8a1b48151cb8048574cf1cda6bc7c098c5c0fb6e5649
 DIST pyotp-2.6.0.tar.gz 15687 BLAKE2B 9e1b97c5fd5a3d9b335c173d44922a0427f9f49f4fb27579ee528d1e6f4776b33db31a1664a9bd6295bbec331458e17ac380c1fcd9860bc200577051f2af2e7e SHA512 8d650c6840dd243c4dcb522745ae80b462c1819bcafef226923d13be6a2b096cf5f2146829fd553d5e096d82b67725706d69d0cbb15a5d6586ea234201671bcd
diff --git a/dev-python/pyotp/metadata.xml b/dev-python/pyotp/metadata.xml
index 545438112513..72d0a84a28a9 100644
--- a/dev-python/pyotp/metadata.xml
+++ b/dev-python/pyotp/metadata.xml
@@ -10,4 +10,5 @@
   <remote-id type="github">pyauth/pyotp</remote-id>
  </upstream>
  <origin>gentoo-staging</origin>
+ <stabilize-allarches/>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/pyotp/pyotp-2.4.1.ebuild b/dev-python/pyotp/pyotp-2.4.1.ebuild
deleted file mode 100644
index 88fd98bb7f1d..000000000000
--- a/dev-python/pyotp/pyotp-2.4.1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="PyOTP is a Python library for generating and verifying one-time passwords."
-HOMEPAGE="https://github.com/pyauth/pyotp https://pypi.org/project/pyotp/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-distutils_enable_tests unittest
diff --git a/dev-python/pyotp/pyotp-2.5.1.ebuild b/dev-python/pyotp/pyotp-2.5.1.ebuild
deleted file mode 100644
index 3452c7353c7a..000000000000
--- a/dev-python/pyotp/pyotp-2.5.1.ebuild
+++ /dev/null
@@ -1,18 +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="PyOTP is a Python library for generating and verifying one-time passwords."
-HOMEPAGE="https://github.com/pyauth/pyotp https://pypi.org/project/pyotp/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-distutils_enable_tests unittest
diff --git a/dev-python/pytest-django/pytest-django-4.2.0.ebuild b/dev-python/pytest-django/pytest-django-4.2.0.ebuild
index 34f608100388..3301b15f0eae 100644
--- a/dev-python/pytest-django/pytest-django-4.2.0.ebuild
+++ b/dev-python/pytest-django/pytest-django-4.2.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 		-> ${P}.gh.tar.gz"
 
 LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 SLOT="0"
 
 RDEPEND="
diff --git a/dev-python/pytest-xvfb/pytest-xvfb-2.0.0-r1.ebuild b/dev-python/pytest-xvfb/pytest-xvfb-2.0.0-r1.ebuild
index 80f249cc17dd..3ace1463503f 100644
--- a/dev-python/pytest-xvfb/pytest-xvfb-2.0.0-r1.ebuild
+++ b/dev-python/pytest-xvfb/pytest-xvfb-2.0.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/The-Compiler/pytest-xvfb/archive/v${PV}.tar.gz -> ${
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	>=dev-python/pytest-2.8.1[${PYTHON_USEDEP}]
diff --git a/dev-python/python-mpd/python-mpd-3.0.4.ebuild b/dev-python/python-mpd/python-mpd-3.0.4.ebuild
index 44e826392f6c..9d4954d60d82 100644
--- a/dev-python/python-mpd/python-mpd-3.0.4.ebuild
+++ b/dev-python/python-mpd/python-mpd-3.0.4.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 S=${WORKDIR}/${MY_P}
 
 LICENSE="LGPL-3+"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 SLOT="0"
 IUSE="examples +twisted"
 
diff --git a/dev-python/reportlab/reportlab-3.5.67.ebuild b/dev-python/reportlab/reportlab-3.5.67.ebuild
index cb4d7e39c441..f5857bdcb4c7 100644
--- a/dev-python/reportlab/reportlab-3.5.67.ebuild
+++ b/dev-python/reportlab/reportlab-3.5.67.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 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"
 
 DEPEND="
 	media-libs/freetype
diff --git a/dev-python/s3transfer/s3transfer-0.4.2.ebuild b/dev-python/s3transfer/s3transfer-0.4.2.ebuild
index db1934218f34..ef83f641a86c 100644
--- a/dev-python/s3transfer/s3transfer-0.4.2.ebuild
+++ b/dev-python/s3transfer/s3transfer-0.4.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/botocore[${PYTHON_USEDEP}]
diff --git a/dev-python/sniffio/sniffio-1.2.0.ebuild b/dev-python/sniffio/sniffio-1.2.0.ebuild
index 1bc896956e43..f7684e1c749d 100644
--- a/dev-python/sniffio/sniffio-1.2.0.ebuild
+++ b/dev-python/sniffio/sniffio-1.2.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="|| ( Apache-2.0 MIT )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/terminado/Manifest b/dev-python/terminado/Manifest
index ceb79d543266..93483458d6f5 100644
--- a/dev-python/terminado/Manifest
+++ b/dev-python/terminado/Manifest
@@ -1,2 +1,2 @@
+DIST terminado-0.10.0.tar.gz 14059 BLAKE2B 9fedf12900275154068f5bac97a7038bbd9f655b30a1f3f50f5a66f581b7ed7599116be8eb59d1a82234455574b3a85f239f25af81b03967e986da01b5cee87b SHA512 a0fdbe904e617659a96a594430da3bc00a8addf93b111557355cca48f7d7e39ea1f388d6cb4179de1c10a35c0bec0c69e97c38e1ce77823b5c938c04fa1a632a
 DIST terminado-0.9.4.tar.gz 13934 BLAKE2B 8544d70a7c561005370bbb2b16db593ac9e4453b729b58d641b99066dc1255e294b712958d54a35a92d85e30b918a1122d24e97400b967858b542498d76305b5 SHA512 ab297e60c1adb25b5fbfcd0246db12f5df3acceeac3357af310602da3915345cb2d4fb460cc303cc4b5b5df237e750ce123ac0ed98a9bf7c6e8493783398cbc9
-DIST terminado-0.9.5.tar.gz 13953 BLAKE2B fcd67a5193fe20b17ff815c934fb20cbcb5d5ca29818c7064534017c13db7ab2326f0be00a4cb541ef877bb7d208eb93685fbb0c2ff08b8640cd5befb1c5eab5 SHA512 7b9f9b81bd30d7b5493faf92c2cecc251c68709ab4c8364e5da1aaf42507919563ee368c30d94c30913f116df9113612500473c6bdf5bc673a96ef1d6c7337a4
diff --git a/dev-python/terminado/terminado-0.9.5.ebuild b/dev-python/terminado/terminado-0.10.0.ebuild
index f98a8046eb9b..3589fe1290df 100644
--- a/dev-python/terminado/terminado-0.9.5.ebuild
+++ b/dev-python/terminado/terminado-0.10.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD-2"
-KEYWORDS=""
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/ptyprocess[${PYTHON_USEDEP}]
diff --git a/dev-python/typed-ast/typed-ast-1.4.3.ebuild b/dev-python/typed-ast/typed-ast-1.4.3.ebuild
index 2a7d718fb385..799f11b61f26 100644
--- a/dev-python/typed-ast/typed-ast-1.4.3.ebuild
+++ b/dev-python/typed-ast/typed-ast-1.4.3.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${P/-/_}"
 
 LICENSE="Apache-2.0 MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86 ~x64-macos"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/unicodecsv/unicodecsv-0.14.1-r1.ebuild b/dev-python/unicodecsv/unicodecsv-0.14.1-r1.ebuild
index ac5126009bbb..0629678ceb13 100644
--- a/dev-python/unicodecsv/unicodecsv-0.14.1-r1.ebuild
+++ b/dev-python/unicodecsv/unicodecsv-0.14.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/dev-python/unidiff/metadata.xml b/dev-python/unidiff/metadata.xml
index 60c9d525a8b4..69ee67c8ec85 100644
--- a/dev-python/unidiff/metadata.xml
+++ b/dev-python/unidiff/metadata.xml
@@ -10,4 +10,5 @@
   <remote-id type="github">matiasb/python-unidiff</remote-id>
  </upstream>
  <origin>gentoo-staging</origin>
+ <stabilize-allarches/>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/unidiff/unidiff-0.6.0.ebuild b/dev-python/unidiff/unidiff-0.6.0.ebuild
index 2933b82e4738..a7e79c1a014c 100644
--- a/dev-python/unidiff/unidiff-0.6.0.ebuild
+++ b/dev-python/unidiff/unidiff-0.6.0.ebuild
@@ -4,7 +4,6 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
 inherit distutils-r1
 
 DESCRIPTION="Unified diff parsing/metadata extraction library"
@@ -14,7 +13,5 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 distutils_enable_tests unittest
diff --git a/dev-python/uvicorn/uvicorn-0.13.4.ebuild b/dev-python/uvicorn/uvicorn-0.13.4.ebuild
index 2deca334b250..1146e61ee473 100644
--- a/dev-python/uvicorn/uvicorn-0.13.4.ebuild
+++ b/dev-python/uvicorn/uvicorn-0.13.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/encode/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
 
 RDEPEND="
 	=dev-python/click-7*[${PYTHON_USEDEP}]
diff --git a/dev-python/watchdog/watchdog-2.1.1.ebuild b/dev-python/watchdog/watchdog-2.1.1.ebuild
index 28303a9ee47c..9429240f8886 100644
--- a/dev-python/watchdog/watchdog-2.1.1.ebuild
+++ b/dev-python/watchdog/watchdog-2.1.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/gorakhargosh/${PN}/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 CDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]"
 RDEPEND="${CDEPEND}
diff --git a/dev-python/websockets/websockets-9.0.2.ebuild b/dev-python/websockets/websockets-9.0.2.ebuild
index e8b587806212..ce1f783d8c80 100644
--- a/dev-python/websockets/websockets-9.0.2.ebuild
+++ b/dev-python/websockets/websockets-9.0.2.ebuild
@@ -13,6 +13,6 @@ SRC_URI="https://github.com/aaugustin/${PN}/archive/${PV}.tar.gz -> ${P}-src.tar
 LICENSE="BSD"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
 
 distutils_enable_tests unittest
diff --git a/dev-python/werkzeug/werkzeug-2.0.1.ebuild b/dev-python/werkzeug/werkzeug-2.0.1.ebuild
index aa9928cf6ceb..a1c2e86c73f7 100644
--- a/dev-python/werkzeug/werkzeug-2.0.1.ebuild
+++ b/dev-python/werkzeug/werkzeug-2.0.1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 DEPEND="
 	test? (
diff --git a/dev-python/wsproto/wsproto-1.0.0.ebuild b/dev-python/wsproto/wsproto-1.0.0.ebuild
index 3fb25c72faf7..2b6b52baf3e8 100644
--- a/dev-python/wsproto/wsproto-1.0.0.ebuild
+++ b/dev-python/wsproto/wsproto-1.0.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
 
 RDEPEND=">=dev-python/h11-0.9[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/zstd/zstd-1.4.9.1.ebuild b/dev-python/zstd/zstd-1.4.9.1.ebuild
index f73c5d5311fb..27217e54768e 100644
--- a/dev-python/zstd/zstd-1.4.9.1.ebuild
+++ b/dev-python/zstd/zstd-1.4.9.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 RDEPEND="
 	app-arch/zstd:=