Adding metadata

33 files changed, 491 insertions, 471 deletions

diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index ddc6da7ea77d..82e5db1be1a9 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -12,4 +12,5 @@ DIST boto3-1.17.25.tar.gz 349475 BLAKE2B 272c5bebed211d015638a652109f2b56475e0d6
 DIST boto3-1.17.26.tar.gz 349529 BLAKE2B 8510b229aea7b725c6286772dff6d54a9df684eac7e455929c059fd02919238335c88af5c655e89bfb5821ac4b70415c8dbd2c549563d008823104d6d54088be SHA512 5ceb9dc557796471f4d582bdf47614a078285a83f9463acb92e5e59e9f82dbca379bf02c2288cf38cb5741f7860d6c8b23872305209d8a4ece697943cd06932d
 DIST boto3-1.17.27.tar.gz 349887 BLAKE2B 1fde4af489c98b8c4f77660ad278abf6641f70da3a0f84ff33d29d082cd283cd8a9faa17a3d9675ca26453f8928c57bb2e3966c607ab677ed814e544c6c928bb SHA512 9c3e45d17a179edf6ff75c9392a3e16323029e4bcefec757a6dd94ccfad5afe718bf91ca6a72ea59fa2791d5a87e9c4b84d147d35b7f584d2df0f73a623c13fb
 DIST boto3-1.17.28.tar.gz 350316 BLAKE2B a6fab50a064fd81337c013bb2516ba2baaa520aa8e7f08418ddaf9b6f0d99a1c8b8eb29b8fee6ab48620430153a0caf4bd296448e1de35a26a972d2e4bbf6df8 SHA512 c26800e18bb254707f0c7e7005b22b1270eae8bf0b8c13f6bcbbe46105ff7439b36c9c80863aefd1037df314abc687bf9b00045d12fb0d3b7337b02605810876
+DIST boto3-1.17.29.tar.gz 350960 BLAKE2B 8192d2ea8165b7d10ffdd56b30ba3fadf6f2373c61fc3a9b61713bd299f246ec1b00dce897254f954a93b3b7c150e1cbe8ddf4f0a5894a071e656963d3a06299 SHA512 f662a39aa66ffead103f1d8153ba4175a4905a96b152c1c23030ead3b731cdd008a50dea5f7192d719df2240f35e0290d9b4b3c00e87e77b5d396be7e707be8f
 DIST boto3-1.17.7.tar.gz 346682 BLAKE2B 08c06dda1d59b4f555cad075673917b38cbf9ad8d0037f66027b17076e60b4d5fd32a93e088635320ebc3226a9cd8809c9208ec84f8588c26a77766b21dbee98 SHA512 2ba1817575c4a64c232c84a75a9d3b0db1de8634ded9aa31844930a82ccf4611805c6dd31b2e4d36cc9a2cc1813d233b4d7366305eaf28efd46a3b843d3c2993
diff --git a/dev-python/boto3/boto3-1.17.29.ebuild b/dev-python/boto3/boto3-1.17.29.ebuild
new file mode 100644
index 000000000000..2df16964cdb0
--- /dev/null
+++ b/dev-python/boto3/boto3-1.17.29.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 5c5b3019d50d..1b3b6c8414f6 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -12,4 +12,5 @@ DIST botocore-1.20.25.tar.gz 7508526 BLAKE2B 244b578cc0596e4fc6b225cd29d0b5ca2e4
 DIST botocore-1.20.26.tar.gz 7510615 BLAKE2B bc8716642c09ec74f7d057bcd9608cbbad98fcb4caf09e0684a03744fda81c0483aebaa4c85e416dac7d54d0f2804aba59f15e714211b59edd824cd3067ed412 SHA512 30ce061c1b7e1830caaf7382352180f9316f8d1d806269726ef3bc00eeb7a3fc7689e43eb4666fe700ca2de564b427c4916289a555aca0138a630059462216c9
 DIST botocore-1.20.27.tar.gz 7518860 BLAKE2B 73a5a5302a0adfe9c72ec40f0edec8fc97f9dcec0428f5785f2546d50e4b8eb8a9c287b29218ebd8ebe091ef0fd022a5b0ba459aae435c363511484a936d2ffb SHA512 1b63295a2f6cdf2c06cc10cd35c350a07eb5326bbd42f2dc2084bb54cac3ebb40f0635180e227632184a6bbff3b58b67bd90878acbfa4cc61879b7b8e77f3fbc
 DIST botocore-1.20.28.tar.gz 7526082 BLAKE2B 523db8ca7ff9ae87ad30fe539f20b34f4627b3a60f58635778d81b7ab055ac7cfbe04b4c4ca6508284dd37f2e6b953210ed2def9608026490332d200f306f7a9 SHA512 f3af2bd784b96a2778361a83d0ad61e5108b0a90b3756575bc4b93aaddb13a0a07e6589f582f03ca95252b272e1f84c350c5a2e1f342f98627f70e8f42350c18
+DIST botocore-1.20.29.tar.gz 7533728 BLAKE2B 75ca3262805177118d0f1a6060d98badf54b07f3b607c4c1c0d057045f671474b11493819030a9e65080af0cdd48c8ea686836b7c9ef7bfe6098babf260f221d SHA512 92d3887929b34e5e6a80b1330e00e6a72d8cfd96b81cc36eed969361db4756607c7c447af73b05f5ff0c27699e32636df12627693c667dea0a9955d2553ea35e
 DIST botocore-1.20.7.tar.gz 7458254 BLAKE2B 8b9a1edda73e2564d3a3d67c6b3542d1ec9372403cb4d88396e58dfbcb5987821f278f2757e079e1ab32e03243ed3a6d1023ecc591b965512b3af5e2d43ea7b0 SHA512 9b023a31be866a50b94017a28aca40b5fe2e720959c928a3fd93db96041f3886049717f50461222a09572c0c56c5961a4614b80e400e4fa6d8b3ff4b4ab681df
