Adding metadata

40 files changed, 431 insertions, 491 deletions

diff --git a/dev-python/Faker/Faker-8.4.0.ebuild b/dev-python/Faker/Faker-8.4.0.ebuild
new file mode 100644
index 000000000000..ee753c20e0d8
--- /dev/null
+++ b/dev-python/Faker/Faker-8.4.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} )
+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/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 6104bb0f3dea..757b8c86d4b8 100644
--- a/dev-python/Faker/Manifest
+++ b/dev-python/Faker/Manifest
@@ -1,3 +1,4 @@
 DIST Faker-8.2.0.tar.gz 1144105 BLAKE2B cac0e083fb91c4eff99b4a1af0c4acf665d2c7dd45acb21926341deb5ac27c6837ed59f9f157f1c4f26810d9844f432dc857887c6d1dcb44b67cc7713fb4ed41 SHA512 4d7d98c2f12f60ea2c690cf4647968181efad4f9940c63ae11dee66e3f4fa45f893711ec6c832b55be9aeac618984206af1ac56daf9af3f2cf5f84ebe4271c2e
 DIST Faker-8.2.1.tar.gz 1144260 BLAKE2B 3c523e394043d2294e9973c0a2764a7c7961ea89b45efecfefa7a094e2b4ffa81513e9ca6ac321e5b2b05bf29c62ae37a4797ad210172d5e988dbd80d8b0858e SHA512 58e6fc188dfb6ef5f5847d2d7966767eb71df66752858fbccbf984afda2d25f6a6b01d2c9446e7b1c9e57bf3744c0e1f89202e0079b01e139789f384e3cdbc17
 DIST Faker-8.3.0.tar.gz 1144870 BLAKE2B fba95fdc3023dc583345d0a7890b4ac6318ca87157270e1d844a2978bd2866c1cd8e8a334e41bc0b8689a1c8814a5353ab4adbb08af49a31779217d82b913ce6 SHA512 7f046e60636dc7c2a584eb75e832a674715424b91de5eac6dba423d40100ce44b5baec178976bcf2b00b5edb81c5796f5eeebed0572984e7740c9e3279afd51a
+DIST Faker-8.4.0.tar.gz 1146293 BLAKE2B 9ec37d76ebfe486a9671f5fc97e321420b9cf83811894db4f7264430f441ab63309e2abed0b5c900467685d7fe979001c216a9e32323c764867f127025706558 SHA512 03abef5c85edccf924191f2bc5be1dd64d56f827bc4307fed16becac7981c0340fa900748e767f2bbbf37721075c03ac068892870f2ac895f8d748403ae8bb08
diff --git a/dev-python/aesara/Manifest b/dev-python/aesara/Manifest
index b05d22bb45bb..ba4a717f38f6 100644
--- a/dev-python/aesara/Manifest
+++ b/dev-python/aesara/Manifest
@@ -1,5 +1,4 @@
 DIST aesara-rel-2.0.10.tar.gz 8038338 BLAKE2B 411623fe6299c9f037a733ff44324c747a3ea1bd71f2d3ca8fad747ec4be0d0dd9a3991f0996ee2e723ec9bb44ba9b47606e3a2cf5f9e6beb27bfa39752b1f1f SHA512 c29a352f2fe85cf5f452fcf7b62d2ccefcac37cfec5336a5b14041cfae5a25aa03f3c95e372453d665995576b6c73765c0b0677628f2ed37e63a390f8bfa5121
-DIST aesara-rel-2.0.6.tar.gz 8020607 BLAKE2B 0a51936fe089061038e9dd60e210d7a0820438a03508fb1aa7f843c9c3dbba86295a7e0471f97084e7ba87e2a771bb640a6f87ce974b219767d2344e2a94b190 SHA512 1370cb4408b694d5b97610229951cfa9e74f42c10347eff375d5aba0aaa60a7c88f5db2a7c101ec6916a40d6cf12b5646e7422dd5e9617f414619d79c55f02fb
 DIST aesara-rel-2.0.7.tar.gz 8020485 BLAKE2B 91c02c5d6826694b08bf3276f9c08e98f5a68a34b7d4a4f4813b44794f625cb0b67677fc8eff8496f19f84b462b30d740645b19b3031640a550b8b07288980ef SHA512 63f636d7293127b21196072fd05edf25f2d03702d5568308ddb35c2d425100aa4087eb282f30a123124e43bedbc82d84209293c2d2de6f598c7b3b6704fc38aa
 DIST aesara-rel-2.0.8.tar.gz 8043104 BLAKE2B ceb4f34b2017516d8d75855eb17fbce8a28ef35d2dfa22c2221f95e910b69126f6d2070654377bebaa8c149bcb13ed1e37c0fd145cad96ddf6875642a6882b2f SHA512 1bcc149e3c55eeaa4522afd48df63602b32b1702402cd269b30c85ec6abf0d4b446a3593b8247c393c2ad9f74176ebe94e7c86a94ee58b91fbdbef69dbc9acd6
 DIST aesara-rel-2.0.9.tar.gz 8045090 BLAKE2B 02f8480cd3c1f843d5878a968514ba9adbf5eefa4f36e4ae201d79e8483dc9d04dd890fa30443aebd3a1520e16eab6eca2478b88bbd6acbbef14b61958a2c8b9 SHA512 bbb300bbbc74fed4e95613efe8eb5b29b932fc201900d340be7ef425c11b56f4e627d9e8c45e290c42a122db45af6639c40ce5bf2bc01895d56c43416a8c3415
