Adding metadata

27 files changed, 390 insertions, 550 deletions

diff --git a/dev-python/QtPy/Manifest b/dev-python/QtPy/Manifest
index 8d96740ebaa3..724b914aaef8 100644
--- a/dev-python/QtPy/Manifest
+++ b/dev-python/QtPy/Manifest
@@ -1,2 +1,3 @@
 DIST QtPy-1.11.2.tar.gz 37098 BLAKE2B 8806cce798c4c2d885dd340d0d077567353cf0f3f1c2b284fd788c190b28b6133d052d31dea861e7d2497d0db88ba7ce8be83074360c61823f7a78dc01c015a5 SHA512 e49beb3180789a8080a19406b0e122bc9fc2192ac89b59f0956d7c65ac957779b192062956a97a7526f32724000df18abf32ddd6bda52f9cdf440ddc551887f8
 DIST QtPy-1.11.3.tar.gz 39637 BLAKE2B d1bfa0944dcebf5e408b9a061bcc6bab2fe172a70f0eadd36b229d2c9b40d74d8159c820608d3afd71a91085d5703af9b7045f359209730c53a9a83007159ce5 SHA512 461d858b05ff75f27017f6f0058f3e47643d5fe6c236e4307fa006735ad80e4c1fa487f1ab75edcfe881026541e302cdc3f8221c4ad7b97bce8c96b66db580bb
+DIST QtPy-2.0.0.tar.gz 39628 BLAKE2B bc1b2cf975c3457cb026016854ec70e0aa3247c1234643dbf95681f655678e43ba0200b26e16a0b9eafd6fb373c1f876d9a54458ceb9b9b035ad463b7874db2c SHA512 95855c305da7f54850bcb6297a1f12ceda79eaf6d9b01771b1391d2d7b07b8f690e134cc2d52417bcc320395dce8c1f7f5c6ccadf2939db196e0ed5441215d5a
diff --git a/dev-python/QtPy/QtPy-2.0.0.ebuild b/dev-python/QtPy/QtPy-2.0.0.ebuild
new file mode 100644
index 000000000000..9f8757ddd633
--- /dev/null
+++ b/dev-python/QtPy/QtPy-2.0.0.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Abstraction layer on top of PyQt5 and PySide2 and additional custom QWidgets"
+HOMEPAGE="https://github.com/spyder-ide/qtpy/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+_IUSE_QT_MODULES="
+	declarative designer gui help location multimedia network opengl
+	positioning printsupport sensors serialport speech sql svg testlib
+	webchannel webengine websockets widgets x11extras xml xmlpatterns
+"
+IUSE="+pyqt5 pyside2 ${_IUSE_QT_MODULES}"
+unset _IUSE_QT_MODULES
+
+REQUIRED_USE="|| ( pyqt5 pyside2 )"
+
+# These flags are currently *not* common to both the PySide2 and PyQt5 ebuild
+# Disable them for now, please check periodically if this is still up to date.
+# 	bluetooth? ( pyqt5 )
+# 	dbus? ( pyqt5 )
+#
+# 	3d? ( pyside2 )
+# 	charts? ( pyside2 )
+# 	concurrent? ( pyside2 )
+# 	datavis? ( pyside2 )
+# 	scxml? ( pyside2 )
+# 	script? ( pyside2 )
+# 	scripttools? ( pyside2 )
+
+# WARNING: the obvious solution of using || for PyQt5/pyside2 is not going
+# to work. The package only checks whether PyQt5/pyside2 is installed, it does
+# not verify whether they have the necessary modules (i.e. satisfy the USE dep).
+#
+# Webengine is a special case, because PyQt5 provides this in a separate package
+# while PySide2 ships it in the same package.
+#
+# declarative/qml/quick is a special case, because PyQt5 bundles the bindings
+# for qml and quick in one flag: declarative PySide2 does not.
+#
+# The PyQt5 ebuild currently enables xml support unconditionally, the flag is
+# added anyway with a (+) to make it future proof if the ebuild were to change
+# this behaviour in the future.
+#
+# The PySide2 ebuild currently enables opengl and serialport support
+# unconditionally, the flag is added anyway with a (+) to make it future proof
+# if the ebuild were to change this behaviour in the future.
+RDEPEND="
+	dev-python/packaging[${PYTHON_USEDEP}]
+	pyqt5? (
+		dev-python/PyQt5[${PYTHON_USEDEP}]
+		dev-python/PyQt5[declarative?,designer?,gui?,help?,location?]
+		dev-python/PyQt5[multimedia?,network?,opengl?,positioning?]
+		dev-python/PyQt5[printsupport?,sensors?,serialport?,speech(-)?,sql?,svg?]
+		dev-python/PyQt5[testlib?,webchannel?,websockets?,widgets?]
+		dev-python/PyQt5[x11extras?,xml(+)?,xmlpatterns?]
+		webengine? ( dev-python/PyQtWebEngine[${PYTHON_USEDEP}] )
+	)
+	pyside2? (
+		dev-python/pyside2[${PYTHON_USEDEP}]
+		dev-python/pyside2[designer?,gui?,help?,location?,multimedia?]
+		dev-python/pyside2[network?,opengl(+)?,positioning?,printsupport?]
+		dev-python/pyside2[sensors?,serialport(+)?,speech?,sql?,svg?]
+		dev-python/pyside2[testlib?,webchannel?,webengine?,websockets?]
+		dev-python/pyside2[widgets?,x11extras?,xml?,xmlpatterns?]
+		declarative? ( dev-python/pyside2[qml,quick] )
+	)
+"
+
+# The QtPy testsuite skips tests for bindings that are not installed, so here we
+# ensure that everything is available and all tests are run. Note that not
+# all flags are available in PyQt5/PySide2, so some tests are still skipped.
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		pyqt5? (
+			dev-python/PyQt5[${PYTHON_USEDEP}]
+			dev-python/PyQt5[bluetooth,dbus,declarative,designer,gui,help,location]
+			dev-python/PyQt5[multimedia,network,opengl,positioning,printsupport]
+			dev-python/PyQt5[sensors,serialport,speech(-),sql,svg,testlib,webchannel]
+			dev-python/PyQt5[websockets,widgets,x11extras,xml(+),xmlpatterns]
+			dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
+		)
+		pyside2? (
+			dev-python/pyside2[${PYTHON_USEDEP}]
+			dev-python/pyside2[3d,charts,concurrent,datavis,designer,gui,help]
+			dev-python/pyside2[location,multimedia,network,opengl(+),positioning]
+			dev-python/pyside2[printsupport,qml,quick,script,scripttools,scxml]
+			dev-python/pyside2[sensors,serialport(+),speech,sql,svg,testlib]
+			dev-python/pyside2[webchannel,webengine,websockets,widgets,x11extras]
+			dev-python/pyside2[xml,xmlpatterns]
+		)
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	default
+	# Disale Qt for Python implementations that are not selected
+	if ! use pyqt5; then
+		sed -i -e "s/from PyQt5.QtCore import/raise ImportError #/" qtpy/__init__.py || die
+	fi
+	if ! use pyside2; then
+		sed -i -e "s/from PySide2 import/raise ImportError #/" qtpy/__init__.py || die
+		sed -i -e "s/from PySide2.QtCore import/raise ImportError #/" qtpy/__init__.py || die
+	fi
+
+	# Disable outdated PyQt4 and PySide
+	sed -i -e "s/from PyQt4.Qt import/raise ImportError #/" qtpy/__init__.py || die
+	sed -i -e "s/from PyQt4.QtCore import/raise ImportError #/" qtpy/__init__.py || die
+	sed -i -e "s/from PySide import/raise ImportError #/" qtpy/__init__.py || die
+	sed -i -e "s/from PySide.QtCore import/raise ImportError #/" qtpy/__init__.py || die
+}
+
+python_test() {
+	if use pyqt5; then
+		QT_API="pyqt5" virtx epytest
+	fi
+	if use pyside2; then
+		QT_API="pyside2" virtx epytest
+	fi
+}
+
+pkg_postinst() {
+	if use pyqt5 && use pyside2; then
+		ewarn "You have enabled both PyQt5 and PySide2, note that QtPy will default"
+		ewarn "to PyQt5 unless the QT_API environment variable overrides this."
+	fi
+}
diff --git a/dev-python/autobahn/Manifest b/dev-python/autobahn/Manifest
index 308c6cdc5c02..96b9dfbe6503 100644
--- a/dev-python/autobahn/Manifest
+++ b/dev-python/autobahn/Manifest
@@ -1,2 +1 @@
 DIST autobahn-21.11.1.tar.gz 365165 BLAKE2B 91a12bf1fa9acd056246d86675c76fbcdb4de8914f4ab5e2c8ec06cf8e822cc1a72f8a7b39b520405cce32e2f32024ebbaa48ba024e1dc71b50da4e6f8913e19 SHA512 5a23272046ef67821e86c6bfe766273b3ba73a75fbc51c7864c2ab83ffb8d4e119022980f8b71c453118bf15b26ede8042aa0114e54caebbfb33555208093ac2
