gentoo resync : 07.08.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-08-07 00:16:33 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-08-07 00:16:33 +0100
commit: d162ba1860a88062f4cd61f8b52fc303ba0b2991 (patch)
tree: 24cd2cf57f3932a24b96e4a0f6666489447e43ba /dev-python
parent: 590b9b7b03bf4651e099949e318755af7cfa81b8 (diff)
414 files changed, 4020 insertions, 2365 deletions
diff --git a/dev-python/Faker/Faker-8.11.0.ebuild b/dev-python/Faker/Faker-8.11.0.ebuild
new file mode 100644
index 000000000000..ada44c6701ce
--- /dev/null
+++ b/dev-python/Faker/Faker-8.11.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="A Python package that generates fake data for you"
+HOMEPAGE="https://github.com/joke2k/faker"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
+	>=dev-python/text-unidecode-1.3[${PYTHON_USEDEP}]
+	!dev-ruby/faker"
+BDEPEND="
+	test? (
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP},tiff]
+		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 4f8761d1905d..46b3f1be0db1 100644
--- a/dev-python/Faker/Manifest
+++ b/dev-python/Faker/Manifest
@@ -2,6 +2,7 @@ DIST Faker-8.10.0.tar.gz 1149474 BLAKE2B 2a5304acb1ce88230660a468756ee79abc7ae0b
 DIST Faker-8.10.1.tar.gz 1144158 BLAKE2B 7463566a8bf2f510ab89b7fd67ee3aea80ce65725063f83798a6f7ce959a1e5c4eef82504adc124add6ff028d6e248871123d0992f715d46485daa6d64d4179b SHA512 c5bb3b376757fe025255de67a184dfae959c834e937825515eaae083a2ce931f2c00ed1ade7ccba49adf182570cf533526e583e6a45c4fa08b41e22544139227
 DIST Faker-8.10.2.tar.gz 1150102 BLAKE2B 5ca744d201a7822cbe35791757a73628d3c12f6521ca55bc2d340c974cb6e76362f87395cbc858e4681738440cf676e9f9bf7a8002b908ff564dc6703ef794e0 SHA512 5a148327df7c34623c0d8c154e6181a183a0aa484659e5872013f0b9c510418690278550ebbed6eb984c87cef588fd862b213295a379b5be3433afe312181103
 DIST Faker-8.10.3.tar.gz 1149954 BLAKE2B 665ed95be11f734ed2ae9b593a4e287cc53b041521ab223efc045f061133e983de500ef12a858d7420342a500926297565b7c50674fe5533b985a00816251031 SHA512 a5969f04dd96660b3e62ece20ce4d92de9c781faa1742e45404b0a6f04dc7521c9532c519df06c4b3e9a815dde43837b7ab7628ef25ed3b60bda49c927b8ace7
+DIST Faker-8.11.0.tar.gz 1150354 BLAKE2B 9799163239afef521d352dea601a63f2702536380891182c72f856bf442441ed654412ba035dd4964ea9ca3f2c19e0737e0225a58178a2edffcc52b06047e2f1 SHA512 5a42ea5c843272f9f70edc88e405f0b309f6e6ae5c061d1f1ca7ed01f40688539371a1bce5084a0de3e424f3eb50443430ff1fafd1ef0a035d385d80b16cae2c
 DIST Faker-8.8.2.tar.gz 1148529 BLAKE2B 279984479ad4f790dc7acd74b5ccd1cf5f32689b8b1ccf2152d7dfaa6fc7b4699d9827c16f83bb86e298723b6906a5cc40c2fa7f75439b5af5fc78c1af99a3f6 SHA512 4273008bf9ab693a40da2f93ff1fe40e9e7b102a2d5439f09096b6754b82dc26310666da65723b363f628365c97d44dd290e1e7065b7a9d862130baa292325b7
 DIST Faker-8.9.0.tar.gz 1148829 BLAKE2B b24a7fa87886cb38850808de2ffe1ceafab3c548c694af30d53b1f415d329264fe7e53f33f46b913d16310dd83d95fe591689a308bb7d4c653254e39defaa24b SHA512 d2e26ae140c30ae8069f8e0fd75bb9bf54aa00a7271b327e37dd248520256e137d192082071bc36a584fc864c54c050107ddecb40624288636c6b41caf1ea574
 DIST Faker-8.9.1.tar.gz 1148890 BLAKE2B 2cab6461bf6067d9dfd8872c19c8c11fa25ffef82b61b7e7676ffc187346d228703424a73278678f19263423716c74ecd47cfc1c17bf54d38bba712e456650b8 SHA512 f7016b320c7394b0eccc06e833a80e227cdbad9c0f34eb9f8f4413f56a4743f58bbd7ec5eac3b8c0642e7764c6c5986707d493f0c84daa75575a12061631c9c5
@@ -9,6 +10,7 @@ EBUILD Faker-8.10.0.ebuild 721 BLAKE2B 507ce2b42185094a19fff4f55a8a084a15944c5df
 EBUILD Faker-8.10.1.ebuild 721 BLAKE2B 507ce2b42185094a19fff4f55a8a084a15944c5df6d8d7eec5a66a20140e66271029e8d9e32d763d68f69fe66355dee528fd8288950202c2b4080d3b5145d0af SHA512 b95a1b67e85b0d7224a90c767857cd0cde0c4cc3e9c4cc35add4548c1a43d1d017a43747b7b680cbae4af80f8385b58cdb34aadf5eb3d57e7537e7e7e59d03fd
 EBUILD Faker-8.10.2.ebuild 721 BLAKE2B 507ce2b42185094a19fff4f55a8a084a15944c5df6d8d7eec5a66a20140e66271029e8d9e32d763d68f69fe66355dee528fd8288950202c2b4080d3b5145d0af SHA512 b95a1b67e85b0d7224a90c767857cd0cde0c4cc3e9c4cc35add4548c1a43d1d017a43747b7b680cbae4af80f8385b58cdb34aadf5eb3d57e7537e7e7e59d03fd
 EBUILD Faker-8.10.3.ebuild 721 BLAKE2B 507ce2b42185094a19fff4f55a8a084a15944c5df6d8d7eec5a66a20140e66271029e8d9e32d763d68f69fe66355dee528fd8288950202c2b4080d3b5145d0af SHA512 b95a1b67e85b0d7224a90c767857cd0cde0c4cc3e9c4cc35add4548c1a43d1d017a43747b7b680cbae4af80f8385b58cdb34aadf5eb3d57e7537e7e7e59d03fd
+EBUILD Faker-8.11.0.ebuild 721 BLAKE2B 507ce2b42185094a19fff4f55a8a084a15944c5df6d8d7eec5a66a20140e66271029e8d9e32d763d68f69fe66355dee528fd8288950202c2b4080d3b5145d0af SHA512 b95a1b67e85b0d7224a90c767857cd0cde0c4cc3e9c4cc35add4548c1a43d1d017a43747b7b680cbae4af80f8385b58cdb34aadf5eb3d57e7537e7e7e59d03fd
 EBUILD Faker-8.8.2.ebuild 721 BLAKE2B 3b750bb0006162a841d700bfdb69f3f73cfda16d476043706dc2126e18eaf044285f1c083fb0f03da88c8ec6a3d9fa46ee4993adf1239f237cc5c43e7feac376 SHA512 95b831595ece05fdf82647aac10a4b59f212589d17dbba04fa432f2a7cbc04e0f05fcffd9be8129bf1799830e39130d556232e1cbdc04a028a483c16bb570c53
 EBUILD Faker-8.9.0.ebuild 721 BLAKE2B 507ce2b42185094a19fff4f55a8a084a15944c5df6d8d7eec5a66a20140e66271029e8d9e32d763d68f69fe66355dee528fd8288950202c2b4080d3b5145d0af SHA512 b95a1b67e85b0d7224a90c767857cd0cde0c4cc3e9c4cc35add4548c1a43d1d017a43747b7b680cbae4af80f8385b58cdb34aadf5eb3d57e7537e7e7e59d03fd
 EBUILD Faker-8.9.1.ebuild 721 BLAKE2B 507ce2b42185094a19fff4f55a8a084a15944c5df6d8d7eec5a66a20140e66271029e8d9e32d763d68f69fe66355dee528fd8288950202c2b4080d3b5145d0af SHA512 b95a1b67e85b0d7224a90c767857cd0cde0c4cc3e9c4cc35add4548c1a43d1d017a43747b7b680cbae4af80f8385b58cdb34aadf5eb3d57e7537e7e7e59d03fd
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index edca4b98f48d..0c1ba5730e77 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/PyQt5/Manifest b/dev-python/PyQt5/Manifest
index 8f2914e38d1e..994a2de0ef4a 100644
--- a/dev-python/PyQt5/Manifest
+++ b/dev-python/PyQt5/Manifest
@@ -1,5 +1,7 @@
 DIST PyQt5-5.15.2.tar.gz 3265445 BLAKE2B 7712d68aa54cf9e6836863d7aa645151254d79621e115ed314ba63c371d5e24577a0392311b31a73e45af45baa29eca1d7e9a03874beac1fbf043fa703af69f9 SHA512 6d48d2ed907b436131d46b0513d82e1069c76e873d395e4a6c0832ae3a20621b92d3abece046c5fcd14cb818d50ffb369153fca1ce9341f0db1b8c479b94e621
 DIST PyQt5-5.15.4.tar.gz 3258085 BLAKE2B 96bda4da1321e499707d29d9870693815170ccc32e2e0d7bb3c6977ea2933f9684557124deb92abbf92b923e0071cf47ee4822f6cb5d06fdc61b498efc44db4c SHA512 6d19f549a71eb8df8ba8407398ccd6e3d339436f4f2e7c5dca6885849d6ce510c4f4dea3c97257685aa462bb09a2ead33d80234ccb934f9b1a40285dbec631c7
+DIST PyQt5-5.15.5.dev2107091435.tar.gz 3264477 BLAKE2B 8289bcce9ebef9b8c289992d508ee1d365c86a127b03e175bb14382ad72150aea396d8358d560ce62b9ff33f3b54f3ebb0bbad8ab26a23edc73217c8325d9853 SHA512 5baf434f57c72a0e01753c69f8b40bc37321441efb652e002e3fff330edb8b7b318af3803fc8702897545763a952f99b68a0043a08e364e6fc1feb1e5d8520f5
 EBUILD PyQt5-5.15.2.ebuild 5645 BLAKE2B bcb40684f9eba4b134884b3d73da969e923e7c1fcd788162ebdb2ff2b47633d2ee60cc3571fe673e05c76fb33926d83cbeee66e7d50e8c240cd35bede1b20191 SHA512 24e491d79e9ce3d9fc2190792e2b7c370ec3816f3bf99bf21448123180dfe4747ffa57bb4ad3efbecd1865eb165de47df9744f5d57ba0eb16972d1882df7a09d
-EBUILD PyQt5-5.15.4-r1.ebuild 5433 BLAKE2B d264b8e00d413eb9d2bdeba8645b94f3098360838d91844f8045344d0a0a150c5466dffae48352f3c58b454e134c86a460260f928ac3e3fb59fc28f48e4fa890 SHA512 0f972e0ab1beb7f25c0881e1ff98bc3dfe9d9a9ef8ae4cadd0f940cf96cb01c641a72b4dc16fec3c0e402514705589837719fcb23b842ec6bab7b5747802b018
+EBUILD PyQt5-5.15.4-r1.ebuild 5435 BLAKE2B bb6fb54e130812edb25acfdd71a12c070390bafe3cf25e66639aedc20af2058d1641e088d63507467d50a788ccf0e4bbddd2baec6f87f01731ee4bf43fd49335 SHA512 3706f43c3aa9a0d64ac13566e8c0eb4a69651ac0e2a9ff58b51858d99680fcf301fb905edba8d9ce8fe986075b66d1f9d103d15ad5f8f4ca2e2938b12cd62a1e
+EBUILD PyQt5-5.15.5_pre2107091435.ebuild 5401 BLAKE2B 5feec52e824c809419d0591b97359feea3d099c7ca919f1373674165f1168eadc436d7d4d2f6ee9b09a2107a62eb688031ae3f7391d6f26d02c2ddeb712b2232 SHA512 39a09886fc3bcf4adc8cf9c6f90119c52c3ecb3f15e8d676b1ac4e2aca7859acfed19962f7cdbb0d8693d6ba3af156d0d4a30f1aaa78146d55279ec9f1c6db3a
 MISC metadata.xml 2432 BLAKE2B 56cd4edfd99449ed4d837edec6952e85d0fa13bdca2189451b7c43645b39a7a7a810f4e206f7aba6690d65529a5f629db532d4ab056374952b34834d2d68fbc3 SHA512 acb9f52dbeed59158c5ef83ffef67e51e4362191210b6addfd5c3e4aa1d17f208ab5ce316d7a8d5116dabe3dba5b58d28ac6f197ebaa832f3b33f4a13a881a62
diff --git a/dev-python/PyQt5/PyQt5-5.15.4-r1.ebuild b/dev-python/PyQt5/PyQt5-5.15.4-r1.ebuild
index 78f0bdd5dd0e..7030695c18fb 100644
--- a/dev-python/PyQt5/PyQt5-5.15.4-r1.ebuild
+++ b/dev-python/PyQt5/PyQt5-5.15.4-r1.ebuild
@@ -85,7 +85,7 @@ RDEPEND="${PYTHON_DEPS}
 	xmlpatterns? ( >=dev-qt/qtxmlpatterns-${QT_PV} )
 "
 DEPEND="${RDEPEND}
-	>=dev-python/sip-4.19.25[${PYTHON_USEDEP}]
+	>=dev-python/sip-4.19.25:0[${PYTHON_USEDEP}]
 	dbus? ( virtual/pkgconfig )
 "
 
diff --git a/dev-python/PyQt5/PyQt5-5.15.5_pre2107091435.ebuild b/dev-python/PyQt5/PyQt5-5.15.5_pre2107091435.ebuild
new file mode 100644
index 000000000000..7d1bf6e760cb
--- /dev/null
+++ b/dev-python/PyQt5/PyQt5-5.15.5_pre2107091435.ebuild
@@ -0,0 +1,193 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit python-r1 qmake-utils
+
+DESCRIPTION="Python bindings for the Qt framework"
+HOMEPAGE="https://www.riverbankcomputing.com/software/pyqt/ https://pypi.org/project/PyQt5/"
+
+MY_P=${PN}-${PV/_pre/.dev}
+if [[ ${PV} == *_pre* ]]; then
+	SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+fi
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+# TODO: QtNfc, QtQuick3D, QtRemoteObjects
+IUSE="bluetooth dbus debug declarative designer examples gles2-only gui help location
+	multimedia network opengl positioning printsupport sensors serialport speech
+	sql svg testlib webchannel websockets widgets x11extras xmlpatterns"
+
+# The requirements below were extracted from the qmake_QT declarations
+# in project.py and from the output of 'grep -r "%Import " ${S}/sip'
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	bluetooth? ( gui )
+	declarative? ( gui network )
+	designer? ( widgets )
+	help? ( gui widgets )
+	location? ( positioning )
+	multimedia? ( gui network )
+	opengl? ( gui widgets )
+	positioning? ( gui )
+	printsupport? ( gui widgets )
+	sensors? ( gui )
+	serialport? ( gui )
+	sql? ( widgets )
+	svg? ( gui widgets )
+	testlib? ( widgets )
+	webchannel? ( network )
+	websockets? ( network )
+	widgets? ( gui )
+	xmlpatterns? ( network )
+"
+
+# Minimal supported version of Qt.
+QT_PV="5.15:5"
+
+DEPEND="${PYTHON_DEPS}
+	>=dev-qt/qtcore-${QT_PV}
+	>=dev-qt/qtxml-${QT_PV}
+	bluetooth? ( >=dev-qt/qtbluetooth-${QT_PV} )
+	dbus? (
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+		>=dev-qt/qtdbus-${QT_PV}
+	)
+	declarative? ( >=dev-qt/qtdeclarative-${QT_PV}[widgets?] )
+	designer? ( >=dev-qt/designer-${QT_PV} )
+	gui? ( >=dev-qt/qtgui-${QT_PV}[gles2-only=] )
+	help? ( >=dev-qt/qthelp-${QT_PV} )
+	location? ( >=dev-qt/qtlocation-${QT_PV} )
+	multimedia? ( >=dev-qt/qtmultimedia-${QT_PV}[widgets?] )
+	network? ( >=dev-qt/qtnetwork-${QT_PV}[ssl] )
+	opengl? ( >=dev-qt/qtopengl-${QT_PV} )
+	positioning? ( >=dev-qt/qtpositioning-${QT_PV} )
+	printsupport? ( >=dev-qt/qtprintsupport-${QT_PV} )
+	sensors? ( >=dev-qt/qtsensors-${QT_PV} )
+	serialport? ( >=dev-qt/qtserialport-${QT_PV} )
+	speech? ( >=dev-qt/qtspeech-${QT_PV} )
+	sql? ( >=dev-qt/qtsql-${QT_PV} )
+	svg? ( >=dev-qt/qtsvg-${QT_PV} )
+	testlib? ( >=dev-qt/qttest-${QT_PV} )
+	webchannel? ( >=dev-qt/qtwebchannel-${QT_PV} )
+	websockets? ( >=dev-qt/qtwebsockets-${QT_PV} )
+	widgets? ( >=dev-qt/qtwidgets-${QT_PV} )
+	x11extras? ( >=dev-qt/qtx11extras-${QT_PV} )
+	xmlpatterns? ( >=dev-qt/qtxmlpatterns-${QT_PV} )
+"
+RDEPEND="${DEPEND}
+	>=dev-python/PyQt5-sip-12.9:=[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/PyQt-builder-1.10[${PYTHON_USEDEP}]
+	>=dev-python/sip-6.2.0_pre2106291255[${PYTHON_USEDEP}]
+	>=dev-qt/qtcore-${QT_PV}
+	dbus? ( virtual/pkgconfig )
+"
+
+src_prepare() {
+	default
+
+	if use gles2-only; then
+		# sip-build doesn't have a command line option for this
+		cat >> pyproject.toml <<-_EOF_ || die
+			[tool.sip.bindings.QtCore]
+			disabled-features = ["PyQt_Desktop_OpenGL"]
+		_EOF_
+	fi
+}
+
+src_configure() {
+	pyqt_use_enable() {
+		use "$1" || return
+
+		if [[ $# -eq 1 ]]; then
+			echo --enable=Qt${1^}
+		else
+			shift
+			echo ${@/#/--enable=}
+		fi
+	}
+
+	configuration() {
+		local myconf=(
+			sip-build
+			--verbose
+			--confirm-license
+			--build-dir="${BUILD_DIR}"
+			--scripts-dir="$(python_get_scriptdir)"
+			--qmake="$(qt5_get_bindir)"/qmake
+			--no-make
+			$(usev debug '--debug --qml-debug --tracing')
+			--enable=Qt
+			$(pyqt_use_enable bluetooth)
+			--enable=QtCore
+			$(pyqt_use_enable dbus QtDBus)
+			$(usex dbus '' --no-dbus-python)
+			$(pyqt_use_enable declarative QtQml QtQuick $(usev widgets QtQuickWidgets))
+			$(usex declarative '' --no-qml-plugin)
+			$(pyqt_use_enable designer)
+			$(usex designer '' --no-designer-plugin)
+			$(pyqt_use_enable gui)
+			$(pyqt_use_enable gui $(use gles2-only && echo _QOpenGLFunctions_ES2 || echo _QOpenGLFunctions_{2_0,2_1,4_1_Core}))
+			$(pyqt_use_enable help)
+			$(pyqt_use_enable location)
+			$(pyqt_use_enable multimedia QtMultimedia $(usev widgets QtMultimediaWidgets))
+			$(pyqt_use_enable network)
+			$(pyqt_use_enable opengl QtOpenGL)
+			$(pyqt_use_enable positioning)
+			$(pyqt_use_enable printsupport QtPrintSupport)
+			$(pyqt_use_enable sensors)
+			$(pyqt_use_enable serialport QtSerialPort)
+			$(pyqt_use_enable speech QtTextToSpeech)
+			$(pyqt_use_enable sql)
+			$(pyqt_use_enable svg)
+			$(pyqt_use_enable testlib QtTest)
+			$(pyqt_use_enable webchannel QtWebChannel)
+			$(pyqt_use_enable websockets QtWebSockets)
+			$(pyqt_use_enable widgets)
+			$(pyqt_use_enable x11extras QtX11Extras)
+			--enable=QtXml
+			$(pyqt_use_enable xmlpatterns QtXmlPatterns)
+			--enable=pylupdate
+			--enable=pyrcc
+		)
+		echo "${myconf[@]}"
+		"${myconf[@]}" || die
+
+		# Run eqmake to respect toolchain and build flags
+		run_in_build_dir eqmake5 -recursive ${PN}.pro
+	}
+	python_foreach_impl configuration
+}
+
+src_compile() {
+	python_foreach_impl run_in_build_dir default
+}
+
+src_install() {
+	installation() {
+		emake INSTALL_ROOT="${D}" install
+		python_optimize
+
+		local exe
+		for exe in "${D}$(python_get_scriptdir)"/*; do
+			python_doexe "${exe}"
+		done
+	}
+	python_foreach_impl run_in_build_dir installation
+
+	einstalldocs
+
+	if use examples; then
+		dodoc -r examples
+	fi
+}
diff --git a/dev-python/PyQtWebEngine/Manifest b/dev-python/PyQtWebEngine/Manifest
index bc7a49fea4f7..234a3d649da9 100644
--- a/dev-python/PyQtWebEngine/Manifest
+++ b/dev-python/PyQtWebEngine/Manifest
@@ -1,5 +1,5 @@
 DIST PyQtWebEngine-5.15.2.tar.gz 48608 BLAKE2B a03f77b0cde0d1031e8f1c4c6b5d13a342c28cf814ebaaf4a2cdb4608ce40cdd8163783932abc76cda583c0fed7191653b537598a9ab65f6509ef88008538e31 SHA512 7e6d95833b1a9e5bb5275eff01e1923419da35d13862fc4cbb231cbf950ed45e628bc7e161b0b6b66c718ee439a1a8e66dd754cee9adcdf69ab1b8ffab58901e
 DIST PyQtWebEngine-5.15.4.tar.gz 49022 BLAKE2B 0ac0b3424f22aabbfd733f2a876e502f133c81f639fbd87a4c7509865635b29d4bd3596ccc151b0919a28eff0015913c4fae1a831dbe774fe2d2aeee732e469b SHA512 25cf8578ffae8adbc1dd8d914921b4edf91f19fcf983c9c83c9c8934b4e918ba27bd34a6b9c8252773ec32e6f1f13a06f22cf7d7326a5aceaa91530ea4ee047e
 EBUILD PyQtWebEngine-5.15.2.ebuild 1665 BLAKE2B 54f976b7e747e2d50aabf99728fc79c1efc49d782d806782677b00c5d32780abc206265760cdb06184ff188c289213c795cb3f65f947f439c69621424192a258 SHA512 3679084254b292ad8b7f51ee80cd9ccbb2e6015965abce43f8c27edcd84ab7e15e83ae40d731404c42805dce598e5dca3a4f665354a3244b86f4e6cd4b573742
-EBUILD PyQtWebEngine-5.15.4.ebuild 1707 BLAKE2B 38c1186a305c4c2e5ecd05a7407a7a535c023a35160853561de4747f1e70406d25f6db94273af8c3817171e7726a200749c57955766c507f477e97a2eecac063 SHA512 b42f7f5dea9802588aba25c7263588afe76127644a0b5d7a5d50d01af5c7019e220c6ecb98ad37ce5402db0bbacb56eb72add4e656da439976fe1b80820e7174
+EBUILD PyQtWebEngine-5.15.4.ebuild 1705 BLAKE2B 61c47b552ce438e3e4429ed7b6230559b3f2143bad5c2daebff9bbc17f179464183157c8e723b4889b20c8e22b8e43af72ee4ce5c9cc854118830a053070714e SHA512 0c331528212847f92712d7e1c3c0a1d41d354fb84827f588f3270d5f2664d39ca974c6cda3b028cb1e0e504951df288ed2fbce5bf106799437e10a3e58ebcd2a
 MISC metadata.xml 958 BLAKE2B 3d360762116d92a71aee391ba8bb5eaeb4f8347f22c0bad7c05211d82cf9bf9ce04e74baa1691c3a48c7be7c3906c180234a7b3c33b76e56c6b94982ad0045f5 SHA512 06ed8222b239484fdb7d1e7ab35b922b9eea81ec144bace571355302d1b01dbd6bd80d2d5c03d1ec7f7edad851050305d2e87232f5580e92276018c7c4e9753f
diff --git a/dev-python/PyQtWebEngine/PyQtWebEngine-5.15.4.ebuild b/dev-python/PyQtWebEngine/PyQtWebEngine-5.15.4.ebuild
index 8aca0d1edee6..fad00a88922c 100644
--- a/dev-python/PyQtWebEngine/PyQtWebEngine-5.15.4.ebuild
+++ b/dev-python/PyQtWebEngine/PyQtWebEngine-5.15.4.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{8..10} )
 inherit python-r1 qmake-utils
 
 DESCRIPTION="Python bindings for QtWebEngine"
-HOMEPAGE="https://www.riverbankcomputing.com/software/pyqtwebengine/intro https://pypi.org/project/PyQtWebEngine/"
+HOMEPAGE="https://www.riverbankcomputing.com/software/pyqtwebengine/ https://pypi.org/project/PyQtWebEngine/"
 
 MY_P=${PN}-${PV/_pre/.dev}
 if [[ ${PV} == *_pre* ]]; then
@@ -28,13 +28,13 @@ REQUIRED_USE="
 
 RDEPEND="
 	${PYTHON_DEPS}
-	>=dev-python/PyQt5-5.15[gui,network,printsupport,ssl,webchannel,widgets,${PYTHON_USEDEP}]
+	~dev-python/PyQt5-5.15.4[gui,network,printsupport,ssl,webchannel,widgets,${PYTHON_USEDEP}]
 	>=dev-python/PyQt5-sip-4.19.22:=[${PYTHON_USEDEP}]
 	dev-qt/qtcore:5
 	dev-qt/qtwebengine:5[widgets]
 "
 DEPEND="${RDEPEND}
-	>=dev-python/sip-4.19.22[${PYTHON_USEDEP}]
+	>=dev-python/sip-4.19.22:0[${PYTHON_USEDEP}]
 "
 
 src_configure() {
diff --git a/dev-python/agate-dbf/Manifest b/dev-python/agate-dbf/Manifest
index 3ff8613bbe1f..a0a2211b4d38 100644
--- a/dev-python/agate-dbf/Manifest
+++ b/dev-python/agate-dbf/Manifest
@@ -2,5 +2,5 @@ DIST agate-dbf-0.2.2.tar.gz 2863 BLAKE2B 112b03e1a02b70e63f77195a999a60a59b4e02a
 DIST agate-dbf-0.2.2_examples%2Ftest.dbf 1314 BLAKE2B 81d5507b88fe7f7c3866d8666feff12bf3b14451affd653d76239f8785037c908509de248ac4bc8dbebeba4b1a84d69a48bf97b83716fe489ceb39f8ccf0e935 SHA512 460f9a624a6fed58d1fe0484ff6f7fa081d595d8f1a04f4f449ef6de037e334abb9da0403622e5af8c7914e02cda2fa38c4058ef1bb650e59e50584b9ae73b2e
 DIST agate-dbf-0.2.2_examples%2Ftestdbf_converted.csv 896 BLAKE2B fe535d9b784088118fcd61b5378d49d92bac801be61e7900200625f267c8f9c454729376b292d809d3e6a6ee2a093e2a813524ff9199223cbc89a9a461feed40 SHA512 ddba24038d4500b97ff8b11b03a5260927a299f1732aa0a6bcb4746c52e04825f2f3d5d211141576736008ff7f56d0970b21c06f4afad53a4e4e0a873815516b
 DIST agate-dbf-0.2.2_tests%2Ftest_table.py 574 BLAKE2B 22a744ae20491632795a0b654d8ab1e8adc090d43d0a18352b83cfc1687c57d33f1159d96cb379743d293203412dbbbaae8c33be195ae9d868584671ff0ea74d SHA512 131d8a553bc9c7538959e1ae29b62c47cea3e14365afca4e92e4f36cc8dab7e4b00efa462db5e9ca0f51b5e3eda892cf91881d65bd1302fa80bd5b0f66fa4076
-EBUILD agate-dbf-0.2.2.ebuild 1581 BLAKE2B 1334d55687a380582f2898b2014ae51365ddb04fd2d51a54e8e36049fc781430d4a550bf47966c30d72a1a8b88f31463aa12a331c87811be08d8cac838384eb9 SHA512 d408a9f5378260fec7b2ed9ee374e1901fc2e2e0092f09d98ebbac978f092f2eb8bed02e5971c1dccaa14d5a80ee1cea5041a16d8ee70386cb4225085f27bb8d
-MISC metadata.xml 512 BLAKE2B ec17367c2f3f9e56074f83615fd39f5edb146abe932307a4c775456e711d784c0a4636bf6dc8859c62b37cc4132735a728296211c95ebcc3b8f55ae74d10d45a SHA512 e830ccb01745a1d493655184bf1a899bfbd4bccde225fc7fcefe6b3979d28a80adb93783cb0fbb5844de04f31895ecbbc8790e13ea6485f0eb388576f9ff7c33
+EBUILD agate-dbf-0.2.2.ebuild 1519 BLAKE2B 9f5635ba118e86976f9498053c21bc0fafa64e465bf8f108836647db425adfa5a8c04cc5e7e61e6ba4cfcbdff8ca2fbcaed40318c7bb3673b83c65a1d5e81610 SHA512 1be17ff2968e9fdfc0e2c72d65dc2355f2ca6944dd55774c918ca4f11e66604aecf69826fca131c153132a15d3972bb104edc74024b2da389ee2b65e886aa358
+MISC metadata.xml 536 BLAKE2B 5d921e1557dd6aca4383d34d51a1930384e5da044cddfcc74999a79704f60ba53f7c92289ebbde2647c62d20f5a01d0ab88b5b24558fb7dbdaad6d38d281f144 SHA512 510a7dd9bdfcce44548349a750ccf16c9f46992f0027702c5e09023f53dec1e3c1d3a0b8cee9d10591e96af848ba1d3e634f2986952565a0d6ec5f993fe49e74
diff --git a/dev-python/agate-dbf/agate-dbf-0.2.2.ebuild b/dev-python/agate-dbf/agate-dbf-0.2.2.ebuild
index 772d11bd4f56..04248032f373 100644
--- a/dev-python/agate-dbf/agate-dbf-0.2.2.ebuild
+++ b/dev-python/agate-dbf/agate-dbf-0.2.2.ebuild
@@ -1,20 +1,20 @@
 # Copyright 2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-PYTHON_COMPAT=( python3_{8..9} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
 DESCRIPTION="Adds read support for DBF files to agate."
 HOMEPAGE="https://github.com/wireservice/agate-dbf https://pypi.org/project/agate-dbf/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="test +xml"
-RESTRICT="!test? ( test )"
+IUSE="+xml"
 
 # Other packages have BDEPEND="test? ( dev-python/agate-dbf[xml] )"
 AGATE_VERSION_DEP=">=dev-python/agate-1.5.0"
diff --git a/dev-python/agate-dbf/metadata.xml b/dev-python/agate-dbf/metadata.xml
index 93b393c9134f..5f83acacc3a5 100644
--- a/dev-python/agate-dbf/metadata.xml
+++ b/dev-python/agate-dbf/metadata.xml
@@ -4,6 +4,7 @@
 	<maintainer type="person">
 		<email>zmedico@gentoo.org</email>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<bugs-to>https://github.com/wireservice/agate-dbf/issues</bugs-to>
 		<changelog>https://github.com/wireservice/agate-dbf/blob/master/CHANGELOG.rst</changelog>
diff --git a/dev-python/agate-excel/Manifest b/dev-python/agate-excel/Manifest
index 84ef1f0d9ed5..c34fb3200aea 100644
--- a/dev-python/agate-excel/Manifest
+++ b/dev-python/agate-excel/Manifest
@@ -1,3 +1,3 @@
 DIST agate-excel-0.2.3.tar.gz 153880 BLAKE2B f090c8bbb75341623545781cbf116b547ebc16249eb0c6814e9fbd51d2688fd2bd0354d187d2f803bde69e563b57836e3d214e287ae62455c59075020588d235 SHA512 3a50bab182391bdadb2e0a82dc28a3cfa1eebbe67744835ab20581a67f7f08f4edb96eebc9a286ac4a6a302996571563ca9e487ea7defdcf07265e9c42436ddf
-EBUILD agate-excel-0.2.3.ebuild 1221 BLAKE2B 3d27b1d2f248306abd7742204e1736ab1f93e3b6235e811dcfae2e37c74809b15f8f19c40e8f625acecfe8998915eaf8d91dc1d9d872539cf4e58af8ba122dcf SHA512 a7e81b85932f0e7b95c5c68f9f2ae513defe74830d9e237bab2c639fb5c9244c74a3be5563ff6f2372d9a697fb560cd2638571890bc3833c94e43d2d9bdcf98b
-MISC metadata.xml 520 BLAKE2B 76548784a8782afa93d38311da98f13f33ac7291f88699dd6c9b2430081803e6a9fbd9d378f060dc641ff6ebc5cea664f60b09d7cc1e58bdb50a2a94bd277843 SHA512 de75458d4d3976f6c54ff41ff14d98b34cee9a2dc3e8830f76362c5c024f8849b8cd27a4999bb9e0cd8adb3e7bf89ace54d5f5eadaeb7975e4145389d635f1ad
+EBUILD agate-excel-0.2.3.ebuild 1025 BLAKE2B cacc20dd57b3412c1f218157d0f63aeef6d50f07c031ad411fd2e20d518603437a933add8775f0e884c1b44e2bd6235c85173ab9d70d1787044cf4f4ef723ffd SHA512 99fd7aee5e08b2245589ce1dfd4a1e96e152651b1c6cf29a572995fff4ea0c189db28812dc91785529b2a1a3d637f5ea54a0e401b4e749ecdfe6044d57950168
+MISC metadata.xml 544 BLAKE2B f41f6f3a5787f6d5a1ff01713cf75c9ba595840505009096b7d91acb8e559cd0014c76eb5ac0ddc00c95cd460bcb52b75f7f044ca90235d9e9a749292ed99945 SHA512 64800c9e5b298eaeaa468890d8e018973c6240bc7251991ccd2af4f163ef0200c03a39252af8146b1590a4118839430f817384b3afa370012f8a4d1cd2b86748
diff --git a/dev-python/agate-excel/agate-excel-0.2.3.ebuild b/dev-python/agate-excel/agate-excel-0.2.3.ebuild
index 0774e1cfcadd..2aa921d5926e 100644
--- a/dev-python/agate-excel/agate-excel-0.2.3.ebuild
+++ b/dev-python/agate-excel/agate-excel-0.2.3.ebuild
@@ -1,22 +1,20 @@
 # Copyright 2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-PYTHON_COMPAT=( python3_{8..9} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
 DESCRIPTION="Adds read support for Excel files (xls and xlsx) to agate."
 HOMEPAGE="https://github.com/wireservice/agate-excel https://pypi.org/project/agate-excel/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE=""
-RDEPEND=""
-IUSE="test +xml"
-RESTRICT="!test? ( test )"
+IUSE="+xml"
 
 # Other packages have BDEPEND="test? ( dev-python/agate-excel[xml] )"
 AGATE_VERSION_DEP=">=dev-python/agate-1.5.0"
@@ -33,15 +31,8 @@ BDEPEND="test? ( ${AGATE_VERSION_DEP}[xml,${PYTHON_USEDEP}] )"
 distutils_enable_tests pytest
 
 python_test() {
-	local pytest_args test_name xfails
-
-	xfails=(
+	local deselect=(
 		tests/test_table_xlsx.py::TestXLSX::test_ambiguous_date
 	)
-
-	for test_name in "${xfails[@]}"; do
-		pytest_args+=(--deselect "${test_name}")
-	done
-
-	epytest "${pytest_args[@]}" || die
+	epytest ${deselect[@]/#/--deselect }
 }
diff --git a/dev-python/agate-excel/metadata.xml b/dev-python/agate-excel/metadata.xml
index 8799df8cb528..7ba58d0d86fb 100644
--- a/dev-python/agate-excel/metadata.xml
+++ b/dev-python/agate-excel/metadata.xml
@@ -4,6 +4,7 @@
 	<maintainer type="person">
 		<email>zmedico@gentoo.org</email>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<bugs-to>https://github.com/wireservice/agate-excel/issues</bugs-to>
 		<changelog>https://github.com/wireservice/agate-excel/blob/master/CHANGELOG.rst</changelog>
diff --git a/dev-python/agate-sql/Manifest b/dev-python/agate-sql/Manifest
index f8763e930369..dc4f343d7ed6 100644
--- a/dev-python/agate-sql/Manifest
+++ b/dev-python/agate-sql/Manifest
@@ -1,5 +1,3 @@
-DIST agate-sql-0.5.6.tar.gz 9091 BLAKE2B 9094a2bfb500422e7fe75d1c83182af698aa92942a305a69301d45d92f01960a7ffc7908f0eb2b66556a856be0f7388e222034428afd269d402488c6c05abd36 SHA512 b4234a86f8bcd5b22bcb1e18d0cec0ba21c8a3521e15f767886241e16285cbd296683f83bd366a82d1e549679b3712663adc080950dedb24a0e6db5b2541050a
 DIST agate-sql-0.5.7.tar.gz 14975 BLAKE2B 7890d5c21d89dd216a7a4c906189e1e44111bd96ef3476f0e6dc4c842dc3f25d537ee398f3c8e720d43e64001fa0ea93940d4a54ee31605eea9e8ae9aa4dec37 SHA512 df7e1d5975d9af0722f4bfa67f1e8679ed46759f8aaa5c76614ed5280c8347f727517568ba377c21dd8eb349f93b7a6d308959ae69bfedd125e6d99bd7bd9dcf
-EBUILD agate-sql-0.5.6.ebuild 1477 BLAKE2B f5a946abb127d8ce24ccd77fc573e6440df8b3c0d1317834e0128d9a8057e1b83f0e054aeb16f2e968c869fd2226d7e5bb1ba1a825d7f91df9dfabb01b80a7f0 SHA512 5e10af0fe07be21b99050734f01e562e0ac2b6fa7d7439eb81e883a601774756fdd32ec244ffdeb2a4ad084c361a0cb8689cdf7ff3f567a33ef5a816db1d02d5
-EBUILD agate-sql-0.5.7.ebuild 1406 BLAKE2B c1b9db47eddbd9cb8a2748b9b6560f0a2c26a0334c60572b01f80826e3766fc52b14aa29747545338ed1ed0ab8b2e4e96ec02ccb7a54ede0003d7f4f2b4a8a2b SHA512 d941e02a642f31f9bf7268a36a6c4cd460fa25d7eedb5761ec571615590cde84b69b3f8b50167a1040dd4e3259aee2a080aac7b432bff66ad428a8dc948d81bc
-MISC metadata.xml 512 BLAKE2B 0709aed8b06df8981ad0b0c2733a1acde06a0753701b6b35ad9662e5c66871529b968a71d39265d0fd72aec90f09f7166848e1155d240815041bff498d4be06a SHA512 f09f6203a8f90abb3646be9e8d2abb4d8b367a857f384a7c43d43862953c99111e05707eb4890a6a3abcfd33aa8717bc65b180771c0cc97e5ff1ed762978f95f
+EBUILD agate-sql-0.5.7.ebuild 1299 BLAKE2B e872f58baf8ee4de3adee73f69d59de678cc0bf18d1fcb85a53872546183c3179bc0ef2d79a7d94694c32071910eb3e63f2930d7b5c44047efdc153e3ea55c0f SHA512 4590164573b2b97d0139ac6e636709c7a9c6fd568b3ae9e29712cebf4c5b827c1853fd8587f8d1af9025b04821eae64fc633468e606f139ba74c326f93e40ab5
+MISC metadata.xml 536 BLAKE2B 12819e737cd063c61f213bd3b093420cf474bde6c4e483ebfc98348e47d99925912f78abd93cb1461dc37a469c06759224e27688d2a1c5b8408ba9fb7a2522ad SHA512 9b0429fe9287edf3a9883fd4d76e70c447d1b03c4e43506d7969650e65e84b184a4da7ec7b949db47c7fb8fe64d351cff974b30ab1735bff70edf34de32234a3
diff --git a/dev-python/agate-sql/agate-sql-0.5.6.ebuild b/dev-python/agate-sql/agate-sql-0.5.6.ebuild
deleted file mode 100644
index 9dbdd4b64698..000000000000
--- a/dev-python/agate-sql/agate-sql-0.5.6.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..9} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Adds SQL read/write support to agate."
-HOMEPAGE="https://github.com/wireservice/agate-sql https://pypi.org/project/agate-sql/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test +xml"
-RESTRICT="!test? ( test )"
-
-# Other packages have BDEPEND="test? ( dev-python/agate-sql[xml] )"
-AGATE_VERSION_DEP=">=dev-python/agate-1.5.0"
-TEST_AGAINST_RDEPEND="xml? ( ${AGATE_VERSION_DEP}[xml,${PYTHON_USEDEP}] )"
-RDEPEND="
-	${AGATE_VERSION_DEP}[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-1.0.8[${PYTHON_USEDEP}]
-
-	${TEST_AGAINST_RDEPEND}
-"
-BDEPEND="test? ( ${AGATE_VERSION_DEP}[xml,${PYTHON_USEDEP}] )"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	local sed_args=(
-		-e "/crate/d"
-		-e "/nose/d"
-		-e "/geojson/d"
-		-e "/Sphinx/d"
-		-e "/sphinx_rtd_theme/d"
-	)
-
-	sed "${sed_args[@]}" -i setup.py agate_sql.egg-info/requires.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local pytest_args test_name xfails
-
-	xfails=(
-		tests/test_agatesql.py::TestSQL::test_to_sql_create_statement_with_dialects
-		tests/test_agatesql.py::TestSQL::test_to_sql_create_statement_with_schema
-	)
-
-	for test_name in "${xfails[@]}"; do
-		pytest_args+=(--deselect "${test_name}")
-	done
-
-	epytest "${pytest_args[@]}" || die
-}
diff --git a/dev-python/agate-sql/agate-sql-0.5.7.ebuild b/dev-python/agate-sql/agate-sql-0.5.7.ebuild
index e58ff6efb206..a5527246e03d 100644
--- a/dev-python/agate-sql/agate-sql-0.5.7.ebuild
+++ b/dev-python/agate-sql/agate-sql-0.5.7.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="Adds SQL read/write support to agate."
@@ -42,16 +42,9 @@ python_prepare_all() {
 }
 
 python_test() {
-	local pytest_args test_name xfails
-
-	xfails=(
+	local deselect=(
 		tests/test_agatesql.py::TestSQL::test_to_sql_create_statement_with_dialects
 		tests/test_agatesql.py::TestSQL::test_to_sql_create_statement_with_schema
 	)
-
-	for test_name in "${xfails[@]}"; do
-		pytest_args+=(--deselect "${test_name}")
-	done
-
-	epytest "${pytest_args[@]}"
+	epytest ${deselect[@]/#/--deselect }
 }
diff --git a/dev-python/agate-sql/metadata.xml b/dev-python/agate-sql/metadata.xml
index a42278954df3..8d445d6d5b34 100644
--- a/dev-python/agate-sql/metadata.xml
+++ b/dev-python/agate-sql/metadata.xml
@@ -4,6 +4,7 @@
 	<maintainer type="person">
 		<email>zmedico@gentoo.org</email>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<bugs-to>https://github.com/wireservice/agate-sql/issues</bugs-to>
 		<changelog>https://github.com/wireservice/agate-sql/blob/master/CHANGELOG.rst</changelog>
diff --git a/dev-python/agate/Manifest b/dev-python/agate/Manifest
index bd8ecd7c8cc8..62793115785b 100644
--- a/dev-python/agate/Manifest
+++ b/dev-python/agate/Manifest
@@ -1,5 +1,3 @@
-DIST agate-1.6.2.tar.gz 191216 BLAKE2B 63e89f6815a36dea956e8a919aeb926291eaf1f4d5eaac7f96dab97c6958dfee4788e18a4c1325a5b8cebf15df27b32e75409ddeab1289c1e8e548088fdc0ea7 SHA512 34d9e45d162bce69d28ad0ec07f5b410b2cdac831e5bd986ca8cb8902fd0ca1ec67663b2f956f42acaf18b8ca0fa169d5236aa4cee7457765e4e86d837e7794e
 DIST agate-1.6.3.tar.gz 202102 BLAKE2B b1a5624b4744b8f3ed266470da580cef2f2e1cf6159e1b33fcd461e4abd235c5e3fe0da35408a42c92fd4abf14a1f841a1ab9eb6cd31545d826a5223e85b4904 SHA512 e83a03c5a3e4b7fa9997030ce0d33e7b59b397e2ae07ee6a723eb7fb708a7fa8b8c4322dd034f42bf664bf2911d89731fd060e4ff33a237f83114a83312ac5ed
-EBUILD agate-1.6.2-r1.ebuild 2753 BLAKE2B 4c80f6ab093d11f85d96215ee86d929fc788ad7714e61632886f1806bd8909c677e5e65887919ab6514c88d08f6697fd37c0d657876e000f86a56c9b13db3fc3 SHA512 7b2bffbdf6dba030b97a6213e7d47c43a24e0f02d25b3420b313a5bd73d465a74c532680ffc8ec1a5d4cade29c6de6a299df251c4ca8fc3764c24eb129dc61ec
-EBUILD agate-1.6.3.ebuild 1375 BLAKE2B c6409f7f677ea26fa8dc305aa6b7664db636cc26a974ea760d2ea701008a9c8684e408c339ad317a5722e424b7bf48195bfa729a943e70c7176cf7f79b2850b7 SHA512 671f40e651ade42d04571c413df6beefbe7748162fd889b66ec99a41dd7b7699008b0e05735489dc6ce3c818af754da5f78d6dd552ddaff84b31316e86ece01a
-MISC metadata.xml 485 BLAKE2B 32cfa1d6bc9582bfe411d79e541837d48019eb8a3bcb956634f3a72f5c41ec30568cab69348e5c7419210b77263a93dd042bb88a1376706888a0e13b2553f456 SHA512 30edf8ea75b16bd491372ca7d72b953fb9d3d27c88b10829b7d90108e952fb3a8489541958621a34d288d9dfb5378063fe6973a15d71700bc1745d20093f7b87
+EBUILD agate-1.6.3.ebuild 1436 BLAKE2B a0590109876c89e4d2e77857cde82e9899de21b345e3963e3316dda407d444b6891af2c550cf4cc9a18bed7cb71cc62eb5436d33fd8290f8a4b32f03dad63c0d SHA512 ba12184f663eae53b40ed91b55ad14d68a0868c09d1224f12282dad6b59f4265859ed99050fccfe2ad3afcfb9b64f9aab7976e471db6aee813cf686ef1286803
+MISC metadata.xml 509 BLAKE2B 9eced9e92bf3c1e763c03b189e46ad085f147ea46dcdade03d8b27f979a9b1abf83015091b475278ff8dab802e1a84eb7bcad6783bbbba02f500260de1ad56f9 SHA512 69908382d702e5be6c249d0beb5cf5d37e036546d74bfb4340e385219168d5891d7b5ca71e42e17422feabe3c3c7cca863f5073086ab633553e5165ee3283a65
diff --git a/dev-python/agate/agate-1.6.2-r1.ebuild b/dev-python/agate/agate-1.6.2-r1.ebuild
deleted file mode 100644
index 7a908b2f5484..000000000000
--- a/dev-python/agate/agate-1.6.2-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..9} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-
-inherit distutils-r1
-
-DESCRIPTION="A Python data analysis library that is optimized for humans instead of machines"
-HOMEPAGE="https://github.com/wireservice/agate https://pypi.org/project/agate/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test +xml"
-RESTRICT="!test? ( test )"
-
-# Other packages have BDEPEND="test? ( dev-python/agate[xml] )"
-LEATHER_VERSION_DEP=">=dev-python/leather-0.3.3-r2"
-TEST_AGAINST_RDEPEND="xml? ( ${LEATHER_VERSION_DEP}[xml,${PYTHON_USEDEP}] )"
-RDEPEND="
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/pytimeparse-1.1.5[${PYTHON_USEDEP}]
-	>=dev-python/parsedatetime-2.1[${PYTHON_USEDEP}]
-	>=dev-python/Babel-2.0[${PYTHON_USEDEP}]
-	>=dev-python/isodate-0.5.4[${PYTHON_USEDEP}]
-	>=dev-python/pyicu-2.4.2[${PYTHON_USEDEP}]
-	>=dev-python/python-slugify-1.2.1[${PYTHON_USEDEP}]
-	${LEATHER_VERSION_DEP}[${PYTHON_USEDEP}]
-
-	${TEST_AGAINST_RDEPEND}
-"
-BDEPEND="test? ( ${LEATHER_VERSION_DEP}[xml,${PYTHON_USEDEP}] )"
-
-distutils_enable_tests pytest
-
-# @FUNCTION: pytest-expect-to-deselect
-# @USAGE: readarray -t pytest_args < <(pytest-expect-to-deselect <<<PYTEST_EXPECT_CONTENT)
-# @DESCRIPTION:
-# Read a pytest-expect pytest --xfail-file file from stdin and write
-# equivalent pytest --deselect arguments to stdout for consumption by
-# readarray -t. The generated pytest --deselect arguments are appropriate
-# for use as described here:
-# https://dev.gentoo.org/~mgorny/python-guide/pytest.html#skipping-tests-based-on-paths-names
-pytest-expect-to-deselect() {
-	while read -r; do
-		[[ ${REPLY} =~ ^[u]?\'([^\']*) ]] || continue
-		printf -- '%s\n' --deselect "${BASH_REMATCH[1]}" || return
-	done
-}
-
-python_test() {
-	# test_cast_format_locale fails with "locale.Error: unsupported locale setting"
-	# which appears to be triggered by these locale settings in the unit tests:
-	#
-	#   agate-1.6.2/tests/test_data_types.py:257:    def test_cast_format_locale(self):
-	#   agate-1.6.2/tests/test_data_types.py-258-        date_type = Date(date_format='%d-%b-%Y', locale='de_DE')
-	#   agate-1.6.2/tests/test_data_types.py:381:    def test_cast_format_locale(self):
-	#   agate-1.6.2/tests/test_data_types.py-382-        date_type = DateTime(datetime_format='%Y-%m-%d %I:%M %p', locale='ko_KR')
-
-	local -a pytest_args
-	readarray -t pytest_args < <(pytest-expect-to-deselect <<<"
-pytest-expect file v1
-(3, 8, 10, 'final', 0)
-u'tests/test_data_types.py::TestDate::test_cast_format_locale': FAIL
-u'tests/test_data_types.py::TestDateTime::test_cast_format_locale': FAIL
-")
-
-	epytest "${pytest_args[@]}" || die
-}
diff --git a/dev-python/agate/agate-1.6.3.ebuild b/dev-python/agate/agate-1.6.3.ebuild
index 52a588ad921a..92bdd1023bf1 100644
--- a/dev-python/agate/agate-1.6.3.ebuild
+++ b/dev-python/agate/agate-1.6.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="A Python data analysis library that is optimized for humans instead of machines"
@@ -33,6 +33,8 @@ RDEPEND="
 BDEPEND="test? ( ${LEATHER_VERSION_DEP}[xml,${PYTHON_USEDEP}] )"
 
 distutils_enable_tests pytest
+distutils_enable_sphinx docs \
+	dev-python/sphinx_rtd_theme
 
 python_test() {
 	local deselect=(
diff --git a/dev-python/agate/metadata.xml b/dev-python/agate/metadata.xml
index 59880222a94e..18785d28a7e6 100644
--- a/dev-python/agate/metadata.xml
+++ b/dev-python/agate/metadata.xml
@@ -4,6 +4,7 @@
 	<maintainer type="person">
 		<email>zmedico@gentoo.org</email>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<bugs-to>https://github.com/wireservice/agate/issues</bugs-to>
 		<changelog>https://github.com/wireservice/agate/commits/master</changelog>
diff --git a/dev-python/aiohttp-jinja2/Manifest b/dev-python/aiohttp-jinja2/Manifest
index effb57668575..a3f2d46dc3f4 100644
--- a/dev-python/aiohttp-jinja2/Manifest
+++ b/dev-python/aiohttp-jinja2/Manifest
@@ -1,5 +1,3 @@
-DIST aiohttp-jinja2-0.15.0.tar.gz 51183 BLAKE2B e19ca813f36ac746a84812ec278a3de43e6e24eaafcf949fd18a32c99f460ded03f4dc97171fe1493174a8e2c51543b8c1afcdec51c4688f4fb0b7781287cc03 SHA512 084714cd2376b93f32cdcebc1971d4aaa704a177524b00f322e0347c15ab8085960a68a3760be056e391410f01b6b637eb59db54fccf54d09ba53a9ea03a01db
 DIST aiohttp-jinja2-1.4.2.tar.gz 54328 BLAKE2B 3d6aaeb03bbb89516a92fa877ee95a2fd27ab83666a03ca12e78f1744b82797faf2547bf55118618cbd979d80779a9571dfcfe9036bc84142563ede55cfbc1a1 SHA512 7bdaee97efe90a0009cd78a4e46dc80cfeb661c2d5561fdb1b1a1ff098abba8667260bb908e3227edd6601c2412812d0311461942568a8aabf07a164ea2f290e
-EBUILD aiohttp-jinja2-0.15.0.ebuild 1080 BLAKE2B 79c5f9ac7a6d1b25fc494a3574c9127f42de3046433c5a3c07bfb1ebbd0b5764d73e30eb87dae1486be98a8cde8e299ba2e28913d832f980fe7327520055e4bf SHA512 dadd8b7326252f151b00440d2bcde8eed37493c9c44283bfaa860a8dd308d9581f8e66a14d181916826ebcdbad1ab87fed70d5fe14b0765ceb99966183ead5a8
-EBUILD aiohttp-jinja2-1.4.2.ebuild 835 BLAKE2B 94a5a9a23474bf9d8b170df4295f7c9529b6ed93b6365c91621616af028f814b402d166bcca0512eec21f165432c20a0bd773300efecffc0d3df39a89be5911e SHA512 ec7546c1cea7828a28369cdffea06d1084c59eb34fd962508aa1cba73b2f56db9283f2090ac826e9af944cf8958ce1e29a4d109467062b57bc345dba8ede3fe0
-MISC metadata.xml 408 BLAKE2B df678e57a82a1c6a818983506af4a0397469497ec15da8a70aa021b77b60b4b4d14f8c37d821c655fb1c92dc75da69bd37ac487d9937d87c14d6338de8bad803 SHA512 bd5b6da5b67af78a148ec4a95378caa391dee95591b6888028d5427000d38411931559332bf0508c201691e04b8b417acbc5dc026858c546e6843d6779607e22
+EBUILD aiohttp-jinja2-1.4.2.ebuild 841 BLAKE2B 25f59019b996241edc0740c400c7ba158c2db205cbbe2a415d7531b0151cb8261e8786321adf84070476c0c4b2d3a45c103180958992d4bd6b7cb1278fa24b7c SHA512 53fd56354bfb1d76fcf8019822f1aa63e10838ec5441c02754696715e74e0a9b76416fec6b6876bfac4eef909ad3ee08080f212bec504da9968535b7783bab86
+MISC metadata.xml 408 BLAKE2B 916a837821dc02a0eda9ed9c5baa16d70426f4d3979a51b68d4516bc1c87cdc9b097528d4c31540513ecefe056031673a75e3ef6a73c27559dc10675d0b19651 SHA512 16235d6f61135b0caeceaf161cf98e700ac13cc136edeb501280b60bc4dfff6734f80523baaab0982cfef3a84c7a34734e4020ac31a028095967953f04291275
diff --git a/dev-python/aiohttp-jinja2/aiohttp-jinja2-0.15.0.ebuild b/dev-python/aiohttp-jinja2/aiohttp-jinja2-0.15.0.ebuild
deleted file mode 100644
index d06f6beff00b..000000000000
--- a/dev-python/aiohttp-jinja2/aiohttp-jinja2-0.15.0.ebuild
+++ /dev/null
@@ -1,51 +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} )
-
-inherit distutils-r1
-
-DESCRIPTION="jinja2 template renderer for aiohttp.web"
-HOMEPAGE="https://github.com/aio-libs/aiohttp-jinja2"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/aiohttp-2.3.9[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.10[${PYTHON_USEDEP}]
-"
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? (
-		>=dev-python/alabaster-0.6.2[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)
-	test? (
-		>=dev-python/pytest-3.2.2[${PYTHON_USEDEP}]
-		>=dev-python/pytest-aiohttp-0.3.0[${PYTHON_USEDEP}]
-	)
-"
-
-DOCS=( CHANGES.txt README.rst )
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	pytest -vv tests || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/aiohttp-jinja2/aiohttp-jinja2-1.4.2.ebuild b/dev-python/aiohttp-jinja2/aiohttp-jinja2-1.4.2.ebuild
index 6afda9ed0652..12b9970dfdaf 100644
--- a/dev-python/aiohttp-jinja2/aiohttp-jinja2-1.4.2.ebuild
+++ b/dev-python/aiohttp-jinja2/aiohttp-jinja2-1.4.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/aiohttp-jinja2/metadata.xml b/dev-python/aiohttp-jinja2/metadata.xml
index f9d1eb44fbde..008342ee256e 100644
--- a/dev-python/aiohttp-jinja2/metadata.xml
+++ b/dev-python/aiohttp-jinja2/metadata.xml
@@ -7,7 +7,7 @@
 	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
-		<remote-id type="pypi">aiohttp_jinja2</remote-id>
+		<remote-id type="pypi">aiohttp-jinja2</remote-id>
 		<remote-id type="github">aio-libs/aiohttp-jinja2</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/aiohttp-socks/Manifest b/dev-python/aiohttp-socks/Manifest
index 11f9373cb72c..93112bd12d84 100644
--- a/dev-python/aiohttp-socks/Manifest
+++ b/dev-python/aiohttp-socks/Manifest
@@ -1,3 +1,3 @@
 DIST aiohttp-socks-0.6.0.tar.gz 19789 BLAKE2B 56a9279f78e2a7a391183e6b68f9b33d878dc9b328d3096ca649b136e321ed372a9f9e8f7a02282c32568ac458639bd76b341f87722eeac46741d68064cc035b SHA512 15a5869d24955cba9548d8bd7cf1ec29b27a024603ca1b1d4abf8f93c70702434542c66ced1d8b28ae851034dad1ae8e2eaa4ed9a3729be35ec1e3c853237811
-EBUILD aiohttp-socks-0.6.0.ebuild 738 BLAKE2B 13b34e46b24cc4dc7c1e4b3cc6d20c3ebeb892c137863c1a3888dc6f8aab647309e75afabcf89be307a3019547bba396ad420ee437519110f18b55abc6ec55ac SHA512 7fe23c40cfbafb740a8a8a1f85b4521c0cc691f30e51e63d793615731d845c4d735e9d026dc719463c8c2bb58e67d977bd78c83042c4d9f92214104a92f146c5
+EBUILD aiohttp-socks-0.6.0.ebuild 788 BLAKE2B 94f8b0582ac5aac373748bc91c389e64d56b9856b696f0d124df76e251ecc7f52611887e4ef5e402493a36c9cc840dd6656559bd7e8859514653984fe09ee4e9 SHA512 13b9e6b3e4abc9022c69aa1af8416bfc4e425ff86f47ec67f62d3641252d8b673381dcae2ecd46c0a018ac3707fc6c172d5685d4ff03444ed83875c120e10db5
 MISC metadata.xml 416 BLAKE2B fd462ceb91bb4032d944cfe0a6f040120e2492a2aab5a34e6d6416ee9dceb51df7fe3b12cf125415989ac7c2be72d609a1955ebc825cb8e9eaa16dc28df89532 SHA512 6712e24058ed1a73dc03eaca9537df0f6ddaace9a5391cfb01453a342bd8ee5d81ba602e582490bf647bce3665567c6cdadcf4d2b92730f77f79654a309fcc20
diff --git a/dev-python/aiohttp-socks/aiohttp-socks-0.6.0.ebuild b/dev-python/aiohttp-socks/aiohttp-socks-0.6.0.ebuild
index 1c3af1c08759..43f35326b131 100644
--- a/dev-python/aiohttp-socks/aiohttp-socks-0.6.0.ebuild
+++ b/dev-python/aiohttp-socks/aiohttp-socks-0.6.0.ebuild
@@ -3,12 +3,12 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 
 inherit distutils-r1
 
 DESCRIPTION="SOCKS proxy connector for aiohttp"
-HOMEPAGE="https://pypi.org/project/aiohttp-socks/"
+HOMEPAGE="https://pypi.org/project/aiohttp-socks/ https://github.com/romis2012/aiohttp-socks"
 SRC_URI="https://github.com/romis2012/aiohttp-socks/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/aiohttp/Manifest b/dev-python/aiohttp/Manifest
index 44dc0bf4edbc..9f17d75e0254 100644
--- a/dev-python/aiohttp/Manifest
+++ b/dev-python/aiohttp/Manifest
@@ -1,5 +1,5 @@
 AUX aiohttp-3.7.4-brotli.patch 3537 BLAKE2B dfb410aabbd24f16bb1cf5fe999e9730417ccaf7ea59cb48d0445abcfe757e0b9d165ea723152df8f54ff039ac092a0a6cc6d6bddfebcad44d8d63f4eb5c3c79 SHA512 6bf8969c57fc649f84dae9eacd79d5f13558bc970e8755dbf22dcc08789d2377d1f04a745becd3c533f3a6ceb459ddb6bab5eb39e1098468650b312c2ecd51c3
 AUX aiohttp-3.7.4-fix-py3.10.patch 2285 BLAKE2B 4d0841adb3e0038b1b361449812975e4f908e0813576dd3adf1f6d841e93adb514803629bb186304d44c92680d0b1529e3a2ca5a861766f856d32cc69edb18d4 SHA512 3cb863431c8175da625d429a6e275a6a3f932f162f9dc9c477f7038af302486698ee0665c3ab69111d277b9bd080d90e7b3e4f7a2c0a797e554c0cdac3f5cef2
 DIST aiohttp-3.7.4.tar.gz 1114533 BLAKE2B dcae3e66e13df8264d731a3ca65b4718feca8d0e6e1baeb6608dcb9bfb4bd4baaed6bd34297ed5ece78d01189bf9a0b9860845cae4e2b93cc2ba463cc35cfb77 SHA512 66fcc837b388020dc998cbaa2db31e48ecec75bcfaa8af9108e2ea265588dafa5684ca96a8fe3ad6759b22e09a4ae6d4efd8653fb76126eccdc826c15cbbe2e6
-EBUILD aiohttp-3.7.4-r1.ebuild 3212 BLAKE2B 662c712aa1811f1d7e603e175ad958d2d87a8075e0fabcf0d157c1efaff634e8a3b7b6f56b2990447072127d2d843af82e44cba711b1fe00160c8ae5849baa1e SHA512 76fdadad383bdd3cb061da3314eda61c9ab325e157990f4469808526a350ee9ac319326237b26f635f565ab6a3ad0c44eba2108ccbdeeee4282a537dde0a750c
+EBUILD aiohttp-3.7.4-r1.ebuild 3383 BLAKE2B 4e172d4405d317b98ebc7c28263c1344e9b75759478650a2650eca248fcb59cfee565b06c57b8bcb2ec3092660c5f2699c6e84dc5644afa894f53d8c8f70d67a SHA512 bd37c51c50ba93b4b4ecb3f989f2d0777f1db3ad1509002b2c81ad3f6210e2af2f81cf2f9d03a3e5a209089063b922b7b6052a8e32a1482611fe3787cac2b6c6
 MISC metadata.xml 489 BLAKE2B beb80da34848dfe7b81ed65d75923480644ecf42e2c5ce04a7f66f3e729651fdc6035054482aff966ec9f03cfbb812d3be0afd783af69e37f1002182e4885473 SHA512 d8c9e2edb8a57a3b6b02bb5314aef77dc266af6e80fd0300eb0652c59790232017d0062f5b7361b059c382d1c904f0f46cd0e672d1963e9595f3d4dc7514f182
diff --git a/dev-python/aiohttp/aiohttp-3.7.4-r1.ebuild b/dev-python/aiohttp/aiohttp-3.7.4-r1.ebuild
index 4c0cea0a0d1e..1010ecc1021f 100644
--- a/dev-python/aiohttp/aiohttp-3.7.4-r1.ebuild
+++ b/dev-python/aiohttp/aiohttp-3.7.4-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 
 inherit distutils-r1 multiprocessing
 
@@ -91,6 +91,11 @@ python_test() {
 		'tests/test_streams.py::TestDataQueue::test_exception_waiter[pyloop]'
 	)
 
+	[[ ${EPYTHON} == pypy3 ]] && deselect+=(
+		# fails with a 'runtime warning'
+		tests/test_multipart.py::TestPartReader::test_read_boundary_with_incomplete_chunk
+	)
+
 	pushd "${BUILD_DIR}/lib" >/dev/null || die
 	ln -snf "${S}"/{LICENSE.txt,tests} . || die
 	epytest -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" --forked \
diff --git a/dev-python/ament_package/Manifest b/dev-python/ament_package/Manifest
index 7bcc0312afaa..152483a14ada 100644
--- a/dev-python/ament_package/Manifest
+++ b/dev-python/ament_package/Manifest
@@ -1,3 +1,3 @@
-DIST ament_package-0.9.2.tar.gz 19471 BLAKE2B 5a2f4d326fae5976ca452666149f17019ef70005142aaf0ec57369df5ba53a99a0e10d15964843e0ba841a9eee1f268df76e4584ac0c004de091fa5bd773a6e1 SHA512 eb9def5eb0faf159d3082eac436059529886644c38a9f40183a7bef8e66ab7ef4d4fc266fe434128c25f040e369d4a6b9f376b0661cbf959960f3c62280c778d
-EBUILD ament_package-0.9.2.ebuild 685 BLAKE2B 1ed1abee5142b32349dd512822b226deea966d3a685e2e34054d2c50c5f0d69e2a403fd3499e385f902fac4cc141d2a223e73e6696795ab09a5a25c5a92c38bc SHA512 36bd7f7a9071501c1deaae0242eef9fef97a199900dc9734adcd0c378d76d0fda41ef48e6ce58a58aff782f6475e302da45d3c877a22e178dc74c7ccdd639472
+DIST ament_package-0.12.0.tar.gz 20119 BLAKE2B 98f013af8e17b2fcc0a516d90dbb517ae3ad292259665d188da1cf08aa5c863ab5f161f0a0e5d6ecf1bc85c1c5f7e050b9e29ffa65c2d8f9653d6619a5ba9c7c SHA512 d8e2984b7055fb796ddcfe2fad563da98d75e377c8d10ffa57a09e7636dfba92a81dc4580c35564fb8b749d123dc64138ed443561e7bce25b8785d0b980396cb
+EBUILD ament_package-0.12.0.ebuild 689 BLAKE2B deaaccfb13096d168ade85c43ddb370d04c1b36e9c17a00e0b55e659be8c2e42d3468319f10cd5e64485944644b62ea161a48c6632b46078830ed45eaad2b914 SHA512 5097f420fbb4d72d91721f54cb45fa97701e6eff5c5b21d922c89dca7cbf7c2b59249f1b6d57ecc676a81b88e2e21148442c4e58f7019bc520ece19075a388bc
 MISC metadata.xml 333 BLAKE2B 713e60970251a9efef7c6be91de9f139953058b16efa8e2c23aa407cfc395a53f63d319c08c0a4597b22c5fb6d9ee3b57c40ed36f9318509b95786297d9958fc SHA512 87cea6fec8887053fe14091c5b76687797618f1c56bdc18215ecf92176027001fe2da63b6cb7e111bf9ce8b6fb9d1b8c0451594a13623ced562840ccc3a7b32a
diff --git a/dev-python/ament_package/ament_package-0.9.2.ebuild b/dev-python/ament_package/ament_package-0.12.0.ebuild
index 630b864aa377..6027deba39c6 100644
--- a/dev-python/ament_package/ament_package-0.9.2.ebuild
+++ b/dev-python/ament_package/ament_package-0.12.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 2019-2020 Gentoo Authors
+# Copyright 2019-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{3_7,3_8} )
+PYTHON_COMPAT=( python{3_7,3_8,3_9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/anyio/Manifest b/dev-python/anyio/Manifest
index dfa166836aeb..5a297c959ed6 100644
--- a/dev-python/anyio/Manifest
+++ b/dev-python/anyio/Manifest
@@ -4,5 +4,5 @@ DIST anyio-3.2.0.tar.gz 126210 BLAKE2B cedace636a115ad579ca47b345bb2a9bb32e97fa2
 DIST anyio-3.2.1.tar.gz 126277 BLAKE2B 510980c9251081d5188f7654279753051cd9f8221f2090fb99624612e48b6f5fc1f6d9f1808f1c329c350857f14ceaee0d72615857171de33dc35cc7ba35ab23 SHA512 ef78e5531a917e3a5ddc1106f45ba556ca147e52ab29ed6cb25a3bd287148a15a015942dde6b9535d683fbe5910affed27df6ce5c4049251610f689cd151ee89
 EBUILD anyio-3.1.0.ebuild 1413 BLAKE2B 35471e090dad1e7d2a820c2c1d225e211311f673bf8d4a6d1adf5d0221d293fad3813295b17ddac496f603a1e26737b7bd43135361f4c5cfbfd29b48fd479f21 SHA512 dff8ec2ff5c87f0bea1d083fe62685c4580580e17bcedb14b014396a280e2468cd548b44bb492e5b64b09c61c49a4f86f043dcbd7e4a1bddb58b8bfff5b443de
 EBUILD anyio-3.2.0.ebuild 1418 BLAKE2B 398427069cbee61cf7ae0111c76933c8908760619f4fd6c26622bafbe68e58287af7d916418aea7b06c8c96b928aefc5242bbebfece4ce9e03676b11b1d0510c SHA512 eb3abcab9ad4e5e26dc861508f881e3f96895eb120951be2be685c0727b0efa9a240a57caaf530076bcce8b229514fd1c80fc0f41bdf13a433aaf8ffc97c795d
-EBUILD anyio-3.2.1.ebuild 1056 BLAKE2B f4eb649e62c2af6fbf8c752d79da26cd8cdd29bce6b2820b67cb8b1a3783cc467d02458f6ba521ed6358f1ce733d58524c5fe832731dd92faa3bc8b67c6ce168 SHA512 e0ba07e14cf9bfae1ab38d8dcc1bebf83a8641056bd0828d2077a00a2def8cbb6afc45a7d6e0a4c9327a742f4b1a88bf08ddc63907b405819904b9cedf6c609e
+EBUILD anyio-3.2.1.ebuild 1064 BLAKE2B a5e3670beccff3e35ddff9857e1fdff6fb0d212803dabc70d868c402ee8286e064818d37bbe36c9ed9d17b596b39993185051aed462dedf51afddb5024d4aeea SHA512 f269acbbb42eecf0d3996658c43db8a493fa1add66f2505d897591780f07ae687adfbbad31d2c24147cd2a89b5133db07bfe003ca48de4b4eb78bdc7747feb98
 MISC metadata.xml 1320 BLAKE2B 0687bd9663338d0f39ad5b705f3ba3064ad7a399e31e6b6dfba80124b4ce719bbde82fb39f8b19b4a2fd22a040919163a59bfb57a3db143983d60db78d05811e SHA512 306491b404e5929eb19f61e359741b2961b3e600e3e6190e29215ea571db2d270d469c331956246f3336e05f5379d37d35bbea30931a9bbd8fb79a671d7642ce
diff --git a/dev-python/anyio/anyio-3.2.1.ebuild b/dev-python/anyio/anyio-3.2.1.ebuild
index 67f9a4d6fb2e..492fcd0eb77a 100644
--- a/dev-python/anyio/anyio-3.2.1.ebuild
+++ b/dev-python/anyio/anyio-3.2.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
 
 RDEPEND="
 	>=dev-python/idna-2.8[${PYTHON_USEDEP}]
diff --git a/dev-python/arrow/Manifest b/dev-python/arrow/Manifest
index 8bf826a62bf6..a61a24d417b3 100644
--- a/dev-python/arrow/Manifest
+++ b/dev-python/arrow/Manifest
@@ -1,7 +1,3 @@
-DIST arrow-1.0.3.tar.gz 102536 BLAKE2B 020b9b12a529f31c8054cfe98b99ee791cd1f2889422e4bb1b0bb6873ff4c1748951b63d20d2526af2bea3ff13b26d809b35eed36984d1063c35c334d76ee416 SHA512 f8da6574758ca1f319ed9d71e4fc6e44d3c3db0a6fe36c8868c3515ab789093660e3d57d6de60813cf2eb57c7a3a8bfe92facbb410a383528cb1fbc37d860b49
-DIST arrow-1.1.0.tar.gz 109692 BLAKE2B da6cf4feb0048db4f808fc8d8863d59b1501c9e5ea8b171aacd36945e7dee874fb088c1bdcf57858e9126b42b312ec24511ee69e8846cb28c5d97b0cb5ece237 SHA512 9ec39458069d9538bd0f05fcbb03f92c6cf613c4bb686037a92ffcf7fa2f6306fa84ca6bcc2b7ffdb84c2fcf4cbe281ad7cb6698d1886da29d9121805140be49
 DIST arrow-1.1.1.tar.gz 113054 BLAKE2B 7f9d205aaba1c8ea4ad433baad03cf2392e5dcb819a95ef8de612f7d6f8cbb8500d224648c61a0f48403878e9b02fa8e90e3e3fb6411fa23eaf1f333205f7c1e SHA512 eaa6cde1083a0ed1204260ae9b9c850ca2dfcc53858e2391def28b2aaefe78671166bfdefa1c725adceb26fa8425885d3a0c3914782203e1c3be593dd9a00349
-EBUILD arrow-1.0.3.ebuild 787 BLAKE2B bc09a63555e5a833d0e1a9dfd645cd37963fc187a664fe0300b9963ec5e11a8aca745c8b35a7ea8b3866f40f93efef8c08dd212c50143aa11748cc58862fc976 SHA512 fcb1145f467ae6d0f66e420c265206b451e6511bc2cc3844214a920efeeb84a6ad7a1848a2816522f8c08b7f438a7716e55619c335d4bd177cd3c6063ecc87c1
-EBUILD arrow-1.1.0.ebuild 788 BLAKE2B ad9deff9436a4461b95ba0326b31be79eedaee00429b80f6a63ff1e8ee6b23c0517f3816e2eca4a79e849eb9789c75349a372e8dbb72e06d0bb2d9956da35c94 SHA512 611ae0a4e3521eaaf6b6a9f93d7dc9e6d6c33c01662f3966b0790af8fe544822584eead130c1381154132413219a7120fbea4497f6657cc2d24daf06a59be260
-EBUILD arrow-1.1.1.ebuild 790 BLAKE2B 08d8611d6f5d20d25f191904722aaaaaf24c16b41675de9d69744a6284917b3d733df153a0ac38087d1b737d1bfe619c6d03b4f0b222fdc768a513d16c24b915 SHA512 0e3c1cc4418bab96965b72394295f92d0d6bfeebe156d9b30e3aeaf44e3445d3817c8b4e604144c5cc4382e39e2636f50c054c3578210651f7cd2642b57668e1
+EBUILD arrow-1.1.1.ebuild 788 BLAKE2B ad9deff9436a4461b95ba0326b31be79eedaee00429b80f6a63ff1e8ee6b23c0517f3816e2eca4a79e849eb9789c75349a372e8dbb72e06d0bb2d9956da35c94 SHA512 611ae0a4e3521eaaf6b6a9f93d7dc9e6d6c33c01662f3966b0790af8fe544822584eead130c1381154132413219a7120fbea4497f6657cc2d24daf06a59be260
 MISC metadata.xml 386 BLAKE2B bc1174a003d7041b7741307be147e5d1e6035982b4174cef130017825d20b6a35835f3decce36e7c8c5fd4cee7d9ea77cb083850bc820f241fee1407665bdb5c SHA512 88ca68a6095f8c900c55d4ca1159d78c4ace39b326b1d5c9086d27177c9f5026d83d32e7c8bed3813a623e2be22243c3fd6a268d79ca528ade6f42bf3fe5a7e7
diff --git a/dev-python/arrow/arrow-1.0.3.ebuild b/dev-python/arrow/arrow-1.0.3.ebuild
deleted file mode 100644
index 85cf54a89d7e..000000000000
--- a/dev-python/arrow/arrow-1.0.3.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} )
-
-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/arrow/arrow-1.1.0.ebuild b/dev-python/arrow/arrow-1.1.0.ebuild
deleted file mode 100644
index 2a7c7c5050b3..000000000000
--- a/dev-python/arrow/arrow-1.1.0.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_{8..10} )
-
-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/arrow/arrow-1.1.1.ebuild b/dev-python/arrow/arrow-1.1.1.ebuild
index 5064da91ddf9..2a7c7c5050b3 100644
--- a/dev-python/arrow/arrow-1.1.1.ebuild
+++ b/dev-python/arrow/arrow-1.1.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 RDEPEND="
 	>=dev-python/python-dateutil-2.7.0[${PYTHON_USEDEP}]
diff --git a/dev-python/astroid/Manifest b/dev-python/astroid/Manifest
index 89add28027ca..63d29a574bee 100644
--- a/dev-python/astroid/Manifest
+++ b/dev-python/astroid/Manifest
@@ -1,5 +1,7 @@
 DIST astroid-2.6.2.tar.gz 360787 BLAKE2B a2744b9ada601b731989f17ec75aa94d88825693a4ccf349374b8795b0db3879aa5bffe838df68759ff3296cd8af9cd45524e7d894a363f54055f3f1fa01e92e SHA512 776f8f9a12d425b7f048318b632dedb8894b6a3051a0607d1079437084aab4e9593e39cf9c7e01c2dd722364d2396cf13d7d26cc2acf33482d75584c458d4b89
 DIST astroid-2.6.5.tar.gz 364383 BLAKE2B 22da12e30bbb27ad93516ef18ebe64839fc1f7057a46fe82444c189bada942b32e00c314fe47eaecaf7cb2e7e047206152e1df98b4f46a40010bef9392721b9c SHA512 28c6fe2953f10f99c31af611644137d566489188459c9249e5621c4dc1c5fecb59c1ba3cc0bbab95c2609203388d1df299f0cb87a1fc3b3bb8b4ad3ad6b010a4
+DIST astroid-2.6.6.tar.gz 368118 BLAKE2B c5117566579ee6c8ccf973e180b3de3cd3896110221627cfa16d17fbeb049954d4452d3f55ab4161751a9eb7892fbd49090eb8e82c5a90f5985ec13a9f5d1fdd SHA512 a077c291b90f52d353d27b8e6aee2ffca1d69bf0e1e7185c32f3959853d9f2957f411975e5bf66f27d73b66cce6bd1e55529de6b7d0a17dea5399edf3a404825
 EBUILD astroid-2.6.2.ebuild 1196 BLAKE2B 53bbb6e068191e80ffa6d8b71d540e7c56d2d7e9ddb5413392dd3f5a543d3c1c1516e7aac55ea83ca23d17f2a33fda8e2b2045bd598986527b8013185c93a6d1 SHA512 e6aa109be4acba3ded8e4b2096b1248498c5cd224b4da42aa7d5c019c7968c4f68c3c523a71c33a662db57f1d438856c40b6a6ebe2aafb06d2d2087602f6ab98
 EBUILD astroid-2.6.5.ebuild 1237 BLAKE2B 59458a61c8528210da912421237f19d0b6462829c19d5da3002cb9e1a713dc2aa1c855f0f2e494931faaeccc4e36b4a0589352e8f9d8e0b49621f02722ee8e27 SHA512 b0ebbef5b7f14f289cbb8bdfb9e068e529ca070b7fcd22b56b1e9c5131eba1a4fcb4d1a78c29c0a0a5abd3d39a545e11ed28e720013e08199071f05a98201055
+EBUILD astroid-2.6.6.ebuild 1237 BLAKE2B 59458a61c8528210da912421237f19d0b6462829c19d5da3002cb9e1a713dc2aa1c855f0f2e494931faaeccc4e36b4a0589352e8f9d8e0b49621f02722ee8e27 SHA512 b0ebbef5b7f14f289cbb8bdfb9e068e529ca070b7fcd22b56b1e9c5131eba1a4fcb4d1a78c29c0a0a5abd3d39a545e11ed28e720013e08199071f05a98201055
 MISC metadata.xml 1142 BLAKE2B a10eadb6bc619901a39f827ac6a4bafaa9e17ff1a521b73d3687c38cd8d39fe9b13d3d817db89e50dadaeb19f0953b48bdcc8170e9b844869d1ee71a792b8164 SHA512 ab6d5f84c85e94c0e5543b8cd9072b6ce4b32cc1ef454ab7cb836e94b82ac85ecaf70685c30398e8710fda68a1f65417b135a296287f7c2a388e59ff4703ea35
diff --git a/dev-python/astroid/astroid-2.6.6.ebuild b/dev-python/astroid/astroid-2.6.6.ebuild
new file mode 100644
index 000000000000..cda705df7b1d
--- /dev/null
+++ b/dev-python/astroid/astroid-2.6.6.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Abstract Syntax Tree for logilab packages"
+HOMEPAGE="
+	https://github.com/PyCQA/astroid/
+	https://pypi.org/project/astroid/"
+SRC_URI="
+	https://github.com/PyCQA/astroid/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+# Version specified in __pkginfo__.py.
+RDEPEND="
+	>=dev-python/lazy-object-proxy-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/wrapt-1.11.2[${PYTHON_USEDEP}]"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/python-dateutil[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+python_test() {
+	local deselect=(
+		# no clue why it's broken
+		tests/unittest_modutils.py::GetModulePartTest::test_known_values_get_builtin_module_part
+	)
+
+	# Faker causes sys.path_importer_cache keys to be overwritten
+	# with PosixPaths
+	epytest -p no:faker ${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/async_timeout/Manifest b/dev-python/async_timeout/Manifest
index 99f09c149359..0e7feeeddabd 100644
--- a/dev-python/async_timeout/Manifest
+++ b/dev-python/async_timeout/Manifest
@@ -1,4 +1,4 @@
 AUX async_timeout-3.0.1-fix-py3.10.patch 11203 BLAKE2B dab3b3e09832ed11a9c684aaa3c21f2294f0066a740ebda047ae8b550c72caa1624b30520870989ec2cebedb72a8e556a92aeea0652411afc16ffab1ca2d825a SHA512 80249589c7f2f2f7c914bef7bf6fb3f03bc9a7d8dfd3376307baf85df28f3240381ca3a580091d1aa1aa9fa4f360ae5d92a5e1b46c308ac0c7e0d857b9d6648d
 DIST async-timeout-3.0.1.tar.gz 9724 BLAKE2B f18ae75969b7048469fe22949f25ea25da3fdbf08b98a16b5d5ffe823060a75e6de9ed764727e08d4344c79426e9c89013d49522f20ed62e6fbe912b5c7a8787 SHA512 fd30842671a79edfd52c7350e7fb2120533a6d97b44975f7b071ce2cbde43443bd5bbe1f2ad0ad3ab2156e1987b9e58e0c149b0ecfea8674eb0cb78eee79c986
-EBUILD async_timeout-3.0.1.ebuild 968 BLAKE2B 1796e2c00b629edd090b88a3b6cff4e3a20190351d1ae105c0cb16581f0a353e388f3274d6693612cf2df95bf95ab495dd7cfb55088594827fa300cf56c778e0 SHA512 16aa8169ceb211ef74631b180083cc9d900b13016f0a90c363aec91832b00051c25712e610b2aabad7fcc443e4ed566b53a8c663e13b963b856ae6e3e5387b2f
+EBUILD async_timeout-3.0.1.ebuild 974 BLAKE2B 532d3834eda42a0b4ddce694a89a202e2e76ac0d5ca148a8b22b47070524ac27ce2baf9f2633d8d9067f2edc6d492e23eea7aa4ad21ac12bd845f8ec3f5836db SHA512 458d6b58d40909245e9b4601046a7c24e9012d5167a6593877ec0d638ce0deecb90b4beff417376667226b7a479e64d492c9089d7c6a927de67e3c53b0d62157
 MISC metadata.xml 459 BLAKE2B aa3214d8a14324f68b5743f51371cf1902962a5b14bb7065a04944684d33f9639edbc9a899f5cd02ca19068506c5e403db149742d0b1cedf8e35a5927a837901 SHA512 fb0488558b0e1d7b9e0721a7d299bf2d105d66c67f51ea1bdb1b8dc529bb3a964c89d4410ee8640d0b094d1e364e5d59d8a9b7bafb0cdd9f3dde6443c0d46a15
diff --git a/dev-python/async_timeout/async_timeout-3.0.1.ebuild b/dev-python/async_timeout/async_timeout-3.0.1.ebuild
index 33755ac4a219..72fa7f086448 100644
--- a/dev-python/async_timeout/async_timeout-3.0.1.ebuild
+++ b/dev-python/async_timeout/async_timeout-3.0.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/backports-entry_points_selectable/Manifest b/dev-python/backports-entry_points_selectable/Manifest
index 5bd10ef5d57b..dd7127f0441a 100644
--- a/dev-python/backports-entry_points_selectable/Manifest
+++ b/dev-python/backports-entry_points_selectable/Manifest
@@ -1,3 +1,3 @@
 DIST backports.entry_points_selectable-1.1.0.gh.tar.gz 7689 BLAKE2B e7fb4372838b47e65e50d91acb034afaf326947bd76bbdf14b57834b94c72fb62afa6526931a96cc1e10b43eca9d95dce7fde431c24a4e15a4b2569ddf42faeb SHA512 abf8f5d228b52281160cedfd017f1a4273b8fce01ed29e9f0417f750125abacaf97a3cc6f363849702d1dc6f3c40602461f79bfcc2a36a3dfb962af1112046d2
-EBUILD backports-entry_points_selectable-1.1.0.ebuild 770 BLAKE2B 81d433d898d2a035416bfeb88da464eaccb31fdadb89e787fb0e0f989230189637ca16603b26ecc90fa8d7facb3f05a4e184d818bd80c05d91303d4935fe69dd SHA512 7cd8df37f6fca99d09f35d49a12bf5b3ac0793a8bf84265c5cc160f301d79532a47303e286018798653773aaa07577fb7bc8939d97198cce47a9c43ce0e85013
+EBUILD backports-entry_points_selectable-1.1.0.ebuild 801 BLAKE2B 4c9df7d4818b08cf176aeb88c1dac81e8c0351502f38311659b1d42a0d429711c8c8a82b1af147fd41b7572658dd43460f382e885f0696457bfa50d1089c91e5 SHA512 550c7aa8edb02b2031272473322f469d2a1a3225217f1f79e170c2d4a61e47a586ca9f9b62f99700ed8150cad421626d7a21463dc68c1b48467f10a5f29b4a92
 MISC metadata.xml 394 BLAKE2B a52263e74cb9051e6c7dc696d1f39e87ded29b3894f58a455b25dc469f084dc4e71dc00fa309a5ab7b1ad7c9fd87e6fd2b95e28be17304aee03bc29a6139b4c0 SHA512 79f57eb7cb48175fb0fbe2d6269c1c7fcc7b48dffede2b77d770333b9ed37bd2957e3531d4638ce3dc83f4bdce83d06477a032a683766a664399bcf5afa68949
diff --git a/dev-python/backports-entry_points_selectable/backports-entry_points_selectable-1.1.0.ebuild b/dev-python/backports-entry_points_selectable/backports-entry_points_selectable-1.1.0.ebuild
index c2e9776a97cd..369229f33401 100644
--- a/dev-python/backports-entry_points_selectable/backports-entry_points_selectable-1.1.0.ebuild
+++ b/dev-python/backports-entry_points_selectable/backports-entry_points_selectable-1.1.0.ebuild
@@ -18,7 +18,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-python/beniget/Manifest b/dev-python/beniget/Manifest
index 3134b8dc67dc..30dc84c4ef51 100644
--- a/dev-python/beniget/Manifest
+++ b/dev-python/beniget/Manifest
@@ -1,3 +1,5 @@
 DIST beniget-0.4.0.gh.tar.gz 16212 BLAKE2B 881b08b40f69950a0689d10c8832d1fe02f3cbcbac3bb5e341084ed59075cb5ca86a22759753036bf65ab2c253e8455c2663b674759f007d49d2ba014a54e400 SHA512 521df94813a086832fe99420815823fe07803350ce8692bb45b793617cd642d0fb590304fe6bf5899073a7ec1c102abf5688ebca23e37803d4576ad86fcf7a96
+DIST beniget-0.4.1.gh.tar.gz 16353 BLAKE2B ef7de5eb15b59de10c56057b22e718ca7284d251a98ff1f8dbe31bad2e1bc7ca3c22c2794b1cae8b4c5fdf2a4b91ac6f9a3a0bef3c3aef51fbe6a93341333e31 SHA512 bd2b7beda41953be9b4052b539ae9812a370702874602175bfca66deebbc569515b9a59c750dc4898a6cb9f4a1d49f8ff15c1288035aaf72940cdd439eaace43
 EBUILD beniget-0.4.0.ebuild 555 BLAKE2B 7d7700112aa737ab87e4abe7c6ed9f05ce7f0f6f0e8b7dd81c100e3460cfc22f83bdc7564bb21c9e2350fabc626f1945debf6c620b1bb57feb8ceedb7b8d865e SHA512 5f258cc0dbd0293337d7b06064fc198cf0f758fbc562facade99ff839c143143e443f0e51c6e9862d4204f429356a8e486209795b5813014f87b5417bc45a815
+EBUILD beniget-0.4.1.ebuild 555 BLAKE2B 7d7700112aa737ab87e4abe7c6ed9f05ce7f0f6f0e8b7dd81c100e3460cfc22f83bdc7564bb21c9e2350fabc626f1945debf6c620b1bb57feb8ceedb7b8d865e SHA512 5f258cc0dbd0293337d7b06064fc198cf0f758fbc562facade99ff839c143143e443f0e51c6e9862d4204f429356a8e486209795b5813014f87b5417bc45a815
 MISC metadata.xml 353 BLAKE2B 045be9e1628640f0c33d984d45107f67bdc692ab5e9648a7a333e5d933f163c4738fe88c13887254ce6cb87f2cfed401477c9b8727c2264ddf6bbcf99eaf4939 SHA512 40571beac3e14d1455717533e9be0db570f24720ca733fd7b51e93dd3a0d12dc366e361a659167556ac4e447280b808c09ff021efa2f36d6deb15e3434b7c67f
diff --git a/dev-python/beniget/beniget-0.4.1.ebuild b/dev-python/beniget/beniget-0.4.1.ebuild
new file mode 100644
index 000000000000..e1aeadad6a54
--- /dev/null
+++ b/dev-python/beniget/beniget-0.4.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Extract semantic information about static Python code"
+HOMEPAGE="
+	https://pypi.org/project/beniget/
+	https://github.com/serge-sans-paille/beniget/"
+SRC_URI="
+	https://github.com/serge-sans-paille/beniget/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="=dev-python/gast-0.5*[${PYTHON_USEDEP}]"
+
+distutils_enable_tests setup.py
diff --git a/dev-python/black/Manifest b/dev-python/black/Manifest
index ca8910cf8b7f..c6d7fbdb18b2 100644
--- a/dev-python/black/Manifest
+++ b/dev-python/black/Manifest
@@ -4,5 +4,5 @@ DIST black-21.6b0.tar.gz 1149421 BLAKE2B a9935d9ef3c9530d127cc2d06e2d64b48e6f2a5
 DIST black-21.7b0.tar.gz 1148431 BLAKE2B 34dcd2fd45b914433d6290c10bb07b44277cb490ef884c44ec00cb5495fadd2e649099dd356c4063d0fff5a6477609b11db73e1dc94d88106c56a3ca9b087c90 SHA512 7e6ee4e185080802c9dfc6eeb73b52b2489283c4bcbc086366f50ffb8ea3e0f4bdfedac9a5906be6ec119e65050741c71591c394f0c361a1d75b3ff4061945c1
 EBUILD black-20.8_beta1.ebuild 2242 BLAKE2B cdcf87b20f7d169425bf851b68dc8f393a7fa60837cce59f2ef9445189609291f5e53561c6411587e0b1343075e5bdf84fdda3771db629f856ce94a15adbafc0 SHA512 4a9fd8f011f4d10ef2dd21cb142065d568fd5d3486a00d4932c1f270aec46fe6f9e097667db0356d5c791dc7fad1ff9d88792292d281da69db3ec68dd5b1f14c
 EBUILD black-21.6_beta0.ebuild 1567 BLAKE2B b9ebf689ad0d2cf8a38fa296977ac10afe2626d90cf0cc0a0ceb8b26364a514d1536b34d21983984363af17262e4adfa6fb1d59721dc6a901cc65c7daf6971c5 SHA512 228058c935b77d23dd2dd26d42d3aef199e492255f39898dc57093b7ff81ad45d83020b7d981eb97811a29c3ba826a826858296894c2bcbedfd5c9202055983d
-EBUILD black-21.7_beta0.ebuild 1411 BLAKE2B a19e601c5157e0507bce9734bc6c026fc0c53f7f1e19af177c2863991b52a3dce93b6bf42879f224c5d23ddf3acb3f38bc1e4ff7d0377ba38af32a358cf623cf SHA512 2caf50f452b84c2e53609e0aa92365f2a35b4ae0eeab7a928657f5d0ef4fa6b07ee2c64393270ff00b2940cee805b3c65f16e1cb7cdc9c67e8501adc9198cac7
+EBUILD black-21.7_beta0.ebuild 1417 BLAKE2B fa0e5475a30d04c4927b1ba17c934fb260f154b84a9d93ba659bfcac03a3a505429d8f0393e60d0abb5002b078660ed97e8d94e2c517600a6a3d2b4a49bf30ec SHA512 1b1b43a270a731586983c38f725b1d834d38641ed008dba5ce8c3a568333b301cfc59b1faa566a16951d1a5227e3f608da43fcb91a9db7e3a41ddb3329573f89
 MISC metadata.xml 396 BLAKE2B d65402ff00389ead3359ab2afe53d33e88a5c0a6aedfd83f6a3fe946f4005e1edbd77683b2fc1097a7963383da492bad8889c2f30dd0408a4c8fb9fea6d508f3 SHA512 33aeaaa8cbcfbd0323075ebc06e4ff2dae2988ac88fe067a3fd51eae6b5ebb6ebaf9bc874d7275acc0ab6d36ac5b6ed9cb32d8e10e3e0bc3aaf75c70a5041c8d
diff --git a/dev-python/black/black-21.7_beta0.ebuild b/dev-python/black/black-21.7_beta0.ebuild
index d104c045b58a..25f7747a2881 100644
--- a/dev-python/black/black-21.7_beta0.ebuild
+++ b/dev-python/black/black-21.7_beta0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~sparc ~x86"
 
 RDEPEND="
 	dev-python/appdirs[${PYTHON_USEDEP}]
diff --git a/dev-python/bleach/Manifest b/dev-python/bleach/Manifest
index bd02d319e3f2..925d04e31c6b 100644
--- a/dev-python/bleach/Manifest
+++ b/dev-python/bleach/Manifest
@@ -1,6 +1,8 @@
 AUX bleach-3.2.1-py39.patch 1637 BLAKE2B eeb66b15ad738d07db70bbf4599ef393678ca737d122efb7b0c5b5ae6f153b8989b4efc0bf26bdc34c9391af0e81fae5a0f01bc25e2b11db0c5ca76785d6b848 SHA512 5bffd50d9be425a97d6032ad6a55e2d92826ea9e074ea76039a94377c2b4f53599a740cd7fd5c6f90aa2ba87882d46514d014889b0a09f8273fbd31fa98f5b50
 DIST bleach-3.3.0.tar.gz 181274 BLAKE2B 32883ef9a77bf1d0cd208217930474285e55f158dc8d7b9c4049ca896cdc5cfb873674aa5f5181c31d46345be29f954badd29969bf156b1cc10eb200214de367 SHA512 8e408289c5175234a383658552e48379da9f570866e4c248a4e5c0b7bdaa9a2e6be545943dd32968cdb425929d51de282cca0678fdc6dd06b6fc2c2f41b58097
 DIST bleach-3.3.1.tar.gz 183687 BLAKE2B 9ca70ff84919b6b893afdbf7914098efe7dc3c9f0c86a729a92754ba6dacc95752abc44cea96db282483cf53413d6a98421c95f102941d23adf89af00b2a5afd SHA512 bb68275f91a4c724c14594d008f58d31ab0a97b08fd45b6cbe8237a31a1bbfd24a19cea1a835efffb979739ce17a3c065099e677019e498e78d9a4222ff2d66c
+DIST bleach-4.0.0.tar.gz 183459 BLAKE2B 380e94163b353e9436748fc6c1f368fb4d261087c2d6bc6fab1262295d597dbe81a67c34b889a29fd6a5180b8b522b517dc234e78b26556a16845f26f83151c8 SHA512 21f2a2dc5fa5e09cc2e38325191d7dc0bff2606cbe68ade54d866e326e712cb00a80b3a7a44f844ad4967ee6fdf453cca07d02c337bf147e4a12237231bcd99f
 EBUILD bleach-3.3.0.ebuild 977 BLAKE2B e2b92647dd8040bcbda4d045e9decd1253e527c6d4850f5fc6de0608b7f21b65f063561dc59cadb4970487d9b7939c936e026a3eec3e88fbb02abd94d9b4077e SHA512 aa9378ec21b658cbb780fc69f547582d1c20cbe8018c5e13439512793164e7f98dc85d4d4e78dbc3e55ce4560260e6bc901372130d5a70b332bb798a0ea8816d
 EBUILD bleach-3.3.1.ebuild 996 BLAKE2B b371d730c001b943647b70bf6cf8282baacc8bd39cbba1c0b7d8221f71bc8edbcb74b396ef1f8a337c361aecffb681c560dd4616c379fd6cfc39cb10b3dcf044 SHA512 dbf86e3442d46c503571bf6169b542bda8a2cfce28b9a1745a26c9b97f6a97e32a3e21058ff4f1388dc2cfc56a94c1c96bfc932e308329e9f5c0842dd8201b46
+EBUILD bleach-4.0.0.ebuild 1002 BLAKE2B 337fa8a4e0f5f8d252463d6a69bc23a22adeed5baa19d057252e371a682357f34e4669b185d075feb272d3a01ebddffe4b6b9cb48db5ad1020631520ff1b9c13 SHA512 e047f0f2bdd86c5b0a75f7fc7cafe17bff91b1e9d3a0d1b3f7425e08bec2525aa317ec1cfa5c25a05cddd95e808b3cc85ff7c6817fe74e028696825b33d22761
 MISC metadata.xml 400 BLAKE2B 931735ca08509e3a1f8803181a1eca6be10b654fe37244772eb43b918dcac641c1733e535f2504bfc311644e52506712857ea24bf4784cebcb8b6063194d1388 SHA512 b73e3cd77b2378668b4086395f9a268105d94992f7b9d23ca8cfb834d015cc3ca0ed995acadba9060a5e96d29bae128b850a803a11c4b3d993f518180d9b4b5a
diff --git a/dev-python/bleach/bleach-4.0.0.ebuild b/dev-python/bleach/bleach-4.0.0.ebuild
new file mode 100644
index 000000000000..a2c284761436
--- /dev/null
+++ b/dev-python/bleach/bleach-4.0.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="An easy whitelist-based HTML-sanitizing tool"
+HOMEPAGE="
+	https://github.com/mozilla/bleach/
+	https://pypi.org/project/bleach/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	dev-python/packaging[${PYTHON_USEDEP}]
+	>=dev-python/html5lib-1.0.1-r1[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+PATCHES=(
+	"${FILESDIR}"/bleach-3.2.1-py39.patch
+)
+
+src_prepare() {
+	# unbundle unpatched broken html5lib
+	rm -r bleach/_vendor || die
+	sed -i -e 's:bleach\._vendor\.::' \
+		bleach/html5lib_shim.py \
+		bleach/sanitizer.py \
+		tests/test_clean.py || die
+	# indirect html5lib deps
+	sed -i -e '/six/d' -e '/webencodings/d' setup.py || die
+
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 40bb7af24211..6a0c48a176c2 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -4,6 +4,10 @@ DIST boto3-1.18.0.tar.gz 392345 BLAKE2B 8d464e038892cd77d7b171c27f41eee31c630ebc
 DIST boto3-1.18.1.tar.gz 392759 BLAKE2B bfa0bcfba9a413fbb13b2698f3ef2461cac99a9fddea0fe16d790a0ddab60fcd46b13ac4026536b9f89fb65ff703d61a4f01499423aa54289f17fc0f035ea2d6 SHA512 1aca424ff105fe2049c94aeaff306a683dd4eb9ac9b88303ff4857f53ddb4d3f267ef69119f8cbdb8463ab12331b2d89149fd0b10ccd23c4fde9485e63ba0005
 DIST boto3-1.18.10.tar.gz 398199 BLAKE2B 950b40afd867a8df9f8154e35572f3302c03c686d3299aac100ffd18a82c9e9a6657a4910f89f385dfb742c32e315110fc61bf00d2dc14892c4051eef5c642c8 SHA512 0391faf993faf8f4cc28e309f3267acc1beb38229f633f4c409820d45e968b1a93a7c74798ee84aebcd29b4547c9f301decd451e89b65a34297f796e1f839826
 DIST boto3-1.18.11.tar.gz 398542 BLAKE2B cecccf462510a6deb55308ea4156ae081d2357480e5d8c160797032c62554ac708f37b38e1cbe26a18e2087a268b392a145d0733400a86e4fca19a5416700ad8 SHA512 63cbea62fcd71fee1c53219f6016fe38bd08afdef0c27d918bd078d04803d14ddd4782c0182e304542314df4bcf081d802d1f581b25ccae3327c4df80e40dabe
+DIST boto3-1.18.12.tar.gz 398935 BLAKE2B 87f8627459908e4ff4bfde7ca7d325a355635c8e7c77cee515d30a443bfaba8474e3637e8facd8fd77778c2faab272e6526df92e96c59db4901bd3be44fce24d SHA512 bef678df9f073bb56152e8e56b4341e40aa98120ded26d1794d3e91382a994929150a06eee543d5397f065e66a9dad192b1a30e89f9d430f8a305a6d1e5a99b9
+DIST boto3-1.18.13.tar.gz 399893 BLAKE2B 3c3e79e2a8ea41a6bf88a2e73926d6e61c9844fe0d373126611e3023d98d9e6a64cf7b537726260ae70fd78fea32f19127d59ddac5d48489be231bfb2a51b693 SHA512 14987a472d5dd7eb254fa4fd4e931b43f36afc57b40676c0c2c2400bb24d7a31892d317b2da6d618311b5df91ee4a5c6cd4974ecf90971540c41b4d9632533ff
+DIST boto3-1.18.14.tar.gz 400263 BLAKE2B 827cf91c151ec03c6bca44967b8b94a5a4f93510ddae67b74dfe17fa800d02d2b139f3a0ecf6958ce24350345dd1f6da3c8dd69d7a5b504fbe79a9e8b587a3c2 SHA512 c3c338868ce50976deea02b308d8f9afecfbeac725319b4379391af1f85a6665de2cb59b2cb19a05520f1ff09d5c31bdc06525bd05e5bd2fa499641c4308b240
+DIST boto3-1.18.15.tar.gz 400374 BLAKE2B 2170319480578b9ac7b6c0da9e9a2f256ce907b8e53bc626bf26fd65f3336ec1974d6dd1917f601fe139e859f144fafd198b2578ffb9097508f09dd40cf82313 SHA512 f330d8249c9f5749770ba5809f3a4fb524f23fc0545b24182023a3b74f815608bdb9986b434d972a017aa7786b1319705e8702b041174275f84a0266bdb7b857
 DIST boto3-1.18.2.tar.gz 393528 BLAKE2B 20424f9a8ff013d1d9724f741ad6754747de504fb961688f433eba74ce1d6df7e95d68c45be1e87df1532f99b2fa4d7e8b00671a8ae9a378a4df74764924cdaa SHA512 287a1f24f62fa83fd944632799540257b2f8d6cf3b5d6add57be60e4f49dafd685bb4fcceef37fe907edba00a7f2285d92bd8d381b03e45ac794b22fdcfe8783
 DIST boto3-1.18.3.tar.gz 393645 BLAKE2B 4967ac751e9ff5a86f6f571961df31d82f6012ade28aa19a038399077bf5a1b968dfa1172995423890b79a2ede54e2c6f6c1937e8ccf21010f17a4d96928df62 SHA512 f9c42257f0925fffaeb1a36e4731dc54fee1836c249617444292991d043dbb9b58472f73a806981c9763b569cc7402b378f6e1e0102fe0f995a7754807f19b38
 DIST boto3-1.18.4.tar.gz 394442 BLAKE2B e82726143b353b843e915ea78ea2e033077ee495b1d416866f5c231f8bd864372496736d266b2b848ed8afd3134bd865c507291fd2fbdd5cae00a92ce3c5e76d SHA512 b3ba1328476a1c642c6b813afc3879e904bc14da69e062156df0405b3da6d2a15a4a40602f24d0a067a83cc441ce5a5e353dacb84869b0fe24e9984c0dec719f
@@ -18,6 +22,10 @@ EBUILD boto3-1.18.0.ebuild 1345 BLAKE2B 7fcca55ab872238ac219842aa92b00c47e9844f0
 EBUILD boto3-1.18.1.ebuild 1345 BLAKE2B 7fcca55ab872238ac219842aa92b00c47e9844f062fc394777d4baba80e8c61303dabe77856a62a70cb52056c06157188edfee68ac1e14d9f46775108b178176 SHA512 4dd0c4e13e8b5437ad51cae5da3c4a8cc4b31a1f0bffc679915fabf144250d074fd3640d54fd398feaf11e859354496daf1627daa8be2f5f8d7bfb2d32683d69
 EBUILD boto3-1.18.10.ebuild 1345 BLAKE2B 7fcca55ab872238ac219842aa92b00c47e9844f062fc394777d4baba80e8c61303dabe77856a62a70cb52056c06157188edfee68ac1e14d9f46775108b178176 SHA512 4dd0c4e13e8b5437ad51cae5da3c4a8cc4b31a1f0bffc679915fabf144250d074fd3640d54fd398feaf11e859354496daf1627daa8be2f5f8d7bfb2d32683d69
 EBUILD boto3-1.18.11.ebuild 1345 BLAKE2B 7fcca55ab872238ac219842aa92b00c47e9844f062fc394777d4baba80e8c61303dabe77856a62a70cb52056c06157188edfee68ac1e14d9f46775108b178176 SHA512 4dd0c4e13e8b5437ad51cae5da3c4a8cc4b31a1f0bffc679915fabf144250d074fd3640d54fd398feaf11e859354496daf1627daa8be2f5f8d7bfb2d32683d69
+EBUILD boto3-1.18.12.ebuild 1345 BLAKE2B 7fcca55ab872238ac219842aa92b00c47e9844f062fc394777d4baba80e8c61303dabe77856a62a70cb52056c06157188edfee68ac1e14d9f46775108b178176 SHA512 4dd0c4e13e8b5437ad51cae5da3c4a8cc4b31a1f0bffc679915fabf144250d074fd3640d54fd398feaf11e859354496daf1627daa8be2f5f8d7bfb2d32683d69
+EBUILD boto3-1.18.13.ebuild 1345 BLAKE2B 7fcca55ab872238ac219842aa92b00c47e9844f062fc394777d4baba80e8c61303dabe77856a62a70cb52056c06157188edfee68ac1e14d9f46775108b178176 SHA512 4dd0c4e13e8b5437ad51cae5da3c4a8cc4b31a1f0bffc679915fabf144250d074fd3640d54fd398feaf11e859354496daf1627daa8be2f5f8d7bfb2d32683d69
+EBUILD boto3-1.18.14.ebuild 1345 BLAKE2B 7fcca55ab872238ac219842aa92b00c47e9844f062fc394777d4baba80e8c61303dabe77856a62a70cb52056c06157188edfee68ac1e14d9f46775108b178176 SHA512 4dd0c4e13e8b5437ad51cae5da3c4a8cc4b31a1f0bffc679915fabf144250d074fd3640d54fd398feaf11e859354496daf1627daa8be2f5f8d7bfb2d32683d69
+EBUILD boto3-1.18.15.ebuild 1345 BLAKE2B 7fcca55ab872238ac219842aa92b00c47e9844f062fc394777d4baba80e8c61303dabe77856a62a70cb52056c06157188edfee68ac1e14d9f46775108b178176 SHA512 4dd0c4e13e8b5437ad51cae5da3c4a8cc4b31a1f0bffc679915fabf144250d074fd3640d54fd398feaf11e859354496daf1627daa8be2f5f8d7bfb2d32683d69
 EBUILD boto3-1.18.2.ebuild 1345 BLAKE2B 7fcca55ab872238ac219842aa92b00c47e9844f062fc394777d4baba80e8c61303dabe77856a62a70cb52056c06157188edfee68ac1e14d9f46775108b178176 SHA512 4dd0c4e13e8b5437ad51cae5da3c4a8cc4b31a1f0bffc679915fabf144250d074fd3640d54fd398feaf11e859354496daf1627daa8be2f5f8d7bfb2d32683d69
 EBUILD boto3-1.18.3.ebuild 1345 BLAKE2B 7fcca55ab872238ac219842aa92b00c47e9844f062fc394777d4baba80e8c61303dabe77856a62a70cb52056c06157188edfee68ac1e14d9f46775108b178176 SHA512 4dd0c4e13e8b5437ad51cae5da3c4a8cc4b31a1f0bffc679915fabf144250d074fd3640d54fd398feaf11e859354496daf1627daa8be2f5f8d7bfb2d32683d69
 EBUILD boto3-1.18.4.ebuild 1345 BLAKE2B 7fcca55ab872238ac219842aa92b00c47e9844f062fc394777d4baba80e8c61303dabe77856a62a70cb52056c06157188edfee68ac1e14d9f46775108b178176 SHA512 4dd0c4e13e8b5437ad51cae5da3c4a8cc4b31a1f0bffc679915fabf144250d074fd3640d54fd398feaf11e859354496daf1627daa8be2f5f8d7bfb2d32683d69
diff --git a/dev-python/boto3/boto3-1.18.12.ebuild b/dev-python/boto3/boto3-1.18.12.ebuild
new file mode 100644
index 000000000000..819e73691110
--- /dev/null
+++ b/dev-python/boto3/boto3-1.18.12.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="https://github.com/boto/boto3"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/boto3"
+	inherit git-r3
+	BOTOCORE_PV=${PV}
+else
+	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# prevent an infinite loop
+	rm tests/functional/docs/test_smoke.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests -v tests/unit/ tests/functional/ ||
+		die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/boto3/boto3-1.18.13.ebuild b/dev-python/boto3/boto3-1.18.13.ebuild
new file mode 100644
index 000000000000..819e73691110
--- /dev/null
+++ b/dev-python/boto3/boto3-1.18.13.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="https://github.com/boto/boto3"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/boto3"
+	inherit git-r3
+	BOTOCORE_PV=${PV}
+else
+	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# prevent an infinite loop
+	rm tests/functional/docs/test_smoke.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests -v tests/unit/ tests/functional/ ||
+		die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/boto3/boto3-1.18.14.ebuild b/dev-python/boto3/boto3-1.18.14.ebuild
new file mode 100644
index 000000000000..819e73691110
--- /dev/null
+++ b/dev-python/boto3/boto3-1.18.14.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="https://github.com/boto/boto3"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/boto3"
+	inherit git-r3
+	BOTOCORE_PV=${PV}
+else
+	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# prevent an infinite loop
+	rm tests/functional/docs/test_smoke.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests -v tests/unit/ tests/functional/ ||
+		die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/boto3/boto3-1.18.15.ebuild b/dev-python/boto3/boto3-1.18.15.ebuild
new file mode 100644
index 000000000000..819e73691110
--- /dev/null
+++ b/dev-python/boto3/boto3-1.18.15.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="https://github.com/boto/boto3"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/boto3"
+	inherit git-r3
+	BOTOCORE_PV=${PV}
+else
+	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# prevent an infinite loop
+	rm tests/functional/docs/test_smoke.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests -v tests/unit/ tests/functional/ ||
+		die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index 95d181af9509..176d88082861 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -5,6 +5,10 @@ DIST botocore-1.21.0.tar.gz 7955550 BLAKE2B 7e68375d07d858dc2071538c2382d8693df2
 DIST botocore-1.21.1.tar.gz 7954248 BLAKE2B d6e7a71d6dd90ed0fcf0dbab3182dcdfa4072e65a1f344d44ac30abc829ac6c546a0ebcdee51f61ae65008550acf65052b49530ae3b3a62d81af222e6e8a0929 SHA512 86d4b4159a96426e7ab853b06564604fd9729011199ba691f6204a7e5f52d9927b93511b73cfc03b65bce706563c6d50b577d85d0de0e50fb5d877472d8326dc
 DIST botocore-1.21.10.tar.gz 8001298 BLAKE2B bbc762302462d9eb5e223245c8dd2430e6f190b643502d3a124e3831f531f014e49bb54bde768fc2dc7313e5b6ca7c78076a74511d724396370d1f699366ab44 SHA512 8e3c90d24ce5c6ae76376649c1ec191bdca162adfa8ab1b33903cffa9ccf2d7b306efe36b9d81f53f579170516c91c7c3f47a00d3033f5b691f2495b0ac97b88
 DIST botocore-1.21.11.tar.gz 8003282 BLAKE2B a7ada604bef2d5130169b0905acfb1ed51fbbafbb9df29d2ed3e3cbf89b44ded59b0de1baffe46b27b10e854b190517d95a26022cc22145fbeb42c46cdb780ae SHA512 45f66cdbbc66dc74c5aac003eb67569533088486fbd3443077be7d6ecb4fe9b8ba9a9de04b94b44fe02167f7261fc9675b7cfb8973de95510d4401a237416713
+DIST botocore-1.21.12.tar.gz 8003489 BLAKE2B 39249b2ccbca9cc11b8acaef59064de3f6533a399949eac6c7168feab987f98914e213cfa4e39067c431e65ec04929b68787f971cd3847229668f12c723f8194 SHA512 7332026e1fab6bc36627f5d9de21367d99ec307e8ff4591671713e81ad44b0549ce7d4fc04f992fc120ba55c54ebc8b5095ef5e4888bca19e0d2aeea25dbbc0a
+DIST botocore-1.21.13.tar.gz 8006167 BLAKE2B 7f876b608fa0d24717f010426a553f54aa3c5a661d923b2a11b685f81d14cbf35fb6cef3518992eb00a520b79d79499af39f4fd03086f6caa6c20d256723fc10 SHA512 e2a2a51e74c5cc98ebc28a58a6865030ebc810f8fd56ae1e0baac23f815b65f9f1fdde6d9e0771a847d383796213d453463f89382286eb0c762c11e0c682ffc9
+DIST botocore-1.21.14.tar.gz 8014362 BLAKE2B c201724fd1eae1a9f84e81ff9d23b27eaf7f38d2a2db1bbf3f1ad7aca37183b56ea752478e78825f5eb5762e649b533be49671acfbbc058cae96bc14121bb336 SHA512 eff147209d9526e2b90fae2dfdaf1536ab29714277d8e4ab2e0244cbf1ab3c98aca72e04c5c7659a98464d52a016bcd5601428f860c67737b080e562c36ebb6f
+DIST botocore-1.21.15.tar.gz 8012673 BLAKE2B cdd2b4128e67c85879e85f61265b10c1e5765eebf65333059af56a6a5b1d650a7612c4b569afde2396704015294e74b717c35d49c3e08396b2c603b7d47c632b SHA512 a5916ffa64568b2040d6f76571d9d716d50339fdaaed61f4ff7be92a5dac2c3f967280330fcbd3d6c2e1c1faf7bd6012ce75dd66ff26fde9d830d334a9d7c45a
 DIST botocore-1.21.2.tar.gz 7960118 BLAKE2B 11d2845e1846c03591625a95b21ff6fe1acb1448414a5f09de1d427614e927d974fafe5dd5d4f195aeb2f3b86d60822a8c73f1bc532bb45c85be8421f92eedc3 SHA512 501f059518026bef10fe933d20a3348b4140cff9ef1af38e17552aea8698179135f5271604e988f53c215e3a13158d7784a49a6b56c0d4db591f99dac9c57ca8
 DIST botocore-1.21.3.tar.gz 7959023 BLAKE2B aab15319b9f36c25ee88f2bf0b2efcb6bbffeac1b4e38dcbdfde3a947f702016e77b66c4b125ca2b63614223109fd793da68f9ce1b1d14476cdd6a3fcb10dfce SHA512 5a8ce8f612fd0e1c68a75223dda95673f72159b02a040d1a71920b7e75b3aa9d14589c33a52970182970a353308954e8cd6d5f97d374e0e2ee2cd40e0dce786e
 DIST botocore-1.21.4.tar.gz 7964960 BLAKE2B 71d55b47633aa658a9dc921375c77230a6ebb89460d9de5a9982d730e03247972476400dbcf292da0a885789860117c1abc9bf803c79547049b242feb8755d15 SHA512 4a36e5870d9996973e2258f2e6afeb7381ac94d14075eaa9885f6f89afb87fa5b4461b02ab234b4ecc8e24630434dbb839e8ad30f622de6ffa5402f872f84a97
@@ -19,6 +23,10 @@ EBUILD botocore-1.21.0.ebuild 1516 BLAKE2B af82b8fbd781de63b2d44cc058542ef0ff9a8
 EBUILD botocore-1.21.1.ebuild 1516 BLAKE2B af82b8fbd781de63b2d44cc058542ef0ff9a83445cf356f6711d956f6d81450b49483940362b56752d80a467874d8a6e39009b865c7821a57fd603f839884ba6 SHA512 1a37e399c5582b618d386d338af3d3de4b966d2cd1c8cfca07b724cda6229ab6680aeac024cbb979be05e4776692c746e7277b22e9ef0c52a23c70b25f8833e5
 EBUILD botocore-1.21.10.ebuild 1516 BLAKE2B af82b8fbd781de63b2d44cc058542ef0ff9a83445cf356f6711d956f6d81450b49483940362b56752d80a467874d8a6e39009b865c7821a57fd603f839884ba6 SHA512 1a37e399c5582b618d386d338af3d3de4b966d2cd1c8cfca07b724cda6229ab6680aeac024cbb979be05e4776692c746e7277b22e9ef0c52a23c70b25f8833e5
 EBUILD botocore-1.21.11.ebuild 1516 BLAKE2B af82b8fbd781de63b2d44cc058542ef0ff9a83445cf356f6711d956f6d81450b49483940362b56752d80a467874d8a6e39009b865c7821a57fd603f839884ba6 SHA512 1a37e399c5582b618d386d338af3d3de4b966d2cd1c8cfca07b724cda6229ab6680aeac024cbb979be05e4776692c746e7277b22e9ef0c52a23c70b25f8833e5
+EBUILD botocore-1.21.12.ebuild 1516 BLAKE2B af82b8fbd781de63b2d44cc058542ef0ff9a83445cf356f6711d956f6d81450b49483940362b56752d80a467874d8a6e39009b865c7821a57fd603f839884ba6 SHA512 1a37e399c5582b618d386d338af3d3de4b966d2cd1c8cfca07b724cda6229ab6680aeac024cbb979be05e4776692c746e7277b22e9ef0c52a23c70b25f8833e5
+EBUILD botocore-1.21.13.ebuild 1516 BLAKE2B af82b8fbd781de63b2d44cc058542ef0ff9a83445cf356f6711d956f6d81450b49483940362b56752d80a467874d8a6e39009b865c7821a57fd603f839884ba6 SHA512 1a37e399c5582b618d386d338af3d3de4b966d2cd1c8cfca07b724cda6229ab6680aeac024cbb979be05e4776692c746e7277b22e9ef0c52a23c70b25f8833e5
+EBUILD botocore-1.21.14.ebuild 1516 BLAKE2B af82b8fbd781de63b2d44cc058542ef0ff9a83445cf356f6711d956f6d81450b49483940362b56752d80a467874d8a6e39009b865c7821a57fd603f839884ba6 SHA512 1a37e399c5582b618d386d338af3d3de4b966d2cd1c8cfca07b724cda6229ab6680aeac024cbb979be05e4776692c746e7277b22e9ef0c52a23c70b25f8833e5
+EBUILD botocore-1.21.15.ebuild 1516 BLAKE2B af82b8fbd781de63b2d44cc058542ef0ff9a83445cf356f6711d956f6d81450b49483940362b56752d80a467874d8a6e39009b865c7821a57fd603f839884ba6 SHA512 1a37e399c5582b618d386d338af3d3de4b966d2cd1c8cfca07b724cda6229ab6680aeac024cbb979be05e4776692c746e7277b22e9ef0c52a23c70b25f8833e5
 EBUILD botocore-1.21.2.ebuild 1516 BLAKE2B af82b8fbd781de63b2d44cc058542ef0ff9a83445cf356f6711d956f6d81450b49483940362b56752d80a467874d8a6e39009b865c7821a57fd603f839884ba6 SHA512 1a37e399c5582b618d386d338af3d3de4b966d2cd1c8cfca07b724cda6229ab6680aeac024cbb979be05e4776692c746e7277b22e9ef0c52a23c70b25f8833e5
 EBUILD botocore-1.21.3.ebuild 1516 BLAKE2B af82b8fbd781de63b2d44cc058542ef0ff9a83445cf356f6711d956f6d81450b49483940362b56752d80a467874d8a6e39009b865c7821a57fd603f839884ba6 SHA512 1a37e399c5582b618d386d338af3d3de4b966d2cd1c8cfca07b724cda6229ab6680aeac024cbb979be05e4776692c746e7277b22e9ef0c52a23c70b25f8833e5
 EBUILD botocore-1.21.4.ebuild 1516 BLAKE2B af82b8fbd781de63b2d44cc058542ef0ff9a83445cf356f6711d956f6d81450b49483940362b56752d80a467874d8a6e39009b865c7821a57fd603f839884ba6 SHA512 1a37e399c5582b618d386d338af3d3de4b966d2cd1c8cfca07b724cda6229ab6680aeac024cbb979be05e4776692c746e7277b22e9ef0c52a23c70b25f8833e5
diff --git a/dev-python/botocore/botocore-1.21.12.ebuild b/dev-python/botocore/botocore-1.21.12.ebuild
new file mode 100644
index 000000000000..30e0988848ad
--- /dev/null
+++ b/dev-python/botocore/botocore-1.21.12.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="https://github.com/boto/botocore"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
+)
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+	# very unstable
+	sed -i -e 's:test_stress_test_token_bucket:_&:' \
+		tests/functional/retries/test_bucket.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# note: suites need to be run separately as one of the unit tests
+	# seems to be leaking mocks and breaking a few functional tests
+	nosetests -v tests/unit ||
+		die "unit tests failed under ${EPYTHON}"
+	nosetests -v tests/functional ||
+		die "functional tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/botocore/botocore-1.21.13.ebuild b/dev-python/botocore/botocore-1.21.13.ebuild
new file mode 100644
index 000000000000..30e0988848ad
--- /dev/null
+++ b/dev-python/botocore/botocore-1.21.13.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="https://github.com/boto/botocore"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
+)
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+	# very unstable
+	sed -i -e 's:test_stress_test_token_bucket:_&:' \
+		tests/functional/retries/test_bucket.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# note: suites need to be run separately as one of the unit tests
+	# seems to be leaking mocks and breaking a few functional tests
+	nosetests -v tests/unit ||
+		die "unit tests failed under ${EPYTHON}"
+	nosetests -v tests/functional ||
+		die "functional tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/botocore/botocore-1.21.14.ebuild b/dev-python/botocore/botocore-1.21.14.ebuild
new file mode 100644
index 000000000000..30e0988848ad
--- /dev/null
+++ b/dev-python/botocore/botocore-1.21.14.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="https://github.com/boto/botocore"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
+)
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+	# very unstable
+	sed -i -e 's:test_stress_test_token_bucket:_&:' \
+		tests/functional/retries/test_bucket.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# note: suites need to be run separately as one of the unit tests
+	# seems to be leaking mocks and breaking a few functional tests
+	nosetests -v tests/unit ||
+		die "unit tests failed under ${EPYTHON}"
+	nosetests -v tests/functional ||
+		die "functional tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/botocore/botocore-1.21.15.ebuild b/dev-python/botocore/botocore-1.21.15.ebuild
new file mode 100644
index 000000000000..30e0988848ad
--- /dev/null
+++ b/dev-python/botocore/botocore-1.21.15.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="https://github.com/boto/botocore"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
+)
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+	# very unstable
+	sed -i -e 's:test_stress_test_token_bucket:_&:' \
+		tests/functional/retries/test_bucket.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# note: suites need to be run separately as one of the unit tests
+	# seems to be leaking mocks and breaking a few functional tests
+	nosetests -v tests/unit ||
+		die "unit tests failed under ${EPYTHON}"
+	nosetests -v tests/functional ||
+		die "functional tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/bottleneck/Manifest b/dev-python/bottleneck/Manifest
index c77ac3384bb2..c57792c8f237 100644
--- a/dev-python/bottleneck/Manifest
+++ b/dev-python/bottleneck/Manifest
@@ -1,3 +1,3 @@
 DIST bottleneck-1.3.2.tar.gz 102565 BLAKE2B 4d903bd8ff918a54cdee5b6c6815e8d404c6d3cd1a73e02f81888aab077970a113fcd24acef9da8a35138aa808c211883bf9bd952f83f17df4f94a6172fbe140 SHA512 9b6f812a625c9bb39501e8834ce41ae34ce57038d3ec9528aa8aa80910663c4e3b420d535f0ec8fa9e506faecabaf0151950afcebdc919479ed04787f26dc3ee
-EBUILD bottleneck-1.3.2.ebuild 691 BLAKE2B bb72a9571480e7aa2e448aa594de34833a66d68ea7421e35cad7b7905138436dce7112bf49e643db62e241317b88a97ad02ec61ea2994680b614c9e155afae58 SHA512 c3b1fc381b7e15c572c613de75064a7e61487dbf7a2f4b0eb1ac904c8bda91ab67f2451f31fdedd72bb72a7100b6eacfd431afc98d1d007b8873e4708f62e7c7
+EBUILD bottleneck-1.3.2.ebuild 698 BLAKE2B abb3ccc730aa74873f9f933808214ac7f02239736467a5151592081840a0c998bede062d88d35e0087fa83a1cce2620709a82dc33baab43a2943473e9a70dfdc SHA512 139854648dc314fddfbeb4971b95d2f58f0491b4a9c75da4a9e28b4daf4ab77ff7ae3543c819a90694f2a7f2fedc3a03219204de6c9e8a7fe8a1efe5b24c583f
 MISC metadata.xml 352 BLAKE2B 3ead01da9109e52e74befde776364c4d88aebb02d1d6857654d3ceb3f9c8bc6710de6d89dba16151497055e1a18bb6c6ba012242c1ce7a9f4b3d1f5f943992d0 SHA512 7bfd46f9995d2c167dd572f409900241f09beede06bfd79c4ddf8733e0e762fc2ee86379be9cb0dc57f7b56643ac6be36172dc0966cad2a6736924766bcc5415
diff --git a/dev-python/bottleneck/bottleneck-1.3.2.ebuild b/dev-python/bottleneck/bottleneck-1.3.2.ebuild
index 2bb815468f3f..7220cd5df777 100644
--- a/dev-python/bottleneck/bottleneck-1.3.2.ebuild
+++ b/dev-python/bottleneck/bottleneck-1.3.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/kwgoodman/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/numpy-1.9.1[${PYTHON_USEDEP}]
diff --git a/dev-python/breathe/Manifest b/dev-python/breathe/Manifest
index 85bda1754557..abac0c43f641 100644
--- a/dev-python/breathe/Manifest
+++ b/dev-python/breathe/Manifest
@@ -1,3 +1,3 @@
 DIST breathe-4.30.0.tar.gz 190892 BLAKE2B 19723ed2f979eedcab73a9920c37cf6d3f6e02ff08703d601cc38fe55ecbac28b8ef8d319205723fce75b5e679a75fbd8e712dc134358e1ba6c23dfcb999a472 SHA512 fa09ee687a8e67fa480865a0d33affd9aa0ab48b0cb5b685731ec393045d8c9e1ae0622a1315f805449d712e99e6982ed229bb79314c69f69da0c705d075f7f9
-EBUILD breathe-4.30.0.ebuild 812 BLAKE2B 14bff5c389afe107bad563dab70edd042e7b9b7b0284f886fccfa51a221821cb4dcb00287cc27f0f612369f4c788f6372b5f8ca380fe922a5d82b03367b8ef25 SHA512 c7fe00015618bd0cf3756d7df994e25ac5358ff6c00f7da6e9e05dade7b16e13f5ce27f7669ea642d2e674f1f766b763d7dc73eb1ddd8956fae480f3dc69d28b
+EBUILD breathe-4.30.0.ebuild 819 BLAKE2B c62e78d4a3631f0ea7e2358c26523f370eba2973a1a62c901fbd971eb416d6b67911fcdd97a157d3cd8bdfefae419aa7e82eb1549dd401d45616deb4aa3baf89 SHA512 807655cc398fb44f235eb1edc643f9a05b2a5fa7c6988e6452277122c8feba8b26128b8c4d690cabeb5dd94d511e324fd56d2faca471bf66e6fcbfa827bc5a74
 MISC metadata.xml 821 BLAKE2B 5105f5b60fd5fb3852dcc4d9c6acbeeb2f15e561256799162b5db18c1dcd665f2ac94f9e766fbab3c17856da7936694700850f84e7ca3bab196a5d96454b5083 SHA512 15b0904261afeb1e16da06f81bc78ed099268c7119086e04899eb6735656d508f3eb1dcc8bc1d8a0f6ae59943f1b2aea4204382eb78474aadb72b9d2030bf3de
diff --git a/dev-python/breathe/breathe-4.30.0.ebuild b/dev-python/breathe/breathe-4.30.0.ebuild
index ec91bb36a878..e18fad478984 100644
--- a/dev-python/breathe/breathe-4.30.0.ebuild
+++ b/dev-python/breathe/breathe-4.30.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/michaeljones/breathe/archive/v${PV}.tar.gz -> ${P}.t
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	app-doc/doxygen
diff --git a/dev-python/cachelib/Manifest b/dev-python/cachelib/Manifest
index 955e6d539eba..752718cb7220 100644
--- a/dev-python/cachelib/Manifest
+++ b/dev-python/cachelib/Manifest
@@ -1,5 +1,5 @@
 DIST cachelib-0.1.1.tar.gz 10192 BLAKE2B ce1ac03498e331c0df405e99b26f24cf38f21243c60d90ca3b0fab599abce5ac8c59ba8c566216d761fea170d64934c63fd74f9733c50aa3ebe382c54b80bcfa SHA512 865dba727427907227b021ecc5962738c85fb74f898acfe1612e48247ada9eda3eddb72c3c29c700fe4275ed699accc5af9526afbaf0dfbfb3a1a1a6370cc3d6
 DIST cachelib-0.2.0.tar.gz 17735 BLAKE2B 737c5083b719b6330df4eab3e256fa64b9bd2292d46a1c0b82c72c6f69f4f2fae6623fd4bc167533101e0ff01b5273a1042f5c1bdf35080a5241358de642cba3 SHA512 4011d9ead4fe27a54508355eba46e91a924ce30ef3d7cdc5a2049f7e0e48f924b64d65f203aebcf9a8729f956b6edde4160cdb7edfa7e63293e2853b94bd6601
 EBUILD cachelib-0.1.1.ebuild 514 BLAKE2B a3d34faaaaa1a3d7d254093f81f7a65382ce0d39849df1459deaa3cf4b97d9e4f120fb1e3ae7aa73b8c79b78a338052ee614cab160e02bfc8584f228aac1f9b5 SHA512 2b2d4a1adcd50421722d41170dade21d406213479de203912023434ac6c2c8a75bdbf57c9e273ec99ed40930b615bc9ebb32f32401d1ffd34bbb05eedbc0291e
-EBUILD cachelib-0.2.0.ebuild 705 BLAKE2B 88729d4bc99addf86fea36d3eb022258c64cf4296acd170a98a42fec0407a7e34dcbbb7f17b468c69a391ff61174465663a473c34cc449974aa8cb7b11174389 SHA512 b5989476dd4b992ae79c91730a2efee0ed6fc7a6a8902605f959427973596931f5afec3fa9d884526a8c11c65ab537671cb3547272ff8dc07c79e6f06354e5d9
+EBUILD cachelib-0.2.0.ebuild 704 BLAKE2B d985e32bff14ca1310071a1076290148d47be06582e35c0731160c1528df396dfc2bbbd8c3094fd86c8ae36fafec6a1915764fd31470dcb50addeecdbd276741 SHA512 495d2beb71db9782d3407682947330a6ba8301e2f80c3d3d60f9eb18b1f611f613c16dd1592c02cdb3806072bac7876120ffdc0d1efdb710d736c0f75572a4f4
 MISC metadata.xml 473 BLAKE2B fc55238dc8f1e3bbdf2afd875e27bccd93084c0497826cae167ebcc7ae36529628bc6cd4d28fd0b6ce5e09d09ea9895e808f090ebc14d70db00bbe80e3c59db5 SHA512 ea41f45ce1423d8db2a46c098704516964f35086417377c9c24ed726d33229575dcf6563121c74f04584233a2744d11c699e454832082070a3f6b4738ad4d21e
diff --git a/dev-python/cachelib/cachelib-0.2.0.ebuild b/dev-python/cachelib/cachelib-0.2.0.ebuild
index 8f80ff98d460..073c202df7be 100644
--- a/dev-python/cachelib/cachelib-0.2.0.ebuild
+++ b/dev-python/cachelib/cachelib-0.2.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/cairocffi/Manifest b/dev-python/cairocffi/Manifest
index 2e3532b5db6a..7841b3f0b49f 100644
--- a/dev-python/cairocffi/Manifest
+++ b/dev-python/cairocffi/Manifest
@@ -1,4 +1,4 @@
 AUX cairocffi-0.8.0-tests.patch 827 BLAKE2B 81e1228f054ccb46b6c3170319fbd47aead8bdbb0b7af8e60cf85391c673d86e3eb1218a393c9b454d3d94b88968421ed9f3d798cc1d28ba7510bc75ad3ec261 SHA512 3fc7c2785586f88b17864931528e8c8e25792855107e5e8b76aa79a198303b68bd8cc822a2a5ff7a646c9f11982a3b5992a9eeb3bd651bbde1792d13a1410021
 DIST cairocffi-1.2.0.tar.gz 70393 BLAKE2B b5cc69ec2805524e8f66a6234c4e19502181fad18c754379d91b05c2d2a88c82742f2b2057afcaac93f4d23ee64b41b2e84f029b6cb4ce2e7b3fa81ae0e8a485 SHA512 0f5b58ae85b2cc880bfb8ede6cbfe4905737211dab5b080815eb59f7cdd9c580367b9e00e7216d68ea9cbb84bda3f21ddcbccb2e744b86d6da8b991cffb96caf
-EBUILD cairocffi-1.2.0.ebuild 912 BLAKE2B bc8e0044f413f5e75f5327fd6991b9b75d844e4c9139f9f1a453162e099f472609e6005bfa3a3179608e75b10033ea6d794922016bd828c5d0ffd274205575a2 SHA512 55d351080e390c5d7e265133d19265fa21e2a7d6db0483824367ac43bb798d4f1553173890cf0fcc7070a3979f995d6ad4f7ab1e54a5229cc22c352659f64c5e
+EBUILD cairocffi-1.2.0.ebuild 918 BLAKE2B 7ec9f1699668ad7f7da18e7ae1221ff934151cddabfb331f7ae6c775c4f4427c89c83ea91d05ea18379e49406502e1402c93098898f76f8e63958cc1d0fe9f3e SHA512 3cadbc7d694e74a4059cbd9c8a73b8dcadc303ad10326fe2a6f47b422447bf684afe9867ecf85c59f7fecc4c1c3348def5c276efda9ca6a5af66614202e1d61d
 MISC metadata.xml 379 BLAKE2B 75baee69a9fff6d3c571bded0b1e6cfd8abbdfae7262faa2215fb3251ace498c33119ebe3bf74e4e4e0b2d1ba620b9bc60d4daf244917098e17c62af24d4b401 SHA512 b0bdbb3b144675f9e90a0421c694e0f0a782dbf315dd8203574bea69b9389d49d377797a28d9d86588d062e15071c1fe226dd4166a4fbf8e95a852d46cc20215
diff --git a/dev-python/cairocffi/cairocffi-1.2.0.ebuild b/dev-python/cairocffi/cairocffi-1.2.0.ebuild
index e58a4d6e25e7..fc6490dba10e 100644
--- a/dev-python/cairocffi/cairocffi-1.2.0.ebuild
+++ b/dev-python/cairocffi/cairocffi-1.2.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-python/cfn-python-lint/Manifest b/dev-python/cfn-python-lint/Manifest
index 6efdfdc79c66..bd4645b7f410 100644
--- a/dev-python/cfn-python-lint/Manifest
+++ b/dev-python/cfn-python-lint/Manifest
@@ -2,7 +2,9 @@ AUX cfn-python-lint-0.30.1-tests.patch 621 BLAKE2B 7b4d457c56f32799c0da0e1e1f655
 DIST cfn-lint-0.50.0.tar.gz 7061105 BLAKE2B bba39823b729b0a53dcc97341b6408654190bceb86acd7de0e2ee1a4ae34234ca6ddc3a4d374c38115632faa0fbbb51fbf07cf717853dd917a262ef5c1116ac9 SHA512 9dc5c00946a9bb142771a4b63571043056b1f522348f11256d7d3181e750c251cfab805a66df884b496fd7639442da0e72f65c0a43cc2ce2ed35f214031c7b1a
 DIST cfn-lint-0.51.0.tar.gz 7125333 BLAKE2B 5f18c03cba52e8f38eb4998ce3640564b6346cd788bc7ca4eebbeebf709fddb130de3fd0c99f5e1585aa07fb965f97ec05d48154bb6788f961c31301058d9ac7 SHA512 6b0eada5204da1c4efbf1a548b74065008bf55142b666aefbc5c1e9311eaaef96e83fd427157be4d3dec98d2e5377ed7f21266af0662e565fdf2aeb6883bb1e4
 DIST cfn-lint-0.52.0.tar.gz 7221391 BLAKE2B 20422bb191e9537ba6950db8c40894ab07655389a0a81eff3489f5bcd626bd81c6f9749f885b8be4f4939f16abe62fbbde7c741e770e6265c28bd59740144558 SHA512 81274b973ede2e60ef113d5ec4e2052dc11ed0a85b79079dd1b40e8afae3738cbd963b2e703f5016e216b2844df8711a34ff024e5dc4b1b12e774176bbe88489
+DIST cfn-lint-0.53.0.tar.gz 7501025 BLAKE2B 0f979ff74e020aa192c040bcc633df8133ed77559afd2fa637af0b02f190f516dc7b3bd2154b9e5ecf3e2edcbf624879727ccbcaab81493f450305e6e1790002 SHA512 58d63e1b9ee7cd64ff30e938d98992dca6214945464c27d61b6d6c7e0daab27daa1feb7f2631de172e9cbf1b22699894b7fb7becd7a292b5efeeedd402db3374
 EBUILD cfn-python-lint-0.50.0.ebuild 1528 BLAKE2B 41e5dc49f8b17753db6a7b2fad4d84e13d125a640d84628090528889649a85971c871e4b817381dfc27574317b300a0980d20fc263fbe36045ca3d126b031d41 SHA512 d61b521de58bccde229e226dd154c6ec70e09e190a0db95f60adc79c7f5dd48cb195529dcbfd3111cd573402b6085efebeeb1eca156adfa3f0efd7b3b55ccc97
 EBUILD cfn-python-lint-0.51.0.ebuild 1530 BLAKE2B afdac8393d467e2657124bd501160b5b0fe29d8fe164a7ace6dbb55e2960ced5018b8a0f321ce5d733d4c3cf28b4bc29474ca6abb1e376ce3422d5019e019da8 SHA512 31347e3c18d543b6d3bdda35c4dc2ad0cd464c2ec5e59ed7c44273ee171248f4c94e0d5c34a760f4a74e509e6cf582a35ef39be01a37d80fdfd769f79e1d074e
 EBUILD cfn-python-lint-0.52.0.ebuild 1530 BLAKE2B ea2f38064081c789468cd0ec6d6c581975d64c4e64fa384b7b6e0058ecc7c43e5942c8f5ef841865ddb5f353015d72b20dd37f62c504eaba72f6d0f08eac6d0a SHA512 73619dc30dfb1b185aabdd41a22d0877b25b0995cc1951e2c31a411e4bc543f195db822c40e0349c24846a1c671345c64fa8a16f2f39cdf5e6604b3e33d5407f
+EBUILD cfn-python-lint-0.53.0.ebuild 1530 BLAKE2B 13604d1fc51910524144b47041b1f277603b80b53d9717950f714d4e92f22097dceb3d3945fac0aa264e61eaf6a94f2b571b13a4838d8a71c4e6be6784cdfc38 SHA512 c6d59e8822495bf76eda2e78fca11aada9c2b7fae15b056dae585f47240530c66577bd95b047d2abdd5a883dd1efd1b974e6596e68f2dd86c41067d4522f3c60
 MISC metadata.xml 596 BLAKE2B c9937cb001e177c18c65bff8b70940d241e54f58aae3818071510f1c73540fcac6c532c8700b4904d4e2c9382f8a5288a2cb8745e174b8ac0a4edfe114d78ff5 SHA512 40c20431d8132ee97311a23bba87d6b408297410573c191f8fc43282bd156884adc25b6ceb6f2168d3456d535c4d82fb3473dd9025bda276f6aad829f68a8e37
diff --git a/dev-python/cfn-python-lint/cfn-python-lint-0.53.0.ebuild b/dev-python/cfn-python-lint/cfn-python-lint-0.53.0.ebuild
new file mode 100644
index 000000000000..5c43ac1c42b8
--- /dev/null
+++ b/dev-python/cfn-python-lint/cfn-python-lint-0.53.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..9} )
+inherit distutils-r1
+
+# TODO: pkgmove to cfn-lint
+MY_P=${P/-python}
+DESCRIPTION="CloudFormation Linter"
+HOMEPAGE="https://pypi.org/project/cfn-lint/ https://github.com/aws-cloudformation/cfn-lint/"
+SRC_URI="
+	https://github.com/aws-cloudformation/cfn-lint/archive/v${PV}.tar.gz
+		-> ${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/aws-sam-translator-1.38.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-5.4[${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/charset_normalizer/Manifest b/dev-python/charset_normalizer/Manifest
index 6ee545a37e28..fa91ec789571 100644
--- a/dev-python/charset_normalizer/Manifest
+++ b/dev-python/charset_normalizer/Manifest
@@ -1,3 +1,3 @@
 DIST charset_normalizer-2.0.3.gh.tar.gz 363159 BLAKE2B f09cd3c9da04123fc7104cfac6829ea23a82173c04469c4d98acf9311f1006f4ecb152992a397a97838f9312ad0fc8bfeea03960650873a9aaa753315245dcc3 SHA512 4fa5507c4c0c61b3722d7423f4b597514a30ad0fea176a77a1e926328003ba6c0f49c95b4f4a64b8dbb32985373706d895bae1c6e3fe1fe224851b8383576923
-EBUILD charset_normalizer-2.0.3.ebuild 640 BLAKE2B 3f1b34c36268cc935c4899d905d2e412a780285d39e803e6909afa9444354d5adcfc00d8b70a9aaa89fd3b15997aab16ab867de41bc4bd96e189a9d092aa754d SHA512 5025b53c31549ed1936afd7b48c0be04bcea91333156d341be769e590fb242f623632ae961e2705554de48a9fe625ac7cabd81134745b6dd92bb744743b2834a
+EBUILD charset_normalizer-2.0.3.ebuild 650 BLAKE2B da8234be681ce4d1d548c84038a700259e8c7b13a076a5ac450ab0cae819ff2313426c0f66c14a63f7e5c3111d5b6329877724f731e12da4dc3ff67e92911580 SHA512 b98413849a0aac1bdaf0b95e2759faf1a46b2cdf59fa842f9a3c031dd8fac8e30e3ead4ca9ea5bed008dff02cf141ee08e4fec42ad739329def2bba8990f9a80
 MISC metadata.xml 364 BLAKE2B be46c29b2fa986a53e4abf38f4f68a9882e3a01c0d3c524a0935a51a04d3e71d98548401ae96e84155c943dc2baf127f28e0f24d764d9e4cea466e2ba010f432 SHA512 bca4661b93af7b085ba8c71ba91188a984336c30467d4e38a7856c2522f83ae6dee122e3061a9b434a218bcb11e18583fc02b85c7629dca5cfbeb6aecc63bfeb
diff --git a/dev-python/charset_normalizer/charset_normalizer-2.0.3.ebuild b/dev-python/charset_normalizer/charset_normalizer-2.0.3.ebuild
index 89687b00b3cd..f26239f68a02 100644
--- a/dev-python/charset_normalizer/charset_normalizer-2.0.3.ebuild
+++ b/dev-python/charset_normalizer/charset_normalizer-2.0.3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~mips ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/cheetah3/Manifest b/dev-python/cheetah3/Manifest
index ffb496a1a564..2a90fb4168fb 100644
--- a/dev-python/cheetah3/Manifest
+++ b/dev-python/cheetah3/Manifest
@@ -1,3 +1,4 @@
+AUX cheetah3-3.2.6-fix-py3.10-tests.patch 1082 BLAKE2B 5e418f22d9067208c038ddcbd35ef5942c09bc92a14a9a28c7ed996496c419b41b772d1fafd3ac01b524aea0dd70706ea69815db0f6fbb3de26abd95b416c3c4 SHA512 1adcc664bfd580fcd62156591b52375e3f01a5107a995ad6a8c01baf8e604c2114451be7cd13775bdf2bcc2d16998d86fd5d0db38c85d4ff6e52bd314fb3c264
 DIST cheetah3-3.2.6.tar.gz 2481158 BLAKE2B cb8ad192ae9caf0d1284294b323cf4a918cd2fc951bae25867d69a3dd7933728056b76fbf52a22d34f290056a96cce7d9ccbeb2404f2f0bb782f8db8b7453e47 SHA512 abf74def695018a79cb1364f60e402e7e0095a4d2f069decfbddf42501d865b70451ebc7b52abc67aa23e57276d7a3b8c2894a9571876e15db43cd1358f74d31
-EBUILD cheetah3-3.2.6.ebuild 1116 BLAKE2B 39fcd02539cf2a09afd27e91276481bcbe6fea3fa8a31b7b9189e37d195e57797d84ebaff1231a3d8495f54b8649f68c21f538a46824ded381cdee727c934694 SHA512 75794dec4df190a31c2ee9019b66bcd6c9cbbef165e444929b6191edfc0eaa5904c4c9a1f28c9355a5d603add708faa6e5db1c7c5cba499590029363571bbc21
-MISC metadata.xml 662 BLAKE2B 3dfe6898c1c2b60050da8427fd4e51a07ba7870120ce491166b9fd222bbaa49e7df7ba3afafe8b159a7b60f781da67dc0dfdf03f085e813cb3f6d59169ecc526 SHA512 b15fac64b057cc9216aaa21002332ec348e89a618ba4c32dd8b9622afd17d7d8db6ef6c3e7c645ad0a03b306c50b79322f5ad1866db93f1033e69b1c7d6130a1
+EBUILD cheetah3-3.2.6.ebuild 1141 BLAKE2B 32148f9cfe925c3b88dccbec20e7c3f555f150b5628dd98394c6df15c21dba364c5b53dbad36b5e3e5e8ebfa0cbfc4c727de63f2a513926ea015dfedfddddfb9 SHA512 74f937845d14930953a5bf9f3286a637470cb1bdf3fb1b7af9f7f42f8cbef44033ec8da166b9ee1c69dce95921f66b3f68398c8eda51d45df244b5df04dc48bf
+MISC metadata.xml 727 BLAKE2B ccbc87781409c89177a8c5e53e21ecf4ebef72351194cd45686e2ac0275b081bb349450f8f66618526d7fbd3038189919d94dd6ea8fc811fa26b09b0d02335a1 SHA512 5fe5a3f3f22238e7c1b9b0ce54d68266678a6078b34ea1472bd140f7f065a9aa658e5c2605c59b31707e1c275b88ee20481443aaf2970f956d1c0a2d5c472874
diff --git a/dev-python/cheetah3/cheetah3-3.2.6.ebuild b/dev-python/cheetah3/cheetah3-3.2.6.ebuild
index 750ee0a37321..c4cb900671de 100644
--- a/dev-python/cheetah3/cheetah3-3.2.6.ebuild
+++ b/dev-python/cheetah3/cheetah3-3.2.6.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{8..9} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
+
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="Python-powered template engine and code generator"
@@ -22,6 +22,10 @@ BDEPEND="${RDEPEND}"
 
 DOCS=( ANNOUNCE.rst README.rst TODO )
 
+PATCHES=(
+	"${FILESDIR}/${P}-fix-py3.10-tests.patch"
+)
+
 python_prepare_all() {
 	# Disable broken tests.
 	sed \
diff --git a/dev-python/cheetah3/files/cheetah3-3.2.6-fix-py3.10-tests.patch b/dev-python/cheetah3/files/cheetah3-3.2.6-fix-py3.10-tests.patch
new file mode 100644
index 000000000000..845520fb02ad
--- /dev/null
+++ b/dev-python/cheetah3/files/cheetah3-3.2.6-fix-py3.10-tests.patch
@@ -0,0 +1,27 @@
+From 112dddd8fa5fb9c285fb8ef2818abfef99365070 Mon Sep 17 00:00:00 2001
+From: Victor Stinner <vstinner@python.org>
+Date: Tue, 19 Jan 2021 11:19:15 +0100
+Subject: [PATCH] Skip test_import_bootlocale() on Python 3.10
+
+The _bootlocale module has been removed from Python 3.10:
+https://github.com/python/cpython/commit/b62bdf71ea0cd52041d49691d8ae3dc645bd48e1
+https://bugs.python.org/issue42208
+---
+ Cheetah/Tests/ImportHooks.py | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/Cheetah/Tests/ImportHooks.py b/Cheetah/Tests/ImportHooks.py
+index d7b5f5d..bc0239c 100644
+--- a/Cheetah/Tests/ImportHooks.py
++++ b/Cheetah/Tests/ImportHooks.py
+@@ -87,7 +87,9 @@ def test_import_builtin(self):
+                 return
+         raise self.fail("All builtin modules are imported")
+ 
+-    if not PY2:
++    # _bootlocale was removed in Python 3.10:
++    # https://bugs.python.org/issue42208
++    if not PY2 and sys.version_info < (3, 10):
+         def test_import_bootlocale(self):
+             if '_bootlocale' in sys.modules:
+                 del sys.modules['_bootlocale']
diff --git a/dev-python/cheetah3/metadata.xml b/dev-python/cheetah3/metadata.xml
index 52f8ccc1f81d..c6b648884ee0 100644
--- a/dev-python/cheetah3/metadata.xml
+++ b/dev-python/cheetah3/metadata.xml
@@ -11,5 +11,6 @@ are its principle user group, but it has many potential uses and is also being
 used to generate C++ game code, Java, SQL, form emails, and even Python code.</longdescription>
 	<upstream>
 		<remote-id type="pypi">Cheetah3</remote-id>
+		<remote-id type="github">CheetahTemplate3/cheetah3</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/clang-python/Manifest b/dev-python/clang-python/Manifest
index 451d41e69c3a..e8e94d9618c5 100644
--- a/dev-python/clang-python/Manifest
+++ b/dev-python/clang-python/Manifest
@@ -2,10 +2,12 @@ DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3
 DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45ca1c93b64fa4c6ebcd70a1d3849dbad2b8e4e24fba02d144c6266d7fab3607ebc6999b28c229cb35256cf40f26a985 SHA512 9a8ce022a935eed42fa71a224f2a207122aadcbef58ee855fdb4825f879e7d028e4dcff22c19b9d336db1c8bf63fb84372d44981acf84615f757e54306c92b81
 DIST llvmorg-12.0.0.tar.gz 134226215 BLAKE2B f9c3ba8c58571855caa4f206fd285c9b5be66672fb0814cb8bc0964a051f57f5d35013aa1e27cbda502652b37df1ec23474129109e76a42066847860db441dbe SHA512 0cff02155c5ac0d6db2b72d60d9819d5b5dd859663b45f721b1c7540239c2fceb1f57d9173f6870c49de851c242ed8e85c5c6d6577a1f8092a7c5dcd12513b26
 DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f65f37dd9e4c8888533cfa8c3ccdcf4f108aaab9de23ab0ab987966eb160f2a553a0bdff99461e71ddd5bfcd086090d SHA512 6eb0dc18e2c25935fabfdfc48b0114be0939158dfdef7b85b395fe2e71042672446af0e68750aae003c9847d10d1f63316fe95d3df738d18f249174292b1b9e1
+DIST llvmorg-13.0.0-rc1.tar.gz 147235597 BLAKE2B 089fed119dee8a16f278cebb13808bd5a95629cc87ebee3050225cc041b78fee51acacc5bcc913d4a99e830bfe5774b19a04a845293c5087dd2a8c9d94d2fde9 SHA512 6e307e2c2dcb7ff41d11ee29d69f41c0ef55f200999847a3a924a2e773fc9c2160015746789af8b723c628bd232f97fce63370209bd0065491d80b0cc0017e85
 EBUILD clang-python-10.0.1.ebuild 923 BLAKE2B 6a6b3667dc21ef2b35e45e4f57db9d854e40b0ea7e49c4cb92ff1979987afb31c33d5d8b57730683b6acb682702c4dca69aa200fc162c60586a9d880b3c290b2 SHA512 d6b0916aa0bd83c3529b9c106ac8ad75c4930aa620cdccd4b1e3e0d7a54fdec0f8d5cd430cddd64a0a7389b1ca6f3a5b142d433691eab4356f72d52c40010e44
 EBUILD clang-python-11.1.0.ebuild 925 BLAKE2B db1ed6c8b6f6f156350e4b29ac9292b3a941abaec52a4a41b41f7e3a641cfa2ae9085f356000bfa361fab697299509193b3d20c1300f0514ee72b368daacb382 SHA512 ca8e1aff2ba826ee9c1e7d5cd9d851bf3fa935e429b078a379083be4ef21de0aac62d2efcee9487a4283dd8a81bcfed05ca55116c2b89e8febe45a4af9a30425
 EBUILD clang-python-12.0.0.ebuild 925 BLAKE2B db1ed6c8b6f6f156350e4b29ac9292b3a941abaec52a4a41b41f7e3a641cfa2ae9085f356000bfa361fab697299509193b3d20c1300f0514ee72b368daacb382 SHA512 ca8e1aff2ba826ee9c1e7d5cd9d851bf3fa935e429b078a379083be4ef21de0aac62d2efcee9487a4283dd8a81bcfed05ca55116c2b89e8febe45a4af9a30425
-EBUILD clang-python-12.0.1.ebuild 927 BLAKE2B 1e0d88215cd7bd7a7968fb00e5c91e10b894750a4ec77a4413d5af19bb93e422b59204e2f62b90ceb628846fede7ed534424640974fe9a3e2d881aec0ccca02e SHA512 11d64eab9433584271e4c97f7af0a9e2762126c3eefffe0f19e74ffdfadef6852aea59337c2fb604daad3c8b3495a3ee2e1a015c20e14eef673e2dacc8304fdf
+EBUILD clang-python-12.0.1.ebuild 926 BLAKE2B 83dcb4cee0ad655c5b098c678dc52f5c239c899c231a482bae52b0d8f44da889b63527ecafa0289aa60f678a169d74a9831c2769e6848c4ab53d141c78736b81 SHA512 90fc2f56ec5c6a3cb2f0b1009fbb66ca9c360b5698404af67656a153ba95a00a918dff7b2357430a57e722534395adf39c4a4022f1d911e6e409dd2725b2faff
 EBUILD clang-python-13.0.0.9999.ebuild 904 BLAKE2B 22ef0cb9f276007d069b46abebbfbe6b31558f0588280ab48bf693a3d23cf233f6d2f562131f43eb77776445deb5dc25084980c775fa0185cd93d776773ffaf0 SHA512 7f09a06f1c45ac93506aa40ee060104d8df1acbbef4e0852f277d6687cb4c8f9541e6438c6e769c730062570dec51c179539e41a9cdc2d3b492cdd6147733ed3
+EBUILD clang-python-13.0.0_rc1.ebuild 904 BLAKE2B 22ef0cb9f276007d069b46abebbfbe6b31558f0588280ab48bf693a3d23cf233f6d2f562131f43eb77776445deb5dc25084980c775fa0185cd93d776773ffaf0 SHA512 7f09a06f1c45ac93506aa40ee060104d8df1acbbef4e0852f277d6687cb4c8f9541e6438c6e769c730062570dec51c179539e41a9cdc2d3b492cdd6147733ed3
 EBUILD clang-python-14.0.0.9999.ebuild 904 BLAKE2B 22ef0cb9f276007d069b46abebbfbe6b31558f0588280ab48bf693a3d23cf233f6d2f562131f43eb77776445deb5dc25084980c775fa0185cd93d776773ffaf0 SHA512 7f09a06f1c45ac93506aa40ee060104d8df1acbbef4e0852f277d6687cb4c8f9541e6438c6e769c730062570dec51c179539e41a9cdc2d3b492cdd6147733ed3
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/dev-python/clang-python/clang-python-12.0.1.ebuild b/dev-python/clang-python/clang-python-12.0.1.ebuild
index 5999d3c28201..2a31d118bb91 100644
--- a/dev-python/clang-python/clang-python-12.0.1.ebuild
+++ b/dev-python/clang-python/clang-python-12.0.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
 IUSE="test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/clang-python/clang-python-13.0.0_rc1.ebuild b/dev-python/clang-python/clang-python-13.0.0_rc1.ebuild
new file mode 100644
index 000000000000..921f7735340a
--- /dev/null
+++ b/dev-python/clang-python/clang-python-13.0.0_rc1.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..10} )
+inherit llvm.org python-r1
+
+DESCRIPTION="Python bindings for sys-devel/clang"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+KEYWORDS=""
+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}"
+
+LLVM_COMPONENTS=( clang/bindings/python )
+llvm.org_set_globals
+
+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/commentjson/Manifest b/dev-python/commentjson/Manifest
index 7280214c8412..4e08b8d19ffc 100644
--- a/dev-python/commentjson/Manifest
+++ b/dev-python/commentjson/Manifest
@@ -1,3 +1,3 @@
 DIST commentjson-0.9.0.gh.tar.gz 15297 BLAKE2B a857b0fa5551079d3d37bff94fb51a903e998c4fb84e0f62a5de28d6eafe0cb8a38b3215515e72c56de0cddb661f109921c801d15b9ba93771290135adaaa5b1 SHA512 cd3d28adecbc445ed3faed7847c65a23829f408cf8aa3fa85544a0f0cf9fa5544b8aff560725cf51921f249123daf9ce9953069e99ca64a312bb4bff652512fe
-EBUILD commentjson-0.9.0.ebuild 765 BLAKE2B 80e4a795ae4ad812ceb8f7920d7da289c33732b5533eff42849600718c235e9c4e3514f13c70e04f5edc29e53e18ad92e5785991380a56fb96935011d420d3a2 SHA512 b8c9f26d58955bfb288acba4d9373dcfa11263c7793e421fc76ab6b251007d2752e20ec9bf341c3de881f2719f30441b369f816e41d71986f41de0019052f88c
+EBUILD commentjson-0.9.0.ebuild 763 BLAKE2B b30935e60c7653c417fad3530bc87f4c24bdba6df9c6ba64eaa34cc6b1aebd29d5430df078c6200be2c8130281324db8fb118e1364135c971c03b4667ff136fb SHA512 ddba1ae38133fd4d090b33dc25d450e2d8fccb8c8d0dfb0bc91d48a775f683512d50d3b4b1e5307fe0e524a3e0c626f08d61eebd28e73dc272a08e4c13f6421d
 MISC metadata.xml 350 BLAKE2B a14a2adc21600c7f65c10bd0d741c0f81ede15baa200532ad346a74f36e4eed3bfd4af40ae30d208bd6cb1064936b4e7fc5acb0db31890a9e7109210f499b3df SHA512 558f86dfd9c937dec4a41df69e50662a86968cf1884484fc0fbe336d95b4fb4c66c22ced5b086024364d8c02aef6ffac436aa6ba80afc5398dcbf3ac12f5f4d0
diff --git a/dev-python/commentjson/commentjson-0.9.0.ebuild b/dev-python/commentjson/commentjson-0.9.0.ebuild
index 548184a4965d..612c505cf3fa 100644
--- a/dev-python/commentjson/commentjson-0.9.0.ebuild
+++ b/dev-python/commentjson/commentjson-0.9.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 
 RDEPEND="
 	dev-python/lark-parser[${PYTHON_USEDEP}]"
diff --git a/dev-python/configobj/Manifest b/dev-python/configobj/Manifest
index 1237158e9562..0cc44cbc936b 100644
--- a/dev-python/configobj/Manifest
+++ b/dev-python/configobj/Manifest
@@ -1,4 +1,4 @@
 AUX configobj-5.0.6-fix-py2-tests.patch 1494 BLAKE2B 5c52aca50d606c0fa3fef6d2fb184b3d21bb45ca39c4cb5893aa67b06e46954110b4a2109fb1592931a1947b56b12a80a575baa54ca7dfbeb1981bb1c610137f SHA512 ff87d2b54a47cddb9dd77d43a3028805f98c76e7a0c9529d40fa2d936c8b23ede24931f2066665d0b6ba30db6f62ac4871605c6b89c4842eb93847eb2d6e1e8c
 DIST configobj-5.0.6.gh.tar.gz 143664 BLAKE2B b554d0aec903aecb55387a0164cd6f8d442e9fc1ab231ce7f7123e7a5041e07a86f5f7bf70492ca93fcdc1bd3caa5b855c427f060842e3b4a7524afbcc417a76 SHA512 326eb86e362f281ebf07abcb1cf7616abb270c482eafe842371cda8708245ca5e8262f1644b7164664ecc10e9004ed061c9de18cd233a657d4697dbc3ba3c59d
-EBUILD configobj-5.0.6-r1.ebuild 741 BLAKE2B f51d1638f6a5f5ca7c758fab7c864d1ac2a3c601cb54df301d7d6ed0f88f8097b9f456370dcf133277640d2c88b7ae4b82491feecbc8717bdf5605c19da59137 SHA512 e79cc3aa461eab6a841c9fac0472fe7c0e17394b212e9b5e0f980c438d60c121189a42e560acd8aaa6f198db2bb985d2adde022801f8b16da3de4e4aa278c85a
+EBUILD configobj-5.0.6-r1.ebuild 748 BLAKE2B 33149db3d6b1e2da33bb65d2b1cca20e488f718f08f8e72c4e95f311c076ba3e89e2d8079ccce4808783467e80f4fde3342542b6e858432b0d7545036d3c6f26 SHA512 b7f0956e980fbbbbd22c58d8f5eee4285d18d98f49046c93bb815c073f3dad86638305be3f17a42c49caf659717ea38611758a932ef3705e17acb53e69f22b81
 MISC metadata.xml 688 BLAKE2B d4a4e54b638c6d5011dda8858341b089eaa20b6d92566586d95ed407b7d94d80a4272426fa2904176e084df92b0606c957f16bb6fa4692848f2044d5ba206386 SHA512 653fec16eb0773050fc60e0df5b8be0311801495f4fe109d6346319a24159f78af614b1c587f0521be47e0c608373289e6bb05dec8284ae01cbe55c52c34d780
diff --git a/dev-python/configobj/configobj-5.0.6-r1.ebuild b/dev-python/configobj/configobj-5.0.6-r1.ebuild
index 3bfa05696f65..efc04cccf1b1 100644
--- a/dev-python/configobj/configobj-5.0.6-r1.ebuild
+++ b/dev-python/configobj/configobj-5.0.6-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/DiffSK/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/csvkit/Manifest b/dev-python/csvkit/Manifest
index 2a074875bd42..d504990bbb9b 100644
--- a/dev-python/csvkit/Manifest
+++ b/dev-python/csvkit/Manifest
@@ -1,5 +1,3 @@
-DIST csvkit-1.0.5.tar.gz 3783495 BLAKE2B 19210c23480cb3068af74c922a3495612f40bbf5c4985f7018c9c185564dd0c101292f165ddd03440220f582bfdc1590e2f75e8e5c92edd71e76e46a73b26547 SHA512 62dc7a5eefeda9c8824b24f8844b6c1ead5449797d9d004111885b03a1989ad89d1f48b3b7d4a69130885b85cc3c1352910737e416fc19f2038525632b1569f6
 DIST csvkit-1.0.6.tar.gz 3784737 BLAKE2B b1e4583443cbfc62f713d3b311bbe313cf4e69b7aa5aa13dc6970375a727a804ba1dbd176b25487027d3bc1a5696f2ce649a460c91ef7c5591c33bb3c6f48c33 SHA512 fb37404405f2f2c0bf803a1df8186aa9e3b11cbf3c4f6e1fe6dc06d53730aa91d462bebcca3917e9a451f1d81df053abd9ceedfaab085ab696f9ba701c873323
-EBUILD csvkit-1.0.5.ebuild 1297 BLAKE2B e00ecf1a78ab98bef348790fc76426f305f598f17893e36588e6d89e0f948f5c7b48b60e6be08d3918ee531696dee592be679759a8054a341130222ad1b733c2 SHA512 7a817661dc9279c841718449a63e218650358cfc8ea9f3bbe70e6b92f33da3156acfeda79be582660841eaa1182eeacc368815a2293cbe1b5fc23b7846755cb7
-EBUILD csvkit-1.0.6.ebuild 1291 BLAKE2B 7f9335b92e6064ac49bd9ba7c144a1837e6e757d21223b8b7862b6f994b7a96a12803b51891456a4316a3cb309563046297c6b40db04fb56b00afd1efe85d32d SHA512 85cb1f7b183a7970ea3b22504d51162791b4b7081648223f4ef9a14b7b4c7700c5764ffbdcc03865b787e2c86c152efdb2bee4856b545683258743f3e69339dc
-MISC metadata.xml 500 BLAKE2B b73dbe5965b76d39d6e97dd46e7de1c0d583fe0b48de00528169068c6d86123c25000a37115d2f9db48eb687a95eb6742975daad252591d4ff18a8ca65b6f4c4 SHA512 daea7035cb0f2e5a852c457e3bdacb15ed5ed618e21dbfc6a42d25d92b8b7f17f46e597783c5fde45a8e71719e035d78cc94ae2c8d76be3e5f36e3f559856b47
+EBUILD csvkit-1.0.6.ebuild 1153 BLAKE2B 951ff2c6dab84db28cf53e5edc0eb7aa761cc965ee9f8a33a64e1ef372d319b2695d4a00ed8db58efb6906b73b1ed8b0f67938683445c5d03ddaeb398c33eb32 SHA512 141018bad52fd5388f515b58e00ab65260e5ba1305525a87e6f400d5c2b00f16e92ae8cda513996792e01ca08e47c0dff8805587691b7a8cd6abd161b8b81aab
+MISC metadata.xml 524 BLAKE2B 47f8e95f0ea809df132b944f148281dabfedbbe91e4fa87a0e5be465f2dcb83eb0173a67f31224013219993ef8eec2a6535e59a73d010b57e17990823917d30b SHA512 5fe2f94011c100fb17f6121ddcd6a2fcee119e2ee90246749833c07e704092dc42c17875eb96921265c071b14dee2be3b7f48a4a08665d1a57540228bc07bf01
diff --git a/dev-python/csvkit/csvkit-1.0.5.ebuild b/dev-python/csvkit/csvkit-1.0.5.ebuild
deleted file mode 100644
index 1430aee3a914..000000000000
--- a/dev-python/csvkit/csvkit-1.0.5.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..9} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-
-inherit distutils-r1
-
-DESCRIPTION="A suite of utilities for converting to and working with CSV."
-HOMEPAGE="https://github.com/wireservice/csvkit https://pypi.org/project/csvkit/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test +xml"
-RESTRICT="!test? ( test )"
-
-# Other packages have BDEPEND="test? ( dev-python/csvkit[xml] )"
-AGATE_VERSION_DEP=">=dev-python/agate-1.6.1"
-TEST_AGAINST_RDEPEND="xml? ( ${AGATE_VERSION_DEP}[xml,${PYTHON_USEDEP}] )"
-RDEPEND="
-	${AGATE_VERSION_DEP}[${PYTHON_USEDEP}]
-	>=dev-python/agate-excel-0.2.2[${PYTHON_USEDEP}]
-	>=dev-python/agate-dbf-0.2.0[${PYTHON_USEDEP}]
-	>=dev-python/agate-sql-0.5.3[${PYTHON_USEDEP}]
-	>=dev-python/six-1.6.1[${PYTHON_USEDEP}]
-
-	${TEST_AGAINST_RDEPEND}
-"
-BDEPEND="test? ( ${AGATE_VERSION_DEP}[xml,${PYTHON_USEDEP}] )"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local pytest_args test_name xfails
-
-	xfails=(
-		tests/test_utilities/test_in2csv.py::TestIn2CSV::test_convert_dbf
-	)
-
-	for test_name in "${xfails[@]}"; do
-		pytest_args+=(--deselect "${test_name}")
-	done
-
-	epytest "${pytest_args[@]}" || die
-}
diff --git a/dev-python/csvkit/csvkit-1.0.6.ebuild b/dev-python/csvkit/csvkit-1.0.6.ebuild
index b703b4a252cb..899bb8fae0d8 100644
--- a/dev-python/csvkit/csvkit-1.0.6.ebuild
+++ b/dev-python/csvkit/csvkit-1.0.6.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-PYTHON_COMPAT=( python3_{8..9} )
+
+PYTHON_COMPAT=( python3_{8..10} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
@@ -14,8 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="test +xml"
-RESTRICT="!test? ( test )"
+IUSE="+xml"
 
 # Other packages have BDEPEND="test? ( dev-python/csvkit[xml] )"
 AGATE_VERSION_DEP=">=dev-python/agate-1.6.1"
@@ -34,15 +34,8 @@ BDEPEND="test? ( ${AGATE_VERSION_DEP}[xml,${PYTHON_USEDEP}] )"
 distutils_enable_tests pytest
 
 python_test() {
-	local pytest_args test_name xfails
-
-	xfails=(
+	local deselect=(
 		tests/test_utilities/test_in2csv.py::TestIn2CSV::test_convert_dbf
 	)
-
-	for test_name in "${xfails[@]}"; do
-		pytest_args+=(--deselect "${test_name}")
-	done
-
-	epytest "${pytest_args[@]}"
+	epytest ${deselect[@]/#/--deselect }
 }
diff --git a/dev-python/csvkit/metadata.xml b/dev-python/csvkit/metadata.xml
index e13598b0ff4a..690a0b7545d6 100644
--- a/dev-python/csvkit/metadata.xml
+++ b/dev-python/csvkit/metadata.xml
@@ -4,6 +4,7 @@
 	<maintainer type="person">
 		<email>zmedico@gentoo.org</email>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<bugs-to>https://github.com/wireservice/csvkit/issues</bugs-to>
 		<changelog>https://github.com/wireservice/csvkit/blob/master/CHANGELOG.rst</changelog>
diff --git a/dev-python/dbusmock/Manifest b/dev-python/dbusmock/Manifest
index f5be335d711b..443a6040d9bd 100644
--- a/dev-python/dbusmock/Manifest
+++ b/dev-python/dbusmock/Manifest
@@ -1,3 +1,3 @@
 DIST python-dbusmock-0.23.1.tar.gz 79964 BLAKE2B 60140997f7a9c196d4c38100a975550d6a4745344fde9084ca5a56881035c09cfd56387897a7e409e35aecbc759f01b8f4953b8a5cdda4bfbe70d80cd01b8332 SHA512 933205c770f82aef623e571d9d806b6d639467c977ca326718ff475f41e309ef25e9a8f1cd8439e181edbafeb6513af7b73dfb938b3abfc7d5f63b6b5ffa9fc9
-EBUILD dbusmock-0.23.1.ebuild 885 BLAKE2B a0c5098a9bccda4c78106f33681f86bc06671207e919a0f2ae1ae551ff5a01dde2121f5589f545089583122a38a0418288e60de75ec97f01ada9863a004ac04a SHA512 ec398412aafc00980d35e27c84d0b34071eaa69bc2b2eaa3a7e918bdfe65d94cbd06d6b89a7a503aefc0fe6e41db839d82d4312729e6f998cef57a6e0e2a0db4
+EBUILD dbusmock-0.23.1.ebuild 892 BLAKE2B 247093a69710fd11581695e7e8f8907fea5561a988b70b39dfeecc1e2e8e42e389f0da0f438bec11c3ec9b5054eef1e52c1a60339267fe3178ecaed4fb0572b1 SHA512 526b6b033a168f92f290fa67159d37335634f9e73bf6eecb18e06ad1792eb49f91225cc830a273ea1b0f4bc179ec7b249207a9e5a953c4bf8d72264a79c30234
 MISC metadata.xml 456 BLAKE2B 1255b5eaa7068525c5661663a3d42b052100e7c0c9ad58f4b85ba6113d2b0ebd4a48691ca52bbaf10635d34e5fe8949b6e44f98babe514ca78663462fa88a85c SHA512 ce665cd1934e2307281538e1f306297974cdf50c7c5576ebd2f290066a39b1a18bd1dfbe34bef29d5f332847699699b811754bac9d52364a96c66b030d953362
diff --git a/dev-python/dbusmock/dbusmock-0.23.1.ebuild b/dev-python/dbusmock/dbusmock-0.23.1.ebuild
index 8c09033ec7be..68998ccb55f6 100644
--- a/dev-python/dbusmock/dbusmock-0.23.1.ebuild
+++ b/dev-python/dbusmock/dbusmock-0.23.1.ebuild
@@ -18,7 +18,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 
 RDEPEND="
 	dev-python/dbus-python[${PYTHON_USEDEP}]
diff --git a/dev-python/denonavr/Manifest b/dev-python/denonavr/Manifest
index f3a669c0e948..fee2ac342c9b 100644
--- a/dev-python/denonavr/Manifest
+++ b/dev-python/denonavr/Manifest
@@ -3,5 +3,5 @@ DIST denonavr-0.10.7.tar.gz 148282 BLAKE2B a5168c1b00ce1e8223d619a8e2e7ae663fa91
 DIST denonavr-0.10.8.tar.gz 148387 BLAKE2B 1ad6687655abe70e6f83119c893187efe88143521e5c91987ae6b3d393fe7a327bf34941d87a4ba37107ef415493471be0630a1f3c643f94cfb3e22460c80806 SHA512 fea1b2a03d83d520c837323939db503879ec0c973bbf9409087298977f4d07f8ed8b25c2d287c1529786a4e42cd59b0f0708a8a4b7df3d5f630967110d7fe906
 EBUILD denonavr-0.10.6.ebuild 755 BLAKE2B 19509ed35e79c27f4a6f352ff1cc06a06786e0a57806999bd02df983e41b04f62aa522fa96665c0fd875208ceef9b0121c7e4bc7427d5a10e71d7e3642dbae5b SHA512 3a6cb8ab60f3be41cd01d155e6501decf3ab5311f565392eb9b71d20b017ae9d3ea3e33cebb78b54ab7ff31ceb8fda0c570a7bdceda9015fff1b8c0ff1d1e7e7
 EBUILD denonavr-0.10.7.ebuild 755 BLAKE2B 19509ed35e79c27f4a6f352ff1cc06a06786e0a57806999bd02df983e41b04f62aa522fa96665c0fd875208ceef9b0121c7e4bc7427d5a10e71d7e3642dbae5b SHA512 3a6cb8ab60f3be41cd01d155e6501decf3ab5311f565392eb9b71d20b017ae9d3ea3e33cebb78b54ab7ff31ceb8fda0c570a7bdceda9015fff1b8c0ff1d1e7e7
-EBUILD denonavr-0.10.8.ebuild 755 BLAKE2B 19509ed35e79c27f4a6f352ff1cc06a06786e0a57806999bd02df983e41b04f62aa522fa96665c0fd875208ceef9b0121c7e4bc7427d5a10e71d7e3642dbae5b SHA512 3a6cb8ab60f3be41cd01d155e6501decf3ab5311f565392eb9b71d20b017ae9d3ea3e33cebb78b54ab7ff31ceb8fda0c570a7bdceda9015fff1b8c0ff1d1e7e7
+EBUILD denonavr-0.10.8.ebuild 756 BLAKE2B bc30fa50f582fcf633f22bc340e215d1f697f0abb36332138bc46f9a14b1becf126dc0af75e7d2c5d15b3435ca7d8db52b4e7f3a0ae63f3496554f87ec4764ed SHA512 1619c4703eb419d9d295a5763fafa2fd94f313236cc2b1112b90d4a702e2a1d2a0119af3f699652520d819b7d77ed90b6e345fa45de033dd813c938168d34478
 MISC metadata.xml 549 BLAKE2B 7031b8af81fe98059cf29d386d6f09493af833f33dacfd2be8f4e4e534a6ec1196e85cfc3ddf13ffe4a4333c0be7c95d453916bf6a223065e1520259956ce51f SHA512 01ecd0c14cce4a3479e70c3aea2d3f2e3c582bf9ff7bc8f887f341e19b0e45fd78638a12b6a617db018da4fe98704345e7e27fb9d6d0ed464daa71b2d1ccacf0
diff --git a/dev-python/denonavr/denonavr-0.10.8.ebuild b/dev-python/denonavr/denonavr-0.10.8.ebuild
index 744cc8df1076..774d25fb91ba 100644
--- a/dev-python/denonavr/denonavr-0.10.8.ebuild
+++ b/dev-python/denonavr/denonavr-0.10.8.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 PYTHON_REQ_USE="xml(+)"
 
 inherit distutils-r1
diff --git a/dev-python/django/Manifest b/dev-python/django/Manifest
index b5cf8a975aba..2a5f97e56004 100644
--- a/dev-python/django/Manifest
+++ b/dev-python/django/Manifest
@@ -1,13 +1,17 @@
 AUX django-2.0.7-bashcomp.patch 1507 BLAKE2B 8aeb494087dbccffc69ad43f370e791d9fbfb1908d45f55d5f8be01ec0f3af6b2aff591da84a06c0858fecd44180579a4647d622ef57d8235ccb4b3b80fd3a2a SHA512 5a3867b8e4f2fafe4c53a741d41e8c6e8e28a55463f7d8007afd669a04daa8b93f911e4ef8d5ad38ba300558f21ac8090b00337d0c0bfb93b2aea73a179334a4
 AUX django-3.1-bashcomp.patch 2085 BLAKE2B 36a0aa4d3413f13089ac104f5d3f98ecbb152a9a5a35f8c1ff2e5ffc9824153b0ac89f1cbca76c31a1afefde471e4d6ed801e405551b25cb31da89c20f3019cc SHA512 82dceede4292bad6e3e4966a6dba01bd2bbc7db494fce592e25dc4a64236485d88d8ad67b247239a80f8fe96dff054d20afea6f48a5518b67cf88404d399e61c
 AUX django-3.2.3-py310-repr.patch 3827 BLAKE2B 42f68fecf8fba65ffc23d19f95b5232ed020005d347fce1b30bd6a18755e649bc00ebd6aa7235810564e8954726dda4f541c58c599a9433d3ecd539717b97284 SHA512 6cfc9ee5f8c5c9a59bfeb5311e853604a6f77c7c747deb48780122f06e7634ea783f5ae82c4935a2a25f1cac358175cb8cbaa6285bd26da5e6fd35d3e3958e1c
+AUX django-3.2.6-argparse-py310.patch 2001 BLAKE2B 888987392f13643e367a8e0f003ab10e0c143034624dfff7e8ec50b91aa2c3a1569f243a383c533757b55616625a40e3e2569d1b0a5f78ccf7bedcdde7c74c55 SHA512 7070ef00895658d0308ece951a3bb60e325e79d81cd987d9296dc6cc9394ecf9329040b89e35fdb31868aeffb23cba80fa982c9a49495124674361f0d8bf614d
 DIST Django-2.2.24.checksum.txt 2558 BLAKE2B 8a4b1759f0c52f9dfe6eafc2b54d2d6db8c1204be837ef0df362e02afb41faa3fcfef3ee1b5bc10482a200db58c21c3a7a9650b6ed8103c69f196b655af5b239 SHA512 e26d71ed2cded2521837c82ee896b68d765da224a42f34457cb67a0105a72b2b0223655208400baddf7bb70dd51c4902b9ae80d8cb2bc8963c16b23d37bb2d53
 DIST Django-2.2.24.tar.gz 9211396 BLAKE2B 7422019ad8849ae543d7b2ca7f5624b5379c832b5d19511f52df77d95acaa0a45cc61579b0e3a74671c295ffab5e1dfecd1c044e9ec042c46606f888c257e1d0 SHA512 5a3ee79500ad458bfc5220b9b68248bec59bf6d2304d58ca280111854d6a5f7e25784680e949487e8b59c1de0b329a53cf0676d2ee4bb2b88463918c4b0b6085
 DIST Django-3.1.13.checksum.txt 2552 BLAKE2B e82052d952f7dfd15e11b413fe2f106af3d3774073c57538b10f1beeada3128de2cb3d861684599fbf5f337b0ae4eff3a101998da30d8d961f84ac7cb3bb31c5 SHA512 07870c27034f70f335ac35b34317944947f544f63108f21134e81326b4e8f05a7cb3d382d91e7f0a846d51944032efcddca2c3bf980f626627c74c388932e4cf
 DIST Django-3.1.13.tar.gz 9656683 BLAKE2B bb2dd72ba2dfc13c8f487d6b59cd9302160800dca4f63b92e640eddf4aba2e5b1bd67580e56477bced44a5393b5f65a463a9c0c539ba998a20606bffdfafcf74 SHA512 55b1ceb24b6e0ba542a96319f63b138439532cf4b00971a8432baaab4a8ee219cc9fbb31d457ba7da9e932c919df83da9630866d909df4a5d432866b158098d7
 DIST Django-3.2.5.checksum.txt 2543 BLAKE2B 4a07a518bdde4670dc3bf079d8d3cfa32b6580cc06f18306a2127463f3a6a2d8f2a50c4562092439c7c99ccf80dde160b061180826c94d4e1064d5064ff500fe SHA512 b073ff758843f72b6467dae7580941774de9702db02a6fab303cb696cb22c84ca961885792e8ec85545294610f34a4eb52ac3f6521c190d2c339c1957ab4156a
 DIST Django-3.2.5.tar.gz 9806547 BLAKE2B d804d758f95f18aac5c44cba9bd9248efa56cba91bea5db2ac89e8c2202ac1fd088b61d6cc98eb7d6d33a95f85983b801c6cc26a3231986a8cf224a0bbeb8a7c SHA512 03d4eee650a857bed298658c68b916beb74690d16b4b28d649c52a7c2d8a61e92f53136d2de3a77fabe1dd01c0e6b3033befc6842f39c222793fb590b1020c13
+DIST Django-3.2.6.checksum.txt 2551 BLAKE2B 2fae4e3daca01f285f651b76df7402a0c08cdea9a98bdc3be3f9b337732c26b2a3dcb239fc06274b6a30227394047476d454bf34fd7e8b765df047510b08620c SHA512 66b9dff471928be514198e50e62f46d14fbea9c1cfb55e9d82562271795fc3e719e0bb8c43a1f6ff6c903700b648a6a0e19e335ddc50df2a7fa539911b6d44b6
+DIST Django-3.2.6.tar.gz 9821499 BLAKE2B 9f18d308bf15ef16a9fe9d84219bd7ad37833b718ff975344aae5950ef01a7a0e8ef8669936c8908e38e07fb078ce2e2d6392968177400c2357b1d3787e0ce39 SHA512 adf2d2ab3006cc5b389bed8d8e16ee8c98393b20d719c3521068e5cc5d1e679b9f660be90f827ea1cc6a41f975641c32bdb0779ee145e5e31a501ca9e06898a4
 EBUILD django-2.2.24.ebuild 2677 BLAKE2B 51325e634c8aa029d70de52fb128e4b168ca170d5bebee7763d55f3a924b7edf758031a9720ded7ee7e1f1a0f283e183a0cfe6d8bbe83629ba1cc5c1819b3457 SHA512 44812712ca209b8af0c14ee92d3db98d428feda28a8a16be9ec928e6c32c0dc9833a84f058f59d934181f57b658e2a6be2212eabd59f84eff17ee674a9bc19e1
 EBUILD django-3.1.13.ebuild 2772 BLAKE2B fca2574b02e943a7535bfb3ed5e98402a65bc86b5b9ec72a7e814cd7c2da7d0017bcd2127e69e8ed6646ba3905d53deb657818d87435c34747b9296ba662dc0f SHA512 15e9ef76ec559b138f1d49bebdd0c5f2603d2ca48693c4066dfeb0a1e3d2baae598e8c8604e05fceb649f5c6d792ec277599ee257c91248df7db718361a08869
 EBUILD django-3.2.5.ebuild 2993 BLAKE2B 5e5a148dd83c40c8b86bbbec80e574a7fa465ac42d5b6c69e5bae60cda7a808acfea48846fd564999479cd042c3c2e80d32fdcef31ca0ebc6da3a7856a3b7b37 SHA512 04bd0a8108af7b99c1607dc78cc2f893e165ed7a2488bf713cda582e35a4418009d924a7d318bb52dc4e3d4989e315c4ecb0b423d156cf394552e20c2e431604
+EBUILD django-3.2.6.ebuild 2989 BLAKE2B cdb75e93c34daab3ece269324d43a1b2d5a23b035db4354a5d966fd9dd193d3fb6d03a0f1f9246bc95f4c56c61373d00aa8e059f6dd7e810422d46b04b1c0553 SHA512 1719f818add4795baf2787df25d291268955d4b383fead2146284b652a190ab6a824068c3ab54fd46caaa6deca922d9124b0a888b9c9beb492b72c0a5f2d4c77
 MISC metadata.xml 399 BLAKE2B f49845f5a6476a0b43cbe47ab11b298f53703d850d145a31967f512d9402048fc1b1891606ddba7342ea9613c27ace3986f6b508ed83f0c5eccb26a13fd49f85 SHA512 92470f2930b1c940ccf3478b11157adcc4b84924b0cab4e1fd8aae98c7bba14e995491ce44810223eeb3802967be68c867d0ee4ac0df9f49b4234efd1a7ecfa7
diff --git a/dev-python/django/django-3.2.6.ebuild b/dev-python/django/django-3.2.6.ebuild
new file mode 100644
index 000000000000..49eee54f6d66
--- /dev/null
+++ b/dev-python/django/django-3.2.6.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE='sqlite?,threads(+)'
+
+inherit bash-completion-r1 distutils-r1 optfeature verify-sig
+
+MY_P=${P^}
+DESCRIPTION="High-level Python web framework"
+HOMEPAGE="https://www.djangoproject.com/ https://pypi.org/project/Django/"
+SRC_URI="
+	https://media.djangoproject.com/releases/$(ver_cut 1-2)/${MY_P}.tar.gz
+	verify-sig? ( https://media.djangoproject.com/pgp/${MY_P}.checksum.txt )"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+# admin fonts: Roboto (media-fonts/roboto)
+LICENSE+=" Apache-2.0"
+# admin icons, jquery, xregexp.js
+LICENSE+=" MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+IUSE="doc sqlite test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/asgiref-3.3.4[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	>=dev-python/sqlparse-0.2.2[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		$(python_gen_impl_dep sqlite)
+		${RDEPEND}
+		dev-python/docutils[${PYTHON_USEDEP}]
+		dev-python/jinja[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pillow[webp,${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/selenium[${PYTHON_USEDEP}]
+		dev-python/tblib[${PYTHON_USEDEP}]
+		sys-devel/gettext
+		!!<dev-python/ipython-7.21.0-r1
+		!!=dev-python/ipython-7.22.0-r0
+	)
+	verify-sig? ( >=app-crypt/openpgp-keys-django-20201201 )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.1-bashcomp.patch
+	# https://github.com/django/django/pull/14732
+	"${FILESDIR}"/${P}-argparse-py310.patch
+)
+
+distutils_enable_sphinx docs --no-autodoc
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/django.asc
+
+src_unpack() {
+	if use verify-sig; then
+		cd "${DISTDIR}" || die
+		verify-sig_verify_signed_checksums \
+			"${MY_P}.checksum.txt" sha256 "${MY_P}.tar.gz"
+		cd "${WORKDIR}" || die
+	fi
+
+	default
+}
+
+python_prepare_all() {
+	# Fails because of warnings
+	sed -i 's/test_dumpdata_proxy_with_concrete/_&/' tests/fixtures/tests.py
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# Tests have non-standard assumptions about PYTHONPATH,
+	# and don't work with ${BUILD_DIR}/lib.
+	PYTHONPATH=. "${EPYTHON}" tests/runtests.py --settings=test_sqlite -v2 ||
+		die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	newbashcomp extras/django_bash_completion ${PN}-admin
+	bashcomp_alias ${PN}-admin django-admin.py
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature_header "Additional Backend support can be enabled via:"
+	optfeature "MySQL backend support" dev-python/mysqlclient
+	optfeature "PostgreSQL backend support" dev-python/psycopg:2
+	optfeature_header
+	optfeature "GEO Django" "sci-libs/gdal[geos]"
+	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
+	optfeature "ImageField Support" dev-python/pillow
+	optfeature "Password encryption" dev-python/bcrypt
+	optfeature "High-level abstractions for Django forms" dev-python/django-formtools
+}
diff --git a/dev-python/django/files/django-3.2.6-argparse-py310.patch b/dev-python/django/files/django-3.2.6-argparse-py310.patch
new file mode 100644
index 000000000000..3702a4c58c72
--- /dev/null
+++ b/dev-python/django/files/django-3.2.6-argparse-py310.patch
@@ -0,0 +1,52 @@
+From dc7d30c03ff72917584952e70b3b25c9a0c59033 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Tue, 3 Aug 2021 10:04:22 +0200
+Subject: [PATCH] Refs #32074 -- Update expected argparse error in invalid
+ choice test
+
+Python 3.10.0rc1 changed the error messages issued by argparse on
+invalid choice to include the argument name.  Update the expected test
+output to account for that.
+---
+ django/utils/version.py      | 1 +
+ tests/user_commands/tests.py | 5 +++--
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/django/utils/version.py b/django/utils/version.py
+index 4b26586b36..54b10e89d7 100644
+--- a/django/utils/version.py
++++ b/django/utils/version.py
+@@ -13,6 +13,7 @@ PY36 = sys.version_info >= (3, 6)
+ PY37 = sys.version_info >= (3, 7)
+ PY38 = sys.version_info >= (3, 8)
+ PY39 = sys.version_info >= (3, 9)
++PY310 = sys.version_info >= (3, 10)
+ 
+ 
+ def get_version(version=None):
+diff --git a/tests/user_commands/tests.py b/tests/user_commands/tests.py
+index 9262e2717a..9da0977c38 100644
+--- a/tests/user_commands/tests.py
++++ b/tests/user_commands/tests.py
+@@ -17,7 +17,7 @@ from django.test import SimpleTestCase, override_settings
+ from django.test.utils import captured_stderr, extend_sys_path, ignore_warnings
+ from django.utils import translation
+ from django.utils.deprecation import RemovedInDjango41Warning
+-from django.utils.version import PY37
++from django.utils.version import PY37, PY310
+ 
+ from .management.commands import dance
+ 
+@@ -334,7 +334,8 @@ class CommandTests(SimpleTestCase):
+         self.assertIn('bar', out.getvalue())
+ 
+     def test_subparser_invalid_option(self):
+-        msg = "Error: invalid choice: 'test' (choose from 'foo')"
++        msg = "Error: %sinvalid choice: 'test' (choose from 'foo')" % (
++            'argument {foo}: ' if PY310 else '')
+         with self.assertRaisesMessage(CommandError, msg):
+             management.call_command('subparser', 'test', 12)
+         if PY37:
+-- 
+2.32.0
+
diff --git a/dev-python/dulwich/Manifest b/dev-python/dulwich/Manifest
index 02da9ac56060..3c7cef79afc8 100644
--- a/dev-python/dulwich/Manifest
+++ b/dev-python/dulwich/Manifest
@@ -1,5 +1,5 @@
 DIST dulwich-0.20.21.tar.gz 399232 BLAKE2B d2768a4cc83ab2dad3b569c7c97c93ffea0293eb10ce269a7edfc7d5a6dc15d31d7637332d6968d40e67dcd2d76d6f9366f6d2e30527a666bc76fab32c5bab91 SHA512 1dc3042ef7ed0320b8e998d78c98e5d181981f665a708547b715ed5a16869f5c0c76b6228bf1e58cb957923ea9643ae2ae7cfca970056bc5230db18c5a110985
 DIST dulwich-0.20.23.tar.gz 414150 BLAKE2B 0f7bfb237acc6bad874465a5bfed21adc29a2ef23875fbcbb92e7e3ff0ed6a4191a30b3975f90ef20b8320575e42abf31f8ec2199d558382c917d0510c2a8d96 SHA512 8bad3528dc87e70b39b59b2f7218579327db4dbd15937b63db76c9b8e7ba6d22e963eaec45b8d675c92f250516a541c395fdac391db68d0932dc5d8cd7ed9fb9
 EBUILD dulwich-0.20.21.ebuild 1623 BLAKE2B f8973b73c094fe2ef5efb9ccb71f44e2da24c137a9b9bd28b5292217c78e1139ff8725417c422df4feadecbbf74ce0e0edc7b63f43e6761e2b9a203fffae986a SHA512 c43266e408a6a8b236036347694062a60c4c806736a4ec540957d509f5534d2c4e56212f23b8b67b48700b267718181977f01e1c389f33f8c90df98445bfae8c
-EBUILD dulwich-0.20.23.ebuild 1589 BLAKE2B 5e36e2b66e89ff3944862432a6bd08d07f630eeb790cd282bc758d3d3071998d4c81d84890e90d8fb609c8b76aa6fe14e944ed58258765b0590e415fce8017e1 SHA512 eed9337dbddef429caa19c0fa6acf02983adbca2d42371cbf961d8fc294b07e50d99942839c0473feb2bca10052b1af058fbc8b8d235dc1b609c13f26632107b
+EBUILD dulwich-0.20.23.ebuild 1590 BLAKE2B 4a48258dd6bdbe22dd305e294dd78c3f8395fa274219a29d2c2b1c5b069a0dcab775e401e8a83a39c78e5e88cf1384ce9672174fcc870a34768f14c6a7fb536a SHA512 1612af29d05dd0d970d0069c89891375711751ac69e6a79f4b12db25a76bdbe3539a3f268ae6557b0bdbd340ade893bd311a9dc644b4cb0ad1c39f4d85d5c268
 MISC metadata.xml 557 BLAKE2B 17a7d57f6d3a8d0a01808be1f9d5381ea21cec37bbaf193f6f5b28b3f8381fbdf5a00b06cefd89a777ca11f11556ed33b13e295aa5687d4eac76df537dc6fa41 SHA512 6325997c6f1fca6d8bd2fb3987ca8a53ee068847e4d184b36928a7265ff0aca1918dfbea34a8cd93f6d3b68aace8e28133d261766524f7da3639a307ace0e160
diff --git a/dev-python/dulwich/dulwich-0.20.23.ebuild b/dev-python/dulwich/dulwich-0.20.23.ebuild
index 0e8096b83c54..2ce5d808ec46 100644
--- a/dev-python/dulwich/dulwich-0.20.23.ebuild
+++ b/dev-python/dulwich/dulwich-0.20.23.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="Pure-Python implementation of the Git file formats and protocols"
diff --git a/dev-python/emoji/Manifest b/dev-python/emoji/Manifest
index bc473dc988e7..efefa049d82a 100644
--- a/dev-python/emoji/Manifest
+++ b/dev-python/emoji/Manifest
@@ -1,7 +1,3 @@
-DIST emoji-0.5.4.tar.gz 43402 BLAKE2B a7d94af22d09159e23b160300f70372c08c095fae3be45e204e5be73a907cd4ffcbad00aeed4c85ec0048ae1a5fdedce52105bcfc1557217d3b53002e1770267 SHA512 20e592247f8bc9bc0a030181904d806b50768b444b728d074afa58896e258ca664b4983de5c51b7624b585edcd93e05a34b8df722f4d0eefb625ce11fbb63d0d
-DIST emoji-1.2.1.tar.gz 158090 BLAKE2B c16ff949611f9453c3c073d466ddde75f31029fb4ec2160ba003dc94d1857c3d6f1de060220869f76fd94ab11539e7ea4bcff81211b7354c1f0e6bedc131e178 SHA512 b654494aab90c3ca4ec17331ba6504e2f16b46226170e170971f5f86553e025027e23d2e02020c899d5251e50bd8b78d4db3ea1a017b4eb371562595e4a9a5a7
 DIST emoji-1.4.2.tar.gz 222120 BLAKE2B 8771c7289a41fc741c54b3096df4ba6099dfdc3bcdc72282c93c565376e8fdb2e5939949a206cb01bfb1f2d663f840cd958e4d762f9da45639c49e52f3410947 SHA512 abf7fcaa922963c990330ebb6fd26c1613ffbdcbd6cabdf44e977b54df4b9c80c30e70e0ed0a9d9311c2fb95423df052e4e9c22d95510eab10eb3754084622ed
-EBUILD emoji-0.5.4.ebuild 373 BLAKE2B 3e20b341efe60379e92339acdd0eabf663b4fa2fe47112a05f53819e97ee81f124f58e44edc31504514667f66b6a4c61a8179d4b9fa168a1cb9dedde22c9feed SHA512 17287f2e2a65e0967a9dbe636c7edda177b8719d462a8fb632f238e9b5e845092b491e198dbda18c11ea2d6aee09419835afc7b8ebcfc1c4ca93cee439bfb167
-EBUILD emoji-1.2.1.ebuild 454 BLAKE2B e5a63d5a5ad79aa68574560dece498bd3d2d2aab19e00d4e46d691c6550eb478d0bdad7c78d72b967aa1de96573b626a8d5bdaa94690d8f0d8323c64123b3356 SHA512 6bd279ae8a9581894a72e4781dc4d8843d5a41dd9899e21dc0fa1d7576f90395913bb026ef18387727ce0fec61a8a1b007777f774bdbe03a877f538e29497c6a
 EBUILD emoji-1.4.2.ebuild 454 BLAKE2B 8783d79b1d000539bd907857843064e1704919ae9b8bbfb3a4d0de5a0bf738170bd86a3c637def670ed22485c6e313dbf2ba0b8176859fbd07da550743198e18 SHA512 f770e6c666137c5fb52040f329d9156670e442c1760c4f49fccf454703361bf1cc9a3f98f73e0d39d0c2a67eb5d6721610d19ae756616a665b7a25e81f3d0083
 MISC metadata.xml 395 BLAKE2B 993d498b8834fcb8d9bc9532a7b4083fefece581175a026ba8a291d4aa95d540ea96fd40e069d11ea1ec35affc9cbe028892d1a2727eb25c1b201c754e6d5276 SHA512 5225011a919d564e2e9f5d3202fc67abaec62c7bc01e8367f6b1595f14eab2f39849e41d407efbf0a31ab8470df46fa71d56816c7a2fee207750fde09c89a70a
diff --git a/dev-python/emoji/emoji-0.5.4.ebuild b/dev-python/emoji/emoji-0.5.4.ebuild
deleted file mode 100644
index 75912bf0e121..000000000000
--- a/dev-python/emoji/emoji-0.5.4.ebuild
+++ /dev/null
@@ -1,18 +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="Emoji for Python"
-HOMEPAGE="https://github.com/carpedm20/emoji/"
-LICENSE="BSD"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64"
-
-BDEPEND=""
-RDEPEND=""
diff --git a/dev-python/emoji/emoji-1.2.1.ebuild b/dev-python/emoji/emoji-1.2.1.ebuild
deleted file mode 100644
index e0c85fabc80d..000000000000
--- a/dev-python/emoji/emoji-1.2.1.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} )
-inherit distutils-r1
-
-DESCRIPTION="Emoji for Python"
-HOMEPAGE="https://github.com/carpedm20/emoji/"
-SRC_URI="https://github.com/carpedm20/emoji/archive/refs/tags/v.${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-v.${PV}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64"
-
-distutils_enable_tests pytest
diff --git a/dev-python/exam/Manifest b/dev-python/exam/Manifest
index 83e6a1dccfc9..498aec7e7157 100644
--- a/dev-python/exam/Manifest
+++ b/dev-python/exam/Manifest
@@ -1,3 +1,3 @@
 DIST exam-0.10.6.tar.gz 15028 BLAKE2B 6d2a888b9adf14665e8f009bae7b2c724dcb60fe19efa98a189988a73a0cb5933179407c754ed1c19b24694080b6df31838768f694460fabd9196e58e8b4c94d SHA512 1cc082b4fb9a7270ea81750ee3f34400f3f6eac65dd1488af333a43d0623bf8f9176b73e2948c324bb9c0062296284bae66fe215263456baf9db378676c8a4f0
-EBUILD exam-0.10.6.ebuild 424 BLAKE2B 0ca86628fa3b18b9c9f732320a0261f9efbd94f93aa4b9b875afbe6cf059399c7ddd448f0934e6c0740d40304253b413b5f5ed51e9e64049ed0680e2b66679ae SHA512 641528dc07269731abfd96604c798d07835504b3ac3d7b81c4e6e9d758fc3c2539a7bce8668e08b2730e8f26a040b03be209d7c11ec513f157ce5c16b8f3ab52
+EBUILD exam-0.10.6.ebuild 427 BLAKE2B 2f3f18667f8393bc8efb53167c9b3ddcbb979bf12bbf71a6de1115e8a7e6e0cf7dd3ddd03f595d3caf19b6d4cb643a6c2b3d7bf5d8f1b7b303daa9c28f962af1 SHA512 e74117f4ebafe4231de4c162dded289cd225d2679f2fbea8ae1a77e96227ca7adea846d1ad15e20fb8fcf5f25e0c1c0736e76a8ed6ad358ffe2ec8956a4822d1
 MISC metadata.xml 1730 BLAKE2B 8b10814eed310f63863f8511e65c5a7534b13f39ca865ba07646b7703b20fd1f84fca088fdb8af13ca2faea5d685132c57c90bf5d2d91517b4a960c3ee098b27 SHA512 0578cf9ac285831447e88a93fdf2717d54392c098a1bfea7726100e6b0b0653b63171c0045afc4068b3b56e71bb798b0c78a71ea8b150adcc05ceb4f38919c78
diff --git a/dev-python/exam/exam-0.10.6.ebuild b/dev-python/exam/exam-0.10.6.ebuild
index ca62934620c0..8fe56f7886f9 100644
--- a/dev-python/exam/exam-0.10.6.ebuild
+++ b/dev-python/exam/exam-0.10.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"
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
@@ -19,4 +19,4 @@ RDEPEND="
 	dev-python/mock[${PYTHON_USEDEP}]
 "
 
-distutils_enable_tests nose
+distutils_enable_tests unittest
diff --git a/dev-python/eyeD3/Manifest b/dev-python/eyeD3/Manifest
index 7886521b7908..a0a812625073 100644
--- a/dev-python/eyeD3/Manifest
+++ b/dev-python/eyeD3/Manifest
@@ -1,4 +1,4 @@
 DIST eyeD3-0.9.6.tar.gz 250445 BLAKE2B 11f8bef4b17af07f08144e922634e4c6e467bd8856da9d445a70006b5bf32d442a52e234845a3f146129403fcc16047cc759102b93c433a0466bf0afd9576230 SHA512 0c993e9bf0a27ca41a8a2964a3347a6b0ffa472f833b3dada39ae09a5a2b40e0afb6bfd8c0ea5ed71d3dc2bf3cd062c1fb5fe79abe6ad867221b779786247173
 DIST eyeD3-test-data.tgz 97281754 BLAKE2B 9b667a5f8be157ace06d773d575c08f4a8e8b7a7b81ba9cb39b1e2c924b2e3f98597607ed3076b13150e02ef7768e89d1ff8a9913021e5f4b9ac6b59344ed397 SHA512 937971dcefc53812c59adb97df27d200e92de04e12391c735ab85cd547e2a168aa1212d88c206ec71ac2fa85a504a9faa91dcc444b45149aca7c8f3a794e9a95
-EBUILD eyeD3-0.9.6.ebuild 1230 BLAKE2B ff2c7191b18d8340f4a24ec5605c588a35c8139dd67ed4441c1a284e131196f5ed81eccb80e38b9b3567b30357d13ad129cad69aea35493676a2791467340cfd SHA512 87d7f38e4a88eddd70c0de8ff6d19607ae0081f1a927b691618f7768e4a30432abfbbed384a23c6c37aefd9b26c4826753855a3192181ddba3c48e6709e7ff60
+EBUILD eyeD3-0.9.6.ebuild 1198 BLAKE2B 268eefd6dcd32e29673dc83266d549efcd652fffbee49f5b9122812d7bd4acc93db18b88601ba11099fccd9539a1334eef5c0a94497ff7f3a9476d72cfbb4818 SHA512 8e67c12f589864602a7b10b2fef58f3205ef8b9ea38219660c92a7bda300be020b22abe14adf926735538c48819b9e715e0a14b6bae334c3d9be89b330e21343
 MISC metadata.xml 498 BLAKE2B 3d978f42129bedd19518980a3b7bc238b256590bc488e6b2d8afdd17ce9a93124861473f0fe7d80fd69cde6a9b53b1789f0dddc7e3de3e606a63751023d385fb SHA512 a4addfbe9bfb257176ba9ea264ac822f299d3ce643fcffc8f8fbedcfb033015ac7fb1832f1a053f1b188d9198d4505a174cf2747829358d612219e9f53d3e718
diff --git a/dev-python/eyeD3/eyeD3-0.9.6.ebuild b/dev-python/eyeD3/eyeD3-0.9.6.ebuild
index cb6fada8d168..34ee27ed6b40 100644
--- a/dev-python/eyeD3/eyeD3-0.9.6.ebuild
+++ b/dev-python/eyeD3/eyeD3-0.9.6.ebuild
@@ -3,8 +3,7 @@
 
 EAPI=7
 
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/fido2/Manifest b/dev-python/fido2/Manifest
index 76e5986385d0..1a3323227d7e 100644
--- a/dev-python/fido2/Manifest
+++ b/dev-python/fido2/Manifest
@@ -1,5 +1,5 @@
 DIST fido2-0.8.1.tar.gz 201198 BLAKE2B 33411dd05d7f513445afa8a6fc4bb90f3989a655fa05d2ba9da411aa7eea3b30ffa253fae6586f76c416115e5bec90f6f120472a49a0acfbd91020d2cba8f74d SHA512 fc0753ea694f2170d529129764cd9f9c5439cd2f467e4f384d7a698266ee8391a5c9c7c6e51d2dc2a99b93fca1c7d5288d5236e302672a87b8ca7704f328c0b5
 DIST fido2-0.9.1.tar.gz 206395 BLAKE2B 9a9b5d0dd808de896c91aa605540a1968aab7ae543336521d4a206f27bcf836c57e88aa6cdd0bacf71db8d16a0f94c2f9c16b16ca415363fd0b5e145a448ec18 SHA512 cde8c247fe0875129a890866ab76d40b2bd6feee86ff1ccb4b9ec5e6dc037e569fc8d969b51a456b5e66c6f7c67e18d14c3917375d5de85bbe7da5af3254f797
 EBUILD fido2-0.8.1.ebuild 1065 BLAKE2B 03714bfe2468a2914760d886b9e9913c6e671510280cbe5e29d6124e6cf08e2894cd91bdb8129ebd28b2f26da62f7f969bdde2a3bf50cf4995a07d06c5ea0791 SHA512 877bcb037b68c29aec4f2ca8312643f3783d2cea4f5eb09adb277a8f9504b7c16f0146ab6fb3a95cc88de7a0b0721228773d3edbbdbe55054de57983a8c3c484
-EBUILD fido2-0.9.1.ebuild 1324 BLAKE2B 8f0115b973f26448680a2a06f1e6623c616684b2f8c1a9e7d83bca8ed7aaf6cca446f22b984c3d09b3bc834900c21336c7b652dbbcabc249626a5ed0e17e45f6 SHA512 9c888534bfee0118cb7f5e98d4e6f94fca85c9bda0d1ddaee7fe59b3d60df307c77786320347309be67356887f18259900d4be61e2b0985dc2ef8b5a652b2647
+EBUILD fido2-0.9.1.ebuild 1331 BLAKE2B d65af450cbb2ccfb13c111c66d76ab42346205223ae47ffdb537617de2b611ea7cf8da0ad4243fc4851b883b555d28c1b34e4f08272f4248ce51cf6d1ed4b1ca SHA512 ad03b13e06e84b730ac5fc0e0c463f7faa7e241fc01185aad50b3f81dc3c8e034386aad20ca062ea90a51f6060ae29a87150cc3b9064163453b11bafd6711e5b
 MISC metadata.xml 825 BLAKE2B c5e9aa7ff7fe2d8c1ad6c7d62fc99252765ef71258fbc6fb3a173b2e586eefb4da24d400c261e5888c3a51eaf5c7ce6fccfb3f01444d4c27778ec5dc098e3457 SHA512 89922697e33c94ad57635fdc4ebf316ed8d1f1eba307ce06f116aefab570613958e84b863e2f806d522fcce0a7c0010bf366c4eaa5777f8bf2d3087966f54622
diff --git a/dev-python/fido2/fido2-0.9.1.ebuild b/dev-python/fido2/fido2-0.9.1.ebuild
index 4d049efb592b..86f0257593d5 100644
--- a/dev-python/fido2/fido2-0.9.1.ebuild
+++ b/dev-python/fido2/fido2-0.9.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/Yubico/python-fido2/releases/download/${PV}/${P}.tar
 
 LICENSE="Apache-2.0 BSD-2 MIT MPL-2.0"
 SLOT="0/0.9" # Bumped every time a backwards-incompatible version is released
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~riscv x86"
 IUSE="examples"
 RESTRICT="test" # Tests require <dev-python/mock-4
 
diff --git a/dev-python/flask-sqlalchemy/Manifest b/dev-python/flask-sqlalchemy/Manifest
index 53b5dc86f399..0ed3b414c9dc 100644
--- a/dev-python/flask-sqlalchemy/Manifest
+++ b/dev-python/flask-sqlalchemy/Manifest
@@ -1,3 +1,3 @@
 DIST Flask-SQLAlchemy-2.5.1.tar.gz 132750 BLAKE2B 6378766e9ae5e697f9a0fe23471f0264e5ac1f4c824657e5197f6c35f9f12eb756528641c1078b1bf470170c557c3201314a80b922b4ab84e4664a0ccaad2a6c SHA512 5d483418204030837e62769d45c16af88c5be6dbafc7c340cc4e67ef1736ea5102f506156119864cd7673cf382b0d3f27050bda64273b93ef4805fce9e1a0f6f
-EBUILD flask-sqlalchemy-2.5.1.ebuild 700 BLAKE2B c39c34211aff8bfc0747a9607cd39f8f4a5411186f5ba5bac91241f041efd6eed66a8b1ef13e3490077c2ae2d96124dff6336fa274d22a9d93739b9472042c6b SHA512 fa023610784c5c381ec973b08c622f3a86ef5399560dbb0f75fa6c27852ae89bcd088715b6fe8fe406875bc9cc88ed64925e5b2d64320e048d1f4cbacbeb9a5c
+EBUILD flask-sqlalchemy-2.5.1.ebuild 700 BLAKE2B 6954278eeb769da8709b4cfe75cc27ff62ee7f855d43346b1cdbfe22fe4663ca03ce377ac72eb6805b5a9600e07b55f16f1757e0d60ce49f438ed8896c10d133 SHA512 c6d54c6043c7f772000cc1f9a0d36f1ddf08d3cba9cdac084b39ba2def6abdca13426ce8f7af7e77c063fc4c0d78be83917cebe420e0783a379ae9abda63f5c1
 MISC metadata.xml 719 BLAKE2B 6d692d63c6b7e9263bd38aa0eb6c9b144c647d6ebc10a367924c9126aa2d305deeb38608627ca160889a575507479065be3bb0c8eb2c16c615dd4b06c000cabf SHA512 22229e104fc82e053e4f98377b5586dd6c9d5d817411c22d3c1eb7de28707823f22608b489c8f3db7ab673b4ffd78462ab9ee312d47398b8b5ea90e20faf5363
diff --git a/dev-python/flask-sqlalchemy/flask-sqlalchemy-2.5.1.ebuild b/dev-python/flask-sqlalchemy/flask-sqlalchemy-2.5.1.ebuild
index cf700a286175..913b8ec45c3f 100644
--- a/dev-python/flask-sqlalchemy/flask-sqlalchemy-2.5.1.ebuild
+++ b/dev-python/flask-sqlalchemy/flask-sqlalchemy-2.5.1.ebuild
@@ -1,10 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{7..9} )
+EAPI=8
 
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
 inherit distutils-r1
 
 MY_PN="Flask-SQLAlchemy"
diff --git a/dev-python/flask/Manifest b/dev-python/flask/Manifest
index 07c3ecf86a7a..f3cfdd57cc28 100644
--- a/dev-python/flask/Manifest
+++ b/dev-python/flask/Manifest
@@ -1,7 +1,7 @@
 DIST Flask-1.1.4.tar.gz 635920 BLAKE2B c1f19e7449177ecf6e901d5932ad25cbe866ff53b9323f717541922b1ea5b10203ff07630fcf3eabaedd9b6a24ef031ad2aaa2e2f759925363bebfa7e5d967da SHA512 6f427a1264921b8560446afacee2757d16de0dc22d6ed249b7bc5d6f50f3af50c89b79ce900d75b41af4befc53910f2b532c2e280de42837e2133acb6b1bd80d
 DIST Flask-2.0.1.tar.gz 626851 BLAKE2B 05273edacd6d66237a552410df7ef7ff367e28c273cc89f654eac5ed2eb3d26f71437169905372b398cc6c5c5067dcbea54aa1cab782e03c6186ac9ae3949f4c SHA512 fefed4971f0542b25ba2867919aa54a83b6e3f47e7cee94586543843e7e00ba209ac15d8fe28a3c53981f587aebcf2f3915a49e1a9cd1b729099dccbed3783c2
 EBUILD flask-1.1.4.ebuild 1330 BLAKE2B ae78a5a449bad145e9ae537f968bab105ce9f4c69a22ed881ea1dbc8cc7cba708da8724731c8009ee23a8c606fbeb32fed970a5237427d51aab13a91baf7bb28 SHA512 1885d47a974863080b2a3c5372fad49765958e2b17e7a70a01afddc7ed87866d9205259da4b2e3891d88594144ed13663a396844aa92e7f430489e2acbc68a42
-EBUILD flask-2.0.1-r1.ebuild 1222 BLAKE2B 5dc98bfddd15251889ca41761d37079dd7a12da64aecdc88749e7e88bee09353b1596eef94ca16baaf76b1a07fb64e7a33522e550a9fa54f359b656d7ab12b02 SHA512 4936b7ef10305903e827faed39c2e35d379d002a5d0ee103f80f09ffa1af9321537b16b6efaa9b51736d665130d51ca9a1a95bac150dc0c86b637c4e6a67b04d
+EBUILD flask-2.0.1-r1.ebuild 1229 BLAKE2B 67a9ac3d79a87f0aa6d6202cca335e7207ddfc0d5d284d92eacfc3329726acf9f004c1d23079f0b270ed95c72ab35da456a191d230e39dd0c0489ed153559711 SHA512 62c9a73ac355dcdfbd2b91c0f5c18a793ca94dfcb38a13b55b9e6e6903352af48cc38fb143e0fc5e5c5b822d75d7ebf998b288e3b2cb3202514720d2f6279c02
 EBUILD flask-2.0.1.ebuild 1161 BLAKE2B 652196afb4a78a8ca1bebc957588150522e6360ce1d524137b449bd4b2123a811ce3e7b08c161f8d20c397d1d85c174d63437f5df0dd2a7f2327539229ef7446 SHA512 03e7fdc43bb1582d20c8620e9f86ebf07a9ce52d63a134751190b68dc17027371a22a17c9dc23bdd97b86871bf1e4843a0684b6e5125d1c505012083127234c8
 EBUILD flask-9999.ebuild 1217 BLAKE2B 57aa06a3fa33b0e8e5fd3e3054e7fba2e263524d2613207582e854643afd6b7c1ab3f41d73318012a9d77982a778cf90c6cdd13d0232447ef94fd2603f5f32e8 SHA512 3c050a9e65cc40a6556d5bace0ec403d043e8c5591814d47fa3c4284f4886d0eeb1c6f29ae0b9e25a001f2ab38f28fc20f34e3de67d2f74c9197b0b94d4a3f05
 MISC metadata.xml 385 BLAKE2B 0aa1fc56ae29e91457344d7ca4f8a26506d46d22b71ac7363fb443ba7fbcad7974f86b898dd7b2e4cc2bbbc5d58fe1a1904a077e5c7b959ba2e1761f1561769f SHA512 223a1a9459b462c6dfbfc2fa0d6932e1f9457e86eb9a70e96c5182a3b4f898a121aa13dc9425811b8fcabc6dca8ba1d715e5aa221453e235a5b5ee2c25cc02fc
diff --git a/dev-python/flask/flask-2.0.1-r1.ebuild b/dev-python/flask/flask-2.0.1-r1.ebuild
index ad0a2c7da03d..555b29c6025c 100644
--- a/dev-python/flask/flask-2.0.1-r1.ebuild
+++ b/dev-python/flask/flask-2.0.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="A microframework based on Werkzeug, Jinja2 and good intentions"
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86"
+	KEYWORDS="~amd64 ~arm ~riscv ~x86"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/dev-python/fleep/Manifest b/dev-python/fleep/Manifest
index 235b131ab6a7..a898770507fb 100644
--- a/dev-python/fleep/Manifest
+++ b/dev-python/fleep/Manifest
@@ -1,4 +1,4 @@
-DIST fleep-1.0.1.tar.gz 6547 BLAKE2B 75ede77464e32404b3e1229adc9484d1d44b33323ed18f4be5275ffd1c8f63863459f46ff9cbf4f90d0e1387c0e5c967cce13ac8f6ce65710709dd227c04df89 SHA512 ba56f3a6c99f4c793e9f5c4ec04f7a96effabeadd92b18aeb7689a75d8504ccfca086db635d33e358ea9f67887e904c141e259ce2e9b9f3ea77f9e24c1b0eb27
-EBUILD fleep-1.0.1.ebuild 502 BLAKE2B 15f704e4051596dcc441201f887f8365398e8cdd6743f2cedac4e8033b8508ab93cab0b9db3c89f044a581f76bf876ad289fd334c598128c87ef2b6a09ddd12a SHA512 b27cdf484c729e24654e5956f4fd30bbc09a94a28da86988ae1e5f65dac69d85a0d0be46ddec74cea05b9a9d67de79c85e78185d4237a025417e0baa259e39ec
-EBUILD fleep-9999.ebuild 502 BLAKE2B 15f704e4051596dcc441201f887f8365398e8cdd6743f2cedac4e8033b8508ab93cab0b9db3c89f044a581f76bf876ad289fd334c598128c87ef2b6a09ddd12a SHA512 b27cdf484c729e24654e5956f4fd30bbc09a94a28da86988ae1e5f65dac69d85a0d0be46ddec74cea05b9a9d67de79c85e78185d4237a025417e0baa259e39ec
-MISC metadata.xml 394 BLAKE2B b7e3b83459800ddcbd5853411afa08493933b4acf4f9795935fb34e42285d60b75caef1eb6860c15306f9a24421f516da6578518de94d0e4e7c7f3fc0529fc87 SHA512 98e150c1ce256678540131c057c1ce822cbed783a81ac09b7c0230a25f3cb214d2a7f44dd1497d2cef312f000e5114d5171105792807cb789a49d72386c40841
+DIST fleep-1.0.1.gh.tar.gz 197438 BLAKE2B cf099a941d63443a9ee314727966ae95e143acc2f33f7760fe34772d4a2d371af534c029ad207b7727d34e7472c9396b3fc1e9c82066d98ae248dd4f7bd430d7 SHA512 ea287b9cec0f88f378b6c2f248938417e7e51b004a03bb4421611f9cbdae7b97cf1c02b5096c491df934922d906812daadab02d46ae49e64dc2a2a880ab4d87e
+EBUILD fleep-1.0.1-r1.ebuild 863 BLAKE2B 9fe0f5c4a539c0f579d9e4f9bf5b38c449410c22a4c529efc63781463fc3023c31e4e594454fc03de2eba795e23d076c86800fb096a2562e96080b7f24f267cd SHA512 6e0aff23476bfa2fbee81b0c5143d8870fe5aa3cde02139b176caa8a25b88a636924819820d86324145ed2985d021b51b93bdbee3b604cdf0ee0506699c47e57
+EBUILD fleep-9999.ebuild 780 BLAKE2B 43fe8b1004891760053221129190333bdc524c89f21248cbf16b2352103ce82a32bf1d7123fcdfbf0427797ac477944c7fba957771aab151975e7b87ed31e7be SHA512 02e6655ef370e0d76672a46168d34cc04dfd70c7b0dd4743b8009698137bedeb86f0069489590a82bb32d686aca940b7046126592fc3ba1c7fc34416627cf215
+MISC metadata.xml 477 BLAKE2B 04c9a6a91ba95aafd79daeb25d1cf2931576b2cf7a2ead6db1f8607ce54b106cb088f6c2d3974bda6ddc4a3986eb2efb85f90d60c3f32bfa41a1aaed817ecae8 SHA512 72185704ef938ac7d469e8c4766f5b32dd8ecb694601acdd81f853439aee98732f6932359bc1ee69ed4c1cbf16359aa7b7c608309fd2e9685ebddd08bd218e81
diff --git a/dev-python/fleep/fleep-1.0.1-r1.ebuild b/dev-python/fleep/fleep-1.0.1-r1.ebuild
new file mode 100644
index 000000000000..cce82c31af2c
--- /dev/null
+++ b/dev-python/fleep/fleep-1.0.1-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/floyernick/fleep-py.git"
+	inherit git-r3
+else
+	# upstream aren't tagging the releases, just as commit title
+	COMMIT="994bc2c274482d80ab13d89d8f7343eb316d3e44"
+	# Note: On next bump, remove gh suffix from SRC_URI - was added just for tests
+	SRC_URI="https://github.com/floyernick/fleep-py/archive/${COMMIT}.tar.gz
+		-> ${P}.gh.tar.gz"
+	S="${WORKDIR}/fleep-py-${COMMIT}"
+
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="File format determination library for Python"
+HOMEPAGE="https://github.com/floyernick/fleep-py"
+
+LICENSE="MIT"
+SLOT="0"
+
+python_test() {
+	cd tests || die
+	"${EPYTHON}" maintest.py || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/fleep/fleep-1.0.1.ebuild b/dev-python/fleep/fleep-1.0.1.ebuild
deleted file mode 100644
index 0171f1ef7528..000000000000
--- a/dev-python/fleep/fleep-1.0.1.ebuild
+++ /dev/null
@@ -1,23 +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} )
-
-inherit distutils-r1
-
-DESCRIPTION="File format determination library for Python"
-HOMEPAGE="https://github.com/floyernick/fleep-py"
-
-if [ "${PV}" = "9999" ]; then
-	EGIT_REPO_URI="https://github.com/floyernick/fleep-py.git"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
diff --git a/dev-python/fleep/fleep-9999.ebuild b/dev-python/fleep/fleep-9999.ebuild
index 0171f1ef7528..68f31790d687 100644
--- a/dev-python/fleep/fleep-9999.ebuild
+++ b/dev-python/fleep/fleep-9999.ebuild
@@ -1,23 +1,32 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
-DESCRIPTION="File format determination library for Python"
-HOMEPAGE="https://github.com/floyernick/fleep-py"
-
-if [ "${PV}" = "9999" ]; then
+if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/floyernick/fleep-py.git"
 	inherit git-r3
 else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	# upstream aren't tagging the releases, just as commit title
+	COMMIT="994bc2c274482d80ab13d89d8f7343eb316d3e44"
+	SRC_URI="https://github.com/floyernick/fleep-py/archive/${COMMIT}.tar.gz
+		-> ${P}.tar.gz"
+	S="${WORKDIR}/fleep-py-${COMMIT}"
+
 	KEYWORDS="~amd64 ~x86"
 fi
 
+DESCRIPTION="File format determination library for Python"
+HOMEPAGE="https://github.com/floyernick/fleep-py"
+
 LICENSE="MIT"
 SLOT="0"
-IUSE=""
+
+python_test() {
+	cd tests || die
+	"${EPYTHON}" maintest.py || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/fleep/metadata.xml b/dev-python/fleep/metadata.xml
index 9e666fde3716..e0bb47d33be4 100644
--- a/dev-python/fleep/metadata.xml
+++ b/dev-python/fleep/metadata.xml
@@ -8,7 +8,9 @@
 		<email>zerochaos@gentoo.org</email>
 		<name>Rick Farina</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">fleep</remote-id>
+		<remote-id type="github">floyernick/fleep-py</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/fonttools/Manifest b/dev-python/fonttools/Manifest
index 115c04cd14ab..69bb6203e251 100644
--- a/dev-python/fonttools/Manifest
+++ b/dev-python/fonttools/Manifest
@@ -2,8 +2,10 @@ DIST fonttools-4.24.4.tar.gz 2556059 BLAKE2B c415ae5214b6df7171a5f8a7ea179b1a4ad
 DIST fonttools-4.25.0.tar.gz 2576777 BLAKE2B 802236b120ae78e2721d734875fba794fb9eafc125fbfea6b70c68d6a18a8b3c1ce685da18c83ee3364ff38f72707e42ed0ae25bc62d362c6271fff90da56d0c SHA512 c8f7512053ce611fa07bbc1fe844ee9d50cf09e19a2a27bed7df9d37d362b7daa910fbb651147f3690a03ec4d8adc8d96e8f0310eda24bb40208240182dc9b54
 DIST fonttools-4.25.1.tar.gz 2577170 BLAKE2B 8cb03ef1f9cf4e61d5e6d4963bb5c43ec48838e0453cc293de1c763a29b34d69701b87430d8a85085f06c26671e00a91c89e4c50ba8d2fad4a9cc72b1f17d0e9 SHA512 ca3732bcc5e2b373983d34bd72e0ea36488f24aa442d25d0d16f6a473ef35323547f900b1ae87c42e64c451afe4f760291095738a4442c11c5566c9efd0aa944
 DIST fonttools-4.25.2.tar.gz 2577630 BLAKE2B ba03dcc25672008722bb7f5ad4238e9216988f5ed1d545297937e771bf076ae516172cd90bd450ded04ca28fe158c83247bd6b6aaaf4687a5893c0980630210b SHA512 b5c94e76a09aeb92061cf792f53eccc0ab369c5458aeac103f865f6110b2764677ad7c63d1367fb027c891a11d7eb158469748ec495c3a7aa6b86029e7c95223
+DIST fonttools-4.26.1.tar.gz 2579211 BLAKE2B 886a803f6214658423c98bd347db6e2cc0baea5e2619ce18ba2a96589785a1b93228f5b35dd7f6c819b81ca471d6ea1a09d12ad6de04c75388ab6cb5003f5bf5 SHA512 226338cd1c3f71662080c69b0786a6a945b5a75d3a4b7ee6fcf6d7e2e089407d11b4a43950c7aebdaeccad1819e5c6e0b947938fbfbaa3caa9747b7b4a1bd5f6
 EBUILD fonttools-4.24.4-r1.ebuild 1295 BLAKE2B da50602b72774fa7dd8ea45e5a8decc1410637898075d60445a6949b1a38c826f9834dd60e0452d8b1f864a44d0fc620f1166ae32181ae8b01279630aeda390a SHA512 02668aa827368428afe0fe2633b7cdbab70590796a822a1eb15fea29d51428534e2ca53c1b66d574f2e7d10b3cfb1af0e99fa8c3c04e072844232081b29dcb95
 EBUILD fonttools-4.25.0.ebuild 1303 BLAKE2B e27de8a4b573c7aac56b6b6e64ef2e68ddfd3e4bcd8ec7cdf10fed6d18261c2c1916a15d1fc40b85288a3b4513ee4abe687c2be796cd34db09aa68b88f06dedb SHA512 1dc4ae9e85b5dce901a56f82b9579c2995852833ce86d7186c013632f214781d1a44574249fa7d5fd477f0fabca745af33ace8e9b19592998854ed9eb2a89ead
 EBUILD fonttools-4.25.1.ebuild 1303 BLAKE2B e27de8a4b573c7aac56b6b6e64ef2e68ddfd3e4bcd8ec7cdf10fed6d18261c2c1916a15d1fc40b85288a3b4513ee4abe687c2be796cd34db09aa68b88f06dedb SHA512 1dc4ae9e85b5dce901a56f82b9579c2995852833ce86d7186c013632f214781d1a44574249fa7d5fd477f0fabca745af33ace8e9b19592998854ed9eb2a89ead
 EBUILD fonttools-4.25.2.ebuild 1303 BLAKE2B e27de8a4b573c7aac56b6b6e64ef2e68ddfd3e4bcd8ec7cdf10fed6d18261c2c1916a15d1fc40b85288a3b4513ee4abe687c2be796cd34db09aa68b88f06dedb SHA512 1dc4ae9e85b5dce901a56f82b9579c2995852833ce86d7186c013632f214781d1a44574249fa7d5fd477f0fabca745af33ace8e9b19592998854ed9eb2a89ead
+EBUILD fonttools-4.26.1.ebuild 1303 BLAKE2B e27de8a4b573c7aac56b6b6e64ef2e68ddfd3e4bcd8ec7cdf10fed6d18261c2c1916a15d1fc40b85288a3b4513ee4abe687c2be796cd34db09aa68b88f06dedb SHA512 1dc4ae9e85b5dce901a56f82b9579c2995852833ce86d7186c013632f214781d1a44574249fa7d5fd477f0fabca745af33ace8e9b19592998854ed9eb2a89ead
 MISC metadata.xml 371 BLAKE2B 68c245e8fa48ff65af06976274a7352964e39e13147683e266688f953d82d67e0548dacfe675bbd2e6807945c2e367bf08de4d18f75d53f44b28ecdcc8e7f188 SHA512 489bf8cc57a5bd577fa8949ae0ea9ec8be9a77bd6853e549c830f60ba6a152bc7dd25b2f3426974ea6448120113808ff627f9179e5e1e70105003057008aa86c
diff --git a/dev-python/fonttools/fonttools-4.26.1.ebuild b/dev-python/fonttools/fonttools-4.26.1.ebuild
new file mode 100644
index 000000000000..e40813acd252
--- /dev/null
+++ b/dev-python/fonttools/fonttools-4.26.1.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_{8..9} )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Library for manipulating TrueType, OpenType, AFM and Type1 fonts"
+HOMEPAGE="https://github.com/fonttools/fonttools/"
+SRC_URI="https://github.com/fonttools/fonttools/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+
+RDEPEND=">=dev-python/fs-2.4.9[${PYTHON_USEDEP}]"
+BDEPEND="
+	${RDEPEND}
+	test? (
+		app-arch/brotli[python,${PYTHON_USEDEP}]
+		app-arch/zopfli
+	)"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# When dev-python/pytest-shutil is installed, we get weird import errors.
+	# This is due to incomplete nesting in the Tests/ tree:
+	#
+	#   Tests/feaLib/__init__.py
+	#   Tests/ufoLib/__init__.py
+	#   Tests/svgLib/path/__init__.py
+	#   Tests/otlLib/__init__.py
+	#   Tests/varLib/__init__.py
+	#
+	# This tree requires an __init__.py in Tests/svgLib/ too, bug #701148.
+	touch Tests/svgLib/__init__.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# virtualx used when matplotlib is installed causing plot module tests to run
+	virtx epytest Tests fontTools
+}
diff --git a/dev-python/gast/Manifest b/dev-python/gast/Manifest
index 68fa1ee5ba78..4708c3ce6288 100644
--- a/dev-python/gast/Manifest
+++ b/dev-python/gast/Manifest
@@ -1,5 +1,7 @@
 DIST gast-0.5.0.tar.gz 14933 BLAKE2B 5d70d832d69185227e574a4bf88752e1dff43ef0e3e78a1de8ac7ab96218530d37a6dd0a3e6e4bf1fe8e11afe98b8d87722bfc2d6c8b68d8ac4905f335c2b85a SHA512 31c204587b3abcde61ce7343bef8439fab7e36c46de17eb2e02138e3d709f8f70e24c2c5d045044ef06e42119a50566c881d293c1c815743655354e72304701d
 DIST gast-0.5.1.tar.gz 14094 BLAKE2B e58e989198991fac1036363f7d1f7aa831263f0a9e5e616470fb6b7732b2bd39b9ce71cfd97b990bc29c3b9a978c56b90e375ec3d4a9b3c6692f44fd36d9309b SHA512 955154d273e97bdb80528bf17bc060e6266c524218d81469ed99e09d099cfa320af5c8384f8cc51d22be254578221e068d7a2e2bd3f0279cb65d40a4eead7766
+DIST gast-0.5.2.tar.gz 14222 BLAKE2B b251f9aa54d8bdba318f0c8aa7fe97221615a22b7dec8da99b15078ce0f482ac8ec931b9c0acba3a405f2ab3c820a1c578ab93583f9f84740571dd85a3fcb45d SHA512 2a06245ba93f2c0715f662e32e0865732828deb672bc70c3d70a4969c8a2e4c518354a4a63760eddeba53932d4f8bf0ae0ffab64f1a1ad3b20d5b2d18285cd6a
 EBUILD gast-0.5.0.ebuild 494 BLAKE2B a305be1db62fc33ab224764831b5613c72f15f2193bd8975deda5ca72d049d171d1eb1f1077177ff96f4ae532a71d1a4cd1b148b4524aa17c402ee5ce1964113 SHA512 1d85abd88a29dc52c1a13de328ce715e07835921db1db0012bff3c1c08453a3b24d141b8002ac6704d8fd211d5959412f96fbe047ba88d8589355688804e5be4
 EBUILD gast-0.5.1.ebuild 496 BLAKE2B fcca9acd62ce1a452e95747793b48e9fc6e865020bf8a6dfbf43ca1583ee061b7e1700cf1ec9cb2ac965d74348d28fe95330235608cf91451261a8b8d260ec14 SHA512 c8e208f3b930305a07b0cd7a55f38bb3e60a21b7bf47358e3895bed93489305122982091eb1c75d125a619e9c63374b340d1cab15841b3bca0af9bed5838b476
+EBUILD gast-0.5.2.ebuild 496 BLAKE2B fcca9acd62ce1a452e95747793b48e9fc6e865020bf8a6dfbf43ca1583ee061b7e1700cf1ec9cb2ac965d74348d28fe95330235608cf91451261a8b8d260ec14 SHA512 c8e208f3b930305a07b0cd7a55f38bb3e60a21b7bf47358e3895bed93489305122982091eb1c75d125a619e9c63374b340d1cab15841b3bca0af9bed5838b476
 MISC metadata.xml 652 BLAKE2B 487de5ab8f3b93f2a1546f307429cf547162f59ac6f8d35da73b9a116517c53e3c365717746f4f0369a44a4863bb2e423119b775ef3c18e4ba61aa79966c099e SHA512 e9b2688651207c7a7384e099b2ddb7d083fb5419681446ed56a6cbe18ec302a689e71dd7e795f934b0cddab96a0d46b2f1c0aefe90132c22fa2ec4700ef1945a
diff --git a/dev-python/gast/gast-0.5.2.ebuild b/dev-python/gast/gast-0.5.2.ebuild
new file mode 100644
index 000000000000..f25219967d31
--- /dev/null
+++ b/dev-python/gast/gast-0.5.2.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="A generic AST to represent Python2 and Python3's Abstract Syntax Tree (AST)"
+HOMEPAGE="https://pypi.org/project/gast/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	test? ( dev-python/astunparse[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests unittest
diff --git a/dev-python/gevent/Manifest b/dev-python/gevent/Manifest
index deb30a80f52c..facca50871f8 100644
--- a/dev-python/gevent/Manifest
+++ b/dev-python/gevent/Manifest
@@ -1,3 +1,3 @@
 DIST gevent-21.1.2.tar.gz 5943652 BLAKE2B ef85e9941a8e46370437a34728c012f9d8976b5680b22bf9b13ab35d7417019ac0e85fac5cfc8632972e38a2f70028a00ba3fe9f8be11aa2ff64e364052da594 SHA512 1ee2b748a97fa40f67ad2c3b83c6b9f48dbfaae9f2b4f1c118919cfd642c1ca27de0e33a00d950f003f90131354b56a4868ce3051864dbe2ea9b7f22eeafc1eb
-EBUILD gevent-21.1.2.ebuild 2160 BLAKE2B a789bb1d3879cb3f17fad0e55e34a3ec7e16a9415d6b5b545ce40feeab8739250b30b0e489ed26524ccbce1a1ef97202d3ebef14ffb67bad01f86ff06feacb86 SHA512 220d4da55997a4a6944d55fa56f610a281cef3eb559892dc5bc3e66facf0edce7f7c127685f724721891b3c199ee4a217679c450274e314cdef1b81fd2b082f8
-MISC metadata.xml 374 BLAKE2B 80be57b8b296d0c79707bf576e666c9b418ef4a575342675ef50eef354d38cabb77ac2f645c08751060ed8d5cd9996c5285265d56b2018b3e8a72a342c9f3903 SHA512 c4ef41632b92cc273287883b966a262e675ddedd67e32953b94bd329152cc0d667138ab0fca50b9525f514fe73c1ccf0cd4ea2d3257178402b101b4ffda2db32
+EBUILD gevent-21.1.2.ebuild 2271 BLAKE2B 3d96ee912aa7b79f935987dfe9dae52567222a33b82eec9df5fba45a607bbb9981dc0d77ec91184a06b3cbf94d2d5f61fd9ea1cbc88aa6cd0d06c113f8f400b5 SHA512 b2fe8541bb779b288e36e67da2f4e9f969233164ae9f70359babf77564493702b31822dfb297ceb7ac84161fea9973a48d01350e20a3a59a773a1aafe1386b04
+MISC metadata.xml 628 BLAKE2B 9e9d9af03576525b40c1ca717cb5728bcdcb5a9891b25f4d1f513261aa6039e7c2161a5cf55b0e72b4e79507bb8e42a7d3de6c943099b51a99b4192f054728d2 SHA512 1e9a89cb8a72a230aab3b8ac367c7121de09e15ce25c9d4805709e3f8a6d5258166a78c66c297b7b8b19b5ebb2fd7505a69696950579355a9df6fc09fde9fe1a
diff --git a/dev-python/gevent/gevent-21.1.2.ebuild b/dev-python/gevent/gevent-21.1.2.ebuild
index 61c3d717cbf5..1568ccd6675d 100644
--- a/dev-python/gevent/gevent-21.1.2.ebuild
+++ b/dev-python/gevent/gevent-21.1.2.ebuild
@@ -16,20 +16,24 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="doc examples test"
+IUSE="doc events examples test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-libs/libev-4.31:=
 	dev-libs/libuv:=
 	>=net-dns/c-ares-1.12:=
-	dev-python/zope-event[${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]
-	virtual/python-greenlet[${PYTHON_USEDEP}]"
+	virtual/python-greenlet[${PYTHON_USEDEP}]
+	events? (
+		dev-python/zope-event[${PYTHON_USEDEP}]
+		dev-python/zope-interface[${PYTHON_USEDEP}]
+	)"
 DEPEND="${RDEPEND}
 	test? (
 		dev-python/psutil[${PYTHON_USEDEP}]
 		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/zope-event[${PYTHON_USEDEP}]
+		dev-python/zope-interface[${PYTHON_USEDEP}]
 	)"
 
 distutils_enable_sphinx doc
diff --git a/dev-python/gevent/metadata.xml b/dev-python/gevent/metadata.xml
index e10bdae3530f..7faa4e9a24e2 100644
--- a/dev-python/gevent/metadata.xml
+++ b/dev-python/gevent/metadata.xml
@@ -5,6 +5,9 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <use>
+    <flag name="events">Enables the gevent events system which is required by libraries that use gevent monkey patching. This adds <pkg>dev-python/zope-event</pkg> and <pkg>dev-python/zope-interface</pkg> as runtime dependencies.</flag>
+  </use>
   <upstream>
     <remote-id type="github">gevent/gevent</remote-id>
     <remote-id type="pypi">gevent</remote-id>
diff --git a/dev-python/google-api-core/Manifest b/dev-python/google-api-core/Manifest
index f31f2acb9a50..4d8a06df6350 100644
--- a/dev-python/google-api-core/Manifest
+++ b/dev-python/google-api-core/Manifest
@@ -1,9 +1,5 @@
-DIST google-api-core-1.28.0.tar.gz 133640 BLAKE2B 8134e39cc3ff2fbb850d5e774d08589e3e64b83ca5d5209279f5d1b7fc2eb350a523bbe2890fba6d907689149df3872a7e0a11991b1ecc62fc64a4753dce38e4 SHA512 3702d27613e621394209047451729c1308beb88c917033b4340e3fa96bf4a5ec36ad2594c98ed14439c578f69a202d95a96d30472438a30417484cff6e06fe7d
 DIST google-api-core-1.30.0.tar.gz 134595 BLAKE2B 104f52bafb68fd91904c02cbd6d3dd2e32c160a528f58e9af3612fc4f7a9934c522f79895b50982b46ee77947af7eb52557bf304b6f2624b97b5082905511829 SHA512 cc14f9c67bac99290665e2b85a97eacf43cdd2a0e4668ecbc7dd8e7131a7e4e908aca2be6d65797d0838081a02768354703762a1a80fa0b666efb81448b27899
-DIST google-api-core-1.31.0.tar.gz 134806 BLAKE2B 8609dd1260b72bc2c8fe949625c1b592e409bcd34c90f46671ef5c1573775f1957723ab6a03909b55145370e2c06250717b15452a89400ad1b6273a28c5a98a3 SHA512 af5a134ffeb65358d1b8e39bc6b0fe0b5477572dc915d941d63fcfeea72cff46c74d5d85350417484243a298462ab1322f69657694b25472d023db4b5fb27659
 DIST google-api-core-1.31.1.tar.gz 134947 BLAKE2B 112e705f8a2d945a207c10096a3cd8c1c65bf806339e8d688cc5638d234c1de03d168099414dd7314b8d3129d6d0e198208cddf15369b84ad837b9da90e8499c SHA512 29c84b98ae39416dbcb8ba7412237007bddea6e9a3af07c1f7753bfe57576125325a6412b73ab7d58c57257405b4b6aa36e043d0cf2496517828c7594f6698ef
-EBUILD google-api-core-1.28.0.ebuild 1260 BLAKE2B a3b0db659b2af9d38c7abab74c044645a03643f634443a6ff5739b0a58d47def40d86d721215afa7090b092325842dc335f83d8609e1da0cf6059dd355ccdfc7 SHA512 48a322282012623f07f845e3f2e6c626261f354ab4044fd99ce4936de559b8a830fb2b470547267f3dbbfd8c9fe8a68b9821918e08c5e7d199f748d8c5557c06
-EBUILD google-api-core-1.30.0.ebuild 1298 BLAKE2B 12d850962f1f5546eacbf64a502314d224c463cb119d6effaf5a5e6dad9591cc5b1ac5e0c5e50d85bcdb54aee71824ff78340f880c3488c456d6af849923ce30 SHA512 71e9bd2ab53bcbd9bfb0086fe2db395056b37c506f1d8e143c60a3092995ae672c2e87d521eb6d7dbefbd89cea61deffb939b4a5f1ec0066483746be92800e46
-EBUILD google-api-core-1.31.0.ebuild 1298 BLAKE2B aa2d3fc7236e6261111a95174eef4ff90cce0dce3164138c5d5947b1b4804dfc9ed967eaa3635e3ad0fde32f91513a7cbd850edffb308a0ab7111ef8c16ac2c3 SHA512 22b106f4c7deb4136700e16057fd9987ef0b4bd718d0cdcdc489ff1eb94c304b05175a70fcb606714c7f8b922ecef2a3e7d85d91234bd8afd84deb4fd1c8dd52
+EBUILD google-api-core-1.30.0.ebuild 1296 BLAKE2B 674507e4bdaab2810fa3bdb9c3976d25d29482d925f7bb0c33971b54047b675a321e807e413d2f3ac5cc8edbbec01dfc4c7ca32d6819148f4f569c3d63800881 SHA512 7477dc17520481e98797eacf93fdd0a6487e12e3c10b3647796274a12dda5788b3cc704ba1cc32b169ae409dfe96332cbe5b4994d973fc680637dadda3b9e0d5
 EBUILD google-api-core-1.31.1.ebuild 1298 BLAKE2B aa2d3fc7236e6261111a95174eef4ff90cce0dce3164138c5d5947b1b4804dfc9ed967eaa3635e3ad0fde32f91513a7cbd850edffb308a0ab7111ef8c16ac2c3 SHA512 22b106f4c7deb4136700e16057fd9987ef0b4bd718d0cdcdc489ff1eb94c304b05175a70fcb606714c7f8b922ecef2a3e7d85d91234bd8afd84deb4fd1c8dd52
 MISC metadata.xml 452 BLAKE2B 0fcfeaec5750606a31eecf6794110c23bee9e2e56c9aa18201568e9ca8b1b45ef538efb4d0700eef7ddb28729acbc23946daf2c88c1cbe4f4f309d635455080c SHA512 0bb4089469ba140ff630b358150bc7ccb646465da9ae7b83ddbbb980b10347e0d3cb7b7e86cd8d0ab5897aa6a34017f6a921978a8ded784ef7582b00552299ae
diff --git a/dev-python/google-api-core/google-api-core-1.28.0.ebuild b/dev-python/google-api-core/google-api-core-1.28.0.ebuild
deleted file mode 100644
index f12208fdc974..000000000000
--- a/dev-python/google-api-core/google-api-core-1.28.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1
-
-DESCRIPTION="Core Library for Google Client Libraries"
-HOMEPAGE="https://github.com/googleapis/python-api-core
-	https://googleapis.dev/python/google-api-core/latest"
-SRC_URI="https://github.com/googleapis/${PN//google/python}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${P//google/python}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-RDEPEND="
-	dev-python/namespace-google[${PYTHON_USEDEP}]
-	dev-python/protobuf-python[${PYTHON_USEDEP}]
-	dev-python/googleapis-common-protos[${PYTHON_USEDEP}]
-	>=dev-python/google-auth-1.25.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.18.0[${PYTHON_USEDEP}]
-	<dev-python/requests-3[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/grpcio[${PYTHON_USEDEP}]
-		dev-python/rsa[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests --install pytest
-
-python_install_all() {
-	distutils-r1_python_install_all
-	find "${D}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/google-api-core/google-api-core-1.30.0.ebuild b/dev-python/google-api-core/google-api-core-1.30.0.ebuild
index 183edfac0b1a..c181080079eb 100644
--- a/dev-python/google-api-core/google-api-core-1.30.0.ebuild
+++ b/dev-python/google-api-core/google-api-core-1.30.0.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${P//google/python}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 RDEPEND="
 	dev-python/namespace-google[${PYTHON_USEDEP}]
diff --git a/dev-python/google-api-core/google-api-core-1.31.0.ebuild b/dev-python/google-api-core/google-api-core-1.31.0.ebuild
deleted file mode 100644
index e85bbb95287c..000000000000
--- a/dev-python/google-api-core/google-api-core-1.31.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1
-
-DESCRIPTION="Core Library for Google Client Libraries"
-HOMEPAGE="https://github.com/googleapis/python-api-core
-	https://googleapis.dev/python/google-api-core/latest"
-SRC_URI="https://github.com/googleapis/${PN//google/python}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${P//google/python}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-RDEPEND="
-	dev-python/namespace-google[${PYTHON_USEDEP}]
-	dev-python/protobuf-python[${PYTHON_USEDEP}]
-	dev-python/googleapis-common-protos[${PYTHON_USEDEP}]
-	>=dev-python/google-auth-1.25.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.18.0[${PYTHON_USEDEP}]
-	<dev-python/requests-3[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/grpcio[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/rsa[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests --install pytest
-
-python_install_all() {
-	distutils-r1_python_install_all
-	find "${D}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/google-auth/Manifest b/dev-python/google-auth/Manifest
index 9a7d539ef6aa..973d4ab54fa3 100644
--- a/dev-python/google-auth/Manifest
+++ b/dev-python/google-auth/Manifest
@@ -1,11 +1,5 @@
-DIST google-auth-1.30.2.tar.gz 169368 BLAKE2B c01191313b4bd7ffdc62fbca20aeadcb01fcb1f26e4c11504f88c2582b9a3dca10046edd5d2fe88c98980fb09e4d68da99bf0b8b5692abcf5271994515f91765 SHA512 f133ef403f8a3c92437055f2fd0e5f607199a0bfd9a76a44075a9be8ec16c4d4822d58d85fa52ade4c448e11cb6822f7e8da03ab72f3dddfb811c8d7a846f841
 DIST google-auth-1.32.1.tar.gz 171621 BLAKE2B e82f4666a38d3dbaa4aa4a4d5192afb711471432c0dcca44b1a1c52fa2171f1de0d7ffd8a7a6d5dc6dbc3a1dec16becabb26306a9ba3b3fd0998584dd1194cc6 SHA512 968c16c7fc5c8c589a94e24139c319ec7f2791b021d6240156d398d4795e6afee8e46591c4aa44457de6f98ca14e8edcb055fb3a02914b43ba5fab74a03d9fc6
-DIST google-auth-1.33.0.tar.gz 178385 BLAKE2B 7d98afcd3a1dfc12a2af48297188c10f9618483ebdeeb8f7e02fca59d6255210a64b4917507a4525a3d6838198035fd827a1276da2a1f06169e83d1ca75fb485 SHA512 19da14b89cac28cf824f258d3dc662cbf40f4227e840594148c7ea3a6640dc00f06653c1b29846a9569d938a0fa307aff1c8425c015ab46d276485210eeb1227
-DIST google-auth-1.33.1.tar.gz 178615 BLAKE2B 1600ca8861a7e75decfda5605414ff45d8f6d7ece40e0bb7a5892fe2289f1adc5bba313eab10c4d0e1f6e7a38634861e28518c2f02522ec924d6ed53805c4207 SHA512 c54356b21af5ddeda88023b886631050e8e4306ed444093ed6589d13d95af402f03928dc5b5f44f9b4c038128ed254aa14de6d852108f44949c42e2d05304062
 DIST google-auth-1.34.0.tar.gz 180860 BLAKE2B d536d689ff5b0c033f787228d643504d1888f0b73a9c6855fe4fae3af20772ef0640feca39c58c39f45681561dce6d5f3ec1d1f7d9699442fff0ec63fd019361 SHA512 7c3b64e8f85056fb660bbfd4f737053813a1e5b8aba52290882a0ddb9d9fd8c5365b767c78dd1e7859ef95caa6e653786d5a8747c8792bbee9c6fad1a5218910
-EBUILD google-auth-1.30.2.ebuild 1444 BLAKE2B 860c43a699cc5f7e52abf7f37cebae31c74cef8c7ac585c09250d9771481916a516ce09f34af774431f0c050b4c266a9617959d48dc183a5d76ba85370381be8 SHA512 c3185dde8203aeb1f1d1b2f82b43cd81d3bbb9a6feaf30343078d893dcdd5dcc3d2be87e2331e095daad0ba4d774f1297bd5c923027016d0f6fddbb4d37c3d4a
-EBUILD google-auth-1.32.1.ebuild 1446 BLAKE2B 4668ddc6f62d28628b5feadbc31e4bd11b0b231f264cafaef704bce3ebdd4815ef8deb1b6c716e563ab9314f6eb1dd84196e537f2b197e188351c99d1cebed76 SHA512 c6a6406afb3b69fb74529b62444c58afe9337f35e25149fa9433df086e73c11c3a2f982999c7074a776215ad449cf4e619c814ca100c95877de3fb08f878c3b0
-EBUILD google-auth-1.33.0.ebuild 1446 BLAKE2B 4668ddc6f62d28628b5feadbc31e4bd11b0b231f264cafaef704bce3ebdd4815ef8deb1b6c716e563ab9314f6eb1dd84196e537f2b197e188351c99d1cebed76 SHA512 c6a6406afb3b69fb74529b62444c58afe9337f35e25149fa9433df086e73c11c3a2f982999c7074a776215ad449cf4e619c814ca100c95877de3fb08f878c3b0
-EBUILD google-auth-1.33.1.ebuild 1446 BLAKE2B 4668ddc6f62d28628b5feadbc31e4bd11b0b231f264cafaef704bce3ebdd4815ef8deb1b6c716e563ab9314f6eb1dd84196e537f2b197e188351c99d1cebed76 SHA512 c6a6406afb3b69fb74529b62444c58afe9337f35e25149fa9433df086e73c11c3a2f982999c7074a776215ad449cf4e619c814ca100c95877de3fb08f878c3b0
+EBUILD google-auth-1.32.1.ebuild 1444 BLAKE2B 3d2e22bfee368499cc5795a300373dd221299165cfd0ffb647d3402ddb2f300276c51f0f148df94a4cde203529633d4dadeb329e36d9eeb328fe9b127f8a5a79 SHA512 a3ced8db4c83ae70017801663ef0cddb3208b21ed87ee353b6e22639b345a32457766122b4d3bd8f93a455c54a920dc032de0c2c1eb50f247747e236b84e481c
 EBUILD google-auth-1.34.0.ebuild 1446 BLAKE2B 4668ddc6f62d28628b5feadbc31e4bd11b0b231f264cafaef704bce3ebdd4815ef8deb1b6c716e563ab9314f6eb1dd84196e537f2b197e188351c99d1cebed76 SHA512 c6a6406afb3b69fb74529b62444c58afe9337f35e25149fa9433df086e73c11c3a2f982999c7074a776215ad449cf4e619c814ca100c95877de3fb08f878c3b0
 MISC metadata.xml 520 BLAKE2B c54ed12c21d00df20c4a605471df6fda2da0ae4bdad730a543a61cb1aed9f159af9db78675c3132142494a32c951560cb9f56a42844a29c3fe65c7522b34cd3e SHA512 761949db3693b2102936c08e9d02c3bfc91a2f1f73489e0fe562c8a64ceb4c1908f9fc7c19f2f142be30fb421075ce2be4628fd4d7d88748a1ac4fa5d42a222f
diff --git a/dev-python/google-auth/google-auth-1.30.2.ebuild b/dev-python/google-auth/google-auth-1.30.2.ebuild
deleted file mode 100644
index a1b10b9fa2aa..000000000000
--- a/dev-python/google-auth/google-auth-1.30.2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..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"
-
-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}]
-	"
-BDEPEND="
-	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/pyu2f[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-		dev-python/urllib3[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-python_install_all() {
-	distutils-r1_python_install_all
-	find "${ED}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/google-auth/google-auth-1.32.1.ebuild b/dev-python/google-auth/google-auth-1.32.1.ebuild
index 2bb9e016a997..8750bd770698 100644
--- a/dev-python/google-auth/google-auth-1.32.1.ebuild
+++ b/dev-python/google-auth/google-auth-1.32.1.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"
 
 RDEPEND="
 	dev-python/namespace-google[${PYTHON_USEDEP}]
diff --git a/dev-python/google-auth/google-auth-1.33.0.ebuild b/dev-python/google-auth/google-auth-1.33.0.ebuild
deleted file mode 100644
index 2bb9e016a997..000000000000
--- a/dev-python/google-auth/google-auth-1.33.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..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"
-
-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}]
-	"
-BDEPEND="
-	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/pyu2f[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-		dev-python/urllib3[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-python_install_all() {
-	distutils-r1_python_install_all
-	find "${ED}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/google-auth/google-auth-1.33.1.ebuild b/dev-python/google-auth/google-auth-1.33.1.ebuild
deleted file mode 100644
index 2bb9e016a997..000000000000
--- a/dev-python/google-auth/google-auth-1.33.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..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"
-
-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}]
-	"
-BDEPEND="
-	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/pyu2f[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-		dev-python/urllib3[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-python_install_all() {
-	distutils-r1_python_install_all
-	find "${ED}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/hiredis/Manifest b/dev-python/hiredis/Manifest
index a37c5406915f..46f8ead901c1 100644
--- a/dev-python/hiredis/Manifest
+++ b/dev-python/hiredis/Manifest
@@ -1,8 +1,4 @@
-AUX hiredis-1.0.1-api-0.14.patch 1332 BLAKE2B 08d5c2f1e85db8f0eb81e620c08f150c613f34f3e0e96716891dc60100dfbe5f3c74ad3bdd312db909951ceddc44f5516a14fb9719c7e8be7c676c93b5981db6 SHA512 3c32c157a9f86498c42bfad043577d981d611a6396408932595d7f58eef2737e7d9f3879c714e358c2233fdebd36958919875f8ff5da90775b4205625de0adb8
-AUX hiredis-1.0.1-system-libs.patch 519 BLAKE2B 8ba885963970dfa0a32b38f4b03e26b2a295a480a7d2033082317ec3b2d598f02acce32c95a784b439d938402a41716d6885e9450dd642b7240af5c6625cced3 SHA512 fb646b968cc14d06de0ec2cbebd6ad1418e1bc0d7c03b529d5c1febe3db9f09933b23e9cf1aa80c6c382923d4b96ce0100709337eb375cbe08508ebbb842059c
 AUX hiredis-2.0.0-system-libs.patch 390 BLAKE2B bf64bb9ad6ca84c5cdabe505dfed0417e71d9585cd60c0fa2bd9627b2cb90f8502f5224d5854a14213a5b4a9e01814e23d2295dba0acc122102181fab955297c SHA512 04521b844c346f86a44608bca76f706ec5f70a35c6ce2678fd7c4b958e6053d56aac0fca0d301ec8bed6aaa369c883370ffb946930d46d0fc8c0f7f9e52f7bed
-DIST hiredis-1.1.0.tar.gz 54620 BLAKE2B 9991745d277e87efe836c1c8eabb2016ce401e2be52c7e1b3a154350776fae6fd3c49e3096da57231e42c57bf36ba692ce26bc993d0923b5246376d8694ad058 SHA512 ad37868376de91303c15ffe6109dc7fadb4f458efdd44b7ddc0a410937a389b8e062ab7d36b1aec3fe324ecafe6b1e5e6b92f547cbf619251dad22a28e02ee9c
 DIST hiredis-2.0.0.tar.gz 75807 BLAKE2B dc7535f117c8ecfb2c924fe44a1cba2f02271c544588249de6794ce3aec27f66038ecb9f6364ca87b71f66ba13870a3be192eb79c1f360d2eb6dcb6dcae41caa SHA512 b9a313acdd00676dc046713a81bbf4336959f49f09bd2828997c23ca41259935047c657a4b6f81913715141a75fb6bbe7fc4429c7a5b0f4bc3d5de66b9cfa909
-EBUILD hiredis-1.1.0.ebuild 711 BLAKE2B ea29b6b1b3715ad14044459e8afe8876716748b8ebcf38f6ec9d9d16ab6d08108efd5bf4f498101618354707f5afc65957ce38a02e491296d0fde4c2b5897a24 SHA512 414f9b7b60adc607f5fcf4ed4d4898a3513fcf0dcbc99bbad842e26b473b07bfd55cae75b1d737f4227e9911035608d205cabe68a69cdd3fa47d31065ba0e047
-EBUILD hiredis-2.0.0.ebuild 664 BLAKE2B 33feff366f8c7832224a086fa3a741ddf695eae454e4e117134161e61e978323eaa3bcc58199ed43a89d33dfc773d6ea0dd936ffc55fc359fcf0bcfa5d76efec SHA512 60beb20d611ef4f2564284a4eeb77fafa961f42e6aebe882580527f3bbdea1decdc1990cc6544bd8d8524da9e0894c3079f80a6e0ef8986e2c1eb22496341bca
+EBUILD hiredis-2.0.0.ebuild 662 BLAKE2B 19cfc847fb62d26e8a678b5aa1a8fe7b62ed2d306b73b3eb25466642c447f92bc05b9253e728aaf0b1ae817c1f3709d32fa57f7413ac34d9b94f023d7f01eb15 SHA512 c8c4fb4c1310d433691e8a45a3f06a9330473d59e09195535c7c1e1420ab01712bc003e4833abdaab2a5173e5b653b4673cd5d36533f7cfc63c4d139caa03c8f
 MISC metadata.xml 578 BLAKE2B 39cbb3058e829134e69701f8acf4c89995d6ef1553b911b956a38ce2432267b78a7db070713d230dc2895c5df0c8e8295278caa442642fe64378a5cfdf444ac4 SHA512 da2ecff30312f5eed7611b107bf678af6d1fa45d5d87f75474d70412d7a17db4a37dae578a3047c45758e22a8041c123fa349c5f23580fdc98439300335636a7
diff --git a/dev-python/hiredis/files/hiredis-1.0.1-api-0.14.patch b/dev-python/hiredis/files/hiredis-1.0.1-api-0.14.patch
deleted file mode 100644
index 16c420228286..000000000000
--- a/dev-python/hiredis/files/hiredis-1.0.1-api-0.14.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -Nur hiredis-1.0.1.orig/src/reader.c hiredis-1.0.1/src/reader.c
---- hiredis-1.0.1.orig/src/reader.c	2019-11-13 11:38:29.000000000 +0100
-+++ hiredis-1.0.1/src/reader.c	2020-04-01 13:15:19.852085240 +0200
-@@ -167,7 +167,7 @@
- static void Reader_dealloc(hiredis_ReaderObject *self) {
-     // we don't need to free self->encoding as the buffer is managed by Python
-     // https://docs.python.org/3/c-api/arg.html#strings-and-buffers
--    redisReplyReaderFree(self->reader);
-+    redisReaderFree(self->reader);
-     Py_XDECREF(self->protocolErrorClass);
-     Py_XDECREF(self->replyErrorClass);
- 
-@@ -271,7 +271,7 @@
-       goto error;
-     }
- 
--    redisReplyReaderFeed(self->reader, (char *)buf.buf + off, len);
-+    redisReaderFeed(self->reader, (char *)buf.buf + off, len);
-     PyBuffer_Release(&buf);
-     Py_RETURN_NONE;
- 
-@@ -290,8 +290,8 @@
-         return NULL;
-     }
- 
--    if (redisReplyReaderGetReply(self->reader, (void**)&obj) == REDIS_ERR) {
--        errstr = redisReplyReaderGetError(self->reader);
-+    if (redisReaderGetReply(self->reader, (void**)&obj) == REDIS_ERR) {
-+        errstr = redisReaderGetError(self->reader);
-         /* protocolErrorClass might be a callable. call it, then use it's type */
-         err = createError(self->protocolErrorClass, errstr, strlen(errstr));
-         if (err != NULL) {
diff --git a/dev-python/hiredis/files/hiredis-1.0.1-system-libs.patch b/dev-python/hiredis/files/hiredis-1.0.1-system-libs.patch
deleted file mode 100644
index c11d0baa5639..000000000000
--- a/dev-python/hiredis/files/hiredis-1.0.1-system-libs.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -Nur hiredis-1.0.1.orig/setup.py hiredis-1.0.1/setup.py
---- hiredis-1.0.1.orig/setup.py	2019-11-13 11:38:29.000000000 +0100
-+++ hiredis-1.0.1/setup.py	2020-03-19 08:18:53.414214592 +0100
-@@ -11,9 +11,8 @@
-   return module.__version__
- 
- ext = Extension("hiredis.hiredis",
--  sources=sorted(glob.glob("src/*.c") +
--                 ["vendor/hiredis/%s.c" % src for src in ("read", "sds")]),
--  include_dirs=["vendor"])
-+  sources=sorted(glob.glob("src/*.c")),
-+  libraries=["hiredis"])
- 
- setup(
-   name="hiredis",
diff --git a/dev-python/hiredis/hiredis-1.1.0.ebuild b/dev-python/hiredis/hiredis-1.1.0.ebuild
deleted file mode 100644
index 68ec424e3aec..000000000000
--- a/dev-python/hiredis/hiredis-1.1.0.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_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python extension that wraps hiredis"
-HOMEPAGE="https://github.com/redis/hiredis-py/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="system-libs"
-
-DEPEND="system-libs? ( dev-libs/hiredis:0/0.14 )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	use system-libs && PATCHES+=(
-		"${FILESDIR}"/${PN}-1.0.1-system-libs.patch
-		"${FILESDIR}"/${PN}-1.0.1-api-0.14.patch
-	)
-	default
-}
-
-python_test() {
-	cd test || die
-	"${EPYTHON}" -m unittest reader.ReaderTest || die "tests failed"
-}
diff --git a/dev-python/hiredis/hiredis-2.0.0.ebuild b/dev-python/hiredis/hiredis-2.0.0.ebuild
index c2881e5aae37..20a1453d27ce 100644
--- a/dev-python/hiredis/hiredis-2.0.0.ebuild
+++ b/dev-python/hiredis/hiredis-2.0.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="system-libs"
 
 DEPEND="system-libs? ( dev-libs/hiredis:0/1.0.0 )"
diff --git a/dev-python/httpcore/Manifest b/dev-python/httpcore/Manifest
index fb5dcc02f806..0e749ce168e3 100644
--- a/dev-python/httpcore/Manifest
+++ b/dev-python/httpcore/Manifest
@@ -9,5 +9,5 @@ EBUILD httpcore-0.13.0.ebuild 2132 BLAKE2B e598e1cad25c700b9bfbf7f74c3af6832be92
 EBUILD httpcore-0.13.1.ebuild 2132 BLAKE2B e598e1cad25c700b9bfbf7f74c3af6832be9271e2fe44cefbd818808f93275378f3768f5bb3019e193ade7b3a0dcd489d9c682d4c9d65d127f4f2fafbc68a336 SHA512 87e7ab3276d7a43be8c3fddd688fb1db4f51b42971446612d7d5463c89d5d7b7dc211f46c8dc0f7aa5a46a069ed4f4adc46087c66d1edfd0d3f4f7250806ca3b
 EBUILD httpcore-0.13.2.ebuild 2132 BLAKE2B e598e1cad25c700b9bfbf7f74c3af6832be9271e2fe44cefbd818808f93275378f3768f5bb3019e193ade7b3a0dcd489d9c682d4c9d65d127f4f2fafbc68a336 SHA512 87e7ab3276d7a43be8c3fddd688fb1db4f51b42971446612d7d5463c89d5d7b7dc211f46c8dc0f7aa5a46a069ed4f4adc46087c66d1edfd0d3f4f7250806ca3b
 EBUILD httpcore-0.13.3.ebuild 2200 BLAKE2B bd8054b48aea11fa7cfa3838bc747860982e903a7d56bd7c4f5cae60c50c618fbaf0afe46a0d5d2876b05a91f35132a5237043d56faac472b5e1c681dd07d101 SHA512 8cd8925a97ada21fe17ba3744e755ca1b231f73955ad4138115c8346d790629f9156dad4e3778f743d483cd8fdca21d044f229d139c90af4944510e440f944f3
-EBUILD httpcore-0.13.6.ebuild 2306 BLAKE2B a31bbbdeea1bde7731632eae255e96101ce0b775a263523586aa4011954746220bd46288ecfc2aa33e4701c6d01a91204a93f6c7d9728ea04250d99dcad71a5d SHA512 ad7495a8ab821825d7ff7c038ad787e7db4b5ae1c0ea6071902df9ccabe5c680e05dc50ef17e962aaa5dcfd3e0ea8032e964ed30249ce5e82e894b983135418c
+EBUILD httpcore-0.13.6.ebuild 2314 BLAKE2B 4d4570069c846005d933bd9ce31282d7742c218d70511db36f8724198087a4c33d110227be51128d012c8cf0531c1b5d16bc083b699c989a8880a5f08832d877 SHA512 e6ccf3784cd33cc557913a5ba17dd34c125142358c7fec8e574ae690ef823dabf0a376c67eb45f817712944abd77447ffeaadf19932ab65fd87bc74ec5e20b7c
 MISC metadata.xml 453 BLAKE2B 9ecaf4c2d0b1da4ef7272fb7fd65dd2ea9bcf0ac036420317c838ed2cdf16119270d1a7ce1673057f6bb2c81b0e0776ac6291eab9830b30ba2954ba0d373ea61 SHA512 c885cf0a5bd4c74962160739702d07c34c834b252d050fbfca9f6fdbf469defba4a27c615c312bead882a4e126eb244982e3fdec6428626c51c6935ca8c004e3
diff --git a/dev-python/httpcore/httpcore-0.13.6.ebuild b/dev-python/httpcore/httpcore-0.13.6.ebuild
index 65b6fd3805fc..c4917dd84414 100644
--- a/dev-python/httpcore/httpcore-0.13.6.ebuild
+++ b/dev-python/httpcore/httpcore-0.13.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/encode/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
 
 RDEPEND="
 	=dev-python/anyio-3*[${PYTHON_USEDEP}]
diff --git a/dev-python/httpx/Manifest b/dev-python/httpx/Manifest
index 62c5e9d8ecde..b3927a8e4e58 100644
--- a/dev-python/httpx/Manifest
+++ b/dev-python/httpx/Manifest
@@ -1,5 +1,6 @@
+AUX httpx-0.18.2-big-endian.patch 2009 BLAKE2B 889f4636c88029778fc7f56b6635543794de81c60b3ef704e577a62ef8d8a1d3eccd19c80c3f6a9870f6b6aca98f4e3692e5ac31be800c707ad5bf91d73b6ece SHA512 3cc62f6b5a039f1c7c79854a95991e750162419d9c5f21a8fdf4d009f19a0694c711bec4aba7cfcfe17c08d98e8fabbe2ab4531ea58a4f5050867cf4f440c836
 DIST httpx-0.18.1.tar.gz 1663996 BLAKE2B dcbfcb4a452b47b643d5114a535005f7f92170392202dedc6c152546430231d20fd8b94b7ecc1d2abacbc9d76acb14cbfdc268109b171cc40812504e696dcaab SHA512 954b020d117dd1064262f3ac2d3137d01bba344b1a061e5713c3889283334d9ca92d9ed3d23f6ce79d684e31bae2d83fca6993178ef55e5a91353b812ad489e3
 DIST httpx-0.18.2.tar.gz 1666756 BLAKE2B 3d1e25d503ae5306150c157bc83afdac9a475110d042e041b58de448a0dcfd75de3f4c15836b838dc799cd5f8b7e0d646e43bbe107ffad87d51ff016afe585cd SHA512 727974e5d5924fdd653987dd4f528d27bb2653085b01ef5efcdac39dc92ef2ed586f872c202349aa31105ad970cff914de4315c2d79338a6aa18bebb8126f392
 EBUILD httpx-0.18.1.ebuild 1355 BLAKE2B 94a851f649d0dc4f8455fd08544f1a22f3f960df4d880368d63ae0ecb59384df465930c71b7078b7493d0e7dada421230dfb4303b6bc577330076e72418520ae SHA512 903129f1d0120d980981e60a0a185ceded491d6e00cfb457b02a069ef709c513a5c764817a1450ce3406c2f3fd0ef93960eaff1b8e412bcc56f3f2e9f309d036
-EBUILD httpx-0.18.2.ebuild 1593 BLAKE2B 674286b88f5d85114101b08a735a7e5a8c6a6f82b4c98c7ddf6dfa67632b6849573fcdd22e5e785b30b76d826297bbb05c0815d96937f8576eb94d2116acbaa1 SHA512 44960d18587f5444ce07650a233d388c5fe8dba07b49d941bd09f742ff18f0ee398887129efb607685dbfffe983f835f688101612808a7749ef31884fa4d6644
+EBUILD httpx-0.18.2.ebuild 1686 BLAKE2B 5c83b933800521aa1a1adf4a3bff9ec4fde481b84e2996b0f79d56bb44b26e88bd338bd6feb0c4546f0915dc7e484090a3a1fddc4efcf0db1d3b30ed3f573e23 SHA512 2434d6a19f8f7109e6b13af15d93fe06b16bf19e5e3a0ab2a4face3a67d09d4ee96dde5f7e51659a19e91734d5ba7080b0296d2e5268b42f5e678bd803a65609
 MISC metadata.xml 444 BLAKE2B 62369fdf937f8caf46980620f2da0b16512ef94cbea9fecf0c336029a709e0975332d0d4e53ff4f3eeddeb9d231a5003dff9bbdf999846152bf578772b47d9a9 SHA512 bbbc7e622f0aae3b63e19765626ee13adf027d5ed98ca97fe04592b1f0a8da0cd0302b31f9cda90eaacf2bf5dad9c6472ddd795db75f0992ba4f084e4135ea3d
diff --git a/dev-python/httpx/files/httpx-0.18.2-big-endian.patch b/dev-python/httpx/files/httpx-0.18.2-big-endian.patch
new file mode 100644
index 000000000000..794609d86a50
--- /dev/null
+++ b/dev-python/httpx/files/httpx-0.18.2-big-endian.patch
@@ -0,0 +1,40 @@
+From 88a0a85ff795d8c23d5cd2cd113eeac957cc818a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Thu, 5 Aug 2021 17:35:54 +0200
+Subject: [PATCH] Fix JSON wrong encoding tests on big endian platforms
+
+Fix test_json_without_specified_encoding_*_error tests on big endian
+platforms.  The tests wrongly assume that data encoded as "utf-32-be"
+can not be decoded as "utf-32".  This is true on little endian platforms
+but on big endian platforms "utf-32" is equivalent to "utf-32-be".
+To avoid the problem, explicitly decode as "utf-32-le", as this should
+trigger the expected exception independently of platform's endianness.
+---
+ tests/models/test_responses.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tests/models/test_responses.py b/tests/models/test_responses.py
+index f1815dc..b7c2d57 100644
+--- a/tests/models/test_responses.py
++++ b/tests/models/test_responses.py
+@@ -735,7 +735,7 @@ def test_json_without_specified_encoding_decode_error():
+     content = json.dumps(data).encode("utf-32-be")
+     headers = {"Content-Type": "application/json"}
+     # force incorrect guess from `guess_json_utf` to trigger error
+-    with mock.patch("httpx._models.guess_json_utf", return_value="utf-32"):
++    with mock.patch("httpx._models.guess_json_utf", return_value="utf-32-le"):
+         response = httpx.Response(
+             200,
+             content=content,
+@@ -750,7 +750,7 @@ def test_json_without_specified_encoding_value_error():
+     content = json.dumps(data).encode("utf-32-be")
+     headers = {"Content-Type": "application/json"}
+     # force incorrect guess from `guess_json_utf` to trigger error
+-    with mock.patch("httpx._models.guess_json_utf", return_value="utf-32"):
++    with mock.patch("httpx._models.guess_json_utf", return_value="utf-32-le"):
+         response = httpx.Response(200, content=content, headers=headers)
+         with pytest.raises(json.decoder.JSONDecodeError):
+             response.json()
+-- 
+2.32.0
+
diff --git a/dev-python/httpx/httpx-0.18.2.ebuild b/dev-python/httpx/httpx-0.18.2.ebuild
index dc1258768a98..4f44b01f6d45 100644
--- a/dev-python/httpx/httpx-0.18.2.ebuild
+++ b/dev-python/httpx/httpx-0.18.2.ebuild
@@ -7,7 +7,7 @@ EAPI=7
 # DOCS_BUILDER="mkdocs"
 # DOCS_DEPEND="dev-python/mkdocs-material"
 # DOCS_AUTODOC=1
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1 # docs
 
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/encode/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 arm arm64 ppc ~ppc64 sparc x86"
 
 RDEPEND="
 	dev-python/certifi[${PYTHON_USEDEP}]
@@ -40,6 +40,11 @@ BDEPEND="
 
 distutils_enable_tests pytest
 
+PATCHES=(
+	# https://github.com/encode/httpx/pull/1781
+	"${FILESDIR}"/${P}-big-endian.patch
+)
+
 python_prepare_all() {
 	# trio is not currently in the tree
 	sed -i '/^import trio/d' tests/concurrency.py || die
diff --git a/dev-python/humanize/Manifest b/dev-python/humanize/Manifest
index ef624c780a5b..9c4c5ebb9426 100644
--- a/dev-python/humanize/Manifest
+++ b/dev-python/humanize/Manifest
@@ -1,5 +1,7 @@
 DIST humanize-3.10.0.tar.gz 65658 BLAKE2B c60aff8f5e2044c10e997f3546b30e8ac7c040ee57aea5342ccce7ea6341a8695c1b94bdc8cb2acc18c3f421667fd4090b7b110b47aa229cd10d5ac8b42d6dae SHA512 f31929ddc1055fb54294b67e25e3b41883ef4e8ff9b76082cdd4703d64a066d0a368d116a60e26465f07dd3a0df8c87bb459ff1b03153d8843d3eefb06ff6961
+DIST humanize-3.11.0.tar.gz 67034 BLAKE2B 9e10582139578e8e041d1ce60c9c5d7e071c4c093a64cf620df6ff38f0567e8b2f3134f10722cb724d13343373db0fa2a1ae5bd68700ff85fb58ee318feb0fd0 SHA512 7aa3c513c6702de0e099865f787858de4c9c65cfe95af61fd0204ff6df64e7359474b4067b4672546936beae6c8c512dd9c75f555d7075c94819e81143c21ce9
 DIST humanize-3.9.0.tar.gz 64229 BLAKE2B 09aeec6a92c8e2e104032d4c61f054785ff58ce2dda68c4f3acffb17c7fa4e262b28a24b7c06d33671ea18d2eb05c9bcc0a82d5491e60afa161ebc0041945bf2 SHA512 75aa8f9f6b07d4b65e5589c3f337a92ee17769ab8da6608147b0f1ec3965b95788dd90cf0d0cae1b7c9be689b44910029ee72e2eba39a60c9926b67726c74353
 EBUILD humanize-3.10.0.ebuild 549 BLAKE2B bb3562a3052c164aa92488a4b5a4fd76600f0e88c882b45daca1f61007c5083881802fc0467c3a019573671293a570120ab8ccf139501e8d4597c68805ffdde4 SHA512 3d77dfc18318baf0072a39d4cd3eb60797b7157edfb132bb1bd40f77dc36f4c766d46123de3adbd6a28f41e5efbc40420fa28c094372169962a4249e83c9b93e
+EBUILD humanize-3.11.0.ebuild 549 BLAKE2B bb3562a3052c164aa92488a4b5a4fd76600f0e88c882b45daca1f61007c5083881802fc0467c3a019573671293a570120ab8ccf139501e8d4597c68805ffdde4 SHA512 3d77dfc18318baf0072a39d4cd3eb60797b7157edfb132bb1bd40f77dc36f4c766d46123de3adbd6a28f41e5efbc40420fa28c094372169962a4249e83c9b93e
 EBUILD humanize-3.9.0.ebuild 547 BLAKE2B 33dab2c67d880f84972528a538579c0c53d6850575b435dd621d3397e888161d7245af1c1f7627ae09164d75aff2f2a3f36c57aa36dfc13554145361f687d759 SHA512 fd88009835781655dabf1441a30b9124061fe4d55c556b4d228ff58a59e4d9a73e0e59d5cb411e08f7df79a4a00e3dee3d4e885426baeb92da873dca4c10d52c
 MISC metadata.xml 561 BLAKE2B a7919d3646edc6a4e7c2e13d74b1ae4eb18e16c41d33f27adb2841e80ab12e5d85f42bedab668c1096740e7ed1323e5accac1ba45a78290f0979c55e39c9d682 SHA512 b31a4947368fcbfb0edf93b48f843c49d5209820cf9da1a8aeb8666ab4fffebac765ca4aeb3cf2523837fcfc9c21d858cecaed65002ac23bb9d946a8c818f113
diff --git a/dev-python/humanize/humanize-3.11.0.ebuild b/dev-python/humanize/humanize-3.11.0.ebuild
new file mode 100644
index 000000000000..ce3c080a882b
--- /dev/null
+++ b/dev-python/humanize/humanize-3.11.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Common humanization utilities"
+HOMEPAGE="https://github.com/jmoiron/humanize/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? ( dev-python/freezegun[${PYTHON_USEDEP}] )
+"
+
+distutils_enable_tests --install pytest
diff --git a/dev-python/identify/Manifest b/dev-python/identify/Manifest
index db20096ad4c0..1b10ba9ef0b5 100644
--- a/dev-python/identify/Manifest
+++ b/dev-python/identify/Manifest
@@ -1,5 +1,7 @@
 DIST identify-2.2.10.tar.gz 101073 BLAKE2B 7049424855d23727180a4af137ebd7cbf88d6ca0187901bbe43abfcb820c1db17af8ff89345612909fc869f9ee8503d84e3d1218548535abb6f499eade284def SHA512 a6f9dfc3d969a30f50922cb9ad285d76c39774706b8c0d868bcbf96564a49841e54b6021e4fced56f17cebd25fadc69dd93714d475e4f517a05677bdabada4dc
 DIST identify-2.2.11.tar.gz 101117 BLAKE2B e316bd18a91b3d073b2bb24743ffcf5e6551ce5a9ddf62b1a30aaf937311b2d07de08d9abe01040de48c607d51e4cab121d778385f8336bc911409bedcd5fce3 SHA512 083dd600bc65f61c1aa41f87943b59a4f2edcbbc7a7d07d7a1375d181761edc4b853df87d4a2b2c0f3122f4f27ed10eb784d2dd75078418b50a471b1d5a0ad0f
+DIST identify-2.2.12.tar.gz 101128 BLAKE2B 71f70e211bb64c44fd56cf276c1e474e002931a711e986f933a80b085a4b1c2465d84780d636efc977c6c91283d33b94d7c25fbf16b83d2fbb1cb227c76ebca9 SHA512 cada883c7d5696c0f5c55e901e88e1d63b28d5045f54f2d197151c37d8a96854e020d4112d857fad0402e61fad3c05a5e9ca624a72be0baecdd0fb247b6bef4b
 EBUILD identify-2.2.10.ebuild 505 BLAKE2B adbd3b5737c1bf6d8e809cc0d947f54d51af4d16526eedd4cd8409b773b0f37b9512a428e9febcd699c1491bae98f7c8e344f2b579f8302a26624e84c6016a03 SHA512 e1bee2e6abd986dfeaaf9003cc0febdff77754d6733ff27127e0bf9f497a00b1257683ef51454b66a37ce8c15c9dd839f1047061e25f5dd5fcd3fb5d07f627f5
 EBUILD identify-2.2.11.ebuild 523 BLAKE2B 5d84c4a34fa413d2d8b0949d1565442c7e0bbf48dea7d088c23a8e2ef9cac449704115b293a114da1f25e48a4553f81336c28429e18e1e96be12e36f9f9a35b1 SHA512 0bdae8084a8bf3678f911e35fcaa620faa75f366bff3e9b04dc119f9ead31984deaa56dd866e426268a613dc56eac88e066b928539203b1e3375e24ab31ce57b
+EBUILD identify-2.2.12.ebuild 523 BLAKE2B 5d84c4a34fa413d2d8b0949d1565442c7e0bbf48dea7d088c23a8e2ef9cac449704115b293a114da1f25e48a4553f81336c28429e18e1e96be12e36f9f9a35b1 SHA512 0bdae8084a8bf3678f911e35fcaa620faa75f366bff3e9b04dc119f9ead31984deaa56dd866e426268a613dc56eac88e066b928539203b1e3375e24ab31ce57b
 MISC metadata.xml 476 BLAKE2B 396158e97712197ecfbad701cd368433e75aba1d79f81ed47726271c7b3a68675116aa994b8fd5ae2a5ea66cf9e047b23c1f81dd10b1f2812aba19e8a0aa3af4 SHA512 e2fa23ad8c27872eada3063f832eaa1962fee31301bbd36abc19f2e03bc8e984cbc0d9680afeeeecf928c8e2ccf9944c4d56767ec04491ccce31e406d9c0180e
diff --git a/dev-python/identify/identify-2.2.12.ebuild b/dev-python/identify/identify-2.2.12.ebuild
new file mode 100644
index 000000000000..c3b147be85a7
--- /dev/null
+++ b/dev-python/identify/identify-2.2.12.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="File identification library for Python"
+HOMEPAGE="https://github.com/pre-commit/identify"
+SRC_URI="https://github.com/pre-commit/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+
+RDEPEND="dev-python/editdistance-s[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
diff --git a/dev-python/immutables/Manifest b/dev-python/immutables/Manifest
index 7cc075487403..090cb253d798 100644
--- a/dev-python/immutables/Manifest
+++ b/dev-python/immutables/Manifest
@@ -1,3 +1,5 @@
+AUX immutables-0.15-32bit-hash.patch 2439 BLAKE2B 353f5452dbff85a3b08786174a69068b0a9081ddbc8f88ba03b8c73ba5ab753c2e463cb9ab3af3d61604c23f3b58fe9226efda8119cd1420d3b27871ceb8f1e7 SHA512 add8e68ce6be057889a075c2ba1e58e522ade9e49513118e5e2acfd688b2f1ca20634aee546c0ed5e92181d5c777af4cf312368510c65f8267a465bc90a063b2
 DIST immutables-0.15.tar.gz 81297 BLAKE2B cb58142c3b833d529046f09a468b3e3964e3d36e4eaf0825f88b920e6795cd042e2fc837ea6d72000bbc9cbc2fd1de911e08b4f6d189e692748b49e848dfb3fb SHA512 cd0ee20f6d6218eaf13499e40971b6750009ff01a1aefcb7dd45c77ae841296b9d9184013e6e7fe5bdef93587f85cdb8ff459af29424a0077538666260572b8e
+EBUILD immutables-0.15-r1.ebuild 629 BLAKE2B 8b756b31629365c274c51d19894105ee6011724361c2aca1b89fcf6f421e01420f8c5e5b61d6f34d9ef5dadffc99181c3300e22909a0f59fe0e2e6151be06268 SHA512 546fce12a5f41544d94852281d030557f454d13deec05fd070ceb4a15418a1ff8bcbc7373d634c7b10518e3f26e1dd59c661c70f3f16f9ff71091431a7f8f393
 EBUILD immutables-0.15.ebuild 487 BLAKE2B 6eb8f45620525e4dd42aea5ae122f9c60e4a1ed5c7585967a7866a71d79fde296565b6e6aa7654f7ca6cc1121cc9ad0ae21a96899c80fa7d3ca2b0c9bef29902 SHA512 1b5e71a31832081a6d6537c8e3084ad29e3492cb2b9042000d6ca488a93a4357bd62c1bf7d4b3023786508604d3750c09cfe54148c0663869e5f607297748a22
 MISC metadata.xml 352 BLAKE2B 65ae089f4fcda6735dce5a7772e25b57c69f38e728073213b7c3d1c96382f22cb570fea4890ba1c9086a327b7e24cf1e58514fa6363a1ca595ea9c66cc4a8289 SHA512 96bd2296b24b710cf4a4eecabf3918cc49fb70e859989074d1c07f16b48dca7e2439a4f5f00e5e2283598216fa574621cdb69c78d7a3e7ee9bca144b3955d4d6
diff --git a/dev-python/immutables/files/immutables-0.15-32bit-hash.patch b/dev-python/immutables/files/immutables-0.15-32bit-hash.patch
new file mode 100644
index 000000000000..234dfa028c08
--- /dev/null
+++ b/dev-python/immutables/files/immutables-0.15-32bit-hash.patch
@@ -0,0 +1,76 @@
+From fa355239e70411179c70b16ed4ff7113d8008dad Mon Sep 17 00:00:00 2001
+From: Elvis Pranskevichus <elvis@edgedb.com>
+Date: Wed, 4 Aug 2021 19:25:44 -0700
+Subject: [PATCH] Fix test_none_collisions on 32-bit systems (#69)
+
+There are two issues at play here:
+
+1. Python version of `map_hash` unnecessarily performs hash truncation
+   even if the hash is already 32-bit wide, which potentially converts
+   it from signed int to unsigned long.
+
+2. The `test_none_collisions` test generates a collision node with
+   hash greater than 2^32.
+
+Both of these are problematic on 32-bit systems, where `sizeof(Py_hash_t)`
+is 4, and so anything that doesn't fit into `Py_hash_t` gets bit-mangled,
+breaking the `hash(x) != x` invariance that the test relies upon.
+
+Fixes: #53
+Fixes: #50
+---
+ .github/workflows/tests.yml | 10 +++++++++-
+ immutables/map.py           |  5 ++++-
+ tests/test_none_keys.py     | 14 +++++++++-----
+ 3 files changed, 22 insertions(+), 7 deletions(-)
+
+diff --git a/immutables/map.py b/immutables/map.py
+index 2c1ffa91..0ad28588 100644
+--- a/immutables/map.py
++++ b/immutables/map.py
+@@ -19,7 +19,10 @@
+ 
+ def map_hash(o):
+     x = hash(o)
+-    return (x & 0xffffffff) ^ ((x >> 32) & 0xffffffff)
++    if sys.hash_info.width > 32:
++        return (x & 0xffffffff) ^ ((x >> 32) & 0xffffffff)
++    else:
++        return x
+ 
+ 
+ def map_mask(hash, shift):
+diff --git a/tests/test_none_keys.py b/tests/test_none_keys.py
+index 8c0bb379..26d4220b 100644
+--- a/tests/test_none_keys.py
++++ b/tests/test_none_keys.py
+@@ -1,3 +1,4 @@
++import ctypes
+ import unittest
+ 
+ from immutables.map import map_hash, map_mask, Map as PyMap
+@@ -6,16 +7,19 @@
+ 
+ none_hash = map_hash(None)
+ assert(none_hash != 1)
+-assert((none_hash >> 32) == 0)
++assert(none_hash.bit_length() <= 32)
+ 
+-not_collision = 0xffffffff & (~none_hash)
++none_hash_u = ctypes.c_size_t(none_hash).value
++not_collision = 0xffffffff & (~none_hash_u)
+ 
+ mask = 0x7ffffffff
+-none_collisions = [none_hash & (mask >> shift)
++none_collisions = [none_hash_u & (mask >> shift)
+                    for shift in reversed(range(0, 32, 5))]
+ assert(len(none_collisions) == 7)
+-none_collisions = [h | (not_collision & (mask << shift))
+-                   for shift, h in zip(range(5, 37, 5), none_collisions)]
++none_collisions = [
++    ctypes.c_ssize_t(h | (not_collision & (mask << shift))).value
++    for shift, h in zip(range(5, 37, 5), none_collisions)
++]
+ 
+ 
+ class NoneCollision(HashKey):
diff --git a/dev-python/immutables/immutables-0.15-r1.ebuild b/dev-python/immutables/immutables-0.15-r1.ebuild
new file mode 100644
index 000000000000..f9ccd8404ee2
--- /dev/null
+++ b/dev-python/immutables/immutables-0.15-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="A high-performance immutable mapping type for Python"
+HOMEPAGE="https://github.com/MagicStack/immutables"
+SRC_URI="https://github.com/MagicStack/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+
+PATCHES=(
+	# https://github.com/MagicStack/immutables/commit/fa355239e70411179c70b16ed4ff7113d8008dad
+	"${FILESDIR}"/${P}-32bit-hash.patch
+)
+
+distutils_enable_tests pytest
diff --git a/dev-python/importlib_resources/Manifest b/dev-python/importlib_resources/Manifest
index b752479553ed..056bf11f9392 100644
--- a/dev-python/importlib_resources/Manifest
+++ b/dev-python/importlib_resources/Manifest
@@ -1,9 +1,3 @@
-DIST importlib_resources-5.1.4.tar.gz 28783 BLAKE2B e88cbe34dfd9b251fc78f2aba173f3eb657462777cb66454fbc1735575c6cac6a868f5e40206fb8925aa8c7f708d72624693cd772f2335231bc5da4f417d622e SHA512 ede757b0ee4a246a3446a165f4c8e56edf326f90464f01d853b6c04042371ff1edc4e41f388c6ea6973302a183cf1c04ee21335342886747c991ba0b38c7aec3
-DIST importlib_resources-5.2.0.tar.gz 29655 BLAKE2B 570e92750351a72c95653302baee56dadc28a328a8e42af9d3346be9a256c2d43322d75622f78d87b5642ed9503c9b7f1df0b0223414847619efb2ebd5e27f5f SHA512 248de71aec8aae93f14b0c48381e7de4425f1eb0c014a4f4a49859db50e8b0a94c2e1c0a664086c74ac7fe19e526b8e3f4fc82d19d3d722df6625dc0dc708c90
-DIST importlib_resources-5.2.1.tar.gz 29622 BLAKE2B 3ac095355534c1ea35e65d685e36ea715555dbda686e1312851b0ea5ce079053429812da5ba57b00bf02981786037de2c5e91a4bc0eedf03c8463f184180c10b SHA512 e0534c6e0e1cfe8621710e58f43b0ec3e5a6fd9e1eafa58ffa09f9120e05a416b69b45639f3028f7d4d02831429bc5de3cbfa97e141474d268d6c32a5f14c1bd
 DIST importlib_resources-5.2.2.tar.gz 29651 BLAKE2B dde545a3f104c799432d7a2b6dbea6f071b82d0b6e3660384e2e0ab3c36eee8942b9f248a6139c708020c617bf0e0dce7fbbd5e06cb0bd192a0296fac6350b51 SHA512 7af9aceece4dd25ad827310fde100a4b0b5e0aee03dfeba8789db060e4decafc543784046c2e9eee95d8cab61845c50e4bb0543bb20ae7e1e480aaa80c88fa27
-EBUILD importlib_resources-5.1.4.ebuild 830 BLAKE2B 70ae32481116b16bf0abbd7d78571dd465a11f271479231e20d2e63dea8d9736a22e82874b7cb33227bb12287438816b5995528c5b79af6ce2e86db11d6a3014 SHA512 44cb6fb5648ae86d152219043c3bb595fd1410eb93662428dcbe74e4a86b52fa4018a2690bc640e9aa7898494f6c32a6811e64dfbf1a0ff54a995ff6a35833a4
-EBUILD importlib_resources-5.2.0.ebuild 834 BLAKE2B c2e04f2127b99d26a90d8eef22f6f21558f1aea0e340eb08663d17666acc73386fa8ad48af88a3b42d4a2b645342f767dbbfc7e9d1bf3db19bdd280116512e11 SHA512 e1212a34a31d74c9ae5ca56a966dda10508947147830df6dd548510e5b06d77ffb3ec1e1d5b08d355a59e636bad5f752578cb494292755697314786e2a72dc20
-EBUILD importlib_resources-5.2.1.ebuild 823 BLAKE2B cb588b06d1ec26e6820539b5270b94908a56391b3f3a0b90ba08a2fcfc649cac67c464e2d780c41230c2ef0a883b25e064abac8f2684dc397ec36039ffaf5343 SHA512 491a6f4960b9e844bc7bed6ed14d61874f3bed3851a80be06fdd97aecf92f6c72c5c42bdcda4c30ef2f40d9b46827d60ccadd6daafd5eb3f4661a9b30b4ccf0b
-EBUILD importlib_resources-5.2.2.ebuild 823 BLAKE2B cb588b06d1ec26e6820539b5270b94908a56391b3f3a0b90ba08a2fcfc649cac67c464e2d780c41230c2ef0a883b25e064abac8f2684dc397ec36039ffaf5343 SHA512 491a6f4960b9e844bc7bed6ed14d61874f3bed3851a80be06fdd97aecf92f6c72c5c42bdcda4c30ef2f40d9b46827d60ccadd6daafd5eb3f4661a9b30b4ccf0b
+EBUILD importlib_resources-5.2.2.ebuild 815 BLAKE2B f0f037c3fa00210fe040e0e56e6a8acef484668462c04efca30c5294c001ebb024d3991834fd906b270248e8f0d838f3ac9b1603691b94d8f33fed9e5a1d7f5f SHA512 e0719c05e422fce67c1d7194719fb3b6f24a0d86aa64d759016019eb17517bec0768f182100fdbc519e43a351e41cb85494d2ed3ba47985fcbff1f3701f86e5c
 MISC metadata.xml 944 BLAKE2B 7a5aa1dfb947b0115f3e22f9550471b452204daedb386e78374c5dc19b408ec52bf5887d3e645c41be9ebd16f3bd003a2ac1bb3bac539e603d44decd86b92458 SHA512 f17b2ad2e3eedd75db96765537c30d68aa28c60137b12bac3bb47307347431a19ca064a94c8e41e4a3947ab2669605d7183b5b62e55def66631d20ab903e1ea9
diff --git a/dev-python/importlib_resources/importlib_resources-5.1.4.ebuild b/dev-python/importlib_resources/importlib_resources-5.1.4.ebuild
deleted file mode 100644
index 9b672e338d95..000000000000
--- a/dev-python/importlib_resources/importlib_resources-5.1.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
-
-# This is a backport of Python 3.9's importlib.resources
-PYTHON_COMPAT=( pypy3 python3_{7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Read resources from Python packages"
-HOMEPAGE="https://github.com/python/importlib_resources"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		>=dev-python/zipp-3.1.0[${PYTHON_USEDEP}]
-	' pypy3 python3_7)
-"
-BDEPEND="
-	dev-python/toml[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm-3.4.1[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests unittest
-distutils_enable_sphinx docs dev-python/rst-linker dev-python/jaraco-packaging
diff --git a/dev-python/importlib_resources/importlib_resources-5.2.0.ebuild b/dev-python/importlib_resources/importlib_resources-5.2.0.ebuild
deleted file mode 100644
index 1fb714a82b6c..000000000000
--- a/dev-python/importlib_resources/importlib_resources-5.2.0.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
-
-# This is a backport of Python 3.9's importlib.resources
-PYTHON_COMPAT=( pypy3 python3_8 )
-
-inherit distutils-r1
-
-DESCRIPTION="Read resources from Python packages"
-HOMEPAGE="https://github.com/python/importlib_resources"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		>=dev-python/zipp-3.1.0[${PYTHON_USEDEP}]
-	' pypy3 python3_7)
-"
-BDEPEND="
-	dev-python/toml[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm-3.4.1[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests unittest
-distutils_enable_sphinx docs dev-python/rst-linker dev-python/jaraco-packaging
diff --git a/dev-python/importlib_resources/importlib_resources-5.2.1.ebuild b/dev-python/importlib_resources/importlib_resources-5.2.1.ebuild
deleted file mode 100644
index e844671db232..000000000000
--- a/dev-python/importlib_resources/importlib_resources-5.2.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# This is a backport of Python 3.9's importlib.resources
-PYTHON_COMPAT=( pypy3 python3_8 )
-inherit distutils-r1
-
-DESCRIPTION="Read resources from Python packages"
-HOMEPAGE="https://github.com/python/importlib_resources"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		>=dev-python/zipp-3.1.0[${PYTHON_USEDEP}]
-	' pypy3)
-"
-BDEPEND="
-	dev-python/toml[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm-3.4.1[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests unittest
-distutils_enable_sphinx docs dev-python/rst-linker dev-python/jaraco-packaging
diff --git a/dev-python/importlib_resources/importlib_resources-5.2.2.ebuild b/dev-python/importlib_resources/importlib_resources-5.2.2.ebuild
index e844671db232..acad426f3fd6 100644
--- a/dev-python/importlib_resources/importlib_resources-5.2.2.ebuild
+++ b/dev-python/importlib_resources/importlib_resources-5.2.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-python/intelhex/Manifest b/dev-python/intelhex/Manifest
index a6c5d7116606..2557c328ca9f 100644
--- a/dev-python/intelhex/Manifest
+++ b/dev-python/intelhex/Manifest
@@ -1,3 +1,3 @@
 DIST intelhex-2.3.0.tar.gz 44513 BLAKE2B 935fb6d5c27231c4b09f7fbe624df07adfdb9eecdd99b17cbbb4994dc74e0c7a141546a663229b0598ddd3884b8d17dd7244f770319a594387de074e7591aea8 SHA512 41b50feb7505474d74a2b6293d755d118b6dfd23a5c9b995791e7dcb7a97fc6f39d8f804b72f6372ba8e136684f9c979c7ce9ef2ff9796b6202eefc9d18f4424
-EBUILD intelhex-2.3.0.ebuild 460 BLAKE2B 32cbe1adf6469cdab1d6e933f058567219af5d46c1db062ad019535e70a53ab75eafc1a32a42907e45251bbca360d7ad067da679d9cefb0ddc351867d69b5774 SHA512 c79d33836c54a9c1ed54e4cd8f52ed8ce3ae2a464c892eaf073efffc7e3891b04dda0370902c9559de23d0c733779600f39bcfa4f69f75a76e293b058e49b1bd
+EBUILD intelhex-2.3.0.ebuild 467 BLAKE2B 6420a92abdfea42ef33d3dd516b6fe054a62e2e08567f1828b02694f52e597133d231def4ecdc83c8139df77f1752ae4b077050e80ec8db44a3c38a020018b6d SHA512 369ec24eab6c2eda1e8f91aeace1975af027031ae065d2501219a9fb4f2d3b664bb4cb619a17728c46d602c1eadc4d8e014ab37f4017b51089cf570a8de8b699
 MISC metadata.xml 367 BLAKE2B 7b356120076a1c1d5f9072d78e19d2edf77bdccc200276dd3929fa340bfc4aa6d7b3b89a29674958a8f6a886511e6c50678959b6e82f0e9ba8df95c140e498d5 SHA512 66592e014b2ab9faaaaa895e8c05d7bb96f7a8055e1cd77321e8751f32f0ff6eba141225af292256a88687679f8d5b64807f3c2e9586942039607187ca822040
diff --git a/dev-python/intelhex/intelhex-2.3.0.ebuild b/dev-python/intelhex/intelhex-2.3.0.ebuild
index 744d1d64c7fd..172f601d36f2 100644
--- a/dev-python/intelhex/intelhex-2.3.0.ebuild
+++ b/dev-python/intelhex/intelhex-2.3.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
@@ -13,6 +13,6 @@ SRC_URI="mirror://pypi/I/IntelHex/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~mips ~x86"
+KEYWORDS="amd64 ~arm ~mips ~riscv ~x86"
 
 distutils_enable_tests setup.py
diff --git a/dev-python/ipython/Manifest b/dev-python/ipython/Manifest
index b6139d00bc52..4e471fd0729d 100644
--- a/dev-python/ipython/Manifest
+++ b/dev-python/ipython/Manifest
@@ -1,7 +1,9 @@
 AUX 2.1.0-substitute-files.patch 1017 BLAKE2B 70577eb950a18345804a2a4b750bd233dc6a0b6bbdb524dfc66e0f4a7c69b0eeb2d35efb9d1845d567a11d1afa7881068b4757e42b9baf24dc01ba3026608a38 SHA512 fc4c9e12267ac5f04a2e16ad27334a093638538b8149ff380099fcbeb674a276ab9eb624a508010e37f82c05d5f7ab527a80e386b3e7b61c123ecb8effd9d542
 DIST ipython-7.24.1.tar.gz 5146561 BLAKE2B ae63d024f488f44dbd61eb9f3e14ac5b8ad801b1db195632c184c6106d4c2e6d6143c1524ae6fc5a2f6f631683b73f241c9115c439c0f97a4fe540cc232fb181 SHA512 0ea8843a1f2e7f9357ff9896f2b6da058adb5fcbbad5c3b1fc4138a085eb57034c62c0b50d82dea0e563523649ec112edd4ef0c267a914f6a7d33b44be30b977
 DIST ipython-7.25.0.tar.gz 5147224 BLAKE2B 0a2ae7cd315ba1abde18cdfcb7ed5227e5fc43b9a053f82e7db0146cbec66b0c2a1585158e60c37559523b457ab339ad42ab8fb3fccfc9e5ea7b880593de2e73 SHA512 726d3577bfb05d0c01c55d7111f8ee03fa879427de0750ee25b0a6451365728b5fb8ccf79c42585268f768680b13f628956d292f27b9e622e5dee0b4d368d22b
+DIST ipython-7.26.0.tar.gz 5147847 BLAKE2B c0cb45550387e47bba6ea67656bbb4561a2250bf9c39b4560b26a8a9e380061f79c5fa663f90df166af1fa49811cb59953fb367b2fea5f07d44ba3f9dae3de44 SHA512 142ff8ebddd61640e6ebff01d16b1310b6370643aa8cf4c7fd076872ad342949a1778c5ad74eccbafdc6b4d31a1849e096d75a28eafc555d629948db523b4776
 EBUILD ipython-7.24.1-r1.ebuild 3837 BLAKE2B 0df904cebd3696dc2468b455f22ed1b374f7d5df1c77c3554ccde6356fc8cd1c71e00991ed2c95f6a88ccc20bd3a1a6267178afc8026a942c0335fe294872782 SHA512 b7446d3f4443044d60a4cd86a61f7f9bb18df87779124c10bfbc83865ee46fee9531b792adbe0cacd800924291f89455320aa8ff49e71ed29a6be790fffbf5cd
 EBUILD ipython-7.24.1.ebuild 3838 BLAKE2B 26db4ab35ee3aef7ef4c604c2ef6de13ebc998a6b6cf37fa4793cd7984fda1e406521aa8f11cf6eda87eaf2e840672fe48e6ed08f6490cf57cb474fd3c1bd056 SHA512 d6eb9f9cb7a5b2c537c65cfec76822d24762a42bcbff0a5ebdff6e91a5908986f3732f9e8dfdf03f2cb9ad151fe3fbc615cc63e7943afa2edc1ae08f309489ea
-EBUILD ipython-7.25.0.ebuild 4169 BLAKE2B d0c773f9ed896d53ad512a02433d9d41e9c21603eee90dbb08c85772d35c8a4b1698a0d0b0ce772dbc4b95ca5e692148ea421243c3704aca0426091d8c1a046b SHA512 aba01bf68071fabf6d64ead00b121509c62ce0567a5cde3b337f0b7ab42c51278b4217c568a93da5651916e5c955e4ce655d0a00785d29ea88a69d0f91710b5c
+EBUILD ipython-7.25.0.ebuild 4168 BLAKE2B 1b6d0d041a945b051ab7dfafdc4094498700f4192430f8071c43894a25eda777b3c80d9bb1477a89b362375475815dd8f183a31006534ba9a068dc2758d713f8 SHA512 1045d7aaeba3cfcc5b2aad7a878bc0219141c970a4d761a86f453b74c283b4d0d53ed1359c408c8a7fe4dc511967f22aad1ebd04d8254d1956a803637e64383c
+EBUILD ipython-7.26.0.ebuild 4171 BLAKE2B 69e9ac23537c108dd0c07b3513c8b9324fed108c61a20ec0f908f906a73871ac285990c8baaff46e563c4cc6324f58214cf4b955dced990a8d6754c97c6397a1 SHA512 3e34d75deaf322826cd4a4681e8ee30d4fb566ff71150118df6ae3ebc489633da6dd705b005f7db6a7ba81b6acad0a8da4bf62d982a4b2a81994cb2f3f1c1ee7
 MISC metadata.xml 2882 BLAKE2B 189477b4ccde9051b61d2a4ff5134907886795f97c5201fc2bf9c012526333151931a1445b6315f286474b71af84253033cbe9bf89bffa7813bfa49a4a07ef6c SHA512 f54fef4552d09a03a8d186c45f917c091928f1de84dfbdd80f1db80912d616d509f10c588de533916d9c494f5b3ca5e6e50a6d8b8c59ea47781311ad4319442a
diff --git a/dev-python/ipython/ipython-7.25.0.ebuild b/dev-python/ipython/ipython-7.25.0.ebuild
index df8b6a4a1de4..d46c1cf5bec0 100644
--- a/dev-python/ipython/ipython-7.25.0.ebuild
+++ b/dev-python/ipython/ipython-7.25.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 ~riscv ~sparc x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
 IUSE="doc examples matplotlib notebook nbconvert qt5 +smp test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/ipython/ipython-7.26.0.ebuild b/dev-python/ipython/ipython-7.26.0.ebuild
new file mode 100644
index 000000000000..870fbdee1654
--- /dev/null
+++ b/dev-python/ipython/ipython-7.26.0.ebuild
@@ -0,0 +1,148 @@
+# 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_{8..10} )
+PYTHON_REQ_USE='readline,sqlite,threads(+)'
+
+inherit distutils-r1 optfeature virtualx
+
+DESCRIPTION="Advanced interactive shell for Python"
+HOMEPAGE="https://ipython.org/ https://github.com/ipython/ipython/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="doc examples matplotlib notebook nbconvert qt5 +smp test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/backcall[${PYTHON_USEDEP}]
+	dev-python/decorator[${PYTHON_USEDEP}]
+	>=dev-python/jedi-0.16[${PYTHON_USEDEP}]
+	>=dev-python/pexpect-4.3[${PYTHON_USEDEP}]
+	dev-python/pickleshare[${PYTHON_USEDEP}]
+	>=dev-python/prompt_toolkit-2[${PYTHON_USEDEP}]
+	<dev-python/prompt_toolkit-3.1[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/traitlets[${PYTHON_USEDEP}]
+	matplotlib? (
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		dev-python/matplotlib-inline[${PYTHON_USEDEP}]
+	)
+"
+
+BDEPEND="
+	test? (
+		app-text/dvipng[truetype]
+		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		dev-python/matplotlib-inline[${PYTHON_USEDEP}]
+		dev-python/nbformat[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		>=dev-python/numpy-1.17[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/testpath[${PYTHON_USEDEP}]
+	)
+	doc? (
+		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-2[${PYTHON_USEDEP}]
+		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+RDEPEND+="
+	nbconvert? (
+		dev-python/nbconvert[${PYTHON_USEDEP}]
+	)"
+PDEPEND="
+	notebook? (
+		dev-python/notebook[${PYTHON_USEDEP}]
+		dev-python/ipywidgets[${PYTHON_USEDEP}]
+		dev-python/widgetsnbextension[${PYTHON_USEDEP}]
+	)
+	qt5? ( dev-python/qtconsole[${PYTHON_USEDEP}] )
+	smp? (
+		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
+		>=dev-python/ipyparallel-6.2.3[${PYTHON_USEDEP}]
+	)"
+
+PATCHES=( "${FILESDIR}"/2.1.0-substitute-files.patch )
+
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_prepare_all() {
+	# Remove out of date insource files
+	rm IPython/extensions/cythonmagic.py || die
+	rm IPython/extensions/rmagic.py || die
+
+	# Prevent un-needed download during build
+	if use doc; then
+		sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/source/conf.py || die
+	fi
+
+	# Rename the test directory to reduce sys.path pollution
+	# https://github.com/ipython/ipython/issues/12892
+	mv IPython/extensions/{,ipython_}tests || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		emake -C docs html_noapi
+		HTML_DOCS=( docs/build/html/. )
+	fi
+}
+
+python_test() {
+	local deselect=()
+	[[ ${EPYTHON} == python3.10 ]] && deselect+=(
+		# fails due to changed argparse output
+		IPython/core/tests/test_magic_arguments.py::test_magic_arguments
+		# py3.10 API incompat, doesn't look important
+		IPython/lib/tests/test_pretty.py::test_pprint_heap_allocated_type
+	)
+	virtx epytest ${deselect[@]/#/--deselect }
+}
+
+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/isodate/Manifest b/dev-python/isodate/Manifest
index c9d218000ebc..99d1896cd4b3 100644
--- a/dev-python/isodate/Manifest
+++ b/dev-python/isodate/Manifest
@@ -1,4 +1,4 @@
 AUX isodate-0.6.0-py310.patch 3387 BLAKE2B 669a1eb70890aa2be676be24489f4434dcf9b8f56cda20bef91913e8d648ede59b78b5e6697cf5d56461db43e9a0df14d76c2210ee0f434d0e7303a9a7eeee18 SHA512 a9c9662f95c60895eef90278d8f628cc06f56d6ed24780e03b7e45d13acf677dce4114e450876bc47fd47c637c933f48a47eb4bbb2b628ec1da7e4063059b694
 DIST isodate-0.6.0.tar.gz 28480 BLAKE2B a7499c736b67193ac73026df7a7c9d9bd5b743a5d556fe5e8ba0a62e8a5238d64afb88547a27e4bcbe706483e3e1e97eecd437e4e1c730c20652cff5926502fc SHA512 e977748e13ee2c94ab47bfc47113d152280e9acff6f70e773de73717392148dd2c111a7db2d9fa3679d37936c6ed9a23dc526cb00bd601df45459b6a244f9f7d
 EBUILD isodate-0.6.0-r2.ebuild 629 BLAKE2B 74460c2091f1e6634461cae46cbbf576680a6d9d0d172fe67cfdaf7721641b7d6cd306d10d274f6d810a8e8b3092aed7d019e0f4f591b884baf60174da295c47 SHA512 894784c520c8c23b6b524feb89938800b2b6459fd5a752c85dd6339edd9902462d9f7a2189b12cefaf1b66ca2b31fbe09bf3b5a8b70a80d98c6b457671b5e2c4
-MISC metadata.xml 1120 BLAKE2B 9889dda56ccb8afebcf88184839aef3527090675f9a51444185c2d22f2eb89eae009b3138edb3a03c3d024b7a6d0ec586bad08480f869a030303a736c3a00dab SHA512 c9213c9a90a27f29d51584edc4537055a82962f9153cbd68fcf8868409be2af625f754c1b8c9e1f5d00ddf6696809a118fa33a742f5e241ba6a4141937f60dce
+MISC metadata.xml 1175 BLAKE2B c5c2b7097b9fb22baa38deca60688f3ea7ed425f4fd616b45d8ecead521b2050f01292bfb77d8eab2def7992feef85d9960319b4b266c835e267def63bb9d020 SHA512 894c2ada19b76d1f76c31160055a5f912994e3c001d887728eda305126fa8351ba914a3c6d4055f8eed64ec54ccce4544292727da5a45bef494e8086068fb056
diff --git a/dev-python/isodate/metadata.xml b/dev-python/isodate/metadata.xml
index 40a9ac204fa7..a93f63226d29 100644
--- a/dev-python/isodate/metadata.xml
+++ b/dev-python/isodate/metadata.xml
@@ -20,5 +20,6 @@
   </longdescription>
   <upstream>
     <remote-id type="pypi">isodate</remote-id>
+    <remote-id type="github">gweis/isodate</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/isort/Manifest b/dev-python/isort/Manifest
index 7e9ac227c771..0926715ab61f 100644
--- a/dev-python/isort/Manifest
+++ b/dev-python/isort/Manifest
@@ -1,9 +1,5 @@
-DIST isort-5.8.0.tar.gz 167927 BLAKE2B 59b9ee4e63e231026e25833ef8bc4a782ad7b30622d1f6b61fe177fbf0f8663ca953f68cf168abb407d3cb90fe98e29540ec3a8933a5df2ca7ba3e938ba4282f SHA512 ffeee045b5328fa410673464b2ca22d9cd1ba8dd34eff9a430b93e9ce72033100e32e3373308438bcb82b8eb7deea1f2087091e111b1204e35791958ca6944c4
-DIST isort-5.9.1.gh.tar.gz 727733 BLAKE2B dc207ac24b586eb5c4c2bd546c0f2ab336c901563e3f2c92d917cf81bc94634c23a20dfe787e65c41fd3aec835d3fdc96721ed579c282b4cb0719afa7f50f9a3 SHA512 e48e08835a71271ab01e52e2c44ecef475aa270ab7242aff4f9ce82bcd5bc8354e2d8a717ccf995172102809198f6dfc9786d8c64e33afc9ae9a4e981ac51feb
 DIST isort-5.9.2.gh.tar.gz 728644 BLAKE2B 37fa16884e987569bceabf71d5d51b5dcf3c26a28df22b07eb5adb8f571901f5f2d0b258c09dfe720a0579836e90ffa46b1d087c536532841ff48848dd71f9b0 SHA512 286536ae5e7328085618ba37d8809b6cd46595b269755c20da0e8f5f866b810663909ed557f16d76c3d5e89b85393264aad7b1d7093cbdb33e808118a3fc7d96
 DIST isort-5.9.3.gh.tar.gz 729342 BLAKE2B f40f046c5706ea4fd6daf7dc8eaccaca35e7de3e77bc17fa73681d12c42f7d2a3b19a909384e6b2e2486679a9f9895c2fa944faace4bbc3d0cfd0ec7aff85edd SHA512 96aa9c8bb58c95a41f562d3f0e1cf6e9c0c4158486bca24dfe2293fc86c7c6b74e3e6a84ed755d965b692b1f06d98cdc8ed69080775f8acd9186ac3ae6401570
-EBUILD isort-5.8.0.ebuild 1609 BLAKE2B c248dd41fd9e90985afedf5ef572abfa0fa46775af0162881518aeb1f9b999334063aeab7f2364eabe10108169833e1037bb25e084c61006c3fb866f664d3d3e SHA512 3cce76276c44cf58ad9a6301618fe43f5765df0fb3961634841171ca09764fc4066a1462b2dd46dbab8d54f77ff43cbf893980755a43894ac149175c92e52a40
-EBUILD isort-5.9.1.ebuild 1357 BLAKE2B bd08b427294a1bb15ed5171345b7310ae5570605664733a31c37e8c75922885e910b43432ad254e851934d8e9bb3dc8ffc43108540736c256101d65d4af34904 SHA512 52fc6da287e78bfbc6e952b7a853f753706935b1ba9ddc9cd31724abd8d1146d94d641edafb0c45c2c250217acfb5cc2a487b7f50185f968ff67e8c2751e3e7b
-EBUILD isort-5.9.2.ebuild 1357 BLAKE2B 053b4a6ebbfb850249dc9598f47f11bcc947f61f26a14d234b9d0e3b5b22c53adc9e440ba0eef9974621ed850e1d7d48ac3cbd4b7d9bd201f52414aba26e2e4d SHA512 6bccec33f9b891a2125df3bc6144664581e20da7b5a7353a07c5347b3803d80c7b43ef700fb2608923e47fb37a40f70dbe34ba57605902500e951a42d8191d9e
+EBUILD isort-5.9.2.ebuild 1356 BLAKE2B ad23c12a74419ed0d6d0e886213bf976fb825c21cb063b3959e8e1d1b31af7820f9e743ff4629c5a54689ecf070ca1adf910598ca08e43b0ef410944fe7cc111 SHA512 d80ef7ded1a89f1b6f7fe12ee223e5dd287c2d7470819fb65d1bafaebdba9b9ee0fbacc64bb3a397a691f1ce69233a4820e3a9dce884f8fbf9107d4f54b45322
 EBUILD isort-5.9.3.ebuild 1363 BLAKE2B b5c7ff70356755c517a7870c8a4b195db2d757560a1dd345c209e4b26cea9b2d662a4e7fba5fc7e1d813d90f3cb57df0595f8728697cd6193064d969b0e502e3 SHA512 e0389431685638814eb54c7366d1cd1cfac8ff6764a3e82466dc51271988fd31933c7e69dcd8bd0971021a7e5392f198851a8dc5dc33f386177383954b14f3ed
 MISC metadata.xml 573 BLAKE2B 2c70619aaf4f917f377e17b73d59656d6e0254bb0aa6c4a01159bd46b5e2e24e22b8ca04ab88ad71c9d4979ea3b484f5efec05e6ce3b40093e010108ef2a80d8 SHA512 4c06a138d3d06e1f9dbf570e6c59819de182d8453c46a5dbdabcfed424501aeba89fed659d19a6e329c33c0307790ef5c1b81d2ee5d7475c102c2bd689255259
diff --git a/dev-python/isort/isort-5.8.0.ebuild b/dev-python/isort/isort-5.8.0.ebuild
deleted file mode 100644
index 1b6d1270e71c..000000000000
--- a/dev-python/isort/isort-5.8.0.ebuild
+++ /dev/null
@@ -1,51 +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="A python utility/library to sort imports"
-HOMEPAGE="https://pypi.org/project/isort/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-BDEPEND="
-	test? (
-		dev-python/black[${PYTHON_USEDEP}]
-		dev-python/colorama[${PYTHON_USEDEP}]
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/pylama[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	# Some tests run the "isort" command
-	distutils_install_for_testing
-
-	local skipped_tests=(
-		# Fails without -s, run it separately to avoid unnecessary output
-		tests/unit/test_importable.py
-		# Excluded from upstream's test script
-		tests/unit/test_deprecated_finders.py
-		# Require "example_isort_formatting_plugin", we're not going
-		# to add an example package just to run a few tests
-		tests/unit/test_literal.py::test_value_assignment_list
-		tests/unit/test_ticketed_features.py::test_isort_supports_formatting_plugins_issue_1353
-		tests/unit/test_ticketed_features.py::test_isort_literals_issue_1358
-		# Same here: requires "example_shared_isort_profile"
-		tests/unit/test_ticketed_features.py::test_isort_supports_shared_profiles_issue_970
-	)
-	epytest -s tests/unit/test_importable.py
-	epytest tests/unit ${skipped_tests[@]/#/--deselect }
-}
diff --git a/dev-python/isort/isort-5.9.1.ebuild b/dev-python/isort/isort-5.9.1.ebuild
deleted file mode 100644
index 146d772ec4c1..000000000000
--- a/dev-python/isort/isort-5.9.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-PYTHON_COMPAT=( python3_{8..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="A python utility/library to sort imports"
-HOMEPAGE="https://pypi.org/project/isort/"
-SRC_URI="
-	https://github.com/PyCQA/isort/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-RDEPEND="
-	dev-python/toml[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/black[${PYTHON_USEDEP}]
-		dev-python/colorama[${PYTHON_USEDEP}]
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/natsort[${PYTHON_USEDEP}]
-		dev-python/pylama[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unbundle toml
-	sed -i -e 's:from ._vendored ::' isort/settings.py || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# Some tests run the "isort" command
-	distutils_install_for_testing
-	# Install necessary plugins
-	local p
-	for p in example*/; do
-		pushd "${p}" >/dev/null || die
-		distutils_install_for_testing
-		popd >/dev/null || die
-	done
-
-	local deselect=(
-		# Excluded from upstream's test script
-		tests/unit/test_deprecated_finders.py
-	)
-	epytest tests/unit ${deselect[@]/#/--deselect }
-}
diff --git a/dev-python/isort/isort-5.9.2.ebuild b/dev-python/isort/isort-5.9.2.ebuild
index 8ed12e811b21..3a8b75254a2b 100644
--- a/dev-python/isort/isort-5.9.2.ebuild
+++ b/dev-python/isort/isort-5.9.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86"
 
 RDEPEND="
 	dev-python/toml[${PYTHON_USEDEP}]"
diff --git a/dev-python/jedi/Manifest b/dev-python/jedi/Manifest
index 07638a5614b0..1e07ce881c62 100644
--- a/dev-python/jedi/Manifest
+++ b/dev-python/jedi/Manifest
@@ -3,5 +3,5 @@ DIST jedi-0.17.2.tar.gz 474372 BLAKE2B cd0bf217202e4413a7d4f1d4095fb22ad5c3de557
 DIST jedi-0.18.0.tar.gz 462786 BLAKE2B 35021ed1566fffc24056060f16b8a0aa6f8b6e382f716ff5978711fd66340e96f4e0b628463aadead5605db32cfc20df06a6c53a9b435658f1c455a6212da6e5 SHA512 fcee84496285a0b0b1cf1f3827593d0603bd87c84baf725cc7bdbf594979f49729b18a29b7465848413bdd3a5670fcc41187dd3eadbd9750d77788c5a9408dbf
 DIST typeshed-jedi_v0.16.0.tar.gz 497407 BLAKE2B d322d70d3c46d1abcedddbd10aed5c6f213698f4e9f9aec1b4bd7e7186ab7ce384ec6a95d6adc46c7459e3bbb748d6ff432115cae744a315aed60972d2390eee SHA512 1551082938b52717f90e28ffd25e838ab04798ea86ea719fa35975a9de006bcc063a00cc8c8babd994990cdff694d48490f4d8c898c322666450d7ef3be8688a
 EBUILD jedi-0.17.2-r1.ebuild 2080 BLAKE2B d27a1db8dcb1f76a86f25f4023b19047a6931e2d10ecc08e68b35cdbe5cebb1916b26cae097ddbfc2c8dc179a4e5eb793ffbd4906f83446d1f59a842d809b40a SHA512 c661c2af2a2c07f2dbf8e4cc6b0ccddca91e028f7771f4c2059532d4cc75ff2f4d4f879b86454e43a2132e28df8dd190bc901f6a2775df598654cfec7f2d4dae
-EBUILD jedi-0.18.0.ebuild 2113 BLAKE2B 93b22952f6e75c26cbb55bd77891e543e7c095e8bd0486ff2515df8d92db1b418c3001765877e203e5f2f18703536789b33dc9c86d00223e9eb578e17493a9d7 SHA512 9db1e83208d14c770f6083ace7a6ba282347bc7a2940c5a880281af983682d3c63b5ecff1103c33e9cba47f85031d1ed069d8f986eba2034fdeb6db5e9b44bf0
+EBUILD jedi-0.18.0.ebuild 2119 BLAKE2B 15011e91ae4132ed0b82b4a2e1202c1e7051b58030c31586f20c5a2d7893baa0212350cc2f88873fdeb75fd698f38511f95db2458cde1e16c8c540be2e65d2a2 SHA512 d8611876cd968a002ae15e513273f48f32ec9605e9667f7b2234a1d3e18968c42331893efe56413ea970320c099d4755f5cde86fe17d049dbdb3e8a1346308be
 MISC metadata.xml 400 BLAKE2B 7ae1b5a2edac295d8d1cce978fd3c6470eacd06b890c960c33c58050a5bebdfd091cbcf48190e2f6b3681341db155f36e9492f41a4c5d88b2f1ebaacd92ca15b SHA512 f3bd9785ed160ea3335a03139abf10e68d10d2431b4b6f56da12c9a074954ad70972e953b2d283646009af180b9a50e59adffd455adb2937905812a98146360c
diff --git a/dev-python/jedi/jedi-0.18.0.ebuild b/dev-python/jedi/jedi-0.18.0.ebuild
index 95127b3a78cd..b3a377fe8ad3 100644
--- a/dev-python/jedi/jedi-0.18.0.ebuild
+++ b/dev-python/jedi/jedi-0.18.0.ebuild
@@ -23,7 +23,7 @@ SRC_URI="
 LICENSE="MIT
 	test? ( Apache-2.0 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND="=dev-python/parso-0.8*[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/jeepney/Manifest b/dev-python/jeepney/Manifest
index 65046af44fb9..2c5b6820bc79 100644
--- a/dev-python/jeepney/Manifest
+++ b/dev-python/jeepney/Manifest
@@ -1,5 +1,7 @@
 DIST jeepney-0.6.0.tar.gz 49513 BLAKE2B e5f9b5104cf07dbcd2d40c2d22b690dfd56c456ab56daf44f4abee83f0bfe7e1dfbad797348044d51e3dc20fbc6ce68bf8df54f9c1e46d7a86ceb22d3ab30f8d SHA512 140be9dd28ed853d2d41b6a8bbeb2f22c0270ce7bf33b943ec2ac010db17d4f06e253fa8637fbbb3044fe9ffdbfa1e15f0c663eb44bdd538f8c47c2e7dab3ca5
 DIST jeepney-0.7.0.tar.gz 61236 BLAKE2B ec477ed0d96d7d82a256c7f62900eff0282ebec4545e30807fd62cffb419ed763fd8042bdd4d72c6cf43ac09d24af9cd86797b1baec61ad5965e51b3d669175d SHA512 b1fac480da0d8798b28eae30cb22ee97d4f73a11922f7b1bce86eebf938c2980414c2d026ef5a1cdcd95813724873700d348b04ba337aaac0706b2c8b38ea6c2
+DIST jeepney-0.7.1.tar.gz 61833 BLAKE2B 626d4c921d0548ea898197ac5459f20b4c73fd52d3579c5b74f257158c82803011655c1d418d7d10afe8ba803100530bc08dbcce41e12727888de5be5995adb3 SHA512 f0af5a18a669f1a6322925201cad83ee01bc5a1b91577565042fd8a18b506a3650ff67b0ba333c8fb3b179f43ef243d16b07a9a1f7a7e5baec825dda0e6b0571
 EBUILD jeepney-0.6.0.ebuild 1038 BLAKE2B 2c7df2b5380f85a8f19645135db863eac3038e58a031065d2a5f491fd5327651a774e37e7e434f1846bbe49abeeec90229c6874081b6c39a5116b08860f4b1b3 SHA512 f6143bbffb239ff02ee46ef558ae5296b98abb3e0a8387abf49a8776d7acf131ec348ba98ae63bfc83b9bb0cc454e0637eeb8e5bd435533edb9277fbf87de9f7
 EBUILD jeepney-0.7.0.ebuild 1229 BLAKE2B e9f888c7e6ccbd40721c32c5da71726a2a17a3ac60f8737a12dc1b0ff6e71796eab0bf4d79796efe2f1634916206904d7a721fbc1efb8c45530f114758bb45a7 SHA512 55bea6c4be689fa66cda7ad9ebaff5a7d8dfb86232305dceafa8f728c3c7aa22d6234deaa0320e97785dfd2728cbc4b8d329696009c617cf05db348a21a74583
+EBUILD jeepney-0.7.1.ebuild 1274 BLAKE2B fa2ad7db40ff4c3b86623c60cd66429f06007c15d68538911b8873f7173440b2c2c9deee756e5a12c27c37351fecb29477372bb0ee6317b735fe33cb12aee6d7 SHA512 63b2ab553d1dc56ff06f3ca04329b8908a186acfed2e6b55b92e949d28146e3d052c579a62472f7f073610bf43e415d7cd7a214b9283a59836d41717f1e15840
 MISC metadata.xml 456 BLAKE2B e597aacc0128f9cd06d21a03ca156343861a56adba6449e12127025265c6019308ba2e8f360d7a4f43bbca3f95a78789d964bdd3e5bd5fea7d21d7b8eb413c74 SHA512 6cb3b5fae02190cce838221a1d5269bc005f985d5935f77880b066999340818338a747a9e24aa5d39ab71f69c842747068e3b573dcf475c7d552af1bc9af031b
diff --git a/dev-python/jeepney/jeepney-0.7.1.ebuild b/dev-python/jeepney/jeepney-0.7.1.ebuild
new file mode 100644
index 000000000000..e68d7065e154
--- /dev/null
+++ b/dev-python/jeepney/jeepney-0.7.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Low-level, pure Python DBus protocol wrapper"
+HOMEPAGE="https://gitlab.com/takluyver/jeepney"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="examples"
+
+BDEPEND="
+	test? (
+		dev-python/async_timeout[${PYTHON_USEDEP}]
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/testpath[${PYTHON_USEDEP}]
+		sys-apps/dbus
+		$(python_gen_cond_dep '
+			dev-python/pytest-trio[${PYTHON_USEDEP}]
+			dev-python/trio[${PYTHON_USEDEP}]
+		' python3_{8..9})
+	)
+"
+
+distutils_enable_tests pytest
+
+distutils_enable_sphinx docs \
+	dev-python/sphinx_rtd_theme
+
+python_test() {
+	local ignore=()
+	# keep in sync with python_gen_cond_dep!
+	if ! has "${EPYTHON}" python3.{8..9}; then
+		ignore+=( jeepney/io/tests/test_trio.py )
+	fi
+
+	dbus-run-session pytest -vv -ra -l ${ignore[@]/#/--ignore } ||
+		die "tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	if use examples; then
+		docompress -x "/usr/share/doc/${PF}/examples"
+		dodoc -r examples
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/jellyfish/Manifest b/dev-python/jellyfish/Manifest
index 5c8b8f3fa88e..35a455fb49a9 100644
--- a/dev-python/jellyfish/Manifest
+++ b/dev-python/jellyfish/Manifest
@@ -1,3 +1,5 @@
 DIST jellyfish-0.8.2.tar.gz 134200 BLAKE2B f765047414e4c1de4588d51598583c49767dde07fe2b94cdb40674bf90f4af8b5b3fa59d0ddf1e0bae3793e531426ccc941dde3fbdaa25839dd13da8b19386c4 SHA512 c4cc2b22df37497ed1ee595f03ec10b7ffe6b8441accaea77ca1b6018df07d23bbe9f2ed72d0c3e06792d6e1229b7e56f77f1758396d83120236d018ce2328da
+DIST jellyfish-0.8.4.tar.gz 137001 BLAKE2B 55ffa7b7b931bf5bd0a2bee9a378fac10212d757d0e28492aac989a836c14106d37591a63a048db16b22c11e3964ad08325fe759e9ac2841722ac491a075feea SHA512 301fed3d4ba7228738b85310272970d2c666dd120a92a61b9870918ca3778bfead2b83437aced7933459f60079efcde863425a4a86077e8a0182db7d6d6c92cf
 EBUILD jellyfish-0.8.2.ebuild 691 BLAKE2B cf021985defb5d28ffe5426114e40b9e7adb94c6811ee86fd02adf46ca244e26259a11d5ec24ffc4b84decbf3b6093efb62c81a77f23252930a81eedd7733c75 SHA512 64f9f210ddc1898bdc4c28e454426ef55a3b2aa29504583990f4e75bfcdf1de8da92ce0fd20eeb5f29535a5e84bfe663075032ed125b68efc2306494c6042fe2
+EBUILD jellyfish-0.8.4.ebuild 693 BLAKE2B 697b1970d46a46e328ff5c5f8151d917bc3c4419e0f2dc6a8cfe79a33b58205bfd886f6f94e6011c37d61114ea8b399c2e012572b841d0467338e7be771b256d SHA512 82b5ed0dbf454b537fff0ef268393c844faa03f4d94a035223570fa141ba683ccb2340de9a4319db9d172b9c40266388867b99a20e1fc850c29a0a5e14bced4d
 MISC metadata.xml 503 BLAKE2B 5233c8c8b58779463d926f276a3fac04e25f70ed8992e75aaa4963a259de9d525b3dd4f040e0fd2aca83efc5bbbce73b7eb86d5b59cacb81f9aa1f82c7949850 SHA512 47e552f516be95767e3dfe9b5b43ea36b02369cc426cebc25d66ed6c3e449c1041d6c79351669d80ac13d19a45f699a719a80130073d02d14459c4630c87736a
diff --git a/dev-python/jellyfish/jellyfish-0.8.4.ebuild b/dev-python/jellyfish/jellyfish-0.8.4.ebuild
new file mode 100644
index 000000000000..837b3652da80
--- /dev/null
+++ b/dev-python/jellyfish/jellyfish-0.8.4.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Python module for doing approximate and phonetic matching of strings"
+HOMEPAGE="https://github.com/jamesturk/jellyfish https://pypi.org/project/jellyfish/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	test? (
+		dev-python/unicodecsv[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs --no-autodoc
+distutils_enable_tests pytest
+
+python_test() {
+	cp -r testdata "${BUILD_DIR}" || die
+	cd "${BUILD_DIR}" || die
+	epytest lib/jellyfish/test.py
+}
diff --git a/dev-python/joblib/Manifest b/dev-python/joblib/Manifest
index a9096e967707..3dc18964110d 100644
--- a/dev-python/joblib/Manifest
+++ b/dev-python/joblib/Manifest
@@ -1,3 +1,3 @@
 DIST joblib-1.0.1.tar.gz 347176 BLAKE2B 046ec87d446eb3075d867e41bb87039062531294d9b6c0be8d3cb42ccdf47dd58f1bc46a599ade64fc210e93fcad6e3007af82dbc670e1eaec1c67b425f87712 SHA512 39b1579efad44d6e51db501dbaa8378e7c8a423822ee3264a8bed44b720f59e6d08993a00f995c45beada3dd59b8e4101c47e587c9bf72027b01723838b533ab
-EBUILD joblib-1.0.1.ebuild 1164 BLAKE2B 7d15901db467c24fadd5f2fa9a7b39b467da5a3301a2833049fa8626709631f3b9e35a7bfd08343c3cda3e4b5bc950871a45bf055e730de0f6ff5ccea9b3c92e SHA512 359e2fb992cd3136904a39c4821e7839c535ab78b4025f6b067084cb1d8cf0219214fa042415088f7bfb4fabc8bfa9f6f9d4022bc3d78ad45bb7bab1ab3b58b9
+EBUILD joblib-1.0.1.ebuild 1166 BLAKE2B 500bebb4b54564688c510f116f316e82db5b8e4cd0b83bbe70e9e736ada02d64b97eca2ccb2c3edaf9763204489951aaa81c9cf484b9593ffa01323fff469661 SHA512 a8bd9cd2c11699172b565066dd75a632bf78fba868a748d0a9cd67a08a7df0e8b00031293897c6f2474db9cebd2d21144769aea50d3e774c0151014a982b5b94
 MISC metadata.xml 857 BLAKE2B 54960e79cd772ee043d09577668c6197ddf0c2b6bbd4cc2bddcbf60ec25fdc9ee3c0a89611ec10d20acac23d69d3a0d4fef9bf225406fb5ba845c3fb6970746e SHA512 ba9709dae22587a7d2c17ff432d05c50f68bc51bf2f7b4e96fec9165304d76862889beafee4feb3a7dfbb5a54e9561ff4c804232a3c9a7dd7384bbd3467688f9
diff --git a/dev-python/joblib/joblib-1.0.1.ebuild b/dev-python/joblib/joblib-1.0.1.ebuild
index 6066ffdcf33f..44167c48f02a 100644
--- a/dev-python/joblib/joblib-1.0.1.ebuild
+++ b/dev-python/joblib/joblib-1.0.1.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/js2py/Manifest b/dev-python/js2py/Manifest
index 057f6b207f3d..042c892ff458 100644
--- a/dev-python/js2py/Manifest
+++ b/dev-python/js2py/Manifest
@@ -1,5 +1,5 @@
 DIST Js2Py-0.70_p20210218.tar.gz 1969615 BLAKE2B 4702b2e771bfd2a5158a3539c33932335816c74f9dbd132679036aa2b7e53796764dd852e92d72a35ecc31efa34b849776c45d8c81e80f85f59308edf0996f00 SHA512 757c895bc0ba933020336a70473ec4455cb93c17040a39f17d645782011ea72273291448f3448ffd34658b48ada45b77facf3d326133f1c0d63e2e26e2cd7f30
 DIST Js2Py-0.71.tar.gz 1969618 BLAKE2B 293a830f4188e66927b23900e8c376bf1a4bfdfa8726e33aa5aa75dcdf735cde89ce463741c142fc7e487ae89c7c11421e459d2fdd09ba88edfe953e4e087e42 SHA512 75bae61619d4766117f3c163d36427f3019825ecb08b745aee7c3b6f2d33a4ea8507ca180b63c0a8e575a5f9491eb64d6963acbb912edc7b934a676b38814597
 EBUILD js2py-0.70_p20210218.ebuild 1174 BLAKE2B 0c29b1ffa0f9807e5ec7b14779aa7b728e6cbb6d7209a38027324c0cc138e6be53dccc0d72c9e1c2404e5ac033a014b62eadb7e0822f46217b1f5076281d91f9 SHA512 c6edd54f7bf75c81610fd20b749535f9a67801ac68f76e411a88c0a48f63acb91e6c694d2f8d8b71b91dc3dd4fd51bd7fd85646d685d22baef9a270ed5394d43
-EBUILD js2py-0.71.ebuild 1122 BLAKE2B cf06099ea27d986bf47bd277e0cf12a057f22ff9c0b82e62d421f4c01f9cc25623053177e533519ac447560b163fbf5ced22320d063136d6b205c8567bcec9e5 SHA512 cb334c6bfb1c4dbc701fab5345d37c891458a4b90a0299271191be692d1eda6bff5efb796c2c96d02f15e1c89b215687dc925a60487a9525e327f9b6edbc770c
+EBUILD js2py-0.71.ebuild 1120 BLAKE2B 687bd48fb7be674ccd747d9a60d2fa0a0fac8eb236fd76ae088b142c7c38240c0222f9d0f81bf8032ff9be9cb0f60cf676d500fca89e891583681d42d32b430c SHA512 bd692acdd2d0b919508687e80c837192b943d7d177d3f16620be324c5aeb57a3a5012f3018899e930e09e016e2048241d206191263c0a6e9e9cd243529f441a4
 MISC metadata.xml 572 BLAKE2B e7e7fe7278ecadeedc310b4adbb1cc21c7c6a5e6cb522c31695196561e30f7bbfa0fc1e29315f931d3068ef6ede674e153e81207a7e5002d9adbe68c88e2e904 SHA512 c914912aac18c8984d4eb8ceed3d27a175fe89def2ba9bf778c3e3d8c729ad030125ea8f1096487b4c35cb9c1aa1f28a3d7a168b2c8992f6d58fb477bb9ca51c
diff --git a/dev-python/js2py/js2py-0.71.ebuild b/dev-python/js2py/js2py-0.71.ebuild
index ce887d3f5ace..1c6da35eb5a3 100644
--- a/dev-python/js2py/js2py-0.71.ebuild
+++ b/dev-python/js2py/js2py-0.71.ebuild
@@ -22,7 +22,7 @@ SRC_URI="https://github.com/PiotrDabkowski/${MY_PN}/archive/${MY_COMMIT}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 
 RDEPEND="
 	>=dev-python/pyjsparser-2.5.1[${PYTHON_USEDEP}]
diff --git a/dev-python/jwcrypto/Manifest b/dev-python/jwcrypto/Manifest
index d7303d9590bb..451e67020dea 100644
--- a/dev-python/jwcrypto/Manifest
+++ b/dev-python/jwcrypto/Manifest
@@ -1,3 +1,5 @@
 DIST jwcrypto-0.9.1.tar.gz 86363 BLAKE2B d5920b9471870855bc131c171dc5515cc23fb9b94c38b33ce4894bcbe6fb5d0fa87e8b88f6470b8d1c1a1bc158d0dd09f51ace50baab03c8a8df59adc6e7e11d SHA512 245221d5e570918c1db9abdad72a0b03fb3fbdbb4db46ece441cbd75d43246b1b35bfd75e20718b8fa125bcaa85088cd776a7c204dd68e51e63818ae438848eb
+DIST jwcrypto-1.0.0.tar.gz 87000 BLAKE2B 6e85d52c26447b07c3d06387ac9e3b7adf585d5dc320c633e80ca2bc1e327f01ac95cec9a0fe2b92f7f8ed7f5650d5ad1a95de500d328b33763d604aaba1bd62 SHA512 12d270219d289041098f875f5b2b0773ffbf9044996a6189b827cafbf3e5dccfc103915275b1a11dce2d50e3510510eea476b024d19cf97fd7c66c25de5b3dbf
 EBUILD jwcrypto-0.9.1.ebuild 819 BLAKE2B e13a6aad1792fd51ffddb6eb4238c2502fdfe8fce1b722cfcfabd4012c3cc122d3757f4bb8e54477142fa2e021908bfdb2a18e44e2403f305a7ec7e1fa22ce84 SHA512 cd8726a1e8950ebc74358c95cc46a4d0b6324e9a38a1758b8afd2da59396c34bb39efea8b0d867e2cde8e58b6fd55665df7feea613df06748f98395927657d42
+EBUILD jwcrypto-1.0.0.ebuild 786 BLAKE2B 520fb7a84c784edb9100c0363ae1cf0c106a670014b7450005982e9d8df70ab6319c8eae5a67c47c0232282c72ed07ebc3f212e7f9ccfc1dcd9e9492c4dc69d3 SHA512 93b4c204ea6e788230ef10f811b752f2542218df6513b21b7dbfadd9cc285acbe6f3ef00a5d9b0f04c60696af6977d16f6bb1ac994e0fcba535ff76cd10e7dda
 MISC metadata.xml 368 BLAKE2B d5656c56c5a851d766c1e6588409d4864688de0c3acd4f28fb00ce22a106e5cf7f3ca8d54a4e448250cfafd04f4a0acced22db2a99879da67eb80c03f141ca74 SHA512 fe3492bfd6ba81846e7ba185468617d19f06eb813d55e87ac8ac9d5c7997d069e2b0f90dbd11ec5508b1da1ddd1d6a291fbd524f0c9dcdbdc8447ca639b78735
diff --git a/dev-python/jwcrypto/jwcrypto-1.0.0.ebuild b/dev-python/jwcrypto/jwcrypto-1.0.0.ebuild
new file mode 100644
index 000000000000..59761ac07cbe
--- /dev/null
+++ b/dev-python/jwcrypto/jwcrypto-1.0.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Implements JWK,JWS,JWE specifications using python-cryptography"
+
+HOMEPAGE="https://github.com/latchset/jwcrypto"
+SRC_URI="
+	https://github.com/latchset/jwcrypto/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/cryptography-2.3[${PYTHON_USEDEP}]
+	dev-python/deprecated[${PYTHON_USEDEP}]"
+
+distutils_enable_sphinx docs/source
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# Do not install doc in non-standard paths
+	sed -i "\|data_files = \[('share/doc/jwcrypto|d" setup.py || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/kafka-python/Manifest b/dev-python/kafka-python/Manifest
index 448e20997893..1115cb6c7233 100644
--- a/dev-python/kafka-python/Manifest
+++ b/dev-python/kafka-python/Manifest
@@ -1,3 +1,5 @@
 DIST kafka-python-1.4.7.tar.gz 352844 BLAKE2B 812c185bf19f3398c358722a44feb572693556ec671d07f2d74d63e45473f5b6d35390cc0fa2c95b8c42a15b635237ffa3c3829adde1f60a7611ce4fdf06f587 SHA512 5bbf9f998fba12e8e7c67a48e82b04e745f1ac528684e91b7454e825656e4a68b8c369984308cff575241b7f808f52f16ab02b7effd6d6b4319215f44ae4748e
+DIST kafka-python-2.0.2.tar.gz 327238 BLAKE2B 9d8bdee1cedcc3c7c0bee9d900bb815552b29f50ec45b7db9d1052a26eb772c84d92648ccc0d498189fc44314f5c8c30529fa61cb983481f2e2480e009630f91 SHA512 e193a8fe5852d2134e854749115feba46a0b8ff748336989a27bf56acba1124dbb8a5d841670a67ee26eef030a686d931d03d329f978b2eef7904183e83d2594
 EBUILD kafka-python-1.4.7.ebuild 610 BLAKE2B 82c5eb243dd959e97b0b7efcb3ac8840f7f3c36e5bcff600100979b9b514b1dda3922f34bfa126a02f3204f1f1df776ab3143c676042c2d0fab68882a538251e SHA512 add04f189fa7a36c7361e0668dc015149bf1b15c5f390cc1552ff91789cb2305c88c8c2d665fe1f1affaaa2e8d8d7b62258e3ed1fa74c52a286a08740ffea578
+EBUILD kafka-python-2.0.2.ebuild 1239 BLAKE2B 98db7060b2cafd5bcb26b0314d571353a2a16a20fbee85c1accb98e88b1e859be9f364cff2d6c11542826f3963bbc2929e57aaf73af7ea9606c3f58de2de159e SHA512 9fb90063a8c25736450098eb40db2b67be3844536d9cdda5b78e769515d8a20ed3224ef36e1c0b243bc2af7cf9529851a3917313087068b9036a3e17b8e511c9
 MISC metadata.xml 306 BLAKE2B e3422b476fc8d0d7fb8576c24d0eee0ed47d822963c979fdc1f9fcbfdd99abcd0caf7948aa7fb1142ea4ca174a5e803b0884a0d707418f5ce918a4a99ef61dbb SHA512 52e23be22b6fc6964bef55d737579c013b58d09cf737781212cd1d4c99f9c1257086ebafe5ed5dcc99ae574e3a0a6eb148029958f135508afa0ac069a2169968
diff --git a/dev-python/kafka-python/kafka-python-2.0.2.ebuild b/dev-python/kafka-python/kafka-python-2.0.2.ebuild
new file mode 100644
index 000000000000..d492752a2026
--- /dev/null
+++ b/dev-python/kafka-python/kafka-python-2.0.2.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_{8..10} )
+
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Kafka protocol support in Python"
+HOMEPAGE="https://github.com/dpkp/kafka-python/ https://pypi.org/project/kafka-python/"
+SRC_URI="https://github.com/dpkp/kafka-python/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/xxhash[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/lz4[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/snappy[${PYTHON_USEDEP}]
+		dev-python/zstandard[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local deselect=(
+		# Needs the unpackaged crc32c module
+		test/record/test_util.py::test_crc32c[None]
+		# Needs kafka server running
+		test/test_consumer_integration.py::test_kafka_consumer_offsets_for_time_old
+	)
+	epytest ${deselect[@]/#/--deselect }
+}
+
+pkg_postinst() {
+	optfeature "LZ4 compression/decompression support" dev-python/lz4
+	optfeature "Snappy compression support" dev-python/snappy
+	optfeature "ZSTD compression/decompression support" dev-python/zstandard
+}
diff --git a/dev-python/lark-parser/Manifest b/dev-python/lark-parser/Manifest
index 9853a4e67296..ca134d95c02c 100644
--- a/dev-python/lark-parser/Manifest
+++ b/dev-python/lark-parser/Manifest
@@ -2,6 +2,6 @@ DIST lark-parser-0.11.2.tar.gz 225851 BLAKE2B b4fec8701287237442d8fd3b2519f75f70
 DIST lark-parser-0.11.3.tar.gz 229917 BLAKE2B 14bd76f1faaa4fa0aa3fea300d7a4969e0afd70cecd163304047b34a001c012932f37a170d6727a01c93f69ad4c29da70e0b26cee477d81880fa7f97ebd01598 SHA512 34cb6b53dc782a8de57f1f9a0946e7d1f383fad83aaf85102f7d8ca9e5ecd1f83a7666ee1ed8bf556a0d21e1ac5af23964377619882b81dd1033512f544d51c0
 DIST lark-parser-0.7.8.tar.gz 276204 BLAKE2B c2d103f41b7b6ccb988c5935c53e422d495980c1d64cba125e9d27b9b7bf03c0864904e6c2c6b40ec56e8975a8051f1a18c9da126d02fe149dc3684ea7d41c30 SHA512 52eed1a5f26fa7ba79820298a8f6f7594b2351797abdaf8fd96f76e15a11711805955e055164ce287f7204edf3d19116562795cf56db464b4f2f15e40e1da561
 EBUILD lark-parser-0.11.2.ebuild 621 BLAKE2B 13609371418dba6d3a11da93e4dec266ffad5b281e2166f502be645707303926c1d7855bee3176e86240cc2d98a679a66a51198069448796f239a24130686040 SHA512 0008e3e37ba77243a566779a0c69853df389e1dab5957ed68f606b263cb178851d25435fcea3cc4b476e87b78174f4c52effc242c5524727f831e30c6034454b
-EBUILD lark-parser-0.11.3.ebuild 687 BLAKE2B 4dc9cca1dde96561fd2ece339620754dcec5e741f3160657e6dda1d65c58c64a30fd190edab304d6ed80a38f73f01daa04bce77b2dccdb45109501202f0f372f SHA512 2de23d36eb3c178916ca03aa14566309cd5a69c5bf09336a642912c9884b55f02d49e361b28f87b62628de8298954bb2bdc5dd07144627f9bfcea7ba9f60ab7d
+EBUILD lark-parser-0.11.3.ebuild 685 BLAKE2B 59f8fdfdc9becc7cb1b9b8591bd8d344b03279eecc2f45ba35bfa7034938e6a112aee8a15bdb93db24e7c1bbb3262cfca4cde4c357362438204a6ed2e14a0909 SHA512 cae4764668c0eced18ed14bbe0ac93a2d9fb739903ddd84a2c3ce92cf36ad438abd460b982e5fe0605f3e4e35b2a8cfd228d46047ddec135cde247aa00d798a0
 EBUILD lark-parser-0.7.8.ebuild 405 BLAKE2B 5605f1497ae47ea1496f40fafd16eeae8de06af7dc57ed676a9edef923542bb6dd0341adddecd26403d3031b16236298b573bc993c1ead949e1b2327713c5715 SHA512 af78a75077dff7bb32690c6b49959287bbd60e74ea82b8faa811b69501990f4f4b5acea98a6750cc7b3f16ad5af4ebd4a255b7a1b34d6fa191c908c021744a6b
 MISC metadata.xml 634 BLAKE2B 579a43df551ac45d8653d586c6567aae74c77dcb49aa9a4acfc2940ba975629aacda078b1090ae54ffc4dfed6b771b4d9f231970cb999db3367a32c45baa7051 SHA512 f9220665198522f359ddce8a72bbade74346be4e74632fc5764beb0d386965d6e7a88d1366dc968e330394a4a367059ec08c2b3b48839789b1b271657be5c49f
diff --git a/dev-python/lark-parser/lark-parser-0.11.3.ebuild b/dev-python/lark-parser/lark-parser-0.11.3.ebuild
index 7e9086fd46c2..ed00a09f0ce4 100644
--- a/dev-python/lark-parser/lark-parser-0.11.3.ebuild
+++ b/dev-python/lark-parser/lark-parser-0.11.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/leather/Manifest b/dev-python/leather/Manifest
index d927473c3ea9..d3988bd1a750 100644
--- a/dev-python/leather/Manifest
+++ b/dev-python/leather/Manifest
@@ -1,3 +1,4 @@
+AUX leather-0.3.3-fix-py3.10.patch 1235 BLAKE2B b71bb4d6b541ba55ca3cde388a331b69b8f93589d04e5c33c75033c9bfa63d718cfac16e1298df03ba024251618de72a0699687364daab87cfe1c9d5bbb94a42 SHA512 cfffdd293685cc0cd74b94ddef9458bdb5d63dfbfad976c097413111e336ac879c07e67226c27f5fdf4b121fe23005eb38f2de4f59d07a94c3930b01f7163eeb
 DIST leather-0.3.3-src.tar.gz 40522 BLAKE2B 3c7e6a48615751b310b7f066f2a78a2494e00256cae2ebfb4633c9389cca2477c2265fcf8c68f37733568ef729db1a5daf02ddc640bf2a60f2b39127c9a38d91 SHA512 30ea50ac6f97c55ee695b0e175a27e1e64fd17da7b0686ca8595fe0e5067932e19e59368fe6441f8f291ec52be3e597a80f8e04a3fcc0eeae33b3a5b3030e1d6
-EBUILD leather-0.3.3-r2.ebuild 1208 BLAKE2B eb9fa86edff5d7fe5ccc36e5176a385348ea16e95ac9ae42bb6e9632a18052d9d82f0d983f76baaacc804336cbb49baf5b84755f8119f44623a67f0a470e03de SHA512 6ba0a36855f4dc039bfa90be8279e55bf1ac57ae27e8b8c129e953cfd2986ef18b697a6c7231c5aef94362b8509bae2413e1f48097564124b089c78a96ebe856
-MISC metadata.xml 493 BLAKE2B f8962c3c95f53a3b1f019a9f0b175700e2954f53cd79e8422a23bb7bd49bc93f402e1dc23a02466bda8a112e1e78e6a843379077e88937dd89efc47d433dd6f7 SHA512 62620c4b79244ca31054b496eff69208bf94aad7df682ed14436a254fb0f604442cd3242a29ab1e828ad902b8ee9348d7830c73a00985017d2a03acde4a757c5
+EBUILD leather-0.3.3-r2.ebuild 1240 BLAKE2B 387ecca42ff6558fbc3cbaf99b90850cb9565ad67ac937871f883915dcd633ed69e3a49998485b40080c2a9e9dc8a27d585a8eca3ddb93f598965acadd7fff1f SHA512 bf7064a146d7e5f0efacb420bd104a7f408cc1fa6b85f4cd889b873b2b8d657af59e8e2df7e41d563fc697b1c470b840d3db22002f2b93c58b07b4cafba64eeb
+MISC metadata.xml 517 BLAKE2B 77a0715582ef60670b54b95e1e2606d0e87edc1c179ba010b11f2cc2c96255733bd38b4fcdd227e2bf575dc35db537b5213d0b8b922bb1ed504594c2645be8aa SHA512 864b114041b0c2ea2884886d1a1953374c243af680e1042cf8f37a6c98e982a73589276c68d736189361db79142b64149817d60f8607b881d6ae4e1f2891eaa5
diff --git a/dev-python/leather/files/leather-0.3.3-fix-py3.10.patch b/dev-python/leather/files/leather-0.3.3-fix-py3.10.patch
new file mode 100644
index 000000000000..8ec9e1767a4f
--- /dev/null
+++ b/dev-python/leather/files/leather-0.3.3-fix-py3.10.patch
@@ -0,0 +1,40 @@
+From 5dd1d3cc82d426388c66db8e3761ca2bf99a3991 Mon Sep 17 00:00:00 2001
+From: Brian <brian@quantrocket.com>
+Date: Fri, 27 Mar 2020 17:08:50 -0400
+Subject: [PATCH] import from collections.abc to suppress python 3.7 warning
+
+---
+ leather/series/base.py     | 5 ++++-
+ leather/series/category.py | 5 ++++-
+ 2 files changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/leather/series/base.py b/leather/series/base.py
+index c5790e5..959e827 100644
+--- a/leather/series/base.py
++++ b/leather/series/base.py
+@@ -1,6 +1,9 @@
+ #!/usr/bin/env python
+ 
+-from collections import Iterable, Sequence, Mapping
++try:
++    from collections.abc import Iterable, Sequence, Mapping
++except ImportError:
++    from collections import Iterable, Sequence, Mapping
+ from functools import partial
+ 
+ import six
+diff --git a/leather/series/category.py b/leather/series/category.py
+index c575308..3678377 100644
+--- a/leather/series/category.py
++++ b/leather/series/category.py
+@@ -1,6 +1,9 @@
+ #!/usr/bin/env python
+ 
+-from collections import Iterable, Sequence, Mapping
++try:
++    from collections.abc import Iterable, Sequence, Mapping
++except ImportError:
++    from collections import Iterable, Sequence, Mapping
+ from functools import partial
+ 
+ import six
diff --git a/dev-python/leather/leather-0.3.3-r2.ebuild b/dev-python/leather/leather-0.3.3-r2.ebuild
index c792bf43f78a..e2397fc3ccf7 100644
--- a/dev-python/leather/leather-0.3.3-r2.ebuild
+++ b/dev-python/leather/leather-0.3.3-r2.ebuild
@@ -1,30 +1,36 @@
 # Copyright 2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-PYTHON_COMPAT=( python3_{8..9} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
 DESCRIPTION="Python charting for 80% of humans."
 HOMEPAGE="https://github.com/wireservice/leather https://pypi.org/project/leather/"
 SRC_URI="https://github.com/wireservice/leather/archive/refs/tags/${PV}.tar.gz -> ${P}-src.tar.gz"
+
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="test +xml"
-RESTRICT="!test? ( test )"
+IUSE="+xml"
 
 # Other packages have BDEPEND="test? ( dev-python/leather[xml] )"
 TEST_AGAINST_RDEPEND="xml? ( dev-python/lxml[${PYTHON_USEDEP}] )"
 RDEPEND="
 	${TEST_AGAINST_RDEPEND}
-	>=dev-python/cssselect-0.9.1[${PYTHON_USEDEP}]
-	>=dev-python/six-1.6.1[${PYTHON_USEDEP}]
+	dev-python/cssselect[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
 "
 
+PATCHES=(
+	"${FILESDIR}/${P}-fix-py3.10.patch"
+)
+
 distutils_enable_tests pytest
+distutils_enable_sphinx docs \
+	dev-python/sphinx_rtd_theme
 
 python_prepare_all() {
 	local requirements_files sed_args
diff --git a/dev-python/leather/metadata.xml b/dev-python/leather/metadata.xml
index 2b9e7e0da02b..a4cf6d4537d2 100644
--- a/dev-python/leather/metadata.xml
+++ b/dev-python/leather/metadata.xml
@@ -4,6 +4,7 @@
 	<maintainer type="person">
 		<email>zmedico@gentoo.org</email>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<bugs-to>https://github.com/wireservice/leather/issues</bugs-to>
 		<changelog>https://github.com/wireservice/leather/commits/master</changelog>
diff --git a/dev-python/libarchive-c/Manifest b/dev-python/libarchive-c/Manifest
index 8d24fecab63e..997bf9aaf000 100644
--- a/dev-python/libarchive-c/Manifest
+++ b/dev-python/libarchive-c/Manifest
@@ -1,3 +1,5 @@
 DIST libarchive-c-2.9.tar.gz 46408 BLAKE2B e24d9ce56919b6c6217da7629ac3c87023f44d2f1470f6632b3e3b478d29e76edb8fed5e4f8d7a75ab5efd160588dba82d23960d0224ce571ea01af9fd7efaec SHA512 b154cfe39247050c156d57f657b9668f3b1add879b7fb5b32cbc127becee63d1898fb1c4bd60e7fe72e814f544ddefa6680d582fec28b0feed90940fae8cc238
+DIST libarchive-c-3.1.tar.gz 11145 BLAKE2B 80d8918423ec23065cfd7dc391f458bdd44ade765c5e16c23f6cd1ff760e750551d1ff16ccd524a409f466512cb4caed9d25716d12021eafc915a9904bfd0f63 SHA512 1863e2981475839aebce50aa649f603dae7d54772fb864a83613e1d94ead48b64e0edfa0046fb91d1fc985a351911dcd13a24cddfefbb5b7403da1107dc3353c
 EBUILD libarchive-c-2.9.ebuild 551 BLAKE2B 899facfbe24c71e3de08272df2a3dc8f0da5bde25ed3d7bf43b8260b11660e11372076e39a56f2e735fb5cbbbe30ccaff7014f32716344f1b263c6eb835c2cc9 SHA512 d77408392d18b46da4b4a5de803c873508beff891cbbcef0bc5c88128f4efb87ef958da63eda6aa63d1cc93e237b950b09d1c49ac7cfd4887988a4d200a0b920
+EBUILD libarchive-c-3.1.ebuild 468 BLAKE2B a84827b391682c1baf4a1e7e55ca3d81fe0d68a893058f832687687b2096709fba396e8db94fd1132757a544474f0e80df142d6a5a99fa79d8ad0e5229c2665d SHA512 f839926103f6482baeb2045a202be350e19f14dd2b40c81cd1e804bc0f5f81059cec40349db63f36c7fcc38558b73b6c8042ee894b63fe7878105d66942a4823
 MISC metadata.xml 561 BLAKE2B b7ed2b26ca60804ca1e6ed5c0d10d8ff4d673c1912cf9f6a7bfa2c02bfe004a9ca2a19d6f165add2d43cfb8e77007480ca168c22036013284d6e3f44f999a118 SHA512 3945224587cefaceaa0959d6b296c680d1a022f23ea07f6c62944aeba9a6fced9ac25738c3067b32f38e759ccfb3bf197d12a73761f9a13da3f57782c1c0d0e0
diff --git a/dev-python/libarchive-c/libarchive-c-3.1.ebuild b/dev-python/libarchive-c/libarchive-c-3.1.ebuild
new file mode 100644
index 000000000000..b8cdc82285f4
--- /dev/null
+++ b/dev-python/libarchive-c/libarchive-c-3.1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="A Python interface to libarchive"
+HOMEPAGE="https://github.com/Changaco/python-libarchive-c/ https://pypi.org/project/libarchive-c/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="CC0-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+RDEPEND="app-arch/libarchive"
diff --git a/dev-python/libcloud/Manifest b/dev-python/libcloud/Manifest
index 64b43c4833a3..e30c97727c43 100644
--- a/dev-python/libcloud/Manifest
+++ b/dev-python/libcloud/Manifest
@@ -1,3 +1,3 @@
 DIST apache-libcloud-3.3.0.tar.bz2 1811722 BLAKE2B bfdacdda6bb39b3782915d71db6d736caa8a1d57c5120dac9020a1c4923ab08bf8983916fcac15723139b073858efdf178aa797dd592d7534a0b6ff35f8fc5ae SHA512 286ddd79b14633ceb59e1a4b015760a1e525b0282f3039f16c2fa4de940005da5fbde1b8262027103ca91c9653baed22d61dd136ddcc2b6886687ad8b27f3ea8
-EBUILD libcloud-3.3.0.ebuild 1200 BLAKE2B 3c278b434fb196fd1b39dab3962daf133aed125af9b001234795b6257a05c5de665de5c89f7fdbb4e48ecd6fe8abd805be2e02d2ee9ada49b5733f512e5d85a4 SHA512 70461bcc5ba5332259c68e18373736110f111148dc80d6df98b450ff43146ecdf5a9eb7f117b092f705c0535f7d5eaaf9727d3f8b4dc21efec48ac5d1b5bb9bc
+EBUILD libcloud-3.3.0.ebuild 1241 BLAKE2B 870271718b9b120997d01c4b6255fe8070b2e7a8570a122b041ba6db00a3bfca209ea5a9b40124e634210241b3e00bd818289e6dc099bb1e180d5157c8679768 SHA512 62f8b3cc20dd157d58da7a401ec9074955da5ab774d5f9b0794a6c37ed7d05d1f17f2de4a82b524a30a5dfb5fcf519f97a4202d5605e282eaeecd34598c0bc03
 MISC metadata.xml 324 BLAKE2B aa05dc2d968f9550a607cc367c5ab6c3426a41e35cc9a29baaf25050978543fee5bdd676a4606c45fd9104ab6dbe2f2c2bf8f7c45d1b95805503f1cf20668b75 SHA512 809416c2bc54a84624712c77982b57734b6510c66dc731f517574949f13b2aa37b97c9ce4e5ea649262a4731a435187f271d0922e87bc647b2e696bfb40eab0d
diff --git a/dev-python/libcloud/libcloud-3.3.0.ebuild b/dev-python/libcloud/libcloud-3.3.0.ebuild
index eae3be8212e2..0c5711501b8b 100644
--- a/dev-python/libcloud/libcloud-3.3.0.ebuild
+++ b/dev-python/libcloud/libcloud-3.3.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE="ssl(+)"
 
 inherit distutils-r1
@@ -18,11 +18,11 @@ SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="examples"
 
-RDEPEND=">=dev-python/requests-2.5.0[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-BDEPEND+="
+RDEPEND="
+	dev-python/pyopenssl[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.5.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
 	test? (
 		>=dev-python/cryptography-2.6.1[${PYTHON_USEDEP}]
 		dev-python/lockfile[${PYTHON_USEDEP}]
@@ -31,6 +31,8 @@ BDEPEND+="
 	)
 "
 
+distutils_enable_tests pytest
+
 python_prepare_all() {
 	if use examples; then
 		mkdir examples || die
diff --git a/dev-python/lit/Manifest b/dev-python/lit/Manifest
index ddea8a0c5fa5..4c2883065115 100644
--- a/dev-python/lit/Manifest
+++ b/dev-python/lit/Manifest
@@ -2,10 +2,12 @@ DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3
 DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45ca1c93b64fa4c6ebcd70a1d3849dbad2b8e4e24fba02d144c6266d7fab3607ebc6999b28c229cb35256cf40f26a985 SHA512 9a8ce022a935eed42fa71a224f2a207122aadcbef58ee855fdb4825f879e7d028e4dcff22c19b9d336db1c8bf63fb84372d44981acf84615f757e54306c92b81
 DIST llvmorg-12.0.0.tar.gz 134226215 BLAKE2B f9c3ba8c58571855caa4f206fd285c9b5be66672fb0814cb8bc0964a051f57f5d35013aa1e27cbda502652b37df1ec23474129109e76a42066847860db441dbe SHA512 0cff02155c5ac0d6db2b72d60d9819d5b5dd859663b45f721b1c7540239c2fceb1f57d9173f6870c49de851c242ed8e85c5c6d6577a1f8092a7c5dcd12513b26
 DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f65f37dd9e4c8888533cfa8c3ccdcf4f108aaab9de23ab0ab987966eb160f2a553a0bdff99461e71ddd5bfcd086090d SHA512 6eb0dc18e2c25935fabfdfc48b0114be0939158dfdef7b85b395fe2e71042672446af0e68750aae003c9847d10d1f63316fe95d3df738d18f249174292b1b9e1
+DIST llvmorg-13.0.0-rc1.tar.gz 147235597 BLAKE2B 089fed119dee8a16f278cebb13808bd5a95629cc87ebee3050225cc041b78fee51acacc5bcc913d4a99e830bfe5774b19a04a845293c5087dd2a8c9d94d2fde9 SHA512 6e307e2c2dcb7ff41d11ee29d69f41c0ef55f200999847a3a924a2e773fc9c2160015746789af8b723c628bd232f97fce63370209bd0065491d80b0cc0017e85
 EBUILD lit-10.0.1.ebuild 893 BLAKE2B eb0a0a0dc7d159d03fc7f791feec613ab9fe2111e010c6ad2a9d805f69990d7d821770d28383cfd3efb740641b8db4b0359f0a9c41723859a419c45e1dd6435c SHA512 803a2e38ff1eb50983f030b5ec38e40b543e1cdc61cfde708f69494dcecd2dace4e00aac6be4342f3950c252769b6a1ef31178ed0337d581b33269d682b95fd5
 EBUILD lit-11.1.0.ebuild 901 BLAKE2B 03656b1026178d703dc2274b8c8e64504d9f84f9946a34efc1e6a03d3b3038f2a6c23e3c16efc6666314f695315a1995d3cbb5a385a17811fb44a372d6caa6bc SHA512 7a09406d817d5110a489686aefb87d85bb0b8b0a958cb2c4a2065b02e2eb6152023a1f06391be934629c27032b73dbca971404bd848a93a9ab602baf7591b838
 EBUILD lit-12.0.0.ebuild 875 BLAKE2B c7eb151f6ea8accdfee67f26f9b65c41a65d61019295681572055c1771556a365f234bea7058491d2e739313b0d77063c3e9028a8f895fe5987604f0f45ab516 SHA512 772d7644cb8d84f53a5275992f2096dc3bb7ea298056da296572deb53cd3bda52c6f523d9484c48e07067dd79f6cd0ab752116b504f60ffc963431b02a4c7d98
-EBUILD lit-12.0.1.ebuild 879 BLAKE2B e1ae6897065f200b1fdbaf5534505138068fde33376ca9414b0929e4dfb0a659b2bcf32e51441dac01752f0036ed8c8276f270ae08274bed9a9e0fa477193342 SHA512 1f0e3b356004ce9b0bf151b6c01e0724e4100cf5c905aa8ba463388dbb308ccda8316190292dfd9db4d601cd144decd7b06154565716d4fba66f6f6a540e0e23
+EBUILD lit-12.0.1.ebuild 878 BLAKE2B 2beebb6866596d6e72008b9a7c0084c4889f088be65f349d0dbe8a17072f37885f3d897a74519c550d1fdcda4e7051c47954aa5ab05c46e2a98c660fa6e70c51 SHA512 8fd4dfaffd4f65f67ec586660bf7658f0f4fb187668f4e0b5716058d0e872c7c10335aae96d326b9bdecd7f518e961d74c1bbb5d3bd5b4d92ef04a831fc3d4c4
 EBUILD lit-13.0.0.9999.ebuild 837 BLAKE2B 95d45d796f67305e0794e105fc7d8a77328c9f3c87ca8ad1724683281cae3f811536cc9df4210ec4e4287d2ff3fa707719e450fcdf9fc760e568a1f3e025048e SHA512 8ff08b3781ce341131d81131fb735030ae00d35f156fe8711da23ae98ae2b34cc8bc7af807406dcc76feec0c9cefb50a8a8b9c7eb452fd48343f74fb6d02ca34
+EBUILD lit-13.0.0_rc1.ebuild 837 BLAKE2B 95d45d796f67305e0794e105fc7d8a77328c9f3c87ca8ad1724683281cae3f811536cc9df4210ec4e4287d2ff3fa707719e450fcdf9fc760e568a1f3e025048e SHA512 8ff08b3781ce341131d81131fb735030ae00d35f156fe8711da23ae98ae2b34cc8bc7af807406dcc76feec0c9cefb50a8a8b9c7eb452fd48343f74fb6d02ca34
 EBUILD lit-14.0.0.9999.ebuild 837 BLAKE2B 95d45d796f67305e0794e105fc7d8a77328c9f3c87ca8ad1724683281cae3f811536cc9df4210ec4e4287d2ff3fa707719e450fcdf9fc760e568a1f3e025048e SHA512 8ff08b3781ce341131d81131fb735030ae00d35f156fe8711da23ae98ae2b34cc8bc7af807406dcc76feec0c9cefb50a8a8b9c7eb452fd48343f74fb6d02ca34
 MISC metadata.xml 282 BLAKE2B 36e6403814edc8e79eca456ef9648a7b261f79d4823082a8dce876127b11bf89182dabb02e58b2a42dec3cf9e21fe2f5c474ee4a8416213901f82cfc481ffcda SHA512 fa292059e410ff5e751980c5f5b0145c579b373d77970b797850c3d92641bbcf27b2c18a33d665e76e59553ba7dcc124ae09ec34fcaab4b2caed74248ace0e57
diff --git a/dev-python/lit/lit-12.0.1.ebuild b/dev-python/lit/lit-12.0.1.ebuild
index 0502b9a74a19..c5b84099fa77 100644
--- a/dev-python/lit/lit-12.0.1.ebuild
+++ b/dev-python/lit/lit-12.0.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/lit/lit-13.0.0_rc1.ebuild b/dev-python/lit/lit-13.0.0_rc1.ebuild
new file mode 100644
index 000000000000..37168fbde9bd
--- /dev/null
+++ b/dev-python/lit/lit-13.0.0_rc1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1 llvm.org
+
+DESCRIPTION="A stand-alone install of the LLVM suite testing tool"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+KEYWORDS=""
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# Tests require 'FileCheck' and 'not' utilities (from llvm)
+BDEPEND="
+	test? (
+		dev-python/psutil[${PYTHON_USEDEP}]
+		sys-devel/llvm )"
+
+LLVM_COMPONENTS=( llvm/utils/lit )
+llvm.org_set_globals
+
+# TODO: move the manpage generation here (from sys-devel/llvm)
+
+src_prepare() {
+	cd "${WORKDIR}" || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local -x LIT_PRESERVES_TMP=1
+	local litflags=$(get_lit_flags)
+	./lit.py ${litflags//;/ } tests || die
+}
diff --git a/dev-python/lockfile/Manifest b/dev-python/lockfile/Manifest
index 106be72bf0e3..03b667074c8d 100644
--- a/dev-python/lockfile/Manifest
+++ b/dev-python/lockfile/Manifest
@@ -1,3 +1,3 @@
 DIST lockfile-0.12.2.tar.gz 20874 BLAKE2B 8a1e49e8799516b44b219fb28101f3985d75fea842456e69c4357b71eb6a7be21cc56c0f9e885df8da3fb6c584ff4a47c7daad87ba34fc47a8cd40644ece063b SHA512 67b7d651d7e963a497c2604912c61eed90181cdd09c744a0ceaa26e6bbe09d1a871ce48be3949b7da7ea6b366b15492c8c8de589edeca2641ca5e6cb3804df07
-EBUILD lockfile-0.12.2-r2.ebuild 597 BLAKE2B 07d73441271d5f0282f8f9e3b18de6e31e1bce2589ff96bf713d52de2c35937abbc98de998830f10c07ba0888a53cc4640c6d53098b2d5cefb0dc760340ad80c SHA512 78e935a02a9abe72de81b590f7f44da2fe9c03c78c413813b9f9a6d86b3e9c9e3736d762416f4cabb23f6539db4d544d3ca97a481c6b35c1014da45dd69eb603
+EBUILD lockfile-0.12.2-r2.ebuild 597 BLAKE2B 0aa9d7128aaf9004988c8806bf4b9860f1fba87b14cd71bbbb8b6b76d901a2e96d08165be610d0504fa17cc63f7c09ef7f53300c1fc7744df6bcb9696318e83d SHA512 f6499069f6f9c6f9b260255c15bd9f2c0fc18ff802b6165c417d87d08d5ab0c8c6f4f6e076e8ea8020905373a3428180136eb91d1c8fedc658b0c23d40267a73
 MISC metadata.xml 388 BLAKE2B 0fe02708c02d058bc6deab9d0138d9b03cc96f604088a4a50faf869b07e8a6daa8fbb6afe0f24464d5820e32d0a79ee7d882f56862dd7a26236d78a69d127687 SHA512 1c5a2a4f97d31f99a9b802b192505d5594cc6df1ce0aff1cea2bf2520c712608b2642429d68c66d73e21fb07d5cd71ba5bde9de486494ef7a769c7c725650d9e
diff --git a/dev-python/lockfile/lockfile-0.12.2-r2.ebuild b/dev-python/lockfile/lockfile-0.12.2-r2.ebuild
index 3d61af935d39..1e2e089dd5cc 100644
--- a/dev-python/lockfile/lockfile-0.12.2-r2.ebuild
+++ b/dev-python/lockfile/lockfile-0.12.2-r2.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} pypy3 )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/loky/Manifest b/dev-python/loky/Manifest
index 94ae98700cb7..2797b0f8a4b8 100644
--- a/dev-python/loky/Manifest
+++ b/dev-python/loky/Manifest
@@ -1,4 +1,5 @@
+AUX loky-2.9.0-fix-py3.10-tests.patch 1554 BLAKE2B de9edaf32d937cf15f38c40b1c35238eb23602aca47014af6eb8418e1acfc141a6baeb4021a48fede6ae12b31cfc6533ce7f0339dd51f7297ad244f1adbdb007 SHA512 2e236f8c9ffbfb24ce1e646bbee4ef62d9af7472b695beecb1926d20fb467e7a67d01f27cb4c6b8e08a91a93195d68a7b3b778ad5258390bb482ba70cfee5d2c
 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 1021 BLAKE2B 2ea8aee9ab4b527a6e72b4f7a6cc7797f1da8ccb265911fa954bb986d8202981038788cfbe10333948de7887d845a4bbc4aa10b13fbedcfe0b871fd99ae979b2 SHA512 503f67e0cde83f3ee71efd5bf66a03cd9770f418d84babc5c5be4ce3492a803415c60504c45140e6802fc2f4a416c5d7ddf483ac8692ede8c3a59361d29854b4
-MISC metadata.xml 307 BLAKE2B 8b13804536c6ca6c44445e1fb411e7e54e40279ac6ecbe51945a75508ce221c78d11007b6600e6706287db6299b2015b7b9b282cbc05486ecca189983b048a7b SHA512 a78a0767759287a9e4bb5a4fcbc655820d619802db28c72cb84300557fd53f25fe9d5e2fdf2873649bf3bb01a5b5129285a304f111695891287aa012f6f937fe
+EBUILD loky-2.9.0.ebuild 1098 BLAKE2B b185322d31bb11de031b833fb20f2a892afdedd2117953c238a7eaf89ade3d0585780876cf09b876a0656994bd5ff7a5539a73404c141d4dbafd815f16368c38 SHA512 90a31ee5f4232062836ab51f4341fd189dd521946e554c249b5e7f54bac3d1db278482ea8bfb56481c7b376d6fa4ccf622e55629f5c9a45a442d454e4000d8b9
+MISC metadata.xml 382 BLAKE2B 32cbc1465ec3aaef961a70862a458cdf20b7eaeb8b4e266a34eea917b58bdc9132cd59958da7b0d390197ae2d8f332d9c835e616c52570fe9338e7085cf7b664 SHA512 25b107a76c02e82bc2ee28a0f7abb1ac0a736a19f497e27b39911f176cde604cb5e61f447616f1a6115806b17251d94dde0186c2a848fedc2b86956fae7ea834
diff --git a/dev-python/loky/files/loky-2.9.0-fix-py3.10-tests.patch b/dev-python/loky/files/loky-2.9.0-fix-py3.10-tests.patch
new file mode 100644
index 000000000000..51cbfb348a51
--- /dev/null
+++ b/dev-python/loky/files/loky-2.9.0-fix-py3.10-tests.patch
@@ -0,0 +1,41 @@
+From 0d31dc24ca9688c11d1fe53fa1283728ecc50706 Mon Sep 17 00:00:00 2001
+From: Arthur Zamarin <arthurzam@gmail.com>
+Date: Mon, 2 Aug 2021 18:35:31 +0300
+Subject: [PATCH] Fix no attribute import_module for python 3.10
+
+In python 3.10, the `import_module` has moved from the
+`test.support` module to `test.support.import_helper`.
+
+As fix, try to import the from the new place and if unknown try from
+the old place.
+---
+ tests/_test_process_executor.py | 11 +++++++----
+ 1 file changed, 7 insertions(+), 4 deletions(-)
+
+diff --git a/tests/_test_process_executor.py b/tests/_test_process_executor.py
+index 65d9a2c9..3bd0b12d 100644
+--- a/tests/_test_process_executor.py
++++ b/tests/_test_process_executor.py
+@@ -1,15 +1,18 @@
+ from __future__ import print_function
+ try:
+-    import test.support
++    try:
++        from test.support.import_helper import import_module
++    except ImportError:
++        from test.support import import_module
+ 
+     # Skip tests if _multiprocessing wasn't built.
+-    test.support.import_module('_multiprocessing')
++    import_module('_multiprocessing')
+     # Skip tests if sem_open implementation is broken.
+-    test.support.import_module('multiprocessing.synchronize')
++    import_module('multiprocessing.synchronize')
+     # import threading after _multiprocessing to raise a more revelant error
+     # message: "No module named _multiprocessing" if multiprocessing is not
+     # compiled without thread support.
+-    test.support.import_module('threading')
++    import_module('threading')
+ except ImportError:
+     pass
+ 
diff --git a/dev-python/loky/loky-2.9.0.ebuild b/dev-python/loky/loky-2.9.0.ebuild
index 6a166599dde5..25edf84e76a1 100644
--- a/dev-python/loky/loky-2.9.0.ebuild
+++ b/dev-python/loky/loky-2.9.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="Robust and reusable Executor for joblib"
@@ -27,6 +27,7 @@ distutils_enable_tests pytest
 
 PATCHES=(
 	"${FILESDIR}"/${P}-libc.patch
+	"${FILESDIR}"/${P}-fix-py3.10-tests.patch
 )
 
 python_test() {
@@ -38,6 +39,8 @@ python_test() {
 		# one test that uses a lot of memory, also broken on 32-bit
 		# platforms
 		--skip-high-memory
+		# breaks teardown
+		-p no:xvfb
 	)
 
 	epytest "${args[@]}"
diff --git a/dev-python/loky/metadata.xml b/dev-python/loky/metadata.xml
index def50b74ac1a..aec9cefdf350 100644
--- a/dev-python/loky/metadata.xml
+++ b/dev-python/loky/metadata.xml
@@ -5,7 +5,9 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">loky</remote-id>
+		<remote-id type="github">joblib/loky</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/m2crypto/Manifest b/dev-python/m2crypto/Manifest
index 92b66d179d9d..b933b1488158 100644
--- a/dev-python/m2crypto/Manifest
+++ b/dev-python/m2crypto/Manifest
@@ -1,7 +1,3 @@
-AUX m2crypto-0.37.1-openssl-fixes.patch 3074 BLAKE2B 3daa583d4f7e04840a9c2f15fc583dcf8e4ee996aee93d9c180ccc4920f36cd2f90e2f2591732597b0108f3944cb3b22d0eb202c8dfd500fccb8e805aa74666d SHA512 fd73a98592026b39341200fc378042b71272dad4c43c63e4da3aafabae4f5a8aadeb41738ca99cca87ebeecb5455abadfe96d0c6640702b14f138f8122dc57ee
-AUX m2crypto-0.37.1-py310.patch 3843 BLAKE2B e983077f9eda65ea63e34f73178429aea8da61021c38ed68a4798857f3b6b37cea9cbd3b8886d4b169521cda243b87bda18de651f60dd53560693c8472374f7d SHA512 0fbc6eecd28e52036df5a74d825c7dba9fe7d3573c88a564607d4514f01631441929d0d02d6bbf6269b0f077c5ee4b0090b91cdb5b38808480623a782f274d51
-DIST M2Crypto-0.37.1.tar.gz 1247031 BLAKE2B 3628150b8da15d7356298b6e52e0d8fa7875921a184a0eba3a97eff0588c9e0fee340c92fd486919057d900d6e3b2b711174dde9761fe247848f92ac6434df0a SHA512 9a5e0220704b4897a9ca7efa4b3b57447b9175c52e8039a85bff7bb1a43b709c69f3c8b5903df461f8de39d3f8a20f9bf494df6f5882771846adfe2c03fbea9e
 DIST M2Crypto-0.38.0.tar.gz 1241269 BLAKE2B 95433090e08ff72cd2b0779491dc38b89eca159b26812e763b5b8973e3d27249a96d5a2c983b59f414184f64beb8e455dc26979310378db89dd2081741d4d17d SHA512 b1e24e3101ce0dd9f17be4cabeddc2ec0f1228b270d74ef2fb38bae8807c5025b031d0743185f06370786a3dd5c3f42129720534dcff07ea4de3c727613f8d20
-EBUILD m2crypto-0.37.1-r1.ebuild 1487 BLAKE2B 13825020a0ab5d5203e238bd5d5cadf719d77c02dfa1b4be8fca51a79b1238360bfc52ae06500ff92c0caec2418c51db8c4c7016d77977304c80a5d6db2531b3 SHA512 2100ed3ca111b84ee5dfbe92f83218a1403981d63f906b49a7d80faddf46f8bbbbaca42da5ec03b304b91dec30dfb296622c9340499ad29c2a55e53b08e96ab6
-EBUILD m2crypto-0.38.0.ebuild 1494 BLAKE2B 8d91c7f87e680de0450db4312dbb59984849f5caafea807f77a2797c3265fd08fe37d0913a0b111c41710a162bfa09c77196c9c015d13f66b56aacddbcbd34e4 SHA512 4d64ad186eb92ccf51e96ddff6c6cbe8c79d9a3ea142b6fea782940702ec572ae0a64875b0753308fbffc1e80ba4ef5e2d873165d362039c0429d6c4a0b6262b
+EBUILD m2crypto-0.38.0.ebuild 1493 BLAKE2B fa8dc1b85a20b0bce14c6bad262a7ffbb799b8130342f8ce4da8fb97303b22a7df0de5eb1a3e3f5524d4e20770b150f9652b3f363c939c61d938cb74ee2daf83 SHA512 a985776c3c522c50d076881099079429e4c9d99d010b1edaadba1d8ae9cb4afefe827dcd961593bcca1141ec298615745628d8003c0e84043a353e3e3c5af832
 MISC metadata.xml 380 BLAKE2B 99a1c8e8202bed7c6d0ff8cdff3f17b664791405b082be2b7d72b3fe2b77bf89c886666d9bdce6a96c540b9518042b9d49b9af926ca10ab4c5b3b416182de01c SHA512 f2e3b4228c45471f0132b3bb412f017f4006eb82bd63e187db3efdfd3f412c1db19bdb79d37630bb059f75ef69f110687b8924d22c2aef0101cb40eb3486f1e6
diff --git a/dev-python/m2crypto/files/m2crypto-0.37.1-openssl-fixes.patch b/dev-python/m2crypto/files/m2crypto-0.37.1-openssl-fixes.patch
deleted file mode 100644
index c249f7adbb80..000000000000
--- a/dev-python/m2crypto/files/m2crypto-0.37.1-openssl-fixes.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From 73fbd1e646f6bbf202d4418bae80eb9941fbf552 Mon Sep 17 00:00:00 2001
-From: Casey Deccio <casey@deccio.net>
-Date: Fri, 8 Jan 2021 12:43:09 -0700
-Subject: [PATCH] Allow verify_cb_* to be called with ok=True
-
-With https://github.com/openssl/openssl/commit/2e06150e3928daa06d5ff70c32bffad8088ebe58
-OpenSSL allowed verificaton to continue on UNABLE_TO_VERIFY_LEAF_SIGNATURE
----
- tests/test_ssl.py | 14 ++++++++++++--
- 1 file changed, 12 insertions(+), 2 deletions(-)
-
-diff --git a/tests/test_ssl.py b/tests/test_ssl.py
-index 92b6942..7a3271a 100644
---- a/tests/test_ssl.py
-+++ b/tests/test_ssl.py
-@@ -59,8 +59,13 @@ def allocate_srv_port():
- 
- 
- def verify_cb_new_function(ok, store):
--    assert not ok
-     err = store.get_error()
-+    # If err is X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE, then instead of
-+    # aborting, this callback is called to retrieve additional error
-+    # information.  In this case, ok might not be False.
-+    # See https://github.com/openssl/openssl/commit/2e06150e3928daa06d5ff70c32bffad8088ebe58
-+    if err != m2.X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE:
-+        assert not ok
-     assert err in [m2.X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT,
-                    m2.X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY,
-                    m2.X509_V_ERR_CERT_UNTRUSTED,
-@@ -618,7 +623,12 @@ class MiscSSLClientTestCase(BaseSSLClientTestCase):
- 
-     def verify_cb_old(self, ctx_ptr, x509_ptr, err, depth, ok):
-         try:
--            self.assertFalse(ok)
-+            # If err is X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE, then instead of
-+            # aborting, this callback is called to retrieve additional error
-+            # information.  In this case, ok might not be False.
-+            # See https://github.com/openssl/openssl/commit/2e06150e3928daa06d5ff70c32bffad8088ebe58
-+            if err != m2.X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE:
-+                self.assertFalse(ok)
-             self.assertIn(err,
-                           [m2.X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT,
-                            m2.X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY,
--- 
-2.31.1
-
-From d06eaa88a5f491827733f32027c46de3557fbd05 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Mat=C4=9Bj=20Cepl?= <mcepl@cepl.eu>
-Date: Fri, 19 Feb 2021 15:53:02 +0100
-Subject: [PATCH] Use of RSA_SSLV23_PADDING has been deprecated.
-
-Fixes #293.
----
- tests/test_rsa.py | 5 -----
- 1 file changed, 5 deletions(-)
-
-diff --git a/tests/test_rsa.py b/tests/test_rsa.py
-index 3de5016..7299785 100644
---- a/tests/test_rsa.py
-+++ b/tests/test_rsa.py
-@@ -124,11 +124,6 @@ class RSATestCase(unittest.TestCase):
-             ptxt = priv.private_decrypt(ctxt, p)
-             self.assertEqual(ptxt, self.data)
- 
--        # sslv23_padding
--        ctxt = priv.public_encrypt(self.data, RSA.sslv23_padding)
--        res = priv.private_decrypt(ctxt, RSA.sslv23_padding)
--        self.assertEqual(res, self.data)
--
-         # no_padding
-         with six.assertRaisesRegex(self, RSA.RSAError, 'data too small'):
-             priv.public_encrypt(self.data, RSA.no_padding)
--- 
-2.31.1
-
diff --git a/dev-python/m2crypto/files/m2crypto-0.37.1-py310.patch b/dev-python/m2crypto/files/m2crypto-0.37.1-py310.patch
deleted file mode 100644
index f9be349fc3db..000000000000
--- a/dev-python/m2crypto/files/m2crypto-0.37.1-py310.patch
+++ /dev/null
@@ -1,119 +0,0 @@
-diff --git a/SWIG/_bio.i b/SWIG/_bio.i
-index 84b76b3..6c090a4 100644
---- a/SWIG/_bio.i
-+++ b/SWIG/_bio.i
-@@ -246,8 +246,8 @@ PyObject *bio_set_cipher(BIO *b, EVP_CIPHER *c, PyObject *key, PyObject *iv, int
-     const void *kbuf, *ibuf;
-     Py_ssize_t klen, ilen;
- 
--    if ((PyObject_AsReadBuffer(key, &kbuf, &klen) == -1)
--        || (PyObject_AsReadBuffer(iv, &ibuf, &ilen) == -1))
-+    if ((m2_PyObject_AsReadBuffer(key, &kbuf, &klen) == -1)
-+        || (m2_PyObject_AsReadBuffer(iv, &ibuf, &ilen) == -1))
-         return NULL;
- 
-     BIO_set_cipher(b, (const EVP_CIPHER *)c,
-diff --git a/SWIG/_ec.i b/SWIG/_ec.i
-index f47d593..a492f6f 100644
---- a/SWIG/_ec.i
-+++ b/SWIG/_ec.i
-@@ -466,7 +466,7 @@ EC_KEY* ec_key_from_pubkey_der(PyObject *pubkey) {
-     const unsigned char *tempBuf;
-     EC_KEY *keypair;
- 
--    if (PyObject_AsReadBuffer(pubkey, &keypairbuf, &keypairbuflen) == -1)
-+    if (m2_PyObject_AsReadBuffer(pubkey, &keypairbuf, &keypairbuflen) == -1)
-     {
-         return NULL;
-     }
-@@ -486,7 +486,7 @@ EC_KEY* ec_key_from_pubkey_params(int nid, PyObject *pubkey) {
-     const unsigned char *tempBuf;
-     EC_KEY *keypair;
- 
--    if (PyObject_AsReadBuffer(pubkey, &keypairbuf, &keypairbuflen) == -1)
-+    if (m2_PyObject_AsReadBuffer(pubkey, &keypairbuf, &keypairbuflen) == -1)
-     {
-         return NULL;
-     }
-diff --git a/SWIG/_lib.i b/SWIG/_lib.i
-index 954e99b..351134b 100644
---- a/SWIG/_lib.i
-+++ b/SWIG/_lib.i
-@@ -137,8 +137,8 @@ m2_PyObject_AsReadBuffer(PyObject * obj, const void **buffer,
- 	    len = view.len;
- 	}
-     } else {
--	if ((ret = PyObject_AsReadBuffer(obj, buffer, &len)) != 0)
--	    return ret;
-+    PyErr_SetString(PyExc_TypeError, "expected a readable buffer object");
-+	return -1;
-     }
-     if (len > INT_MAX) {
- 	m2_PyBuffer_Release(obj, &view);
-@@ -171,11 +171,8 @@ static int m2_PyObject_GetBufferInt(PyObject *obj, Py_buffer *view, int flags)
-     if (PyObject_CheckBuffer(obj))
-         ret = PyObject_GetBuffer(obj, view, flags);
-     else {
--        const void *buf;
--
--        ret = PyObject_AsReadBuffer(obj, &buf, &view->len);
--        if (ret == 0)
--            view->buf = (void *)buf;
-+        PyErr_SetString(PyExc_TypeError, "expected a readable buffer object");
-+        return -1;
-     }
-     if (ret)
-         return ret;
-@@ -633,7 +630,7 @@ BIGNUM *hex_to_bn(PyObject *value) {
-         }
-     }
-     else {
--        if (PyObject_AsReadBuffer(value, &vbuf, &vlen) == -1)
-+        if (m2_PyObject_AsReadBuffer(value, &vbuf, &vlen) == -1)
-             return NULL;
-     }
- 
-@@ -665,7 +662,7 @@ BIGNUM *dec_to_bn(PyObject *value) {
-         }
-     }
-     else {
--        if (PyObject_AsReadBuffer(value, &vbuf, &vlen) == -1)
-+        if (m2_PyObject_AsReadBuffer(value, &vbuf, &vlen) == -1)
-             return NULL;
-     }
- 
-diff --git a/SWIG/_rc4.i b/SWIG/_rc4.i
-index eb4747e..6af2dc6 100644
---- a/SWIG/_rc4.i
-+++ b/SWIG/_rc4.i
-@@ -46,7 +46,7 @@ PyObject *rc4_update(RC4_KEY *key, PyObject *in) {
-     Py_ssize_t len;
-     void *out;
- 
--    if (PyObject_AsReadBuffer(in, &buf, &len) == -1)
-+    if (m2_PyObject_AsReadBuffer(in, &buf, &len) == -1)
-         return NULL;
- 
-     if (!(out = PyMem_Malloc(len))) {
-diff --git a/SWIG/_util.i b/SWIG/_util.i
-index bc2ee61..18e446a 100644
---- a/SWIG/_util.i
-+++ b/SWIG/_util.i
-@@ -22,7 +22,7 @@ PyObject *util_hex_to_string(PyObject *blob) {
-     char *ret;
-     Py_ssize_t len;
- 
--    if (PyObject_AsReadBuffer(blob, &buf, &len) == -1)
-+    if (m2_PyObject_AsReadBuffer(blob, &buf, &len) == -1)
-         return NULL;
- 
-     ret = hex_to_string((unsigned char *)buf, len);
-@@ -44,7 +44,7 @@ PyObject *util_string_to_hex(PyObject *blob) {
-     Py_ssize_t len0;
-     long len;
- 
--    if (PyObject_AsReadBuffer(blob, &buf, &len0) == -1)
-+    if (m2_PyObject_AsReadBuffer(blob, &buf, &len0) == -1)
-         return NULL;
- 
-     len = len0;
diff --git a/dev-python/m2crypto/m2crypto-0.37.1-r1.ebuild b/dev-python/m2crypto/m2crypto-0.37.1-r1.ebuild
deleted file mode 100644
index 86a235286642..000000000000
--- a/dev-python/m2crypto/m2crypto-0.37.1-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 2018-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 toolchain-funcs
-
-MY_PN="M2Crypto"
-DESCRIPTION="A Python crypto and SSL toolkit"
-HOMEPAGE="https://gitlab.com/m2crypto/m2crypto https://pypi.org/project/M2Crypto/"
-SRC_URI="mirror://pypi/${MY_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 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	>=dev-lang/swig-2.0.9
-	test? ( dev-python/parameterized[${PYTHON_USEDEP}] )
-"
-RDEPEND="
-	dev-libs/openssl:0=
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-openssl-fixes.patch"
-	"${FILESDIR}/${P}-py310.patch"
-)
-
-swig_define() {
-	local x
-	for x; do
-		if tc-cpp-is-true "defined(${x})"; then
-			SWIG_FEATURES+=" -D${x}"
-		fi
-	done
-}
-
-src_prepare() {
-	# TODO
-	sed -e 's:test_server_simple_timeouts:_&:' \
-		-i tests/test_ssl.py || die
-	distutils-r1_src_prepare
-}
-
-python_compile() {
-	# setup.py looks at platform.machine() to determine swig options.
-	# For exotic ABIs, we need to give swig a hint.
-	local -x SWIG_FEATURES=
-
-	# https://bugs.gentoo.org/617946
-	swig_define __ILP32__
-
-	# https://bugs.gentoo.org/674112
-	swig_define __ARM_PCS_VFP
-
-	distutils-r1_python_compile --openssl="${ESYSROOT}"/usr
-}
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/m2crypto/m2crypto-0.38.0.ebuild b/dev-python/m2crypto/m2crypto-0.38.0.ebuild
index 5cdac9b517cd..b6170a252e6b 100644
--- a/dev-python/m2crypto/m2crypto-0.38.0.ebuild
+++ b/dev-python/m2crypto/m2crypto-0.38.0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/minimock/Manifest b/dev-python/minimock/Manifest
index a95c830bfb0c..fe0c6877ec4c 100644
--- a/dev-python/minimock/Manifest
+++ b/dev-python/minimock/Manifest
@@ -1,3 +1,3 @@
 DIST minimock-1.3.0.tar.gz 13828 BLAKE2B ed60d9725ada7173f88cdd64d76e3674fbeff352f4ead919f2a3a94ec871189051da29da5ee285b4d663eee143da847c95e35286cf33a587abb7fe95e02a4824 SHA512 de7feef7fee044ba45a52d7c83905d082ad2ed2c3d12b294a6995086b377a22317730326946d048b19063758f158a9bee7bbb6a79c9ae0b4ba7a93e4a21ea196
-EBUILD minimock-1.3.0.ebuild 510 BLAKE2B 60461d7024c2eff7cf3ad74c6708127a1cd4a84ab9234890cf721b025ca39f300c6a452297bf9146cc9d7c05a37c24ba110e22c13a771db230aa786dc69c3153 SHA512 571dd5e799b75ebbb401bf89dbdb0908c63b1e43d22fdb56575af548b86b647ee49d9df50e364ee8be8893fa6f11e1eb45c2e8abfbd6e8a7ad7246712acad727
+EBUILD minimock-1.3.0.ebuild 558 BLAKE2B 7916e6d42927acd97a9bd488f22a5dd320651819638808b59acd7f19edecff6c80a7cf90edb78cc67bf850c4ba06ed281c234008d818a15f163dfd58a882e3ea SHA512 755ecccabea68142268eb5ad43ba1e42f29ee0ba92524e2be33f23ac63a15797b603354ddce7d12f1b581f5188f9b3b3fe94ef948599a75eb3bfdf76eb6b6e83
 MISC metadata.xml 389 BLAKE2B 5a2faad0837b39b8b5736820387d577e3c5f97802beae17340221fcc026ef18906f5bf9ed8cb86814fa8989879d84e062a9b542b0b530c9acfbaac80d4158c7e SHA512 907b5500e461c7f3c30d1d006270f06feef7537368c139dcdc791805f266435887162ad6209a7f827a8d9470e7e4d98e41d0027604e36532b90a16abcc60244e
diff --git a/dev-python/minimock/minimock-1.3.0.ebuild b/dev-python/minimock/minimock-1.3.0.ebuild
index 626cb3a2d8b3..dda36847f069 100644
--- a/dev-python/minimock/minimock-1.3.0.ebuild
+++ b/dev-python/minimock/minimock-1.3.0.ebuild
@@ -3,12 +3,11 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
-MY_PN="MiniMock"
-MY_P="${MY_PN}-${PV}"
+MY_P="MiniMock-${PV}"
 
 DESCRIPTION="The simplest possible mock library"
 HOMEPAGE="https://pypi.org/project/MiniMock/"
@@ -21,3 +20,8 @@ KEYWORDS="amd64 arm ~arm64 ppc x86"
 DOCS=( CHANGELOG.txt README.rst )
 
 distutils_enable_tests nose
+
+src_prepare() {
+	sed -i -e '/cov/d' setup.cfg || die
+	default
+}
diff --git a/dev-python/mkdocs-material/Manifest b/dev-python/mkdocs-material/Manifest
index 5b8f1bdf6b49..4d13b835f5e6 100644
--- a/dev-python/mkdocs-material/Manifest
+++ b/dev-python/mkdocs-material/Manifest
@@ -1,7 +1,7 @@
 DIST mkdocs-material-7.1.1.tar.gz 6080208 BLAKE2B a67742ce923dc7bbefbb5638156f5a2f703bd54af96e59b1c580264ae3096d0a823df6cd88151f2c446a97b578bc4a620d694323f5a81cc33836181dad203214 SHA512 ab6b9b4b08268c15b42cf9d5d26ea0bc91151efb1b478602b495f603335792fcd1f9058ecc52767cb861969ab1db7aff2681653db35cb739173b56f7f32f9c65
 DIST mkdocs-material-7.1.9.tar.gz 6492415 BLAKE2B 67a86251289126320088dde4611ea1c1e75543e7edcb2f737dfcf21844f53a3457544716cded44f0954c2658cb107e5cae589efa2c71ee07151a39ed0f28401f SHA512 1a4296ff692842e61406b24ac50b1c02550a2581040611c263aa744c98031a54c6f380e6f655aa477f98d7507d2e8649434fc981928e9d27f09df71cccd22ecd
-DIST mkdocs-material-7.2.1.tar.gz 6773988 BLAKE2B 8b57a58b11ecdf9fb9668a766d10869040c8f6e2d2045cae01e4e32243503540ef955c81bdf0b2066886a309c46e724586a912631ffb78a6383ee1736f1b13d1 SHA512 9ce1cd733205ab87e865c8b90e9b78b133b5172acc042f8ee954073885c8380d06607ead2fc80352311502638c02439798515acfe8521c06b9fee707173e7d63
+DIST mkdocs-material-7.2.2.tar.gz 6777834 BLAKE2B 09c5ee5e0e0cef76ca66c8d86941fa044f2650d621a194991f279c09dd64c81c96bdfbe7d37eee5fe0e3837fc6461e7abad3537d92f3fdd178078485665088b5 SHA512 5332246103eb3007df3d2fd7ead4f2f60ce29c0e8a2bef6249db3e14a8e0ce1b2cdaffe4f48f57701d07a1771e275c69a79006ec53cfacff1a885894076188fb
 EBUILD mkdocs-material-7.1.1.ebuild 816 BLAKE2B 6e872ef6c7186551647d37f7a80142f591b393fcea6cb132040809478f92aa1abbada00f92530b12e23cd7712944ac8b0a82db414d0a39c1be1cf28f4189ae5d SHA512 871fc55ae207e78a3c9ef1f50b887ced596d2ba7cd4a4606549f9877f1d4f660857d3f62aeb23d4eabc4d75f7a79406cf78c45d80b645cd145baf45efbd8eb5a
 EBUILD mkdocs-material-7.1.9.ebuild 817 BLAKE2B 7700357d46cf7298e980eaebd60a96823a0c6e31800fd35c260cc00ac4f73757fe7f13adc1003476e4ff4076cc00f59934fd8a11bff95d10cce32d2c75beeafa SHA512 e32d3869be7418b2453432021fd67930c58c6886fff89b805438d71b4b4567a7c3091e96a0201dbad4da7522525d07634eb7f1ceb6fb66e52ca82d62b3b93184
-EBUILD mkdocs-material-7.2.1.ebuild 817 BLAKE2B 924aa54ed7c0c1ecc16497b25b07c7bccffd7dbca5369595d981ace8d2db7e2f118948af863309d69e2a4ff522be107ce7ccc1ebda5e6839c69fb27bee9c72ea SHA512 65a70738804a58fd256516ecbd22ca10f51fe6831a17234e813ebf30da8d34f2e2335f804d2b326bf458743075416e1678784ad8a5cddab8393e5fc2cf7696c0
+EBUILD mkdocs-material-7.2.2.ebuild 817 BLAKE2B 541ba90c73ce9a7a3c7e52664f7f73a569001a6e644c81b5e452c2c041ef745473987580491e1f4fa67e918d0019d22d10824ae9f4ba3738060e5133aa7c6f3e SHA512 2b09409640d0dc8fc45e0336544517f92c3aad66c450f93632b6f57eefa20c7ae446906d707cd01c207be5fa9c36746eafe22a8d8c4f4f795567e629d7713518
 MISC metadata.xml 1036 BLAKE2B d9f342d8f3da5a5b1ce9ee0e68938b0c8f7235ff84e39c59d9da18cec1b4553193aaa7eff85157c92fd014e971f2ac947bd252caad791605b0867cf2d7622ce4 SHA512 31db1dbe3433dbbcb6036ece9803d22913980644f014f8e8db80bb00899e0b98602016a08e887f7fdd5d99627d411ea8cb18fbb091faae0a03f8804e3497b52f
diff --git a/dev-python/mkdocs-material/mkdocs-material-7.2.1.ebuild b/dev-python/mkdocs-material/mkdocs-material-7.2.2.ebuild
index 2190898a4626..ed35fce29300 100644
--- a/dev-python/mkdocs-material/mkdocs-material-7.2.1.ebuild
+++ b/dev-python/mkdocs-material/mkdocs-material-7.2.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 DOCS_BUILDER="mkdocs"
 DOCS_DEPEND="
diff --git a/dev-python/mysql-connector-python/Manifest b/dev-python/mysql-connector-python/Manifest
index 4d6c6bddfe6d..17bf773c3819 100644
--- a/dev-python/mysql-connector-python/Manifest
+++ b/dev-python/mysql-connector-python/Manifest
@@ -1,7 +1,9 @@
 DIST mysql-connector-python-8.0.22.tar.gz 12081967 BLAKE2B fc6b724ec2eb47a92294f7316093d4a4d2f4925981adeb07b305e946a047dbdaedd96c6ff9a07426fd56185f467cf6473bc84e0896d2e8fde70a188af16e9df2 SHA512 07f380922c18f9ade38f95d8e107fe8f90b8a7901fb9a36bbdfdb2b29f9cb79b0b6387a608e89bf90e9344c635d47184c750a206beacb2c9cc7615d6a7df2c29
 DIST mysql-connector-python-8.0.23.tar.gz 12095843 BLAKE2B e4cc24f045d0e988ad97a9427fa3f6e20eb9d993d97f51033140e12722bc04fc3a2b252b811402daea2fea8f987948ebd8c68623f2af3e0e7e35d2b0d6fa7eda SHA512 66ca61c15573555a3f42ad8a9e9b3a4bc612c4d2b4e54928af87adcf609e131e9afd53b76c3a8da30f181e4f2111245cda5995063109526ff72f4f2062c2e528
 DIST mysql-connector-python-8.0.25.tar.gz 14600643 BLAKE2B e3452aa82dc047cfdec8e64975ceb4f1ba7804aae770956fa52293e185408a4a31b2f563a21dcc6f0c5be0f4a5858d6b58f0d33ab5cf5071543e2c68b2b52b52 SHA512 2a76b879b369e69e0ed6a67d1eab4787c0f9a29c505ad785b03b6b25d7c92b85547082adeae572c75e61b613f39ee01d291fdf54927bdaf25dfcfc85cb8ced7c
+DIST mysql-connector-python-8.0.26.tar.gz 15180658 BLAKE2B e964728d5f39b9ca5abc72ab84780b463708d1a1cf90507330e73be4837cd30befe245ddd70783490660c70da1b7c162803eee743a0e668cfa6b82773bea4fef SHA512 204021e08b21c5efe87c0f59a6ff3b949cc1d01005121dfe5dde7fea12852a3e28c35b68e06e04f2c0ac4f911bfc14893e6509c99d0c5bf2c30fa32d4131c630
 EBUILD mysql-connector-python-8.0.22.ebuild 1523 BLAKE2B 482d37af75f68fcfbf92074f82474a006e66376289a177e49e3421c25895d2a8cbdf40c4d9301a7b8fa17d69737252ef99a2196c969bc65b57cc000819ef86d5 SHA512 5f1eea17a35e9277f09eb8101c3e91d3b47ae9803b6c949afea3206b22757c73144081cb456faa1c46b992c7ca14a4b39997f35a12f79100f823d6dbd7eee970
 EBUILD mysql-connector-python-8.0.23.ebuild 1524 BLAKE2B f97c6f95c11fa80fea43d8ac86d1f7369561f5bee7ae7e8826187e5d9b758d4ff85b6d3f1ffaf096d680fcfb4b8dcd7133e0203d89011dab60ed3b4789f68a42 SHA512 e2a3f26be785e0ec920b828584e7c9bee38ed78bdf336d2d2e02e595c0b5ad6441dd971b67a4e5219999b0ca5b05d31f9733bf200813b8b2cd86b733081a1f98
 EBUILD mysql-connector-python-8.0.25.ebuild 1552 BLAKE2B a07510229e2b661993118ed1c1e18138a0a837aa0a15b38b2c841270534be962e247fecb00b293679998eef9ebc2fff6497bb396bd2116933978a1a774276655 SHA512 e91b8d26a81fc6065cfc516be3a2c9f74c402340e467a98a648f2872cd3fe43fdc6973124fbdaed4e9123fe8b29d9e8a1a456adaf7291de78df4c05743bfe008
+EBUILD mysql-connector-python-8.0.26.ebuild 1555 BLAKE2B 7b2b7890a89ac612be17e73eba571feb5e4dc6d493a905c392dc0d16986a03f5d212cdf07e50ddea8968cc91ecf3a7c30fcabd08ce2bf133b718013b4e2ef81c SHA512 6b35f874775c6b5aecdff32ba64979ee9311fc4e46af3eb9bba79506040b2c579e59f29f0d17dd4b8f2ed82b63216fa63bd5aea4ad41d868dc12711aacd76cdd
 MISC metadata.xml 429 BLAKE2B ecbfe7e88466287141bd923db191969d384118b464659804a4aad33d811a6042b8082c9675a103e3e50b1ccbf74357be609ed714890412d2534bc77388f6b61a SHA512 812597d8918eeb1c0b94b8afb0b605cf98fe6e0f3d4f79b644d90e78f026a13d1233c7c0665022c752818acf07deea7151b988a701c8a5060aefe9264c2a592f
diff --git a/dev-python/mysql-connector-python/mysql-connector-python-8.0.26.ebuild b/dev-python/mysql-connector-python/mysql-connector-python-8.0.26.ebuild
new file mode 100644
index 000000000000..454f690c682b
--- /dev/null
+++ b/dev-python/mysql-connector-python/mysql-connector-python-8.0.26.ebuild
@@ -0,0 +1,53 @@
+# 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
+
+DESCRIPTION="Python client library for MariaDB/MySQL"
+HOMEPAGE="https://dev.mysql.com/downloads/connector/python/"
+SRC_URI="https://github.com/mysql/mysql-connector-python/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+KEYWORDS="~amd64 ~arm ~x86"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="examples test"
+
+BDEPEND=">=dev-libs/protobuf-3.6.1"
+
+RDEPEND="
+	>=dev-db/mysql-connector-c-8.0
+	>=dev-python/protobuf-python-3.6.1[${PYTHON_USEDEP}]
+	dev-python/dnspython[${PYTHON_USEDEP}]
+"
+# tests/mysqld.py does not like MariaDB version strings.
+# See the regex MySQLServerBase._get_version.
+DEPEND="${RDEPEND} test? ( dev-db/mysql[server(+)] )"
+
+# Tests currently fail.
+# mysql.connector.errors.DatabaseError: 1300 (HY000): Invalid utf8 character string: ''
+RESTRICT="test"
+
+DOCS=( README.txt CHANGES.txt README.rst )
+
+python_test() {
+	"${EPYTHON}" unittests.py --with-mysql="${EPREFIX}/usr" --unix-socket="${T}" --mysql-topdir="${T}"
+}
+
+# Yeah, this is really broken, but the extension will only build this way during "install"
+python_install() {
+	distutils-r1_python_install \
+		--with-mysql-capi="${EPREFIX}/usr" \
+		--with-protobuf-include-dir="${EPREFIX}/usr/include/google/protobuf/" \
+		--with-protobuf-lib-dir="${EPREFIX}/usr/$(get_libdir)" \
+		--with-protoc="${EPREFIX}/usr/bin/protoc"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	if use examples ; then
+		dodoc -r examples
+	fi
+}
diff --git a/dev-python/natsort/Manifest b/dev-python/natsort/Manifest
index bb877c4df351..2a5505ab5b6f 100644
--- a/dev-python/natsort/Manifest
+++ b/dev-python/natsort/Manifest
@@ -1,3 +1,3 @@
 DIST natsort-7.1.1.tar.gz 142749 BLAKE2B dffd5b7b18ac49653d4d65ae1335c85d441748903aa983df092778476988cf0ca59c08526ee0da1761fce1afe4849d4c9a9e2f3e0c5400ebca2478781d0986dc SHA512 1903c933c6203ef0cd194ea444d79276b79ec385728a92b6e73d1698abc8e1351e96ed8ea4ae5f9f413ef6daecfd269a4d0de74c45eedff682fe929d8f977f30
-EBUILD natsort-7.1.1.ebuild 540 BLAKE2B 3ccd6734cc487075ffd12b84e7d28ff97121730c5546b38bbdcb29ff7119d1b77d579aded0aa835e1bb1fe3c80069784307bfc1b4fb26c6799d1e86d4d9f9bee SHA512 a52e4506b46473fc2289232ba9bdd4e135cf427a83efb51cef29a6374df1e145909d1e1919642c6ae12c2c9a4c495516da9a6ac3d6de3d829406080f17d930a7
+EBUILD natsort-7.1.1.ebuild 539 BLAKE2B 5f9ce11469e8ac667cf1c573111fbd4765b14784d7fedfe1f3e1ee291abcfcb1c6a5e5b6b988e5fa7dee60ce64ee04472807506e252dc77c74f638fe0dd76085 SHA512 f15e47699c043461911ab7f92996d8c51e62c5a3ca7c830fc8601fc05bd696fc099fa2dc1f1ce5fa7f4940cec517811f322edefb5170598fe4b67cb8a7b05373
 MISC metadata.xml 406 BLAKE2B 1bd6819234aa6417e45d2e38c65863145930ff04eccd05690ca9d210fc9572394c18ef59e0d2c5adbd6791047fc8090baca5d6ec0c1118aaaa3fa23e2fa9427a SHA512 693524d7b020bdf70374c4ab784d6e230963dde0ba168fb9b5a4c39652a81bf67feecf091720f1fc1c853830705bf7aa4da64f2c3b4e921cf316507c8a79aa17
diff --git a/dev-python/natsort/natsort-7.1.1.ebuild b/dev-python/natsort/natsort-7.1.1.ebuild
index 3bdaff1542b1..bc902c2837f8 100644
--- a/dev-python/natsort/natsort-7.1.1.ebuild
+++ b/dev-python/natsort/natsort-7.1.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/notebook/Manifest b/dev-python/notebook/Manifest
index 46412f2a1604..14f384761f6d 100644
--- a/dev-python/notebook/Manifest
+++ b/dev-python/notebook/Manifest
@@ -1,4 +1,6 @@
 AUX notebook-5.7.0-no-mathjax.patch 1438 BLAKE2B 66719f5342c08fce7576a70780b38a97ac3e768f3385218da15e7e2b7073ec0e1bbe943f320e4ebd0618401760de96295fc1b0ea0f2e919487b41f90acabfef0 SHA512 ef2754a0e7f552de34411532e7cbddffeab66364075a5514290b09f956b3486791f757b9a159a6c3f975507b8a5626612efeee754933927e2b505aea5f5df2db
 DIST notebook-6.4.0.tar.gz 13937270 BLAKE2B 41ba6e3dd22c92b6044199737fe93563aad07117e8c64817566765d643867b582218a1b34099acf2a84df9ac9f8eb2773f6f3e6779b14255867fd97ec443df85 SHA512 8bb57b3efaaddb781ee963a569996e45c563b50b2cb918fb7722805710dd5852d895ff5b5f5575686032a037d7395aa581140b471b529d68dfcb371841607481
+DIST notebook-6.4.1.tar.gz 14139457 BLAKE2B 4be00ba6cd2f66873657f8ad5f79b444bbfbb978eaac7ddb57ef5da39a81c2746e7658004179e44aa98fa5fc5954b022b2e3c0c15dac0cc6da21b95a16225bfd SHA512 aa73e90f8ad1888f469e4cb412b6f17742e3b68ce429b2feaafeaeebbbb9e0cc437f3f73f26204b8de8367620ecb492033786c00b04d641ce0bfb4df75460419
 EBUILD notebook-6.4.0.ebuild 3235 BLAKE2B a83eca348e5db25252af465ca499e16512ca91175b4b051f18196e3e3f60a1a657125b9fd7d1ec2119c096afa9d71f2a42b5edd9710bf248609f8298e75c89bb SHA512 78b4c658232dcf15124860d5fc6d3f394f9c2c9bde8de3cf8a9e05badb73cce17b4f4373fa64f079b12c4dc6a8169b66b89c50a13c992c96cf5a3c275d786bdb
+EBUILD notebook-6.4.1.ebuild 3237 BLAKE2B 840150c7f2f86c75b492df97c4dbd325a1693ba7279847d16aedadd1a79cd80947de345d3ed5fe95d5b5b399d886afbaddc2c61824ea718af56c3e1fa05a35ec SHA512 74033b899159821856d305629dc72c8f430f3c11608937f73ef8d5d08e4d6731150c519e1d07e16f17752420697277da8f281cfbfb114b8d4a2a10249c10ce4d
 MISC metadata.xml 524 BLAKE2B dfca744ea63418ee961bc5f106be6a01acf80af2e4179e0f3446c370a416bdae998887a55e866cd2fe5ede334653b46205f32b5db275e2ec54efefbd10455541 SHA512 a3511781a2086a80a0cc7a02842e1c71490ae1b200ac5263ace00610d37df7cf9ad866f4bfb89441514dbf26a5dfeb6559cbef9e1e6e2fba534c14feb5fcd616
diff --git a/dev-python/notebook/notebook-6.4.1.ebuild b/dev-python/notebook/notebook-6.4.1.ebuild
new file mode 100644
index 000000000000..892d3ca7cd84
--- /dev/null
+++ b/dev-python/notebook/notebook-6.4.1.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 xdg-utils
+
+DESCRIPTION="Jupyter Interactive Notebook"
+HOMEPAGE="https://jupyter.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-libs/mathjax-2.4
+	dev-python/argon2-cffi[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	>=dev-python/terminado-0.8.3[${PYTHON_USEDEP}]
+	>=www-servers/tornado-6.0[${PYTHON_USEDEP}]
+	dev-python/ipython_genutils[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-4.2.1[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_core-4.6.1[${PYTHON_USEDEP}]
+	>=dev-python/pyzmq-17[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_client-5.3.4[${PYTHON_USEDEP}]
+	dev-python/nbformat[${PYTHON_USEDEP}]
+	>=dev-python/nbconvert-4.2.0[${PYTHON_USEDEP}]
+	dev-python/ipykernel[${PYTHON_USEDEP}]
+	dev-python/send2trash[${PYTHON_USEDEP}]
+	dev-python/prometheus_client[${PYTHON_USEDEP}]"
+
+# sphinx 2+ seems to have a problem with its github plugin. temporarily adding
+# a version constraint.
+BDEPEND="
+	test? (
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/requests-unixsocket[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}"-5.7.0-no-mathjax.patch
+)
+
+distutils_enable_tests --install pytest
+
+python_prepare_all() {
+	# disable bundled mathjax
+	sed -i 's/^.*MathJax.*$//' bower.json || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local deselect=(
+		# trash doesn't seem to work for us
+		notebook/services/contents/tests/test_contents_api.py::APITest::test_checkpoints_follow_file
+		notebook/services/contents/tests/test_contents_api.py::APITest::test_delete
+		notebook/services/contents/tests/test_contents_api.py::GenericFileCheckpointsAPITest::test_checkpoints_follow_file
+		notebook/services/contents/tests/test_contents_api.py::GenericFileCheckpointsAPITest::test_delete
+		notebook/services/contents/tests/test_contents_api.py::GenericFileCheckpointsAPITest::test_delete_dirs
+		notebook/services/contents/tests/test_contents_api.py::GenericFileCheckpointsAPITest::test_delete_non_empty_dir
+		notebook/services/contents/tests/test_manager.py::TestContentsManager::test_delete
+		notebook/services/contents/tests/test_manager.py::TestContentsManagerNoAtomic::test_delete
+		# TODO
+		notebook/services/kernels/tests/test_kernels_api.py::KernelAPITest::test_connections
+		notebook/services/kernels/tests/test_kernels_api.py::AsyncKernelAPITest::test_connections
+		notebook/services/kernels/tests/test_kernels_api.py::KernelCullingTest::test_culling
+	)
+
+	# selenium tests require geckodriver
+	epytest --ignore notebook/tests/selenium ${deselect[@]/#/--deselect }
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	ln -sf \
+		"${EPREFIX}/usr/share/mathjax" \
+		"${D}$(python_get_sitedir)/notebook/static/components/MathJax" || die
+}
+
+pkg_preinst() {
+	# remove old mathjax folder if present
+	rm -rf "${EROOT}"/usr/lib*/python*/site-packages/notebook/static/components/MathJax || die
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index 5ba135f13c6b..90a8184983fb 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -22,5 +22,5 @@ DIST numpy-user-1.21.1.pdf 5142404 BLAKE2B d670f1eb0f060599a640c52bdeba53b175800
 EBUILD numpy-1.20.2-r1.ebuild 3789 BLAKE2B 04b13cd33ea2805716faf5c2d286e3f0928eeda592c0c6217501a1adbea30e614d940732041cb4236a89966db1cebae33b437ab55a309ff6be62e81bb6be5010 SHA512 9a2bb8e998e317e540b7a0fa70979a872db8b0a99cc1e6f72d1fa0ab1c11f26551be22eff1a84b2c25e9d39934246b955ea54fc72c25b2d89badc430bf048f38
 EBUILD numpy-1.20.3-r1.ebuild 3724 BLAKE2B 3d3c2ade82decb593116388cbd00e6c688e0b308b2a4bccb122fa716e7e8826f83f0d9f2fb6edeb43578325007b97c228899be055c5ae90b2740bc5a5dcfc7c4 SHA512 496058416f50bcc39632458bac10017071df0231bb564be2b496c65f693f0bb12c6a01a50df72f70a7f98f872f8258c8030db766fbde2f89a5c8327b1a786dca
 EBUILD numpy-1.21.0.ebuild 3567 BLAKE2B 8bfccf3046fa52a171d97bfe22385688d37a383a772310833fd59ead145d8ef7e1c45567ab664f3462e99595bac7411faddba01863143d553db30017f88f1225 SHA512 77e8d721c372f06aaab330c69d21eaf699cd0b04f91a1466878f9e2e89169a14979f7ec834c906ca0905ce909215f74c0b9c77f0e08b39dbbe34d07f275a83e9
-EBUILD numpy-1.21.1.ebuild 3682 BLAKE2B 753c9e53177bae352f3aec669b07c6367a86b89c0c97e46b43ce3ddaa322f01ad141b5303c98567d8397259c6fbbd78ea953bdbd7e32b66fa2cde2430003e3e1 SHA512 9309099f1e9869cdaf8a3ebf6682075abd6d41decf123fc25e342202e8250dd55a310d220b0f48b8d71da6e8353ca21e36f996c593a9d44731ef6141e436d5fc
+EBUILD numpy-1.21.1.ebuild 3679 BLAKE2B 523d82f2a2dbdfb1cff4886dc78c41d793c5850bf283b95ad3a1a3161e4c34e96542baad5e4c489167d8078cbfd9eab9e3354d5ee87825b52ccaeff3e7ced9f5 SHA512 9e746ac832581cf1d34cdd339cd7511e9e55a96396ca242bb5635f1478d3b3628e27b6e06f820786a3e8b950de26aba20eb45c969ac52ef0dd7843badf20c2dd
 MISC metadata.xml 934 BLAKE2B 948b9a948cddc46d20d672992bf73ddb1e59ba18f470acf805c78f561249e7bce2cec1cb1affe63aad447f2f0ad627147cf05ca04ac3c321781255357de92d63 SHA512 404bc31423a1093c19dd535aa3cd5a6b925f4ef1699f9991ae19b46495c46ac4ab3b0b1995f62ea8bc5de15889b975dfcdc416360978508b837d4d5d518dfeeb
diff --git a/dev-python/numpy/numpy-1.21.1.ebuild b/dev-python/numpy/numpy-1.21.1.ebuild
index 3353915bf361..7950d9f40029 100644
--- a/dev-python/numpy/numpy-1.21.1.ebuild
+++ b/dev-python/numpy/numpy-1.21.1.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 	)"
 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"
+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="
diff --git a/dev-python/parso/Manifest b/dev-python/parso/Manifest
index 3dff2404ecec..0c5cff3fcf6b 100644
--- a/dev-python/parso/Manifest
+++ b/dev-python/parso/Manifest
@@ -1,6 +1,8 @@
+AUX parso-0.8.2-flaky-test.patch 947 BLAKE2B b6ece3214328f3121e4de8217395ac108678a37a97bea943e900e13cf44fdbeccf70f2b3bf8dda70df6cf06feb73a55f2bd2d75236898e4cf45c8b22f46b93fb SHA512 b7c5ac93d2f44a897b8d9eb59c470c82b2013f4e3ebf35e81254294f9961e8916a6d590d61ed1d8f3841e50c47cc7902e13d1e28826869afa9168e44e85a98e0
+AUX parso-0.8.2-py310-2.patch 2145 BLAKE2B f0b403c9b9ca5370b1c2ffd52d0a22d995bff03242526a4a649cd58392380c3e38cad4b251b20580b5c22ab859f4829d8ef6ad9c5faaaae3a02b39526d3d585a SHA512 6761d95f4ae0c9a8042abc3fcb42848f323337920306974802f008614c75c7c313aa9a666dd24cfe7e01c7d01f06cbd8e2d370fbc89cc08fdd8b87bcea0aec61
 AUX parso-0.8.2-py310.patch 1128 BLAKE2B f052039f8aef2913cef406c97d55e1afdcd76e46d2a64e2e2f1fd2ac1b7571950ca816213b155602f7b974d01996876a4a7bb0b92f49161d9b29e4ec98950918 SHA512 5aaff0ca295195674006f1435863ff59eac121189c938ef44428eba929a2d76daea9fffb51feebcc75502dbdfb5df7ead18d62c4ee98cb53c35129b81c562810
 DIST parso-0.7.1.tar.gz 399842 BLAKE2B 1e47c1dd6846d01aa5820d7cedc3eafcf12ea0d4a2e95fa3f54429633b1c12dc39a4abe237fa46eb629408006777bd1f512cf878025b55119568ac19729b8c19 SHA512 318969a7a941c4a0948e58643b07b6f5c446ea166b3a8e44a556f0677ec9a36d7dc8c6d37ca7bce3f8276ee3d7144e22fbaaeac90c738fb90f7e94a0cf8abf7d
 DIST parso-0.8.2.tar.gz 394419 BLAKE2B f4e86ae55140adc9bbfdd34a8044e7fdfbf9d318a6385ac5feedc07127061943c2d690581af144f158846e3bf6f82124046c7e625369a4055ab92a54f9210c49 SHA512 a90810ad89301d804d215392ed77593b015f13bc7ef8512302a8893b314a9e74c15e2aaa77157c8595a134d3481e8115f306f9628835271478837ec6f19e645f
-EBUILD parso-0.7.1-r1.ebuild 866 BLAKE2B 730cdde56ea2935fd3ed22322a423d7fd4025b117ab3775b7f64517ad3735b4bf2eac7ea3de2aafbfdd41139e14b4301d13295e3d6f5313161a465bede10cd65 SHA512 725052f75029489e6eb9d9ee179287fd6b258d0f0f1baa414f76a4a9d5f322283f7a921db11d60bb64525caf76c82563ca8f61790cf5922018b4b1729065a74d
-EBUILD parso-0.8.2.ebuild 911 BLAKE2B 50944234ba8b5a49412bf541d88b342c11c933a45b4246a78e296371016e2153156a513c241f46ee2a5cc928bc7a30e28cdb26c82b4a6cd963a03029b9a5a2d1 SHA512 d37c6834563a2cc62cd6aee457fa943a6678ef416a9de66c8edaae663acf63e76a3b3fba0c35c348199a4c74b07f134a0af7dac31e52a562a7e79eb7bbcf749d
+EBUILD parso-0.7.1-r1.ebuild 872 BLAKE2B ea9cc5082628bf3fa685faea2c6f641ec480980639d9a5a7549f49d0f7afc7ded936bad02086c62b7a6f7e9ef0083c58fa2b37610f206d82647de3956787fcb3 SHA512 3f4a9d3aa0048c8da17c22880b50f9482fb5309ca10828565c6d6a9dada5190edb151d5ccc0999263e24a2afffc94a069a6b08f08e1318c7ade868315a50d6cb
+EBUILD parso-0.8.2.ebuild 922 BLAKE2B 30e7445875016d94268188ecb5f654c8daac9a473bf218190317c8cd15b1f45654ce94e3cfd5e2360b0de5c6ac0a02f6eb4cb786749f45c2d1e83c0a2a38031f SHA512 08a707da0f0e3a69f0c84cf8391f025f911c9a560a2da38d283f721e8053bc8289741837bef1c2e3408f6c6e2d5a7b4c3725608956fc9cdc6ac9595f5c19ddf5
 MISC metadata.xml 402 BLAKE2B 3dbbdbbd15ec82aa4f38d92f52f4342a14b209edff3aa09b5dc1866784533e21f8c5d75146e3b9b535c01bb4dd36cd259abb2deb959382866242d99fb5d8fad3 SHA512 61cca7520333f595582f3e52602afa09d685d8072a211c4b8a2930fccbd98645c8c69ef7f687a25c05e2e2dc7ddda2fee16b7666cc2854b0b5ac6e23a95bac42
diff --git a/dev-python/parso/files/parso-0.8.2-flaky-test.patch b/dev-python/parso/files/parso-0.8.2-flaky-test.patch
new file mode 100644
index 000000000000..729ec409c829
--- /dev/null
+++ b/dev-python/parso/files/parso-0.8.2-flaky-test.patch
@@ -0,0 +1,23 @@
+From 60fed7b9f80cbb3d9cb7a9e42ad8c0f3c513801d Mon Sep 17 00:00:00 2001
+From: Saiyang Gou <gousaiyang@163.com>
+Date: Sat, 29 May 2021 18:17:24 -0700
+Subject: [PATCH] Fix flaky test_cache_last_used_update again (#189)
+
+This is a follow up for #177. On Windows, `assert node_cache_item.last_used < now` may fail as the two time values can be equal.
+---
+ test/test_cache.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test/test_cache.py b/test/test_cache.py
+index f4291c2..5e633fc 100644
+--- a/test/test_cache.py
++++ b/test/test_cache.py
+@@ -137,7 +137,7 @@ def test_cache_last_used_update(diff_cache, use_file_io):
+     parse('somecode', cache=True, path=p)
+     node_cache_item = next(iter(parser_cache.values()))[p]
+     now = time.time()
+-    assert node_cache_item.last_used < now
++    assert node_cache_item.last_used <= now
+ 
+     if use_file_io:
+         f = _FixedTimeFileIO(p, 'code', node_cache_item.last_used - 10)
diff --git a/dev-python/parso/files/parso-0.8.2-py310-2.patch b/dev-python/parso/files/parso-0.8.2-py310-2.patch
new file mode 100644
index 000000000000..7c6b1ad78286
--- /dev/null
+++ b/dev-python/parso/files/parso-0.8.2-py310-2.patch
@@ -0,0 +1,57 @@
+From dc41958947770849c8b3b4d344db434e2c8548cc Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Thu, 5 Aug 2021 09:09:28 +0200
+Subject: [PATCH] Update expected exception line numbers for Python 3.10.0rc1
+
+It seems that upstream has fixed line numbers in some of the expections
+in Python 3.10.0rc1, so update the tests accordingly.  This means that
+test_non_async_in_async() gets the correct line again,
+and test_default_except_error_postition() no longer suffers from
+the apparent off-by-one problem.
+
+This doesn't fix tests entirely with Python 3.10 but it's a step
+forward.
+---
+ test/test_python_errors.py | 13 ++++++++-----
+ 1 file changed, 8 insertions(+), 5 deletions(-)
+
+diff --git a/test/test_python_errors.py b/test/test_python_errors.py
+index cda9bd2..e847ebb 100644
+--- a/test/test_python_errors.py
++++ b/test/test_python_errors.py
+@@ -57,10 +57,10 @@ def test_non_async_in_async():
+         error, = errors
+         actual = error.message
+     assert actual in wanted
+-    if sys.version_info[:2] < (3, 8):
++    if sys.version_info[:2] not in ((3, 8), (3,9)):
+         assert line_nr == error.start_pos[0]
+     else:
+-        assert line_nr == 0  # For whatever reason this is zero in Python 3.8+
++        assert line_nr == 0  # For whatever reason this is zero in Python 3.8/3.9
+ 
+ 
+ @pytest.mark.parametrize(
+@@ -140,13 +140,16 @@ def _get_actual_exception(code):
+ 
+ 
+ def test_default_except_error_postition():
+-    # For this error the position seemed to be one line off, but that doesn't
+-    # really matter.
++    # For this error the position seemed to be one line off in Python < 3.10,
++    # but that doesn't really matter.
+     code = 'try: pass\nexcept: pass\nexcept X: pass'
+     wanted, line_nr = _get_actual_exception(code)
+     error, = _get_error_list(code)
+     assert error.message in wanted
+-    assert line_nr != error.start_pos[0]
++    if sys.version_info[:2] >= (3, 10):
++        assert line_nr == error.start_pos[0]
++    else:
++        assert line_nr != error.start_pos[0]
+     # I think this is the better position.
+     assert error.start_pos[0] == 2
+ 
+-- 
+2.32.0
+
diff --git a/dev-python/parso/parso-0.7.1-r1.ebuild b/dev-python/parso/parso-0.7.1-r1.ebuild
index d05ee8925e65..395f094f2437 100644
--- a/dev-python/parso/parso-0.7.1-r1.ebuild
+++ b/dev-python/parso/parso-0.7.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/davidhalter/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv ~sparc x86"
 
 distutils_enable_sphinx docs
 distutils_enable_tests pytest
diff --git a/dev-python/parso/parso-0.8.2.ebuild b/dev-python/parso/parso-0.8.2.ebuild
index 2aa420a8cb86..42be4262b424 100644
--- a/dev-python/parso/parso-0.8.2.ebuild
+++ b/dev-python/parso/parso-0.8.2.ebuild
@@ -13,13 +13,15 @@ SRC_URI="https://github.com/davidhalter/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv ~sparc x86"
 
 distutils_enable_sphinx docs
 distutils_enable_tests pytest
 
 PATCHES=(
 	"${FILESDIR}"/${P}-py310.patch
+	"${FILESDIR}"/${P}-py310-2.patch
+	"${FILESDIR}"/${P}-flaky-test.patch
 )
 
 python_test() {
@@ -27,7 +29,6 @@ python_test() {
 	[[ ${EPYTHON} == python3.10 ]] && deselect+=(
 		# py3.10 changed exception messages
 		test/test_python_errors.py::test_python_exception_matches
-		test/test_python_errors.py::test_default_except_error_postition
 	)
 	epytest ${deselect[@]/#/--deselect }
 }
diff --git a/dev-python/pathtools/Manifest b/dev-python/pathtools/Manifest
index adfce7c33569..8a0fe48eddf5 100644
--- a/dev-python/pathtools/Manifest
+++ b/dev-python/pathtools/Manifest
@@ -1,3 +1,3 @@
 DIST pathtools-0.1.2.tar.gz 11006 BLAKE2B ad257edd9a62477a07343ecd6786c24ad2472da8844e3358980973c9daee9c52f3317976b2971f9afe33bfcd0dba1c1497230b105fd364a45c0d138abec41894 SHA512 e014cb17f3d61ce7979e36663f94a44d4f1116c35e3d2ec8c4ac207a81935dde246495ed06597e6edade1509f384b9e5729a97ffd3eec31b1d1c4a8372d1dfd7
-EBUILD pathtools-0.1.2-r3.ebuild 396 BLAKE2B 64d405d3ac3772162bb51fc4b7ce82a59df9fbe3db989b07dfe4d963eb42f8479224d7dd2eb684130f29c337467543a89b7221375e446bf94341626dcae76041 SHA512 16233d54304794945942e2434eb4ef16d179ca19c9abcc216b100d229aa0ce9cf076bd01f2372ae5c458532dbe9bccfb7c90d16423aa9700cdaa894fafb152be
-MISC metadata.xml 312 BLAKE2B 655db0f4e05f6f22057f5b40c38a0790aa4878190ba1f2eddd703c2a13a1d8010282517cc827bdf2f48597024c9069ddff7be23a4f914899d5c432115d150c57 SHA512 f1187bfa80d1a0e64b04e3d474d8d805fa73f7c23ad412fdde4a51f347268c764d1f808d9c9b1f191c661e777dcfe6aaf0966bf13ce7ea9e8c02f6a8e5249851
+EBUILD pathtools-0.1.2-r3.ebuild 440 BLAKE2B caed609298803d0bdfb4e3ab1a286fbef2d198510720168b41f94d8aa1f92260c9ee4074e83f30f6e9831dd5a175fad29e34ac87ae86bf7578e5fbcc0a3c898a SHA512 a4034860c8afc2d5a94fe690f7cb3bdbcd27a915160b4164edf34204e8f58c8aa4e51154d8c58f9c1ea0180f42e088a4db3df106319dbedeb5a0b3cbad100c5a
+MISC metadata.xml 374 BLAKE2B 96ee367dbe63a299948d92324e124f30e9a9b0524c7d12e7905f639107d83a3ea438897307cd97623809a05926d3a7d904e9a420a14e82f29e9e23e408c2c23b SHA512 14d8a6343d250ae0c0f58022eafef55aab26972166c80e0e564c8fd110d6b14e1a7d0f5422d0a3ac1d4333ebbfa160be8438f4df435aa1e59ab2b9bac1afd491
diff --git a/dev-python/pathtools/metadata.xml b/dev-python/pathtools/metadata.xml
index 599f44315a3e..42abc819ab19 100644
--- a/dev-python/pathtools/metadata.xml
+++ b/dev-python/pathtools/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="pypi">pathtools</remote-id>
+		<remote-id type="github">gorakhargosh/pathtools</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pathtools/pathtools-0.1.2-r3.ebuild b/dev-python/pathtools/pathtools-0.1.2-r3.ebuild
index cd695cccc74b..b41eb1d3fb2c 100644
--- a/dev-python/pathtools/pathtools-0.1.2-r3.ebuild
+++ b/dev-python/pathtools/pathtools-0.1.2-r3.ebuild
@@ -1,14 +1,14 @@
-# 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..9})
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
 DESCRIPTION="Pattern matching and various utilities for file systems paths"
-HOMEPAGE="https://pypi.org/project/pathtools/"
+HOMEPAGE="https://pypi.org/project/pathtools/ https://github.com/gorakhargosh/pathtools"
 SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/patsy/Manifest b/dev-python/patsy/Manifest
index f9f877614710..e86c04d2d897 100644
--- a/dev-python/patsy/Manifest
+++ b/dev-python/patsy/Manifest
@@ -1,4 +1,4 @@
 AUX patsy-0.5.1-py310.patch 1159 BLAKE2B 6b734bf60d74f071cae590658b613c36fef694d99362fa30f4e6651a14c4f8063c8a67f93e756447712146d89b8f3371a8d08604a40edfb29f31c60b1e7a24b8 SHA512 843cac6b873114de82f784d3bd1ab4d317c73d4ae125088d303a976d15ca38eb6a0e2598e4758eb06a984c3c3820814b0b66380b3f7138eceef0d4730ca2fb8c
 DIST patsy-0.5.1.tar.gz 397623 BLAKE2B b8861e8c8e223db5df616c378d5b1ce475a1b337d049723c1a4b01432d9e1569c4b6537dc467fbc1ba83dfc7cd999ad188008e387c446f2133f872393c9eb960 SHA512 aeb56411e68713ec75c0b5344890939f721c460d3c7643b9fd57d7c928421d21408b0f2963348edf27a025842989dbae6fd5cfccd3f9d9497d60a1dffe8d7bdc
-EBUILD patsy-0.5.1.ebuild 636 BLAKE2B 6a4494a742b9c9b257fd3b1c5f56b75e94a1bd320dbb4fa9417a3a71a66b514834088e3260e8f82dec117a537f9f289d8b5df264dabf18e4304ba8fc74eb3a3c SHA512 24cc4bc05a433866385b7d6e0cb6834b2c4b0d8ddde0a0046ee4ff18f2c0b6dca86e5adf31fdb4ee0ce40ecce1b5e84d0998b243a982b6910c4e84093bff7cc0
+EBUILD patsy-0.5.1.ebuild 643 BLAKE2B f8fed9e424a614bd15df8460a69e92f7a1a1fa03f1fa2dbf4efc23ea89f1d92199325587c1d9ba64139521293f5e821ddf9bd78578e2e953a1fe722701e14d91 SHA512 6780bdb5c7e742e4f4de039d11057eba6534d8eab9b43d38b7c7d6a4536281fe79e744ae9b4999fda997b48d7b78479c6403f6c467290bea544c33c218a80997
 MISC metadata.xml 568 BLAKE2B 198b70af00599da8c516753e5ec88fb4353a966a279e4e40db5b57a7bab57f0ec360ac70ebe4dc14b194b147520b0a8d6d35d2e73003c9c70bbbcc3c830b91aa SHA512 57957dc18e93d9bc8d53d72bf8c9e601856ffb1511943034ff30aa7d93761f8b986e67daadf8dbcd57ef7714ebf3dda13ccd345df294809954c942cb9bdd1310
diff --git a/dev-python/patsy/patsy-0.5.1.ebuild b/dev-python/patsy/patsy-0.5.1.ebuild
index 78b6a5d4cd69..3b4305a33058 100644
--- a/dev-python/patsy/patsy-0.5.1.ebuild
+++ b/dev-python/patsy/patsy-0.5.1.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 ~sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/numpy[${PYTHON_USEDEP}]
diff --git a/dev-python/pipenv/Manifest b/dev-python/pipenv/Manifest
index e317db6290ac..5975a8e38d96 100644
--- a/dev-python/pipenv/Manifest
+++ b/dev-python/pipenv/Manifest
@@ -1,5 +1,7 @@
+AUX pipenv-2021-5-29-r1-remove-attr-vendor-import.patch 3064 BLAKE2B a292df872da96e643545dc3c0b8c27d40466f6b4fb76d0c19316021e103ab6ee3b4e18861f286fee96a004e4f8c1fb3889bd7285f790d31b7f81e49579ab13f1 SHA512 4301b2302648dea77809c3afda896f0f38e4fcde503a9810f8c1706e35b553bee8fc3bc803ff958b0afb0cde0b764854647416efadccab3541f284f3efde15ab
 DIST pipenv-2020.11.15.tar.gz 11603983 BLAKE2B 552c35c942f9ece0f52419b6090b87c7dce0c49dd9dc12f8c5b3eb311058fc770ec9e2b141e960d357064c66c6de7cd0892d2dd19868e5cdaee0f302f98fb0ff SHA512 d312059b3fefc97d4cd79bf2b75d6bde1d117d92c0a299c30181a60ebea662a6c3dff0ca7b92c610dd8eb0c873509dd23c9a891761d0d47d0bba2cab738c830d
 DIST pipenv-2021.5.29.tar.gz 11607230 BLAKE2B 8eef8e79fbdfaf85a949437d06d9f8b48f7eaa6e4769f6d4ed90b01c0ebf70c282fc90581cce5ffcab0aeb6bc9ad770a8b4425f355a06e0fc4cd56fb221386e2 SHA512 4fa018c13d4babe856bf5671cf5d18a95f4af4b6d4fc64c4919825fe04004ed3d8979ca335b851c6e24dad081475f6fb5b925eeff58c6fb5cffc450b967ed1cd
 EBUILD pipenv-2020.11.15.ebuild 1428 BLAKE2B 154c51236e9875df17d635f17093473227102e830fcf639c0b92577cf36f973525b9251841ea02a3bbafade091673aeefd3a964ba26372a1c95b1ae2cf79c06f SHA512 e71bef8c4f72f4f6e2d35c5d2c59d7a8eed220d5718f9e31d94a8e3608b6e55dbcb42af2d63c5375cdcafba22ba55f7cfc6cf51e83820a7e71c7dda1f216ba7a
+EBUILD pipenv-2021.5.29-r1.ebuild 1427 BLAKE2B 62fc045ec96f38ba7adee831a3ea108b36b1f96868703aa04d50bdb88f15e91c8d835195d652e74b102f22919ef6b4f2af7f39197d74d3ac02b435002774f3e9 SHA512 3b45d3c1bd613d3212df52638cf4b20c23c306f14dac1f9e571dbed26dd34173fd3339e0c6056cc62e860abae4d48c98ad610c9df0409c92207234fb31a33eab
 EBUILD pipenv-2021.5.29.ebuild 1428 BLAKE2B 154c51236e9875df17d635f17093473227102e830fcf639c0b92577cf36f973525b9251841ea02a3bbafade091673aeefd3a964ba26372a1c95b1ae2cf79c06f SHA512 e71bef8c4f72f4f6e2d35c5d2c59d7a8eed220d5718f9e31d94a8e3608b6e55dbcb42af2d63c5375cdcafba22ba55f7cfc6cf51e83820a7e71c7dda1f216ba7a
 MISC metadata.xml 642 BLAKE2B a652239b8d21d5c30d7893bb530bb89af62e0642824d4954bdd41719d1f1b8afee5e8ca4cdc7859995adca8fe0ddbca916e4876ed10104fa9e69f76147227f71 SHA512 f9d9c4433c8bdbe9bdb4c62f8da158d59afba2052a899eb14c245c1109cf82f690e513581aa6028b4ceebc836a32df5b8961672fed833a08b8ef2ac8a442a860
diff --git a/dev-python/pipenv/files/pipenv-2021-5-29-r1-remove-attr-vendor-import.patch b/dev-python/pipenv/files/pipenv-2021-5-29-r1-remove-attr-vendor-import.patch
new file mode 100644
index 000000000000..3437c2a2f33f
--- /dev/null
+++ b/dev-python/pipenv/files/pipenv-2021-5-29-r1-remove-attr-vendor-import.patch
@@ -0,0 +1,95 @@
+diff --git a/pipenv/installers.py b/pipenv/installers.py
+index 1e81047d..ccfd639c 100644
+--- a/pipenv/installers.py
++++ b/pipenv/installers.py
+@@ -6,8 +6,11 @@ from abc import ABCMeta, abstractmethod
+ 
+ 
+ from .environments import PIPENV_INSTALL_TIMEOUT
+-from .vendor import attr, delegator
+ from .utils import find_windows_executable
++# future version of pipenv drops this
++# hence, this stays here for a while
++from .vendor import delegator
++import attr
+ 
+ 
+ @attr.s
+diff --git a/pipenv/vendor/passa/models/projects.py b/pipenv/vendor/passa/models/projects.py
+index c7807c05..f6e037d6 100644
+--- a/pipenv/vendor/passa/models/projects.py
++++ b/pipenv/vendor/passa/models/projects.py
+@@ -6,7 +6,7 @@ import collections
+ import io
+ import os
+ 
+-from pipenv.vendor import attr
++import attr
+ import packaging.markers
+ import packaging.utils
+ import plette
+diff --git a/pipenv/vendor/pythonfinder/models/mixins.py b/pipenv/vendor/pythonfinder/models/mixins.py
+index aeba0443..76327115 100644
+--- a/pipenv/vendor/pythonfinder/models/mixins.py
++++ b/pipenv/vendor/pythonfinder/models/mixins.py
+@@ -5,7 +5,7 @@ import abc
+ import operator
+ from collections import defaultdict
+ 
+-from pipenv.vendor import attr
++import attr
+ import six
+ 
+ from ..compat import fs_str
+diff --git a/pipenv/vendor/pythonfinder/models/path.py b/pipenv/vendor/pythonfinder/models/path.py
+index e8c13429..7a197181 100644
+--- a/pipenv/vendor/pythonfinder/models/path.py
++++ b/pipenv/vendor/pythonfinder/models/path.py
+@@ -7,7 +7,7 @@ import sys
+ from collections import defaultdict
+ from itertools import chain
+ 
+-from pipenv.vendor import attr
++import attr
+ import six
+ from cached_property import cached_property
+ from ..compat import Path, fs_str
+diff --git a/pipenv/vendor/pythonfinder/models/python.py b/pipenv/vendor/pythonfinder/models/python.py
+index 4f7e5563..d001a1e5 100644
+--- a/pipenv/vendor/pythonfinder/models/python.py
++++ b/pipenv/vendor/pythonfinder/models/python.py
+@@ -7,7 +7,7 @@ import platform
+ import sys
+ from collections import defaultdict
+ 
+-from pipenv.vendor import attr
++import attr
+ import six
+ from packaging.version import Version
+ 
+diff --git a/pipenv/vendor/pythonfinder/models/windows.py b/pipenv/vendor/pythonfinder/models/windows.py
+index c69b9484..fb36a272 100644
+--- a/pipenv/vendor/pythonfinder/models/windows.py
++++ b/pipenv/vendor/pythonfinder/models/windows.py
+@@ -4,7 +4,7 @@ from __future__ import absolute_import, print_function
+ import operator
+ from collections import defaultdict
+ 
+-from pipenv.vendor import attr
++import attr
+ 
+ from ..environment import MYPY_RUNNING
+ from ..exceptions import InvalidPythonVersion
+diff --git a/pipenv/vendor/pythonfinder/utils.py b/pipenv/vendor/pythonfinder/utils.py
+index bcea7f3e..41d2d59a 100644
+--- a/pipenv/vendor/pythonfinder/utils.py
++++ b/pipenv/vendor/pythonfinder/utils.py
+@@ -10,7 +10,7 @@ from collections import OrderedDict
+ from fnmatch import fnmatch
+ from threading import Timer
+ 
+-from pipenv.vendor import attr
++import attr
+ import six
+ from packaging.version import LegacyVersion, Version
+ 
diff --git a/dev-python/pipenv/pipenv-2021.5.29-r1.ebuild b/dev-python/pipenv/pipenv-2021.5.29-r1.ebuild
new file mode 100644
index 000000000000..403619ae6073
--- /dev/null
+++ b/dev-python/pipenv/pipenv-2021.5.29-r1.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=( python3_{7,8,9} )
+
+inherit distutils-r1
+
+MY_PV=${PV/_beta/b}
+DESCRIPTION="Python Development Workflow for Humans"
+HOMEPAGE="https://github.com/pypa/pipenv https://pypi.org/project/pipenv/"
+SRC_URI="https://github.com/pypa/pipenv/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}-${MY_PV}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+PATCHES="${FILESDIR}/${PN}-${PV//./-}-${PR}-remove-attr-vendor-import.patch"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	dev-python/certifi[${PYTHON_USEDEP}]
+	dev-python/pip[${PYTHON_USEDEP}]
+	>=dev-python/virtualenv-20.0.35[${PYTHON_USEDEP}]
+	dev-python/virtualenv-clone[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	${RDEPEND}
+	test? (
+		dev-python/flaky[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+	)
+"
+
+src_prepare() {
+	# remove vendored version of PyYAML that is backported to Python2
+	rm -vR "${S}/${PN}/patched/yaml2/" || die
+	# remove vendored versions
+	# see https://bugs.gentoo.org/717666
+	rm -vR "${S}/${PN}/vendor/attr/" || die
+	rm -vR "${S}/${PN}/vendor/jinja2/" || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	pytest -vvv -x -m "not cli and not needs_internet" tests/unit/ || die
+}
diff --git a/dev-python/platformdirs/Manifest b/dev-python/platformdirs/Manifest
index 49072a747278..ffff77361f69 100644
--- a/dev-python/platformdirs/Manifest
+++ b/dev-python/platformdirs/Manifest
@@ -1,3 +1,3 @@
 DIST platformdirs-2.0.2.gh.tar.gz 11365 BLAKE2B 53257c69f26dde3a0031c991cd6b5c72b361084342617f5c0590007a11a1d7d6e3c925dd6a8d73d3553cf1cc1d2b9fdf74fd0553d6b8891ef6b21d64bc0e256f SHA512 7cdfbcb4e37f2b4b551f3d685a40780518f9ba9c333cef0664965abaca320a10f6e944f967c0b0ba2d00e80df04b0e1e03426e6d1291e28d8f64128f50ebc1fc
-EBUILD platformdirs-2.0.2.ebuild 620 BLAKE2B 835319eb3a94ab6adc765332197cb95ce33af57488016606dccbacc4b196c65200ddf4729e7759fdfd42aa0fa9f1a2719a2bd0df69dc58cc69dac5ff9d48ed5a SHA512 14af1e4e2f56da676be18c7289ad8ab39752ab610ff3d233366dcee5aa0c9452a01cb020c25c14ab6a4f0c95acc1a275bdc229f75556d8bbbb196440ffef94d3
+EBUILD platformdirs-2.0.2.ebuild 651 BLAKE2B 41b314b1b210128eaa6bb06aef2a26f1fc41cc179155a6c0857e5fb25ba6f4508059d5949fdce52e4ad21f33a4f70bc121da5ae5d6357df43cba20aacba7714a SHA512 41c14115ed346e8d5d5ca1661a616a4d12bce35bc7b292f4de7cc0103b9efef08d7620eafabacaa68db3fe4bcc43833407fefb5c6188f5f2f5bc77473886d338
 MISC metadata.xml 358 BLAKE2B 59aae3db7ff7375600e504797a7fe4dbd4c0119d5b3fa31ef523854d8a8cd54ee60131f9bac4f608dbb5740a1e9dcf27d47cca75c7c83de4850600eb02aae2fd SHA512 09d5618647fdc5104705ac94e3af0a3bac586e27105f95d14c827b10265355a53deaa66483c12567596c2c4e8285c1cc0520f5475a1404aca3b1d677792d7654
diff --git a/dev-python/platformdirs/platformdirs-2.0.2.ebuild b/dev-python/platformdirs/platformdirs-2.0.2.ebuild
index 3aa5e9a22459..a5e2a8f53d42 100644
--- a/dev-python/platformdirs/platformdirs-2.0.2.ebuild
+++ b/dev-python/platformdirs/platformdirs-2.0.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 BDEPEND="
 	test? ( dev-python/appdirs[${PYTHON_USEDEP}] )"
diff --git a/dev-python/plyvel/Manifest b/dev-python/plyvel/Manifest
index 913f12ca6b8b..4a3186794762 100644
--- a/dev-python/plyvel/Manifest
+++ b/dev-python/plyvel/Manifest
@@ -1,3 +1,3 @@
 DIST plyvel-1.3.0.tar.gz 149379 BLAKE2B 0a4fc8c3073cc8e103ab217f8e7971f04d9e6d1862dea7ce3d2634ba9646bdeebdda740fe6cb2e83aeeab513601bddef374355c4f6c9f320ce6b4b14ff2b2bf6 SHA512 fc1b84f0e98bf3edcdc2d7eda4f18313186538bb419bd297f694330e60512a6ab63e8d2fabaa825023eb5570f175ebbc22b8ae81e29603b1a94c1abb37774e99
-EBUILD plyvel-1.3.0.ebuild 712 BLAKE2B de4f335fb79ab1c7ed03d7263d8256eb0aa63990cf6e8b77040c999d5f2a48fe595e59ffce93d4b48cd58f50f58ce683843c936dbe4deb6797ee1f61a9a043e0 SHA512 776030a62e9d48a09343947cf049bce82be13b9ec264ad7cfc8ec39b30d04217735306047bbf92c12c8bb5a58b9cd98a4a9cdd06b88fcb5ffe25aabb37cf9781
+EBUILD plyvel-1.3.0.ebuild 713 BLAKE2B 397c1c4e9b762253a7ac4675af405a6689c8e674f47b875fd60dd8ef1bb388ea811a2a2278f63fcfb79bb507f2a231d79ecaea519b68d0489f6a9d366f809d66 SHA512 01b93baaa9d813babfae8bac99b087c15762309d0b6475800fe3a3b0a4a5946b11c6ad22051700ed329622f09af1cef09baa90d2407fd32f895eec193505340a
 MISC metadata.xml 432 BLAKE2B 104f398c338d136f67c24b43c90896b50fa4ad1a7ff2c7b4aa395aab0d16ccb2686a97f15e6aa090fbfa52ed60fbf4f8bb062439367bce20c36e91af1a3de68a SHA512 850af8f1bbef92f2b496037854be6f2b0c92d1ab1d3314f8bce773b89427d80b89d9121aff4294c1cf1903c2caaa24aeb85246c77434420871ed377603a8259f
diff --git a/dev-python/plyvel/plyvel-1.3.0.ebuild b/dev-python/plyvel/plyvel-1.3.0.ebuild
index ae20d1026cb1..25f0cbdb9e9d 100644
--- a/dev-python/plyvel/plyvel-1.3.0.ebuild
+++ b/dev-python/plyvel/plyvel-1.3.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=( pypy3 python3_{7..9} )
+PYTHON_COMPAT=( pypy3 python3_{7..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pocketlint/Manifest b/dev-python/pocketlint/Manifest
index a7fece769d17..c4431d874475 100644
--- a/dev-python/pocketlint/Manifest
+++ b/dev-python/pocketlint/Manifest
@@ -1,3 +1,3 @@
 DIST pocketlint-0.21.tar.gz 23524 BLAKE2B b5ec01cba8b73356f08720149125abe1427561b499b53409e5eb41dc2e5c6dc894b51fc8d7655eb94a6b7ec43a3cd94067d170e2a7f985e251497f253c57f6a3 SHA512 af5f3d9ebd67102a3c2b793ff550c6626ead48da7043ac86d4129f6746532fb6c8ce34540b255e649c936c5d8d7dadc116ddc03f86b2a85311327eb10af14ad8
-EBUILD pocketlint-0.21.ebuild 479 BLAKE2B 2616aac24d0efd34edc0de7cc8dd0eeb286934674efb43af5068c75b6506621a821b63d930414ad41d6293a2cfcd93a49d2178f1fd8051e81a67093d6419a7a6 SHA512 69db41a584c88296704a4a3b7a9b1097194e89edbabaf0902c7f7fe9a93a8aee461d57bd9c6efa91da290b5ea2b0b543596f27705c2610f0477f75c41d340c98
+EBUILD pocketlint-0.21.ebuild 486 BLAKE2B 14b03199cae1f854f143cd97bd9454d7c482040e8bc40b1e4eb957c9411f94a8ccd607165c745be95981919f910bb6b77e8c1d08352161b39239eb97e5d98ff1 SHA512 149c1bc6d1492123dcf1840f73226afd06f441f28e082f9841ba2c5882af73143818db33166a5fb14094c8ff7f59311b6698e503d22a4646be8470e8d5ac4812
 MISC metadata.xml 386 BLAKE2B 66a4c2f274af0b1f76bcffd9cf7cc3d67cebe52f79e9e08dde88122f0912005941e4ec45aa20c4cef06775c9bc59b8342067af2aefcb1315b340a8682830270a SHA512 4e7958fb1508b4b5d9462b3ecf3a24efe298aa1af63e9d6746f82cd56410a8607e28e0157ffffcca0ec25bb66257e9072529d4760f2d461444496530848b3775
diff --git a/dev-python/pocketlint/pocketlint-0.21.ebuild b/dev-python/pocketlint/pocketlint-0.21.ebuild
index d10e4c4623b7..758d87d84a5a 100644
--- a/dev-python/pocketlint/pocketlint-0.21.ebuild
+++ b/dev-python/pocketlint/pocketlint-0.21.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
@@ -13,5 +13,5 @@ SRC_URI="https://github.com/rhinstaller/${PN}/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
 IUSE=""
diff --git a/dev-python/polib/Manifest b/dev-python/polib/Manifest
index 4b11c1aa0099..726d122e98b0 100644
--- a/dev-python/polib/Manifest
+++ b/dev-python/polib/Manifest
@@ -1,4 +1,4 @@
 AUX polib-1.0.7-BE-test.patch 545 BLAKE2B 800372796d19d98f47dff73ed593dcbe8a60d55b654258ea5063b702fc3761906754096bc2f4703621378a56ef9589ff5a4c1d7aa6bcef368e293bad9e8b869f SHA512 0b62dadaa7983657901463770a5e7abc41361094c7dba41618881d7328378b989c10b3458c667f15134ad92d0bfebd785f475e1ba040ea11da70352bd8a2cc2c
 DIST polib-1.1.1.tar.gz 154644 BLAKE2B 3dfbaf2fa73d286a60a1fff3e50d8703cf62917b7da0c8b783aaec49b8dcfb927b03b0fe0b411b5f90c2ac89298ea027beb2f0d00ad582a65628d8351397ddab SHA512 38de5fbdbc9ef879a4d55b9fe4f86a3aca3fb90dbb671745bd2b126be443598b8b18fe53afd116c3a4d3efc7a42b5ed05d75569bb5b2ef0bd2ced6e13eda95ad
-EBUILD polib-1.1.1.ebuild 643 BLAKE2B df947685c5296f310eb8869a34e6e89ad2419e29ed810ea1bf3f09a322ece8af76cb2b688e17a06decf218fb476679c6f692c5d0dbb8306f92bc3930c6178d61 SHA512 e87cd22868495ef9302a09b30b0ac87685b947bd8a3f3282ce4098652c1d76d215f7fe6e1d2b334976134a7e049ba3757a4ed9bdfce33a4edeee4502f2e61ff2
+EBUILD polib-1.1.1.ebuild 650 BLAKE2B 2047aea0a6a6481f7b57114865563f95f1fe76ad5799f268d62cf2ee978d09103b9634c52dcd9cad960b2a945ff541768517f179df7af5137c96bced9311bf71 SHA512 089576068a24e92618c437183e8bd60b01f2ea3f0e4037ce1239e47f1bf2790b80dba55a70a80834061c37c4c70d189fb4e2275fecf9f4935a96eab791fb09a5
 MISC metadata.xml 386 BLAKE2B e3f5998d90e39a98ca9e48ad9b3fee30d6e32e143e684a439ebd639aec2aba401a4b858ba27ae33526531c6650f2475c3ef980c067e0a0922138410d46c41425 SHA512 717b7834a63a57242bf1a804dc763160786880beb15cdecafd2a2b393d548cd6445a8ff86a38ef6ce5003468fbd473696d39087683dd04495a4b32e74a835fbe
diff --git a/dev-python/polib/polib-1.1.1.ebuild b/dev-python/polib/polib-1.1.1.ebuild
index 3867ed7a6b9c..166a15e19c9d 100644
--- a/dev-python/polib/polib-1.1.1.ebuild
+++ b/dev-python/polib/polib-1.1.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
 
 distutils_enable_sphinx docs
 
diff --git a/dev-python/priority/Manifest b/dev-python/priority/Manifest
index f55c4a4336ec..cf24554e52ae 100644
--- a/dev-python/priority/Manifest
+++ b/dev-python/priority/Manifest
@@ -2,5 +2,5 @@ AUX priority-1.3.0-test-timeout.patch 716 BLAKE2B b48691b508a4116c9656acaa3a3187
 DIST priority-1.3.0.tar.gz 13827 BLAKE2B 8c100eb44ed42f4f624bfb37dd6f698a3da84812783bd44ba82afef565562379a7677b3cbc9e16c4ea5a5dcc91d0897fa47c341a81bc1875461a72aff328fcff SHA512 cefb13b15e99ef98c37fdd1486466c9e1d7d04b4574cbca1665fde7b7b44cc7d66964bed41184315a9b51bd6f9d0e02bbe113bfa004a754ac270170309b71e0a
 DIST priority-2.0.0.tar.gz 24792 BLAKE2B c230f74aba3153edafba4bf85965a726ac3d3f5e2293d7c496b65fda260722cc44e4582666eee9d715e0d0686695434f8e0cbbd089c105bb45b777bf6eb4d72c SHA512 f90648a3ff1ee4131f30e99ecd8c36110abf484733f507edefcede8fdcb9ec3a618b9278e85724855709f41facee438061e4c5cae201b6e916c22f4a451db575
 EBUILD priority-1.3.0.ebuild 699 BLAKE2B 1c7cceec979ef8c857192b266b7470a5f60eede6da8cc232f6243e21ffb8387a3628f7eaa28fda944239458a59eccc92c8b4bfd9e3edf32f41717a353f7ac423 SHA512 d124b956e3f493146ceaab4b5c80ebaf83d19e94a24b3577bd90cb31fcdbc0e4519f579d8002e5eba21d48326272380f88f3e457bd5a1883cd395960b0f08906
-EBUILD priority-2.0.0.ebuild 641 BLAKE2B f4ea289acc3991e4d3bc8ce6d536da4ffdcdc678f8c56fea1d723c4c6c44c465c3c6c3324131bd74d4e05a780f17f4475e955ae6b829f301c05ce3453ab10e7e SHA512 ac6bb364b934773ccdcfc1f9a8a94bfbe8c1c126cc96efa7cb2042cfa2e6d6dafc5ad651a85f8d4d83e7767a39239cb597706c9008e25a5a6f0631d60fd551b3
+EBUILD priority-2.0.0.ebuild 638 BLAKE2B 69acba21e257270ae15b75d3ed0098282bee0b219a5a314c3295404bc3fd9db6cfce72647727224c8688dd4ad4028c45563be9a50d943320c8be13bf78ea81b3 SHA512 c09ce6829cc1cffd8a578cb1458dec177b44757c6546f8a80db68c4fecaad86ee52b1c175d975188dcf32e15f8b0917df1162331139f11c139be7204f0aa520d
 MISC metadata.xml 839 BLAKE2B 2a922ade07ccabbde2eaaeaac310e1c89206f7a6194ea14cd83f53182270edfd2cca4b1d13072d8a4c81c96563ba3b81251626eb777ced188bc9a22a37dcbffb SHA512 fbd62fe6b97e29566a18a29d155b8b08124d5c1561a21ad7aef7daac1a68b75b48b82d3edc612a27888da0d24ecde73b808cb90dfb7fe78ee97adc5fb507b003
diff --git a/dev-python/priority/priority-2.0.0.ebuild b/dev-python/priority/priority-2.0.0.ebuild
index 21fab37fbf14..775bdafdbea6 100644
--- a/dev-python/priority/priority-2.0.0.ebuild
+++ b/dev-python/priority/priority-2.0.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 BDEPEND="
 	test? ( >=dev-python/hypothesis-3.4.2[${PYTHON_USEDEP}] )
diff --git a/dev-python/psycopg/Manifest b/dev-python/psycopg/Manifest
index d2eeaef39405..a88d910db457 100644
--- a/dev-python/psycopg/Manifest
+++ b/dev-python/psycopg/Manifest
@@ -1,7 +1,3 @@
-DIST psycopg2-2.8.6.tar.gz 383797 BLAKE2B da0e3f1e143c51c940ba1f51d3e457b492d880ab71267dacd4747444bc767711ccd6c2f54d9e10ce5ad8fae0c3206fb4b6199f267e9bbaf12eb654227f59c2b0 SHA512 1e1d5d8755c6d1a153d84210bf29902afafe853659d709e13abc6bc5772def13779d2394690af1c544384c9c607edc0fe5cf2763244fb346febf9a9e0032b45f
 DIST psycopg2-2.9.1.tar.gz 379972 BLAKE2B 89a05f0f3e2f426848641bdf07bee1846a5512dd248d7e4eb4723dbc4f7775b00d142217a5cc59e126eeae8e672173b63de3b1152e3bf14dfaccf5fe7149c88d SHA512 478eaeaad98e4521424a0a48d5f0fdba934bb3b682ba111cc37b833cd3c953ad5fbe2a2071d3a9b95c6a447e95de88887ceda5143b63a08703c388f96dd9b4ad
-DIST psycopg2-2.9.tar.gz 379805 BLAKE2B 4e34b9dc28d0922ae9e9f75dd734b961915a032eba0c4b5ea9c4fe82bff4d5d230b37b0efdb25b8423177fdd7e98e69d0ed6ae0eccd731dca212845966b9c0ac SHA512 9787d0d3bb163815a452139bc3fbde93c767431b3e31c77dd534b6a476d1c09a51e2503b0420ac7a3753ef7fa64c13e2643f4bf4aeaeb60f15ea4eefc3538bfa
-EBUILD psycopg-2.8.6-r1.ebuild 1313 BLAKE2B dbdf3b3a72aa22bdc1d55c9a6b8f67e706a9d13d9e43c0c09bae8a735eb999b19f262d104aaa9196c6189ed5ecebcafbce49f6499e9632d7f56b4d73c48453f3 SHA512 db57102c60158abf196eef91391c3a37a02a92fc6ffb79c57aaeaafa1b771938a1a3b1d048fe6130e9fab326b9a7d46de605090fdca09025baae051bcbd8f7cd
-EBUILD psycopg-2.9.1.ebuild 1314 BLAKE2B bfb0b2322085761cc582386671dbe273daddb7173bd142655dbbdd4ed395b02771ea5e367dce2513f9c32622f2baa7409ef3b5b8898ae1d9b68937301279f099 SHA512 972033aa2d972de28305ee1560f841bd80ca0890f2cb2c823acf91d60148c2d7abd01ac711294835b2efb09631ded33058179f501cd89b49a71d3c320e8d328a
-EBUILD psycopg-2.9.ebuild 1320 BLAKE2B 979571fb982c3f10bc2e372ca057f58dd5853c548b5f0c6f323fc21130bd28a0f63efa73185401b104ef7c7ecab9a02d6b1031cdb21a94d6efa6e77fc3e7b358 SHA512 80df76f557598a869ae34a7f917863de7c93ce1a66dc4202fa76eddf360360019f45e98cdd5e7e7b3029201d41602f5bb8f502c4644825bf5b2f87847e419e92
+EBUILD psycopg-2.9.1.ebuild 1313 BLAKE2B c2bce21b2419eada56725d5c0aa64a6e9de12e1bc917818ccda7e0f8dc908bcc4339d449cb3dd97918be299734f113dfa4167fd9ad934fd8cdc102a8e74adf3e SHA512 aa2303648975b85fc26f388997fbad3111c20a2c3c92ce0ff5aeaec4bba080b3018baf7bf3b2ce7bbbe004a2d884d4e44e966414797ab88bfddb598998a5b499
 MISC metadata.xml 321 BLAKE2B aff48bec04e34b92668aa18214d86ddbedef2376eeced4815118d35eebfb8e6af87234a9470828f465626f7d9ed56fe0fcb8f078c23945371248136533651ad3 SHA512 358b751b3a65f64ab5468bcf4022315f7069a2fb60709c2bb12ac02577866a3ff24ab2dd69577052070cf010a51428cb3ec385ca7cfe48640f4dd25ae478a966
diff --git a/dev-python/psycopg/psycopg-2.8.6-r1.ebuild b/dev-python/psycopg/psycopg-2.8.6-r1.ebuild
deleted file mode 100644
index f14410ac8a4d..000000000000
--- a/dev-python/psycopg/psycopg-2.8.6-r1.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..10} )
-
-inherit distutils-r1 flag-o-matic
-
-MY_PN="${PN}2"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="PostgreSQL database adapter for Python"
-HOMEPAGE="https://www.psycopg.org https://pypi.org/project/psycopg2/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="LGPL-3+"
-SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
-IUSE="debug test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-db/postgresql-8.1:*"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	test? ( >=dev-db/postgresql-8.1[server] )"
-
-python_prepare_all() {
-	if use debug; then
-		sed -i 's/^\(define=\)/\1PSYCOPG_DEBUG,/' setup.cfg || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-src_test() {
-	initdb -D "${T}"/pgsql || die
-	# TODO: random port
-	pg_ctl -w -D "${T}"/pgsql start \
-		-o "-h '' -k '${T}'" || die
-	createdb -h "${T}" psycopg2_test || die
-
-	local -x PSYCOPG2_TESTDB_HOST="${T}"
-	distutils-r1_src_test
-
-	pg_ctl -w -D "${T}"/pgsql stop || die
-}
-
-python_test() {
-	"${EPYTHON}" -c "
-import tests
-tests.unittest.main(defaultTest='tests.test_suite')
-" --verbose || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/psycopg/psycopg-2.9.1.ebuild b/dev-python/psycopg/psycopg-2.9.1.ebuild
index dd341bac2755..f8f15754549d 100644
--- a/dev-python/psycopg/psycopg-2.9.1.ebuild
+++ b/dev-python/psycopg/psycopg-2.9.1.ebuild
@@ -17,7 +17,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="LGPL-3+"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="debug test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/psycopg/psycopg-2.9.ebuild b/dev-python/psycopg/psycopg-2.9.ebuild
deleted file mode 100644
index 7a7e34f73507..000000000000
--- a/dev-python/psycopg/psycopg-2.9.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_{8..10} )
-
-inherit distutils-r1 flag-o-matic
-
-MY_PN="${PN}2"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="PostgreSQL database adapter for Python"
-HOMEPAGE="https://www.psycopg.org https://pypi.org/project/psycopg2/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="LGPL-3+"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
-IUSE="debug test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-db/postgresql-8.1:*"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	test? ( >=dev-db/postgresql-8.1[server] )"
-
-python_prepare_all() {
-	if use debug; then
-		sed -i 's/^\(define=\)/\1PSYCOPG_DEBUG,/' setup.cfg || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-src_test() {
-	initdb -D "${T}"/pgsql || die
-	# TODO: random port
-	pg_ctl -w -D "${T}"/pgsql start \
-		-o "-h '' -k '${T}'" || die
-	createdb -h "${T}" psycopg2_test || die
-
-	local -x PSYCOPG2_TESTDB_HOST="${T}"
-	distutils-r1_src_test
-
-	pg_ctl -w -D "${T}"/pgsql stop || die
-}
-
-python_test() {
-	"${EPYTHON}" -c "
-import tests
-tests.unittest.main(defaultTest='tests.test_suite')
-" --verbose || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/pybind11/Manifest b/dev-python/pybind11/Manifest
index bb47c1e5980c..625b6f8e2fd4 100644
--- a/dev-python/pybind11/Manifest
+++ b/dev-python/pybind11/Manifest
@@ -1,7 +1,9 @@
 DIST pybind11-2.6.1.tar.gz 634179 BLAKE2B 33f057e88e45985a0475783b8931ec669a16efcad5d66ecb265744155e9941b2d618391a36bff1d8c1c2d74a7e0b41de50b26eae689215d4585542fbd4282cc1 SHA512 8730efec82eef8dc09a58ca3e3b28fca45880cef85d32aa5524a8fe64e23d5f6dff4ca1b48b3034a287199bd56f4db4d6806c5358bef66fde84ed0fbf80ec264
 DIST pybind11-2.6.2.tar.gz 647954 BLAKE2B e336d626d314538123a121d48998b15d9d16b80a6a513e85b4ef2b3179f73732ef23b85ab91d815f15c31f7e2c5091192e90b9ff8e727725882963a895367612 SHA512 1eb346ff6b8f827053265340925e2c8038b1e2a89c352fc09f15ebe86128e7ba1f48c4368b193941f034b30bee7f72a94343e05d4841fdbbd0e4d91ed3d32025
 DIST pybind11-2.7.0.tar.gz 666200 BLAKE2B 4f78493ecbea5068dd9ab6771c9b33859baf3e14a82a6a3b361a11620ce6495763f94acca0c0a9512fa92343fa2ff91fa3e2ff7f30731bdda823b2b3fc139302 SHA512 529596c8762f463868f942ca9c4d3e4ed141bc09c734defeeace2b0250234c3359ef1f231997389fbffca849e01ba1feb8d7edc385745b6d964771aa67ced720
+DIST pybind11-2.7.1.tar.gz 668217 BLAKE2B 92d857f14290ee0717bd9f9b871dcecd6c0b36209bb9879f107c8542326fb0cc42c051f3bc12a8be50df892f1e26c26b710f60ed275f0dff206e30149547f2b4 SHA512 f09f46622b394d3990ab82aa7ea15a06e298df109cd2df263ba9d6ac7fb248217df7450e1954a9679a8360335d5bbf662926a34c8b7c61b6e4c396bbdfd88305
 EBUILD pybind11-2.6.1.ebuild 1161 BLAKE2B 7659fbed755e30d43df45a866c38f04aebfb31522b2af3985977eba7a60789fbae631d404165610aa1968f0c276cbfab41e56a158ffdc32a7c47bc360bda2bab SHA512 1484031b362330e62f4f7e7d65ebcc2bc4473aaff5fff1c7e9ebbf67d914982074490295e640625a9cbd198e97334ec6814e5b52977af04285861f94fd41a461
 EBUILD pybind11-2.6.2.ebuild 1090 BLAKE2B d257373dc4744344f2e862ae70e35e620e4af9b0947e53ab16255b5d3018defe9860f48f6b72952ee817c7cfade63b3153120500f0a0558553ed5ff7bd39837c SHA512 7ab5833a1cf3a908a0b20ec135926029738a44681ddc346a4c0a5a220cd9ff850bf7ac2739cf25a996e714cc7e34e5ffb604378c1a76dfe0c8f6057e01d75415
 EBUILD pybind11-2.7.0.ebuild 1093 BLAKE2B 554211e048af6889ba187b6685d374cd1784395c8a5b87c30a04929b967987ea0cf7c2c8fa0dacf218dd5b7621d871ea77e2982b20f21a9142a8de88236e5d3b SHA512 93d2a3fc91065335b4e6165c910a1e5afd553f7e295fe67da427f35fb744447b0cfaac413f58a7be60e2d22be5d3f955a675353fa5c1bed834ec5707d9c8ee68
+EBUILD pybind11-2.7.1.ebuild 1060 BLAKE2B a5cb3518bf63d86385ec59ab367caf7128bdeee31d40c6c67f600593a0360441212971efd04fad0c55f3392b842edcb65f460557c001b8a1c3af534cdc338f17 SHA512 68461a9589597ea080c5d24ded5352d3c8e9632f38a0150af9733563445cf9667716877f0eef85ac4586635665456483a030c4c77cd9a7a4778d89aecf2e474b
 MISC metadata.xml 419 BLAKE2B 4b76037af5a23b231241e9d53f12dd3866cb07811888d1de3e022d3ea812a83a17856107b257f608343aafe763975cfa621061e225c7ecdcc175f3bb0b8a51a8 SHA512 b17fc1d7231812f22077e7feb0400a3c1e9b66f29c125457b5cf568694ef35332d83fdf405d6c849df55e1f0e517a8c25ecd6f24d1d67ca6654cae8522bb10a2
diff --git a/dev-python/pybind11/pybind11-2.7.1.ebuild b/dev-python/pybind11/pybind11-2.7.1.ebuild
new file mode 100644
index 000000000000..903b46f35328
--- /dev/null
+++ b/dev-python/pybind11/pybind11-2.7.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..10} )
+inherit cmake distutils-r1
+
+DESCRIPTION="AST-based Python refactoring library"
+HOMEPAGE="https://pybind11.readthedocs.io/en/stable/"
+SRC_URI="https://github.com/pybind/pybind11/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+
+RDEPEND="
+	dev-cpp/eigen:3
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	export PYBIND11_USE_CMAKE=1
+
+	cmake_src_prepare
+	distutils-r1_python_prepare_all
+}
+
+python_configure() {
+	local mycmakeargs=(
+		# disable forced lto
+		-DPYBIND11_LTO_CXX_FLAGS=
+		-DPYBIND11_INSTALL=ON
+		-DPYBIND11_TEST=$(usex test)
+	)
+	cmake_src_configure
+}
+
+python_compile() {
+	distutils-r1_python_compile
+	# Compilation only does anything for tests
+	use test && cmake_src_compile
+}
+
+python_test() {
+	cmake_build check
+}
+
+python_install() {
+	distutils-r1_python_install
+	cmake_src_install
+}
diff --git a/dev-python/pyclipper/Manifest b/dev-python/pyclipper/Manifest
index b3caf1b265c8..f568df663d4a 100644
--- a/dev-python/pyclipper/Manifest
+++ b/dev-python/pyclipper/Manifest
@@ -1,5 +1,5 @@
 DIST pyclipper-1.2.1.tar.gz 51862 BLAKE2B be59011d44ba4364e3e0d1d789c10f76635a5bc690dad8030104fa7965cc118e3529bf6505e5c4e743a8ff21e0d24129be716cd91e09b7521baa64359de364ab SHA512 0fc411bd8fa33fc3e5a71ec149b720b5c2f2e9a5e704d5e175b5930e0e073bacfd26b68e19c00802ab68e7a8946bdfcacae858e2d6d81b87d85b3747fa4a316b
 DIST pyclipper-1.3.0.tar.gz 51405 BLAKE2B a7a3e81452c8178d907528b7595fb92521dfb039a6ea116d7f189639ea2975d8058ac1f685a211c98be921c41a694d89f7f431264dfe366e3acc842b25d670f4 SHA512 bee6c5f835e84baa65cbca1d812219bd94272010bbeed365b3835ef3d191042129fdcccdd85ce7841f60f46cbfd52edd270d108ff81d64b0ca712c1369394d40
 EBUILD pyclipper-1.2.1.ebuild 807 BLAKE2B 0f9f25ae0280910804565438dce15dc39369b8533da1652524cc5cd04fdb96ff72577ff8cca71917b88281e473713585536e7b2010cc9943c33408f5699dbd12 SHA512 299b9f3c316d2a029d49e39005a8376f99957b9ca6a41eba380882a932493e94d21a92ec7bcdc26aa1052c629a4ec81a403377f72820e62dfe33e3f805e95df1
-EBUILD pyclipper-1.3.0.ebuild 811 BLAKE2B a8d1d0c90a6997525589c5b136776fe4d956382d045dd3823824865e16026e864eabfc63a9fe2db68ef2ae48e7dc916a62d1b6f86c8d614a583cfe6f533be78e SHA512 4bcbad102d89e991cb47c9ea4016225c7a2355c9a2029f9c8e3987f5e40237721af7e669a961a95181b8daab55f93aa7d2547bec4424a31b8dbdae65f08ff0c8
+EBUILD pyclipper-1.3.0.ebuild 809 BLAKE2B 246d4044e50bbb6b6b61d390a2445dc30444378342f892d45ef376e6dfa157940588ab16e142fbab4b3711e7209b0386b8adc3e34ee277ac9614a256c1098228 SHA512 d6d5db457d009c947fc0adf436236e9d51e00821a567869dc288dfb2ad737017bf12d47a78aa1dd9d7546e1ee43b6c5f3d058fa8a2a5d36cc8ea689fdec9c973
 MISC metadata.xml 315 BLAKE2B dfea428911659d721c46baf73e32549fd98d51aa056ef26b98f305f447292b75a1ddde062602dbe03cf4b7f4e08d0a32a7e085463df1e650ac40f997cd6c0c9d SHA512 15f70085b3bba01136c37bc97ab84749d0d6f99e785c753929c00c3f9de7cec360804f44001954db05d650eae634038791533a1d02e9e1286e8fcdffda3bf597
diff --git a/dev-python/pyclipper/pyclipper-1.3.0.ebuild b/dev-python/pyclipper/pyclipper-1.3.0.ebuild
index 3bbd1db8a19e..21a820a03b7d 100644
--- a/dev-python/pyclipper/pyclipper-1.3.0.ebuild
+++ b/dev-python/pyclipper/pyclipper-1.3.0.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${P/_p/.post}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 IUSE=""
 
 BDEPEND="
diff --git a/dev-python/pyenchant/Manifest b/dev-python/pyenchant/Manifest
index e538eea11372..6a3ea169db2d 100644
--- a/dev-python/pyenchant/Manifest
+++ b/dev-python/pyenchant/Manifest
@@ -1,5 +1,5 @@
 DIST pyenchant-3.2.0.gh.tar.gz 75395 BLAKE2B bff9d4d5038252473fd7673758ecf1304f74f96514d984f5b6cd052042d0b2cf6fe2e149e3675777899107794c9d2fe1c630e87b031f38512ed2499ee1053f34 SHA512 63ca44aea9e7af3fecf554dc6156513c42d278a92170bd6b88b71a737def2e9fe7f7d2ecafd5fea2b860b4d5de55c9e8a6e4b30a58d6f28533bba71cc407850c
 DIST pyenchant-3.2.1.gh.tar.gz 75501 BLAKE2B b70a47484a7f242ff42aa0018f495544f9e7bdab904f835bd52533c93bc28b06ab155132158d2551b9c32eadee83418b6bcb70becee769653196a9bb0d13f130 SHA512 3d1229307b070fa83bd8a287a787b40edfba31e748ca37a94f71caa4b355a9de829f3133db9772a57f0aa922fbd4f32c67c986e86c8905633b3940dd20be32ed
 EBUILD pyenchant-3.2.0.ebuild 632 BLAKE2B 87b17e54a5a4993a3607c153b015b64b081eb4d512f12d0fae660a8b806188c3ca372762f42c71fbcb9d2379e0c84ec67f5aa9f55e1db54e25f1e0d2169d5093 SHA512 8c7a4d1c799f2b7af00cb65e9edf831fd8a4b4a202746113e6325d03a0e76a1f65c9764511d825888846e5807e0478fc581aa885a129e9b77cebe98d474d1d50
-EBUILD pyenchant-3.2.1.ebuild 636 BLAKE2B 4a90ba0d1a547a0877eeecbed4417683a47d0bf52230d5f5fbe92c56678e76636660ff6cf88a0590dedf9cc73d59b6718087f4a071294d5f25af707314b69fc6 SHA512 77eccbcd8775979d47796fcfa8519022aa6f55f8a6f29ba0fa1ad369b17cca4a0ffbfcfa59ab6b716c1759bfbdfb83112d1245b7cfad7918030a66f8f1c2537f
+EBUILD pyenchant-3.2.1.ebuild 633 BLAKE2B 984d03f4c5c964fdd6a539b906f5035872708d408eb6a6734b7937dc96aebb895a077ac5e7fe44b4df23aa684d52be715d1e140efda3c12483e8d980414ee919 SHA512 7351dc87eff6d555552a30c0db798d35cde13a5dff98b6d290dddf4997507721c4f5d6653d99447194fb2b81416e485bfb0677ae1a6b0be36d53b3b65de885cb
 MISC metadata.xml 876 BLAKE2B 4b2b615496f92b395ca4449e8caba7860223101e142d45f3eb703e829d34b27a0e7b3965f7362739ffc16a61d4e5f495754415047b41473303982eb2bf35e528 SHA512 7e69e0da10236e15c70526eb35b2ae8d862109e3aaa81a2613f5a97ba08816eb71e76a845a0656dbe2a6bc92b45a79ab018386110aa7fa0687b3faba18c63129
diff --git a/dev-python/pyenchant/pyenchant-3.2.1.ebuild b/dev-python/pyenchant/pyenchant-3.2.1.ebuild
index 2b5bd2833aa1..e029c11278ae 100644
--- a/dev-python/pyenchant/pyenchant-3.2.1.ebuild
+++ b/dev-python/pyenchant/pyenchant-3.2.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 
 RDEPEND="app-text/enchant:*"
 BDEPEND="
diff --git a/dev-python/pyhcl/Manifest b/dev-python/pyhcl/Manifest
index 14e797402b0c..79baf0ed6123 100644
--- a/dev-python/pyhcl/Manifest
+++ b/dev-python/pyhcl/Manifest
@@ -1,3 +1,3 @@
 DIST pyhcl-0.4.4.tar.gz 58400 BLAKE2B 89ce8ba1eff577d9b4c7a86931e305f94ad7633b83c27f44352658ec2a12e48fd0cb05619e4afd97e4f2d78a9f4dba5c082a0d5703060b629880a3d193d9b4ee SHA512 7c5e2b611d1198a0e6c667b8fda868231bdd25da822d634a34c076fea655a7ea2999fc827de8484992efcf52b6b843871713a83e3be7787003c90f05e3e7ddf6
-EBUILD pyhcl-0.4.4.ebuild 806 BLAKE2B 0be078a5df5857c1e7425f9bda2db0a2234bde032a3ee103aaa5563aa949ebaffdfa0e08d0b35b07f2e17ca456267cc1b761d7f2d67499b886926f92c50d5e61 SHA512 a36b63dfcb1f91bdbfc4b7d44d60e2477faf06054c03cb2443ac1aaccd01ea217b661acaef2ab9d61245963561d1ffc78a9162515011879879c0fd0ac65373d7
+EBUILD pyhcl-0.4.4.ebuild 802 BLAKE2B 6c09db1a22a32c78a20341b530ca539f493f0ea6d96e805f10c149f01a7298f289e28efea8ec316c9381dfa362d5975e0e18b379e7e0918d51aa13cf13a72cb3 SHA512 2a33dcfdb7a153d95fa190aac7fd478d51c7b89d9330c57c781ebac570ef13259e81dfc8c880f34e8a702b43fe7704f547357cf21558db1dd6be91c7d229cfd5
 MISC metadata.xml 504 BLAKE2B 829a8f8466ea2164836482d43073fdbcf8eee25aa17999b1f5ddd36971dff10fc9e42cc7c1b4a5c6be72bb6307f46c40bb657afa8760659e9fbad0b38142fb33 SHA512 7ca7aac67d55ac7594e805cbb493285d69bd751a30bb127713f736f0c1b2f1d5b795fa48001b3544c920512e3b791b3bb2303647ce62d94781bfa279afe4dd26
diff --git a/dev-python/pyhcl/pyhcl-0.4.4.ebuild b/dev-python/pyhcl/pyhcl-0.4.4.ebuild
index f3342b15ce58..62857bcba53e 100644
--- a/dev-python/pyhcl/pyhcl-0.4.4.ebuild
+++ b/dev-python/pyhcl/pyhcl-0.4.4.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 # tag:
 # git describe --tags --long
 LONG_VERSION=0.4.4-0-g314cd32
-PYTHON_COMPAT=( python3_8 python3_9 )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="HCL configuration parser for python"
diff --git a/dev-python/pyjsparser/Manifest b/dev-python/pyjsparser/Manifest
index 298ca6712ff8..1e18be698fe0 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 762 BLAKE2B 22a787218dcd7929ec3c80534501e5b3a912f83013ea4348b1633b2b3b043fd722e8244b93e9daaf709de49b5c0afbae6c9257653c30586699726f067fedc22d SHA512 e3cf5eb38cffb1f298e6839a888eb27fd3ef71cc991f1768b96cdd9d3aeb4bde8dad6b88f96d6a23fec97cf61a9a8aad5ef9c2178e7c7d965236b6052db09c8e
+EBUILD pyjsparser-2.7.1_p20190421.ebuild 760 BLAKE2B e646082147b0c45c062364180515ef6666480e5782efbe0706073b18baa862ab5e1f86a19b38d73212b90bc1bf136fc38ad2210b6f5fae30c9612e545902d91b SHA512 115154d9319a6b8f5a20915622d8bfd13818cd185573be145ea3d41ffd2e3e12256576e3431b8ec8c3c0d2660c22b73e62e5b7ad94b433fd9bf1282d17248631
 MISC metadata.xml 582 BLAKE2B 5abbbf08ca42bed861709c7e8df70074112efb8d5270cd628fa26902f9083a242ad9ab63a6aa1f74824a2eab29738c46a3fb0684182fbfe5d692ff35d0c86570 SHA512 ca17ca99b83926f956af099be27eb359f4b2b9be425e68e95abaab8163667fa744b12734f6b8e5f72a7e3e1f9c3d684e4b1c23e3b954495575ecc934f2528c3e
diff --git a/dev-python/pyjsparser/pyjsparser-2.7.1_p20190421.ebuild b/dev-python/pyjsparser/pyjsparser-2.7.1_p20190421.ebuild
index 21099184d643..c8bb95c2269e 100644
--- a/dev-python/pyjsparser/pyjsparser-2.7.1_p20190421.ebuild
+++ b/dev-python/pyjsparser/pyjsparser-2.7.1_p20190421.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/PiotrDabkowski/${PN}/archive/${MY_COMMIT}.tar.gz ->
 RESTRICT="!test? ( test )"
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 IUSE="test"
 
 BDEPEND="
diff --git a/dev-python/pyproject2setuppy/Manifest b/dev-python/pyproject2setuppy/Manifest
index 0c47e24dd3ea..c5afe829c9b4 100644
--- a/dev-python/pyproject2setuppy/Manifest
+++ b/dev-python/pyproject2setuppy/Manifest
@@ -1,5 +1,7 @@
 DIST pyproject2setuppy-17.tar.gz 12191 BLAKE2B 5be19c9e70abf37d776649237581b1cb281331585c6ffa312f63e50bd2fd8104972861b38958272d5eced086b2a60ed370437807d1eeb382e4ad0cde5f03b0db SHA512 0291f9ad1c3059a4ccd366d8f1078ffd57de89cc128e996126f62a92ac4dded9c7da25be1325ca9f660062ba3a65fd01d62d4ffb22084cec7f4aba79e552ae2f
 DIST pyproject2setuppy-18.tar.gz 12566 BLAKE2B 424aac4c89f498cca61b18bc1e8da3dd72324014d04b2a1e0b7d9aad48b445ddf95117902f6f2d80f9c0e1f3ac808d22dc62b31a2bc41f59820765e49de56a48 SHA512 f29f262ea59cccb698e82de630c8de40fae5a758e71b741c5c5e26639813bc45de13d1479b92a92aaee24edc71ea6f66b0484bba765c4d66eb10e0487bdef080
+DIST pyproject2setuppy-19.tar.gz 12531 BLAKE2B c5364f9f31a9cd23252664e69d252ebff579e965585db338587557d7bbf78ff346e6dc9d6cd20abee332ef7675f3246f175c4a1694bfefc434ffe1563c1158e4 SHA512 1f18f39779e4078d9e3fabebfa8cb279cab80b97ce9aa4dfe5a84019b16bf6bb973dfeb0feb360f36fd93f8106d847602e21589859ca3d7837a78ce1572ea6ea
 EBUILD pyproject2setuppy-17.ebuild 781 BLAKE2B 7777a59955f823ae46991f592da9815467690ea129b0c68449e217700f8e5af25de53407c486245367ecb104a1e8ba570237881de37f9e569a7090ebd5e78386 SHA512 35d001fa3ba56ca4ce3748741dcc1c0761385f1416bef7f8d246d62ded57b94b38c5b2c12343d1635198d9dd1114286952f26e93e3a0bf947487750a84cc8f94
 EBUILD pyproject2setuppy-18.ebuild 789 BLAKE2B fe0e00600f65bd19118748c645d47c6bdc820037a301c847ea5070e7d6d73e469130fd9fbabc01facf39bc93dfe3edc7ebcc5c2c9511bda969eed68d03d228e5 SHA512 2e839ed0a1bd1e69ef9d505c0e2ff0236e093d76bb1018908f08207cb9830bb018c2d1ed8f511e6ac78f9525b533c1a86708b74f2e69bb0dcf3f2277a41a9293
+EBUILD pyproject2setuppy-19.ebuild 784 BLAKE2B cc64e9f18ddbafee29ecf10fadcde495ab198a1a26296295a5bd70ce7b2c12cbaf49c8dd94a6ce2dbe21aa06d48988b3880785a65d855d0b282bcde82076f29f SHA512 542d090bd6da15a67c7a443676e83e7f5a631c871279b0fbffab9f50d0787a43965687831e3ae31abc92e5d578daed5ae9826ca0aee2ed9a5b81fe77a1da525a
 MISC metadata.xml 430 BLAKE2B 934e5a791bb16f3717ace5fa869aab4998938109ee14ca1ae0c9c378d67366060b705ff4430f3d267d33c04cf23ffa0b4c1b2654b2a95d586fc22ab4fb43f8f9 SHA512 f52d07edc973dc7665be77367cfdc37d92f27adc730a327c57374b54b60f77802b79ca5f2ebfce2c687090763224e5939274dcf4fa2555834c580cb06c32419d
diff --git a/dev-python/pyproject2setuppy/pyproject2setuppy-19.ebuild b/dev-python/pyproject2setuppy/pyproject2setuppy-19.ebuild
new file mode 100644
index 000000000000..e769cb4874c8
--- /dev/null
+++ b/dev-python/pyproject2setuppy/pyproject2setuppy-19.ebuild
@@ -0,0 +1,29 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_SETUPTOOLS=manual
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="Cheap setup.py hack to install flit & poetry-based projects"
+HOMEPAGE="https://github.com/mgorny/pyproject2setuppy"
+SRC_URI="
+	https://github.com/mgorny/pyproject2setuppy/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/tomli[${PYTHON_USEDEP}]"
+BDEPEND="${RDEPEND}
+	test? (
+		dev-python/pytest-forked[${PYTHON_USEDEP}]
+		dev-python/wheel[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pyscard/Manifest b/dev-python/pyscard/Manifest
index 6cae00c4dfe8..538e5e5ba0ab 100644
--- a/dev-python/pyscard/Manifest
+++ b/dev-python/pyscard/Manifest
@@ -1,3 +1,3 @@
 DIST pyscard-2.0.1.tar.gz 149193 BLAKE2B f140e3e62635634de8125d88c69e4ac3657468eef04798b4ce5b20d73905189ced71f041ef7742233a185aff8b28cc0fcda5af175d6dff21afeff84f062afcce SHA512 c9292b9616f150e500b308c47b0d6ed6f869f2022149c99a7789f8fef8c145dec4db84d35b6df30fa31d4007dffff75fcc21c9846693eccd9bd3bc8ec77fce5a
-EBUILD pyscard-2.0.1.ebuild 689 BLAKE2B e43f6bc8cd4bc377adf932b497f4ecfa793d054f7e380b54fa7c43eb5ebdbc222ad4e0aa27a746b0c9e049d591b4b83cc5ca3d0f2cb9596db4559e960283e3c2 SHA512 ff90be9d70d0886b04429ddcf1dfc5a109a8cb380b84fdfaac472b877d5e1e6d5bed76369780591d99e77b532fa69418f988c2f2dcd20a31929eef665b0b2d44
+EBUILD pyscard-2.0.1.ebuild 696 BLAKE2B d562563800900c5c71f3d30a0b4e56e53fec15250a9145485a2f36239b8e8bc59cc2b309511dec66e2f79666e441ce3ef35fe964e47780ecb8c861c5d70e5c49 SHA512 f86ec47198295f5b6b07378de3e14c10ac720a898f3f4d3f9ca9b8b13833cd4ab0454de3fd20b4f983285731b1f0839fec0a4dc47b6f43e5594a21a8f5e6116b
 MISC metadata.xml 425 BLAKE2B d08b4263a97d671761cc9d5ba2084ce7ecef3d10031371ec4bf5deb4d43d840dbc34787d69c353ff0b2acaade7e50c512c15fc41cc7ee6a14d295a7ccc9f3019 SHA512 75d4e0a2023ee036c4b48f3fba331c9b97dafcc53cc9d071196bf08a5bef4e51c254eec6a1d7258b5bf5b14b93860ff5f16262983cef7b7cfbec9e05f6a806dc
diff --git a/dev-python/pyscard/pyscard-2.0.1.ebuild b/dev-python/pyscard/pyscard-2.0.1.ebuild
index cfd7922e7568..7aa7611328f0 100644
--- a/dev-python/pyscard/pyscard-2.0.1.ebuild
+++ b/dev-python/pyscard/pyscard-2.0.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="amd64 ~arm ~riscv x86"
 
 RDEPEND="sys-apps/pcsc-lite"
 DEPEND="${RDEPEND}"
diff --git a/dev-python/pysol_cards/Manifest b/dev-python/pysol_cards/Manifest
index 5d375c427161..4c5ae7c2ba2e 100644
--- a/dev-python/pysol_cards/Manifest
+++ b/dev-python/pysol_cards/Manifest
@@ -1,3 +1,5 @@
 DIST pysol_cards-0.10.1.tar.gz 20670 BLAKE2B 1183502ec0e7c070686ed5fc2972091a5bf91d55e31170690124e949bd592401daaae44cf25e3ac9b213230e27fbc90ea9e58450d75caa09b9467f0d2ba513cc SHA512 40ef02fe919f961688039667b9073913acb452d163eef1a4ef71648788676c678bf615a26b1f4d562ba072167eb3629c4cc463678edff89bfdc62b0878db062c
-EBUILD pysol_cards-0.10.1.ebuild 549 BLAKE2B d0efad37cad0c2b2487c636a1c056daee49f2b7f4d97972e8816f0e95c20d19a9b6361ac55e8f40720872f9b72d97d0ebc9d0e65edddb4f509c1cf217ca5bdfa SHA512 0b9a1009fb16a1533ebcbc932740b256490cf56d8c13b055684db5b10cfdcd2cd96a03e075463d5a39e84a7aa985b49d7f1a5b8b53f2a2f100d90714e7fbf68f
-MISC metadata.xml 289 BLAKE2B daedbd790704b3663910c8067dbf69dd886eafcac1aad5b2cc18f54a8dc74596a9a4821a945250e2ed997c754151995b675965cbebc64abf5445c1c63db91ba1 SHA512 f48ef730220d3520d2230ebb0caee8e3456c8b8b7255bc978944897c424d1338f7d7a865c37455d279fdca077fb1436233fcf085564b1d1e9802d28e35d7fc1e
+DIST pysol_cards-0.10.2.tar.gz 20776 BLAKE2B b9f3f20e983453196a7db78ac81c17eb35f157e6419a9dd25e6286ab82763bf2a1601177e41abfe0f49367189a4a78ac66e4f77151c52acae006e3198ff8c524 SHA512 df8848c63ad12496c4346fc51fbac803b7a27c274147d458c78f937b70c804cddeeece8c6a980ef2a422bb17771ee1825c9824843e7d1cbc47e3678e506a30c5
+EBUILD pysol_cards-0.10.1.ebuild 581 BLAKE2B ef43c60fbc25caeb2cc59c6128330e8604a27f51c75aa1f2ed92e00ebb1605824adadfd0317817f8114c71037abb931eb4ef1ce5ec4431136c0a2d0a7fac99fc SHA512 e8aae83b09903e958a768c786fcad3ab19979d272f6180ea572f1e697e28a437a1b1f0c2359d42309bbc42cc96a50443581e3664a82ad4427e5cbbc63d8fb39c
+EBUILD pysol_cards-0.10.2.ebuild 584 BLAKE2B 0c99a56bf7e33a5c5cf0637a64faf2718734141da372a289a270f395c9118d3de4faeab70c3fcf0a6f4bed61ee1a61f355e625136a23c557c89e36935e8bffac SHA512 7da62defe664a7621654c8e41995977a535992e0d771c4b41e428e79fe4b20c4b2c061b0b166847ab74feffad283ea8f81cc5517bd5b8aad3d47f92a71eefe98
+MISC metadata.xml 313 BLAKE2B 93d91c2f05938e3698e3ee364bf509571ee4e4deaa3ae27179e9a9b54689936410df4d49f69431ea67e8c6ed780688577d30a80906870c49d4348e72f07a29c4 SHA512 ec49fbd1703c3c27317b42b4d2909596608a52c8193282dba84a81440ff2564e22187c8974915845f01dd0301cb0b6061362352238276084d6e5ce86e9a99b7f
diff --git a/dev-python/pysol_cards/metadata.xml b/dev-python/pysol_cards/metadata.xml
index 1b3bb96f4f8d..c62bba65117b 100644
--- a/dev-python/pysol_cards/metadata.xml
+++ b/dev-python/pysol_cards/metadata.xml
@@ -7,4 +7,5 @@
 	<upstream>
 		<remote-id type="pypi">pysol-cards</remote-id>
 	</upstream>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/dev-python/pysol_cards/pysol_cards-0.10.1.ebuild b/dev-python/pysol_cards/pysol_cards-0.10.1.ebuild
index 1a4f5ba807c9..eea6d82458cd 100644
--- a/dev-python/pysol_cards/pysol_cards-0.10.1.ebuild
+++ b/dev-python/pysol_cards/pysol_cards-0.10.1.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_{8,9} )
 
 inherit distutils-r1
 
@@ -14,11 +14,12 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="Apache-2.0 MIT"
 SLOT="0"
 KEYWORDS="amd64 arm64 x86"
-IUSE=""
 
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="
 	dev-python/pbr[${PYTHON_USEDEP}]
 	dev-python/random2[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
 "
+BDEPEND="test? ( dev-python/oslotest[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests unittest
diff --git a/dev-python/pysol_cards/pysol_cards-0.10.2.ebuild b/dev-python/pysol_cards/pysol_cards-0.10.2.ebuild
new file mode 100644
index 000000000000..7e42f93af853
--- /dev/null
+++ b/dev-python/pysol_cards/pysol_cards-0.10.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_{8,9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Deal PySol FreeCell cards"
+HOMEPAGE="https://pypi.org/project/pysol-cards/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/pbr[${PYTHON_USEDEP}]
+	dev-python/random2[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+BDEPEND="test? ( dev-python/oslotest[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests unittest
diff --git a/dev-python/pysvn/Manifest b/dev-python/pysvn/Manifest
index a2358ed25347..a507887f2bb4 100644
--- a/dev-python/pysvn/Manifest
+++ b/dev-python/pysvn/Manifest
@@ -5,5 +5,5 @@ DIST pysvn-1.9.13.tar.gz 666722 BLAKE2B 4ada83f474026976309b8fc7876dd860fb68eb73
 DIST pysvn-1.9.15.tar.gz 667161 BLAKE2B 35e9e0967d5c0b4cebf546e40df17b66c66406d0f8100c32e6e840220f60b0083c0ed3f3af5f54e2264d06905ea90970d6b7cbfad2bab872a14d5d4aea5900df SHA512 0809507134fd31f6bcc90217e7840eb166e2eb2ed56316010a549dd70f6f855599f596942574343cdefd5997947b12c847df2cd145669f50aa93f603e46a5ee0
 EBUILD pysvn-1.9.11.ebuild 1324 BLAKE2B a4ba06214b0f6343ff0c8af7c86857cd9565c10dcf24a70445bd7c1627828b4abf0afa015e58df190b74b6b7aae48b9fd06278b3e657988d5a7f4abeb0a1ec41 SHA512 66fcd0af0e02c94a7338db96a4fe6a29f955be2ce23f7eb580996e695d727f32985b96db1e35a318be54fce628b931e2387ba9d48de8a3155a13a1d236e0f432
 EBUILD pysvn-1.9.13.ebuild 1750 BLAKE2B 13751eb3b69b91a47b3939eb8d793c412955a5d5db88e9fde574cce071583a04b5f8b0fc6b77fd17dbade1039f2afbf59bb5a5c829f6a9d5417783effd7f11f3 SHA512 9a75ae9734ac1028e80ee6f0627b42f44d7551cc1cac15815f0bf0cd70ab2bfc2941427294e17455e3972dad54a874482398908aec822e5c60e3e055a1abe12b
-EBUILD pysvn-1.9.15.ebuild 1332 BLAKE2B 93b4683afa60b180d7a308fb3adfe9e48c8fa69e368a2327a2faded8b60c43436834c9f7f0e504049e7afef0e969b51c576661629680556bd7c7326b2ab0cab3 SHA512 5fef4ee3806cea84f084fdbee01f265202e6d6097970a7967da29abcdd4637a27c4e2015a3921aebf85b19fd6503335a9b36d0ec2964086d905f719350078828
+EBUILD pysvn-1.9.15.ebuild 1275 BLAKE2B f0c87e7da5a2b1f5cdd6f2ac076e410e12781507ae48ad1df83dc2e33aea9d181ba2c3fed0201cf877bff9e4de01ca5a85ba5159b6421c2c3cbafd4af6fcedf6 SHA512 2a0e29dd2e7943dd60ce334b11d9e90748927eaac90c445ce17e1baac66f24fa85b60c2f82c3fb5757f31c50e806d7518ae1999537f8b88a0d2ec59661c0390a
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-python/pysvn/pysvn-1.9.15.ebuild b/dev-python/pysvn/pysvn-1.9.15.ebuild
index 9e8fecfbe0e4..2944d5593d63 100644
--- a/dev-python/pysvn/pysvn-1.9.15.ebuild
+++ b/dev-python/pysvn/pysvn-1.9.15.ebuild
@@ -31,15 +31,13 @@ python_prepare_all() {
 
 python_configure() {
 	cd Source || die
-	# all config options from 1.7.6 are all already set
-	esetup.py configure
+	CC="$(tc-getCC)" CCC="$(tc-getCXX)" \
+		esetup.py configure
 }
 
 python_compile() {
 	cd Source || die
-	emake \
-		CC="$(tc-getCC)" \
-		CCC="$(tc-getCXX)"
+	emake
 }
 
 python_test() {
diff --git a/dev-python/pytables/Manifest b/dev-python/pytables/Manifest
index 041cb176e785..5feb3f37ed69 100644
--- a/dev-python/pytables/Manifest
+++ b/dev-python/pytables/Manifest
@@ -1,5 +1,5 @@
 AUX pytables-3.6.1-numpy-float.patch 7336 BLAKE2B 7322dea9dcc5d115dd7fe8a92e5547359c2496326f7195d6b14f596ea8eaf69b8b3e583a7de68bb22c9346073de31e46e9bf36babc423eecd1e36772d6a6e094 SHA512 2807aa3ddcb9a9e0cd086e621d9a906c6de9c49ac1668f261ac284b7b28841c36645e42557fbe3b45b21dab9c8551fc022d5496658d8ed267516d54021791ef5
 AUX pytables-3.6.1-py310.patch 1960 BLAKE2B fd0dede7bf5b515e03d7f936b2e512b815053aed8a4e5fad6f68844a3cb99b3d51a44d8c665d6113c79bb44cafd4f85d12142d1a94e70bef454970498b1909b3 SHA512 06d28a86fad569373304167440d364341a32121c6f7fb6d777d7c320c97c6e3903f862f5372dc85b5c6f953b168aa26029d0559004003526730e9b5af3284dda
 DIST tables-3.6.1.tar.gz 4641089 BLAKE2B 4ef44b1263f40babe6719bac911ab191e9cb0c58c377705b755fa83f1fba5af1d0fab10b0b45bd6af619a9dce4842a80afad8d8fbab64c3be4f35a1b3f117ee3 SHA512 7f018b70251095049bce9075be4e19f72efba9d39121a35c4521f634b1dd5b81ab6de47df3bb44ad6b8b2dbdbff4e6d0985ad1a7b2f13b44f920c0935e5830ff
-EBUILD pytables-3.6.1.ebuild 1764 BLAKE2B 89b8f0309c49c54e4c2dc991cf21bd8271616c917f79b9f52ca21da9d755672cd00138741c664b41249b160467d73563cc7db1fb190baf9d56f0fb288d8a5f5b SHA512 bce9783d8f90e6543d6680c866be5fcd7c06d22d3c8011e1d1934926f87c0ba87d05767a09bbd2e0470b818efe431aec61f2986cb2d500bab6224f906fd6f23b
+EBUILD pytables-3.6.1.ebuild 1771 BLAKE2B 30e0e612fe192826e0f682643295c9757f4dac8e5f6dee6eca28375e033738f7c541293552f349743bc2f290d993a1114b23a6965e7459a38e183d1ef1b01b14 SHA512 ae566bab2c87ccd731813cd53bf2d4c193ed6ee2b8539a22e5e17bfe59512da1f8cf24b59795fad142847130fd055868a0bc932ca2be69b95afc14a4e51ca185
 MISC metadata.xml 894 BLAKE2B 279b64a5124a6471b3ea6ed8d2f82b8d62e5d8bc809168fb2ae1c3bfd8cfa07428c2ff7f07deb5042a6ccb5ba7af43bc45d0db82b9cfc79fa5d19c090d0500a3 SHA512 88dd752e6014f6f133b5df7db6c2aafce0b9da8cdbc057493916dbfbe1da4bf52e0ed43d570d68035fc8f12302794a381a54f5b07b9726b52601724163bc672c
diff --git a/dev-python/pytables/pytables-3.6.1.ebuild b/dev-python/pytables/pytables-3.6.1.ebuild
index 67448098a5b3..d8118cbff31e 100644
--- a/dev-python/pytables/pytables-3.6.1.ebuild
+++ b/dev-python/pytables/pytables-3.6.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 S="${WORKDIR}/${MY_P}"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~sparc x86 ~amd64-linux ~x86-linux"
 LICENSE="BSD"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/pytest-aiohttp/Manifest b/dev-python/pytest-aiohttp/Manifest
index be67ee3d7c4b..e89f72dd3b55 100644
--- a/dev-python/pytest-aiohttp/Manifest
+++ b/dev-python/pytest-aiohttp/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-aiohttp-0.3.0.tar.gz 6884 BLAKE2B 02b50fcd14192d23a4b257c2b7cb235966eff52b1c0ac87a4c61a20bc0babdb22eb999938c63e267a797d52ce57c9fb471232db3d0bc6566168a2d73f6404cd4 SHA512 4164166465dc40ff78a86304d1bcd4db9fb3f7dad3188f8ebe2ff151ed51eb0bf9c1b7a608d94cfe3339ee3b6efd4d5abbaa0691388460d5ac95635afa14984c
-EBUILD pytest-aiohttp-0.3.0-r1.ebuild 549 BLAKE2B dc17c2758b294b805084eed6b5b980aad1fee4ea74093aa72ab13b7ebd8e20dec93daa260159a32a2a68cf38129a8a057468d5ddbc9b1c7a334218903160f49e SHA512 72d4833faf068c58e1ecbf0bf619c8436bc4a3e6b35b6a7a5052881a875616c0494a3d0fc62cdda99f26bb596b0274d3fd7f374bc84bfaf207dc03dc47f73756
+EBUILD pytest-aiohttp-0.3.0-r1.ebuild 547 BLAKE2B 5c088b47cb2a0a3ca328b6cecc11fab293f2ed3fdbbe2cc5bc8ca799cf0a3ce2d883eeee31b08a77a16f66bcce8549d2fed1dd183426a79db594e437a1fb5b68 SHA512 244e0586f80244ae61d860c521e0c92db70d8297c5e04a58c42f5747d79165b24575b94bc879da5c50cd0894afc50223a9feb5cdc5a34540d7cbe79068684d1d
 MISC metadata.xml 382 BLAKE2B cd3cf0ec70a8506a0a36c6be50dd70b68c1397c9bac788f15e012d10a4b35d5912c53f4de68bc7cfb3b4c03e84efe053d18b6a16bebff26fbcf935ad6d282645 SHA512 ae3b23c6b0741388a625d45f65e5b51e6ba9596eae3cd26378cca840656cfbe61f580705c82766b8a39dd7c603263bb66299c11d4890ed24b2aa6804bf008791
diff --git a/dev-python/pytest-aiohttp/pytest-aiohttp-0.3.0-r1.ebuild b/dev-python/pytest-aiohttp/pytest-aiohttp-0.3.0-r1.ebuild
index 122c4ebbdb2b..a63fe0646249 100644
--- a/dev-python/pytest-aiohttp/pytest-aiohttp-0.3.0-r1.ebuild
+++ b/dev-python/pytest-aiohttp/pytest-aiohttp-0.3.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 
 inherit distutils-r1
 
@@ -14,7 +14,6 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
-IUSE=""
 
 RDEPEND="
 	>=dev-python/pytest-5.4[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-datadir/Manifest b/dev-python/pytest-datadir/Manifest
index fe154751d134..d27fa6a1e0ce 100644
--- a/dev-python/pytest-datadir/Manifest
+++ b/dev-python/pytest-datadir/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-datadir-1.3.1.tar.gz 15230 BLAKE2B 72c5daaeb93315be55ae052d39a22eee4e64a1aaafa344ae64b527eebd137dc4667cee2f60af887551f00814d7ea4e5788097d0f59f7769335545c5083aef356 SHA512 2ab035ea4e6c4eaaead746a5fd3988feed31a314f73e18270faf4ae606521aa045f3d6c5e1301adcb87f8fd5b1ba5f3f1784f212ad778707ba46ad638d594f8c
-EBUILD pytest-datadir-1.3.1.ebuild 613 BLAKE2B ef60c0fc71c3f11224a31dc2262a7972415f5c1247fc621450234dad26468df1fc5f7857ebe461472c40431bcc5e5d7d5d7d4dfa6b5b95efc2358e21a55860fe SHA512 0766686899a801c07a33e256b46a0be014ccbac82449081f0a978726bbf47651069a7c1f7ebc790feae6fe9026befa548880125790cf3673c25698f40610f11a
+EBUILD pytest-datadir-1.3.1.ebuild 620 BLAKE2B 517bc1aca15d5bbb74de8467e50df39d6209b6f9d386f060f43927f4158fac71b98c2da1ee8a00ffc4d43a77859d7c563ce361fc50f23c2ab8a4143a4662a01d SHA512 a65019a2210170337f87c428c78c08887895bc10bd8731ed05b3c2728171a70e8612c9a3d3ccfe218a2f66efed2cb5afd10dbd1eca75b7bcce779157ac9906f0
 MISC metadata.xml 359 BLAKE2B 41902d1f5543ce1c93f41cfa086f273b440e0f69e59601ab48ec57ef4e5371a45e2a9b3d913b406a46b16eb073b30cff8dc30c09ff66a16b9010dcb5982460b8 SHA512 b0cd9e7e16cafb7051d23fa47f7eb0e6ebffc7cd2334c539dabaa252d5d1bcd3e4db51afab71fcb3e03e933384735bd49d378cb4fe2f8558a8d3da91bc429cb5
diff --git a/dev-python/pytest-datadir/pytest-datadir-1.3.1.ebuild b/dev-python/pytest-datadir/pytest-datadir-1.3.1.ebuild
index 7d375a90f87b..ed1a4f2902a9 100644
--- a/dev-python/pytest-datadir/pytest-datadir-1.3.1.ebuild
+++ b/dev-python/pytest-datadir/pytest-datadir-1.3.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="amd64 ~arm ~riscv x86"
 
 RDEPEND="dev-python/pytest[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/pytest-httpx/Manifest b/dev-python/pytest-httpx/Manifest
index b5b43b419f90..b09cfe43c3ba 100644
--- a/dev-python/pytest-httpx/Manifest
+++ b/dev-python/pytest-httpx/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-httpx-0.12.0.tar.gz 21319 BLAKE2B 59c3678937a7756f13971e3f1f8d312b227f56339b4234ac8e5544f4370622bcff401f76f68c2ee042fdc64deae6a7a9dd05ca8a54b60b14bfb74b2d2d724de4 SHA512 b5866ab0123755020fad679d27d4d113132b2a79da85c52a334904d19aea90ddc71088a6e0f27110498da2731be664c525f3cab256d447a37d9a507f9a508b43
-EBUILD pytest-httpx-0.12.0.ebuild 652 BLAKE2B a6600bd0ee18c71ebfaf847a81d32c1ff24bdbabcd76a12753425f1acbb2e4e36ce51038d078bbe2264393a3a8d89438182a11c48f5de39dab3b92ff174cfd91 SHA512 99450df18c6b3a93794b44f2ab7e3c1a113d6e798e03e0435ebac2a63b90d345c0df0fccba016b70e8948081cc2536be38ff16ed8fcfa53af33253cee349cbda
+EBUILD pytest-httpx-0.12.0.ebuild 653 BLAKE2B 49026b4a4108d22081b0cf24ae5921ce32b54c948b804b1c1ab6daf790f030f727738313862390b9c5b7a9f9761fb34b95a5ab8f6fbb70f0aea563a4aa2a1902 SHA512 fb68de7d314fcaf3e256854a6a882fac594e29ab4b331f25024da8d0092551279bf15a273089ee4174b7a7d29d8b8e8a96f58c21bf7fc919940bb0732671e5ee
 MISC metadata.xml 467 BLAKE2B d13bfcccc41321e84d9e912be5e6106c376d7dd5a8bc596e69e570713fb2d0dee3627e29dc9c35c6638322c7edd328a6f60e6af8dc967fad302508dcfded32be SHA512 a6b6cc298ccbbc4b11c0e91a4402f634ee0f69e5ee53e09648f842771b8d6f3fdebe5114b3f55623b75e6539a794b6b94956a6eaf4e7f91e28eb6d4bcbb5f770
diff --git a/dev-python/pytest-httpx/pytest-httpx-0.12.0.ebuild b/dev-python/pytest-httpx/pytest-httpx-0.12.0.ebuild
index 49212ed89c34..89a575419478 100644
--- a/dev-python/pytest-httpx/pytest-httpx-0.12.0.ebuild
+++ b/dev-python/pytest-httpx/pytest-httpx-0.12.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pytest-regressions/Manifest b/dev-python/pytest-regressions/Manifest
index 3ba1c26bb038..ab8454e4b5d8 100644
--- a/dev-python/pytest-regressions/Manifest
+++ b/dev-python/pytest-regressions/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-regressions-2.2.0.tar.gz 98162 BLAKE2B d87b331a35a988e8da6a6c827b594eea6ac64adb17a5b4a054ff0e9526d8d0153d84e0f59ffc805f76a96c1b100961ae12d05849fe2dd35ff4c18f42e235b3b0 SHA512 a4c91590f6e3825eef97da4fb21c1b852b68b60d6dc61ca9e1581737c0cb02831b091ae215aa16a5c50d06d413dabf243de4e98ebd01ce2af7fd2ddbaedec3fb
-EBUILD pytest-regressions-2.2.0.ebuild 1072 BLAKE2B acc00f997fa2bf940a4174338888ca65404fc0592ebfe3d6a35d6eb95b70cd64091007b4bf5660a088ee1d4e98f820f6c7ad09b3cf588ee7734318835a79dee7 SHA512 508b5ae2b21d610026c60d96343967a9884521e0c8ffa1b080db6233912a46c40752090efe2a470b5b2a0a16c850b2380536cd7551e84f42e8666d37c4f434aa
+EBUILD pytest-regressions-2.2.0.ebuild 1079 BLAKE2B 3f57fd9646d196cd3bbaa33b5ee8e129404eca3249fb2a2f71689fab40e0d2a52b7fdd91c98e3b41ec6381c0b295ea2d6fd5c3b8e7c7025fbcf18b8c48cec89a SHA512 39a2bf85153a1abb4f67699caa23d9897b03cd6da3a9af194e0f850a0b89f665cb50603383b6d90807768a2635250e94aa83f0f780fbd5685a945b4cde6dd8a7
 MISC metadata.xml 464 BLAKE2B df781a65e58ca817930a547d83f754cd1b3ba652ad8aab397bb9a0954b5ec124fa99a9d0c804ec02de1d2ed8f9d67bab2e7655c219b8504a9a1aa0e50de5bf57 SHA512 3156101dfe3b4029b2fef4823563e267139010b0d5273a41b7ce86f739a040a2f31b60afd7d8636dacb3e20391ebbad1195d9c08209d96e0e959f7abab4549f8
diff --git a/dev-python/pytest-regressions/pytest-regressions-2.2.0.ebuild b/dev-python/pytest-regressions/pytest-regressions-2.2.0.ebuild
index 50c202516a7b..eb15745f3a59 100644
--- a/dev-python/pytest-regressions/pytest-regressions-2.2.0.ebuild
+++ b/dev-python/pytest-regressions/pytest-regressions-2.2.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="amd64 ~arm ~riscv x86"
 
 RDEPEND="
 	dev-python/pytest[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-rerunfailures/Manifest b/dev-python/pytest-rerunfailures/Manifest
index d9e511d0474c..677d1d96c8cb 100644
--- a/dev-python/pytest-rerunfailures/Manifest
+++ b/dev-python/pytest-rerunfailures/Manifest
@@ -1,5 +1,5 @@
 DIST pytest-rerunfailures-10.0.tar.gz 12706 BLAKE2B fb445acd6324a377258ebcd32255bd725dc78f2209990e5807a0553da259ffc101969b7572799efa5041ae68bcc264ab80581cf9d9943ab81d9b158a15dd71d5 SHA512 83270e18cc3f825c0e0184950a149899b99a2b46cfaa6ca1c82b7cf388144265831fc2b8b82ccebb5df57463219cb7e0b41f5beb049feedcba90ae6d48d1e05f
 DIST pytest-rerunfailures-10.1.tar.gz 13644 BLAKE2B 05b654128cbc94be803d15e038cdfcaa3879dbc43eb57dcf5cc3f5e52d0e4848a38b70048b32eb5afc99bcaec614abe6febfa95e4e8f7c7e07f6dc71dcdc3915 SHA512 9aa825c7fb1fb36edb78f1cdfc4a5f705e1688d00be0cd311e5cdf542698a2e03eed15b526235e2a35262000ce24923ea1049f3efa449c9a3723a2a5c1316717
 EBUILD pytest-rerunfailures-10.0.ebuild 598 BLAKE2B a1096ed122bb81fbe9d789d0fd8346d0935fe595bedd7d0efb354be425bd252cff3061399b2dc6d3f9d98f2a9170d09aacbc01ed1533e6483222bcfa2457098f SHA512 861186112fe5ea6d6c9b6fae638db8f78872ea71dc25b06306a23beae86a971327b225fa558d270665cde074eb345c33c69aa68f8b6dece6ab0f1fe204e50ddb
-EBUILD pytest-rerunfailures-10.1.ebuild 605 BLAKE2B 2ca1529e1ec95d66bd0557d30f8e7d81e028ecad3cb260b9cc7c4e1e24d4c63ae62a06a0157776805705a323759d660dfe724249099c2b464923bd9cd6d0ecaf SHA512 e480320d7e98c7b092a92b8555fe842ade51049bddf73d90513e2f758de82422f518befdcb9b8c52d50c3ff243b1cdeb06b56761c6301cbdb499d9347b206c24
+EBUILD pytest-rerunfailures-10.1.ebuild 612 BLAKE2B f64d9c5d34916e43143274472500d62970bd705f5a49d28e0946c6ac45c2cea39a4855d6f699ed527e711db41e6539558007ba88d9475d3c4667e4550875574e SHA512 46180b4605c612580b9820ac2aeb82eb88e4e76e65ffb56167b77620db79433e4e4a927f5422e1c674eed3d6b6ae39cdf0c9b9e93dd86bd1ac48d1187a9f4f88
 MISC metadata.xml 431 BLAKE2B 5a8702f2474240f37ccaec26f689300650c53798e6a5fe0e5fbc910316db3b5796c285419c8531200823ec33c12b2e474825c28990b39234b7d4c915f1504add SHA512 8609709f8477b3df1417ce765896dc27f8da65f8ce8d1d7d10020ed3acde36b00c9e7634e9e9efeb6d0d00ba4e49b774fb4c90670804ed938a6d94562d08a998
diff --git a/dev-python/pytest-rerunfailures/pytest-rerunfailures-10.1.ebuild b/dev-python/pytest-rerunfailures/pytest-rerunfailures-10.1.ebuild
index 4d06d64d0a62..80cbae2f304a 100644
--- a/dev-python/pytest-rerunfailures/pytest-rerunfailures-10.1.ebuild
+++ b/dev-python/pytest-rerunfailures/pytest-rerunfailures-10.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MPL-2.0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 BDEPEND="
 	>=dev-python/pytest-5.0[${PYTHON_USEDEP}]
 	test? ( !!dev-python/flaky )
diff --git a/dev-python/pytest-tempdir/Manifest b/dev-python/pytest-tempdir/Manifest
index 71a56719b4b9..42a97a8e027f 100644
--- a/dev-python/pytest-tempdir/Manifest
+++ b/dev-python/pytest-tempdir/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-tempdir-2019.10.12.tar.gz 9859 BLAKE2B fe4d32d2de3d577952b90a811c38f1cfa0c16badf9115a1b70faf07f0123e29935c01bfc3c1b9c616a0eeb3e0da9f42a4415687a4862830e0edea505a99dfc04 SHA512 d6f8994423d9be90f4be20878f980ad4604475ccd4b65975cd3cad357c2d6a2a7bb8623e4ccd7441437ad72b7899d8b59ae19ca3a52c35a6c24456e44b7626de
-EBUILD pytest-tempdir-2019.10.12.ebuild 650 BLAKE2B 5ece3b87dcb9fcf28b757198af4f049a5f2c8e458107f109541dc00be6bb9b6dd814f8709f947857526275d2ce5a202bf1be961114ec2ffdf8c94e68ec29b67f SHA512 c5676a39f3aa7b7a123df72481e89142cbe1e373254a4aeea2ce04ddf2bca98449d186005c792ce4cfd3d24429e252dc8be7b7fdf0eb1c973ae5203798fc35be
+EBUILD pytest-tempdir-2019.10.12.ebuild 503 BLAKE2B 44d5b57db6b9363c3cddb58d89acee79e8dc187b03357fe5c42b2daac4e57a8a8cd9e398942fbeb1968b02deb1a3e86f6efc0206c17a513c084a97e7d709c278 SHA512 c06d8895372f04ee94bd850bcc067199a0e75e50869ac57fae7e1155e27c09da8aab264c6b9c189aa83aed782bdaa5cb829f2709b2801ae3b51b0b78bd0d9dd2
 MISC metadata.xml 326 BLAKE2B 9e3ebe5f21ea79c1bcf36480d71363aacbd79499aa6ad5c2189aa08f4383400eed646a05c5f820bb803405fe198b4981cb5cbabe737c89a5f92e723eeac13285 SHA512 a221e01e2f66ab996b06e4dfaf6c8ffca79849e635ecb5f443574190a33e934b8e28839d142571cf8eb1f360ef418ed529b60a60fe5d99c0ba208e37cc0bf784
diff --git a/dev-python/pytest-tempdir/pytest-tempdir-2019.10.12.ebuild b/dev-python/pytest-tempdir/pytest-tempdir-2019.10.12.ebuild
index f347e2e070f7..0720ff8875bd 100644
--- a/dev-python/pytest-tempdir/pytest-tempdir-2019.10.12.ebuild
+++ b/dev-python/pytest-tempdir/pytest-tempdir-2019.10.12.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="Pytest plugin to support for a predictable and repeatable temporary directory"
@@ -14,13 +14,4 @@ LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 x86"
 
-BDEPEND="
-	>=dev-python/pytest-2.8.1[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	distutils_install_for_testing
-	pytest -vv || die "Tests failed with ${EPYTHON}"
-}
+distutils_enable_tests --install pytest
diff --git a/dev-python/python-caja/Manifest b/dev-python/python-caja/Manifest
index bb6661a90b2c..51ae336ab829 100644
--- a/dev-python/python-caja/Manifest
+++ b/dev-python/python-caja/Manifest
@@ -1,3 +1,3 @@
 DIST python-caja-1.24.0.tar.xz 312340 BLAKE2B a860cb1cc983221710d93943ac39b9b77761997fa6a52b32dceeeec381ee86d976c56266013d0370a28e7cb26de3601fec42234b4f91c78e5ac54992035e17ee SHA512 9febf7cae1736e30c80218dcfd3cc05b948823b99945ed67c1839ab5149aa3fe05b090d46c598810f0cde8ba66b83426c4642f6ebdbef6067f6b2fbc0798e816
-EBUILD python-caja-1.24.0-r2.ebuild 1218 BLAKE2B f1398f1578bd7246c4878d588ed03569d0f4e1eac555100cb819431fa1f31d546bb75d954ff9ec31ff25bf3cc274d8439081c918df357bf9dd6469349d90870f SHA512 233bff12b4e70fc76758d613391ae7d1e0fa35c62fb95df9040d810e08871380c1e528af48a607bf23b443543ea0ccb2ce05a60fe73bb72a002cde15d65dd1a1
+EBUILD python-caja-1.24.0-r2.ebuild 1233 BLAKE2B 37babcdb3a0b35b8ed48f02a8d0e9b9bc4248d8fb13808968551e5c4e722f6f6dde4284a435e151e2031457aeb98b114257ec8e862e9402bb06e781963f4a73d SHA512 b31f7b1c399441b3e840504e27789a7495cc698811e9d80c8e61e2b459cbe920f5555c925b11cf62bf6a5debbd89656c2cf61f528097cd7715178a4bca2a9aac
 MISC metadata.xml 340 BLAKE2B 38e2ec7c21175122fe4d2439ef5b70277caef629d7275055ae44146db7d9def0c2af3f4d190a7a4ac426ff6fe19f9cf5a707abf71dd1fab85ec79e5d81e1f075 SHA512 5892ee1cdadbfd6a93d5bea5a6232ce8351373df7a6037ed605a8d66c3367fb7afb39e1b4b31052a599cb1e7ea155ae818e9f8225c7992a21443131e98621b33
diff --git a/dev-python/python-caja/python-caja-1.24.0-r2.ebuild b/dev-python/python-caja/python-caja-1.24.0-r2.ebuild
index 2d0ab57971d0..ed1f90bf01b8 100644
--- a/dev-python/python-caja/python-caja-1.24.0-r2.ebuild
+++ b/dev-python/python-caja/python-caja-1.24.0-r2.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 MATE_LA_PUNT="yes"
-PYTHON_COMPAT=( python3_8 )
+PYTHON_COMPAT=( python{3_7,3_8,3_9,3_10} )
 
 inherit mate python-single-r1
 
diff --git a/dev-python/python-ctags/Manifest b/dev-python/python-ctags/Manifest
index ad55cd2f56ae..257541ff2ad1 100644
--- a/dev-python/python-ctags/Manifest
+++ b/dev-python/python-ctags/Manifest
@@ -1,3 +1,3 @@
 DIST python-ctags3-1.5.0.tar.gz 59091 BLAKE2B 303b061e7e660c1ed08c52fa76e4a96e288c6359167006a112de2262eff8c6bb564cb5c5ed310e091a3e88c5d5494e883020e7aa3ed900dc9a316cc8a9f597e8 SHA512 a5f1e2ff49abf9cf471a0139c1d2e1c4f836557386f394a96e67692d6153c60717df16fc7dbf832f69182270842fdc550f77194855111534c3b71b81ac94e483
-EBUILD python-ctags-1.5.0.ebuild 509 BLAKE2B 59250c65622796fa0c0d40e2504e5064e32fd36902ea997cc931a247135a7434385b4c344e9683e54ffa3fbc3be35381dd2bf103612cb82ae186d3ed3a45b67e SHA512 e86c5a986718e7ad0f6666d0faa694590dfe3b63b060c85d2776ee170f23b64a0118f7f5ba412d6ca6852844244c1dbe0c2156227e50d39666907cac86369edd
-MISC metadata.xml 455 BLAKE2B af37b4a79a49f4128c7ed43a10ba5a384d5d6d4a33912cf74fb59ddbddd155184f1e47161519649ddac98556ad17cee495913321632f30a629704eabf7fc5d11 SHA512 480ef8e0ccfb6e278348ed31be811e51ec6a845c984c92d9d215d0375305278639dda7e409b66f18860ea980de149656b0dfd8111d26aaf79787e3c7a34ce848
+EBUILD python-ctags-1.5.0.ebuild 515 BLAKE2B 9e5feaefddadddd79f8aab4a24a6da06c10f53f186493f12bc7a1610e6acb644f4266abce26230a7fd5b4d9839fe37af0e88c8e24b8351e0efdddee85396fafc SHA512 44d4c078917582d34db0500ac4fdb69443de8055437c2f7ce9f3cabe7727f5cbba9a7c2a7cb42065ee3b5827e697241ddace66db292ec8a9036dc22cb7e91058
+MISC metadata.xml 467 BLAKE2B c98725373b16862b014fe930fa87d92dd9f3f75cb1b64bb2aa026115409bc5b3c29bd19eb15fbeea9fa4657117c5fedaed3bcabd3d00ab0328b47aa86dd367c9 SHA512 1d6d6796e7532f5ea01ce4169cf500cb26494ca1801e4a2066b16a72b5d45f92949daebb9528d814f94661e95344c0b729feacbf2c59964bbe77b788ac7c3ef5
diff --git a/dev-python/python-ctags/metadata.xml b/dev-python/python-ctags/metadata.xml
index 123026b36366..17a2cc790006 100644
--- a/dev-python/python-ctags/metadata.xml
+++ b/dev-python/python-ctags/metadata.xml
@@ -7,7 +7,7 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="pypi">python-ctags3</remote-id>
-		<remote-id type="github">jonashaag/python-ctags3</remote-id>
-		<bugs-to>https://github.com/jonashaag/python-ctags3/issues</bugs-to>
+		<remote-id type="github">universal-ctags/python-ctags3</remote-id>
+		<bugs-to>https://github.com/universal-ctags/python-ctags3/issues</bugs-to>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/python-ctags/python-ctags-1.5.0.ebuild b/dev-python/python-ctags/python-ctags-1.5.0.ebuild
index e1bae13e2d98..11636912c57f 100644
--- a/dev-python/python-ctags/python-ctags-1.5.0.ebuild
+++ b/dev-python/python-ctags/python-ctags-1.5.0.ebuild
@@ -1,15 +1,15 @@
-# 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=( pypy3 python3_{7,8,9} )
+PYTHON_COMPAT=( pypy3 python3_{7..10} )
 
 inherit distutils-r1
 
 MY_PN="${PN}3"
 DESCRIPTION="Exuberant Ctags indexing python bindings"
-HOMEPAGE="https://github.com/jonashaag/python-ctags3"
+HOMEPAGE="https://github.com/universal-ctags/python-ctags3"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 S="${WORKDIR}/${MY_PN}-${PV}"
 
diff --git a/dev-python/python-docs/Manifest b/dev-python/python-docs/Manifest
index 71c7bd4931a5..26576907007c 100644
--- a/dev-python/python-docs/Manifest
+++ b/dev-python/python-docs/Manifest
@@ -1,19 +1,11 @@
 DIST python-2.7.18-docs-html.tar.bz2 4634932 BLAKE2B c48e2dede15d8186231acf65709641e0844c42e924262d6ee21a55e515aaf4d023bf394681bab780ab83998de9f409685e2d5870506810432145acc6422eff9d SHA512 db39390577ec86f13c9b6b57c01cba36fe9fd89092a773dc94f1a6a19d912759d097c4d80e765d3657b572abc731c1da9e7b4cd4c38065cd444606b906744abe
-DIST python-3.6.13-docs-html.tar.bz2 6016532 BLAKE2B b1aa4fea09f84615146a160ebfc7f2a40481397f25549f8935ea83b5dd5d6db83c0e8ecec94efa9941712186f93b8564fbda7a579550919bfe3ce47adc6c0a84 SHA512 7bdc77767211a652dbbe654cf9675e325a959d1d90eb751fa2f86abd04ddc41301d1035c8cf1a4968a8f23c97f95cf87b06763fd97f7844ac13c365b39dfcd8b
 DIST python-3.6.14-docs-html.tar.bz2 6022374 BLAKE2B 5c747ccc66ca9bf9d22368893d3be488a1e3cae4feff34557f8abe394aeb5b5c0038d8a0b319a903a38ad7cf0fd267486704e5e41d5db056472f03861b4a2a53 SHA512 a35525fd934e7e95a4e242fb7cfaa770ee42acdb4db40cbe8e40d77d73e98bf72ab02554f3733c884a73f7afaf28e079e0b37ba300134814cf9a08bb61dfee45
-DIST python-3.7.10-docs-html.tar.bz2 6289108 BLAKE2B ff751e3b847602f766389a4dc249bbb55776d91c7263a7b51b4699b3c65ab02a055e67c483d28a284c18b686086c21b2689a1b62373209a64dc102418d6fe26c SHA512 c303561ce3b758df1ee017ab8dad862adad116eedf1f2d0ed1180529e0af06526c9293810fe086f8223ec97b2c935cb08ca7e74bc20b9be93dc4e97909f5f561
 DIST python-3.7.11-docs-html.tar.bz2 6294193 BLAKE2B 3fe4794770e81ac92c75d3fe3d717770011d3ee5d98bc0ea67049450427b01924ff10ee41ef04932e4885b08f808bf0e1b8d2b09ead2b28303a25d2a9cc8db56 SHA512 c2e354df460b20cbcf49cde56a93070033dc8364f6678bcab62ffd66dbe9803447d5169c033486331351c2cc1dc7140879297e0ad1ce35c6788c94ad3555b283
-DIST python-3.8.10-docs-html.tar.bz2 6604538 BLAKE2B 270c53edc7917926a1fa065b4cd3cf8cb2e1334e55fbe8f7d1b6e52117b44da1e66d1e5ee240055b5f34320aa45145a38636201bd0ffb9751897e5060f987e90 SHA512 74a94ecbcba83f3392f08e36b0697f4213ff9118c68363706d0151c29c50fa12a0e61fd821bb1c16166833872a996e6b53126ba5c9e1c3aa606a57ade5086eb6
 DIST python-3.8.11-docs-html.tar.bz2 6603016 BLAKE2B 8488fdef3fce83c71140d4fec328a0564993b95a6d00307da3ace1c3c4447b0edf99e514cdb224cb06df14228748a7ba9355525a5c8afcc4bd4e27ba20530210 SHA512 8fb51867d2e0af1b4f6e39d24241ef5b8955f9f8bada31c4ee096e4148b0313d10eecb4dee3b6af4bef6ffb3e4e871465cad8d05b5974719936f110cc96fb792
-DIST python-3.9.5-docs-html.tar.bz2 6839136 BLAKE2B e05d327c858cb674463b8bbbed53cf92a4816a58275bb493b02c670696cc58c07735685f1e9e1ae39e10bae3c1fb4e253b29e096fcddb5f0a592ac9895fadf36 SHA512 74526fd849f8a8e50e9263f7963e4ef14635c994e8abb89ae6a096703a4a1807316dd1ea095ab33f0fde63f195cb6d94b5e1a523b34d35481441b4fd1d2b5701
 DIST python-3.9.6-docs-html.tar.bz2 6848664 BLAKE2B d5e84fc69928e304898120b172629cd724043fff26237908f2adfb13c9ffa11701a87bcd7091eeeee4ef5b2ade12c29781ea26554a7f4fc13fd28efe765b48cf SHA512 b9aa734e9616253278febc5f668ecb6f1d43bc824f84c92e3c13007441388d21e27edd4cb30c463739a271ffcbd8581d6d4573cfe693dca78623762bcdd5bf20
 EBUILD python-docs-2.7.18.ebuild 627 BLAKE2B 2146c6b420275e346d9b84a96d3318088c46b1bcea16ea9acbb5b9b9777e20c774e56b846f1956f9906a243f1d3b3a15a7f12a8d190f996f67b332f655eb5c27 SHA512 ab50141e18c1cebbbd89facfc7a415fafebfd3f26ab9e6af02d6163c3d694aa885a452b7b47abe45c1c301394fc0c665e0f84fcada0929e8d907a3d3daa4976d
-EBUILD python-docs-3.6.13.ebuild 627 BLAKE2B 2146c6b420275e346d9b84a96d3318088c46b1bcea16ea9acbb5b9b9777e20c774e56b846f1956f9906a243f1d3b3a15a7f12a8d190f996f67b332f655eb5c27 SHA512 ab50141e18c1cebbbd89facfc7a415fafebfd3f26ab9e6af02d6163c3d694aa885a452b7b47abe45c1c301394fc0c665e0f84fcada0929e8d907a3d3daa4976d
-EBUILD python-docs-3.6.14.ebuild 628 BLAKE2B 5d4afa9694261a40bef1a42bc0c62790866755e09de30249121d4f11c6211bc3dea254751b1e8f3e59e33d4aae0d6f844dac3a515995ef0af96d980cad998c42 SHA512 76fc69f1a7d37147f2388d3601f0088fd522d3401ffad95c20acd720f4b91c1d2201ab9db8b67bff38c88b04fa877a46903045751b0cc37d8c604debdee5ebe4
-EBUILD python-docs-3.7.10.ebuild 627 BLAKE2B 2146c6b420275e346d9b84a96d3318088c46b1bcea16ea9acbb5b9b9777e20c774e56b846f1956f9906a243f1d3b3a15a7f12a8d190f996f67b332f655eb5c27 SHA512 ab50141e18c1cebbbd89facfc7a415fafebfd3f26ab9e6af02d6163c3d694aa885a452b7b47abe45c1c301394fc0c665e0f84fcada0929e8d907a3d3daa4976d
-EBUILD python-docs-3.7.11.ebuild 628 BLAKE2B 5d4afa9694261a40bef1a42bc0c62790866755e09de30249121d4f11c6211bc3dea254751b1e8f3e59e33d4aae0d6f844dac3a515995ef0af96d980cad998c42 SHA512 76fc69f1a7d37147f2388d3601f0088fd522d3401ffad95c20acd720f4b91c1d2201ab9db8b67bff38c88b04fa877a46903045751b0cc37d8c604debdee5ebe4
-EBUILD python-docs-3.8.10.ebuild 627 BLAKE2B 2146c6b420275e346d9b84a96d3318088c46b1bcea16ea9acbb5b9b9777e20c774e56b846f1956f9906a243f1d3b3a15a7f12a8d190f996f67b332f655eb5c27 SHA512 ab50141e18c1cebbbd89facfc7a415fafebfd3f26ab9e6af02d6163c3d694aa885a452b7b47abe45c1c301394fc0c665e0f84fcada0929e8d907a3d3daa4976d
-EBUILD python-docs-3.8.11.ebuild 628 BLAKE2B 5d4afa9694261a40bef1a42bc0c62790866755e09de30249121d4f11c6211bc3dea254751b1e8f3e59e33d4aae0d6f844dac3a515995ef0af96d980cad998c42 SHA512 76fc69f1a7d37147f2388d3601f0088fd522d3401ffad95c20acd720f4b91c1d2201ab9db8b67bff38c88b04fa877a46903045751b0cc37d8c604debdee5ebe4
-EBUILD python-docs-3.9.5.ebuild 627 BLAKE2B 2146c6b420275e346d9b84a96d3318088c46b1bcea16ea9acbb5b9b9777e20c774e56b846f1956f9906a243f1d3b3a15a7f12a8d190f996f67b332f655eb5c27 SHA512 ab50141e18c1cebbbd89facfc7a415fafebfd3f26ab9e6af02d6163c3d694aa885a452b7b47abe45c1c301394fc0c665e0f84fcada0929e8d907a3d3daa4976d
-EBUILD python-docs-3.9.6.ebuild 628 BLAKE2B 5d4afa9694261a40bef1a42bc0c62790866755e09de30249121d4f11c6211bc3dea254751b1e8f3e59e33d4aae0d6f844dac3a515995ef0af96d980cad998c42 SHA512 76fc69f1a7d37147f2388d3601f0088fd522d3401ffad95c20acd720f4b91c1d2201ab9db8b67bff38c88b04fa877a46903045751b0cc37d8c604debdee5ebe4
+EBUILD python-docs-3.6.14.ebuild 627 BLAKE2B 2146c6b420275e346d9b84a96d3318088c46b1bcea16ea9acbb5b9b9777e20c774e56b846f1956f9906a243f1d3b3a15a7f12a8d190f996f67b332f655eb5c27 SHA512 ab50141e18c1cebbbd89facfc7a415fafebfd3f26ab9e6af02d6163c3d694aa885a452b7b47abe45c1c301394fc0c665e0f84fcada0929e8d907a3d3daa4976d
+EBUILD python-docs-3.7.11.ebuild 627 BLAKE2B 2146c6b420275e346d9b84a96d3318088c46b1bcea16ea9acbb5b9b9777e20c774e56b846f1956f9906a243f1d3b3a15a7f12a8d190f996f67b332f655eb5c27 SHA512 ab50141e18c1cebbbd89facfc7a415fafebfd3f26ab9e6af02d6163c3d694aa885a452b7b47abe45c1c301394fc0c665e0f84fcada0929e8d907a3d3daa4976d
+EBUILD python-docs-3.8.11.ebuild 627 BLAKE2B 2146c6b420275e346d9b84a96d3318088c46b1bcea16ea9acbb5b9b9777e20c774e56b846f1956f9906a243f1d3b3a15a7f12a8d190f996f67b332f655eb5c27 SHA512 ab50141e18c1cebbbd89facfc7a415fafebfd3f26ab9e6af02d6163c3d694aa885a452b7b47abe45c1c301394fc0c665e0f84fcada0929e8d907a3d3daa4976d
+EBUILD python-docs-3.9.6.ebuild 627 BLAKE2B 2146c6b420275e346d9b84a96d3318088c46b1bcea16ea9acbb5b9b9777e20c774e56b846f1956f9906a243f1d3b3a15a7f12a8d190f996f67b332f655eb5c27 SHA512 ab50141e18c1cebbbd89facfc7a415fafebfd3f26ab9e6af02d6163c3d694aa885a452b7b47abe45c1c301394fc0c665e0f84fcada0929e8d907a3d3daa4976d
 MISC metadata.xml 236 BLAKE2B 167eb58da19caba0e03167e2f209e118ce8a468851bca2790a0353112848fffcd72522497e5f951bf5c6eafa9691fa2a1ad980843cb4170a8194f3b8178ebe16 SHA512 0f2c2a0401b53543eac90eafdd4d11c5913be07f47b968e2892ca92c265adbd9564f02a491ff2607d7031194ba3e50c7720851537341b1541120821c487147a3
diff --git a/dev-python/python-docs/python-docs-3.6.13.ebuild b/dev-python/python-docs/python-docs-3.6.13.ebuild
deleted file mode 100644
index 69cbb66a42be..000000000000
--- a/dev-python/python-docs/python-docs-3.6.13.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="HTML documentation for Python"
-HOMEPAGE="https://www.python.org/doc/"
-SRC_URI="https://www.python.org/ftp/python/doc/${PV}/python-${PV}-docs-html.tar.bz2"
-S="${WORKDIR}/python-${PV}-docs-html"
-
-LICENSE="PSF-2"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
-
-src_install() {
-	rm -r _sources || die
-	docinto html
-	dodoc -r .
-
-	newenvd - 60python-docs-${SLOT} <<-EOF
-		PYTHONDOCS_${SLOT//./_}="${EPREFIX}/usr/share/doc/${PF}/html/library"
-	EOF
-}
diff --git a/dev-python/python-docs/python-docs-3.6.14.ebuild b/dev-python/python-docs/python-docs-3.6.14.ebuild
index a957c58aad3d..69cbb66a42be 100644
--- a/dev-python/python-docs/python-docs-3.6.14.ebuild
+++ b/dev-python/python-docs/python-docs-3.6.14.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}/python-${PV}-docs-html"
 
 LICENSE="PSF-2"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 
 src_install() {
 	rm -r _sources || die
diff --git a/dev-python/python-docs/python-docs-3.7.10.ebuild b/dev-python/python-docs/python-docs-3.7.10.ebuild
deleted file mode 100644
index 69cbb66a42be..000000000000
--- a/dev-python/python-docs/python-docs-3.7.10.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="HTML documentation for Python"
-HOMEPAGE="https://www.python.org/doc/"
-SRC_URI="https://www.python.org/ftp/python/doc/${PV}/python-${PV}-docs-html.tar.bz2"
-S="${WORKDIR}/python-${PV}-docs-html"
-
-LICENSE="PSF-2"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
-
-src_install() {
-	rm -r _sources || die
-	docinto html
-	dodoc -r .
-
-	newenvd - 60python-docs-${SLOT} <<-EOF
-		PYTHONDOCS_${SLOT//./_}="${EPREFIX}/usr/share/doc/${PF}/html/library"
-	EOF
-}
diff --git a/dev-python/python-docs/python-docs-3.7.11.ebuild b/dev-python/python-docs/python-docs-3.7.11.ebuild
index a957c58aad3d..69cbb66a42be 100644
--- a/dev-python/python-docs/python-docs-3.7.11.ebuild
+++ b/dev-python/python-docs/python-docs-3.7.11.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}/python-${PV}-docs-html"
 
 LICENSE="PSF-2"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 
 src_install() {
 	rm -r _sources || die
diff --git a/dev-python/python-docs/python-docs-3.8.10.ebuild b/dev-python/python-docs/python-docs-3.8.10.ebuild
deleted file mode 100644
index 69cbb66a42be..000000000000
--- a/dev-python/python-docs/python-docs-3.8.10.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="HTML documentation for Python"
-HOMEPAGE="https://www.python.org/doc/"
-SRC_URI="https://www.python.org/ftp/python/doc/${PV}/python-${PV}-docs-html.tar.bz2"
-S="${WORKDIR}/python-${PV}-docs-html"
-
-LICENSE="PSF-2"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
-
-src_install() {
-	rm -r _sources || die
-	docinto html
-	dodoc -r .
-
-	newenvd - 60python-docs-${SLOT} <<-EOF
-		PYTHONDOCS_${SLOT//./_}="${EPREFIX}/usr/share/doc/${PF}/html/library"
-	EOF
-}
diff --git a/dev-python/python-docs/python-docs-3.8.11.ebuild b/dev-python/python-docs/python-docs-3.8.11.ebuild
index a957c58aad3d..69cbb66a42be 100644
--- a/dev-python/python-docs/python-docs-3.8.11.ebuild
+++ b/dev-python/python-docs/python-docs-3.8.11.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}/python-${PV}-docs-html"
 
 LICENSE="PSF-2"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 
 src_install() {
 	rm -r _sources || die
diff --git a/dev-python/python-docs/python-docs-3.9.5.ebuild b/dev-python/python-docs/python-docs-3.9.5.ebuild
deleted file mode 100644
index 69cbb66a42be..000000000000
--- a/dev-python/python-docs/python-docs-3.9.5.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="HTML documentation for Python"
-HOMEPAGE="https://www.python.org/doc/"
-SRC_URI="https://www.python.org/ftp/python/doc/${PV}/python-${PV}-docs-html.tar.bz2"
-S="${WORKDIR}/python-${PV}-docs-html"
-
-LICENSE="PSF-2"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
-
-src_install() {
-	rm -r _sources || die
-	docinto html
-	dodoc -r .
-
-	newenvd - 60python-docs-${SLOT} <<-EOF
-		PYTHONDOCS_${SLOT//./_}="${EPREFIX}/usr/share/doc/${PF}/html/library"
-	EOF
-}
diff --git a/dev-python/python-docs/python-docs-3.9.6.ebuild b/dev-python/python-docs/python-docs-3.9.6.ebuild
index a957c58aad3d..69cbb66a42be 100644
--- a/dev-python/python-docs/python-docs-3.9.6.ebuild
+++ b/dev-python/python-docs/python-docs-3.9.6.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}/python-${PV}-docs-html"
 
 LICENSE="PSF-2"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 
 src_install() {
 	rm -r _sources || die
diff --git a/dev-python/python-dotenv/Manifest b/dev-python/python-dotenv/Manifest
index 89a859edf624..058f45d772c6 100644
--- a/dev-python/python-dotenv/Manifest
+++ b/dev-python/python-dotenv/Manifest
@@ -3,7 +3,7 @@ DIST python-dotenv-0.17.1.tar.gz 31608 BLAKE2B fdddfa1c39282ceec03fc1569d9a7d038
 DIST python-dotenv-0.18.0.tar.gz 32242 BLAKE2B 6cbef7ea7278a3114b3eaea2ede0c68e2c6dcc3868f655dbcad9596ea6e1ec0b9f5d183a73fda32e53d348ae23c11ca3f9d2e8eadd974eea4dd13903b9f9c845 SHA512 4b120ee45602ce703ee360fb5af07a8854bcb1ecd9084057e00324b152cf230fa6f065b374b6eebbfb7069b32762624ea61dd5d2fa6ac62cb7e3a2bb6ddfc1ed
 DIST python-dotenv-0.19.0.tar.gz 32016 BLAKE2B c9f499abf99b3af8aafe7285347e08e61e770b1a5ca9d9b0cdf9dc306367c3f0492dae814835b637c9fd3c25d81006f78cbcf8d2de18bf7dc917e1bcdb0cb544 SHA512 6207f30e79ce13ccacc00ab1a95a1613317c2cc6bd735060ddca558b498c9d5c1c46ba76d97cdbb282c0f2695aed9346159ecbe08aa8a7c4f143a65708182806
 EBUILD python-dotenv-0.17.1.ebuild 699 BLAKE2B 30991868d0fe6e918e73ac6a627cb310221caf566dc6675086674fae634e0206c883ced4f34e89c8abc19518461ee41ffe880e9a18220f9a7e00a6c1c4171639 SHA512 4bbbfa7542acee21adf7f946904dcd56026186aa8737a5877b15c0d2af47efae1228b1956696fae57ca83c2b6a1fe2d35030ebe58c04164cde781bd824686c61
-EBUILD python-dotenv-0.18.0-r1.ebuild 848 BLAKE2B 3557a336eff3d9c640c3212673f1946ffb833f68e12494a791b241193a248ec2ac5bb2185c1f013677018d63c5d78e55b9045cd66d911077b2a409c555b205cb SHA512 2cc5e8277d3ee49d0b9fed4fa9234882f7b7045d646c069648f961bd52bd0642784c016cb64ff9ef9f33a782e1f14b3bf02f12c2e5e12d0d783b9096af3dcee2
+EBUILD python-dotenv-0.18.0-r1.ebuild 849 BLAKE2B 2bc460d75a0c4ec77be0206bc5aad3f067a6111b4de689a7fcbcd292e9f8e1d64ff8de7c04de5bfa1cbb055fd6ab4a78233ddda5aac74e8f1ff3ed78b000218f SHA512 77b731f7bb0f8d8247a8100c1ccb1251abb996ff486e5d70a835deea36b5a2ae9fcd719588e1732b332a757724aede48792151ab850e4aadad25bd56c6f1067a
 EBUILD python-dotenv-0.18.0.ebuild 667 BLAKE2B afa1384333768d7c865ee8c1410e7b2d54899c185fda2940d4dd05a184c78ef334be98db6c05cf093bfdcaf64293d1b4ae2123e036a78124d2f27d4a69013ac8 SHA512 5409f429cbb14e907cd20df27fffd4fc1b8c9ad7ac3a26fcc5ff6c99160baf5486f89a443ea96c0d062547ef4a8b49c92f86ae015a273b2e15cca581b7ae41de
 EBUILD python-dotenv-0.19.0.ebuild 850 BLAKE2B fc149c8425197954deac6bbaf32d30f146a5c932a22e7c9cbe90dc3f9e78cc05400a32ae449c5eadf83b8649b82063d585147997bca9027723b40f080fdf88b5 SHA512 01d909a7670238234c76f026dcb65ffedf5a5ed47b605aa9f683b48897fd14116c1ee6a007b8685514316de1aad6d50eec65e29c336dbf086b31b3174c22ddb6
 MISC metadata.xml 465 BLAKE2B 9b67c317b80cf8956d86e3482f9bd4b8824013c758e13c53865c4c8b428127a39188b23776176e038b4e58f8eb4e28b6ff7030df75a300bb647f969ef979a551 SHA512 f4bbf11566f50c90aeb7684755651f9112d3ce12dbfc425aa209eeff7c5a2636688a9236bd5227961cc334c07c82f49da0f4f27c3189bb7a0a8f76b517e9036f
diff --git a/dev-python/python-dotenv/python-dotenv-0.18.0-r1.ebuild b/dev-python/python-dotenv/python-dotenv-0.18.0-r1.ebuild
index 6e5625da2f43..9c19ce5b8174 100644
--- a/dev-python/python-dotenv/python-dotenv-0.18.0-r1.ebuild
+++ b/dev-python/python-dotenv/python-dotenv-0.18.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="Manage .env files"
diff --git a/dev-python/python-efl/Manifest b/dev-python/python-efl/Manifest
index 60c7725d82ce..237c4acf63c9 100644
--- a/dev-python/python-efl/Manifest
+++ b/dev-python/python-efl/Manifest
@@ -1,4 +1,4 @@
 AUX python-efl-1.25-clang-crosscompile.patch 579 BLAKE2B d308bf06950094a00fbbad24f4813b6dd511122071328f01ab2bd774ba1cd79cca7cddffc8dad4d65c8cc83430f99d59a55dfc2a5d4805a54f62ae0ece880a3f SHA512 3da1b63c7d40dc8027db5bcd6ab165789790e4db8c3ad876d55eda9363557cff8a46858a2ca8c23d1bb8e1e43bb7b057ff596aebe7adb2c40f3bb18b37e71225
 DIST python-efl-1.25.0.tar.xz 9543920 BLAKE2B fc2b951ade2fc2b7c32dd78a84800bc9f225499ee9d8431034b378c86e423181d918aba2c4d056974f3aa2df9cfb9c7b3dcf1c366362387048cde182c0b3128a SHA512 23ed29add25cd2639e9eb144f22c5e2809b8634389f7ab5c4b7ebc19302fde4ebb0fe8c41d7b10923e658676c4dfbb8670fda16675682fd376258beecbc3d9c3
-EBUILD python-efl-1.25.0.ebuild 1802 BLAKE2B baed68f8455bb510b5c330e5c74ecf3146d87736cba66eb1fc756d986f16c6b9c27cc89c2697232fbc0fb38059f54f411bd72af960ac927886c9a7d2adbeef54 SHA512 e9711ba46c3c6bc22f862b75a5008dc5cff3584d67044459bf8455689f97434bd267731ecc4d044fa4d08f925a14e9c693218a2946c9a52e484481586dbd7c98
+EBUILD python-efl-1.25.0.ebuild 1809 BLAKE2B 93fce1140f0d41d992725805df87be45324b00f673ba54bc629e1bab6f1aa4908a69f8fe1c6464d5805cee55aff3a9bf8dc3d2faaf1f25c2f13aefeddb73c77f SHA512 a1fa37dc4ac7486f952a7c8b23dcd5689b8c3bc58f23eff1b632eb7d4f2fc764f2a5770313e0742353c62c16e9b005014ad56bc52ff62f1da45a3c9a517865ce
 MISC metadata.xml 643 BLAKE2B 75acbf33cb36cfad418051c1ef0c4afc2906cbcad599ad13e82a38defbfdf50458582229ec3f04fd98bf834b23d20be8fd248b5a2e9853b9509e1e2065af021d SHA512 83cff66b4f08aebd492d61f953847098372c8b4a118fb8e20cb746b4fe0c6113baae569a462362dc7203c9d6fae04cead12ad6970547a951b75a8a10fd53f7d8
diff --git a/dev-python/python-efl/python-efl-1.25.0.ebuild b/dev-python/python-efl/python-efl-1.25.0.ebuild
index a9b38a6c4925..28433bf1957c 100644
--- a/dev-python/python-efl/python-efl-1.25.0.ebuild
+++ b/dev-python/python-efl/python-efl-1.25.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://download.enlightenment.org/rel/bindings/python/${P}.tar.xz"
 
 LICENSE="|| ( GPL-3 LGPL-3 )"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~riscv x86"
 IUSE="doc test"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-python/python-engineio/Manifest b/dev-python/python-engineio/Manifest
index 2b12287d3cbe..8bf41cc03fa9 100644
--- a/dev-python/python-engineio/Manifest
+++ b/dev-python/python-engineio/Manifest
@@ -2,8 +2,10 @@ DIST python-engineio-3.12.1.tar.gz 37158 BLAKE2B a3f75b0ec197248029a2a257eee7694
 DIST python-engineio-4.0.1.gh.tar.gz 296000 BLAKE2B dc3b2c3f25ebbfb9d795e3c08e82b2e001fbc785dfb1666f137d8b261b65a90a15af7527917bdd9c636f076f75e01c65b498145ae5051649e1264eb9339d9f7e SHA512 83886ed1a60465127b7eb42a8437196cd68f4c538076237e4f64ff36f6fb02d1e45bd6730d4bb6209c931e05b4c2e10bae60451d1d4644071178ff44a73805e9
 DIST python-engineio-4.1.0.gh.tar.gz 296431 BLAKE2B 5ab267aba4dc6e49d26166b661da5b40961d328efb92dbcb653a405f62956f33b28dbf48cd891d0e74314da998be477f917dd6eabdf154877cd80077e4172c9f SHA512 5dea0ffc24138664216eefd6f917280d6199e4c2661a2e41622bb7f4cf03467d60d555e5c28ba23c35f59ae8b549902d235308242bbc5607ac91fd61580e0c4f
 DIST python-engineio-4.2.0.gh.tar.gz 297410 BLAKE2B 140dd21e779fd89f4d94ee3d191f0b661fa9dab2fac86c1023039afbe83d5136206add52ad412148eff69e79c84b7a8ad1744b3b2c69e02a270373c8c4a38488 SHA512 02eaa5b03045ac1ba73dbcd8c7c7853526234afb61dee6de45ee18bdf3663a2f82f9a5c969fb679e3eb8ccfe5a959434d574c59648b23d3e8e876d22f90e0591
+DIST python-engineio-4.2.1.gh.tar.gz 297657 BLAKE2B 0a634cec9f71a3b8659e5b07cc326fb3d7801c8a834248d6f2ea5a48bcd058f8d0b86c2e43c110ea18ef641e3ace273a2ebd20f350aec9360d38ffe0f32f2778 SHA512 f0ea7cb0a34f49d2e3de58dc1038f41cda099fba0033af7020b9ccacd34fbf44fd1613ef14d4d05013dd99a2d35330769e6c3d2f532556fd39262229e40714f6
 EBUILD python-engineio-3.12.1.ebuild 737 BLAKE2B f8ee47b26152d15b8bee1b25743ac1a4a98e725f7426124f5c7783bd3fb1a67926f099e72823a56c04b846fa994c21a0d6535e08d7a778139d725e00d8c68887 SHA512 8fb54dc01b1df87fc841245f986b8548207329c1d6cbaf74929d1417d4b21db6032d88ddbbf7b6c24c3d01feb6b3c4a8f7699510cd8dd6cc67a6814070a902a7
 EBUILD python-engineio-4.0.1.ebuild 808 BLAKE2B 9b97a4531a5bcb3308f93d6b8a165856a602c210350f6f66d7ae24278bf6e42c1f4df02a611f4f89081992952982b536f48796b7bab1aa1db609ad9848560cb4 SHA512 f57984d627b39e7e5beca8b4256df87d2e4234bff1891c2d34703c36850171de6a0c43be1461f374be0cebd6436f9cc4b3f18075299005337b5612b9d9e320c4
 EBUILD python-engineio-4.1.0.ebuild 807 BLAKE2B 691d02082918708a0ba6528a59e8bdfb568e57d63cb6ffa27258cab98c64a76f55ad1fd6aa512415465ce4c82d378e7e7bf641041c0e7bf4d7963cfcb9f62a81 SHA512 bd636c0c9495e25a2dc88ff154109c406133eca6c1adfd45878a32a821c403312f5c7a26dd26f9dff125e7ccea75476ca5edf473b4769dc44bf1c0ebda8757fc
 EBUILD python-engineio-4.2.0.ebuild 807 BLAKE2B 691d02082918708a0ba6528a59e8bdfb568e57d63cb6ffa27258cab98c64a76f55ad1fd6aa512415465ce4c82d378e7e7bf641041c0e7bf4d7963cfcb9f62a81 SHA512 bd636c0c9495e25a2dc88ff154109c406133eca6c1adfd45878a32a821c403312f5c7a26dd26f9dff125e7ccea75476ca5edf473b4769dc44bf1c0ebda8757fc
+EBUILD python-engineio-4.2.1.ebuild 807 BLAKE2B 212977b70608d0b322fe88498362ca449e47444aa27132658fb177f7b6913827b85d90affce8cd3a08e5b479a6a69012ad0b6bbd02a0fc7a7a57f5e4f2b32579 SHA512 bcd943f8c5e7b098508ee143951ac56f477e6ac256467716f70d125f35b491ce8a9879f0e70dab5884f3d468993c361cb643f24fdec0bf0f1a11495034a6aeff
 MISC metadata.xml 517 BLAKE2B c4eef9b286bd64542def3d6155741d9763f9757c847671448f926666c65e6ce3ced2fb0a5adc75885ad2379b6cf4eabf85bb40c55de7b58e1cf51ca4500609cc SHA512 75fb14f0e068c12ca86262ecccac67ffdcb5bea5f84b6d4b6290ad25a73b7ec0289c478bc5afe4f08123aabd2fb72963e206cdae9fc980fe540dfc8d2ed28b64
diff --git a/dev-python/python-engineio/python-engineio-4.2.1.ebuild b/dev-python/python-engineio/python-engineio-4.2.1.ebuild
new file mode 100644
index 000000000000..3fba6ef7d60a
--- /dev/null
+++ b/dev-python/python-engineio/python-engineio-4.2.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python implementation of the Engine.IO realtime server."
+HOMEPAGE="
+	https://python-engineio.readthedocs.io/
+	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-lsp-server/Manifest b/dev-python/python-lsp-server/Manifest
index 2fd5ced8d80f..16583db96dcb 100644
--- a/dev-python/python-lsp-server/Manifest
+++ b/dev-python/python-lsp-server/Manifest
@@ -1,6 +1,8 @@
 AUX pyls-fix-test-with-pylint28.patch 9964 BLAKE2B 8f8f4a2a874f0f4a3b146463301b997b82a0b05d662451faf77994ede1057f7be71e2916d74944e0b30fb6d6c0d7b7a9bf5eb651085033b2279974d2005191a2 SHA512 248bfc639c6e534ddaa7775ec09e8c108e1ab8b071b99e2b9fb855c22b9427112a6e46e6f9261150700ecc752206c36a99398973bc8a10b48587f12bc42bed7d
 DIST python-lsp-server-1.0.1.tar.gz 56835 BLAKE2B 430e215b7d65bff2008136783539c262ee201d651bf83750333d41353483882fe7a603208c2725c89530a34cef22e73fe1ef26ec80fe7fb42d2df79eae511528 SHA512 bf116d92bdebea41e4f6647673d390887d84be70d612b92b8c3973aa55db4b151c1188b06fb8e3b6dccb814fd22f938572e998f0b1329bf0b69d0e4750b8f5f6
 DIST python-lsp-server-1.1.0.tar.gz 58194 BLAKE2B bc1d542e90a1295e7bddf68d366a738b371895a453e8fb7de5b0d688c49b45b9c3441d479c1f760291e32eedc6fd42cb5ee0966ed32a10ee7f883dee3559932f SHA512 fd9f1985bd55f93740671e83696b02567b12b9b77db14c495482494d23f0a73b2048d99fce9c1be0b7d7c847f213a681d379c342d128a95cf40bd3ffeca9766f
+DIST python-lsp-server-1.2.1.tar.gz 61448 BLAKE2B 28294bf1f62a4fd0bf7b32b51a34b6206551614523130d7bb11f7f2e0175d4c061decada8c4f7713dc6c775f09f423d2c622d17354307faa557a48f5db2cdad3 SHA512 7a82af96508db943699ae63c90576205fca78e2ff47093934f26d9c5547199753acbc83ac0bdddb00d373761bebb31b5b869a9a02f734a5a4e033e7f024bf2d1
 EBUILD python-lsp-server-1.0.1-r1.ebuild 2785 BLAKE2B fb1f120ef5169cb5dce27b66b8b82581159fc7bd00d2a8154d96052ef92d92027a7cab629c3956d3531da3094daa638bf38c6ddacd98b852d03c0834bd59ffca SHA512 91fa8f63c97b151189e40680996d8e1a1f8e2db9221eae9c9b235a6dcb7734d6f5528f261f15dcaa062fbdcc6a9b4dbbf3f5f30f9a838f404f7bf7c3b7000db9
-EBUILD python-lsp-server-1.1.0-r1.ebuild 2832 BLAKE2B 00d5fb78a80f07885f952864cc14c8e9126de6011f879c4e8caa72c35ffb3075df242c6f4c9f156931f98d41bdde204ad578bb68bf4ef2d56c40a1c853249e83 SHA512 fd81294a4a46fc6a20047b8532cd0ecc538bc0d19ff1ff7fdf989f8016d107d7a2e6719f3b49c87cdd11effc726b5420615be03698502c80c6c85388813a140d
+EBUILD python-lsp-server-1.1.0-r1.ebuild 2830 BLAKE2B 8d17983a23a937269922c0d32935e895719aa6d9c51af09f6f513e4717fa275510147e29c89aca8c2105fd8ed314f6e47bae3189328bb30f658240a6a48ba6a1 SHA512 3e08152aefb7dfa35657cc20f7fbe2b798afddba530d295cda049dc8553917013be5f74906d5cf0a9aa8e2a56fef25a6b5fea9cf5d1671f1b9696824a77c8e20
+EBUILD python-lsp-server-1.2.1.ebuild 2832 BLAKE2B 83583067841de47a542fa5d51de49e8ce69537211519aa055b593b90cf45c3255f13661e3427f1d5a101a1479c9feb0f1ad8e9192bb4a11588f8c5d70c84a3c9 SHA512 e65571aa55a1bb32f9eee8d95d792fe126d61097b8a2136cb6e68aaf80bdb15d8b0b52d30f141d0c155f50c7b762ba936bc673af74ca6450bf05a3314cb2869d
 MISC metadata.xml 541 BLAKE2B 1c86ef694fd93a9fc531d0f76f919e7cea42cf21a5012dbcfdcb543254541bd66a4deac7593441f5efdf0bca3fbc4f51953303e1391f6f812813b6ab9cf69869 SHA512 9dd78ed4f786f574e9fe607a87134af82fd59934ef35a23183444e3309b27e3341a9288819558de194db037bb0fd02effe1411bf9d93d748b546eb07c038395f
diff --git a/dev-python/python-lsp-server/python-lsp-server-1.1.0-r1.ebuild b/dev-python/python-lsp-server/python-lsp-server-1.1.0-r1.ebuild
index a81825d5a49e..648b4fb72439 100644
--- a/dev-python/python-lsp-server/python-lsp-server-1.1.0-r1.ebuild
+++ b/dev-python/python-lsp-server/python-lsp-server-1.1.0-r1.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="all-plugins"
 
diff --git a/dev-python/python-lsp-server/python-lsp-server-1.2.1.ebuild b/dev-python/python-lsp-server/python-lsp-server-1.2.1.ebuild
new file mode 100644
index 000000000000..4cbf60e4f655
--- /dev/null
+++ b/dev-python/python-lsp-server/python-lsp-server-1.2.1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..9} )
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Python Language Server for the Language Server Protocol"
+HOMEPAGE="https://github.com/python-lsp/python-lsp-server"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+IUSE="all-plugins"
+
+BDEPEND="
+	test? (
+		dev-python/autopep8[${PYTHON_USEDEP}]
+		dev-python/flaky[${PYTHON_USEDEP}]
+		>=dev-python/flake8-3.8.0[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		>=dev-python/mccabe-0.6.0[${PYTHON_USEDEP}]
+		<dev-python/mccabe-0.7.0[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pandas[${PYTHON_USEDEP}]
+		>=dev-python/pycodestyle-2.7.0[${PYTHON_USEDEP}]
+		>=dev-python/pydocstyle-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/pyflakes-2.3.0[${PYTHON_USEDEP}]
+		<dev-python/pyflakes-2.4.0[${PYTHON_USEDEP}]
+		>=dev-python/pylint-2.5.0[${PYTHON_USEDEP}]
+		dev-python/QtPy[gui,testlib,${PYTHON_USEDEP}]
+		>=dev-python/rope-0.10.5[${PYTHON_USEDEP}]
+		dev-python/yapf[${PYTHON_USEDEP}]
+	)"
+
+RDEPEND="
+	>=dev-python/jedi-0.17.2[${PYTHON_USEDEP}]
+	<dev-python/jedi-0.19.0[${PYTHON_USEDEP}]
+	>=dev-python/python-lsp-jsonrpc-1.0.0[${PYTHON_USEDEP}]
+	dev-python/pluggy[${PYTHON_USEDEP}]
+	all-plugins? (
+		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.7.0[${PYTHON_USEDEP}]
+		>=dev-python/pydocstyle-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/pyflakes-2.3.0[${PYTHON_USEDEP}]
+		<dev-python/pyflakes-2.4.0[${PYTHON_USEDEP}]
+		>=dev-python/pylint-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/rope-0.10.5[${PYTHON_USEDEP}]
+		dev-python/yapf[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# remove pytest-cov dep
+	sed -i -e '0,/addopts/I!d' setup.cfg || die
+
+	# This test is continuously breaking
+	sed -i -e 's/test_folding/_&/' test/plugins/test_folding.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+pkg_postinst() {
+	optfeature "Automatically formats Python code to conform to the PEP 8 style guide" dev-python/autopep8
+	optfeature "A wrapper around PyFlakes, pep8 & mccabe" dev-python/flake8
+	optfeature "flake8 plugin: McCabe complexity checker" dev-python/mccabe
+	optfeature "Python style guide checker (fka pep8)" dev-python/pycodestyle
+	optfeature "Python docstring style checker" dev-python/pydocstyle
+	optfeature "Passive checker for Python programs" dev-python/pyflakes
+	optfeature "Python code static checker" dev-python/pylint
+	optfeature "Python refactoring library" dev-python/rope
+	optfeature "A formatter for Python files" dev-python/yapf
+}
diff --git a/dev-python/python-socks/Manifest b/dev-python/python-socks/Manifest
index e8795c903f32..417477df7c22 100644
--- a/dev-python/python-socks/Manifest
+++ b/dev-python/python-socks/Manifest
@@ -1,3 +1,3 @@
 DIST python-socks-1.2.4.gh.tar.gz 32192 BLAKE2B fa06f9158348292bef874c81623c11a54556db9c36cd7428d7a835428d152f3a4925d59e14d87518dfaae9e6937324e35db99bb5e1000f29fe9caf11fa2f8318 SHA512 6e70d8d98b2901e97250d30b350002944d979356bb6cd7dd4022af420e166076259a7b1aa4845d771243b18ab3f06ee955f07482c527835bb0135f0622d804be
-EBUILD python-socks-1.2.4.ebuild 860 BLAKE2B 520446e3d15de92ab16829284ae0a2f947fd735cd1a73315ba58eaa019590943e82744e68258929ddf331679971d1e132c1b830ab151902a0abb723681094a33 SHA512 3a5cabde8de4502523a60fb29ec77da0115aef42592c9010364211eea75c80e547396e1f289c1da14725985b0768a6afc37712f6e72afb274db039ccfaa5ae06
+EBUILD python-socks-1.2.4.ebuild 866 BLAKE2B 8b14359c34a4e82c6bd8c55d52073cf0017950fcc068d5629fea9319a59289a3b2a1c3a1b586512d414e376a3eed19732622ca8aac2217df90f55fb507e452ee SHA512 9c71273fc1d164995de5d7ad48f806b7d9f864188e4690b3018e42252dce373bb2d5c728ef79d7aab706c9a2d2f2528fca23ac615af9b6fce2da274100333637
 MISC metadata.xml 379 BLAKE2B 837cc3435249b88e94e6b35aeb9ff95ca1e88160f4f2352acfc353fdb0891e361d376f3278207e9bea3eca1742f634ae3dd165d9c48c3ba4a4c60df7137172a4 SHA512 9d81d94484e23f22cbeff22a0d8f19052b01c60713295d9d3aa40ecb250255dda4096588201fd0f30b2954ce81569e66de1ed0f88e6ea9545c0210259fefe3a0
diff --git a/dev-python/python-socks/python-socks-1.2.4.ebuild b/dev-python/python-socks/python-socks-1.2.4.ebuild
index 63ec12cd3af5..6e9be2bca66f 100644
--- a/dev-python/python-socks/python-socks-1.2.4.ebuild
+++ b/dev-python/python-socks/python-socks-1.2.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9}  )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="SOCKS4, SOCKS5, HTTP tunneling functionality for Python"
diff --git a/dev-python/python-xmlsec/Manifest b/dev-python/python-xmlsec/Manifest
index b93336acf444..23271fc2799d 100644
--- a/dev-python/python-xmlsec/Manifest
+++ b/dev-python/python-xmlsec/Manifest
@@ -1,5 +1,4 @@
+AUX python-xmlsec-1.3.11-fix-xml-testfail.patch 879 BLAKE2B 3d655b40a67b44a4abd65188c6d719e12063e857942fdb112b47da38977864252e3d250e0bbaf5c86f4688bb7701aae89df444c4fef0e3f0eaffc98fe5b6b856 SHA512 8c8f9af415dc9207e5c0599ee958dff6558618f94a9cb3c583b1c9eb6d1de251d714edf1afdee581cb33c7543f88c54d36af9b6f903fe31994a86f1b602e4c75
 DIST python-xmlsec-1.3.11.tar.gz 75023 BLAKE2B 87fe4b47a9df6bc2fb2f1a459fa20240d9d5c92e0f7fa9bfc466e1fbfc0e3f12d90d01f5c7a6eac1389ea3252b8267a545203edf34c30117573bada9a7f5481a SHA512 fe0144d67edcad366b1d0f4615983f5630afd8f22aa056f46d1e6564f1c3114c0a469675e64a06591540515b0d12b5bf9304845f5138b24e15acaf4e5b861961
-DIST python-xmlsec-1.3.9.tar.gz 75465 BLAKE2B 32aa8bcc2a17e1164fab6ebf37b47ad64bf8164a5d5cc5929571c32715e37d22143f996afc75c8a73a08e0a0a07d74ce1f8e405731260c1bcdb26c7ccb5faf25 SHA512 3c212c409430297a85316e0c4f7f704be112dfda323fd0300b7d70de812d90dd4681c6a5a3cc0314d1937ebc4f8e012fac7f787bccdfb2dc699d5d6f17316b38
-EBUILD python-xmlsec-1.3.11.ebuild 900 BLAKE2B c9349e0e28ed592fe1730ed17602d08b7a5db7dcc65f40836ef92269f724c819b1c1bf8e276e3f37ddf2ce79f078811dce52d8a0e99ef899329352f564da7ece SHA512 1e0cadca1655874b204dda456b54e53b7b6af51462416a687c94ae64e5a0eebfea0ce1aba30f59ffed566ee891a0c1244ea3957c10edf92fa5d622c264fb7e05
-EBUILD python-xmlsec-1.3.9.ebuild 900 BLAKE2B 732c28c6233267dfc04033c300b0b6966c0e69833317e966d47d0fbf8734246389f33c8bbc119e8e9e7f569fa893aac5d5137b7812c2836485ace4f5512c33d3 SHA512 90f29b20a98a541ff3a849fd6cf64339284046e9bff72e1635c9e54057c0d45aebf356fd0fabc610b1f60f06204d53ecb777c57000e83f6d3f7c70680b171c09
-MISC metadata.xml 318 BLAKE2B 1e735a969ef22076ee423f1b4a02cc1fd7207d3ecf99065b970dca3a5e335c261bad5ff081edec59e19f5600f516eb79e9759b8677ffd3204afb688ff43f4d17 SHA512 9eeb6edafad382e54d31fcdd02da868cfd0efcb95aefe7f89e7fa59d9b4031d06895219dc331badc2319dd3fa57764a640ffe9dabbc3b70f6d686901ed391a74
+EBUILD python-xmlsec-1.3.11.ebuild 901 BLAKE2B 77245e435fbb4741bc130aba61316959bbf93fb86c653e5ac2a4fb033110234da53dbd77d82f6daa462895e3f7a8fd4725b56521f2827051ffbba03a647a0c70 SHA512 13491d16a271099ed556ce155e9080d58df08a89bf9be6fbb67180ce479096088db3e5a7a88944f10da7eb5a2d2616a96969121afa19afa7a77d9411af9f2190
+MISC metadata.xml 419 BLAKE2B 1ee41309bea90a61f4b702e42e022c17861d70a309db059a27666514a678ca179770b68a8598589677126ae84950bacdca3d07aac7741b9c96b4ab5a82a27921 SHA512 39dc93ff456cc9e5436ba27035a2c8a296cd2e1235e2ded63a83a3003b0b2d152f6d7f13a12734065326f4b0652934e1138ee6d0a0f4c8b47b397bfab892ee68
diff --git a/dev-python/python-xmlsec/files/python-xmlsec-1.3.11-fix-xml-testfail.patch b/dev-python/python-xmlsec/files/python-xmlsec-1.3.11-fix-xml-testfail.patch
new file mode 100644
index 000000000000..3e7ab8829c2f
--- /dev/null
+++ b/dev-python/python-xmlsec/files/python-xmlsec-1.3.11-fix-xml-testfail.patch
@@ -0,0 +1,23 @@
+Taken from: https://github.com/mehcode/python-xmlsec/issues/84#issuecomment-632930116
+diff --git a/tests/base.py b/tests/base.py
+index b05de1d..5ec356f 100644
+--- a/tests/base.py
++++ b/tests/base.py
+@@ -94,6 +94,7 @@ class TestMemoryLeaks(unittest.TestCase):
+ 
+     def load_xml(self, name, xpath=None):
+         """returns xml.etree"""
++        etree.set_default_parser(parser=etree.XMLParser())
+         root = etree.parse(self.path(name)).getroot()
+         if xpath is None:
+             return root
+diff --git a/tests/test_doc_examples.py b/tests/test_doc_examples.py
+index 2fc490f..53d2377 100644
+--- a/tests/test_doc_examples.py
++++ b/tests/test_doc_examples.py
+@@ -42,3 +42,5 @@ def test_doc_example(example):
+     """
+     with cd(example.parent):
+         runpy.run_path(str(example))
++    from lxml import etree
++    etree.set_default_parser(parser=etree.XMLParser())
diff --git a/dev-python/python-xmlsec/metadata.xml b/dev-python/python-xmlsec/metadata.xml
index e5523976e0c6..23c0e46965f2 100644
--- a/dev-python/python-xmlsec/metadata.xml
+++ b/dev-python/python-xmlsec/metadata.xml
@@ -5,6 +5,10 @@
 		<email>chutzpah@gentoo.org</email>
 		<name>Patrick McLean</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">xmlsec</remote-id>
 	</upstream>
diff --git a/dev-python/python-xmlsec/python-xmlsec-1.3.11.ebuild b/dev-python/python-xmlsec/python-xmlsec-1.3.11.ebuild
index 2cdbbac944bb..a43d02473ec7 100644
--- a/dev-python/python-xmlsec/python-xmlsec-1.3.11.ebuild
+++ b/dev-python/python-xmlsec/python-xmlsec-1.3.11.ebuild
@@ -1,9 +1,9 @@
 # Copyright 2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="Python bindings for the XML Security Library"
@@ -23,11 +23,13 @@ RDEPEND="${DEPEND}
 BDEPEND="${RDEPEND}
 	dev-python/pkgconfig[${PYTHON_USEDEP}]
 	dev-python/wheel[${PYTHON_USEDEP}]
-"
+	test? (
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+	)"
 
-# tests fail, has been reported upstream
-# https://github.com/mehcode/python-xmlsec/issues/84
-RESTRICT=test
+PATCHES=(
+	"${FILESDIR}/${P}-fix-xml-testfail.patch"
+)
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/python-xmlsec/python-xmlsec-1.3.9.ebuild b/dev-python/python-xmlsec/python-xmlsec-1.3.9.ebuild
deleted file mode 100644
index 0a857cf27929..000000000000
--- a/dev-python/python-xmlsec/python-xmlsec-1.3.9.ebuild
+++ /dev/null
@@ -1,40 +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
-
-DESCRIPTION="Python bindings for the XML Security Library"
-HOMEPAGE="https://github.com/mehcode/python-xmlsec"
-SRC_URI="https://github.com/mehcode/python-xmlsec/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-
-DEPEND="
-	dev-libs/xmlsec:=
-"
-RDEPEND="${DEPEND}
-	dev-python/lxml[${PYTHON_USEDEP}]
-"
-BDEPEND="${RDEPEND}
-	dev-python/pkgconfig[${PYTHON_USEDEP}]
-	dev-python/wheel[${PYTHON_USEDEP}]
-"
-
-# tests fail, has been reported upstream
-# https://github.com/mehcode/python-xmlsec/issues/84
-RESTRICT=test
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	sed -e "s:use_scm_version=.*:version='${PV}',:" \
-		-e "/setup_requires/ d" \
-		-i setup.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/python3-lxc/Manifest b/dev-python/python3-lxc/Manifest
index 59fae50e8fd0..93b89bdf630a 100644
--- a/dev-python/python3-lxc/Manifest
+++ b/dev-python/python3-lxc/Manifest
@@ -1,4 +1,4 @@
 DIST python3-lxc-3.0.4.tar.gz 27278 BLAKE2B f549ffb94c2bc331e0628a344432d4699aed64de466b0d1e9e4338cee8252ca9f5defeb2c940bd29723e20aede23d8a33bd1bdfe57874069e8cc5a61bfe9bf4a SHA512 37660fe97a2171cc3346c31e736ead8a38e328bfcbea621d6b563042fcd1e70c48b97440f6263fb0f6f02a4f1704af2241661bc526921c124a6456c06a497828
 DIST python3-lxc-3.0.4.tar.gz.asc 833 BLAKE2B ed44e595fc7ac3d7c4d64f8a84e78cfe48428299015d7c7c8504301d98511b644ede378feb8e1947e4007f43e97ed4e9aa35b1d1456ae108818b3696e1bdb44a SHA512 5c1faf28545ce26047cf3bd81f90aca48046f63c5d5dd0c18b9a2575cc0735f8a45dea6a78bf4674b9092b82012b26080db727f7afaf1c856edc7ef4dfe5486d
-EBUILD python3-lxc-3.0.4.ebuild 664 BLAKE2B 5a6e133f4733f54aec4315a3e0214259f204b32be520916d27268220a6eda5a99fb1c00add770db7b964504e028bf6fe10a0cc77d3a9ff81c991e86f0ca6ffbf SHA512 f49fae2d5c8496eb6d45e6fe92568cc76de9210670992f8a43473032ab966d15f438600a4e41ce06216b0b8fcc260b8376d0a0db3b5e5fbf3158c70c980e61df
+EBUILD python3-lxc-3.0.4.ebuild 671 BLAKE2B 5fcca2b4e996ba953e85baf54aa51b0584e6d5c0b52bcdd0f4b1929e9ffe7a839dbd77afbb2f985c1e439a5b89aad6e9d02298f50f45227450fce64fca559398 SHA512 8efa1cb91bb7a5b9402c5a97504c4b132fa43460d534bae84e30b8f6880d11c489780a66b23c8fc00ba207a5ea63d58d5c8c0b7e25964f46fe680edf6c58fc40
 MISC metadata.xml 361 BLAKE2B ac875639b7fd2af373b46fa94f9d89755785417ab97ad2b89c3d795aae4d64516fa03c4d65d0872cb1f8b78e320f53dd71995b2a8a97f14420ecc6f8b0feeeb0 SHA512 8930d025f9924645eaf87661d863f6a049aa15fd9f965dc0ed483f77c37354f0fa075d00b19677bdb038bc122311ebb890d321453e0073e106554fa02aa3a589
diff --git a/dev-python/python3-lxc/python3-lxc-3.0.4.ebuild b/dev-python/python3-lxc/python3-lxc-3.0.4.ebuild
index f050740ec7be..0a65749e4421 100644
--- a/dev-python/python3-lxc/python3-lxc-3.0.4.ebuild
+++ b/dev-python/python3-lxc/python3-lxc-3.0.4.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
@@ -14,7 +14,7 @@ SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 IUSE="verify-sig"
 
 RDEPEND="app-emulation/lxc"
diff --git a/dev-python/python_orocos_kdl/Manifest b/dev-python/python_orocos_kdl/Manifest
index dc758223a625..9a3474b5ac2a 100644
--- a/dev-python/python_orocos_kdl/Manifest
+++ b/dev-python/python_orocos_kdl/Manifest
@@ -1,5 +1,4 @@
-AUX 0001-Declare-assignment-operator-private-for-SIP-Closes-2.patch 4179 BLAKE2B 376165750100ca16cc1ce21825b4ada44f90847f0b126d1fb96e9afa8279f3629e89470a2fdec0a12a1a855896aedacdbea64b799f7e929da3fa0bbe3b076630 SHA512 5300db08820cce2584da4a4f5e45ffd7d047d5dd0e5cb9bada7e967bb894e07d86760241db437b16973d1ea47d80bd94bcddd1be2435886b1767a0f19384350c
-DIST orocos_kinematics_dynamics-1.4.0.tar.gz 215004 BLAKE2B 02ca44195af2ae2bd5c2293869893c56846501e2055ca1cacef602ffdd44824fc618ed528d351ee2212b7c087ff5e69438ab87e9fb8813d8a4eb4c143fdbfd27 SHA512 7156465e2aff02f472933617512069355836a03a02d4587cfe03c1b1d667a9762a4e3ed6e055b2a44f1fce1b6746179203c7204389626a7b458dcab1b28930d8
-EBUILD python_orocos_kdl-1.4.0-r1.ebuild 1400 BLAKE2B 724a95ef3761f1cb510bb042845387325232a4609f9ab7afea8c4a906fecd73845563502d14edfaa4af2b66f984feb184799ab8c36272ab7745f915c0f7bd056 SHA512 928fd86f7c2ebbe729cdd0d72a4fbdf40ff80a89aabe48fea11147db21dd29121a30605eb675cd7e3a4fc962ad005964484fa9e8924abb2373ae23d12c186f3f
-EBUILD python_orocos_kdl-9999.ebuild 1310 BLAKE2B 8e41e13c28d81cc86b6ca77514acc19c58357ad8adc68c14412c84f21ec55234167f3b5bce60abbcb379c0f6b996a70e53edb9cc8475b711ad5d225b79b6275a SHA512 8198ca14839732d79abce5770e13514906c8d6720071fee028d2c9fc6b953a42b8b7101eee7f3db56d115ffa9e2cde6b8c1746915f844add45fc22521e05bcec
+DIST orocos_kinematics_dynamics-1.5.0.tar.gz 251515 BLAKE2B 53c14354b0833867b6fd030cde91c9524b6f0537ea0d0f3977e7aeb8482030edd5723a571030e8b78e4d6d01eba38c6a8e5c49d66c49c4b1b0f2e7a3d8159c74 SHA512 5fc9c336d6ed31ad59a5bdf6ee06444cac29beae090b9026b34f35a3cb4cdf1cd6c33af621205b8d6a5201070e679531c8b5bbdeb8a91cd1d8061153b0e47e49
+EBUILD python_orocos_kdl-1.5.0.ebuild 1399 BLAKE2B f9179d56590c3b0d70f4b120a7da4a708ac14bf8598b5eef1d46cc0cecce8eed7e2f50ade56d6462b98f4b4781ee1ee38dc5073603adfdc3beadc918f8c14278 SHA512 0ca959bd0a395465ef85d3dfc3948b22e6cc142818a35b2a03e7b7d7c59ca8f8ff5ff951cade3a85d363700a8e43fd6921d4779d7373199d7e9a9deea3e197d1
+EBUILD python_orocos_kdl-9999.ebuild 1399 BLAKE2B f9179d56590c3b0d70f4b120a7da4a708ac14bf8598b5eef1d46cc0cecce8eed7e2f50ade56d6462b98f4b4781ee1ee38dc5073603adfdc3beadc918f8c14278 SHA512 0ca959bd0a395465ef85d3dfc3948b22e6cc142818a35b2a03e7b7d7c59ca8f8ff5ff951cade3a85d363700a8e43fd6921d4779d7373199d7e9a9deea3e197d1
 MISC metadata.xml 347 BLAKE2B f798f437c41d07bbcf1918138506db38727087f9437d0abb5082bde5802cc5f7a29173d788fb8b8b8f6c150f5f1c642795dbde30e848512e6d1f9ada39a951d9 SHA512 a32a6de7eece8df29d9542f14dccacb7d046e7205af6bd996d41279175111c9416cddf78cc8a87e2319cc1b25bf880b38e8d2d0573ba6747820a5c328d809074
diff --git a/dev-python/python_orocos_kdl/files/0001-Declare-assignment-operator-private-for-SIP-Closes-2.patch b/dev-python/python_orocos_kdl/files/0001-Declare-assignment-operator-private-for-SIP-Closes-2.patch
deleted file mode 100644
index 6c8d93ed62e7..000000000000
--- a/dev-python/python_orocos_kdl/files/0001-Declare-assignment-operator-private-for-SIP-Closes-2.patch
+++ /dev/null
@@ -1,134 +0,0 @@
-https://bugs.gentoo.org/728618
-
-Backported by Victor Mataré
-
-From 30e5057f01627539dd170a1e831bb14278433deb Mon Sep 17 00:00:00 2001
-From: Jochen Sprickerhof <git@jochen.sprickerhof.de>
-Date: Fri, 26 Jun 2020 17:04:12 +0200
-Subject: [PATCH] Declare assignment operator private for SIP (Closes: #260)
-
-Starting with v4.19.23 SIP expects a working operator= or one marked
-private explicitly. All classes in this PR have a reference member
-(&chain) resulting in the compiler deleting the default assignment
-operator. This PR makes this known to SIP as well.
----
- python_orocos_kdl/PyKDL/dynamics.sip |  3 +++
- python_orocos_kdl/PyKDL/kinfam.sip   | 29 ++++++++++++++++++++++++++++
- 2 files changed, 32 insertions(+)
-
-diff --git a/PyKDL/dynamics.sip b/python_orocos_kdl/PyKDL/dynamics.sip
-index e0096dd..36f833c 100644
---- a/PyKDL/dynamics.sip
-+++ b/PyKDL/dynamics.sip
-@@ -72,4 +72,7 @@ public:
-     int JntToCoriolis(const JntArray &q, const JntArray &q_dot, JntArray &coriolis);
- 	int JntToMass(const JntArray &q, JntSpaceInertiaMatrix& H);
- 	int JntToGravity(const JntArray &q,JntArray &gravity);
-+
-+private:
-+    ChainDynParam& operator=(const ChainDynParam&);
- };
-diff --git a/PyKDL/kinfam.sip b/python_orocos_kdl/PyKDL/kinfam.sip
-index d87fd00..e87ceb8 100644
---- a/PyKDL/kinfam.sip
-+++ b/PyKDL/kinfam.sip
-@@ -344,6 +344,9 @@ public:
-     ChainFkSolverPos_recursive(const Chain& chain);
-     virtual int JntToCart(const JntArray& q_in, Frame& p_out,int segmentNr=-1);
-     virtual void updateInternalDataStructures();
-+
-+private:
-+    ChainFkSolverPos_recursive& operator=(const ChainFkSolverPos_recursive&);
- };
- 
- class ChainFkSolverVel_recursive : ChainFkSolverVel
-@@ -357,6 +360,9 @@ public:
-     virtual int JntToCart(const JntArrayVel& q_in ,FrameVel& out,int
-     segmentNr=-1 );
-     virtual void updateInternalDataStructures();
-+
-+private:
-+    ChainFkSolverVel_recursive& operator=(const ChainFkSolverVel_recursive&);
- };
- 
- class ChainIkSolverPos : SolverI {
-@@ -392,6 +398,9 @@ public:
-     
-     virtual int CartToJnt(const JntArray& q_init , const Frame& p_in ,JntArray& q_out);
-     virtual void updateInternalDataStructures();
-+
-+private:
-+    ChainIkSolverPos_NR& operator=(const ChainIkSolverPos_NR&);
- };
- 
- class ChainIkSolverPos_NR_JL : ChainIkSolverPos
-@@ -407,6 +416,9 @@ public:
-     
-     virtual int CartToJnt(const JntArray& q_init , const Frame& p_in ,JntArray& q_out);
-     virtual void updateInternalDataStructures();
-+
-+private:
-+    ChainIkSolverPos_NR_JL& operator=(const ChainIkSolverPos_NR_JL&);
- };
- 
- class ChainIkSolverVel_pinv : ChainIkSolverVel
-@@ -420,6 +432,9 @@ public:
-         
-     virtual int CartToJnt(const JntArray& q_in, const Twist& v_in, JntArray& qdot_out);
-     virtual void updateInternalDataStructures();
-+
-+private:
-+    ChainIkSolverVel_pinv& operator=(const ChainIkSolverVel_pinv&);
- };
- 
- class ChainIkSolverVel_wdls : ChainIkSolverVel
-@@ -506,6 +521,8 @@ public:
- 
-     void setLambda(const double& lambda);
- 
-+private:
-+    ChainIkSolverVel_wdls& operator=(const ChainIkSolverVel_wdls&);
- };
- 
- 
-@@ -520,6 +537,9 @@ public:
- 
-     virtual int CartToJnt(const JntArray& q_init , const Frame& p_in ,JntArray& q_out);
-     virtual void updateInternalDataStructures();
-+
-+private:
-+    ChainIkSolverPos_LMA& operator=(const ChainIkSolverPos_LMA&);
- };
- 
- 
-@@ -546,6 +566,9 @@ public:
-     const JntArray& getOptPos()const /Factory/;
- 
-     const double& getAlpha()const /Factory/;
-+
-+private:
-+    ChainIkSolverVel_pinv_nso& operator=(const ChainIkSolverVel_pinv_nso&);
- };
- 
- class ChainIkSolverVel_pinv_givens : ChainIkSolverVel
-@@ -559,6 +582,9 @@ public:
-         
-     virtual int CartToJnt(const JntArray& q_in, const Twist& v_in, JntArray& qdot_out);
-     virtual void updateInternalDataStructures();
-+
-+private:
-+    ChainIkSolverVel_pinv_givens& operator=(const ChainIkSolverVel_pinv_givens&);
- };
- 
- class ChainJntToJacSolver : SolverI
-@@ -571,4 +597,7 @@ public:
-     ChainJntToJacSolver(const Chain& chain);
-     int JntToJac(const JntArray& q_in,Jacobian& jac);
-     virtual void updateInternalDataStructures();
-+
-+private:
-+    ChainJntToJacSolver& operator=(const ChainJntToJacSolver&);
- };
--- 
-2.27.0
-
diff --git a/dev-python/python_orocos_kdl/python_orocos_kdl-1.4.0-r1.ebuild b/dev-python/python_orocos_kdl/python_orocos_kdl-1.5.0.ebuild
index 7843700bedee..a3114345ba43 100644
--- a/dev-python/python_orocos_kdl/python_orocos_kdl-1.4.0-r1.ebuild
+++ b/dev-python/python_orocos_kdl/python_orocos_kdl-1.5.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{3_7,3_8,3_9} )
+PYTHON_COMPAT=( python{3_8,3_9,3_10} )
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
@@ -29,9 +29,8 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RDEPEND="
 	${PYTHON_DEPS}
 	>=sci-libs/orocos_kdl-1.4.0:=
-	<dev-python/sip-5[${PYTHON_USEDEP}]"
+	dev-python/pybind11[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/0001-Declare-assignment-operator-private-for-SIP-Closes-2.patch" )
 
 if [ "${PV#9999}" != "${PV}" ] ; then
 	S=${WORKDIR}/${P}/python_orocos_kdl
@@ -39,6 +38,14 @@ else
 	S=${WORKDIR}/orocos_kinematics_dynamics-${PV}/python_orocos_kdl
 fi
 
+src_prepare() {
+	sed -e 's/find_package(catkin/find_package(NoTcatkin/' \
+		-e 's/add_subdirectory(pybind11/find_package(pybind11/' \
+		-e 's/dist-packages/site-packages/' \
+		-i CMakeLists.txt || die
+	cmake_src_prepare
+}
+
 src_configure() {
 	python_foreach_impl cmake_src_configure
 }
@@ -53,8 +60,4 @@ src_test() {
 
 src_install() {
 	python_foreach_impl cmake_src_install
-
-	# Need to have package.xml in our custom gentoo path
-	insinto /usr/share/ros_packages/${PN}
-	doins "${ED}/usr/share/${PN}/package.xml"
 }
diff --git a/dev-python/python_orocos_kdl/python_orocos_kdl-9999.ebuild b/dev-python/python_orocos_kdl/python_orocos_kdl-9999.ebuild
index 12ffb7c93b4f..a3114345ba43 100644
--- a/dev-python/python_orocos_kdl/python_orocos_kdl-9999.ebuild
+++ b/dev-python/python_orocos_kdl/python_orocos_kdl-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{3_7,3_8,3_9} )
+PYTHON_COMPAT=( python{3_8,3_9,3_10} )
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
@@ -29,7 +29,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RDEPEND="
 	${PYTHON_DEPS}
 	>=sci-libs/orocos_kdl-1.4.0:=
-	<dev-python/sip-5[${PYTHON_USEDEP}]"
+	dev-python/pybind11[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}"
 
 if [ "${PV#9999}" != "${PV}" ] ; then
@@ -38,6 +38,14 @@ else
 	S=${WORKDIR}/orocos_kinematics_dynamics-${PV}/python_orocos_kdl
 fi
 
+src_prepare() {
+	sed -e 's/find_package(catkin/find_package(NoTcatkin/' \
+		-e 's/add_subdirectory(pybind11/find_package(pybind11/' \
+		-e 's/dist-packages/site-packages/' \
+		-i CMakeLists.txt || die
+	cmake_src_prepare
+}
+
 src_configure() {
 	python_foreach_impl cmake_src_configure
 }
@@ -52,8 +60,4 @@ src_test() {
 
 src_install() {
 	python_foreach_impl cmake_src_install
-
-	# Need to have package.xml in our custom gentoo path
-	insinto /usr/share/ros_packages/${PN}
-	doins "${ED}/usr/share/${PN}/package.xml"
 }
diff --git a/dev-python/pytidylib/Manifest b/dev-python/pytidylib/Manifest
index 137151d837d3..23d0e16a180e 100644
--- a/dev-python/pytidylib/Manifest
+++ b/dev-python/pytidylib/Manifest
@@ -1,3 +1,3 @@
 DIST pytidylib-0.3.2.tar.gz 87669 BLAKE2B 57eee794e3a6ba147b778360a12d2417c21579250620854267a83300d918cac0320c768faacb531517b66eed7fd7afc1679e76f2db626f7d7daa80af1667a06d SHA512 24f755ed2607e300711f5a1aee510df3a0a410cc7d8d8f46e065ec8d93c50e436a492cc2831e9d416ab9837497c603f9dc8705da543102813d3264e6de033ca7
-EBUILD pytidylib-0.3.2-r1.ebuild 585 BLAKE2B e395912c1a49082b6fb1137d4577ec9a9af053461a8fbe1d64a069e879fb16754ac9e289abe679c0562b3b3b46f678b74e795128629aadf39e89f77b6d6d5c37 SHA512 4efe9b1cb28f2102f182e4289ee554cf3a769998ea9b52b4e6c30ff613ae250aead8840650d38c56fa0d81c1e51a15cc9b4c9878144a715e49aedb21bd760d1d
+EBUILD pytidylib-0.3.2-r1.ebuild 592 BLAKE2B 58ce98b89d7c8c0a4a521970de919d6f80e6b197fd004cdff490f7ba2ebc47a49649a8a0850d86bbfdd92b0d3e01edd4db401ec647c8c43931f8f90069eea53e SHA512 17481ab9d1a49385f54ad402b0ddd72d1f75103db7ec86d6570d0afda27469f707803dd373d5bbc1166ca745822b876f154926af4d094c95d5da5f5b800c5186
 MISC metadata.xml 385 BLAKE2B 6c53cf6462d81e85c2a9facf85c0fd7b6c0c870656fdc4cc63bcd67e646d51e14fc9246a7b75a527eccecaf4385677ea63b56dfa04aeab708b41b83c8bc4fcef SHA512 e41d4897a343c45e469fe4cd52a7ce93d525ea208dd570fe0517feda8f445fa9175d971e4c37b8f1941a7cb6931ff6473526ced82384489f02a11c4040fec933
diff --git a/dev-python/pytidylib/pytidylib-0.3.2-r1.ebuild b/dev-python/pytidylib/pytidylib-0.3.2-r1.ebuild
index 2b905c8da95e..af4606a00b43 100644
--- a/dev-python/pytidylib/pytidylib-0.3.2-r1.ebuild
+++ b/dev-python/pytidylib/pytidylib-0.3.2-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="app-text/htmltidy"
 DEPEND=${RDEPEND}
diff --git a/dev-python/pyusb/Manifest b/dev-python/pyusb/Manifest
index 4e2114379b0a..b6ac2b6ec029 100644
--- a/dev-python/pyusb/Manifest
+++ b/dev-python/pyusb/Manifest
@@ -3,5 +3,5 @@ DIST pyusb-1.2.0.tar.gz 75557 BLAKE2B 3a2d066d4069a8662c981ab1f01237d7c0bc18be82
 DIST pyusb-1.2.1.tar.gz 75292 BLAKE2B c1b99f22919ab4beb8e96d664147dc51001c4a48b3acf9ba3961f7f53a9d13277c622e891481fd00b9d34d2ed8a2a0932b7949c13396ea4d76b36f36fcc4cdb0 SHA512 51d0c1165540afa21d6d0ab7315ac77b08083d1cb8e502173dfb1766bc542173f9d7b0070fd14bc71d147e31c3f0780b277093791a7c82485962a04ec62bf0f1
 EBUILD pyusb-1.1.1.ebuild 685 BLAKE2B aa089665e9e419582529ac05ec110843b081a8250fc789843a2aa5e63cc44e8434299dde0db61aba578d26cd9767bd1faa232d0a189643d0920535a31d171030 SHA512 d617a404d667a5506726a440cc251072374ef56ea5e3e33a710e4f5e8b1d8099d0bd68a946249862700ef589d1fc10f112295926a75b6dad3c5c425eb3200597
 EBUILD pyusb-1.2.0.ebuild 653 BLAKE2B 9f78d406a03a9bca19d4267d9d443d3d83fafa5bbc66d600ae854a95f5f1df7bdc7c0c791de13569e2e2944a7293eb01269b82686715be7d24edcf3e6cffa4d1 SHA512 cd76b832a07c19ee02fb7bc30688cf73c9c3150ebeb1beb60331eb990b14897167c51fcec25ffdec73e65c6859d1c65e8687e695cfdf39638503c11885262012
-EBUILD pyusb-1.2.1.ebuild 653 BLAKE2B 9f78d406a03a9bca19d4267d9d443d3d83fafa5bbc66d600ae854a95f5f1df7bdc7c0c791de13569e2e2944a7293eb01269b82686715be7d24edcf3e6cffa4d1 SHA512 cd76b832a07c19ee02fb7bc30688cf73c9c3150ebeb1beb60331eb990b14897167c51fcec25ffdec73e65c6859d1c65e8687e695cfdf39638503c11885262012
+EBUILD pyusb-1.2.1.ebuild 660 BLAKE2B 7395289ff59e940347c555ef36c94b3a1c67bb695d6b8a511f47eea67f227587d89aa3a6b190642f6473011d6713ed81a98503d99571360aa29aaa41ef7f30f4 SHA512 0b96f8e76914768394f2f39ffa74290b8142fb16d7866942d18a8c3f12594f7ab3d8a9a3bd2d19f5dc6e16644e6b84626bacf4c3517823169b557229ecfa922d
 MISC metadata.xml 359 BLAKE2B 44a04e5fad69cdf343bb324f0367a1b52ce7443d4ef4c6bcd1e7742ac0cb9c6eeb8afc5b250d126c2bf4472c9fca2cce7f9a12a7354372bba8351d0489972e09 SHA512 ac428041984c13af0492c228514fcfabb00d98645b97ff78347c4fee2813df292f52ec9c37dd00392eff6c306a18513bec6d4c883cede2ff31f18c2973bff494
diff --git a/dev-python/pyusb/pyusb-1.2.1.ebuild b/dev-python/pyusb/pyusb-1.2.1.ebuild
index 24e01cf2f163..8966bec8f2e4 100644
--- a/dev-python/pyusb/pyusb-1.2.1.ebuild
+++ b/dev-python/pyusb/pyusb-1.2.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~riscv ~x86"
 
 ### This version is compatible with both 0.X and 1.X versions of libusb
 DEPEND="virtual/libusb:="
diff --git a/dev-python/pyzmq/Manifest b/dev-python/pyzmq/Manifest
index d77fac3f409a..5a6240bf13f7 100644
--- a/dev-python/pyzmq/Manifest
+++ b/dev-python/pyzmq/Manifest
@@ -1,5 +1,5 @@
 DIST pyzmq-20.0.0.gh.tar.gz 393041 BLAKE2B 1f22f556f5d0f2755c2e56411fdb9f583bbdfad6315e4e72fbaa1fb18d0ad5436ee0ee8d17497641421cea3f4e1b53b8ff85bf7ced96c8f1c80db0be901ca3d5 SHA512 30359e501e76d6ec14175622d6c970d9ec0f227b372d2b1c6e6650be812dd47017b797a016f5a2da83f72d00536e64d2f005a38003c9a1b4fbb7266f2640782d
 DIST pyzmq-22.1.0.gh.tar.gz 401919 BLAKE2B ec43c62e68633a7e0ac06e7a717b6409e444dbd1347154c2a29a2dfb00916829656308122fa2cf0fc1e3013c82ba6bcc5e11b86582f95d46f43e9e81f6d8ff74 SHA512 aa135279927bff07339b99b4ebbc7d47effbfba7df99d3576088fe0e7d4a3ad44174a928e8b94afdeaf531c6a30cbb7bb88bce7fe19e7e5420b079ffb8e8690e
 EBUILD pyzmq-20.0.0.ebuild 2653 BLAKE2B c0d0fc48eb69fc23c199f66d8171c7b3eb57d752f3b00e8f667eb41a0cce14b967b2d09a4ee98d3d3713532931d7ee154bdf0d1e67b218d24475cdb5dc761b2a SHA512 6841126e1f898b56f784606725d916ecbba38f0a99154a179cdcffb905f574072c66cea39c7f5368c064d2208a571bf63cafac4ea9b5a8af998c4d6e591ac50a
-EBUILD pyzmq-22.1.0.ebuild 1720 BLAKE2B 52284dc19ec17607b781f6c6f70edc542d2a7bb9f81bd5336bfa7e4611be1b7aea723bb814d253d99e83694f5346d4f0ba0fe219210de33472f65ac7bb6ea9fc SHA512 9e0db238744f587f3fe03493c13d607baa1760591ca984cb2654bd21d68589439ad8416306b51eb06913cfcb965c36805f32e06f0eb8c966dcc2eaf2c768b510
+EBUILD pyzmq-22.1.0.ebuild 1727 BLAKE2B a2476b1ef9236a751c4adf97adecdd37c24e9fcc3225de5162d5c9395c91b783b91ca626ac380c93f41987ef2f333a122a110caf3c33acf1ac9f587d835ba10f SHA512 bfa572218c8216b0b3c175360f6e39d4ae37668f32481ebf1b50ff4cbeedc9b7af4a8b6b85cc8b344c23198f5ca9106c2bc24e09ba32ac6be7332394c9ebb404
 MISC metadata.xml 428 BLAKE2B 36d5533b4bcb9fe9aa69847e05599da6400c634c73f1f00321e0a4492b053fbc9e1fcf0f9a22782162b8bbafadb9a343b19da35e732e7898fb3784473564438a SHA512 af1c8716dbd0846be80b90587ffec0c51e0f56f277a659cce15f1114cc0d3889ebe9fd92fdbcdc62b04a9919f48037b44153f7cb5e66d4719ef649aec933ca12
diff --git a/dev-python/pyzmq/pyzmq-22.1.0.ebuild b/dev-python/pyzmq/pyzmq-22.1.0.ebuild
index 4be15e3ad80d..c442a2de75f1 100644
--- a/dev-python/pyzmq/pyzmq-22.1.0.ebuild
+++ b/dev-python/pyzmq/pyzmq-22.1.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 IUSE="+draft"
 
 DEPEND="
diff --git a/dev-python/qrcode/Manifest b/dev-python/qrcode/Manifest
index a2e781c99f2d..c5b627a5e2cb 100644
--- a/dev-python/qrcode/Manifest
+++ b/dev-python/qrcode/Manifest
@@ -4,6 +4,6 @@ DIST qrcode-7.1.tar.gz 36068 BLAKE2B 93f09da56b6e0cf6875250e46ec6b3cd5fc631c5775
 DIST qrcode-7.2.tar.gz 43032 BLAKE2B dc1ff428dd86485d2e2fe08b0efb367eb925551fbc31b4ab4f7f22a132ccc3fa0f7625a1e54f16df57f69fce3753883be0e46de6df84b13170d82d10c268866e SHA512 2ce72b2f6893168b96e1f6dae03b3250b8a0654afc9c0194075493d8ed93616acec7b61b9b95573f92c853cf227fff467edae7255aed10a9f7730e9ec5215133
 EBUILD qrcode-6.1.ebuild 650 BLAKE2B 6bb326e7847e7706bfdf3392f78c8d1e882c82625822316d9325e60cf187dfb3a7d4b704d4ed60d56b60519a4690b66d88a9a0bb4b60e724b51c28f3cd61601e SHA512 8dd6811383a8c27cfff84c1436928dd94887d1f37d403c2a2659bb998c12bc30ad556a10cb36b65e986c4568a94beae94c85ed4c029c78663c4fbe919b20a185
 EBUILD qrcode-7.0.ebuild 619 BLAKE2B 074ef233f0bbbe4df9ffe6286c2204e31f97512133faf63a6000efbf678360f5bfe0a7d5cfdebc2f924cbb384e66dbe126d9aca6402a3b3da8433baa4aea73bc SHA512 24f6a06811fa989110986820defc69d0f52694ba4c6840ec76894c1fe527c91c9dc18a47bf7c004fdc98f6c430bebbc16d2207fbc6bf32a28882ff0267baecd6
-EBUILD qrcode-7.1.ebuild 619 BLAKE2B 074ef233f0bbbe4df9ffe6286c2204e31f97512133faf63a6000efbf678360f5bfe0a7d5cfdebc2f924cbb384e66dbe126d9aca6402a3b3da8433baa4aea73bc SHA512 24f6a06811fa989110986820defc69d0f52694ba4c6840ec76894c1fe527c91c9dc18a47bf7c004fdc98f6c430bebbc16d2207fbc6bf32a28882ff0267baecd6
+EBUILD qrcode-7.1.ebuild 617 BLAKE2B b6e696e03cf9ded2d1c48333e3abb97869604352c3ab69a82dd1c842e1b62a7a36dfe37621b82d55e647dc84266d3d92b000aba8fa95721c19955d4b08e4b597 SHA512 64dec804ec83f00d006d189b135898af053357cd0d672da894c8a0d8dd31cca9fd966ab8e4b74b0ee815bd12d7415bb3cb045a07b162eddfac9a6a743af235cc
 EBUILD qrcode-7.2.ebuild 619 BLAKE2B 074ef233f0bbbe4df9ffe6286c2204e31f97512133faf63a6000efbf678360f5bfe0a7d5cfdebc2f924cbb384e66dbe126d9aca6402a3b3da8433baa4aea73bc SHA512 24f6a06811fa989110986820defc69d0f52694ba4c6840ec76894c1fe527c91c9dc18a47bf7c004fdc98f6c430bebbc16d2207fbc6bf32a28882ff0267baecd6
 MISC metadata.xml 309 BLAKE2B 1ddae27e1f2ec0dc7c656238d9895afa6034ef205f42bea031b29cc69191b074e29f4049ec8103701cd916e17dae25e26d25d4e61f123d53fc0b0f6321c8d857 SHA512 65fa150581939d81a62bcd84b25e733b5cbf394ee6b201aaf7f64b22eeb75a3466ae0a6e1e230a8bb8f08b678544660e4382eb85fe55754bd64014a3c7b35aec
diff --git a/dev-python/qrcode/qrcode-7.1.ebuild b/dev-python/qrcode/qrcode-7.1.ebuild
index 0185db078736..e9930ae51fc5 100644
--- a/dev-python/qrcode/qrcode-7.1.ebuild
+++ b/dev-python/qrcode/qrcode-7.1.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"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 # optional deps:
 # - pillow and lxml for svg backend, set as hard deps
diff --git a/dev-python/qscintilla-python/Manifest b/dev-python/qscintilla-python/Manifest
index 9a411f7e9e40..31353313e595 100644
--- a/dev-python/qscintilla-python/Manifest
+++ b/dev-python/qscintilla-python/Manifest
@@ -1,5 +1,5 @@
-DIST QScintilla-2.11.5.tar.gz 3007564 BLAKE2B e1eb7794b2e09f7bbfebde69a7c62c1a952e36b95f9c7a38c3db0b6bbdab8d0bad4a6d780dc9bf9b5e8d64111046f1741c6710d8444504230ee0f4154ce0a304 SHA512 46bc3c896b4ab71fbcc821ce3a248ecc4200378e0b621adef8d39092f940928806c76abe529b7f27ce4280e7e49091d8cbeafe6f303ca85cf5675df2887fd99b
 DIST QScintilla-2.11.6.tar.gz 3027764 BLAKE2B 1eb5d9ba44040cbff30e8b0028e164cf2aa86c565a5368890500614b9395dbe861c5cd268cf6a4ec06e2c7d77860b2ad6064bc3d07fd63a6ede2b060f44a7117 SHA512 8055d72a40f9f5a7d45c6592055c1b8eb5e5c50ce9e51673babd5e567c769d60c64d244ba5a7def5731a3120099e9528d01ed94327a06bb56ae2fa2e5e37b198
-EBUILD qscintilla-python-2.11.5.ebuild 1776 BLAKE2B 5fb12707469657cdc578331fecfe6d249ac7a0931c7317ffa0fa21db6a2ed8ce10be77f0be52dea9b90e22a6f2f161c56e44b2042de9c4e7ebe150f612eb4b6a SHA512 1b50ec0477ebfbdc8d646cace0faa2c965de30f2f67cb22d02a2900d0a19dd4d4fd3ab5230bc7f3ed1c601998338a876fa0d391cbfb603abd230037ae36744c0
-EBUILD qscintilla-python-2.11.6.ebuild 1775 BLAKE2B 66678db25f96256fc2180b0202a2bfdc497871b38ac16a4404e5c41ad9ab76108441d1c30372dfe2f63954c7625fe5bef8e16320a9e9b357874cb763aaf47539 SHA512 a0dbf64b283f52c03c3ed1fa0ea176eb65560fc65adbe06985ac8d4d91ab9b01ba785e39a4e502b911f9194c65e6287128ffb84a0568fff236e13ff42e7510aa
+DIST QScintilla_src-2.13.0.tar.gz 3059601 BLAKE2B 8de5440c3019cb3f67ea25db2935dc8d8cd711298a8a49ce3f632937c538da5b8b337851c3f68c59eb3cb8df8396eebd8ac4f0b4d6d715c2519598eeda9b6586 SHA512 c72676e2d8463dde6e7c620e15a526eae056cfbf00bb5d013c315ebbf20340fcc79188c6e60c336679f7d18287066a26bdc96be2f1ef8a98b3adcada3ee09fd1
+EBUILD qscintilla-python-2.11.6.ebuild 1777 BLAKE2B 99a1c78b5b6bb20e5396450e6c5d3443c881a66a18f62dd8ccaead47896092a55b859ba1ef3a952d342923cc527354a120ce21a38467745e9f39380e2adb2b3f SHA512 34f2ce3ca646d2d55f351987a5f1d88039a112a15aaa0ceb0cf30223141b73129b9f468574e468e7872e35ed71a222db58fd0c303c4b00671e80ecf2834bf97d
+EBUILD qscintilla-python-2.13.0.ebuild 1863 BLAKE2B 6ca7d42d986b0c1849c477678764e0e93c3078880fe88133d72d8dffc162d9b511eb8b47d77cf830e4a5b32d1e10ba0ff91e21e576e2a8fc4a595ab9a5386aa1 SHA512 7874ecbc87db5ec40ce73576eb2957cedc13134a617d6263800cffa41b2ee1d7be8ea3f0aefb33a45a0ca7dd594c39022f2ab837e691b72b900d5c49a7fae25b
 MISC metadata.xml 678 BLAKE2B e849d949281fe5162977ac3cba9c3559258f0534ced3e4e160554e2ee166cd20f979545bebae2effb0690231c987abb0ad11ed2090dbcb1c6724fc3389edc195 SHA512 58afaba4b14bf09297c024e29d51bc6b22c9a8290a6ca7f2c8c5fd63dea01037a637eeddb2ad5dfc09f2fd09d92229f74f1ee9cfb200c835110236407296e530
diff --git a/dev-python/qscintilla-python/qscintilla-python-2.11.6.ebuild b/dev-python/qscintilla-python/qscintilla-python-2.11.6.ebuild
index 0a5d085b95f0..bea10fcea4e0 100644
--- a/dev-python/qscintilla-python/qscintilla-python-2.11.6.ebuild
+++ b/dev-python/qscintilla-python/qscintilla-python-2.11.6.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{7..9} )
 inherit python-r1 qmake-utils
 
 DESCRIPTION="Python bindings for QScintilla"
-HOMEPAGE="https://www.riverbankcomputing.com/software/qscintilla/intro"
+HOMEPAGE="https://www.riverbankcomputing.com/software/qscintilla/"
 
 MY_PN=QScintilla
 MY_P=${MY_PN}-${PV/_pre/.dev}
@@ -28,7 +28,7 @@ REQUIRED_USE="
 
 RDEPEND="
 	${PYTHON_DEPS}
-	>=dev-python/PyQt5-5.12[gui,printsupport,widgets,${PYTHON_USEDEP}]
+	<dev-python/PyQt5-5.15.5_pre[gui,printsupport,widgets,${PYTHON_USEDEP}]
 	>=dev-python/PyQt5-sip-4.19.22:=[${PYTHON_USEDEP}]
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
@@ -37,7 +37,7 @@ RDEPEND="
 	~x11-libs/qscintilla-${PV}:=
 "
 DEPEND="${RDEPEND}
-	>=dev-python/sip-4.19.22[${PYTHON_USEDEP}]
+	>=dev-python/sip-4.19.22:0[${PYTHON_USEDEP}]
 "
 
 S=${WORKDIR}/${MY_P}/Python
diff --git a/dev-python/qscintilla-python/qscintilla-python-2.11.5.ebuild b/dev-python/qscintilla-python/qscintilla-python-2.13.0.ebuild
index 12eb318581e7..03cabdd434c2 100644
--- a/dev-python/qscintilla-python/qscintilla-python-2.11.5.ebuild
+++ b/dev-python/qscintilla-python/qscintilla-python-2.13.0.ebuild
@@ -1,68 +1,72 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit python-r1 qmake-utils
 
 DESCRIPTION="Python bindings for QScintilla"
-HOMEPAGE="https://www.riverbankcomputing.com/software/qscintilla/intro"
+HOMEPAGE="https://www.riverbankcomputing.com/software/qscintilla/ https://pypi.org/project/QScintilla/"
 
 MY_PN=QScintilla
-MY_P=${MY_PN}-${PV/_pre/.dev}
+MY_P=${MY_PN}_src-${PV/_pre/.dev}
 if [[ ${PV} == *_pre* ]]; then
 	SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"
 else
 	SRC_URI="https://www.riverbankcomputing.com/static/Downloads/${MY_PN}/${PV}/${MY_P}.tar.gz"
 fi
+S=${WORKDIR}/${MY_P}/Python
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE="debug"
 
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
 "
 
-RDEPEND="
-	${PYTHON_DEPS}
-	>=dev-python/PyQt5-5.12[gui,printsupport,widgets,${PYTHON_USEDEP}]
-	>=dev-python/PyQt5-sip-4.19.22:=[${PYTHON_USEDEP}]
+DEPEND="${PYTHON_DEPS}
+	>=dev-python/PyQt5-5.15.5_pre2107091435[gui,printsupport,widgets,${PYTHON_USEDEP}]
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
 	dev-qt/qtprintsupport:5
 	dev-qt/qtwidgets:5
 	~x11-libs/qscintilla-${PV}:=
 "
-DEPEND="${RDEPEND}
-	>=dev-python/sip-4.19.22[${PYTHON_USEDEP}]
+RDEPEND="${DEPEND}
+	>=dev-python/PyQt5-sip-12.9:=[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/PyQt-builder-1.10[${PYTHON_USEDEP}]
+	>=dev-python/sip-6.2.0_pre2106291255[${PYTHON_USEDEP}]
+	dev-qt/qtcore:5
 "
 
-S=${WORKDIR}/${MY_P}/Python
+src_prepare() {
+	default
+	mv pyproject{-qt5,}.toml || die
+}
 
 src_configure() {
 	configuration() {
 		local myconf=(
-			"${PYTHON}"
-			"${S}"/configure.py
-			--pyqt=PyQt5
-			--qmake="$(qt5_get_bindir)"/qmake
-			$(usex debug '--debug --trace' '')
+			sip-build
 			--verbose
+			--build-dir="${BUILD_DIR}"
+			--scripts-dir="$(python_get_scriptdir)"
+			--qmake="$(qt5_get_bindir)"/qmake
+			--no-make
+			$(usev debug '--debug --qml-debug --tracing')
 		)
 		echo "${myconf[@]}"
 		"${myconf[@]}" || die
 
-		# Fix parallel install failure
-		sed -i -e '/INSTALLS += distinfo/i distinfo.depends = install_subtargets install_pep484_stubs install_api' \
-			${MY_PN}.pro || die
-
 		# Run eqmake to respect toolchain and build flags
-		eqmake5 -recursive ${MY_PN}.pro
+		run_in_build_dir eqmake5 -recursive ${MY_PN}.pro
 	}
-	python_foreach_impl run_in_build_dir configuration
+	python_foreach_impl configuration
 }
 
 src_compile() {
diff --git a/dev-python/qtconsole/Manifest b/dev-python/qtconsole/Manifest
index 4d78992d3720..99820931f54d 100644
--- a/dev-python/qtconsole/Manifest
+++ b/dev-python/qtconsole/Manifest
@@ -1,5 +1,3 @@
-DIST qtconsole-5.1.0.tar.gz 428856 BLAKE2B 4176c8add4fb949a82ce33fe9df598d2141c42dfa9ce57ae09ea201398df6ea54e00b890ad2b548b51e95f4dc0c7b2793640ced9b39b7adea910e3d2b90ec900 SHA512 50d2f1466d1fd5ebd33da1778f8271c5a328a61551f665e488c5c45326fabb4b431090d89b39c130a064b3c117cd24dc92e160c68c1eecf6647f2b662b01b2db
 DIST qtconsole-5.1.1.tar.gz 428840 BLAKE2B eb5f6dacf576133c07bc45a9f0fcfdfd041f72012d9564e288a40ac060a6843f6438c80836bcf2f35ffa1f575383bdffe347a498930fe96e2d99a1f1fbe3a032 SHA512 dd9f725fc6e55dea3910650c4c5641336ed1ed56e6eeaad91e6567743bc02fbd0ca567295c3c8897bb800df305ec0bf9f2d8caa8ad0099cdfa2d20c7ca96fbdc
-EBUILD qtconsole-5.1.0.ebuild 1270 BLAKE2B 07487143c4fdd5d3f282cf2e755c9a8114240ba31582fbed0c3d18758f341ec21193b3a2dabcf5f18a128dcc1e98c67ada4484292637e856e9dc7661ac3f2e46 SHA512 394de48ee8182970988bdc007ad1333f6772157aa37b9ec25c9ae01115d642238bd075c8b018d4e516c67f2bc46bba0cd4ad0d45a4ba0fe378037f177db86c58
-EBUILD qtconsole-5.1.1.ebuild 1254 BLAKE2B a73005cc8c0aca61aaa29892e50c91361187abf4a356d31e9391a4a0bbaad57e85cc7f7c1e94ce61b320fd6d5d628bdd5a2d497f69a601eda28356621c52de0d SHA512 9ae3d3fc72b61a373732e27884ca0b4abb178f3cbc94f476a15320d060fc170ae30cb9da0193c4b66c762454217f671aba348b1d751908afaf14806b5ddf6823
+EBUILD qtconsole-5.1.1.ebuild 1251 BLAKE2B bbb40ff3932daaeebb68edd12c1d66eb8066aec4425e1f594d899bf8494ab1df84cca58e758a873f561e48c7dcb02b07e27f88b9b5f8ce6dae855c71311d5496 SHA512 ef18174dc4f932b9b65c043037b02b7dbd88097a17ce781f8ae5ddccc41382b54edc5bdd8a1f03c6db3b49511be99350826d8db3c202e9df01c113e8f9c04b5b
 MISC metadata.xml 689 BLAKE2B 65c50141dd002a264402eb90385ad3203ebdec1fc47bfa0d94055a82bd98bbe93cc0cacdd4b0f9cab0cc36ad3ea22f500f53c55398347b6cc1cada2569abdb22 SHA512 40e7ef3f4437946e75f1a2be9373ba06b3c58b4ebae0cef8958e2c101aa855e4c92aa0a426d2a74d8e946d05e176690006324db1d8514598bb574f1071644d81
diff --git a/dev-python/qtconsole/qtconsole-5.1.0.ebuild b/dev-python/qtconsole/qtconsole-5.1.0.ebuild
deleted file mode 100644
index 97125f3772aa..000000000000
--- a/dev-python/qtconsole/qtconsole-5.1.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Qt-based console for Jupyter with support for rich media output"
-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/ipykernel[${PYTHON_USEDEP}]
-	dev-python/ipython_genutils[${PYTHON_USEDEP}]
-	dev-python/jupyter_core[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_client-4.1.1[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/traitlets[${PYTHON_USEDEP}]
-	dev-python/QtPy[${PYTHON_USEDEP},gui,printsupport,svg]
-"
-BDEPEND="
-	test? (
-		dev-python/QtPy[${PYTHON_USEDEP},svg,testlib]
-	)
-"
-# required by the tests that are removed:
-#		dev-python/flaky[${PYTHON_USEDEP}]
-#		dev-python/pytest-qt[${PYTHON_USEDEP}]
-
-PDEPEND="dev-python/ipython[${PYTHON_USEDEP}]"
-
-distutils_enable_sphinx docs/source
-distutils_enable_tests pytest
-
-src_prepare() {
-	# TODO: these tests require virtx; however, running under virtx
-	# causes pytest to segv on exit (even though tests pass)
-	rm qtconsole/tests/test_00_console_widget.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/qtconsole/qtconsole-5.1.1.ebuild b/dev-python/qtconsole/qtconsole-5.1.1.ebuild
index 83475660a39a..4755d1405d43 100644
--- a/dev-python/qtconsole/qtconsole-5.1.1.ebuild
+++ b/dev-python/qtconsole/qtconsole-5.1.1.ebuild
@@ -13,7 +13,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/ipykernel[${PYTHON_USEDEP}]
diff --git a/dev-python/re-assert/Manifest b/dev-python/re-assert/Manifest
index 2d4f4712eb62..c88cc4cff8cb 100644
--- a/dev-python/re-assert/Manifest
+++ b/dev-python/re-assert/Manifest
@@ -1,3 +1,3 @@
 DIST re-assert-1.1.0.gh.tar.gz 5010 BLAKE2B fc65f43b3525d02d877d51f0a1556b6b205dd1126fc205b775f5c0b6c34ee7c3e8d224fc3f46a80e8df4a366674be90221e891e19e12072c87ff82451ca8676c SHA512 fc14267cc68a12ff7350982f0bf54c77107809c9f0379ab3aa73fa1b7cf5ccabb130fcd35ab75bdf183e69c802a041deac707e1f0bab1c3815d4146b4e320c07
-EBUILD re-assert-1.1.0.ebuild 553 BLAKE2B a755035cb0415e2555f269ecda8ccd0ec21dfba2e9f8161ac8295d278341790879976056a58806a670b8ceb96e5d0f74d26836bdf21e76379052b34c28021bc1 SHA512 cd9e2303a7927962fca3fbfbbdfb638c0720c9937f5d13dbcc56a4ac2e0e348f6a0c4dda250ba83e6c45f0c834d43b0a488211015c7dcec6773fa1809bc59fbd
-MISC metadata.xml 336 BLAKE2B 0e8c17f4a0d9ded996c0df12dcb090fdfa554faa05b8e45f32f14326ceb847bea4dcfdb08279e1d5793dba8a745af9f989ee86b6ff055a66771530568beee57f SHA512 793b2d73757f42b3854ee1e80e35982f688993767607518150fb35a67625ab93fa4eb2864d14bd4ecc714b37d5338a8cb5542b84fadff123d0a3abdd58b8383d
+EBUILD re-assert-1.1.0.ebuild 559 BLAKE2B 3d430db049e5ece3c1bf7af986423884edb73987f5235009cf0fe3da3b52a60a9f5db7417658fad11e2f52375e4d03dda7396eafd282682fe4b20bede16655d1 SHA512 417491c5de05f333401a65f1cb33731a267cacd1af5d72141990da7119021c7afe77f940539e356c77b4e2583f7951b6519993f1d9952d78244956ae4c8d4e24
+MISC metadata.xml 394 BLAKE2B 58b3e95dcebdf8cc5f96fc98ee4cd7fcddcfb07357f05fe59631a726c7a7898198d35ce934d023aa0f1e3c3979ab6b8f0ccbc5658e06e74b4081dec47a4e715a SHA512 f18a82cccaf35a8e94bb2aa4d34cf24fd2a05fecaf1b39cc8409efc7d7e91b369518d61cb83715918006a553080059e79743a8ba0db157006099d1ffffec9f0d
diff --git a/dev-python/re-assert/metadata.xml b/dev-python/re-assert/metadata.xml
index f8f52fb13a66..0fa82858848e 100644
--- a/dev-python/re-assert/metadata.xml
+++ b/dev-python/re-assert/metadata.xml
@@ -8,5 +8,6 @@
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">re-assert</remote-id>
+		<remote-id type="github">asottile/re-assert</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/re-assert/re-assert-1.1.0.ebuild b/dev-python/re-assert/re-assert-1.1.0.ebuild
index 4b7f98bf6787..595f9cfd91b8 100644
--- a/dev-python/re-assert/re-assert-1.1.0.ebuild
+++ b/dev-python/re-assert/re-assert-1.1.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Show where your regex match assertion failed"
diff --git a/dev-python/regex/Manifest b/dev-python/regex/Manifest
index d08929420a92..26447a1cb4a1 100644
--- a/dev-python/regex/Manifest
+++ b/dev-python/regex/Manifest
@@ -1,7 +1,11 @@
+AUX regex-2021.4.4-pypy3-fix-test_empty_array.patch 1103 BLAKE2B 2498de0ebaa68fcb99653a40bfbb9a1009519a79244fa3193ca43b9b8b3ef714f066fdac68f32d7f24c275690cb24bd1deca6b30120519b99a3402db7b4d4d48 SHA512 d55643d7ca251f465d14d8cffab60e6f2c8fb18ec6f9032a5318fab17a8b8e5ae5c98d22e0eff28aacd5bb8ec2ff606022921f73f3c9f7e54ee0853de262cfa7
+AUX regex-2021.4.4-pypy3-fix-test_issue_18468.patch 1078 BLAKE2B 3545ee5167790fbb1d068afdac3f6dbba28ea92d6c1d4ef31b60a8406061deb8609d7fd9a659b45715d4af0f2deb1da0ef9865aebe58919c2b392e2a1a833cae SHA512 182628709ef0f373037acf197c2ade3215684b2c805a96a600a3dfcb092e6fd134c261330ed76c7c248e72f439e464ccde432444bfe4a9610bd36c777bf45c9d
 DIST regex-2021.4.4.tar.gz 693187 BLAKE2B a13a51a883599f726c20cdbf28d5b0f1a53d8f2eec5f4047da0ede2951694507c5065de5a84152510874db087c342d52f19d920a7b72c034325ddc91f5fb75ac SHA512 2eff9867639f16ad7894997f399262d653a9ef0bb4e8d40bd977e5c55625cf57b4bb593f84504009a0b3cd50b3876d1938c71fd733c0ad1a076de32b6b4b33b9
 DIST regex-2021.7.1.tar.gz 693459 BLAKE2B 484259e14af99d911a20835be73686fea621e501756b02e760128b60a52eb62719efaa0b788ca57026dbdc3dfd55aa321a0feb8e73f6b7435f8711cf465ec2f6 SHA512 7b28e24a829b8ac8f43fdfadf012e833c715b9743d1c9a7cd34eea2789ec54df23d651c8a15aabe8c5d69662402f6302cfdeb23287c49d91b4e9fb3b9452ef73
 DIST regex-2021.7.6.tar.gz 693843 BLAKE2B 9acbca300632ff45744d509e47de56625b003b2046c068f3bf5cae3987bc9bbd51e5cdc442c3e72c6c9c0daeeacd658c56b56754c0f9e83c03816237cc311000 SHA512 0849caaafc669b6dc322dcd4d48962cefbe955c19f9ee3d657b7b8389f77ab2b2e27ec341745dff01a60dd3930904d69015a334ff748de10be2d0b7c421b0967
-EBUILD regex-2021.4.4.ebuild 727 BLAKE2B 8c568d7a6ec94ed2af98176ab5a5fec05f890781b04bf182ddd1a38a7a48e39df0d03873bef012af54a54cbed8648c24cab6206b17ed4356faadc1b8c0720db8 SHA512 965a6e5bfe52cc24b8696ab65e7bd6b499ce1321dd5356ba25653b11f23313ed62616f2e34c2ad037e200a48241399f8809958f5031ed2aa07a09c5c1f638a27
-EBUILD regex-2021.7.1.ebuild 734 BLAKE2B 1010613ac705325563111fe6c89aee0a60b71ed283fa5c64ec5d4e28c2b27539b2d80fd47439a716ad9e400b0dc91c1e3613a921519026f63ab8d0c1f7de711e SHA512 b42991f21d156a5b9cd01268460fa3e7fec12b06cee038bdce6eb9b8bf6bc53d94b708414015c8b5dd3bd63c696d833b50558fe017e45da89bbc6d55063ce2fe
-EBUILD regex-2021.7.6.ebuild 734 BLAKE2B 1010613ac705325563111fe6c89aee0a60b71ed283fa5c64ec5d4e28c2b27539b2d80fd47439a716ad9e400b0dc91c1e3613a921519026f63ab8d0c1f7de711e SHA512 b42991f21d156a5b9cd01268460fa3e7fec12b06cee038bdce6eb9b8bf6bc53d94b708414015c8b5dd3bd63c696d833b50558fe017e45da89bbc6d55063ce2fe
+DIST regex-2021.8.3.tar.gz 693937 BLAKE2B 886dfe1a312bb34d83a3fe9442231215be7e263cbd123da24c454cdceac1055cb4dacfe4a3104699b6b97f86b14e2b723ea1267a13c2395ce2baad4ca367d77e SHA512 3ac33421ca15e47a1d8beeb3841b6e698d492e96965955afe69529dc71cc7d522e5e8236e4f577c934a3fd27036340a8084c84055bcfff0a9572e8fb56ba272b
+EBUILD regex-2021.4.4.ebuild 872 BLAKE2B 2cab2ea84342bb3e2eae49f4d6e4456b507713dcee7ffc5f85ef2f54be4f774f8c3a138f4be7427af0656e50c5b97671f9d535bb3e7bae58be01134934597a03 SHA512 1ad72740d9b239bca774777eb12a685f7230344b6788f8f01eb120184d888cf4e5deeb1158d1d9c0b546993eff91c7d3bc00a34836ae6844fc3f39d76f7f1061
+EBUILD regex-2021.7.1.ebuild 879 BLAKE2B 50834b1ef67a73159b65498cc429e8d9a38b0cd30fd1e0ed994563d240c81c9c0b06a196e1b5fbc7c9ff9137ec7bf176d577e6bf1161686f13103fdba479367f SHA512 e971fcce3414eb203ddd4dab3eeeb964e3e93470e3f3c5a450d5f8ff8e1379d9ea27083b9c3f5e594b43f8cb52265191246a9d4097531aa723bb6c308e5f9d3c
+EBUILD regex-2021.7.6.ebuild 879 BLAKE2B 50834b1ef67a73159b65498cc429e8d9a38b0cd30fd1e0ed994563d240c81c9c0b06a196e1b5fbc7c9ff9137ec7bf176d577e6bf1161686f13103fdba479367f SHA512 e971fcce3414eb203ddd4dab3eeeb964e3e93470e3f3c5a450d5f8ff8e1379d9ea27083b9c3f5e594b43f8cb52265191246a9d4097531aa723bb6c308e5f9d3c
+EBUILD regex-2021.8.3.ebuild 879 BLAKE2B 50834b1ef67a73159b65498cc429e8d9a38b0cd30fd1e0ed994563d240c81c9c0b06a196e1b5fbc7c9ff9137ec7bf176d577e6bf1161686f13103fdba479367f SHA512 e971fcce3414eb203ddd4dab3eeeb964e3e93470e3f3c5a450d5f8ff8e1379d9ea27083b9c3f5e594b43f8cb52265191246a9d4097531aa723bb6c308e5f9d3c
 MISC metadata.xml 384 BLAKE2B 4928f66b54b5e4de6a8b913207ec6e46c124e55510eac304a7fd46c6ca63cce60704757e9289bf35d2d58e9ddcd4aa98d751a079c79f09dda9206553096e0561 SHA512 3db0a8abe7036cd9d0fd8b1450598436dbb30581806380ad51c3d0f49d129325aba1bad9700d14adffc7cfd199c4ec3377e6eb0225244bfc82368bbb50548e07
diff --git a/dev-python/regex/files/regex-2021.4.4-pypy3-fix-test_empty_array.patch b/dev-python/regex/files/regex-2021.4.4-pypy3-fix-test_empty_array.patch
new file mode 100644
index 000000000000..706b41b74688
--- /dev/null
+++ b/dev-python/regex/files/regex-2021.4.4-pypy3-fix-test_empty_array.patch
@@ -0,0 +1,35 @@
+From: Arthur Zamarin <arthurzam@gmail.com>
+Date: Fri, 30 Jul 2021 11:13:41 +0300
+[PATCH] PyPy3: fix test_empty_array
+
+As an optimization, PyPy sets empty array.array to use a NULL buffer
+pointer, while CPython uses empty buffer (but not NULL).
+Add a very specially crafted fix for PyPy3
+
+Signed-off-by: Arthur Zamarin <arthurzam@gmail.com>
+---
+ regex_3/_regex.c | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+--- a/regex_3/_regex.c
++++ b/regex_3/_regex.c
+@@ -18062,9 +18062,19 @@ Py_LOCAL_INLINE(BOOL) get_string(PyObject* string, RE_StringInfo* str_info) {
+     }
+ 
+     if (!str_info->view.buf) {
++#if defined(PYPY_VERSION)
++        /* In PyPy3, when the array.array is empty, it's buffer is NULL */
++        str_info->characters = NULL;
++        str_info->length = 0;
++        str_info->charsize = 1;
++        str_info->is_unicode = FALSE;
++        str_info->should_release = FALSE;
++        return TRUE;
++#else
+         PyBuffer_Release(&str_info->view);
+         PyErr_SetString(PyExc_ValueError, "buffer is NULL");
+         return FALSE;
++#endif
+     }
+ 
+     str_info->should_release = TRUE;
diff --git a/dev-python/regex/files/regex-2021.4.4-pypy3-fix-test_issue_18468.patch b/dev-python/regex/files/regex-2021.4.4-pypy3-fix-test_issue_18468.patch
new file mode 100644
index 000000000000..ae5958021781
--- /dev/null
+++ b/dev-python/regex/files/regex-2021.4.4-pypy3-fix-test_issue_18468.patch
@@ -0,0 +1,31 @@
+From: Arthur Zamarin <arthurzam@gmail.com>
+Date: Fri, 30 Jul 2021 11:38:26 +0300
+[PATCH] PyPy3: fix test_issue_18468
+
+When using the small subclass classes to test correctness of split
+results, there are difference between CPython and PyPy3:
+ - CPython returns always the base class (for example str instead
+   of StrSubclass)
+ - PyPy3 returns the same class, so we get an StrSubclass
+
+Based on the test, it looks like the behaviour of PyPy3 is correct,
+but the test works based on CPython.
+
+The fix was to relax the equals type to check that it is a subclass.
+
+Signed-off-by: Arthur Zamarin <arthurzam@gmail.com>
+---
+ regex_3/test_regex.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/regex_3/test_regex.py
++++ b/regex_3/test_regex.py
+@@ -52,7 +52,7 @@ class RegexTests(unittest.TestCase):
+                 for x, y in zip(actual, expect):
+                     recurse(x, y)
+             else:
+-                self.assertIs(type(actual), type(expect), msg)
++                self.assertIsInstance(actual, type(expect), msg)
+ 
+         recurse(actual, expect)
+ 
diff --git a/dev-python/regex/regex-2021.4.4.ebuild b/dev-python/regex/regex-2021.4.4.ebuild
index 80f758e55ed2..738d258d1ab9 100644
--- a/dev-python/regex/regex-2021.4.4.ebuild
+++ b/dev-python/regex/regex-2021.4.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 
 inherit distutils-r1 flag-o-matic
 
@@ -16,6 +16,11 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 IUSE="doc"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-2021.4.4-pypy3-fix-test_empty_array.patch"
+	"${FILESDIR}/${PN}-2021.4.4-pypy3-fix-test_issue_18468.patch"
+)
+
 distutils_enable_tests unittest
 
 python_test() {
diff --git a/dev-python/regex/regex-2021.7.1.ebuild b/dev-python/regex/regex-2021.7.1.ebuild
index 271faa2b4fed..c0a5a26d5c4e 100644
--- a/dev-python/regex/regex-2021.7.1.ebuild
+++ b/dev-python/regex/regex-2021.7.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 inherit distutils-r1 flag-o-matic
 
 DESCRIPTION="Alternative regular expression module to replace re"
@@ -15,6 +15,11 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 IUSE="doc"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-2021.4.4-pypy3-fix-test_empty_array.patch"
+	"${FILESDIR}/${PN}-2021.4.4-pypy3-fix-test_issue_18468.patch"
+)
+
 distutils_enable_tests unittest
 
 python_test() {
diff --git a/dev-python/regex/regex-2021.7.6.ebuild b/dev-python/regex/regex-2021.7.6.ebuild
index 271faa2b4fed..c0a5a26d5c4e 100644
--- a/dev-python/regex/regex-2021.7.6.ebuild
+++ b/dev-python/regex/regex-2021.7.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 inherit distutils-r1 flag-o-matic
 
 DESCRIPTION="Alternative regular expression module to replace re"
@@ -15,6 +15,11 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 IUSE="doc"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-2021.4.4-pypy3-fix-test_empty_array.patch"
+	"${FILESDIR}/${PN}-2021.4.4-pypy3-fix-test_issue_18468.patch"
+)
+
 distutils_enable_tests unittest
 
 python_test() {
diff --git a/dev-python/regex/regex-2021.8.3.ebuild b/dev-python/regex/regex-2021.8.3.ebuild
new file mode 100644
index 000000000000..c0a5a26d5c4e
--- /dev/null
+++ b/dev-python/regex/regex-2021.8.3.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+inherit distutils-r1 flag-o-matic
+
+DESCRIPTION="Alternative regular expression module to replace re"
+HOMEPAGE="https://bitbucket.org/mrabarnett/mrab-regex"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+IUSE="doc"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2021.4.4-pypy3-fix-test_empty_array.patch"
+	"${FILESDIR}/${PN}-2021.4.4-pypy3-fix-test_issue_18468.patch"
+)
+
+distutils_enable_tests unittest
+
+python_test() {
+	eunittest -s "${BUILD_DIR}"/lib
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/Features.html )
+	local DOCS=( README.rst docs/*.rst )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/reno/Manifest b/dev-python/reno/Manifest
index 505be61cd017..be563bb328d0 100644
--- a/dev-python/reno/Manifest
+++ b/dev-python/reno/Manifest
@@ -1,3 +1,5 @@
 DIST reno-3.3.0.tar.gz 81168 BLAKE2B 46afacfa437c9d5fed49d454edaf92b96ffbd677de02d91c7fd431b5ae98764918e099dd486345907446a19b2c94a1c36ac5cff9cf6d911438b48d41d9585ba1 SHA512 0fb6ff09e71b829cabe452693aac0c3a14d44f75f93e8934ebd0b0861e7dcd749a92b7bf19bc4f46202ecb02840edd6d5e5787c8b8a5b64a6b91fb52fe18287d
+DIST reno-3.4.0.tar.gz 82815 BLAKE2B aab374c48c1dcf25ba7a78d46069c5d659762bf01d25dc05f597f02098ee10e7b8c518a0afad186ecd93602782a7c50294183b7e33075f8bfe57cc0bc3c1d016 SHA512 cbfd5d9b41beb1599438e249b8082175c8bd2b8dca62d8e6fd1ef742bf889adf6490e1ed0fa78d8aca663a0fb6bbe70742815a6512c6d51fb8073745b6860d65
 EBUILD reno-3.3.0.ebuild 1100 BLAKE2B 3590b4a407686db5705f36a966be9a2f4a072c10fc9e6e848c98fc9a6c3409530a9d582eaf6a48bbc49361d04e1db538033363183bb1d9964546375166f4b92f SHA512 6c1bb0c90a6167c207b82d2ce02a513c41acf5cc9e4ff2c6ce8d76abe5166e3be79c458fc391189c117c7716a49bdb6579943c85874cf57db8331bbb7f2d3d75
+EBUILD reno-3.4.0.ebuild 1061 BLAKE2B 0e75de4f03ea4d804d94d75ec19ea8da6d47afcdebc15872627e9e4059f0313625645a85364a3517095a817fab8156e2c3f8df630aa60261f280faeac68d81d0 SHA512 98b222aa591121844aca6fc654c532c47c44e4c069c53384271c019e958f51ed5e0e6213a98c2d506501b7d5eae438f011745cebd204495152128dca995667a4
 MISC metadata.xml 345 BLAKE2B 64bb3d1c4711fd517770e90167d9edcab33908e0f9ba511b8ae1c0e1ad6181bd4c4d2639d6cf802aeeef8cc77e623d749a3522e73e53514ecf39b30b77f8072b SHA512 127fc0515eae674566848c406e6695ca20d7db100d1378713d8900f25b2ec957eb89eb7f075aafc3efb48b3db7b290e88480248c78bf94456f680c528c7e6269
diff --git a/dev-python/reno/reno-3.4.0.ebuild b/dev-python/reno/reno-3.4.0.ebuild
new file mode 100644
index 000000000000..755626baf35b
--- /dev/null
+++ b/dev-python/reno/reno-3.4.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..9} )
+inherit distutils-r1
+
+DESCRIPTION="Release notes manager, storing release notes in a git repo and building docs"
+HOMEPAGE="https://pypi.org/project/reno/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~x86"
+
+RDEPEND="
+	dev-python/pbr[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-5.3.1[${PYTHON_USEDEP}]
+	>=dev-python/dulwich-0.15.0[${PYTHON_USEDEP}]
+	>=dev-python/packaging-20.4[${PYTHON_USEDEP}]
+	>=dev-python/docutils-0.11[${PYTHON_USEDEP}]
+	>=dev-python/sphinx-2.1.1[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/pbr[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+	)
+"
+
+# The doc needs to be built from a git repository
+distutils_enable_tests unittest
+
+python_prepare_all() {
+	# Some tests need to be run from a git repository
+	rm reno/tests/test_{cache,semver}.py || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/reportlab/Manifest b/dev-python/reportlab/Manifest
index e131d633ca8f..df00382a33e7 100644
--- a/dev-python/reportlab/Manifest
+++ b/dev-python/reportlab/Manifest
@@ -2,6 +2,8 @@ AUX reportlab-3.5.48-usr-lib-LLD.patch 1601 BLAKE2B 34ff1ce6b0cc2fa8ea3b2bec79cc
 DIST pfbfer-20070710.zip 677333 BLAKE2B 100214476a361a5e5d1f3da0999591345f6e3a3f8c6bc3f6a3e9eca734190c6259758a43302c6e41254d33491fe535eb7d5dd07aa9727c912424bebc31fc18df SHA512 6fd4a5d955464b10d13a7b748703450c1fe120d5ed09e8cfa1b4dfa9c183c59fe001df29433af551796b0df62544b7ddc364f9bb1bdcc2cd300434340ffcc4f2
 DIST reportlab-3.5.67.tar.gz 2911726 BLAKE2B 8dbd3bb54c2c651616c3b6be905ac7b43b3a8f30f630d2f9b91882416cb4513751affa507870fdd801b5aa53480498ecc9a5fe3902ab38d72288b6f48ce892e9 SHA512 5a0ec58f0ee925079f3756bac309bd5aaf159118a4ed7ec6467721ead23e5db37839014bb49f1804a0dee4532ce21f9c78adec99ec61a4aeffd957184d489a6c
 DIST reportlab-3.5.68.tar.gz 4512985 BLAKE2B b38fea7704fcf08ff25d314286830473b90e75a80bcc65fc7b2cfc4c270347aa7c68f31716e635048428c24bb0ca0afc3d0e22bebedb1d1bc50901c13d278fc4 SHA512 4d41f9d9708d2bd172928985e1e2d22ffcc61d2d6fb21bdf1f3275f9ff576f06e712cd9c9d1707ff364608ad8bed6c30754893a7b142dc3accd6eef8aa19c975
+DIST reportlab-3.6.0.tar.gz 4499377 BLAKE2B d72f1fb8c05f192ca7e9a13cbf3142e1b14b4bdd6c6eee7da6bb3e48a08500f2c1aebc671d06c020e1dab6107b0b52490c0c72faa82cba1ac66c03014a6130c1 SHA512 64ca4cf868d6d68432e933176087323c2bba58afe2bf444593831afad2471e07b4f33dbeff02fbef009ae7211ef781b1499d3881f27d583dc36ce1eb8f004c4f
 EBUILD reportlab-3.5.67.ebuild 1492 BLAKE2B d9b54242e7d90d7ab8df30cdffe52fb2ac3ecfc8b4727f7c631fee7d000f7e231a097dbdc67ea0999bac6360da963c43c05231cf61c20cd8c66e113e1b3e30fb SHA512 5401c2173c88acb054c37ac0acbf894d2c741e391300cf38e042b90115de07418639ce65275ca0edfc11a7139b43371487f58ebb9356f32b53a7edb3013b7dfd
 EBUILD reportlab-3.5.68.ebuild 1506 BLAKE2B ffc03740dc04b43534aae829798c416466017cbb3c637316ce4940e2acfe0a289568559c6fe84f785291850da414e71e5998fcb23da569929147aacab46a9e95 SHA512 b1397f7c24bf43bd987d1a54dc2823572266cf4fb253d055803f6a5d5be13bda416422ab2936e2d794a0e2405838145c5b56a969028f2980ab01eca25209f736
+EBUILD reportlab-3.6.0.ebuild 1505 BLAKE2B beb3a6d0d101289987cf96e11742498d9419e0eda0551841dbf0266cab697add000b16867c064de81bb2b552033e5863b2c642a0fa40f287403f4494b4e84179 SHA512 15ecaaee1f7eb4d249edbacd3cd04164bb58e3ce18c0dbc4fb3c1f09e9a17a6272dc6cd04341728660faf6b506c1160daffa272bad73eb10fda5c259450dcd61
 MISC metadata.xml 1972 BLAKE2B 92f398fa2c71a354bf25e35578038cfe62fc7687dd9f378574d7221d9982fb96f668f63fe8811b8e189eecd9f02edfe44d53cd17471e226cae8e5ee742ad0872 SHA512 363607498faad8268e3e9aea57f52240d8f5e7f0f9fa48436d7383b16138ee6e2eba87bfd54077dd475a37201324dc83f05a0c53d9c8eb5941be4026f3454fbb
diff --git a/dev-python/reportlab/reportlab-3.6.0.ebuild b/dev-python/reportlab/reportlab-3.6.0.ebuild
new file mode 100644
index 000000000000..1088559e78cb
--- /dev/null
+++ b/dev-python/reportlab/reportlab-3.6.0.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+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 ~riscv ~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() {
+	DISTUTILS_ARGS=(
+		--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/Manifest b/dev-python/requests/Manifest
index 23c69ae0f153..0b0edcbedb7c 100644
--- a/dev-python/requests/Manifest
+++ b/dev-python/requests/Manifest
@@ -2,5 +2,5 @@ AUX requests-2.26.0-test.patch 1328 BLAKE2B 4f9e66505a4acfe7b4bd62c6c95c28fc01eb
 DIST requests-2.25.1.tar.gz 102161 BLAKE2B 1901ca3bb1eb7a6eb7689a81e01c1c23d3f359835507fda78de734162cbd8573b7640c9376cb50ed9397603d67d9a14624028573c2709086547f37993a959429 SHA512 ca6b0a257b448a999cade0ae173c29cddc9cfffb319d16fc3d051d3e1cd77161536e3cab279b3cba59c60d29d7864a9281c1fa1f689ce48d3bce2ca9f1cd8d45
 DIST requests-2.26.0.tar.gz 104433 BLAKE2B 49872a0602ab0e6b3838c4ff84d6611c5265dd584a1902b51d5903a2fc566b97f7a70973a9244adf190e9249bc6d1fa448a2164a31d125ab6b3dac172ae62e1c SHA512 c3397d77f0d2f1afb05661c4b98adad6c1ddaf360906254150b33ab0d9479fd306905bd6d61b8cf8becd9a40bdcf9b03542e8267c644ef19f03f44bfca0bc461
 EBUILD requests-2.25.1-r2.ebuild 1674 BLAKE2B 6efa6716415cf24e9bfc2b001bf2aab3ef7c10032921fb5e43fde6824a6202856eb5282b6dbda13206e1b19a7ec22e542b0721abb2688671f2a475dff6d33882 SHA512 3632026495ee62d4e17596d18d8f7ab78dcf1cb21646f1c04e2baaaaafc3925515c4018581ef47b86abac87e63ab74277fa43557f15446f12f06d6c79cc988a6
-EBUILD requests-2.26.0.ebuild 1523 BLAKE2B 1b2150526f391c64487ae75b331bf782abc62e61f64610889af526ca42f08a43dc093c1d24a3ac8d077706b511e40ab93061cffa1c12df3c90464bc292acd974 SHA512 e65e67180500105b8e63c4eacf1403594f30c42e29550643f4f5ebebf7a4c14a569878307d7ae512cdca4bd3c247d8d7ecfb104becc049696d334f3ee337649c
+EBUILD requests-2.26.0.ebuild 1533 BLAKE2B abac6a547f05fe3a7ba0f1c515c1fd753d5f095318fd66cd506c4a89771b6e38660126b87e748f99c724de60ab82cdae4491b7805323d76d6b9a8dca032f42be SHA512 253b995b4430f10bad13453ad5bf0f40c55cd7d63b018d877b0255553998275139f3a5a5fccfcdda29e9c7c1532545bf32aca7649837affaf984a936f87637d9
 MISC metadata.xml 769 BLAKE2B 3b70fd8b559e10b971a7c72e4e134028300406af09445bf3d9c013cc15899f10452b493730b0af5f1ec958b81f719ae1af9be96cbf3fb5c0e3bf6f5bf1de7326 SHA512 12d72ea4ecc2ba0a58306917322a1687b73a3234b6dfa7f9ddbc4aa861daa4a56bcc6a8ea7e5da7cafdca2239f065c0f839a998de133958656b2c9a764fc30ae
diff --git a/dev-python/requests/requests-2.26.0.ebuild b/dev-python/requests/requests-2.26.0.ebuild
index 88f1f9b8a52d..b7f083336e7e 100644
--- a/dev-python/requests/requests-2.26.0.ebuild
+++ b/dev-python/requests/requests-2.26.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~mips ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="socks5"
 
 RDEPEND="
diff --git a/dev-python/resolvelib/Manifest b/dev-python/resolvelib/Manifest
index d854b5b5dbe8..1c95deb9e17d 100644
--- a/dev-python/resolvelib/Manifest
+++ b/dev-python/resolvelib/Manifest
@@ -5,5 +5,5 @@ DIST resolvelib-0.7.1.gh.tar.gz 764630 BLAKE2B 32c50ef0a16e07716f18994efe4b2bd21
 EBUILD resolvelib-0.5.4.ebuild 511 BLAKE2B 2459023b3fdd4fe6b7b7e4e070d43a9ba2dbddd898b5d78ca1d044d30916609947d6b8f18bc83d0dc0b5f3441374e47946db5da751f21dd4c6e09cafec9b4136 SHA512 1ff656be933084de43506a99ac745fd5079672735dde60a1360e6f93ea01baa7f6d3aec5e26bb86aa67783e188b09d3833351d512380d050cd690e3198af1be1
 EBUILD resolvelib-0.6.0.ebuild 514 BLAKE2B ddc301b7c8b2e4f0a8a6b9ffa5fd6491fffffa7a156f98968c560e4b86c044c4c07b75c3cd61eb5f088987d1e0255dd40edf07ca76db86b619cc311590be75a4 SHA512 6cc501ae8d9dc932dd90fa6da5e45f2395291c525b7f4df7ba9c6b9042d4a10dbe0e7c28150abb745508819318b6bedcc937cf50a4813589290ff2c9593b364c
 EBUILD resolvelib-0.7.0.ebuild 514 BLAKE2B ddc301b7c8b2e4f0a8a6b9ffa5fd6491fffffa7a156f98968c560e4b86c044c4c07b75c3cd61eb5f088987d1e0255dd40edf07ca76db86b619cc311590be75a4 SHA512 6cc501ae8d9dc932dd90fa6da5e45f2395291c525b7f4df7ba9c6b9042d4a10dbe0e7c28150abb745508819318b6bedcc937cf50a4813589290ff2c9593b364c
-EBUILD resolvelib-0.7.1.ebuild 593 BLAKE2B 206bd7dd4d41822052a7a252b9d3b5f586f2ee4266b9b9bdbda895bea2e9ebb965fc85456fb63cb6dce7c70dc56d829ce22c45e7956adb63babe016809b5b6a3 SHA512 2a925e88f6aa99b6112497f5dc10d0b4d94772ccb8c21a5507efb398f2177140b03fe048eeb7d5a55bb2cff0a1245837e14d391cce6441a963c611e0f6eceb25
+EBUILD resolvelib-0.7.1.ebuild 591 BLAKE2B 17c3acb92a42ea88285c07af12e4a5202a52f535c7bbc43feeca2cd9948e203bf4f49958c8fd1fa64fadd2e80925933abcd76b173b776d4f5818c2b44318d351 SHA512 da1e08c5d81f3d689bb2e6d82699561ed6e8e18d2a2e6201d9887dcdbc4da61bdc40d125853c3d8ba43d0086b9f47842f81c0ec9d7eb7178bb6ecf5886a111f1
 MISC metadata.xml 853 BLAKE2B 6b194c20227de800cc062248107ee5b0726199789af9837807523b335b1e9a63e850270060fb4d306996a4113ab2975102e285bcf52f8dd4177f71038bf65e2f SHA512 a86ffe23f2067369d2794f3cf013fb3e3d4a685273397f6f221f67e251939c17147a8cd30aec92cbcc40fc38e770755ca53507c42f8b84da66a96ad46e24e90a
diff --git a/dev-python/resolvelib/resolvelib-0.7.1.ebuild b/dev-python/resolvelib/resolvelib-0.7.1.ebuild
index ff9b580980e0..a848f30540bd 100644
--- a/dev-python/resolvelib/resolvelib-0.7.1.ebuild
+++ b/dev-python/resolvelib/resolvelib-0.7.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/rich/Manifest b/dev-python/rich/Manifest
index 6012d9852b0d..652526f7097d 100644
--- a/dev-python/rich/Manifest
+++ b/dev-python/rich/Manifest
@@ -2,8 +2,10 @@ DIST rich-10.3.0.tar.gz 16237609 BLAKE2B ddac8f2ed7b3b39e647179cd03cf59994729d7d
 DIST rich-10.4.0.tar.gz 16240850 BLAKE2B 76874e3efd9a8d696ba96579e1c658b1c76e71d353574cf3f9fb5d8a15810879f649d0ebfcbd1d72d9d496ce438cc08099b5d0416b932875704be2d0b4b28d0a SHA512 ecf6234ac862c1e04ab71c39763857d770c20200f5e1903a7d8e90fc1a67b5702a9eb0c67454ca48fb786a7631f60401f0a3299e82d864eca8c7afefedf21e26
 DIST rich-10.5.0.tar.gz 16242786 BLAKE2B d4d612555f9dca24b5150f5502d95bede784d7e6481e15948614de15a914d0cb3c83b64148a02db4ce8693feb1604c3729006fc0ca347eb10313aedcb795feca SHA512 c0471c0f35d3d9e5b5baf5798911073de02820a5bb5dcf42324bef2153a49a3019db44bc96b95247defe3be65f18097fc266a30bdeab153d9dda0ae38d34a79b
 DIST rich-10.6.0.tar.gz 16244447 BLAKE2B 79012a211e8f5510fd4cf0f2580971c51fee17a1e38905abc8227ba07eed1f2d25b7c356ecc907043a9e1898245cb6927cf226218c0ba20344865c1cd0a4a160 SHA512 59b777ef0fe3efe67138a7dbfc0c4e813b0a8c3d46adc6526b07241483919e0f71b478c0a66f3e0c207fcebdc0d639b7acf989ebf914c0e0fb6953029f0c9a16
+DIST rich-10.7.0.tar.gz 16261862 BLAKE2B 41f49bcda95f64b6deb30b32c7b8809ec1fa008d08de08dbb2ed8e718f04de1f446291468d714030db951877eb8a5e95360504c6a396758cb1e8d37fff4fe6be SHA512 23607389370cc2b8203f4505cee1536a57e7c3379d97ebbe3a751e11d578e1f652c0522d151048bc7ee018800d44ac762b7272cd3084f4ee94263e019bc42964
 EBUILD rich-10.3.0.ebuild 823 BLAKE2B 120174e85e952b8c8d177d9da9e66b29067bc76085a4cb33e6883f64254020f46b1cc69a1a1d658905cd840cf7a5dcc357a2818fdd684cfc52c35c56a74300dd SHA512 dbf3d8030491acb2fd93f41b122362d14d93f917863609c0f08fd08eb96a5218433ff4c37a1afd3a6bd906fe496fae49cba7764e963f1feb6783ccb84b36b39e
 EBUILD rich-10.4.0.ebuild 823 BLAKE2B 120174e85e952b8c8d177d9da9e66b29067bc76085a4cb33e6883f64254020f46b1cc69a1a1d658905cd840cf7a5dcc357a2818fdd684cfc52c35c56a74300dd SHA512 dbf3d8030491acb2fd93f41b122362d14d93f917863609c0f08fd08eb96a5218433ff4c37a1afd3a6bd906fe496fae49cba7764e963f1feb6783ccb84b36b39e
 EBUILD rich-10.5.0.ebuild 735 BLAKE2B 2c23538ece26718559c8d0de5d8dfa8dc285efbfe4ac03e2f96b86e693f576fabd0213c57abe42068a2d0c4caf07d4b5df08d63b7eb8c3b500dce2884c352ad6 SHA512 46a0261d511fae0adb555234657eb80c2382528a86e8a7ce06fbcbd83dd682fe4d0855ae2e31e135bbaf4b6caac65a77754397d9ba5ef7c69430157b8ebea895
 EBUILD rich-10.6.0.ebuild 735 BLAKE2B 2c23538ece26718559c8d0de5d8dfa8dc285efbfe4ac03e2f96b86e693f576fabd0213c57abe42068a2d0c4caf07d4b5df08d63b7eb8c3b500dce2884c352ad6 SHA512 46a0261d511fae0adb555234657eb80c2382528a86e8a7ce06fbcbd83dd682fe4d0855ae2e31e135bbaf4b6caac65a77754397d9ba5ef7c69430157b8ebea895
+EBUILD rich-10.7.0.ebuild 735 BLAKE2B 875be51f53984700db70490288f736476aadfa252a9eb3e64dbdb6fda717d278efc752a0b2fad93833fc118240284181a32d4069692f0b53fed7f57495215b93 SHA512 443876cc52c19b83804365142903b887966fe46f68ce1f2e0c117a03efe0633d74ecdc091d284dfabee0c5c1d973b825aa94a5f2377d93b9ebbdc7ee3d993228
 MISC metadata.xml 493 BLAKE2B 3ba69fa824ec59308ce763ccf317a1cb187586e17727e59e6f59f40a5f9d0a23c78ad20e67009a6ec460b317c471fa8c00d68fd8fc152cb5a87077aaa425af21 SHA512 186ecd75daa3aa481ccc5773ea797bb87afbf6f4017224b6e7d54985838f9beb1cc4a2faafef0ec1e24ce6b881ce95d7665d4f5945285032f19f7a86a5a7eb14
diff --git a/dev-python/rich/rich-10.7.0.ebuild b/dev-python/rich/rich-10.7.0.ebuild
new file mode 100644
index 000000000000..b676261d987f
--- /dev/null
+++ b/dev-python/rich/rich-10.7.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..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}]"
+
+distutils_enable_tests pytest
+
+pkg_postinst() {
+	optfeature "integration with HTML widgets for Jupyter" dev-python/ipywidgets
+}
diff --git a/dev-python/rospkg/Manifest b/dev-python/rospkg/Manifest
index bf907a9be43b..73eb6290b77b 100644
--- a/dev-python/rospkg/Manifest
+++ b/dev-python/rospkg/Manifest
@@ -1,6 +1,6 @@
 AUX gentoo.patch 662 BLAKE2B 06e1c4af66a5d1ca1e51f8d99a1cf4e62042da3d41f38b34143f7af2ec7ae4bd4516f2b57e863ec6b80d921e2ab6a920ba581dccc6615da480c237e410f4cea2 SHA512 7525f4e8809b6002000b22d6f5def37054a1bceb3d581fe01bcedd7e21dc757dd04d229e9550bfe1d2248c5804856cd9869149bea9a9ec5423e1a596c0f56153
 AUX yaml_load.patch 2300 BLAKE2B 3d24162a4c2501d7ae431b602244d102e0e26894304c868fafee8bf72a7ebea867280f2a5985b5b9139ba6d0b42379fec598212e7db73067a426c28bd9ae3a98 SHA512 60968ec2250ec450b461ef4c196561fdeedfe5fc28d7af6b6a1971b0e5794d3a028c227b8609d3c541902a3fc498194b33ad2f8698115cc1b3eb99c955ca70ff
-DIST rospkg-1.2.8.tar.gz 91042 BLAKE2B 4c4640d45a06214240a80d2ea15a09799eb892755c7c4410761e2a3505115ee1914a542886385bcd6996ead46e46a3e4d22bf79ffc38a0d2d8f2c7ac295eb0bb SHA512 c4f0c1992597aadf395effd4e6db65c20bf19501a19c569de57a2b9977d9ba794c3c68ba16b2b274ec865caffe6ec98b8fc0e88ad13ea3a9bc744e9ab6adb3a6
-EBUILD rospkg-1.2.8-r1.ebuild 1258 BLAKE2B 6fb0bc582e73293a7b1e54e5babd735ff20f6e6cd88cce1720e9b165c3c676f16e20e8033d46577c8b8117d2c284ef08aa8629c05ff9ba545ae42409bf69dd27 SHA512 4de3342e7ebea7e7210e040763a4c64aa2c241483740f3615de57b81046923b5dd8c86960d10d2e50161e2dd80e817278208297c0f6cb0e79d97d27345d3c0b8
+DIST rospkg-1.3.0.tar.gz 91442 BLAKE2B 9bf217ff103513471b1a2b0812e4b08519d667c0b883c545b23dd42f10216390f4fb618bf67baed0ba2aba71c18c13b0a702445425ca29568394c0cc5b4dff61 SHA512 bfd67eee80e063db45eb98b1b73cf1865d23a14a55d72639890d7ad3d01f4c85f07aa662d9d66e996340798c002f5ee9d1167cee32b20caff900fe527ed50d5b
+EBUILD rospkg-1.3.0.ebuild 1258 BLAKE2B 6fb0bc582e73293a7b1e54e5babd735ff20f6e6cd88cce1720e9b165c3c676f16e20e8033d46577c8b8117d2c284ef08aa8629c05ff9ba545ae42409bf69dd27 SHA512 4de3342e7ebea7e7210e040763a4c64aa2c241483740f3615de57b81046923b5dd8c86960d10d2e50161e2dd80e817278208297c0f6cb0e79d97d27345d3c0b8
 EBUILD rospkg-9999.ebuild 1258 BLAKE2B 6fb0bc582e73293a7b1e54e5babd735ff20f6e6cd88cce1720e9b165c3c676f16e20e8033d46577c8b8117d2c284ef08aa8629c05ff9ba545ae42409bf69dd27 SHA512 4de3342e7ebea7e7210e040763a4c64aa2c241483740f3615de57b81046923b5dd8c86960d10d2e50161e2dd80e817278208297c0f6cb0e79d97d27345d3c0b8
 MISC metadata.xml 339 BLAKE2B b73b43910983a77b06481850b398f006e6e535382c5fde12e8b86d43151b840e309bb2c6b0cd83899c3a9b8fcfd1c44fe6f1e5c53008e62b5653fda7cbfb12db SHA512 c9e10c6eecb919a284258e818a9830f6ba2afe095a9f4c565bf086855d5bbb26bf6973455c62a38ab4e20eb88da1f3d44b97597b197ca30227a7e7438a84d8a7
diff --git a/dev-python/rospkg/rospkg-1.2.8-r1.ebuild b/dev-python/rospkg/rospkg-1.3.0.ebuild
index 9a43e2fb6d1e..9a43e2fb6d1e 100644
--- a/dev-python/rospkg/rospkg-1.2.8-r1.ebuild
+++ b/dev-python/rospkg/rospkg-1.3.0.ebuild
diff --git a/dev-python/rq/Manifest b/dev-python/rq/Manifest
index 72fd7767730c..d56b3d118b0a 100644
--- a/dev-python/rq/Manifest
+++ b/dev-python/rq/Manifest
@@ -1,5 +1,3 @@
-DIST rq-1.8.1.tar.gz 585211 BLAKE2B 17feb07cb376c5aef88a7aab6d716f58a19f62f19db6c6b0490b4f666981e40304c6a23c88669a0aef9b75a39ce8cb85a9b10a2d42e83e646cdcb6282167d8f9 SHA512 b9df7b4e894a5da693827ff720be3068336d82d2f17928faf5ae6133b042ac2f98a3d673bb2ed86c9351479669e9ef0e4fffcb1dba9b8853f6f793db4a4678f8
 DIST rq-1.9.0.tar.gz 592217 BLAKE2B 831fbc7a3fe23ead59041e2556d37e4aa885a21bffa9aeeb0765382e84b56a2ee6d34a864cb03a9a12274c8ac80b714f10a7752d0bae7a79b8e2e7149be4aea7 SHA512 a2ec7b05fe1dda983cfb30182401c6e5367c54b7649ddcb1d3c6d0f0a5f6583665b39ed7c1cb6bc37d067926f089e3fd80ea7558856233edc1bca8234aa728aa
-EBUILD rq-1.8.1.ebuild 1365 BLAKE2B db42990a90d0a4adb2b1dbc3b458f82e27f18e5887953efffadf720350a4018a68109ae186889bcef92fbdce1191e83ccd49789eab58c5a412c55d0bc773dc8e SHA512 323c05c818ebf27372987852563829c6155045a658711a297577fe1e28dcc93e106375f95b8eee0e9bb67bf90a0abf67ae4701cce4b98b5234058a402dd0a926
-EBUILD rq-1.9.0.ebuild 1369 BLAKE2B ed157155382e0c363f099bdda4c9c63de60be4964bdf1b50b8f95e8207e20eb44352a06da4641f33247e12de51f00c13b8889e3e4f4a63dc4e1894331a97bd6d SHA512 ac88d8c45df017c600560bcd2bed430b591627064c581570f7af3bf4bbf0f9d2a9c37b3f909c2708459adffb5c39d1aa826171ba4e57ad2588c8d1322366d512
+EBUILD rq-1.9.0.ebuild 1365 BLAKE2B 7de1a6f06cbead680e3ac63c3dd2a318a4e539757c4fb09120cdf04b3c7118d5c01686accf23ac4d29b038e637047acd8a5e1f02d4bfd4700c0e587c0262461a SHA512 9f2ea36361e71c986f033df05739836d8653a103131d6839a62b1212d07ef2ad4ded188c63c592d97def8a73b1fec7ae1715f7884e40a792d1a059a5937720e7
 MISC metadata.xml 452 BLAKE2B 61dd85f86606a345d1f3fa4d88f7b4e7c827d61107e0f6ae7c60d24cb3d49f9da5a472310e182a9df36cfcf50b8c3415028958b0559d84db755bf8ba16140a22 SHA512 a70bad859fd51b632427cf5aaecadc36815e4efd14f4aeb02125da4b5c04724abf3d82f42f74c9851efa60b48e2f7722f2a82182e65f90cf2045354b3810c0d7
diff --git a/dev-python/rq/rq-1.8.1.ebuild b/dev-python/rq/rq-1.8.1.ebuild
deleted file mode 100644
index 66850d4a2446..000000000000
--- a/dev-python/rq/rq-1.8.1.ebuild
+++ /dev/null
@@ -1,53 +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="simple, lightweight library for creating and processing background jobs"
-HOMEPAGE="https://python-rq.org https://github.com/rq/rq"
-SRC_URI="https://github.com/rq/rq/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~sparc x86"
-
-RDEPEND="
-	>=dev-python/click-5.0[${PYTHON_USEDEP}]
-	>=dev-python/redis-py-3.5.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-db/redis
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/sentry-sdk[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests --install pytest
-
-src_test() {
-	local redis_pid="${T}"/redis.pid
-	local redis_port=6379
-	local redis_test_config="daemonize yes
-		pidfile ${redis_pid}
-		port ${redis_port}
-		bind 127.0.0.1
-	"
-
-	# Spawn Redis itself for testing purposes
-	# NOTE: On sam@'s machine, spawning Redis can hang in the sandbox.
-	# I'm not restricting tests yet because this doesn't happen for anyone else AFAICT.
-	elog "Spawning Redis"
-	elog "NOTE: Port ${redis_port} must be free"
-	/usr/sbin/redis-server - <<< "${redis_test_config}" || die
-
-	# Run the actual tests
-	distutils-r1_src_test
-
-	# Clean up afterwards
-	kill "$(<"${redis_pid}")" || die
-}
diff --git a/dev-python/rq/rq-1.9.0.ebuild b/dev-python/rq/rq-1.9.0.ebuild
index ea0095ca05a0..2e4b2930dc94 100644
--- a/dev-python/rq/rq-1.9.0.ebuild
+++ b/dev-python/rq/rq-1.9.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/rq/rq/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND="
 	>=dev-python/click-5.0[${PYTHON_USEDEP}]
diff --git a/dev-python/ruamel-yaml-clib/Manifest b/dev-python/ruamel-yaml-clib/Manifest
index b2676c3e1c8f..04761ccde7d7 100644
--- a/dev-python/ruamel-yaml-clib/Manifest
+++ b/dev-python/ruamel-yaml-clib/Manifest
@@ -4,5 +4,5 @@ DIST ruamel.yaml.clib-0.2.4.tar.gz 180667 BLAKE2B 01341ac42ecea437faebbc9b30ebe2
 DIST ruamel.yaml.clib-0.2.6.tar.gz 180695 BLAKE2B 54d0e00544c1716971022257bece3a6c8f83c9188b52e15a136381f5fdf00a519fc5b74792c614a2908ffe68f20fb165732cb814458dadb8498660f28ea67939 SHA512 12307a3c3bae09cf65d9672894c9a869a7ed5483ca3afb9ee39d8bcbf1948b012a0dbf570e315cc8b9a8b55184de9e10324953ec4819d214379e01522ee13b20
 EBUILD ruamel-yaml-clib-0.2.2-r1.ebuild 712 BLAKE2B 21715932317dbc77cf8ff974a08d5deb490df557dc696596cf712f5d7d0cf174b37984aaf704a2adf8a166243b6eb4f7497d73ab098107a80590f200fca2bf44 SHA512 1d10a165392ef789b683dd3f726eb39f5b79d57429f20056c1cb4e2f1c8b3830ed7eaadbd25ed36ef64f2fb83cf50cff21f2205d21ced9ca4edf7db476d00793
 EBUILD ruamel-yaml-clib-0.2.4.ebuild 657 BLAKE2B 5225bbfd6231d6fe97068f0db8cdee17f81c64f20f4299fe516c7188105ecfea1ab822859aa27f8c170cbe445cde3428d127d57bd6ea154210f3620d9f9e9eb5 SHA512 b6e66aaf6dc00caf379ccd1dee8a9ffbf3f13623d18066e5592bd26f04d5197354e4d5aac239eca00bc567b881bcfecd45ca361d115c6223ab80945eeac2a5e6
-EBUILD ruamel-yaml-clib-0.2.6.ebuild 654 BLAKE2B 8e2c3860252e933656fbd8428c08cefffcaca1c75f8fb2cc979bdc6839683b43aa5ee0f58d34e3dd285045f4bbab7fd38c3ba1b300a6d70ee600bfd3009ff4f5 SHA512 736497ed7d2c1d2f2053541bc378b5413c4482d14e8c16bedf02175d56d0e08442b79b6f05c356ef10d583786b6dce4a525369aa22b9d4af959d02ddb14ab77d
+EBUILD ruamel-yaml-clib-0.2.6.ebuild 651 BLAKE2B 93e5eb72fc94a82d350967df87f8dd23ad34ca1e62c01d43223602e47f4318f3cac1160ef86436e2b18370d79aaddea0db70372284dd8fba0974488961c58b6c SHA512 3c19c89852ae8df750aec74cfb9bc417b93eba4a1b42ed444ca6a48db6c0a8215680452924d86b723a013f1ea3beba2a251deb864b4eb1b69028488bd864d022
 MISC metadata.xml 1183 BLAKE2B 5e9198838214711c9fbb5beb4179300c5465079646c3f4268145a3c893f1913ac9a14811b39afe637aadd183e4351a54c2ed160951e995bc4ce3f869b28bd6e9 SHA512 d6e5a8de5f9fe3e71a91a26be44cd87162863b1fede14301694e0a38135fc2ffb5c3ee25a4aef40d7cdb73812d0b6af72aa6b67ad782004648f54ac5e86cc662
diff --git a/dev-python/ruamel-yaml-clib/ruamel-yaml-clib-0.2.6.ebuild b/dev-python/ruamel-yaml-clib/ruamel-yaml-clib-0.2.6.ebuild
index 381abd6f3384..9d7d37dbd335 100644
--- a/dev-python/ruamel-yaml-clib/ruamel-yaml-clib-0.2.6.ebuild
+++ b/dev-python/ruamel-yaml-clib/ruamel-yaml-clib-0.2.6.ebuild
@@ -16,7 +16,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc ~x86"
+KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 
 python_install() {
 	distutils-r1_python_install --single-version-externally-managed
diff --git a/dev-python/scipy/Manifest b/dev-python/scipy/Manifest
index ca4e0b2ed12e..e2bf2b9211e6 100644
--- a/dev-python/scipy/Manifest
+++ b/dev-python/scipy/Manifest
@@ -5,5 +5,5 @@ DIST scipy-html-1.6.2.zip 23947380 BLAKE2B e4616a157c037b0830fc32d23678fb7e8ebe0
 DIST scipy-ref-1.6.1.pdf 34594740 BLAKE2B 905ddcd7a3d462b09ded688f0818204d7684fa18058d0dac480d0a000e9ea0b7ebcdd33c01adae17234dcdf630d4aef9078174127af46f1db55d5c14b3245346 SHA512 355f4681439c1720f45dca6badfe72d77edfca0962fd9b42df34f1cd8fff7121fa6e7f60570bb638abd3ba9693930fa46b25af862d8fc1568b508c6fdd785479
 DIST scipy-ref-1.6.2.pdf 34599668 BLAKE2B 9ae3221c814eb0d1b1e9191e08000955af503f6448cf8b5841e400fad106c658670339219f4838bd312023601776fe0b0d123ebbd41460c478145da2ac3e9989 SHA512 9aecb7ca760805c470c41121268281c9547aef35ddf078816c5e48f7cf4912a67cf622e267152c6cc823df9d82be1f3a875d97469169d0d91d6219164c130c88
 EBUILD scipy-1.6.2.ebuild 4145 BLAKE2B 5ff8d9071dcea9ab487dc253717939110d1e79a41492b0172a504ba14c1da81126aafdfb16312d88ad54e8f26f73f4e4ad289bf455b3c56d3186bab926f721a0 SHA512 d020e73bd5bf44f2a0aadb1a34e61d93dcaab2d1a68e50cfcc101f88b61ebcd10404efa7e2570d839143f9683b5b8e9bfc9a3645d01c710250d1ef1d1bdd0be0
-EBUILD scipy-1.6.3.ebuild 4155 BLAKE2B 74d58e7152bbec337e6b38aa11318b1885d4fd1c551a90471b4f11d55f2e8ac05ffd1cb3ce125915b5bfe4124db22c9f5bea537dcde60bb87f46e9e0310b4806 SHA512 118a42c6d7971a0e35cb3b7b3a172ee8688ed59aa07fafb3697058ac3898780e5a9dd3528750b27b2cd224750b96a5924caeb9c10d69c4d4f8158b898e64e98f
+EBUILD scipy-1.6.3.ebuild 4162 BLAKE2B ee3da32f74b2b4d878992cf95ec069ad296e248c46770a0bb0464c30afb8a3fd568aaa933b8fc2bf4586242ce5b5e127fd3f55278de4e479d3207a6be5eeb4a1 SHA512 3e43ab96a8c7592088667368a05bd312521cd76d1f2c03ffa2c35f2c7c693035e93d92f14e8884261157bf06b88a82378ac4948f8ee5af42ec7e6bdb0b9571a1
 MISC metadata.xml 1038 BLAKE2B a17718312d2d1ead8646e838b2704c14a9f21be8c59fbc0cd8544ab45bdb28005443be05f3a9f5671581f0f28e3cf7507131e2baad5e7b128a452d1ca3fae19e SHA512 2ee6a44a4f32d34f52eb1a0bb787907c31d22c15af597c8db8820df72cafcbba72201c5157b60dede7df4ff0ba48847e8f764c5a67a0b7efacabe1b9fa9bd74a
diff --git a/dev-python/scipy/scipy-1.6.3.ebuild b/dev-python/scipy/scipy-1.6.3.ebuild
index ecc6f1571bd1..e98e4bd93794 100644
--- a/dev-python/scipy/scipy-1.6.3.ebuild
+++ b/dev-python/scipy/scipy-1.6.3.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="BSD LGPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="doc sparse"
 
 DEPEND="
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index c6a3a912580b..7843ab66078a 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -1,7 +1,9 @@
+DIST python-gentoo-patches-3.10.0rc1.tar.xz 8112 BLAKE2B d6f9b44c5a231f447ffe3533afbcaffe0f3b8bdd5a6690f1854bd7e1199d036d11a4cf4abfae345a88c42740ccbd4b72e53cbe28aea1a5db39dda1e5bfd47229 SHA512 bba7045f56369ca0354a539f8478a1afed77dc89a9faf548a0cf8959d644360b0afc4f84b95151ebfc2a6553078322c7445073f7a4104e9cd639ccc86ad0f792
 DIST setuptools-57.0.0.tar.gz 2144749 BLAKE2B e1fc99503ee5de425b70bf2733b1c489693e38cd256bf95cb321671bdaf87745eaaf40c43bcd03756a4cefa408dd1414f8c30af274963e3a0ae57f7b95d3f9c0 SHA512 5277d8630367d6b16a49e36ed84d8cc6abfaedf87dac3f795b204626a8f15ca9fd80d158a465d8bcabe9c074c76b87c3378d82a4ba5feee1ac6a5f2c91db061e
 DIST setuptools-57.1.0.tar.gz 2144012 BLAKE2B 148eb7b5e432461f692faeb3fd4eaafb99bb9fcd2c430cbde40fb16b365ed011ce49966a8923337a860b63cdc6d8f3a26efdd138cf4c40c99e72f7d714fce57c SHA512 dfcf75584b3d7ae07e0f58ce8f596d7e9cbe3a0c178411053b066fb4362226bcf6467a79aed0853acd0b9f6a3371c47ddb07d77cbd780fe9782b8c19bce2e5fb
 DIST setuptools-57.4.0.tar.gz 2141309 BLAKE2B 89b386b6d5bbac61df400f60c91a0a9b9ee381aec7d2f65a856c317c7b0b5512c5e9aa8844c0e64f1840a8e954ae22ed542ad97a104d5416b1df2ac02351809b SHA512 7fcc297ea3e6310f2ec8ba5bf0d509e3f4acbce6bde7e5f0fe1b022c147cf88a047471bd4aa278724e86ebc6be800015fb935c7a31dbb6a0801a2d380ddd89f2
 EBUILD setuptools-57.0.0.ebuild 2319 BLAKE2B bde0c2b2c28dca1d79a688e838340404c1c21f4433f1ee104d2fb4df05ee39ff74403cc56bae332c4ccdf1faca4b6d05a58526c6b858e7c7fea04642ecf5c52a SHA512 aa0bbb2debf43915d698a6a94ec8b71441b4aed0cd0b991dd39dc61409ca8edf3245486fc5b5bba4566512181eb193d1811bf34f394592fedc0361dcc3ffe8f8
 EBUILD setuptools-57.1.0.ebuild 2328 BLAKE2B 87a70ef14e6c01d7d28c69eb6bee16a57ee6d228bf002d2614fc67a8e4a7479ac21fcc2234869bada3ed4224f3a22ce2a45bcd3625ddc122f60ddf96ce28e92f SHA512 a1fb816d0e6fe413f6f96129821625a7b8556cdb59ca3d84509e9cf1792e599e7567ac22f62b815dca978644bba1fda0ad10d991cd7bbb113b94b6b7aa1a9e44
+EBUILD setuptools-57.4.0-r1.ebuild 2746 BLAKE2B 3a62da0fe8fcf6ad2ebc214debee1df3429a97dd5a3d1103dce1abfebb0d3946814a349311346c183275dddb46ea65da88e05c5048c7b8baf11b56e23b0f49a0 SHA512 862575f3046cf84224e49eabe7ed24f5dbfca9e08b6528a3b0a768a6ae916a78ed172618d150d63b4932fffa0e8a75ffd075692eae59efbb3bcf2eccf7113cd6
 EBUILD setuptools-57.4.0.ebuild 2328 BLAKE2B a099a65fb32d0c0d8484fb50248bf699b0e4563a882e2282318bab53739f4969c3853f7570275251a5568950662650ffcbebccbb8ad528e9337e2412ce2f45cd SHA512 123817b89c66f61ee6f3ca70185038ac835672e724d8a500707e5ed90f83a8e1624a511e824dc74d87af243954d6feccd80765519388b5efef805c08703b2e26
 MISC metadata.xml 468 BLAKE2B 7acca7f204485279233a4ccd34d76661954e2f995cf82bd178f1dac0d9825b073dea76e734aa7625d036813d658e1dd7a5acd408b79b6841540bde62644ddd47 SHA512 c8215fadf291dc1cf8df2f1d8931f5f70657fc6c37fd105426d03f3e4b19963fe93ec4b76107aef5c2f9bf6fe5ce123fcd48519bf942ce8cbbc0c5f2678e1de6
diff --git a/dev-python/setuptools/setuptools-57.4.0-r1.ebuild b/dev-python/setuptools/setuptools-57.4.0-r1.ebuild
new file mode 100644
index 000000000000..f5f5fae0f1b6
--- /dev/null
+++ b/dev-python/setuptools/setuptools-57.4.0-r1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Set to 'manual' to avoid triggering install QA check
+DISTUTILS_USE_SETUPTOOLS=manual
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1 multiprocessing
+
+CPY_PATCHSET="python-gentoo-patches-3.10.0rc1"
+DESCRIPTION="Collection of extensions to Distutils"
+HOMEPAGE="https://github.com/pypa/setuptools https://pypi.org/project/setuptools/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+	https://dev.gentoo.org/~mgorny/dist/python/${CPY_PATCHSET}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/jaraco-envs[${PYTHON_USEDEP}]
+			>=dev-python/jaraco-path-3.2.0[${PYTHON_USEDEP}]
+			dev-python/mock[${PYTHON_USEDEP}]
+			dev-python/pip[${PYTHON_USEDEP}]
+			dev-python/sphinx[${PYTHON_USEDEP}]
+			dev-python/pytest[${PYTHON_USEDEP}]
+			dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
+			dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
+			dev-python/pytest-xdist[${PYTHON_USEDEP}]
+			>=dev-python/virtualenv-20[${PYTHON_USEDEP}]
+			dev-python/wheel[${PYTHON_USEDEP}]
+		' python3_{8..10} pypy3)
+	)
+"
+PDEPEND="
+	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
+
+# Force in-source build because build system modifies sources.
+DISTUTILS_IN_SOURCE_BUILD=1
+
+DOCS=( {CHANGES,README}.rst )
+
+src_prepare() {
+	# apply distutils patches to the bundled distutils
+	pushd setuptools/_distutils >/dev/null || die
+	# TODO: distutils C++ patch?
+	eapply -p3 "${WORKDIR}/${CPY_PATCHSET}/0006-distutils-make-OO-enable-both-opt-1-and-opt-2-optimi.patch"
+	popd >/dev/null || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# keep in sync with python_gen_cond_dep above!
+	has "${EPYTHON}" python3.{8..10} pypy3 || continue
+
+	distutils_install_for_testing
+	local deselect=(
+		# network
+		'setuptools/tests/test_virtualenv.py::test_pip_upgrade_from_source[None]'
+		setuptools/tests/test_distutils_adoption.py
+		# TODO
+		setuptools/tests/test_easy_install.py::TestSetupRequires::test_setup_requires_with_allow_hosts
+	)
+	[[ ${EPYTHON} == pypy3 ]] && deselect+=(
+		setuptools/tests/test_develop.py::TestDevelop::test_2to3_user_mode
+	)
+
+	# test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
+	# It tries to sandbox the test in a tempdir
+	HOME="${PWD}" epytest ${deselect[@]/#/--deselect } \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" \
+		setuptools
+}
+
+python_install() {
+	export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
+	distutils-r1_python_install
+}
diff --git a/dev-python/signature_dispatch/Manifest b/dev-python/signature_dispatch/Manifest
index 799103f1d658..f1e53cc1810f 100644
--- a/dev-python/signature_dispatch/Manifest
+++ b/dev-python/signature_dispatch/Manifest
@@ -1,3 +1,5 @@
 DIST signature_dispatch-0.1.0.tar.gz 8715 BLAKE2B c62f5d0b0b263e50215d588e83bab4b5ca6dff82f856ad6265a0bb2dd64e2a3a8dfd0b8989ec17424828575607bd4dccc5802ef072af271eddb88c2479e6b8e7 SHA512 687a1de540a61d274e93510d2c5a93c736a52587b0215aef91364e34ad8932b880361b53fb84e68f9c2083652fa97c759705b4d61bc74caeba73a4ff37b42785
+DIST signature_dispatch-0.2.0.tar.gz 11422 BLAKE2B 3e3297ef34bb4f7352fe867edd2c804d627d5f8e854b1551c88dcdea2f83a6e2cde9c0f088d263e405f29ccd7114717c9348dc59d60ccd00a4ebb84db800d398 SHA512 e2fedfe3260be641c319364a8f79b2d1444179c824e409fb8304352cc9f73fc2cfb8fbdab6788c14d08e716d4655cda72bc15b406596d43520f959973fc612c5
 EBUILD signature_dispatch-0.1.0.ebuild 505 BLAKE2B fc8de8b0ace0179bb7618f53b02d82f7b82cb8c3467085b43095319bdcaf7fbba7c871c956251693cc48d9b40833567d98953361c626901dca6bd173b6163b4b SHA512 66c425ebbf62950d3d5c1f85534aba0369164f0f72e9f063dc7f9016f960f8096a31cf0157071eab0a8009c1c0b0921a2646c3af7ad09a92c9c7b97ba1cf3d98
+EBUILD signature_dispatch-0.2.0.ebuild 557 BLAKE2B 9a60e0db2cdc6294a7c2eec151edbd74bfce2ead92e3fd5fce7f3baa93dbd9bd0818969213d344546f880f2c436427a7e6a423e1f2fbeaec3b99862fbeb4b53a SHA512 a58c1c204e8f23dbae1111e9e3bdc51e12a6eab4f64605d5e5a6e1038091b6cce9f178bc6011904ca7256a03bb6c7edaf5b9ad0e81d9fc32401c9015ced85cc8
 MISC metadata.xml 393 BLAKE2B b1a6b8868d977b7d8c96a6ac06cf9ee4f34c9dcf162d6eb4f8e5a45c0bf31b692533f7291f8875261fa14a8ea48ff96cab96b9c0a533a75013fc12472ea95940 SHA512 9706906e9ce4d27c9053eb99c54c98301ffca6ead45191a9386ce4bc1f0daaca58b062397b93515fb2d9ecb0a9d4f6f6a26a96ba238069bdcad411eaabb7204e
diff --git a/dev-python/signature_dispatch/signature_dispatch-0.2.0.ebuild b/dev-python/signature_dispatch/signature_dispatch-0.2.0.ebuild
new file mode 100644
index 000000000000..73c2bc0b51b2
--- /dev/null
+++ b/dev-python/signature_dispatch/signature_dispatch-0.2.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Execute the first function that matches the given arguments"
+HOMEPAGE="
+	https://github.com/kalekundert/signature_dispatch/
+	https://pypi.org/project/signature-dispatch/"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+distutils_enable_tests pytest
+
+RDEPEND="
+	dev-python/typeguard[${PYTHON_USEDEP}]"
diff --git a/dev-python/sip/Manifest b/dev-python/sip/Manifest
index 3d432bd3c3c0..3b5b8a572abb 100644
--- a/dev-python/sip/Manifest
+++ b/dev-python/sip/Manifest
@@ -1,9 +1,9 @@
 AUX sip-4.18-darwin.patch 1187 BLAKE2B a3cd0418de90e7377bc2ae1206f4620c6be379a3bd38f22c19256b06f5ba0c90ff07f34dcc8d2f44a25244e11544176a5e1b91049d220bd56cc7b3876a26ba76 SHA512 1afe049fd21f0e8e5118dec4d4b74851cd5e2c75a66a93e1a79a42267954b1edfcff9644696c7d98342499fb27fde727a554b5739cbd791d17a0e319c1dddb7e
 DIST sip-4.19.25.tar.gz 1056384 BLAKE2B f92e105e6b30e871aea2883dc9cd459e4032fb139a9eaff153a3412a66b39df4d7ac985711a2693aee83195ff3850ae648bee4102f7fc3cc30d09885799f2b98 SHA512 60fb4133c68869bf0993144978b4847d94a0f9c7b477f64a346ea133cfe35bc11820204ab327dcf9a929b6f65a26d16cc7efbce65e49967c3347b39376e57001
 DIST sip-5.5.0.tar.gz 1108126 BLAKE2B 59f0323b3befd7ebb89461e93e1e7e5707d11b2882bd524a45f3a6ba8d8a3c792aff5580027255812f6a3fa0854febeb418690fa6106efb21aab1610d66ef911 SHA512 0122beab575239cdb3b1430dc53a7f74175e3fbb3e113bcafced122ffbc4bd3d339b64a672ac1319ea14cd540b5877c2bcfeb7f8821fe8a3c8ba3ce9744bf803
-DIST sip-6.2.0.dev2106291255.tar.gz 1180173 BLAKE2B e5dc12515a692f5cb0e82828cc8a14879a764056b04e15957c3e4eeca3bcaf21bce95397eacf5480a16f3f9c2037596880efc0e6a84599fe232823438b2bdf02 SHA512 35cfa8a9b641bfe2cb7e2454e514ece0cdddc48b7afaf55e65c34b76eff82a9730d05dc6122e4f08cfc2dfbcbca63e99ea11932f778055f532026b3cb2d92873
-EBUILD sip-4.19.25-r1.ebuild 2274 BLAKE2B 6c6b9eda1e03e05a1e92da561a4ab208ebf80b9b546c8bfa0e1a68830d8e6889a1fcd5dfef10c2d184aa8dae55c14b46f1bf281bf5ba87ce80f256f12be6174b SHA512 8fa6edfef0535f920e2fbdc08db3c705d27abdbef4442f72ff7ce796de967190cd7aff0bbc710f3bbf9c481aa984ea44afa7fd6a4131405266dc07200277f3a7
+DIST sip-6.2.0.dev2107131757.tar.gz 1180225 BLAKE2B 456111e610d872c4b7a875f99e151a82ba3ed1ff11f7d93b19558c52f37e710e448387256d0f620a497d260d97c583c53cbcc5a42affd6e7c05e4f557ae97732 SHA512 260d86d676a56440ac78099de9998697114ed5deb1ed15299aaea68b49b8ea829dfb92f990762875abff0a0c653e4998f1a91437895ba8d38cdac5cf4f2c5761
+EBUILD sip-4.19.25-r1.ebuild 2268 BLAKE2B ee2c0d7da7d33f9043e5c368200fdff53d8438f283762595ebf9a873e0e90324eec111d9b47cae8da3f2a8500081f0b64687f7ca20dc27482f2fe6578f31a619 SHA512 c4f50bd111aee5daa0da7b47bb7340c4ab7facd8b7bc71fbeea661178defcc586e42b8f14828848a5b65024edb8607f1636e9592a7ff62ded8deb62f385097a4
 EBUILD sip-4.19.25.ebuild 2266 BLAKE2B 0c407d5662f9b4a52c6609f26f2af147c9f545408d85f4b0ff3607858057f5c8d8e2fdf9b43638037289b1dc7378c77667894b046a37e62d2268e7af635b5ef9 SHA512 ed0d96b98948b38564c61e95d25546306891652fcc2cacfb47fa9d6e535595a4146a82458943cbbc5ed02f58283ebc9ef338c39bd806e3e79114a3e34633bf51
 EBUILD sip-5.5.0-r2.ebuild 866 BLAKE2B 7a712bf5925feeb8758b32a5fe4871172163d2c423a22d4eeed2802901b9a1a3a6ae5e4a46092f5132cb695a2ea10d8c759be08866689794d9460b53313c71ca SHA512 9f3b813efcb8c02d2e9998b1f547bf6238b59e6e9342b5d441a1eebe1ac36b7ac1988ce876081da7ddc432cc8a6a4819f96257e5188a519a2296733d094f4659
-EBUILD sip-6.2.0_pre2106291255.ebuild 899 BLAKE2B f004737c0f47e793bfff550e16b63103ac4290d90421d384b6d1157ef72631edc25ab06fe4910124810e138724d0ef4b2fc81bd29a78062f6fe351a134510dca SHA512 8c12603272fb963edb8afb8145718c0880ca1b43ddef577df1073b31f15e474bf22fa577238d696015e527e3ca5c465fa0d6e4bebe78629713418116a21ce3e3
+EBUILD sip-6.2.0_pre2107131757.ebuild 899 BLAKE2B f004737c0f47e793bfff550e16b63103ac4290d90421d384b6d1157ef72631edc25ab06fe4910124810e138724d0ef4b2fc81bd29a78062f6fe351a134510dca SHA512 8c12603272fb963edb8afb8145718c0880ca1b43ddef577df1073b31f15e474bf22fa577238d696015e527e3ca5c465fa0d6e4bebe78629713418116a21ce3e3
 MISC metadata.xml 638 BLAKE2B fc7e45529b0822365db27d281febae466f128ddf88223eea8fd2dedc2c4107e0a91a2784bdac69e7ecda930a76e25c5ad80cf3c6d8ef326737cc47e12a571ec3 SHA512 a603d5a00a8315fcf19b860a45660c76c3f4b47199983d2a0ac73ef1d1617afc7c56f67e2ff1c60bfe3fe644aad57ddf47e55ea2fc400fd9851c3a010fcb4cee
diff --git a/dev-python/sip/sip-4.19.25-r1.ebuild b/dev-python/sip/sip-4.19.25-r1.ebuild
index 6c1abd79157a..5cccba1a46d2 100644
--- a/dev-python/sip/sip-4.19.25-r1.ebuild
+++ b/dev-python/sip/sip-4.19.25-r1.ebuild
@@ -20,7 +20,7 @@ S=${WORKDIR}/${MY_P}
 # Sub-slot based on SIP_API_MAJOR_NR from siplib/sip.h
 SLOT="0/12"
 LICENSE="|| ( GPL-2 GPL-3 SIP )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
 IUSE="doc"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-python/sip/sip-6.2.0_pre2106291255.ebuild b/dev-python/sip/sip-6.2.0_pre2107131757.ebuild
index e9cccc902285..e9cccc902285 100644
--- a/dev-python/sip/sip-6.2.0_pre2106291255.ebuild
+++ b/dev-python/sip/sip-6.2.0_pre2107131757.ebuild
diff --git a/dev-python/snakeoil/Manifest b/dev-python/snakeoil/Manifest
index 929c0f1c8e46..d7837fcf8264 100644
--- a/dev-python/snakeoil/Manifest
+++ b/dev-python/snakeoil/Manifest
@@ -1,8 +1,10 @@
 DIST snakeoil-0.9.4.tar.gz 271395 BLAKE2B 6aeaf03e2c2f48a85ce926f1b8e0b86271c608695694358cb6eea56b962c0731b909c16bf37844031e986fc7ebca3a7c4cae5cb94ee55122584bf83981d8c4b6 SHA512 853c3fef517e7161a61ae0622fed82ceffdc110cad4ef7d5e2166728f506228d0802018dd351956f1525f0d27a4150e9885b2cc7c71788950261f72d8d7c4cc9
 DIST snakeoil-0.9.5.tar.gz 266086 BLAKE2B 635d2d821e47a92a668b2e95364d6587f0f74c21438356e708d6b16ed6c027df39a28f73d261d8ae06eb32de471124cd5ba5df0fc899f59dad5f7d2363391e00 SHA512 0762d90932bdf995160b3410e224660dae2cce327cdc30d5093ca9e3d16d3e910f88e409a87d2d7da211b850f7d0b7d9c70f053462dd9a651e4202b8ca018105
 DIST snakeoil-0.9.6.tar.gz 261998 BLAKE2B 1f81e633321b7b1988865092ec2778feb35338edec0eb00c9a5be505a9cf7d4cf27b140c9bc56fc42156dc33a7990e8a269d1a69df7cac92a71b56ce612b65ae SHA512 a900c76ecd5a3519bf5236567e5f9d59bca7c5f7588bdcfbf1bec0d912352486c86dfd4677b0aea19170bc9170109ca782dd60232e365008ae016cdf9ade7217
+DIST snakeoil-0.9.7.tar.gz 261551 BLAKE2B 6739541d1e40b3ac5c4908e6bb92b5b40957f49119307d6046fd17327394ae0406c01dc10396cb568ceb3757ba3367b930441d08079e9be635eeb6f14bd02e3a SHA512 c2626d8050bf24b4ce3f6fed5c6b8993fa9a5ebb40dd664c7008caffe4b26237edeecd3de8fe90f3a1c5756de3d770c3b9e1ef2e95cc052a5f8fcf22058925f6
 EBUILD snakeoil-0.9.4.ebuild 753 BLAKE2B daac420726043bcd5c0c742aba5384325c5206c5b9068fdfad02bed5e625f67ef388d8e5a19a8e83625c8b520370f87966fa26285f01d1236752510b6bc8f36a SHA512 f5abe777e2ef85f45681ca1c2acbbe774b50b036d8b0717076d987f5e5c640dc3f55ac22796327509b4c106757b8db1e249929a2cead7f6fe5f545e59096fe08
 EBUILD snakeoil-0.9.5.ebuild 765 BLAKE2B 675a1df4e4137585c09fa2c7b9223a918a355ec86872c5c93f7719d7f197851d7d3c36c13fd6bd0ae2026258cf5504856786060f98d634edbdf064ed87f7bbaa SHA512 545968751d1fc39240510ae92ab5c909a72b9f0540f24a7eee940dffd9ab6844268e1e03de95ca1abe70c40a49c401d82cd625566bb3dde74384aa6003761712
 EBUILD snakeoil-0.9.6.ebuild 844 BLAKE2B 687712f6ccb8c151953040595fd4a87e75e670c70502200b43f26f64f78d447ab009ae4dc7232b2b7df1353ae310aa0b97b0e4f52adfde0775bdedd077ef3ab9 SHA512 96a7884eb260cb0a0f2c5ede3a5407eabda735c046627ba30b2f0f634bd13c80b43aa4cbb34342f0faa414c2c88a040f52207ae2502785e50e8c0b298c0701ec
-EBUILD snakeoil-9999.ebuild 806 BLAKE2B d74dc5937e3afef85beed58d7c18b7d9744ea94465c96702b3b3926ab94929c0702d168053d9a80479f5d16b6e49dfc17604a209ba8e1da6533f5681347a2bc4 SHA512 d0402ae1d379f9d5710d287fbe9d5828ddecf3e5960f1e9ad603fce72e2b2fd0dd40116c60cf1b6eeaebec8a8bc7f7ecb2bf38d03156af1c0e9ef372fcc2d491
+EBUILD snakeoil-0.9.7.ebuild 820 BLAKE2B 781e02504b5010235d6c8688fc00d2d29999b6c80b62e04cb91eaf8e8309a95c2171d856b64acddc598957dd247a9d65975713394e06c5d460d6faaa114c6647 SHA512 4f10e304fac0f4f4ba1be7304b73d41bb9f78e458ff5214c732d2fc2526e2b7f532565b44f8ff63ad027231b9131de9d37e0e534ff36777ba42d85d6b8981bbf
+EBUILD snakeoil-9999.ebuild 820 BLAKE2B 781e02504b5010235d6c8688fc00d2d29999b6c80b62e04cb91eaf8e8309a95c2171d856b64acddc598957dd247a9d65975713394e06c5d460d6faaa114c6647 SHA512 4f10e304fac0f4f4ba1be7304b73d41bb9f78e458ff5214c732d2fc2526e2b7f532565b44f8ff63ad027231b9131de9d37e0e534ff36777ba42d85d6b8981bbf
 MISC metadata.xml 386 BLAKE2B f9bc5cb5f590209e7211fffa5ac87e106e636f871dec0b31a90c4aaed63cb9fd4bf4fe510a4f36676eb47028465a58d5088307aec6c2c5b000d370aca5437b68 SHA512 47ee140ad8c665e0541a71721eec7739913a93944a0be471287c0df7403d63757500b27d3ffb909590846991c69727ea95d960dc98e7887bea3b178bc4dd6047
diff --git a/dev-python/snakeoil/snakeoil-0.9.7.ebuild b/dev-python/snakeoil/snakeoil-0.9.7.ebuild
new file mode 100644
index 000000000000..53cc9eba8f72
--- /dev/null
+++ b/dev-python/snakeoil/snakeoil-0.9.7.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+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 ~mips ~ppc ~ppc64 ~riscv ~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}]"
+BDEPEND="
+	test? ( >=dev-python/pytest-6 )"
+
+[[ ${PV} == 9999 ]] && BDEPEND+=" dev-python/cython[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
diff --git a/dev-python/snakeoil/snakeoil-9999.ebuild b/dev-python/snakeoil/snakeoil-9999.ebuild
index b4ffe8974a52..53cc9eba8f72 100644
--- a/dev-python/snakeoil/snakeoil-9999.ebuild
+++ b/dev-python/snakeoil/snakeoil-9999.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
+
 PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE="threads(+)"
 inherit distutils-r1
@@ -10,7 +11,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 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 fi
 
diff --git a/dev-python/sphinx-tabs/Manifest b/dev-python/sphinx-tabs/Manifest
index 46520b76c113..4fefff4186e5 100644
--- a/dev-python/sphinx-tabs/Manifest
+++ b/dev-python/sphinx-tabs/Manifest
@@ -1,3 +1,3 @@
 DIST sphinx-tabs-3.1.0.tar.gz 521642 BLAKE2B 10fb138f62ff98316b348437d1fcb0354060a89902b6706919d4439800b79b94d68fb871d37abe3ac5d19a7920c928143251c5d58d5f66979b9e551797d8f9c3 SHA512 4e278e860a763cc03981dc15ed493fb1a9c43f671031eadf7c75412687543e4eaa75c60d527fd6c7f815d4abe79a833cf11ff97b660c47b635fc8b0b3c77bf3f
-EBUILD sphinx-tabs-3.1.0.ebuild 899 BLAKE2B 9af945f9a1c413283c70823ef7ac1a3838ddb9b45d840657964a61c54bae6cc3d5784728f0a4ad0a1c6caae949f70d3412761e9520a95f5592ff6d8982881d6d SHA512 dc70b6e45cbd152e5042efca800d77fba8b5148344ef22737b0e48286137610c5347e31143cda78b7fc04eac093aa6c38751be670d3b64cab62bfbe5673175c1
+EBUILD sphinx-tabs-3.1.0.ebuild 906 BLAKE2B 606210a2d5d8a3df8733598106efc90cb319a98b4a2856708ece4ad261aab517eb069b9aa988b50c0c2b586cdce2db712309f27e01842a9e70456650b589e8bf SHA512 559c5e353b49ea17883be16bc26cd6bd8c07bad2c45f34e58b87562b0fecfbc88dd8ebe262905cbe2829557f77558d5acbdafa33565615ae2c01d69781fa3cf3
 MISC metadata.xml 316 BLAKE2B 375e14399e0e3fcc075546dcb40e4125667d899744136c51827951ff91c721da0e8a3c3a8672a9a66ae5379b46fc30128d108407d95153c39e75567f2b106434 SHA512 09121a2b49771ae98c777720b3cf24840f9e76fa5a300d44f4a5b0fb29375a0995f28f51d6756cfcebcf576a93ba0e5c4ffd28c6ab8e2300e05a4ba5e7d35b35
diff --git a/dev-python/sphinx-tabs/sphinx-tabs-3.1.0.ebuild b/dev-python/sphinx-tabs/sphinx-tabs-3.1.0.ebuild
index 66b201c60e34..05fd289b77b2 100644
--- a/dev-python/sphinx-tabs/sphinx-tabs-3.1.0.ebuild
+++ b/dev-python/sphinx-tabs/sphinx-tabs-3.1.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/executablebooks/sphinx-tabs/archive/v${PV}.tar.gz ->
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~riscv ~x86"
 
 RDEPEND="
 	dev-python/docutils[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinx/Manifest b/dev-python/sphinx/Manifest
index 84bf005bad1a..23ad6b643e23 100644
--- a/dev-python/sphinx/Manifest
+++ b/dev-python/sphinx/Manifest
@@ -1,11 +1,14 @@
 AUX sphinx-3.2.1-doc-link.patch 604 BLAKE2B f23f8f9a0a48b170e2b6daaeded1e65aebe830da463d4e30f2405b511cb72dde12767d0113b2d1efdce821c16837d700c71c60de38d20950ca5d6579f19a80ff SHA512 3088ba8768b4ba9e6a187e4c52fcc226efd5125fd01526b4a724504f4c445d69d6964fe79c1325ff7f58edcefc7f3489393ab085ea0458d94c44b186aa16e2f1
 AUX sphinx-4.0.2-py310.patch 981 BLAKE2B d4f64e7b0cff10ea4c348735820d6cbb595c15e36185107a25819b11af2d79b7776296f167bcceefd0b2065af0611b5b2d3fb1e8ffc8d1d0ef14cab8f42671ae SHA512 0dee3be88a4dd39d5a34b8e388dd53609b586fb41473560e96ba8c850819b2da41d69e6e97af7f7a154bf4555f3020501409b2a54618605bef0d6628dc2f44e6
+AUX sphinx-4.1.2-py310.patch 2404 BLAKE2B 9768ede1a7272497ec5f266ed676fe114d6b72d54d8369b28c98a2af20094050a04f70c0e5df93580ed7e3655a0bfb81a4ebf79bab1f658b121f97c8d8cf7d71 SHA512 f49567b0acebfd1187db7f9a4fc5d20bfa9a2d250a8a987ff7ac49bc29d1877755fd74d60c8318d82be34c50d4bddf427e764417366509abdbb43ff3d119b82f
 DIST Sphinx-3.5.4.tar.gz 5911093 BLAKE2B 8740714dfaf3733bf57d0b277315b4e7b5cad86247ea30dcbc4f5dadf5f5169329050b7be43ec8625c47df9dcc19afcc6c4d782725c7007f8178b7eb7be7dc05 SHA512 853379f3b0496772846be9beb072c2c8a69ff899ffe4c6435b448ea639a32138c61403f9c14f62f4f78b2e526a2ee7c05b4196eabdeee37bcae6aa98df992125
 DIST Sphinx-4.0.3.tar.gz 6164298 BLAKE2B 60726ed4cc4f92910bcfff20dde09beef89e4c171b6f12a327e981df8fa6569a901c0b8e994cd66263b87056548f9f966a2e3049341447ad28797bf120a42a70 SHA512 8dd561b220779efb4cf779f46b342a298f18bfeb7670e0485ba8fcae7a03b2bd30368b441237ed597e1d8f001e35bae13a7d4d44d6921a4fa1b8a7804a5850c7
 DIST Sphinx-4.1.0.tar.gz 6302885 BLAKE2B 7e2eafa236173c0fe7d761d1692ff8bb0c12ad8fae2894e2088fff0415d085a3ea652c59d4efc94788829c4261cbee161d85a5c35d6a282fb1a201f658425bb7 SHA512 482378b85b51e74bc2c841bc5ac7b7d5a0034b28e62d36182972439a1e48ce5faaa82e6c3daa35ff6a3f1b1ed1c4187564c77806e6d1804dae0f2c24262adbe6
 DIST Sphinx-4.1.1.tar.gz 6373009 BLAKE2B dd19089149d626a0a65af4ff1cd8acf5a5ea8d00b6c940d2d7c5e1c459ae37d993d82652114b9144a80971275a6e346942dce9a6a3798220dc77e0f88d8fc2e1 SHA512 6250fa568f9952471f3cb433a1e7a053c779540c0c049d0e0bad4f2b754935f8c9f351a297349bc15f1dcb4b152a550771f2f381b2eee92a68759e034fce23c4
+DIST Sphinx-4.1.2.tar.gz 6373677 BLAKE2B a78df4302520898c8708a75129baf28dd2dcde2dcbb4147d8246a2dd7907ae2af2ed8cf1d259ff1065dbe987fd918a7153831a9f5c16e79834c41f86b6031e41 SHA512 1fe998de7b8fc47989e186835748b7fb5d0b523db95434515b6af29b56d28372f2f92ab917c27cbed51aa0cad13175eda8bf4fc93a8726eb5e93e9bc6995e457
 EBUILD sphinx-3.5.4.ebuild 4147 BLAKE2B 71424a28d134dbd1eb18babe105a5b98bb27c1dd92f64844121c3b0f465ed1c73f10b2cc8e9d49952a49eabc1d58ec748f3c207f60dce9b5ef8b1be71f9718ba SHA512 c83535c4082e426930df4bbbc4eea476ed50e109323b89f3baeaa2a27bd0aa61f48f3f09f9b2030f4335fb65b5ef7256640233d2183db36352e2cbce60044661
 EBUILD sphinx-4.0.3.ebuild 4293 BLAKE2B 70552e6b75fa50af4d5af1aa491e7bc8f1aa3103e609c7cfec110ed466d624ec4d0bc1e291157d59383e25bdd4b7d90f794e0213394713b323a131831fcc4001 SHA512 01192407c223cdc47861631e4f211d526ae4f3c9546b91bd75d7a09d05adf9d8e53c8cb23eadcaf5a8cc7acf90772a0a0624df1e92146f81b17273b4dbffb16b
 EBUILD sphinx-4.1.0.ebuild 4343 BLAKE2B 78d3a74da8b013e5d80b0731ad1a6f5b19ae1e991f96c1a28b03234822f78ccea813275ecef944b75d16f75908d7ebfdc6b7077e291a8b86b4bb7f2d5833569c SHA512 b560de6ba97660341f97b3ad657fc62bd3d2ac56e749ec0576cc967da54698481e365300c95251d257a393209aba97bf13e6ea2b508a4d77f195ba951c8dacd5
 EBUILD sphinx-4.1.1.ebuild 4359 BLAKE2B d274c51e81c11455ac5c7eb17891ef9056b6f8bf26b75413afff72196df610c15ba5b1c9dde354e8e495a9e910bbfcc7f33cd207eea5741a14fc6fbe3aa03356 SHA512 09afc62e84ded1a76f1b967962fd8f33e77a4e2ca2a1e61883e1990e4cad1074405f38c3f9e6c375e1ea37af15acd3498d5254e7a459d264556e455d5f08ed05
+EBUILD sphinx-4.1.2.ebuild 4479 BLAKE2B 7e9b009d093e17f56e43b75a2d88d98643d5f47757a4afeb0a53f8e85bacebaac773015ef4e147c938fd9ad1a2b04a6d9073c93c1ee658ca39e38b39af5bfda3 SHA512 366a40dd4c4106ae2da1c7124370af17d2471c5b89f1a22f05923466293a953405403742ab00c395ead68f6b73b8da1fd4529f4bbf3139db23568e0da9aeb5bc
 MISC metadata.xml 567 BLAKE2B e99637c5c116e3b8b17bd92341271350eaab38d3e0c5918ba2921db1fa0abb4615a1903b9916f94f3951f8b22e2939d71c5fde97b6ae467bc80570bdfee3b13e SHA512 7f9edc2ab5d01da2d23630f1cca2a25cb727b8336b600b48934b205727876361c2cc5432772940d855a00766d190b3319dc397927b9218345dac226886e9cec4
diff --git a/dev-python/sphinx/files/sphinx-4.1.2-py310.patch b/dev-python/sphinx/files/sphinx-4.1.2-py310.patch
new file mode 100644
index 000000000000..8c03d1f66721
--- /dev/null
+++ b/dev-python/sphinx/files/sphinx-4.1.2-py310.patch
@@ -0,0 +1,63 @@
+From 1fd5f746539d3e02886032fae8d53af0c2f6ecdd Mon Sep 17 00:00:00 2001
+From: Takeshi KOMIYA <i.tkomiya@gmail.com>
+Date: Fri, 30 Jul 2021 01:27:38 +0900
+Subject: [PATCH] Fix #9512: sphinx-build: crashed with the HEAD of Python 3.10
+
+Recently, `types.Union` was renamed to `types.UnionType` on the HEAD
+of 3.10 (refs: python/cpython#27342). After this change, sphinx-build
+has been crashed because of ImportError.
+---
+ CHANGES               |  2 ++
+ sphinx/util/typing.py | 12 ++++++------
+ 2 files changed, 8 insertions(+), 6 deletions(-)
+
+diff --git a/CHANGES b/CHANGES
+index a643bfe841..70eb8db93a 100644
+--- a/CHANGES
++++ b/CHANGES
+@@ -16,6 +16,8 @@ Features added
+ Bugs fixed
+ ----------
+ 
++* #9512: sphinx-build: crashed with the HEAD of Python 3.10
++
+ Testing
+ --------
+ 
+diff --git a/sphinx/util/typing.py b/sphinx/util/typing.py
+index f1723c035a..012d32e524 100644
+--- a/sphinx/util/typing.py
++++ b/sphinx/util/typing.py
+@@ -33,10 +33,10 @@ def _evaluate(self, globalns: Dict, localns: Dict) -> Any:
+             ref = _ForwardRef(self.arg)
+             return ref._eval_type(globalns, localns)
+ 
+-if sys.version_info > (3, 10):
+-    from types import Union as types_Union
+-else:
+-    types_Union = None
++try:
++    from types import UnionType  # type: ignore  # python 3.10 or above
++except ImportError:
++    UnionType = None
+ 
+ if False:
+     # For type annotation
+@@ -114,7 +114,7 @@ def restify(cls: Optional[Type]) -> str:
+             return ':class:`%s`' % INVALID_BUILTIN_CLASSES[cls]
+         elif inspect.isNewType(cls):
+             return ':class:`%s`' % cls.__name__
+-        elif types_Union and isinstance(cls, types_Union):
++        elif UnionType and isinstance(cls, UnionType):
+             if len(cls.__args__) > 1 and None in cls.__args__:
+                 args = ' | '.join(restify(a) for a in cls.__args__ if a)
+                 return 'Optional[%s]' % args
+@@ -337,7 +337,7 @@ def _stringify_py37(annotation: Any) -> str:
+     elif hasattr(annotation, '__origin__'):
+         # instantiated generic provided by a user
+         qualname = stringify(annotation.__origin__)
+-    elif types_Union and isinstance(annotation, types_Union):  # types.Union (for py3.10+)
++    elif UnionType and isinstance(annotation, UnionType):  # types.Union (for py3.10+)
+         qualname = 'types.Union'
+     else:
+         # we weren't able to extract the base type, appending arguments would
diff --git a/dev-python/sphinx/sphinx-4.1.2.ebuild b/dev-python/sphinx/sphinx-4.1.2.ebuild
new file mode 100644
index 000000000000..3d9abeccb558
--- /dev/null
+++ b/dev-python/sphinx/sphinx-4.1.2.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{8..10} 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"
+S=${WORKDIR}/${P^}
+
+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"
+
+RDEPEND="
+	<dev-python/alabaster-0.8[${PYTHON_USEDEP}]
+	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
+	dev-python/docutils[${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-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/sphinxcontrib-serializinghtml-1.1.5[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-qthelp[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	latex? (
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-luatex
+		app-text/dvipng
+	)"
+BDEPEND="
+	doc? (
+		dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
+		media-gfx/graphviz
+	)
+	test? (
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		virtual/imagemagick-tools[jpeg,png,svg]
+		dev-texlive/texlive-fontsextra
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-luatex
+		app-text/dvipng
+	)"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.2.1-doc-link.patch"
+	# https://github.com/sphinx-doc/sphinx/commit/1fd5f746539d3e02886032fae8d53af0c2f6ecdd
+	"${FILESDIR}/${P}-py310.patch"
+)
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# disable internet access
+	sed -i -e 's:^intersphinx_mapping:disabled_&:' \
+		doc/conf.py || die
+
+	# remove unnecessary upper bounds
+	sed -e '/Jinja2/s:,<3.0::' \
+		-e '/MarkupSafe/s:<2.0::' \
+		-i setup.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} == python3.10 ]] && deselect+=(
+		tests/test_ext_autodoc.py::test_enum_class
+	)
+	[[ ${EPYTHON} == pypy3 ]] && deselect+=(
+		tests/test_build_linkcheck.py::test_connect_to_selfsigned_fails
+		tests/test_ext_autodoc.py::test_autodoc_inherited_members_None
+		tests/test_ext_autodoc.py::test_autodoc_typed_inherited_instance_variables
+		tests/test_ext_autodoc.py::test_autodoc_typed_instance_variables
+		tests/test_ext_autodoc.py::test_automethod_for_builtin
+		tests/test_ext_autodoc.py::test_cython
+		tests/test_ext_autodoc.py::test_partialfunction
+		tests/test_ext_autodoc_autoclass.py::test_autodoc_process_bases
+		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_type_aliases
+		tests/test_ext_autodoc_configs.py::test_autodoc_typehints_signature
+		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
+	)
+
+	epytest ${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/spyder-kernels/Manifest b/dev-python/spyder-kernels/Manifest
index a5423d730eeb..2acf53845f6f 100644
--- a/dev-python/spyder-kernels/Manifest
+++ b/dev-python/spyder-kernels/Manifest
@@ -1,5 +1,7 @@
 DIST spyder-kernels-1.10.2-gh.tar.gz 78924 BLAKE2B 47f0ec284f54590ee9c5a43caeeea61b644fccc6d6222dfbf85187beb9cc141504082dbf50d1d85f5315c8e8e46b9f810253d904b594bb4c52677271b0f7f12d SHA512 4bcbc2646493f384a3f5fad1cc2a42bbe1d06c5225362beb995a73e3c1abe482f3855d844c449b07631b4ffda99492ccbd3cbe69c515ed38d6a98913bea90e2d
 DIST spyder-kernels-2.0.5-gh.tar.gz 81123 BLAKE2B 390c3c5d8ceee787f6699dd41ecc9e015050db86d0e416e32be28ebe0a62b09c611707ac6427e8cc809303f41a77b7d9289f15d71d0b2a8ce17ff87af79ea5ad SHA512 b44702a0964bde69a9035839e3ca052a4ccc60340de83ccb9f1b0e6b93b73da5554e10b5eb61b8965416130d8f658f1a18fb1164c59cd27134298c16d3442dbe
+DIST spyder-kernels-2.1.0-gh.tar.gz 82069 BLAKE2B 04fdf22f887d43a3c9bdb973588af895f07263ee7fed42d1a8f7b1caa25083c8498c28bbe0cd7f8f744082a94bc2906000b34cd6b5b78cb2ea017d0e2950b5ae SHA512 2261f582de5bff4c28463d4bd056cb64edbadabb352cd39b110d21ea004d3118162ca5f715366235789f41c76e6ccbd9064d7f2f7de77663eda89e583368c8d9
 EBUILD spyder-kernels-1.10.2.ebuild 1342 BLAKE2B 0e2ad1fd6d5e3e8ff63487993ee6f49e9becef8cc688558d0b2e6fa4e408752e769b289e317f4a79ff69d282279168258fbb7ce0ed7b81f032551bde250eb8cf SHA512 2e1e25a8db0c3e3da14c684ba80d19225878c4e345be724858bac43218991f537a9515514469d975495c0e9616310081c49b510c4590cc2ce52080d9e6969c4c
 EBUILD spyder-kernels-2.0.5.ebuild 1469 BLAKE2B f865f1bf5562695201d6c0d94053ec5dd308de044c085e2de6084224cd3f3c4327c6dbe3bbe3ed7f2cfe5a0cbc6d7ba9494913e813fca4561dc59ac29f3fabb8 SHA512 25536520288ad3e2e17a42b1b6b5c815c3ebd03ce113671fff457c44721c8a3cf1a76cbce5e06c0c2f5d517e76905b9dbad4fc31a4950b5a2022d35824db65f0
+EBUILD spyder-kernels-2.1.0.ebuild 1469 BLAKE2B f865f1bf5562695201d6c0d94053ec5dd308de044c085e2de6084224cd3f3c4327c6dbe3bbe3ed7f2cfe5a0cbc6d7ba9494913e813fca4561dc59ac29f3fabb8 SHA512 25536520288ad3e2e17a42b1b6b5c815c3ebd03ce113671fff457c44721c8a3cf1a76cbce5e06c0c2f5d517e76905b9dbad4fc31a4950b5a2022d35824db65f0
 MISC metadata.xml 544 BLAKE2B 621ae952ca69bb37d3968b2c4e0eb9d613a6082467229a66f54cb62ac13f11e9a4f849ecc312d02c16d5af45921a9c1c15cc2ad552dfe3d105abfb67effcde6a SHA512 e4c77b881f16c1017fe2c3fb2f4072db36038e8a8aa57cd69233e1a807326398d80381fbcfc156ccee3294fee759df51546af36fc8273ec09955ffd7937ef72d
diff --git a/dev-python/spyder-kernels/spyder-kernels-2.1.0.ebuild b/dev-python/spyder-kernels/spyder-kernels-2.1.0.ebuild
new file mode 100644
index 000000000000..6e20169fd3b2
--- /dev/null
+++ b/dev-python/spyder-kernels/spyder-kernels-2.1.0.ebuild
@@ -0,0 +1,53 @@
+# 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="Kernels used by spyder on its ipython console"
+HOMEPAGE="https://github.com/spyder-ide/spyder-kernels/
+	https://pypi.org/project/spyder-kernels/"
+SRC_URI="https://github.com/spyder-ide/${PN}/archive/v${PV}.tar.gz -> ${P}-gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/cloudpickle[${PYTHON_USEDEP}]
+	dev-python/decorator[${PYTHON_USEDEP}]
+	>=dev-python/ipykernel-5.3.0[${PYTHON_USEDEP}]
+	>=dev-python/ipython-7.6.0[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_client-5.3.4[${PYTHON_USEDEP}]
+	dev-python/matplotlib-inline[${PYTHON_USEDEP}]
+	>=dev-python/pyzmq-17[${PYTHON_USEDEP}]
+	>=dev-python/wurlitzer-1.0.3[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		dev-python/cython[${PYTHON_USEDEP}]
+		dev-python/dask[${PYTHON_USEDEP}]
+		dev-python/flaky[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pandas[${PYTHON_USEDEP}]
+		dev-python/scipy[${PYTHON_USEDEP}]
+		dev-python/xarray[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local deselect=(
+		# we no longer package distributed
+		spyder_kernels/console/tests/test_console_kernel.py::test_dask_multiprocessing
+	)
+
+	epytest ${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/spyder-notebook/Manifest b/dev-python/spyder-notebook/Manifest
index 3adf7bac25ce..c88ee5a567ce 100644
--- a/dev-python/spyder-notebook/Manifest
+++ b/dev-python/spyder-notebook/Manifest
@@ -1,4 +1,4 @@
 DIST spyder-notebook-0.3.2-spyder-5.patch 38116 BLAKE2B 2f311e179d1e0cbdf458773eb0e8d71f1f7cb9dbeca9f01b3dd12120f12177b2bb84ac6e09d7a17a9b26d667523bd28027f80102ff90889d6c781f7b530f8c95 SHA512 e57bc9d9b85622a64d151931d5b96a0c8d448075535ea9e91dfde5326c5192b3cd2d96c9fc88fef95237d4ec833e47238ddc3a3d12de25b4a8dcbda65c92e57f
 DIST spyder-notebook-0.3.2.tar.gz 3868854 BLAKE2B ca13e905dcc02d6767002481fb68ab8bc119d4d2511a1b881f033b9387d4237a1b2232ba75368f48b4d096998da40a14d862f125c0b01c6b2498165acebf4835 SHA512 dd3b505c8a678a9f49b1fce1d22a8a1a6cf334b65d1ab94852a7ba2120f53e2e38eb2fa0d58343588d7304511d7171d8e0040e10cda905db11ab65cae7f6ce5c
-EBUILD spyder-notebook-0.3.2-r1.ebuild 1292 BLAKE2B 6dbb8cc563c0ebaffa690d47939ff7143b609b67ea3da32caa53cae4cd1b1909d41330e9934a244fff27c0ca4e1cf32b4a87d09e4bd9576a9e23fc624757bba5 SHA512 72938777bf6120052beeb36ba24f4beab7cfe8a207eb02bb9b9f9baf7d4967198e84f23d07bdc34e16c4517026835bbb7e08d0985f8da4bc9c138f5f557ea95f
+EBUILD spyder-notebook-0.3.2-r2.ebuild 1336 BLAKE2B 80af99f36afe561b82d5b16a95ab975b6711eaaf1200e644e0b346034210133679286506486958e1d485dffffc930c3549a98c8ee39e781c87d67a3f82c7ffc2 SHA512 3da8116be8f1cd9a5b05b77a90940ac04a960c6abae046b4eb38cac967d83f64663ecbb3dd8d960dacb71dc43a950fc71806ecc5b7df8517aa338b84fc55c3b2
 MISC metadata.xml 360 BLAKE2B 0c9d7f85523a02c6a4c867c2a4ae0c706d69f9bf7ffde077c28c97d9b12348ff797101cb784e702b4b6d910823efe5f0d426fdc4c7952efa02ae79c2cbf3041c SHA512 679dbf9cc9d01046262a7371dc9b523349583a6f8e2586f5ea06c1e91332f6aee004109c62d255a9d8ee61be40706097427cd1027c4a63487ad87609de9e3fae
diff --git a/dev-python/spyder-notebook/spyder-notebook-0.3.2-r1.ebuild b/dev-python/spyder-notebook/spyder-notebook-0.3.2-r2.ebuild
index 8a3c6f0edf6c..e62f67cf8633 100644
--- a/dev-python/spyder-notebook/spyder-notebook-0.3.2-r1.ebuild
+++ b/dev-python/spyder-notebook/spyder-notebook-0.3.2-r2.ebuild
@@ -25,7 +25,8 @@ RDEPEND="
 	dev-python/qdarkstyle[${PYTHON_USEDEP}]
 	dev-python/QtPy[${PYTHON_USEDEP}]
 	dev-python/requests[${PYTHON_USEDEP}]
-	>=dev-python/spyder-5[${PYTHON_USEDEP}]
+	>=dev-python/spyder-5.0[${PYTHON_USEDEP}]
+	<dev-python/spyder-5.1[${PYTHON_USEDEP}]
 	dev-python/traitlets[${PYTHON_USEDEP}]
 "
 
diff --git a/dev-python/spyder-terminal/Manifest b/dev-python/spyder-terminal/Manifest
index c45a060c1281..38eb925b652b 100644
--- a/dev-python/spyder-terminal/Manifest
+++ b/dev-python/spyder-terminal/Manifest
@@ -1,3 +1,3 @@
 DIST spyder-terminal-1.0.0.tar.gz 10098665 BLAKE2B a81e4cd2b1194cd750aff7d5a4d2c587ab60264b89e6e4264352b5f8ba850b66f278245fffed176dc36c2d5912e6f676ba2701d0a09bb384810230f631534059 SHA512 aa426e037dce6c2c7010fbf924ace27fa5dce9f736cd3b6b55d8ba3935e02ba4f6dab8815930c8686525c6e74f4119f781afaf9432f22f5436abec2c5a14c570
-EBUILD spyder-terminal-1.0.0.ebuild 601 BLAKE2B bdb5bed1476fa329c256ab323a6304a09929770d2a18c6f9ec632d1785d8a9420f3f9bcfe210c6416a5575ce2c5aa37dce768be980ffd9ea150f7e0d54c5510e SHA512 1cfa003e0889d617d0157fc9a2ca024d521ca0c88cd6a3ca91847cdb9c06a9b1cf321b152a749406437eb9049f61cbe80524636aad09463dbf5343e6c473dd23
+EBUILD spyder-terminal-1.0.0-r1.ebuild 643 BLAKE2B 97468c51254d98fc96100ab680567cb829f14d64060edf717674426419679e8c122693219e8028919b439cf6ebf23893ad8dd17bf7e8fb3a8780c702ace479dd SHA512 8df665588ed90405b2fecf49092de7305c72b08503e4e7cfb4c26b1a4a3a3e4901c0b0cbfe3bb1e0d62d7fd693875e881b3c01c4ff74c7cb2df5c7e59b9feb37
 MISC metadata.xml 360 BLAKE2B 76b0535377eaf46594ae7a7dd1fabd1d5c3a53e476e2068c66b7b50773f21e7fe1bf609b12e03763e276131d5f426aa95df7d483d993b0cdabb683fe884a2db7 SHA512 87e065d435f8fcff1c0da0e69c50904e5ce13980ae5463cec66013acdff144b5274289347bb9fa16c519cd4345a22062289b74537a5aaafc5606ac4614cdefa5
diff --git a/dev-python/spyder-terminal/spyder-terminal-1.0.0.ebuild b/dev-python/spyder-terminal/spyder-terminal-1.0.0-r1.ebuild
index 4150c3b690f6..a1a0efddee4d 100644
--- a/dev-python/spyder-terminal/spyder-terminal-1.0.0.ebuild
+++ b/dev-python/spyder-terminal/spyder-terminal-1.0.0-r1.ebuild
@@ -19,6 +19,7 @@ RDEPEND="
 	dev-python/coloredlogs[${PYTHON_USEDEP}]
 	dev-python/requests[${PYTHON_USEDEP}]
 	>=dev-python/spyder-5.0.5[${PYTHON_USEDEP}]
+	<dev-python/spyder-5.1[${PYTHON_USEDEP}]
 	>=dev-python/terminado-0.10.0[${PYTHON_USEDEP}]
 	www-servers/tornado[${PYTHON_USEDEP}]
 "
diff --git a/dev-python/spyder-unittest/Manifest b/dev-python/spyder-unittest/Manifest
index 8d73060f3812..bbcb1795c079 100644
--- a/dev-python/spyder-unittest/Manifest
+++ b/dev-python/spyder-unittest/Manifest
@@ -1,3 +1,3 @@
 DIST spyder-unittest-0.4.1.tar.gz 79158 BLAKE2B 10b7a8fde9dffdb436c44f22d305ceab84970dabd19aaeb7b5685be21f0e7bfc701a5fbbf9e393a71c9feb36dd6a2be68680e276c8d0841b2133a7171c504e3f SHA512 17e08b09accd938bf533c409f9a8011e9780f9cc4533af0ec754b6a01061490f198213cb77af9050e1e67e2b4b9c25251bbab27dce23d3f6e09f502cfbef95fc
-EBUILD spyder-unittest-0.4.1.ebuild 1131 BLAKE2B 74a73101befd576e43470861ab715864173ce23a413f0142389c031314b990659fbc42f917aeaf71d05cc2f4d4144915779e306161240a2aed75a72d25cdb7ed SHA512 9a9685721c56c33b0db0fc9a556bb10b46685aebb90d21d8050f7bd0232b6c74785ffd7aa1c67b4d70d1699128015bdcd3a55ac0031c3c2b242034198a76ffc5
+EBUILD spyder-unittest-0.4.1-r1.ebuild 1173 BLAKE2B d64d8c767b2885c207195d69f00788a2fb236bae5ae4a460c3fbffd140a8e3efbdc1b7fe02f8496b646664de2fd9013fde853385155b81dc922b45f3032be06e SHA512 01c3be4900ebf154a9c5287bb0cebaeb0c7940ff8046c64a089b869b322d24298e8906abd3769424061274cffd62cd286938bb286c1125dc6e292b461e31a87b
 MISC metadata.xml 360 BLAKE2B 8157712dad4e0e35bb988afacd2c0d4a6b1e5cdfe16c64958d7aafbab827e87bcd8cbf4e7de4c04328311d3a80b609fa53123e92c53562bab77fb95c23bfdcba SHA512 522539af150d97c3ee19cb04b110584777ac903cee791a635078f4b14a1c215f43d6327f7e0e3345e217e4501676f0d91e2276ff0b824fb95ab38e73db659fe5
diff --git a/dev-python/spyder-unittest/spyder-unittest-0.4.1.ebuild b/dev-python/spyder-unittest/spyder-unittest-0.4.1-r1.ebuild
index ca9b9487f598..38bdd2eb9179 100644
--- a/dev-python/spyder-unittest/spyder-unittest-0.4.1.ebuild
+++ b/dev-python/spyder-unittest/spyder-unittest-0.4.1-r1.ebuild
@@ -17,6 +17,7 @@ KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
 	>=dev-python/spyder-4.0.0[${PYTHON_USEDEP}]
+	<dev-python/spyder-5.1[${PYTHON_USEDEP}]
 	dev-python/pyzmq[${PYTHON_USEDEP}]
 	dev-python/lxml[${PYTHON_USEDEP}]
 "
diff --git a/dev-python/spyder-vim/Manifest b/dev-python/spyder-vim/Manifest
index 4bba940d9da5..a9b745165ad8 100644
--- a/dev-python/spyder-vim/Manifest
+++ b/dev-python/spyder-vim/Manifest
@@ -1,3 +1,3 @@
 DIST spyder-vim-0_pre20201026.tar.gz 293554 BLAKE2B 1ee4122e5a149d029d67f93acabacf81af47b2a7d9902ef2c3a5bc289e5c532c8b2f15ce59cb0b8bb16eb6b3ea461c3ce44ff85f6f8d022cea5e5b482987a8fc SHA512 98b479b4ab2be5e1cbe730e1d4441c5d557d32ad7caee31ed2e6c936d97554ca50f3f0b0d2cef68be7742653946d3c87a01938479664de4066e22b13441c58fa
-EBUILD spyder-vim-0_pre20201026.ebuild 806 BLAKE2B 08fa791def71696d7e5c98bd19adf317057a174a878fbdafa045078851c6a50771ec001e6d922e27fd38e8d955ce1dc7eaa26bbdc331ca3c32f6511cb673878c SHA512 c08d96f7b6fff994f99c8dcc430aa75e0d4e35949229444429fc04c9df46f84a210621a36a347cc8385b64cf9b3747c778723f539eb904eea9c94f081c4de87c
+EBUILD spyder-vim-0_pre20201026-r1.ebuild 852 BLAKE2B 44210d89a0e11fd2fdab1aee9db39ecf0cf0583ab0d5a2914164fad6f49694bea214e90994baa48776cf2e0bd797190e5e6fab2ddcda5f478a357db3bfc5e94a SHA512 f3c8eb60ad8e3c5f2adb8a031295165d301234785ffb033610a71ef89e2d997ab66acd010035edd71ccde00e0769b0b5a07ff4d1adc517ea56b0dd938beac03d
 MISC metadata.xml 282 BLAKE2B 723887f64c8928a88fb027b9281cf3c37264eb14d86c5f53a2e63f7b86da612a18f9fba397e4a8b57df75ddb755e4f62a2c2759174b3fcd8c9dfb3d19a0219f2 SHA512 b7943b255eaee8517f7cc0fc5d081ead6a0f380348dcf376dff573c40163502257a1df896c9ff47c5c572f5363f4750b2147b68e11ef4351c0c5c994336f8504
diff --git a/dev-python/spyder-vim/spyder-vim-0_pre20201026.ebuild b/dev-python/spyder-vim/spyder-vim-0_pre20201026-r1.ebuild
index 168e5eb75d56..29e15e60845a 100644
--- a/dev-python/spyder-vim/spyder-vim-0_pre20201026.ebuild
+++ b/dev-python/spyder-vim/spyder-vim-0_pre20201026-r1.ebuild
@@ -17,7 +17,10 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-RDEPEND=">dev-python/spyder-4.0.0[${PYTHON_USEDEP}]"
+RDEPEND="
+	>dev-python/spyder-4.0.0[${PYTHON_USEDEP}]
+	<dev-python/spyder-5.1[${PYTHON_USEDEP}]
+	"
 
 DEPEND="test? (
 	dev-python/flaky[${PYTHON_USEDEP}]
diff --git a/dev-python/spyder/Manifest b/dev-python/spyder/Manifest
index 39a3ada1af39..a795bc41ef8c 100644
--- a/dev-python/spyder/Manifest
+++ b/dev-python/spyder/Manifest
@@ -4,8 +4,11 @@ AUX spyder-5.0.0-build.patch 1147 BLAKE2B 68e62f6bd7a021d82f1da8d86c16e2289faac7
 AUX spyder-5.0.1-doc-theme-renamed.patch 346 BLAKE2B d0f894f5f736a32e78aaaac6c9c8f051dfdf5f12b09038c047be8885d05ca149830fbebc0bcc2764bbb24033817874be0e1b2609e2a6cae591254bb139488954 SHA512 0a2e0eaee4386ab85881ff67669a4820c26a17993c85b33a6df3576a07aba1c331eef5853db1ef8a760e95c315036411f6f13880510efda20933ee3cc0600741
 DIST spyder-4.2.5.tar.gz 11539071 BLAKE2B 9d7a98da018aae934803d640995fe2dfa6bbb20bfc7140bd00f5e7a00a09c47922fefd8df84f4b217a50176ee190515da6f4cbf498a03cae68e2ac4f5ec70664 SHA512 081b047a45b7522a69b1b21a221ab5cdef47f87f36ed4423ff63297d205f924c1627517c50622acb2d10efa094bc506fed4ec88f861775d3f58e81ac6ef017ac
 DIST spyder-5.0.5.tar.gz 20606379 BLAKE2B 52f05ffcf0b6aabdac23a055af1c674c6aa80a7d4f3608779df1d46e0e51de63a71b4e97db286dc92e071cbb44a0dc827aa750d8ca538e6764b5e780f493d615 SHA512 17654ee76eb51c5f5b9f494d009af3d7813f869f27f22ceb8ad8ca96dcedcbcd6b86c7a3895bb63eba3cc60e4a57ab94128abb8d21f05c4672b8bb8d545fe1ff
+DIST spyder-5.1.1.tar.gz 19782262 BLAKE2B 64dcd45b91eba57cb5e435fe4b9d9c2f0884165e68099fa0a354ddfba13fc41022564218ad9661126c18f638dc5d26083494d0a97454e5a1055d01848df896fe SHA512 ba6ee6681ca2c3ae0b41aab57b28747d27141f274bb28331926ad75d9c5011cee604895f7b187853f5d7dc4777d4ca21a954911adb1b063dc1da26ff88cbfa2c
 DIST spyder-docs-5eb83118155a3765de4a0f863b936bcbe73bb7aa.tar.gz 85362596 BLAKE2B 7294dcd0f169958da132b141379b9b1cf497095981a86416fb98d98f98e30a425fe2e628a523785f932bbc06a2ba1ecddb45bae0df009887db928f879e08cdef SHA512 45f45546b83afb3036348e89ee3eded4d8ecee36ce58fe697da14677fbff8fa2dfe170be7385ecf10e1989817780c07b5676d545ee34e87a8f252929ad72882e
 DIST spyder-docs-78b25754c69a20643258821146e398ad5535c920.tar.gz 69167467 BLAKE2B d2815d552002f329b5fac59329fba3b3b0cd592bcbdacc0878966919e44dbab29548533661e60a1b9b8fd763d57d1e4c2f761782ace1b0a814a5f0cec1f66af9 SHA512 10764367fd5f830d7a3620b9d9e7ec4ab74539c1f48326c0c40f7caff74a50401addc7609fe1558c57dac4649d0a214c0d2d77cecd100bd8574151134e49634d
+DIST spyder-docs-ebf13f362a604c5ac127efcddb74a91610d92f59.tar.gz 85347412 BLAKE2B 3d7ef7a491a974d3255040998716931cf14d88c74af9f44b6a46edea6d75585c4d9683e03dbc4175c237a7baafe409e4a2ba43a0db666c7d4e96b864e2ee58b8 SHA512 c0f50ad9cd721558484c8dce3cd59c503475e814a3d42e8786b4678a449baff46b13c8ec1227fdc8f8b733c856736ecc4652f0a43db36feab27f2fb10355debc
 EBUILD spyder-4.2.5-r2.ebuild 9965 BLAKE2B f94f8de5c81eac740cb34912fd7aedf6f9768fa63c564c5869ab025068d558de4052c9990a95682a8045a5b5e7dbc7c705f4d8d992f978e0f9706888339e0277 SHA512 0e4c1d37d26ff4b02148b28254750cdf5e36f5440e575ae097deabb8606ae32c681e6666a47753c71f411a626d24f5333ab8b8d0c270a447a0723ae93b03d9da
 EBUILD spyder-5.0.5-r1.ebuild 7943 BLAKE2B 8564bf7aae20878fa68a6fa1d9b0abb71c76bd8c87364525808641b97d8da88f86c362cd3b1bae32f3875bf691c5b15ee8043537ddbf5ecd738750d58e69ec8a SHA512 9c206b76177eb1e76757d0586056f2201ae17f9760cfecf7458c0ca1029967b094270ee4302dc94eee09245b33d445f46128dbd3e20e1df9906da59d3964ae64
+EBUILD spyder-5.1.1.ebuild 7152 BLAKE2B bec57606bd7ae195e68e8f02c807565982acf2e5f12e89eda4d2467835d246270774deb889967041ce2a94d2f58f203ba76442a19e5b648a630f9f20accc1f27 SHA512 ce55f2d923c60e8bb67cad21626c9032a388e72cf49ac4dc0f330289f7ec24755d174c8c8cf5d1dc7c2f7484a6a83a34e9933aca211b219f715c38553d4d463d
 MISC metadata.xml 1315 BLAKE2B d6969e1a2167c283ef39b5041f58307ce0eda6a70ec0efa6aad7f0871dd9202f857af5d5a676bcc45af9f31743b856ac6c7e90e3767f82810f2c27a2b266d76a SHA512 eb59a948abca8c2920705647d09d339d09e10d27b08ed3e4ff6acdfb2cf0662fc60c3983d6bf44cfe68b11023f7c71b642b0453d0e11c1c701f281a1dfb3be08
diff --git a/dev-python/spyder/spyder-5.1.1.ebuild b/dev-python/spyder/spyder-5.1.1.ebuild
new file mode 100644
index 000000000000..404f796dec26
--- /dev/null
+++ b/dev-python/spyder/spyder-5.1.1.ebuild
@@ -0,0 +1,188 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit optfeature xdg distutils-r1
+
+# Commit of documentation to fetch
+DOCS_PV="ebf13f362a604c5ac127efcddb74a91610d92f59"
+
+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"
+
+RDEPEND="
+	>=dev-python/atomicwrites-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/chardet-2.0.0[${PYTHON_USEDEP}]
+	>=dev-util/cookiecutter-1.6.0[${PYTHON_USEDEP}]
+	>=dev-python/diff-match-patch-20181111[${PYTHON_USEDEP}]
+	>=dev-python/intervaltree-3.0.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/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/python-lsp-black-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/pyls-spyder-0.4.0[${PYTHON_USEDEP}]
+	>=dev-python/pyxdg-0.26[${PYTHON_USEDEP}]
+	>=dev-python/pyzmq-17[${PYTHON_USEDEP}]
+	~dev-python/qdarkstyle-3.0.2[${PYTHON_USEDEP}]
+	>=dev-python/qstylizer-0.1.10[${PYTHON_USEDEP}]
+	>=dev-python/qtawesome-1.0.2[${PYTHON_USEDEP}]
+	>=dev-python/qtconsole-5.1.0[${PYTHON_USEDEP}]
+	>=dev-python/QtPy-1.5.0[${PYTHON_USEDEP},pyqt5(+),svg,webengine]
+	>=sci-libs/rtree-0.9.7[${PYTHON_USEDEP}]
+	>=dev-python/sphinx-0.6.6[${PYTHON_USEDEP}]
+	>=dev-python/spyder-kernels-2.1.0[${PYTHON_USEDEP}]
+	<dev-python/spyder-kernels-2.2.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}]
+"
+
+BDEPEND="
+	test? (
+		dev-python/cython[${PYTHON_USEDEP}]
+		dev-python/flaky[${PYTHON_USEDEP}]
+		dev-python/matplotlib[tk,${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-4[${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}-5.0.0-build.patch"
+	"${FILESDIR}/${PN}-5.0.1-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 dependencies are packaged separately:
+	#    dev-python/spyder-kernels,
+	#    dev-python/python-lsp-server,
+	#    dev-python/qdarkstyle
+	rm -r external-deps/* || die
+	# runs against things packaged in external-deps dir
+	rm conftest.py || die
+
+	# Do not depend on pyqt5<5.13, this dependency is carried by QtPy[pyqt5]
+	# Do not depend on pyqtwebengine<5.13, this dependency is carried by QtPy[webengine]
+	# Do not depend on parso and jedi, this is dependency is carried in python-lsp-server
+	# Do not depend on python-lsp-server, this dependency is carried in pyls-spyder
+	# The explicit version requirements only make things more complicated, if e.g.
+	# pyls-spyder gains compatibility with a newer version of python-lsp-server
+	# in a new release it will take time for this information to propagate into
+	# the next spyder release. So just remove the dependency and let the other
+	# ebuilds handle the version requirements to speed things up and prevent
+	# issues such as Bug 803269.
+	sed -i \
+		-e '/pyqt5/d' \
+		-e '/pyqtwebengine/d' \
+		-e '/python-lsp-server/d' \
+		-e '/parso/d' \
+		-e '/jedi/d' \
+			{setup.py,requirements/conda.txt} || die
+	sed -i \
+		-e "/^PYLS_REQVER/c\PYLS_REQVER = '>=0.0.1'" \
+		-e "/^PYLSP_REQVER/c\PYLSP_REQVER = '>=0.0.1'" \
+		-e "/^PARSO_REQVER/c\PARSO_REQVER = '>=0.0.1'" \
+		-e "/^JEDI_REQVER/c\JEDI_REQVER = '>=0.0.1'" \
+			spyder/dependencies.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
+
+	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
+
+	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
+}
diff --git a/dev-python/sqlalchemy/Manifest b/dev-python/sqlalchemy/Manifest
index 6ef817e7258e..709192bd3c13 100644
--- a/dev-python/sqlalchemy/Manifest
+++ b/dev-python/sqlalchemy/Manifest
@@ -1,10 +1,8 @@
 AUX sqlalchemy-1.3.20-pypy3.patch 7321 BLAKE2B 706ff7da1f25a667784f462effb85593e8ad9a3fe893000866e487ec32328a571f4440ce4dcce61e2b5f1ded5c8145f5cd12a141c40f4bb64e87135aa18a8274 SHA512 40944c59cc6cb17f512d0df1e2cf50626dfa6a53e2e8b182c0ccb4007c2338d8058459a9158e9e72ee6aa89394275cf818f0c7572b249175d3acd52f5a1c2827
 DIST SQLAlchemy-1.3.24.tar.gz 6353598 BLAKE2B 6eb92b20fa3412a1f1398e18e902e3338320973287afa4a37477ec28d47e7422a19c3a60e6290a6da7b23512c0d818a26400958d02097def778c917f098bb3db SHA512 4f5f0a23e80e1cebe541f8748a7e794e8964d986252803b3289a7cea732ad22557e00221775332e2766b6ff16ad5d9069223f441f8880ca6d0c47011f15fee5b
-DIST SQLAlchemy-1.4.18.tar.gz 7643090 BLAKE2B 8046bb9f9aa459eec95af57e597540552f6cd79ca3c393abf66d7370754e8433d743e739803929aaf0e2788b0c0419c022ddda1517d38da6580f3afeee1bc4d4 SHA512 06110bf727fd6d83404da2e031a27163c06059bf9eae4cc5b79ce047b5bab67b54432890091fa03abd9644156b92569001ae78c48c22799ab3bec220d4bbe1a0
 DIST SQLAlchemy-1.4.20.tar.gz 7682074 BLAKE2B 7921bbab0c7fcaccb232121625dcd9acc162cb21e747b889fa032863435b6a922b9ad21c7ba136b94617710d3aa6ec331941b11b0fd87a8d543b633d3d605c36 SHA512 cb9ec5c74b27c93824b7d46844d2a122c719e358d917563039f3dd96a44d057d4daa239b2820893db42348f46546efc469a202999be2c722027abbb6eed50063
 DIST SQLAlchemy-1.4.22.tar.gz 7709437 BLAKE2B cc4ab689c8f53601ba76632ad32ed2ae23f9ac46fe23f40cc7657b66f48cccc6a7801f9bea64dcebbe1c39786d7ff0708fad8e8d05534a5ab4ef691e6da8d85c SHA512 92a36a77d104db23577dda9add6dca86c1e1c416d3dc552c4dc6049522683da2857c1071c81d216d41a723c11de081af92800acb5d44d69fb0e36ee6756839ce
 EBUILD sqlalchemy-1.3.24.ebuild 1817 BLAKE2B 7cf908d3be350140f1f1744ed3361bd2fa12f1cdd3d5cd08b2abb5d408c796a0837d3a585c8b299065f4da4f231dd83fdb6e9a3982aed6ef8465e7e1edd9d6f2 SHA512 3ff6fa141d32dbe4c96715eaaf88e3aa616eb98f19ca9913eee74f573b05bf91f57430d1c3b30060b28e1846b2a613f6ede62224f9163b28818e5b306a6b7125
-EBUILD sqlalchemy-1.4.18.ebuild 1689 BLAKE2B f416319b85910319c2978ef29269ef78073aa917a503ab9b9c5d649480179d918c15530170783108d6c48dc8ed24896f4e82607588d8b36a041e404581983cbc SHA512 706321122605b9b121346f7e408b06dcb9864fcc59f778c50612f01819da7a92930dd9c01d137fe23ce76b8c43aadf94a93fae421d9d6a1fe77a1a558c85d275
-EBUILD sqlalchemy-1.4.20.ebuild 3129 BLAKE2B dea891b5cf7c6f91fd9539ff5391fb56423d3ee5607d6fce242dd474b41ddfefe5b8d981285b08f2380788b03e233a45fe6192be7585ef9ebab4b4b79531f472 SHA512 f9ee209be3903d2935621d5036214483159685c21ffb2914b6630f04a02930a3f4335d89a3c7a560c1ed158da2093756d085cc781510f7eb7bb60c293a293ea1
+EBUILD sqlalchemy-1.4.20.ebuild 3127 BLAKE2B 1eab3aec274e4151fdf6fbc3dcf7d6160da7f086f15d8663b5f1ada31b5485b996403543a25d3794105dde8976911aeedcd8f61bd3803f0dbd02f2858641d51a SHA512 87037d20361db24faf4b55d975f54a36f2b6b1d113ee8c0cbb7ff410270812951160c53ec5f6002a1533498be28e9487178a15c916c9bada7539599154d8cf4d
 EBUILD sqlalchemy-1.4.22.ebuild 3135 BLAKE2B a33219c712e87ef93f1cb549340d04c513222878fa3e374824158711407272be30f64d865aa2a5a5e2e30434c79728bee719214a7d1f9ce8c077d62842727037 SHA512 390ac7f5f6f607d2418b275192ef2fd53387fb9ba1df6f4ed4519b9e512bc98bbf2fdf49b6ba09f36b2d568a9f882752966e3727bf925c9c5d1c4d70afb37f16
 MISC metadata.xml 443 BLAKE2B 44c09d8332158ed09ece04188ca9b41a68b7e8a0a2b6d8d44cef44d7be396a08cab3432c05b3bcdbe706a470662d313548e80e202c8ea0e02aec6035daacb3ef SHA512 c262e5b27bbb02b6e64a1fa8a240cf14fe572dc0d41901dfc65ca979f7f89b3e0885b71a6f5c39b33e1534e13366873144693eed44bf43712d3c924a504dc6c8
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.4.18.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.18.ebuild
deleted file mode 100644
index 4e64d3a7d6d6..000000000000
--- a/dev-python/sqlalchemy/sqlalchemy-1.4.18.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
-PYTHON_REQ_USE="sqlite?"
-
-inherit distutils-r1 multiprocessing optfeature
-
-MY_PN="SQLAlchemy"
-MY_P="${MY_PN}-${PV/_beta/b}"
-
-DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
-HOMEPAGE="https://www.sqlalchemy.org/ https://pypi.org/project/SQLAlchemy/"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="examples +sqlite test"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/importlib_metadata[${PYTHON_USEDEP}]
-	' pypy3)
-"
-# Use pytest-xdist to speed up tests
-BDEPEND="
-	test? (
-		$(python_gen_impl_dep sqlite)
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# remove optional/partial dep on greenlet, greenlet is not very portable
-	sed -i -e '/greenlet/d' setup.cfg || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# Disable tests hardcoding function call counts specific to Python versions.
-	epytest --ignore test/aaa_profiling \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
-
-python_install_all() {
-	if use examples; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		dodoc -r examples
-	fi
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature "MySQL support" dev-python/mysqlclient dev-python/pymysql \
-		dev-python/mysql-connector-python
-	optfeature "mssql support" dev-python/pymssql
-	optfeature "postgresql support" dev-python/psycopg:2
-}
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.4.20.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.20.ebuild
index 842ded996206..b0801a904449 100644
--- a/dev-python/sqlalchemy/sqlalchemy-1.4.20.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-1.4.20.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="examples +sqlite test"
 
 RDEPEND="
diff --git a/dev-python/tomli/Manifest b/dev-python/tomli/Manifest
index dae3ea426ae9..843ea58cf99d 100644
--- a/dev-python/tomli/Manifest
+++ b/dev-python/tomli/Manifest
@@ -1,3 +1,3 @@
 DIST tomli-1.0.4.gh.tar.gz 120508 BLAKE2B bd75568315b405598578b395ec0e20b7f37e9ceee58f145cda8adaf58a3fa549cd35902650f5b2aa84b764ab32eac8a21d3ffd94c0c4c43eab3c3a0b49203a71 SHA512 e30e06ea805c94359596c3d6db82464ccafcdde0172cae12d62c889c70986159b3198cf465183854bef1b048c21e487c2b0dad2825e2477d363885e749b238ee
-EBUILD tomli-1.0.4.ebuild 605 BLAKE2B 742599f57c015247c50e9e06cfe4f460e9a19fd710e6efc825fe0abf48160b4965554f130c3137536d5544a2d93e73ccb2eff7f3241f1a86cc01560db89b6761 SHA512 255da837f0e42fb505c7d8f4fae366192ab2663df69fd4879d949cedd93c30f781eb9fb35ced8b6153b8e01bd7469fc8b9d6ae819f822ed90f37f0d8991b405b
+EBUILD tomli-1.0.4.ebuild 816 BLAKE2B a837bf74fef98b24112be0c2f9e704ddabd75e3712c00aa62316dc66534c6ad6dc1dac923c6e67064846eb00c189659363920727517e9fe833fef6215a715bd2 SHA512 9cc575a78ef9e1c7acd0813210c9d795f05c558d5023df3c6f12385ec9d94b911932aa2db37d59bd82a2f2477a48a5d00aade484a39358d7e70a7e279af92dcb
 MISC metadata.xml 338 BLAKE2B 9a121aa354145d8764982615b75e0d7bbafd9fd9f62d8aec58f75b07ee4c86a2e31d56d4f9e15025eafd639fb8bc378e2e7524d8d5310aadc98d06cd374644b7 SHA512 4be4620f741c382a83c748af54f8f9744703d0eef7302bff78d3d85da6b9c2628ad0bdda54b8bd75399f9e89ecf5eb80a961029574d85aaefbdd95cbf35b6099
diff --git a/dev-python/tomli/tomli-1.0.4.ebuild b/dev-python/tomli/tomli-1.0.4.ebuild
index b35f22cf0cf9..7ad7d69a48f2 100644
--- a/dev-python/tomli/tomli-1.0.4.ebuild
+++ b/dev-python/tomli/tomli-1.0.4.ebuild
@@ -3,7 +3,6 @@
 
 EAPI=8
 
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
 PYTHON_COMPAT=( python3_{8..10} pypy3 )
 inherit distutils-r1
 
@@ -23,3 +22,13 @@ BDEPEND="
 	test? ( dev-python/python-dateutil[${PYTHON_USEDEP}] )"
 
 distutils_enable_tests pytest
+
+src_prepare() {
+	# we don't use pyproject.toml to avoid circular deps
+	cat > setup.py <<-EOF || die
+		from setuptools import setup
+		setup(name="tomli", version="${PV}", packages=["tomli"], package_data={"": ["*"]})
+	EOF
+
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/typeguard/Manifest b/dev-python/typeguard/Manifest
new file mode 100644
index 000000000000..7e15745021db
--- /dev/null
+++ b/dev-python/typeguard/Manifest
@@ -0,0 +1,3 @@
+DIST typeguard-2.12.1.gh.tar.gz 35894 BLAKE2B 309b5fd906ae5122fbd2134ff30f6f2908a5d64fc8510dd054a9f47feef5f1674ea6133156fb6649c85a6fc8a98609387f742e7f9588db8ab008ef2caec0c740 SHA512 ea91140ba0ebfe7cc83bf212ae20aca777279fc88ff806bf6a1f4208581bb726c6091d0777371d487e7422887814d81c84ebac9f06bfacc5a929f5a2657312a8
+EBUILD typeguard-2.12.1.ebuild 981 BLAKE2B 3306b30332ad9d8f9943206995afca09ab34fa33f07e2836ab9a62621a0ba7f67b3018c1329ebff995d4ec362da06b82e2d59c7cf6701160a0977c048dd0cd44 SHA512 44a09aea91107a9eee9f24ecc1c63e6774ea00cd056728590e2995637bdbcb6cc5dd7bbbf53609adb2a30c2c58599ae508244fbfdbd159230b6073b8e31951cd
+MISC metadata.xml 349 BLAKE2B 873714697a9a764860b297dfbb7fe6132810af46e1eff9fa2748b4228522b6a9277e41eaceca817223fddab6d8e6b1b82be475c1db8ceac5b7d67846573cff16 SHA512 b15a90ad3556ed039357792d7370d9b0333307ac1e8f29bfeb93a5ae89ca10a0392c4b600392bb55fd5d4ca5367e1efdce77f326d0e535ef97c7042845b55ab4
diff --git a/dev-python/typeguard/metadata.xml b/dev-python/typeguard/metadata.xml
new file mode 100644
index 000000000000..4522c923343f
--- /dev/null
+++ b/dev-python/typeguard/metadata.xml
@@ -0,0 +1,11 @@
+<?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>
+	<upstream>
+		<remote-id type="github">agronholm/typeguard</remote-id>
+		<remote-id type="pypi">typeguard</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/typeguard/typeguard-2.12.1.ebuild b/dev-python/typeguard/typeguard-2.12.1.ebuild
new file mode 100644
index 000000000000..92dfba2742ea
--- /dev/null
+++ b/dev-python/typeguard/typeguard-2.12.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Run-time type checker for Python"
+HOMEPAGE="
+	https://pypi.org/project/typeguard/
+	https://github.com/agronholm/typeguard/"
+SRC_URI="
+	https://github.com/agronholm/typeguard/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+python_test() {
+	local -x PYTHONDONTWRITEBYTECODE=
+	local deselect=()
+	[[ ${EPYTHON} == python3.10 ]] && deselect+=(
+		# https://github.com/agronholm/typeguard/issues/199
+		tests/test_typeguard.py::TestCheckArgumentTypes::test_newtype
+	)
+	# mypy changes results from version to version
+	epytest --ignore tests/mypy ${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/uvicorn/Manifest b/dev-python/uvicorn/Manifest
index d86e6a169c2f..f50c7630b63a 100644
--- a/dev-python/uvicorn/Manifest
+++ b/dev-python/uvicorn/Manifest
@@ -2,6 +2,6 @@ AUX uvicorn-0.13.4-fix-wsproto-1.0.patch 1122 BLAKE2B 4190a5e61af991e77271aef8be
 DIST uvicorn-0.13.4.tar.gz 505858 BLAKE2B 486436c0b4c717741c11b7da6a979dc9fe977baa2dbc3e2538ce28551d2dee593076b670b16c099056165624c149f96974f64d2847e38234122ec93b65b31cda SHA512 5332494e0b43b4e87f9d6742be679527b1ec2bc4d2e061768594d44b1fd1d6961a2bd1fa23469fca6c530ef36d6123e453306c2bb664cb27b0cd6145b9a70fd7
 DIST uvicorn-0.14.0.tar.gz 511593 BLAKE2B 9f7aee0001874c128e44d31945aaa0ca92237e594debb6fea3c6c6d0f283c96cfad5248578b0e1c170fe2fde96a6b17c56ecf2436783fcae135b8eab1997b701 SHA512 f41a7f01ac6893ceaf4d1f06a4bccd7355e319eee11d6aa290b0d316fb356eb807c926941157ec64f1fc6b7c4601930cfbe271075d6c4cf684bd7e175617390f
 EBUILD uvicorn-0.13.4.ebuild 1297 BLAKE2B e2e429e266084c92acf6965e86220494101135001bf656ce9ed1ee08b8ea07b61a8cb844bd416ddfa77ae9c8dd0d3618a8438b3dd1b08d12857efce9e6fbcbbc SHA512 3fd28de46cea2f2b8a2a7aa688155127d1a6d8e7f79137443606019e05825a1f4ab1c1ecd1dd8f4a04c8dc8e6851b59136fdcc68d5d4344be98fe70f97714dc0
-EBUILD uvicorn-0.14.0-r1.ebuild 1279 BLAKE2B 90399c2f4a25353b5e59e6468de1b9082370c70942bbc12522060023adcfda8051d28f72960e375381d8f160607fb7f81fe2325e4c49f88c8c072766191d9086 SHA512 fe1564d7e1ae099680c19be4f5f12dcc8d15bb4a277f2bc314f2ec54ace4afaf0641f055e9c93815f82b81e47f300aa51c3a0b3aa000a735fb69966df4d2ba78
+EBUILD uvicorn-0.14.0-r1.ebuild 1280 BLAKE2B 63482aa3db046fa48f4b3d175aee5ad07f2094a93fab84172cc5c8709dbf365fbdf3262b63a8e1e0d5edae1b8f1f810482a4aedd937e4e9fa71ef004fe532836 SHA512 9df124e0b0ad41e8d37217e0ef522ac950ad971ac9501d5365e3d5158ee427c64730e005208eaae0c07a219aa19c1f3710cd820e03fd4c82885f616cd7479c51
 EBUILD uvicorn-0.14.0.ebuild 1426 BLAKE2B 7051151bdae8ad61fe11b8b209f2895cc37b0d0998dfdc110210cbcc5774082e8a5d0b21e6265d7b9a9c2437784e3c499750b48c5b0271691e5a1092c6083037 SHA512 982224e58b7cd8cf7a9596b921b226bebb6d8463b7c844b691be1c284598586d8ffaf70f911644e85f5518d2a21aa1c54eaa6741e5d9227b05b8b3d42709353e
 MISC metadata.xml 450 BLAKE2B e6413874e7247880323b72113f002ade2edff362d7464ebbd5890ec95946b97bc37d74c2d6e9ff7a6a416a45f32bbab1b6eca70db8964adc6be287793c0fb4b4 SHA512 a1138016ec2d87c77f82333a0d41a68113d87c74d50e1bd6ccef0e0300f53663ecb907959be2547b42cc5cd007f47626e98b8c8cdc7e3557d2dfd0a369447268
diff --git a/dev-python/uvicorn/uvicorn-0.14.0-r1.ebuild b/dev-python/uvicorn/uvicorn-0.14.0-r1.ebuild
index 90b6ff8d6663..70d867f283a3 100644
--- a/dev-python/uvicorn/uvicorn-0.14.0-r1.ebuild
+++ b/dev-python/uvicorn/uvicorn-0.14.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="Lightning-fast ASGI server implementation"
diff --git a/dev-python/uvloop/Manifest b/dev-python/uvloop/Manifest
index d94b85dc2689..ea7bfe25e9f5 100644
--- a/dev-python/uvloop/Manifest
+++ b/dev-python/uvloop/Manifest
@@ -1,7 +1,7 @@
 AUX uvloop-0.15.3-uint64-thread-id.patch 1548 BLAKE2B 2d1af0cd42f1911e2296db843bace2c3281e9defff1b174a7ca3c2bf651af2b9149b4066e9e252b216a33751591e0e15afec035142c35dac2bce7683c52a48e7 SHA512 0ae9fd1210d80f8efdf1d29b84450c60578848467b49616e9c5e71476779972e94ccebe13d99e74cef99ea59cf50617a8152a1768a0c14b812036310b403a55c
 DIST uvloop-0.15.2.tar.gz 2092589 BLAKE2B 05c518ba5854fa22fe72a0224856fa0529af0b9432f366b5b1cb0df09a92c787425713fadb85b151363df28800a94ed2a2ad617aaa1c4e854586e49d16f7dd1c SHA512 e398c7ff85da65344a6ab637e9b2f560e9ba61a3be7a3138d546138949359e30bc2e5f8268f1569b73c3881c66d71cf6298038ca1a883be71a33d7ef86d09eed
 DIST uvloop-0.15.3.tar.gz 2094066 BLAKE2B 77ae4634ee31211dba13f41aede4480d70271e042a30a1268e9ad18f5de2b296b84931fb6b2022d2351f33521a84264f74cbc30caa5ff84b0f429bc9f1d426a0 SHA512 5687371a13509bdac0ef7a5ca0f7c78b54d0d9225cbf68cebc6d4fdf3807c2e3346579f5440eb0ff6578088780cc5efb09fba114da0bc0e60ad3f607d9df652f
-EBUILD uvloop-0.15.2.ebuild 1179 BLAKE2B 90824270e60d1444e154fa694831fe6c9a6deefa790babfa7afc8deef627295545da7d966998165db1ebff37ed7ad466fbede4ecb13fce22586858ce3b75d335 SHA512 1df3a69ed7cf55669219004c1ed4c620788cee5a9f009e906575aadea9babdfdf61c549b1c850977ac4cb97e4c533d1644de6151d571bbf801b99f6075ad32e3
-EBUILD uvloop-0.15.3-r1.ebuild 1368 BLAKE2B dbc27abde002b5db0cb9034f092909bb2b5faba902c0de5025c7ea88a91998188a1fe4b5bcaac7ea989ebb1c32b95794615170fa6766c44216fba53a6ef80e63 SHA512 997cb0ae5f2e94e424f5f8f06b6ebb8d750f90a06113607c332cf11121e9ab232bb20a1479087921b8a485bc303a1c4232bc17b48917a0b99a39f4180dad7e1c
-EBUILD uvloop-0.15.3.ebuild 1187 BLAKE2B ee17834d7053f51fea2ab82738e4da26b84709d0f97558dc759f9ce7e0f9da6c465cfa85c30423a85ef21f5732229a6ee117ceee04d9d94c7d579d671c9bbe57 SHA512 73a371db1120e099db3e18926e63902698b2a5594233662efb91bc11549de7f9d2904476c7dde83e1a185a0bb22687e5aeb341ff8d44c2c0ab758ece9a0afe38
+EBUILD uvloop-0.15.2.ebuild 1186 BLAKE2B fd0f48927d952bc9708aa93a987a64b5d0eaca3af5394c4874a2fd31212c0d89114da7cc2c92374999a60b8d822e3b22375dfe60832170e02d29e2b891fbfc7f SHA512 682e85299f491a92eed9c5c06baea83778e748c94e2d99240db0c07866829655f5b351aaebe83fa93fede258f42709b6c411df5f5f2d999988af7dbbc631088d
+EBUILD uvloop-0.15.3-r1.ebuild 1406 BLAKE2B ba8d047185aa66f1048ff6fb5f31247e964f48ee39786ce3962177b4b503b12563342020501312e90011b88e265fc4681474a3153548afe225dd9b572284d204 SHA512 6fb3967147daa33b6c9aa00cfd7c37faa2aaac9fdc1554d2be1b21b5c71aada4c2df83723079f3ee4a69eabfadb0491ccd4702f60dc6c6bb8ae8a3daf116d47a
+EBUILD uvloop-0.15.3.ebuild 1194 BLAKE2B 6af2b9ff94aa9213dc90d430e2f814795e0737770d4d8d05e2283219bf1837437cc1dd180a677b6acc3796b2b30cfe5b31835ff892b1f3cdcc5be88aa6f8c645 SHA512 cb50ec260320f110e0a393bebbe0bbfe63f5f815aba8b0c58bc3f7cfa30ee52e5b93460ae9fb1d3579e474c9a7881a269a6f57eabf18de707e5b97b7f6976878
 MISC metadata.xml 526 BLAKE2B 1c5d5ffd994ab70aae22d5a6312708a168f89790a5999d81ccf4eab552e910fd063ace9f1e51d1b477ed96604a23265f586781feb7b692d1f49a0c502d59dd3a SHA512 e38163d8b0b033c5825d4f977cb58bc727195a7e577eb229a70c4b089943ad99f4c8121e0d4e209db51fe2977ffad2f88b8bfae3baedd853eabefabb15578b85
diff --git a/dev-python/uvloop/uvloop-0.15.2.ebuild b/dev-python/uvloop/uvloop-0.15.2.ebuild
index a85e64a2ad6e..b10e112d367d 100644
--- a/dev-python/uvloop/uvloop-0.15.2.ebuild
+++ b/dev-python/uvloop/uvloop-0.15.2.ebuild
@@ -3,14 +3,14 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 inherit distutils-r1
 
 DESCRIPTION="Ultra-fast implementation of asyncio event loop on top of libuv"
 HOMEPAGE="https://github.com/magicstack/uvloop"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 -riscv x86"
 LICENSE="MIT"
 SLOT="0"
 IUSE="doc examples"
diff --git a/dev-python/uvloop/uvloop-0.15.3-r1.ebuild b/dev-python/uvloop/uvloop-0.15.3-r1.ebuild
index 4c2a70b59ede..ca1f98ca45b5 100644
--- a/dev-python/uvloop/uvloop-0.15.3-r1.ebuild
+++ b/dev-python/uvloop/uvloop-0.15.3-r1.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Ultra-fast implementation of asyncio event loop on top of libuv"
 HOMEPAGE="https://github.com/magicstack/uvloop"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-KEYWORDS="~alpha ~amd64"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 -riscv ~sparc"
 LICENSE="MIT"
 SLOT="0"
 IUSE="doc examples"
diff --git a/dev-python/uvloop/uvloop-0.15.3.ebuild b/dev-python/uvloop/uvloop-0.15.3.ebuild
index 3ff9f3019ff5..14bd0d99ccb3 100644
--- a/dev-python/uvloop/uvloop-0.15.3.ebuild
+++ b/dev-python/uvloop/uvloop-0.15.3.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Ultra-fast implementation of asyncio event loop on top of libuv"
 HOMEPAGE="https://github.com/magicstack/uvloop"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 -riscv ~x86"
 LICENSE="MIT"
 SLOT="0"
 IUSE="doc examples"
diff --git a/dev-python/virtualenv/Manifest b/dev-python/virtualenv/Manifest
index 121cec59a413..f89901e2be45 100644
--- a/dev-python/virtualenv/Manifest
+++ b/dev-python/virtualenv/Manifest
@@ -3,5 +3,5 @@ DIST virtualenv-20.6.0.tar.gz 8700762 BLAKE2B 718bbfda175ab4ef0820ba66b480060c03
 DIST virtualenv-20.7.0.tar.gz 8714219 BLAKE2B 81b5ee144614a7c854e03599270d03454f991520e8381b98ef01b64e91bb7520a3949e5af9710ceb6292be6b7b7e3738ed7a08324b5ada37f8f4941b408fb425 SHA512 af0f993045013814d9397419fc9d789a1ad64dc53818cbeceb5146e418a8535f76b74ed36b4b164d6974660be77de91cda244eb70b810c8c9fb522ba1088813a
 EBUILD virtualenv-20.4.7.ebuild 4256 BLAKE2B 8fbe67f90a9b7079b5eb6b6e9c6c28fcc887fdcfa1bf31ba9fa02c62166ee8f7e42d1a98336110d452907133a0d75892b7d28c202a8075f88b32ac354dd57ca3 SHA512 db31bfb20d836ad986acff3b6ff5d16ef00a78379b02cf7d6be853aaaa08cbcbfcd7de106d47d398e9b8125644fc9daa164bfa6cb09a302e1f3135b709f38bb3
 EBUILD virtualenv-20.6.0.ebuild 4276 BLAKE2B 6533c59050af3916bdf02e38671cb6fa6558bacb9ca47af9a9282594fb5d97d3c8eb405db4c6f41a180203ba54dd77066f7bab75deebc8a101d078b22e8dd5c2 SHA512 f49d6360516804b898fa90bfd4a0592c58ed224e1abea528730f041e7f3cc15d68bf2628323feb5c05f724fdb1c085dd940ffdaedceae7010551f6ebc00d08d0
-EBUILD virtualenv-20.7.0.ebuild 4223 BLAKE2B 750a8ba95e246111f3d7f59db4f724caf2b395d850bfc6bfd3197ae986515ca9aec1ca1ab0f33337c23cafc0dd8afd1a013d0650e5c6dd03b6ce9b982583408e SHA512 d0777e46b38b8f0cd8b986fa506a2500f0a694ecaaeeba5d6d08cad60e79bc364369106cfe88b89b9785ddcddbd6107ba1651dc94e2efd128d0ec8c96179670e
+EBUILD virtualenv-20.7.0.ebuild 4254 BLAKE2B 001e09ffdad208c5386993419b56dd0f0c35504d6591896a306b39e70f01ecbc0f47ef800f8b50bb502ee10eeb03d952d7c65cd6ec94823450c7b8d83c2b4fca SHA512 501bb46fb0e7ee7fabba977a25a4ab8b4168e18e5655226900320543e15dd95f84d0932bafd6a5230f3e7424e66c560ba853cc515cb2995dea7dea020595abad
 MISC metadata.xml 405 BLAKE2B 65152299182652973b0a6387a690d6e04066d9ac05167d6f0ef7d27036813a793503d16e65514093869ed596227123f493dfdba021a094b0021b6c5b98cc0cf7 SHA512 13db4a863e2a82bae1d177967fc45821a59fddc9afc5c9bbbc0abf64fd2c57cb1f7053443d4721c3c91b6562c1b3844560fccc5853f14bce387aabc620167eb6
diff --git a/dev-python/virtualenv/virtualenv-20.7.0.ebuild b/dev-python/virtualenv/virtualenv-20.7.0.ebuild
index 848d5dc99614..1c6b72d16019 100644
--- a/dev-python/virtualenv/virtualenv-20.7.0.ebuild
+++ b/dev-python/virtualenv/virtualenv-20.7.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 SLOT="0"
 
 RDEPEND="
diff --git a/dev-python/websocket-client/Manifest b/dev-python/websocket-client/Manifest
index a480479f1b94..8b5e69b1828c 100644
--- a/dev-python/websocket-client/Manifest
+++ b/dev-python/websocket-client/Manifest
@@ -1,3 +1,5 @@
 DIST websocket-client-1.1.0.tar.gz 58890 BLAKE2B b7557f0847ee4ec31279d98661f2370f32eff35de5ea6207abe4afa6ef7314258da275d823487773722ac717888ca629284ef92870b5880fb385f7fb677506d6 SHA512 6f4b963455bdb6a0e0defff92a6b898ee4bdf605c18fef7e25e18e2c72a2ae360d760c2069a0ed330e5dc0f3347f16a9129c405d5c98cd2d56014f8636e7d5b5
+DIST websocket-client-1.1.1.tar.gz 59092 BLAKE2B c71e16e427584434781fe407f3185ccfc9fed3e638ef7374752584e35623f56c082ab7a4e7ae01038025e0435b24b567bb9a2abe4da50800f421930c982e4b39 SHA512 f4ed98180910068415ed3b66b70091491d6b11098c32abd9bfc0f8e0d4cb5a25df096c9437fb59c66bacff66440f9422b3f67bf43af746019d74b17d7bcba474
 EBUILD websocket-client-1.1.0.ebuild 761 BLAKE2B 09a7a7ec1110f0d9b5c43504139c555f2777d2f3a12071daf6900ea9210d18d620506b7795f2e11ae353e32b0453557cb8bf901d2aef36027c000958c9b85495 SHA512 1607c7cac20dc8e8b8b6be41bf74d74acaf607c51ddef355b85e5565c5094355d69ecec545207ad248387a75b756de933fc2b0cff4b9df687c9e33a2fb233268
+EBUILD websocket-client-1.1.1.ebuild 639 BLAKE2B 04289450b50888e60941274005cac6ad16f5c09738f0cb48138ed4cd011d54fda4d995f5136cf7d99804a73a2894f1e93c53ce988c96bbcb9b022f6f36286265 SHA512 e27ec163137610e1ba1123227fc5e38c0d68f9ef3912dae0cc233e53bb0933b3ef3c9f3b92a5b3b3bbfea11898debdfc9aac74f2a65998c0e21432eedb1c3846
 MISC metadata.xml 497 BLAKE2B 1a68fcd42a257afae80db03043a732a321079f146c252a89d1c5399bc5800a5475fd36f31cef381544c9592e39a86c14eb5334ab1800a5191b0f7ec9e0806f19 SHA512 ce4184c2e87f87cd787cacf1c7b566df2fbf7dda97a6b6639e02c003ede6ac5b90494eb9b3b509c303a56fc4e829acc05ec9d3d01846e85b233a561d1cdbd5b4
diff --git a/dev-python/websocket-client/websocket-client-1.1.1.ebuild b/dev-python/websocket-client/websocket-client-1.1.1.ebuild
new file mode 100644
index 000000000000..73166b2954d2
--- /dev/null
+++ b/dev-python/websocket-client/websocket-client-1.1.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="WebSocket client for python with hybi13 support"
+HOMEPAGE="https://github.com/websocket-client/websocket-client"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
+IUSE="examples"
+
+distutils_enable_tests unittest
+
+python_install_all() {
+	if use examples; then
+		docompress -x "/usr/share/doc/${PF}/examples"
+		dodoc -r examples
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/websockets/Manifest b/dev-python/websockets/Manifest
index ce828ab25a1a..0443e6e23de1 100644
--- a/dev-python/websockets/Manifest
+++ b/dev-python/websockets/Manifest
@@ -1,3 +1,5 @@
+DIST websockets-9.1-python-3.10-support.patch.gz 6940 BLAKE2B e4835c7d5efaf956d07b884c85e0b95f26674bf36164fa8362d1c1a564a959bde761d25e747333c58864f74a5ea1b199f228a46ec6a1647c5495ea032020c179 SHA512 7fb4b298a9167c8d913e293fa7549b21d5acb333a5b97e0624a22cb83548ef548b819ac23750c40295140b6f83a701c73a81fdcaed3ab8e704dbee8e17d22f1d
 DIST websockets-9.1-src.tar.gz 191813 BLAKE2B cb3807f01e1a4c22a40bf5150d1e8b21ca786dc5bc4da8f3e6602971f3f7c79b57092f5ddfe3ee52ec00e7fd15f3a992fdbb94b5e26599f2621a7f51434ba6dd SHA512 ff2907a913ff0b8ced6dda72b6fc6512a2ece3ffded2e2dcb8ff6805de9ad504430cc1871c1f6e02ab8069e7b96b2e7609afaf3c9c25f9271b28e2daa72bd3ac
+EBUILD websockets-9.1-r1.ebuild 936 BLAKE2B 0a9c53c5a15a9b6d6b4ad2a16cb31dfd3c445346d7352bae307f4a6334cb06e869f7dcf55704d1a1e08319d0bacb5899436e2529bc4919a14f2f1acca51092db SHA512 93acf9b63835c187a0a79c1ea66a1f116aab90f77570a799de887680436d9215062fc2358f5a7e368d5a8442b9423d123c01d7d55091033cdef4ceb3c1b8662e
 EBUILD websockets-9.1.ebuild 711 BLAKE2B 76b5e96b67135d5173709b1ea9ebd459595a26986fe8f522434a8b744fa5b7faf21e80480323b0573ceb4b4656c9e65d3ee91000937d184a99a50c5bc5697c78 SHA512 c097db15bf8ece86b4595078699f9644ab2026dd215288fdf202aff356c88d3bace38539cc280f4efcd2c467d0d17d26e4ca1ad278e4b7f89498fa2fbf034f93
 MISC metadata.xml 487 BLAKE2B 7d67f4b4e650d1cc83e80eb7ad5020ef997f92997d94f19274b7e0c794f9efdb3d085faa8582321f0732cf489a5358310368a2e22b8e471d815bc9b09a16f47e SHA512 6b88582ba918dd95faa5b7e3d4aeb59f7ff455a509c018c61f61a1d2e9f69734c9d02c9d666447ea787f771fd13b44f7a54b0e6147703187a7a9fe9fccf186e2
diff --git a/dev-python/websockets/websockets-9.1-r1.ebuild b/dev-python/websockets/websockets-9.1-r1.ebuild
new file mode 100644
index 000000000000..4fe1b8159c40
--- /dev/null
+++ b/dev-python/websockets/websockets-9.1-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Library for building WebSocket servers and clients in Python"
+HOMEPAGE="https://websockets.readthedocs.io/"
+SRC_URI="
+	https://github.com/aaugustin/${PN}/archive/${PV}.tar.gz -> ${P}-src.tar.gz
+	https://dev.gentoo.org/~sbraz/${P}-python-3.10-support.patch.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+
+distutils_enable_tests unittest
+
+PATCHES=(
+	# https://github.com/aaugustin/websockets/commit/08d8011132ba038b3f6c4d591189b57af4c9f147
+	"${WORKDIR}/${P}-python-3.10-support.patch"
+)
+
+src_prepare() {
+	# these fail due to timeouts on slower hardware
+	sed -e 's:test_keepalive_ping_with_no_ping_timeout:_&:' \
+		-e 's:test_keepalive_ping(:_&:' \
+		-i tests/legacy/test_protocol.py || die
+
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/wsproto/Manifest b/dev-python/wsproto/Manifest
index 625c868fa4fb..10eb5e6c7f93 100644
--- a/dev-python/wsproto/Manifest
+++ b/dev-python/wsproto/Manifest
@@ -1,5 +1,5 @@
 DIST wsproto-0.15.0.tar.gz 51765 BLAKE2B 6eae2d2ceeb2d1e870c1ca70db22708fc2e5d10aac6b1d1a44ab00f4b31e18f21fd324c7e8c95e28769f4642601b775dc687eb28b419c5698ed68e617d054599 SHA512 c9666ec65374181da762f460f0c394a5bb599f8a0666989fb2d53e5e8822f5ebdd28eae3098e115d5bbacf6d6e1dd33a9cfeb808d569e1a01025eefaff18c531
 DIST wsproto-1.0.0.tar.gz 53423 BLAKE2B b4cc8c1ef0ccf324821b893b57fc86ab744c639dd07604618485004ef56ca105b5515e1f34a08ccc93de941b1a93eb76ef0d1946f11e05f80d40b98bfe7e4c56 SHA512 36f8c4eebf84bfe869f7124330898d22416b423f47396f2e3f72069e14f1763514e1df700c3e8ee81467cf973197e10143e088978d0688930fa98518af8773fb
 EBUILD wsproto-0.15.0.ebuild 507 BLAKE2B a010d403ef7e818dc7577d45898ed3ccba0879182f935c1cab9f55549ad9721413c7828f769562bb0f52dbe5c74a6822980b3b5d329acf5e9859f8046f75d6f3 SHA512 5b57c2fe1a79e68e245e58415071cc73cad18a8124b72d58af71307d3633d7aa1fc90f7f0e0eb6076fc97307ee2b5e4f5e0c3a1b36d5b0a7d56fe5f5d8c871d9
-EBUILD wsproto-1.0.0.ebuild 532 BLAKE2B 5d7d0c1e3d59e29e080fdb685197ef6e1bb1189bac66744ca29c91e6c31ede6672cda5a04d1910db4a93f037a255868afe782f2778194a347e289daa1e8176c6 SHA512 81c5b2c440fcefd5f3d3bfee5401e1c55a69db9a7b649b61dab2f0a7bd542c591a816d4d1d0e8783ba7f0ed750d77a333ab3b07ebce3c38d83630c5049d61328
+EBUILD wsproto-1.0.0.ebuild 532 BLAKE2B b39eff2ad82384e1880240f7cd489d6700a4c8c0ff1abfc1a13af7da4e22e86d76a93af17b09015177b055ab98796bfdee6b7da37249670d19b4e49c2fa494ed SHA512 80d128d5cda2c6a5f4586191528852f077e41162b2a5977145099606d40f58e05b849bd2b2fb41381e21f5709e87fe638080feacf6e518659126af0058f3bbf1
 MISC metadata.xml 493 BLAKE2B 82485e0fa56d1f0e3e1bd3d6f54c929cacd58055d0993520134ed7bb74bfc34a990e65303b33ad2ec74c625f8c4d14f9f4e65a1c14e063995ce20a7bc6ae82b6 SHA512 83ef31eda65a98f50ee0e800cbb358b49f579ed893cd5cdcfb38a0da79b62a1359453127140dfce971b9dcbfc7da9efa83fc1426cfe40167f0ee987d0b9f9c56
diff --git a/dev-python/wsproto/wsproto-1.0.0.ebuild b/dev-python/wsproto/wsproto-1.0.0.ebuild
index cdaaf69cb505..488a8311e788 100644
--- a/dev-python/wsproto/wsproto-1.0.0.ebuild
+++ b/dev-python/wsproto/wsproto-1.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/wxpython/Manifest b/dev-python/wxpython/Manifest
index 3dc95f410c22..3e5c57755aba 100644
--- a/dev-python/wxpython/Manifest
+++ b/dev-python/wxpython/Manifest
@@ -1,6 +1,5 @@
 AUX wxpython-4.0.6-no-webkit.patch 1411 BLAKE2B 222f85e79f55420ca2b04b3ba6a30293646f84894a45ac2b72852e3f72f187e333b2efd6d76cc02c5996ae75725ef40e882d45012c492b7f3a478666a01d0189 SHA512 82539d4ec63a8b21576de38b17fe2fdf095443b4cfeabf369c443d818ce402e62dcf257ccba022c3b0d671f914f5ef88e4ff40b9fc7d6276493c9a8caf2b76fa
 AUX wxpython-4.0.6-skip-broken-tests.patch 4113 BLAKE2B 920f1c0c6e1154de83c412ffdfa4b3276d01a5e9be8998be42634368f34217bd5b6505abced2ec3479b9ab4f40a5697405983740e599b76be1725bb963e3311e SHA512 04201012f1cc16913ff53a9d4868dbdaa6915b1a3a33f0342572aa56741207b6de6e274b91cd26a06511ae8d79d7fef247c2cababafd57130417caa4463a409a
 DIST wxPython-4.0.7.post2.tar.gz 68891167 BLAKE2B 77eb69f7a59e5be81c3d17b64c76e09a43efc9226bd87fd058483185871a95ce05dbb65614ec8b003edf52cbe1cb1a115856c0d622170c51ecacbb952106fe22 SHA512 7af89db90a0f7e6b644d61c1ede01ec36a2c295e46d44692ae9dbc4af923310c1b498a52f45b02a89e8917d844c6abe67e5f3fdd9c1d51da3312899319a349e4
-EBUILD wxpython-4.0.7-r1.ebuild 2310 BLAKE2B 90fb0b24c3aeb64693ed7b62541b27775192630ab49ce18b83f68fb2e8db1d7aac4b650d2546d81e487068955322d415e786088a7390d429431749b9cd557472 SHA512 75113ecf7f1d9cf8d6f35ef78ff18bd5ed9f27b41a1f8534da526f34fbaac3d6b08917ceb29f4394193bd621bf276256a8456d300c0f4eeace3834e57c09cc9a
-EBUILD wxpython-4.0.7.ebuild 2273 BLAKE2B faf2c0361be73a32f7a27b5010e4fb66c0a7cfb899046f34373bf3c30c344317226bd0c12f1db0c71194084368f8bdb59eaab675fe91153ffc32d52eb169aa21 SHA512 52fb7e58b05874e3f878a23f1c7a27ce7795f89d58ad11bddfd50a30106191d0af034ad0a99826b6303a2de265c16b2a1334e5bdf1b65f1016e20e76d9889ed5
+EBUILD wxpython-4.0.7-r1.ebuild 2309 BLAKE2B 0854dde5690dd6db4012b788d0929f29560f52ac26f540e1cdb1500c9e7130833c945aacc287c1bac6042e083286446baf94782735e792f99a5e9735e8cc706c SHA512 ffd1ffa380753dfb844c0a57921973cdd643a5b1eabe9a404c03f1b66547c4f220d302e2bb6686c8b83b355dbc508f80cc521a14bebc33556f045d6f6034fe94
 MISC metadata.xml 490 BLAKE2B b268c95de8e09d5027a6dff7413f8e85030c64610f0f5739321bca1c66892981e2e4273e3e4fc92f3edbbcee1d2ede23a366dfec9ffbc17c8b015b784847755f SHA512 a33e6390e4cfcedbe7a2e950b1f447195f439747e37acfa6ad234b58fd449d80b16d342213e5190fa3143c71a5e95861f11daff1b61fcb5015c3a5255a27cadb
diff --git a/dev-python/wxpython/wxpython-4.0.7-r1.ebuild b/dev-python/wxpython/wxpython-4.0.7-r1.ebuild
index c4eb46fbce64..cf5ea393f6b4 100644
--- a/dev-python/wxpython/wxpython-4.0.7-r1.ebuild
+++ b/dev-python/wxpython/wxpython-4.0.7-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${MY_PN}/${MY_PN}-${MY_PV}.tar.gz"
 
 LICENSE="wxWinLL-3"
 SLOT="4.0"
-KEYWORDS="~alpha amd64 arm ~arm64 ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86"
 IUSE="test webkit"
 # Tests broken: #726812, #722716
 RESTRICT="test"
diff --git a/dev-python/wxpython/wxpython-4.0.7.ebuild b/dev-python/wxpython/wxpython-4.0.7.ebuild
deleted file mode 100644
index dcf072142cb9..000000000000
--- a/dev-python/wxpython/wxpython-4.0.7.ebuild
+++ /dev/null
@@ -1,89 +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} )
-WX_GTK_VER="3.0-gtk3"
-
-inherit distutils-r1 multiprocessing virtualx wxwidgets
-
-MY_PN="wxPython"
-MY_PV="${PV}.post2"
-
-DESCRIPTION="A blending of the wxWindows C++ class library with Python"
-HOMEPAGE="https://www.wxpython.org/"
-SRC_URI="mirror://pypi/${P:0:1}/${MY_PN}/${MY_PN}-${MY_PV}.tar.gz"
-
-LICENSE="wxWinLL-3"
-SLOT="4.0"
-KEYWORDS="~alpha amd64 arm arm64 ppc ppc64 ~sparc x86"
-IUSE="test webkit"
-# Tests broken: #726812, #722716
-RESTRICT="test"
-#RESTRICT="!test? ( test )"
-
-# wxPython doesn't seem to be able to optionally disable features. webkit is
-# optionally patched out because it's so huge, but other elements are not,
-# which makes us have to require all features from wxGTK
-RDEPEND="
-	>=x11-libs/wxGTK-3.0.4-r301:${WX_GTK_VER}=[gstreamer,libnotify,opengl,sdl,tiff,webkit?,X]
-	media-libs/libpng:0=
-	media-libs/tiff:0
-	virtual/jpeg:0"
-
-DEPEND="${RDEPEND}
-	app-doc/doxygen
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	test? (
-		${VIRTUALX_DEPEND}
-		dev-python/appdirs[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}/${MY_PN}-${MY_PV}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.0.6-skip-broken-tests.patch"
-)
-
-python_prepare_all() {
-	if ! use webkit; then
-		eapply "${FILESDIR}/${PN}-4.0.6-no-webkit.patch"
-		rm unittests/test_webview.py || die
-	fi
-	# Most of these tests disabled below fail because of the virtx/portage
-	# environment, but some fail for unknown reasons.
-	rm unittests/test_uiaction.py \
-		unittests/test_notifmsg.py \
-		unittests/test_mousemanager.py \
-		unittests/test_display.py \
-		unittests/test_pi_import.py \
-		unittests/test_lib_agw_thumbnailctrl.py \
-		unittests/test_sound.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-src_configure() {
-	setup-wxwidgets
-}
-
-python_compile() {
-	DOXYGEN=/usr/bin/doxygen ${PYTHON} build.py dox etg --nodoc || die
-	${PYTHON} build.py build_py \
-		--use_syswx \
-		--no_magic \
-		--jobs=$(makeopts_jobs) \
-		--release || die
-}
-
-python_install() {
-	distutils-r1_python_install --skip-build
-}
-
-python_test() {
-	virtx pytest -vv unittests
-}
diff --git a/dev-python/xmlschema/Manifest b/dev-python/xmlschema/Manifest
index 2729013bdf08..3b653ca08013 100644
--- a/dev-python/xmlschema/Manifest
+++ b/dev-python/xmlschema/Manifest
@@ -1,3 +1,5 @@
 DIST xmlschema-1.6.4.tar.gz 369270 BLAKE2B f3b98f0b8b4446dfa67da778c6b63585a894f4dcc9fd7ea98637ccd54b26e63aebc7f3fbc00e13ce43730b88da0f773a491917d5eae9301b5d22f6efe620473b SHA512 7e13d20a6add1cc5b6d0f732e672be3eeeb2f107fd2031cd5c22d1059d24b7d818c534817ea115d0c5f011727175bdcae71a0b8d55f1d6bd263a7e38286c26fc
+DIST xmlschema-1.7.0.tar.gz 370433 BLAKE2B 0270151705ca65d4b0f587e2ac75f7273a20242a0a315b4b954a6ccad6d46d7d093330a4c40d74a44c0c55af021da1c4ddde85f8431e0779d30e2164a599a335 SHA512 c4620f205cbdccef95a38eab6e6a5d6082681e3ff71708376f0ddeecd75a5c53f686fd740a41e98afd2ec5ec0f14be913b6c65bce80fab0143fa5fe1cc8a2ab6
 EBUILD xmlschema-1.6.4.ebuild 779 BLAKE2B b122698cef27e5e87ea640ba5c33838efbec2ed1f70373637046b666ac829fdf8583368d4ac325a02f782eb0b25771f7aabffcf3b2b5a2c4f281ec97c7e27f26 SHA512 392c42ad67bf932549a56d1f2de75871cf8f49739c110d84e4d61f5db02ed410d3374ecd2612288552b07dc87f0a0d7ee1af2d5c3f763c521031f14c2a9b00ec
+EBUILD xmlschema-1.7.0.ebuild 787 BLAKE2B 03aa4c39550d304c71c4a17be07df8ab34db4e86f6678d68bcd6a855e86c861109fa6efe4049a2f95862c78cdc20c1c6eb53d04f6a7592d38a6a1bdeeb68f5a8 SHA512 8c3306d60dfcdd48515c7f3968c4c3c424793428f5b5e2121d77fed159ea6b3cf6a38d5a1207f22964543e7002f66a4e65734d57d796374d2162ccd19d9871c0
 MISC metadata.xml 375 BLAKE2B 16a422a1beab981008ef66eccca94cace74cb244fb6123d2495e13045b4c786bf00f2807d3ac73e98f1c962fc0ccb7f7aa84f565dff54e2ef2077776a85bd479 SHA512 db2b030851d7357aea0b41066bcfa36b9ae81c745f413a3cdc1a528a38f2ea1a8c7876abff7f139801185f075be9e841d637f238b9d3bc37fa212f13c06ec411
diff --git a/dev-python/xmlschema/xmlschema-1.7.0.ebuild b/dev-python/xmlschema/xmlschema-1.7.0.ebuild
new file mode 100644
index 000000000000..be89448c38aa
--- /dev/null
+++ b/dev-python/xmlschema/xmlschema-1.7.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="An XML Schema validator and decoder"
+HOMEPAGE="https://github.com/sissaschool/xmlschema https://pypi.org/project/xmlschema/"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/elementpath-2.2.2[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/jinja[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	"${EPYTHON}" tests/test_all.py -v ||
+		die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/xxhash/Manifest b/dev-python/xxhash/Manifest
index 086c676173fa..02eac696388a 100644
--- a/dev-python/xxhash/Manifest
+++ b/dev-python/xxhash/Manifest
@@ -1,3 +1,3 @@
 DIST xxhash-2.0.2.tar.gz 64283 BLAKE2B 01fe9868b45f0be762c233a80b550e4069bd7f259fac8aeb90407864ac1fa6cda314880c87ce03d8854bedbecea1eba665ec4e00b27b68a8573c398238c5ce97 SHA512 8908e78207ff7b835259e359e2617f6b96555bd9dbc5bb079c850e9de22fd33c15396fbde0cd824cf8af2a195217f3ddc1aa8e62f1ed4071408b4a29bab31f2c
-EBUILD xxhash-2.0.2.ebuild 591 BLAKE2B b042cdc1a8c5362b80294da4d10e3b3150777cac4c8b61c5d16d8d1f222465019a14e41d57670f9582cb78a90c0c2119b75a1113e8f7eae6bd25dcfc76005dba SHA512 573f721d3c20fe7b330679c5a2c2b1805cf010e645eb69af552c04b015e7bfb5be579123e89820162635e424b1fbe1716313d306247546166d68d2a57db0981c
+EBUILD xxhash-2.0.2.ebuild 595 BLAKE2B a6340f3c9f22ccfe8f0d0d75944043351e85b3503f0279d90bffa617626f14e4d7c316d5b9ec1e9074ba533698ebb919754267b6e1b94a28e01e89473c836b93 SHA512 0f7228c525b072b1b123f4d53626d1109f1a0072c482d359e573418a529dffff86a5a78da301501dc8a24d407e0789e7ee489fdb9267b316871346e5c7cb7dda
 MISC metadata.xml 459 BLAKE2B 6d21bb3d1d6c87afa60f906321f40e0cca071167ff256655a1d16357cf2104850305ed3fe3e4dbd9a3d8c40876e95f2e295f9519f159e2c3228eb492b9063094 SHA512 6ae6d99e9495dca1a0615d0ba908f01454fed46abfb8fee74bb8b00ea73d4f2ab335abaa729b42cd0beecfb61b0a1d123085d28642fbab50ddf031f8050a704c
diff --git a/dev-python/xxhash/xxhash-2.0.2.ebuild b/dev-python/xxhash/xxhash-2.0.2.ebuild
index 57d6734c93ad..b13178e0671a 100644
--- a/dev-python/xxhash/xxhash-2.0.2.ebuild
+++ b/dev-python/xxhash/xxhash-2.0.2.ebuild
@@ -11,13 +11,13 @@ DESCRIPTION="Python binding for the xxHash library"
 HOMEPAGE="https://github.com/ifduyue/python-xxhash
 	https://pypi.org/project/xxhash/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-LICENSE="MIT"
 
-KEYWORDS="~amd64"
+LICENSE="MIT"
 SLOT="0"
+KEYWORDS="~amd64 ~x86"
 
 RDEPEND=">=dev-libs/xxhash-0.8.0"
-BDEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}"
 
 distutils_enable_tests unittest
 
diff --git a/dev-python/zeroconf/Manifest b/dev-python/zeroconf/Manifest
index b8efa2b75068..9718478fe23e 100644
--- a/dev-python/zeroconf/Manifest
+++ b/dev-python/zeroconf/Manifest
@@ -1,11 +1,7 @@
-DIST python-zeroconf-0.30.0.gh.tar.gz 64301 BLAKE2B ea0d5e36f3f012f217cbd4eeff0a9cd366496e2f64b06112ee3629ad016c8e28877f62358d5b5fd27387cfe474e488e99a9ad8ca1802f6d23612f99310243c57 SHA512 1f3165500a07525ef182bb60c1804fe2002a33a9f800470bdb32bdfd44a1b8f466a818a4390537674952159e5c0e257cf9e4ca570b1a9936e1cf8be294be6311
-DIST python-zeroconf-0.32.0.gh.tar.gz 115276 BLAKE2B 7084c02f989ebc6db6686b82ce3212158595b87e00567e4857e84790a30a2fa6f688288769d1eb118da485a6755da1ef404765070d26905d10ab45b1d95ca849 SHA512 6a612b39be85e673cffc560ea5bcc16facc5a16a370ff6edb1d4f7ff978a01d6ba249a9b313caca3b3ed0c6463a4914a98063eb89f28268cec1c9a2faa4db611
 DIST python-zeroconf-0.32.1.gh.tar.gz 116507 BLAKE2B 03de415620745b75cd43be74b724faf909aad9628175f18cf4b2c04245d02adbca984eaa861e807729f36caa3feecab913f2e4aafcdd9aac1af02de6eeefbb3d SHA512 cefcd1abdc3ca2b5ed796aee09e6826c0d0f54343bdefbf45c425d6e033542dc061c84fb4438ba53774d87c6516801c6e2196c1e6cfdd9dbf9187f5d8d4b1b11
-DIST python-zeroconf-0.33.0.gh.tar.gz 118002 BLAKE2B e5bdf8011777f46207c7f0aafbf4bfc34e704b59e01fcecd93e2ca05154f836bbe206688242eb37578a0e3b6d462de86944bdc81b96b0f3613eed21e9d0b6be0 SHA512 214fc1b25e1b900b6745f808144c0a1d94102dbc30f1e6ae49dfbfe2e75e9611e33d1341d192641be363662a0259aa340f52fe20fcf2bd5cf1611e823754186d
 DIST python-zeroconf-0.33.2.gh.tar.gz 118266 BLAKE2B e239443c778d24895a830ac8d4f23be5eeac701b92ddf945efc955a731cbce62bea10243f57a0929ad21c4444d32c37b0a9e23b53e734362b9c6b9ce85e2eb59 SHA512 9631dc348baf028794934d826a1fd2e874cf9039e6fb1c93a1b9a8e2a95ae436ab2fc1a955e2d89656c37a56b71075b578857f6de041a7e61ff55c7a62a2a7a3
-EBUILD zeroconf-0.30.0.ebuild 1089 BLAKE2B c5aebaa0b0bc8ecf9a809bd2964da3c822c87e5ff35ade028ed69894a277a0cac2f20438a616695275f94c3e32d9ae20ed53451f76ae490588f9d41309d37860 SHA512 986a489207ea2c47bfd3cc02ff53a48e3f3925f6326f1c9911d2da4adc3619c53e671f25ad024168b048b93cef39b43d7f155c1baa379d791e1f06abb97c0aa0
-EBUILD zeroconf-0.32.0.ebuild 1165 BLAKE2B 310bf2df5ace5e3ece81e42e764d7cca4f3124608287e674a308acef4060592f93c2c871c8140aafbe52e4b79d6340053b704c91c5fe227b7cf204cf3e4ae2a2 SHA512 fd1e8e11d8381cdcb38bde8d0da2b6971c3812ec90c389750ec7d23166fbbc8a379f3739c0bc60ac3b810b64e97eab0da41080ed2bb5e27b892fe003c3cb5231
-EBUILD zeroconf-0.32.1.ebuild 1165 BLAKE2B 91a1aff140a3f8210fb902e61b5489312696a786b4b5995cb6c35e9fe2209a6f1128662967bf5da2fa6489cea7bba82f57e0412f6e22e5b70024c0440f63537f SHA512 b1b1908a3fc8b4279cd410f44c26075f80ec7953bc02d6dd4cd4e59c73d8ab00ca042012d08c3ff5a009ed27f6b2c0359acbbc9c525dbcda7744e478f4c89e9e
-EBUILD zeroconf-0.33.0.ebuild 1165 BLAKE2B 91a1aff140a3f8210fb902e61b5489312696a786b4b5995cb6c35e9fe2209a6f1128662967bf5da2fa6489cea7bba82f57e0412f6e22e5b70024c0440f63537f SHA512 b1b1908a3fc8b4279cd410f44c26075f80ec7953bc02d6dd4cd4e59c73d8ab00ca042012d08c3ff5a009ed27f6b2c0359acbbc9c525dbcda7744e478f4c89e9e
+DIST python-zeroconf-0.33.3.gh.tar.gz 121202 BLAKE2B f457a65d26b58e4dac6c83b66be48e57ff0c34dd59dc3bfa008e2fd204f2f290088e6c784580114b91ddefce1cd2a3cea9310cfd4848c983c04749a1dbf3ebb8 SHA512 4e232fb9ad1e447333880d9737c3af3e9c652db2e0d7187d485cb6cdf8fe58076b78da4e1db3d2467b147c71343aeb18878f259bbfde6acd0faa3c4b9196222f
+EBUILD zeroconf-0.32.1.ebuild 1163 BLAKE2B 128ee4afa146f073b96fa6b4fa6e961319cc38997f0bada936b05d325c175ecc2063cca7e247a40292c41be35b22a7ff4f69813694655c96c8a3f35e8b065a89 SHA512 cff5c5f655f74230da9a2ab05d0cb2e767e78627ffd65e1f310f2aef54319f9216cfbb5d0fcb12707255a24b1e6c05272ce35e3771b1dd6c986f083fd16101fd
 EBUILD zeroconf-0.33.2.ebuild 1165 BLAKE2B 91a1aff140a3f8210fb902e61b5489312696a786b4b5995cb6c35e9fe2209a6f1128662967bf5da2fa6489cea7bba82f57e0412f6e22e5b70024c0440f63537f SHA512 b1b1908a3fc8b4279cd410f44c26075f80ec7953bc02d6dd4cd4e59c73d8ab00ca042012d08c3ff5a009ed27f6b2c0359acbbc9c525dbcda7744e478f4c89e9e
+EBUILD zeroconf-0.33.3.ebuild 1165 BLAKE2B 91a1aff140a3f8210fb902e61b5489312696a786b4b5995cb6c35e9fe2209a6f1128662967bf5da2fa6489cea7bba82f57e0412f6e22e5b70024c0440f63537f SHA512 b1b1908a3fc8b4279cd410f44c26075f80ec7953bc02d6dd4cd4e59c73d8ab00ca042012d08c3ff5a009ed27f6b2c0359acbbc9c525dbcda7744e478f4c89e9e
 MISC metadata.xml 412 BLAKE2B 70dd13f9065885850c7c24da7e1a0825a1537e452213847e00d8af9977818d6bfcfda9c8f9e0d0b2241550a95d186432e0072762a1b77e65b66441812b29651a SHA512 28bafc2919fa66c0f1e532798ac40c537a53c18e781590881116440886d09f5511425f2cddee912e3fc63ef92ee1a9c4da0f7f79cb44dab6e5f51d62202de844
diff --git a/dev-python/zeroconf/zeroconf-0.30.0.ebuild b/dev-python/zeroconf/zeroconf-0.30.0.ebuild
deleted file mode 100644
index 3c5bffd941ce..000000000000
--- a/dev-python/zeroconf/zeroconf-0.30.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
-
-PYTHON_COMPAT=( python3_{7..10} )
-inherit distutils-r1
-
-MY_P=python-zeroconf-${PV}
-DESCRIPTION="Pure Python Multicast DNS Service Discovery Library (Bonjour/Avahi compatible)"
-HOMEPAGE="
-	https://github.com/jstasiak/python-zeroconf/
-	https://pypi.org/project/zeroconf/"
-SRC_URI="
-	https://github.com/jstasiak/python-zeroconf/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
-
-RDEPEND=">=dev-python/ifaddr-0.1.7[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local excludes=(
-		# network
-		zeroconf/test.py::Framework::test_close_multiple_times
-		zeroconf/test.py::Framework::test_launch_and_close
-		zeroconf/test.py::Framework::test_launch_and_close_v4_v6
-		zeroconf/test.py::Framework::test_launch_and_close_v6_only
-		zeroconf/test.py::ServiceTypesQuery::test_integration_with_listener_ipv6
-	)
-
-	epytest ${excludes[@]/#/--deselect } zeroconf/test.py
-}
diff --git a/dev-python/zeroconf/zeroconf-0.32.0.ebuild b/dev-python/zeroconf/zeroconf-0.32.0.ebuild
deleted file mode 100644
index 0fadc7be4ba7..000000000000
--- a/dev-python/zeroconf/zeroconf-0.32.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-MY_P=python-zeroconf-${PV}
-DESCRIPTION="Pure Python Multicast DNS Service Discovery Library (Bonjour/Avahi compatible)"
-HOMEPAGE="
-	https://github.com/jstasiak/python-zeroconf/
-	https://pypi.org/project/zeroconf/"
-SRC_URI="
-	https://github.com/jstasiak/python-zeroconf/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND=">=dev-python/ifaddr-0.1.7[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local excludes=(
-		# network
-		tests/test_core.py::Framework::test_close_multiple_times
-		tests/test_core.py::Framework::test_launch_and_close
-		tests/test_core.py::Framework::test_launch_and_close_context_manager
-		tests/test_core.py::Framework::test_launch_and_close_v4_v6
-		tests/test_core.py::Framework::test_launch_and_close_v6_only
-		tests/services/test_types.py::ServiceTypesQuery::test_integration_with_listener_ipv6
-	)
-
-	epytest ${excludes[@]/#/--deselect }
-}
diff --git a/dev-python/zeroconf/zeroconf-0.32.1.ebuild b/dev-python/zeroconf/zeroconf-0.32.1.ebuild
index 0e1b2943b16e..8078abee7f30 100644
--- a/dev-python/zeroconf/zeroconf-0.32.1.ebuild
+++ b/dev-python/zeroconf/zeroconf-0.32.1.ebuild
@@ -18,7 +18,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND=">=dev-python/ifaddr-0.1.7[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/zeroconf/zeroconf-0.33.0.ebuild b/dev-python/zeroconf/zeroconf-0.33.3.ebuild
index 0e1b2943b16e..0e1b2943b16e 100644
--- a/dev-python/zeroconf/zeroconf-0.33.0.ebuild
+++ b/dev-python/zeroconf/zeroconf-0.33.3.ebuild
author	V3n3RiX <venerix@redcorelinux.org>	2021-08-07 00:16:33 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-08-07 00:16:33 +0100
commit	d162ba1860a88062f4cd61f8b52fc303ba0b2991 (patch)
tree	24cd2cf57f3932a24b96e4a0f6666489447e43ba /dev-python
parent	590b9b7b03bf4651e099949e318755af7cfa81b8 (diff)