Adding metadata

author: Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> 2021-05-06 13:47:34 +0000
committer: Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> 2021-05-06 13:47:34 +0000
commit: 20061f2a002ae795f50d917b6f62ea2e3eb9c2ad (patch)
tree: 57d128a419b6c94c70360ed9916cb58d38b32124 /dev-python
parent: 7247b409bd52b658cedc7055304d4b1c280e678e (diff)
download: baldeagleos-repo-20061f2a002ae795f50d917b6f62ea2e3eb9c2ad.tar.gz
baldeagleos-repo-20061f2a002ae795f50d917b6f62ea2e3eb9c2ad.tar.xz
baldeagleos-repo-20061f2a002ae795f50d917b6f62ea2e3eb9c2ad.zip
157 files changed, 933 insertions, 2326 deletions
diff --git a/dev-python/aesara/Manifest b/dev-python/aesara/Manifest
index ccc3e7157247..da039c600c9a 100644
--- a/dev-python/aesara/Manifest
+++ b/dev-python/aesara/Manifest
@@ -1,7 +1,2 @@
-DIST aesara-rel-2.0.1.tar.gz 7975083 BLAKE2B 6dfeffb5abbd2a9b8097b9f91b537f215b1d2ee8ec9d2ad2abcb823761b722c2e4de75843c74584445c96add175366ac4e2a62eced88ad75c58d0c31f2b4df87 SHA512 8dad298ada2d4a20151cf86c08424b02e1c0afc5060915844ba06a492866b04225e6cb0407bf1de8d651c0e7ed8bca34e184f2f9a2778a66ed41f08d4b51bfd2
-DIST aesara-rel-2.0.2.tar.gz 7974102 BLAKE2B 53ddfada4304776694553d491e80a8b20cec5b5b46819adcc099a7b4cf32dfc68b46d83ba7b769f22f0d088a42e8de269c3385aed4e185920a37c4a349b4a1d5 SHA512 f8f34a1750b5ad250e9243fc0d47f19cd0f8847650e98ea3cef6da03d5a50b884d03e7b6f5cab36d65948a6dd904742a851ac8ea475a0113eb9cbe230a5c834d
-DIST aesara-rel-2.0.3.tar.gz 8019978 BLAKE2B 5e3a7cdca08569a06b7731ff55894c618599c1ebfbaa168cae2d5b8d5b29c5a638b96daa934e663b7cdca6a10ca4b32562c26ab5d240d741ba869863b1701ef4 SHA512 a72c142f9eb1dae34eb0ea172dad7758771e9e8da471a2563798b33fc622e26210f0081013b9a6fb61a927e9ca07e53399ced1fcedc4648f6d76384a3c5c386e
-DIST aesara-rel-2.0.4.tar.gz 8020138 BLAKE2B 4fa1d0d1979eaac1635cd09d9af61ae4be0cbac3722c37cba54a81a93f358f72a7b6c543e2f8c4b120262469e27f96273bffb9222a2c36f58284bc5b7c148d89 SHA512 8205cbbdfb2ce901ea4991a2dc82a8809d1151b2a8da9382cb5306ecb916793c927f8e7c057cc32145802625883476d6a69b5e19b69a69bc843b0114775918ae
-DIST aesara-rel-2.0.5.tar.gz 8020447 BLAKE2B 97a08e01b06fa6ce86d0d81fa02a9bc9bb9d7f25c2bfe25e68d46864519899f5a530871a6ca8e07a64732239207869fe88ca235e2ba102aa0eae8360310234cd SHA512 dc69c7e1f5dc30c5e29bf37957ca3e84d370cce054d61656b44398324385a7490d7b6f4edaffd0019196e2a413124b05f44b9b7c618851a51247bc6b79559849
 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
diff --git a/dev-python/aesara/aesara-2.0.1-r1.ebuild b/dev-python/aesara/aesara-2.0.1-r1.ebuild
deleted file mode 100644
index f23baa5bc574..000000000000
--- a/dev-python/aesara/aesara-2.0.1-r1.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/aesara/aesara-2.0.2.ebuild b/dev-python/aesara/aesara-2.0.2.ebuild
deleted file mode 100644
index f23baa5bc574..000000000000
--- a/dev-python/aesara/aesara-2.0.2.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/aesara/aesara-2.0.3.ebuild b/dev-python/aesara/aesara-2.0.3.ebuild
deleted file mode 100644
index f23baa5bc574..000000000000
--- a/dev-python/aesara/aesara-2.0.3.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/aesara/aesara-2.0.4.ebuild b/dev-python/aesara/aesara-2.0.4.ebuild
deleted file mode 100644
index f23baa5bc574..000000000000
--- a/dev-python/aesara/aesara-2.0.4.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/aesara/aesara-2.0.5.ebuild b/dev-python/aesara/aesara-2.0.5.ebuild
deleted file mode 100644
index f23baa5bc574..000000000000
--- a/dev-python/aesara/aesara-2.0.5.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/asgiref/Manifest b/dev-python/asgiref/Manifest
index 21c4f4021096..6d2097599c32 100644
--- a/dev-python/asgiref/Manifest
+++ b/dev-python/asgiref/Manifest
@@ -1,3 +1 @@
-DIST asgiref-3.3.1.tar.gz 27197 BLAKE2B 1a883ed8b87dd1214ffb7672796159684f04a9a38d75562df38455ea039667f877020263b4577a3f6f7cfdfa0aae2a2074781db669f10c5b639a5009ee4c94b3 SHA512 2d709e8b0ea8b9f11f485ee438cfbbfe8a832de1aa37094a6339cfff23c2605ec79f691320c42bebf46f3bddb005ebb6857d17a8ad641c87a149536cc65984e6
-DIST asgiref-3.3.2.tar.gz 30088 BLAKE2B 7c2b6083a0e0bd19162d4e1e12ad8e3b7267e8e004494eeca0e22ce13acd3bdc7b4ab056f72bb19209b7f933cee817e50930e31be798a89d0952d9de38fc6d67 SHA512 e2259add28554968936e09bf6a53cf71cef4e2e01d58d8e9651543657ba8517be5f2dd7d76334394cac579f7d560e3ab1c498434bbd67276b336ddd78644ba1f
 DIST asgiref-3.3.4.tar.gz 30780 BLAKE2B f14a5ae3cc3d0c67a827b4b8d002c9d92388285f7388b7ac439b11fbe2e72b6dee5a9c38637e6b5189e3a3625d24a806b5aeff1ffc41861fd4947d7b7c4621ba SHA512 e224ce82f9156e3efde316f3e209a9fbb9494cb9347d6652e19ed130921143de8d3e2a45f50352bf13fcdf229c291e68a0348fff31de144e58cd1a53b4eb0c31
