gentoo resync : 12.03.2021

425 files changed, 5529 insertions, 4210 deletions

diff --git a/dev-python/3to2/Manifest b/dev-python/3to2/Manifest
index e0ab6cbe7da9..033c97867530 100644
--- a/dev-python/3to2/Manifest
+++ b/dev-python/3to2/Manifest
@@ -1,3 +1,3 @@
 DIST 3to2-1.1.1.zip 78779 BLAKE2B 441e74bd06017c84bd382c32513d84f42b8bc35f46aeb62ec1e3f5b9876573e0a76f6e04f4ca529175761af6f29e10ee0c4d4114ff0bcafb066d2d6344b1d885 SHA512 7580f174409420556f89ae78eba07cc95b95aee9d062586d0862bd41980ae31bf4ac82a43855e160eec745fcdd3b4aff614f68e77da1bfc5f9f404413cab1492
 EBUILD 3to2-1.1.1-r1.ebuild 936 BLAKE2B 61069a687d8280aad2ef5d4facef4cec6b20d6c2ecec4593dda3de61a1d24f0d71b6c973bf7610946e866c96a2c988e6d564fa2b044d307fa0899d76a76490b5 SHA512 f15c0af4f8315e7868a0420c02ff61ce3c6c183b7f6d70444c2a311ed4d27f9d72fed68afa662e781fd7140035740a8c13ec57ef32415f42d7e929fbff360eeb
-MISC metadata.xml 433 BLAKE2B 4f1b66cebd6b0b9f083d0896f702cc2f882d0d05a28634fad2d83af9802ccdfeb237e8d1eddee71c5a18663ede779085c28c81c3586b4ccfa2274c5dd8a9e1cc SHA512 fbf01ed6fe0bfdf49ba985e62e8694d7152129e0d46a3701fe39dd11ed7d48641efaea848694a271f39b9ae7e6b805b0ac535945cf33d455e0745d1f66ad3c04
+MISC metadata.xml 458 BLAKE2B 67c069e2b704c93d5ef08d3fabe71aa12ee1f298f0d5d9b8fc1003735181089f6f00e810c8d22c30c7cad25a3f91778958f02cb52151b601add21117e26dad77 SHA512 80815027bab3a3e462f5813724ff1ef17303abf7104ffb213f3628ade6f734a3613e15d85f713cb33cb805829037bac3106d3ce7fb3ae279a530775303701cbf
diff --git a/dev-python/3to2/metadata.xml b/dev-python/3to2/metadata.xml
index 57a9d13fae65..122990214c7c 100644
--- a/dev-python/3to2/metadata.xml
+++ b/dev-python/3to2/metadata.xml
@@ -9,6 +9,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">3to2</remote-id>
   </upstream>
diff --git a/dev-python/Faker/Faker-6.5.1.ebuild b/dev-python/Faker/Faker-6.5.1.ebuild
new file mode 100644
index 000000000000..44adab5d87c2
--- /dev/null
+++ b/dev-python/Faker/Faker-6.5.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1
+
+DESCRIPTION="A Python package that generates fake data for you"
+HOMEPAGE="https://github.com/joke2k/faker"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
+	>=dev-python/text-unidecode-1.3[${PYTHON_USEDEP}]
+	!dev-ruby/faker"
+BDEPEND="
+	test? (
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/random2[${PYTHON_USEDEP}]
+		dev-python/validators[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/Faker/Faker-6.6.0.ebuild b/dev-python/Faker/Faker-6.6.0.ebuild
new file mode 100644
index 000000000000..44adab5d87c2
--- /dev/null
+++ b/dev-python/Faker/Faker-6.6.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1
+
+DESCRIPTION="A Python package that generates fake data for you"
+HOMEPAGE="https://github.com/joke2k/faker"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
+	>=dev-python/text-unidecode-1.3[${PYTHON_USEDEP}]
+	!dev-ruby/faker"
+BDEPEND="
+	test? (
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/random2[${PYTHON_USEDEP}]
+		dev-python/validators[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/Faker/Manifest b/dev-python/Faker/Manifest
index b1f9854e9f07..7d0e5d81071d 100644
--- a/dev-python/Faker/Manifest
+++ b/dev-python/Faker/Manifest
@@ -1,6 +1,10 @@
 AUX Faker-5.6.5-ukposttest.patch 1224 BLAKE2B 4d7dcd6637c5e2cdb619b60414cc84b635847a305767d02291d51adb500e6e76bcba834359262a8cc0290e59419192b6dfe3e633a409db5bf61ee09d88fb5a0e SHA512 c3a4505ce7524fcb98567aa1870da3c25917cc2c8514bee6696982ce09ccb9eb207650b2d5129ca6977ac07bc65ee864e59fc6583f1fa3c3d87d0ee22d72e797
 DIST Faker-5.6.5.tar.gz 1058615 BLAKE2B 2a730b79ca11a80b33f5249541e2de68e5c53832fcd06891ce2e074dbca8aa21c657147e55725d37954cb997a2b1854b5c853449e7d58a71358b69fd2a36584f SHA512 1806eded3534602eb5c463ad030564edfe7c663952e62e943b809dd5d7c4e485b26c612e45f481b6125f6462d48215df065f2d3f30df67ab19699b6386a65b7b
 DIST Faker-6.4.1.tar.gz 1073921 BLAKE2B 1434375b8341ad3143e5977b26fd22af69aee2e30da92072937308341f22151764c8a72361c93112b5818dc9858e8e565ab2b45bd0fabc9e59613c1015e6ea63 SHA512 8ae2014b27f07b41afc67dc9a3d65e39f1073987c0c4bac6da5d625145e1d43783e4134bafdfe4e94035be9ff4367e5a19ab63635bf8ce7ff353a8745cf96269
+DIST Faker-6.5.1.tar.gz 1074618 BLAKE2B dfcd80c170ae1f68c4eb541804b4f91c5c2821669e51d3231daa92c6b2818b30e6ff6a6328e5836f534a7d1ddd24d4b089adffc461e785642d7663088ba47251 SHA512 7681e9afa48f39c3a7dd41ef48e70025a4a225de3cbb6b8272279f353df7d4b956a2398ae0d84926fc1e72530accda4b2407e1b0cee116494bccfbaaf21bc38d
+DIST Faker-6.6.0.tar.gz 1114719 BLAKE2B 2e3639eba6ad74784ef30e2e7e6aa8b9fdc61c1d64babb256994068e1f54133841225b6549b4edde3539c3888acdcacf3029fe7daa414fd1142e2c1df8ac201d SHA512 1e72fa5672e310ff846f0945481d60db3749d916b37cd4e267c8ca4ffc5a2eab067622f618e9b4c8bc704155be413424f197b5796a86975b86219556116e0d47
 EBUILD Faker-5.6.5.ebuild 797 BLAKE2B 79802fa2f75b54f955f02417689548235864e29e38d53afca8e80f5c9d07327daec7f9a877440420ddf80a3e63a873744cffabc9022715519abf75f4f4660a69 SHA512 4d4cd1bb4f17dfbcd41eec4e5dadc73d66438ae552ff7be1ec3dba2f8a61c13d902f857185df3d3083a53adf144ce4407d2ca95be6cb7d3bf3661326bf478501
 EBUILD Faker-6.4.1.ebuild 682 BLAKE2B 592c09b3f0caa3336c660c348a9a2cb09f6eb2e97a5d5c7594fd4d8d884062cea8f16d5c27867b282f59565dc0ad075832866f386158d6ab553ff68126f5555a SHA512 dcb4a5100c6b5779d283890a98c4bca15a1d77051e82802c0d4ab3eb264b2fa89b3230958b02071e367b65a9bf489a2de7c13aa79bb901ac886b4dc03001cbfb
+EBUILD Faker-6.5.1.ebuild 710 BLAKE2B c91b7a47573bb0d362fa570c1b4242c8e31f19364ec453d4513dec64ed9258e1cfe0c96d9c875d91eaf559c6b6bbf4ac5c843bc914a531e42387511d5a05729a SHA512 b6b1e1196bc8457165d7612a8e8f67f881eebb24bf646cbfeb4bcce4bcb6e730bc8d0dfaa8f758812238bd7a7f92dbd1534f23d9bfa6a56203fa685a77f59608
+EBUILD Faker-6.6.0.ebuild 710 BLAKE2B c91b7a47573bb0d362fa570c1b4242c8e31f19364ec453d4513dec64ed9258e1cfe0c96d9c875d91eaf559c6b6bbf4ac5c843bc914a531e42387511d5a05729a SHA512 b6b1e1196bc8457165d7612a8e8f67f881eebb24bf646cbfeb4bcce4bcb6e730bc8d0dfaa8f758812238bd7a7f92dbd1534f23d9bfa6a56203fa685a77f59608
 MISC metadata.xml 473 BLAKE2B 339c0263dce223547f0a5267983079a02f885abc66023578dd24a602c11dfda07faffb43b78f7805fcf31804de10568baeabff695bfbd64d85863a392056436a SHA512 414f9ce994c58c60b8f58e0531208d189698c932d18b25dae03dfb0eef181452532ff57ff9b40707acc896184742a36dc3793a92217257969bb92bb886e8b67d
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index d17c9f66622f..c0b68158f2e9 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/QtPy/Manifest b/dev-python/QtPy/Manifest
index 70d3205ccf05..0e3157b7e2b6 100644
--- a/dev-python/QtPy/Manifest
+++ b/dev-python/QtPy/Manifest
@@ -1,3 +1,4 @@
 DIST QtPy-1.9.0.tar.gz 35522 BLAKE2B 05b700c1f804cc535c3065c8f819d1d7fb0e02d43f199082d2e0d2c575ff8dbfdbf0053ddb3b155108cf55350ff4daf75166ab39a60374a35a86a1707724a4a1 SHA512 2492c531f0df3afc9e0f8875a2b2e39cc8b09542fb9f251900b8596c0db7767390bb85365cc39efd6cd37ae852a00655354e6f9f3d795023e4fd86dbf8bd5fa7
 EBUILD QtPy-1.9.0-r2.ebuild 956 BLAKE2B 3a5efbef2e6ec3f5c2c175940f9f4825d578c57a7fa701db6ea9e8ca0441fd3e460f258e585b1b96ef28a482dfa25c31d6c9d13dfccda5c381743fb3f34d244c SHA512 b190a298d525dd9d02a3f110ef62bc40369e5d23a5c58facab74140da08ab1651f0a74a7c9e183550dba049df051aa4e70da6f049a1a1533b30bb2f06e13a02f
-MISC metadata.xml 1350 BLAKE2B 1871f64db7308ed1232a209c8e4b93b061727ceb3c39f4c1ec1f4e70341aafb422f2053070de1f3327e98dd904fe1933bb750f60170f07c77fa7628ff1bd65b2 SHA512 6dc3acac74cb60e1b1c9fbd357d14fca2ca1c49d3ca8ff1fcbfd923c53c5e862c7c580857329a00fb1ba707f856dcf171e1441e8bedb7622501717c9bdfcbe62
+EBUILD QtPy-1.9.0-r3.ebuild 4249 BLAKE2B 8d9f5f2649006c32b94f06dba70da730cf134e9a0f6ba7c69c41c86878159b60f88a5fd5c8f4b70db92215a2285ca74cd4758c2efa6c22e2bce27bc60156704f SHA512 6e4e0940b2033d8f7ce61ed34977cb5519e035d6643a86d7dae43e684503a840f6e9055d8c3151c4574d4de142b679a6a71522ff7df2e1091fc9f848ab30cb59
+MISC metadata.xml 2850 BLAKE2B 3548a7feb6ab18f1ae067a5faca9ac68735ca171c2d23c6400714a581934adcdc86910e322e606f010e7111d63263b06efea15a170c5379aa452fb407b8218af SHA512 e6139ad7820b1cbf18d322b305e2cd3e884fc5939c3cd1522f658a644701dd632c96749ff158963c4c7e46eea2898ff7e60530b17104dbe4281ad8320551cde4
diff --git a/dev-python/QtPy/QtPy-1.9.0-r3.ebuild b/dev-python/QtPy/QtPy-1.9.0-r3.ebuild
new file mode 100644
index 000000000000..e707c30eebb6
--- /dev/null
+++ b/dev-python/QtPy/QtPy-1.9.0-r3.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..8} )
+
+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 ~arm64 ~x86"
+
+IUSE="
+	declarative designer gui help location multimedia network
+	opengl positioning printsupport qml quick sensors serialport
+	sql svg test testlib webchannel webengine websockets
+	widgets x11extras xml xmlpatterns
+"
+
+# 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="
+	app-eselect/eselect-QtPy
+	|| (
+		dev-python/PyQt5[${PYTHON_USEDEP},designer?,gui?,help?,location?,multimedia?,network?,opengl?,positioning?,printsupport?,sensors?,serialport?,sql?,svg?,testlib?,webchannel?,websockets?,widgets?,x11extras?,xml(+)?,xmlpatterns?]
+		dev-python/pyside2[${PYTHON_USEDEP},designer?,gui?,help?,location?,multimedia?,network?,opengl(+)?,positioning?,printsupport?,sensors?,serialport(+)?,sql?,svg?,testlib?,webchannel?,websockets?,widgets?,x11extras?,xml?,xmlpatterns?]
+	)
+
+	webengine? ( || (
+		dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
+		dev-python/pyside2[${PYTHON_USEDEP},webengine]
+	) )
+
+	qml? ( || (
+		dev-python/PyQt5[${PYTHON_USEDEP},declarative]
+		dev-python/pyside2[${PYTHON_USEDEP},qml]
+	) )
+
+	quick? ( || (
+		dev-python/PyQt5[${PYTHON_USEDEP},declarative]
+		dev-python/pyside2[${PYTHON_USEDEP},quick]
+	) )
+
+	declarative? ( || (
+		dev-python/PyQt5[${PYTHON_USEDEP},declarative]
+		dev-python/pyside2[${PYTHON_USEDEP},qml,quick]
+	) )
+"
+
+# These bindings are currently only provided by PyQt5 or PySide2
+# but not by both. Just DEPEND on these directly if they are
+# required.
+# Please check periodically if this list is still up to date
+#
+# 	bluetooth? ( dev-python/PyQt5[${PYTHON_USEDEP},bluetooth] )
+# 	dbus? ( dev-python/PyQt5[${PYTHON_USEDEP},dbus] )
+# 	examples? ( dev-python/PyQt5[${PYTHON_USEDEP},examples] )
+# 	networkauth? ( dev-python/PyQt5[${PYTHON_USEDEP},networkauth] )
+# 	ssl? ( dev-python/PyQt5[${PYTHON_USEDEP},ssl] )
+# 	webkit? ( dev-python/PyQt5[${PYTHON_USEDEP},webkit] )
+#
+# 	3d? ( dev-python/pyside2[${PYTHON_USEDEP},3d] )
+# 	charts? ( dev-python/pyside2[${PYTHON_USEDEP},charts] )
+# 	concurrent? ( dev-python/pyside2[${PYTHON_USEDEP},concurrent] )
+# 	datavis? ( dev-python/pyside2[${PYTHON_USEDEP},datavis] )
+# 	scxml? ( dev-python/pyside2[${PYTHON_USEDEP},scxml] )
+# 	script? ( dev-python/pyside2[${PYTHON_USEDEP},script] )
+# 	scripttools? ( dev-python/pyside2[${PYTHON_USEDEP},scripttools] )
+# 	speech? ( dev-python/pyside2[${PYTHON_USEDEP},speech] )
+
+# The QtPy testsuite skips tests for bindings that are
+# not installed, so here we ensure that everything
+# is available and all tests are run.
+BDEPEND="test? (
+	dev-python/PyQt5[${PYTHON_USEDEP},bluetooth,dbus,declarative,designer,gui,help,location,multimedia,network,networkauth,opengl,positioning,printsupport,sensors,serialport,sql,ssl,svg,testlib,webchannel,webkit,websockets,widgets,x11extras,xml(+),xmlpatterns]
+	dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
+	dev-python/pyside2[${PYTHON_USEDEP},3d,charts,concurrent,datavis,designer,gui,help,location,multimedia,network,opengl(+),positioning,printsupport,qml,quick,script,scripttools,scxml,sensors,serialport(+),speech,sql,svg,testlib,webchannel,webengine,websockets,widgets,x11extras,xml,xmlpatterns]
+)"
+
+distutils_enable_tests pytest
+
+python_test() {
+	export QT_API="pyqt5"
+	virtx pytest -vv
+	export QT_API="pyside2"
+	virtx pytest -vv
+	unset QT_API
+}
diff --git a/dev-python/QtPy/metadata.xml b/dev-python/QtPy/metadata.xml
index a19bcec18947..5b164c14610b 100644
--- a/dev-python/QtPy/metadata.xml
+++ b/dev-python/QtPy/metadata.xml
@@ -1,30 +1,51 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Gentoo Python Project</name>
-  </maintainer>
-  <longdescription>
-     QtPy is a small abstraction layer that lets you write
-     applications using a single API call to either PyQt or
-     PySide. QtPy also provides a set of additional QWidgets. It
-     provides support for PyQt5, PyQt4 and PySide using the PyQt5
-     layout (where the QtGui module has been split into QtGui and
-     QtWidgets).
-     Basically, you write your code as if you were using PyQt5 but
-     import qt from QtPy instead of PyQt5.
-  </longdescription>
-  <use>
-    <flag name="designer">Build bindings for the QtDesigner module and enable the designer plugin</flag>
-    <flag name="gui">Build bindings for the QtGui module</flag>
-    <flag name="printsupport">Build bindings for the QtPrintSupport module</flag>
-    <flag name="svg">Build bindings for the QtSvg module</flag>
-    <flag name="testlib">Build bindings for the QtTest module</flag>
-    <flag name="webengine">Build bindings for the QtWebEngine module</flag>
-  </use>
-  <upstream>
-    <remote-id type="github">spyder-ide/qtpy</remote-id>
-    <remote-id type="pypi">QtPy</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Gentoo Python Project</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>andrewammerlaan@riseup.net</email>
+		<name>Andrew Ammerlaan</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription>
+		QtPy is a small abstraction layer that lets you write applications using a single API call to either PyQt or PySide.
+		It provides support for PyQt5, PyQt4, PySide2 and PySide using the Qt5 layout (where the QtGui module has been split into QtGui and QtWidgets).
+		Basically, you can write your code as if you were using PySide2 but import Qt modules from qtpy instead of PySide2 (or PyQt5)
+	</longdescription>
+	<use>
+		<flag name="declarative">Pull in bindings for the QtQml/QtQuick modules and enable the qmlscene plugin</flag>
+		<flag name="designer">Pull in bindings for the QtDesigner module and enable the designer plugin</flag>
+		<flag name="gui">Pull in bindings for the QtGui module</flag>
+		<flag name="help">Pull in bindings for the QtHelp module</flag>
+		<flag name="location">Pull in bindings for the QtLocation module</flag>
+		<flag name="multimedia">Pull in QtMultimedia and QtMultimediaWidgets modules</flag>
+		<flag name="network">Pull in bindings for the QtNetwork module</flag>
+		<flag name="opengl">Pull in bindings for the QtOpenGL module</flag>
+		<flag name="positioning">Pull in bindings for the QtPositioning module</flag>
+		<flag name="printsupport">Pull in bindings for the QtPrintSupport module</flag>
+		<flag name="qml">Pull in QtQml module</flag>
+		<flag name="quick">Pull in QtQuick and QtQuickWidgets modules</flag>
+		<flag name="sensors">Pull in bindings for the QtSensors module</flag>
+		<flag name="serialport">Pull in bindings for the QtSerialPort module</flag>
+		<flag name="sql">Pull in bindings for the QtSql module</flag>
+		<flag name="svg">Pull in bindings for the QtSvg module</flag>
+		<flag name="testlib">Pull in bindings for the QtTest module</flag>
+		<flag name="webchannel">Pull in bindings for the QtWebChannel module</flag>
+		<flag name="webengine">Pull in QtWebEngine and QtWebEngineWidgets modules</flag>
+		<flag name="websockets">Pull in bindings for the QtWebSockets module</flag>
+		<flag name="widgets">Pull in bindings for the QtWidgets module</flag>
+		<flag name="x11extras">Pull in bindings for the QtX11Extras module</flag>
+		<flag name="xmlpatterns">Pull in bindings for the QtXmlPatterns module</flag>
+		<flag name="xml">Pull in QtXml module</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">spyder-ide/qtpy</remote-id>
+		<remote-id type="pypi">QtPy</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/abydos/Manifest b/dev-python/abydos/Manifest
index da3486e0f365..3426959c597a 100644
--- a/dev-python/abydos/Manifest
+++ b/dev-python/abydos/Manifest
@@ -1,3 +1,3 @@
 DIST abydos-0.5.0.tar.gz 21321759 BLAKE2B 1f14675f42e849e5e1563dd858bfb2bf040e25b0f90cb3da9986492378892bedd0f23eea990cd65d804aececb350b0e90fb27921382a8df8b91e55d7f820c27e SHA512 28aeea4ba16ea88b077e8b9902f5d8b3a650eeced489687daf9af0e4aa437eaee6c8eeb0747dd5a8f95291594064a1221cc1da2dfa989978bcc870045fee3531
 EBUILD abydos-0.5.0.ebuild 897 BLAKE2B 1355c70ae281e6b3e5ceda7e8fb81b5e0f5c87fc0f3893f8edd03092a1e2846d99621681640696e0f321e6d28d2410fce5081e99cb279cce5fd7fcc8e1e02e0d SHA512 c1254a8d79e471b767c1f59bcb175fb99dfcf865a3bdb800b47e0a114046f302bae6692202169a6735860c940ba38b86a842339320ed83c7bf0816050fc5002b
-MISC metadata.xml 499 BLAKE2B 28420593060655cc8158459e63a1f553e19e45513aad9e6736a77f788759f8b66663119a9534ae787f54869529ff69eb6c64ef236c9569787a714197b57f3d69 SHA512 d95c2d09f564a4dd4f8883ed1b233871377e42697b44111b17b1457a68446409e6ab0bad903a1f463c4470e3ac4de5ae686176c65c5401dd1535f2716e1bab90
+MISC metadata.xml 523 BLAKE2B e26545369a3e282f2433db497da8613a87178928384a50ddf632508e36418cefccd4a352f77e6942b2c250dd4e9d4e84bf4cf035e5a93ee8883156a6480d317a SHA512 95b83696d06387ec20a470039a7951d8a054f9e621b82c2448540575e68f0a0fa5c11cfa9fb49a106b3e13f8bc5e81029cf4d3ca4074fb1900a4dab5eb989cce
diff --git a/dev-python/abydos/metadata.xml b/dev-python/abydos/metadata.xml
index 79a10a06f44b..d0ada16d5525 100644
--- a/dev-python/abydos/metadata.xml
+++ b/dev-python/abydos/metadata.xml
@@ -9,6 +9,7 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">abydos</remote-id>
 		<remote-id type="github">chrislit/abydos</remote-id>
diff --git a/dev-python/aesara/Manifest b/dev-python/aesara/Manifest
index 1671756c1f93..1afaa18437f1 100644
--- a/dev-python/aesara/Manifest
+++ b/dev-python/aesara/Manifest
@@ -1,3 +1,5 @@
 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
 EBUILD aesara-2.0.1-r1.ebuild 1904 BLAKE2B 5826aa94aa158fde2fa8690f9a28ae1f676fc081d92bcf4134e566678292eddc6d40fa6694cff63be219dc7476be67b20cf42d2f483e561b5ca39b8342de7067 SHA512 9885c85d1756870c19c22e88ff0c1628c7e6773561bedeef2aa2fcce42055e7d5a8031bb7b2fd455fdc4352a6d1663526caab324f63a3a7b9d505790b60c0971
+EBUILD aesara-2.0.2.ebuild 1904 BLAKE2B 5826aa94aa158fde2fa8690f9a28ae1f676fc081d92bcf4134e566678292eddc6d40fa6694cff63be219dc7476be67b20cf42d2f483e561b5ca39b8342de7067 SHA512 9885c85d1756870c19c22e88ff0c1628c7e6773561bedeef2aa2fcce42055e7d5a8031bb7b2fd455fdc4352a6d1663526caab324f63a3a7b9d505790b60c0971
 MISC metadata.xml 402 BLAKE2B a82c76dff3cfcbf83936f2815e15d051d4ab26a739a970848573f5856610e763d9f346e2d265b2d38e53460df6bcba879ce50d6e60bffea77af6052d03d8dc5d SHA512 f3c86b74cbaaadb63bb98ffc2a3e6e1d121c141b33edd574cfdee3652a43e9f8b05e3276050bd407f00ddbec1d6fb6eda87983520075ad368ab8792e0ae17143
diff --git a/dev-python/aesara/aesara-2.0.2.ebuild b/dev-python/aesara/aesara-2.0.2.ebuild
new file mode 100644
index 000000000000..e637143ab45e
--- /dev/null
+++ b/dev-python/aesara/aesara-2.0.2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{7..9} )
+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/aiorpcX/Manifest b/dev-python/aiorpcX/Manifest
index dab67e35f13f..85c7a862ff75 100644
--- a/dev-python/aiorpcX/Manifest
+++ b/dev-python/aiorpcX/Manifest
@@ -1,7 +1,13 @@
 DIST aiorpcX-0.18.5.gh.tar.gz 65622 BLAKE2B 68b91e2cfb869c6971efb525fd35132c38ab9092362944fa77476bdb33f076f8415a079d97238e2c4ffbc6c9df596b468c2b6640389a11d1607b1a99aa8dc68d SHA512 5eb8417ce2ffb70208aec79e44ee0d8671c4cf86745f2d8061cf013c4ad17f83db68ed3ed43ef61df196e4ef073a21f9a4e22df46b00ce3054babf98dfcd1eaf
 DIST aiorpcX-0.19.1.gh.tar.gz 72903 BLAKE2B ba3da1bc1f8d83ec6c6d2189aee554b4b819b601d366d0e8858ec73fe6aedddf6a6ed00d56d66c38d18ee44921a4cce7cb83ebf05aec9348355f88b8ed67e1a5 SHA512 b71edf335ad78b1d46b2b23dcb102b29f988d32f75571b881e2ce3471bf48c7ffc9bf509ce1cafec036662bb06d6f90598304c207f416b4124a7b02fdca915e8
 DIST aiorpcX-0.19.gh.tar.gz 65557 BLAKE2B 2bc9d809abbcdcf4dd0358e4bb734068ef76482dc711e1c4568db78e9ae2141e00cffb82c1c7d5976887e0561b6c4f1422063969cec23a886bb192c279fc57d7 SHA512 21d8a75a90233bb4caed804da39274516a7c852c8adf9eabcba928ff7ad9bf922760fdca2c040aad8242193cb23be512803615973256b35347b6c998cccd6632
+DIST aiorpcX-0.20.1.gh.tar.gz 74087 BLAKE2B eee9b3d7d1e513e5eefec97ba30b8b5783b3128cd010b6c8c9530c19c06b1261499559249a9b46c2a8689daebd78d23f97a3b16c25572de80dc13a3650d4d593 SHA512 0f03fe54f268c64028607766bd45dd2fc8ee4ddab30da7744e9493e0e98cdbd9061dd502fd1bbde1880e5f4410f147f4ecf0ea04e4056c16bb784c3f76a558fc
+DIST aiorpcX-0.20.2.gh.tar.gz 74627 BLAKE2B e5a33dfd8ef0c18e26cfee881fd7515437598628bf61dfd86a34f0a758474abcf257c7afcbf0ee1d11ed6bad44596289efe2261d9ca7ccc26e7d949f05b3ad40 SHA512 af63d51bd21a045d71073ba6cd030834f8262e393eac9c44e6b33a2b3cecd86a5d2a6a0ed7ab60d2362e99ab38c801abcae1ada368a533d8f7fb8b616c43e582
+DIST aiorpcX-0.21.0.gh.tar.gz 75194 BLAKE2B dc8494531ca64db15e3e4b35ef5392e8177ca9b5c885c93c146edf921154f42caef5a7b2863a166d337a2f16e99e880b1e315f1f72624f50aa2d73a93c23e054 SHA512 0bcbb31cf367db029ef4acc06b23b6d3f861ab168971e367d760a220c0a6688934a8a91f7bb2fd9d993e173f2049e45556b6f094bb7ca005b37f66179061484d
 EBUILD aiorpcX-0.18.5.ebuild 861 BLAKE2B 6f13104a6bff221918e00c198b3fc3596e43dc37102d4ca53eec9774ef0f237d0bfe7ea3ab002584497ca59f448fa64e70dbc0a6fdf4d25c55eb45b0e8af03e6 SHA512 ce74a01085c864f0427da094a6073fce2a002dc32ce93ead0d03b671ec0d25d2600f7be278ba2621ef35d1ee00bc96922f2c0a18d9c97a45d3fae1ae2177ab1b
 EBUILD aiorpcX-0.19.1.ebuild 863 BLAKE2B 59fd6bb30d94a00014f1591f15605ea87281b8181535e4388379029b783dbaee85a6482ffcbeb89b9eab4cb819ed030284a9a562fd528b42cad38941ab9a04c5 SHA512 0913a68d34dfca6dcf38d9d73ad63b2641269e7ee49b6a80b3329e8bf2939c544cf6763c952c9b8a65e82de25f132e7c7bcf0774f06fc896e405dfd87a91bd7e
 EBUILD aiorpcX-0.19.ebuild 640 BLAKE2B 640d8106e3d14386cdea25aadc0b5534321b6c569e9578779c21398a71b7fe424ce089bb60021b0122df363c8f3a7b0324d21d8f1a2f87d2058ee244dfa9b09f SHA512 3010aafc2427f05af99f33d97a84e4f99ddb091feffe171f98a31427504ed8ae143467e7f4bb8417cbc540ac40000241a84296dfd78cec4aacb40b9626f0bfc5
-MISC metadata.xml 380 BLAKE2B c1355cf2d901123fa14fadb4f4bf084d385dfd870baa0a2189c68d05cd3bed57ae4f1caaa668211b74b6e2491e3263b99ba8b99446c0e4f5336ea06577dc540f SHA512 b025f50be4d5ba7e95f7ae7b91099498b76b75c7faa28df52f0bb64dbe55b494107f011d42bc4cd6f5c9e5786b2dc1eb8ffc8561334326dff9c99f7877576364
+EBUILD aiorpcX-0.20.1.ebuild 863 BLAKE2B 59fd6bb30d94a00014f1591f15605ea87281b8181535e4388379029b783dbaee85a6482ffcbeb89b9eab4cb819ed030284a9a562fd528b42cad38941ab9a04c5 SHA512 0913a68d34dfca6dcf38d9d73ad63b2641269e7ee49b6a80b3329e8bf2939c544cf6763c952c9b8a65e82de25f132e7c7bcf0774f06fc896e405dfd87a91bd7e
+EBUILD aiorpcX-0.20.2.ebuild 863 BLAKE2B 59fd6bb30d94a00014f1591f15605ea87281b8181535e4388379029b783dbaee85a6482ffcbeb89b9eab4cb819ed030284a9a562fd528b42cad38941ab9a04c5 SHA512 0913a68d34dfca6dcf38d9d73ad63b2641269e7ee49b6a80b3329e8bf2939c544cf6763c952c9b8a65e82de25f132e7c7bcf0774f06fc896e405dfd87a91bd7e
+EBUILD aiorpcX-0.21.0.ebuild 863 BLAKE2B 59fd6bb30d94a00014f1591f15605ea87281b8181535e4388379029b783dbaee85a6482ffcbeb89b9eab4cb819ed030284a9a562fd528b42cad38941ab9a04c5 SHA512 0913a68d34dfca6dcf38d9d73ad63b2641269e7ee49b6a80b3329e8bf2939c544cf6763c952c9b8a65e82de25f132e7c7bcf0774f06fc896e405dfd87a91bd7e
+MISC metadata.xml 405 BLAKE2B 6e2904d4bba224f3ea6898a0050b43aebb88132ab641533837cc39f2404b867aeba63f0466827199a4a4d54bce5f08376328dc1f3a9e50965be06ebd8fa02133 SHA512 5877ba7a1e6d5cd3bd6a5d1484e7abaa524a16d880c15e4b78d47986be8de8d290ebeb0bad628ff3d68d8dd7a85930d05e56c6954ec8e78c6f4e73530f27f12b
diff --git a/dev-python/aiorpcX/aiorpcX-0.20.1.ebuild b/dev-python/aiorpcX/aiorpcX-0.20.1.ebuild
new file mode 100644
index 000000000000..89eb9710f38e
--- /dev/null
+++ b/dev-python/aiorpcX/aiorpcX-0.20.1.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_{8..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Generic async RPC implementation, including JSON-RPC"
+HOMEPAGE="https://pypi.org/project/aiorpcX/
+	https://github.com/kyuupichan/aiorpcX/"
+SRC_URI="https://github.com/kyuupichan/aiorpcX/archive/${PV}.tar.gz
+	-> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+BDEPEND="
+	test? (
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/uvloop[${PYTHON_USEDEP}]
+		dev-python/websockets[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local deselect=(
+		# require Internet
+		tests/test_socks.py::TestSOCKSProxy::test_create_connection_resolve_good
+	)
+
+	pytest -vv ${deselect[@]/#/--deselect } ||
+		die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/aiorpcX/aiorpcX-0.20.2.ebuild b/dev-python/aiorpcX/aiorpcX-0.20.2.ebuild
new file mode 100644
index 000000000000..89eb9710f38e
--- /dev/null
+++ b/dev-python/aiorpcX/aiorpcX-0.20.2.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_{8..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Generic async RPC implementation, including JSON-RPC"
+HOMEPAGE="https://pypi.org/project/aiorpcX/
+	https://github.com/kyuupichan/aiorpcX/"
+SRC_URI="https://github.com/kyuupichan/aiorpcX/archive/${PV}.tar.gz
+	-> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+BDEPEND="
+	test? (
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/uvloop[${PYTHON_USEDEP}]
+		dev-python/websockets[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local deselect=(
+		# require Internet
+		tests/test_socks.py::TestSOCKSProxy::test_create_connection_resolve_good
+	)
+
+	pytest -vv ${deselect[@]/#/--deselect } ||
+		die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/aiorpcX/aiorpcX-0.21.0.ebuild b/dev-python/aiorpcX/aiorpcX-0.21.0.ebuild
new file mode 100644
index 000000000000..89eb9710f38e
--- /dev/null
+++ b/dev-python/aiorpcX/aiorpcX-0.21.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_{8..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Generic async RPC implementation, including JSON-RPC"
+HOMEPAGE="https://pypi.org/project/aiorpcX/
+	https://github.com/kyuupichan/aiorpcX/"
+SRC_URI="https://github.com/kyuupichan/aiorpcX/archive/${PV}.tar.gz
+	-> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+BDEPEND="
+	test? (
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/uvloop[${PYTHON_USEDEP}]
+		dev-python/websockets[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local deselect=(
+		# require Internet
+		tests/test_socks.py::TestSOCKSProxy::test_create_connection_resolve_good
+	)
+
+	pytest -vv ${deselect[@]/#/--deselect } ||
+		die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/aiorpcX/metadata.xml b/dev-python/aiorpcX/metadata.xml
index 92df4ff80f74..bb5feb7bfe44 100644
--- a/dev-python/aiorpcX/metadata.xml
+++ b/dev-python/aiorpcX/metadata.xml
@@ -5,6 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">aiorpcX</remote-id>
     <remote-id type="github">kyuupichan/aiorpcX</remote-id>
diff --git a/dev-python/aiosmtpd/Manifest b/dev-python/aiosmtpd/Manifest
index bf913f4cebb0..c332190b016b 100644
--- a/dev-python/aiosmtpd/Manifest
+++ b/dev-python/aiosmtpd/Manifest
@@ -4,10 +4,12 @@ DIST aiosmtpd-1.2.tar.gz 51457 BLAKE2B c2dba38c5d5a243a65c332cb3b6bf85a124eb6ab9
 DIST aiosmtpd-1.3.2.tar.gz 110769 BLAKE2B 985684d8183c89670c362e39b81cbff187fa820bc3197a0c0c18cd61eb4c00912bf489d935303be0fedfee3dabfafaf81c7d4be3e428374624ed9a1fab6ce2c8 SHA512 b5d183671b8a985dcf774fb1b35ffbdf5c058e24e7cb81d77b2b0ce00b2b4dff27ff8bb167e985d5bf84cb6816c014d7cd601aab59243136ae409975ef3da30d
 DIST aiosmtpd-1.4.0.tar.gz 136307 BLAKE2B 5ae007be6953de8fd804bef25e290153ead6730bf44dbf71448946c1380a972a59b0fcf6f669035dd23acc582d697dc746efe0b03612e6c3ee51b31d58aee309 SHA512 cefbc819a51cbdacc8f24d0f5ff4f2a92ad6e4c5809a9b97635226767f1dd20c63565522ab66fd6c7ede5efdafa89c42e3c3bae4e94ea5c57b49531b02e1bad6
 DIST aiosmtpd-1.4.1.tar.gz 137171 BLAKE2B 601cbcc1eb409277dfada35bd8bf39c7282651b479a4db4a7716ef74dd66fce37bdeb7b0fd8fceb9889ec247e1ec32d9b2305de74868feceba208c23835e08de SHA512 f018e0a75adaa269c1f003a6f7fbbe92257c518ea9b62ffd807bb75a169362ff1159b69562b0d6cfa211ff5cd19f0756ed78c92a7be533a0c1929608d6eacc82
+DIST aiosmtpd-1.4.2.tar.gz 140630 BLAKE2B 9a725d3aa28943afbb14fb6792e0115cf4bc257250da815183c9c9e6b293cf71ac836cc811f50e48bc450d3f629f74d1948aaef78d44852bc96fb3daf0398605 SHA512 b910ae4c00b52f59b9f2199b296a1b76caa7567cbcd2e27c73d4ec894e9b48cd8190090083ce33b87dc924c4394a6425506355951208af65b89a6c1abe371114
 EBUILD aiosmtpd-1.2.2.ebuild 604 BLAKE2B b5d7a51a15335f12ea7479be582db17be6fd7a929db3db086238bc0ea9b4bf305d7c351d4d943fc09b40983c3cb1aee95a9378f5a507c4cb999ea3512d600885 SHA512 4b09dcff6e06f621db49b94c50bbfb2be17a49b5a5e2c64d28dd725ed37b78f51440081b93aca9b7f6f95e64531810b8e9994a472a014ad9fd77a2fbf67af368
 EBUILD aiosmtpd-1.2.4.ebuild 481 BLAKE2B 7f1e922676bdf7abf8323aa883c282f0705cc2931139dcd9c0a8167e584764550fc40a0004de9e71e76d5bb15bb9d71b62ed08ab7dfd99b36f0cf36f2cdf2beb SHA512 8d6e06c4e21d789f36c4646baddbd239be2dc25d0a078b5c4472410a3c0521bc20696e221b66cd3ee5e801036419bdd1ce0216a6bc4e3e0e08637b278b26cffb
 EBUILD aiosmtpd-1.2.ebuild 569 BLAKE2B c6147ea15f789e3324ae80739619916a80574e2978ee8fc00eaec4c0acc9ec56241f21bc7830ba1330a3f51dcc36597ff20a036a15fb4e3cb7a14210f1d570d3 SHA512 c1669e3177372be4fef402fa1629e33f8f998ef070c5250844fec86c6e1446406649f6754af54b10f19f5b8f4b839977b05a52b34fa0161045a45c08081e87ee
 EBUILD aiosmtpd-1.3.2.ebuild 627 BLAKE2B 25c69f1ea753d119197475f1a4b769d973ad74f8cc64a86f37ccc0204ea988deb1a2874ec79e214c792ba3fefc30a00284e2a273b4960bbacc2f20bee056c4f5 SHA512 668180bcbdbfca58bb1c79b37495a4ea2162cd092c326ef131fbc265081ba6c8631f224e6c60634db74e793ab96bbd17c56b5132ea3bf7b2d3f49bc2cadd82dc
 EBUILD aiosmtpd-1.4.0.ebuild 750 BLAKE2B 66a6d103c69d91e59f27c2c54c5bfdeb8376be5a366602f9825971d0067a15b0c32b23ae283b99171eace58014fb50a3d0c407e3dc80da5c3d0c313eb6e89ab3 SHA512 9c06dda2aac6276db5abac43e97ca1848492512b195ac5c5a9577c3168c5e04eff1903514e01f6712ebf1723df2d994ceb39d3a242ebc83086e9e5a3a810e9d5
 EBUILD aiosmtpd-1.4.1.ebuild 750 BLAKE2B 66a6d103c69d91e59f27c2c54c5bfdeb8376be5a366602f9825971d0067a15b0c32b23ae283b99171eace58014fb50a3d0c407e3dc80da5c3d0c313eb6e89ab3 SHA512 9c06dda2aac6276db5abac43e97ca1848492512b195ac5c5a9577c3168c5e04eff1903514e01f6712ebf1723df2d994ceb39d3a242ebc83086e9e5a3a810e9d5
+EBUILD aiosmtpd-1.4.2.ebuild 750 BLAKE2B 66a6d103c69d91e59f27c2c54c5bfdeb8376be5a366602f9825971d0067a15b0c32b23ae283b99171eace58014fb50a3d0c407e3dc80da5c3d0c313eb6e89ab3 SHA512 9c06dda2aac6276db5abac43e97ca1848492512b195ac5c5a9577c3168c5e04eff1903514e01f6712ebf1723df2d994ceb39d3a242ebc83086e9e5a3a810e9d5
 MISC metadata.xml 461 BLAKE2B 26a357ec03cbd43372f7fe77a2b7ba7330c9c1c18695887c5e297f7d769d3af34ae456f30743880098080f3c6740180bbe0e7e0be5a02a0059096b18177968cd SHA512 67f76d5cf941e2276006c55471a101e0be62e79a2cf3c69d74fac6566da9ef44b14fa29d7fbe57b72d2452318465d4b43aa9337c1cdac798b874a3b3ce2f1734
diff --git a/dev-python/aiosmtpd/aiosmtpd-1.4.2.ebuild b/dev-python/aiosmtpd/aiosmtpd-1.4.2.ebuild
new file mode 100644
index 000000000000..3c32f8604a09
--- /dev/null
+++ b/dev-python/aiosmtpd/aiosmtpd-1.4.2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="asyncio based SMTP server"
+HOMEPAGE="https://aiosmtpd.readthedocs.io/en/latest/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/atpublic[${PYTHON_USEDEP}]
+	dev-python/attrs[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	' python3_7)"
+BDEPEND="
+	test? (
+		>=dev-python/pytest-6[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+	)"
+
+# TODO: run doctests using sphinx?
+distutils_enable_tests pytest
diff --git a/dev-python/alembic/Manifest b/dev-python/alembic/Manifest
index 817b64a77487..de7124c94e4e 100644
--- a/dev-python/alembic/Manifest
+++ b/dev-python/alembic/Manifest
@@ -1,7 +1,9 @@
-DIST alembic-1.5.1.tar.gz 1128404 BLAKE2B 70a2ce16adcf317c9376f77d8fa88e9eef3aa4090de5f933187f47df9fe6ac40a25df75d6c74c50c3be23dd3cef13d465eb2ddae4ea83558d01ebffd8effe241 SHA512 2fe490c46c253123333f0496fe28b59956efc78924f145b69ba95e5cb1cc091a72047c1aa5f8a85924ec59ad0aba2bfa143b9cad475dedc6f849c38695c08601
 DIST alembic-1.5.4.tar.gz 1133598 BLAKE2B 88e1f40ef1935b90de789f1adc99edb5fc580c96a3e86a672cc9cfd694e79e940ba696efe560db3bf2878420a168382ed4342cbf1b8c7b9bbbf084532b8da402 SHA512 190f8fe96f18541fd62802e026e93c332f6046618cb89d4f9a6b478505742671d363de1161feeccd8873036a458743165080b5a0e2e55e1d0dd81e617c8cd4ad
 DIST alembic-1.5.5.tar.gz 1150308 BLAKE2B 33db8a0ea00802b37d3e24ca43232a993bfc333e232fa08b8dd0560dfec5f18f4fa82bcc3c34a776c88c8fc8d3645c4501a9dde8e4e5411bc255eb654183d01a SHA512 a4078c66bbe1627620224f965b879c46453bc74e6a2a902619df28912f55b27f086cba68f08bc8c0a37bd221ac16e195f7f905379fd5d191854adb7f90f86530
-EBUILD alembic-1.5.1.ebuild 771 BLAKE2B 5135004eb121ed720404cf1935bcfc2394a2c0193f438552b34303f23db704a193fb695bf926e63bf8dfa2fb44097ef4e089aafb479aad08475f2df42a868a88 SHA512 9ad90f45ada8b63d8685d072373adea49aebae62e53b6416264d48ad8b4bf017c4fad9595a47e01dc14f4ffdb7849bebb3192b5a900f529480425ccd5799ce2c
-EBUILD alembic-1.5.4.ebuild 773 BLAKE2B ee30f61abd6a43633de146454e043bcaa6a9a6f9ba04a80aeae6eab8bb9c714951be0dcbce4edf4d79045b0c9a729150a910d62f1041e4af44ac596e06b0dd9b SHA512 89c70ac4a4ea7151e529a65e3d4a8750c776d5cd65a997bf689f613c5b73584a9b9cd69fad2378521541695cda48addda5655c737c92eb6207b2f8104662380f
+DIST alembic-1.5.6.tar.gz 1153606 BLAKE2B ef790285975101f5f17a629c812ef56053dcd2878a02a54d6c79aebd9b97e1d253dc63e98e99eb10eeee74ab85ac0f0483c7e0d993920f120373dd40d6dfc2c6 SHA512 95b57dd920fb36e36b7c249d369b1835492f8e4b74086d39f1100590c827b76b49a1aede1d484cfb1f600662bfb99d38ddead468ec8ffb92e8110d8c3523e23d
+DIST alembic-1.5.7.tar.gz 1154141 BLAKE2B 9932889b31d6afb49c91b3b5681285869867119f493123ccabac8d24d8a4de6c8700aa1bd5578bfbfd4e13adda10cfb4a59ad4de1a51a6180a3e9455acde928e SHA512 a0bd6104405302ab9155438e980223c0ac97c0bb9026afa701f02cd6b79233cdbb7e1f953314542ebed829c1db96bc73def47eeff42f63c75c31e1fb8e981829
+EBUILD alembic-1.5.4.ebuild 771 BLAKE2B 5135004eb121ed720404cf1935bcfc2394a2c0193f438552b34303f23db704a193fb695bf926e63bf8dfa2fb44097ef4e089aafb479aad08475f2df42a868a88 SHA512 9ad90f45ada8b63d8685d072373adea49aebae62e53b6416264d48ad8b4bf017c4fad9595a47e01dc14f4ffdb7849bebb3192b5a900f529480425ccd5799ce2c
 EBUILD alembic-1.5.5.ebuild 773 BLAKE2B ee30f61abd6a43633de146454e043bcaa6a9a6f9ba04a80aeae6eab8bb9c714951be0dcbce4edf4d79045b0c9a729150a910d62f1041e4af44ac596e06b0dd9b SHA512 89c70ac4a4ea7151e529a65e3d4a8750c776d5cd65a997bf689f613c5b73584a9b9cd69fad2378521541695cda48addda5655c737c92eb6207b2f8104662380f
+EBUILD alembic-1.5.6.ebuild 773 BLAKE2B ee30f61abd6a43633de146454e043bcaa6a9a6f9ba04a80aeae6eab8bb9c714951be0dcbce4edf4d79045b0c9a729150a910d62f1041e4af44ac596e06b0dd9b SHA512 89c70ac4a4ea7151e529a65e3d4a8750c776d5cd65a997bf689f613c5b73584a9b9cd69fad2378521541695cda48addda5655c737c92eb6207b2f8104662380f
+EBUILD alembic-1.5.7.ebuild 773 BLAKE2B ee30f61abd6a43633de146454e043bcaa6a9a6f9ba04a80aeae6eab8bb9c714951be0dcbce4edf4d79045b0c9a729150a910d62f1041e4af44ac596e06b0dd9b SHA512 89c70ac4a4ea7151e529a65e3d4a8750c776d5cd65a997bf689f613c5b73584a9b9cd69fad2378521541695cda48addda5655c737c92eb6207b2f8104662380f
 MISC metadata.xml 515 BLAKE2B 219e6908903fd35cdc826ecf6dd46ad0e55996c4e674274b7840a9f04e50b19c9cdf24f0af66a9ea6782caeba7b7b0f0286c43055f25c638fda443fcf5a04f2e SHA512 8fe0d55be255a8f486693b026de9d9f934baf1ac6b927a743fdb8170bb52a32a1a0ae57b1b8c7e30ad8921e2dbae7af560a8942c801aec88d4c3b2544fd66319
diff --git a/dev-python/alembic/alembic-1.5.4.ebuild b/dev-python/alembic/alembic-1.5.4.ebuild
index 32d428a7bdf3..b0a59134f8e1 100644
--- a/dev-python/alembic/alembic-1.5.4.ebuild
+++ b/dev-python/alembic/alembic-1.5.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="doc"
 
 RDEPEND="
diff --git a/dev-python/alembic/alembic-1.5.1.ebuild b/dev-python/alembic/alembic-1.5.6.ebuild
index b0a59134f8e1..32d428a7bdf3 100644
--- a/dev-python/alembic/alembic-1.5.1.ebuild
+++ b/dev-python/alembic/alembic-1.5.6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="doc"
 
 RDEPEND="
diff --git a/dev-python/alembic/alembic-1.5.7.ebuild b/dev-python/alembic/alembic-1.5.7.ebuild
new file mode 100644
index 000000000000..32d428a7bdf3
--- /dev/null
+++ b/dev-python/alembic/alembic-1.5.7.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="database migrations tool, written by the author of SQLAlchemy"
+HOMEPAGE="https://github.com/sqlalchemy/alembic"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc"
+
+RDEPEND="
+	>=dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
+	dev-python/mako[${PYTHON_USEDEP}]
+	>=dev-python/python-editor-0.3[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/arrow/Manifest b/dev-python/arrow/Manifest
index 5265450db93c..4d880d1c9ba7 100644
--- a/dev-python/arrow/Manifest
+++ b/dev-python/arrow/Manifest
@@ -2,8 +2,10 @@ DIST arrow-0.17.0.tar.gz 97411 BLAKE2B d908f9e98b4046aa8afbde992e108106e0cb81d5d
 DIST arrow-1.0.0.tar.gz 101951 BLAKE2B b8949dc2274f44020bd70e1013b3b3053789319daae0c630e17d2bac66d614e958b2d34ed9b06a1a5502a21684de10e053d4f1e70bfaf9a630548135d72f364f SHA512 4e487a0c1c6f55361b8ec673082d61efec1b27a32b19e2e599a344407737e5eea47ee8e2173b2f089e69a5638f99022870bb3ac57f31c16d5b4efd2858933fa8
 DIST arrow-1.0.1.tar.gz 102243 BLAKE2B bad601878bf692858db56967b456fa0c413faebcaaeee352ffe40933cfd915dca8dbbcc2ce4e4f37e03b393acdbfc94d49b8825664a9d1e246ae91a350e9cfcd SHA512 5500df4af6ac8c2858dc98a427a4b81d51d08a4bb44841ef03bbb3a57c9c9004a306e5d627a5202d5b7498dfb71c3602c1ec265666958a94b95861c901ecd79a
 DIST arrow-1.0.2.tar.gz 102330 BLAKE2B 2f7b737890aceceb265d2790d163c2d2325e78cc9045a95523b4e71d520f7d1fdb10efd18ccfc305bf10b27cf8f503a4e5bfc81897936b7c63600a3569ddd230 SHA512 a1ddfda75c84bd1e7708ba8368bbf672b1906bcd3a10cfb9ff867c72acd4da977089b4059b16de29c6112ce793e459f9eaa173f345bd25727c2dcbacbe235b05
+DIST arrow-1.0.3.tar.gz 102536 BLAKE2B 020b9b12a529f31c8054cfe98b99ee791cd1f2889422e4bb1b0bb6873ff4c1748951b63d20d2526af2bea3ff13b26d809b35eed36984d1063c35c334d76ee416 SHA512 f8da6574758ca1f319ed9d71e4fc6e44d3c3db0a6fe36c8868c3515ab789093660e3d57d6de60813cf2eb57c7a3a8bfe92facbb410a383528cb1fbc37d860b49
 EBUILD arrow-0.17.0.ebuild 701 BLAKE2B 54462cd2a6133d61697eeeda4df826f83510775759cd5a497f0ceaac9e18b9aa3969d877bae1f59ba5ba3ae2cd4e457a19b56a2bc4eccbcc9239d5cd07c4f711 SHA512 f57b5fb31a08c8a26d6b054da81fbf24516c29eda887b22b944da5955733b624c15f260901a094b8f2f7a5fb22b3183ee4ab91bf1d0b4b9333f3a5d80277db22
 EBUILD arrow-1.0.0.ebuild 789 BLAKE2B 7103cf7ba5f93bc9bdfe5ff77c046c959a0d26f3473626bc8c9d07a6248d643574b46d2fe167face9133bffad3b98f29b933fa901a4390cd29a92651c5e8a0b1 SHA512 5b14ba5897482c520d5eccacec6dd7470fd5787d8e0add04cc26ec91c01800ab90c0faaa680158bc484312d1443590af1917c53d6da2b41f8104ab19e435cfbe
 EBUILD arrow-1.0.1.ebuild 789 BLAKE2B 7103cf7ba5f93bc9bdfe5ff77c046c959a0d26f3473626bc8c9d07a6248d643574b46d2fe167face9133bffad3b98f29b933fa901a4390cd29a92651c5e8a0b1 SHA512 5b14ba5897482c520d5eccacec6dd7470fd5787d8e0add04cc26ec91c01800ab90c0faaa680158bc484312d1443590af1917c53d6da2b41f8104ab19e435cfbe
 EBUILD arrow-1.0.2.ebuild 789 BLAKE2B 7103cf7ba5f93bc9bdfe5ff77c046c959a0d26f3473626bc8c9d07a6248d643574b46d2fe167face9133bffad3b98f29b933fa901a4390cd29a92651c5e8a0b1 SHA512 5b14ba5897482c520d5eccacec6dd7470fd5787d8e0add04cc26ec91c01800ab90c0faaa680158bc484312d1443590af1917c53d6da2b41f8104ab19e435cfbe
+EBUILD arrow-1.0.3.ebuild 789 BLAKE2B 7103cf7ba5f93bc9bdfe5ff77c046c959a0d26f3473626bc8c9d07a6248d643574b46d2fe167face9133bffad3b98f29b933fa901a4390cd29a92651c5e8a0b1 SHA512 5b14ba5897482c520d5eccacec6dd7470fd5787d8e0add04cc26ec91c01800ab90c0faaa680158bc484312d1443590af1917c53d6da2b41f8104ab19e435cfbe
 MISC metadata.xml 386 BLAKE2B e605d85f1f0360d1a0ea7f78dbfd058597a0c1bf86a7464b3fcbf6951ee5faf5b39b82563d63b2922fe85330ba78e57291242b1260257e3f787f772aba99f91d SHA512 1aa5206e180fd0a879d97ae70ab8b8cbdc4e9196232bb4aca9c09e7fb87bca840a450ee55c046c8579b2bcb13386c8691e6ec970f64b8366e887780a42825851
diff --git a/dev-python/arrow/arrow-1.0.3.ebuild b/dev-python/arrow/arrow-1.0.3.ebuild
new file mode 100644
index 000000000000..81e5cb7ef66e
--- /dev/null
+++ b/dev-python/arrow/arrow-1.0.3.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_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Better dates and times for Python"
+HOMEPAGE="https://github.com/arrow-py/arrow/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/python-dateutil-2.7.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	' python3_7)"
+
+BDEPEND="
+	test? (
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+		dev-python/simplejson[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/addopts/d' tox.ini || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/autopep8/Manifest b/dev-python/autopep8/Manifest
index 51edae27565b..35d5a4c68014 100644
--- a/dev-python/autopep8/Manifest
+++ b/dev-python/autopep8/Manifest
@@ -1,6 +1,4 @@
-DIST autopep8-1.5.4.tar.gz 121471 BLAKE2B 4d9d4d0de94757573ad56636d92983d0bedfb2c7a3f25a47d8dba9c78c4e0752aa2ea0cd43f93d9cf37e434178cf89ad6c98b2af3a07f2490147c87a95ff610a SHA512 e613295d080149028361715f748fc9db1b7fc6212ca4e117594a10c3924a67eaad6ff8d94cfcf2c3dea087e0aa1ce6bcadc1b4eb3f07915daa5b002a09913f59
 DIST autopep8-1.5.5.tar.gz 117991 BLAKE2B 74e9bfed663d68f4a73088fccd879c538d40c564e7527b067d549a15361dfba2adcb853a8895fc61da50972f947ce23900f8067f5b8e715f73d6a80c6c27ef5b SHA512 9982271805131a7330d4a2a46eda65c05f079925393686f2df7eb92dc9e172003f9d788663cb8c0c8849dbae4f64c518c310eb65c3df308a12700abab084c39c
-EBUILD autopep8-1.5.4.ebuild 848 BLAKE2B 611f5c07e00f65d96e6b9937c3901a1e8eadbd5935305930f5cd51dda81d08161a936a826efc84e360b3200c642e3eb0e17fd13129596a8ba410734090bafaf9 SHA512 e2676d967fd0e231c6a10ea09f779bd9248d531e881d35c841f6062058d2bcb3a683745076db4c2a468752d7a15c5c5fa34e3c307fe3153cf63aac8aca9f1c37
-EBUILD autopep8-1.5.5.ebuild 852 BLAKE2B 31fa597daf60388aeb3e0bd8899e432509819048722dd88e29f771b088961dfd001e1855350e0fc87c5100eee3a04e9425b3ba4b90ff7a17723e8046981cc9ae SHA512 3f9340ec088580d6be94f60054740ed70a4c3f024a2f441c0c880d279892497749af8ea94074cbe10458eaba4652f7d2e33b9f008f85f5d7d624fdd47bb41150
+EBUILD autopep8-1.5.5.ebuild 848 BLAKE2B 611f5c07e00f65d96e6b9937c3901a1e8eadbd5935305930f5cd51dda81d08161a936a826efc84e360b3200c642e3eb0e17fd13129596a8ba410734090bafaf9 SHA512 e2676d967fd0e231c6a10ea09f779bd9248d531e881d35c841f6062058d2bcb3a683745076db4c2a468752d7a15c5c5fa34e3c307fe3153cf63aac8aca9f1c37
 EBUILD autopep8-9999.ebuild 852 BLAKE2B 8fff8cfdccb97703fa9d3503c9c3c649de315241d0791f1927161e3385cfa0945566b3ca78c04a56a147f2a4f7fbff603810b98bba1f6251c821bb6e004c7020 SHA512 13ca0fb94ff41a20f23e416438c90205123f522906732d6b43d759b87d70f5ba6d7479512d695440180c2a8b1744e7486d5d8f10a81cf1d77b23586fb5be564f
 MISC metadata.xml 403 BLAKE2B b84ac94eda3fac9977c2a936d006626b0fbc918c24d8f08f4b7620b778ea5ffec298945bbe6baf5353fc00888ee97c7f3c48493ab1c83ebe1586a9196da13a59 SHA512 7e2fd3edd7e82fa2474441a0e54ebbca38dd95f2dba7ba717fd839cf11bd21cb00d5ee56c7b8dc1b377e24a33b098d2932cc06de6c367e1c812b448a9395f18a
diff --git a/dev-python/autopep8/autopep8-1.5.4.ebuild b/dev-python/autopep8/autopep8-1.5.4.ebuild
deleted file mode 100644
index 861696f391a8..000000000000
--- a/dev-python/autopep8/autopep8-1.5.4.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
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Automatically formats Python code to conform to the PEP 8 style guide"
-HOMEPAGE="https://github.com/hhatto/autopep8 https://pypi.org/project/autopep8/"
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/hhatto/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 ~arm64 ~ia64 ppc sparc x86 ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND="
-	>=dev-python/pycodestyle-2.6.0[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]"
-BDEPEND="test? ( dev-python/pydiff[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests setup.py
diff --git a/dev-python/autopep8/autopep8-1.5.5.ebuild b/dev-python/autopep8/autopep8-1.5.5.ebuild
index daf7a5d94067..861696f391a8 100644
--- a/dev-python/autopep8/autopep8-1.5.5.ebuild
+++ b/dev-python/autopep8/autopep8-1.5.5.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 ~arm64 ~ia64 ppc sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="MIT"
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 667b004d5e35..d1ff2055045a 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -4,6 +4,12 @@ DIST boto3-1.17.17.tar.gz 347835 BLAKE2B 7861befb9275b0cf36235749369f65b69845ef7
 DIST boto3-1.17.18.tar.gz 347971 BLAKE2B 1390758e578763d0e8faba73e44e769224f6b3ff54e88798cd2d3a79c7d0fe5c3ef58a08e6a4aec70a7c3a64bbcbac22cd8471679951794fc1c0e48623f31008 SHA512 372baa35ddb770d65cd680544c9dd504a1e19b1052355b729f5b3ae8ef480ad4e250bef305671b1ec9741d953e813209398e8afe1bd396cc1e9c79221e34c629
 DIST boto3-1.17.19.tar.gz 348163 BLAKE2B 47b3f24dd7af7362fb37fb66bb333ac7a607b3d55790e47e3987d88f1ae09fe0a5bcafbbbe6245ecda378a8c56f6cfaa2a86c0b6e0dece58b0b6d2c819646a8c SHA512 ddfccb03335b3389a820a37e2e3ea40414291243291887be6dfd4243e43d918882e7386373578cf6474c5b8c5f592a15e650528b5cf61cb3b989522d4bff7ec1
 DIST boto3-1.17.20.tar.gz 348258 BLAKE2B b26a72e3861c8e45a11f4d8da3733cbdefe5e2b4a9328feac2e87a03c92e32efa0f896a60cc1a7e286ad3c93bfc07c1fd92612fed716607f7a408a837ec5954a SHA512 430d796ca12cf6497e70afcde7be5ab77910728bc0cc6cce74ceefc232d93e592d71864c33f403f75a8fb1bf67e7da9435e0f563d8d83b75d315c6ed50f779f1
+DIST boto3-1.17.21.tar.gz 348371 BLAKE2B 97799d4013e8ace6ebdfbb471c51743112e0d103fa1e13b947989c8da5b6517a2a6c088807519c735f5eb80ea1cedef3aae7aea5b2bd7b337af0ddc6744d91d9 SHA512 092e84c0e15a686634ae247295b5e525da605c9845950094525746df07e59082f36e90be66cb7726f6bc0ce4ac918aeb7e8f8efced98c1a002b8775d5ea68a04
+DIST boto3-1.17.22.tar.gz 348457 BLAKE2B 952650e5ebd51fe8f83ab9eeb0b9d76438865205cae75ff52fcb51aef38f2a3b61a0838dc7dbecac13f71774619a55b944bf8afc5894c93016c37b283e19cab0 SHA512 02a0e9f7723d61b5d21cc503f5dd3001aeb9433b989688728d5475e40852e84dfb0de6757f38c78b40b47d81321236aaf535aaa0b763deac8df9e4c1213c87b4
+DIST boto3-1.17.23.tar.gz 348518 BLAKE2B 53e918cbb39f4cc1a5fc9303817efe7fade551c0c6ff80ef4093871fe1c99a4e01bb9dbdf5815c4b46803a327878454971a88a8fa12053009a61afefacfe9b84 SHA512 f4e9ccfe4d7da3bec049f415e5236e00c701335b3eec842c2e6955e43b4b1ede834b116b6299f43c3cd6eae3d2496ffb58017b64730a3bc8c1913d603c9eadf9
+DIST boto3-1.17.24.tar.gz 349323 BLAKE2B 41a15fb92218d9aa936300054805b4cda52f373165e6d9f1f0b9f1edc0035e95a1134a407dd740856f8d28878e77ea669e6589ca20ab7af616390fda575d661c SHA512 57bc612e1f86edd2264364ad35c4a334a0ed98173d4f1e6808dce0b3c65dda4eb550fa231520aa67259a185d37e2b9e61e5ab4e1d7c41f7a0f22f270d1a07867
+DIST boto3-1.17.25.tar.gz 349475 BLAKE2B 272c5bebed211d015638a652109f2b56475e0d682ff585915061a495ce26ca6c12a5e844f9d4b73fca105c2f40e3fe7c1aa5bee045af284f45e74899cde3fde2 SHA512 d24c118a4af747360f226c9c6e98e26ad3dacf34f13dadb084fef4e7404d1141c66cf5d7074eeea2c792b134e7b83174bc0be0c387c478fd61de646118b41b9e
+DIST boto3-1.17.26.tar.gz 349529 BLAKE2B 8510b229aea7b725c6286772dff6d54a9df684eac7e455929c059fd02919238335c88af5c655e89bfb5821ac4b70415c8dbd2c549563d008823104d6d54088be SHA512 5ceb9dc557796471f4d582bdf47614a078285a83f9463acb92e5e59e9f82dbca379bf02c2288cf38cb5741f7860d6c8b23872305209d8a4ece697943cd06932d
 DIST boto3-1.17.7.tar.gz 346682 BLAKE2B 08c06dda1d59b4f555cad075673917b38cbf9ad8d0037f66027b17076e60b4d5fd32a93e088635320ebc3226a9cd8809c9208ec84f8588c26a77766b21dbee98 SHA512 2ba1817575c4a64c232c84a75a9d3b0db1de8634ded9aa31844930a82ccf4611805c6dd31b2e4d36cc9a2cc1813d233b4d7366305eaf28efd46a3b843d3c2993
 EBUILD boto3-1.16.63.ebuild 1353 BLAKE2B 66c5372ceee1dbf124e71a2a2e6c5b885571f36e0ad9f409865ea83916dc2ed0d8826a01f1bdcace97a63d47253a059461e9d994c9e28f507489667c5ee796ac SHA512 7d57c590630a3b5a8ef86e66de7365c9c77c3bbd4dbbac9d376cec3cbace41e9f75dadbe5a7402f2fbe3a7a586391955d1aaa81269c5bb9bcf4f49ae54f54787
 EBUILD boto3-1.17.12.ebuild 1355 BLAKE2B e54b5b065e8d06942f0670579e3c0fce789aba2c27b485f9dc87888ead8bbcea0d519c2968a100e1bf309a14127c409396fd3387cb201395cc7544959705d801 SHA512 d82769ad3ccd34a04ece5b63866451d593fe6166d44a50b019ed952dc5e7c0ad7bd2c25513fc7a7b8149ac5c537cf7cac9728bff5504793cad0b8c64bef8ae6d
@@ -11,6 +17,12 @@ EBUILD boto3-1.17.17.ebuild 1355 BLAKE2B e54b5b065e8d06942f0670579e3c0fce789aba2
 EBUILD boto3-1.17.18.ebuild 1355 BLAKE2B e54b5b065e8d06942f0670579e3c0fce789aba2c27b485f9dc87888ead8bbcea0d519c2968a100e1bf309a14127c409396fd3387cb201395cc7544959705d801 SHA512 d82769ad3ccd34a04ece5b63866451d593fe6166d44a50b019ed952dc5e7c0ad7bd2c25513fc7a7b8149ac5c537cf7cac9728bff5504793cad0b8c64bef8ae6d
 EBUILD boto3-1.17.19.ebuild 1355 BLAKE2B e54b5b065e8d06942f0670579e3c0fce789aba2c27b485f9dc87888ead8bbcea0d519c2968a100e1bf309a14127c409396fd3387cb201395cc7544959705d801 SHA512 d82769ad3ccd34a04ece5b63866451d593fe6166d44a50b019ed952dc5e7c0ad7bd2c25513fc7a7b8149ac5c537cf7cac9728bff5504793cad0b8c64bef8ae6d
 EBUILD boto3-1.17.20.ebuild 1355 BLAKE2B e54b5b065e8d06942f0670579e3c0fce789aba2c27b485f9dc87888ead8bbcea0d519c2968a100e1bf309a14127c409396fd3387cb201395cc7544959705d801 SHA512 d82769ad3ccd34a04ece5b63866451d593fe6166d44a50b019ed952dc5e7c0ad7bd2c25513fc7a7b8149ac5c537cf7cac9728bff5504793cad0b8c64bef8ae6d
+EBUILD boto3-1.17.21.ebuild 1355 BLAKE2B e54b5b065e8d06942f0670579e3c0fce789aba2c27b485f9dc87888ead8bbcea0d519c2968a100e1bf309a14127c409396fd3387cb201395cc7544959705d801 SHA512 d82769ad3ccd34a04ece5b63866451d593fe6166d44a50b019ed952dc5e7c0ad7bd2c25513fc7a7b8149ac5c537cf7cac9728bff5504793cad0b8c64bef8ae6d
+EBUILD boto3-1.17.22.ebuild 1355 BLAKE2B e54b5b065e8d06942f0670579e3c0fce789aba2c27b485f9dc87888ead8bbcea0d519c2968a100e1bf309a14127c409396fd3387cb201395cc7544959705d801 SHA512 d82769ad3ccd34a04ece5b63866451d593fe6166d44a50b019ed952dc5e7c0ad7bd2c25513fc7a7b8149ac5c537cf7cac9728bff5504793cad0b8c64bef8ae6d
+EBUILD boto3-1.17.23.ebuild 1355 BLAKE2B e54b5b065e8d06942f0670579e3c0fce789aba2c27b485f9dc87888ead8bbcea0d519c2968a100e1bf309a14127c409396fd3387cb201395cc7544959705d801 SHA512 d82769ad3ccd34a04ece5b63866451d593fe6166d44a50b019ed952dc5e7c0ad7bd2c25513fc7a7b8149ac5c537cf7cac9728bff5504793cad0b8c64bef8ae6d
+EBUILD boto3-1.17.24.ebuild 1355 BLAKE2B e54b5b065e8d06942f0670579e3c0fce789aba2c27b485f9dc87888ead8bbcea0d519c2968a100e1bf309a14127c409396fd3387cb201395cc7544959705d801 SHA512 d82769ad3ccd34a04ece5b63866451d593fe6166d44a50b019ed952dc5e7c0ad7bd2c25513fc7a7b8149ac5c537cf7cac9728bff5504793cad0b8c64bef8ae6d
+EBUILD boto3-1.17.25.ebuild 1355 BLAKE2B e54b5b065e8d06942f0670579e3c0fce789aba2c27b485f9dc87888ead8bbcea0d519c2968a100e1bf309a14127c409396fd3387cb201395cc7544959705d801 SHA512 d82769ad3ccd34a04ece5b63866451d593fe6166d44a50b019ed952dc5e7c0ad7bd2c25513fc7a7b8149ac5c537cf7cac9728bff5504793cad0b8c64bef8ae6d
+EBUILD boto3-1.17.26.ebuild 1355 BLAKE2B e54b5b065e8d06942f0670579e3c0fce789aba2c27b485f9dc87888ead8bbcea0d519c2968a100e1bf309a14127c409396fd3387cb201395cc7544959705d801 SHA512 d82769ad3ccd34a04ece5b63866451d593fe6166d44a50b019ed952dc5e7c0ad7bd2c25513fc7a7b8149ac5c537cf7cac9728bff5504793cad0b8c64bef8ae6d
 EBUILD boto3-1.17.7.ebuild 1355 BLAKE2B e54b5b065e8d06942f0670579e3c0fce789aba2c27b485f9dc87888ead8bbcea0d519c2968a100e1bf309a14127c409396fd3387cb201395cc7544959705d801 SHA512 d82769ad3ccd34a04ece5b63866451d593fe6166d44a50b019ed952dc5e7c0ad7bd2c25513fc7a7b8149ac5c537cf7cac9728bff5504793cad0b8c64bef8ae6d
 EBUILD boto3-9999.ebuild 1350 BLAKE2B 93fe4639ced27cf1ba9a359e276c7fa8f88642fc5e1c086712a4b167cce520ef5cb0a499303ca0c544924b22d37b8928edbc9989605e792bd0d8354d772349c6 SHA512 8140e73da7a57210df954e46c9cbb4f0a76beb2817ce4f1799bd58da71eef1a032cc80dec8c25de2e47f827fe0b015bab0fe237a30ba0cc8bb360de3a60f19ee
 MISC metadata.xml 711 BLAKE2B da283ea39f4540ad2445b1b88a12509a384e2f2a2ce0ffbc3845a475015c108de69b9e9868a0e43c0fb8c8b71a6ce498ece9676b0f623ed41b89efd92790be80 SHA512 80202cdc324464906b9ae7eae889d7d00c7c773aa5c49d22d8faab7deb621bbfe31cd4e66b289eadc7065e091b8615b284760736d915aa16ee15cf1c7f9e6b5d
diff --git a/dev-python/boto3/boto3-1.17.21.ebuild b/dev-python/boto3/boto3-1.17.21.ebuild
new file mode 100644
index 000000000000..74b9170a9119
--- /dev/null
+++ b/dev-python/boto3/boto3-1.17.21.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_{7..9} )
+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/boto3/boto3-1.17.22.ebuild b/dev-python/boto3/boto3-1.17.22.ebuild
new file mode 100644
index 000000000000..74b9170a9119
--- /dev/null
+++ b/dev-python/boto3/boto3-1.17.22.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_{7..9} )
+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/boto3/boto3-1.17.23.ebuild b/dev-python/boto3/boto3-1.17.23.ebuild
new file mode 100644
index 000000000000..74b9170a9119
--- /dev/null
+++ b/dev-python/boto3/boto3-1.17.23.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_{7..9} )
+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/boto3/boto3-1.17.24.ebuild b/dev-python/boto3/boto3-1.17.24.ebuild
new file mode 100644
index 000000000000..74b9170a9119
--- /dev/null
+++ b/dev-python/boto3/boto3-1.17.24.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_{7..9} )
+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/boto3/boto3-1.17.25.ebuild b/dev-python/boto3/boto3-1.17.25.ebuild
new file mode 100644
index 000000000000..74b9170a9119
--- /dev/null
+++ b/dev-python/boto3/boto3-1.17.25.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_{7..9} )
+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/boto3/boto3-1.17.26.ebuild b/dev-python/boto3/boto3-1.17.26.ebuild
new file mode 100644
index 000000000000..74b9170a9119
--- /dev/null
+++ b/dev-python/boto3/boto3-1.17.26.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_{7..9} )
+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 c262b50123e7..1597318b1876 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -6,6 +6,12 @@ DIST botocore-1.20.17.tar.gz 7483893 BLAKE2B 5a9ea5c1d3bc5caa91ea939943d86236d58
 DIST botocore-1.20.18.tar.gz 7485852 BLAKE2B df22d0c74796ddc5c7046803039423e31784a2221556a0cb224f0a006870bb4406cf3e576fac1cc65457da0267dbed92159d98d4198c3beef1b995ef7565f06b SHA512 e1881ca20ffc0b3eaf59635a321f0191775b4c62f4aed4d8ada54dee6066ba85fa1af00bea00949ccb245dce4e1279eb1d120237da097420d95e1c3c95c50d6f
 DIST botocore-1.20.19.tar.gz 7479977 BLAKE2B 4193cb9975dcde134450968ffcf4cc07b7aece4bbd0d8306483f24eaba63c891cb88d0af640f602b03eb400e5815eb977fca0da927dae0eec82f2922e6c185da SHA512 f4d4ffb88edfb95a13b637c928701966d7903bf50c493926674d8c1c0e6004fa6ec2d9b63402fca5829af3d381ad04221c4154a08e2a0cab065110ab65d44fc1
 DIST botocore-1.20.20.tar.gz 7484162 BLAKE2B c9b14936ca8d59070cc99ec56fb7124c2c162f8b3473e3049f57218e41df8bc0bf20172bd65067d504e6317c917573e16d456169564d93dd969e69e87944fdb3 SHA512 aff520c93bea5b600d1c0decd20d49208b2dbf7113f435a633b4b4c68dd0dc46f04079c4e38132d03e5f9aed7a124bcdaaae55ed0126c002acd30954e9609352
+DIST botocore-1.20.21.tar.gz 7489798 BLAKE2B edaea4e14515e5ce5d1a84dcc466f9cc2720f6cf996d61b1ee9fbdb4164849fd3f22fb7321e007b02b7348e6134a20623be4768875de7f7f811e7ea4591197cf SHA512 41086b8f8dac26db5ffdc8d60969f5c2accc756535323d645e44456bdf6af71929211e31e3d73b6fb3ec0367752f8646dbbed2abc0f147b4b34ad462ecd86c48
+DIST botocore-1.20.22.tar.gz 7499474 BLAKE2B 14394f8de4de39d8073548409f08615452a1d3059a13287549e16ab8815dbf1ac975e0c116ebcbe7acb86055df29ca8d9f2e251f56386ed3cf15922eee9e5f1f SHA512 1c67de2456d5933a67966b0497492acec2954a2a397c856f54d06aa642ee286b8975a52d0df6b2b814bc817ae129b9965b0d5ba6711c75585b0e2127bcde823f
+DIST botocore-1.20.23.tar.gz 7499542 BLAKE2B abcc28ec69d30ddff06ac2e2f3e2c0dcd7311c6a4ba676c9d11059fa5f66de3cebf93b37b88da6204f74ce77e3dbf9da6829be7f9f0c62abb14310a6a2863c34 SHA512 d44d5619ffb288c99f9c5638ab84466a5776df986525a258349264697fd85842b25f67b177fb5a5cf87a5aade81fbbc87b731d4e7a8ff9156cfe12814fc915ec
+DIST botocore-1.20.24.tar.gz 7503493 BLAKE2B fdc1de907a8201ecc63435b2f3cef38ec40ac8cb6b23bf20140db3d5def46dae3a6d66ee0f1cf268bfa63fa9cbcd7f0835570a91b3c538c3303350499e3a1964 SHA512 26ab23f2b3fb8c5b6b0fbd3045761ae81b4abf07c3457307a3b79f7b2a3840b5f1bca5ca669aa98d2465c9c39bb1250f93f2254bace5bfc75849745804f29061
+DIST botocore-1.20.25.tar.gz 7508526 BLAKE2B 244b578cc0596e4fc6b225cd29d0b5ca2e42159dcc506ff3f0a730e3602166ca52bb1a4a2ea8049b86fe6409ac521e30d1f0ff02deec8550a4187579b9a43f9f SHA512 010aac3c0021c7406471cae2c0b13a33dde620b2d7e5df96170971459b9f425d9ffb2a3ad08a650c3097924ff12b34354983ef36336e2afd0172fc3a73f988e7
+DIST botocore-1.20.26.tar.gz 7510615 BLAKE2B bc8716642c09ec74f7d057bcd9608cbbad98fcb4caf09e0684a03744fda81c0483aebaa4c85e416dac7d54d0f2804aba59f15e714211b59edd824cd3067ed412 SHA512 30ce061c1b7e1830caaf7382352180f9316f8d1d806269726ef3bc00eeb7a3fc7689e43eb4666fe700ca2de564b427c4916289a555aca0138a630059462216c9
 DIST botocore-1.20.7.tar.gz 7458254 BLAKE2B 8b9a1edda73e2564d3a3d67c6b3542d1ec9372403cb4d88396e58dfbcb5987821f278f2757e079e1ab32e03243ed3a6d1023ecc591b965512b3af5e2d43ea7b0 SHA512 9b023a31be866a50b94017a28aca40b5fe2e720959c928a3fd93db96041f3886049717f50461222a09572c0c56c5961a4614b80e400e4fa6d8b3ff4b4ab681df
 EBUILD botocore-1.19.63.ebuild 1494 BLAKE2B a255e29174ab1e24312ca7e0ac20a84809bcec4671fc7d885f50426bbb7f6fcc01cf5ac1ac28eb212c755db83c67cc4407d06044d1e1af9f0edc57bfe889d140 SHA512 74ca6dc19bec8ec8fe9b9721a859de82e974bdd6a8da2f7d9f757c56f4df040927b99f5406aaf91ef84c3daf8c600debf697edaf38972c508c316ae4d279a075
 EBUILD botocore-1.20.12.ebuild 1496 BLAKE2B 3b9c7b12c0a7037482b3e60ef95ba87c8659a9d5fb52b562e0a2ad02ce44e84db9b3aca408ede04198c0c58edd4e4e91b8f1b21642493ffbe3b8b6d1d76e1ef2 SHA512 c0a226f08044b1a2c7f69becac5de9b3ad942ce3cefef699f09f176d797bb24f7dc76d3b5795eddff97f0ca52459c3d876a3a67328b74670185e12b80652ae55
@@ -13,6 +19,12 @@ EBUILD botocore-1.20.17.ebuild 1496 BLAKE2B 3b9c7b12c0a7037482b3e60ef95ba87c8659
 EBUILD botocore-1.20.18.ebuild 1496 BLAKE2B 3b9c7b12c0a7037482b3e60ef95ba87c8659a9d5fb52b562e0a2ad02ce44e84db9b3aca408ede04198c0c58edd4e4e91b8f1b21642493ffbe3b8b6d1d76e1ef2 SHA512 c0a226f08044b1a2c7f69becac5de9b3ad942ce3cefef699f09f176d797bb24f7dc76d3b5795eddff97f0ca52459c3d876a3a67328b74670185e12b80652ae55
 EBUILD botocore-1.20.19.ebuild 1496 BLAKE2B 3b9c7b12c0a7037482b3e60ef95ba87c8659a9d5fb52b562e0a2ad02ce44e84db9b3aca408ede04198c0c58edd4e4e91b8f1b21642493ffbe3b8b6d1d76e1ef2 SHA512 c0a226f08044b1a2c7f69becac5de9b3ad942ce3cefef699f09f176d797bb24f7dc76d3b5795eddff97f0ca52459c3d876a3a67328b74670185e12b80652ae55
 EBUILD botocore-1.20.20.ebuild 1496 BLAKE2B 3b9c7b12c0a7037482b3e60ef95ba87c8659a9d5fb52b562e0a2ad02ce44e84db9b3aca408ede04198c0c58edd4e4e91b8f1b21642493ffbe3b8b6d1d76e1ef2 SHA512 c0a226f08044b1a2c7f69becac5de9b3ad942ce3cefef699f09f176d797bb24f7dc76d3b5795eddff97f0ca52459c3d876a3a67328b74670185e12b80652ae55
+EBUILD botocore-1.20.21.ebuild 1496 BLAKE2B 3b9c7b12c0a7037482b3e60ef95ba87c8659a9d5fb52b562e0a2ad02ce44e84db9b3aca408ede04198c0c58edd4e4e91b8f1b21642493ffbe3b8b6d1d76e1ef2 SHA512 c0a226f08044b1a2c7f69becac5de9b3ad942ce3cefef699f09f176d797bb24f7dc76d3b5795eddff97f0ca52459c3d876a3a67328b74670185e12b80652ae55
+EBUILD botocore-1.20.22.ebuild 1496 BLAKE2B 3b9c7b12c0a7037482b3e60ef95ba87c8659a9d5fb52b562e0a2ad02ce44e84db9b3aca408ede04198c0c58edd4e4e91b8f1b21642493ffbe3b8b6d1d76e1ef2 SHA512 c0a226f08044b1a2c7f69becac5de9b3ad942ce3cefef699f09f176d797bb24f7dc76d3b5795eddff97f0ca52459c3d876a3a67328b74670185e12b80652ae55
+EBUILD botocore-1.20.23.ebuild 1496 BLAKE2B 3b9c7b12c0a7037482b3e60ef95ba87c8659a9d5fb52b562e0a2ad02ce44e84db9b3aca408ede04198c0c58edd4e4e91b8f1b21642493ffbe3b8b6d1d76e1ef2 SHA512 c0a226f08044b1a2c7f69becac5de9b3ad942ce3cefef699f09f176d797bb24f7dc76d3b5795eddff97f0ca52459c3d876a3a67328b74670185e12b80652ae55
+EBUILD botocore-1.20.24.ebuild 1496 BLAKE2B 3b9c7b12c0a7037482b3e60ef95ba87c8659a9d5fb52b562e0a2ad02ce44e84db9b3aca408ede04198c0c58edd4e4e91b8f1b21642493ffbe3b8b6d1d76e1ef2 SHA512 c0a226f08044b1a2c7f69becac5de9b3ad942ce3cefef699f09f176d797bb24f7dc76d3b5795eddff97f0ca52459c3d876a3a67328b74670185e12b80652ae55
+EBUILD botocore-1.20.25.ebuild 1496 BLAKE2B 3b9c7b12c0a7037482b3e60ef95ba87c8659a9d5fb52b562e0a2ad02ce44e84db9b3aca408ede04198c0c58edd4e4e91b8f1b21642493ffbe3b8b6d1d76e1ef2 SHA512 c0a226f08044b1a2c7f69becac5de9b3ad942ce3cefef699f09f176d797bb24f7dc76d3b5795eddff97f0ca52459c3d876a3a67328b74670185e12b80652ae55
+EBUILD botocore-1.20.26.ebuild 1496 BLAKE2B 3b9c7b12c0a7037482b3e60ef95ba87c8659a9d5fb52b562e0a2ad02ce44e84db9b3aca408ede04198c0c58edd4e4e91b8f1b21642493ffbe3b8b6d1d76e1ef2 SHA512 c0a226f08044b1a2c7f69becac5de9b3ad942ce3cefef699f09f176d797bb24f7dc76d3b5795eddff97f0ca52459c3d876a3a67328b74670185e12b80652ae55
 EBUILD botocore-1.20.7.ebuild 1496 BLAKE2B 3b9c7b12c0a7037482b3e60ef95ba87c8659a9d5fb52b562e0a2ad02ce44e84db9b3aca408ede04198c0c58edd4e4e91b8f1b21642493ffbe3b8b6d1d76e1ef2 SHA512 c0a226f08044b1a2c7f69becac5de9b3ad942ce3cefef699f09f176d797bb24f7dc76d3b5795eddff97f0ca52459c3d876a3a67328b74670185e12b80652ae55
 EBUILD botocore-9999.ebuild 1606 BLAKE2B dd2cf59015a5d45b8b0d6bf20e711d982d5314d7aacd20ed74f4c93f6d77a2fd753cf97214b7b308ba5a32afeaa32e170195db7269509fc019a0861cd3d5879e SHA512 1363331284892dd6675d5f5a5ad484572ffbc25f262f37eb14688302120a37e41b87ab35954253eca6aaad6c73f7b5221c1cd25a91baee4cb9daf53f0c48cf4a
 MISC metadata.xml 717 BLAKE2B 6b5923518aebfebb4ac5de56ccc51b6d665b81870d4cdd915265ddef063db42dc9b0a4814c8cec71b44cb1aec7050797f6e2ec8f2a499b6c2e16d9cf312f7fb2 SHA512 fef7663fe63c373d775e419b5b5cfc63a896adf32a177e856c42ebf1c7574b3956fa989c30428d9ce69b19ecf68e553f19885fef46cbcaf7b434e27b15022b54
diff --git a/dev-python/botocore/botocore-1.20.21.ebuild b/dev-python/botocore/botocore-1.20.21.ebuild
new file mode 100644
index 000000000000..4e5d698e619b
--- /dev/null
+++ b/dev-python/botocore/botocore-1.20.21.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+
+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"
+)
+
+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/botocore/botocore-1.20.22.ebuild b/dev-python/botocore/botocore-1.20.22.ebuild
new file mode 100644
index 000000000000..4e5d698e619b
--- /dev/null
+++ b/dev-python/botocore/botocore-1.20.22.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+
+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"
+)
+
+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/botocore/botocore-1.20.23.ebuild b/dev-python/botocore/botocore-1.20.23.ebuild
new file mode 100644
index 000000000000..4e5d698e619b
--- /dev/null
+++ b/dev-python/botocore/botocore-1.20.23.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+
+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"
+)
+
+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/botocore/botocore-1.20.24.ebuild b/dev-python/botocore/botocore-1.20.24.ebuild
new file mode 100644
index 000000000000..4e5d698e619b
--- /dev/null
+++ b/dev-python/botocore/botocore-1.20.24.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+
+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"
+)
+
+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/botocore/botocore-1.20.25.ebuild b/dev-python/botocore/botocore-1.20.25.ebuild
new file mode 100644
index 000000000000..4e5d698e619b
--- /dev/null
+++ b/dev-python/botocore/botocore-1.20.25.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+
+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"
+)
+
+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/botocore/botocore-1.20.26.ebuild b/dev-python/botocore/botocore-1.20.26.ebuild
new file mode 100644
index 000000000000..4e5d698e619b
--- /dev/null
+++ b/dev-python/botocore/botocore-1.20.26.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+
+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"
+)
+
+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/braintree/Manifest b/dev-python/braintree/Manifest
index 2fe35255c37e..f68fc6e43eba 100644
--- a/dev-python/braintree/Manifest
+++ b/dev-python/braintree/Manifest
@@ -1,3 +1,3 @@
-DIST braintree-4.4.0.tar.gz 75010 BLAKE2B 5f59960117a59ae12d51e47bbeecfa9422eda5d2fe29456eaac3a37720878d0e853bbd2bc9d4bae2df4008da8dd80e4c5cbe9b8708734e2d112f7c9482946a06 SHA512 b5ad359ad4dd0459b1468b7281495d4f9eb781d7788060cfdcd0b9c9eb877da07bbe227f149ac07f6445164d25932bb2cfb966bd36cb1402eb8182df6869a489
-EBUILD braintree-4.4.0.ebuild 476 BLAKE2B cb5e40e22abbc6833831896c19c7accc490cac8dc0dea84f9eade48d19f51619af6e4b8c56cde0dc99473b54f96d9a36e31f24bdec66b60a65033ab383a5daab SHA512 8d334422b6bb1f1262f82103b3721e6f35e18c791f21efbe4906a7cf13e21442f22b4764705f5fc3daa19a6241cff00e5e9be44512cadc3b314d5a30a214bf22
+DIST braintree-4.6.0.tar.gz 76142 BLAKE2B 1f0079d76561bb9c0b2d4f66c42ce23eaece56ab5965abd075d7fd9ee7620b468c6b2c7003883a8089ab7b7419a12c89dcb01f4f54d0dd44cd8c5ccff7e8a0e8 SHA512 96a376bccf3722c984cd342c58d4f8f162beeca97f92ecfbea03300a527a2415b5de1bd1d4160b22033500ac90c4fb611177c2c6dd0a1e5e7d63634234d204c7
+EBUILD braintree-4.6.0.ebuild 511 BLAKE2B 943f2ca4244489b44deaaa5bff2838b654f8de6ee84cb2399103aa019a0e50efc03ddbb01a7477f72c73f337cf606bbc6688a163b3601769c22bc3caceb7588e SHA512 f5674655372b8abaa556872dab5f259e69a16bda711823673379d170b096419fcc526832356f1f5f6fa2ce45e6fc76ea87a40bb19ed9d8a185aebf6c5f771d67
 MISC metadata.xml 382 BLAKE2B 6e2bc46cc7741039be9bec7e3ee5d38d03531890cee3b14061fc53dde71d4113084b10f2589a1dfe5dc638811acdb24e87136024cf42ac462d1c0b8b107270a6 SHA512 dfa274acdb16be755f63670de5331a557010f3b63e97962a052999c4712328bc298bdbe0f6322067eae37784b50a479c8c3083b3316a6b8c5560a8c2b7c5216a
diff --git a/dev-python/braintree/braintree-4.4.0.ebuild b/dev-python/braintree/braintree-4.6.0.ebuild
index 686add5196d7..8a1849a5e417 100644
--- a/dev-python/braintree/braintree-4.4.0.ebuild
+++ b/dev-python/braintree/braintree-4.6.0.ebuild
@@ -1,9 +1,10 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..8} )
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS="no"
 inherit distutils-r1
 
 DESCRIPTION="Braintree Python Library"
diff --git a/dev-python/cfn-python-lint/Manifest b/dev-python/cfn-python-lint/Manifest
index 7ff71907c194..29e3e9c8ed4c 100644
--- a/dev-python/cfn-python-lint/Manifest
+++ b/dev-python/cfn-python-lint/Manifest
@@ -2,7 +2,11 @@ AUX cfn-python-lint-0.30.1-tests.patch 621 BLAKE2B 7b4d457c56f32799c0da0e1e1f655
 DIST cfn-python-lint-0.44.5.tar.gz 5657765 BLAKE2B e35fca9cf8232bc802666333184a52b544bad5858ec8e4c16fe435ea5c421ca25296bb9d8a3bf351276dc1e36ee3101cb0c950ca9d8ce87f5dd2f64cf347ba30 SHA512 e23e415f7d5dd3933e70e7c5b0d9d001bc9aefd0ec67ba9245b4cecbad0c5470376439c12d2cd532eb39e900a325de52c4856351bba2ca27cdc0760ed091ccca
 DIST cfn-python-lint-0.44.7.tar.gz 5711448 BLAKE2B b38b90ca7d181dc655b07a0151acad6a22ed1a0d34223cb813c3257cceb0f9ef5ca175cd4992a9d72a843c2b40b0830c433cbbe8b71550c9c9c482ea62783142 SHA512 a4ed91383f80e437338f7afee55de5e7cb0f3f8690c4324de77f2d35a665e5947f07945449aedddbd9d996270495ee63418e38b97639c4b7852b1fe50e8ce6e4
 DIST cfn-python-lint-0.46.0.tar.gz 6287874 BLAKE2B 7ec2665596b50697c95e32b40f736822d718d4682d3a41f72b94e45f1b42a386d2d44cb5447826010c01ccd8da655e394b7379764e5e8ca2a79db22c274cc033 SHA512 b87751a719fc037dca2533bb8e14a483bc85d4460b73c7ef2a2d2fff188bd1c611d9828dbf13eca16781e21124123a85c723054bc460243df8ee9fcba5d8e104
+DIST cfn-python-lint-0.47.0.tar.gz 6326333 BLAKE2B 450190ab374f491c034a93edfdb0d5c006c8468deee285dba676f055557f4017ecbfa68ffb10a052ea2d46aa4c6d94870261065e26bdd4a753978fca76778914 SHA512 b2349730993758578226253ae6ab942658bc3d9326d75ad1ec029ce093112697fb2a15ee63377dff210a33111de9940b391d276c0ff4894a2b68e545f1783fbb
+DIST cfn-python-lint-0.47.1.tar.gz 6446725 BLAKE2B b4e2ce6bfd51a919f93eb5a13d5318392b9e3483d6e8d4645f7c67b82e42075d047b9e565e488413dad9196f79a15b01639af158b0335f0c9360815fd276324b SHA512 8f568d29e0857697fbb82962b6864bdfed930f052fd5f125e993222ebc17bd325ffea373261c0dda5cb899af3a8e4dcf9fbf8d06d32182e1679c491943811bf8
 EBUILD cfn-python-lint-0.44.5.ebuild 1339 BLAKE2B ebbbe1a8c2e871603c4ec619274dc30743b5995150e8641ddaa3bd0c652252e900ed9ec7858098f3b9ba9cc024b328ff7bb0816d1d4dab0690ec4e00fe19be0e SHA512 d543235b8cf214f1388adb6e1c4b3067659fd1dea232c733a595ad0292eed5769bd7534da0d548408118caeaa3348247306a30b37484f28f28c7af5955978865
 EBUILD cfn-python-lint-0.44.7.ebuild 1341 BLAKE2B 74f6c99a1b76c9f67bfb2280154e08b5cb2e1d2e6119a18c9131852fe44cde34b064a5c44a9c960f4d4420df27f09c158efc7f711def911277a1b3898b9ca268 SHA512 8f30cae0e21f0728416c4cfa5951d79e6e3002acc30f09c5a368114bc3abb33959b4ded0a7da46d4998324adc67f168d379490386b46bda7550ed3f2fcc7d594
 EBUILD cfn-python-lint-0.46.0.ebuild 1485 BLAKE2B c6cd9d6d148a185c3da1fd878f3cd0dbf5b6d7cd1fe4edcbaa559064fa749bef285e353ae24d80839b71ce705a9892747d8479dd5669103ca83959d709d70eb3 SHA512 b48edc2e41dae3629d694cd23e379093158d0e2ee46c458359def8a22439b031f055bb8813b05ca62cbfe63b6f59d071024b376ac573e8d15df7f462af0f4840
+EBUILD cfn-python-lint-0.47.0.ebuild 1485 BLAKE2B c6cd9d6d148a185c3da1fd878f3cd0dbf5b6d7cd1fe4edcbaa559064fa749bef285e353ae24d80839b71ce705a9892747d8479dd5669103ca83959d709d70eb3 SHA512 b48edc2e41dae3629d694cd23e379093158d0e2ee46c458359def8a22439b031f055bb8813b05ca62cbfe63b6f59d071024b376ac573e8d15df7f462af0f4840
+EBUILD cfn-python-lint-0.47.1.ebuild 1485 BLAKE2B c6cd9d6d148a185c3da1fd878f3cd0dbf5b6d7cd1fe4edcbaa559064fa749bef285e353ae24d80839b71ce705a9892747d8479dd5669103ca83959d709d70eb3 SHA512 b48edc2e41dae3629d694cd23e379093158d0e2ee46c458359def8a22439b031f055bb8813b05ca62cbfe63b6f59d071024b376ac573e8d15df7f462af0f4840
 MISC metadata.xml 596 BLAKE2B c9937cb001e177c18c65bff8b70940d241e54f58aae3818071510f1c73540fcac6c532c8700b4904d4e2c9382f8a5288a2cb8745e174b8ac0a4edfe114d78ff5 SHA512 40c20431d8132ee97311a23bba87d6b408297410573c191f8fc43282bd156884adc25b6ceb6f2168d3456d535c4d82fb3473dd9025bda276f6aad829f68a8e37
diff --git a/dev-python/cfn-python-lint/cfn-python-lint-0.47.0.ebuild b/dev-python/cfn-python-lint/cfn-python-lint-0.47.0.ebuild
new file mode 100644
index 000000000000..c3edcec5c4eb
--- /dev/null
+++ b/dev-python/cfn-python-lint/cfn-python-lint-0.47.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1
+
+DESCRIPTION="CloudFormation Linter"
+HOMEPAGE="https://pypi.org/project/cfn-lint/ https://github.com/aws-cloudformation/cfn-python-lint"
+SRC_URI="https://github.com/aws-cloudformation/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/aws-sam-translator-1.25.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/importlib_resources[${PYTHON_USEDEP}]
+	' python3_6)
+	dev-python/jsonpatch[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
+	dev-python/junit-xml[${PYTHON_USEDEP}]
+	dev-python/networkx[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.15.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.11[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests --install unittest
+
+PATCHES=(
+	"${FILESDIR}/cfn-python-lint-0.30.1-tests.patch"
+)
+
+src_prepare() {
+	# unpin the deps
+	sed -e 's:~=[0-9.]*::' -i setup.py || die
+	# requires git checkout
+	sed -e 's:test_update_docs:_&:' \
+		-i test/unit/module/maintenance/test_update_documentation.py || die
+	# requires Internet
+	sed -e 's:test_update_resource_specs_python:_&:' \
+		-i test/unit/module/maintenance/test_update_resource_specs.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/cfn-python-lint/cfn-python-lint-0.47.1.ebuild b/dev-python/cfn-python-lint/cfn-python-lint-0.47.1.ebuild
new file mode 100644
index 000000000000..c3edcec5c4eb
--- /dev/null
+++ b/dev-python/cfn-python-lint/cfn-python-lint-0.47.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1
+
+DESCRIPTION="CloudFormation Linter"
+HOMEPAGE="https://pypi.org/project/cfn-lint/ https://github.com/aws-cloudformation/cfn-python-lint"
+SRC_URI="https://github.com/aws-cloudformation/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/aws-sam-translator-1.25.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/importlib_resources[${PYTHON_USEDEP}]
+	' python3_6)
+	dev-python/jsonpatch[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
+	dev-python/junit-xml[${PYTHON_USEDEP}]
+	dev-python/networkx[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.15.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.11[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests --install unittest
+
+PATCHES=(
+	"${FILESDIR}/cfn-python-lint-0.30.1-tests.patch"
+)
+
+src_prepare() {
+	# unpin the deps
+	sed -e 's:~=[0-9.]*::' -i setup.py || die
+	# requires git checkout
+	sed -e 's:test_update_docs:_&:' \
+		-i test/unit/module/maintenance/test_update_documentation.py || die
+	# requires Internet
+	sed -e 's:test_update_resource_specs_python:_&:' \
+		-i test/unit/module/maintenance/test_update_resource_specs.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/cjkwrap/Manifest b/dev-python/cjkwrap/Manifest
index 932e7d0093fc..40e086d028d9 100644
--- a/dev-python/cjkwrap/Manifest
+++ b/dev-python/cjkwrap/Manifest
@@ -1,3 +1,3 @@
 DIST cjkwrap-2.2.tar.gz 20995 BLAKE2B 35604e2d1aa24a75e1de0f0b17ba592e7588aade42d43e98864f5d83fe598eaa0ca566682cb7c7af566e66f79c9696ba2ae86b1579681688d6cd31469c07a3ff SHA512 c72ce67b10af46018f7aa5d65af030373e8889a28f533a59d55668e5c90a759ad7cb31708dd6ff35561f9e62115edef5bc0facc74b6a6e122d7399d9dc950624
 EBUILD cjkwrap-2.2-r1.ebuild 446 BLAKE2B a60df254b4fdc7e683de23bf2467c0bcaa49bda18b542e5a3cdd2997ae89e5ec3620f752b88a9fed0ddbb382ade7d7202e8ac8f1499bc8c4410cd8c391bdfa6c SHA512 9ae4fb667fe1a453c2e7949d828949b203edd0f700c19889ffd7fdec3f3433ea65b2c797970da6a125bfa472237701906ba56f665acc8e7a16ce6ecd7515c4f0
-MISC metadata.xml 318 BLAKE2B 6915746c10e2f9ad3c3a2254c537a8fa5a759adaff27057d2ea0e368530e9bd42eabd846226fe19136dfeeea90f9d7cf046870f1f18c572d5bafcd3ccf0c4e26 SHA512 425a58c2d40e02eaabd011b347308de7a23d5858e896b415fb45b1b36f971349241a13e6b94c1a61477ba2d78973889bc73cc4990d7c40decd167824f8eed74f
+MISC metadata.xml 353 BLAKE2B 08c67a0ffd2bc9768d29fce746fe69044b9ac5079c01f4b68d7d9c9bda9149807f78bfc6a064314161007534ba51922bc7cb19a1229b58b52db08dd3c9f6c6e7 SHA512 9ae5295e7fa7ef600c9861812a396550f0c536df48a6fa906351211ed9bf66c09ce6b1329b4b4c2c13533991e6e65ab9340fbfba98414789f8e5b891568514a4
diff --git a/dev-python/cjkwrap/metadata.xml b/dev-python/cjkwrap/metadata.xml
index 07822b67318e..175a8a2142b5 100644
--- a/dev-python/cjkwrap/metadata.xml
+++ b/dev-python/cjkwrap/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>juippis@gentoo.org</email>
-		<name>Joonas Niilola</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="pypi">CJKwrap</remote-id>
-	</upstream>
+  <maintainer type="person">
+    <email>juippis@gentoo.org</email>
+    <name>Joonas Niilola</name>
+  </maintainer>
+  <stabilize-allarches/>
+  <upstream>
+    <remote-id type="pypi">CJKwrap</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-python/clang-python/Manifest b/dev-python/clang-python/Manifest
index 6cd1f8464d52..e037cb4d88c5 100644
--- a/dev-python/clang-python/Manifest
+++ b/dev-python/clang-python/Manifest
@@ -2,16 +2,14 @@ DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3
 DIST llvmorg-11.0.0.tar.gz 122743665 BLAKE2B 3f95570240789fd68ddb747df817f5c6cdc9da40911bbe9ee3531c15ada9165e5002b1c2f778cf8735858485ea05a8754e3d3a5f4b15bdd6cb33d64a14692984 SHA512 b6d38871ccce0e086e27d35e42887618d68e57d8274735c59e3eabc42dee352412489296293f8d5169fe0044936345915ee7da61ebdc64ec10f7737f6ecd90f2
 DIST llvmorg-11.0.1.tar.gz 122790338 BLAKE2B 0130996b4a8c4d9f757136fd7fb318068c9bfdc565060dec0d4336480c4ab66c4ae3185a7fdb05f13cf9ee8fd4123b09df938881b75d6e5d3689595114b7e32a SHA512 f5e6ef0b3111aae08a89cd01adb2ff4abfa9ef779c68b9190421d0447efd25c2cc00e5aae9f4764805f5fa31434866043d1510ae7389817e28ae53a5442e2fdf
 DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45ca1c93b64fa4c6ebcd70a1d3849dbad2b8e4e24fba02d144c6266d7fab3607ebc6999b28c229cb35256cf40f26a985 SHA512 9a8ce022a935eed42fa71a224f2a207122aadcbef58ee855fdb4825f879e7d028e4dcff22c19b9d336db1c8bf63fb84372d44981acf84615f757e54306c92b81
-DIST llvmorg-12.0.0-rc1.tar.gz 134164708 BLAKE2B d4261ff7d9586b47f4cfda3d2cda4b76534f9e17fbd5cdb8861895b8eb466021962f4608bfcdeb52f8fce78850a994fd5eda0560f7211e5c8d1ac9330a738a36 SHA512 3d07d013d0705bb99f56898cc55d054d0d95aeb53b3c756cfab80b4c9097cc4935bcea89b9efde2e503a899b9fccf0dacc0073c9991c8ea352755c5ec68a757a
 DIST llvmorg-12.0.0-rc2.tar.gz 134242619 BLAKE2B bb741a311db608fc2ba7eeaab71c5c9f2a430f7fee3f0c5c4334e5c14caa19738d18c87b568de963d57d9b53e808ac412cf8554eca7fcae9ecca65aa4442e197 SHA512 d8f9b3dfeb0fe9b91eb7f49da393784333044db2653373fbb168afd3c8d50f3e3ec7a7b8f44df522d0facafbfe4cfc4d9e2906d19f1e6feb0bdc569b6c10a17d
-DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
+DIST llvmorg-12.0.0-rc3.tar.gz 134244008 BLAKE2B ed09aa361b264387711ba1ee2e4b01c0c78ad97391df95e2542d4edc31f657cc33c8a2a45de63eb421908d5dadd9392a736610fbb04b3ecbd336d6514a649da8 SHA512 1fae53c6f255160cf4be53848b8b92c8b162ddcfbddf1bf0017faf249859040c15c862c4b52bc3ba894149139afb814e0674da88793ddebfc0756ba3aa7626ce
 EBUILD clang-python-10.0.1.ebuild 923 BLAKE2B 6a6b3667dc21ef2b35e45e4f57db9d854e40b0ea7e49c4cb92ff1979987afb31c33d5d8b57730683b6acb682702c4dca69aa200fc162c60586a9d880b3c290b2 SHA512 d6b0916aa0bd83c3529b9c106ac8ad75c4930aa620cdccd4b1e3e0d7a54fdec0f8d5cd430cddd64a0a7389b1ca6f3a5b142d433691eab4356f72d52c40010e44
 EBUILD clang-python-11.0.0.ebuild 923 BLAKE2B 6a6b3667dc21ef2b35e45e4f57db9d854e40b0ea7e49c4cb92ff1979987afb31c33d5d8b57730683b6acb682702c4dca69aa200fc162c60586a9d880b3c290b2 SHA512 d6b0916aa0bd83c3529b9c106ac8ad75c4930aa620cdccd4b1e3e0d7a54fdec0f8d5cd430cddd64a0a7389b1ca6f3a5b142d433691eab4356f72d52c40010e44
 EBUILD clang-python-11.0.1.ebuild 924 BLAKE2B 78a1cdf53d24ec466a677857d438f341595bb8f9b9cfcb7d8102bed1131068d5140f3dced794e52de9d6f6d3e273e60482554894ffd9326dad976d6bcc7ac72c SHA512 16ef8f0862afdc31cacf3d3c5e23f3af94d9f4178656b2cf65bcb65c9f3969fa86fab5d43b9ece4cb237842fb650e0756d59078bd8390466289c02d074ec4c16
 EBUILD clang-python-11.1.0.ebuild 926 BLAKE2B e99ef100250facaee5b99b053a1886379e78e16feeedbd16db6a7fc5851a8f49ed56885100d4ae51476b6eceedf5094b174a56b2f61f7310e4c082e03fde469f SHA512 b8da10973bb33b04b3cdff83a1bcecc7ea2c307cdfb93c5c9799683c0361574da77cc735eea0f4c70e5c5571ec93bd9cd23b0b3b407d82606c0758b093c90a57
 EBUILD clang-python-12.0.0.9999.ebuild 903 BLAKE2B eb88d06b0ea6be7b7918f47b0eec30b399ff1cb64819a8b784cd0242d0455e38658bf89703c376846010c2eecb6c051e963bb8c3e47821dfd7efcb7416f1aaf4 SHA512 4eedf397fb83180c54a1f1b6bd9523abbcee38331866d35ba35e2b106f60a6fa5afd510b17c691807f674bbbbc46777c6bb240e2e11d2549f2c2f48532517606
-EBUILD clang-python-12.0.0_rc1.ebuild 903 BLAKE2B 7d6ceaae7567ebad7f36a591a502acd349a0f7cd7587f6933bf393337bd4d3e29509a5760134318e0c760fb3e09700bd388c68ec8da5dd051574f53dbd049f68 SHA512 679ccc13a9da978e1f7bdc65883fe3d709e268fe6950283928471a87bdfc02916cb6d2d07a49e8302cbdee082329676a1d44e690a37026ccd24b6e280ff9821e
 EBUILD clang-python-12.0.0_rc2.ebuild 903 BLAKE2B 7d6ceaae7567ebad7f36a591a502acd349a0f7cd7587f6933bf393337bd4d3e29509a5760134318e0c760fb3e09700bd388c68ec8da5dd051574f53dbd049f68 SHA512 679ccc13a9da978e1f7bdc65883fe3d709e268fe6950283928471a87bdfc02916cb6d2d07a49e8302cbdee082329676a1d44e690a37026ccd24b6e280ff9821e
+EBUILD clang-python-12.0.0_rc3.ebuild 903 BLAKE2B 7d6ceaae7567ebad7f36a591a502acd349a0f7cd7587f6933bf393337bd4d3e29509a5760134318e0c760fb3e09700bd388c68ec8da5dd051574f53dbd049f68 SHA512 679ccc13a9da978e1f7bdc65883fe3d709e268fe6950283928471a87bdfc02916cb6d2d07a49e8302cbdee082329676a1d44e690a37026ccd24b6e280ff9821e
 EBUILD clang-python-13.0.0.9999.ebuild 903 BLAKE2B 7d6ceaae7567ebad7f36a591a502acd349a0f7cd7587f6933bf393337bd4d3e29509a5760134318e0c760fb3e09700bd388c68ec8da5dd051574f53dbd049f68 SHA512 679ccc13a9da978e1f7bdc65883fe3d709e268fe6950283928471a87bdfc02916cb6d2d07a49e8302cbdee082329676a1d44e690a37026ccd24b6e280ff9821e
-EBUILD clang-python-9.0.1.ebuild 920 BLAKE2B 10f5e147283f34ef462ecf9cbfa788b47ac3b89d493f245307de0cf9ab66d2291903ef654a9c0642daa84b892e175e207216f794863e84730d266e1c90b4a871 SHA512 4d65b05fc80de160c358a330481da9c71a5dc2a4725033ca7161e77483f31336f212ed03e801db30134f31a8dec993a44e0a95856b43fba8f352cf37ce4e422d
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/dev-python/clang-python/clang-python-12.0.0_rc1.ebuild b/dev-python/clang-python/clang-python-12.0.0_rc3.ebuild
index 39e999e67709..39e999e67709 100644
--- a/dev-python/clang-python/clang-python-12.0.0_rc1.ebuild
+++ b/dev-python/clang-python/clang-python-12.0.0_rc3.ebuild
diff --git a/dev-python/clang-python/clang-python-9.0.1.ebuild b/dev-python/clang-python/clang-python-9.0.1.ebuild
deleted file mode 100644
index 585c0de34ec4..000000000000
--- a/dev-python/clang-python/clang-python-9.0.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_7 )
-inherit llvm.org python-r1
-
-DESCRIPTION="Python bindings for sys-devel/clang"
-HOMEPAGE="https://llvm.org/"
-LLVM_COMPONENTS=( clang/bindings/python )
-llvm.org_set_globals
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="!test? ( test )"
-
-# The module is opening libclang.so directly, and doing some blasphemy
-# on top of it.
-RDEPEND="
-	>=sys-devel/clang-${PV}:*
-	!sys-devel/llvm:0[clang(-),python(-)]
-	!sys-devel/clang:0[python(-)]
-	${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
-
-python_test() {
-	"${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
-}
-
-src_test() {
-	python_foreach_impl python_test
-}
-
-src_install() {
-	python_foreach_impl python_domodule clang
-}
diff --git a/dev-python/click/Manifest b/dev-python/click/Manifest
index f7042cfc7c96..9e450b635bf2 100644
--- a/dev-python/click/Manifest
+++ b/dev-python/click/Manifest
@@ -3,5 +3,6 @@ AUX click-6.7-support-sphinx-1.7.patch 1243 BLAKE2B d4939d49d43b50a3cddb77899ed2
 DIST click-6.7.tar.gz 279019 BLAKE2B cc1e59d0a34ccb4ce50c8a2982b308d23cd525ceb44d84a493c0fe9b5a6f7f616e8a4c440ae211fca811a2bf904ddb75d93618f3c6ac7bbe6b1ed022710dab1f SHA512 d454369fe1acb01c2210a61e15f45ac9cc77102c93345257f4ef3090bd8f31f1ccc49d9fd6ea670cddca9f715ad5db29368b4eecd95abff50d1033c4f7a967d6
 DIST click-7.1.2.tar.gz 295757 BLAKE2B aea76d5378cfa49fe58a83132737d609d48b3d3a71ec65c0a8a144c7a0e244b5bdf0196ffe2150889b82edda20c3f1faa3c84a227fc9ef459a5a9646cff86129 SHA512 d0caf2fb0a258774a18a7b8f83bdfa73abeb70196a70b45a6cc35befaeb862d068d2f2cce4e27201ab2e3adcd02e7e2f099d6c37c497a507010eefa10ad16eba
 EBUILD click-6.7-r2.ebuild 838 BLAKE2B 608a2d022c059f918754df5755b29d848e8b30fb12122eecd5396e83775ddd2ea0ebae860ca2e2602d34c705de954a0c196b1770a29e38a6ec6ad37ba3d71265 SHA512 a1def50b7d240f7abfa5b1d42aa3b5126e35b6907ce03fe78b77610df8e1a7027833f82118310c9b5a3d2ca7942c87e3287b29cf1e42df447d4c48cb1deb6df0
+EBUILD click-6.7-r3.ebuild 975 BLAKE2B 435031938814afa6d19b056a1afbeec60d4e4bb230683ede187b49893bc0e42ab96f2afacff6c56dcae8ffed29a4549386bae975378f472914a2841d08c03cfb SHA512 7014fd220332c4280add5a57fbf09a8b79867ac254c7298ec681470653a305ff84b7016a889ca84f12e5e5ac1378f445c8bdb20f55ec85b6d5782d99f228776a
 EBUILD click-7.1.2-r1.ebuild 764 BLAKE2B 095cfcf03856893fbb93140a12ad1f52c6cd30f32367ff466ae798dc9fc6a1cee978eed1826685d698f8f4698fd3751d672083bbc8f067ce77de3304440b0759 SHA512 d606e2c5508c25eebe0cc72faccb248281651fb0d5574a5c5a6ef04af218c047a021f7ce1983fc42c4c89842626dceb6f366a421fdbc64023ada25e4d4d49f2a
 MISC metadata.xml 332 BLAKE2B a41bc7699360c666ce286a0d9a44779fab5afa6e6ce99efec2ee65a5d8d534bf3ccd65d4b23a2f5d40fc3b1c04c3c7e078a8889a3030909e7cc3992eabecfcb3 SHA512 de78734678a4bafe5175228f6df58210c65eaf016efec93e65441109b280725c4994406d0f21f2ee22ca0f9e1e27e27f76b3a1db724dbbd5b958fc8d8410126f
diff --git a/dev-python/click/click-6.7-r3.ebuild b/dev-python/click/click-6.7-r3.ebuild
new file mode 100644
index 000000000000..6a6ff97cc066
--- /dev/null
+++ b/dev-python/click/click-6.7-r3.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..9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A Python package for creating beautiful command line interfaces"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+HOMEPAGE="https://palletsprojects.com/p/click/ https://pypi.org/project/click/"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="examples test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+PATCHES=(
+	# From upstream, can be removed in next release.
+	"${FILESDIR}/${PN}-6.7-fix-tests.patch"
+	# From upstream, can be removed in next release.
+	"${FILESDIR}/${PN}-6.7-support-sphinx-1.7.patch"
+)
+
+python_test() {
+	emake test
+}
+
+python_install_all() {
+	use examples && dodoc -r examples
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/cmd2/Manifest b/dev-python/cmd2/Manifest
index 64bb0b89cc5e..d6a299af4c62 100644
--- a/dev-python/cmd2/Manifest
+++ b/dev-python/cmd2/Manifest
@@ -1,5 +1,3 @@
-DIST cmd2-1.4.0.tar.gz 660494 BLAKE2B 1a7d5efef704cf3011affa99303233ad9d16e09d16bbe9319324599e6d69b1a664556e9ed406f2a34bfc6021a6d1607a44fd4df9cedbd6688826e0bfe8d91b77 SHA512 1f35e9773578a1d2ea1255cd697754b126c1e90486e84319c0f86ee409ed22bfbc267ff1d3b9af1072985337c9cbc51eac4e288281146d9c20b54c8b364f1547
 DIST cmd2-1.5.0.tar.gz 662624 BLAKE2B ed46c4e70f1e09c612f66333bb601afab0158a899badd2b86ce193f7384c35d32c58d0a1238d5fc2b69adc11a233fba2089b0f4433c7b6159aeb347150128fb2 SHA512 ea7e26370e1f83dc95bd0db8a705ab8ea95935584123f4684e3b8debf23a37fbcadf2bc1634051eaddcaba92f2b22a0ab2582773630fab3d1482b4dc8a23acd6
-EBUILD cmd2-1.4.0.ebuild 1519 BLAKE2B 2fcb7f29a61b2ca13332499539493291e4a4559f4751a8cffc20ee81a2db97ddf6962e47fce9caa24ec2b890ab01d52a87d68ec0e0983faf0590c8015809924a SHA512 c7d5b7748269e11da214f72bbcdd1bde041399f220beff57a467be70723c13a6f10576049303dad723a8f70d6aad1c87e8af676217c26b350dd02f02f27a47bc
-EBUILD cmd2-1.5.0.ebuild 1411 BLAKE2B daa6650a2d4e33377982db208e269d3d553b8f3a707f8032bbd5bc12fee0b3663228d0899ad59e5740b9be89f1a8a42012737b0c93826b347d7bdae3011c4fb6 SHA512 5391f42cd82bbe691ab2f442f139e0adf5a89fde98245e0e18e3529a1982c6a7e01e2fbec83aae7dc6c3403a90fce7115ec550cd5d2209ed48f42d2d2bf1d130
+EBUILD cmd2-1.5.0.ebuild 1406 BLAKE2B 59f9dff3907bd69222f7f9f9cd1fcfb03cf08cad75ee951942b58dd29fa9e4b950883631f73b079c1b887fd348ce71b99bcc66a959fb831f4f9114f1b984925b SHA512 313d412dd2e175657668e9b250541b9d2caddb3db078fccd35a75b20e4d5e08a0ca9523e26dceea0c359d35fa32f7281344397e5faea30db519ba4a7b0b8089e
 MISC metadata.xml 521 BLAKE2B 0246c37d4e3d54c54b632fc75eb51b0b6e1ff3fcf6be8218a958c9483fb0248bfa3238ed31ab9631f41b12bdef71704649423bd2b44a322ec0b4cfb20a6026f2 SHA512 6a94c23d403d07e6d8e980e4c11ed1a1a0de4707417d60b539a4acc50312d1a9604d9d7ee55dd232c51c8fa6fc24f10bd28e9cc80e2a6f143086da448f78f924
diff --git a/dev-python/cmd2/cmd2-1.4.0.ebuild b/dev-python/cmd2/cmd2-1.4.0.ebuild
deleted file mode 100644
index 02b1add3de6a..000000000000
--- a/dev-python/cmd2/cmd2-1.4.0.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_{7..9} )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Extra features for standard library's cmd module"
-HOMEPAGE="https://github.com/python-cmd2/cmd2"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc64 sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	dev-python/attrs[${PYTHON_USEDEP}]
-	>=dev-python/colorama-0.3.7[${PYTHON_USEDEP}]
-	>=dev-python/pyperclip-1.6[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/wcwidth[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-1.6.0[${PYTHON_USEDEP}]
-	' python3_{6,7})
-"
-# pyperclip uses clipboard backends in the following preference order:
-# pygtk, xclip, xsel, klipper, qtpy, pyqt5, pyqt4.
-# klipper is known to be broken in Xvfb, and therefore causes test
-# failures.  to avoid them, we must ensure that one of the backends
-# preferred to it is available (i.e. xclip or xsel) + which(1).
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		sys-apps/which
-		|| (
-			x11-misc/xclip
-			x11-misc/xsel
-		)
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e 's:test_which_editor_good:_&:' tests/test_cmd2.py || die
-	distutils-r1_src_prepare
-}
-
-src_test() {
-	# tests rely on very specific text wrapping...
-	local -x COLUMNS=80
-	virtx distutils-r1_src_test
-}
diff --git a/dev-python/cmd2/cmd2-1.5.0.ebuild b/dev-python/cmd2/cmd2-1.5.0.ebuild
index d098041609c4..94981d9a869f 100644
--- a/dev-python/cmd2/cmd2-1.5.0.ebuild
+++ b/dev-python/cmd2/cmd2-1.5.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc64 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/attrs[${PYTHON_USEDEP}]
diff --git a/dev-python/croniter/Manifest b/dev-python/croniter/Manifest
index 47d808c69f60..d57e29f413e3 100644
--- a/dev-python/croniter/Manifest
+++ b/dev-python/croniter/Manifest
@@ -1,7 +1,5 @@
-DIST croniter-1.0.2.tar.gz 29809 BLAKE2B d7e5b668f97f98efdf992de4dd92bbddd8197275557364516af5d74b8376260967b249723dfda1d835c60dd185612a45f6ed6447609c593ad108ae1b738cefc7 SHA512 6e4b593dbbb5e3e1ce9a25ad709a1970f22feb1d0a2bf7fa97b8cc3eb43fbe896a842f74b3fc3cd08e3d414767cc661bf5c5307a206c42e1f0de5776b2b24310
 DIST croniter-1.0.6.tar.gz 30489 BLAKE2B a3caf1d0606dbec7a978e5089b08bf6edb13533524f5a3f1639483547b14a83f099276f4c63e9b84031202c088a8237326f70ecaca0bf3503f4a33173ce0d358 SHA512 1ca37c7dbd6a7365db112ccd474d76babc890aad1e2c341677be13c4f4e28a98219266efc065442e2077588a36b60c01d8e2996f0a32def690cf49e2c7c584bc
-DIST croniter-1.0.7.tar.gz 30735 BLAKE2B 0cd033fd669e8b5ce58136898f8409bc1d3253d7e6b7d8b6d09792fad715656fa51655930aa4fd7b7f771fd8684048dd3d5bcc28510882b7c726ccc5636c87b2 SHA512 db31271889b95333c2bfdb371804bc9ca5197c96b20ad5bd4bf2d81f86b58d43266be8a76c481d28ef4e8f7ae9e4f21947754d6a721ed71ccd0ff0143c80b918
-EBUILD croniter-1.0.2.ebuild 648 BLAKE2B e5fc9aaa8db66bbf820be39afaabe1fd3bfa7423fd8819ab6d40e1831ea1ef1f6ba9d1efe50c2923d7c33a5c339cfae18590ab1b956e8fe76e666dd364dd8223 SHA512 db093df41123a01dbf9d66ac462b05fc633897eb8859c1f0d0a2e8cd255c7582498b9dd14c571dc111c94d218d15dd183317c7ee967243a117b5052ab091f98d
-EBUILD croniter-1.0.6.ebuild 687 BLAKE2B 5b0092b53e7fd30c1e2822eeeb223eaf8e099448beda766cdc86b37c5ec21e6cf39fa86ac887d8533be3e7787cacbba9e4664a65c7124bc28a55848ee7494b89 SHA512 e805ae20ff19f5f05606df6d3a8969be7cba5e448f49030eaf098fb4ace60ae166e3f6e8d1f0ab193f82fa336f778e6ac06840a95794876e055d1626a3ddcc40
-EBUILD croniter-1.0.7.ebuild 687 BLAKE2B 5b0092b53e7fd30c1e2822eeeb223eaf8e099448beda766cdc86b37c5ec21e6cf39fa86ac887d8533be3e7787cacbba9e4664a65c7124bc28a55848ee7494b89 SHA512 e805ae20ff19f5f05606df6d3a8969be7cba5e448f49030eaf098fb4ace60ae166e3f6e8d1f0ab193f82fa336f778e6ac06840a95794876e055d1626a3ddcc40
+DIST croniter-1.0.8.tar.gz 31019 BLAKE2B a637f7df806a85aeb236c38a9fa19ed0929fd257268cbe98bf7b281f1c52a9bfe98c91063da48b1344946f6619c5ac8f0e89051c1672fa6997c830dd97b7d9f2 SHA512 cf620baa55709c2379cc7f8f0123bd79e03b7dabaecd539633b8f52f97aa617c48e5692e0a45c08f4b30b2fab52c47cfc502c2ea550329083db2353ecdc56635
+EBUILD croniter-1.0.6.ebuild 685 BLAKE2B 4d70d54a476f912717c3e10434c97671dd62073a638fa4953f48fe3da31bb211c651b47c45ff53179d5c8899877427d20f8f32a78f3dca4966ae97f3ef0b5902 SHA512 d078347e938ab3b48902042c64128a200821baa3466cb4213278cc4ebc9688a520d205ec32ebc97af58b4f05a44b684ca0e53d6fb49f405867e05cbc26297f4d
+EBUILD croniter-1.0.8.ebuild 687 BLAKE2B 5b0092b53e7fd30c1e2822eeeb223eaf8e099448beda766cdc86b37c5ec21e6cf39fa86ac887d8533be3e7787cacbba9e4664a65c7124bc28a55848ee7494b89 SHA512 e805ae20ff19f5f05606df6d3a8969be7cba5e448f49030eaf098fb4ace60ae166e3f6e8d1f0ab193f82fa336f778e6ac06840a95794876e055d1626a3ddcc40
 MISC metadata.xml 469 BLAKE2B 94811bf25a8bef886ba5ab75039994f844ba8d8311f993667e73492fff7775ae7846db93fab9b28d90c610f53ca3b8757d683a0e032c4c5693c0c348719529bf SHA512 092ee760431c977b57ba891289c77aba3f54616e7c2b8a48b6232c562c31c2a6e5d240bb7b7411d32080e5da119f47f6bff4d32b56ff10c22a0d4952b027b250
diff --git a/dev-python/croniter/croniter-1.0.2.ebuild b/dev-python/croniter/croniter-1.0.2.ebuild
deleted file mode 100644
index 38a4aedab7c5..000000000000
--- a/dev-python/croniter/croniter-1.0.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python module to provide iteration for datetime object"
-HOMEPAGE="https://github.com/kiorky/croniter https://pypi.org/project/croniter/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-RDEPEND="
-	dev-python/natsort[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/pytz[${PYTHON_USEDEP}]
-		dev-python/tzlocal[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/croniter/croniter-1.0.6.ebuild b/dev-python/croniter/croniter-1.0.6.ebuild
index 872a3960c97a..5ed6ec7f11f9 100644
--- a/dev-python/croniter/croniter-1.0.6.ebuild
+++ b/dev-python/croniter/croniter-1.0.6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 RDEPEND="
 	dev-python/future[${PYTHON_USEDEP}]
diff --git a/dev-python/croniter/croniter-1.0.7.ebuild b/dev-python/croniter/croniter-1.0.8.ebuild
index 872a3960c97a..872a3960c97a 100644
--- a/dev-python/croniter/croniter-1.0.7.ebuild
+++ b/dev-python/croniter/croniter-1.0.8.ebuild
diff --git a/dev-python/cssutils/Manifest b/dev-python/cssutils/Manifest
index 272978b5af36..485855123a49 100644
--- a/dev-python/cssutils/Manifest
+++ b/dev-python/cssutils/Manifest
@@ -1,3 +1,7 @@
 DIST cssutils-1.0.2.tar.gz 367038 BLAKE2B e19edce100dbc05d6e469eb6b0ad234d7d4c9458aca1b2a3e72bdeff1a35dec64427353936a339e2071d8ba2e8804c5754f55a391955a61ef61ae56381269125 SHA512 4988893875a03923d3127e334654799e5c2ebcdc0a7f5b3fb5c9ab27d1b331caa5bf197161312a298531e0757843aa3259ceba5fa19947353eea24a5da53ceda
+DIST cssutils-2.0.0.tar.gz 734153 BLAKE2B 09a6db97c2f10865d88ca83fe93b3b7a3981608b4afdc20fbb8533cd49b9f06b03d30ea5f456e83fc28a199b375fb6c7709ef067107bea1965e74b5e810158b5 SHA512 598f589c0f5961abe4f55f2ad0a63c98c931592c00d6c28579895527d2d2fc71686f3ae08df5b64616aa64ebf5a160a4aab12f7eae961d8891c4f525568b0188
+DIST cssutils-2.2.0.tar.gz 731024 BLAKE2B 8da0e8898e7126a6a84f053f6a3411c3830dc4ec1e20b80bba53b1004c0747f0510390e10c611ce655cc8af62bf657f3b69d3a12a49b781f1b20553cd038f601 SHA512 cd9c3d069e18516484894df38f8cbc9abb1ffc5b021538c99c06878d34195619d7928d553049309ac30c144210df6ed616bbd0d04e158d9fbfce166f9935d5a2
 EBUILD cssutils-1.0.2-r2.ebuild 1501 BLAKE2B 7deba3d5f67cfe6d65f904453336d2109f8124a91f24cda2760be82d82072dec9d1061f48e6e303354915d285aa6e928c45da8b6971715e32f40706e5fff5f0e SHA512 0030ef823ab46620431c8e754ccf48bf216887bf4785870b08b4ab1d76735fc13224d8904ef667e991547a0f097ee106cb41b5377976d852177c5593abb9c3f3
-MISC metadata.xml 321 BLAKE2B 3931989725607574de3204e9a48f65f07c95cb6a821cf0966d1fc6fbb95b1e23f3ab232f39c02aefffe1c0332a9f7c6101c79248a87da357386ce8d370c5fab7 SHA512 596c3a2389627971d5ab797ff1c2c863f878fe48709326e5264369609388bb7203bd68d0a3134f3cf4161ad9b94a25b639afb4f99f7a85a7fc88a9d435dde344
+EBUILD cssutils-2.0.0.ebuild 1146 BLAKE2B 8bf36f3dfef9a462566ef73082be92060ab63941ce1a570dec1e1035d4b419d6bce49e94b7db45f8fb82cd24c98d7524689f1cc6a76ec6ea8ee666da90572511 SHA512 fa15898bea0548386fea3e611da94030f2421abcfce5784fa0ef9ed8c116d2700f807e01d10d62e8e11c926ba6b8cefec5645574f69336e475e0e8223813ae99
+EBUILD cssutils-2.2.0.ebuild 806 BLAKE2B c42606fda9786521fb35d08acf7f6310bc0e22238867fc9812c434c3fc45655072f9a9af1757cb3505781417e6fbd4f9b9f6d5c0453c3abae86c871db11c9bc3 SHA512 59ac787f14c1232301f5bd5770154ccb40b94b93473c5b38432029be2a3278cdb24c0a281670437abd3de17e58d3fb0f52ef1ca4d928379f59c850e42ac625bc
+MISC metadata.xml 403 BLAKE2B 302086fe905e2d7d254c907b68c5e6a4e1091dcd4df1061c8150e6c7ebdcfd062d252a57eda07db004a8df41e689025859f0df447627063037d72ddef43d68d7 SHA512 875b891f1192147c1948f444c621ae2a76eea815b05fee6440458295a8c4175a0fb81de07b4dd6f4d69267b8cb4e960f9ac9516596882fb79ac6de518da6ea5d
diff --git a/dev-python/cssutils/cssutils-2.0.0.ebuild b/dev-python/cssutils/cssutils-2.0.0.ebuild
new file mode 100644
index 000000000000..8f87d89ad443
--- /dev/null
+++ b/dev-python/cssutils/cssutils-2.0.0.ebuild
@@ -0,0 +1,44 @@
+# 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_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="A CSS Cascading Style Sheets library"
+HOMEPAGE="https://pypi.org/project/cssutils/ https://cthedot.de/cssutils/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+	)"
+
+python_prepare_all() {
+	# fix casing of call to Windows-1252. Remove when upstream fixes casing.
+	sed -i -e 's/encutils.tryEncodings(test)/encutils.tryEncodings(test).lower()/' \
+		cssutils/tests/test_encutils/__init__.py ||
+		die "fixing test_encutils failed"
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	ln -s "${S}/sheets" "${BUILD_DIR}/sheets" || die
+	# esetup.py test
+	# exclude tests that connect to the network
+	set -- nosetests -v -P "${BUILD_DIR}/lib/cssutils/tests" \
+		-e test_parseUrl
+	echo "$@"
+	"$@" || die "Testing failed with ${EPYTHON}"
+}
diff --git a/dev-python/cssutils/cssutils-2.2.0.ebuild b/dev-python/cssutils/cssutils-2.2.0.ebuild
new file mode 100644
index 000000000000..c2bd943c82ac
--- /dev/null
+++ b/dev-python/cssutils/cssutils-2.2.0.ebuild
@@ -0,0 +1,36 @@
+# 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_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="A CSS Cascading Style Sheets library"
+HOMEPAGE="https://pypi.org/project/cssutils/ https://cthedot.de/cssutils/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local deselect=(
+		# network
+		encutils/__init__.py::encutils
+		cssutils/tests/test_parse.py::CSSParserTestCase::test_parseUrl
+	)
+
+	epytest ${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/cssutils/metadata.xml b/dev-python/cssutils/metadata.xml
index c9b197a9598b..586ee083720d 100644
--- a/dev-python/cssutils/metadata.xml
+++ b/dev-python/cssutils/metadata.xml
@@ -5,7 +5,9 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">cssutils</remote-id>
+    <remote-id type="github">jaraco/cssutils</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/cython-test-exception-raiser/Manifest b/dev-python/cython-test-exception-raiser/Manifest
index d7f921419a7e..82fce8276860 100644
--- a/dev-python/cython-test-exception-raiser/Manifest
+++ b/dev-python/cython-test-exception-raiser/Manifest
@@ -1,3 +1,3 @@
 DIST cython-test-exception-raiser-1.0.0.gh.tar.gz 4273 BLAKE2B 028c3ded07b137a186055b4fa8f9d7306585942ad7ee022a37b3df065dae5d2110d6ddcd874f3dc2c687f10da1122329194b817b1a78a76ff8de557997ca2a19 SHA512 4e1c5dd65a7c493cf43213badfcaaeb0df9c4774cc6f90cfd437612126893e7831d218c707599adb97dbee7ebaaa2372c796c634d75738bd06328735eb8f1189
-EBUILD cython-test-exception-raiser-1.0.0.ebuild 583 BLAKE2B 1a742070a914aebca3c1980f88bc779443ac13714346761321eba153f6d2b7ef472d8a3c1ec1928d68901fd94d93287b97b1dbb46969eea4f2e8491f0f00e5bd SHA512 4d49a44afee03265d5ee22002943bbc8abbde39fe07bf36deade6aa2c89fe0001f1fff2a7457280156a6fabb6e3d3727148ab581a925fc01477d7ae5661f019c
+EBUILD cython-test-exception-raiser-1.0.0.ebuild 590 BLAKE2B 68950b1e0f8c5d0c4ec09e7ad7c9a6f90419b5ad820cd406dcaf08068c15e380c5dcebc3c9f4723e883703d4b200179ca9ae5deb26cb9e6d2b64850ec6ac2172 SHA512 3743825bb7b8a459304aac20450d5b11f4bbbae3755013f9888c6034bf608567fd1c2879901772ab5ef3ff78a6356cac3ca69a0ff54dc52e60e09aa5443ea36d
 MISC metadata.xml 385 BLAKE2B a99aacc4e3a21f41dd413b185fec8ac393e1c1c2f3897fd7173d717a72b056acb8362a0b5c9b6028021365678f828549fc0b711e9697620f50f9d66ff83952d9 SHA512 1b978c0d50c3b60bdcba9bf93d6da041d83cc9614d4fc6b9837ce9797b0c251d2ed08777f7bc0877d98a9c76b8f8ec744f7f171cbb663aa36e55e2e6a7429fd2
diff --git a/dev-python/cython-test-exception-raiser/cython-test-exception-raiser-1.0.0.ebuild b/dev-python/cython-test-exception-raiser/cython-test-exception-raiser-1.0.0.ebuild
index 8d32fe93d5c3..b7d373a71772 100644
--- a/dev-python/cython-test-exception-raiser/cython-test-exception-raiser-1.0.0.ebuild
+++ b/dev-python/cython-test-exception-raiser/cython-test-exception-raiser-1.0.0.ebuild
@@ -16,6 +16,6 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~sparc ~x86"
 
 BDEPEND="dev-python/cython[${PYTHON_USEDEP}]"
diff --git a/dev-python/cython/Manifest b/dev-python/cython/Manifest
index 9cc34908b759..1ec8855f907d 100644
--- a/dev-python/cython/Manifest
+++ b/dev-python/cython/Manifest
@@ -1,9 +1,10 @@
 AUX 50cython-gentoo.el 388 BLAKE2B 5bc38190b467efa9e7be1a5831022534dbfdc02206fca34f39bb2c897aa50cdebf960589181a9614a50829c380a892a9013e8ec5f538d51f52475cb8d92fdb5b SHA512 dd554d0d6cc220988552b06a20337af20b847e75bee76c90eb92ea979d9c2ae9d64ffa849266ff403d857b3737981de451bf40061bea0533600476bc57661c18
 AUX cython-0.29.14-sphinx-update.patch 377 BLAKE2B 32ba9ccc6c093fb9e575686c9a3b707a10a2488979d0a1dcc0863022d48255455216d11c1968bc5d49a8b583a340113c090ec103ae233dcac2164beb1765f9cc SHA512 3714019a1659b69243bf5f76d1557e3e4e507fa6b15bf4259001f961d1127e18e01e3d17fe04706c882e264651ea5699c6295f33c66af7577ab6e0906c0d3273
 AUX cython-0.29.21-spawn-multiprocessing.patch 1096 BLAKE2B f31e9e8bdc86ab1098bfa115e60470410f41fdf4be558c6a11d0c3ea61b8a8009f6242a96e2574f525e53b6125de78c5f8dbd8f7499d8debd368e80a6d383e47 SHA512 71f2349dfee2504bffe2ce378a00b2033ad229f99c597382eafa54107fbdc56fc177e4412e6314794b5ce22d9713e535467b0ed3e36ae657a5deb9c3325eb242
+AUX cython-0.29.22-spawn-multiprocessing.patch 963 BLAKE2B ebbc3f6f4fa88e7e082326bccbad328724a4ff5645f0b2aa28f21419044b17bed8495618bb980b23a99310c2b6ef275331e1b9aa6d734017eb33646c92a07a73 SHA512 3f5c6b4108b87cf3014416386095c07ac91762152bbd87e8bd589177d40b933c11e19610bea06720c5c70f76b5b9b70d27e5c3cfa20eed30deaaf7d122910bd3
 DIST cython-0.29.21.gh.tar.gz 2088511 BLAKE2B 7a4ddabb65a519d3c71454ac8417438a3a9c46b47489c18e7c7e82ffcb5d5f2f0c5246d0b364f8317d374c53f0c83844c73c7d2ef6b9f75f10707aaf2931ce41 SHA512 2c0c3e3fff07106eb98862f71cd5dec9ff29460cf9b9e4de74537ca5e033f7523989beb5fbdc14723beaf94a535976f75c803e791b87e017961d9694b8c37679
 DIST cython-0.29.22.gh.tar.gz 2091955 BLAKE2B 8225fa6073d43de1e44e8cd22d52f9bde5d3b6e6e766c74d5ef18d77b57c0e1b22a21cae5b133b0b22f7207aa51dc0e76f1073db977190d42c2b55cc2d7e148e SHA512 b7f22112678f159bf1d0ad5fe4f7c103e96f240bab4d9dc07edd7c2f66a9887b9af72b32f1d5886361b48d428bc2b9499d3c5b59ce5af1068f20a26549783dd6
 EBUILD cython-0.29.21-r1.ebuild 1792 BLAKE2B 03fbab5e328ff2dba249e6a5bf17abdb4fe69217f3527a89c4920d78129bc4a40b267ac58f8eb70deddd432ea34538a44254e1a71931f7263fae8d3761b9c1a2 SHA512 7b0240e6ff14f2cf12e54deaf025cbb4c72984a351541b646234091159c0a4e2305339cd6a58f64b756a9f99aa39fee3e9b326127e5bcf98ccca5de26d9bdf3a
 EBUILD cython-0.29.21.ebuild 1987 BLAKE2B 1df83b6ef7f839622cd73c07384ccf0a6e722fe5ae9f42374ff9df2995e5b624e78a534c078534c341d034f984f73fc5c3abe954166ba8ef0f3fcc6aff2fbf06 SHA512 aa85e5d5ea9a1413686d8903af4c2c310f504ba0fc1ca469253010dae7a2abbb434b5d2e59f18b1a22f1149cfaade4b942466973e9559b913146abdf3b191155
-EBUILD cython-0.29.22.ebuild 1796 BLAKE2B eb33c0156b5e9a19faab496091632de2e6ffecbfec83e756b493b302b2e850d28aed7bcea7190d69bbaa2d2fc09c61d1b2c0e13d5d6062f3e16fe0299067fdd1 SHA512 b7fad08575a5c2e966416019174fb412355c7bc178433c42bc60a115528004d8e901d2878a2bc494e5d55a6717c161f434081cfe8f294f1a55ffe039bdf5ca84
+EBUILD cython-0.29.22.ebuild 1852 BLAKE2B 343b0e6d7115144ff2bf5491d07b38e1a829c04831b890725edb611dfdbf00c3a001285970fe3a3dea4961efc6e878dee6ec28ab6726df78a25b2f772fe05eac SHA512 7570f675c7de77c7c1189e327851b8896ddcf475278edb14ba86dfdcb6cd641ce50b0dbd9624de653d2395f7da4c894aa8238a05174b7149441205a86a6a2170
 MISC metadata.xml 605 BLAKE2B 900f2ffaa501d7ce5bef46115f7fdbda0966bf4ae048b4c27ac4be06e1b23de17c674e27f97627aed8d1d65b52bea01532d8a698bdbcd20b7c9fab4bad278b16 SHA512 66176bb6e00f70b610a41bfbc973bae2b4b8b9aeeeb6bdc9e14c2832d513d5452aec6509f8225daffb7e169d93311a4ccb026c935ead80ffeb35d91f1ae558fe
diff --git a/dev-python/cython/cython-0.29.22.ebuild b/dev-python/cython/cython-0.29.22.ebuild
index 137bf8549e56..d2fe1b9af4ef 100644
--- a/dev-python/cython/cython-0.29.22.ebuild
+++ b/dev-python/cython/cython-0.29.22.ebuild
@@ -30,7 +30,8 @@ BDEPEND="${RDEPEND}
 	)"
 
 PATCHES=(
-	"${FILESDIR}/cython-0.29.14-sphinx-update.patch"
+	"${FILESDIR}/${PN}-0.29.14-sphinx-update.patch"
+	"${FILESDIR}/${PN}-0.29.22-spawn-multiprocessing.patch"
 )
 
 SITEFILE=50cython-gentoo.el
diff --git a/dev-python/cython/files/cython-0.29.22-spawn-multiprocessing.patch b/dev-python/cython/files/cython-0.29.22-spawn-multiprocessing.patch
new file mode 100644
index 000000000000..15b6f968e4bc
--- /dev/null
+++ b/dev-python/cython/files/cython-0.29.22-spawn-multiprocessing.patch
@@ -0,0 +1,27 @@
+Needed to prevent a loop while calling cythonize on macOS - or any platform
+defaulting to the 'spawn' method, as Python 3.8 does on Darwin.
+
+https://github.com/cython/cython/pull/3263
+
+[Rebased on 0.29.22]
+
+From 15ae78bb74a856836dd64828326f4f0812d36520 Mon Sep 17 00:00:00 2001
+From: Marcel Bargull <marcel.bargull@udo.edu>
+Date: Fri, 6 Dec 2019 18:21:19 +0100
+Subject: [PATCH] Disable parallel cythonization for "spawn" start method.
+
+---
+--- a/Cython/Build/Dependencies.py
++++ b/Cython/Build/Dependencies.py
+@@ -1071,6 +1071,11 @@ def cythonize(module_list, exclude=None, nthreads=0, aliases=None, quiet=False,
+
+     if N <= 1:
+         nthreads = 0
++    if nthreads:
++        import multiprocessing
++        if multiprocessing.get_start_method() == 'spawn':
++            print('Disabling parallel cythonization for "spawn" process start method.')
++            nthreads = 0
+     if nthreads:
+         # Requires multiprocessing (or Python >= 2.6)
+         try:
diff --git a/dev-python/dask/Manifest b/dev-python/dask/Manifest
index 1917b20dc0bc..19580ec10f45 100644
--- a/dev-python/dask/Manifest
+++ b/dev-python/dask/Manifest
@@ -1,5 +1,5 @@
-DIST dask-2021.1.1.tar.gz 3637063 BLAKE2B 6b2ec67f5551c4bba0fde8cecf02de6f24bbcd126a22c56c75e41a645a31f0fd7ba81aa8e5167f495122ca96e2113fa4893851eac382df1ccfaa8bf1be576ed3 SHA512 d1d093af6389b9e02e6040ef66159a4696c2dd91e12190cf9efc25ad5a0f790e3da9ada64a8a5e1cfceab7452957a503c6c303d3e2248e05ebac168a0f7c52f1
 DIST dask-2021.2.0.tar.gz 3643277 BLAKE2B d34f706cefd068e42b32c84b05a46c24c98ba8391358140e2a7d2325d3a18cd855fbe9174ac8b8541e8274b83621fcb5c299d70fa5e2bcfe11214a2a32a82ce5 SHA512 da8baaa7cd211eb3ff123127aa9f599337c3af52f06e9a35331397ab580500dda7135addbfe27815a2b14957f7852d9c22a21b1d220af28c8561edaaabdf2e34
-EBUILD dask-2021.1.1.ebuild 1060 BLAKE2B 03702330a6a43b38330f63b17aac6f994c95754edca3370dcad8362610ffdb5c578003ea1aa375e719c4cf5f1a4123bc97849b31009b54a6761d225894be0be5 SHA512 9664356c87af65db6e5a9b772057466c1ee838ea0712939076eab6af0e5f3b86c9ec9c322e29c88f9b4de9af0a8a53837602b44e5ce3710e1f50e560de045111
-EBUILD dask-2021.2.0.ebuild 1062 BLAKE2B aba8e6ce442988efff5665fd11ee384543bf4c8f01d63d45ca0df6b4f49bf40266aa3cffade0c99bfa872a2a8854c03f9d5e685faa49b89f52ab416355e49cef SHA512 81c3edcda8af9979ebc381f1941fef031ce319884787fd52df739e08e80d048c498f887e1c46561c5c57e12c7f830a55e2fcdc2761505076485362d493625b60
+DIST dask-2021.3.0.tar.gz 3672035 BLAKE2B 17b3e808603b8524e96273ad33b69689605707a1c187b32c8ed67f054e7f242525365956800017ad5685e0c306dcd21bcfb3dbb3f9920446f03553ceb0fdd9a8 SHA512 ba5b62dd51dad29a106a4fe38a5015f7e1d7ad11eaa21a524b7c8b7d916873b9e447d065c9009e8100662aa3b1f64718b164369f173fc84f5f085a1e369e091a
+EBUILD dask-2021.2.0.ebuild 1060 BLAKE2B 03702330a6a43b38330f63b17aac6f994c95754edca3370dcad8362610ffdb5c578003ea1aa375e719c4cf5f1a4123bc97849b31009b54a6761d225894be0be5 SHA512 9664356c87af65db6e5a9b772057466c1ee838ea0712939076eab6af0e5f3b86c9ec9c322e29c88f9b4de9af0a8a53837602b44e5ce3710e1f50e560de045111
+EBUILD dask-2021.3.0.ebuild 1126 BLAKE2B 61ad25c7243e23eca07b7398109a69c685902211ca50510862a7be53a51cca08fa2a452bbca051fe4878095931f93af248784ae06ea8b63b33215898d5fef32f SHA512 8d41b22fc71f7d87711edfab68a3f5e56a49df8f0f6d0ca5a49d2931e0d64284029b62b30f45eb43faa4b9dd37453a2aa2c387e56991a7a360069f7bbc986f30
 MISC metadata.xml 670 BLAKE2B 1a15001a3836bd70c8d539b34283c9e3b19e3a37031de32f82e8b44a09de2031e572104b1dcc5a690c80c55981f0c510325ba700e4e859a15dcd0a3b06a6abd1 SHA512 41e31ef86be6c90bf9846bb9a753d6f6ed3119d0bca3f0b205c9f814045fccf99702ff901b7e5fb1d785fb5cdd5230ba7520dd6e6ae604761af1442e8ec81538
diff --git a/dev-python/dask/dask-2021.2.0.ebuild b/dev-python/dask/dask-2021.2.0.ebuild
index 7028d637c3bb..bf04a92fdf3f 100644
--- a/dev-python/dask/dask-2021.2.0.ebuild
+++ b/dev-python/dask/dask-2021.2.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/cloudpickle-0.2.2[${PYTHON_USEDEP}]
diff --git a/dev-python/dask/dask-2021.1.1.ebuild b/dev-python/dask/dask-2021.3.0.ebuild
index bf04a92fdf3f..991bf4a4899c 100644
--- a/dev-python/dask/dask-2021.1.1.ebuild
+++ b/dev-python/dask/dask-2021.3.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/cloudpickle-0.2.2[${PYTHON_USEDEP}]
@@ -29,6 +29,7 @@ BDEPEND="
 	test? (
 		dev-python/moto[${PYTHON_USEDEP}]
 		dev-python/numexpr[${PYTHON_USEDEP}]
+		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
 		dev-python/scipy[${PYTHON_USEDEP}]
 	)
 "
@@ -36,6 +37,6 @@ BDEPEND="
 distutils_enable_tests pytest
 
 python_test() {
-	pytest -vv -m "not network" ||
+	pytest -vv -p no:flaky -m "not network" ||
 		die "Tests failed with ${EPYTHON}"
 }
diff --git a/dev-python/deepmerge/Manifest b/dev-python/deepmerge/Manifest
index 0f4aaf3ed9a4..c588a55df091 100644
--- a/dev-python/deepmerge/Manifest
+++ b/dev-python/deepmerge/Manifest
@@ -1,3 +1,5 @@
-DIST deepmerge-0.1.1.tar.gz 5432 BLAKE2B 18f54fa4f0504c1825300373665c99ef1f0ea8f779b00f89cfe8ad44861cb4991cf5694c08788ac1ad3b52686734967dbb954553ba84741a71a70e24c98e6b18 SHA512 209ff3ca6be02d788f9740b6241e2ae0366592051933438e887cac5f89f86201bb870336e94d1bacff709dd63c7644161b33ed1da29da1b823b37987813862c0
-EBUILD deepmerge-0.1.1.ebuild 564 BLAKE2B 40ea001d2f6d4e207b3b9c320f90c70b1833a6e43adc392f5358f25a18ebcfbe5ff68c0db81d696a2913899a5e5b3e5bdc090036d903196c8cb558a007e14947 SHA512 4e56bf0942a784e0fff00bea3e05a6d4af1033bbe504a63588450fc36263c5eec4b496ab29658fa3ff1ed32d8f8e854226c08b274302f6d76fdffa16b18b1af0
+DIST deepmerge-0.1.1_p1.tar.gz 14317 BLAKE2B 0e327b129a63f1f3fd5a18ae5c895452a823401f54b614c6c085f82e9332b86800e9ccc42fbd2d6c9904e6ae0bc999b393e9af542c310a76c8975567b9b2346f SHA512 72a40609a31dbb692908365f32a94527280e7d1bceed27f27a9a17d6f30551054235de608cef5e88f285bf33b9c155c0aa4aebf74f1c9f8049f0751073593083
+DIST deepmerge-0.2.1.gh.tar.gz 14427 BLAKE2B 0039debcecdbfaf8c4b6f721f6a000dcaf5da41a5601ed2091e00ce496fa14b1c19580a443da0de75c67656e829cb7fc04b13a6604a671ed491ba4e41bb9e08e SHA512 e4e1b87121473be062b77fea4e3cdee85fe4cb3f98a15eabf3a9fbb2f9e209f3caa0fd0a4c1fc20e42aa89d7c1c8d0ecdffde9f99791f3a9f47b6dcfa78f48b0
+EBUILD deepmerge-0.1.1_p1.ebuild 648 BLAKE2B 7374129d8d70d3b6a2dcd8c5186064f48bbbc3acb467c4887569f96e0da9739e52d1a42e33f6b050283864aa20843c23cd95df1806cea66c5d72dafe1ab11b00 SHA512 e96f906f27cfdd5b57511e37984ec2da0b1261f5178fa47d9cb12beb41b1a83e7fbb51845e0229ca7628fde25bd3fe95a9b08d1a10fc94c6ccd7494d7a77c14d
+EBUILD deepmerge-0.2.1.ebuild 567 BLAKE2B bf6ae8a88dfe43621d2b5d5e75771beb5a71557999fda00d335d186f63294f6efe3956586fdeb573666abc884de4fde9a303bca24cb04e015adbda2152bf6c75 SHA512 fa5fe4bfc5ea7a9abd0805858d4eec80941646916ef41f026706284f7025691b948e2922f4b26b62c3150879603d90df186424c9d3d146f4ff338e5a5db9449a
 MISC metadata.xml 263 BLAKE2B 4e090c272c8539944f061cbfe1b05e3b933029de278ac9d555167db0ba98d05f67b430f48dc740d83a3778d32d5d1f5380856736965e9ee602707f60acdc5dc1 SHA512 d820cb3ccd236931ac0f862314a471ba93e5f3e0cfef0f04e73d0229aaaf164b10513980dc760fce7ee333acf6bf6d15d947bf138bf5e279f38ab9ae225ec3c6
diff --git a/dev-python/deepmerge/deepmerge-0.1.1.ebuild b/dev-python/deepmerge/deepmerge-0.1.1_p1.ebuild
index 721eb6b566e2..05d1db1f2708 100644
--- a/dev-python/deepmerge/deepmerge-0.1.1.ebuild
+++ b/dev-python/deepmerge/deepmerge-0.1.1_p1.ebuild
@@ -6,16 +6,17 @@ EAPI=7
 PYTHON_COMPAT=( python3_{7..9} )
 inherit distutils-r1
 
+MY_COMMIT="587279c6771abb13ed831ebc2cba3c9e4d81e7e5"
 DESCRIPTION="Tools to handle merging of nested data structures in python"
 HOMEPAGE="https://deepmerge.readthedocs.io/en/latest"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/toumorokoshi/deepmerge/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_COMMIT}"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-# pypi doesn't ship tests, and last github release is 0.0.5
-RESTRICT="test"
+distutils_enable_tests pytest
 
 python_prepare_all() {
 	sed -i -e '/vcver/d' setup.py || die
diff --git a/dev-python/deepmerge/deepmerge-0.2.1.ebuild b/dev-python/deepmerge/deepmerge-0.2.1.ebuild
new file mode 100644
index 000000000000..3bd2c651aa47
--- /dev/null
+++ b/dev-python/deepmerge/deepmerge-0.2.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+inherit distutils-r1
+
+DESCRIPTION="Tools to handle merging of nested data structures in python"
+HOMEPAGE="https://deepmerge.readthedocs.io/en/latest"
+SRC_URI="
+	https://github.com/toumorokoshi/deepmerge/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/defcon/Manifest b/dev-python/defcon/Manifest
index 76e4f9a5bc28..f7bd0ce01cdb 100644
--- a/dev-python/defcon/Manifest
+++ b/dev-python/defcon/Manifest
@@ -1,5 +1,7 @@
 DIST defcon-0.6.0.tar.gz 403682 BLAKE2B c85cf4f846cab3f7543dcec885221e9f828cdf56fb1a373c9d06b27a29c1ab22fc9702d2ce561af97e3d4aa3b03712538ce0b29a0042fa4a0fea6f11eacba69b SHA512 b981c87d2355dc83b5da0ea4879707336ade8ea4d6ca2bc13da064367938579f2a60dfa5b1c0fd3629f4a2de97676e4f02f30f99a6116049cc2a10abd13a3d7b
 DIST defcon-0.7.2.tar.gz 424146 BLAKE2B 6a3cc6c4bd8ccf030cda5fdaa3d7d2ba8aabc74daf71ce9a006de015d459ff0e5d876d584e7873fba7349a2941490db8d0ebd9a9c880e80db534b231639d3147 SHA512 9cf402b6626b75222e351d11afcde3e0c8be88b3ceb6ed4ff68cc3762b636905b61f31ece288f4d7e5273b6cd2b044661188a39fde1941e1bb5b483b23f3b42e
+DIST defcon-0.8.0.tar.gz 424547 BLAKE2B 4018479d0d67603af58680c1150a143f92230c77b6fd6bda6741ed3f42403c7a7eb2ddc62632ffbf73096fffe8f089975b43a5bb88562ba059fa09ee2e0da12c SHA512 a7b0baec983a3051c7cd804b93983318c14f56a1a88f8f95699b0429740d7b3b27f6f6ab21fd1c31b542008b6f0924aae39e609fc4498ee64c0592272b536b8c
 EBUILD defcon-0.6.0-r1.ebuild 593 BLAKE2B acc65aafbb0131f2f39150d7f37ef57e155b67b3497a5ba0e34a1461fffc4d25fe943fe19a2710899c4bd8a4eeb3251673b61838db1a9207616b2d3cda28e392 SHA512 b8ec2d630d5eac98a90b6c860c1d08e05a0748d69a2eac930c562e5427d6f50df5d1811c135d29d82b95938ee1ab55de2a18ae04c937dbdaa5585c036b2d3311
 EBUILD defcon-0.7.2.ebuild 594 BLAKE2B 765b1df4c1f71a1a76d919a80e3e21abc70566b702a6f1a7c0a0ade312969cdea1c402429611bab53c5c9bd9d107d0d2e50f0b72a28f2cfc3802b787df097f85 SHA512 4816d505d85c62af4eb7a879606bb1fe5f68731ee90be8ce6ced5cc1f7428b562a3e0bc4a4650f2ae0494d8ea232dd5f177850d86fdf3869aa2d510f5212d127
+EBUILD defcon-0.8.0.ebuild 687 BLAKE2B 59f66b848721f21914c58a055ece033656c10b6e07c5261d5ff467408944a7de9855615bc2864914e20fb42126810427fc6553b43a400a616698af8d42ff22ca SHA512 9e39007d876fe338330343de820717e1f6d26f9568a3e43f22309df8c95880c0b5c58ea6bcaba0342e70676ddb965dc68050f56c6ffbe77d2ee163c90bd2fed2
 MISC metadata.xml 392 BLAKE2B a4d2092bcba7205623f44d3f461f3c9f869c9a9e7521b491232f9ade8c3f457c0e60c435b7f0751721279441e493ab0ece6b6da0f6d89a594fc34a18c4d37088 SHA512 70bb099659e2c90b33ecb2ecb2bc3b54bfb0bc148ef872a564df8470ece1ba0b7bf07340a5c6ccfa4f0a9ca574dfb652117dcc88df33ac2bf11a5652c66e0aa6
diff --git a/dev-python/defcon/defcon-0.8.0.ebuild b/dev-python/defcon/defcon-0.8.0.ebuild
new file mode 100644
index 000000000000..a1f46cf8b2f5
--- /dev/null
+++ b/dev-python/defcon/defcon-0.8.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_{7..9} )
+inherit distutils-r1
+
+DESCRIPTION="A set of UFO based objects for use in font editing applications"
+HOMEPAGE="https://github.com/robotools/defcon"
+SRC_URI="https://github.com/robotools/defcon/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-python/fonttools-3.31.0[${PYTHON_USEDEP}]"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/fs[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/defusedxml/Manifest b/dev-python/defusedxml/Manifest
index 898e79ae11f2..08b734904ef5 100644
--- a/dev-python/defusedxml/Manifest
+++ b/dev-python/defusedxml/Manifest
@@ -1,5 +1,7 @@
 DIST defusedxml-0.7.0.rc1.tar.gz 33950 BLAKE2B d2794d0d06ca7bd1faa0b33f3fa7e02fcfb8b7bb7bfba5e0cf4119f7341a618daf80b08e0a6949cad67c5d3ceb84a5d984d731ae129b9aed383b5b583b114013 SHA512 068a6610fcb791385dc1956d1ff1e8b17b143a0138e6a10a293b8f18153d733e160e924f52c565e2df503101faa9b2c3d4718b2980f0e5652034e250b8a82f55
 DIST defusedxml-0.7.0.tar.gz 34412 BLAKE2B 661003c15c4e22877ccbd5c746f782d662bf8ba16dfb998953d979867eed181df01fda51bbec0813497059a27665ab391db7c4d442f90f1f22faafa6a27fe500 SHA512 7738175dafb4092a61d1a73941aecf5d78840e3674e2ae6bbf45e4e0ab6c71a9c9abce8a5394a148d50d90fd6a20d4e02c65241212af2ba6b655c1935e432603
+DIST defusedxml-0.7.1.tar.gz 34709 BLAKE2B cfe69851e0ac6472cb9e66d1b577831eec37b0a01129dcb43cec151aa939029efc194220f3c7b481d306a77db710a639bdd56f3fd1f7ae46fa4ab8f308b8036f SHA512 4f536794b814291520c7db27765014c57f415554cff569cddab596b33e1aa03799aae9448fdaf07417d1a9f4d8782aa827d1b68aac6881ffe5c2ca9b8a40d864
 EBUILD defusedxml-0.7.0.ebuild 771 BLAKE2B 7db25489ae6023850c869e566641bd07f50f23689386c7ed42bd43299ab99e6a14ae2dec83f9b8044175c5659a9542b55c165d7e77ebe557d0e145f7e58ab712 SHA512 5fb7054c2f02260a815f238466f927230abb17bed5e1dcc75c3781d21c0678f349c74cdcf42dcd99bbacec2c4cb29bbeafebbd1c45f4ea921693796ed769e9d8
 EBUILD defusedxml-0.7.0_rc1.ebuild 763 BLAKE2B 4ce16ef59ebaa00ecc4a578428f6988464f281398639fa73abe5ff5de72becfdb34f02e523c3ef9a32b4156f2f42ff6ec5020df5b52b2edd37dd800fc221fa6e SHA512 660a3cd3038dd50bb9d2e4c291e09fd41a07821edc8e01496167093fe1ec34b59ce043f097f50babb7ef711af173809ac20f0436be35d56b1ff6e5e200befa6d
+EBUILD defusedxml-0.7.1.ebuild 771 BLAKE2B 7db25489ae6023850c869e566641bd07f50f23689386c7ed42bd43299ab99e6a14ae2dec83f9b8044175c5659a9542b55c165d7e77ebe557d0e145f7e58ab712 SHA512 5fb7054c2f02260a815f238466f927230abb17bed5e1dcc75c3781d21c0678f349c74cdcf42dcd99bbacec2c4cb29bbeafebbd1c45f4ea921693796ed769e9d8
 MISC metadata.xml 406 BLAKE2B 365781c65fe4cd1a48d65f80056d5ae136c8fb81e88f80e57b5832f0424a30a5c836f8b5f0645f59ffb0e22b7d0732827f96a015699b6469a211bf02935f6f99 SHA512 5185c963f9ed00372963adc8ccf5270daa902704452fa7b2538dbff3a9be51ed860bd92407daa2199be6ff0147c5916ba744cc02ad0012605cfe4d9980f8aba9
diff --git a/dev-python/defusedxml/defusedxml-0.7.1.ebuild b/dev-python/defusedxml/defusedxml-0.7.1.ebuild
new file mode 100644
index 000000000000..3955f4c70145
--- /dev/null
+++ b/dev-python/defusedxml/defusedxml-0.7.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} pypy3 )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="XML bomb protection for Python stdlib modules, an xml serialiser"
+HOMEPAGE="https://pypi.org/project/defusedxml/"
+SRC_URI="
+	https://github.com/tiran/defusedxml/archive/v${PV/_/.}.tar.gz
+		-> ${P/_/.}.tar.gz"
+S=${WORKDIR}/${P/_/.}
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples"
+
+distutils_enable_tests setup.py
+
+src_prepare() {
+	default
+
+	mv other examples || die
+}
+
+python_install_all() {
+	use examples && dodoc -r examples/
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/dulwich/Manifest b/dev-python/dulwich/Manifest
index 9d85940dc472..dd4246133f94 100644
--- a/dev-python/dulwich/Manifest
+++ b/dev-python/dulwich/Manifest
@@ -4,7 +4,7 @@ DIST dulwich-0.20.19.tar.gz 393004 BLAKE2B 89a63943a150ccd15549898689af68769b7f0
 DIST dulwich-0.20.20.tar.gz 397197 BLAKE2B 941cb09c0537ec9ab96fc65cac12f94cc74b549eb2a8a516def96f66a8d31ad602ae4253910a24efe7254411dd4723832481b0df3189a9cb8708e3bbd512eb6f SHA512 ca83bfe3566981830bdc91d2e4ed039625fa6780dcabf74e0e91c9d89001e06dd04c8a10e8dfaf5c5ad67081d77fc9e996e2e3e1a0589954faae09162c545b02
 DIST dulwich-0.20.6.tar.gz 388660 BLAKE2B 1a193d03e0f21a9fdd125617823742b87e9bea74c73734da10eb79f1ecbec0263cb90224f78413c724db8998f4d06ff6c448e7a6d50ce760ba1545f3321b95d8 SHA512 2f11ce9a1c716fb4242f1f93fce92f756bd93ed8f0951fc2e6b3fb18b0a495b0f372966149fca587efcafc0eaf00e9fbfcfd957442a96cc2004eb66cb7f0773e
 EBUILD dulwich-0.20.15.ebuild 1622 BLAKE2B 4575bf17b5e18a6c9b24e874ecfca0d0570011c7192ff015df65e0ef61410dd3f9db3b0d514cbba33a58321bee9c94375460a4d570b03355b11f55d7263cfdae SHA512 30e6a165a3b63a84d4e107b70a6a7a9bbe9fac37dfd7ca1b195b282a51c4a5547b948fcb5e7a57801d3e782c2cdd654261864ba46f7c9c7f8ca3aeba05b91297
-EBUILD dulwich-0.20.18.ebuild 1624 BLAKE2B 349c954db5c2625e0d20e8075795e42e6765b54a929e2276fd25d9ffa8db211d4268358d5b4d75cb1288ef695a2025bb3599f710e73b468454bcb830e10938e4 SHA512 cc9762cb667344f9d2da5c80599bfbb97c0165cce992ff606ea43e3a2f91372aa17ffcaec5c74c70bc1bd6011ec65a5b8c636b7c024e04836967195423305981
+EBUILD dulwich-0.20.18.ebuild 1623 BLAKE2B d30b2cc83dfed6b4497f7995bc7a5ce80370478e54dd507e061d088cb291484f1b8d518e6f46a5a744b11c67e0a16086ed18b62355c6ce9776460cc0636a0672 SHA512 ebfed958f09bead470ad802824438a7f6d3ee6a934a87f7a3a5b812b61322a9ce390af4d179fd94f95471fede1711315a183a4224d385288949b7ddf9d7bebe8
 EBUILD dulwich-0.20.19.ebuild 1623 BLAKE2B 50106cd3c4484d1e1feace25a67f11531fb12d8724684fa007b3bdb8a4705ef0d4089c6ea6d0acfc78b33a4089ac4a3ee372552f32140ef80e0bea2390a17477 SHA512 1de83698c4151d82879edff3acdc605597dfa7e6dfdbf5a6eea427088c4b5bba1810c7640c183458262a7a8e3252e76cea760ec52c1ff97d93e65f174d4a09de
 EBUILD dulwich-0.20.20.ebuild 1634 BLAKE2B efc98f7ef54b9d9f4edd2ade18aa8c6033357c5215b4258b6aa6fa12f990501749512871676e506bdc2723aad490f44f73276b749f83d462b410860fdcf70548 SHA512 b2d2169bc5693b78f8e3c29e460d2d0b658fa68ee8002aefbd513ff4e7791dc5122d138d4ecd238b6f7774f96d59e445d43a17c5964f9f68fe6563ec6506b881
 EBUILD dulwich-0.20.6.ebuild 1616 BLAKE2B d82dd9edb8fe9e96bf7bd7adc8d78f8fefd1e3a853fa851d5de6c5b48310d7bd15bbde07215586efc8721ad0408bf69ed5ea3f350415b337dc4a1f2d0109c6bb SHA512 867cf515ebb647f25bcb356f924739e412aa9746cc4842cbbab63ac23e8431ef2a06103fa3324aeff6ee04a9f66b3b142f06b7515cbfd2a20be6ec87e68f490e
diff --git a/dev-python/dulwich/dulwich-0.20.18.ebuild b/dev-python/dulwich/dulwich-0.20.18.ebuild
index c8d0f79e4e49..7f87ddd01bc0 100644
--- a/dev-python/dulwich/dulwich-0.20.18.ebuild
+++ b/dev-python/dulwich/dulwich-0.20.18.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/elasticsearch-curator/Manifest b/dev-python/elasticsearch-curator/Manifest
index 77fa449f5b8f..fbb9eda61716 100644
--- a/dev-python/elasticsearch-curator/Manifest
+++ b/dev-python/elasticsearch-curator/Manifest
@@ -1,4 +1,7 @@
 DIST elasticsearch-7.3.2-linux-x86_64.tar.gz 285050383 BLAKE2B 730d8550f5887facae3075ce3b0bdb96b49350782fe7e687b8f4477bb363ce7c1595f2b1ece2b7d59d18539886b6e4806f56b0f5674bc417528232a92f1c00a8 SHA512 08e89347797ec6f008fb76cda17ec3e0dbc553fc992d07f4944fd99d17d5bc934849d9e534724d1541432c9844d3da57d875bc08a0c4cd95ba4251e2b03f833b
 DIST elasticsearch-curator-5.8.1.tar.gz 231233 BLAKE2B d2369c18be69cc5c8e17a6d7a72660bd7165c349cdb06c740c8db9dd2b583f181a09ba7d53ee0f4692cb6e31d373274f0610f2a654ba4a6da2d0ca0ff22c7c97 SHA512 500767967f423629f34d42ee088a9c007e193216c42f5590364ffcacc9e1efeba65dd4d333f806250e3b7fe0bea8b5501d1e6f3bf6fb0b8c46a46954e92c4a65
+DIST elasticsearch-curator-5.8.3.tar.gz 239107 BLAKE2B 6f924dd2e5d39f06741dbb0529f4ea8bb61a280ebe901682ffd95054cd1ad2b30ef5619d0d4c8237923a6ab3d9bd7531a7bc6ff674435d807f1f146a2ecb57e7 SHA512 243d37aa36a50711b57aeb1df61ed48f29e5097d9f7d5b515a5437dca2b4eb92ed92a4886db3213ef549192d9886c20ee10133856990e8c0ebaa16bb24a10592
 EBUILD elasticsearch-curator-5.8.1-r2.ebuild 5000 BLAKE2B a32098c4696d7d3fcbd98114dde6ac6347e8477523787a708aa71f3c6df959f3023eaea40cc49d1cb999e051d2d1336e8f89a2696e83ad54d68bfd06ef2becc4 SHA512 e577aed093ca6acd8d8f2364ba05417c66d363ebf79bd6d8108633901c3b8c0d3cb98f2d32145e7020a1f79ca9f506894fd0fde6e0b8fa65b54b038901e532d5
+EBUILD elasticsearch-curator-5.8.1-r3.ebuild 5091 BLAKE2B aee6aa6d671d6a078a033687da7ee751a8f45fdfa95bb7c00ba95d457376ece5632c17a3e2228cdab40e710d44bdf63943df29cb0505891be9501c9173ba9460 SHA512 e09e19a1f150fb13762ad25eb976a5d608a582334ab300a769e952d251437c99cfb45d46188587810f77cb876a7142ac34359ae17e5767ff991793aa25cc2dc4
+EBUILD elasticsearch-curator-5.8.3.ebuild 5096 BLAKE2B 476f30ba965bba0b339d2c9d42f16ffad2f124a48bee095af1ac0aa83eaaaa8d31aff157fe0aacd75e9579f587adca0fbe7172bbc0f49f1e482eb3d03c1b91c0 SHA512 e5375c8441dec1ce4ad56884830689ca819a6292687762b267a1c5cd58455eb3c026b6fd4951892abaddd53960d5a68e1e48f360243f5cc309068fccaab97ed6
 MISC metadata.xml 304 BLAKE2B 08a58fb0853f9fa5113313673eb6884f09248e8ba6cc8e94ecc7068b3d07054b0d6762235529b2629835fa735ad8d695871a6d39491f50079f20d526f64dfebf SHA512 d9584d016eb61732b1cafe35b0e02df2c26f2759c00aa89a206e7d46e9c7309f66ad6fbf9dd3a992df46feb608d3b5fa354d878aa38c206c26565f4c987926c8
diff --git a/dev-python/elasticsearch-curator/elasticsearch-curator-5.8.1-r3.ebuild b/dev-python/elasticsearch-curator/elasticsearch-curator-5.8.1-r3.ebuild
new file mode 100644
index 000000000000..526bbb2aac47
--- /dev/null
+++ b/dev-python/elasticsearch-curator/elasticsearch-curator-5.8.1-r3.ebuild
@@ -0,0 +1,165 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_7 )
+
+MY_PN="curator"
+ES_VERSION="7.3.2"
+
+inherit distutils-r1
+
+DESCRIPTION="Tending time-series indices in Elasticsearch"
+HOMEPAGE="https://github.com/elastic/curator"
+SRC_URI="https://github.com/elastic/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	test? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${ES_VERSION}-linux-x86_64.tar.gz )"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+# tests fail in chroot
+# https://github.com/elastic/elasticsearch/issues/12018
+RESTRICT="test"
+IUSE="doc test"
+
+# vulnerable pyyaml
+# https://github.com/elastic/curator/issues/1415
+RDEPEND="
+	>=dev-python/elasticsearch-py-7.0.4[${PYTHON_USEDEP}]
+	<dev-python/elasticsearch-py-8.0.0[${PYTHON_USEDEP}]
+	>=dev-python/click-6.7[${PYTHON_USEDEP}]
+	<dev-python/click-7.0[${PYTHON_USEDEP}]
+	>=dev-python/certifi-2019.9.11[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.20.0[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.24.2[${PYTHON_USEDEP}]
+	<dev-python/urllib3-1.26[${PYTHON_USEDEP}]
+	>=dev-python/voluptuous-0.9.3[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/six-1.11.0[${PYTHON_USEDEP}]
+	dev-python/sphinx
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/cx_Freeze[${PYTHON_USEDEP}]
+	dev-python/importlib_metadata[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND}
+		virtual/jre
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+python_prepare_all() {
+	# avoid downloading from net
+	sed -e '/^intersphinx_mapping/,+3d' -i docs/conf.py || die
+
+	# requests_aws4auth not in portage
+	sed -e '/boto3/d' \
+		-e '/requests_aws4auth/d' \
+		-e 's/pyyaml==3.13/pyyaml/g' \
+		-e '/tests_require/s/, "coverage", "nosexcover"//g' \
+		-i setup.cfg setup.py || die
+
+	# Bug 713342
+	sed -i 's/yaml.load/yaml.unsafe_load/g' curator/utils.py test/unit/* || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	emake -C docs -j1 man $(usex doc html "")
+}
+
+# running tests in non-chroot environments:
+# FEATURES="test -usersandbox" emerge dev-python/elasticsearch-curator
+python_test_all() {
+	# starts two ES instances (local,remote) and runs the tests
+	# https://github.com/elastic/curator/blob/master/travis-run.sh
+	local ES_INSTANCES="local remote"
+	local ES_PATH="${WORKDIR}/elasticsearch-${ES_VERSION}"
+
+	declare -A ES_PORT
+	ES_PORT[local]=9200
+	ES_PORT[remote]=9201
+
+	local i transport
+	declare -A ES_CONFIG_DIR ES_CONFIG_PATH ES_INSTANCE ES_LOG ES_PID
+	for i in ${ES_INSTANCES}; do
+		ES_CONFIG_DIR[$i]="${ES_PATH}/$i"
+		ES_CONFIG_PATH[$i]="${ES_CONFIG_DIR[$i]}/elasticsearch.yml"
+		ES_PID[$i]="${ES_PATH}/$i.pid"
+		ES_LOG[$i]="${ES_PATH}/logs/$i.log"
+	done
+
+	# configure ES instances
+	for i in ${ES_INSTANCES}; do
+		mkdir -p "${ES_CONFIG_DIR[$i]}" || die
+		cp ${ES_PATH}/config/{jvm.options,log4j2.properties} "${ES_CONFIG_DIR[$i]}"/ || die
+		echo 'network.host: 127.0.0.1' > "${ES_CONFIG_PATH[$i]}" || die
+		echo "http.port: ${ES_PORT[$i]}" >> "${ES_CONFIG_PATH[$i]}" || die
+		echo "cluster.name: $i" >> "${ES_CONFIG_PATH[$i]}" || die
+		echo "node.name: $i" >> "${ES_CONFIG_PATH[$i]}" || die
+		echo 'node.max_local_storage_nodes: 2' >> "${ES_CONFIG_PATH[$i]}" || die
+		transport=$((${ES_PORT[$i]}+100))
+		echo "transport.port: ${transport}" >> "${ES_CONFIG_PATH[$i]}" || die
+		echo "discovery.seed_hosts: [\"localhost:${transport}\"]" >> "${ES_CONFIG_PATH[$i]}" || die
+		echo "discovery.type: single-node" >> "${ES_CONFIG_PATH[$i]}" || die
+	done
+
+	echo 'path.repo: /' >> "${ES_CONFIG_PATH[local]}" || die
+	echo "reindex.remote.whitelist: localhost:${ES_PORT[remote]}" >> "${ES_CONFIG_PATH[local]}" || die
+
+	# start ES instances
+	for i in ${ES_INSTANCES}; do
+		ES_PATH_CONF=${ES_CONFIG_DIR[$i]} "${ES_PATH}/bin/elasticsearch" -d -p "${ES_PID[$i]}" || die
+
+		local j
+		local es_started=0
+		for j in {1..30}; do
+			grep -q "started" "${ES_LOG[$i]}" 2> /dev/null
+			if [[ $? -eq 0 ]]; then
+				einfo "Elasticsearch $i started"
+				es_started=1
+				eend 0
+				break
+			elif grep -q 'BindException\[Address already in use\]' "${ES_LOG[$i]}" 2>/dev/null; then
+				eend 1
+				eerror "Elasticsearch $i already running"
+				die "Cannot start Elasticsearch $i for tests"
+			else
+				einfo "Waiting for Elasticsearch $i"
+				eend 1
+				sleep 2
+				continue
+			fi
+		done
+
+		[[ $es_started -eq 0 ]] && die "Elasticsearch failed to start"
+	done
+
+	export TEST_ES_SERVER="localhost:${ES_PORT[local]}"
+	export REMOTE_ES_SERVER="localhost:${ES_PORT[remote]}"
+
+	# run tests
+	nosetests -v || die
+
+	for i in ${ES_INSTANCES}; do
+		pkill -F ${ES_PID[$i]}
+	done
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	doman docs/_build/man/*
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	ewarn ""
+	ewarn "For Python 3 support information please read: http://click.pocoo.org/latest/python3/"
+	ewarn ""
+	ewarn "Example usage on Python 3:"
+	ewarn "export LC_ALL=en_US.UTF-8"
+	ewarn "export LANG=en_US.UTF-8"
+	ewarn "curator ..."
+}
diff --git a/dev-python/elasticsearch-curator/elasticsearch-curator-5.8.3.ebuild b/dev-python/elasticsearch-curator/elasticsearch-curator-5.8.3.ebuild
new file mode 100644
index 000000000000..7f6b7f539bfa
--- /dev/null
+++ b/dev-python/elasticsearch-curator/elasticsearch-curator-5.8.3.ebuild
@@ -0,0 +1,165 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+MY_PN="curator"
+ES_VERSION="7.3.2"
+
+inherit distutils-r1
+
+DESCRIPTION="Tending time-series indices in Elasticsearch"
+HOMEPAGE="https://github.com/elastic/curator"
+SRC_URI="https://github.com/elastic/${MY_PN}/archive/V${PV}.tar.gz -> ${P}.tar.gz
+	test? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${ES_VERSION}-linux-x86_64.tar.gz )"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+# tests fail in chroot
+# https://github.com/elastic/elasticsearch/issues/12018
+RESTRICT="test"
+IUSE="doc test"
+
+# vulnerable pyyaml
+# https://github.com/elastic/curator/issues/1415
+RDEPEND="
+	>=dev-python/elasticsearch-py-7.0.4[${PYTHON_USEDEP}]
+	<dev-python/elasticsearch-py-8.0.0[${PYTHON_USEDEP}]
+	>=dev-python/click-6.7[${PYTHON_USEDEP}]
+	<dev-python/click-7.0[${PYTHON_USEDEP}]
+	>=dev-python/certifi-2019.9.11[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.20.0[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.24.2[${PYTHON_USEDEP}]
+	<dev-python/urllib3-1.26[${PYTHON_USEDEP}]
+	>=dev-python/voluptuous-0.9.3[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/six-1.11.0[${PYTHON_USEDEP}]
+	dev-python/sphinx
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/cx_Freeze[${PYTHON_USEDEP}]
+	dev-python/importlib_metadata[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND}
+		virtual/jre
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+python_prepare_all() {
+	# avoid downloading from net
+	sed -e '/^intersphinx_mapping/,+3d' -i docs/conf.py || die
+
+	# requests_aws4auth not in portage
+	sed -e '/boto3/d' \
+		-e '/requests_aws4auth/d' \
+		-e 's/pyyaml==3.13/pyyaml/g' \
+		-e '/tests_require/s/, "coverage", "nosexcover"//g' \
+		-i setup.cfg setup.py || die
+
+	# Bug 713342
+	sed -i 's/yaml.load/yaml.unsafe_load/g' curator/utils.py test/unit/* || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	emake -C docs -j1 man $(usex doc html "")
+}
+
+# running tests in non-chroot environments:
+# FEATURES="test -usersandbox" emerge dev-python/elasticsearch-curator
+python_test_all() {
+	# starts two ES instances (local,remote) and runs the tests
+	# https://github.com/elastic/curator/blob/master/travis-run.sh
+	local ES_INSTANCES="local remote"
+	local ES_PATH="${WORKDIR}/elasticsearch-${ES_VERSION}"
+
+	declare -A ES_PORT
+	ES_PORT[local]=9200
+	ES_PORT[remote]=9201
+
+	local i transport
+	declare -A ES_CONFIG_DIR ES_CONFIG_PATH ES_INSTANCE ES_LOG ES_PID
+	for i in ${ES_INSTANCES}; do
+		ES_CONFIG_DIR[$i]="${ES_PATH}/$i"
+		ES_CONFIG_PATH[$i]="${ES_CONFIG_DIR[$i]}/elasticsearch.yml"
+		ES_PID[$i]="${ES_PATH}/$i.pid"
+		ES_LOG[$i]="${ES_PATH}/logs/$i.log"
+	done
+
+	# configure ES instances
+	for i in ${ES_INSTANCES}; do
+		mkdir -p "${ES_CONFIG_DIR[$i]}" || die
+		cp ${ES_PATH}/config/{jvm.options,log4j2.properties} "${ES_CONFIG_DIR[$i]}"/ || die
+		echo 'network.host: 127.0.0.1' > "${ES_CONFIG_PATH[$i]}" || die
+		echo "http.port: ${ES_PORT[$i]}" >> "${ES_CONFIG_PATH[$i]}" || die
+		echo "cluster.name: $i" >> "${ES_CONFIG_PATH[$i]}" || die
+		echo "node.name: $i" >> "${ES_CONFIG_PATH[$i]}" || die
+		echo 'node.max_local_storage_nodes: 2' >> "${ES_CONFIG_PATH[$i]}" || die
+		transport=$((${ES_PORT[$i]}+100))
+		echo "transport.port: ${transport}" >> "${ES_CONFIG_PATH[$i]}" || die
+		echo "discovery.seed_hosts: [\"localhost:${transport}\"]" >> "${ES_CONFIG_PATH[$i]}" || die
+		echo "discovery.type: single-node" >> "${ES_CONFIG_PATH[$i]}" || die
+	done
+
+	echo 'path.repo: /' >> "${ES_CONFIG_PATH[local]}" || die
+	echo "reindex.remote.whitelist: localhost:${ES_PORT[remote]}" >> "${ES_CONFIG_PATH[local]}" || die
+
+	# start ES instances
+	for i in ${ES_INSTANCES}; do
+		ES_PATH_CONF=${ES_CONFIG_DIR[$i]} "${ES_PATH}/bin/elasticsearch" -d -p "${ES_PID[$i]}" || die
+
+		local j
+		local es_started=0
+		for j in {1..30}; do
+			grep -q "started" "${ES_LOG[$i]}" 2> /dev/null
+			if [[ $? -eq 0 ]]; then
+				einfo "Elasticsearch $i started"
+				es_started=1
+				eend 0
+				break
+			elif grep -q 'BindException\[Address already in use\]' "${ES_LOG[$i]}" 2>/dev/null; then
+				eend 1
+				eerror "Elasticsearch $i already running"
+				die "Cannot start Elasticsearch $i for tests"
+			else
+				einfo "Waiting for Elasticsearch $i"
+				eend 1
+				sleep 2
+				continue
+			fi
+		done
+
+		[[ $es_started -eq 0 ]] && die "Elasticsearch failed to start"
+	done
+
+	export TEST_ES_SERVER="localhost:${ES_PORT[local]}"
+	export REMOTE_ES_SERVER="localhost:${ES_PORT[remote]}"
+
+	# run tests
+	nosetests -v || die
+
+	for i in ${ES_INSTANCES}; do
+		pkill -F ${ES_PID[$i]}
+	done
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	doman docs/_build/man/*
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	ewarn ""
+	ewarn "For Python 3 support information please read: http://click.pocoo.org/latest/python3/"
+	ewarn ""
+	ewarn "Example usage on Python 3:"
+	ewarn "export LC_ALL=en_US.UTF-8"
+	ewarn "export LANG=en_US.UTF-8"
+	ewarn "curator ..."
+}
diff --git a/dev-python/elasticsearch-py/Manifest b/dev-python/elasticsearch-py/Manifest
index fc60c664bf31..15d8ed5382e6 100644
--- a/dev-python/elasticsearch-py/Manifest
+++ b/dev-python/elasticsearch-py/Manifest
@@ -1,4 +1,5 @@
 DIST elasticsearch-oss-7.7.0-no-jdk-linux-x86_64.tar.gz 73216528 BLAKE2B f0f1a3d3347ea37703e90bd896b24f6e3c58406d9fb20f3607a4d08eee325b5ae293db48d1afdc208468ee775b9085a28f39f2e175b67e4881bfb61d5cb85a9a SHA512 f9b323cff078a0dc856f99efd164775a9cd0718bb0ddb6c4d4817fa53cae71748f1aec5158afa45d4b29076043cbada9743a996e685439436e93d94a9eff2768
 DIST elasticsearch-py-7.7.0.tar.gz 128862 BLAKE2B 461b7ac3bc6d96bacdc1e8595c05b4dfd3e6bad2d2d11eecaedcb3b7e96c7390fe26c47b7095b3b1e8500872cfef689a749bd7103bef352680a2cf3ef7dad350 SHA512 6da382c5056f61dde2bf509c902a4ca33548ee937d037dc977e8c8864ebc09385f630b5c99ab8b24b69390773a241786495d1c01a5684ea3892d834e7a1550b1
+EBUILD elasticsearch-py-7.7.0-r1.ebuild 2935 BLAKE2B 13c8802c1a2e3b44387c461bb7d6c3b221b0a0c275231353925e0b1887c58d97775a1829148e63f9454576697c6fd117b95c4a3ee25da01ab0a00031f9347722 SHA512 0686e343f49de18249d7c4650c9ca3b81873d06d62054534cddd0465a9b33f31a4f7ad06160039851777562cfa746396b092726d58b93329f1b07228be2f8409
 EBUILD elasticsearch-py-7.7.0.ebuild 2933 BLAKE2B caf9fe1e4229bc95b9562246f8e7f92bfdb3292f505fb58ad1582b081a93cbabfc521ece39f2333765687342c42b3d4cdc3890b2cc80600e3cd6e3f5e0941a65 SHA512 56d41ed981f93b80a9f2b6f506c2b738ab47f328448cb554580cee7a08292952f170ee0b4f9b909e7d0dae6677098e7deb09864afad2527ddd6373144d9ebbcb
 MISC metadata.xml 505 BLAKE2B f91672ea101edbc85c7c726c3f2cc996f028f2cbb1688138a1cc8f3f4afed6531820bab6234830b75698efaa328ba38faa660b6c598ec3fb9dd6091eb5b7d37c SHA512 4e93c374721a8fc667640fc5cb8c78d0540cc4b45e4a06c3350a402e419465275d54d83d47ae44cc8f16c86e26b140456c98d7d3097d04b23f1ca66776b8c7cc
diff --git a/dev-python/elasticsearch-py/elasticsearch-py-7.7.0-r1.ebuild b/dev-python/elasticsearch-py/elasticsearch-py-7.7.0-r1.ebuild
new file mode 100644
index 000000000000..ad8b35583dab
--- /dev/null
+++ b/dev-python/elasticsearch-py/elasticsearch-py-7.7.0-r1.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+ES_VERSION="7.7.0"
+
+inherit distutils-r1
+
+MY_PN=${PN/-py/}
+DESCRIPTION="Official Python low-level client for Elasticsearch"
+HOMEPAGE="https://github.com/elastic/elasticsearch-py"
+SRC_URI="https://github.com/elastic/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+	test? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-oss-${ES_VERSION}-no-jdk-linux-x86_64.tar.gz )"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+# tests fail in chroot
+# https://github.com/elastic/elasticsearch/issues/12018
+RESTRICT="test"
+
+RDEPEND="dev-python/certifi[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.21.1[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/requests-2.0.0[${PYTHON_USEDEP}]
+		<dev-python/requests-3.0.0[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pretty-yaml[${PYTHON_USEDEP}]
+		virtual/jre:*
+	)"
+BDEPEND=">=dev-python/sphinx-1.3.1-r1"
+
+python_prepare_all() {
+	# needs numpy/pandas
+	sed -e '/test_serializes_numpy_bool/,+79d' \
+		-e '/import numpy/d' \
+		-e '/import pandas/d' \
+		-i test_elasticsearch/test_serializer.py || die
+
+	sed -e '/coverage/d' \
+		-e '/nosexcover/d' \
+		-i setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	emake -C docs -j1 man $(usex doc html "")
+}
+
+# FEATURES="test -usersandbox" emerge dev-python/elasticsearch-py
+python_test() {
+	local es="${WORKDIR}/elasticsearch-${ES_VERSION}"
+	local es_port="25124"
+	local es_instance="gentoo-es-py-test"
+	local es_log="${es}/logs/${es_instance}.log"
+	local pid="${es}/elasticsearch.pid"
+	export JAVA_HOME=$(java-config -g JAVA_HOME || die)
+
+	# run Elasticsearch instance on custom port
+	sed -i "s/#http.port: 9200/http.port: ${es_port}/g; \
+		s/#cluster.name: my-application/cluster.name: ${es_instance}/g" \
+		"${es}/config/elasticsearch.yml" || die
+
+	# start local instance of elasticsearch
+	"${es}"/bin/elasticsearch -d -p "${pid}" -Epath.repo=/ || die
+
+	local i
+	local es_started=0
+	for i in {1..20}; do
+		grep -q "started" ${es_log} 2> /dev/null
+		if [[ $? -eq 0 ]]; then
+			einfo "Elasticsearch started"
+			es_started=1
+			eend 0
+			break
+		elif grep -q 'BindException\[Address already in use\]' "${es_log}" 2>/dev/null; then
+			eend 1
+			eerror "Elasticsearch already running"
+			die "Cannot start Elasticsearch for tests"
+		else
+			einfo "Waiting for Elasticsearch"
+			eend 1
+			sleep 2
+			continue
+		fi
+	done
+
+	[[ $es_started -eq 0 ]] && die "Elasticsearch failed to start"
+
+	export ELASTICSEARCH_HOST="localhost:${es_port}"
+	nosetests -v || die
+
+	pkill -F ${pid} || die
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( docs/_build/html/. )
+	doman docs/_build/man/*
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/fastjsonschema/Manifest b/dev-python/fastjsonschema/Manifest
index 4db9cdbd8c1f..84debe5fe8a6 100644
--- a/dev-python/fastjsonschema/Manifest
+++ b/dev-python/fastjsonschema/Manifest
@@ -1,5 +1,3 @@
-DIST python-fastjsonschema-2.14.5.tar.gz 33488 BLAKE2B 4604ebd46851c8fe856909fa3943e053ac7359a9f360c189add2a46780fe045ca1952033174d008db7696bfc861a504c3aaa7389c33a2edbccd10cb14de8a097 SHA512 255db86d1d62845e512ca5669f3200360847d974710050ac53fe88536d6d9f943ccf41a8414702dad70fa1a38defe9859f2b608e13a54af11199c90d63cdf1d0
 DIST python-fastjsonschema-2.15.0.tar.gz 35225 BLAKE2B 43b5dce109b0b25db4906b13223ede61b9f9eee9acb05b207d3cd11e0cc1d3740674c4e29709ce55dca8b4964643942be0959267d0228a71ff8fb535ccc5de17 SHA512 3323c085e79e1a465e807ef972ecd3f09811e232a36abc16d6b2e3e2ac5cc343edf2610e18d18b64fdd555d640c0ef1dd3417e268b5c62738f82680a404a300a
-EBUILD fastjsonschema-2.14.5.ebuild 577 BLAKE2B 98da8940b1f3210f64bd925a602e6a3f5fd59545d237b6495654fde3ddf2705d7c58e72991d66cb51b99152b08aa5e5f94eefb14e710f8158e97c0ed80448f88 SHA512 9a04f102b23b996fe9e62be6058210a87eefbb9aa894b428306798e9cd2cbcda8ca6e2b8dc3e20f14d96faf8178787710659b9d91c97e4e5c2391f78a5bee566
-EBUILD fastjsonschema-2.15.0.ebuild 585 BLAKE2B dc7a5f36d0a0bbf81a6a16588f01ce1390f55cec3b5ab59606494afdde87f8fea6a25ff2d4edaa1ab5b359f639a899732a89dc993c675e5ea5a865042dd9997b SHA512 af1184abb37f2ae4a5f9032cbe8d8a4fcbc198859a779befa8e98477f75e80b38f1ed37c021df015d0444471b019ab0ee017a96a6592bf93f1cda5ccb50ef197
-MISC metadata.xml 295 BLAKE2B 3074fbdbb11405da3fe5f91635d597613413c525ecca4c64e06fe674f64dfc3bf8283ceadfff25f18b963887440600d96d0d6c885d3646871e408104eaa82e1d SHA512 21d8a9a257002002453b0975bb890d047eefbc9a3367b2eec5f51d321b95de5538347bf96041ab62117d66f76b1e4c5c587861434e273818df7b11c38920d3a8
+EBUILD fastjsonschema-2.15.0.ebuild 582 BLAKE2B 8880ef570a879cfe78768728655fa16a702a714540a858bf9703f202bf3dae82150e9b7cb432063b54c31fbe67c053d197070f3fa6a8dd5633966da99569feeb SHA512 8b7f3e5545b1e0f1355364691596a533a0b84dcddbe09774f75827bc958af64f2980e24bec2f08651475919ee8eca6703d58ab954aaa077ce52a36344171c8c8
+MISC metadata.xml 319 BLAKE2B e19c02bfc0b2d83b78d1d775d34f9556025170483be474d2b3a4803d62818de81706fb50011059260011d3e0cb11736059014c549af5c2ef913b711a87e7c953 SHA512 6efd64e7ea5b5e60d33f87d5cb75941d976c5c84cd1bec89afa5ef611b0efc620dadf2983f303f6a360a6362db003ef14ff28dd4280105c61ba43ec7b71c41de
diff --git a/dev-python/fastjsonschema/fastjsonschema-2.14.5.ebuild b/dev-python/fastjsonschema/fastjsonschema-2.14.5.ebuild
deleted file mode 100644
index eb92e2dc92d3..000000000000
--- a/dev-python/fastjsonschema/fastjsonschema-2.14.5.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-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/fastjsonschema/fastjsonschema-2.15.0.ebuild b/dev-python/fastjsonschema/fastjsonschema-2.15.0.ebuild
index 3669e189ca8f..d7a02824024e 100644
--- a/dev-python/fastjsonschema/fastjsonschema-2.15.0.ebuild
+++ b/dev-python/fastjsonschema/fastjsonschema-2.15.0.ebuild
@@ -16,7 +16,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/fastjsonschema/metadata.xml b/dev-python/fastjsonschema/metadata.xml
index b22752a68952..2ef6489eb775 100644
--- a/dev-python/fastjsonschema/metadata.xml
+++ b/dev-python/fastjsonschema/metadata.xml
@@ -4,6 +4,7 @@
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">fastjsonschema</remote-id>
 	</upstream>
diff --git a/dev-python/flask-cors/Manifest b/dev-python/flask-cors/Manifest
index 9bf0f92eeca0..4f73f1902e87 100644
--- a/dev-python/flask-cors/Manifest
+++ b/dev-python/flask-cors/Manifest
@@ -1,3 +1,3 @@
 DIST flask-cors-3.0.10.tar.gz 31012 BLAKE2B 2e546518c8183dfca32308ef0f7d8f503c75ff62302d11ac0dc315f7c6760fa3e9064477216fd8c2cd290b0a280e6c45c35cf2cce3cfdffe141edab7beca1c8a SHA512 4471e94aea92700185a6fca37f01d61b9b966754f206eb6211813fb8c82fc0d219597e3df80e9d80b68663931ec561ca209fe23afa0142345fb75beacf3adc4e
-EBUILD flask-cors-3.0.10.ebuild 810 BLAKE2B 60bb22b310d0d550d02c24e9f1d28f2d64d8a5976f76e016fe56d7e1bcd3743595d2299d962bf8fae3db0b651e7524896b21ca0890ddc0281159d7fb6f4d6de3 SHA512 4ae10cb5be99418bdb0430350ac56d7f558c8797db0e51a5f4b37008b149cbbb7c81e53d50fe51698c741d63191e0a49e0e780ae46d53ab413c859709c3a2326
+EBUILD flask-cors-3.0.10.ebuild 817 BLAKE2B 2e277e31015a268122b0c7f94eda77b1d49e9583a106d0fd8868a055250d42284e90c4913c41c1f2a338af51504b5ec5c09c86512f78c8657573e713051c0131 SHA512 908ef79e9ebd4c23ab6cf23a03ab09951639346d57d983e46fecedee51216c2b0c7a003e47be483545151dc05d99850dfc42eef4daaa174006ff8eb82887c8f8
 MISC metadata.xml 539 BLAKE2B e07720b476d151810d692a4dc4d0bc5712fdc9477731272e46de0f65a14fdeade798c7c9e91e4eb85e49293f7e52a2c03bfbf69fa6b024a2ecb8cb75fc469073 SHA512 c90f218c17ba4e11e9d3cdfb057179ccd58fc95242cdc8b4fb213b326ff7d7b267a5ce8b68851bc0637e1d6b0bfcea8ad7f73e371818b25706cdde635b35af9c
diff --git a/dev-python/flask-cors/flask-cors-3.0.10.ebuild b/dev-python/flask-cors/flask-cors-3.0.10.ebuild
index fb63fbbbae0a..b2c5f36fbecd 100644
--- a/dev-python/flask-cors/flask-cors-3.0.10.ebuild
+++ b/dev-python/flask-cors/flask-cors-3.0.10.ebuild
@@ -12,7 +12,7 @@ if [[ "${PV}" == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/corydolphin/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 DESCRIPTION="A Flask extension for Cross Origin Resource Sharing (CORS)"
diff --git a/dev-python/flask-security/Manifest b/dev-python/flask-security/Manifest
index 548493499707..55c17a3872e7 100644
--- a/dev-python/flask-security/Manifest
+++ b/dev-python/flask-security/Manifest
@@ -1,4 +1,9 @@
+AUX flask-security-3.4.3-optional-deps.patch 2287 BLAKE2B 5cd174499a3fc22e0888850332ccd0798927a3127d6b84b19dae2ae1cbb8c998b6e8e5246a76eb84712d932f80c77316201834ee048c05c2de6e190bf9aafed6 SHA512 08b0ebfadbf126d1c4dfbc51d222f5da797c40bafc11c923eb2a98c3f65778f2f5400e0ced37c5fc6318a7941dd036ae780dbc958980620bd075f0212c0ea49d
 AUX flask-security-4.0.0-test-install.patch 590 BLAKE2B 54f4b8e174af28b875d937f727401dbc323a9326f98f7a045742448f227929246af6d1e1bfd3a45830618b433b5a3e60a1b01fcb0202e1bf01e3efb13b023fc0 SHA512 13da8c4eeb967e730ffff647ac9345a33fed7e2c8de2db21f6f10c9c10cfbdf8d263804032884298b528c00103705afccab81110839df95409635b78a139fc67
+DIST flask-security-3.4.4.gh.tar.gz 348525 BLAKE2B 77a851c2549be9ce8612e3b186ad2d83d272b277f286885da491f3f0fe99e8836d145749ae137f1e75625c34b2214270ba4d24f1bfaa514012064dd38f083230 SHA512 1c1a4f079199704d7a2a4e11351cd199e3a790f5d0c7f68b240c299e83b129227fac4ca00caf45401efbf14520c1d65d3b710b85e8f53b495283b94a164f97a2
+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
+EBUILD flask-security-3.4.4.ebuild 2191 BLAKE2B c849507f90f3ccf8c7b9b09d787ea15dea55a61d8ab40537779557f9ee28bc36cd52829bf55d570d5218006cf4fd2b13c9bc67ed5e2e11527c17dde06a3d9f13 SHA512 98425abe2e65f5564bcc76824c97d49a56c7745fd702c4e614391a188e6c06381d73acff33f98e1c46785fdf2e2e13d7984126050bea1b6d9369db1f4edd97d5
+EBUILD flask-security-3.4.5.ebuild 2191 BLAKE2B c849507f90f3ccf8c7b9b09d787ea15dea55a61d8ab40537779557f9ee28bc36cd52829bf55d570d5218006cf4fd2b13c9bc67ed5e2e11527c17dde06a3d9f13 SHA512 98425abe2e65f5564bcc76824c97d49a56c7745fd702c4e614391a188e6c06381d73acff33f98e1c46785fdf2e2e13d7984126050bea1b6d9369db1f4edd97d5
 EBUILD flask-security-4.0.0.ebuild 1950 BLAKE2B fc96c8cbcca9444dffa1587dd44d2a195c0126dc244d874ca87f28744d67a209a24c2143a63f7fdab913645e439e9308975babbe554a8fb2e8e672c3a0a3148a SHA512 64dd7f4f5522a92b840581a4e87e31d3075c19809cfc1bc0a048fe1aa5811623429e1d9ff07cf9cad0956217952e8f39cb32560065be1d028071a817f5455c8c
 MISC metadata.xml 416 BLAKE2B 1da613b370aed838bdfe6ffaa616c80aca54cab6030680212db38c0bf1ff783d24db11d8dd2056843621668b25ccba850b2c3d6d62b378ade78f88b263c5573d SHA512 3ab74e9f590c343323fd3d9438bf2a487b77019eeb986e4a0f461c991a00075a70246812cde79f27a337c6ba385e162148a4382063888ff7f2fcf8405bf9573a
diff --git a/dev-python/flask-security/files/flask-security-3.4.3-optional-deps.patch b/dev-python/flask-security/files/flask-security-3.4.3-optional-deps.patch
new file mode 100644
index 000000000000..484e816908f4
--- /dev/null
+++ b/dev-python/flask-security/files/flask-security-3.4.3-optional-deps.patch
@@ -0,0 +1,63 @@
+From 8943f49c3e6064839bd1e3c2c73a750b2b476ae3 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Wed, 15 Jul 2020 09:02:15 +0200
+Subject: [PATCH 1/2] tests: Skip tests requiring specific data backends if not
+ available
+
+Skip tests that require a specific database backend if the respective
+package is not available.  This is mostly intended to make it possible
+to test flask-security on Python 3.9 since Pony does not support this
+Python version but there is no harm in extending it to other backends.
+
+Technically, Flask-SQLAlchemy is still required due to other tests.
+---
+ tests/conftest.py | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/tests/conftest.py b/tests/conftest.py
+index 3305d92..a48f480 100644
+--- a/tests/conftest.py
++++ b/tests/conftest.py
+@@ -218,6 +218,7 @@ def mongoengine_datastore(request, app, tmpdir, realdburl):
+ 
+ 
+ def mongoengine_setup(request, app, tmpdir, realdburl):
++    pytest.importorskip('flask_mongoengine')
+     from flask_mongoengine import MongoEngine
+     from mongoengine.fields import (
+         BooleanField,
+@@ -282,6 +283,7 @@ def sqlalchemy_datastore(request, app, tmpdir, realdburl):
+ 
+ 
+ def sqlalchemy_setup(request, app, tmpdir, realdburl):
++    pytest.importorskip('flask_sqlalchemy')
+     from flask_sqlalchemy import SQLAlchemy
+     from flask_security.models import fsqla_v2 as fsqla
+ 
+@@ -326,6 +328,7 @@ def sqlalchemy_session_datastore(request, app, tmpdir, realdburl):
+ 
+ 
+ def sqlalchemy_session_setup(request, app, tmpdir, realdburl):
++    pytest.importorskip('sqlalchemy')
+     from sqlalchemy import create_engine
+     from sqlalchemy.orm import scoped_session, sessionmaker, relationship, backref
+     from sqlalchemy.ext.declarative import declarative_base
+@@ -426,6 +429,7 @@ def peewee_datastore(request, app, tmpdir, realdburl):
+ 
+ 
+ def peewee_setup(request, app, tmpdir, realdburl):
++    pytest.importorskip('peewee')
+     from peewee import (
+         TextField,
+         DateTimeField,
+@@ -522,6 +526,7 @@ def pony_datastore(request, app, tmpdir, realdburl):
+ 
+ def pony_setup(request, app, tmpdir, realdburl):
+ 
++    pytest.importorskip('pony')
+     from pony.orm import Database, Optional, Required, Set
+     from pony.orm.core import SetInstance
+ 
+-- 
+2.27.0
+
diff --git a/dev-python/flask-security/flask-security-3.4.4.ebuild b/dev-python/flask-security/flask-security-3.4.4.ebuild
new file mode 100644
index 000000000000..ff4924b074a5
--- /dev/null
+++ b/dev-python/flask-security/flask-security-3.4.4.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_{7..9} )
+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.2[${PYTHON_USEDEP}]
+	>=dev-python/itsdangerous-1.1.0[${PYTHON_USEDEP}]
+	>=dev-python/passlib-1.7.2[${PYTHON_USEDEP}]
+	>=dev-python/python-email-validator-1.0.5[${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-mongoengine-0.9.5[${PYTHON_USEDEP}]
+		>=dev-python/flask-sqlalchemy-2.3[${PYTHON_USEDEP}]
+		dev-python/mock[${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/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}]
+		$(python_gen_cond_dep '
+			>=dev-python/pony-0.7.11[${PYTHON_USEDEP}]
+		' python3_{6,7})
+	)"
+
+distutils_enable_tests pytest
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.4.3-optional-deps.patch
+)
+
+src_prepare() {
+	sed -i -e '/setup_requires/d' setup.py || die
+	sed -e 's@--cov flask_security@-p no:httpbin@' \
+		-e 's:--cov-report term-missing::' \
+		-e 's:--black::' \
+		-e 's:--flake8::' \
+		-e 's:--cache-clear::' \
+		-i pytest.ini || die
+	distutils-r1_src_prepare
+}
+
+python_configure_all() {
+	esetup.py compile_catalog
+}
diff --git a/dev-python/flask-security/flask-security-3.4.5.ebuild b/dev-python/flask-security/flask-security-3.4.5.ebuild
new file mode 100644
index 000000000000..ff4924b074a5
--- /dev/null
+++ b/dev-python/flask-security/flask-security-3.4.5.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_{7..9} )
+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.2[${PYTHON_USEDEP}]
+	>=dev-python/itsdangerous-1.1.0[${PYTHON_USEDEP}]
+	>=dev-python/passlib-1.7.2[${PYTHON_USEDEP}]
+	>=dev-python/python-email-validator-1.0.5[${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-mongoengine-0.9.5[${PYTHON_USEDEP}]
+		>=dev-python/flask-sqlalchemy-2.3[${PYTHON_USEDEP}]
+		dev-python/mock[${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/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}]
+		$(python_gen_cond_dep '
+			>=dev-python/pony-0.7.11[${PYTHON_USEDEP}]
+		' python3_{6,7})
+	)"
+
+distutils_enable_tests pytest
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.4.3-optional-deps.patch
+)
+
+src_prepare() {
+	sed -i -e '/setup_requires/d' setup.py || die
+	sed -e 's@--cov flask_security@-p no:httpbin@' \
+		-e 's:--cov-report term-missing::' \
+		-e 's:--black::' \
+		-e 's:--flake8::' \
+		-e 's:--cache-clear::' \
+		-i pytest.ini || die
+	distutils-r1_src_prepare
+}
+
+python_configure_all() {
+	esetup.py compile_catalog
+}
diff --git a/dev-python/fqdn/Manifest b/dev-python/fqdn/Manifest
index 1e72fc87ed56..95ba41f901f4 100644
--- a/dev-python/fqdn/Manifest
+++ b/dev-python/fqdn/Manifest
@@ -1,3 +1,5 @@
 DIST fqdn-1.5.0.tar.gz 14630 BLAKE2B 021b4e53c42830a5523964961cde9857bea9eb700cd2030331b05006ec4a8b7e05a9f2330748b0d84531526e17d81ade73fb04e65db381417f2d7f618138f09a SHA512 3940955df50bcd0bbd5cae82f148e9a8ef64b6db84dc867fbfbfbdd661fcc42208a7506f931209347f9115722c00e330fc03c5bdd459cb4a98d0df59af48c492
-EBUILD fqdn-1.5.0.ebuild 549 BLAKE2B b0415d64bdd4f8e6d0d4ee8e730a0b61a7e83a9fc9e497430b3309686e36828ca359cb964920b9e6c82a1d0338d63aa8bb5c74f9212b2cb97fe4a96e5ea3b9d2 SHA512 31bde258d6ea380b75596a8029d0b02d627c43087067f8c90f908c6880db339f36cb227b27f551173d5bc5c11159ec5f5061d9cdf4fecabf0a776020894e06c8
+DIST fqdn-1.5.1.tar.gz 18334 BLAKE2B 24dfd88a8176e67209350fe20e446cfee848c392795cde09725526a52af0a9adc6908a4eb6d5dd3ad6f8a11546acb6b82a7b2ad591997010dfdd0a1d235f57ae SHA512 d9d7d1bb8798c63973534bf45fb9bc0ab57b1600c6597212129debb97a908140401f5477f33b83ea273e3f9a2a852072110245a09596ab9a58a10be8043c57fc
+EBUILD fqdn-1.5.0-r1.ebuild 597 BLAKE2B 285258443c384872b88f8e21133d42a5532e3771e97fe9ca70e21c3ec8f928fdcb602ababc2b3ee939a1c025a4f2eaaa9314d9a440458616d19c41c143d0c9d2 SHA512 2414ef2577f401124db4c958296762e73f301dcf891f218f7204b7ad27a9b0f2bd8b8da77eb374dcda7e277f83ac51e6918ec3d5cf810c4dee748ea3ed8fda40
+EBUILD fqdn-1.5.1.ebuild 590 BLAKE2B d6e75b02d59a89249033ab2eebbcbd1e11af82455b6787090f8aeede8abe27ebad85a9d298b6a3ca82ef6506d2cd375c03d95d1b899c14f25505ed305b48beab SHA512 5e9238495c2210c95d0fbe0ff3de7453a00c3ac5332fb0f9257c554f9ad4ab6fb541ed3b5977ead3028aed9e73914014bb8fcd30326b0bd68587260dbf06b054
 MISC metadata.xml 651 BLAKE2B 52e04a7e3de79067b3ef936ecc8bd0a2ad9db6157901992e45b4c96fd84cffe68a836fdfabd3e6b8350e53fbc88af9fc5534d0754ecaaa7f2df8e4c7af146951 SHA512 1f938747b18ee81777209bc80b6ffd66fb680f980feba5e7fd2fa13c2e96727be27be004a4e69b244629e00da851b2ad384691816ebf49cc81e73e9ca000f1bc
diff --git a/dev-python/fqdn/fqdn-1.5.0.ebuild b/dev-python/fqdn/fqdn-1.5.0-r1.ebuild
index 9e8e8158b783..deeea469ea8b 100644
--- a/dev-python/fqdn/fqdn-1.5.0.ebuild
+++ b/dev-python/fqdn/fqdn-1.5.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2018-2020 Gentoo Authors
+# Copyright 2018-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,10 @@ LICENSE="MPL-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc64 ~x86"
 
-RDEPEND="dev-python/cached-property[${PYTHON_USEDEP}]"
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/cached-property[${PYTHON_USEDEP}]
+	' python3_7 pypy3)"
 
 distutils_enable_tests pytest
 distutils_enable_sphinx docs
diff --git a/dev-python/fqdn/fqdn-1.5.1.ebuild b/dev-python/fqdn/fqdn-1.5.1.ebuild
new file mode 100644
index 000000000000..91ac88a37d86
--- /dev/null
+++ b/dev-python/fqdn/fqdn-1.5.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 2018-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="RFC-compliant FQDN validation and manipulation for Python"
+HOMEPAGE="https://github.com/ypcrts/fqdn"
+SRC_URI="https://github.com/ypcrts/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/cached-property[${PYTHON_USEDEP}]
+	' python3_7 pypy3)"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs
diff --git a/dev-python/fuzzywuzzy/Manifest b/dev-python/fuzzywuzzy/Manifest
index dded30c15b97..56fb2b2a8c10 100644
--- a/dev-python/fuzzywuzzy/Manifest
+++ b/dev-python/fuzzywuzzy/Manifest
@@ -1,3 +1,3 @@
 DIST fuzzywuzzy-0.18.0.tar.gz 28888 BLAKE2B be2729660eb20a33a14acd1c5fbcefa48bd8a6a3dcfa6dd5137b0414fb283d279990f61250dbb2526e8faa80da23eb6de36618ae0d98166d29655b8a71cd15a1 SHA512 4a21ea67278fa525842d48fed8db666d00eae6d13254e8844d11f63b47c3a305b3cac760f28c24c6347aebcf73e96180e0a7cfba29c75f01ece2f7751e0398c5
 EBUILD fuzzywuzzy-0.18.0.ebuild 632 BLAKE2B 20c7dea4a1916fd6f421bbc945c8905508b121e460074ff9f701c99d18d663037340ad5a5222594a5304fe7885209102511464b3f46b0b3029f4ce13b824eac8 SHA512 277080f548b9fbd8c960e51b433005c921a20a987005055d78ed74e758d43c4bc3e08ca8fb7da3167fb2d6b09e313a3af7494c8adc784023ba5644351442e6e1
-MISC metadata.xml 350 BLAKE2B 5be22a76bb8ef1192943820a9912f7f70c7effdef36090c52641717ead53cf8b74c82f3a6f1a3718d4c7a93f6b5acc1b367b43ee022d05d427a8de3f61b9b4da SHA512 556e5115df47dafe0ec68cde9cc9e452c5c25adb6dbbf6699e9cc59937ac5ff334a65b94d9310d94c2cb2a491b9ee0f84c6ce9787fd1d5d799b9dcf796eeedbb
+MISC metadata.xml 396 BLAKE2B f783c63a60a9adb732460390e5ccd5b54965a300dc92aaa7759b1f6dd24c169ddcf54cc93114a1a93c83217a4578cc867140126173727bf7f636b84f0fb4bd6f SHA512 b0f13db55f102301ab24d18b8bed4b1825de409fb883bbc141e5e9326ad6395ea6694d1d9bb65f4f832767e6e3f145094dd8950ba9ca6c0654f50ee706bd09a4
diff --git a/dev-python/fuzzywuzzy/metadata.xml b/dev-python/fuzzywuzzy/metadata.xml
index 1d370c15437a..66a1230eb8f9 100644
--- a/dev-python/fuzzywuzzy/metadata.xml
+++ b/dev-python/fuzzywuzzy/metadata.xml
@@ -3,7 +3,9 @@
 <pkgmetadata>
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
+		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">seatgeek/fuzzywuzzy</remote-id>
 		<remote-id type="pypi">fuzzywuzzy</remote-id>
diff --git a/dev-python/glooey/Manifest b/dev-python/glooey/Manifest
index 3c138949e383..46eba7689589 100644
--- a/dev-python/glooey/Manifest
+++ b/dev-python/glooey/Manifest
@@ -1,3 +1,3 @@
 DIST glooey-0.3.4.tar.gz 19113011 BLAKE2B 45be6355ad51fd9a77003a39f8532f4a86bb3ba758d8fb56d483399ae2d876ff5f072e6f0c6a64ce71b493b650f5e09b553b3d97d8b73c6e2dbdfb789d427f47 SHA512 12222b336f0d1f720b6eb5b2a24eeba8bfa3d39c0775ffc8b9687a6720d8282f263da55cae653ccc1f610db0708a6c75671ca98969accaf0d02320815244ecbf
-EBUILD glooey-0.3.4.ebuild 717 BLAKE2B f89e887889c637659449ff3fee4b2db67af994a6c0689e3d81158a1fee233aac0cba32c320ccaa67ebedd08255a3d0ee5af360f41e3b88f2d00387f643c7c74e SHA512 e637d245c098f90908d0ab356e7bc1daf2b85d868f2395b08e29e9c6fea13f3f886d11c215e9039032a4da9510a7b6122b029e9b1e32068f0cac83df1196afa9
+EBUILD glooey-0.3.4-r1.ebuild 754 BLAKE2B 3d90fbc25009351f7c888c349349645faf54a9f98467ecba0398902ace3f0d4a58f14521ad619d8cfe9b17377091107ad9dc596fe884e863611af46d1d260a70 SHA512 f75b2dfc500a556d9b2d93ae43eaf046d4c24e039924a3b3843ddb59ce1a6e66b4086fa7b5612cbb6614b639061c4eff5dedbad3d60f3ee0b7e870963d3685c3
 MISC metadata.xml 1232 BLAKE2B 468fd4a26705765cedf29afd9e18992bb3bcd1f32bbc2620dbcfd89e433b6a64b38072299c31839dbf49336dce97c712a906b6fcb43e4af2a2bd22a7bc7bddec SHA512 8c9ac4fb1928a1a5647cca9a3ab031aaa918a32779a001928a711ab1cead02bd404461c24a86a847ede482c9bd7f9739ff9975971c96ee1ee94be21e6e217655
diff --git a/dev-python/glooey/glooey-0.3.4.ebuild b/dev-python/glooey/glooey-0.3.4-r1.ebuild
index 89ca43e46a8a..ccdb9bd473e4 100644
--- a/dev-python/glooey/glooey-0.3.4.ebuild
+++ b/dev-python/glooey/glooey-0.3.4-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
@@ -20,6 +20,7 @@ RDEPEND="
 	dev-python/autoprop[${PYTHON_USEDEP}]
 	dev-python/more-itertools[${PYTHON_USEDEP}]
 	dev-python/pyglet[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
 	dev-python/vecrec[${PYTHON_USEDEP}]
 "
 
diff --git a/dev-python/google-auth/Manifest b/dev-python/google-auth/Manifest
index 96d5c639937e..1b151af010f1 100644
--- a/dev-python/google-auth/Manifest
+++ b/dev-python/google-auth/Manifest
@@ -1,10 +1,8 @@
-DIST google-auth-1.24.0.tar.gz 120351 BLAKE2B b0a78ad87622bc806cce72847d5dad3844afe080ffbcd822575dab6208952806360bed4e8756133d5b4fe2755f6cbeeb239b8f51634dd3d4cede9346372b689a SHA512 3e678dd946eb6c3c865cd35df1480a96ed35cf14b973f2239c5213b223a6569b4a9642609ac51243af75c662a08bbf0518d8592db97af297cf67c52b83019e30
 DIST google-auth-1.25.0.tar.gz 121940 BLAKE2B 9c7346b134153321fe7116cc77bdcd0d07b2d4a5264d4a982f23a44458ba17c03ef8d204d2c6bd697561c11563bbff1d093ec4563700910ea3bbd9a063006005 SHA512 1c83f18904b646264263c8ba20c13bcc61572b9de397331564b1c2e65083a27e6393dd9435b03789136d2fc2b43750f784d21a3dc670a58cc4bade9de267f195
 DIST google-auth-1.26.1.tar.gz 121927 BLAKE2B a24a9c5bca8de234213e75673ba49ef6b82eb3c165f9c3af276b3c4cd47750c6d8a53e46084ae71c8eadf474ec8f53c6a2469fd91e7bdcc87f61bd46bbf9704d SHA512 632cdada9975311ab079022da79334f69ae703183bef395c3b04fc86192c23032b9925259ade7c115883659b10a403661f2d9a39f3b5262b964d0b9f2947567f
 DIST google-auth-1.27.0.tar.gz 157225 BLAKE2B d3bf40dac2f72d5bafa318c4ec07588a250d4d778b2313c22ef5f43742939b023c864f465f543bf9e8ef6fd0251ba4642f78151df2534e82f2f2a60f5894e63c SHA512 adadea669ddd18a345011602e9fd575fa7783aee0f786d6a42e97278e14a0acf721451d7171765c8aea4bfa5eaa63762f9f826a2d1d5f2c4ea6abbb7d7186ebb
 DIST google-auth-1.27.1.tar.gz 157876 BLAKE2B 0a06451e8a800231972b5b167d45410791b38a1616043912befb5554eff217bd1af70bf34aaf455fe68f9f515ea143cb2446800231006c369005de6981f7f466 SHA512 d640bb5395f956fd3442ea31145af2d72855108bff6b11dfeecfd4b48ad4fa50efba838e423bace310e78bbae74860d6c031d4ee873a7ab6dd522eb49e3fbdab
-EBUILD google-auth-1.24.0.ebuild 1632 BLAKE2B 3a64c4915bfe8626f7c240b27704a77f7cafa3697f85922f6fc74f612390908d34814dad94ffb649e7298b8e93b833e4f71dc8153bd725643d09c6f7ba4b1171 SHA512 c32bd705495a1be9e276e9de185cfc4f498cc186f71f89d5396f10dc7a4b16b8cf139209cd00a4d74f43ba027bf251e58f3ec79744cf8b64290e305889b78cee
-EBUILD google-auth-1.25.0.ebuild 1634 BLAKE2B 4bb0f2cd679828176bbb5599afbef8de92b2b14b6de3570059ce9e6e69b84bd8a5759d189835ce31c29bd34fc69a2684dcf89b3df6697bf88b71f6f2d4a642a6 SHA512 b7220099a99c3a3caf55e7a06b2efc6872de9c949366e1cceb05d1fd4b776e3fd751f62c6057471c6c40450b1f1e03982889d9e2f5090215dbb6a1c2ed7d9384
+EBUILD google-auth-1.25.0.ebuild 1632 BLAKE2B 3a64c4915bfe8626f7c240b27704a77f7cafa3697f85922f6fc74f612390908d34814dad94ffb649e7298b8e93b833e4f71dc8153bd725643d09c6f7ba4b1171 SHA512 c32bd705495a1be9e276e9de185cfc4f498cc186f71f89d5396f10dc7a4b16b8cf139209cd00a4d74f43ba027bf251e58f3ec79744cf8b64290e305889b78cee
 EBUILD google-auth-1.26.1.ebuild 1634 BLAKE2B 4bb0f2cd679828176bbb5599afbef8de92b2b14b6de3570059ce9e6e69b84bd8a5759d189835ce31c29bd34fc69a2684dcf89b3df6697bf88b71f6f2d4a642a6 SHA512 b7220099a99c3a3caf55e7a06b2efc6872de9c949366e1cceb05d1fd4b776e3fd751f62c6057471c6c40450b1f1e03982889d9e2f5090215dbb6a1c2ed7d9384
 EBUILD google-auth-1.27.0.ebuild 1634 BLAKE2B 4bb0f2cd679828176bbb5599afbef8de92b2b14b6de3570059ce9e6e69b84bd8a5759d189835ce31c29bd34fc69a2684dcf89b3df6697bf88b71f6f2d4a642a6 SHA512 b7220099a99c3a3caf55e7a06b2efc6872de9c949366e1cceb05d1fd4b776e3fd751f62c6057471c6c40450b1f1e03982889d9e2f5090215dbb6a1c2ed7d9384
 EBUILD google-auth-1.27.1.ebuild 1409 BLAKE2B 3122b6bd350caeb99eae9b04c6fafeb47cf557b478415cc44fa9a6f586926bb19abb14f10705614e01fa4ab1e6b473cd7d3090e4bdd393a8e99406721f67075e SHA512 8ad46680c5b3d3b072a7c6386539fe72de6598388a4a8c891bc38b9ad69a556355b85d444e4c99decd0454dabe13e4e332ca6e3afe82ed54d32560f9410c47a8
diff --git a/dev-python/google-auth/google-auth-1.24.0.ebuild b/dev-python/google-auth/google-auth-1.24.0.ebuild
deleted file mode 100644
index 4686417faf35..000000000000
--- a/dev-python/google-auth/google-auth-1.24.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Google Authentication Library"
-HOMEPAGE="
-	https://github.com/googleapis/google-auth-library-python/
-	https://pypi.org/project/google-auth/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/namespace-google[${PYTHON_USEDEP}]
-	>=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
-	>=dev-python/pyasn1-modules-0.2.1[${PYTHON_USEDEP}]
-	>=dev-python/rsa-3.1.4[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/cachetools-2.0.0[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/cryptography[${PYTHON_USEDEP}]
-		dev-python/flask[${PYTHON_USEDEP}]
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/grpcio[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/moto[${PYTHON_USEDEP}]
-		dev-python/oauth2client[${PYTHON_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		dev-python/pytest-localserver[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-		dev-python/urllib3[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# delete stray files included in the tarball
-	find "${S}"/tests -name '*.pyc' -delete || die
-	distutils-r1_src_prepare
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	find "${ED}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/google-auth/google-auth-1.25.0.ebuild b/dev-python/google-auth/google-auth-1.25.0.ebuild
index 61a646b39ce4..4686417faf35 100644
--- a/dev-python/google-auth/google-auth-1.25.0.ebuild
+++ b/dev-python/google-auth/google-auth-1.25.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/gsd/Manifest b/dev-python/gsd/Manifest
index b143172fcb51..e3206deb9925 100644
--- a/dev-python/gsd/Manifest
+++ b/dev-python/gsd/Manifest
@@ -1,5 +1,7 @@
 DIST gsd-v1.5.3.tar.gz 240114 BLAKE2B 076d888f03350fba2388c907787354e878a1536c7d85c759eb3513102ee2abffe2c9313a6e9e208726d66d6324dac02ae70d8872342f9bcb162ad13d9a23dbc3 SHA512 893db74dc481da47d6c51ea0d0d9faefbe164edfaeb5a2ed73e25acbd9dc42c3cf28cbc0d9257c6bf0cc0e9911ab85cfa72997886350c0e7c125d30636ec432a
 DIST gsd-v2.4.0.tar.gz 112743 BLAKE2B d35a1108cb12f58f8b6cc980c156ae2dceb0c0d2c4d41d35ae29bae1bc342654e148616e64a6dfcb07bdbb1156299d8d05914d028dfb877979c8a17f299feb06 SHA512 47e136018d813f48c5d78cc31786a5bb33992f488a4d907b450a570bb90f9ffeb233e82f9686d09aeb3541fca1518294d5bf63c6a896635f30ad369350012458
+DIST gsd-v2.4.1.tar.gz 113343 BLAKE2B 5d87fe5dbac037aeccf2ef800fc18accb1888606ed904b15910480032edaaa21bed3adf264e17ea5dc42f6600321c838c15e73617a1d8f49fb9a8e5e79a0bff4 SHA512 47982500160dc2a125ae2d796fccb1fb31fa501f059c8dee9be1342713d62e3d6ce71b534dbc91daedbf6981299efa4b81382afa13283d647c0848bbd3591c91
 EBUILD gsd-1.5.3-r1.ebuild 532 BLAKE2B 0be25e3bd74cc0cb03f869286cd6f4e6b06c318d16d2f8c6892c1362e255f99e8e0a1d9d94175dc42f9faef05b90601d802bb050094cc4ca39ee63c878e90e45 SHA512 99c4e74b6b6c77b9faaeb9cf0675301e938274fc77669f6bf47936afa6fa4adaff73b229a62fe7f3e1c79a17270b19b98c4d6f0237d81593084cd520fb65e6a7
 EBUILD gsd-2.4.0.ebuild 545 BLAKE2B aaff0ecf6ffabb6704500c3e9edb2bbc5cd341e2ce20e9ad40595e4bc173784d8cb0607571d204ce8eeb5630a3dcfd6e6cd1c0d4d0855cca773b9805441b1670 SHA512 180a26acb2ae6d76493b848c65546cbbbbd49cf9f2fbcf04512422dfd77c8f8d49fde76e3abff234b3c2e09c1ed1e3c7de1ce62c75c86965713aad8ed5160524
-MISC metadata.xml 314 BLAKE2B 6e80a1ce6d4aaef8cf49029f57a7ac25049b192c43f14054ebf84651094f61aec1245fb862ea0d8e3109db70997811d054a2afe289c2979bf60a4110346f36eb SHA512 47aa649aed6e2b663b456913c004110eaf091711f37c489bcf1af8dfc02515427bd435327c2587bd115b81c7fd055e881cefdf83e761600cedd0f8daaa326159
+EBUILD gsd-2.4.1.ebuild 725 BLAKE2B fe0a4352404737e30530b0bbc680f47796c934913e9af587e8f7efc5c1656438de506a2c08160f0a9694cb817036a54eab62fe24534b7e271da913d0590f5024 SHA512 3608ac504e5a82a057baddad889c1548834c07e3dbe6ce00ec15ae0e229cb589fcf921560274d646b3a6989e54f40f8465d492f0fbad03a702ca1662cf60e2f0
+MISC metadata.xml 415 BLAKE2B 8ac3be3849cd5b583109d74b72d4e4d41e4b8948daec4efd1fe319f4108ad79c2f1e760ba0a0a60ee1e7d6bbe5dc62be492af32f1ba5355611769c74495363d7 SHA512 93e8d2b6801f27174930aa595a8ce29ef8c0f44c2feb712e020127c239172e704bfca055382f8661e4fc7ea9ee4c2b81231cb40248c82b2d8d4d7cceacba611a
diff --git a/dev-python/gsd/gsd-2.4.1.ebuild b/dev-python/gsd/gsd-2.4.1.ebuild
new file mode 100644
index 000000000000..85d4225e06f2
--- /dev/null
+++ b/dev-python/gsd/gsd-2.4.1.ebuild
@@ -0,0 +1,29 @@
+# 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_{7..9} )
+inherit distutils-r1
+
+DESCRIPTION="GSD - file format specification and a library to read and write it"
+HOMEPAGE="https://github.com/glotzerlab/gsd"
+SRC_URI="https://github.com/glotzerlab/gsd/releases/download/v${PV}/${PN}-v${PV}.tar.gz"
+S="${WORKDIR}/${PN}-v${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-python/numpy[${PYTHON_USEDEP}]"
+RDEPEND=${DEPEND}
+BDEPEND="dev-python/cython[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+python_test() {
+	cd "${BUILD_DIR}"/lib || die
+	epytest
+	rm -rf .pytest_cache || die
+}
diff --git a/dev-python/gsd/metadata.xml b/dev-python/gsd/metadata.xml
index c45682ad9f25..fcc19211159d 100644
--- a/dev-python/gsd/metadata.xml
+++ b/dev-python/gsd/metadata.xml
@@ -5,6 +5,10 @@
 		<email>alexxy@gentoo.org</email>
 		<name>Alexey Shvetsov</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">gsd</remote-id>
 	</upstream>
diff --git a/dev-python/guessit/Manifest b/dev-python/guessit/Manifest
index 712c20bfc0ef..f45cd67e49ce 100644
--- a/dev-python/guessit/Manifest
+++ b/dev-python/guessit/Manifest
@@ -1,7 +1,5 @@
-DIST guessit-3.2.0.tar.gz 147286 BLAKE2B 0ab249eb82204fd58a6d6c960b11b2009a3055ae91a91c244192a2bd9832e7356f444a6b4291cf56d55a4c9a1cd0ccec22d527114d61f9f5888a8439918ba6bc SHA512 5eaa0ad8cdf60812bebf10af51f62095baa70f48b66a052002fceb0d705daab3b8bcd2cb0fc3d18b63b9f4aa8118b9d85283bebdcfdb8ed4204e1b7e2b5ae78c
 DIST guessit-3.3.0.tar.gz 157901 BLAKE2B 8022e69f763d09912349e193d3273a95adf6cd533d28097e3e17e5a5d3a9f18b623024bac6b00b3aa78ac43cb6ff179a97344e516401f71e1ad23743d033604e SHA512 5569572ed6d7910b320e1742b902325baf3f3455598e17a7e3bb36ae5da0e450d4bc2db0b1651a8d4df7354e0624216c1093aace48ef607b3146933fbb83a918
 DIST guessit-3.3.1.tar.gz 156178 BLAKE2B 190b61eb98c4945eb2e14bbc3387a2eabff4e0f2fccf42f3b957d2b081d83d96333f3931837ad77d6b09c12aaa174eb8adf993d62ab9de7b74d8f0c55282a77c SHA512 42c87525ea2d9c808e30b50db674862f5362f26b95ba5e6bc163df03a261d9b24daf4b4d525677d3e6d53e8e7f637c3d9e0ba3f25f4397e0658b618f50a3248b
-EBUILD guessit-3.2.0.ebuild 1030 BLAKE2B 6c9c912637d955c92a67474f8328760a4a55866d63fd59129b567596721f08afab3026d50b26da6287b87c9f516a77105d60c9c32c93cd68047b96e058249a48 SHA512 5b0d1c0b2269b85d6e9a028f4c9db23ac8b384b1147e8629470d6fa636ca0997b484a35ec7e5cef827b226b42d0b19eab08e598097645a6879f53eda44ee48b7
-EBUILD guessit-3.3.0.ebuild 1032 BLAKE2B d1bcb45fd8d0d70c6b7413c7725813eb49fcd185fa87007e90f8b3556a6a3ba4db0be8cba256efc69355ffb12d2c4eba75ef2955bb38d2f57c36ac7e024c36d2 SHA512 cb99c0e7922030e87c770c1eef32797da728fdb8c89a38168b6b0fe35109457684c23c10088c6c8ebccd36bf1438ed0710f39dddbe62e8041a34c13c24c5a3f7
+EBUILD guessit-3.3.0.ebuild 1030 BLAKE2B 6c9c912637d955c92a67474f8328760a4a55866d63fd59129b567596721f08afab3026d50b26da6287b87c9f516a77105d60c9c32c93cd68047b96e058249a48 SHA512 5b0d1c0b2269b85d6e9a028f4c9db23ac8b384b1147e8629470d6fa636ca0997b484a35ec7e5cef827b226b42d0b19eab08e598097645a6879f53eda44ee48b7
 EBUILD guessit-3.3.1.ebuild 1032 BLAKE2B d1bcb45fd8d0d70c6b7413c7725813eb49fcd185fa87007e90f8b3556a6a3ba4db0be8cba256efc69355ffb12d2c4eba75ef2955bb38d2f57c36ac7e024c36d2 SHA512 cb99c0e7922030e87c770c1eef32797da728fdb8c89a38168b6b0fe35109457684c23c10088c6c8ebccd36bf1438ed0710f39dddbe62e8041a34c13c24c5a3f7
 MISC metadata.xml 392 BLAKE2B fa31237c110d3c600f6f4416685509ecf55f2e90dd4630b6980907703a2d65676dfc0fc36d94ec53f452dcfa393c5e8784af03b2071e0660f5c0597f7c0744f7 SHA512 c1cd9bc55758444324bce57d1bb07c597a95e8552ca14a81b42806cd71df5af343fa211cd1fd9b36a8918ca8b36383c37cb943d6336c74e8df7665e7bb048e7f
diff --git a/dev-python/guessit/guessit-3.2.0.ebuild b/dev-python/guessit/guessit-3.2.0.ebuild
deleted file mode 100644
index b7a5ba657f3c..000000000000
--- a/dev-python/guessit/guessit-3.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_{7,8,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library for guessing information from video filenames"
-HOMEPAGE="https://github.com/guessit-io/guessit
-	https://pypi.org/project/guessit/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-RDEPEND="
-	>=dev-python/babelfish-0.5.5[${PYTHON_USEDEP}]
-	>=dev-python/rebulk-3[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# Disable benchmarks as they require unavailable pytest-benchmark.
-	rm guessit/test/test_benchmark.py || die
-	sed -i -e "s|'pytest-benchmark',||g" setup.py || die
-
-	# Disable unconditional dependency on dev-python/pytest-runner.
-	sed -i -e "s|'pytest-runner'||g" setup.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/guessit/guessit-3.3.0.ebuild b/dev-python/guessit/guessit-3.3.0.ebuild
index cbd2a8e83fc4..b7a5ba657f3c 100644
--- a/dev-python/guessit/guessit-3.3.0.ebuild
+++ b/dev-python/guessit/guessit-3.3.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 RDEPEND="
 	>=dev-python/babelfish-0.5.5[${PYTHON_USEDEP}]
diff --git a/dev-python/h5py/Manifest b/dev-python/h5py/Manifest
index dd569581e598..71948645d326 100644
--- a/dev-python/h5py/Manifest
+++ b/dev-python/h5py/Manifest
@@ -1,4 +1,6 @@
 AUX h5py-2.10.0-tests.patch 1090 BLAKE2B 2c915f28055d6368a5bd43b281d61879e91ae4506e2038b17c7111bae9ebecbb8eb5ca2a2cb8c32b2f6c8cd7c0629cffd926774c3d995fbd0fb6ad09db8c4310 SHA512 7ee887648d025d994eb6e495bad7ab41f7b8c2e9bb65800d9c34c1e31fc1020455202bac87c7cbf2a037a68c7cac43704f02074ae4396053ae03694fab949314
 DIST h5py-2.10.0.tar.gz 301057 BLAKE2B 2e9da02224493b79b2df75ff9aa5cb16ab668d07bb95066356749be09091c54032efb3db8b53bdf0fbbbac2bcde532f9f051627327dcf3f35fb578b701ecc165 SHA512 c49b04f7dcddf03f36d4f063d79ecbe544e0b1daee432d4a76cfa83dac3a1f2cb144f40a74fb85ea17cb5b778f57f709969ea5d1a2afc5bdd5aecbc9d732898d
+DIST h5py-3.2.1.tar.gz 368170 BLAKE2B 2c198d0cfbd988a8531284e16f563ae630afbdd0b32d41ff1b8e33741ac9c678328a07dbb925d67c538100088de9423a45e65c76f3a1daaa0f7b08229916546d SHA512 c98f935f800f340239fdd5132534a3b79995dc952250521f0bd6972a60c34c21bb56d7ca3f1c655ad9d1e47fc5792f434f88a0919ae75bc9102e659bf4f1c284
 EBUILD h5py-2.10.0-r1.ebuild 1603 BLAKE2B c1ec4e72f614eb760f020ffb04fbb5988c79019eb9bc233e9f1359cdc6376e0a9ba4e1a2c51134755c0df088c126729f235cdada2d4ed1f4e9faea05d3e5d888 SHA512 a115a6a1122c2af0ffdeac399a5dd330d456c71864b7848e35664bad2a7dde1f2482e5a9e46a8da9e2196018145ceed7338dbc1b02b78749616a70f0d27d18d1
+EBUILD h5py-3.2.1.ebuild 1596 BLAKE2B 39b1af073d49d022b37f9c908c9f8ca09016631360da7f5bdb72f926cfcb456a9563b8649bb5ef68b2622f52d2b1605803f076364f16f0eda1f1d457cfd35dcc SHA512 4618aeb23fe13de94b3ac8ab96a5837084f8a4bc59dba4310e6f6f35aa4a50315d822302584a937b3b8015bc213c556a3aafad590db5c9e3fe2b6b3387309803
 MISC metadata.xml 1015 BLAKE2B 4b62b6e3d38b745ff2e27bfdd14e6ca380264089c9953e09e6f8c12e223fc9ad45072b8c884ee9a7c24329a00e71a93207d3ffb21b17e8377bf195fb20b54ad1 SHA512 1880b779b8917357e6301273a304314e73686cea70325c2ee17c1bd901190bf0b07575584275039d199df6b190df9be3ab6617ee9f2babb0b609c408cba5af52
diff --git a/dev-python/h5py/h5py-3.2.1.ebuild b/dev-python/h5py/h5py-3.2.1.ebuild
new file mode 100644
index 000000000000..82dc31d6252c
--- /dev/null
+++ b/dev-python/h5py/h5py-3.2.1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1 flag-o-matic
+
+DESCRIPTION="Simple Python interface to HDF5 files"
+HOMEPAGE="https://www.h5py.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+# disable mpi until mpi4py gets python3_8
+#IUSE="examples mpi"
+IUSE="examples"
+
+#RDEPEND="sci-libs/hdf5:=[mpi=,hl(+)]
+DEPEND="sci-libs/hdf5:=[hl(+)]"
+RDEPEND="${DEPEND}
+	$(python_gen_cond_dep '
+		dev-python/cached-property[${PYTHON_USEDEP}]
+	' python3_7)
+	dev-python/numpy[${PYTHON_USEDEP}]"
+
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/pkgconfig[${PYTHON_USEDEP}]
+	test? (
+		dev-python/QtPy[testlib,${PYTHON_USEDEP}]
+		dev-python/cached-property[${PYTHON_USEDEP}]
+	)"
+#	mpi? ( virtual/mpi )
+#	mpi? ( dev-python/mpi4py[${PYTHON_USEDEP}] )
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs \
+	dev-python/alabaster
+
+#pkg_setup() {
+#	use mpi && export CC=mpicc
+#}
+
+python_prepare_all() {
+	# avoid pytest-mpi dep, we do not use mpi anyway
+	sed -i -e 's:pytest-mpi::' pytest.ini || die
+	distutils-r1_python_prepare_all
+
+	export H5PY_SETUP_REQUIRES=0
+}
+
+python_test() {
+	cd "${BUILD_DIR}/lib" || die
+	pytest -vv -m "not mpi" ||
+		die "Tests failed with ${EPYTHON}"
+	# tests generate .pytest_cache which should not be installed
+	rm -r .pytest_cache || die
+}
+
+python_install_all() {
+	use examples && dodoc -r examples
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index 4fc1b2e1f6ea..6dfed43a66c2 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -4,10 +4,16 @@ DIST hypothesis-python-6.3.4.tar.gz 9112374 BLAKE2B 78867f0ff142d6059a20c437c3fa
 DIST hypothesis-python-6.4.0.tar.gz 9112974 BLAKE2B bb2312e1ae838e9a58741709f5d55d9593991c2600330f4917c8e8f86eb8219a0826e87aa810ccfa731e5a14f1d0985cb3342c73ba5b8ad5d8e01419689e180f SHA512 2899557ff872b45347f8865ff9bf07da97e2bfc3f4827ead2d4b0648c664bd9ef7ae3d48e5f5158b4dbb2d5063831ae8a1a7ef0ac97f2ae21318c6198850865d
 DIST hypothesis-python-6.4.2.tar.gz 9113516 BLAKE2B 115f16b4e9a4fdc4b39942cb593dc397066c556862cb79baf3c9d9c0c9d1fa46e1e855b91c73d8f93135e9582f6293d896245fbfa31bca667cb522f1d4955adf SHA512 bcaf876c197f196f27936fd6b5294cfed5d0db2f528ee95b9ebf6ae429a41dccddfd6fd66eebf8e5ad7ac512d8ec20f1878a6ded9d4c10013b732262c9454799
 DIST hypothesis-python-6.4.3.tar.gz 9113616 BLAKE2B f3761a22b574edc0b001a25c836c3a845fb3a1396dbc4afc2caa1f31870793cfca8646e6b9b45386e835fce97b9bc68226018c50675931e48968e9502ad41844 SHA512 010d140538bd6a361326d00bf38a50ffbbe08adc55cc7597cf69563b5d028335493c1925bcb91f618afd87f4d754e8109776be89f229e8b25b91510fbf64d7bd
+DIST hypothesis-python-6.6.0.tar.gz 9117847 BLAKE2B bb88ebee9db53f1c5753730d04e5dfe6a39ac4c5f7d534778b22b813ba188a55de6ad8a34f611f7863d1c3287be39ed7e10981e9d6ed8d8dd106688f154c3a49 SHA512 a446b4a11c6ee013225bfcd58e26efc6c9d867545d9bcf90a19468cb01fc5e2c5a7280ff9a80d4a1adbfe06dd155df6152941d5f53869d85e1d259e68a33a5e2
+DIST hypothesis-python-6.7.0.tar.gz 9118149 BLAKE2B 5c9601e6ffd9f2e20b518fdfc30f74ace1ee906604fca35c942a59370349c1166a1fd229de0bf5d3ebbfc1851fb59f92be65b112aeadc3bd10d4f628e3648e6e SHA512 fd57845f696117eb5d97f533443c60446adb95eb4dabc772c84eed268c2942001fecfc1460b42c2a83fdaec88176ff87a881f925a6e6ab5485b44f0878054d2d
+DIST hypothesis-python-6.8.0.tar.gz 9118818 BLAKE2B 560220e7224235ae395ef457344c5b998236265d2d4be30be670e8559cb290554313d23da0fc4a16121cb01e0ee39550d3e915cb3e90d3a344b3cbcfe3a34b7d SHA512 cf151ad89e5882fcc97e8fb447ef07deb90de6c9a3d2ab770bc31c156cbf1189f330a8297c8847180c8c98099a759813bd798e727c3f268cc7f87a0a523993f6
 EBUILD hypothesis-6.1.1.ebuild 1849 BLAKE2B 9515ada34767c85fad60ece3c12a46243e74e242c579c19b091683f74c69a729c0d3cc564aadbb1f67ac44f8a91e829b036b5960fb3f0c5b6e2eded695e90b52 SHA512 c5eac04dba95a69fd204c9787a02b2ff69dd8f5d20bf622a5f6a774bdf59f3f990894b960fb47428bb751a42ee4651d6c149e4fd6e0b18f61b3d5983625f6a42
 EBUILD hypothesis-6.2.0.ebuild 1857 BLAKE2B 64212b703d2f6226cf86734220a48c883b2b6c18f6e6a14d492079c7dd2374fce60a66d263023abc92117a5293e4c395773ab5f48697f7f2f9b32dd8de7959e8 SHA512 7e43f71209914d65f71250831a0583d92afe56ae1e20d3195d99a261e7d3871aa4295000efebcf0413612de80132beaa7cd2b696b47622a2fdfdafc7bb83c03a
 EBUILD hypothesis-6.3.4.ebuild 1810 BLAKE2B f24b2ef4037fee550337dbb719f727725a0b50ce8187e37708f91afcf80d048f2e3053332aa0d4ac0316259f916cc4345bc28305dc080c64546a9d3e45d29233 SHA512 cb2c9c312783f9e00e24175f4b65d5a8a396c59a9827bd4de63c67ca2556a082cf46f0c9b0700b56617c0e9298b451f2b9375309f2df0b38d39d7dd4a1df441b
 EBUILD hypothesis-6.4.0.ebuild 1810 BLAKE2B f24b2ef4037fee550337dbb719f727725a0b50ce8187e37708f91afcf80d048f2e3053332aa0d4ac0316259f916cc4345bc28305dc080c64546a9d3e45d29233 SHA512 cb2c9c312783f9e00e24175f4b65d5a8a396c59a9827bd4de63c67ca2556a082cf46f0c9b0700b56617c0e9298b451f2b9375309f2df0b38d39d7dd4a1df441b
 EBUILD hypothesis-6.4.2.ebuild 1810 BLAKE2B f24b2ef4037fee550337dbb719f727725a0b50ce8187e37708f91afcf80d048f2e3053332aa0d4ac0316259f916cc4345bc28305dc080c64546a9d3e45d29233 SHA512 cb2c9c312783f9e00e24175f4b65d5a8a396c59a9827bd4de63c67ca2556a082cf46f0c9b0700b56617c0e9298b451f2b9375309f2df0b38d39d7dd4a1df441b
 EBUILD hypothesis-6.4.3.ebuild 1810 BLAKE2B f24b2ef4037fee550337dbb719f727725a0b50ce8187e37708f91afcf80d048f2e3053332aa0d4ac0316259f916cc4345bc28305dc080c64546a9d3e45d29233 SHA512 cb2c9c312783f9e00e24175f4b65d5a8a396c59a9827bd4de63c67ca2556a082cf46f0c9b0700b56617c0e9298b451f2b9375309f2df0b38d39d7dd4a1df441b
+EBUILD hypothesis-6.6.0.ebuild 1810 BLAKE2B f24b2ef4037fee550337dbb719f727725a0b50ce8187e37708f91afcf80d048f2e3053332aa0d4ac0316259f916cc4345bc28305dc080c64546a9d3e45d29233 SHA512 cb2c9c312783f9e00e24175f4b65d5a8a396c59a9827bd4de63c67ca2556a082cf46f0c9b0700b56617c0e9298b451f2b9375309f2df0b38d39d7dd4a1df441b
+EBUILD hypothesis-6.7.0.ebuild 1782 BLAKE2B 379ad45339122b922c698b0beef73d7c98555abe8fc13a2253b23cc0679a137d64165c29f2a63814081fe65c3f92267dce259d096428e32711083173b20bceaf SHA512 19afdc10e149ff2145bd5b3d920766407c724435beafa7911f60491f366eb825c21df97339cfdb96aa818c9aa4debd21423fcd2f9b0afdc5191cd5611c1a281b
+EBUILD hypothesis-6.8.0.ebuild 1758 BLAKE2B 851664ea210f1d73d74597e16cdad4a3ecb7a94f69876aa4fe1518b7cb90041e148fa703d4260ce0321f99b561a3352e45369ccddd2cd3b9ade733e4f7f42d59 SHA512 75a7c6d83e2d9dc1f6b6571876483d8ee019b82b0eb1ee670d2db92c3541e1acdc344ff8a8fe6ce2dac3e7ea3b56c9672149f21f20f490aebec0702975aee33a
 MISC metadata.xml 755 BLAKE2B da1fcfe4509905d2058d448b0178dacbb87026a3542368d8aa3ffca38edf1cd3d76d9542f8badc0220f5b5c916fdbb054f65b054a361977e0258e475768e3cf3 SHA512 3f046788581ef05937ec8376538cc60628f9d8e25486fc6e4421dd8461a9a085f51540e1d5203ccf85007adf1a978a23da9ac39cc486d698967412eeb3f2a793
diff --git a/dev-python/hypothesis/hypothesis-6.6.0.ebuild b/dev-python/hypothesis/hypothesis-6.6.0.ebuild
new file mode 100644
index 000000000000..46ee7df74d3c
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-6.6.0.ebuild
@@ -0,0 +1,63 @@
+# 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_{7..9} pypy3 )
+PYTHON_REQ_USE="threads(+),sqlite"
+
+inherit distutils-r1 eutils 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}]
+		' 'python*')
+	)
+"
+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 || [[ ${EPYTHON} != python* ]]; then
+		sed -i -e '/console_scripts/d' setup.py || die
+	fi
+}
+
+python_test() {
+	distutils_install_for_testing --via-root
+	pytest -vv tests/cover tests/pytest tests/quality \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" ||
+		die "Tests fail with ${EPYTHON}"
+}
+
+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/hypothesis/hypothesis-6.7.0.ebuild b/dev-python/hypothesis/hypothesis-6.7.0.ebuild
new file mode 100644
index 000000000000..f1a7844b5d55
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-6.7.0.ebuild
@@ -0,0 +1,63 @@
+# 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_{7..9} pypy3 )
+PYTHON_REQ_USE="threads(+),sqlite"
+
+inherit distutils-r1 eutils 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}]
+		' 'python*')
+	)
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		!!dev-python/pydantic
+		!!<dev-python/typing-3.7.4.1
+	)
+"
+
+distutils_enable_tests --install pytest
+
+python_prepare() {
+	if ! use cli || [[ ${EPYTHON} != python* ]]; 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/hypothesis/hypothesis-6.8.0.ebuild b/dev-python/hypothesis/hypothesis-6.8.0.ebuild
new file mode 100644
index 000000000000..75d02aad2bd3
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-6.8.0.ebuild
@@ -0,0 +1,62 @@
+# 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_{7..9} pypy3 )
+PYTHON_REQ_USE="threads(+),sqlite"
+
+inherit distutils-r1 eutils 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}]
+		' 'python*')
+	)
+"
+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 || [[ ${EPYTHON} != python* ]]; then
+		sed -i -e '/console_scripts/d' setup.py || die
+	fi
+}
+
+python_test() {
+	distutils_install_for_testing
+	epytest tests/cover tests/pytest tests/quality \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+}
+
+pkg_postinst() {
+	optfeature "datetime support" dev-python/pytz
+	optfeature "dateutil support" dev-python/python-dateutil
+	optfeature "numpy support" dev-python/numpy
+	optfeature "django support" dev-python/django dev-python/pytz
+	optfeature "pandas support" dev-python/pandas
+	optfeature "pytest support" dev-python/pytest
+}
diff --git a/dev-python/importlib_metadata/Manifest b/dev-python/importlib_metadata/Manifest
index ecb7731be8e6..9959e364be38 100644
--- a/dev-python/importlib_metadata/Manifest
+++ b/dev-python/importlib_metadata/Manifest
@@ -1,5 +1,9 @@
 DIST importlib_metadata-3.4.0.tar.gz 33841 BLAKE2B e2ac38c0f6fc5ecf78d3a4018715282b176f448e0a9f2cb16320812c1f9ca18f797b2ddfa85a96d83f6ff9540b486abcd8b5a38fa7f9261abbde4a88962e765d SHA512 d17aae60ca79ddb3c2e60218144e7a3e055b2807e8ca4e55f0d0c1ae428323ab7d832e4178dd05a60f1de2f157497a6261afa7baa8f91bec85d042303869fb67
 DIST importlib_metadata-3.7.0.tar.gz 36517 BLAKE2B b96ac99bbc9ed7c961635a598d46bf409f11b008453123f3236feaf3650f7c6fe262c803dbf6b65bbe42ca4ea9990b559d3f03dde2287b19f0f7ff21668a3a3a SHA512 c11c503412cb5f18a235dbff13eb0d5b24a2a7510f32cb8fc4abec3259987de9e5a01692aef729c5d7c7fe597156b1317abc357d49726ef1026172995b080631
+DIST importlib_metadata-3.7.1.tar.gz 36595 BLAKE2B c4eaf3671ec48610ce310a2609625ab77496252953c2d0567cc4824c39a8601ef99fb3ffd5d7968eb7aa358aaedf0ab81d87271afdddac68d7bd3a70971b153a SHA512 b301c6c72b185d893e5e400dbd9417b2ba94122073d6cb163c9e9949fb13762ddc57b34dbba1330b55bef47073fc72a6a4b5689adf9af819a68be603c9d64c9e
+DIST importlib_metadata-3.7.2.tar.gz 36644 BLAKE2B 11e8f0c012d405a7059842fbc0aa1edfd8313a01b12b36e40c5a542b17f6ebe5284e945967f080c5934758820354f131df81e84d1fa4d5e6ac1660dac055a914 SHA512 ecf630c83c08895d566fbf3f435d4bfc5c0336dff1c682e6413598749c13720211aad4085dd7b9a88ca4218ef5514cd730a6f13c2c53be6cc349edd142106204
 EBUILD importlib_metadata-3.4.0.ebuild 1124 BLAKE2B 4638a48f81b82f368fc805c11e5ae2da1ea40e21de8bbd2eec56d5189d8d1b7ee4fed82e922f4767c77d2f490785baa0e2a5827cadf4df067dbfc7b73fb17452 SHA512 f5e6c62d3528d0f2dc4c517f23990c0b6b46f51e4beea035287d7762eac87fa677b7b9045fcbfd16cc74374b5180279e4cf8a18950e53f9a415cde93331998e7
-EBUILD importlib_metadata-3.7.0.ebuild 1132 BLAKE2B f993380a4f00c9bbd46aff735031adb6165d2b5be989fbe73cf56ba5a73b527c5ae36f3d01ca917cca7d56e346babaf908ecb4479a1fb7fbfc5ed07f160d2825 SHA512 9de1b984f97372f5b7c72d878d8f369512dafecc8cc34b38aa586b7e7a459afcc7dc651356ce9236dc8febbdb17d1d57e4ab180438b4fa73f8d5094bc094b289
+EBUILD importlib_metadata-3.7.0.ebuild 1275 BLAKE2B 151f0c0660967a67aec7959309e5ed2e85f2ea7547c2f7d273444f097287c04e87010a7338e6f4f87f0345b2a64fe7850804adbd174a12d81f676ba0c8f278f8 SHA512 cca8e63ec6b503b3290e65ff425cb1cdc32d6aee6b9d2a1dc5effc05a9f8b9382b1b42515df45c0cd5b2804135d25628d8a19ab242bddb43b5ecbaf5aafb15c4
+EBUILD importlib_metadata-3.7.1.ebuild 1275 BLAKE2B 151f0c0660967a67aec7959309e5ed2e85f2ea7547c2f7d273444f097287c04e87010a7338e6f4f87f0345b2a64fe7850804adbd174a12d81f676ba0c8f278f8 SHA512 cca8e63ec6b503b3290e65ff425cb1cdc32d6aee6b9d2a1dc5effc05a9f8b9382b1b42515df45c0cd5b2804135d25628d8a19ab242bddb43b5ecbaf5aafb15c4
+EBUILD importlib_metadata-3.7.2.ebuild 1275 BLAKE2B 151f0c0660967a67aec7959309e5ed2e85f2ea7547c2f7d273444f097287c04e87010a7338e6f4f87f0345b2a64fe7850804adbd174a12d81f676ba0c8f278f8 SHA512 cca8e63ec6b503b3290e65ff425cb1cdc32d6aee6b9d2a1dc5effc05a9f8b9382b1b42515df45c0cd5b2804135d25628d8a19ab242bddb43b5ecbaf5aafb15c4
 MISC metadata.xml 645 BLAKE2B e0d506f3cb5304b3cb14bd546c997978bfa70d77b16abd318c8e733ae90057b4dae2533107c3157a53df21b9f3046be0317c62367b3de26cfb245f4bf572ae85 SHA512 054fdafb3815ca9fb34178219c48ce5779f2ac8a700112d470fbf3bfdf780a6d98e0f30b6b0c7d6bc48cb12bda304dac01eacfa45d06964da704457311402679
diff --git a/dev-python/importlib_metadata/importlib_metadata-3.7.0.ebuild b/dev-python/importlib_metadata/importlib_metadata-3.7.0.ebuild
index 753f44d0b774..c7a1cf5de753 100644
--- a/dev-python/importlib_metadata/importlib_metadata-3.7.0.ebuild
+++ b/dev-python/importlib_metadata/importlib_metadata-3.7.0.ebuild
@@ -3,9 +3,9 @@
 
 EAPI=7
 
-# Included in Python >= 3.8
-PYTHON_COMPAT=( pypy3 python3_{7,8} )
-
+# NB: this package extends beyond built-in importlib stuff in py3.8+
+# new entry_point API not yet included in cpython release
+PYTHON_COMPAT=( pypy3 python3_{7..9} )
 inherit distutils-r1
 
 DESCRIPTION="Read metadata from Python packages"
@@ -23,9 +23,11 @@ RDEPEND="
 BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
 	test? (
-		>=dev-python/importlib_resources-1.3.0[${PYTHON_USEDEP}]
 		dev-python/packaging[${PYTHON_USEDEP}]
 		dev-python/pyfakefs[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/importlib_resources[${PYTHON_USEDEP}]
+		' pypy3 python3_{7,8})
 	)
 "
 
diff --git a/dev-python/importlib_metadata/importlib_metadata-3.7.1.ebuild b/dev-python/importlib_metadata/importlib_metadata-3.7.1.ebuild
new file mode 100644
index 000000000000..c7a1cf5de753
--- /dev/null
+++ b/dev-python/importlib_metadata/importlib_metadata-3.7.1.ebuild
@@ -0,0 +1,42 @@
+# 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=( pypy3 python3_{7..9} )
+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.7.2.ebuild b/dev-python/importlib_metadata/importlib_metadata-3.7.2.ebuild
new file mode 100644
index 000000000000..c7a1cf5de753
--- /dev/null
+++ b/dev-python/importlib_metadata/importlib_metadata-3.7.2.ebuild
@@ -0,0 +1,42 @@
+# 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=( pypy3 python3_{7..9} )
+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/ipdb/Manifest b/dev-python/ipdb/Manifest
index 0ceef9b79398..64097ccfc0fb 100644
--- a/dev-python/ipdb/Manifest
+++ b/dev-python/ipdb/Manifest
@@ -1,5 +1,7 @@
 DIST ipdb-0.10.3.tar.gz 9356 BLAKE2B 50afece454d55ce3df13251afb625d93e11f7ae8d0e563ca7007e7abe0ad46b59f2e93318578992c5c7d2d25fc815d53ebed8801530d74c4fb30cc150246f415 SHA512 5f704222ea4d6877bbf6a83cb528e0e975ceebd7ee0838cd7a01f167381b80c48d3c8fc06d13a718a08ec619bfe984fd258e86ce93dba571ebdec2539db543f3
 DIST ipdb-0.13.5.tar.gz 16145 BLAKE2B e0bae825c2ce6b640e73e8ad8615f5f4e9c18a00e8c081a66ef0adab3429792a07c8434ddc8b236f938b7efd263c51f29bfe3f8d232d8bca20ab0cc2eff8165f SHA512 3ec05dec884a0006435fd7e5eb68bc76c6dacb1b0dd3f68c10c8c2a9dd3991bd6e498dcfb3877e5e534240ead1194787049ae3815fb8579b7bdea2e8c91970c3
+DIST ipdb-0.13.6.tar.gz 16303 BLAKE2B 92c5a3b5717c6cb8f1afc8b13d6ad04a0964bb82221e5637818c085f6df6451b806b74bea6cfb1b3f18db7b3a8101bcf006160f9ad0ab241dbcc088dc0fd0321 SHA512 d46d92e55fc3ca35dfa29aed9a47cfb841cc09460ba7724dd553d719f8e8deddeba33a39e143914c32a5e41d38ffe086dc4b64c6c53b984a6c83546ae5f46319
 EBUILD ipdb-0.10.3-r1.ebuild 536 BLAKE2B 07e119a2fefe2dd1387c75988a0b4aa9fe73e47d288fa8e1e51fa75b54ab60f06adac72a6bcc2b8e68aa5ecceecccebd392d0c08a32d6514b3370106c54b89ec SHA512 17fce962ef688d754ac4c3f0fd251d5c66bba339b25c7b902e51b67f64280b0e12b47853081305a6c6085165453369014aee6895a94f2ef62b1874dc568437cc
 EBUILD ipdb-0.13.5.ebuild 544 BLAKE2B d686553950302b57bf0276b9467ba1b3f25e032889aae910d2b19060de39a2ea17bf18adaba9e9849e6ec3fca884bfc54c8baa713f39d1e5ab92c37d997f1eef SHA512 222e7ab0556ca424ae24e3d54d11a6a56c5bb84036ed8390e15446a5f7637a526280dd02b04ca900727e9273bcfeec516acac449143b4f3fac032bf3e80cad3e
+EBUILD ipdb-0.13.6.ebuild 544 BLAKE2B d686553950302b57bf0276b9467ba1b3f25e032889aae910d2b19060de39a2ea17bf18adaba9e9849e6ec3fca884bfc54c8baa713f39d1e5ab92c37d997f1eef SHA512 222e7ab0556ca424ae24e3d54d11a6a56c5bb84036ed8390e15446a5f7637a526280dd02b04ca900727e9273bcfeec516acac449143b4f3fac032bf3e80cad3e
 MISC metadata.xml 307 BLAKE2B ec524a1b59512e5f70c0d7138fb3d5ec9f8116cec0c22a3b37c335c99766c3ee338949c4dfca60f78249610cac48f4d40bc80da68ba0b5efbcb3c2d8eca3f5f8 SHA512 debb6af292a4b01925b248df604776ec21fafc3d3dca20373399a1481061392aa8e5313b07b586af6a9c2f429474d2b07fc1115e9c337c19fe0c38c489e774c9
diff --git a/dev-python/ipdb/ipdb-0.13.6.ebuild b/dev-python/ipdb/ipdb-0.13.6.ebuild
new file mode 100644
index 000000000000..4b895e23400f
--- /dev/null
+++ b/dev-python/ipdb/ipdb-0.13.6.ebuild
@@ -0,0 +1,25 @@
+# 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_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="IPython-enabled pdb"
+HOMEPAGE="https://pypi.org/project/ipdb/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+RDEPEND=">=dev-python/ipython-7.17[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	app-arch/unzip"
+
+DOCS=( HISTORY.txt )
+
+distutils_enable_tests unittest
diff --git a/dev-python/ipython/Manifest b/dev-python/ipython/Manifest
index c9636b3a0563..bfd23c0afd21 100644
--- a/dev-python/ipython/Manifest
+++ b/dev-python/ipython/Manifest
@@ -1,8 +1,6 @@
 AUX 2.1.0-substitute-files.patch 1017 BLAKE2B 70577eb950a18345804a2a4b750bd233dc6a0b6bbdb524dfc66e0f4a7c69b0eeb2d35efb9d1845d567a11d1afa7881068b4757e42b9baf24dc01ba3026608a38 SHA512 fc4c9e12267ac5f04a2e16ad27334a093638538b8149ff380099fcbeb674a276ab9eb624a508010e37f82c05d5f7ab527a80e386b3e7b61c123ecb8effd9d542
-DIST ipython-7.19.0.tar.gz 5225775 BLAKE2B 1909d8336e7fc90959da4ca33ad7edcb8c2dec0a5aa20ca6f643ef53482fe7bf0d52e2bbec7cf97e72a1fd4d37af45ba01166febb25f35b52d69ffc062f0f0e8 SHA512 5350a125da3050acaea4899939a3b9d779009a2f5769fc9f3aa514ce029df050069ef9310d3255ad62f28912b4dec39207267248d3a2c3e9131cffd691322622
 DIST ipython-7.20.0.tar.gz 5140776 BLAKE2B ec01caf874ab9c331eb1f074f9e70acb521fe6d4abe3e8f086d9e9e77cd710c3b0d88c6d7b071abc6962eee8141b65a012ec772cbec3450db25f086fc66cf1c6 SHA512 2fff1a64c3d83e794e76bcbdf54e105f499321d9a7e5d3221cdc3e15a96e90543fd465b8dbee4836965286e7c1f1ea6d13e4d3d88c095164858bf71c161111fe
 DIST ipython-7.21.0.tar.gz 5141725 BLAKE2B dae44d481e959ef7d002bdb51d0ab1e2f3eca3449071a2e4161aa735c06fef8a948d80bafd3f2bdd066208437b5ed36615cad5885af453771a32a313fba907eb SHA512 200e41d4e06343b6320f3d106925f6c995f39cf88d01250f53885d4e94d0fd9454a6be4cd7c69410f7dced94b05634f6d2269f9737cc563accf85206d4d7fff8
-EBUILD ipython-7.19.0-r1.ebuild 3703 BLAKE2B efb9a0572c9368abfee6b103dd44517a5700fa1a33cb00e07f61bd286dce2de9a11eb16fefd6bec121871bc6504ed3be2aa2109efe1114442cd4c0a3620bd73a SHA512 8c7c1260c7b07e09282e01090033e702a5fb118c56e0e091a265c5a3bfe5129a17f702cd6ff30a1fef6bf732a678bf1efac4273f7088a2262f8c39202e6fd19c
-EBUILD ipython-7.20.0.ebuild 3708 BLAKE2B a1423f8a27cf4e4f404c1944182b667eba23abfbb947e32c73d0764934b63282dd05c016db5794378bc3a5e34911474520a28709c3ef162fdc16d19f807c0346 SHA512 2d482219964bc6d1b29209bdc1d0377fed71e4258cd7dd912958d40d014eb10ae012c07eb4db28f9392d9a8c7696125d2de22fe454f2d1cdcd41c0c60f22bf7b
+EBUILD ipython-7.20.0.ebuild 3704 BLAKE2B fb00d3cbc6ce0bc276e0ac5e9fb4babda5e5fb020d73c072ecd3e8b250806438c4638e1c064b70b15ee4c4cfba4089d28bf85af7b4f177128a7d2e03dbab94e8 SHA512 1100f88c399313d33d4c463cc9c9a05a44c74203d086109e3d597a0360011036b57016e63964563410606096b13ee9dbd588882f2aac77193a2a6dae513ae192
 EBUILD ipython-7.21.0.ebuild 3708 BLAKE2B a1423f8a27cf4e4f404c1944182b667eba23abfbb947e32c73d0764934b63282dd05c016db5794378bc3a5e34911474520a28709c3ef162fdc16d19f807c0346 SHA512 2d482219964bc6d1b29209bdc1d0377fed71e4258cd7dd912958d40d014eb10ae012c07eb4db28f9392d9a8c7696125d2de22fe454f2d1cdcd41c0c60f22bf7b
 MISC metadata.xml 2882 BLAKE2B 189477b4ccde9051b61d2a4ff5134907886795f97c5201fc2bf9c012526333151931a1445b6315f286474b71af84253033cbe9bf89bffa7813bfa49a4a07ef6c SHA512 f54fef4552d09a03a8d186c45f917c091928f1de84dfbdd80f1db80912d616d509f10c588de533916d9c494f5b3ca5e6e50a6d8b8c59ea47781311ad4319442a
diff --git a/dev-python/ipython/ipython-7.19.0-r1.ebuild b/dev-python/ipython/ipython-7.19.0-r1.ebuild
deleted file mode 100644
index 34f777debd5e..000000000000
--- a/dev-python/ipython/ipython-7.19.0-r1.ebuild
+++ /dev/null
@@ -1,137 +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_{7..9} )
-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 ~ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples matplotlib notebook nbconvert qt5 +smp test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="
-	dev-python/backcall[${PYTHON_USEDEP}]
-	dev-python/decorator[${PYTHON_USEDEP}]
-	<dev-python/jedi-0.18[${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}] )
-"
-
-RDEPEND="${CDEPEND}
-	nbconvert? ( dev-python/nbconvert[${PYTHON_USEDEP}] )"
-
-BDEPEND="
-	test? (
-		${CDEPEND}
-		app-text/dvipng[truetype]
-		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
-		dev-python/nbformat[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		>=dev-python/numpy-1.14[${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}]
-	)"
-
-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
-
-	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_test() {
-	distutils_install_for_testing
-	pushd "${TEST_DIR}" >/dev/null || die
-	"${TEST_DIR}"/scripts/iptest || die
-	popd >/dev/null || die
-}
-
-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.20.0.ebuild b/dev-python/ipython/ipython-7.20.0.ebuild
index e314d1de9986..a6700d2b28b3 100644
--- a/dev-python/ipython/ipython-7.20.0.ebuild
+++ b/dev-python/ipython/ipython-7.20.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 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples matplotlib notebook nbconvert qt5 +smp test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/ipywidgets/Manifest b/dev-python/ipywidgets/Manifest
index 19de12333e46..456cb75c8760 100644
--- a/dev-python/ipywidgets/Manifest
+++ b/dev-python/ipywidgets/Manifest
@@ -3,5 +3,5 @@ DIST ipywidgets-7.6.2.tar.gz 4066260 BLAKE2B b0d75d83108336bac204c24d2a67e88a200
 DIST ipywidgets-7.6.3.tar.gz 4072376 BLAKE2B 095226ef6a9ee0821b875dc117afe4155132b6b2d94da71b937959c1c4e9f33fa2837d8b736a47caed77c4c52fbb95d8afb5db9e58e99e567a34d6c8cf39afa3 SHA512 7b3506b43214948d73f4f2c55af81ceacff3d7cccc167dd32c72df6bffb8b1b1f8bdbfac7162d343858f723e7b3f3a1cd78f20c2f93b14a8eb39125ae2aee7b4
 EBUILD ipywidgets-7.5.1-r1.ebuild 662 BLAKE2B 59d22bbe2c5149799509cdb5bf95592b6e4eaadb687fb8a6337ba39b111aece352e86fc44cc811ec45c174ca8e83bdc7c0c17a933312e355f5a355b19413516e SHA512 3f7c57a8e75fdd19b6a718cc09f6bb5b296070f22e2fff8a4a231633c0dd201bb2c96e8083389950086145584f592c670197fc7808fac4d96f4c7c1292e00c61
 EBUILD ipywidgets-7.6.2.ebuild 692 BLAKE2B 050bb849c9300a5ffc23659c29624a989034907527b297997517c3704ca63feba144ca276f2903d8d683db54be73cb28e3e4f333abbd23d3fc9799c48ccbc9f3 SHA512 53de75afe4494284a17082d230651f707d64e09f338b10c4523d442e4d887e5277efd5b31ddf1bcb81029ba19d73af2bde942aa9d44f06fdbb763e90f9e6d037
-EBUILD ipywidgets-7.6.3.ebuild 692 BLAKE2B 0bbca97629451bd2a4c1c680beaf83b772aaecb05a2b556fda4788a576552cdc2fa65d6c0e8dc302b6489f6862e95ba50db70b576430f549d35c74490dab889c SHA512 59a607d22861d6a32117e7b2672013db4e5e25189482b4b6fda55bca63e6fb313ac034d0069cff6f01f1c3496e9240c938601e6118e4ae86b5367499d7d8acf7
+EBUILD ipywidgets-7.6.3.ebuild 690 BLAKE2B 05f57786512c2af4649ae0fbc9bdc7dd7cdf3b80f0b46a16811e001bd404b91284d54e9c19942fa54a9dff34329d3806851a1359c7b4bbbd13fa4aca43e06aea SHA512 ecb9b70c84e27358aeee1b245d05603fdc007ec32ac61c7700f436dea635f782bad9ab9c499995a16a325dc2814e7502dd0f08824b742f4e567b0e25434f2dae
 MISC metadata.xml 536 BLAKE2B 885f71096220f3b226d03e8b44bfb31ccccf060a55c1de6634369d2570463912e19146577c10c0152ad0aac8c5d0a107317db1e2a2f705bc8a21efb6ac59a636 SHA512 2e7e02e4dbb0b2ef05216f597a14bca27af0526da6ec962da402e206ec5eb8a9b08174d52cf5d6d231c20c899a7e87a8f942c7cefb93dfa50eeab7bc65d61a05
diff --git a/dev-python/ipywidgets/ipywidgets-7.6.3.ebuild b/dev-python/ipywidgets/ipywidgets-7.6.3.ebuild
index 65b2d5905dd9..dae94f88ffb8 100644
--- a/dev-python/ipywidgets/ipywidgets-7.6.3.ebuild
+++ b/dev-python/ipywidgets/ipywidgets-7.6.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/ipykernel-4.5.1[${PYTHON_USEDEP}]
diff --git a/dev-python/iso8601/Manifest b/dev-python/iso8601/Manifest
index 7d5ca23bfd81..01d1a8224efb 100644
--- a/dev-python/iso8601/Manifest
+++ b/dev-python/iso8601/Manifest
@@ -1,5 +1,3 @@
-DIST iso8601-0.1.13.tar.gz 12205 BLAKE2B 21dbc1f4212ec76bba2105e15eaeaac1a3bbac9f296e91e813efcb0811e75e45c4dcb5500bb29446e401c88035a602746ebe9394abc65b4d9637a12a2bf96a00 SHA512 0a16e2699ba3f33cec57acdd2be70c64d0e2655f08d30581f56997992945b700e6bfb14164f1f422e073eefeaefab4377a56ec6b3800156347e1568172c32737
 DIST iso8601-0.1.14.tar.gz 12722 BLAKE2B bbf56603d976d9f015ce04ed61c246b1b57e4edce1a912ac7ac5c932d122ca3855e917a7993b3e2d7ee6ba9ebbc9be6c554e69880abc30488698d8c354bf8ad4 SHA512 a461eb6cd011fed1ebec583b80ecf85b542c80dbdb4ad0213131febe0b58567bc0852283443c87923662b85e125ab66642b876b16ddfc3698445dd80e67e0720
-EBUILD iso8601-0.1.13.ebuild 543 BLAKE2B 9c984f1b47eda93e1a66f32019bfab03b56796a7dd4a1da209e6df50af6fa88bd7ea0be6aaf619b43d6e46cabe2cc37d16bd570d8ec5bc5070789d3c6c733300 SHA512 3587e1ad424a4b155da0655126d0eb75c30c00144c261a9053ede87b5a1a38f5a5e831dec6833e29af99cd157c547943cf97a3f2f1998e2f16baa52bcd7c0940
-EBUILD iso8601-0.1.14.ebuild 552 BLAKE2B 03387f6542ce63ba3717dd2a028d5248f2db820abc1177a55fbc55a7a6fc50b41b26da31d61d62ff2525a9f0853a2fa30fca258f3652236cc0c7e338a5ba52af SHA512 a8e5affc2a04913886f073bce6178c0aee9373e86ded920efa64297371c5644a9a17900f6920e0370d21dfd479d307ac63c5f8a2d1480d0fedb9e8e756306165
+EBUILD iso8601-0.1.14.ebuild 543 BLAKE2B 9c984f1b47eda93e1a66f32019bfab03b56796a7dd4a1da209e6df50af6fa88bd7ea0be6aaf619b43d6e46cabe2cc37d16bd570d8ec5bc5070789d3c6c733300 SHA512 3587e1ad424a4b155da0655126d0eb75c30c00144c261a9053ede87b5a1a38f5a5e831dec6833e29af99cd157c547943cf97a3f2f1998e2f16baa52bcd7c0940
 MISC metadata.xml 394 BLAKE2B 11ec2e471953befe48f94577e708d873fc6aeca3ea72af7ae5d069badb8bc87511685de5acdc289e4d77cf1cfe99ec9ac16a9fcb7edba73adb48c8df7b2ab634 SHA512 dc0926ce7410798e86865bc067798027ec1b4be5fa9962db67248cc806cc3e5486f288df86c045bbc938f66a941472e49f2c17db2da9b61ed3ae5a4fe2f202ea
diff --git a/dev-python/iso8601/iso8601-0.1.13.ebuild b/dev-python/iso8601/iso8601-0.1.13.ebuild
deleted file mode 100644
index 1cfde114660f..000000000000
--- a/dev-python/iso8601/iso8601-0.1.13.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Simple module to parse ISO 8601 dates"
-HOMEPAGE="https://pypi.org/project/iso8601/"
-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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris"
-
-distutils_enable_tests pytest
diff --git a/dev-python/iso8601/iso8601-0.1.14.ebuild b/dev-python/iso8601/iso8601-0.1.14.ebuild
index cbb31758601e..1cfde114660f 100644
--- a/dev-python/iso8601/iso8601-0.1.14.ebuild
+++ b/dev-python/iso8601/iso8601-0.1.14.ebuild
@@ -13,6 +13,6 @@ 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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris"
 
 distutils_enable_tests pytest
diff --git a/dev-python/jaraco-path/Manifest b/dev-python/jaraco-path/Manifest
index 7f37b3116900..505d392e8355 100644
--- a/dev-python/jaraco-path/Manifest
+++ b/dev-python/jaraco-path/Manifest
@@ -1,3 +1,3 @@
 DIST jaraco.path-3.3.1.tar.gz 13287 BLAKE2B 8a803269fc02cc85391b4b1e1f2ee2a94c039d433b505aeb4aa0fcbb23731b802f236cd2de80dbb8b9e59297312892a085632f41234d3e1bb7d4bd04f62e00ba SHA512 00dac02fdc6df469f8661d552b16a8ee6150d86a7df9459264377a03e96fd94608f9782ad4cc2b2df67c64a10f8af26ed650b0bac0b1e59607d429abdbe64309
-EBUILD jaraco-path-3.3.1.ebuild 934 BLAKE2B 220ed025f5c99810585e974afb588b91132cf27a0061899feede44dc8a9ebbb16fcc0211bc410ffab0c9c3d8fd50dc296762ba5a8f0b0765c1f0364c439e05c0 SHA512 77f01e7161d28ac47cc9ded14671bb401b7be47f6ad19c616a93ea45fe4bf2471edcca67798c0563ce45e842ac75d1f21493601085403ffede4f4a191469c7d1
+EBUILD jaraco-path-3.3.1.ebuild 947 BLAKE2B 668f59215ca6fee00b6ffef16dbe726ea34800bb2251bfa6ba72f8804e950db95f4a51a39df0da7360926efa11a1baf810319b57d1cafc67b11dd8821a057283 SHA512 a78ff4e4031dd743e8715f66482b52fa30f3c692555d24572ec209aa90be66292407642e31b41d4b9b57ef3e8162f9c930b7d1643ecb4b703e7a7da2471ec3ec
 MISC metadata.xml 396 BLAKE2B 3ecf8b1f6392c3d14122458f7b5fc3c08e5693570685a6ad0f29da64e9f38e4e93c83b180fe01803471342343b0420769af6a01086cd71cc3031b2efaaf3b54c SHA512 eb3cdebd2a8d524c88b519d8e4bb6020e63da5cf69cb4f81eb7a7867bc6d880c313afcd8aa7dd6bd82b661e1aabc60c6ea0c4319ad2b2589e1825d8e3ea65de3
diff --git a/dev-python/jaraco-path/jaraco-path-3.3.1.ebuild b/dev-python/jaraco-path/jaraco-path-3.3.1.ebuild
index d718b3dcdb27..4bb46642db13 100644
--- a/dev-python/jaraco-path/jaraco-path-3.3.1.ebuild
+++ b/dev-python/jaraco-path/jaraco-path-3.3.1.ebuild
@@ -15,7 +15,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
diff --git a/dev-python/jaraco-stream/Manifest b/dev-python/jaraco-stream/Manifest
index 7b39d613914e..5e547be56a84 100644
--- a/dev-python/jaraco-stream/Manifest
+++ b/dev-python/jaraco-stream/Manifest
@@ -1,3 +1,3 @@
 DIST jaraco.stream-3.0.0.tar.gz 11838 BLAKE2B 9d26ff8f78a3f090d79ccc8cbc41819a8290ebdb7770f56a57938ad9311ca1fd168d633fec78ee102c2c08156c9e0ae6f521dd5cafcb9df22928ba9f3f832734 SHA512 f2ce7e65d9a3bcd81985f45d03f7cd56b2f2939f13a423b8b65714f19eb249493d89cad774460dd08c1345124d3d10f85ce6875b5f7049705f993c0a3146e5d9
 EBUILD jaraco-stream-3.0.0-r1.ebuild 1288 BLAKE2B 68a93e0bf746149b7e0c8c3c9fe591453922e02fd6f988396a8351abafafd4d61afe4b86eaf6a49c6d84145719fac4ce1b363d70270d0c1e2134146619c7d08b SHA512 4f33d6cb1918011727d1e65671aee9f66da9b2aa6846e3764b16c8efe97423f04d16f177a0722df3577ce70e89b3e95f80663f65cb58e9cb2ad0c47336423805
-MISC metadata.xml 602 BLAKE2B 3875bfb93914028b263ef5b6f7af81ee9f3fc08f1217537363a02b12e69f273ad9344c5078ea284ed5edfee1389bace975f2745379c3b4b17db4fbeee4045494 SHA512 3a6635e6f38260c76979248878ff326451273bab021f3e85c23a0ae7e29d71daa53ccfa319c8d8457faa00c6fdf5ad3dc68e0693e951ecdd419182f1861a36c0
+MISC metadata.xml 626 BLAKE2B c28ab97500af030d20cc155fd74e8b918f68c84c0335b1a104956db4aae0801f028ccf46d41aeb9ace3618ec77bb2c19f2917150ff6f6309a82b507be57cf3c2 SHA512 2b870ff52a49ab3e2f81322dd811fa1603341aade274f12b0485f2af7f8d0794873a4801a9e648de632eacba61e45f433a0624aeef283add6ffced35c19bece1
diff --git a/dev-python/jaraco-stream/metadata.xml b/dev-python/jaraco-stream/metadata.xml
index b154260363e4..73937827cc3b 100644
--- a/dev-python/jaraco-stream/metadata.xml
+++ b/dev-python/jaraco-stream/metadata.xml
@@ -5,6 +5,7 @@
 		<email>sbraz@gentoo.org</email>
 		<name>Louis Sautier</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">jaraco.stream</remote-id>
 		<remote-id type="github">jaraco/jaraco.stream</remote-id>
diff --git a/dev-python/js2py/Manifest b/dev-python/js2py/Manifest
index 69d17e06718e..06ab707cb14b 100644
--- a/dev-python/js2py/Manifest
+++ b/dev-python/js2py/Manifest
@@ -1,3 +1,3 @@
 DIST Js2Py-0.70_p20210218.tar.gz 1969615 BLAKE2B 4702b2e771bfd2a5158a3539c33932335816c74f9dbd132679036aa2b7e53796764dd852e92d72a35ecc31efa34b849776c45d8c81e80f85f59308edf0996f00 SHA512 757c895bc0ba933020336a70473ec4455cb93c17040a39f17d645782011ea72273291448f3448ffd34658b48ada45b77facf3d326133f1c0d63e2e26e2cd7f30
 EBUILD js2py-0.70_p20210218.ebuild 1104 BLAKE2B 7468b86817d2cc6eac70d19d84a28667520ac46b075e1967dffedcf8042fdde7f5974174816977aaca8ebcac026a2fe363414f61e618670ac72ac55b5a8b57de SHA512 13c446847663b6b574f74d0b6ed7873c4f28a2bdefb944a12354e05c6c9cf2e19d86c0db302378adc9f4464f30ff544cffeb6a5a85526c855f0d50b28d319f84
-MISC metadata.xml 546 BLAKE2B 725ee93573250bef3db5d8bdc1bc4cbb6c8af06a8f1a395564843de779151a447d28e56ccc64456659d72c066b1341a8215f8f259f1861d53d5aaa921e25d751 SHA512 40a016ead490a75d46c2eb031911d5869870da7adeaee05231d3f38602cb290936a5986b2cd8f22f68489acfb0b288aa12e383f8dce2f225a7d223e9c9b52a4d
+MISC metadata.xml 542 BLAKE2B 6f64decdab352e206758cd1f72a8cbd44a3f2139330bd13a8d8c57af739b5fb1f830258e486cf830c7074c00311aac5d370fb55bcc4ea3a45ca2b9a467f338b6 SHA512 d813c7c3b62569eb7e2c11ce0688d76a69bfb1de1508857032a678e4a053bb075561a4ebe7f376f9c4c9a34f962da700d78c449c20515559904910b146b2e8e1
diff --git a/dev-python/js2py/metadata.xml b/dev-python/js2py/metadata.xml
index 03e41f2cd8e4..586c77123d23 100644
--- a/dev-python/js2py/metadata.xml
+++ b/dev-python/js2py/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
     <maintainer type="person">
-        <email>xgqt@protonmail.com</email>
+        <email>xgqt@riseup.net</email>
         <name>Maciej Barć</name>
     </maintainer>
     <maintainer type="project">
diff --git a/dev-python/jupyter_core/Manifest b/dev-python/jupyter_core/Manifest
index 7d19304a9cca..14df43073004 100644
--- a/dev-python/jupyter_core/Manifest
+++ b/dev-python/jupyter_core/Manifest
@@ -1,5 +1,3 @@
-DIST jupyter_core-4.6.3.tar.gz 67305 BLAKE2B 7c6a32bd8ce773b7bc4156eabf75597112716632179736b19be4b0e73eba7c5c67a0c9d2d141b952d72b68aff826227b0004a3bc9f3b286b68eb1375f2316bdb SHA512 3c7370c24a4cf53c9747e9e411852d207c0c7035809dab7cb018ccb53e19208df25ad4f728531e47f3a42c4d9694c3e1ed7b03133de23bcbdeb346c319f5f51f
 DIST jupyter_core-4.7.1.tar.gz 68886 BLAKE2B aa89351845c669474c03a307934a5d84b6357679bc99f2fc7da4f93ff347766d52ce3551780803b73941d6457f7004306e795398fd390c81e9180193a2119225 SHA512 bc190abd000566dbd097dcb14acf1926c92bb265f2cfbbd14dac6a9cf7d6a02f924ba89fa957ca30c2af57433e9187e288bb8e80d039a3d3a583c6e488a9c80e
-EBUILD jupyter_core-4.6.3-r1.ebuild 873 BLAKE2B c12862c168695134a8c52a77060095a2b9561cc63ac212267cc91116144466b22d89accb0e0e48309c359017c9de14f15c42404d2ce210258ad0a44798fe19e9 SHA512 bbbc98f07bd98aad3d0a719ebc1c0a0b398138fdac6c259c886dd502950db26508a8da010802367dddaec04d7744e037e3e8dae272d478a20c3b07897bb9825f
-EBUILD jupyter_core-4.7.1.ebuild 1041 BLAKE2B d293bb8833b7e69d946c7428a57668c2ff058199128fb590ef631f136186d6735ca7333755890b46f3c09a2738c08cfad2a22d490d590a31fb0dc09b52a610d8 SHA512 f961279743b7cb4e630fcc195cdd26e72d3ab471425aec6208ef0e90f391d412d6eda3a2f1cae2c615e9c2062071eebe4c75f92c8699213f79e023f4fe685291
-MISC metadata.xml 733 BLAKE2B b53498df76d4e2adf05087c94920897408001e3852dd2d600f7f08748c09e8248d2d2be301ef7691db2ef1768369d935cfb3d03bf0dce44db8f0b8e98539037d SHA512 a828f64941f7f50c82af438692a21614115df2f151064cc684ddda16c6a7dad674efc2563a68dd6b01ca9edaf07c6d2e54a1ae6803f72bfa9e5e14995c4ca37f
+EBUILD jupyter_core-4.7.1.ebuild 1038 BLAKE2B face60e9d54facaa680cf2896ee92bd2e29156c6027f102a3d7082e382020199db21d9f85b0bebca700f5d5abd985c28d1176d478eeefde136194e5aa6feece2 SHA512 f497d46a597c241793fef62742cbd5a25f9864c6c84674eded5643bcb14b00ff14618d103a5bd3cd92b7e6e7ebd405785213f6649324e4ab801780399d597b44
+MISC metadata.xml 758 BLAKE2B 53222aff39fc0d952b84f0f6e2c8daa0946f338cb4ea36d0412ac4ef019850e8aacd4967f2602db0c6c725d5795686fc8c16e3db6aac78ddb35b698273e7e62d SHA512 e965891552fc7e537d2315eac0e32f37acab6e36acde000a534228aebf1dca39024930d2c2f3d37b6f9a7b6467bd16921288095c26f9e99a15f0644a8b172467
diff --git a/dev-python/jupyter_core/jupyter_core-4.6.3-r1.ebuild b/dev-python/jupyter_core/jupyter_core-4.6.3-r1.ebuild
deleted file mode 100644
index b5e369ae4bba..000000000000
--- a/dev-python/jupyter_core/jupyter_core-4.6.3-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Core common functionality of Jupyter projects"
-HOMEPAGE="https://jupyter.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-
-RDEPEND="dev-python/traitlets[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		>=dev-python/ipython-4.0.1[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_sphinx docs \
-	dev-python/sphinxcontrib-github-alt
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# rely on imports working without PYTHONPATH
-	sed -e 's:test_not_on_path:_&:' \
-		-e 's:test_path_priority:_&:' \
-		-i jupyter_core/tests/test_command.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/jupyter_core/jupyter_core-4.7.1.ebuild b/dev-python/jupyter_core/jupyter_core-4.7.1.ebuild
index 3ee1504526a9..ebe9d474f3d9 100644
--- a/dev-python/jupyter_core/jupyter_core-4.7.1.ebuild
+++ b/dev-python/jupyter_core/jupyter_core-4.7.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 
 RDEPEND="dev-python/traitlets[${PYTHON_USEDEP}]"
 BDEPEND="
diff --git a/dev-python/jupyter_core/metadata.xml b/dev-python/jupyter_core/metadata.xml
index 1166bf9d3de0..1578fbcbc2a6 100644
--- a/dev-python/jupyter_core/metadata.xml
+++ b/dev-python/jupyter_core/metadata.xml
@@ -14,6 +14,7 @@
     This package contains base application classes and configuration
     inhertited by other projects. It doesn't do much on its own.
   </longdescription>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">jupyter-core</remote-id>
     <remote-id type="github">jupyter/jupyter_core</remote-id>
diff --git a/dev-python/kaitaistruct/Manifest b/dev-python/kaitaistruct/Manifest
index ac4076d98d46..0ebacf1e7449 100644
--- a/dev-python/kaitaistruct/Manifest
+++ b/dev-python/kaitaistruct/Manifest
@@ -1,5 +1,3 @@
-DIST kaitaistruct-0.8.tar.gz 5158 BLAKE2B 802435e81c8ec2544f26109762d43d7761c8672714107861e5f981583bf38ab85b3c2f1f3be5d25429287b380b756599fb51cedd130870f2cd9cfe221fd2f509 SHA512 8361e30c5bec9a7c57c280d277232ff4123686f29f3813e61cde9bf7512ead2e2f447ea1e18b8925aefe432edbbd9682a690293dcb928a9049c4c81832b5666f
 DIST kaitaistruct-0.9.tar.gz 5497 BLAKE2B c3f4dae4269b8bf5102a120aa8792ab710607efd854d01e1239e0269fe696d38183f82a4d93838756d5283cbaa36bd137ddc8b0ea6c91bc474eb89dfba4a76e5 SHA512 4654f18d72f31745f27eed035899231e69f9539a8e8322055b0dd99ad701dbd4d484357d0bc42f5a1953abc6947a90fc5ec9da80aeb862077c175c1295549682
-EBUILD kaitaistruct-0.8.ebuild 396 BLAKE2B 7c85b1b07edff988f1ae67abc63276b0aeaa5f1f2967c2bfd3bcb51caee0ef191fb4fb977a8dbd9fcc397baf19a2ae1ae82b63eade5adb5214fcce419ec5755f SHA512 f3174e4a6de2b8be8755aae30dc0da4cf8e383d7fc8017d02b359fb73e1ec66ff07004060d653eb911eb23940411813e71c0506fccc12741d4bc353f4521140f
 EBUILD kaitaistruct-0.9.ebuild 352 BLAKE2B 052cb18460a97a79ea48138a0bc5c14cd70808045f2e2c437acb161b142c8d0325216adf5d8e8b83cd98073c6aaeedb4ad1c506edff6e56497b376122f2047d0 SHA512 e1d5261465173260edad4534f106a4daafe93558683780015643f98bf4bff7ae495730f168d0ee68cefd232ff2882dcddc67d4b89e33dbe171177ab7a2b245c0
-MISC metadata.xml 754 BLAKE2B 2e243bfaaeb4bf110e5a229ded97a4dc9021031f527415f4f59978aa1f37df1d00b76142ff13de317e8cdc28665555800465696c4f13b812d199a523b15c8cfa SHA512 a50ba1aebf1fe3d7ac4f294b9edf20709a542ac263ae3a2d33029dc424136c6a689680933430075c9783032cb893de5563b810974da724bb17b556ee5d6d08fc
+MISC metadata.xml 778 BLAKE2B 54b1b487d1a267101bba4558451de2efbfd3cc995f65da76f96999cf6d11572196a940002287faa3127c343c0110103a68872a5a0e53cf2285e616a9ebc7332e SHA512 c35ef9a23fa48d359deb4226113bfb031ac52dbbec82a08a8fd0500be29c3c946fc6e167811117021afeb1c02533e43b6dc9368c80b98174958777e9ff7669d1
diff --git a/dev-python/kaitaistruct/kaitaistruct-0.8.ebuild b/dev-python/kaitaistruct/kaitaistruct-0.8.ebuild
deleted file mode 100644
index 2d87b9f5d3fa..000000000000
--- a/dev-python/kaitaistruct/kaitaistruct-0.8.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Kaitai Struct runtime for Python"
-HOMEPAGE="https://kaitai.io/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/kaitaistruct/metadata.xml b/dev-python/kaitaistruct/metadata.xml
index cc1ef567f767..ca6306e5e4a7 100644
--- a/dev-python/kaitaistruct/metadata.xml
+++ b/dev-python/kaitaistruct/metadata.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<stabilize-allarches/>
 	<maintainer type="person">
 		<email>matt@offtopica.uk</email>
 		<name>Matt Smith</name>
diff --git a/dev-python/keyring/Manifest b/dev-python/keyring/Manifest
index 13eb60e0bd9d..b922631b98fc 100644
--- a/dev-python/keyring/Manifest
+++ b/dev-python/keyring/Manifest
@@ -1,5 +1,7 @@
 DIST keyring-22.0.1.tar.gz 47782 BLAKE2B ec9f5c0418b2c279f111cbcb8ccc1fc05f64e859e2e675041289a639c7e2d4681e562c9c023e46f1eacb99f88114af97545ad36f71037db0b77e83d927785ce0 SHA512 2e264570d2e905ce4862d71fe4b02fcf0631218a693292c13159fdbad0032e91d81910f84d787e948057e2f428fcf8677ebdd83af4da54c3359347f642db0441
 DIST keyring-22.3.0.tar.gz 48195 BLAKE2B f990c1c5fd87115cfb22a0e1d84712c1299334e5db89049f04718dba9b31dddbc0ec91950bdf529310955341d1250a6a62b1f1b76b0d552cb7cbf09748892b3d SHA512 c71ba8ec7b69661b2929ed5aa7b8baca7b5164a267dbb901adc2b7bc2cef1eb0ec8931f1021d69cfb0e31514ff922dfb03fd784feb12d1dc7229d4e5e759bb5e
+DIST keyring-23.0.0.tar.gz 48218 BLAKE2B a71e86e91b874d2b82477ebcd93687592864095bc20bbda898b934e6f888e2ef666d462fe27ffc5fcbafb909c44b8e816c46d138865c53afcb12dd5d04a7c761 SHA512 4fd83ab0e73bc748b593bdcc2d8df608c7ef4ad9b64b58db611995eb3cb98d1bd5b5a312ab15f7322f33359fe12bd1b02eed1dbaae50455abb9e84e367976c4e
 EBUILD keyring-22.0.1.ebuild 1082 BLAKE2B 8008a84045abbe9c0f6a8be39f37406db51be0c832878ca48116912875eee6327aa22adb59411048ecf479d1485bf5a942a01c5beced336c682492a63a95bad3 SHA512 dce2c1374f2b235d2fb20c99d327074b8b3b661d31028c48c4262e8e142f9e961915dffd04a0697118efc829dac852c27ebe0fd1aa0fab122b76d28a3d61d9eb
 EBUILD keyring-22.3.0.ebuild 1090 BLAKE2B 54a6e182eddf3b5b7e8498fae18dcdec0e560331a25cae865422db5a07c233726953eeab324d954ce3ca5c644a2fa2beecfb9576ed914fb7c78a0a0526c6ca51 SHA512 70605a3652eb2eb753d71a46a98cbc422ff456c58e57e70b42bcd0358f76eb2d0b7f1ef8cd0dd2abed4af703eebec0d094d7334a4d282c0c037bdc8203d834c7
+EBUILD keyring-23.0.0.ebuild 1044 BLAKE2B 49cc49e8960e9ab998f5931d7f91732de0e9c84cddaf85e5790b860da5a5bca53f593a7a28f985ad45a070286bc91a50bc0acb074b379ae305f55bbd36d0b37f SHA512 dcf85e379d56afffa5ee41c24d8871810dfe8ff5e5088af7a2f77edd5a9a1eab87094ae4809f210e6bb1e49c4ef6765c0a72189053b945aab0043da406451729
 MISC metadata.xml 610 BLAKE2B abd4cf8986ea009081e0e21d31b8bbdbe7b2e99fb332bda41d666c97feda8974cabcabdf6d88e4d8d9a2b9aefd250ad06bfcdd8888513cc0a10cdbda9c93c981 SHA512 931f5d607bc5d9caf329f0b7a010ee055f3c962e67e61c8f4e7458f5325a89bd91678c215fbdd63160eb2d7f34ce58b0a30b144e4159fb426c243efa1dc12d05
diff --git a/dev-python/keyring/keyring-23.0.0.ebuild b/dev-python/keyring/keyring-23.0.0.ebuild
new file mode 100644
index 000000000000..341a6425d15b
--- /dev/null
+++ b/dev-python/keyring/keyring-23.0.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( pypy3 python3_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Provides access to the system keyring service"
+HOMEPAGE="https://github.com/jaraco/keyring"
+SRC_URI="https://github.com/jaraco/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="PSF-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	dev-python/secretstorage[${PYTHON_USEDEP}]
+	dev-python/entrypoints[${PYTHON_USEDEP}]
+	dev-python/jeepney[${PYTHON_USEDEP}]
+	dev-python/importlib_metadata[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs \
+	dev-python/jaraco-packaging \
+	dev-python/rst-linker
+
+python_prepare_all() {
+	rm tests/backends/test_kwallet.py || die
+
+	distutils-r1_python_prepare_all
+
+	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+}
diff --git a/dev-python/lazy-object-proxy/Manifest b/dev-python/lazy-object-proxy/Manifest
index 9e0ead83a559..f34aefe59119 100644
--- a/dev-python/lazy-object-proxy/Manifest
+++ b/dev-python/lazy-object-proxy/Manifest
@@ -1,3 +1,3 @@
 DIST lazy-object-proxy-1.5.0.tar.gz 35938 BLAKE2B 11e091538f4bcddd5acb39963572e30535b01227481affcb160d55b39c5b4548fef2da316efe483d6b0450e204126b957884dfb7a96727b0a00209addd6097cc SHA512 8d594df743694f01b9710e55d8e88831d6ac2e81a925ad310f0c39d061f20115550c5adf1da40d0d7c4749eb3a7ffbbb6000ebbda3dbb445c9efa1d05ff37cc3
-EBUILD lazy-object-proxy-1.5.0.ebuild 937 BLAKE2B c031bc13979cd26eaeedbb7f447cdc01650a22dafb61edd0e2d4c347324c038dbefeb9fbdbb05be59cc8a2076bdb07dc4fdcf9bb064ad783ba73e5bc25395b81 SHA512 444decee287a042ef82ff6eb28fcef4346575767750f8b322cd5e2085ffd06fd4dbe84e5a7d4bffa82a4c776898a585edc50431ce921968e5c181cd73bce3123
+EBUILD lazy-object-proxy-1.5.0.ebuild 936 BLAKE2B 3bf3d97b81f4873b2b321d3cb782c8166c4ac9122740dff3ba84eab1d9a466d79574c7b60c09fba37c897aa3d52d5b91c2f13d2f05bfb889cd7ca471850905e4 SHA512 867b6eabbf8e62d04f881febeca820687b90c71347c9c59d0f72045458c03ce6d81c350fcffb73d88d05b1a7b81bda7e14aebcf9bba0c3b5e4ea070c20938eb4
 MISC metadata.xml 539 BLAKE2B 7f76da60b882c2832b84e774d3db85b1349d7e7190ac629c9f1cd99abaf6aa94e55ebb5867f75fbc948b03cf32121c4312a32a9435c2f037866af855130076d8 SHA512 7e5fa1513ed6a00183c3722f53b25062e35a3128dce6fd4e0d40fc10dcce8157eb902654b2f7606184378f81972f9bafc6e1ba578581ecf6d8e1b3ec09e1f473
diff --git a/dev-python/lazy-object-proxy/lazy-object-proxy-1.5.0.ebuild b/dev-python/lazy-object-proxy/lazy-object-proxy-1.5.0.ebuild
index 41cb2484aa5e..7e8dd99b89a3 100644
--- a/dev-python/lazy-object-proxy/lazy-object-proxy-1.5.0.ebuild
+++ b/dev-python/lazy-object-proxy/lazy-object-proxy-1.5.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
diff --git a/dev-python/libvirt-python/Manifest b/dev-python/libvirt-python/Manifest
index 179f779f9faa..8967f44d8fa4 100644
--- a/dev-python/libvirt-python/Manifest
+++ b/dev-python/libvirt-python/Manifest
@@ -1,6 +1,8 @@
 DIST libvirt-python-6.8.0.tar.gz 210034 BLAKE2B 667c2713bf9c0936f444c5b621f5af4e5273deda31496bc01c8834286a0ec0eb1c056006549cc5d129ef597264f8582acee62db3a2fd375daa4ebbceacb8fcc1 SHA512 6d2f82fafd414047cff16f0ad655fefd69c8c0da04be07d27da44e3ab17dd03e4e4ff102be1c30948c361268f57ea312978f9198fd128bfb54a3c1a07150e6af
 DIST libvirt-python-7.0.0.tar.gz 214945 BLAKE2B 9ab616fa6336a284dbb1dcebf0be6a06d9ca0c41e83ca403cb335c61ff217e1e9f0343fc915e20e16f3e59adc5c7b1c51e493143c45cd50f48f627ebe2e9c211 SHA512 c56bc53da06a81d330389f684df204d0ae8edb28127eccd81ac551342a0965341d20832f6e2b044e02e9217320349f6f5cb36098c5cc46508a4026fb1e59c4ac
+DIST libvirt-python-7.1.0.tar.gz 215468 BLAKE2B 5734f686760d118bc326c68d93714db31b65d0d2f8495c8fb7788aa59658680cc07b8c522e5854bafc6a75989cee4b7c817ec0f54ae5ebcb76ed74418fa1c0f0 SHA512 9c4adf0107b2b6d8ac3f84f4a201733b851b5c518e498b4bb8fe3531ec8923b2a96e5593ee0fe309b9501884a83e77a6a0347a6714293febf907c9a4dc742cd4
 EBUILD libvirt-python-6.8.0.ebuild 994 BLAKE2B 59cb3b545706226b8fb90dd7e76d4bca7893cd8b6593a0f51578f4ad92185eca39c26eea80797fd2b20428a3629db8db3a94b735cc1c5b70cf99f3db7bfae598 SHA512 12540c4bee991e3e097d02700aab5105cf4bd23a69eaf34700c38b3217f11d12a69cd6e0401642a7d1564ee8e3f89bb6b7e23d542c00a4d89e54d58945826e1e
-EBUILD libvirt-python-7.0.0.ebuild 993 BLAKE2B 4b6ed2e5c55632b14f782c3efc43a6cf9eb1b7b7165315d42c5db3568d27220fc43e7ae608bfd5108e24744c708de74cd3079e526010d0b5f848b221934ab267 SHA512 ad79b00a48034e03f4065f2e91f597aff14d7f429e20ee384d9706bca06c19e61cfb662bdfbe3e84ae6671092e3b747d9e4f4525a2090082ef3d0ec4f441c13c
+EBUILD libvirt-python-7.0.0.ebuild 992 BLAKE2B 3e853fcaba587974bfb67f201dedb352ad2f6b1e25e25b03c4be90b6324412714213926b6fc788dc4f0d31551272481893fd71987fe435d92ca8275f38dd94d1 SHA512 dc74f84337afd8e8b06b7f5a1469f55888df9bd1d5c5d64648a0ad3412818db0dc14ac07cd66058406cd63703813dffe4d847a4c42f1d0b912a37c14d0137a37
+EBUILD libvirt-python-7.1.0.ebuild 994 BLAKE2B 90d2e376d09a0d1e222e98e1f408abe8d8b5c9d502aa487ebe0b67470cd2bfa8193ed58f5682ee2f2bca3107a77d9ac8b0977587e4eb9f41e3a23c1cb00be03e SHA512 092e94e7441e52f70c972c57403d3072eaee6dc40f9b4f3e00915849d34248c0c313e53ebf648ea8a2f6c7879ac14d7f784b69e70292a8dc459f155db293448c
 EBUILD libvirt-python-9999.ebuild 994 BLAKE2B 90d2e376d09a0d1e222e98e1f408abe8d8b5c9d502aa487ebe0b67470cd2bfa8193ed58f5682ee2f2bca3107a77d9ac8b0977587e4eb9f41e3a23c1cb00be03e SHA512 092e94e7441e52f70c972c57403d3072eaee6dc40f9b4f3e00915849d34248c0c313e53ebf648ea8a2f6c7879ac14d7f784b69e70292a8dc459f155db293448c
 MISC metadata.xml 518 BLAKE2B ac9993d622790a5cec52f737de0494b7ac6a5a6e17e66ccad8e4862257ba8926d688fa4b6e68cd96ea5a4f2d35825204219fd79bc5917d05a6f39787f80bc1df SHA512 243b815c70c65046d672bc2b4a05d67f61c6e70dc6677ef7e8b76783979d801793f8d864a33ed9c64072c4fa30786d4455c82c82fa37933dac0b0efac2264083
diff --git a/dev-python/libvirt-python/libvirt-python-7.0.0.ebuild b/dev-python/libvirt-python/libvirt-python-7.0.0.ebuild
index 6b628a11a99f..7ba9a7a94353 100644
--- a/dev-python/libvirt-python/libvirt-python-7.0.0.ebuild
+++ b/dev-python/libvirt-python/libvirt-python-7.0.0.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} = *9999* ]]; then
 	RDEPEND="app-emulation/libvirt:=[-python(-)]"
 else
 	SRC_URI="https://libvirt.org/sources/python/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 x86"
+	KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 	RDEPEND="app-emulation/libvirt:0/${PV}"
 fi
 S="${WORKDIR}/${P%_rc*}"
diff --git a/dev-python/libvirt-python/libvirt-python-7.1.0.ebuild b/dev-python/libvirt-python/libvirt-python-7.1.0.ebuild
new file mode 100644
index 000000000000..cb778ad7f1cb
--- /dev/null
+++ b/dev-python/libvirt-python/libvirt-python-7.1.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+DISTUTILS_USE_SETUPTOOLS=no
+
+MY_P="${P/_rc/-rc}"
+
+inherit distutils-r1
+
+if [[ ${PV} = *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://libvirt.org/git/libvirt-python.git"
+	RDEPEND="app-emulation/libvirt:=[-python(-)]"
+else
+	SRC_URI="https://libvirt.org/sources/python/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+	RDEPEND="app-emulation/libvirt:0/${PV}"
+fi
+S="${WORKDIR}/${P%_rc*}"
+
+DESCRIPTION="libvirt Python bindings"
+HOMEPAGE="https://www.libvirt.org"
+LICENSE="LGPL-2"
+SLOT="0"
+IUSE="examples test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	virtual/pkgconfig
+	test? (
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests setup.py
+
+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/lit/Manifest b/dev-python/lit/Manifest
index c4d94b79bbc9..cc1c199bf3e9 100644
--- a/dev-python/lit/Manifest
+++ b/dev-python/lit/Manifest
@@ -2,16 +2,14 @@ DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3
 DIST llvmorg-11.0.0.tar.gz 122743665 BLAKE2B 3f95570240789fd68ddb747df817f5c6cdc9da40911bbe9ee3531c15ada9165e5002b1c2f778cf8735858485ea05a8754e3d3a5f4b15bdd6cb33d64a14692984 SHA512 b6d38871ccce0e086e27d35e42887618d68e57d8274735c59e3eabc42dee352412489296293f8d5169fe0044936345915ee7da61ebdc64ec10f7737f6ecd90f2
 DIST llvmorg-11.0.1.tar.gz 122790338 BLAKE2B 0130996b4a8c4d9f757136fd7fb318068c9bfdc565060dec0d4336480c4ab66c4ae3185a7fdb05f13cf9ee8fd4123b09df938881b75d6e5d3689595114b7e32a SHA512 f5e6ef0b3111aae08a89cd01adb2ff4abfa9ef779c68b9190421d0447efd25c2cc00e5aae9f4764805f5fa31434866043d1510ae7389817e28ae53a5442e2fdf
 DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45ca1c93b64fa4c6ebcd70a1d3849dbad2b8e4e24fba02d144c6266d7fab3607ebc6999b28c229cb35256cf40f26a985 SHA512 9a8ce022a935eed42fa71a224f2a207122aadcbef58ee855fdb4825f879e7d028e4dcff22c19b9d336db1c8bf63fb84372d44981acf84615f757e54306c92b81
-DIST llvmorg-12.0.0-rc1.tar.gz 134164708 BLAKE2B d4261ff7d9586b47f4cfda3d2cda4b76534f9e17fbd5cdb8861895b8eb466021962f4608bfcdeb52f8fce78850a994fd5eda0560f7211e5c8d1ac9330a738a36 SHA512 3d07d013d0705bb99f56898cc55d054d0d95aeb53b3c756cfab80b4c9097cc4935bcea89b9efde2e503a899b9fccf0dacc0073c9991c8ea352755c5ec68a757a
 DIST llvmorg-12.0.0-rc2.tar.gz 134242619 BLAKE2B bb741a311db608fc2ba7eeaab71c5c9f2a430f7fee3f0c5c4334e5c14caa19738d18c87b568de963d57d9b53e808ac412cf8554eca7fcae9ecca65aa4442e197 SHA512 d8f9b3dfeb0fe9b91eb7f49da393784333044db2653373fbb168afd3c8d50f3e3ec7a7b8f44df522d0facafbfe4cfc4d9e2906d19f1e6feb0bdc569b6c10a17d
-DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
+DIST llvmorg-12.0.0-rc3.tar.gz 134244008 BLAKE2B ed09aa361b264387711ba1ee2e4b01c0c78ad97391df95e2542d4edc31f657cc33c8a2a45de63eb421908d5dadd9392a736610fbb04b3ecbd336d6514a649da8 SHA512 1fae53c6f255160cf4be53848b8b92c8b162ddcfbddf1bf0017faf249859040c15c862c4b52bc3ba894149139afb814e0674da88793ddebfc0756ba3aa7626ce
 EBUILD lit-10.0.1.ebuild 893 BLAKE2B eb0a0a0dc7d159d03fc7f791feec613ab9fe2111e010c6ad2a9d805f69990d7d821770d28383cfd3efb740641b8db4b0359f0a9c41723859a419c45e1dd6435c SHA512 803a2e38ff1eb50983f030b5ec38e40b543e1cdc61cfde708f69494dcecd2dace4e00aac6be4342f3950c252769b6a1ef31178ed0337d581b33269d682b95fd5
 EBUILD lit-11.0.0.ebuild 900 BLAKE2B 90b478966ab5582ca0a073dad5450f29068bd75f107e48fa1371304c9e9d87e202b9e85f5cf03b30c54c3f3e4b2c950253e987cd3c44473797cdfe031f5085c2 SHA512 0c461cf8ffee04344f22291b06298ccb63cbc57bac6849a39da9accaf64077046f5ed927db13963ba961536f84f2d71449fafbd5e91bb602a56ff3e5ebd8fa7a
 EBUILD lit-11.0.1.ebuild 902 BLAKE2B 1b2524d3c5216f47c0a81ad24594af8af9310904434a9dc4a32be827aa41fc65d236c6bd0c3d1dbe7db904b81ff6851ab36dcc128e16a19d3ae959f1fb27f5fe SHA512 fbec68212c533e9f37f46b2a421ffc4ebdfedc21a52bb92460b61dfc9eb9d1ce9d70f7d293abcd963b3ff5d297de417ec6ec33066849434a0aea6058ff5416b0
 EBUILD lit-11.1.0.ebuild 906 BLAKE2B 9e7f47f55e7f33ca5644f654e8d6f200442549b6698c18f0bf6b6cb78a5ccbf8151bf08cbd103003445d87f4816b366cc281aaa3c2318d12025c5afbe813f0bb SHA512 bd5907f22002671d674fe0f5cc40fdb3895ce271bf3cec2a1c0047317c11153aa98dbfee415c165fe9c9637a6d809a182f50e0240fca7026211a10a247f38d99
 EBUILD lit-12.0.0.9999.ebuild 869 BLAKE2B 124a91bfb39964af4222f3dcd88250c2c91d9c399e87b00b721e14b75d08f9aa9f2b55a105174bc8a2764664c287812e823621e272742b83f497d2f9ee9f8a1c SHA512 238e92e87e72989a6818be202f5602dd94fb4e8f9a172736d9f0548feb1770d7befe77fc23b00ddb5182dc7e8649cf7e639b50ca26301fcb7bb596ec8b59401e
-EBUILD lit-12.0.0_rc1.ebuild 869 BLAKE2B 40773aa5d208d0d5690ea169e20206160436a2f7cda95d10e760e6f8cf65df25cde6d54bcfa541b8853296cbff3808d61c5c1c30e325ee381ec0846d100525b4 SHA512 4f553e04cda8c1248f28d504367fdf2659f88b65a74b3061ac250943d1a071827621cf2a80ba1745a0ccc40fc574bd5550406427549dfca44e0706cc4703a1a5
 EBUILD lit-12.0.0_rc2.ebuild 869 BLAKE2B 40773aa5d208d0d5690ea169e20206160436a2f7cda95d10e760e6f8cf65df25cde6d54bcfa541b8853296cbff3808d61c5c1c30e325ee381ec0846d100525b4 SHA512 4f553e04cda8c1248f28d504367fdf2659f88b65a74b3061ac250943d1a071827621cf2a80ba1745a0ccc40fc574bd5550406427549dfca44e0706cc4703a1a5
+EBUILD lit-12.0.0_rc3.ebuild 869 BLAKE2B 40773aa5d208d0d5690ea169e20206160436a2f7cda95d10e760e6f8cf65df25cde6d54bcfa541b8853296cbff3808d61c5c1c30e325ee381ec0846d100525b4 SHA512 4f553e04cda8c1248f28d504367fdf2659f88b65a74b3061ac250943d1a071827621cf2a80ba1745a0ccc40fc574bd5550406427549dfca44e0706cc4703a1a5
 EBUILD lit-13.0.0.9999.ebuild 869 BLAKE2B 40773aa5d208d0d5690ea169e20206160436a2f7cda95d10e760e6f8cf65df25cde6d54bcfa541b8853296cbff3808d61c5c1c30e325ee381ec0846d100525b4 SHA512 4f553e04cda8c1248f28d504367fdf2659f88b65a74b3061ac250943d1a071827621cf2a80ba1745a0ccc40fc574bd5550406427549dfca44e0706cc4703a1a5
-EBUILD lit-9.0.1.ebuild 857 BLAKE2B a323b54eda1cface36f35b011ae2a44d931439b3e277e59f38b1ee8672398ad427773296e56ab46d52c9388bac409eed79a93459e701115d9dc809e2995349b5 SHA512 c611b762802614d0c5adb0e739b44b37a3a88dc921628ffbd2d33af7a17d9a5ab150b7508c7511a72ae687d1953bd127470840f91cb074148aa7c9aed9bbf6c6
 MISC metadata.xml 282 BLAKE2B 36e6403814edc8e79eca456ef9648a7b261f79d4823082a8dce876127b11bf89182dabb02e58b2a42dec3cf9e21fe2f5c474ee4a8416213901f82cfc481ffcda SHA512 fa292059e410ff5e751980c5f5b0145c579b373d77970b797850c3d92641bbcf27b2c18a33d665e76e59553ba7dcc124ae09ec34fcaab4b2caed74248ace0e57
diff --git a/dev-python/lit/lit-12.0.0_rc1.ebuild b/dev-python/lit/lit-12.0.0_rc3.ebuild
index 2076120cc165..2076120cc165 100644
--- a/dev-python/lit/lit-12.0.0_rc1.ebuild
+++ b/dev-python/lit/lit-12.0.0_rc3.ebuild
diff --git a/dev-python/lit/lit-9.0.1.ebuild b/dev-python/lit/lit-9.0.1.ebuild
deleted file mode 100644
index 917b4beae445..000000000000
--- a/dev-python/lit/lit-9.0.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_7 )
-
-inherit distutils-r1 llvm.org multiprocessing
-
-DESCRIPTION="A stand-alone install of the LLVM suite testing tool"
-HOMEPAGE="https://llvm.org/"
-LLVM_COMPONENTS=( llvm/utils/lit )
-llvm.org_set_globals
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# Tests require 'FileCheck' and 'not' utilities (from llvm)
-BDEPEND="
-	test? (
-		dev-python/psutil[${PYTHON_USEDEP}]
-		sys-devel/llvm )"
-
-# TODO: move the manpage generation here (from sys-devel/llvm)
-
-python_test() {
-	local -x LIT_PRESERVES_TMP=1
-	./lit.py -j "${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}" \
-		-vv tests || die
-}
diff --git a/dev-python/lmdb/Manifest b/dev-python/lmdb/Manifest
index da18d253c271..4c26a4968af2 100644
--- a/dev-python/lmdb/Manifest
+++ b/dev-python/lmdb/Manifest
@@ -1,9 +1,5 @@
-AUX lmdb-1.0.0-pypy3.patch 1657 BLAKE2B faeda530b91755269415c7c2b2015d68e4567acb01c2375ed98073a0f4f74be6ce0494a28dcc7e57be4409645ea629d75b06e59bb605ee35364131a4e7d73ad8 SHA512 6bfb0b5de254480fce86bd7360529cd1d419eaf100359fcd5c315cdba93b47b0e16ec1f712e62f3dc1147ead22beeda437804250a4caa40c9227e4f9ad11cfb9
-DIST lmdb-1.0.0.tar.gz 876673 BLAKE2B 33fdf7dd344e42412b756f7c6d42c291f94bb2410366802b22b8045c8ae5ff4f73f41cdc655e750f0ccb9f547f70b190bb9b584d7858edd07c1fb274bff684eb SHA512 3a4dba711ce5a3795a7f916cf04d5c7e9d4b5df30161dcbd02b53bcec73b96450865fb2bd8fe4a9ca2b5060531d03cefd9ea19aa09f139f93c3d03b2516f5632
 DIST lmdb-1.1.0.tar.gz 880212 BLAKE2B 5f038c704061bb7915b0b0926c2dc60a5dd4931a70a1bf1041508363e036ae0553e22c52f8c956bebb05a27fad751c3b84c4a2b9fd6158fd8b6bd346e3efe7b4 SHA512 19573626a24fcea17c72641ce4491cf9e0901fa4a463ad5da6244191f28e4d9680d903fc2f87fe4a6b607f2a6a3a6bc644d5c1fc6e568394eb9822face30dfae
 DIST lmdb-1.1.1.tar.gz 880359 BLAKE2B b202154eae151d3748e9e90fcb71a3c8a722923c2583e469ef1a0017a4c3dfdfd62d99db24fb79e7da1fc7c6a4fb695d9db5ed6a67750967788a12fe0ba24761 SHA512 4621c87dd646f8ca37f4cdc40ffa2fe809ca4da21b335856e50e6d0ae07f3828d424cde9cc383e4cdc761cd9311eb504d67678a33de51c1931a006ec86a2fcd0
-EBUILD lmdb-1.0.0.ebuild 934 BLAKE2B 08047ce395edf9b9ad90180731c448381c60fd3014a8232d4b73ab924b46ae3aede5c84fc385aa8d48a6b9171c6ba43a5412ebae788e6f056c00013f66531dd3 SHA512 66b84126516a205ee40389350f01d2ab47dbbf5d7016630e83320f481a057a2f340ed65e31232bdb05e8b434828e3c88627e4da2c03a06f1098df35c7b14f0a2
-EBUILD lmdb-1.1.0.ebuild 804 BLAKE2B 48ad94200a19e58100d47cc0dbad81704faeadf73e21ae1d83b9158ef13dd41fa590f9de691ea3e7fb5891ee8a636a55d73009e025e00e3da34385ec3a717a71 SHA512 38fe27127465b9290a6dc34d435c47c4de28623f571879306b06d16abd7f978ae2ebdfe559612715aa337db2a0ca2e7a6e376a05368190e1434f0fe659ca963a
+EBUILD lmdb-1.1.0.ebuild 802 BLAKE2B 21ef2f957734ea27ea884f7cec57f9f5c71e72e078253f681bd3c053d0e7e8396c8c4516ef4073159005589bed1223aa4a9424ca2290408b38b68e8da7d261cb SHA512 8588a72f7623692821cb940f986c0386b3e00e37fa5b1586d6c402ede78d97d85783b7f129faa15a384a4715c3275714845dfc4f99913df21252808754ed6944
 EBUILD lmdb-1.1.1-r1.ebuild 813 BLAKE2B 25110739fc0b43f43d717754e5455710691be1326844a9f62e48ab276f5a953b473780edf98ec8971c5f0e76b31994cb395b409963f7a014a6859839d10c3a60 SHA512 ad07cf3cdf4eaf5d9d0720d0bb6bb0c6e9ff0671349ffb48f9c91e2be5214176f7e3d0f2b060d0062297f1e75a8f624760479f92ee1a2884bead91405f848d22
-EBUILD lmdb-1.1.1.ebuild 854 BLAKE2B 44d624f40d4995c5a673407abe1e6c5b1885d93c80389f12b118f62adcd3b3a4009a0e4c9727da83a329b757014e5a4465780fa8912e884103918a5fd45477fe SHA512 7cd6c5cf30f7f5e7bbc47c37a269063ff6e9141086ab9e9d8bbdbc615f730fad00f7182faaa50e1170b6797455b6983a5a8a98ca1cf048e1f6366d627c0f194b
 MISC metadata.xml 419 BLAKE2B 7bb3bd08439249e8bcb7f64d91a707245dd2c32eefed576a4389019217c304173754628f1fdd82f147e6f7a077e2abcb6062dcbaf76d0547c8d710c8d16d0a64 SHA512 700345b4a50d602e35c983fadf73eee5da01b7d9dc4a647966277aeb7fe1fb26f583c681acf1718060dff14b195df7fa4689bad2451c475d1883b66e223ad29d
diff --git a/dev-python/lmdb/files/lmdb-1.0.0-pypy3.patch b/dev-python/lmdb/files/lmdb-1.0.0-pypy3.patch
deleted file mode 100644
index 008213ac46c6..000000000000
--- a/dev-python/lmdb/files/lmdb-1.0.0-pypy3.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 2d0f93984f53c19925f07d742584f5e3e69d7902 Mon Sep 17 00:00:00 2001
-From: Nic Watson <github@nicwatson.org>
-Date: Wed, 7 Oct 2020 12:44:30 -0400
-Subject: [PATCH] Get pypy3 passing tests
-
----
- .travis.yml          | 2 +-
- tests/cursor_test.py | 8 ++++----
- 2 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/tests/cursor_test.py b/tests/cursor_test.py
-index acfb0ea..22dd6f8 100644
---- a/tests/cursor_test.py
-+++ b/tests/cursor_test.py
-@@ -245,7 +245,7 @@ def setUp(self, redo=False):
-         self.txn = self.env.begin(write=True)
-         self.c = self.txn.cursor()
- 
--    @unittest.skipIf(sys.platform != 'linux', "test only works on Linux")
-+    @unittest.skipIf(not sys.platform.startswith('linux'), "test only works on Linux")
-     def test_preload(self):
-         """
-         Test that reading just the key doesn't prefault the value contents, but
-@@ -264,13 +264,13 @@ def test_preload(self):
-         self.path, self.env = testlib.temp_env(path=self.path, writemap=True)
-         self.txn = self.env.begin(write=True, buffers=True)
-         self.c = self.txn.cursor()
--        minflts_before = resource.getrusage(resource.RUSAGE_THREAD)[6]
-+        minflts_before = resource.getrusage(resource.RUSAGE_SELF)[6]
-         self.c.set_key(B('a'))
-         assert self.c.key() == B('a')
--        minflts_after_key = resource.getrusage(resource.RUSAGE_THREAD)[6]
-+        minflts_after_key = resource.getrusage(resource.RUSAGE_SELF)[6]
- 
-         self.c.value()
--        minflts_after_value = resource.getrusage(resource.RUSAGE_THREAD)[6]
-+        minflts_after_value = resource.getrusage(resource.RUSAGE_SELF)[6]
- 
-         epsilon = 20
- 
diff --git a/dev-python/lmdb/lmdb-1.0.0.ebuild b/dev-python/lmdb/lmdb-1.0.0.ebuild
deleted file mode 100644
index d66980370797..000000000000
--- a/dev-python/lmdb/lmdb-1.0.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for the Lightning Database"
-HOMEPAGE="https://github.com/jnwatson/py-lmdb/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="OPENLDAP"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="dev-db/lmdb:="
-DEPEND="${RDEPEND}"
-
-distutils_enable_sphinx docs
-distutils_enable_tests pytest
-
-PATCHES=(
-	# https://github.com/jnwatson/py-lmdb/commit/2d0f93984f53c19925f07d742584f5e3e69d7902
-	"${FILESDIR}/${P}-pypy3.patch"
-)
-
-python_compile() {
-	LMDB_FORCE_SYSTEM=1 distutils-r1_python_compile
-}
-
-python_test() {
-	pytest tests -vv || die "Tests fail with ${EPYTHON}"
-}
-
-python_install() {
-	# This is required when the CFFI extension is used (for PyPy3)
-	LMDB_FORCE_SYSTEM=1 distutils-r1_python_install
-}
diff --git a/dev-python/lmdb/lmdb-1.1.0.ebuild b/dev-python/lmdb/lmdb-1.1.0.ebuild
index 1196a1fe9b8a..8152dc7bdfdf 100644
--- a/dev-python/lmdb/lmdb-1.1.0.ebuild
+++ b/dev-python/lmdb/lmdb-1.1.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="OPENLDAP"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="dev-db/lmdb:="
 DEPEND="${RDEPEND}"
diff --git a/dev-python/lmdb/lmdb-1.1.1.ebuild b/dev-python/lmdb/lmdb-1.1.1.ebuild
deleted file mode 100644
index be8e1065ac2d..000000000000
--- a/dev-python/lmdb/lmdb-1.1.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for the Lightning Database"
-HOMEPAGE="https://github.com/jnwatson/py-lmdb/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="OPENLDAP"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-
-# TODO: switch to >=0.9.28 when available
-RDEPEND="<dev-db/lmdb-0.9.27:="
-DEPEND="${RDEPEND}"
-
-distutils_enable_sphinx docs
-distutils_enable_tests pytest
-
-python_compile() {
-	LMDB_FORCE_SYSTEM=1 distutils-r1_python_compile
-}
-
-python_test() {
-	pytest tests -vv || die "Tests fail with ${EPYTHON}"
-}
-
-python_install() {
-	# This is required when the CFFI extension is used (for PyPy3)
-	LMDB_FORCE_SYSTEM=1 distutils-r1_python_install
-}
diff --git a/dev-python/loky/Manifest b/dev-python/loky/Manifest
index 8ac20630812f..c35cc67c275a 100644
--- a/dev-python/loky/Manifest
+++ b/dev-python/loky/Manifest
@@ -1,3 +1,4 @@
+AUX loky-2.9.0-libc.patch 956 BLAKE2B a03de811cb32e728c22b2637106ffd3c969e9fbbbd45deb180ac83d9c44e81b7b5eb0744816abd4a1083d9d47c817db5c02f5f5f6c448f944365299dbd97a044 SHA512 c2e74f96a8f70ec9817cc517fb13ecb8414d6a9157d882ba15af05a81ec70df0edcdb6a8a02c96e7ecc4731813cb86932832fe61b5e19653164af9f7c68dc25a
 DIST loky-2.9.0.tar.gz 115019 BLAKE2B 2aa2042e32821b67db8b8de12d4b380d22af93d308bb35878271a4859325d6740a3bdab70b464a2c0d0af143903c8af3da81b4b804605cdae88779fefd7971a6 SHA512 d49354b834251f6f05a689ac44464aafa5a7a5b4a8ef84a308ec3bda138e810fc3dc31aa628307984dc69386a210f442d4c202b9499ae3e3864837b47a5b0cd9
-EBUILD loky-2.9.0.ebuild 878 BLAKE2B 74097796492b0383ed7018a272ac5f683f7f95037000b3ed4016dfb1635c34479f6a6d926b49a3d14dd5a5ada7c64dd4ce423577417be067b2a22a442e4606b8 SHA512 9d8be95852595a33352f71c1ace72e4c6575b45f4238406b1d98e535ea94c3f4809567e0f208da084f3fa36a95c838e6b42ebef4fb245b0d082dfe29644ecfd0
+EBUILD loky-2.9.0.ebuild 1021 BLAKE2B 2ea8aee9ab4b527a6e72b4f7a6cc7797f1da8ccb265911fa954bb986d8202981038788cfbe10333948de7887d845a4bbc4aa10b13fbedcfe0b871fd99ae979b2 SHA512 503f67e0cde83f3ee71efd5bf66a03cd9770f418d84babc5c5be4ce3492a803415c60504c45140e6802fc2f4a416c5d7ddf483ac8692ede8c3a59361d29854b4
 MISC metadata.xml 285 BLAKE2B 0a3a6c5d0dd5f4ba9ee472ae8d58d5ccc0c0a4677793e1b0350193fce534d96513ce5b16610e90ba5f8cd3cb71e03db6c45566e1d55ebc5fb52bf6f30b740d66 SHA512 ab759fe515785fa9dfc92ed5e3e71e67b32eea0f7c1d0ad7165bc41713e8345ddc04549bb771dd92973365ceb53b4465fdbad914b4d1f7f76232e278edec2577
diff --git a/dev-python/loky/files/loky-2.9.0-libc.patch b/dev-python/loky/files/loky-2.9.0-libc.patch
new file mode 100644
index 000000000000..58cceab01eb2
--- /dev/null
+++ b/dev-python/loky/files/loky-2.9.0-libc.patch
@@ -0,0 +1,28 @@
+From 4100bb481dd1599be3deae8539ff9eac2d9b7104 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Mon, 8 Mar 2021 10:32:38 +0100
+Subject: [PATCH] FIX load libc correctly in test_reusable_executor
+
+Fix test_reusable_executor to load libc via "c" library rather than
+"libc".  The latter is incorrect, and does not work in the newest
+versions of Python anymore, see https://bugs.python.org/issue42580.
+---
+ tests/test_reusable_executor.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/test_reusable_executor.py b/tests/test_reusable_executor.py
+index 1ff5b8b..d24d2de 100644
+--- a/tests/test_reusable_executor.py
++++ b/tests/test_reusable_executor.py
+@@ -32,7 +32,7 @@ if sys.platform == "win32":
+ else:
+     from signal import SIGKILL
+     from ctypes.util import find_library
+-    libc = ctypes.CDLL(find_library("libc"))
++    libc = ctypes.CDLL(find_library("c"))
+ 
+ 
+ try:
+-- 
+2.30.1
+
diff --git a/dev-python/loky/loky-2.9.0.ebuild b/dev-python/loky/loky-2.9.0.ebuild
index 70165402b043..6a166599dde5 100644
--- a/dev-python/loky/loky-2.9.0.ebuild
+++ b/dev-python/loky/loky-2.9.0.ebuild
@@ -25,14 +25,20 @@ BDEPEND="
 
 distutils_enable_tests pytest
 
+PATCHES=(
+	"${FILESDIR}"/${P}-libc.patch
+)
+
 python_test() {
 	local args=(
 		# docker, seriously?
 		--deselect 'tests/test_loky_module.py::test_cpu_count_cfs_limit'
+		# hangs, and even pytest-timeout does not help
+		--deselect 'tests/test_reusable_executor.py::TestExecutorDeadLock::test_deadlock_kill'
 		# one test that uses a lot of memory, also broken on 32-bit
 		# platforms
 		--skip-high-memory
 	)
 
-	pytest -vv "${args[@]}" || die "Tests failed on ${EPYTHON}"
+	epytest "${args[@]}"
 }
diff --git a/dev-python/lunr/Manifest b/dev-python/lunr/Manifest
index 416da23cc9fa..03cca0b765aa 100644
--- a/dev-python/lunr/Manifest
+++ b/dev-python/lunr/Manifest
@@ -1,5 +1,5 @@
-DIST lunr-0.5.6.tar.gz 43815 BLAKE2B 0d68dc098a71c1fdaaddee80605fc63a0d30492b6e329cd8f963dc740bc40fc79959bf20b159af6b88c4eb2736db6793c6fea5b74968f74923741f220a372a89 SHA512 48167c90ac1351fd3aeaefbead752d8b96b941e79edb33a4232ac588a2fa54775972c883564ea23e3d58f3f5a94ee448c27049f4410016032f5a8f36aa4c6709
 DIST lunr-0.5.8.tar.gz 834919 BLAKE2B 970cc12fb30bc849d4ef846818f93fa7b7701b1155c9b7880f3a63384a8f353c760be5dc6c37188db656e7424715aa854f20615ae652b0a5c9e656871be490af SHA512 90c279b9e91744f19c4a155947526bff749aee5d727bc38cc36ee05228a6624419a54bef4214e8195a69abcf1a5b40b29c4fa8b14bece0befbde02d13af969ac
-EBUILD lunr-0.5.6.ebuild 875 BLAKE2B 01e27f9c8d1cf9ae42b0baf74af8908063520bed6b5951039509ba4e414a95b9a672e4782c8e07d31def3e4be995d3491636f6d3299427a6a756df5a1366d4f2 SHA512 07ec627a8c914396d13f70fb39d6b27a142ff3bccfb3d3546da7653de2c44c99fb80d185bfb2d0b9593a2d1c8bf486692d51ef0fbc26a77019184bc13e183c2e
+DIST lunr-0.5.9.tar.gz 837871 BLAKE2B 988d4b6a59a868b2e06d5454dd1e4932981328ddfc6312027f22dd11228547c6ab21c096f3e673ea5aee0745fcd718ac805bc2067b834ed64841a8592f4317c1 SHA512 e2efa0b22af79140befe9d16e8f9fd3cd57f5413b466447eecb9a21ad2f50a6b31f27510bc7558662f418023290350730e6517b202b9d5ae06428ccdac12ebd9
 EBUILD lunr-0.5.8.ebuild 1059 BLAKE2B b5477761c205f3638b85445424b8e75fbabaa7e4b5898d0a2005e096c51d4ad8d582525b8f0a15943cd46d21cd9bb7693036d168d9e1e3371d529d65d694790a SHA512 2f7206d376c36be97f0563a7e06d7c4cce5f5c99dff1a9fa85110a40eb6d97fe408bed86b193514432e57e7d602b57061628663a3d11e78fd3571030d87da1e9
+EBUILD lunr-0.5.9.ebuild 987 BLAKE2B 6ccf15125f53f4f738187cbaa07b20b2179794bc2686fea8a091499c073f2e63718c7b53e56ac78e3ce613bb0af42137bfd865ae4b1d637d2a4fc18938c264a4 SHA512 f7c8dc472845b35c2a0f8e184328e606422d9a078b235ab03493f0f8bdb7d2a6d8af22bdf34b38b6ebbe21b4a412d528afb5b9b5ea573a2ebff2df4f84908a87
 MISC metadata.xml 531 BLAKE2B 24f03a1bfa5b46b9329b1a60fffa7cd83a8443e8c2a77a8a605e6f488e81fa8c7ff85571d50eac8a30f466f6ebf71b3338ad641a8f775daf39b3c370743ca808 SHA512 da9f5d1f03263d8864d5846de7790bb7e9e1ad1a010c7a15abc618b1254960a656b86af2bcf941bbb77bcad6fae9d01eb33758ff187bc1f827cd8de70c8ad25b
diff --git a/dev-python/lunr/lunr-0.5.6.ebuild b/dev-python/lunr/lunr-0.5.6.ebuild
deleted file mode 100644
index 17909a1b3a41..000000000000
--- a/dev-python/lunr/lunr-0.5.6.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..8} )
-
-inherit distutils-r1
-
-DESCRIPTION="A Python implementation of Lunr.js"
-HOMEPAGE="https://github.com/yeraydiazdiaz/lunr.py"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	dev-python/future[${PYTHON_USEDEP}]
-	dev-python/nltk[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-
-DEPEND="test? (
-	dev-python/mock[${PYTHON_USEDEP}]
-)"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# No such file or directory: '/var/tmp/portage/dev-python/lunr-0.5.6/work/lunr-0.5.6/tests/fixtures/stemming_vocab.json'
-	# file missing in pypi release tarball
-	sed -i -e 's:test_reduces_words_to_their_stem:_&:' tests/test_stemmer.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/lunr/lunr-0.5.9.ebuild b/dev-python/lunr/lunr-0.5.9.ebuild
new file mode 100644
index 000000000000..9fdb54be751f
--- /dev/null
+++ b/dev-python/lunr/lunr-0.5.9.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8} )
+
+DOCS_BUILDER="mkdocs"
+
+inherit distutils-r1 docs
+
+DESCRIPTION="A Python implementation of Lunr.js"
+HOMEPAGE="https://github.com/yeraydiazdiaz/lunr.py"
+SRC_URI="https://github.com/yeraydiazdiaz/lunr.py/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/nltk[${PYTHON_USEDEP}]"
+
+BDEPEND="test? (
+	dev-python/mock[${PYTHON_USEDEP}]
+)"
+
+S="${WORKDIR}/${PN}.py-${PV}"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# Tests in this subdir all fail
+	# Command '['node', '/var/tmp/portage/dev-python/lunr-0.5.8/work/lunr.py-0.5.8/tests/acceptance_tests/javascript/mkdocs_load_serialized_index_and_search.js', '/var/tmp/portage/dev-python/lunr-0.5.8/temp/tmpldbff36d', 'plugins']' returned non-zero exit status 1.
+	rm -r tests/acceptance_tests || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/markups/Manifest b/dev-python/markups/Manifest
index c77f97ca273a..c78032b72ee4 100644
--- a/dev-python/markups/Manifest
+++ b/dev-python/markups/Manifest
@@ -1,5 +1,5 @@
-DIST Markups-3.0.0.tar.gz 16966 BLAKE2B 9245b1b0056bda9538fabf8540ddc41f2861a41c2ea42f29da195393bb85a63af1273109cb8f3d15ee4b257774512e3002d95948bab4a4493d89e18d687f19ce SHA512 3dfb97f29e801fa296e7ea22f2693d05fe9a9bfdf6c9b560cf6a44d04abfb6c2ac0717093732b6fbd9ea052ab9f8d054b3aae10a0c16516af3815ca1d720aef5
 DIST Markups-3.1.0.tar.gz 20146 BLAKE2B 426c6f050868e423eeb7f01cee930b088c4b6f7748b7f198f03880cb7d6cc237575c6253d40631aad1601e193ff0e2b587906492c07b953903ee12422e06cb3c SHA512 eaf99b8f521dc93008e0e2519e5c6e8885609457739378d5af6e3aa044a9dd1370bf906a061d8a284d8ad4f9c5196c01a6d8dde3a4630898fe4711154cef7ce0
-EBUILD markups-3.0.0-r1.ebuild 870 BLAKE2B e685c504ff90b704ee0d33fb4e2930ebde2fe05df30669f43f6efec16bcac9f6367e8be177dd8f724e42fea915d2443de3181ededb486e308fd98b20f54d676f SHA512 0f38bd1acc36e8d5a2c7a300ba43e02e7adb079c6c417b4a5cb2ea00aad470ef957a6d3819ea4fb2a3a807aade67e182fde60ed4c27158449a01eb24ec812510
-EBUILD markups-3.1.0.ebuild 930 BLAKE2B ad4606963f4c409233a19a0cb26bc8fdf0005192e62412e2b68d6e2e465c4901817513d4c639824668a1e42c057168a3b22d90482d921f106e030b8ebbc27175 SHA512 c71a3b6ab327053febd0f9270919c4ef7e3759cc6a68837c0994012d4392af66e3b2a71e7610abf9bc01d0f2a57207a1ba72a272d994e138d5449f0dbea68d3f
-MISC metadata.xml 625 BLAKE2B e700717385a02ed240f11bbbebfabf215d6bbff574ea2876035e300111490f0f477be1cab1224157413eba57f6ed4f84a166c2c241110b35db284c07818d64f7 SHA512 acf3002c22de1375c1a03e0a84765e52cca93b4ad1c6a57ee7f73e7e1616551dc3d6f61dcd1a8d9f31671d6779e19ec19041691bbb7eec6eecc0b66a280de9c5
+DIST Markups-3.1.1.tar.gz 20482 BLAKE2B 26fb19e11aaede8eeadc5a3022785dd3663e7002c5fc4b17c3718d68bda55a9cba07fc1c83a78ca4dee06b4e911b74701fe11865e8933a9d385d032fac00eb0d SHA512 9e8e7b3cc86127fed0367faf257d761e0eae4ca5e11a9ddc8e99b2fc88c76ddb218ee371added56e2c19f5772754adc4c01a09503c308220f6a9d35e736220d7
+EBUILD markups-3.1.0.ebuild 928 BLAKE2B 4327e366240016b1a138d54c1b64df9f6f07a2c63484e96431f3157f6d4b796d4f43e6dd78b05b0514d6476b6cd5feaa996e931b7b194b19bd24b081627cdb82 SHA512 e8336de0269333efddf51d09a28a9baca1acd91a4155e26ce40c646bdf3757092f260c307f74c37e5728bf8c607dcd1488aa807d1903759a9580dd4d543fa21b
+EBUILD markups-3.1.1.ebuild 980 BLAKE2B 7b83ee24ab073c39cd7c6727791db04443426551b8c47b3525d3892d6b9ad7e47f4a0e60d1c6fd9cbd4f5d0df0aa36da68aa3bee4bdf59d393ddea28b6f3b867 SHA512 6a8bcd678feb239f4bb4471e92ec9c5abb0c397e3a7f0469cebfb4e80d09e8d9deccbc6586fb4906767d3e7a9dc7d8c4e724a12c4e71ccc5b096256702d90be8
+MISC metadata.xml 650 BLAKE2B 377d385b80c22d12306b425a4fb0605a1ad72fa2f9c18c00eb328870033957ca878acbf22a1cac03efc28cd1477d7bf8777926604a555ca39255ca3e97a21e27 SHA512 e403dade9bcf926f7d7488a373d16d75072f4c1b9b5abc53bf15337864d269bb5727e6580e99e6a78e51a31eb4e7429a090e8d44ea5375a586e0629a15fa5a68
diff --git a/dev-python/markups/markups-3.1.0.ebuild b/dev-python/markups/markups-3.1.0.ebuild
index 1877e90402e0..6ebb4c472a0a 100644
--- a/dev-python/markups/markups-3.1.0.ebuild
+++ b/dev-python/markups/markups-3.1.0.ebuild
@@ -20,7 +20,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-python/markups/markups-3.0.0-r1.ebuild b/dev-python/markups/markups-3.1.1.ebuild
index 7910938c8a91..c18b011171b4 100644
--- a/dev-python/markups/markups-3.0.0-r1.ebuild
+++ b/dev-python/markups/markups-3.1.1.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_{7,8,9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit distutils-r1
 
@@ -17,16 +16,19 @@ HOMEPAGE="
 	https://pypi.org/project/Markups/
 "
 SRC_URI="mirror://pypi/${MY_P:0:1}/${PN^}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
+KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/importlib_metadata[${PYTHON_USEDEP}]
+	' python3_7 pypy3)
 	dev-python/markdown[${PYTHON_USEDEP}]
 	dev-python/python-markdown-math[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
@@ -34,9 +36,8 @@ BDEPEND="
 		app-text/pytextile[${PYTHON_USEDEP}]
 		dev-python/docutils[${PYTHON_USEDEP}]
 		dev-python/pygments[${PYTHON_USEDEP}]
+		dev-python/pymdown-extensions[${PYTHON_USEDEP}]
 	)
 "
 
 distutils_enable_tests unittest
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/markups/metadata.xml b/dev-python/markups/metadata.xml
index a3992b86df2a..daa6f7664d24 100644
--- a/dev-python/markups/metadata.xml
+++ b/dev-python/markups/metadata.xml
@@ -13,6 +13,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">Markups</remote-id>
     <remote-id type="github">retext-project/pymarkups</remote-id>
diff --git a/dev-python/matplotlib/Manifest b/dev-python/matplotlib/Manifest
index 0ee0c03f47fa..13dde5ac9e9d 100644
--- a/dev-python/matplotlib/Manifest
+++ b/dev-python/matplotlib/Manifest
@@ -3,8 +3,6 @@ AUX matplotlib-3.3.2-test-extra.patch 851 BLAKE2B 8fca758413834cf78707a42edbf878
 AUX matplotlib-3.3.3-disable-lto.patch 828 BLAKE2B 2044ef633091f27080d20e3e1b2c74605e13e99c9d044e97accde3b0a7946ef656f10c9bf5c036745f8ec85380e48cfd5e3d6fe8a023fa60e408d270f45a1da5 SHA512 81562749756b0415c6ce333d3cbbc197306dc9c2c425ec761767271c974badd13fe9a497c74231cd1bf9347f03ef0593bceff9b597289a8328e7c0211c7047ed
 AUX matplotlib-3.3.4-test-extra.patch 481 BLAKE2B 1926876a15bd2d8b14c62404dddb0b119abde78baea3cee7dd751d0b0a21249ad1461fbba4d20823d7e754f074cbf48aaf2da317685dded99c792be9e17edb9d SHA512 7a7e0bdbd96a4f1f335eb3ee1840747045b09ba974d2614f234fa4fbc5c3e1e7c5fd154ec68a74640a916fed9e0b3d5ca01d1b22ba4f7bf3ba5f47039e67d00a
 DIST freetype-2.6.1.tar.gz 2302080 BLAKE2B 6a5fb98e5fa6cf4b7d7533ad44e364227d8c2f7dded4c552d6e22e204c32b7858f20d41d1e809ecdad6e5353d6cec81bea0e0b06a4533363a41ecab83ce3f7ca SHA512 ff2daed64d712737085924c50e75862fafbcbb24eef6d72dac9eaae63bb656d7245397fd828f5d3e47ac847f7ff83d73dedfdd61fde1f7d6e0f0cdeb49bcf83b
-DIST matplotlib-3.3.3.tar.gz 37944403 BLAKE2B 30358d7b7df87b0b15724c4eeb132acdacf31ac900d5c06b22c7ebc7217d6cabcc76b7e29cea6af0b4711b5b1724ce34dd065f63cabcfd40c0fcf9788f94c1fe SHA512 36b482a6c36ee08c47f3c02c160289bbdec8746d4d246084723bd3e1fd632c6383f6db58c950a9773a6993d10f24dacd870a91faafc34864616288cd05b6232c
 DIST matplotlib-3.3.4.tar.gz 37941665 BLAKE2B 77b86dc3ceec3695a0d749197bcec684893d237da1aaf8778d9dc2038da1ba56b757bbce94efcf215ac30f35420b77e0a0e75ebb75b6d2cde5146d8a35ee25e7 SHA512 aadfe3db4edde9940b9e15daf1b6c5f237d3a6f38610956ceee994f919d711fce818ea12be4db18aa2a8638c4e8f434d79541fecaa7233e233bf4c73792bc4c4
-EBUILD matplotlib-3.3.3-r1.ebuild 6912 BLAKE2B 5f809ed5512b7e908b2daede9aac0e1ff5519140cc3553da1a781702e55eb1e8ec7428e2dfc6b2e4170559f8705c747b16e2b0bf3f1e94ac7bf7e55adea9de26 SHA512 ec81df574b7cd100de03b7851c51bda23cf2e3ac8b34ab86db91d5457c92c03aa328f557e5d61fb962ee6bb5222f2997cf25b2017628f70700184d10337cbd94
-EBUILD matplotlib-3.3.4.ebuild 6930 BLAKE2B f3ab4483dd7158c00119ceac85c0005b72f1d64873e38a8f893b4e481c760914a607a3a878d225ededbf9c37d1e6912881172324c8fa93ca30c3c2175cbb9e78 SHA512 f2854ee2f8a14010f1a86b4c04807800ffe74d48962bd56a406491b7556f091cd7091f58e10504345d1b9400c912b95456aba49eae01951177aee72f953c8f59
+EBUILD matplotlib-3.3.4.ebuild 6929 BLAKE2B 22ff822577ff6cf4f692809429681a52f0f48591eaacf2858d04a34f7008473c803ef87f95ddae705e36c17a09dcaf61281410824e96a947d56e28cdd81ec4cb SHA512 a7af125117cf69af4a40debcbf3476342004100f3499f1028e7087e61168514693f086a6dfd6ace1616d8f27c343346d421a199073fff8a0a78d17062db40ed2
 MISC metadata.xml 1013 BLAKE2B 7a02989dfd3230db1225c97927adcf0b6b3fd0dc6d81cca69db3472f4f9fbb185daede39e35ad3477b1592a5deba76fb970be8559bc8b30791484bbe0624d417 SHA512 e1b11cfb0dc4f534f0a0b25bce759554906d5656b7c3607f56ae3b3cc53f8d30a3f5be1e6c96c3942dcb1b7ee0936ddd02c9560507d2d1d2fb46c2f4dbeba608
diff --git a/dev-python/matplotlib/matplotlib-3.3.3-r1.ebuild b/dev-python/matplotlib/matplotlib-3.3.3-r1.ebuild
deleted file mode 100644
index f9d13a43756c..000000000000
--- a/dev-python/matplotlib/matplotlib-3.3.3-r1.ebuild
+++ /dev/null
@@ -1,282 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-PYTHON_REQ_USE='tk?,threads(+)'
-
-DISTUTILS_USE_SETUPTOOLS=bdepend
-inherit distutils-r1 flag-o-matic virtualx toolchain-funcs prefix
-
-FT_PV=2.6.1
-DESCRIPTION="Pure python plotting library with matlab like syntax"
-HOMEPAGE="https://matplotlib.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
-	test? (
-		https://downloads.sourceforge.net/project/freetype/freetype2/${FT_PV}/freetype-${FT_PV}.tar.gz
-	)"
-
-# Main license: matplotlib
-# Some modules: BSD
-# matplotlib/backends/qt4_editor: MIT
-# Fonts: BitstreamVera, OFL-1.1
-LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 x86"
-IUSE="cairo doc excel examples gtk3 latex qt5 tk webagg wxwidgets"
-
-# internal copy of pycxx highly patched
-#	dev-python/pycxx
-RDEPEND="
-	dev-python/certifi[${PYTHON_USEDEP}]
-	>=dev-python/cycler-0.10.0-r1[${PYTHON_USEDEP}]
-	>=dev-python/kiwisolver-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.18.2[${PYTHON_USEDEP}]
-	>=dev-python/pillow-7.1.1[jpeg,${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-1.5.6[${PYTHON_USEDEP}]
-	dev-python/python-dateutil:0[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
-	>=dev-python/six-1.14.0[${PYTHON_USEDEP}]
-	dev-python/versioneer[${PYTHON_USEDEP}]
-	media-fonts/dejavu
-	media-fonts/stix-fonts
-	media-libs/freetype:2
-	media-libs/libpng:0
-	>=media-libs/qhull-2013:=
-	cairo? (
-		dev-python/cairocffi[${PYTHON_USEDEP}]
-	)
-	excel? (
-		dev-python/xlwt[${PYTHON_USEDEP}]
-	)
-	gtk3? (
-		dev-python/pygobject:3[cairo?,${PYTHON_USEDEP}]
-		x11-libs/gtk+:3[introspection]
-	)
-	latex? (
-		virtual/latex-base
-		app-text/dvipng
-		app-text/ghostscript-gpl
-		app-text/poppler[utils]
-		dev-texlive/texlive-fontsrecommended
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-xetex
-	)
-	qt5? (
-		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
-	)
-	webagg? (
-		>=www-servers/tornado-6.0.4[${PYTHON_USEDEP}]
-	)
-	wxwidgets? (
-		$(python_gen_cond_dep '
-			dev-python/wxpython:*[${PYTHON_USEDEP}]
-		' python3_{6,7,8})
-	)
-"
-
-BDEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-	doc? (
-		>=app-text/dvipng-1.15-r1
-		>=dev-python/colorspacious-1.1.2[${PYTHON_USEDEP}]
-		>=dev-python/ipython-1.18.2[${PYTHON_USEDEP}]
-		>=dev-python/numpydoc-0.9.2[${PYTHON_USEDEP}]
-		>=dev-python/scipy-1.4.1[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.3.1[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-gallery-0.3.1-r1[${PYTHON_USEDEP}]
-		>=dev-python/xlwt-1.3.0-r1[${PYTHON_USEDEP}]
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-fontsrecommended
-		dev-texlive/texlive-latexrecommended
-		>=media-gfx/graphviz-2.42.3[cairo]
-	)
-	test? (
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pygobject:3[cairo?,${PYTHON_USEDEP}]
-		>=www-servers/tornado-6.0.4[${PYTHON_USEDEP}]
-		x11-libs/gtk+:3[introspection]
-	)
-"
-
-# A few C++ source files are written to srcdir.
-# Other than that, the ebuild shall be fit for out-of-source build.
-DISTUTILS_IN_SOURCE_BUILD=1
-
-distutils_enable_tests pytest
-
-pkg_setup() {
-	unset DISPLAY # bug #278524
-}
-
-use_supported() {
-	case ${1} in
-		wxwidgets)
-			[[ ${EPYTHON} == python3.[678] ]]
-			;;
-	esac
-
-	return 0
-}
-
-use_setup() {
-	local uword="${2:-${1}}"
-	if use_supported "${1}" && use "${1}"; then
-		echo "${uword} = True"
-		echo "${uword}agg = True"
-	else
-		echo "${uword} = False"
-		echo "${uword}agg = False"
-	fi
-}
-
-python_prepare_all() {
-# Generates test failures, but fedora does it
-#	local PATCHES=(
-#		"${FILESDIR}"/${P}-unbundle-pycxx.patch
-#		"${FILESDIR}"/${P}-unbundle-agg.patch
-#	)
-#	rm -r agg24 CXX || die
-#	rm -r agg24 || die
-
-#	cat > lib/${PN}/externals/six.py <<-EOF
-#	from __future__ import absolute_import
-#	from six import *
-#	EOF
-
-	local PATCHES=(
-		"${FILESDIR}"/matplotlib-3.3.0-test.patch
-		"${FILESDIR}"/matplotlib-3.3.2-test-extra.patch
-		"${FILESDIR}"/matplotlib-3.3.3-disable-lto.patch
-	)
-
-	# requires jupyter-nbconvert
-	rm lib/matplotlib/tests/test_backend_nbagg.py || die
-
-	sed \
-		-e 's/matplotlib.pyparsing_py[23]/pyparsing/g' \
-		-i lib/matplotlib/{mathtext,fontconfig_pattern}.py \
-		|| die "sed pyparsing failed"
-
-	sed -e 's:\(@pytest.mark.flaky\)(reruns=3):\1:' \
-		-i lib/matplotlib/tests/test_*.py || die
-
-	hprefixify setupext.py
-
-	rm -rf libqhull || die
-
-	export XDG_RUNTIME_DIR="${T}/runtime-dir"
-	mkdir "${XDG_RUNTIME_DIR}" || die
-	chmod 0700 "${XDG_RUNTIME_DIR}" || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	append-flags -fno-strict-aliasing
-	append-cppflags -DNDEBUG  # or get old trying to do triangulation
-	tc-export PKG_CONFIG
-}
-
-python_configure() {
-	mkdir -p "${BUILD_DIR}" || die
-
-	# create setup.cfg (see setup.cfg.template for any changes).
-
-	# common switches.
-	cat > "${BUILD_DIR}"/setup.cfg <<- EOF || die
-		[directories]
-		basedirlist = ${EPREFIX}/usr
-		[provide_packages]
-		pytz = False
-		dateutil = False
-		[libs]
-		system_freetype = True
-		system_qhull = True
-		[packages]
-		tests = $(usex test True False)
-		[gui_support]
-		agg = True
-		gtk = False
-		gtkagg = False
-		macosx = False
-		pyside = False
-		pysideagg = False
-		qt4 = False
-		qt4agg = False
-		$(use_setup cairo)
-		$(use_setup gtk3)
-		$(use_setup qt5)
-		$(use_setup tk)
-		$(use_setup wxwidgets wx)
-	EOF
-
-	if use gtk3 && use cairo; then
-		echo "gtk3cairo = True" >> "${BUILD_DIR}"/setup.cfg || die
-	else
-		echo "gtk3cairo = False" >> "${BUILD_DIR}"/setup.cfg || die
-	fi
-}
-
-wrap_setup() {
-	local MAKEOPTS=-j1
-	local -x MPLSETUPCFG="${BUILD_DIR}"/setup.cfg
-	"$@"
-}
-
-python_compile() {
-	wrap_setup distutils-r1_python_compile --build-lib="${BUILD_DIR}"/lib
-}
-
-python_compile_all() {
-	if use doc; then
-		cd doc || die
-
-		# necessary for in-source build
-		local -x PYTHONPATH="${BUILD_DIR}"/build/lib:${PYTHONPATH}
-
-		VARTEXFONTS="${T}"/fonts \
-		emake SPHINXOPTS= O=-Dplot_formats=png:100 html
-	fi
-}
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	# we need to rebuild mpl against bundled freetype, otherwise
-	# over 1000 tests will fail because of mismatched font rendering
-	grep -v system_freetype "${BUILD_DIR}"/setup.cfg \
-		> "${BUILD_DIR}"/test-setup.cfg || die
-	local -x MPLSETUPCFG="${BUILD_DIR}"/test-setup.cfg
-	ln -s "${WORKDIR}/freetype-${FT_PV}" "${BUILD_DIR}" || die
-	distutils-r1_python_compile -j1 --build-lib="${BUILD_DIR}"/test-lib
-	local -x PYTHONPATH=${BUILD_DIR}/test-lib:${PYTHONPATH}
-
-	"${EPYTHON}" -c "import sys, matplotlib as m; sys.exit(m.test(argv=['-m', 'not network'], verbosity=2))" || die
-}
-
-python_install() {
-	wrap_setup distutils-r1_python_install
-
-	# mpl_toolkits namespace
-	python_moduleinto mpl_toolkits
-	python_domodule lib/mpl_toolkits/__init__.py
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-
-	distutils-r1_python_install_all
-
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	find "${D}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/matplotlib/matplotlib-3.3.4.ebuild b/dev-python/matplotlib/matplotlib-3.3.4.ebuild
index 189809ebd78c..9e754ff8b2dd 100644
--- a/dev-python/matplotlib/matplotlib-3.3.4.ebuild
+++ b/dev-python/matplotlib/matplotlib-3.3.4.ebuild
@@ -22,7 +22,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
 # Fonts: BitstreamVera, OFL-1.1
 LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 x86"
 IUSE="cairo doc excel examples gtk3 latex qt5 tk webagg wxwidgets"
 
 # internal copy of pycxx highly patched
diff --git a/dev-python/mkdocs-material/Manifest b/dev-python/mkdocs-material/Manifest
index 4df7a595902f..6eb43e42d1bd 100644
--- a/dev-python/mkdocs-material/Manifest
+++ b/dev-python/mkdocs-material/Manifest
@@ -1,3 +1,5 @@
 DIST mkdocs-material-6.1.7.tar.gz 4580050 BLAKE2B 9919a94b008be298dcff569a33c6dacfa783b338cbf1a09afde6f14c85636b9f971f65863d82f9616c527c3521490c945c0d3ad3647adf69ff8e2795a1b43166 SHA512 ddca360760db8a29055bbf41b58d568943965ffe3bcce5b77fbd4af17caaaebba94f41a9dec6d1042c537054ab92eb6da41cc267ef4421d91ed69373417cde99
+DIST mkdocs-material-6.2.5.tar.gz 5373656 BLAKE2B 7e04a4a284c0749264be819a0b42bc93f924c84b40df9f718392912f97b4cc2288dac7d7a721047c0ad24ed4bb73e4a2d00aaedfbcdd9198c59180fcb2eb286a SHA512 3925c03e2f7e71cf25cf386a6f7c6e768c059a61201860dce186f095c84cb311645628fd8732f10e9106bd818e348115c1f22457bba7c128f6bc89e980983bab
 EBUILD mkdocs-material-6.1.7.ebuild 816 BLAKE2B 6ce78beccf0bdb6e185e0ca97ba608c0e66ac08628452a8d422f56bb9ad060d65b28b72ca4494bae0c7793795d3e7832dbb2ed382e412574cda083c3b0514758 SHA512 5262baf73d87bc9c6dcbab632c0dc42177925d9601abc784be9050aad2b73256e6a814fd38a8a2be960e14a93c3fb267975b8f25769ee3afa12840f4cb742c07
+EBUILD mkdocs-material-6.2.5.ebuild 816 BLAKE2B 8a9a7cc9d112a5c596f216837237265834c6217606d8842c1026e2af6062ab12515d0d1784f16a77f22a9afcc293d2607a4937352b562a23646d541afb6263e6 SHA512 0ba0ef0706b08b9a39abaee80756cab1f177a9e9403fe88c8a02b7d86f96f401fc88d51708ab6d7bf5eba699c1ef3c193748850fecfc879ee213d429f062d474
 MISC metadata.xml 1131 BLAKE2B 908836f444c410650ed620f0346d3d9fd1d34527cb7605ca9ea16c5327a21399423842a857db2804a8dccaebad4ae61bd4cf0dff2362833ba38756aa6dc17879 SHA512 da9a3f27bd04808da31cc9ba1a7fcfd1064a89f8fdda5337110e2472b3e2b95987b01332ea9dd5f70c092bf8ced4baea22e016f7ec3dc813e99053c2f6ea4ecc
diff --git a/dev-python/mkdocs-material/mkdocs-material-6.2.5.ebuild b/dev-python/mkdocs-material/mkdocs-material-6.2.5.ebuild
new file mode 100644
index 000000000000..1fdd08b1bef0
--- /dev/null
+++ b/dev-python/mkdocs-material/mkdocs-material-6.2.5.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8} )
+
+DOCS_BUILDER="mkdocs"
+DOCS_DEPEND="
+	dev-python/mkdocs-minify-plugin
+	dev-python/mkdocs-redirects
+"
+
+inherit distutils-r1 docs
+
+DESCRIPTION="A Material Design theme for MkDocs"
+HOMEPAGE="
+	https://github.com/squidfunk/mkdocs-material
+	https://pypi.org/project/mkdocs-material
+"
+SRC_URI="https://github.com/squidfunk/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/markdown-3.2[${PYTHON_USEDEP}]
+	>=dev-python/mkdocs-1.1[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.4[${PYTHON_USEDEP}]
+	>=dev-python/pymdown-extensions-7.0[${PYTHON_USEDEP}]
+	>=dev-python/mkdocs-material-extensions-1.0[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/mkdocs-minify-plugin/Manifest b/dev-python/mkdocs-minify-plugin/Manifest
index ae1a163adbd3..6836c71658da 100644
--- a/dev-python/mkdocs-minify-plugin/Manifest
+++ b/dev-python/mkdocs-minify-plugin/Manifest
@@ -1,3 +1,5 @@
 DIST mkdocs-minify-plugin-0.3.0.tar.gz 3101 BLAKE2B 6b3451734d2d87f967c46521350f53cfd3cacdb555777328056ca61ed80e2341da86041be32fe87a0174241e3f36f0f0d7ca43538d0a8ca7a45cc06b6b4254e3 SHA512 97d8cb1ca3b0abfa362b9f71c7f881c889eb08963519ff0a356778b446c62140edb70ec344cbf54df7990e94ef515202b567799d0426e518a1abd6c3886a4281
+DIST mkdocs-minify-plugin-0.4.0.tar.gz 3097 BLAKE2B b1bba66539cc3470e922ff2bd1c6ae21de401ea343e2bd313bc93ec692e15794476681d48c9dceb9edd09f3c6274dd9174d5861137312ce9b9836e02f34a52e4 SHA512 6a42f649a2a867b2c796de3c602f19375705859fc9b3592fc1d8c102b42a96d7bb7150a4f75b281843ece40bd19ca5bb82654c658e1fe6d1b94f34c8279b2602
 EBUILD mkdocs-minify-plugin-0.3.0.ebuild 619 BLAKE2B 21bc69da07457a68305d4fe09e8e624af1de6554bd611de1a1ba66ec30438143acc4b2874792c6e5aa4b9453b1f1d3cb70312f157f2d7cc11e5e6537c4a56294 SHA512 e24e345cfd128b0eefd7770a1e8a868c6be60ef10b90122442336d88eb0673bf711754b144cac5bdb0a9ac385b63f33848f82887b2b513e0946ae80b21a0aa9d
+EBUILD mkdocs-minify-plugin-0.4.0.ebuild 619 BLAKE2B 2c55c9644425537c9b4958f39398e8bf2c22e0d931c0bb285d466e9f6a4efdb3b70f1b941648243a26be27de138116f34a0d7dad853699264c8f76917949943c SHA512 d4bc048cede7ed6993c9c1960f41a8e1f95a0225dd9d2d725b9000385f77b3819e23689b2212a85227b8327ed8c0505adb62380c16dd475086309cd78648e8d6
 MISC metadata.xml 530 BLAKE2B 4e36cb35c704c21112be2be62ad527339beeb4aeec3d4b42d1b1f35849403bb32fdda46a593741c6fda4c1e33cefaec505d382f3bea1ad6e17b82038223a48c8 SHA512 e522a55624c75108a9758a2a4faac669e9c980526825b9a1dc3a0175888e8367753f5eb16ae70075580905b0c1c199e883f045d6153807240e56403b601891ba
diff --git a/dev-python/mkdocs-minify-plugin/mkdocs-minify-plugin-0.4.0.ebuild b/dev-python/mkdocs-minify-plugin/mkdocs-minify-plugin-0.4.0.ebuild
new file mode 100644
index 000000000000..e0ff2102c326
--- /dev/null
+++ b/dev-python/mkdocs-minify-plugin/mkdocs-minify-plugin-0.4.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="An MkDocs plugin to minify HTML and/or JS files prior to being written to disk"
+HOMEPAGE="
+	https://github.com/byrnereese/mkdocs-minify-plugin
+	https://pypi.org/project/mkdocs-minify-plugin/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/mkdocs-1.0.4[${PYTHON_USEDEP}]
+	>=app-text/htmlmin-0.1.4[${PYTHON_USEDEP}]
+	>=dev-python/jsmin-2.2.2[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/mongoengine/Manifest b/dev-python/mongoengine/Manifest
index 56795a149b2d..e8c4668ea5f6 100644
--- a/dev-python/mongoengine/Manifest
+++ b/dev-python/mongoengine/Manifest
@@ -1,3 +1,5 @@
 DIST mongoengine-0.22.1.tar.gz 321227 BLAKE2B 933850eb85623a33b1f8e124b6c8375a9e0448c39f5cf44a3aa5b281746933043873d6ac32997121b15c611b9c1a50a1194fa8f364bae3009339d50f5ca98bb8 SHA512 a5188e854aede8feddc01c2d7cbaedd0af4faf5ac03d28f8df9d6dd2f7ae58d9de81eb9d4f3bb02daafb85b7fdf8d54ba38994af07bb338af2b27940cc3413ed
+DIST mongoengine-0.23.0.tar.gz 322731 BLAKE2B 5aa01b59193fa118d9b9c2110d6ec401090bff768b5b2e5d9c5fea4bcb5ae6714c62d4ff664c3ab24c600d912f90287a8ac77313bc8c50e13c6d191baef69e49 SHA512 9dbc45ebf3d367a829947f404a3979236be7ef0fc39611046e2815b6ab83bdb2ada3db8b6d1f4bec6301677f5b727cc2570bb732050e2ff865da49a5ba63d0aa
 EBUILD mongoengine-0.22.1.ebuild 1345 BLAKE2B 7eaa40b181c8977de264e3590dc96019045b4a6a657b0959ebf40df19df19037c57aa84eccf7c3225ed15234e57c0f18e6c7ce5ef509cc25b9df13cb73346250 SHA512 781d3610ee521b244f91b31671a035b51a8bceafcd87de14a2ffaf93f119402d1470b48be3cd2c09164ef96ca31af00685512ee1031b94970cf68c928012f89a
+EBUILD mongoengine-0.23.0.ebuild 1348 BLAKE2B 5e4ef2fc7d48a7253fd0f20686b7b497671c12d04cbfdc96b719b90c932e7c72285d53558a5de3e4b2c8ada7ed830a364c7aba187e54114432426ef9f66374ca SHA512 9c4f0336620df3389d47dcfb5b7a1f0ec75908aa58f01661228206aeda090bbb2f5d61a593da225613b98314cc66e9463c7964c45e75c9a00a419077a92b2a6b
 MISC metadata.xml 401 BLAKE2B 85d14e37ee9648d1067f85cd133ffc31023c94057b3bba418c3c047ac7ed7234193ab54f1784908ffbbc23b087675d295ad55e59689dc9be312bc3ac966213fe SHA512 8eec6c724d7d943777ffd842f5963fbb72247aa0e9a66a9de006e56421e3b51e262df3aeb04112f2b91c9251ff3e3abfcd1c018a5bf0621a5a7b1f0ba17fcd1a
diff --git a/dev-python/mongoengine/mongoengine-0.23.0.ebuild b/dev-python/mongoengine/mongoengine-0.23.0.ebuild
new file mode 100644
index 000000000000..13ab5c94bc56
--- /dev/null
+++ b/dev-python/mongoengine/mongoengine-0.23.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+inherit distutils-r1
+
+DESCRIPTION="A Python Object-Document-Mapper for working with MongoDB"
+HOMEPAGE="https://github.com/MongoEngine/mongoengine/"
+SRC_URI="https://github.com/MongoEngine/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+# TODO: make it run a local database server
+#RESTRICT="test"
+
+RDEPEND="dev-python/blinker[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/pymongo[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? ( dev-python/mongomock[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# TODO: investigate
+	sed -e 's:test_covered_index:_&:' \
+		-i tests/document/test_indexes.py || die
+	# no $eval
+	sed -e 's:test_exec_js_field_sub:_&:' \
+		-e 's:test_exec_js_query:_&:' \
+		-e 's:test_item_frequencies_normalize:_&:' \
+		-e 's:test_item_frequencies_with_0_values:_&:' \
+		-e 's:test_item_frequencies_with_False_values:_&:' \
+		-e 's:test_item_frequencies_with_null_embedded:_&:' \
+		-i tests/queryset/test_queryset.py || die
+	# TODO: investigate (wrong order? bad comparison?)
+	sed -e 's:test_distinct_ListField_EmbeddedDocumentField:_&:' \
+		-i tests/queryset/test_queryset.py || die
+
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/moto/Manifest b/dev-python/moto/Manifest
index ebbb1db42543..a9d28b704ef1 100644
--- a/dev-python/moto/Manifest
+++ b/dev-python/moto/Manifest
@@ -8,5 +8,5 @@ DIST moto-2.0.1.tar.gz 1530088 BLAKE2B eb35bcbc8b22044ae86eaa6eb1f71eb24174a8686
 EBUILD moto-1.3.14-r3.ebuild 2875 BLAKE2B de0b07e01a296d89ae22fe0a91c91fc76634f054a148c0cf60101d85df67f0a17cfd9a80cd41e264a0641e79602b5e3cf23b90f2eda98a50af78794ccc9ef0b7 SHA512 c6bef4b6f0899fbc31d97cc101fd14894814edcbf66df837f776fbb51780f86a95bfd94dbf278e274897ba25e4465938eb9bd0410910a95ecddea56962a70f3a
 EBUILD moto-1.3.16-r1.ebuild 3189 BLAKE2B 6c4612eda3bb91d40b7e0ad451568d5c877ef4d3a6563fdf13513d11abbb477702d542109174e91b7c1e580c366d448248453170480b7a15a8b8e9918814624b SHA512 5df5495f98a4929a7e97e257a2bd7b8ee44c915fa008b6d45674d6172ea17fb103b2c579e76a7d14944995019a73217e510c60938b42ea5d2885f92f785d92ad
 EBUILD moto-2.0.0.ebuild 2359 BLAKE2B c9204998835e0f41bc23d820a9ce677f33d1f18f614905cf2d572ef194fc422a7be02f5d37ca6a25389feeebf4e1bd8f8439ba1e44466a45b12678d8e0cf69e7 SHA512 3689854904d3c9f5152dc2211d52e21dd475151c18fb9463b288634cd0754cffa744e4de129655277e5b1f4d5b1bb78f451a7282a31203483d75a7990aa3d693
-EBUILD moto-2.0.1.ebuild 2359 BLAKE2B c9204998835e0f41bc23d820a9ce677f33d1f18f614905cf2d572ef194fc422a7be02f5d37ca6a25389feeebf4e1bd8f8439ba1e44466a45b12678d8e0cf69e7 SHA512 3689854904d3c9f5152dc2211d52e21dd475151c18fb9463b288634cd0754cffa744e4de129655277e5b1f4d5b1bb78f451a7282a31203483d75a7990aa3d693
+EBUILD moto-2.0.1.ebuild 2366 BLAKE2B 25b780427da33dbdae8cb9ea6bb0c834a02ec745f40e7ad94c27cf79c9fc13bc4a91d6a3ac0e4627ebd77a36ed0ba1daadfaca963cadf32a860d4ba62b34df99 SHA512 38596bc35536b0a1598cdf2425a164605b5b7614c776592b1f76279334dc1ccf91440e88e74511ebfea239095a1180d91c740d05596645c82982f45e39e0c8f6
 MISC metadata.xml 551 BLAKE2B 5473a586a27737f95b3795ff19bd08359fa5135aa60858c52b633d1ed53412fc1cbac3952f937ed497de18e90b00bd45725b920ad6fc75c8928181ca48ac5c45 SHA512 5b68da384123be90f74ea6cdd216f59ee004c4383b13da95fa17864c998ecb821fd0f16bf65abdc9b29f081a1e06be482518ede38139e29e32e46c962b3d4805
diff --git a/dev-python/moto/moto-2.0.1.ebuild b/dev-python/moto/moto-2.0.1.ebuild
index 8984175648d9..115b2bdf55aa 100644
--- a/dev-python/moto/moto-2.0.1.ebuild
+++ b/dev-python/moto/moto-2.0.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 
 RDEPEND="
 	>=dev-python/aws-xray-sdk-python-0.93[${PYTHON_USEDEP}]
diff --git a/dev-python/namespace-ruamel/Manifest b/dev-python/namespace-ruamel/Manifest
new file mode 100644
index 000000000000..9133579c5757
--- /dev/null
+++ b/dev-python/namespace-ruamel/Manifest
@@ -0,0 +1,2 @@
+EBUILD namespace-ruamel-1.ebuild 908 BLAKE2B b8660f2f50c7419d66991eaff92457fac634d61e538ced54629829fe2de41f7758baf2101ecd4914299c31dc23846bcedda89e639e279b371ea2417460f3af2d SHA512 a1099f6dac115cc573dcb363385dc7c324627225993e2fd982de2ec19b015576467a8baaaace1c4c9e72683af0d8a1e07ef529030b63f81ec6096bc0a043ec9c
+MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/namespace-ruamel/metadata.xml b/dev-python/namespace-ruamel/metadata.xml
new file mode 100644
index 000000000000..266e3f19ca59
--- /dev/null
+++ b/dev-python/namespace-ruamel/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/namespace-ruamel/namespace-ruamel-1.ebuild b/dev-python/namespace-ruamel/namespace-ruamel-1.ebuild
new file mode 100644
index 000000000000..2eb907705dcf
--- /dev/null
+++ b/dev-python/namespace-ruamel/namespace-ruamel-1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{7..9} )
+
+inherit python-r1
+
+DESCRIPTION="Namespace package declaration for ruamel"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Python/Namespace_packages"
+SRC_URI=""
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${PYTHON_DEPS}"
+DEPEND="${PYTHON_DEPS}"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+src_unpack() {
+	mkdir -p "${S}"/ruamel || die
+	cat > "${S}"/ruamel/__init__.py <<-EOF || die
+		__import__('pkg_resources').declare_namespace(__name__)
+	EOF
+}
+
+src_install() {
+	python_foreach_impl python_domodule ruamel
+}
diff --git a/dev-python/nbval/Manifest b/dev-python/nbval/Manifest
index d711046a561c..a14be1bd518b 100644
--- a/dev-python/nbval/Manifest
+++ b/dev-python/nbval/Manifest
@@ -1,5 +1,3 @@
-DIST nbval-0.9.1.tar.gz 64476 BLAKE2B 299f6cb9a1e28b80b2e27a74f2b6614e83e5b571b1dc27d0f6829693dd0f6c2b59845543c91487615a8621e21ac2cbc2d34e60e62b7a646914283e23649d8bd9 SHA512 8ab0cb4e09907d99f898b148b635f0818660d04417c1c809beb93680862a5ecab14b606ecc3f90eff85e5f01de7dbf10954f1edf3629a1cf8ddac00556d4d6e7
 DIST nbval-0.9.6.tar.gz 60932 BLAKE2B 77f283279e16e03ec87f250b2012aabd8f580e24b222efcb0b21d9b0dadc381cea3c4a3f96a85df0104da86911de66e6c21bfd3985801fa9c3d8764b2fb26183 SHA512 d4261fc30e197e7350c07504649f0230751b5ed746fe4626b92c5920032dc15abe47ad421c93f4762e93a8b6afcbca440ca006bfd1cdbcba37d131c4e6decaa7
-EBUILD nbval-0.9.1-r1.ebuild 740 BLAKE2B 69c62d981984faae61a0aeb70d4c038f78a791607fdb741495eb896d04e7e0356e8f928471ef51798aec14d3fb75b2aa73ebeab4a79f38813e274a161cb3af08 SHA512 c00a36c40e79a10161fd740f003172d39b07c753bc3e7bed8c267e6bb249f8d49f419337670f0bf06eb8a3cb4c9c6b1a7d915823f5122c389c4dfc6331753389
 EBUILD nbval-0.9.6.ebuild 977 BLAKE2B a699ee8f98774865b8e7f190e8b364ea9df156f5500401fd9a5dc3371a1f87f4308f1a572a17560fb7037cce4e962725aa67dcf0ed8e920bbec9f7d9aeaf1346 SHA512 ebd4d4ec9fc1bba8160fd1acda17b8a37ea3a8ef218db45d01fcf02a0c39102bc7f14fbfd54a7397a630ce46860736326f229f8abdb7883a1c0485992a6a58e3
 MISC metadata.xml 983 BLAKE2B deb9c0b7b10480d8d918b61c9c1110cd3168ba51ad49b0f4822761875e5e3aff5d68f502e023a1e5c7a744b2a867aae9606737be79c1593960a7fda4d277448d SHA512 a1901ee74f9260328bb99d3ee37642d94a15a7e9c266a0cfd509e8cff5bf012ebc8185c8a576dbb4e5ac3f887086639a917cd76174398edbab17060d43111665
diff --git a/dev-python/nbval/nbval-0.9.1-r1.ebuild b/dev-python/nbval/nbval-0.9.1-r1.ebuild
deleted file mode 100644
index 24226b042d45..000000000000
--- a/dev-python/nbval/nbval-0.9.1-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="A py.test plugin to validate Jupyter notebooks"
-HOMEPAGE="https://github.com/computationalmodelling/nbval"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/pytest[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/jupyter_client[${PYTHON_USEDEP}]
-	dev-python/nbformat[${PYTHON_USEDEP}]
-	dev-python/ipykernel[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/sympy[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-	)"
diff --git a/dev-python/ntlm-auth/Manifest b/dev-python/ntlm-auth/Manifest
index 63cc38cdc944..5babcf63d59a 100644
--- a/dev-python/ntlm-auth/Manifest
+++ b/dev-python/ntlm-auth/Manifest
@@ -1,3 +1,3 @@
 DIST ntlm-auth-1.5.0.tar.gz 41826 BLAKE2B fb313cdb4f1022e0cbc1ffcb048a587baca400a75e053ea8943d960f21746e847080db20169f55e6a3060a8b8502637ce7dc269b66bdaffe98c3f769b2b22358 SHA512 cf08b23e49d45c528404b70b6be88f6c3edee9fd0d4584f3962931a08a0982cdad4089963a95aea911b6eb4db32a932536cf6d9c02c292cd447e0a9c6b3b802b
-EBUILD ntlm-auth-1.5.0.ebuild 513 BLAKE2B 51ce5135ed5f3f5bc48957673db4fe8da05f5a4eecd4ef3c918faf20125503e56c6e323496ac6fd5768e3fbe45c6c06d02f2a4256b25a607bb4bcfbe183c3907 SHA512 bfc6c94c7e1a1d8ecfd23dfd175a09c69b09ce1c6927f51acfa3ecbbccea08bbc6040fb477b764307d7e5aa3f0017c10fead22959403438f9c75c03ccf4b41d5
+EBUILD ntlm-auth-1.5.0.ebuild 514 BLAKE2B ff446c17adf9e09dcb84af9f037dd8fd5d2c03b2015d2f2ae844709982ec7dc92f56a11731829ffb7c99c59c62ad6567f82b439692af5a45d5404a3a684780ab SHA512 79caf80443c99383cc2490cbfc8aec31040cec336d0aed017583ee0d0e0b0a53f31ea7c23b116cc23c84b0af915939d3e9297829ecd5f2640ba011f277b963d3
 MISC metadata.xml 484 BLAKE2B 4c2fa6f77f0f6ffca89dc62dcfe9a841b96b04594d142392e3878ac920c72ee73369cf399d1b336519dc4a3b18e3e2a7eeb441ff8696c37ef85e79bc7acbadd8 SHA512 66e8db35c0d39bd2a5b4f957378769a977579baab33a3f9f4e06248af4f38fe7993497b2c59cc8dde94b2c836a1d3475e53537909d4b1d4b2315221d670123a3
diff --git a/dev-python/ntlm-auth/ntlm-auth-1.5.0.ebuild b/dev-python/ntlm-auth/ntlm-auth-1.5.0.ebuild
index 73b8595dec0c..ffc6df49c46d 100644
--- a/dev-python/ntlm-auth/ntlm-auth-1.5.0.ebuild
+++ b/dev-python/ntlm-auth/ntlm-auth-1.5.0.ebuild
@@ -1,9 +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_{7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index a1d85e780489..7acd5b144842 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -1,12 +1,10 @@
 AUX numpy-1.17.4-no-hardcode-blasv2.patch 2420 BLAKE2B e4c0058b1226fced2c38caf67b2843021c6f42773781668a556eb48d7038acd0b1c7cbf30a432fdc3f4d2abf8eef28df7102be1bc9669a4ddc4ee4fc5e239d68 SHA512 9c6dc7e4f5b28b24ac5e1c686066c973b218b0e4e07b500a52c8b3e247acb150714072d17dd1a8579f47c48e9776bddebf9f049616aca52e0325c8f09ef09dad
 AUX numpy-1.20.1-no-hardcode-blasv2.patch 2582 BLAKE2B 5057f925a12e6703ab5d9d4c342db80f7f5a7f02a5b5884bd9fac574dcadb9234901b08b1b2ca5bc5ba0345a58e896a241e3a48b4b050b2f5a1063324359d84c SHA512 4418b9c5ed3842848bc06a56ebbd7cd9261657e407775374f2f060944522128d8a5178888def6e4cf42ff6d81082d9cc1425d9553c5334ad4e728d0df9b86bc8
-DIST numpy-1.19.4.zip 7315971 BLAKE2B 4809ad6aaf7f9893ea6ed4c2456f4827aa5728b9dba00ed4c8e517267dd299933ca6c9205e3e31ef61ba25a6c13dde32dbe7d268c2d54391bd532d368bb3c5e8 SHA512 ae8e6b2792022c147159a11188f9702fa9fa9c9707c834da4f21aa43752451509b0a5b8807d93dfa86dff7e95c127dab20e4f372336a66f25f9b56c2869a486f
 DIST numpy-1.19.5.zip 7318340 BLAKE2B a01fd07d8cbfc53c1585b19701f9052fd4b1b4010d24c61e1054352a80343e6644ae6e61ce7565fd9c7c99b9e1174bdd2e685fd5666640d08b1ec9919f86cc8e SHA512 dfe2809b5f486624b4802ea5610822bf7ba80c46dcf8505f69b0267137b01719131f74aa366949954c66796d48ba1b4f74cf0ecc5692a9ebd49e673fb0881ff4
 DIST numpy-1.20.1.zip 7750776 BLAKE2B 0f3915f2e8dfa6e0e7a6251fcba5365379d91b448101513860573f07e1f3fa24b097177a333230d7cbea1f58afed1718346d0348d14344544fe063e4baa6786a SHA512 edd1be2df27940f050ebd8eeb7b053b9987849d3b4aa0cb3c75d2fe2318f358e1b37f3bafedc772c224021e9316ebce45e1b75aa0e35d248f8ba9a9112b57b86
 DIST numpy-html-1.16.4.zip 12097069 BLAKE2B db1f897342fbc80a761fbaee7b0eee3761dbfa04ef6c46a137bb2392caaec8256580467ce06498cceeada2639151a1ec75dafab484d64cb897c008727d6d32a5 SHA512 c44c5e1e0cb22f9dd46fe9e302030292d85e567456178fee296746a414271634e906509fb6665ac63fbfebdd13c5383574f0aa47b4fbc639063da31addc3316a
 DIST numpy-ref-1.16.4.pdf 5176571 BLAKE2B 9a875ebd1473b241d463d810a6d191581aef961158f2f82959671b554ace3ad482795e4f3e1cb7dd4632cff926c1e864c675a7624fb0f4e4f297948bf50f0564 SHA512 983ba0f34a70c011886bdbc9fd8f3f75a3a967ca29217acc76fa46e7da391296a5628c9a557ac76efb393271abfb8ee4f376d401c1cc1e5c30622e54b9325d09
 DIST numpy-user-1.16.4.pdf 596203 BLAKE2B da3ad1f0ec1c965d20656f73a970911cbb58efa73a5df89e2e6485e0dd763f483e35eea1395ac919bf35d496fb216cee954fc5d31edebc1796a24a2a7a2d12b9 SHA512 3083008547213bfa98ffa5cd8e2cea13f6947f42d83aef61502a2a852b0d5f27d727c76b42d281d7a2f4f76c78e88b12ee3d9b164b39fe1f0213ace7097357d6
-EBUILD numpy-1.19.4.ebuild 3722 BLAKE2B 8c4f52962817ab70d1181da8e87978a5a48eafe23afe3d64aac5fa0cf8ef6095178fa877939f4be7cd1bc7f43415587d78aff06001ea787cac8bb83d3513df8d SHA512 623a3d1b3181981ef1702d476589e2659ee11ed45476a74c07365dc6fddea0b215950505c3f9b6c51cb05a1c5960f2c769aa550de6adc94b70c7c318cb69c00d
 EBUILD numpy-1.19.5.ebuild 3719 BLAKE2B 89f1510bf7a43e52f697c67912be79c3bef0a1320eb35e26290c7f7556c630ab8555d029c931966a94598e33eb9f8c3b76a5a59ab1284df3d8386c63c843774f SHA512 3f6ca348191de750bcd92c5a1206d92fcf82333e58081f86eee56c3cb5730a9cdea6678973db3049273b7f3d1d6bf3812e154b218d69c144430a092b0779deff
 EBUILD numpy-1.20.1.ebuild 3727 BLAKE2B fafca319c164ac66f10193f4f364829d4a3ea3eb9e1e03b1261c3348b381e58b91700e12f70a7e026515f54acb1e06e93bca86e82d6eb7aa2f21c25e7e75603a SHA512 188b6584b9c3020768311c782920335386c714ecdb5b97fe1b832882c3df155e4b44fb2ff09a1c90ab5083318669e47aa696da42d31c6ca8fcb3953de05e5c88
 MISC metadata.xml 876 BLAKE2B 5e257d6ea3c59c5819d854db7b7db3ebff53b5c87b5ce9348786085f09db12aa6fc8fa86393b9e6c06760ac0d9f36a52fdfb1865c9d1d9ad5526d74d3d53e8b1 SHA512 d35d0954ff8f21e370edeab3ce3e5ab501bf216c93399e807ede6f1910ba0ea41359425bf894d813a39442fb92a724fe83ec8a5c64e6bd97de9422f67700d549
diff --git a/dev-python/numpy/numpy-1.19.4.ebuild b/dev-python/numpy/numpy-1.19.4.ebuild
deleted file mode 100644
index 386a189c2c5f..000000000000
--- a/dev-python/numpy/numpy-1.19.4.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-PYTHON_REQ_USE="threads(+)"
-
-FORTRAN_NEEDED=lapack
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1 flag-o-matic fortran-2 multiprocessing toolchain-funcs
-
-DOC_PV="1.16.4"
-DESCRIPTION="Fast array and numerical python library"
-HOMEPAGE="https://www.numpy.org"
-SRC_URI="
-	mirror://pypi/${PN:0:1}/${PN}/${P}.zip
-	doc? (
-		https://numpy.org/doc/$(ver_cut 1-2 ${DOC_PV})/numpy-html.zip -> numpy-html-${DOC_PV}.zip
-		https://numpy.org/doc/$(ver_cut 1-2 ${DOC_PV})/numpy-ref.pdf -> numpy-ref-${DOC_PV}.pdf
-		https://numpy.org/doc/$(ver_cut 1-2 ${DOC_PV})/numpy-user.pdf -> numpy-user-${DOC_PV}.pdf
-	)"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc lapack"
-
-RDEPEND="
-	lapack? (
-		>=virtual/cblas-3.8
-		>=virtual/lapack-3.8
-	)
-"
-BDEPEND="
-	${RDEPEND}
-	app-arch/unzip
-	>=dev-python/cython-0.29.21[${PYTHON_USEDEP}]
-	lapack? ( virtual/pkgconfig )
-	test? (
-		>=dev-python/hypothesis-5.8.0[${PYTHON_USEDEP}]
-		>=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
-		>=dev-python/cffi-1.14.0[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.17.4-no-hardcode-blasv2.patch
-)
-
-distutils_enable_tests pytest
-
-src_unpack() {
-	default
-	if use doc; then
-		unzip -qo "${DISTDIR}"/numpy-html-${DOC_PV}.zip -d html || die
-	fi
-}
-
-python_prepare_all() {
-	if use lapack; then
-		local incdir="${EPREFIX}"/usr/include
-		local libdir="${EPREFIX}"/usr/$(get_libdir)
-		cat >> site.cfg <<-EOF || die
-			[blas]
-			include_dirs = ${incdir}
-			library_dirs = ${libdir}
-			blas_libs = cblas,blas
-			[lapack]
-			library_dirs = ${libdir}
-			lapack_libs = lapack
-		EOF
-	else
-		export {ATLAS,PTATLAS,BLAS,LAPACK,MKL}=None
-	fi
-
-	export CC="$(tc-getCC) ${CFLAGS}"
-
-	append-flags -fno-strict-aliasing
-
-	# See progress in http://projects.scipy.org/scipy/numpy/ticket/573
-	# with the subtle difference that we don't want to break Darwin where
-	# -shared is not a valid linker argument
-	if [[ ${CHOST} != *-darwin* ]]; then
-		append-ldflags -shared
-	fi
-
-	# only one fortran to link with:
-	# linking with cblas and lapack library will force
-	# autodetecting and linking to all available fortran compilers
-	append-fflags -fPIC
-	if use lapack; then
-		NUMPY_FCONFIG="config_fc --noopt --noarch"
-		# workaround bug 335908
-		[[ $(tc-getFC) == *gfortran* ]] && NUMPY_FCONFIG+=" --fcompiler=gnu95"
-	fi
-
-	# don't version f2py, we will handle it.
-	sed -i -e '/f2py_exe/s: + os\.path.*$::' numpy/f2py/setup.py || die
-
-	# disable fuzzed tests
-	find numpy/*/tests -name '*.py' -exec sed -i \
-		-e 's:def \(.*_fuzz\):def _\1:' {} + || die
-	# very memory- and disk-hungry
-	sed -i -e 's:test_large_zip:_&:' numpy/lib/tests/test_io.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	export MAKEOPTS=-j1 #660754
-
-	distutils-r1_python_compile ${NUMPY_FCONFIG}
-}
-
-python_test() {
-	distutils_install_for_testing --single-version-externally-managed \
-		--record "${TMPDIR}/record.txt" ${NUMPY_FCONFIG}
-
-	cd "${TMPDIR}" || die
-
-	"${EPYTHON}" -c "
-import numpy, sys
-r = numpy.test(label='full', verbose=3)
-sys.exit(0 if r else 1)" || die "Tests fail with ${EPYTHON}"
-}
-
-python_install() {
-	# https://github.com/numpy/numpy/issues/16005
-	local mydistutilsargs=( build_src )
-	distutils-r1_python_install ${NUMPY_FCONFIG}
-	python_optimize
-}
-
-python_install_all() {
-	local DOCS=( LICENSE.txt README.md THANKS.txt )
-
-	if use doc; then
-		local HTML_DOCS=( "${WORKDIR}"/html/. )
-		DOCS+=( "${DISTDIR}"/${PN}-{user,ref}-${DOC_PV}.pdf )
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/openpyxl/Manifest b/dev-python/openpyxl/Manifest
index d615678c00d8..571e4a27cd4c 100644
--- a/dev-python/openpyxl/Manifest
+++ b/dev-python/openpyxl/Manifest
@@ -1,3 +1,5 @@
 DIST openpyxl-3.0.6.tar.bz2 2423464 BLAKE2B 205db09634730a1da6c24bc8c407b2f3deeac712b4c2cbe69796c538c6911ccb3e7e003617ab9563df12a74d6ca9fb2b1b83d8d75f3b91c168d2053a14c15d66 SHA512 6996800c54746dc41b902cbea378181cdab5db916fd6863c673df25f84f71de67019e34d0034231d7c588bf56be3f8e16b3a52c198dcbe74465d0b088090c24a
+DIST openpyxl-3.0.7.tar.bz2 2426608 BLAKE2B 5ce0a34ea4ec8f33da2224555f3d681c4cfa2145f4cba10ed182044e6a6d69ce61c500c51a26db7ded2a3a0e778d0d8e2bd996c3852732f565501f233b145db7 SHA512 bd697c353d0a9fe66a7947dc0f51530b8419e39b36833e5322cca544fafcbd6aba36e42e53c1a1672f44b3940de9b91417bc58955c87257b7b82782c480ef738
 EBUILD openpyxl-3.0.6.ebuild 744 BLAKE2B 42f98d2b8105d362e8deb2a92a512fd268ddd039cfa80852a34e817445ddb97ae9a7829ded9a60a8e599eb17333df03e39c07e5a9ac9dc8db60e6893943cf581 SHA512 f194262d4809c3944c368a0328f7baad5bfb17d08784ab59f3ee50c331e53b32c14aa7c1bbf723d3a2659fba4b3a4cd03fe6f39b1fd3678831a414ad7921453e
+EBUILD openpyxl-3.0.7.ebuild 710 BLAKE2B 451b45e37e15ebd0b167384c879eadf7758f93eb244dc581246ab5af65f9e1472582a13c0078b0329400d83a98515d5c385328656c7e02b6dea0795330df21d6 SHA512 95712f9b6b4c26b8b5d9f49db5080513c28ea6f986af1968962a5b5c1ed8ac531f153344791523efa54b9570067a878ebb5e9c6cdb507a9ee7224d5c27fdd4f2
 MISC metadata.xml 535 BLAKE2B 59a57dfa41a492b88402a893a4c2e1a6bc624ada24584744ad2c142d1ba9bbad0172450e17cc2ab62068c7964c08066499b4cae59e39aef81bc7714ba86059f5 SHA512 30500339fc951ec3dbef77bcb5b0298b33bedc78ceb4733f9fac689da179096396da308214f012c40c54f718d74c6555b5795d763db197dfacceb46441b292a5
diff --git a/dev-python/openpyxl/openpyxl-3.0.7.ebuild b/dev-python/openpyxl/openpyxl-3.0.7.ebuild
new file mode 100644
index 000000000000..8ecd3bf3eba4
--- /dev/null
+++ b/dev-python/openpyxl/openpyxl-3.0.7.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Pure python reader and writer of Excel OpenXML files"
+HOMEPAGE="https://openpyxl.readthedocs.io/en/stable/"
+# Upstream doesn't want to include tests in PyPI tarballs
+SRC_URI="https://foss.heptapod.net/openpyxl/openpyxl/-/archive/${PV}/${P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/et_xmlfile[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP},tiff,jpeg]
+	)"
+
+distutils_enable_sphinx doc
+distutils_enable_tests pytest
diff --git a/dev-python/oslo-serialization/Manifest b/dev-python/oslo-serialization/Manifest
index 54d951892b87..dc64dc7fe6f3 100644
--- a/dev-python/oslo-serialization/Manifest
+++ b/dev-python/oslo-serialization/Manifest
@@ -1,5 +1,3 @@
-DIST oslo-serialization-4.0.1.tar.gz 30010 BLAKE2B 0f5dae22ca096b1dd7e4eb35862c931c5cf2cb06cbd2d5660cb5322140a12052ba76c50ca24644a4957f116bc33bbdf12adcd4191ddef3006f1630d762bb71af SHA512 dea4ecb0face2bc730d1e8883e71b34d3709c6cb43a0dc3bfbb757809fda7c198949de42327b5854d65b152f3ab09fbb14311259cf584063c73b93a3cc1313c1
 DIST oslo-serialization-4.0.2.tar.gz 33029 BLAKE2B 8e0d4b71b87f38bc22994d423d7bfe7e7d4d66c6279ec1a8cd33fdb064d56c6aea7de41795c7bdacec3c970eb46a49a3204ade20d8128f44eb94b95d0239ba13 SHA512 30d5a6d0f91c8a4bebeb0389e7d8d6b306efef420dc1dd2141ac27fd43be7526443294082cfbc1a4eb9b0b88dbff5be3b854aa8493595f3d0145e8a938e00131
-EBUILD oslo-serialization-4.0.1.ebuild 899 BLAKE2B f62ff87739420024229f0c57e3b479450392c303cd9006af91d6ccc70463ac390e0edba9ea43f523b05f263ed71e7daaffe6612aa4dbdeb67d8b143ffe403571 SHA512 22c86662d539a0dc1051f6f920793bbd3bd7ab7e791236d5d9c240e7473b0f9234719da550e8b71aa5ee547cd98b50450c488869aa79f6113734f727ee50ca01
-EBUILD oslo-serialization-4.0.2.ebuild 901 BLAKE2B ce1a73ce008a53152f872840a3194aa412a60acdc682d01f0175c6d6b5586a2d3c885104e80736658e451c37ad76de4330a8714c20742b69559d6bfad8f51515 SHA512 250c57422eba64fc8568d4d929efae6bc66aa827d807efb977a3b9ffd24694434916a81ac79793435f99a3d285a6bbe2c55f851c40be8ab0303bf8799f24b551
+EBUILD oslo-serialization-4.0.2.ebuild 899 BLAKE2B f62ff87739420024229f0c57e3b479450392c303cd9006af91d6ccc70463ac390e0edba9ea43f523b05f263ed71e7daaffe6612aa4dbdeb67d8b143ffe403571 SHA512 22c86662d539a0dc1051f6f920793bbd3bd7ab7e791236d5d9c240e7473b0f9234719da550e8b71aa5ee547cd98b50450c488869aa79f6113734f727ee50ca01
 MISC metadata.xml 513 BLAKE2B 019650e2c80bf2578f18cafd2479e411976d0e52b3dfcdc6f072e90c2349dd700de96fbfffd6a54729b5d2114f2b10e45760c43a1efbe93f2d903551aa4bbd6a SHA512 701020897031a3a452366bc192ffcfc79bb94c1af69487fd8d2f4c92e7469191d89d9be53994291053835ca06c00b613ad8dc09988938972d2620755cbf67ac3
diff --git a/dev-python/oslo-serialization/oslo-serialization-4.0.1.ebuild b/dev-python/oslo-serialization/oslo-serialization-4.0.1.ebuild
deleted file mode 100644
index 69c55794b4c1..000000000000
--- a/dev-python/oslo-serialization/oslo-serialization-4.0.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-
-inherit distutils-r1
-
-MY_PN=${PN/-/.}
-
-DESCRIPTION="Oslo Serialization library"
-HOMEPAGE="https://launchpad.net/oslo"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE=""
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
-DEPEND="${CDEPEND}"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/msgpack-0.5.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	# allow useage of renamed msgpack
-	sed -i '/^msgpack/d' requirements.txt || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/oslo-serialization/oslo-serialization-4.0.2.ebuild b/dev-python/oslo-serialization/oslo-serialization-4.0.2.ebuild
index 0b96df5be7e3..69c55794b4c1 100644
--- a/dev-python/oslo-serialization/oslo-serialization-4.0.2.ebuild
+++ b/dev-python/oslo-serialization/oslo-serialization-4.0.2.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/pandas/Manifest b/dev-python/pandas/Manifest
index e67de05953df..8a6d840e87da 100644
--- a/dev-python/pandas/Manifest
+++ b/dev-python/pandas/Manifest
@@ -2,8 +2,8 @@ DIST pandas-1.1.5.tar.gz 5229894 BLAKE2B 5b47774e33c7fccd7a9110e8971e8ce63cafd68
 DIST pandas-1.2.1.tar.gz 5459053 BLAKE2B 49d99e7217d52f1233cdff20628da9028b7a8ce1d89a5ebe502c6e960ca9f7948005e7a63a15b76f9bc44ab5f15e00eef86c3b3179e6cad820e6f5072c7c78f0 SHA512 9bf9212ebdd07785f1877f5f80d6a5beb4637e8a1cf741e32a705a48724280a8e8daae209c66c1a3f00718b566127d77af578d6c72a5d9b68e2b03784c604083
 DIST pandas-1.2.2.tar.gz 5463571 BLAKE2B e27e032bb9d6abb6f40d1a15bc7e9796690f0bd099e5fc7704cbd5b40b37c0f277b462116bd7582263abef8f728d3109f6c4c425cac427f0c750b019fd5e8ad8 SHA512 288ec9f3a2042c2a376340ddc25b4e2d9d3c4de146468316378269d4b70fb271241acb9aa5295415d8bebabad859a9ea9dc95aa71a68f06c2eba73809b9b30e2
 DIST pandas-1.2.3.tar.gz 5466356 BLAKE2B f392321915128769814b3a8b7673cd7b00c9c292f4cb8d8b2e8537f7cc513f92cb6b8ff74dffe3b167987e8fa387738264dbebfdf4019f9cd7afd4f78234212a SHA512 3108424253aa143a85ef166091829bbd8c9b6446b516f37252742146d184f722e1fb8af5b4d04937362a298068019a91392e40c818126df6a7459bab7f3077cb
-EBUILD pandas-1.1.5.ebuild 5819 BLAKE2B d2dfb6a5df813628a733c02c4fd4b7faade174402283c54a687a5b380f68c3b8d12909453575068ce5bb2f114a28bed3b449ecfbdc38cb445f4c3205c9e5618c SHA512 fe64e04b59c0c72595e61ebcd15eb7ae1131fb29a184c087b96ad91decd77ec51251aa99dd475f91c04d7010be12907ec2cd32fec1fd837528bf063306da5d22
-EBUILD pandas-1.2.1.ebuild 6128 BLAKE2B cb4f841c4f752c08cee096fb1631f6e954426c074e2cf43f0f1a571397562497920e4a53cd4e1d07d93887765178115a9505113751bf29a96e0acf5854f6f7c3 SHA512 5b19b8cbb936a76b6b37c57f1300bb1d8f3a756ff10c0b4996a4f944c087ffbc67c32693f8ea7f919c2b8a69b62ac394fa099f9326903bf0003578cc1dd569c5
-EBUILD pandas-1.2.2.ebuild 6129 BLAKE2B fbf314947b6cc67a966e664f5fd34611afccbc4a5de5b5c6c62a8ca7e45452984f8416979fa426b02dcf93f74e0c1a8226b30b66c0957cd40d2e1a75210b4c8a SHA512 9888c47fb7d822613a3b121592a4b403d562771b4d8d88ae3f1ccdd1d146e0463a77bbb9b983588642101503f38706a719e9a9a347618b287687de49532df00a
-EBUILD pandas-1.2.3.ebuild 6129 BLAKE2B fbf314947b6cc67a966e664f5fd34611afccbc4a5de5b5c6c62a8ca7e45452984f8416979fa426b02dcf93f74e0c1a8226b30b66c0957cd40d2e1a75210b4c8a SHA512 9888c47fb7d822613a3b121592a4b403d562771b4d8d88ae3f1ccdd1d146e0463a77bbb9b983588642101503f38706a719e9a9a347618b287687de49532df00a
+EBUILD pandas-1.1.5-r1.ebuild 5874 BLAKE2B 01bfc318109bf7234187748e7f2907534bebe6fe032a991c56c479ffbf068199094d8aaad6c10a64d1afe84d2bf66afa052cc056187f01e36e1b52a5d617c898 SHA512 1ef0dc09e253691c9df3207c895c867203180f2617216e6291e909bd8a1bc05155f6c6e830a13b4657a5bb3e976be7a0f11f3e39ad3c5d5e05913ef6a1b00e00
+EBUILD pandas-1.2.1-r1.ebuild 6183 BLAKE2B 3091341a86a89a0c1424b77ae716efd2ed28594b285b87ef491503f084b54556121270f307cbbaa2ab34d1200e3ebc394859951d9c6cf63b393769d4d232f396 SHA512 5df3a288866cab94f0e13dfc32d68ad1bef7cbbb86197046a0ae871698d22c34c000c12ec24803a15d51df8c4001ad51e3543a1620953e8b2219e3cbc3ab92c5
+EBUILD pandas-1.2.2-r1.ebuild 6184 BLAKE2B 9b37c5e90374b0dc1ce93c7446fa149964e0b731f6540c7d18973e67afc0d851984100ba7128b6a9a617af013eefc2ff225916799a9c4aa5e30fa8814a5fc58b SHA512 331df46bd67535831ae807ab7c3d889bb177907187d7c66627901ba71e62cf553cded809b1e6bba3f30db67fad937488e47313a3fe758022e97bf3154a5564d1
+EBUILD pandas-1.2.3-r1.ebuild 6184 BLAKE2B 9b37c5e90374b0dc1ce93c7446fa149964e0b731f6540c7d18973e67afc0d851984100ba7128b6a9a617af013eefc2ff225916799a9c4aa5e30fa8814a5fc58b SHA512 331df46bd67535831ae807ab7c3d889bb177907187d7c66627901ba71e62cf553cded809b1e6bba3f30db67fad937488e47313a3fe758022e97bf3154a5564d1
 MISC metadata.xml 917 BLAKE2B 52ce164457db6dcf39fe8cd3482021ca88bb1d8d35f09adbc189e23f31b098229d2d5381ce2df7e68f996f50dd5b41b8ccb851fe877d5a7c468c8e42d1cc457b SHA512 fdfd49c8327288be612fa5f5a7a230a278d0634b090ac8da1dcc63c732db84dbcd7cb37dee74a9996127c4062bc73a5be1a9f911715166ed6af16758a578e333
diff --git a/dev-python/pandas/pandas-1.1.5.ebuild b/dev-python/pandas/pandas-1.1.5-r1.ebuild
index 89393e785bc5..75aeaa4bcee4 100644
--- a/dev-python/pandas/pandas-1.1.5.ebuild
+++ b/dev-python/pandas/pandas-1.1.5-r1.ebuild
@@ -124,6 +124,10 @@ python_prepare_all() {
 	distutils-r1_python_prepare_all
 }
 
+python_compile() {
+	distutils-r1_python_compile -j1
+}
+
 python_compile_all() {
 	# To build docs the need be located in $BUILD_DIR,
 	# else PYTHONPATH points to unusable modules.
diff --git a/dev-python/pandas/pandas-1.2.1.ebuild b/dev-python/pandas/pandas-1.2.1-r1.ebuild
index 5a54eac96e6e..05a432d36557 100644
--- a/dev-python/pandas/pandas-1.2.1.ebuild
+++ b/dev-python/pandas/pandas-1.2.1-r1.ebuild
@@ -121,6 +121,10 @@ python_prepare_all() {
 	distutils-r1_python_prepare_all
 }
 
+python_compile() {
+	distutils-r1_python_compile -j1
+}
+
 python_compile_all() {
 	# To build docs the need be located in $BUILD_DIR,
 	# else PYTHONPATH points to unusable modules.
diff --git a/dev-python/pandas/pandas-1.2.3.ebuild b/dev-python/pandas/pandas-1.2.2-r1.ebuild
index 2bfbf0f7609a..a79b5b1c18ca 100644
--- a/dev-python/pandas/pandas-1.2.3.ebuild
+++ b/dev-python/pandas/pandas-1.2.2-r1.ebuild
@@ -121,6 +121,10 @@ python_prepare_all() {
 	distutils-r1_python_prepare_all
 }
 
+python_compile() {
+	distutils-r1_python_compile -j1
+}
+
 python_compile_all() {
 	# To build docs the need be located in $BUILD_DIR,
 	# else PYTHONPATH points to unusable modules.
diff --git a/dev-python/pandas/pandas-1.2.2.ebuild b/dev-python/pandas/pandas-1.2.3-r1.ebuild
index 2bfbf0f7609a..a79b5b1c18ca 100644
--- a/dev-python/pandas/pandas-1.2.2.ebuild
+++ b/dev-python/pandas/pandas-1.2.3-r1.ebuild
@@ -121,6 +121,10 @@ python_prepare_all() {
 	distutils-r1_python_prepare_all
 }
 
+python_compile() {
+	distutils-r1_python_compile -j1
+}
+
 python_compile_all() {
 	# To build docs the need be located in $BUILD_DIR,
 	# else PYTHONPATH points to unusable modules.
diff --git a/dev-python/pebble/Manifest b/dev-python/pebble/Manifest
index 8edd18b7a520..bebeb2e22120 100644
--- a/dev-python/pebble/Manifest
+++ b/dev-python/pebble/Manifest
@@ -1,3 +1,5 @@
 DIST Pebble-4.6.0.tar.gz 23910 BLAKE2B 3a2f1b4cdad898274d53cdfc07b5c933162aef375ae548a39138b50d50376e7f06642dfbff038b431d77715a14414f90fbd77db1c373e988df6afe65cfb5a632 SHA512 445f65cf5a18c864478326ca1198ae49bf5aae3c53e67f68ffdcbdabe3cf16c59468b3d340568986414f45f13684c11da0e3a9fd31f510c391a7fd44cf3dc6e2
+DIST Pebble-4.6.1.tar.gz 24800 BLAKE2B 5030b1206eb263ac4584b4dc5a6b2d13c39af827245c5f1574b30138a80ac4eb501374e22109bf20c4bafc21105cea7030d30f68fb9f48e77400b028f30c37be SHA512 0d6c04a45af66f8d849225e87158f33e8ec218943008dc385c5b13187f816d7e7a2fb485ab1a230b8d5e2ab23fc9fd18efc57ef3f15dc5caefad9b75cd149de1
 EBUILD pebble-4.6.0.ebuild 510 BLAKE2B cb9c2017f85d06beb9df63c901351ee73bad131dc63dab9853d173e8b9c5a9128040b5c5a2cb84367a9ebbeec24541360e251fad269d754b79b1e92d3dcfb7f4 SHA512 199f6e506ce12107db7d0ceeccd9aaba661437c7ba208f693afd4304e3159ae3bc5985a45bf5da491e458aca1befaf40599ec63c89a387dc58e7bb1b7b02f12c
+EBUILD pebble-4.6.1.ebuild 512 BLAKE2B 3906caca67b246b5890e1ceff1d003878ea014e688aa48cec31f024eeadfd8f47264952e137de0fbbd12785b45744d8568b4be226b49bfce2a234972efa25905 SHA512 9b8e3ae23c5afccb8250617b3e1e25ce9f585ccd51101d06cedc0b47300d3ff897314507a2b8b616cc70ade788aff44a446c52ac12f2912d330b5414fa78ff4e
 MISC metadata.xml 366 BLAKE2B 65d8f6a8f317f3d4dc671ecaf51954d904265d61c261e5e52dbb09f2fe963875a325bca94ae6028690ace79fbf03e9277353511e736a8fcf05e446f9736ce0bf SHA512 bc3e0a767e97e35202912e6d52a4104daaaa9ecedc8f42b35651f94d76bb3b187ed0d2a74c9c024f84904b0d12384d6772550d7d206ce4788775fb1497319e88
diff --git a/dev-python/pebble/pebble-4.6.1.ebuild b/dev-python/pebble/pebble-4.6.1.ebuild
new file mode 100644
index 000000000000..7ef364dc27df
--- /dev/null
+++ b/dev-python/pebble/pebble-4.6.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+inherit distutils-r1
+
+MY_P=${P^}
+DESCRIPTION="Threading and multiprocessing eye-candy"
+HOMEPAGE="
+	https://pypi.org/project/Pebble/
+	https://pebble.readthedocs.io/
+	https://github.com/noxdafox/pebble"
+SRC_URI="mirror://pypi/${MY_P::1}/${PN^}/${MY_P}.tar.gz"
+S=${WORKDIR}/${P^}
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+distutils_enable_tests pytest
diff --git a/dev-python/peewee/Manifest b/dev-python/peewee/Manifest
index 44f5e42848c5..87adb76e51ae 100644
--- a/dev-python/peewee/Manifest
+++ b/dev-python/peewee/Manifest
@@ -1,7 +1,9 @@
 DIST peewee-3.14.0.tar.gz 877299 BLAKE2B 25d0027354258c3b2a4db0765f8dac23527816c24afdaf20252e244cfec383a4ae4f10a29ea0f801d5c38406f8c17bcc6fef881b4bce96ed45920a8865868e80 SHA512 083bb24952a6d05cd6c8376e185e050df0ab5b37bc553241128b0ed3b0ebdd322d9626c32943658324d413cff8ab0bb2ddf6c84d99a0fbe057c0e5c8ec93d7f9
 DIST peewee-3.14.1.tar.gz 879443 BLAKE2B f7a1967006e517c56a4a2b10bd9c097e87dca4135038676b096431e6927fa6f0a7e2ad13c036a1a7499a9b3a140a4d4796399f9c1e727e7e8a0770ef3483a3ce SHA512 f8b8bddd1e32e05d75a2f1cc5fcc8b9d98397107e4e4d3b19b444f20f4b8243d740643c858d20fd0ceb8b30de859fe17079fc611ac21cf289c417e1f857f1f0f
 DIST peewee-3.14.2.tar.gz 881173 BLAKE2B d784f133b9119e8c769d4259360f73c801129f1eb498591f716427d54ee518e74d851cec951ebb65605f50e18eccd1cdd9e6b5fbb527679345bb681d2248b30e SHA512 8473cbe8df69c4aeb6d8fe7e13fa5f7e462ad8827d67698e244b44944532289ba7941f4294c21f12ee51378037bc9ba2ed28a9682e61ba1c67a7c04eb72ff6b5
+DIST peewee-3.14.3.tar.gz 881613 BLAKE2B f64a73c9e8fd94b67023cbb360ce4dabfd373319403a7c942a1f845d962200ff432b4b8d84482c9e42bc5251fbafb05855f308b3aed818c14dc0191ef4e84661 SHA512 e8b3698e5c48e917b7eb4f9572590a66d792abe8ac15157935fbcc9478580f4ca41a0704cdd7412f853e63a8750ac2d5d5075c9a67d0d67d5d32bd5c8048b6b1
 EBUILD peewee-3.14.0.ebuild 753 BLAKE2B 3bbf8da2196374f36d4947a258e8b09e078d1618f7f2d6ab91bd47b3e0dfe09b04df345a24a8bcad55e758f857838c1c21425ccc775818057f8905234178ac61 SHA512 e8327280be86e1c60a3cc6fd8ab0894b235f3c8388d95b453dd63e61a3bfd6cec32a0cd718e6746c8b43267bbab7d8c008ef5f742d72738e53129855391173b3
 EBUILD peewee-3.14.1.ebuild 755 BLAKE2B dc9d43fe216113450d0a211fb0d74723a24fc3f895fb33353a840d2a0eb8bed5692a04cead776e5f22107c5306e27e30e1b0d05a07698ea53f9e9004b4186559 SHA512 e607644cfc8305bb00bef66436afa638577fab33ecf54857ad5bd06a72837beb357f6ea794061a876379b8910c877951697d6e222b5a1b2283d534ac337e10b6
 EBUILD peewee-3.14.2.ebuild 760 BLAKE2B 78fd7e2744f2550b508c23bd79c0c3c851b86bd5bb5a6042fc41ecd74aaecd7b0dd7d464ba5b7f98d976cd87c2c2a4b633838041affad4c203f373e1b5f99709 SHA512 d5a1b47be6c8781bdfb722c7367f92c2d3ba075e2bd0299769333d04d8e486739fa7a869de0b6467c3a37c9eff2e51ce503349113bd832456669fc61b2605c76
+EBUILD peewee-3.14.3.ebuild 760 BLAKE2B 78fd7e2744f2550b508c23bd79c0c3c851b86bd5bb5a6042fc41ecd74aaecd7b0dd7d464ba5b7f98d976cd87c2c2a4b633838041affad4c203f373e1b5f99709 SHA512 d5a1b47be6c8781bdfb722c7367f92c2d3ba075e2bd0299769333d04d8e486739fa7a869de0b6467c3a37c9eff2e51ce503349113bd832456669fc61b2605c76
 MISC metadata.xml 364 BLAKE2B a14159b1b72a7138b6df21d06f487b2bf4e0d71297eecdd345343996327713a34fbaff5d69d9dbd4664b3aec116b8bebe98f48f5f672922cd0f029563d28942f SHA512 b60eca92f270da62f8c55a42a6b69d26f1ef888afbe62bb58d489b890e748a6bebb1f6048bc30e4f5c85fd47be4f6d95c6b5fbe125ce1be293ce7e7514691356
diff --git a/dev-python/peewee/peewee-3.14.3.ebuild b/dev-python/peewee/peewee-3.14.3.ebuild
new file mode 100644
index 000000000000..618fc5042135
--- /dev/null
+++ b/dev-python/peewee/peewee-3.14.3.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_{7..9} )
+PYTHON_REQ_USE="sqlite"
+
+inherit distutils-r1
+
+DESCRIPTION="Small Python ORM"
+HOMEPAGE="https://github.com/coleifer/peewee/"
+SRC_URI="https://github.com/coleifer/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	test? ( dev-python/psycopg[${PYTHON_USEDEP}] )
+"
+
+distutils_enable_sphinx docs
+
+python_test() {
+	"${EPYTHON}" ./runtests.py -v 2 || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use examples && DOCS=( examples/ )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/phply/Manifest b/dev-python/phply/Manifest
index 76b20991e72e..a44989dc49e6 100644
--- a/dev-python/phply/Manifest
+++ b/dev-python/phply/Manifest
@@ -1,3 +1,3 @@
 DIST phply-1.2.5.gh.tar.gz 35624 BLAKE2B 99fe9704cef570ad3055fa6c5aaaaed866d3c41c1479efbd29bb3224ae666d2ba13ccca61e6d67a8a0da4542dec79b5fdd201254e1ad638de81fa762049f4d13 SHA512 f0e4d0a6d2dfad5163fb68660602482b6de58c0dbd60d8db2f1df0622a9da3cc24e5fd309299a4a9ccf7abde081644a9a91fac8a2800520859199060f4080dc4
-EBUILD phply-1.2.5.ebuild 802 BLAKE2B 8d20f5b84baad742ec99271d219e74ec8794950abd000150a39ffbfecb7c2f35bb52803d307faf99ef6011fa6e9b905068a084e7cf01a1ddd3d6a220e59c1c16 SHA512 635a363785a5fba51a399fe5b5f336d69513e8fa40bd74581f9d840068845fbd657634e3e61d1496dc3df68962f0cb9ff425545846f4f156f1e127240411ca48
+EBUILD phply-1.2.5.ebuild 800 BLAKE2B 350db63dfb4f5389b09aa90c9893157b3f0b042018e0dcc525265beedf5b2797b9b4b94851146395134ade3a54be7a8629c96695382ef867b513b7f901b61fe0 SHA512 fdf089f769aede01295d47c0b8e0d8019a91243de8bf72c1446351a25db8d67565ad479575e4acbaee07ab028f4b43d3ba03a55bfad6fad55e80c56ab2e1c930
 MISC metadata.xml 364 BLAKE2B 32f89060e0ce7bed45287e0d206ba333b07888c7b32c6e76f916c7a153cab420440f4cc9a0b16e9747949339155ac013696f65ce4e4d7dbda69aede6fb8531f2 SHA512 67ec43a111b7cbdd46954b82baa2d528d2cd86d25f579500bc556069b67aa5055abf78dfc3c51afd095e282a240c295f5503ff5a1c0292a996d3f2315fbe27f5
diff --git a/dev-python/phply/phply-1.2.5.ebuild b/dev-python/phply/phply-1.2.5.ebuild
index 15413f1e50a0..ac2a2fcfc582 100644
--- a/dev-python/phply/phply-1.2.5.ebuild
+++ b/dev-python/phply/phply-1.2.5.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 RDEPEND="dev-python/ply[${PYTHON_USEDEP}]"
 BDEPEND="${RDEPEND}"
diff --git a/dev-python/pikepdf/Manifest b/dev-python/pikepdf/Manifest
index 8a146482a06c..5dce2b38a2a9 100644
--- a/dev-python/pikepdf/Manifest
+++ b/dev-python/pikepdf/Manifest
@@ -1,9 +1,13 @@
 DIST pikepdf-2.5.2.tar.gz 2368463 BLAKE2B dcf7e2c6f8a2a9d41073f2528fa6a13d5d79c0915d4dba810fb13a989039beafebbbfe0c8211f0a769ade9889af0c99ce1ca5052c74d0d88d817447dfdb3a7d5 SHA512 52e13805d4712f623af6c91eb287009abb6179d28451ab0a32b3472c4b8e484cc5700c3a32bb98cd7a188d4249128b2a2ef7fb19e8bc5aee4488627df161c38d
 DIST pikepdf-2.6.0.tar.gz 2368553 BLAKE2B 9bffcb7ed046f0337392fc27bcdaf8bc7ddd451d6c238fc5cf7ef952658f154e6cd0ae553f84fe10c4df946756fb8011a449e90b7f886db11b2330fe452f75d7 SHA512 0a57df99156dfe34d129231cd9ee703cb4d00f44d65e767aa71d7094e1e0896afda1d8f770f4efa33e156ac083ede9741ac7765a415a101bf38f1eab8da04bf1
 DIST pikepdf-2.7.0.tar.gz 2369537 BLAKE2B e37f77a5ce9e76f05c73b1a517da0f470d437ef41e49ad922a2f29c46f74cba9570aa1e3f9dffeacfe2bf31f6abee27bc393200620ebf23184f80ce3b40a93c3 SHA512 d3291e15461ebf9cb20d6ed145d6327e25595375a0b9e4ca9f6ee26a4b698d094f8f938cf766ee530cdd565b0f10bec78f228f70479e2777907376d24ea3b34f
+DIST pikepdf-2.8.0.post1.tar.gz 2370159 BLAKE2B 336f2034f3a0207d1f5522b13ff2d0a02945862341eab78de00276cfeb9cb9c2bce17d2951b388045ef40e59bbb225988ed6443642a129b1b088908326c04bfa SHA512 8021afbc33625d5990543e315769534b9c886cb1487ad20ef00d00246c6b58edc0104f717fcfc575347e33533144af79114c5828303901d907d4756a052fcfba
+DIST pikepdf-2.8.0.post2.tar.gz 2369810 BLAKE2B 67b2f88a0718076d9f28148342832ec646443b6bdf0f9ca3717a9a9caa6518563564f25e4532c3ebc5d05e18b78f2db4a9bab17f0d0cf6cf329dcc41f7c3332f SHA512 adf28106dbf58bf4b29c3930280c6f54c04ac4fc40adb4d9e7fe3a288293b077f2e4b063e4be91e661c835b474ba2b46167ce05d9f5d2c7c13ae180f6b3b76dc
 DIST pikepdf-2.8.0.tar.gz 2369623 BLAKE2B 465fbb682b973631d50b841b292ed8d86b5ff51f8466634c59c22cd86c56ace5594b74c2e36668f5f40f18ac55278978a59b0cbbc3e66d0ac49b6a6d7fe97a00 SHA512 8be9dbb20061352b482e1e4dd81cbede7cc99c294ccf7f5741b46f68244537cba225ce88e113b76e049ad5db70bfb075a8993fca1d24d99e0296e318b5107435
 EBUILD pikepdf-2.5.2.ebuild 1482 BLAKE2B ed869023041dfd2868624ad0e1e1c54bb93c2f19575ab2747d9f917911e0f9828b1a26b3e48749f8b14b5415ba9aed3ba168eb1eb6e8ef38f2bfa7d3e78ac596 SHA512 56732bc004bf3aa895df1ab72912e7941084a196a075be91357dc30eb19f87177318b2fd39ef7edb264fa7ec3e6f41598d84b749bb8a09af7efe2bd249c47a7b
 EBUILD pikepdf-2.6.0.ebuild 1483 BLAKE2B f22d7d4699cc989de5b7f3786a38713a9a67497646a759d2bcb19b8a615d711945ab634901f5b13595881ec51db32d2d6551b82aae72bf51db4bd8a14adc504e SHA512 83a16a80169e09fc31c993782523c9b0738341e042d24ff3cb3c2c0b17445ec3972906afd492d0b7dfa38441abd15ee83d62d6a247d8499b746bf7ddaa4d4234
 EBUILD pikepdf-2.7.0.ebuild 1483 BLAKE2B f22d7d4699cc989de5b7f3786a38713a9a67497646a759d2bcb19b8a615d711945ab634901f5b13595881ec51db32d2d6551b82aae72bf51db4bd8a14adc504e SHA512 83a16a80169e09fc31c993782523c9b0738341e042d24ff3cb3c2c0b17445ec3972906afd492d0b7dfa38441abd15ee83d62d6a247d8499b746bf7ddaa4d4234
 EBUILD pikepdf-2.8.0.ebuild 1483 BLAKE2B f22d7d4699cc989de5b7f3786a38713a9a67497646a759d2bcb19b8a615d711945ab634901f5b13595881ec51db32d2d6551b82aae72bf51db4bd8a14adc504e SHA512 83a16a80169e09fc31c993782523c9b0738341e042d24ff3cb3c2c0b17445ec3972906afd492d0b7dfa38441abd15ee83d62d6a247d8499b746bf7ddaa4d4234
+EBUILD pikepdf-2.8.0_p1.ebuild 1539 BLAKE2B 841c0a3650d5cc0f09cc3c076fbb5050d2c2e34c636c0ab8afc0ddce709dc46d7a2feb723026ab6c3f2bae636b3c6d10f7127de6d840efe1c10577dc941fd9c0 SHA512 a4ac1019887e723a6562a0f0e2d97f6c7049f469409be3abcf08ad8b9d72b5b99b254b7d319b58df88f86c7a6f0ec6b03f7ccc6de3b3573c860a6b022200fe82
+EBUILD pikepdf-2.8.0_p2.ebuild 1539 BLAKE2B 841c0a3650d5cc0f09cc3c076fbb5050d2c2e34c636c0ab8afc0ddce709dc46d7a2feb723026ab6c3f2bae636b3c6d10f7127de6d840efe1c10577dc941fd9c0 SHA512 a4ac1019887e723a6562a0f0e2d97f6c7049f469409be3abcf08ad8b9d72b5b99b254b7d319b58df88f86c7a6f0ec6b03f7ccc6de3b3573c860a6b022200fe82
 MISC metadata.xml 686 BLAKE2B 1f1d046dfc50cdcd7a3fe3f7b0c059cda23dc88173e5024a9c267dab6e061693d29bd41de17b26a957e674daeb0330d0040fb354f0ff2632f29bfd7cfacf1a9f SHA512 55fc4fdc78fd0f9c9edbb7a6dc62a946086c98cd4a0779e4ff73c462e14634db0f3b67ba79aa7758831a365cdacc7e931be66d16680c8055895468e08f285bbe
diff --git a/dev-python/pikepdf/pikepdf-2.8.0_p1.ebuild b/dev-python/pikepdf/pikepdf-2.8.0_p1.ebuild
new file mode 100644
index 000000000000..2a76869d388e
--- /dev/null
+++ b/dev-python/pikepdf/pikepdf-2.8.0_p1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+inherit distutils-r1
+
+MY_P=${P/_p/.post}
+DESCRIPTION="Python library to work with pdf files based on qpdf"
+HOMEPAGE="https://pypi.org/project/pikepdf/ https://github.com/pikepdf/pikepdf"
+SRC_URI="
+	https://github.com/${PN}/${PN}/archive/v${PV/_p/.post}.tar.gz
+		-> ${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="app-text/qpdf:0="
+RDEPEND="${DEPEND}
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/pybind11[${PYTHON_USEDEP}]"
+BDEPEND="
+	>=dev-python/pybind11-2.6.0[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-4.1[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/attrs-20.2.0[${PYTHON_USEDEP}]
+		>=dev-python/hypothesis-5[${PYTHON_USEDEP}]
+		>=dev-python/pillow-5.0.0[${PYTHON_USEDEP},jpeg,lcms,tiff]
+		>=dev-python/psutil-5[${PYTHON_USEDEP}]
+		>=dev-python/pytest-6[${PYTHON_USEDEP}]
+		>=dev-python/pytest-timeout-1.4.2[${PYTHON_USEDEP}]
+		>=dev-python/python-dateutil-2.8.0[${PYTHON_USEDEP}]
+		>=dev-python/python-xmp-toolkit-2.0.1[${PYTHON_USEDEP}]
+	)"
+
+#distutils_enable_sphinx docs \
+#	dev-python/ipython \
+#	dev-python/matplotlib \
+#	dev-python/sphinx_rtd_theme
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/wheel/d' setup.py || die
+	sed -i -e '/-n auto/d' setup.cfg || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/pikepdf/pikepdf-2.8.0_p2.ebuild b/dev-python/pikepdf/pikepdf-2.8.0_p2.ebuild
new file mode 100644
index 000000000000..2a76869d388e
--- /dev/null
+++ b/dev-python/pikepdf/pikepdf-2.8.0_p2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+inherit distutils-r1
+
+MY_P=${P/_p/.post}
+DESCRIPTION="Python library to work with pdf files based on qpdf"
+HOMEPAGE="https://pypi.org/project/pikepdf/ https://github.com/pikepdf/pikepdf"
+SRC_URI="
+	https://github.com/${PN}/${PN}/archive/v${PV/_p/.post}.tar.gz
+		-> ${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="app-text/qpdf:0="
+RDEPEND="${DEPEND}
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/pybind11[${PYTHON_USEDEP}]"
+BDEPEND="
+	>=dev-python/pybind11-2.6.0[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-4.1[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/attrs-20.2.0[${PYTHON_USEDEP}]
+		>=dev-python/hypothesis-5[${PYTHON_USEDEP}]
+		>=dev-python/pillow-5.0.0[${PYTHON_USEDEP},jpeg,lcms,tiff]
+		>=dev-python/psutil-5[${PYTHON_USEDEP}]
+		>=dev-python/pytest-6[${PYTHON_USEDEP}]
+		>=dev-python/pytest-timeout-1.4.2[${PYTHON_USEDEP}]
+		>=dev-python/python-dateutil-2.8.0[${PYTHON_USEDEP}]
+		>=dev-python/python-xmp-toolkit-2.0.1[${PYTHON_USEDEP}]
+	)"
+
+#distutils_enable_sphinx docs \
+#	dev-python/ipython \
+#	dev-python/matplotlib \
+#	dev-python/sphinx_rtd_theme
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/wheel/d' setup.py || die
+	sed -i -e '/-n auto/d' setup.cfg || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/pillow/Manifest b/dev-python/pillow/Manifest
index 571797ba631f..a7c8a9dae3bf 100644
--- a/dev-python/pillow/Manifest
+++ b/dev-python/pillow/Manifest
@@ -1,3 +1,5 @@
 DIST pillow-8.1.1.tar.gz 44976395 BLAKE2B 208534f3e24d9416360efaab8f802b4d482208fe81d1b39bf8339ddd1fe992b281a59faaadeb5ad5364ff062b1b7b19c3dadc11f9a453d5bd14bbf5170521396 SHA512 d04300442ac33e946bea186d6293516b615059b0f4b1b6ac7a48ce3a2e4e22bce5bc403331be697c022a4c81cb30f943cc33bfda649873c734af7db23afd6b69
+DIST pillow-8.1.2.tar.gz 45217041 BLAKE2B dbc7fb5c426c6a8f0efd218db5cd404c6b6a603054b36125ea687c69cca78ddd2e58712e8fe94460978bffe6bc059e5819d7ac6371bad11ee8fc1df445495c70 SHA512 32ffedf8cc8f2c21c241f41938d0521626ea05206d1a762305ac38abedecdf9bc8a6e5e2ded7565340e54797a4395acefb3b4d939ebdde8fc9583a1998bae34d
 EBUILD pillow-8.1.1.ebuild 2621 BLAKE2B a0df80c884d2ae46c5f02126e220dbb10330c35e25ccc8a24ba4ce451efe93aac0ce1f2ce753cccc286626a3841a46a683ef4c15435175e0caa6a46f7ee86e6a SHA512 3337dd0acc4a11306870d428a64e7af65f381d57ada6fe44ebdbd748eeef28b69d7081c6485fe93b38e93f33da734d7d398a91fd4b8e9e273624d4a687464fb7
+EBUILD pillow-8.1.2.ebuild 2629 BLAKE2B fe83d3ef84696b841bda4c81ecb331d2187ab00778246ef67942138e22267dbbea3eaafe8718520f3072c6157483dc52653a2716d8e723301b0467f963d31eea SHA512 665272d523162f76719895e3a3a0ba82736834e2675f96236968b702eba765456c0252c70eb06f825b16e72db847f750acd6b37c8ed0ba8f4e31a9e29d01d8a8
 MISC metadata.xml 479 BLAKE2B 8573c3f71b8e0d548f50dcb630a7c36d773ca8bb80f210bec320dc85bf12b70e9f30068dea615925c401726f0a5430827baa0104300abfd85060b522065c8d37 SHA512 473a9aea70516087faba8abddcd02bb76cb62711a5446fc5c58cedc0f0beb70cdef32e928ec293698b524d2e49440be2328567f84efeea4333477b7b9bd7a7d2
diff --git a/dev-python/pillow/pillow-8.1.2.ebuild b/dev-python/pillow/pillow-8.1.2.ebuild
new file mode 100644
index 000000000000..65a55a7139fe
--- /dev/null
+++ b/dev-python/pillow/pillow-8.1.2.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} pypy3 )
+PYTHON_REQ_USE='tk?,threads(+)'
+
+inherit distutils-r1 toolchain-funcs virtualx
+
+MY_PN=Pillow
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Python Imaging Library (fork)"
+HOMEPAGE="https://python-pillow.org/"
+SRC_URI="https://github.com/python-pillow/Pillow/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="HPND"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux"
+IUSE="examples imagequant jpeg jpeg2k lcms test tiff tk truetype webp xcb zlib"
+REQUIRED_USE="test? ( jpeg jpeg2k tiff )"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	imagequant? ( media-gfx/libimagequant:0 )
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( media-libs/openjpeg:2= )
+	lcms? ( media-libs/lcms:2= )
+	tiff? ( media-libs/tiff:0=[jpeg,zlib] )
+	truetype? ( media-libs/freetype:2= )
+	webp? ( media-libs/libwebp:0= )
+	xcb? ( x11-libs/libxcb )
+	zlib? ( sys-libs/zlib:0= )"
+RDEPEND="${DEPEND}
+	dev-python/olefile[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/pytest[${PYTHON_USEDEP}]
+		media-gfx/imagemagick[png]
+	)
+"
+
+python_configure_all() {
+	# It's important that these flags are also passed during the install phase
+	# as well. Make sure of that if you change the lines below. See bug 661308.
+	mydistutilsargs=(
+		build_ext
+		--disable-platform-guessing
+		$(use_enable truetype freetype)
+		$(use_enable jpeg)
+		$(use_enable jpeg2k jpeg2000)
+		$(use_enable lcms)
+		$(use_enable tiff)
+		$(use_enable imagequant)
+		$(use_enable webp)
+		$(use_enable webp webpmux)
+		$(use_enable xcb)
+		$(use_enable zlib)
+	)
+
+	# setup.py sucks at adding the right toolchain paths but it does
+	# accept additional ones from INCLUDE and LIB so set these. You
+	# wouldn't normally need these at all as the toolchain should look
+	# here anyway but this setup.py does stupid things.
+	export \
+		INCLUDE=${ESYSROOT}/usr/include \
+		LIB=${ESYSROOT}/usr/$(get_libdir)
+
+	# We have patched in this env var.
+	tc-export PKG_CONFIG
+}
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	"${EPYTHON}" selftest.py --installed || die "selftest failed with ${EPYTHON}"
+	# no:relaxed: pytest-relaxed plugin make our tests fail. deactivate if installed
+	pytest -vv -p no:relaxed || die "Tests fail with ${EPYTHON}"
+}
+
+python_install() {
+	python_doheader src/libImaging/*.h
+	distutils-r1_python_install
+}
+
+python_install_all() {
+	if use examples ; then
+		docinto example
+		dodoc docs/example/*
+		docompress -x /usr/share/doc/${PF}/example
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pockets/Manifest b/dev-python/pockets/Manifest
index bf024dda97dc..57a79ae63798 100644
--- a/dev-python/pockets/Manifest
+++ b/dev-python/pockets/Manifest
@@ -1,3 +1,4 @@
 DIST pockets-0.9.1.tar.gz 24993 BLAKE2B 9962655f755bb96853f1b4450f2bdcbd111ba945dc3a5cdaad84bb43a84150e7384ecb3c5758274b9cf578adc1c8991c163c56f72a00a00bf8fed634397e02af SHA512 436f2fd8cfb9c5612733b1163d381f52c28b8749de28f5e0de609d012ccfc10ad77a31851d3e1010feef5b517f287f1e5c7fc4b447e7b080e5536fdaf8d2e9d6
+EBUILD pockets-0.9.1-r1.ebuild 495 BLAKE2B be6d60d07e47f29ffb9365453ef7b7267117f06421cdf83a27f90caeea8c9094e9a9281113900120808360fc13e60acdddbed48c26eb45d51f026719c7560c1c SHA512 c641ea921252e0c9f79d9e01af1c2f02a2343e83338263c711b62be6d4331fa9acb37f9ae8438f1daccb369ce3e9136799e9a4909e09749c870c303bb92bd118
 EBUILD pockets-0.9.1.ebuild 483 BLAKE2B 9053ce2bbd69a691fb297566438084e838ff23ac490f63803c90c0ca4670275b51a60daacafff817d64fc64ea92b386c0eac12482b09dfefe241838694ed0812 SHA512 567721b7f139168950ff6d5bdc3ab3818a74910dfd0a50f37390c1f53f49a2f447f8d74df31025bc971f0deeae474a4173a31270d19ee96d59308b66141738b2
 MISC metadata.xml 331 BLAKE2B cb17ecc8fb5618d45d09af9211028e4876b6523792f70d20df4104b9dc72f132a592ba961d2571632e34a72f213eff0c06e02d1700c82d4f46ca48ea9d9fc844 SHA512 70933bb4063959e5fa091a416ba3aeb6e8540e03263fd8cfb5680165200e2716a90a19e03afbd9f746cd7ca7673bf309d47307c7e2f49b7f2609d77de65ed4fb
diff --git a/dev-python/pockets/pockets-0.9.1-r1.ebuild b/dev-python/pockets/pockets-0.9.1-r1.ebuild
new file mode 100644
index 000000000000..af890950b797
--- /dev/null
+++ b/dev-python/pockets/pockets-0.9.1-r1.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 python3_8 python3_9 )
+
+inherit distutils-r1
+
+DESCRIPTION="Collection of helpful Python tools"
+HOMEPAGE="https://pypi.org/project/pockets/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/prompt_toolkit/Manifest b/dev-python/prompt_toolkit/Manifest
index c15680e866d6..82103b35f7e9 100644
--- a/dev-python/prompt_toolkit/Manifest
+++ b/dev-python/prompt_toolkit/Manifest
@@ -1,7 +1,9 @@
 DIST prompt_toolkit-3.0.10.tar.gz 3020391 BLAKE2B 397ab28e5a362c84df7286be27be11acd4c6666bf77d63a1042cd76e6a4ee0b8002bad6166d858dfa6f07f8da41c6513c13fe2500b55da1dbc6562038ed974ef SHA512 71cdbe28064f28a2d88f369ee4550cc02b2609841b51d8fa7e8028304e77f34c6feed5d4549d62a3cbce27f95a4ebca1066a6fd869fbffa1799a3dedef2df6f4
 DIST prompt_toolkit-3.0.14.tar.gz 385647 BLAKE2B 08e4483846ba0e6cc69828840a0791e1b85a7db91718042e9a357741164183c0ccd241130c83b980b88884ba32bcb60714c7f920731aa6ca91186ed6f256bafe SHA512 7767861d9f6e5cf88b398420187e4b0a075aaa4645cd8c346db104101f89bbe7c0da2a6518c82066da5efa7376db5144451416ec7b12e92360972f8d4e25d018
 DIST prompt_toolkit-3.0.16.tar.gz 3033157 BLAKE2B 6f21544701f956a1e9ec29d049750dc47a6e3861e33a0ccc1e407185ece967c692d3f868e670779dadef3cdf5ec72bd6477e1b3ebfeddd84c267db94efa33f22 SHA512 fd8ebf4ceb61fb823a13bf81ebd6864e817541d08d0744eec8968afe9a9d44bfa95031fe7c53accc81a1612253041e742957aee3718dd18c437d8c3e1b616f35
+DIST prompt_toolkit-3.0.17.tar.gz 3033301 BLAKE2B 86ba94f2e0c9e998c53e5e4ed12961c85c667b6d0356d17cfcb1856aef933f88c1c525507e76a833970444a787641c7316bc7496787ffcd61102945ae91b73bb SHA512 ef78b3aaf953f20a035f8a1f58262a8e4c1ae6b88c02c523bc51237bed22f52e229488d0113901bcd94835cc7120ccb4beb75cc9c9d99dde4e8f21df7bfde8a4
 EBUILD prompt_toolkit-3.0.10.ebuild 601 BLAKE2B f5cd919989a08fa2deac507ab423247e62ed252cec0bc8fa2133065761690a9e0ea434f4a8581e94b59fc75552a653f0d73a9b7d5e15a14745a70ccc3eb871d2 SHA512 5d219c5ce75be08eae971241cc657f0299b6031d3a4b8cb550d032c488cca9e3910cf1843d5e8fb004a664850fb1f15e15b869d92d3cc0bfc0cc6e777ade503c
 EBUILD prompt_toolkit-3.0.14.ebuild 597 BLAKE2B fb5db05ae055ba17a8e0dd2f3db0a1e84053785b28db2a0ccbe37270cc96994a2ee74fe2764d168f079d46f22415125ce4ba6b427cfc21a7546b3b22d865e0c9 SHA512 bb1da9ff1bb8834d1fbc815395c4d0c50d3e551cabe8fc603dd9fb11bec0c466fd8f5fca2b3dd02a8aa8784e1d1b0f27994b9655110130455f873c9b60e101de
 EBUILD prompt_toolkit-3.0.16.ebuild 601 BLAKE2B f5cd919989a08fa2deac507ab423247e62ed252cec0bc8fa2133065761690a9e0ea434f4a8581e94b59fc75552a653f0d73a9b7d5e15a14745a70ccc3eb871d2 SHA512 5d219c5ce75be08eae971241cc657f0299b6031d3a4b8cb550d032c488cca9e3910cf1843d5e8fb004a664850fb1f15e15b869d92d3cc0bfc0cc6e777ade503c
+EBUILD prompt_toolkit-3.0.17.ebuild 601 BLAKE2B f5cd919989a08fa2deac507ab423247e62ed252cec0bc8fa2133065761690a9e0ea434f4a8581e94b59fc75552a653f0d73a9b7d5e15a14745a70ccc3eb871d2 SHA512 5d219c5ce75be08eae971241cc657f0299b6031d3a4b8cb550d032c488cca9e3910cf1843d5e8fb004a664850fb1f15e15b869d92d3cc0bfc0cc6e777ade503c
 MISC metadata.xml 430 BLAKE2B e3e66ce24a2ac8bbe9d6f6c0bef07dc0bbc3222ca281cf374abb492898428de9f84404b5575b122cdd1dcea44faf395350a14f4fa985d1ba29681ac673560132 SHA512 259a53798ccc14411b01184139e72d633473e2539d7c93911cf71db94bbb01166de3b3abaa76fa32b51e1107cf0ffbbc84644d8c8615ffd3a0e95b95e1f4c5f2
diff --git a/dev-python/prompt_toolkit/prompt_toolkit-3.0.17.ebuild b/dev-python/prompt_toolkit/prompt_toolkit-3.0.17.ebuild
new file mode 100644
index 000000000000..fe628251486f
--- /dev/null
+++ b/dev-python/prompt_toolkit/prompt_toolkit-3.0.17.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+inherit distutils-r1
+
+DESCRIPTION="Building powerful interactive command lines in Python"
+HOMEPAGE="
+	https://pypi.org/project/prompt-toolkit/
+	https://github.com/prompt-toolkit/python-prompt-toolkit"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	dev-python/wcwidth[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pybtex-docutils/Manifest b/dev-python/pybtex-docutils/Manifest
index 344217648652..354962325886 100644
--- a/dev-python/pybtex-docutils/Manifest
+++ b/dev-python/pybtex-docutils/Manifest
@@ -1,3 +1,5 @@
 DIST pybtex-docutils-0.2.2.tar.gz 12556 BLAKE2B fac2d669d7e71fdfae75dceae847693f5af00180b9b18a4afa4724578c1bbf66bcf9e89d29f2923d457602602508008ad10f2620ae405322ddce23dfbbd3e275 SHA512 5659d148a71cd1adb7243d06a09872f2a610dfbc3d3bf00b2b433cab0afdf5615646c195a68ee74815b5770654f584b7a994f89d5c0482f4355fbfd925de6a27
+DIST pybtex-docutils-1.0.0.tar.gz 13627 BLAKE2B 5a18c29fb64f9b19deb4699017de17b1d4a112e0739d84066c4eb0df9d51005fe3b0132a7d1e46e3dad5b9b8e41340cf1a4da094ab20dd140cc83a3a53d82ca8 SHA512 d0054c5ed27a8c57b85963c5f3443d53fe8edab8ce2cf924eeac73240d662a6ac3cf74b2e38601d708809ddbf0984b3c7f24f177c67f77039bc236360474fa38
 EBUILD pybtex-docutils-0.2.2.ebuild 550 BLAKE2B c2e4f7f9c86187f3b7cef9958b42520f581069ecebf66fb8eea66eb91862bd74db981e123be82c9d4212a42c26b2a48587e5e6fd4caf64b195084d8c6fd2c5e0 SHA512 b82b33269520d226dac81bd17693dedb4fc407cd67bca1d238209262e1e454031f880a18e4d68c94f0d014761379a1f91439063300ee3cd1dce3d9febe7c1e16
+EBUILD pybtex-docutils-1.0.0.ebuild 519 BLAKE2B cbbae5e244ac1fa35e72793e417ea929844bc1871e8e8070c1e38f38188d329f953de8e62e24269811d2fcf20ca54eeefd5588dc8e2ce941516406dad5eaf604 SHA512 cf105c7c72a509e9adea923063775492e3371c59a640cacb8ba557befe4bcb541b64682b219981083ccb0c87085164aa16119f320d80479743ef2b9cedd4e5ab
 MISC metadata.xml 520 BLAKE2B 64dc3b8876d4414593c121a311674bacebb561db03300ef8deaeb338a81eeccf5eba4ce73399aa363772e734740af130cb473e2e8de6c85c003a609edfc213c2 SHA512 bdf60da82f1dcc5fdac92f0c636f428e9808a705248e77dc3391421e4067badbc548d9481792fb27866b50a8487f9a6f714522f80f6ef4db354eb21ea08c20d7
diff --git a/dev-python/pybtex-docutils/pybtex-docutils-1.0.0.ebuild b/dev-python/pybtex-docutils/pybtex-docutils-1.0.0.ebuild
new file mode 100644
index 000000000000..450da88eb67c
--- /dev/null
+++ b/dev-python/pybtex-docutils/pybtex-docutils-1.0.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="A docutils backend for pybtex"
+HOMEPAGE="https://github.com/mcmtroffaes/pybtex-docutils"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/pybtex[${PYTHON_USEDEP}]
+
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx doc
diff --git a/dev-python/pychm/Manifest b/dev-python/pychm/Manifest
index 1517626194c1..9556bffcd63b 100644
--- a/dev-python/pychm/Manifest
+++ b/dev-python/pychm/Manifest
@@ -1,3 +1,3 @@
 DIST pychm-0.8.6.gh.tar.gz 23803 BLAKE2B fdf3c37eead60455fd5bde1638a010f2788074752f98c32cf4b3431b4a87b8893c23a9fa29995352b35b41f628b7026fdbfa6ff20b75e8a6efdf75fc2da3f67d SHA512 cc1b254b6c58aba038171ad9db1eea3212094d7fb9386b22ada67381d702b388e6a1dde0317b5724587ee135d2695c546a7c2d65af7091dafeb394647597b0ae
-EBUILD pychm-0.8.6.ebuild 490 BLAKE2B f28c3f8e687a66a8dc46a544b18674a641c9dc0821c819c2266a0482e76e9c6b0a6044f4b24a5beeaae526c2c2205c2b78bb69548a1c3c8b445b1bd52e7cf658 SHA512 c3fda95a29c554b8936fd4866126c5e7d30b3bb22d66fd77f99ad991815c0a2cdcae0a4a18dfd87458d8f5c88fd905e41349c2c071f00f795e376ff869ae3f8e
+EBUILD pychm-0.8.6.ebuild 675 BLAKE2B c36fd039d5458d9ba27c1ca0f5aae2df7ff74bb2689b27957b62cfeb6993aa00b8019493ad139afb305b8461930df534374b02b879baf4328885f548547f98f3 SHA512 c3ce090e8e8c54cb1211db39e496d78e77cc13dc1d2f7e219a5f78f3760ae60fe5f04d630b88653206026b0a12dff644d12bf6da6d1af64b916549449c9cfa71
 MISC metadata.xml 1024 BLAKE2B 4284f9d29a44bfb1997cc7e529bc28bef911febe769135b5837f5d81482d353e3377e162fa35f677a6ac1e29b1b467ee15caa1607ea789d3287d5a75f6db79a8 SHA512 f67597a0718d67bfc13216966d1a47f7192c17cbf939f10758c1ff09c761a07bfde094b1d4cf1c35acb872c6c6426cc1dc699a10f46448669ae645dd9f07507d
diff --git a/dev-python/pychm/pychm-0.8.6.ebuild b/dev-python/pychm/pychm-0.8.6.ebuild
index 90adc71074bd..3957210dc1f6 100644
--- a/dev-python/pychm/pychm-0.8.6.ebuild
+++ b/dev-python/pychm/pychm-0.8.6.ebuild
@@ -1,9 +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_{7,8,9} )
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit distutils-r1
 
@@ -19,3 +19,11 @@ RDEPEND="dev-libs/chmlib"
 DEPEND="${RDEPEND}"
 
 distutils_enable_tests pytest
+
+src_test() {
+	# need to avoid relative import of 'chm' directory but tests rely
+	# on locating files relatively via tests/...
+	mv tests .. || die
+	cd .. || die
+	distutils-r1_src_test
+}
diff --git a/dev-python/pydantic/Manifest b/dev-python/pydantic/Manifest
index 554f240ac07b..0df213ed8dfe 100644
--- a/dev-python/pydantic/Manifest
+++ b/dev-python/pydantic/Manifest
@@ -1,5 +1,7 @@
 AUX pydantic-1.6.1-fix-tests.patch 1616 BLAKE2B 80a3c209bd9a94aeef76b0aa564abd349cd458d767c73ab531d0a04df174f816ad2d237ee2fd53146e49d30dda449aeaf0487d890756b58eeea534a11bb9d923 SHA512 dfb6096266510fed229e24bffce280c45e72da5a2bb18cbba3bac6098e6175cc515d58c3dc8e0e256f58ff3bffb23fe123c815c7a538fe48b85d4e0304b5a830
 AUX pydantic-1.6.1-py39.patch 13658 BLAKE2B d9562e5f36fbaf9c9489d045d833499caa750922156d74936a18ca35db65c223ae19935b059225408d6070d6583107a292c726155f66d722505c3b9a41fe6d60 SHA512 a671b538a84857227da5e062763c86d9308e10fdbdc1ef04a1e07220f60280a089ea836fd1a0e7ef2f936c6cf02895efd39259eeb9cf1b9fe041e429579d808e
 DIST pydantic-1.6.1.tar.gz 244677 BLAKE2B 0a1d6986858ab753cbc4dd262bd268b2a365c241a7de106a7bf21714c6c499c7dbacaea095789d3503507965ca50106da32545be670ed0261827f1fe0316ff67 SHA512 b0442f78a661f56d29697da7e27393261420bdb0f08473d2f7872145a49a18de8c17c903d0899a44263bcd8229e8790161da032dd5a3d5f2dae347c66bd6a567
+DIST pydantic-1.8.1.tar.gz 300512 BLAKE2B a7840bd895c73c3049184fc2c4a165783fd68a82290c3826be53667e7b7919580493aff9f2aaa25274b0251da14218dd6f7a41c1cb3cb55f0fbb0c90f79b7833 SHA512 dc58ab2e411744e63408c952c92c589acf037e809c60b85e02f277af2c6342c99c4fbfa7a585f14e57256912c0e6471821973bd2f755aac3822eb3a7883fd407
 EBUILD pydantic-1.6.1.ebuild 1002 BLAKE2B 74967cc5755ab17a7ba321d2d59cae28b2665f26389dcd0769bdce7f4600b3bc89bbf370829d0f43e59e5c85b7c0ad8c0787d77a64cc08e7f68ea10f1e5ce271 SHA512 341ce3fe397c40be7271a1c25d32e334a2766066ca13525468da3b5b9980007346f7ec5e6a07245527c0c661ec58060036d850caaf844896bc9cb5e1d8e6f553
+EBUILD pydantic-1.8.1.ebuild 917 BLAKE2B e1db90e2bc6e8842876b77ab98b0c85dfdd3af411d1aa4e06300489942497e567f773782c7617aaa0adf73292d9abf66acce514a3fb9bb1338b596891b34e28d SHA512 d3baa0113efd4eaafc5734b9258ac1901cc26f3572246386c094ed7fe323547bec2f9c21326963b9ae37b96b1af15f70045166db02389403e7b6bb2a37e0320b
 MISC metadata.xml 491 BLAKE2B 1c17cf9901705ce6aa44e87902e2d52dbebf6c465ce3210b005ce0a2a69df04f91f90d3f8bfb3f44c1ce804bdb02bfd959920564b5e496ea58089fa77b4ccb22 SHA512 f7fd4fa24b1df7ecb7260f74569413af570c75df6e2c52fa59a8e01d030e4c0bbef120e53f6c3a6b0ad8100d8797c86dd8c1586f86f02c3a740362f6f0b96479
diff --git a/dev-python/pydantic/pydantic-1.8.1.ebuild b/dev-python/pydantic/pydantic-1.8.1.ebuild
new file mode 100644
index 000000000000..26b8dccc514f
--- /dev/null
+++ b/dev-python/pydantic/pydantic-1.8.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Data parsing and validation using Python type hints"
+HOMEPAGE="https://github.com/samuelcolvin/pydantic"
+# No tests on PyPI: https://github.com/samuelcolvin/pydantic/pull/1976
+SRC_URI="https://github.com/samuelcolvin/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/typing-extensions[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/python-email-validator[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# seriously?
+	sed -i -e '/CFLAGS/d' setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# TODO
+	epytest --deselect tests/test_hypothesis_plugin.py
+}
diff --git a/dev-python/pydata-sphinx-theme/Manifest b/dev-python/pydata-sphinx-theme/Manifest
index cc8f8d660fd5..19a14fcabc07 100644
--- a/dev-python/pydata-sphinx-theme/Manifest
+++ b/dev-python/pydata-sphinx-theme/Manifest
@@ -1,3 +1,5 @@
 DIST pydata-sphinx-theme-0.4.3.tar.gz 3279359 BLAKE2B c2a57fc7dd70f8d57a0b56bb45907615658b1dbb705f177fd40e04995754180dd637256618b36b0a6ee59e865558eb013d191f2a5f461365f07cf647427056e9 SHA512 9f4f0b1fab88e92302211957df798a7e1bbae034e9935260f94959bba50bc3384ef818ff0cdcd04c3a4b4d09a5285c3d165e35fa3114d6dbb15452cc6895703f
+DIST pydata-sphinx-theme-0.5.0.tar.gz 2556070 BLAKE2B 10682a631314991b89e05f95ec67b133a87391a00048a06505cb6c38d4106cf7162c9d150866d0099a18512164e59224601fd0e132e4c1de56b47c42ab357f9b SHA512 12731065d463cffadb78b50d31815eadc41ce5214087c7b5d859fe58bb672e318323880a9b915c7d4e5b47e5bf9a8a1b90d14695f2440e4f70d129dbe5d3a40e
 EBUILD pydata-sphinx-theme-0.4.3.ebuild 978 BLAKE2B c1195609b74e8a79b596d12ca3546ec6e2a338c4bac68bb5aee54d206a8954038fc4d2b88380703f7db0a516d33eadae8557fced9194b07a9589723536aab1c2 SHA512 8bfd6a630fce8520733d012c22b3496786dc35d3f5a252f5e5b23a05e58b5a971db4feac105ea69682ceeafc2a07f83d0e4dedabc38cfd93a21ba4e43da6b895
+EBUILD pydata-sphinx-theme-0.5.0.ebuild 883 BLAKE2B 14b08df2c133696eef59bcb47ad391802af4deab48a63fe0f119e6fd59b8cd7678ea5b9526a69db83edae0f2dc537695f3f84ad58c2e437eff5f339ae1491d33 SHA512 6a98b8f53cd49c818dd9e704894646d37e28f401170faf45a74379ba97fcbe6b2c79a690b9c2c0c6e36e6a30667a52905557d9d7f60d086ee915ff058ecda1ab
 MISC metadata.xml 582 BLAKE2B b4438cce7d7df99e76b61279181bfe6b249df6fad33895afeec44bfc25f44589804b51c6542bc7f75866d7b30a10d9b083bbf57de27808e55db15f0517c096a9 SHA512 3f2984b687c60d565bf1a2b8890b6c044c138484003fd67589035f5a1217c866f0157e0ef9956ccf5c35adf337be822ca34dd3c70394855c7c4916bca15deb17
diff --git a/dev-python/pydata-sphinx-theme/pydata-sphinx-theme-0.5.0.ebuild b/dev-python/pydata-sphinx-theme/pydata-sphinx-theme-0.5.0.ebuild
new file mode 100644
index 000000000000..50298065c09c
--- /dev/null
+++ b/dev-python/pydata-sphinx-theme/pydata-sphinx-theme-0.5.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_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Bootstrap-based Sphinx theme from the PyData community"
+HOMEPAGE="https://github.com/pandas-dev/pydata-sphinx-theme"
+SRC_URI="https://github.com/pandas-dev/pydata-sphinx-theme/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-with-disclosure"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	test? (
+		dev-python/beautifulsoup[${PYTHON_USEDEP}]
+		dev-python/pytest-regressions[${PYTHON_USEDEP}]
+	)"
+
+RDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]"
+
+# ModuleNotFoundError: No module named 'plotly' even if dev-python/plotly is installed
+#distutils_enable_sphinx docs dev-python/commonmark dev-python/recommonmark dev-python/numpydoc dev-python/jupyter-sphinx dev-python/plotly
+distutils_enable_tests pytest
diff --git a/dev-python/pyglet/Manifest b/dev-python/pyglet/Manifest
index f82027be7d66..7e51106964d4 100644
--- a/dev-python/pyglet/Manifest
+++ b/dev-python/pyglet/Manifest
@@ -1,7 +1,5 @@
-DIST pyglet-1.5.13.tar.gz 6415241 BLAKE2B 784e387072ea7260c5fc3f0c78869e62d42a68b7ca1208318af3dad77d64d6ca8d12b03c040ce1dca8430cbab31f218c2a1782ccfcaaf3637203e1e9638488b8 SHA512 05863b187653cb82d7727d7d33a65d9907030ac97d926d6dac01301817159c31d4a301570f41ad8e2af9e0509f67008b876e7f3460f31c6d58d5548179cba4ea
 DIST pyglet-1.5.14.tar.gz 6414252 BLAKE2B 3e30f4dc80fffbf93a3cc7fa744ba224868dea1d9f1998446a2341fd3ed1c058493c486979aedb8415abe5c8a3f53dc634494f849bf6f3ab6f9ceb0e35cfecd9 SHA512 9b34e80e1b28a2ef0504339b67bdc31e568bf3a3352a9a1d78d3cf87ba84e86e23aec6e524abbca26865082ec2f9da8d7633ba83206f9996d87002faa1269044
 DIST pyglet-1.5.15.tar.gz 6429039 BLAKE2B 5835d2c8c0c6e309664bea4a4001d0b68622379ae27555b640ed4441cb4319bf4ffd2b491cf789cba5639b9ca43e047f1e2cf820e540123939dd386a4c88fbf3 SHA512 0ea6f936895b0f17d7272866ecec7721ae1fb353af3654c49bb09eb81729f939df07ba3cdaf8b8bece345a8f144d56a45dc23d82e1887db306fd08c7989c688e
-EBUILD pyglet-1.5.13.ebuild 1291 BLAKE2B b1dbd7878bc4b209f007ae0993a2bc8368a76098d7d9179b221bdf02d296a7d8be9b03862b5b41192d3ddaa923d478ec6dcba3c9f827120680f58da37b189739 SHA512 dea783a7a0b2a20e6998c7d37dc4fdd6ea2b4dd4af6c904801c3e993dd183a28038da89ff06adf1b3303b38fcd8a578ed6effdd8068e1c5c1ef5dc8902defd63
-EBUILD pyglet-1.5.14.ebuild 1293 BLAKE2B 209f13b197ac97780cde942142bf1d594649f74a1f0b2800c9b96069b7edf6c062da16e0297696965214a4e2e8b2aa54f55e0b0089b1e670561292a1f4e73d76 SHA512 172906464af3010afc1e49ecaf2df264d1f91c616b2feecf25a832e09148a46120c47367eaf5f9f90e4a038e1d67321dd78e2ebb28a0207c505c23b15dc60bbe
+EBUILD pyglet-1.5.14.ebuild 1291 BLAKE2B b1dbd7878bc4b209f007ae0993a2bc8368a76098d7d9179b221bdf02d296a7d8be9b03862b5b41192d3ddaa923d478ec6dcba3c9f827120680f58da37b189739 SHA512 dea783a7a0b2a20e6998c7d37dc4fdd6ea2b4dd4af6c904801c3e993dd183a28038da89ff06adf1b3303b38fcd8a578ed6effdd8068e1c5c1ef5dc8902defd63
 EBUILD pyglet-1.5.15.ebuild 1292 BLAKE2B de30eb98ef60ee5e09a2a5c9672ec85400221fecafa73172d6859e4f8a2e6d06301cf3ffc3943ae187e12d66cc0320d991f218968b88fde945dfb2b0cffb36d7 SHA512 1db556f81e7f173655ba6d323d10f91a625f17e313ddcd910f9558ef8340861190a1b74fdbad1ee7dd85d8ac4ecf0b9ed069ea8f37f635fa48685a729a23fbe6
 MISC metadata.xml 996 BLAKE2B 74fda944aaa3954eafb31e21741f8cb599c9f8bff46c662a598cb384da9770d3160302b37ce8cbe9ddbc7dfe63c594614783afa568ab4be5e73db502fdc3a095 SHA512 a13a1aa2134de7bc7e007f81540631623c5a3fc1f5bfd4b6f7bc744eff8cc037da321292aa968184d324099dbfd87f608d7c0a2aeea90707c27aee5532a1fe15
diff --git a/dev-python/pyglet/pyglet-1.5.13.ebuild b/dev-python/pyglet/pyglet-1.5.13.ebuild
deleted file mode 100644
index 24ad840b7173..000000000000
--- a/dev-python/pyglet/pyglet-1.5.13.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit distutils-r1 virtualx xdg-utils
-
-DESCRIPTION="Cross-platform windowing and multimedia library for Python"
-HOMEPAGE="http://pyglet.org/"
-SRC_URI="https://github.com/pyglet/pyglet/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE="examples image +sound"
-
-BDEPEND="
-	test? (
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/gst-python[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	virtual/glu
-	virtual/opengl
-	image? ( || (
-		dev-python/pillow[${PYTHON_USEDEP}]
-		x11-libs/gtk+:2
-	) )
-	sound? ( || (
-		media-libs/openal
-		media-sound/pulseaudio
-	) )
-"
-#	ffmpeg? ( media-libs/avbin-bin )
-
-DOCS=( DESIGN NOTICE README.md RELEASE_NOTES )
-
-distutils_enable_tests pytest
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	xdg_environment_reset
-
-	# Specify path to avoid running interactive tests
-	# We could add in integration tests, but they're slow
-	pytest -vv tests/unit || die "Tests failed with ${EPYTHON}"
-}
-
-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/pyglet/pyglet-1.5.14.ebuild b/dev-python/pyglet/pyglet-1.5.14.ebuild
index 30633644f236..24ad840b7173 100644
--- a/dev-python/pyglet/pyglet-1.5.14.ebuild
+++ b/dev-python/pyglet/pyglet-1.5.14.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
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/pyglet/pyglet/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="examples image +sound"
 
 BDEPEND="
diff --git a/dev-python/pygments/Manifest b/dev-python/pygments/Manifest
index 29e595943bb1..6d39094b920c 100644
--- a/dev-python/pygments/Manifest
+++ b/dev-python/pygments/Manifest
@@ -1,5 +1,7 @@
 DIST Pygments-2.7.4.tar.gz 2325473 BLAKE2B 48e45f8d58e4d06be71cacbfbcbee57c69fe0b4c344c1dde2054912f1b74c67db19c24de2661acab7026ea78420ff90e4596e1a89b783ce79ebea12c8d3a7a60 SHA512 84fb2e0c52e4683d52524ee1d70c11a9ff6cc0b21fe6aa3e1a6c4fac393f87267756b1c04b7c2555799e387b2e9ca7d2e7703ddc1690a642aa263ed27510e030
 DIST Pygments-2.8.0.tar.gz 3999484 BLAKE2B 5267a4a9e18a01897906239d2cb4f508675e0de3d9a33ae9b144424b18883da53937d92755f8ab1ddc7b10a248031fb693b4012407079aca1d08c8924360e75d SHA512 7e3dd2119769b704d6bbd4867c85eedb0d3c8ac415280fb35a1194284511c6fe6c5696bf6515e14da7a944b7ad5aeb945a71e79abcd1a42949ca30bbfe2e31b3
+DIST Pygments-2.8.1.tar.gz 4000119 BLAKE2B d88a3a3b4626a33c375b85ec076120e3561d1719ce45f9f85595bf87f7e813416be934f7ea0022fbfbf1a8ba3f2be1c76f693ab9ece5325fe527a4922cf46318 SHA512 223835c78615207ad590d364ba9a0f4bc9b5815baa080e60b9b71ce7b8e1ebfcc7a292d2a2b1cd358c08d820fc89e02c4060876d37ee17fd9e2759c9a0dcc80c
 EBUILD pygments-2.7.4.ebuild 1234 BLAKE2B 1abc07b72f10c8bbc95dc597052682911eed7fbf49b3e9f37fec207cd602c3c4837200c84eaf00abccbfeba93641caa1ff033379902f69a04479c17cf72856f7 SHA512 cbe478ba3832cf4a28fac676e2608e7758052e4a166316a77fd26a69eb20995b4d04939271ad40c54bd58d26c423667e6609fbee45dff4bc5c24a961efa13b5c
 EBUILD pygments-2.8.0.ebuild 1248 BLAKE2B a13c017b5279c248b9cda129f413d7f725955417fccf38a4a0ad3877cc13fecaa9f90381037139339af83777dfd01c0e5eff9e3621b45afa487621a486b18042 SHA512 5ddb26823783fda50bb0c97626cafae831ed16977666b88e093ebfc464d8919f5c689b64f40e9e15eefda9e3b8aa56b240ceebb3686228fcee88598d2164e7be
+EBUILD pygments-2.8.1.ebuild 1248 BLAKE2B a13c017b5279c248b9cda129f413d7f725955417fccf38a4a0ad3877cc13fecaa9f90381037139339af83777dfd01c0e5eff9e3621b45afa487621a486b18042 SHA512 5ddb26823783fda50bb0c97626cafae831ed16977666b88e093ebfc464d8919f5c689b64f40e9e15eefda9e3b8aa56b240ceebb3686228fcee88598d2164e7be
 MISC metadata.xml 556 BLAKE2B 87120b6aafeefb97b45a6895b23d08c6443cb177d5bc337845bec55ebdb59ee9eb19ef41c10b3ce4d61452c602f925b4120a441959b5b5d5fea26e15de4a1510 SHA512 b5f4491bb714e2abef07da4e960609aae651ceae3153102467e19bc4d06b9006418729f0b915cc026842253287786faa083d608c0ad5bd7f5c423922740580bd
diff --git a/dev-python/pygments/pygments-2.8.1.ebuild b/dev-python/pygments/pygments-2.8.1.ebuild
new file mode 100644
index 000000000000..eb9fa4c20022
--- /dev/null
+++ b/dev-python/pygments/pygments-2.8.1.ebuild
@@ -0,0 +1,45 @@
+# 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_{7..9} pypy3 )
+
+inherit distutils-r1 bash-completion-r1
+
+MY_P=${P^}
+DESCRIPTION="Pygments is a syntax highlighting package written in Python"
+HOMEPAGE="
+	https://pygments.org/
+	https://github.com/pygments/pygments/
+	https://pypi.org/project/Pygments/"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${PN^}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD"
+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"
+
+BDEPEND="
+	test? (
+		virtual/ttf-fonts
+	)"
+
+distutils_enable_sphinx doc
+distutils_enable_tests pytest
+
+python_test() {
+	local deselect=()
+	# there is a known bug in regex engine of pypy3.7
+	[[ ${EPYTHON} == pypy3 && $(pypy3 --version) == "Python 3.7"* ]] &&
+		deselect+=( tests/snippets/crystal/test_macro.txt:: )
+
+	pytest -vv ${deselect[@]/#/--deselect } ||
+		die "Tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	newbashcomp external/pygments.bashcomp pygmentize
+}
diff --git a/dev-python/pygobject/Manifest b/dev-python/pygobject/Manifest
index a8451ddf6813..b05d94ac4464 100644
--- a/dev-python/pygobject/Manifest
+++ b/dev-python/pygobject/Manifest
@@ -3,5 +3,5 @@ DIST pygobject-3.36.1.tar.xz 556568 BLAKE2B cd38aec8e71ff230926327e77867d07ae0fd
 DIST pygobject-3.38.0.tar.xz 553892 BLAKE2B d6add416c3f87ee9d5a56f30dbcaa599682ec5932b204f7c743d50475503ea2705e7943e6a93610d6f1c9d322723d1df6ea0f19c1cf245b2ca7d49395ca36170 SHA512 d63313dea2c143cf8c08a4678f1aa8e5908d503ad29c596eeb9fa1070e1231de57cf934c33031f9c4920b85e391f3b4143b46491ffd16e04e8d48871cb05e5df
 EBUILD pygobject-3.34.0-r1.ebuild 1885 BLAKE2B 5c83846b565f9415fa654e1d4bba401438a7e11122b0eeb9ddb91015598f58b0e37b5f326e21d3c4b5cf79c046129b7d4612c32efdbbd20c0bbd1241bb2c13a8 SHA512 5ee96c08251222a4dc18636fd2b1b45a519848cc469a9ba18df2780f22684a6a8f377cf9ac4e0bb9c65fee1eef005409c8ac1691ab3f1957fb67c051b64bb0cc
 EBUILD pygobject-3.36.1-r1.ebuild 1745 BLAKE2B 34eaf592f7695c65bec024632d4e5e852806a3e26e1769c21abfb9a1db5b0f8649efd505d1a416e5a106155839fd72cf2d012160beb4eae0c40b99b2176d15d0 SHA512 fe8e7cf92ffa159fb173b0bc978822c4f68661588038a48cb111e2e6e7fc7f432c34e9039877c5e28953eb6fa943e0af1f2dbf9bae7aff5d109b0adec9a0b8f5
-EBUILD pygobject-3.38.0.ebuild 1758 BLAKE2B 79ca92254199f4cedcd03f01ceac10e04e8ac9d1ed7fc9aa47dab408f4d197c75464e58cf8519fb2299a3703c73e6a15c899357202140fe99c61ffb05e1881b8 SHA512 05fb33e672edb058f5eae0a75374159c5a8c9a19bcfa10f9fc69802014a2a78471c4d8677d380cbf966215525922dde29d83c99562a9f17c410c3dcafd964128
+EBUILD pygobject-3.38.0.ebuild 1757 BLAKE2B e6e9ca79a742e09486e219cc6f1f4418e4affbcab13d7ef07c68209cc83c8b9140f700fd179cc6ae99e75deede081c7acca89ab1c043db3afced4bf420bdb264 SHA512 e13299fd37f59d38d4579113099186dc8d29045aae384d30ff20ed7cc0359ed20943168e62daf6ea322df772c238839168a401ebf673d376afd05a1f27fcf545
 MISC metadata.xml 1292 BLAKE2B ba52782219669d3f01ff1befd8ddcd445c36ac0af2f9e4125ca4fedca7c01665282485b9457b189689c80d4db55de9316ee2dfc19d06340c23a6f00e08e92213 SHA512 7aaf7a98227e36a6d556f225161eecbc43140736f3e79583694d131e99218f887aa6cfdb9991d6fb041bba6e7df2318e65e8cdf181d97bc41301aac6f040df48
diff --git a/dev-python/pygobject/pygobject-3.38.0.ebuild b/dev-python/pygobject/pygobject-3.38.0.ebuild
index 1f3f254260a9..033a5dd7caf3 100644
--- a/dev-python/pygobject/pygobject-3.38.0.ebuild
+++ b/dev-python/pygobject/pygobject-3.38.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://pygobject.readthedocs.io/"
 
 LICENSE="LGPL-2.1+"
 SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="+cairo examples test"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-python/pyjsparser/Manifest b/dev-python/pyjsparser/Manifest
index 21de43cace4f..c42e2b8d3ae3 100644
--- a/dev-python/pyjsparser/Manifest
+++ b/dev-python/pyjsparser/Manifest
@@ -1,3 +1,3 @@
 DIST pyjsparser-2.7.1_p20190421.tar.gz 210147 BLAKE2B 1286167a8ff9a0ee08019af2c1ba36a0dd1c22004a4e1ea3764f0a2a06e87b649435f332b9a9dea461ceade32340f7388489c972dafc9e558f973d7bbea4ac42 SHA512 2e4b3ee1cd863099da262eaf4df5ec4f364ce54e7c7535558f36d3449e21c9f851460078e1a7057ef8c82e2ed9c82f54944cd92782fe3f8cd05411edca191a40
 EBUILD pyjsparser-2.7.1_p20190421.ebuild 744 BLAKE2B 34cdfb147af916180e0ed06aa43fe7eb6e5d9b877b107f747edf763ae43b3bfe3959cfc85e01cc69c15a697f9156b8292f1ea2fd42bf4d9b3e1a9c2ffde4dc7a SHA512 71b4fb433125d1da59d9c2ed931144358a09a6c637034eaecaf590ad57432f8edfc1c0c918241649299e161dcfd97bea1ed9a51d54ea0ddef383a1cfb96ea1ac
-MISC metadata.xml 556 BLAKE2B 698d63c671dc2fcbfb7503bf7e545c58e8b3f9e64da013738cbfd6a8dea478fac113beb18f009dc1777caa6df4f01e765f7ea3d853d92d05b23ae1574eb0d37e SHA512 997062facc34f870037e9a9d67ef3eed1fd7430d2463d8d340228e2eb822b5fe7ec254d9911f8b5c0b1e5c699ed0f953ae91e58d66f744ae707e385ff5f1e90f
+MISC metadata.xml 552 BLAKE2B de13a805265568997c7b7d48e6ceb7e412f5ba9ee0e00fe096f68655fc072c777e115c8b7b47e21a369f8b6f58ace7c174f88d6742b0086cdeb89ab45d322dca SHA512 3a30d39bb19e1f13d986132c58b62c0223a0bf9367e8357b0a3d0a57387573addf9e7f2a2c51c7236f78fa683c38d7dde79eb654f0c0e43aba5fe68b7fb197f9
diff --git a/dev-python/pyjsparser/metadata.xml b/dev-python/pyjsparser/metadata.xml
index 5ce6ed5ca087..12f59667a6d9 100644
--- a/dev-python/pyjsparser/metadata.xml
+++ b/dev-python/pyjsparser/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
     <maintainer type="person">
-        <email>xgqt@protonmail.com</email>
+        <email>xgqt@riseup.net</email>
         <name>Maciej Barć</name>
     </maintainer>
     <maintainer type="project">
diff --git a/dev-python/pykwalify/Manifest b/dev-python/pykwalify/Manifest
index d1b35778fded..611491b85995 100644
--- a/dev-python/pykwalify/Manifest
+++ b/dev-python/pykwalify/Manifest
@@ -1,4 +1,4 @@
 AUX pykwalify-1.4.0-S.patch 862 BLAKE2B d92c4e8d4d85d28f6df574bfe2f1ab0aa82c32ba8ce2b4a2d6ecdc21fe1db4056351b6aa6dde04d897525ce596ed492781bd7dcf0fba2ca5970a3af79a9abf3b SHA512 f7d9189993cd73a0412ef01fcb01a99fcbc61edc6863a1997333de085294b9c5772d026f7ab8f16703568404f2ff76bb1aeed760d7908c7865e0891ad5752dc9
 DIST pykwalify-1.8.0.tar.gz 62462 BLAKE2B 1593f5e3e15188929574ece60bf6818438258bf024d105ae26323a97a202ac69001a15ca6daaa430970af3659c49da745bcf1f77c23ac72bed2ddca14440d943 SHA512 c77d3072995bb3f61336e725227eeece1dafe2182513e5f67eedeeca3437825b53ac691a991055aad8298db252e2012bc9a61c23d766335fcfbb10a3b587b45d
-EBUILD pykwalify-1.8.0.ebuild 782 BLAKE2B 85920ffd2e4840b4fa25a37681e5995b83ef783e7d75db189d6636f323a983af0cbc89f98332752267c971e6c073db24d012cbfa3d36f9f7725d9370dad812a1 SHA512 77b1a65348c77bc271eb96c5b62d3aa0c6874b66e76b9f1e87e1c11a806a7912a8c3682493fcc3dbacc9db29691903bfead3343b774dda70502cc52690c2c90a
+EBUILD pykwalify-1.8.0.ebuild 789 BLAKE2B 1c768b14e1c1d17521a9722604248ed5275f237b224c72be5093768e2eab25d64f7656c555bc2280ec48cfd6749f2986f064a516c9c8867482cd3e5717e4ea51 SHA512 7ef13af82aabbc8c603d42d6d679fb698058074ebb643b779adcfa3e781eefb3d6e6bb10e1da2df5b0fbf42f18fddfcd467e121bd319f0513e490dcd241316a2
 MISC metadata.xml 393 BLAKE2B 16007b48a409e741604ff8a1ccf4a23a2ef7c2cabe43213b833c7d3d88bddfae2e7f506c11df480ee3e746c80ed69766a15931977d64c0adb6cae49c20316f3a SHA512 0044cc9f44d2bac090b214e323de8e1e81fd0e22e94f939e4821f5786a33c400b1f7c94593587c458fd533dc321a64226bac5a220bcd116e41e300a897bd725c
diff --git a/dev-python/pykwalify/pykwalify-1.8.0.ebuild b/dev-python/pykwalify/pykwalify-1.8.0.ebuild
index c86530f3f72b..db0d16f28cf0 100644
--- a/dev-python/pykwalify/pykwalify-1.8.0.ebuild
+++ b/dev-python/pykwalify/pykwalify-1.8.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/docopt-0.6.2[${PYTHON_USEDEP}]
diff --git a/dev-python/pymetar/Manifest b/dev-python/pymetar/Manifest
index e4a716191628..22c228a423a4 100644
--- a/dev-python/pymetar/Manifest
+++ b/dev-python/pymetar/Manifest
@@ -1,5 +1,6 @@
 DIST pymetar-1.1.tar.gz 3162533 BLAKE2B 43cc79a0c8b27f7146a0f89d4271830ace0bd25790e8df006c19205419eabec88b90645d473019951b21952ee67df25261f6eea8c2d58de95e13186ab4bce214 SHA512 3e830065d3201373695c381f45969e7b532d69de8218cb32e107ed72235cd7cff8051e129c6ae4761154ed9d3fca81c530938520d6a54e7bf467cf28ebf9de02
 DIST pymetar-1.2.tar.gz 3163447 BLAKE2B be3e06efa007db46bd90e944ce60d24389f6b8685fcbb66803aca9b46b62cbb23b27e4ef7b2dc47080b6e6c9366acd3ecf13d02ef47ca50705a7631006482002 SHA512 4f19e99f56497b59ca31620a41beb7fd896b4503ed3edd34bafc8e9158895a238cc721e4161c2940abb49b34b1a7cbeb3d97952c4b19361d74a8b3ca56ea2fe7
 EBUILD pymetar-1.1-r1.ebuild 455 BLAKE2B 2635baf43e35bd0f4c4e3948770c6c6504ba33c1b40f6b780ae8347a7148cc2abe9edb0ffc7383311f1ea1a85092ff2804708cb9b7f803c2fc042200d9767992 SHA512 ca7f89c21bacbbb3d5369e572591af533f9503ba0db9bfa68a758ed92ad8a4be35be2439fe83f0a77dd8858dab15695a6c23f529d6d1fcbd352ca320f9095974
+EBUILD pymetar-1.2-r1.ebuild 452 BLAKE2B 145a2019c700825209c9f977faf837e606f23eb0eed418642f17196e9921aec659007c6f7167c55bc331fecc3439c6c5c4ae97dfa478409c54f5e99dde637951 SHA512 7c34ffb667a0c871fb5c93a49ea38c5bc47b5ee6beb66599ca612da76fdb0fd8ae879c9d8dedbda7aab2d7f127994a705fb36628039611edc83456b65f410481
 EBUILD pymetar-1.2.ebuild 450 BLAKE2B 7c102b064c778e8686669e166eea548295a98bf6cfa8fd3418b30fb43ec931f9b7b8b341cddc57eb6c79cfcba88dd767b9bca63a726700ecb724ffd6a9c1a530 SHA512 70d069529dd2463cf29e64fd892e2b44c6bba73d3a11c16a3100b8bcc5f686ac6f4969ad53a7184e269b03654aab4783bf3a428588081ee19b5b45d2d936cf90
 MISC metadata.xml 1146 BLAKE2B dad7f0dd50292e100ae7984401b1d8ef13a04ddf13943fc5a537a7807af0a5cdcba0296c9ee200c690547de3bbc70a56c70d9208bdfc8ce31aa174d19f90040e SHA512 ac50c6e1511ae8370f7b70d56918914b59a06d61c28f3d55943e32609f9c932e27e757bf72cca91106165391f29bda31ebdc20c181ef7e9b18a842e99f03367c
diff --git a/dev-python/pymetar/pymetar-1.2-r1.ebuild b/dev-python/pymetar/pymetar-1.2-r1.ebuild
new file mode 100644
index 000000000000..59f0836e3ad6
--- /dev/null
+++ b/dev-python/pymetar/pymetar-1.2-r1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Downloads and decodes to the weather report for a given station ID"
+HOMEPAGE="https://www.schwarzvogel.de/software-pymetar.shtml"
+SRC_URI="https://www.schwarzvogel.de/pkgs/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
diff --git a/dev-python/pymongo/Manifest b/dev-python/pymongo/Manifest
index 0c66be5009ff..388aa2114bbd 100644
--- a/dev-python/pymongo/Manifest
+++ b/dev-python/pymongo/Manifest
@@ -5,5 +5,5 @@ DIST pymongo-3.11.0.tar.gz 771691 BLAKE2B 5ae5b78caac335656c1005666c5633882da517
 EBUILD pymongo-3.11.0-r1.ebuild 2642 BLAKE2B 3ab0a0f617a4aa61880829f1f507673a2d46c730605d7c0e38b3eca4a45f57d5950246caeba0d9c0607d5d7b6c91ed7f27037353b6908a0408f0b7a3404fc69a SHA512 9e792030f1fb032dc79a08c5717faf5798e627437ea639f3808cdb518cdeeab54dacceb229af1bbb8a066f2832a12ed86e35cc74eddcc984fbf448a66f1ccd5f
 EBUILD pymongo-3.11.1.ebuild 2743 BLAKE2B 9a4e53be028428053e1b8d7478c4e3e336488e52c75b667fe3f17176e82a9c8275cb9d278ed921bb54b3ef6ca66d7a3a9beaaa3b4a87805d5f2d7e42ff103691 SHA512 937fd738051a0cceb969ac14f26cc27867c874b0aeaabad7cd9cdececcb2bc960d0592a97ada6f55a50bb92a2ec4cfcefb43583ee46b445b63adf66af151df2a
 EBUILD pymongo-3.11.2.ebuild 2743 BLAKE2B 3c91424d5bcf9e550c6e3a12218e3862fabdde50f476677cc3d6baf91973152ca7fc643c7c910b8fcfe69e1d6485de49bac345fec87ec3bc9a761e29be2489f5 SHA512 31ab715885b1f64a87b55380a45304273c2c11e2927a3d91aea765a7ac3240c46f81a368c5bf6783c236d0fd2349c596d8929a2fdd43c7418abb05370e1998e0
-EBUILD pymongo-3.11.3.ebuild 2745 BLAKE2B 97314718c77a5327eb4ef7bf50fc5e68177433a6fd2d6e17480904790b2c2d635e938d6f1e4872d9290848bcf4463891f66b3434c105807c75d606ef87a0f49e SHA512 55d6dd5992fbd6a06886b1af9edd3b8f3c34d3df0a2b1bdbc3e4e43667431dfcbfe5dbca0215014e5d5c0bf751ae306b081c614db0e6ccfa657ea2125ec59da2
+EBUILD pymongo-3.11.3.ebuild 2744 BLAKE2B 4b4692e579117121eeb64be952b6d3dd380c6f8b80989320bcaae72c2e90863bf83b883d9838748c87412c81979796928e7060d73fb2d06be22d7d3dd77947f0 SHA512 743b339d4b26fb924bf5533ad486c334bed47e78f504b06a1bd433355773383dd89f23e3d73e07ff35cf401f6d3aa3aa229aa0f6edabb1a9942b8c466598e9cc
 MISC metadata.xml 672 BLAKE2B 48cf6ce2f03ec2865a99fd033455a1b0a53cf9e55240ab6e993483929a6dd93661afcea7fa255095b66536f0a8cc05b5c4e6a12bd044547a5cf190559a9e480f SHA512 89b8a3551a5b0bd495bc98ac2f9324daeb3f3d81d0f6b991e5537e02c7b369201f9692be5acbe228ddcd3581002a39ac777ea5fc136957e9ccb9683f205e38ea
diff --git a/dev-python/pymongo/pymongo-3.11.3.ebuild b/dev-python/pymongo/pymongo-3.11.3.ebuild
index 9ed4fd9c839c..d5e28904376e 100644
--- a/dev-python/pymongo/pymongo-3.11.3.ebuild
+++ b/dev-python/pymongo/pymongo-3.11.3.ebuild
@@ -16,7 +16,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~x86"
+KEYWORDS="amd64 ~arm64 ~hppa ~x86"
 IUSE="doc kerberos test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pynest2d/Manifest b/dev-python/pynest2d/Manifest
index d79ac82934e7..0eea8d2bfef5 100644
--- a/dev-python/pynest2d/Manifest
+++ b/dev-python/pynest2d/Manifest
@@ -1,4 +1,5 @@
+AUX pynest2d-4.8.0-fix-cpp-version.patch 516 BLAKE2B f10567673b4347a45446de9f97561faff615685df9027cea0f2c3625ed8ecd4df1ae80981da0295ef0795529795295ebb37e285f6926e3d1c69fe70081aa4b03 SHA512 0d01349a110bc2cde6b7279ba8b8d60cd71c599fe10054e4082aac86bf4e30184959dcfcc795a63ae7517845c014b14db029a6070833696191d874dbfa24ed30
 AUX pynest2d-4.8.0-required-flags-from-Libnest2D-target.patch 1422 BLAKE2B b42ac90f1182e38d31e9dac877d8e94baa01db734dc31381d674f000a9982ed65f316c4613f0cfcc1910ec086c3e3bf51cb08d4d72624fc684ec658a8260f8f4 SHA512 2957da641a52a457254bf53a83a7f83085306f2158ca814feeeee6a230c4d6b9bafb29dd0aeb7244857a4152fdb927fa02085d2a19b77b8f990128491a051ce6
 DIST pynest2d-4.8.0.tar.gz 18174 BLAKE2B 3720815b3d5ba5d4a0dd24ec4104af318d2d7f2e86e66ada68ead8249ed28184d9a153995f143cc4e00d603804da959a086a27decfe2b1e0ef00256a891e0d17 SHA512 1304450f94589b5212f11d83fb228f0deb919698b44b1651f248105c23b65cf3d233e67526bbfb47df74b9b18d0c465f4188d02a0a6941564b551f50d9a3c84f
-EBUILD pynest2d-4.8.0.ebuild 892 BLAKE2B 513a0f81ba0de1a72550f19f8e521269f1c8fa162161006b6e6351133e0cb2f2aa6694a23a184c193ca24e924cf5a48160cc5ccd36b6ee55a14cf81888184b63 SHA512 0beb2834dea7c184953f9368fa1073c4ac3882b0437a673a5136697767bffdfa3fceeab2fefd435a47b9c65aade2e7fec2ce6b7c999a73310ff411c682292bf3
+EBUILD pynest2d-4.8.0-r1.ebuild 701 BLAKE2B 667826e64bc8f64d5fd93da87b53aff760b2c749c0216b22dd2d3460009293252baf52d3760054ecebfc7f96835e981935c25f37124b326825b9df24908cc600 SHA512 3e0c323f32c79d2607a7e2cd38155f5703df37f77c5d4281d31ec4f17539f17fe63214e02cd0509ccc5b6ffbc810e9abb0522467c1fc71d53d6c776d8f2df211
 MISC metadata.xml 409 BLAKE2B d2b4665c2ecc55b12a8058ea9875761523b925461731bc3e9cdfc87b946b950dce07511c3404047dfe283edf761a3b69e71af29618fd39040a04bc3500413a5e SHA512 4e95045f37666488ae3b2dc2277e97bd3e5f832da3d23a20f601d71ede313d51ffe3407ab23536827d9b449a4cf5b38b49b410997e0f3a9bb90ad02ab8e4cbbf
diff --git a/dev-python/pynest2d/files/pynest2d-4.8.0-fix-cpp-version.patch b/dev-python/pynest2d/files/pynest2d-4.8.0-fix-cpp-version.patch
new file mode 100644
index 000000000000..1fe895892de2
--- /dev/null
+++ b/dev-python/pynest2d/files/pynest2d-4.8.0-fix-cpp-version.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -17,7 +17,7 @@ find_package(Boost REQUIRED)  # Dependency of libnest2d.
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DLIBNEST2D_GEOMETRIES_clipper -DLIBNEST2D_OPTIMIZERS_nlopt -DLIBNEST2D_THREADING_std")  # Tell libnest2d to use Clipper and NLopt, and standard threads.
+
+ # Some build options.
+-set(CMAKE_CXX_STANDARD 11)
++set(CMAKE_CXX_STANDARD 14)
+ if(APPLE AND CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
+ endif()
diff --git a/dev-python/pynest2d/pynest2d-4.8.0.ebuild b/dev-python/pynest2d/pynest2d-4.8.0-r1.ebuild
index 5f57d42dca50..b2b6ecd0a450 100644
--- a/dev-python/pynest2d/pynest2d-4.8.0.ebuild
+++ b/dev-python/pynest2d/pynest2d-4.8.0-r1.ebuild
@@ -1,9 +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_{7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit cmake python-single-r1
 
@@ -15,8 +15,6 @@ LICENSE="LGPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~x86"
 
-IUSE=""
-
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
@@ -26,14 +24,7 @@ RDEPEND="${PYTHON_DEPS}
 
 DEPEND="${RDEPEND}"
 
-PATCHES=( "${FILESDIR}/${P}-required-flags-from-Libnest2D-target.patch" )
-
-#	test? (  )
-#	""
-
-#DEPENDENCIES
-
-# Clipper, a polygon clipping library.
-# NLopt, a library to solve non-linear optimization problems.
-# Boost, the headers only.
-# Sip, an application to generate Python bindings more easily.
+PATCHES=(
+	"${FILESDIR}"/${P}-required-flags-from-Libnest2D-target.patch
+	"${FILESDIR}"/${P}-fix-cpp-version.patch
+)
diff --git a/dev-python/pyproj/Manifest b/dev-python/pyproj/Manifest
index e170f9da069a..e4a6ae079732 100644
--- a/dev-python/pyproj/Manifest
+++ b/dev-python/pyproj/Manifest
@@ -1,4 +1,6 @@
 AUX pyproj-2.6.1_p1-tests.patch 2132 BLAKE2B 6d516cddb5b5bab0778a68d12025726e37871f49d34d7136905ecc17120d8436d5ef8f5304f1ea5ed35d25468a0116b72db01f0c3c627e9c4338ec57b58e22b2 SHA512 3678c9ae5c0793d0c33f64ebf473dc051e49437db1cad35b21ec11861ef19c1164987eaf8fe11e7883ebd28d5a81e073550bba380c5282cee6e44fd54cb9b2ee
 DIST pyproj-2.6.1.post1.tar.gz 545482 BLAKE2B ba87cbbe93dad357c1fc4f333c7d3f02b632e6f2a00821b3875e73965f36fd7ea958f24705c125c3ae43dc8edac1b53a20578c46bc55bcbf335a9457d193d493 SHA512 43a885dbbf4ba54839c3b697d2582700e2b30172ef34acf6297b5e4ddba9b3148aeab83b3a515f1ce975898828c77ad457b6f6460e91083189f66a2fde6d77b7
+DIST pyproj-3.0.1.tar.gz 168962 BLAKE2B 3271d604148c122f4dfdd68c4237e1911f30da7cc858128d644b6b6807c3e49450e0b42c385d37bbe1cfa5ab80d635e7f620d41bf5089af6b49a542eb9b3fcd0 SHA512 f5ae0ede1deaa93757cb98cc680d6e47a19b9f5c0ce5e357c2ecfe96f764ff59ec7285c606162da38573123d21f12f1df82354f1d2205149970af2d7d63c2689
 EBUILD pyproj-2.6.1_p1.ebuild 1252 BLAKE2B 7592e15a884fc7da5d2e49908f7aaec16b2e649a1346b86ebaf905cabcb7187120491ee2f70fff0a0574783516398972a8b0e5f148a74ba8f1d535e93e5de3cc SHA512 231cdc338240645051c972740a7424d145a51732d9556051004bc429685a7a5d8444642e320d510f7c406c0e4b5529db6ab31073b6a0aa5fb2ea750ad663b80d
+EBUILD pyproj-3.0.1.ebuild 1456 BLAKE2B 3807d40ff44314a5cf231267dcaf3b4e26d99c8510e8f4d31f790f39c6cf3e6221bcc83668e23f5c85362540f2be390fd499dfb507fa410b502f971bc4bcc16d SHA512 97471be094eb91888631c09079ffec12c5ccafb655a2920debf85c8a309e1eb7c5c5f36e962f3ef064a328be4e81ea9b9586f91617fa4e3636fb53dbef6bfd8f
 MISC metadata.xml 414 BLAKE2B 37b554706874ecf474f6fde6c09e4d7e466f2a22527e2851d3766518d0044dbbd2211f291851564541394a4d8f7d37f8216ae1c50cab8f662d3335d58c1ea142 SHA512 c117112962969a1cee0a9c3c7ec86942bfca1ef3eb9859b079ebdac743b691a954d7dc55ec729e141336c253abff8e0c7fcf1625279990cb87da87d732efe881
diff --git a/dev-python/pyproj/pyproj-3.0.1.ebuild b/dev-python/pyproj/pyproj-3.0.1.ebuild
new file mode 100644
index 000000000000..af1f8f54b07d
--- /dev/null
+++ b/dev-python/pyproj/pyproj-3.0.1.ebuild
@@ -0,0 +1,49 @@
+# 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_{7..9} )
+inherit distutils-r1
+
+DESCRIPTION="Python interface to the PROJ library"
+HOMEPAGE="https://github.com/pyproj4/pyproj"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P/_p/.post}.tar.gz"
+S="${WORKDIR}/${P/_p/.post}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
+
+RDEPEND=">=sci-libs/proj-7.2.0:="
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pandas[${PYTHON_USEDEP}]
+		dev-python/xarray[${PYTHON_USEDEP}]
+		sci-libs/shapely[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
+distutils_enable_tests --install pytest
+
+python_test() {
+	local deselect=(
+		# TODO
+		test/test_datum.py
+		test/test_transformer.py::test_transform_wgs84_to_alaska
+		test/test_transformer.py::test_repr__conditional
+		test/test_transformer.py::test_transformer_group__unavailable
+		test/test_transformer.py::test_transformer_group__network_disabled
+		test/test_transformer.py::test_transformer_group__download_grids__directory
+		test/crs/test_crs.py::test_coordinate_operation_grids__alternative_grid_name
+	)
+
+	distutils_install_for_testing
+	pytest -vv --import-mode=append -m "not network" \
+		${deselect[@]/#/--deselect } test ||
+		die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/pyproject2setuppy/Manifest b/dev-python/pyproject2setuppy/Manifest
index 978f2ac7cd5b..1ced1e6781ce 100644
--- a/dev-python/pyproject2setuppy/Manifest
+++ b/dev-python/pyproject2setuppy/Manifest
@@ -1,5 +1,3 @@
 DIST pyproject2setuppy-10.tar.gz 10221 BLAKE2B d9309cd7fe44a5f2f32311033df14e3e9c6391859a063a3c7afd25df69143dc93b0d8ccd03b908f0bf0badfce394f04f46177a30e7dc94043a5405017d9da711 SHA512 e6f94c29e5bde9c884fd14bba7d28a5313f363fbb7af3d2e5f2d55d718340c14cf26a5b28956eaf6c47a74b6b498b88e9a0fe0a2bd504370dbcb1553765da0f4
-DIST pyproject2setuppy-9.tar.gz 9611 BLAKE2B 448e6ca468c2a5c1097e63316bf1a2da41dfc4a8dfa756553b56ebcbb66c43cce7dd57aeacce45491087b956a01b8ff2707fc5f60ada10a4f496c9c8f7c722c4 SHA512 bd337f392e3dfd686039714687bd8a57b7b946b486f5513bf603e322843a4d8f4c2fdca747e61090f00f3ed4a5284a2b182f064412a3c8e70f278a2be7551d93
-EBUILD pyproject2setuppy-10.ebuild 743 BLAKE2B 86c8377ca897f0fa7f7820273a247aa618341b69ea49aee5dcbb67d6f69a12540021a4612bdd4375cd0b1589d64fee7dab53674b7aa0a8f1671af0297f3ac45a SHA512 514f2f3ff189798551124a4855184fbd0b240888cdc123bb6c254ec7da7214d27b4ef397472b68831bd0b00d270a6f0718fc386cc3f8eecc9a29f2ff56caeb7b
-EBUILD pyproject2setuppy-9.ebuild 687 BLAKE2B b2cffdd50b64428f83c255dec7eae0f16ee2ada588432238dda4bda422bffb6be05a6584b58263e6b6a357f4385cb0672cfba7b445f01cb43dfa2f88420a0400 SHA512 bb6c9dfd10735beebde373c84b587526fb31af1443c920114d6fc963c1e1b520854917fed061c1fccea661c5eb2f567cdcd28441dab0b783bc8fe7fc5b0f1ee4
+EBUILD pyproject2setuppy-10.ebuild 735 BLAKE2B 77a962231e7572f8b6fe9290555fe9c234d5d52b6dfd2188ba73f77a9b9bfe6c6328026b4832b955fdc9cfddfa6101b0876844d46ea714355fb97988bf6825fb SHA512 55d7b8d0c4cf4908a153e0ae342ea9d9476f41f9ffa906d41fedaa5e5a5e6859a796393714cc9b82a8258db1071bd66d38af717e64b496be4706d20af48379ad
 MISC metadata.xml 430 BLAKE2B 934e5a791bb16f3717ace5fa869aab4998938109ee14ca1ae0c9c378d67366060b705ff4430f3d267d33c04cf23ffa0b4c1b2654b2a95d586fc22ab4fb43f8f9 SHA512 f52d07edc973dc7665be77367cfdc37d92f27adc730a327c57374b54b60f77802b79ca5f2ebfce2c687090763224e5939274dcf4fa2555834c580cb06c32419d
diff --git a/dev-python/pyproject2setuppy/pyproject2setuppy-10.ebuild b/dev-python/pyproject2setuppy/pyproject2setuppy-10.ebuild
index 30484dfb0418..a11b6a162f50 100644
--- a/dev-python/pyproject2setuppy/pyproject2setuppy-10.ebuild
+++ b/dev-python/pyproject2setuppy/pyproject2setuppy-10.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="BSD-2"
 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="
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/pyproject2setuppy/pyproject2setuppy-9.ebuild b/dev-python/pyproject2setuppy/pyproject2setuppy-9.ebuild
deleted file mode 100644
index fc9e893af046..000000000000
--- a/dev-python/pyproject2setuppy/pyproject2setuppy-9.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=manual
-PYTHON_COMPAT=( python3_{7,8,9} 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}"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pypy-exe-bin/Manifest b/dev-python/pypy-exe-bin/Manifest
index ffa0834cba7e..d23c537087b1 100644
--- a/dev-python/pypy-exe-bin/Manifest
+++ b/dev-python/pypy-exe-bin/Manifest
@@ -1,7 +1,4 @@
-DIST pypy-exe-7.3.3-1.amd64.xpak 13533778 BLAKE2B de70f6b47e9908757ae73c047f04fc8081bb422f5ba6c0e9a865dde2c9aebfc881858194b107bb3e0110d61de718fb8fe7db2aac0885bb6adca101b12e6e400f SHA512 f98b86ed44567979234460fc9df7b79477729bdcc233ab8dd3ba991f80a5f32c9111f263ef4df5b2703581431d7f92ee468f057ce95613deaf35176634f253e2
-DIST pypy-exe-7.3.3-1.x86.xpak 10258112 BLAKE2B 55744bb2b68dee5b959c8976ad62b0e8e4d633f2b31003fc14d8bae82b4b55e7927ea1296501207ee2377df456b469ce3594a65a5171c84188ef22b88370a051 SHA512 baa895377c3cbd090971660edf3b634ada20390ed940c72ba2e9fadce30d3c88125f4c52b11d17160a1ba1331e648d2bed37d6d533866ea97d786634b5ecc0a7
 DIST pypy-exe-7.3.3_p2-1.amd64.xpak 13559131 BLAKE2B 85826ef13cc12ec07143b55cd6821f50db821ba3dad351aae90c2beb98b85f51f39ee26626a04757a63e96ef0da6062ad714f1bf96900ef361d61f2051342787 SHA512 5f5566942f6187d8fdf5b05dc27a3eb7e4bfa958da9b39a85a3531c427de89ca5bea16d080dd5450df906e5a3ab56fdb09010a603795a4763b80d5e4ee4ed96c
 DIST pypy-exe-7.3.3_p2-1.x86.xpak 10215453 BLAKE2B 34bbac2f3fab96eb91d2f3a9514e8f1b7ecb342da7402385f6d44755bf31f9b3d76688dcc7446aac2a9d768b588c545c0557e96b2bcace39ee669ab3ba5f882b SHA512 9cfc4fc080ec67a1a28cad2d1a76ffcff0db3e1d02ca2efe35f9dd4931c6d2e58ea9de1b3bd8098fc891f7c4b2ff703e42c77f19bedc837c1f5c4c7dc141f26f
-EBUILD pypy-exe-bin-7.3.3.ebuild 1083 BLAKE2B 09a71e537f6e5503c1e4f48e546a1106d6284755b1ec437744d9331408a1a3ecd9962d25f6f57c48dd12353d981c58148b737e1738fcc8e8da3b29a73757a957 SHA512 35aca37e67a3dedb282c0b3b0f91e7bba4ff4c3a85b2f5b4c5cab40c4d3441721ff6dbbe266c4d7a53b3706a693b3a2918a5b40f1bccdab449ba40128cfc1fa7
-EBUILD pypy-exe-bin-7.3.3_p2.ebuild 1091 BLAKE2B 0be760cc02b31062222064026a7b9841a28116ce108163891d6ace8af7f76f2a384e6948a861345c51df1c26a7087d35b678d15a9ff401009f6076ab3c9f4acc SHA512 6dcc86170c9fd7e88bfc1e9f7338fe53d49ebe5ab84ebb969b6d8f9fdec7bd5cb376e40755b7e240225742d2543921095067c0b24861cfe45a582e9fd9ac9b18
+EBUILD pypy-exe-bin-7.3.3_p2.ebuild 1089 BLAKE2B e5ae34937ba2774e660e91fd3ca1a1a4e11d505c0ad7783bf7ff24d61bed3138965bc769d01c3fcf6413664f92f4819747fb96badb6c489c730217718a5e4685 SHA512 b85514d575478a4f14dfc19dc389a563d96e91e57b38219b5d65c6a75dfebd353bc19a806d3701e23e79a9d83b038fdde5cd09960c655834ba7a7bae15e944e0
 MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.3.ebuild b/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.3.ebuild
deleted file mode 100644
index bec05ec196d6..000000000000
--- a/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit pax-utils
-
-MY_P=pypy-exe-${PV}-1
-DESCRIPTION="PyPy executable (pre-built version)"
-HOMEPAGE="https://www.pypy.org/"
-SRC_URI="
-	amd64? (
-		https://dev.gentoo.org/~mgorny/binpkg/amd64/pypy/dev-python/pypy-exe/${MY_P}.xpak
-			-> ${MY_P}.amd64.xpak
-	)
-	x86? (
-		https://dev.gentoo.org/~mgorny/binpkg/x86/pypy/dev-python/pypy-exe/${MY_P}.xpak
-			-> ${MY_P}.x86.xpak
-	)"
-S="${WORKDIR}"
-
-LICENSE="MIT"
-SLOT="${PV}"
-KEYWORDS="amd64 x86"
-
-RDEPEND=">=sys-libs/zlib-1.1.3:0/1
-	dev-libs/libffi:0/7
-	virtual/libintl:0/0
-	dev-libs/expat:0/0
-	app-arch/bzip2:0/1
-	sys-libs/ncurses:0/6
-	!dev-python/pypy-exe:${PV}"
-
-QA_PREBUILT="
-	usr/lib/pypy2.7/pypy-c-${SLOT}"
-
-src_unpack() {
-	ebegin "Unpacking ${MY_P}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${MY_P}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${MY_P} failed"
-}
-
-src_install() {
-	insinto /
-	doins -r usr
-	fperms +x "/usr/lib/pypy2.7/pypy-c-${SLOT}"
-	pax-mark m "${ED}/usr/lib/pypy2.7/pypy-c-${SLOT}"
-}
diff --git a/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.3_p2.ebuild b/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.3_p2.ebuild
index 23e8a4ef4993..3d0b3fd13699 100644
--- a/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.3_p2.ebuild
+++ b/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.3_p2.ebuild
@@ -21,7 +21,7 @@ S="${WORKDIR}"
 
 LICENSE="MIT"
 SLOT="${PV%_p*}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND=">=sys-libs/zlib-1.1.3:0/1
 	dev-libs/libffi:0/7
diff --git a/dev-python/pypy-exe/Manifest b/dev-python/pypy-exe/Manifest
index 764f91622f74..740f422025a5 100644
--- a/dev-python/pypy-exe/Manifest
+++ b/dev-python/pypy-exe/Manifest
@@ -1,5 +1,4 @@
 DIST pypy2.7-gentoo-patches-7.3.3_p2.tar.xz 11184 BLAKE2B b2b9b94478609372d616c65a87cbb12a07e217928beef9fac26c428f81c662ef390db3fd85bf368ffcc8c6fa3802e506412b7bebd14bdc453009008bc3459d25 SHA512 9ab8ed99b42b36e9c212683ef93f7f1fb99caecf056293ab9a5734f8b52eedec192860702baa121630558530cb5c4652f8542300ecaaaa282377ea6456618b95
 DIST pypy2.7-v7.3.3-src.tar.bz2 20881821 BLAKE2B ce1ecdd1fffe40574c7662da6038b84d2bca47ab168939ef0c12be2c6348317f17a94a3026e7fa53c71601edc153aefd98f770bd148e7af07ca751c0a5fc1252 SHA512 c2b6c44fdcac5f9445fab01572f859228fc286891fd09a4ddb95d283683d805276c853ec8e61fcd04cb9ee811d0e959d19bb03fdd7442c044f28a773633122e7
-EBUILD pypy-exe-7.3.3.ebuild 4076 BLAKE2B 032c50ac8da2a3fa9ee4d84aa715b7092223f6ff61363f2404e7cb74b08d45f430f6e2020ab654463cfaf3c23ec099500e4062d158545bcf2f54becbee6dd23c SHA512 60b28d5095d68f06350204bb72deb10b5e038a35e5ac599f16b89e7d2ab34be21c32ffdaeeed43e8672aa8f81500ca3ee6df03b0f6b9ed882bed3a98dbf23944
-EBUILD pypy-exe-7.3.3_p2.ebuild 4302 BLAKE2B 1b66c71c7584d3b80d686740727c92fe64a4f81360451da4212e5f6618c8368f93df16488ed50bbc94f9472374fac48b7028054b3266c2e01d5826c642f38239 SHA512 b95a9a2558758835ec6302d02fada4b02f3c711ddc55df8728ec9f6b64cf3846ce63f910df458dd47a6a7a17a22abbc7029bacc7527a12233fecb55b260211f9
+EBUILD pypy-exe-7.3.3_p2.ebuild 4300 BLAKE2B 0b02d3c04a0921c1a0de139ce1ea6990c923931641567e57a5827e40f87d8538ca2d0f500ef062260b43ded984f8ec6063d72ded50600b3a8b643224b5d67a7d SHA512 d3b388afb00117df5c739fdf6a27e9dfe1e8b892b0e248e8ad915bc4661ad24da3119340e5a32fa4c09b9800329461760b0a17b3eb37f6fc294912ec06b9fb08
 MISC metadata.xml 497 BLAKE2B 02040ea95327971e16090c00e5771bc684710e90000ca07b366226fedbae8973a1f4bdd9d37506446a2fe3caea4fdf83ca186d2706747adccd14ea24a19486b3 SHA512 816621f5288b822fc1c7b360ac6f1e5f7b464a60c9b6e58fc464860bb8a4f44be932fe6562625006925ddda2b5cc14feeaef587303642d894494ddea6472cd2a
diff --git a/dev-python/pypy-exe/pypy-exe-7.3.3.ebuild b/dev-python/pypy-exe/pypy-exe-7.3.3.ebuild
deleted file mode 100644
index b3798107352b..000000000000
--- a/dev-python/pypy-exe/pypy-exe-7.3.3.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-inherit check-reqs pax-utils python-any-r1 toolchain-funcs
-
-MY_P=pypy2.7-v${PV/_/}
-DESCRIPTION="PyPy executable (build from source)"
-HOMEPAGE="https://www.pypy.org/"
-SRC_URI="https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2"
-S="${WORKDIR}/${MY_P}-src"
-
-LICENSE="MIT"
-SLOT="${PV}"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="bzip2 +jit low-memory ncurses cpu_flags_x86_sse2"
-
-RDEPEND=">=sys-libs/zlib-1.1.3:0=
-	dev-libs/libffi:0=
-	virtual/libintl:0=
-	dev-libs/expat:0=
-	bzip2? ( app-arch/bzip2:0= )
-	ncurses? ( sys-libs/ncurses:0= )
-	!dev-python/pypy-exe-bin:${PV}"
-# don't enforce the dep on pypy with USE=low-memory since it's going
-# to cause either collisions or circular dep on itself
-DEPEND="${RDEPEND}"
-BDEPEND="
-	!low-memory? (
-		|| (
-			dev-python/pypy
-			dev-lang/python:2.7
-		)
-	)"
-
-check_env() {
-	if use low-memory; then
-		if ! has_version -b dev-python/pypy &&
-				! has_version -b dev-python/pypy-bin
-		then
-			eerror "USE=low-memory requires a (possibly old) version of dev-python/pypy"
-			eerror "being installed. Please install it using e.g.:"
-			eerror
-			eerror "  $ emerge -1v dev-python/pypy dev-python/pypy-exe-bin"
-			eerror
-			eerror "before attempting to build dev-python/pypy-exe[low-memory]."
-			die "dev-python/pypy needs to be installed for USE=low-memory"
-		fi
-
-		CHECKREQS_MEMORY="1750M"
-		use amd64 && CHECKREQS_MEMORY="3500M"
-	else
-		CHECKREQS_MEMORY="3G"
-		use amd64 && CHECKREQS_MEMORY="6G"
-	fi
-
-	check-reqs_pkg_pretend
-}
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && check_env
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		check_env
-
-		use low-memory && EPYTHON=
-		if [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]] &&
-				{ has_version -b dev-python/pypy ||
-				has_version -b dev-python/pypy-bin; }
-		then
-			einfo "Using already-installed PyPy to perform the translation."
-			EPYTHON=pypy
-		else
-			einfo "Using ${EPYTHON} to perform the translation. Please note that upstream"
-			einfo "recommends using PyPy for that. If you wish to do so, please unset"
-			einfo "the EPYTHON variable."
-			python-any-r1_pkg_setup
-		fi
-	fi
-}
-
-src_configure() {
-	tc-export CC
-
-	local jit_backend
-	if use jit; then
-		jit_backend='--jit-backend='
-
-		# We only need the explicit sse2 switch for x86.
-		# On other arches we can rely on autodetection which uses
-		# compiler macros. Plus, --jit-backend= doesn't accept all
-		# the modern values...
-
-		if use x86; then
-			if use cpu_flags_x86_sse2; then
-				jit_backend+=x86
-			else
-				jit_backend+=x86-without-sse2
-			fi
-		else
-			jit_backend+=auto
-		fi
-	fi
-
-	local args=(
-		--no-shared
-		$(usex jit -Ojit -O2)
-
-		${jit_backend}
-
-		pypy/goal/targetpypystandalone
-	)
-
-	# Avoid linking against libraries disabled by use flags
-	local opts=(
-		bzip2:bz2
-		ncurses:_minimal_curses
-	)
-
-	local opt
-	for opt in "${opts[@]}"; do
-		local flag=${opt%:*}
-		local mod=${opt#*:}
-
-		args+=(
-			$(usex ${flag} --withmod --withoutmod)-${mod}
-		)
-	done
-
-	local interp=( "${EPYTHON}" )
-	if use low-memory; then
-		interp=( env PYPY_GC_MAX_DELTA=200MB
-			"${EPYTHON}" --jit loop_longevity=300 )
-	fi
-
-	if [[ ${EPYTHON} != pypy ]]; then
-		# reuse bundled pycparser to avoid external dep
-		mkdir -p "${T}"/pymod/cffi || die
-		: > "${T}"/pymod/cffi/__init__.py || die
-		cp -r lib_pypy/cffi/_pycparser "${T}"/pymod/cffi/ || die
-		local -x PYTHONPATH=${T}/pymod:${PYTHONPATH}
-	fi
-
-	# translate into the C sources
-	# we're going to build them ourselves since otherwise pypy does not
-	# free up the unneeded memory before spawning the compiler
-	set -- "${interp[@]}" rpython/bin/rpython --batch --source "${args[@]}"
-	echo -e "\033[1m${@}\033[0m"
-	"${@}" || die "translation failed"
-}
-
-src_compile() {
-	emake -C "${T}"/usession*-0/testing_1
-}
-
-src_install() {
-	local dest=/usr/lib/pypy2.7
-	exeinto "${dest}"
-	newexe "${T}"/usession*-0/testing_1/pypy-c pypy-c-${PV}
-	insinto "${dest}"/include/${PV}
-	doins include/pypy_*
-	pax-mark m "${ED}${dest}/pypy-c-${PV}"
-}
diff --git a/dev-python/pypy-exe/pypy-exe-7.3.3_p2.ebuild b/dev-python/pypy-exe/pypy-exe-7.3.3_p2.ebuild
index b76695a82c8b..0bedc372a695 100644
--- a/dev-python/pypy-exe/pypy-exe-7.3.3_p2.ebuild
+++ b/dev-python/pypy-exe/pypy-exe-7.3.3_p2.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}-src"
 
 LICENSE="MIT"
 SLOT="${PYPY_PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="bzip2 +jit low-memory ncurses cpu_flags_x86_sse2"
 
 RDEPEND=">=sys-libs/zlib-1.1.3:0=
diff --git a/dev-python/pypy/Manifest b/dev-python/pypy/Manifest
index 07723c9e6616..22c8adf28d6b 100644
--- a/dev-python/pypy/Manifest
+++ b/dev-python/pypy/Manifest
@@ -1,9 +1,4 @@
-AUX 1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch 555 BLAKE2B 4976bf66e4e96f89e64ad79910bb7b6fc7c3929cf7b7f1a0a59e66b5bb87e600864df2556f1dccf7695223121c7271382227e16cfb8fb7851cf56be25542b7ab SHA512 f2df0a67480bbe46fbb25dd06abcbc226a7034410855105012045287e662a598fae467f5bc81b3d4adb738f812bf41819aaa5827151db0d6bba573305ee88474
-AUX 7.3.1-gentoo-path.patch 1575 BLAKE2B e374b879aabdb1a9b4d3bb07ba03510e9df7c00e6fba13e117dd718268118ade06fa76f7468855463fa50112fb780fddb9687198f4a24bb0a6cc69b5b79e70d4 SHA512 14e14e4c000166bfe3f1cd10377baecc721b43c2df43c0d5d85e8dc6f220e1a453d7fe30cfbaab547e5483f8f493ddd840620b8de4de6d55abe8f9cddcca2464
-AUX 7.3.3-distutils-cxx.patch 18613 BLAKE2B af9f2a5f0248a865d1a5c7423b35a9a14d7cf8a3d885f5ddeafa68b0c0358a0a9eebf5ba1b687558102c3dd4e2a5b4399db1f4f701628b8fff8f0f4d9795550f SHA512 332396a0a1b8181946ef3b70cd76fad8ef6f06b3fc267229ef70fda5e6d48193981ed5620a5f3577a12e3cfda22a75ee4fdad12351a57c9ade96b3f1796d651c
 DIST pypy2.7-gentoo-patches-7.3.3_p2.tar.xz 11184 BLAKE2B b2b9b94478609372d616c65a87cbb12a07e217928beef9fac26c428f81c662ef390db3fd85bf368ffcc8c6fa3802e506412b7bebd14bdc453009008bc3459d25 SHA512 9ab8ed99b42b36e9c212683ef93f7f1fb99caecf056293ab9a5734f8b52eedec192860702baa121630558530cb5c4652f8542300ecaaaa282377ea6456618b95
 DIST pypy2.7-v7.3.3-src.tar.bz2 20881821 BLAKE2B ce1ecdd1fffe40574c7662da6038b84d2bca47ab168939ef0c12be2c6348317f17a94a3026e7fa53c71601edc153aefd98f770bd148e7af07ca751c0a5fc1252 SHA512 c2b6c44fdcac5f9445fab01572f859228fc286891fd09a4ddb95d283683d805276c853ec8e61fcd04cb9ee811d0e959d19bb03fdd7442c044f28a773633122e7
-DIST python-gentoo-patches-2.7.18-r1.tar.xz 15500 BLAKE2B 7008b29827dbbd80d4ab8f010ccf9efced99c6b4b9109e4430c0ba269ce53529cb6fedd832502c8d2d3aa21938749cc3591c2545b21c0a59a6e60f8598e84ccc SHA512 e656ab07281fd932b92165674619bbf55ecf410d2937ae4ae771d490b4532540498cc731d30d19c1e8aafd1f64df8a406bbfbb46ea985b3dcd8edb89a0b7f20f
-EBUILD pypy-7.3.3.ebuild 5592 BLAKE2B 470f10f9d2ce53951adb8cc108b55a504afaf33598ee9e970b57d42aa8b2b554bc4ae41c1d45c853836c0bad73d70572b683bf95cf9ebe65040ed7e3b9f6a19a SHA512 b5095f9cdfdf68cb9049343f8e888a7da94d5f4c272baacc4e4c8be87adede76b5342a3dfc74fc7f09987e122f98f7b0f4d4e1618f3af62273936ee7e71a3f9d
-EBUILD pypy-7.3.3_p2-r1.ebuild 4882 BLAKE2B 53bf57f5c0420e7c09b1a443410a4728fe0536c6bf54ac191c707bb3fd038f9b9297b157ff0424aad9589c1055cb9ab5874d3a791468dc493baeb65051df99ec SHA512 d3704ed1211a8742b9147890937eb7801c12389e67de262d6b010dc7ab04db73e2a6e9c5e4beae588bcb9cd83db69c41171b43839c0a5583d69775ac58697979
+EBUILD pypy-7.3.3_p2-r1.ebuild 4880 BLAKE2B 652df6a07bc9fb23a636ff2289b9fd4709fece2b26ec5ea029c71e8a394b569b5ac72ff27b98e077c24d0d654c72dd4d74e71c94bfcdf748c52d0b69cf03ddd5 SHA512 e8b81d6ff53b744aab44a46ffea2384a2ebf6a265b32b89d62fce2ea65fd6d53a7c69b8c66e73c600a0c29a1b13b29cb956e428c070d2fc0f5ad97e5c131ee4a
 MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/dev-python/pypy/files/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch b/dev-python/pypy/files/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch
deleted file mode 100644
index 65321bb60e6e..000000000000
--- a/dev-python/pypy/files/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/lib-python/2.7/distutils/unixccompiler.py
-+++ b/lib-python/2.7/distutils/unixccompiler.py
-@@ -297,7 +297,7 @@
-         # this time, there's no way to determine this information from
-         # the configuration data stored in the Python installation, so
-         # we use this hack.
--        compiler = os.path.basename(sysconfig.get_config_var("CC"))
-+        compiler = os.path.basename(self.compiler[0])
-         if sys.platform[:6] == "darwin":
-             # MacOSX's linker doesn't understand the -R flag at all
-             return "-L" + dir
diff --git a/dev-python/pypy/files/7.3.1-gentoo-path.patch b/dev-python/pypy/files/7.3.1-gentoo-path.patch
deleted file mode 100644
index 74ca86a84ac9..000000000000
--- a/dev-python/pypy/files/7.3.1-gentoo-path.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 6d439c6718625bb7dce32b0afdc6a3d5168a21e5 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Sat, 11 Apr 2020 07:01:27 +0200
-Subject: [PATCH] Support Gentoo install scheme
-
----
- lib-python/2.7/distutils/command/install.py | 12 +++++++++++-
- 1 file changed, 11 insertions(+), 1 deletion(-)
-
-diff --git a/lib-python/2.7/distutils/command/install.py b/lib-python/2.7/distutils/command/install.py
-index 6fe62be..a4e9f0d 100644
---- a/lib-python/2.7/distutils/command/install.py
-+++ b/lib-python/2.7/distutils/command/install.py
-@@ -97,6 +97,13 @@ INSTALL_SCHEMES = {
-         'scripts': '$base/Scripts',
-         'data'   : '$base',
-         },
-+    'gentoo': {
-+        'purelib': '$base/site-packages',
-+        'platlib': '$base/site-packages',
-+        'headers': '$base/include/$dist_name',
-+        'scripts': '@EPREFIX@/usr/bin',
-+        'data'   : '@EPREFIX@/usr',
-+        },
-     }
- 
- # The keys to an installation scheme; if any new types of files are to be
-@@ -483,7 +490,10 @@ class install (Command):
-         # it's the caller's problem if they supply a bad name!
-         if (hasattr(sys, 'pypy_version_info') and
-                 not name.endswith(('_user', '_home'))):
--            if os.name == 'nt':
-+            if self.install_base.startswith(os.path.normpath('@EPREFIX@/usr/lib/pypy')):
-+                # override paths for system-wide install
-+                name = 'gentoo'
-+            elif os.name == 'nt':
-                 name = 'pypy_nt'
-             else:
-                 name = 'pypy'
--- 
-2.26.0
-
diff --git a/dev-python/pypy/files/7.3.3-distutils-cxx.patch b/dev-python/pypy/files/7.3.3-distutils-cxx.patch
deleted file mode 100644
index d5939d7417f2..000000000000
--- a/dev-python/pypy/files/7.3.3-distutils-cxx.patch
+++ /dev/null
@@ -1,387 +0,0 @@
-From 5ca45626481778f12654cd2ea8c45b5eeb2363c6 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Fri, 13 Nov 2020 01:02:28 +0100
-Subject: [PATCH] Fancy patch for distutils C++ support, rebased for
- pypy7.3.3rc1
-
----
- lib-python/2.7/_osx_support.py                | 10 ++--
- lib-python/2.7/distutils/cygwinccompiler.py   | 21 ++++++-
- lib-python/2.7/distutils/emxccompiler.py      | 14 ++++-
- lib-python/2.7/distutils/sysconfig_cpython.py | 26 +++++++--
- lib-python/2.7/distutils/sysconfig_pypy.py    | 37 ++++++++++---
- lib-python/2.7/distutils/unixccompiler.py     | 55 ++++++++++---------
- 6 files changed, 112 insertions(+), 51 deletions(-)
-
-diff --git a/lib-python/2.7/_osx_support.py b/lib-python/2.7/_osx_support.py
-index d2aaae7..8bcdb05 100644
---- a/lib-python/2.7/_osx_support.py
-+++ b/lib-python/2.7/_osx_support.py
-@@ -14,13 +14,13 @@ __all__ = [
- # configuration variables that may contain universal build flags,
- # like "-arch" or "-isdkroot", that may need customization for
- # the user environment
--_UNIVERSAL_CONFIG_VARS = ('CFLAGS', 'LDFLAGS', 'CPPFLAGS', 'BASECFLAGS',
--                            'BLDSHARED', 'LDSHARED', 'CC', 'CXX',
--                            'PY_CFLAGS', 'PY_LDFLAGS', 'PY_CPPFLAGS',
--                            'PY_CORE_CFLAGS')
-+_UNIVERSAL_CONFIG_VARS = ('CFLAGS', 'CXXFLAGS', 'LDFLAGS', 'CPPFLAGS',
-+                          'BASECFLAGS', 'BLDSHARED', 'LDSHARED', 'LDCXXSHARED',
-+                          'CC', 'CXX', 'PY_CFLAGS', 'PY_LDFLAGS',
-+                          'PY_CPPFLAGS', 'PY_CORE_CFLAGS')
- 
- # configuration variables that may contain compiler calls
--_COMPILER_CONFIG_VARS = ('BLDSHARED', 'LDSHARED', 'CC', 'CXX')
-+_COMPILER_CONFIG_VARS = ('BLDSHARED', 'LDSHARED', 'LDCXXSHARED', 'CC', 'CXX')
- 
- # prefix added to original configuration variable names
- _INITPRE = '_OSX_SUPPORT_INITIAL_'
-diff --git a/lib-python/2.7/distutils/cygwinccompiler.py b/lib-python/2.7/distutils/cygwinccompiler.py
-index 767400c..7133097 100644
---- a/lib-python/2.7/distutils/cygwinccompiler.py
-+++ b/lib-python/2.7/distutils/cygwinccompiler.py
-@@ -120,8 +120,10 @@ class CygwinCCompiler (UnixCCompiler):
-         # dllwrap 2.10.90 is buggy
-         if self.ld_version >= "2.10.90":
-             self.linker_dll = "gcc"
-+            self.linker_dll_cxx = "g++"
-         else:
-             self.linker_dll = "dllwrap"
-+            self.linker_dll_cxx = "dllwrap"
- 
-         # ld_version >= "2.13" support -shared so use it instead of
-         # -mdll -static
-@@ -135,9 +137,13 @@ class CygwinCCompiler (UnixCCompiler):
-         self.set_executables(compiler='gcc -mcygwin -O -Wall',
-                              compiler_so='gcc -mcygwin -mdll -O -Wall',
-                              compiler_cxx='g++ -mcygwin -O -Wall',
-+                             compiler_so_cxx='g++ -mcygwin -mdll -O -Wall',
-                              linker_exe='gcc -mcygwin',
-                              linker_so=('%s -mcygwin %s' %
--                                        (self.linker_dll, shared_option)))
-+                                        (self.linker_dll, shared_option)),
-+                             linker_exe_cxx='g++ -mcygwin',
-+                             linker_so_cxx=('%s -mcygwin %s' %
-+                                            (self.linker_dll_cxx, shared_option)))
- 
-         # cygwin and mingw32 need different sets of libraries
-         if self.gcc_version == "2.91.57":
-@@ -163,8 +169,12 @@ class CygwinCCompiler (UnixCCompiler):
-                 raise CompileError, msg
-         else: # for other files use the C-compiler
-             try:
--                self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
--                           extra_postargs)
-+                if self.detect_language(src) == 'c++':
-+                    self.spawn(self.compiler_so_cxx + cc_args + [src, '-o', obj] +
-+                               extra_postargs)
-+                else:
-+                    self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
-+                               extra_postargs)
-             except DistutilsExecError, msg:
-                 raise CompileError, msg
- 
-@@ -330,9 +340,14 @@ class Mingw32CCompiler (CygwinCCompiler):
-         self.set_executables(compiler='gcc%s -O -Wall' % no_cygwin,
-                              compiler_so='gcc%s -mdll -O -Wall' % no_cygwin,
-                              compiler_cxx='g++%s -O -Wall' % no_cygwin,
-+                             compiler_so_cxx='g++%s -mdll -O -Wall' % no_cygwin,
-                              linker_exe='gcc%s' % no_cygwin,
-                              linker_so='%s%s %s %s'
-                                     % (self.linker_dll, no_cygwin,
-+                                       shared_option, entry_point),
-+                             linker_exe_cxx='g++%s' % no_cygwin,
-+                             linker_so_cxx='%s%s %s %s'
-+                                    % (self.linker_dll_cxx, no_cygwin,
-                                        shared_option, entry_point))
-         # Maybe we should also append -mthreads, but then the finished
-         # dlls need another dll (mingwm10.dll see Mingw32 docs)
-diff --git a/lib-python/2.7/distutils/emxccompiler.py b/lib-python/2.7/distutils/emxccompiler.py
-index a017205..bdc532c 100644
---- a/lib-python/2.7/distutils/emxccompiler.py
-+++ b/lib-python/2.7/distutils/emxccompiler.py
-@@ -65,8 +65,12 @@ class EMXCCompiler (UnixCCompiler):
-         # XXX optimization, warnings etc. should be customizable.
-         self.set_executables(compiler='gcc -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall',
-                              compiler_so='gcc -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall',
-+                             compiler_cxx='g++ -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall',
-+                             compiler_so_cxx='g++ -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall',
-                              linker_exe='gcc -Zomf -Zmt -Zcrtdll',
--                             linker_so='gcc -Zomf -Zmt -Zcrtdll -Zdll')
-+                             linker_so='gcc -Zomf -Zmt -Zcrtdll -Zdll',
-+                             linker_exe_cxx='g++ -Zomf -Zmt -Zcrtdll',
-+                             linker_so_cxx='g++ -Zomf -Zmt -Zcrtdll -Zdll')
- 
-         # want the gcc library statically linked (so that we don't have
-         # to distribute a version dependent on the compiler we have)
-@@ -83,8 +87,12 @@ class EMXCCompiler (UnixCCompiler):
-                 raise CompileError, msg
-         else: # for other files use the C-compiler
-             try:
--                self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
--                           extra_postargs)
-+                if self.detect_language(src) == 'c++':
-+                    self.spawn(self.compiler_so_cxx + cc_args + [src, '-o', obj] +
-+                               extra_postargs)
-+                else:
-+                    self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
-+                               extra_postargs)
-             except DistutilsExecError, msg:
-                 raise CompileError, msg
- 
-diff --git a/lib-python/2.7/distutils/sysconfig_cpython.py b/lib-python/2.7/distutils/sysconfig_cpython.py
-index 6a14f70..2cce5bc 100644
---- a/lib-python/2.7/distutils/sysconfig_cpython.py
-+++ b/lib-python/2.7/distutils/sysconfig_cpython.py
-@@ -181,10 +181,12 @@ def customize_compiler(compiler):
-                 _osx_support.customize_compiler(_config_vars)
-                 _config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True'
- 
--        (cc, cxx, cflags, ccshared, ldshared, so_ext, ar, ar_flags) = \
--            get_config_vars('CC', 'CXX', 'CFLAGS',
--                            'CCSHARED', 'LDSHARED', 'SO', 'AR',
--                            'ARFLAGS')
-+        (cc, cxx, ccshared, ldshared, ldcxxshared, so_ext, ar, ar_flags) = \
-+            get_config_vars('CC', 'CXX', 'CCSHARED', 'LDSHARED', 'LDCXXSHARED',
-+                            'SO', 'AR', 'ARFLAGS')
-+
-+        cflags = ''
-+        cxxflags = ''
- 
-         if 'CC' in os.environ:
-             newcc = os.environ['CC']
-@@ -199,19 +201,27 @@ def customize_compiler(compiler):
-             cxx = os.environ['CXX']
-         if 'LDSHARED' in os.environ:
-             ldshared = os.environ['LDSHARED']
-+        if 'LDCXXSHARED' in os.environ:
-+            ldcxxshared = os.environ['LDCXXSHARED']
-         if 'CPP' in os.environ:
-             cpp = os.environ['CPP']
-         else:
-             cpp = cc + " -E"           # not always
-         if 'LDFLAGS' in os.environ:
-             ldshared = ldshared + ' ' + os.environ['LDFLAGS']
-+            ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS']
-         if 'CFLAGS' in os.environ:
--            cflags = cflags + ' ' + os.environ['CFLAGS']
-+            cflags = os.environ['CFLAGS']
-             ldshared = ldshared + ' ' + os.environ['CFLAGS']
-+        if 'CXXFLAGS' in os.environ:
-+            cxxflags = os.environ['CXXFLAGS']
-+            ldcxxshared = ldcxxshared + ' ' + os.environ['CXXFLAGS']
-         if 'CPPFLAGS' in os.environ:
-             cpp = cpp + ' ' + os.environ['CPPFLAGS']
-             cflags = cflags + ' ' + os.environ['CPPFLAGS']
-+            cxxflags = cxxflags + ' ' + os.environ['CPPFLAGS']
-             ldshared = ldshared + ' ' + os.environ['CPPFLAGS']
-+            ldcxxshared = ldcxxshared + ' ' + os.environ['CPPFLAGS']
-         if 'AR' in os.environ:
-             ar = os.environ['AR']
-         if 'ARFLAGS' in os.environ:
-@@ -220,13 +230,17 @@ def customize_compiler(compiler):
-             archiver = ar + ' ' + ar_flags
- 
-         cc_cmd = cc + ' ' + cflags
-+        cxx_cmd = cxx + ' ' + cxxflags
-         compiler.set_executables(
-             preprocessor=cpp,
-             compiler=cc_cmd,
-             compiler_so=cc_cmd + ' ' + ccshared,
--            compiler_cxx=cxx,
-+            compiler_cxx=cxx_cmd,
-+            compiler_so_cxx=cxx_cmd + ' ' + ccshared,
-             linker_so=ldshared,
-             linker_exe=cc,
-+            linker_so_cxx=ldcxxshared,
-+            linker_exe_cxx=cxx,
-             archiver=archiver)
- 
-         compiler.shared_lib_extension = so_ext
-diff --git a/lib-python/2.7/distutils/sysconfig_pypy.py b/lib-python/2.7/distutils/sysconfig_pypy.py
-index ec9f5a3..192974d 100644
---- a/lib-python/2.7/distutils/sysconfig_pypy.py
-+++ b/lib-python/2.7/distutils/sysconfig_pypy.py
-@@ -67,6 +67,7 @@ def _init_posix():
-     g['CFLAGS'] = "-DNDEBUG -O2"
-     g['CCSHARED'] = "-fPIC"
-     g['LDSHARED'] = "cc -pthread -shared"
-+    g['LDCXXSHARED'] = "c++ -pthread -shared"
-     g['SO'] = [s[0] for s in imp.get_suffixes() if s[2] == imp.C_EXTENSION][0]
-     g['AR'] = "ar"
-     g['ARFLAGS'] = "rc"
-@@ -85,6 +86,7 @@ def _init_posix():
-             # just a guess
-             arch = platform.machine()
-         g['LDSHARED'] += ' -undefined dynamic_lookup'
-+        g['LDCXXSHARED'] += ' -undefined dynamic_lookup'
-         g['CC'] += ' -arch %s' % (arch,)
-         g['MACOSX_DEPLOYMENT_TARGET'] = '10.7'
- 
-@@ -183,37 +185,52 @@ def customize_compiler(compiler):
-                 _osx_support.customize_compiler(_config_vars)
-                 _config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True'
- 
--        (cc, cxx, opt, cflags, ccshared, ldshared, so_ext, ar, ar_flags) = \
--            get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS',
--                            'CCSHARED', 'LDSHARED', 'SO', 'AR',
--                            'ARFLAGS')
-+        (cc, cxx, ccshared, ldshared, ldcxxshared, so_ext, ar, ar_flags) = \
-+            get_config_vars('CC', 'CXX', 'CCSHARED', 'LDSHARED', 'LDCXXSHARED',
-+                            'SO', 'AR', 'ARFLAGS')
-+
-+        cflags = ''
-+        cxxflags = ''
- 
-         if 'CC' in os.environ:
-             newcc = os.environ['CC']
--            if (sys.platform == 'darwin'
-+            if (True
-                     and 'LDSHARED' not in os.environ
-                     and ldshared.startswith(cc)):
-                 # On OS X, if CC is overridden, use that as the default
-                 #       command for LDSHARED as well
-+                # Gentoo: s/OS X/every system/
-                 ldshared = newcc + ldshared[len(cc):]
-             cc = newcc
-         if 'CXX' in os.environ:
--            cxx = os.environ['CXX']
-+            newcxx = os.environ['CXX']
-+            if ('LDCXXSHARED' not in os.environ
-+                    and ldcxxshared.startswith(cxx)):
-+                ldcxxshared = newcxx + ldcxxshared[len(cxx):]
-+            cxx = newcxx
-         if 'LDSHARED' in os.environ:
-             ldshared = os.environ['LDSHARED']
-+        if 'LDCXXSHARED' in os.environ:
-+            ldcxxshared = os.environ['LDCXXSHARED']
-         if 'CPP' in os.environ:
-             cpp = os.environ['CPP']
-         else:
-             cpp = cc + " -E"           # not always
-         if 'LDFLAGS' in os.environ:
-             ldshared = ldshared + ' ' + os.environ['LDFLAGS']
-+            ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS']
-         if 'CFLAGS' in os.environ:
--            cflags = opt + ' ' + os.environ['CFLAGS']
-+            cflags = os.environ['CFLAGS']
-             ldshared = ldshared + ' ' + os.environ['CFLAGS']
-+        if 'CXXFLAGS' in os.environ:
-+            cxxflags = os.environ['CXXFLAGS']
-+            ldcxxshared = ldcxxshared + ' ' + os.environ['CXXFLAGS']
-         if 'CPPFLAGS' in os.environ:
-             cpp = cpp + ' ' + os.environ['CPPFLAGS']
-             cflags = cflags + ' ' + os.environ['CPPFLAGS']
-+            cxxflags = cxxflags + ' ' + os.environ['CPPFLAGS']
-             ldshared = ldshared + ' ' + os.environ['CPPFLAGS']
-+            ldcxxshared = ldcxxshared + ' ' + os.environ['CPPFLAGS']
-         if 'AR' in os.environ:
-             ar = os.environ['AR']
-         if 'ARFLAGS' in os.environ:
-@@ -222,13 +239,17 @@ def customize_compiler(compiler):
-             archiver = ar + ' ' + ar_flags
- 
-         cc_cmd = cc + ' ' + cflags
-+        cxx_cmd = cxx + ' ' + cxxflags
-         compiler.set_executables(
-             preprocessor=cpp,
-             compiler=cc_cmd,
-             compiler_so=cc_cmd + ' ' + ccshared,
--            compiler_cxx=cxx,
-+            compiler_cxx=cxx_cmd,
-+            compiler_so_cxx=cxx_cmd + ' ' + ccshared,
-             linker_so=ldshared,
-             linker_exe=cc,
-+            linker_so_cxx=ldcxxshared,
-+            linker_exe_cxx=cxx,
-             archiver=archiver)
- 
-         compiler.shared_lib_extension = so_ext
-diff --git a/lib-python/2.7/distutils/unixccompiler.py b/lib-python/2.7/distutils/unixccompiler.py
-index 250ff12..7e64543 100644
---- a/lib-python/2.7/distutils/unixccompiler.py
-+++ b/lib-python/2.7/distutils/unixccompiler.py
-@@ -55,14 +55,17 @@ class UnixCCompiler(CCompiler):
-     # are pretty generic; they will probably have to be set by an outsider
-     # (eg. using information discovered by the sysconfig about building
-     # Python extensions).
--    executables = {'preprocessor' : None,
--                   'compiler'     : ["cc"],
--                   'compiler_so'  : ["cc"],
--                   'compiler_cxx' : ["c++"],  # pypy: changed, 'cc' is bogus
--                   'linker_so'    : ["cc", "-shared"],
--                   'linker_exe'   : ["cc"],
--                   'archiver'     : ["ar", "-cr"],
--                   'ranlib'       : None,
-+    executables = {'preprocessor'    : None,
-+                   'compiler'        : ["cc"],
-+                   'compiler_so'     : ["cc"],
-+                   'compiler_cxx'    : ["c++"],
-+                   'compiler_so_cxx' : ["c++"],
-+                   'linker_so'       : ["cc", "-shared"],
-+                   'linker_exe'      : ["cc"],
-+                   'linker_so_cxx'   : ["c++", "-shared"],
-+                   'linker_exe_cxx'  : ["c++"],
-+                   'archiver'        : ["ar", "-cr"],
-+                   'ranlib'          : None,
-                   }
- 
-     if sys.platform[:6] == "darwin":
-@@ -129,12 +132,19 @@ class UnixCCompiler(CCompiler):
- 
-     def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts):
-         compiler_so = self.compiler_so
-+        compiler_so_cxx = self.compiler_so_cxx
-         if sys.platform == 'darwin':
-             compiler_so = _osx_support.compiler_fixup(compiler_so,
-                                                     cc_args + extra_postargs)
-+            compiler_so_cxx = _osx_support.compiler_fixup(compiler_so_cxx,
-+                                                    cc_args + extra_postargs)
-         try:
--            self.spawn(compiler_so + cc_args + [src, '-o', obj] +
--                       extra_postargs)
-+            if self.detect_language(src) == 'c++':
-+                self.spawn(compiler_so_cxx + cc_args + [src, '-o', obj] +
-+                           extra_postargs)
-+            else:
-+                self.spawn(compiler_so + cc_args + [src, '-o', obj] +
-+                           extra_postargs)
-         except DistutilsExecError, msg:
-             raise CompileError, msg
- 
-@@ -191,23 +201,16 @@ class UnixCCompiler(CCompiler):
-                 ld_args.extend(extra_postargs)
-             self.mkpath(os.path.dirname(output_filename))
-             try:
--                if target_desc == CCompiler.EXECUTABLE:
--                    linker = self.linker_exe[:]
-+                if target_lang == "c++":
-+                    if target_desc == CCompiler.EXECUTABLE:
-+                        linker = self.linker_exe_cxx[:]
-+                    else:
-+                        linker = self.linker_so_cxx[:]
-                 else:
--                    linker = self.linker_so[:]
--                if target_lang == "c++" and self.compiler_cxx:
--                    # skip over environment variable settings if /usr/bin/env
--                    # is used to set up the linker's environment.
--                    # This is needed on OSX. Note: this assumes that the
--                    # normal and C++ compiler have the same environment
--                    # settings.
--                    i = 0
--                    if os.path.basename(linker[0]) == "env":
--                        i = 1
--                        while '=' in linker[i]:
--                            i = i + 1
--
--                    linker[i] = self.compiler_cxx[i]
-+                    if target_desc == CCompiler.EXECUTABLE:
-+                        linker = self.linker_exe[:]
-+                    else:
-+                        linker = self.linker_so[:]
- 
-                 if sys.platform == 'darwin':
-                     linker = _osx_support.compiler_fixup(linker, ld_args)
--- 
-2.29.2
-
diff --git a/dev-python/pypy/pypy-7.3.3.ebuild b/dev-python/pypy/pypy-7.3.3.ebuild
deleted file mode 100644
index 8e48bcb5dc59..000000000000
--- a/dev-python/pypy/pypy-7.3.3.ebuild
+++ /dev/null
@@ -1,176 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit pax-utils python-utils-r1
-
-MY_P=pypy2.7-v${PV/_/}
-# note: remember to update this to newest dev-lang/python:2.7 on bump
-PATCHSET="python-gentoo-patches-2.7.18-r1"
-
-DESCRIPTION="A fast, compliant alternative implementation of the Python language"
-HOMEPAGE="https://www.pypy.org/"
-SRC_URI="https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2
-	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz"
-S="${WORKDIR}/${MY_P}-src"
-
-LICENSE="MIT"
-# pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")'
-SLOT="0/73"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="bzip2 gdbm +jit libressl ncurses sqlite tk"
-
-RDEPEND="
-	|| (
-		dev-python/pypy-exe:${PV}[bzip2?,ncurses?]
-		dev-python/pypy-exe-bin:${PV}
-	)
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	gdbm? ( sys-libs/gdbm:0= )
-	sqlite? ( dev-db/sqlite:3= )
-	tk? (
-		dev-lang/tk:0=
-		dev-tcltk/tix:0=
-	)
-	!<dev-python/pypy-bin-7.3.0:0"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	eapply "${FILESDIR}/7.3.1-gentoo-path.patch"
-	eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
-	eapply "${FILESDIR}/7.3.3-distutils-cxx.patch"
-
-	sed -e "s^@EPREFIX@^${EPREFIX}^" \
-		-i lib-python/2.7/distutils/command/install.py || die
-
-	# apply CPython stdlib patches
-	pushd lib-python/2.7 > /dev/null || die
-	# TODO: cpy turkish locale patch now fixes C code
-	# probably needs better port to pypy, if it is broken there
-	eapply -p2 "${WORKDIR}/${PATCHSET}"/0010-use_pyxml.patch
-	popd > /dev/null || die
-
-	# this test relies on pypy-c hardcoding correct build time paths
-	sed -i -e 's:test_executable_without_cwd:_&:' \
-		lib-python/2.7/test/test_subprocess.py || die
-	# requires Internet
-	sed -i -e '/class NetworkedTests/i@unittest.skip("Requires networking")' \
-		lib-python/2.7/test/test_ssl.py || die
-
-	eapply_user
-}
-
-src_compile() {
-	# copy over to make sys.prefix happy
-	cp -p "${BROOT}"/usr/lib/pypy2.7/pypy-c-${PV} pypy-c || die
-	cp -p "${BROOT}"/usr/lib/pypy2.7/include/${PV}/* include/ || die
-	# (not installed by pypy)
-	rm pypy/module/cpyext/include/_numpypy/numpy/README || die
-	mv pypy/module/cpyext/include/* include/ || die
-	mv pypy/module/cpyext/parse/*.h include/ || die
-	pax-mark m pypy-c
-
-	einfo "Generating caches and CFFI modules ..."
-
-	# Generate Grammar and PatternGrammar pickles.
-	./pypy-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
-		|| die "Generation of Grammar and PatternGrammar pickles failed"
-
-	# Generate cffi modules
-	# Please keep in sync with pypy/tool/build_cffi_imports.py!
-#cffi_build_scripts = {
-#    "_ssl": "_ssl_build.py",
-#    "sqlite3": "_sqlite3_build.py",
-#    "audioop": "_audioop_build.py",
-#    "tk": "_tkinter/tklib_build.py",
-#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
-#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
-#    "gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
-#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
-#    "resource": "_resource_build.py" if sys.platform != "win32" else None,
-	cffi_targets=( ssl audioop syslog pwdgrp resource )
-	use gdbm && cffi_targets+=( gdbm )
-	use ncurses && cffi_targets+=( curses )
-	use sqlite && cffi_targets+=( sqlite3 )
-	use tk && cffi_targets+=( tkinter/tklib )
-
-	local t
-	# all modules except tkinter output to .
-	# tkinter outputs to the correct dir ...
-	cd lib_pypy || die
-	for t in "${cffi_targets[@]}"; do
-		# tkinter doesn't work via -m
-		../pypy-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
-	done
-
-	# Cleanup temporary objects
-	find -name "_cffi_*.[co]" -delete || die
-	find -type d -empty -delete || die
-}
-
-src_test() {
-	# (unset)
-	local -x PYTHONDONTWRITEBYTECODE=
-	local -x COLUMNS=80
-
-	local ignored_tests=(
-		# network
-		--ignore=lib-python/2.7/test/test_urllibnet.py
-		--ignore=lib-python/2.7/test/test_urllib2net.py
-		# lots of free space
-		--ignore=lib-python/2.7/test/test_zipfile64.py
-	)
-
-	./pypy-c ./pypy/test_all.py --pypy=./pypy-c -vv \
-		"${ignored_tests[@]}" lib-python || die
-}
-
-src_install() {
-	local dest=/usr/lib/pypy2.7
-	einfo "Installing PyPy ..."
-	dosym pypy-c-${PV} "${dest}/pypy-c"
-	insinto "${dest}"
-	# preserve mtimes to avoid obsoleting caches
-	insopts -p
-	doins -r include lib_pypy lib-python
-
-	# replace copied headers with symlinks
-	for x in "${BROOT}"/usr/lib/pypy2.7/include/${PV}/*; do
-		dosym "${PV}/${x##*/}" "${dest}/include/${x##*/}"
-	done
-
-	dosym ../lib/pypy2.7/pypy-c /usr/bin/pypy
-	dodoc README.rst
-
-	if ! use gdbm; then
-		rm -r "${ED}${dest}"/lib_pypy/gdbm.py \
-			"${ED}${dest}"/lib-python/*2.7/test/test_gdbm.py || die
-	fi
-	if ! use sqlite; then
-		rm -r "${ED}${dest}"/lib-python/*2.7/sqlite3 \
-			"${ED}${dest}"/lib_pypy/_sqlite3.py \
-			"${ED}${dest}"/lib-python/*2.7/test/test_sqlite.py || die
-	fi
-	if ! use tk; then
-		rm -r "${ED}${dest}"/lib-python/*2.7/{idlelib,lib-tk} \
-			"${ED}${dest}"/lib_pypy/_tkinter \
-			"${ED}${dest}"/lib-python/*2.7/test/test_{tcl,tk,ttk*}.py || die
-	fi
-
-	local -x EPYTHON=pypy
-	local -x PYTHON=${ED}${dest}/pypy-c-${PV}
-	# temporarily copy to build tree to facilitate module builds
-	cp -p "${BROOT}${dest}/pypy-c-${PV}" "${PYTHON}" || die
-
-	echo "EPYTHON='${EPYTHON}'" > epython.py || die
-	python_moduleinto /usr/lib/pypy2.7/site-packages
-	python_domodule epython.py
-
-	einfo "Byte-compiling Python standard library..."
-	python_optimize "${ED}${dest}"
-
-	# remove to avoid collisions
-	rm "${PYTHON}" || die
-}
diff --git a/dev-python/pypy/pypy-7.3.3_p2-r1.ebuild b/dev-python/pypy/pypy-7.3.3_p2-r1.ebuild
index d9a8bc29d156..94fa2f5ad800 100644
--- a/dev-python/pypy/pypy-7.3.3_p2-r1.ebuild
+++ b/dev-python/pypy/pypy-7.3.3_p2-r1.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}-src"
 LICENSE="MIT"
 # pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")'
 SLOT="0/73"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="bzip2 gdbm +jit libressl ncurses sqlite tk"
 
 RDEPEND="
diff --git a/dev-python/pypy3-exe-bin/Manifest b/dev-python/pypy3-exe-bin/Manifest
index 518d33526c24..f4c4b988c1af 100644
--- a/dev-python/pypy3-exe-bin/Manifest
+++ b/dev-python/pypy3-exe-bin/Manifest
@@ -1,10 +1,7 @@
-DIST pypy3-exe-7.3.3-1.amd64.xpak 11716026 BLAKE2B e57bc5e4420bb3d21f8ca9076f1795f33ba79fadb9ef6020a8597ac607e1173a11e440649a5ee7e308155ca28702e95aace36d5772f7ccc1d2c66b605a0c2a1d SHA512 462c1845f4566246df96abd59f2312fcd0ae1a9cf577ed6218aada4a95133f34a93f98a627fea5245ab79d9056fce00a2903503492e8f3e652a05b5832a5b67e
-DIST pypy3-exe-7.3.3-1.x86.xpak 9041169 BLAKE2B 47a2352407387d96214b0e297cc82504afe8b64378a528349a32d751ac3acb068bbf720165dae94582816a0372d85a8e9ccd9f8d5bf03c63a9f5d8cbc9463480 SHA512 c3c44c1448be6d861ca788e17ca79a4fd68fa1751f3d1f47d2570e1d924343e35e106fee30f7da5b3e14a679f5d9048d5bc263a8ef49cac420349acad67530ed
-DIST pypy3-exe-7.3.3_p37-1.amd64.xpak 11868037 BLAKE2B d23aa2c9dabbb1032ffce4176926f6996427dae05095c0842db3ac046e2234aef160cfcb84b9f2d146b76ae7315dd7d9c3c5ac974121ee876128f8977306e513 SHA512 7e26342c64a678058030bb38c29f5534c25694619942a66f4f507a615ee2798e2f631d81345ed269d252a3e68a79536e9248444c72563dddc1dc0a293457c76f
-DIST pypy3-exe-7.3.3_p37-1.x86.xpak 9133686 BLAKE2B ae8e82cf1820e93a08c85177ba1e6547afa4e063277617efc5ce658b890526f546e7e4d5accf37f2189cc8d5203625175fb5413482c21aded7006208a57afc19 SHA512 ec5d3a521cb1d784b1083f86c0693db180f31015b56feca85bb85ab35dd3d461fc96d31ad7aaf8031ec8e0488151fbd3049cac83bc0edac5df99b062b49eb481
 DIST pypy3-exe-7.3.3_p37_p1-1.amd64.xpak 11849780 BLAKE2B 50af990a9f636c6f3fdceaaaa6187d9dbc70b0cffd833bbb143379194515ee7a2c7c8289085cbc979cf9448a08ea12c702116fe021cbc24022298caef88ce98b SHA512 b2ec41db00bbc8cf4b610633a0027ea0825d6695c053081195edbd38634609e9d53e38ae72e76a0d53921e6d0adc337ae8221a7658c04cdae1b0702fcafc6f9f
 DIST pypy3-exe-7.3.3_p37_p1-1.x86.xpak 9097573 BLAKE2B bac15c49691ee264c271a1b9a6fa3fe6bc6c35effd8d21477264e2e8f140f713608bad74746ee796b98e94d4e7dc1ea33d667aa89389786c2e04acf31f264952 SHA512 128e9e570a00b684fb0915917b58166049b6280805915952c11a3793c579233a35e917a42b25aa2b50262dc6a0c99ca9e5283f39128973249d8735c827dfc10e
-EBUILD pypy3-exe-bin-7.3.3.ebuild 1090 BLAKE2B 390617c4896666cd2cec904110f26c93a3f3d91c8ba317f90ea7d99bf9fc5977180ffb88dfb8fd3dbc99bf524ece06ef1cec8de0d0e189a66312805439fcc57c SHA512 7d42b02bd9cd63eab8fa747d4a8ab3158c1203b1f97cd546ea48cdf90692cd533d57cf6228eb1319818a88c439c06731c2e4d2a9d75e8d3a8703c011810dc7c7
-EBUILD pypy3-exe-bin-7.3.3_p37.ebuild 1121 BLAKE2B d4e86f61dd2216fe629c60b4a21459458159a95d4c0b9b297ce3c55863a032a00ecefb5b32b5b3df15ad3773e6e8f67cb4ebfdb2dac0cefed017c57a23a5ae73 SHA512 200977ea0e0958e4361e86296617ce34fe0686e5cb450ba8e2f817d34197f255299922faea945f1ba6e60fad6fc88e4bf674451f45d1f6b561b9659fb61d745a
-EBUILD pypy3-exe-bin-7.3.3_p37_p1.ebuild 1127 BLAKE2B 08da61e98198eed1b7989bacc748ea7030cab222b3c043bdc5932dc0ce31df2b8d4b9c759c3fb9b724fd274f6438140b52aba553bc136e915c77d21a34d643c6 SHA512 8dfbbbc20aa7ee40fd332db0517be883c72fd3c93bf7c2636848339666a9dad15019423caad338ae99ce81b4290417f7cc4ef7f17717814ebc03edf223b3a003
+DIST pypy3-exe-7.3.3_p37_p2-1.amd64.xpak 11834007 BLAKE2B c6d501f7c2317c2550404158d5c917c4519cef5987dbfe72d9b9b01f5821554be951e8b89db1d74e5629a747d1044f0d9d69ea3520760eba294740ec4599a490 SHA512 bff2f9e499a9992fa3ae8779713cd7455049f8d16f16d42b8e62d2564291d495cfcd641c0e492bbac9dd157ea00fb377ba89c9751eb743ce6639329aebe7de39
+DIST pypy3-exe-7.3.3_p37_p2-1.x86.xpak 9153105 BLAKE2B 58a2f4c7e2e6c7cc1c65e129d6a5153b566fedd109834cec2b0506519f62bc508cdb342bc4eb084a4a5eaaa2ff6e7afae8f9f22d9b5d6a4647eaa7ea177fff8e SHA512 3990567c97175d6024499c65b050b4e095de5374c050416a479671e31aedefd749abb259d255841001351b043f9e86ffaa1a5cd61a1f8449b26fe023a7022849
+EBUILD pypy3-exe-bin-7.3.3_p37_p1.ebuild 1125 BLAKE2B c73b6673f3fba074df41979e3ce6f8f01ed51f3fbd7e95141e3fcb9340a1f434adda98465276d19c235d8dd94aa1422aaac5ef7fb33b4e6853f7c08eef9f48f1 SHA512 b7a4c2074b7b15a91aa546c40c61d24b0c1259ae677260182d6b7eb625c795fc23b9b469b44ee151b45b545431305b53f7379a6fc32f0b93d5fb6571fd741313
+EBUILD pypy3-exe-bin-7.3.3_p37_p2.ebuild 1127 BLAKE2B 08da61e98198eed1b7989bacc748ea7030cab222b3c043bdc5932dc0ce31df2b8d4b9c759c3fb9b724fd274f6438140b52aba553bc136e915c77d21a34d643c6 SHA512 8dfbbbc20aa7ee40fd332db0517be883c72fd3c93bf7c2636848339666a9dad15019423caad338ae99ce81b4290417f7cc4ef7f17717814ebc03edf223b3a003
 MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.3.ebuild b/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.3.ebuild
deleted file mode 100644
index 3c4a20b1749a..000000000000
--- a/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit pax-utils
-
-MY_P=pypy3-exe-${PV}-1
-DESCRIPTION="PyPy3 executable (pre-built version)"
-HOMEPAGE="https://www.pypy.org/"
-SRC_URI="
-	amd64? (
-		https://dev.gentoo.org/~mgorny/binpkg/amd64/pypy/dev-python/pypy3-exe/${MY_P}.xpak
-			-> ${MY_P}.amd64.xpak
-	)
-	x86? (
-		https://dev.gentoo.org/~mgorny/binpkg/x86/pypy/dev-python/pypy3-exe/${MY_P}.xpak
-			-> ${MY_P}.x86.xpak
-	)"
-S="${WORKDIR}"
-
-LICENSE="MIT"
-SLOT="${PV}"
-KEYWORDS="amd64 x86"
-
-RDEPEND=">=sys-libs/zlib-1.1.3:0/1
-	dev-libs/libffi:0/7
-	virtual/libintl:0/0
-	dev-libs/expat:0/0
-	app-arch/bzip2:0/1
-	sys-libs/ncurses:0/6
-	!dev-python/pypy-exe:${PV}"
-
-QA_PREBUILT="
-	usr/lib/pypy3.6/pypy3-c-${SLOT}"
-
-src_unpack() {
-	ebegin "Unpacking ${MY_P}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${MY_P}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${MY_P} failed"
-}
-
-src_install() {
-	insinto /
-	doins -r usr
-	fperms +x "/usr/lib/pypy3.6/pypy3-c-${SLOT}"
-	pax-mark m "${ED}/usr/lib/pypy3.6/pypy3-c-${SLOT}"
-}
diff --git a/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.3_p37_p1.ebuild b/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.3_p37_p1.ebuild
index c25ec9fa093a..277fe587ef6d 100644
--- a/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.3_p37_p1.ebuild
+++ b/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.3_p37_p1.ebuild
@@ -21,7 +21,7 @@ S="${WORKDIR}"
 
 LICENSE="MIT"
 SLOT="${PV%_p*}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND=">=sys-libs/zlib-1.1.3:0/1
 	dev-libs/libffi:0/7
diff --git a/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.3_p37.ebuild b/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.3_p37_p2.ebuild
index 7facc0539573..c25ec9fa093a 100644
--- a/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.3_p37.ebuild
+++ b/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.3_p37_p2.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 S="${WORKDIR}"
 
 LICENSE="MIT"
-SLOT="${PV}"
+SLOT="${PV%_p*}"
 KEYWORDS="~amd64 ~x86"
 
 RDEPEND=">=sys-libs/zlib-1.1.3:0/1
@@ -29,7 +29,7 @@ RDEPEND=">=sys-libs/zlib-1.1.3:0/1
 	dev-libs/expat:0/0
 	app-arch/bzip2:0/1
 	sys-libs/ncurses:0/6
-	!dev-python/pypy-exe:${PV}"
+	!dev-python/pypy-exe:${SLOT}"
 
 PYPY_PV=${SLOT%_p*}
 QA_PREBUILT="
diff --git a/dev-python/pypy3-exe/Manifest b/dev-python/pypy3-exe/Manifest
index 23e4f3686bc9..4dcd661930c3 100644
--- a/dev-python/pypy3-exe/Manifest
+++ b/dev-python/pypy3-exe/Manifest
@@ -1,7 +1,6 @@
-DIST pypy3.6-v7.3.3-src.tar.bz2 22484684 BLAKE2B a252e3070ec1c7cfd708cd694bd461d56241100463bac5ff7bbcf2d2667e01990ec8b4ceb947449ab1f620d0d5a8984bd8af3e2565555e5f73218e3c35ae1ebd SHA512 3bc9d9cc362f500e9e79c2694fc355706ac44d6dd5b8f5fb4d017d0997581472a9fdda08ccbe45469c7b52facdc0512be07843ba54d1d691fdb37f6628065879
 DIST pypy3.7-gentoo-patches-7.3.3_p1.tar.xz 13816 BLAKE2B 135a029e2d881ed5e43869fde391571285454b8612f2857fb5fe7aaf5b126f84d01293bd31e7a7746ad03fce1e14ace6a6f9cc2634269ec431b4aabfe70f9b4c SHA512 acf4938bc171e757196cf138358a298880792367ca5fff6b462d6971c8597e064777f99b687cb25003c6f25762a901ed482eebd791fdb008fa729ca9c9c300e8
+DIST pypy3.7-gentoo-patches-7.3.3_p2.tar.xz 14508 BLAKE2B c2df6b9a88fc4dfb5fd4d68dda65e69e039c28a44193d94b1efeed58aa944a111f755096b8dc3d3318a294eaafd75eb1d583fa3acc704bc272260f25545a9da8 SHA512 5736fefa62b359e2a86c336853142114ceab0e68cf8337aaaac18492d6521d780109cdab80ab46f577610a32082477610a1f56882650d45f41b17083387f1f8d
 DIST pypy3.7-v7.3.3-src.tar.bz2 24633503 BLAKE2B 0fb9fbb8866cf661c5b1d8d029fb2bc50737fae097875d0dac86c9ec21dc907093173b350a4f89d2c5a1fbed4c92ca4919f047536b828d4ee35583d615e7ddce SHA512 c98955e72dc0bd0452e4e16e0fe0ab318a34d6d57217ea33349e98ed047597ba97be7d15b41edd4dc85028fcca0a6257a4bb98fe96ce876e41a04df012261f4a
-EBUILD pypy3-exe-7.3.3.ebuild 3643 BLAKE2B 5738a151be6dfda7631333ed592d35932057aac63593b054e21005f632c8d79265b248eac5e9955c36b87d66dba1948046aa219d43201abfafce9db1bc541227 SHA512 21417e375877037ca0584cb7f4dae4f9bdd60c0394e36ebe11d5aa0503e6ef712afd27a8123af2d1324cd4e4ecb77ccb3328b60422d57a5dfaf41a8001f57971
-EBUILD pypy3-exe-7.3.3_p37.ebuild 3684 BLAKE2B a7aca5e0bab7853edd21ce1ce94ce98689347e687835adf80f99cd737a5a545cbd39ad031e6f18bd36664dcfbb45a99e636ef682a8b78059b399eda5b8e19be6 SHA512 5c65b0855ada4f1ec8914076dcee97327e024d452d06aafd4a3277e98e1be330d8c3f41c9180ef0a4bb61288dc7b39ac8e83b81f14bbb933407943729654a3cd
-EBUILD pypy3-exe-7.3.3_p37_p1.ebuild 3877 BLAKE2B 8e51c2e911a7ec9aded060d86ef67748a07345dfe179035c52f68ddfc696afbfd40e492830ce92abe92c9de9e0425e6a2e528e23995dba5a7e4942fe8d00119c SHA512 33e4f61c2d68a32ed43a476606df2fb76e431b315963de341d6ebc09352d930b038b54f6d619908d05b6fafe9c58defaa4c0cc3a9a2b229c87139320a0e14563
+EBUILD pypy3-exe-7.3.3_p37_p1.ebuild 3875 BLAKE2B aed7bde6ddbefa3a5abeeae05cf4c5fec25f6e83141d998a2b6f95fae214fc4d986f01293ea50dfff07f85cbd39fc28c87b8f45810ac552ad97d2b1d1ae16be9 SHA512 026a3a4b44f4d1916c9e8c520ac4021035bc08aeb98b8bc676bab0a2b04e34656b8a5885930b3ba6dad82d0eff788bee14bc10598d7d8a17e4b398c013efb3bb
+EBUILD pypy3-exe-7.3.3_p37_p2.ebuild 3877 BLAKE2B 8e51c2e911a7ec9aded060d86ef67748a07345dfe179035c52f68ddfc696afbfd40e492830ce92abe92c9de9e0425e6a2e528e23995dba5a7e4942fe8d00119c SHA512 33e4f61c2d68a32ed43a476606df2fb76e431b315963de341d6ebc09352d930b038b54f6d619908d05b6fafe9c58defaa4c0cc3a9a2b229c87139320a0e14563
 MISC metadata.xml 497 BLAKE2B 02040ea95327971e16090c00e5771bc684710e90000ca07b366226fedbae8973a1f4bdd9d37506446a2fe3caea4fdf83ca186d2706747adccd14ea24a19486b3 SHA512 816621f5288b822fc1c7b360ac6f1e5f7b464a60c9b6e58fc464860bb8a4f44be932fe6562625006925ddda2b5cc14feeaef587303642d894494ddea6472cd2a
diff --git a/dev-python/pypy3-exe/pypy3-exe-7.3.3.ebuild b/dev-python/pypy3-exe/pypy3-exe-7.3.3.ebuild
deleted file mode 100644
index 47842a1b89c8..000000000000
--- a/dev-python/pypy3-exe/pypy3-exe-7.3.3.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# pypy3 needs to be built using python 2
-PYTHON_COMPAT=( python2_7 )
-inherit check-reqs pax-utils python-any-r1 toolchain-funcs
-
-MY_P=pypy3.6-v${PV/_/}
-DESCRIPTION="PyPy3 executable (build from source)"
-HOMEPAGE="https://www.pypy.org/"
-SRC_URI="https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2"
-S="${WORKDIR}/${MY_P}-src"
-
-LICENSE="MIT"
-SLOT="${PV}"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="bzip2 +jit low-memory ncurses cpu_flags_x86_sse2"
-
-RDEPEND=">=sys-libs/zlib-1.1.3:0=
-	dev-libs/libffi:0=
-	virtual/libintl:0=
-	dev-libs/expat:0=
-	bzip2? ( app-arch/bzip2:0= )
-	ncurses? ( sys-libs/ncurses:0= )
-	!dev-python/pypy3-exe-bin:${PV}"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	low-memory? ( dev-python/pypy )
-	!low-memory? (
-		|| (
-			dev-python/pypy
-			dev-lang/python:2.7
-		)
-	)"
-
-check_env() {
-	if use low-memory; then
-		CHECKREQS_MEMORY="1750M"
-		use amd64 && CHECKREQS_MEMORY="3500M"
-	else
-		CHECKREQS_MEMORY="3G"
-		use amd64 && CHECKREQS_MEMORY="6G"
-	fi
-
-	check-reqs_pkg_pretend
-}
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && check_env
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		check_env
-
-		# unset to allow forcing pypy below :)
-		use low-memory && EPYTHON=
-		if [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]] &&
-				{ has_version -b dev-python/pypy ||
-				has_version -b dev-python/pypy-bin; }
-		then
-			einfo "Using PyPy to perform the translation."
-			EPYTHON=pypy
-		else
-			einfo "Using ${EPYTHON:-python2} to perform the translation. Please note that upstream"
-			einfo "recommends using PyPy for that. If you wish to do so, please install"
-			einfo "dev-python/pypy and ensure that EPYTHON variable is unset."
-			python-any-r1_pkg_setup
-		fi
-	fi
-}
-
-src_configure() {
-	tc-export CC
-
-	local jit_backend
-	if use jit; then
-		jit_backend='--jit-backend='
-
-		# We only need the explicit sse2 switch for x86.
-		# On other arches we can rely on autodetection which uses
-		# compiler macros. Plus, --jit-backend= doesn't accept all
-		# the modern values...
-
-		if use x86; then
-			if use cpu_flags_x86_sse2; then
-				jit_backend+=x86
-			else
-				jit_backend+=x86-without-sse2
-			fi
-		else
-			jit_backend+=auto
-		fi
-	fi
-
-	local args=(
-		--no-shared
-		$(usex jit -Ojit -O2)
-
-		${jit_backend}
-
-		pypy/goal/targetpypystandalone
-	)
-
-	# Avoid linking against libraries disabled by use flags
-	local opts=(
-		bzip2:bz2
-		ncurses:_minimal_curses
-	)
-
-	local opt
-	for opt in "${opts[@]}"; do
-		local flag=${opt%:*}
-		local mod=${opt#*:}
-
-		args+=(
-			$(usex ${flag} --withmod --withoutmod)-${mod}
-		)
-	done
-
-	local interp=( "${EPYTHON}" )
-	if use low-memory; then
-		interp=( env PYPY_GC_MAX_DELTA=200MB
-			"${EPYTHON}" --jit loop_longevity=300 )
-	fi
-
-	if [[ ${EPYTHON} != pypy ]]; then
-		# reuse bundled pycparser to avoid external dep
-		mkdir -p "${T}"/pymod/cffi || die
-		: > "${T}"/pymod/cffi/__init__.py || die
-		cp -r lib_pypy/cffi/_pycparser "${T}"/pymod/cffi/ || die
-		local -x PYTHONPATH=${T}/pymod:${PYTHONPATH}
-	fi
-
-	# translate into the C sources
-	# we're going to build them ourselves since otherwise pypy does not
-	# free up the unneeded memory before spawning the compiler
-	set -- "${interp[@]}" rpython/bin/rpython --batch --source "${args[@]}"
-	echo -e "\033[1m${@}\033[0m"
-	"${@}" || die "translation failed"
-}
-
-src_compile() {
-	emake -C "${T}"/usession*-0/testing_1
-}
-
-src_install() {
-	local dest=/usr/lib/pypy3.6
-	exeinto "${dest}"
-	newexe "${T}"/usession*-0/testing_1/pypy3-c pypy3-c-${PV}
-	insinto "${dest}"/include/${PV}
-	doins include/pypy_*
-	pax-mark m "${ED}${dest}/pypy3-c-${PV}"
-}
diff --git a/dev-python/pypy3-exe/pypy3-exe-7.3.3_p37_p1.ebuild b/dev-python/pypy3-exe/pypy3-exe-7.3.3_p37_p1.ebuild
index 27b0473f2566..3b5b032c10e7 100644
--- a/dev-python/pypy3-exe/pypy3-exe-7.3.3_p37_p1.ebuild
+++ b/dev-python/pypy3-exe/pypy3-exe-7.3.3_p37_p1.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/${MY_P}-src"
 
 LICENSE="MIT"
 SLOT="${PV%_p*}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="bzip2 +jit low-memory ncurses cpu_flags_x86_sse2"
 
 RDEPEND=">=sys-libs/zlib-1.1.3:0=
diff --git a/dev-python/pypy3-exe/pypy3-exe-7.3.3_p37.ebuild b/dev-python/pypy3-exe/pypy3-exe-7.3.3_p37_p2.ebuild
index e18b6cd2b56f..27b0473f2566 100644
--- a/dev-python/pypy3-exe/pypy3-exe-7.3.3_p37.ebuild
+++ b/dev-python/pypy3-exe/pypy3-exe-7.3.3_p37_p2.ebuild
@@ -7,15 +7,18 @@ EAPI=7
 PYTHON_COMPAT=( python2_7 )
 inherit check-reqs pax-utils python-any-r1 toolchain-funcs
 
-PYPY_PV=${PV%_p37}
+PYPY_PV=${PV%_p37*}
 MY_P=pypy3.7-v${PYPY_PV/_/}
+PATCHSET="pypy3.7-gentoo-patches-${PV/_p37}"
+
 DESCRIPTION="PyPy3 executable (build from source)"
 HOMEPAGE="https://www.pypy.org/"
-SRC_URI="https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2"
+SRC_URI="https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2
+	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz"
 S="${WORKDIR}/${MY_P}-src"
 
 LICENSE="MIT"
-SLOT="${PV}"
+SLOT="${PV%_p*}"
 KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="bzip2 +jit low-memory ncurses cpu_flags_x86_sse2"
 
@@ -25,7 +28,7 @@ RDEPEND=">=sys-libs/zlib-1.1.3:0=
 	dev-libs/expat:0=
 	bzip2? ( app-arch/bzip2:0= )
 	ncurses? ( sys-libs/ncurses:0= )
-	!dev-python/pypy3-exe-bin:${PV}"
+	!dev-python/pypy3-exe-bin:${PV%_p*}"
 DEPEND="${RDEPEND}"
 BDEPEND="
 	low-memory? ( dev-python/pypy )
@@ -73,6 +76,13 @@ pkg_setup() {
 	fi
 }
 
+src_prepare() {
+	local PATCHES=(
+		"${WORKDIR}/${PATCHSET}"
+	)
+	default
+}
+
 src_configure() {
 	tc-export CC
 
diff --git a/dev-python/pypy3/Manifest b/dev-python/pypy3/Manifest
index ab23a58ec28c..d33070ef76ca 100644
--- a/dev-python/pypy3/Manifest
+++ b/dev-python/pypy3/Manifest
@@ -1,13 +1,4 @@
-AUX 1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch 551 BLAKE2B efeecabe4ff7c8b0d6c845cfaab5eacc56e92da7614a0a7cfa2260a0ae93ebcd87d79c33444d16e57382bba55bdaf49f04c844c125a0a57c67119374f47e0b9e SHA512 9b6b5ede218cea96a424376677d52cbd7c23cd7f569756403849523fc79f8db27190e0bd80501a9e428688fd393397d2fa4e59a59607212993f4ac6d93b18733
-AUX 7.2.0-distutils-cxx.patch 14432 BLAKE2B 7c2f5a22457781c4b7d21954a3ffe7b1dfb55f12f890205cfe294316be86e7b206c4ce732f15fbf021c0fc87ed05a20aa57918cda869226efadb01e5fb2823a7 SHA512 7ccb64419d4ad90d03958bf6ddbb700a253fec75bceca7f9355f5f8496e1aba9ac72b09d0616600ebf8169d5ec705d6b058556905b032db8fb5abd23cf9b30e8
-AUX 7.3.1-gentoo-path.patch 1565 BLAKE2B 3c444b8112fd40de747fae75cc6d6f5ff8d2ecdafc17c76dde4d23169ecbde86ec6ca3e5a9646a719ea91ada57b8a7bf151ee3d63420730aae0a6003136551f7 SHA512 ce8258ac5c87b9c978ce780120c31848306a652d9b87ece90ba17ebbaee545806fc62e6f63538fc0cdf557c6b98eec8c0978fe4fbe3b24ea8e2ab9617c99b1ef
-AUX 7.3.2-py37-distutils-cxx.patch 14756 BLAKE2B 3524f2fbeef2b23a17c2248fbe07e0b194f2d6cc8be9c4ffec9c7a745421577d0c246a82c61afbd4af116f6ec756ce11988093e3e0a74337868530382206dd7d SHA512 e590266f1f6f5571b0056fbbf38c54bd7f07bebcdc009dbfaa3203aaeb3f70eac0f9b281df3ec04771960dea930b30ae861bb1dbc886fa28dfb8c58e484f6a8d
-AUX 7.3.3_p37-sni-handle.patch 1971 BLAKE2B 953b55283d9aceddf0dd6e6e6b786c3a472b012cb78e2398d58bc7f3be13438fc74aeb2c7d34de45d59546087b78b0f1babca0038c6f097f629273f41bf259be SHA512 6573a966a6a3f1256cdd8a97ac43088b1328fc8d7c3b386b784a2e4ffdfbdafc791f37e5ac3dca0cd0ad0b12e2aa9992e4188fce1a67e57f79c7cdaae7fcc44d
-AUX python-3.5-distutils-OO-build.patch 3627 BLAKE2B fe4fd23515f0d1cfc236ac3e773b6a70a9b0fbbaff4719c1f1621e21433cfdb1f53b6bf5f348069d7bf03d26bd039f793e4ef2ac4f6271062d83c088ccbab56d SHA512 5e8e4ab7d326386a244df9d0fca5b54e16b5943e35d12ecaf9ea986e79d2d8d8e85585f6286e0fc440dbb7a8c17e2bcf7a11498ff9cc5f523e97d8b353d9a511
-DIST pypy3.6-v7.3.3-src.tar.bz2 22484684 BLAKE2B a252e3070ec1c7cfd708cd694bd461d56241100463bac5ff7bbcf2d2667e01990ec8b4ceb947449ab1f620d0d5a8984bd8af3e2565555e5f73218e3c35ae1ebd SHA512 3bc9d9cc362f500e9e79c2694fc355706ac44d6dd5b8f5fb4d017d0997581472a9fdda08ccbe45469c7b52facdc0512be07843ba54d1d691fdb37f6628065879
 DIST pypy3.7-gentoo-patches-7.3.3_p1.tar.xz 13816 BLAKE2B 135a029e2d881ed5e43869fde391571285454b8612f2857fb5fe7aaf5b126f84d01293bd31e7a7746ad03fce1e14ace6a6f9cc2634269ec431b4aabfe70f9b4c SHA512 acf4938bc171e757196cf138358a298880792367ca5fff6b462d6971c8597e064777f99b687cb25003c6f25762a901ed482eebd791fdb008fa729ca9c9c300e8
 DIST pypy3.7-v7.3.3-src.tar.bz2 24633503 BLAKE2B 0fb9fbb8866cf661c5b1d8d029fb2bc50737fae097875d0dac86c9ec21dc907093173b350a4f89d2c5a1fbed4c92ca4919f047536b828d4ee35583d615e7ddce SHA512 c98955e72dc0bd0452e4e16e0fe0ab318a34d6d57217ea33349e98ed047597ba97be7d15b41edd4dc85028fcca0a6257a4bb98fe96ce876e41a04df012261f4a
-EBUILD pypy3-7.3.3.ebuild 6596 BLAKE2B f650d562771fc3e668fdf0ab0749ad84ba06f9b2ea6738da21b4f92d0acf65a487ec6d5088b99c9f56f681cc609e89a1b94f1fc53b2d79159cfabe1cb45a2ee8 SHA512 91ebc84c7c10ef44d613a014d9609a25ffdac0556a9f0ce2035f4329489d85deac80857b0f7f4f1c88e6d8d8b0c6ac2a3a8896fa70c9608fce2534a9c9f1ed5c
-EBUILD pypy3-7.3.3_p37-r1.ebuild 5529 BLAKE2B 7b4fa1b5687d4e3c15daafed23b5a1d4e00c0c5b46c50d38dbefa024ca464dfc415e74dea6426a0939690af6da9954f6f61d4f7c929028dd289cb01005976c15 SHA512 0421de6f206a4a111978589c477b173cb85dbc6cface5b8bdf11c0b18bd1a573dab7dbc1725e306fb963947eda5c6ae94ae963ca474004e1f495a236078bc174
-EBUILD pypy3-7.3.3_p37_p1-r1.ebuild 5265 BLAKE2B e31a9266cb254743c93743db0f0a489a33fac8f62ad2c237956223638c6ed891166c61d091838b67b3bfcfa83ba03106d4ca3a15e340ac85926f9d4c54b3f57a SHA512 975aff4e97dddbab316dbf5e86f6823dea0c5a2ddda76b47c1ce8327d309677e3e8f6cb95690daa4ec53dc130956ccb827c956c5d67e9e334d7906bd40b9255d
+EBUILD pypy3-7.3.3_p37_p1-r1.ebuild 5263 BLAKE2B 02d7989efa9610528133d6ebc5fb595065080485ba26e87211cf5ddf69f34f7d7a69631139bb5f5767e21ee960360803b82ebb1891762b2729546e9a0b98b21d SHA512 c30c387278501c4e945decb1d7cf4508590b15d0785eaff296d4e9701e36e143ef8c31b8cb85e5ae71a0f8705a13f7ac538eda105a124e5d280b64fa2596d19e
 MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/dev-python/pypy3/files/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch b/dev-python/pypy3/files/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch
deleted file mode 100644
index 29d99dcfdb73..000000000000
--- a/dev-python/pypy3/files/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/lib-python/3/distutils/unixccompiler.py
-+++ b/lib-python/3/distutils/unixccompiler.py
-@@ -297,7 +297,7 @@
-         # this time, there's no way to determine this information from
-         # the configuration data stored in the Python installation, so
-         # we use this hack.
--        compiler = os.path.basename(sysconfig.get_config_var("CC"))
-+        compiler = os.path.basename(self.compiler[0])
-         if sys.platform[:6] == "darwin":
-             # MacOSX's linker doesn't understand the -R flag at all
-             return "-L" + dir
diff --git a/dev-python/pypy3/files/7.2.0-distutils-cxx.patch b/dev-python/pypy3/files/7.2.0-distutils-cxx.patch
deleted file mode 100644
index 89a38050c804..000000000000
--- a/dev-python/pypy3/files/7.2.0-distutils-cxx.patch
+++ /dev/null
@@ -1,306 +0,0 @@
-diff --git a/lib-python/3/distutils/cygwinccompiler.py b/lib-python/3/distutils/cygwinccompiler.py
-index 1c36990..ead3174 100644
---- a/lib-python/3/distutils/cygwinccompiler.py
-+++ b/lib-python/3/distutils/cygwinccompiler.py
-@@ -125,8 +125,10 @@ class CygwinCCompiler(UnixCCompiler):
-         # dllwrap 2.10.90 is buggy
-         if self.ld_version >= "2.10.90":
-             self.linker_dll = "gcc"
-+            self.linker_dll_cxx = "g++"
-         else:
-             self.linker_dll = "dllwrap"
-+            self.linker_dll_cxx = "dllwrap"
- 
-         # ld_version >= "2.13" support -shared so use it instead of
-         # -mdll -static
-@@ -140,9 +142,13 @@ class CygwinCCompiler(UnixCCompiler):
-         self.set_executables(compiler='gcc -mcygwin -O -Wall',
-                              compiler_so='gcc -mcygwin -mdll -O -Wall',
-                              compiler_cxx='g++ -mcygwin -O -Wall',
-+                             compiler_so_cxx='g++ -mcygwin -mdll -O -Wall',
-                              linker_exe='gcc -mcygwin',
-                              linker_so=('%s -mcygwin %s' %
--                                        (self.linker_dll, shared_option)))
-+                                        (self.linker_dll, shared_option)),
-+                             linker_exe_cxx='g++ -mcygwin',
-+                             linker_so_cxx=('%s -mcygwin %s' %
-+                                            (self.linker_dll_cxx, shared_option)))
- 
-         # cygwin and mingw32 need different sets of libraries
-         if self.gcc_version == "2.91.57":
-@@ -166,8 +172,12 @@ class CygwinCCompiler(UnixCCompiler):
-                 raise CompileError(msg)
-         else: # for other files use the C-compiler
-             try:
--                self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
--                           extra_postargs)
-+                if self.detect_language(src) == 'c++':
-+                    self.spawn(self.compiler_so_cxx + cc_args + [src, '-o', obj] +
-+                               extra_postargs)
-+                else:
-+                    self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
-+                               extra_postargs)
-             except DistutilsExecError as msg:
-                 raise CompileError(msg)
- 
-@@ -302,9 +312,14 @@ class Mingw32CCompiler(CygwinCCompiler):
-         self.set_executables(compiler='gcc -O -Wall',
-                              compiler_so='gcc -mdll -O -Wall',
-                              compiler_cxx='g++ -O -Wall',
-+                             compiler_so_cxx='g++ -mdll -O -Wall',
-                              linker_exe='gcc',
-                              linker_so='%s %s %s'
-                                         % (self.linker_dll, shared_option,
-+                                           entry_point),
-+                             linker_exe_cxx='g++',
-+                             linker_so_cxx='%s %s %s'
-+                                        % (self.linker_dll_cxx, shared_option,
-                                            entry_point))
-         # Maybe we should also append -mthreads, but then the finished
-         # dlls need another dll (mingwm10.dll see Mingw32 docs)
-diff --git a/lib-python/3/distutils/sysconfig_cpython.py b/lib-python/3/distutils/sysconfig_cpython.py
-index b8340f1..a8c5473 100644
---- a/lib-python/3/distutils/sysconfig_cpython.py
-+++ b/lib-python/3/distutils/sysconfig_cpython.py
-@@ -170,9 +170,12 @@ def customize_compiler(compiler):
-                 _osx_support.customize_compiler(_config_vars)
-                 _config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True'
- 
--        (cc, cxx, opt, cflags, ccshared, ldshared, shlib_suffix, ar, ar_flags) = \
--            get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS',
--                            'CCSHARED', 'LDSHARED', 'SHLIB_SUFFIX', 'AR', 'ARFLAGS')
-+        (cc, cxx, ccshared, ldshared, ldcxxshared, shlib_suffix, ar, ar_flags) = \
-+            get_config_vars('CC', 'CXX', 'CCSHARED', 'LDSHARED', 'LDCXXSHARED',
-+                            'SHLIB_SUFFIX', 'AR', 'ARFLAGS')
-+
-+        cflags = ''
-+        cxxflags = ''
- 
-         if 'CC' in os.environ:
-             newcc = os.environ['CC']
-@@ -187,19 +190,27 @@ def customize_compiler(compiler):
-             cxx = os.environ['CXX']
-         if 'LDSHARED' in os.environ:
-             ldshared = os.environ['LDSHARED']
-+        if 'LDCXXSHARED' in os.environ:
-+            ldcxxshared = os.environ['LDCXXSHARED']
-         if 'CPP' in os.environ:
-             cpp = os.environ['CPP']
-         else:
-             cpp = cc + " -E"           # not always
-         if 'LDFLAGS' in os.environ:
-             ldshared = ldshared + ' ' + os.environ['LDFLAGS']
-+            ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS']
-         if 'CFLAGS' in os.environ:
--            cflags = opt + ' ' + os.environ['CFLAGS']
-+            cflags = os.environ['CFLAGS']
-             ldshared = ldshared + ' ' + os.environ['CFLAGS']
-+        if 'CXXFLAGS' in os.environ:
-+            cxxflags = os.environ['CXXFLAGS']
-+            ldcxxshared = ldcxxshared + ' ' + os.environ['CXXFLAGS']
-         if 'CPPFLAGS' in os.environ:
-             cpp = cpp + ' ' + os.environ['CPPFLAGS']
-             cflags = cflags + ' ' + os.environ['CPPFLAGS']
-+            cxxflags = cxxflags + ' ' + os.environ['CPPFLAGS']
-             ldshared = ldshared + ' ' + os.environ['CPPFLAGS']
-+            ldcxxshared = ldcxxshared + ' ' + os.environ['CPPFLAGS']
-         if 'AR' in os.environ:
-             ar = os.environ['AR']
-         if 'ARFLAGS' in os.environ:
-@@ -208,13 +219,17 @@ def customize_compiler(compiler):
-             archiver = ar + ' ' + ar_flags
- 
-         cc_cmd = cc + ' ' + cflags
-+        cxx_cmd = cxx + ' ' + cxxflags
-         compiler.set_executables(
-             preprocessor=cpp,
-             compiler=cc_cmd,
-             compiler_so=cc_cmd + ' ' + ccshared,
--            compiler_cxx=cxx,
-+            compiler_cxx=cxx_cmd,
-+            compiler_so_cxx=cxx_cmd + ' ' + ccshared,
-             linker_so=ldshared,
-             linker_exe=cc,
-+            linker_so_cxx=ldcxxshared,
-+            linker_exe_cxx=cxx,
-             archiver=archiver)
- 
-         compiler.shared_lib_extension = shlib_suffix
-diff --git a/lib-python/3/distutils/sysconfig_pypy.py b/lib-python/3/distutils/sysconfig_pypy.py
-index bf1748e..70dfd72 100644
---- a/lib-python/3/distutils/sysconfig_pypy.py
-+++ b/lib-python/3/distutils/sysconfig_pypy.py
-@@ -145,36 +145,52 @@ def customize_compiler(compiler):
-                 _osx_support.customize_compiler(_config_vars)
-                 _config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True'
- 
--        (cc, cxx, opt, cflags, ccshared, ldshared, shlib_suffix, ar, ar_flags) = \
--            get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS',
--                            'CCSHARED', 'LDSHARED', 'SHLIB_SUFFIX', 'AR', 'ARFLAGS')
-+        (cc, cxx, ccshared, ldshared, ldcxxshared, shlib_suffix, ar, ar_flags) = \
-+            get_config_vars('CC', 'CXX', 'CCSHARED', 'LDSHARED', 'LDCXXSHARED',
-+                            'SHLIB_SUFFIX', 'AR', 'ARFLAGS')
-+
-+        cflags = ''
-+        cxxflags = ''
- 
-         if 'CC' in os.environ:
-             newcc = os.environ['CC']
--            if (sys.platform == 'darwin'
-+            if (True
-                     and 'LDSHARED' not in os.environ
-                     and ldshared.startswith(cc)):
-                 # On OS X, if CC is overridden, use that as the default
-                 #       command for LDSHARED as well
-+                # Gentoo: s/OS X/every system/
-                 ldshared = newcc + ldshared[len(cc):]
-             cc = newcc
-         if 'CXX' in os.environ:
--            cxx = os.environ['CXX']
-+            newcxx = os.environ['CXX']
-+            if ('LDCXXSHARED' not in os.environ
-+                    and ldcxxshared.startswith(cxx)):
-+                ldcxxshared = newcxx + ldcxxshared[len(cxx):]
-+            cxx = newcxx
-         if 'LDSHARED' in os.environ:
-             ldshared = os.environ['LDSHARED']
-+        if 'LDCXXSHARED' in os.environ:
-+            ldcxxshared = os.environ['LDCXXSHARED']
-         if 'CPP' in os.environ:
-             cpp = os.environ['CPP']
-         else:
-             cpp = cc + " -E"           # not always
-         if 'LDFLAGS' in os.environ:
-             ldshared = ldshared + ' ' + os.environ['LDFLAGS']
-+            ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS']
-         if 'CFLAGS' in os.environ:
--            cflags = opt + ' ' + os.environ['CFLAGS']
-+            cflags = os.environ['CFLAGS']
-             ldshared = ldshared + ' ' + os.environ['CFLAGS']
-+        if 'CXXFLAGS' in os.environ:
-+            cxxflags = os.environ['CXXFLAGS']
-+            ldcxxshared = ldcxxshared + ' ' + os.environ['CXXFLAGS']
-         if 'CPPFLAGS' in os.environ:
-             cpp = cpp + ' ' + os.environ['CPPFLAGS']
-             cflags = cflags + ' ' + os.environ['CPPFLAGS']
-+            cxxflags = cxxflags + ' ' + os.environ['CPPFLAGS']
-             ldshared = ldshared + ' ' + os.environ['CPPFLAGS']
-+            ldcxxshared = ldcxxshared + ' ' + os.environ['CPPFLAGS']
-         if 'AR' in os.environ:
-             ar = os.environ['AR']
-         if 'ARFLAGS' in os.environ:
-@@ -183,13 +199,17 @@ def customize_compiler(compiler):
-             archiver = ar + ' ' + ar_flags
- 
-         cc_cmd = cc + ' ' + cflags
-+        cxx_cmd = cxx + ' ' + cxxflags
-         compiler.set_executables(
-             preprocessor=cpp,
-             compiler=cc_cmd,
-             compiler_so=cc_cmd + ' ' + ccshared,
--            compiler_cxx=cxx,
-+            compiler_cxx=cxx_cmd,
-+            compiler_so_cxx=cxx_cmd + ' ' + ccshared,
-             linker_so=ldshared,
-             linker_exe=cc,
-+            linker_so_cxx=ldcxxshared,
-+            linker_exe_cxx=cxx,
-             archiver=archiver)
- 
-         compiler.shared_lib_extension = shlib_suffix
-diff --git a/lib-python/3/distutils/unixccompiler.py b/lib-python/3/distutils/unixccompiler.py
-index 2944ceb..cf2f219 100644
---- a/lib-python/3/distutils/unixccompiler.py
-+++ b/lib-python/3/distutils/unixccompiler.py
-@@ -52,14 +52,17 @@ class UnixCCompiler(CCompiler):
-     # are pretty generic; they will probably have to be set by an outsider
-     # (eg. using information discovered by the sysconfig about building
-     # Python extensions).
--    executables = {'preprocessor' : None,
--                   'compiler'     : ["cc"],
--                   'compiler_so'  : ["cc"],
--                   'compiler_cxx' : ["c++"],  # pypy: changed, 'cc' is bogus
--                   'linker_so'    : ["cc", "-shared"],
--                   'linker_exe'   : ["cc"],
--                   'archiver'     : ["ar", "-cr"],
--                   'ranlib'       : None,
-+    executables = {'preprocessor'    : None,
-+                   'compiler'        : ["cc"],
-+                   'compiler_so'     : ["cc"],
-+                   'compiler_cxx'    : ["c++"],
-+                   'compiler_so_cxx' : ["c++"],
-+                   'linker_so'       : ["cc", "-shared"],
-+                   'linker_exe'      : ["cc"],
-+                   'linker_so_cxx'   : ["c++", "-shared"],
-+                   'linker_exe_cxx'  : ["c++"],
-+                   'archiver'        : ["ar", "-cr"],
-+                   'ranlib'          : None,
-                   }
- 
-     if sys.platform[:6] == "darwin":
-@@ -125,12 +128,19 @@ class UnixCCompiler(CCompiler):
- 
-     def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts):
-         compiler_so = self.compiler_so
-+        compiler_so_cxx = self.compiler_so_cxx
-         if sys.platform == 'darwin':
-             compiler_so = _osx_support.compiler_fixup(compiler_so,
-                                                     cc_args + extra_postargs)
-+            compiler_so_cxx = _osx_support.compiler_fixup(compiler_so_cxx,
-+                                                    cc_args + extra_postargs)
-         try:
--            self.spawn(compiler_so + cc_args + [src, '-o', obj] +
--                       extra_postargs)
-+            if self.detect_language(src) == 'c++':
-+                self.spawn(compiler_so_cxx + cc_args + [src, '-o', obj] +
-+                           extra_postargs)
-+            else:
-+                self.spawn(compiler_so + cc_args + [src, '-o', obj] +
-+                           extra_postargs)
-         except DistutilsExecError as msg:
-             raise CompileError(msg)
- 
-@@ -188,22 +198,16 @@ class UnixCCompiler(CCompiler):
-                 ld_args.extend(extra_postargs)
-             self.mkpath(os.path.dirname(output_filename))
-             try:
--                if target_desc == CCompiler.EXECUTABLE:
--                    linker = self.linker_exe[:]
-+                if target_lang == "c++":
-+                    if target_desc == CCompiler.EXECUTABLE:
-+                        linker = self.linker_exe_cxx[:]
-+                    else:
-+                        linker = self.linker_so_cxx[:]
-                 else:
--                    linker = self.linker_so[:]
--                if target_lang == "c++" and self.compiler_cxx:
--                    # skip over environment variable settings if /usr/bin/env
--                    # is used to set up the linker's environment.
--                    # This is needed on OSX. Note: this assumes that the
--                    # normal and C++ compiler have the same environment
--                    # settings.
--                    i = 0
--                    if os.path.basename(linker[0]) == "env":
--                        i = 1
--                        while '=' in linker[i]:
--                            i += 1
--                    linker[i] = self.compiler_cxx[i]
-+                    if target_desc == CCompiler.EXECUTABLE:
-+                        linker = self.linker_exe[:]
-+                    else:
-+                        linker = self.linker_so[:]
- 
-                 if sys.platform == 'darwin':
-                     linker = _osx_support.compiler_fixup(linker, ld_args)
-diff --git a/lib_pypy/_sysconfigdata.py b/lib_pypy/_sysconfigdata.py
-index 4d2b0bc..5ed9641 100644
---- a/lib_pypy/_sysconfigdata.py
-+++ b/lib_pypy/_sysconfigdata.py
-@@ -15,6 +15,7 @@ build_time_vars = {
-     'CFLAGS': "-DNDEBUG -O2",
-     'CCSHARED': "-fPIC",
-     'LDSHARED': "cc -pthread -shared",
-+    'LDCXXSHARED': "c++ -pthread -shared",
-     'EXT_SUFFIX': so_ext,
-     'SHLIB_SUFFIX': ".so",
-     'AR': "ar",
diff --git a/dev-python/pypy3/files/7.3.1-gentoo-path.patch b/dev-python/pypy3/files/7.3.1-gentoo-path.patch
deleted file mode 100644
index fba00b9fcac3..000000000000
--- a/dev-python/pypy3/files/7.3.1-gentoo-path.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 6d439c6718625bb7dce32b0afdc6a3d5168a21e5 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Sat, 11 Apr 2020 07:01:27 +0200
-Subject: [PATCH] Support Gentoo install scheme
-
----
- lib-python/3/distutils/command/install.py | 12 +++++++++++-
- 1 file changed, 11 insertions(+), 1 deletion(-)
-
-diff --git a/lib-python/3/distutils/command/install.py b/lib-python/3/distutils/command/install.py
-index 6fe62be..a4e9f0d 100644
---- a/lib-python/3/distutils/command/install.py
-+++ b/lib-python/3/distutils/command/install.py
-@@ -97,6 +97,13 @@ INSTALL_SCHEMES = {
-         'scripts': '$base/Scripts',
-         'data'   : '$base',
-         },
-+    'gentoo': {
-+        'purelib': '$base/site-packages',
-+        'platlib': '$base/site-packages',
-+        'headers': '$base/include/$dist_name',
-+        'scripts': '@EPREFIX@/usr/bin',
-+        'data'   : '@EPREFIX@/usr',
-+        },
-     }
- 
- # The keys to an installation scheme; if any new types of files are to be
-@@ -483,7 +490,10 @@ class install (Command):
-         # it's the caller's problem if they supply a bad name!
-         if (hasattr(sys, 'pypy_version_info') and
-                 not name.endswith(('_user', '_home'))):
--            if os.name == 'nt':
-+            if self.install_base.startswith(os.path.normpath('@EPREFIX@/usr/lib/pypy')):
-+                # override paths for system-wide install
-+                name = 'gentoo'
-+            elif os.name == 'nt':
-                 name = 'pypy_nt'
-             else:
-                 name = 'pypy'
--- 
-2.26.0
-
diff --git a/dev-python/pypy3/files/7.3.2-py37-distutils-cxx.patch b/dev-python/pypy3/files/7.3.2-py37-distutils-cxx.patch
deleted file mode 100644
index d126edacc6b9..000000000000
--- a/dev-python/pypy3/files/7.3.2-py37-distutils-cxx.patch
+++ /dev/null
@@ -1,314 +0,0 @@
-diff --git a/lib-python/3/distutils/cygwinccompiler.py b/lib-python/3/distutils/cygwinccompiler.py
-index 6c5d777..640fa2d 100644
---- a/lib-python/3/distutils/cygwinccompiler.py
-+++ b/lib-python/3/distutils/cygwinccompiler.py
-@@ -125,8 +125,10 @@ class CygwinCCompiler(UnixCCompiler):
-         # dllwrap 2.10.90 is buggy
-         if self.ld_version >= "2.10.90":
-             self.linker_dll = "gcc"
-+            self.linker_dll_cxx = "g++"
-         else:
-             self.linker_dll = "dllwrap"
-+            self.linker_dll_cxx = "dllwrap"
- 
-         # ld_version >= "2.13" support -shared so use it instead of
-         # -mdll -static
-@@ -140,9 +142,13 @@ class CygwinCCompiler(UnixCCompiler):
-         self.set_executables(compiler='gcc -mcygwin -O -Wall',
-                              compiler_so='gcc -mcygwin -mdll -O -Wall',
-                              compiler_cxx='g++ -mcygwin -O -Wall',
-+                             compiler_so_cxx='g++ -mcygwin -mdll -O -Wall',
-                              linker_exe='gcc -mcygwin',
-                              linker_so=('%s -mcygwin %s' %
--                                        (self.linker_dll, shared_option)))
-+                                        (self.linker_dll, shared_option)),
-+                             linker_exe_cxx='g++ -mcygwin',
-+                             linker_so_cxx=('%s -mcygwin %s' %
-+                                            (self.linker_dll_cxx, shared_option)))
- 
-         # cygwin and mingw32 need different sets of libraries
-         if self.gcc_version == "2.91.57":
-@@ -166,8 +172,12 @@ class CygwinCCompiler(UnixCCompiler):
-                 raise CompileError(msg)
-         else: # for other files use the C-compiler
-             try:
--                self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
--                           extra_postargs)
-+                if self.detect_language(src) == 'c++':
-+                    self.spawn(self.compiler_so_cxx + cc_args + [src, '-o', obj] +
-+                               extra_postargs)
-+                else:
-+                    self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
-+                               extra_postargs)
-             except DistutilsExecError as msg:
-                 raise CompileError(msg)
- 
-@@ -302,9 +312,14 @@ class Mingw32CCompiler(CygwinCCompiler):
-         self.set_executables(compiler='gcc -O -Wall',
-                              compiler_so='gcc -mdll -O -Wall',
-                              compiler_cxx='g++ -O -Wall',
-+                             compiler_so_cxx='g++ -mdll -O -Wall',
-                              linker_exe='gcc',
-                              linker_so='%s %s %s'
-                                         % (self.linker_dll, shared_option,
-+                                           entry_point),
-+                             linker_exe_cxx='g++',
-+                             linker_so_cxx='%s %s %s'
-+                                        % (self.linker_dll_cxx, shared_option,
-                                            entry_point))
-         # Maybe we should also append -mthreads, but then the finished
-         # dlls need another dll (mingwm10.dll see Mingw32 docs)
-diff --git a/lib-python/3/distutils/sysconfig_cpython.py b/lib-python/3/distutils/sysconfig_cpython.py
-index 484721f..0088dd4 100644
---- a/lib-python/3/distutils/sysconfig_cpython.py
-+++ b/lib-python/3/distutils/sysconfig_cpython.py
-@@ -188,9 +188,13 @@ def customize_compiler(compiler):
-                 _osx_support.customize_compiler(_config_vars)
-                 _config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True'
- 
--        (cc, cxx, cflags, ccshared, ldshared, shlib_suffix, ar, ar_flags) = \
--            get_config_vars('CC', 'CXX', 'CFLAGS',
--                            'CCSHARED', 'LDSHARED', 'SHLIB_SUFFIX', 'AR', 'ARFLAGS')
-+        (cc, cxx, ccshared, ldshared, ldcxxshared, shlib_suffix, ar, ar_flags) = \
-+            get_config_vars('CC', 'CXX',
-+                            'CCSHARED', 'LDSHARED', 'LDCXXSHARED',
-+                            'SHLIB_SUFFIX', 'AR', 'ARFLAGS')
-+
-+        cflags = ''
-+        cxxflags = ''
- 
-         if 'CC' in os.environ:
-             newcc = os.environ['CC']
-@@ -205,19 +209,27 @@ def customize_compiler(compiler):
-             cxx = os.environ['CXX']
-         if 'LDSHARED' in os.environ:
-             ldshared = os.environ['LDSHARED']
-+        if 'LDCXXSHARED' in os.environ:
-+            ldcxxshared = os.environ['LDCXXSHARED']
-         if 'CPP' in os.environ:
-             cpp = os.environ['CPP']
-         else:
-             cpp = cc + " -E"           # not always
-         if 'LDFLAGS' in os.environ:
-             ldshared = ldshared + ' ' + os.environ['LDFLAGS']
-+            ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS']
-         if 'CFLAGS' in os.environ:
--            cflags = cflags + ' ' + os.environ['CFLAGS']
-+            cflags = os.environ['CFLAGS']
-             ldshared = ldshared + ' ' + os.environ['CFLAGS']
-+        if 'CXXFLAGS' in os.environ:
-+            cxxflags = os.environ['CXXFLAGS']
-+            ldcxxshared = ldcxxshared + ' ' + os.environ['CXXFLAGS']
-         if 'CPPFLAGS' in os.environ:
-             cpp = cpp + ' ' + os.environ['CPPFLAGS']
-             cflags = cflags + ' ' + os.environ['CPPFLAGS']
-+            cxxflags = cxxflags + ' ' + os.environ['CPPFLAGS']
-             ldshared = ldshared + ' ' + os.environ['CPPFLAGS']
-+            ldcxxshared = ldcxxshared + ' ' + os.environ['CPPFLAGS']
-         if 'AR' in os.environ:
-             ar = os.environ['AR']
-         if 'ARFLAGS' in os.environ:
-@@ -226,13 +238,17 @@ def customize_compiler(compiler):
-             archiver = ar + ' ' + ar_flags
- 
-         cc_cmd = cc + ' ' + cflags
-+        cxx_cmd = cxx + ' ' + cxxflags
-         compiler.set_executables(
-             preprocessor=cpp,
-             compiler=cc_cmd,
-             compiler_so=cc_cmd + ' ' + ccshared,
--            compiler_cxx=cxx,
-+            compiler_cxx=cxx_cmd,
-+            compiler_so_cxx=cxx_cmd + ' ' + ccshared,
-             linker_so=ldshared,
-             linker_exe=cc,
-+            linker_so_cxx=ldcxxshared,
-+            linker_exe_cxx=cxx,
-             archiver=archiver)
- 
-         compiler.shared_lib_extension = shlib_suffix
-diff --git a/lib-python/3/distutils/sysconfig_pypy.py b/lib-python/3/distutils/sysconfig_pypy.py
-index bf1748e..70dfd72 100644
---- a/lib-python/3/distutils/sysconfig_pypy.py
-+++ b/lib-python/3/distutils/sysconfig_pypy.py
-@@ -145,36 +145,52 @@ def customize_compiler(compiler):
-                 _osx_support.customize_compiler(_config_vars)
-                 _config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True'
- 
--        (cc, cxx, opt, cflags, ccshared, ldshared, shlib_suffix, ar, ar_flags) = \
--            get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS',
--                            'CCSHARED', 'LDSHARED', 'SHLIB_SUFFIX', 'AR', 'ARFLAGS')
-+        (cc, cxx, ccshared, ldshared, ldcxxshared, shlib_suffix, ar, ar_flags) = \
-+            get_config_vars('CC', 'CXX', 'CCSHARED', 'LDSHARED', 'LDCXXSHARED',
-+                            'SHLIB_SUFFIX', 'AR', 'ARFLAGS')
-+
-+        cflags = ''
-+        cxxflags = ''
- 
-         if 'CC' in os.environ:
-             newcc = os.environ['CC']
--            if (sys.platform == 'darwin'
-+            if (True
-                     and 'LDSHARED' not in os.environ
-                     and ldshared.startswith(cc)):
-                 # On OS X, if CC is overridden, use that as the default
-                 #       command for LDSHARED as well
-+                # Gentoo: s/OS X/every system/
-                 ldshared = newcc + ldshared[len(cc):]
-             cc = newcc
-         if 'CXX' in os.environ:
--            cxx = os.environ['CXX']
-+            newcxx = os.environ['CXX']
-+            if ('LDCXXSHARED' not in os.environ
-+                    and ldcxxshared.startswith(cxx)):
-+                ldcxxshared = newcxx + ldcxxshared[len(cxx):]
-+            cxx = newcxx
-         if 'LDSHARED' in os.environ:
-             ldshared = os.environ['LDSHARED']
-+        if 'LDCXXSHARED' in os.environ:
-+            ldcxxshared = os.environ['LDCXXSHARED']
-         if 'CPP' in os.environ:
-             cpp = os.environ['CPP']
-         else:
-             cpp = cc + " -E"           # not always
-         if 'LDFLAGS' in os.environ:
-             ldshared = ldshared + ' ' + os.environ['LDFLAGS']
-+            ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS']
-         if 'CFLAGS' in os.environ:
--            cflags = opt + ' ' + os.environ['CFLAGS']
-+            cflags = os.environ['CFLAGS']
-             ldshared = ldshared + ' ' + os.environ['CFLAGS']
-+        if 'CXXFLAGS' in os.environ:
-+            cxxflags = os.environ['CXXFLAGS']
-+            ldcxxshared = ldcxxshared + ' ' + os.environ['CXXFLAGS']
-         if 'CPPFLAGS' in os.environ:
-             cpp = cpp + ' ' + os.environ['CPPFLAGS']
-             cflags = cflags + ' ' + os.environ['CPPFLAGS']
-+            cxxflags = cxxflags + ' ' + os.environ['CPPFLAGS']
-             ldshared = ldshared + ' ' + os.environ['CPPFLAGS']
-+            ldcxxshared = ldcxxshared + ' ' + os.environ['CPPFLAGS']
-         if 'AR' in os.environ:
-             ar = os.environ['AR']
-         if 'ARFLAGS' in os.environ:
-@@ -183,13 +199,17 @@ def customize_compiler(compiler):
-             archiver = ar + ' ' + ar_flags
- 
-         cc_cmd = cc + ' ' + cflags
-+        cxx_cmd = cxx + ' ' + cxxflags
-         compiler.set_executables(
-             preprocessor=cpp,
-             compiler=cc_cmd,
-             compiler_so=cc_cmd + ' ' + ccshared,
--            compiler_cxx=cxx,
-+            compiler_cxx=cxx_cmd,
-+            compiler_so_cxx=cxx_cmd + ' ' + ccshared,
-             linker_so=ldshared,
-             linker_exe=cc,
-+            linker_so_cxx=ldcxxshared,
-+            linker_exe_cxx=cxx,
-             archiver=archiver)
- 
-         compiler.shared_lib_extension = shlib_suffix
-diff --git a/lib-python/3/distutils/unixccompiler.py b/lib-python/3/distutils/unixccompiler.py
-index 06fc718..c3773f0 100644
---- a/lib-python/3/distutils/unixccompiler.py
-+++ b/lib-python/3/distutils/unixccompiler.py
-@@ -52,14 +52,17 @@ class UnixCCompiler(CCompiler):
-     # are pretty generic; they will probably have to be set by an outsider
-     # (eg. using information discovered by the sysconfig about building
-     # Python extensions).
--    executables = {'preprocessor' : None,
--                   'compiler'     : ["cc"],
--                   'compiler_so'  : ["cc"],
--                   'compiler_cxx' : ["c++"],  # pypy: changed, 'cc' is bogus
--                   'linker_so'    : ["cc", "-shared"],
--                   'linker_exe'   : ["cc"],
--                   'archiver'     : ["ar", "-cr"],
--                   'ranlib'       : None,
-+    executables = {'preprocessor'    : None,
-+                   'compiler'        : ["cc"],
-+                   'compiler_so'     : ["cc"],
-+                   'compiler_cxx'    : ["c++"],
-+                   'compiler_so_cxx' : ["c++"],
-+                   'linker_so'       : ["cc", "-shared"],
-+                   'linker_exe'      : ["cc"],
-+                   'linker_so_cxx'   : ["c++", "-shared"],
-+                   'linker_exe_cxx'  : ["c++"],
-+                   'archiver'        : ["ar", "-cr"],
-+                   'ranlib'          : None,
-                   }
- 
-     if sys.platform[:6] == "darwin":
-@@ -125,12 +128,19 @@ class UnixCCompiler(CCompiler):
- 
-     def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts):
-         compiler_so = self.compiler_so
-+        compiler_so_cxx = self.compiler_so_cxx
-         if sys.platform == 'darwin':
-             compiler_so = _osx_support.compiler_fixup(compiler_so,
-                                                     cc_args + extra_postargs)
-+            compiler_so_cxx = _osx_support.compiler_fixup(compiler_so_cxx,
-+                                                    cc_args + extra_postargs)
-         try:
--            self.spawn(compiler_so + cc_args + [src, '-o', obj] +
--                       extra_postargs)
-+            if self.detect_language(src) == 'c++':
-+                self.spawn(compiler_so_cxx + cc_args + [src, '-o', obj] +
-+                           extra_postargs)
-+            else:
-+                self.spawn(compiler_so + cc_args + [src, '-o', obj] +
-+                           extra_postargs)
-         except DistutilsExecError as msg:
-             raise CompileError(msg)
- 
-@@ -188,30 +198,16 @@ class UnixCCompiler(CCompiler):
-                 ld_args.extend(extra_postargs)
-             self.mkpath(os.path.dirname(output_filename))
-             try:
--                if target_desc == CCompiler.EXECUTABLE:
--                    linker = self.linker_exe[:]
-+                if target_lang == "c++":
-+                    if target_desc == CCompiler.EXECUTABLE:
-+                        linker = self.linker_exe_cxx[:]
-+                    else:
-+                        linker = self.linker_so_cxx[:]
-                 else:
--                    linker = self.linker_so[:]
--                if target_lang == "c++" and self.compiler_cxx:
--                    # skip over environment variable settings if /usr/bin/env
--                    # is used to set up the linker's environment.
--                    # This is needed on OSX. Note: this assumes that the
--                    # normal and C++ compiler have the same environment
--                    # settings.
--                    i = 0
--                    if os.path.basename(linker[0]) == "env":
--                        i = 1
--                        while '=' in linker[i]:
--                            i += 1
--
--                    if os.path.basename(linker[i]) == 'ld_so_aix':
--                        # AIX platforms prefix the compiler with the ld_so_aix
--                        # script, so we need to adjust our linker index
--                        offset = 1
-+                    if target_desc == CCompiler.EXECUTABLE:
-+                        linker = self.linker_exe[:]
-                     else:
--                        offset = 0
--
--                    linker[i+offset] = self.compiler_cxx[i]
-+                        linker = self.linker_so[:]
- 
-                 if sys.platform == 'darwin':
-                     linker = _osx_support.compiler_fixup(linker, ld_args)
-diff --git a/lib_pypy/_sysconfigdata.py b/lib_pypy/_sysconfigdata.py
-index f1cca41..3ec5b4c 100644
---- a/lib_pypy/_sysconfigdata.py
-+++ b/lib_pypy/_sysconfigdata.py
-@@ -20,6 +20,7 @@ build_time_vars = {
-     'CFLAGS': "-DNDEBUG -O2",
-     'CCSHARED': "-fPIC",
-     'LDSHARED': "cc -pthread -shared",
-+    'LDCXXSHARED': "c++ -pthread -shared",
-     'EXT_SUFFIX': so_ext,
-     'SHLIB_SUFFIX': ".so",
-     'AR': "ar",
diff --git a/dev-python/pypy3/files/7.3.3_p37-sni-handle.patch b/dev-python/pypy3/files/7.3.3_p37-sni-handle.patch
deleted file mode 100644
index c4e377c3d8d8..000000000000
--- a/dev-python/pypy3/files/7.3.3_p37-sni-handle.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff -dupr a/lib_pypy/_cffi_ssl/_stdssl/__init__.py b/lib_pypy/_cffi_ssl/_stdssl/__init__.py
---- a/lib_pypy/_cffi_ssl/_stdssl/__init__.py	2021-02-10 00:15:40.815208732 +0100
-+++ b/lib_pypy/_cffi_ssl/_stdssl/__init__.py	2021-02-10 00:19:27.963109365 +0100
-@@ -1008,10 +1008,10 @@ for name in SSL_CTX_STATS_NAMES:
-     SSL_CTX_STATS.append((name, getattr(lib, attr)))
- 
- class _SSLContext(object):
--    __slots__ = ('ctx', '_check_hostname', 'servername_callback',
-+    __slots__ = ('ctx', '_check_hostname',
-                  'alpn_protocols', '_alpn_protocols_handle', '_protocol'
-                  'npn_protocols', 'set_hostname', '_post_handshake_auth',
--                 '_sni_cb', '_npn_protocols_handle')
-+                 '_sni_cb', '_sni_cb_handle', '_npn_protocols_handle')
-     def __new__(cls, protocol):
-         self = object.__new__(cls)
-         self.ctx = ffi.NULL
-@@ -1451,15 +1451,17 @@ class _SSLContext(object):
-                     "is not in the current OpenSSL library.")
-         if cb is None:
-             lib.SSL_CTX_set_tlsext_servername_callback(self.ctx, ffi.NULL)
--            self._sni_cb= None
-+            self._sni_cb = None
-+            lib.SSL_CTX_set_tlsext_servername_arg(self.ctx, ffi.NULL)
-+            self._sni_cb_handle = None
-             return
-         if not callable(cb):
-             lib.SSL_CTX_set_tlsext_servername_callback(self.ctx, ffi.NULL)
-             raise TypeError("not a callable object")
--        self.scb = ServernameCallback(cb, self)
--        sni_cb = ffi.new_handle(self.scb)
-+        self._sni_cb = ServernameCallback(cb, self)
-+        self._sni_cb_handle = ffi.new_handle(self._sni_cb)
-         lib.SSL_CTX_set_tlsext_servername_callback(self.ctx, _servername_callback)
--        lib.SSL_CTX_set_tlsext_servername_arg(self.ctx, sni_cb)
-+        lib.SSL_CTX_set_tlsext_servername_arg(self.ctx, self._sni_cb_handle)
- 
-     def cert_store_stats(self):
-         store = lib.SSL_CTX_get_cert_store(self.ctx)
diff --git a/dev-python/pypy3/files/python-3.5-distutils-OO-build.patch b/dev-python/pypy3/files/python-3.5-distutils-OO-build.patch
deleted file mode 100644
index ff4446662a95..000000000000
--- a/dev-python/pypy3/files/python-3.5-distutils-OO-build.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From 90507018442f9adabb586fd3d0a0206b9c2f2f50 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Sun, 5 Jun 2016 08:18:01 +0200
-Subject: [PATCH] distutils: make -OO enable both opt-1 and opt-2 optimization
-
-Bug: http://bugs.python.org/issue27226
-Bug: https://bugs.gentoo.org/585060
----
- distutils/command/build_py.py    |  8 ++++----
- distutils/command/install_lib.py | 12 ++++++------
- 2 files changed, 10 insertions(+), 10 deletions(-)
-
-diff --git a/distutils/command/build_py.py b/distutils/command/build_py.py
-index cf0ca57..838d4e4 100644
---- a/distutils/command/build_py.py
-+++ b/distutils/command/build_py.py
-@@ -315,9 +315,9 @@ class build_py (Command):
-                 if self.compile:
-                     outputs.append(importlib.util.cache_from_source(
-                         filename, optimization=''))
--                if self.optimize > 0:
-+                for opt in range(1, self.optimize + 1):
-                     outputs.append(importlib.util.cache_from_source(
--                        filename, optimization=self.optimize))
-+                        filename, optimization=opt))
- 
-         outputs += [
-             os.path.join(build_dir, filename)
-@@ -387,8 +387,8 @@ class build_py (Command):
-         if self.compile:
-             byte_compile(files, optimize=0,
-                          force=self.force, prefix=prefix, dry_run=self.dry_run)
--        if self.optimize > 0:
--            byte_compile(files, optimize=self.optimize,
-+        for opt in range(1, self.optimize + 1):
-+            byte_compile(files, optimize=opt,
-                          force=self.force, prefix=prefix, dry_run=self.dry_run)
- 
- class build_py_2to3(build_py, Mixin2to3):
-diff --git a/distutils/command/install_lib.py b/distutils/command/install_lib.py
-index 6154cf0..049b662 100644
---- a/distutils/command/install_lib.py
-+++ b/distutils/command/install_lib.py
-@@ -24,8 +24,8 @@ class install_lib(Command):
-     #   2) compile .pyc only (--compile --no-optimize; default)
-     #   3) compile .pyc and "opt-1" .pyc (--compile --optimize)
-     #   4) compile "opt-1" .pyc only (--no-compile --optimize)
--    #   5) compile .pyc and "opt-2" .pyc (--compile --optimize-more)
--    #   6) compile "opt-2" .pyc only (--no-compile --optimize-more)
-+    #   5) compile .pyc, "opt-1" and "opt-2" .pyc (--compile --optimize-more)
-+    #   6) compile "opt-1" and "opt-2" .pyc (--no-compile --optimize-more)
-     #
-     # The UI for this is two options, 'compile' and 'optimize'.
-     # 'compile' is strictly boolean, and only decides whether to
-@@ -132,8 +132,8 @@ class install_lib(Command):
-             byte_compile(files, optimize=0,
-                          force=self.force, prefix=install_root,
-                          dry_run=self.dry_run)
--        if self.optimize > 0:
--            byte_compile(files, optimize=self.optimize,
-+        for opt in range(1, self.optimize + 1):
-+            byte_compile(files, optimize=opt,
-                          force=self.force, prefix=install_root,
-                          verbose=self.verbose, dry_run=self.dry_run)
- 
-@@ -167,9 +167,9 @@ class install_lib(Command):
-             if self.compile:
-                 bytecode_files.append(importlib.util.cache_from_source(
-                     py_file, optimization=''))
--            if self.optimize > 0:
-+            for opt in range(1, self.optimize + 1):
-                 bytecode_files.append(importlib.util.cache_from_source(
--                    py_file, optimization=self.optimize))
-+                    py_file, optimization=opt))
- 
-         return bytecode_files
- 
--- 
-2.8.3
-
diff --git a/dev-python/pypy3/pypy3-7.3.3.ebuild b/dev-python/pypy3/pypy3-7.3.3.ebuild
deleted file mode 100644
index 1de8b40bb880..000000000000
--- a/dev-python/pypy3/pypy3-7.3.3.ebuild
+++ /dev/null
@@ -1,207 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-inherit pax-utils python-any-r1 toolchain-funcs
-
-MY_P=pypy3.6-v${PV/_/}
-
-DESCRIPTION="A fast, compliant alternative implementation of the Python (3.6) language"
-HOMEPAGE="https://www.pypy.org/"
-SRC_URI="https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2"
-S="${WORKDIR}/${MY_P}-src"
-
-LICENSE="MIT"
-# pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))'
-SLOT="0/pypy36-pp73"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="bzip2 gdbm +jit libressl ncurses sqlite test tk"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	|| (
-		dev-python/pypy3-exe:${PV}[bzip2?,ncurses?]
-		dev-python/pypy3-exe-bin:${PV}
-	)
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	gdbm? ( sys-libs/gdbm:0= )
-	sqlite? ( dev-db/sqlite:3= )
-	tk? (
-		dev-lang/tk:0=
-		dev-tcltk/tix:0=
-	)
-	!<dev-python/pypy3-bin-7.3.0:0"
-DEPEND="${RDEPEND}
-	test? (
-		${PYTHON_DEPS}
-		!!dev-python/pytest-forked
-	)"
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	eapply "${FILESDIR}/7.3.1-gentoo-path.patch"
-	eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
-	eapply "${FILESDIR}"/7.2.0-distutils-cxx.patch
-
-	sed -e "s^@EPREFIX@^${EPREFIX}^" \
-		-i lib-python/3/distutils/command/install.py || die
-
-	# apply CPython stdlib patches
-	pushd lib-python/3 > /dev/null || die
-	eapply "${FILESDIR}"/python-3.5-distutils-OO-build.patch
-	popd > /dev/null || die
-
-	# see http://buildbot.pypy.org/summary?branch=py3.6&builder=pypy-c-jit-linux-x86-64
-	sed -i -e 's:test_jumpy:_&:' \
-		lib-python/3/test/test_dis.py || die
-	sed -i -e 's:test_get_and_set_scheduler_and_param:_&:' \
-		lib-python/3/test/test_posix.py || die
-	sed -i -e 's:test_auto_history:_&:' \
-		-e 's:test_history_size:_&:' \
-		lib-python/3/test/test_readline.py || die
-	sed -i -e 's:test_eval_bytes_invalid_escape:_&:' \
-		-e 's:test_eval_str_invalid_escape:_&:' \
-		lib-python/3/test/test_string_literals.py || die
-	sed -i -e 's:test_jump_out_of_async_for_block:_&:' \
-		-e 's:test_jump_over_async_for_block_before_else:_&:' \
-		-e 's:test_no_jump_.*wards_into_async_for_block:_&:' \
-		-e 's:test_no_jump_into_async_for_block_before_else:_&:' \
-		-e 's:test_no_jump_from_yield:_&:' \
-		lib-python/3/test/test_sys_settrace.py || die
-	sed -i -e 's:test_circular_imports:_&:' \
-		lib-python/3/test/test_threaded_import.py || die
-
-	# the first one's broken by sandbox, the second by our env
-	sed -i -e 's:test_empty_env:_&:' \
-		-e 's:test_executable(:_&:' \
-		-e 's:test_executable_without_cwd:_&:' \
-		lib-python/3/test/test_subprocess.py || die
-
-	# XXX
-	sed -i -e 's:test_locale:_&:' \
-		lib-python/3/test/test_format.py || die
-	sed -i -e 's:test_decompressor_bug_28275:_&:' \
-		lib-python/3/test/test_lzma.py || die
-
-	eapply_user
-}
-
-src_configure() {
-	tc-export CC
-}
-
-src_compile() {
-	# copy over to make sys.prefix happy
-	cp -p "${BROOT}"/usr/lib/pypy3.6/pypy3-c-${PV} pypy3-c || die
-	cp -p "${BROOT}"/usr/lib/pypy3.6/include/${PV}/* include/ || die
-	# (not installed by pypy)
-	rm pypy/module/cpyext/include/_numpypy/numpy/README || die
-	mv pypy/module/cpyext/include/* include/ || die
-	mv pypy/module/cpyext/parse/*.h include/ || die
-	pax-mark m pypy3-c
-
-	einfo "Generating caches and CFFI modules ..."
-
-	# Generate Grammar and PatternGrammar pickles.
-	./pypy3-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
-		|| die "Generation of Grammar and PatternGrammar pickles failed"
-
-	# Generate cffi modules
-	# Please keep in sync with pypy/tool/build_cffi_imports.py!
-#cffi_build_scripts = {
-#    "_blake2": "_blake2/_blake2_build.py",
-#    "_ssl": "_ssl_build.py",
-#    "sqlite3": "_sqlite3_build.py",
-#    "audioop": "_audioop_build.py",
-#    "tk": "_tkinter/tklib_build.py",
-#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
-#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
-#    "gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
-#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
-#    "resource": "_resource_build.py" if sys.platform != "win32" else None,
-#    "lzma": "_lzma_build.py",
-#    "_decimal": "_decimal_build.py",
-#    "_sha3": "_sha3/_sha3_build.py",
-	cffi_targets=( blake2/_blake2 sha3/_sha3 ssl
-		audioop syslog pwdgrp resource lzma decimal )
-	use gdbm && cffi_targets+=( gdbm )
-	use ncurses && cffi_targets+=( curses )
-	use sqlite && cffi_targets+=( sqlite3 )
-	use tk && cffi_targets+=( tkinter/tklib )
-
-	local t
-	# all modules except tkinter output to .
-	# tkinter outputs to the correct dir ...
-	cd lib_pypy || die
-	for t in "${cffi_targets[@]}"; do
-		# tkinter doesn't work via -m
-		../pypy3-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
-	done
-
-	# Cleanup temporary objects
-	find -name "_cffi_*.[co]" -delete || die
-	find -type d -empty -delete || die
-}
-
-src_test() {
-	# (unset)
-	local -x PYTHONDONTWRITEBYTECODE=
-	local -x COLUMNS=80
-
-	# Test runner requires Python 2 too. However, it spawns PyPy3
-	# internally so that we end up testing the correct interpreter.
-	"${EPYTHON}" ./pypy/test_all.py --pypy=./pypy3-c -vv lib-python || die
-}
-
-src_install() {
-	local dest=/usr/lib/pypy3.6
-	einfo "Installing PyPy ..."
-	dosym pypy3-c-${PV} "${dest}/pypy3-c"
-	insinto "${dest}"
-	# preserve mtimes to avoid obsoleting caches
-	insopts -p
-	doins -r include lib_pypy lib-python
-
-	# replace copied headers with symlinks
-	for x in "${BROOT}"/usr/lib/pypy3.6/include/${PV}/*; do
-		dosym "${PV}/${x##*/}" "${dest}/include/${x##*/}"
-	done
-
-	dosym ../lib/pypy3.6/pypy3-c /usr/bin/pypy3
-	dodoc README.rst
-
-	if ! use gdbm; then
-		rm -r "${ED}${dest}"/lib_pypy/_gdbm* || die
-	fi
-	if ! use sqlite; then
-		rm -r "${ED}${dest}"/lib-python/*3/sqlite3 \
-			"${ED}${dest}"/lib_pypy/_sqlite3* \
-			"${ED}${dest}"/lib-python/*3/test/test_sqlite.py || die
-	fi
-	if ! use tk; then
-		rm -r "${ED}${dest}"/lib-python/*3/{idlelib,tkinter} \
-			"${ED}${dest}"/lib_pypy/_tkinter \
-			"${ED}${dest}"/lib-python/*3/test/test_{tcl,tk,ttk*}.py || die
-	fi
-
-	local -x EPYTHON=pypy3
-	local -x PYTHON=${ED}${dest}/pypy3-c-${PV}
-	# temporarily copy to build tree to facilitate module builds
-	cp -p "${BROOT}${dest}/pypy3-c-${PV}" "${PYTHON}" || die
-
-	echo "EPYTHON='${EPYTHON}'" > epython.py || die
-	python_moduleinto /usr/lib/pypy3.6/site-packages
-	python_domodule epython.py
-
-	einfo "Byte-compiling Python standard library..."
-	python_optimize "${ED}${dest}"
-
-	# remove to avoid collisions
-	rm "${PYTHON}" || die
-}
diff --git a/dev-python/pypy3/pypy3-7.3.3_p37-r1.ebuild b/dev-python/pypy3/pypy3-7.3.3_p37-r1.ebuild
deleted file mode 100644
index 235d4e09f2d7..000000000000
--- a/dev-python/pypy3/pypy3-7.3.3_p37-r1.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-inherit pax-utils python-any-r1 toolchain-funcs
-
-PYPY_PV=${PV%_p37}
-MY_P=pypy3.7-v${PYPY_PV/_/}
-
-DESCRIPTION="A fast, compliant alternative implementation of the Python (3.7) language"
-HOMEPAGE="https://www.pypy.org/"
-SRC_URI="https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2"
-S="${WORKDIR}/${MY_P}-src"
-
-LICENSE="MIT"
-# pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))'
-SLOT="0/pypy37-pp73"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="bzip2 gdbm +jit libressl ncurses sqlite test tk"
-# pypy3.7 is in alpha state and a lot of tests are failing
-RESTRICT="test"
-
-RDEPEND="
-	|| (
-		dev-python/pypy3-exe:${PV}[bzip2?,ncurses?]
-		dev-python/pypy3-exe-bin:${PV}
-	)
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	gdbm? ( sys-libs/gdbm:0= )
-	sqlite? ( dev-db/sqlite:3= )
-	tk? (
-		dev-lang/tk:0=
-		dev-tcltk/tix:0=
-	)
-	!<dev-python/pypy3-bin-7.3.0:0"
-DEPEND="${RDEPEND}
-	test? (
-		${PYTHON_DEPS}
-		!!dev-python/pytest-forked
-	)"
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	eapply "${FILESDIR}/7.3.1-gentoo-path.patch"
-	eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
-	eapply "${FILESDIR}/7.3.2-py37-distutils-cxx.patch"
-	# https://foss.heptapod.net/pypy/pypy/-/issues/3396
-	eapply "${FILESDIR}/7.3.3_p37-sni-handle.patch"
-
-	sed -e "s^@EPREFIX@^${EPREFIX}^" \
-		-i lib-python/3/distutils/command/install.py || die
-
-	# apply CPython stdlib patches
-	pushd lib-python/3 > /dev/null || die
-	eapply "${FILESDIR}"/python-3.5-distutils-OO-build.patch
-	popd > /dev/null || die
-
-	eapply_user
-}
-
-src_configure() {
-	tc-export CC
-}
-
-src_compile() {
-	# copy over to make sys.prefix happy
-	cp -p "${BROOT}"/usr/lib/pypy3.7/pypy3-c-${PYPY_PV} pypy3-c || die
-	cp -p "${BROOT}"/usr/lib/pypy3.7/include/${PYPY_PV}/* include/ || die
-	# (not installed by pypy)
-	rm pypy/module/cpyext/include/_numpypy/numpy/README || die
-	mv pypy/module/cpyext/include/* include/ || die
-	mv pypy/module/cpyext/parse/*.h include/ || die
-	pax-mark m pypy3-c
-
-	einfo "Generating caches and CFFI modules ..."
-
-	# Generate Grammar and PatternGrammar pickles.
-	./pypy3-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
-		|| die "Generation of Grammar and PatternGrammar pickles failed"
-
-	# Generate cffi modules
-	# Please keep in sync with pypy/tool/build_cffi_imports.py!
-#cffi_build_scripts = {
-#    "_blake2": "_blake2/_blake2_build.py",
-#    "_ssl": "_ssl_build.py",
-#    "sqlite3": "_sqlite3_build.py",
-#    "audioop": "_audioop_build.py",
-#    "tk": "_tkinter/tklib_build.py",
-#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
-#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
-#    "gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
-#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
-#    "resource": "_resource_build.py" if sys.platform != "win32" else None,
-#    "lzma": "_lzma_build.py",
-#    "_decimal": "_decimal_build.py",
-#    "_sha3": "_sha3/_sha3_build.py",
-	cffi_targets=( blake2/_blake2 sha3/_sha3 ssl
-		audioop syslog pwdgrp resource lzma decimal )
-	use gdbm && cffi_targets+=( gdbm )
-	use ncurses && cffi_targets+=( curses )
-	use sqlite && cffi_targets+=( sqlite3 )
-	use tk && cffi_targets+=( tkinter/tklib )
-
-	local t
-	# all modules except tkinter output to .
-	# tkinter outputs to the correct dir ...
-	cd lib_pypy || die
-	for t in "${cffi_targets[@]}"; do
-		# tkinter doesn't work via -m
-		../pypy3-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
-	done
-
-	# Cleanup temporary objects
-	find -name "_cffi_*.[co]" -delete || die
-	find -type d -empty -delete || die
-}
-
-src_test() {
-	# (unset)
-	local -x PYTHONDONTWRITEBYTECODE=
-	local -x COLUMNS=80
-
-	# Test runner requires Python 2 too. However, it spawns PyPy3
-	# internally so that we end up testing the correct interpreter.
-	# (--deselect for failing doctests)
-	"${EPYTHON}" ./pypy/test_all.py --pypy=./pypy3-c -vv lib-python || die
-}
-
-src_install() {
-	local dest=/usr/lib/pypy3.7
-	einfo "Installing PyPy ..."
-	dosym pypy3-c-${PYPY_PV} "${dest}/pypy3-c"
-	insinto "${dest}"
-	# preserve mtimes to avoid obsoleting caches
-	insopts -p
-	doins -r include lib_pypy lib-python
-
-	# replace copied headers with symlinks
-	for x in "${BROOT}"/usr/lib/pypy3.7/include/${PYPY_PV}/*; do
-		dosym "${PYPY_PV}/${x##*/}" "${dest}/include/${x##*/}"
-	done
-
-	dosym ../lib/pypy3.7/pypy3-c /usr/bin/pypy3
-	dodoc README.rst
-
-	if ! use gdbm; then
-		rm -r "${ED}${dest}"/lib_pypy/_gdbm* || die
-	fi
-	if ! use sqlite; then
-		rm -r "${ED}${dest}"/lib-python/*3/sqlite3 \
-			"${ED}${dest}"/lib_pypy/_sqlite3* \
-			"${ED}${dest}"/lib-python/*3/test/test_sqlite.py || die
-	fi
-	if ! use tk; then
-		rm -r "${ED}${dest}"/lib-python/*3/{idlelib,tkinter} \
-			"${ED}${dest}"/lib_pypy/_tkinter \
-			"${ED}${dest}"/lib-python/*3/test/test_{tcl,tk,ttk*}.py || die
-	fi
-
-	local -x EPYTHON=pypy3
-	local -x PYTHON=${ED}${dest}/pypy3-c-${PYPY_PV}
-	# temporarily copy to build tree to facilitate module builds
-	cp -p "${BROOT}${dest}/pypy3-c-${PYPY_PV}" "${PYTHON}" || die
-
-	echo "EPYTHON='${EPYTHON}'" > epython.py || die
-	python_moduleinto /usr/lib/pypy3.7/site-packages
-	python_domodule epython.py
-
-	einfo "Byte-compiling Python standard library..."
-	python_optimize "${ED}${dest}"
-
-	# remove to avoid collisions
-	rm "${PYTHON}" || die
-}
diff --git a/dev-python/pypy3/pypy3-7.3.3_p37_p1-r1.ebuild b/dev-python/pypy3/pypy3-7.3.3_p37_p1-r1.ebuild
index f41ba9dd6fd0..3061d9aa33ae 100644
--- a/dev-python/pypy3/pypy3-7.3.3_p37_p1-r1.ebuild
+++ b/dev-python/pypy3/pypy3-7.3.3_p37_p1-r1.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/${MY_P}-src"
 LICENSE="MIT"
 # pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))'
 SLOT="0/pypy37-pp73"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="bzip2 gdbm +jit libressl ncurses sqlite test tk"
 # pypy3.7 is in alpha state and a lot of tests are failing
 RESTRICT="test"
diff --git a/dev-python/pyscreenshot/Manifest b/dev-python/pyscreenshot/Manifest
index d2b4615bd624..05ddc411f515 100644
--- a/dev-python/pyscreenshot/Manifest
+++ b/dev-python/pyscreenshot/Manifest
@@ -1,3 +1,5 @@
 DIST pyscreenshot-2.2.tar.gz 29726 BLAKE2B d1e314be360d4716b35b4302de82010dfc9a97212b3f4472b42e40f9470fd0575fe8f0ceb976adfe13059c0566413414e03f78189d4afa193d88a0aaf4c5c26e SHA512 6689ccbcd5c6164aeb12d911ee93c8958f6c6b5aaba5ba7d4073ee855e6398180ed27fce6299480b18b3d7ffad12cd17694c3db1f1c7373d4b25be0073d49338
+DIST pyscreenshot-2.3.tar.gz 34543 BLAKE2B a9ae6fc51ac62efabca7e9b4e08ee8ee05d778a3f8ea0bfaec5f0958bea7f6dd266e18a938350aac6fa1058fdb378cfa69cf6c5490768c39d7312be51e3d2630 SHA512 6919e4529a932b9a6e3dd28d60c628447b0e6f25df567db742b5bf14455373ad7340237bb4b77696c436be6f31211030b206d7152f4b61d16d6745f439f84425
 EBUILD pyscreenshot-2.2.ebuild 1618 BLAKE2B af871f3177aec6da987058dcee2e8cc9447d0d40c881b8035fbafaf210450047240d4e71648a6b83846f7034b8559ec2f2dad939d65c5fdcec771c6b64d07d09 SHA512 d1faac137a5b51b73a79290822900e3d941a362bfc376976aed8239d0c4130e5da53be1421732bdc9f2972053938dae5d239da8598a3889d9d7576cdaa2f4308
+EBUILD pyscreenshot-2.3.ebuild 1013 BLAKE2B f50256cbfc64fcafdf7677b8400d70e9d8604d5e543a66b9db6eb3728eedea4d33bd3265bba4bf6bb32836e503d96e99d586a2f32fcfa94158e50cbbd2bcc01c SHA512 c0dc3e699c1498b14c323e74d04f52a9ebf8ddcc3235a25dfb8ddcb4c4496e8192dcc90b64724f2829a029f4aee6cd7adceedc8f31439ce00a31cdf1e5a67006
 MISC metadata.xml 450 BLAKE2B bd7e7fa6219b153954486f9457cc9ed56a055ee8caa2d04f0f6d587b7df88a8abe4b51165c1220ae1fbb7a3a2314f10851a6bdc35336305829e31a82d7004d4e SHA512 dd24b4495cf676ea8c90ad639d2177b27c725e21bbed0d6a64f0a4ecc5226c4a332c018306d3dd231409063cd179215c1e80c6efca1001ca9a36f58472fa82a3
diff --git a/dev-python/pyscreenshot/pyscreenshot-2.3.ebuild b/dev-python/pyscreenshot/pyscreenshot-2.3.ebuild
new file mode 100644
index 000000000000..04cec4abf98f
--- /dev/null
+++ b/dev-python/pyscreenshot/pyscreenshot-2.3.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8} )
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Python screenshot library"
+HOMEPAGE="https://github.com/ponty/pyscreenshot"
+SRC_URI="https://github.com/ponty/pyscreenshot/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="test? (
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/python-xlib[${PYTHON_USEDEP}]
+	dev-python/pyvirtualdisplay[${PYTHON_USEDEP}]
+	media-gfx/imagemagick
+	media-gfx/pqiv
+	kde-apps/gwenview
+	x11-apps/xdpyinfo
+)"
+
+DEPEND="
+	dev-python/easyprocess[${PYTHON_USEDEP}]
+	dev-python/entrypoint2[${PYTHON_USEDEP}]
+	dev-python/jeepney[${PYTHON_USEDEP}]
+	dev-python/mss[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# Needs access to dbus
+	sed -i -e 's:test_kwin_dbus:_&:' \
+			tests/test_kwin_dbus.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	virtx pytest -vv
+}
diff --git a/dev-python/pyspelling/Manifest b/dev-python/pyspelling/Manifest
index 9cea24378912..96eee55aaf69 100644
--- a/dev-python/pyspelling/Manifest
+++ b/dev-python/pyspelling/Manifest
@@ -1,3 +1,5 @@
 DIST pyspelling-2.7.0.tar.gz 149425 BLAKE2B f8e600a41ebd4ec290562307306e7fd5c67d384b9186de037b98d50d58016ded19c426caa892497ca44e309fb3db04292b890612afbe25a34f9f6b06985d3740 SHA512 2fcd225a66cb02fff10d5ca652e523a01bd0488a005dafa32ba1151fba9afe73809781501c957d6df00927baa9fb6779872973b32e2d3fe8a09306fdc4191995
+DIST pyspelling-2.7.1.tar.gz 149449 BLAKE2B a5faefac163850d327d64b75776b5f360ad1e1337cb3784c8d0a167e1240e92a202f4ecbe86d768341a7512b36c83981b5fbf4058a2142a5b627f40c0e60c09f SHA512 be0cc9be343e2d5d2c16b2dc9cb6f83fd5f60eba81c709711fef37b880363db8b76e86ec048b57ab270be59803b101696709bd474d4f0267c99f55c906ec7857
 EBUILD pyspelling-2.7.0.ebuild 1339 BLAKE2B 02605cc438f1292b803cf477d9ece6ee8ac5acf66c3fa51b813f3edae8faf57033e13547a08704a9f8a1ecdffced770d40c180770031c1ed16396357ad2f4e07 SHA512 2bfc52570bac76a50854f4ff3a6aafbc9f82894a16c7a1096d8b3e25d07f6dc33806068f815b2c8d982f62b14a62762b56f781f56625dd4aa84401347b8f9325
+EBUILD pyspelling-2.7.1.ebuild 1339 BLAKE2B 02000bbde0c75d186febae4b45309228c2c9b6430a19db3b0ce7b3d4c613452276ec0b8e2c64bd2f037e2bb1ed450c11e8a8d810d066f0a41e32a089fce7f7b0 SHA512 0eecb02ded18f6ec79f96726f17cde843160a467a6ac7f665cd266cb7bc663e0c08888fc90e17fd8f29f541d3cd403f265f81972bffe409f2718bc885474f26d
 MISC metadata.xml 1868 BLAKE2B 06a6aada2ff7c6634c7baff2eb5ebbe5e6f884a44cd9828b6aac350bcdae480b6ff3fae5a3060721db386e80558167ebb50937afe209ff2cf2cb5296cdadf4f8 SHA512 89c47e531f6aa5a2e7525732a30d3b9e62be48598a6ea61ccd3588223e01ca4f54fd6cd9359ccc6d1fe9a269cd865fabf960d18cf084feb0c7368f5beb0fc446
diff --git a/dev-python/pyspelling/pyspelling-2.7.1.ebuild b/dev-python/pyspelling/pyspelling-2.7.1.ebuild
new file mode 100644
index 000000000000..fd08ac4dbfe5
--- /dev/null
+++ b/dev-python/pyspelling/pyspelling-2.7.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8} )
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+DOCS_BUILDER="mkdocs"
+DOCS_DEPEND="
+	~dev-python/mkdocs_pymdownx_material_extras-1.1.3
+	dev-python/mkdocs-git-revision-date-localized-plugin
+	dev-python/mkdocs-minify-plugin
+"
+
+inherit distutils-r1 docs
+
+DESCRIPTION="Spell checker automation tool"
+HOMEPAGE="https://github.com/facelessuser/pyspelling"
+SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	|| ( app-text/aspell app-text/hunspell )
+
+	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+	dev-python/html5lib[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/markdown[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	>=dev-python/soupsieve-1.8[${PYTHON_USEDEP}]
+	>=dev-python/wcmatch-6.0.3[${PYTHON_USEDEP}]
+"
+
+BDEPEND="test? ( 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/pytest-pylint/Manifest b/dev-python/pytest-pylint/Manifest
index 0d13a6852bda..607a89813323 100644
--- a/dev-python/pytest-pylint/Manifest
+++ b/dev-python/pytest-pylint/Manifest
@@ -1,3 +1,5 @@
 DIST pytest-pylint-0.17.0.tar.gz 11660 BLAKE2B b536dcaaf0ac652dcbe66018fa22e120782496de58f74003c523eb003ff0556f9b738e528a85724a1e589e18bb0024d99fbeb581b7f5b36ec349ad07da8d26d0 SHA512 a23937ec191ef14829530ac6bf31b882bc250f312e2ba6e3b8cc1187c888511e4b67ffaf5bce176556a621fbf80239b30c43c635898d458bb8d819e92a9f8142
+DIST pytest-pylint-0.18.0.tar.gz 12448 BLAKE2B 9d0cecb08fc87d7e2aade47af3f2677431776a425726c281e9abc5fdeebb84f38ab4a97e405ed407b1cd241eb97a8cd90e878af61f818b46cab5f9fba5ca3d5f SHA512 a0716104d288774d4c3ab596f30a33cf439df5031647912574c31eefc3a84e69e82fc362f77e73b437c7566a596d2ff8bf51a332626a7fa7468cea3b916e9ad9
 EBUILD pytest-pylint-0.17.0.ebuild 1118 BLAKE2B 2afc692f96d558d956eee04d70b2a516babfff606a858117efeb3f5efd0631823f3a99706dd10441d682101ff994f732f8dee84a2367390245f28cc85bd25086 SHA512 9047a6777d0ea48b040b4249531b2e5254dd535202a3bba2745614286f4d2d628e9a99aaf950515374cb2d4dfee17595a3b61c0da109e63479b4fb580fbb5626
-MISC metadata.xml 428 BLAKE2B 5986f5476c70157e31680be898d8b45cf38d1fa303aeac5d9336796e0b5941de9170d781ecddf308174b9b4aff51ec9fefa5c6620ee49f9121005aa86229a740 SHA512 65370aeb2b8c39941a34035ae9c44f5e19fdf4c533e50f9641870b2496773a5f782460f4518f79a2e45489c871f3e18d05a2d36fe8610fd1ea87e616f39a9a19
+EBUILD pytest-pylint-0.18.0.ebuild 827 BLAKE2B 5a3cf1127d9c4cee9f363d8bd6de620d874ba31ae2e0294f7a76f6951d78ae3f9b607f68686bc087dc78af438c5f5da17d9cfd3cf1eacfff89c2be76ce836321 SHA512 b3a35d0585bee70baff8fa77ab3e14c06c9c9e78d3d8a1c9ac08ebe3925617ea2ad1c9f4c559de5a8f495ded9fefae5be087b0bb4ece907d76326bf674a0a4ff
+MISC metadata.xml 474 BLAKE2B 4d013c02cc0b5fc2353986b665fd919f8a678d7f4e39e628b6fce39cfca8139a619dc4e27c5de67f2271f9e00a802e1422e8d61f5f4d758a3cab0c1b00692819 SHA512 434efa91bad6e55caa520e409598c6504a11c116f4ffdddf77f7fedd9bd9135e2f90e2fb4f1bd551c492c0af13134a12b75f6f29172326e4218471f1466c3f81
diff --git a/dev-python/pytest-pylint/metadata.xml b/dev-python/pytest-pylint/metadata.xml
index 4f79f21e49ec..cb65d5c32b97 100644
--- a/dev-python/pytest-pylint/metadata.xml
+++ b/dev-python/pytest-pylint/metadata.xml
@@ -3,7 +3,9 @@
 <pkgmetadata>
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
+		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">carsongee/pytest-pylint</remote-id>
 		<remote-id type="pypi">pytest-pylint</remote-id>
diff --git a/dev-python/pytest-pylint/pytest-pylint-0.18.0.ebuild b/dev-python/pytest-pylint/pytest-pylint-0.18.0.ebuild
new file mode 100644
index 000000000000..447f4c2ddd2e
--- /dev/null
+++ b/dev-python/pytest-pylint/pytest-pylint-0.18.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="pytest plugin to check source code with pylint"
+HOMEPAGE="https://github.com/carsongee/pytest-pylint"
+SRC_URI="https://github.com/carsongee/pytest-pylint/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/pylint-2.3.0[${PYTHON_USEDEP}]
+	>=dev-python/pytest-5.4[${PYTHON_USEDEP}]
+	>=dev-python/toml-0.7.1[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests --install pytest
+
+python_prepare_all() {
+	# Disable flake8 and pep8 options
+	sed -i -e '/^addopts =/d' tox.ini || die
+	# Remove pytest-runner requirement
+	sed -i -e "s/'pytest-runner'//" setup.py || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/python-cinderclient/Manifest b/dev-python/python-cinderclient/Manifest
index 21a4862ef8a9..fc7e79716877 100644
--- a/dev-python/python-cinderclient/Manifest
+++ b/dev-python/python-cinderclient/Manifest
@@ -1,3 +1,5 @@
 DIST python-cinderclient-7.2.0.tar.gz 248517 BLAKE2B 8d992762d3ee69db12f51f6e4e005c6781c865274d42ba31d693854f1c5267a1a15cf5591ed262dacf463a10a719069fc1db67a4fcc95d528b964e128c50a8c8 SHA512 535be2d6e71a9fc415b17929a78cf7c8f1e5f5f2764637fbcd22c90b08da4ae477b863c913faad24439aea06e234cf26a66f392d54e5238af4c2730f4a087a13
+DIST python-cinderclient-7.2.1.tar.gz 251082 BLAKE2B 20b1ae9ecce0161e225b510363be74f7197075bd2247d3f5386894040582a61379faa1825197728bf9981fb9c6d66cc020483a07c0781e30e43f6bdadcb33185 SHA512 c434a353185d8e47d5849f08e7c9418454a5f643292837f0890f9aaccbf939be4528ae75851164068a2bc2ea39a4c841965be664bae4e7d37fec54a55c8332dc
 EBUILD python-cinderclient-7.2.0.ebuild 1057 BLAKE2B 2837e9d8d4bd6bc52595ba4e71fc9a6d11532b3274339e7678cdb7f4f627783dbae43d226bf743c99a8f19f04bb0afe7ec1398801c3c6380dc828fcc84d5eaa2 SHA512 64ed43f46c4e462bda547204c09ffdd469e2f1d50d65ea57b00779bb3a5958f91091705de80c2f1c079b22650b4d05eb90e4052cd5fa9a6be1dfbe25cec5068b
+EBUILD python-cinderclient-7.2.1.ebuild 1059 BLAKE2B 3571c13f44aa878b77a7d921052e01823f4612e493ba105d81aef9689af2e0d6af159946b12c3d84dca4adf69054a51043c97347f585262ac31ddd9a2db991e9 SHA512 bdbea6f8aa341a2b1fb4441a135cf5a48093593c4da9b9cb58d07c1588822190acaaf86dabc9ecf05e2c8a39fe5f5981492d095c268814e6ce21de1870679aea
 MISC metadata.xml 548 BLAKE2B ac006bff7560af28326e8b82415fca4c32319f36bc4a9fd5a9ebb19ab851dfa27aab94be4d0358b41840a1a271d336dd786af3a5ed56c1c3c9ab16bcd1cc3e8b SHA512 0a336aea095418b4dc025b5ce704b70d237d1e2b43c52ac7091c7854581bc65aa8cc70694687a466a39b428f7e1ab23a30fabddffabbb865db7d27db68c45654
diff --git a/dev-python/python-cinderclient/python-cinderclient-7.2.1.ebuild b/dev-python/python-cinderclient/python-cinderclient-7.2.1.ebuild
new file mode 100644
index 000000000000..9f9984d12812
--- /dev/null
+++ b/dev-python/python-cinderclient/python-cinderclient-7.2.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7,8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="A client for the OpenStack Cinder API"
+HOMEPAGE="https://launchpad.net/python-cinderclient"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0"
+DEPEND="${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
+	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-3.4.0[${PYTHON_USEDEP}]
+	>=dev-python/simplejson-3.5.1[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+	!~dev-python/requests-2.20.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/python-discid/Manifest b/dev-python/python-discid/Manifest
index fb6e99a2e215..156d447f5fef 100644
--- a/dev-python/python-discid/Manifest
+++ b/dev-python/python-discid/Manifest
@@ -1,3 +1,3 @@
 DIST python-discid-1.2.0.tar.gz 30756 BLAKE2B 616613de23b66adfc92227a9f36b710649f2a419ffd83443766ebcf1dbfaf528b7d933011bcbdcd19f5092726b81e40d905a62a64262a528dfad89e561210992 SHA512 239cb608508e94109aa9b8b582bc3de1fb9408b508d56698d7f17ec9ebb0d37c1fb76557d98b6d194c1532e3047efcde3adc5d6e9634bc87533d331423a7f19f
-EBUILD python-discid-1.2.0.ebuild 550 BLAKE2B 06490f385945c2abefa78d60d654305a9d02ea8a419403485de6bb8985de208237b680f1fceb3dd0aeff58d0971d0f5146b8ee5ed1cf8964415085f6c30f011b SHA512 60146d9c3535f1d4e989e20b7372cf6a9fd58b7249f0ae0e5d58e850b2bfc1d2b921876d28b2335de91026752277ba140ebc73e6efa2bcee884bcba6d3ad266a
+EBUILD python-discid-1.2.0.ebuild 547 BLAKE2B 997d9486c604b97007b110994e90a3e633afa4a35dcb32cd98917555682eba27ef4608a612be87f31044b6964b0fa48645bb72aa07ddaf9fed28505f8f48bc8d SHA512 5f061aca55c44dac78eef0e32c6df21e8b7a7f5063472b6c9689e055449fa23316c5c4709716fcc9c22c957691cc1bb465e00638d0510a1568f564c32cd97504
 MISC metadata.xml 370 BLAKE2B fb7b7810115818be8b49cc15bad4e3367befe9e757256622855c8fe3960420259458d65c0cf04b2c81bd3d0f6d46b465c35ecb0486ddc5dd14d27714bcf3b9b0 SHA512 aa8305f7acf09afd075d1e3729e537b4aadfecb0b8ea84c21fe428c09cd112fcb9ad99a389a2c6d5507836977a3e32573c4dbb07737a0d781cdfe2c0ab91b741
diff --git a/dev-python/python-discid/python-discid-1.2.0.ebuild b/dev-python/python-discid/python-discid-1.2.0.ebuild
index d3458750ed41..c28f0f8aff4c 100644
--- a/dev-python/python-discid/python-discid-1.2.0.ebuild
+++ b/dev-python/python-discid/python-discid-1.2.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-engineio/Manifest b/dev-python/python-engineio/Manifest
index 5b215598d45f..635b0b540b02 100644
--- a/dev-python/python-engineio/Manifest
+++ b/dev-python/python-engineio/Manifest
@@ -1,3 +1,5 @@
 DIST python-engineio-3.12.1.tar.gz 37158 BLAKE2B a3f75b0ec197248029a2a257eee7694298d916bc444705df7a941e8106d09e5bc802cd612c88e526883083730797e4835e13db93121714a701af17d894ac53cf SHA512 f81012e264025dc24845986e67c7d19d46048e072a409483a130630e07efb84e831e188d3f277dd0f7d26351015009afcef0d2058bb19dacee68d6c56837fa1d
+DIST python-engineio-4.0.1.gh.tar.gz 296000 BLAKE2B dc3b2c3f25ebbfb9d795e3c08e82b2e001fbc785dfb1666f137d8b261b65a90a15af7527917bdd9c636f076f75e01c65b498145ae5051649e1264eb9339d9f7e SHA512 83886ed1a60465127b7eb42a8437196cd68f4c538076237e4f64ff36f6fb02d1e45bd6730d4bb6209c931e05b4c2e10bae60451d1d4644071178ff44a73805e9
 EBUILD python-engineio-3.12.1.ebuild 737 BLAKE2B f8ee47b26152d15b8bee1b25743ac1a4a98e725f7426124f5c7783bd3fb1a67926f099e72823a56c04b846fa994c21a0d6535e08d7a778139d725e00d8c68887 SHA512 8fb54dc01b1df87fc841245f986b8548207329c1d6cbaf74929d1417d4b21db6032d88ddbbf7b6c24c3d01feb6b3c4a8f7699510cd8dd6cc67a6814070a902a7
-MISC metadata.xml 466 BLAKE2B 6ed10a68ef43c4462dcc0fd1ff545828cb6a38d63323da41ea1403d62c7465c08b2668319a0924b31d07719ccc0bd8587461d63362acddd9e329f9800b26bda7 SHA512 4b945547b692e81069a2ae0d70af112945aa2200b935efbddbbcfff4fea60268a9933dcf7ba2936e6c7a6655ef805f93252f157e63771e068a7ac6fb82c4de1a
+EBUILD python-engineio-4.0.1.ebuild 808 BLAKE2B 9b97a4531a5bcb3308f93d6b8a165856a602c210350f6f66d7ae24278bf6e42c1f4df02a611f4f89081992952982b536f48796b7bab1aa1db609ad9848560cb4 SHA512 f57984d627b39e7e5beca8b4256df87d2e4234bff1891c2d34703c36850171de6a0c43be1461f374be0cebd6436f9cc4b3f18075299005337b5612b9d9e320c4
+MISC metadata.xml 517 BLAKE2B c4eef9b286bd64542def3d6155741d9763f9757c847671448f926666c65e6ce3ced2fb0a5adc75885ad2379b6cf4eabf85bb40c55de7b58e1cf51ca4500609cc SHA512 75fb14f0e068c12ca86262ecccac67ffdcb5bea5f84b6d4b6290ad25a73b7ec0289c478bc5afe4f08123aabd2fb72963e206cdae9fc980fe540dfc8d2ed28b64
diff --git a/dev-python/python-engineio/metadata.xml b/dev-python/python-engineio/metadata.xml
index 5362121cde22..80d89641c27f 100644
--- a/dev-python/python-engineio/metadata.xml
+++ b/dev-python/python-engineio/metadata.xml
@@ -1,15 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<upstream>
-		<remote-id type="pypi">python-engineio</remote-id>
-		<remote-id type="github">miguelgrinberg/python-engineio</remote-id>
-	</upstream>
 	<maintainer type="person">
 		<email>zmedico@gentoo.org</email>
+		<name>Zac Medico</name>
 	</maintainer>
-<maintainer type="project">
+	<maintainer type="project">
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="pypi">python-engineio</remote-id>
+		<remote-id type="github">miguelgrinberg/python-engineio</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/python-engineio/python-engineio-4.0.1.ebuild b/dev-python/python-engineio/python-engineio-4.0.1.ebuild
new file mode 100644
index 000000000000..4b15e29d3ee9
--- /dev/null
+++ b/dev-python/python-engineio/python-engineio-4.0.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python implementation of the Engine.IO realtime server."
+HOMEPAGE="
+	https://python-engineio.readthedocs.org/
+	https://github.com/miguelgrinberg/python-engineio/
+	https://pypi.org/project/python-engineio/"
+SRC_URI="
+	https://github.com/miguelgrinberg/python-engineio/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/aiohttp[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/websocket-client[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/eventlet[${PYTHON_USEDEP}]
+		www-servers/tornado[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/python-gnupg/Manifest b/dev-python/python-gnupg/Manifest
index 5807ae7d89c9..36735abf116f 100644
--- a/dev-python/python-gnupg/Manifest
+++ b/dev-python/python-gnupg/Manifest
@@ -1,3 +1,5 @@
 DIST python-gnupg-0.4.6.tar.gz 52527 BLAKE2B ac616bebac3c5d0ac35c2c1a9353b4ee700848be2469fabc4b6df9f328868638f61211adc786ec59a24f122106ae53cce68d0f16c33b64c2d3d27cb94bf17956 SHA512 33b98bdd1c7d211d31173bbea2358fdfd2dabdbd5e70d4b33035a0edbf666bdba7319ffc847c8617f2626d1bf5a91102f1103c0bfe651fcd709d51ee821be104
+DIST python-gnupg-0.4.7.tar.gz 53091 BLAKE2B ebbd67b7255fa6e7739da785476efc441733c3cfa740fcb11c595c560b5a90ee43a1040a654485c30ae35f5e8d06fee235a4ae8d069f20f0eb1fb6e45b4ed441 SHA512 e590778affd3f864bac2221e1ce7c4a37ba257e7112e023d70617f3f3c7597dbeb2974db0ed611b2fc75a071678ae8856be4a3b3f48428a12b42c2f1125fdce5
 EBUILD python-gnupg-0.4.6.ebuild 681 BLAKE2B 4aa161e28d3e0587c08a0331a53e164e5198c976a8ae1e4eca0c54538d05f61e1211adc22a51c646af8974e682ceb261eb5382e72618377e3f4c1136930b7352 SHA512 d489c69d2b6e52fa7c58042f02fec19694e926ab93b4deddac99c85bbfbd71c37bee5edb3260a11f0ac0c62619a606a9b4db2542878d356bed3b09dd2a1ee004
+EBUILD python-gnupg-0.4.7.ebuild 696 BLAKE2B 10381ad9e7e67a115992fb023234399df028681cfc4398f6858183b905868a6d44b40fe67635baede5f0e40441efa33a97204455fc2142861bb1b9c293bf8b8e SHA512 868c294568d08eb8ba86710360beac992f5607fd4ff23d845e2ee5232f8e494bdd64bb1f55ae59bfbd66aa8f7fbf7fcd46460d5558d8870e8e88653f79caef20
 MISC metadata.xml 719 BLAKE2B bbab1386e54f1fdc7b8ca36064f020f5e2e908b367503af9d41612b63b3d97fd615a5c79fd49fafde4f60d372d2545953d8fcac28c8ecf5832212a24c102cd8a SHA512 153a00e09ea9fdf656a0e332ffa41cf52ee1fc018055c8d01129400b0141a34a511db15ab2fdcb21166bab06702342dfaab1e271d35aaee142146681e3ca8e14
diff --git a/dev-python/python-gnupg/python-gnupg-0.4.7.ebuild b/dev-python/python-gnupg/python-gnupg-0.4.7.ebuild
new file mode 100644
index 000000000000..d3fb551ea896
--- /dev/null
+++ b/dev-python/python-gnupg/python-gnupg-0.4.7.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{7,8,9} )
+
+inherit distutils-r1
+
+DESCRIPTION="A Python wrapper for GnuPG"
+HOMEPAGE="
+	https://bitbucket.org/vinay.sajip/python-gnupg
+	https://pypi.org/project/python-gnupg/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+LICENSE="BSD"
+SLOT="0"
+
+RDEPEND="app-crypt/gnupg"
+DEPEND="${RDEPEND}"
+
+python_test() {
+	# NO_EXTERNAL_TESTS must be enabled,
+	# to disable all tests, which need internet access.
+	NO_EXTERNAL_TESTS=1 "${EPYTHON}" -m unittest discover -v ||
+		die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/python-markdown-math/Manifest b/dev-python/python-markdown-math/Manifest
index 3f95b7b73279..00e571a6bdda 100644
--- a/dev-python/python-markdown-math/Manifest
+++ b/dev-python/python-markdown-math/Manifest
@@ -1,3 +1,5 @@
 DIST python-markdown-math-0.7.tar.gz 8320 BLAKE2B b402a6c1c3ef93f8716b88c0ba356109e6b483ce26b4a7923c16642a7a7fe69b25ee00e4f537d26b6fa743e81fef05871c447f9e5d3a986ff52bf7095bcdd436 SHA512 05bfff71c758785591c388a95b176205a8707428cbda91734c4f1b5d39cd030d9106782e92aca8f1de18be227b1489ad2cb09981b4455ba1d1177974cd0cbecd
+DIST python-markdown-math-0.8.tar.gz 8509 BLAKE2B f91d0dbd6073d724f90a1265a64f2375be51ce25f6bdf808e1176a582c0e98aa59a52d45d67c5e37f674db5b5b7dead572a93950b9143f0950a0ee20b241e4a2 SHA512 d35e0cba68fb4ec099368d0d4865a5ad1baab6fbd23f7457312ab6893c3864287c41c32f560bbd8cddb0afff6522640f9b9144a02774539eba4e1302fac05bcb
 EBUILD python-markdown-math-0.7.ebuild 888 BLAKE2B 828efca52077d8c74862db193696afc84dc4352a13f886167a0cd606b92d19f3b0c3ff5f8c451fa0335097f8d7c01d21cf15c036830f5d6bfe4a7abbba4daf67 SHA512 2b47515689a808624cecc0c17d4c15dad5859d5c88fc6f713fd4d99d9d2462afd4d83a5b1028940823c2d6387a8ed6531830c8251fc0a467e512c6c9ce10a96a
-MISC metadata.xml 618 BLAKE2B 38507a41b254385cc67fc807c7bc9597c22f65bf7ccad19a128d619d1b1ee86aeef3244fa01c90ab652179a9999146f02ac5bed4f57fec308f82c03356bf88a1 SHA512 cfdc0f283f5351aa12165bf85cd9e428f8d1d4c80eda12bacacbcf11d2b195d6306bc406b64ddd7dbdc3b086c7d2fbde70a424e0169751a9b92ae48e02544802
+EBUILD python-markdown-math-0.8.ebuild 473 BLAKE2B ccfdec63fd4692cfdcce4a02bf2b01389fee33d87205f60a1fdbdfa752968163966d1ec5cd3eec97d5a409510f2e92a61d533641e480ae10379c531dd20db280 SHA512 7bcef0da0a36be07dcf76853d9557d98ea4b0be8257dc510c4ddcc4888a8e8ed62ceddc704b10c2ad5483df13ce49988d1c61bb11971f2bec2ee1ef91dc81d97
+MISC metadata.xml 642 BLAKE2B 98bced2ef156614e4c32985a116ab66da51ba1e26926aee127e9e2e32e1856092d8e6e945facfc700bc00375e56729b961670f1aa94f1daed847727506e44d69 SHA512 5fa1cc7d05722e49e85467b40467c18e90401d02a256ac703ff2e888030d5b6412eee6d201df092b8d5bf72a9c8b99c176d6eeb854ab6af7051a71ff2f83835e
diff --git a/dev-python/python-markdown-math/metadata.xml b/dev-python/python-markdown-math/metadata.xml
index d1e1d1b62523..1d05563a467e 100644
--- a/dev-python/python-markdown-math/metadata.xml
+++ b/dev-python/python-markdown-math/metadata.xml
@@ -13,6 +13,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">mitya57/python-markdown-math</remote-id>
 		<remote-id type="pypi">python-markdown-math</remote-id>
diff --git a/dev-python/python-markdown-math/python-markdown-math-0.8.ebuild b/dev-python/python-markdown-math/python-markdown-math-0.8.ebuild
new file mode 100644
index 000000000000..5da919a71082
--- /dev/null
+++ b/dev-python/python-markdown-math/python-markdown-math-0.8.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..9} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="Math extension for Python-Markdown"
+HOMEPAGE="https://github.com/mitya57/python-markdown-math"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/markdown-3.0.1[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests setup.py
diff --git a/dev-python/python-sshpubkeys/Manifest b/dev-python/python-sshpubkeys/Manifest
index f49e00732831..46e8c99c71da 100644
--- a/dev-python/python-sshpubkeys/Manifest
+++ b/dev-python/python-sshpubkeys/Manifest
@@ -1,5 +1,3 @@
-DIST python-sshpubkeys-3.3.0.tar.gz 57904 BLAKE2B b716f91f99539a27574842687ca71b9eef4f715a667931576a94094687a6dd9bbb2ad50826fe2a4d7f21d546c4dd1e33daa815128e62e2446ade30218c3b42a2 SHA512 41314001e6f32a6286927833e64622c45bc5c55729722351dbb2305919a5b44fe74e528988a3fad672595eb2e8da7db225ad7ea6395aa14dc5abdc38187a600c
 DIST python-sshpubkeys-3.3.1.tar.gz 57896 BLAKE2B 3212ea0c38377255258a831cc942f71c0b0efb040ba8ca3283200b638dcae7a31ad5763ae0de4f51a7ae0c3f0a1b83ca6db96f00384ecd1e1e3a369028e4ed41 SHA512 8a59e73eddd795a71b64fc7433292ca03a9f447a13c8ef40d68fc599776c37f5e4a1fdbbf2f2ab00b0091a513e2412f213f6a21474ae0784af2df9a7107a2ed6
-EBUILD python-sshpubkeys-3.3.0.ebuild 576 BLAKE2B dc0a882dad0e9d646c7b242996360ba00aca2917dc2dfa8487669ea4283e81712c74d9941c3ff6d693a8a45a70564bd57468580bf07bea1b170e89e358c0b3ab SHA512 1e1caf7f070901f3a89cddcb4a5ff83297e404f8d22dc580684df6fb33280cf5be8d6cc8d60b96169fa9e8ba40389c68cb5f868250d1d47d2d170bb7026b06a1
-EBUILD python-sshpubkeys-3.3.1.ebuild 578 BLAKE2B d1a0ae006d31ed6880cfc55a774b2a17b86b47427f13f5d9e52aba1135e320ea16902e5462c34fadb92e76e7456825a9f641417286299cae36ef0c03a34af558 SHA512 56bf86ca3fd9fb8e39b9470dd062dec0f087a89b5553d84ed9e1b9e198fcacc9ba63c1a6aa40e47b042085fce3feb774758e896b93f5e80dd497261b9e8bfca1
+EBUILD python-sshpubkeys-3.3.1.ebuild 576 BLAKE2B dc0a882dad0e9d646c7b242996360ba00aca2917dc2dfa8487669ea4283e81712c74d9941c3ff6d693a8a45a70564bd57468580bf07bea1b170e89e358c0b3ab SHA512 1e1caf7f070901f3a89cddcb4a5ff83297e404f8d22dc580684df6fb33280cf5be8d6cc8d60b96169fa9e8ba40389c68cb5f868250d1d47d2d170bb7026b06a1
 MISC metadata.xml 511 BLAKE2B 1c456477ba1082685b12f78dec6f05e32b217923e608d2c62e0bdceb3ec1f695852e6d584657888d53c313f6a2ca444bf25709fe28a246acf28f076972a8e6fd SHA512 4180c2dd2bdd77c3df2ac08863e75b5e459738e71fe8c98f0dd44d267ea255a391796a95b52e9d53a0c0ec792927fa31bbfcb225577471da44805c117766c5c9
diff --git a/dev-python/python-sshpubkeys/python-sshpubkeys-3.3.0.ebuild b/dev-python/python-sshpubkeys/python-sshpubkeys-3.3.0.ebuild
deleted file mode 100644
index 0d5b72ec5ae1..000000000000
--- a/dev-python/python-sshpubkeys/python-sshpubkeys-3.3.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-inherit distutils-r1
-
-DESCRIPTION="OpenSSH public key parser for Python"
-HOMEPAGE="
-	https://pypi.org/project/sshpubkeys/
-	https://github.com/ojarva/python-sshpubkeys"
-SRC_URI="
-	https://github.com/ojarva/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-RDEPEND="
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/ecdsa[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests unittest
diff --git a/dev-python/python-sshpubkeys/python-sshpubkeys-3.3.1.ebuild b/dev-python/python-sshpubkeys/python-sshpubkeys-3.3.1.ebuild
index c2a98bb36685..0d5b72ec5ae1 100644
--- a/dev-python/python-sshpubkeys/python-sshpubkeys-3.3.1.ebuild
+++ b/dev-python/python-sshpubkeys/python-sshpubkeys-3.3.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 RDEPEND="
 	dev-python/cryptography[${PYTHON_USEDEP}]
diff --git a/dev-python/python-utils/Manifest b/dev-python/python-utils/Manifest
index 8250d88df1ea..8090578aec83 100644
--- a/dev-python/python-utils/Manifest
+++ b/dev-python/python-utils/Manifest
@@ -1,5 +1,3 @@
-DIST python-utils-2.5.3.tar.gz 49110 BLAKE2B 13b6a20278c73acc1e52c12dff3833b1dc6ebe6c1373ab5b972300d778bb4f110af79333dddc805b29a7d34265973ebf0136a607b82880b5c43c4c4d0c9f391c SHA512 7e0a584a80ce5eca654eca5335080b98b21bed11bcef7d238639d07e386f58d44a00765133b487dc5492cb35a221bc9e8042513099ee3b49177c77334129c8bd
 DIST python-utils-2.5.6.tar.gz 14057 BLAKE2B 2f66ab26cd6cda25f73c9f40081048404cde819e3e3c2fd11d134244ab2b80a05ab2b943e56a45bd8656bf3ba231853e3bfa9efbab9cb70515daaec70f6e0715 SHA512 35299880afdecd4a44144b95e6b2073e51680dfd2b00f31fb333d578cfa2c2f8bf5f58128cab88a7b81e658e6d5dca303f1c9f5be3870160679e1defbf94859e
-EBUILD python-utils-2.5.3.ebuild 568 BLAKE2B 2e80158c8a0a01dc2b3a0db07eccc38d576ba0cc5576da4eb76524ca453bc3300268499cc75c6bc61eb3d57996f8357360d14a92477c004c6409b283f2f7214e SHA512 d05fad7705f80815800fc2ffefddd711ede411e91e7d7224118cb1ebd6c13fd3dfd159051e3b83a606a307de96ce1a8cb39daadccb334cf63e896679602a7c5f
-EBUILD python-utils-2.5.6.ebuild 569 BLAKE2B be00a0f01485d3f953d68b13910328286128c4c96301e2841d5abf1c638e047db2a69e631cad59f75d49fe4b080758405d6c13989bb015d40a4563e2798efedd SHA512 ef998f76341d9d433d68cb892b41accfabff93f11966bf654f5bec8fea1b535e6dd74cf3573b1c68bb89e3d4bbd206d4e41c248ff48775f8bb06ae8cbafeb7a0
+EBUILD python-utils-2.5.6.ebuild 568 BLAKE2B 2e80158c8a0a01dc2b3a0db07eccc38d576ba0cc5576da4eb76524ca453bc3300268499cc75c6bc61eb3d57996f8357360d14a92477c004c6409b283f2f7214e SHA512 d05fad7705f80815800fc2ffefddd711ede411e91e7d7224118cb1ebd6c13fd3dfd159051e3b83a606a307de96ce1a8cb39daadccb334cf63e896679602a7c5f
 MISC metadata.xml 445 BLAKE2B a847943e498e81c625bd90908ea97d42ce4054cbb4f9a2bf525a214b261cd6baea9795b04ca88443c906c937647b50db5d3731f2a6b6740f3301de6f6e45d8cd SHA512 bd6c83e0495c326af8e74d6cece2faa6914508f6fc0edce4003ca116880e9730f9414028918a389300b494d77ef6e01a3652e7e2620221e1606d39da3901df18
diff --git a/dev-python/python-utils/python-utils-2.5.3.ebuild b/dev-python/python-utils/python-utils-2.5.3.ebuild
deleted file mode 100644
index 3fddaf420a56..000000000000
--- a/dev-python/python-utils/python-utils-2.5.3.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_{7..9} pypy3)
-
-inherit distutils-r1
-
-DESCRIPTION="Collection of small Python functions & classes"
-HOMEPAGE="https://pypi.org/project/python-utils/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	sed -i -e '/--cov/d' -e '/--flake8/d' pytest.ini || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/python-utils/python-utils-2.5.6.ebuild b/dev-python/python-utils/python-utils-2.5.6.ebuild
index b83efbe8075e..3fddaf420a56 100644
--- a/dev-python/python-utils/python-utils-2.5.6.ebuild
+++ b/dev-python/python-utils/python-utils-2.5.6.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/python-xlib/Manifest b/dev-python/python-xlib/Manifest
index 23ccde5af1a7..466c5dd1ac5f 100644
--- a/dev-python/python-xlib/Manifest
+++ b/dev-python/python-xlib/Manifest
@@ -1,3 +1,3 @@
 DIST python-xlib-0.29.tar.bz2 209322 BLAKE2B 4d94d99c8094947ce1acb84f3adc28ab4b6e9d6aaf61317b625e50578ece3800f6462551f8656b194d5635e3e35a5d6fec86d4eb553d7b65684a7f74fdf0dc14 SHA512 6275deb2c1e2068d560c45803e651fef9910b5cb921e043ed8204878a1f885b92122b6af3d4ac33f220231c1933d3150524169d0078f64b74df29a8f617d953a
-EBUILD python-xlib-0.29.ebuild 831 BLAKE2B e5716945af5611dc3f8b9672648da4c220d5869a5619477f587001e1c0f1d811a7f71aa87d99bed1ac757d4e4937949703e68b05a03e18c91393f206c379afbd SHA512 461658644d1ceaad161ade13e5d33f50329728e53a839a16d56c57a2c2e938b5ebdbeb596734b0b9a447e8ee5d1ce7a77aeaf7a5de80b6bd5c0e9b75dd23f079
+EBUILD python-xlib-0.29.ebuild 877 BLAKE2B 909e99cded605fc8e658e27e288f280428c84b1c781672393718e9be562af77713b6e2be9063f52825d56c554aec189516f154a1d9065477b796d1d5301c325f SHA512 b6b2a326932958a285c6fe81b7f8f835f2cbfc8cc5bbbd35dfed397e2bf3280555a49492b55b0d5a4010631eb957a119dccd4b4375017ef8bcdbffd1d6c57cae
 MISC metadata.xml 433 BLAKE2B 7ed1d8e54df6935b05b4ef997ed50a0df4e5178b8bf2a48f8d67a4ac6a4323ee8646c4fa93ecc6fa70aefa14d0b5039ff99183c3710b7ce689e5b73b8a5affb5 SHA512 29095e67eed7821c4e447579662019fad67c456f6ef6cd5a00f51db7e6c4be297cd48ee7b4c2ada10e59a5d829dc33fe503e7d5daa924493d050ce4a256411db
diff --git a/dev-python/python-xlib/python-xlib-0.29.ebuild b/dev-python/python-xlib/python-xlib-0.29.ebuild
index d6d571099055..9d95ed51ab69 100644
--- a/dev-python/python-xlib/python-xlib-0.29.ebuild
+++ b/dev-python/python-xlib/python-xlib-0.29.ebuild
@@ -19,7 +19,9 @@ IUSE="doc"
 RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
 BDEPEND="${RDEPEND}
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	doc? ( sys-apps/texinfo )"
+	doc? ( sys-apps/texinfo )
+	test? ( dev-python/mock[${PYTHON_USEDEP}] )
+"
 
 distutils_enable_tests unittest
 
diff --git a/dev-python/pytools/Manifest b/dev-python/pytools/Manifest
index f8695eaa7964..de56b6b8f490 100644
--- a/dev-python/pytools/Manifest
+++ b/dev-python/pytools/Manifest
@@ -1,4 +1,8 @@
+DIST pytools-2021.1.2.tar.gz 62893 BLAKE2B 9aa637f2cfeef93a8353f6df700d8566918aa75560f5b732cae96c2a1e1e327c53f303ddb107dab3f1056264dcd1aa2f75389a2bc3f433f7e44f7595e22df251 SHA512 c976f8dd87ee6fb870020ca14b4ac615e657a4be1ab4c737b4c572a8dc00b3f0c45c335ea0188bbad7b6769ce4123a33922e070e0dfe2bea63506d784c464a2c
 DIST pytools-2021.1.tar.gz 62003 BLAKE2B 2938359365082d9475cfb51586c78d3dce264cf0e8b1cf3fea0c7c688570c6e25c9a558b78977c35331ee89afd23ab7eb44a8702b3908eea160b07747646cc53 SHA512 c365cbb65b756869407f7f053112cb9732aeb138493172f2b90563a4f45e6d993557e54de2165a463931b8e2bd29c3ccd32c059702f21fb59e3dee74c19efd8f
+DIST pytools-2021.2.tar.gz 65140 BLAKE2B 8f419b5776c99b3179b2f4d44a2461ee5e3b55d663e8982f1e34f9fab3cb397ee5a0ee13a2eaf9de1f3330c951b6972cac6d9d0c3994f461ffeca8abf110f11d SHA512 3a91be32c5e1c70a3f2d8accb29888cd7f4b9e304fc68a3d2ca2d9ff674a885836236f6dbf11711555444a8eee63cbe86d85834fc73676420b331f94915a1018
+EBUILD pytools-2021.1.2.ebuild 632 BLAKE2B 435feb6c54a3ec7c848185818fd354e0bcc5338e8aa3671c369baefcacbfc011eb82b3eb9030eb1752e12f1d0fb45f7dc1312021570079644bfa7af2b4034742 SHA512 5829639f5b19f01739dc1b9de25787905237a771ce051c4c98b3a303fc6959354e1b05b06d04739e285dbc7fea3d7b60fd25e8c353e3d37995bf2091190aea2c
 EBUILD pytools-2021.1.ebuild 631 BLAKE2B c6331d7fc2c4ea29ecda248e305e01624dc8dbcba35546ac1a255ccfbf47b395a043aac44a3b7ff8a8e1f26fd0d31d881c2ea54325b82fbaabed36d3b785140d SHA512 1a2b7167f3f9d1959d77d21df99ffcbb22a8f0a0287512fac9b60ef14f264579230a971af8656e3135419694cf61a1f99eb226be0fbef05e25e11c9c6ac1babd
+EBUILD pytools-2021.2.ebuild 599 BLAKE2B b5548a84ac73adca30124537d35167f9aeffcca694a81f688ce733ee0c48ce8f148d75cda4c7e00fe6da3e69d77e81c0543fb13554008b5674c4cd92ce29e064 SHA512 e9f2ae3287f2872582dbfdf2ee909293b3bfb5d9ff173d9eac43ba50c14e5cbe9e5ce49094412de386221bbc2c0fd497538f3195652e84489742c70fe0affce7
 EBUILD pytools-9999.ebuild 659 BLAKE2B e95a3d9d028e49f5f6123a98342ac999ec1d6a3487ab7acfb2b09b4814d6b4a3af9d609ff17b9451bf93509926cb665c4568ccdf4a2dbeb93dab80ad82f976d1 SHA512 07ef3afa1568beae15a9210426a0d5b4687becf12249443e7f2d5e867b6a8632c17b01eca5dbb69ce1055eaecdda62256129783106b0bc45a88ec48e9670ed38
 MISC metadata.xml 394 BLAKE2B c92c0da3fd787c1b70b8b6518448050c13a1b68b27a813506d513f54db1b47853d4d2c633b70f5bb1e604935dbdf8e1f4fc3394cadb29ba30ead7a2b718c03f5 SHA512 70139b5703a5bda95cf48fa30cc97702a149a3555da20a2e8143fad5d9174557b3508a251526af797a93811aa3964ed5b0f8e89fc2a6b3da965a72062649ec37
diff --git a/dev-python/pytools/pytools-2021.1.2.ebuild b/dev-python/pytools/pytools-2021.1.2.ebuild
new file mode 100644
index 000000000000..21d7abc4ad97
--- /dev/null
+++ b/dev-python/pytools/pytools-2021.1.2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_REQ_USE='sqlite'
+DISTUTILS_USE_SETUPTOOLS=bdepend
+
+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/pytools/pytools-2021.2.ebuild b/dev-python/pytools/pytools-2021.2.ebuild
new file mode 100644
index 000000000000..c055f9dd4ed4
--- /dev/null
+++ b/dev-python/pytools/pytools-2021.2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+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/pytz/Manifest b/dev-python/pytz/Manifest
index bf36365f7134..db93bbf50d11 100644
--- a/dev-python/pytz/Manifest
+++ b/dev-python/pytz/Manifest
@@ -1,6 +1,4 @@
 AUX pytz-2020.5-system-zoneinfo.patch 1294 BLAKE2B 0f6f4cf1c588b90827decb19d82d7adf97f44769b2acd4038d6b818ae27162f576338b61de6775b4aa387b4a1cb434b36d6f14fdf1eaa3c878e2af7e9ce32620 SHA512 aad785a23a3681de7d52c4898eae4d7f33ddff9c136f52111ab0aef076d0a3c72c7b0aa0910e191f3098baa05c09f522e927a94967481a89d1d1bcbe99824e3b
-DIST pytz-2020.5.tar.gz 314194 BLAKE2B c374e0ee803878ad2dde1ef03c108f59f431d645d8067fb9f183b9feb029b4de283477e7f6c146a6d03462bd5cb4fc98118e03601c838f73903f5f7a7d28bf8f SHA512 0845c0b7cefb8732e3016568b17ae73232fe6537bac6da89cb1bf911ba5786ee1be6b5e3aa8767225291e3a7e9afd5b8e40e4051671a3a006f9e2f71c551e13e
 DIST pytz-2021.1.tar.gz 317945 BLAKE2B 5d8b5ac80a9d5be56977df8a422e9f008ccb1afb9468155c53aa97f0bf43ba15c27fd30ee7be035be6fa590dcb272991a069cd1383f1c6c8d378958d7b0c4970 SHA512 507e24e3c5c2c619d9f3c7f4c33d44d262e33656b07701d0db78f5d67b263ad845dccc4ff50e48c580b0f295cf97ed146af7b9259890a50bb6da4c82b70c439b
-EBUILD pytz-2020.5.ebuild 863 BLAKE2B df7c17e9cbcea04312351809c17a3384e86363e415b0ed7f5da654421a41c722bd6ce33e3b46f8b66b92f6a2ab8ccaf5faffca1d5bc4b407ef289a791cdc5cc3 SHA512 adf05dedb276703ce53ea1693e5f8ed3300db9a713a295f0bed1a740aef3e28c74d7fcd8a45e27de8f809151062e66f5b7f5d5ac7c7e1c20c625b7aea18df7a9
-EBUILD pytz-2021.1.ebuild 879 BLAKE2B 98fa7a0e1e92cfa0654b8a5b489b007fdf868c306fa07efea38d1e85388087f75ad5ad4efb9b5f2e5ef39aa4c238cbaea1beb3636df389750892bd09590335d4 SHA512 1e2d8bee9de12d26e6446aaaac9c3a3bab2a11388555d8efd1f2e603565e06923ff3aaad69c3474c0a02d8faa35e911e6c2c70151dd337931ac3eadba75e5192
+EBUILD pytz-2021.1.ebuild 870 BLAKE2B 438e965655695791453e308615710f8895962071cbef19a41921d884a0a2354c8de91321c2074c356bc5f99bda831c865155cef228a40ba574c2058461c6e633 SHA512 4cadc8b21513c3888f3723efa693c2f09649abb71a4dac793b5eff513550284845239331856b8fd08b4a893f1ede083d2c8d9e3f2147fad919cf8e8e2768117f
 MISC metadata.xml 764 BLAKE2B d26c3334bd7cf99b7a8a7767def5d9ec82ee6e335e27aaf891a47c5037eeb2816457974ea99a1cc865359718a5d7fc30e41f68d8b7ecc82a7a7e87b5943c10ed SHA512 6160a54921cc7c8f7dd504121b359727ab14ef9277bdb96720a31c8e32d223d29080cf9eb76531a94da8a5c7752372938fa5760e4e6cc77118a4792c31813580
diff --git a/dev-python/pytz/pytz-2020.5.ebuild b/dev-python/pytz/pytz-2020.5.ebuild
deleted file mode 100644
index 139d6cadf7c5..000000000000
--- a/dev-python/pytz/pytz-2020.5.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="World timezone definitions for Python"
-HOMEPAGE="https://pythonhosted.org/pytz/ https://pypi.org/project/pytz/"
-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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE=""
-
-RDEPEND="
-	|| ( >=sys-libs/timezone-data-2017a sys-libs/glibc[vanilla] )"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-PATCHES=(
-	# Use timezone-data zoneinfo.
-	"${FILESDIR}"/pytz-2020.5-system-zoneinfo.patch
-)
-
-python_test() {
-	"${EPYTHON}" pytz/tests/test_tzinfo.py -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/pytz/pytz-2021.1.ebuild b/dev-python/pytz/pytz-2021.1.ebuild
index 876bb3d8bfa1..8795a50315d9 100644
--- a/dev-python/pytz/pytz-2021.1.ebuild
+++ b/dev-python/pytz/pytz-2021.1.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 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE=""
 
 DEPEND="
diff --git a/dev-python/pyvirtualdisplay/Manifest b/dev-python/pyvirtualdisplay/Manifest
index 7af238df9410..68898e57c5e2 100644
--- a/dev-python/pyvirtualdisplay/Manifest
+++ b/dev-python/pyvirtualdisplay/Manifest
@@ -1,5 +1,7 @@
 DIST PyVirtualDisplay-2.1.tar.gz 40798 BLAKE2B 315bb794b81948357919e98637b6276cca11739d019333c873a2b9c3d28d0bbece6996a70fe619f7acae658bcbaa2743dbbdfb23b7b8515c3a40858a83b07712 SHA512 f95a1622adfa1198d7f35757110e923e45bbfc18b31945c9efedb578e1a27fc91ffec403cc68269b2414837260b2b56ae9a58323ed5020af962757722d7a4517
 DIST pyvirtualdisplay-1.3.2.tar.gz 38532 BLAKE2B 2c0cb3af426abc58dc895667c5fecb40ee9aa870dbb08a51ac32fbd5bd3620b97498b3dfc6e7026362604c82f67b60885370f0704a1349a65668628d9a21e80c SHA512 422e1530bb740fc77cc0b7abb73cb8e7326689c80c5f49b58be70b262e8a2c28274d3b83a0ec7753adfbf78b780047f61cf7b18fb14f935d483a5e3d04953210
+DIST pyvirtualdisplay-2.0.tar.gz 40480 BLAKE2B 8243f88a3878124aebf45624ab5712052e3ee9bdae77c150bdfcf109cd7528db8b47a7328aa9a149e8fdb3d8437e84076631adb539185a16a8e64ab97265a45e SHA512 bb5c789723c96d4f2952626c063f749c9f07045231af90d21ccda41697319a4d2f27db8c0f352fd273db114c0d5e65e8c6151b7f858b8ea4e19660a1e941514f
 EBUILD pyvirtualdisplay-1.3.2.ebuild 1378 BLAKE2B 251f36c32e53a76604d98d8166e6a32e5a663994c6729cff60d0e759089d3cc52a87d459e41783c4fdcc68df2ed77d1979bf92b4c288c92ce52ed0d7a90cbaa4 SHA512 ed8dfae1439ccaf1c0b5936024f9f91ebafaa0efbf324f0d8070797a3c6c2dd2751b672cdb5b39acc56c79a4faf9de4ce6683513b1faa6de224719e2213840dd
+EBUILD pyvirtualdisplay-2.0.ebuild 1383 BLAKE2B 57eadd7da3a9c5f32936a282416785f7c3c78e3c2ad41c6307a184f742e20951351863f3b03e29cd09497c259df13d433bcb52227ebea8667c0789e0810f2ec5 SHA512 0365e68ea9ad8600139c197ca8b21539309b08c197f710e6f0db191cd404ede12dc81b43431b4fe1ec6cecf4400bd58797140ff96c8b831d7e1ad2cedbefe49e
 EBUILD pyvirtualdisplay-2.1.ebuild 950 BLAKE2B e351abd07253bea2a2a16421e96fc3d6e853e6f9a0851969da6d39bc23c1378b8cc9637ae4a8177afffc1b091e6c0ce9a06dfd699bb905d02f4b5e80eacf6d89 SHA512 68d0bb13e235b2515ecc30da4135ca5ea401c2aa9e7148e232b405204a02468f31727caaa6091788e362a9c47bc0adacfb3eb2093046d78d4a1246256d9fd1e9
 MISC metadata.xml 555 BLAKE2B 226c0f1bf5691e6e3c2c7e092df25cbf3f52d5aa9138e393228381de08acdcc64e3860a7c8ccda30135ac702ffcc57718a4c4c1ea12846dba20e34812a36b6b7 SHA512 0d29bd64e163061ad69b87bafd41fec8ea618437ddbdc1b7597e2e5182cb516a266d8246e0a6f10d01b6feaab96552c9e35b619afb9ba2cd55d2f5fe23366462
diff --git a/dev-python/pyvirtualdisplay/pyvirtualdisplay-2.0.ebuild b/dev-python/pyvirtualdisplay/pyvirtualdisplay-2.0.ebuild
new file mode 100644
index 000000000000..132a2cde78b6
--- /dev/null
+++ b/dev-python/pyvirtualdisplay/pyvirtualdisplay-2.0.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_{7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python wrapper for Xvfb, Xephyr and Xvnc"
+HOMEPAGE="https://github.com/ponty/PyVirtualDisplay"
+SRC_URI="https://github.com/ponty/PyVirtualDisplay/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="test? (
+	dev-python/entrypoint2[${PYTHON_USEDEP}]
+	dev-python/pillow[xcb,${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	~dev-python/vncdotool-0.13.0[${PYTHON_USEDEP}]
+	x11-base/xorg-server[xvfb,xephyr]
+	x11-misc/x11vnc
+)"
+
+DEPEND="dev-python/easyprocess[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/PyVirtualDisplay-${PV}"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# all of this fails: AssertionError
+	rm tests/test_examples.py || die
+
+	# Hangs forever
+	sed -i -e 's:test_race_100_xvfb:_&:' \
+	-e 's:test_race_100_xe:_&:' \
+			tests/test_race.py || die
+
+	# Hangs forever
+	sed -i -e 's:test_slowshot:_&:' \
+		-e 's:test_slowshot_with:_&:' \
+			tests/test_smart.py || die
+
+	# Hangs forever
+	sed -i -e 's:test_double:_&:' \
+			tests/test_smart2.py || die
+
+	# pyvirtualdisplay.smartdisplay.DisplayTimeoutError: Timeout! elapsed time:1.8 timeout:1
+	sed -i -e 's:test_smart:_&:' \
+			tests/test_smart_thread.py || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/pyxattr/Manifest b/dev-python/pyxattr/Manifest
index b7b23454f165..c7fc0b843890 100644
--- a/dev-python/pyxattr/Manifest
+++ b/dev-python/pyxattr/Manifest
@@ -1,5 +1,3 @@
-DIST pyxattr-0.7.1.tar.gz 30580 BLAKE2B 748ce0610ebc1a074dee87dffc67a88e1def0ea467f13758d2d85f9f5c37954586d85dfb8ceb1b77f4ef637295d57a153849b00d773e2e79b06902974fe01663 SHA512 093cb3f9b9637194b9737c07da7dde45b3d5083ec16a9209af80d30c86da8f93badff5aada395415be3dd48da73004286e47d0aa0671c95e65b0492d02e86009
 DIST pyxattr-0.7.2.tar.gz 31550 BLAKE2B 3505300d7a50dc305068740379bb8edbefa29f228c797e2e74467a51f4b0a6b740203f89b8ed461218978214213a6cd778107f58eb07a64d6b45e25d0fb769ea SHA512 fb9b36d5d2fb9ab674daf40d6f5c7dbe50d847dcb6d9955d270ef3aed2d8e3540f8feebd934009f47d63f3c55882846a20f7ed733b0d0c004e7a1984e7106206
-EBUILD pyxattr-0.7.1.ebuild 824 BLAKE2B bf563eaaa4ae394748c7be5f6fa54e306efa1435e73a6e6677e7dbc94a23a57ac073c31dcabcc00fad70dfaeb805b2b6b3ae015b815bbfd91083fab8feb66d5b SHA512 c41ae555d23866dca2ec2c9d7e1185aa3bf676641a3b0a24d882f8e9f83c827f6db4b7142834fd02afaa345b6245c9cac4c84fc3c6aba41e020d947eb9c8a7b9
-EBUILD pyxattr-0.7.2.ebuild 826 BLAKE2B 40bf37b2f3a1e7300863c22dcb5a98187051b8590e232fe8a65ad00fad262ff101cb77164c0f7f5a3e5397a5640eacd27ecdc8816bf87ce9c4fc8a65475a44f9 SHA512 861b16dfd9561684a951395291e90d01dde2b875d6e008f0448c8273cfa2ba25fd172a7e7a49785b61536db337ba2d22829a66645c449a0437b30d579aa06698
+EBUILD pyxattr-0.7.2.ebuild 824 BLAKE2B 03ea55768e80272ea88d95c625f6f483a94288cacbef354292b23aa16686c214543601384ce424056727d50d95394ed2241943f853811addc8d383b54a21abfc SHA512 8a9249c07fec26209c5c2405fa42dbfef35adbfcd74fa856b14f6272c4feaa09d235ee4caeeb07d8b356cc7bdbe08907606533acf685b6963a3b350edda2ec40
 MISC metadata.xml 609 BLAKE2B 8f3429390129e4438c5bb4c8d82ae11e9824863d4b200a57d660d0ae93692711b96c6cbcfd9e7e8ad46848beba86dd2ee971acde59c08c9fc6f317283358157f SHA512 8a18175143b319bf6f623304ad8f534ad34eaf8b67c57ee1addb8886e34d79bd3a74723bce4f66fb5e9e3dad4768aaf253cec8fb8e97365f152d0b8f772d7df6
diff --git a/dev-python/pyxattr/pyxattr-0.7.1.ebuild b/dev-python/pyxattr/pyxattr-0.7.1.ebuild
deleted file mode 100644
index be3812bbdd40..000000000000
--- a/dev-python/pyxattr/pyxattr-0.7.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python interface to xattr"
-HOMEPAGE="https://pyxattr.k1024.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
-	https://pyxattr.k1024.org/downloads/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="sys-apps/attr:="
-DEPEND="${RDEPEND}"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx doc dev-python/recommonmark
-
-python_prepare_all() {
-	sed -i -e 's:, "-Werror"::' setup.py || die
-	# Bug 548486
-	sed -e "s:html_theme = 'default':html_theme = 'classic':" \
-		-i doc/conf.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/pyxattr/pyxattr-0.7.2.ebuild b/dev-python/pyxattr/pyxattr-0.7.2.ebuild
index 16e0011df0e1..605596a12e96 100644
--- a/dev-python/pyxattr/pyxattr-0.7.2.ebuild
+++ b/dev-python/pyxattr/pyxattr-0.7.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="sys-apps/attr:="
 DEPEND="${RDEPEND}"
diff --git a/dev-python/rencode/Manifest b/dev-python/rencode/Manifest
index da2c891d2579..49117d9696ed 100644
--- a/dev-python/rencode/Manifest
+++ b/dev-python/rencode/Manifest
@@ -1,3 +1,3 @@
 DIST rencode-1.0.6.tar.gz 25455 BLAKE2B def013a569a53e2b2d96b3430c13676810bc5879e565f091dbc44f1ae950b8ec7ca0fa5e35a974432fd71a1bcca5a3f1f18bb2a9f042480167ab50e4f0aba8c3 SHA512 f04de4d3a83aed916bdc4b7a8ca772655e9324d0531ee882cb7d2a1e92b397bdcec8497bf02939e0a806886ecc62ed2e7319dfee054dad1b69052157f0959e8f
-EBUILD rencode-1.0.6.ebuild 543 BLAKE2B 1ba70f8280426f1c3f608bd824b3503becf5f90bb02b7705dbf3761f8b64c606594458af3b292ad8534e6637073fd1587fdf880635dd6012e362396e4c1a9666 SHA512 6ead784884454272530c03b82a7fdee78022ffe2e2f7d577c89b644efd6c0c3faa59f089aa1066133a2fda81f78961190e5233b0e3ada461d4873e4b3b4dff5b
+EBUILD rencode-1.0.6.ebuild 550 BLAKE2B a758e02c534663464a4d8ba52059904d134f61e9194a9bdd4493c55eb92b3a2d9525807e5242d34811c76e7a3e86619e39d343c34e25637caa48388c9e9c9396 SHA512 0ff395a1b4365b6db91525c4263bdf7b26d63a1094c800ed434463e3a03d2db0ae6e96ef65274bd4fe4d615f828ce73b855aa212e54518ee18c596f8b360b954
 MISC metadata.xml 711 BLAKE2B 99d00b59865b5d2994f472e347afb5cf8a4bfc1333c9eea5ce76d45f6ae2ee246c376bf2a7b0dbafa7f8b9e14ffb4cd062ea1c3e6bf300061b6bb13c212aa09b SHA512 55138e8f053487e2d4fc904ac544f9fa2058ed3fb2ab3238d36612c6741f667a812460d613c474a287eb871cbc8ba76b521838ca1d030a088761e5c73dc65511
diff --git a/dev-python/rencode/rencode-1.0.6.ebuild b/dev-python/rencode/rencode-1.0.6.ebuild
index 03525db2042e..a23f32664aa6 100644
--- a/dev-python/rencode/rencode-1.0.6.ebuild
+++ b/dev-python/rencode/rencode-1.0.6.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
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/aresch/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-python/reportlab/Manifest b/dev-python/reportlab/Manifest
index 3f83cb24d336..29abb4b8cfbe 100644
--- a/dev-python/reportlab/Manifest
+++ b/dev-python/reportlab/Manifest
@@ -1,5 +1,11 @@
 AUX reportlab-3.5.48-usr-lib-LLD.patch 1601 BLAKE2B 34ff1ce6b0cc2fa8ea3b2bec79ccab0eb7ccc28ed306b524b0fced1a37605c0c957090c39c5a0b71dd6d3c47c60cb7b714142a2f339170b7dcd965363ff2df66 SHA512 32fbd4410846ba4d0a3a8a5521f21f445f76ee75d0adde6ade210816901f1bcffc511efe3822c9b473d71b3541a716f9b2a3aa39181afb21de3aad9d13026476
 DIST pfbfer-20070710.zip 677333 BLAKE2B 100214476a361a5e5d1f3da0999591345f6e3a3f8c6bc3f6a3e9eca734190c6259758a43302c6e41254d33491fe535eb7d5dd07aa9727c912424bebc31fc18df SHA512 6fd4a5d955464b10d13a7b748703450c1fe120d5ed09e8cfa1b4dfa9c183c59fe001df29433af551796b0df62544b7ddc364f9bb1bdcc2cd300434340ffcc4f2
 DIST reportlab-3.5.60.tar.gz 2905122 BLAKE2B 8863e910dac03d5fd1d53880bb9fe83d218641156e481c97b498e462cf9e1e5c6826f2f25fcef7c65cee3dbc7551401bfd1dba6a319532363b7c9cbc9c37e618 SHA512 395ad0c904215ba3ae16efa52140b7cc6f751efd04c70f687a8891806b346d78c75bb29df5aa0d6d49adb6f5638da58704e713ee1500df05424c9dddc38afad2
+DIST reportlab-3.5.63.tar.gz 2908785 BLAKE2B 0af6f72063e4a1f4464bf8d847575e23b5d96ced3bdbafa518e56503194e98aed5e07c17fbf6cf07d3d95ef91b3d0d450233024b40368889dc1ef5d8792050fe SHA512 39c940a585695752095b868fa631396193083d9d270512e0e89e766e02d749745b6d0438f2d9f5ec2ea58c7da6aa538a0315fbd7483571ebc2c460035e12a1bf
+DIST reportlab-3.5.64.tar.gz 2909252 BLAKE2B 5922ec3083238c2884d7ebede5593a15fa537a8bd72f5cf9b6a84bf1673fe43be2df9f2125f033400c766fdf78a07f4c919b331bbd2215acb950dbbcb971bced SHA512 ac4eb9a7c337ebdde81dcfa9e6b9609aec7fca8451d383c28b9d58e0ea73bd71c328fb2362ba5805b96e10c95dc166d5806eb763c5c325a6d72a9474dce3c422
+DIST reportlab-3.5.65.tar.gz 2909468 BLAKE2B cec88aa00299d329a44379798824a8694f7547a9bb35685b202873387d0b40cdb2bfc864257ee2749c8cc24ed1d26e1ef22c1059fe2e27df38cedae71d55ceda SHA512 a143ff277ab4e9bf667d8334aca9d5b0c959b64eebbd5eda8d6fed95b09cd28544a33bbe5f630753f167b54e63a1a5e04f841c8892712e93d2f8739e9651269a
 EBUILD reportlab-3.5.60.ebuild 1427 BLAKE2B e28248a50f14aa4b7c110fc965fbe3a2b723369f0ab9ceaf1afaf32b216ce224557cb3d08eef46ab510a96371840df2b4a162d881dbae65652a465a3166e7034 SHA512 9b5203054f7b4f52a4440ea2f6500928c9be0ba8dfdd3f392512d7d7caa3be2bb23f28e25d2fb9ea01e3af984990af454b15e398965c9d7da13ffd8aca59c907
+EBUILD reportlab-3.5.63.ebuild 1498 BLAKE2B 067bba343813221022b21a79f81132a4eda9b40d962cb231baa8dc0f50c9963942a83cc05a788f8990b400815042d162bb7b4fd150271a66528fce15106541da SHA512 03aae050ba5b791514aedf2a9d9f6c877fedd500029280d530e845aa136d234312edb08bf9e61ab18afba562398e17138881e31521756d7fc446d3d87d3c2dac
+EBUILD reportlab-3.5.64.ebuild 1498 BLAKE2B 067bba343813221022b21a79f81132a4eda9b40d962cb231baa8dc0f50c9963942a83cc05a788f8990b400815042d162bb7b4fd150271a66528fce15106541da SHA512 03aae050ba5b791514aedf2a9d9f6c877fedd500029280d530e845aa136d234312edb08bf9e61ab18afba562398e17138881e31521756d7fc446d3d87d3c2dac
+EBUILD reportlab-3.5.65.ebuild 1498 BLAKE2B 067bba343813221022b21a79f81132a4eda9b40d962cb231baa8dc0f50c9963942a83cc05a788f8990b400815042d162bb7b4fd150271a66528fce15106541da SHA512 03aae050ba5b791514aedf2a9d9f6c877fedd500029280d530e845aa136d234312edb08bf9e61ab18afba562398e17138881e31521756d7fc446d3d87d3c2dac
 MISC metadata.xml 322 BLAKE2B 64b99a95cfa082f2ae8e3a778cf44d3598f4d3f43f03d58eae011aa4b361af042e1b650eba9eb17421c8c154e654a8340d4a85d60891aa89666861a973a49d15 SHA512 cea3f16d94fb50eb3e505756952d9ee14e170e5354e5a3a186c24dc3a253ce96d6d275505e71586ef360c71e080a9eaf5fb461d8aff4fc18ac6122912bbe1976
diff --git a/dev-python/reportlab/reportlab-3.5.63.ebuild b/dev-python/reportlab/reportlab-3.5.63.ebuild
new file mode 100644
index 000000000000..71dd8dad099d
--- /dev/null
+++ b/dev-python/reportlab/reportlab-3.5.63.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_{7..9} )
+inherit distutils-r1
+
+DESCRIPTION="Tools for generating printable PDF documents from any data source"
+HOMEPAGE="
+	https://www.reportlab.com/
+	https://pypi.org/project/reportlab/"
+SRC_URI="
+	mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz
+	https://www.reportlab.com/ftp/fonts/pfbfer-20070710.zip"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+DEPEND="
+	media-libs/freetype
+	media-libs/libart_lgpl
+	sys-libs/zlib:="
+RDEPEND="
+	${DEPEND}
+	dev-python/pillow[tiff,truetype,jpeg(+),${PYTHON_USEDEP}]"
+BDEPEND="
+	app-arch/unzip"
+
+distutils_enable_sphinx docs/source
+distutils_enable_tests unittest
+
+PATCHES=(
+	# bug 738312, remove -L/usr/lib from link line
+	"${FILESDIR}"/${PN}-3.5.48-usr-lib-LLD.patch
+)
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	cd ${P}/src/reportlab/fonts || die
+	unpack pfbfer-20070710.zip
+}
+
+python_prepare_all() {
+	# tests requiring Internet access
+	sed -i -e 's:test0:_&:' \
+		tests/test_platypus_general.py \
+		tests/test_platypus_images.py || die
+	sed -i -e 's:test9:_&:' tests/test_lib_utils.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+src_configure() {
+	mydistutilsargs=(
+		--no-download-t1-files
+		--use-system-libart
+	)
+}
+
+python_test() {
+	pushd tests >/dev/null || die
+	"${EPYTHON}" runAll.py -v || die "Testing failed with ${EPYTHON}"
+	popd >/dev/null || die
+}
diff --git a/dev-python/reportlab/reportlab-3.5.64.ebuild b/dev-python/reportlab/reportlab-3.5.64.ebuild
new file mode 100644
index 000000000000..71dd8dad099d
--- /dev/null
+++ b/dev-python/reportlab/reportlab-3.5.64.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_{7..9} )
+inherit distutils-r1
+
+DESCRIPTION="Tools for generating printable PDF documents from any data source"
+HOMEPAGE="
+	https://www.reportlab.com/
+	https://pypi.org/project/reportlab/"
+SRC_URI="
+	mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz
+	https://www.reportlab.com/ftp/fonts/pfbfer-20070710.zip"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+DEPEND="
+	media-libs/freetype
+	media-libs/libart_lgpl
+	sys-libs/zlib:="
+RDEPEND="
+	${DEPEND}
+	dev-python/pillow[tiff,truetype,jpeg(+),${PYTHON_USEDEP}]"
+BDEPEND="
+	app-arch/unzip"
+
+distutils_enable_sphinx docs/source
+distutils_enable_tests unittest
+
+PATCHES=(
+	# bug 738312, remove -L/usr/lib from link line
+	"${FILESDIR}"/${PN}-3.5.48-usr-lib-LLD.patch
+)
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	cd ${P}/src/reportlab/fonts || die
+	unpack pfbfer-20070710.zip
+}
+
+python_prepare_all() {
+	# tests requiring Internet access
+	sed -i -e 's:test0:_&:' \
+		tests/test_platypus_general.py \
+		tests/test_platypus_images.py || die
+	sed -i -e 's:test9:_&:' tests/test_lib_utils.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+src_configure() {
+	mydistutilsargs=(
+		--no-download-t1-files
+		--use-system-libart
+	)
+}
+
+python_test() {
+	pushd tests >/dev/null || die
+	"${EPYTHON}" runAll.py -v || die "Testing failed with ${EPYTHON}"
+	popd >/dev/null || die
+}
diff --git a/dev-python/reportlab/reportlab-3.5.65.ebuild b/dev-python/reportlab/reportlab-3.5.65.ebuild
new file mode 100644
index 000000000000..71dd8dad099d
--- /dev/null
+++ b/dev-python/reportlab/reportlab-3.5.65.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_{7..9} )
+inherit distutils-r1
+
+DESCRIPTION="Tools for generating printable PDF documents from any data source"
+HOMEPAGE="
+	https://www.reportlab.com/
+	https://pypi.org/project/reportlab/"
+SRC_URI="
+	mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz
+	https://www.reportlab.com/ftp/fonts/pfbfer-20070710.zip"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+DEPEND="
+	media-libs/freetype
+	media-libs/libart_lgpl
+	sys-libs/zlib:="
+RDEPEND="
+	${DEPEND}
+	dev-python/pillow[tiff,truetype,jpeg(+),${PYTHON_USEDEP}]"
+BDEPEND="
+	app-arch/unzip"
+
+distutils_enable_sphinx docs/source
+distutils_enable_tests unittest
+
+PATCHES=(
+	# bug 738312, remove -L/usr/lib from link line
+	"${FILESDIR}"/${PN}-3.5.48-usr-lib-LLD.patch
+)
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	cd ${P}/src/reportlab/fonts || die
+	unpack pfbfer-20070710.zip
+}
+
+python_prepare_all() {
+	# tests requiring Internet access
+	sed -i -e 's:test0:_&:' \
+		tests/test_platypus_general.py \
+		tests/test_platypus_images.py || die
+	sed -i -e 's:test9:_&:' tests/test_lib_utils.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+src_configure() {
+	mydistutilsargs=(
+		--no-download-t1-files
+		--use-system-libart
+	)
+}
+
+python_test() {
+	pushd tests >/dev/null || die
+	"${EPYTHON}" runAll.py -v || die "Testing failed with ${EPYTHON}"
+	popd >/dev/null || die
+}
diff --git a/dev-python/requests-kerberos/Manifest b/dev-python/requests-kerberos/Manifest
index 2625b74b4abc..c239f2b1432e 100644
--- a/dev-python/requests-kerberos/Manifest
+++ b/dev-python/requests-kerberos/Manifest
@@ -1,3 +1,3 @@
 DIST requests-kerberos-0.12.0.tar.gz 21579 BLAKE2B 297cbecb0fc3508f5f62440c5860dcd94eeb077e68757c0646e7e3bec65cd34e19212b9992dad491ce0adeb91234db533528936f740599e42ff439f78af103ba SHA512 b925b5f9f6753e87368dce451927df09568d0d6126d4ae8514bbd99a794d983e32298b92b6239be9f95595483e2682259cf165c6997d17d9cea64a81d4af1a06
-EBUILD requests-kerberos-0.12.0-r1.ebuild 782 BLAKE2B af985bc345f71465227bf93ed8d499f2d815abff69de1d61b55642024f56928ad4bb251aefeda732f4a96d81bf81170bd98f4f835fc23da4b883080f9763c534 SHA512 3367627541d5b8e4d3139c202abef48c8b8481ae42d90101c75e272a34d2cbe8ac8683e912869a1ceb7490555d35d5a71670a8049736926c7224fc07d72360c7
+EBUILD requests-kerberos-0.12.0-r1.ebuild 801 BLAKE2B 36e0bcae4f70c9e628e76800f761d8fda7def102f9ccf0b3a21b92cd8e71f0ba8e27d7e25adacbce7a28d811ac7ce937f203795c7133c5c3d868610b7a2b53d9 SHA512 b0fd4926966c9d74f40da302184eea10456a5510deab7ce7182ff1bcf7064e7784a6d5832f37d374023c0d41c3f3290110d514f9f203e36bc31c20b79ec1aa7c
 MISC metadata.xml 386 BLAKE2B 6eee29cfd3bc3387cf97222bd167b60be9c45f8d0dc417c428241660c8151f74d284423f7a7c324d652f99f677c86b34e48fe1a627cdae52af349f37e7a77aa8 SHA512 885e86f315747187bff26ee29b88892a93712250923b5ec94a7baa1e30cc4e28cced1d93e055eb4a0bea15362fe9047d133747812393cd83ee327b9092a95127
diff --git a/dev-python/requests-kerberos/requests-kerberos-0.12.0-r1.ebuild b/dev-python/requests-kerberos/requests-kerberos-0.12.0-r1.ebuild
index f3ff6d43cab0..7fc7fc968c67 100644
--- a/dev-python/requests-kerberos/requests-kerberos-0.12.0-r1.ebuild
+++ b/dev-python/requests-kerberos/requests-kerberos-0.12.0-r1.ebuild
@@ -1,9 +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_{7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit distutils-r1
 
@@ -17,11 +17,16 @@ KEYWORDS="amd64 x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
-RDEPEND=">=dev-python/requests-1.1.0[${PYTHON_USEDEP}]
-	|| ( >=dev-python/pykerberos-1.1.8[${PYTHON_USEDEP}] <dev-python/pykerberos-2[${PYTHON_USEDEP}] )"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+RDEPEND="
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	>=dev-python/requests-1.1.0[${PYTHON_USEDEP}]
+	|| (
+		<dev-python/pykerberos-2[${PYTHON_USEDEP}]
+		>=dev-python/pykerberos-1.1.8[${PYTHON_USEDEP}]
+	)"
+BDEPEND="
 	test? ( dev-python/mock[${PYTHON_USEDEP}] )"
 
 python_test() {
-	${PYTHON} tests/test_requests_kerberos.py || die
+	"${EPYTHON}" tests/test_requests_kerberos.py -v || die
 }
diff --git a/dev-python/requests-ntlm/Manifest b/dev-python/requests-ntlm/Manifest
index 032a1c6a56db..ee792c6dc4e3 100644
--- a/dev-python/requests-ntlm/Manifest
+++ b/dev-python/requests-ntlm/Manifest
@@ -1,3 +1,3 @@
 DIST requests_ntlm-1.1.0.tar.gz 5183 BLAKE2B 190a75d3f82ae2216e05295f855aa072f98908ef8a0d4dda68d6e39239655ccf175c707af137290cd78cf622c0a3d1741a0afbb1363f8b170f408c34a2682fa6 SHA512 9a74ecd6e4ed5c5e4381d2ee3fb9ff233352b49baa5fae4e0ecc30aaad12fc7a5c1b9dd936f35d4a3815ae7f6ec5bb8581e84128d63ff0e961181408daddb807
-EBUILD requests-ntlm-1.1.0-r1.ebuild 565 BLAKE2B 1103faaaad72dc5896e56f9afaa399a2022fefb2add2b274ad998d644fb8e72c250d9dc82f8a30cb979b2a52f554019e9b9e867a8618ddbc29e0760b058713fa SHA512 01b5bbdb53269100914a8d146a1cd05329db13eb5da5ce94427db458c74146e260ae9835b2ca36973d4a2c8bc353b9a3789e14989f0bd83babef6a1978d9b958
+EBUILD requests-ntlm-1.1.0-r1.ebuild 566 BLAKE2B dcafeaee93d2d6607d823fb065cb2905db81991913074415963590ed9de1d2eb76d7ad10d55611d027008447b0506ba16d39209876ba8486fdf54413d439c621 SHA512 ed378a922a52cda2e1c4a87ee5e13488e83927b5b9856522eaac4d1b892fd026c37fef3140bc77599735b6401cf3758099bca8eaec8c1735803317483a048f20
 MISC metadata.xml 491 BLAKE2B b503610de8790903299c9424c570b85b7566d6a2301a8ab11029e5b891137a3dc6fb634fc3c4f6684ab382884157fbef7448ae8e57e5a29c5a458e64238ce244 SHA512 9608e9f1b72871d8c4146fca162c046231492a7872314add98509813ade7b2bfc23a3ed70073671ecb2b7096ca560d8e2fa2c1e2d6c261b29f26fdef43500c6c
diff --git a/dev-python/requests-ntlm/requests-ntlm-1.1.0-r1.ebuild b/dev-python/requests-ntlm/requests-ntlm-1.1.0-r1.ebuild
index c0d4bc16cda0..0dc99202b61a 100644
--- a/dev-python/requests-ntlm/requests-ntlm-1.1.0-r1.ebuild
+++ b/dev-python/requests-ntlm/requests-ntlm-1.1.0-r1.ebuild
@@ -1,9 +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_{7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/requests-toolbelt/Manifest b/dev-python/requests-toolbelt/Manifest
index 98293cc0e922..853089c7d7e6 100644
--- a/dev-python/requests-toolbelt/Manifest
+++ b/dev-python/requests-toolbelt/Manifest
@@ -3,5 +3,5 @@ AUX requests-toolbelt-0.9.1-tests-internet.patch 1225 BLAKE2B 54af195690d8ac4754
 AUX requests-toolbelt-0.9.1-tests-py2.patch 3100 BLAKE2B 39ecfd8f0bbf2a4d0731c485ada404f405413117e7451d36eefbc4f05b0073f86310e66ad4320e8ce648175aa072306acab551a50a4a516470b0beb4b981124a SHA512 540813a2d69c84d37a4a6ec5b98d2b71693ba34bbf661bb44be69c646d164134702e9fadd341d07085205b476239260167c858983978488553a07bdbf205ba24
 AUX requests-toolbelt-0.9.1-tests.patch 5781 BLAKE2B ff7339a1daf0ba2df49914847000f0b8b5ff2d097a59bcb02bcb2b20a885f18223a1da1f44a99d846dcff423239108411c193da5092bbb27fdf50bf211dd59f7 SHA512 86919154164274efe8bceb42eb9fc17524d4e144a541e82bc10692da66e533220cdc7186362d77fd4f3acdc639744cdf5273c2e4e2091eb4d33c1fdc6c631ec5
 DIST requests-toolbelt-0.9.1.tar.gz 207286 BLAKE2B 6123677a9abafebddf7dffde2150b2426b5132ebe0c330ff891322ecc3d69232a5b15a0c66e3e1fb4832dc04f5a636a939613fba041e499e9fbca9814f548c7e SHA512 12229928df5df71cb57bc65ef453dc0e4a2bbe190c1579811b2c2823673bd81aeba856b00000fa20b253d0f0fa4fff55ea1e750794ca3785f71c376b1df7fd93
-EBUILD requests-toolbelt-0.9.1.ebuild 1139 BLAKE2B 906fe72f2f1ca9ffb3d6b51135fbbc10683b5a1726789cfbcc0302764764bc6d538f181b4876333cf2af88eb03786e974a2605da23a99d0a4a84920bf65bb652 SHA512 2210ebe01e97a97bcb8271182f969e5d376d9f979bcd2aa9e8d523b95f6db9c51c42d681d9dd3c9c1e2ef4dad7d655ac161d60e42be26e45ca12baa7e201a007
+EBUILD requests-toolbelt-0.9.1.ebuild 1179 BLAKE2B cfc42193cecd8ed5ab18b97b6ea8746d587650701876a1147400d43d5330dd56c69ea136929f4fc12e061ebdf6c8166b2aa0395931507a645a67936065c33ed9 SHA512 9b572ca80e2d6bdcc37243d3b480a98ec31275fd463c9df600d4c80c93ae135f9dc813f0059ad09dea0ff35cccfbae26eadea26b0f1c83a7790f729152a3fb7b
 MISC metadata.xml 422 BLAKE2B ee5e05cef3889e6bfc8e252aaf7bf6752ad4d094438684ae545ab5e20d119f64e0eb7c26de9f7cd5ac8c649b50963c8ee2002d22eb8dd86527ec94b93870422e SHA512 aef79a2dffbcf613f549e48b8d47ae013e5880e5f507b3677d37997c167ad01d8d6bf2671b04209ba2a7179765a883490e8ec1168e7e01a0dcf4f4695663058e
diff --git a/dev-python/requests-toolbelt/requests-toolbelt-0.9.1.ebuild b/dev-python/requests-toolbelt/requests-toolbelt-0.9.1.ebuild
index 3544d71ec0bf..dd4056a4fc3b 100644
--- a/dev-python/requests-toolbelt/requests-toolbelt-0.9.1.ebuild
+++ b/dev-python/requests-toolbelt/requests-toolbelt-0.9.1.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_{7,8,9} pypy3 )
+PYTHON_COMPAT=( python3_{7..9} pypy3 )
 
 inherit distutils-r1
 
@@ -20,6 +20,7 @@ DEPEND="${RDEPEND}
 	test? (
 		dev-python/betamax[${PYTHON_USEDEP}]
 		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
 	)"
 
 DOCS=( AUTHORS.rst HISTORY.rst README.rst )
diff --git a/dev-python/rich/Manifest b/dev-python/rich/Manifest
index 7a6e1efe5c29..d1673e73afa5 100644
--- a/dev-python/rich/Manifest
+++ b/dev-python/rich/Manifest
@@ -1,5 +1,7 @@
 DIST rich-9.11.1.tar.gz 14050070 BLAKE2B 7dcae32743bfcbbab0af6896f72e865d2a72ab66545168544d065145cf10a2aab4785454e547f011219a85a8aa762f1ed5ebef2b9fb7f44225a2f776835b643d SHA512 2139cb6602d930e9bf1479456a8e6cee812237fb64073db3f23fd8eab64c1c2b3a83c6292f1f90652791100a93961d8ec8036e5d819f1e23159b6b9a75cd1f6c
 DIST rich-9.12.4.tar.gz 16204429 BLAKE2B b57d7dc7ad4463c85cbc43e0fd8afd9f0c5329cbe81eaac168895af3701091669e4b0b6fd0d2de2f5876405c5aae00ed77e77d1b317dbd20c7dd3e53deddf2ca SHA512 92feb4ceab4e10f33c0f4abec19a4ee5bdcf27139591b603aba98239483874089fbd33998a2f05f2b609799afa59cddbe1ee245a87c391d15f58887b21a138df
+DIST rich-9.13.0.tar.gz 16206916 BLAKE2B 27a058821f5bcdeaadf4ec9beadd0f2bb5357993a1c15cd72c6cac4def9c7c9d9d7705064853931bb868b7bf873a85469feb8a9c67daf88cdab8169f0d342b0c SHA512 bb93339f985c88b86897a9b21769877cb68f4a6f61a74b9e4a2a96aad0556502e6c848c4f769ee53c57bf03f0cfdfab97e004aa9d6572158a37037afee61f0ad
 EBUILD rich-9.11.1.ebuild 783 BLAKE2B c487ec61fd8fc42065954d2eff2e5e38dd2faf8ce54007e8129f9e83cae675ec672b51cfb6f5fb647c33c1920b239950274f0a0ee4a23dc00e2a57f59bb74f42 SHA512 b0c2fc1d5926af38d2a1448aaf6c63f22a873430642b1e48919ca8f19d1cda60f0122b0f4346efb0e5cc3f549b536a8895a5fcdf140acc7b274ec9181c709e18
 EBUILD rich-9.12.4.ebuild 783 BLAKE2B c487ec61fd8fc42065954d2eff2e5e38dd2faf8ce54007e8129f9e83cae675ec672b51cfb6f5fb647c33c1920b239950274f0a0ee4a23dc00e2a57f59bb74f42 SHA512 b0c2fc1d5926af38d2a1448aaf6c63f22a873430642b1e48919ca8f19d1cda60f0122b0f4346efb0e5cc3f549b536a8895a5fcdf140acc7b274ec9181c709e18
+EBUILD rich-9.13.0.ebuild 783 BLAKE2B c487ec61fd8fc42065954d2eff2e5e38dd2faf8ce54007e8129f9e83cae675ec672b51cfb6f5fb647c33c1920b239950274f0a0ee4a23dc00e2a57f59bb74f42 SHA512 b0c2fc1d5926af38d2a1448aaf6c63f22a873430642b1e48919ca8f19d1cda60f0122b0f4346efb0e5cc3f549b536a8895a5fcdf140acc7b274ec9181c709e18
 MISC metadata.xml 493 BLAKE2B 3ba69fa824ec59308ce763ccf317a1cb187586e17727e59e6f59f40a5f9d0a23c78ad20e67009a6ec460b317c471fa8c00d68fd8fc152cb5a87077aaa425af21 SHA512 186ecd75daa3aa481ccc5773ea797bb87afbf6f4017224b6e7d54985838f9beb1cc4a2faafef0ec1e24ce6b881ce95d7665d4f5945285032f19f7a86a5a7eb14
diff --git a/dev-python/rich/rich-9.13.0.ebuild b/dev-python/rich/rich-9.13.0.ebuild
new file mode 100644
index 000000000000..a62e88778e09
--- /dev/null
+++ b/dev-python/rich/rich-9.13.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Python library for renrering rich text, tables, etc. to the terminal"
+HOMEPAGE="https://github.com/willmcgugan/rich"
+SRC_URI="https://github.com/willmcgugan/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/commonmark[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/typing-extensions[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+pkg_postinst() {
+	optfeature "integration with HTML widgets for Jupyter" dev-python/ipywidgets
+}
diff --git a/dev-python/rst-linker/Manifest b/dev-python/rst-linker/Manifest
index 58f4a12a1268..b003afcdac3f 100644
--- a/dev-python/rst-linker/Manifest
+++ b/dev-python/rst-linker/Manifest
@@ -1,3 +1,5 @@
 DIST rst.linker-2.1.1.tar.gz 13492 BLAKE2B 0f53f3110c4a54e7eb36787ed08f81d0ce551174251203b7184ccbcc0153ee450e8e8927e8989b572b929219b1002019f49167482d59956ad96a54360317f998 SHA512 c49e6b3de41636184f75941d8fa258c2dad3d13a7d82b6221a10f583ada228a96f56abefce7840f93cbae8512332b69430601961cc396f3917b912e369b2b1b9
+DIST rst.linker-2.2.0.tar.gz 14339 BLAKE2B fedeb8deea3ba3dc1f084a08476d2117787dd33c3ff2cd4c7881283e3c3e6813ffc143373812adfb4e578d21034d2c287a5af2b1e3dc9ae2f087cae9364d2ce3 SHA512 3e51103eb5111e1dd6e4e6f8c546a366eeb669d27b050de41a0580ac992117c530c322ed7cf31fd26a2f4a872ce8a7a41e801630e9291a6a644befd7272351a1
 EBUILD rst-linker-2.1.1.ebuild 1269 BLAKE2B b5f86fe5ff48438616bf0d98d79577f683330ee9ae5bfea44eae5e3fe91011bb27675430ab738459fb831cd1ea34451014ec21447a950e7d78dd04e5d925c8be SHA512 2eea7ad78621c0523cd7222631ebc5e646e579b3416436f77ee1aa0b8bc875eda8793ee585099add0597383c3787b86d311402cb1d36476abda131529814724d
+EBUILD rst-linker-2.2.0.ebuild 932 BLAKE2B 6d13629cdf1637dc16f7859e8cbbf64eda28de30296327270dc00e0001ac11403cb1a3926dbb0f18d229df17c9c3c73cf9c37ab66ecee53c7e92e65cb15df804 SHA512 531d4438dd9a42342c05d316abb54dddd52a6d503a9f6388fca95ff4a3e135834865bd43077fe1507839e64e5949c09bd9bcc3de3755435be2ba9fdbcabf6b7a
 MISC metadata.xml 464 BLAKE2B 553b3e9fd8b0a5df09e6ff044ecc6724c155bff6ea5ce21ceb1cbf919e1dee65122f8902921235a40b20baf656a54861741633dfa853405785d8ceecdf0c37b3 SHA512 cb0e45d357d9134fda6c859885350414a04ba45d8a5bbf4424f3f4311f0e662aefce70238434392d8be98b0d7ecb6c470f6725935143e88e09463ff3f0519f02
diff --git a/dev-python/rst-linker/rst-linker-2.2.0.ebuild b/dev-python/rst-linker/rst-linker-2.2.0.ebuild
new file mode 100644
index 000000000000..e32e43d93ce9
--- /dev/null
+++ b/dev-python/rst-linker/rst-linker-2.2.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{7..9} )
+
+inherit distutils-r1
+
+MY_PN="${PN/-/.}"
+DESCRIPTION="Sphinx plugin to add links and timestamps to the changelog"
+HOMEPAGE="https://github.com/jaraco/rst.linker"
+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 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	$(python_gen_cond_dep 'dev-python/importlib_metadata[${PYTHON_USEDEP}]' pypy3 python3_{6,7})
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]
+	test? (
+		dev-python/path-py[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs ">=dev-python/jaraco-packaging-3.2"
+distutils_enable_tests pytest
diff --git a/dev-python/ruamel-std-pathlib/Manifest b/dev-python/ruamel-std-pathlib/Manifest
new file mode 100644
index 000000000000..04eb314b1897
--- /dev/null
+++ b/dev-python/ruamel-std-pathlib/Manifest
@@ -0,0 +1,3 @@
+DIST ruamel-std-pathlib-0.6.4.tar.xz 18844 BLAKE2B 714b38dc832839d9e915f74aa45a7b3e277578e89ed23c55599d598bd3a3de3e8231fb2f3890c60e065d84ae146ca5071305ea0bae750b1a42808a58d0ce1d01 SHA512 079e423d1fa70629429b0af8254a5034ca198b4e131205c3fac87cfb320d6821f3290a457db84550a280db1aa46542a8db81555cfaa3c8143a31515704e5f45e
+EBUILD ruamel-std-pathlib-0.6.4-r2.ebuild 827 BLAKE2B ea0ef8635b857021b5188396c4f56fd23ed53f17a40b5600d9642677f41ae118427eaa6a36fa2248aa4089231438824a4d6ac5a74a4831af42c67bbcdd0c275a SHA512 f466c4586aba90b39dd8c2645545485d4d64277c0c68d06ee76459123476418d57ddf7438bb81964714e09154299651c5066efb97734a663f57982f12e66e6fc
+MISC metadata.xml 753 BLAKE2B b34bf595b1fa759bec45178246d351516ebc1de0291ff2df61096e9b54251d17836f83d6a139ed0fd92187f89fce05c39145d28a32a40eb301bae05877c6aa54 SHA512 ef872857daf0ac20451c9248756ac22516cfa8fa0c5067a0dd2be35b4ac9fa755c55ff2dddaff65c021b105accafa0d48ebe1f8f63c4c616b8b3eac69e955e27
diff --git a/dev-python/ruamel-std-pathlib/metadata.xml b/dev-python/ruamel-std-pathlib/metadata.xml
new file mode 100644
index 000000000000..a930f0e9cad9
--- /dev/null
+++ b/dev-python/ruamel-std-pathlib/metadata.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>andrey_utkin@gentoo.org</email>
+		<name>Andrey Utkin</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>zoltan@sinustrom.info</email>
+		<name>Zoltan Puskas</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="pypi">ruamel.std.pathlib</remote-id>
+		<remote-id type="sourceforge">ruamel-std-pathlib</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/ruamel-std-pathlib/ruamel-std-pathlib-0.6.4-r2.ebuild b/dev-python/ruamel-std-pathlib/ruamel-std-pathlib-0.6.4-r2.ebuild
new file mode 100644
index 000000000000..6145fde1e296
--- /dev/null
+++ b/dev-python/ruamel-std-pathlib/ruamel-std-pathlib-0.6.4-r2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{7..9} )
+
+inherit distutils-r1
+
+MY_PN="${PN//-/.}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Ruamel enhancements to pathlib and pathlib2"
+HOMEPAGE="https://pypi.org/project/ruamel.std.pathlib/ https://sourceforge.net/p/ruamel-std-pathlib"
+# PyPI tarballs do not include tests
+SRC_URI="mirror://sourceforge/ruamel-dl-tagged-releases/${MY_P}.tar.xz -> ${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="dev-python/namespace-ruamel[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}"/${MY_P}
+
+distutils_enable_tests pytest
+
+python_install() {
+	distutils-r1_python_install --single-version-externally-managed
+	find "${ED}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/ruamel-yaml/Manifest b/dev-python/ruamel-yaml/Manifest
index 0fc640b11048..e06c14f326f5 100644
--- a/dev-python/ruamel-yaml/Manifest
+++ b/dev-python/ruamel-yaml/Manifest
@@ -1,3 +1,6 @@
+AUX ruamel-yaml-0.16.13-pypy3_collection_deprecation.patch 647 BLAKE2B af2f03b775539038b557879a7d01d42ca050ad2abcdfd60db07fa48129fdc90219577fe9f0ba1a51b897057ee36e6abe5fabd61b343956bf6edb3584144d6912 SHA512 55ae9245470076938d1bd5322b3dc6042267914eef30b3a64a278f5bd06c0fd60500463c6c0a33f80d09e326f0dc0f87986a56f1d05e2e7b6fd9c20e83949a9d
+DIST ruamel-yaml-0.16.13.tar.xz 178756 BLAKE2B 19ee4713786a33853f42256e5cd3187e9e19b931ebd83a133365de3f080721c5a6f5fb41ff3079473461df47a0ab149981c5e94d08321da8b3c9eb311c226945 SHA512 1366fc0b3b5ea2699ca324636403576134ccc7c725b13c21a7752d1b16c644c93c7f7d82ddc337087d2c02947f95263d7a3fdd162f552ac3a78fa36f1f17b3f1
 DIST ruamel.yaml-0.16.12.tar.gz 147355 BLAKE2B 6e91116029dba57b81580f4ce34a066fc49ec2c6167c2bd6ec2ae940b16bc12ba53cbd4c62f9ae3975664917ce990b050e9f15b434f5ff66f9dece5426049c9d SHA512 21be4d956d01164b84233c3d3945a4e56351a8fc59c35a8e71b1276da84aa43b125e3860f9884e95a1f895bc53e0b85b6d3f0f4b03512d629a892d8664e3ecd6
 EBUILD ruamel-yaml-0.16.12-r1.ebuild 738 BLAKE2B 34ad19df9b4725013b1d300374123a7cef0bffa383f544b80be2afe4c38f53855c8aba777c4addfca0835b7de4ebb303a7ac3b54649c04e58bc3b8db3f682acb SHA512 65535c7f50602cc4d32ac24dee681020782468f29a3882c2312f639d39c740c887fa2075c448e1bcaab1d87c57e3d08926a1e7e09fbd09a4da0163283f866411
-MISC metadata.xml 715 BLAKE2B 8adfe458db838b8217c79ae03ba0133fd7aabd143c99f2177debff61e8960bb9b89df4e7bab27eb392127bc95a34ec7ab2a7e2ab96ec87adc28ea7453bcce6b8 SHA512 bb76d173705214d1df3e44032301d078ea0f1abb41ddbbe743d4ae3928ade3fc3622b26bc54d8c66f47ef2e2f445180aad381bccdc18a6e5fc512c9e83826a9f
+EBUILD ruamel-yaml-0.16.13-r1.ebuild 1239 BLAKE2B cb5c19702d96a6d952ef9a53debb09730a3fa865e0acdfa4b09404661694f6b4bef95d42a92a42cfd17ffd7eb5a33b88520a7dc1246029fc49708720de3c2f22 SHA512 62414542ba33ebcd37d3439e53862df7752feed6bc552c1bdcd169ed34163abe6957a803d2aaaf94b46fc6455e89b42e1cc6e0eac6e2c6b13f01047e4b933f1b
+MISC metadata.xml 739 BLAKE2B ff8160bdfda16166cd750467eda32d2040765fb4acde3a640f0b62fddf1eff8890733ff9d2bb30d52977838edfc49d5328dbc756b5a1ce5670a8bbf6a46205bd SHA512 c8bb594dd0fbc94496c5b1b563ae4d2266d97704f116338d1dfd37d4a2bd829bd96e469e499228ffe44330c26b68c6a18d02aeccb20fb39bc8de2d8a3701a083
diff --git a/dev-python/ruamel-yaml/files/ruamel-yaml-0.16.13-pypy3_collection_deprecation.patch b/dev-python/ruamel-yaml/files/ruamel-yaml-0.16.13-pypy3_collection_deprecation.patch
new file mode 100644
index 000000000000..15d00625b68e
--- /dev/null
+++ b/dev-python/ruamel-yaml/files/ruamel-yaml-0.16.13-pypy3_collection_deprecation.patch
@@ -0,0 +1,19 @@
+This does not produce a deprecation warning under PyPy, even pypy3.7
+(last tested on 2021-03-12 using version 7.3.3-beta0).
+
+--- a/_test/test_deprecation.py
++++ b/_test/test_deprecation.py
+@@ -2,11 +2,12 @@
+ 
+ from __future__ import print_function
+ 
++import platform
+ import sys
+ import pytest  # NOQA
+ 
+ 
+-@pytest.mark.skipif(sys.version_info < (3, 7) or sys.version_info >= (3, 9),
++@pytest.mark.skipif(platform.python_implementation() == 'PyPy' or sys.version_info < (3, 7) or sys.version_info >= (3, 9),
+                     reason='collections not available?')
+ def test_collections_deprecation():
+     with pytest.warns(DeprecationWarning):
diff --git a/dev-python/ruamel-yaml/metadata.xml b/dev-python/ruamel-yaml/metadata.xml
index d1c93d5b8e28..4a6a33a39d5f 100644
--- a/dev-python/ruamel-yaml/metadata.xml
+++ b/dev-python/ruamel-yaml/metadata.xml
@@ -17,6 +17,7 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">ruamel.yaml</remote-id>
 		<remote-id type="sourceforge">ruamel-yaml</remote-id>
diff --git a/dev-python/ruamel-yaml/ruamel-yaml-0.16.13-r1.ebuild b/dev-python/ruamel-yaml/ruamel-yaml-0.16.13-r1.ebuild
new file mode 100644
index 000000000000..41502f6c0260
--- /dev/null
+++ b/dev-python/ruamel-yaml/ruamel-yaml-0.16.13-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=( pypy3 python3_{7..9} )
+
+inherit distutils-r1
+
+MY_PN="${PN//-/.}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="YAML parser/emitter that supports roundtrip comment preservation"
+HOMEPAGE="https://pypi.org/project/ruamel.yaml/ https://sourceforge.net/p/ruamel-yaml"
+# PyPI tarballs do not include tests
+SRC_URI="mirror://sourceforge/ruamel-dl-tagged-releases/${MY_P}.tar.xz -> ${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+
+RDEPEND="dev-python/namespace-ruamel[${PYTHON_USEDEP}]
+	dev-python/ruamel-yaml-clib[${PYTHON_USEDEP}]"
+BDEPEND="test? (
+	dev-python/ruamel-std-pathlib[${PYTHON_USEDEP}]
+)"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.16.13-pypy3_collection_deprecation.patch
+)
+
+S="${WORKDIR}"/${MY_P}
+
+distutils_enable_tests pytest
+
+# Old PyYAML tests from lib/ require special set-up and are invoked indirectly
+# via test_z_olddata, tell pytest itself to leave the subdir alone.
+python_test() {
+	epytest --ignore _test/lib/
+}
+
+python_install() {
+	distutils-r1_python_install --single-version-externally-managed
+	find "${ED}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index 2003cd6f0f4f..0f03edd5ad31 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -1,9 +1,7 @@
-DIST setuptools-51.3.3.tar.gz 2053035 BLAKE2B 73b33359f10f900233b82e68c91781609665bdecb6b0e2963d7d15a798149c104030cc1e124ee945b23e5fc8db3f573d0b9012cfba7767ff913077af907141e4 SHA512 5a3572466a68c6f650111448ce3343f64c62044650bb8635edbff97e2bc7b216b8bbe3b4e3bccf34e6887f3bedc911b27ca5f9a515201cae49cf44fbacf03345
 DIST setuptools-53.0.0.tar.gz 2050503 BLAKE2B b1ebe5a9776917fe9a21a13a4db613fd05aa1f61043482487013bcfed7802ff1b984fe0f72623b092eee7ebfb9debd5f71732223220bc2b73a6ece0a7ec86a2c SHA512 d045198210f09c5f2acbd487d3dd291cd7ce814bebe331f1876c133cd28f56d368717c7bd4a875b439c9cc8c9488dc9a7d3e27ab791cce419f78b87fcfd8fff6
 DIST setuptools-53.1.0.tar.gz 2051159 BLAKE2B f4148df45f5c62acd6acae833619dcae50f131da91ece1a2e1231620d4800294f14dab6c72ca5b2ffd31191c4e3306a869abdba349adcec5746600fc067b340d SHA512 0ca02e9b997623268d8f73b73ee6a4b1ad513802cbc75c74124a85bd5ca7bfaea5cf7cccb706334c0dac2c8a0674a5bc2cea10f44f99f881ad893c8337af3da2
-DIST setuptools-54.0.0.tar.gz 2052086 BLAKE2B b96b8ac1119a9ece7d6a7e481a8d078f6ea65957be679549381b67e26498a6d403aca38b8ee8ca832c8e1045f960114e037787863ea6247bc87a92c1301c11fb SHA512 b13ad8aa13da63d9504064fb702632d0d17dd81eee8c09b9d38d30a6e4d625a600f0b3e7349e45354b444c25d5caccb5407bdecdd220af2e283f4baccd6f675f
-EBUILD setuptools-51.3.3.ebuild 2125 BLAKE2B 36d22c2a80921dc739c60798293b0c6475f45832ccba934901e1f525109737966dd8e8cec259e123d2168dce2dfaf7acd6e8021ca43762752ab8f3f56911dfbd SHA512 71aee4df07af820f2051bf98ddb7465605b17574b0855a5f56c358048256b8d3b05e886ad163273fe6ec5aee121f7e334af2ed24501667a7f67dc780523e4748
-EBUILD setuptools-53.0.0.ebuild 2134 BLAKE2B 026061402b07b6aee16e9c963e8af99e35fba7c894c7ef922ab9b2ae5fd0231d42578846985648e8ca7791b3ed83e721dd2d152a59af958e4b54df42bdef39e3 SHA512 a4a912ede611ca6d251e6923625d2ecb6343ce0032ee89015236bdbf6d740fc2876c298e33be385e3a15d42655bc61b4ed4472df27c9b514d1ac60c4f57daf3a
+DIST setuptools-54.1.1.tar.gz 2053415 BLAKE2B 59d60e9be5a184e34e8c9e1ccb477eae538836c8fac4862f3365e1abe8beec6cc85490918d413b29831c4d3738ca19cd84ac4a9d30178e45e42c652a0ade5fac SHA512 d2ab5445a9b4de5b5fae8aab6a47131ad41a011fa23fb1e6c07a599bcb27a8f89ea3c5ea9939577d6286bf3f8e2edf0334816ae1a507dba09c46435d063c3379
+EBUILD setuptools-53.0.0.ebuild 2125 BLAKE2B 36d22c2a80921dc739c60798293b0c6475f45832ccba934901e1f525109737966dd8e8cec259e123d2168dce2dfaf7acd6e8021ca43762752ab8f3f56911dfbd SHA512 71aee4df07af820f2051bf98ddb7465605b17574b0855a5f56c358048256b8d3b05e886ad163273fe6ec5aee121f7e334af2ed24501667a7f67dc780523e4748
 EBUILD setuptools-53.1.0.ebuild 2134 BLAKE2B 026061402b07b6aee16e9c963e8af99e35fba7c894c7ef922ab9b2ae5fd0231d42578846985648e8ca7791b3ed83e721dd2d152a59af958e4b54df42bdef39e3 SHA512 a4a912ede611ca6d251e6923625d2ecb6343ce0032ee89015236bdbf6d740fc2876c298e33be385e3a15d42655bc61b4ed4472df27c9b514d1ac60c4f57daf3a
-EBUILD setuptools-54.0.0.ebuild 2129 BLAKE2B f88eca3d0aeb651f066e25e475e8059c56276c94a9918cb174f8ebf03af7692d8d33ac1233726b1c9fe412c0832e55141b4c66b4a01353f2b56333ae16b0f534 SHA512 03df0dcf752b058e6cd18eec06100e77fc7515ef11f20344f3535d58edb9b976333ddd9de07b5c12d340eb4aa67f1f672dfcfef3c483b66f7df0b009e2e86bf2
+EBUILD setuptools-54.1.1.ebuild 2198 BLAKE2B 9398a7ed3e4503cddda05dc4a07c875899fd0343943cf681dc1b374dc31a552aff18bd481de62f3f9b6ef22a629c867c66189ba1757771c071ad2cb755e661c7 SHA512 0dcd13c80cb304998dd9d7ef8d0ce73bc346ed550b4c1606d27b8d93a559c4bec7758dccdc2e54ee5107e61b11dffe875b5d847077c139ecbbc8095bd8c481d7
 MISC metadata.xml 468 BLAKE2B 5f9a9240795261f894d54130ba489bb18fd24f8f95f993b55d23136fb2b518f47b64494d71ab0f697ca64f4eacc8cb58487e8889a8de22e8e3448caba5498065 SHA512 e284933f2a5d11cf7bb483776b8de2afe96ccad15a0e0bf7c9feab05c65f4247c9b19bb60c04d699ba917a637ca470e6ba41a38795899e54179602b587efe300
diff --git a/dev-python/setuptools/setuptools-51.3.3.ebuild b/dev-python/setuptools/setuptools-51.3.3.ebuild
deleted file mode 100644
index 4231ee0d4ba4..000000000000
--- a/dev-python/setuptools/setuptools-51.3.3.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-# Set to 'manual' to avoid triggering install QA check
-DISTUTILS_USE_SETUPTOOLS=manual
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1 multiprocessing
-
-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"
-
-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"
-
-BDEPEND="
-	test? (
-		dev-python/jaraco-envs[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pip[${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}]
-	)
-"
-PDEPEND="
-	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-# Force in-source build because build system modifies sources.
-DISTUTILS_IN_SOURCE_BUILD=1
-
-DOCS=( {CHANGES,README}.rst )
-
-python_test() {
-	distutils_install_for_testing --via-root
-	local deselect=(
-		# TODO
-		setuptools/tests/test_easy_install.py::TestSetupRequires::test_setup_requires_with_allow_hosts
-		# this one's unhappy about pytest-xdist but one test is not worth
-		# losing the speed gain
-		setuptools/tests/test_build_meta.py::TestBuildMetaBackend::test_build_sdist_relative_path_import
-	)
-	# test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
-	# It tries to sandbox the test in a tempdir
-	HOME="${PWD}" pytest -vv ${deselect[@]/#/--deselect } \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" \
-		setuptools || die "Tests failed under ${EPYTHON}"
-}
-
-python_install() {
-	export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
-	distutils-r1_python_install
-}
diff --git a/dev-python/setuptools/setuptools-53.0.0.ebuild b/dev-python/setuptools/setuptools-53.0.0.ebuild
index 49b44d46c0df..4231ee0d4ba4 100644
--- a/dev-python/setuptools/setuptools-53.0.0.ebuild
+++ b/dev-python/setuptools/setuptools-53.0.0.ebuild
@@ -15,7 +15,7 @@ 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"
+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"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/setuptools/setuptools-54.0.0.ebuild b/dev-python/setuptools/setuptools-54.1.1.ebuild
index 9bc11f0ea338..ea333f90465a 100644
--- a/dev-python/setuptools/setuptools-54.0.0.ebuild
+++ b/dev-python/setuptools/setuptools-54.1.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 BDEPEND="
 	test? (
@@ -23,6 +23,7 @@ BDEPEND="
 		>=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-fixture-config[${PYTHON_USEDEP}]
 		dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
 		dev-python/pytest-xdist[${PYTHON_USEDEP}]
diff --git a/dev-python/setuptools_scm/Manifest b/dev-python/setuptools_scm/Manifest
index 7f02a4008a10..3eaae667e0c8 100644
--- a/dev-python/setuptools_scm/Manifest
+++ b/dev-python/setuptools_scm/Manifest
@@ -1,3 +1,5 @@
 DIST setuptools_scm-5.0.1.tar.gz 51679 BLAKE2B 33f43b437b675291ded4408dd5e68ffbf4615938f963516c0047ead023b2f2a50b28a0d91c7c72a8bdff678d9b8b292aeec36bf418b43f8d039f13560b1fbeb6 SHA512 055403539a26caeb119f3d6623e7b32ef52ccc11a39757fdd9b265ba191265346be5a062a5926a381ba47bbd1a666ffa632653ee6055050689cc38fe0f90cd0f
+DIST setuptools_scm-5.0.2.tar.gz 52273 BLAKE2B a4166b293f26161be8748f0c4b819dba0c03186a95d0c06b6fd6fdee7910de60e034ab81f6f1d89f7a1b47381441deb8a38d05421aef3287b35705bbddee33ee SHA512 1e92d03e2d8473425c146a885eb641e98895c43afebcd3c66c1455ace2d81f187b87681072f8aacc5e8be166577f00138cc7c53e4b7d77cb1b598f835b72b010
 EBUILD setuptools_scm-5.0.1.ebuild 1197 BLAKE2B a94beb25a56928405b785bea232e2568addb05548294d028a8a76b10c8b9b8596ee38851ca9d61df2bf6c9d3f822378d4fbf9482495103493488495e51a3f14f SHA512 07841d4e3f94719fc04990f2c3d3834837f02fe17e357c864a46ed87830434e454d2aadd54685b8067df9d4f14cc09d6436eeb6e1dcce9b9fe92ae90c9e70014
+EBUILD setuptools_scm-5.0.2.ebuild 1066 BLAKE2B 929685bd4d33137734e7f37851da49ea1b1f28e0305377b665e7f7f5af46d7c02b402b227d833b4d40597710d0329756d807b499a13b744c87c813293d98262b SHA512 3ac8fddd4ca46970ba63c2c3647d6b9449adb6bd99e5962d0541d116652457217b6394bdd4aeec3e8a71f1b70a1a0957358969f17c615ecb715905f0301df082
 MISC metadata.xml 400 BLAKE2B c588c18ca5fef828f93a70bb799701725aeadea660b06cf1b61fc96c65e6dd25784901a36778d6f972e1aa9d6075a238fdfcdf8ec8a44b86f0e2852608c52186 SHA512 75b27d43cc0fc4dc74179f9b64c562ec80113354a59e6a8a440535e62d5119d20614c7c0e905c42966da839e149b4c7b79e894643a069dbaa45102b6ace5f07d
diff --git a/dev-python/setuptools_scm/setuptools_scm-5.0.2.ebuild b/dev-python/setuptools_scm/setuptools_scm-5.0.2.ebuild
new file mode 100644
index 000000000000..07d1b0659787
--- /dev/null
+++ b/dev-python/setuptools_scm/setuptools_scm-5.0.2.ebuild
@@ -0,0 +1,37 @@
+# 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_{7..9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Manage versions by scm tags via setuptools"
+HOMEPAGE="
+	https://github.com/pypa/setuptools_scm/
+	https://pypi.org/project/setuptools-scm/"
+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"
+
+BDEPEND="
+	!!<dev-python/setuptools_scm-2
+	test? (
+		dev-python/toml[${PYTHON_USEDEP}]
+		dev-vcs/git
+		!sparc? ( dev-vcs/mercurial ) )"
+
+distutils_enable_tests --install pytest
+
+python_prepare_all() {
+	# network access
+	sed -i -e 's:test_pip_download:_&:' testing/test_regressions.py || die
+	# all fetch specific setuptools versions
+	rm testing/test_setuptools_support.py || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/simpleeval/Manifest b/dev-python/simpleeval/Manifest
index c8cd896dd43b..7552707d734a 100644
--- a/dev-python/simpleeval/Manifest
+++ b/dev-python/simpleeval/Manifest
@@ -1,3 +1,3 @@
 DIST simpleeval-0.9.10.tar.gz 26687 BLAKE2B eccde3c580f65bc22e88711cdfae4b1d6509515d674d62bab501d1cdc5dc1e91f76d391441e012f7fa51221e2c807b831dda05e7b620303d0845b5032b1a45be SHA512 50710221b49ff618218375d6d9b4eb9ee12b875ce0cdaaa63e2dfcaa112918f5bfdf8f02bbc3b5be98c7abc312f99563d910985bc5ad86eb846df935fc072eab
-EBUILD simpleeval-0.9.10.ebuild 510 BLAKE2B bbc760bba599c9e27def776bb182082430c9cfb238f479dc22fdc49b1c60a171c095521e9a78106151544ed6b5727a080cd754da6576d5318702e9c5d0b4f9f2 SHA512 22e798e93750ed821ad44edda8361de2a61ebb20323fa9ffc8d4af3e232f00e7ffb3c1617ec2a375c9473e970b6e751d7228afcc2e1fd855eed42c499686b9d1
+EBUILD simpleeval-0.9.10.ebuild 511 BLAKE2B 213307964e51cc75a63a7c6e95163575328592d14360b3216e8c336c50cd355e79c38f617853c00184dccd1b904a46cce08678cadb504b49f07b991f857afd1e SHA512 cbc83d68a4d8cebd1a7d153f13d24505130916150970a179d8ca14b0e647927d43a0988f0562081f0c6d77cf9d2147a49e403293e2271533b430b1bba4bcc4d5
 MISC metadata.xml 404 BLAKE2B 67311501b2868bd8b408afac33876a6f1c22668e928211f689d30a597a64b6aead900e67b6c4cc6c4aceebb97ca40be49ddbde771e1207a55f8f31efbae6866c SHA512 882e0b28786a05a956f57c1b3bcfc9fab815f602b360d185380a7f51ef663631ef3e18c5bc565c94bba5b07f6a307442fb097912494cefe404b5f18664e9d511
diff --git a/dev-python/simpleeval/simpleeval-0.9.10.ebuild b/dev-python/simpleeval/simpleeval-0.9.10.ebuild
index 020dd94e6902..f47417669031 100644
--- a/dev-python/simpleeval/simpleeval-0.9.10.ebuild
+++ b/dev-python/simpleeval/simpleeval-0.9.10.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_{7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/snakeoil/Manifest b/dev-python/snakeoil/Manifest
index 68af602109a6..39268a3cfff7 100644
--- a/dev-python/snakeoil/Manifest
+++ b/dev-python/snakeoil/Manifest
@@ -4,10 +4,12 @@ DIST snakeoil-0.8.9.tar.gz 271205 BLAKE2B dcaf4d26b430a2e99481182aa912a884a0cf59
 DIST snakeoil-0.9.0.tar.gz 271675 BLAKE2B 7dd65335fd79a7d335e5047ba928d7c156c5758874e20e41a06fc25fd2133697bccadc3cd24bcd611b7b210dfe330c121487c6d5bf5afa6330b714c928f3fd44 SHA512 c34938fdc5dd41ab84c5775090cc6bac1ac6bf0bd145c8d8966582917205ef422da272d12e4272afde764f52c62c8f02be076ce13c6552e0384a18fc8442cf96
 DIST snakeoil-0.9.1.tar.gz 271045 BLAKE2B 74c45d38d294e06940d4a339e6d6c6e66d84b7fd174b4d79a9716262bc1902d47dfed1751b44183f9119ccb3bd50e11700951d15070a15b94d6a7b20f77c5919 SHA512 94d8baed4baaab8c3cb3631fed4e6cced8fa32c953bba2ec2afd0cc99eb9b526dc58e5e9efb402513b0416cda21a0811b14a2a98044fd1d5bb7f6f2b349db24a
 DIST snakeoil-0.9.2.tar.gz 271441 BLAKE2B 754030285f03c83979c74da6cf8ee585486631e2dd1410c0da4a8e4c59a0367d911af3bc82ecf9e04438e3227982af8789662022ae5dfe5e1d83863aa2ec001e SHA512 664c91236500aafc81157132c5138d14972e9b74a344fdad65064440acdca0cbbdcef63b1d3b4d09f120a14a1eb40bbc8e7801fbbf2fc3b289b615cdd6caf61e
+DIST snakeoil-0.9.3.tar.gz 270471 BLAKE2B 2f8c3737c560a756e6fd5450c900d1fbe49b0200e1c4427a312f90d14da22e2e403a710bdc768446b3b03166853d6a0965507550ee837556d273817a7f634282 SHA512 18aa892fe6d225823593f8199f029a1a866052b1cebdf4f77dc57916e6a2b15982b6729d3004a8616eedddee5e3bc260d2c5b2f78170c4d008d1f2e46cc26ce1
 EBUILD snakeoil-0.8.8.ebuild 894 BLAKE2B 23757057ae12f52670278b905bbc32c5fe937587cd1db49eed123ce31163f4c3d1fbc2d1434c290aace0bf14756790b35fc6e48b176f790c5635628abc7e716f SHA512 44cd2098f4bad925f8d4fcec61d4367f963bc4a10566ca52542c4eeda5019527166ab9f358c3b289a5c6c1ff7698f770da84cb799f57d68196ef9c28286aeb94
 EBUILD snakeoil-0.8.9.ebuild 856 BLAKE2B 42754983e2c4c21405112dd562722fe1065ebce7c16bffa2902eb14d3b00fc534ca566f9a22665463b5ca48532a86f91ad396292b2774e9ed9a4c46022bc7699 SHA512 75db4d4ef4b92d0cde7c42cc9f7bf9bfd0a5aa1d148aff6dfe9b32bd695d121f4738cfe2805d48a1db34e1bf4a7d0766c82dcb51560b27cf0749cffed0c0e6c5
 EBUILD snakeoil-0.9.0.ebuild 720 BLAKE2B 92f9f964592a63930e00ac23a7b5d102776ea63ad2af6ba5e47f5ba1f9fc4e18184056bfedaf60eb8c21569830e5152a0e58b061dcd18ba1d57af1ab2a83592f SHA512 59a367b088eaa2b993468c39c5a03a54cc0cdfea6f651c281750ca207b67905c19475c2066871f475884373b69587ddc8b079a129cfef1705a589374f486fc3c
 EBUILD snakeoil-0.9.1.ebuild 717 BLAKE2B fe7fc18a2b270b859857d1a2127d48e42fd36ea9a39d6bb60879df026e4074f96811acae535727b7e030a8bb811ec7084fff1422758e8594394c1e53f4d16b60 SHA512 38d9fdab976098e044bba394cd4b3df90d5385bb9f6022c44075fd2d303d7ecf8978a70559a77e637bd9bf28cd24877f1cba52d656721b8365bce126abc8df95
-EBUILD snakeoil-0.9.2-r1.ebuild 758 BLAKE2B 25ab838c53e3d25f393ccd39c503f5ef35b05b7432733b85a932ababf358562aae313d9946d7c528643a6f6d420be2558de5545daf7c3a283bd5aa6f9f946545 SHA512 e0336a7d5a825e9098adda54b9e2d78e04f2f65169f52fda33275602890d8b0c4583837930592acd98cf9bd27515e1f5a700567ca11ce76ff28b7299413d9a4e
+EBUILD snakeoil-0.9.2-r1.ebuild 755 BLAKE2B d721e65479ecec1750a47d35e682d68452c0582a746ae0989698c22c2b9608c6197c457a0b68db3f1f7f6cb6820a0b09f6b22f53509be99ae809a526fb5f2bd5 SHA512 f16351b364239138db61dbd850ebf74014b3e63fa8c6d0b9f3b6c121a743fb9b54bf3b909a614255b1d11c1d2f5d1a965f86364547ff11178ec8df35c4c36771
+EBUILD snakeoil-0.9.3.ebuild 761 BLAKE2B 2311f5265e771ad5787a7bd533abe74198e3b5957d20b4a2792ca409f662a4b7a278777676327cc146bac885be50ca7afcc98c5702ca89bc47f7c089d2dc8f2d SHA512 50a2f53ffb4d77005ff0ac9a0e387b4eb7c8d63c129d11f75422dbc189f1773e5e2ad05e61be381d741d719ea4cb04030f47780c179eb7aca530e1c671a3c3a3
 EBUILD snakeoil-9999.ebuild 780 BLAKE2B f45e83fc2a91d592ea3a2586a1162345e9d3f4520226ab5ca7cffd372868cea009a6c08844bfd5b417e26a41ebe435d027ca82b3de614b7641a2d330ad66f2b3 SHA512 8c3f35c0136e4866d1443c91d7fa43445f83d2cf86dc4272240322e89778495af1074f61d165b74d301c5a9d5775fe8391cc5e9aeda3e9781465425d3dc30261
 MISC metadata.xml 386 BLAKE2B f9bc5cb5f590209e7211fffa5ac87e106e636f871dec0b31a90c4aaed63cb9fd4bf4fe510a4f36676eb47028465a58d5088307aec6c2c5b000d370aca5437b68 SHA512 47ee140ad8c665e0541a71721eec7739913a93944a0be471287c0df7403d63757500b27d3ffb909590846991c69727ea95d960dc98e7887bea3b178bc4dd6047
diff --git a/dev-python/snakeoil/snakeoil-0.9.2-r1.ebuild b/dev-python/snakeoil/snakeoil-0.9.2-r1.ebuild
index b2a9b9feb24a..221b582e9b7d 100644
--- a/dev-python/snakeoil/snakeoil-0.9.2-r1.ebuild
+++ b/dev-python/snakeoil/snakeoil-0.9.2-r1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/pkgcore/snakeoil.git"
 	inherit git-r3
 else
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 sparc x86 ~x64-macos"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~x64-macos"
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 fi
 
diff --git a/dev-python/snakeoil/snakeoil-0.9.3.ebuild b/dev-python/snakeoil/snakeoil-0.9.3.ebuild
new file mode 100644
index 000000000000..c15346749758
--- /dev/null
+++ b/dev-python/snakeoil/snakeoil-0.9.3.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_{8..9} )
+PYTHON_REQ_USE="threads(+)"
+inherit distutils-r1
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/pkgcore/snakeoil.git"
+	inherit git-r3
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+fi
+
+DESCRIPTION="misc common functionality and useful optimizations"
+HOMEPAGE="https://github.com/pkgcore/snakeoil"
+
+LICENSE="BSD BSD-2 MIT"
+SLOT="0"
+
+RDEPEND="
+	dev-python/lazy-object-proxy[${PYTHON_USEDEP}]"
+
+[[ ${PV} == 9999 ]] && BDEPEND+=" dev-python/cython[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
diff --git a/dev-python/sphinx-issues/Manifest b/dev-python/sphinx-issues/Manifest
index caa1cacb67a3..7039905ede09 100644
--- a/dev-python/sphinx-issues/Manifest
+++ b/dev-python/sphinx-issues/Manifest
@@ -1,3 +1,3 @@
 DIST sphinx-issues-1.2.0.tar.gz 8051 BLAKE2B 2f17738719f92be1e4ef2d7e2e0b7c123f6f924e4bfea82e2151ed96b9fdbe2cf676bddc5c009a947e1172a84131a1a58a3bf0758f045a636bd4cb7ec496fa68 SHA512 8814e910b111f0b241bc40a93de8b6ff1acd24437f1b014b24691b3bbaaadaadaded82175067d8992bb482f4bfcdec570cdd26b4c6858d7af60d5dd3f0638b64
-EBUILD sphinx-issues-1.2.0.ebuild 633 BLAKE2B 9fc01ad243ffbb991900b89bee17f4ce178e93ad78bb17c3239caf8e032728793cb5f04321d228e473d4d3b59f87af9bc257fc3df237bcc3e80855227ba39eed SHA512 0848d20863493ef26fa55868f87c481d4814d89916da38cf72ff3d3ca8531aa8b572f35abc8aaaa4789b7e9fed65c19513e1400efce5737b033de25e44d3c737
-MISC metadata.xml 388 BLAKE2B 192707563103236482cf5de03630e3b39f6827f446ba6e058e29c384d6e989e3b96b3f54b5e353426022328f81596ba3c70c61f3f84f69b3c20f34163836b74c SHA512 3b29ce4fbde49727c8dfd8f7f28f3baea1ca5feb60a1ab21b8ac0b597326e702941cb0190903aa930d55358c092bb5ba6b31d27f9acf8940380557c562ea659c
+EBUILD sphinx-issues-1.2.0.ebuild 630 BLAKE2B 534adbc5c138acc5a25b16b9a5f6794a0388af442a51fe5e2898e3127fd6b31b7a963bd3e6fb576fc2c8bb30e5094d7dcbb85b3d627744264d83971f4cb64af8 SHA512 9b5e7daacd184cc3a89540ae5ca662e943fe096145aded9b1971d76356a51cf4a499906aef1761af85e1908eb97cd4ddbc81e5f176b658e558cbb53340e8b125
+MISC metadata.xml 458 BLAKE2B d34c5cd0485863435a8d1b3a1cd92504faa9339d336891957f71b48b6ffe3284a6e65c41df8f0215965bc04c4e379f36fbcef031e596446b51bdce78003593a4 SHA512 dc8495272631a939ad1231a08f4e37585a3c442c8d13c5c9bb790633c1ed18885394ade5edb7dfcdfa3caede4af25225ae90cefd4c0ac5be83ba6e7911801607
diff --git a/dev-python/sphinx-issues/metadata.xml b/dev-python/sphinx-issues/metadata.xml
index 17cccf68901e..0805c69064a3 100644
--- a/dev-python/sphinx-issues/metadata.xml
+++ b/dev-python/sphinx-issues/metadata.xml
@@ -8,5 +8,6 @@
   <upstream>
     <remote-id type="pypi">sphinx-issues</remote-id>
     <remote-id type="github">sloria/sphinx-issues</remote-id>
+    <bugs-to>https://github.com/sloria/sphinx-issues/issues</bugs-to>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/sphinx-issues/sphinx-issues-1.2.0.ebuild b/dev-python/sphinx-issues/sphinx-issues-1.2.0.ebuild
index 15a56e84d52d..cf1388d85f4c 100644
--- a/dev-python/sphinx-issues/sphinx-issues-1.2.0.ebuild
+++ b/dev-python/sphinx-issues/sphinx-issues-1.2.0.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 PYTHON_COMPAT=( python3_{7..9} )
 inherit distutils-r1
 
-DESCRIPTION="A Sphinx extension for linking to your project's issue tracker "
+DESCRIPTION="Sphinx extension for linking to your project's issue tracker"
 HOMEPAGE="https://github.com/sloria/sphinx-issues"
 SRC_URI="https://github.com/sloria/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
diff --git a/dev-python/sphinx/Manifest b/dev-python/sphinx/Manifest
index c3320e470dae..5f88cf781caf 100644
--- a/dev-python/sphinx/Manifest
+++ b/dev-python/sphinx/Manifest
@@ -1,6 +1,8 @@
 AUX sphinx-3.2.1-doc-link.patch 604 BLAKE2B f23f8f9a0a48b170e2b6daaeded1e65aebe830da463d4e30f2405b511cb72dde12767d0113b2d1efdce821c16837d700c71c60de38d20950ca5d6579f19a80ff SHA512 3088ba8768b4ba9e6a187e4c52fcc226efd5125fd01526b4a724504f4c445d69d6964fe79c1325ff7f58edcefc7f3489393ab085ea0458d94c44b186aa16e2f1
 DIST Sphinx-3.4.3.tar.gz 5997116 BLAKE2B 73a488564d5889bfc6d7f6f797aa3b144b03cf5f086a4543c3f4b2a452b353f4d799b80a14a0d4118e227660b7f9367fe8f3a2e91f6127cdca489cf4fad215f3 SHA512 2e085e00c722f3aaf34552eefc3842daf5443f7b8a11afa850db1e31ad81d5ff7f579622b91f982b21708fa6379907bac4fe72d42dc05859a3f62c75298facaa
 DIST Sphinx-3.5.1.tar.gz 5905170 BLAKE2B f374a65d66f404b2a7486c58a0e13e228e0de88985fed18cfa74e8219759af6afb1bb05cc10b6a8ed8ad7b413889b7282de7212010fe6d3bd30ce04fe9b59b9a SHA512 31a9253e30d5616c99161455fb61ab3b8298b5364d5eeb5c7b23466182913c99fea4cec14d088b6b64a530cbfb60d691ad093a6f6a0f9060f847f0b73d5e6b3f
+DIST Sphinx-3.5.2.tar.gz 5907358 BLAKE2B 59b2789d7f3cc34622f34c54b5d614be7fa22d9d61cbb6c096ac7efe8f011331f51af12986d505245a30c9583050ae8c012ac736cd8ff5234f528616999dc325 SHA512 97f1589726fe5bdf48b5bc8bfc53267fb4dfa2f21d5d9eefbd9bcc9ff5cc0c7846840b0fe5fcdd133d9735d402189d5b89202de4e462dce99a7653d6f1a86ff9
 EBUILD sphinx-3.4.3.ebuild 4228 BLAKE2B 03956198ff8572f45558478db5d23e045c52ea99c6cc30344b9d9db119fb495b8948da092a922857c2089e388bdb7ddf5f2ced2dd4c3c865dad63779271743d1 SHA512 853b855364f0559bf63e8342d91a3dda21aa04d67c349108f86522a8968602b61e9a60fa6262a7af1e18ac50bdfcdb4e8283fac384c879eb087ff15998569cae
 EBUILD sphinx-3.5.1.ebuild 4190 BLAKE2B 41227a347dde3aa2d5df18933961aea6db9eb2b70bc2af441d4743fb39472b0b9a40a2c9a89c774da60f54130e0374362fabd6dbb4306fc29e160f111c24073f SHA512 5051c57468f7f180a2513ce7445f61cb3012a239bf3989c5e6323b42f7c2349e5d0029b5c0f36112bbc9632b479be15269d805df10571ff4b8c32be495870e11
+EBUILD sphinx-3.5.2.ebuild 4190 BLAKE2B 41227a347dde3aa2d5df18933961aea6db9eb2b70bc2af441d4743fb39472b0b9a40a2c9a89c774da60f54130e0374362fabd6dbb4306fc29e160f111c24073f SHA512 5051c57468f7f180a2513ce7445f61cb3012a239bf3989c5e6323b42f7c2349e5d0029b5c0f36112bbc9632b479be15269d805df10571ff4b8c32be495870e11
 MISC metadata.xml 567 BLAKE2B e99637c5c116e3b8b17bd92341271350eaab38d3e0c5918ba2921db1fa0abb4615a1903b9916f94f3951f8b22e2939d71c5fde97b6ae467bc80570bdfee3b13e SHA512 7f9edc2ab5d01da2d23630f1cca2a25cb727b8336b600b48934b205727876361c2cc5432772940d855a00766d190b3319dc397927b9218345dac226886e9cec4
diff --git a/dev-python/sphinx/sphinx-3.5.2.ebuild b/dev-python/sphinx/sphinx-3.5.2.ebuild
new file mode 100644
index 000000000000..86421550c2b5
--- /dev/null
+++ b/dev-python/sphinx/sphinx-3.5.2.ebuild
@@ -0,0 +1,127 @@
+# 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_{7..9} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Python documentation generator"
+HOMEPAGE="https://www.sphinx-doc.org/
+	https://github.com/sphinx-doc/sphinx"
+SRC_URI="mirror://pypi/S/${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 ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="doc latex test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	<dev-python/alabaster-0.8[${PYTHON_USEDEP}]
+	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
+	>=dev-python/docutils-0.12[${PYTHON_USEDEP}]
+	dev-python/imagesize[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.3[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.5.0[${PYTHON_USEDEP}]
+	>=dev-python/snowballstemmer-1.1[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-applehelp[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-devhelp[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-jsmath[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-htmlhelp[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-serializinghtml[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-qthelp[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/typed-ast[${PYTHON_USEDEP}]
+	' python3_{6,7})
+	latex? (
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-luatex
+		app-text/dvipng
+	)"
+BDEPEND="
+	doc? (
+		dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
+		media-gfx/graphviz
+	)
+	test? (
+		${RDEPEND}
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		virtual/imagemagick-tools[jpeg,png,svg]
+		dev-texlive/texlive-fontsextra
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-luatex
+		app-text/dvipng
+	)"
+
+S="${WORKDIR}/${P^}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.2.1-doc-link.patch"
+)
+
+python_prepare_all() {
+	# disable internet access
+	sed -i -e 's:^intersphinx_mapping:disabled_&:' \
+		doc/conf.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	distutils-r1_python_compile
+
+	# Generate the grammar. It will be caught by install somehow.
+	# Note that the tests usually do it for us. However, I don't want
+	# to trust USE=test really running all the tests, especially
+	# with FEATURES=test-fail-continue.
+	pushd "${BUILD_DIR}"/lib >/dev/null || die
+	"${EPYTHON}" -m sphinx.pycode.__init__ || die "Grammar generation failed."
+	popd >/dev/null || die
+}
+
+python_compile_all() {
+	if use doc; then
+		esetup.py build_sphinx
+		HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
+	fi
+}
+
+python_test() {
+	mkdir -p "${BUILD_DIR}/sphinx_tempdir" || die
+	local -x SPHINX_TEST_TEMPDIR="${BUILD_DIR}/sphinx_tempdir"
+
+	local deselect=(
+		# these tests require Internet access
+		tests/test_build_latex.py::test_latex_images
+		tests/test_build_linkcheck.py::test_defaults
+		tests/test_build_linkcheck.py::test_defaults_json
+		tests/test_build_linkcheck.py::test_anchors_ignored
+	)
+	[[ ${EPYTHON} == pypy3 ]] && deselect+=(
+		tests/test_ext_autodoc.py::test_autodoc_inherited_members_None
+		tests/test_ext_autodoc.py::test_automethod_for_builtin
+		tests/test_ext_autodoc.py::test_partialfunction
+		tests/test_ext_autodoc.py::test_autodoc_typed_instance_variables
+		tests/test_ext_autodoc.py::test_autodoc_typed_inherited_instance_variables
+		tests/test_ext_autodoc.py::test_cython
+		tests/test_ext_autodoc_autoclass.py::test_show_inheritance_for_subclass_of_generic_type
+		tests/test_ext_autodoc_autodata.py::test_autodata_type_comment
+		tests/test_ext_autodoc_autofunction.py::test_builtin_function
+		tests/test_ext_autodoc_autofunction.py::test_methoddescriptor
+		tests/test_ext_autodoc_configs.py::test_autodoc_typehints_signature
+		tests/test_ext_autodoc_configs.py::test_autodoc_type_aliases
+		tests/test_ext_autosummary.py::test_autosummary_generate_content_for_module
+		tests/test_ext_autosummary.py::test_autosummary_generate_content_for_module_skipped
+		tests/test_pycode_parser.py::test_annotated_assignment_py36
+	)
+
+	pytest -vv ${deselect[@]/#/--deselect } ||
+		die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/sphinxcontrib-bibtex/Manifest b/dev-python/sphinxcontrib-bibtex/Manifest
index a5c7e90cb4fa..230f647023d3 100644
--- a/dev-python/sphinxcontrib-bibtex/Manifest
+++ b/dev-python/sphinxcontrib-bibtex/Manifest
@@ -1,3 +1,5 @@
 DIST sphinxcontrib-bibtex-2.0.0.tar.gz 135555 BLAKE2B 8a542ff7895a89a8dbf6b8ed1df3ab4e928b68ce86881819c1fbfafdda626c2e1106f5513832ee09248381c89f54f06d4d1b42f005b1f775b0fbe8962a0a0ff1 SHA512 bffd4cb1ea8d88b947b89f5bd1c55bbb8bbab8679f205216f87f932cc0170d2bbabfbe4ea8d32fb7c980826d3f7c4a20cd49c2fb36f288b5cdc4500ad9ff75cd
+DIST sphinxcontrib-bibtex-2.2.0.tar.gz 96027 BLAKE2B 77ca45e36f1730fa6992cfe41763a34e2a0bcdc99c520412591be3c219dcb7a8af240cc74d08c260548475b88b6cfba24b82e7bad2ab21b24c0e9cb62590792a SHA512 fa78d35f04825f841f757e2708d0ebbd3617a7bf20a893249eaee7e435ff2880ffc8bd23608356904ce41fc11d7fd49bab20f3da501d4a217593c52d99caebaa
 EBUILD sphinxcontrib-bibtex-2.0.0.ebuild 717 BLAKE2B 68a5f0e8ff7ad027deab9d1c265b4368969891ff7a04f0afcb7d914d69afa6ce9cd225ab7f473cec0d054193bb30e9cb5afd5d12fce04a2bcc879166dbf90c5f SHA512 d6a3b48beac66e0d5ec41dfb7d0a84bf2117588043680785a2164ac7a4433b1a0d63c9a09a457ea7298cd0babbd050910fd2811cb4e46f5c7c1f4562ea3e8836
+EBUILD sphinxcontrib-bibtex-2.2.0.ebuild 792 BLAKE2B 0e3002f9741dfc7343d49bfe75fe2d8683ba5f1d7b3ff3a001c5fea45289c8c23f51925ab51bb6879ed88b3c6ab968ce9870168979f25336683291c6dd47a3a2 SHA512 7cd7b81c93902735eec977b1d815c9ba04f10cbb35b5ec40a9e75d5d248c9ac440700f5bd5289662cfea241a0a1aa1c272ebc2385bf41548cabc600b6e7729ae
 MISC metadata.xml 530 BLAKE2B f1d70822ed84bb0da1bc7702416f944107b1d7812c853b5e4973d5c28c9722051860f0979f8f19abc23ec555cab46c046bb2264a1ad3ec6b4f422ae4b5408471 SHA512 c4bc4d4e3699247b24d4ad57cd88c1688bb46348c7b989b631b46d2313a0da380856e08bb311a39bad5fbce06680bff8753cf989a76691cc09092fc644db4574
diff --git a/dev-python/sphinxcontrib-bibtex/sphinxcontrib-bibtex-2.2.0.ebuild b/dev-python/sphinxcontrib-bibtex/sphinxcontrib-bibtex-2.2.0.ebuild
new file mode 100644
index 000000000000..3c3e2d33175d
--- /dev/null
+++ b/dev-python/sphinxcontrib-bibtex/sphinxcontrib-bibtex-2.2.0.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_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Sphinx extensions for BibTeX style citations"
+HOMEPAGE="https://github.com/mcmtroffaes/sphinxcontrib-bibtex"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/oset[${PYTHON_USEDEP}]
+	dev-python/pybtex[${PYTHON_USEDEP}]
+	dev-python/pybtex-docutils[${PYTHON_USEDEP}]
+	dev-python/sphinx[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx doc
+
+python_test() {
+	pytest -vv test || die "Tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	find "${D}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/spyder-notebook/Manifest b/dev-python/spyder-notebook/Manifest
index c5fad72a1819..711e6bc75295 100644
--- a/dev-python/spyder-notebook/Manifest
+++ b/dev-python/spyder-notebook/Manifest
@@ -1,3 +1,3 @@
-DIST spyder-notebook-0.3.1.tar.gz 3862401 BLAKE2B cfafc631fc0fe44fadecc1f2509435c0a7b6ce5320c19bbe75be92e4c50275a06e79aa77e8b0cf832fbb1fdb229236c3741208f3081e879528751373d8875126 SHA512 253583b0a080f6359b58583f8c459ae858bafe4b15d24e86c7f144801431bd03254ced3984ac98e1e3349f48ebe5081252d298e59dd88609b7bb22f9e0b6765d
-EBUILD spyder-notebook-0.3.1.ebuild 1186 BLAKE2B 313470e0a945e49fa7f145a5417c2bc72cd8d9cb07dd60c375d090844de00ddb009bad6f3fb825a2e0ba9144bfbf4049afc733faa193d2ef5c73df4d5df1c90a SHA512 73deaf0ac5a7e77619e7bccafc6a7a87645a3041c955c6c56a21d8d0235aca7f9293b268a176f1a969cd13969e3e6f068309e12958ca14b9431c0c7261f8319d
+DIST spyder-notebook-0.3.2.tar.gz 3868854 BLAKE2B ca13e905dcc02d6767002481fb68ab8bc119d4d2511a1b881f033b9387d4237a1b2232ba75368f48b4d096998da40a14d862f125c0b01c6b2498165acebf4835 SHA512 dd3b505c8a678a9f49b1fce1d22a8a1a6cf334b65d1ab94852a7ba2120f53e2e38eb2fa0d58343588d7304511d7171d8e0040e10cda905db11ab65cae7f6ce5c
+EBUILD spyder-notebook-0.3.2.ebuild 1186 BLAKE2B 32f1258e3ac562a125d77845a8d3c1b84a84a1e822afcb2e4ad4f6ba299f16048569b02d7b6850328711dcb048385b0884f3f46c99dabbe610399d74da48630b SHA512 087edafae14b540b348586aa98285ccded49cf0a9d5946459c4eb9f0cd20488c6d8adb83fca5c2c7f72ff2a1240fe2aa80cc347cf6715abaf51bd52d743d4d3b
 MISC metadata.xml 453 BLAKE2B 85e86a15f42d0ef745aa417ae51f95725c8dc9b609ab55549a39dd0dc1ab5e8c48637e792b0d848c7a00b9cd2115987ce08b1871c2ffcaeceb44508c85ff0a71 SHA512 1017abac649d9a726fea8d22317c0c1dda117ca605bed467907ac4e0600888a9b9debc1ce2b5cd09542a734de3e4313e01c71b8b8b9bc498a95b04bc76a740a0
diff --git a/dev-python/spyder-notebook/spyder-notebook-0.3.1.ebuild b/dev-python/spyder-notebook/spyder-notebook-0.3.2.ebuild
index 04a29dcd842c..5644ae3cc7a6 100644
--- a/dev-python/spyder-notebook/spyder-notebook-0.3.1.ebuild
+++ b/dev-python/spyder-notebook/spyder-notebook-0.3.2.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/spyder/Manifest b/dev-python/spyder/Manifest
index 15d8398fe63f..b9c3aaf6c150 100644
--- a/dev-python/spyder/Manifest
+++ b/dev-python/spyder/Manifest
@@ -3,8 +3,10 @@ AUX spyder-4.1.5-doc-theme-renamed.patch 375 BLAKE2B f4c902b331e9e6f034018d781d4
 AUX spyder-4.2.1-build.patch 1232 BLAKE2B 54bef30dca6cc94a7a32fab200bceed1a01f730f4758f03b97688d3ecf5709e8c7b37af82746452520c2f3135722b4e387f3ef9d9219e1d159b8abe937d8165f SHA512 052f249b5f6b2195a472750f42b16721de9e8020481cb57bb5e180267507df6f6b5f1a36b8a45f28b64d098c8a02a4814c1c03f1efdcd1ffedaca77a28ad8705
 DIST spyder-4.2.0.tar.gz 11840358 BLAKE2B 26e4cd9865196fb39fa5b49a17f172b3000fe27c5ab6fb1b31ed56d41f118e4016b6ed97ce8cb1b39c65031fc11413f8e426876d3dc8d5af25f12428d0e0c481 SHA512 c1460e2fe9a37c0e6107657de71205682018d87737b3eac16ec92c32d979bf727a6c8955bd2700872b6e91159d1a1efc57cdea52ffc44604fe34b78094de6e7f
 DIST spyder-4.2.1.tar.gz 12156626 BLAKE2B 4a009c8b2ebe1b71bb60c568d5e6a3d7616fba7f9988669e97a2454b6369421a8603495271ad4c275cae9ad7207f2666b28ecccb121b4cc5554a3d1a863a1579 SHA512 56975e851a05dd023d851adaff8e9a747f9b1aa626db8ce65f805e41c5c47dba017332e81bf9efaae65671e06bc7632a519def286568a8ed2f48b41aa285de62
+DIST spyder-4.2.3.tar.gz 11539371 BLAKE2B aecd2e9772c52e644e9c0503195e380fffecdfaa5aea3f00a64e98a969faf3de4e0d8eb0515cc59893f28deb7733403826e90e36006ad7f8f4d67e8ef5e64543 SHA512 9e56efab8862c21e7496d45e813d28c4e9be583275352b0a6e0a58e99f6c0234fa9862da66705839beacb971dde9b6edc253405d9d62853a3c4c9c9991844846
 DIST spyder-docs-5c9c8a3317045c2d301e05b751943be9b521d129.tar.gz 66692311 BLAKE2B ec741a9cd830bc8a5776be1d52dcac9649c8abf33faec0ac8741d95625d8aeda2b8c0d2bdbef02c068a22ec62a4d5281a48e996530e1bd2e6de43b86e0a14ffe SHA512 73bd05ef31f69ebd80bb488017998536c4ed0e63a331efe743d9d858b936df287253f333d09beac6d2b249a96e8f82538d321850a64b0941db3d0141122995eb
 DIST spyder-docs-7fbdabcbc37fe696e4ad5604cdbf4023dfbe8b6c.tar.gz 58822544 BLAKE2B 9ddd662eb0e3b2845a15bc38a0ab994fcf43824a560cf635a29e16b5eb66407706a412ea50a2f8e5c0212675df3422ece649bd1e50e3ecd1c34ee5727f8a2df9 SHA512 ab30f287733681da0b1d15656a44cd320401330309efbff8f0a89f59a15d5c57532a2eab3e8353d8c3856eac0a393385a852663d6698d0a0d309def21d13933d
 EBUILD spyder-4.2.0.ebuild 8406 BLAKE2B e634bfeccb37da403424636e1c1425ab375bbadcf34da1c9ef3b3a250fc8675a0b213259176025b7565d899bb56af260dfb2e761c07b5ba16112b1b3783afd35 SHA512 c190334f7bf444d8872207de4021422395ebb5accbb4273d17b88c29811fc45c71bd72f1a3a069659825ae3dda645b8f179bfbc7c9613020733ead734619dafe
 EBUILD spyder-4.2.1.ebuild 9232 BLAKE2B 661fce13032a96659195fc27082a872f4fe191ecec5ce6f13881eb6b5972ef85d4a490ea79e3ced696e6d84b32a3732f50d914d7222f4db6c391f77e318ffb0d SHA512 20426a6f6b5d3da3fefd7bff488c8362c2cdc432f06b25e76b248f58bd182551c4b95bd684d41597e05006590ec44756ced930680eb76c6837971b834b000224
+EBUILD spyder-4.2.3.ebuild 9616 BLAKE2B f19fe1a411bf3ed4ebebb4faa790933f1310401e97b7d3c0195cb8bd8eedc0dfd7eabeeded4bd94439cc310c9fab82c22f921b6ede55f51161f555f5c1675103 SHA512 676b5feca5dd1eb03e4f8326c027bad7abd21ab52d887d3a396afa49cad7ccf57c3f6e040820e51053f328f0d10486609f79d3e54230111bfd16387b6e4b7a3c
 MISC metadata.xml 1413 BLAKE2B cf9779b0f4f71f9929c9faefc8e50c1f0a06a55927002f1473958934a9eb808651c0df8171ef8faf16f7ce2bb3149ff119a8e9df1896e18121c545d6244ae13c SHA512 bbb55ced9bcc673df13224acb530de91094a496e97af91229ce5dc8ab167414f1a606994596779e0b6d99845c157b699783c63af761c4e9428ba35a658ef9cdf
diff --git a/dev-python/spyder/spyder-4.2.3.ebuild b/dev-python/spyder/spyder-4.2.3.ebuild
new file mode 100644
index 000000000000..25d5e585b49f
--- /dev/null
+++ b/dev-python/spyder/spyder-4.2.3.ebuild
@@ -0,0 +1,252 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8} )
+# The warning that this is wrong is a false positive
+# Spyder has setuptools in install_requires
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit optfeature xdg distutils-r1
+
+# Commit of documentation to fetch
+DOCS_PV="5c9c8a3317045c2d301e05b751943be9b521d129"
+
+DESCRIPTION="The Scientific Python Development Environment"
+HOMEPAGE="
+	https://www.spyder-ide.org/
+	https://github.com/spyder-ide/spyder/
+	https://pypi.org/project/spyder/
+"
+SRC_URI="https://github.com/spyder-ide/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/spyder-ide/${PN}-docs/archive/${DOCS_PV}.tar.gz -> ${PN}-docs-${DOCS_PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# The test suite often hangs or does not work.
+# Technically spyder requires pyqt5<13, which
+# we do not have in ::gentoo any more. Likely
+# this is the reason many of the tests fail
+# or hang. RESTRICTing because IMO it is
+# not worth the several hours I spend every
+# single version bump checking which tests
+# do and do not work. Spyder itself works
+# fine with pyqt5>13.
+RESTRICT="test"
+
+# White space separated deps are expansion of python-language-server[all] dep
+# As the pyls ebuild does not add flags for optional runtime dependencies
+# we have to manually specify these desp instead of just depending on the [all]
+# flag. The indentation allows us to distinguish them from spyders direct deps.
+RDEPEND="
+	>=dev-python/atomicwrites-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/chardet-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/cloudpickle-0.5.0[${PYTHON_USEDEP}]
+	>=dev-python/diff-match-patch-20181111[${PYTHON_USEDEP}]
+	>=dev-python/intervaltree-3.0.2[${PYTHON_USEDEP}]
+	>=dev-python/ipython-7.6.0[${PYTHON_USEDEP}]
+	~dev-python/jedi-0.17.2[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
+	>=dev-python/keyring-17.0.0[${PYTHON_USEDEP}]
+	>=dev-python/nbconvert-4.0[${PYTHON_USEDEP}]
+	>=dev-python/numpydoc-0.6.0[${PYTHON_USEDEP}]
+	~dev-python/parso-0.7.0[${PYTHON_USEDEP}]
+	>=dev-python/pexpect-4.4.0[${PYTHON_USEDEP}]
+	>=dev-python/pickleshare-0.4[${PYTHON_USEDEP}]
+	>=dev-python/psutil-5.3[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
+	>=dev-python/pylint-1.0[${PYTHON_USEDEP}]
+	>=dev-python/python-language-server-0.36.2[${PYTHON_USEDEP}]
+
+	dev-python/autopep8[${PYTHON_USEDEP}]
+	>=dev-python/flake8-3.8.0[${PYTHON_USEDEP}]
+	>=dev-python/mccabe-0.6.0[${PYTHON_USEDEP}]
+	<dev-python/mccabe-0.7.0[${PYTHON_USEDEP}]
+	>=dev-python/pycodestyle-2.6.0[${PYTHON_USEDEP}]
+	<dev-python/pycodestyle-2.7.0[${PYTHON_USEDEP}]
+	>=dev-python/pydocstyle-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/pyflakes-2.2.0[${PYTHON_USEDEP}]
+	<dev-python/pyflakes-2.3.0[${PYTHON_USEDEP}]
+	dev-python/pylint[${PYTHON_USEDEP}]
+	>=dev-python/rope-0.10.5[${PYTHON_USEDEP}]
+	dev-python/yapf[${PYTHON_USEDEP}]
+
+	<dev-python/python-language-server-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/pyls-black-0.4.6[${PYTHON_USEDEP}]
+	>=dev-python/pyls-spyder-0.3.2[${PYTHON_USEDEP}]
+	>=dev-python/pyxdg-0.26[${PYTHON_USEDEP}]
+	>=dev-python/pyzmq-17.0.0[${PYTHON_USEDEP}]
+	>=dev-python/qdarkstyle-2.8[${PYTHON_USEDEP}]
+	>=dev-python/qtawesome-0.5.7[${PYTHON_USEDEP}]
+	>=dev-python/qtconsole-5.0.1[${PYTHON_USEDEP}]
+	>=dev-python/QtPy-1.5.0[${PYTHON_USEDEP},svg,webengine]
+	>=dev-python/sphinx-0.6.6[${PYTHON_USEDEP}]
+	>=dev-python/spyder-kernels-1.10.2[${PYTHON_USEDEP}]
+	<dev-python/spyder-kernels-1.11.0[${PYTHON_USEDEP}]
+	>=dev-python/textdistance-4.2.0[${PYTHON_USEDEP}]
+	>=dev-python/three-merge-0.1.1[${PYTHON_USEDEP}]
+	>=dev-python/watchdog-0.10.3[${PYTHON_USEDEP}]
+	<dev-python/watchdog-2.0.0[${PYTHON_USEDEP}]
+
+	dev-python/PyQt5[${PYTHON_USEDEP}]
+	dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
+"
+
+BDEPEND="test? (
+	dev-python/cython[${PYTHON_USEDEP}]
+	dev-python/flaky[${PYTHON_USEDEP}]
+	dev-python/matplotlib[tk,${PYTHON_USEDEP}]
+	dev-python/mock[${PYTHON_USEDEP}]
+	dev-python/pandas[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	<dev-python/pytest-6.0[${PYTHON_USEDEP}]
+	dev-python/pytest-lazy-fixture[${PYTHON_USEDEP}]
+	dev-python/pytest-mock[${PYTHON_USEDEP}]
+	dev-python/pytest-ordering[${PYTHON_USEDEP}]
+	dev-python/pytest-qt[${PYTHON_USEDEP}]
+	dev-python/pytest-xvfb[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/scipy[${PYTHON_USEDEP}]
+	dev-python/sympy[${PYTHON_USEDEP}]
+)"
+
+# Based on the courtesy of Arfrever
+# This patch removes a call to update-desktop-database during build
+# This fails because access is denied to this command during build
+PATCHES=(
+	"${FILESDIR}/${PN}-4.2.1-build.patch"
+	"${FILESDIR}/${PN}-4.1.5-doc-theme-renamed.patch"
+)
+
+DOCS=(
+	"AUTHORS.txt"
+	"Announcements.md"
+	"CHANGELOG.md"
+	"CODE_OF_CONDUCT.md"
+	"CONTRIBUTING.md"
+	"NOTICE.txt"
+	"README.md"
+	"RELEASE.md"
+)
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs/doc dev-python/sphinx-panels dev-python/pydata-sphinx-theme dev-python/sphinx-multiversion
+
+python_prepare_all() {
+	# move docs into workdir
+	mv ../spyder-docs-${DOCS_PV}* docs || die
+
+	# these deps are packaged separately: dev-python/spyder-kernels, dev-python/python-language-server
+	rm external-deps/* -r || die
+	# runs against things packaged in external-deps dir
+	rm conftest.py || die
+
+	# do not depend on pyqt5<13
+	sed -i -e '/pyqt5/d' \
+		-e '/pyqtwebengine/d' \
+			setup.py || die
+
+	# do not check deps, fails because we removed pyqt5 dependency above
+	sed -i -e 's:test_dependencies_for_spyder_setup_install_requires_in_sync:_&:' \
+		spyder/tests/test_dependencies_in_sync.py || die
+
+	# can't check for update, need network
+	rm spyder/workers/tests/test_update.py || die
+
+	# skip online test
+	rm spyder/widgets/github/tests/test_github_backend.py || die
+
+	# KeyError: 'conda: base', need conda??
+	sed -i -e 's:test_status_bar_conda_interpreter_status:_&:' \
+		spyder/widgets/tests/test_status.py || die
+
+	# assert 2 == 1
+	sed -i -e 's:test_pylint_max_history_conf:_&:' \
+		spyder/plugins/pylint/tests/test_pylint.py || die
+
+	# https://bugs.gentoo.org/747211
+	sed -i -e 's:test_loaded_and_closed_signals:_&:' \
+		spyder/plugins/projects/tests/test_plugin.py || die
+
+	# AssertionError: assert '' == 'This is some test text!'
+	sed -i -e 's:test_tab_copies_find_to_replace:_&:' \
+		spyder/plugins/editor/widgets/tests/test_editor.py || die
+
+	# hangs till forever
+	sed -i -e 's:test_help_opens_when_show_tutorial_full:_&:' \
+		spyder/app/tests/test_mainwindow.py || die
+
+	# Assertion error, can't connect/remember inside ebuild environment
+	rm spyder/plugins/ipythonconsole/widgets/tests/test_kernelconnect.py || die
+
+	# AssertionError: waitUntil timed out in 20000 miliseconds
+	sed -i -e 's:test_pdb_multiline:_&:' \
+		spyder/plugins/ipythonconsole/tests/test_ipythonconsole.py || die
+
+	# AssertionError: assert 'if True:\n    0\n    ' == 'if True:\n    0'
+	sed -i -e 's:test_undo_return:_&:' \
+		spyder/plugins/editor/widgets/tests/test_codeeditor.py || die
+
+	# assert False is True
+	sed -i -e 's:test_range_indicator_visible_on_hover_only:_&:' \
+		spyder/plugins/editor/panels/tests/test_scrollflag.py || die
+
+	# AssertionError: waitUntil timed out in 10000 miliseconds
+	sed -i -e 's:test_get_hints:_&:' \
+		spyder/plugins/editor/widgets/tests/test_hints_and_calltips.py || die
+
+	# Fatal Python error: Aborted
+	sed -i -e 's:test_module_completion:_&:' \
+		spyder/utils/introspection/tests/test_modulecompletion.py || die
+
+	# assert 0 > 0
+	sed -i -e 's:test_maininterpreter_page:_&:' \
+		spyder/preferences/tests/test_config_dialog.py || die
+
+	# This hangs forever
+	sed -i -e 's:test_load_kernel_file:_&:' \
+		-e 's:test_load_kernel_file_from_location:_&:' \
+		-e 's:test_load_kernel_file_from_id:_&:' \
+		spyder/plugins/ipythonconsole/tests/test_ipythonconsole.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+# Calling pytest directly makes the tests freeze after completing even if successful
+# Exit code is nonzero even upon success, so can't add || die here
+# test results should be checked for success manually
+python_test() {
+	${EPYTHON} runtests.py
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	elog "To get additional features, optional runtime dependencies may be installed:"
+		optfeature "2D/3D plotting in the Python and IPython consoles" dev-python/matplotlib
+		optfeature "View and edit DataFrames and Series in the Variable Explorer" dev-python/pandas
+		optfeature "View and edit two or three dimensional arrays in the Variable Explorer" dev-python/numpy
+		optfeature "Symbolic mathematics in the IPython console" dev-python/sympy
+		optfeature "Import Matlab workspace files in the Variable Explorer" dev-python/scipy
+		optfeature "Run Cython files in the IPython console" dev-python/cython
+		optfeature "The hdf5/h5py plugin" dev-python/h5py
+		optfeature "The line profiler plugin" dev-python/spyder-line-profiler
+		optfeature "The memory profiler plugin" dev-python/spyder-memory-profiler
+		# spyder-autopep8 does not have a release (yet)
+		# and are not compatible with >=spyder-4.0.0 at the moment
+		# optfeature "The autopep8 plugin" dev-python/spyder-autopep8
+		optfeature "Vim key bindings" dev-python/spyder-vim
+		optfeature "Unittest support" dev-python/spyder-unittest
+		optfeature "Jupyter notebook support" dev-python/spyder-notebook
+		optfeature "System terminal inside spyder" dev-python/spyder-terminal
+		# spyder-reports not yet updated to >=spyder-4.0.0
+		# optfeature "Markdown reports using Pweave" dev-python/spyder-reports
+
+	elog ""
+	elog "Spyder currently only works with PyQt5 as QtPy backend, PySide2 is not supported."
+	elog "Please ensure that 'eselect qtpy' is set to PyQt5."
+	elog ""
+}
diff --git a/dev-python/sqlalchemy/Manifest b/dev-python/sqlalchemy/Manifest
index f372c6f83451..63b8cc8c326b 100644
--- a/dev-python/sqlalchemy/Manifest
+++ b/dev-python/sqlalchemy/Manifest
@@ -7,6 +7,6 @@ DIST SQLAlchemy-1.3.23.tar.gz 6313652 BLAKE2B e87f67ee7ee70036b94e1708c1a59f58b1
 EBUILD sqlalchemy-1.3.17.ebuild 1427 BLAKE2B 7a068977d5832b08fccd51075f31608e21c6e234be5443e055dc3f0f20f1016e9c72ed321a3fc09bdd791146a20933d6c9f76b41e25a9ac8ce32488d25faaa51 SHA512 0f00ac700d30e1f8e080fd5ddc07be4173bee454e78a68063c3cc98e9bbe9c2e7d572c41d5cd863e0375c3553a5185144bcd30d4059c3b0d5ed6939a40172b9d
 EBUILD sqlalchemy-1.3.20.ebuild 1881 BLAKE2B 62eccd43feada54889f3829308f3b813bfd9f95da3f99270a8ac8a2600486d029705615f4436bd5494b505743818101f188f4e4315aa1555b8ba6a1e0e25bd6f SHA512 07287e4c7c56ae1f12f928857bbb3298be752a534054386316a79e86c6501212030d258dab1643fef7150b9c4a7e462b0f8e60cadacbda2f81b67a398d42d5b3
 EBUILD sqlalchemy-1.3.21.ebuild 1901 BLAKE2B 6c60421975fba0b2bc5173037bc0e497819fe7918b0e4e0aef8a3a1fb1ef32a2e4352da20ac5eafddfaf7f7b21bf6bd1b864cd09fdedf957bf4a41fc0d1f0dfb SHA512 17282faf6f3a63c36a9d3735eaa896e31058cbcf672671dabcc155fa6246b5b250876790954d0225f2c44e4e8207c575aa7ff5ff2ec1f966c7a7cfb767598f0e
-EBUILD sqlalchemy-1.3.22.ebuild 1894 BLAKE2B 21e90139805c2e5e23ae20eec320362e18b8e36f6ee5da7fc76a9e0c4e9fad2fad09cf856c4fe9f642078d1653d67c1c9593b21bb11d76adb5c5695bc0637712 SHA512 36bb9767c975b0b07eda3b3b564b448d6c755d57ad716775fa4814fcfae45f7ee33cffeb2c65f25d2b72bdffd5dddf5ffff6b78e8c64e74c316c1b32878c21d7
-EBUILD sqlalchemy-1.3.23.ebuild 1901 BLAKE2B 6c60421975fba0b2bc5173037bc0e497819fe7918b0e4e0aef8a3a1fb1ef32a2e4352da20ac5eafddfaf7f7b21bf6bd1b864cd09fdedf957bf4a41fc0d1f0dfb SHA512 17282faf6f3a63c36a9d3735eaa896e31058cbcf672671dabcc155fa6246b5b250876790954d0225f2c44e4e8207c575aa7ff5ff2ec1f966c7a7cfb767598f0e
+EBUILD sqlalchemy-1.3.22.ebuild 1893 BLAKE2B 5b6d06e31f3e1181a893a1c49b026f61dd582ce40adc0d3b7812427feac915c4dccdb4deebb9603c0d9d988490a23451ac6348dd930eb0ca81f5cbb197264760 SHA512 1ed46e7c780e210c727984b0c9e598048de06afaabe46cb3166f90a4fe3263c87d263b4b83536d8a8388add67914220b18eaeb152dcabc173dc3bd5c498eb701
+EBUILD sqlalchemy-1.3.23.ebuild 1893 BLAKE2B 5b6d06e31f3e1181a893a1c49b026f61dd582ce40adc0d3b7812427feac915c4dccdb4deebb9603c0d9d988490a23451ac6348dd930eb0ca81f5cbb197264760 SHA512 1ed46e7c780e210c727984b0c9e598048de06afaabe46cb3166f90a4fe3263c87d263b4b83536d8a8388add67914220b18eaeb152dcabc173dc3bd5c498eb701
 MISC metadata.xml 443 BLAKE2B 44c09d8332158ed09ece04188ca9b41a68b7e8a0a2b6d8d44cef44d7be396a08cab3432c05b3bcdbe706a470662d313548e80e202c8ea0e02aec6035daacb3ef SHA512 c262e5b27bbb02b6e64a1fa8a240cf14fe572dc0d41901dfc65ca979f7f89b3e0885b71a6f5c39b33e1534e13366873144693eed44bf43712d3c924a504dc6c8
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.3.22.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.3.22.ebuild
index 79cefe7a13e9..b536d9b3320a 100644
--- a/dev-python/sqlalchemy/sqlalchemy-1.3.22.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-1.3.22.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="examples +sqlite test"
 
 # Use pytest-xdist to speed up tests
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.3.23.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.3.23.ebuild
index 0c7cc3a6397e..b536d9b3320a 100644
--- a/dev-python/sqlalchemy/sqlalchemy-1.3.23.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-1.3.23.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="examples +sqlite test"
 
 # Use pytest-xdist to speed up tests
diff --git a/dev-python/statsmodels/Manifest b/dev-python/statsmodels/Manifest
index d1dfe33e5067..0973577d4a2e 100644
--- a/dev-python/statsmodels/Manifest
+++ b/dev-python/statsmodels/Manifest
@@ -6,5 +6,5 @@ DIST statsmodels-0.12.2.tar.gz 17470078 BLAKE2B 7b2a17fe350489888fd05d2275b597ec
 EBUILD statsmodels-0.11.1.ebuild 2206 BLAKE2B 7dfec0250fa61ef241b786609fde70a031dd62b6661a37b28240bb3db1431ae3f6369d44c905f7a658248c31e4aac5a18bbe194846d066b4f40b608264dae513 SHA512 45ff4220ed6bb0e128d17058c98fd560eefdf4decc541770b0bf9a5adfed95558be3426c489af453371b17f6da15ca93c336c9fbf312c668385c903a757a0f1f
 EBUILD statsmodels-0.12.0.ebuild 2016 BLAKE2B 1843135cbd9b9feaa80523eb6383ee8458d4c364908bdf23270e564b7eaaaee3e637ab5cb6b8789bd946a9b9a31b0795cd5c2cfadc6cf69daf4a1508f686257f SHA512 a7000a68ef9954182b7b3d08064cfc15f66d4732ce9312398a6434db6c344a6e8c51bdf3669be24e0947cce15f6dad63f4da00a486938c51874e2afdf3b9737e
 EBUILD statsmodels-0.12.1.ebuild 2016 BLAKE2B 1843135cbd9b9feaa80523eb6383ee8458d4c364908bdf23270e564b7eaaaee3e637ab5cb6b8789bd946a9b9a31b0795cd5c2cfadc6cf69daf4a1508f686257f SHA512 a7000a68ef9954182b7b3d08064cfc15f66d4732ce9312398a6434db6c344a6e8c51bdf3669be24e0947cce15f6dad63f4da00a486938c51874e2afdf3b9737e
-EBUILD statsmodels-0.12.2.ebuild 2017 BLAKE2B 83a054cba8a1bb772e3577de192e756c9fe12c8e1e662ca968e131e6605f7a7dcda3587c50444a87eeeffed69bb9c9543305432a43151eaac044fbf1a2f0e304 SHA512 45283f975a9640984f08920adc38da055e99a8506f6d6d79736ee1548ab98d5d4349d8ac945cd3092e17a3c4d5ad29615327f278987792661b14525c32ed4f7c
+EBUILD statsmodels-0.12.2.ebuild 2016 BLAKE2B 3dfa18391bc68db377c8df44353b418b6f8abde0a822418586e8660892f9cfdf2daee78678faf5dd93705cacec9e2e03ee706d3ab027ac572e035741a271e951 SHA512 5aec85f4407ffdbfdb37248f85c5bd480e82af7673a765c6db884d73f1043c67d2a21e91b5a4b68271cf9ba682ab57081716d4ddeff614278acd228ac36f9142
 MISC metadata.xml 1313 BLAKE2B 6ac22c4e2ee393a800f2c30b81f5343f8370e8cff1522ec96d95f0582d2d8ce8250b2c9a0120e2925f77c22cd516fcf4865e19982971ebbb653ba1df07815e38 SHA512 cfce7637265b19fc29fa537e591ff6ee348cfcd2d8b87463a1d2a04e549eb934bd66510d72f727f093c1babfe69ad6c6bcd590b159f77cd7d55d179c4722d4a2
diff --git a/dev-python/statsmodels/statsmodels-0.12.2.ebuild b/dev-python/statsmodels/statsmodels-0.12.2.ebuild
index 6cb060e4ff75..1f96e8caebb7 100644
--- a/dev-python/statsmodels/statsmodels-0.12.2.ebuild
+++ b/dev-python/statsmodels/statsmodels-0.12.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="examples"
 
 RDEPEND="
diff --git a/dev-python/sybil/Manifest b/dev-python/sybil/Manifest
index c0b86bf3a51b..9d460ba620b9 100644
--- a/dev-python/sybil/Manifest
+++ b/dev-python/sybil/Manifest
@@ -1,3 +1,3 @@
 DIST sybil-2.0.1.tar.gz 29316 BLAKE2B cf03bc1595efab535d1248b9d267dcd01547f02539977c12b8753e70d13ea0744a6ab76dc1e44fd1c46d192577aa4c1a9b5d5d52678928acfd63937358fa3e33 SHA512 4f3be7686c1acf6812623a756fa79b41e3fbe5d4c3b4c7cf5dfe39fbe56806b4ef3acd24e25968ab9119b2c65ad5c30eabe32f1a93fb62ba8d3893ef123e69f0
-EBUILD sybil-2.0.1.ebuild 415 BLAKE2B 4aba9800c8b13be28ca4641541cfc52eb78ea1afde658c9deb2c8e5b59715710ac542d8d7c5de7e73ab76fa9e18a83ee604736bf47fb6a11d099b778ef2a63ca SHA512 71715d7e234985ddb6804bdd2d215b9ab9ed4cc971b8b736052501a09a5eb8393b2f6e06bd9d1f79de2c71d256938a3b7da48b3105f832215199ea4d2ece94fd
+EBUILD sybil-2.0.1.ebuild 422 BLAKE2B 6ccbc35567ebb977dba661dc7c0110711e5239a0bbb421b578c2edb24e8ea4005e1ba7c1f36d2c7a0e607fc16adb6c94988ca119da4b929d644f5b291c971fa8 SHA512 4a3c4705321eb0a91084bc2686500c5acbda315a89533e165e572173a746bbd509bfd7f5c8ac79a2f504f4323c28feb9b5f4331dba7bb7d1d6001f9f6aba3a19
 MISC metadata.xml 397 BLAKE2B 6a49550b305c35a6fbb679f8b33a359e96067c3980fccb5bb4f46837f125f84d7c590cdff0b7e9edd08d27ae406ec2e12a00db9e5c266d83f764c213579b3b9e SHA512 85ed69ab5207b47db4b65e7a199639a5368cfc9ea03365ed62bf00c7447e5aaadee89b9827a1bbc93d035732b757a132e6e2992163ada0c2050be0983f3bc883
diff --git a/dev-python/sybil/sybil-2.0.1.ebuild b/dev-python/sybil/sybil-2.0.1.ebuild
index 536800f0b0a5..c160c4715741 100644
--- a/dev-python/sybil/sybil-2.0.1.ebuild
+++ b/dev-python/sybil/sybil-2.0.1.ebuild
@@ -12,6 +12,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/testfixtures/Manifest b/dev-python/testfixtures/Manifest
index 3ee7e9a3e2e2..fc6c0ffdb61c 100644
--- a/dev-python/testfixtures/Manifest
+++ b/dev-python/testfixtures/Manifest
@@ -1,3 +1,3 @@
 DIST testfixtures-6.17.1.tar.gz 121440 BLAKE2B 6fcdf4f99af7941044f5f3cdc3e1204b5730d514a009e95f14451537f62af6c6ebaa97356b7ca0dae6313bd81b2a83d981567346e20c477c2d17c6bca73ecdcf SHA512 fbf7c8cd39b83516a257c5a3bce724a8416af88cf1bac8d69457b2030873185c685feb12aea065df2af729a9b733b3e0afe76207bd78e9b5a0c2d464b727d99e
-EBUILD testfixtures-6.17.1.ebuild 1092 BLAKE2B 3e62c79714fbcb16edbbf886844d6ede93ef7fae7370871b221295dee233d1b673e0b31fd7fa1e4e9d4335d5faafbd8a371380f9aac0e538b82d4151f5e18ec7 SHA512 715f9f6b42d6ca147c1d8300985a1eab042a08e0e4f2177a84e5ff635a07884d7142de5c1bb98aa50566d109889ad31f5cc0cce5b1daa5d0386740fe1c159833
+EBUILD testfixtures-6.17.1.ebuild 1099 BLAKE2B e2b3db56847d5dd550a529457c5ef474d64401191c9e176bd6e1a315d49c3eeb5153713adda820b082421f5f475af426606e47d363d48efacf3e17746eb6cfe2 SHA512 0c636a6a0f83501552b98dc987a3ac3fada8cff20dd8241fdf518d7db248e4a544a00b0eb7b34fa74dd42de8b54ad1752822c6d056248455fcba4234994e8bdd
 MISC metadata.xml 415 BLAKE2B d3e133602f86d013faf5998b2e52256dca88ed9593b9ea26bed0277b70823eda4dd27deca7488a7f66fac2f77e3312cddf833a4b865cf400c7e78a4d267a4c5b SHA512 78fd16b4fd4e8ea3f244b3d8fcce8451a38713d0374df3d2661453f2ad06af587b4613c9119b11bf4cfe3d226fd04620bfa74f58f2660e44ba7e84b93c99c20e
diff --git a/dev-python/testfixtures/testfixtures-6.17.1.ebuild b/dev-python/testfixtures/testfixtures-6.17.1.ebuild
index af5e5d8c2a52..056ba7d05a0d 100644
--- a/dev-python/testfixtures/testfixtures-6.17.1.ebuild
+++ b/dev-python/testfixtures/testfixtures-6.17.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/texttable/Manifest b/dev-python/texttable/Manifest
index 0951b4f7b72d..696d5c67650b 100644
--- a/dev-python/texttable/Manifest
+++ b/dev-python/texttable/Manifest
@@ -1,3 +1,3 @@
 DIST texttable-1.6.3.tar.gz 11574 BLAKE2B aebb306acb89f62963e9473ab6e22291a1ec93993a0106ddd2943f656737cb0960a10e680a69b6577ebb8ac0af3c6ecdfd8c58647a6ce37d9a6531e41f61f480 SHA512 89a26ef7d9947ec4edfc5791c91f2ac327c79bbc5aa0e0f89c0a63dbd80bc420027af073da935254faa143b9e8bef85a7bb352791b45b0cd60c7bcf569869f2d
 EBUILD texttable-1.6.3.ebuild 686 BLAKE2B 757aa798f0142ed18bd44f7cafcea82918869c9bfadffe2bd5e09fc9a2d6dac491aee2206a9d9e81ee1c4f058ea061deab52a08a723d13383bca7cc8a372156d SHA512 98225164864da5494fb5591a2a1568456a3f7720dc4200ba6d71c79e51c5cf78e0e00b41fd36abcee575305316f0d76c7b5d2d60afe0ca8a88f12a8f808c490b
-MISC metadata.xml 378 BLAKE2B 278fb97915edd484d5a59296e51689c296b9c6534c2a1b69427bc8c12f83934b33e6f2f3db22cd3c9716e45168aaf24fb4e286c58b1b0ffbda6918baa29ad7aa SHA512 54b6636d443856ffed61de7b258432f7e2988dc750a5f9bca1d8800e8b78dc72feb87e917a5c0e10ce7f38fc0f1c20fc882c0d672a5ecf1ba1097b577ad64706
+MISC metadata.xml 415 BLAKE2B 11ff7752eaaef7044c1fdb52bef9a06af78430db5a83c4f502eed9b93417bfb6ed0d93ab5ced5fd979e1dfbec35b37f76018aa6bc8c11c64fb8e31af947b175f SHA512 b0eda5e903c15a6de61d24b01a1b97b6002bd40e51291fa74c2be1b1a54b44641354863b7c83a60c02609582fea55dc38e0cf8b3ce126a26c7d437aca77cc0ec
diff --git a/dev-python/texttable/metadata.xml b/dev-python/texttable/metadata.xml
index 3f7038e7e9ee..520ecb42ff2e 100644
--- a/dev-python/texttable/metadata.xml
+++ b/dev-python/texttable/metadata.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>juippis@gentoo.org</email>
-		<name>Joonas Niilola</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="pypi">texttable</remote-id>
-		<remote-id type="github">foutaise/texttable</remote-id>
-	</upstream>
+  <maintainer type="person">
+    <email>juippis@gentoo.org</email>
+    <name>Joonas Niilola</name>
+  </maintainer>
+  <stabilize-allarches/>
+  <upstream>
+    <remote-id type="pypi">texttable</remote-id>
+    <remote-id type="github">foutaise/texttable</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-python/theano-pymc/Manifest b/dev-python/theano-pymc/Manifest
index cf908449ff82..9dce0b640e54 100644
--- a/dev-python/theano-pymc/Manifest
+++ b/dev-python/theano-pymc/Manifest
@@ -1,5 +1,5 @@
 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
 EBUILD theano-pymc-1.1.0.ebuild 1712 BLAKE2B 2a34d16d3e5f058c28ec775a7c0c216aca942ff9653f6766762d451971008f322149c44baa240e88e8bfc9e6a4a6074e41fa3f0d3a557c7bbf5cda9855baddab SHA512 c21327fcf0a210c7ba2ac6923360991b9156d24943f9ecd11d7b5a45ec3f1a57e5f3b4a2cb57f83310a1d98197d5500dc5048f373bff0813963891609395caa9
-EBUILD theano-pymc-1.1.2-r1.ebuild 1963 BLAKE2B 5fe652240981f2101f7dad22adde944760d90f42049875b39162deded72dd7b624a6ee1e7f364591c8a69cb56befc8dc2332655809513be4ebfacd00135cb7af SHA512 cb9285ddc9d24c225adb8cac8a4890f4445cb07522661a779a8949644cda8c46cf33ea568a6d9eeac56dcaa38bb03fff38fc5adf86b3ca43a1d7fe85502a7756
+EBUILD theano-pymc-1.1.2-r1.ebuild 1962 BLAKE2B 8d5f9f44b3fe4dd84c537463dab72a67974d11454010a7411e0e66b8b25ad6d2903f529b7edfcb5e6e3785f5b919e8036908a7b4eddfbbeecab25201e9396a36 SHA512 7a729fad233266d4cce725e224fc05541942aef43efba30d2c3f7e66a9573a60d975d997435d8f038406ec9751d86a7ac2b136f606595679b28d5614a6a15f66
 MISC metadata.xml 400 BLAKE2B a9f06ebe35c874d15d1a6608e8398a79480b24cc0ec1b7a45db8c8d18aa24d26817c47a62ad13fba1f32286699749679568b75593c0909dd2ef5785450b379f2 SHA512 530f9e294ab4481624cd9757d67a9e8a67dc2a023002a7f312de619bf05bfd1a06c30ecebd0606f76a1dbe37176697e990867c95de9f411b7631bcc341192e93
diff --git a/dev-python/theano-pymc/theano-pymc-1.1.2-r1.ebuild b/dev-python/theano-pymc/theano-pymc-1.1.2-r1.ebuild
index 4d6177238299..6f1edc13d6e8 100644
--- a/dev-python/theano-pymc/theano-pymc-1.1.2-r1.ebuild
+++ b/dev-python/theano-pymc/theano-pymc-1.1.2-r1.ebuild
@@ -17,7 +17,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 RDEPEND="
 	dev-python/filelock[${PYTHON_USEDEP}]
diff --git a/dev-python/tox/Manifest b/dev-python/tox/Manifest
index a165c1dabf12..5317033f5a7a 100644
--- a/dev-python/tox/Manifest
+++ b/dev-python/tox/Manifest
@@ -1,9 +1,7 @@
-DIST tox-3.21.2.tar.gz 301587 BLAKE2B 81d19e45a1d53000a2e9f956ed7b934f0f1926b4270ddced997ddc8b77a1f05388e0907d379dbabaafd5e6fdcd7031d5e87f206fff385759318a89a5f3eebf58 SHA512 beb551f49af1f8661931f241cf73fa77a37a8061ade7d41b415a2fcecd4d5dd1ba7d3e3add248d3bc14627468fa896f3f4f532305bbc36d112d226b1961fd191
 DIST tox-3.21.4.tar.gz 301889 BLAKE2B 166864fe9f44fe01d3b36481ba63738d4290bb609c6ea7e3dde3494ab7ba009c31b12c0801f5be9dfca6f56059f94438cfa31bc45dec862afda5bea763e37be0 SHA512 de12e8ba0f3287be2fced61573b3e2dfdf8513a947724982d0e17ff215489994985067692c94c499047a8b0e2dd843e214e958367199bfa6e0adcde4e09b8106
 DIST tox-3.22.0.tar.gz 302088 BLAKE2B f9ef6feb9fa438b668f6a1b6f8846845f1cfcb0826ffacc04c52dfe0a968a7df2542acc8f4a1e69c634a7866672dbb78ab8f04ba7d6e94f88b40f6c3dd042571 SHA512 d96c31c9faa4d76a6181ce332e70ec9ccfb0a6b96feff45793393f3fd2d08668fc6f14da9164947c4b93f371fab3b9d23c87b38dac89ece18e87494ac3a7caac
 DIST tox-3.23.0.tar.gz 303091 BLAKE2B 609e74ea354ca5daf45c848000961782fcef59da07f815292355d72f3e5dd078e3b5909a65521a4a1032fa2bb9481fdab0e620f4882b33aa377de9764296761c SHA512 fb96cbbdbd36399036d348716f1181285184985922e0dc61b610b36e53ea79e2d8a77190aad893650bcba86ef4c57ff0f2de2813becb2a12fe0d1aa36bb27ad3
-EBUILD tox-3.21.2.ebuild 2422 BLAKE2B 8e63cd0e826190ac010e09469d9c442628089f28fde6eac674e552cdc1a25d815679a79cb6ae253ce95f4747d8e5ef7f6f69de25c1354b639c11ac48ede2d6d6 SHA512 2ff7614ed21a4ed9f81f0a2323cf2095999462d0c629b824cf126bc5767a055b2044a7b947a5944e75510da1430e916a0f419c0126d518680db7b0caf71c7a32
-EBUILD tox-3.21.4.ebuild 2429 BLAKE2B 06ac31886c70251412dddcaf63f5bd9f837681979e3dd9d512b3a55fbefe320f3fda4811c18e9c2a7a2f1c4f52622afeeea1f7d53edad36521ae1e219d312b70 SHA512 1dac1d24d32431046d99e954f9e04b512d4a3332874a1ae6fb875204e85bf72a62cfba3aa267f690ad1e102e488e1d96fe488006583ba2a0399f359018e4f79d
+EBUILD tox-3.21.4.ebuild 2422 BLAKE2B 8e63cd0e826190ac010e09469d9c442628089f28fde6eac674e552cdc1a25d815679a79cb6ae253ce95f4747d8e5ef7f6f69de25c1354b639c11ac48ede2d6d6 SHA512 2ff7614ed21a4ed9f81f0a2323cf2095999462d0c629b824cf126bc5767a055b2044a7b947a5944e75510da1430e916a0f419c0126d518680db7b0caf71c7a32
 EBUILD tox-3.22.0.ebuild 2429 BLAKE2B 06ac31886c70251412dddcaf63f5bd9f837681979e3dd9d512b3a55fbefe320f3fda4811c18e9c2a7a2f1c4f52622afeeea1f7d53edad36521ae1e219d312b70 SHA512 1dac1d24d32431046d99e954f9e04b512d4a3332874a1ae6fb875204e85bf72a62cfba3aa267f690ad1e102e488e1d96fe488006583ba2a0399f359018e4f79d
 EBUILD tox-3.23.0.ebuild 2429 BLAKE2B 06ac31886c70251412dddcaf63f5bd9f837681979e3dd9d512b3a55fbefe320f3fda4811c18e9c2a7a2f1c4f52622afeeea1f7d53edad36521ae1e219d312b70 SHA512 1dac1d24d32431046d99e954f9e04b512d4a3332874a1ae6fb875204e85bf72a62cfba3aa267f690ad1e102e488e1d96fe488006583ba2a0399f359018e4f79d
 MISC metadata.xml 381 BLAKE2B b690863c744dafd1aed2f7ef7b648f3abbebba225bfd14b0c977ba3def34f59a23a07d04dab8ae42d494db7ecfd8b89d4b011200e7ba4f36ecc1c81c3ae67e37 SHA512 620820cfdc3328e19da1b0e7b4db2967510de45e1fba55173474d6b0631b785ebf7e8f1441fc8411a101403fbbc0cad1f919e89563de1939cce66436546a9cbf
diff --git a/dev-python/tox/tox-3.21.2.ebuild b/dev-python/tox/tox-3.21.2.ebuild
deleted file mode 100644
index 78e1824c9517..000000000000
--- a/dev-python/tox/tox-3.21.2.ebuild
+++ /dev/null
@@ -1,76 +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_{7..9} 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
-	pytest -vv --no-network ${deselect[@]/#/--deselect } || die "Testsuite failed under ${EPYTHON}"
-}
diff --git a/dev-python/tox/tox-3.21.4.ebuild b/dev-python/tox/tox-3.21.4.ebuild
index c21ec8453e95..78e1824c9517 100644
--- a/dev-python/tox/tox-3.21.4.ebuild
+++ b/dev-python/tox/tox-3.21.4.ebuild
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86"
 # doc disabled because of missing deps in tree
 IUSE="test"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/tqdm/Manifest b/dev-python/tqdm/Manifest
index 893bfaf62c80..e45deb3cc359 100644
--- a/dev-python/tqdm/Manifest
+++ b/dev-python/tqdm/Manifest
@@ -2,8 +2,10 @@ DIST tqdm-4.55.2.tar.gz 162632 BLAKE2B 02e49f442c8d5ad3799de143dd8a188796293253e
 DIST tqdm-4.56.2.tar.gz 167040 BLAKE2B c1754cb262977688365c6bf17ec6b6ec31704cdb22aaf05261653c4c9609bdbd16863a15f58a7fe0fb2c0983513b091be55dbca48a0a7b1177a4d017d6800ce0 SHA512 8e7ec199c43a3cdb69bdbfaaec33c11ce8b337255eff4ae6af9928c2a2c5adb065698538562020c9f0a29a63671cbbfcf2c4c9ccb25bec0ec1d8ae8df66516c3
 DIST tqdm-4.57.0.tar.gz 167590 BLAKE2B 30852febdcb69d1f0c6a7416ec7611a79896d643e18c658bb19e52196b4998d8ff9ef708c92d09d9804d8c0210b378dc8a3d58ef2b788a65835cd95ddf3406e4 SHA512 5393ffe6cbb5b41a3c51efdd14169936fcae9dd635b7a35d64f44157f2c855914dbd5c8aa933c4830a16867c83a73c0734e0ebee548392d2c73cae4e6aba531f
 DIST tqdm-4.58.0.tar.gz 167844 BLAKE2B 9a28aa91b330714f6f4d178ca793f9bc1ce5988417b38dc5a9af06c36b8949d0f23de846bc1fb87f7dac2a3b09028c4d216659f84a8ce2125de0a7870d8bc4b4 SHA512 a97a7fc1d5a181d326e91bd017cf9737fd2322f375b8efe5e53c8e49c7986edcdea39086f5057a6d2584a16e2a45b5a679055ba08c83d813fff0a61050b71b45
+DIST tqdm-4.59.0.tar.gz 168620 BLAKE2B 0e3467c777d36bcfaa9f004a587bff70f171cfd7ecdca46d3a6f894afa3694873b7c50c860da31b0147f3233bb419e0c74762797d64e79b938bea813f8a38b92 SHA512 be7ffe2f5e28dd2c653fdafd26cdfab6c89f1fd257420f9ab47460230318183b4934370261d7d5939d05f55b907e2d3982cbef078d372d9a4167e1df42c895a8
 EBUILD tqdm-4.55.2.ebuild 1231 BLAKE2B bc9ca1ef772b1b2c5ce796e0c80e1c4e202ec0cbc77fe37246230ba1eeb101c54a65c62a5e784b6390e18f3bfe081b98c57a77e981d3a1732a94dddbb6f081d4 SHA512 5a4eda4aa40484068c823a976a1b65e906f44c8616265683463586a2d202183c8f038a8b04c90e041fc21f358c9402ceac2fd4063155bd91510d0e18ef8912b7
 EBUILD tqdm-4.56.2.ebuild 1239 BLAKE2B 4c4da34cec6f736174ac62151c84cebb692e8c9624ad7dd2b2d65fcb7fb3427d033b1e45cb6ae4f8305e85aeb76f281bf1cb171ae5e9ba976c843f656995e26d SHA512 062b481740c2d84e64073feb1e3e202cfd967ab07ac8736251edd9d0407c0f2ab6d9343b851c0215f9bfeac7e9b23f925bf745a37e20a14d0dbcc57f5a8e20d0
 EBUILD tqdm-4.57.0.ebuild 1239 BLAKE2B 4c4da34cec6f736174ac62151c84cebb692e8c9624ad7dd2b2d65fcb7fb3427d033b1e45cb6ae4f8305e85aeb76f281bf1cb171ae5e9ba976c843f656995e26d SHA512 062b481740c2d84e64073feb1e3e202cfd967ab07ac8736251edd9d0407c0f2ab6d9343b851c0215f9bfeac7e9b23f925bf745a37e20a14d0dbcc57f5a8e20d0
 EBUILD tqdm-4.58.0.ebuild 1239 BLAKE2B 4c4da34cec6f736174ac62151c84cebb692e8c9624ad7dd2b2d65fcb7fb3427d033b1e45cb6ae4f8305e85aeb76f281bf1cb171ae5e9ba976c843f656995e26d SHA512 062b481740c2d84e64073feb1e3e202cfd967ab07ac8736251edd9d0407c0f2ab6d9343b851c0215f9bfeac7e9b23f925bf745a37e20a14d0dbcc57f5a8e20d0
+EBUILD tqdm-4.59.0.ebuild 1239 BLAKE2B 4c4da34cec6f736174ac62151c84cebb692e8c9624ad7dd2b2d65fcb7fb3427d033b1e45cb6ae4f8305e85aeb76f281bf1cb171ae5e9ba976c843f656995e26d SHA512 062b481740c2d84e64073feb1e3e202cfd967ab07ac8736251edd9d0407c0f2ab6d9343b851c0215f9bfeac7e9b23f925bf745a37e20a14d0dbcc57f5a8e20d0
 MISC metadata.xml 604 BLAKE2B 574eef287a9260a1c115d2e8751c417962cbc09fdd18c68b189898974c8396bc7fab56fcb71a067477e0701916cc9e4dd6701d19e86e62027fd8a34e630b3f17 SHA512 d12b1ccb6601676fcb18122a94d0f397ed1d411a8f8a40d32e595bf36faa08d5a9aeada278c471f063ea75605d7657f6697c2ed45ccc658b9e7f57a0114e7982
diff --git a/dev-python/tqdm/tqdm-4.59.0.ebuild b/dev-python/tqdm/tqdm-4.59.0.ebuild
new file mode 100644
index 000000000000..0bf4e4570b83
--- /dev/null
+++ b/dev-python/tqdm/tqdm-4.59.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( pypy3 python3_{7..9} )
+
+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/translate-toolkit/Manifest b/dev-python/translate-toolkit/Manifest
index fa55b862f3aa..4e6ecb6da75a 100644
--- a/dev-python/translate-toolkit/Manifest
+++ b/dev-python/translate-toolkit/Manifest
@@ -3,6 +3,6 @@ DIST translate-toolkit-3.3.1.tar.gz 5969914 BLAKE2B 2ede440a341be0bd0206400d01ba
 DIST translate-toolkit-3.3.2.tar.gz 6123347 BLAKE2B 9bf5f2c84d15043d25744b3bb63526177748c7c38425bd73ad34dcf3b4051c11a3ce28ccaf5c907b6ced27d1fe9ecb06cfde46481a609df64adfedec83b91680 SHA512 53baf7c1203c27335201fbf339e2747d7b22696c219e6911c191b3c89cf6d1c0d84624ffa8c4c687e45fad229d3cb09f52d15d1d80dd914ccc8e2fff34a601be
 DIST translate-toolkit-3.3.3.tar.gz 5903525 BLAKE2B a21c5d89c808615ff2f3f718e732ce5d5591a9d8a997950ae1066655cc3e4382065f75e7a86f8e37bdd0e146283f9bd941ff20479cb1af635f393e0e7f8fc196 SHA512 41964dc26dfbb983b1c2e4cbb0e9d8eb2a035369a94ef872f7703080b5ca0280a9364916a1e1256cd358b263bc72198e767462cc9065b54556fc481d1b85a836
 EBUILD translate-toolkit-3.3.1.ebuild 2865 BLAKE2B 241cd7c4edb1c7ac600d0b426510eea52e85eef01318b3453afa9b9f35cd77e23c79b93e1566e16b2a4fef07a71d1c1d4e68edea50e9a96e8ce817e76cf0cb34 SHA512 33c174b4ed4d7eb7563ff060324971da0e39cea92bd59e35291aa787bfbc8df805ae4f020c44fb6a74d063d715409f44535b10c13b2c2ae2667568192c21d95d
-EBUILD translate-toolkit-3.3.2.ebuild 2493 BLAKE2B 92ad7246f6192f7d33910f9c23e3867ca63cb34df29321b50a6dd167fec4d9ef491619d6440454fe9ecd6ceb21f403f3e1ecf488f4366b74a304278d38cf01eb SHA512 ccf2dd92647343bacbc27a641607c3be94d22836c6ca22066ab13377829914af37093c37f0c40122e28a2a1416c26a05518b5657fd3d27166264792061af830e
+EBUILD translate-toolkit-3.3.2.ebuild 2491 BLAKE2B 7ad339b2a37e1b74108560616ceabb9c905f6e5e66ad1d3478f51152216f1b9da462d6dd7435d72f2069930164f7d44bc94e5cd774b4af55c51b3a858ce8d951 SHA512 5b7f8d55e330e34157b721a17c65a45811289964dff369af62047ecd19e4c48d6d6dabd495fa32e1ca29a65706c53418cc599ba77ebf5679bbc9d2ea076ba214
 EBUILD translate-toolkit-3.3.3.ebuild 2493 BLAKE2B 92ad7246f6192f7d33910f9c23e3867ca63cb34df29321b50a6dd167fec4d9ef491619d6440454fe9ecd6ceb21f403f3e1ecf488f4366b74a304278d38cf01eb SHA512 ccf2dd92647343bacbc27a641607c3be94d22836c6ca22066ab13377829914af37093c37f0c40122e28a2a1416c26a05518b5657fd3d27166264792061af830e
 MISC metadata.xml 745 BLAKE2B fada3477df5ccc4e5f6036d8d60f948dd4c015ba9ea4e0c844526a43bddf469378e3601a6f5652f8e4f7fe88e65beb82e3dbd1f171c1e7fe83794e91ac7a52ac SHA512 314825d2d8187ebce4e0fb63bed639dfdcb8455883eff29e75cfce963e200371bd38de86190e7051d0950c60befa2115cdcb8630313774946036b693b3c51106
diff --git a/dev-python/translate-toolkit/translate-toolkit-3.3.2.ebuild b/dev-python/translate-toolkit/translate-toolkit-3.3.2.ebuild
index fe65fd0c9450..db64c6cc4c27 100644
--- a/dev-python/translate-toolkit/translate-toolkit-3.3.2.ebuild
+++ b/dev-python/translate-toolkit/translate-toolkit-3.3.2.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/tree-sitter/Manifest b/dev-python/tree-sitter/Manifest
index b3c4f636bc9b..d8a40285210d 100644
--- a/dev-python/tree-sitter/Manifest
+++ b/dev-python/tree-sitter/Manifest
@@ -1,7 +1,7 @@
-DIST tree_sitter-0.2.0.tar.gz 110387 BLAKE2B 62bd0cac84626738c051a16a6e1d8bf18985850e9c0174794d060e09f289edcf5e6183da28ab3805713b7d55d63c2210cc0e53d022689b46a3770243acf08937 SHA512 1b5c1dd8855de00357b5e8fc9dc3cb826c1cd10bec499b2db26f50fe2249a9848e1641765ee9717c8eae88b8d091f0de79cdfabafdecbe8e666a05f63fefe4ba
+DIST py-tree-sitter-0.19.0.tar.gz 112342 BLAKE2B f64db1bb078bd7b4a9b9e9c93c5eb449b9833870914ae5489dfc9d232c6f43d1779a5e9da47457f3152faae6997062c0a989893255bc66ec4747918342610bac SHA512 c06e921aa1a2fde97612fcbde61f0baa92730d927798076b3b6476bc26a84529d8a3299f4d4092ee85af84824c5d4444bf0800fe3cf1d15c66bcb2bf49a430e8
 DIST tree_sitter-0.2.1.tar.gz 110417 BLAKE2B 263f47b9c8beab4b99fbfeb40521467f7f507ead77b20eb1bea7d6f076398d4f0db02299290a552aaa35959dff4a87866d010d628269e64cebeb06d86856fdc6 SHA512 72fd602689a78f51184820fb15891863873f8b290811152ea568cfa6fbd2d3f182ae8627f028c8d485d0e9bbe7b81a9d6ed57e7a8b551ba38f8dd738fb7c858a
 DIST tree_sitter-0.2.2.tar.gz 110585 BLAKE2B 2798469b65bdc2447697797f937242dcfd2fe0dbb0afa7a41fe05463ec6c93afa63b26ee4e3e65585b57a2592ac444c2522469472cb0562f313f1261c358e5b3 SHA512 b32d7e3be408eedf52b53a5ae7613b3c423eb84d175d0fb31d63c052c2c4d3a7539b53d45276629a2a02c460289e877efa519c2055cdee477e23fe50cc452892
-EBUILD tree-sitter-0.2.0.ebuild 499 BLAKE2B 55744148da398f8871c869a4d3e8cae5cae12fc057689d15a6691d5fbc70615496f8b4411181adffe681f4cab32032feb0c94dfa1f3144040a61d4232a852cb8 SHA512 364a37e0857a9698a7b97e73d5757e6e2f6d929d769168d8329cd116827af84837e2e407304838ca44b7a2b82beb5e971f8327c111452a816651f504d9eac453
-EBUILD tree-sitter-0.2.1.ebuild 544 BLAKE2B 9ea6fd5fc0bc0a3b27c1ee637b34b15f54b645e8d4baf4bc3cc545ccc76411d22ccb14898dc59a310bf6f78664042bd8c3a926ed3adf46767c9da70920bcfa05 SHA512 b111a5a3903fb846d1e3e0b54c659aac6c87311a590f0613d60c83a67971a7c04671584c527b66dad43f0cb6f5f9d706f9deabee8d8a16a3d06e1b752533e1a4
+EBUILD tree-sitter-0.19.0.ebuild 567 BLAKE2B 6fd61083f9ba8e7466fd3da1244fce610bda372ee03ef5f77ae6ba17d2ce2a30c40a5d9fdea22d9424eeb2b39ec92887cc9f9b62d33c48065d4bf671a8f77030 SHA512 255574fddfdc4f63737ec3b231fd45aa629952c1ab2c9639f9d189196599966969138a1dd567f4cfa95f6a39d34053800b994d15e2269b8bb69d2b9a0b9fe0dc
+EBUILD tree-sitter-0.2.1.ebuild 543 BLAKE2B 351e3b054370ca42891b610933ed42997ddcb65e92accc84a7a4b1221f51caff54e76f7efd391738a24173f8207f68da78a456f041f29659f74b295eab566039 SHA512 3c62dc7df641bf32196be756fbb08352c8daae9e8fda39a5c60a819c98d9f12bba5289d7eb132d05cfebc10b1e793f73e856aa165209f9700eebaff881fa7359
 EBUILD tree-sitter-0.2.2.ebuild 549 BLAKE2B 9fe8a70cf46d813d37a63689a4895884998933a4e28d48ec9331173df1f68a0e61f8378b22d8c0ecaa08ba6f7b940eb92c981abb2ba6cab10e37ffff716569d7 SHA512 18fb5537c3571a9e5abf9c94ae81149755b4df19d8d97e07aee0380d30f4c64ceb44781a5d305873a6aeeda3ccc089562fc507618a899dc7852da2b4210dd7ae
 MISC metadata.xml 392 BLAKE2B 5359a33b220d2104d9a0e09ff6ee637c93dbbd3601d1004c194af9cf04ad46f9639f9f91b60576812847c2eb6b8c6988ba5fb3fac73ab30d81a0533b532c4490 SHA512 6047bcd144cd23f16232e5140c817e00af555f4c7b470b3492015e28042536015d64c2e19534a9c62fd4e869cdaca0fdcfcc30abbda034bf423f7ec72e909756
diff --git a/dev-python/tree-sitter/tree-sitter-0.2.0.ebuild b/dev-python/tree-sitter/tree-sitter-0.19.0.ebuild
index c9c145ecfa31..db8a7bdabd25 100644
--- a/dev-python/tree-sitter/tree-sitter-0.2.0.ebuild
+++ b/dev-python/tree-sitter/tree-sitter-0.19.0.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
@@ -11,10 +11,10 @@ MY_P=${MY_PN}-${PV}
 
 DESCRIPTION="Python bindings to the Tree-sitter parsing library"
 HOMEPAGE="https://github.com/tree-sitter/py-tree-sitter"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz -> py-${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
 
 S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/tree-sitter/tree-sitter-0.2.1.ebuild b/dev-python/tree-sitter/tree-sitter-0.2.1.ebuild
index 329b00cba76a..4204b16be7c6 100644
--- a/dev-python/tree-sitter/tree-sitter-0.2.1.ebuild
+++ b/dev-python/tree-sitter/tree-sitter-0.2.1.ebuild
@@ -15,6 +15,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 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"
 
 S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/twisted/Manifest b/dev-python/twisted/Manifest
index deb8a8b56264..9560f0b9e408 100644
--- a/dev-python/twisted/Manifest
+++ b/dev-python/twisted/Manifest
@@ -13,5 +13,5 @@ DIST twisted-21.2.0.tar.gz 3882978 BLAKE2B ba37572b0f9eadf2962a2730e4c2c0ed65f58
 DIST twisted-regen-cache.gz 911 BLAKE2B ffd3fcda6c67ffe6fd3ef581c8d507548396b66ed0708e9a5c790095e579c0d5f0f71596acf05712989da2ddef2b8d437eca973bc4d80ef8a9fa852915f38305 SHA512 95a9b931c73017d16d1b5e6b41345dddffe62b6af1a8e93b5e40d06d3d15be17b0dd0181c767ffeeb791534d463764ef9e066fa6c2ee2ac4b53c86d1da8fce03
 EBUILD twisted-19.10.0.ebuild 5777 BLAKE2B 163fac4a0cdc830f9be404a69c43287f8594f2a71dacee4d4b37a56e5fd140c060b1a3e765e63bcd4b1a4fefff0bb30a1df007b6f7ad0f01adb0b6ad8f1687ee SHA512 124513b07e486caf4655534cfa0fd3c34facce3f16fe42977d41f2fcd7fa032e3dfd0ea85cf461941539ca8e0768e015809f33c798e49582aaef657aa02ce499
 EBUILD twisted-20.3.0.ebuild 5611 BLAKE2B 598bfa6c58c1acae83610bf1472d49ddf65ba75689e7c76eb356af50b1c786b5201dfb696afc7ab0ac0439878e2119de9f359250d2ba373de146ebe9edb5b37e SHA512 bbebee3ed4a72f34d346dbc38141f2a461b61c3d3a8ca99be711d16ee10a8759aaefc9f780daa0ee2dca589b4f273fb47c69b6b694c19a437ea3ef94d3ca2d14
-EBUILD twisted-21.2.0.ebuild 4690 BLAKE2B 0f2800074f941cb6207ac806a3000fff80eeb22cd51628f4495aa6c0755da571d986528c482ad501244562ccbb0e42573edc4ce9f9bc9752f68edd6914cbfed6 SHA512 3d1ac6a97aecf00a0d10c7e065aa81399654b9d106e1a8e10e6ecdd124f03d62cee92d16d20a42552119319109225518b939c456eab739c3185644756195d0c9
+EBUILD twisted-21.2.0.ebuild 4704 BLAKE2B 3034fdbdff9136be6c1cc398b4dde6bfff1242bbac8eac7c2c8e6e6e03b84e5f9c1c039d2712d07c19c44ff9373cb5d1193b4966892d920dfa0087523a6418e7 SHA512 f715f1fcdd397080fb3fe44bfac28ec17a67adefa3b5e2066a2fadf0bfdc40df6fc76c662f01a8811c67b16b313a2f1be96f21dffa9f50013e5fa9a61ec7501f
 MISC metadata.xml 1351 BLAKE2B b3a4ccdc922dd4aa902b24b2545f3cc5517b2842c92f1195e8eaa2a8b62558c1ea86059cc23b9ad6a8e6093216a11a01f46360b5ba259e5eadcb351ad3bc0094 SHA512 403d692122913d079c5a93cb5b226f33316776360663a171cd757584d219d0789b24809c9e65840aaeb63eae4cb7cc79258757837abb1e3dd92536369fff6604
diff --git a/dev-python/twisted/twisted-21.2.0.ebuild b/dev-python/twisted/twisted-21.2.0.ebuild
index 8d9934638c13..4dd4707c1690 100644
--- a/dev-python/twisted/twisted-21.2.0.ebuild
+++ b/dev-python/twisted/twisted-21.2.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~sparc ~x86"
 IUSE="conch crypt http2 serial test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/typed-ast/Manifest b/dev-python/typed-ast/Manifest
index 24b669c30e1b..7aed870ee628 100644
--- a/dev-python/typed-ast/Manifest
+++ b/dev-python/typed-ast/Manifest
@@ -1,5 +1,3 @@
-DIST typed_ast-1.4.1.tar.gz 208587 BLAKE2B db874caf459cb73345305051a7c4e97244e92b28e94e82f59b38bb91b7c6c69a2531a81c84d483eca8d641bc947f6aa1b98ba59cd880f7560fbdec55bce41787 SHA512 a3154fe723aeadf998694aba0faf516e5b9abb876e4c7d91843b3694474ff6911b3e77a6cb7366cfa8e5a573b331906b6a0b134b25627aaba0dcbe92c4e25590
 DIST typed_ast-1.4.2.tar.gz 208583 BLAKE2B fb94967409c073b3390a133232259605aab0ee893fe53deb0e97a07c814b1c2021815beab4fa680653f75a44b53eb3f02d7c9e330cf51195c2dd668762c9e0be SHA512 9a46f2a4c48bd267445a773463771824be958dfdd1a2df21356d0a763ee2029b51d5b0fddeb16df202f89ba86019640ab45ba520fdad5c550250fe2a135605fe
-EBUILD typed-ast-1.4.1.ebuild 584 BLAKE2B 612d3dd28ebe656f5c8db2db64fd75c6e770be74f11d3d3992d2b0cd9a327fe0349b3258815a4243cd574bc19c9d9f170ddaca606c063856d2386bafba48c921 SHA512 69169841fccdd19dcc35012da4efb4877e77e23bc6291851c4b7224a133594f05cf5519938121a34990f420d1da5cb26da2f5982235baa45b0d45406b7b93c03
-EBUILD typed-ast-1.4.2.ebuild 585 BLAKE2B 190fb312f96aaff24d179d5698abf167d729f5df2fa5096d7b42c51a1121dfb589a34704bb4c64e6a790e31697bc395952fd2a990e726cb77550f9456293a8f4 SHA512 d1873b8dc563f4ef8a1d9979fc50b52b2660335eb7625f29385d99c9392d9a3931cf550fe64042d2bff0fca5ab0eb0e29268966209965bf14784e5589f05b4c1
+EBUILD typed-ast-1.4.2.ebuild 586 BLAKE2B a41f92c8ead6ae02c072a03df1150e08f711cf5c781c2c5cb88aeb9bee8fcd32e2bb5e5f8840adc19e4928848bd8b195a4f6e31ba154eb8d792151716c50578f SHA512 ce1c9be302de219b26d48c5a1437c19ff2512957d4d3abfba23410f95d6db67a1a91408d3b6cbccb667f38f24420f50be8165bd1f97dea20c550928aa2fdb8e5
 MISC metadata.xml 368 BLAKE2B 857d763576c4a8d9d13016cdb5c18b5bf343012143e58356e823dbd40e0899e2b31cabdbadedd7958b45f7fd6c2cfe47995b2f8262bcc596047f15375e3807aa SHA512 e72d87878400135962ad878c3bb8f44b267eb0c733c88a1f53f3459744a173a8b7fab2be08a3eb33867dbb2dbabcbb023e9293bf00aa2ac8beb2951a1e334009
diff --git a/dev-python/typed-ast/typed-ast-1.4.1.ebuild b/dev-python/typed-ast/typed-ast-1.4.1.ebuild
deleted file mode 100644
index 41ff7b3d3b4d..000000000000
--- a/dev-python/typed-ast/typed-ast-1.4.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-inherit distutils-r1
-
-DESCRIPTION="Python typed-ast backported"
-HOMEPAGE="https://pypi.org/project/typed-ast/ https://github.com/python/typed_ast"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN/-/_}/${P/-/_}.tar.gz"
-
-LICENSE="Apache-2.0 MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~x64-macos"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/${P/-/_}"
-
-distutils_enable_tests pytest
diff --git a/dev-python/typed-ast/typed-ast-1.4.2.ebuild b/dev-python/typed-ast/typed-ast-1.4.2.ebuild
index 232974126516..b4dc7f7e211a 100644
--- a/dev-python/typed-ast/typed-ast-1.4.2.ebuild
+++ b/dev-python/typed-ast/typed-ast-1.4.2.ebuild
@@ -3,19 +3,21 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7..9} )
 inherit distutils-r1
 
 DESCRIPTION="Python typed-ast backported"
 HOMEPAGE="https://pypi.org/project/typed-ast/ https://github.com/python/typed_ast"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN/-/_}/${P/-/_}.tar.gz"
+S="${WORKDIR}/${P/-/_}"
 
 LICENSE="Apache-2.0 MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~x64-macos"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/${P/-/_}"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~x64-macos"
 
 distutils_enable_tests pytest
+
+python_test() {
+	cd "${BUILD_DIR}" || die
+	epytest
+}
diff --git a/dev-python/unidecode/Manifest b/dev-python/unidecode/Manifest
index 62e9d19092d0..68cb5ca279f1 100644
--- a/dev-python/unidecode/Manifest
+++ b/dev-python/unidecode/Manifest
@@ -1,5 +1,3 @@
-DIST Unidecode-1.1.2.tar.gz 213644 BLAKE2B c4a9ecb441eb05800d931ccd43843d19ae07f74829d43bc3c24462955e8872f4edf4bb9b3909fc5155b13676b8d255848cdd90772a88cd453152ca13af0d3fab SHA512 8ee45ae05064612638ecbaa4eb74759580e5ea5cba9f3116b8e63db4af13affc266c7a07aaefbbd70b50ead7e483a72d7676c64e20b5bee2a6ba831aaccd6748
 DIST Unidecode-1.2.0.tar.gz 216042 BLAKE2B c63a192bfa726a9e91224e73a42236088de0b39f34f3f6404eec1c3adfe6512e843ce1f75dab32456ce6be4d938b0b8acfc1e6243c394dffff7d4d47d07d0905 SHA512 aedc16be1b676dbde7e45444e297be916b1ca2874a76f07316e2df3aff9687dcf73def24b2441e147c94641f4407cc745ac35937508e09c670f8aa1473977859
-EBUILD unidecode-1.1.2.ebuild 582 BLAKE2B 6c775d1505a7ac027e68639a94ede19d495a64b15ab40e9d1a18a0129f95c13a7f4cc1d1fb22c36170bed4c58087ec681ccc858f88fa40158428d272d7b48caa SHA512 2aca9446fedb1ceacab2ac07b463de63fd05f4c5277512a46a475f33bc757700360de0683c613728be6594042127350b3646d0fe82af55ee1f2b1ebb4bd830af
-EBUILD unidecode-1.2.0.ebuild 589 BLAKE2B f4c4e92f62290262fff9ace3ccb32ccbe2a8b9740f841bf14d3b51db12170e51f1a7998d19c70b58a8b25f6f6c246c4feccddc57c1b3757146ee4f25918ff7e7 SHA512 2b5aa9aa5432d2da3815ec198e6d64d925be0e6da41cec15ea72ff25fc7086ea4ea768d4f8851f0ea84e72557d1a91a67196bb0cc70fca343f2ca595f42da840
+EBUILD unidecode-1.2.0.ebuild 582 BLAKE2B 6c775d1505a7ac027e68639a94ede19d495a64b15ab40e9d1a18a0129f95c13a7f4cc1d1fb22c36170bed4c58087ec681ccc858f88fa40158428d272d7b48caa SHA512 2aca9446fedb1ceacab2ac07b463de63fd05f4c5277512a46a475f33bc757700360de0683c613728be6594042127350b3646d0fe82af55ee1f2b1ebb4bd830af
 MISC metadata.xml 456 BLAKE2B 7e83e494d3d8a8626be4f4e3045cd2b2b4a23d6866d4786d2d33f40a192efb08d5db59462fb2fae4db0a721f323ee5002ca5ea1d77766c6f904533da12882cbf SHA512 e797d601b472cd2bdcac5c1053e38f8e88a8fc59a971db8b65be326153ea0b2fda5e340050560efc954f751ab7e56629fae0205277f95b5384af2139094d8f9c
diff --git a/dev-python/unidecode/unidecode-1.1.2.ebuild b/dev-python/unidecode/unidecode-1.1.2.ebuild
deleted file mode 100644
index df4537dad3d1..000000000000
--- a/dev-python/unidecode/unidecode-1.1.2.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=( pypy3 python3_{7..9} )
-PYTHON_REQ_USE="wide-unicode(+)"
-DISTUTILS_USE_SETUPTOOLS="rdepend"
-
-inherit distutils-r1
-
-MY_P=Unidecode-${PV}
-DESCRIPTION="Module providing ASCII transliterations of Unicode text"
-HOMEPAGE="https://pypi.org/project/Unidecode/"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${PN^}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 sparc x86"
-
-distutils_enable_tests setup.py
diff --git a/dev-python/unidecode/unidecode-1.2.0.ebuild b/dev-python/unidecode/unidecode-1.2.0.ebuild
index c75c5fcd8214..df4537dad3d1 100644
--- a/dev-python/unidecode/unidecode-1.2.0.ebuild
+++ b/dev-python/unidecode/unidecode-1.2.0.ebuild
@@ -17,6 +17,6 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 sparc x86"
 
 distutils_enable_tests setup.py
diff --git a/dev-python/urlgrabber/Manifest b/dev-python/urlgrabber/Manifest
index 002d8184191e..50c2b35beaf7 100644
--- a/dev-python/urlgrabber/Manifest
+++ b/dev-python/urlgrabber/Manifest
@@ -1,3 +1,7 @@
+AUX urlgrabber-4.1.0-skip-test_range.patch 466 BLAKE2B d7035794c6beb47e7ae13e7914f5eb067e71d592b14100c04a67102c98351d020cb3949fcba79521245189c139b3eca36403ad23c2692043c20db3b4e2bad66d SHA512 f952eb16eb93b4a61826c36c8265b01d3084144dcb90aa274c3fd22ce837ef58c84a5cf7b2aae7fbbbab4048ac405b6320ba917cd6f181ccf3875bdf81f3c6be
+AUX urlgrabber-4.1.0-test-mirror-set-thread-daemon.patch 406 BLAKE2B 0b37cfa8eccf790fe0dce89f8c6cc5f9241f9c6fbf11d339cee72056387aa5444f811b3ce62e83311499effd93d954dc350b3951030b5636372b4c7b41b280f7 SHA512 208812678cc58651294b858071d3b89630f3f539036b1a4f97c5fb99314fb2889240ec9550dcf3d062bca8620049e388c47c9e57ba4beccc3c843a2f69787f77
 DIST urlgrabber-4.0.0.tar.gz 86308 BLAKE2B 15195336d8e19331134b3bc1de29a669b80ab62c14e613fbcbbc1b8be8cb4ee1da3df317591989c6a3e3a403f8ad9071ca866006f23fbadc6283e88d5f050290 SHA512 01579281b1548c71737166daa6dfb7eaafceaf4afd9703f8e5e3193c33613750cb4291e3c7939065e995a173925965a16e656c43324f3b599f9c83d9e479e8c1
-EBUILD urlgrabber-4.0.0.ebuild 535 BLAKE2B 633a59ef8fee2c4c829978758c7d03ec5b5c559566a43aa1cb8fff68b675d8211df2b923dd42e3822ddd24b6ca9126ebb6d5a737ccfbc329010ca7a153c78375 SHA512 cad88565c543d06f3437006f50bfbd0067cdc3b2bd17c55da218fdd0a5d9eb7fa4100eecdfbefd01a9bcb5ea757b43a0c637dc55379e5284b9c12062f7daa190
-MISC metadata.xml 1524 BLAKE2B e00b20c0ec1de78a0b66bbe9293ec25bc3b22813f08c1d6db42e34c83d3fb26bbc977bde9baca5b7011dfa0c4fe94ca82766db569e3181341661fd9b79792e38 SHA512 387b2b964b98573902e78eb92ac214ce8ea8e98809ff63e17f0888163909a4202fbec1f9cf4d7aedfde1b0918fa521dd5db9768804553c1f25403a8261af9316
+DIST urlgrabber-4.1.0.tar.gz 277537 BLAKE2B 3697cb1d08fe0fa8bc83118e1466d76d1b8aa0375fd895d12f5135850bb5100d1d52b1691b2135a80a4937158c5d362e88777ae9ba58790ad88355f13e679b34 SHA512 43e54656d0ca92f616d49cd90dd6282408d64909848e4bf1c74b3b1eede55ba0c9526d6ea5fa9ae18545b806ef9965130ecf1cb1f5f05d4611db974d3f2aa200
+EBUILD urlgrabber-4.0.0-r1.ebuild 577 BLAKE2B ed7feb464204d7f7d8a2c471fe407367458652cf1a169f64201d37be5f7fcf38e1b13b52b641c096a575146cb62f12ea881e6a2122deac45cf685ce691504806 SHA512 bfbeb3c9ce9b8e8ccd05487db4b45b3f3ad2f8619748cd5873f8ff460888c234da76dc8d5177a71d10e967eb06a7051682713b48cc4e06eb86e5a7c2eb9accdc
+EBUILD urlgrabber-4.1.0.ebuild 1105 BLAKE2B 2a4a4561259a267dc0df947596e116352781177ec2186ff22aadc5780210da4a1cff252078f4ee938c24ec8543fe97dad5612230378d80f1d42edf93dc296149 SHA512 43aa7d131fda8d971ce5b440f3d7626b76c431d22a7df87c27f8bc1b2156bbaffc3c3e4636d9180244f3019c78441b2dc1310172984e8c198a573a0776af7773
+MISC metadata.xml 1598 BLAKE2B c43f625ed8c17c5ea79b41a2b0b51ff57e7db27b28010d7e05746ba320ce844d57a250b75b9d0903b538b2610a17b848eae68fae033ad476b5f9c03e6e7e62b8 SHA512 411adc0b0da63882a68ff0a6ae0ac906cfcf568e962bf9380430f22e33b0f378ddeaad0ba535c84754c003001af321e6a0fb39e599fd1effd950d0f7ca10a068
diff --git a/dev-python/urlgrabber/files/urlgrabber-4.1.0-skip-test_range.patch b/dev-python/urlgrabber/files/urlgrabber-4.1.0-skip-test_range.patch
new file mode 100644
index 000000000000..548242fc1894
--- /dev/null
+++ b/dev-python/urlgrabber/files/urlgrabber-4.1.0-skip-test_range.patch
@@ -0,0 +1,11 @@
+--- urlgrabber-urlgrabber-4-1-0/test/test_mirror.py.orig	2020-11-16 06:23:15.874354961 +0100
++++ urlgrabber-urlgrabber-4-1-0/test/test_mirror.py	2020-11-16 06:23:59.674354944 +0100
+@@ -329,6 +329,8 @@
+         self.assertEqual(self.code, 503); del self.code
+ 
+     def test_range(self):
++        # skip failing test
++        self.skip()
+         'test client-side processing of HTTP ranges'
+         # server does not process ranges
+         self.reply = 200, b'OK'
diff --git a/dev-python/urlgrabber/files/urlgrabber-4.1.0-test-mirror-set-thread-daemon.patch b/dev-python/urlgrabber/files/urlgrabber-4.1.0-test-mirror-set-thread-daemon.patch
new file mode 100644
index 000000000000..6d6e8afa6462
--- /dev/null
+++ b/dev-python/urlgrabber/files/urlgrabber-4.1.0-test-mirror-set-thread-daemon.patch
@@ -0,0 +1,10 @@
+--- urlgrabber-urlgrabber-4-1-0/test/test_mirror.py.orig	2020-11-16 18:47:43.724337579 +0100
++++ urlgrabber-urlgrabber-4-1-0/test/test_mirror.py	2020-11-16 18:47:57.724337574 +0100
+@@ -290,6 +290,7 @@
+             self.exit = False
+ 
+         self.thread = threading.Thread(target=server)
++        self.thread.daemon = True
+         self.thread.start()
+ 
+         # create grabber and mirror group objects
diff --git a/dev-python/urlgrabber/metadata.xml b/dev-python/urlgrabber/metadata.xml
index 96c924d2a326..4713699df8c6 100644
--- a/dev-python/urlgrabber/metadata.xml
+++ b/dev-python/urlgrabber/metadata.xml
@@ -36,5 +36,6 @@
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">urlgrabber</remote-id>
+		<remote-id type="github">rpm-software-management/urlgrabber</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/urlgrabber/urlgrabber-4.0.0.ebuild b/dev-python/urlgrabber/urlgrabber-4.0.0-r1.ebuild
index aece0892c4ca..9f714bff38da 100644
--- a/dev-python/urlgrabber/urlgrabber-4.0.0.ebuild
+++ b/dev-python/urlgrabber/urlgrabber-4.0.0-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
@@ -17,7 +17,10 @@ KEYWORDS="amd64 ~arm ~ia64 ppc ppc64 x86"
 
 RDEPEND="
 	dev-python/pycurl[${PYTHON_USEDEP}]
-	dev-python/urllib3[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
 "
 
 # Entire testsuite relies on connecting to the i'net
diff --git a/dev-python/urlgrabber/urlgrabber-4.1.0.ebuild b/dev-python/urlgrabber/urlgrabber-4.1.0.ebuild
new file mode 100644
index 000000000000..aad0b5c7180f
--- /dev/null
+++ b/dev-python/urlgrabber/urlgrabber-4.1.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1
+
+DESCRIPTION="Python module for downloading files"
+HOMEPAGE="http://urlgrabber.baseurl.org https://github.com/rpm-software-management/urlgrabber"
+SRC_URI="https://github.com/rpm-software-management/${PN}/archive/${PN}-${PV//./-}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${PN}-${PV//./-}"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
+RESTRICT="test"
+
+RDEPEND="
+	dev-python/pycurl[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/urllib3[${PYTHON_USEDEP}]
+"
+BDEPEND="dev-python/six[${PYTHON_USEDEP}]"
+
+PATCHES=(
+	"${FILESDIR}/${P}-skip-test_range.patch"
+	"${FILESDIR}/${P}-test-mirror-set-thread-daemon.patch"
+)
+
+python_test() {
+	# Entire testsuite relies on connecting to the i'net, added for reference
+	URLGRABBER_EXT_DOWN="${S}/scripts/urlgrabber-ext-down" \
+	PYTHON_PATH="${S}" \
+	"${PYTHON}" test/runtests.py -v 2 || die "tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/vpython/Manifest b/dev-python/vpython/Manifest
index 386f9c5166a9..632da341886f 100644
--- a/dev-python/vpython/Manifest
+++ b/dev-python/vpython/Manifest
@@ -1,3 +1,3 @@
 DIST vpython-7.6.1.tar.gz 3552831 BLAKE2B 78281ebbdae2bf09d139569cd344f32aa77aad59ce988a72c57b9984774bc376348c6e69c9119822fe1fbd5dbe6cecf81f17da3977b257c64321e4d4f2deb755 SHA512 8a06bf41865a6bb61c6616c853889b24128f32a9ce1eb8cd9ff861e4995f700ea24e7ffc04fd1edf9cd823a1a592083202abecb1373d5f544facc8646f0cf30b
-EBUILD vpython-7.6.1-r2.ebuild 668 BLAKE2B 2a40d6c4d434a0c097e2acf2718e5f48bbb99e2a14d1d56d50360bdfcdcc37bea55d9b103da9edbd08fdf3a2da4fed9ed10489b004394a5091343b9f2f643b60 SHA512 e38bae96de59cd5af18d181fa158f9c36d57429629c0f0aaa6aaba93339084cff9542d10e4cb309a05b1bf31af46fc709816aaa3cd64608e9ac7adc13bc01b24
+EBUILD vpython-7.6.1-r3.ebuild 668 BLAKE2B ddf9e620a85b5425427c348a35642877552b1270ae2994364d7e3e8bd5950aaa0c96f17d77ca715b18283154d0b938805971ea7d2d86fbae8375dafe10c40286 SHA512 160cf59afcc603ca7a179b82a3cc19a8528561a52f9ddb77877fc3c32d8feacaff74a1db6bd7d7199cf81ab53d23f92b8b580d64c8fd4d1cc7821ecac155d709
 MISC metadata.xml 691 BLAKE2B 0478c7a9616036b5790aa415e6367f966086d51088b2780ccd735fe6c6ddbc1ccc53874363355c0b722d4304f0145b2422cbd16471c6a8c24d233654478c5701 SHA512 7d3bfe32e1e803656c00ed920aa67f0d769b3fa96548f35c9f321daf100f42fe0a2c340563345d24066f2eb347d6054e8e6aa47adae799cc12316a680236a5ed
diff --git a/dev-python/vpython/vpython-7.6.1-r2.ebuild b/dev-python/vpython/vpython-7.6.1-r3.ebuild
index 0b80bad621f1..1d56387d3f84 100644
--- a/dev-python/vpython/vpython-7.6.1-r2.ebuild
+++ b/dev-python/vpython/vpython-7.6.1-r3.ebuild
@@ -1,9 +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_{7..8} )
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/waitress/Manifest b/dev-python/waitress/Manifest
index 8d62198ad6b7..e9f87835ec27 100644
--- a/dev-python/waitress/Manifest
+++ b/dev-python/waitress/Manifest
@@ -1,3 +1,5 @@
 DIST waitress-1.4.4.tar.gz 173124 BLAKE2B 5521b6c983cb23bc768986e9e8d19e9fd94b1dc632661b0f136cb60176b8c9a81306b8c9604b2a5b4a1a821346cedfcea281f49ecd81686a944f60b387e1cdf9 SHA512 87d57f8cd241e3c88c30a34351d57255dc1388b5ce1bb216e1b94760db09c1f184d20ea5797b20a91bc2cf0815b5067569099f4639291b4a79e885c0ab8a9fd9
+DIST waitress-2.0.0.tar.gz 175641 BLAKE2B 819682a44f388cce3b77d31e5d1fb299db88d41a2a7b01e42d48554bff65c2ba165dae5d1e680cd2a46a1ebe6887f96f8b93d4bc18bd7527a48fd5c3aabab0bf SHA512 c046195431ca31ff5ad74638ff80022d23591a06265d195b82eb320bb20b2b1d2de261db5981a91556af9f9c3b2ad12bf42148e4dfd955ed764d9b3f9a71f058
 EBUILD waitress-1.4.4.ebuild 665 BLAKE2B df2cc401203457d43b1ea7a3df7f363a6b00a57edcaa85d6859639274f720e990cded6d90d1ab21f407abecfb6c9fa2b75d2bb1d0048e6fcb865bfbde4cef7e9 SHA512 164d5df4bf17572fe9e5ee3a220682525ee3430af36f0cc2fee9e08d62fa8a05a6d368f364378f45750c5c1707a61b2e9f5d97ce6d02b4a4f03d35491c8a6d6c
+EBUILD waitress-2.0.0.ebuild 673 BLAKE2B fbb43f2ccd66e21bbeb168580ba648a6fe42254c04e30c49ee50964303500dddb4586fd295a814f539170fcfbc4d6b6b9e06433af82aed194fc9f3063973bc81 SHA512 6865f6f5f7c5bd77cd67a19e44e0b5412be6da49b6e76cd31333381d9bdc8efdc4d131303be5d15c983a3bf126b3f723baecb46a0d17c0c740c5b066673ed982
 MISC metadata.xml 403 BLAKE2B 7fd0afda3d808404b7b7836afbf014eda9746e3ea718bcbc4220b1a9f4d399328eee971e71e1cd3b64a0fab3621f4ce3be8632875bd5489caa7222482a774a68 SHA512 6d59404fbc08bf9bd67845c3febb4075de455b4241c221444831c09231636afb857823b747fc24cacc03656f7c310cedd426d848c55d6513f52eb558d919e423
diff --git a/dev-python/waitress/waitress-2.0.0.ebuild b/dev-python/waitress/waitress-2.0.0.ebuild
new file mode 100644
index 000000000000..3a2ec5f66847
--- /dev/null
+++ b/dev-python/waitress/waitress-2.0.0.ebuild
@@ -0,0 +1,26 @@
+# 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_{7..9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A pure-Python WSGI server"
+HOMEPAGE="https://docs.pylonsproject.org/projects/waitress/en/latest/
+	https://pypi.org/project/waitress/
+	https://github.com/Pylons/waitress"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="ZPL"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e 's:--cov::' setup.cfg || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/wcmatch/Manifest b/dev-python/wcmatch/Manifest
index c985e408a24d..1e28b07b2bef 100644
--- a/dev-python/wcmatch/Manifest
+++ b/dev-python/wcmatch/Manifest
@@ -3,11 +3,13 @@ DIST wcmatch-7.2.tar.gz 105087 BLAKE2B a28bd9d02468f3ca83d606ee7f7d5c9b6b8883cf6
 DIST wcmatch-8.0.1.tar.gz 105948 BLAKE2B efa23d89f01b91dfb06885a9dcce94622c76e889fa7a0d8ed839cba1eafac4bd3bd1f9a8ccd95d0c7f3a6d990346de2df2bed05a1ac092b07076c548e61b77f0 SHA512 ae99df5ea8f2d1c9e0e120ba23c36dd7b0b13832e5ee599cf08dee2c93f624bab550d937743a3063fac8cce6ce18f56582380521aa3860f220abdcbfe9461dec
 DIST wcmatch-8.0.tar.gz 105910 BLAKE2B 228295a28511ac8c534feed31459dc3e75316febc377473de6d30075886cf33262d6f97931c134b5aaef9109216a4b50383e884e9f3f370849e8a1ac5af5999a SHA512 94bd02e02d544746b678704bd77c1252bd569f1030316e2617f340ee81266dcba398a1a6a15d9460203e681a4825a853cbebee3681d8d338a17ef9ae8d9a03ce
 DIST wcmatch-8.1.1.tar.gz 111931 BLAKE2B 0ec1bac5b26d3f45dac1b24eb3994b803e2297d064277965f6f46e23db3841f008dd6d9ebe7914c68e9c4733c5455cdcdb9652be0f6a1dc3674eaaa28666a91b SHA512 1e31a2a9edf25a7d7e64f8e64a6d8b5e00595ce4c9ac4780f073a2c8d0c123d33860f0843c8313de51478e927746f5b56902afda7b1dee0784dfb3231eb807b7
+DIST wcmatch-8.1.2.tar.gz 112726 BLAKE2B 4d91425f30e81f1ff3449b364b74f242b7393b7a4a162538e57406f9d5cc05d24277d6c0119c40266d4474c9c99919ade8d0450b1999abb39077ffc64f495719 SHA512 f96fc646db334407229ee9885b308eb2b27967d9b4e4245df33641605af678f3edfb54f53c5c8722b946029d39779fcd775299963530036c723cfa860dcfff38
 DIST wcmatch-8.1.tar.gz 111866 BLAKE2B c896c67437e28faa0accc47f2faacedfcd9baf8f3c795f4c4429eb91bc22c0e71668db58979ee81356d5ead73e244ac2d13053ef421b8e212efd3a3feadc4eae SHA512 fdb06c46d6ea83f02f2a4ac8743431d1b7821188a6ad9f845c583707091cbfd1231d1970ba3cea92e993583ed91ee314f04240dcb9285f6bb5624bd4dbae8743
 EBUILD wcmatch-7.1.ebuild 1282 BLAKE2B b20d13b6cb341a90220bf601da53c5988e8bcb8f343236140b86e32b8bdf5d53b69b289f4a944b9544a5f950e9d285cb445c5d039f9b7bac4c16013eb6f69978 SHA512 a6e4a2b56a383e50ce8ac772e8db214da0a8e76bd420ad61b58cea1e624c429a73d010ca1400867fa2c8652c3636d0d02103468feb23e0d265be938507dc6e0e
 EBUILD wcmatch-7.2.ebuild 1443 BLAKE2B 8bfaf6f2402343b2adb91680c5b23d369326b62f88b27ddf0c289599bca11fd53f8bf6b2bd14ec75b192f0df4cb086d4d35e90e621b34f870644258d88055b49 SHA512 28ec3d2cd6093d6433faa32fefa1e3a0f549df3e1b28098a6dcaf90b6a7df2cbabb26f99459c95de4781cf04d08725afad1d950c39f08ee26516a6e37a0deb4c
 EBUILD wcmatch-8.0.1.ebuild 1443 BLAKE2B 8bfaf6f2402343b2adb91680c5b23d369326b62f88b27ddf0c289599bca11fd53f8bf6b2bd14ec75b192f0df4cb086d4d35e90e621b34f870644258d88055b49 SHA512 28ec3d2cd6093d6433faa32fefa1e3a0f549df3e1b28098a6dcaf90b6a7df2cbabb26f99459c95de4781cf04d08725afad1d950c39f08ee26516a6e37a0deb4c
 EBUILD wcmatch-8.0.ebuild 1443 BLAKE2B 8bfaf6f2402343b2adb91680c5b23d369326b62f88b27ddf0c289599bca11fd53f8bf6b2bd14ec75b192f0df4cb086d4d35e90e621b34f870644258d88055b49 SHA512 28ec3d2cd6093d6433faa32fefa1e3a0f549df3e1b28098a6dcaf90b6a7df2cbabb26f99459c95de4781cf04d08725afad1d950c39f08ee26516a6e37a0deb4c
 EBUILD wcmatch-8.1.1.ebuild 1443 BLAKE2B 8bfaf6f2402343b2adb91680c5b23d369326b62f88b27ddf0c289599bca11fd53f8bf6b2bd14ec75b192f0df4cb086d4d35e90e621b34f870644258d88055b49 SHA512 28ec3d2cd6093d6433faa32fefa1e3a0f549df3e1b28098a6dcaf90b6a7df2cbabb26f99459c95de4781cf04d08725afad1d950c39f08ee26516a6e37a0deb4c
+EBUILD wcmatch-8.1.2.ebuild 1443 BLAKE2B 8bfaf6f2402343b2adb91680c5b23d369326b62f88b27ddf0c289599bca11fd53f8bf6b2bd14ec75b192f0df4cb086d4d35e90e621b34f870644258d88055b49 SHA512 28ec3d2cd6093d6433faa32fefa1e3a0f549df3e1b28098a6dcaf90b6a7df2cbabb26f99459c95de4781cf04d08725afad1d950c39f08ee26516a6e37a0deb4c
 EBUILD wcmatch-8.1.ebuild 1443 BLAKE2B 8bfaf6f2402343b2adb91680c5b23d369326b62f88b27ddf0c289599bca11fd53f8bf6b2bd14ec75b192f0df4cb086d4d35e90e621b34f870644258d88055b49 SHA512 28ec3d2cd6093d6433faa32fefa1e3a0f549df3e1b28098a6dcaf90b6a7df2cbabb26f99459c95de4781cf04d08725afad1d950c39f08ee26516a6e37a0deb4c
 MISC metadata.xml 3008 BLAKE2B d7abc1a9ca8152f4e70c187503e1cd05181cb1d67343c5e2d62112e35171b0b528444f2b13ae8f2a0e86f29837795915b20f465fd286961decccc22052eea1f4 SHA512 331e3a2470fdeb5d88e92e8c2461c5253bf09084c5875d458ec0aa5263bc19240dcf3fdc85530c621d09e9498c5dc5d1a4ee47abde709edb6b51bbfeb50df29c
diff --git a/dev-python/wcmatch/wcmatch-8.1.2.ebuild b/dev-python/wcmatch/wcmatch-8.1.2.ebuild
new file mode 100644
index 000000000000..fdc416d52454
--- /dev/null
+++ b/dev-python/wcmatch/wcmatch-8.1.2.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_{7..9} )
+
+DOCS_BUILDER="mkdocs"
+DOCS_DEPEND="
+	~dev-python/mkdocs_pymdownx_material_extras-1.0.7
+	dev-python/mkdocs-material
+	dev-python/mkdocs-git-revision-date-localized-plugin
+	dev-python/mkdocs-minify-plugin
+	dev-python/pyspelling
+"
+
+inherit distutils-r1 docs
+
+DESCRIPTION="Wildcard/glob file name matcher"
+HOMEPAGE="
+	https://github.com/facelessuser/wcmatch/
+	https://pypi.org/project/wcmatch/"
+SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/backrefs-4.1[${PYTHON_USEDEP}]
+	>=dev-python/bracex-2.0[${PYTHON_USEDEP}]
+"
+
+BDEPEND="test? (
+	dev-python/mock[${PYTHON_USEDEP}]
+	dev-vcs/git
+)"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# this test makes a really wrong assumption that basename of $HOME
+	# will be a username
+	sed -i -e 's:test_tilde_user:_&:' \
+		tests/test_glob.py || die
+
+	# tests require some files in homedir
+	> "${HOME}"/test1.txt || die
+	> "${HOME}"/test2.txt || die
+
+	# 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/weasyprint/Manifest b/dev-python/weasyprint/Manifest
index 0adc95a4aa3f..91db85b849a1 100644
--- a/dev-python/weasyprint/Manifest
+++ b/dev-python/weasyprint/Manifest
@@ -1,6 +1,8 @@
 AUX weasyprint-51-skip-useless-deps.patch 526 BLAKE2B 8e0fc794ffab3b9ba9d9c5992dba9f2ca5d88a3e79018f108558e81556f968498087a13aacd7030677e86000b7ad3f5ecab276dfe53b13b1fd0d3356c597cfd7 SHA512 dad97fd25f9f506aa7806a55b459eff051bb5592e28393733bb5c2c03473a8a93e78116339bd435f8d215e7f297772c9feae68cb84d5d1710bc72a6476cf608a
 DIST WeasyPrint-51.tar.gz 308411 BLAKE2B f88f9e1abc09986d51d92d8a153c71242cadc8ce6b8ac99a08d86746677d40a86affe3c56dd3e3e6a0eb2fc915f77036271f049f6ccc644d508be51d01d97b7c SHA512 631038bece7ac0c15c6a668a7d06137e4bccc049eb80484a153ca9c4a996256de8647428b21ed1d0c1607af3893c747a1956a3d3f012b30105ba4f8613a96fcd
 DIST WeasyPrint-52.3.tar.gz 325076 BLAKE2B 2981a487938d4ceefe20da36262438a64c30beaff340be6bd48b0140f63ea3971ca80a36386dde2db270e1555b137a89480673c4fdc2fa49079efdf58e53029b SHA512 7db740dd8f7264f73efe6e2505c603cedb1f8e5c053447b03517bdb003b933e1ef58f15482d4ab316b04b6631f9102752670f8b56989983cab80f7bd110746c9
+DIST WeasyPrint-52.4.tar.gz 325062 BLAKE2B ead641007e84664dfc1a9b95a227d5c6539e19e629d95d68b663b46a873ffa83b203897dd4d03c5d72f00e2737268c64624b97a37840c86d4a555f5b1a20a7bb SHA512 0003f9b46452e60118e7f6944f0bf48b6f548814dae10f990bedb124d3c67d9c530c30ee142d416f448b3b479f54b4fcdf01e31747957438192c77031926cb8c
 EBUILD weasyprint-51.ebuild 1384 BLAKE2B 8c21b4f54af4c4cfa0d231a5ce02d911a6a8d53acdc7bc530be7e39235beb0f57d8a0c0dc8c399992c7e59af1a455ec39411ce9f85f5c6f731d8cc36e31c0a5e SHA512 d101e24e5f91982c8ca2b555ae44b4a8f40f9ca729ec460404b6e471f9bd3279aa934c136ea80a9af4a26c6cca81ea6cabb18477bc559cdfc85775adb0f6bf16
 EBUILD weasyprint-52.3.ebuild 1274 BLAKE2B c436d65ab599aad4c43e29c2186f2641ec79d14d8a94f77426d2aeb276624430a393e6d76aea2191ee5114d8ad6a0ad1a6e0b953142946557df80c83e6080051 SHA512 9e7a9dbc41cfa111784921375456fcffc24650d9119f726fb3b913d4530c66741f351c6b18cdaf6ac97dc414f07ba1f4791ec15c05cf1ae9b5c8d62712be1f5d
+EBUILD weasyprint-52.4.ebuild 1274 BLAKE2B c436d65ab599aad4c43e29c2186f2641ec79d14d8a94f77426d2aeb276624430a393e6d76aea2191ee5114d8ad6a0ad1a6e0b953142946557df80c83e6080051 SHA512 9e7a9dbc41cfa111784921375456fcffc24650d9119f726fb3b913d4530c66741f351c6b18cdaf6ac97dc414f07ba1f4791ec15c05cf1ae9b5c8d62712be1f5d
 MISC metadata.xml 381 BLAKE2B 422f89ba40bf25e47d53fa91f51ed8b12c5f37a7befd16a2cc2d78335b0dc472180c5e46c6bf890e7a30fc7936e672737e931867097e21a781819fd7ee644e94 SHA512 92ccf545a50a97d2f2cf6f85a6986525ea787d6534682b5fbdd1f0395ed7e938c4e341f5897a663b185d2b2755d4123132b8ec36866b44f2615f08d607a14398
diff --git a/dev-python/weasyprint/weasyprint-52.4.ebuild b/dev-python/weasyprint/weasyprint-52.4.ebuild
new file mode 100644
index 000000000000..db3c161e34a6
--- /dev/null
+++ b/dev-python/weasyprint/weasyprint-52.4.ebuild
@@ -0,0 +1,51 @@
+# 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_{7..9} )
+
+inherit distutils-r1
+
+MY_PN="WeasyPrint"
+MY_P="${MY_PN}-${PV}"
+DESCRIPTION="Visual rendering engine for HTML and CSS that can export to PDF"
+HOMEPAGE="https://weasyprint.org https://github.com/Kozea/WeasyPrint"
+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"
+IUSE="jpeg tiff"
+
+# Note: specific subslot of pango since it inlines some of pango headers.
+#	>=dev-python/lxml-3.0[${PYTHON_USEDEP}]
+RDEPEND="
+	>=dev-python/cairocffi-0.9[${PYTHON_USEDEP}]
+	>=dev-python/cffi-0.6:=[${PYTHON_USEDEP}]
+	>=dev-python/cssselect2-0.1[${PYTHON_USEDEP}]
+	>=dev-python/html5lib-0.999999999[${PYTHON_USEDEP}]
+	>=dev-python/pyphen-0.9.1[${PYTHON_USEDEP}]
+	>=dev-python/tinycss2-1.0.0[${PYTHON_USEDEP}]
+	>=media-gfx/cairosvg-2.4.0[${PYTHON_USEDEP}]
+	>=x11-libs/cairo-1.15.4
+	x11-libs/gdk-pixbuf[jpeg?,tiff?]
+	x11-libs/pango:0/0
+"
+
+BDEPEND="
+	test? (
+		media-fonts/ahem
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -e '/pytest-runner/d' \
+		-e 's:--flake8 --isort::' \
+		-i setup.cfg || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/websocket-client/Manifest b/dev-python/websocket-client/Manifest
index 508502527f9c..2e7b1007cc68 100644
--- a/dev-python/websocket-client/Manifest
+++ b/dev-python/websocket-client/Manifest
@@ -2,4 +2,4 @@ DIST websocket-client-0.57.0.tar.gz 39333 BLAKE2B 3e24c41176e0566edf0d31bcbb0ecd
 DIST websocket_client-0.58.0.tar.gz 48216 BLAKE2B 5e559852385d95caffa73fdb4bfcddd3e00f7bdc9d23d07e7bd6b9e8de599742e153d31bb3a57bdf1aef02361f5dc0b13a443c21872c27576e068f246102d655 SHA512 c587945831427a9bddef96be53d20fec7f55ffd7efe2b676dac96b8078ba446ecda85379a4edfc49c36de936516d3994cbd0515decb9b615cd969bde1117167a
 EBUILD websocket-client-0.57.0.ebuild 756 BLAKE2B adc92d87c58d17958efdff82fe60054106b4cfbee41a8dd61d84fd80e9c81b4486a37540fe64c3082ded39e4be24417de60cc39ce902f3f7a5ee9acfe610f5e9 SHA512 bc028e9d85e2207db7ef924de5ab2f2220ae13e82eca34f047b17b46678065485cfe4b9d07f1e462bd6df62dbd6b9aa6e85467f6ea161dc07c7f91a305137dda
 EBUILD websocket-client-0.58.0.ebuild 724 BLAKE2B d833b7e0ef12f8c6d013544eb7d9f0272726cabc294d4e946ff77b9f89e0b21eb36971897fb837849b1e411cd07bbcc9d10a986e323f47ab0ae440754e6638b5 SHA512 0e1b56bc073243c72498c11dbbf3157554920742c22b4f834e1a14ef6a9d344ac425b611c018f7e3224765f2e61a8b4c05eb686fe89dab61403fa834035e6957
-MISC metadata.xml 473 BLAKE2B 22faac31bc833792ca0ed170d4a785a85275c81403da85cf04003672ce00c1b28fcbcb0834f03cc872dabef36af53a30e53949c154586f3346c3b731a1fbe56b SHA512 1ed56113c593335003b4ccaadac76f39bf05ca4f403c25bf7f2de655b0047bec86088d56aab803a20540193748b2063846f0c6ea552514907b4ec9da6b6aa106
+MISC metadata.xml 497 BLAKE2B 1a68fcd42a257afae80db03043a732a321079f146c252a89d1c5399bc5800a5475fd36f31cef381544c9592e39a86c14eb5334ab1800a5191b0f7ec9e0806f19 SHA512 ce4184c2e87f87cd787cacf1c7b566df2fbf7dda97a6b6639e02c003ede6ac5b90494eb9b3b509c303a56fc4e829acc05ec9d3d01846e85b233a561d1cdbd5b4
diff --git a/dev-python/websocket-client/metadata.xml b/dev-python/websocket-client/metadata.xml
index f14d1ae7caed..3c3265249c2d 100644
--- a/dev-python/websocket-client/metadata.xml
+++ b/dev-python/websocket-client/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">websocket-client</remote-id>
 		<remote-id type="github">websocket-client/websocket-client</remote-id>
diff --git a/dev-python/wsaccel/Manifest b/dev-python/wsaccel/Manifest
index 92205763b0b5..e59bd8bffbae 100644
--- a/dev-python/wsaccel/Manifest
+++ b/dev-python/wsaccel/Manifest
@@ -1,5 +1,5 @@
 DIST wsaccel-0.6.2_p20170108.zip 21344 BLAKE2B ecb8ef7888fb2ca8e6566d2b3fcbd3911a0df5a8c9f4be86a3cffb95afc31603c2477bd983f9d24ee7cf48c33cbcfb10068c38640ee2a888f46402756313cf29 SHA512 d0cf13360bd6cc0b51b8bee1d36a8ee544816c318e828bf6129ff85827636642cfebae4ef0e99d841cdf64f6c67006a649994804aa42d3d76e977a861aafb3b9
 DIST wsaccel-0.6.3.tar.gz 9723 BLAKE2B 75da0f27e07b52ed730d239ef807da7ba9dd342144ca2e78c32dc09b20c1ebfc006aa9969b1f811d172ca18b75533a4560a29112e56d6dfd472117a0d072fc8e SHA512 0fe97c7fa94cec1b9cf019507f55ce633a9b4bda86329937cddcfa25ba94755010813688cda77ee4fea1c50918e45cd50770bb27e7583e630c46e84d27c155da
 EBUILD wsaccel-0.6.2_p20170108.ebuild 632 BLAKE2B 8f6c3799d33a2699cbfae51dfe49a3f44d5c1634e44c595098d9aba58887b1ae6ff2007691d54e7a4c2fd70490ed60e9962bb1e3b380b708c2a6be6d214459b0 SHA512 ad7ae81ac8583842e12a08d9c25488ede7c047399f07976ed3e759582455b4e2792b45f2e9ea1a0201b88deaf6e03c38e21b2d8ad1f197d68a5bb127f69dd216
-EBUILD wsaccel-0.6.3.ebuild 553 BLAKE2B 1bec4b80d2582e2bb43acc85c1e8b7fe170c95e79a0a5dab7757a520f5c43841da5549490e4a8f053dcfefac4e0b1ff2e024eec96085b26cbc74b5f0a05d5a81 SHA512 4d14b9d6b295f0ded60f308a2286da5e449eebeacd90b06ce4e9565d9c14c10c9309f9efd7cfd5a2c18e435659e8f824ad02f27b50df0d49b674150c2bd89370
+EBUILD wsaccel-0.6.3.ebuild 598 BLAKE2B 1059f1d4aab750616b8d19c3a5fd2cafcb97834debc77c589c1355cd30c8c8d8b4f97dc7a99e94579daba861c6a93de3857b61abb627cc74e1cb23118af47c7e SHA512 7ce628d101cae5cc1c691cf1de53db438873435b3ae195c1c28bb1b443578596d1ca75cf2b020e90fe84ad14dae3db5bbac8f531a8faaeed2a9f082639312430
 MISC metadata.xml 377 BLAKE2B 9e994c8b6d0e89336fd1f2998f8544201ccccf3d647f3600e57ffddf21fb75e05bc3f8ffc2634dda9be9ba78709ac634d8d642cf110edd382d24ae055d860fc0 SHA512 cd6ff7d5e94219b550161b57a1c6f3736a8c78906a81a5e293046b9b3b454f97c1fb41dd7eb7034f45ab784c22189e3788f2e8d9c17a725743936796af3a4d6d
diff --git a/dev-python/wsaccel/wsaccel-0.6.3.ebuild b/dev-python/wsaccel/wsaccel-0.6.3.ebuild
index 51e3a0668a00..825d6a73e6c3 100644
--- a/dev-python/wsaccel/wsaccel-0.6.3.ebuild
+++ b/dev-python/wsaccel/wsaccel-0.6.3.ebuild
@@ -17,3 +17,8 @@ KEYWORDS="amd64 arm arm64 x86 ~amd64-linux ~x86-linux"
 BDEPEND="dev-python/cython[${PYTHON_USEDEP}]"
 
 distutils_enable_tests pytest
+
+python_test() {
+	cd tests || die
+	epytest
+}
diff --git a/dev-python/xdg/Manifest b/dev-python/xdg/Manifest
index 8f575d8596f4..d9b82a7a81d2 100644
--- a/dev-python/xdg/Manifest
+++ b/dev-python/xdg/Manifest
@@ -1,3 +1,3 @@
 DIST xdg-5.0.1.tar.gz 4120 BLAKE2B f80ca1ec0ac064d64a2603f101301d427e7b64133eede1ff0770db0b7ba4368c8640b2d2eea8f1d28a52874a6b632ce83d969c38a036c970e20c2abba3a1f98c SHA512 c6da757cf0fd11a03d97506f7b898b902f560cb74cd9a90ed55550d89bf60eef5e32abe2aca19816279621e6ad0ad7899c7326b126a777231c67cc6cb30b766f
-EBUILD xdg-5.0.1.ebuild 416 BLAKE2B a6b809952ed8d9f25bfdd4505b9b1484cd6e419ef009babc6dc9289771ccc9bee093f3c39f5f3505110c2c5651249c0b1525f558a4d19e2e34c51af85afede61 SHA512 a0e610ee6d7e9e1e847b7bd4ea7b78f792817eb482e54f4feab827aec33b23d66307e768520f278f0ff4b0a6d477a0a5a102ed2e08e3897551c8fa69bc997b92
+EBUILD xdg-5.0.1-r1.ebuild 496 BLAKE2B a74f2ae47967c71bf0743ce426c6ee037c26f21f92d53d6083b84f4de9f447ee73076f0509de97dd3d5c4a43b1217e54fee471f7d914c46c9edc4a7446ff0688 SHA512 a88d3467b63ae8109d6ffa776c65e4984e1a09fb34eb1a2dd49829e69299e70ad8e1d12897ac37065c8ad09102cb5c01a03c4724e6684dbea623d0bfbf5c820e
 MISC metadata.xml 512 BLAKE2B 30af9ed234e57029ac520d0e0de3f5f819ad876d2b771d3e61dc7386f51de8e2456330b58df6c58ed66481e97b5af1065690ec016c9cfcd97e248d36cb97be36 SHA512 8e7a91ab41040620c24048a500c00b37b6808ea2605a6d544683f84045ee68d1d111ed60d94b0ad49937abc5ceaebe16db9a06d897763ba5e0df68677f01e994
diff --git a/dev-python/xdg/xdg-5.0.1.ebuild b/dev-python/xdg/xdg-5.0.1-r1.ebuild
index 688a5a44d199..b31f4fca9726 100644
--- a/dev-python/xdg/xdg-5.0.1.ebuild
+++ b/dev-python/xdg/xdg-5.0.1-r1.ebuild
@@ -13,3 +13,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="ISC"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
+
+# https://bugs.gentoo.org/773415
+RDEPEND="!dev-python/pyxdg[${PYTHON_USEDEP}]"
diff --git a/dev-python/xdoctest/Manifest b/dev-python/xdoctest/Manifest
index 5e610ef12d4f..f4795c2f434f 100644
--- a/dev-python/xdoctest/Manifest
+++ b/dev-python/xdoctest/Manifest
@@ -1,3 +1,3 @@
 DIST xdoctest-0.15.4.gh.tar.gz 179295 BLAKE2B 0b44276a219119196543671d8ac24469ecd73b040bbd03ca416320d407f0dd34361dbb2778121621f6efb65835ea421107883277b6e712f03e4c06ea2b03dd6a SHA512 a0a35d5c73a8696266d9be44d11e9dbf05c9ac1165a05e681f7b70ef07ae7d56f4bd179e863b6675e2366f1627015e92092e8250ca592f004680db5ad886ad49
-EBUILD xdoctest-0.15.4.ebuild 906 BLAKE2B c75cf1f08cd0fa6e435632476f216adf599184bb462c3b562b847e852db3885e9c60238dcbda5e45553f5ec82f45987c1bbbd48811f98e2cec168c15d5206e0a SHA512 9c93108f4e46da127f2158dee9826e3e404dfe94e56f9229dc619a59e503e7cc6bdba628a8c200536bfb883272f1bdd9a78829f4c974560e3bb1ed58e58c6b0f
+EBUILD xdoctest-0.15.4.ebuild 827 BLAKE2B a34f9f71a0b1bc098df19f51538fca4c7338c0e00f0e268d1100ea26246425e770a682bdfd7177a0520a035f54a3c838a164305efd20c0552e0a411c7113857c SHA512 26c3d3221fea5bacfe95e5611d29a20f6ce2dcc795534adb1afa7c1e2e460858e00a0aea0f21b353bd9334961599542f433eb6bd971eb701a8387fec63bd622b
 MISC metadata.xml 425 BLAKE2B ef6df66f437f7b59189999a895fde27e87580c6eff536aa9b80855b7db9e83c2a0edbaa4784f9438846800b89eac58857c4c303752d1110f86d43194fdee21f9 SHA512 81c57c3abf70d2fc182b5d935ae35187e2f5a9a99b3a5958c282f478fceb0283ee2c09ebe2561da8753dca35c73f54ec3fa17d29ecefd7c50f3c8b7bf42f9657
diff --git a/dev-python/xdoctest/xdoctest-0.15.4.ebuild b/dev-python/xdoctest/xdoctest-0.15.4.ebuild
index 8453e2c4d62f..89bc48d329b4 100644
--- a/dev-python/xdoctest/xdoctest-0.15.4.ebuild
+++ b/dev-python/xdoctest/xdoctest-0.15.4.ebuild
@@ -28,10 +28,5 @@ BDEPEND="
 		)
 	)"
 
-distutils_enable_tests pytest
+distutils_enable_tests --install pytest
 distutils_enable_sphinx docs/source dev-python/sphinx_rtd_theme
-
-python_test() {
-	local -x PYTHONPATH=.
-	pytest -vv || die "Test fail with ${EPYTHON}"
-}
diff --git a/dev-python/yarl/Manifest b/dev-python/yarl/Manifest
index 5e386bdfd57d..5700796ced9f 100644
--- a/dev-python/yarl/Manifest
+++ b/dev-python/yarl/Manifest
@@ -1,4 +1,4 @@
 AUX yarl-1.4.2-test-without-coverage.patch 585 BLAKE2B 2a49dbc7f8c0465b51f0d3405e897b61ce16355c64a7b19cb805d1d546b26a8088e1aca834b215b3337ed6062d068d646e635d85fdbfa9ae98744fa0a5956cf7 SHA512 f7775c6a01fac42c9c4a544d9326692d97cdf4a4a2e8c7d69a53dc6d0847eaef9660d193531c9bf50964b0e01d764fe85761c3ba1dae8c70669795723da7154d
 DIST yarl-1.6.3.tar.gz 176823 BLAKE2B 58d36c6d18ef661cb08074153081f541fc98968107d71e7b501297f45f38de092804bba2ae89ddcf0da79b5d4fca62292a4c460bc9dff9d723d3958bc64ff84b SHA512 4c76b94198b8e334f4b4e71d92b0fe23f752d35e0c29bc68df99648b3f48fbb6e3dd8d7339138544e5dc8fbf64c15cb61678052670ac47edc5be958df819d42e
-EBUILD yarl-1.6.3.ebuild 734 BLAKE2B f28034b5db2647098e871240df53cf361d58d39d0715384f380f754da57c13b54b0990b5f63f9c7e0d69015999c58823bac0c49dd62f1025189505e0650678e0 SHA512 a2c66a4f3ae4a9c49fd9097068b53840b448c74ad04703cdb42dafc3795422df2563b29523903496cf6a80487d662f6164e3d98023dc0953372f6b733a0e9c2a
+EBUILD yarl-1.6.3.ebuild 876 BLAKE2B 08e35ff658f8b27fd24433c69c84213758a5a02d2086a10fadb6aea5bf30b61bc531375d2908fb72bf73ae09fad66cab7e628fea0f4ca8737bbb22dcf496c0d9 SHA512 6cdd36b5e2a23272bbcca8f6f6f5496c11e6dae83abfa5ba74be3123e73eeb1bf180bee638c08c797ce965058cea86535c7214b2dac800897bab6e92b39d8c7c
 MISC metadata.xml 439 BLAKE2B 8d9b97af296f25f501da90aa57deffca21625c8dda04f04e458879977865609e2fece4231deea45f297e3dc74740cea6a2d3a1e0be9b8c37eb5b08379361fef6 SHA512 f554403c332e415434d21a63d65f755dfd80dcdd813f3832b8e09ece9e26a2d28d274de9afcff7dbf2cf64122e4f4b50e546d7a2f67cc6f2090a4da8205cba8c
diff --git a/dev-python/yarl/yarl-1.6.3.ebuild b/dev-python/yarl/yarl-1.6.3.ebuild
index 451ae527610e..dd7465b90388 100644
--- a/dev-python/yarl/yarl-1.6.3.ebuild
+++ b/dev-python/yarl/yarl-1.6.3.ebuild
@@ -27,3 +27,10 @@ distutils_enable_tests pytest
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.4.2-test-without-coverage.patch
 )
+
+python_test() {
+	cd tests || die
+	# broken by CPython CVE fix
+	epytest \
+		--deselect tests/test_url_query.py::test_semicolon_as_separator
+}
diff --git a/dev-python/yaswfp/Manifest b/dev-python/yaswfp/Manifest
index 0db7b3b1883a..dec279a04327 100644
--- a/dev-python/yaswfp/Manifest
+++ b/dev-python/yaswfp/Manifest
@@ -1,3 +1,3 @@
 DIST yaswfp-0.9.3.tar.gz 29845 BLAKE2B 2c5961b79d8378b707a920a4c6a1d75cf8cb09cc6a689035c7118758de3fc1f6fddf6a23e91f4cddea5f7370e4b558b40dfd4a05b16d7fb5f881c5ca74beb4a5 SHA512 06fb5d38c92f418fff77d812507621236b3fc74cf75786031bbd81ac1e61767a29647c7f1d0ffbb25d2f6f1a8749e5a732896ad66956e16c886e24e85915f72b
-EBUILD yaswfp-0.9.3-r1.ebuild 425 BLAKE2B 0cd70dfbcc4f0a5ee872817bc6240ee9a5a4538356fd59e3d1d7a5d11c08443ca7517498980921d15a33f303fc875788a6803488a817d650d12af221266e9ea5 SHA512 1e51c1ae95d645f8b4af801ed66c3a777162248193658da6cc6343ceea801cbdc1d8e09f18493b6a82737c1b9bb935f5e628c1bf3f5abe4aeea3137a3238f1c5
+EBUILD yaswfp-0.9.3-r1.ebuild 426 BLAKE2B 512e71c37d687cedf4a130c0d4df2ed7119ee1ab25e4c65fac0592900edfe5b9d89730f0ba392597299e1e2294d07844ccc18021845172e15839ee24d7d10f9f SHA512 772f24dc1f510228c0ae734237abfb91ad939e206229c25c9ffdf26658759a4a88e8402356611fca6fa78d546486fb2987e3dd296bb14f55f33c0e5f8aafafc8
 MISC metadata.xml 483 BLAKE2B f34efe0a4c7f5dad0ee483229b2215e8d52dd8d8a7db263d74b557bd22e84d87701dd15db52da1e02c7a3e7cbdd9754165afdf62361c6c8a91cbdce86c67b3ee SHA512 f7d15aa5bc14d27a6e8151c8e971a53f75759838f4b5d7542aedf4fa7f7cbef03c5d402d00b2320acf4ed79089de9855d20e664e0760df606ddf9fdffdb7cc6f
diff --git a/dev-python/yaswfp/yaswfp-0.9.3-r1.ebuild b/dev-python/yaswfp/yaswfp-0.9.3-r1.ebuild
index 32c44068ebc5..b835d4a1778b 100644
--- a/dev-python/yaswfp/yaswfp-0.9.3-r1.ebuild
+++ b/dev-python/yaswfp/yaswfp-0.9.3-r1.ebuild
@@ -1,10 +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_{7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/zipp/Manifest b/dev-python/zipp/Manifest
index 2d09b0ff142a..e9c73a54cd82 100644
--- a/dev-python/zipp/Manifest
+++ b/dev-python/zipp/Manifest
@@ -1,3 +1,5 @@
 DIST zipp-3.4.0.tar.gz 15638 BLAKE2B c06f68b9a23e6ba560cf7b703150e4b14d8bbeb5c8712c54257f587de9a44eb853804495eaecff2ad17261304da9b9433951cbb9b17e3f35446406e4e4fe517d SHA512 c791e72f05a92110037cbee7153103e47ec536994d9e86cdecb34c602839c0bf5e6e4ab4ce56d6a44c7eb4f7a555ba531df8c986e302654c624f59e2217bf10f
+DIST zipp-3.4.1.tar.gz 16545 BLAKE2B 5ebdc4d1e932d72502866701db8b0f352aca3194890d9ed340722bb2a65c4e3be0f6bb54f49567e4fd46faaec3379d0c1d668e1a55f63bea6c57e4ef0c2f9e01 SHA512 2ba50109efd0ceea9eb1d57e2d839f522b5a78a8dae344d6da54b79305dd46bff23f1116f562127290152c0b100369439c17fe9dc3fb14d0b42beaa48348ebe6
 EBUILD zipp-3.4.0.ebuild 1209 BLAKE2B 4c7e797fef899adc3074882090ee22e339326d8bc6babf051c16a9dd5e68c4040bf837e4a128f06b509be4e5158210f75f7b96dfebb51eece37412981de6220d SHA512 a11718125971b1bd154d72752af5e06f8dc1e93d448b2e40e92f1dedf01519c9f0f7b6b05f033df8214ac5e801d947d71643f07fc785c794e10262da52babfa3
+EBUILD zipp-3.4.1.ebuild 1218 BLAKE2B 5f210408eb2ec409cfb8cccc6160048747fac96d9175bbea97a62a863b167c84687cd0f372eb0dddd5ed3cae5f0bc87237282c84bd67aab203a29da49a970888 SHA512 d273267cdd7188b0303400f4c5535832613e57772a22a514723b5ae47e7889bbc79550eed39182b12855439cda9cbbf5232aeaf09a091cdb29c476bd33341f79
 MISC metadata.xml 547 BLAKE2B 18466508bbc1bd39ebac74f8ae583b1f58e7444f96171132ba3521f302d179417cec21f34ea55d95b94a5ce8242ef77cbab5805f844d84de809c58f5a48b5bd4 SHA512 693f379106d242cb63a5bc2e04133d0619f168b964e9e4cfd5dbbacfb06b6d4e732d9304b2029afe28e800020ac771f5b38a0963477976cc5bc049359ef7b6b8
diff --git a/dev-python/zipp/zipp-3.4.1.ebuild b/dev-python/zipp/zipp-3.4.1.ebuild
new file mode 100644
index 000000000000..b486e084b541
--- /dev/null
+++ b/dev-python/zipp/zipp-3.4.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Backport of pathlib-compatible object wrapper for zip files"
+HOMEPAGE="https://github.com/jaraco/zipp"
+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 ~x64-macos"
+
+BDEPEND="
+	dev-python/toml[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-3.4.2[${PYTHON_USEDEP}]
+	test? ( dev-python/jaraco-itertools[${PYTHON_USEDEP}] )
+"
+
+distutils_enable_sphinx docs \
+	">=dev-python/jaraco-packaging-3.2" \
+	">=dev-python/rst-linker-1.9"
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# Skip a potentially flaky performance test
+	sed -i -e '/^import func_timeout\|^ *@func_timeout\.func_set_timeout/d' \
+		-e 's/test_implied_dirs_performance/_&/' test_zipp.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# Ignoring zipp.py from ${S} avoids ImportPathMismatchError with Python < 3.8
+	# by ensuring only zipp from ${BUILD_DIR} is loaded
+	pytest --ignore zipp.py -vv || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/zope-i18nmessageid/Manifest b/dev-python/zope-i18nmessageid/Manifest
index d52f2c1c5175..5927a27fb583 100644
--- a/dev-python/zope-i18nmessageid/Manifest
+++ b/dev-python/zope-i18nmessageid/Manifest
@@ -1,3 +1,3 @@
 DIST zope.i18nmessageid-5.0.1.tar.gz 28217 BLAKE2B 67e31a18daa8c2d5ccc16b173d37188fc6154cc75b1fd7cd908d6ee3ebeca0092316546587103f01aa6b39d074aaa207bec86401c4d50f664efba179191c9719 SHA512 31af16581d59ce1b7d5d8fd86c715c56b84aee9a7a0756bb2b7ceac6db30903acc5fdff85d844c0250c0a112cb45ab03be2f56d3d4ca6165272ff76c09d40d8c
-EBUILD zope-i18nmessageid-5.0.1.ebuild 883 BLAKE2B 7196006b075c447f34260c28e19cfe50c27c90b08650a52a3021e44ccc0f7233ccee25d07c525b84473380470765df072cf575abfd43625bbafe917221a8c691 SHA512 9ccba072727067773d7afdba45a00799c51b921fa4fc4b07544caa968d8cedb5401e50e02402b1e88337c0927a5375276f27afafb70f0a85fed4862361d58c9a
+EBUILD zope-i18nmessageid-5.0.1.ebuild 1049 BLAKE2B 5cc71895c8a44fc52454bcd29fedd2f7a0bf2a9a8916e5c3e1d8896bde8e8c4d9460d27a9e33db9f0fd92cc5ee28f5dc436b08a1e9ce99719b10b8cbbf961137 SHA512 65d820351784a806926bb7e6cff6e1211e50ed31a8ffb4c862c5fa3a3b39a604b28d713eee8f9fb8ba447a7f2c3de73fd3a6a90916548c38099bb5870beb8ed9
 MISC metadata.xml 487 BLAKE2B 7d59b64c324e8f6d9a38f6d95c2a672fbc8ebc3054e7786a114db8d99082a9d7d10c794c97a6b684f792475c79759a27cf48ed2d4f013201fe8f7b70ba00e3ff SHA512 5f2f2862d427dc342c90d1624ee7dd8d95ccc5f11410532dd892aa79b93c2e79a41bc6ead47e4f1ca43aa718ac619a01bfc03a71bcf7116aa39e2069dfc7da87
diff --git a/dev-python/zope-i18nmessageid/zope-i18nmessageid-5.0.1.ebuild b/dev-python/zope-i18nmessageid/zope-i18nmessageid-5.0.1.ebuild
index 289e9eff0c34..47d123720e1e 100644
--- a/dev-python/zope-i18nmessageid/zope-i18nmessageid-5.0.1.ebuild
+++ b/dev-python/zope-i18nmessageid/zope-i18nmessageid-5.0.1.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
@@ -21,10 +21,17 @@ LICENSE="ZPL"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]
+RDEPEND="
+	dev-python/namespace-zope[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
 	dev-python/zope-interface[${PYTHON_USEDEP}]"
 
-distutils_enable_tests setup.py
+distutils_enable_tests unittest
+
+python_test() {
+	"${EPYTHON}" -m unittest discover -v -s "${BUILD_DIR}"/lib ||
+		die "Tests failed with ${EPYTHON}"
+}
 
 python_install_all() {
 	distutils-r1_python_install_all
diff --git a/dev-python/zstandard/Manifest b/dev-python/zstandard/Manifest
index 472a137565bb..1a8d8f54cb25 100644
--- a/dev-python/zstandard/Manifest
+++ b/dev-python/zstandard/Manifest
@@ -1,11 +1,9 @@
 DIST zstandard-0.14.0.tar.gz 676761 BLAKE2B f90fcee6571f89eb5964ba50c722be8f3b846a0aaa6f79bd41389131ce332a4c6f7ec3d2eabd16268a42d211c7c02c2f7379019ef44272eb23cc74a20e5e9b3d SHA512 57c62eb7dedde2a2178f79a5658b87b5c5f176b282311273953003824272afa03e126a79b57fc8b75e9e15585d44d6b9931318a8ea5e7c75ec0feebbd7eb6cf0
 DIST zstandard-0.14.1.tar.gz 676849 BLAKE2B ad2a89371301e64428de90adf8770ebb7b43b06d720f5e0e9b490dc8771c55a974625105128c3a8052d68230d2670a802adfbf64708729440fdf624ca8d4fccb SHA512 e49f294816f0c7da35914363dbbdfcc4d432f7fa8367192e07a5d0c093ec8af76966fd0a95b4e8316091f056a8027c383ca73cc9ed506b29e2f9a31bc9ad3379
 DIST zstandard-0.15.0.tar.gz 990208 BLAKE2B d31a4c3cec60b642ec8c3a85b9038d6b0153e2be25696591db1a8e8f45b44018e370eb10bc4a902df3da03048a26ad55b2358d3b9912b1802c61bb63ce920523 SHA512 2de5a2047b1a9a146160bfa1cc50adb0ae1ddf23ae346b22d49b04e38987f90dcbb1f15d75c486fb37bf7084de66ebe19d917a37515dedac462102543533c407
-DIST zstandard-0.15.1.tar.gz 992126 BLAKE2B 7f6e987402bb5ddada70b56660d6e9d4eb5cd17dfa0041323ba2ef75bdb5362e7bc4fc8415132079a929e34fefdb654860088356b38dc0546b7c4f7108f93252 SHA512 7aabe647fa8c9a696084da6544c27287fe7d57e3a0ce2594c061fd20136e147ded4ea3da3648f6ef93c49636edc1d04ca4f29561514fb13f1a5d0340cd51996b
 DIST zstandard-0.15.2.tar.gz 1012864 BLAKE2B 3239a7003d8869182becbaf952b43da8923518e4b5202b115d59fc1492d26bf9703c1ea2dcf525459da023470c134c70525bd040a2d728d24861f7bc1e3a8948 SHA512 0102f3522145c80ec096e9dfac34a5bdd2a98b43b50b8c1e99bcfb0057904c551ababeeb82ced5f8b65945d42b39479cbc29472058679af1f8f91b68ae79f70f
 EBUILD zstandard-0.14.0-r1.ebuild 777 BLAKE2B aa61d4659110f07d40acfdd5e3c31e8557138ed9266323337d957dd588a838e8bd5eccab02d6aac549f014d7819fe5b50f90f782c02b51b806dd28b39e65bb91 SHA512 3e4cba50c243d2604b53eb5b284343427aaf1912c4cf1362ae8cdc19d3475c6e293ccb383ca64c7a95763606739ea4b7628c0e698cc4b95330de16ac27673f45
 EBUILD zstandard-0.14.1.ebuild 779 BLAKE2B fc38dda68bc290c1dfe450b3733eee2eb241ef7e213efe3e8cb60f5a47de6034f11b0822e04e61774bea2a17562d0d1332f393352913d77bc800d33cc4fc625f SHA512 ad392c8eaba60a3fc905840b17e50876ca98bdbb109998095eff564eec8cb2e39d742fd314f3786a5afe924e369703f7b160abf630a0cd2dfb664f343c940705
 EBUILD zstandard-0.15.0.ebuild 783 BLAKE2B 89e7f68224ee060cca75e92bc1bc714b1163752204f9fbc9184463325847006ac516874eee2b5cbaac862cd0a9cd30767667843ed3b9b26edcf131643ff4e14d SHA512 f88092d3e344b66f42082d85880fb3ca6ff7c3856efbc662a660ecebaa765e05d8726210cea88dc50d4fb0a9725f639c763961ec7fc609854711ed98b4d5b118
-EBUILD zstandard-0.15.1.ebuild 941 BLAKE2B 2c85553683b281b0c3b0dfee4470fd744bf190abc68776ec50cb036af83d468848d2362a45223807b5ca78b79e2c396b94def1248bfe6937786eb7081a59bd17 SHA512 1bad138a1524b76d9be258e3e16572f693538a713d47a8fd61c940589a9ee6332df343bf428bdbd601efeea4aa362dbd05415fe02d698646faaa9329e56a145c
-EBUILD zstandard-0.15.2.ebuild 942 BLAKE2B d6fc0d52c313571d68b6c4a0b8c71af11d311f8dc0ec090757b40b25fd1b13aa0a5d48867fb90fe7da6882db7d83b81e902ae4c0425166cf93473b1a7b1110bb SHA512 6de2881097963a26b9c79282272190a2a6ca2bea90f891c43017d5b9acf9b6792c95615bd825b44a72556b6b38dbca157d60c092b86960caf117073af907baef
+EBUILD zstandard-0.15.2-r1.ebuild 1049 BLAKE2B b08d6bc0fc7dd761c0555ae913feec4e2d9efc7466ff9a63b05d0eb23bc400e7fc75c3747b74438a61e5d9444f2cb27f9f73ec65e70b99d4a0576b864ad8f5a3 SHA512 20ef99bb5f972af33cae31a00d4959ca6774a2b5c33eb41363ec380354915fbab2048ea6e949f6c25b4445517af3048b5ae6e8fa2e1286ab0d4217c6c8a436db
 MISC metadata.xml 377 BLAKE2B 987c1e1f5a7a37a8686acf05929a8c7cfa702358d5c8fcb678ebec0e28ab590d2dbfe92892330d006b202cc4fbc22eb4fec8876902ab56f44990a59932d6c0f3 SHA512 54b4b2a4b98fda27659ac1cb39e16ff788687aa814d882822ffdfa9c085b04bb3a24885f9a08ea73b05b959ed6441a6ff5090c1159300c1d024f1abf239cb141
diff --git a/dev-python/zstandard/zstandard-0.15.1.ebuild b/dev-python/zstandard/zstandard-0.15.1.ebuild
deleted file mode 100644
index 1bc00826f8c2..000000000000
--- a/dev-python/zstandard/zstandard-0.15.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Zstandard Bindings for Python"
-HOMEPAGE="https://pypi.org/project/zstandard/ https://github.com/indygreg/python-zstandard"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-DEPEND="
-	app-arch/zstd:="
-RDEPEND="${DEPEND}
-	$(python_gen_cond_dep '>=dev-python/cffi-1.14.0-r2:=[${PYTHON_USEDEP}]' 'python*')
-"
-BDEPEND="
-	test? ( dev-python/hypothesis[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests setup.py
-
-python_compile() {
-	local MAKEOPTS=-j1
-	distutils-r1_python_compile --system-zstd
-}
-
-python_install() {
-	distutils-r1_python_install --system-zstd
-}
diff --git a/dev-python/zstandard/zstandard-0.15.2.ebuild b/dev-python/zstandard/zstandard-0.15.2-r1.ebuild
index 605c6dd344ad..1fe9edfd1a63 100644
--- a/dev-python/zstandard/zstandard-0.15.2.ebuild
+++ b/dev-python/zstandard/zstandard-0.15.2-r1.ebuild
@@ -25,11 +25,15 @@ BDEPEND="
 
 distutils_enable_tests setup.py
 
-python_compile() {
-	local MAKEOPTS=-j1
-	distutils-r1_python_compile --system-zstd
-}
+src_prepare() {
+	# the C backend is repeatedly broken, so force CFFI instead
+	sed -e '/PYTHON_ZSTANDARD_IMPORT_POLICY/s:default:cffi:' \
+		-i zstandard/__init__.py || die
+
+	distutils-r1_src_prepare
 
-python_install() {
-	distutils-r1_python_install --system-zstd
+	mydistutilsargs=(
+		--no-c-backend
+		--system-zstd
+	)
 }