Updating liguros repo

22 files changed, 361 insertions, 250 deletions

diff --git a/dev-python/bleach/Manifest b/dev-python/bleach/Manifest
index 831c79a3bb69..276c0ace9609 100644
--- a/dev-python/bleach/Manifest
+++ b/dev-python/bleach/Manifest
@@ -1,4 +1 @@
-DIST bleach-3.2.1.tar.gz 179763 BLAKE2B 5288277ceae1f51fb76c360db72fb646e1d391b3e51f29ba2b25f5dba7704af8ef7cfd2db017237dad42ff4a99e502daa29cdf4edd82952e15842e288c50c0dd SHA512 61710f48f00333b38d251360736e19078063433ca4d7aada210a986f7d79b08c79c64b412686c67f360e4b2e8420c40c4b515eb175ab92bd546f88e2ba0e5835
-DIST bleach-3.2.2.tar.gz 180189 BLAKE2B 14b496ced66abb5dadabbfaca7663124deda939c494cfc79803db875bcd4195f3b951962d219d56780de56320948c4d5be294a73a8244d1dfa1ced3fe92862d2 SHA512 20e58b58f6464d819ffbf70d0dbaf4b52eac8894d089291b40c2e27440d5c78577f653020ab6296ca72de27bbad60f58e07ce4bcf140ccb21928b0f600f1c236
-DIST bleach-3.2.3.tar.gz 180414 BLAKE2B 2b46fbedd109649e61b17719cc6fbbaa34e03e878938eee17aa81c66e11887ca9156e5e1b2a99b19f319c99df9fd0ce4d91106acae1638cf2569df0f1c41b788 SHA512 0bee6415ed0d6349311e92b68c4897b830a9ae8c0b1399a35da8ebb76af7b989b67c3e90c24cc34fd8afb903ee5f8de1062a0fa0e34a75328a281cf1706193a0
 DIST bleach-3.3.0.tar.gz 181274 BLAKE2B 32883ef9a77bf1d0cd208217930474285e55f158dc8d7b9c4049ca896cdc5cfb873674aa5f5181c31d46345be29f954badd29969bf156b1cc10eb200214de367 SHA512 8e408289c5175234a383658552e48379da9f570866e4c248a4e5c0b7bdaa9a2e6be545943dd32968cdb425929d51de282cca0678fdc6dd06b6fc2c2f41b58097
