Adding metadata

43 files changed, 942 insertions, 278 deletions

diff --git a/dev-python/Faker/Faker-9.8.4.ebuild b/dev-python/Faker/Faker-9.8.4.ebuild
new file mode 100644
index 000000000000..1f1f09ada79c
--- /dev/null
+++ b/dev-python/Faker/Faker-9.8.4.ebuild
@@ -0,0 +1,29 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+inherit distutils-r1
+
+DESCRIPTION="A Python package that generates fake data for you"
+HOMEPAGE="https://github.com/joke2k/faker"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
+	>=dev-python/text-unidecode-1.3[${PYTHON_USEDEP}]
+	!dev-ruby/faker"
+BDEPEND="
+	test? (
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP},tiff]
+		dev-python/random2[${PYTHON_USEDEP}]
+		dev-python/validators[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/Faker/Manifest b/dev-python/Faker/Manifest
index de1b19c353fb..1a5b2c277c07 100644
--- a/dev-python/Faker/Manifest
+++ b/dev-python/Faker/Manifest
@@ -1,3 +1,4 @@
 DIST Faker-9.8.1.tar.gz 1198229 BLAKE2B 8877a9da582fcd81b8b374c344343c9ba4a21d1cd0160694300030b2ace4b7b517fb8a62c1f0ffeacf3a950703b882ff5b484d54fdabc5b9c8b49658c45d421f SHA512 a93d625311358100c7a1dfe33dfda64b5890dd25e8d6e3dd095329ab2156c76abf3f00fe6b2c335316bbe3f42322adda2bcae3a9a312ddf4778d8143796667a0
 DIST Faker-9.8.2.tar.gz 1198270 BLAKE2B 1a7ea02b43afe0ff494ee39dac4259e9eb67fa3230b9b5744a96b4913ac471ed3ccf29f91b2db02124dfefc232a9fae05ce7ddc6e9fd0cbf27bd94468a7702b6 SHA512 37a35a02ea81a871e77378ceecdd65a63c97dd82ba9aec04c2a8f7a827e5bdb264a6ed0927c534a67bf4b06886dcb2a98a188798fe7c860135deb8d6aa6e36e3
 DIST Faker-9.8.3.tar.gz 1192380 BLAKE2B 90acea6d0d78307bc9e1e0d44ec2a1761f1039fdd0a3aad9ac495c139b87a055e8b43dc44bd7722aea52379506858548dbd6cd25c62697b3953f748e4ed053e5 SHA512 943adddc32ac275a030442c3ec0a529c3b97b35de9f245c027d21a90dcf7115753e1419b6b31c8d01f867c71a67fd469b75933d5475b343c47efc43be42df084
+DIST Faker-9.8.4.tar.gz 1198752 BLAKE2B d632ed8bafd61eedd304e132d7257deb3c8da1cb86071dabd476b3baa335a182a344f70a6ead583a196ce5c9077664a4f424b9a3b721966f78c1086a026f3026 SHA512 76dbd86501c0b8427d3318b24dc6e59c9f562fead0807310bda577c018b5ab558ca0f01ca17a9099a5f060e956c1f17507fc146288980ea7081761df2a5fb921
diff --git a/dev-python/argparse-manpage/argparse-manpage-2.ebuild b/dev-python/argparse-manpage/argparse-manpage-2.ebuild
index 270c21b9944c..a78f87a412d6 100644
--- a/dev-python/argparse-manpage/argparse-manpage-2.ebuild
+++ b/dev-python/argparse-manpage/argparse-manpage-2.ebuild
@@ -14,6 +14,11 @@ LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 
+BDEPEND="
+	test? (
+		dev-python/pip[${PYTHON_USEDEP}]
+	)"
+
 distutils_enable_tests pytest
 
 python_test() {
diff --git a/dev-python/boltons/Manifest b/dev-python/boltons/Manifest
new file mode 100644
index 000000000000..21f53da6a6cf
--- /dev/null
+++ b/dev-python/boltons/Manifest
@@ -0,0 +1 @@
+DIST boltons-21.0.0.tar.gz 241010 BLAKE2B e8c7cba3aadc40fbf40b784c8060d7b4f9d89457a4416c8fe9c733c3a35cf292609b2cc4e43e20a1308add6b854c3e00cb55274328a14699b3c704b73c189318 SHA512 5f5d642ab8ce0bc26133f4bd5059071bc86ca8e6619ebac796d522a0e4c39b958176ccc9de9a56e0448b24bdcf569e73f51011d5a9fc875bdef12a363f106018
diff --git a/dev-python/boltons/boltons-21.0.0.ebuild b/dev-python/boltons/boltons-21.0.0.ebuild
new file mode 100644
index 000000000000..f6127faaf810
--- /dev/null
+++ b/dev-python/boltons/boltons-21.0.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+inherit distutils-r1
+
+DESCRIPTION="Pure-python utilities in the same spirit as the standard library"
+HOMEPAGE="https://boltons.readthedocs.org/"
+SRC_URI="https://github.com/mahmoud/boltons/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs \
+	dev-python/sphinx_rtd_theme
+
+DOCS=( CHANGELOG.md README.md TODO.rst )
+
+PATCHES=(
+	"${FILESDIR}"/${P}-python3.10.patch
+)
diff --git a/dev-python/boltons/files/boltons-21.0.0-python3.10.patch b/dev-python/boltons/files/boltons-21.0.0-python3.10.patch
new file mode 100644
index 000000000000..2e9974a71c9e
--- /dev/null
+++ b/dev-python/boltons/files/boltons-21.0.0-python3.10.patch
@@ -0,0 +1,110 @@
+https://github.com/mahmoud/boltons/commit/270e974
+From: Mahmoud Hashemi <mahmoud@hatnote.com>
+Date: Sun, 10 Oct 2021 23:26:24 -0700
+Subject: [PATCH] address ecoutils import issue, fixes #294
+--- a/boltons/ecoutils.py
++++ b/boltons/ecoutils.py
+@@ -354,38 +354,53 @@ def get_profile(**kwargs):
+     return ret
+ 
+ 
+-_real_safe_repr = pprint._safe_repr
+-
+-
+-def _fake_json_dumps(val, indent=2):
+-    # never do this. this is a hack for Python 2.4. Python 2.5 added
+-    # the json module for a reason.
+-    def _fake_safe_repr(*a, **kw):
+-        res, is_read, is_rec = _real_safe_repr(*a, **kw)
+-        if res == 'None':
+-            res = 'null'
+-        if res == 'True':
+-            res = 'true'
+-        if res == 'False':
+-            res = 'false'
+-        if not (res.startswith("'") or res.startswith("u'")):
+-            res = res
+-        else:
+-            if res.startswith('u'):
+-                res = res[1:]
++try:
++    import json
++
++    def dumps(val, indent):
++        if indent:
++            return json.dumps(val, sort_keys=True, indent=indent)
++        return json.dumps(val, sort_keys=True)
++
++except ImportError:
++    _real_safe_repr = pprint._safe_repr
++
++    def _fake_json_dumps(val, indent=2):
++        # never do this. this is a hack for Python 2.4. Python 2.5 added
++        # the json module for a reason.
++        def _fake_safe_repr(*a, **kw):
++            res, is_read, is_rec = _real_safe_repr(*a, **kw)
++            if res == 'None':
++                res = 'null'
++            if res == 'True':
++                res = 'true'
++            if res == 'False':
++                res = 'false'
++            if not (res.startswith("'") or res.startswith("u'")):
++                res = res
++            else:
++                if res.startswith('u'):
++                    res = res[1:]
+ 
+-            contents = res[1:-1]
+-            contents = contents.replace('"', '').replace(r'\"', '')
+-            res = '"' + contents + '"'
+-        return res, is_read, is_rec
++                contents = res[1:-1]
++                contents = contents.replace('"', '').replace(r'\"', '')
++                res = '"' + contents + '"'
++            return res, is_read, is_rec
+ 
+-    pprint._safe_repr = _fake_safe_repr
+-    try:
+-        ret = pprint.pformat(val, indent=indent)
+-    finally:
+-        pprint._safe_repr = _real_safe_repr
++        pprint._safe_repr = _fake_safe_repr
++        try:
++            ret = pprint.pformat(val, indent=indent)
++        finally:
++            pprint._safe_repr = _real_safe_repr
++
++        return ret
++
++    def dumps(val, indent):
++        ret = _fake_json_dumps(val, indent=indent)
++        if not indent:
++            ret = re.sub(r'\n\s*', ' ', ret)
++        return ret
+ 
+-    return ret
+ 
+ 
+ def get_profile_json(indent=False):
+@@ -393,20 +408,6 @@ def get_profile_json(indent=False):
+         indent = 2
+     else:
+         indent = 0
+-    try:
+-        import json
+-
+-        def dumps(val, indent):
+-            if indent:
+-                return json.dumps(val, sort_keys=True, indent=indent)
+-            return json.dumps(val, sort_keys=True)
+-
+-    except ImportError:
+-        def dumps(val, indent):
+-            ret = _fake_json_dumps(val, indent=indent)
+-            if not indent:
+-                ret = re.sub(r'\n\s*', ' ', ret)
+-            return ret
+ 
+     data_dict = get_profile()
+     return dumps(data_dict, indent)
diff --git a/dev-python/boltons/metadata.xml b/dev-python/boltons/metadata.xml
new file mode 100644
index 000000000000..d709ec402ec3
--- /dev/null
+++ b/dev-python/boltons/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+  <email>ionen@gentoo.org</email>
+  <name>Ionen Wolkens</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="pypi">boltons</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+ <stabilize-allarches/>
+</pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index e7b9c329da95..533c9b788987 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -6,6 +6,7 @@ DIST boto3-1.20.11.tar.gz 444945 BLAKE2B ead4a78e67c12dfeccfe2c55e88ff9ed0ed2d02
 DIST boto3-1.20.12.tar.gz 447029 BLAKE2B 191a8fb12e8e61ea354acc42db3513dfbc95e60e901f696a6b92a9891deb4bd7e835daa18057d36e926ccb375856244204c5ed46238f311eb27499d50d5d7f2e SHA512 19cedff433d5256b305d743dd50bd754ce6b6227c5f820a51741ae76736d70a6adf04192f60533f1cafadb670503d05912847d82e355088be9b21d1e37e4d1dc
 DIST boto3-1.20.13.tar.gz 448520 BLAKE2B 0354d9a66fdee4a82f23c1e8bd1b7f78f53e941cf2c603f1740efa9e6a86b92f52b4eb57e6892ea1f5a3b5e05872a2a2d8f4321b29b4b11adf2885c5eb8ea731 SHA512 ef4857d14c40e70e656d51d1126f49da48fa6a79a58cae9bb6cdb2490d3ef3153165a23ad8c6f99cc553ea140b3030b4e8855c2a832a54086e54ca6e6acef790
 DIST boto3-1.20.14.tar.gz 449126 BLAKE2B b2ef8a101aaecb5d65a60fcbf7f83e89946181092bb4ad1f4a7abcf8b218c5ce797a47cd9ac3e7fdee85c6457d89b91836729f4019f5ecebf1193d015714ca8a SHA512 ff4e3f2accde84fe71cdcb090775c384700d3cba0d43f46a834b653f6a9493d7cd57be1741f39378cddf315d5f5ce07f4f233c300feb1529c22e99a0817af85c
+DIST boto3-1.20.15.tar.gz 449395 BLAKE2B 702a8e1c156b3c4d3f6d5428779bbeb2f917a9977d5b34553ebef684e14dfb680ca1fbd513e285dbf706c8de8e9469f1bbe19655992649a10290dbde4cd5f641 SHA512 2b2b77670df654594adc0047214a4d68f800611a2b8d6f4faeba10a66bd289508eb88f34a436c59eb4bbe65f549baae4a5676054c38b7816f16d8de46a41fe94
 DIST boto3-1.20.5.tar.gz 439166 BLAKE2B c140e15e497e6cdf6b4b77bb99e0a0f5ac01d5b5793f8bfb210b52bbc09e39e6fe06a957951375e0795210dc1c3b2a0afd2f498bc88e449d9e6846f2b357f016 SHA512 2823466e4851684253d4ce42a8c34e5cbdad6d04c823040fe2cebdf0cffb14d5d3f40e28d57ebec14533fab04ba74f27c25f078ddb8791b8f52d0424e11b39fc
 DIST boto3-1.20.6.tar.gz 440133 BLAKE2B b154714261372cebb8643d529b66fe3a42d30e056cf2a454092d598c51d0cdef723980834be6a36abb892d3022ae8ef67053b22bb176f540e67c3f37422155d8 SHA512 d8d66a761f03beeca10fea8446de1136d418a93b21065aebfefcafe2abfd9b5bbfa243594f54647ad80547e48348086e2be2de129b89f9ca71f308579f11a0b7
 DIST boto3-1.20.7.tar.gz 440428 BLAKE2B f1b2b36799e6c22a40c04226443f15f9174d68a02d2f731df84f6ff0962158e9d940ae5bc04d25fe99a74f105946026ccb66547838734294d649d661071c1e3b SHA512 85493a85789caa5453a4dafa1472c8ecd75c05a819227909092ae03690243eb103c1588cb10e5e5277ab9df49673b9b54fda064a412bdcf6b9e11238b277f450
diff --git a/dev-python/boto3/boto3-1.20.15.ebuild b/dev-python/boto3/boto3-1.20.15.ebuild
new file mode 100644
index 000000000000..ace657bcbe4d
--- /dev/null
+++ b/dev-python/boto3/boto3-1.20.15.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 9fcad2fcfebb..653856073711 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -6,6 +6,7 @@ DIST botocore-1.23.11.tar.gz 8445108 BLAKE2B 16e486ff61e2b7822d6db74ed5829ce4e0c
 DIST botocore-1.23.12.tar.gz 8456254 BLAKE2B 64119372aca49f1a18835b518ca2474b9e1bcfc0f03e13ffa749b04c6658f229d096751d9bd87b0f5852afd62cbfbe8eacd05c1d91e1c423171374a341daca43 SHA512 e54fc3054093bb41d566d24e06c97ffbd68cfed68183564efe67fb5a70f90acd14d95345874a80fa82faa19cafaa3f84839c5cd8443e171a17029279d1ecf949
 DIST botocore-1.23.13.tar.gz 8480446 BLAKE2B 08a26abd886b21efdfdc395dc7679ca268e7eb974ebc3fda91efdb06c2a8a7b242d122285c5d7833d5e8283e4fe8d463055c92a3e73077cfeea8dd9a806ebf6d SHA512 bed800e75a21ee6689157eaeddccb45a9ab6630486d59ff863d9f0df1a377f3d6974698fe83a5e2d2c9be6588217ee6ec8cee48d4611a21c138171a476feff74
 DIST botocore-1.23.14.tar.gz 8486875 BLAKE2B 93a3fd40b26d026dcee10172e560b4d59cdea803964e0f7ec85afbdd371d700ddc1594aad895730fc82d6684db4aa041b9c0e4e1b0b17ad701e5b87d082ca1ee SHA512 900afcb4d7378e1bd1f7a9dee1f6809151ad161f3442a7e197b2986db41af998d550d21ea225f66d1ff6374853da7bf13166186978edda08139a2c3093ff4b6c
+DIST botocore-1.23.15.tar.gz 8499971 BLAKE2B d08fdcb398cd6bcb63a8922ebfb0f1c32c62190fb04e79e38db13ff51fbf45a0e1191037266ec4e96bb67d1c48e2510976a79591b06a7bb6d0cd57c89f8c81ce SHA512 df57fc9698d5bd5babbd0e94b4150fa287ecb3b32453532fe7cc87bb7dab87d181a7bedb85a57ca250987539f92b832e3a368d9faa39ae5ac641688d3907f818
 DIST botocore-1.23.5.tar.gz 8374467 BLAKE2B 467092e7d8aa5ccb756132669049865445a47205913964c1c944b20caaf100b1efdd1bf3af9c5416ff079b487e6d4d08ffe6208e2b352d09655cc5be21c88739 SHA512 6afca19b724f9019f21e5993ce970d605b95d31c1a4e969ec1b4080510a5a120b3fa0cfd5ade973a9203bd6b7983a3dbca2f7a03108a9167392efd60d5e2fe9b
 DIST botocore-1.23.6.tar.gz 8387968 BLAKE2B 415a177d591a0ef369f17b8f02563be0fb53bc4e65c2767f41ca11300939585a10146874b6ac5297cdd3dcb36cf6fd2065fd09f3c612c4ba1d954b03a5b15579 SHA512 a46e45b7bb67d7c4bcc5508f38448b9ed3778ed6b6080239459b22b7f753adaf12e8d64496f7d7c71b33bb17ae1744000e9269ea0f545286e56fabe39e7f0340
 DIST botocore-1.23.7.tar.gz 8391467 BLAKE2B dd6cad44c1b8109b76c44bfffa45e74da0fbeaa027429860640e33134dc5f6e5bb813b46d8b662d80b89af46d437c6fb962f0e0ab1edbeca3ee790f3b6d029bf SHA512 a3270da3b6d906bc2372af221400e14039868598ccd56f40f976bcc2638f300ae9990ff367f76e5b5cdf8d46a8a37716865f9a40ca7e79b73a5b8dbcb2b1af7f
diff --git a/dev-python/botocore/botocore-1.23.15.ebuild b/dev-python/botocore/botocore-1.23.15.ebuild
new file mode 100644
index 000000000000..cfc004c5eba7
--- /dev/null
+++ b/dev-python/botocore/botocore-1.23.15.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/cmd2/Manifest b/dev-python/cmd2/Manifest
index 2883889d60da..aa72e85070da 100644
--- a/dev-python/cmd2/Manifest
+++ b/dev-python/cmd2/Manifest
@@ -2,3 +2,4 @@ DIST cmd2-2.2.0.tar.gz 667076 BLAKE2B babdf4034ea45cebce0a9b037e0bef0127c924e358
 DIST cmd2-2.3.0.tar.gz 673314 BLAKE2B a4ec117af937157d9d4c74d73652bb89998289b9f6ae1548cf064a7f5d964aa77576b00f5c530886f04a2f39f3969a26da4a5752a654b6cbb8b2cbde40907831 SHA512 615b88abd64e0909fc9d24a495060d2d45cf962b2293b91e3bb4e24fa0f90e8e6c07fe5c29a2e0915392fac365960cca418aa4e27b50718c45e9d91397802f30
 DIST cmd2-2.3.1.tar.gz 675209 BLAKE2B 492567f78c72349d3781d8372103bf3db0ec1016989fb946bf3b2f5d28505e9c4a2caee1dd1d0f2d4a2a63e6ad5512eea2ecd9d41e7009d429372c0e0c6890f3 SHA512 2f2de90c90bd6773d37c11367b3e77245d2a0e96925874d9ad45ce421e32d6cb02ca51d8bf702c4d2c0ee763b322a36ed508aa2013374f1b4513208fd2c49096
 DIST cmd2-2.3.2.tar.gz 675745 BLAKE2B 5e2f2066642685cca8a0aa703b885b257ec61516f59409e1daf7f53abdb6b0ad7b2b37ba3df691eb6371293ab328aa150b1029cfd4428b3974e9d37829a96223 SHA512 5192bd0b54bfa7deed14c035e4463b8c5ac1aeb49a55d6288190279429fce307950d0218fc60dd19639e05c82a7a5a1dad60529927c16afa5ede9ce84ac76cca
+DIST cmd2-2.3.3.tar.gz 675880 BLAKE2B 216b10d7a1d2eb78106e5af51a6c996ea22ff8ef13503ace6019978152f63d5015e61ab911a839703d2b3506fea4e709d507d147b2af259cf933ad628e52be22 SHA512 30d7a82a1c3d23431a40a7e99f10a4c23227e9ab073ab1d7fd83e516f54e9c90bda10e6072b50c0a2ca435498c1060e06b32a550409721899e28d2662995a8b8
diff --git a/dev-python/cmd2/cmd2-2.3.3.ebuild b/dev-python/cmd2/cmd2-2.3.3.ebuild
new file mode 100644
index 000000000000..bb132cac6252
--- /dev/null
+++ b/dev-python/cmd2/cmd2-2.3.3.ebuild
@@ -0,0 +1,52 @@
+# 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 virtualx
+
+DESCRIPTION="Extra features for standard library's cmd module"
+HOMEPAGE="https://github.com/python-cmd2/cmd2"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	dev-python/attrs[${PYTHON_USEDEP}]
+	>=dev-python/colorama-0.3.7[${PYTHON_USEDEP}]
+	>=dev-python/pyperclip-1.6[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/wcwidth[${PYTHON_USEDEP}]
+"
+# pyperclip uses clipboard backends in the following preference order:
+# pygtk, xclip, xsel, klipper, qtpy, pyqt5, pyqt4.
+# klipper is known to be broken in Xvfb, and therefore causes test
+# failures.  to avoid them, we must ensure that one of the backends
+# preferred to it is available (i.e. xclip or xsel) + which(1).
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		sys-apps/which
+		|| (
+			x11-misc/xclip
+			x11-misc/xsel
+		)
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	distutils-r1_src_prepare
+	sed -i -e '/--cov/d' setup.cfg || die
+}
+
+src_test() {
+	# tests rely on very specific text wrapping...
+	local -x COLUMNS=80
+	virtx distutils-r1_src_test
+}
diff --git a/dev-python/django-otp/Manifest b/dev-python/django-otp/Manifest
index 2353d4fad682..209230488f72 100644
--- a/dev-python/django-otp/Manifest
+++ b/dev-python/django-otp/Manifest
@@ -1 +1,2 @@
 DIST django-otp-1.1.1.gh.tar.gz 71526 BLAKE2B d68c0fe99c5437d08a8a0a433b4d6f41f0068047e3899efbb24234696c3494a064982aabc02d2788662d516235413bfc804f76cf5ffa1c608d3aa61927e2fad3 SHA512 5946cd64fd0f52dac5ef9fb192f8ecf78e99c96fe7e3223b41c68d96e249f6727149ef58a2dbf48024452e078f5f93c1f9edb9db2a25def5cbb3992c16aac18c
+DIST django-otp-1.1.2.gh.tar.gz 72639 BLAKE2B ba30e8d6c9982010dd9a627a810b9bc36474c571cbb6eb756d45b617338f18b7ceb024f88baeb7ceb6dbd76b3f5cf9ed53ebabd9dba435b6ab6cc3bdba092fa4 SHA512 85b34f9a36632ca44e4f7a3f11d1fd795bf65f909c0b6e4735afd56f06d754f7f28b43ccc851cb86c7330919978d3e2cb793111e50030273056da0231ee0e3ca
diff --git a/dev-python/django-otp/django-otp-1.1.2.ebuild b/dev-python/django-otp/django-otp-1.1.2.ebuild
new file mode 100644
index 000000000000..8119b92ce6d4
--- /dev/null
+++ b/dev-python/django-otp/django-otp-1.1.2.ebuild
@@ -0,0 +1,35 @@
+# 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="Django framework adding two-factor authentication using one-time passwords"
+HOMEPAGE="https://github.com/django-otp/django-otp/"
+SRC_URI="
+	https://github.com/django-otp/django-otp/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/django-2.2[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		$(python_gen_impl_dep sqlite)
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/qrcode[${PYTHON_USEDEP}]
+		${RDEPEND}
+	)"
+
+python_test() {
+	local -x PYTHONPATH=test:${PYTHONPATH}
+	local -x DJANGO_SETTINGS_MODULE=test_project.settings
+	django-admin test -v 2 django_otp || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/eventlet/eventlet-0.32.0-r1.ebuild b/dev-python/eventlet/eventlet-0.32.0-r1.ebuild
index 98506823f702..b64978a58320 100644
--- a/dev-python/eventlet/eventlet-0.32.0-r1.ebuild
+++ b/dev-python/eventlet/eventlet-0.32.0-r1.ebuild
@@ -34,6 +34,13 @@ PATCHES=(
 
 distutils_enable_tests nose
 
+src_prepare() {
+	# increase timeout - #791748
+	sed -e '/eventlet.sleep/s/0.1/5.0/' -i tests/isolated/patcher_fork_after_monkey_patch.py || die
+
+	distutils-r1_src_prepare
+}
+
 python_test() {
 	unset PYTHONPATH
 	export TMPDIR="${T}"
diff --git a/dev-python/eventlet/eventlet-0.33.0.ebuild b/dev-python/eventlet/eventlet-0.33.0.ebuild
index f43fdec86544..f9cbcf797e80 100644
--- a/dev-python/eventlet/eventlet-0.33.0.ebuild
+++ b/dev-python/eventlet/eventlet-0.33.0.ebuild
@@ -34,6 +34,13 @@ PATCHES=(
 
 distutils_enable_tests nose
 
+src_prepare() {
+	# increase timeout - #791748
+	sed -e '/eventlet.sleep/s/0.1/5.0/' -i tests/isolated/patcher_fork_after_monkey_patch.py || die
+
+	distutils-r1_src_prepare
+}
+
 python_test() {
 	unset PYTHONPATH
 	export TMPDIR="${T}"
diff --git a/dev-python/google-api-python-client/Manifest b/dev-python/google-api-python-client/Manifest
index fd3e0eda0265..efc6b2a48e2c 100644
--- a/dev-python/google-api-python-client/Manifest
+++ b/dev-python/google-api-python-client/Manifest
@@ -1,5 +1 @@
-DIST google-api-python-client-2.27.0.tar.gz 27434968 BLAKE2B 95575f70ec3a7cb71a252495c8daa74ee06fc5499c4b9febbb4f492db9d043e1a67d78bb7a5cafb64bf50697922b1b5f92cf8e5d023fab762cd4dc585507d139 SHA512 7486cb120ca726a7ba57e8629e6e369c49d1de4459986c1458d087fd1c01be2979ac0d30697d50adbb1ff67c0d262e68bb17c7f43e1148db62d04b7befe3af2f
-DIST google-api-python-client-2.28.0.tar.gz 27582046 BLAKE2B 84803c124bdda7d93a28b9690848ab2a41bcb1327feb26cb13c17b395f6fa57d86cb4ae01095966cf5423a821c49996931dde45f95d5f23fedc05e09f875de3a SHA512 d9cbec2ad600af281df2ad6db34d146a37b8248240357d7bc8a7c651d06029dc9dba2e408aa6b7f364e30ffd2b063926e67b184d90ff66f771974ca84979d8db
-DIST google-api-python-client-2.29.0.tar.gz 27697101 BLAKE2B e8c9ea3e6a0ff89dce9baef9328dd6a424b096cafe00504f28b516c753c5e9a861fe472edd3e980861c244b0642589cddf537f9a0a37ec9e089ea533b8b5d22c SHA512 c842c16496349fff2ba9522fc7144342024fcb056a79c50350c9fdd01a44f843aaaf5c7f8058595029815c0b9d4d7014ea41d28647dae6780a4dc9ee1bcddad2
-DIST google-api-python-client-2.30.0.tar.gz 27735458 BLAKE2B 5ed8d7d08643bd0f67d51b4316f5eed5ff247fb68ab751cd95a35015a738601ead2b5e96b5c32293386b01297eeaf8eb80e1102f6a3364241e375c0c10461d1e SHA512 b9b403f2c8face4277858231cd72ef79d39191ca6dd1cb763ad1216a9c14315d46a08e7d70c835254c0f1405bc519bce81ac71917e03c0fa133db128edad2ff8
 DIST google-api-python-client-2.31.0.tar.gz 27822400 BLAKE2B 447d97ec10376c1a9e911023051b8e3e278db782f91e0e4c1eb72f4ba54db0498439fca42633bc9fdf16ac2982a286103d6d7a99b701b0ff30e024e131b5e175 SHA512 80359f415e2ec4c42b7e12aa333d91849a4246fd744ec627397099be261176add44bf4ada875bc353729bbbca589be59e6cad3810f609d9d23f9fb458bf2c69e
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.27.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.27.0.ebuild
deleted file mode 100644
index fe07590b7b3f..000000000000
--- a/dev-python/google-api-python-client/google-api-python-client-2.27.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="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 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 ${deselect[@]/#/--deselect }
-}
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.28.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.28.0.ebuild
deleted file mode 100644
index 476845566039..000000000000
--- a/dev-python/google-api-python-client/google-api-python-client-2.28.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="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 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 ${deselect[@]/#/--deselect }
-}
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.29.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.29.0.ebuild
deleted file mode 100644
index f0739995529c..000000000000
--- a/dev-python/google-api-python-client/google-api-python-client-2.29.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="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/google-api-python-client/google-api-python-client-2.30.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.30.0.ebuild
deleted file mode 100644
index f0739995529c..000000000000
--- a/dev-python/google-api-python-client/google-api-python-client-2.30.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="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/humanize/Manifest b/dev-python/humanize/Manifest
index 090530e513e8..ec8f139202d5 100644
--- a/dev-python/humanize/Manifest
+++ b/dev-python/humanize/Manifest
@@ -1,2 +1,3 @@
 DIST humanize-3.11.0.tar.gz 67034 BLAKE2B 9e10582139578e8e041d1ce60c9c5d7e071c4c093a64cf620df6ff38f0567e8b2f3134f10722cb724d13343373db0fa2a1ae5bd68700ff85fb58ee318feb0fd0 SHA512 7aa3c513c6702de0e099865f787858de4c9c65cfe95af61fd0204ff6df64e7359474b4067b4672546936beae6c8c512dd9c75f555d7075c94819e81143c21ce9
 DIST humanize-3.12.0.tar.gz 67112 BLAKE2B 248458d337c8411261b1078b3ebc040c133bd6310d89ac6809e36e55b46c644ab1308255015e9530c0b1d5d5a0c6ba3b02fbdcb8a48f48c02802ec8314c68210 SHA512 339cd392c9fd022714dfa54920b24522eee37ec24711fea8016f6a95728a500eaf9cc4dde76e542886f6c5b570a77beeb6dbc5047a475496f99199d793ab2e44
+DIST humanize-3.13.0.tar.gz 71972 BLAKE2B 9c9d2198de70a0cbdbb7ad7d161778870e4464df04c9e03fd18c71f4109f8dc6bc5c41545ccb82027a59fcde6d3e6fa66251b03bad63bc0200bab6b58412b391 SHA512 02baccf184dcc075839275de552f37ef13afd3412338a67ef52167622b0bf06e8c19f8d49796674e435947c4644d614bb362addea8660d10e5884cd6711ea2e1
diff --git a/dev-python/humanize/humanize-3.13.0.ebuild b/dev-python/humanize/humanize-3.13.0.ebuild
new file mode 100644
index 000000000000..05538f960c07
--- /dev/null
+++ b/dev-python/humanize/humanize-3.13.0.ebuild
@@ -0,0 +1,22 @@
+# 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="Common humanization utilities"
+HOMEPAGE="https://github.com/jmoiron/humanize/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? ( dev-python/freezegun[${PYTHON_USEDEP}] )
+"
+
+distutils_enable_tests --install pytest
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index cd4ac6809296..4eab47b66c7a 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -8,3 +8,4 @@ DIST hypothesis-python-6.27.1.tar.gz 9173425 BLAKE2B 0fa35a863cbddb9bdd592622247
 DIST hypothesis-python-6.27.2.tar.gz 9173689 BLAKE2B 1f3aced11713f272158f8990090ee27cd44f585849ddfb416d636b6390335c717c98a7b1f5060f38118498d08faed00f25e7e51f42eea2efc902720db2b2513e SHA512 eed1f15b8cc739e2c02e234090f937cc8a4ffddf4d44ec4ce1bdf3759cdc12d47c358e29b401f262cd2ffc25485a1db7ff4265870f588282939546300a272426
 DIST hypothesis-python-6.27.3.tar.gz 9173846 BLAKE2B d8ba0509ff182cf25b8fbb8c5ade3c3d88fe54fb90203d41db68c1462903623d8ec4817d615cb42ec03948f5bc581a97902a55e73ac427416ac51a7bd067f560 SHA512 497b7e70aa29088dfe7c20be501c537201613813f6c74aec4723a87846ef38494026cb2ad79eb930b1a17b33b65eaf9dfce1411be8a58bc322d6f61f4d62b2f7
 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
diff --git a/dev-python/hypothesis/hypothesis-6.29.0.ebuild b/dev-python/hypothesis/hypothesis-6.29.0.ebuild
new file mode 100644
index 000000000000..8b48444a4699
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-6.29.0.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/moto/Manifest b/dev-python/moto/Manifest
index deda8a56ffe3..bfe4e828760e 100644
--- a/dev-python/moto/Manifest
+++ b/dev-python/moto/Manifest
@@ -3,3 +3,4 @@ DIST moto-2.2.12.tar.gz 1941427 BLAKE2B d1f85e46f4072b0e1c48e727d9e99eec12001a53
 DIST moto-2.2.14.tar.gz 1962233 BLAKE2B 2e61a2a946bdb51280fc16a2efd47e88e9643a04cebec1fc117a984b3bb8be366523fb202fe558137c4bf5c6a9e8b2e035adceda6fd37712b004d650d3d042fd SHA512 2f6c5a498f95760e910174c91562aa4f5a223d691efc1db65b66508c407641473b5b94512e67f48ed02e3733421cc51eba7aa569b19e92cf58ffa6bbcb81b362
 DIST moto-2.2.15.tar.gz 1962356 BLAKE2B 469f9c0eb36552b475b5e76fe286a6e50ae6379a9b0436a40eb290fd033123b2b400b6b85a1dd66b01176f1795a0211831acf10efac1a44a09f17efe325fad3b SHA512 2fffb3d095cd7274891d1d9ff5eee07550773eb06d1410205db39c75234e37833bda12aca7c29fda5b1d415145e55e7c7d59f8a03f3163c8f752e968fc273d3a
 DIST moto-2.2.16.tar.gz 1982590 BLAKE2B 016760c1eebd418ddb281f9cf438d9e13c868409ca1465a2a8b8292c714b7a3e4a6d47bef7a506e5c8d4128282f4f68cfea30eb61940464be4a5e27e0749e035 SHA512 bca5d5a8efa6ba204caf0cfcae700ee4079ac0a1aca22eb4adfa09f3e81f0bb43daa24088a55578022fc7b25ae14c9f41701d9557f2dd09b818fdd25ba4c3e78
+DIST moto-2.2.17.tar.gz 2013217 BLAKE2B 6fe6dd23e96fe8ba210fc9bbb400ced7c27aa6626097c523579482d58709fbf2d22e217bdab604017ee17c45b4093c8106e15e5894484face28c07bba85d42ea SHA512 73dfa0f15afd299e2c5b4c7833a73b1a7537248b8b332258868bac01890c1861e9a62b6fb634d795d4e37e5505cc51008f1048154044a8238049de5b21f31251
diff --git a/dev-python/moto/moto-2.2.17.ebuild b/dev-python/moto/moto-2.2.17.ebuild
new file mode 100644
index 000000000000..f9548678aa18
--- /dev/null
+++ b/dev-python/moto/moto-2.2.17.ebuild
@@ -0,0 +1,87 @@
+# 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="Mock library for boto"
+HOMEPAGE="https://github.com/spulec/moto"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/aws-xray-sdk-python-0.93[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/backports-tempfile[${PYTHON_USEDEP}]' python3_{6,7})
+	dev-python/boto[${PYTHON_USEDEP}]
+	dev-python/cfn-lint[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-3.3.1[${PYTHON_USEDEP}]
+	dev-python/cookies[${PYTHON_USEDEP}]
+	>=dev-python/docker-py-2.5.1[${PYTHON_USEDEP}]
+	>=dev-python/idna-2.5[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
+	>=dev-python/jsondiff-1.1.2[${PYTHON_USEDEP}]
+	>=dev-python/boto3-1.9.201[${PYTHON_USEDEP}]
+	>=dev-python/botocore-1.12.201[${PYTHON_USEDEP}]
+	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/flask-cors[${PYTHON_USEDEP}]
+	dev-python/more-itertools[${PYTHON_USEDEP}]
+	dev-python/pretty-yaml[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/python-jose[${PYTHON_USEDEP}]
+	dev-python/python-sshpubkeys[${PYTHON_USEDEP}]
+	>=dev-python/responses-0.9.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.5[${PYTHON_USEDEP}]
+	dev-python/xmltodict[${PYTHON_USEDEP}]
+	dev-python/werkzeug[${PYTHON_USEDEP}]
+	dev-python/zipp[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/responses[${PYTHON_USEDEP}]
+		>=dev-python/sure-1.4.11[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# unpin indirect dep on ecdsa that's supposed to workaround pip bugs
+	sed -i -e '/ecdsa/s:<0.15::' setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# TODO
+		tests/test_firehose/test_firehose_put.py::test_put_record_http_destination
+		tests/test_firehose/test_firehose_put.py::test_put_record_batch_http_destination
+		tests/test_swf/responses/test_decision_tasks.py::test_respond_decision_task_completed_with_schedule_activity_task_boto3
+		tests/test_swf/responses/test_timeouts.py::test_activity_task_heartbeat_timeout_boto3
+		tests/test_swf/responses/test_timeouts.py::test_decision_task_start_to_close_timeout_boto3
+		tests/test_swf/responses/test_timeouts.py::test_workflow_execution_start_to_close_timeout_boto3
+		# Needs network (or docker?) but not marked as such, bug #807031
+		# TODO: report upstream
+		tests/test_batch/test_batch_jobs.py::test_terminate_job
+		tests/test_batch/test_batch_jobs.py::test_cancel_running_job
+		tests/test_batch/test_batch_jobs.py::test_dependencies
+		tests/test_batch/test_batch_jobs.py::test_container_overrides
+		tests/test_cloudformation/test_cloudformation_custom_resources.py::test_create_custom_lambda_resource__verify_cfnresponse_failed
+		tests/test_cloudformation/test_cloudformation_stack_integration.py::test_lambda_function
+		tests/test_sqs/test_integration.py::test_invoke_function_from_sqs_exception
+		tests/test_sqs/test_sqs_integration.py::test_invoke_function_from_sqs_exception
+	)
+
+	# pytest-django causes freezegun try to mangle stuff inside django
+	# which fails when django is not really used
+	epytest -p no:django -m 'not network'
+}
diff --git a/dev-python/pip/pip-21.3.1-r1.ebuild b/dev-python/pip/pip-21.3.1-r1.ebuild
index cefd2a54448c..650d63221a06 100644
--- a/dev-python/pip/pip-21.3.1-r1.ebuild
+++ b/dev-python/pip/pip-21.3.1-r1.ebuild
@@ -32,7 +32,7 @@ SRC_URI="
 "
 
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 SLOT="0"
 IUSE="test vanilla"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/pymongo/Manifest b/dev-python/pymongo/Manifest
index bfa7dbbf251f..33dfd91238f1 100644
--- a/dev-python/pymongo/Manifest
+++ b/dev-python/pymongo/Manifest
@@ -1,3 +1,5 @@
 DIST mongo-python-driver-3.11.4.tar.gz 983009 BLAKE2B b2ca8d90a34b41c0991b545626853137b6a7f5f006dbb5d7a93fd8312759b53b99415583ca5ba982abb420db8502cb9de745f1ac0962efa05eb05ecb4289c323 SHA512 ecd2ff41ab902423dc58901cd9a8355e200f5b00a4eea4a8e950de75674fd59f7367df1ab7ee6c09bf515b8fa110cac0f7de084fbe14527486a9c38a0c8c9c27
 DIST mongo-python-driver-3.12.0.tar.gz 1062091 BLAKE2B 636a34a42d43a6ecd549c51e9e5b3a617291b64a1ba91d7473c365f8df88d59efd7b2906dd80147ffab4309d38cce30a3475bbe142e347312823236f8657c801 SHA512 fc2734b8821b42cca1b67930d5c7612526e51292144a376425627ea6254b09128ccd894af3be293184f940c7f8faa1c0cd3a0d069f9b4143a15cb32279c3bdb1
 DIST mongo-python-driver-3.12.1.tar.gz 1067667 BLAKE2B 3f18c5aa92ce180067f9c86e1fcbd80543274a2ee33ce1fad5741f0e7f5a9cb0520c33b8fe885ea69c2c8ce168747a44129fe79a5df389b83bd5e77a6ec4a687 SHA512 1fc98c33d8140ab045804130fc27b655a8622318f7030967d841e7a296dcdfb89a125cb2574a9b08eef15d3fdc089f268631501743b46d04a7b465cc45c0c04e
+DIST mongo-python-driver-3.12.2.tar.gz 1069372 BLAKE2B 962dc2ee42f01586d9e8fb07d3ba7a74f4379af268b6213c1a5b67b901c805719b9c164fc3d270dd77b3c627f998b291330eeb02968246f2a68e5925bcb608fc SHA512 0e6ac0eafb8fb71db22e7ce27e6acc5c17ea80ac8c0100c358302582da68e03d7bd33eed320f5c8c43b067c3f1e75b4ed4f8c63c4c9705bf9a1c764917d973cb
+DIST mongo-python-driver-4.0.tar.gz 1029687 BLAKE2B d8ae35b68bff288388a797c51b40d453c3e2197a0b639689bbb43f7e4470f3c4d5bf861d6ae77805b950e8c8daadcef5043b93c6d6a4b094fcb95521caf4c751 SHA512 b29acfcbd92b8f46780039cd0688cb03c083dfaf1ec6793906029f1e03635edc9a9ef6eb7104fa3dc16eca6df4ccfedd7bd4a8da495f754157edec371211fe15
diff --git a/dev-python/pymongo/pymongo-3.12.2.ebuild b/dev-python/pymongo/pymongo-3.12.2.ebuild
new file mode 100644
index 000000000000..cb7526699f86
--- /dev/null
+++ b/dev-python/pymongo/pymongo-3.12.2.ebuild
@@ -0,0 +1,112 @@
+# 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 check-reqs distutils-r1
+
+MY_P=mongo-python-driver-${PV}
+DESCRIPTION="Python driver for MongoDB"
+HOMEPAGE="https://github.com/mongodb/mongo-python-driver https://pypi.org/project/pymongo/"
+SRC_URI="
+	https://github.com/mongodb/mongo-python-driver/archive/${PV}.tar.gz
+		-> ${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~hppa ~riscv ~x86"
+IUSE="doc kerberos"
+
+RDEPEND="
+	kerberos? ( dev-python/pykerberos[${PYTHON_USEDEP}] )
+"
+BDEPEND="
+	test? (
+		>=dev-db/mongodb-2.6.0
+	)
+"
+DISTUTILS_IN_SOURCE_BUILD=1
+
+distutils_enable_sphinx doc
+distutils_enable_tests unittest
+
+reqcheck() {
+	if use test; then
+		# During the tests, database size reaches 1.5G.
+		local CHECKREQS_DISK_BUILD=1536M
+
+		check-reqs_${1}
+	fi
+}
+
+pkg_pretend() {
+	reqcheck pkg_pretend
+}
+
+pkg_setup() {
+	reqcheck pkg_setup
+}
+
+src_prepare() {
+	# network-sandbox probably
+	rm test/test_srv_polling.py || die
+	sed -e 's:test_connection_timeout_ms_propagates_to_DNS_resolver:_&:' \
+		-i test/test_client.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# Yes, we need TCP/IP for that...
+	local DB_IP=127.0.0.1
+	local DB_PORT=27000
+
+	export DB_IP DB_PORT
+
+	local dbpath=${TMPDIR}/mongo.db
+	local logpath=${TMPDIR}/mongod.log
+
+	# Now, the hard part: we need to find a free port for mongod.
+	# We're just trying to run it random port numbers and check the log
+	# for bind errors. It shall be noted that 'mongod --fork' does not
+	# return failure when it fails to bind.
+
+	mkdir -p "${dbpath}" || die
+	while true; do
+		ebegin "Trying to start mongod on port ${DB_PORT}"
+
+		LC_ALL=C \
+		mongod --dbpath "${dbpath}" --nojournal \
+			--bind_ip ${DB_IP} --port ${DB_PORT} \
+			--unixSocketPrefix "${TMPDIR}" \
+			--logpath "${logpath}" --fork \
+		&& sleep 2
+
+		# Now we need to check if the server actually started...
+		if [[ ${?} -eq 0 && -S "${TMPDIR}"/mongodb-${DB_PORT}.sock ]]; then
+			# yay!
+			eend 0
+			break
+		elif grep -q 'Address already in use' "${logpath}"; then
+			# ay, someone took our port!
+			eend 1
+			: $(( DB_PORT += 1 ))
+			continue
+		else
+			eend 1
+			eerror "Unable to start mongod for tests. See the server log:"
+			eerror "	${logpath}"
+			die "Unable to start mongod for tests."
+		fi
+	done
+
+	local failed
+	DB_PORT2=$(( DB_PORT + 1 )) DB_PORT3=$(( DB_PORT + 2 )) esetup.py test || failed=1
+
+	mongod --dbpath "${dbpath}" --shutdown || die
+
+	[[ ${failed} ]] && die "Tests fail with ${EPYTHON}"
+
+	rm -rf "${dbpath}" || die
+}
diff --git a/dev-python/pymongo/pymongo-4.0.ebuild b/dev-python/pymongo/pymongo-4.0.ebuild
new file mode 100644
index 000000000000..cb7526699f86
--- /dev/null
+++ b/dev-python/pymongo/pymongo-4.0.ebuild
@@ -0,0 +1,112 @@
+# 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 check-reqs distutils-r1
+
+MY_P=mongo-python-driver-${PV}
+DESCRIPTION="Python driver for MongoDB"
+HOMEPAGE="https://github.com/mongodb/mongo-python-driver https://pypi.org/project/pymongo/"
+SRC_URI="
+	https://github.com/mongodb/mongo-python-driver/archive/${PV}.tar.gz
+		-> ${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~hppa ~riscv ~x86"
+IUSE="doc kerberos"
+
+RDEPEND="
+	kerberos? ( dev-python/pykerberos[${PYTHON_USEDEP}] )
+"
+BDEPEND="
+	test? (
+		>=dev-db/mongodb-2.6.0
+	)
+"
+DISTUTILS_IN_SOURCE_BUILD=1
+
+distutils_enable_sphinx doc
+distutils_enable_tests unittest
+
+reqcheck() {
+	if use test; then
+		# During the tests, database size reaches 1.5G.
+		local CHECKREQS_DISK_BUILD=1536M
+
+		check-reqs_${1}
+	fi
+}
+
+pkg_pretend() {
+	reqcheck pkg_pretend
+}
+
+pkg_setup() {
+	reqcheck pkg_setup
+}
+
+src_prepare() {
+	# network-sandbox probably
+	rm test/test_srv_polling.py || die
+	sed -e 's:test_connection_timeout_ms_propagates_to_DNS_resolver:_&:' \
+		-i test/test_client.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# Yes, we need TCP/IP for that...
+	local DB_IP=127.0.0.1
+	local DB_PORT=27000
+
+	export DB_IP DB_PORT
+
+	local dbpath=${TMPDIR}/mongo.db
+	local logpath=${TMPDIR}/mongod.log
+
+	# Now, the hard part: we need to find a free port for mongod.
+	# We're just trying to run it random port numbers and check the log
+	# for bind errors. It shall be noted that 'mongod --fork' does not
+	# return failure when it fails to bind.
+
+	mkdir -p "${dbpath}" || die
+	while true; do
+		ebegin "Trying to start mongod on port ${DB_PORT}"
+
+		LC_ALL=C \
+		mongod --dbpath "${dbpath}" --nojournal \
+			--bind_ip ${DB_IP} --port ${DB_PORT} \
+			--unixSocketPrefix "${TMPDIR}" \
+			--logpath "${logpath}" --fork \
+		&& sleep 2
+
+		# Now we need to check if the server actually started...
+		if [[ ${?} -eq 0 && -S "${TMPDIR}"/mongodb-${DB_PORT}.sock ]]; then
+			# yay!
+			eend 0
+			break
+		elif grep -q 'Address already in use' "${logpath}"; then
+			# ay, someone took our port!
+			eend 1
+			: $(( DB_PORT += 1 ))
+			continue
+		else
+			eend 1
+			eerror "Unable to start mongod for tests. See the server log:"
+			eerror "	${logpath}"
+			die "Unable to start mongod for tests."
+		fi
+	done
+
+	local failed
+	DB_PORT2=$(( DB_PORT + 1 )) DB_PORT3=$(( DB_PORT + 2 )) esetup.py test || failed=1
+
+	mongod --dbpath "${dbpath}" --shutdown || die
+
+	[[ ${failed} ]] && die "Tests fail with ${EPYTHON}"
+
+	rm -rf "${dbpath}" || die
+}
diff --git a/dev-python/python-ldap/Manifest b/dev-python/python-ldap/Manifest
index d62459d0142f..99a3c3c496f9 100644
--- a/dev-python/python-ldap/Manifest
+++ b/dev-python/python-ldap/Manifest
@@ -1,2 +1 @@
-DIST python-ldap-3.3.1.tar.gz 379810 BLAKE2B bb5d4902211b70cc57d2967134d3c41768bfedbec40be0d5bb592b96523f408952ca7e9a18546cc24f8267e958f454d56d97952092bc46e02bc9954bced9ba00 SHA512 2a1222bf5bbc1d885611fc4f2a25d0b1b64b49ae379f1212f1b3b70fc12fdc547eb6c4af4060a20bf082547b7df8f1824bb1fdfafa37ab21acf2f1e231c4d2d1
 DIST python-ldap-3.4.0.tar.gz 376169 BLAKE2B f514ddb6267fd8c21a1c4595669921a1256a8087a3a272b3751636313e7d79de9d34f4213aa57128679dc5a93db4ef7a71f7f92894a1802deb8c2ca9dfd92fe2 SHA512 d10c10f1d416a0f67e7669c6c0b5460a3484bc31f4af471d581a9207689e5687c08d1ad78ba8d47e0ce0c35d24d79e4b848b4c503534f211a36c1b882bee3605
diff --git a/dev-python/python-ldap/python-ldap-3.3.1.ebuild b/dev-python/python-ldap/python-ldap-3.3.1.ebuild
deleted file mode 100644
index 5b57890c21d0..000000000000
--- a/dev-python/python-ldap/python-ldap-3.3.1.ebuild
+++ /dev/null
@@ -1,89 +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="Various LDAP-related Python modules"
-HOMEPAGE="https://www.python-ldap.org/en/latest/
-	https://pypi.org/project/python-ldap/
-	https://github.com/python-ldap/python-ldap"
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/python-ldap/python-ldap.git"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~x86-solaris"
-fi
-
-LICENSE="PSF-2"
-SLOT="0"
-IUSE="examples sasl ssl"
-
-# We do not need OpenSSL, it is never directly used:
-# https://github.com/python-ldap/python-ldap/issues/224
-RDEPEND="
-	>=dev-python/pyasn1-0.3.7[${PYTHON_USEDEP}]
-	>=dev-python/pyasn1-modules-0.1.5[${PYTHON_USEDEP}]
-	>net-nds/openldap-2.4.11:=[sasl?,ssl?]
-"
-# We do not link against cyrus-sasl but we use some
-# of its headers during the build.
-BDEPEND="
-	>net-nds/openldap-2.4.11:=[sasl?,ssl?]
-	sasl? ( >=dev-libs/cyrus-sasl-2.1 )
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx Doc
-
-python_prepare_all() {
-	# The live ebuild won't compile if setuptools_scm < 1.16.2 is installed
-	# https://github.com/pypa/setuptools_scm/issues/228
-	if [[ ${PV} == *9999* ]]; then
-		rm -r .git || die
-	fi
-
-	if ! use sasl; then
-		sed -i 's/HAVE_SASL//g' setup.cfg || die
-	fi
-	if ! use ssl; then
-		sed -i 's/HAVE_TLS//g' setup.cfg || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# Run all tests which don't require slapd
-	local ignored_tests=(
-		t_bind.py
-		t_cext.py
-		t_edit.py
-		t_ldapobject.py
-		t_ldap_options.py
-		t_ldap_sasl.py
-		t_ldap_schema_subentry.py
-		t_ldap_syncrepl.py
-		t_slapdobject.py
-	)
-	pushd Tests >/dev/null || die
-	epytest ${ignored_tests[@]/#/--ignore }
-	popd > /dev/null || die
-}
-
-python_install() {
-	distutils-r1_python_install
-	python_optimize
-}
-
-python_install_all() {
-	if use examples; then
-		docinto examples
-		dodoc -r Demo/.
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/qtawesome/Manifest b/dev-python/qtawesome/Manifest
index 18895a00c135..4ed7a75404c4 100644
--- a/dev-python/qtawesome/Manifest
+++ b/dev-python/qtawesome/Manifest
@@ -1,2 +1,3 @@
 DIST QtAwesome-1.0.3.tar.gz 878811 BLAKE2B f4392caf940ffecabf4848e892226a0871686d34a2190e35c4b11a0803a006ca0a9bfb09b3de03f7baba6777eec40ede30e35aa702bc83d9eacfd45cdde207aa SHA512 90ff132034ccc21c358b341e21aa848c34dac1c10e41720f57870f6c73fa21d1da944e4ca2ce2ded034c9edd85679181f0bd7a6a949f46a582a4402a620f2849
 DIST QtAwesome-1.1.0.tar.gz 2277438 BLAKE2B cda30636fb271da13a5c146cf84971ca10cc0bb527235319fe289730ac859dd4e23c679b963f4c0a65c26f83d2dfaac33fa0907f8ca64bd6d5a346d9ecbde30d SHA512 3fcd4704a57a52f1f46a0a55bc52255d2d600ff407a3c568da3e4bdc53d74153199869b4ea7bfaf349373fa876a950cae028cc7c87bc2d395b0aacbb64309407
+DIST QtAwesome-1.1.1.tar.gz 2277767 BLAKE2B ca8668e0b6633087b7e09ffcec19809c8b7e12af2caa0beac896940cdbf3a113206f6952916fbe81c53899a56f8222e613df9c028f59907a2553174551ef9fcf SHA512 3cf04b822464c14f52f23499e64515f50f743aba40a8d22224d22315342cef760da476dc9b2ae42e901ac8ef8440e105a6bf6175efc6749250e0fbbbc255e08f
diff --git a/dev-python/qtawesome/qtawesome-1.1.1.ebuild b/dev-python/qtawesome/qtawesome-1.1.1.ebuild
new file mode 100644
index 000000000000..439cc25cb98a
--- /dev/null
+++ b/dev-python/qtawesome/qtawesome-1.1.1.ebuild
@@ -0,0 +1,39 @@
+# 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 virtualx
+
+MY_PN="QtAwesome"
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Enables iconic fonts such as Font Awesome in PyQt"
+HOMEPAGE="https://github.com/spyder-ide/qtawesome/ https://pypi.org/project/QtAwesome/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	media-fonts/fontawesome
+	dev-python/QtPy[pyqt5(+),gui,${PYTHON_USEDEP}]
+"
+
+DEPEND="test? ( dev-python/pytest-qt[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs/source
+
+src_test() {
+	virtx python_foreach_impl python_test
+}
+
+python_test() {
+	# Tests fail with pyside2, so depend on QtPy[pyqt5] and explicitly run
+	# the tests with pyqt5
+	PYTEST_QT_API="pyqt5" epytest
+}
diff --git a/dev-python/reportlab/Manifest b/dev-python/reportlab/Manifest
index 420e5298b91a..a3bc1e24e39f 100644
--- a/dev-python/reportlab/Manifest
+++ b/dev-python/reportlab/Manifest
@@ -1,2 +1,3 @@
 DIST pfbfer-20070710.zip 677333 BLAKE2B 100214476a361a5e5d1f3da0999591345f6e3a3f8c6bc3f6a3e9eca734190c6259758a43302c6e41254d33491fe535eb7d5dd07aa9727c912424bebc31fc18df SHA512 6fd4a5d955464b10d13a7b748703450c1fe120d5ed09e8cfa1b4dfa9c183c59fe001df29433af551796b0df62544b7ddc364f9bb1bdcc2cd300434340ffcc4f2
 DIST reportlab-3.6.2.tar.gz 4501397 BLAKE2B 725b1142b54f2968d01f788949b9bd4a9208353710724bb7e647be5652b4bb01c37d344db1975f906e83c1265b9dd294fbbfbbb5c1960d25503a255ea32269de SHA512 5a8f22c50bbfcd1e76671e3337df5a740f6451ae42795288c0a0855167d0369543983e895317f1f6cbd14231bc664cea62e5a3b8ccd99775c423074b8c347b68
+DIST reportlab-3.6.3.tar.gz 4502282 BLAKE2B 32f096eaa6526eaa3460f85f85e9e2e3947a4f774cce4306248fabd061e0acce3ffcc711552928ddf7d7d6b0cbb8e6629fbf35cbd15176972e0739cf6fd4751e SHA512 7e2f284a322371aa217ed60b966721b0ea5e2419e76bcc50ade9924e0ce6c3f5f9858500b17457883c41738ce5989624b87d26408a8afb65f737e82884b9c7df
diff --git a/dev-python/reportlab/reportlab-3.6.3.ebuild b/dev-python/reportlab/reportlab-3.6.3.ebuild
new file mode 100644
index 000000000000..05b4f8f567b8
--- /dev/null
+++ b/dev-python/reportlab/reportlab-3.6.3.ebuild
@@ -0,0 +1,56 @@
+# 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="Tools for generating printable PDF documents from any data source"
+HOMEPAGE="
+	https://www.reportlab.com/
+	https://pypi.org/project/reportlab/"
+SRC_URI="
+	mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz
+	https://www.reportlab.com/ftp/fonts/pfbfer-20070710.zip"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+DEPEND="
+	media-libs/freetype
+	media-libs/libart_lgpl
+	sys-libs/zlib:="
+RDEPEND="
+	${DEPEND}
+	dev-python/pillow[tiff,truetype,jpeg(+),${PYTHON_USEDEP}]"
+BDEPEND="
+	app-arch/unzip"
+
+distutils_enable_sphinx docs/source
+distutils_enable_tests unittest
+
+PATCHES=(
+	# bug 738312, remove -L/usr/lib from link line
+	"${FILESDIR}"/${PN}-3.5.48-usr-lib-LLD.patch
+)
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	cd ${P}/src/reportlab/fonts || die
+	unpack pfbfer-20070710.zip
+}
+
+src_configure() {
+	DISTUTILS_ARGS=(
+		--no-download-t1-files
+		--use-system-libart
+	)
+}
+
+python_test() {
+	pushd tests >/dev/null || die
+	"${EPYTHON}" runAll.py -v || die "Testing failed with ${EPYTHON}"
+	popd >/dev/null || die
+}
diff --git a/dev-python/rich/Manifest b/dev-python/rich/Manifest
index 1cbe7c6cf932..e279380488bf 100644
--- a/dev-python/rich/Manifest
+++ b/dev-python/rich/Manifest
@@ -2,3 +2,4 @@ DIST rich-10.12.0.tar.gz 16265099 BLAKE2B c2249be5a5008e3e9fd5c301b10d7bc544e480
 DIST rich-10.13.0.tar.gz 16277448 BLAKE2B e33bca376e1a5b82d0648c7bdda9ce30930b7c095cd8272b573f52dcb056a21be35fb0ef83c939e7feeb458eb4efb7767bf98706a4c58fc134627a0b0f3aa68d SHA512 23ea811fbaa8002416530975fe79c62b42d3c79806d312c172351f632864356be77063d5dc0fe0243d78479fb31a87433a432b115f5cf570f7c6e44c6f773ff0
 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
diff --git a/dev-python/rich/rich-10.15.1.ebuild b/dev-python/rich/rich-10.15.1.ebuild
new file mode 100644
index 000000000000..3958bf9474a3
--- /dev/null
+++ b/dev-python/rich/rich-10.15.1.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/scipy/scipy-1.7.1-r1.ebuild b/dev-python/scipy/scipy-1.7.1-r1.ebuild
index 01048c34918c..01e81db6075c 100644
--- a/dev-python/scipy/scipy-1.7.1-r1.ebuild
+++ b/dev-python/scipy/scipy-1.7.1-r1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="BSD LGPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ia64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~ia64 ~ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="doc +pythran sparse"
 
 DEPEND="
diff --git a/dev-python/scipy/scipy-1.7.2.ebuild b/dev-python/scipy/scipy-1.7.2.ebuild
index ac3aea6e9aef..2d356a568593 100644
--- a/dev-python/scipy/scipy-1.7.2.ebuild
+++ b/dev-python/scipy/scipy-1.7.2.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="BSD LGPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 -hppa ~ia64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 -hppa ~ia64 ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="doc +pythran sparse"
 
 DEPEND="
diff --git a/dev-python/tomli-w/tomli-w-0.4.0.ebuild b/dev-python/tomli-w/tomli-w-0.4.0.ebuild
index 8cf8379d775d..94845394ad5f 100644
--- a/dev-python/tomli-w/tomli-w-0.4.0.ebuild
+++ b/dev-python/tomli-w/tomli-w-0.4.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 BDEPEND="
 	test? ( dev-python/tomli[${PYTHON_USEDEP}] )"