-DIST autobahn-21.3.1.tar.gz 351296 BLAKE2B d018c8820a1accc779decdb8d392d3ff6225f80674b468145a8f29b275d6f0b1021a226dc8bc72915a792591e6d4ae8d6a33a96cf705241990ac401c8342e2c5 SHA512 dd6bf6eba6f2880860c6fa42e3925bb15d36bfb9d2354ddeb0165972848e81a308723b7f9dcd6ec3426b6286f71cb2da453590810e5d891523d92acf9fd64c52
diff --git a/dev-python/autobahn/autobahn-21.3.1.ebuild b/dev-python/autobahn/autobahn-21.3.1.ebuild
deleted file mode 100644
index 5b0db75a9195..000000000000
--- a/dev-python/autobahn/autobahn-21.3.1.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
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-inherit distutils-r1
-
-MY_P=${PN}-$(ver_rs 3 -)
-
-DESCRIPTION="WebSocket and WAMP for Twisted and Asyncio"
-HOMEPAGE="https://pypi.org/project/autobahn/
-	https://crossbar.io/autobahn/
-	https://github.com/crossbario/autobahn-python"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="amd64 arm arm64 x86"
-IUSE="crypt scram test xbr"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	>=dev-python/cbor-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/cbor2-5.2.0[${PYTHON_USEDEP}]
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	>=dev-python/flatbuffers-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/hyperlink-21.0.0[${PYTHON_USEDEP}]
-	>=dev-python/msgpack-0.6.1[${PYTHON_USEDEP}]
-	>=dev-python/py-ubjson-0.8.4[${PYTHON_USEDEP}]
-	>=dev-python/snappy-0.5[${PYTHON_USEDEP}]
-	>=dev-python/twisted-20.3.0[${PYTHON_USEDEP}]
-	>=dev-python/txaio-21.2.1[${PYTHON_USEDEP}]
-	>=dev-python/ujson-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/wsaccel-0.6.2[${PYTHON_USEDEP}]
-	>=dev-python/zope-interface-3.6[${PYTHON_USEDEP}]
-	crypt? (
-		>=dev-python/pyopenssl-16.2.0[${PYTHON_USEDEP}]
-		>=dev-python/pynacl-1.0.1[${PYTHON_USEDEP}]
-		>=dev-python/pytrie-0.2[${PYTHON_USEDEP}]
-		>=dev-python/pyqrcode-1.1.0[${PYTHON_USEDEP}]
-		>=dev-python/service_identity-18.1.0[${PYTHON_USEDEP}]
-	)
-	scram? (
-		dev-python/cffi[${PYTHON_USEDEP}]
-		dev-python/argon2-cffi[${PYTHON_USEDEP}]
-		dev-python/passlib[${PYTHON_USEDEP}]
-	)
-	"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		>=dev-python/pynacl-1.0.1[${PYTHON_USEDEP}]
-		>=dev-python/pytrie-0.2[${PYTHON_USEDEP}]
-		>=dev-python/pyqrcode-1.1.0[${PYTHON_USEDEP}]
-	)"
-
-python_prepare_all() {
-	if use xbr ; then
-		eerror "***************"
-		eerror "Required xbr dependencies are incomplete in Gentoo."
-		eerror "So this functionality will not yet work"
-		eerror "Please file a bug if this feature is needed"
-		eerror "***************"
-	else
-		# remove xbr components
-		export AUTOBAHN_STRIP_XBR="True"
-	fi
-
-	# avoid useless rust dependency
-	sed -i -e '/cryptography/s:>=3.4.6::' setup.py || die
-
-	# remove twisted plugin cache regen in setup.py
-	# to fix tinderbox sandbox issue
-	sed -e 's/# regenerate Twisted plugin cache/# DO NOT regenerate Twisted plugin cache in Gentoo\nexit()/' \
-		-i setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	einfo "Testing all, cryptosign using twisted"
-	local -x USE_TWISTED=true
-	cd "${BUILD_DIR}"/lib || die
-	"${EPYTHON}" -m twisted.trial autobahn || die
-	unset USE_TWISTED
-	einfo "RE-testing cryptosign and component_aio using asyncio"
-	local -x USE_ASYNCIO=true
-	pytest -vv autobahn/wamp/test/test_wamp_cryptosign.py || die
-	pytest -vv autobahn/wamp/test/test_wamp_component_aio.py || die
-	unset USE_ASYNCIO
-	rm -r .pytest_cache || die
-	rm -f "${BUILD_DIR}"/lib/twisted/plugins/dropin.cache || die
-}
-
-pkg_postinst() {
-	python_foreach_impl twisted-regen-cache || die
-}
-
-pkg_postrm() {
-	python_foreach_impl twisted-regen-cache || die
-}
diff --git a/dev-python/autobahn/metadata.xml b/dev-python/autobahn/metadata.xml
index 68ab8ad272a8..9e640f9e5eb9 100644
--- a/dev-python/autobahn/metadata.xml
+++ b/dev-python/autobahn/metadata.xml
@@ -13,7 +13,6 @@
   <remote-id type="pypi">autobahn</remote-id>
  </upstream>
  <use>
