Adding metadata

33 files changed, 614 insertions, 114 deletions

diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 630e996491b6..547491b6b4b6 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -3,4 +3,5 @@ DIST boto3-1.20.14.tar.gz 449126 BLAKE2B b2ef8a101aaecb5d65a60fcbf7f83e899461810
 DIST boto3-1.20.15.tar.gz 449395 BLAKE2B 702a8e1c156b3c4d3f6d5428779bbeb2f917a9977d5b34553ebef684e14dfb680ca1fbd513e285dbf706c8de8e9469f1bbe19655992649a10290dbde4cd5f641 SHA512 2b2b77670df654594adc0047214a4d68f800611a2b8d6f4faeba10a66bd289508eb88f34a436c59eb4bbe65f549baae4a5676054c38b7816f16d8de46a41fe94
 DIST boto3-1.20.17.tar.gz 452876 BLAKE2B ff59e490e5938bea7cdd0ae54f82c33d410b42b9417a16e9890e809cc3540d07711ae2285f354129b178e59d7400b25e2176907354acb12bcfeb5dd5d3bc0111 SHA512 1232f475282666fa6653407bebfd85fee5d681523a94da56adf02616117002d7123e6f55523ef042f89cd5971031192665b84ca5619d26b1795cf597e1060082
 DIST boto3-1.20.18.tar.gz 454201 BLAKE2B f6e87d93fcfe525deb34166310cb830547a8d51280b48005d25a9bfa5852a1a577bccb91f2fe0825991ef4f4b5a1340b6f0b505be864338386f2e02b522a2236 SHA512 22b349efbfcc2a4e7dd9be8a8f19ff5a399c7b474ac615f065e2fe62217ed1d94951744e9ba266c85650ff92c7b2183c3916f3d39f62d0d685742344b2500992
+DIST boto3-1.20.19.tar.gz 454558 BLAKE2B e1d08d2508bee7b22af370b4566d4f1b5e65b42b3993f4e5bdf7398703381e34c7da0f497506972643ccda12a746848a2198deb01990d08740b9ea278e1b26d3 SHA512 0df24734b3961a49380b39325278a3fb50e66c21fb5dbacf1133ef0e4ced1f7058c990b48e1dd0fc7c949fdd5f5674810b5e311df0e5a862d3877d41eb6475ab
 DIST boto3-1.20.5.tar.gz 439166 BLAKE2B c140e15e497e6cdf6b4b77bb99e0a0f5ac01d5b5793f8bfb210b52bbc09e39e6fe06a957951375e0795210dc1c3b2a0afd2f498bc88e449d9e6846f2b357f016 SHA512 2823466e4851684253d4ce42a8c34e5cbdad6d04c823040fe2cebdf0cffb14d5d3f40e28d57ebec14533fab04ba74f27c25f078ddb8791b8f52d0424e11b39fc
diff --git a/dev-python/boto3/boto3-1.20.19.ebuild b/dev-python/boto3/boto3-1.20.19.ebuild
new file mode 100644
index 000000000000..ace657bcbe4d
--- /dev/null
+++ b/dev-python/boto3/boto3-1.20.19.ebuild
@@ -0,0 +1,59 @@
+# 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="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 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+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 pytest
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	epytest tests/{functional,unit}
+}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index b67469dca1b4..03136029e5a1 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -3,4 +3,5 @@ DIST botocore-1.23.14.tar.gz 8486875 BLAKE2B 93a3fd40b26d026dcee10172e560b4d59cd
 DIST botocore-1.23.15.tar.gz 8499971 BLAKE2B d08fdcb398cd6bcb63a8922ebfb0f1c32c62190fb04e79e38db13ff51fbf45a0e1191037266ec4e96bb67d1c48e2510976a79591b06a7bb6d0cd57c89f8c81ce SHA512 df57fc9698d5bd5babbd0e94b4150fa287ecb3b32453532fe7cc87bb7dab87d181a7bedb85a57ca250987539f92b832e3a368d9faa39ae5ac641688d3907f818
 DIST botocore-1.23.17.tar.gz 8604819 BLAKE2B f6be48e3d0a2397be4934d9adaddbc4f2d70b2b002585e3057aead69ba934f4e53fcbffe7ea3f5919aa85d1cefe8c1abf6d1e150af6a18bd96561901d1ba7f87 SHA512 fecbb2f2ac451ffc97d7d8ad8224c3d1eff81fa225839199f403be9428cea203c077beb7c05e412784d8b6bedace3c1f24ca45730cc7877961931ac14912d1e1
 DIST botocore-1.23.18.tar.gz 8647407 BLAKE2B a1c5a9006d0e2214ad1fc89752043832e657a2bb1994b9b91981430d6544818d79d669cbdf8e41b4cd6880dfb6bf001dfc03e9616da4873a89b0c3f8fcd3fdc5 SHA512 65ec3aad0508dc9a4d0426658b5a0dfec011613d236248726f94e128c2b762ac652fd5078973a9a7a101cb1a01c3dadc52b272a584310cf76ca798884c06f25b
+DIST botocore-1.23.19.tar.gz 8666566 BLAKE2B 617704ba2bb367f864a6b493be9b643e52f8c22041d255252aae5e21c684544db1d58fc06f920e20ddfa54b8a3c166627d046b79d6ef06db2cd034fb58397258 SHA512 6a551cd50ecbad954982a7e6296c803a20d28065df04c9ca482b91aa91b6f336df8f81fd706771c0f04d55e2f3803cc4f1ec9b347e490e492515df427f52a692
 DIST botocore-1.23.5.tar.gz 8374467 BLAKE2B 467092e7d8aa5ccb756132669049865445a47205913964c1c944b20caaf100b1efdd1bf3af9c5416ff079b487e6d4d08ffe6208e2b352d09655cc5be21c88739 SHA512 6afca19b724f9019f21e5993ce970d605b95d31c1a4e969ec1b4080510a5a120b3fa0cfd5ade973a9203bd6b7983a3dbca2f7a03108a9167392efd60d5e2fe9b
