Adding metadata

43 files changed, 305 insertions, 642 deletions

diff --git a/dev-python/astunparse/astunparse-1.6.3.ebuild b/dev-python/astunparse/astunparse-1.6.3.ebuild
index e8e0e80917b4..d600b9dd6bf6 100644
--- a/dev-python/astunparse/astunparse-1.6.3.ebuild
+++ b/dev-python/astunparse/astunparse-1.6.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	>=dev-python/six-1.6.1[${PYTHON_USEDEP}]
diff --git a/dev-python/aws-sam-translator/aws-sam-translator-1.42.0.ebuild b/dev-python/aws-sam-translator/aws-sam-translator-1.42.0.ebuild
index 3c9f8cfed61b..bbf3ee2c0702 100644
--- a/dev-python/aws-sam-translator/aws-sam-translator-1.42.0.ebuild
+++ b/dev-python/aws-sam-translator/aws-sam-translator-1.42.0.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/serverless-application-model-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/boto3-1.17[${PYTHON_USEDEP}]
diff --git a/dev-python/beniget/beniget-0.4.1.ebuild b/dev-python/beniget/beniget-0.4.1.ebuild
index 424d4a2d089e..f7f75fffd3f5 100644
--- a/dev-python/beniget/beniget-0.4.1.ebuild
+++ b/dev-python/beniget/beniget-0.4.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND="=dev-python/gast-0.5*[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/cfn-lint/Manifest b/dev-python/cfn-lint/Manifest
index 2ff838275da5..3a1dee5ea7a5 100644
--- a/dev-python/cfn-lint/Manifest
+++ b/dev-python/cfn-lint/Manifest
@@ -1,3 +1 @@
-DIST cfn-lint-0.56.1.tar.gz 8095525 BLAKE2B a9db57f17c0f5bcc0950aa61b109488154dfb67997224f7c49f35c324ada7e4881ab2bd2048df344b78668db5e26eb365712cc0a1b8d2b2349cc53c7e97b35b1 SHA512 0857139094fcfd8d935c526986319a67cddb7fc42ec1297b29f797299699d068ddbb0fdd30736b2ba1b647c905c6c7be4946915d98a23119fdb6bb70b23adef1
-DIST cfn-lint-0.56.2.tar.gz 8139815 BLAKE2B 70e2657801fa7c995e6a92c36bfd49195af80b1477da651cf10a234ebf8f0aba2382e8512efc1adfeace6503d0e5afffb09e4a80e7f9464ebb6f2d53b57f84fc SHA512 9169d81b3144fa28c48372971b6197aa3a85b6365d7e45c22967ea388896b5df65e1daf6889984b8ece46b938c91c349fcde01ed9e0bf4780b549163f8948866
 DIST cfn-lint-0.56.3.tar.gz 8278034 BLAKE2B 894d30add7a193d256dc2195c0cd1d4b75f10f60abe9e37c5b0bdd84178d9559759326ad3e55d2321b99588094b436dc2dc8dff1cc561ae56dd4cee98d6b43bd SHA512 8aeaf44a626f9bfc05ebeefc8aec9211fcac1a65de681d5d700f3621631bff15e74ed644b9d0dc8af4d9b0b14802c2259dbc4ccf38594705040f5fd3af1cf482
