Adding metadata

58 files changed, 391 insertions, 460 deletions

diff --git a/dev-python/Faker/Faker-8.10.1.ebuild b/dev-python/Faker/Faker-8.10.1.ebuild
new file mode 100644
index 000000000000..b9fd92931d21
--- /dev/null
+++ b/dev-python/Faker/Faker-8.10.1.ebuild
@@ -0,0 +1,28 @@
+# 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 610301785f92..655096277088 100644
--- a/dev-python/Faker/Manifest
+++ b/dev-python/Faker/Manifest
@@ -1,4 +1,5 @@
 DIST Faker-8.10.0.tar.gz 1149474 BLAKE2B 2a5304acb1ce88230660a468756ee79abc7ae0b6aeb850e3d05bb694cb9e5b596b1d9de4c8f1e82c208a3281efc026a290b6d96cd17bc6c523d22fcd61eaf756 SHA512 0d035663677bea9ef4a66c6f0cf5fb1e648e948deb4db07b352a8b8881f5774a9432524bef10e60f28d5d586ac66f0e207c3ad218edffd6071fa6ac614ac950b
+DIST Faker-8.10.1.tar.gz 1144158 BLAKE2B 7463566a8bf2f510ab89b7fd67ee3aea80ce65725063f83798a6f7ce959a1e5c4eef82504adc124add6ff028d6e248871123d0992f715d46485daa6d64d4179b SHA512 c5bb3b376757fe025255de67a184dfae959c834e937825515eaae083a2ce931f2c00ed1ade7ccba49adf182570cf533526e583e6a45c4fa08b41e22544139227
 DIST Faker-8.8.2.tar.gz 1148529 BLAKE2B 279984479ad4f790dc7acd74b5ccd1cf5f32689b8b1ccf2152d7dfaa6fc7b4699d9827c16f83bb86e298723b6906a5cc40c2fa7f75439b5af5fc78c1af99a3f6 SHA512 4273008bf9ab693a40da2f93ff1fe40e9e7b102a2d5439f09096b6754b82dc26310666da65723b363f628365c97d44dd290e1e7065b7a9d862130baa292325b7
 DIST Faker-8.9.0.tar.gz 1148829 BLAKE2B b24a7fa87886cb38850808de2ffe1ceafab3c548c694af30d53b1f415d329264fe7e53f33f46b913d16310dd83d95fe591689a308bb7d4c653254e39defaa24b SHA512 d2e26ae140c30ae8069f8e0fd75bb9bf54aa00a7271b327e37dd248520256e137d192082071bc36a584fc864c54c050107ddecb40624288636c6b41caf1ea574
 DIST Faker-8.9.1.tar.gz 1148890 BLAKE2B 2cab6461bf6067d9dfd8872c19c8c11fa25ffef82b61b7e7676ffc187346d228703424a73278678f19263423716c74ecd47cfc1c17bf54d38bba712e456650b8 SHA512 f7016b320c7394b0eccc06e833a80e227cdbad9c0f34eb9f8f4413f56a4743f58bbd7ec5eac3b8c0642e7764c6c5986707d493f0c84daa75575a12061631c9c5
