Adding metadata

79 files changed, 515 insertions, 303 deletions

diff --git a/dev-python/aiodns/aiodns-3.0.0.ebuild b/dev-python/aiodns/aiodns-3.0.0.ebuild
index 2dafb090f444..aea35192aef5 100644
--- a/dev-python/aiodns/aiodns-3.0.0.ebuild
+++ b/dev-python/aiodns/aiodns-3.0.0.ebuild
@@ -21,6 +21,11 @@ RESTRICT="test"
 RDEPEND=">=dev-python/pycares-3[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}"
 
+PATCHES=(
+	# https://github.com/saghul/aiodns/commit/146286601fe80eb4ede8126769e79b5d5e63f64e
+	"${FILESDIR}/${P}-py3.10-tests.patch"
+)
+
 python_test() {
 	"${EPYTHON}" tests.py -v || die
 }
diff --git a/dev-python/aiodns/files/aiodns-3.0.0-py3.10-tests.patch b/dev-python/aiodns/files/aiodns-3.0.0-py3.10-tests.patch
new file mode 100644
index 000000000000..19062f1c8861
--- /dev/null
+++ b/dev-python/aiodns/files/aiodns-3.0.0-py3.10-tests.patch
@@ -0,0 +1,24 @@
+From 146286601fe80eb4ede8126769e79b5d5e63f64e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Sat, 15 May 2021 10:03:01 +0200
+Subject: [PATCH] Remove loop= param from asyncio.sleep() to fix tests on
+ Python 3.10
+
+Fixes #95
+---
+ tests.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests.py b/tests.py
+index 7b2279f..fc0e2b9 100755
+--- a/tests.py
++++ b/tests.py
+@@ -116,7 +116,7 @@ def test_future_cancel(self):
+         f = self.resolver.query('google.com', 'A')
+         f.cancel()
+         async def coro():
+-            await asyncio.sleep(0.1, loop=self.loop)
++            await asyncio.sleep(0.1)
+             await f
+         try:
+             self.loop.run_until_complete(coro())
diff --git a/dev-python/backoff/Manifest b/dev-python/backoff/Manifest
new file mode 100644
index 000000000000..ad9ddf8baa5a
--- /dev/null
+++ b/dev-python/backoff/Manifest
@@ -0,0 +1 @@
+DIST backoff-1.11.0.gh.tar.gz 17566 BLAKE2B 4afed5284eb3cbedf54e06fcd89861701613357c672ebabe2611a4bc28c3a6e4539e206cee24bb6a646f7c16c033f16ef56be3b21867aad760b71410749383b7 SHA512 0f5e176bf9d093a72068cf6e55ada8da3e8ec67b85b4fba2d697117dcb3c563a429ff53c5fe17b4a20a8b5ee0420930b789478bd89de5949b628158263413a60
diff --git a/dev-python/python-backoff/python-backoff-1.11.0.ebuild b/dev-python/backoff/backoff-1.11.0.ebuild
index c0fefcf7d95a..1344017a9a24 100644
--- a/dev-python/python-backoff/python-backoff-1.11.0.ebuild
+++ b/dev-python/backoff/backoff-1.11.0.ebuild
@@ -7,12 +7,9 @@ PYTHON_COMPAT=( python3_{6,7,8,9,10} )
 DISTUTILS_USE_SETUPTOOLS=pyproject.toml
 inherit distutils-r1
 
-MY_PN=${PN#python-}
-MY_P=${MY_PN}-${PV}
 DESCRIPTION="Function decoration for backoff and retry"
 HOMEPAGE="https://github.com/litl/backoff https://pypi.org/project/backoff/"
 SRC_URI="https://github.com/litl/backoff/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/python-backoff/metadata.xml b/dev-python/backoff/metadata.xml
index b56ba1873a16..b56ba1873a16 100644
--- a/dev-python/python-backoff/metadata.xml
+++ b/dev-python/backoff/metadata.xml
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 03fcefc5a424..5d513726a2ec 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -2,4 +2,5 @@ DIST boto3-1.17.112.tar.gz 391748 BLAKE2B 071eddfe134face48b86985ccd0171e0d8994f
 DIST boto3-1.18.15.tar.gz 400374 BLAKE2B 2170319480578b9ac7b6c0da9e9a2f256ce907b8e53bc626bf26fd65f3336ec1974d6dd1917f601fe139e859f144fafd198b2578ffb9097508f09dd40cf82313 SHA512 f330d8249c9f5749770ba5809f3a4fb524f23fc0545b24182023a3b74f815608bdb9986b434d972a017aa7786b1319705e8702b041174275f84a0266bdb7b857
 DIST boto3-1.18.21.tar.gz 402611 BLAKE2B 39974c66ed5ad0697be6df04dbb141ce28e9a09863349f7adfcf756666d58ed02232453a9d86d46e62380c0b7f197a52b6869469309dff0c532e50a6bfc88403 SHA512 9920891b7be9d98c3a3d2f3065183532624e78fd2ff7a94d26594d2499cd5d17db0ac4ba6adf27f0e0f67fa836020dfac648babc144e4339a3dd717a1bd56ef7
 DIST boto3-1.18.22.tar.gz 403212 BLAKE2B 82ee003adf55339ef956182287220d4c2bbafe371676ff94ca73f8cc95c484de86f1a9ae32a64d532e3731efeed486b9486d9591c3ee3a76d3a74d2fae22ec88 SHA512 f5abd2169adbc0d9edc28f6d8e5165c7c0587c387b3a71a40483b3bb4d90752d745dc0bbc58bda5470bd6fd68675f0eff3c1fa5e889fb231956c47a81a353b79
+DIST boto3-1.18.23.tar.gz 403993 BLAKE2B 060f556e7787c02bf34cb18ac950217bfc105773295836c35893c09a132a295faf219d5b39b80d7b7174b9a612ce5067d69838f2bbd2f99a87b117267c4663e1 SHA512 18fe36d7c4a9ec8b1bb008c1da1e9f26f455cd88ce0db3ead760bb328a4190111832c0e5b9b155382d540b3c788ad97ea796afd099de527f2df626571f50db5b
 DIST boto3-1.18.7.tar.gz 395640 BLAKE2B 6a9fa1dd55644806fe93271805f35fbe0c4cb65d1de08dded2d2f57fcefa96e32c4ebe7b60743c52c0898222bc06d33dbd03d304bbef327b88022450a7943e2c SHA512 20e7fedab7d061ab02f391e9baf36cb554e7f194f38d24d5a75f76715b2acf1b51b6adce5d8cf5a2a0d29df73566db00b8813a219d45a194d9a8eb93d0dab570
diff --git a/dev-python/boto3/boto3-1.18.23.ebuild b/dev-python/boto3/boto3-1.18.23.ebuild
new file mode 100644
index 000000000000..bee358e1c595
--- /dev/null
+++ b/dev-python/boto3/boto3-1.18.23.ebuild
@@ -0,0 +1,57 @@
+# 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 nose
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# prevent an infinite loop
+	rm tests/functional/docs/test_smoke.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests -v tests/unit/ tests/functional/ ||
+		die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index 4db46890111f..8658bfdcb553 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -2,4 +2,5 @@ DIST botocore-1.20.112.tar.gz 7917776 BLAKE2B 6a5ebf3d32c505ec2c1fc4cd3d97aa94c7
 DIST botocore-1.21.15.tar.gz 8012673 BLAKE2B cdd2b4128e67c85879e85f61265b10c1e5765eebf65333059af56a6a5b1d650a7612c4b569afde2396704015294e74b717c35d49c3e08396b2c603b7d47c632b SHA512 a5916ffa64568b2040d6f76571d9d716d50339fdaaed61f4ff7be92a5dac2c3f967280330fcbd3d6c2e1c1faf7bd6012ce75dd66ff26fde9d830d334a9d7c45a
 DIST botocore-1.21.21.tar.gz 8042971 BLAKE2B 888abb929e1d66c293bff9d3d25682590e0fce3173ca6e121b969d1ef92dd4bb3fd010f72ab4bed664ed6e2df94fd61a9211a3aad72742eb1d4ee2b192cb4f7d SHA512 f8f47c2a2ed07f90263fd5eefe593bf14e8bb2a8df599660f2c84c504a16eb1c370ff8edea0b809be34f1fe9c7e8a3d604b74689b9e16c0686e6ff7c640534a4
 DIST botocore-1.21.22.tar.gz 8044541 BLAKE2B 09c32d015d7bd5c6deeffc164f272eb72f30ff0555d68ee7edd45d52871fcf130bd487a54e79e463432182e538bd36173dcae7f533455cdae9da3139c237d766 SHA512 00e99f314e36916b6d89e30cbf0e4397739f44db2329608841b4c77c60d61ef7e6ffd419b122f58ecca02b807b91e6da87602b02e362bb60e46b02af96e76fc7
+DIST botocore-1.21.23.tar.gz 8046520 BLAKE2B 8c5b610617f322fd3e1480937309994e2da364cb6a426a0b0bf28c04a19e94ee734ec6b0dc398cbaba890e2341c5e8f7533c26feb8f43dec334052c2c63b674a SHA512 d1956d3a5a2f456848b5e780fbe689822e7ccede0dbb2b6477320ffd33d8f78187abf8c2ebc968758e32e5e106c27608ddf1667b5a62ed43e2a0479dfecaed5a
 DIST botocore-1.21.7.tar.gz 7977343 BLAKE2B 19c5bf5de40ab131585e30bb85486fcffc3428808811b312b33578174ce31a691f4f4d955462120f05d2aad2cd5e5772789704eee641760fb67099aa3cddc9b5 SHA512 db1bb36faa6857a1cc717e5d591954415bb948178ee2be90ab9c32c11b1fb45c5b5aff87dfacd907c2f11bc7cdd2cd4de2ee9c847fa8cda4e5f0814a828b1019
diff --git a/dev-python/botocore/botocore-1.21.23.ebuild b/dev-python/botocore/botocore-1.21.23.ebuild
new file mode 100644
index 000000000000..5684261bd4b3
--- /dev/null
+++ b/dev-python/botocore/botocore-1.21.23.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="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/mock[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
+)
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+	# very unstable
+	sed -i -e 's:test_stress_test_token_bucket:_&:' \
+		tests/functional/retries/test_bucket.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# note: suites need to be run separately as one of the unit tests
+	# seems to be leaking mocks and breaking a few functional tests
+	nosetests -v tests/unit ||
+		die "unit tests failed under ${EPYTHON}"
+	nosetests -v tests/functional ||
+		die "functional tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/cffi/cffi-1.14.6.ebuild b/dev-python/cffi/cffi-1.14.6.ebuild
index 9248c03105d7..3473909cca85 100644
--- a/dev-python/cffi/cffi-1.14.6.ebuild
+++ b/dev-python/cffi/cffi-1.14.6.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND="dev-libs/libffi:="
 RDEPEND="${DEPEND}