diff --git a/dev-python/asgiref/asgiref-3.3.1.ebuild b/dev-python/asgiref/asgiref-3.3.1.ebuild
deleted file mode 100644
index 97e3a923d050..000000000000
--- a/dev-python/asgiref/asgiref-3.3.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# 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} )
-inherit distutils-r1
-
-DESCRIPTION="ASGI utilities (successor to WSGI)"
-HOMEPAGE="
-	https://asgi.readthedocs.io/en/latest/
-	https://github.com/django/asgiref/
-	https://pypi.org/project/asgiref/"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~sparc x86"
-
-BDEPEND="
-	test? ( dev-python/pytest-asyncio[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests pytest
diff --git a/dev-python/asgiref/asgiref-3.3.2.ebuild b/dev-python/asgiref/asgiref-3.3.2.ebuild
deleted file mode 100644
index 61e1320d8226..000000000000
--- a/dev-python/asgiref/asgiref-3.3.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# 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} )
-inherit distutils-r1
-
-DESCRIPTION="ASGI utilities (successor to WSGI)"
-HOMEPAGE="
-	https://asgi.readthedocs.io/en/latest/
-	https://github.com/django/asgiref/
-	https://pypi.org/project/asgiref/"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	' python3_7)"
-BDEPEND="
-	test? ( dev-python/pytest-asyncio[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests pytest
diff --git a/dev-python/asgiref/asgiref-3.3.4.ebuild b/dev-python/asgiref/asgiref-3.3.4.ebuild
index 61e1320d8226..7229d1d336b0 100644
--- a/dev-python/asgiref/asgiref-3.3.4.ebuild
+++ b/dev-python/asgiref/asgiref-3.3.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-python/astroid/Manifest b/dev-python/astroid/Manifest
index 17fab663f01c..127982b5f50e 100644
--- a/dev-python/astroid/Manifest
+++ b/dev-python/astroid/Manifest
@@ -1,6 +1,3 @@
-DIST astroid-2.5.1.tar.gz 312511 BLAKE2B 85d85c045579f6bf42a4640da95836e760d1d89edaefdf94209a2fdc7f2686a27abcb1c0710cad658473a0a1516df5ad80f10c6b7c2a4f14dea36af94aa9ae5b SHA512 a0aaa95257961235abbbbc021cdb48da760f8b1856bbc0a7a8b98c53c69045cee4bfe575182a631f994765819e373b33b3a6eca052573128e8b36f2c23c250de
-DIST astroid-2.5.2.tar.gz 312789 BLAKE2B 53b286a8772fea1df149aff19f56c0d86154e616a04f4e3e459e029bd4ae54e7f41c55873e0c310c4e36b0901a39bf88d92a7748a7a46baa000f386a0d154c05 SHA512 391d6b0981b4332fd074a568d33838cbd5d71e7200a3a7ba27bc96641d12be4a6452def0bb615a54e1fa6d1f1f6863a39d56cf3e503aba42ea0d0fdddbbb9102
 DIST astroid-2.5.3.tar.gz 317721 BLAKE2B 66566287fa65489064056d6dba65fd7c59cbe9e4e3d88ba5a33d08dbcf6af48b6f1eb4aafb4f7483a1fc0eb6fdd92a7bc8f1991d05cd4d589fbcc6ed6f5db769 SHA512 dbf480e86023f7d093386cc68b259d5b721717638927a893b3ade0a397b212f5f24a17c753b705cf499b47e12ab255d51126b41b5af167d5c3018f5aade1abcb
-DIST astroid-2.5.5.tar.gz 344997 BLAKE2B 9ab06834ac05557c095efaaf348772d5d523cb5f0fc79f369319d7b15a92a6737d8464ad8a331474737bab9453519cb779dbb1bb5bbe6ab2ee8bb9a0af269c47 SHA512 ffaa6b156c6bdb3399581388bdb4d058e0182b42051c83752d2f93fdf6aafe28e26bd085d272c9ae2907978ba22a94713e959df70b891f772ffe7f891a1f0dd3
 DIST astroid-2.5.6.tar.gz 345014 BLAKE2B 13916663aef712449a842e50b74ecd2e1b82817e1c128fdf9a4d5779d391deab7f806300cb6597b29920222ff041b13eb985aa395dff024af6fee628a84f883f SHA512 3d10d0f92c4b4c2d7d5e0035f23ae554b512f34ddd55b4c1c4032b328643dfe60cb4aa675a3824423fcd12baea7961847435f1894a47fafa99802f3e17a5605f
 DIST astroid-2.5.tar.gz 304788 BLAKE2B 3d9304dcfff72aa8172fe88b5ee53b723b47b3e602b7c30cae15a61d0cff7d578ccfde4885b56c09c8254ca3fe185fcf297bf85184d68798eb51f1860c516db6 SHA512 eba7e757a12f89a74bff579731a157fda3c8d8dd1b5a4369791d47f7f6e321b23e167260d0988d389428222c8c98929e66ad26f379ff937e274dcd1abdb3b3d2
diff --git a/dev-python/astroid/astroid-2.5.1.ebuild b/dev-python/astroid/astroid-2.5.1.ebuild
deleted file mode 100644
index 03ebfcdad6ed..000000000000
--- a/dev-python/astroid/astroid-2.5.1.ebuild
+++ /dev/null
@@ -1,45 +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="Abstract Syntax Tree for logilab packages"
-HOMEPAGE="https://github.com/PyCQA/astroid https://pypi.org/project/astroid/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# Version specified in __pkginfo__.py.
-RDEPEND="
-	>=dev-python/lazy-object-proxy-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/wrapt-1.11.2[${PYTHON_USEDEP}]
-	>=dev-python/typed-ast-1.4.0[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local deselect=(
-		# no clue why it's broken
-		--deselect
-		tests/unittest_modutils.py::GetModulePartTest::test_knownValues_get_builtin_module_part
-	)
-
-	pytest -vv "${deselect[@]}" || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/astroid/astroid-2.5.2.ebuild b/dev-python/astroid/astroid-2.5.2.ebuild
deleted file mode 100644
index 10ccb4ac7c43..000000000000
--- a/dev-python/astroid/astroid-2.5.2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Abstract Syntax Tree for logilab packages"
-HOMEPAGE="https://github.com/PyCQA/astroid https://pypi.org/project/astroid/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-# Version specified in __pkginfo__.py.
-RDEPEND="
-	>=dev-python/lazy-object-proxy-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/wrapt-1.11.2[${PYTHON_USEDEP}]
-	>=dev-python/typed-ast-1.4.0[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local deselect=(
-		# no clue why it's broken
-		--deselect
-		tests/unittest_modutils.py::GetModulePartTest::test_knownValues_get_builtin_module_part
-	)
-
-	# Faker causes sys.path_importer_cache keys to be overwritten
-	# with PosixPaths
-	epytest -p no:faker "${deselect[@]}"
-}
diff --git a/dev-python/astroid/astroid-2.5.3.ebuild b/dev-python/astroid/astroid-2.5.3.ebuild
index 41a86203f4b2..639e679e7e46 100644
--- a/dev-python/astroid/astroid-2.5.3.ebuild
+++ b/dev-python/astroid/astroid-2.5.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86"
 
 # Version specified in __pkginfo__.py.
 RDEPEND="
diff --git a/dev-python/astroid/astroid-2.5.5.ebuild b/dev-python/astroid/astroid-2.5.5.ebuild
deleted file mode 100644
index acf1c8abd2fa..000000000000
--- a/dev-python/astroid/astroid-2.5.5.ebuild
+++ /dev/null
@@ -1,47 +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="Abstract Syntax Tree for logilab packages"
-HOMEPAGE="
-	https://github.com/PyCQA/astroid/
-	https://pypi.org/project/astroid/"
-SRC_URI="
-	https://github.com/PyCQA/astroid/archive/${P}.tar.gz"
-S=${WORKDIR}/${PN}-${P}
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-# Version specified in __pkginfo__.py.
-RDEPEND="
-	>=dev-python/lazy-object-proxy-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/wrapt-1.11.2[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/typed-ast-1.4.0[${PYTHON_USEDEP}]
-	' python3_7)"
-BDEPEND="
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local deselect=(
-		# no clue why it's broken
-		tests/unittest_modutils.py::GetModulePartTest::test_knownValues_get_builtin_module_part
-	)
-
-	# Faker causes sys.path_importer_cache keys to be overwritten
-	# with PosixPaths
-	epytest -p no:faker ${deselect[@]/#/--deselect }
-}
diff --git a/dev-python/attrs/Manifest b/dev-python/attrs/Manifest
index 09494bc15e8d..56b2785eb383 100644
--- a/dev-python/attrs/Manifest
+++ b/dev-python/attrs/Manifest
@@ -1,2 +1,3 @@
 DIST attrs-03d3fc7a71fe770e1f86b9c3ad8588586e5ea63b.tar.gz 170688 BLAKE2B 1256cb115b3613929f9caf7f31907a51c9afdd5f6e0a10a172089e920d6604c41db3fb11726ab71a698b4ff9e6420e827d5ff25c4127ef7c6cf12536a66a9bb3 SHA512 3007f8c502c0bcd2481ffbbb00bec4ed677d1be9514e417670c4adb791dc67eee76b8a7c07a4a972cd4ece3291e2c996944bb1cdb282682086551cbd571a0011
 DIST attrs-20.3.0.tar.gz 164523 BLAKE2B 66d2e038e485833f5033fbabe2ef9a6565e3f5f5e8530f2c70019e4f5bdfca51083ac6d0bbc9eb765f838070bc90e01db1c83ed6da113ced67300238e12b5f42 SHA512 640532c6b763fd96572e5d85e93c111bebc4c5e0ff9419fe92fb51280f03acb5f9f43339f57d30659e777d5578460675c60ec0a362f9ad433893e3624ce6a931
+DIST attrs-21.1.0.tar.gz 187841 BLAKE2B fa3c4294d5b4f01ec7a8903cfdeb2ad37a77ac6a3d37cca8e559226ff8c28be989128132c0cc8a08963b095f2dd1b279522f5fe93b0ad497a030a09291f1056d SHA512 32110d74fc578a94edd959868cec491f22b9f63637fea72522980e3c1894eaa7ca4fd3a4c0a3f9a8a6d10d9186e6f04c52a18b66698947efa13e0922d61e87be
diff --git a/dev-python/attrs/attrs-21.1.0.ebuild b/dev-python/attrs/attrs-21.1.0.ebuild
new file mode 100644
index 000000000000..8e86973388fd
--- /dev/null
+++ b/dev-python/attrs/attrs-21.1.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="Attributes without boilerplate"
+HOMEPAGE="
+	https://github.com/python-attrs/attrs/
+	https://attrs.readthedocs.io/
+	https://pypi.org/project/attrs/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="
+	dev-python/zope-interface[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		$(python_gen_impl_dep sqlite)
+		>=dev-python/hypothesis-3.6.0[${PYTHON_USEDEP}]
+		>=dev-python/pytest-4.3.0[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/bitarray/Manifest b/dev-python/bitarray/Manifest
index dd2a4c6ee8fa..3e33ee475229 100644
--- a/dev-python/bitarray/Manifest
+++ b/dev-python/bitarray/Manifest
@@ -1,2 +1,2 @@
-DIST bitarray-2.0.0.tar.gz 70098 BLAKE2B 3189ca9bc7bb5c765994d85c827e30019d33ecf062fa0aae0158487c61c1bd4316e094ca35276b4f59a55049035bec68b37ca349bed18e27dbd666b7816fdb1a SHA512 564b80b2e22cc04df0b6a2a48a594d0891aecd77cc6644c10bfea9db241cb6f8c92f87be98d1055ba2a71749721f1de6c591794623a5201aed0bded6909dff41
 DIST bitarray-2.0.1.tar.gz 69368 BLAKE2B 4acc490998e058e3882db2d58ad80b8c275999f49a7a76604091beae8015e7290691f6b34947c3376795b9dc5643592ab7fd09ef5a482a29e4e154616926e444 SHA512 091a0e7b1ddbdb804241eb4f51c9167dcfefb55d5bcef1eaa617ac77593a58113b47f57be83ceed47a91bc5d8d15a8a2e6053a10243323b9f7c0908444ab03af
+DIST bitarray-2.1.0.tar.gz 71169 BLAKE2B 8d82d49ac309605d989d29d492dbb94dd59c633f0987220ed28bbca7d2c3b0c4566ce147d0f65893c5dfaf1c2f702870d95181dfaa969050e13bcd4a9664ef51 SHA512 e91200b8829b63f297a1882fab293ac007991740a739587ba473abce183aa79a85e08db8a0fca5729b6e1d3e130965b2f14dc40acccf12d3231852498e2fb141
diff --git a/dev-python/bitarray/bitarray-2.0.0.ebuild b/dev-python/bitarray/bitarray-2.1.0.ebuild
index 012b3f886892..012b3f886892 100644
--- a/dev-python/bitarray/bitarray-2.0.0.ebuild
+++ b/dev-python/bitarray/bitarray-2.1.0.ebuild
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 6e9359d68762..57f4d7a9e013 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -16,3 +16,4 @@ DIST boto3-1.17.61.tar.gz 366107 BLAKE2B ccd13150f800d6d783784d84cbc8bf8fdefa6e7
 DIST boto3-1.17.62.tar.gz 366832 BLAKE2B be452f1afe79538c29a9c8d8aaf0e0d0224a34b78a7d4f261cea1286e21e7154784f7aa0a544aef68161a861915a19b12fc1526ed7499ad9de6fdb638abb5b7d SHA512 64c323cfcfdd4a1adf083dde08fc88707975c03c4536ef8f66ff08694c292705dca7f11a37c0a2b1158facec9c0c9b58c62570e61e3018ca218f1207d0713479
 DIST boto3-1.17.64.tar.gz 367357 BLAKE2B 582cc599628df29acdb146a0a1da78fb1e35d560f08f54709e5aed9fb27be9ffeaec27b1c2f393ddd48fad5b9c5ff5e51d001972a798b516e089d58d321aaac3 SHA512 ffe248707d162de5a2edd2dec4acb769bda3d2d0c9611548813647d3f0d70de9e6754216ba32df70eacf2e4a6ed2c8fab30261731aa87977eb5972af6052ddb4
 DIST boto3-1.17.65.tar.gz 367905 BLAKE2B d6aa552a8f5a40613577dcb4d43de185662799f471eae2c14baee4799ac2ccc3b8a7c44e39bad8997b2c68d783c1e4454c0f94e41888a895f88bbc740905d626 SHA512 0bfdcba7fa15e0340b9bc235c4f3e09cd1e01d99b6fc7a95e7543723477b6d642ef2b833b24a5cd1adf2c274d517fe43ee0f9bdceac973b472227580fa39b29f
+DIST boto3-1.17.67.tar.gz 368242 BLAKE2B 72e612816c45d49c74430d82f4ede59f6b6e7c128d5cb60b8f7d0f07808776b2a1b7656fa8acdf1b8c0d18b4b0a33479aeeebb57355b07ea2e9b6970f84bc4e0 SHA512 a80ea576a60c21f67f43a556ebead8caffcfd18fb9e777693375f591c5e842bfefff86d0d15252057b7ec1ef5cc54b66019d023880a30c88bc8bce012c9b063d
diff --git a/dev-python/boto3/boto3-1.17.67.ebuild b/dev-python/boto3/boto3-1.17.67.ebuild
new file mode 100644
index 000000000000..2df16964cdb0
--- /dev/null
+++ b/dev-python/boto3/boto3-1.17.67.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 ~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 bada8c6ac053..10b3cc55960e 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -16,3 +16,4 @@ DIST botocore-1.20.61.tar.gz 7668184 BLAKE2B 2b48af271b0a7c90f18de0e1742fbf5a7fa
 DIST botocore-1.20.62.tar.gz 7674812 BLAKE2B 6fec1213c13bc12937f45c2584ce52532ea75d6973e9741d18933dc399e8f0ec569d6aacdf4a9f83f997ff9898cb39c327410965d992836bbfbd9aa06ea81311 SHA512 ae25e2266955964de7be499fe17b64dd5008b1c1abec84167593b04a1bd4f7baa506f91013b292cd42aae01990ec3523d75e3529398185fdaedc358bb5048e83
 DIST botocore-1.20.64.tar.gz 7685481 BLAKE2B d939b262f04a67918fe61ba0789a4ac9a73bd571096fde881ad537bd7b193798960096ea6d966b49634f33454845c8227786c7bb16c0008e8b5dd84591c2e018 SHA512 a2e82988e59f05ae7050b3e8f86b379dde83f516736c9ca133c0fa678cb7c6ba5448e2165cb0ab3f4262e8e3681ede37048508092ba62313e6ce3f89700c8827
 DIST botocore-1.20.65.tar.gz 7689179 BLAKE2B 4f831519c785747b48351b9820fe00efb39ae9157ff11604b6d850b9768a6613ad54b3db9071dedf51e0e9209f3741f35d7e21e953842d1bc89db52b22779d41 SHA512 1936955ab69aaa7d82ea2dc522603162b00e3a9ca39b5911ccd4f3d78688ff1375c4e2abc65638a517a5d7a07076c1c7d6fb81529c6d5cfbe9c13254c3736777
+DIST botocore-1.20.67.tar.gz 7691087 BLAKE2B b56cb7e80179b7c5c2b4daa27907870c075b0cc5b0c14da1d96583701df6d764f0e80cff7973f501263a4edd4e70e4adb613cbe7fa05d7855602db508b509539 SHA512 d0feea0042ef5bbe1fc76ca107cb2450bdf564d82542c483f3b484aa3e32986d649bea9e7e65ea7a36e23582c73c7b341bdb1b07722f09b67334b97ca423999c
diff --git a/dev-python/botocore/botocore-1.20.67.ebuild b/dev-python/botocore/botocore-1.20.67.ebuild
new file mode 100644
index 000000000000..31e4df449edc
--- /dev/null
+++ b/dev-python/botocore/botocore-1.20.67.ebuild
@@ -0,0 +1,60 @@
+# 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 ~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"
+	"${FILESDIR}/botocore-1.20.64-bpo43882.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/breathe/Manifest b/dev-python/breathe/Manifest
index 38e5174bc2f9..b2006cab533c 100644
--- a/dev-python/breathe/Manifest
+++ b/dev-python/breathe/Manifest
@@ -1,5 +1,2 @@
-DIST breathe-4.27.0.tar.gz 186352 BLAKE2B fd4cac6e32a4988812085a71ea6b7222058d6856c377c9ad147da4a9eed980904f09cc04d9524bb20d6495d593c3fb3aa05792b1f0a6a8ce58bff4ca3c29d643 SHA512 b5fc79f8d7728b39e5667d1d763b02a4c0556d9b79ee6b138dc7b1951d9896d18cac1d418401edcb5eb7c4da416c77f177b40b34f85a7ea823cc2d8a4bf6dda4
 DIST breathe-4.28.0.tar.gz 187954 BLAKE2B fc17eb9fb47f01907a3edeb316a427c9f06b802189cb860fa43bf7333a2897c36b2ed6ed008ca30e6e5c856d10fcf55df53ed05997ea60c29aade84cc1e5111a SHA512 a02ff717e4f50d336c91aa943a6a15b7ad834e3896d63c3ec31b3d10ff098400c53fb80fd3441e115194942722e5fce8f9b858fc3a3ba691aac900e0b415906a
-DIST breathe-4.29.0.tar.gz 189293 BLAKE2B 8eeca14c24b819c4a6510674a55a4f6f9397e33752f449c138a4b3f8fa139d50a7dd2446dcbd297ac6eb7b666090e11fec3de770120e1b581d1586d9f1356bc5 SHA512 2b9824c66ef2cfe4eda1c783ffced147352ce7e59b09d1ff2f728e293d9624aa458e534185c0745aba244817abd58a5d781f4447fb52c9ce511654c06a13748d
-DIST breathe-4.29.1.tar.gz 190929 BLAKE2B cb5cbad4005e0d6ae292d13f2011b6d254b519adaa07b6495f577c6ff5fe0eafcec9bed5cbfca0d11b7e8a51c184a0d9100cdf260db462fde83071548831da31 SHA512 a235a7b15dba12e463ffc078e6cc94a60eed8371b51182a4c55691ae2c42d76e1cfbb957ccc9d82a79e2a08297a4b93121811990421e92b9464fd8bf9cbbbb78
 DIST breathe-4.29.2.tar.gz 190695 BLAKE2B c3ecdc02f7ef8d83a63d4c6077f3ddfa794ff9113428a0686e37dcb281bb05a27a885b0664a3eadeeb2efdab5b51a1164c93fe67954bc3e71f54e1c6bc114c84 SHA512 1a47a36f9ebb4c863dd3d06d19ae1dd18af3b9468561f2b2370f57da8573faf4489ee3f1c9aebc84d867a51a6a7032d1a57a3430b804c5dd5886a0fce4c0adfc
diff --git a/dev-python/breathe/breathe-4.27.0.ebuild b/dev-python/breathe/breathe-4.27.0.ebuild
deleted file mode 100644
index 4b4f165e7ea2..000000000000
--- a/dev-python/breathe/breathe-4.27.0.ebuild
+++ /dev/null
@@ -1,31 +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=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Sphinx Doxygen renderer"
-HOMEPAGE="https://breathe.readthedocs.io/en/latest/"
-SRC_URI="https://github.com/michaeljones/breathe/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	app-doc/doxygen
-	dev-python/docutils[${PYTHON_USEDEP}]
-	>=dev-python/sphinx-3.0.0[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-texlive/texlive-bibtexextra
-	dev-texlive/texlive-fontsextra
-	dev-texlive/texlive-fontutils
-	dev-texlive/texlive-latex
-	dev-texlive/texlive-latexextra
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/breathe/breathe-4.28.0.ebuild b/dev-python/breathe/breathe-4.28.0.ebuild
index fc33165df342..4b4f165e7ea2 100644
--- a/dev-python/breathe/breathe-4.28.0.ebuild
+++ b/dev-python/breathe/breathe-4.28.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/michaeljones/breathe/archive/v${PV}.tar.gz -> ${P}.t
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	app-doc/doxygen
diff --git a/dev-python/breathe/breathe-4.29.0.ebuild b/dev-python/breathe/breathe-4.29.0.ebuild
deleted file mode 100644
index fc33165df342..000000000000
--- a/dev-python/breathe/breathe-4.29.0.ebuild
+++ /dev/null
@@ -1,31 +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=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Sphinx Doxygen renderer"
-HOMEPAGE="https://breathe.readthedocs.io/en/latest/"
-SRC_URI="https://github.com/michaeljones/breathe/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	app-doc/doxygen
-	dev-python/docutils[${PYTHON_USEDEP}]
-	>=dev-python/sphinx-3.0.0[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-texlive/texlive-bibtexextra
-	dev-texlive/texlive-fontsextra
-	dev-texlive/texlive-fontutils
-	dev-texlive/texlive-latex
-	dev-texlive/texlive-latexextra
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/breathe/breathe-4.29.1.ebuild b/dev-python/breathe/breathe-4.29.1.ebuild
deleted file mode 100644
index 99e2a478d963..000000000000
--- a/dev-python/breathe/breathe-4.29.1.ebuild
+++ /dev/null
@@ -1,38 +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=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Sphinx Doxygen renderer"
-HOMEPAGE="
-	https://breathe.readthedocs.io/en/latest/
-	https://github.com/michaeljones/breathe/"
-SRC_URI="https://github.com/michaeljones/breathe/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	app-doc/doxygen
-	dev-python/docutils[${PYTHON_USEDEP}]
-	>=dev-python/sphinx-3.0.0[${PYTHON_USEDEP}]
-	dev-texlive/texlive-bibtexextra
-	dev-texlive/texlive-fontsextra
-	dev-texlive/texlive-fontutils
-	dev-texlive/texlive-latex
-	dev-texlive/texlive-latexextra
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# remove stale dep
-	sed -i -e "s:'six>=1.9'::" setup.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/case/case-1.5.3.ebuild b/dev-python/case/case-1.5.3.ebuild
index d291634ca467..e2e0658bc40f 100644
--- a/dev-python/case/case-1.5.3.ebuild
+++ b/dev-python/case/case-1.5.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/dev-python/cleo/cleo-0.8.1.ebuild b/dev-python/cleo/cleo-0.8.1.ebuild
index d42fd2cffdc0..b1e3a9d75ad0 100644
--- a/dev-python/cleo/cleo-0.8.1.ebuild
+++ b/dev-python/cleo/cleo-0.8.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+PYTHON_COMPAT=( python3_{7..10} )
 inherit distutils-r1
 
 DESCRIPTION="Python tool for building testable command-line interfaces"
diff --git a/dev-python/clikit/clikit-0.6.2.ebuild b/dev-python/clikit/clikit-0.6.2.ebuild
index 3ae6dd5605ec..026b38221889 100644
--- a/dev-python/clikit/clikit-0.6.2.ebuild
+++ b/dev-python/clikit/clikit-0.6.2.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+PYTHON_COMPAT=( python3_{7..10} )
 inherit distutils-r1
 
 DESCRIPTION="Group of utilities to build beautiful and testable command line interfaces"
diff --git a/dev-python/crashtest/crashtest-0.3.1.ebuild b/dev-python/crashtest/crashtest-0.3.1.ebuild
index 54ae155e80ee..6fc98de916f6 100644
--- a/dev-python/crashtest/crashtest-0.3.1.ebuild
+++ b/dev-python/crashtest/crashtest-0.3.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+PYTHON_COMPAT=( python3_{7..10} )
 inherit distutils-r1
 
 DESCRIPTION="Python library that makes exceptions handling and inspection easier"
diff --git a/dev-python/dash-renderer/Manifest b/dev-python/dash-renderer/Manifest
new file mode 100644
index 000000000000..09d64e15abc6
--- /dev/null
+++ b/dev-python/dash-renderer/Manifest
@@ -0,0 +1 @@
+DIST dash_renderer-1.9.1.tar.gz 1006154 BLAKE2B 484f88415608007e67099e44d66554b9f1bbe06e825ac0382fbd4501a13b3bb971530f5e15b40bfcbc274e5cc59c3f645f9cde46d4d14112de3c23d468bc0477 SHA512 d2326d8368660d2640a11a00588dbd4e6a418d827171d5bdcdcacc68a03d06878ae1fc1dd90f809efc6c03b6e922b203f2c1cfa07393446f0162aedc589ea7a3
diff --git a/dev-python/dash-renderer/dash-renderer-1.9.1.ebuild b/dev-python/dash-renderer/dash-renderer-1.9.1.ebuild
new file mode 100644
index 000000000000..fc74ae9cfd84
--- /dev/null
+++ b/dev-python/dash-renderer/dash-renderer-1.9.1.ebuild
@@ -0,0 +1,25 @@
+# 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="Dash front-end renderer"
+HOMEPAGE="https://plot.ly/dash"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN/-/_}/${P/-/_}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+S="${WORKDIR}/${P/-/_}"
+
+python_install() {
+	distutils-r1_python_install
+
+	python_moduleinto ${PN}
+	python_domodule package.json digest.json
+}
diff --git a/dev-python/dash-renderer/metadata.xml b/dev-python/dash-renderer/metadata.xml
new file mode 100644
index 000000000000..70e2209d43b1
--- /dev/null
+++ b/dev-python/dash-renderer/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+  <email>python@gentoo.org</email>
+ </maintainer>
+ <maintainer type="person">
+  <email>tupone@gentoo.org</email>
+  <name>Tupone Alfredo</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-python/decorator/Manifest b/dev-python/decorator/Manifest
index 0bd47cb42e49..53616c2a13f9 100644
--- a/dev-python/decorator/Manifest
+++ b/dev-python/decorator/Manifest
@@ -1,6 +1,2 @@
 DIST decorator-4.4.2.tar.gz 33629 BLAKE2B 5b2c6a1b6aba293d4b93444d4613e3c9af16bd9d6d80ae9eb21112a4a16397ff67e1f648e8118beeb7d17755a2f1bd37b867f73129c42ef7f8654d1c1f609e5f SHA512 c068efd4e70764ac447b772c9c29625c2180dad256b2b4e46a50a8479fc1d7de09b114c2ba11bb37dd58774ed9460d2e0ea9fa76061833a2d3c2676ac91a0db1
-DIST decorator-5.0.0.tar.gz 33099 BLAKE2B c59a02c2a9c27342dcfdc96ecb89bb9d7f91add52a9e823963976d750b0197255e4c68f72b61f940f36fd09c504f7fa75a10c3cf0e17758fe707a79d332070ba SHA512 010e0ac6b8929b73afdfe57d41915cf56db3edcb2759ba6224bf589e5ff1780021ef9f65a628b530422665d3fc2f9b9b48e21db5e0f21053dbb5d0d20e8da194
-DIST decorator-5.0.3.tar.gz 33035 BLAKE2B 5d9f071422ca7135f6a72f731a56c39e7c790f329d749cb4100c8cfc08d19ae84955e22d0fa335601982fcf896437b107f48831469002f319ecd7f354f49b3a3 SHA512 04272791c7b645341a7bcba7bf63287a9741a9e306e02ef63efea2b6c0535b1b49e5a36ad521872450635d04874bbd180fbc76bf2d6a5fbe894b309fc7bf4376
-DIST decorator-5.0.5.tar.gz 33827 BLAKE2B c6155a2ad6eb1b0f08ea9aa5eaf165682915869a7cd9e465b792e15c8065763993fa0008e467fd3c11526d81f531107271aa795be00f7ae9b57a0a6e9b802fef SHA512 ba5269de8d7821547348902917dc503582ca4576482c149b42a8b3407d901cb14700996992dc9743a990a6bf347c80966bc82b92ffe95b7b0034736c3fbcaf83
-DIST decorator-5.0.6.tar.gz 33937 BLAKE2B 88784f44976f439d071c8a6bfa0df2842fec289ec9a87f51a22bdcc6324b65cce0d268d55ea66ef91f28810a00f86f120c95987489f79b11e74e9f2dd0d7f855 SHA512 686e3281724bc754fcb45a208f9d410db7d3258d639c72827c360bcc647c688ae229e333c5bd32d70a583deda41f7804cd9a09149f161a8cc60c02210950242f
 DIST decorator-5.0.7.tar.gz 34292 BLAKE2B 93f69256e21fd9867faf8c80c6a62834e5206aeb552efb757badeb0f0ec0085699a520542feac2bfa1a0165c0a40f86ecf70e5717c10801bed28d1acd7397216 SHA512 78ae542b2f20d3d1714cf13120b14db308d73b866591c8ae42d69103a11e8d05a553438619bb68730310857587746e9d211ec4cf4b3fb5fbbcef030183b65294
diff --git a/dev-python/decorator/decorator-5.0.0.ebuild b/dev-python/decorator/decorator-5.0.0.ebuild
deleted file mode 100644
index 9775a5587507..000000000000
--- a/dev-python/decorator/decorator-5.0.0.ebuild
+++ /dev/null
@@ -1,21 +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="Simplifies the usage of decorators for the average programmer"
-HOMEPAGE="https://github.com/micheles/decorator https://pypi.org/project/decorator/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-DOCS=( CHANGES.md )
-
-python_test() {
-	"${EPYTHON}" src/tests/test.py -v || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/decorator/decorator-5.0.3.ebuild b/dev-python/decorator/decorator-5.0.3.ebuild
deleted file mode 100644
index 9775a5587507..000000000000
--- a/dev-python/decorator/decorator-5.0.3.ebuild
+++ /dev/null
@@ -1,21 +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="Simplifies the usage of decorators for the average programmer"
-HOMEPAGE="https://github.com/micheles/decorator https://pypi.org/project/decorator/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-DOCS=( CHANGES.md )
-
-python_test() {
-	"${EPYTHON}" src/tests/test.py -v || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/decorator/decorator-5.0.5.ebuild b/dev-python/decorator/decorator-5.0.5.ebuild
deleted file mode 100644
index 9775a5587507..000000000000
--- a/dev-python/decorator/decorator-5.0.5.ebuild
+++ /dev/null
@@ -1,21 +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="Simplifies the usage of decorators for the average programmer"
-HOMEPAGE="https://github.com/micheles/decorator https://pypi.org/project/decorator/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-DOCS=( CHANGES.md )
-
-python_test() {
-	"${EPYTHON}" src/tests/test.py -v || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/decorator/decorator-5.0.6.ebuild b/dev-python/decorator/decorator-5.0.6.ebuild
deleted file mode 100644
index 9775a5587507..000000000000
--- a/dev-python/decorator/decorator-5.0.6.ebuild
+++ /dev/null
@@ -1,21 +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="Simplifies the usage of decorators for the average programmer"
-HOMEPAGE="https://github.com/micheles/decorator https://pypi.org/project/decorator/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-DOCS=( CHANGES.md )
-
-python_test() {
-	"${EPYTHON}" src/tests/test.py -v || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/decorator/decorator-5.0.7.ebuild b/dev-python/decorator/decorator-5.0.7.ebuild
index 9775a5587507..f89c20047bf4 100644
--- a/dev-python/decorator/decorator-5.0.7.ebuild
+++ b/dev-python/decorator/decorator-5.0.7.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 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"
 
 DOCS=( CHANGES.md )
 
diff --git a/dev-python/django/Manifest b/dev-python/django/Manifest
index 8af0f7cca7f1..0f3bdddc585a 100644
--- a/dev-python/django/Manifest
+++ b/dev-python/django/Manifest
@@ -1,14 +1,6 @@
-DIST Django-2.2.20.checksum.txt 2553 BLAKE2B 93b0cb2abdf105a0755b960d5047e473a9a70abf89a73d37e86b846227be377b5b0b9f581cd0c18bdcdf92a7968e3e1cac8203558395c76d40e6b6bf899d2e46 SHA512 d573cfd94ea30ae3403d4e59232421f7f26b3c45c5485497b1b9706f1c41b98dbe31c13c02b24ed66bbf34063fa3ac867eaebc4ebc9da2df5f19a190138b2e3d
-DIST Django-2.2.20.tar.gz 9182853 BLAKE2B e1f3e685bad3b81ea687ff2b63b8cc874e8bc29a87ee8287104f50914839a9cf6c144693787fe175f84b0fb6d05378fc2382b047c1d02f944dd1609410e95576 SHA512 1d72805b3b80c9bc33a99e213f610aaf9ef90cdefa2341d7970499e831a69d2b26e5ce1e1ba1f9452b64ec768bb3f002968ebc7e26b99d5f8a07cd89b72b6870
 DIST Django-2.2.21.checksum.txt 2557 BLAKE2B 76c1588760de34bdd4274eb12abcb60dd476ef1057dd7679ae76f8b7fe916c40c26ab19a821075523c5ae886802af7aa267efafe3d8192ad14ac18557651f5cf SHA512 83d4893e83eaf271f783c177549f8267a2d84969a6d87447f3cb9d9cb36d9acb48564867644c7d95763f9a3888dd9d8647233733b92b432c54e4472f8c34a5fd
 DIST Django-2.2.21.tar.gz 9209871 BLAKE2B 616215d43fc879bd4f01fb6fec7f3fa47c4630bcc961c8606c01a6e25c2ff27dfdf886db7dc03f8445b52957c1ad858fb8bb5e7cd25c97a927646bba436399de SHA512 37d1f58c23907792e49c827fe1efe4345fd5d74ca85b44d1f492d45c9f4f7cc9ebfbd59dc6a142bb24b666fb89e2ee62a3bc3e2242cd25d5c1e801a3f07a2589
-DIST Django-3.0.14.checksum.txt 2553 BLAKE2B 142b407d6573cac8d07a140370123ce3996433742a67907cedff340741f36b0f82fb577a671929a938967b810d25cf2f491ff85241e6a25782e216eb5571c89f SHA512 3c0ec40c42b23d0213df540eeecb3d8dfc8590ccdbd2c5e8fab598a09dff0408364ea3c8836963e94205e0086c96bd64b8a049a62b9250c6b0c5850cf8d834db
-DIST Django-3.0.14.tar.gz 9259569 BLAKE2B 454b91900a9d8cf81f6227adb465e4f9e0da16e4ddab40fa4a1c66ab131832088dd89be129ec97fd70dc8725e826e7da2c657c87c2339db64dd3eba410a91eb3 SHA512 d503f99417479e5c8be928981c14517c519adc88923efaec691cf090b4d9de77424d9ca5dae09a29dae4cb5e962cd86bbfb39cc86c3e910d45bc1757cf169d4a
-DIST Django-3.1.8.checksum.txt 2544 BLAKE2B e62097ab681f16fb9732b656a05edc77673e3eefd81112bb7d362857c81f3d3f16baeb354e48f5989be8044df11440436ea39315d8c5f573968e93a54d310a3e SHA512 7c41575a3ee18f0db07b51a02ec780cf51a4cd375879c368f1b3dca405b13d1fec303bd2b85a38732c4a371c8aee7ec49fa5e12d3e1c88295a8c5e6e65f7b9c7
-DIST Django-3.1.8.tar.gz 9651582 BLAKE2B 00d0b80f2508df0d68e4009297f1251138419da0ded8ba51e85596399ffb456ac7351ed212d0f88a317ebb6b706c5ef3ee39579d9029d567ecdcf3a3af992212 SHA512 2b4df8595778b1436fe0077514f3a51d3e298fcdfb7751c8ba8bb7125ece3199a8269b2da96cdcdb230a39707e122a6d8f48444598fb624d5f5c312b12c2d7cc
 DIST Django-3.1.9.checksum.txt 2548 BLAKE2B 2b733f7ef48b861fd97136a4efa034420e956e506020336ffaec4de7aa7d967d88bcfc5d8574afde317a74f95703378489109334569a84e163fcc635c59378ee SHA512 4558df4393661deb44c0b0c4658aeef3757e8e16dab98b177d0f5102398530dc96d526a955e4f7c88b2d0c40af544e7f9f6deb8d2697c4626c19e16f1860fb06
 DIST Django-3.1.9.tar.gz 9673018 BLAKE2B 6212bb48b31566ed2d87f2bdf7922b6e3e93df06b4f8f7ddb1fd20a1a7465856ccc280dad6885f1d2fbf90c6c1919cbc0830416e82e4123fee1c116561d0631c SHA512 7df6afd2539407727a250a981488c80450b882772ecf0edb778182a828d4c80a47b668e64e6e2adc8d21fcab92aef5322cfae3f386369688087774708e75fa13
 DIST Django-3.2.1.checksum.txt 2548 BLAKE2B 2f5feeffd4cc664e5ef97de2ae1428a9f432f4480fee846bf8abefbecdd4e418736ca700481e3fc6f114d6c62ff083dae60cefee4e5d8481f97f013fba1e0242 SHA512 32cfa9d890059fda32bbd0062b0333bad4b1b616bd555a99870fad09e7d3c662117b4fd5fb98ac7e634daf199434c2f58fdaeb28d895cf714ae05fbf7eef1b91
 DIST Django-3.2.1.tar.gz 9820723 BLAKE2B 968104e3a42310effe8a81b46eb7e17b97aa8f92fddaeef6a1dbee49947d9711daf0c71628fb9c4384a4e7bcb63041a15151f71a368f20934db80513967f0ea2 SHA512 5f3f80047cdcb6c9a07ca0dc9d6d83d190c8c0215311f39e6e441384659c92e4fa42bf4677d297a4ba8520a0bfbd78c4b2ca13cf467c1e1220c0c6a3131ba444
-DIST Django-3.2.checksum.txt 2532 BLAKE2B f36a277a983bed99905a61ab19bff11e50ac253838ec2d9d03fb9a88541d5da530dab60817e6286dcd022cf28ce136c410b06bdd96b96547199d039b3dad922f SHA512 fae42d25963618b68f39218c6c2ed70bf5b0785568e0a7e34a6613015dcf34f433fe571866478dafa601e83150dc10b766186c820e18fd57c213867208fb6800
-DIST Django-3.2.tar.gz 9819119 BLAKE2B 5fdc0a3ee9be8b084427f4fcb226616360eaed110066aa721136045c7139683f94488434c6079e450eec65b06551e3c18d4963ae30eae06acf483a39762c6c82 SHA512 126b9e9e848ed049721163a770af062e829c11d38c8be64288287149e494ac20bb2ecec28055c36cb515fec8c4e574c4e9923b3d7bbccc548a843ce7ff7fd004
diff --git a/dev-python/django/django-2.2.20.ebuild b/dev-python/django/django-2.2.20.ebuild
deleted file mode 100644
index 79e58d63c9bc..000000000000
--- a/dev-python/django/django-2.2.20.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-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} )
-PYTHON_REQ_USE='sqlite?,threads(+)'
-
-inherit bash-completion-r1 distutils-r1 optfeature verify-sig
-
-MY_P=${P^}
-DESCRIPTION="High-level Python web framework"
-HOMEPAGE="https://www.djangoproject.com/ https://pypi.org/project/Django/"
-SRC_URI="
-	https://media.djangoproject.com/releases/$(ver_cut 1-2)/${MY_P}.tar.gz
-	verify-sig? ( https://media.djangoproject.com/pgp/${MY_P}.checksum.txt )"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="BSD"
-# admin fonts: Roboto (media-fonts/roboto)
-LICENSE+=" Apache-2.0"
-# admin icons, jquery, xregexp.js
-LICENSE+=" MIT"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="doc sqlite test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/pytz[${PYTHON_USEDEP}]
-	>=dev-python/sqlparse-0.2.2[${PYTHON_USEDEP}]"
-BDEPEND="
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		$(python_gen_impl_dep sqlite)
-		${RDEPEND}
-		dev-python/docutils[${PYTHON_USEDEP}]
-		dev-python/jinja[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pillow[webp,${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/selenium[${PYTHON_USEDEP}]
-		dev-python/tblib[${PYTHON_USEDEP}]
-		sys-devel/gettext
-	)
-	verify-sig? ( app-crypt/openpgp-keys-django )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.0.7-bashcomp.patch
-)
-
-distutils_enable_sphinx docs --no-autodoc
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/django.asc
-
-src_unpack() {
-	if use verify-sig; then
-		cd "${DISTDIR}" || die
-		verify-sig_verify_signed_checksums \
-			"${MY_P}.checksum.txt" sha256 "${MY_P}.tar.gz"
-		cd "${WORKDIR}" || die
-	fi
-
-	default
-}
-
-python_test() {
-	# Tests have non-standard assumptions about PYTHONPATH,
-	# and don't work with ${BUILD_DIR}/lib.
-	PYTHONPATH=. "${EPYTHON}" tests/runtests.py --settings=test_sqlite -v2 ||
-		die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	newbashcomp extras/django_bash_completion ${PN}-admin
-	bashcomp_alias ${PN}-admin django-admin.py
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature_header "Additional Backend support can be enabled via:"
-	optfeature "MySQL backend support" dev-python/mysqlclient
-	optfeature "PostgreSQL backend support" dev-python/psycopg:2
-	optfeature_header
-	optfeature "GEO Django" "sci-libs/gdal[geos]"
-	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
-	optfeature "ImageField Support" dev-python/pillow
-	optfeature "Password encryption" dev-python/bcrypt
-	optfeature "High-level abstractions for Django forms" dev-python/django-formtools
-}
diff --git a/dev-python/django/django-2.2.21.ebuild b/dev-python/django/django-2.2.21.ebuild
index 0baeff9f63e0..db5371e1a8e2 100644
--- a/dev-python/django/django-2.2.21.ebuild
+++ b/dev-python/django/django-2.2.21.ebuild
@@ -22,7 +22,7 @@ LICENSE+=" Apache-2.0"
 # admin icons, jquery, xregexp.js
 LICENSE+=" MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="doc sqlite test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/django/django-3.0.14-r1.ebuild b/dev-python/django/django-3.0.14-r1.ebuild
deleted file mode 100644
index 7d1b29019615..000000000000
--- a/dev-python/django/django-3.0.14-r1.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-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} )
-PYTHON_REQ_USE='sqlite?,threads(+)'
-
-inherit bash-completion-r1 distutils-r1 optfeature verify-sig
-
-MY_P=${P^}
-DESCRIPTION="High-level Python web framework"
-HOMEPAGE="https://www.djangoproject.com/ https://pypi.org/project/Django/"
-SRC_URI="
-	https://media.djangoproject.com/releases/$(ver_cut 1-2)/${MY_P}.tar.gz
-	verify-sig? ( https://media.djangoproject.com/pgp/${MY_P}.checksum.txt )"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="BSD"
-# admin fonts: Roboto (media-fonts/roboto)
-LICENSE+=" Apache-2.0"
-# admin icons, jquery, xregexp.js
-LICENSE+=" MIT"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc ~ppc64 x86"
-IUSE="doc sqlite test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	|| (
-		>=dev-python/asgiref-3.3.4[${PYTHON_USEDEP}]
-		<dev-python/asgiref-3.3.2[${PYTHON_USEDEP}]
-	)
-	dev-python/pytz[${PYTHON_USEDEP}]
-	>=dev-python/sqlparse-0.2.2[${PYTHON_USEDEP}]"
-BDEPEND="
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		$(python_gen_impl_dep sqlite)
-		${RDEPEND}
-		dev-python/docutils[${PYTHON_USEDEP}]
-		dev-python/jinja[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pillow[webp,${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/selenium[${PYTHON_USEDEP}]
-		dev-python/tblib[${PYTHON_USEDEP}]
-		sys-devel/gettext
-		!!<dev-python/ipython-7.21.0-r1
-		!!=dev-python/ipython-7.22.0-r0
-	)
-	verify-sig? ( app-crypt/openpgp-keys-django )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.0.6-bashcomp.patch
-)
-
-distutils_enable_sphinx docs --no-autodoc
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/django.asc
-
-src_unpack() {
-	if use verify-sig; then
-		cd "${DISTDIR}" || die
-		verify-sig_verify_signed_checksums \
-			"${MY_P}.checksum.txt" sha256 "${MY_P}.tar.gz"
-		cd "${WORKDIR}" || die
-	fi
-
-	default
-}
-
-src_prepare() {
-	# do not bind to a specific version
-	# https://bugs.gentoo.org/750695
-	sed -i -e 's:asgiref ~= 3.2:asgiref:' setup.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# Tests have non-standard assumptions about PYTHONPATH,
-	# and don't work with ${BUILD_DIR}/lib.
-	PYTHONPATH=. "${EPYTHON}" tests/runtests.py --settings=test_sqlite -v2 ||
-		die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	newbashcomp extras/django_bash_completion ${PN}-admin
-	bashcomp_alias ${PN}-admin django-admin.py
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature_header "Additional Backend support can be enabled via:"
-	optfeature "MySQL backend support" dev-python/mysqlclient
-	optfeature "PostgreSQL backend support" dev-python/psycopg:2
-	optfeature_header
-	optfeature "GEO Django" "sci-libs/gdal[geos]"
-	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
-	optfeature "ImageField Support" dev-python/pillow
-	optfeature "Password encryption" dev-python/bcrypt
-	optfeature "High-level abstractions for Django forms" dev-python/django-formtools
-}
diff --git a/dev-python/django/django-3.1.8-r1.ebuild b/dev-python/django/django-3.1.8-r1.ebuild
deleted file mode 100644
index 2869c5938e98..000000000000
--- a/dev-python/django/django-3.1.8-r1.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-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} )
-PYTHON_REQ_USE='sqlite?,threads(+)'
-
-inherit bash-completion-r1 distutils-r1 optfeature verify-sig
-
-MY_P=${P^}
-DESCRIPTION="High-level Python web framework"
-HOMEPAGE="https://www.djangoproject.com/ https://pypi.org/project/Django/"
-SRC_URI="
-	https://media.djangoproject.com/releases/$(ver_cut 1-2)/${MY_P}.tar.gz
-	verify-sig? ( https://media.djangoproject.com/pgp/${MY_P}.checksum.txt )"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="BSD"
-# admin fonts: Roboto (media-fonts/roboto)
-LICENSE+=" Apache-2.0"
-# admin icons, jquery, xregexp.js
-LICENSE+=" MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~sparc x86 ~x64-macos"
-IUSE="doc sqlite test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	|| (
-		>=dev-python/asgiref-3.3.4[${PYTHON_USEDEP}]
-		<dev-python/asgiref-3.3.2[${PYTHON_USEDEP}]
-	)
-	dev-python/pytz[${PYTHON_USEDEP}]
-	>=dev-python/sqlparse-0.2.2[${PYTHON_USEDEP}]"
-BDEPEND="
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		$(python_gen_impl_dep sqlite)
-		${RDEPEND}
-		dev-python/docutils[${PYTHON_USEDEP}]
-		dev-python/jinja[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pillow[webp,${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/selenium[${PYTHON_USEDEP}]
-		dev-python/tblib[${PYTHON_USEDEP}]
-		sys-devel/gettext
-		!!<dev-python/ipython-7.21.0-r1
-		!!=dev-python/ipython-7.22.0-r0
-	)
-	verify-sig? ( >=app-crypt/openpgp-keys-django-20201201 )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.1-bashcomp.patch
-)
-
-distutils_enable_sphinx docs --no-autodoc
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/django.asc
-
-src_unpack() {
-	if use verify-sig; then
-		cd "${DISTDIR}" || die
-		verify-sig_verify_signed_checksums \
-			"${MY_P}.checksum.txt" sha256 "${MY_P}.tar.gz"
-		cd "${WORKDIR}" || die
-	fi
-
-	default
-}
-
-python_test() {
-	# Tests have non-standard assumptions about PYTHONPATH,
-	# and don't work with ${BUILD_DIR}/lib.
-	PYTHONPATH=. "${EPYTHON}" tests/runtests.py --settings=test_sqlite -v2 ||
-		die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	newbashcomp extras/django_bash_completion ${PN}-admin
-	bashcomp_alias ${PN}-admin django-admin.py
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature_header "Additional Backend support can be enabled via:"
-	optfeature "MySQL backend support" dev-python/mysqlclient
-	optfeature "PostgreSQL backend support" dev-python/psycopg:2
-	optfeature_header
-	optfeature "GEO Django" "sci-libs/gdal[geos]"
-	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
-	optfeature "ImageField Support" dev-python/pillow
-	optfeature "Password encryption" dev-python/bcrypt
-	optfeature "High-level abstractions for Django forms" dev-python/django-formtools
-}
diff --git a/dev-python/django/django-3.1.9.ebuild b/dev-python/django/django-3.1.9.ebuild
index b7412a899702..aad589629e48 100644
--- a/dev-python/django/django-3.1.9.ebuild
+++ b/dev-python/django/django-3.1.9.ebuild
@@ -22,7 +22,7 @@ LICENSE+=" Apache-2.0"
 # admin icons, jquery, xregexp.js
 LICENSE+=" MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~sparc x86 ~x64-macos"
 IUSE="doc sqlite test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/django/django-3.2.ebuild b/dev-python/django/django-3.2.ebuild
deleted file mode 100644
index 14009945545f..000000000000
--- a/dev-python/django/django-3.2.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-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} )
-PYTHON_REQ_USE='sqlite?,threads(+)'
-
-inherit bash-completion-r1 distutils-r1 optfeature verify-sig
-
-MY_P=${P^}
-DESCRIPTION="High-level Python web framework"
-HOMEPAGE="https://www.djangoproject.com/ https://pypi.org/project/Django/"
-SRC_URI="
-	https://media.djangoproject.com/releases/$(ver_cut 1-2)/${MY_P}.tar.gz
-	verify-sig? ( https://media.djangoproject.com/pgp/${MY_P}.checksum.txt )"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="BSD"
-# admin fonts: Roboto (media-fonts/roboto)
-LICENSE+=" Apache-2.0"
-# admin icons, jquery, xregexp.js
-LICENSE+=" MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
-IUSE="doc sqlite test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/asgiref-3.3.4[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	>=dev-python/sqlparse-0.2.2[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		$(python_gen_impl_dep sqlite)
-		${RDEPEND}
-		dev-python/docutils[${PYTHON_USEDEP}]
-		dev-python/jinja[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pillow[webp,${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/selenium[${PYTHON_USEDEP}]
-		dev-python/tblib[${PYTHON_USEDEP}]
-		sys-devel/gettext
-		!!<dev-python/ipython-7.21.0-r1
-		!!=dev-python/ipython-7.22.0-r0
-	)
-	verify-sig? ( >=app-crypt/openpgp-keys-django-20201201 )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.1-bashcomp.patch
-)
-
-distutils_enable_sphinx docs --no-autodoc
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/django.asc
-
-src_unpack() {
-	if use verify-sig; then
-		cd "${DISTDIR}" || die
-		verify-sig_verify_signed_checksums \
-			"${MY_P}.checksum.txt" sha256 "${MY_P}.tar.gz"
-		cd "${WORKDIR}" || die
-	fi
-
-	default
-}
-
-python_test() {
-	# Tests have non-standard assumptions about PYTHONPATH,
-	# and don't work with ${BUILD_DIR}/lib.
-	PYTHONPATH=. "${EPYTHON}" tests/runtests.py --settings=test_sqlite -v2 ||
-		die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	newbashcomp extras/django_bash_completion ${PN}-admin
-	bashcomp_alias ${PN}-admin django-admin.py
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature_header "Additional Backend support can be enabled via:"
-	optfeature "MySQL backend support" dev-python/mysqlclient
-	optfeature "PostgreSQL backend support" dev-python/psycopg:2
-	optfeature_header
-	optfeature "GEO Django" "sci-libs/gdal[geos]"
-	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
-	optfeature "ImageField Support" dev-python/pillow
-	optfeature "Password encryption" dev-python/bcrypt
-	optfeature "High-level abstractions for Django forms" dev-python/django-formtools
-}
diff --git a/dev-python/entrypoints/entrypoints-0.3-r2.ebuild b/dev-python/entrypoints/entrypoints-0.3-r2.ebuild
index a0727fac80df..2410523b9886 100644
--- a/dev-python/entrypoints/entrypoints-0.3-r2.ebuild
+++ b/dev-python/entrypoints/entrypoints-0.3-r2.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# 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} pypy3 )
-
+PYTHON_COMPAT=( pypy3 python3_{7..10} )
 inherit distutils-r1
 
 DESCRIPTION="Discover and load entry points from installed packages"
@@ -15,15 +14,8 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
-BDEPEND="
-	test? (
-		${RDEPEND}
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
+distutils_enable_tests pytest
 
 PATCHES=(
 	"${FILESDIR}/${PN}"-0.2.1-init.py.patch
diff --git a/dev-python/eventlet/Manifest b/dev-python/eventlet/Manifest
index fe106339ba73..c885f11deda6 100644
--- a/dev-python/eventlet/Manifest
+++ b/dev-python/eventlet/Manifest
@@ -1,2 +1,3 @@
 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
diff --git a/dev-python/eventlet/eventlet-0.31.0.ebuild b/dev-python/eventlet/eventlet-0.31.0.ebuild
new file mode 100644
index 000000000000..d649fcff2ded
--- /dev/null
+++ b/dev-python/eventlet/eventlet-0.31.0.ebuild
@@ -0,0 +1,66 @@
+# 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="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="doc 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="
+	doc? ( >=dev-python/python-docs-2.7.6-r1:2.7 )
+	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_sphinx doc
+distutils_enable_tests nose
+
+python_prepare_all() {
+	if use doc; then
+		local PYTHON_DOC_ATOM=$(best_version -b dev-python/python-docs:2.7)
+		local PYTHON_DOC_VERSION="${PYTHON_DOC_ATOM#dev-python/python-docs-}"
+		local PYTHON_DOC="/usr/share/doc/python-docs-${PYTHON_DOC_VERSION}/html"
+		local PYTHON_DOC_INVENTORY="${PYTHON_DOC}/objects.inv"
+		sed -i "s|'https://docs.python.org/': None|'${PYTHON_DOC}': '${PYTHON_DOC_INVENTORY}'|" doc/conf.py || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+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/fastjsonschema/Manifest b/dev-python/fastjsonschema/Manifest
index 2ee6693707dd..6ce7bcdbe127 100644
--- a/dev-python/fastjsonschema/Manifest
+++ b/dev-python/fastjsonschema/Manifest
@@ -1 +1,2 @@
 DIST python-fastjsonschema-2.15.0.tar.gz 35225 BLAKE2B 43b5dce109b0b25db4906b13223ede61b9f9eee9acb05b207d3cd11e0cc1d3740674c4e29709ce55dca8b4964643942be0959267d0228a71ff8fb535ccc5de17 SHA512 3323c085e79e1a465e807ef972ecd3f09811e232a36abc16d6b2e3e2ac5cc343edf2610e18d18b64fdd555d640c0ef1dd3417e268b5c62738f82680a404a300a
+DIST python-fastjsonschema-2.15.1.tar.gz 35384 BLAKE2B 89b9be7a9dcb8b22634dcfb54abec7b5709805b7087558af93b4cbca3c71a0b876956060aac0d0e7f4467db1bb38e6a587025c1c219613a661fb0d9e656b81e0 SHA512 7eb4d512eac03e258d670f6d448c5aeb74e20f892a08fa84a0412fd9c99cdc6412d4daa74bc09f9fe933a973a81227dae36125766e64f3c5b01106435ca5d70f
diff --git a/dev-python/fastjsonschema/fastjsonschema-2.15.0.ebuild b/dev-python/fastjsonschema/fastjsonschema-2.15.0.ebuild
index 8f56301479cf..375ee9426e37 100644
--- a/dev-python/fastjsonschema/fastjsonschema-2.15.0.ebuild
+++ b/dev-python/fastjsonschema/fastjsonschema-2.15.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+PYTHON_COMPAT=( python3_{7..10} )
 inherit distutils-r1
 
 MY_P=python-${P}
diff --git a/dev-python/fastjsonschema/fastjsonschema-2.15.1.ebuild b/dev-python/fastjsonschema/fastjsonschema-2.15.1.ebuild
new file mode 100644
index 000000000000..a14b649f59d6
--- /dev/null
+++ b/dev-python/fastjsonschema/fastjsonschema-2.15.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..10} )
+inherit distutils-r1
+
+MY_P=python-${P}
+DESCRIPTION="Fast JSON schema validator for Python"
+HOMEPAGE="https://github.com/horejsek/python-fastjsonschema/"
+SRC_URI="
+	https://github.com/horejsek/python-fastjsonschema/archive/v${PV}.tar.gz
+		-> ${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	distutils-r1_src_prepare
+	rm -r tests/benchmarks || die
+}
diff --git a/dev-python/fire/Manifest b/dev-python/fire/Manifest
new file mode 100644
index 000000000000..458e85959f89
--- /dev/null
+++ b/dev-python/fire/Manifest
@@ -0,0 +1 @@
+DIST fire-0.3.1.tar.gz 99035 BLAKE2B 32d961c31d255d310ebd4048aee409d42e7890d741e845c6d4f7487eda20ccb09da02509110ded35c67bcc912c0392ff2bbd0c45f7cf2559a6255971f49a09ce SHA512 cbd9e66c74c706552da44b275d7ce637ab3ce1b34cad9981ca74be2e75f1b2219d330ea914873617334357c8b02a330bc275ae62938c9afcdf1733fb809f4e20
diff --git a/dev-python/fire/fire-0.3.1.ebuild b/dev-python/fire/fire-0.3.1.ebuild
new file mode 100644
index 000000000000..6b879f43e82c
--- /dev/null
+++ b/dev-python/fire/fire-0.3.1.ebuild
@@ -0,0 +1,25 @@
+# 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="library for automatically generating command line interfaces"
+HOMEPAGE="https://github.com/google/python-fire"
+#SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/google/python-fire/archive/refs/tags/v0.3.1.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/termcolor[${PYTHON_USEDEP}]"
+BDEPEND=""
+
+S="${WORKDIR}"/python-${P}
diff --git a/dev-python/fire/metadata.xml b/dev-python/fire/metadata.xml
new file mode 100644
index 000000000000..70e2209d43b1
--- /dev/null
+++ b/dev-python/fire/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+  <email>python@gentoo.org</email>
+ </maintainer>
+ <maintainer type="person">
+  <email>tupone@gentoo.org</email>
+  <name>Tupone Alfredo</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-python/flask-security/Manifest b/dev-python/flask-security/Manifest
index 126528aa8288..5c5bca76fb7f 100644
--- a/dev-python/flask-security/Manifest
+++ b/dev-python/flask-security/Manifest
@@ -1,3 +1,2 @@
 DIST flask-security-3.4.5.gh.tar.gz 348928 BLAKE2B 9890227e9775c4a28fc364affb0bf767407463d514f6dc3cd359dd8a026e8325d943a547f294f6363a276f9e7d97336c526dd45f4549c7cfaff2d6ef9ef0316a SHA512 f9ac7f46b2e1ab7dbb44ba925b01e16304e8f8d6d5d56f4e558d07b80dfffa59f04c2597e17c00a7d7ae11be3a97c78ccf8d79993b7451be4a7f75f85bc89f6f
-DIST flask-security-4.0.0.gh.tar.gz 381592 BLAKE2B 62f8ceb5b6912839ad69a9f26793a831304f0d03cd40c73bd7c6701421d22955bec1e43713b2e07004ff9686591370378d9ff6e2e61e6bdc9a6472f18b28bfad SHA512 1d616121d0220bdef6081f4feb2c56b6feb346609548ad74c7bbbb60f4d65e9b3ec92a35fa9e077c35db9ab398d921461450594185956d05d5dda063fe972b72
 DIST flask-security-4.0.1.gh.tar.gz 389071 BLAKE2B 38e352dab5fe687211240011d844a1d5f6c0b5fcbb10752960f7ff5de14f5aa2e30ed9bdadda6684a3bc99e176edb7b8937d99322b4c131e22e87b273896c391 SHA512 ea541cb40679432dea67ffc0bc640147c518e07b7e83a01e3beacc156d0a9198a33da3f458a9219b04148c011f1a26f1a4019a216904239efea3b57e65f3cb45
diff --git a/dev-python/flask-security/files/flask-security-4.0.0-test-install.patch b/dev-python/flask-security/files/flask-security-4.0.0-test-install.patch
deleted file mode 100644
index 8e78cf7b1116..000000000000
--- a/dev-python/flask-security/files/flask-security-4.0.0-test-install.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 09fb542d472c863495a88c9cd73d692d86e86c22 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Tue, 26 Jan 2021 10:50:08 +0100
-Subject: [PATCH] Do not install global-scope 'tests' package
-
----
- setup.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/setup.py b/setup.py
-index 1d832b7..7abc0f3 100755
---- a/setup.py
-+++ b/setup.py
-@@ -19,7 +19,7 @@ install_requires = [
-     "passlib>=1.7.2",
- ]
- 
--packages = find_packages()
-+packages = find_packages(exclude=['tests'])
- 
- setup(
-     name="Flask-Security-Too",
--- 
-2.30.0
-
diff --git a/dev-python/flask-security/flask-security-4.0.0.ebuild b/dev-python/flask-security/flask-security-4.0.0.ebuild
deleted file mode 100644
index 710ccdde7e9b..000000000000
--- a/dev-python/flask-security/flask-security-4.0.0.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} )
-inherit distutils-r1
-
-DESCRIPTION="Simple security for Flask apps"
-HOMEPAGE="
-	https://github.com/Flask-Middleware/flask-security/
-	https://pypi.org/project/Flask-Security-Too/"
-SRC_URI="
-	https://github.com/Flask-Middleware/flask-security/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	dev-python/cachetools[${PYTHON_USEDEP}]
-	>=dev-python/flask-1.1.1[${PYTHON_USEDEP}]
-	>=dev-python/flask-babelex-0.9.3[${PYTHON_USEDEP}]
-	>=dev-python/flask-login-0.4.1[${PYTHON_USEDEP}]
-	>=dev-python/flask-principal-0.4.0[${PYTHON_USEDEP}]
-	>=dev-python/flask-wtf-0.14.3[${PYTHON_USEDEP}]
-	>=dev-python/itsdangerous-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/passlib-1.7.2[${PYTHON_USEDEP}]
-	>=dev-python/python-email-validator-1.1.1[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	dev-python/Babel[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/argon2-cffi-19.1.0[${PYTHON_USEDEP}]
-		>=dev-python/bcrypt-3.1.5[${PYTHON_USEDEP}]
-		>=dev-python/cryptography-2.3.1[${PYTHON_USEDEP}]
-		>=dev-python/flask-mail-0.9.1[${PYTHON_USEDEP}]
-		>=dev-python/flask-sqlalchemy-2.3[${PYTHON_USEDEP}]
-		>=dev-python/mongomock-3.19.0[${PYTHON_USEDEP}]
-		>=dev-python/peewee-3.11.2[${PYTHON_USEDEP}]
-		>=dev-python/phonenumbers-8.11.1[${PYTHON_USEDEP}]
-		>=dev-python/pony-0.7.11[${PYTHON_USEDEP}]
-		>=dev-python/psycopg-2.8.4:2[${PYTHON_USEDEP}]
-		>=dev-python/pymysql-0.9.3[${PYTHON_USEDEP}]
-		>=dev-python/pyqrcode-1.2[${PYTHON_USEDEP}]
-		>=dev-python/zxcvbn-4.4.28[${PYTHON_USEDEP}]
-		amd64? ( >=dev-python/flask-mongoengine-0.9.5[${PYTHON_USEDEP}] )
-		arm64? ( >=dev-python/flask-mongoengine-0.9.5[${PYTHON_USEDEP}] )
-	)"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}"/flask-security-4.0.0-test-install.patch
-)
-
-src_prepare() {
-	sed -i -e 's@--cache-clear@-p no:httpbin@' pytest.ini || die
-	distutils-r1_src_prepare
-}
-
-python_configure_all() {
-	esetup.py compile_catalog
-}
diff --git a/dev-python/flask-security/flask-security-4.0.1.ebuild b/dev-python/flask-security/flask-security-4.0.1.ebuild
index bf467c441d7e..dfdeff5a760c 100644
--- a/dev-python/flask-security/flask-security-4.0.1.ebuild
+++ b/dev-python/flask-security/flask-security-4.0.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	>=dev-python/blinker-1.4[${PYTHON_USEDEP}]
diff --git a/dev-python/fonttools/Manifest b/dev-python/fonttools/Manifest
index 82abe74e775e..6d9412e77785 100644
--- a/dev-python/fonttools/Manifest
+++ b/dev-python/fonttools/Manifest
@@ -1,3 +1,2 @@
-DIST fonttools-4.21.1.tar.gz 2531249 BLAKE2B 7f507f85061c67da0003ed2c4f685b22ccf0e6c5067adb934772ef0832656bbe092d1282b30b5a40071cd3a3219f5cfd810e06e9cd3f85ddd8fa93538134c943 SHA512 8c54809ab9f39e34f482ee6b17dbf8b309e8bfa0bde783e24195c1f2949ded64591c5e79565136ec8492c0095d593db20779d3f28b933f8e40e54b610130e0f4
 DIST fonttools-4.22.0.tar.gz 2544600 BLAKE2B 685da467c40fc7cffe2b33b08da53e5bd148c5190efdc8d08e2c66ef06e67b5e26ec5fa090334b9ef427b1a005c6386b0f78b978d376c7daee7f4d540faa21c7 SHA512 06db054ce488d0291f876b05b5dd09a772a702f1d45b97c1ba46d02e01fe59f7c63e268fff958baa4076c1ce72f450384e473263250c1617791d78c0e311710d
 DIST fonttools-4.22.1.tar.gz 2544433 BLAKE2B 711737f696bd3a25f0c0eec2c1fb80c38dcab81d974c7f5c9d9e644aa3850dbb08502ba14111397b42615fc5287f9af8aa4d7b83e7fe9f23ae4d080f2864189d SHA512 2f38eda41ce913bdd6e62f495a215c38ed9c1fa7df87f1ecc0964b3065498e39c55e030899a5561321b16f995a705449c958244ecca2aaef492c49066db0ef93
diff --git a/dev-python/fonttools/fonttools-4.21.1.ebuild b/dev-python/fonttools/fonttools-4.21.1.ebuild
deleted file mode 100644
index aba21adf0c33..000000000000
--- a/dev-python/fonttools/fonttools-4.21.1.ebuild
+++ /dev/null
@@ -1,55 +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="xml(+)"
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Library for manipulating TrueType, OpenType, AFM and Type1 fonts"
-HOMEPAGE="https://github.com/fonttools/fonttools/"
-SRC_URI="https://github.com/fonttools/fonttools/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
-RESTRICT="!test? ( test )"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	test? (
-		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
-
-		>=dev-python/fs-2.4.9[${PYTHON_USEDEP}]
-		app-arch/brotli[python,${PYTHON_USEDEP}]
-		app-arch/zopfli
-	)"
-
-python_prepare_all() {
-	# When dev-python/pytest-shutil is installed, we get weird import errors.
-	# This is due to incomplete nesting in the Tests/ tree:
-	#
-	#   Tests/feaLib/__init__.py
-	#   Tests/ufoLib/__init__.py
-	#   Tests/svgLib/path/__init__.py
-	#   Tests/otlLib/__init__.py
-	#   Tests/varLib/__init__.py
-	#
-	# This tree requires an __init__.py in Tests/svgLib/ too, bug #701148.
-	touch Tests/svgLib/__init__.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-src_test() {
-	# virtualx used when matplotlib is installed causing plot module tests to run
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	pytest -vv Tests fontTools || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/fonttools/fonttools-4.22.0.ebuild b/dev-python/fonttools/fonttools-4.22.0.ebuild
index 1c49e0e79245..84c20edeedc0 100644
--- a/dev-python/fonttools/fonttools-4.22.0.ebuild
+++ b/dev-python/fonttools/fonttools-4.22.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/fonttools/fonttools/archive/${PV}.tar.gz -> ${P}.tar
 
 LICENSE="BSD"
 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"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/google-api-core/Manifest b/dev-python/google-api-core/Manifest
index ed78cdf9a666..f93491766243 100644
--- a/dev-python/google-api-core/Manifest
+++ b/dev-python/google-api-core/Manifest
@@ -1,2 +1 @@
-DIST google-api-core-1.26.1.tar.gz 132880 BLAKE2B f1872c1240b0b40385fce0496c676c2408501600710ec51cdcbfa8c5f0f15858ef62860f33022bd9ceaffbca25ec83cc1879b7ec7c3a3b119e5e3cc4ac043a0f SHA512 138bd10895006885761f34932bf8f4b0776c2f3a2c2038d97d1837d961088b4a19cbd84321a493b81cad4727374949e87c59b7f649507a7cb356e6457a94cb1f
 DIST google-api-core-1.26.3.tar.gz 133409 BLAKE2B ca3c63769f87cc79483d5ac52646cb044fa21e4f702a945994aeffad71b5be6bd1105e7aa3ec489c943d8adb1148f1c5eb868d64d71f0bcc4a6084ff470acf05 SHA512 8a7753ee30f6f3bb78265b083d8fb80a48021ab32c849ddadaf969263e5a63bfaeb3010b584440d5c5f1c4e0dcd4e8fcd4df16321ccb03d3c0932e19502bbe4c
diff --git a/dev-python/google-api-core/google-api-core-1.26.1-r1.ebuild b/dev-python/google-api-core/google-api-core-1.26.1-r1.ebuild
deleted file mode 100644
index 4bb106b3b6c8..000000000000
--- a/dev-python/google-api-core/google-api-core-1.26.1-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# 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} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1
-
-DESCRIPTION="Core Library for Google Client Libraries"
-HOMEPAGE="https://github.com/googleapis/python-api-core
-	https://googleapis.dev/python/google-api-core/latest"
-SRC_URI="https://github.com/googleapis/${PN//google/python}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${P//google/python}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-RDEPEND="
-	dev-python/namespace-google[${PYTHON_USEDEP}]
-	dev-python/protobuf-python[${PYTHON_USEDEP}]
-	dev-python/googleapis-common-protos[${PYTHON_USEDEP}]
-	>=dev-python/google-auth-1.21.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.18.0[${PYTHON_USEDEP}]
-	<dev-python/requests-3[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/grpcio[${PYTHON_USEDEP}]
-		dev-python/rsa[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests --install pytest
-
-python_install_all() {
-	distutils-r1_python_install_all
-	find "${D}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/google-api-core/google-api-core-1.26.3.ebuild b/dev-python/google-api-core/google-api-core-1.26.3.ebuild
index 1f2741cdc81a..4bb106b3b6c8 100644
--- a/dev-python/google-api-core/google-api-core-1.26.3.ebuild
+++ b/dev-python/google-api-core/google-api-core-1.26.3.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${P//google/python}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 RDEPEND="
 	dev-python/namespace-google[${PYTHON_USEDEP}]
diff --git a/dev-python/google-api-python-client/Manifest b/dev-python/google-api-python-client/Manifest
index 9ddbb81c64cc..64f9c9bf9157 100644
--- a/dev-python/google-api-python-client/Manifest
+++ b/dev-python/google-api-python-client/Manifest
@@ -1,6 +1,2 @@
-DIST google-api-python-client-1.8.3.tar.gz 13537177 BLAKE2B 00b1d46f349a8ad66d08a01da31aed224260ad38f0ee2d7a5b68afe29264234475d28b33cd95addf9f7020fa052e9528b01a4c9cdb73e2ca5742134c4f8f86b5 SHA512 7b9138b27bf032cc1b8beb321459ba5935ed31e4965fa783e472b9483cfd0e97c1da6a34e84fb8c939c462fac462d3f0d853266586ab37be8f890a6b873cf4e6
-DIST google-api-python-client-2.0.0.tar.gz 23121166 BLAKE2B 427160b34982438ef7b2ded441623daf49285c5734313f49cc47d1bef5a86a80613ae357a0307b84c145219c44d301b5fb5243bda9f4005c56aa2de97efe112c SHA512 1172e50349d2062e1c79d864c0b9602a1a51823c4453f68f1d6d8644fca330ef7767168cdd45623452271930c0234ff07a94fa694509095bffd8724be3961c2b
-DIST google-api-python-client-2.0.2.tar.gz 23122914 BLAKE2B 0df0b44b2e86088069c5abc1916e733340ccfdb5be7629a2b5f1fcc8e5597183213d2ec149ef64a879bd50710ac804839b7d3be3d912ff6f132473dc6b4050f1 SHA512 9224a1f925ddeedfa0237372b4c5d1dbab913e07a8885398b955ff188decea68ebcde36fdc06394674e31d8ff4dee02aba0e13ebf8f599b1fc19854c21f9ce85
-DIST google-api-python-client-2.1.0.tar.gz 23921001 BLAKE2B 8594d79a0eb71587c2d0d55c3d9bc1414f5ec057594324638947fb408182a58f04a8672bbbfeda95a262ff2888d93e3e103730f592caf4d884d392f8ed894824 SHA512 c76075920a3e56f3d64ada1973ade61bb3806afd63e5bd184074b4a3a16e143aa5662543127e98451a942c6b47e8f9f28002ef52b548fc8702ef703c0da33cf4
 DIST google-api-python-client-2.2.0.tar.gz 24631108 BLAKE2B 377b87d30a0adb2bdbf983e9821e8be5db371e70572d79cafc1c4d231206461d50373b87aed5927cf5a485c3c1b21819db2719107cf58472551a7a0f858d8090 SHA512 9e921aa4b3868f85ecc3eb572d465c13851b1dfa0e84d11706821d5d02511cd4ae4fab4b9b55c606446d5753dccb973a99de888fbfa890aa1fcb6083fde976de
 DIST google-api-python-client-2.3.0.tar.gz 24912943 BLAKE2B 60233808f0f6243c37e8915791975e9aa10fa2d82e54c183582db9712dc36920d7d99f6caa67a25a96b1806ae9f96fd4f371010472b753f7a80d5e4fab49bd3e SHA512 11b9ba2f6417c017d47c9563460c38afdbfd01658e6c0f1812b1cdd1068b04bd37bb362e2ade4214fcc9a89d758f31bc977e281b093793a48641a2b7d926715e
diff --git a/dev-python/google-api-python-client/google-api-python-client-1.8.3-r1.ebuild b/dev-python/google-api-python-client/google-api-python-client-1.8.3-r1.ebuild
deleted file mode 100644
index 074bd73c9348..000000000000
--- a/dev-python/google-api-python-client/google-api-python-client-1.8.3-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 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="Google API Client for Python"
-HOMEPAGE="https://github.com/googleapis/google-api-python-client"
-SRC_URI="https://github.com/googleapis/google-api-python-client/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/chardet[${PYTHON_USEDEP}]
-	>=dev-python/httplib2-0.9.2[${PYTHON_USEDEP}]
-	<dev-python/httplib2-1[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/google-api-core[${PYTHON_USEDEP}]
-	>=dev-python/google-auth-1.4.1[${PYTHON_USEDEP}]
-	>=dev-python/google-auth-httplib2-0.0.3[${PYTHON_USEDEP}]
-	>=dev-python/uritemplate-3.0[${PYTHON_USEDEP}]
-	<dev-python/uritemplate-4[${PYTHON_USEDEP}]
-	>=dev-python/six-1.6.1[${PYTHON_USEDEP}]
-	<dev-python/six-2[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/google-auth-httplib2[${PYTHON_USEDEP}]
-		dev-python/oauth2client[${PYTHON_USEDEP}]
-		dev-python/rsa[${PYTHON_USEDEP}]
-		dev-python/unittest2[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=(
-	"${FILESDIR}/google-api-python-client-1.8.3-tests.patch"
-)
-
-distutils_enable_tests pytest
-
-python_test() {
-	distutils_install_for_testing
-	pytest -vv || die "tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.0.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.0.0.ebuild
deleted file mode 100644
index 8f277e406986..000000000000
--- a/dev-python/google-api-python-client/google-api-python-client-2.0.0.ebuild
+++ /dev/null
@@ -1,46 +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="Google API Client for Python"
-HOMEPAGE="https://github.com/googleapis/google-api-python-client"
-SRC_URI="https://github.com/googleapis/google-api-python-client/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-RDEPEND="
-	>=dev-python/httplib2-0.15[${PYTHON_USEDEP}]
-	<dev-python/httplib2-1[${PYTHON_USEDEP}]
-	dev-python/google-api-core[${PYTHON_USEDEP}]
-	>=dev-python/google-auth-1.16.0[${PYTHON_USEDEP}]
-	>=dev-python/google-auth-httplib2-0.0.3[${PYTHON_USEDEP}]
-	>=dev-python/uritemplate-3.0.0[${PYTHON_USEDEP}]
-	<dev-python/uritemplate-4[${PYTHON_USEDEP}]
-	>=dev-python/six-1.13.0[${PYTHON_USEDEP}]
-	<dev-python/six-2[${PYTHON_USEDEP}]
-	"
-BDEPEND="
-	test? (
-		dev-python/unittest2[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests --install pytest
-
-python_test() {
-	local deselect=(
-		# require Internet access (and credentials)
-		tests/test_discovery.py::DiscoveryErrors::test_credentials_and_credentials_file_mutually_exclusive
-		tests/test_discovery.py::DiscoveryFromDocument::test_api_endpoint_override_from_client_options_mapping_object
-	)
-
-	distutils_install_for_testing
-	pytest -vv ${deselect[@]/#/--deselect } ||
-		die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.0.2.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.0.2.ebuild
deleted file mode 100644
index 063c4ef93ac7..000000000000
--- a/dev-python/google-api-python-client/google-api-python-client-2.0.2.ebuild
+++ /dev/null
@@ -1,49 +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="Google API Client for Python"
-HOMEPAGE="https://github.com/googleapis/google-api-python-client"
-SRC_URI="https://github.com/googleapis/google-api-python-client/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-RDEPEND="
-	>=dev-python/httplib2-0.15[${PYTHON_USEDEP}]
-	<dev-python/httplib2-1[${PYTHON_USEDEP}]
-	dev-python/google-api-core[${PYTHON_USEDEP}]
-	>=dev-python/google-auth-1.16.0[${PYTHON_USEDEP}]
-	>=dev-python/google-auth-httplib2-0.0.3[${PYTHON_USEDEP}]
-	>=dev-python/uritemplate-3.0.0[${PYTHON_USEDEP}]
-	<dev-python/uritemplate-4[${PYTHON_USEDEP}]
-	>=dev-python/six-1.13.0[${PYTHON_USEDEP}]
-	<dev-python/six-2[${PYTHON_USEDEP}]
-	"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/oauth2client[${PYTHON_USEDEP}]
-		dev-python/parameterized[${PYTHON_USEDEP}]
-		dev-python/unittest2[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests --install pytest
-
-python_test() {
-	local deselect=(
-		# require Internet access (and credentials)
-		tests/test_discovery.py::DiscoveryErrors::test_credentials_and_credentials_file_mutually_exclusive
-		tests/test_discovery.py::DiscoveryFromDocument::test_api_endpoint_override_from_client_options_mapping_object
-	)
-
-	distutils_install_for_testing
-	pytest -vv ${deselect[@]/#/--deselect } ||
-		die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.1.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.1.0.ebuild
deleted file mode 100644
index cb4d93176de0..000000000000
--- a/dev-python/google-api-python-client/google-api-python-client-2.1.0.ebuild
+++ /dev/null
@@ -1,49 +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="Google API Client for Python"
-HOMEPAGE="https://github.com/googleapis/google-api-python-client"
-SRC_URI="https://github.com/googleapis/google-api-python-client/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-RDEPEND="
-	>=dev-python/httplib2-0.15[${PYTHON_USEDEP}]
-	<dev-python/httplib2-1[${PYTHON_USEDEP}]
-	dev-python/google-api-core[${PYTHON_USEDEP}]
-	>=dev-python/google-auth-1.16.0[${PYTHON_USEDEP}]
-	>=dev-python/google-auth-httplib2-0.1.0[${PYTHON_USEDEP}]
-	>=dev-python/uritemplate-3.0.0[${PYTHON_USEDEP}]
-	<dev-python/uritemplate-4[${PYTHON_USEDEP}]
-	>=dev-python/six-1.13.0[${PYTHON_USEDEP}]
-	<dev-python/six-2[${PYTHON_USEDEP}]
-	"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/oauth2client[${PYTHON_USEDEP}]
-		dev-python/parameterized[${PYTHON_USEDEP}]
-		dev-python/unittest2[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests --install pytest
-
-python_test() {
-	local deselect=(
-		# require Internet access (and credentials)
-		tests/test_discovery.py::DiscoveryErrors::test_credentials_and_credentials_file_mutually_exclusive
-		tests/test_discovery.py::DiscoveryFromDocument::test_api_endpoint_override_from_client_options_mapping_object
-	)
-
-	distutils_install_for_testing
-	pytest -vv ${deselect[@]/#/--deselect } ||
-		die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.2.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.2.0.ebuild
index cb4d93176de0..d780f80fd22b 100644
--- a/dev-python/google-api-python-client/google-api-python-client-2.2.0.ebuild
+++ b/dev-python/google-api-python-client/google-api-python-client-2.2.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/googleapis/google-api-python-client/archive/v${PV}.t
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 RDEPEND="
 	>=dev-python/httplib2-0.15[${PYTHON_USEDEP}]
diff --git a/dev-python/google-apitools/Manifest b/dev-python/google-apitools/Manifest
index ca8360535682..1b622b1f448e 100644
--- a/dev-python/google-apitools/Manifest
+++ b/dev-python/google-apitools/Manifest
@@ -1 +1,2 @@
 DIST google-apitools-0.5.31.tar.gz 364797 BLAKE2B f61ea1f982653998d9c85782f171f1bbb5f1c20dee067eb5b865d4eb87db8287544aeeb94f722f8cd1d04c45974c15c54ec7edd581287323c9336d11e642f1b6 SHA512 b66b4ee17dca9330c036ad93521ec76ece84b2780743486e58f768db8949875710af256fe6ba8e570c1309b791c0fc0d6fca84342e3ced85fc6fba416cd849e1
+DIST google-apitools-0.5.32.tar.gz 365913 BLAKE2B e43b21e6ce8491c89955bd6c194a1f4076988be2f67280c1bfb8184e1b83a01c307077080d182877d1306814bc38aa0541d9d417cfb93afdd766ddb3c83e0ef5 SHA512 5996d80cb08fd7de3b2df5fbdbe56c885af5d85276a44f174762ac71407227e454d338007035ba2b3deef09384e7bd389f121ea5e19e5e302a054f1033c19b6f
diff --git a/dev-python/google-apitools/google-apitools-0.5.32.ebuild b/dev-python/google-apitools/google-apitools-0.5.32.ebuild
new file mode 100644
index 000000000000..71c197d97e73
--- /dev/null
+++ b/dev-python/google-apitools/google-apitools-0.5.32.ebuild
@@ -0,0 +1,35 @@
+# 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
+
+COMMIT_HASH="7975c0cdbae1b9fc106553ce46e4a59cf0bea1e1"
+DESCRIPTION="Python library to manipulate Google APIs"
+HOMEPAGE="https://github.com/google/apitools"
+SRC_URI="
+	https://github.com/google/apitools/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz"
+S="${WORKDIR}/${P#google-}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+RDEPEND="
+	>=dev-python/httplib2-0.8[${PYTHON_USEDEP}]
+	>=dev-python/fasteners-0.14[${PYTHON_USEDEP}]
+	>=dev-python/oauth2client-1.5.2[${PYTHON_USEDEP}]
+	>=dev-python/six-1.12.0[${PYTHON_USEDEP}]
+	>=dev-python/python-gflags-3.1.2[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? ( >=dev-python/mock-1.0.1[${PYTHON_USEDEP}] )"
+
+PATCHES=(
+	"${FILESDIR}/google-apitools-0.5.30-py37.patch"
+)
+
+distutils_enable_tests nose
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index dc026f5bd2f0..4edb2e52fcd4 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -1,5 +1,6 @@
 DIST hypothesis-python-6.10.0.tar.gz 9126095 BLAKE2B 7dbcbb1d1099490c5329fb9a134b87449a8224565c4ccc88692c6cdedc847b0c3143b438f1d7bed98932ddfdf53fb5d09980ec0cc7d5e23fe60e651aef10ddbe SHA512 a9ced1baccaa411c264aa02de3ebc2d76985b3f61a378f9ec413b510b7b16c40cc3072d0d042a03046593b303ee367f3dd34f8b09987a1b0fb97de77f6fe3e8d
 DIST hypothesis-python-6.10.1.tar.gz 9126246 BLAKE2B cc8cb3436d1de5d3d65a13cb5edefdbaae8bf9daed296eea9111ac46c002c34f43119f10b2ab1f45c5cbca5fe46d00738676290eb0e8437f2c10b5926d9e0915 SHA512 586b7f380cb850089f7d5321f11da92ef4a9b80e2ea925103e29c1f6c6c9da0a2a899a1a45ce77e0a40073f147561bc4fcbd5cb2ce77a9c0c65f6f64dfe4b716
+DIST hypothesis-python-6.12.0.tar.gz 9127949 BLAKE2B fae9be5f82362f46554e9912f34e7da06b2e8f8612428af7a8a77bda06e926b8c541e79c40a8aaab4a1d4d299cd947f2ffc92f44c8d569c185891e5b6aaac61e SHA512 7eafa80a546d17cb5239caf3aa18df1a23caea3021fe9a8d1e180c85443920df44ab93a31c13192ea9856db6a1ee8d5af82f44dcbaefb6dba6c37ab63081e050
 DIST hypothesis-python-6.6.0.tar.gz 9117847 BLAKE2B bb88ebee9db53f1c5753730d04e5dfe6a39ac4c5f7d534778b22b813ba188a55de6ad8a34f611f7863d1c3287be39ed7e10981e9d6ed8d8dd106688f154c3a49 SHA512 a446b4a11c6ee013225bfcd58e26efc6c9d867545d9bcf90a19468cb01fc5e2c5a7280ff9a80d4a1adbfe06dd155df6152941d5f53869d85e1d259e68a33a5e2
 DIST hypothesis-python-6.8.1.tar.gz 9119495 BLAKE2B 4d98e30a04f652af79dd49e921b856124a312b63f087a6fd200282e9b0a0cd6fcad1a42a6008406bc347f21bf9cd6c5ff2db79d013987281f59365bd9d91550d SHA512 2f25e994438479b5faa15b2038146ab385445bf2722b0951ff55f324b074248d7322c4c6f3e9c659c18d0aa94150eea4c6567a7ac24debf2de4b32bab37a4dcc
 DIST hypothesis-python-6.8.9.tar.gz 9122168 BLAKE2B 2568dcfcbc7182071247d0b7d978abf2184be4583937a42568c3e199eac6ce538adb7b3687747979fc6ab9da1e61088db7d1a01294982e75cb04992cdc10537a SHA512 4dc3884e2487f27a3b6b362e04cecd281f9072fdd2e8e91738899baf589d6d48df9eeacb9a158251c20b210d1190b78eadd191aa95f151023bd81091131dff66
diff --git a/dev-python/hypothesis/hypothesis-6.12.0.ebuild b/dev-python/hypothesis/hypothesis-6.12.0.ebuild
new file mode 100644
index 000000000000..53d7bcf04c04
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-6.12.0.ebuild
@@ -0,0 +1,61 @@
+# 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/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/ifaddr/ifaddr-0.1.7.ebuild b/dev-python/ifaddr/ifaddr-0.1.7.ebuild
index 01f76bec620a..770de466ee75 100644
--- a/dev-python/ifaddr/ifaddr-0.1.7.ebuild
+++ b/dev-python/ifaddr/ifaddr-0.1.7.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+PYTHON_COMPAT=( pypy3 python3_{7..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/importlib_metadata/Manifest b/dev-python/importlib_metadata/Manifest
index 54902782b600..ec0b21161580 100644
--- a/dev-python/importlib_metadata/Manifest
+++ b/dev-python/importlib_metadata/Manifest
@@ -1,5 +1,3 @@
 DIST importlib_metadata-3.10.1.tar.gz 39980 BLAKE2B 9e7ba25618c9a530d122e43d6d56cc0386aad87accef111574b24aa53aaea51e08c422275acf4650eae2102a92de30d066a66c72c02b3a3b432ce9bd9453dacc SHA512 e028fb6abba0c7775943c346db0e733b5ba879583184c99f8413ded6314162e5dce03e10661b16392825038096fac8f6fbbea47ceac9565c60227129f3a3a48d
-DIST importlib_metadata-3.7.3.tar.gz 37193 BLAKE2B 0de5f4ece99db9ec4f86e9b967c8583d06a5bda939a7bdb137dba3c6a9d7fd034802d9fa0eb5bf209ae5ada89ebd0f3120557d3fa2b300739ebff2ff1bb6edb8 SHA512 1d6ee80edb3e5efb56deb0676ef42ba72fdaf124504023954cb3b1192e5378c3370a35b5e77708f3d9a19c02f0d89a1ba08a919a7aaec5e284f54c2eb3c61fc1
-DIST importlib_metadata-3.8.2.tar.gz 38973 BLAKE2B 40b001870608003a9beaa513e5f7dad0217884719a78a64dd74bad3db275ac30bc226d57f61aa644fcd0425bc69e06ce66555aa92132e89d36ecd5519c7d32d9 SHA512 c4ca5055c759b588b42708a9ca903d4cda91614385cc39016c5126e37e1f3bd0faafe7ec0cf6d58553ac71c1a028f0f74d0ba3d66135e97d75b051ea4f71cbeb
 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
diff --git a/dev-python/importlib_metadata/importlib_metadata-3.10.1.ebuild b/dev-python/importlib_metadata/importlib_metadata-3.10.1.ebuild
index eb45b99adc44..8aab6d04df8c 100644
--- a/dev-python/importlib_metadata/importlib_metadata-3.10.1.ebuild
+++ b/dev-python/importlib_metadata/importlib_metadata-3.10.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	$(python_gen_cond_dep 'dev-python/typing-extensions[${PYTHON_USEDEP}]' python3_{6,7})
diff --git a/dev-python/importlib_metadata/importlib_metadata-3.7.3.ebuild b/dev-python/importlib_metadata/importlib_metadata-3.7.3.ebuild
deleted file mode 100644
index 8aab6d04df8c..000000000000
--- a/dev-python/importlib_metadata/importlib_metadata-3.7.3.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="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-RDEPEND="
-	$(python_gen_cond_dep 'dev-python/typing-extensions[${PYTHON_USEDEP}]' python3_{6,7})
-	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-3.8.2.ebuild b/dev-python/importlib_metadata/importlib_metadata-3.8.2.ebuild
deleted file mode 100644
index eb45b99adc44..000000000000
--- a/dev-python/importlib_metadata/importlib_metadata-3.8.2.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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-
-RDEPEND="
-	$(python_gen_cond_dep 'dev-python/typing-extensions[${PYTHON_USEDEP}]' python3_{6,7})
-	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/intervaltree/intervaltree-3.0.2.ebuild b/dev-python/intervaltree/intervaltree-3.0.2.ebuild
index b0c3da88fe7d..6e6e9bf04d0d 100644
--- a/dev-python/intervaltree/intervaltree-3.0.2.ebuild
+++ b/dev-python/intervaltree/intervaltree-3.0.2.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# 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_COMPAT=( python3_{7..10} )
 inherit distutils-r1
 
 DESCRIPTION="Editable interval tree data structure for Python 2 and 3"
diff --git a/dev-python/intervaltree/intervaltree-3.1.0.ebuild b/dev-python/intervaltree/intervaltree-3.1.0.ebuild
index 83e445a2b40a..351ab7015af0 100644
--- a/dev-python/intervaltree/intervaltree-3.1.0.ebuild
+++ b/dev-python/intervaltree/intervaltree-3.1.0.ebuild
@@ -3,8 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
+PYTHON_COMPAT=( python3_{7..10} )
 inherit distutils-r1
 
 DESCRIPTION="Editable interval tree data structure for Python 2 and 3"
diff --git a/dev-python/ipykernel/Manifest b/dev-python/ipykernel/Manifest
index b83cda9c7830..406eec664695 100644
--- a/dev-python/ipykernel/Manifest
+++ b/dev-python/ipykernel/Manifest
@@ -1,2 +1,3 @@
 DIST ipykernel-5.5.0.tar.gz 112600 BLAKE2B d1df26095e9badd5eb1fe4665bac01c254375407ac3af1f014d78b9e6dd6613c6a5830c09a63191ea84c36fc31a5d9faf73b1a29dab1a020e225636f6f2f0c90 SHA512 b1726d765f4debbb4c5efcc5e2d9745d8e51ada8e1417b31463b7c9546c6887cc6c0787fd32729b4013544e2bd41829dfd289dbb45b0c5dbb026eb57a47ec51a
 DIST ipykernel-5.5.3.tar.gz 112656 BLAKE2B 4cad13f24baafc591558136405c8c643e12033ffd01b5608ffdef5442080c3e2003c0f2c4b1562c1f326b4c10e124afc358f5258a6c59b7c9db90b8bb23278e3 SHA512 7b7f0a0aed71f7713934ac071e7283be2028a221fa2b87cad8c2d26821909f81d21dec23a5f72c91e7c9de639b0d7430957c8cc58bbc026d95bd81bb0a005800
+DIST ipykernel-5.5.4.tar.gz 112728 BLAKE2B 489e12d0cbde2f80f2c921f026c7b84554b1fef481164e07f89b063127b01d106fc6b19f830ac321d79285fb9df065352dbc0c2a997b3629a64e766d2e50f347 SHA512 96728321fe71d528435415eda917c623269af734598a78168144d983aa64db4f9ced981fa67c83263da1ed878831669d821b84a769a08a271adafacfcbb75bf9
diff --git a/dev-python/ipykernel/ipykernel-5.5.0.ebuild b/dev-python/ipykernel/ipykernel-5.5.0-r1.ebuild
index 89acd7f816b4..7ba3bf9006ea 100644
--- a/dev-python/ipykernel/ipykernel-5.5.0.ebuild
+++ b/dev-python/ipykernel/ipykernel-5.5.0-r1.ebuild
@@ -19,7 +19,7 @@ IUSE="test"
 
 RDEPEND="
 	dev-python/ipython[${PYTHON_USEDEP}]
-	dev-python/jupyter_client[${PYTHON_USEDEP}]
+	<dev-python/jupyter_client-6.2[${PYTHON_USEDEP}]
 	dev-python/jupyter_core[${PYTHON_USEDEP}]
 	dev-python/traitlets[${PYTHON_USEDEP}]
 	www-servers/tornado[${PYTHON_USEDEP}]"
diff --git a/dev-python/ipykernel/ipykernel-5.5.3.ebuild b/dev-python/ipykernel/ipykernel-5.5.3-r1.ebuild
index 3115222a8fc2..aa8f6598a7f9 100644
--- a/dev-python/ipykernel/ipykernel-5.5.3.ebuild
+++ b/dev-python/ipykernel/ipykernel-5.5.3-r1.ebuild
@@ -19,7 +19,7 @@ IUSE="test"
 
 RDEPEND="
 	dev-python/ipython[${PYTHON_USEDEP}]
-	dev-python/jupyter_client[${PYTHON_USEDEP}]
+	<dev-python/jupyter_client-6.2[${PYTHON_USEDEP}]
 	dev-python/jupyter_core[${PYTHON_USEDEP}]
 	dev-python/traitlets[${PYTHON_USEDEP}]
 	www-servers/tornado[${PYTHON_USEDEP}]"
diff --git a/dev-python/ipykernel/ipykernel-5.5.4-r1.ebuild b/dev-python/ipykernel/ipykernel-5.5.4-r1.ebuild
new file mode 100644
index 000000000000..aa8f6598a7f9
--- /dev/null
+++ b/dev-python/ipykernel/ipykernel-5.5.4-r1.ebuild
@@ -0,0 +1,46 @@
+# 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
+
+DESCRIPTION="IPython Kernel for Jupyter"
+HOMEPAGE="https://github.com/ipython/ipykernel"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	dev-python/ipython[${PYTHON_USEDEP}]
+	<dev-python/jupyter_client-6.2[${PYTHON_USEDEP}]
+	dev-python/jupyter_core[${PYTHON_USEDEP}]
+	dev-python/traitlets[${PYTHON_USEDEP}]
+	www-servers/tornado[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/flaky[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/nose_warnings_filters[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local deselect=(
+		# TODO
+		ipykernel/tests/test_serialize.py::test_numpy_in_seq
+		ipykernel/tests/test_serialize.py::test_numpy_in_dict
+		ipykernel/tests/test_serialize.py::test_class
+		ipykernel/tests/test_serialize.py::test_class_oldstyle
+		ipykernel/tests/test_serialize.py::test_class_inheritance
+	)
+
+	epytest ${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/ipython/Manifest b/dev-python/ipython/Manifest
index 4f469b8eba4c..addfdfa8c9e6 100644
--- a/dev-python/ipython/Manifest
+++ b/dev-python/ipython/Manifest
@@ -1,3 +1,4 @@
 DIST ipython-7.21.0.tar.gz 5141725 BLAKE2B dae44d481e959ef7d002bdb51d0ab1e2f3eca3449071a2e4161aa735c06fef8a948d80bafd3f2bdd066208437b5ed36615cad5885af453771a32a313fba907eb SHA512 200e41d4e06343b6320f3d106925f6c995f39cf88d01250f53885d4e94d0fd9454a6be4cd7c69410f7dced94b05634f6d2269f9737cc563accf85206d4d7fff8
 DIST ipython-7.22.0.tar.gz 5143229 BLAKE2B be78fc7089d620cb9ad437ed8154b37ac8c7cd68ca18a2569cfcf7ea9af968c58eeee18c8d18a1f26459ccef73e59083ac27055c19e4df254836e484ce0a9908 SHA512 2647dcd5e0d9b6afc8d990d2c099ad7ed581b5eff6d657630929e0d0d9f8965e7c7924c51a10a797e7d7406212d7a06c941c163e6f6046aa62130049a9bbc0d0
 DIST ipython-7.23.0.tar.gz 5143701 BLAKE2B 6672ea3a5bbc9afa38c73acef87a8c8f6d1830e3b949543537b522b809b68b80e5369566c8bee68139f9c3213fbe4c07ad36377a686fe2d26d7bbafd5e54fc4a SHA512 b00b71dbb2851f03f72b6c0e93920afc52cdb3cd5b8f27ba8cca4cb062a0f313db359ba83ba3a9608bca22744efab24c27350e06c5884946709b7fd29536820f
+DIST ipython-7.23.1.tar.gz 5188898 BLAKE2B 9713b0f1f75e283e53ba19044c9919f0c4d0b1c120e63d7a79ab9c6b8783499ed115e86a24cab34fc13c46245fb43865b851e6f98a2ee729ee35c3db242fa2ba SHA512 9b35626a8a07c6bd0b93552341e5a61d3d90a60c72ad6e3fc71266d9509134366c46a7ae8aeca9c3acc7509dfeab47b5144f105cb3d1d05ef1c7acca6c2f365d
diff --git a/dev-python/ipython/ipython-7.23.1.ebuild b/dev-python/ipython/ipython-7.23.1.ebuild
new file mode 100644
index 000000000000..15e0d4c4454f
--- /dev/null
+++ b/dev-python/ipython/ipython-7.23.1.ebuild
@@ -0,0 +1,139 @@
+# 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} )
+PYTHON_REQ_USE='readline,sqlite,threads(+)'
+
+inherit distutils-r1 optfeature virtualx
+
+DESCRIPTION="Advanced interactive shell for Python"
+HOMEPAGE="https://ipython.org/ https://github.com/ipython/ipython/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples matplotlib notebook nbconvert qt5 +smp test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/backcall[${PYTHON_USEDEP}]
+	dev-python/decorator[${PYTHON_USEDEP}]
+	>=dev-python/jedi-0.16[${PYTHON_USEDEP}]
+	>=dev-python/pexpect-4.3[${PYTHON_USEDEP}]
+	dev-python/pickleshare[${PYTHON_USEDEP}]
+	>=dev-python/prompt_toolkit-2[${PYTHON_USEDEP}]
+	<dev-python/prompt_toolkit-3.1[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/traitlets[${PYTHON_USEDEP}]
+	matplotlib? (
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		dev-python/matplotlib-inline[${PYTHON_USEDEP}]
+	)
+"
+
+BDEPEND="
+	test? (
+		app-text/dvipng[truetype]
+		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		dev-python/matplotlib-inline[${PYTHON_USEDEP}]
+		dev-python/nbformat[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		>=dev-python/numpy-1.16[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/testpath[${PYTHON_USEDEP}]
+	)
+	doc? (
+		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-2[${PYTHON_USEDEP}]
+		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+RDEPEND+="
+	nbconvert? ( dev-python/nbconvert[${PYTHON_USEDEP}] )"
+PDEPEND="
+	notebook? (
+		dev-python/notebook[${PYTHON_USEDEP}]
+		dev-python/ipywidgets[${PYTHON_USEDEP}]
+		dev-python/widgetsnbextension[${PYTHON_USEDEP}]
+	)
+	qt5? ( dev-python/qtconsole[${PYTHON_USEDEP}] )
+	smp? (
+		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
+		>=dev-python/ipyparallel-6.2.3[${PYTHON_USEDEP}]
+	)"
+
+PATCHES=( "${FILESDIR}"/2.1.0-substitute-files.patch )
+
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_prepare_all() {
+	# Remove out of date insource files
+	rm IPython/extensions/cythonmagic.py || die
+	rm IPython/extensions/rmagic.py || die
+
+	# Prevent un-needed download during build
+	if use doc; then
+		sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/source/conf.py || die
+	fi
+
+	# Rename the test directory to reduce sys.path pollution
+	# https://github.com/ipython/ipython/issues/12892
+	mv IPython/extensions/{,ipython_}tests || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		emake -C docs html_noapi
+		HTML_DOCS=( docs/build/html/. )
+	fi
+}
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	# Create ipythonX.Y symlinks.
+	# TODO:
+	# 1. do we want them for pypy? No.  pypy has no numpy
+	# 2. handle it in the eclass instead (use _python_ln_rel).
+	# With pypy not an option the dosym becomes unconditional
+	dosym ../lib/python-exec/${EPYTHON}/ipython \
+		/usr/bin/ipython${EPYTHON#python}
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
+
+pkg_postinst() {
+	optfeature "sympyprinting" dev-python/sympy
+	optfeature "cythonmagic" dev-python/cython
+	optfeature "%lprun magic command" dev-python/line_profiler
+	optfeature "%mprun magic command" dev-python/memory_profiler
+
+	if use nbconvert; then
+		if ! has_version app-text/pandoc ; then
+			einfo "Node.js will be used to convert notebooks to other formats"
+			einfo "like HTML. Support for that is still experimental. If you"
+			einfo "encounter any problems, please use app-text/pandoc instead."
+		fi
+	fi
+}
diff --git a/dev-python/ipython_genutils/ipython_genutils-0.2.0-r2.ebuild b/dev-python/ipython_genutils/ipython_genutils-0.2.0-r2.ebuild
index 9d441efb6481..aa4c43d5ec0b 100644
--- a/dev-python/ipython_genutils/ipython_genutils-0.2.0-r2.ebuild
+++ b/dev-python/ipython_genutils/ipython_genutils-0.2.0-r2.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/jaraco-collections/Manifest b/dev-python/jaraco-collections/Manifest
index a8d7d189ff04..b55e5f8350be 100644
--- a/dev-python/jaraco-collections/Manifest
+++ b/dev-python/jaraco-collections/Manifest
@@ -1,2 +1 @@
-DIST jaraco.collections-3.2.0.tar.gz 18195 BLAKE2B 51510dd5053563319eac1c412deadac0a5f99ce3144d44150b5835ab92a05529998676fdcb577a5e725b19b4953c47c662e2f3eaa791de955c2493014713dd11 SHA512 cfea2de312781ec9d7a51752570432ec85e62834d02582023378ce0815e0c25f4d4e6afad8486559aa4e3f6fa6e602df917fdb11ed7a72423bea7ae816675258
 DIST jaraco.collections-3.3.0.tar.gz 18563 BLAKE2B 80e8463324598cdd6025984c6ab304b108521a606de87fa7aeacbb2234aec5fce20319d7cd288caa5a46b1fefb7e7686a2d00e668e90c38b943082267e6b4ceb SHA512 23fea645226bcfbd5f034877aff7846960ad99d65d451bdbf5b8abb166356074d07780ea8e2e25d31fd03343929596dcd64a9ec949c1ff056c11862e043a8b7e
diff --git a/dev-python/jaraco-collections/jaraco-collections-3.2.0.ebuild b/dev-python/jaraco-collections/jaraco-collections-3.2.0.ebuild
deleted file mode 100644
index a08ddd796676..000000000000
--- a/dev-python/jaraco-collections/jaraco-collections-3.2.0.ebuild
+++ /dev/null
@@ -1,33 +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
-
-MY_PN="${PN/-/.}"
-DESCRIPTION="Models and classes to supplement the stdlib collections module"
-HOMEPAGE="https://github.com/jaraco/jaraco.collections"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ia64 ppc ~ppc64 x86"
-
-RDEPEND="
-	dev-python/jaraco-classes[${PYTHON_USEDEP}]
-	dev-python/jaraco-text[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
-"
-
-PATCHES=(
-	"${FILESDIR}/jaraco-collections-3.0.0-pypy.patch"
-)
-
-distutils_enable_sphinx docs '>=dev-python/jaraco-packaging-3.2' \
-	'>=dev-python/rst-linker-1.9'
-distutils_enable_tests pytest
diff --git a/dev-python/jaraco-collections/jaraco-collections-3.3.0.ebuild b/dev-python/jaraco-collections/jaraco-collections-3.3.0.ebuild
index 8d2220308021..a08ddd796676 100644
--- a/dev-python/jaraco-collections/jaraco-collections-3.3.0.ebuild
+++ b/dev-python/jaraco-collections/jaraco-collections-3.3.0.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ~ia64 ppc ~ppc64 x86"
 
 RDEPEND="
 	dev-python/jaraco-classes[${PYTHON_USEDEP}]
diff --git a/dev-python/llvmlite/llvmlite-0.36.0.ebuild b/dev-python/llvmlite/llvmlite-0.36.0.ebuild
index 2352f1f720c3..be3fd4360f57 100644
--- a/dev-python/llvmlite/llvmlite-0.36.0.ebuild
+++ b/dev-python/llvmlite/llvmlite-0.36.0.ebuild
@@ -14,7 +14,7 @@ S=${WORKDIR}/${P/_/}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="examples"
 
 LLVM_MAX_SLOT=10
diff --git a/dev-python/mako/mako-1.1.4.ebuild b/dev-python/mako/mako-1.1.4.ebuild
index 7e048f0731ea..cd829d5c4924 100644
--- a/dev-python/mako/mako-1.1.4.ebuild
+++ b/dev-python/mako/mako-1.1.4.ebuild
@@ -3,9 +3,7 @@
 
 EAPI=7
 
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-
+PYTHON_COMPAT=( pypy3 python3_{7..10} )
 inherit distutils-r1 optfeature
 
 MY_P=${P^}
diff --git a/dev-python/nbformat/Manifest b/dev-python/nbformat/Manifest
index 49e579fbea11..4475cd915fef 100644
--- a/dev-python/nbformat/Manifest
+++ b/dev-python/nbformat/Manifest
@@ -1,2 +1 @@
-DIST nbformat-5.1.2.gh.tar.gz 152275 BLAKE2B 2a0758f33952547e5ef91f0ac0a8b98b97b882a8797c38feff6710a3a0824637f41396b152403e155e1af9805b7a85c189ba2a609076c591562e5f4bb783da29 SHA512 4fd574373c2f325b6d078a062878d139d741d30f9101f3344e0c7fc19bdf714f8ef71994134e76c90e1301102aac55cc490df8344f3ceb407002437f35d03944
 DIST nbformat-5.1.3.gh.tar.gz 130922 BLAKE2B 866eb53dd3f04c09f4a08303c5e84b672cc826d2d9b369cd85038b6c4075e74dce88fbcae80fc9b5450faf1c4971d121abe35e0a2ce2a8e73e020d2bed3a5594 SHA512 b4bc3d51d6e940ce1e2b1f5ca1005cf3d466b2b7b589383a31c4d2908c4e539344f4c8fb9e92993469d4d66f363c35082f0c16b8a63aa61e19fb24fa5ac910fd
diff --git a/dev-python/nbformat/nbformat-5.1.2-r1.ebuild b/dev-python/nbformat/nbformat-5.1.2-r1.ebuild
deleted file mode 100644
index c8ceaca64fba..000000000000
--- a/dev-python/nbformat/nbformat-5.1.2-r1.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
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-PYTHON_REQ_USE='sqlite'
-
-inherit distutils-r1
-
-DESCRIPTION="Reference implementation of the Jupyter Notebook format"
-HOMEPAGE="https://jupyter.org"
-# missing on pypi
-SRC_URI="
-	https://github.com/jupyter/nbformat/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-
-RDEPEND="
-	>=dev-python/jsonschema-2.4.0[${PYTHON_USEDEP}]
-	dev-python/ipython_genutils[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-4.1[${PYTHON_USEDEP}]
-	dev-python/jupyter_core[${PYTHON_USEDEP}]
-	"
-BDEPEND="
-	test? (
-		dev-python/fastjsonschema[${PYTHON_USEDEP}]
-		dev-python/testpath[${PYTHON_USEDEP}]
-	)
-	"
-
-PATCHES=(
-	"${FILESDIR}"/nbformat-5.1.2-package-data.patch
-)
-
-distutils_enable_sphinx docs \
-	dev-python/numpydoc
-distutils_enable_tests pytest
diff --git a/dev-python/nbformat/nbformat-5.1.3.ebuild b/dev-python/nbformat/nbformat-5.1.3.ebuild
index c7d03d6c1107..23f449ea5054 100644
--- a/dev-python/nbformat/nbformat-5.1.3.ebuild
+++ b/dev-python/nbformat/nbformat-5.1.3.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 
 RDEPEND="
 	>=dev-python/jsonschema-2.4.0[${PYTHON_USEDEP}]
diff --git a/dev-python/ordered-set/ordered-set-4.0.2.ebuild b/dev-python/ordered-set/ordered-set-4.0.2.ebuild
index d83235365b3a..fb789b3cdbfa 100644
--- a/dev-python/ordered-set/ordered-set-4.0.2.ebuild
+++ b/dev-python/ordered-set/ordered-set-4.0.2.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# 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_COMPAT=( python3_{7..10} )
 inherit distutils-r1
 
 DESCRIPTION="A mutable set that remembers the order of its entries"
diff --git a/dev-python/parso/Manifest b/dev-python/parso/Manifest
index cd68f27f5adc..935b0f19fe22 100644
--- a/dev-python/parso/Manifest
+++ b/dev-python/parso/Manifest
@@ -1,4 +1,3 @@
 DIST parso-0.7.0.tar.gz 395175 BLAKE2B ac407b711b6229a93864e339b3632563d3fcd7f84e22a43bd89282300b931f58d638ab8a64c441dc183852576261be18a3be471b0824b6e56fb69025cf666d6b SHA512 41ad60b1d7dff682281059aabff0d43ccd3048b6cc6ee3e9e141d4a0a965fd99449f6d3f23689914c1f7bda371e3cc86266775a1c23fb1c430ea689c916fbb71
 DIST parso-0.7.1.tar.gz 399842 BLAKE2B 1e47c1dd6846d01aa5820d7cedc3eafcf12ea0d4a2e95fa3f54429633b1c12dc39a4abe237fa46eb629408006777bd1f512cf878025b55119568ac19729b8c19 SHA512 318969a7a941c4a0948e58643b07b6f5c446ea166b3a8e44a556f0677ec9a36d7dc8c6d37ca7bce3f8276ee3d7144e22fbaaeac90c738fb90f7e94a0cf8abf7d
-DIST parso-0.8.1.tar.gz 393403 BLAKE2B d8d2a025dfb6664d8deeabfc621f4dcf0c6f6e0769dc3a7081888436cce39685f7749ee4ed33c501e3690bec0c8b21d18195d585a8baf5fa8c1b1ae1bfad5680 SHA512 10cc36a4f288d06b8d06bf3995eafe8c6b5d46d0ab01ce6db4557c82f8c64c6792b438a5b7dea570a9690bad586ab4216161268be9c1979b91b3af50e1c8801c
 DIST parso-0.8.2.tar.gz 394419 BLAKE2B f4e86ae55140adc9bbfdd34a8044e7fdfbf9d318a6385ac5feedc07127061943c2d690581af144f158846e3bf6f82124046c7e625369a4055ab92a54f9210c49 SHA512 a90810ad89301d804d215392ed77593b015f13bc7ef8512302a8893b314a9e74c15e2aaa77157c8595a134d3481e8115f306f9628835271478837ec6f19e645f
diff --git a/dev-python/parso/parso-0.8.1.ebuild b/dev-python/parso/parso-0.8.1.ebuild
deleted file mode 100644
index c4562869fc0e..000000000000
--- a/dev-python/parso/parso-0.8.1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="a python parser that supports error recovery and round-trip parsing"
-HOMEPAGE="https://github.com/davidhalter/parso https://pypi.org/project/parso/"
-SRC_URI="https://github.com/davidhalter/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 x86"
-
-distutils_enable_sphinx docs
-distutils_enable_tests pytest
diff --git a/dev-python/parso/parso-0.8.2.ebuild b/dev-python/parso/parso-0.8.2.ebuild
index c857c4baed5f..c4562869fc0e 100644
--- a/dev-python/parso/parso-0.8.2.ebuild
+++ b/dev-python/parso/parso-0.8.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/davidhalter/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 x86"
 
 distutils_enable_sphinx docs
 distutils_enable_tests pytest
diff --git a/dev-python/pastel/pastel-0.2.1.ebuild b/dev-python/pastel/pastel-0.2.1.ebuild
index 160121f875e8..027b1445f9f1 100644
--- a/dev-python/pastel/pastel-0.2.1.ebuild
+++ b/dev-python/pastel/pastel-0.2.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+PYTHON_COMPAT=( python3_{7..10} )
 inherit distutils-r1
 
 DESCRIPTION="Bring colors to your terminal"
diff --git a/dev-python/pickleshare/pickleshare-0.7.5.ebuild b/dev-python/pickleshare/pickleshare-0.7.5.ebuild
index b6f5a988afb5..8909a84efbca 100644
--- a/dev-python/pickleshare/pickleshare-0.7.5.ebuild
+++ b/dev-python/pickleshare/pickleshare-0.7.5.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# 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_COMPAT=( python3_{7..10} )
 inherit distutils-r1
 
 DESCRIPTION="A small 'shelve' like datastore with concurrency support"
diff --git a/dev-python/pudb/Manifest b/dev-python/pudb/Manifest
index 563bd9e2b9a4..6c331995a833 100644
--- a/dev-python/pudb/Manifest
+++ b/dev-python/pudb/Manifest
@@ -1,2 +1 @@
-DIST pudb-2019.2.tar.gz 59548 BLAKE2B 2df98688948ea79b8bbe125735aef04b3ea5d6db4adba503610c3fc88201cd0ae6da3249371f9ef78d1f4650901a02cc25738201e4891695f7726c919dcdd702 SHA512 231663b404e0e7d35f32235c02d4878b41a043054821c3d39d4a05d45c1e45aff0eaffb0a6d96669676b52538ca99a69de64014f922e3c80405d34198c6d4812
 DIST pudb-2020.1.tar.gz 70838 BLAKE2B c0f9ebf88851ebd859876e3e9b29239c72e308d7a544aee26baeb44a47ec3de75aed031ca10ef67c32d0262ffa690bfc063122524e64afa7d5763afb9a5baccf SHA512 4878c3f375d96130ca9a1afe668227b6f08e876e618bcffb47b1507be6bf7a393d88ab5f65f33c6497c98e645a188d5f3eaabb4f6a1e49d8d09b0f8b6b17ba14
diff --git a/dev-python/pudb/pudb-2019.2.ebuild b/dev-python/pudb/pudb-2019.2.ebuild
deleted file mode 100644
index 5e5de773eb7c..000000000000
--- a/dev-python/pudb/pudb-2019.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 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=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="A full-screen, console-based Python debugger"
-HOMEPAGE="https://pypi.org/project/pudb/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	dev-python/urwid[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]"
-
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/pyalsa/pyalsa-1.1.6-r1.ebuild b/dev-python/pyalsa/pyalsa-1.1.6-r1.ebuild
index 1819b0523f19..89e539e76461 100644
--- a/dev-python/pyalsa/pyalsa-1.1.6-r1.ebuild
+++ b/dev-python/pyalsa/pyalsa-1.1.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/dev-python/pylev/pylev-1.2.0.ebuild b/dev-python/pylev/pylev-1.2.0.ebuild
index 8a830774bcee..4c9d4648c592 100644
--- a/dev-python/pylev/pylev-1.2.0.ebuild
+++ b/dev-python/pylev/pylev-1.2.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+PYTHON_COMPAT=( python3_{7..10} )
 inherit distutils-r1
 
 DESCRIPTION="Python Levenshtein implementation"
@@ -14,3 +14,5 @@ SRC_URI="https://github.com/toastdriven/pylev/archive/v${PV}.tar.gz -> ${P}.tar.
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 x86"
+
+distutils_enable_tests unittest
diff --git a/dev-python/pyproject2setuppy/Manifest b/dev-python/pyproject2setuppy/Manifest
index 55d93472b900..0f433f5033f4 100644
--- a/dev-python/pyproject2setuppy/Manifest
+++ b/dev-python/pyproject2setuppy/Manifest
@@ -1,2 +1 @@
-DIST pyproject2setuppy-11.tar.gz 10420 BLAKE2B 64eaf9d9855c767a821c876292613a360d631a21d5e45715dbf63c2f0704135110eb6d7fa0f6eb9ec6eb52dc17c621b89ad709170b099fc71a26c9b754c61566 SHA512 8b4f9e933301c4f724242f47877a0c436434c3d8303a3d3288b09f5814e9f7dbe8d2039e8c040b5e1d5b21d7ac44e58287e9573e9f0fe9827b5db1bef1e4b169
-DIST pyproject2setuppy-12.tar.gz 10729 BLAKE2B 06988e45c42822db8f0bd65d3c88bc9c0481956c6b86bcce4b98ad7a17cbabd3d66b9037c5fb11a0926922109dbf0f9640d390f0bcfcb43ae63c46f47ecf4933 SHA512 d3612ffcdc16b851a1b3bd96ff4b3484dd91a210c4617fdedebf8ddb1df9842b58ef6a68d2d66e9888cb9819b3baf3b522f46c0e9286956916471a4d0dc80b94
+DIST pyproject2setuppy-14.tar.gz 10669 BLAKE2B ee4fac31546455ac3144f4989dd4260d876a7b8bd749bb34b210e5fc0194fb6347f9b5e7ebc9aa1374b4e4e5e4f22d260923097a58b47b5b940c69ec77f3b5b1 SHA512 46bbe31460195ca7df2c7e707772a430ccdbabf264a26f54d98101d08031d302343a6299a8e20d7be3d7984c48ad095dae942bf4da085285f61e2900a501245a
diff --git a/dev-python/pyproject2setuppy/pyproject2setuppy-12.ebuild b/dev-python/pyproject2setuppy/pyproject2setuppy-12.ebuild
deleted file mode 100644
index 37fe81665a72..000000000000
--- a/dev-python/pyproject2setuppy/pyproject2setuppy-12.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=manual
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Cheap setup.py hack to install flit & poetry-based projects"
-HOMEPAGE="https://github.com/mgorny/pyproject2setuppy"
-SRC_URI="
-	https://github.com/mgorny/pyproject2setuppy/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-
-RDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]"
-BDEPEND="${RDEPEND}
-	test? (
-		dev-python/wheel[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pyproject2setuppy/pyproject2setuppy-11.ebuild b/dev-python/pyproject2setuppy/pyproject2setuppy-14.ebuild
index 254e09e10885..f26b68d1859b 100644
--- a/dev-python/pyproject2setuppy/pyproject2setuppy-11.ebuild
+++ b/dev-python/pyproject2setuppy/pyproject2setuppy-14.ebuild
@@ -23,6 +23,7 @@ RDEPEND="
 	dev-python/toml[${PYTHON_USEDEP}]"
 BDEPEND="${RDEPEND}
 	test? (
+		dev-python/pytest-forked[${PYTHON_USEDEP}]
 		dev-python/wheel[${PYTHON_USEDEP}]
 	)"
 
diff --git a/dev-python/pytest-mock/pytest-mock-3.6.0.ebuild b/dev-python/pytest-mock/pytest-mock-3.6.0.ebuild
index 029264b47d38..88026025c385 100644
--- a/dev-python/pytest-mock/pytest-mock-3.6.0.ebuild
+++ b/dev-python/pytest-mock/pytest-mock-3.6.0.ebuild
@@ -4,7 +4,6 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-
 inherit distutils-r1
 
 DESCRIPTION="Thin-wrapper around the mock package for easier use with pytest"
@@ -14,11 +13,9 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
-IUSE=""
 
 RDEPEND=">=dev-python/pytest-5[${PYTHON_USEDEP}]"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
+BDEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/python-slugify/Manifest b/dev-python/python-slugify/Manifest
index b6269765eb97..e2385448eac0 100644
--- a/dev-python/python-slugify/Manifest
+++ b/dev-python/python-slugify/Manifest
@@ -1,3 +1,4 @@
 DIST python-slugify-1.2.6.tar.gz 8439 BLAKE2B 74699bf80408e1b6a705525b0ada2612cc6224a2ac1e17ce21230ed684af144c0f72ad99b32674bf19bd716d2cfc3a2f0da6f74facc99acba16e3ebc1873f3f3 SHA512 ad45958d03892d8db75967b150f25509c05ab2a87d5ac4a2ed12fccccfe1f86d7db26c406c6de22ba759b77fe772cc0c00d0e517c71db085618f62094ddadfd2
 DIST python-slugify-4.0.1.tar.gz 11509 BLAKE2B b505c62c959dae3823db4441b8811ed98ec8afa0278325cb2715abb63a84b5de1506362699bc39216bbac4100ae265671f940dbbbdaf9164fd251bdaa7af462a SHA512 c1d99a9dc891c4cfa927e4d2bc5701f47b23b7882cce22350283a53c6ded18e1290196c3bb9838883c29c9cb3582e5e684edffd50dfbb4e9da9c2b821ea54bb5
 DIST python-slugify-5.0.0.tar.gz 11730 BLAKE2B 0ec93c230523bcd4ba5f917bc9d2676ae92fc164eccc84198777a59c36ff427fdb7a242bd89f9bc3d24e86b5a1d106f0118cf118349de648f5779c384445abab SHA512 b29c542ec3cb3d05d88be0fb53909b160022fe97dbc89efc0eef5f4e2414031026f570dd6eec1e7bbe2930d801c2fd8d152e49cd2639cddb23392c9b11e7266b
+DIST python-slugify-5.0.1.tar.gz 11706 BLAKE2B 1fdffd6fb9eaec13a1ece65433c53dbcb35c5ccbe2ebfb07055acac4d9a7be1e0832535aa6f335ae7eda5b07b823a3b4d63ef1f95f220b5fbf26c28dfbe62ac2 SHA512 6c52d6242fb6b2379e28b074987b474111527ac336dfa673828e5283347cfc52e056d9485251cde90493ea2389210701f566ce01916ae250d76549aafbea75a8
diff --git a/dev-python/python-slugify/python-slugify-5.0.0.ebuild b/dev-python/python-slugify/python-slugify-5.0.0.ebuild
index 33fa40c2f5e8..165d16f9ab9f 100644
--- a/dev-python/python-slugify/python-slugify-5.0.0.ebuild
+++ b/dev-python/python-slugify/python-slugify-5.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-slugify/python-slugify-5.0.1.ebuild b/dev-python/python-slugify/python-slugify-5.0.1.ebuild
new file mode 100644
index 000000000000..79448555636a
--- /dev/null
+++ b/dev-python/python-slugify/python-slugify-5.0.1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="A Python Slugify application that handles Unicode"
+HOMEPAGE="https://github.com/un33k/python-slugify https://pypi.org/project/python-slugify/"
+SRC_URI="https://github.com/un33k/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+
+RDEPEND="dev-python/text-unidecode[${PYTHON_USEDEP}]"
+
+distutils_enable_tests unittest
diff --git a/dev-python/pytools/Manifest b/dev-python/pytools/Manifest
index b680345f56e4..bf514350ea76 100644
--- a/dev-python/pytools/Manifest
+++ b/dev-python/pytools/Manifest
@@ -1,2 +1 @@
 DIST pytools-2021.2.6.tar.gz 63630 BLAKE2B a94420134688514f5a27c85aedb3655e507ca37b30e0db81656e9c1597b2527f55e534b777d97daef889ed496766718bd42c1e6193ac62d45ec90e9305a91959 SHA512 378c58c4e321f5ca3bb8e3d36d06dfdbe20d04210ca9943cff0909b85d2fd89791c1d966992b2e6f5ccd772f68d223eb13c02b335d9f5c0ac3b17d36fe04aed0
-DIST pytools-2021.2.tar.gz 65140 BLAKE2B 8f419b5776c99b3179b2f4d44a2461ee5e3b55d663e8982f1e34f9fab3cb397ee5a0ee13a2eaf9de1f3330c951b6972cac6d9d0c3994f461ffeca8abf110f11d SHA512 3a91be32c5e1c70a3f2d8accb29888cd7f4b9e304fc68a3d2ca2d9ff674a885836236f6dbf11711555444a8eee63cbe86d85834fc73676420b331f94915a1018
diff --git a/dev-python/pytools/pytools-2021.2.6.ebuild b/dev-python/pytools/pytools-2021.2.6.ebuild
index c73c8d5facb9..6c12e65afaab 100644
--- a/dev-python/pytools/pytools-2021.2.6.ebuild
+++ b/dev-python/pytools/pytools-2021.2.6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 RDEPEND="
 	>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
diff --git a/dev-python/pytools/pytools-2021.2.ebuild b/dev-python/pytools/pytools-2021.2.ebuild
deleted file mode 100644
index 5ab7ab8ce65b..000000000000
--- a/dev-python/pytools/pytools-2021.2.ebuild
+++ /dev/null
@@ -1,25 +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='sqlite'
-
-inherit distutils-r1
-
-DESCRIPTION="Collection of tools missing from the Python standard library"
-HOMEPAGE="https://mathema.tician.de/software/pytools/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
-
-RDEPEND="
-	>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/decorator-3.2.0[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.6.0[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pytzdata/pytzdata-2020.1.ebuild b/dev-python/pytzdata/pytzdata-2020.1.ebuild
index 95f1365739c7..1863e0277677 100644
--- a/dev-python/pytzdata/pytzdata-2020.1.ebuild
+++ b/dev-python/pytzdata/pytzdata-2020.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+PYTHON_COMPAT=( python3_{7..10} )
 inherit distutils-r1
 
 DESCRIPTION="The Olson timezone database for Python"
diff --git a/dev-python/regex/regex-2021.4.4.ebuild b/dev-python/regex/regex-2021.4.4.ebuild
index 8de9bf76670d..aaa9037595e9 100644
--- a/dev-python/regex/regex-2021.4.4.ebuild
+++ b/dev-python/regex/regex-2021.4.4.ebuild
@@ -13,7 +13,7 @@ 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 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-macos"
 IUSE="doc"
 
 distutils_enable_tests unittest
diff --git a/dev-python/responses/Manifest b/dev-python/responses/Manifest
index 4aa78041b85e..ef73f3f473ec 100644
--- a/dev-python/responses/Manifest
+++ b/dev-python/responses/Manifest
@@ -1,3 +1,2 @@
-DIST responses-0.13.1.tar.gz 30290 BLAKE2B 823ef6e9e6d760d4516770255c96a8ccd326be8a1b864eb176497b613f9ec97bc0916e8f80e32275859f91129cd1b7a90ee9c8620721ea6ee03440bc4e7500cd SHA512 b6628c5890a9034c003fe1e7ea656474fa553c56fe29e025645f28d524368d4f4e65268ccb384fd514f620fc5f5d008937697161868efefb0760d56a9174e1d6
 DIST responses-0.13.2.tar.gz 30302 BLAKE2B d90059e12518841af0276777a77c28aa96ffa5fcdea9ff1ce2d7a5b0c7e225b1b6253bc38bce534b8447de43365e7315b3ee667e6d845206a9a7a3c3c0d27227 SHA512 cac338cd2c2b3c0193de779ef47830471ed17f2df7d94c30acea0117dfe508550a1dec471fbf249320637125322a5a40273be568b330989a272870afaea0bd04
 DIST responses-0.13.3.tar.gz 30327 BLAKE2B 299d4ce81b5ff1703cf72fdb42d39126b5bc8cd95837467cbcfb35c1688e75ec8c95edaafca4100c1b6cb51fe8e9f4c22db1a3e2f46714539bff7a861b16451c SHA512 c523755e44e158c3b37d084b9105ba36f515eb883928d51f296ffd911d72206461cd864355d991ff6f6f05abb447a3eb558ac9958379b0a8a49d29b8afcadef4
diff --git a/dev-python/responses/responses-0.13.1.ebuild b/dev-python/responses/responses-0.13.1.ebuild
deleted file mode 100644
index f263cb3d18e4..000000000000
--- a/dev-python/responses/responses-0.13.1.ebuild
+++ /dev/null
@@ -1,30 +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="Utility for mocking out the Python Requests library"
-HOMEPAGE="https://github.com/getsentry/responses"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/requests-2.0[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.10[${PYTHON_USEDEP}]
-	dev-python/cookies[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		dev-python/pytest-localserver[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/responses/responses-0.13.2.ebuild b/dev-python/responses/responses-0.13.2.ebuild
index 1f498bbb2533..f263cb3d18e4 100644
--- a/dev-python/responses/responses-0.13.2.ebuild
+++ b/dev-python/responses/responses-0.13.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/requests-2.0[${PYTHON_USEDEP}]
diff --git a/dev-python/six/Manifest b/dev-python/six/Manifest
index 0317468df3ef..2c93586d43ea 100644
--- a/dev-python/six/Manifest
+++ b/dev-python/six/Manifest
@@ -1 +1,2 @@
 DIST six-1.15.0.tar.gz 33917 BLAKE2B 57e852b6c35dd19e256814c0371cfbc26141b0f25a31f79a1cbd1b0cdd7d3cacf1236b96f5452f968cc426e6dff4d1ad70a9f2432bc361ba3c8c17fd40fe7582 SHA512 eb840ac17f433f1fc4af56de75cfbfe0b54e6a737bb23c453bf09a4a13d768d153e46064880dc763f4c5cc2785b78ea6d3d3b4a41fed181cb9064837e3f699a9
+DIST six-1.16.0.tar.gz 34041 BLAKE2B 764f8da9a0d89e95af002c79c2b19e852fdec9a6819655c57be019b48bd65a5f7909473e71887e6080073f381f983c077487591d4e44297542cf6b9a29ba42b8 SHA512 076fe31c8f03b0b52ff44346759c7dc8317da0972403b84dfe5898179f55acdba6c78827e0f8a53ff20afe8b76432c6fe0d655a75c24259d9acbaa4d9e8015c0
diff --git a/dev-python/six/six-1.16.0.ebuild b/dev-python/six/six-1.16.0.ebuild
new file mode 100644
index 000000000000..a3ca8c6adf7c
--- /dev/null
+++ b/dev-python/six/six-1.16.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python 2 and 3 compatibility library"
+HOMEPAGE="https://github.com/benjaminp/six https://pypi.org/project/six/"
+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 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+distutils_enable_sphinx documentation --no-autodoc
+distutils_enable_tests pytest
+
+python_test() {
+	local deselect=()
+	[[ ${EPYTHON} == pypy3 ]] && deselect+=(
+		'test_six.py::test_move_items[dbm_ndbm]'
+	)
+
+	epytest ${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/sphinx_rtd_theme/Manifest b/dev-python/sphinx_rtd_theme/Manifest
index 774ac096f560..24daf3d45d6b 100644
--- a/dev-python/sphinx_rtd_theme/Manifest
+++ b/dev-python/sphinx_rtd_theme/Manifest
@@ -1,2 +1 @@
-DIST sphinx_rtd_theme-0.5.1.tar.gz 2774928 BLAKE2B 1ff9c2e1b7ef7740de4969b6b4862d9ac499d515163a32ca2b5438c84910d610c80f5e8c3d03e3016ffa8c58003abecb67bd036ded065dfb65318e2f1d7e69d9 SHA512 20a04408fdf3f5698fecb2a0a430eba6f484770c8e01026c0d444d25ffcbd798edb82aa4b489df10b63d9fcc5eac204e9e3ccdaaf7eac7eb0baee2a5d7960c30
 DIST sphinx_rtd_theme-0.5.2.tar.gz 7606638 BLAKE2B c104121b36c89f4d2b7c2fc12433ffd1a7cba9b9d532358dafd53061b2ca9ead4bb93b7b596394c244a9da51c0b9299f2fe0ec8d4ca102015b6c7dfb92081813 SHA512 dd46bfeb05b433970d8130c06cad6dfa9dbc4e9db2d9a8190b80232d75b4d0a86590c17d64b9b1dcd2cb1d042033f4d2c2ce2e5cac0239c6b86899628b94b274
diff --git a/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.5.1.ebuild b/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.5.1.ebuild
deleted file mode 100644
index 05eb5ae6b639..000000000000
--- a/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.5.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=bdepend
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="ReadTheDocs.org theme for Sphinx"
-HOMEPAGE="https://github.com/readthedocs/sphinx_rtd_theme"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-IUSE=""
-
-PDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		${PDEPEND}
-		dev-python/readthedocs-sphinx-ext[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-src_configure() {
-	# CI=1 disables rebuilding webpack that requires npm use
-	# yes, that surely makes sense
-	export CI=1
-}
diff --git a/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.5.2.ebuild b/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.5.2.ebuild
index 486ecf442137..86597ac4e183 100644
--- a/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.5.2.ebuild
+++ b/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.5.2.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 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 IUSE=""
 
 PDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]"
diff --git a/dev-python/tempora/Manifest b/dev-python/tempora/Manifest
index 5592cbb1c48f..acbc5e01107f 100644
--- a/dev-python/tempora/Manifest
+++ b/dev-python/tempora/Manifest
@@ -1,2 +1 @@
-DIST tempora-4.0.1.tar.gz 20978 BLAKE2B 1216472a3e03fe0856f598478267647a2a9f8f6b6e28a0e48fc9f66877303da053d1a7e793b812fa8b0909b219a669cd8d82759dfd2c0793d43cc2d086993a8c SHA512 1ee954a7053db2dc0a94637453613851806cc4582f04019e303e13566a842c2710f3c364fd54d8832d4ce2a5eaac29121db9c474b407d5b92e4f8b8ff43b03df
 DIST tempora-4.0.2.tar.gz 21837 BLAKE2B 2d3a9e2fb09ce63e37beb8090eef0238a55c0daf8ddeec79da148af5a77ba0afbc1ae5cc9cbffe1fe04adee3fb0928005e30dfe69dd95ec746d5b003670926cb SHA512 6b4b4f78d1bd05518a1ac89900f927bff9164b57f9cf295045babb0a2b23216012226035d9a2e092e987ab9dc55e583975f9d2f8e62e526cd1a88e13858f9588
diff --git a/dev-python/tempora/tempora-4.0.1.ebuild b/dev-python/tempora/tempora-4.0.1.ebuild
deleted file mode 100644
index 4d5073084928..000000000000
--- a/dev-python/tempora/tempora-4.0.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-MY_PN="${PN/-/.}"
-DESCRIPTION="Objects and routines pertaining to date and time"
-HOMEPAGE="https://github.com/jaraco/tempora"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos"
-
-RDEPEND="
-	>=dev-python/jaraco-functools-1.20[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/pytest-freezegun[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs \
-	">=dev-python/jaraco-packaging-3.2" \
-	">=dev-python/rst-linker-1.9"
-
-src_prepare() {
-	sed -i -e 's:--flake8 --black --cov --mypy::' pytest.ini || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/tempora/tempora-4.0.2.ebuild b/dev-python/tempora/tempora-4.0.2.ebuild
index 8eba49ed59fd..87932edb1a94 100644
--- a/dev-python/tempora/tempora-4.0.2.ebuild
+++ b/dev-python/tempora/tempora-4.0.2.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos"
 
 RDEPEND="
 	>=dev-python/jaraco-functools-1.20[${PYTHON_USEDEP}]
diff --git a/dev-python/text-unidecode/text-unidecode-1.3.ebuild b/dev-python/text-unidecode/text-unidecode-1.3.ebuild
index f8b8ebd22218..dc39392c1d63 100644
--- a/dev-python/text-unidecode/text-unidecode-1.3.ebuild
+++ b/dev-python/text-unidecode/text-unidecode-1.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+PYTHON_COMPAT=( python3_{7..10} )
 inherit distutils-r1
 
 DESCRIPTION="The most basic port of the Text::Unidecode Perl library"
diff --git a/dev-python/theano-pymc/Manifest b/dev-python/theano-pymc/Manifest
index 181f5320ccd3..7cadf87c89a1 100644
--- a/dev-python/theano-pymc/Manifest
+++ b/dev-python/theano-pymc/Manifest
@@ -1,2 +1 @@
-DIST Theano-PyMC-rel-1.1.0.tar.gz 12482951 BLAKE2B 3c3cf6bcd396ce01d68575d8272a9b110077ef8c2b4a6c8f0e795dafcf75f862e145d4e9d83289950e8d463098fe0ebbcee8f4d5f0867d9e6c673c77d6fe8b90 SHA512 667c0b3662ee41254d1776060d64d46b58980ac4ae4e7b271d29d7e09321089946e4aa864626b6e8ea1bd2eae330688b675d507e18dce2d92a4a8df5a0116bb6
 DIST Theano-PyMC-rel-1.1.2.tar.gz 12482962 BLAKE2B 427afab5b831f625b0825746d24d68d7c7a2ea853f83d0b543f9c16baf7f120bb26446a438fa69279cd55e7788b3f1aaa6c6ac787231415f49a53e34e6b92584 SHA512 f582e23803d392fc469ed4aa13ee8615b7ce367de0a95d57fb71217f578112bd1611df1fa580f19970e1e3681fc5dc7d80d9bb9c2c40e5956d1eb937a9271431
diff --git a/dev-python/theano-pymc/theano-pymc-1.1.0.ebuild b/dev-python/theano-pymc/theano-pymc-1.1.0.ebuild
deleted file mode 100644
index 975c9de79625..000000000000
--- a/dev-python/theano-pymc/theano-pymc-1.1.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 2020-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=Theano-PyMC-rel-${PV}
-DESCRIPTION="Library for operating on mathematical expressions with multi-dimensional arrays"
-HOMEPAGE="https://github.com/pymc-devs/Theano-PyMC"
-SRC_URI="
-	https://github.com/pymc-devs/Theano-PyMC/archive/rel-${PV}.tar.gz
-		-> ${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~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}"
-}
-
-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/towncrier/Manifest b/dev-python/towncrier/Manifest
index 26f016e30faa..6067f3634938 100644
--- a/dev-python/towncrier/Manifest
+++ b/dev-python/towncrier/Manifest
@@ -1,3 +1 @@
-DIST towncrier-19.2.0.tar.gz 18089 BLAKE2B d1e17e707b90089b19d9eedebd898b71fcc9a582cbae0166650a6bd52a8ac6bb3921a458a6d2c10e5930b92230ddf5efc5a428646c464edb6eb4bfc06949e217 SHA512 60999446c4ae404fb54ea6282a862621d49f62a2488d31eecf8fed9dd7afa6e01f4feac6e3dd26b882ee75f747424d63d05521e33b5f6b8df7059ce32dbe5c4f
-DIST towncrier-19.9.0.tar.gz 23674 BLAKE2B 89f1c9ac98f5d5505d43a10252e70c5d4fce2e304604582e33c72de460313227382bf73a3b8b7d56b42274aff5587cc092b477649a4d74dd2491a6c7a14f6fa5 SHA512 089a493df6a8e9f8459c1f4cf497a9f4f647d1d907f13cbf716e6b1e79a591570daf40c19bf7bceaf44a1890187ea912aef6f38e82251194dfba16edb933374c
 DIST towncrier-21.3.0.tar.gz 31787 BLAKE2B 1ad54cb2eb28d25131be13a7fce5aeec3df07fe198f3200202d612b2b49cbef76d422025e143b19db498af224ba522f3a67b66fc10ec2cfb0ab81a52aeb7263e SHA512 b6093864d590849e29311fd1a085cc40997f88ada38e92bf159d72fd809691e014f67ac87844886cfdb27be0f9abc8fbf79d5d7e800688eac34e9edec6d6a2f6
diff --git a/dev-python/towncrier/metadata.xml b/dev-python/towncrier/metadata.xml
index 4f057cfe8770..b8402860df0f 100644
--- a/dev-python/towncrier/metadata.xml
+++ b/dev-python/towncrier/metadata.xml
@@ -10,4 +10,5 @@
   <remote-id type="github">twisted/towncrier</remote-id>
  </upstream>
  <origin>gentoo-staging</origin>
+ <stabilize-allarches/>
 </pkgmetadata>
 \ No newline at end of file
diff --git a/dev-python/towncrier/towncrier-19.2.0.ebuild b/dev-python/towncrier/towncrier-19.2.0.ebuild
deleted file mode 100644
index 6f2f839fbf8c..000000000000
--- a/dev-python/towncrier/towncrier-19.2.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-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
-
-DESCRIPTION="Building newsfiles for your project"
-HOMEPAGE="https://github.com/twisted/towncrier"
-SRC_URI="https://github.com/twisted/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-IUSE="test"
-
-RDEPEND="
-	dev-python/click[${PYTHON_USEDEP}]
-	dev-python/click-default-group[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/incremental[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-vcs/git
-		>=dev-python/twisted-16.0.0[${PYTHON_USEDEP}]
-	)"
-
-RESTRICT="!test? ( test )"
-
-python_test() {
-	distutils_install_for_testing --via-root
-
-	trial towncrier || die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/towncrier/towncrier-19.9.0.ebuild b/dev-python/towncrier/towncrier-19.9.0.ebuild
deleted file mode 100644
index 982d17595914..000000000000
--- a/dev-python/towncrier/towncrier-19.9.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-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
-
-DESCRIPTION="Building newsfiles for your project"
-HOMEPAGE="https://github.com/twisted/towncrier"
-SRC_URI="https://github.com/twisted/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-IUSE="test"
-
-RDEPEND="
-	dev-python/click[${PYTHON_USEDEP}]
-	dev-python/click-default-group[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/incremental[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-vcs/git
-		>=dev-python/twisted-16.0.0[${PYTHON_USEDEP}]
-	)"
-
-RESTRICT="!test? ( test )"
-
-python_test() {
-	distutils_install_for_testing
-	trial towncrier || die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/towncrier/towncrier-21.3.0.ebuild b/dev-python/towncrier/towncrier-21.3.0.ebuild
index 021937d94fa1..d002f40b2320 100644
--- a/dev-python/towncrier/towncrier-21.3.0.ebuild
+++ b/dev-python/towncrier/towncrier-21.3.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/twisted/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/tox/Manifest b/dev-python/tox/Manifest
index 67828445f2a6..1865b4af5f74 100644
--- a/dev-python/tox/Manifest
+++ b/dev-python/tox/Manifest
@@ -1 +1,2 @@
 DIST tox-3.23.0.tar.gz 303091 BLAKE2B 609e74ea354ca5daf45c848000961782fcef59da07f815292355d72f3e5dd078e3b5909a65521a4a1032fa2bb9481fdab0e620f4882b33aa377de9764296761c SHA512 fb96cbbdbd36399036d348716f1181285184985922e0dc61b610b36e53ea79e2d8a77190aad893650bcba86ef4c57ff0f2de2813becb2a12fe0d1aa36bb27ad3
+DIST tox-3.23.1.tar.gz 303896 BLAKE2B d59160035a6412a69f9434bfb5b2b27aa9a2ebd5344b4898b677dac15dc91ab94feca67b8edde4c0ba68c8a6a12fa885091d82a088439257e9393a99e77ade88 SHA512 ec5daf106287b265d1abec8465df8ad053ecf59876038a7cb419a57e22373809e50f8131736762dc485f559363b1878abb49d909e7b6952b2e49eea77c193281
diff --git a/dev-python/tox/tox-3.23.1.ebuild b/dev-python/tox/tox-3.23.1.ebuild
new file mode 100644
index 000000000000..dccc2a855871
--- /dev/null
+++ b/dev-python/tox/tox-3.23.1.ebuild
@@ -0,0 +1,74 @@
+# 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="virtualenv-based automation of test activities"
+HOMEPAGE="https://tox.readthedocs.io https://github.com/tox-dev/tox https://pypi.org/project/tox/"
+SRC_URI="https://github.com/tox-dev/tox/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+# doc disabled because of missing deps in tree
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/filelock[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_metadata-1.1[${PYTHON_USEDEP}]
+	' python3_{5,6,7} pypy3)
+	dev-python/packaging[${PYTHON_USEDEP}]
+	>=dev-python/pluggy-0.12[${PYTHON_USEDEP}]
+	dev-python/pip[${PYTHON_USEDEP}]
+	dev-python/py[${PYTHON_USEDEP}]
+	>=dev-python/six-1.14[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]
+	>=dev-python/virtualenv-16.0.0[${PYTHON_USEDEP}]"
+# TODO: figure out how to make tests work without the package being
+# installed first.
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		>=dev-python/flaky-3.4.0[${PYTHON_USEDEP}]
+		>=dev-python/freezegun-0.3.11[${PYTHON_USEDEP}]
+		>=dev-python/pytest-4.0.0[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+	)"
+
+src_configure() {
+	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+}
+
+python_test() {
+	local deselect=(
+		# broken without Internet
+		tests/unit/session/test_provision.py::test_provision_non_canonical_dep
+		tests/integration/test_provision_int.py::test_provision_interrupt_child
+
+		# expects python2 to exist
+		tests/unit/interpreters/test_interpreters.py::test_tox_get_python_executable
+
+		# broken without tox installed first
+		# TODO: figure out how to make importlib_metadata work
+		tests/unit/test_z_cmdline.py::test_tox_console_script
+		tests/unit/test_z_cmdline.py::test_tox_quickstart_script
+	)
+
+	[[ ${EPYTHON} != pypy3 ]] && deselect+=(
+		# TODO?
+		tests/unit/interpreters/test_interpreters.py::test_find_alias_on_path
+
+		# broken without tox installed first
+		# TODO: why it can't import itself?
+		tests/integration/test_parallel_interrupt.py::test_parallel_interrupt
+	)
+
+	distutils_install_for_testing --via-root
+	epytest --no-network ${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/tqdm/Manifest b/dev-python/tqdm/Manifest
index b1d1eacd537c..1a6e028754ad 100644
--- a/dev-python/tqdm/Manifest
+++ b/dev-python/tqdm/Manifest
@@ -1,2 +1 @@
-DIST tqdm-4.59.0.tar.gz 168620 BLAKE2B 0e3467c777d36bcfaa9f004a587bff70f171cfd7ecdca46d3a6f894afa3694873b7c50c860da31b0147f3233bb419e0c74762797d64e79b938bea813f8a38b92 SHA512 be7ffe2f5e28dd2c653fdafd26cdfab6c89f1fd257420f9ab47460230318183b4934370261d7d5939d05f55b907e2d3982cbef078d372d9a4167e1df42c895a8
 DIST tqdm-4.60.0.tar.gz 174201 BLAKE2B 78f4e2c2189621b5d276b8a9c75bae1566b05888cce81d8281de358ad2817e9751395bcf529c07620cd1ec4431c78ed7c1400dc96e9c3a99ac92daf2551b2da5 SHA512 e76dda97323353725c8e30b254bacfa328b4708d37ba2d21dadd30fd26e76605d8f077f02f2047030c6ab9761710a0e86640153fee0e3a3f972db12266fcfde2
diff --git a/dev-python/tqdm/tqdm-4.59.0.ebuild b/dev-python/tqdm/tqdm-4.59.0.ebuild
deleted file mode 100644
index e98fff6f8208..000000000000
--- a/dev-python/tqdm/tqdm-4.59.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-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} pypy3 )
-
-inherit distutils-r1
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/tqdm/tqdm"
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos"
-fi
-
-DESCRIPTION="Add a progress meter to your loops in a second"
-HOMEPAGE="https://github.com/tqdm/tqdm"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="examples"
-
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-python_test() {
-	# Skip unpredictable performance tests
-	pytest -vv --ignore 'tests/tests_perf.py' ||
-		die "Tests failed with ${EPYTHON}"
-}
-
-python_install() {
-	doman "${BUILD_DIR}"/lib/tqdm/tqdm.1
-	rm "${BUILD_DIR}"/lib/tqdm/tqdm.1 || die
-	distutils-r1_python_install
-}
-
-python_install_all() {
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/tqdm/tqdm-4.60.0.ebuild b/dev-python/tqdm/tqdm-4.60.0.ebuild
index a230b1437084..27c48f2974b2 100644
--- a/dev-python/tqdm/tqdm-4.60.0.ebuild
+++ b/dev-python/tqdm/tqdm-4.60.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/tqdm/tqdm"
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos"
 fi
 
 DESCRIPTION="Add a progress meter to your loops in a second"
diff --git a/dev-python/translate-toolkit/Manifest b/dev-python/translate-toolkit/Manifest
index 04fd7af2a48e..86cb3fc0fc64 100644
--- a/dev-python/translate-toolkit/Manifest
+++ b/dev-python/translate-toolkit/Manifest
@@ -1,4 +1,2 @@
 DIST translate-3.3.6.gh.tar.gz 1140841 BLAKE2B 77d8b930ba8a91e801a04c67bdd13c0c6538d4df2418f26e1f6bfdb98c275fe746062840034c5345dcf61abc87ee6b8e1b2cda34a71c8e3850ac37df707b8a34 SHA512 c6eedcdb9ecece4804c25aedd57de37da12baf9b2f3bae1c87377f9a07e1e5f1cfeeed8073861b73201de3b35ec4e5da5f972d775c7ff35fa7be21c97746435d
-DIST translate-toolkit-3.3.3.tar.gz 5903525 BLAKE2B a21c5d89c808615ff2f3f718e732ce5d5591a9d8a997950ae1066655cc3e4382065f75e7a86f8e37bdd0e146283f9bd941ff20479cb1af635f393e0e7f8fc196 SHA512 41964dc26dfbb983b1c2e4cbb0e9d8eb2a035369a94ef872f7703080b5ca0280a9364916a1e1256cd358b263bc72198e767462cc9065b54556fc481d1b85a836
 DIST translate-toolkit-3.3.4.tar.gz 6060105 BLAKE2B 01f8e718a4a60d0f4d439be14b30b2e3f040045630d6f6254ad291a2558d59718521bfb79761d20933f7bb1abd2229ccce67fd71ccd54f6e43dffa7e7ecedd8c SHA512 6bfc4387aa600610fa2a9e7e58368924768ddcc8eb2a697ef02c59682e1e1304b7096f48a1e6e38cd47c68c644dff01d35ffc988d378dbf4833b41d1c5432c05
-DIST translate-toolkit-3.3.5.tar.gz 6061630 BLAKE2B 18843344acf8eecf6d1859e1c6d6148046ba3adc56d00413234e1fb755e7cc14f3ffc22d9cc46b249d01ea5d4b73b4edf4d8c6a22ddb882c62183e1f4ce8dd23 SHA512 9e5837e487b7ec703078d6babfeb2fc720c4c4fd2896e5a23839a856d76f6372d5d3c72f5f1e20ee9d130cb2224c5d8a5b9e33e0154484edd0e0ed756ae8429f
diff --git a/dev-python/translate-toolkit/translate-toolkit-3.3.3.ebuild b/dev-python/translate-toolkit/translate-toolkit-3.3.3.ebuild
deleted file mode 100644
index 1bbc2b44ba35..000000000000
--- a/dev-python/translate-toolkit/translate-toolkit-3.3.3.ebuild
+++ /dev/null
@@ -1,92 +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="sqlite"
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1
-
-DESCRIPTION="Toolkit to convert between many translation formats"
-HOMEPAGE="https://github.com/translate/translate"
-SRC_URI="https://github.com/translate/translate/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-IUSE="+html +ical +ini +subtitles +yaml"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-BDEPEND=">=dev-python/six-1.11.0[${PYTHON_USEDEP}]"
-RDEPEND="${BDEPEND}
-	!dev-python/pydiff
-	app-text/iso-codes
-	>=dev-python/chardet-3.0.4[${PYTHON_USEDEP}]
-	dev-python/cheroot[${PYTHON_USEDEP}]
-	>=dev-python/lxml-4.3.1[${PYTHON_USEDEP}]
-	>=dev-python/pycountry-19.8.18[${PYTHON_USEDEP}]
-	>=dev-python/python-levenshtein-0.12.0[${PYTHON_USEDEP}]
-	dev-python/ruamel-yaml[${PYTHON_USEDEP}]
-	sys-devel/gettext
-	html? ( dev-python/utidylib[${PYTHON_USEDEP}] )
-	ical? ( dev-python/vobject[${PYTHON_USEDEP}] )
-	ini? ( >=dev-python/iniparse-0.5[${PYTHON_USEDEP}] )
-	subtitles? ( media-video/gaupol[${PYTHON_USEDEP}] )
-	yaml? ( dev-python/pyyaml[${PYTHON_USEDEP}] )
-"
-BDEPEND+="
-	test? ( dev-python/phply[${PYTHON_USEDEP}] )"
-
-distutils_enable_sphinx docs \
-	dev-python/sphinx-bootstrap-theme
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}"/translate-toolkit-3.3.0-no-install-docs.patch
-)
-
-python_test() {
-	local deselect=(
-		# Fails with network-sandbox (and even with it off but w/ softer fail)
-		--deselect 'tests/xliff_conformance/test_xliff_conformance.py::test_open_office_to_xliff'
-		--deselect 'tests/xliff_conformance/test_xliff_conformance.py::test_po_to_xliff'
-	)
-
-	if ! use ini; then
-		deselect+=(
-			--ignore translate/convert/test_ini2po.py
-			--ignore translate/convert/test_po2ini.py
-		)
-	fi
-
-	if ! use subtitles; then
-		deselect+=(
-			--ignore translate/storage/test_subtitles.py
-		)
-	fi
-
-	# translate/storage/test_mo.py needs 'pocompile'
-	distutils_install_for_testing --via-root
-
-	pytest -vv "${deselect[@]}" || die "Tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if ! use html; then
-		rm "${ED}"/usr/bin/{html2po,po2html} || die
-	fi
-	if ! use ical; then
-		rm "${ED}"/usr/bin/{ical2po,po2ical} || die
-	fi
-	if ! use ini; then
-		rm "${ED}"/usr/bin/{ini2po,po2ini} || die
-	fi
-	if ! use subtitles; then
-		rm "${ED}"/usr/bin/{sub2po,po2sub} || die
-	fi
-
-	python_optimize
-}
diff --git a/dev-python/translate-toolkit/translate-toolkit-3.3.4.ebuild b/dev-python/translate-toolkit/translate-toolkit-3.3.4.ebuild
index e1b12646c6f3..5705ea2a5688 100644
--- a/dev-python/translate-toolkit/translate-toolkit-3.3.4.ebuild
+++ b/dev-python/translate-toolkit/translate-toolkit-3.3.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/translate/translate/releases/download/${PV}/${P}.tar
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="+html +ical +ini +subtitles +yaml"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/dev-python/translate-toolkit/translate-toolkit-3.3.5.ebuild b/dev-python/translate-toolkit/translate-toolkit-3.3.5.ebuild
deleted file mode 100644
index e1b12646c6f3..000000000000
--- a/dev-python/translate-toolkit/translate-toolkit-3.3.5.ebuild
+++ /dev/null
@@ -1,91 +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="sqlite"
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1
-
-DESCRIPTION="Toolkit to convert between many translation formats"
-HOMEPAGE="https://github.com/translate/translate"
-SRC_URI="https://github.com/translate/translate/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="+html +ical +ini +subtitles +yaml"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-BDEPEND=">=dev-python/six-1.11.0[${PYTHON_USEDEP}]"
-RDEPEND="${BDEPEND}
-	!dev-python/pydiff
-	app-text/iso-codes
-	>=dev-python/chardet-3.0.4[${PYTHON_USEDEP}]
-	dev-python/cheroot[${PYTHON_USEDEP}]
-	>=dev-python/lxml-4.3.1[${PYTHON_USEDEP}]
-	>=dev-python/pycountry-19.8.18[${PYTHON_USEDEP}]
-	>=dev-python/python-levenshtein-0.12.0[${PYTHON_USEDEP}]
-	dev-python/ruamel-yaml[${PYTHON_USEDEP}]
-	sys-devel/gettext
-	html? ( dev-python/utidylib[${PYTHON_USEDEP}] )
-	ical? ( dev-python/vobject[${PYTHON_USEDEP}] )
-	ini? ( >=dev-python/iniparse-0.5[${PYTHON_USEDEP}] )
-	subtitles? ( media-video/gaupol[${PYTHON_USEDEP}] )
-	yaml? ( dev-python/pyyaml[${PYTHON_USEDEP}] )
-"
-BDEPEND+="
-	test? ( dev-python/phply[${PYTHON_USEDEP}] )"
-
-distutils_enable_sphinx docs \
-	dev-python/sphinx-bootstrap-theme
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}"/translate-toolkit-3.3.0-no-install-docs.patch
-)
-
-python_test() {
-	local deselect=(
-		# Fails with network-sandbox (and even with it off but w/ softer fail)
-		--deselect 'tests/xliff_conformance/test_xliff_conformance.py::test_open_office_to_xliff'
-		--deselect 'tests/xliff_conformance/test_xliff_conformance.py::test_po_to_xliff'
-	)
-
-	if ! use ini; then
-		deselect+=(
-			--ignore translate/convert/test_ini2po.py
-			--ignore translate/convert/test_po2ini.py
-		)
-	fi
-
-	if ! use subtitles; then
-		deselect+=(
-			--ignore translate/storage/test_subtitles.py
-		)
-	fi
-
-	# translate/storage/test_mo.py needs 'pocompile'
-	distutils_install_for_testing
-	epytest "${deselect[@]}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if ! use html; then
-		rm "${ED}"/usr/bin/{html2po,po2html} || die
-	fi
-	if ! use ical; then
-		rm "${ED}"/usr/bin/{ical2po,po2ical} || die
-	fi
-	if ! use ini; then
-		rm "${ED}"/usr/bin/{ini2po,po2ini} || die
-	fi
-	if ! use subtitles; then
-		rm "${ED}"/usr/bin/{sub2po,po2sub} || die
-	fi
-
-	python_optimize
-}
diff --git a/dev-python/vine/metadata.xml b/dev-python/vine/metadata.xml
index 9f14f0461d07..650a237c8f5e 100644
--- a/dev-python/vine/metadata.xml
+++ b/dev-python/vine/metadata.xml
@@ -4,9 +4,14 @@
  <maintainer type="person">
   <email>zmedico@gentoo.org</email>
  </maintainer>
+ <maintainer type="project">
+  <email>python@gentoo.org</email>
+  <name>Python</name>
+ </maintainer>
  <upstream>
   <remote-id type="pypi">vine</remote-id>
   <remote-id type="github">celery/vine</remote-id>
  </upstream>
  <origin>gentoo-staging</origin>
+ <stabilize-allarches/>
 </pkgmetadata>
 \ No newline at end of file
diff --git a/dev-python/virtualenv/Manifest b/dev-python/virtualenv/Manifest
index 3eb2c66ddb40..9ddd80421216 100644
--- a/dev-python/virtualenv/Manifest
+++ b/dev-python/virtualenv/Manifest
@@ -1,3 +1,4 @@
 DIST virtualenv-16.7.10.tar.gz 5116776 BLAKE2B 42f0a4b4330850b504f8febd991ef6ecdcbb0821efdd94ca324a8cc34a68a760a8a98de97f0cb2384d8e6cbb0ce8f261995c6433886444e29b75ba0ce09ca12c SHA512 f06d7c354ce1910f04dbcbe1a77e60392653bbe4f638bafbe9284454db2c0e5d63cf9159201d0916fc01aaba91d45fb733b63096c38517fcd83fd00ed8b26d28
 DIST virtualenv-20.4.3.tar.gz 10579193 BLAKE2B 02102579eb72b7e4ea8fa182b3c7ef5d8b9d95992b5f73b0f24737522dfae988a91953c49df5aa17541f3f0b1c54557ece7feba173a9cce3bb65964bddbd6edb SHA512 d79479d73fc87f34462e775629306bd20ff5d25eb1829c6719f08c800df6a5db03254b04773766a703d903d577cf74b8409a026196ba98d0f5f94f70604ed576
 DIST virtualenv-20.4.4.tar.gz 10579531 BLAKE2B 9e10c07bd191d745d6904f304787a3913c0c574bb4453549796052f27329cbc2e3700fbc6f40ff02f4e94b8f1c21458c8fbd706b05ae458c033722d3eaf04f2e SHA512 acc528cccfc80aeed2fcd7209cab7ff0f1a7d1dc01a59fdb6a07703c7905904ab68d3f4ff312e108c687d03495e82ed8d26ecc15c2b17b9e771605a46164b4bd
+DIST virtualenv-20.4.6.tar.gz 10588254 BLAKE2B 90537a694940063d74513ac74eb5e771c97cb7413b98ef9628ad71eecfd7bf1f604d920b94fc31b87ec2884aa1988aae8917085c4561cd9902eec83994197073 SHA512 4ed0b1e333215f2a9cc91082b4bbbe9ba6c1da928e5c19a2245966041213d771e02f84538c2a2a34c7aab539419ff14013150fc4b70884941fe48aa4786e90c0
diff --git a/dev-python/virtualenv/virtualenv-20.4.6.ebuild b/dev-python/virtualenv/virtualenv-20.4.6.ebuild
new file mode 100644
index 000000000000..445a853b3170
--- /dev/null
+++ b/dev-python/virtualenv/virtualenv-20.4.6.ebuild
@@ -0,0 +1,96 @@
+# 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 )
+DISTUTILS_USE_SETUPTOOLS=manual
+
+inherit distutils-r1
+
+DESCRIPTION="Virtual Python Environment builder"
+HOMEPAGE="
+	https://virtualenv.pypa.io/en/stable/
+	https://pypi.org/project/virtualenv/
+	https://github.com/pypa/virtualenv/
+"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+SLOT="0"
+
+RDEPEND="
+	>=dev-python/appdirs-1.4.3[${PYTHON_USEDEP}]
+	>=dev-python/distlib-0.3.1[${PYTHON_USEDEP}]
+	>=dev-python/filelock-3[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-41[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_metadata-0.12[${PYTHON_USEDEP}]
+	' python3_7 pypy3)"
+# coverage is used somehow magically in virtualenv, maybe it actually
+# tests something useful
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/coverage[${PYTHON_USEDEP}]
+			dev-python/flaky[${PYTHON_USEDEP}]
+			>=dev-python/pip-20.0.2[${PYTHON_USEDEP}]
+			>=dev-python/pytest-freezegun-0.4.1[${PYTHON_USEDEP}]
+			>=dev-python/pytest-mock-2.0.0[${PYTHON_USEDEP}]
+			>=dev-python/pytest-timeout-1.3.4[${PYTHON_USEDEP}]
+			dev-python/wheel[${PYTHON_USEDEP}]
+			>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
+		' 'python3*')
+	)"
+
+distutils_enable_sphinx docs \
+	dev-python/sphinx_rtd_theme \
+	dev-python/towncrier
+distutils_enable_tests pytest
+
+src_configure() {
+	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+}
+
+python_test() {
+	local deselect=(
+		tests/unit/activation/test_xonsh.py
+		tests/unit/seed/embed/test_bootstrap_link_via_app_data.py::test_seed_link_via_app_data
+		tests/unit/create/test_creator.py::test_cross_major
+	)
+	[[ ${EPYTHON} == pypy3 ]] && deselect+=(
+		'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-isolated]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-global]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-isolated]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-global]'
+		'tests/unit/create/test_creator.py::test_zip_importer_can_import_setuptools'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.10-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.10--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.10-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.10--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3--bin-]'
+	)
+
+	distutils_install_for_testing
+	epytest ${deselect[@]/#/--deselect }
+}
+
+pkg_postinst() {
+	elog "Please note that while virtualenv package no longer supports"
+	elog "Python 2.7, you can still create py2.7 virtualenvs via:"
+	elog "  $ virtualenv -p 2.7 ..."
+}
diff --git a/dev-python/wurlitzer/metadata.xml b/dev-python/wurlitzer/metadata.xml
index f876b5900f2f..a6cc6e80dcec 100644
--- a/dev-python/wurlitzer/metadata.xml
+++ b/dev-python/wurlitzer/metadata.xml
@@ -14,4 +14,5 @@
   <remote-id type="github">minrk/wurlitzer</remote-id>
  </upstream>
  <origin>gentoo-staging</origin>
+ <stabilize-allarches/>
 </pkgmetadata>
 \ No newline at end of file
diff --git a/dev-python/wurlitzer/wurlitzer-2.1.0.ebuild b/dev-python/wurlitzer/wurlitzer-2.1.0.ebuild
index c2999556343b..8f7df62ef9b4 100644
--- a/dev-python/wurlitzer/wurlitzer-2.1.0.ebuild
+++ b/dev-python/wurlitzer/wurlitzer-2.1.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/zeroconf/Manifest b/dev-python/zeroconf/Manifest
index 18148fa854ae..632a025e172a 100644
--- a/dev-python/zeroconf/Manifest
+++ b/dev-python/zeroconf/Manifest
@@ -1 +1,2 @@
 DIST python-zeroconf-0.29.0.gh.tar.gz 62466 BLAKE2B 430a9f4d4460d66166a2484862a8dd3af65f3cfad0e25557648abf26ebe88a7ae581934273db270ff30fa4d714b32a822448b22fd7a95e9e382b68ffae9b66b4 SHA512 a084da17cda264b531e7f58975d30ae0b5adb98f33ca78d1e865e1450dc42ad2bca69bc319c268f7977e70e082ae713142a57f97a9f050486c47b50698002590
+DIST python-zeroconf-0.30.0.gh.tar.gz 64301 BLAKE2B ea0d5e36f3f012f217cbd4eeff0a9cd366496e2f64b06112ee3629ad016c8e28877f62358d5b5fd27387cfe474e488e99a9ad8ca1802f6d23612f99310243c57 SHA512 1f3165500a07525ef182bb60c1804fe2002a33a9f800470bdb32bdfd44a1b8f466a818a4390537674952159e5c0e257cf9e4ca570b1a9936e1cf8be294be6311
diff --git a/dev-python/zeroconf/zeroconf-0.29.0.ebuild b/dev-python/zeroconf/zeroconf-0.29.0.ebuild
index 7eb4a2d83973..83912114f7e2 100644
--- a/dev-python/zeroconf/zeroconf-0.29.0.ebuild
+++ b/dev-python/zeroconf/zeroconf-0.29.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+PYTHON_COMPAT=( python3_{7..10} )
 inherit distutils-r1
 
 MY_P=python-zeroconf-${PV}
diff --git a/dev-python/zeroconf/zeroconf-0.30.0.ebuild b/dev-python/zeroconf/zeroconf-0.30.0.ebuild
new file mode 100644
index 000000000000..7468e3466c5c
--- /dev/null
+++ b/dev-python/zeroconf/zeroconf-0.30.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..10} )
+inherit distutils-r1
+
+MY_P=python-zeroconf-${PV}
+DESCRIPTION="Pure Python Multicast DNS Service Discovery Library (Bonjour/Avahi compatible)"
+HOMEPAGE="
+	https://github.com/jstasiak/python-zeroconf/
+	https://pypi.org/project/zeroconf/"
+SRC_URI="
+	https://github.com/jstasiak/python-zeroconf/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND=">=dev-python/ifaddr-0.1.7[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local excludes=(
+		# network
+		zeroconf/test.py::Framework::test_close_multiple_times
+		zeroconf/test.py::Framework::test_launch_and_close
+		zeroconf/test.py::Framework::test_launch_and_close_v4_v6
+		zeroconf/test.py::Framework::test_launch_and_close_v6_only
+		zeroconf/test.py::ServiceTypesQuery::test_integration_with_listener_ipv6
+	)
+
+	epytest ${excludes[@]/#/--deselect } zeroconf/test.py
+}
author	Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net>	2021-05-06 13:47:34 +0000
committer	Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net>	2021-05-06 13:47:34 +0000
commit	20061f2a002ae795f50d917b6f62ea2e3eb9c2ad (patch)
tree	57d128a419b6c94c70360ed9916cb58d38b32124 /dev-python
parent	7247b409bd52b658cedc7055304d4b1c280e678e (diff)
download	baldeagleos-repo-20061f2a002ae795f50d917b6f62ea2e3eb9c2ad.tar.gz baldeagleos-repo-20061f2a002ae795f50d917b6f62ea2e3eb9c2ad.tar.xz baldeagleos-repo-20061f2a002ae795f50d917b6f62ea2e3eb9c2ad.zip