diff --git a/dev-python/botocore/botocore-1.20.29.ebuild b/dev-python/botocore/botocore-1.20.29.ebuild
new file mode 100644
index 000000000000..9d681f87244c
--- /dev/null
+++ b/dev-python/botocore/botocore-1.20.29.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/google-auth/Manifest b/dev-python/google-auth/Manifest
index 81d5e5529c9c..cead1bbdaf35 100644
--- a/dev-python/google-auth/Manifest
+++ b/dev-python/google-auth/Manifest
@@ -1,3 +1,4 @@
 DIST google-auth-1.26.1.tar.gz 121927 BLAKE2B a24a9c5bca8de234213e75673ba49ef6b82eb3c165f9c3af276b3c4cd47750c6d8a53e46084ae71c8eadf474ec8f53c6a2469fd91e7bdcc87f61bd46bbf9704d SHA512 632cdada9975311ab079022da79334f69ae703183bef395c3b04fc86192c23032b9925259ade7c115883659b10a403661f2d9a39f3b5262b964d0b9f2947567f
 DIST google-auth-1.27.0.tar.gz 157225 BLAKE2B d3bf40dac2f72d5bafa318c4ec07588a250d4d778b2313c22ef5f43742939b023c864f465f543bf9e8ef6fd0251ba4642f78151df2534e82f2f2a60f5894e63c SHA512 adadea669ddd18a345011602e9fd575fa7783aee0f786d6a42e97278e14a0acf721451d7171765c8aea4bfa5eaa63762f9f826a2d1d5f2c4ea6abbb7d7186ebb
 DIST google-auth-1.27.1.tar.gz 157876 BLAKE2B 0a06451e8a800231972b5b167d45410791b38a1616043912befb5554eff217bd1af70bf34aaf455fe68f9f515ea143cb2446800231006c369005de6981f7f466 SHA512 d640bb5395f956fd3442ea31145af2d72855108bff6b11dfeecfd4b48ad4fa50efba838e423bace310e78bbae74860d6c031d4ee873a7ab6dd522eb49e3fbdab