diff --git a/dev-python/GitPython/GitPython-3.1.15.ebuild b/dev-python/GitPython/GitPython-3.1.15.ebuild
deleted file mode 100644
index 2e9bb94f11ce..000000000000
--- a/dev-python/GitPython/GitPython-3.1.15.ebuild
+++ /dev/null
@@ -1,59 +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} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-TEST_P=GitPython-${PV}
-GITDB_P=gitdb-4.0.5-r1
-SMMAP_P=smmap-3.0.4
-
-DESCRIPTION="Library used to interact with Git repositories"
-HOMEPAGE="https://github.com/gitpython-developers/GitPython https://pypi.org/project/GitPython/"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz
-	test? (
-		https://dev.gentoo.org/~mgorny/dist/${TEST_P}.gitbundle
-		https://dev.gentoo.org/~mgorny/dist/${GITDB_P}.gitbundle
-		https://dev.gentoo.org/~mgorny/dist/${SMMAP_P}.gitbundle
-	)"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	dev-vcs/git
-	>=dev-python/gitdb-4.0.1[${PYTHON_USEDEP}]
-	dev-python/typing-extensions[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		>=dev-python/ddt-1.1.1[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests unittest
-
-src_test() {
-	git config --global user.email "travis@ci.com" || die
-	git config --global user.name "Travis Runner" || die
-
-	git clone "${DISTDIR}/${TEST_P}.gitbundle" "${T}"/test || die
-	git clone "${DISTDIR}/${GITDB_P}.gitbundle" \
-		"${T}"/test/git/ext/gitdb || die
-	git clone "${DISTDIR}/${SMMAP_P}.gitbundle" \
-		"${T}"/test/git/ext/gitdb/gitdb/ext/smmap || die
-
-	cd "${T}"/test || die
-	TRAVIS=1 ./init-tests-after-clone.sh || die
-	cat test/fixtures/.gitconfig >> ~/.gitconfig || die
-	rm -r test/performance || die
-	# tests requiring network access
-	sed -i -e 's:test_fetch_error:_&:' test/test_remote.py || die
-	sed -i -e 's:test_leaking_password_in_clone_logs:_&:' test/test_repo.py || die
-	rm test/test_installation.py || die
-
-	distutils-r1_src_test
-}
diff --git a/dev-python/GitPython/GitPython-3.1.17.ebuild b/dev-python/GitPython/GitPython-3.1.17.ebuild
deleted file mode 100644
index 11206782aa26..000000000000
--- a/dev-python/GitPython/GitPython-3.1.17.ebuild
+++ /dev/null
@@ -1,66 +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} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-TEST_P=GitPython-${PV}
-GITDB_P=gitdb-4.0.7
-SMMAP_P=smmap-4.0.0
-
-DESCRIPTION="Library used to interact with Git repositories"
-HOMEPAGE="https://github.com/gitpython-developers/GitPython https://pypi.org/project/GitPython/"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz
-	test? (
-		https://dev.gentoo.org/~mgorny/dist/${TEST_P}.gitbundle
-		https://dev.gentoo.org/~mgorny/dist/${GITDB_P}.gitbundle
-		https://dev.gentoo.org/~mgorny/dist/${SMMAP_P}.gitbundle
-	)"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	dev-vcs/git
-	>=dev-python/gitdb-4.0.1[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	' python3_7)"
-BDEPEND="
-	test? (
-		>=dev-python/ddt-1.1.1[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests unittest
-
-src_test() {
-	git config --global user.email "travis@ci.com" || die
-	git config --global user.name "Travis Runner" || die
-
-	git clone "${DISTDIR}/${TEST_P}.gitbundle" "${T}"/test || die
-	git clone "${DISTDIR}/${GITDB_P}.gitbundle" \
-		"${T}"/test/git/ext/gitdb || die
-	git clone "${DISTDIR}/${SMMAP_P}.gitbundle" \
-		"${T}"/test/git/ext/gitdb/gitdb/ext/smmap || die
-
-	cd "${T}"/test || die
-	git rev-parse HEAD > .git/refs/remotes/origin/master || die
-	TRAVIS=1 ./init-tests-after-clone.sh || die
-	cat test/fixtures/.gitconfig >> ~/.gitconfig || die
-	rm -r test/performance || die
-	# tests requiring network access
-	sed -i -e 's:test_fetch_error:_&:' test/test_remote.py || die
-	sed -i -e 's:test_leaking_password_in_clone_logs:_&:' test/test_repo.py || die
-	# TODO
-	sed -e 's:test_root_module:_&:' \
-		-e 's:test_base_rw:_&:' \
-		-i test/test_submodule.py || die
-	rm test/test_installation.py || die
-
-	distutils-r1_src_test
-}
diff --git a/dev-python/GitPython/GitPython-3.1.18.ebuild b/dev-python/GitPython/GitPython-3.1.18.ebuild
index 11206782aa26..641701db97c7 100644
--- a/dev-python/GitPython/GitPython-3.1.18.ebuild
+++ b/dev-python/GitPython/GitPython-3.1.18.ebuild
@@ -23,7 +23,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-vcs/git
diff --git a/dev-python/GitPython/Manifest b/dev-python/GitPython/Manifest
index deef82c425c8..54af7688d54b 100644
--- a/dev-python/GitPython/Manifest
+++ b/dev-python/GitPython/Manifest
@@ -1,10 +1,4 @@
-DIST GitPython-3.1.15.gitbundle 4811422 BLAKE2B 16399b302f7f3f36b315bcaa1535992a43b02fd888586d135824f8f4dc5ba611875d68e6d3102d71edc93848a91d3b244176d6b735ef30d65fdf64c28d325ef9 SHA512 13064036f20aaa58cf7784a3a61ed9c9e08414e9126332fc629e976889c87a2a70b1c9270774df676dcc08ded0ee3629112c60b88025536a9d13a04491b7b1e2
-DIST GitPython-3.1.15.tar.gz 175132 BLAKE2B 5a0cc8176257a5fec9afbf81351da191fc70ad5678d3ee89d36807cdf01a7f69216916723ac551bcc29fbc07a88a9a0357d12d41b4f43888917bd45dd766328e SHA512 bee1e12625995a0264694796ec6f346a5258ec13c24517939e65eaf9b679d82afb7848c02e6222389609bdf3a0dccbce4af1bd59a5d12f2851da47878a21b210
-DIST GitPython-3.1.17.gitbundle 9249795 BLAKE2B 2c647de0e335d58d85eb5444e52f93adb13c5e2cf9a6272fa26a7fd68bc1f467ab2134ee88a4386af03b9816cd568b7366a202480ab0fd7540202b5757a7caf3 SHA512 576082e3f6f741183392e3fa51c3ed0f3c6de668562f07ead14500644afe01ea5d667a1c30f3a111326b3bcb320b42eadfeefb9eeccb699cb19661b330321a6b
-DIST GitPython-3.1.17.tar.gz 178303 BLAKE2B cc4a89c6d5ab8ae59439286ed4159aa4e6cc936e5ef011eecae2ba79010eb13a2e7e79635e1f89bfbc32dc58e4a6f11c9bb13f164d8111178b3302a2780d599c SHA512 c87d9de510f245a64d9df68f0e5c07744eef21669ef3beb81f2d0aefe4299f1cb4cfd2d37b87120b21781aea06fa9f8b2ccbfda1f2648c92cd9c73506b953ed4
 DIST GitPython-3.1.18.gitbundle 9129652 BLAKE2B df2ea8fa06d4209c532a239fa5bebde29314b467811526f67629f181a62b2b5ba235a3302b979dfd87993deca238a91820b3caa58fcb7cf3aaffc3bf76b0c731 SHA512 91fd937193db8a948fb575bf24a295c349e69b132128ed3b0c4fc3be89feb76ff47f31afe422c99ccbee4cf908b3040e9dd3f568db74785d12cf6cabbc356daa
 DIST GitPython-3.1.18.tar.gz 181199 BLAKE2B ac50cee78b5980c6d23ec60786e8d279558a2740480e0975c212de8d96abd58da95de8d66bc9c7c3f0c7d1baa1757460f36df53552b06bd6323d3f882d0b90ae SHA512 981b3f4eec71c4e1de6efa2381c3c411aedfc51918f9f58f397926d21dabdfabb54d498ae44a5b6ceca59adf99e866df8d04f97a86df942e81408a5a0e751a15
-DIST gitdb-4.0.5-r1.gitbundle 1499071 BLAKE2B e429014def18d645b7117b27f592ead9c518076eeee2f6cc42c4a231f9a4f61c8275ccb1def5d042d44f34863528570163e9e154bb1536a0917b10f135e2462c SHA512 6fcf345af9f72afa39f4ba931bf474b2596678f1b790e3d4e1e3f7420baafbad04689bcdee9e99407f7c2b1c6f0d36fcf524b408ceb37b95dc4980e9423b1ad7
 DIST gitdb-4.0.7.gitbundle 1498536 BLAKE2B 1e0aff67259c04d2932dbdefb0ae07bd9fb51c5dcb99ee8431e78bf428095250ed45f5e12e2484b407bb4257050b0864e67096b3501d4829491cb7714a7b5ddf SHA512 f8b1b3de00f0597d65f528dd30495fd3dd9e1e4d494987899ef2064d23947ede799db391a59688dfa27e4fcdc9379b5352a378b39e6fb2421e6c850f81157bec
-DIST smmap-3.0.4.gitbundle 276552 BLAKE2B 2d17b927b2c644d2f1984168ee99fe5a9a58392401ac0b2894a1d5e5f9c292f32311a7a5d7669bd93c642ff791f4801d61ef3236c1dafa1434e99a17fd8751f6 SHA512 6deb282c6ece3b556c59c458b5242ff362b903441db63c005a0ab1ac055b3f974f9b34f30e0a4a41ef9246696e08b191254f72db61a8f24d4eb2f0e48a08937b
 DIST smmap-4.0.0.gitbundle 322820 BLAKE2B 20ac688cafa9ad036f3e21ac1bb9323ae55e618eb0806634fe4c885d2b12fe802779adcffb0fea3da9707e94109a168738d63abe990d1ce9b141c779aa6798d6 SHA512 03296099303eb38ac9ca46733255024355aed2e64a2f9409552ae34af76beb9685a6dd2458df986593fe426e428bc184617abe22c8b92ee01c8c7e1d98de8592
diff --git a/dev-python/black/black-21.6_beta0.ebuild b/dev-python/black/black-21.6_beta0.ebuild
index 8b8c97be1e1f..46e66c90050d 100644
--- a/dev-python/black/black-21.6_beta0.ebuild
+++ b/dev-python/black/black-21.6_beta0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
 
 RDEPEND="
 	dev-python/appdirs[${PYTHON_USEDEP}]
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index e997e625e2df..07a68f5fc8c8 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -4,4 +4,5 @@ DIST boto3-1.17.106.tar.gz 388602 BLAKE2B f9cc023ce4c0810ea7eb004126941229536fc0
 DIST boto3-1.17.107.tar.gz 389348 BLAKE2B 8c0893d8ad73563f63254877621440ba24dac76c577f5684bc37b5f99b9111be209f69efa324cc079209340051230a43b66004d09ccd5804d631b0c04083c384 SHA512 450222507aa3bae8062b788ac7f637dbe8a5e7a5baa0f45001a74a810c2579927a7400cef180b57a7d7e57c391d665930b577b39272681ca380b5e553385b1f8
 DIST boto3-1.17.108.tar.gz 389871 BLAKE2B 964ff0b2d7a437c569e2b19f5c24d228df6595f15d72350b2cae0cb43c5e1f4d8376c0a25ec393a0a0f085650b193afc852fef59d258dd1c3addbfff4c27ce62 SHA512 4b78af4e59f399aa022762b6d1dc14252d4f549cdbb9264e5762a927b3a7e391d336ca48d938b1245ceaaa243ec01ea642545bc97abe5f7a3f8f8774ee21e2ce
 DIST boto3-1.17.109.tar.gz 390366 BLAKE2B f39548e623fc65907b13d7d5ba8a16034e5f741a3343ef69e52984a2417b4fcf8c21cdd49854222781a41aef0e26a7ffeb38c7a2dc600321ef6e7574f43e785e SHA512 4e13a99db4be8d61b217afc9bf4626ae5e6be524684581d74b7d7ce180c8d74716a0ef196ab6b91a7ef6fa56a57887e6ab0d05da380ebf8ae5bb915ac1a844b2
+DIST boto3-1.17.110.tar.gz 390476 BLAKE2B ffe9da7e57a44b673c5f29a0b1c711d63d706c3c68459c89d2aabb3d2ac45730f52e49d73300bcbe6edc53bd1d51d79c1168cb1fc71411bd070a1efe99019200 SHA512 7d2307a66a1469b43f166c7458efc326b2158ce16b306c2637f4126ba99cf6880080d78f87c5952c2807445039746d86d62e368a4895efe3bace5dd2ce70dd49
 DIST boto3-1.17.97.tar.gz 383223 BLAKE2B 1a1b4e9f2c51d830762f27cf3e30038efb88322e300ac304d1cb88d5b7efc6af35ad9810cea7292c9807dcdfedb11ba039ee6d5dbb9162f2a1c6d6936ef75bcc SHA512 e74a59763cc9b8a51fd09121a790d29a7291d9380d4451c2e6af90902f18415a3780eeea7f7d63e052b295792b92c3cdd3b8597f7013241ebbbdb7e418cf73ce
diff --git a/dev-python/boto3/boto3-1.17.110.ebuild b/dev-python/boto3/boto3-1.17.110.ebuild
new file mode 100644
index 000000000000..8e0f2cecffd7
--- /dev/null
+++ b/dev-python/boto3/boto3-1.17.110.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="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 7016ad7dfce6..d52b40fa766a 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -4,4 +4,5 @@ DIST botocore-1.20.106.tar.gz 7885164 BLAKE2B 3fa8b860a40a0915f6a59912fdee7b9e55
 DIST botocore-1.20.107.tar.gz 7893209 BLAKE2B 4e4882efef667ae91bb3e42a84748609390ef637d0a72a0b8b9dbab83a55cac9117553a0ef34bd38af98493d0972fd6178b322207c71914068eb3c634debaae9 SHA512 09c7a4bc4fab922aa7dbe94fcc0da6a462dbd90bdd51e8612431e5a790b46c56eab3b436048572a4a14c6ed2417ddca8efa52474d28fbe32558550c44b3fe0dd
 DIST botocore-1.20.108.tar.gz 7897833 BLAKE2B 3b4ee27640dbfce1c9923137ef21500649454eba8e1a5b569fb0d949253e619852b61344ff86c769e2f2314a089047fe9590a685982491b21f4f7feb0a33b220 SHA512 a394fa8fc686d07ad5e1a25f0403d4adf53aa6af565696c4bd5aab58ee8f739b761f4c8058263a05b028175d1256ab87fa7fae3035cee605f236749939cc0eab
 DIST botocore-1.20.109.tar.gz 7900306 BLAKE2B 1f2009ccb236ff7b4d9d3b45b34b2295c9bbbd4bce207c51514bf3f568985eb3d5fedaf0e5309266f46ad1e42466524d148d601452474b738b53c329f0164a84 SHA512 7f266b2395f79bfa629ac147abbf646bf049ea78b208228b3817912626845fffac9c89419c75444116ae6f14067805e291faeb942e6d25061d2e6f1c382d762e
+DIST botocore-1.20.110.tar.gz 7904149 BLAKE2B f503e9d4876820f669bd4ae12603498fe0a310fddd7a7c739a53b804391657c48144c43c2dd3606932c7e457d1e2324a5dba4885e93eaf7526d46080b565c6d8 SHA512 e33d8e9dbd212d06644882e60c9b6f2754a549727a22d73814798230561b3d766524f0a32b49cce8ac68c1cb47e58eab7047abe75bf7c37ef7b6857dd81d2dbc
 DIST botocore-1.20.97.tar.gz 7846552 BLAKE2B da0355cc229ba8a0632f67866bf06b27d7b257184b53670e5dc183c6b5a1f4d3a34145de0a3f04abd2adc08de3f0775e3c7e0dbecae729acb5bc05c7ce9acaf2 SHA512 7411d5de8ecf0c42c0142ded036189dcf378cd16f761071beb5bc2a2c240eabb0c4a8c669ce89a5b4e798a0aae92f0e67755627c2a84df77fc2e9557265a4e3b
diff --git a/dev-python/botocore/botocore-1.20.110.ebuild b/dev-python/botocore/botocore-1.20.110.ebuild
new file mode 100644
index 000000000000..5684261bd4b3
--- /dev/null
+++ b/dev-python/botocore/botocore-1.20.110.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/cairocffi/cairocffi-1.2.0.ebuild b/dev-python/cairocffi/cairocffi-1.2.0.ebuild
index 81df394ac4fb..ba95491bcbda 100644
--- a/dev-python/cairocffi/cairocffi-1.2.0.ebuild
+++ b/dev-python/cairocffi/cairocffi-1.2.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-python/dj-email-url/dj-email-url-1.0.2.ebuild b/dev-python/dj-email-url/dj-email-url-1.0.2.ebuild
index 80cc346c9197..4b740b657749 100644
--- a/dev-python/dj-email-url/dj-email-url-1.0.2.ebuild
+++ b/dev-python/dj-email-url/dj-email-url-1.0.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/migonzalvar/dj-email-url/archive/refs/tags/v${PV}.ta
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 DOCS=( CHANGELOG.rst README.rst )
 
diff --git a/dev-python/dj-search-url/dj-search-url-0.1.ebuild b/dev-python/dj-search-url/dj-search-url-0.1.ebuild
index e38d9a5aa52e..667c36e95e0c 100644
--- a/dev-python/dj-search-url/dj-search-url-0.1.ebuild
+++ b/dev-python/dj-search-url/dj-search-url-0.1.ebuild
@@ -14,4 +14,4 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
diff --git a/dev-python/django-cache-url/django-cache-url-3.2.3.ebuild b/dev-python/django-cache-url/django-cache-url-3.2.3.ebuild
index b370d86eb87a..6cf8cba65c84 100644
--- a/dev-python/django-cache-url/django-cache-url-3.2.3.ebuild
+++ b/dev-python/django-cache-url/django-cache-url-3.2.3.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 DOCS=( AUTHORS.rst CHANGELOG.rst README.rst )
 
diff --git a/dev-python/django-configurations/django-configurations-2.2.ebuild b/dev-python/django-configurations/django-configurations-2.2.ebuild
index 021d18b84f57..38e469fd8acd 100644
--- a/dev-python/django-configurations/django-configurations-2.2.ebuild
+++ b/dev-python/django-configurations/django-configurations-2.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/eventlet/Manifest b/dev-python/eventlet/Manifest
index c885f11deda6..283f64d93c09 100644
--- a/dev-python/eventlet/Manifest
+++ b/dev-python/eventlet/Manifest
@@ -1,3 +1,4 @@
 DIST eventlet-0.30.0.tar.gz 401035 BLAKE2B 94a272ce810b28c00fc8a468f160e38f3c58c98750455e5eb096c266c46257a7e30e0278a6a8f509e47e6ab40297129ccf52b347a723037f9cc9b85a3e06a203 SHA512 c2ba283063333e9e74536dcda33276f98f74051ea0e9c8669506d2e3b11715f37cd5963af6130f14761a42cc6c8346e59c756efe2cef0ea3547dc30ccb8bf0fb
 DIST eventlet-0.30.2.tar.gz 401552 BLAKE2B 89291efde90d106a96eebd4ea4a892eeb005d6850262b28f7a4508f4f3ccfb9b49dc392dcb6eb0cf20c5d171d26d2a6639627188c97123546162e4e8c61c464d SHA512 af31a7b126f2120dd77699dcf25c7134af1bcf664f40b2422238a3d2120457d5a4d5764e23016ce209882a8b888f94d2776fe194c33092f4a33111b2ac8f0cf1
 DIST eventlet-0.31.0.tar.gz 402530 BLAKE2B d4d5983b22d04fbd6102b7e1ebe58c6e23cba04968478808445d946a3d8fc9ee0b668e83321397163d507cacf58f0cdd8547b0fb2649bad23819fbee0a6cc5ad SHA512 1721ec5d3c6c02361a5993237426d0466d87327e3d429d7b9f20d3466eebf08c60e57a2b1ab133956fe508835e5e84c52317aa51f962e8487f22a6207bbbfcf8
+DIST eventlet-0.31.1.tar.gz 412021 BLAKE2B 6358dca8e0a766f0cc2cef37586a8d38f5d87f03d8389a7cc11b3d2d616669825df2a416ae980eed8a980f8e81ce8b2848225921bb4536f5537a7954ed75fb64 SHA512 c240a332aaf8eeb4af429d1b190ae198b4bcb92ae1bc38ade3f824634327872526267c6ff02f7196e3f9dfd17d639af500c28a3ed70a773b1b050d6d967a88a5
diff --git a/dev-python/eventlet/eventlet-0.31.1.ebuild b/dev-python/eventlet/eventlet-0.31.1.ebuild
new file mode 100644
index 000000000000..b897b626551d
--- /dev/null
+++ b/dev-python/eventlet/eventlet-0.31.1.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
+
+DESCRIPTION="Highly concurrent networking library"
+HOMEPAGE="https://pypi.org/project/eventlet/ https://github.com/eventlet/eventlet/"
+SRC_URI="mirror://pypi/e/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="examples"
+
+RDEPEND="
+	>=dev-python/dnspython-1.15.0[${PYTHON_USEDEP}]
+	<dev-python/dnspython-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	virtual/python-greenlet[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/eventlet-0.25.1-tests.patch"
+	"${FILESDIR}/eventlet-0.30.0-tests-socket.patch"
+	"${FILESDIR}/eventlet-0.30.2-test-timeout.patch"
+)
+
+distutils_enable_tests nose
+
+python_test() {
+	unset PYTHONPATH
+	export TMPDIR="${T}"
+	nosetests -v -x || die
+}
+
+python_install_all() {
+	if use examples; then
+		docompress -x "/usr/share/doc/${PF}/examples"
+		docinto examples
+		dodoc -r examples/.
+	fi
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/ghp-import/ghp-import-2.0.1.ebuild b/dev-python/ghp-import/ghp-import-2.0.1.ebuild
index 81a75df35f9f..f4d45816ecb8 100644
--- a/dev-python/ghp-import/ghp-import-2.0.1.ebuild
+++ b/dev-python/ghp-import/ghp-import-2.0.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	>=dev-python/python-dateutil-2.8.1[${PYTHON_USEDEP}]
diff --git a/dev-python/greenlet/greenlet-1.1.0.ebuild b/dev-python/greenlet/greenlet-1.1.0.ebuild
index 9ff58b0bfde8..d7f93804baf4 100644
--- a/dev-python/greenlet/greenlet-1.1.0.ebuild
+++ b/dev-python/greenlet/greenlet-1.1.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 -hppa -ia64 ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 -hppa -ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 distutils_enable_sphinx docs
 distutils_enable_tests unittest
diff --git a/dev-python/hvac/Manifest b/dev-python/hvac/Manifest
index de27c76df106..244badeebc49 100644
--- a/dev-python/hvac/Manifest
+++ b/dev-python/hvac/Manifest
@@ -4,3 +4,4 @@ DIST hvac-0.10.13.tar.gz 301612 BLAKE2B 1b3524f72b54bf6fdfde6c02ecae8f16e32363be
 DIST hvac-0.10.14.tar.gz 301617 BLAKE2B b3d721b245b9f7b0e8aa5404599da8f3fde3fe10a5b3d70cf1831faeaecc6e1c42f0228c2511eb8d24ef56fbb2a971487b0707a1640e3a48bf01d3e4811992e8 SHA512 3b3b5c64df5c57679a35e09cd61d29090c950dfaa11f64b4c3f8442a3ccf6512cc2d792f60e035815e4c4857813ba49612e0f52c5da3670bd692116a6bd28469
 DIST hvac-0.10.8.tar.gz 290963 BLAKE2B 539e604d2c0476c3f8bd9bf9e803f2d7c6ea8671cd86ef650a7a3e615fa3461135e956726a869fa8b9c1883b70c11eaa51f28e6d07f284dbb43b51a696dd9958 SHA512 010a851c39bdc4d420343fa42aef5cd7faa073c11bf1507fc563791b8c93e85367b2081d573123acccd467881bccb9f9f33487551cac763d91ee7e5341ea5568
 DIST hvac-0.10.9.tar.gz 291045 BLAKE2B 63c48b21e402a1af3f73e5b295061a2f82040cedd412fab69e8759e290a46eb67d1aa0ddaeb40c1638eefbc492441e238cbe4be114093015af6eabd99a0c0a75 SHA512 4af23583110ca4c2c9714f5234daf21ee199c2ac97cde01a220db6f5d89957b95c1e8b84904104e5a96ec39b54cea567973427a73ed7cae5806e794d37403a8d
+DIST hvac-0.11.0.tar.gz 306753 BLAKE2B 0300705044f6575ffeb9fa3dc28d6ee1139b6ce84f52b89920606b603355530823a1f2ec8ac251423c5a0305f3ea1ae15933e84dddb2e09c5d7880b5c0508ec8 SHA512 47226ba5113a4df48f115d02d2fb1fa7ab8b42895d38f7fad37c84814db71a57f4e455a9b46134bb577fbded1881e6272464b9f1d1d74142dc089bde03b0eba9
diff --git a/dev-python/hvac/hvac-0.11.0.ebuild b/dev-python/hvac/hvac-0.11.0.ebuild
new file mode 100644
index 000000000000..0984e346b63f
--- /dev/null
+++ b/dev-python/hvac/hvac-0.11.0.ebuild
@@ -0,0 +1,49 @@
+# 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="hashicorp vault client in python"
+HOMEPAGE="https://github.com/hvac/hvac"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/hvac/hvac.git"
+else
+	SRC_URI="https://github.com/hvac/hvac/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+BDEPEND="
+	test? (
+		dev-python/flask-sqlalchemy[${PYTHON_USEDEP}]
+		dev-python/jwcrypto[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/parameterized[${PYTHON_USEDEP}]
+		dev-python/python-jwt[${PYTHON_USEDEP}]
+		dev-python/requests-mock[${PYTHON_USEDEP}]
+		dev-python/semantic_version[${PYTHON_USEDEP}]
+		dev-python/werkzeug[${PYTHON_USEDEP}]
+	)"
+RDEPEND="
+	>=dev-python/pyhcl-0.4.4[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.24.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.15.0[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local ignore=(
+		# ldap_test is not packaged.
+		tests/integration_tests/api/auth_methods/test_ldap.py
+		# https://github.com/lepture/authlib is not packaged.
+		tests/integration_tests/api/auth_methods/test_oidc.py
+	)
+
+	epytest ${ignore[@]/#/--ignore }
+}
diff --git a/dev-python/mergedeep/mergedeep-1.3.4.ebuild b/dev-python/mergedeep/mergedeep-1.3.4.ebuild
index be5281ecea40..49b501b25314 100644
--- a/dev-python/mergedeep/mergedeep-1.3.4.ebuild
+++ b/dev-python/mergedeep/mergedeep-1.3.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/clarketm/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 distutils_enable_tests pytest
 distutils_enable_sphinx docs/source dev-python/alabaster dev-python/recommonmark
diff --git a/dev-python/micawber/Manifest b/dev-python/micawber/Manifest
index eeb3f632c5f1..c3ca70a80aae 100644
--- a/dev-python/micawber/Manifest
+++ b/dev-python/micawber/Manifest
@@ -1 +1,2 @@
 DIST micawber-0.5.3.tar.gz 34550 BLAKE2B 045eebd018d8b1f52cca9f043cfbc8de528a409e42ad9f785cfa00bbe223546c98d2d182ed2dca0047b3e73428b318e8db712466813a781154a8a6654d8cb9a4 SHA512 7b5c7e3bb5d92a50a3488229c59c5ae95355410cc0aacd49be2d96372a2d6ab9169aa6ab066d49c72e6a8b80358b3937b358c4bb8027779c5132f0929747dde8
+DIST micawber-0.5.4.tar.gz 34963 BLAKE2B 1c311e2d1c8f32f81be466893bf1eb34f8c38901b168a97c88f2043aba1624fa8b6d12460c7470c3bbd720ae29af23ab808a9464b13ebf5ec193f5818b6f3aa1 SHA512 26879174071256fd3f95e92b0ea01b11a44eab767aa7bb43ff62221212ea0ab1ad33b67060e2dec33963abad599b864573f6a9d5a98fcd8f1a6633a3c73d7c80
diff --git a/dev-python/micawber/micawber-0.5.4.ebuild b/dev-python/micawber/micawber-0.5.4.ebuild
new file mode 100644
index 000000000000..ab1305932e29
--- /dev/null
+++ b/dev-python/micawber/micawber-0.5.4.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+inherit distutils-r1
+
+DESCRIPTION="A small library for extracting rich content from urls"
+HOMEPAGE="https://github.com/coleifer/micawber/"
+SRC_URI="https://github.com/coleifer/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	test? (
+		$(python_gen_impl_dep sqlite)
+		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+		dev-python/django[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	"${EPYTHON}" runtests.py || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/mkdocs-redirects/mkdocs-redirects-1.0.3.ebuild b/dev-python/mkdocs-redirects/mkdocs-redirects-1.0.3.ebuild
index 1abe88d37668..41c4157bd386 100644
--- a/dev-python/mkdocs-redirects/mkdocs-redirects-1.0.3.ebuild
+++ b/dev-python/mkdocs-redirects/mkdocs-redirects-1.0.3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	>=dev-python/mkdocs-1.0.4[${PYTHON_USEDEP}]
diff --git a/dev-python/mkdocs/mkdocs-1.2.1.ebuild b/dev-python/mkdocs/mkdocs-1.2.1.ebuild
index 2898c61db8e6..4942349de282 100644
--- a/dev-python/mkdocs/mkdocs-1.2.1.ebuild
+++ b/dev-python/mkdocs/mkdocs-1.2.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 IUSE="doc"
 
diff --git a/dev-python/numpy/numpy-1.20.3-r1.ebuild b/dev-python/numpy/numpy-1.20.3-r1.ebuild
index 37def6fd1eac..227a0eedc602 100644
--- a/dev-python/numpy/numpy-1.20.3-r1.ebuild
+++ b/dev-python/numpy/numpy-1.20.3-r1.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 	)"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc lapack"
 
 RDEPEND="
diff --git a/dev-python/oauthlib/Manifest b/dev-python/oauthlib/Manifest
index 68ed6914b737..9f074dfca091 100644
--- a/dev-python/oauthlib/Manifest
+++ b/dev-python/oauthlib/Manifest
@@ -1,2 +1 @@
-DIST oauthlib-3.1.0.tar.gz 155362 BLAKE2B 83e9331589305c85acc755f9c4dab8558a19aa247aff5be0fe6c51d047fb9e96b64f17d07a3e33378f6ebc73a283e0162bab56e110aca581f73b628544042600 SHA512 c295de232e0215532c501d8f0803bd501a15fe89a746179ba4facca878e4927c8c05f07825f483c4a846922fb49d6d89f559a8b49bb72b19903f902d772b790e
 DIST oauthlib-3.1.1.tar.gz 161395 BLAKE2B bc127841a16429364191a69777741135594366a5c99b32f063ce9bec4b6a3e9b7eb67515aee4da37f26cc2e8b2a2450fc708a21da7e4944861b9adbd9e112018 SHA512 1c18f265a6017a6f2bf77507f5de095b439be36f309316993b547ded0f306461b058dcb85dc245bf26f65a9c77be44ca38f9053f3300a9b5cb92332b61a7f307
diff --git a/dev-python/oauthlib/oauthlib-3.1.0.ebuild b/dev-python/oauthlib/oauthlib-3.1.0.ebuild
deleted file mode 100644
index 14f391cfc512..000000000000
--- a/dev-python/oauthlib/oauthlib-3.1.0.ebuild
+++ /dev/null
@@ -1,29 +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="Spec-compliant and thorough implementation of the OAuth request-signing logic"
-HOMEPAGE="https://github.com/oauthlib/oauthlib https://pypi.org/project/oauthlib/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
-
-# optional extras hard set as RDEPs. See setup.py
-RDEPEND="
-	>=dev-python/pyjwt-1.0.0[${PYTHON_USEDEP}]
-	dev-python/blinker[${PYTHON_USEDEP}]
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests unittest
diff --git a/dev-python/oauthlib/oauthlib-3.1.1.ebuild b/dev-python/oauthlib/oauthlib-3.1.1.ebuild
index 8d9520dd3aa5..14f391cfc512 100644
--- a/dev-python/oauthlib/oauthlib-3.1.1.ebuild
+++ b/dev-python/oauthlib/oauthlib-3.1.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 
 # optional extras hard set as RDEPs. See setup.py
 RDEPEND="
diff --git a/dev-python/py-cpuinfo/py-cpuinfo-8.0.0.ebuild b/dev-python/py-cpuinfo/py-cpuinfo-8.0.0.ebuild
index 627b31f70f6c..f5b1323ec299 100644
--- a/dev-python/py-cpuinfo/py-cpuinfo-8.0.0.ebuild
+++ b/dev-python/py-cpuinfo/py-cpuinfo-8.0.0.ebuild
@@ -14,6 +14,6 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 
 distutils_enable_tests setup.py
diff --git a/dev-python/pycairo/pycairo-1.20.1.ebuild b/dev-python/pycairo/pycairo-1.20.1.ebuild
index 255817da3c92..d33f85872d58 100644
--- a/dev-python/pycairo/pycairo-1.20.1.ebuild
+++ b/dev-python/pycairo/pycairo-1.20.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/pygobject/${PN}/releases/download/v${PV}/${P}.tar.gz
 
 LICENSE="|| ( LGPL-2.1 MPL-1.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"
 IUSE="examples"
 
 BDEPEND="
diff --git a/dev-python/pycxx/Manifest b/dev-python/pycxx/Manifest
index 3dd4e917655c..bd8fdd9c4a29 100644
--- a/dev-python/pycxx/Manifest
+++ b/dev-python/pycxx/Manifest
@@ -1,2 +1 @@
-DIST pycxx-7.1.2.tar.gz 150865 BLAKE2B bbf78d88ca13fafee1239c354167b56cef2f1d56d20b0fc81d9a5d7d82096ab5d6a88802f411719cc490179314f87ef89b1e53c2b8a3a784566f9ff9d16d7cc8 SHA512 67f8d8d1ec6ce63c39695cd56c3276767d5cb4b6cc2fcf7daf5aea4bac11114f5a1fa4784ecdb35be708859cf07fc88c8e9f00b7fc808169708fd0eef1056a63
 DIST pycxx-7.1.5.tar.gz 156343 BLAKE2B 099de7f88c19ec86aea67b503e6fbdc0df66bbdd3bdc0ff7f8ce77425be9486e6abebed8548f9ac764688a85e62cda77d3832f460e5678b4c07b1c6d2123b257 SHA512 0f980298739886d0c05ddd5ee23ebb234014b8276d811e62dc5b0a738666c6a011ad3f4aeeb7b1b404d8bff87dddfc30f68eec9c6bd13d5f262a2f7c53e273be
diff --git a/dev-python/pycxx/pycxx-7.1.2-r2.ebuild b/dev-python/pycxx/pycxx-7.1.2-r2.ebuild
deleted file mode 100644
index b38289822e2d..000000000000
--- a/dev-python/pycxx/pycxx-7.1.2-r2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-DISTUTILS_USE_SETUPTOOLS=no
-inherit distutils-r1
-
-DESCRIPTION="Set of facilities to extend Python with C++"
-HOMEPAGE="https://sourceforge.net/projects/cxx/"
-SRC_URI="mirror://sourceforge/cxx/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
-IUSE="doc examples"
-
-python_prepare_all() {
-	# Without this, pysvn fails.
-	# Src/Python3/cxxextensions.c: No such file or directory
-	sed -e "/^#include/s:Src/::" -i Src/*.{c,cxx} || die "sed failed"
-
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( Doc/. )
-	if use examples ; then
-		docinto examples
-		dodoc -r Demo/Python{2,3}/.
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pycxx/pycxx-7.1.5.ebuild b/dev-python/pycxx/pycxx-7.1.5.ebuild
index f964d3029c70..b38289822e2d 100644
--- a/dev-python/pycxx/pycxx-7.1.5.ebuild
+++ b/dev-python/pycxx/pycxx-7.1.5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/cxx/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="doc examples"
 
 python_prepare_all() {
diff --git a/dev-python/pygit2/Manifest b/dev-python/pygit2/Manifest
index 56186c75db2e..45f21fdd55d3 100644
--- a/dev-python/pygit2/Manifest
+++ b/dev-python/pygit2/Manifest
@@ -1,3 +1 @@
-DIST pygit2-1.5.0.tar.gz 255958 BLAKE2B 696a4c39920e7f66962b69d2a838c55bfb6f96e7e5ee56a39aaa732926accc3bb6331042382fd22f377959cbc129be0320d94765d13db95fdb7c7f87a14f7608 SHA512 3f915c855ad08641391565906023d231550a38d4e7f8938fad4634a30e2ee1c81e2a0d3289052426e21d2c14814300a0f789eaaa9f3e62c3ece73cf53803bb80
-DIST pygit2-1.6.0.tar.gz 265798 BLAKE2B 8244cbcecdd9b9edcb8fb0cfbc2024f1d36a01c8a3e519e05770ca80d7a482393892bcbd4a61402e7622b84f02909a2a36b9767273d6322a94a15eb974fdb8fa SHA512 c051ce09d227b6ec0c7d3068b5b0220f5c150936d788462dfb3236c97954f9b76f6a1fd61cd42e604810582e3d1a5bc8784fc51c9fedac66ad1b42af580af494
 DIST pygit2-1.6.1.tar.gz 258338 BLAKE2B dc223e2a5231728c42ca7e0581483731fbab6ee090cf4aeeb27f186973b3c753fdf54c89679a88b97d834d717135f9b8f9a2adf492ed8572affa938c79d0f905 SHA512 67a78313493ba096cbae6805bda861495f33644fd180b5fb1cd99dcd226ef5a09ee85bd27d04d0697ef15503a4e902aa1384980870551f430fd9560ac949fe2f
diff --git a/dev-python/pygit2/pygit2-1.5.0.ebuild b/dev-python/pygit2/pygit2-1.5.0.ebuild
deleted file mode 100644
index 7cc0051bb3bf..000000000000
--- a/dev-python/pygit2/pygit2-1.5.0.ebuild
+++ /dev/null
@@ -1,40 +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 bindings for libgit2"
-HOMEPAGE="https://github.com/libgit2/pygit2 https://pypi.org/project/pygit2/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2-with-linking-exception"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	=dev-libs/libgit2-1.1*
-	dev-python/cached-property[${PYTHON_USEDEP}]
-	>=dev-python/cffi-1.0:=[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	distutils-r1_src_prepare
-
-	# unconditionally prevent it from using network
-	sed -i -e '/has_network/s:True:False:' test/utils.py || die
-
-	# we need to move them away to prevent pytest from forcing '..'
-	# for imports
-	mkdir hack || die
-	mv test hack/ || die
-	ln -s hack/test test || die
-}
-
-python_test() {
-	pytest -vv hack/test || die
-}
diff --git a/dev-python/pygit2/pygit2-1.6.0.ebuild b/dev-python/pygit2/pygit2-1.6.0.ebuild
deleted file mode 100644
index fde46352e44b..000000000000
--- a/dev-python/pygit2/pygit2-1.6.0.ebuild
+++ /dev/null
@@ -1,40 +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 bindings for libgit2"
-HOMEPAGE="https://github.com/libgit2/pygit2 https://pypi.org/project/pygit2/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2-with-linking-exception"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	=dev-libs/libgit2-1.1*
-	dev-python/cached-property[${PYTHON_USEDEP}]
-	>=dev-python/cffi-1.0:=[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	distutils-r1_src_prepare
-
-	# unconditionally prevent it from using network
-	sed -i -e '/has_network/s:True:False:' test/utils.py || die
-
-	# we need to move them away to prevent pytest from forcing '..'
-	# for imports
-	mkdir hack || die
-	mv test hack/ || die
-	ln -s hack/test test || die
-}
-
-python_test() {
-	pytest -vv hack/test || die
-}
diff --git a/dev-python/pygit2/pygit2-1.6.1.ebuild b/dev-python/pygit2/pygit2-1.6.1.ebuild
index 4e262b4949e4..7cc0051bb3bf 100644
--- a/dev-python/pygit2/pygit2-1.6.1.ebuild
+++ b/dev-python/pygit2/pygit2-1.6.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2-with-linking-exception"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	=dev-libs/libgit2-1.1*
diff --git a/dev-python/pytest-django/pytest-django-4.4.0.ebuild b/dev-python/pytest-django/pytest-django-4.4.0.ebuild
index c7fc182c83b7..ae4df90cfa1d 100644
--- a/dev-python/pytest-django/pytest-django-4.4.0.ebuild
+++ b/dev-python/pytest-django/pytest-django-4.4.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 		-> ${P}.gh.tar.gz"
 
 LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 SLOT="0"
 
 RDEPEND="
diff --git a/dev-python/python-backoff/Manifest b/dev-python/python-backoff/Manifest
index 328926a5063f..7fe0f1be42d0 100644
--- a/dev-python/python-backoff/Manifest
+++ b/dev-python/python-backoff/Manifest
@@ -1 +1,2 @@
 DIST python-backoff-1.10.0.gh.tar.gz 15546 BLAKE2B 4e2ff1f63a4659c9dbf3135f32da44d4c127909178ffe0fe6935cef43558d61087498d0cd31260396da0ccdff360ee1025db2c0347fb865468abffed2f4adf49 SHA512 9a874a12462c56e8559d2d3d85508f546c397c9d419d1d9ab81d9a046d27b338068f6baeb768fa78b43eccd299de71ec7d1471c4fb153f8c02e6f7292f56b285
+DIST python-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/python-backoff/python-backoff-1.11.0.ebuild
new file mode 100644
index 000000000000..e8b72aa45034
--- /dev/null
+++ b/dev-python/python-backoff/python-backoff-1.11.0.ebuild
@@ -0,0 +1,25 @@
+# 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=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"
+KEYWORDS="~amd64 ~x86"
+
+DOCS=( README.rst )
+
+BDEPEND="test? ( dev-python/pytest-asyncio[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pyyaml_env_tag/pyyaml_env_tag-0.1.ebuild b/dev-python/pyyaml_env_tag/pyyaml_env_tag-0.1.ebuild
index 18ac2448e2b3..6791c5317f00 100644
--- a/dev-python/pyyaml_env_tag/pyyaml_env_tag-0.1.ebuild
+++ b/dev-python/pyyaml_env_tag/pyyaml_env_tag-0.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	dev-python/pyyaml[${PYTHON_USEDEP}]
diff --git a/dev-python/rich/Manifest b/dev-python/rich/Manifest
index 311da1ffda86..3b08a62b6bc9 100644
--- a/dev-python/rich/Manifest
+++ b/dev-python/rich/Manifest
@@ -1,3 +1,4 @@
 DIST rich-10.3.0.tar.gz 16237609 BLAKE2B ddac8f2ed7b3b39e647179cd03cf59994729d7d82bdfad6670284a692871b79f2f6ceb86fae0d47d76401f756c122ebcb5978d241d4a95b4f3d6c54de67132a1 SHA512 91886b19c91052a7fe24fb9ae8c98a59f882e6c387036420f17a4867f581e71839b990541fcedf7831d361a9cb535f05c13e45bf5505a4d1fcdc0d0f8e8b39c8
 DIST rich-10.4.0.tar.gz 16240850 BLAKE2B 76874e3efd9a8d696ba96579e1c658b1c76e71d353574cf3f9fb5d8a15810879f649d0ebfcbd1d72d9d496ce438cc08099b5d0416b932875704be2d0b4b28d0a SHA512 ecf6234ac862c1e04ab71c39763857d770c20200f5e1903a7d8e90fc1a67b5702a9eb0c67454ca48fb786a7631f60401f0a3299e82d864eca8c7afefedf21e26
 DIST rich-10.5.0.tar.gz 16242786 BLAKE2B d4d612555f9dca24b5150f5502d95bede784d7e6481e15948614de15a914d0cb3c83b64148a02db4ce8693feb1604c3729006fc0ca347eb10313aedcb795feca SHA512 c0471c0f35d3d9e5b5baf5798911073de02820a5bb5dcf42324bef2153a49a3019db44bc96b95247defe3be65f18097fc266a30bdeab153d9dda0ae38d34a79b
+DIST rich-10.6.0.tar.gz 16244447 BLAKE2B 79012a211e8f5510fd4cf0f2580971c51fee17a1e38905abc8227ba07eed1f2d25b7c356ecc907043a9e1898245cb6927cf226218c0ba20344865c1cd0a4a160 SHA512 59b777ef0fe3efe67138a7dbfc0c4e813b0a8c3d46adc6526b07241483919e0f71b478c0a66f3e0c207fcebdc0d639b7acf989ebf914c0e0fb6953029f0c9a16
diff --git a/dev-python/rich/rich-10.6.0.ebuild b/dev-python/rich/rich-10.6.0.ebuild
new file mode 100644
index 000000000000..d15cd9f18c9a
--- /dev/null
+++ b/dev-python/rich/rich-10.6.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 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=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 ~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/sqlalchemy/sqlalchemy-1.4.18.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.18.ebuild
index 0f3821dd32e7..ec68c9ac57fe 100644
--- a/dev-python/sqlalchemy/sqlalchemy-1.4.18.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-1.4.18.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="examples +sqlite test"
 
 RDEPEND="
diff --git a/dev-python/stripe/Manifest b/dev-python/stripe/Manifest
index e9b79d40f9e4..782c3c6c2201 100644
--- a/dev-python/stripe/Manifest
+++ b/dev-python/stripe/Manifest
@@ -1,4 +1,2 @@
-DIST stripe-2.56.0.tar.gz 216066 BLAKE2B 1473c0b5a0f53cea18120b6234ed7f310c3625592423f16e77ca3a87c8a79f61c19c0c5f09d071a2be84e4f0d8b5323cc9f1de2e24a74bd24e557c9eb48b2c38 SHA512 1f2f08b5425ad48df9afc78f574109604319ccfcdb2fba8ca574008de5dadb349eec84d0e6cf532c57218bc8624af9b256a29ef01facb950a3cfd1168d8c2660
-DIST stripe-2.57.0.tar.gz 216286 BLAKE2B 9f2c3b7d4ae3f100647a1cae32d09f258703890eb97637ab2a9d3fc1d2fc30eae7042e4245d8f62a5cb4a5226337a7b22813d992842326aaa57d7ecb3a1da200 SHA512 c63efabc8febe79a01167ad4c166d9498f8623a3b1d36c292a3554cbacfc6aada1bf5ec720723b5a9de6e5c4fb770b8f44d1c95289aff4394a70a0301df61e93
 DIST stripe-2.58.0.tar.gz 216926 BLAKE2B 398b16ddab4050373ba5d7da3c8404b85b88d50749a5c3ce2e1704dbe04cdb99abc90b6c8837afbc3e086551e8dfa72baa3a5e68edf2ebb4e30aff157fb3ce8c SHA512 eee6154384fae69632e5e9ae7f972d97915b07da85c9f1af3849f5b9fea1e6f291c3d3e5b0e319c0d6dc0c035fec167f7711f650032016d3eb4709b333f3d5b7
 DIST stripe-2.59.0.tar.gz 219952 BLAKE2B f59d7e7f7c03f620dd2f43b5678208d72de0f947bf748c9c41d6782a6b01450a0547ddd5972a731fd1b8187479e1b813f890993ae097ec8c32acd4691256a4c3 SHA512 f27ed8457d1097aac43aaddaf39b8d1d9df25e837160407edea354b2fa8faf122ed86a9d36583ff56885e22663b230ee63af04baab0edad2711f3c691c8de51c
diff --git a/dev-python/stripe/stripe-2.56.0.ebuild b/dev-python/stripe/stripe-2.56.0.ebuild
deleted file mode 100644
index e914bffe8f0e..000000000000
--- a/dev-python/stripe/stripe-2.56.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.103.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.57.0.ebuild b/dev-python/stripe/stripe-2.57.0.ebuild
deleted file mode 100644
index a57444a83837..000000000000
--- a/dev-python/stripe/stripe-2.57.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.105.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.58.0.ebuild b/dev-python/stripe/stripe-2.58.0.ebuild
index f8ca6f8e9237..8a55be32b727 100644
--- a/dev-python/stripe/stripe-2.58.0.ebuild
+++ b/dev-python/stripe/stripe-2.58.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/tenacity/Manifest b/dev-python/tenacity/Manifest
index 615a34b4522f..99961be7e11f 100644
--- a/dev-python/tenacity/Manifest
+++ b/dev-python/tenacity/Manifest
@@ -1,2 +1,3 @@
 DIST tenacity-7.0.0.tar.gz 33874 BLAKE2B 485b35058e246ac7c68a2d92a4bd30ae182d382d4258854afb1e61d0b31cd1674bfd92599b83425f4e9a92ca4c38e4a91b72a17d0de6f918474ebe59e6bd2d66 SHA512 a627112df19b9f6d1c53294daad7fe1b0aeaed15e6ec07054228575fbc76ca5c22f560ddd6fc176c5c22141669423547ba17f1e33c7d0e7e92d0188acad065c4
 DIST tenacity-8.0.0.tar.gz 35483 BLAKE2B bde48a9682d1ce661ec6a35387c8a3931e60f61ac605b95637ce88176a5346eed54047623d0ee116e5c6d279f265d9cee0fd69e2b805c50cd7e06390d6952813 SHA512 f9c8b74d53dc4973e833a2d2625d15b7f40b813b1cfe389511c1083e738d62b0793dbfab73ed13a9e88cc65a17d2c6d8b0a571f13732a26f4c957e16dd9bbefc
+DIST tenacity-8.0.1.tar.gz 37492 BLAKE2B 10438b3877862baa88d164837b201773c287e7ce11b6213c677c227cbddda02434b423c0f331746495e68ab130ff9a9c720cccd2def3efa8ca6df8eef441eee9 SHA512 b5a615306e25c93d2734d408cc73f4db5361d92b713c1e7bbb57cd7bf635f82c5ccffafe9c0a6bc0da4057d11c92012d2337a5e4f15465bf4e6839d1fa97b877
diff --git a/dev-python/tenacity/tenacity-8.0.1.ebuild b/dev-python/tenacity/tenacity-8.0.1.ebuild
new file mode 100644
index 000000000000..94c3c01f44e2
--- /dev/null
+++ b/dev-python/tenacity/tenacity-8.0.1.ebuild
@@ -0,0 +1,33 @@
+# 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="General-purpose retrying library"
+HOMEPAGE="https://github.com/jd/tenacity"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		www-servers/tornado[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local deselect=(
+		# TODO: package typeguard
+		tests/test_tenacity.py::TestRetryTyping::test_retry_type_annotations
+	)
+
+	epytest ${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/tree-sitter/tree-sitter-0.19.0_p20210506-r1.ebuild b/dev-python/tree-sitter/tree-sitter-0.19.0_p20210506-r1.ebuild
index 339aaec178de..eb61eb9ce909 100644
--- a/dev-python/tree-sitter/tree-sitter-0.19.0_p20210506-r1.ebuild
+++ b/dev-python/tree-sitter/tree-sitter-0.19.0_p20210506-r1.ebuild
@@ -25,7 +25,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 
 RDEPEND="dev-libs/tree-sitter:="
 DEPEND=${RDEPEND}
diff --git a/dev-python/xapp/Manifest b/dev-python/xapp/Manifest
index c49c5f657088..df9ec09218ad 100644
--- a/dev-python/xapp/Manifest
+++ b/dev-python/xapp/Manifest
@@ -1,2 +1 @@
-DIST xapp-2.0.2.tar.gz 19946 BLAKE2B fde2f4f30fa1dbb5d4778d82bcfb347a5b8f89635df6c298d0dc509a194c528b653a1cbe4537c878bde4a8b987852ca51e37a70b6c35f96c9882c5b1b277dd36 SHA512 2b5d2a259e55384426940e6284ec9f964f4f0220b8cb364606c938ef6e1717d40ddbc3730732dddc86d460f624ac6161fe5ab55c276aedba9187a79d9d53a60e
 DIST xapp-2.2.1.tar.gz 20739 BLAKE2B 11f3b8964aedc726235d1c9350b159ed5cc0e859f33d6390d06e8df225eb86d0d6a392d16023a460ae0dad69f4a65b3cc8c3a759e8a4e5abab491a6d71ea8ab9 SHA512 2c03a6201404d7c792e12b10241309c912ca6b1daaa56aa0867ddbb16af053f110e4cb05da969b1800678d60acc0e6d19fc097581e6b195fff9f68acb48505ff
diff --git a/dev-python/xapp/xapp-2.0.2.ebuild b/dev-python/xapp/xapp-2.0.2.ebuild
deleted file mode 100644
index 91e5d357db12..000000000000
--- a/dev-python/xapp/xapp-2.0.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for x11-libs/xapps"
-HOMEPAGE="https://github.com/linuxmint/python3-xapp"
-SRC_URI="https://github.com/linuxmint/python3-xapp/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-DEPEND="
-	x11-libs/xapps[introspection]
-"
-RDEPEND="
-	${DEPEND}
-	dev-python/psutil[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}/python3-xapp-${PV}"
diff --git a/dev-python/xapp/xapp-2.2.1.ebuild b/dev-python/xapp/xapp-2.2.1.ebuild
index 9252f6269483..6bc376ff41a3 100644
--- a/dev-python/xapp/xapp-2.2.1.ebuild
+++ b/dev-python/xapp/xapp-2.2.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/linuxmint/python3-xapp/archive/${PV}.tar.gz -> ${P}.
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/dev-python/xcffib/xcffib-0.11.1.ebuild b/dev-python/xcffib/xcffib-0.11.1.ebuild
index 01d63fef68b6..87525b25c2c1 100644
--- a/dev-python/xcffib/xcffib-0.11.1.ebuild
+++ b/dev-python/xcffib/xcffib-0.11.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv ~sparc x86"
 
 DEPEND="x11-libs/libxcb"
 RDEPEND="