diff --git a/dev-python/aesara/aesara-2.0.6.ebuild b/dev-python/aesara/aesara-2.0.6.ebuild
deleted file mode 100644
index f23baa5bc574..000000000000
--- a/dev-python/aesara/aesara-2.0.6.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-inherit distutils-r1 optfeature
-
-MY_P=aesara-rel-${PV}
-DESCRIPTION="Library for operating on mathematical expressions with multi-dimensional arrays"
-HOMEPAGE="https://github.com/pymc-devs/aesara"
-SRC_URI="https://github.com/pymc-devs/aesara/archive/rel-${PV}.tar.gz -> ${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-RDEPEND="
-	dev-python/filelock[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/scipy[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_sphinx doc 'dev-python/sphinx_rtd_theme'
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	sed -i -e "s/tests.\*/tests\*/" setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local exclude=(
-		# speed tests are unreliable
-		tests/scan/test_basic.py::test_speed
-		tests/scan/test_basic.py::test_speed_rnn
-		tests/scan/test_basic.py::test_speed_batchrnn
-		tests/link/test_vm.py::test_speed
-		tests/link/test_vm.py::test_speed_lazy
-		tests/tensor/test_gc.py::test_merge_opt_runtime
-	)
-
-	distutils_install_for_testing --via-root
-	pytest -vv ${exclude[@]/#/--deselect } \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" ||
-		die "Tests fail with ${EPYTHON}"
-}
-
-# https://dev.gentoo.org/~mgorny/python-guide/concept.html#packaging-pkgutil-style-namespaces-in-gentoo
-python_install() {
-	rm "${BUILD_DIR}"/lib/bin/__init__.py || die
-	distutils-r1_python_install
-}
-
-pkg_postinst() {
-	optfeature "GPU code generation/execution on NVIDIA gpus" dev-util/nvidia-cuda-toolkit dev-util/nvidia-cuda-sdk
-	optfeature "GPU/CPU code generation on CUDA and OpenCL devices" dev-libs/libgpuarray dev-python/pycuda
-}
diff --git a/dev-python/alembic/Manifest b/dev-python/alembic/Manifest
index 4e63fa7fda3d..36363eccbba5 100644
--- a/dev-python/alembic/Manifest
+++ b/dev-python/alembic/Manifest
@@ -3,3 +3,4 @@ DIST alembic-1.6.0.tar.gz 1166934 BLAKE2B 1d1473ca55bf2e5f8f6dcdf2fd7cbd5246e11e
 DIST alembic-1.6.2.tar.gz 1167842 BLAKE2B 0b61282987e974e81b1007d4a66620b1ac2393b175f91011d0d6c450af1038a9ea553f4a7c1906b2e463f7b95617a00629f337547788821b250373f0de18d0b7 SHA512 d5b23812d3e65e9642f39e2596ab86773476a77959938f518438d7659c2da5436432fdc020a5fbda33fe866a047d9558f7a4c5eabe032a6d3f2e6d04ff7928e7
 DIST alembic-1.6.3.tar.gz 1172826 BLAKE2B e405589352bc06b6a80e532e564b69b7095e57ff150a519654737c9d5ac43827d1ddedeffd12295419eb0fc7555c346cdf0e32fcc21fcc9c301015fc0c9540f5 SHA512 4a73e67962d44de719b9873e4b61153607cb2ebcdd15a19172fc4ea641e2909339ca448e83fa8ecb871a270ccd980f16fcf4a880e9742a177649c4dc44cb30cd
 DIST alembic-1.6.4.tar.gz 1173603 BLAKE2B 24c7a7f5431db4856ea7f7ea7095b1a992e5c41c1d94235098b6c93b6a9dbd6b0261297019b01e1274a466d5b9236d6c0890a08a8720191f77c20973e1b07afa SHA512 019268060d0552da87d0ab4d624d53f2c7460dfd3018c2643b71adf0c7a574eeb92b238d777c786ecc6f9bb94e8e25655f07f64258b17b9cadccb7ba83a091e4
+DIST alembic-1.6.5.tar.gz 1174376 BLAKE2B a1bfdf611b30831363bd29a63f2a50d7c31e348ab6f450f709d1e8dbd891441263d8e0067de38c09351c26c26d07178e3079b30b5c976dfa90cd24d5973038d8 SHA512 8e5ce4bb41a47fb2c263d3542d7fd2dad04bd76b81a6a565fa93cef80a38a016944924b9eb57895ae71d7f8eef428bf440388444ef750bf281616e514a61c79b
diff --git a/dev-python/alembic/alembic-1.6.5.ebuild b/dev-python/alembic/alembic-1.6.5.ebuild
new file mode 100644
index 000000000000..d53ec4cad934
--- /dev/null
+++ b/dev-python/alembic/alembic-1.6.5.ebuild
@@ -0,0 +1,31 @@
+# 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="database migrations tool, written by the author of SQLAlchemy"
+HOMEPAGE="https://github.com/sqlalchemy/alembic"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc"
+
+RDEPEND="
+	>=dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
+	dev-python/mako[${PYTHON_USEDEP}]
+	>=dev-python/python-editor-0.3[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/autoprop/Manifest b/dev-python/autoprop/Manifest
index 69e9407074ff..0a786c30ba92 100644
--- a/dev-python/autoprop/Manifest
+++ b/dev-python/autoprop/Manifest
@@ -3,3 +3,4 @@ DIST autoprop-2.0.0.tar.gz 11705 BLAKE2B 0dd6401671250f9445aaaf20345035bec683eb7
 DIST autoprop-2.1.0.tar.gz 13258 BLAKE2B a08431a87067463278276974326ca81a8c0150193fd3a03fdc2ab422b836655a11f759154fdeeaf834bc379163e167d4815358aaefdc83a76ab4dfa87b6efee5 SHA512 c30ee4bf85d139abf1be2e7b0217bc6f394ba289ccdad423c97f1d27f472ce00eaef2be0f3cdf1c9022c6edc56006d5834d1afd6ef2c5ee2ec124eb5bf679652
 DIST autoprop-2.1.1.tar.gz 13794 BLAKE2B 63645d0d8f9d49f5df730dca18c468e3dea7108e01cf12f6de6d80ad6cf8b5d396957d4a0cd82c737c0b12274a8534e6f48120ef1118c0fb34dba529dc74f081 SHA512 39db6c1130d0b958713f15efcd75ecbbb41659f5f7182be37f1dca22a46c18832d0f7893fadfbf4e8ad9f446417a2476e7dc7890124c9caabd6b5dde37eb7c6f
 DIST autoprop-2.2.0.tar.gz 13939 BLAKE2B b30565618cab67c5a3b9f94958a8f4734d60c048067f73a007fdb9d34555337f92776cac221c89e0067851d59b21f157b4bc1d24fdcaf3e3ae677c31c8a32cc9 SHA512 d8ef758b0d097ddb73cb384075d3d2b0d59191cd12d59a54cc449483da94ab116c75b39cf48d3d262b147e855af1806a0c617ba220f435118d636cd6f283c51e
+DIST autoprop-3.0.0.tar.gz 14082 BLAKE2B 9881dd924b8d66e83dccb3e7ca1d753bec924e8f348d96d0522a76e857c85311ef7ada37b0080c1b3a0e719bf84e807d12c7e4dff4bbfc111273b340f92244a5 SHA512 4730155130b98fc02bea991837ee6d875f19ffa14ae542909314264950d20a34cdbff9e21b31431136624de0dac5eb2a50a9cf677da01862b38cae9c10bec92f
diff --git a/dev-python/autoprop/autoprop-3.0.0.ebuild b/dev-python/autoprop/autoprop-3.0.0.ebuild
new file mode 100644
index 000000000000..59992b19b15b
--- /dev/null
+++ b/dev-python/autoprop/autoprop-3.0.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Infer properties from accessor methods"
+HOMEPAGE="
+	https://github.com/kalekundert/autoprop/
+	https://pypi.org/project/autoprop/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~amd64"
+SLOT="0"
+
+RDEPEND="
+	dev-python/signature_dispatch[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
diff --git a/dev-python/awscli/Manifest b/dev-python/awscli/Manifest
deleted file mode 100644
index 0bc5e2b9f088..000000000000
--- a/dev-python/awscli/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST awscli-1.19.47.tar.gz 1990843 BLAKE2B c894aaf84d5fe7cb8998fcd682783a1f2e75dd9273a2aa22babe4d57175a1716aefccda50edb96a1203f010dbb2af29cd47d43b5d5f94adfdee1730ab98345af SHA512 7d51022e13609f5f5ab3155e3ac09670c7e49508d67eca8cb477e556e4b06b7643e86bdfe5fa8db59360f6d73e5774b433cb7093c25d6b688f98847b502872b7
-DIST awscli-1.19.78.tar.gz 2006020 BLAKE2B 6def90848e033413136865b0176c8d435fb70465f700a82673e9b20378be3792c8e3e59715466a93199358d698c9b58daaa88d6c2e921474460fdef0a214fdba SHA512 ff48f06158d401bf27e2f63c86ade91009dd9a48edf20156d3511ec2685a2dc93e8129a766eb0cc979e81121804dff9f18524e72f8ac1cffc43c4d3ed3595c83
-DIST awscli-1.19.79.tar.gz 2006413 BLAKE2B 40b806b7987dcbb83f0d5f7411dd36c5acfddf3927bff00d396724ed178dd114b91a6852fce9f1f1dea44644c3be26c2d1b63f114b5a9eb9b1832cc2f7e5c69e SHA512 1255b2439ba5061987af7f7b418e564c8bccd6d837614405512628a259c2f89acee3a41386b2507c596d9f52b432fa34c615d06ad15787a131bd06397a3b2aab
-DIST awscli-1.19.80.tar.gz 2006767 BLAKE2B 9840d8068d10048ff043b43cb3e2dc49ee55f38a177ec32b0e061eb4ef3e7503864d05b4a886995ba25a716e82300d20a0c5678bd8f0b8f211bc1ba8785312b2 SHA512 3ca91745075cd46aeb5853fe5979b4c9e9ebb4e7ccae03f2f59d4817fd2e5089747dcb48bff496fcfdccc81d7832a203144364ef0ae716b347222c2226743295
-DIST awscli-1.19.82.tar.gz 2007776 BLAKE2B aaa065a555c481733a3bece914cc84d97845be52a6d254b74494b8f3fc554dbaf33a5cddedd45fdd1f5811e9fad2ce9172939dfa352ba693576dc8554e0d7283 SHA512 87e4b4449d05dd01480c74b992c25163761dc4b495f0414c46631bc547d6b7d2b3b0805205c6d0b641b33f1a8ec98ccb821fdcb18bd2f672695b431505792e18
diff --git a/dev-python/awscli/awscli-1.19.47-r1.ebuild b/dev-python/awscli/awscli-1.19.47-r1.ebuild
deleted file mode 100644
index f70da63d88a5..000000000000
--- a/dev-python/awscli/awscli-1.19.47-r1.ebuild
+++ /dev/null
@@ -1,56 +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 bash-completion-r1 distutils-r1
-
-DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="https://pypi.org/project/awscli/"
-#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-SRC_URI="https://github.com/aws/aws-cli/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/aws-cli-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-RDEPEND="
-	=dev-python/botocore-1.20*[${PYTHON_USEDEP}]
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/rsa[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests --install nose
-
-PATCHES=(
-	"${FILESDIR}"/awscli-1.19.47-py39.patch
-)
-
-python_test() {
-	distutils_install_for_testing
-	# integration tests require AWS credentials and Internet access
-	nosetests -v tests/{functional,unit} ||
-		die "Tests failed for ${EPYTHON}"
-}
-
-python_install_all() {
-	newbashcomp bin/aws_bash_completer aws
-
-	insinto /usr/share/zsh/site-functions
-	newins bin/aws_zsh_completer.sh _aws
-
-	distutils-r1_python_install_all
-
-	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
-}
diff --git a/dev-python/awscli/awscli-1.19.78.ebuild b/dev-python/awscli/awscli-1.19.78.ebuild
deleted file mode 100644
index ec221770074d..000000000000
--- a/dev-python/awscli/awscli-1.19.78.ebuild
+++ /dev/null
@@ -1,58 +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 bash-completion-r1 distutils-r1
-
-DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="https://pypi.org/project/awscli/"
-#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-SRC_URI="https://github.com/aws/aws-cli/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/aws-cli-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-# botocore is x.(y+1).z
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 1)).$(ver_cut 3-)"
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/rsa[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.4.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests --install nose
-
-PATCHES=(
-	"${FILESDIR}"/awscli-1.19.47-py39.patch
-)
-
-python_test() {
-	distutils_install_for_testing
-	# integration tests require AWS credentials and Internet access
-	nosetests -v tests/{functional,unit} ||
-		die "Tests failed for ${EPYTHON}"
-}
-
-python_install_all() {
-	newbashcomp bin/aws_bash_completer aws
-
-	insinto /usr/share/zsh/site-functions
-	newins bin/aws_zsh_completer.sh _aws
-
-	distutils-r1_python_install_all
-
-	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
-}
diff --git a/dev-python/awscli/awscli-1.19.79.ebuild b/dev-python/awscli/awscli-1.19.79.ebuild
deleted file mode 100644
index ec221770074d..000000000000
--- a/dev-python/awscli/awscli-1.19.79.ebuild
+++ /dev/null
@@ -1,58 +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 bash-completion-r1 distutils-r1
-
-DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="https://pypi.org/project/awscli/"
-#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-SRC_URI="https://github.com/aws/aws-cli/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/aws-cli-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-# botocore is x.(y+1).z
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 1)).$(ver_cut 3-)"
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/rsa[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.4.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests --install nose
-
-PATCHES=(
-	"${FILESDIR}"/awscli-1.19.47-py39.patch
-)
-
-python_test() {
-	distutils_install_for_testing
-	# integration tests require AWS credentials and Internet access
-	nosetests -v tests/{functional,unit} ||
-		die "Tests failed for ${EPYTHON}"
-}
-
-python_install_all() {
-	newbashcomp bin/aws_bash_completer aws
-
-	insinto /usr/share/zsh/site-functions
-	newins bin/aws_zsh_completer.sh _aws
-
-	distutils-r1_python_install_all
-
-	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
-}
diff --git a/dev-python/awscli/awscli-1.19.80.ebuild b/dev-python/awscli/awscli-1.19.80.ebuild
deleted file mode 100644
index ec221770074d..000000000000
--- a/dev-python/awscli/awscli-1.19.80.ebuild
+++ /dev/null
@@ -1,58 +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 bash-completion-r1 distutils-r1
-
-DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="https://pypi.org/project/awscli/"
-#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-SRC_URI="https://github.com/aws/aws-cli/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/aws-cli-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-# botocore is x.(y+1).z
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 1)).$(ver_cut 3-)"
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/rsa[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.4.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests --install nose
-
-PATCHES=(
-	"${FILESDIR}"/awscli-1.19.47-py39.patch
-)
-
-python_test() {
-	distutils_install_for_testing
-	# integration tests require AWS credentials and Internet access
-	nosetests -v tests/{functional,unit} ||
-		die "Tests failed for ${EPYTHON}"
-}
-
-python_install_all() {
-	newbashcomp bin/aws_bash_completer aws
-
-	insinto /usr/share/zsh/site-functions
-	newins bin/aws_zsh_completer.sh _aws
-
-	distutils-r1_python_install_all
-
-	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
-}
diff --git a/dev-python/awscli/awscli-1.19.82.ebuild b/dev-python/awscli/awscli-1.19.82.ebuild
deleted file mode 100644
index ec221770074d..000000000000
--- a/dev-python/awscli/awscli-1.19.82.ebuild
+++ /dev/null
@@ -1,58 +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 bash-completion-r1 distutils-r1
-
-DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="https://pypi.org/project/awscli/"
-#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-SRC_URI="https://github.com/aws/aws-cli/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/aws-cli-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-# botocore is x.(y+1).z
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 1)).$(ver_cut 3-)"
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/rsa[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.4.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests --install nose
-
-PATCHES=(
-	"${FILESDIR}"/awscli-1.19.47-py39.patch
-)
-
-python_test() {
-	distutils_install_for_testing
-	# integration tests require AWS credentials and Internet access
-	nosetests -v tests/{functional,unit} ||
-		die "Tests failed for ${EPYTHON}"
-}
-
-python_install_all() {
-	newbashcomp bin/aws_bash_completer aws
-
-	insinto /usr/share/zsh/site-functions
-	newins bin/aws_zsh_completer.sh _aws
-
-	distutils-r1_python_install_all
-
-	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
-}
diff --git a/dev-python/awscli/files/awscli-1.19.47-py39.patch b/dev-python/awscli/files/awscli-1.19.47-py39.patch
deleted file mode 100644
index 4d1be8eab6d4..000000000000
--- a/dev-python/awscli/files/awscli-1.19.47-py39.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 85361123d2fa12eaedf912c046ffe39aebdd2bad Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Sat, 22 May 2021 19:42:14 +0200
-Subject: [PATCH] Replace use of deprecated base64.encodestring()
-
-Replace the uses of deprecated base64.encodestring() in favor
-of botocore.compat.encodebytes().  This fixes incompatibility with
-Python 3.9 where the former function has finally been removed.
----
- awscli/customizations/ec2/bundleinstance.py  | 4 +++-
- tests/functional/ec2/test_bundle_instance.py | 4 +++-
- 2 files changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/awscli/customizations/ec2/bundleinstance.py b/awscli/customizations/ec2/bundleinstance.py
-index f704ec301..775e75718 100644
---- a/awscli/customizations/ec2/bundleinstance.py
-+++ b/awscli/customizations/ec2/bundleinstance.py
-@@ -17,6 +17,8 @@ import hmac
- import base64
- import datetime
- 
-+from botocore.compat import encodebytes
-+
- from awscli.compat import six
- 
- from awscli.arguments import CustomArgument
-@@ -135,7 +137,7 @@ def _generate_signature(params):
-         policy = base64.b64encode(six.b(policy)).decode('utf-8')
-         new_hmac = hmac.new(sak.encode('utf-8'), digestmod=sha1)
-         new_hmac.update(six.b(policy))
--        ps = base64.encodestring(new_hmac.digest()).strip().decode('utf-8')
-+        ps = encodebytes(new_hmac.digest()).strip().decode('utf-8')
-         params['UploadPolicySignature'] = ps
-         del params['_SAK']
- 
-diff --git a/tests/functional/ec2/test_bundle_instance.py b/tests/functional/ec2/test_bundle_instance.py
-index 3eee363da..ca36d7cd5 100644
---- a/tests/functional/ec2/test_bundle_instance.py
-+++ b/tests/functional/ec2/test_bundle_instance.py
-@@ -17,6 +17,8 @@ import datetime
- import mock
- from six.moves import cStringIO
- 
-+from botocore.compat import encodebytes
-+
- import awscli.customizations.ec2.bundleinstance
- from awscli.compat import six
- from awscli.testutils import BaseAWSCommandParamsTest
-@@ -70,7 +72,7 @@ class TestBundleInstance(BaseAWSCommandParamsTest):
- 
-     def test_policy_provided(self):
-         policy = '{"notarealpolicy":true}'
--        base64policy = base64.encodestring(six.b(policy)).strip().decode('utf-8')
-+        base64policy = encodebytes(six.b(policy)).strip().decode('utf-8')
-         policy_signature = 'a5SmoLOxoM0MHpOdC25nE7KIafg='
-         args = ' --instance-id i-12345678 --owner-akid AKIAIOSFODNN7EXAMPLE'
-         args += ' --owner-sak wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY'
--- 
-2.31.1
-
diff --git a/dev-python/awscli/metadata.xml b/dev-python/awscli/metadata.xml
deleted file mode 100644
index f6e4c89d3b6d..000000000000
--- a/dev-python/awscli/metadata.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
-  <email>slashbeast@gentoo.org</email>
-  <name>Piotr Karbowski</name>
- </maintainer>
- <maintainer type="person">
-  <email>patrick@gentoo.org</email>
-  <name>Patrick Lauer</name>
- </maintainer>
- <maintainer type="project">
-  <email>python@gentoo.org</email>
-  <name>Python</name>
- </maintainer>
- <upstream>
-  <remote-id type="pypi">awscli</remote-id>
- </upstream>
- <origin>gentoo-staging</origin>
- <stabilize-allarches/>
-</pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 5642aff957d0..2872157e29ec 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -4,3 +4,4 @@ DIST boto3-1.17.78.tar.gz 374487 BLAKE2B 8a83cb32db8336351454251a3cf78efad619788
 DIST boto3-1.17.79.tar.gz 375101 BLAKE2B 3948499f1bab6853ea110fd025a9e9e917e3ddb3a90681008686293132dc18098c13834937f04342dade16663b878da065f44f023c9adcf682c4c0057e19484d SHA512 d01933f1a41d352ba33e6e78debf5f0cd2c3d187214e7cff5602d26518b45d605c2a319a98ddf86179871410277e85aa59ddda80dcf1efb66f9aaf0c89109350
 DIST boto3-1.17.80.tar.gz 375564 BLAKE2B dd10855ff88a0f24789cb389b0e10c3a6d4f98453ba37d1b76429fd9fc48bda8d9c5a578bd72230401a20973c9d6ad62be15f4ea00845d834a573fb9b20fa60a SHA512 cb6c6628faca586131b3dc8d989437e7a5f09ba5de55d7eb40e941003bb5407812ca4058a2c951d473aa1f1ea0acf48370a275191c7fb64ec0fde34793a59218
 DIST boto3-1.17.82.tar.gz 376284 BLAKE2B 33520a1a80566a17b3a0665ce2520e73bab69b48db02b1ac25b6ff438a2dd68a75c08026abce6a2274e1fa40aaa7fe4f0e56ecc663672d9a6eef205df5d0baea SHA512 0ab14df312032a64746624b67dc721c45ed6cb7c3be21cceba77eb4c20a76d85bd2db22eca41f598431f6579473becc78e84075a57ab43b16561d4b58e3648a5
+DIST boto3-1.17.83.tar.gz 376963 BLAKE2B 0bdcae1097a8ee4250c08fe639419ea99b83e33ea77433698ee9bafd928252e6b836c93bb83d383ff4aeacc583d2309236e80d2ebd5425e320aa2a80da295964 SHA512 c1dad3d17b0bf628ae31edda3a6eaf01fa1b820031d541f0dd4f4d56e98a1da9f868ed1c6e63ff0b6bd83cda027c540c08b41a066d3b35959294779c2113cb37
diff --git a/dev-python/boto3/boto3-1.17.83.ebuild b/dev-python/boto3/boto3-1.17.83.ebuild
new file mode 100644
index 000000000000..511fc98f5fff
--- /dev/null
+++ b/dev-python/boto3/boto3-1.17.83.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+inherit distutils-r1
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="https://github.com/boto/boto3"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/boto3"
+	inherit git-r3
+	BOTOCORE_PV=${PV}
+else
+	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~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 e3d6badc9984..c7aa4af631f0 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -4,3 +4,4 @@ DIST botocore-1.20.78.tar.gz 7758829 BLAKE2B af13d6c1aa918e2c49c6dc931c9a78e1899
 DIST botocore-1.20.79.tar.gz 7763400 BLAKE2B b49dbc848980312b1a8f42514bc37b9bd8e2d27252402042835302aabac4c6fbda6a49de409d5ea5b8f630ee044f50ab01de95919c2b9aaac8292d2c04e99331 SHA512 acbb9118dec30ef8389f7cb65660a927f64819e7d2f9902bf5ff1d36c55b974f42605ec25244a95904df4915113df92a9638c0df8d7a6c038885cb520659c424
 DIST botocore-1.20.80.tar.gz 7767475 BLAKE2B de8f7f6575e9e5a7f7e8ad0adeb886be77697d37a7aad1828cb69977d4914129c6c786da74447f8cb93514546c3c85f91e439ff08e6972047b9c164828850cda SHA512 7abfdec5450a24b5c576e47409cf311581bb909853b887a9770dc8cbb5aebb25cd9fde3c3a904d66bb69969e49ca00cef2fd11d2ddedef204b2d51feb89513cf
 DIST botocore-1.20.82.tar.gz 7772021 BLAKE2B 09fc32ba42275afde8332287825e954bd5bb8b7f5bea00666f73baf60297bd972b2ec6525f1d6e16e22bb23e233b619fecbb666dcdededcc07a016c9763ab774 SHA512 227b7160ef9d945d00efdcdfaa60ed85d50b183fbeded816e6185b8125b32c2fa0eee9dc473f83f977c0de2139eb042f3338eea37081b37d480edd7c300b641f
+DIST botocore-1.20.83.tar.gz 7786168 BLAKE2B 1bd8864da814ed502c4e0860d8c7a82c6c15d778f2aafc333ffe6e64f45398c173ad7700f9fc90a9fbf4b91f8f77b5494619bdc6e4bda1dcec6cef8d496327c2 SHA512 7ff1c73d85e02cc1f2de1de915d337369681e28ac44aba5cfb29df6bc4377f664170844ed8caeb7e50c97d127d1e9caac08fac18724046a7f1450cc7ea212b4a
diff --git a/dev-python/botocore/botocore-1.20.83.ebuild b/dev-python/botocore/botocore-1.20.83.ebuild
new file mode 100644
index 000000000000..ca62b7dad65f
--- /dev/null
+++ b/dev-python/botocore/botocore-1.20.83.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="https://github.com/boto/botocore"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~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/cbor2/cbor2-5.3.0.ebuild b/dev-python/cbor2/cbor2-5.3.0.ebuild
index 3b375154b1fe..2b62b53f898a 100644
--- a/dev-python/cbor2/cbor2-5.3.0.ebuild
+++ b/dev-python/cbor2/cbor2-5.3.0.ebuild
@@ -14,6 +14,9 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
+
 distutils_enable_tests pytest
 
 python_prepare_all() {
diff --git a/dev-python/cliff/Manifest b/dev-python/cliff/Manifest
index cb88603c1ba3..1c8dcab3d55e 100644
--- a/dev-python/cliff/Manifest
+++ b/dev-python/cliff/Manifest
@@ -1 +1,2 @@
 DIST cliff-3.7.0.tar.gz 81853 BLAKE2B aab3ad056c13232978e93b380d9d0d48748778f403b4200c09f92bcedc6c2806213d81612aa453277e2c99acc5959ad666ac888d4a0726f50a5c0f04be0e9fdd SHA512 d3cf3ecc6778bbc676e47ebfcbc6be4ee120dd864684da58e476f52d021b5932bf9361ce2aa6a8ee4d68845ba79ec7a9174cfa7f21fa3fa16a945b96c968cc26
+DIST cliff-3.8.0.tar.gz 81862 BLAKE2B 3a8219f822fdf14e1de56204b0f536a92d27be5a99fb628f3aed5b569a1e703d4711bdded28fa42c0692316454847ba3338baac8efae873540652e46d155227a SHA512 002e3ddfb254c5369582cc28572856a8b4ad05d598a7f8aa690add69f49cabb12ef2ef17b6c1553792aaee785b7c1703b05dd9d4889271cd5eba5629fad3d09b
diff --git a/dev-python/cliff/cliff-3.8.0.ebuild b/dev-python/cliff/cliff-3.8.0.ebuild
new file mode 100644
index 000000000000..5e311e6be64d
--- /dev/null
+++ b/dev-python/cliff/cliff-3.8.0.ebuild
@@ -0,0 +1,40 @@
+# 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} )
+# TODO: revert to rdepend once this is merged
+# https://github.com/openstack/cliff/pull/3
+DISTUTILS_USE_SETUPTOOLS=manual
+
+inherit distutils-r1
+
+DESCRIPTION="Command Line Interface Formulation Framework"
+HOMEPAGE="https://github.com/openstack/cliff"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/cmd2-0.8.0[${PYTHON_USEDEP}]
+	dev-python/prettytable[${PYTHON_USEDEP}]
+	>=dev-python/pyparsing-2.1.0[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-2.0.1[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.12.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
diff --git a/dev-python/ecdsa/Manifest b/dev-python/ecdsa/Manifest
index 046eef54f9d1..34dce2b4a9e8 100644
--- a/dev-python/ecdsa/Manifest
+++ b/dev-python/ecdsa/Manifest
@@ -1 +1,2 @@
 DIST ecdsa-0.16.1.tar.gz 126935 BLAKE2B 84e04c0afe076c009a88f7ef1a0193329e3d4945e34c752b869cbf449667c424341fae7da2e7c908b773c6f4ab495d29dd40aa3a9be35b0c03d315ac330dc3e0 SHA512 935416ff25a71b1e6fe442b11e8d2c1463b1652d539274e094112a4847c2c749ff58eb9f5ed108ed5613b7363d3f2b1c07ba3d01af8cfed4e1b4bec407d3f5a6
+DIST ecdsa-0.17.0.tar.gz 158486 BLAKE2B 45a27aaf362853bd39052a78a7f86b6d2fd220c165724b088cc5285977013b354f5373bcf8295258e9121da2fe6a4b79625afbc097cca756c688afbd542f647c SHA512 23acf993ce4f7f832674a3b70ab870c20172816e27adc836d4c6a876e72a488a830895d63ab6af67cc7cbc83c71f7097d0d530bf67d24c84e69e9fa87031f6fd
diff --git a/dev-python/ecdsa/ecdsa-0.17.0.ebuild b/dev-python/ecdsa/ecdsa-0.17.0.ebuild
new file mode 100644
index 000000000000..5572f37f0bb4
--- /dev/null
+++ b/dev-python/ecdsa/ecdsa-0.17.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="ECDSA cryptographic signature library in pure Python"
+HOMEPAGE="https://github.com/tlsfuzzer/python-ecdsa/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/gmpy[${PYTHON_USEDEP}]
+	' 'python*')
+	dev-python/six[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		dev-python/pluggy[${PYTHON_USEDEP}]
+		dev-python/wheel[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/fakeredis/Manifest b/dev-python/fakeredis/Manifest
index b360bc563ea5..aee3e9d2605a 100644
--- a/dev-python/fakeredis/Manifest
+++ b/dev-python/fakeredis/Manifest
@@ -1 +1,2 @@
 DIST fakeredis-1.5.0.gh.tar.gz 66371 BLAKE2B da9a961b9e163ba8221193c9c353f17bd23a710bd105b4fc6b9249a857828ece0b3551e3890818b0519f96aa9691166658332c25b796b22827f0951d3f50cebf SHA512 5bd4965c36abada4b937b635318d58e88ba76d30ff577b0f9b9134a94a3407a8c0e92d953e6b5299cabfe11ebe5a785e9d75406e8a07a4257674be64f6b8cffb
+DIST fakeredis-1.5.1.gh.tar.gz 67064 BLAKE2B 6eac029b7de6fb2c9b56a60655b6a224cdcba25fa86662a0423044ab97248984c4c6cfbaacbe4bbb2e3fc6826693791f232c6c55d7f15995d0e5bd00370a9ba8 SHA512 74a238573f9f911e9a39885b52d8c908d51d5620e346b8927c161111ce193566c315999f71d3edb1cb1326970985fd73d533b5483afe0c98ad76798a3c15e242
diff --git a/dev-python/fakeredis/fakeredis-1.5.1.ebuild b/dev-python/fakeredis/fakeredis-1.5.1.ebuild
new file mode 100644
index 000000000000..42900d2fc8f6
--- /dev/null
+++ b/dev-python/fakeredis/fakeredis-1.5.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 2020-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="Fake implementation of redis API for testing purposes"
+HOMEPAGE="
+	https://github.com/jamesls/fakeredis/
+	https://pypi.org/project/fakeredis/"
+SRC_URI="
+	https://github.com/jamesls/fakeredis/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/redis-py[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/sortedcontainers[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local excludes=(
+		# tests for use with aioredis, not packaged in ::gentoo
+		--ignore test/test_aioredis.py
+		# tests requiring lupa (lua support)
+		-k 'not test_eval and not test_lua and not test_script'
+	)
+
+	epytest "${excludes[@]}"
+}
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index 7fe390fc2ea6..37a9fc3115e9 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -4,3 +4,4 @@ DIST hypothesis-python-6.13.2.tar.gz 9130008 BLAKE2B 3ca5c306ac402002a1435b8ccbc
 DIST hypothesis-python-6.13.4.tar.gz 9130435 BLAKE2B eeb78cc647df49ea11fb0e0f4d8412e20095e7c33bb0601dcbaad2b9e9929423729b25b1bfbf2a27b05e87ae38ced4e9aeba5bae4de76cfc81aae2d073248de0 SHA512 93db99bdbe408ddbad4baf983b00b3e7624fd28d15a0d4c1453437328a51b0733db13e3b7b04b40bc60aa05e2e8364ce5b186d81a2d33e50b49f5a406fec95d6
 DIST hypothesis-python-6.13.5.tar.gz 9131314 BLAKE2B 3de7ba681ab9c0907920ea7ad562a4434f06009a7bced47b98bf46da5d15aea35085350f4aca24fd41ba9fd14957e4de1d56092d49e757ea60a1575f59371add SHA512 06765607be1a49d92382d426105021ed9dca91c5b41674ba45f0a29ce7cb06537edf706ea7305300f9aae7d8c9b1827bcaf807e3c4aece9594a55b3c0122c622
 DIST hypothesis-python-6.13.6.tar.gz 9132027 BLAKE2B 939c7b410bef3d8e38a513e55f462f72cc758b78d8c76031f382969e0a622585b6f42b35a5eb70879e8cc80ea9795c5ad2d91dd55c1d3a60035e6f8e982a46d1 SHA512 dd53352df352e12f8bb9294d4e679518eff3a4431e0ccdc7037713cc3acda6d9b3da3ad2cb7748021b3acbb1b2cfe0d76fac22de68d2a020f293073ad2ce80bd
+DIST hypothesis-python-6.13.7.tar.gz 9132167 BLAKE2B a7f58630d114743a04665d245384d3b5f6a0592d03a9b7e771ceb3ad8633fdd9c437dc6fa099d9dc48225d5d113a203a62ca29f50ff76fdbeb406f2cc63f9013 SHA512 70022d90c09f9478df94986059cbb986e35cb24d3a8c19d023a5a78c9e12982e196d258149456d6d2f01646e84a5ef07714f1967c6b31b53ad5e41ab2b5375d3
diff --git a/dev-python/hypothesis/hypothesis-6.13.7.ebuild b/dev-python/hypothesis/hypothesis-6.13.7.ebuild
new file mode 100644
index 000000000000..3858e9c1e208
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-6.13.7.ebuild
@@ -0,0 +1,62 @@
+# 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 )
+PYTHON_REQ_USE="threads(+),sqlite"
+
+inherit distutils-r1 multiprocessing optfeature
+
+DESCRIPTION="A library for property based testing"
+HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
+SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar.gz"
+S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+IUSE="cli"
+
+RDEPEND="
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
+	cli? (
+		$(python_gen_cond_dep '
+			dev-python/black[${PYTHON_USEDEP}]
+			dev-python/click[${PYTHON_USEDEP}]
+		' python3_{7..9})
+	)
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		!!dev-python/pytest-describe
+		!!<dev-python/typing-3.7.4.1
+	)
+"
+
+distutils_enable_tests --install pytest
+
+python_prepare() {
+	if ! use cli || ! has "${EPYTHON}" python3_{7..9}; then
+		sed -i -e '/console_scripts/d' setup.py || die
+	fi
+}
+
+python_test() {
+	distutils_install_for_testing
+	epytest tests/cover tests/pytest tests/quality \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+}
+
+pkg_postinst() {
+	optfeature "datetime support" dev-python/pytz
+	optfeature "dateutil support" dev-python/python-dateutil
+	optfeature "numpy support" dev-python/numpy
+	optfeature "django support" dev-python/django dev-python/pytz
+	optfeature "pandas support" dev-python/pandas
+	optfeature "pytest support" dev-python/pytest
+}
diff --git a/dev-python/importlib_metadata/Manifest b/dev-python/importlib_metadata/Manifest
index 6b20d7aefcf9..9537462d0baa 100644
--- a/dev-python/importlib_metadata/Manifest
+++ b/dev-python/importlib_metadata/Manifest
@@ -1,4 +1,3 @@
 DIST importlib_metadata-3.10.1.tar.gz 39980 BLAKE2B 9e7ba25618c9a530d122e43d6d56cc0386aad87accef111574b24aa53aaea51e08c422275acf4650eae2102a92de30d066a66c72c02b3a3b432ce9bd9453dacc SHA512 e028fb6abba0c7775943c346db0e733b5ba879583184c99f8413ded6314162e5dce03e10661b16392825038096fac8f6fbbea47ceac9565c60227129f3a3a48d
 DIST importlib_metadata-4.0.0.tar.gz 41881 BLAKE2B cd0330e2a5959f651ef6ceee722762c3cbb034a534dab6c24523ca76d25dde4cb2c6bb06cef7e787db9a9cd83ca08a71bfd7b849db57ef4a95e461e6d887b14e SHA512 bbdf7b3f1e714c5a02babe0f9ff5eb366942e21b626d1d61839ee04040d0ed529cd299afd446639795b34665be20e6438d8e9970292b282946a8b6495682f726
-DIST importlib_metadata-4.0.1.tar.gz 42189 BLAKE2B ed0fda0a2218efc75ce4fd614c8d69767042f035d026b28348d7909b7d6a520e6c1a6f1edb8a00f5e0c0e0e9f818d65e97ad590471d2398a5fb21f4efbdad600 SHA512 972e2f4bcd6433f603f0c6e23f4dbf4269993a47a5a8f66740e0143df63568ea8ca4ed6aa84587dcf967c6c4ba93e5d5ead9ac9444db9bc6424bd8c238f8335e
-DIST importlib_metadata-4.2.0.tar.gz 38311 BLAKE2B 5ea9a0ae143ca3f5fd58d207fefa1bc6c0c68bf50668451580477dcbc9de868eac62ae4f1a1840e35edebdb1c3412e60a6e58bc1b4070edfe4dbbb9d681f4b85 SHA512 e53c1eb8070f494bc06bff5a77f9ecc15d9f76044fc7a6041e4148c923b43909594ffbc2867748ba929bedf2b32033648bb904a5a122859e4d6b9b9b8e2e3b4d
+DIST importlib_metadata-4.3.0.tar.gz 38461 BLAKE2B 5c8387aa618b6561910adf48a701b28556574abe0a4aacc6ae8fbecb258cd0308f637a95402a07c2452ba92daca39034a5fdaac03608e5112534c379e66aa4b9 SHA512 44e3da5207ae6900059758ab26636798fafa9d186d045096e382660083909305887e28c63c2147c940f0af5870d1781f69968c9cc992e50811b5f9b055048459
diff --git a/dev-python/importlib_metadata/importlib_metadata-4.2.0.ebuild b/dev-python/importlib_metadata/importlib_metadata-4.2.0.ebuild
deleted file mode 100644
index f998c0885a23..000000000000
--- a/dev-python/importlib_metadata/importlib_metadata-4.2.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# NB: this package extends beyond built-in importlib stuff in py3.8+
-# new entry_point API not yet included in cpython release
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Read metadata from Python packages"
-HOMEPAGE="https://github.com/python/importlib_metadata"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~mips"
-
-RDEPEND="
-	$(python_gen_cond_dep 'dev-python/typing-extensions[${PYTHON_USEDEP}]' python3_{6,7} pypy3)
-	dev-python/zipp[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/packaging[${PYTHON_USEDEP}]
-		dev-python/pyfakefs[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/importlib_resources[${PYTHON_USEDEP}]
-		' pypy3 python3_{7,8})
-	)
-"
-
-distutils_enable_sphinx docs dev-python/jaraco-packaging dev-python/rst-linker
-distutils_enable_tests unittest
-
-python_prepare_all() {
-	# Skip a test that requires pep517 which is not in the tree
-	sed -e 's:test_find_local:_&:' -i tests/test_integration.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/importlib_metadata/importlib_metadata-4.0.1.ebuild b/dev-python/importlib_metadata/importlib_metadata-4.3.0.ebuild
index f998c0885a23..e67ddfddb764 100644
--- a/dev-python/importlib_metadata/importlib_metadata-4.0.1.ebuild
+++ b/dev-python/importlib_metadata/importlib_metadata-4.3.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~mips"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 
 RDEPEND="
 	$(python_gen_cond_dep 'dev-python/typing-extensions[${PYTHON_USEDEP}]' python3_{6,7} pypy3)
diff --git a/dev-python/phonenumbers/Manifest b/dev-python/phonenumbers/Manifest
index d05ad750a9e9..12f9df561d09 100644
--- a/dev-python/phonenumbers/Manifest
+++ b/dev-python/phonenumbers/Manifest
@@ -1,2 +1,3 @@
 DIST phonenumbers-8.12.22.tar.gz 2258000 BLAKE2B 0aaabf98997a254166267e3f37718e6ed745f0ae55b6b338eabc65067d1115a08f035879bbfd6a2ebaa76f4edbd4c50510119d3eeb4502ce2e53e097dc021c5d SHA512 80fcfda8051b6b77f5f75f39341a8b588ec7cc4620433f415f34feac1eaedcd8c36bd43ab75621386282ce1b77b184bd6407a7dff2c0958ce0507dc96383e47d
 DIST phonenumbers-8.12.23.tar.gz 2257693 BLAKE2B 338a3e943e98c768178768c0e352a8c162f88f47d51652c032a5492b869ce1bc047bc42a9194699d36bdb1699a360324d3211cd4670225a7fbeef6f46f2e47a7 SHA512 2ff7f4a9118a2d1dcf32e7dd919b8f91af0240ba7e180fbb4f11a7af197ad1236f65a7ed985c39fd8059dad80e9859284c3b1ece7f1bf699ccbe399971b060a3
+DIST phonenumbers-8.12.24.tar.gz 2257982 BLAKE2B b7fa2a29c1c9a4a1029013d7de3eed9998c764a12b41a9db2db8d4c9c2fcef1bff00167809f9cdffd484ba1c9d22ef244d45e7c21bb61899a37fc4d3cbb0b6d5 SHA512 1145c527e349436ecc8eaae5bf2dc2e10d25eab73d2ab3b566d7aaddc2cfcd9ae1ada4e3b9876f133f42f7ce023c74a91e48619df69d817f74964e429ebc20a8
diff --git a/dev-python/phonenumbers/phonenumbers-8.12.24.ebuild b/dev-python/phonenumbers/phonenumbers-8.12.24.ebuild
new file mode 100644
index 000000000000..ac8788fcaacf
--- /dev/null
+++ b/dev-python/phonenumbers/phonenumbers-8.12.24.ebuild
@@ -0,0 +1,20 @@
+# 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 port of Google's libphonenumber"
+HOMEPAGE="https://github.com/daviddrysdale/python-phonenumbers"
+SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DOCS=(README.md)
+
+distutils_enable_tests setup.py
diff --git a/dev-python/python-libevdev/python-libevdev-0.9.ebuild b/dev-python/python-libevdev/python-libevdev-0.9.ebuild
index 564f7f4542a7..99aa8e4b341a 100644
--- a/dev-python/python-libevdev/python-libevdev-0.9.ebuild
+++ b/dev-python/python-libevdev/python-libevdev-0.9.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://gitlab.freedesktop.org/libevdev/${PN}/-/archive/${PV}/${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pyudev/pyudev-0.22.0.ebuild b/dev-python/pyudev/pyudev-0.22.0.ebuild
index 99377c59eeca..37d93b4d7ad8 100644
--- a/dev-python/pyudev/pyudev-0.22.0.ebuild
+++ b/dev-python/pyudev/pyudev-0.22.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="qt5"
 
 RDEPEND="
diff --git a/dev-python/pyxdg/pyxdg-0.27.ebuild b/dev-python/pyxdg/pyxdg-0.27.ebuild
index db68952d2fd2..0d6c8edff57f 100644
--- a/dev-python/pyxdg/pyxdg-0.27.ebuild
+++ b/dev-python/pyxdg/pyxdg-0.27.ebuild
@@ -15,6 +15,6 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
 
 distutils_enable_tests nose
diff --git a/dev-python/setuptools/setuptools-57.0.0.ebuild b/dev-python/setuptools/setuptools-57.0.0.ebuild
index 772ee09f5117..dd468691ca32 100644
--- a/dev-python/setuptools/setuptools-57.0.0.ebuild
+++ b/dev-python/setuptools/setuptools-57.0.0.ebuild
@@ -38,9 +38,7 @@ BDEPEND="
 "
 PDEPEND="
 	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	' python3_{7..9} pypy3)"
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
 
 # Force in-source build because build system modifies sources.
 DISTUTILS_IN_SOURCE_BUILD=1
diff --git a/dev-python/websockets/Manifest b/dev-python/websockets/Manifest
index 0b92fae7b5ff..0b45a423cabf 100644
--- a/dev-python/websockets/Manifest
+++ b/dev-python/websockets/Manifest
@@ -2,3 +2,4 @@ DIST websockets-8.1-src.tar.gz 156472 BLAKE2B 6cb5eec8276f7ef7172048eba6157560f4
 DIST websockets-9.0-src.tar.gz 192076 BLAKE2B f5d2fe0e947b4833a11c013ce64640369794e1c5e4db5dcee7a630d8edd46ba72afd4bc42cd8adb392c09e2758d907a0029e09d61465215b3fbaa2430582cf2f SHA512 446d9734e2767a19a5c84de2676cf3730dc717d94e14443ded01727d47b02fca67546bcebe37d177088baaee61c8a7a90f7e15df1ee5bd0ed0a96bb4e46ad1d8
 DIST websockets-9.0.1-src.tar.gz 191411 BLAKE2B 9e45836334f55c18391fc853c81fe7d2b3929fc3fe19d216498a8f39891c82efaa83608ed6732375e1d6fa2a9c84aad77c99aa3e6f57a9a328ff9168a1e58c77 SHA512 554dc5f272f4f849982a2e2a3d391bc6dfc36dc247aa0e2854913d18772749762db424da38f135f8cf4a2a5f67a379f774faba76eb3113bafe509ac62753bed1
 DIST websockets-9.0.2-src.tar.gz 191752 BLAKE2B fde055626e067c482e81a80e0bfe32be81451b99c77c66a4d99b9375a93e46ee627668323599cd7444c834a13cefefadcc9acfa3f8ed00fc8a2a69d743a7fe69 SHA512 ddbd98c70734ff387b96396e5233286154a1f5f92db945f723012e7199f71db31e514d407f065c9d027358dfac0bd1ad59396bc7560b15749e9828af827a23cc
+DIST websockets-9.1-src.tar.gz 191813 BLAKE2B cb3807f01e1a4c22a40bf5150d1e8b21ca786dc5bc4da8f3e6602971f3f7c79b57092f5ddfe3ee52ec00e7fd15f3a992fdbb94b5e26599f2621a7f51434ba6dd SHA512 ff2907a913ff0b8ced6dda72b6fc6512a2ece3ffded2e2dcb8ff6805de9ad504430cc1871c1f6e02ab8069e7b96b2e7609afaf3c9c25f9271b28e2daa72bd3ac
diff --git a/dev-python/websockets/websockets-9.1.ebuild b/dev-python/websockets/websockets-9.1.ebuild
new file mode 100644
index 000000000000..ce1f783d8c80
--- /dev/null
+++ b/dev-python/websockets/websockets-9.1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Library for building WebSocket servers and clients in Python"
+HOMEPAGE="https://websockets.readthedocs.io/"
+SRC_URI="https://github.com/aaugustin/${PN}/archive/${PV}.tar.gz -> ${P}-src.tar.gz"
+LICENSE="BSD"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+
+distutils_enable_tests unittest