Adding metadata

41 files changed, 173 insertions, 581 deletions

diff --git a/dev-python/QtPy/QtPy-1.11.3-r1.ebuild b/dev-python/QtPy/QtPy-1.11.3-r1.ebuild
index 3c10390426cd..be5586a9eda3 100644
--- a/dev-python/QtPy/QtPy-1.11.3-r1.ebuild
+++ b/dev-python/QtPy/QtPy-1.11.3-r1.ebuild
@@ -122,16 +122,12 @@ src_prepare() {
 	sed -i -e "s/from PySide.QtCore import/raise ImportError #/" qtpy/__init__.py || die
 }
 
-src_test() {
-	virtx python_foreach_impl python_test
-}
-
 python_test() {
 	if use pyqt5; then
-		QT_API="pyqt5" epytest
+		virtx QT_API="pyqt5" epytest
 	fi
 	if use pyside2; then
-		QT_API="pyside2" epytest
+		virtx QT_API="pyside2" epytest
 	fi
 }
 
diff --git a/dev-python/aiohttp/aiohttp-3.8.1.ebuild b/dev-python/aiohttp/aiohttp-3.8.1.ebuild
index 1cbffe7c2b5b..2a3751c7cf5e 100644
--- a/dev-python/aiohttp/aiohttp-3.8.1.ebuild
+++ b/dev-python/aiohttp/aiohttp-3.8.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc ~x86"
 
 RDEPEND="
 	app-arch/brotli[python,${PYTHON_USEDEP}]
diff --git a/dev-python/aiosignal/aiosignal-1.2.0.ebuild b/dev-python/aiosignal/aiosignal-1.2.0.ebuild
index 725b6399e97f..872f42c25619 100644
--- a/dev-python/aiosignal/aiosignal-1.2.0.ebuild
+++ b/dev-python/aiosignal/aiosignal-1.2.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 
 RDEPEND="
 	>=dev-python/frozenlist-1.1.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/consonance/Manifest b/dev-python/consonance/Manifest
index 1cc521e240ca..3b59e36d0cb0 100644
--- a/dev-python/consonance/Manifest
+++ b/dev-python/consonance/Manifest
@@ -1 +1,2 @@
 DIST consonance-0.1.3.tar.gz 30762 BLAKE2B c30db2741a851ae1ef02361102c432d931925125d8648c0e5b1a88005f480219eaf81e8205559dd709b43e98b3925777d1fecf702577e38c3ec1c8f4e8a19cce SHA512 9f36f81b453dc4de2217a997580bb3f8747c86a8116275ba5a0e86cc66ec62d6490ae20c0e5f7401d1c16d601686936ba7b789999941c657a0b508ce0dea1cea