diff --git a/dev-python/botocore/botocore-1.23.19.ebuild b/dev-python/botocore/botocore-1.23.19.ebuild
new file mode 100644
index 000000000000..cfc004c5eba7
--- /dev/null
+++ b/dev-python/botocore/botocore-1.23.19.ebuild
@@ -0,0 +1,65 @@
+# 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="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 ~ppc ~ppc64 ~sparc ~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/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 pytest
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+
+	# unbundle deps
+	rm -r botocore/vendored || die
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# rely on bundled six
+		tests/functional/test_six_imports.py::test_no_bare_six_imports
+		tests/functional/test_six_threading.py::test_six_thread_safety
+	)
+
+	distutils_install_for_testing --via-venv
+	epytest tests/{functional,unit}
+}
diff --git a/dev-python/coverage/coverage-6.1.2.ebuild b/dev-python/coverage/coverage-6.1.2.ebuild
index a76a3e829758..1b051f0babc3 100644
--- a/dev-python/coverage/coverage-6.1.2.ebuild
+++ b/dev-python/coverage/coverage-6.1.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 #IUSE="test"
 # The tests are impossible to appease.  Please run them externally
 # via tox.  Or fix the ebuild if you have hours of time to spend
diff --git a/dev-python/cycler/Manifest b/dev-python/cycler/Manifest
index 73f0eead7970..ba18bacb831f 100644
--- a/dev-python/cycler/Manifest
+++ b/dev-python/cycler/Manifest
@@ -1,2 +1 @@
-DIST cycler-0.10.0.gh.tar.gz 21672 BLAKE2B 68b48e8359210845e35e4fe2cd1f48b48ac2c1ce67196fd9fa1e3a83a3bf15d6889a727bf62a65097d0975e93e660550084ef66a0c3a3de98ba04d439d29965b SHA512 685231d455dfdde70eb71415dfe561e07c34579d7b31ef7197f4c1441301635b387fec903d610b35406b619264f4c0cc616562de8f02b8192414c29274b63c01
 DIST cycler-0.11.0.gh.tar.gz 19028 BLAKE2B 7726067db988e40b833ebcef4a9122fd91753925af829a0023c08081ea7f315b84fd3a5d13731dba72d2820159da45698200ca8649b65b854d48e1a114e31d81 SHA512 cdf91b861d20710b3d77ad105e54668fafa4be69e566d6a09683c638a35aa423b542a141ca0bbffd7a6cd30c8e2a629d578be88648ab9f38a0c43405f2f39613
diff --git a/dev-python/cycler/cycler-0.10.0-r1.ebuild b/dev-python/cycler/cycler-0.10.0-r1.ebuild
deleted file mode 100644
index 4030aab2b31b..000000000000
--- a/dev-python/cycler/cycler-0.10.0-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-inherit distutils-r1
-
-MY_PN="Cycler"
-
-DESCRIPTION="Composable style cycles"
-HOMEPAGE="
-	https://matplotlib.org/cycler/
-	https://pypi.org/project/Cycler/
-	https://github.com/matplotlib/cycler"
-SRC_URI="
-	https://github.com/matplotlib/cycler/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-
-distutils_enable_tests nose
diff --git a/dev-python/cycler/cycler-0.11.0.ebuild b/dev-python/cycler/cycler-0.11.0.ebuild
index 83300ca2f30c..fa06e67fd565 100644
--- a/dev-python/cycler/cycler-0.11.0.ebuild
+++ b/dev-python/cycler/cycler-0.11.0.ebuild
@@ -17,6 +17,6 @@ SRC_URI="
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 distutils_enable_tests pytest
diff --git a/dev-python/cycler/metadata.xml b/dev-python/cycler/metadata.xml
index 89826300f3c7..761e70d41b6d 100644
--- a/dev-python/cycler/metadata.xml
+++ b/dev-python/cycler/metadata.xml
@@ -9,4 +9,5 @@
   <remote-id type="pypi">cycler</remote-id>
  </upstream>
  <origin>gentoo-staging</origin>
+ <stabilize-allarches/>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/google-api-python-client/Manifest b/dev-python/google-api-python-client/Manifest
index efc6b2a48e2c..cd9c4260b302 100644
--- a/dev-python/google-api-python-client/Manifest
+++ b/dev-python/google-api-python-client/Manifest
@@ -1 +1,2 @@
 DIST google-api-python-client-2.31.0.tar.gz 27822400 BLAKE2B 447d97ec10376c1a9e911023051b8e3e278db782f91e0e4c1eb72f4ba54db0498439fca42633bc9fdf16ac2982a286103d6d7a99b701b0ff30e024e131b5e175 SHA512 80359f415e2ec4c42b7e12aa333d91849a4246fd744ec627397099be261176add44bf4ada875bc353729bbbca589be59e6cad3810f609d9d23f9fb458bf2c69e