-  <flag name="scram">Add support for WAMP-SCRAM authentication</flag>
   <flag name="xbr">Add support for XBR decentralized data markets and etherium blockchain</flag>
  </use>
  <origin>gentoo-staging</origin>
diff --git a/dev-python/imageio/Manifest b/dev-python/imageio/Manifest
index 7ae03b75c542..f8b5662463f3 100644
--- a/dev-python/imageio/Manifest
+++ b/dev-python/imageio/Manifest
@@ -1,10 +1,2 @@
-DIST imageio-2.10.4.gh.tar.gz 335495 BLAKE2B 66f8662953d7023557d4fc98b9cf2cfa00346a14286b72dd1b3abf618ee6da36da341c4a57116197e0f138424ef01050cc9176c6afcf277796aa61199e5a1530 SHA512 562bb0d7c8e627e491910f997947a4ffe967ed6dcf3d281b07145f9c8148ca0f2d9775bc89c9024ebc9bfa54f03a60aadc30a84827c050f18dbb23286ac18b96
-DIST imageio-2.10.5.gh.tar.gz 335546 BLAKE2B 1bfd418bb59f217c2108be9aedf35d1b6326d29d476ac6648041b38efa44a2220212f170cae90005e027006adfe55178dee699a1e4b37b7e948863c61432afe8 SHA512 2a058e8ce7e2ad650bea05573d249c1c06326dd1ed0f47517c3a0095a2e03fa2b90ffa5f8aae535e937b8b9fd8153ccb13267773183e45639205faddab08348a
-DIST imageio-2.11.0.gh.tar.gz 339057 BLAKE2B 6dd5661866135b472a062b57b424e8ff044510488b1ccd291552f979263f2f03d3feb00ad9ab035249a2966711e804a95ff7e8f174a1f0773445782365744b6c SHA512 b42f05eabcbee4fb4bb66793cca04137b4db2695269c204b2fec43527ab6a1d9e29c688061ee53c28454b64e09343d69cc931867c5aca01d47145bd734348629
-DIST imageio-2.11.1.gh.tar.gz 339241 BLAKE2B b197c946fe34e504979c9fe7e69179211bf72d986105175419c304b95628c02d3dae2e5e7b13902493cb6a7538bc3e5976590e25a35165c857623b62635b79b3 SHA512 cf33d0c96a08f29ed761e811922a31a97c36aef48022708132d5282bf5c87bb3ef67a80a98e01f57489fd4a261955e4ca231c67dfc69f5865c47a5b1f317d137
-DIST imageio-2.12.0.gh.tar.gz 339829 BLAKE2B 5f6c38bd139c33e7fc00fad8f32cd2f9888fa61a4930021b58fc33530241cf8d40e13002cfedf21631d1ff18797a9d044288e3ffc8852276912ddd7485206ecd SHA512 05824e8617470734ca4966fa4cb0b3da5ce22bbbf2ff6382d216d768b6dd3923d072a3f157d1ba23524c4b499c320d3a8e051852f656ad5cb0f120a298daf688
-DIST imageio-2.13.0.gh.tar.gz 339891 BLAKE2B a9e38a855836dac3ee228376c49e9751e651530b316932a756c86f21f7c987f1f57387db1751ff0cd6673844cbfc8dcfd0bceee520ec6107290712db03ca9d9c SHA512 4f63a1183a631fa192e08438cfe97936f45b9157cad73c8a27ddc378817c21db3d92bab2e7565ef9ef539c771120e158075ae1069aec60d824c40d420dd8e117
-DIST imageio-2.13.1.gh.tar.gz 340484 BLAKE2B 8b05feabdcf44877365d5fea7916cc36c30f2ab9f40a909e02ccace6f457d5bfedae58a1397dc8d211d5f3738f148a3de355b399f47d80b2f50cc634fcbd18ad SHA512 3c5ca6b96a26fc19801d571af3e0d804b4946bf34d8d3ed52b946bdde595a90ff8c0da7fb2949f6a1d2d6ba5799c2feff6bade04de40cb9a807c7cd30e57eaac
-DIST imageio-2.13.2.gh.tar.gz 340635 BLAKE2B 463607eda8b3479d3f76174ccc6674bb1f727cb2fcafa5c47ce63241188d6396619a57725032812bb531aa4a36a00d28e4ad95d8a82de658c755405d2068a0f0 SHA512 0b08d12463075fcf8a45deef04843bebf5932347fc34aa48effe7d29232fcc482fd0d4fa29bc9a51a81e343e1636823931db5b28290ffa67987b608cc51a8e99
-DIST imageio-2.13.3.gh.tar.gz 340780 BLAKE2B ea0ce7fcd941d14d41f5212f053884de4bb5bf9794050a8872a7a10a1dcdeb217706e97c9a7dd74b5bff27796b4431ca27535d6becc3db9595a0447f54fc1454 SHA512 709aabb0b89cf1bac65f8671f57523833bf0c5dc1f4e4a379f0c77203ae25b651a5ba9135f45b5dea2affbab6d6e79bb66a75ea05a0c83d5d08027a5bd6aeaef
 DIST imageio-2.13.4.gh.tar.gz 340913 BLAKE2B 332d819633a52069265dd0c02163698085b8d0891ee84def78d99f6fb9888752d8f6384c9666dc66d99bc48673648f736eb6f545b67583cae7252caef6f9e499 SHA512 0329a1bfb6906d7f759fec8d5a500cae9a8edaa125d3e4cab7f0e87b2e5eef24655520aecab309de823f9bd8357a1461f772801bac437ed3489804e3c4b40855