+DIST google-auth-1.28.0.tar.gz 158266 BLAKE2B 7e1fcdd0a6d155c0170012d43062fa5df2c9dd731105990af6d055c0dc8f9c36917776876a25caedd4b804acf24cdebd93a0953a9f7642563a5abc05cc946156 SHA512 a02db23132950c99e032d8318451cd67127f1e9fc57731a8a76505a360d77484aef1859e54d8e4efa1bcde3f6f5379c3324d54cf57c0a95fb1fa7765f43e9581
diff --git a/dev-python/google-auth/google-auth-1.28.0.ebuild b/dev-python/google-auth/google-auth-1.28.0.ebuild
new file mode 100644
index 000000000000..9ac16e5b5663
--- /dev/null
+++ b/dev-python/google-auth/google-auth-1.28.0.ebuild
@@ -0,0 +1,50 @@
+# 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="Google Authentication Library"
+HOMEPAGE="
+	https://github.com/googleapis/google-auth-library-python/
+	https://pypi.org/project/google-auth/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/namespace-google[${PYTHON_USEDEP}]
+	>=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
+	>=dev-python/pyasn1-modules-0.2.1[${PYTHON_USEDEP}]
+	>=dev-python/rsa-3.1.4[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/cachetools-2.0.0[${PYTHON_USEDEP}]
+	"
+BDEPEND="
+	test? (
+		dev-python/cryptography[${PYTHON_USEDEP}]
+		dev-python/flask[${PYTHON_USEDEP}]
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/grpcio[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/moto[${PYTHON_USEDEP}]
+		dev-python/oauth2client[${PYTHON_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		dev-python/pytest-localserver[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/responses[${PYTHON_USEDEP}]
+		dev-python/urllib3[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+python_install_all() {
+	distutils-r1_python_install_all
+	find "${ED}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/jsonpickle/Manifest b/dev-python/jsonpickle/Manifest
index 4d0ed801b7ce..e3699d6f0989 100644
--- a/dev-python/jsonpickle/Manifest
+++ b/dev-python/jsonpickle/Manifest
@@ -1,3 +1 @@
-DIST jsonpickle-1.5.0.tar.gz 106088 BLAKE2B dcd35979a428180f10611638c831b083d9b8307729a0b19fe89b283c30ecac58477bd6a66e89c31e214dd2f100385d9933dc00d506e1f9bbb4b6ea9c3a0eaed3 SHA512 7828ded98173cb10908a9d60fa6b3f358add360d738cd85a90f012ca24b15c6bbb19c611027bdb0a4d25fe0649978ae59ff08fb7b717ef503a9916152aa6f849
-DIST jsonpickle-1.5.2.tar.gz 110239 BLAKE2B 3d4ee457a3f45dd1a6d1004d3fce66c95057958ec172227a7590631e479bd3a63dafe2ece04f5a0a78b9e283f61d949f5c359e4dd9270e162a3060e1032fc562 SHA512 609effeb5553c7c273aa621a8e86b4e630754eab1a948c505a08c98ff13e7f2622a0eb71374c03b69cf8e07c9a3b06fc9d282efba299a720b342424d642cfc6e
 DIST jsonpickle-2.0.0.tar.gz 110336 BLAKE2B 574dab58418c5225a9364836d04eaabf3384e9dab404d191846a4bb41e9c8bbb51243a6a231ec8baf05ff9be337e12b5c96c46b74a327e9f05653ca81bf6ccf2 SHA512 acba11e5dfce116b27edfe0fdccdd74755e299aa43f873dd1ce547d947b58f14c1059c21d04007b5be0857f7ce69fe5355fb2edc47a99cc2217fe00297ca78d3
diff --git a/dev-python/jsonpickle/jsonpickle-1.5.0.ebuild b/dev-python/jsonpickle/jsonpickle-1.5.0.ebuild
deleted file mode 100644
index 6eeadfc0f892..000000000000
--- a/dev-python/jsonpickle/jsonpickle-1.5.0.ebuild
+++ /dev/null
@@ -1,52 +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=bdepend
-inherit distutils-r1
-
-DESCRIPTION="Python library for serializing any arbitrary object graph into JSON"
-HOMEPAGE="https://github.com/jsonpickle/jsonpickle/ https://pypi.org/project/jsonpickle/"
-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="doc test"
-RESTRICT="!test? ( test )"
-
-# There are optional json backends serializer/deserializers in addition to those selected here
-# jsonlib, yajl.
-RDEPEND="
-	dev-python/simplejson[${PYTHON_USEDEP}]
-	dev-python/feedparser[${PYTHON_USEDEP}]
-	dev-python/ujson[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/importlib_metadata[${PYTHON_USEDEP}]
-	' python3_{6,7})
-"
-# toml via setuptools_scm[toml]
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]"
-
-distutils_enable_sphinx "docs/source"
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# too many dependencies
-	rm tests/pandas_test.py || die
-	sed -e '/pandas/ d' -i tests/runtests.py || die
-	# broken with gmpy
-	rm tests/ecdsa_test.py || die
-
-	sed -i -e 's:--flake8 --black --cov --cov-append::' pytest.ini || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	pytest -vv tests || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/jsonpickle/jsonpickle-1.5.2.ebuild b/dev-python/jsonpickle/jsonpickle-1.5.2.ebuild
deleted file mode 100644
index b99c3b729f26..000000000000
--- a/dev-python/jsonpickle/jsonpickle-1.5.2.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} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-inherit distutils-r1
-
-DESCRIPTION="Python library for serializing any arbitrary object graph into JSON"
-HOMEPAGE="https://github.com/jsonpickle/jsonpickle/ https://pypi.org/project/jsonpickle/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-
-# There are optional json backends serializer/deserializers in addition to those selected here
-# jsonlib, yajl.
-RDEPEND="
-	dev-python/feedparser[${PYTHON_USEDEP}]
-	dev-python/simplejson[${PYTHON_USEDEP}]
-	dev-python/ujson[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/importlib_metadata[${PYTHON_USEDEP}]
-	' python3_7)
-"
-# toml via setuptools_scm[toml]
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]"
-
-distutils_enable_sphinx "docs/source"
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# too many dependencies
-	rm tests/pandas_test.py || die
-	# broken with gmpy
-	rm tests/ecdsa_test.py || die
-
-	sed -i -e 's:--flake8 --black --cov::' pytest.ini || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	pytest -vv tests || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/jsonpickle/jsonpickle-2.0.0.ebuild b/dev-python/jsonpickle/jsonpickle-2.0.0.ebuild
index b99c3b729f26..611efbbb40ca 100644
--- a/dev-python/jsonpickle/jsonpickle-2.0.0.ebuild
+++ b/dev-python/jsonpickle/jsonpickle-2.0.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 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 
 # There are optional json backends serializer/deserializers in addition to those selected here
 # jsonlib, yajl.
diff --git a/dev-python/jupyter_console/Manifest b/dev-python/jupyter_console/Manifest
index c8e174ee38f5..a2d89343127d 100644
--- a/dev-python/jupyter_console/Manifest
+++ b/dev-python/jupyter_console/Manifest
@@ -1 +1,2 @@
 DIST jupyter_console-6.1.0.tar.gz 28468 BLAKE2B 08ef158de6a0eb8fe741dac00b74e11f7e577b5097f54aa16c47ae9e39607231e19a1fcd0a96cbae41d41fad891fefdb532d0f66bc03aa66ff99a8d3ff3cb28c SHA512 abb5457a90d109457e91071cd8b592a14bec7ead75fd667d656f9180a457e39bf470877b2e17c81ff512d1cc69b62a8f700996492f6164eb05a1581db82abbf7
+DIST jupyter_console-6.3.0.tar.gz 35313 BLAKE2B 980eac57de949654bf99d99eb74d8600d73d0699ab394e0ad4c5e937fdc278477442e0e95887c95f631ba1bc2b2469c36cc6e4bca8d5f11f97c4943c2f312c4f SHA512 777d9cf8b842eccea108a1857c421fec1bcdf8c226a6947d7ff4ee5d5da4bdbb50096e9e63638053d8eb200e55c093c753010ffb1460dae5579de16aad4e64a6
diff --git a/dev-python/jupyter_console/jupyter_console-6.3.0.ebuild b/dev-python/jupyter_console/jupyter_console-6.3.0.ebuild
new file mode 100644
index 000000000000..5d573893be3e
--- /dev/null
+++ b/dev-python/jupyter_console/jupyter_console-6.3.0.ebuild
@@ -0,0 +1,34 @@
+# 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} )
+
+inherit distutils-r1
+
+DESCRIPTION="A terminal-based console frontend for Jupyter kernels"
+HOMEPAGE="https://jupyter.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/ipython[${PYTHON_USEDEP}]
+	dev-python/ipykernel[${PYTHON_USEDEP}]
+	dev-python/jupyter_client[${PYTHON_USEDEP}]
+	<dev-python/prompt_toolkit-3.1.0[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]"
+# util-linux provides script(1)
+BDEPEND="
+	test? (
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		sys-apps/util-linux
+	)"
+
+distutils_enable_sphinx docs \
+	dev-python/sphinxcontrib-github-alt dev-python/sphinx_rtd_theme
+distutils_enable_tests pytest
diff --git a/dev-python/notebook/Manifest b/dev-python/notebook/Manifest
index 928f4865e077..9651db14043f 100644
--- a/dev-python/notebook/Manifest
+++ b/dev-python/notebook/Manifest
@@ -1,2 +1 @@
-DIST notebook-6.1.6.tar.gz 13926673 BLAKE2B 944f92d468ade0f0d3fbe01d46cb2893866fca067b48c6a6cefe653b9941bbde0802c7d9ee17b493bcf6391d1b0a77e710f5b5c8f1d58ec692b40753ac0692e9 SHA512 d1271273ae9cc098d5937a3ac91dc8035b033bb8da799f31c5d71abe48b17579f2fadc8b0ff7134dedda72ac49cc29c5adafaa4ef6f347cc4f6698ab46d83040
 DIST notebook-6.2.0.tar.gz 13927515 BLAKE2B ca752f0cb316b46b71d8451c59c196c324008c296dfc7fbc4ee426ba5b3c1035e90170e46720547a9e3f2cf381ab5e0294185ee1a814d31ffbe6ecf546f229d6 SHA512 217392000ca2d0266137f937fc4d2a1b81ed19217fdbf6550b07453eede8b9a6e15c8fbb1c94f559a7f44ac73dfadcefeae815c186e56bb1e9a30120fe070f3a
diff --git a/dev-python/notebook/notebook-6.1.6.ebuild b/dev-python/notebook/notebook-6.1.6.ebuild
deleted file mode 100644
index e402f7efcfb7..000000000000
--- a/dev-python/notebook/notebook-6.1.6.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# 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} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Jupyter Interactive Notebook"
-HOMEPAGE="https://jupyter.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-RDEPEND="
-	>=dev-libs/mathjax-2.4
-	dev-python/argon2-cffi[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	>=dev-python/terminado-0.8.3[${PYTHON_USEDEP}]
-	>=www-servers/tornado-5.0[${PYTHON_USEDEP}]
-	dev-python/ipython_genutils[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-4.2.1[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_core-4.6.1[${PYTHON_USEDEP}]
-	>=dev-python/pyzmq-17[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_client-5.3.4[${PYTHON_USEDEP}]
-	dev-python/nbformat[${PYTHON_USEDEP}]
-	>=dev-python/nbconvert-4.2.0[${PYTHON_USEDEP}]
-	dev-python/ipykernel[${PYTHON_USEDEP}]
-	dev-python/send2trash[${PYTHON_USEDEP}]
-	dev-python/prometheus_client[${PYTHON_USEDEP}]"
-
-# sphinx 2+ seems to have a problem with its github plugin. temporarily adding
-# a version constraint.
-BDEPEND="
-	test? (
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/requests-unixsocket[${PYTHON_USEDEP}]
-	)
-	"
-
-PATCHES=(
-	"${FILESDIR}/${PN}"-5.7.0-no-mathjax.patch
-)
-
-distutils_enable_tests --install pytest
-
-python_prepare_all() {
-	# disable bundled mathjax
-	sed -i 's/^.*MathJax.*$//' bower.json || die
-
-	# require geckodriver
-	rm -r notebook/tests/selenium || die
-	# trash doesn't seem to work for us
-	sed -e 's:test_delete:_&:' \
-		-i notebook/services/contents/tests/test_manager.py || die
-	sed -e 's:test_checkpoints_follow_file:_&:' \
-		-e 's:test_delete:_&:' \
-		-i notebook/services/contents/tests/test_contents_api.py || die
-	# network-sandbox?
-	sed -e 's:test_connections:_&:' \
-		-e 's:test_culling:_&:' \
-		-i notebook/services/kernels/tests/test_kernels_api.py || die
-
-	sed -i -e "/'bdist_egg':/d" setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	ln -sf \
-		"${EPREFIX}/usr/share/mathjax" \
-		"${D}$(python_get_sitedir)/notebook/static/components/MathJax" || die
-}
-
-pkg_preinst() {
-	# remove old mathjax folder if present
-	rm -rf "${EROOT}"/usr/lib*/python*/site-packages/notebook/static/components/MathJax || die
-}
diff --git a/dev-python/pandas/pandas-1.1.5-r2.ebuild b/dev-python/pandas/pandas-1.1.5-r1.ebuild
index edb3da6dc2d7..4cc845b99a16 100644
--- a/dev-python/pandas/pandas-1.1.5-r2.ebuild
+++ b/dev-python/pandas/pandas-1.1.5-r1.ebuild
@@ -46,6 +46,8 @@ OPTIONAL_DEPEND="
 		>=dev-python/xarray-0.10.8[${PYTHON_USEDEP}]
 	' python3_{6,7})
 	>=dev-python/sqlalchemy-0.8.1[${PYTHON_USEDEP}]
+	>=dev-python/xlrd-1.0.0[${PYTHON_USEDEP}]
+	dev-python/xlwt[${PYTHON_USEDEP}]
 	>=dev-python/scipy-1.1[${PYTHON_USEDEP}]
 	X? (
 		|| (
@@ -77,6 +79,8 @@ DEPEND="${COMMON_DEPEND}
 		dev-python/pytz[${PYTHON_USEDEP}]
 		dev-python/rpy[${PYTHON_USEDEP}]
 		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/xlrd[${PYTHON_USEDEP}]
+		dev-python/xlwt[${PYTHON_USEDEP}]
 		dev-python/scipy[${PYTHON_USEDEP}]
 		x11-misc/xclip
 	)
@@ -96,7 +100,6 @@ DEPEND="${COMMON_DEPEND}
 		dev-python/xlsxwriter[${PYTHON_USEDEP}]
 		x11-misc/xclip
 		x11-misc/xsel
-		!!dev-python/xlwt
 	)
 "
 # dev-python/statsmodels invokes a circular dep
@@ -169,7 +172,7 @@ pkg_postinst() {
 	optfeature "for msgpack compression using blosc" dev-python/blosc
 	optfeature "Template engine for conditional HTML formatting" dev-python/jinja
 	optfeature "Plotting support" dev-python/matplotlib
-	optfeature "Needed for Excel I/O" ">=dev-python/openpyxl-1.6.1" dev-python/xlsxwriter
+	optfeature "Needed for Excel I/O" ">=dev-python/openpyxl-1.6.1" dev-python/xlsxwriter dev-python/xlrd dev-python/xlwt
 	optfeature "necessary for HDF5-based storage" ">=dev-python/pytables-3.2.1"
 	optfeature "R I/O support" dev-python/rpy
 	optfeature "Needed for parts of pandas.stats" dev-python/statsmodels
diff --git a/dev-python/pandas/pandas-1.2.1-r3.ebuild b/dev-python/pandas/pandas-1.2.1-r1.ebuild
index d15ae7de9bf5..adf526d614ef 100644
--- a/dev-python/pandas/pandas-1.2.1-r3.ebuild
+++ b/dev-python/pandas/pandas-1.2.1-r1.ebuild
@@ -46,6 +46,8 @@ OPTIONAL_DEPEND="
 		>=dev-python/xarray-0.10.8[${PYTHON_USEDEP}]
 	' python3_{6,7})
 	>=dev-python/sqlalchemy-0.8.1[${PYTHON_USEDEP}]
+	>=dev-python/xlrd-1.0.0[${PYTHON_USEDEP}]
+	dev-python/xlwt[${PYTHON_USEDEP}]
 	>=dev-python/scipy-1.1[${PYTHON_USEDEP}]
 	X? (
 		|| (
@@ -77,6 +79,8 @@ DEPEND="${COMMON_DEPEND}
 		dev-python/pytz[${PYTHON_USEDEP}]
 		dev-python/rpy[${PYTHON_USEDEP}]
 		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/xlrd[${PYTHON_USEDEP}]
+		dev-python/xlwt[${PYTHON_USEDEP}]
 		dev-python/scipy[${PYTHON_USEDEP}]
 		x11-misc/xclip
 	)
@@ -96,7 +100,6 @@ DEPEND="${COMMON_DEPEND}
 		dev-python/xlsxwriter[${PYTHON_USEDEP}]
 		x11-misc/xclip
 		x11-misc/xsel
-		!!dev-python/xlwt
 	)
 "
 # dev-python/statsmodels invokes a circular dep
@@ -119,12 +122,6 @@ python_prepare_all() {
 }
 
 python_compile() {
-	if use amd64 || use x86; then
-		# FMA apparently breaks rolling var/stdev
-		# https://github.com/pandas-dev/pandas/issues/38921
-		append-flags -mno-fma
-	fi
-
 	distutils-r1_python_compile -j1
 }
 
@@ -144,6 +141,11 @@ src_test() {
 
 python_test() {
 	local deselect=(
+		# test for rounding errors, fails if we have better precision
+		# e.g. on amd64 with FMA or on arm64
+		# https://github.com/pandas-dev/pandas/issues/38921
+		pandas/tests/window/test_rolling.py::test_rolling_var_numerical_issues
+
 		# weird issue, doesn't seem very important
 		'pandas/tests/base/test_misc.py::test_memory_usage[series-with-empty-index]'
 	)
@@ -178,7 +180,7 @@ pkg_postinst() {
 	optfeature "for msgpack compression using blosc" dev-python/blosc
 	optfeature "Template engine for conditional HTML formatting" dev-python/jinja
 	optfeature "Plotting support" dev-python/matplotlib
-	optfeature "Needed for Excel I/O" ">=dev-python/openpyxl-1.6.1" dev-python/xlsxwriter
+	optfeature "Needed for Excel I/O" ">=dev-python/openpyxl-1.6.1" dev-python/xlsxwriter dev-python/xlrd dev-python/xlwt
 	optfeature "necessary for HDF5-based storage" ">=dev-python/pytables-3.2.1"
 	optfeature "R I/O support" dev-python/rpy
 	optfeature "Needed for parts of pandas.stats" dev-python/statsmodels
diff --git a/dev-python/pandas/pandas-1.2.2-r2.ebuild b/dev-python/pandas/pandas-1.2.2-r1.ebuild
index a5f25991872a..c5fb371b8de1 100644
--- a/dev-python/pandas/pandas-1.2.2-r2.ebuild
+++ b/dev-python/pandas/pandas-1.2.2-r1.ebuild
@@ -46,6 +46,8 @@ OPTIONAL_DEPEND="
 		>=dev-python/xarray-0.10.8[${PYTHON_USEDEP}]
 	' python3_{6,7})
 	>=dev-python/sqlalchemy-0.8.1[${PYTHON_USEDEP}]
+	>=dev-python/xlrd-1.0.0[${PYTHON_USEDEP}]
+	dev-python/xlwt[${PYTHON_USEDEP}]
 	>=dev-python/scipy-1.1[${PYTHON_USEDEP}]
 	X? (
 		|| (
@@ -77,6 +79,8 @@ DEPEND="${COMMON_DEPEND}
 		dev-python/pytz[${PYTHON_USEDEP}]
 		dev-python/rpy[${PYTHON_USEDEP}]
 		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/xlrd[${PYTHON_USEDEP}]
+		dev-python/xlwt[${PYTHON_USEDEP}]
 		dev-python/scipy[${PYTHON_USEDEP}]
 		x11-misc/xclip
 	)
@@ -96,7 +100,6 @@ DEPEND="${COMMON_DEPEND}
 		dev-python/xlsxwriter[${PYTHON_USEDEP}]
 		x11-misc/xclip
 		x11-misc/xsel
-		!!dev-python/xlwt
 	)
 "
 # dev-python/statsmodels invokes a circular dep
@@ -138,8 +141,8 @@ src_test() {
 
 python_test() {
 	local deselect=(
-		# broken on practically any hardware/CFLAGS but the one
-		# the patch author was using
+		# test for rounding errors, fails if we have better precision
+		# e.g. on amd64 with FMA or on arm64
 		# https://github.com/pandas-dev/pandas/issues/38921
 		pandas/tests/window/test_rolling.py::test_rolling_var_numerical_issues
 
@@ -177,7 +180,7 @@ pkg_postinst() {
 	optfeature "for msgpack compression using blosc" dev-python/blosc
 	optfeature "Template engine for conditional HTML formatting" dev-python/jinja
 	optfeature "Plotting support" dev-python/matplotlib
-	optfeature "Needed for Excel I/O" ">=dev-python/openpyxl-1.6.1" dev-python/xlsxwriter
+	optfeature "Needed for Excel I/O" ">=dev-python/openpyxl-1.6.1" dev-python/xlsxwriter dev-python/xlrd dev-python/xlwt
 	optfeature "necessary for HDF5-based storage" ">=dev-python/pytables-3.2.1"
 	optfeature "R I/O support" dev-python/rpy
 	optfeature "Needed for parts of pandas.stats" dev-python/statsmodels
diff --git a/dev-python/pandas/pandas-1.2.3-r3.ebuild b/dev-python/pandas/pandas-1.2.3-r1.ebuild
index b2e124d45be3..c5fb371b8de1 100644
--- a/dev-python/pandas/pandas-1.2.3-r3.ebuild
+++ b/dev-python/pandas/pandas-1.2.3-r1.ebuild
@@ -46,6 +46,8 @@ OPTIONAL_DEPEND="
 		>=dev-python/xarray-0.10.8[${PYTHON_USEDEP}]
 	' python3_{6,7})
 	>=dev-python/sqlalchemy-0.8.1[${PYTHON_USEDEP}]
+	>=dev-python/xlrd-1.0.0[${PYTHON_USEDEP}]
+	dev-python/xlwt[${PYTHON_USEDEP}]
 	>=dev-python/scipy-1.1[${PYTHON_USEDEP}]
 	X? (
 		|| (
@@ -77,6 +79,8 @@ DEPEND="${COMMON_DEPEND}
 		dev-python/pytz[${PYTHON_USEDEP}]
 		dev-python/rpy[${PYTHON_USEDEP}]
 		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/xlrd[${PYTHON_USEDEP}]
+		dev-python/xlwt[${PYTHON_USEDEP}]
 		dev-python/scipy[${PYTHON_USEDEP}]
 		x11-misc/xclip
 	)
@@ -96,7 +100,6 @@ DEPEND="${COMMON_DEPEND}
 		dev-python/xlsxwriter[${PYTHON_USEDEP}]
 		x11-misc/xclip
 		x11-misc/xsel
-		!!dev-python/xlwt
 	)
 "
 # dev-python/statsmodels invokes a circular dep
@@ -119,12 +122,6 @@ python_prepare_all() {
 }
 
 python_compile() {
-	if use amd64 || use x86; then
-		# FMA apparently breaks rolling var/stdev
-		# https://github.com/pandas-dev/pandas/issues/38921
-		append-flags -mno-fma
-	fi
-
 	distutils-r1_python_compile -j1
 }
 
@@ -144,6 +141,11 @@ src_test() {
 
 python_test() {
 	local deselect=(
+		# test for rounding errors, fails if we have better precision
+		# e.g. on amd64 with FMA or on arm64
+		# https://github.com/pandas-dev/pandas/issues/38921
+		pandas/tests/window/test_rolling.py::test_rolling_var_numerical_issues
+
 		# weird issue, doesn't seem very important
 		'pandas/tests/base/test_misc.py::test_memory_usage[series-with-empty-index]'
 	)
@@ -178,7 +180,7 @@ pkg_postinst() {
 	optfeature "for msgpack compression using blosc" dev-python/blosc
 	optfeature "Template engine for conditional HTML formatting" dev-python/jinja
 	optfeature "Plotting support" dev-python/matplotlib
-	optfeature "Needed for Excel I/O" ">=dev-python/openpyxl-1.6.1" dev-python/xlsxwriter
+	optfeature "Needed for Excel I/O" ">=dev-python/openpyxl-1.6.1" dev-python/xlsxwriter dev-python/xlrd dev-python/xlwt
 	optfeature "necessary for HDF5-based storage" ">=dev-python/pytables-3.2.1"
 	optfeature "R I/O support" dev-python/rpy
 	optfeature "Needed for parts of pandas.stats" dev-python/statsmodels
diff --git a/dev-python/qtconsole/Manifest b/dev-python/qtconsole/Manifest
index 352066aeddbf..c900a22251c0 100644
--- a/dev-python/qtconsole/Manifest
+++ b/dev-python/qtconsole/Manifest
@@ -1 +1,2 @@
 DIST qtconsole-5.0.2.tar.gz 428499 BLAKE2B 42d71e1a1909f8e07705fd5e7e64194d865b70cc67377ba631bb75fb8678faea4d8dddce90a2e84c0898fa074a88b655290bcf9ee1f9aebb39f91d2370908dbf SHA512 b74711c0444b74efc2fc31c631e6a87cfc05045d8ae9eb8253a9fcd1c82a1ecb688cbe50dc2f3dd4dc5d47c6e2b4fa027ac22e77b7ac37e1ed3fa0a9d2b677bb
+DIST qtconsole-5.0.3.tar.gz 428599 BLAKE2B 3110d597fe8692d46ac64c8f058f96356be62b95e74ebba8476eae148a9aa51193da0fe67fecf8a2de90d280121367802866bf17f68c7ad5b52ce3f84914af82 SHA512 efe88c66a508eac4ed14efb698b99d80b1a292e4b90fb04f76be829e95cf12b36e3afd968a6c7203bdd077a8bedbf7207c3a717809aaa3a514dfd99f7d4d5dcb
diff --git a/dev-python/qtconsole/qtconsole-5.0.3.ebuild b/dev-python/qtconsole/qtconsole-5.0.3.ebuild
new file mode 100644
index 000000000000..8962c1c192b3
--- /dev/null
+++ b/dev-python/qtconsole/qtconsole-5.0.3.ebuild
@@ -0,0 +1,47 @@
+# 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 distutils-r1
+
+DESCRIPTION="Qt-based console for Jupyter with support for rich media output"
+HOMEPAGE="https://jupyter.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/ipykernel[${PYTHON_USEDEP}]
+	dev-python/ipython_genutils[${PYTHON_USEDEP}]
+	dev-python/jupyter_core[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_client-4.1.1[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/traitlets[${PYTHON_USEDEP}]
+	dev-python/QtPy[${PYTHON_USEDEP},gui,printsupport,svg]
+"
+BDEPEND="
+	test? (
+		dev-python/QtPy[${PYTHON_USEDEP},svg,testlib]
+	)
+"
+# required by the tests that are removed:
+#		dev-python/flaky[${PYTHON_USEDEP}]
+#		dev-python/pytest-qt[${PYTHON_USEDEP}]
+
+PDEPEND="dev-python/ipython[${PYTHON_USEDEP}]"
+
+distutils_enable_sphinx docs/source
+distutils_enable_tests pytest
+
+src_prepare() {
+	# TODO: these tests require virtx; however, running under virtx
+	# causes pytest to segv on exit (even though tests pass)
+	rm qtconsole/tests/test_00_console_widget.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/responses/Manifest b/dev-python/responses/Manifest
index 259ec90dd8d5..bf1f6abd285d 100644
--- a/dev-python/responses/Manifest
+++ b/dev-python/responses/Manifest
@@ -1 +1,2 @@
 DIST responses-0.12.1.tar.gz 27123 BLAKE2B 2c77e3ac48e7430e2c91321a946c09746953b3aa2a93aff1ad277f849bc57fe8033d405cd0c391111ba31e523ecb2dfa5bc475519fb1224dff5247925eb54616 SHA512 cc840920895c5ab02b546d6441636197e93c4dc7346a801a14d663a30a761d78a0be73e820cdd5963e52d882958d9ea7873df6fcd6c032d99a230109b5c0ddb8
+DIST responses-0.13.0.tar.gz 30265 BLAKE2B fdf111b143fb47cb9d175a3718dabe1d23199e02719ece741a6416d25dc8ecf5fc67243c9f8d982b758524db45145d494131aa3f3659f04ff60c147da0fd9947 SHA512 84a542a4d1faccb3d530357db6e1edcf666c82a2eb3bfd86a5478fa96878bd42f82ffdec358f68e954838f5dd7dfa4aa6acf3dad7e0d1881fb8816a422b0e755
diff --git a/dev-python/responses/responses-0.13.0.ebuild b/dev-python/responses/responses-0.13.0.ebuild
new file mode 100644
index 000000000000..1f498bbb2533
--- /dev/null
+++ b/dev-python/responses/responses-0.13.0.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="Utility for mocking out the Python Requests library"
+HOMEPAGE="https://github.com/getsentry/responses"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/requests-2.0[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.10[${PYTHON_USEDEP}]
+	dev-python/cookies[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		dev-python/pytest-localserver[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/statsmodels/Manifest b/dev-python/statsmodels/Manifest
index c07c6e1a0d04..771b9aa85bff 100644
--- a/dev-python/statsmodels/Manifest
+++ b/dev-python/statsmodels/Manifest
@@ -1,4 +1 @@
-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.11.1.ebuild b/dev-python/statsmodels/statsmodels-0.11.1.ebuild
deleted file mode 100644
index 7b340c437102..000000000000
--- a/dev-python/statsmodels/statsmodels-0.11.1.ebuild
+++ /dev/null
@@ -1,89 +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 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="doc examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/numpy[${PYTHON_USEDEP}]
-	>=dev-python/pandas-0.23.0[${PYTHON_USEDEP}]
-	dev-python/patsy[${PYTHON_USEDEP}]
-	dev-python/scipy[${PYTHON_USEDEP}]
-"
-BDEPEND="dev-python/cython[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	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/nose[${PYTHON_USEDEP}]
-		dev-python/pandas[${PYTHON_USEDEP}]
-		dev-python/pytest[${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() {
-	pushd "${BUILD_DIR}" >/dev/null || die
-	"${EPYTHON}" -c '
-import statsmodels
-statsmodels.test(extra_args=["-vv"], 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-0.12.0.ebuild b/dev-python/statsmodels/statsmodels-0.12.0.ebuild
deleted file mode 100644
index 6c9bf7240b22..000000000000
--- a/dev-python/statsmodels/statsmodels-0.12.0.ebuild
+++ /dev/null
@@ -1,83 +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 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-0.12.1.ebuild b/dev-python/statsmodels/statsmodels-0.12.1.ebuild
deleted file mode 100644
index 6c9bf7240b22..000000000000
--- a/dev-python/statsmodels/statsmodels-0.12.1.ebuild
+++ /dev/null
@@ -1,83 +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 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-0.12.2.ebuild b/dev-python/statsmodels/statsmodels-0.12.2.ebuild
index 8f30b723ba8d..864bf269d9c2 100644
--- a/dev-python/statsmodels/statsmodels-0.12.2.ebuild
+++ b/dev-python/statsmodels/statsmodels-0.12.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="examples"
 
 RDEPEND="
diff --git a/dev-python/twine/Manifest b/dev-python/twine/Manifest
index a91b4e931df5..01d4ea27fc40 100644
--- a/dev-python/twine/Manifest
+++ b/dev-python/twine/Manifest
@@ -1,2 +1,3 @@
 DIST twine-3.3.0.tar.gz 148996 BLAKE2B 60668acd0481534631ca0ecf3c755df7e9e46c6d183d0f1c73ed7467cfecc144878d6ccf7ef2ee62efa17eb5629f5ed74c77c8ae4d57ef16530fad31afe40d97 SHA512 94fc7a9b3f2b5fc7c06baf55debf4fd55f6a2b4c4321c9bff46b844166769ce8bdcab10355c4967998149b62e13b26e11a30ff66042bfdd5af24d448321fd291
 DIST twine-3.4.0.tar.gz 211582 BLAKE2B 6b309880e96142a666f0113343f6a7a604ec6058f58429befa4709366d8dd8b6ddd0d2cd69d74653d12a74a615e6e3ad6b7d96892aa5beab00c934be2fc4b8d6 SHA512 6ce4757048fe7b5ada8a384fa185e80cee8412ef7f0561f55a5cbec39c0069522b57e403f148b9b55c55330a577873a5e9597ca0a6b0fb0cce6b377c8df07e4e
+DIST twine-3.4.1.tar.gz 211775 BLAKE2B 0fdc6a8f5a37ee9695c8db2080987b631dfe6f8ed718e3912c94d77b46d35682d27bef07715c1fe7c0d8b6ab1449a771e18d8ffa5c6044dde1536b56b3e7885e SHA512 eca2a7b6b1386868f67dec1182599a8331981585e1cc0b7eef762aa0e99b87b0c6725a2c776330a8b392254501880a68e01ed8569a169857e8079abb8da43b79
diff --git a/dev-python/twine/twine-3.4.1.ebuild b/dev-python/twine/twine-3.4.1.ebuild
new file mode 100644
index 000000000000..308ac8b33597
--- /dev/null
+++ b/dev-python/twine/twine-3.4.1.ebuild
@@ -0,0 +1,55 @@
+# 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="Collection of utilities for publishing packages on PyPI"
+HOMEPAGE="https://twine.readthedocs.io/ https://github.com/pypa/twine https://pypi.org/project/twine/"
+SRC_URI="https://github.com/pypa/twine/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	>=dev-python/colorama-0.4.3[${PYTHON_USEDEP}]
+	>=dev-python/importlib_metadata-3.6[${PYTHON_USEDEP}]
+	>=dev-python/keyring-15.1[${PYTHON_USEDEP}]
+	>=dev-python/pkginfo-1.4.2[${PYTHON_USEDEP}]
+	>=dev-python/readme_renderer-21.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.20.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-toolbelt-0.8.0[${PYTHON_USEDEP}]
+	>=dev-python/rfc3986-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/tqdm-4.14[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/jaraco-envs[${PYTHON_USEDEP}]
+		dev-python/jaraco-functools[${PYTHON_USEDEP}]
+		dev-python/munch[${PYTHON_USEDEP}]
+		dev-python/portend[${PYTHON_USEDEP}]
+		dev-python/pretend[${PYTHON_USEDEP}]
+		dev-python/pypiserver[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests --install pytest
+
+python_prepare_all() {
+	# requires internet
+	rm -f tests/test_integration.py || die
+	# pytest-socket dep relevant only to test_integration, and upstream
+	# disables it anyway
+	sed -i -e '/--disable-socket/d' pytest.ini || die
+	sed -i -e '/--cov/d' pytest.ini || die
+
+	distutils-r1_python_prepare_all
+	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+}
diff --git a/dev-python/virtualenv/Manifest b/dev-python/virtualenv/Manifest
index 8d87297f6e0b..f74c42ec0925 100644
--- a/dev-python/virtualenv/Manifest
+++ b/dev-python/virtualenv/Manifest
@@ -1,3 +1,4 @@
 DIST virtualenv-16.7.10.tar.gz 5116776 BLAKE2B 42f0a4b4330850b504f8febd991ef6ecdcbb0821efdd94ca324a8cc34a68a760a8a98de97f0cb2384d8e6cbb0ce8f261995c6433886444e29b75ba0ce09ca12c SHA512 f06d7c354ce1910f04dbcbe1a77e60392653bbe4f638bafbe9284454db2c0e5d63cf9159201d0916fc01aaba91d45fb733b63096c38517fcd83fd00ed8b26d28
 DIST virtualenv-20.4.0.tar.gz 9079287 BLAKE2B a3c97537b9c35b463a0077e6020fd087a1cf7c22302ab9f57a7df951bd68d3b0e1bc323cdf12a71ca0fdba938364dbd970467d4f9f768ee688a5d9709949b08a SHA512 4dcc141441626ca2a565c1b51453ef0b7a05016037c44ae1017269e5b2ea98fb7fb29fb9cf3f8909a377824b5e52c5b40d2592e40931d8ad63ad850b8e5f23ac
 DIST virtualenv-20.4.2.tar.gz 10578406 BLAKE2B e9b50a40407954c411076244c09a57601553c16b750231ee451e1954a91f1c18740804246e3e4ba2ff55da021e976cab80da86a1b9d01e3cd3d494aa95f07129 SHA512 3ae13f0ca2af8be1cd95affdbfe58d43f930cf616a38963252219d4efc2523b1c3e8d922b3ab2200ac4cadc76c1237ddb4828ac15b5122771e96f7401a852d4e
+DIST virtualenv-20.4.3.tar.gz 10579193 BLAKE2B 02102579eb72b7e4ea8fa182b3c7ef5d8b9d95992b5f73b0f24737522dfae988a91953c49df5aa17541f3f0b1c54557ece7feba173a9cce3bb65964bddbd6edb SHA512 d79479d73fc87f34462e775629306bd20ff5d25eb1829c6719f08c800df6a5db03254b04773766a703d903d577cf74b8409a026196ba98d0f5f94f70604ed576
diff --git a/dev-python/virtualenv/virtualenv-20.4.3.ebuild b/dev-python/virtualenv/virtualenv-20.4.3.ebuild
new file mode 100644
index 000000000000..b913c7100c09
--- /dev/null
+++ b/dev-python/virtualenv/virtualenv-20.4.3.ebuild
@@ -0,0 +1,95 @@
+# 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 )
+DISTUTILS_USE_SETUPTOOLS=manual
+
+inherit distutils-r1
+
+DESCRIPTION="Virtual Python Environment builder"
+HOMEPAGE="
+	https://virtualenv.pypa.io/en/stable/
+	https://pypi.org/project/virtualenv/
+	https://github.com/pypa/virtualenv/
+"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+SLOT="0"
+
+RDEPEND="
+	>=dev-python/appdirs-1.4.3[${PYTHON_USEDEP}]
+	>=dev-python/distlib-0.3.1[${PYTHON_USEDEP}]
+	>=dev-python/filelock-3[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-41[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_metadata-0.12[${PYTHON_USEDEP}]
+	' python3_{6,7} pypy3)
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_resources-1.0[${PYTHON_USEDEP}]
+	' python3_6 pypy3)"
+# coverage is used somehow magically in virtualenv, maybe it actually
+# tests something useful
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/coverage[${PYTHON_USEDEP}]
+			dev-python/flaky[${PYTHON_USEDEP}]
+			>=dev-python/pip-20.0.2[${PYTHON_USEDEP}]
+			>=dev-python/pytest-freezegun-0.4.1[${PYTHON_USEDEP}]
+			>=dev-python/pytest-mock-2.0.0[${PYTHON_USEDEP}]
+			>=dev-python/pytest-timeout-1.3.4[${PYTHON_USEDEP}]
+			dev-python/wheel[${PYTHON_USEDEP}]
+			>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
+		' 'python3*')
+	)"
+
+distutils_enable_sphinx docs \
+	dev-python/sphinx_rtd_theme \
+	dev-python/towncrier
+distutils_enable_tests pytest
+
+src_configure() {
+	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+}
+
+python_test() {
+	local deselect=(
+		tests/unit/activation/test_xonsh.py
+		tests/unit/seed/embed/test_bootstrap_link_via_app_data.py::test_seed_link_via_app_data
+		tests/unit/create/test_creator.py::test_cross_major
+	)
+	[[ ${EPYTHON} == pypy3 ]] && deselect+=(
+		'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-isolated]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-global]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-isolated]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-global]'
+		'tests/unit/create/test_creator.py::test_zip_importer_can_import_setuptools'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3--bin-]'
+	)
+
+	distutils_install_for_testing
+	epytest ${deselect[@]/#/--deselect }
+}
+
+pkg_postinst() {
+	elog "Please note that while virtualenv package no longer supports"
+	elog "Python 2.7, you can still create py2.7 virtualenvs via:"
+	elog "  $ virtualenv -p 2.7 ..."
+}
diff --git a/dev-python/xlrd/Manifest b/dev-python/xlrd/Manifest
index 2771a9e0040a..8ab51716c963 100644
--- a/dev-python/xlrd/Manifest
+++ b/dev-python/xlrd/Manifest
@@ -1 +1,2 @@
 DIST xlrd-1.2.0.tar.gz 554079 BLAKE2B 57c956139a3e2239c9caeae66b36e384458f1f2060422575dcb63fb09b7f9050f669154d1479303640cc45fb5716e027d3b5d07282b08bd866c4e5366861ecef SHA512 eea14845701b86a2679f140c9730e8ee2722b4f859cdd870f86bf54df522d54fc3c78dc4354aeb958c72596a6349995e9d79935efc734de096f6e007945fc1b3
+DIST xlrd-2.0.1.gh.tar.gz 368304 BLAKE2B eaf6dbefde00954452a96214c6a48e5d35526168445d15d721851da690bd99e53bd765a73495b00c8ee7ce243c487da0afbc6d6217abd7a5956820357dc97104 SHA512 b3e2efa216fc73bf55bb0b165ef63e797d16a00c62f0f2f2a2114d2db7204208f2623835697a045abe185f52c426ed5e9ef38a4f5f8e1880f0cfdf642af3c57e
diff --git a/dev-python/xlrd/xlrd-2.0.1.ebuild b/dev-python/xlrd/xlrd-2.0.1.ebuild
new file mode 100644
index 000000000000..8fb5b4596878
--- /dev/null
+++ b/dev-python/xlrd/xlrd-2.0.1.ebuild
@@ -0,0 +1,22 @@
+# 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="Library to extract data from Microsoft Excel spreadsheets"
+HOMEPAGE="
+	https://www.python-excel.org/
+	https://github.com/python-excel/xlrd/"
+SRC_URI="
+	https://github.com/python-excel/xlrd/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+
+distutils_enable_tests unittest