+DIST consonance-0.1.5.tar.gz 31225 BLAKE2B 049637747e0b9b027bfc9a064d4fe792a7d2cc42219d83662646120423af1ef18e4a8328a9deaa9e9d8d0f75065afceb6cc9c533fa5728b1e866c160811cce16 SHA512 3ab8a7a2dbca22d519c79a2903f90d79ce3b5709e0025667c9fbe0d5bfc8b3a4ab853403dd29b791bd2cf3101fdd2a3c806e694840256f373d1930daeea71509
diff --git a/dev-python/consonance/consonance-0.1.5.ebuild b/dev-python/consonance/consonance-0.1.5.ebuild
new file mode 100644
index 000000000000..5c396de53150
--- /dev/null
+++ b/dev-python/consonance/consonance-0.1.5.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+inherit distutils-r1
+
+DESCRIPTION="WhatsApp's handshake implementation using Noise Protocol"
+HOMEPAGE="https://github.com/tgalal/consonance"
+SRC_URI="https://github.com/tgalal/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+# Tests require an active internet connection
+RESTRICT="test"
+PROPERTIES="test_network"
+
+RDEPEND="
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/dissononce[${PYTHON_USEDEP}]
+	dev-python/protobuf-python[${PYTHON_USEDEP}]
+	dev-python/python-axolotl-curve25519[${PYTHON_USEDEP}]
+	dev-python/transitions[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+src_install() {
+	distutils-r1_src_install
+
+	use examples && dodoc examples/*.py
+}
diff --git a/dev-python/flask-wtf/Manifest b/dev-python/flask-wtf/Manifest
index 6ba915043437..8a1e38521cee 100644
--- a/dev-python/flask-wtf/Manifest
+++ b/dev-python/flask-wtf/Manifest
@@ -1,2 +1 @@
-DIST Flask-WTF-0.15.1.tar.gz 45540 BLAKE2B 95ed9efaa89b487f406811926a8b206d15ad9c065f99595a35ea2ca4f98ede671673204c4085de91afe1e1b91b611ceb0f43b9c68b46fdd0e38d9025ac666f70 SHA512 9741e2c2285a500866b160e8c906c38ca579fdae2235bcba2336c7125ba614a9f75167c82bfcb96a45e553170c5925cb1a530d0164ecc57dc76cf1b560c40855
 DIST Flask-WTF-1.0.0.tar.gz 45365 BLAKE2B 13568ed3cbf7666c2c04663ec66c788d3cd4aa4fc7abc32938dfa703e7f120784c9491dc0ffe77fc42485c943b25f166b6540fa0f3de1d77df8a015300e1e468 SHA512 4b47e3586e3fb34f2ef964fb2a84d25c8279d4ce98e2064655e5ecb5f8fd67e4637ffd81b171e4623e2cd943e5abbcb6f5980ea8a354c2745d65c64161c0fd60
diff --git a/dev-python/flask-wtf/flask-wtf-0.15.1.ebuild b/dev-python/flask-wtf/flask-wtf-0.15.1.ebuild
deleted file mode 100644
index d92e8e5cf96b..000000000000
--- a/dev-python/flask-wtf/flask-wtf-0.15.1.ebuild
+++ /dev/null
@@ -1,39 +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
-
-MY_PN="Flask-WTF"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Simple integration of Flask and WTForms"
-HOMEPAGE="https://pythonhosted.org/Flask-WTF/ https://pypi.org/project/Flask-WTF/"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	>=dev-python/Babel-1[${PYTHON_USEDEP}]
-	dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/flask-babel[${PYTHON_USEDEP}]
-	dev-python/itsdangerous[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/werkzeug[${PYTHON_USEDEP}]
-	>=dev-python/wtforms-1.0.5[${PYTHON_USEDEP}]
-"
-
-distutils_enable_sphinx docs
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# tries to access things over the network
-	tests/test_recaptcha.py
-	# unpackaged Flask-Uploads
-	tests/test_file.py
-)
diff --git a/dev-python/flask-wtf/flask-wtf-1.0.0.ebuild b/dev-python/flask-wtf/flask-wtf-1.0.0.ebuild
index 7a26d0c7b336..5ed597098798 100644
--- a/dev-python/flask-wtf/flask-wtf-1.0.0.ebuild
+++ b/dev-python/flask-wtf/flask-wtf-1.0.0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	>=dev-python/Babel-1[${PYTHON_USEDEP}]
diff --git a/dev-python/frozenlist/frozenlist-1.2.0.ebuild b/dev-python/frozenlist/frozenlist-1.2.0.ebuild
index 516dd2c39e8a..70775b60c7a0 100644
--- a/dev-python/frozenlist/frozenlist-1.2.0.ebuild
+++ b/dev-python/frozenlist/frozenlist-1.2.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 
 BDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-python/ipython/Manifest b/dev-python/ipython/Manifest
index 3113952fdb92..34264bbdc018 100644
--- a/dev-python/ipython/Manifest
+++ b/dev-python/ipython/Manifest
@@ -1,4 +1,2 @@
-DIST ipython-7.28.0.tar.gz 5150515 BLAKE2B e69b2ca9b788d8bcc12fb1b82c2e3f198ba4cf1918c8d8d30aea9a1ee3c7cea99ba3ade8ac7171466f1ffc8771dafcf5980766ecca7b985e07890e229cd1575d SHA512 227645ab2cc698f6f7141bb3712b254d75beaf3f227065530f25f988ac76b5a741752ddfa6bb2816b625eaa4972d434f9e73dbe465654e4efc5420b5d80650cb
 DIST ipython-7.29.0.tar.gz 5151803 BLAKE2B 685bb7df39513fe262c07dbb10de4d795860bf2958c626d030bfa3e18052a98d7c9d5f0f96c0c9a5d4b9fdcfab09c492457d409f05ce522f607456ff3a4b35fd SHA512 b8e9cc07a0f77bbfaa88183546ed9d7e4a4c37e7c1704b1a3716d605a04339f986c7767f3c0920a94039eda99e75afb62a7bb43fa0cde6699a902f3b8f83a398
-DIST ipython-7.30.0.tar.gz 5154105 BLAKE2B d78dd28aa294ef5e1432ca5d2d853f313f72113a26b9130628e706915d646795a950c983f10e6f6d749833169e42f137a5338a680ea5ed237099a9436497cced SHA512 a3de277701154ebe458809796d7a71319ea41f87dc914814571fcd5723050a5e6c9af06ff2a28b336b1ec9dfc4288b27b141d3faa04d98d43f3f9836ba059f50
 DIST ipython-7.30.1.tar.gz 5154336 BLAKE2B 0753433eea2ee6a5a6451db6aa537c9c9469c749b970ecdd040123787064e7be78363060a785c7ea4175b8e0f4f2bfefa15485f6f5412ec34690fe505a1cfb97 SHA512 839f709e019dd5efe32730f2e4c457e6dae0db5490844805d30f12a1fd17bfb2f991f1374a84542b2392d3ce332096d3922471c6b14149331075be8719b14734
diff --git a/dev-python/ipython/ipython-7.28.0.ebuild b/dev-python/ipython/ipython-7.28.0.ebuild
deleted file mode 100644
index d9d57b535644..000000000000
--- a/dev-python/ipython/ipython-7.28.0.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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 arm arm64 hppa ppc ppc64 ~riscv ~s390 sparc 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.17[${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
-}
-
-python_test() {
-	local -x IPYTHON_TESTING_TIMEOUT_SCALE=20
-	local EPYTEST_DESELECT=()
-	[[ ${EPYTHON} == python3.10 ]] && EPYTEST_DESELECT+=(
-		# TODO
-		IPython/core/tests/test_completer.py::TestCompleter::test_all_completions_dups
-		IPython/core/tests/test_completer.py::TestCompleter::test_deduplicate_completions
-		IPython/core/tests/test_oinspect.py::test_pinfo_docstring_if_detail_and_no_source
-		# fails due to changed argparse output
-		IPython/core/tests/test_magic_arguments.py::test_magic_arguments
-		# py3.10 API incompat, doesn't look important
-		IPython/lib/tests/test_pretty.py::test_pprint_heap_allocated_type
-	)
-	virtx epytest
-}
-
-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/ipython-7.29.0.ebuild b/dev-python/ipython/ipython-7.29.0.ebuild
index b37808175082..a6b75d11a90f 100644
--- a/dev-python/ipython/ipython-7.29.0.ebuild
+++ b/dev-python/ipython/ipython-7.29.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="doc examples matplotlib notebook nbconvert qt5 +smp test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/ipython/ipython-7.30.0.ebuild b/dev-python/ipython/ipython-7.30.0.ebuild
deleted file mode 100644
index b37808175082..000000000000
--- a/dev-python/ipython/ipython-7.30.0.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~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.17[${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
-}
-
-python_test() {
-	local -x IPYTHON_TESTING_TIMEOUT_SCALE=20
-	local EPYTEST_DESELECT=()
-	[[ ${EPYTHON} == python3.10 ]] && EPYTEST_DESELECT+=(
-		# TODO
-		IPython/core/tests/test_completer.py::TestCompleter::test_all_completions_dups
-		IPython/core/tests/test_completer.py::TestCompleter::test_deduplicate_completions
-		IPython/core/tests/test_oinspect.py::test_pinfo_docstring_if_detail_and_no_source
-		# fails due to changed argparse output
-		IPython/core/tests/test_magic_arguments.py::test_magic_arguments
-		# py3.10 API incompat, doesn't look important
-		IPython/lib/tests/test_pretty.py::test_pprint_heap_allocated_type
-	)
-	virtx epytest
-}
-
-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/lazy-object-proxy/Manifest b/dev-python/lazy-object-proxy/Manifest
index 923ac8a658df..1bd3170b5ef4 100644
--- a/dev-python/lazy-object-proxy/Manifest
+++ b/dev-python/lazy-object-proxy/Manifest
@@ -1 +1,2 @@
 DIST lazy-object-proxy-1.5.0.tar.gz 35938 BLAKE2B 11e091538f4bcddd5acb39963572e30535b01227481affcb160d55b39c5b4548fef2da316efe483d6b0450e204126b957884dfb7a96727b0a00209addd6097cc SHA512 8d594df743694f01b9710e55d8e88831d6ac2e81a925ad310f0c39d061f20115550c5adf1da40d0d7c4749eb3a7ffbbb6000ebbda3dbb445c9efa1d05ff37cc3
+DIST lazy-object-proxy-1.7.0.tar.gz 42441 BLAKE2B 8652697cf80f4fca6a4ad83daee2fafb203b7c1a1375fa504aba731e4717d40f3b130cbfeffd642a7d76ae35ab5532aaa819566d8706b37504863e7b433906c3 SHA512 462e04efccba1462a09bec66bdfa47f3cb4d8fa746f66d7dada0e9436416c6f7948363d11eac95f8d8734d3296794899f28f123cb289565af85d3bc29a635c61
diff --git a/dev-python/lazy-object-proxy/lazy-object-proxy-1.7.0.ebuild b/dev-python/lazy-object-proxy/lazy-object-proxy-1.7.0.ebuild
new file mode 100644
index 000000000000..27a6ad6f5fd2
--- /dev/null
+++ b/dev-python/lazy-object-proxy/lazy-object-proxy-1.7.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="A fast and thorough lazy object proxy"
+HOMEPAGE="
+	https://github.com/ionelmc/python-lazy-object-proxy
+	https://pypi.org/project/lazy-object-proxy/
+	https://python-lazy-object-proxy.readthedocs.org/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# No need to benchmark
+	sed \
+		-e '/benchmark/s:test_:_&:g' \
+		-e '/pytest.mark.benchmark/d' \
+		-i tests/test_lazy_object_proxy.py || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/moto/moto-2.2.19.ebuild b/dev-python/moto/moto-2.2.19.ebuild
index 4d826b63d833..6f4203c9b010 100644
--- a/dev-python/moto/moto-2.2.19.ebuild
+++ b/dev-python/moto/moto-2.2.19.ebuild
@@ -25,8 +25,8 @@ RDEPEND="
 	>=dev-python/idna-2.5[${PYTHON_USEDEP}]
 	>=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
 	>=dev-python/jsondiff-1.1.2[${PYTHON_USEDEP}]
-	<dev-python/boto3-1.20.24[${PYTHON_USEDEP}]
-	<dev-python/botocore-1.23.24[${PYTHON_USEDEP}]
+	dev-python/boto3[${PYTHON_USEDEP}]
+	dev-python/botocore[${PYTHON_USEDEP}]
 	dev-python/flask[${PYTHON_USEDEP}]
 	dev-python/flask-cors[${PYTHON_USEDEP}]
 	dev-python/more-itertools[${PYTHON_USEDEP}]
diff --git a/dev-python/natsort/Manifest b/dev-python/natsort/Manifest
index f4900a5191cb..79284d00367f 100644
--- a/dev-python/natsort/Manifest
+++ b/dev-python/natsort/Manifest
@@ -1,2 +1,3 @@
 DIST natsort-7.2.0.tar.gz 144338 BLAKE2B cba2a547813b56c3f42a6d9526be59ebda0e12f964ce72e166dec825ceab923b06f7be768e4071f9380e7b8c2a2d24a5b9af0ad0752e48655046bca44fd03ab9 SHA512 9490d4f3f304834a82f91fc7f215a9212e5e4a2c78e2d0943d886cff2f50c581171bd27edc8ceec23981ebaf8d13d3be2bf1954439dd76aef9a2cc9983b1968a
 DIST natsort-8.0.1.tar.gz 144778 BLAKE2B 81aaeebb02b0a0e45d9291c4efd341eadff7be9e8b50a966e21b0a22b92eb05cee99148f6e2b93ce792bda2a223f1a64e43d2569dd1cbc4b421e11f2652722f8 SHA512 a1db383c466b8605006d880cb19f284902ae7384bca839877cc7baa0d60b5ab369126ae7efe0b93e1b5a0c399ad902fdd818beed2c34bb209b56e3c960896d4f
+DIST natsort-8.0.2.tar.gz 144912 BLAKE2B 0e5d83e6991ef1208b84cbf17e287f487a2a059d68274876977ae6f18f89492284bc166499a9518bfc2df19999e5593f386ce88beca94c23d8a050697c0b2a36 SHA512 fad31e1af1e1d4a33061b8b3e31d022f353f662d306136d05e0121a0531f33cf388467a40f91f51036f283ab8fbdefc1193d09f440052960ffdf733186b5fb27
diff --git a/dev-python/natsort/natsort-8.0.2.ebuild b/dev-python/natsort/natsort-8.0.2.ebuild
new file mode 100644
index 000000000000..b058d908b84a
--- /dev/null
+++ b/dev-python/natsort/natsort-8.0.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Natural sorting for Python"
+HOMEPAGE="https://pypi.org/project/natsort/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+BDEPEND="
+	test? (
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+pkg_postinst() {
+	optfeature "sorting results that match most file browsers" "dev-python/pyicu"
+}
diff --git a/dev-python/prometheus_client/Manifest b/dev-python/prometheus_client/Manifest
index 2522b4c3e7d9..7e52edad9def 100644
--- a/dev-python/prometheus_client/Manifest
+++ b/dev-python/prometheus_client/Manifest
@@ -1,2 +1 @@
-DIST prometheus_client-0.11.0.tar.gz 72272 BLAKE2B 2526a65acf928ce5f492c6a43276ecb951d8b600eeb5050b92db091919862eb0ec4f41ca41347b4dd70a612f70e8f4a49796572de80b197d21c3a8cf8e303201 SHA512 5e644d781b7fcc3e0e386a2244f524ccaf978f1eab87b1d6d8009ac3f10fe2ca4adf2c76c2a2ffa47b4b54237cd906807d55bd99530a92d82cd3825de93280dc
 DIST prometheus_client-0.12.0.tar.gz 73521 BLAKE2B eb90c7f3991519fe132f01612d6aadd10193947069b79e67c9e37faa4e174d739ca78b12de028dfc922cb368c7405baeb4fa929b378a91db12e67190ca3561ff SHA512 ebcbbed706a96a9402eb985f5da15ee8fae09de952144a89a3323e147c0d16615ccd9be58b50b5b8ede37d4f66de1e2ce93ed53c4da939ca2e44c7aac687a1f7
diff --git a/dev-python/prometheus_client/prometheus_client-0.11.0.ebuild b/dev-python/prometheus_client/prometheus_client-0.11.0.ebuild
deleted file mode 100644
index 87ebf1bbe0e1..000000000000
--- a/dev-python/prometheus_client/prometheus_client-0.11.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} )
-inherit distutils-r1
-
-DESCRIPTION="Python client for the Prometheus monitoring system"
-HOMEPAGE="https://pypi.org/project/prometheus-client/
-	https://github.com/prometheus/client_python/"
-SRC_URI="https://github.com/prometheus/client_python/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/client_python-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 hppa ppc ~ppc64 ~riscv ~s390 ~sparc x86"
-
-RDEPEND="dev-python/twisted[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
diff --git a/dev-python/prometheus_client/prometheus_client-0.12.0.ebuild b/dev-python/prometheus_client/prometheus_client-0.12.0.ebuild
index 091517163b16..90e37ba0bfc7 100644
--- a/dev-python/prometheus_client/prometheus_client-0.12.0.ebuild
+++ b/dev-python/prometheus_client/prometheus_client-0.12.0.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/client_python-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 hppa ~ia64 ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="dev-python/twisted[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/pyglet/pyglet-1.5.21.ebuild b/dev-python/pyglet/pyglet-1.5.21.ebuild
index a5553ee2ec95..d2faa85e9436 100644
--- a/dev-python/pyglet/pyglet-1.5.21.ebuild
+++ b/dev-python/pyglet/pyglet-1.5.21.ebuild
@@ -18,7 +18,7 @@ IUSE="examples image +sound"
 BDEPEND="
 	test? (
 		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/gst-python[${PYTHON_USEDEP}]
+		media-libs/fontconfig
 	)
 "
 RDEPEND="
@@ -39,16 +39,17 @@ DOCS=( DESIGN NOTICE README.md RELEASE_NOTES )
 
 distutils_enable_tests pytest
 
-src_test() {
-	virtx distutils-r1_src_test
-}
-
 python_test() {
 	xdg_environment_reset
 
+	# Deselect openal test, can't open device in sandbox
+	local deselect=(
+		tests/unit/media/test_listener.py::test_openal_listener
+	)
+
 	# Specify path to avoid running interactive tests
 	# We could add in integration tests, but they're slow
-	epytest tests/unit
+	virtx epytest tests/unit ${deselect[@]/#/--deselect }
 }
 
 python_install_all() {
diff --git a/dev-python/pymdown-extensions/Manifest b/dev-python/pymdown-extensions/Manifest
index 95abb68c7aaa..aa7675bf19dc 100644
--- a/dev-python/pymdown-extensions/Manifest
+++ b/dev-python/pymdown-extensions/Manifest
@@ -1,2 +1 @@
-DIST pymdown-extensions-9.0.tar.gz 978665 BLAKE2B 328b36bf34b362ed20b8f52576fb8ea1bbf818e99815c15e0779e38dc560134096bb35ac9a5a4ad11c713921052b0ac0041b0fd2491fc76fcd7cfcbba0760f0a SHA512 813d81900b19e8235e67da362951e3e72f9948751cbe3ee9547e043d535fb8b480f0b65aa811a8b8a67c25509fefef01d3f46b4a1a6af9f00c8be244ad6fb6a9
 DIST pymdown-extensions-9.1.tar.gz 1004051 BLAKE2B e6b1ebfbacce8c78c00cffc314244ed4a65a2e63d8270196e1acdd72adc75956e57b00b89ad0e4089cb186d23df390eb00a08b47a0418f4a41147803bed079ce SHA512 ab5b9703096dc95d33469d79eb042e845f1337ac65d951e65e44224190f7feb832049854163dfcb73ee238254e10b831640a1813cafd981368df96b96d3f6752
diff --git a/dev-python/pymdown-extensions/pymdown-extensions-9.0.ebuild b/dev-python/pymdown-extensions/pymdown-extensions-9.0.ebuild
deleted file mode 100644
index 629c032e1f73..000000000000
--- a/dev-python/pymdown-extensions/pymdown-extensions-9.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-DOCS_BUILDER="mkdocs"
-DOCS_DEPEND="
-	dev-python/mkdocs-git-revision-date-localized-plugin
-	dev-python/mkdocs-minify-plugin
-	dev-python/mkdocs-material
-	dev-python/pymdown-lexers
-	dev-python/pyspelling
-"
-
-inherit distutils-r1 docs
-
-DESCRIPTION="Extensions for Python Markdown"
-HOMEPAGE="
-	https://github.com/facelessuser/pymdown-extensions/
-	https://pypi.org/project/pymdown-extensions/
-"
-SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-
-RDEPEND=">=dev-python/markdown-3.2[${PYTHON_USEDEP}]"
-
-BDEPEND="
-	test? (
-		dev-python/pygments[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# mkdocs-git-revision-date-localized-plugin needs git repo
-	if use doc; then
-		git init || die
-		git config --global user.email "you@example.com" || die
-		git config --global user.name "Your Name" || die
-		git add . || die
-		git commit -m 'init' || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/pymdown-extensions/pymdown-extensions-9.1.ebuild b/dev-python/pymdown-extensions/pymdown-extensions-9.1.ebuild
index d9c1b4fcb919..629c032e1f73 100644
--- a/dev-python/pymdown-extensions/pymdown-extensions-9.1.ebuild
+++ b/dev-python/pymdown-extensions/pymdown-extensions-9.1.ebuild
@@ -25,7 +25,7 @@ SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 
 RDEPEND=">=dev-python/markdown-3.2[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/pyproject2setuppy/Manifest b/dev-python/pyproject2setuppy/Manifest
index d732e1280386..6e8c0c9e746e 100644
--- a/dev-python/pyproject2setuppy/Manifest
+++ b/dev-python/pyproject2setuppy/Manifest
@@ -1,2 +1 @@
-DIST pyproject2setuppy-20.tar.gz 12795 BLAKE2B 14f1862c546d9850f0e523b79c44d49dceab76752c4a0b5527d33b36bbb459735b29ca9fad9d8c72f1be189004014b2ce6b2b6858842263fe913532800398064 SHA512 1d75b908611f121c6723037d0132c890d9d00f3f7b1b237fa658dc8c217a1f60e7141a99a7d744e9b8ff67b5fdef1fd11b38f4a3bda0858a55836ad49211a068
 DIST pyproject2setuppy-21.tar.gz 12938 BLAKE2B 09b030e882e7ec66c3d8ad76d486c08b991c7ba725d628101c07475348890a55bc6d6f4ef96f3a9b0f8d40382c026f075aac6dd2fa970fa409c4824b625ba3f1 SHA512 d899bc81f01283dd854fa2c0c5d15e5b77bd273f4269e2dea8612dd41bb4d5404e63e0fc6db5cbefe2a65a69848a3a5c9eae56e93face1736b2e8a0aa39f2193
diff --git a/dev-python/pyproject2setuppy/pyproject2setuppy-20.ebuild b/dev-python/pyproject2setuppy/pyproject2setuppy-20.ebuild
deleted file mode 100644
index c663cab42f07..000000000000
--- a/dev-python/pyproject2setuppy/pyproject2setuppy-20.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-RDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/tomli[${PYTHON_USEDEP}]"
-BDEPEND="${RDEPEND}
-	test? (
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-		dev-python/wheel[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pyproject2setuppy/pyproject2setuppy-21.ebuild b/dev-python/pyproject2setuppy/pyproject2setuppy-21.ebuild
index 01b516520671..c663cab42f07 100644
--- a/dev-python/pyproject2setuppy/pyproject2setuppy-21.ebuild
+++ b/dev-python/pyproject2setuppy/pyproject2setuppy-21.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-describe/Manifest b/dev-python/pytest-describe/Manifest
index ea964ebbd4a0..06e4322f13c3 100644
--- a/dev-python/pytest-describe/Manifest
+++ b/dev-python/pytest-describe/Manifest
@@ -1,2 +1 @@
-DIST pytest-describe-2.0.0.tar.gz 9711 BLAKE2B d9a799afebf77166c81a9d2477a378d7664e9aa586460043c9a9448838eafebcb0679768d10d2439ab350b48ad7263ebe17eea6fdaef96ef14aceb6aa9ff943c SHA512 28edd2b10607424aff7b95dd834716fc1888a09c23d810e0b9870a5a93de3ca745d3506a6327ece6f92b3afcdcee0fb56f6f163e2868abcf2022175708ff58af
 DIST pytest-describe-2.0.1.tar.gz 9793 BLAKE2B e7816cbc68e1ed1e2686ce3437cd0f59a52191d5413dbc9e0d6f9530a57728ad0917d86680b91228aa55ce689bc16c4da83595f87d82f9be9c4ce222c46fefea SHA512 c74362d5f1b0f3ff6d35d9049e82b7dc54be6755f1daa13366c47dee1ab9f1b1085d8c9719952d75c3c6c58b76a2c5f6b0162c78e53da71fe09bd91ed27f6bf2
diff --git a/dev-python/pytest-describe/pytest-describe-2.0.0.ebuild b/dev-python/pytest-describe/pytest-describe-2.0.0.ebuild
deleted file mode 100644
index d1e424ba3fba..000000000000
--- a/dev-python/pytest-describe/pytest-describe-2.0.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="Describe-style plugin for pytest"
-HOMEPAGE="https://github.com/pytest-dev/pytest-describe/
-	https://pypi.org/project/pytest-describe/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-RDEPEND=">=dev-python/pytest-2.6.0[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-python_test() {
-	# We need to disable some plugins because tests don't like unexpected
-	# output
-	PYTEST_ADDOPTS="-p no:flaky -p no:capturelog" epytest
-}
diff --git a/dev-python/pytest-describe/pytest-describe-2.0.1.ebuild b/dev-python/pytest-describe/pytest-describe-2.0.1.ebuild
index 9c59d1a119b3..d1e424ba3fba 100644
--- a/dev-python/pytest-describe/pytest-describe-2.0.1.ebuild
+++ b/dev-python/pytest-describe/pytest-describe-2.0.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND=">=dev-python/pytest-2.6.0[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/pythran/Manifest b/dev-python/pythran/Manifest
index 6b22a3992ef2..65f819485dab 100644
--- a/dev-python/pythran/Manifest
+++ b/dev-python/pythran/Manifest
@@ -1 +1,2 @@
 DIST pythran-0.10.0.gh.tar.gz 3614984 BLAKE2B 82686479d475c6814392eb6c34e2d765ba36c88f9de3119f38c81b3f09d07acce8f5ab11b31114c13a1aa3bebd3699c540edcc6203401a007caf02c960a4733b SHA512 3d48d6f12fcd0317cb756eee18ad359057e4daee1a496023253b26febd2acf0fd22c3b4976bc8552a137d25052e4feaacf1917c5dc84414e9fbed66dff5c1614
+DIST pythran-0.11.0.gh.tar.gz 3582011 BLAKE2B 532afe9edd84d2699254bcad330dc03fcda4defce73997ec9feecf1a9e0c8f4fd407a5c4ebae7e10f96463a43453137953dc3e4df010ae7fb63d540d41b79f53 SHA512 bd703148f26a0511f5a21e691e62f4e9b7bf5a92548f8ac837b2d24135917b71b052941180c9801f29c457018eb57e5f5107a509d6815d8dd8ddab1b8626b1a1
diff --git a/dev-python/pythran/pythran-0.11.0.ebuild b/dev-python/pythran/pythran-0.11.0.ebuild
new file mode 100644
index 000000000000..13b5d69fe009
--- /dev/null
+++ b/dev-python/pythran/pythran-0.11.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+inherit distutils-r1 multiprocessing
+
+MY_P=${P/_p/.post}
+DESCRIPTION="Ahead of Time compiler for numeric kernels"
+HOMEPAGE="
+	https://pypi.org/project/pythran/
+	https://github.com/serge-sans-paille/pythran/"
+SRC_URI="
+	https://github.com/serge-sans-paille/pythran/archive/${PV/_p/.post}.tar.gz
+		-> ${MY_P}.gh.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	=dev-python/beniget-0.4*[${PYTHON_USEDEP}]
+	=dev-python/gast-0.5*[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	>=dev-python/ply-3.4[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/ipython[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		dev-python/scipy[${PYTHON_USEDEP}]
+		dev-python/wheel[${PYTHON_USEDEP}]
+		virtual/cblas
+	)"
+
+distutils_enable_tests pytest
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.10.0-tests-werror.patch
+)
+
+src_prepare() {
+	sed -i -e '/pytest-runner/d' setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local -x COLUMNS=80
+	epytest -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+}
diff --git a/dev-python/toolz/Manifest b/dev-python/toolz/Manifest
index 46cf9697e0e8..cf8b89888acb 100644
--- a/dev-python/toolz/Manifest
+++ b/dev-python/toolz/Manifest
@@ -1,2 +1 @@
-DIST toolz-0.11.1.tar.gz 64428 BLAKE2B 934f122bbf9e762e72f502f8b9ba8b5aa946b6e2b758e9501c2bc58fefa3443cda4b3e2c423be221643f51b2a12de0961be835ae3a23e97525fa203c969edff4 SHA512 8bea2b75b74d9da988c777577f3ad574192659dcc4bea54ac6d1400a81bef07818c49c8da40028a8c42905f9ab5b5111c50c239fb56f34c315865f90413af68b
 DIST toolz-0.11.2.tar.gz 65928 BLAKE2B 3a2baddae437272e8f3efb665b63df127b3ec6bc2a68f3381651a1a3a3b45e4de6e575a328306fac95e9261228ee91193effd4aeca8d115f1608cb2561d50f13 SHA512 67e8aaea3f9fb8811027f19aa9cf56ab980e4f9cea43978ed9515662c78a7bea12314054b2c26da483b055382d4b080125c011fc43bc48b0965a6ff8415f7168
diff --git a/dev-python/toolz/files/toolz-0.11.1-py310.patch b/dev-python/toolz/files/toolz-0.11.1-py310.patch
deleted file mode 100644
index d926f3457ab1..000000000000
--- a/dev-python/toolz/files/toolz-0.11.1-py310.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From da81b1e8ab96b22ed81e6414099aba066633f3ff Mon Sep 17 00:00:00 2001
-From: Erik Welch <erik.n.welch@gmail.com>
-Date: Thu, 22 Apr 2021 00:20:24 -0500
-Subject: [PATCH] Support Python 3.10 by adding `anext` signature.
-
-Fixes #512
----
- .travis.yml          | 3 ++-
- toolz/_signatures.py | 3 +++
- 2 files changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/toolz/_signatures.py b/toolz/_signatures.py
-index 328cea91..3ce1616a 100644
---- a/toolz/_signatures.py
-+++ b/toolz/_signatures.py
-@@ -45,6 +45,9 @@
-         lambda x: None],
-     all=[
-         lambda iterable: None],
-+    anext=[
-+        lambda aiterator: None,
-+        lambda aiterator, default: None],
-     any=[
-         lambda iterable: None],
-     apply=[
diff --git a/dev-python/toolz/toolz-0.11.1.ebuild b/dev-python/toolz/toolz-0.11.1.ebuild
deleted file mode 100644
index 9739e8162e5e..000000000000
--- a/dev-python/toolz/toolz-0.11.1.ebuild
+++ /dev/null
@@ -1,24 +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="List processing tools and functional utilities"
-HOMEPAGE="https://pypi.org/project/toolz/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
-
-BDEPEND="
-	dev-python/versioneer[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}"/${P}-py310.patch
-)
diff --git a/dev-python/toolz/toolz-0.11.2.ebuild b/dev-python/toolz/toolz-0.11.2.ebuild
index 8276c407f32d..687f57539024 100644
--- a/dev-python/toolz/toolz-0.11.2.ebuild
+++ b/dev-python/toolz/toolz-0.11.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="
 	dev-python/versioneer[${PYTHON_USEDEP}]"
diff --git a/dev-python/typing-extensions/Manifest b/dev-python/typing-extensions/Manifest
index 2b3bf5f8d207..a76656936b96 100644
--- a/dev-python/typing-extensions/Manifest
+++ b/dev-python/typing-extensions/Manifest
@@ -1,2 +1 @@
 DIST typing-extensions-4.0.0.gh.tar.gz 64263 BLAKE2B c4fe05f5ad32b471d9aff6c792870ce315e52184d4e8c0850fdc1b6e7421bc80566ca2d364764583c3bce76f53018e3ec284ca1866da4fa3f09438c852c89d80 SHA512 eda25164d40c642949c92140678d1ab9ec73fa988c0b9233852207ac2dad05b0390fda8da420c8817bf3816ab33e4540b41766ccd8b9a0b16c857650bc2e3f73
-DIST typing_extensions-3.10.0.2.tar.gz 46048 BLAKE2B a8f7ecacd553ed469cf090f4b8f52e15039fbcf1ae6879f5899fb99e7bbf5b7289cf5d7e5409314a110b2a626b59bd5e6a52f893e4322244c9e7e80ab393d334 SHA512 171ada56758fb04328a2cafefe80b70fbf166f2d799406883df642927964925ca73f04d0646661cd4fd016dfb5e1856b84f362e3b404c27b368ca06a09cf87db
diff --git a/dev-python/typing-extensions/typing-extensions-3.10.0.2.ebuild b/dev-python/typing-extensions/typing-extensions-3.10.0.2.ebuild
deleted file mode 100644
index 92c1bbeb5831..000000000000
--- a/dev-python/typing-extensions/typing-extensions-3.10.0.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-inherit distutils-r1
-
-MY_P=${P/-/_}
-DESCRIPTION="Type Hint extensions from Python 3.8 backported"
-HOMEPAGE="
-	https://pypi.org/project/typing-extensions/
-	https://github.com/python/typing/"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_P%-*}/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
-
-python_test() {
-	cd "${S}"/src_py3 || die
-	"${EPYTHON}" test_typing_extensions.py -v || die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/typing-extensions/typing-extensions-4.0.0.ebuild b/dev-python/typing-extensions/typing-extensions-4.0.0.ebuild
index 3191633be3e0..2ec9de225f4c 100644
--- a/dev-python/typing-extensions/typing-extensions-4.0.0.ebuild
+++ b/dev-python/typing-extensions/typing-extensions-4.0.0.ebuild
@@ -19,7 +19,7 @@ S=${WORKDIR}/${MY_P}/typing_extensions
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 
 BDEPEND="
 	>=dev-python/pyproject2setuppy-21[${PYTHON_USEDEP}]"
diff --git a/dev-python/websockets/websockets-10.1.ebuild b/dev-python/websockets/websockets-10.1.ebuild
index 025b92e12888..a8bf4d9d1bc7 100644
--- a/dev-python/websockets/websockets-10.1.ebuild
+++ b/dev-python/websockets/websockets-10.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 hppa ppc ppc64 ~riscv sparc ~x86"
 
 distutils_enable_tests unittest