diff --git a/dev-python/cfn-lint/cfn-lint-0.56.1.ebuild b/dev-python/cfn-lint/cfn-lint-0.56.1.ebuild
deleted file mode 100644
index 169f56d823dd..000000000000
--- a/dev-python/cfn-lint/cfn-lint-0.56.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-inherit distutils-r1
-
-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
-		-> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-RDEPEND="
-	>=dev-python/aws-sam-translator-1.40.0[${PYTHON_USEDEP}]
-	dev-python/jsonpatch[${PYTHON_USEDEP}]
-	>=dev-python/jschema_to_python-1.2.3[${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/sarif_om-1.0.4[${PYTHON_USEDEP}]
-	>=dev-python/six-1.11[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests --install pytest
-
-EPYTEST_DESELECT=(
-	# TODO
-	test/unit/module/test_template.py::TestTemplate::test_build_graph
-	# requires git repo
-	test/unit/module/maintenance/test_update_documentation.py::TestUpdateDocumentation::test_update_docs
-	# Internet
-	test/unit/module/formatters/test_formatters.py::TestFormatters::test_sarif_formatter
-	test/unit/module/maintenance/test_update_resource_specs.py::TestUpdateResourceSpecs::test_update_resource_specs_python_2
-	test/unit/module/maintenance/test_update_resource_specs.py::TestUpdateResourceSpecs::test_update_resource_specs_python_3
-)
-
-src_prepare() {
-	# unpin the deps
-	sed -e 's:~=[0-9.]*::' -i setup.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/cfn-lint/cfn-lint-0.56.2.ebuild b/dev-python/cfn-lint/cfn-lint-0.56.2.ebuild
deleted file mode 100644
index 16397777fde5..000000000000
--- a/dev-python/cfn-lint/cfn-lint-0.56.2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-inherit distutils-r1
-
-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
-		-> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-RDEPEND="
-	>=dev-python/aws-sam-translator-1.40.0[${PYTHON_USEDEP}]
-	dev-python/jsonpatch[${PYTHON_USEDEP}]
-	>=dev-python/jschema_to_python-1.2.3[${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/sarif_om-1.0.4[${PYTHON_USEDEP}]
-	>=dev-python/six-1.11[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests --install pytest
-
-EPYTEST_DESELECT=(
-	# TODO
-	test/unit/module/test_template.py::TestTemplate::test_build_graph
-	# requires git repo
-	test/unit/module/maintenance/test_update_documentation.py::TestUpdateDocumentation::test_update_docs
-	# Internet
-	test/unit/module/formatters/test_formatters.py::TestFormatters::test_sarif_formatter
-	test/unit/module/maintenance/test_update_resource_specs.py::TestUpdateResourceSpecs::test_update_resource_specs_python_2
-	test/unit/module/maintenance/test_update_resource_specs.py::TestUpdateResourceSpecs::test_update_resource_specs_python_3
-)
-
-src_prepare() {
-	# unpin the deps
-	sed -e 's:~=[0-9.]*::' -i setup.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/cfn-lint/cfn-lint-0.56.3.ebuild b/dev-python/cfn-lint/cfn-lint-0.56.3.ebuild
index 5c4f98fb8a5a..16a451269f75 100644
--- a/dev-python/cfn-lint/cfn-lint-0.56.3.ebuild
+++ b/dev-python/cfn-lint/cfn-lint-0.56.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/aws-sam-translator-1.42.0[${PYTHON_USEDEP}]
diff --git a/dev-python/deprecated/deprecated-1.2.13.ebuild b/dev-python/deprecated/deprecated-1.2.13.ebuild
index c4cf575b302b..e7b4a01f852a 100644
--- a/dev-python/deprecated/deprecated-1.2.13.ebuild
+++ b/dev-python/deprecated/deprecated-1.2.13.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 sparc x86"
 
 RDEPEND="dev-python/wrapt[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/gast/gast-0.5.3.ebuild b/dev-python/gast/gast-0.5.3.ebuild
index 40a932c368fd..a2448187cab9 100644
--- a/dev-python/gast/gast-0.5.3.ebuild
+++ b/dev-python/gast/gast-0.5.3.ebuild
@@ -12,6 +12,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD PSF-2"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv ~sparc x86"
 
 distutils_enable_tests unittest
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index a5748c4f3dfd..8187cf935962 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -1,2 +1,3 @@
 DIST hypothesis-python-6.30.1.tar.gz 9180975 BLAKE2B 3b0e8e29d74f579a9ace6fc341451992386de3358defcf42936d2d535c31bae07d7ab49fa6d4a8d1a2bd0e8231086dd9795d78125555e668425fba2bc539b224 SHA512 8abf31debf94124744d17d5ddac6698a21981feca7b776e97d92d5f6d1404ec17794bdf11b256dc7b0a335a041af6d3f1f20ae6fd6a62abc1ad78c2b39354fa9
 DIST hypothesis-python-6.31.4.tar.gz 9183157 BLAKE2B a8c82cd2e798b7dc0b149a09d52cdde77677473d91f3192783a8903fa7513ce410a89e67df32a812a12b59ca113b065c52e84fae0632f8a2dd852f4a39e90cbd SHA512 b1783d7463b575afa40418e4d67aff04c025bd9d733b1c6b2ac671d8d1c9a5d58ee7d10ce5e27aaa14156285abb6b182f7ee5f3ebe8eb335421680d20dbb4405
+DIST hypothesis-python-6.32.1.tar.gz 9176925 BLAKE2B 0b57c8b46b766055a19c8831620b6ad780bd1a3b3e4835496cbd01f4fb861c64679171c685797458ec56ff07fe9524840cffce1e1930390de71225b707163880 SHA512 f64b0ca16a47d9f4dbce4986aa2c4414e86e596b6e167bd8be373fda05f8bbb626de7a615861a71313faebde50b1fe55e54c8b20247c71fa4ecb2223de171502
diff --git a/dev-python/hypothesis/hypothesis-6.32.1.ebuild b/dev-python/hypothesis/hypothesis-6.32.1.ebuild
new file mode 100644
index 000000000000..8a8c3349037b
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-6.32.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+PYTHON_REQ_USE="threads(+),sqlite"
+
+inherit distutils-r1 multiprocessing optfeature
+
+DESCRIPTION="A library for property based testing"
+HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
+SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar.gz"
+S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+IUSE="cli"
+
+RDEPEND="
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
+	cli? (
+		$(python_gen_cond_dep '
+			dev-python/black[${PYTHON_USEDEP}]
+			dev-python/click[${PYTHON_USEDEP}]
+		' python3_{8..9})
+	)
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		!!<dev-python/typing-3.7.4.1
+	)
+"
+
+distutils_enable_tests --install pytest
+
+python_prepare() {
+	if ! use cli || ! has "${EPYTHON}" python3.{8..9}; then
+		sed -i -e '/console_scripts/d' setup.py || die
+	fi
+}
+
+python_test() {
+	distutils_install_for_testing
+	epytest tests/cover tests/pytest tests/quality \
+		-p no:pytest-describe \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+}
+
+pkg_postinst() {
+	optfeature "datetime support" dev-python/pytz
+	optfeature "dateutil support" dev-python/python-dateutil
+	optfeature "numpy support" dev-python/numpy
+	optfeature "django support" dev-python/django dev-python/pytz
+	optfeature "pandas support" dev-python/pandas
+	optfeature "pytest support" dev-python/pytest
+}
diff --git a/dev-python/iso8601/Manifest b/dev-python/iso8601/Manifest
index 3bbff74169c5..dcd6c6b1adbb 100644
--- a/dev-python/iso8601/Manifest
+++ b/dev-python/iso8601/Manifest
@@ -1,3 +1 @@
-DIST iso8601-1.0.0.tar.gz 12294 BLAKE2B 71983fdb2d47dd4699af60ee8bb31e94c1b4aab91aad6b107896429ddccc8dd087c955df812ca088667a082febd5f65fdf3c2cb10974f14e32d0f9605ce0c13b SHA512 137fdbe891889428331883c745fc341b7b066e681d7ffa339bd3484663974f35ac0d9f25eaa438603c8d982821832f8f2fddb2a3906889e62affda6d8cfb38e6
-DIST iso8601-1.0.1.tar.gz 12525 BLAKE2B d5211464ad2e4774b25964a38eea95b63bc5fa7619f3d4e40326242b51340a3bc89d690b8112373450d183235ae3cca2888f2f17d604a730f965f04e73d5d331 SHA512 45e18b80b543fb0f9869810378ccaf17e46e046c2739901e881fb40a5b99315fdf893567e50e68a243ae72e268339ed486c07dbc98539904e4096d3357dca04d
 DIST iso8601-1.0.2.tar.gz 12653 BLAKE2B c7dbbe680f2828050b2ff32765da009b5f6dafdbc5182d5136f951f8604d7ff579b85050dbefae47d2b28ce88515b9dd73a8abf73b3419b4cdc4a4dd275b7228 SHA512 f28fbfe82c25575ad73a92df144c108ef3cf4e1a5a9af8362187014904073f26daa3b77dde689a23cfd87cdbf86196b241e925dd8cf5fd81728f0dbeee4836b7
diff --git a/dev-python/iso8601/iso8601-1.0.0.ebuild b/dev-python/iso8601/iso8601-1.0.0.ebuild
deleted file mode 100644
index 9ea5d551aec1..000000000000
--- a/dev-python/iso8601/iso8601-1.0.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Simple module to parse ISO 8601 dates"
-HOMEPAGE="https://pypi.org/project/iso8601/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris"
-
-distutils_enable_tests pytest
diff --git a/dev-python/iso8601/iso8601-1.0.1.ebuild b/dev-python/iso8601/iso8601-1.0.1.ebuild
deleted file mode 100644
index 17fc4a662034..000000000000
--- a/dev-python/iso8601/iso8601-1.0.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Simple module to parse ISO 8601 dates"
-HOMEPAGE="https://pypi.org/project/iso8601/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris"
-
-BDEPEND="
-	test? (
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/iso8601/iso8601-1.0.2.ebuild b/dev-python/iso8601/iso8601-1.0.2.ebuild
index 17fc4a662034..fcee4aa40d71 100644
--- a/dev-python/iso8601/iso8601-1.0.2.ebuild
+++ b/dev-python/iso8601/iso8601-1.0.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 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/jupyter_client/Manifest b/dev-python/jupyter_client/Manifest
index b07246c99a7c..93803696fa45 100644
--- a/dev-python/jupyter_client/Manifest
+++ b/dev-python/jupyter_client/Manifest
@@ -1,3 +1,2 @@
 DIST jupyter_client-6.1.12.tar.gz 301499 BLAKE2B 8041b84ad2e89413ee60d1aee2e49a67a89b5aad1c3118c8fa7d7d719c8ec2acbc72278c9aaea095cdcb89235800d09b1792b2138c09a4aad59ceaaf695af431 SHA512 f31ff1a24b264c32d35d07491785e1d77935cdb463243e90e4aadcb0a093a074cdce75f01662591766588f39b146077639ca697f71157309dc92f12ae04d5cdd
-DIST jupyter_client-7.0.6.tar.gz 320572 BLAKE2B 5c853fbdad3bc044ffaba27534d9bc4682797660cdb5d45121ae8f6cbf0fc5511c6a9fad14d26bd82daef17b32be14e51bf86c2ae672ed9b310141b29307ff9c SHA512 c836ba061da0461d6d27eb0405ba295ff67bf2c99011a21c9695da139c0a14513de292cdfff3ee00c2e1029c2a51f95094ad875a5f9cdec2fd99c3c079526e3b
 DIST jupyter_client-7.1.0.tar.gz 323501 BLAKE2B fa431f70b327a98be3958b2c39a2aa07ab0ec3752f069bc5e6d0645ac0660074974c871b159002dcbf3054c97860dc6b0e289c34826d929f0493479cd9f37ed2 SHA512 eb9456088c19d3780d943fb9457ded5e006afb7e7ebd726d8a253f91107d8e1839cac16e25466c902ff33ed2777e97e18b08e24092ddbb062aa9cf6336dc8921
diff --git a/dev-python/jupyter_client/jupyter_client-7.0.6.ebuild b/dev-python/jupyter_client/jupyter_client-7.0.6.ebuild
deleted file mode 100644
index d2f1a45aaa7f..000000000000
--- a/dev-python/jupyter_client/jupyter_client-7.0.6.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-PYTHON_REQ_USE="threads(+)"
-inherit distutils-r1
-
-DESCRIPTION="Jupyter protocol implementation and client libraries"
-HOMEPAGE="https://jupyter.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/entrypoints[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_core-4.6.0[${PYTHON_USEDEP}]
-	>=dev-python/nest_asyncio-1.5[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
-	>=dev-python/pyzmq-14.4.0[${PYTHON_USEDEP}]
-	>=www-servers/tornado-4.1[${PYTHON_USEDEP}]
-	dev-python/traitlets[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/ipykernel[${PYTHON_USEDEP}]
-		dev-python/ipython[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-7.0.6-test-timeout.patch
-)
-
-EPYTEST_DESELECT=(
-	jupyter_client/tests/test_kernelmanager.py::TestKernelManagerShutDownGracefully::test_signal_kernel_subprocesses
-	jupyter_client/tests/test_kernelmanager.py::TestKernelManagerShutDownGracefully::test_async_signal_kernel_subprocesses
-)
-
-distutils_enable_tests pytest
diff --git a/dev-python/jupyter_client/jupyter_client-7.1.0.ebuild b/dev-python/jupyter_client/jupyter_client-7.1.0.ebuild
index 25b8195b436a..d2f1a45aaa7f 100644
--- a/dev-python/jupyter_client/jupyter_client-7.1.0.ebuild
+++ b/dev-python/jupyter_client/jupyter_client-7.1.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/entrypoints[${PYTHON_USEDEP}]
diff --git a/dev-python/matplotlib/matplotlib-3.5.1.ebuild b/dev-python/matplotlib/matplotlib-3.5.1.ebuild
index 7f378db69057..208aa9bb355b 100644
--- a/dev-python/matplotlib/matplotlib-3.5.1.ebuild
+++ b/dev-python/matplotlib/matplotlib-3.5.1.ebuild
@@ -22,7 +22,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
 # Fonts: BitstreamVera, OFL-1.1
 LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
 SLOT="0"
-KEYWORDS="~amd64 arm arm64 ~hppa ~ia64 ppc ~ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="~amd64 arm arm64 hppa ~ia64 ppc ~ppc64 ~riscv ~s390 sparc ~x86"
 IUSE="cairo doc excel examples gtk3 latex qt5 tk webagg wxwidgets"
 
 # internal copy of pycxx highly patched
diff --git a/dev-python/mkdocs-git-revision-date-localized-plugin/Manifest b/dev-python/mkdocs-git-revision-date-localized-plugin/Manifest
index e4a7b0c8c87d..73f2b4aa1acb 100644
--- a/dev-python/mkdocs-git-revision-date-localized-plugin/Manifest
+++ b/dev-python/mkdocs-git-revision-date-localized-plugin/Manifest
@@ -1,3 +1,3 @@
 DIST mkdocs-git-revision-date-localized-plugin-0.10.0.tar.gz 368270 BLAKE2B c00956c86394bdfc8b2fe9e51e7588362f6bd7bc3bde174c1d387377418a47f56f01137e597405146280bba195ebf7aa5cadf67e9514734e5874df69e4990857 SHA512 8ce742cd995c180372a9d76a96c19f4f7c7b9fafe5c67f13e2c1d7377dc18e071d379cd741cb5f4a84be9f275b3f3d74d23875e766a7dda86498acb0a08d4344
 DIST mkdocs-git-revision-date-localized-plugin-0.10.3.tar.gz 368559 BLAKE2B eb0a1e7f85a99ac6f79ebe8cbb547e4b836bde22909363492b63e0bc40ff139fb1f16c9de5662cbb1ba5ab65f2bb8cd3a6f871bc81b894218c4a7d2b8a37770c SHA512 f5cd242eb48cb50c426c9dad76d36958ed31434090986ab5062d8b57ff941ec4dfd9e1cd1f50ac6713e49751afb476e9bc1d7efadf1cfca19f3de70f08320de7
-DIST mkdocs-git-revision-date-localized-plugin-0.11.tar.gz 369947 BLAKE2B cf0ae8d40818a234d8c974ec7fdbdae1c0a4b33c00b8421f0b6896c3593bfda3de2fb489cf8ee12875a9fa9362f92e27a2e9fb3ad29441f6cd4949dabb146fbd SHA512 c04a78f0e37f3603f0fc377d9a4f17093628c50b1c2488943f2d32fb7f996954bb482952af5311d44002c52dcc02b3f3e85fe5245bab3926118feb69f4c7ad8d
+DIST mkdocs-git-revision-date-localized-plugin-0.11.1.tar.gz 369943 BLAKE2B 261813f3d63d6b1bfb021aab3f9db96f7977ac8f6bf6239158f1d8045e1eb5b21b89f2c4eb493634944b202334f59ce589797624137bfc643cda3ef52969bd73 SHA512 fb5e1c1b65f431585dc6a6887fc079a3181e73286697c331317a69f7748453af61abfb8fc58eb55203f09c9a70c752781dd834d03e13184ddb0bb761aa10e371
diff --git a/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-0.11.ebuild b/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-0.11.1.ebuild
index 9ba3e13858f2..9ba3e13858f2 100644
--- a/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-0.11.ebuild
+++ b/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-0.11.1.ebuild
diff --git a/dev-python/pytest-httpx/Manifest b/dev-python/pytest-httpx/Manifest
index 398a8f1e759e..c2365991ac3d 100644
--- a/dev-python/pytest-httpx/Manifest
+++ b/dev-python/pytest-httpx/Manifest
@@ -1,2 +1,3 @@
 DIST pytest-httpx-0.13.0.tar.gz 21515 BLAKE2B 691ce45dd2b27c8f47724e3356ba96e62a0d6a7ce7d3feea68295a873c12f9a3df00d5b25aad7ef8a1154e887077ae6f6c1b12f3685a0669534a0d0ee8aae68c SHA512 514d9acacdfd60d13b5ce2c5ebe46d0e4d16c1b06fd359b0b9515ae2fa9091296537f369882a78bdfad48e9a0aad0b2f8c172c2e54f4ae9e23ba03220c7c17fb
 DIST pytest-httpx-0.17.1.tar.gz 23310 BLAKE2B 3b26a50380916a556657a02bc4d44ceb523261f14404eaf3461dae8adb99e913e820c55942bc200b6d23f85447bf74e37c8cbfea2c934489e5d91a56f47b186a SHA512 8fa9447bf50f9bf46ad781abbf9e5d46609e2796a6ec26d39b15c1cda99fc936af6b540c27f9cbe4f40948f041ceedd074c312815fe5ea6b023da20112c83f69
+DIST pytest-httpx-0.17.2.tar.gz 23385 BLAKE2B 17a00a7c733bca7faf8e05914c0744288fe8555bc9d8f94d45ce0162b86417fcf608d339d9d4a24514e2897db879a6d13c41f665a8cf5d3c1ac1769c246a582e SHA512 aaeded94d204d53bf96f802668449361c291d4b0accbe614d8c80d609482f6b10945afb255b81d4199187f3c50cb98d35d5acfd75423283907223ca924b85444
diff --git a/dev-python/pytest-httpx/pytest-httpx-0.17.2.ebuild b/dev-python/pytest-httpx/pytest-httpx-0.17.2.ebuild
new file mode 100644
index 000000000000..dda4c402aa99
--- /dev/null
+++ b/dev-python/pytest-httpx/pytest-httpx-0.17.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+inherit distutils-r1
+
+MY_PN="${PN/-/_}"
+DESCRIPTION="Send responses to HTTPX using pytest"
+HOMEPAGE="https://colin-b.github.io/pytest_httpx/"
+SRC_URI="https://github.com/Colin-b/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	=dev-python/httpx-0.21*[${PYTHON_USEDEP}]
+	=dev-python/pytest-6*[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests --install pytest
diff --git a/dev-python/pythran/pythran-0.10.0.ebuild b/dev-python/pythran/pythran-0.10.0.ebuild
index 93c243704a0e..95f723e84084 100644
--- a/dev-python/pythran/pythran-0.10.0.ebuild
+++ b/dev-python/pythran/pythran-0.10.0.ebuild
@@ -18,7 +18,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm arm64 ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	=dev-python/beniget-0.4*[${PYTHON_USEDEP}]
diff --git a/dev-python/redis-py/redis-py-4.0.2.ebuild b/dev-python/redis-py/redis-py-4.0.2.ebuild
index 63398b7a047c..2320fd534b26 100644
--- a/dev-python/redis-py/redis-py-4.0.2.ebuild
+++ b/dev-python/redis-py/redis-py-4.0.2.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 arm arm64 ~hppa ppc ppc64 sparc ~x86"
 
 RDEPEND="
 	dev-python/deprecated[${PYTHON_USEDEP}]"
diff --git a/dev-python/rope/Manifest b/dev-python/rope/Manifest
index a52b96d5b9e7..2609619a09f8 100644
--- a/dev-python/rope/Manifest
+++ b/dev-python/rope/Manifest
@@ -1,2 +1 @@
-DIST rope-0.21.0.tar.gz 256456 BLAKE2B f9ed997933794caaeaee7c9951ea46c1fc50983f93433b227151366f720198f96966faa28993d2a8a54e667a34cc318c322068bc47fd38789c9604aea9586c53 SHA512 b1b882087b235849b04beeb85c253eecdcc06e0d75ba54975db9c4e60e68178f7acb87a58a9a24dc942994cfbfc3662e05000d00965278697b0db412411b4c44
 DIST rope-0.22.0.tar.gz 260138 BLAKE2B 11aff47af50225d66ade44a63a2c747bc11f0adcec1abed2dff71466f088f1460b3eec541db326af545f89907eb9d4f518c24ec8a445ca07b3116573883123ec SHA512 ead82eba834890d90a6972cc432d153b977a123588621712b50decf1f1bfff03cd411e3615dff63a5272cf4a46b32791ea625f30e3dfdf9d1969081a99544396
diff --git a/dev-python/rope/rope-0.21.0.ebuild b/dev-python/rope/rope-0.21.0.ebuild
deleted file mode 100644
index 08cc04102ddb..000000000000
--- a/dev-python/rope/rope-0.21.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="Python refactoring library"
-HOMEPAGE="https://github.com/python-rope/rope"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc"
-
-# Dependency for docbuild documentation which is not noted in
-# setup.py, using standard docutils builds docs successfully.
-BDEPEND="
-	doc? ( dev-python/docutils[${PYTHON_USEDEP}] )
-	test? ( dev-python/pytest-timeout[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests pytest
-
-python_compile_all() {
-	if use doc; then
-		pushd docs > /dev/null || die
-		mkdir build || die
-		local i
-		for i in ./*.rst; do
-			rst2html.py $i > ./build/${i/rst/html} || die
-		done
-		popd > /dev/null || die
-	fi
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/build/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/rope/rope-0.22.0.ebuild b/dev-python/rope/rope-0.22.0.ebuild
index a85054180d87..08cc04102ddb 100644
--- a/dev-python/rope/rope-0.22.0.ebuild
+++ b/dev-python/rope/rope-0.22.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 # Dependency for docbuild documentation which is not noted in
diff --git a/dev-python/scipy/Manifest b/dev-python/scipy/Manifest
index ab7dc2d11b63..88d145b73116 100644
--- a/dev-python/scipy/Manifest
+++ b/dev-python/scipy/Manifest
@@ -1,11 +1,7 @@
-DIST scipy-1.6.2.tar.gz 27187804 BLAKE2B af3578bc029c3af548c04144d7405ac8e6f8e057f870394e124f24aea9989120275407e5a7fdd29fbe1019d2acc295c1ce00872461ecf3a325000e8817cd559f SHA512 18b03f32e8343c5a6c6148ac0bfd4b5f2cc9ff5f74d5d41761ae9e773d6af8774c7b09a3fcc47122864eccce1dbbc17e9325819885d3fc3ab2baf98e7d3befa4
 DIST scipy-1.6.3.tar.gz 27187987 BLAKE2B 30f7171ca0dc0842f254472f4b52c0b0ad4389964a140cc4b94f9d85437c5a7da238c082be503242d433f1d3c65c3fd4afeb2f7831eea39ce303077406e718df SHA512 10ff25da84ce09ae231e781873902d8040d79868721d75a3f9facee177e7f46f7c9c34374feee6fe2253ddd968716d2993658ce514c4ac0c98d255c06a6ef808
 DIST scipy-1.7.1.tar.gz 36102628 BLAKE2B 67a414d863c61bf419fa907b9bed53b57beedc20d71d0630fac9719f02e951ea79b893d0803b385936a7c04a6c2f723d3870f0498f71e3c210ccd6ee75a009dc SHA512 81fea7e4f5fbcd537d662273507b6ac75bd4cf900567da8083ac86fb06d9f96b010d01a1697db53211440f0fdb2d89510313bafd3d383284d0ab9a08311dd102
-DIST scipy-1.7.2.tar.gz 36104529 BLAKE2B 8e31a71e8cd69a83e1b60747a01e34f79e42664089a2c41aa263c1697a689464fde0b467063e0ae3bafa37721294a79e21d0eedc6023c1558aea6e0105aefeae SHA512 87596430571ff2a43f067eaaf3254c0841dac82b9152cb64040f1a4d9bc5429aebc31c619ce55d74727f2a79567dfef4acbc6252c24c46d3c8849f97e6e8cfef
 DIST scipy-1.7.3.tar.gz 36102562 BLAKE2B 9a605a45d8f03aae3411a6fa92e32c7f6d10373455493ead847d4ad01429b55dbbc33c1a0309d6c9d76d3e9ab1a06772df59c08d393377896c4b534599f9eb9b SHA512 83fe00cf708a13a08d28af7022ec645d8976c177f2fefb56e0a47bfcbec726330b973d1f44364e23c939ae708e239a05904346f515ea1a37e8b70ad160b81cee
-DIST scipy-html-1.6.1.zip 23946591 BLAKE2B d3464c342b1d4f43e17e214c7557737913bf4131f88b9d569cff106c75dc7ebf0d065283792fddc189e2a3ddc322f1b2b4f38c6d313569f28395e79680060b58 SHA512 73561f9daa303c6e967f9b11952c6239dea7ff1a2fa02434354ac78fcffe7a552aa0f1043a17cb5c35a442def499eff199856cca8efa1415449cbf54f0d4913b
 DIST scipy-html-1.6.2.zip 23947380 BLAKE2B e4616a157c037b0830fc32d23678fb7e8ebe023d1fd9f0f762695a0d93bc56e432e441e675ec3c7a7d6586a665f6127ce49d570f1716876e58afb402761f8e95 SHA512 119a2227a808c752a751bc7bec6463da739c68391ebac8d2451998d90ebe03b2af401adbf987f0b694244e715c0ef1fd86c2f4a36c48dbb1ff7cdf4d914875df
 DIST scipy-html-1.7.1.zip 32435246 BLAKE2B fd8173da41aba95a14b1376f848bc668c4659bf1bbbdd0f87d926633d36f29c039957d38be145a5583010ebd83f6458090f75bdad773cc0f1591664e13c04c20 SHA512 ee59722878f6ef2d2319cdf4e6a60d3d1184f7c22752f9a8859eaa46fb677ebac9e8eef9c0826998e12bac9399e336799843341ef203224a82c9101347149672
-DIST scipy-ref-1.6.1.pdf 34594740 BLAKE2B 905ddcd7a3d462b09ded688f0818204d7684fa18058d0dac480d0a000e9ea0b7ebcdd33c01adae17234dcdf630d4aef9078174127af46f1db55d5c14b3245346 SHA512 355f4681439c1720f45dca6badfe72d77edfca0962fd9b42df34f1cd8fff7121fa6e7f60570bb638abd3ba9693930fa46b25af862d8fc1568b508c6fdd785479
 DIST scipy-ref-1.6.2.pdf 34599668 BLAKE2B 9ae3221c814eb0d1b1e9191e08000955af503f6448cf8b5841e400fad106c658670339219f4838bd312023601776fe0b0d123ebbd41460c478145da2ac3e9989 SHA512 9aecb7ca760805c470c41121268281c9547aef35ddf078816c5e48f7cf4912a67cf622e267152c6cc823df9d82be1f3a875d97469169d0d91d6219164c130c88
 DIST scipy-ref-1.7.1.pdf 33542025 BLAKE2B 6c978f06b770805f0fae06db740e8596658d98bbbc93c865127eae909957503bb38e02a9c97319aed07608718f8f373374b1cf3a8c3bd624aa3143f1d21bc428 SHA512 45720dc299594bac5c7539f950a0ff135b125d86bfe9847032cbff1f294601fefd0a1ac3fd7e3928b2702390c318ae2f8adca6403ba06ea1ded705fcff94ab79
diff --git a/dev-python/scipy/scipy-1.6.2.ebuild b/dev-python/scipy/scipy-1.6.2.ebuild
deleted file mode 100644
index ddf54b915c21..000000000000
--- a/dev-python/scipy/scipy-1.6.2.ebuild
+++ /dev/null
@@ -1,155 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit fortran-2 distutils-r1 flag-o-matic multiprocessing toolchain-funcs
-
-# upstream is slacking forever with doc updates
-DOC_PV=1.6.1
-DESCRIPTION="Scientific algorithms library for Python"
-HOMEPAGE="https://www.scipy.org/"
-SRC_URI="
-	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
-	doc? (
-		https://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-html-${DOC_PV}.zip
-		https://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-ref-${DOC_PV}.pdf
-	)"
-
-LICENSE="BSD LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="doc sparse"
-
-DEPEND="
-	>=dev-python/numpy-1.16.5[lapack,${PYTHON_USEDEP}]
-	sci-libs/arpack:0=
-	virtual/cblas
-	virtual/lapack
-	sparse? ( sci-libs/umfpack:0= )"
-RDEPEND="${DEPEND}
-	dev-python/pillow[${PYTHON_USEDEP}]"
-BDEPEND="
-	dev-lang/swig
-	>=dev-python/cython-0.29.18[${PYTHON_USEDEP}]
-	dev-python/pybind11[${PYTHON_USEDEP}]
-	virtual/pkgconfig
-	doc? ( app-arch/unzip )
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-	)"
-
-DISTUTILS_IN_SOURCE_BUILD=1
-
-distutils_enable_tests pytest
-
-src_unpack() {
-	default
-	if use doc; then
-		unzip -qo "${DISTDIR}"/${PN}-html-${DOC_PV}.zip -d html || die
-	fi
-}
-
-pc_incdir() {
-	$(tc-getPKG_CONFIG) --cflags-only-I $@ | \
-		sed -e 's/^-I//' -e 's/[ ]*-I/:/g' -e 's/[ ]*$//' -e 's|^:||'
-}
-
-pc_libdir() {
-	$(tc-getPKG_CONFIG) --libs-only-L $@ | \
-		sed -e 's/^-L//' -e 's/[ ]*-L/:/g' -e 's/[ ]*$//' -e 's|^:||'
-}
-
-pc_libs() {
-	$(tc-getPKG_CONFIG) --libs-only-l $@ | \
-		sed -e 's/[ ]-l*\(pthread\|m\)\([ ]\|$\)//g' \
-		-e 's/^-l//' -e 's/[ ]*-l/,/g' -e 's/[ ]*$//' \
-		| tr ',' '\n' | sort -u | tr '\n' ',' | sed -e 's|,$||'
-}
-
-python_prepare_all() {
-	# scipy automatically detects libraries by default
-	export {FFTW,FFTW3,UMFPACK}=None
-	use sparse && unset UMFPACK
-	# the missing symbols are in -lpythonX.Y, but since the version can
-	# differ, we just introduce the same scaryness as on Linux/ELF
-	[[ ${CHOST} == *-darwin* ]] \
-		&& append-ldflags -bundle "-undefined dynamic_lookup" \
-		|| append-ldflags -shared
-	[[ -z ${FC}  ]] && export FC="$(tc-getFC)"
-	# hack to force F77 to be FC until bug #278772 is fixed
-	[[ -z ${F77} ]] && export F77="$(tc-getFC)"
-	export F90="${FC}"
-	export SCIPY_FCONFIG="config_fc --noopt --noarch"
-	append-fflags -fPIC
-
-	local libdir="${EPREFIX}"/usr/$(get_libdir)
-	cat >> site.cfg <<-EOF || die
-		[blas]
-		include_dirs = $(pc_incdir cblas)
-		library_dirs = $(pc_libdir cblas blas):${libdir}
-		blas_libs = $(pc_libs cblas blas)
-		[lapack]
-		library_dirs = $(pc_libdir lapack):${libdir}
-		lapack_libs = $(pc_libs lapack)
-	EOF
-	cat >> setup.cfg <<-EOF || die
-		[options]
-		zip_safe = False
-	EOF
-
-	# Drop hashes to force rebuild of cython based .c code
-	rm cythonize.dat || die
-
-	# TODO
-	sed -e "s:== 'levy_stable':in ('levy_stable', 'crystalball', 'ncf'):" \
-		-i scipy/stats/tests/test_continuous_basic.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	# bug 721860
-	test-flag-FC -fallow-argument-mismatch &&
-		append-fflags -fallow-argument-mismatch
-}
-
-python_compile() {
-	# FIXME: parallel python building fails, bug #614464
-	export MAKEOPTS=-j1
-
-	${EPYTHON} tools/cythonize.py || die
-	distutils-r1_python_compile \
-		${SCIPY_FCONFIG}
-}
-
-python_test() {
-	# fails with bdist_egg. should it be fixed in distutils-r1 eclass?
-	distutils_install_for_testing ${SCIPY_FCONFIG}
-	cd "${TEST_DIR}/lib" || die "no ${TEST_DIR} available"
-	PYTHONPATH=. "${EPYTHON}" -c "
-import scipy, sys
-r = scipy.test('fast', verbose=2)
-sys.exit(0 if r else 1)" || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && \
-		local DOCS=( "${DISTDIR}"/${PN}-ref-${DOC_PV}.pdf ) \
-		local HTML_DOCS=( "${WORKDIR}"/html/. )
-	distutils-r1_python_install_all
-}
-
-python_install() {
-	distutils-r1_python_install ${SCIPY_FCONFIG}
-	python_optimize
-}
-
-pkg_postinst() {
-	elog "You might want to set the variable SCIPY_PIL_IMAGE_VIEWER"
-	elog "to your prefered image viewer. Example:"
-	elog "    echo \"export SCIPY_PIL_IMAGE_VIEWER=display\" >> ~/.bashrc"
-}
diff --git a/dev-python/scipy/scipy-1.7.1-r1.ebuild b/dev-python/scipy/scipy-1.7.1-r1.ebuild
index 01e81db6075c..50f5e1b1cd8a 100644
--- a/dev-python/scipy/scipy-1.7.1-r1.ebuild
+++ b/dev-python/scipy/scipy-1.7.1-r1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="BSD LGPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ia64 ~ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~ia64 ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="doc +pythran sparse"
 
 DEPEND="
diff --git a/dev-python/scipy/scipy-1.7.2.ebuild b/dev-python/scipy/scipy-1.7.2.ebuild
deleted file mode 100644
index 2d356a568593..000000000000
--- a/dev-python/scipy/scipy-1.7.2.ebuild
+++ /dev/null
@@ -1,185 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit fortran-2 distutils-r1 flag-o-matic toolchain-funcs
-
-# upstream is slacking forever with doc updates
-DOC_PV=1.7.1
-DESCRIPTION="Scientific algorithms library for Python"
-HOMEPAGE="https://www.scipy.org/"
-SRC_URI="
-	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
-	doc? (
-		https://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-html-${DOC_PV}.zip
-		https://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-ref-${DOC_PV}.pdf
-	)"
-
-LICENSE="BSD LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 -hppa ~ia64 ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="doc +pythran sparse"
-
-DEPEND="
-	>=dev-python/numpy-1.16.5[lapack,${PYTHON_USEDEP}]
-	sci-libs/arpack:0=
-	virtual/cblas
-	virtual/lapack
-	sparse? ( sci-libs/umfpack:0= )"
-RDEPEND="${DEPEND}
-	dev-python/pillow[${PYTHON_USEDEP}]"
-BDEPEND="
-	dev-lang/swig
-	>=dev-python/cython-0.29.18[${PYTHON_USEDEP}]
-	dev-python/pybind11[${PYTHON_USEDEP}]
-	virtual/pkgconfig
-	doc? ( app-arch/unzip )
-	pythran? ( dev-python/pythran[${PYTHON_USEDEP}] )
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-	)"
-
-DISTUTILS_IN_SOURCE_BUILD=1
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.7.1-pythran-tests-32-bit.patch
-)
-
-src_unpack() {
-	default
-	if use doc; then
-		unzip -qo "${DISTDIR}"/${PN}-html-${DOC_PV}.zip -d html || die
-	fi
-}
-
-pc_incdir() {
-	$(tc-getPKG_CONFIG) --cflags-only-I $@ | \
-		sed -e 's/^-I//' -e 's/[ ]*-I/:/g' -e 's/[ ]*$//' -e 's|^:||'
-}
-
-pc_libdir() {
-	$(tc-getPKG_CONFIG) --libs-only-L $@ | \
-		sed -e 's/^-L//' -e 's/[ ]*-L/:/g' -e 's/[ ]*$//' -e 's|^:||'
-}
-
-pc_libs() {
-	$(tc-getPKG_CONFIG) --libs-only-l $@ | \
-		sed -e 's/[ ]-l*\(pthread\|m\)\([ ]\|$\)//g' \
-		-e 's/^-l//' -e 's/[ ]*-l/,/g' -e 's/[ ]*$//' \
-		| tr ',' '\n' | sort -u | tr '\n' ',' | sed -e 's|,$||'
-}
-
-python_prepare_all() {
-	# scipy automatically detects libraries by default
-	export {FFTW,FFTW3,UMFPACK}=None
-	use sparse && unset UMFPACK
-	# the missing symbols are in -lpythonX.Y, but since the version can
-	# differ, we just introduce the same scaryness as on Linux/ELF
-	[[ ${CHOST} == *-darwin* ]] \
-		&& append-ldflags -bundle "-undefined dynamic_lookup" \
-		|| append-ldflags -shared
-	[[ -z ${FC}  ]] && export FC="$(tc-getFC)"
-	# hack to force F77 to be FC until bug #278772 is fixed
-	[[ -z ${F77} ]] && export F77="$(tc-getFC)"
-	export F90="${FC}"
-	export SCIPY_FCONFIG="config_fc --noopt --noarch"
-	append-fflags -fPIC
-
-	local libdir="${EPREFIX}"/usr/$(get_libdir)
-	cat >> site.cfg <<-EOF || die
-		[blas]
-		include_dirs = $(pc_incdir cblas)
-		library_dirs = $(pc_libdir cblas blas):${libdir}
-		blas_libs = $(pc_libs cblas blas)
-		[lapack]
-		library_dirs = $(pc_libdir lapack):${libdir}
-		lapack_libs = $(pc_libs lapack)
-	EOF
-	cat >> setup.cfg <<-EOF || die
-		[options]
-		zip_safe = False
-	EOF
-
-	# TODO
-	sed -e "s:== 'levy_stable':in ('levy_stable', 'crystalball', 'ncf'):" \
-		-i scipy/stats/tests/test_continuous_basic.py || die
-
-	# Skip known-failing test. Broken on all versions in Gentoo for years.
-	# bug #743295
-	sed -e 's:test_bisplev_integer_overflow:_&:' \
-			-i scipy/interpolate/tests/test_fitpack.py || die
-
-	# Skip a few 32-bit related failures
-	if use x86 ; then
-		# TODO: Tidy this up and switch to epytest
-		sed -i -e 's:test_nd_axis_m1:_&:' \
-			-e 's:test_nd_axis_0:_&:' \
-			-e 's:test_maxiter_worsening:_&:' \
-			-e 's:test_pdist_jensenshannon_iris:_&:' \
-			-e 's:test_align_vectors_single_vector:_&:' \
-			scipy/signal/tests/test_spectral.py \
-			scipy/sparse/linalg/isolve/tests/test_iterative.py \
-			scipy/spatial/tests/test_distance.py \
-			scipy/spatial/transform/tests/test_rotation.py || die
-	fi
-
-	if has_version ">=sci-libs/lapack-3.10"; then
-		sed -e 's:test_sort(:_&:' \
-			-i scipy/linalg/tests/test_decomp.py || die
-		sed -e 's:test_solve_discrete_are:_&:' \
-			-i scipy/linalg/tests/test_solvers.py || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	export SCIPY_USE_PYTHRAN=$(usex pythran 1 0)
-
-	# bug 721860
-	test-flag-FC -fallow-argument-mismatch &&
-		append-fflags -fallow-argument-mismatch
-}
-
-python_compile() {
-	# FIXME: parallel python building fails, bug #614464
-	export MAKEOPTS=-j1
-
-	${EPYTHON} tools/cythonize.py || die
-	distutils-r1_python_compile \
-		${SCIPY_FCONFIG}
-}
-
-python_test() {
-	# fails with bdist_egg. should it be fixed in distutils-r1 eclass?
-	distutils_install_for_testing ${SCIPY_FCONFIG}
-	cd "${TEST_DIR}/lib" || die "no ${TEST_DIR} available"
-	PYTHONPATH=. "${EPYTHON}" -c "
-import scipy, sys
-r = scipy.test('fast', verbose=2)
-sys.exit(0 if r else 1)" || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && \
-		local DOCS=( "${DISTDIR}"/${PN}-ref-${DOC_PV}.pdf ) \
-		local HTML_DOCS=( "${WORKDIR}"/html/. )
-	distutils-r1_python_install_all
-}
-
-python_install() {
-	distutils-r1_python_install ${SCIPY_FCONFIG}
-	python_optimize
-}
-
-pkg_postinst() {
-	elog "You might want to set the variable SCIPY_PIL_IMAGE_VIEWER"
-	elog "to your prefered image viewer. Example:"
-	elog "    echo \"export SCIPY_PIL_IMAGE_VIEWER=display\" >> ~/.bashrc"
-}
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index 658bbb7aa09e..c4900e28f90d 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -10,3 +10,4 @@ DIST setuptools-60.0.0.tar.gz 2282339 BLAKE2B ad9a78df348c71d4374ccd773495cc3bfd
 DIST setuptools-60.0.2.tar.gz 2284789 BLAKE2B b3763673e65ae7e6e7d8d2e7bb5d4b72e348a873496d5d0ffdb85daa2a65280fdd71be411132ee92717fd5f3437e10c36d244b0389d0a845b8f1ecd6f2094514 SHA512 1323c5993fcb1d8f23c6fc88d217af59d08d0130d06e84d38f0ac5ed6e3bf6d5595027a8f9430f3441d9a065686562d79b413ed32771276410a31f3addcde116
 DIST setuptools-60.0.3.tar.gz 2284909 BLAKE2B 39fab878aa5d9ae4712088a96548cf3312070c6bca59d6fb22642bc5fb9919acf1ad151c63f812a5bdddffdb657fff9631330d93685e9a54e569daaa5b3f2760 SHA512 3020182f30f85eef07952085aed90db42e205abe754eb130327651edd3fdb7fcca52b0654d6c7bc69e5b33920549675f2325bebdc4c71425e212275f49572a10
 DIST setuptools-60.0.4.tar.gz 2282600 BLAKE2B bc2e9c38f9646babce1144cfc1751c034fa2783149ad47c8365a4a2e56b4176b6f0e7a44d1cb5567c34b792cb85b52a7553be09eee34d8f079e67f0a09fb54a6 SHA512 f3dae0e4ac9553a35864978db24041f26b7ea05ba07a7f791a30d3910b23d50eb44b75b9f06f1644c0409344aff153b09417b520957d01bccf6413cdaecf9ced
+DIST setuptools-60.0.5.tar.gz 2285236 BLAKE2B 75255465933957e5e8a6cab84d27c0bbab506c70db80c4bfad5d81c61f5ef331fd3d0eec7769cc7da35f670f120d571d455dab40abbaf88e95cec83349a97e6f SHA512 0a92953b9650a06b30b1c3dc8e24ea462ccdd78b177ce0f372dc62cf8395d3df2e25b53d74d174b86e1b44e7ee1dc1852ab6c49d9f78972acd551b692fcc4b49
diff --git a/dev-python/setuptools/setuptools-60.0.5.ebuild b/dev-python/setuptools/setuptools-60.0.5.ebuild
new file mode 100644
index 000000000000..d386091769f9
--- /dev/null
+++ b/dev-python/setuptools/setuptools-60.0.5.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
+EAPI=7
+
+# Set to 'manual' to avoid triggering install QA check
+DISTUTILS_USE_SETUPTOOLS=manual
+PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1 multiprocessing
+
+CPY_PATCHSET="python-gentoo-patches-3.10.0_p1"
+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}.tar.gz
+	https://dev.gentoo.org/~floppym/python/${CPY_PATCHSET}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/jaraco-envs[${PYTHON_USEDEP}]
+			>=dev-python/jaraco-path-3.2.0[${PYTHON_USEDEP}]
+			dev-python/mock[${PYTHON_USEDEP}]
+			dev-python/pip[${PYTHON_USEDEP}]
+			dev-python/sphinx[${PYTHON_USEDEP}]
+			dev-python/pytest[${PYTHON_USEDEP}]
+			dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
+			dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
+			dev-python/pytest-xdist[${PYTHON_USEDEP}]
+			>=dev-python/virtualenv-20[${PYTHON_USEDEP}]
+			dev-python/wheel[${PYTHON_USEDEP}]
+		' python3_{8..10} pypy3)
+	)
+"
+PDEPEND="
+	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
+
+# Force in-source build because build system modifies sources.
+DISTUTILS_IN_SOURCE_BUILD=1
+
+DOCS=( {CHANGES,README}.rst )
+
+src_prepare() {
+	# apply distutils patches to the bundled distutils
+	pushd setuptools/_distutils >/dev/null || die
+	# TODO: distutils C++ patch?
+	eapply -p3 "${WORKDIR}/${CPY_PATCHSET}/0006-distutils-make-OO-enable-both-opt-1-and-opt-2-optimi.patch"
+	popd >/dev/null || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local -x SETUPTOOLS_USE_DISTUTILS=stdlib
+
+	# keep in sync with python_gen_cond_dep above!
+	has "${EPYTHON}" python3.{8..10} pypy3 || continue
+
+	distutils_install_for_testing
+	local EPYTEST_DESELECT=(
+		# network
+		setuptools/tests/test_distutils_adoption.py
+		'setuptools/tests/test_virtualenv.py::test_pip_upgrade_from_source[None]'
+		# unhappy with pytest-xdist?
+		setuptools/tests/test_easy_install.py::TestUserInstallTest::test_local_index
+		# TODO
+		setuptools/tests/test_easy_install.py::TestSetupRequires::test_setup_requires_with_allow_hosts
+		setuptools/tests/test_test.py::test_tests_are_run_once
+	)
+
+	# test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
+	# It tries to sandbox the test in a tempdir
+	HOME="${PWD}" epytest \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" setuptools
+}
+
+python_install() {
+	export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
+	distutils-r1_python_install
+}
diff --git a/dev-python/tikzplotlib/Manifest b/dev-python/tikzplotlib/Manifest
index 08ee20e637d9..ed97defb17f0 100644
--- a/dev-python/tikzplotlib/Manifest
+++ b/dev-python/tikzplotlib/Manifest
@@ -1 +1,2 @@
 DIST tikzplotlib-0.9.16.tar.gz 98162 BLAKE2B de32064cd8cb6f3fbd8e067c8126a86da6d9836dc42d91d42fd8ad6ba9f8fc2a1001904d370cb756e76112a0d746247f6235fe40af277a7142bdc6264b1ee531 SHA512 7633b7e8ee23aed8da3df249a7dbc4e36667950d2c5caef5845b5468a61f5cb0191cad3253cc7940d19be56a7981d33c70c9d45ce0d9329286266af6f36c2d94
+DIST tikzplotlib-0.9.17.tar.gz 98194 BLAKE2B 746bd940805fa7bcef56398f974ad13c54814c7192ed8c85bdcfdf2fbeb93a0016d810a0b532120a404053e0666352c07f5f0db97b3241574fbcda3ad464664f SHA512 3708eba0d77890a919c7e974569fcf4cf1c798199927bd2771e8952f6ea49a10a6b85d605c3d6c4969e16bf47eb1683557f8bbefdf986f043049aa6b0c37a8ff
diff --git a/dev-python/tikzplotlib/tikzplotlib-0.9.17.ebuild b/dev-python/tikzplotlib/tikzplotlib-0.9.17.ebuild
new file mode 100644
index 000000000000..d1f10e4ed7b4
--- /dev/null
+++ b/dev-python/tikzplotlib/tikzplotlib-0.9.17.ebuild
@@ -0,0 +1,39 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Convert matplotlib figures into TikZ/PGFPlots"
+HOMEPAGE="https://github.com/nschloe/tikzplotlib"
+SRC_URI="https://github.com/nschloe/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	app-text/texlive[extra]
+	<dev-python/matplotlib-3.5[latex,${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		dev-python/exdown[${PYTHON_USEDEP}]
+		dev-python/pandas[${PYTHON_USEDEP}]
+		dev-python/scipy[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx doc dev-python/mock
+
+python_test() {
+	local -x MPLBACKEND=Agg
+	virtx epytest
+}
diff --git a/dev-python/tinycss2/Manifest b/dev-python/tinycss2/Manifest
index b16817c0ddc8..89c74b1fb5a4 100644
--- a/dev-python/tinycss2/Manifest
+++ b/dev-python/tinycss2/Manifest
@@ -1,3 +1,2 @@
 DIST css-parsing-tests-c5749e51dda3868b3e8062e65a36584c2fec8059.gh.tar.gz 35758 BLAKE2B d834011c3ac774eb79b35e2e74f3854ddc2bb871531a32194041d6f98bde3dc68db67baea25d5463a03e057197144237be69fee4eacfb8edb73167e6e4faf7be SHA512 ef44eb1144a6484f308fabe4187310b2ef0067f328bf5213969d87c475fccae3d716dc66640a0a554ab2a3d7da0efb3a168a288ac6eef7722f3ae46959943b49
-DIST tinycss2-1.1.0.gh.tar.gz 28205 BLAKE2B 46ba3f705522067e5b7aa5fdbc89f8980598e7e81b39114052b428e8c21b1a90fb3a9082bd51bbc0c6719adf6f0be285683b125886afe1a957013164f3b89428 SHA512 e1ed2679c09a0814d6deca069c68521e6ceef80f4a9cc16ab359dc5ee7ef97d0c7335680702548b023b1a48c5aeb838e29bf1b55f64698913dd16ae33a478a2b
 DIST tinycss2-1.1.1.gh.tar.gz 28261 BLAKE2B f86b25be62c4c107dd6dca0b9e49605bc0c04b6ec48c4283fa7a5a33249032dcc3a42bdb9910d6235da4c4ddbf581ef8ebdc404c3bb32eeca7f355c0081e6fb7 SHA512 788b57fbadd299a4d4745bcc1814a2ebf6db76e337f2de2637ffc1610a3dac5a70f01bb9ffbb2afbdb0c638a6b23cc1b2f199eebfbb77d84906a9da5dfecada6
diff --git a/dev-python/tinycss2/tinycss2-1.1.0.ebuild b/dev-python/tinycss2/tinycss2-1.1.0.ebuild
deleted file mode 100644
index 864c2235fcea..000000000000
--- a/dev-python/tinycss2/tinycss2-1.1.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-inherit distutils-r1
-
-CSS_TEST_COMMIT_ID=c5749e51dda3868b3e8062e65a36584c2fec8059
-
-DESCRIPTION="A complete yet simple CSS parser for Python"
-HOMEPAGE="https://github.com/Kozea/tinycss2/
-	https://pypi.org/project/tinycss2/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-SRC_URI="
-	https://github.com/Kozea/tinycss2/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz
-	test? (
-		https://github.com/SimonSapin/css-parsing-tests/archive/${CSS_TEST_COMMIT_ID}.tar.gz
-			-> css-parsing-tests-${CSS_TEST_COMMIT_ID}.gh.tar.gz
-	)"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
-
-RDEPEND=">=dev-python/webencodings-0.4[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e '/addopts/d' pyproject.toml || die
-	if use test; then
-		mv "${WORKDIR}/css-parsing-tests-${CSS_TEST_COMMIT_ID}"/* \
-			tests/css-parsing-tests/ || die
-	fi
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/tinycss2/tinycss2-1.1.1.ebuild b/dev-python/tinycss2/tinycss2-1.1.1.ebuild
index 9820b7df6c23..b89fd2cdb4fc 100644
--- a/dev-python/tinycss2/tinycss2-1.1.1.ebuild
+++ b/dev-python/tinycss2/tinycss2-1.1.1.ebuild
@@ -23,7 +23,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 
 RDEPEND=">=dev-python/webencodings-0.4[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/wtforms/Manifest b/dev-python/wtforms/Manifest
index 6e3f707f4717..a3850a254177 100644
--- a/dev-python/wtforms/Manifest
+++ b/dev-python/wtforms/Manifest
@@ -1 +1,2 @@
 DIST WTForms-3.0.0.tar.gz 137053 BLAKE2B 518dfadf248a70fd0627a822c646e884709e295517bc187750e42296896db16dddbe95aa67bf29624147e77fc9db7deb46f3ebc3558801f7b8a5895116df1922 SHA512 dbed8706a317022be07f9568d11c7dab6021642957efab38e547b7b1b83b1ac8863a521b8fb0f5f4ec15cdc2966520a76d079a00ea88ce56f40a42b335fcfc6e
+DIST WTForms-3.0.1.tar.gz 137513 BLAKE2B 17fbb385a28baefaf3fe368b7c7dbd3d6671aaef887ee89617e60e0537ae060248442d4990e7ea926b15d4b85585a1c80ffb61c0fdad2627e5cca90799eb01d7 SHA512 a6db54a7ef9bc96b8fdf69cd65d3810fab9436ff9c056e1cfc580f5ecd0ed8837dcbb7c2adf92419cc5f74e865bb3a023e316407a87d5c5277da5d30e6836fb3
diff --git a/dev-python/wtforms/wtforms-3.0.1.ebuild b/dev-python/wtforms/wtforms-3.0.1.ebuild
new file mode 100644
index 000000000000..1b5fad524810
--- /dev/null
+++ b/dev-python/wtforms/wtforms-3.0.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+inherit distutils-r1
+
+MY_PN="WTForms"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Flexible forms validation and rendering library for python web development"
+HOMEPAGE="https://wtforms.readthedocs.io/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/markupsafe[${PYTHON_USEDEP}]"
+
+BDEPEND="
+	dev-python/Babel[${PYTHON_USEDEP}]
+	test? (
+		dev-python/python-dateutil[${PYTHON_USEDEP}]
+		dev-python/python-email-validator[${PYTHON_USEDEP}]
+		dev-python/sqlalchemy[${PYTHON_USEDEP}]
+		dev-python/webob[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/xmlschema/Manifest b/dev-python/xmlschema/Manifest
index ef8366107aec..810417939fec 100644
--- a/dev-python/xmlschema/Manifest
+++ b/dev-python/xmlschema/Manifest
@@ -1,3 +1,4 @@
 DIST xmlschema-1.8.2.tar.gz 392045 BLAKE2B 05b63c069bc6f7052e84f7af20b789e2e9b9e54eccbc28971006b924d1eff4b23a43e2a85356214603f4c2263f2478f7cc4321c4ae93e8106f31940098ab7ae2 SHA512 3a03206c732b3d46a58bcfdeafdccb08c7f3334c78df63901352d2d2eaebaabbb663d70329bd9667530a1e8c2bf1b7087eb493f971c3fa914d8944064e12361c
 DIST xmlschema-1.9.0.tar.gz 394048 BLAKE2B 96060d971826263b3a52b3d8720c7d2421af0bf55f1603b68691a374a72d441238b790f3c7ce0e48ca436cd9939aa0f3563bd3862d5371bd57c44815777ec83a SHA512 c7763acefa6cd34a1edc5487f0c2257c871b7c5aed2466dfb1867a004e9f91603e20d458238a52da33225d9303a7262e347f20c41203dea0f0cb7400bed66838
 DIST xmlschema-1.9.1.tar.gz 394695 BLAKE2B 38cb0cbb1bb9f23ea4cd16440c175d509e57dce86bc4362facfb0c034895af7cd27b326be450def6e671320ce08d96eeabd33b2c81a682e33001d8b0e1951d13 SHA512 958052e5a3573c5e3ae08fe487cbbb219d361264920f7ffc4157faf53a4e260f256c0ad9a68575c16d2e6cc1bd75b94459ec088b08daa4a419f756f1a7044836
+DIST xmlschema-1.9.2.tar.gz 394954 BLAKE2B c8d932827f03962fcd6b1408d25cb4079b84d44984227c53922587d9c61dcf16e2b46c7df16a2795623017c1b844f3fca497e5856b6d6b2a475eabf1c49cc4cc SHA512 99abc53da52ba8f7f0f269c791b227d2b5c81d7ede847ccd98e18c5817ddd988ba26b88ad5afe0a0933e0c5af5425c0efdd4a1beb218d009e476de5b2931a0fb
diff --git a/dev-python/xmlschema/xmlschema-1.9.2.ebuild b/dev-python/xmlschema/xmlschema-1.9.2.ebuild
new file mode 100644
index 000000000000..4980f9b98bb3
--- /dev/null
+++ b/dev-python/xmlschema/xmlschema-1.9.2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="An XML Schema validator and decoder"
+HOMEPAGE="https://github.com/sissaschool/xmlschema https://pypi.org/project/xmlschema/"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/elementpath-2.3.2[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/jinja[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	"${EPYTHON}" tests/test_all.py -v ||
+		die "Tests fail with ${EPYTHON}"
+}