diff --git a/dev-python/cfn-python-lint/Manifest b/dev-python/cfn-lint/Manifest
index 6ba2044bb1d7..6ba2044bb1d7 100644
--- a/dev-python/cfn-python-lint/Manifest
+++ b/dev-python/cfn-lint/Manifest
diff --git a/dev-python/cfn-python-lint/cfn-python-lint-0.50.0.ebuild b/dev-python/cfn-lint/cfn-lint-0.50.0.ebuild
index 4d11689b7bf0..4d9f3984ab63 100644
--- a/dev-python/cfn-python-lint/cfn-python-lint-0.50.0.ebuild
+++ b/dev-python/cfn-lint/cfn-lint-0.50.0.ebuild
@@ -6,14 +6,11 @@ EAPI=7
 PYTHON_COMPAT=( python3_{6,7,8,9,10} )
 inherit distutils-r1
 
-# TODO: pkgmove to cfn-lint
-MY_P=${P/-python}
 DESCRIPTION="CloudFormation Linter"
 HOMEPAGE="https://pypi.org/project/cfn-lint/ https://github.com/aws-cloudformation/cfn-lint/"
 SRC_URI="
 	https://github.com/aws-cloudformation/cfn-lint/archive/v${PV}.tar.gz
-		-> ${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
+		-> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
@@ -41,7 +38,7 @@ BDEPEND="
 distutils_enable_tests --install unittest
 
 PATCHES=(
-	"${FILESDIR}/cfn-python-lint-0.30.1-tests.patch"
+	"${FILESDIR}/cfn-lint-0.30.1-tests.patch"
 )
 
 src_prepare() {
diff --git a/dev-python/cfn-python-lint/cfn-python-lint-0.51.0.ebuild b/dev-python/cfn-lint/cfn-lint-0.51.0.ebuild
index 7602d69e05bf..54451cf0a7b6 100644
--- a/dev-python/cfn-python-lint/cfn-python-lint-0.51.0.ebuild
+++ b/dev-python/cfn-lint/cfn-lint-0.51.0.ebuild
@@ -6,14 +6,11 @@ EAPI=7
 PYTHON_COMPAT=( python3_{6,7,8,9,10} )
 inherit distutils-r1
 
-# TODO: pkgmove to cfn-lint
-MY_P=${P/-python}
 DESCRIPTION="CloudFormation Linter"
 HOMEPAGE="https://pypi.org/project/cfn-lint/ https://github.com/aws-cloudformation/cfn-lint/"
 SRC_URI="
 	https://github.com/aws-cloudformation/cfn-lint/archive/v${PV}.tar.gz
-		-> ${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
+		-> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
@@ -41,7 +38,7 @@ BDEPEND="
 distutils_enable_tests --install unittest
 
 PATCHES=(
-	"${FILESDIR}/cfn-python-lint-0.30.1-tests.patch"
+	"${FILESDIR}/cfn-lint-0.30.1-tests.patch"
 )
 
 src_prepare() {
diff --git a/dev-python/cfn-python-lint/cfn-python-lint-0.52.0.ebuild b/dev-python/cfn-lint/cfn-lint-0.52.0.ebuild
index a274a23e2329..1787c02e0736 100644
--- a/dev-python/cfn-python-lint/cfn-python-lint-0.52.0.ebuild
+++ b/dev-python/cfn-lint/cfn-lint-0.52.0.ebuild
@@ -6,14 +6,11 @@ EAPI=8
 PYTHON_COMPAT=( python3_{6,7,8,9,10} )
 inherit distutils-r1
 
-# TODO: pkgmove to cfn-lint
-MY_P=${P/-python}
 DESCRIPTION="CloudFormation Linter"
 HOMEPAGE="https://pypi.org/project/cfn-lint/ https://github.com/aws-cloudformation/cfn-lint/"
 SRC_URI="
 	https://github.com/aws-cloudformation/cfn-lint/archive/v${PV}.tar.gz
-		-> ${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
+		-> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
@@ -41,7 +38,7 @@ BDEPEND="
 distutils_enable_tests --install unittest
 
 PATCHES=(
-	"${FILESDIR}/cfn-python-lint-0.30.1-tests.patch"
+	"${FILESDIR}/cfn-lint-0.30.1-tests.patch"
 )
 
 src_prepare() {
diff --git a/dev-python/cfn-python-lint/cfn-python-lint-0.53.0.ebuild b/dev-python/cfn-lint/cfn-lint-0.53.0.ebuild
index b92a0c2dfd4a..aa7c177932de 100644
--- a/dev-python/cfn-python-lint/cfn-python-lint-0.53.0.ebuild
+++ b/dev-python/cfn-lint/cfn-lint-0.53.0.ebuild
@@ -6,14 +6,11 @@ EAPI=8
 PYTHON_COMPAT=( python3_{6,7,8,9,10} )
 inherit distutils-r1
 
-# TODO: pkgmove to cfn-lint
-MY_P=${P/-python}
 DESCRIPTION="CloudFormation Linter"
 HOMEPAGE="https://pypi.org/project/cfn-lint/ https://github.com/aws-cloudformation/cfn-lint/"
 SRC_URI="
 	https://github.com/aws-cloudformation/cfn-lint/archive/v${PV}.tar.gz
-		-> ${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
+		-> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
@@ -41,7 +38,7 @@ BDEPEND="
 distutils_enable_tests --install unittest
 
 PATCHES=(
-	"${FILESDIR}/cfn-python-lint-0.30.1-tests.patch"
+	"${FILESDIR}/cfn-lint-0.30.1-tests.patch"
 )
 
 src_prepare() {
diff --git a/dev-python/cfn-python-lint/files/cfn-python-lint-0.30.1-tests.patch b/dev-python/cfn-lint/files/cfn-lint-0.30.1-tests.patch
index 6c81aef9a7a8..6c81aef9a7a8 100644
--- a/dev-python/cfn-python-lint/files/cfn-python-lint-0.30.1-tests.patch
+++ b/dev-python/cfn-lint/files/cfn-lint-0.30.1-tests.patch
diff --git a/dev-python/cfn-python-lint/metadata.xml b/dev-python/cfn-lint/metadata.xml
index 5c29795a7676..ca751e9e7ce4 100644
--- a/dev-python/cfn-python-lint/metadata.xml
+++ b/dev-python/cfn-lint/metadata.xml
@@ -11,7 +11,7 @@
  </maintainer>
  <upstream>
   <remote-id type="pypi">cfn-lint</remote-id>
-  <bugs-to>https://github.com/aws-cloudformation/cfn-python-lint/issues</bugs-to>
+  <bugs-to>https://github.com/aws-cloudformation/cfn-lint/issues</bugs-to>
  </upstream>
  <origin>gentoo-staging</origin>
  <stabilize-allarches/>
diff --git a/dev-python/charset_normalizer/Manifest b/dev-python/charset_normalizer/Manifest
index ac5fb9a40d50..091105d4d611 100644
--- a/dev-python/charset_normalizer/Manifest
+++ b/dev-python/charset_normalizer/Manifest
@@ -1 +1,2 @@
 DIST charset_normalizer-2.0.3.gh.tar.gz 363159 BLAKE2B f09cd3c9da04123fc7104cfac6829ea23a82173c04469c4d98acf9311f1006f4ecb152992a397a97838f9312ad0fc8bfeea03960650873a9aaa753315245dcc3 SHA512 4fa5507c4c0c61b3722d7423f4b597514a30ad0fea176a77a1e926328003ba6c0f49c95b4f4a64b8dbb32985373706d895bae1c6e3fe1fe224851b8383576923
+DIST charset_normalizer-2.0.4.gh.tar.gz 363800 BLAKE2B 81a0474238fc2fad6792201629286c261af73ed5dc3c7c4da525b356507f53bfb3e53d1ed325647295986a16fdd2a1e4bec00ee0648cb6e44f201196ef778556 SHA512 64fdddf2b6574828cc37dcb310e5e023d994e9cd4f8a7f6fb5796e997542cb1b14d9444994ab2594267361712a125fa476205462f9c7fea95505eef3c9770d5e
diff --git a/dev-python/charset_normalizer/charset_normalizer-2.0.4.ebuild b/dev-python/charset_normalizer/charset_normalizer-2.0.4.ebuild
new file mode 100644
index 000000000000..e20c4fc0b217
--- /dev/null
+++ b/dev-python/charset_normalizer/charset_normalizer-2.0.4.ebuild
@@ -0,0 +1,27 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="The Real First Universal Charset Detector"
+HOMEPAGE="
+	https://pypi.org/project/charset-normalizer/
+	https://github.com/ousret/charset_normalizer/"
+SRC_URI="
+	https://github.com/Ousret/charset_normalizer/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/addopts/d' setup.cfg || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/eventlet/eventlet-0.31.1.ebuild b/dev-python/eventlet/eventlet-0.31.1.ebuild
index 59e7b2eb5144..00e73708ebc6 100644
--- a/dev-python/eventlet/eventlet-0.31.1.ebuild
+++ b/dev-python/eventlet/eventlet-0.31.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/e/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 ~s390 ~sparc ~x86"
 IUSE="examples"
 
 RDEPEND="
diff --git a/dev-python/google-api-python-client/Manifest b/dev-python/google-api-python-client/Manifest
index 3db13ef38e79..c76c29b9c069 100644
--- a/dev-python/google-api-python-client/Manifest
+++ b/dev-python/google-api-python-client/Manifest
@@ -1,2 +1,3 @@
 DIST google-api-python-client-2.13.0.tar.gz 25562934 BLAKE2B 6ce955995c0f2fa5d09e1c90e65d38a7f321421199f53957fb58934c1f067de03a48f47f1d161c9ad2cb852663316c5d0f873a32b9eedd7fffaa2b067d84ae05 SHA512 d2b0cf3c250a500e774970790390025119102e24eaf8c7a0c170139cf322c37f4c8cd3f406a41d18deb2597dfeb21e6304e173cfaafb4d6faeff23b2215d4072
 DIST google-api-python-client-2.14.1.tar.gz 25415625 BLAKE2B 2b843a6ec6345e51c5a92c0285c2b8ae195928bec61b73033fbc64d8e55c34ae39d8d542534d89edac36d6ddc6c12b6acf11a25dbcbc06f72776799a70606659 SHA512 e22600b9b87d646775780d0f45043753e4dea24e898faf16ae49f2c91677282700b45de993d085923c006f2948747a6afa2e58b38f42f934f1602401faa30d22
+DIST google-api-python-client-2.17.0.tar.gz 26302010 BLAKE2B 1d4a63825b79ff252b318d988aaa572a7567c4b3e19d110ec480d03c4ffcd16b16a19c4b54f51288a21e34a3a280c8077aa983da8eacaad1f176fb485ea7e89c SHA512 1967539825490530bb4330940bf69bc1bb25035b2079797185bb359c350fc111188b188e2d21dbd0009f8658a6dbb11539beed2aa5ce03daa142d7cbd330e466
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.17.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.17.0.ebuild
new file mode 100644
index 000000000000..8647284e7595
--- /dev/null
+++ b/dev-python/google-api-python-client/google-api-python-client-2.17.0.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="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-4[${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
+
+src_prepare() {
+	find tests -name '*.py' -exec \
+		sed -i -e 's:unittest2 as ::' {} + || die
+	distutils-r1_src_prepare
+}
+
+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-auth/Manifest b/dev-python/google-auth/Manifest
index 2eb98eb83941..4ff5d583d2b5 100644
--- a/dev-python/google-auth/Manifest
+++ b/dev-python/google-auth/Manifest
@@ -1,3 +1,4 @@
 DIST google-auth-1.32.1.tar.gz 171621 BLAKE2B e82f4666a38d3dbaa4aa4a4d5192afb711471432c0dcca44b1a1c52fa2171f1de0d7ffd8a7a6d5dc6dbc3a1dec16becabb26306a9ba3b3fd0998584dd1194cc6 SHA512 968c16c7fc5c8c589a94e24139c319ec7f2791b021d6240156d398d4795e6afee8e46591c4aa44457de6f98ca14e8edcb055fb3a02914b43ba5fab74a03d9fc6
 DIST google-auth-1.34.0.tar.gz 180860 BLAKE2B d536d689ff5b0c033f787228d643504d1888f0b73a9c6855fe4fae3af20772ef0640feca39c58c39f45681561dce6d5f3ec1d1f7d9699442fff0ec63fd019361 SHA512 7c3b64e8f85056fb660bbfd4f737053813a1e5b8aba52290882a0ddb9d9fd8c5365b767c78dd1e7859ef95caa6e653786d5a8747c8792bbee9c6fad1a5218910
 DIST google-auth-1.35.0.tar.gz 181504 BLAKE2B 3994650c1931f98bebe3299a61660462370c81db4f281bf67db5fc41ec8964a50b7cde1a72b9c8d34a9220a9f6018608b83705cb6e853cd1797740b569023555 SHA512 7dcaa202b36e18679ea85ffbb1fdb204f1a5b28eabf158dbde96e1a783b034bf424b801ba63609678bb275a2bbf92aedf019e6dec06fc90f5968e3d5d41191f0
+DIST google-auth-2.0.0.tar.gz 180337 BLAKE2B e262ba19e41a8216c8ccc7f50ce9beb25764809853e9dc49900c7edacee4adfe255d307a503768ed257f9843ded01620aeff89e4cf0e9abf8e987e75f0eef8a5 SHA512 21f7adfd07ef5abe2dc2da9fb2b5c660157be6645b039510e14e3f80f6e39561f2a679c7e948d14ca96173da87c920adbfaaeb4c4877e8504bec638b318528cd
diff --git a/dev-python/google-auth/google-auth-2.0.0.ebuild b/dev-python/google-auth/google-auth-2.0.0.ebuild
new file mode 100644
index 000000000000..5dbfea8e2d83
--- /dev/null
+++ b/dev-python/google-auth/google-auth-2.0.0.ebuild
@@ -0,0 +1,50 @@
+# 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="Google Authentication Library"
+HOMEPAGE="
+	https://github.com/googleapis/google-auth-library-python/
+	https://pypi.org/project/google-auth/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/cachetools-2.0.0[${PYTHON_USEDEP}]
+	dev-python/namespace-google[${PYTHON_USEDEP}]
+	>=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
+	>=dev-python/pyasn1-modules-0.2.1[${PYTHON_USEDEP}]
+	>=dev-python/rsa-3.1.4[${PYTHON_USEDEP}]
+	"
+BDEPEND="
+	test? (
+		dev-python/cryptography[${PYTHON_USEDEP}]
+		dev-python/flask[${PYTHON_USEDEP}]
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/grpcio[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/moto[${PYTHON_USEDEP}]
+		dev-python/oauth2client[${PYTHON_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		dev-python/pytest-localserver[${PYTHON_USEDEP}]
+		dev-python/pyu2f[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/responses[${PYTHON_USEDEP}]
+		dev-python/urllib3[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+python_install_all() {
+	distutils-r1_python_install_all
+	find "${ED}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/hcloud-python/Manifest b/dev-python/hcloud-python/Manifest
index d7a8d1e48742..647260def8d5 100644
--- a/dev-python/hcloud-python/Manifest
+++ b/dev-python/hcloud-python/Manifest
@@ -2,3 +2,4 @@ DIST hcloud-python-1.12.0.tar.gz 88905 BLAKE2B 1e24cfa208f02a1068b0016ac8948358a
 DIST hcloud-python-1.13.0.tar.gz 89714 BLAKE2B 0d39d25c867e2433cec235b1ce101b3df8c5946cb4ccc7ffe658cb8a721eea5502f8fb2816491ac687a411a696c60ba4b1c602668385480d7a3645eb2a652c62 SHA512 4283b7b9be6add5ee6321645efc95b4bb77110417bff34327a533c416ee916c19511c35ef614fddbff184ee515fcf31bce740cdb6ad5c18ea7dd8e66c9760fc5
 DIST hcloud-python-1.14.1.tar.gz 89865 BLAKE2B 962c24488681ed31d91d2f94b589de2c6192f3397831b482e3f0939224705344671467708266f1ce9ddf2ba767a0eaccaf4ac7516e1a9e27b5a5331fb009ab5c SHA512 bc4fdae97daf41ec8b84bf4069c07d75674b5bab8e74861a28e124343135e6c90fbdef232c6950d612778ffb9ba194bc9bd1a432df2336664e9fef87e28f9210
 DIST hcloud-python-1.15.0.tar.gz 93265 BLAKE2B 851e2eebccd13a2c64902094f0012f018872ba78648abc98b049cc60c66283081db0e39e13b94f98eaa521c1b07df0b5f8f6f7beaaa463cb0d823319b2d94c7f SHA512 26feafdaf6f08bdc451394165442035dc61473e69c466cad8e1308dbebf220c7d6a6b719b539ccbab1a2db00526f875e037762d3656a38a1eb114a953b3e2f10
+DIST hcloud-python-1.16.0.tar.gz 93731 BLAKE2B d94881550dbd08281226b9869008ea6c4a10bc544a21a5aa17e48d4862808baa92b4805dc101ea970bf66baca1f5a971912601c4b934fe47614351029ece9f04 SHA512 282d1accb3c387caefe9dce7ab70dccfe2ff830c6ec3cd665326ad79076d7f9e58ab2f3061fa262208731c9d1e09e6c52d13075adf119f8b19d6af50e0374556
diff --git a/dev-python/hcloud-python/hcloud-python-1.16.0.ebuild b/dev-python/hcloud-python/hcloud-python-1.16.0.ebuild
new file mode 100644
index 000000000000..ca524e78ab95
--- /dev/null
+++ b/dev-python/hcloud-python/hcloud-python-1.16.0.ebuild
@@ -0,0 +1,40 @@
+# 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="Official Hetzner Cloud python library"
+HOMEPAGE="https://github.com/hetznercloud/hcloud-python"
+SRC_URI="https://github.com/hetznercloud/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc examples"
+
+RDEPEND="
+	>=dev-python/future-0.17.1[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.7.5[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.20[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_sphinx docs \
+	dev-python/sphinx_rtd_theme
+distutils_enable_tests pytest
+
+python_install_all() {
+	use examples && dodoc -r examples
+	distutils-r1_python_install_all
+}
+
+python_test() {
+	# Integration tests need docker:
+	# https://github.com/hetznercloud/hcloud-python/blob/master/.travis.yml#L16
+	epytest --ignore tests/integration
+}
diff --git a/dev-python/identify/Manifest b/dev-python/identify/Manifest
index 2aa90253871d..19ec58a7f251 100644
--- a/dev-python/identify/Manifest
+++ b/dev-python/identify/Manifest
@@ -1,3 +1,2 @@
-DIST identify-2.2.10.tar.gz 101073 BLAKE2B 7049424855d23727180a4af137ebd7cbf88d6ca0187901bbe43abfcb820c1db17af8ff89345612909fc869f9ee8503d84e3d1218548535abb6f499eade284def SHA512 a6f9dfc3d969a30f50922cb9ad285d76c39774706b8c0d868bcbf96564a49841e54b6021e4fced56f17cebd25fadc69dd93714d475e4f517a05677bdabada4dc
 DIST identify-2.2.11.tar.gz 101117 BLAKE2B e316bd18a91b3d073b2bb24743ffcf5e6551ce5a9ddf62b1a30aaf937311b2d07de08d9abe01040de48c607d51e4cab121d778385f8336bc911409bedcd5fce3 SHA512 083dd600bc65f61c1aa41f87943b59a4f2edcbbc7a7d07d7a1375d181761edc4b853df87d4a2b2c0f3122f4f27ed10eb784d2dd75078418b50a471b1d5a0ad0f
 DIST identify-2.2.13.tar.gz 101136 BLAKE2B b1835ca6b576a15be16de124554cfaf7b6dc55a1dfee70021613d35251135c295c3acf141eb645823add4c260bec9fdcde4799f0b72fbd57bc7a2e8659e416bd SHA512 37764325268c164028b7719f91571c006c9c6db3f4bba5a93d20f3d9ea30712cfe7e5710b175266a3d74f3f85485f16ebf7d21486d4329050b55e5835e8b4197
diff --git a/dev-python/identify/identify-2.2.10.ebuild b/dev-python/identify/identify-2.2.10.ebuild
deleted file mode 100644
index 9af6664b6ec4..000000000000
--- a/dev-python/identify/identify-2.2.10.ebuild
+++ /dev/null
@@ -1,19 +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
-
-DESCRIPTION="File identification library for Python"
-HOMEPAGE="https://github.com/pre-commit/identify"
-SRC_URI="https://github.com/pre-commit/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ~riscv"
-
-RDEPEND="dev-python/editdistance-s[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
diff --git a/dev-python/identify/identify-2.2.11.ebuild b/dev-python/identify/identify-2.2.11.ebuild
index bae7649cf429..5f03896e94d1 100644
--- a/dev-python/identify/identify-2.2.11.ebuild
+++ b/dev-python/identify/identify-2.2.11.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/pre-commit/${PN}/archive/refs/tags/v${PV}.tar.gz ->
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
 
 RDEPEND="dev-python/editdistance-s[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/jellyfish/Manifest b/dev-python/jellyfish/Manifest
index bf57f156c191..2a5ac4136638 100644
--- a/dev-python/jellyfish/Manifest
+++ b/dev-python/jellyfish/Manifest
@@ -1,3 +1,3 @@
 DIST jellyfish-0.8.2.tar.gz 134200 BLAKE2B f765047414e4c1de4588d51598583c49767dde07fe2b94cdb40674bf90f4af8b5b3fa59d0ddf1e0bae3793e531426ccc941dde3fbdaa25839dd13da8b19386c4 SHA512 c4cc2b22df37497ed1ee595f03ec10b7ffe6b8441accaea77ca1b6018df07d23bbe9f2ed72d0c3e06792d6e1229b7e56f77f1758396d83120236d018ce2328da
 DIST jellyfish-0.8.4.tar.gz 137001 BLAKE2B 55ffa7b7b931bf5bd0a2bee9a378fac10212d757d0e28492aac989a836c14106d37591a63a048db16b22c11e3964ad08325fe759e9ac2841722ac491a075feea SHA512 301fed3d4ba7228738b85310272970d2c666dd120a92a61b9870918ca3778bfead2b83437aced7933459f60079efcde863425a4a86077e8a0182db7d6d6c92cf
-DIST jellyfish-0.8.7.tar.gz 134456 BLAKE2B d6e14de100ca0f992ef9e576748043c7e3acc4a2b27e8e5541d0979562d8b56b3275ee956f7bcb3c4a88de181e00fb26a64276bb7d037e7f98f80eb07ba14d17 SHA512 9543f9187879b7a4c26d58f4b3d17067265ad8742577bd7e33305967083dcce12dbc9d3e5ded3525463bb4ff5946d26868ed0408fb120fe26566e8a58f623683
+DIST jellyfish-0.8.8.tar.gz 134461 BLAKE2B 29a4da13d248ab7916a4c9a6bd16da28bb9b4409bbc2e14660ac2a2bfad2563c7ddafb51c58968f5cac56c238de2786a5e1e64ee8d47cc668b0ab83e881b15f5 SHA512 d78f997a12ea2531e2621b3858f89a00c6c0620974a141fea6fdf6695860fa50ff4b5c21799de898944474563e6043e4d391448061501fbec078923dae21ae7c
diff --git a/dev-python/jellyfish/jellyfish-0.8.7.ebuild b/dev-python/jellyfish/jellyfish-0.8.8.ebuild
index 1a38f4aa60e7..1a38f4aa60e7 100644
--- a/dev-python/jellyfish/jellyfish-0.8.7.ebuild
+++ b/dev-python/jellyfish/jellyfish-0.8.8.ebuild
diff --git a/dev-python/markdown2/Manifest b/dev-python/markdown2/Manifest
index dd06515cb2da..e8eb5f021c40 100644
--- a/dev-python/markdown2/Manifest
+++ b/dev-python/markdown2/Manifest
@@ -1 +1,2 @@
 DIST markdown2-2.4.0.tar.gz 96596 BLAKE2B 23fa2b05e7f26bd76b38b2c7f4fb5b3b36694b0e30ab3f168b64754f62d7d2742c5e0bfbed774a198527ad226bfe411e0ba11ddf6d0b2002670e5937750070a2 SHA512 ed523116e01121e471ee1a8ea9e8dde42a04c4c7c5170c56eed852268881f18b7b5062c43f1548fad3a84e2fbddc19c26fbf88084f6affdd11fd4d493a480cdf
+DIST markdown2-2.4.1.tar.gz 97089 BLAKE2B 62506be323a0c05060e5922b4eafbe1d0f6c2d9f81348fe5e35af8a577e0d7c26ba56cfa727fc1bb13dc3d08e7a8fe183d9ad91746dfc7a0034d025ff91c1bb9 SHA512 fa62640a135bb01b2dc82f658089c5880a3183c3b6e498ce76a27075d3045d70d7e00b9d497180a63c00cbd9ece83ebabaa8cd31ee326160d891fb422f43528e
diff --git a/dev-python/markdown2/markdown2-2.4.1.ebuild b/dev-python/markdown2/markdown2-2.4.1.ebuild
new file mode 100644
index 000000000000..9422202c45a5
--- /dev/null
+++ b/dev-python/markdown2/markdown2-2.4.1.ebuild
@@ -0,0 +1,29 @@
+# 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/moto/moto-2.0.10.ebuild b/dev-python/moto/moto-2.0.10.ebuild
index bb3423485e8c..c81860a8a564 100644
--- a/dev-python/moto/moto-2.0.10.ebuild
+++ b/dev-python/moto/moto-2.0.10.ebuild
@@ -18,7 +18,7 @@ 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-python-lint[${PYTHON_USEDEP}]
+	dev-python/cfn-lint[${PYTHON_USEDEP}]
 	>=dev-python/cryptography-3.3.1[${PYTHON_USEDEP}]
 	dev-python/cookies[${PYTHON_USEDEP}]
 	dev-python/dicttoxml[${PYTHON_USEDEP}]
diff --git a/dev-python/moto/moto-2.0.5.ebuild b/dev-python/moto/moto-2.0.5.ebuild
index 3bbeccc235c5..d1c683c631dc 100644
--- a/dev-python/moto/moto-2.0.5.ebuild
+++ b/dev-python/moto/moto-2.0.5.ebuild
@@ -18,7 +18,7 @@ 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-python-lint[${PYTHON_USEDEP}]
+	dev-python/cfn-lint[${PYTHON_USEDEP}]
 	>=dev-python/cryptography-3.3.1[${PYTHON_USEDEP}]
 	dev-python/cookies[${PYTHON_USEDEP}]
 	dev-python/dicttoxml[${PYTHON_USEDEP}]
diff --git a/dev-python/moto/moto-2.2.0.ebuild b/dev-python/moto/moto-2.2.0.ebuild
index 923cec7e26d2..8447a398c3cc 100644
--- a/dev-python/moto/moto-2.2.0.ebuild
+++ b/dev-python/moto/moto-2.2.0.ebuild
@@ -18,7 +18,7 @@ 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-python-lint[${PYTHON_USEDEP}]
+	dev-python/cfn-lint[${PYTHON_USEDEP}]
 	>=dev-python/cryptography-3.3.1[${PYTHON_USEDEP}]
 	dev-python/cookies[${PYTHON_USEDEP}]
 	dev-python/dicttoxml[${PYTHON_USEDEP}]
diff --git a/dev-python/moto/moto-2.2.2.ebuild b/dev-python/moto/moto-2.2.2.ebuild
index fb596d412f1b..3fef96c9dee4 100644
--- a/dev-python/moto/moto-2.2.2.ebuild
+++ b/dev-python/moto/moto-2.2.2.ebuild
@@ -18,7 +18,7 @@ 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-python-lint[${PYTHON_USEDEP}]
+	dev-python/cfn-lint[${PYTHON_USEDEP}]
 	>=dev-python/cryptography-3.3.1[${PYTHON_USEDEP}]
 	dev-python/cookies[${PYTHON_USEDEP}]
 	dev-python/dicttoxml[${PYTHON_USEDEP}]
diff --git a/dev-python/moto/moto-2.2.3.ebuild b/dev-python/moto/moto-2.2.3.ebuild
index fb596d412f1b..3fef96c9dee4 100644
--- a/dev-python/moto/moto-2.2.3.ebuild
+++ b/dev-python/moto/moto-2.2.3.ebuild
@@ -18,7 +18,7 @@ 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-python-lint[${PYTHON_USEDEP}]
+	dev-python/cfn-lint[${PYTHON_USEDEP}]
 	>=dev-python/cryptography-3.3.1[${PYTHON_USEDEP}]
 	dev-python/cookies[${PYTHON_USEDEP}]
 	dev-python/dicttoxml[${PYTHON_USEDEP}]
diff --git a/dev-python/networkx/networkx-2.6.2.ebuild b/dev-python/networkx/networkx-2.6.2.ebuild
index fa496dd79558..0ab70d82f92d 100644
--- a/dev-python/networkx/networkx-2.6.2.ebuild
+++ b/dev-python/networkx/networkx-2.6.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="examples extras xml yaml"
 
 RDEPEND="
diff --git a/dev-python/pipenv/files/pipenv-2021-5-29-r1-remove-attr-vendor-import.patch b/dev-python/pipenv/files/pipenv-2021-5-29-r2-remove-attr-vendor-import.patch
index 3437c2a2f33f..3437c2a2f33f 100644
--- a/dev-python/pipenv/files/pipenv-2021-5-29-r1-remove-attr-vendor-import.patch
+++ b/dev-python/pipenv/files/pipenv-2021-5-29-r2-remove-attr-vendor-import.patch
diff --git a/dev-python/pipenv/files/pipenv-2021-5-29-r2-remove-colorama-vendor-import.patch b/dev-python/pipenv/files/pipenv-2021-5-29-r2-remove-colorama-vendor-import.patch
new file mode 100644
index 000000000000..5c50788d0320
--- /dev/null
+++ b/dev-python/pipenv/files/pipenv-2021-5-29-r2-remove-colorama-vendor-import.patch
@@ -0,0 +1,18 @@
+diff --git a/pipenv/patched/crayons.py b/pipenv/patched/crayons.py
+index d7644a21..19b0d695 100644
+--- a/pipenv/patched/crayons.py
++++ b/pipenv/patched/crayons.py
+@@ -13,7 +13,7 @@ import re
+ import sys
+ 
+ from pipenv.vendor import shellingham
+-from pipenv.vendor import colorama
++import colorama
+ 
+ PY3 = sys.version_info[0] >= 3
+ 
+Submodule tests/pypi f5530013..1881ecb4 (rewind):
+  < Update setuptools version
+  < Add sha256 checksum files
+  < Update url reference
+  < Add pep 508 subdirectory fixtures
diff --git a/dev-python/pipenv/pipenv-2021.5.29-r1.ebuild b/dev-python/pipenv/pipenv-2021.5.29-r2.ebuild
index 90879c57aa1e..000622b0b57f 100644
--- a/dev-python/pipenv/pipenv-2021.5.29-r1.ebuild
+++ b/dev-python/pipenv/pipenv-2021.5.29-r2.ebuild
@@ -20,11 +20,17 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-PATCHES="${FILESDIR}/${PN}-${PV//./-}-${PR}-remove-attr-vendor-import.patch"
+PATCHES=( 
+	"${FILESDIR}/${PN}-${PV//./-}-${PR}-remove-attr-vendor-import.patch"
+	"${FILESDIR}/${PN}-${PV//./-}-${PR}-remove-colorama-vendor-import.patch"
+	)
 
 RDEPEND="
 	${PYTHON_DEPS}
+	dev-python/attrs[${PYTHON_USEDEP}]
 	dev-python/certifi[${PYTHON_USEDEP}]
+	>=dev-python/colorama-0.4.4[${PYTHON_USEDEP}]
+	>=dev-python/jinja-3.0.1[${PYTHON_USEDEP}]
 	dev-python/pip[${PYTHON_USEDEP}]
 	>=dev-python/virtualenv-20.0.35[${PYTHON_USEDEP}]
 	dev-python/virtualenv-clone[${PYTHON_USEDEP}]
@@ -45,6 +51,7 @@ src_prepare() {
 	# remove vendored versions
 	# see https://bugs.gentoo.org/717666
 	rm -vR "${S}/${PN}/vendor/attr/" || die
+	rm -vR "${S}/${PN}/vendor/colorama/" || die
 	rm -vR "${S}/${PN}/vendor/jinja2/" || die
 	distutils-r1_src_prepare
 }
diff --git a/dev-python/python-podman/Manifest b/dev-python/podman-py/Manifest
index ab2ad9fb16d0..ab2ad9fb16d0 100644
--- a/dev-python/python-podman/Manifest
+++ b/dev-python/podman-py/Manifest
diff --git a/dev-python/python-podman/metadata.xml b/dev-python/podman-py/metadata.xml
index 2d1631517062..2d1631517062 100644
--- a/dev-python/python-podman/metadata.xml
+++ b/dev-python/podman-py/metadata.xml
diff --git a/dev-python/python-podman/python-podman-3.2.0.ebuild b/dev-python/podman-py/podman-py-3.2.0.ebuild
index 33185e822671..510ed1b1a495 100644
--- a/dev-python/python-podman/python-podman-3.2.0.ebuild
+++ b/dev-python/podman-py/podman-py-3.2.0.ebuild
@@ -6,15 +6,13 @@ EAPI=8
 PYTHON_COMPAT=( python3_{6,7,8,9,10} )
 inherit distutils-r1
 
-MY_P=podman-py-${PV}
 DESCRIPTION="A library to interact with a Podman server"
 HOMEPAGE="
 	https://github.com/containers/podman-py/
 	https://pypi.org/project/podman/"
 SRC_URI="
 	https://github.com/containers/podman-py/archive/v${PV}.tar.gz
-		-> ${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
+		-> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
diff --git a/dev-python/pyglet/Manifest b/dev-python/pyglet/Manifest
index 354e13da740a..7aa180271602 100644
--- a/dev-python/pyglet/Manifest
+++ b/dev-python/pyglet/Manifest
@@ -1 +1,2 @@
 DIST pyglet-1.5.18.tar.gz 6440818 BLAKE2B cb7832000e0df96cd794f8eff9ba41aac8571542fbc45d1607df3935a7ed53ba8fd46b6bba40f6d5d53adfb2024aad1930cba1889b5d40d342457f7dc06db5d1 SHA512 d6ceddecccb36a90bef38c4a1608e866bb90ebb72eaaff693a2eb34678c7a50c99213a69042c569c22d54cc04a4b11d37ea8da47425958505261ebcf99bd28ce
+DIST pyglet-1.5.19.tar.gz 6446786 BLAKE2B fef21122cf31718e0a796b3be4edf386bf477dc4fa6480970159b9d361e489417c9cad1df1060290bc1678408eed36e287c15da442275beaa8d354c268568411 SHA512 7ef85d91cdcafef8cf097e96bd34e800002824696ffbc1132c2dd776fe9d3c7be0b5633fff1cb10344fcc1aafa3c0c9a75547ad374be091f35aa99527869ab4b
diff --git a/dev-python/pyglet/pyglet-1.5.19.ebuild b/dev-python/pyglet/pyglet-1.5.19.ebuild
new file mode 100644
index 000000000000..5513865e435b
--- /dev/null
+++ b/dev-python/pyglet/pyglet-1.5.19.ebuild
@@ -0,0 +1,61 @@
+# 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 xdg-utils
+
+DESCRIPTION="Cross-platform windowing and multimedia library for Python"
+HOMEPAGE="http://pyglet.org/"
+SRC_URI="https://github.com/pyglet/pyglet/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples image +sound"
+
+BDEPEND="
+	test? (
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/gst-python[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	virtual/glu
+	virtual/opengl
+	image? ( || (
+		dev-python/pillow[${PYTHON_USEDEP}]
+		x11-libs/gtk+:2
+	) )
+	sound? ( || (
+		media-libs/openal
+		media-sound/pulseaudio
+	) )
+"
+#	ffmpeg? ( media-libs/avbin-bin )
+
+DOCS=( DESIGN NOTICE README.md RELEASE_NOTES )
+
+distutils_enable_tests pytest
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	xdg_environment_reset
+
+	# Specify path to avoid running interactive tests
+	# We could add in integration tests, but they're slow
+	epytest tests/unit
+}
+
+python_install_all() {
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pygraphviz/Manifest b/dev-python/pygraphviz/Manifest
index ca7cd8c5394a..63c57d24a880 100644
--- a/dev-python/pygraphviz/Manifest
+++ b/dev-python/pygraphviz/Manifest
@@ -1,2 +1 @@
-DIST pygraphviz-1.6.zip 117043 BLAKE2B a6c4f28d67ff67bf3fb69869adaad23855c6d702663cfea648b2072b8a5095caaa3d9cfcc864354a362cc6c4c2c6e4a15d5977c58c6af5e22b02f8cea8f7e877 SHA512 6dd389b3fd8c46fd5c8a5a450623f2fe080f720bcf0812618549d092cf917b56ef515f4235fdb89123ece422c6e295705bb08076a3d3e9b193955fcda624acb3
 DIST pygraphviz-1.7.zip 118754 BLAKE2B 36507fc862bec45a33bee3f89e7593a15639e7d98067e1c4ddf917558b7bc037b9d7607f7f017ad5980ba0e6805e63f05464efe8fd416ef70cb95709151714e3 SHA512 09438931d1930a70f7da94b0a12b449c0836ad707c6c8abed49bae0db162c136002d170398ed02dc56a5029269490ce3156d2d4b0f30602a11165bc0038998ea
diff --git a/dev-python/pygraphviz/files/pygraphviz-1.5-docs.patch b/dev-python/pygraphviz/files/pygraphviz-1.5-docs.patch
deleted file mode 100644
index aed5c9075b88..000000000000
--- a/dev-python/pygraphviz/files/pygraphviz-1.5-docs.patch
+++ /dev/null
@@ -1,29 +0,0 @@
- setup.py | 8 --------
- 1 file changed, 8 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index fc0a96f..98b7f58 100644
---- a/setup.py
-+++ b/setup.py
-@@ -36,13 +36,6 @@ release.write_versionfile()
- sys.path.pop(0)
- 
- packages = ["pygraphviz", "pygraphviz.tests"]
--docdirbase = 'share/doc/pygraphviz-%s' % release.version
--data = [
--    (docdirbase, glob("*.txt")),
--    (os.path.join(docdirbase, 'examples'), glob("examples/*.py")),
--    (os.path.join(docdirbase, 'examples'), glob("examples/*.dat")),
--    (os.path.join(docdirbase, 'examples'), glob("examples/*.dat.gz")),
--]
- package_data = {'': ['*.txt'], }
- 
- if __name__ == "__main__":
-@@ -75,7 +68,6 @@ if __name__ == "__main__":
-         download_url=release.download_url,
-         classifiers=release.classifiers,
-         packages=packages,
--        data_files=data,
-         ext_modules=extension,
-         cmdclass={
-             'install': AddExtensionInstallCommand,
diff --git a/dev-python/pygraphviz/pygraphviz-1.6.ebuild b/dev-python/pygraphviz/pygraphviz-1.6.ebuild
deleted file mode 100644
index 2c06261d5068..000000000000
--- a/dev-python/pygraphviz/pygraphviz-1.6.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python wrapper for the Graphviz Agraph data structure"
-HOMEPAGE="https://pygraphviz.github.io/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86 ~x86-linux ~ppc-macos ~x64-macos"
-
-# Note: only C API of graphviz is used, PYTHON_USEDEP unnecessary.
-RDEPEND="media-gfx/graphviz"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	app-arch/unzip
-	dev-lang/swig:0
-	test? ( dev-python/doctest-ignore-unicode[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests nose
-
-PATCHES=( "${FILESDIR}"/${PN}-1.5-docs.patch )
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-	swig -python pygraphviz/graphviz.i || die
-}
-
-python_test() {
-	nosetests -c setup.cfg -x -v "${BUILD_DIR}"/lib/pygraphviz || die
-}
-
-python_install_all() {
-	dodoc -r examples
-	docompress -x /usr/share/doc/${PF}/examples
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pygraphviz/pygraphviz-1.7.ebuild b/dev-python/pygraphviz/pygraphviz-1.7.ebuild
index 6b5266c77fb9..81a10f728ec9 100644
--- a/dev-python/pygraphviz/pygraphviz-1.7.ebuild
+++ b/dev-python/pygraphviz/pygraphviz-1.7.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 ~riscv ~x86 ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 ~riscv x86 ~x86-linux ~ppc-macos ~x64-macos"
 
 # Note: only C API of graphviz is used, PYTHON_USEDEP unnecessary.
 RDEPEND="media-gfx/graphviz"
diff --git a/dev-python/pytest-expect/pytest-expect-1.1.0-r1.ebuild b/dev-python/pytest-expect/pytest-expect-1.1.0-r1.ebuild
index da2322e7ba00..4f649b30094a 100644
--- a/dev-python/pytest-expect/pytest-expect-1.1.0-r1.ebuild
+++ b/dev-python/pytest-expect/pytest-expect-1.1.0-r1.ebuild
@@ -18,4 +18,4 @@ RESTRICT="test"
 
 RDEPEND="
 	dev-python/pytest[${PYTHON_USEDEP}]
-	dev-python/u-msgpack[${PYTHON_USEDEP}]"
+	dev-python/u-msgpack-python[${PYTHON_USEDEP}]"
diff --git a/dev-python/python-backoff/Manifest b/dev-python/python-backoff/Manifest
deleted file mode 100644
index 77ea8cdd1343..000000000000
--- a/dev-python/python-backoff/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST python-backoff-1.11.0.gh.tar.gz 17566 BLAKE2B 4afed5284eb3cbedf54e06fcd89861701613357c672ebabe2611a4bc28c3a6e4539e206cee24bb6a646f7c16c033f16ef56be3b21867aad760b71410749383b7 SHA512 0f5e176bf9d093a72068cf6e55ada8da3e8ec67b85b4fba2d697117dcb3c563a429ff53c5fe17b4a20a8b5ee0420930b789478bd89de5949b628158263413a60
diff --git a/dev-python/dbusmock/Manifest b/dev-python/python-dbusmock/Manifest
index 92ec5980baea..92ec5980baea 100644
--- a/dev-python/dbusmock/Manifest
+++ b/dev-python/python-dbusmock/Manifest
diff --git a/dev-python/dbusmock/metadata.xml b/dev-python/python-dbusmock/metadata.xml
index 6e45285d5ffa..6e45285d5ffa 100644
--- a/dev-python/dbusmock/metadata.xml
+++ b/dev-python/python-dbusmock/metadata.xml
diff --git a/dev-python/dbusmock/dbusmock-0.23.1.ebuild b/dev-python/python-dbusmock/python-dbusmock-0.23.1.ebuild
index c107c576666b..64764737fd54 100644
--- a/dev-python/dbusmock/dbusmock-0.23.1.ebuild
+++ b/dev-python/python-dbusmock/python-dbusmock-0.23.1.ebuild
@@ -8,13 +8,10 @@ PYTHON_REQ_USE="xml(+)"
 
 inherit distutils-r1
 
-MY_PN="python-${PN}"
-MY_P="${MY_PN}-${PV}"
-
 DESCRIPTION="Easily create mock objects on D-Bus for software testing"
 HOMEPAGE="https://github.com/martinpitt/python-dbusmock"
-SRC_URI="https://github.com/martinpitt/${MY_PN}/releases/download/${PV}/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
+SRC_URI="
+	https://github.com/martinpitt/python-dbusmock/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="LGPL-3+"
 SLOT="0"
diff --git a/dev-python/fcl/Manifest b/dev-python/python-fcl/Manifest
index c8d389d0a36c..c8d389d0a36c 100644
--- a/dev-python/fcl/Manifest
+++ b/dev-python/python-fcl/Manifest
diff --git a/dev-python/fcl/files/fcl-0.0.12-fix-compiling-on-lld.patch b/dev-python/python-fcl/files/python-fcl-0.0.12-fix-compiling-on-lld.patch
index 0e3cf7a54196..0e3cf7a54196 100644
--- a/dev-python/fcl/files/fcl-0.0.12-fix-compiling-on-lld.patch
+++ b/dev-python/python-fcl/files/python-fcl-0.0.12-fix-compiling-on-lld.patch
diff --git a/dev-python/fcl/metadata.xml b/dev-python/python-fcl/metadata.xml
index d32393e9b0fa..d32393e9b0fa 100644
--- a/dev-python/fcl/metadata.xml
+++ b/dev-python/python-fcl/metadata.xml
diff --git a/dev-python/fcl/fcl-0.0.12-r1.ebuild b/dev-python/python-fcl/python-fcl-0.0.12-r1.ebuild
index 4448f901e7bb..586b9f144522 100644
--- a/dev-python/fcl/fcl-0.0.12-r1.ebuild
+++ b/dev-python/python-fcl/python-fcl-0.0.12-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,12 +7,9 @@ PYTHON_COMPAT=( python3_{6,7,8,9,10} )
 
 inherit distutils-r1
 
-MY_PN="python-fcl"
-MY_P="${MY_PN}-${PV}"
-
 DESCRIPTION="Python bindings for the Flexible Collision Library"
 HOMEPAGE="https://github.com/BerkeleyAutomation/python-fcl https://pypi.org/project/python-fcl/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="BSD"
 
 KEYWORDS="~amd64"
@@ -25,8 +22,6 @@ RDEPEND="
 	sci-libs/octomap
 "
 
-S=${WORKDIR}/${MY_P}
-
 PATCHES=( "${FILESDIR}"/${P}-fix-compiling-on-lld.patch )
 
 distutils_enable_tests unittest
diff --git a/dev-python/python-musicbrainz-ngs/Manifest b/dev-python/python-musicbrainz-ngs/Manifest
deleted file mode 100644
index fbebf1a80bc0..000000000000
--- a/dev-python/python-musicbrainz-ngs/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST python-musicbrainzngs0.7.1.tar.gz 112302 BLAKE2B 1c0696c72b8ea78d182300c76c0040117e1448a7955fa9aed8e42d1ebf9aa1b43359cee1158920fa31d3fb7536796130b54d0d45f351ddb5449d8f022a55f552 SHA512 a674c38b5084d1ae554dd03d1b3e613b48f8f3f3ada67f8d608130cebd35f0640ca65f8b4d224c1e660975274b0b077ffae29739ac2dc5a7078ca87eb8ccadd9
diff --git a/dev-python/python-musicbrainzngs/Manifest b/dev-python/python-musicbrainzngs/Manifest
new file mode 100644
index 000000000000..d822a2016c42
--- /dev/null
+++ b/dev-python/python-musicbrainzngs/Manifest
@@ -0,0 +1 @@
+DIST python-musicbrainzngs-0.7.1.tar.gz 112302 BLAKE2B 1c0696c72b8ea78d182300c76c0040117e1448a7955fa9aed8e42d1ebf9aa1b43359cee1158920fa31d3fb7536796130b54d0d45f351ddb5449d8f022a55f552 SHA512 a674c38b5084d1ae554dd03d1b3e613b48f8f3f3ada67f8d608130cebd35f0640ca65f8b4d224c1e660975274b0b077ffae29739ac2dc5a7078ca87eb8ccadd9
diff --git a/dev-python/python-musicbrainz-ngs/metadata.xml b/dev-python/python-musicbrainzngs/metadata.xml
index 79bc6e6a9686..79bc6e6a9686 100644
--- a/dev-python/python-musicbrainz-ngs/metadata.xml
+++ b/dev-python/python-musicbrainzngs/metadata.xml
diff --git a/dev-python/python-musicbrainz-ngs/python-musicbrainz-ngs-0.7.1.ebuild b/dev-python/python-musicbrainzngs/python-musicbrainzngs-0.7.1.ebuild
index 9b1abaf15f3e..faa544347755 100644
--- a/dev-python/python-musicbrainz-ngs/python-musicbrainz-ngs-0.7.1.ebuild
+++ b/dev-python/python-musicbrainzngs/python-musicbrainzngs-0.7.1.ebuild
@@ -4,15 +4,13 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-
 inherit distutils-r1
 
-MY_PN="${PN/%-ngs/ngs}"
-
 DESCRIPTION="Python bindings for the MusicBrainz NGS and the Cover Art Archive webservices"
 HOMEPAGE="https://github.com/alastair/python-musicbrainzngs"
-SRC_URI="https://github.com/alastair/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_PN}${PV}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
+SRC_URI="
+	https://github.com/alastair/python-musicbrainzngs/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz"
 
 LICENSE="BSD-2 ISC"
 SLOT="0"
diff --git a/dev-python/pyzmq/pyzmq-22.1.0.ebuild b/dev-python/pyzmq/pyzmq-22.1.0.ebuild
index 79406151662e..7dc5fc4720b3 100644
--- a/dev-python/pyzmq/pyzmq-22.1.0.ebuild
+++ b/dev-python/pyzmq/pyzmq-22.1.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="+draft"
 
 DEPEND="
diff --git a/dev-python/setuptools_trial/setuptools_trial-0.6.0-r1.ebuild b/dev-python/setuptools_trial/setuptools_trial-0.6.0-r1.ebuild
index 0815ca9b2340..f47670fe1f76 100644
--- a/dev-python/setuptools_trial/setuptools_trial-0.6.0-r1.ebuild
+++ b/dev-python/setuptools_trial/setuptools_trial-0.6.0-r1.ebuild
@@ -1,11 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-DISTUTILS_USE_SETUPTOOLS=bdepend
+EAPI=8
 
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
 inherit distutils-r1
 
 DESCRIPTION="Setuptools plugin that makes unit tests execute with trial instead of pyunit"
@@ -22,7 +20,13 @@ RDEPEND="
 	>=dev-python/twisted-16.0.0[${PYTHON_USEDEP}]
 "
 
-BDEPEND="${RDEPEND}"
+BDEPEND="test? ( ${RDEPEND} )"
+
+src_prepare() {
+	# don't install docs into wrong location
+	sed -e '/data_files=/d' -i setup.py || die
+	distutils-r1_src_prepare
+}
 
 python_test() {
 	distutils_install_for_testing
diff --git a/dev-python/simplejson/simplejson-3.17.3.ebuild b/dev-python/simplejson/simplejson-3.17.3.ebuild
index 607c15376cc4..acb46be59f1c 100644
--- a/dev-python/simplejson/simplejson-3.17.3.ebuild
+++ b/dev-python/simplejson/simplejson-3.17.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( MIT AFL-2.1 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 DOCS=( README.rst CHANGES.txt )
 
diff --git a/dev-python/slixmpp/files/slixmpp-1.7.1-fix-py3.10.patch b/dev-python/slixmpp/files/slixmpp-1.7.1-fix-py3.10.patch
new file mode 100644
index 000000000000..0901090e4651
--- /dev/null
+++ b/dev-python/slixmpp/files/slixmpp-1.7.1-fix-py3.10.patch
@@ -0,0 +1,28 @@
+From 8b7648502b003d433a08333b041baf1d4960c9d4 Mon Sep 17 00:00:00 2001
+From: Nicolas Cedilnik <nicoco@nicoco.fr>
+Date: Mon, 22 Feb 2021 13:07:15 +0100
+Subject: [PATCH] Fix deprecation warning
+
+---
+ slixmpp/thirdparty/orderedset.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/slixmpp/thirdparty/orderedset.py b/slixmpp/thirdparty/orderedset.py
+index f6642db3..43023af4 100644
+--- a/slixmpp/thirdparty/orderedset.py
++++ b/slixmpp/thirdparty/orderedset.py
+@@ -20,9 +20,9 @@
+ #     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ #     OTHER DEALINGS IN THE SOFTWARE.
+ 
+-import collections
++from collections.abc import MutableSet
+ 
+-class OrderedSet(collections.MutableSet):
++class OrderedSet(MutableSet):
+ 
+     def __init__(self, iterable=None):
+         self.end = end = []
+-- 
+GitLab
+
diff --git a/dev-python/slixmpp/slixmpp-1.7.1.ebuild b/dev-python/slixmpp/slixmpp-1.7.1.ebuild
index fc5a3519c9a7..10b6d0953e94 100644
--- a/dev-python/slixmpp/slixmpp-1.7.1.ebuild
+++ b/dev-python/slixmpp/slixmpp-1.7.1.ebuild
@@ -31,8 +31,8 @@ RDEPEND="
 	${DEPEND}
 "
 
-distutils_enable_tests unittest
+PATCHES=(
+	"${FILESDIR}/${P}-fix-py3.10.patch"
+)
 
-python_test() {
-	"${EPYTHON}" ./run_tests.py || die "Tests failed with ${EPYTHON}"
-}
+distutils_enable_tests unittest
diff --git a/dev-python/slixmpp/slixmpp-9999.ebuild b/dev-python/slixmpp/slixmpp-9999.ebuild
index 72a628d079ca..0704f9492671 100644
--- a/dev-python/slixmpp/slixmpp-9999.ebuild
+++ b/dev-python/slixmpp/slixmpp-9999.ebuild
@@ -32,7 +32,3 @@ RDEPEND="
 "
 
 distutils_enable_tests unittest
-
-python_test() {
-	"${EPYTHON}" ./run_tests.py || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/sphinx/sphinx-4.1.2.ebuild b/dev-python/sphinx/sphinx-4.1.2.ebuild
index 8c897d7042b2..17b23642b818 100644
--- a/dev-python/sphinx/sphinx-4.1.2.ebuild
+++ b/dev-python/sphinx/sphinx-4.1.2.ebuild
@@ -17,7 +17,7 @@ S=${WORKDIR}/${P^}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="doc latex"
 
 RDEPEND="
diff --git a/dev-python/stripe/Manifest b/dev-python/stripe/Manifest
index 417b673f68f2..56e1d04b9ae7 100644
--- a/dev-python/stripe/Manifest
+++ b/dev-python/stripe/Manifest
@@ -1,3 +1 @@
-DIST stripe-2.58.0.tar.gz 216926 BLAKE2B 398b16ddab4050373ba5d7da3c8404b85b88d50749a5c3ce2e1704dbe04cdb99abc90b6c8837afbc3e086551e8dfa72baa3a5e68edf2ebb4e30aff157fb3ce8c SHA512 eee6154384fae69632e5e9ae7f972d97915b07da85c9f1af3849f5b9fea1e6f291c3d3e5b0e319c0d6dc0c035fec167f7711f650032016d3eb4709b333f3d5b7
-DIST stripe-2.59.0.tar.gz 219952 BLAKE2B f59d7e7f7c03f620dd2f43b5678208d72de0f947bf748c9c41d6782a6b01450a0547ddd5972a731fd1b8187479e1b813f890993ae097ec8c32acd4691256a4c3 SHA512 f27ed8457d1097aac43aaddaf39b8d1d9df25e837160407edea354b2fa8faf122ed86a9d36583ff56885e22663b230ee63af04baab0edad2711f3c691c8de51c
 DIST stripe-2.60.0.tar.gz 219649 BLAKE2B 208826e62560f6e9acb5016cecae4f3128106d562f8b5de6caa106179f6991376bacd679ab4cd61a973a60f68a84aebb673d17c1ca8d10541c2ab4a1e761da0e SHA512 eaae2356ed83285713be6396c071b8f5761ad0ff651691b1560b06bca190a5c5df3659182e5a25e8d286257046162f32755854f0e382a280cb63180478114502
diff --git a/dev-python/stripe/stripe-2.58.0.ebuild b/dev-python/stripe/stripe-2.58.0.ebuild
deleted file mode 100644
index 8a55be32b727..000000000000
--- a/dev-python/stripe/stripe-2.58.0.ebuild
+++ /dev/null
@@ -1,63 +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="Stripe python bindings"
-HOMEPAGE="https://github.com/stripe/stripe-python"
-SRC_URI="mirror://pypi/s/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	>=dev-python/requests-2.20[${PYTHON_USEDEP}]
-"
-DEPEND="
-	test? (
-		${RDEPEND}
-		>=dev-util/stripe-mock-0.106.0
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		net-misc/curl
-	)
-"
-
-distutils_enable_tests pytest
-
-DOCS=(LONG_DESCRIPTION.rst CHANGELOG.md README.md)
-
-src_test() {
-	local stripe_mock_port=12111
-	local stripe_mock_max_port=12121
-	local stripe_mock_logfile="${T}/stripe_mock_${EPYTHON}.log"
-	# Try to start stripe-mock until we find a free port
-	while [[ "${stripe_mock_port}" -le "${stripe_mock_max_port}" ]]; do
-		ebegin "Trying to start stripe-mock on port ${stripe_mock_port}"
-		stripe-mock --http-port ${stripe_mock_port} &> "${stripe_mock_logfile}" &
-		local stripe_mock_pid=$!
-		sleep 2
-		# Did stripe-mock start?
-		curl --fail -u "sk_test_123:" \
-			http://127.0.0.1:${stripe_mock_port}/v1/customers &> /dev/null
-		eend $? "Port ${stripe_mock_port} unavailable"
-		if [[ $? -eq 0 ]]; then
-			einfo "stripe-mock running on port ${stripe_mock_port}"
-			break
-		fi
-		(( stripe_mock_port++ ))
-	done
-	if [[ "${stripe_mock_port}" -gt "${stripe_mock_max_port}" ]]; then
-		eerror "Unable to start stripe-mock for tests"
-		die "Please see the logfile located at: ${stripe_mock_logfile}"
-	fi
-
-	local -x STRIPE_MOCK_PORT=${stripe_mock_port}
-	distutils-r1_src_test
-
-	# Tear down stripe-mock
-	kill "${stripe_mock_pid}" || die "Unable to stop stripe-mock"
-}
diff --git a/dev-python/stripe/stripe-2.59.0.ebuild b/dev-python/stripe/stripe-2.59.0.ebuild
deleted file mode 100644
index 10414b9661bc..000000000000
--- a/dev-python/stripe/stripe-2.59.0.ebuild
+++ /dev/null
@@ -1,62 +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="Stripe python bindings"
-HOMEPAGE="https://github.com/stripe/stripe-python"
-SRC_URI="mirror://pypi/s/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/requests-2.20[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-util/stripe-mock-0.109.0
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		net-misc/curl
-	)
-"
-
-distutils_enable_tests pytest
-
-DOCS=(LONG_DESCRIPTION.rst CHANGELOG.md README.md)
-
-src_test() {
-	local stripe_mock_port=12111
-	local stripe_mock_max_port=12121
-	local stripe_mock_logfile="${T}/stripe_mock_${EPYTHON}.log"
-	# Try to start stripe-mock until we find a free port
-	while [[ "${stripe_mock_port}" -le "${stripe_mock_max_port}" ]]; do
-		ebegin "Trying to start stripe-mock on port ${stripe_mock_port}"
-		stripe-mock --http-port ${stripe_mock_port} &> "${stripe_mock_logfile}" &
-		local stripe_mock_pid=$!
-		sleep 2
-		# Did stripe-mock start?
-		curl --fail -u "sk_test_123:" \
-			http://127.0.0.1:${stripe_mock_port}/v1/customers &> /dev/null
-		eend $? "Port ${stripe_mock_port} unavailable"
-		if [[ $? -eq 0 ]]; then
-			einfo "stripe-mock running on port ${stripe_mock_port}"
-			break
-		fi
-		(( stripe_mock_port++ ))
-	done
-	if [[ "${stripe_mock_port}" -gt "${stripe_mock_max_port}" ]]; then
-		eerror "Unable to start stripe-mock for tests"
-		die "Please see the logfile located at: ${stripe_mock_logfile}"
-	fi
-
-	local -x STRIPE_MOCK_PORT=${stripe_mock_port}
-	distutils-r1_src_test
-
-	# Tear down stripe-mock
-	kill "${stripe_mock_pid}" || die "Unable to stop stripe-mock"
-}
diff --git a/dev-python/stripe/stripe-2.60.0.ebuild b/dev-python/stripe/stripe-2.60.0.ebuild
index 083179b01b1d..7a606fbeeddb 100644
--- a/dev-python/stripe/stripe-2.60.0.ebuild
+++ b/dev-python/stripe/stripe-2.60.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/s/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	>=dev-python/requests-2.20[${PYTHON_USEDEP}]
diff --git a/dev-python/u-msgpack-python/Manifest b/dev-python/u-msgpack-python/Manifest
new file mode 100644
index 000000000000..b5c610e840e1
--- /dev/null
+++ b/dev-python/u-msgpack-python/Manifest
@@ -0,0 +1 @@
+DIST u-msgpack-python-2.7.1.tar.gz 20631 BLAKE2B 10008f0653f969f1f5655c894be5b2497d692bf7ebf6d50de221695cab9c3a973c0870a8162efe6b61f2d9d4fb062c4130c07cddff8d64d6258d7d832efe4021 SHA512 0825b9edee28db2c954c9c0d64987a4640f11af52570c1ad834882a5fcd2e3a76eab3524cc3bb639cacfaf9eef27bf0a75656b4d02bca42b2d35b708348691d6
diff --git a/dev-python/u-msgpack/metadata.xml b/dev-python/u-msgpack-python/metadata.xml
index 03f8c778e488..03f8c778e488 100644
--- a/dev-python/u-msgpack/metadata.xml
+++ b/dev-python/u-msgpack-python/metadata.xml
diff --git a/dev-python/u-msgpack/u-msgpack-2.7.1.ebuild b/dev-python/u-msgpack-python/u-msgpack-python-2.7.1.ebuild
index 1a27c1f1d22c..eb54c02f7ab5 100644
--- a/dev-python/u-msgpack/u-msgpack-2.7.1.ebuild
+++ b/dev-python/u-msgpack-python/u-msgpack-python-2.7.1.ebuild
@@ -6,13 +6,9 @@ PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
 
 inherit distutils-r1
 
-MY_PN="${PN}-python"
-MY_P="${MY_PN}-${PV}"
-
 DESCRIPTION="A portable, lightweight MessagePack serializer and deserializer"
 HOMEPAGE="https://github.com/vsergeev/u-msgpack-python https://pypi.org/project/u-msgpack-python/"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/u-msgpack/Manifest b/dev-python/u-msgpack/Manifest
deleted file mode 100644
index bcda3df40825..000000000000
--- a/dev-python/u-msgpack/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST u-msgpack-2.7.1.tar.gz 20631 BLAKE2B 10008f0653f969f1f5655c894be5b2497d692bf7ebf6d50de221695cab9c3a973c0870a8162efe6b61f2d9d4fb062c4130c07cddff8d64d6258d7d832efe4021 SHA512 0825b9edee28db2c954c9c0d64987a4640f11af52570c1ad834882a5fcd2e3a76eab3524cc3bb639cacfaf9eef27bf0a75656b4d02bca42b2d35b708348691d6