+DIST imageio-2.13.5.gh.tar.gz 341447 BLAKE2B 8fd719533325647980355c0a5180a949d1f282ed11fcdb92a0c580f6aa76f799a60f8a3642c72424e557c84c5f1d5a0610cf679d37dcd8d157865c5d19ef94bf SHA512 52b431c3f41ea598d48f1d9c36cd9a5cdaa13365ce5391b832a3ef5dbdb6803435456bd653b509b75ee00452d07b47e43d87ac0c80598bb99f817ee8abe2e74c
diff --git a/dev-python/imageio/imageio-2.10.4.ebuild b/dev-python/imageio/imageio-2.10.4.ebuild
deleted file mode 100644
index 3101497b5429..000000000000
--- a/dev-python/imageio/imageio-2.10.4.ebuild
+++ /dev/null
@@ -1,41 +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="Python library for reading and writing image data"
-HOMEPAGE="https://imageio.github.io/"
-SRC_URI="
-	https://github.com/imageio/imageio/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-PROPERTIES="test_network"
-RESTRICT="test"
-
-RDEPEND="
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	media-libs/freeimage
-"
-BDEPEND="
-	test? (
-		dev-python/psutil[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# Fails because of system installed freeimage
-	tests/test_core.py::test_findlib2
-	# Needs unpackaged imageio_ffmpeg
-	tests/test_ffmpeg.py
-	tests/test_ffmpeg_info.py
-)
diff --git a/dev-python/imageio/imageio-2.10.5.ebuild b/dev-python/imageio/imageio-2.10.5.ebuild
deleted file mode 100644
index b7c5f792ae7a..000000000000
--- a/dev-python/imageio/imageio-2.10.5.ebuild
+++ /dev/null
@@ -1,46 +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="Python library for reading and writing image data"
-HOMEPAGE="https://imageio.github.io/"
-SRC_URI="
-	https://github.com/imageio/imageio/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-PROPERTIES="test_network"
-RESTRICT="test"
-
-RDEPEND="
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	media-libs/freeimage
-"
-BDEPEND="
-	test? (
-		dev-python/psutil[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# Fails because of system installed freeimage
-	tests/test_core.py::test_findlib2
-)
-
-EPYTEST_IGNORE=(
-	# Needs unpackaged imageio_ffmpeg
-	tests/test_ffmpeg.py
-	tests/test_ffmpeg_info.py
-	# Needs tifffile
-	tests/test_tifffile.py
-)
diff --git a/dev-python/imageio/imageio-2.11.0.ebuild b/dev-python/imageio/imageio-2.11.0.ebuild
deleted file mode 100644
index b7c5f792ae7a..000000000000
--- a/dev-python/imageio/imageio-2.11.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=8
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="Python library for reading and writing image data"
-HOMEPAGE="https://imageio.github.io/"
-SRC_URI="
-	https://github.com/imageio/imageio/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-PROPERTIES="test_network"
-RESTRICT="test"
-
-RDEPEND="
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	media-libs/freeimage
-"
-BDEPEND="
-	test? (
-		dev-python/psutil[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# Fails because of system installed freeimage
-	tests/test_core.py::test_findlib2
-)
-
-EPYTEST_IGNORE=(
-	# Needs unpackaged imageio_ffmpeg
-	tests/test_ffmpeg.py
-	tests/test_ffmpeg_info.py
-	# Needs tifffile
-	tests/test_tifffile.py
-)
diff --git a/dev-python/imageio/imageio-2.11.1.ebuild b/dev-python/imageio/imageio-2.11.1.ebuild
deleted file mode 100644
index b7c5f792ae7a..000000000000
--- a/dev-python/imageio/imageio-2.11.1.ebuild
+++ /dev/null
@@ -1,46 +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="Python library for reading and writing image data"
-HOMEPAGE="https://imageio.github.io/"
-SRC_URI="
-	https://github.com/imageio/imageio/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-PROPERTIES="test_network"
-RESTRICT="test"
-
-RDEPEND="
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	media-libs/freeimage
-"
-BDEPEND="
-	test? (
-		dev-python/psutil[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# Fails because of system installed freeimage
-	tests/test_core.py::test_findlib2
-)
-
-EPYTEST_IGNORE=(
-	# Needs unpackaged imageio_ffmpeg
-	tests/test_ffmpeg.py
-	tests/test_ffmpeg_info.py
-	# Needs tifffile
-	tests/test_tifffile.py
-)
diff --git a/dev-python/imageio/imageio-2.12.0.ebuild b/dev-python/imageio/imageio-2.12.0.ebuild
deleted file mode 100644
index b7c5f792ae7a..000000000000
--- a/dev-python/imageio/imageio-2.12.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=8
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="Python library for reading and writing image data"
-HOMEPAGE="https://imageio.github.io/"
-SRC_URI="
-	https://github.com/imageio/imageio/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-PROPERTIES="test_network"
-RESTRICT="test"
-
-RDEPEND="
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	media-libs/freeimage
-"
-BDEPEND="
-	test? (
-		dev-python/psutil[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# Fails because of system installed freeimage
-	tests/test_core.py::test_findlib2
-)
-
-EPYTEST_IGNORE=(
-	# Needs unpackaged imageio_ffmpeg
-	tests/test_ffmpeg.py
-	tests/test_ffmpeg_info.py
-	# Needs tifffile
-	tests/test_tifffile.py
-)
diff --git a/dev-python/imageio/imageio-2.13.0.ebuild b/dev-python/imageio/imageio-2.13.0.ebuild
deleted file mode 100644
index b7c5f792ae7a..000000000000
--- a/dev-python/imageio/imageio-2.13.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=8
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="Python library for reading and writing image data"
-HOMEPAGE="https://imageio.github.io/"
-SRC_URI="
-	https://github.com/imageio/imageio/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-PROPERTIES="test_network"
-RESTRICT="test"
-
-RDEPEND="
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	media-libs/freeimage
-"
-BDEPEND="
-	test? (
-		dev-python/psutil[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# Fails because of system installed freeimage
-	tests/test_core.py::test_findlib2
-)
-
-EPYTEST_IGNORE=(
-	# Needs unpackaged imageio_ffmpeg
-	tests/test_ffmpeg.py
-	tests/test_ffmpeg_info.py
-	# Needs tifffile
-	tests/test_tifffile.py
-)
diff --git a/dev-python/imageio/imageio-2.13.1.ebuild b/dev-python/imageio/imageio-2.13.1.ebuild
deleted file mode 100644
index b7c5f792ae7a..000000000000
--- a/dev-python/imageio/imageio-2.13.1.ebuild
+++ /dev/null
@@ -1,46 +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="Python library for reading and writing image data"
-HOMEPAGE="https://imageio.github.io/"
-SRC_URI="
-	https://github.com/imageio/imageio/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-PROPERTIES="test_network"
-RESTRICT="test"
-
-RDEPEND="
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	media-libs/freeimage
-"
-BDEPEND="
-	test? (
-		dev-python/psutil[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# Fails because of system installed freeimage
-	tests/test_core.py::test_findlib2
-)
-
-EPYTEST_IGNORE=(
-	# Needs unpackaged imageio_ffmpeg
-	tests/test_ffmpeg.py
-	tests/test_ffmpeg_info.py
-	# Needs tifffile
-	tests/test_tifffile.py
-)
diff --git a/dev-python/imageio/imageio-2.13.2.ebuild b/dev-python/imageio/imageio-2.13.2.ebuild
deleted file mode 100644
index b7c5f792ae7a..000000000000
--- a/dev-python/imageio/imageio-2.13.2.ebuild
+++ /dev/null
@@ -1,46 +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="Python library for reading and writing image data"
-HOMEPAGE="https://imageio.github.io/"
-SRC_URI="
-	https://github.com/imageio/imageio/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-PROPERTIES="test_network"
-RESTRICT="test"
-
-RDEPEND="
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	media-libs/freeimage
-"
-BDEPEND="
-	test? (
-		dev-python/psutil[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# Fails because of system installed freeimage
-	tests/test_core.py::test_findlib2
-)
-
-EPYTEST_IGNORE=(
-	# Needs unpackaged imageio_ffmpeg
-	tests/test_ffmpeg.py
-	tests/test_ffmpeg_info.py
-	# Needs tifffile
-	tests/test_tifffile.py
-)
diff --git a/dev-python/imageio/imageio-2.13.3.ebuild b/dev-python/imageio/imageio-2.13.3.ebuild
deleted file mode 100644
index b7c5f792ae7a..000000000000
--- a/dev-python/imageio/imageio-2.13.3.ebuild
+++ /dev/null
@@ -1,46 +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="Python library for reading and writing image data"
-HOMEPAGE="https://imageio.github.io/"
-SRC_URI="
-	https://github.com/imageio/imageio/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-PROPERTIES="test_network"
-RESTRICT="test"
-
-RDEPEND="
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	media-libs/freeimage
-"
-BDEPEND="
-	test? (
-		dev-python/psutil[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# Fails because of system installed freeimage
-	tests/test_core.py::test_findlib2
-)
-
-EPYTEST_IGNORE=(
-	# Needs unpackaged imageio_ffmpeg
-	tests/test_ffmpeg.py
-	tests/test_ffmpeg_info.py
-	# Needs tifffile
-	tests/test_tifffile.py
-)
diff --git a/dev-python/imageio/imageio-2.13.3-r1.ebuild b/dev-python/imageio/imageio-2.13.5.ebuild
index f77f23d98427..f77f23d98427 100644
--- a/dev-python/imageio/imageio-2.13.3-r1.ebuild
+++ b/dev-python/imageio/imageio-2.13.5.ebuild
diff --git a/dev-python/mypy/Manifest b/dev-python/mypy/Manifest
index b90016e39a4e..2dfd0efa3b08 100644
--- a/dev-python/mypy/Manifest
+++ b/dev-python/mypy/Manifest
@@ -1,2 +1,3 @@
 DIST mypy-0.910.tar.gz 2551057 BLAKE2B a3c6939c8f0e2ea19a3a3f91031330df2fb25a93cc3f9239535f15c17eedcca5716cc75c5412a1d345d8572d396c3d7128e38989fd694833cb6aec8366ac4afe SHA512 49060c13da8bf17385b6b1db6efa9ac5771f2bac92d26760c4087cf128de22846b8a062f38e83ecff524e7893f8c9cd0647a2ef89e10387138544436a2840459
 DIST mypy-0.921.tar.gz 2730985 BLAKE2B cfb7b54165b961758891fcf225f1a7d6bd9c6a7b14e6bb6d8adb990ed047bc4983b5e82de6709d3b8db85a3914e1bae2be4fd36e878d37db7387ebe6e81daac1 SHA512 f592d440b45a1bbcab973aeb717ffc805164168f1369793067a46bd2884fedcb9f981bfadd3447c6801120042553a7a7110d8cfc4e1649241d3b8685dffef653
+DIST mypy-0.930.tar.gz 2777310 BLAKE2B 4681991993b04679d21c8f6bf8327a02eb628addc289ed22fbf06e4865ee9e60b90ab41a0d0b069d0a50924bf210816bdb87cff902d4424741f4e141f0957684 SHA512 f7f7ed762eb0f56b46a174c51c34423633d72b5046129617e456c41647705380b014c0c27bd0a104319e4872f2a7d7900a260bf6151d4419c95c93e4c01c6e9d
diff --git a/dev-python/mypy/mypy-0.930.ebuild b/dev-python/mypy/mypy-0.930.ebuild
new file mode 100644
index 000000000000..695ac2eb810d
--- /dev/null
+++ b/dev-python/mypy/mypy-0.930.ebuild
@@ -0,0 +1,64 @@
+# 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 multiprocessing
+
+DESCRIPTION="Optional static typing for Python"
+HOMEPAGE="http://www.mypy-lang.org/"
+SRC_URI="https://github.com/python/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+# stubgen collides with this package: https://bugs.gentoo.org/585594
+RDEPEND="
+	!dev-util/stubgen
+	>=dev-python/psutil-4[${PYTHON_USEDEP}]
+	>=dev-python/typed-ast-1.4.0[${PYTHON_USEDEP}]
+	<dev-python/typed-ast-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/typing-extensions-3.7.4[${PYTHON_USEDEP}]
+	>=dev-python/mypy_extensions-0.4.3[${PYTHON_USEDEP}]
+	<dev-python/mypy_extensions-0.5.0[${PYTHON_USEDEP}]
+	dev-python/tomli[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		>=dev-python/attrs-18.0[${PYTHON_USEDEP}]
+		>=dev-python/lxml-4.4.0[${PYTHON_USEDEP}]
+		>=dev-python/pytest-6.1.0[${PYTHON_USEDEP}]
+		>=dev-python/pytest-xdist-1.18[${PYTHON_USEDEP}]
+		>=dev-python/py-1.5.2[${PYTHON_USEDEP}]
+		>=dev-python/typed-ast-1.4.0[${PYTHON_USEDEP}]
+		>=dev-python/virtualenv-16.0.0[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source dev-python/sphinx_rtd_theme
+distutils_enable_tests pytest
+
+# this requires packaging a lot of type stubs
+export MYPY_USE_MYPYC=0
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# Fails with pytest-xdist 2.3.0
+		# https://github.com/python/mypy/issues/11019
+		mypy/test/teststubtest.py
+		# fails due to setuptools deprecation warnings
+		mypyc/test/test_run.py::TestRun::run-imports.test::testImports
+	)
+
+	[[ "${EPYTHON}" == "python3.10" ]] && EPYTEST_DESELECT+=(
+		# https://github.com/python/mypy/issues/11018
+		mypyc/test/test_commandline.py::TestCommandLine::testErrorOutput
+	)
+
+	# Some mypy/test/testcmdline.py::PythonCmdlineSuite tests
+	# fail with high COLUMNS values
+	local -x COLUMNS=80
+	epytest -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+}
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index 0b060585c091..658bbb7aa09e 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -9,3 +9,4 @@ DIST setuptools-59.8.0.tar.gz 2282358 BLAKE2B 2f1b49285fc70420e24f958c4955200ef0
 DIST setuptools-60.0.0.tar.gz 2282339 BLAKE2B ad9a78df348c71d4374ccd773495cc3bfd6d02c214a327eece5daea06538c6a7a55975b22175afb6e67692a0945a7d48cd7b317040c7b5c4878a030505d5dbb1 SHA512 088c3dc38485ca16441d38e3404bce7d822f3ef8e48588101e9e93209905d8b1e1676de1131e2fd993a95caed0fcb3681386fbb7b679712ad0632cdbbcc04f51
 DIST setuptools-60.0.2.tar.gz 2284789 BLAKE2B b3763673e65ae7e6e7d8d2e7bb5d4b72e348a873496d5d0ffdb85daa2a65280fdd71be411132ee92717fd5f3437e10c36d244b0389d0a845b8f1ecd6f2094514 SHA512 1323c5993fcb1d8f23c6fc88d217af59d08d0130d06e84d38f0ac5ed6e3bf6d5595027a8f9430f3441d9a065686562d79b413ed32771276410a31f3addcde116
 DIST setuptools-60.0.3.tar.gz 2284909 BLAKE2B 39fab878aa5d9ae4712088a96548cf3312070c6bca59d6fb22642bc5fb9919acf1ad151c63f812a5bdddffdb657fff9631330d93685e9a54e569daaa5b3f2760 SHA512 3020182f30f85eef07952085aed90db42e205abe754eb130327651edd3fdb7fcca52b0654d6c7bc69e5b33920549675f2325bebdc4c71425e212275f49572a10
+DIST setuptools-60.0.4.tar.gz 2282600 BLAKE2B bc2e9c38f9646babce1144cfc1751c034fa2783149ad47c8365a4a2e56b4176b6f0e7a44d1cb5567c34b792cb85b52a7553be09eee34d8f079e67f0a09fb54a6 SHA512 f3dae0e4ac9553a35864978db24041f26b7ea05ba07a7f791a30d3910b23d50eb44b75b9f06f1644c0409344aff153b09417b520957d01bccf6413cdaecf9ced
diff --git a/dev-python/setuptools/setuptools-60.0.4.ebuild b/dev-python/setuptools/setuptools-60.0.4.ebuild
new file mode 100644
index 000000000000..d386091769f9
--- /dev/null
+++ b/dev-python/setuptools/setuptools-60.0.4.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
+EAPI=7
+
+# Set to 'manual' to avoid triggering install QA check
+DISTUTILS_USE_SETUPTOOLS=manual
+PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1 multiprocessing
+
+CPY_PATCHSET="python-gentoo-patches-3.10.0_p1"
+DESCRIPTION="Collection of extensions to Distutils"
+HOMEPAGE="https://github.com/pypa/setuptools https://pypi.org/project/setuptools/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+	https://dev.gentoo.org/~floppym/python/${CPY_PATCHSET}.tar.xz"
+
+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"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/jaraco-envs[${PYTHON_USEDEP}]
+			>=dev-python/jaraco-path-3.2.0[${PYTHON_USEDEP}]
+			dev-python/mock[${PYTHON_USEDEP}]
+			dev-python/pip[${PYTHON_USEDEP}]
+			dev-python/sphinx[${PYTHON_USEDEP}]
+			dev-python/pytest[${PYTHON_USEDEP}]
+			dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
+			dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
+			dev-python/pytest-xdist[${PYTHON_USEDEP}]
+			>=dev-python/virtualenv-20[${PYTHON_USEDEP}]
+			dev-python/wheel[${PYTHON_USEDEP}]
+		' python3_{8..10} pypy3)
+	)
+"
+PDEPEND="
+	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
+
+# Force in-source build because build system modifies sources.
+DISTUTILS_IN_SOURCE_BUILD=1
+
+DOCS=( {CHANGES,README}.rst )
+
+src_prepare() {
+	# apply distutils patches to the bundled distutils
+	pushd setuptools/_distutils >/dev/null || die
+	# TODO: distutils C++ patch?
+	eapply -p3 "${WORKDIR}/${CPY_PATCHSET}/0006-distutils-make-OO-enable-both-opt-1-and-opt-2-optimi.patch"
+	popd >/dev/null || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local -x SETUPTOOLS_USE_DISTUTILS=stdlib
+
+	# keep in sync with python_gen_cond_dep above!
+	has "${EPYTHON}" python3.{8..10} pypy3 || continue
+
+	distutils_install_for_testing
+	local EPYTEST_DESELECT=(
+		# network
+		setuptools/tests/test_distutils_adoption.py
+		'setuptools/tests/test_virtualenv.py::test_pip_upgrade_from_source[None]'
+		# unhappy with pytest-xdist?
+		setuptools/tests/test_easy_install.py::TestUserInstallTest::test_local_index
+		# TODO
+		setuptools/tests/test_easy_install.py::TestSetupRequires::test_setup_requires_with_allow_hosts
+		setuptools/tests/test_test.py::test_tests_are_run_once
+	)
+
+	# test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
+	# It tries to sandbox the test in a tempdir
+	HOME="${PWD}" epytest \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" setuptools
+}
+
+python_install() {
+	export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
+	distutils-r1_python_install
+}
diff --git a/dev-python/sqlalchemy/Manifest b/dev-python/sqlalchemy/Manifest
index 8eaef9040f62..451a0b7937ab 100644
--- a/dev-python/sqlalchemy/Manifest
+++ b/dev-python/sqlalchemy/Manifest
@@ -2,3 +2,4 @@ DIST SQLAlchemy-1.3.24.tar.gz 6353598 BLAKE2B 6eb92b20fa3412a1f1398e18e902e33383
 DIST SQLAlchemy-1.4.26.tar.gz 7836259 BLAKE2B 149c9947f5536a3715bb05f5bf72a58b597873f824aa492af0df1a0bcbb0e5d8ff848d171f9d12a9f3acc872d3b05df6e67ed79dc190e82d376df152ad150383 SHA512 0289bfc61391e330a8b3df0876727947c6ebd55b54922d3c6107e47a1da27fd6bf7087edbf259e1ef8e7359f53c73d833185f0bc72d307defdb56560bbb21902
 DIST SQLAlchemy-1.4.27.tar.gz 7907686 BLAKE2B a9751a82e81bcdcf1bd344f0275c0ff89df38c7e9eda4470d147f4b50b0a2a0d7e9861d932fb6382328ec0e2024d72279ea889e4dadd61a4a33fc3e085521604 SHA512 8d1d76596b1698e320305a07e3f0a56607568ef60b6be36c86c0cabc843c8d6d62034d7446eef69f0cd0687de474d34ce1161c1adb9fdeea8c0b47af372015be
 DIST SQLAlchemy-1.4.28.tar.gz 7968048 BLAKE2B 1e08eefd5a6abbff5c7f7a09a67eb144e6e863b94c33224808507aa1c4392b0895ab4bd02a091c1b439fca1e0312d1f6c29c605fe5c8699438c9694603502b67 SHA512 26f88df36fd91aea40c1f5e233a3da962d2d28b47f9b3157f537ea1f6bc4dac43f7037025b55511eaaa377ffb05f5c5bd1e1c69596b58c1f193e98f437c0c831
+DIST SQLAlchemy-1.4.29.tar.gz 7974880 BLAKE2B 8f9e06168f17ca1cf3f75a00f57fdc0cef0eaf014503233249b4185a5d87dac9870ffabae0c9b93de710f6893231bb020b3b157c29bf672823d3d0b8fa59970c SHA512 40f7b30db6c080061aa2d38c8257c1d9df4cd5a99425becc89ffb339bd764f60c6174fc85fc2dad8be248baf8e78c20b9ac28a5ddff0f58033fa7756517bb50f
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.4.27-r3.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.27-r3.ebuild
index 6976ced35c27..7b0b4249ed61 100644
--- a/dev-python/sqlalchemy/sqlalchemy-1.4.27-r3.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-1.4.27-r3.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="asyncio examples +sqlite test"
 
 # greenlet for bug #823794
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.4.29.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.29.ebuild
new file mode 100644
index 000000000000..0334598f2ac7
--- /dev/null
+++ b/dev-python/sqlalchemy/sqlalchemy-1.4.29.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+PYTHON_REQ_USE="sqlite?"
+
+inherit distutils-r1 optfeature
+
+MY_PN="SQLAlchemy"
+MY_P="${MY_PN}-${PV/_beta/b}"
+
+DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
+HOMEPAGE="https://www.sqlalchemy.org/ https://pypi.org/project/SQLAlchemy/"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="examples +sqlite test"
+
+BDEPEND="
+	test? (
+		$(python_gen_impl_dep sqlite)
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_IGNORE=(
+	# hardcode call counts specific to Python versions
+	test/aaa_profiling
+)
+
+src_prepare() {
+	sed -i -e '/greenlet/d' setup.cfg || die
+	distutils-r1_src_prepare
+}
+
+python_install_all() {
+	if use examples; then
+		docompress -x "/usr/share/doc/${PF}/examples"
+		dodoc -r examples
+	fi
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "asyncio support" dev-python/greenlet
+	optfeature "MySQL support" dev-python/mysqlclient dev-python/pymysql \
+		dev-python/mysql-connector-python
+	optfeature "mssql support" dev-python/pymssql
+	optfeature "postgresql support" dev-python/psycopg:2
+}
diff --git a/dev-python/ujson/Manifest b/dev-python/ujson/Manifest
index 0703cd3d1288..651358114bc3 100644
--- a/dev-python/ujson/Manifest
+++ b/dev-python/ujson/Manifest
@@ -1,3 +1,2 @@
-DIST ujson-4.2.0.tar.gz 7129419 BLAKE2B 478ff6a3de9603478e9b747935ebc966f980dc832252974dda444b2ccb53878b3565ebdf7e8c223c687304d5f95607027d0652956d1f804cf2d80df6ce19be1a SHA512 894316eeeafe80eb3328958f4336c1989c9591caf84de5a9442f9d028c85f67d08e7c295e74f5828abc93ad56ffa2d12b98ebe0ecf4bca27ae37642fbffe47e4
 DIST ujson-4.3.0.tar.gz 7129405 BLAKE2B 434a686d319415391910c2d8358b97b27221fe8ec725394c066126e9f0b05f8624db6fd2b372add7d3629733f108e8a0d4b840328499aadf43dda3397e07aef9 SHA512 62a84562a95dbbd0825c9c961f8b769c908201c56a1981bb22809f11e7330f68a1c5fa86c182a6c7823a4d780b1afba186b6203be88eb0ec30a4e2f99e51062e
 DIST ujson-5.0.0.tar.gz 7128113 BLAKE2B 9ce58a57d85203f2e20690494ae627b87caf8524781eb07e63b97ecd40dbd7e25bc2e5a217fca738e4b8b2fe5bc9a9e7a7ad032a089bf8e5b5104d1e107671b7 SHA512 cda9b29baf77e5aa0f3adb8ba09445753fc6730eab95a7f483b0c0b0c8bb389d12e438324f63808e5c36815330ce6508a460700882a7661bc3640721a7cc906f
diff --git a/dev-python/ujson/ujson-4.2.0.ebuild b/dev-python/ujson/ujson-4.2.0.ebuild
deleted file mode 100644
index 60d85ef819f5..000000000000
--- a/dev-python/ujson/ujson-4.2.0.ebuild
+++ /dev/null
@@ -1,22 +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="Ultra fast JSON encoder and decoder for Python"
-HOMEPAGE="https://pypi.org/project/ujson/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 x86 ~amd64-linux ~x86-linux"
-
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? ( dev-python/pytz[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/wheel/Manifest b/dev-python/wheel/Manifest
index 8dd681627528..6449a06c7896 100644
--- a/dev-python/wheel/Manifest
+++ b/dev-python/wheel/Manifest
@@ -1 +1,2 @@
 DIST wheel-0.37.0.gh.tar.gz 68270 BLAKE2B a91714a57e0f1ef32e17b405668c765cbb586518b370e005c52fb4898c5a2e95a9781d7b71e22db12e613feb4d81dda14a8e462d73b4329c19db46653cce57dc SHA512 2e0eb1c5560a0229be9de450da8b2bc62153744abb6d8ab9a0625c150dc00d3fc3e24dbe37cc26f4ca6b6876b5c63298427b2076ee42b8f772c75010bfc135a8
+DIST wheel-0.37.1.gh.tar.gz 68751 BLAKE2B 55919649f82668565d3b5907d14d0758984bb7d29d8857807ad034288ed8c9e8660957dc16f418f18408e89a97cf0d3c30df874a17f56deb56918388b18246a7 SHA512 9493db2f29e16d17ca06a4d47854b3df5dfd17f21c77efd42befd54470858256fd59f56aa9585cbf0a09830927b657d546324f793e1b1153665bf0b74d0c0457
diff --git a/dev-python/wheel/wheel-0.37.1.ebuild b/dev-python/wheel/wheel-0.37.1.ebuild
new file mode 100644
index 000000000000..7e52d015afa2
--- /dev/null
+++ b/dev-python/wheel/wheel-0.37.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="A built-package format for Python"
+HOMEPAGE="https://pypi.org/project/wheel/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/pypa/wheel/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	dev-python/packaging[${PYTHON_USEDEP}]"
+
+distutils_enable_tests --install pytest
+
+src_prepare() {
+	sed \
+		-e 's:--cov --cov-config=setup.cfg::g' \
+		-i setup.cfg || die
+
+	# unbundle packaging
+	rm -r src/wheel/vendored || die
+	sed -i -e 's:\.vendored\.::' src/wheel/*.py || die
+
+	distutils-r1_src_prepare
+}