+DIST google-api-python-client-2.32.0.tar.gz 27954196 BLAKE2B 1863735d3862a11b3fce3dc270442b9cd5612375062ee447be07baa35578668db53d8415e7c88ad29b9c6ede02113686ba7ea6b994bfb6b2b72bb2bf5139c86f SHA512 2a9300020ec28da02ae689b4527fcfea6f3f78131a5431a3c3720dae1868bfa76871330685fdb4403328cc21736099fe8e346cfbf215e19f8cb00d1f5d1707f6
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.32.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.32.0.ebuild
new file mode 100644
index 000000000000..f0739995529c
--- /dev/null
+++ b/dev-python/google-api-python-client/google-api-python-client-2.32.0.ebuild
@@ -0,0 +1,45 @@
+# 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="Google API Client for Python"
+HOMEPAGE="https://github.com/googleapis/google-api-python-client"
+SRC_URI="https://github.com/googleapis/google-api-python-client/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/httplib2-0.15[${PYTHON_USEDEP}]
+	<dev-python/httplib2-1[${PYTHON_USEDEP}]
+	dev-python/google-api-core[${PYTHON_USEDEP}]
+	>=dev-python/google-auth-1.35.0[${PYTHON_USEDEP}]
+	>=dev-python/google-auth-httplib2-0.1.0[${PYTHON_USEDEP}]
+	>=dev-python/uritemplate-3.0.0[${PYTHON_USEDEP}]
+	<dev-python/uritemplate-5[${PYTHON_USEDEP}]
+	"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/oauth2client[${PYTHON_USEDEP}]
+		dev-python/pandas[${PYTHON_USEDEP}]
+		dev-python/parameterized[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests --install pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# require Internet access (and credentials)
+		tests/test_discovery.py::DiscoveryErrors::test_credentials_and_credentials_file_mutually_exclusive
+		tests/test_discovery.py::DiscoveryFromDocument::test_api_endpoint_override_from_client_options_mapping_object
+	)
+
+	distutils_install_for_testing
+	epytest tests
+}
diff --git a/dev-python/hiredis/hiredis-2.0.0-r1.ebuild b/dev-python/hiredis/hiredis-2.0.0-r1.ebuild
deleted file mode 100644
index dc815b8d0689..000000000000
--- a/dev-python/hiredis/hiredis-2.0.0-r1.ebuild
+++ /dev/null
@@ -1,32 +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="Python extension that wraps hiredis"
-HOMEPAGE="https://github.com/redis/hiredis-py/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~sparc x86"
-IUSE="system-libs"
-
-DEPEND="system-libs? ( >=dev-libs/hiredis-1.0.0:= )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	use system-libs && PATCHES+=(
-		"${FILESDIR}"/${P}-system-libs.patch
-	)
-	sed -i -e 's:description-file:description_file:' setup.cfg || die
-	default
-}
-
-python_test() {
-	cd test || die
-	"${EPYTHON}" -m unittest -v reader.ReaderTest || die "tests failed"
-}
diff --git a/dev-python/hiredis/hiredis-2.0.0-r2.ebuild b/dev-python/hiredis/hiredis-2.0.0-r2.ebuild
index 625a817c132d..0e00e36d0083 100644
--- a/dev-python/hiredis/hiredis-2.0.0-r2.ebuild
+++ b/dev-python/hiredis/hiredis-2.0.0-r2.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 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~sparc x86"
 IUSE="system-libs"
 
 DEPEND="system-libs? ( >=dev-libs/hiredis-1.0.0:= )"
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index cf85761436ee..c5689f6d0f01 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -10,3 +10,4 @@ DIST hypothesis-python-6.27.3.tar.gz 9173846 BLAKE2B d8ba0509ff182cf25b8fbb8c5ad
 DIST hypothesis-python-6.28.1.tar.gz 9175083 BLAKE2B c5ecd2e62696a57643ca7043a902f08c58c0635bf80e3366921b0c0f6232015f8833fa25ebd20faad01a3b77660c489c25574934e6899dd0a4151b89ad65932c SHA512 4402e7d6030ef79214d9d4b83d165788a3a45bc733aeefb7d70a85fb3d542dc1619943d19cbf7abc3902bf23eecb61a369915bee333abd3347927522ae9ed01d
 DIST hypothesis-python-6.29.0.tar.gz 9175657 BLAKE2B 0e558e6562f6ed258384209bf5a8268b65bb6caaa590b87dce8b609030c6f25f520e094a269d08bfa39dc97411f75f0465508b176c785c7009b48eb2c864f9cb SHA512 dc54d541dc4d3b2d67adc553f0482bcd41d4102ee1b297d7a45bf8098af147c8ef12816ab13e105f990994dfe8ee23572a71e43e4b80ae8d04e7a6950f413651
 DIST hypothesis-python-6.29.1.tar.gz 9175987 BLAKE2B c12691eb1ff9221ba03799f6848d3c17ec7915f34881fcd7c809dbf5041b2ec203d1189ca425215fa06a3500df622797fe38e77dbca29c10cc707e3c9c96d664 SHA512 b9d05838711a587594ca767e3d9226b69b9deedb2e586719ea6f5a2b8acfc70ae48fcea184b5418a1072d089d3b14eb0b99b2b257515e47f175770a8e10f9f28