diff --git a/dev-python/bleach/bleach-3.2.1.ebuild b/dev-python/bleach/bleach-3.2.1.ebuild
deleted file mode 100644
index adb47bbe69c7..000000000000
--- a/dev-python/bleach/bleach-3.2.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="an easy whitelist-based HTML-sanitizing tool"
-HOMEPAGE="https://github.com/mozilla/bleach https://pypi.org/project/bleach/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~x64-macos"
-
-RDEPEND="
-	dev-python/packaging[${PYTHON_USEDEP}]
-	>=dev-python/html5lib-1.0.1-r1[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/webencodings[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}"/bleach-3.2.1-py39.patch
-)
-
-src_prepare() {
-	# unbundle unpatched broken html5lib
-	rm -r bleach/_vendor || die
-	sed -i -e 's:bleach\._vendor\.::' \
-		bleach/html5lib_shim.py \
-		bleach/sanitizer.py \
-		tests/test_clean.py || die
-
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/bleach/bleach-3.2.2.ebuild b/dev-python/bleach/bleach-3.2.2.ebuild
deleted file mode 100644
index 0f522b5460bf..000000000000
--- a/dev-python/bleach/bleach-3.2.2.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
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="an easy whitelist-based HTML-sanitizing tool"
-HOMEPAGE="https://github.com/mozilla/bleach https://pypi.org/project/bleach/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
-
-RDEPEND="
-	dev-python/packaging[${PYTHON_USEDEP}]
-	>=dev-python/html5lib-1.0.1-r1[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/webencodings[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}"/bleach-3.2.1-py39.patch
-)
-
-src_prepare() {
-	# unbundle unpatched broken html5lib
-	rm -r bleach/_vendor || die
-	sed -i -e 's:bleach\._vendor\.::' \
-		bleach/html5lib_shim.py \
-		bleach/sanitizer.py \
-		tests/test_clean.py || die
-
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/bleach/bleach-3.2.3.ebuild b/dev-python/bleach/bleach-3.2.3.ebuild
deleted file mode 100644
index 0f522b5460bf..000000000000
--- a/dev-python/bleach/bleach-3.2.3.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
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="an easy whitelist-based HTML-sanitizing tool"
-HOMEPAGE="https://github.com/mozilla/bleach https://pypi.org/project/bleach/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
-
-RDEPEND="
-	dev-python/packaging[${PYTHON_USEDEP}]
-	>=dev-python/html5lib-1.0.1-r1[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/webencodings[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}"/bleach-3.2.1-py39.patch
-)
-
-src_prepare() {
-	# unbundle unpatched broken html5lib
-	rm -r bleach/_vendor || die
-	sed -i -e 's:bleach\._vendor\.::' \
-		bleach/html5lib_shim.py \
-		bleach/sanitizer.py \
-		tests/test_clean.py || die
-
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/bleach/bleach-3.3.0.ebuild b/dev-python/bleach/bleach-3.3.0.ebuild
index 0f522b5460bf..6add88c99e32 100644
--- a/dev-python/bleach/bleach-3.3.0.ebuild
+++ b/dev-python/bleach/bleach-3.3.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	dev-python/packaging[${PYTHON_USEDEP}]
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 3b2fd761b7d1..58eee2bb9953 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -5,3 +5,4 @@ DIST boto3-1.16.60.tar.gz 344983 BLAKE2B c479bc65a04ef01576b046452b125eef9312749
 DIST boto3-1.16.61.tar.gz 345049 BLAKE2B 542dc15da302d9eeec31d99d2ee0c1229e4155b1f02ffb295819b0365ad9a9f4b87d2adc67e35b760b5a9be27cfb6c6445c5f22472c1a45d8ffca536f2737b51 SHA512 3e27c6b5c638171941b33a6e22b167a6e2bb5609c9e10cf4b7b2991a81ea5a03d3cb911ff1cf53aaf875327463cfb8437f3922c767d51a8386d665d8ec642096
 DIST boto3-1.16.62.tar.gz 345246 BLAKE2B 26b88075e2d5a14b98a3868c4c8f6c7f13d4188c73f5c6884971fb7e3f61ec7f2f371d95f381150b630c94fb2d0d4abc8ba1cf48ecbbce44a23890e15a72ee45 SHA512 1dfa6f45caf57bffe33308bafc68ffa8180d34349a7d84862c6a105139e7ec5134c932fd0050e2ea4375a066724c002c52b6809f0f9fe2a831f48967f86dcc78
 DIST boto3-1.16.63.tar.gz 345303 BLAKE2B e6877aeb3efd8018188eaf687b96e604f6b6b4910ae1a96d6f0d6db335f836d223f3f3216990a8a1eed3af91830ef8effd52f2c16148bb05dd4a6d69f777ef76 SHA512 25df3e65feb6c89c865021311d3c63bb52b5e48ef2e09813f548b1cc4c28b462969b4c3ec5192ab8b02ab9faef28f9ff042ea78f22d19a8df96f1211a9e1a763
+DIST boto3-1.17.0.tar.gz 345964 BLAKE2B 09dbde33fe41e625e4fe9519d88b6d878024e14c594a845e3394347c5e9b28f2dae6a9e791af277fd2acd73dc8a3e96a7567f3cad3259b7370cfe7e8cb782111 SHA512 eb5b1feb310d44a6201846bead22c2c7e7862b753bcd0b02d91809b5df37842b07e74e507c322243133ffc0e3c64a36bf588e36e5b4066a2aa2a73f2316f768e
diff --git a/dev-python/boto3/boto3-1.17.0.ebuild b/dev-python/boto3/boto3-1.17.0.ebuild
new file mode 100644
index 000000000000..2df16964cdb0
--- /dev/null
+++ b/dev-python/boto3/boto3-1.17.0.ebuild
@@ -0,0 +1,56 @@
+# 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=bdepend
+inherit distutils-r1
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="https://github.com/boto/boto3"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/boto3"
+	inherit git-r3
+	BOTOCORE_PV=${PV}
+else
+	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# prevent an infinite loop
+	rm tests/functional/docs/test_smoke.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index 6eb78b570b8a..9f5c78825ab1 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -5,3 +5,4 @@ DIST botocore-1.19.60.tar.gz 7432208 BLAKE2B 6dd879a5c0c812dd218a71f9712758ec619
 DIST botocore-1.19.61.tar.gz 7432779 BLAKE2B 09fe171532dc5672d5265712b9af1149008cc9a1e3c6d6c6754f332bfc1fb89effe5a5d1f2a7f52ae049ed58db8d07c1187533e6f8d36952b1010a692392dff4 SHA512 9a1095f305c3d2c00cb2ee902cfb46b8e3ab7b2b6757308072c1adeed3632bec7c422be3febbf23de796f0b303a2e9e27877273316e8c9f4a21e32295fb055c1
 DIST botocore-1.19.62.tar.gz 7435742 BLAKE2B 94562f0f42878e5b5aa59e7b36e60c7c8014a356041a9c4e043e3abdf2b029727e05a34a254047374fdbafe830aa982ae6b34682573f8fe2175fa2de3642bf1c SHA512 0c702e207b904593788c7f7a290308730ed2cbe6b67c1566e2c53c45a68d9a5a8a45be67f6a0e2e5e6d1ffce5488508a5680d2f8a83c31f329d1a2878a52e7fb
 DIST botocore-1.19.63.tar.gz 7437996 BLAKE2B b55aa80cf4f17538e5876f61492d15916111c216aff455a1366d12293579bd2c3d4e9c5e2a51e91ee117ac0469743b898cd314abc693a466e99fe332deea95c2 SHA512 11c616f5574df986f576078c18a1f65149ccd01ac21575fd610e2dec0598387cc4d55c05a8ffeed3e7c2fb1809a699d6c6c0c9b57482cbb895146a6a1cddb65b
+DIST botocore-1.20.0.tar.gz 7440754 BLAKE2B 1ff36cd0cc4adefaa9ebdd2150c6469a66867a0491c41e7739c26a91742fe3fac3ca323b9aa2e54ae07cd4145d236a093120a2284af95143af7ccdb39dc82ecc SHA512 0cf8c3d2afadc69fee2a2b0795989b7328c24c038cf66fee693612affc7656d76df492e7ae61604ee4e26f5f355cd4ac27909519cddf7dcefa65168eea13db64
diff --git a/dev-python/botocore/botocore-1.20.0.ebuild b/dev-python/botocore/botocore-1.20.0.ebuild
new file mode 100644
index 000000000000..9d681f87244c
--- /dev/null
+++ b/dev-python/botocore/botocore-1.20.0.ebuild
@@ -0,0 +1,59 @@
+# 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="Low-level, data-driven core of boto 3"
+HOMEPAGE="https://github.com/boto/botocore"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
+)
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+	# very unstable
+	sed -i -e 's:test_stress_test_token_bucket:_&:' \
+		tests/functional/retries/test_bucket.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# note: suites need to be run separately as one of the unit tests
+	# seems to be leaking mocks and breaking a few functional tests
+	nosetests -v tests/unit ||
+		die "unit tests failed under ${EPYTHON}"
+	nosetests -v tests/functional ||
+		die "functional tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/cfn-python-lint/Manifest b/dev-python/cfn-python-lint/Manifest
index 0c473692247f..538f512a529e 100644
--- a/dev-python/cfn-python-lint/Manifest
+++ b/dev-python/cfn-python-lint/Manifest
@@ -3,3 +3,4 @@ DIST cfn-python-lint-0.44.2.tar.gz 5515542 BLAKE2B 9da951dc7faa000d2abd1610595e4
 DIST cfn-python-lint-0.44.3.tar.gz 5591470 BLAKE2B 7d8f6763023a86d528f132b36b9b860b726241576037a1dd92a296f4b5ec5389ffe24e4a41a8f504ae8351b9dafc166d96ae3b17b90ac23062af2159baa36220 SHA512 a3c5fa435ed9afce32336d01cfc6c94d1965dc5c296601aba75064fdaecda9df5bfaf2976837729b56f00bc3e8cea7fe8cd5141c58335091a35dbec31a630b69
 DIST cfn-python-lint-0.44.4.tar.gz 5632477 BLAKE2B 3520cb016f926e180bb1547b4e467d6fb5251ca5e2ef0ceaaed487f40f10b58f5b6700a5f1995d4a764b53e83ba8a4ab7a9e67fe9803557bef54df3036e691ee SHA512 39e244963109953b92cc9e9fd84e33ede157c9e752854f685dd81d2a3e09ea88ec402addc8f2c12f044f0f7ab8e0bbf53486153be9517b76f0a89fed3ff94a14
 DIST cfn-python-lint-0.44.5.tar.gz 5657765 BLAKE2B e35fca9cf8232bc802666333184a52b544bad5858ec8e4c16fe435ea5c421ca25296bb9d8a3bf351276dc1e36ee3101cb0c950ca9d8ce87f5dd2f64cf347ba30 SHA512 e23e415f7d5dd3933e70e7c5b0d9d001bc9aefd0ec67ba9245b4cecbad0c5470376439c12d2cd532eb39e900a325de52c4856351bba2ca27cdc0760ed091ccca
+DIST cfn-python-lint-0.44.6.tar.gz 5689226 BLAKE2B 19f6d4f09a621d8389893234dea2cc5c9e2e04fae7f1519bbd95657f5bf1ff97e34c1ed66a6f2bb0ffc2851e99cae5ea2734aacac58b87088a5430346ce0d102 SHA512 8c4414145e039d8b2b32008871dc0d2dbe946bd10eb9b7a78a070ce16ca13c3c0f4a37212bae07fa798b8b0d0868b342735ef406c6b651f6c85b8ec92bd563b2
diff --git a/dev-python/cfn-python-lint/cfn-python-lint-0.44.6.ebuild b/dev-python/cfn-python-lint/cfn-python-lint-0.44.6.ebuild
new file mode 100644
index 000000000000..b0cefcddd0c5
--- /dev/null
+++ b/dev-python/cfn-python-lint/cfn-python-lint-0.44.6.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1
+
+DESCRIPTION="CloudFormation Linter"
+HOMEPAGE="https://pypi.org/project/cfn-lint/ https://github.com/aws-cloudformation/cfn-python-lint"
+SRC_URI="https://github.com/aws-cloudformation/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/aws-sam-translator-1.25.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[${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
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/cftime/Manifest b/dev-python/cftime/Manifest
index 5e9b696ad9f8..f8c0e0b9fe5a 100644
--- a/dev-python/cftime/Manifest
+++ b/dev-python/cftime/Manifest
@@ -1,2 +1,3 @@
 DIST cftime-1.3.0.tar.gz 55668 BLAKE2B c233a3d45305476f422ca93f89348b7b3c018b10c0fa42d6649001b7bcdb4d26d230322108def41818449ec78dc531261b52d09252306fb5889ac4011af33828 SHA512 07f79e902142e8a314c9d09af08ea752454e490c3027ee44853f78c725305bf11cad90bd331edd204defded11e7f29173df9bef70ab805a28b745cc0afdd4685
 DIST cftime-1.4.0.tar.gz 46098 BLAKE2B b1ca1eaec2b0b5015d6d8d512ae831bfb36c59061c094f5eaf5931f85ecabdb1b562d1ab56cb1b0b0fcea36fce15d073411fd9afd955ec864a4ca9a71f0a6a82 SHA512 72862d35cbe32eefb1149b345e63fabf1a58bdb145138ea82fb21aa8b4862abae53a2c7719b8cf56670acdcfa9c7bb090cb35f8c2ea711e23bfb031f72ccdc2f
+DIST cftime-1.4.1.tar.gz 46721 BLAKE2B 903f8c042b6f4738893ee54c9d1b862f6f29b42c67b45800d21e1215979c95d985d56eb234dd52493da331c30b2b55c5c1590b51822bb87eaada7dd2879c57b1 SHA512 2d07b8f423e9945b1ced2e89f03965df5c3b25f932b0e7ce893a6cbd4568c93f0abb1d8e6efebe2cafca2ee19259f3c0878fec4fb91f68bf5dde1ccb67bcdef9
diff --git a/dev-python/cftime/cftime-1.4.1.ebuild b/dev-python/cftime/cftime-1.4.1.ebuild
new file mode 100644
index 000000000000..5240371abd71
--- /dev/null
+++ b/dev-python/cftime/cftime-1.4.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+inherit distutils-r1
+
+DESCRIPTION="Time-handling functionality from netcdf4-python"
+HOMEPAGE="https://pypi.org/project/cftime"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-python/numpy[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+BDEPEND="dev-python/cython[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# remove pytest-cov dep
+	sed -i -e "/--cov/d" setup.cfg || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/jinja/jinja-2.11.3.ebuild b/dev-python/jinja/jinja-2.11.3.ebuild
index 7cbf1f331739..3533febe62bb 100644
--- a/dev-python/jinja/jinja-2.11.3.ebuild
+++ b/dev-python/jinja/jinja-2.11.3.ebuild
@@ -15,7 +15,7 @@ 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"
+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="
diff --git a/dev-python/pycryptodome/pycryptodome-3.9.9-r1.ebuild b/dev-python/pycryptodome/pycryptodome-3.9.9-r1.ebuild
index 98699851ea32..f4ac4dba8c8d 100644
--- a/dev-python/pycryptodome/pycryptodome-3.9.9-r1.ebuild
+++ b/dev-python/pycryptodome/pycryptodome-3.9.9-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="BSD-2 Unlicense"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos"
 IUSE=""
 
 DEPEND="
diff --git a/dev-python/pycryptodome/pycryptodome-3.9.9.ebuild b/dev-python/pycryptodome/pycryptodome-3.9.9.ebuild
deleted file mode 100644
index db22e0f7d780..000000000000
--- a/dev-python/pycryptodome/pycryptodome-3.9.9.ebuild
+++ /dev/null
@@ -1,49 +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 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="A self-contained cryptographic library for Python"
-HOMEPAGE="https://www.pycryptodome.org
-	https://github.com/Legrandin/pycryptodome/
-	https://pypi.org/project/pycryptodome/"
-SRC_URI="
-	https://github.com/Legrandin/pycryptodome/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz"
-
-LICENSE="BSD-2 Unlicense"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND="
-	dev-libs/gmp:0"
-BDEPEND="
-	virtual/python-cffi[${PYTHON_USEDEP}]"
-RDEPEND="
-	${DEPEND}
-	${BDEPEND}
-	!dev-python/pycrypto"
-
-PATCHES=(
-	"${FILESDIR}/pycryptodome-3.9.4-parallel-make.patch"
-)
-
-distutils_enable_tests setup.py
-
-python_prepare_all() {
-	# parallel make fixes
-	#  Multiple targets were compiling the same file, setuptools doesn't
-	#  understand this and you get race conditions where a file gets
-	#  overwritten while it's linking. This makes the files look like separate
-	#  files so this race won't happen
-	ln src/blowfish.c src/blowfish_eks.c || die
-	ln src/mont.c src/mont_math.c || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/pygame/pygame-2.0.1.ebuild b/dev-python/pygame/pygame-2.0.1.ebuild
index 26eca5dd3021..d0731104bfa4 100644
--- a/dev-python/pygame/pygame-2.0.1.ebuild
+++ b/dev-python/pygame/pygame-2.0.1.ebuild
@@ -17,7 +17,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="doc examples midi opengl test X"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/statsmodels/Manifest b/dev-python/statsmodels/Manifest
index 1ac9c2739e53..c07c6e1a0d04 100644
--- a/dev-python/statsmodels/Manifest
+++ b/dev-python/statsmodels/Manifest
@@ -1,3 +1,4 @@
 DIST statsmodels-0.11.1.tar.gz 15381516 BLAKE2B a40cf9138edd8a9a6707a550d9885e0610f9bc666fcd73a60bd11ade6dcfa806ecd912a725cf2a13902e92f31af2c3e82f244280f70586bb3359dc8fc2842508 SHA512 54afe55a23b431154c159f44d284aa093f3368988f0695c0f3fbb206046cdfb171ab2ba51ce94285d567b8536141f93a1ef404b5f7222f1e61264baf0541926d
 DIST statsmodels-0.12.0.tar.gz 17502050 BLAKE2B 8621882d920db652d1244fcd4a0bc4f31310663c4dc6582421cd64a040e0b64917070aef5962515b07a8e92c0d690d43dea19d8ee9b71c7a3c2548e903e69125 SHA512 a9cbba0c8cd7e11bef4fbb303c204d5d4db4eb9f3f93f608b9be5b3c0d7feccc08dd84b4904557fbd1c12f49f3376b2aa7fabd06daf5649fd72c16b7041afac9
 DIST statsmodels-0.12.1.tar.gz 17392393 BLAKE2B 10443f3d4063c312a822fd18a062481300ca55e2ac93be41c3819619d0eafa1756ebaa79d941032ece20b9bfbf4567f0635718aa0a833556daba1aa748d60322 SHA512 43d1ab2261f740055bbed6ed5e885e39e0444d575aa3bce61a5dcd3737714138e9c2fc93c8caaba279883860dffc71f6fe75888ecdab8a736175863cfa00de2e
+DIST statsmodels-0.12.2.tar.gz 17470078 BLAKE2B 7b2a17fe350489888fd05d2275b597ec7cb0f32dcea97daa5c06a973fa53a7b3af40d494c735e30cd65deec9b5dd314c0513454a7c2d2c40e22fd6de3aeb40c8 SHA512 ae4872bc7300ef564407daa8b4076fd70fc180965622ed2173871579e063e2143e000540089923fe171dbb191b7dd872077d8ba6794fe23390331375ec7ce810
diff --git a/dev-python/statsmodels/statsmodels-0.12.2.ebuild b/dev-python/statsmodels/statsmodels-0.12.2.ebuild
new file mode 100644
index 000000000000..5c966f13ec51
--- /dev/null
+++ b/dev-python/statsmodels/statsmodels-0.12.2.ebuild
@@ -0,0 +1,83 @@
+# 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 optfeature
+
+DESCRIPTION="Statistical computations and models for use with SciPy"
+HOMEPAGE="https://www.statsmodels.org/stable/index.html"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples"
+
+RDEPEND="
+	>=dev-python/numpy-1.15[${PYTHON_USEDEP}]
+	>=dev-python/pandas-0.23.0[${PYTHON_USEDEP}]
+	dev-python/patsy[${PYTHON_USEDEP}]
+	>=dev-python/scipy-1.1[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.15[${PYTHON_USEDEP}]
+	>=dev-python/scipy-1.1[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/statsmodels-0.11.1-tests.patch"
+)
+
+distutils_enable_sphinx docs \
+	'dev-python/ipykernel' \
+	'dev-python/jupyter_client' \
+	'dev-python/matplotlib' \
+	'dev-python/nbconvert' \
+	'dev-python/numpydoc'
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# Prevent un-needed d'loading
+	export VARTEXFONTS="${T}"/fonts
+	export MPLCONFIGDIR="${T}"
+	printf -- 'backend : Agg\n' > "${MPLCONFIGDIR}"/matplotlibrc || die
+
+	# these tests require internet
+	sed -i -e 's:test_results_on_the:_&:' \
+		statsmodels/stats/tests/test_dist_dependant_measures.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local -x MKL_NUM_THREADS=1
+	local -x OMP_NUM_THREADS=1
+	local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")
+
+	pushd "${BUILD_DIR}" >/dev/null || die
+	"${EPYTHON}" -c "
+import statsmodels
+statsmodels.test(extra_args=['-vv', '-n', '${jobs}'], exit=True)" \
+		|| die "tests fail with ${EPYTHON}"
+	popd >/dev/null || die
+}
+
+python_install_all() {
+	if use examples; then
+		docompress -x /usr/share/doc/${PF}/examples
+		dodoc -r examples
+	fi
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "Plotting functionality" "dev-python/matplotlib"
+}
diff --git a/dev-python/statsmodels/statsmodels-9999.ebuild b/dev-python/statsmodels/statsmodels-9999.ebuild
deleted file mode 100644
index 73ef74dd0fce..000000000000
--- a/dev-python/statsmodels/statsmodels-9999.ebuild
+++ /dev/null
@@ -1,77 +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 git-r3 optfeature virtualx
-
-DESCRIPTION="Statistical computations and models for use with SciPy"
-HOMEPAGE="https://www.statsmodels.org/stable/index.html"
-SRC_URI=""
-EGIT_REPO_URI="https://github.com/statsmodels/statsmodels.git"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS=""
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/pandas[${PYTHON_USEDEP}]
-	dev-python/patsy[${PYTHON_USEDEP}]
-	dev-python/scipy[${PYTHON_USEDEP}]
-"
-RDEPEND="${CDEPEND}
-	examples? ( dev-python/matplotlib[${PYTHON_USEDEP}] )
-"
-DEPEND="${CDEPEND}
-	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/ipykernel[${PYTHON_USEDEP}]
-		dev-python/jupyter_client[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		dev-python/nbconvert[${PYTHON_USEDEP}]
-		dev-python/nbformat[${PYTHON_USEDEP}]
-		dev-python/numpydoc[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-"
-
-python_prepare_all() {
-	# Prevent un-needed d'loading
-	sed -e "/sphinx.ext.intersphinx/d" -i docs/source/conf.py || die
-	export VARTEXFONTS="${T}"/fonts
-	export MPLCONFIGDIR="${T}"
-	export HOME="${T}"
-	echo "backend : Agg" > "${MPLCONFIGDIR}"/matplotlibrc || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		esetup.py build_sphinx -b html --build-dir=docs/build
-		HTML_DOCS=( docs/build/html/. )
-	fi
-}
-
-python_test() {
-	cd "${BUILD_DIR}" || die
-	${EPYTHON} -c 'import statsmodels; statsmodels.test(exit=True)' || die
-}
-
-python_install_all() {
-	find "${S}" -name \*LICENSE.txt -delete
-	if use examples; then
-		docompress -x /usr/share/doc/${PF}/examples
-		dodoc -r examples
-	fi
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature "Plotting functionality" "dev-python/matplotlib"
-}
diff --git a/dev-python/tox/Manifest b/dev-python/tox/Manifest
index b5afa37cd9f0..8bb90924f397 100644
--- a/dev-python/tox/Manifest
+++ b/dev-python/tox/Manifest
@@ -3,3 +3,4 @@ DIST tox-3.21.0.tar.gz 300962 BLAKE2B 360aedb86ef1f918e73f726af238d8fdb20c3217b4
 DIST tox-3.21.1.tar.gz 301387 BLAKE2B 3b15a17cfa8f2df1c8c3558cacde81d818cbc72b3dd0c4e4868d2fedace61c85ed484ad08e8abec10c0bef4062e623c75e4bf1122b4d15151b741057ea90fba3 SHA512 c3feaf1832db2b16df444d52ea774602c9a68eabd379c86483d33716f414df901b5e95ea9d63dd7c2f4338227cb5d9ee521a56f2dbb0d9c7d21221f49d1fc335
 DIST tox-3.21.2.tar.gz 301587 BLAKE2B 81d19e45a1d53000a2e9f956ed7b934f0f1926b4270ddced997ddc8b77a1f05388e0907d379dbabaafd5e6fdcd7031d5e87f206fff385759318a89a5f3eebf58 SHA512 beb551f49af1f8661931f241cf73fa77a37a8061ade7d41b415a2fcecd4d5dd1ba7d3e3add248d3bc14627468fa896f3f4f532305bbc36d112d226b1961fd191
 DIST tox-3.21.3.tar.gz 301828 BLAKE2B d777a858c07d94b9239ecf8286bebc5b4efe1a79cd15b37dd2a717df06cb189d4ef3126da0523719289f8fb410965c4f9c06b02c56dfa5af6ad4fb6a60c6514f SHA512 1975efcab6af938058642a85675907dadc17bd14f881c074087b221cd22d42bd1fcd577bcbef134a499c9a5b2ee583af2b557657fbfb7db30261ff9d394cf82b
+DIST tox-3.21.4.tar.gz 301889 BLAKE2B 166864fe9f44fe01d3b36481ba63738d4290bb609c6ea7e3dde3494ab7ba009c31b12c0801f5be9dfca6f56059f94438cfa31bc45dec862afda5bea763e37be0 SHA512 de12e8ba0f3287be2fced61573b3e2dfdf8513a947724982d0e17ff215489994985067692c94c499047a8b0e2dd843e214e958367199bfa6e0adcde4e09b8106
diff --git a/dev-python/tox/tox-3.21.4.ebuild b/dev-python/tox/tox-3.21.4.ebuild
new file mode 100644
index 000000000000..1ed45c6fdaaf
--- /dev/null
+++ b/dev-python/tox/tox-3.21.4.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="virtualenv-based automation of test activities"
+HOMEPAGE="https://tox.readthedocs.io https://github.com/tox-dev/tox https://pypi.org/project/tox/"
+SRC_URI="https://github.com/tox-dev/tox/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+# doc disabled because of missing deps in tree
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/filelock[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_metadata-1.1[${PYTHON_USEDEP}]
+	' python3_{5,6,7} pypy3)
+	dev-python/packaging[${PYTHON_USEDEP}]
+	>=dev-python/pluggy-0.12[${PYTHON_USEDEP}]
+	dev-python/pip[${PYTHON_USEDEP}]
+	dev-python/py[${PYTHON_USEDEP}]
+	>=dev-python/six-1.14[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]
+	>=dev-python/virtualenv-16.0.0[${PYTHON_USEDEP}]"
+# TODO: figure out how to make tests work without the package being
+# installed first.
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		>=dev-python/flaky-3.4.0[${PYTHON_USEDEP}]
+		>=dev-python/freezegun-0.3.11[${PYTHON_USEDEP}]
+		>=dev-python/pytest-4.0.0[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+	)"
+
+src_configure() {
+	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+}
+
+python_test() {
+	local deselect=(
+		# broken without Internet
+		tests/unit/session/test_provision.py::test_provision_non_canonical_dep
+		tests/integration/test_provision_int.py::test_provision_interrupt_child
+
+		# expects python2 to exist
+		tests/unit/interpreters/test_interpreters.py::test_tox_get_python_executable
+
+		# broken without tox installed first
+		# TODO: figure out how to make importlib_metadata work
+		tests/unit/test_z_cmdline.py::test_tox_console_script
+		tests/unit/test_z_cmdline.py::test_tox_quickstart_script
+	)
+
+	[[ ${EPYTHON} != pypy3 ]] && deselect+=(
+		# TODO?
+		tests/unit/interpreters/test_interpreters.py::test_find_alias_on_path
+
+		# broken without tox installed first
+		# TODO: why it can't import itself?
+		tests/integration/test_parallel_interrupt.py::test_parallel_interrupt
+	)
+
+	distutils_install_for_testing --via-root
+	pytest -vv --no-network ${deselect[@]/#/--deselect } || die "Testsuite failed under ${EPYTHON}"
+}