+DIST hypothesis-python-6.29.3.tar.gz 9176581 BLAKE2B d013c6dd2ddb8dfddf7f856c9358157ff4fa22aa19d40c4057952a2e136e8618cfd2bf8c80f0d606147b91efaed03c710cc2a993f9b8658e25669691e3df22f3 SHA512 4226683702b8be568073167ec6e5681a4ea2416c9e2baebb04bc549164e88c3e0d14d8ea525c64d571c8dc1446626f93809bc75b2a1c3f4c50ece97ee791446f
diff --git a/dev-python/hypothesis/hypothesis-6.29.3.ebuild b/dev-python/hypothesis/hypothesis-6.29.3.ebuild
new file mode 100644
index 000000000000..8b48444a4699
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-6.29.3.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_{7..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.{7..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/ipython/Manifest b/dev-python/ipython/Manifest
index 13f8759bde48..3113952fdb92 100644
--- a/dev-python/ipython/Manifest
+++ b/dev-python/ipython/Manifest
@@ -1,3 +1,4 @@
 DIST ipython-7.28.0.tar.gz 5150515 BLAKE2B e69b2ca9b788d8bcc12fb1b82c2e3f198ba4cf1918c8d8d30aea9a1ee3c7cea99ba3ade8ac7171466f1ffc8771dafcf5980766ecca7b985e07890e229cd1575d SHA512 227645ab2cc698f6f7141bb3712b254d75beaf3f227065530f25f988ac76b5a741752ddfa6bb2816b625eaa4972d434f9e73dbe465654e4efc5420b5d80650cb
 DIST ipython-7.29.0.tar.gz 5151803 BLAKE2B 685bb7df39513fe262c07dbb10de4d795860bf2958c626d030bfa3e18052a98d7c9d5f0f96c0c9a5d4b9fdcfab09c492457d409f05ce522f607456ff3a4b35fd SHA512 b8e9cc07a0f77bbfaa88183546ed9d7e4a4c37e7c1704b1a3716d605a04339f986c7767f3c0920a94039eda99e75afb62a7bb43fa0cde6699a902f3b8f83a398
 DIST ipython-7.30.0.tar.gz 5154105 BLAKE2B d78dd28aa294ef5e1432ca5d2d853f313f72113a26b9130628e706915d646795a950c983f10e6f6d749833169e42f137a5338a680ea5ed237099a9436497cced SHA512 a3de277701154ebe458809796d7a71319ea41f87dc914814571fcd5723050a5e6c9af06ff2a28b336b1ec9dfc4288b27b141d3faa04d98d43f3f9836ba059f50
+DIST ipython-7.30.1.tar.gz 5154336 BLAKE2B 0753433eea2ee6a5a6451db6aa537c9c9469c749b970ecdd040123787064e7be78363060a785c7ea4175b8e0f4f2bfefa15485f6f5412ec34690fe505a1cfb97 SHA512 839f709e019dd5efe32730f2e4c457e6dae0db5490844805d30f12a1fd17bfb2f991f1374a84542b2392d3ce332096d3922471c6b14149331075be8719b14734
diff --git a/dev-python/ipython/ipython-7.30.1.ebuild b/dev-python/ipython/ipython-7.30.1.ebuild
new file mode 100644
index 000000000000..b37808175082
--- /dev/null
+++ b/dev-python/ipython/ipython-7.30.1.ebuild
@@ -0,0 +1,153 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+PYTHON_REQ_USE='readline,sqlite,threads(+)'
+
+inherit distutils-r1 optfeature virtualx
+
+DESCRIPTION="Advanced interactive shell for Python"
+HOMEPAGE="https://ipython.org/ https://github.com/ipython/ipython/"
+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"
+IUSE="doc examples matplotlib notebook nbconvert qt5 +smp test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/backcall[${PYTHON_USEDEP}]
+	dev-python/decorator[${PYTHON_USEDEP}]
+	>=dev-python/jedi-0.16[${PYTHON_USEDEP}]
+	>=dev-python/pexpect-4.3[${PYTHON_USEDEP}]
+	dev-python/pickleshare[${PYTHON_USEDEP}]
+	>=dev-python/prompt_toolkit-2[${PYTHON_USEDEP}]
+	<dev-python/prompt_toolkit-3.1[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/traitlets[${PYTHON_USEDEP}]
+	matplotlib? (
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		dev-python/matplotlib-inline[${PYTHON_USEDEP}]
+	)
+"
+
+BDEPEND="
+	test? (
+		app-text/dvipng[truetype]
+		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		dev-python/matplotlib-inline[${PYTHON_USEDEP}]
+		dev-python/nbformat[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		>=dev-python/numpy-1.17[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/testpath[${PYTHON_USEDEP}]
+	)
+	doc? (
+		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-2[${PYTHON_USEDEP}]
+		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+RDEPEND+="
+	nbconvert? (
+		dev-python/nbconvert[${PYTHON_USEDEP}]
+	)"
+PDEPEND="
+	notebook? (
+		dev-python/notebook[${PYTHON_USEDEP}]
+		dev-python/ipywidgets[${PYTHON_USEDEP}]
+		dev-python/widgetsnbextension[${PYTHON_USEDEP}]
+	)
+	qt5? ( dev-python/qtconsole[${PYTHON_USEDEP}] )
+	smp? (
+		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
+		>=dev-python/ipyparallel-6.2.3[${PYTHON_USEDEP}]
+	)"
+
+PATCHES=( "${FILESDIR}"/2.1.0-substitute-files.patch )
+
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_prepare_all() {
+	# Remove out of date insource files
+	rm IPython/extensions/cythonmagic.py || die
+	rm IPython/extensions/rmagic.py || die
+
+	# Prevent un-needed download during build
+	if use doc; then
+		sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/source/conf.py || die
+	fi
+
+	# Rename the test directory to reduce sys.path pollution
+	# https://github.com/ipython/ipython/issues/12892
+	mv IPython/extensions/{,ipython_}tests || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		emake -C docs html_noapi
+		HTML_DOCS=( docs/build/html/. )
+	fi
+}
+
+python_test() {
+	local -x IPYTHON_TESTING_TIMEOUT_SCALE=20
+	local EPYTEST_DESELECT=()
+	[[ ${EPYTHON} == python3.10 ]] && EPYTEST_DESELECT+=(
+		# TODO
+		IPython/core/tests/test_completer.py::TestCompleter::test_all_completions_dups
+		IPython/core/tests/test_completer.py::TestCompleter::test_deduplicate_completions
+		IPython/core/tests/test_oinspect.py::test_pinfo_docstring_if_detail_and_no_source
+		# fails due to changed argparse output
+		IPython/core/tests/test_magic_arguments.py::test_magic_arguments
+		# py3.10 API incompat, doesn't look important
+		IPython/lib/tests/test_pretty.py::test_pprint_heap_allocated_type
+	)
+	virtx epytest
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	# Create ipythonX.Y symlinks.
+	# TODO:
+	# 1. do we want them for pypy? No.  pypy has no numpy
+	# 2. handle it in the eclass instead (use _python_ln_rel).
+	# With pypy not an option the dosym becomes unconditional
+	dosym ../lib/python-exec/${EPYTHON}/ipython \
+		/usr/bin/ipython${EPYTHON#python}
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
+
+pkg_postinst() {
+	optfeature "sympyprinting" dev-python/sympy
+	optfeature "cythonmagic" dev-python/cython
+	optfeature "%lprun magic command" dev-python/line_profiler
+	optfeature "%mprun magic command" dev-python/memory_profiler
+
+	if use nbconvert; then
+		if ! has_version app-text/pandoc ; then
+			einfo "Node.js will be used to convert notebooks to other formats"
+			einfo "like HTML. Support for that is still experimental. If you"
+			einfo "encounter any problems, please use app-text/pandoc instead."
+		fi
+	fi
+}
diff --git a/dev-python/libarchive-c/Manifest b/dev-python/libarchive-c/Manifest
index 9ea5c8f7a1b4..22e774256cb4 100644
--- a/dev-python/libarchive-c/Manifest
+++ b/dev-python/libarchive-c/Manifest
@@ -1 +1,2 @@
 DIST libarchive-c-3.1.tar.gz 11145 BLAKE2B 80d8918423ec23065cfd7dc391f458bdd44ade765c5e16c23f6cd1ff760e750551d1ff16ccd524a409f466512cb4caed9d25716d12021eafc915a9904bfd0f63 SHA512 1863e2981475839aebce50aa649f603dae7d54772fb864a83613e1d94ead48b64e0edfa0046fb91d1fc985a351911dcd13a24cddfefbb5b7403da1107dc3353c
+DIST libarchive-c-3.2.tar.gz 44896 BLAKE2B 9e984c8e23422ceb552d34d4560b2c8279e1c2d52ffedcc893af3a1a8420eb03b735058d2f8dbe542f3920d0f0bf53777f0679a238cc0368e8e680c44358a72c SHA512 d11a7da0e592b7fce5044b9ff2930e50004c15b166a76f7871b9d0d584cb6da5989c4ec79969439b00baffa564738af607cdf5e37141c6e879b8a76ae68c325c
diff --git a/dev-python/libarchive-c/libarchive-c-3.2-r1.ebuild b/dev-python/libarchive-c/libarchive-c-3.2-r1.ebuild
new file mode 100644
index 000000000000..35673f4febd5
--- /dev/null
+++ b/dev-python/libarchive-c/libarchive-c-3.2-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+inherit distutils-r1
+
+DESCRIPTION="A Python interface to libarchive"
+HOMEPAGE="https://github.com/Changaco/python-libarchive-c/ https://pypi.org/project/libarchive-c/"
+SRC_URI="https://github.com/Changaco/python-libarchive-c/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/python-${P}
+
+LICENSE="CC0-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+RDEPEND="app-arch/libarchive"
+BDEPEND="test? ( dev-python/mock[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
diff --git a/dev-python/markdown2/Manifest b/dev-python/markdown2/Manifest
index 2dbb28a94137..7d15892592d3 100644
--- a/dev-python/markdown2/Manifest
+++ b/dev-python/markdown2/Manifest
@@ -1,2 +1 @@
-DIST markdown2-2.4.1.tar.gz 97089 BLAKE2B 62506be323a0c05060e5922b4eafbe1d0f6c2d9f81348fe5e35af8a577e0d7c26ba56cfa727fc1bb13dc3d08e7a8fe183d9ad91746dfc7a0034d025ff91c1bb9 SHA512 fa62640a135bb01b2dc82f658089c5880a3183c3b6e498ce76a27075d3045d70d7e00b9d497180a63c00cbd9ece83ebabaa8cd31ee326160d891fb422f43528e
 DIST markdown2-2.4.2.tar.gz 96270 BLAKE2B 63808f2b6e8af25eca047e7b24a7ab7ce7afc35fa10aff57b93952cefae765ae8746300f6e93033be87aa73607249198cdfd4fa6e3b3aed711e80d9dc7a006ab SHA512 8c41617213ae8a2d02a986489756d511ee7e1ae970eef348f68808439feaef099ef935ea0a2c31cb9e9abe39899a24fd981a29b7c90d1f8096ba999506121e60
diff --git a/dev-python/markdown2/markdown2-2.4.1.ebuild b/dev-python/markdown2/markdown2-2.4.1.ebuild
deleted file mode 100644
index 1a7ea89e2de4..000000000000
--- a/dev-python/markdown2/markdown2-2.4.1.ebuild
+++ /dev/null
@@ -1,29 +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} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Python Markdown language reimplementation"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-HOMEPAGE="https://github.com/trentm/python-markdown2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="dev-python/pygments[${PYTHON_USEDEP}]"
-
-distutils_enable_tests unittest
-
-src_test() {
-	cd test || die
-	distutils-r1_src_test
-}
-
-python_test() {
-	"${EPYTHON}" -m unittest test_markdown2.py -v ||
-		die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/markdown2/markdown2-2.4.2.ebuild b/dev-python/markdown2/markdown2-2.4.2.ebuild
index 9422202c45a5..1a7ea89e2de4 100644
--- a/dev-python/markdown2/markdown2-2.4.2.ebuild
+++ b/dev-python/markdown2/markdown2-2.4.2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://github.com/trentm/python-markdown2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="dev-python/pygments[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/nuitka/Manifest b/dev-python/nuitka/Manifest
index baf567740d96..60391a0882b2 100644
--- a/dev-python/nuitka/Manifest
+++ b/dev-python/nuitka/Manifest
@@ -1,2 +1,3 @@
 DIST Nuitka-0.6.17.6.tar.gz 3148827 BLAKE2B 4c898cac6ae5934e45ecfd37222670d7665ad9f512ae4e7f4e94eb25d19cd434448dbdf188b74398c49eea3b26a393f4fabfddb879be4d2bd795fc1ae6a8538d SHA512 1e370b083861cc9953ab9b72c98dc81f9d6bbf97196abc69d8229ed2a87f2151101b825c8d34d3656cf3b1cc0cdcbbc5a4aa97fc1c32ce605b0535cbf2d3142f
 DIST Nuitka-0.6.17.7.tar.gz 3150990 BLAKE2B 130c98e0499380591f3d3a4d6acabd396749624eca7a0ddcaa997e27ce0ae05d22230edb4fc7284b89dd3bfad1ac16092b7db5ae7c7b7e7c7a41c1f5a16ea8f3 SHA512 08f99cafbdedaca2df2967f452038a69827f291ab825c31231b434e80f56da0698b458f129c2639d2820257c7dc86e306b507742d4d695002d5a64ab8747cb3e
+DIST Nuitka-0.6.18.tar.gz 3687825 BLAKE2B f2c5655c610083065cc205c0a92ff9c57edfc87a479592f435c3dd194e2d6d71ff0ee9866bc97f222b3936190a4420e7d69cf9413b5b2a5e9439448dda82004f SHA512 df4c81d890ce9c5dc24e648f65137d4bb91dcb92917859976a3400ace6c297f985cee4932b50cb3c2aedb2eaa806be7529a98a75a32fe3f59ec718ed3281003b
diff --git a/dev-python/nuitka/nuitka-0.6.18.ebuild b/dev-python/nuitka/nuitka-0.6.18.ebuild
new file mode 100644
index 000000000000..e7fb8e91318b
--- /dev/null
+++ b/dev-python/nuitka/nuitka-0.6.18.ebuild
@@ -0,0 +1,48 @@
+# 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 flag-o-matic optfeature
+
+DESCRIPTION="Python to native compiler"
+HOMEPAGE="https://www.nuitka.net"
+SRC_URI="https://nuitka.net/releases/${P^}.tar.gz"
+S="${WORKDIR}/${P^}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-util/scons[${PYTHON_USEDEP}]"
+BDEPEND="
+	${RDEPEND}
+	test? ( dev-util/ccache )
+"
+
+DOCS=( Changelog.pdf Developer_Manual.pdf README.pdf )
+
+distutils-r1_src_prepare() {
+	# remove vendored version of SCons that is Python2 only
+	# this should be removed when upstream removes support for Python2
+	rm -vR "${S}/${PN}/build/inline_copy/lib/scons-2.3.2/SCons"  || die
+	eapply_user
+}
+
+python_install() {
+	distutils-r1_python_install
+	python_optimize
+	doman doc/nuitka3.1 doc/nuitka3-run.1
+}
+
+python_test() {
+	append-ldflags -Wl,--no-warn-search-mismatch
+	./tests/basics/run_all.py search || die
+}
+
+pkg_postinst() {
+	optfeature "support for stand-alone executables" app-admin/chrpath
+}
diff --git a/dev-python/numexpr/numexpr-2.8.0.ebuild b/dev-python/numexpr/numexpr-2.8.0.ebuild
index 3043006c02c8..ab05cc7dd54e 100644
--- a/dev-python/numexpr/numexpr-2.8.0.ebuild
+++ b/dev-python/numexpr/numexpr-2.8.0.ebuild
@@ -15,29 +15,11 @@ SRC_URI="https://github.com/pydata/numexpr/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="mkl"
 
-RDEPEND="
+DEPEND="
 	>=dev-python/numpy-1.6[${PYTHON_USEDEP}]
-	mkl? ( sci-libs/mkl )
 "
-
-python_prepare_all() {
-	# TODO: mkl can be used but it fails for me
-	# only works with mkl in tree. newer mkl will use pkgconfig
-	if use mkl; then
-		use amd64 && local ext="_lp64"
-		cat > site.cfg <<- _EOF_ || die
-			[mkl]
-			library_dirs = ${MKLROOT}/lib/em64t
-			include_dirs = ${MKLROOT}/include
-			mkl_libs = mkl_solver${ext}, mkl_intel${ext}, \
-			mkl_intel_thread, mkl_core, iomp5
-		_EOF_
-	fi
-
-	distutils-r1_python_prepare_all
-}
+RDEPEND=${DEPEND}
 
 python_test() {
 	pushd "${BUILD_DIR}"/lib >/dev/null || die
diff --git a/dev-python/pytest-django/Manifest b/dev-python/pytest-django/Manifest
index 0e1b28eeecf6..50325da8149f 100644
--- a/dev-python/pytest-django/Manifest
+++ b/dev-python/pytest-django/Manifest
@@ -1,2 +1,3 @@
 DIST pytest-django-4.4.0.gh.tar.gz 72905 BLAKE2B 4532bef9afdc7f11fdf9a16f019810d10e4e580b517958722184d361a69a195f6c66f7f3bc18be6cb7f63fe4576963c59a00d72bd8a42f104d26e5ad091c6d54 SHA512 47e4a84606aeb6bb99ed74603faf988298d52f81f74ec8e4608cb670f0f331ad0c6555f3e4a516fc7834aea4e634f849dc0ff6d446a86e924a116fbe90bd79e0
 DIST pytest-django-4.5.0.gh.tar.gz 75264 BLAKE2B 7743e21cd397cb5620a9a4ba73edf049c9540a64ba675baabd768c6060872eb2911384346f21c598469db604b78084f27e7e6da7423fc26cb7c550934cf4ed49 SHA512 9d86a35a05521e1cc3582f17fd6d78367d0d8383ee06e5a2f97ea5da658be4008471094d6c0b4c1d43da3091cf7e936e40ec984d232f9e3cc8cf69cd88adb9b9
+DIST pytest-django-4.5.1.gh.tar.gz 75348 BLAKE2B 36bac4524ee4dab37ee661780fd4033f16a29677fa00a35ad345f092c46454eb67fcbb111e2422221ebf335a1046e353ed53f2b029b493c82eac7f435d1a275c SHA512 cddc87b989933b2537caaf3d369ec101331ce544a8e66298d170b985810f21425059eb9a516fe37d97cbb5a38a430410cfff4da086d82d62689b65215b59cc66
diff --git a/dev-python/pytest-django/pytest-django-4.5.1.ebuild b/dev-python/pytest-django/pytest-django-4.5.1.ebuild
new file mode 100644
index 000000000000..0d2d22560a44
--- /dev/null
+++ b/dev-python/pytest-django/pytest-django-4.5.1.ebuild
@@ -0,0 +1,51 @@
+# 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="A Django plugin for py.test"
+HOMEPAGE="
+	https://pypi.org/project/pytest-django/
+	https://pytest-django.readthedocs.io/
+	https://github.com/pytest-dev/pytest-django/"
+SRC_URI="
+	https://github.com/pytest-dev/pytest-django/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+SLOT="0"
+
+RDEPEND="
+	dev-python/django[${PYTHON_USEDEP}]
+	>=dev-python/pytest-5.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/setuptools_scm-1.11.1[${PYTHON_USEDEP}]
+	test? (
+		dev-python/django-configurations[${PYTHON_USEDEP}]
+	)
+"
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+distutils_enable_tests --install pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# something else may be loading it
+		tests/test_django_settings_module.py::test_django_not_loaded_without_settings
+	)
+
+	distutils_install_for_testing
+	cp -r pytest_django_test "${TEST_DIR}"/lib || die
+
+	local -x DJANGO_SETTINGS_MODULE
+	for DJANGO_SETTINGS_MODULE in pytest_django_test.settings_sqlite{,_file}; do
+		einfo "Testing ${DJANGO_SETTINGS_MODULE}"
+		epytest tests
+	done
+}
diff --git a/dev-python/rich/Manifest b/dev-python/rich/Manifest
index e279380488bf..efb477c23867 100644
--- a/dev-python/rich/Manifest
+++ b/dev-python/rich/Manifest
@@ -3,3 +3,4 @@ DIST rich-10.13.0.tar.gz 16277448 BLAKE2B e33bca376e1a5b82d0648c7bdda9ce30930b7c
 DIST rich-10.14.0.tar.gz 16276866 BLAKE2B bc7d9a493dd4d283b0890bf385ac219c60cfb80addc226b39418ff26ca598a96c71e56ce7bea34b0508728d5535ed8ef71b21b907c13bb2ac3a1c79afefeb8f2 SHA512 be5f36ca19e4c353b94030f65abd7177f8a8194a2b6d46554c29aaa3e57fca585892634e2b096f407e6ae4ae47a7f9844fb7686c34e10d4bbccb0ea35a7d2247
 DIST rich-10.15.0.tar.gz 16279650 BLAKE2B c169ca3d9144349770a0baf56d6267d5ac2e8505878838c233561961c0f1f4c5dee9585e241ee730346935134162652368f735f3f9c8cf20fa43272bc99f0e68 SHA512 8c853221761199b8d3a07c38bf4ca3c355fb5618c6c0edeccd55ad88ea68907cd8d80075824bfd83ad88c9c06a2ddf46e52d88934670040bf74262128e241e89
 DIST rich-10.15.1.tar.gz 16279572 BLAKE2B e91a9d168d88c1d8db4b0901809c4da29d32b2dd582b0a7584a2f20cc60ff4418a95e593c9085babb948c0ffb4568da3b752e60d36adfc85ee704d7dd4dfc7e7 SHA512 9544f00eaddbb69cb95a16a0cd780acff38a49cdc6e35217e88ed462333e17b295dc5fdd3bf1ae25ab5e9100804e1d055b0d81bd0bca805e7b433238313f2edd
+DIST rich-10.15.2.tar.gz 16282858 BLAKE2B 7fe05eb357e5137319764b0d751c3bc68f8545e391575a9a360b252c395714ecb8ad7b944e7c77e74990413cb6bfb2a6c6db0fb8e72eb098f91c8d5d86bc9f8a SHA512 02e851cc9a72cb62d1826f82a5b8919a8911cf3dbdfe5f5443a89b2b7bc48c575dcf5ba63c17da60cf2ef9de3d036c7b68a845610be72af63d082d487c3b61c2
diff --git a/dev-python/rich/rich-10.15.2.ebuild b/dev-python/rich/rich-10.15.2.ebuild
new file mode 100644
index 000000000000..3958bf9474a3
--- /dev/null
+++ b/dev-python/rich/rich-10.15.2.ebuild
@@ -0,0 +1,27 @@
+# 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} )
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Python library for renrering rich text, tables, etc. to the terminal"
+HOMEPAGE="https://github.com/willmcgugan/rich"
+SRC_URI="https://github.com/willmcgugan/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+
+RDEPEND="
+	dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/commonmark[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+pkg_postinst() {
+	optfeature "integration with HTML widgets for Jupyter" dev-python/ipywidgets
+}
diff --git a/dev-python/sip/Manifest b/dev-python/sip/Manifest
index 5245e1f641ff..52c9a17c715e 100644
--- a/dev-python/sip/Manifest
+++ b/dev-python/sip/Manifest
@@ -1,3 +1,4 @@
 DIST sip-4.19.25.tar.gz 1056384 BLAKE2B f92e105e6b30e871aea2883dc9cd459e4032fb139a9eaff153a3412a66b39df4d7ac985711a2693aee83195ff3850ae648bee4102f7fc3cc30d09885799f2b98 SHA512 60fb4133c68869bf0993144978b4847d94a0f9c7b477f64a346ea133cfe35bc11820204ab327dcf9a929b6f65a26d16cc7efbce65e49967c3347b39376e57001
 DIST sip-5.5.0.tar.gz 1108126 BLAKE2B 59f0323b3befd7ebb89461e93e1e7e5707d11b2882bd524a45f3a6ba8d8a3c792aff5580027255812f6a3fa0854febeb418690fa6106efb21aab1610d66ef911 SHA512 0122beab575239cdb3b1430dc53a7f74175e3fbb3e113bcafced122ffbc4bd3d339b64a672ac1319ea14cd540b5877c2bcfeb7f8821fe8a3c8ba3ce9744bf803
 DIST sip-6.4.0.tar.gz 1201890 BLAKE2B be5ccdfa7853eb2baa3b7c4e7f64a315e39ef899631e93569d75ed27bbf9752c97cca1bfd6c813efb0046d1d82fc8c5625a04f08c330a4e2c102461f3a42beee SHA512 eec1bdbe4ef3d8ba5152a2dcd888efc23498bcbee01c95b7eb72074c2a133d8e8599cc4bb6d6b2fec99f093a73705e0fea1c148c2e49058c0fd6f2ba97f40884
+DIST sip-6.5.0.tar.gz 1202004 BLAKE2B a67ba784c0851a528fded689cc2a84fa18ba906d23adb71fceab14e652c02b079ce7d3b40a3594251852d20875ac53571e851630e441b8846c302772933b1829 SHA512 3baa20403b668e5f02b2506a693522ce421080e073ac39f62a23823b3e023b0b88fc60ab79e2301ecc39304f6df3d8647adc56429641e91c217fecea9bfacb91
diff --git a/dev-python/sip/sip-6.5.0.ebuild b/dev-python/sip/sip-6.5.0.ebuild
new file mode 100644
index 000000000000..ae0a8ed02b24
--- /dev/null
+++ b/dev-python/sip/sip-6.5.0.ebuild
@@ -0,0 +1,32 @@
+# 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} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1
+
+DESCRIPTION="Python bindings generator for C/C++ libraries"
+HOMEPAGE="https://www.riverbankcomputing.com/software/sip/ https://pypi.org/project/sip/"
+
+MY_P=${PN}-${PV/_pre/.dev}
+if [[ ${PV} == *_pre* ]]; then
+	SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+fi
+S=${WORKDIR}/${MY_P}
+
+LICENSE="|| ( GPL-2 GPL-3 SIP )"
+SLOT="5"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	!<dev-python/sip-4.19.25-r1[${PYTHON_USEDEP}]
+	!=dev-python/sip-5.5.0-r0[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]
+"
+
+distutils_enable_sphinx doc --no-autodoc
diff --git a/dev-python/zstd/Manifest b/dev-python/zstd/Manifest
index 301fdceb5c35..c3b64f748b58 100644
--- a/dev-python/zstd/Manifest
+++ b/dev-python/zstd/Manifest
@@ -1 +1,2 @@
 DIST zstd-1.5.0.2.tar.gz 528892 BLAKE2B 9aaa0beba1a6703d881daf5c5e10d93a8c67923d07773bce5eda3eba652f50c4cb4aa18d2ea9bea304a8742a7e8501568679837aa8bb1e71fe6eff5a5d08d193 SHA512 a7a6033e743c5bc0fa5256dfd256c2a9417c200cda5d5c02c6c7a5d5553d188637e21908658a4a948e565b16bb03f85f57c74d51c63a3ae7eb160f8b3bdbd3c3
+DIST zstd-1.5.0.3.tar.gz 535958 BLAKE2B b8f08d8d0fab22112cd2ed565da747013027349fe8fabcaa882b8e15a1dabd14f8e8797b6b45910bfe4c9f7c94256ea7203084eb6d30b117d2d03745ec441886 SHA512 fb13f05e930fa78f24252e24cd65ea24971e4e6a6f4684a291ddb1e682bd2fe9bbc037c87acbc832ec84ffd0dc51df63c1deb9647eb5b8123c510fe92c7b9f3c
diff --git a/dev-python/zstd/zstd-1.5.0.3.ebuild b/dev-python/zstd/zstd-1.5.0.3.ebuild
new file mode 100644
index 000000000000..1608db206218
--- /dev/null
+++ b/dev-python/zstd/zstd-1.5.0.3.ebuild
@@ -0,0 +1,33 @@
+# Copyright 2020-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="Simple python bindings to Yann Collet ZSTD compression library"
+HOMEPAGE="https://github.com/sergey-dryabzhinsky/python-zstd"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	app-arch/zstd:=
+	!dev-python/zstandard[${PYTHON_USEDEP}]
+"
+DEPEND=${RDEPEND}
+
+distutils_enable_tests unittest
+
+src_configure() {
+	mydistutilsargs=( --external )
+
+	# for tests
+	export ZSTD_EXTERNAL=1
+	export VERSION=${PV}
+	export PKG_VERSION=${PV}
+	export LEGACY=0
+}