gentoo resync : 06.04.2022

author: V3n3RiX <venerix@koprulu.sector> 2022-04-06 22:33:41 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2022-04-06 22:33:41 +0100
commit: e68d405c5d712af4387159df07e226217bdda049 (patch)
tree: 009ab0f3d427f0813e62930d71802cb054c07e30 /dev-python
parent: 401101f9c8077911929d3f2b60a37098460a5d89 (diff)
892 files changed, 11095 insertions, 6817 deletions
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 8b92233c37f0..15c53698c085 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/PyGithub/Manifest b/dev-python/PyGithub/Manifest
index aaa5667e1e83..6375a990aeb1 100644
--- a/dev-python/PyGithub/Manifest
+++ b/dev-python/PyGithub/Manifest
@@ -1,4 +1,3 @@
 DIST PyGithub-1.55.gh.tar.gz 3123996 BLAKE2B 58522db764b44286bb4b65cfa13fcce8fcaac99f1b71d62afe6cfda2bc8b13537de0b0db65e0cbc5c6e4a346cfdbf0084c0c8f4c13ed046d8bea33b10fa51382 SHA512 7ea9e67428e98330f90f1d78e5a003dbe1a6d5cd98b6c729f2030a73d21b4a72a7957382c888fac0b7bae4a409cfb53473a19e7e73df46b251df0327871e173a
-EBUILD PyGithub-1.55-r1.ebuild 811 BLAKE2B d11b64ea62d7483209afb3ebbcfe87d690eb07bf30f3f1d8961149cc89af7046b3b10505adec8b0a3c760d847e3bb3746179ba4c40b62bcad1dd98e673298cf0 SHA512 f0aee5f5fb05a863e462e26fba05ef5b2fd0a6a924ad7fc6179bf532c6f09c636f038a97402e4e200e5ba8808c090e75aa767c6109a7b708b271c381d938dcf0
-EBUILD PyGithub-1.55.ebuild 817 BLAKE2B ffd4f1a0d3b18932978169c40ea0da57088464e36492738637ce028eb98724c4ea9e284c723b79d304acc4a379840246418db9b5597ce920f64701a48b70442b SHA512 20cb8f97a44f7bb8d6ac335db8806c8598e2fe9916ab43907521e782c14c83f2f64873c8edcbbb070ec71126ac4a824363fc22660134713123198db0cd8d37bb
+EBUILD PyGithub-1.55-r1.ebuild 809 BLAKE2B d1f070c089a44dc8e187a4bf36bd63f17ce05d7bbc4d2fbee899ace65d632dd99721f25584efedac0047db7c57a1b2c0b96dd671a7e56376cb853120c568eb0e SHA512 6ee25a123200eae9ebdea95f552471feee0497dd2f78424d4a4684472ea39266b0152e46b5b393a4f8d6554ee33eb7ec208a806b81cd1fcb80c3d6eb2c8f2a0d
 MISC metadata.xml 501 BLAKE2B 1692287021b81416f18386da2b1dffd1c358d4dbfa3aacf7d5f773db0889ba966408c35fdbb7ea7f741923d542ea4e825039ab124a64168ad2d5264d1718dc5b SHA512 e1f2c16e725e96e8d576ff6b87a79d39f1b8169c6f419eadcd18a8a266fd188dc08fc9efa236f2c696449a083b000086b153da559cd819fcb73ddf2518500813
diff --git a/dev-python/PyGithub/PyGithub-1.55-r1.ebuild b/dev-python/PyGithub/PyGithub-1.55-r1.ebuild
index c2405edca9b5..30ea465aba97 100644
--- a/dev-python/PyGithub/PyGithub-1.55-r1.ebuild
+++ b/dev-python/PyGithub/PyGithub-1.55-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	dev-python/deprecated[${PYTHON_USEDEP}]
diff --git a/dev-python/PyGithub/PyGithub-1.55.ebuild b/dev-python/PyGithub/PyGithub-1.55.ebuild
deleted file mode 100644
index 2d5c530f24f9..000000000000
--- a/dev-python/PyGithub/PyGithub-1.55.ebuild
+++ /dev/null
@@ -1,29 +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 library to access the Github API v3"
-HOMEPAGE="https://github.com/PyGithub/PyGithub/"
-# Use github since pypi is missing test data
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="dev-python/deprecated[${PYTHON_USEDEP}]
-	>=dev-python/pyjwt-2.0[${PYTHON_USEDEP}]
-	>=dev-python/pynacl-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.0[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/cryptography[${PYTHON_USEDEP}]
-		>=dev-python/httpretty-0.9.6[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/PyRSS2Gen/Manifest b/dev-python/PyRSS2Gen/Manifest
index 3602e3aa331d..8c680636e7e0 100644
--- a/dev-python/PyRSS2Gen/Manifest
+++ b/dev-python/PyRSS2Gen/Manifest
@@ -1,3 +1,3 @@
 DIST PyRSS2Gen-1.1.tar.gz 9149 BLAKE2B 1f388e8616c79d8b5436f69191d479c529e1348308d69782a833bec714da6289fc459ea2b554a1e660027a25d0581c441a0e75a623add3c42c8c33c5cc8518e1 SHA512 2240686914c87984626eb739676927fcd53488158bdebf589e07e8a778e6d24305964e032581c61836f0fabc1264e42d05c88eac8f4c5f6536c31c775434ce02
-EBUILD PyRSS2Gen-1.1-r2.ebuild 458 BLAKE2B 2f8be69f711bf49c9ce6b7ef04fcb69df0e814e1d2baf081568a1ec5a66bff0af4f107cbf8e1bf00c1b4b602c88652fed44670b4641cd0b3852ffa150b872236 SHA512 22363f0fef8a1e184123e5de85e22de01660b6a923ada6f533e45604fe0ac49338c95580907df871fbad4519641d630043f072611d40a7a58418e769958b58bb
+EBUILD PyRSS2Gen-1.1-r2.ebuild 465 BLAKE2B b6f13bfbbfd9442de22561393ab3dbb7a75624239fdb313a8c11e6974927244bcb31bf53a7204c0f414909a454b074f4e78090ea1bb3fc1c4dfb159a7a8031cb SHA512 2fe2451820baa864cfa620b4909093bf453f73b91e1c302d33d1b94fa103c0cc85cef468d2912b98712d6bd6bb02321a26f2af36c63aee099ac0a222f210f523
 MISC metadata.xml 348 BLAKE2B 03db7aaa1d20fb6eadbe5106345624f7eb50d7b45d5adb3a8f4d15a86d3039caa9fbe2771256b1cd9ec2a7c2922ab2f4aaa0e36ed51d63daa620687dad876d66 SHA512 99437dcfe725fb9ee0657aaa499f1d9bf77cc7f21f15bce803dad2c2ebc17972154845a61c7e4ada3b499abcdf79688bc670843f5b595d636de5b77e255556e7
diff --git a/dev-python/PyRSS2Gen/PyRSS2Gen-1.1-r2.ebuild b/dev-python/PyRSS2Gen/PyRSS2Gen-1.1-r2.ebuild
index e1d49e74ed3a..1f7b162dbef1 100644
--- a/dev-python/PyRSS2Gen/PyRSS2Gen-1.1-r2.ebuild
+++ b/dev-python/PyRSS2Gen/PyRSS2Gen-1.1-r2.ebuild
@@ -14,4 +14,4 @@ SRC_URI="http://www.dalkescientific.com/Python/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~riscv x86"
diff --git a/dev-python/QtPy/Manifest b/dev-python/QtPy/Manifest
index be6e396f2b29..d6c3e7ba9ff2 100644
--- a/dev-python/QtPy/Manifest
+++ b/dev-python/QtPy/Manifest
@@ -1,5 +1,3 @@
-DIST QtPy-2.0.0.tar.gz 39628 BLAKE2B bc1b2cf975c3457cb026016854ec70e0aa3247c1234643dbf95681f655678e43ba0200b26e16a0b9eafd6fb373c1f876d9a54458ceb9b9b035ad463b7874db2c SHA512 95855c305da7f54850bcb6297a1f12ceda79eaf6d9b01771b1391d2d7b07b8f690e134cc2d52417bcc320395dce8c1f7f5c6ccadf2939db196e0ed5441215d5a
 DIST QtPy-2.0.1.tar.gz 43047 BLAKE2B 66625852e75fbfcf0bf96e740754ca26b6d5226dd5450d0274cf6dc875cba18e5ed8e339c8c7ad084ffa9b135f19447e087b338690ec521205316c4f22f09197 SHA512 5d482b0a5bd2be67a0fabccf98a9dedf28ef328641c8c976e2274d4a5afb14b9fefce251e80496ed54425dcb3da24984c6c36308db0bfc810ea2142528ad88fd
-EBUILD QtPy-2.0.0.ebuild 5215 BLAKE2B 23261bb6e3a1818b8032c4bb87ee501a12aac8e9595c2aaf17cfa516d8db2f1fd6410af388601fed1a6f9daf8323300303deda7e434dfd7f152db4bed742ca77 SHA512 aca9dc14dd97d1ab4719f47e110fdd91ed12c97f3f83dae91f3d2888650af57917b251da3a85dbcfae6fbedc1dd270450ea0ce63cc2385e70d59b0f4f6b9ca4d
-EBUILD QtPy-2.0.1.ebuild 5218 BLAKE2B 9a171da96f211d963e26654e14ed739a9c5c3c3389cce25b591235fffceb65dd4b51985409d6afff7bdb2facfae4b3388efc89acbb9f5fcbb558900bce53d457 SHA512 6f4a041717e98025b11e27af4a76ad80f067887ae63f7cb06a226b145de1aa7a22c0e5dd3adb484b491f245ca3b5e849505ab738b4b0051c9e2c74566a17e73d
+EBUILD QtPy-2.0.1.ebuild 5215 BLAKE2B 23261bb6e3a1818b8032c4bb87ee501a12aac8e9595c2aaf17cfa516d8db2f1fd6410af388601fed1a6f9daf8323300303deda7e434dfd7f152db4bed742ca77 SHA512 aca9dc14dd97d1ab4719f47e110fdd91ed12c97f3f83dae91f3d2888650af57917b251da3a85dbcfae6fbedc1dd270450ea0ce63cc2385e70d59b0f4f6b9ca4d
 MISC metadata.xml 2904 BLAKE2B f951ee9cfb1e57da9c1b528015cf56bf72e36fbcea6973f5bd237e86c8039d82d9700166ab76773b9bfbc8e499df492994e5dd73aee0bb2d35914d36bcf1bd78 SHA512 e6e13d0c24f16379ac03711f02c5201d1ab28bcbbddd7063f0487bbaaeda99e5a2ef87f00d8df834d822c9230a50ddead93b44affccf07b80bfc275140f4e9ff
diff --git a/dev-python/QtPy/QtPy-2.0.0.ebuild b/dev-python/QtPy/QtPy-2.0.0.ebuild
deleted file mode 100644
index 9fcfb7eab3c3..000000000000
--- a/dev-python/QtPy/QtPy-2.0.0.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Abstraction layer on top of PyQt5 and PySide2 and additional custom QWidgets"
-HOMEPAGE="https://github.com/spyder-ide/qtpy/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
-
-_IUSE_QT_MODULES="
-	declarative designer gui help location multimedia network opengl
-	positioning printsupport sensors serialport speech sql svg testlib
-	webchannel webengine websockets widgets x11extras xml xmlpatterns
-"
-IUSE="+pyqt5 pyside2 ${_IUSE_QT_MODULES}"
-unset _IUSE_QT_MODULES
-
-REQUIRED_USE="|| ( pyqt5 pyside2 )"
-
-# These flags are currently *not* common to both the PySide2 and PyQt5 ebuild
-# Disable them for now, please check periodically if this is still up to date.
-# 	bluetooth? ( pyqt5 )
-# 	dbus? ( pyqt5 )
-#
-# 	3d? ( pyside2 )
-# 	charts? ( pyside2 )
-# 	concurrent? ( pyside2 )
-# 	datavis? ( pyside2 )
-# 	scxml? ( pyside2 )
-# 	script? ( pyside2 )
-# 	scripttools? ( pyside2 )
-
-# WARNING: the obvious solution of using || for PyQt5/pyside2 is not going
-# to work. The package only checks whether PyQt5/pyside2 is installed, it does
-# not verify whether they have the necessary modules (i.e. satisfy the USE dep).
-#
-# Webengine is a special case, because PyQt5 provides this in a separate package
-# while PySide2 ships it in the same package.
-#
-# declarative/qml/quick is a special case, because PyQt5 bundles the bindings
-# for qml and quick in one flag: declarative PySide2 does not.
-#
-# The PyQt5 ebuild currently enables xml support unconditionally, the flag is
-# added anyway with a (+) to make it future proof if the ebuild were to change
-# this behaviour in the future.
-#
-# The PySide2 ebuild currently enables opengl and serialport support
-# unconditionally, the flag is added anyway with a (+) to make it future proof
-# if the ebuild were to change this behaviour in the future.
-RDEPEND="
-	dev-python/packaging[${PYTHON_USEDEP}]
-	pyqt5? (
-		dev-python/PyQt5[${PYTHON_USEDEP}]
-		dev-python/PyQt5[declarative?,designer?,gui?,help?,location?]
-		dev-python/PyQt5[multimedia?,network?,opengl?,positioning?]
-		dev-python/PyQt5[printsupport?,sensors?,serialport?,speech(-)?,sql?,svg?]
-		dev-python/PyQt5[testlib?,webchannel?,websockets?,widgets?]
-		dev-python/PyQt5[x11extras?,xml(+)?,xmlpatterns?]
-		webengine? ( dev-python/PyQtWebEngine[${PYTHON_USEDEP}] )
-	)
-	pyside2? (
-		dev-python/pyside2[${PYTHON_USEDEP}]
-		dev-python/pyside2[designer?,gui?,help?,location?,multimedia?]
-		dev-python/pyside2[network?,opengl(+)?,positioning?,printsupport?]
-		dev-python/pyside2[sensors?,serialport(+)?,speech?,sql?,svg?]
-		dev-python/pyside2[testlib?,webchannel?,webengine?,websockets?]
-		dev-python/pyside2[widgets?,x11extras?,xml?,xmlpatterns?]
-		declarative? ( dev-python/pyside2[qml,quick] )
-	)
-"
-
-# The QtPy testsuite skips tests for bindings that are not installed, so here we
-# ensure that everything is available and all tests are run. Note that not
-# all flags are available in PyQt5/PySide2, so some tests are still skipped.
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		pyqt5? (
-			dev-python/PyQt5[${PYTHON_USEDEP}]
-			dev-python/PyQt5[bluetooth,dbus,declarative,designer,gui,help,location]
-			dev-python/PyQt5[multimedia,network,opengl,positioning,printsupport]
-			dev-python/PyQt5[sensors,serialport,speech(-),sql,svg,testlib,webchannel]
-			dev-python/PyQt5[websockets,widgets,x11extras,xml(+),xmlpatterns]
-			dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
-		)
-		pyside2? (
-			dev-python/pyside2[${PYTHON_USEDEP}]
-			dev-python/pyside2[3d,charts,concurrent,datavis,designer,gui,help]
-			dev-python/pyside2[location,multimedia,network,opengl(+),positioning]
-			dev-python/pyside2[printsupport,qml,quick,script,scripttools,scxml]
-			dev-python/pyside2[sensors,serialport(+),speech,sql,svg,testlib]
-			dev-python/pyside2[webchannel,webengine,websockets,widgets,x11extras]
-			dev-python/pyside2[xml,xmlpatterns]
-		)
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	default
-	# Disale Qt for Python implementations that are not selected
-	if ! use pyqt5; then
-		sed -i -e "s/from PyQt5.QtCore import/raise ImportError #/" qtpy/__init__.py || die
-	fi
-	if ! use pyside2; then
-		sed -i -e "s/from PySide2 import/raise ImportError #/" qtpy/__init__.py || die
-		sed -i -e "s/from PySide2.QtCore import/raise ImportError #/" qtpy/__init__.py || die
-	fi
-
-	# Disable outdated PyQt4 and PySide
-	sed -i -e "s/from PyQt4.Qt import/raise ImportError #/" qtpy/__init__.py || die
-	sed -i -e "s/from PyQt4.QtCore import/raise ImportError #/" qtpy/__init__.py || die
-	sed -i -e "s/from PySide import/raise ImportError #/" qtpy/__init__.py || die
-	sed -i -e "s/from PySide.QtCore import/raise ImportError #/" qtpy/__init__.py || die
-}
-
-python_test() {
-	if use pyqt5; then
-		QT_API="pyqt5" virtx epytest
-	fi
-	if use pyside2; then
-		QT_API="pyside2" virtx epytest
-	fi
-}
-
-pkg_postinst() {
-	if use pyqt5 && use pyside2; then
-		ewarn "You have enabled both PyQt5 and PySide2, note that QtPy will default"
-		ewarn "to PyQt5 unless the QT_API environment variable overrides this."
-	fi
-}
diff --git a/dev-python/QtPy/QtPy-2.0.1.ebuild b/dev-python/QtPy/QtPy-2.0.1.ebuild
index 3013f6cdc707..9fcfb7eab3c3 100644
--- a/dev-python/QtPy/QtPy-2.0.1.ebuild
+++ b/dev-python/QtPy/QtPy-2.0.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 
 _IUSE_QT_MODULES="
 	declarative designer gui help location multimedia network opengl
diff --git a/dev-python/agate/Manifest b/dev-python/agate/Manifest
index afb2c9fbaad9..7d4358a0bd5f 100644
--- a/dev-python/agate/Manifest
+++ b/dev-python/agate/Manifest
@@ -1,3 +1,3 @@
 DIST agate-1.6.3.tar.gz 202102 BLAKE2B b1a5624b4744b8f3ed266470da580cef2f2e1cf6159e1b33fcd461e4abd235c5e3fe0da35408a42c92fd4abf14a1f841a1ab9eb6cd31545d826a5223e85b4904 SHA512 e83a03c5a3e4b7fa9997030ce0d33e7b59b397e2ae07ee6a723eb7fb708a7fa8b8c4322dd034f42bf664bf2911d89731fd060e4ff33a237f83114a83312ac5ed
-EBUILD agate-1.6.3-r2.ebuild 1275 BLAKE2B 006fbbee0fab4936f55f84054ccc005267d1ffb3e792ea5eea272d3eb47e106b94bd17f1d5c0362fa2c8a912b01ace0268955939b8b259fe534bc29297933d86 SHA512 96f8db4bb80f0f81ba6f5d08ce3f63e121ff4babd47fbc7ebe0f0476cdc7710204d6f1f0583f2bfd83031bbcb8a0f22a7ad3b9fb9b1aaf4362bf479cf18bbdc6
+EBUILD agate-1.6.3-r2.ebuild 1282 BLAKE2B b1d322cde533e572fca11731bb6aa1597cc98010cf95317a26be049c1dd6862c32391ffcc0fc1f8c3b08ea78c29d362b1fc73acfc9110ed26daa251b942cb83b SHA512 c22457637c75799021b2309806ca274a6ce355da9328b0290df3627cffde3c4c39bea351a5cb67fd26b6f9e231453a120b2ceff736cec7eab2a3ab78dbffe892
 MISC metadata.xml 510 BLAKE2B e4f41aa63b508b2d2f0d5d064bb88dfeb8e335bb461d7c97bb4cb646526c3862c4ace62feb201bf8690627a8661d86e9eb3161d5018cc50adc3f19a5bc56a2ca SHA512 de2c8764bf315f86fb630d3d0a5a31a3f78430c47a6723af7c0bec4cb6216349456f062a3fd9ad7ecb400f144ba5b5450670c1edac2d3c85598cc610ecdf59d6
diff --git a/dev-python/agate/agate-1.6.3-r2.ebuild b/dev-python/agate/agate-1.6.3-r2.ebuild
index 67dd8ae99c92..54050fabfda6 100644
--- a/dev-python/agate/agate-1.6.3-r2.ebuild
+++ b/dev-python/agate/agate-1.6.3-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~riscv"
 
 RDEPEND="
 	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
diff --git a/dev-python/aiohttp-cors/Manifest b/dev-python/aiohttp-cors/Manifest
index e1c4cb16d6cb..9fa97189f229 100644
--- a/dev-python/aiohttp-cors/Manifest
+++ b/dev-python/aiohttp-cors/Manifest
@@ -1,6 +1,5 @@
 AUX aiohttp-cors-0.7.0-py3_7.patch 991 BLAKE2B e2a08dab701bd31e4a9008c8f89ae97508fb6b99b89db69a05b731849e09c6f04e8b148d82d38f2093e00bb9bee03e45f230cfc8eff4b71ca7797a95524732e2 SHA512 efe7c488d9f30da7eebbe355d86c603657bddc75c88f5cd1bb4b0e76b17f26f5827cc2f42ab8766767a4ad16c08fa636a4f61e50a8c478e7f32eb2567e26427c
 AUX aiohttp-cors-0.7.0-tests.patch 2422 BLAKE2B 4660be793987dd0cd5c945703aa4d6d4b499ba0ab1c305b80e26bac9cc87d811131f6ab179e402821740f193bbfc86a384b58e35aaa453fdfd5d4db3bcc44b23 SHA512 b3fa463b87a112529443f516fe1c37ffda092e8a0133a6d37f407519e32842f65773c87e939082591edb969ee243170be3a4828896ec5ffc1150c3f43aedd9d5
 DIST aiohttp-cors-0.7.0.tar.gz 39728 BLAKE2B 747499856272f551cf8e2e0911ff7cbb2c7cb8a1f3159327dd8f0d40cabbbd9713a1a9e30ef9c99f3f9642567c99025e049db837c89f907d6698a27005ac2632 SHA512 72e0b365b952c08a02c1123d7672cfea01063e2ff01743a71e10f804d22178edc0f1c6b7f87b7ed484ca7c24e89a32de90d0d279f2f5c060427319182f9bdd3b
-EBUILD aiohttp-cors-0.7.0-r1.ebuild 963 BLAKE2B dea2e0726ae2d2f0abb75ea370bc146b75e4d342d52dbc7a44667100e9d652db54dd38f16be805908195cbe556b1820dd199ad941b18960fe71df10cf2d91a9f SHA512 26f76f287a57abc4dd1ff6e8a29be8f938508274c7f39b5ced5009a4fc3c297b11d81d4d80a800642d91841ac91957ecac84fa60f5e3bd0574a568e810a21c13
-EBUILD aiohttp-cors-0.7.0-r2.ebuild 954 BLAKE2B 869c6f57a890d2da40d3a7df10ac4bc7c18e4ac3701662e7b36d2dd89f60354a08765aed9ce8666d4302c4e50b0187d0b1f3c2b09abd95a8216c286100a0432a SHA512 6465ac031a782340d22adf93d219e8b379b7f5dca2e6205c4be232e2999ceff4dcec645d00f6af7396a340cfdf33bda3dc9af4a1aa4cf14db7b3da7c02b4fa62
+EBUILD aiohttp-cors-0.7.0-r2.ebuild 946 BLAKE2B e1b97deb7a75e12dc3767f1f933c0af148ec61ff7ce4bd37f136fb8562bb920a9db4c06752702f235a713636c9a0173d9d2792f71e8dba08f419df0163cd072c SHA512 73695a471611c5f2a3bec4454faaf6ca94881d86c790b66e41e956197fd4e1af63ae022566368c5c98f2c188b66717f9fd157307e08f44c470e3e263c2d18d06
 MISC metadata.xml 558 BLAKE2B db98935b061e7553213d771c0293892bdb2db6209715121a775dec9eee3df6498addbdc64a5c8c9174e8ae7ebac0be3785645a97de238e4320f5724280a406b8 SHA512 4a97a4bb76eef1ce332b6df9d6d2dead19dfce48bbd9705a5ee8ad50c1e66a98b24f7d40425b81acf82347afb1e809d0b7ddd67419c039c3dd1e0a4d2c358de5
diff --git a/dev-python/aiohttp-cors/aiohttp-cors-0.7.0-r1.ebuild b/dev-python/aiohttp-cors/aiohttp-cors-0.7.0-r1.ebuild
deleted file mode 100644
index 502919c6a8bd..000000000000
--- a/dev-python/aiohttp-cors/aiohttp-cors-0.7.0-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Implements CORS support for aiohttp asyncio-powered asynchronous HTTP server"
-HOMEPAGE="https://github.com/aio-libs/aiohttp-cors"
-SRC_URI="https://github.com/aio-libs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86"
-
-RDEPEND=">=dev-python/aiohttp-1.1.1[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/pytest-aiohttp[${PYTHON_USEDEP}]
-		dev-python/selenium[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-# https://github.com/aio-libs/aiohttp-cors/pull/278
-PATCHES=(
-	"${FILESDIR}/${P}-tests.patch"
-	"${FILESDIR}/${P}-py3_7.patch"
-)
-
-src_prepare() {
-	sed -i -e '/^addopts=/d' setup.cfg || die
-	echo "    ignore::DeprecationWarning" >> pytest.ini
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/aiohttp-cors/aiohttp-cors-0.7.0-r2.ebuild b/dev-python/aiohttp-cors/aiohttp-cors-0.7.0-r2.ebuild
index ed8a02fef13e..6686f7fb4a2a 100644
--- a/dev-python/aiohttp-cors/aiohttp-cors-0.7.0-r2.ebuild
+++ b/dev-python/aiohttp-cors/aiohttp-cors-0.7.0-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/aio-libs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 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="
 	>=dev-python/aiohttp-1.1.1[${PYTHON_USEDEP}]
diff --git a/dev-python/aioresponses/Manifest b/dev-python/aioresponses/Manifest
index fdec295155de..a31116649769 100644
--- a/dev-python/aioresponses/Manifest
+++ b/dev-python/aioresponses/Manifest
@@ -1,4 +1,3 @@
 DIST aioresponses-0.7.3.tar.gz 28895 BLAKE2B e948e25daef231b7984609ca475cde9ce026880953b395ebf1d5619fc951338614d1f56332c54467706f66275bc8aa1be9f04d3503295388f9dd4a213316d7c8 SHA512 9e2bdbf4fe5089928de9a7ddd54931d70ea137fbaba2bd22b32d248c9282f70d551a3aa2de270342bdf0c1acd0973b377f503d1194156aa545109ef3458278b5
-EBUILD aioresponses-0.7.3-r1.ebuild 893 BLAKE2B 57b35f7efde71f55d9456a8e4e3db852b24755c5063bc6181f0916691ace5d6f035faf5e5a77a779af5363467db083b4a79c27227b7c357d5f13c5c849594c85 SHA512 0aac85f0e72d689f24c2b608d93af9f34155c5630f882e96fcf5c16a43758494ed2d5eccb680d08da501618747adedbc69ca557ec459924c83ce5cc7476615f8
-EBUILD aioresponses-0.7.3.ebuild 915 BLAKE2B f389a0da1e550e679b7665f387eef283e1bc404a4c083309a1cc68092cc48b2c4635c3d7302cb6486788db62aea05570bf1d992878a084232e1080bc06756e2b SHA512 ded5acf692622e39335927ab7f31f993337a7ddb82dec1d949ebcff0af0bafa9e286484ca023b6f2b1fda3f1cdcf40eae248a3699032ca536c4a954176afcde8
+EBUILD aioresponses-0.7.3-r1.ebuild 891 BLAKE2B 7c35435ff5d4adbafffa1e78509db9661474adcd31f9beebb417553458f99037cde94013248c72813592c7e391e423deccb61f21777e18071c8bd79b076bf36f SHA512 132b956b942dc01f723d0266d7ce860b66f14ab1a6a231d54f6af0f209ec13f8b160a9b40372303818083e67aec93eec30167a6ca641fa3aa0f8f4e35709b662
 MISC metadata.xml 474 BLAKE2B 1768a360fe74d971bd194fdccc0b562c416b70f9992b513167cc6a0944c0d9e7b806029ac55f70998f6bdeffbe0113d1901664c4ded69d23b8664da5b1deda8e SHA512 b133e74d89b308b68387e069544fb24ac2b2f0aa2287c38c48e05c07fa7ec04639b5339930562078b17febd9895b1af46df59c9be323a2de8d7597f35eb24d7d
diff --git a/dev-python/aioresponses/aioresponses-0.7.3-r1.ebuild b/dev-python/aioresponses/aioresponses-0.7.3-r1.ebuild
index be27317991b0..9494709fa4ed 100644
--- a/dev-python/aioresponses/aioresponses-0.7.3-r1.ebuild
+++ b/dev-python/aioresponses/aioresponses-0.7.3-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	dev-python/aiohttp[${PYTHON_USEDEP}]
diff --git a/dev-python/aioresponses/aioresponses-0.7.3.ebuild b/dev-python/aioresponses/aioresponses-0.7.3.ebuild
deleted file mode 100644
index 929183849024..000000000000
--- a/dev-python/aioresponses/aioresponses-0.7.3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Helper to mock/fake web requests in Python's aiohttp package"
-HOMEPAGE="https://github.com/pnuckowski/aioresponses"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="dev-python/aiohttp[${PYTHON_USEDEP}]"
-BDEPEND="
-	dev-python/pbr[${PYTHON_USEDEP}]
-	test? (
-		dev-python/ddt[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs
-distutils_enable_tests pytest
-
-python_test() {
-	local deselect=(
-		# These tests require Internet access
-		tests/test_aioresponses.py::AIOResponsesTestCase::test_address_as_instance_of_url_combined_with_pass_through
-		tests/test_aioresponses.py::AIOResponsesTestCase::test_pass_through_with_origin_params
-	)
-	epytest ${deselect[@]/#/--deselect }
-}
diff --git a/dev-python/ansible-compat/Manifest b/dev-python/ansible-compat/Manifest
index 063b0d4c1b39..f7c5d50e2cce 100644
--- a/dev-python/ansible-compat/Manifest
+++ b/dev-python/ansible-compat/Manifest
@@ -1,7 +1,3 @@
-DIST ansible-compat-1.0.0.tar.gz 34729 BLAKE2B 56eb32314e310777e454a5f5e020cc4dfc485e6d5720d45e99734ce8cf238377f1ff443f9f78f5b9de947944564a7001294907c0e186fe94cd4561d4d348723e SHA512 dd02b47acf38b378016acbe6f2e6494df1cbf68d88a0cb685a5f594ee24b23af1c4d14878090ba7ea69f76185afb57eeb546cc40a6038171eebc991401c6e241
-DIST ansible-compat-2.0.0.tar.gz 34702 BLAKE2B a88afd442ffa520037957a537be5a22c8644c1a3d3cc9e23645f74687db068113945869c271b93ad1fdc07ebc58f29d3137e606889a0eb01ad0e68f75237ba1f SHA512 2b2aade5a201e6edbd5000b0e19497eb5ed5eaf9633edd502c19596b3d1018212f5504f1abad5bc225a8128ad5bb118fcea664b3a927490bcb3636e00ec16fd9
 DIST ansible-compat-2.0.2.tar.gz 35072 BLAKE2B 288baaa4bb535da5fc41ea6a700d4eaf969b466848a592f3c919cac55b237cc81b9bfcd800a429b89c82781b29e80dc6486ea9bf0621ae8a3f249139021030e2 SHA512 ae278498f58ac1eb663115215e7ef6bda7279ff02d4a1f09e8301b88681d8c46f13a620b765cbbbacfc3d1fe8b294d5258cddbf7fd2f2cb54f0bde85fc9af593
-EBUILD ansible-compat-1.0.0.ebuild 1734 BLAKE2B 193fd3618adf36a087d3c60515063b45c15e3d67b40d28d371aa6b1615139542b617f9ea3795e8f89b24d93a917b66731ec58c851d577cb5fb52be278df51465 SHA512 2b3d1e1a224bafb5dfd7a75e5ff8817949db7f54ab0a9a82b7cde2185aecbd483c36bc278807c12863faf3da4fb49aee20c527ea312372f56a0740af7a173d86
-EBUILD ansible-compat-2.0.0.ebuild 1721 BLAKE2B 932e80083255ac718beab5b7d4867fdeb2aaed6a9ae6242dde2687cb30653317d432fe0e9cfee19120177df8f6134b4a310b723b6c9d3f39b12a067d5ac6fa6b SHA512 b73cabb9b757c1b4bc4b86996921e8e5386893e6475f463d54a894658c2362acc082c92d3661e9cad7ac99362d8794c61e763787ea94d2faa884edb023758b99
-EBUILD ansible-compat-2.0.2.ebuild 1705 BLAKE2B f212b5455b6f1ec0679d51d7dfdd1c48e791432ee5ffc79288fa71c0e72ab92ccaec54ed5453667b6ae3b5159ac55c7e9b3882c0a2b446725254e8c85772dcdf SHA512 5599c863674f8056d67518d631589c0770641123dbe644b05eeb449d0ec1757d84285f381a918324eafb79f890d1eb95ec347d678e9cc3acd7578892a0b7893c
-MISC metadata.xml 419 BLAKE2B 5862d98909b54bbf69b84b10742ae5c4e8e5919f84a986161f8fb948f472c9f4f8b567fd4fa81d259395187c8b58ce64c2675349b076d9087021c2ef246d03d9 SHA512 9c22801a3c01f6d1be465823f3b78ee43016dd037ce80f99f78ec0d906fef887260b830ff20d523fae085204914cecece77893e3c3a7c5a6247f301395d8e3f0
+EBUILD ansible-compat-2.0.2.ebuild 1702 BLAKE2B 425593284f3679798c96fabae8b20f2307664b5b216dfde1513c3b5c0a64e24137d62278c90de17e79ed63d1a525d31b60144145abede9e0b93a2f20db39bb9c SHA512 676c9c05e3aa8726712159d66476b1170b96e21b87db102e9ed17f939dab9879b55d192935fb7bd4e814a286395470d0da258a86bbf6df47a0ff5d341ee56572
+MISC metadata.xml 409 BLAKE2B 60c2a2a8a80326a6fa9b375b3bdac4f8f609d071f5f06f76a0a80038bf9950c7c2cc377ae883abab3d93104fe2095a8c31c2bc3554b97f5e9e4a2cef8a8cec72 SHA512 900ba03ec907dcbba53f4eb6827485c5948300e04d7b00f9159d328f8bc507a5bc9f893593f0dcc7029b5f6c480a1129ddb541f9ddb40e3b389669bfb0d1f3f1
diff --git a/dev-python/ansible-compat/ansible-compat-1.0.0.ebuild b/dev-python/ansible-compat/ansible-compat-1.0.0.ebuild
deleted file mode 100644
index e963e3ab20d9..000000000000
--- a/dev-python/ansible-compat/ansible-compat-1.0.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-
-inherit distutils-r1
-
-DESCRIPTION="Contains functions that facilitate working with various versions of Ansible"
-HOMEPAGE="https://pypi.org/project/ansible-compat/ https://github.com/ansible-community/ansible-compat/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	>=app-admin/ansible-base-2.9.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	>=dev-python/subprocess-tee-0.3.5[${PYTHON_USEDEP}]
-"
-BDEPEND="$(python_gen_cond_dep '
-	>=dev-python/setuptools_scm-6.3.1[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm_git_archive-1.0[${PYTHON_USEDEP}]
-	test? (
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/pytest-markdown[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytest-plus[${PYTHON_USEDEP}]
-	)
-')"
-
-# All these tests attempt to connect to galaxy.ansible.com
-EPYTEST_DESELECT=(
-	test/test_runtime.py::test_install_collection
-	test/test_runtime.py::test_install_collection_dest
-	test/test_runtime.py::test_prepare_environment_with_collections
-	test/test_runtime.py::test_prerun_reqs_v1
-	test/test_runtime.py::test_prerun_reqs_v2
-	test/test_runtime.py::test_require_collection_no_cache_dir
-	test/test_runtime.py::test_require_collection_wrong_version
-	test/test_runtime.py::test_require_collection
-	test/test_runtime.py::test_upgrade_collection
-	test/test_runtime_example.py::test_runtime
-)
-
-# Requires currently unpackaged Sphinx extension myst_parser
-#distutils_enable_sphinx docs 'dev-python/sphinx_ansible_theme'
-
-distutils_enable_tests pytest
diff --git a/dev-python/ansible-compat/ansible-compat-2.0.0.ebuild b/dev-python/ansible-compat/ansible-compat-2.0.0.ebuild
deleted file mode 100644
index 5a527bb5e082..000000000000
--- a/dev-python/ansible-compat/ansible-compat-2.0.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-
-inherit distutils-r1
-
-DESCRIPTION="Contains functions that facilitate working with various versions of Ansible"
-HOMEPAGE="https://pypi.org/project/ansible-compat/ https://github.com/ansible-community/ansible-compat/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	>=app-admin/ansible-base-2.9.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	>=dev-python/subprocess-tee-0.3.5[${PYTHON_USEDEP}]
-"
-BDEPEND="$(python_gen_cond_dep '
-	>=dev-python/setuptools_scm-6.3.1[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm_git_archive-1.0[${PYTHON_USEDEP}]
-	test? (
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/pytest-markdown[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytest-plus[${PYTHON_USEDEP}]
-	)
-')"
-
-# All these tests attempt to connect to galaxy.ansible.com
-EPYTEST_DESELECT=(
-	test/test_runtime.py::test_install_collection
-	test/test_runtime.py::test_install_collection_dest
-	test/test_runtime.py::test_prepare_environment_with_collections
-	test/test_runtime.py::test_prerun_reqs_v1
-	test/test_runtime.py::test_prerun_reqs_v2
-	test/test_runtime.py::test_require_collection_no_cache_dir
-	test/test_runtime.py::test_require_collection_wrong_version
-	test/test_runtime.py::test_require_collection
-	test/test_runtime.py::test_upgrade_collection
-	test/test_runtime_example.py::test_runtime
-)
-
-distutils_enable_sphinx docs dev-python/ansible-pygments dev-python/myst_parser dev-python/sphinx_ansible_theme
-
-distutils_enable_tests pytest
diff --git a/dev-python/ansible-compat/ansible-compat-2.0.2.ebuild b/dev-python/ansible-compat/ansible-compat-2.0.2.ebuild
index 5002b5d41ebc..c1f62f805b15 100644
--- a/dev-python/ansible-compat/ansible-compat-2.0.2.ebuild
+++ b/dev-python/ansible-compat/ansible-compat-2.0.2.ebuild
@@ -9,12 +9,12 @@ PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="Contains functions that facilitate working with various versions of Ansible"
-HOMEPAGE="https://pypi.org/project/ansible-compat/ https://github.com/ansible-community/ansible-compat/"
+HOMEPAGE="https://pypi.org/project/ansible-compat/ https://github.com/ansible/ansible-compat/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~riscv"
 
 RDEPEND="
 	>=app-admin/ansible-base-2.9.0[${PYTHON_USEDEP}]
diff --git a/dev-python/ansible-compat/metadata.xml b/dev-python/ansible-compat/metadata.xml
index d3c8f1c3e37f..cc57cf6f5340 100644
--- a/dev-python/ansible-compat/metadata.xml
+++ b/dev-python/ansible-compat/metadata.xml
@@ -8,6 +8,6 @@
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">ansible-compat</remote-id>
-		<remote-id type="github">ansible-community/ansible-compat</remote-id>
+		<remote-id type="github">ansible/ansible-compat</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/ansible-pygments/Manifest b/dev-python/ansible-pygments/Manifest
index fafc03707225..f98cdd1aa895 100644
--- a/dev-python/ansible-pygments/Manifest
+++ b/dev-python/ansible-pygments/Manifest
@@ -1,5 +1,3 @@
-DIST ansible-pygments-0.1.0.tar.gz 8046 BLAKE2B a6b9873dc8494af77a8c71de45f23dbd14419f3abb98d577631d51be9fe48cc88f5bec2f77707fd376369e325538800a47ae014a13f85022f805466a2e590316 SHA512 370a28e984f1c19c78b3047c5506847d625ad46458067804fcc7cc850d01cb77f837fbc80071fc9ff0e9df31805e48477a3026ce28389de8de368d35bd9d9428
 DIST ansible-pygments-0.1.1.tar.gz 8446 BLAKE2B ff631dd24c723035db7ab11a6c3fc0c90e8cebd72e6b0fa0d8b2c4bc4250ff5fb1e4180366e4ee084aab90bf24a8c3b2ecfad2c421b9f0cfdbf7675c94f0fcf7 SHA512 1ad2f4568d46d7fc617c6e674bcd9aea48e14307d91c476b51a04f778b452f18cb983d87d4872664d567b984193edee2af7964854fb2f3ae37ab4bce09c387d4
-EBUILD ansible-pygments-0.1.0.ebuild 514 BLAKE2B bd9363775c4e72c462fee45860eb269b838ff962b2ffb53f746a9d9e8d71695422a01e87b35e503ad328483ca8c597a3b86ed229c9f11be3365a06683ab08da6 SHA512 f8c0fab96f93c3154f592842a6e8321824b7c7013adb27dbc7937bc0a0bec55da3f47e234682a049b361f167a6c476ea601f72c4a8bc336c03bcbcbb1bbeccf5
 EBUILD ansible-pygments-0.1.1.ebuild 555 BLAKE2B d3645ad63a74c5766e2d3ed63d6623b798f572b10c3d46755ccc60905a5b7084bba7c49cc72218827ab2194bba6a24eddbb0d5e6876f1297126aa4563dc308a8 SHA512 816f5fc2545ea172fc68083b6361a6a9c2c9196a883e6374be6ec27316d9e1bf58ebb83d4274eff24e8e7b5f9cfcc5209294f3d2b169585a032534664d964276
 MISC metadata.xml 786 BLAKE2B 5883f03ffc7b0850bc8ecc90c91a15a9498ced9ee196a4f8d2a97a77a41957cb05a40ebf671ddbdf226886b94e9a5e796376094924712544a07559e0858aa5a8 SHA512 c7736962fe565be524294a30630e7cfd2820d1e9ace6f6dbd307ad46a252947ce368057d5ea5d20889a5ccdbb7f3418496affad5f8ed345e0e0808bd4abbe4ed
diff --git a/dev-python/ansible-pygments/ansible-pygments-0.1.0.ebuild b/dev-python/ansible-pygments/ansible-pygments-0.1.0.ebuild
deleted file mode 100644
index 4cb71a916654..000000000000
--- a/dev-python/ansible-pygments/ansible-pygments-0.1.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_USE_SETUPTOOLS="pyproject.toml"
-
-inherit distutils-r1
-
-DESCRIPTION="Pygments lexer and style Ansible snippets"
-HOMEPAGE="https://github.com/ansible-community/ansible-pygments"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv"
-
-RDEPEND="dev-python/pygments[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
diff --git a/dev-python/anyio/Manifest b/dev-python/anyio/Manifest
index 0110029c77bb..3781154b0e63 100644
--- a/dev-python/anyio/Manifest
+++ b/dev-python/anyio/Manifest
@@ -1,5 +1,4 @@
-DIST anyio-3.4.0.tar.gz 135737 BLAKE2B 6023d051a10a067b8c86576dd80571a64c72a807c56235ecd7bad364b79b10c5b845c6b584c5310db01b3bfdd92deeaf64b855716b9fa817fe2fc590de33ec4c SHA512 276fb5fc243e2c7f80a069f604ef68eeaca923c0df6f533878f9bf2185e846e537a1b9a8f19260a3c9ad3aad70898884316e6783057044a936762f7eb1f1cb9a
+AUX anyio-3.5.0-pytest-7.patch 2624 BLAKE2B e9a1fd06838f2d8fd9c2a2a1e33f6d55d5d9b0edfbb3eb1cc703164a2c85e1f7c3a1a099b6b659826098b5710352b289dcb129b5248c1a6fa392efd26652f258 SHA512 207d7e4cd4b3be7399625874bfae47be94b7593e53a1fd61f84ee87810992c0a06a466ca47b1419858d81879c25ba6666e043015ce5271034186d77a506e290f
 DIST anyio-3.5.0.tar.gz 136934 BLAKE2B 422d604c23658844467926f42c09895e54debfd3ddf2f7fa561eccae0c9cbc225f51d663cb9f98a2455736ad7a81eb4ae40a6f3ad66f3d2f0b02d0a5157203e0 SHA512 b91124c95d194eb7e4542405a973895d21562a2636d9600d528465da52536d1ffedbf5a6fc3ea5b1ff3e83e7dca2b42f090bb2ff6b077e32f5a2c314f07d3206
-EBUILD anyio-3.4.0.ebuild 1093 BLAKE2B ba828d6d187689d45f44f7e0dfb685f81afa357fea4a4589f94f996c420a6529cff46e1daa4d173581b79d796e148257d6db444289434de882aac2b20d749305 SHA512 5d2e07bf8468f2b9bbfbfde58d0ace51507ac0c6919e851c6fa3c7d7d2b54d51541fce789a1cb6c03c18d2c4bcf4743dd78fb19fc571b4e3f9e658b456f3dbdc
-EBUILD anyio-3.5.0.ebuild 1252 BLAKE2B fd4a6f00598610d11999c27def585b210748e2544b03a4a3dc775561bdd7ee9f64c639981c2f1da6f2962580c88e808afee46f9835faf1a832153eb0678406ca SHA512 e231848bc83f73705fc70f78835e4c69e1a0a1591a6115d7f7114b348efa1b01ae79eb187d908f3e8fe24ea6de93014c613a300bb7a7ea1abd0d016ff199f86b
+EBUILD anyio-3.5.0-r1.ebuild 1280 BLAKE2B c8ac3efda1b2d446405787238ae535fedc4c5d2e0c8c5d82dd26a70bd201600d19dd964198ad6444fb0897bd693163ad07f91fe13945a6c4cb23a97566795380 SHA512 b014a15f307cfa893b743998d171f38d7f5df75e87e36e97151915f376781b641fcd1a25af6d8c8f40edf8a2de202f8bff02ad98fc02a800aeeab63c421f2e9b
 MISC metadata.xml 1321 BLAKE2B 22708116b3b04529a83c9e005e421dab21dd5b259df12c3c7e75c74cc3505510b828ebe9808a234ce91d0fc2f17476bf884050561efb18892eb13c35806bbfc1 SHA512 6c1333b6e58faacacf68cd1bd6544c5b28d55ebb75efba1702aa5e2d4f28c29ac86dbbfd45dbb8af1dc2bf69476667d52c7f14bc765d836133e0811c6f2c880e
diff --git a/dev-python/anyio/anyio-3.4.0.ebuild b/dev-python/anyio/anyio-3.4.0.ebuild
deleted file mode 100644
index e8baabafef7d..000000000000
--- a/dev-python/anyio/anyio-3.4.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Compatibility layer for multiple asynchronous event loop implementations"
-HOMEPAGE="
-	https://github.com/agronholm/anyio
-	https://pypi.org/project/anyio/
-"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ppc ppc64 ~riscv sparc x86"
-
-RDEPEND="
-	>=dev-python/idna-2.8[${PYTHON_USEDEP}]
-	>=dev-python/sniffio-1.1[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		>=dev-python/hypothesis-4.0[${PYTHON_USEDEP}]
-		>=dev-python/pytest-6.2[${PYTHON_USEDEP}]
-		>=dev-python/pytest-mock-3.6.1[${PYTHON_USEDEP}]
-		dev-python/trustme[${PYTHON_USEDEP}]
-		>=dev-python/uvloop-0.15[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests --install pytest
-distutils_enable_sphinx docs \
-	dev-python/sphinx_rtd_theme \
-	dev-python/sphinx-autodoc-typehints
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	distutils_install_for_testing --via-venv
-	epytest -m 'not network'
-}
diff --git a/dev-python/anyio/anyio-3.5.0.ebuild b/dev-python/anyio/anyio-3.5.0-r1.ebuild
index 5379b452a5e4..cbbb327c2923 100644
--- a/dev-python/anyio/anyio-3.5.0.ebuild
+++ b/dev-python/anyio/anyio-3.5.0-r1.ebuild
@@ -3,12 +3,14 @@
 
 EAPI=8
 
+DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{8..10} )
+
 inherit distutils-r1
 
 DESCRIPTION="Compatibility layer for multiple asynchronous event loop implementations"
 HOMEPAGE="
-	https://github.com/agronholm/anyio
+	https://github.com/agronholm/anyio/
 	https://pypi.org/project/anyio/
 "
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
@@ -26,20 +28,23 @@ RDEPEND="
 BDEPEND="
 	test? (
 		>=dev-python/hypothesis-4.0[${PYTHON_USEDEP}]
-		>=dev-python/pytest-6.2[${PYTHON_USEDEP}]
+		>=dev-python/pytest-7[${PYTHON_USEDEP}]
 		>=dev-python/pytest-mock-3.6.1[${PYTHON_USEDEP}]
 		dev-python/trustme[${PYTHON_USEDEP}]
 		amd64? ( >=dev-python/uvloop-0.15[${PYTHON_USEDEP}] )
 	)
 "
 
-distutils_enable_tests --install pytest
+distutils_enable_tests pytest
 distutils_enable_sphinx docs \
 	dev-python/sphinx_rtd_theme \
 	dev-python/sphinx-autodoc-typehints
 
+PATCHES=(
+	"${FILESDIR}"/${P}-pytest-7.patch
+)
+
 python_test() {
 	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	distutils_install_for_testing --via-venv
 	epytest -m 'not network'
 }
diff --git a/dev-python/anyio/files/anyio-3.5.0-pytest-7.patch b/dev-python/anyio/files/anyio-3.5.0-pytest-7.patch
new file mode 100644
index 000000000000..858404632959
--- /dev/null
+++ b/dev-python/anyio/files/anyio-3.5.0-pytest-7.patch
@@ -0,0 +1,78 @@
+From fed7cc4f95e196f68251bcb9253da3b143ea8e7e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Alex=20Gr=C3=B6nholm?= <alex.gronholm@nextday.fi>
+Date: Mon, 7 Feb 2022 00:16:18 +0200
+Subject: [PATCH] Upgraded pytest to 7.0
+
+---
+ setup.cfg                   |  2 +-
+ tests/test_pytest_plugin.py | 14 +++++++-------
+ 2 files changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/tests/test_pytest_plugin.py b/tests/test_pytest_plugin.py
+index 4255702..f3b0e0c 100644
+--- a/tests/test_pytest_plugin.py
++++ b/tests/test_pytest_plugin.py
+@@ -1,5 +1,5 @@
+ import pytest
+-from _pytest.pytester import Testdir
++from _pytest.pytester import Pytester
+ 
+ from anyio import get_all_backends
+ 
+@@ -9,7 +9,7 @@ pytestmark = pytest.mark.filterwarnings(
+ pytest_args = '-v', '-p', 'anyio', '-p', 'no:asyncio'
+ 
+ 
+-def test_plugin(testdir: Testdir) -> None:
++def test_plugin(testdir: Pytester) -> None:
+     testdir.makeconftest(
+         """
+         import sniffio
+@@ -67,7 +67,7 @@ def test_plugin(testdir: Testdir) -> None:
+     result.assert_outcomes(passed=3 * len(get_all_backends()), skipped=len(get_all_backends()))
+ 
+ 
+-def test_asyncio(testdir: Testdir) -> None:
++def test_asyncio(testdir: Pytester) -> None:
+     testdir.makeconftest(
+         """
+         import asyncio
+@@ -140,7 +140,7 @@ def test_asyncio(testdir: Testdir) -> None:
+     result.assert_outcomes(passed=2, failed=1, errors=2)
+ 
+ 
+-def test_autouse_async_fixture(testdir: Testdir) -> None:
++def test_autouse_async_fixture(testdir: Pytester) -> None:
+     testdir.makeconftest(
+         """
+         import pytest
+@@ -177,7 +177,7 @@ def test_autouse_async_fixture(testdir: Testdir) -> None:
+     result.assert_outcomes(passed=len(get_all_backends()))
+ 
+ 
+-def test_cancel_scope_in_asyncgen_fixture(testdir: Testdir) -> None:
++def test_cancel_scope_in_asyncgen_fixture(testdir: Pytester) -> None:
+     testdir.makepyfile(
+         """
+         import pytest
+@@ -204,7 +204,7 @@ def test_cancel_scope_in_asyncgen_fixture(testdir: Testdir) -> None:
+     result.assert_outcomes(passed=len(get_all_backends()))
+ 
+ 
+-def test_hypothesis_module_mark(testdir: Testdir) -> None:
++def test_hypothesis_module_mark(testdir: Pytester) -> None:
+     testdir.makepyfile(
+         """
+         import pytest
+@@ -235,7 +235,7 @@ def test_hypothesis_module_mark(testdir: Testdir) -> None:
+     result.assert_outcomes(passed=len(get_all_backends()) + 1, xfailed=len(get_all_backends()))
+ 
+ 
+-def test_hypothesis_function_mark(testdir: Testdir) -> None:
++def test_hypothesis_function_mark(testdir: Pytester) -> None:
+     testdir.makepyfile(
+         """
+         import pytest
+-- 
+2.35.1
+
diff --git a/dev-python/astor/Manifest b/dev-python/astor/Manifest
index 669213e9cd6d..4c0d0a7c9cb0 100644
--- a/dev-python/astor/Manifest
+++ b/dev-python/astor/Manifest
@@ -1,3 +1,4 @@
 DIST astor-0.8.1.tar.gz 35090 BLAKE2B 11e5e77d4f8a8617d0330d3091a1571744bb5773df926f41b10208e1c5beb7e82ad8961a460dd326e9130591dade495c77a36456618a97a5c22e41237805a4ce SHA512 cfc69a21fcbc9842bc26fbe8372e5c700d9957cc0c3c62de415155d2036163951f0ece88557829afd7c4dabba8a8e238a2335994ddfc020cb3db913eed5b6f28
-EBUILD astor-0.8.1.ebuild 469 BLAKE2B cccfeda5823b0b67b52019164bf6050d66c68e114b60494da18b88ebaa1ad2d9ca91e64a1b08bf30dcb0d69514eb4f33d1ec198fee41a4ef99401d32e326a0ce SHA512 0f375af0d87ca3132741d650c47570d876a4932751a616fc3c6a4225a572bb0af5fc98f47b2fa24e64c5c2ec2d93daf432e4db71dfbc9c203ae7833ed066c156
+EBUILD astor-0.8.1-r1.ebuild 516 BLAKE2B e9a3a06e7a213c444b8138151a46d3584460ecbb8897b01e7c4f63aaf25bc996362cba800d38d44e322696fa35c4f627580ffc19ef29b25e15784fdefa652da4 SHA512 4e1166353470f1ffda288bf8dd8c98fbb4c40e0af3a592c94810b5d8c40b41f93db014440b8df12e7a03b18279c0f85b5019c04290cbc38bc9e5649c7c661077
+EBUILD astor-0.8.1.ebuild 475 BLAKE2B 088174a87c013b94e8a81cc90b1450818d2bca33b9925a1687ee8c85f437c5ba8e8c48b2423690ea5c516107c3373a212d310e0afec87afb414e5d298dcaa564 SHA512 364ca6f843157533460a33bf07efb78712a094edd89dafa34239b9593be1e8b8ccf18b65d0ac0ec161b120ca06869a62fd46bd16f25fe593a04b367869920d3c
 MISC metadata.xml 367 BLAKE2B c4400dae3db36ae716e1dd85aeb58b85c54bd7e27276b79fc0291f42e485b9804c7246f583eb40ff5081e2a44aba703f49fcdc1cfcc85b5bb75dee72217a3501 SHA512 7f7f5f3de928f5f89393d10df44a042231507f78a82d0869939cae5e3c12d5effa0606dcb70fc72c9e697deca16711159454bece3c7afe52d902c3881d7135ac
diff --git a/dev-python/astor/astor-0.8.1-r1.ebuild b/dev-python/astor/astor-0.8.1-r1.ebuild
new file mode 100644
index 000000000000..a73a5388bc50
--- /dev/null
+++ b/dev-python/astor/astor-0.8.1-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Read/rewrite/write Python ASTs"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+HOMEPAGE="https://pypi.org/project/astor/"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+distutils_enable_tests pytest
+
+EPYTEST_IGNORE=(
+	tests/test_rtrip.py
+)
diff --git a/dev-python/astor/astor-0.8.1.ebuild b/dev-python/astor/astor-0.8.1.ebuild
index 5f0135ccda83..7d8443b2ac12 100644
--- a/dev-python/astor/astor-0.8.1.ebuild
+++ b/dev-python/astor/astor-0.8.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="Read/rewrite/write Python ASTs"
diff --git a/dev-python/astroid/Manifest b/dev-python/astroid/Manifest
index b79478d9b9e7..e4aff5fcf191 100644
--- a/dev-python/astroid/Manifest
+++ b/dev-python/astroid/Manifest
@@ -1,9 +1,11 @@
 DIST astroid-2.10.0.tar.gz 417686 BLAKE2B a4aa0451134403abf8e56ccd9dae106d2a92b2bd53c6772c952984ea5603b44ef5c13b9822b4fda0a146ad96a7412a602c2c46313938dea30cfb390fc55ee54d SHA512 34b52cd2e6636009369ec55a5781caaf8e8b0766b7ba4e70ff1f55d275a673266e0293f65145ff38637d6da353679314d0fbf182416146b89e210a68e39d86f0
 DIST astroid-2.11.0.tar.gz 412098 BLAKE2B 022c940913ae71ca0280a2ae47c19a6c82ea69b4f2a1c1ce0e2f00dac7a37b26f7ee2fa798db4f5d230e021ac5096b79d48b12d389d0c754dc17bde301c1712f SHA512 82423c9cf6da4e041621218acc81b9a301e4c1f532a74863c89040654d61457a89481004556a4795f021f0fc52b5f79412a35e9e43a1de33189dcae305cefdff
 DIST astroid-2.11.1.tar.gz 412506 BLAKE2B d3153b9019d5c466d39f7b27d459158cabe47cc9375afe2f1362b20620847fed0b4b09e2994e4372712fbd5bdff3cf88f709c1644abd25bdb6085e93cdcb145f SHA512 e0a1cfc67602e53c8d5b67d1605b38ee5c62886cb0ca757f0835f8af2ad94b21af58427ed4aad9f98171955733c4b333443efb1f7fdcec661d1e68c403a529b1
+DIST astroid-2.11.2.tar.gz 412621 BLAKE2B e43be65b733a5de5d027920e8e4db0365a3af98614739f0a56dcf95ef6c1c3a9e104b52c1fad4477bccd460850cf6bab6f38014aaa6891e8d04720d4a52b79d8 SHA512 5b33cb3594513804c6933a888297ed54c42cb52274c7fe49060368e3fac62be8f3febcb822aa9267a5a0a99a32932912ebc4640a7d10288b7021955fe0277c0d
 DIST astroid-2.9.3.tar.gz 409069 BLAKE2B 152dbe8ab2fee3964dc8cc714a5ba48c71b5994c77d1e20683bcf028483aca22d5be5772e72d056cfd3d1f59562b447366d61fc35a2b67d545f069a8f7975e84 SHA512 7bb3bf2d456c0d22325444e641961c34eaddcddf50c97ee9f5b5c8755232cf1b65a315258403b40bb7dcad15c4f9b6b73ab0eb607525a48a65f52406969eca04
-EBUILD astroid-2.10.0.ebuild 1393 BLAKE2B 82e0a985a022d7f8aec57ad6041c47a40d660f2b0deedaa792a126e46ad38208fe4f0456361c08d608f2ae206a6db6f7c8cfa1972a8c6cbe79a50aea6acdbd43 SHA512 657a2bde8ec50f205236b3024eea16a875a1881a7313fa39f8d06c713d26d19a890759c4dd96fec25b2110e7f694c49b4a76eaf6871a6fec193762aa0dfa16b0
+EBUILD astroid-2.10.0.ebuild 1385 BLAKE2B 7f781a73a4b307635089af9a7640b650ccd20806fe5bbe8346b98b4504f4a1c5126d35324345ef4a114dbdc1ed88aaa31cd9ba309a4ba42752ad9dca3b5410da SHA512 67b80af9953efe265fffcfbfb68f0157f671474c8e6a051449d0ca1ec6e1759f1298e8efc63f6c502c5a794fe13c68c2a3494a7b0d36808313653d8d99ba9543
 EBUILD astroid-2.11.0.ebuild 1390 BLAKE2B a505bc47a393b96daae7473338866384d60aa291a3f4bba29a1337958c3cea6ca0e5e538b4b1a1044e51c7ee3666e4faaaeebe4d8b5ec2ca03f727513fffd749 SHA512 31c1a84e11b941a225a1454c13e5daef31dce932a770c4d513668ccb6e64e7327e54e7d8b67e3bd72381da289c160da0b0335b48fab34421e37fc9ebb806d474
 EBUILD astroid-2.11.1.ebuild 1391 BLAKE2B 026560b411056b47cdcd3c04ff8525c3d395ee381da86d317527126bf111cd56e21a154872f1beca9e2167c6f060a2b81972f3f296b01367cb06332d002f2975 SHA512 9332b9a912758389cd698a1f806c7f5412e3cdff3007fbba33823f509e6c9edb517612475951c306abaf10286756df6c7a491ce7bdf5938c3723a665d1355994
+EBUILD astroid-2.11.2.ebuild 1391 BLAKE2B 026560b411056b47cdcd3c04ff8525c3d395ee381da86d317527126bf111cd56e21a154872f1beca9e2167c6f060a2b81972f3f296b01367cb06332d002f2975 SHA512 9332b9a912758389cd698a1f806c7f5412e3cdff3007fbba33823f509e6c9edb517612475951c306abaf10286756df6c7a491ce7bdf5938c3723a665d1355994
 EBUILD astroid-2.9.3.ebuild 1305 BLAKE2B 8ed0e241b8c820dfce1228a811ab24f9e96898f61037c5d66c5db327218b1740a13f87078c60977e2a923c193ea59a9cbcb1197a35fabdcdb09e8b1370251e78 SHA512 f89e842c114311520ef5d55ffa00410986ed1c19b9eb132e1b1b527e74cb6e0605548704b6129013a3d2c11542902ba25ca1df1c0e65692cfb9939cc407e7ada
 MISC metadata.xml 1143 BLAKE2B 1f6c4e004277eebed2e29cb935ef01e5f18fb0a526f99f0e875ae3815308dce0483b5274b4e23bed076464aa62a035937a7a3817e2d4a5fb9211b9043271e04c SHA512 56b07d0f08a49772661bc3d233cf1f628aa7c241c51b91d75dfbd44995e169d8ab5bbd99863d7b9b67792486346982a7b8eebefb462e7e212cd7dff920d80840
diff --git a/dev-python/astroid/astroid-2.10.0.ebuild b/dev-python/astroid/astroid-2.10.0.ebuild
index 8b4c9b7ad2be..e3f87ec535af 100644
--- a/dev-python/astroid/astroid-2.10.0.ebuild
+++ b/dev-python/astroid/astroid-2.10.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 # Version specified in __pkginfo__.py.
 RDEPEND="
diff --git a/dev-python/astroid/astroid-2.11.2.ebuild b/dev-python/astroid/astroid-2.11.2.ebuild
new file mode 100644
index 000000000000..313a897a7376
--- /dev/null
+++ b/dev-python/astroid/astroid-2.11.2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+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 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+# Version specified in __pkginfo__.py.
+RDEPEND="
+	>=dev-python/lazy-object-proxy-1.4.0[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/typing-extensions-3.10[${PYTHON_USEDEP}]
+	<dev-python/wrapt-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 EPYTEST_DESELECT=(
+		# no clue why it's broken
+		tests/unittest_modutils.py::GetModulePartTest::test_known_values_get_builtin_module_part
+		tests/unittest_brain_dataclasses.py::test_pydantic_field
+	)
+
+	# Faker causes sys.path_importer_cache keys to be overwritten
+	# with PosixPaths
+	epytest -p no:faker
+}
diff --git a/dev-python/asyncstdlib/Manifest b/dev-python/asyncstdlib/Manifest
index 5e34e6727dfa..aabe842d377d 100644
--- a/dev-python/asyncstdlib/Manifest
+++ b/dev-python/asyncstdlib/Manifest
@@ -1,6 +1,8 @@
 DIST asyncstdlib-3.10.2.gh.tar.gz 45697 BLAKE2B 8f9bbee8d2a4e9f6a60a5088ef00940f22c2aec79557070d1b13d8d7256179bddaf1130ace0393e95e06e077824dd862e27a6c5d644ae52dab2d80989bb08027 SHA512 be5a8cbb521b8082ad9898907bce1a888443eafb24e2030f9dfbb2dff293646376ad44ebbc53d12e539ad70af935d833f2f114e383171388b9d724f274eb8421
 DIST asyncstdlib-3.10.3.gh.tar.gz 50929 BLAKE2B 109c6bb7712c9d59a31f3993336fc35b6db0375a8705ec9996756ccb4f1f5982d193edd5907d1e1c4dee7e41fa41e59884a6dfda01b1594fa22b8354c6142515 SHA512 6c2f140495b806beb28a2cf56f71d35da1c15fad8da2727ce6e8dff40ff606c36c03370fab285d084cbf41dd675c9e40c199fa1384826b3f1aa84c2dadb7b1eb
+DIST asyncstdlib-3.10.4.gh.tar.gz 52905 BLAKE2B 7b71e816395ab9e33ad4bd3d78d62e8260b78d736ba8b70bb6c47d9d4bbcc431f4a54b8c604e4b520df11a5317a7ab1a70d765e40089b323f985217a943eb96b SHA512 ced64809f1a8d1f60ed045bef69ff6cef84fbcf1b4587c70421112cdc65d6344bb1fceeb55e64e17237a00672bbfff19d4627371b45e1e7659e405d506abf216
 EBUILD asyncstdlib-3.10.2-r1.ebuild 610 BLAKE2B 7e0b105ec6009fd2d0f56ce033bbefc84f3e0689b70ad66171688070318638baeca6bea4e7ed3e45c2b1e0824813dd587ef726dbdbffc87a98b90cc9a129eca1 SHA512 230e2b354e114d42b630cfe7cb955418e4b0eb76aa805bb19ab209e5898a27bcf30c3db1f11b7ea9bcf787e5febf159f1a9fc7fa5d1e8664cb68624338d673d6
 EBUILD asyncstdlib-3.10.2.ebuild 521 BLAKE2B 29f1d54b54ab23d5c364106db4c0bedadbea9a9c5336fc4d799fd1ecd8f55a59a940e832e5c4767290c5e320317d73e788dffee6bbe895bbfb9dec5574dd8a28 SHA512 673c9e2bab7be93ee4d35b2cfc1adbc2275bf9a1b5457f9a68d5df163328daac286887b2af0280e429cdf2a0f67c3475a694c1de3d9c5b526122dd50f322e4cc
 EBUILD asyncstdlib-3.10.3.ebuild 513 BLAKE2B d0836c2aade5fd89a2eec4b15c2e7debd09ee1632cfe4c6cc8dbb6eb3f8907dd7b18191656e2af336006b3a9a8ab221ead6fff4acda046acd5d84bb6f058220b SHA512 0c61b822c012e8d7751e7a331a92a004a8a1e7e01a6a1c5644bea6c1e966da139be54e66caf2120b995072f4c6290717505de875623da426ec80d546944b829e
+EBUILD asyncstdlib-3.10.4.ebuild 513 BLAKE2B d0836c2aade5fd89a2eec4b15c2e7debd09ee1632cfe4c6cc8dbb6eb3f8907dd7b18191656e2af336006b3a9a8ab221ead6fff4acda046acd5d84bb6f058220b SHA512 0c61b822c012e8d7751e7a331a92a004a8a1e7e01a6a1c5644bea6c1e966da139be54e66caf2120b995072f4c6290717505de875623da426ec80d546944b829e
 MISC metadata.xml 359 BLAKE2B 10bdbf5adba9cefa912d8e1f195f20d4040bc2e8e3efb3fdc6efcb8272bb58160c6d772de3fe9ad9c4cb43e2817139319ffece082c3c043f1d97cb36ed8ac7a8 SHA512 e56f712f7446a3e68137a945a1ab212f6254740ce2f962fc7ab0061f41cb0d314809ad4fe3317fd10d8ebb594fb20d690d06b0a73636b13b5fdb5184cde2e306
diff --git a/dev-python/asyncstdlib/asyncstdlib-3.10.4.ebuild b/dev-python/asyncstdlib/asyncstdlib-3.10.4.ebuild
new file mode 100644
index 000000000000..91515a83ee60
--- /dev/null
+++ b/dev-python/asyncstdlib/asyncstdlib-3.10.4.ebuild
@@ -0,0 +1,23 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="The missing async toolbox"
+HOMEPAGE="
+	https://github.com/maxfischer2781/asyncstdlib/
+	https://pypi.org/project/asyncstdlib/"
+SRC_URI="
+	https://github.com/maxfischer2781/asyncstdlib/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+distutils_enable_tests pytest
diff --git a/dev-python/autobahn/Manifest b/dev-python/autobahn/Manifest
index a92f5768e6dc..1e63721aa5b9 100644
--- a/dev-python/autobahn/Manifest
+++ b/dev-python/autobahn/Manifest
@@ -1,3 +1,7 @@
 DIST autobahn-22.2.2.tar.gz 375443 BLAKE2B a321cfeaa35e7da5aa58ade0da3bc5891baab1d4a915782e9d25038679261c19744d65baa4a981cb01025902dc8f4ffb93d8c0ad59b8db32119c0fb0eeb49d53 SHA512 95b0ee867a866b1cf67a55ffa9386addd3640b12a3e5a2673b4d496aa6d41ec49408e1f528bc21d1e390d5e3343dda0b1625d4ac0d9e9101db151c7c79623263
+DIST autobahn-22.3.1.tar.gz 375616 BLAKE2B 2644ff3766b268df54cf955d657870530723342dc9b040b05806766e25dbf89b78b448d8b6a949cb8a8d1486a16f6901348dc127903c34502f8663997b539ac8 SHA512 5fbeec8808d90431e37ede1b3c147ffd8e92af99af3bc4f6fec3519cdbfe5962c3d770e9102b7f54bfbdd03f453b488c8ba8eb104c6a34458ca429fd1233e037
+DIST autobahn-22.3.2.tar.gz 376020 BLAKE2B 5d7b776c24541b08363942ed1868d5e7a2ccb4f99edc1ad722d3d68417852f324e79afa5ec8cc0251499ba27c078087ba40be744d657b562f5f1c431492705b6 SHA512 a33619bb7624f56bf571a4c61d11290316554c5c5a23724c6d5624f1e8e673dfc6a8e12ea3b17f809306a14f45e982b3425a23efb123003b575b248718c9a299
 EBUILD autobahn-22.2.2.ebuild 3751 BLAKE2B c19a75f5f089a3b46933e293f2355860c382f6071b6a7094ccb035f19db97876d33a75dee0863cc08e3413bf21db97f8d2a385335ef992b36437c8e40435b6da SHA512 256a397da7b9765553b7a464caa73226ffccdadb6d6126207d42f21c2a6a4c703d713158aea26a9c7b251161ac33eff5c53a585ec72318f4e8d01cb5db920dcf
+EBUILD autobahn-22.3.1.ebuild 3755 BLAKE2B c39c6f86301b4d595e5236755b05bacc4ecce3cac1eeb82d80eaded33d242a4c7ecd711bd97e8a1c3b2e7a323513e40d755537dcffdf2477e1f914ae44a69f0d SHA512 91ab857cc3483a66f1b44e06d8f80a486dc64abb325638746fd97a5467a595b345de9e2ce325ca0349eaad765e53845c8bf513a49d7692dd5d6ee18b592ac93a
+EBUILD autobahn-22.3.2.ebuild 3755 BLAKE2B c39c6f86301b4d595e5236755b05bacc4ecce3cac1eeb82d80eaded33d242a4c7ecd711bd97e8a1c3b2e7a323513e40d755537dcffdf2477e1f914ae44a69f0d SHA512 91ab857cc3483a66f1b44e06d8f80a486dc64abb325638746fd97a5467a595b345de9e2ce325ca0349eaad765e53845c8bf513a49d7692dd5d6ee18b592ac93a
 MISC metadata.xml 596 BLAKE2B 07cc4fbcb4c6fde6b1bb49a0a30fa8d2ef7ff4424397e29053a6ac89d87acd9fa7b1897c5381910d53f590192945a89a5b987fcdb9595e42f67f23333010a0ba SHA512 4d4cecf09593ec201711b13de1820e59f007f745b41611471ec737da4d679323787ac06a3a987cede9bf2c8dff71c9dbcb197e6a9c9109cf4d3a34d9247f9962
diff --git a/dev-python/autobahn/autobahn-22.3.1.ebuild b/dev-python/autobahn/autobahn-22.3.1.ebuild
new file mode 100644
index 000000000000..a15603075d58
--- /dev/null
+++ b/dev-python/autobahn/autobahn-22.3.1.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1 optfeature
+
+MY_P=${PN}-$(ver_rs 3 -)
+
+DESCRIPTION="WebSocket and WAMP for Twisted and Asyncio"
+HOMEPAGE="https://pypi.org/project/autobahn/
+	https://crossbar.io/autobahn/
+	https://github.com/crossbario/autobahn-python"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+IUSE="test xbr"
+RESTRICT="!test? ( test )"
+
+# The order of deps is based on their appearance in setup.py
+# All extra deps should be included in test and in optfeature
+RDEPEND="
+	>=dev-python/zope-interface-5.2.0[${PYTHON_USEDEP}]
+	>=dev-python/twisted-20.3.0[${PYTHON_USEDEP}]
+	>=dev-python/attrs-20.3.0[${PYTHON_USEDEP}]
+	>=dev-python/txaio-21.2.1[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	>=dev-python/hyperlink-21.0.0[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		>=dev-python/wsaccel-0.6.3[${PYTHON_USEDEP}]
+		>=dev-python/snappy-0.6.0[${PYTHON_USEDEP}]
+		>=dev-python/msgpack-1.0.2[${PYTHON_USEDEP}]
+		>=dev-python/ujson-4.0.2[${PYTHON_USEDEP}]
+		>=dev-python/cbor2-5.2.0[${PYTHON_USEDEP}]
+		>=dev-python/py-ubjson-0.16.1[${PYTHON_USEDEP}]
+		>=dev-python/flatbuffers-1.12[${PYTHON_USEDEP}]
+		>=dev-python/pyopenssl-20.0.1[${PYTHON_USEDEP}]
+		>=dev-python/service_identity-18.1.0[${PYTHON_USEDEP}]
+		>=dev-python/pynacl-1.4.0[${PYTHON_USEDEP}]
+		>=dev-python/pytrie-0.4[${PYTHON_USEDEP}]
+		>=dev-python/pyqrcode-1.2.1[${PYTHON_USEDEP}]
+		>=dev-python/cffi-1.14.5[${PYTHON_USEDEP}]
+		>=dev-python/argon2-cffi-20.1.0[${PYTHON_USEDEP}]
+		>=dev-python/passlib-1.7.4[${PYTHON_USEDEP}]
+
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/pytest-aiohttp[${PYTHON_USEDEP}]
+	)
+"
+
+python_prepare_all() {
+	if use xbr ; then
+		eerror "***************"
+		eerror "Required xbr dependencies are incomplete in Gentoo."
+		eerror "So this functionality will not yet work"
+		eerror "Please file a bug if this feature is needed"
+		eerror "***************"
+	else
+		# remove xbr components
+		export AUTOBAHN_STRIP_XBR="True"
+	fi
+
+	# avoid useless rust dependency
+	sed -i -e '/cryptography/s:>=3.4.6::' setup.py || die
+
+	# remove twisted plugin cache regen in setup.py
+	# to fix tinderbox sandbox issue
+	sed -e '/import/s:reactor:__importmustfail__:' \
+		-i setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	einfo "Testing all, cryptosign using twisted"
+	local -x USE_TWISTED=true
+	cd "${BUILD_DIR}/install$(python_get_sitedir)" || die
+	"${EPYTHON}" -m twisted.trial autobahn || die "Tests failed with ${EPYTHON}"
+	unset USE_TWISTED
+
+	einfo "RE-testing cryptosign and component_aio using asyncio"
+	local -x USE_ASYNCIO=true
+	epytest autobahn/wamp/test/test_wamp_{cryptosign,component_aio}.py
+	unset USE_ASYNCIO
+
+	rm -f twisted/plugins/dropin.cache || die
+}
+
+pkg_postinst() {
+	optfeature "C-based WebSocket acceleration" "dev-python/wsaccel"
+	optfeature "non-standard WebSocket compression support" "dev-python/snappy"
+	optfeature "accelerated WAMP serialization support" \
+		"dev-python/msgpack dev-python/ujson dev-python/cbor2 dev-python/flatbuffers dev-python/py-ubjson"
+	optfeature "TLS transport encryption" \
+		"dev-python/pyopenssl dev-python/pynacl dev-python/pytrie dev-python/pyqrcode dev-python/service_identity"
+	optfeature "WAMP-SCRAM authentication" \
+		"dev-python/cffi dev-python/argon2-cffi dev-python/passlib"
+	optfeature "native SIMD acceleration" "dev-python/cffi"
+
+	python_foreach_impl twisted-regen-cache
+}
+
+pkg_postrm() {
+	python_foreach_impl twisted-regen-cache
+}
diff --git a/dev-python/autobahn/autobahn-22.3.2.ebuild b/dev-python/autobahn/autobahn-22.3.2.ebuild
new file mode 100644
index 000000000000..a15603075d58
--- /dev/null
+++ b/dev-python/autobahn/autobahn-22.3.2.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1 optfeature
+
+MY_P=${PN}-$(ver_rs 3 -)
+
+DESCRIPTION="WebSocket and WAMP for Twisted and Asyncio"
+HOMEPAGE="https://pypi.org/project/autobahn/
+	https://crossbar.io/autobahn/
+	https://github.com/crossbario/autobahn-python"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+IUSE="test xbr"
+RESTRICT="!test? ( test )"
+
+# The order of deps is based on their appearance in setup.py
+# All extra deps should be included in test and in optfeature
+RDEPEND="
+	>=dev-python/zope-interface-5.2.0[${PYTHON_USEDEP}]
+	>=dev-python/twisted-20.3.0[${PYTHON_USEDEP}]
+	>=dev-python/attrs-20.3.0[${PYTHON_USEDEP}]
+	>=dev-python/txaio-21.2.1[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	>=dev-python/hyperlink-21.0.0[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		>=dev-python/wsaccel-0.6.3[${PYTHON_USEDEP}]
+		>=dev-python/snappy-0.6.0[${PYTHON_USEDEP}]
+		>=dev-python/msgpack-1.0.2[${PYTHON_USEDEP}]
+		>=dev-python/ujson-4.0.2[${PYTHON_USEDEP}]
+		>=dev-python/cbor2-5.2.0[${PYTHON_USEDEP}]
+		>=dev-python/py-ubjson-0.16.1[${PYTHON_USEDEP}]
+		>=dev-python/flatbuffers-1.12[${PYTHON_USEDEP}]
+		>=dev-python/pyopenssl-20.0.1[${PYTHON_USEDEP}]
+		>=dev-python/service_identity-18.1.0[${PYTHON_USEDEP}]
+		>=dev-python/pynacl-1.4.0[${PYTHON_USEDEP}]
+		>=dev-python/pytrie-0.4[${PYTHON_USEDEP}]
+		>=dev-python/pyqrcode-1.2.1[${PYTHON_USEDEP}]
+		>=dev-python/cffi-1.14.5[${PYTHON_USEDEP}]
+		>=dev-python/argon2-cffi-20.1.0[${PYTHON_USEDEP}]
+		>=dev-python/passlib-1.7.4[${PYTHON_USEDEP}]
+
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/pytest-aiohttp[${PYTHON_USEDEP}]
+	)
+"
+
+python_prepare_all() {
+	if use xbr ; then
+		eerror "***************"
+		eerror "Required xbr dependencies are incomplete in Gentoo."
+		eerror "So this functionality will not yet work"
+		eerror "Please file a bug if this feature is needed"
+		eerror "***************"
+	else
+		# remove xbr components
+		export AUTOBAHN_STRIP_XBR="True"
+	fi
+
+	# avoid useless rust dependency
+	sed -i -e '/cryptography/s:>=3.4.6::' setup.py || die
+
+	# remove twisted plugin cache regen in setup.py
+	# to fix tinderbox sandbox issue
+	sed -e '/import/s:reactor:__importmustfail__:' \
+		-i setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	einfo "Testing all, cryptosign using twisted"
+	local -x USE_TWISTED=true
+	cd "${BUILD_DIR}/install$(python_get_sitedir)" || die
+	"${EPYTHON}" -m twisted.trial autobahn || die "Tests failed with ${EPYTHON}"
+	unset USE_TWISTED
+
+	einfo "RE-testing cryptosign and component_aio using asyncio"
+	local -x USE_ASYNCIO=true
+	epytest autobahn/wamp/test/test_wamp_{cryptosign,component_aio}.py
+	unset USE_ASYNCIO
+
+	rm -f twisted/plugins/dropin.cache || die
+}
+
+pkg_postinst() {
+	optfeature "C-based WebSocket acceleration" "dev-python/wsaccel"
+	optfeature "non-standard WebSocket compression support" "dev-python/snappy"
+	optfeature "accelerated WAMP serialization support" \
+		"dev-python/msgpack dev-python/ujson dev-python/cbor2 dev-python/flatbuffers dev-python/py-ubjson"
+	optfeature "TLS transport encryption" \
+		"dev-python/pyopenssl dev-python/pynacl dev-python/pytrie dev-python/pyqrcode dev-python/service_identity"
+	optfeature "WAMP-SCRAM authentication" \
+		"dev-python/cffi dev-python/argon2-cffi dev-python/passlib"
+	optfeature "native SIMD acceleration" "dev-python/cffi"
+
+	python_foreach_impl twisted-regen-cache
+}
+
+pkg_postrm() {
+	python_foreach_impl twisted-regen-cache
+}
diff --git a/dev-python/autopep8/Manifest b/dev-python/autopep8/Manifest
index 24bc3851b3ed..658067169f8a 100644
--- a/dev-python/autopep8/Manifest
+++ b/dev-python/autopep8/Manifest
@@ -1,6 +1,4 @@
-DIST autopep8-1.5.7.tar.gz 121537 BLAKE2B 06f107cab210258fe71b8e912312520797122fd38e3e67fa0d6cf640806690e1255fec63c74c11ec39952a4a50964a3f622ca1166d29299c4f7a7031a1013202 SHA512 b8fb8b63400e74ea978f576cb47c99b0a4bb15a5d1cfeb6ffc25d2ecdad301762f99ddff5c75af3900b3560797d9289a15bbb87ddcf74077d39bde0abadd4da7
 DIST autopep8-1.6.0.tar.gz 122165 BLAKE2B 606ccf7ab51b52db95287384f9b19fd0f72da9e8fb4537bf395651622a95f88d782679550e61816d60dd3faa2fa096c979575d60cbd95476fa1cd7cf2c4f4180 SHA512 f4ffd564ceb48ff1f37d0a051aa8fefc60595a68709045c13561d8ab73de48dce99cc12acf40559e587ba4f6fddd4727dd2b40691ce43c991d60dda2c8b0d617
-EBUILD autopep8-1.5.7.ebuild 760 BLAKE2B fd4d89701d3d26e111aebb26aba24832f702debb93ec17dff927c5f44ba59751899527e82060ed8b77e5a095639bcab1d556781559214235b3db20aa81ad0331 SHA512 4873f601ec0d065846354c28d8de937952456ef77532b032dbf1c7f35e317319d530349bfe3191c7b4ef8880807f4b7e1e085131ab0547c75649ab08afd882cf
 EBUILD autopep8-1.6.0.ebuild 760 BLAKE2B 13b165f2deecbda14f999976b63f5d6f5486db9ca13313518109a626f8bd3985c3c1c0b160e3ff2fe518394e4f93247dfa3757af6900e63a56b4deee9748255c SHA512 a25a8449dc7c430b917c409cf7e52f6f1381bb1463e94bfebd28976e76a42a79ccf00e944511f3236acaf0896aa3b124f1b67af7ffb5efb8d7f236b48e5b1eb4
 EBUILD autopep8-9999.ebuild 764 BLAKE2B 58e548231ca3c7a4acefe00795638eee425965e66bd7abda154213f9014b2db7ef5cd749830fb3f0d26c8d292986adf618e7871296f2b5b772b8b2ce8318bc99 SHA512 bb924400c5bb108cd8dca18df54360f7362ced56179006e59f41e8113880a15737535fbc38d4c648c874b9f4bf2d13516fa10570c6ba9b9125944789cc91eddd
 MISC metadata.xml 404 BLAKE2B e9442968d195e1605d55b880cf29f4a2945f67c57c0d7d0325e19c0ccf60cac0ac3e68115a0285f87068482163f537abc1d75bddfdc6ae860c8c52c375147fdc SHA512 3e0b8a6ee869086166bb670a73189ca681729276cc7897666127b7e25b3a252aa2e80da5fd4dbb43d101a439d12f146ba0ba61bebf30a87a97f1030325f1aeab
diff --git a/dev-python/autopep8/autopep8-1.5.7.ebuild b/dev-python/autopep8/autopep8-1.5.7.ebuild
deleted file mode 100644
index e6d7e406100a..000000000000
--- a/dev-python/autopep8/autopep8-1.5.7.ebuild
+++ /dev/null
@@ -1,28 +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} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Automatically formats Python code to conform to the PEP 8 style guide"
-HOMEPAGE="https://github.com/hhatto/autopep8 https://pypi.org/project/autopep8/"
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/hhatto/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 ~arm64 ~ia64 ppc sparc x86 ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND="
-	>=dev-python/pycodestyle-2.7.0[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]"
-
-distutils_enable_tests setup.py
diff --git a/dev-python/aws-sam-translator/Manifest b/dev-python/aws-sam-translator/Manifest
index bb5c3640f8fe..113c807e606d 100644
--- a/dev-python/aws-sam-translator/Manifest
+++ b/dev-python/aws-sam-translator/Manifest
@@ -1,7 +1,9 @@
 DIST aws-sam-translator-1.40.0.tar.gz 988864 BLAKE2B 5a414bde5ceeb016267c64742e8c8dabf1460471261a84464ab2bffa4b5553eb042ffe2b4ac91b470316f64a68043e27f652b2cc5aabc8a83cf61faa89d7af51 SHA512 99c578cbe4100c30d2e6357dbb35aaf9e93180b8fce27f1b8400253153fef7d18487b5f67e0824920c6adb8bfdfe763a8fd893b3ac4ef3f781673f4761866e0e
 DIST aws-sam-translator-1.42.0.tar.gz 1017720 BLAKE2B d0166b09b99c64f5f4a4c1ebfe63b6a35ca6db73efb97f76b8748272b646fe2fcf9de06c2f6b29ce69a3edfce9235ba932913055e70f48d88569e4df25a6be0e SHA512 6b1bfd4bde203e31a9d98a385d6c0705ba651c39846358e750faf8a30c4e4e8b2ee57623af27da670ee8f1f5edca795b1b5528b5237ff9f01f911d4b9385ebcd
 DIST aws-sam-translator-1.43.0.tar.gz 1046840 BLAKE2B 19e405a07c9eb42ee77f26986eb09e6902559fc3fad5f1b7f4df0d09cb529add1c53910afa3fa3d867f048e69fb4c6872004733fc611347d4438013b80605e5c SHA512 9e7a5b4769eafcf1a9d8af7582cd4af3a82843d2c7c474495b9099fcb94f8dd0dd45d02f52ed609de7dc341b77f0f913526410935244836c3201b99c3fb6a292
+DIST aws-sam-translator-1.44.0.tar.gz 1047747 BLAKE2B 54714943b1bb561e32fb0102aa7b3fdb77d9bd864510ff1cc5315591fad70ef112fe7bc080f2c7ba1444fc2dd7ccae212c539b8ec2015a93b1486e9152493fac SHA512 0c165b808b6ead83bfb3d4ee75ff683e733433b505ec035527b3e2ecac4d166acf60ce7c0a16f16181a42adf126bb215f88916e705fc9746b412ba58dbfe1815
 EBUILD aws-sam-translator-1.40.0.ebuild 1215 BLAKE2B 5081267656b1107b865edcce52360bc4cb7aa498cb43204d0b7b4f517b1e66870f85f3e74e3785038deafd4c910ff767f5163d6a7d7bc4894b774324e6a1e572 SHA512 1f757a62c66f94eabfc7178c2088a5b4055941928fe166a556536f81f9b30e24b0fa061c90a389a569b039ddfa84e89a633f8d4a3de6db60016775608aa5f4b5
 EBUILD aws-sam-translator-1.42.0.ebuild 1344 BLAKE2B 0c9e5d10c317fd808610359c30c458157dfaf7eb4cebb41e9d809b55accca642f6eb464a1dad630f053779a5d87fbf8e7a65e67af9c7b1ceb7675d014e55ebaa SHA512 5f0c00271b0f27a739ccff93f1e39476f29ad190074936ecd4b188587303142508e5e5db005c8d41ffc5ccb70de06f37f277bf9faf28f54ef00d92d598ab23af
 EBUILD aws-sam-translator-1.43.0.ebuild 1496 BLAKE2B 5aaeaa212d8a5efb826961d82ad7c6d86342cda218a3a2e7953e4834d22c04e0647566b2a4f9694630214115ab88c78b4281c9679891ce6cd9a4cf95ec220203 SHA512 c7d4f40e133976303c0b37812e453672bdcf39756d88c022268859a3ab5c688f009d3462befeee54afb60b372f88f9880832463631f0bdbf8e2f0dac1280761f
+EBUILD aws-sam-translator-1.44.0.ebuild 1496 BLAKE2B 5aaeaa212d8a5efb826961d82ad7c6d86342cda218a3a2e7953e4834d22c04e0647566b2a4f9694630214115ab88c78b4281c9679891ce6cd9a4cf95ec220203 SHA512 c7d4f40e133976303c0b37812e453672bdcf39756d88c022268859a3ab5c688f009d3462befeee54afb60b372f88f9880832463631f0bdbf8e2f0dac1280761f
 MISC metadata.xml 603 BLAKE2B 89556267393186cf69a585c58efeb6fa599bfb42ef221bea955ea807a28edee89036a2ee0d0ca81ae55d96702a01b171b837754dabf38047ecc2789157bb7116 SHA512 106b6d241eadf7807dadf03329073703f8b51e7443eddc4db8752878b6dd84cc4357689cd4b796b3a083192e9d98eacbe9e7b8af0273160c7b89846e78230a88
diff --git a/dev-python/aws-sam-translator/aws-sam-translator-1.44.0.ebuild b/dev-python/aws-sam-translator/aws-sam-translator-1.44.0.ebuild
new file mode 100644
index 000000000000..34c909b06a88
--- /dev/null
+++ b/dev-python/aws-sam-translator/aws-sam-translator-1.44.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="A library that transform SAM templates into AWS CloudFormation templates"
+HOMEPAGE="
+	https://github.com/aws/serverless-application-model/
+	https://pypi.org/project/aws-sam-translator/
+"
+SRC_URI="
+	https://github.com/aws/serverless-application-model/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz
+"
+S="${WORKDIR}/serverless-application-model-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/boto3-1.17[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-2.6[${PYTHON_USEDEP}]
+	>=dev-python/six-1.11[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/parameterized[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	tests/validator/test_validator_api.py::TestValidatorApi::test_errors_13_error_definitionuri
+	tests/unit/test_region_configuration.py::TestRegionConfiguration::test_is_service_supported_positive_4_ec2
+)
+
+python_prepare_all() {
+	# remove pytest-cov dependency
+	sed -r -e 's:--cov(-[[:graph:]]+|)[[:space:]]+[[:graph:]]+::g' \
+		-i pytest.ini || die
+
+	# deps are installed by ebuild, don't try to reinstall them via pip
+	truncate --size=0 requirements/*.txt || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/awxkit/Manifest b/dev-python/awxkit/Manifest
index 03c1ae006081..b78991b051a2 100644
--- a/dev-python/awxkit/Manifest
+++ b/dev-python/awxkit/Manifest
@@ -1,5 +1,7 @@
 DIST awxkit-19.4.0.tar.gz 95558 BLAKE2B fa8f408e310ba819e6d8a326e67dddac44ffe0fec2ff3018e8eeeda269c50257689b221785f27c897f526e6f5180c49aa506be6b85e01602b0d7d1dcd88a6987 SHA512 c6c6cf897128153fbb1dac77d50028a7649b97278394384bf5a549c1583b9c89b694f1ce2c850d0b072a4a7142a9b906edfba8d3a68cb446c73a13e3e33c0a61
 DIST awxkit-20.0.1.gh.tar.gz 15896876 BLAKE2B b1ad083e8aa5075b2acd03fe588223186e96f7a09451dec471f58fc463717079840368ad770c3bbcc819fdf7b148fcfdc098baa72dae923d3a3db514318c8a5e SHA512 caa6092bb2d47c9027fd20e42207f4e4fd431afaaec88afd498d0f535545f99dbd9186338e803d33e3cbaa3fcb4e44f29d6d7688b2c22f9393438aae3c9c6ed3
+DIST awxkit-20.1.0.gh.tar.gz 15917777 BLAKE2B da7f112472d55fa90fc2c92ac6c4fbce89928a24e861e18b04342039aae2ef467bbf5f8b67a0ad5a5e3a90d77f5363d6df742199d988aa7dd35ac1b00c3625ca SHA512 835053a7adabc96f21650e7ed2d4bfb088fbcdbf359572673904756d7bee4fe2b60fc42d1bdacf4c8ab5a1101e474cb8d6018ae67486b16d9675dbe69b9d056c
 EBUILD awxkit-19.4.0.ebuild 750 BLAKE2B 4b8ccda00fe41e68124d8bc22bc74c15c73214230ffb61a058b468aa3d53ad5ac185222a6d4f641bc31faac7ff318defdb7210632f54953ec14a501df9e14941 SHA512 ca1b14d71a46df2e413049cf7945bf5961af2246d32ab0633b23bfd3d8dfd223f42caef4689b05ef6ab25982fa66baa75657811e790c663af7ea335d81b74b54
 EBUILD awxkit-20.0.1.ebuild 959 BLAKE2B 17f598b81c370c5b6411df38161151ae38ecf2a6aee95be4c3074baf639b1d6e5f7e4d0ff50dac74cdbb1dc7372837f49c240719abbdac1cf72888473583c84c SHA512 5a3b29db6b34c949698d0c62f861aefe97fe352113d21b340024c823ee33129e2841162d5eb92237605b421db99b834b47dbcb53473a507394459bb1398b5b19
+EBUILD awxkit-20.1.0.ebuild 960 BLAKE2B e05e602d0daf612c9b4818838600e71682202d4c87189c0c13797e80e958659b2b33c0f72bcc45bd9f961d6294597922c301ba82f27b2b10580500c4d9e5c62f SHA512 d374a109811987644fad287ddec4e83759de82e67d94435927d0d44f8b19e2f480eaaf08ac124317aaa77e6866b0f88bdbac7bb2c7123f6d510c6374f3d292f4
 MISC metadata.xml 512 BLAKE2B be7f98bdaff6b814e03c9f6c816a0f1f59dc2e8763298f8a48107ea50b0534eddb314bb6d8b8a0f8c1d7c89c381916031544eea4a06068fb9acab4d2c8c48a57 SHA512 7322d992e1d67ea200df0cbf144d08fd387d7cd6ccb72191fc94dd605c9aeecb4b8083917760e2203296d5514fccd7ca621133aef6622658d1ef2c33171c8b7d
diff --git a/dev-python/awxkit/awxkit-20.1.0.ebuild b/dev-python/awxkit/awxkit-20.1.0.ebuild
new file mode 100644
index 000000000000..f63cc6bc217b
--- /dev/null
+++ b/dev-python/awxkit/awxkit-20.1.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Command line interface for Ansible AWX"
+HOMEPAGE="https://github.com/ansible/awx"
+SRC_URI="https://github.com/ansible/awx/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
+S="${WORKDIR}/awx-${PV}/awxkit"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/urllib3[${PYTHON_USEDEP}]
+	dev-python/websocket-client[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+	sed -e 's|websocket-client==[[:digit:]\.]*|websocket-client|' \
+		-e "/'clean'/d" \
+		-i setup.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/bandit/Manifest b/dev-python/bandit/Manifest
index 74fb71808937..6048a8157a9c 100644
--- a/dev-python/bandit/Manifest
+++ b/dev-python/bandit/Manifest
@@ -1,7 +1,3 @@
-DIST bandit-1.7.2.tar.gz 497104 BLAKE2B 235e8c29658db9b0916b2108a46931581384851650217a7e368f06fe9225aadf181b320a75061387b277d1e3ff3f1d38fe6d07be14f7c7d056fa06e8db84e4e4 SHA512 fde27d409dcb867285f3c7a9ee88a079dae58211e17c2157601bbff9e9144e604def3c0179a7c9016266bdf70ed9da9ca519641f4aca4e76a30859c8e01177b9
-DIST bandit-1.7.3.tar.gz 495009 BLAKE2B fb31ae7a5115ec98ba9b62100a2601552e6ca54b9f57fe61e0bb3f2b4b107cc83c25425a43e2681a1e83d7606e209089cbfa95068bb3dc0f35f188b75a307390 SHA512 4a95c67185446ba4250bb2e37dcafb423d4985952122793a698788f8d973ac700964dce0603b5d547d4b74f82272593bc72be266c34ec73af903f3d016015148
 DIST bandit-1.7.4.tar.gz 495104 BLAKE2B 5531a602dea877745ebdecf768fa83e0e478c52d472fbfdf98fec32c73a76a73e4f6dd957be760b4757e47c5f9cc25f6cd2f6c593df1e54165e647950a9f8a54 SHA512 93e1a25fd41e9409971f4cbac2ff73971ba270936a6b2aeecb3e0a2aa2015bcefd5eaab3cc94b2d9d96e4604d1a39c5ca1150c9eadd073357a90c5265c592407
-EBUILD bandit-1.7.2-r1.ebuild 1003 BLAKE2B 7dfa8148cd649735baf6aef8a8b73df4c8907264395769026ece3f14930a633f6c78f98898baa1fa3e1cdf85d7391af608a1968d137cb1f1e71f235bb0ae483e SHA512 4c389f78b83e9fd043519bed2b090a30ac4c29783cada939cfed0bf3e4ba720197aab8944f7e8940aee5e618928c15a5fd53ab06c558e10f5cee43c52274bd7c
-EBUILD bandit-1.7.3.ebuild 1007 BLAKE2B efcff3c8b64c6ef2ea97c3465db4db6177463dfa9389f3528835e43d4714f0998a141b10ac7404d021f36c813c0a1ed0434eb8c3f23c5a7d57fa54d8c6a5725c SHA512 9ad7f4d8e49ced48c10c9f0c638c73900126c41c31fb46b6a0811f919f56f18f081a8ee27fab8a1647f8035df0badf6496f9bd0406517a08cff78e3d03f5977c
-EBUILD bandit-1.7.4.ebuild 1007 BLAKE2B efcff3c8b64c6ef2ea97c3465db4db6177463dfa9389f3528835e43d4714f0998a141b10ac7404d021f36c813c0a1ed0434eb8c3f23c5a7d57fa54d8c6a5725c SHA512 9ad7f4d8e49ced48c10c9f0c638c73900126c41c31fb46b6a0811f919f56f18f081a8ee27fab8a1647f8035df0badf6496f9bd0406517a08cff78e3d03f5977c
+EBUILD bandit-1.7.4.ebuild 1004 BLAKE2B 36e03c9c801ad1e014aeb35f88431f4ed7d095f49f56309931f6b99357615a9ec662ac578729f75def6b76a84cca9ad44375d365050b49b20d3a529e07f7a14b SHA512 2875cafc7c3fe0be44bc7f45af0c5d0a2048a27e014c9c992e4671941a7b2a68502192259e93f191d7fc2edee9b3e9671d912f53cba3f81f7105d318b340b924
 MISC metadata.xml 709 BLAKE2B 845208c1e800577f159e34675344ce540c61888393dfcfc2f7c47e77ccfd4784cb3f1990b25b78f97d62c8b5c53feaadfdc894990333a09b7938a90be68b8815 SHA512 ba2c6de072973fcd891e4e161a43d52100df89f13243765cb5b2f2ccd7ef7a5266d8fd6e8d373859b53d6743c1de5b0733d5bb4f81b4a94d95843e0593e9dc8f
diff --git a/dev-python/bandit/bandit-1.7.2-r1.ebuild b/dev-python/bandit/bandit-1.7.2-r1.ebuild
deleted file mode 100644
index a03789dace94..000000000000
--- a/dev-python/bandit/bandit-1.7.2-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="A security linter from OpenStack Security"
-HOMEPAGE="https://github.com/PyCQA/bandit"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~s390 x86"
-
-RDEPEND="
-	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/GitPython-1.0.1[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-5.3.1[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.5.0[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.3.0[${PYTHON_USEDEP}]
-		>=dev-python/beautifulsoup4-4.8.0[${PYTHON_USEDEP}]
-		>=dev-python/pylint-1.9.4[${PYTHON_USEDEP}]
-		dev-python/toml[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests unittest
diff --git a/dev-python/bandit/bandit-1.7.3.ebuild b/dev-python/bandit/bandit-1.7.3.ebuild
deleted file mode 100644
index bee6bbb3bc1a..000000000000
--- a/dev-python/bandit/bandit-1.7.3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="A security linter from OpenStack Security"
-HOMEPAGE="https://github.com/PyCQA/bandit"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~s390 ~x86"
-
-RDEPEND="
-	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/GitPython-1.0.1[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-5.3.1[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.5.0[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.3.0[${PYTHON_USEDEP}]
-		>=dev-python/beautifulsoup4-4.8.0[${PYTHON_USEDEP}]
-		>=dev-python/pylint-1.9.4[${PYTHON_USEDEP}]
-		dev-python/toml[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
diff --git a/dev-python/bandit/bandit-1.7.4.ebuild b/dev-python/bandit/bandit-1.7.4.ebuild
index bee6bbb3bc1a..e5fa5a6ea770 100644
--- a/dev-python/bandit/bandit-1.7.4.ebuild
+++ b/dev-python/bandit/bandit-1.7.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~s390 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~s390 x86"
 
 RDEPEND="
 	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/bitarray/Manifest b/dev-python/bitarray/Manifest
index 2707287b1b87..7e3eedaf7b35 100644
--- a/dev-python/bitarray/Manifest
+++ b/dev-python/bitarray/Manifest
@@ -1,5 +1,7 @@
 DIST bitarray-2.3.7.tar.gz 89721 BLAKE2B 8c56e82862a4314d199fa8021fbe4d0fefa5172f6c3c93573cc1d6a06d7965788d65e0b193f199f86d685c7edd0f0faf878db65243625427d4b6be6d2fb8c807 SHA512 4484f93001a74105bdb85155ee9975f7f399652634e6173a4502e2a8eae83dc4d331e638f6b2dc2a94e89aa695208586a502bc41583539271ae3869576de41c9
 DIST bitarray-2.4.0.tar.gz 95151 BLAKE2B 04b76ac59042b6b318f75944b84f1927844e7858b2559a81809fc905bfd080ac52fcc2ba89caa30b0329b74997b9547bd7a6bfeec22c7257c12b5435f178f5a5 SHA512 c668c378fe66bcc6579e2b687e272481c43285875924660cb1b5796e441d7f815580fde24d38d94f950d25dba043a85b2466768bc5dc6f2efa10836088d5eff2
+DIST bitarray-2.4.1.tar.gz 95300 BLAKE2B feee2339f66d0941719fca7bb9a43d3234d1043f894bb52346f89318e586397078d84afd386b027338b5186d609f0197d656288ac9f7f4bbd631e41056d7f24b SHA512 ba623e783bae879833ac7759599c085e86c2acb3c81780ce0df95e2b23764e494a33f1e27e52db8b634b6b04d02ebee693ce0186e7a2bb9bd73906856c19bade
 EBUILD bitarray-2.3.7.ebuild 563 BLAKE2B b4dccf93e0c28deb5c94f7639c33893fcb15892c1499e2cc332bfc40f4a10c82c7411cd736159b77cb0e6d81c011219796d36bcccdd8dc3a732ab26d916f7c54 SHA512 0f0c63060e1c549585429c3bc5dd13efd041cb26a78f5e79341f12832c812bd6d648385c1af8a67e71dd161fb58797b181d4a958c3a0ae235c1adbb633cdaa0e
 EBUILD bitarray-2.4.0.ebuild 565 BLAKE2B 29c4e27a474913cbc5ad733f50197ba664e0f013f8a1f9458acdbc41a3e0f388d6e61582c08a0611208464f65989012e6cc0c04adf54463c366ed2f04ba15876 SHA512 25a9855e44d8c73a1784384e171796c9801c63249dff4e739386bcb12b7591c539f69693e23c9f8e399251b393bc0f9e01750dc903a4775a56c1327c14c8ae5f
+EBUILD bitarray-2.4.1.ebuild 565 BLAKE2B 29c4e27a474913cbc5ad733f50197ba664e0f013f8a1f9458acdbc41a3e0f388d6e61582c08a0611208464f65989012e6cc0c04adf54463c366ed2f04ba15876 SHA512 25a9855e44d8c73a1784384e171796c9801c63249dff4e739386bcb12b7591c539f69693e23c9f8e399251b393bc0f9e01750dc903a4775a56c1327c14c8ae5f
 MISC metadata.xml 1195 BLAKE2B 4b6e3f2c8304d9a1af4382a876987ea116ae62c369b70468e9791a075c343a6901c0642ca76826577a8ba85480915e7297e1476aff0295188904c016cdeaa5cb SHA512 4943b61fa1dd60662510f27d3ff5d8ef135c327be620c1eb948e8a1e9e4ccbd5e386be7af7e5c7b04614ac9a11e7c14f4a0a8c35a9580d631b41df09b5033f19
diff --git a/dev-python/bitarray/bitarray-2.4.1.ebuild b/dev-python/bitarray/bitarray-2.4.1.ebuild
new file mode 100644
index 000000000000..75035a316dcc
--- /dev/null
+++ b/dev-python/bitarray/bitarray-2.4.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Efficient arrays of booleans -- C extension"
+HOMEPAGE="
+	https://github.com/ilanschnell/bitarray/
+	https://pypi.org/project/bitarray/"
+SRC_URI="mirror://pypi/b/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="PSF-2"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+python_test() {
+	"${EPYTHON}" bitarray/test_bitarray.py -v || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/black/Manifest b/dev-python/black/Manifest
index 5e581b42a45d..68bf5b8a6d0f 100644
--- a/dev-python/black/Manifest
+++ b/dev-python/black/Manifest
@@ -1,7 +1,9 @@
 AUX black-21.12_beta0-support-tomli-2.patch 1530 BLAKE2B 2b378a2da1e067b6e2a562556423f1359122934bf946468bda1eeb556064eff9de59837d5375df5bea846175ff32e6ed3a98e86ffd485f07c2e947c2d9b1d069 SHA512 d8302a9febff804e9ee81820c00c6caa3c975349244f22136a086428dc47c259b969caafd83983cfaa1d26b13c0d42bd38c2df477b9c574e545ef36915668c0c
 DIST black-21.12b0.tar.gz 1200305 BLAKE2B cd019b230d2ba1fab88075a5e14cb5de88a4ee283b53d869564f071a104d2810ca31c04db09310b99a1610bdace7d5b9b360b2a3a4810822322a4eacc8998ad8 SHA512 1f6e4eeafd653fa9db608585110f5c5067942031b2d67e630befa899d7fca3c35f52cbde8fc91c2697fb294fb16525254756ebce16e556fc139b621f738bfa22
 DIST black-22.1.0.tar.gz 1161720 BLAKE2B d74cbdd39dc1576583cee57089cb6d75a338f2d6640697adda79d38d02eeb51664049dca934d5014761d0fd4080ca2f40a3ea10c30e40bde9fe6af6c178b202c SHA512 9b97a3b32ecebebeb61ea581784a9b2215540c20533097fe87d5ef3c046dbe7c2ab8f2f21d1884cbe0ddd458434f17eb9b540764f955385873e6fdef86c3014c
+DIST black-22.3.0.tar.gz 1154456 BLAKE2B c89b43722839748dff0ce60debb684cd8eeae5ef5fb7e080f6b0031412381d7be121ce62ad252a67fa7930726243680a4bf183417611617be5af39722164289d SHA512 fc44576b93a6e158f625ad5444247f6a59a1ebcc7f0c73ed40d557a9a865457b297eabd492f01999e51ee3e5c3fa83f3d6e3c10937ecaa8c1d36f7541736d2e4
 EBUILD black-21.12_beta0-r1.ebuild 1859 BLAKE2B 55de6d5698665e5e9dbaced8e5a8f3b38399899e5bd03d74b86281b6b8f0c2704181612a0aec3c062f4444618311bb2995a1ff631ca38a5d11e57d0683f284b7 SHA512 1a098b1dbe13f26f40e628e26e7115cb7d3aaa36e74d041b66fc348a7bf5b7e3fcc917e2be0ca0c2816584e618748c8c06604455b10e67498fcd1b57a837ddd9
 EBUILD black-21.12_beta0.ebuild 1742 BLAKE2B f141ef150cb63b6878ca9cf3be3782f83443cdd545b53a23c55c3df164cf53d601d773043acc52035d98f80f707df8d55eab387f48757ed52342e00a6d094275 SHA512 d5590abc3f486285ad92f01aca47df729cea9c292cd2c4f1958b687d396b51ba825c2497fc9896f824387485930b6d97d66c74fef580b00cda0173f481b1f101
 EBUILD black-22.1.0.ebuild 1398 BLAKE2B 706c43bd99730f9aa01c50a1910192e0f09070287d4447e581d4b4259c3a5a4a822ba6691124fea1f89f92085004079de619af68239d42a68ea526dce524ed39 SHA512 6a9653a3978d61494662dee26969bd4628010a024f42c860e79b83603c7d7568d1f4eb2d885009fbd1fd2ae203b56bb83a8294ce5d559254bb1cde72f99e352a
+EBUILD black-22.3.0.ebuild 1398 BLAKE2B 706c43bd99730f9aa01c50a1910192e0f09070287d4447e581d4b4259c3a5a4a822ba6691124fea1f89f92085004079de619af68239d42a68ea526dce524ed39 SHA512 6a9653a3978d61494662dee26969bd4628010a024f42c860e79b83603c7d7568d1f4eb2d885009fbd1fd2ae203b56bb83a8294ce5d559254bb1cde72f99e352a
 MISC metadata.xml 397 BLAKE2B 505ed4127741ef8d2fd77c36e6ad2d6168dca8ae5570cf7606a557fad29393c0dd78fe2eb1fe990d9d69abec19fb65d563481160b0bf0a914997b114e73f7c66 SHA512 357189214d3cc2a026b8c29ee5c695a62d73db229ca1f71372bfc5a1120317a4c4ffac942f5a196f20e84ae8988a4e707d4194ebde12ef7c96eb713b398f587c
diff --git a/dev-python/black/black-22.3.0.ebuild b/dev-python/black/black-22.3.0.ebuild
new file mode 100644
index 000000000000..5af8bdaa4f15
--- /dev/null
+++ b/dev-python/black/black-22.3.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1 optfeature
+
+MY_PV="${PV//_beta/b}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="The uncompromising Python code formatter"
+HOMEPAGE="https://black.readthedocs.io/en/stable/ https://github.com/psf/black"
+SRC_URI="https://github.com/psf/${PN}/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
+
+RDEPEND="
+	>=dev-python/click-8.0.0[${PYTHON_USEDEP}]
+	>=dev-python/mypy_extensions-0.4.3[${PYTHON_USEDEP}]
+	>=dev-python/platformdirs-2[${PYTHON_USEDEP}]
+	>=dev-python/pathspec-0.9.0[${PYTHON_USEDEP}]
+	>=dev-python/tomli-1.1.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/typing-extensions-3.10.0.0[${PYTHON_USEDEP}]
+	' python3_{8..9})
+"
+BDEPEND="
+	>=dev-python/setuptools_scm-6.3.1[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/aiohttp-3.7.4[${PYTHON_USEDEP}]
+		dev-python/aiohttp-cors[${PYTHON_USEDEP}]
+		dev-python/colorama[${PYTHON_USEDEP}]
+		dev-python/parameterized[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${MY_PV}
+
+pkg_postinst() {
+	optfeature "blackd - HTTP API for black" "dev-python/aiohttp dev-python/aiohttp-cors"
+}
diff --git a/dev-python/blessings/Manifest b/dev-python/blessings/Manifest
index 3adabecfe9b1..47da7b1db4d1 100644
--- a/dev-python/blessings/Manifest
+++ b/dev-python/blessings/Manifest
@@ -1,3 +1,3 @@
 DIST blessings-1.7.tar.gz 22844 BLAKE2B 3694d3e421416bf876265fd0877240b2e0d61e8c58dfa63a6e74dd2f5efd2307cc4a0eef0e825adc0c0f37f6e78e15640362f9477c0dc5c89846416e16f180a9 SHA512 9b1e3eded3fa588c48898d88ba466836be8f25264ce908a2289504e8f13b01315ae1686ee34c0e3a44cdd2bf73da8c1b65e0aaf49ffc0e5b29c412a497c3d76e
-EBUILD blessings-1.7-r1.ebuild 865 BLAKE2B c38b5d255776817a9e7897a5413584ee575b79840b8081ce95dcfd6b6ab0d3b89bce2fd794cf7bdb863a05c5a1568c68509055be725db1004fcf355e6eae1d34 SHA512 d2b4c58bdb263be1f5aa6058772901af9a0e88ea4a5fc099dc771319b9e0f5c4aa18591c1c8f59b31d6fa7066766b11f6e1a8f12cd81c9dda23d582caafb7400
+EBUILD blessings-1.7-r1.ebuild 872 BLAKE2B 0ea57c1e397fcc809d80fcd98fcc95828ab6cba009b9f941cebc1862f115d9fb7f017c7a7695de4e43c8f479c628ced226302d0cdf8040e18687ad7b40090222 SHA512 2cb0c82a585acf4c730eec88f1ae177b3b9b4ab36b20feed1f6c938156a20b7652ba09976faea2a156dffd060c1970bf1450fe39f9b90016c8615118d3efea9c
 MISC metadata.xml 451 BLAKE2B 448082939a1f02b3c481b4877c1a0caf5b5545e5e8220a5232af612ad45ec605d0f251f2d66d3d44219d7af1da139e95852cdf19de2859dcdaa4461ff729d5aa SHA512 2e17e0eb21c10236ada1a3e55ebfab2a20f1029ad89aacadc2dfaa0b2d4d5d879a14517b8d9a406c45f802dee3df925a2b18f6846e1c3c05616daf6a00feb82a
diff --git a/dev-python/blessings/blessings-1.7-r1.ebuild b/dev-python/blessings/blessings-1.7-r1.ebuild
index 6b58627ad2dc..231b7fbf85b0 100644
--- a/dev-python/blessings/blessings-1.7-r1.ebuild
+++ b/dev-python/blessings/blessings-1.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/erikrose/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~riscv x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/blosc/Manifest b/dev-python/blosc/Manifest
index 902a5ba92734..38578e5f3568 100644
--- a/dev-python/blosc/Manifest
+++ b/dev-python/blosc/Manifest
@@ -1,4 +1,3 @@
 DIST python-blosc-1.10.5.gh.tar.gz 1570462 BLAKE2B e2ee3cc3827e1df89afc97a0cdc3f07670368d2edfea9b6ae32ecbb74b464d5311bbd7b129b3b94fb91d20fd579425859412665de397facd4c119e429fbcd014 SHA512 75b91e50def65ecbbdd29f7b7aba65c6ca611eeeaa9e55583c0253eda5d1e1ab7d899d0c77c45ae999188f701205f20d8c8ed130a3865433edd87db3c0eeebb0
-EBUILD blosc-1.10.5-r1.ebuild 973 BLAKE2B 1a068e6abee90f69f685c6344296e97f3388060b8cbb302f1027133e6db21452e3fb5e80237670904398f4c5e7da8519b1e2dce520af04afcfe1a2f079e98478 SHA512 2d0105cdefe407577c5312b265c4bf0d905ddb28d3b6ad13486bb73905013306b7186686b72af708ea292b17247e06e75e5c3c2511ac084a7e801a52cab23155
-EBUILD blosc-1.10.5.ebuild 1040 BLAKE2B 5aa9588930e78101a2bd90a636507c89fdcdee71e6bd61283568f7ae0265484ee26dc68a160841885b24b00f55397c0b4d5907fdbf6e49c115ddad49c52e65d0 SHA512 8326622d5a5d297610b7fe039b57f4b1d5c2b1fbdc4fce8f75537e88d12089e1bcb61d02a928d3effe9b037332043d1ee53502eebc9ebda9024bca13e39854e9
+EBUILD blosc-1.10.5-r1.ebuild 967 BLAKE2B 46427100a1e846ce6067829fb17726c5879634efeda8ad53a61cdea1d853b3f63aa98918f78749e7f7076105f653191b7fc1db55796609463daa050fe0092c1b SHA512 93475018956bccb45c6c3e0f0dc0739bdadaf7047398fe21274de60ba9d9cd132009f5f2319acfafe17f31abe0813fa4a24ba36ed86ef13a3b945a64f80db942
 MISC metadata.xml 999 BLAKE2B e8ab94b206c8364bc10de6e57872e6f4264927118269fe74dc040d5fc1c8fae7b3422a62c6d675b47a87168f03eec83a8ea16210bfd1f7e11920ae94844d9546 SHA512 5dec5341aa068659bb74d206ed7ffc96bc47d1128eb48827ec189be38d9112079c37a140dadc6326ba84352ccbeeac453888391920737bbf73153431d8be1720
diff --git a/dev-python/blosc/blosc-1.10.5-r1.ebuild b/dev-python/blosc/blosc-1.10.5-r1.ebuild
index e699cb10dabb..79ef5a1ac142 100644
--- a/dev-python/blosc/blosc-1.10.5-r1.ebuild
+++ b/dev-python/blosc/blosc-1.10.5-r1.ebuild
@@ -19,7 +19,7 @@ S=${WORKDIR}/${MY_P}
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/blosc/blosc-1.10.5.ebuild b/dev-python/blosc/blosc-1.10.5.ebuild
deleted file mode 100644
index a5785bfc0ba9..000000000000
--- a/dev-python/blosc/blosc-1.10.5.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-MY_P=python-blosc-${PV}
-DESCRIPTION="High performance compressor optimized for binary data"
-HOMEPAGE="http://python-blosc.blosc.org"
-SRC_URI="
-	https://github.com/Blosc/python-blosc/archive/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-libs/c-blosc-1.19.0:="
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-python/scikit-build[${PYTHON_USEDEP}]
-	test? (
-		dev-python/numpy[${PYTHON_USEDEP}]
-	)
-"
-
-DOCS=( ANNOUNCE.rst README.rst RELEASE_NOTES.rst )
-
-python_prepare_all() {
-	export USE_SYSTEM_BLOSC=1
-	export BLOSC_DIR="${EPREFIX}/usr"
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	"${EPYTHON}" -m blosc.test -v || die
-}
-
-python_install() {
-	distutils-r1_python_install
-	python_optimize
-}
diff --git a/dev-python/bluelet/Manifest b/dev-python/bluelet/Manifest
index cc0a93822f3e..239747f18453 100644
--- a/dev-python/bluelet/Manifest
+++ b/dev-python/bluelet/Manifest
@@ -1,4 +1,3 @@
 DIST bluelet-0.2.0.tar.gz 14182 BLAKE2B c05560f4cd1b4aaf3f25d22bbf5eabfef695cb1686742ae274df9024786ca08a4604ec9a24ad185718ad8d8876f8b5fb12df0f45cdda5b61fb6fbdc8fb09bcaf SHA512 58bd8df4b61f23a53f9310b68e5754155c00d598c9bcb7724e90ef6722ee5d6017751c2e056eaaa64cca71b89c391d248c14477457f30ebf2b28841a3fdc98fa
-EBUILD bluelet-0.2.0-r1.ebuild 604 BLAKE2B 5c84c79f78fbfa58f3373a178d6c2a546cdc0bb4b80776ff07751e4a4bc14640857a32d66975d50ac1468e0094cba21a5c85f374504b325f843eb2bad978acc2 SHA512 f8b3b66326114601e3791505e0ee6956783c038d168976cbfd3c90a24ca75576d27ace83bf51edf1cdfef2d0ebd8e3a893d74226f37af2c875360771742cb397
-EBUILD bluelet-0.2.0.ebuild 600 BLAKE2B 287e7022a9456ccf849d472749392bc41802f098b819a091367e67b179a442dc3f84bcf7909e35915b147c13e6d0d1e2265a63ec54103629c5f7252bdab629fd SHA512 a52061f4bd6cb3aa77f47d66762db4b1da38587a875de1b879826f64f11549966096aea0a695a2fb53327ecd37737cd119f9a367ae7e9d380f7bfc639bbd53c0
+EBUILD bluelet-0.2.0-r1.ebuild 605 BLAKE2B 4728fb160fdda6214f65fbdff6f569ebf84b1169ec09ecf8d181ee04fce413742c776f4524397514b6bbb29fd1b35de5ab8082bd0544bfd4bbaea3c38d0acdca SHA512 edbce94d999ce089e7eaef1e817335391eca2413e4eb13ffe994230b41a970b437967449c82bd81a61087f92c0c21d3c6101aee05a0fb039a815bb289d68dd37
 MISC metadata.xml 1119 BLAKE2B 885b96dfe070abfd98d033d66135ee952aeb3dfdd012f491e943abd73b0b270eadbf005fa7e364a90e64b6a228a902dd2136f57de8412bbd40ea55857287ac59 SHA512 6c044e853a5786b8808e8d5f496a4230c284f497bbda8ebf369d49fbad684af9a22425a9ad879cf80535046129e294b388ac0045947a9438dc8234b344bd2f8c
diff --git a/dev-python/bluelet/bluelet-0.2.0-r1.ebuild b/dev-python/bluelet/bluelet-0.2.0-r1.ebuild
index 77f005715b72..71584a5d606d 100644
--- a/dev-python/bluelet/bluelet-0.2.0-r1.ebuild
+++ b/dev-python/bluelet/bluelet-0.2.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/sampsyo/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~x86"
 IUSE="examples"
 
 python_install_all() {
diff --git a/dev-python/bluelet/bluelet-0.2.0.ebuild b/dev-python/bluelet/bluelet-0.2.0.ebuild
deleted file mode 100644
index 87d8e02f69c6..000000000000
--- a/dev-python/bluelet/bluelet-0.2.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Module for pure Python asynchronous I/O using coroutines"
-HOMEPAGE="https://pypi.org/project/bluelet/"
-SRC_URI="https://github.com/sampsyo/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="examples"
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if use examples; then
-		dodoc -r demo
-		docompress -x /usr/share/doc/${PF}/demo
-	fi
-}
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index b78132dc6c32..204bcb605187 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -1,10 +1,28 @@
 DIST boto3-1.21.15.tar.gz 476516 BLAKE2B 306c7ee69dec5ff1fbd76ed32aaebdf0f52cdc49df600562f49cd543e5f331c6dbf88001070022043b9fd01c651af83b1c8c0966292c90791831f2e9d9fc4a84 SHA512 9d431fcbdcd42658cd52094b97c151fd10a68f2c83a457dccdf7991c8358c17b32faa09e3941f6d6e72bad8cda1b93dcfae8d78585dae43790c0ec248f0ab15d
 DIST boto3-1.21.22.tar.gz 479768 BLAKE2B 3ae647a4c06cb9f7c4c32216dba439ce8bbf346fccf5a8651c08b398bcb7fdb0a4ac81c8d311625d0f50634b90c2f8a02160a19435db836ad05edf0d998a148d SHA512 583a49907339fdb8bb1deaec7683dad6bd0c2836a05cc317a8fc97a17e7b79fd114677fd6342cf6f96b1140bf1bcf9ca0fb1fd3af1c86600e6cfba5bbbf21ec2
 DIST boto3-1.21.25.tar.gz 482117 BLAKE2B 7f4823fa6045addb4b4ed01e83d1095e9f56dac7c232c5cc744cd956ce0c9840bf70a2901cf4094b0b403ba38129529880b1f1c91d26e9d85db9ca714cfc447b SHA512 2571098f20054d09e691adef67f518321349a55ae3f6eaf3b4ae1d58eefe2e61c67f1bce79366dd017bbaa86e8ffebea12f0d22c712f0b00487fe39e169ce115
+DIST boto3-1.21.26.tar.gz 482624 BLAKE2B 19f38b86eab6363ff86febc9f7623def010314a70e3d88c405bf641a4cd0b2de390fb69f5205c5df2e7d71c80a31989efbc64c442bd02d3d2a5efb7ee937596d SHA512 85848df7f5863df5ddc97be29f734bbdff54d195d5d1e465b35f3693b8196c03422b9a8024a2ecdaead40a4ddd1742c06e9d2e5b90fd4de28dffd6609f209dfb
+DIST boto3-1.21.27.tar.gz 482968 BLAKE2B f8dbabe73377a861cf1d3d2e9388f7ba91f2047d8ce792b44a10693e5b0575924b3abbd8ec2b72d0c3b9a553bb088fc17dc4cd23b571f375db45737376931a46 SHA512 54bb43022ba12fc7b5c54872632cd46c07c6f167246917b5413cdd30de6c327bc625410cdfe62f4ff257ad7c42da762d2bcec5515367e214131259ddc69a9061
+DIST boto3-1.21.28.tar.gz 483052 BLAKE2B 89afa5ff7d9b8c256b525ef2d67a17de45fda8b63a3640513d9a786b2bcd77c0b8a5a572deb4bf3fb264fcc9c317c510b27fd836cba958816514bc1ac32bc327 SHA512 af6a8d11371b3616b15a5bf996b165808590d0074ead1bb54ee1b7a8357cd076648700838aba84f7d370120981db36096a6060c8b00ea7bdd9a4da5cb5ddcb8c
+DIST boto3-1.21.29.tar.gz 483137 BLAKE2B fa753a52923d013a3c5b3981fb32614bc5cb7be1b7696d2b60df877b33814553c22eccaf8d66e4719922b4289181c2e8356a3b377b25e81c8bdf8496cd49d0a9 SHA512 6c916fce1097d226b865cebf2d8791bc40506d9dd5b2db49b61e038872fb2f51d9de727ab8c9da3accced2563e81314dbe87788af57d6366fb90c446d3b79555
+DIST boto3-1.21.30.tar.gz 483635 BLAKE2B b42a3f647c2b609ac6604e4390d4c1c45757a15d420ea9f9710a0c469547bdb8c1fbc3e4737de88fa628e58b6021da5e470cb3a04f95f8dd383df0089fa0d13c SHA512 993c584e3cdad05436b88b2959cc359713b96a20e54be12d305544b8f1e059196caa76566c88d979490d40bb73a2ee213618ec3e4a20cc01328a00e9f160fd53
+DIST boto3-1.21.31.tar.gz 484562 BLAKE2B f647e7eb053ed38a8c670073ba028e5cccbb540807d8f9a1c60aec1a1e557937f62391a33d63edb69c123cf832b9eaeaa8dbfebb673b554381d548d60995fbfd SHA512 229b4c95743b7e217b2698130fc86970eb346728bdc0bc3cc0f5a9dc48a7922c21d04234a2f9ff9da29fb2d1742e5cca5e42f11ec92d0dd6ee29b3e2baf34c52
+DIST boto3-1.21.32.tar.gz 485694 BLAKE2B da6fa6f38b234af9e67bfeb8182751f1ac533a2aea72d8d407aea21554501f598c9da71f3c30dd952248c1ab244c849b779a329fc941d05b53325fe46de2aba4 SHA512 d65cffa91ae1a29e69e4bac2fc0af704987e9bca914f3f905e00c383bc92127c6e41beed71e9445e3f484c6dadde2372aca69f550af600abbb42731275c53eda
+DIST boto3-1.21.33.tar.gz 486096 BLAKE2B 9a37ec9e7d9ede3aa8fb2e7b3c90ae799a803f64a4793ccc2431e23fc71b7db0cb8e1268117eecb2c69baaf60b8e6bd8468c7d6b3288a6ac509c3add7337ba60 SHA512 bd35e3225abb7c7803c2b2f187ecd03f3c59d095f3f571e86b24ff193c09cb32069a88725a2b964a143a752c627be7f92b985add90b5f26eaed766d655e532e1
+DIST boto3-1.21.34.tar.gz 486432 BLAKE2B 9872f7ee32f48f399e1e7a404dc9f68c15ecb639308654a596cc31b3614071fc0b6ef5752eff788f5a363cd11a3cd99bcdc32038f7a8b95971abe71d0d891331 SHA512 3ea997289aa5d1a74fd3c1542b413299b9d89b1f3bc9e3f4cdc568f688b82401772def3d57c1c78d1a5bb0736aa39004cd21f291a35906cf02e9be5cc3321495
 DIST boto3-1.21.8.tar.gz 473069 BLAKE2B f08f76fb9c4e56e6ba5624c885973599505769d7f9eea6e20a06e1a641768b1f7b108fc7293282a55bf4c7d2b62eb34853f46b8c3ada9afb8fc25624daa60c12 SHA512 23ed88dcaefe3224db05959251befaae4f03859bf00daf649db1e838e5fb92e01a6da4bee8083366d804404aac358df19d7e4552d6aaf39f9c4b371ccc7f9088
 EBUILD boto3-1.21.15.ebuild 1570 BLAKE2B 53ee8a19917c517edba8c435e535cfbfaa85beac364578971c97d2eba3669f2500c2d13420a2efd447b50e6d29d48ad6ee9aff62dd11d73012884018dd1e3b80 SHA512 e55368dd8e440d6220915a691aad0aa8e8cdcb3e191030b4d406efbdabfb5ab8e56b81ccad728bcbf56c7f363f7f1b3238ec314765bcbe52b5f245c3b4e04ae0
 EBUILD boto3-1.21.22.ebuild 1571 BLAKE2B 1b87e4a517f7f0c5e5a0dfb0d0f3ded875baec635bed006cd68b93bd8add314c5348cfbb340120f9d8b17438ed694cfb0102822d9c3c2edb27ef1983eb5fbc7b SHA512 a8c8ad219e89c1af3c657a76c67353391f19ab9e72fc59ec7bf054182d6698e079ac23b80012660baff3a833887cd02f79ce120406423d1d3f422d220dc3c54d
 EBUILD boto3-1.21.25.ebuild 1571 BLAKE2B 1b87e4a517f7f0c5e5a0dfb0d0f3ded875baec635bed006cd68b93bd8add314c5348cfbb340120f9d8b17438ed694cfb0102822d9c3c2edb27ef1983eb5fbc7b SHA512 a8c8ad219e89c1af3c657a76c67353391f19ab9e72fc59ec7bf054182d6698e079ac23b80012660baff3a833887cd02f79ce120406423d1d3f422d220dc3c54d
+EBUILD boto3-1.21.26.ebuild 1571 BLAKE2B 1b87e4a517f7f0c5e5a0dfb0d0f3ded875baec635bed006cd68b93bd8add314c5348cfbb340120f9d8b17438ed694cfb0102822d9c3c2edb27ef1983eb5fbc7b SHA512 a8c8ad219e89c1af3c657a76c67353391f19ab9e72fc59ec7bf054182d6698e079ac23b80012660baff3a833887cd02f79ce120406423d1d3f422d220dc3c54d
+EBUILD boto3-1.21.27.ebuild 1571 BLAKE2B 1b87e4a517f7f0c5e5a0dfb0d0f3ded875baec635bed006cd68b93bd8add314c5348cfbb340120f9d8b17438ed694cfb0102822d9c3c2edb27ef1983eb5fbc7b SHA512 a8c8ad219e89c1af3c657a76c67353391f19ab9e72fc59ec7bf054182d6698e079ac23b80012660baff3a833887cd02f79ce120406423d1d3f422d220dc3c54d
+EBUILD boto3-1.21.28.ebuild 1571 BLAKE2B 1b87e4a517f7f0c5e5a0dfb0d0f3ded875baec635bed006cd68b93bd8add314c5348cfbb340120f9d8b17438ed694cfb0102822d9c3c2edb27ef1983eb5fbc7b SHA512 a8c8ad219e89c1af3c657a76c67353391f19ab9e72fc59ec7bf054182d6698e079ac23b80012660baff3a833887cd02f79ce120406423d1d3f422d220dc3c54d
+EBUILD boto3-1.21.29.ebuild 1571 BLAKE2B 1b87e4a517f7f0c5e5a0dfb0d0f3ded875baec635bed006cd68b93bd8add314c5348cfbb340120f9d8b17438ed694cfb0102822d9c3c2edb27ef1983eb5fbc7b SHA512 a8c8ad219e89c1af3c657a76c67353391f19ab9e72fc59ec7bf054182d6698e079ac23b80012660baff3a833887cd02f79ce120406423d1d3f422d220dc3c54d
+EBUILD boto3-1.21.30.ebuild 1571 BLAKE2B 1b87e4a517f7f0c5e5a0dfb0d0f3ded875baec635bed006cd68b93bd8add314c5348cfbb340120f9d8b17438ed694cfb0102822d9c3c2edb27ef1983eb5fbc7b SHA512 a8c8ad219e89c1af3c657a76c67353391f19ab9e72fc59ec7bf054182d6698e079ac23b80012660baff3a833887cd02f79ce120406423d1d3f422d220dc3c54d
+EBUILD boto3-1.21.31.ebuild 1571 BLAKE2B 1b87e4a517f7f0c5e5a0dfb0d0f3ded875baec635bed006cd68b93bd8add314c5348cfbb340120f9d8b17438ed694cfb0102822d9c3c2edb27ef1983eb5fbc7b SHA512 a8c8ad219e89c1af3c657a76c67353391f19ab9e72fc59ec7bf054182d6698e079ac23b80012660baff3a833887cd02f79ce120406423d1d3f422d220dc3c54d
+EBUILD boto3-1.21.32.ebuild 1571 BLAKE2B 1b87e4a517f7f0c5e5a0dfb0d0f3ded875baec635bed006cd68b93bd8add314c5348cfbb340120f9d8b17438ed694cfb0102822d9c3c2edb27ef1983eb5fbc7b SHA512 a8c8ad219e89c1af3c657a76c67353391f19ab9e72fc59ec7bf054182d6698e079ac23b80012660baff3a833887cd02f79ce120406423d1d3f422d220dc3c54d
+EBUILD boto3-1.21.33.ebuild 1571 BLAKE2B 1b87e4a517f7f0c5e5a0dfb0d0f3ded875baec635bed006cd68b93bd8add314c5348cfbb340120f9d8b17438ed694cfb0102822d9c3c2edb27ef1983eb5fbc7b SHA512 a8c8ad219e89c1af3c657a76c67353391f19ab9e72fc59ec7bf054182d6698e079ac23b80012660baff3a833887cd02f79ce120406423d1d3f422d220dc3c54d
+EBUILD boto3-1.21.34.ebuild 1571 BLAKE2B 1b87e4a517f7f0c5e5a0dfb0d0f3ded875baec635bed006cd68b93bd8add314c5348cfbb340120f9d8b17438ed694cfb0102822d9c3c2edb27ef1983eb5fbc7b SHA512 a8c8ad219e89c1af3c657a76c67353391f19ab9e72fc59ec7bf054182d6698e079ac23b80012660baff3a833887cd02f79ce120406423d1d3f422d220dc3c54d
 EBUILD boto3-1.21.8.ebuild 1563 BLAKE2B a3064c6a72f92bab2abba12e88334ffb8f6cf706ff6f8c5834958a93dc9045324dc20bd36f0e987d28aa2c90dec58c820b86d3e8d3b551d19061b6c58e2a1e3b SHA512 5a0c3c442d405304bece4cb399f72cc6a1333b94a2e635ea9f8e5334d97d449325949db30a4936b5005ea38a00e922f87757ffb17fae5182125ddf9c2d90bcf9
 EBUILD boto3-9999.ebuild 1570 BLAKE2B 53ee8a19917c517edba8c435e535cfbfaa85beac364578971c97d2eba3669f2500c2d13420a2efd447b50e6d29d48ad6ee9aff62dd11d73012884018dd1e3b80 SHA512 e55368dd8e440d6220915a691aad0aa8e8cdcb3e191030b4d406efbdabfb5ab8e56b81ccad728bcbf56c7f363f7f1b3238ec314765bcbe52b5f245c3b4e04ae0
 MISC metadata.xml 493 BLAKE2B 7d6324fc877ffe1d20c5369c2af0b09a7028f94d28f1841188913d0d8be7ea699c9d3f92c624992c4c96bd69615d3a1211a2483c76c56b7d3082492e43512523 SHA512 44420d8c03d5986f990b76369edfa8dfd7659b4952db3ad946fd05392ec594628a28745ad888d055d4f074d5214f61fcffafe6c04c4ab54109d45ac0371582bd
diff --git a/dev-python/boto3/boto3-1.21.26.ebuild b/dev-python/boto3/boto3-1.21.26.ebuild
new file mode 100644
index 000000000000..6fcba460ab1d
--- /dev/null
+++ b/dev-python/boto3/boto3-1.21.26.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1 multiprocessing
+
+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 ~riscv ~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}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	epytest tests/{functional,unit} \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+}
diff --git a/dev-python/boto3/boto3-1.21.27.ebuild b/dev-python/boto3/boto3-1.21.27.ebuild
new file mode 100644
index 000000000000..6fcba460ab1d
--- /dev/null
+++ b/dev-python/boto3/boto3-1.21.27.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1 multiprocessing
+
+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 ~riscv ~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}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	epytest tests/{functional,unit} \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+}
diff --git a/dev-python/boto3/boto3-1.21.28.ebuild b/dev-python/boto3/boto3-1.21.28.ebuild
new file mode 100644
index 000000000000..6fcba460ab1d
--- /dev/null
+++ b/dev-python/boto3/boto3-1.21.28.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1 multiprocessing
+
+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 ~riscv ~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}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	epytest tests/{functional,unit} \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+}
diff --git a/dev-python/boto3/boto3-1.21.29.ebuild b/dev-python/boto3/boto3-1.21.29.ebuild
new file mode 100644
index 000000000000..6fcba460ab1d
--- /dev/null
+++ b/dev-python/boto3/boto3-1.21.29.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1 multiprocessing
+
+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 ~riscv ~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}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	epytest tests/{functional,unit} \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+}
diff --git a/dev-python/boto3/boto3-1.21.30.ebuild b/dev-python/boto3/boto3-1.21.30.ebuild
new file mode 100644
index 000000000000..6fcba460ab1d
--- /dev/null
+++ b/dev-python/boto3/boto3-1.21.30.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1 multiprocessing
+
+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 ~riscv ~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}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	epytest tests/{functional,unit} \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+}
diff --git a/dev-python/boto3/boto3-1.21.31.ebuild b/dev-python/boto3/boto3-1.21.31.ebuild
new file mode 100644
index 000000000000..6fcba460ab1d
--- /dev/null
+++ b/dev-python/boto3/boto3-1.21.31.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1 multiprocessing
+
+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 ~riscv ~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}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	epytest tests/{functional,unit} \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+}
diff --git a/dev-python/boto3/boto3-1.21.32.ebuild b/dev-python/boto3/boto3-1.21.32.ebuild
new file mode 100644
index 000000000000..6fcba460ab1d
--- /dev/null
+++ b/dev-python/boto3/boto3-1.21.32.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1 multiprocessing
+
+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 ~riscv ~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}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	epytest tests/{functional,unit} \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+}
diff --git a/dev-python/boto3/boto3-1.21.33.ebuild b/dev-python/boto3/boto3-1.21.33.ebuild
new file mode 100644
index 000000000000..6fcba460ab1d
--- /dev/null
+++ b/dev-python/boto3/boto3-1.21.33.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1 multiprocessing
+
+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 ~riscv ~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}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	epytest tests/{functional,unit} \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+}
diff --git a/dev-python/boto3/boto3-1.21.34.ebuild b/dev-python/boto3/boto3-1.21.34.ebuild
new file mode 100644
index 000000000000..6fcba460ab1d
--- /dev/null
+++ b/dev-python/boto3/boto3-1.21.34.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1 multiprocessing
+
+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 ~riscv ~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}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	epytest tests/{functional,unit} \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index 3e5fd733e52a..6d37e1fd5f23 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -2,10 +2,28 @@ AUX 1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch 1056 BLAKE2B ecdf805cd61e3
 DIST botocore-1.24.15.tar.gz 8820413 BLAKE2B 1a842d811b0471ee6881fc6fbae9726912636c9a83ed9e1395ae96705f6ef47cbb5d6b134a011da747951b7570e722af5a60c949e9301d509a79f431a797ca70 SHA512 d614d6f065a77e5d4dda9c8dbe401feae4e83398c5d2508b0807984fc8783b31cd6c507663c90a08daa5ccbf95b450633928599cd340227ab5dc90ea00fa1bbe
 DIST botocore-1.24.22.tar.gz 8839717 BLAKE2B 7b3843900da913561ab2a99f7371139cd8fd89a2eb52a90b33f8fb4c0449ff23a00f56347a2916b271346acf2c0721af0a9695bff3663888aa87c790705ce4c3 SHA512 070222b5eca46fa5463620af63816bc8813c717a56b4c41294556130390959ac14570a1256542f145a5b36727ced9657b386fcd5f538d64912c8a9f049673bd6
 DIST botocore-1.24.25.tar.gz 8852839 BLAKE2B feb0f5de1d34b9f5a1b20f76480f432059c74293c70d310234beb8515741883d639dc54d7843d47e03aa107846d1a83af29fb98e6cc519aea289841a17464f56 SHA512 d2bb402bff2af857d433b379d81b727120543de6a5cf3d13f0c5dd60cef219fd5ea6362156c5284bb06860ec2ca0f1823fce4dccda03e4213eb737e45470ca0d
+DIST botocore-1.24.26.tar.gz 8855676 BLAKE2B ad8e82872429043a9a80d6584a5a8af623ce91b516c045284b8ea618629c7cf65195433691db7eced91969ccb14fc8c7f57956897b528c6861fe84175d46286b SHA512 2f08bcd1db6b9a5ede68be204d68f8fa0f1c906ca8d7dccb69d5775a66f86c990788970194058973a90ada928914ec92cf02d4cba30a85c7619bb38d3b117268
+DIST botocore-1.24.27.tar.gz 8856607 BLAKE2B aa149a79106bc6e9460d2b69b032b20d0fcd9b0a4d7dda04ac656e0681aff378267f5c6bde4e64432f309ad4ed89ff8cae50b0dc92f01086f8fbe433e5347ad3 SHA512 1cdeb2926bfdd54eb6805295982891cb02005c01ee74e3394d8680e486fd924f73322fb9ae56730deaf360b0e60c9fd482759d597eadb3dc180cb099beff487c
+DIST botocore-1.24.28.tar.gz 8856916 BLAKE2B d662fec904cdfb048582252cfa77dadfcb1fcb58bb61e4b273bda34120825a27bc630d2c7fffd215f8733cdba97534da643da6d5b094f3e2ee3c6bb0a86bb27f SHA512 3f10d5ccd2b8051598adc37e452b057a3b53bc267f9cc3fb71caa18f406e515f008f22d2394a37b194ff4c63477f93791e6bdc09657df5ba59377379227c106b
+DIST botocore-1.24.29.tar.gz 8857387 BLAKE2B b873c369a6a9fe2d44124385f618f1caac2986cdbad2ea53cf9ce481692431ff389de44b055b0128eefbd1e26d8cf205d49cfb22decfa11bf6cba8c00aa5df3f SHA512 dcc836ebe25a510aa13f4ba54be99c0d2d086e6a54d446bd303ecd13f3528f004be92ff6408690ebda84b8c13f83ef19cc4026422c2ad15e3c32abfdbf923e9d
+DIST botocore-1.24.30.tar.gz 8860517 BLAKE2B dcdfdd59482a071a2dc7c2250c303abab6840ac9d90a9f3e4183e8137dbf34b37941e9e471dc5795e3eb67cff356dce08dba5fad02bf54ff1628ca6f247a04be SHA512 69ff9f6f777052e3c8aeb7b92cc75d1aa90b88bb5256bcbcae6e4a5d6d41783ea205a58c99a59627ecd720cdfa23caf315c48c792218937d91e6699791e75548
+DIST botocore-1.24.31.tar.gz 8884591 BLAKE2B 596c0df9e5331cf81472c93f436caed79eb15da5770b11fb972d2f522308c02a2e2906d2d0de6bb2d79da0c7726a0e390fc0ff7aa043804031c99576e211c9e6 SHA512 cbae4220e8899189dc6e09facdf0576c9ac781aa892f8d1537ef7b4f56ba12794d073e65ecb503ab469c63a035c1675d8524f7f37f6538591ce183785533d6c9
+DIST botocore-1.24.32.tar.gz 8884956 BLAKE2B c899ed9b540663fc16e937d98c4c4383b5b0b9c36a976a6b872019bee46edb6db4b9fbe9cf5cebfa5fd1f43d37d21213c90a93802e6d95e4218693269021f5fe SHA512 06142282ff93918052fc6d4832061c65088a5ce8a9fdbfb587be4a1575edf1ed160c58159f25446c7717a841e9ddff00b0a95dd5926a738ffb166b70b42da71f
+DIST botocore-1.24.33.tar.gz 8885297 BLAKE2B 0c45249844be79643ea312a41ccb0fad06459fae0b1d419bfadec93b213ff2e24894dd255ac940d0df3325f7786386249ce7391b90a04467e9b0a2506e1a4661 SHA512 ac9f983495368cef53e2ca13c80cd8ef90d04efc6cedb7a38072cef67705b6c11bfc4d9802b94c805e798e6161960bf74ccf3b3c6c8c7a258d91b0e1e72aa852
+DIST botocore-1.24.34.tar.gz 8886786 BLAKE2B a100f9085d2d02d476b0748cca38eeff4e5fbe1441e930f286807d66e837c5fbd1ff1ee8328f87f27c5239891fa46d3324c038d8f0f76f10769cbac5f0628c38 SHA512 beee01425c19affed5c2c9b0d995d23c4e9454715c8ab8144c407e330b0d79099885d30376bb678fc28268cba53112b21bda8491614d2ebef4976b803e189bcf
 DIST botocore-1.24.8.tar.gz 8798121 BLAKE2B 4ca37ed7be0af62901bf154f75739cc7e07505a809e551884c72d5b5eed334fff1111fc6db016df522564a1f3d9b6f258e8eca96161a734711340bf880b553b5 SHA512 6ac2139694ab199313a0fb9a2f783b12de7f3915d10cba739f4758356a3b84a917c3c394954b6d82d7a62de907c6fe57a3559e2b9a625bb0479e7bacd31d21cc
 EBUILD botocore-1.24.15.ebuild 1646 BLAKE2B dd0c215ddae91bb93f37f150ea10ee1efdae56f39d878f977f5abad8918d9da64063345faeef31d7c7f0beddcc7374810380ab0b049fdac9f1f49d58976ae788 SHA512 ce261fe481bb083270a8c8e706556164b2eea45a5091590d30b0671f3e4948ad03b46d37e555096cb244405c8a56db12fcd0c46fc85122640bd3818760e5851f
 EBUILD botocore-1.24.22.ebuild 1650 BLAKE2B b286bf969ee64868dba6eca2bd16fb2d650e6393f9556a65b1509de19d114399a2005695ce8b7534e5fe35f7404e0bc7fd0f8e52ce675e73f0d6666cc2b3bc42 SHA512 4d56ec33157b7d00724598f0f55c27f3b5e625784b82fa27f2f75c3bb21a97ea7ddc1ac18f34b54da34454bac53af6617ab20f4f2caef51adb9b2f6e35906f82
 EBUILD botocore-1.24.25.ebuild 1650 BLAKE2B b286bf969ee64868dba6eca2bd16fb2d650e6393f9556a65b1509de19d114399a2005695ce8b7534e5fe35f7404e0bc7fd0f8e52ce675e73f0d6666cc2b3bc42 SHA512 4d56ec33157b7d00724598f0f55c27f3b5e625784b82fa27f2f75c3bb21a97ea7ddc1ac18f34b54da34454bac53af6617ab20f4f2caef51adb9b2f6e35906f82
+EBUILD botocore-1.24.26.ebuild 1650 BLAKE2B b286bf969ee64868dba6eca2bd16fb2d650e6393f9556a65b1509de19d114399a2005695ce8b7534e5fe35f7404e0bc7fd0f8e52ce675e73f0d6666cc2b3bc42 SHA512 4d56ec33157b7d00724598f0f55c27f3b5e625784b82fa27f2f75c3bb21a97ea7ddc1ac18f34b54da34454bac53af6617ab20f4f2caef51adb9b2f6e35906f82
+EBUILD botocore-1.24.27.ebuild 1650 BLAKE2B b286bf969ee64868dba6eca2bd16fb2d650e6393f9556a65b1509de19d114399a2005695ce8b7534e5fe35f7404e0bc7fd0f8e52ce675e73f0d6666cc2b3bc42 SHA512 4d56ec33157b7d00724598f0f55c27f3b5e625784b82fa27f2f75c3bb21a97ea7ddc1ac18f34b54da34454bac53af6617ab20f4f2caef51adb9b2f6e35906f82
+EBUILD botocore-1.24.28.ebuild 1650 BLAKE2B b286bf969ee64868dba6eca2bd16fb2d650e6393f9556a65b1509de19d114399a2005695ce8b7534e5fe35f7404e0bc7fd0f8e52ce675e73f0d6666cc2b3bc42 SHA512 4d56ec33157b7d00724598f0f55c27f3b5e625784b82fa27f2f75c3bb21a97ea7ddc1ac18f34b54da34454bac53af6617ab20f4f2caef51adb9b2f6e35906f82
+EBUILD botocore-1.24.29.ebuild 1650 BLAKE2B b286bf969ee64868dba6eca2bd16fb2d650e6393f9556a65b1509de19d114399a2005695ce8b7534e5fe35f7404e0bc7fd0f8e52ce675e73f0d6666cc2b3bc42 SHA512 4d56ec33157b7d00724598f0f55c27f3b5e625784b82fa27f2f75c3bb21a97ea7ddc1ac18f34b54da34454bac53af6617ab20f4f2caef51adb9b2f6e35906f82
+EBUILD botocore-1.24.30.ebuild 1650 BLAKE2B b286bf969ee64868dba6eca2bd16fb2d650e6393f9556a65b1509de19d114399a2005695ce8b7534e5fe35f7404e0bc7fd0f8e52ce675e73f0d6666cc2b3bc42 SHA512 4d56ec33157b7d00724598f0f55c27f3b5e625784b82fa27f2f75c3bb21a97ea7ddc1ac18f34b54da34454bac53af6617ab20f4f2caef51adb9b2f6e35906f82
+EBUILD botocore-1.24.31.ebuild 1650 BLAKE2B b286bf969ee64868dba6eca2bd16fb2d650e6393f9556a65b1509de19d114399a2005695ce8b7534e5fe35f7404e0bc7fd0f8e52ce675e73f0d6666cc2b3bc42 SHA512 4d56ec33157b7d00724598f0f55c27f3b5e625784b82fa27f2f75c3bb21a97ea7ddc1ac18f34b54da34454bac53af6617ab20f4f2caef51adb9b2f6e35906f82
+EBUILD botocore-1.24.32.ebuild 1650 BLAKE2B b286bf969ee64868dba6eca2bd16fb2d650e6393f9556a65b1509de19d114399a2005695ce8b7534e5fe35f7404e0bc7fd0f8e52ce675e73f0d6666cc2b3bc42 SHA512 4d56ec33157b7d00724598f0f55c27f3b5e625784b82fa27f2f75c3bb21a97ea7ddc1ac18f34b54da34454bac53af6617ab20f4f2caef51adb9b2f6e35906f82
+EBUILD botocore-1.24.33.ebuild 1650 BLAKE2B b286bf969ee64868dba6eca2bd16fb2d650e6393f9556a65b1509de19d114399a2005695ce8b7534e5fe35f7404e0bc7fd0f8e52ce675e73f0d6666cc2b3bc42 SHA512 4d56ec33157b7d00724598f0f55c27f3b5e625784b82fa27f2f75c3bb21a97ea7ddc1ac18f34b54da34454bac53af6617ab20f4f2caef51adb9b2f6e35906f82
+EBUILD botocore-1.24.34.ebuild 1650 BLAKE2B b286bf969ee64868dba6eca2bd16fb2d650e6393f9556a65b1509de19d114399a2005695ce8b7534e5fe35f7404e0bc7fd0f8e52ce675e73f0d6666cc2b3bc42 SHA512 4d56ec33157b7d00724598f0f55c27f3b5e625784b82fa27f2f75c3bb21a97ea7ddc1ac18f34b54da34454bac53af6617ab20f4f2caef51adb9b2f6e35906f82
 EBUILD botocore-1.24.8.ebuild 1639 BLAKE2B 661d6810ac62f653444c59c978e3d904868415e13bddbc20e93ac8f033f3a179736a74f4cf4b55ca0251d5c9392c96d241f5c3c6385d5bf569caa54eee5c5457 SHA512 b46be0c5c734d0283e33b51d88ce992a15c06510e61b67cd8500ae780d822062e761cbe647c0def8b36cfc57f195480f59bc92ba051c399c72f996c1d0baf327
 EBUILD botocore-9999.ebuild 1646 BLAKE2B dd0c215ddae91bb93f37f150ea10ee1efdae56f39d878f977f5abad8918d9da64063345faeef31d7c7f0beddcc7374810380ab0b049fdac9f1f49d58976ae788 SHA512 ce261fe481bb083270a8c8e706556164b2eea45a5091590d30b0671f3e4948ad03b46d37e555096cb244405c8a56db12fcd0c46fc85122640bd3818760e5851f
 MISC metadata.xml 499 BLAKE2B e5aaa7da26f200c09adfdf38b68f656bbccbec627cb5d966b280ac2165334e7eec659c89075bcace748f58e2ec3e7d2998e54a688d56ecea2d30653c67dfd35a SHA512 103c554d5dbd967bf9b6e418b3913d9235e7e910d012160909ce0715134ed2e37b06e6a345395f9d16ce08d1cf51f3ce458bce93c6a978fd3dca6610f2acdbd0
diff --git a/dev-python/botocore/botocore-1.24.26.ebuild b/dev-python/botocore/botocore-1.24.26.ebuild
new file mode 100644
index 000000000000..3bf7c7cfb689
--- /dev/null
+++ b/dev-python/botocore/botocore-1.24.26.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1 multiprocessing
+
+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 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	<dev-python/jmespath-2[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${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 pytest
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+
+	# unbundle deps
+	rm -r botocore/vendored || die
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# rely on bundled six
+		tests/functional/test_six_imports.py::test_no_bare_six_imports
+		tests/functional/test_six_threading.py::test_six_thread_safety
+	)
+
+	epytest tests/{functional,unit} \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+}
diff --git a/dev-python/botocore/botocore-1.24.27.ebuild b/dev-python/botocore/botocore-1.24.27.ebuild
new file mode 100644
index 000000000000..3bf7c7cfb689
--- /dev/null
+++ b/dev-python/botocore/botocore-1.24.27.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1 multiprocessing
+
+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 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	<dev-python/jmespath-2[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${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 pytest
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+
+	# unbundle deps
+	rm -r botocore/vendored || die
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# rely on bundled six
+		tests/functional/test_six_imports.py::test_no_bare_six_imports
+		tests/functional/test_six_threading.py::test_six_thread_safety
+	)
+
+	epytest tests/{functional,unit} \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+}
diff --git a/dev-python/botocore/botocore-1.24.28.ebuild b/dev-python/botocore/botocore-1.24.28.ebuild
new file mode 100644
index 000000000000..3bf7c7cfb689
--- /dev/null
+++ b/dev-python/botocore/botocore-1.24.28.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1 multiprocessing
+
+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 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	<dev-python/jmespath-2[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${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 pytest
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+
+	# unbundle deps
+	rm -r botocore/vendored || die
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# rely on bundled six
+		tests/functional/test_six_imports.py::test_no_bare_six_imports
+		tests/functional/test_six_threading.py::test_six_thread_safety
+	)
+
+	epytest tests/{functional,unit} \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+}
diff --git a/dev-python/botocore/botocore-1.24.29.ebuild b/dev-python/botocore/botocore-1.24.29.ebuild
new file mode 100644
index 000000000000..3bf7c7cfb689
--- /dev/null
+++ b/dev-python/botocore/botocore-1.24.29.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1 multiprocessing
+
+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 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	<dev-python/jmespath-2[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${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 pytest
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+
+	# unbundle deps
+	rm -r botocore/vendored || die
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# rely on bundled six
+		tests/functional/test_six_imports.py::test_no_bare_six_imports
+		tests/functional/test_six_threading.py::test_six_thread_safety
+	)
+
+	epytest tests/{functional,unit} \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+}
diff --git a/dev-python/botocore/botocore-1.24.30.ebuild b/dev-python/botocore/botocore-1.24.30.ebuild
new file mode 100644
index 000000000000..3bf7c7cfb689
--- /dev/null
+++ b/dev-python/botocore/botocore-1.24.30.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1 multiprocessing
+
+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 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	<dev-python/jmespath-2[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${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 pytest
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+
+	# unbundle deps
+	rm -r botocore/vendored || die
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# rely on bundled six
+		tests/functional/test_six_imports.py::test_no_bare_six_imports
+		tests/functional/test_six_threading.py::test_six_thread_safety
+	)
+
+	epytest tests/{functional,unit} \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+}
diff --git a/dev-python/botocore/botocore-1.24.31.ebuild b/dev-python/botocore/botocore-1.24.31.ebuild
new file mode 100644
index 000000000000..3bf7c7cfb689
--- /dev/null
+++ b/dev-python/botocore/botocore-1.24.31.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1 multiprocessing
+
+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 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	<dev-python/jmespath-2[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${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 pytest
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+
+	# unbundle deps
+	rm -r botocore/vendored || die
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# rely on bundled six
+		tests/functional/test_six_imports.py::test_no_bare_six_imports
+		tests/functional/test_six_threading.py::test_six_thread_safety
+	)
+
+	epytest tests/{functional,unit} \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+}
diff --git a/dev-python/botocore/botocore-1.24.32.ebuild b/dev-python/botocore/botocore-1.24.32.ebuild
new file mode 100644
index 000000000000..3bf7c7cfb689
--- /dev/null
+++ b/dev-python/botocore/botocore-1.24.32.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1 multiprocessing
+
+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 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	<dev-python/jmespath-2[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${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 pytest
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+
+	# unbundle deps
+	rm -r botocore/vendored || die
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# rely on bundled six
+		tests/functional/test_six_imports.py::test_no_bare_six_imports
+		tests/functional/test_six_threading.py::test_six_thread_safety
+	)
+
+	epytest tests/{functional,unit} \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+}
diff --git a/dev-python/botocore/botocore-1.24.33.ebuild b/dev-python/botocore/botocore-1.24.33.ebuild
new file mode 100644
index 000000000000..3bf7c7cfb689
--- /dev/null
+++ b/dev-python/botocore/botocore-1.24.33.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1 multiprocessing
+
+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 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	<dev-python/jmespath-2[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${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 pytest
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+
+	# unbundle deps
+	rm -r botocore/vendored || die
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# rely on bundled six
+		tests/functional/test_six_imports.py::test_no_bare_six_imports
+		tests/functional/test_six_threading.py::test_six_thread_safety
+	)
+
+	epytest tests/{functional,unit} \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+}
diff --git a/dev-python/botocore/botocore-1.24.34.ebuild b/dev-python/botocore/botocore-1.24.34.ebuild
new file mode 100644
index 000000000000..3bf7c7cfb689
--- /dev/null
+++ b/dev-python/botocore/botocore-1.24.34.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1 multiprocessing
+
+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 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	<dev-python/jmespath-2[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${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 pytest
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+
+	# unbundle deps
+	rm -r botocore/vendored || die
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# rely on bundled six
+		tests/functional/test_six_imports.py::test_no_bare_six_imports
+		tests/functional/test_six_threading.py::test_six_thread_safety
+	)
+
+	epytest tests/{functional,unit} \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+}
diff --git a/dev-python/bottleneck/Manifest b/dev-python/bottleneck/Manifest
index 497e78b6db77..6d005c693e26 100644
--- a/dev-python/bottleneck/Manifest
+++ b/dev-python/bottleneck/Manifest
@@ -1,6 +1,4 @@
 AUX bottleneck-1.3.4-install-test-data.patch 512 BLAKE2B 850df917f8b10b2c513c083863786072624c3e75c3dc81520f7325a3fe0b91d15b72fcf670b4fa047a56714ebcf7f101acd9b696c46cd0844105582cddd3ff7f SHA512 d1f27e5be6043b92372b1110b7705b3ca4fb01c4d62b9aefa9f5fe05b4d7cff9f8aef11d463785b55651b91b1c748851e1b571d801fc22d74c6d6e2ff52e9a09
-DIST bottleneck-1.3.2.tar.gz 102565 BLAKE2B 4d903bd8ff918a54cdee5b6c6815e8d404c6d3cd1a73e02f81888aab077970a113fcd24acef9da8a35138aa808c211883bf9bd952f83f17df4f94a6172fbe140 SHA512 9b6f812a625c9bb39501e8834ce41ae34ce57038d3ec9528aa8aa80910663c4e3b420d535f0ec8fa9e506faecabaf0151950afcebdc919479ed04787f26dc3ee
 DIST bottleneck-1.3.4.gh.tar.gz 118739 BLAKE2B af4b32bf296f11538b12f364592553d407668762e1e2d94c814bf262bc9ef88f1338cd388ff1c02065f8266988fe6cad5f8461aed2a144a9bfaf98f8ae46eeae SHA512 0cb3837139f947a7da026bddc8ff6e8025ee0aac6aedf4046383eb8385789d1816158ae20438b15a28c7f0b6552c3570c18abdbb6ef265fa9f497edebae1d808
-EBUILD bottleneck-1.3.2-r1.ebuild 676 BLAKE2B 3000cec562a567fbe3160b35a1a13e8f89c6bcde975eff487cd17959251837b7f449b4d396e724facbc23d7ac99cb518c9a095b78fcc2768116d29ac06e04212 SHA512 7c686a142e18b030f422304c3467532a6d9400d8af5f74e5907da0cbaf2a6cb20278cc050d6cafba6b5f2e7bd9a3b728f7592e32d081a9c1a32cd987329a0db9
-EBUILD bottleneck-1.3.4.ebuild 880 BLAKE2B c8d7e2a4b5fa048ce00def53c862117ebbd1526c4554d5ce1004ec49ad83aebdd648826527312fbdd46a46ce71a0c9d6f4ae431b51fb12d08039fcead5a8892a SHA512 f3bdf9debcb4ca47735773c2e803c1f90262a6eb3e5c721fab4744d2dbf9d9fe518db60808a81373e9f1a56f2ad107e6088a385f3bf6fa370a3128eab0e743d5
+EBUILD bottleneck-1.3.4.ebuild 874 BLAKE2B 929ac37335222284ff882080780fa3f08fd4a7a91277b8cfbb608c64d4b51a3f739331c96f249abaf5554018a9252a6abe27fa78ebaed22b486c8979bd13bfcf SHA512 bfd2aa09879f6c3ba430a86a9a5dc967210f68f4098716fdcd8d35ee8f965ee849d79c3f305726ae1a80714a59b3f12eb10e746412c398e50329bce5f0c8f9cb
 MISC metadata.xml 519 BLAKE2B 5e5e712122fb0bbc898942cbae15c7cf623aa8462257f063f65a06bc9caae6662c373963f0945f99c5fffe01270e2792e8e5d01af93b49a04f5c3c22cd3a30f7 SHA512 55d2c03dedaa48c8f802d1e4d1d7db4e829fe7357b501c3b2955d28da501eae00675b2775ab36d1131cf2ef0a3d037183bde8df4c85e986d81510df4e234b0ae
diff --git a/dev-python/bottleneck/bottleneck-1.3.2-r1.ebuild b/dev-python/bottleneck/bottleneck-1.3.2-r1.ebuild
deleted file mode 100644
index 9acd4ca07def..000000000000
--- a/dev-python/bottleneck/bottleneck-1.3.2-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Fast NumPy array functions written in C"
-HOMEPAGE="https://pypi.org/project/Bottleneck/"
-SRC_URI="https://github.com/kwgoodman/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND=">=dev-python/numpy-1.9.1[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-distutils_enable_tests pytest
-
-python_test() {
-	"${EPYTHON}" ./tools/test-installed-bottleneck.py -vv -m full || die
-}
diff --git a/dev-python/bottleneck/bottleneck-1.3.4.ebuild b/dev-python/bottleneck/bottleneck-1.3.4.ebuild
index 3bafb223587f..b065a6e175b4 100644
--- a/dev-python/bottleneck/bottleneck-1.3.4.ebuild
+++ b/dev-python/bottleneck/bottleneck-1.3.4.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/numpy-1.9.1[${PYTHON_USEDEP}]
diff --git a/dev-python/bpython/Manifest b/dev-python/bpython/Manifest
index 8c76caccafa0..55ea721541b3 100644
--- a/dev-python/bpython/Manifest
+++ b/dev-python/bpython/Manifest
@@ -1,3 +1,3 @@
 DIST bpython-0.22.1.tar.gz 217294 BLAKE2B 907b51753182add775d3e2ba08c3999d30ba23ab13d59f364d03ce5f22191e1a90031f7c3b5477fd00c94342a5ee204aa2618a7cd1a9470bbc898cfc266ba9bd SHA512 6b29235c41b645c3658812b8c80637d1e76029a6386f8628e5c681b2f3fdea653f89a12f4e28f55381464755e04fa7a33f023f096e75d889d5a588222c0d06c3
-EBUILD bpython-0.22.1.ebuild 1216 BLAKE2B 302e83c381a00ba00c26b37818b5964e8c6034c0f4e526815226ae2423cde001300074d836515cffd4f3fb3863b2b859bb7a3260940fdef1bbd5c28292661419 SHA512 efbcd9013a0187a97e257762dd4523b6aa877fba99dd6ab2f275a0759298ced880ad87bca424d61bbc268d524191683ed5176e6614ec2c38860fd379aa5c4287
+EBUILD bpython-0.22.1.ebuild 1223 BLAKE2B 8d83c73542b1ce45acb4aa425372eb717c27b7fadd47b6d7409b212f02097f51c5609e7b08cac64e9f4bd71a494ac12d1583d47acc555ebabd1cbc16325a5058 SHA512 aa95362ec7357c9eb406cafc4a850b402004dfcac1ec116060aec3fe2b2312568ed5bbcdd8604cc0d5b4d34271927442974d3c46a85e1b5ddccf2c53ca99e5a3
 MISC metadata.xml 866 BLAKE2B 0abfdfadfdd88b477380ca383047987b12e2a4f6f8e666e1e8ac9a245da606fe587fec0ff406e0784396e41f8897dba84b02618b63fb8ffe56dbdb990b1bd2d4 SHA512 cc3b9f87ae93e16094cf7a227e5bd84db52f82dc7ed5e36d5d0f6b07a7242e314dcf8911e12ebf6d1e6574ff7d05833798b9a095d0696094b93941aaf68da45f
diff --git a/dev-python/bpython/bpython-0.22.1.ebuild b/dev-python/bpython/bpython-0.22.1.ebuild
index 9b331710fca8..83c4d7432f7a 100644
--- a/dev-python/bpython/bpython-0.22.1.ebuild
+++ b/dev-python/bpython/bpython-0.22.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 IUSE="clipboard +jedi urwid watch"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/curtsies-0.3.5[${PYTHON_USEDEP}]
diff --git a/dev-python/braintree/Manifest b/dev-python/braintree/Manifest
index 3010377115c1..95986212ce3f 100644
--- a/dev-python/braintree/Manifest
+++ b/dev-python/braintree/Manifest
@@ -1,3 +1,5 @@
 DIST braintree-4.14.0-gh.tar.gz 206937 BLAKE2B 449a70c7f83e2ee3cb5c9e74624605387e0c12359e81aa18041c4dd2146c1bbb899cc97c9bcf6348ea1d0494d73d8a2366e41c05479e637d777a636cc1f0cec7 SHA512 d7d77d06c1a210200732e9e8fe4a55eb25f43ca7df9ab00fdbbbf077196c1605ed825976f691440e10b23bf4727b1e8200c5bd6b2cd9a66305110440cde0edce
+DIST braintree-4.15.2.gh.tar.gz 207089 BLAKE2B 5ed62e341c05e254cf3bec47f91704670bb57873be995352ce1e427e8075aee6193e11cbd863074b1ae39ddbf2c1a77f7c0207ffa9c8b7ca9335e2beeed42f29 SHA512 324823a078bc4068577793b169dd6b3d67e05d77850cebfe09602c0f6c3626ef1098f612c0ddfb7cc72b4b734d7319944c30297658f77edaf906334d27393f13
 EBUILD braintree-4.14.0-r1.ebuild 721 BLAKE2B e586c4a6e55ae204cd6559cda583852d4d56056f114fc33caeac2adffedac5416d8af670285ffa5ea9f505c64fdd0f39e1a78bc7ec553c35fad8cfc19eb47ee8 SHA512 79e79106427cde200cd30d5ffae38ac250a75c5fb80c3b1532132787a23b44513f24c2ef777c65ce652646f2e649ea678c76aa96bbdad90da5d535c6d53fbbe6
+EBUILD braintree-4.15.2.ebuild 716 BLAKE2B e8d1f98a5cbef751686ab49ca6633c9d79ddf0e930309a4f40df594547dd5d9f47dc58b42a75b78718f3077cf0ef59376effd691f5b12305f9b538868ef18f04 SHA512 f1bafa0905ab067b89e37f42db8f82c6a012cb7855695e4420754838385090631cc4d84f4ce1903e635c00d53f65842654ca0be9cb4620b5c99088b1046900e0
 MISC metadata.xml 383 BLAKE2B 70a8e7ca92990a7e46944543465ae8b4d57edcda29370e27b6d3efe6b2a08e8be51b79dc650b7c0250614104df37cf9f36083155da5c3aad0888bfeda8a411a2 SHA512 479ac40a800706fb70556a07f5097cd80886a9ad6778b2d71a457e2fd2be08578da90091bb87609fb66eef014ae2b7b84637fea4de20d1aca0c86e245abea5b4
diff --git a/dev-python/braintree/braintree-4.15.2.ebuild b/dev-python/braintree/braintree-4.15.2.ebuild
new file mode 100644
index 000000000000..d328d1adc899
--- /dev/null
+++ b/dev-python/braintree/braintree-4.15.2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Braintree Python Library"
+HOMEPAGE="
+	https://developers.braintreepayments.com/python/sdk/server/overview
+	https://github.com/braintree/braintree_python
+"
+SRC_URI="
+	https://github.com/braintree/braintree_python/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S="${WORKDIR}/${PN}_python-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/requests-0.11.1[${PYTHON_USEDEP}]
+"
+
+DOCS=( README.md )
+
+distutils_enable_tests nose
+
+python_test() {
+	distutils-r1_python_test tests/unit
+}
diff --git a/dev-python/cached-property/Manifest b/dev-python/cached-property/Manifest
index 7e6059bff3e4..763e9f568172 100644
--- a/dev-python/cached-property/Manifest
+++ b/dev-python/cached-property/Manifest
@@ -1,4 +1,4 @@
 AUX cached-property-1.5.1-test-failure.patch 366 BLAKE2B 1df343e43fb74df2913c222d2a1f37e703de34480e325df68feee7575682005be6d0f41f34e553c3ec2cde11c6907b1d79a73e67ac88c5691e366b7bc64d6970 SHA512 bf005bbb986140dab7949e015ee9453081b72a9c377b6f330f8ffac10f73d7ec0e2a2e20c9d65879c3c18b3c4b2735b3329b30f48e1e4bd01ece475833f2a58c
 DIST cached-property-1.5.2.tar.gz 12244 BLAKE2B 26981dcfa51925741962c60ad8659a165af6d7f242f4abd392932aac20e966ad6c1763a25184bbabdeb5bd75f8063a430c41f0241afdee8013ffcb437b3ff7da SHA512 626d98a8891a70d858269859cf4e49416464c836d073c1331c21033a4cd9e0e47dc89b53bf393375439992f4993972517dc3cdcbb2cc6f8286f282d3c973e600
-EBUILD cached-property-1.5.2.ebuild 740 BLAKE2B 7a14e80d2e41af7729ff3f87bc48883799c3ee44fe99278951c66b8f21a10a56b5d769ba6cdd72b943dd70e3192a490c1229c00b6e76e3ae58e8234e655f22dd SHA512 325b9af04523dd9b5035379f95a8455166cb27fa7df0c847fc65e9a9be3a3ab6af4e8deb31c776b8fbff473a108acd6cfdabaab867f7187e8f8ec6d5bbc5defc
+EBUILD cached-property-1.5.2.ebuild 747 BLAKE2B 0940af2530973886eba2778518abf76de8a537a6e8bc6d6af8dfcdde317a63338415914593ceaa37e94620fd1db06bb767310fdd53c763f16cbe91ae758d2730 SHA512 db6e5cf1871f609fb3357846417d1206afdae1e9a7b35d07bbf012229b909d4a53b9e0ce3aac8de9c2153d98549635617d69b4020878a6e3fb9825aedea7d23a
 MISC metadata.xml 406 BLAKE2B 4c2879c4bc8a511a8646c11d560414dc55421e0e8761b0b1b40138ac19a5e4f6d1e13f96962eed8333791c53a09d611a959be7c8485561e030af43020abd6c2f SHA512 00f4ca0fd3ae8c2b6b7ee3f1b35f5b5a9d690d86ad2753f971c6d37c98fb95d66fbf3680a64cef44dca262e962cf5f53d2a34c44dc789f2ee6bad193280614e3
diff --git a/dev-python/cached-property/cached-property-1.5.2.ebuild b/dev-python/cached-property/cached-property-1.5.2.ebuild
index cef671a3d11c..8a772ac7a3ed 100644
--- a/dev-python/cached-property/cached-property-1.5.2.ebuild
+++ b/dev-python/cached-property/cached-property-1.5.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64 ~riscv x86"
 
 DEPEND="test? ( dev-python/freezegun[${PYTHON_USEDEP}] )"
 
diff --git a/dev-python/cachelib/Manifest b/dev-python/cachelib/Manifest
index 8660dbeeedd0..e5ed2491c708 100644
--- a/dev-python/cachelib/Manifest
+++ b/dev-python/cachelib/Manifest
@@ -1,3 +1,3 @@
 DIST cachelib-0.6.0.tar.gz 21842 BLAKE2B a886e0d6558dd7b3e5cb70124ac48b1fd55de13bc15998da32111300505501252f96c419c2bf82f6101c51e70d2d98f5a49362554891513ea3d1c8522d17ab4c SHA512 a828b6a9e425efcfbae46c148f1f56fd6f4df2ce37ed72b90fc4c3ea9edec1273aa2f2e1f9ad59fad30d1b8e37d6794176b85a7b5afb2b65264bd992dfc5c4f6
 EBUILD cachelib-0.6.0.ebuild 790 BLAKE2B 0939bf9ab5d15a42d5c711d88e8477cf11a210317bc927db6c55e82777f6ef818b52d1207e5dfc8fe8ca70e2c2e82f926d27efec7b2320a90ef94cef644d4040 SHA512 a5e7d3161ee066961d70f9a7d64f80499b8aa1fd0e86d0d126e76790527d20dcf67cbef0b5f9de672240d9aaf973d30bd25c2341e38760724e88dbf6dbc68091
-MISC metadata.xml 474 BLAKE2B 68232ce6be8604d810b8f8ed5a5a92cfdbd74f61b8c6d5cfb2dfb354cec4336ba9459eb5d41782824aa4a928aaa5f583f06b03f7e1ea6eee521c1b17be80fc10 SHA512 5de03537b7551f96a156476f693359f2222c060384baa54e4a35564377e88a2916eddb486bfadf327d86258ebf1555b2a942f2c993f68a5f7fc5e837e01317e6
+MISC metadata.xml 506 BLAKE2B 42b11218d972652fbbd9ffb8548355105f98f666446667218efeb14dff0f215fef052399d77a9f49041b7d330a876324dfff25314b661d3c9f1d81b937c1a291 SHA512 dc8b59313b06accdff01d335db098b8b05a781f8d57c61c944152e2edf7a602dd1345228dd8df32decaddcf171b23a88ce8054f396809a245a2fcd6506ac2468
diff --git a/dev-python/cachelib/metadata.xml b/dev-python/cachelib/metadata.xml
index e1b96bd04336..c8213cd3fc6d 100644
--- a/dev-python/cachelib/metadata.xml
+++ b/dev-python/cachelib/metadata.xml
@@ -3,6 +3,7 @@
 <pkgmetadata>
 	<maintainer type="person">
 		<email>kensington@gentoo.org</email>
+		<name>Michael Palimaka</name>
 	</maintainer>
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
diff --git a/dev-python/cachetools/Manifest b/dev-python/cachetools/Manifest
index 0caff352123d..dc6c6ec484c4 100644
--- a/dev-python/cachetools/Manifest
+++ b/dev-python/cachetools/Manifest
@@ -1,5 +1,5 @@
 DIST cachetools-4.2.4.tar.gz 25487 BLAKE2B 91979f72b8719f4fbc57421ded6edcca38106814997abd2a17c1147af55a1b64e11b347c8ef790cd8cdafbd83b8492d377540b872430d285584aa3d3228f6435 SHA512 29a6bb3a064e5603cd3e3882d8e5a6a6ef95ba3029716692c9a82d7186a0befcfb8ed4a0ee3ecb591fdff93a46836d5b25acca7ba5eab1ba837e86404aea8fcf
 DIST cachetools-5.0.0.tar.gz 26119 BLAKE2B 29d3c9d9859c4848d807dcf8d84614b23a125bdabd4188191e7ccb1536da249226ed4b21798b49c2eb764bfea4ba16b557440438a827b1bfd8d4c5b0984695e4 SHA512 3d311969a4fcc180767f4546f384e16d47bbeb5c1d97884006872317514ea2739560346d62d0afed1916def249d92f9ff14e4d964e9521de09132d3a83463a76
 EBUILD cachetools-4.2.4.ebuild 419 BLAKE2B 0cb00cc291fba7a29b18af9b3e25202cd36891bc52f1d1d5ba9134e0fa5de557545b3572a835d0584ee8fa7ad77a08b3716c983e0335605438f6e6f63bd33338 SHA512 e52ebe03812ca4317222d0cb040f498d4f87fdb99cc624b5415ee171efab35f8ca9072fd913cfcf299d871a0a61a5a4703a9d7232962a28c3ec3c255b54a606e
-EBUILD cachetools-5.0.0.ebuild 419 BLAKE2B bb1ea153e9b5471ed310be5183091136976f899c2ca636be2974613ac5e615873e47ad76bab5567dfe0f5ae72a4c3586998a9219a2ba0124f3c0d75f5601fa7b SHA512 14dc7dcfa7b75d443555bb27a4b4bc002ccb7c9f88d22ca0db306d05c69a0e12452fe2a8bbfc3c04355cb2a441a0aff75d98a097f99fe5606761da9e9b795864
+EBUILD cachetools-5.0.0.ebuild 426 BLAKE2B 2bb25e4179e8f1b91cbfdc665b1289004ec7743e6f52022579dd925bfb12b65cd2af25ba8bcff54661de31aa82114757a3b3fad2084bea80b07ebe9f3ee7dac9 SHA512 ee5d35d82477fb585959f3a5d0ef3d188ea641c4a4d1738fed6888d475fdc01f82f4c0a9868e07fbdc55b1140696649f7a4bbe77b0a75411558d1bbcfd60fc18
 MISC metadata.xml 508 BLAKE2B 46dd3d86627746b2b26d9980c2773a25cde3fe6d8ef25bffd88edf1cd2f66a9457f09eea791efc1dab3d354f405bf755992e4a44acd721e4e72f085eabf9b61e SHA512 63d48b1e710965f09538e71b982df8e2fdf5693c6043d5498e4536f76e139584f8783479c1742f91fbe45b4e7bf9eec8d8a54d698734c196bbd8d5a14712b59b
diff --git a/dev-python/cachetools/cachetools-5.0.0.ebuild b/dev-python/cachetools/cachetools-5.0.0.ebuild
index 349d8e6ebe72..913ab3eaa0fe 100644
--- a/dev-python/cachetools/cachetools-5.0.0.ebuild
+++ b/dev-python/cachetools/cachetools-5.0.0.ebuild
@@ -12,6 +12,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/chameleon/Manifest b/dev-python/chameleon/Manifest
index 35afcc74c7fc..8c7e7e35789b 100644
--- a/dev-python/chameleon/Manifest
+++ b/dev-python/chameleon/Manifest
@@ -1,3 +1,5 @@
+DIST chameleon-3.10.0.gh.tar.gz 136996 BLAKE2B a622fa4d972dc0bea9532f0815b586e17d56fc4da94bad37f83fb29d2a94442da2a7d1ebd00fdfb0a877fcf9a2d269c2c3780ec9cf96ad772952b096a1ca1db2 SHA512 de59a4f1d0243beae91008f93741e9565831ea3b07c3f39e20e15ecc7220711a78bf475844fcaa9dc25f2376b0e937779ca28bd58f7c9b95fa2cf35cc7212117
 DIST chameleon-3.9.1.gh.tar.gz 136555 BLAKE2B 277df179cd26f1edc6513bc6a80d6f7a7f9f95b1562efa23f454d7055ffbeaf59d7a726bfe8969505b0839138c7f97fdb810754bb0342060a79b23abecb3ad36 SHA512 53b0aeeef89df7cacc299dad20e05023c638e708604876ce5269f22bab00e5001b640123920aef0ef9a0f554bbd37d151bedfdfe55ec161defe6b6f3781d841e
+EBUILD chameleon-3.10.0.ebuild 580 BLAKE2B 8881fa0ca9b91915b9bf265a029fa990c9a8bd8476ae40d11e0f771b6dce3e180e4da3a2ac1e118171f260c50c60443055820c27dac4d34e918243e7b7925427 SHA512 86b5c77e770fc489c3f3f44a68fce64ae1656aeeedcc57e0a21a4fd533e6fa9a8423a07fb206637aee4c268c59b8aa3d9377d2e03159b21124104a0cd693bde4
 EBUILD chameleon-3.9.1.ebuild 542 BLAKE2B 39056f329362d4f389bc07d241a336c9e86b7deb4e7a5d34e1f770f3b7f1722c0a5302f4cdb3f16383c27a50fc52807005a6b3e7ccd28c323e87e0632c786602 SHA512 3ad24608e422c76bf76e41ee974ee524a6ee83cb937de3072736d5593b74650650d1f9836a9de07178ad2db6b6bf9e191cf50aff82a5949672a7fca38862a096
 MISC metadata.xml 393 BLAKE2B da75a225bf4e4b27bdcfeec93eb41d2e20b2498bd28624d5728bc0aaa915a312376e85252258f7195ef77f4d089b8a94097b5d5762472e8a686df8e8901c7d15 SHA512 715ba1cb0190a925747a0c8d5529aa5e61202fba701cb2238ebe16643607918560373d34079e7ccd3e097e988b1ce2f6e6bf5eb3d090fd3f384bc7e651cb331c
diff --git a/dev-python/chameleon/chameleon-3.10.0.ebuild b/dev-python/chameleon/chameleon-3.10.0.ebuild
new file mode 100644
index 000000000000..1d224f95ca79
--- /dev/null
+++ b/dev-python/chameleon/chameleon-3.10.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Fast HTML/XML template compiler for Python"
+HOMEPAGE="
+	https://github.com/malthe/chameleon/
+	https://pypi.org/project/Chameleon/
+"
+SRC_URI="
+	https://github.com/malthe/chameleon/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="repoze"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+distutils_enable_tests unittest
+
+src_test() {
+	cd src || die
+	distutils-r1_src_test
+}
diff --git a/dev-python/cleo/Manifest b/dev-python/cleo/Manifest
index 8105bbbd959e..eb321c3f6667 100644
--- a/dev-python/cleo/Manifest
+++ b/dev-python/cleo/Manifest
@@ -1,3 +1,3 @@
 DIST cleo-0.8.1.tar.gz 96220 BLAKE2B 57971f6254a31ecf5101d89e96607b5915ab5138d727279d445172b89a10acd6b76619d344973fa2bdbc320866fa1dbdf05c889f4eca879839fa6bcbbad0af7c SHA512 9cd470063db9866a526f0bb8619d772c585377d5b1a662e0f94bad9fb9c853598b176444ca1ac0fadec82992196c471646504d6a28d4dcd1171433b8d160be9c
-EBUILD cleo-0.8.1.ebuild 642 BLAKE2B 76b582e4e3d96435472a71e6c2a2539d0096baa0f1c14e780a6d332331852436826ed569ba1c83b1a2af68ff92887a3a7c1ef5762a27843800a9c0ccca756b07 SHA512 a19ca32b764232d581bd979cb0a3e4ecf900b6410b5c786c3dab37ff5c3c465cffceb2d9a744b3b2264a672656aea473714639e3508ce9badf5e525cf357bb7d
+EBUILD cleo-0.8.1.ebuild 643 BLAKE2B d759283c0b32fe9a614d5a2062e384ffeafaa0b12ab85c45cacc19c21186b9a22d30d38af7434753fd47bb9a8b9c4deb8268c825048e0f7fdc1b41fed3b7646f SHA512 1086e3fcfffb51ffadc2116783623e20869567ca15aa770bea76057bbfc8bf4ec96ab3440fef2bc1f9408b2151421b9e2af8bb3d6efa91aac4c993d31cf4a641
 MISC metadata.xml 406 BLAKE2B 67bc199e81032a8cfa3e83b1af55e9a7a62a8a9deab6818b46218cd1a99139fc5dd67833d38ac73682f581883df5ca1f58ae30329a87d3f16f264e1436e6b872 SHA512 5fcb0997f4c0e89eb2ba6b64eb2b72af5c4bcd8228d681569c31d1b8e683555d359bd51d0d97092ebf8e9396f726b4525a430003602f5bd46cfde8cedd87636c
diff --git a/dev-python/cleo/cleo-0.8.1.ebuild b/dev-python/cleo/cleo-0.8.1.ebuild
index 9e9e0865e1e7..2d49e464a55a 100644
--- a/dev-python/cleo/cleo-0.8.1.ebuild
+++ b/dev-python/cleo/cleo-0.8.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/sdispater/cleo/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/click/Manifest b/dev-python/click/Manifest
index 832d09ae7c0e..a4388877aeb2 100644
--- a/dev-python/click/Manifest
+++ b/dev-python/click/Manifest
@@ -1,7 +1,11 @@
 DIST click-7.1.2.tar.gz 295757 BLAKE2B aea76d5378cfa49fe58a83132737d609d48b3d3a71ec65c0a8a144c7a0e244b5bdf0196ffe2150889b82edda20c3f1faa3c84a227fc9ef459a5a9646cff86129 SHA512 d0caf2fb0a258774a18a7b8f83bdfa73abeb70196a70b45a6cc35befaeb862d068d2f2cce4e27201ab2e3adcd02e7e2f099d6c37c497a507010eefa10ad16eba
-DIST click-8.0.3.tar.gz 332553 BLAKE2B d0ac16196dd80ca452a5fbab2304cabc2dd6b493789a43c2d69f152c85f247e8512e965683d4d2cab9b59188766ee9950c0d47812b7ca03c30d873f54bc48076 SHA512 73d29b73d5f90132282753fa1b53f42a690ebf713e8e4f2e3ff3c8820ef71ed82c5165bf61563341170a263c4202adb5690540fdeb6501fb9d81d2db06a5e89e
 DIST click-8.0.4.tar.gz 332977 BLAKE2B 71366fa8436fb6997675ecb84d98f43b40a646466f0f9f7a51f145bd6a41950836df30a545e50ab6166f3643766c994f5a636b9a2b6e0a700eec04d377aced25 SHA512 2a572863814ef4f79ee408d4aa8df30a15b958986c4615e13bdeab30b4847679330e1b3baeeeff1aa80464a08418400c7a1ff22f29db4fc8d8042ab7b1ba475c
+DIST click-8.1.0.tar.gz 333449 BLAKE2B c0f5dfb245c5c8a71e9aa5200393d021f4e77ae73fa9a8cdef4abc35546d2ff0b7b1322776002dc28b37e8311141fc3db8a39b5cfbb8947781326b6417494563 SHA512 7d9fcd74392baa55e0fd9050e7382d4b8b542856d4fee79ec5a4d6185ddeb47abaed1de6771e30aaec6cee5cff7166dd8ab7fefbc6aefa1856adc58b9fecc0c7
+DIST click-8.1.1.tar.gz 333663 BLAKE2B c7b0de884c3ea5365d3227f5a4e81a41531dfa100705b203745bed15826cc7e9ace112c959ab5f4eabac510623d83ceeedf6ea36a40aaf8f997cbb6b3ba1abfb SHA512 b553d140f1425001575d7584367bd90cea6d20760b4a811efb0fb164f0d62d631f54514b033ceb1130d510f35cfb330f4af6d93d1e70dd1ea929b878304b9140
+DIST click-8.1.2.gh.tar.gz 333755 BLAKE2B cf579db101e296a0626445e0823d8c72bc6cd40f0ec667c3179465050d0aa7d7a94ed1416d583f7c9afde8e5ea41738c26b000f87c95074a9d93837c039d687a SHA512 8781965212a0732990e47050db8ae5e37633986b23cd7895d74f06007c61993f8ea45183376761987931caf00dd68c22900bc8d3930d4416853374cfd170a0e5
 EBUILD click-7.1.2-r1.ebuild 764 BLAKE2B d1d38b50a150be24f89380cf98233f141ca96c91e6dbc64153c8cfd6326b98098a174fb7ee58fb120957509b85262a056d7837a9e9f61639abb10d6707f6845a SHA512 ac8ba661a0f1664960eaf8748cfa1118e851ee5b2a4cd924b37742d6d09009dc7e4eaef10b08f1d796d47cdce0ba3483fc2809eefe0717111339327b14585c22
-EBUILD click-8.0.3.ebuild 837 BLAKE2B d707566d5f11e17b9d3c0ba73083e5abd0cfedf6f782fe3e62f2428572cdcfb1637e7da9f3fdcae0151e6474b74bd089ec892ac1fc1473109f686e69e6922a97 SHA512 a2546e221d3ab2dd7a8d56dea54f09efec70d8bb1f7a92106b700d6ead4241bb27661400980a6c42f63b686bbdfe796d8d0473cb7f2b66393936a9d64cbbf242
-EBUILD click-8.0.4.ebuild 878 BLAKE2B 7c10b780f71b4e90184b4e272ddaa39a5c03f44c92443ff3518a3143487b48c87ec3e72d51b91d3f879c431d4e55893a3d6bc48d9efee7a07796ac1db000cd68 SHA512 24b54e54f52cc7f02da5bd8d2de74b3a743ed97c2f3d3490ad30d9bc75c271afb4315a90887b0f1c788a72ea4598c792c403191a807bd1067d640927d83d8e5c
+EBUILD click-8.0.4.ebuild 870 BLAKE2B 55c99217995792636420619bfba896fac2fd6d33ca07af7252e59fe28b2d3647788b3d6865a48c47470ef02d7f8e5f969ed4fbdd7854cdcf09ba5dcf83599fb2 SHA512 25eec249575b9a4ac029c496999e6ae3ce44f4f1c274f37c93958711a8de49e317397b1f9e119d34f2e7b6f85162b13f10a2a74a39f9048ca2d35d6aff3fa0c7
+EBUILD click-8.1.0.ebuild 878 BLAKE2B 7c10b780f71b4e90184b4e272ddaa39a5c03f44c92443ff3518a3143487b48c87ec3e72d51b91d3f879c431d4e55893a3d6bc48d9efee7a07796ac1db000cd68 SHA512 24b54e54f52cc7f02da5bd8d2de74b3a743ed97c2f3d3490ad30d9bc75c271afb4315a90887b0f1c788a72ea4598c792c403191a807bd1067d640927d83d8e5c
+EBUILD click-8.1.1.ebuild 878 BLAKE2B 7c10b780f71b4e90184b4e272ddaa39a5c03f44c92443ff3518a3143487b48c87ec3e72d51b91d3f879c431d4e55893a3d6bc48d9efee7a07796ac1db000cd68 SHA512 24b54e54f52cc7f02da5bd8d2de74b3a743ed97c2f3d3490ad30d9bc75c271afb4315a90887b0f1c788a72ea4598c792c403191a807bd1067d640927d83d8e5c
+EBUILD click-8.1.2.ebuild 890 BLAKE2B ed868d2dc8fbfe1993f0f16e7bdf95688fba2e53a46b721ed4a579b900ebd4efb8ef69f0d8e3113d19d166a6c2520ba49b8f82736cc85344a8e1544895b2f2ea SHA512 cdf5d68628bec787fbd2ea3124fed0146dfc3654ec37c791b401a60be14f5a3946624b626618bc2d30ed3129e61811d211ea147abbf436d1f4c48e6dd39cbee4
 MISC metadata.xml 386 BLAKE2B e460c7d70bbd848cd239d9e1ba5dc234c7de2a2bc0c77bfefb6aed1fa6d954de18508d4db44e77495f90a141180fa2602b15d3699aaaa99a48520a7e37a098f4 SHA512 ef8dd0545e92bb8fdc107fd6170068d35f44abad698226ea4724c450aebc0f32c76eb90b9fc936f9c85b8a93637f6006e889796e2bb3b7da5f57c1419f6b3794
diff --git a/dev-python/click/click-8.0.4.ebuild b/dev-python/click/click-8.0.4.ebuild
index 88f5b3d0969b..b9b231e6e34d 100644
--- a/dev-python/click/click-8.0.4.ebuild
+++ b/dev-python/click/click-8.0.4.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://palletsprojects.com/p/click/ https://pypi.org/project/click/"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 IUSE="examples"
 
 distutils_enable_sphinx docs \
diff --git a/dev-python/click/click-8.0.3.ebuild b/dev-python/click/click-8.1.0.ebuild
index 4194f6b92a1c..88f5b3d0969b 100644
--- a/dev-python/click/click-8.0.3.ebuild
+++ b/dev-python/click/click-8.1.0.ebuild
@@ -1,9 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
+DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{8..10} pypy3 )
+
 inherit distutils-r1
 
 DESCRIPTION="A Python package for creating beautiful command line interfaces"
@@ -12,7 +14,7 @@ HOMEPAGE="https://palletsprojects.com/p/click/ https://pypi.org/project/click/"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 IUSE="examples"
 
 distutils_enable_sphinx docs \
diff --git a/dev-python/click/click-8.1.1.ebuild b/dev-python/click/click-8.1.1.ebuild
new file mode 100644
index 000000000000..88f5b3d0969b
--- /dev/null
+++ b/dev-python/click/click-8.1.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A Python package for creating beautiful command line interfaces"
+SRC_URI="https://github.com/pallets/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://palletsprojects.com/p/click/ https://pypi.org/project/click/"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+IUSE="examples"
+
+distutils_enable_sphinx docs \
+	'>=dev-python/docutils-0.14' \
+	dev-python/pallets-sphinx-themes \
+	dev-python/sphinxcontrib-log_cabinet \
+	dev-python/sphinx-issues
+distutils_enable_tests pytest
+
+python_install_all() {
+	use examples && dodoc -r examples
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/click/click-8.1.2.ebuild b/dev-python/click/click-8.1.2.ebuild
new file mode 100644
index 000000000000..ba8f4b9c8fe8
--- /dev/null
+++ b/dev-python/click/click-8.1.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A Python package for creating beautiful command line interfaces"
+HOMEPAGE="
+	https://palletsprojects.com/p/click/
+	https://pypi.org/project/click/
+"
+SRC_URI="
+	https://github.com/pallets/${PN}/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+IUSE="examples"
+
+distutils_enable_sphinx docs \
+	'>=dev-python/docutils-0.14' \
+	dev-python/pallets-sphinx-themes \
+	dev-python/sphinxcontrib-log_cabinet \
+	dev-python/sphinx-issues
+distutils_enable_tests pytest
+
+python_install_all() {
+	use examples && dodoc -r examples
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/cliff/Manifest b/dev-python/cliff/Manifest
index f0be206d509d..1fe29ee2ccb5 100644
--- a/dev-python/cliff/Manifest
+++ b/dev-python/cliff/Manifest
@@ -1,7 +1,3 @@
-DIST cliff-3.10.0.tar.gz 82636 BLAKE2B bb0031a96cca3bd6f7c806c394133ca81e0fad56c65361c3643a32d96d4136228972af2b1567489b4cbb669f9008f0b1dd9eecede73b294097ab3a781ea64443 SHA512 52064ca1144cbf5e76b3654924e00a6e12c70707a3d4f7cd9c0bcee514a29c47626152cfb558d46837a967f5e0f827a2af291b4532e383fc7fc3abb616b01803
 DIST cliff-3.10.1.tar.gz 82764 BLAKE2B 88e8481d23f6ad35acac9fd17b1e4930f31ebc13211ad5bf1db441dbe4ad99faec023b6a46640d0fa3dbac4d76f4fd9d9fd3cd1e6c319cab390d502c9adff53c SHA512 2a1eb1f5311eb92ac481b35e0f703bb37171c9c7eee68a3d8322786a802d562d990ea8e3e52e924215b2ff8c3f14614f99ea403d94bfa2ea3794ab3556baa0c9
-DIST cliff-3.8.0.tar.gz 81862 BLAKE2B 3a8219f822fdf14e1de56204b0f536a92d27be5a99fb628f3aed5b569a1e703d4711bdded28fa42c0692316454847ba3338baac8efae873540652e46d155227a SHA512 002e3ddfb254c5369582cc28572856a8b4ad05d598a7f8aa690add69f49cabb12ef2ef17b6c1553792aaee785b7c1703b05dd9d4889271cd5eba5629fad3d09b
-EBUILD cliff-3.10.0.ebuild 1161 BLAKE2B 88c88e4df86f78d270210032203b64347e1b128417cff8b9865ee7af61422dbe700ae1c372c908830ef01547c4cee8d7f9c8593d27131e74fd389360e7a5a5b5 SHA512 585ca1b3755919ede05442cd7257b3f21b8d75c386922820b3937915479564797da8555171d70656f1d0fc27315e3135d451b3ecadea28112245f881797264ac
-EBUILD cliff-3.10.1.ebuild 1034 BLAKE2B ef1163f2f51e348603a03286147f0e44e7aa3609a02978e5efecee16d81b58a38f29ceb1731389f452b7c08bf6bd84a3c33bd5534d260c616121d6966c05cd93 SHA512 9bd5e94585a0720ca3fb74cfec299a25b35fe5f4b11d302dd5e99c000b41d4bcf6cb14abb3963e5a32c53e9381a3cb2c77403dd6f929d865f597daa51785c573
-EBUILD cliff-3.8.0.ebuild 1162 BLAKE2B 437d306a8b53ed989eb8118c33f8216cdbe2643a48f8f444492b50ec96113ff376c7709434eb9017521e2d5f83673f88b440ed2b112fcf67cde91a39d9d3db0e SHA512 61dfc0762c58b4dcc8ee498a5f3f6199786a33d35ff1563edc7af5c2f106af832b60a2dd9dfd080d65cbec0f265174790ee63f5d6bc9022c657d2bd0172d3e7d
+EBUILD cliff-3.10.1.ebuild 1030 BLAKE2B e6ef060072f8b3023b98bb0784df647dfaedec1bcdced3412f2a5ec05ed60f3d2a6292e0e9a91384eb6c73b17a02d5421abb39e4f922fa9faf2dc42ba1c66db4 SHA512 958f7544cde454bffed6e6362a87b534a406c27a1489e41279230c6c2749f2c8040397af07549ae417e18c0f08f65113f5b7cd1e0b52db74ead041026a133f93
 MISC metadata.xml 767 BLAKE2B d9d994960046172167f20f59073011b2defe84e94144386db5465a973050e48e05abccff88d7f84cbe9f20615eddc5b61a46920f8b27c4dc9b2587f762f3e368 SHA512 018a0bfac3f0126341207d16203fab4a666b17d8a5dcf9f101335c396797f2e724e2250910fca39e12cb6616614983a756a42dac03aa215d2a1b51af5246269b
diff --git a/dev-python/cliff/cliff-3.10.0.ebuild b/dev-python/cliff/cliff-3.10.0.ebuild
deleted file mode 100644
index 363fbe358011..000000000000
--- a/dev-python/cliff/cliff-3.10.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-# TODO: revert to rdepend once this is merged
-# https://github.com/openstack/cliff/pull/3
-DISTUTILS_USE_SETUPTOOLS=manual
-
-inherit distutils-r1
-
-DESCRIPTION="Command Line Interface Formulation Framework"
-HOMEPAGE="https://github.com/openstack/cliff"
-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 ~ppc64 ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/autopage-0.4.0[${PYTHON_USEDEP}]
-	>=dev-python/cmd2-0.8.0[${PYTHON_USEDEP}]
-	dev-python/prettytable[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-2.1.0[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-2.0.1[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.12.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
diff --git a/dev-python/cliff/cliff-3.10.1.ebuild b/dev-python/cliff/cliff-3.10.1.ebuild
index 2a06faab3f16..984a8675bd1d 100644
--- a/dev-python/cliff/cliff-3.10.1.ebuild
+++ b/dev-python/cliff/cliff-3.10.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc64 ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/autopage-0.4.0[${PYTHON_USEDEP}]
diff --git a/dev-python/cliff/cliff-3.8.0.ebuild b/dev-python/cliff/cliff-3.8.0.ebuild
deleted file mode 100644
index 0fbb09d634f2..000000000000
--- a/dev-python/cliff/cliff-3.8.0.ebuild
+++ /dev/null
@@ -1,40 +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} )
-# TODO: revert to rdepend once this is merged
-# https://github.com/openstack/cliff/pull/3
-DISTUTILS_USE_SETUPTOOLS=manual
-
-inherit distutils-r1
-
-DESCRIPTION="Command Line Interface Formulation Framework"
-HOMEPAGE="https://github.com/openstack/cliff"
-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 ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/cmd2-0.8.0[${PYTHON_USEDEP}]
-	dev-python/prettytable[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-2.1.0[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-2.0.1[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.12.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
diff --git a/dev-python/clikit/Manifest b/dev-python/clikit/Manifest
index 2a4b55d4b900..4d851f0dd4a8 100644
--- a/dev-python/clikit/Manifest
+++ b/dev-python/clikit/Manifest
@@ -1,3 +1,3 @@
 DIST clikit-0.6.2.tar.gz 72115 BLAKE2B b72f245128c698375f97139cf245bdc8c017e3e2d142f6e3183a42620b23a024531e5b14f05163c6defa9ee54c52c19a64932c62484f2ec8da5c75ea1b7d3d27 SHA512 6f6e436b2161349ce03c705df594e564dbc594b03370dfd62e3b1c8f2accbbc12a1cda881ca392a096435ee243e4f772589ce6f6dfbd3af63d1656d49c3fcb04
-EBUILD clikit-0.6.2.ebuild 850 BLAKE2B a5237bdc0b51e174cc4c641b16ced32759fe55e34100a34ec4b01f883779c0c2a5ed5426df344945df634834ef9d4b7a2e20a3a4365c2c3a2d7422d544893510 SHA512 05523ca6931575a9eed9d4feae13019271b4f49e8ce90152d357ab5e9343941c313a87988941d4106ccb987ee8c260519141a6ea0705b8f8079ac96c3a93a65e
+EBUILD clikit-0.6.2.ebuild 851 BLAKE2B f088a0f346008b53ba0555496e5aab81158417bbfe82aa6e2d5af41a5fd4bb90fa597adf23cc834e2a35b597e6d9c2435b575009e7b936bfc6967bd6767f0166 SHA512 74b902ea215c672b3bc07163b4368880faab40ba7a4965154511fd007c68d9f2267918298baeba24dae5511a51b8ffae3c8f3ed180f178e6dbe6a36f0d5f9466
 MISC metadata.xml 412 BLAKE2B 79ae358d09fe2f24fa3a16de6caf873fe4d423e731605b0d5b7cb67915a1f1e879279ed8526f3c7e1d272c9a209c74f0d546d18f152a593337389bb0409fff91 SHA512 13b98a2040e30df09ccb0a44719c3f0d5ac4b603ba724408de045613c33eb8f8d4cda05e4d9641819d30574bc33d2a3de9f54469a662c2713520a4faad8362b4
diff --git a/dev-python/clikit/clikit-0.6.2.ebuild b/dev-python/clikit/clikit-0.6.2.ebuild
index bcb06e795e39..8bb676a6f1ba 100644
--- a/dev-python/clikit/clikit-0.6.2.ebuild
+++ b/dev-python/clikit/clikit-0.6.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/sdispater/clikit/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
 
 RDEPEND="
 	dev-python/pastel[${PYTHON_USEDEP}]
diff --git a/dev-python/cmd2/Manifest b/dev-python/cmd2/Manifest
index d485afb46da7..6a2fbf34b061 100644
--- a/dev-python/cmd2/Manifest
+++ b/dev-python/cmd2/Manifest
@@ -1,5 +1,3 @@
-DIST cmd2-2.3.3.tar.gz 675880 BLAKE2B 216b10d7a1d2eb78106e5af51a6c996ea22ff8ef13503ace6019978152f63d5015e61ab911a839703d2b3506fea4e709d507d147b2af259cf933ad628e52be22 SHA512 30d7a82a1c3d23431a40a7e99f10a4c23227e9ab073ab1d7fd83e516f54e9c90bda10e6072b50c0a2ca435498c1060e06b32a550409721899e28d2662995a8b8
 DIST cmd2-2.4.0.tar.gz 680118 BLAKE2B 09f4893db7587dce9fd59103f8a1ef54c2b61248dd4aed313a90a390bb50e8927ef7a11dc5ca3af90b5ccf36ce16e0e18f3b555cc961a8c6862f7b8131f190ae SHA512 4ecd4c71294bee86f02b39a588c42a7232309db54459c950f77734926dedc3ec273237b9615bab6ef8a499c65442e3d6f7d2e9f159ccca021db0b450435ffbc0
-EBUILD cmd2-2.3.3.ebuild 1396 BLAKE2B 2a14076f2fb23f65fa8a50330df0c89c90aa33a9feb989f2782c6ec24a56556f28f7233ef0b682cdc9e4a3de1bb3d77fce380598d7cc1af9036aeea272457747 SHA512 e2c80c7bf92acff359ab6399154553d49de4314e5eb6714ec34dd7cb2657bc1c2902d0ac4dab269a9f5d087e0498ae2d51618fa8e4963c307b9c0ab3cd76f4c4
-EBUILD cmd2-2.4.0.ebuild 1485 BLAKE2B 7b006ebfdb5f20641db2dafd058467e97059b16d10ea7b1c9f0826d4b5657b0d3643a88d6994ed3d328381e910e40289fea0f85bc07816644cdd420e4106c478 SHA512 b7eeeb2e25eb4bbe57b4022c3de84e8b8c81ceb6f41eaf84294090222a11c3000e3e7a1d8afe9047df854e4d2f83f76dd95eccadb6929e42d82251cad7f70006
+EBUILD cmd2-2.4.0.ebuild 1480 BLAKE2B bfc6bc865af4ba2d333cfd54c765d5af146ef0cab8974408e29821168b24211c5593215211d4242c8021c2374b6b9721092f34d75c42490c089fe3539ae48c69 SHA512 872ff54658926538c30086fec4540ceb5d900a4553b053112f6906001a01087b6143e281cccd277c7e89f669fadc521aa8679d4f870dfea7ac7c122a2e798a03
 MISC metadata.xml 522 BLAKE2B 39d319b6a64a7b54568a3fbd3d7db9adf7719b690a8f086018ce41f0595db157b1f7825ce28afb4fb0d748ca0d6dc21d79e480361b69b4bf29c0efc2d2540bba SHA512 57315c23dd64534085502e59f0b8ca01ef8088d5a2b16ed807631a1f36a523768960754b00619e802333552c405e2984e314d91003f7a624da6f1eb8e8e4b98a
diff --git a/dev-python/cmd2/cmd2-2.3.3.ebuild b/dev-python/cmd2/cmd2-2.3.3.ebuild
deleted file mode 100644
index 6603d301f98e..000000000000
--- a/dev-python/cmd2/cmd2-2.3.3.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Extra features for standard library's cmd module"
-HOMEPAGE="https://github.com/python-cmd2/cmd2"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc64 sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	dev-python/attrs[${PYTHON_USEDEP}]
-	>=dev-python/colorama-0.3.7[${PYTHON_USEDEP}]
-	>=dev-python/pyperclip-1.6[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/wcwidth[${PYTHON_USEDEP}]
-"
-# pyperclip uses clipboard backends in the following preference order:
-# pygtk, xclip, xsel, klipper, qtpy, pyqt5, pyqt4.
-# klipper is known to be broken in Xvfb, and therefore causes test
-# failures.  to avoid them, we must ensure that one of the backends
-# preferred to it is available (i.e. xclip or xsel) + which(1).
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		sys-apps/which
-		|| (
-			x11-misc/xclip
-			x11-misc/xsel
-		)
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	distutils-r1_src_prepare
-	sed -i -e '/--cov/d' setup.cfg || die
-}
-
-src_test() {
-	# tests rely on very specific text wrapping...
-	local -x COLUMNS=80
-	virtx distutils-r1_src_test
-}
diff --git a/dev-python/cmd2/cmd2-2.4.0.ebuild b/dev-python/cmd2/cmd2-2.4.0.ebuild
index 26a05e90d1bf..ccb5d6207f86 100644
--- a/dev-python/cmd2/cmd2-2.4.0.ebuild
+++ b/dev-python/cmd2/cmd2-2.4.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc64 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/attrs[${PYTHON_USEDEP}]
diff --git a/dev-python/configclass/Manifest b/dev-python/configclass/Manifest
index 91200626ff93..9ea4845d3aa5 100644
--- a/dev-python/configclass/Manifest
+++ b/dev-python/configclass/Manifest
@@ -1,3 +1,3 @@
 DIST configclass-0.2.0.gh.tar.gz 4631 BLAKE2B 8e273e539a9f3cce70397ef0bcc420ba7d5b2b007de490bc4347412546b6af0bbea4950218e69590817f41c884044bd7d976c6a188f8665f2de0bc173f1e9c8e SHA512 7f22679d3470ede4106bdd99f1216bc49631c32452dc681fbd6a6b91735bbc82db1babed3cd94f93a0f9f2915d0866ee18704ffcfe477fd3134b6f18a094d192
-EBUILD configclass-0.2.0.ebuild 512 BLAKE2B acbcdd734e8a90c914dbcf236f1a2b86f05381cbf8c6d595e00f16066697a8101900547b4666cd22142c097675453253bdaaacaf1b61fee96d549a970f805b49 SHA512 e347802c134393b62e5d1cd84177d44a1a1024e7ea47b7033e872975aa464e618d6a18572fa245a0619e126369d45444d2247d608712b30e4ef5ae926eb18ccd
+EBUILD configclass-0.2.0.ebuild 519 BLAKE2B d01e4ef82801326450c54e488b96534dc7cfcbd7885b7afb9c9f5db8647b98fcc0873c004d9f8464860fe3a3db5582d526a7c8994ae5c1266a233b57d22cc5f1 SHA512 946c0c62fcfad1465760a0346a565747a2c6c331863499a94a31286e6189728f2d47d62666cddb9ba20780c9c7076c9e4d024a034f02f4e3738e8bb6b1b8633d
 MISC metadata.xml 402 BLAKE2B d65861f3cf818d5b95f2090b71c9c6995a70cdd9df6d3bce3c5321d3a0bc2ce6b3c7c09c03c8021a4801f56f0993f12a6b2b23534cf6ef35283996c335da94c9 SHA512 cc65aab1d9b14c4a48a81174c0b10df7e1c87670171cb923dddb2c28c0ad07b9c3dafb5423c6664784305b81c261f7a525da196e14c9900f84bba811334ec114
diff --git a/dev-python/configclass/configclass-0.2.0.ebuild b/dev-python/configclass/configclass-0.2.0.ebuild
index b3fab3ff014c..ed0d29263137 100644
--- a/dev-python/configclass/configclass-0.2.0.ebuild
+++ b/dev-python/configclass/configclass-0.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/schettino72/configclass/archive/${PV}.tar.gz -> ${P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~riscv x86"
 
 RDEPEND=">=dev-python/mergedict-0.2.0[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/consonance/Manifest b/dev-python/consonance/Manifest
index fec40f3d16dc..ee3310b5927d 100644
--- a/dev-python/consonance/Manifest
+++ b/dev-python/consonance/Manifest
@@ -1,4 +1,3 @@
 DIST consonance-0.1.5.tar.gz 31225 BLAKE2B 049637747e0b9b027bfc9a064d4fe792a7d2cc42219d83662646120423af1ef18e4a8328a9deaa9e9d8d0f75065afceb6cc9c533fa5728b1e866c160811cce16 SHA512 3ab8a7a2dbca22d519c79a2903f90d79ce3b5709e0025667c9fbe0d5bfc8b3a4ab853403dd29b791bd2cf3101fdd2a3c806e694840256f373d1930daeea71509
-EBUILD consonance-0.1.5-r1.ebuild 908 BLAKE2B 99ed20cc06bfe39a86803301673868463c695397066f734bfd72b4a59b1648a9d6c3f375051c10462ccaa1ffec19a33bbc37ffd3aa71a7364b465c978c77c040 SHA512 39bb327b50134ddc093ef84e246d7c1a3fa377fac61f3ab67fdaa3263a6dec4c1b5fc15eebb07e6e777e5f6de19fd8f1e0a65fb15c7c9742a4317bb156fc1d85
-EBUILD consonance-0.1.5.ebuild 873 BLAKE2B 37b2dcdfdff2d1ac3407910c67bde20368924a94c67f4f6b5b00d20bb62c1767e9ca6a961b56bc9a78c60ac4252d50b73a998ed6d8cc7060950773017e94db63 SHA512 2a91338250b4d97577a4f09054720d49cb7e701310b648c834a6ebe494ffbbecdf2c34ad186eb5a205af2dddff85de194429b42c0ca1ea0dfa08218d7281200f
+EBUILD consonance-0.1.5-r1.ebuild 906 BLAKE2B b4c67a87600be92246cef323488bb3c4809a3114ef20656d2a6f82edc2c927b20aecd9c4a6b3085149268b1f7295f31501e0360876dd5fe70283fa79db867afa SHA512 5b360bdf24cfc9e6194807ae33c906512fc2c3be7b371c5cc7bc70093b363dfb5f2ec4c6c45792cafde3a839f59fcdcffa0bd5cde446a1034c9f8a4c26f2ada8
 MISC metadata.xml 631 BLAKE2B 1a0cbaea43cebd4827640482c9b8d740b853266f7430579e9560c419c8ed83d25db425d45d3c6bfc8e672a84ff62fe817a4ee9404bcae8417a5197559f1cf507 SHA512 22051966ad03ce0741f556fd729115f572e9d73e639e59748027d4b2b5e57493f8ed63455e489987535699b2a031eb8681bd29bb22d075697ca56869d2077627
diff --git a/dev-python/consonance/consonance-0.1.5-r1.ebuild b/dev-python/consonance/consonance-0.1.5-r1.ebuild
index 71911ed00e7d..f9ba7df1255e 100644
--- a/dev-python/consonance/consonance-0.1.5-r1.ebuild
+++ b/dev-python/consonance/consonance-0.1.5-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/tgalal/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="examples"
 # Tests require an active internet connection
 RESTRICT="test"
diff --git a/dev-python/consonance/consonance-0.1.5.ebuild b/dev-python/consonance/consonance-0.1.5.ebuild
deleted file mode 100644
index 9b3a02ed25a5..000000000000
--- a/dev-python/consonance/consonance-0.1.5.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="WhatsApp's handshake implementation using Noise Protocol"
-HOMEPAGE="https://github.com/tgalal/consonance"
-SRC_URI="https://github.com/tgalal/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="examples"
-# Tests require an active internet connection
-RESTRICT="test"
-PROPERTIES="test_network"
-
-RDEPEND="
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/dissononce[${PYTHON_USEDEP}]
-	dev-python/protobuf-python[${PYTHON_USEDEP}]
-	dev-python/python-axolotl-curve25519[${PYTHON_USEDEP}]
-	dev-python/transitions[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-src_install() {
-	distutils-r1_src_install
-
-	use examples && dodoc examples/*.py
-}
diff --git a/dev-python/construct/Manifest b/dev-python/construct/Manifest
index d54038b104cb..665ff150f9a5 100644
--- a/dev-python/construct/Manifest
+++ b/dev-python/construct/Manifest
@@ -1,5 +1,3 @@
-DIST construct-2.10.67.tar.gz 1189939 BLAKE2B e3effd2bb2906435208ef6a5fadbdbde2e1ef3565174568949207bdace48e25f423932f08598c82df661919d926a18d49767ea1189b01a5a3ee48aae601c45c8 SHA512 a4c7cc32b9eb63311c6ae2b1580b7a696c1e0c3960d78936798dd794cb37a77ec8ed8baa8128f12abd50390b9f4cb3f150e3453d5043797f0bd603525b8292a5
 DIST construct-2.10.68.tar.gz 1190512 BLAKE2B b41e5b3b62cd1568c78ac4975b0d66e7a7ad4489e97031d3e866ff8eb98eea4eb387041dce15210304c608e0c419548cddea3557c2f53d52ecbcf6eb5be67749 SHA512 2388751323b16b69a06457c4862e7d1334580c201050734f150ab4437e2066ed18ff5323f7d81b8bb93124ae0f57a2ae91d7c64ffefc6e0369d6e625b7fef4eb
-EBUILD construct-2.10.67.ebuild 1014 BLAKE2B 6b444e2fcff9e54ee78e9006e91c061336ed79db45c7577bfc072213c09b3fc96815b7719ebd552966bc3b479eacb37b4fc90ad0e7f81efa2a498306d0fff5c2 SHA512 02ccda08e22eff4b51219c415ae23caa870f584e83be50feae405abe934580b81c28c68983496050a1a4f489286d0136695f92b0fb0a3ee20c94a99f7c12c0de
-EBUILD construct-2.10.68.ebuild 1050 BLAKE2B 113909e13c385f5af7ec1e328b5b7ca156820c570fec7fa3dfbae6b7f30807a0b278d20d3c40d1cdc95ee962397e8dbe8629decd13027115976cc3a4069b0bdb SHA512 23075643b6ff3084b496167e3e74a8d71c354b1979bcbe8343d85fc29ab91fa470bdf4d75cdf1e475da735602043fd73a330fe3c45b7c62d0de3143bccf0efe6
+EBUILD construct-2.10.68.ebuild 1048 BLAKE2B e914f94d7683960265f067617abb64e740c74295032fcd2335c60e874c042b4d0a9dbd6d7008dbb5fb350cdcbc6252000a944e80b89a5638e509f0b44e78e72a SHA512 5848649ecfe1c23cbbe4cec5865085cd31153ac23c0d5a1ebf0fd568caa3c926ba1ee0e28317f22f2a437b92195877edda5ce0d94bbfb0f9fc46ed880f03a1cc
 MISC metadata.xml 530 BLAKE2B 841ba440080eb109449759509abcefb1449a87e3aed1f63a2acf021e6bb8c18e67d4e7e6c85d530877b7a2eb3de167708a728ad35507e3e6268f2d3f202018a1 SHA512 6c0e4d31dfaf335a7f94bc21866791100f8e96f5d58aaf988a48c55a054f5ac5d7ef579943a01d68e1403432b33f62c241b2a06dcf874278a1424f3cf60c8caf
diff --git a/dev-python/construct/construct-2.10.67.ebuild b/dev-python/construct/construct-2.10.67.ebuild
deleted file mode 100644
index 4ec846464409..000000000000
--- a/dev-python/construct/construct-2.10.67.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="A powerful declarative parser for binary data"
-HOMEPAGE="https://construct.readthedocs.io/en/latest/ https://pypi.org/project/construct/"
-SRC_URI="https://github.com/construct/construct/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-BDEPEND="
-	test? (
-		dev-python/arrow[${PYTHON_USEDEP}]
-		dev-python/cloudpickle[${PYTHON_USEDEP}]
-		dev-python/lz4[${PYTHON_USEDEP}]
-		>=dev-python/numpy-1.15.4[${PYTHON_USEDEP}]
-		dev-python/ruamel-yaml[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	tests/test_benchmarks.py
-)
-
-pkg_postinst() {
-	ewarn "Version 2.10.x has significant API and implementation changes from"
-	ewarn "previous 2.9.x releases. Please read the documentation at"
-	ewarn "https://construct.readthedocs.io/en/latest/transition210.html"
-	ewarn "for more info."
-}
diff --git a/dev-python/construct/construct-2.10.68.ebuild b/dev-python/construct/construct-2.10.68.ebuild
index b97a308445b2..727d0a891abc 100644
--- a/dev-python/construct/construct-2.10.68.ebuild
+++ b/dev-python/construct/construct-2.10.68.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/construct/construct/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/coverage/Manifest b/dev-python/coverage/Manifest
index b69c12830b6a..6bc1032d4a4b 100644
--- a/dev-python/coverage/Manifest
+++ b/dev-python/coverage/Manifest
@@ -1,5 +1,5 @@
 DIST coverage-6.3.1.tar.gz 707088 BLAKE2B 4253f2973fec34dd5737878c6977c4b7cd273d7786f5e34877b2061774a5177cf7905472e6c578f3292120dc9123e74387c2fe71723206efcf9a257563918a28 SHA512 aa91f7f45510ce8120081aef6367bc3f39f56480901b57f8e2c3f26c921b5d2c15c44c1ed628eefdd2f1d2360a2c62063004aeb19d287a50c4b33304f8eae5b7
 DIST coverage-6.3.2.tar.gz 709294 BLAKE2B 2da96731ee0065fb6139af7db073284a83efa135e7379d2a6d6e571cdf58c888cf72719fbddadb1bd8f62b0b155b8420a84377068c40e4c813533b3ad6b190a8 SHA512 d9ea3a93eefe2dbb723ed1eadb09dc1165c4f46e7186889ce3615411283baac1d80f04a3831208a164f99accea5d246d4613a7c2e909d2e63d3c714620432a16
 EBUILD coverage-6.3.1.ebuild 1522 BLAKE2B 0bebeab7afc69a217c3e3a146f7ef829effb7aae18d100438f5569e2b350f2ff4d242ebda9081da93782b8547fd4c8aacd1f62180fcb67e5cabcc53458986e67 SHA512 68faf983cf3ec85e0cea4b0da7507e6d2010e771678ca7f0ffd52a78f88ae68b66300376d321efa3b7d8015519e761482644fbe33954e837e9fe97b3ad679965
-EBUILD coverage-6.3.2-r1.ebuild 1546 BLAKE2B 79eb9746be1294f8cec5959947ab4bbd646bb5ec669cdbcbb145e2bd478eb5b5245b1c8ad4ab0ea2939c0d7f412e97cc2ec3975dfdf7ae0334c9c0daff6df915 SHA512 1c1e9608b57500273af316f774a74fe37bc22aab2f74d99abebd4f823f3eb39f6a55621ef5c8ebe51e6b6992c3c2b250e148ad228b99a7f24071358e5ad636a6
+EBUILD coverage-6.3.2-r1.ebuild 1540 BLAKE2B c6ecfad56e92bcffabcd755608b030217ed47c64533af8a65d5ec6e5b141202f9b871a5300a49b582e7e0fcd10232513a998ce005e1384b8b246d1e9c79eb961 SHA512 1ec876166eef0adfc29fd9447add8dc2b7da0ab0f678853018c24cb16e93e1e99144af076554619c86605825639f7d27980396081d5cf208441fb26cb0d0d00b
 MISC metadata.xml 714 BLAKE2B c0d2641f795a21a80b6fa36206973f41421effe055e4c5e41bf752869759eb48e8fe42a0ab00af55b5d5111bfaccd330676d63e263013dc9bd3c344cb038a3a6 SHA512 412d70b7c9c2871bb93ae6ed6ae110a9f29c26957f6e1b24cc531c7d49f292ecb5206df10b409f2e44d2f814b119ef4ed973bca608df999026bda8df2156df24
diff --git a/dev-python/coverage/coverage-6.3.2-r1.ebuild b/dev-python/coverage/coverage-6.3.2-r1.ebuild
index 1a2016543a8b..5936a985ff78 100644
--- a/dev-python/coverage/coverage-6.3.2-r1.ebuild
+++ b/dev-python/coverage/coverage-6.3.2-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/cppy/Manifest b/dev-python/cppy/Manifest
index 70ee7e940c43..803d21f5e39c 100644
--- a/dev-python/cppy/Manifest
+++ b/dev-python/cppy/Manifest
@@ -1,5 +1,7 @@
 DIST cppy-1.1.0.tar.gz 11777 BLAKE2B 3bdeba7ee9bb478b51090a52077abc44ee74f72439c3cf2bca898bfc84bd97993bf4dd20d641a1952e2738e3f6b89434f7435fe0a5a8302f91ebef9d02729686 SHA512 9ef4db580c963219a111ab10bc263cdf2c4386e27fce8ffe5c785fc7e8f6c6b60cb23ce918959c6f17194fd6977cc65fa64d167a0b62e6cff0cf662154bc734c
 DIST cppy-1.2.0.tar.gz 16701 BLAKE2B 0d77f742f5436145ef5923253c1e4949352b6dce904519d655943eb9e9293a47ef19471fde0aefd914309677db0aa5ca1ddb81a2b1e6541b2ff5724b734f8c5b SHA512 074496bc08b1e163610fcd8fc15225a6110ea874a1e1680ec85e449fb8de77dda548d170c631fc90c3cb81d8fa090d2e1d8f19c156e34b0fa1da2b1f20b531fa
+DIST cppy-1.2.1.tar.gz 18040 BLAKE2B f828fd6e7b401ea2f7672ade94acd8014e77890d68cf09c4f189f4c8776875130db185a7458016dd20f8b3eae536ad6794a79a0aab6894092b26ea341e73e309 SHA512 4215051ce848faccfabcfbd840a343bc81d1ef0321ff0837354560dc6208cc235a6a130bab96f8fe42d5f630d1dfc20795928c64f6204a49e8f04b3fda8f9c90
 EBUILD cppy-1.1.0.ebuild 491 BLAKE2B d5f29ce79782ee4cfdb30edde2cf50ee7b37896eda936d013fcfc7b5a6158f606fad45c98ebdc4a89163edfcac40a0cf1b1f16b62094f5ae74adbdd7c21663ed SHA512 4472c1c1539cb7043016a4d93a235ceb4020963dc8a766690db941216000566c179a015b2f719e153df8f2ce87dc21396a76c3888737adc7d02bdbb1c1bf4371
 EBUILD cppy-1.2.0.ebuild 531 BLAKE2B 9cc712c26c3206976ff4a4740ca5e0eed7ae5c63d144b6c6c194459b6a88071a6651a1c8beeb328aed374795ff41f6233792adf1d4d58d7262c16233343800fc SHA512 294052aae039af136ab705136db907e51da43b26178a81fe75e85a1034dac43a365faa4a9086d6f67139ae600ec143b8b286c9b41c47f25530e6b6b26cc0b4be
+EBUILD cppy-1.2.1-r1.ebuild 556 BLAKE2B d37090ee9c9eb4e523451961ec32318b5752ed4dcbafcc63e2b881cd7c3d8f4753726fe21fe094b1b09c51e3a5ea2a9c93998c1eace8c4f796d4b69474cc9758 SHA512 c17d452787bfe4b7974db2e2a99a4c8a520efe1298f28d5be22cc5f43d0f658198f40d1c7c32df40ae5ffd6528700dda8033fcb85f0034e25791b9aa4ca4c5a6
 MISC metadata.xml 602 BLAKE2B fc0deb89e55e63a036cc7eee611ded9481592777d978e9bdaec313b838574bbc7a21bd71e28f99121d2166f28fd2f0cc6d37786790a75344467708fc7203ab8e SHA512 61f35eb674dc1eef1258dcc8ebe128c004f3843bc17bdb828b83d5f719430746922518494686d13825c4e0644fbd4d0f907e78c1b6405e9547dab7ae2ed653c8
diff --git a/dev-python/cppy/cppy-1.2.1-r1.ebuild b/dev-python/cppy/cppy-1.2.1-r1.ebuild
new file mode 100644
index 000000000000..8fa0b2893cc4
--- /dev/null
+++ b/dev-python/cppy/cppy-1.2.1-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="C++ header library which makes it easier to write Python extension modules"
+HOMEPAGE="https://pypi.org/project/cppy"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# bug #836765 for setuptools >= dep
+BDEPEND=">=dev-python/setuptools-61.2[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
diff --git a/dev-python/crashtest/Manifest b/dev-python/crashtest/Manifest
index e5cee7bcf3ea..a7f9f03717bf 100644
--- a/dev-python/crashtest/Manifest
+++ b/dev-python/crashtest/Manifest
@@ -1,3 +1,3 @@
 DIST crashtest-0.3.1.tar.gz 16223 BLAKE2B b90465ee736ec0d9c378ed16327fe5bbddf19066a64a2a9d1c454f38eac5321235cafeb20756b2018e1dfea0e07726696084b8965a2543edc5e9fe0d79c33db1 SHA512 1ec80159416e820336d2217c2327f26638e235797ac73edc96fc5e568e2d9fa6e8746e11acde71953a960247f73a6ed9540e3f01c96d3a65f2071dc3e6be5be6
-EBUILD crashtest-0.3.1.ebuild 516 BLAKE2B dc00e4c3577445a8d3e05e93c5c34263d7ee2f59d6999676573bfe862cd0ef13f87a25ea8eb96dd68a000dbf9d7af64731bd4ba14a3b03ab52a9a6b14e2ebfdf SHA512 f98cb4a37ea7f997fdefdc65e57fb53c747015bccc8b8f3d41ba179678c4d7d79640175ac5028b5f0969147445bc6d4fb256186b6cb9b967ff5cc2a6d926103c
+EBUILD crashtest-0.3.1.ebuild 517 BLAKE2B d9f0c623c57e105147cd3f504ec1163142960bffb2b0cb40ae3f2ce706106c979918c1f4ecb3140d74963ff1dc396559341034fe716713ab9c377f511ec1ae31 SHA512 0110d1bb9993ef3dba24007eaf7ec0800c6e525d585d5834179e7d8dc80fd2d4a5965ed9fbe31f2c3e8737d5a80d52bd0897007bd196686847c88b93c7b37d26
 MISC metadata.xml 416 BLAKE2B f6b8728929c04221908904b4e43f0fa00c480b193537b519558a1f9e83bd99ab131c3b28d03a624690c4891feee71b6b90bbed6fdc0aa89a4f14dabe282c8343 SHA512 55c2a10cf5611aad9461b1aef9ec28f699a46237a7616e1a834769d20a00f9e4477e2910cc3117a71acd7512ee9812b7658010234387560445c484ce3feabe84
diff --git a/dev-python/crashtest/crashtest-0.3.1.ebuild b/dev-python/crashtest/crashtest-0.3.1.ebuild
index 8c32ead4a383..865d0fd5a700 100644
--- a/dev-python/crashtest/crashtest-0.3.1.ebuild
+++ b/dev-python/crashtest/crashtest-0.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,6 +13,6 @@ SRC_URI="https://github.com/sdispater/crashtest/archive/${PV}.tar.gz -> ${P}.tar
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/cryptography/Manifest b/dev-python/cryptography/Manifest
index 86366a827776..31ff54d328fd 100644
--- a/dev-python/cryptography/Manifest
+++ b/dev-python/cryptography/Manifest
@@ -51,6 +51,6 @@ DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9d
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 EBUILD cryptography-3.4.7-r2.ebuild 2172 BLAKE2B 98630de3f319af4e148989cedfc8c53ada6b81f188af90ebe1f117f55addd61017359d248ae354b868d4b2592acb21c752306d34e4d97d3e470454c9c91918da SHA512 6f90e044e4f79617a522bd8c4e299b4a920e60c2f97bdd059a38ce0dffb88182915483982716abfe8d39ae5910fbc9fec622a7247a3bf5f3330c5780ff6e0a0c
-EBUILD cryptography-3.4.7-r3.ebuild 2203 BLAKE2B d5143d7ade2d8e11e3d2e4859a19a742d168327858b455cf3bbe68062e760e1bfc5f68de8ba124dd3dd47f06f50507c3816d32b402494165e045fe1a6f9a9dfb SHA512 0a02173b00d4dd0d7d1423349151147718bac1020eeb5376a84ebef7b0a792f984a1c4cebbc76ead11f82ebc070b639b38113ca1d777be05a1190d95d0a0cc41
+EBUILD cryptography-3.4.7-r3.ebuild 2196 BLAKE2B 0a9c55bda7092913baa8fd982f1c62cd0deb40ae3167faf3f8ec86097b5e88236c95417bc93a7f86929ae04adc36e30c96580228b66ece8dd106e627d4f180c1 SHA512 7218eff44b397e12a9598794202d8c330fdbd9534e4cae5be9d8849beeb33941813c49a72dd1826e1a05269bd4c9a712db5358ae71bdc7a92fc5e9302f991338
 EBUILD cryptography-36.0.0.ebuild 2947 BLAKE2B bbf4b90b241f004645bec64847de4b30663c6e8e493500132f173ccf04d18908eda35f365c547a70ae524be81cbdab460830979c1a29c5c4a7b18faef84a1003 SHA512 677f0f736ba3b1cde9fe630431ae8ba2f590bc642467f424eb7b387df7d3017c834ed6249dfd5c6d12d84af38d0159efa4997df2792cd201761fd13de971120d
 MISC metadata.xml 385 BLAKE2B 28c12f0c0303afca4d0fb015a1ed123efb559686e71477b3120291164a01f219c0dce373d7f4f7380ced372343945a8ee1ce875c27851d3864a468ba48eb2cc1 SHA512 f80a4794ae57fc9e434679ccdd0ff4cc5e2c4fb48274cca32316f827dd6d4cd3b903cb45f52abdd4893866987d4d1026f7ddb1efaa76cb99e0f55d01e8433b83
diff --git a/dev-python/cryptography/cryptography-3.4.7-r3.ebuild b/dev-python/cryptography/cryptography-3.4.7-r3.ebuild
index 4051e6af5c34..b2833f722b2d 100644
--- a/dev-python/cryptography/cryptography-3.4.7-r3.ebuild
+++ b/dev-python/cryptography/cryptography-3.4.7-r3.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="|| ( Apache-2.0 BSD )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-python/css-parser/Manifest b/dev-python/css-parser/Manifest
index d9d62d4d55f4..242717788187 100644
--- a/dev-python/css-parser/Manifest
+++ b/dev-python/css-parser/Manifest
@@ -1,4 +1,3 @@
 DIST css-parser-1.0.7.tar.gz 348843 BLAKE2B 72fd2a0555eea2b912d3088b1d38a4bf082862a47a414c4c00718ad1b31299a3df3b2e9dcf4f22c3195520c28f5652aaf4103a9a999ceb3ea6b8c785f50bb40e SHA512 51e4ca836b18f963d798a14762bed78cbd3034598cc828dfe81b3f7d921a5bfe52374b0dc6160e1c01e40a8c8147a10664b9f7edeee867ca1086e6a4a96ff162
-EBUILD css-parser-1.0.7-r1.ebuild 538 BLAKE2B c44c8d307df807ed6214a7a92ded6f8043d380f8671ed0a61bfdea886f87a5debe188927be125855f2a8f36e02d7a903e7d19ddc5cd2bf6636dfab746a66eb42 SHA512 358a96fd0564ed20a884805a77273f994153836460f21c48557c3d20dd804a1613b532f8aef6a6ee8e0f1d195cfa92efb790732ca113a51ab97b9e1e7c4e0761
-EBUILD css-parser-1.0.7.ebuild 539 BLAKE2B 1ff6c1dc4c6a78b8c83b85f17e0be129118c1fd3f774f14fb382d4101f04538e5fbbe4a942c5a7d51d669d7358449d22f14c8544694f186d5a8531a5332f3c7f SHA512 5e081b6795adb3374b2fcb54534f1c2af52abc8b7f74e63867ea3b17e1ee46627481750fc67b679095e71d52dd2cd52c6354c2cf8cd3d001be8a4843ae6db416
+EBUILD css-parser-1.0.7-r1.ebuild 536 BLAKE2B 6843a32f8c6d140728c1b44d87962f6076e4f17bb90eba1779f0990d031bd189999103b33e9d941034136b66ccfcb62d872121a485568766b541739787136a85 SHA512 994ff8ea97b2923ef19330304a77cfa3340486ec1c74373520d3a1588340dac970140c910333f6afcacc25cb89702b4003f0e7e22e5fb9372c1930b03c466c66
 MISC metadata.xml 479 BLAKE2B 117a5a889216d7f10d68f4f61a5787e5c921167a26d099e1f268916f5e96c8332a396d2a41d76411e48a67991473ac2dae158b8c978bbc6a88cc015e79d32f5a SHA512 339cb0d6b67f1aa92e4ebef1ffd1dd79975e92d67b91c0fb88a39ae6bd54a7e713964655d8e486b7107562cb5b186404714531c5b348985cbf8d598c00b29f75
diff --git a/dev-python/css-parser/css-parser-1.0.7-r1.ebuild b/dev-python/css-parser/css-parser-1.0.7-r1.ebuild
index 717719f4a345..d450388f0198 100644
--- a/dev-python/css-parser/css-parser-1.0.7-r1.ebuild
+++ b/dev-python/css-parser/css-parser-1.0.7-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 
 BDEPEND="
 	test? ( dev-python/chardet[${PYTHON_USEDEP}] )
diff --git a/dev-python/css-parser/css-parser-1.0.7.ebuild b/dev-python/css-parser/css-parser-1.0.7.ebuild
deleted file mode 100644
index 142831e80e03..000000000000
--- a/dev-python/css-parser/css-parser-1.0.7.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2022 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 CSS Cascading Style Sheets library (fork of cssutils)"
-HOMEPAGE="https://pypi.org/project/css-parser/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="test? ( dev-python/chardet[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests setup.py
diff --git a/dev-python/cssutils/Manifest b/dev-python/cssutils/Manifest
index 72ba2408cacf..884536918e0a 100644
--- a/dev-python/cssutils/Manifest
+++ b/dev-python/cssutils/Manifest
@@ -1,7 +1,3 @@
-AUX cssutils-2.3.0-fix-py3.10.patch 762 BLAKE2B 1830a0ba7d498e52007ab0fa5399c4794cd084babff7efb6060331d8cde4a0e2a653252741874410f051b777891a5d5198a38926efae9fc9239306e81f45c64d SHA512 23dd9517a486281a0133445dbb4ba54961e26f666dfbda3b34552732c0542108b6e387b4213bb4c3504b0e437319f4a8c5482926d8dcc177c1f0cabc3e9a8588
-AUX cssutils-2.3.0-fix-py3.8.patch 922 BLAKE2B 7506c982710040a36d636f665bd273b32c3741ccb0db534b5bf146d671c03132fb90304a27b0bb1f3ab011459dbb1d6a1686921cba90da4eeb3a2eb18ff40319 SHA512 071fba0bdb927fd3f213c2429f0469e0ac8757a4103f3d7a0258214650d468785b96da01cb94d537dd82869f70f0ccbc110cd87c6170a3bb9804f3de57dc164e
-DIST cssutils-2.3.0.tar.gz 725849 BLAKE2B 7c6f0280c24eb9cf8c6e4215fc6a102ea0b1f72f52b06d8396601a19ffe457fa628bbf5b9f6c020185378ddf26c96e4aec11026e686343513db9141c7ca22dfd SHA512 9919224a61222e860a99ec80e6375a472b89c52af72272c1de7bcd5fd31cf8570a04da7762c62a17a85bef2c41b1c67447583087df4c86c1f8969ad4875a76d2
 DIST cssutils-2.4.0.tar.gz 725986 BLAKE2B 2f8d0166288e3af1f838fec3443293b4166bab6e2e115e198f3e6f7a0ec0949262de77eaeebe7437b3cf27567780f988884ce1225b94c379cabddcae0fe10543 SHA512 53e18f9d06905dbda5382a3ed6ef1808571e8a32204864364b0a344e641c774f0998bf23ad0997b34ddbe9f04d3d2c7d622249cfeb0a9e846f7fb1530ae9b12b
-EBUILD cssutils-2.3.0.ebuild 973 BLAKE2B 9d7c2853e2ebe62939335909c16ee684ada2604047da059914f2cf42cca92cda908b99d69f332f2c72a1517392f976b0a0754b4aa1316bc97b958e97972add74 SHA512 553a929971a5dd7cd787afce0661ae9892b19ce79fb8dd51e590dfbba9dd6de6722560056e56a0be0dee4ac37e1ea5bec365d95774c35de62cdf45a411337fbb
-EBUILD cssutils-2.4.0.ebuild 913 BLAKE2B bdf3853b94145483a7a29478f8ee743430e692ea6319433a14a5055fb916885c1fd2a81f3d10de25b3eca538c5c3d65a5f5f952adf013d1d937045303ce46ee7 SHA512 6b62519f73d74c60b16b9e11bd802f0ed6c4c0c201ac29a417e30f1716a9e61ba1fdd5f402b0cfbe5ecf2d44147f4e98e8c259fc3e9cc8502b07e0e7b1b848c8
+EBUILD cssutils-2.4.0.ebuild 908 BLAKE2B 9ab0f74daca9b3845b326459c6ccc760c28bf50441489901c05955ea5b10fb3bf238d17ea591a7e8d6022affa0b287c97d64de469ba7a86475b4678e6a0cb151 SHA512 44e411d5b60586331c623c4c827acc4f1b40d8420be5955cdceac41d5cdc8f415952a87d8b4103aabc598b8026bfbecd87487771199666ae6f1a2c129f11d715
 MISC metadata.xml 404 BLAKE2B 799ecc65093102f5dc56c272245253ad76e69ade2196953bc37547408cbec9c3259c05dd75838c23027cb6a348d03586d2e1d61d37713401ae3cbcfb330275e9 SHA512 b009e78386aee2e8405406ed455c5432e00d5990ca86b49e6ac5db4e3e06102fb968cdc7b55b824c3451156fe2501e3f1deed1f31b48cd1916f90ef515dd8e4e
diff --git a/dev-python/cssutils/cssutils-2.3.0.ebuild b/dev-python/cssutils/cssutils-2.3.0.ebuild
deleted file mode 100644
index 77df7eba3da9..000000000000
--- a/dev-python/cssutils/cssutils-2.3.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2022 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 CSS Cascading Style Sheets library"
-HOMEPAGE="https://pypi.org/project/cssutils/ https://cthedot.de/cssutils/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc x86"
-
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/cssselect[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/importlib_resources[${PYTHON_USEDEP}]
-		' python3_8 pypy3)
-	)"
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-py3.8.patch"
-	"${FILESDIR}/${P}-fix-py3.10.patch"
-)
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# network
-	encutils/__init__.py::encutils
-	cssutils/tests/test_parse.py::CSSParserTestCase::test_parseUrl
-	examples/website.py::website.logging
-)
diff --git a/dev-python/cssutils/cssutils-2.4.0.ebuild b/dev-python/cssutils/cssutils-2.4.0.ebuild
index cb65c2fe41ca..7d9c3d3258c2 100644
--- a/dev-python/cssutils/cssutils-2.4.0.ebuild
+++ b/dev-python/cssutils/cssutils-2.4.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+KEYWORDS="amd64 arm arm64 ppc x86"
 
 BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
diff --git a/dev-python/cssutils/files/cssutils-2.3.0-fix-py3.10.patch b/dev-python/cssutils/files/cssutils-2.3.0-fix-py3.10.patch
deleted file mode 100644
index 540fc7a1cc03..000000000000
--- a/dev-python/cssutils/files/cssutils-2.3.0-fix-py3.10.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Arthur Zamarin <arthurzam@gmail.com>
-Date: Fri, 22 Oct 2021 17:48:28 +0300
-Subject: [PATCH] Fix expected error message for python 3.10
-
-python 3.10 adds some words to it's errors, so catch if our expected
-are contained in the actual output
-
-Signed-off-by: Arthur Zamarin <arthurzam@gmail.com>
-https://github.com/jaraco/cssutils/pull/17
-
---- a/cssutils/tests/basetest.py
-+++ b/cssutils/tests/basetest.py
-@@ -126,7 +126,7 @@ class BaseTestCase(unittest.TestCase):
-             if not msg:
-                 # No message provided: any message is fine.
-                 return
--            elif excMsg == msg:
-+            elif msg in excMsg:
-                 # Message provided, and we got the right message: passes.
-                 return
-             else:
diff --git a/dev-python/cssutils/files/cssutils-2.3.0-fix-py3.8.patch b/dev-python/cssutils/files/cssutils-2.3.0-fix-py3.8.patch
deleted file mode 100644
index a3fff246b616..000000000000
--- a/dev-python/cssutils/files/cssutils-2.3.0-fix-py3.8.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Mon, 24 May 2021 08:35:13 +0200
-Subject: [PATCH] Force using importlib_resources in Python < 3.9
-
-Force using the external importlib_resources package based on Python
-version rather than the presence of the built-in importlib.resources.
-The latter does not have the needed files() method in Python < 3.9,
-and therefore results in test failures:
-
-  E       AttributeError: module 'importlib.resources' has no attribute 'files'
-
-This affects specifically Python 3.7 and 3.8 that have an older version
-of importlib.resources module.
-
-https://github.com/jaraco/cssutils/pull/10
-
---- a/cssutils/tests/basetest.py
-+++ b/cssutils/tests/basetest.py
-@@ -6,9 +6,9 @@
- import sys
- import unittest
-
--try:
-+if sys.version_info >= (3, 9):
-     from importlib import resources
--except ImportError:
-+else:
-     import importlib_resources as resources
-
- import cssutils
diff --git a/dev-python/curtsies/Manifest b/dev-python/curtsies/Manifest
index 3a61f34f30de..ba4b79840102 100644
--- a/dev-python/curtsies/Manifest
+++ b/dev-python/curtsies/Manifest
@@ -1,3 +1,3 @@
 DIST curtsies-0.3.10.tar.gz 53340 BLAKE2B 376258a71c1e89b241c2fb9439b7f094b72cdc19f50c075debfba019effed5b3b5286603b44f11e37420d4e0be0dce0cb69fc6e11dab332c6f1c109c1b7a098a SHA512 59dfae36a43f7cdb272f94900da81bc7a1033a6482df5ac5babb329659e16d740f98b9538146f2fe7c79aa2723ec3db10c8ec658539db7d462b02953a33cb4ca
-EBUILD curtsies-0.3.10.ebuild 591 BLAKE2B 99c4e11220e99821a99700a3d7f319bae7863f8cae15bb653edf45386db5ab551306cd402ab7f84615d35ce4f5c35bde9ac4678085a3a34683c377238aedd2d1 SHA512 45b5e11a179bd9e2c15c18847abd41ff009357697d3375bf8b0541c1312c4a26aba80e809848101b07eab8e27b0b9c2b5221c9393e30e3920fa65ef9b03d5f88
+EBUILD curtsies-0.3.10.ebuild 598 BLAKE2B 08f3997fcc0a3aead9b71c8372e19ffe6958821786b0217769bb102b198b28d410fdcbf3159ca05569b2554e0ff103f787da0eaa3ac20b1541de855e119b4c17 SHA512 fd713af1e015ae4fcf879a859a558de7f9b3ee8930653736ab77519d0dd22ac7f12c50c38f907009b528ce8ec2e1e3854bde32e4f924a494cb27b37aff6610d3
 MISC metadata.xml 405 BLAKE2B 7c57f4c632fddcb41ee10c615862a68010cc66fce074a430f5cf2e0aa82e008d47b10da7fe6c30f39b86bae57019f2db6f7a65c3c1731643b465aad17047073e SHA512 32a4bcd62ffc656cacd01c3f86a06206f643a23e1d44bb760b1ac0b36e01363a491722084f1f7836f218b0637087d7067f33c86dd4cd636c8b258cb0e1731c38
diff --git a/dev-python/curtsies/curtsies-0.3.10.ebuild b/dev-python/curtsies/curtsies-0.3.10.ebuild
index 751e9c977708..1dbf4e9c8f73 100644
--- a/dev-python/curtsies/curtsies-0.3.10.ebuild
+++ b/dev-python/curtsies/curtsies-0.3.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~riscv x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/blessings-1.5[${PYTHON_USEDEP}]
diff --git a/dev-python/cwcwidth/Manifest b/dev-python/cwcwidth/Manifest
index 320e4412756e..58ba9681ac39 100644
--- a/dev-python/cwcwidth/Manifest
+++ b/dev-python/cwcwidth/Manifest
@@ -1,3 +1,3 @@
 DIST cwcwidth-0.1.6.gh.tar.gz 11563 BLAKE2B 014c1ae377005c704620fda7063e9891c014bb3f3f22160baf55cbef6e07084302a34ccea6bce2ca0f06d193ed3782006e308930a19c9a3c02bf181070eb5654 SHA512 0516fd49d625cd4bec26c27fd2fbbde55ca13a92bee3712018627a5c7f7a0c04aa06842ecce4c99d468f262a829f4ec5ff20bbc66232ad0fc037a7ade5845622
-EBUILD cwcwidth-0.1.6.ebuild 577 BLAKE2B 8507c69b7c3028573352fa84802ac1d627be0a14345e72d6eb3abc1247cb7c72f24abbc70d7877a7005df3bb8fcd41fddd4495e17c4d273df61f8b3b094671cd SHA512 6aba1d4c08facfb4a7750df38b04f7272679a07cb74fec3d5e4e3bca9ac6b46e7ebe11313996458c9e781d1f3c027457b3d14e6d2481336d6d41ad772705b28a
+EBUILD cwcwidth-0.1.6.ebuild 584 BLAKE2B a93459947bc79afe6ecbbaf57988eb9d1ae8c18c35414241f449ca1ecd20285e2a0acc29c79bd56cefa2a04145467923c9e93a4a0ca240f64ece2faf0158e45d SHA512 8faa2c1f7ec0f66991853e253fd6d2c93bd95d84ac0c711a1726a4e52a6afa91da3922f1309a6262b2cf618df29530a57cad0926fdc579ab60f51ce5d70736ee
 MISC metadata.xml 349 BLAKE2B e1564185d34e24bd6070ffe534ded26aee31004f72bdcb85e27b6d42d243e7db1a9db68e75a6678c9da59530457d34a8cf58be54d919d18ddc539461e03992bc SHA512 65af1da9bc2295a6395395a832288b493df2218a85d8289361c05f2b0ee1bba57a3d32edf09a6c29e691dc43e4a92b34bc8980d346e7b860c5562a238731c067
diff --git a/dev-python/cwcwidth/cwcwidth-0.1.6.ebuild b/dev-python/cwcwidth/cwcwidth-0.1.6.ebuild
index 3294bd1fba61..47ea6436124f 100644
--- a/dev-python/cwcwidth/cwcwidth-0.1.6.ebuild
+++ b/dev-python/cwcwidth/cwcwidth-0.1.6.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~riscv x86"
 
 BDEPEND="dev-python/cython[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/dask/Manifest b/dev-python/dask/Manifest
index d021741234d3..5d5818640f2d 100644
--- a/dev-python/dask/Manifest
+++ b/dev-python/dask/Manifest
@@ -1,8 +1,5 @@
-AUX dask-2021.10.0-warning.patch 1606 BLAKE2B 69d75601493a8702ad61e1e9411c1219a83a2251349e4112346215fa7d8f78e10ed1f4bd1f6f5ed1db14627e1b7ba24c8ebf180b9210589c27bdecdf3d94d207 SHA512 f0479c156cfc40c6501bbc4c1832abb2d36a322edce2b5827c05e7d6cea075e12c57c5f0460eeebe250ca049ad6df74eba7509a4517d654775c915391a6b6af4
-DIST dask-2022.02.0.gh.tar.gz 5028629 BLAKE2B efe6e6143d030024abae6d33c98289a37e3a6003da15ea6c4132a5610bf74763f9d921a1f04bf4a28a6ca60405e89fad3ca0491f67da6661c45853d172551c06 SHA512 397dabd3caabac0657808ff031299a1461c7acf4a123db4d1876d8e72a0ae971266dcb256e29498b1988b1b4bea506db3aec962b876f280ec532b96da35d356c
-DIST dask-2022.02.1.gh.tar.gz 5034850 BLAKE2B ec5ff745c3dbe19bbbdc533be6bc86537b532943cc798932f57051001648fb97cc39890060d064f7db5f3fbe6aa72d784393a3ccdcce67beedf3540a2a925d0b SHA512 6f66b5a904ea7ab0137465f622d1606a218b4ddc8b91939759098c66c7b749c674c750bf0caa6b53c7cf9d192312c0991d8e6144cebf9745eb9dfd4583b8b66c
 DIST dask-2022.03.0.gh.tar.gz 8192610 BLAKE2B 1099dac34487dc51b9010746920e64e4e7e4a07bb1f3b82ebe069afdd2f64feccc7c97291a1a4d1fc089cbc6f0b6f40a81fedc96be11f85920558ad305b63641 SHA512 e32b82d76d6b3d1494c32bcec171e3fc09e38b6cc94729b3f82bf0618445e58e4bd5361efb359e5894af2703bdb4f3f100916d4d7fc905faecc9a5262559754a
-EBUILD dask-2022.02.0.ebuild 1516 BLAKE2B e668253fbcc714894f28ea59a96bd846a8ac11a69a56e8369fef0f63738bbd8c438d44068ab8f9378a570cd803c52c76a11a341fe3ac00af353dbe578cd07509 SHA512 afff6b8b98973df3979711586f7ef947272dcbff91fd10760e47eb26282bd527f01915af007f520df6ed149318b2903951835fb4b3ac4d43ece81997fc6f2855
-EBUILD dask-2022.02.1.ebuild 1517 BLAKE2B 0a835aade88fa19e4e5bd9ab7c99d514e830376ca1b99b38f15d3a971d6837129092cb27b716ffe453d1d6a80aa7dd25eb92c6771d8308f4f5a1fb6db7cf29ef SHA512 4140165c6ce99c99919fb8d9c254e74f0f32572f9152a20be4ed981da04a422836b5a360b6e02e56c1764298a854094b10c0f828743ce28386be870880419f47
-EBUILD dask-2022.03.0.ebuild 1460 BLAKE2B 63c47e7789d686647aadd4022b6ab98f216257fb0a019c97767042597051b095eb9dbcd098a3e1154aecef378493f2974c29497f06509e0e6797c8d2fd5ff6be SHA512 35b187333c5d4e3ce8835132673817a3fabb06afb870a936bb6123401f8e558c429565d3297c6ba4f3663424e75a74909818ca8d4d99006d56066676bcdcf3d9
+DIST dask-2022.04.0.gh.tar.gz 8649475 BLAKE2B 92602e239be8c281ca450eb3fb1dbafea2f5caba12f83cd6d05670431b945dba861d92481f5ec1ec0834ccf35af6658d482b26d25cf16c8b784364adbe7e9ccf SHA512 2abc10a1140ad81a5f6bdc7ff697b899a5410da6dff976c98fb30d32fff625078ebf5ed23b2317c94d293973040b05bf650c02aef2b8c18230bf2841e54c71fa
+EBUILD dask-2022.03.0.ebuild 1459 BLAKE2B ef0062494df8770f2fa32f2fd0dba186e9e0f0f449b55fc3819554cd0f36501b541f2213975b0ded0b3d19a56eaa02302313e4bb044c7c15df0488167d084f0b SHA512 1244c46992e84b76fa2a1875d366c83bcf8d5f04afc5c83079659e2bb19fb77904ef7313e041c599a1946bf79869ca4c55a6d8bb917f3b79de0f73c04d848e22
+EBUILD dask-2022.04.0.ebuild 1460 BLAKE2B 63c47e7789d686647aadd4022b6ab98f216257fb0a019c97767042597051b095eb9dbcd098a3e1154aecef378493f2974c29497f06509e0e6797c8d2fd5ff6be SHA512 35b187333c5d4e3ce8835132673817a3fabb06afb870a936bb6123401f8e558c429565d3297c6ba4f3663424e75a74909818ca8d4d99006d56066676bcdcf3d9
 MISC metadata.xml 722 BLAKE2B f5ef083408180a71a3f997ab61bba6770b08018e3d0737a17a99827edd486c2d10fc8bf17c70c8d5a431bc40bdd685d2a6ce6e8e1784a2c1d89152b167f51648 SHA512 1e1a79bf0d919a2a7a0840e77f239b3aa3bcd57666a06f18113c39c9b075d03e380b37c2e9c96dfe8ba864a94e98fe52fc0b6b16e69009364374020729b261ef
diff --git a/dev-python/dask/dask-2022.02.0.ebuild b/dev-python/dask/dask-2022.02.0.ebuild
deleted file mode 100644
index 40ae2bc73eef..000000000000
--- a/dev-python/dask/dask-2022.02.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Task scheduling and blocked algorithms for parallel processing"
-HOMEPAGE="https://dask.org/"
-SRC_URI="
-	https://github.com/dask/dask/archive/${PV}.tar.gz -> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/cloudpickle-0.2.2[${PYTHON_USEDEP}]
-	>=dev-python/fsspec-0.6.0[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.15.1[${PYTHON_USEDEP}]
-	>=dev-python/pandas-0.25.0[${PYTHON_USEDEP}]
-	>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
-	>=dev-python/partd-0.3.10[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-5.3.1[${PYTHON_USEDEP}]
-	>=dev-python/toolz-0.8.2[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/toolz[${PYTHON_USEDEP}]
-	test? (
-		dev-python/moto[${PYTHON_USEDEP}]
-		dev-python/numexpr[${PYTHON_USEDEP}]
-		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
-		dev-python/scipy[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}"/dask-2021.10.0-warning.patch
-)
-
-EPYTEST_DESELECT=(
-	# another test relying on -Werror
-	"dask/array/tests/test_overlap.py::test_map_overlap_no_depth[None]"
-	# TODO
-	dask/array/tests/test_reductions.py::test_mean_func_does_not_warn
-	dask/tests/test_config.py::test__get_paths
-)
-
-python_test() {
-	epytest -p no:flaky -m "not network"
-}
diff --git a/dev-python/dask/dask-2022.03.0.ebuild b/dev-python/dask/dask-2022.03.0.ebuild
index d78a53023b58..824476a13a69 100644
--- a/dev-python/dask/dask-2022.03.0.ebuild
+++ b/dev-python/dask/dask-2022.03.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/cloudpickle-0.2.2[${PYTHON_USEDEP}]
diff --git a/dev-python/dask/dask-2022.02.1.ebuild b/dev-python/dask/dask-2022.04.0.ebuild
index 77fb824ab55c..d78a53023b58 100644
--- a/dev-python/dask/dask-2022.02.1.ebuild
+++ b/dev-python/dask/dask-2022.04.0.ebuild
@@ -41,10 +41,6 @@ BDEPEND="
 
 distutils_enable_tests pytest
 
-PATCHES=(
-	"${FILESDIR}"/dask-2021.10.0-warning.patch
-)
-
 EPYTEST_DESELECT=(
 	# another test relying on -Werror
 	"dask/array/tests/test_overlap.py::test_map_overlap_no_depth[None]"
diff --git a/dev-python/dask/files/dask-2021.10.0-warning.patch b/dev-python/dask/files/dask-2021.10.0-warning.patch
deleted file mode 100644
index 87c2ab318aee..000000000000
--- a/dev-python/dask/files/dask-2021.10.0-warning.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From f59293c180f846a220762701006d25655095991f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Sat, 23 Oct 2021 09:09:29 +0200
-Subject: [PATCH] Fix test_describe_empty to work without global -Werror
-
-Fix test_describe_empty to work when the test suite is run without
-global -Werror.  This is e.g. desirable for packagers who don't want
-the test suite for a fixed version to suddenly start failing due to
-DeprecationWarnings in dependencies that otherwise don't break
-the package.
-
-Since the test expects either a ValueError or a RuntimeWarning, it seems
-that the easiest way to assert for that is to inject the "error" filter
-for the scope of the call.
----
- dask/dataframe/tests/test_dataframe.py | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/dask/dataframe/tests/test_dataframe.py b/dask/dataframe/tests/test_dataframe.py
-index 32edb488..e0d88ba8 100644
---- a/dask/dataframe/tests/test_dataframe.py
-+++ b/dask/dataframe/tests/test_dataframe.py
-@@ -570,7 +570,11 @@ def test_describe_empty():
-     )
- 
-     with pytest.raises((ValueError, RuntimeWarning)):
--        ddf_len0.describe(percentiles_method="dask").compute()
-+        with warnings.catch_warnings():
-+            # ensure that the warning is turned into an error since this is
-+            # the easiest way to assert for exception-or-warning
-+            warnings.simplefilter("error")
-+            ddf_len0.describe(percentiles_method="dask").compute()
- 
-     with pytest.raises(ValueError):
-         ddf_nocols.describe(percentiles_method="dask").compute()
--- 
-2.33.1
-
diff --git a/dev-python/defcon/Manifest b/dev-python/defcon/Manifest
index 611c2b283875..2de91a00a338 100644
--- a/dev-python/defcon/Manifest
+++ b/dev-python/defcon/Manifest
@@ -1,4 +1,3 @@
 DIST defcon-0.10.0.tar.gz 426111 BLAKE2B 6750ac064677bd1b2a2b49d37792b4e35c923ddd239c521490dd3aa0c40f55a96dcdac156a2511c3bb40605505beb920c66053488bb2bc2508899d4a81f77ddb SHA512 69d48701bdf419080b7acafe2b92c1897358d969d6ea5b78330969b79b9e393a1c53cfb1a17b4d58719329c403ac3a52a4e12828d99b8793d8dd19ddda151c76
-EBUILD defcon-0.10.0-r1.ebuild 723 BLAKE2B 3a4c0a37309f00028124b9ac296cdf628345d41c094773c5d2be85b957d118c0698e7104f732f1c7c5da060d8df4f6688981dd32bd9b93afb7a0b515fed16451 SHA512 432bc3f816544b4747b1ea92a4001a097d163c91fb9435948b3750ee1d3baf278282cd99a660b1c4e448749022865d12836aac90acf3be8bdb01f72b3eb3d6f2
-EBUILD defcon-0.10.0.ebuild 692 BLAKE2B 8680cb4c9970cda0640bf904f001b248f2562457a0c985af2a15ac52185fe84d56b12d4698bed8a8ec61dd90abd3c8eea9364da7d5d6894b338e29bf11b45b86 SHA512 f31316b1bb17fbcbf9f70b9b436bb37346abf4f60d2d05f2756e2fa379a4272797685c8b7a3f16e535881a0df0821c1569e1cef9b0e4fd86f3abea518986220b
+EBUILD defcon-0.10.0-r1.ebuild 720 BLAKE2B 544665158c21e30346d8ae88de808927cde265723d91c1f1feed491b757f061921c092e5c83eab63e8214fc5b78220195862b23dafd7c73a59a7c6ce51877b87 SHA512 b0b0389b4a500f0d61a2ffbe461c157d6d2acd1931fb87c0a7cf5430991eef77979f1a5b21f5530601a580b60ead57b0d38025343ec7696a2b7db703fa8585b8
 MISC metadata.xml 393 BLAKE2B 54f3c0643f3329d956636dc0d59a1396c65b082b7fb4d97fa0a3ffc494f04d19e5e0b7d84370a90825d67c82c0d7f5cd9d300fd5cc763250cc97e478e7a56423 SHA512 016cfb5ca7dc52255bded1027f1d1101707b78913562e81232ba7768d2ed2eb1060095a61744680bcd96ddefaf29569e0b164704d1e6fec1771c5fe129004f6e
diff --git a/dev-python/defcon/defcon-0.10.0-r1.ebuild b/dev-python/defcon/defcon-0.10.0-r1.ebuild
index ecf74aab0094..2c7688d19ab6 100644
--- a/dev-python/defcon/defcon-0.10.0-r1.ebuild
+++ b/dev-python/defcon/defcon-0.10.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/robotools/defcon/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/fonttools-4.28.5[${PYTHON_USEDEP}]
diff --git a/dev-python/defcon/defcon-0.10.0.ebuild b/dev-python/defcon/defcon-0.10.0.ebuild
deleted file mode 100644
index cd13e6c31296..000000000000
--- a/dev-python/defcon/defcon-0.10.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2022 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 set of UFO based objects for use in font editing applications"
-HOMEPAGE="https://github.com/robotools/defcon"
-SRC_URI="https://github.com/robotools/defcon/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-IUSE=""
-
-RDEPEND=">=dev-python/fonttools-4.28.5[${PYTHON_USEDEP}]"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/fs[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/dill/Manifest b/dev-python/dill/Manifest
index 3b3b18550a33..3ade8fb5cb14 100644
--- a/dev-python/dill/Manifest
+++ b/dev-python/dill/Manifest
@@ -1,3 +1,4 @@
 DIST dill-0.3.4.gh.tar.gz 152875 BLAKE2B 61c638f0459b94f5cc0dabd9d5fd224c3c010ab6ccc9b7e47943922e7e139bd74c7a5173657febb028fc79632792f807586e271316ad87bb505520163f85a300 SHA512 1b1991909a9782382ecdb2ada13249c8b446d3558de69501280c816f7cd6c6728f9d3303c826461245ab9e42c43c02e4605142f25e09244bb7ccc9ca68a4b565
+EBUILD dill-0.3.4-r1.ebuild 690 BLAKE2B 9788410a39e6bce60f6bb2a637bc10cdcc8dc0d236314f544fa9e83afe404d9e0dc7e0872bbf1f3d7051f73d42877dadb897bfff7ee5030dee596628eff315cf SHA512 9018c38afc8083b64496b97ce7bb5daa72d799f15266b51f693d4d63d3e8d11cc3aa043c3378917c551eb0e28075b36d6681214a06689b6e5c5e5a8aaa6f49a6
 EBUILD dill-0.3.4.ebuild 631 BLAKE2B deb8ca8ed00a31b3e0148a1e285948d3bda1eb8288edbf44674c9ba3c7c0394fe6173d229351c2ba2377f9dede1a4ea9194c9163a27fbc649e26447088da0064 SHA512 29894a9f32ad179a8ea45503cdc29ce0644d902d410446f136b2b0cbdac6f76bc429e77bcda37e56995882637017a826909ef988d5114ec0c66fc44b0c1e7eff
 MISC metadata.xml 997 BLAKE2B ae32cd96d7a4967a9886d4903e21720459c0a963a675d301c2bb651fdb15877d845100822c1e7a7b6184ccaa666cbb6dc58f939616de9c1c22554670d841bd19 SHA512 e3dc363382bea8ed76343b62377c139ad84011a6b804f64b65d93941a7c192c268c0da273c73d5ec1cece7320b15fa88bf5a2f20a628d8845efddab24f3acc5b
diff --git a/dev-python/dill/dill-0.3.4-r1.ebuild b/dev-python/dill/dill-0.3.4-r1.ebuild
new file mode 100644
index 000000000000..7adc8ad7e0e1
--- /dev/null
+++ b/dev-python/dill/dill-0.3.4-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Serialize all of python (almost)"
+HOMEPAGE="https://pypi.org/project/dill/"
+SRC_URI="
+	https://github.com/uqfoundation/dill/archive/${P}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S=${WORKDIR}/${PN}-${P}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~m68k ~ppc ~riscv ~x86 ~amd64-linux ~x86-linux"
+
+python_test() {
+	local fail= t
+	for t in tests/test_*.py; do
+		ebegin "\t${t}"
+		"${EPYTHON}" "${t}"
+		eend ${?} || fail=1
+	done
+
+	[[ ${fail} ]] && die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/diskcache/Manifest b/dev-python/diskcache/Manifest
index 31377d867271..db3cbb9d1b3d 100644
--- a/dev-python/diskcache/Manifest
+++ b/dev-python/diskcache/Manifest
@@ -1,4 +1,3 @@
 DIST diskcache-5.4.0.gh.tar.gz 653968 BLAKE2B 765f0d8d9c4b3a8bf9e4c52b3b931867dc0b92aa7b891d6d64cbfe9e7ff491662a1fa2f0af776f9b3dcc4b441f50b68dc009a29e9b0d37f99add9033f4fb94d8 SHA512 cc15ff0b06b2a5708692f50e185699bd53e60408cef25053bcb5aaffec2795dd53c3bfe4b131a47f68c43388927ecc034c43233c38494cb2f6e40636344270fc
-EBUILD diskcache-5.4.0-r1.ebuild 931 BLAKE2B 1e6a9706363ba4cefaf547abf2f74e756a5d6a817ca475418752ea7462e1812e2d870d5399541a7d20cc519c66c6abe2ae60f799e3c2e88bd4c2bd6e62200754 SHA512 64014f02af783f86a0564e0d428fc19ef6c6c57b5ee744e6a1d6c03d5f2775156cbeaabf2f3e24b2cce16ea666a3605b629133312c475b4e689b642f38deadd0
-EBUILD diskcache-5.4.0.ebuild 885 BLAKE2B dae18c65738660b24ef67eda072cdc0d282e1cf9c2a6bb0098765f00590f76f9d7b890463345643810e7cb9bd5c0c58b617ed5d210ed48ad3c3bfeef9bbe14db SHA512 c767a20dd918b0946db2269c02258228ed265d7a74af9dcbc2d5677dbbf003d5aff6ff1f11e8f0cf8c89f0425ab64fc8f2ccab323b440fe34eb0d995ec374939
+EBUILD diskcache-5.4.0-r1.ebuild 923 BLAKE2B be8673e54e05e87d090488309df4c6f24c50d9379c5a3615b41718102679a0b061510dbcb6b9efac4d5740fa949222e89a0dfc2f8f345db8336ac39a73f73c8a SHA512 3be8289c6c4b5333cd59842d686614bafa5c60fffe2b3e5302a2060c2a3d2c2bffb3cdcbe691ef922b78ad69bddcdeabae474fe73bb1a93c44c9e5afce039e80
 MISC metadata.xml 417 BLAKE2B ea6f6d25bf863d8be1af817e00d06d668672ddb5cdd938f0bb1a0e92712bdf116540c36014778a160be6ec6144db406f1a1f0d804c3218e38b8bbfc7c1456cc9 SHA512 c5812352980d74ddadbe2192c2c724369ae37d2d0c3d6018220d2ab0bf07559e569af816f3503b8db825a7689cca7a340adc4bd3d1bd73893446a41a7bfb6882
diff --git a/dev-python/diskcache/diskcache-5.4.0-r1.ebuild b/dev-python/diskcache/diskcache-5.4.0-r1.ebuild
index 76a1c5fc6504..41c26e65f9d8 100644
--- a/dev-python/diskcache/diskcache-5.4.0-r1.ebuild
+++ b/dev-python/diskcache/diskcache-5.4.0-r1.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/python-diskcache-${PV}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/diskcache/diskcache-5.4.0.ebuild b/dev-python/diskcache/diskcache-5.4.0.ebuild
deleted file mode 100644
index 42daaf56c9bb..000000000000
--- a/dev-python/diskcache/diskcache-5.4.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="sqlite"
-
-inherit distutils-r1
-
-HOMEPAGE="http://www.grantjenks.com/docs/diskcache/
-	https://github.com/grantjenks/python-diskcache/"
-DESCRIPTION="Disk and file backed cache"
-SRC_URI="
-	https://github.com/grantjenks/python-diskcache/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-S=${WORKDIR}/python-diskcache-${PV}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-BDEPEND="
-	test? (
-		>=dev-python/django-3.2[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_sphinx docs
-distutils_enable_tests pytest
-
-src_prepare() {
-	# remove dep on pytest-xdist and pytest-cov
-	sed -i -e '/-n auto/d' -e '/--cov/d' tox.ini || die
-
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/django-allauth/Manifest b/dev-python/django-allauth/Manifest
index 4c4ceabd7882..1d95bea304c9 100644
--- a/dev-python/django-allauth/Manifest
+++ b/dev-python/django-allauth/Manifest
@@ -1,7 +1,5 @@
-DIST django-allauth-0.47.0.tar.gz 649860 BLAKE2B 9d230c546f5615a38be5fc915f080c44765c52f315910436af6e698af860efdf0debbe72a7d754cc7bd90a9791cd8647e3a186c748385c2d6e1f91a8ea8fc619 SHA512 b96acb3f44d5c04bef992cd5905e5cb3643d0329b10d9ae7df08f55a80c59bca8b59537a192f8de61b3776842fe166463e001a08585d5f701eeb839882cb6dac
-DIST django-allauth-0.48.0.tar.gz 658354 BLAKE2B 118b5ec1e02d39c437257ad7abc4b8970ccade3d6d129ba0bfb6149a8b79ce7ccc4206018ae08d89cfd07f63aabb65b1bdb09a683eeb47148ab891210ddceab2 SHA512 74390c0137cbd5b9351229fa659c2ae607e02b430e10751fc1588660772e74520fb495e0b8d7ef65d38e73168acefc30c608a69ee676b1ccf6644c83e18a6582
 DIST django-allauth-0.49.0.tar.gz 702336 BLAKE2B 0f39ff98e8e6d18b80e2ce858dcc104a0bf41eded6d1211f157c158030a65494bfbdc522d37242247d260413d75bd73f4d50bc53e9993d3bd6517b062faccee8 SHA512 134c578c65c61da393cbdb2a2f3ea3fdc32479371af0106af8f97eb794315c3025a705fb659a81b11618924dc2968c57dbcf1fdc03cec023de14deb94307d8de
-EBUILD django-allauth-0.47.0.ebuild 1127 BLAKE2B 3ca2c15f4d6895543d942e918f68696ddcdaccec0cb6ff9ef5180174f0e993bf1cbe8a7cb18a9ad7e821a8dd4ddad3e7bcebeec81b23595da09e56ad816a13d0 SHA512 4ddbd1b9e6673067ef99c2b3b1a6887659dfd11c59d62e037d023991a2e0ab2497a8a113790e742cc43b94f4c15d5e41a59852356deaf4a301cc2c6c88a5015a
-EBUILD django-allauth-0.48.0.ebuild 1160 BLAKE2B 539702c72c795437a23d41304ef80dcef1272afaa9b611fe0a61430054c5c75cc3b5dc1295362f87eee9eeb3735191aaaf7094d3c4e88a45e65c3da52fbe3a7c SHA512 455330bf5ad595a86a2f5aa02f2d863a275008dc1717ba38d58f61b7b45e702b7ed9277aa01edae16e9a9791b5b9ac10bb0853dff8c06a907aa6efe1fa4449b4
+DIST django-allauth-0.50.0.tar.gz 703083 BLAKE2B cb43eb09c5385020a581ecdc97acb74329d9c188f4365d91a46b8d2fe742d1d497bdd08d39cff36c93958e885fa1098a2b15218b296f1d9bf9211320aed247b6 SHA512 bf769e639ad37cfa150ed115b88d8802ae2f407461738a0dd2f39b055a4afc1468fe30d47a86e8f22697d2e67d4277078218c76f6c394a5cc685b7b21fa0a53a
 EBUILD django-allauth-0.49.0.ebuild 1172 BLAKE2B 68ea881e5c38d82c4eccf68bcf4c906516a7a4eccdf5be6770cb4226e236a943161cc27dc84863fe36bd1b1bf808ff01c9532ac04da79f6078e41c1be9abdc6f SHA512 121aab119362abda4dc883532441f8330f10c34f2ad024c8ab179702e47adde947d321590e83613658712f45f720700b1a5b27438c393af785b5d4559e6777c1
+EBUILD django-allauth-0.50.0.ebuild 1218 BLAKE2B f2317c811f9e7a7ab7ff9ca9d3f6cac4116b167d0e6886ce2775e65ae2a82cb9be609fb09eed24e7b9505f603a2929b884e70bde875e07ef4d26ded1b8350ee3 SHA512 6154fccc108d4239d135278def54649c04cc7a52f541020761d10548bfa4f9e62984db2ca8b108edbf5c06bf7a1d3ff7b351c5eee3f7d81eca5cb2948c095782
 MISC metadata.xml 405 BLAKE2B aadebaa1363c2a3acdd34c78ff2ec4385aee8a75f788957b8e298325e2f9bc10966903ac3762b2487971523241d653bfd95852fc3726807c97958f08ab6ae06a SHA512 24c11691847c031351bbc4a4f2de657eb166402b8aa054ee328dd865e637ecf06679ab7cd7cef0b36dcaed863a1b712664b991ed42a3f79951bc59603510d745
diff --git a/dev-python/django-allauth/django-allauth-0.47.0.ebuild b/dev-python/django-allauth/django-allauth-0.47.0.ebuild
deleted file mode 100644
index 815a68413f7c..000000000000
--- a/dev-python/django-allauth/django-allauth-0.47.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# 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="Django 3rd party (social) account authentication"
-HOMEPAGE="
-	https://www.intenct.nl/projects/django-allauth/
-	https://github.com/pennersr/django-allauth/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# cryptography via pyjwt[crypto]
-RDEPEND="
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/django[${PYTHON_USEDEP}]
-	dev-python/pyjwt[${PYTHON_USEDEP}]
-	dev-python/python3-openid[${PYTHON_USEDEP}]
-	dev-python/requests-oauthlib[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? ( ${RDEPEND} )"
-
-DOCS=( README.rst AUTHORS ChangeLog.rst )
-
-src_test() {
-	# cern provider tests require Internet
-	rm allauth/socialaccount/providers/cern/tests.py || die
-	distutils-r1_src_test
-}
-
-python_test() {
-	local -x DJANGO_SETTINGS_MODULE=test_settings
-	local -x PYTHONPATH=.
-	django-admin test -v 2 || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/django-allauth/django-allauth-0.48.0.ebuild b/dev-python/django-allauth/django-allauth-0.50.0.ebuild
index 8a0f79e402a0..524cd84abddc 100644
--- a/dev-python/django-allauth/django-allauth-0.48.0.ebuild
+++ b/dev-python/django-allauth/django-allauth-0.50.0.ebuild
@@ -11,7 +11,9 @@ inherit distutils-r1
 DESCRIPTION="Django 3rd party (social) account authentication"
 HOMEPAGE="
 	https://www.intenct.nl/projects/django-allauth/
-	https://github.com/pennersr/django-allauth/"
+	https://github.com/pennersr/django-allauth/
+	https://pypi.org/project/django-allauth/
+"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
@@ -20,16 +22,20 @@ KEYWORDS="~amd64"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-# cryptography via pyjwt[crypto]
 RDEPEND="
-	dev-python/cryptography[${PYTHON_USEDEP}]
 	dev-python/django[${PYTHON_USEDEP}]
 	dev-python/pyjwt[${PYTHON_USEDEP}]
 	dev-python/python3-openid[${PYTHON_USEDEP}]
 	dev-python/requests-oauthlib[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]"
+	dev-python/requests[${PYTHON_USEDEP}]
+"
+# cryptography via pyjwt[crypto]
+RDEPEND+="
+	dev-python/cryptography[${PYTHON_USEDEP}]
+"
 BDEPEND="
-	test? ( ${RDEPEND} )"
+	test? ( ${RDEPEND} )
+"
 
 DOCS=( README.rst AUTHORS ChangeLog.rst )
 
diff --git a/dev-python/doc8/Manifest b/dev-python/doc8/Manifest
index c4c2eed79ed6..97ff62982a34 100644
--- a/dev-python/doc8/Manifest
+++ b/dev-python/doc8/Manifest
@@ -1,3 +1,7 @@
+DIST doc8-0.11.0.tar.gz 25540 BLAKE2B 4ccfd741da44206e12ec0adcc2155534225363fdd034dfef259b425fc862bfcb62eea691bc86bb39d0fc26fda036956be4f60eaa2214a8eaf6ec1086fa83ec1d SHA512 9a8b57bfe21dcc7302fbdcb9b5f1592c7449b43d4475622926b794a0e9041e85ae7806990517e911348f78f5871133983ec0feab13cea3ccca7e75449e519351
+DIST doc8-0.11.1.tar.gz 25643 BLAKE2B 5f7eaa00b6fac123d02da41e02c7585c7c7160664766466a3bf06ba146411fda14b3720f8c8277f307f7b4985ded47707c836f9f6e6d7e4f89dc1af50111b87f SHA512 88b0882af3a671afc2a87d9dea0df5e7890895907545ff8fc02b40ae7f765c142bc715bff3e90685dd1d2358b701b8c6c30cac431fe3d6d0ec078b78added2f3
 DIST doc8-0.9.1.tar.gz 31122 BLAKE2B 84708d05414fe1545558910d0d74ae9612091500efb1880062910b395f1244c6edb1fe1c95ff97a177fcbb4127fcbc4b819a749f90c8384c0c23e9041af12b25 SHA512 058403a808ec2d55cf732c8eb0e28f6902c935a6fe0fd4e3ce1a11088888f32875a416adf478b81192948ebd581548b2d1591581222f1e841e97777980a80d69
+EBUILD doc8-0.11.0.ebuild 980 BLAKE2B 28a18e1be23517c2800529698bc5d20b1f403787db8541a487ea1f2f1ba03107a21da1162027978fa2ffdce1ed1a75ceeafd3adcb68298d8217c6dd9b6425394 SHA512 d6918771c18d877c00e6da46de4cab1594e1bcf8581498aca5da54f239b78dd7be2dd8a193cdc6657f0881ffbb24b10c4898426eb0ec95c7a2a00f64a92a49e9
+EBUILD doc8-0.11.1.ebuild 874 BLAKE2B 4e26e3c0c0e793667ec5df1568cd29c4d59320e3e800a97f5b9181a1c813c090c78bbe5b9e6fd65b1b813290a446f857b046e218d49b3d9174920b154f1c2557 SHA512 ed38964ab276076c8af3ee04a87907e07c328bfe1265135109d7689d516af606e040d68ae3bb33d36d20a0cab3affa7f3da6830b181b5cd42fd55df6c04f57b6
 EBUILD doc8-0.9.1.ebuild 956 BLAKE2B dd8560d5039ab6eb66eae7119817335c7971bb47ed6e9f87b13421deb3d1b52fa7912b6e175a296966b016bca9db6f1123d4b40e325532dcb2f00b46226dc2cd SHA512 fe8e223be01c1c9409b100c13ce7d80e2583a678d91c0f94f7648b6faa944aba4a64c532ea11f3337fee64bb13fd73f9f8f67cc78fc16d2e3a2f09955e3f6904
 MISC metadata.xml 322 BLAKE2B 0dc9c91cdb78ef3c143f7e45ac3ee3754643c676c249a685fdc73ee8f7468e19eecd6463fcb873b4a242789aa6c8f65ef92c45a1a5dc61c21bb070ae055f6553 SHA512 a417cd533ae3ef3b64cd170caa7e84fdf761be3b9b35178357134bcd5ca487fd5d4286cdff4718b345afef06cd63d5e9511431483ff7ba3ce5b5aca4ebe8ef41
diff --git a/dev-python/doc8/doc8-0.11.0.ebuild b/dev-python/doc8/doc8-0.11.0.ebuild
new file mode 100644
index 000000000000..4f9d8a2a0054
--- /dev/null
+++ b/dev-python/doc8/doc8-0.11.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Style checker for Sphinx (or other) RST documentation"
+HOMEPAGE="
+	https://pypi.org/project/doc8/
+	https://github.com/pycqa/doc8/
+"
+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/docutils[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	>=dev-python/restructuredtext-lint-0.7[${PYTHON_USEDEP}]
+	dev-python/stevedore[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]
+	test? (
+		dev-python/toml[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
+
+python_test() {
+	eunittest -s src
+}
+
+pkg_postinst() {
+	optfeature "checking pyproject.toml projects" dev-python/toml
+}
diff --git a/dev-python/doc8/doc8-0.11.1.ebuild b/dev-python/doc8/doc8-0.11.1.ebuild
new file mode 100644
index 000000000000..b6e36fe26377
--- /dev/null
+++ b/dev-python/doc8/doc8-0.11.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Style checker for Sphinx (or other) RST documentation"
+HOMEPAGE="
+	https://pypi.org/project/doc8/
+	https://github.com/pycqa/doc8/
+"
+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/docutils[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	>=dev-python/restructuredtext-lint-0.7[${PYTHON_USEDEP}]
+	dev-python/stevedore[${PYTHON_USEDEP}]
+	dev-python/tomli[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests unittest
+
+python_test() {
+	eunittest -s src
+}
diff --git a/dev-python/doit-py/Manifest b/dev-python/doit-py/Manifest
index 107d8050c163..090ff44bf791 100644
--- a/dev-python/doit-py/Manifest
+++ b/dev-python/doit-py/Manifest
@@ -1,3 +1,3 @@
 DIST doit-py-0.5.0.tar.gz 15174 BLAKE2B 092f21549d3c088baf8a96b8dd7575304d08c7ae7b0472e7a890159247422060af06c1cc14064cd608bd59e71788067c5374953b16f4511971bb3018c0245cd4 SHA512 f9e70be30f47b7251bdb479762dabe655be898f9fe37fc5ac6608110a82863a08002271620569745f9ec2f47c03529c044a6ea74244b8bb6438b3fbe7e4c28f7
-EBUILD doit-py-0.5.0.ebuild 620 BLAKE2B 96345acee6bd477797da7b811cdba31bf51e513e2967312ebf7d0a9bda2644c5728acc1575fabaada01f7debc42abe4d86c8bfe62001265168928174bd8c3924 SHA512 f0a068c68039bd6628fa4c5d7d7cfba15fca6ddf548c7a8c83bb0edac2c16edae62f0544659f7781266dd8e0011b214a2b2a6b19ac22bb0bd7f9f8f86f73ce3c
+EBUILD doit-py-0.5.0.ebuild 627 BLAKE2B 0fc21f1e7bad821adee4f2b76eaca432a06dcde9fa33cf59aa89c75864a31856b59eb6f788317fef38a286f87c2a563ac9acd23c6b7303c1a5ae3d8eb685093a SHA512 ce06d355483794d214c83cea9ddddbcd3218ce15414a2f8a7654dc49649a43304d679697d879eb6264f3ac3d94f13e4fd49f5962a077e3d983b78f6d8490d058
 MISC metadata.xml 574 BLAKE2B 7a0bbe729e4c116efeed154754527f4a2c8ce3f25aa0f0e7cddd9377ddd58032d49bd01583693014fd7006516d947f85976774da86ef2b952e14e06b4a81bc08 SHA512 e0f4d58ca417e125ace7705e1d326edad58ec391ef555f43ba3e34ee42007df84ee61f7234f98367f0410f4fa980c6a19e2493d3ae840c751687018919032294
diff --git a/dev-python/doit-py/doit-py-0.5.0.ebuild b/dev-python/doit-py/doit-py-0.5.0.ebuild
index 1d2bd8fb5fc3..2f1406248bfa 100644
--- a/dev-python/doit-py/doit-py-0.5.0.ebuild
+++ b/dev-python/doit-py/doit-py-0.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/pydoit/doit-py/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~riscv x86"
 
 DEPEND="
 	test? (
diff --git a/dev-python/doit/Manifest b/dev-python/doit/Manifest
index efe1982c15f1..f1ababcd77b8 100644
--- a/dev-python/doit/Manifest
+++ b/dev-python/doit/Manifest
@@ -1,3 +1,3 @@
 DIST doit-0.34.2.tar.gz 1449767 BLAKE2B c7d81144da99147dbc6bf7d670b6f411879a8080e405866866bc97ae4701d9a47a3d4882db9672e2e36bc8af577ba9632da1fb4ed2c9f87717f719ac1cd53d34 SHA512 24afc8078fef42a446733554c6ab63298ee5bb734381fc2bfc9d623dc98394916a1f89a18bb28e7ef862da8c0449b5cf16d605295e8948a0ea6968a231a1c8e2
-EBUILD doit-0.34.2.ebuild 1333 BLAKE2B 55c6cee8af39bd50d770b0c1d6593453cad0b1bce5e4c73b9a7f39909b986d0fc60c35022d72a1de4d661a4fd31f7d6a798539db397bb73dcc76fc24cc33835b SHA512 8b999ddd2c5d9a6744c3d97d1679e7e4a44658d7408deda726e0d94389afb4cc9b10a1aa6f918d8ab5126facdfe32dba0e7ba58238b139ac6d98f53da89fea58
+EBUILD doit-0.34.2.ebuild 1340 BLAKE2B b5b5cf0fa9ad50fa1fae8ace420c6b02f3c486930350eaed8c6acb2d5b855577305df0126bfaa906c104a97a19e65ad2fe8ed60b3b44b803376d6b6f45cb6132 SHA512 b26083148144f940816fc29d7836687e78f1f413e0f662643fc750f3325c1719309139055f0a31facfd7406ca6b266bf8184cb2bed950d50a70054f32f24e213
 MISC metadata.xml 568 BLAKE2B add52a6e7986bb88b9dc87d2f03c4ec3716ae7d5e2402556b7a3137b8267ca2cad0ae3324d628f3127afde36513414029c0f567a9683dd9b11b1a287ff5e3a7d SHA512 e772c9ccd8133fd73dcf04733facf60ef7c2f1559b83e5024faeea4d5fd7799c42a28be6c9b8676ea9b6d68969ca5be633320e8cb7dd8d1f0dca35e819eaebc7
diff --git a/dev-python/doit/doit-0.34.2.ebuild b/dev-python/doit/doit-0.34.2.ebuild
index 3148083ded7e..7e2072aec798 100644
--- a/dev-python/doit/doit-0.34.2.ebuild
+++ b/dev-python/doit/doit-0.34.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~riscv x86"
 
 RDEPEND="
 	dev-python/cloudpickle[${PYTHON_USEDEP}]
diff --git a/dev-python/editables/Manifest b/dev-python/editables/Manifest
new file mode 100644
index 000000000000..1362bea7fdae
--- /dev/null
+++ b/dev-python/editables/Manifest
@@ -0,0 +1,3 @@
+DIST editables-0.2.gh.tar.gz 6488 BLAKE2B 02c3e0c352effa902306f5c5a7b6b96cae74c8d8f620dabb3fa4df2568c5d730ecf3a078bfdab8ef87bfa29cb95b24563587de361337a8617fa0776b890b35d2 SHA512 39adc72f9710c28853ffebc9c0757f779e948bed7fc32f78bf52bc26ef4a6a5b351bf011bbf9353fc68e6ef2506481927c3558f8fd6650d61ac7a09591566b74
+EBUILD editables-0.2.ebuild 518 BLAKE2B 16619b267d652bc4fc67928cd6f2382837b17390325746c1ebb4fbc3ca798986ea35c19bdbd1667cd8b425181dc1c36ee48adad7b68ec855a6923df3639bc476 SHA512 742884d3f2e5b7754507846ee9e230c23074f2eded96592f1b93e875f11d51c5ca116e1a08d20560cf8534c5880054b8f617ed74b7bf6429968a70f8d8a31497
+MISC metadata.xml 348 BLAKE2B 6f17488b4dc6b5892f0826c49a22220cb85a739b7a9f85542af4c085d20322b3b38110c030471a96af9cbfeffe19061382ecaf506dddd394e3c2dd9304b1f8db SHA512 4f8cb5b90c329f8ba3bd9dee1c8195b96798a5d5106b870950aaf1597c8ea47b21a935de1b3af114015fde6c416db0883e4d039d90c5afccdd7346cdbc75a288
diff --git a/dev-python/editables/editables-0.2.ebuild b/dev-python/editables/editables-0.2.ebuild
new file mode 100644
index 000000000000..ce912db63c45
--- /dev/null
+++ b/dev-python/editables/editables-0.2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="A Python library for creating 'editable wheels'"
+HOMEPAGE="
+	https://pypi.org/project/editables/
+	https://github.com/pfmoore/editables/
+"
+SRC_URI="
+	https://github.com/mgorny/editables/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+distutils_enable_tests pytest
diff --git a/dev-python/editables/metadata.xml b/dev-python/editables/metadata.xml
new file mode 100644
index 000000000000..e973093a20df
--- /dev/null
+++ b/dev-python/editables/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">pfmoore/editables</remote-id>
+		<remote-id type="pypi">editables</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/ephemeral-port-reserve/Manifest b/dev-python/ephemeral-port-reserve/Manifest
new file mode 100644
index 000000000000..d2f9b48d8378
--- /dev/null
+++ b/dev-python/ephemeral-port-reserve/Manifest
@@ -0,0 +1,3 @@
+DIST ephemeral-port-reserve-1.1.4.gh.tar.gz 4839 BLAKE2B 843ddbfe8b102c10b3166628ba2aa1ef40f3314a74ac5e944e4e6c500f3f0d871424ca37dbbe64bc385352ba3ee9895884e82fd169962db8b6bf96aaf131d078 SHA512 e0412ac5ec362cffbd5efeb8c24a47ee36b50f2bf126438816824711f1f34412c903b116e96d4e541183925e7422b8f58bb0b7c5b819090d0f3d063cbf8c9f87
+EBUILD ephemeral-port-reserve-1.1.4.ebuild 610 BLAKE2B f504fcdaf184621adb90a7e15b7d6ad2617fa7906c7d1ecc3774a9e0384628d4abd86528725010f2d92726fb98dfe7b93c8d591d69b1a4f173835433314e8f3a SHA512 6d25607e34fb8a679fac2bc9d80a39c2950c2120661740adcf8ef86f36474de8f73306009164b91ee92a17294b137a0f7e68a442d28735c52b368f7e0520225d
+MISC metadata.xml 371 BLAKE2B 1ece78571254bc92c83621d671d74658de34133d33cdd1c902c06593058ff74ef82b2d4dc5d6a67af5c4d485e53f62818c063c11ae9f1c4a4f7fec20ac0a79e2 SHA512 d6096c1e95da471e04eb3571cc0cd780ad57dd392776064b874b2613f2d64749971851cafe1efdcc41a28a834c3ac6c6fa02117def2ce03cd65762c6ded6ceba
diff --git a/dev-python/ephemeral-port-reserve/ephemeral-port-reserve-1.1.4.ebuild b/dev-python/ephemeral-port-reserve/ephemeral-port-reserve-1.1.4.ebuild
new file mode 100644
index 000000000000..f1f3f2ea9aaa
--- /dev/null
+++ b/dev-python/ephemeral-port-reserve/ephemeral-port-reserve-1.1.4.ebuild
@@ -0,0 +1,25 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Bind to an ephemeral port, force it into the TIME_WAIT state, and unbind it"
+HOMEPAGE="
+	https://pypi.org/project/ephemeral-port-reserve/
+	https://github.com/Yelp/ephemeral-port-reserve/
+"
+SRC_URI="
+	https://github.com/Yelp/ephemeral-port-reserve/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~m68k ~riscv ~x86"
+
+distutils_enable_tests pytest
diff --git a/dev-python/ephemeral-port-reserve/metadata.xml b/dev-python/ephemeral-port-reserve/metadata.xml
new file mode 100644
index 000000000000..3f3e45e7f75b
--- /dev/null
+++ b/dev-python/ephemeral-port-reserve/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">Yelp/ephemeral-port-reserve</remote-id>
+		<remote-id type="pypi">ephemeral-port-reserve</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/eradicate/Manifest b/dev-python/eradicate/Manifest
index 033cb73473e7..cf7c800f3f39 100644
--- a/dev-python/eradicate/Manifest
+++ b/dev-python/eradicate/Manifest
@@ -1,3 +1,5 @@
 DIST eradicate-2.0.0.tar.gz 8390 BLAKE2B 22dced2414622138655be80d1c10b746519d313959c7620cb54c4dc27247b0c29b7607c54934fe1dc379bec2cb729213b7ffb1d27f3f7f9b9a9d186aa9402674 SHA512 947a3890ccb1dbb52e73b37e632ae5ba1eff732d9d0b0dc127fa8dc908412e864fcda3203274d5eb1645b22f6e97a90ebb13cd4363a2360d6591475d909bdb96
+DIST eradicate-2.1.0.tar.gz 8706 BLAKE2B 5b5cab1c465c8295157bec1e8e39f0e33dbe31957da01ec44bbabf54a2b19c519a35cd7d2b92217d5395ce7397b3ae70175766a83b66d05e723fc5b5a019eb40 SHA512 a9b06745bceff909a1bbe34348b8e4c17d7f1e0ab3b554206633f350725c34a9b7238b3af6a40516081bc06aa86cdd593b27b90efa083ac024b0226f7cfc4df3
 EBUILD eradicate-2.0.0-r1.ebuild 625 BLAKE2B 382b95a56f458c8067cc08d45e5c966488b487daaaaac28f9abe1a332daab8e90902945e61f81a860e9aa60798bf468ebbe46df9203adf17dd143445c09aa300 SHA512 0043335de7b1691f19264e14ab45c4fa727b46878e4e72490108db6068f63424da5d93e975d0d85ea3da6c934eafb2554386b13a5d8b057ce9e745be5bdd4a28
+EBUILD eradicate-2.1.0.ebuild 633 BLAKE2B f747ba9fd46ab4bbea4a956f9dc34bd6a1941d0b88dd7f2bb756c254e344be84a86e7aa8d374a3ae897a8dde4a312b5dbeea670096c6d325cfadde4ccb761ebe SHA512 fe867fc02285163680a938c5f573993450d9b6fe12c8f853dba539625928504fa3df4fb02f32928af7a0d94587d5a4c15ce0e1cd5ddb13f5185789d3a5ed29b3
 MISC metadata.xml 396 BLAKE2B fbd39a684f629b20e9553c911e5ce288863e35bb6a1a4fc7a16e9e114d9a70f0ee6bef0ea8cf34f091427ceaf743a5b280ff0b7b6ca6858b0c301fecf6535df5 SHA512 03886b745b7f3e2b99a39fdb0fe7864d4c1acdd529137b845d1700715b606fa02ec53bd8ed25ea20242857bd421869246f0165566dfe72098853203bf8fda21b
diff --git a/dev-python/eradicate/eradicate-2.1.0.ebuild b/dev-python/eradicate/eradicate-2.1.0.ebuild
new file mode 100644
index 000000000000..3d56e702338b
--- /dev/null
+++ b/dev-python/eradicate/eradicate-2.1.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Removes commented-out code from Python files"
+HOMEPAGE="https://github.com/myint/eradicate"
+# TODO: revert to PyPI tarball once it includes tests
+# https://github.com/myint/eradicate/pull/28
+SRC_URI="https://github.com/myint/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+distutils_enable_tests unittest
diff --git a/dev-python/et_xmlfile/Manifest b/dev-python/et_xmlfile/Manifest
index 7e39fae04e06..82ed23819a50 100644
--- a/dev-python/et_xmlfile/Manifest
+++ b/dev-python/et_xmlfile/Manifest
@@ -1,4 +1,3 @@
 DIST et_xmlfile-1.1.tar.gz 12566 BLAKE2B f8f1c95a523433698032c79442b8bdf725717b647d3f65017926be3c12b78890528d5cde99c13e219d99f20e45ee5db872a772f88e451974435d565bebb56923 SHA512 0978cfa08c56b6dd8b3bed020a9f48c286c5bbcef5ac46f0cbf37bea0c1fcc79c6688f9853da68cbd9df4c6268e780fd99a172907cf900bcb3faf2f6252157f8
-EBUILD et_xmlfile-1.1.0-r1.ebuild 760 BLAKE2B c891a1d0f9e65667a0adffa4d6a3de6f5bbea78f2bf0d22a038f36a9e1b015575d0ae9ef930a3129dda7ebd5f1407e5d802617da5ace5e02f5af4e92fb2f5605 SHA512 1730b043f7630bb8c5cf647a3b0bd3c078f5145a267d23a3b1a10f0395a8c93df08497d52318e70df81e04836357f894cbb9628de32f1a7d3debcba13ef8bf99
-EBUILD et_xmlfile-1.1.0.ebuild 722 BLAKE2B 52209e9e660c6a03cb8707ff32a9798e99e7672d6284e1ea44a28ba2619921d665daf7110ab15369201bcfeeaa6ddd415d53cc30f447894fb3267572b939d618 SHA512 803289e1a5982017a4974c5f89ab126b59b687db95de2b9eff332b8df5011f64e57b163f8632b6859e2e7a0b6d03a7b4cbc0e97392d75a67793448f01f1b7919
+EBUILD et_xmlfile-1.1.0-r1.ebuild 754 BLAKE2B 23633db01db812eba40b2bc65b51e574bbb2ba75992a0cef4756ac2227e047b24bde2c150239acec37fb02862604d09c756ff29e3f715a57b13962038e837af4 SHA512 2f5f755a386068dea80893ce0916e13e135564ef585232467c71205d53739fff88f8f1773b3360dba084eb4beb55e55454c4e1d39366bcc3d8cf6636c83ba6ac
 MISC metadata.xml 349 BLAKE2B 4f74359c66b9c0ae3dbce05a4b719a0f4498f66ae68d9fcfc9809253369d798006dff7d28f2cdf79335ece94314275eb1a16be9bc4419feea7d6d3123ff29dba SHA512 efdd054a65a9536d3da8b5cb4d065a1eb507e5ff5ce10242271cae34d6dc04fe12d17d07026f44c99504a18be9fdb42e064c07dfeafaf407713cf54cee445c61
diff --git a/dev-python/et_xmlfile/et_xmlfile-1.1.0-r1.ebuild b/dev-python/et_xmlfile/et_xmlfile-1.1.0-r1.ebuild
index dbfbac7ecd70..be0c19c8deb6 100644
--- a/dev-python/et_xmlfile/et_xmlfile-1.1.0-r1.ebuild
+++ b/dev-python/et_xmlfile/et_xmlfile-1.1.0-r1.ebuild
@@ -21,7 +21,7 @@ S=${WORKDIR}/${MY_P}
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="dev-python/lxml[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/et_xmlfile/et_xmlfile-1.1.0.ebuild b/dev-python/et_xmlfile/et_xmlfile-1.1.0.ebuild
deleted file mode 100644
index e7c45aa91601..000000000000
--- a/dev-python/et_xmlfile/et_xmlfile-1.1.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-MY_PV=${PV%.0}
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="An implementation of lxml.xmlfile for the standard library"
-HOMEPAGE="
-	https://pypi.org/project/et-xmlfile/
-	https://foss.heptapod.net/openpyxl/et_xmlfile/"
-SRC_URI="
-	https://foss.heptapod.net/openpyxl/et_xmlfile/-/archive/${MY_PV}/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="dev-python/lxml[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx doc
diff --git a/dev-python/etuples/Manifest b/dev-python/etuples/Manifest
index 6decefc8674d..b90dbba5d0a3 100644
--- a/dev-python/etuples/Manifest
+++ b/dev-python/etuples/Manifest
@@ -1,3 +1,5 @@
 DIST etuples-0.3.4.gh.tar.gz 44650 BLAKE2B 4d0e7235d010ff10e01d4143858bbc2ee1516f66db35fb9c6acf054df898a605a49dc82e4eeaddcb7ab6e5ea9bbd5dec493ac5d1741c4d595756e0f4af0ed1c1 SHA512 4e2c2884cd741a1e85358678347dc65c994583ff700c6a1adaa561bd4446035ccca2e27855fbb5842012f7e2bfa90ef7fa1634e9b3cc43cf9c7006acd7b66595
+DIST etuples-0.3.5.gh.tar.gz 44924 BLAKE2B 81b603c851b89b3ec3556246d7dfc12a533632f4e99f8b784c4b9f46c3ee51fe7d370556e376a957e52c980b6e16fc93d85c597d31cee371fa2e5cbeec962c9e SHA512 df51ff42609a341c42009b650dadac2a6fb8ea85c3ccc6145ee2bdf6270ed9509d73196f8b0b789091918e93492f766d5fc242e2d5acc30074c171a2334a42fa
 EBUILD etuples-0.3.4.ebuild 615 BLAKE2B 5bf11afd8fce5bbd81bb574fa643260111af1b43513fddf7a2bffa901cbee0d1cf6ca07bd23a82246a64501c567c02f86972651837c0b77fa37ef2669ae12017 SHA512 1fc9f3a3c62375e45570ff267a4fd2dd4ffc098844332256cb588c28033c31def81725af71a8dadf402df74fa5a49ffbad93675fc445522dc4ac2b40758cd5bc
+EBUILD etuples-0.3.5.ebuild 650 BLAKE2B 2264088a0ed8dec72bfd6b8635467940f72f9eae9f6b4250cb432ae7b0b3f75f1ee90414bc15a716c5561b352408a3c5699c19295ae07ad9eefd620a9b9ae6a6 SHA512 73564ed801b5f926dec6b85d5e19d88b33477a0cc4bd8d9a6d285b84a7c6c79637ca9ec508554adba2fe05da3e05b8f87092b3b9df83e97de6b6c348f5ba5842
 MISC metadata.xml 395 BLAKE2B 1f931fb8859a01cebd9dc3b94c11d2105552e7b371f8dddf1028d1cb45b7db6e2b138bb753b631399c885f463cc7d7ba76ad1d43f2d70babbc01c70913191c85 SHA512 a7dc4d5a713c5ecd58ee2fb371962fff65488966a968316e4415e19e2db08381c7d5aea0997e062667123eed86c8d6bbaddadea61872e6f07726fedee463802a
diff --git a/dev-python/etuples/etuples-0.3.5.ebuild b/dev-python/etuples/etuples-0.3.5.ebuild
new file mode 100644
index 000000000000..5d23977f1232
--- /dev/null
+++ b/dev-python/etuples/etuples-0.3.5.ebuild
@@ -0,0 +1,30 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python S-expression emulation using tuple-like objects"
+HOMEPAGE="
+	https://pypi.org/project/etuples/
+	https://github.com/pythological/etuples/
+"
+SRC_URI="
+	https://github.com/pythological/etuples/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	dev-python/cons[${PYTHON_USEDEP}]
+	dev-python/multipledispatch[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/falcon/Manifest b/dev-python/falcon/Manifest
index f42ef6072329..afa47dcb73f9 100644
--- a/dev-python/falcon/Manifest
+++ b/dev-python/falcon/Manifest
@@ -1,3 +1,5 @@
 DIST falcon-3.0.1.tar.gz 1300689 BLAKE2B 76dd59d0274cc2e78052b800e6e5b4c4244e1f5e47169a424882cda5bb59c38cd69c1c0942d506867728da9ddaf5d35b88195a1b003ca5f66549248293b7006d SHA512 c6a5763264b497979129df26d83a04323f53861b6d453a2b642d22208d0dad2ec1fcb88b13a53c2cb2b2988a1c0d19b94021099b458e23d640984b4d03880edc
+DIST falcon-3.1.0.tar.gz 1319252 BLAKE2B 183623c8d7e8b86ed9915cbf3757fd526f7f3a8a97ae5fdf86294bcc65052c5c827d4a920d93e9fa0198a8d255c7b56ecff465a36d9b0ea31581abd87d55ccd0 SHA512 9da76dd92dfce1611ef681588d8e0e2fc7e906b5c0bc4b60a4620e2e9907564783763b7776c9cc2ccb296116c985e527b2f429520a1c601567cf4eb15e98f8cc
 EBUILD falcon-3.0.1-r1.ebuild 1198 BLAKE2B 3da77afa28ba721301f042e26846bcb8f4aa563395bdb57dcc42cdc678f2bfa813a8ab6ab6f71935b7a07a888f745b09b8e89c3b81bd872a5424ad245c23e261 SHA512 c66a86d1ca817b1ed9552b9e95edd579488cd65932cab5a9921b11a3e9d0ee0af758f1723f95003c8836aec211971d264259b2e871b05a98b02f1a33cc7cac74
+EBUILD falcon-3.1.0.ebuild 1674 BLAKE2B 15b380000749507ef98545f1ef6657cf0cf1a721bb4b6331cae3f60bd026f61398e8294693739bbdc2fe304dbd86317b24de18a01981fd4ddb5d101060962633 SHA512 222c52865306c496c7b5726b44514953e2b2dd38463942f64d40aa6627bfed40140346ffe0696f917a7bfc9171c7053cb390013be67b6a086d0623f568b801f4
 MISC metadata.xml 365 BLAKE2B 8dc08ffa6bcc9e64e2732ecb700dbbf6002e3e3c225baf98d1ec42d14abac3fce82f3cf546f07ff1fe1b0f74689e2d225e6f58c35d254afcc6d5bae2de314313 SHA512 24be56363b9bdbcf093a20ac9f5ec982830ae36c7ceb1305de7ad94ecbb5bc2a0397b38f3feb9588422e961b570459e97c259daef6bdeb7de6123760a69b619d
diff --git a/dev-python/falcon/falcon-3.1.0.ebuild b/dev-python/falcon/falcon-3.1.0.ebuild
new file mode 100644
index 000000000000..121575f7c481
--- /dev/null
+++ b/dev-python/falcon/falcon-3.1.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="A supersonic micro-framework for building cloud APIs"
+HOMEPAGE="
+	https://falconframework.org/
+	https://pypi.org/project/falcon/
+	https://github.com/falconry/falcon/
+"
+SRC_URI="
+	https://github.com/falconry/${PN}/archive/${PV}.tar.gz
+		-> ${P}.tar.gz
+"
+
+LICENSE="Apache-2.0 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	test? (
+		dev-python/aiofiles[${PYTHON_USEDEP}]
+		dev-python/cbor2[${PYTHON_USEDEP}]
+		dev-python/httpx[${PYTHON_USEDEP}]
+		dev-python/msgpack[${PYTHON_USEDEP}]
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/uvicorn[${PYTHON_USEDEP}]
+		dev-python/websockets[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# uwsgi seems to be broken/incompatible
+		'tests/test_wsgi_servers.py::TestWSGIServer::test_get[uwsgi]'
+		'tests/test_wsgi_servers.py::TestWSGIServer::test_get_deprecated[uwsgi]'
+		'tests/test_wsgi_servers.py::TestWSGIServer::test_post_multipart_form[uwsgi]'
+		'tests/test_wsgi_servers.py::TestWSGIServer::test_static_file[uwsgi]'
+		'tests/test_wsgi_servers.py::TestWSGIServer::test_static_file_byte_range[uwsgi-'
+	)
+
+	local EPYTEST_IGNORE=(
+		# mujson is unpackaged, test-only dep
+		tests/test_media_handlers.py
+	)
+
+	rm -rf falcon || die
+	# needed because servers are spawned via /usr/bin/python*
+	local -x PYTHONPATH=${BUILD_DIR}/install$(python_get_sitedir):${PYTHONPATH}
+	epytest tests
+}
diff --git a/dev-python/fastimport/Manifest b/dev-python/fastimport/Manifest
index 829592430e06..fbbb1c844a2e 100644
--- a/dev-python/fastimport/Manifest
+++ b/dev-python/fastimport/Manifest
@@ -1,3 +1,3 @@
 DIST fastimport-0.9.11.tar.gz 41764 BLAKE2B afb82878ea1996894ff71fe99edc5ca26d45f98eedf7a8a6e85af45949e1e81c2112de9fc2c026438306a8a0e89c484063954ba7d2ff9a80c6b71ab40174f8d4 SHA512 e1b7e4897542ef6f33af51e1018340a6807688e44424e4e7e482b3347264d58d4290678cc2cfa230af500a53cabdcf35c9e7b03c8ff0f1ec3e6e0a9e869a1455
-EBUILD fastimport-0.9.11.ebuild 657 BLAKE2B 1fbcb25dfc77ac39861b3e9034d52159d26d6ad83df77430510fc71e382be54c36eba837899626bb5cd5e66a5442ec606efad7a452832791c692f0b346e7f5b9 SHA512 e53dc04601eadb4633069b3c73c224c6effe9d5cf36f9b02446affc862ab050978c8cdeced16f18854dea4f14767cab403a0d5228e26c4ff64f3e7a8bdd3e7c0
+EBUILD fastimport-0.9.11.ebuild 664 BLAKE2B ea96510fb3370df0e9767b51b4e53288fa38a674c59bcc40d6d864b600c9d41254a1e3bbd4e0ffd2bcc4ed1e3407a1e4a9c1241788fa1086142918e9c4014f1d SHA512 a55790e863752620562e8aba4c8cac5778c0c11f335153cf38c18e365e76193bd0199521fb7f41816cac9ad75fd5636d60ad390740d14ef426a4c0b7fc37407a
 MISC metadata.xml 510 BLAKE2B 4a5fb1bbc975e2ea96ba006cee969224dc838dc670338210a95630dd61b3e4fda8e9d0da833ff0afbd68900f50a3cec06bd768f41c013f843ebad1e38ec9c095 SHA512 a7319e71da1dd95051e339715b4359e0a99ae1de246ce64094222013eb27cc2e04aee484629aae172ddc26e594b8dda717f8726e5c4ebcb46e351064169151a4
diff --git a/dev-python/fastimport/fastimport-0.9.11.ebuild b/dev-python/fastimport/fastimport-0.9.11.ebuild
index fc9af555a2c7..59fa4261dccb 100644
--- a/dev-python/fastimport/fastimport-0.9.11.ebuild
+++ b/dev-python/fastimport/fastimport-0.9.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 python_test() {
 	"${EPYTHON}" -m unittest -v fastimport.tests.test_suite ||
diff --git a/dev-python/ffmpeg-python/Manifest b/dev-python/ffmpeg-python/Manifest
new file mode 100644
index 000000000000..24654312e5c6
--- /dev/null
+++ b/dev-python/ffmpeg-python/Manifest
@@ -0,0 +1,5 @@
+AUX ffmpeg-python-0.2.0-_run.py-collections.patch 507 BLAKE2B 6e503e627656775c4cc665ff68adf4afd8ed36131b2d55cdd00d420aefbb69d1585ddc8ec6513b64ddcea1a20d0d522d9d9d0d885c1d03e7d11de3741543782c SHA512 571087d23eec2880de37cec5799f967a2cb498b56e1109e086ead82cf65f8fac94cbc9c63953954f7ab3b59970285ecc18f5c446fc930a0c09ac8552251d47ec
+AUX ffmpeg-python-0.2.0-setup.py-pytest-runner.patch 366 BLAKE2B 874898215b2102406fa11ab4e2289671dc03a8b40a8831aa6958048b94c64a5cd1cd34d326539144ebe549046cb0df074e6ffb4b37a72aaa44d94c0bc161cfb6 SHA512 627bfc39b3f0feef02306d73d8dc113673483e0e1aa5182cada9d12195413d7638b94071a76b546092061d6916d45575a42aa5d949c8bd9df737c34b1b62ea71
+DIST ffmpeg-python-0.2.0.tar.gz 3267771 BLAKE2B 8bca4a24434b6c7a542e3c178cb7bf1e5650f9763636d5378f9652cdd07ef19b0e96007d6bb71fdf1664efb6e33d597844c7d6a44dc8dcb1c083e21f53649469 SHA512 933ed958d61536bbbc0e0b08e19521c4b1f7df1cfe97de0b3d149a2748c5bd74915a3134861e8ecb1f92d5860315228b76aefcd087fcf07e188a56c651f5e301
+EBUILD ffmpeg-python-0.2.0.ebuild 918 BLAKE2B 839fe64da380e4fa8c5d4fd1e9c940920858c3935d7a7a70bf35ff879cd094e363de4198e8ac60991b348924d2091fce43c025a2224835d9d924b23cb97241e3 SHA512 df450ca269d477a22b4a0bbdab9a126ddbddfb9a4544f5940244ee5de96892f1e5686ae35b7101c3fac658349be0eff8ad2e0bfebbf1a9d15743c40debb17f80
+MISC metadata.xml 417 BLAKE2B 86f8cba73359487932c4515f4369fc89f0c162693977c8b7ab49c7f3eb1fb3bfb713cb4e2c25b41674891610ed0de6dba6616289b951cb39abe5645a475f4b39 SHA512 27e9d1f757e395fe23660531924c5ea4faa41c782b4ab240ba616aea2bf439cf93b2d21166ff693a9c0055637160bd94c31b8e58dd84c662b2d1a3bee2503663
diff --git a/dev-python/ffmpeg-python/ffmpeg-python-0.2.0.ebuild b/dev-python/ffmpeg-python/ffmpeg-python-0.2.0.ebuild
new file mode 100644
index 000000000000..4ee086b79602
--- /dev/null
+++ b/dev-python/ffmpeg-python/ffmpeg-python-0.2.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for FFmpeg with complex filtering support"
+HOMEPAGE="https://github.com/kkroening/ffmpeg-python"
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/kkroening/${PN}.git"
+else
+	SRC_URI="https://github.com/kkroening/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+RDEPEND="
+	dev-python/future[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	media-video/ffmpeg
+"
+BDEPEND="test? ( dev-python/pytest-mock[${PYTHON_USEDEP}] )"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-_run.py-collections.patch
+	"${FILESDIR}"/${P}-setup.py-pytest-runner.patch
+)
+
+distutils_enable_tests pytest
+distutils_enable_sphinx doc/src
diff --git a/dev-python/ffmpeg-python/files/ffmpeg-python-0.2.0-_run.py-collections.patch b/dev-python/ffmpeg-python/files/ffmpeg-python-0.2.0-_run.py-collections.patch
new file mode 100644
index 000000000000..6231ba17b86e
--- /dev/null
+++ b/dev-python/ffmpeg-python/files/ffmpeg-python-0.2.0-_run.py-collections.patch
@@ -0,0 +1,12 @@
+index afc504d..bf43c06 100644
+--- a/ffmpeg/_run.py
++++ b/ffmpeg/_run.py
+@@ -137,7 +137,7 @@ def _get_output_args(node, stream_name_map):
+     if 'video_size' in kwargs:
+         video_size = kwargs.pop('video_size')
+         if not isinstance(video_size, basestring) and isinstance(
+-            video_size, collections.Iterable
++            video_size, collections.abc.Iterable
+         ):
+             video_size = '{}x{}'.format(video_size[0], video_size[1])
+         args += ['-video_size', video_size]
diff --git a/dev-python/ffmpeg-python/files/ffmpeg-python-0.2.0-setup.py-pytest-runner.patch b/dev-python/ffmpeg-python/files/ffmpeg-python-0.2.0-setup.py-pytest-runner.patch
new file mode 100644
index 000000000000..67fbb2308a37
--- /dev/null
+++ b/dev-python/ffmpeg-python/files/ffmpeg-python-0.2.0-setup.py-pytest-runner.patch
@@ -0,0 +1,11 @@
+index 0282c67..2011d2c 100644
+--- a/setup.py
++++ b/setup.py
+@@ -60,7 +60,6 @@ keywords = misc_keywords + file_formats
+ setup(
+     name='ffmpeg-python',
+     packages=['ffmpeg'],
+-    setup_requires=['pytest-runner'],
+     tests_require=['pytest', 'pytest-mock'],
+     version=version,
+     description='Python bindings for FFmpeg - with complex filtering support',
diff --git a/dev-python/ffmpeg-python/metadata.xml b/dev-python/ffmpeg-python/metadata.xml
new file mode 100644
index 000000000000..b908e7d7cbe1
--- /dev/null
+++ b/dev-python/ffmpeg-python/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+  <maintainer type="person">
+    <email>xgqt@gentoo.org</email>
+    <name>Maciej Barć</name>
+  </maintainer>
+  <upstream>
+    <bugs-to>https://github.com/kkroening/ffmpeg-python/issues/</bugs-to>
+    <remote-id type="github">kkroening/ffmpeg-python</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/flask-babel/Manifest b/dev-python/flask-babel/Manifest
index bb5ce69dc97f..23d752a4c680 100644
--- a/dev-python/flask-babel/Manifest
+++ b/dev-python/flask-babel/Manifest
@@ -1,3 +1,3 @@
 DIST Flask-Babel-2.0.0.tar.gz 19588 BLAKE2B dbd5d6f3af38fad15a4eb6d674222473d673a9002ced21ce09a913e0bce3285b1eac9a5a85ce53c1dcebf648444164f33a5c790039a7d01184d45c7734dac05f SHA512 2ad8f80b450db0cab7dd57f46158e7e653556d60869acdb3c2469d42dceca3fa97237cc960986655091c84a1a67a057d72ed510787ccb065d171e6f35764cb1d
-EBUILD flask-babel-2.0.0.ebuild 923 BLAKE2B 101ffc68d1900e8365d633f5bc0617727a084af2feb5a0a642575b4ab0aed1f76cf28c504d93f1f97f8983aa053754c9c7433ba507d3df62c817cba60251e9f5 SHA512 a3f2ade7c07c8e40ef0c0f45735b68a115ad69ab1ee404e28dbc5c1af33060335bbb416060554ab7f64ba62a93574cce50fa49a860ffa1293c47d37db7d2c48c
+EBUILD flask-babel-2.0.0.ebuild 930 BLAKE2B f3ec6dba909c55448475ec94ac7ef18468371003dd70bec4477ff1fe6580d226ae5d34af751429c071841d42a83ed69b8529cd5c14e98b7d8b462866870433e5 SHA512 fe93943c9b6aa48117b48ed0fb503733cec17c8773b5c367380dd9ac81fab2540d4214d079b801f8024d0d6bce29860dde912c4d32be2c3ba43c4e4b3b38e784
 MISC metadata.xml 475 BLAKE2B 877bb5c46f8e3661564f34e49139abbfe5e9f871249917c87af4eea2f6c4b7cb9ecc4e2c0122e944775656e9dd218ad4db8f23f62b4059208aacfad660d6abde SHA512 3b7e470ce1495f5099d861aa7ac95a7460d3811f9d1337d4c5f877bc5997100f26b5ee379dcc9989f1edfea90359526d283f5df29e8feebfa10ef427ac83bc4f
diff --git a/dev-python/flask-babel/flask-babel-2.0.0.ebuild b/dev-python/flask-babel/flask-babel-2.0.0.ebuild
index 08ffec5020f0..fdc3d3f53662 100644
--- a/dev-python/flask-babel/flask-babel-2.0.0.ebuild
+++ b/dev-python/flask-babel/flask-babel-2.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,7 +19,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 
 RDEPEND="
 	dev-python/Babel[${PYTHON_USEDEP}]
diff --git a/dev-python/flask-babelex/Manifest b/dev-python/flask-babelex/Manifest
index 9d3e86fe78ac..d0315b5086da 100644
--- a/dev-python/flask-babelex/Manifest
+++ b/dev-python/flask-babelex/Manifest
@@ -1,4 +1,4 @@
 AUX flask-babelex-0.9.3-tests-fix.patch 1508 BLAKE2B 828c0932722c4a052e8360338a21f31e45e26d6aeb2e7ef18678dd159ac9b4ec4f2566e46bc088dcf556dfeefb25567227d28a885a00617c1551bef40328d728 SHA512 60761e4117919619562701c24ea2e7f7f55554da251b8144526063cdde35413ced741bcfb35c8666104b7f0850e665450a27e8f134d768b0c5d49d1ee6775ace
 DIST Flask-BabelEx-0.9.4.tar.gz 43423 BLAKE2B 9aa6223cd29cd1ce3de0d8c8b771980457fa0ee76b7fd361b9b6d8ae79f521b36096b4d912281b7fe671655ac8c7b04032c68fcc59463c5630af073f264f5815 SHA512 0deec4b481876f4c76cde398157cd2bdc564e9d1076a7accf1720be86b41912466435412ad5f7e5e8b06f17ad5363ea503191b159b30625d067e76a45eaba957
-EBUILD flask-babelex-0.9.4.ebuild 865 BLAKE2B 3150ee62dfe1d1ec748e18b891916b257aedac83de757f484520e41d875605c6c7d027e699dd3b2246c4404f4f8850c8fc7432b241a980c4a85896578c24a109 SHA512 b280645fa88f85838b1c6c6e4f4d296a74e506bc00872b253165503aadc9b749fa8f499338b42d3d22f776578594e40e18a633cc67658ecdd0a19a7e7e7d42c7
+EBUILD flask-babelex-0.9.4.ebuild 872 BLAKE2B 325c0721619624dd02eafe7a9c1acaa528f9fbb4e6c8d38a2e45ccdbccb5f12ef1b046a070de66d140c203204512bb84486f3e004941bcaaf8703251763e787d SHA512 d7641f0d061f587852e69941bb553b2de2099b028e06e8ee67b6a3c2431302c538c09e30d7b0111a98fcfe881d25cc567ec35e1738b51d18162bc516efcd3a83
 MISC metadata.xml 414 BLAKE2B 549d851f0776852b25bc89147081615a3790a8a0ad03e3fd1705c20ef2ad6ddbee54166c4762a5813beeda8e4a81bc15418d81c9785a77e43b28d9d401968780 SHA512 a33f1d03323cdbdcc19c8cdc2de6b7ddc9169d082a5295b151ccde0c3bea012b669d2888544d36e4740afd8c37bedfd3606b0e65c2123d1201c8a72ef74dbc09
diff --git a/dev-python/flask-babelex/flask-babelex-0.9.4.ebuild b/dev-python/flask-babelex/flask-babelex-0.9.4.ebuild
index 8c709a50a162..2b2f5f347a35 100644
--- a/dev-python/flask-babelex/flask-babelex-0.9.4.ebuild
+++ b/dev-python/flask-babelex/flask-babelex-0.9.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~riscv x86"
 
 RDEPEND="dev-python/flask[${PYTHON_USEDEP}]
 	>=dev-python/Babel-1[${PYTHON_USEDEP}]
diff --git a/dev-python/flask-login/Manifest b/dev-python/flask-login/Manifest
index 4a59264ed00c..68d9e2618f9e 100644
--- a/dev-python/flask-login/Manifest
+++ b/dev-python/flask-login/Manifest
@@ -1,4 +1,6 @@
 AUX flask-login-0.5.0-fix-tests-py3.10.patch 769 BLAKE2B 82cfe4209de45f6c282b3e289daca11f31ecd96764eba7185909f8d7896e9e39e4401ab7e250155d07575a779bf98f836a7ffcb7d47ae1a1cb6f35f342fd86d4 SHA512 04f0cdf5b6beac3ecbc27513fd994362416c6990f9040710f979b997cace59d7560e4a0471b44e04f9de69fa93ac8698a0c73765f7548f1adc9ddaf5de834e4d
 DIST flask-login-0.5.0.tar.gz 44961 BLAKE2B a780a3ca1ced7f01cbc1f99e3d92f57819c73982a4098330be7b9b4dce88e5fac577d15b2989b99971c4b2f7e6c9f02a54aeab9f7fa1c101f409cbdcfa3c6942 SHA512 8ffecd2a512738f81ec3901ad30d356b1d63355268f7cf1b427e463d0a271a4623723255e139bbd0f88845d73fa4aab051418b5f68aef0b4576c30294f6207b3
+DIST flask-login-0.6.0.gh.tar.gz 47368 BLAKE2B 799591ec0bd538e6cc467a80b3a8891a97ee60bbfcf01eb6ba7be1ab48e7ea9be22e8777801621b39bf089c00d7914f7b045e4e6617e45d623354276ba7e245b SHA512 0766ef5702105bc2cea7082b2b2a9bebed282a9166757adbc91a02c4adcc291d41a3217e8b9566b6bb4778db4a1d2453edb0b7a727c9bff2673833d27b69148e
 EBUILD flask-login-0.5.0.ebuild 961 BLAKE2B c16aaa50f2efa07e036ac6ddf2048f91e613faf2beee1dc48a01b1581be1b9c622cd05c0a598dd3fef2ceb8a7b664679f59f81c1dadc96199e2685f815c439b5 SHA512 623d85c78f6742f4e1945ef52ff19c921ff05b883de01583ccf8e9465d40d6fe8d69854aae248d735d3ed952670d2a6367a1e1d6dab6f613cf31a3972060d731
+EBUILD flask-login-0.6.0.ebuild 829 BLAKE2B 459319f7661afed2cee11499f67be8b8e07128d8177debb784af692829ca0ed32b1a390fc83efddb4fca1a389a2aac1f7db07cdc731d17067dba912463813416 SHA512 3e301da2269eb213455dc1cfb4476ae4bcc3fc9ee8e347d5e2490ebcff5230744933b3ea98e8fd1627f446326ece1e828ca29dc568f88dac50490f5b846dfa2e
 MISC metadata.xml 404 BLAKE2B 8f8070dd3be696102c88bf75e22511b75432dfd17d21f6f3ce084cbae8092bc91ce1cbb7e47d691c7ac502afd58882ccd0bd1ea732df9239a4ec1b70e8728f19 SHA512 0b32444d9f1508697be1a19a6eb57efa5cbff443baf35958c24161d0b716a55d96b0caf66936925970904642fde975d94f4360b8b96d018ebe0fad24216769a4
diff --git a/dev-python/flask-login/flask-login-0.6.0.ebuild b/dev-python/flask-login/flask-login-0.6.0.ebuild
new file mode 100644
index 000000000000..4bc29b40ada8
--- /dev/null
+++ b/dev-python/flask-login/flask-login-0.6.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Login session support for Flask"
+HOMEPAGE="https://pypi.org/project/Flask-Login/"
+SRC_URI="
+	https://github.com/maxcountryman/${PN}/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/flask-1.0.4[${PYTHON_USEDEP}]
+	>=dev-python/werkzeug-1.0.1[${PYTHON_USEDEP}]
+"
+DEPEND="
+	test? (
+		dev-python/asgiref[${PYTHON_USEDEP}]
+		dev-python/blinker[${PYTHON_USEDEP}]
+		dev-python/semantic_version[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_sphinx docs
+distutils_enable_tests pytest
+
+python_test() {
+	epytest -p no:httpbin
+}
diff --git a/dev-python/flask-mail/Manifest b/dev-python/flask-mail/Manifest
index b5ad1885450c..afdefc4b9135 100644
--- a/dev-python/flask-mail/Manifest
+++ b/dev-python/flask-mail/Manifest
@@ -1,3 +1,3 @@
 DIST Flask-Mail-0.9.1.tar.gz 45654 BLAKE2B 4b7e352698bd9434c507d3a27b8e5b4976cc82484e86e64245423392b25000d904d19bafa07ea97a32c2a80ed6bbbbc59aed7386a8d5a2ad6b9b61b23fe4c5f8 SHA512 1d19f0bade77c66e73624d8af0919165f8b6f208a00c1e4025049b50ad56912557b8446cb80f8567adf697e92b126954a5f130bd9fa7a2345d4e98e35b29ac47
-EBUILD flask-mail-0.9.1-r1.ebuild 714 BLAKE2B 0d9366ae735d442b8c4fc804edc93785bdd11b912f69bf9a02f91df6a8e8265a2141891ba1f41ca69d3b9e895d23cc78dad91d88d43c4e32313327927ebf4942 SHA512 218c5ab163b4f82103567343127efe3eedde7e246d95a64a8a17aec28204b28b5ba163f566475d472625427086163755d14804314fd7e872d2123c6d4d5fdbed
+EBUILD flask-mail-0.9.1-r1.ebuild 721 BLAKE2B 931d365e72c51335a3a04bc300da01e5f5e8a2dbd8d640ded0f48f5e3ac958125d113d899c228a277bd46b894a1927f3b3b33a073551e4e364c6c08eebed13bf SHA512 16b1356e8fd667dc2fbb40f535c00647c3429005e09ec758f55d8e1e3eb476fc0c61d429392f63e6c109ccd86a0d70a2653ebf9131d96abb5554274af3ff2fab
 MISC metadata.xml 400 BLAKE2B 3cf4871f8b6f956a5425ba37765b02edabae32d22b763f30335a835cdaca8f96ae394430e451236bc693ef42d2111c91794dde65dd74f5a6b5203e13c62cc97f SHA512 daebad69da41cab04a8ee4ca28cc22d801b6411e692d9db437d7ccd0b83a43fa1fe95c0aeae0c48439563bcc3dd841446b722072598d66c17694a2b4c61bd9b6
diff --git a/dev-python/flask-mail/flask-mail-0.9.1-r1.ebuild b/dev-python/flask-mail/flask-mail-0.9.1-r1.ebuild
index ff1ef2743777..21b8d51f0240 100644
--- a/dev-python/flask-mail/flask-mail-0.9.1-r1.ebuild
+++ b/dev-python/flask-mail/flask-mail-0.9.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~riscv x86"
 
 RDEPEND="dev-python/flask[${PYTHON_USEDEP}]
 	dev-python/blinker[${PYTHON_USEDEP}]"
diff --git a/dev-python/flask-paranoid/Manifest b/dev-python/flask-paranoid/Manifest
index c3bbcb7aab7b..4628efb66e2a 100644
--- a/dev-python/flask-paranoid/Manifest
+++ b/dev-python/flask-paranoid/Manifest
@@ -1,3 +1,5 @@
 DIST flask-paranoid-0.2.0.tar.gz 101084 BLAKE2B 5f1f92679da5f374699c8acc97300085840d47e57f48d935cba60e78782109f70651bb7f804410dbb241b48c96ec08498b8b2cc8c18573f14d0bc7972b746d19 SHA512 0d642999fa4d5b795c3dcecc586fc1600cdfceec4adb38bb87ca8be9825d9ddafabb07d98df573a89e61a44a0abd27cbbd21524237b0e23b337a7d5e32ddfdae
+DIST flask-paranoid-0.3.0.gh.tar.gz 102495 BLAKE2B a892c62b3d821d9b8c31567e1d4fdf3f01d990c28f0ab9d8e5a16cc3a6cd78ba06301cbea61048f89db46020051a0426f5abba7fbe43ca09bca5a2c69e904a54 SHA512 68e49a79e7e00c3a89bcc0347c41b80634b3f5f64227f4ae44db95a286a57b6101dff8f7aba592b8d325b38effc58744ee15d56bd8be30507b76c5dc836fc112
 EBUILD flask-paranoid-0.2.0-r1.ebuild 630 BLAKE2B e48eb3be387a9bf5f845b438d8e21b2d47ea7b40020e2aa80dea6ee7c5577065ddc33c4b1972c1a648aee276fb83bdd47ae98a4858c1a3394d7d39786886e44d SHA512 fcff2f950e80623209b04381bc791bbc9b9523f83fbcb1d7a8fba3ecb2a7ccef7db28fcb662d3b693fb6597e55b1f356bd652cf78070d04e8de3ad252231b9eb
+EBUILD flask-paranoid-0.3.0.ebuild 558 BLAKE2B b3be11135a40f1915ba775bec0a7eace163e1a88304ba1a3c20ed9904551f5d3372d2e6ecd6b6320275cca587fd3a286e44f6fcfade2f1caa0370e6c670bc117 SHA512 6fe265e0727df189755a634e55ae3985e8c16a5db68a08d5a17e72c176e8f95c2f0c7a0369721e1ef29ad0295f51e525274e6d677f6e7134204c9d79cb627229
 MISC metadata.xml 525 BLAKE2B acb88fe8cd9037908e8576b90bc3e2c368edc64e3233b8455f71dad565835ca599c8275b4112da1f5f8f034425741e0748ae425b3a32edca255bcca6201a57fd SHA512 b6aced08599515c7715faf1504857b7915a5405842100f7d2255171c5404cecb18db5beda3e1b542695ffdd498a690ae40ec6b4d5108c38e3b359d994f1e6e02
diff --git a/dev-python/flask-paranoid/flask-paranoid-0.3.0.ebuild b/dev-python/flask-paranoid/flask-paranoid-0.3.0.ebuild
new file mode 100644
index 000000000000..24102c35c237
--- /dev/null
+++ b/dev-python/flask-paranoid/flask-paranoid-0.3.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Simple user session protection extension for Flask"
+HOMEPAGE="https://github.com/miguelgrinberg/flask-paranoid/"
+SRC_URI="
+	https://github.com/miguelgrinberg/flask-paranoid/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/flask[${PYTHON_USEDEP}]"
+
+distutils_enable_tests unittest
diff --git a/dev-python/flask-principal/Manifest b/dev-python/flask-principal/Manifest
index 52addc692de1..9af7aa790a60 100644
--- a/dev-python/flask-principal/Manifest
+++ b/dev-python/flask-principal/Manifest
@@ -1,3 +1,3 @@
 DIST flask-principal-0.4.0.tar.gz 17287 BLAKE2B f5c44e21b4e8242122fc10c7c17bd0e6a4759eda555d4355bc340228eff18f1fc3f519f2ef822448b651c0aa3a00a16c562001d17d8915ce417eb56cd39d2adc SHA512 ed8cb28c4e8d936de96db0bf9f7cb45b253dc204c4b8f8dd8022ef1552592ff6324b4a33d3ee862794a6e20eb8c32a0365e7b9397d427da5022c5ded3dfa308a
-EBUILD flask-principal-0.4.0-r2.ebuild 605 BLAKE2B e4a9618c94146ccfd5763d472e5f5efa8817f6558bc858639e6603e69e7df56a4a578b592e063546d0a350809aa0353bf9f87172717a171847ab3d475f2f20db SHA512 c991a695827ca33069f14edd94718f4d81bc278357c29319c113d3953e2825553168b6238ecfca8c369e3eee6ffb65a1e8439b981d4b3ee76577cfff5e256822
+EBUILD flask-principal-0.4.0-r2.ebuild 612 BLAKE2B 36e8efbc16c0dc94aeadcd29a915fce114296eea8f9a8fab0d6d20592bacf2c71df907ae3f30e74a8dc5a75517cc9ca115fb946e72d76184306102dd2be0466a SHA512 fd3906b34d2fe6d2c4d5dfeb93ff529d3ba7e39af2b4a0481906f2b09127e7f5bbe1561170858dff485783e74373bee2c0edf820753c2a706b1d4fda6347c03e
 MISC metadata.xml 410 BLAKE2B 809c7f39bf13d57521f9fe79ff298be6384513da601b43996585a29c0daba49e813812f827ecc59a5193b53536bd247db88305d6233c782316ce21c5f85882ff SHA512 fc970bc0b9cc4f267b3c49153bcf253ffdb2e9197f6fa537eb5efd7215b269727624e64f5e5aa4f1fce1a03c142cd85142da33229d0a2065f680dd8ed63443d6
diff --git a/dev-python/flask-principal/flask-principal-0.4.0-r2.ebuild b/dev-python/flask-principal/flask-principal-0.4.0-r2.ebuild
index 1951c5c1685e..a06a64000a94 100644
--- a/dev-python/flask-principal/flask-principal-0.4.0-r2.ebuild
+++ b/dev-python/flask-principal/flask-principal-0.4.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 
 RDEPEND="
 	dev-python/flask[${PYTHON_USEDEP}]
diff --git a/dev-python/flask-security/Manifest b/dev-python/flask-security/Manifest
index 1305a30fea91..b6b05c09084f 100644
--- a/dev-python/flask-security/Manifest
+++ b/dev-python/flask-security/Manifest
@@ -4,5 +4,5 @@ DIST flask-security-4.1.2.gh.tar.gz 408120 BLAKE2B a4ec9b0a58368b9c84ee2d5b8b740
 DIST flask-security-4.1.3.gh.tar.gz 408609 BLAKE2B ef4b270d62de75fdcf51d1247960df85deca1699fdbfb73592a5711f9bb56f71a2f2de12a8d8c0eccdaccfef11a578cf9bd9abbf52bdacfe4bfc10f9adda0acc SHA512 92a0e7fce95eb4eb04baa9a11ee88ab3b8e88952aa6300bf8245cecfcc90657c83bbe93e1c3b19d62642a346b30f5912dd424e59a81023637f3183a61e8cf91c
 EBUILD flask-security-3.4.5.ebuild 2043 BLAKE2B 46b5e6f41ab2c371fb7db7a84d63f2bfd6a3f1052b076865ab40f64211b1715c54f0d084b0483a9fa6bc0c38919b9133eb8b5a5a7ee0959c2e7a4d896fadeb18 SHA512 6468ff9f277c24fcd9fd4dc76d8c70850e1c50b20e233b6509ee86060f39b08fe4cbc139f027770870f93fba42845eb71756f5564dc5c9e17003df88732e59ac
 EBUILD flask-security-4.1.2.ebuild 1908 BLAKE2B c9ce504b2e42accb7156bc2eb8105606ae9025a5e81af6ca43beb4beee1a94a20954ea46719af07a011b85d093e685e1814d524ceca56968feb72fa57a7a29b4 SHA512 05939bdc2ca94ddfd085ce4e68910d8ab391b80f4975d76d2efe1b6c9826f4bc16aa0e27c5ae0b6b947057d05e150fd40e776365a5641ff2de1d8ff030dc84b0
-EBUILD flask-security-4.1.3.ebuild 1989 BLAKE2B 3ac844bccff260ec113148b7bf4acde8f829d55bc821f11c1d101a1ff684d39270f4278380a6c3e04ae6e52cab8bd49a8448a3e1e67b932865ce9ea0d6398358 SHA512 2c61a264dde08d5e686317c3649d7aa9ab31d64c5fe63f94de2fc0ee1caef8debbbf0a612aad91e81dcd6bf269dc02a4ae3d89b31dc49fb25bbd201f96335d97
+EBUILD flask-security-4.1.3.ebuild 1996 BLAKE2B 258192f7d8b955f998000677d05628a71bdbbf75a087a3de8b0d54935f1519ad44d7a4aee4d62512d5f03c6d20a7469a13464a7816b65371678431a0cdc3127b SHA512 27e585b528101ad25f65fc892625b54f18211118d0f1d6d70f888a53ef663be580b03f5bd20d0f5aa6c6e5acc870d89d3492a1d7395584e5b53ee24a1e5eebad
 MISC metadata.xml 417 BLAKE2B d2c9497a88d513e360256445b7d144ab969c40cb11726477e2d9a3b850a7bcda909ba0a5d844a6079ddd597056b4628a6eb309bca8756e15864d151a54f1d1c0 SHA512 3aecbb252d4b6e3675ee221eb485fd80dbe52eabda6c4a6831dfb95110feab3284a6b6f4ea0d42aa6d6d7ced8ff0895ab40529ccabcdb5144481243b2bdf1653
diff --git a/dev-python/flask-security/flask-security-4.1.3.ebuild b/dev-python/flask-security/flask-security-4.1.3.ebuild
index d179a41755a8..7461c5995d62 100644
--- a/dev-python/flask-security/flask-security-4.1.3.ebuild
+++ b/dev-python/flask-security/flask-security-4.1.3.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~riscv ~x86"
 
 RDEPEND="
 	>=dev-python/bleach-3.3.1[${PYTHON_USEDEP}]
diff --git a/dev-python/flask-sphinx-themes/Manifest b/dev-python/flask-sphinx-themes/Manifest
index 8a9734f26964..185658f75129 100644
--- a/dev-python/flask-sphinx-themes/Manifest
+++ b/dev-python/flask-sphinx-themes/Manifest
@@ -1,3 +1,3 @@
 DIST Flask-Sphinx-Themes-1.0.2.tar.gz 9066 BLAKE2B f4c67bf6c8e064a9d278779613182fa2139c83255b6e5c28adfd7d5e8df90c2203a6758dc22702b2d708d9876de029ff4e4d05daeb462dc8127bbb28a1392ac0 SHA512 55893b19f1c3da026e1e6d98143ccb4d2939da0d76e6530dd00f72ace6095d0fd038213a4ad02151a82670543634c6efe61a546df3ef90d71b1864914d36e2ac
-EBUILD flask-sphinx-themes-1.0.2.ebuild 542 BLAKE2B b82ad368f85b1feadd9cc12f4a000a4396cbd25960e5223f4584b090f5be55819f5978608990c146267f98d47acd3e05a91fe4e492b0f606e393fc70c914bf8d SHA512 99dd46edf93c550afb86040ce255ad70336ddc73c612ba95ac94240a6260506ef528ede096dc0d1ca13226fa809c6d1646b29417966fe30430f961bb4c279d1f
+EBUILD flask-sphinx-themes-1.0.2.ebuild 549 BLAKE2B 32b2f7220cb8e762bbbb49feca26e25c2ae6da1e7c7c848a5c352cccf968162fcba4fa2a6b510fde66904f37c40a408410fdde4da62263d19ec0a8c070b3316a SHA512 a813813c81077a15ce88ffa2ab1f7b522433093286545cb00400ffb6048b0a2b5175890867aac88eb0e51b29031d15685bbad86c69f3bd0e986b024a05b6ab4d
 MISC metadata.xml 504 BLAKE2B 4fe3d61ba640b18462737907d7048d3f81a4378b946f9552e5e145ea77f94618b5d4b6e2582f7b8933ff4bd2093f12137bcc8f37db284e93fe1a50db7f0c312c SHA512 576cbb6cef7b45e3dac5f23f0684ff2dccde20237cd8c2449fa9f67b7265561507a8c5067022eb93e16b222941d6af70593d01d337fcf1a3df2c8992b3a4dc66
diff --git a/dev-python/flask-sphinx-themes/flask-sphinx-themes-1.0.2.ebuild b/dev-python/flask-sphinx-themes/flask-sphinx-themes-1.0.2.ebuild
index 630add4ca05b..2fcb2605b2ee 100644
--- a/dev-python/flask-sphinx-themes/flask-sphinx-themes-1.0.2.ebuild
+++ b/dev-python/flask-sphinx-themes/flask-sphinx-themes-1.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,4 +16,4 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
diff --git a/dev-python/flask-wtf/Manifest b/dev-python/flask-wtf/Manifest
index a58ae635b681..9cf2f1c64aa5 100644
--- a/dev-python/flask-wtf/Manifest
+++ b/dev-python/flask-wtf/Manifest
@@ -1,3 +1,5 @@
 DIST Flask-WTF-1.0.0.tar.gz 45365 BLAKE2B 13568ed3cbf7666c2c04663ec66c788d3cd4aa4fc7abc32938dfa703e7f120784c9491dc0ffe77fc42485c943b25f166b6540fa0f3de1d77df8a015300e1e468 SHA512 4b47e3586e3fb34f2ef964fb2a84d25c8279d4ce98e2064655e5ecb5f8fd67e4637ffd81b171e4623e2cd943e5abbcb6f5980ea8a354c2745d65c64161c0fd60
-EBUILD flask-wtf-1.0.0.ebuild 1063 BLAKE2B e6faea76f19f86bced46b7369c7af940760c08fc92ddc36d492ec3223bf224df9b2da0c0319fc75ceee09e90bc450eac2389c93208332d92dcb006e11152ad60 SHA512 6fd36c22ff5f2b960683085750be69fb63b030e1b74ac17cdb768257740470f193784cb573b7732b08f00656a751586f7b19d4f39e6d9e0aa5b50e3451a0cef2
+DIST Flask-WTF-1.0.1.tar.gz 45721 BLAKE2B 9b38aaa9e83c8d08abed46343ee8a4e16a87aa0389307ce17bd44fed0996405f9de233572f3d7e6f91edb87c2233574183944bdb3458a6ee9f6da154a5e30bae SHA512 e1380e788d0b09ac84e158a6574883a2c061452595973bea8137f9c2789b8ed14bfc6816a571b9116643c36ed31e97ae9ad7fb0fa6c1638e5be142a6fc8d85f4
+EBUILD flask-wtf-1.0.0.ebuild 1070 BLAKE2B ddbb5b86756129a9ea85766deaaef59199ff837fb9a16023035fdbbafb060f95958454997676beab4d85eebdf2b87750fd17288d94432edcc555ba8db4d2b1aa SHA512 e746ac286439ca41dcbf3ead71df6e341a0101a9f3a694de7efad1c846bd53d5c1e4b3beb43dc211cc39ccb33ac5097e7fe63f52b8edc86b437eb06dd614becc
+EBUILD flask-wtf-1.0.1.ebuild 1113 BLAKE2B 3a8b6ac74e04f3eeca1fb1859a1d487834ee63f1610fb504e8e09e7ed3839aa8571b52674d7e75c9286aa72aa31bb523f20c8b1080350225d9eb70f46d6412fd SHA512 15518df54c540918e5a6a2eee5cabd84cae77ff49cfd9e08efde5095a50a1c5056b9e6c40ef5176ea69a7c3913f117620c79e31384c181b4adf974e0ff7ce911
 MISC metadata.xml 504 BLAKE2B af79c3ff24343422e32ceb0181d5c327d930d6361abece4a27da6957f1e5932324950041d4c777e965638083cd779de6a6ffb9f10261771f16d2c0fded03b9c9 SHA512 03239994900f5705dd032b78954301caf6af4efb3f8018d7d40db7fd3ee8715916a7dd2fc6ceca9a450f177a3dcd7549289e92a6bd222fb3bf32649541dd261e
diff --git a/dev-python/flask-wtf/flask-wtf-1.0.0.ebuild b/dev-python/flask-wtf/flask-wtf-1.0.0.ebuild
index 7d81736c5d46..251c81fc05b0 100644
--- a/dev-python/flask-wtf/flask-wtf-1.0.0.ebuild
+++ b/dev-python/flask-wtf/flask-wtf-1.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/Babel-1[${PYTHON_USEDEP}]
diff --git a/dev-python/flask-wtf/flask-wtf-1.0.1.ebuild b/dev-python/flask-wtf/flask-wtf-1.0.1.ebuild
new file mode 100644
index 000000000000..835f6535839a
--- /dev/null
+++ b/dev-python/flask-wtf/flask-wtf-1.0.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+MY_PN="Flask-WTF"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Simple integration of Flask and WTForms"
+HOMEPAGE="https://pythonhosted.org/Flask-WTF/ https://pypi.org/project/Flask-WTF/"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/Babel-1[${PYTHON_USEDEP}]
+	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/flask-babel[${PYTHON_USEDEP}]
+	dev-python/itsdangerous[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/werkzeug[${PYTHON_USEDEP}]
+	>=dev-python/wtforms-1.0.5[${PYTHON_USEDEP}]
+"
+
+distutils_enable_sphinx docs \
+	dev-python/pallets-sphinx-themes \
+	dev-python/sphinxcontrib-log_cabinet \
+	dev-python/sphinx-issues
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# tries to access things over the network
+	tests/test_recaptcha.py
+	# unpackaged Flask-Uploads
+	tests/test_file.py
+)
diff --git a/dev-python/flask/Manifest b/dev-python/flask/Manifest
index a89816953022..84f4ca503a77 100644
--- a/dev-python/flask/Manifest
+++ b/dev-python/flask/Manifest
@@ -2,10 +2,12 @@ DIST Flask-1.1.4.tar.gz 635920 BLAKE2B c1f19e7449177ecf6e901d5932ad25cbe866ff53b
 DIST Flask-2.0.1.tar.gz 626851 BLAKE2B 05273edacd6d66237a552410df7ef7ff367e28c273cc89f654eac5ed2eb3d26f71437169905372b398cc6c5c5067dcbea54aa1cab782e03c6186ac9ae3949f4c SHA512 fefed4971f0542b25ba2867919aa54a83b6e3f47e7cee94586543843e7e00ba209ac15d8fe28a3c53981f587aebcf2f3915a49e1a9cd1b729099dccbed3783c2
 DIST Flask-2.0.2.tar.gz 628479 BLAKE2B 13555ce0602e685b5fe29ba51e05534263d70440c56c9096e95e0893e010d877154d3d1db1bff47209e6b70e91612a71e8aed149a067465f9e3a11486d843a86 SHA512 341be4e453dd5f682e465af356ff85ffe76f52a62e529e6cd251f95199e73b0f93414af093f899f61721e9bb351f09972a433a55beacc972b5e577b86e003081
 DIST Flask-2.0.3.tar.gz 629304 BLAKE2B dae5ffb86b9f57ea95c682be4f858faec6432c877695c06fff40a056cd7eedff25cf120458435b634954f0e65e57ad6c22c3eb6b5ed751b6d7f5d4501358c240 SHA512 b759ada3ab610d4893cd48f6de070c23929ab2e37af863238912fa19246acfb399b1e67576bf6112c9bb56b00002792d28c7538c65b026f31bcc6f64305ae966
+DIST Flask-2.1.0.tar.gz 630852 BLAKE2B 6a67d4c0f67aebf326493d86baefcdfb5d1e1b36a3b6a2e818d8bd92d84267ca8762ee0af3e70254bd4ce53a4f781edc9560e6408adf8ac285b308cdf1103c0f SHA512 8d9da72e3ad7df378a32fc40290e9499bc79eb3167235e8497f8f2753ac2c9da170d34f0ae3e87db99ba8282c887a479a64b680818b668bc13e033e6e5603926
 EBUILD flask-1.1.4.ebuild 1330 BLAKE2B ae78a5a449bad145e9ae537f968bab105ce9f4c69a22ed881ea1dbc8cc7cba708da8724731c8009ee23a8c606fbeb32fed970a5237427d51aab13a91baf7bb28 SHA512 1885d47a974863080b2a3c5372fad49765958e2b17e7a70a01afddc7ed87866d9205259da4b2e3891d88594144ed13663a396844aa92e7f430489e2acbc68a42
 EBUILD flask-2.0.1-r1.ebuild 1254 BLAKE2B 4905978df3fa82a8c6d823348dd93886d894ded96a7d2086d27365c7b0c87633a20fbd698866d1b5b7ff0df1bb234be3cf2c225a716531a0fe5bbdbc4fb4f2fa SHA512 6e8889540ba701ae776da1c2c72f95839ae09d6e3cb224e65fabcbf49f4b073b8ec5a26cb2c8638e8508a63b30370acaad68dcee78c5505ce25aa33cde024396
 EBUILD flask-2.0.1.ebuild 1157 BLAKE2B 0bc463ef16344809f4fc20924a286d45263be516a5ba31e7f2b5177c0e839398cb0d0ede26374cff1ae74a2bde6b112f7b3c0c3ccb44323bab9fe8fddd200f3f SHA512 eff0a6235f8a7e7dc98976dea47be68aa65ea5a8f2fdbeb873540adb781bfbccd7415686d045c58d3ce49e50e0ee18c4e106c6dd6c6edaf29b04311860a76cbf
 EBUILD flask-2.0.2.ebuild 1467 BLAKE2B f58ee8a015b45ec847061d6b4786a18f6e1d75216bcae7b6d135767549198d71b6e255fbdbe0cf6bae785406c8805d220daa0e6135d490101bd4d4085201e2f3 SHA512 45b312db1d2c806c2ab23d3e31ed3f7388bd2428c6ec8f26b709ea49f74063a7eb045a6896325ded7222c29783dc45a41ca66521e01029e895673d2a4aab8dcb
 EBUILD flask-2.0.3.ebuild 1306 BLAKE2B 552e9ef0c973d6973b68919e3a95086f763b08dedfec3b1324306a2629af118422130cae699248f4251bb7cf721c53af3ad17b56f2f4d17c27d8b3e12210c149 SHA512 2f11847c1ac1686b477901e021be64e4ed90c5d494f584305ac500dc863b0cfc60171b9595ce32505038b08df4e43551d5922a77c95e0783e0c063e6e74345d3
-EBUILD flask-9999.ebuild 1217 BLAKE2B 57aa06a3fa33b0e8e5fd3e3054e7fba2e263524d2613207582e854643afd6b7c1ab3f41d73318012a9d77982a778cf90c6cdd13d0232447ef94fd2603f5f32e8 SHA512 3c050a9e65cc40a6556d5bace0ec403d043e8c5591814d47fa3c4284f4886d0eeb1c6f29ae0b9e25a001f2ab38f28fc20f34e3de67d2f74c9197b0b94d4a3f05
+EBUILD flask-2.1.0.ebuild 1417 BLAKE2B c29b9854806854948990c2cf2958f25e3fff0b0b63f2edd29498c55b5da72ef4a70c4acb2dd912a2124b81785ce90b26a022af0b379f16c669316b7ee6ce2bdf SHA512 d95c54d2f7dcdd7f369ddeac2d527966d1f2af88c76df2105127cd9d1a4988c2bd476b22030ab9b4f0af5d4dad491a04663a6e138de39ecfa56809e4598548b1
+EBUILD flask-9999.ebuild 1417 BLAKE2B c29b9854806854948990c2cf2958f25e3fff0b0b63f2edd29498c55b5da72ef4a70c4acb2dd912a2124b81785ce90b26a022af0b379f16c669316b7ee6ce2bdf SHA512 d95c54d2f7dcdd7f369ddeac2d527966d1f2af88c76df2105127cd9d1a4988c2bd476b22030ab9b4f0af5d4dad491a04663a6e138de39ecfa56809e4598548b1
 MISC metadata.xml 386 BLAKE2B b449c54b966bc8943f7b7b12d6126867a89a2759eb749c08f7ad53a174e93ecad07f09b5e30c8562c63ab05df75a82e2f48f550ea8cf3a546f5afc2eef5a896d SHA512 123334db31948046e47f3cdbe0237cdec3dc2207485c8243d1e34e065436995423b6a89909563a6158741a8cc62a7fdad95923870a7114cf69e58ef715e7ec5c
diff --git a/dev-python/flask/flask-2.1.0.ebuild b/dev-python/flask/flask-2.1.0.ebuild
new file mode 100644
index 000000000000..eec62df569de
--- /dev/null
+++ b/dev-python/flask/flask-2.1.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A microframework based on Werkzeug, Jinja2 and good intentions"
+HOMEPAGE="https://github.com/pallets/flask/"
+MY_PN="Flask"
+MY_P="${MY_PN}-${PV}"
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/mitsuhiko/flask.git"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="examples"
+
+RDEPEND="
+	>=dev-python/click-8.0[${PYTHON_USEDEP}]
+	dev-python/blinker[${PYTHON_USEDEP}]
+	>=dev-python/itsdangerous-2.0[${PYTHON_USEDEP}]
+	>=dev-python/jinja-3.0[${PYTHON_USEDEP}]
+	>=dev-python/werkzeug-2.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/importlib_metadata[${PYTHON_USEDEP}]
+	' 3.8 3.9)
+"
+BDEPEND="
+	test? (
+		>=dev-python/asgiref-3.2[${PYTHON_USEDEP}]
+		!!dev-python/shiboken2
+	)"
+
+distutils_enable_sphinx docs \
+	dev-python/pallets-sphinx-themes \
+	dev-python/sphinx-issues \
+	dev-python/sphinx-tabs \
+	dev-python/sphinxcontrib-log_cabinet
+distutils_enable_tests pytest
+
+python_test() {
+	epytest -p no:httpbin
+}
+
+python_install_all() {
+	use examples && dodoc -r examples
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/flask/flask-9999.ebuild b/dev-python/flask/flask-9999.ebuild
index feea1195fdd3..eec62df569de 100644
--- a/dev-python/flask/flask-9999.ebuild
+++ b/dev-python/flask/flask-9999.ebuild
@@ -1,9 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="A microframework based on Werkzeug, Jinja2 and good intentions"
@@ -15,7 +17,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 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 	S="${WORKDIR}/${MY_P}"
 fi
 
@@ -24,14 +26,19 @@ SLOT="0"
 IUSE="examples"
 
 RDEPEND="
-	>=dev-python/click-7.1.2[${PYTHON_USEDEP}]
+	>=dev-python/click-8.0[${PYTHON_USEDEP}]
 	dev-python/blinker[${PYTHON_USEDEP}]
 	>=dev-python/itsdangerous-2.0[${PYTHON_USEDEP}]
 	>=dev-python/jinja-3.0[${PYTHON_USEDEP}]
-	>=dev-python/werkzeug-2.0[${PYTHON_USEDEP}]"
+	>=dev-python/werkzeug-2.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/importlib_metadata[${PYTHON_USEDEP}]
+	' 3.8 3.9)
+"
 BDEPEND="
 	test? (
 		>=dev-python/asgiref-3.2[${PYTHON_USEDEP}]
+		!!dev-python/shiboken2
 	)"
 
 distutils_enable_sphinx docs \
diff --git a/dev-python/flit_core/Manifest b/dev-python/flit_core/Manifest
index c8c6149e90bd..87a99acc914f 100644
--- a/dev-python/flit_core/Manifest
+++ b/dev-python/flit_core/Manifest
@@ -1,8 +1,3 @@
-DIST flit_core-3.5.1.tar.gz 27497 BLAKE2B 0e47576a05afa306a17e0fe64bd48e4a141fa51df225365495692aeae1c693635f1ea13ba23fdd93543c9b152dcfc2424bd8101a544ad25be2c4561964a8a8bb SHA512 c83b5bd54ffdf2d7dbea340939cb5f0210ffd36aa0f61b02519837843ebbab206a2456a007f76cbae45c2133ef3d21949d1834083c8dddb505ed5bb127a5fdba
-DIST flit_core-3.6.0.tar.gz 37534 BLAKE2B 7450dcddc0719e17b79b82a07fbfee3116ea9eface5cba8f7d6fa27011f6b20822f8f5c02633ac75456b30327328ef60e05e15ca78a26935dfac5a66e2538a1e SHA512 6a217a6e7d8c4f81491314987ff1510f1cede233213982d9f7b2705ab5b1a7fb4b337ad9daa5ff824ed00034ba1d53215d56def86909240d49265e628ffb83b2
 DIST flit_core-3.7.1.tar.gz 40330 BLAKE2B 67a938ef576a70ce1bfe1f1bf996f1d2e468ea46f76ed2a363b278cebc42602b38fbf44a6bc45294996549d673d3145e2db2293780b8d157fd4f3b3876dc88cd SHA512 8c477bcd2924a93b51e6f3d8bbc3599929663c8d5addf16062e8e1b6c5acd740a4e4905b144092efb6e38e9700479525013831a53e055438f94c1e53ff5c6f8d
-EBUILD flit_core-3.5.1-r1.ebuild 769 BLAKE2B 19014b2a2ab5d41d793d9ec99e5da8ef27654323d505fc421d5ee7f7a77771589c1ff5fc8ff4b286679c8884ef744baad978fe1b5e915c2a3fc6ec99acf37fa8 SHA512 d9c418e90aa794270ea1c78b7f1b1bb2ef97223a446a23b985e064f0d5a0b405b6dd1c2cda89846ba8c7502bacafa0936036edbaa7891657c2766d600be49da6
-EBUILD flit_core-3.6.0-r1.ebuild 939 BLAKE2B 2a8df19932d924d99b6761e8bbad16b714a6de517834f804a95e1e2e8d1f783ec4e0d2a4a283bdcbd93a9c72496e9557d9a4662239bad4bfdf27b7efd8934c98 SHA512 0d87399ce6012af003b06b3803026d8b1a68a6ff54c98d768b2bbd71353a3ba82cfbaffaf39db3260ec43a127ecbbd6d485fa6657147358dc6f1d192a5a02bbd
-EBUILD flit_core-3.6.0-r2.ebuild 967 BLAKE2B 0625a07b8b5aee2a8bb0b45b00e8bd78e074797fe04ea2e332ce98002abda126cf97e69e341e68e317e63a4c25d6222d8cbdbc74bd1a9ba0e8c0a5ebdc5f845b SHA512 3404d5505239b5f40cf4be5b0a969778add642d87b6bce485004cafd76bcf2d6be4305d64cce89e52909e61f4971821aa86680bf1bedaaed0ee5c26e7e46dd43
-EBUILD flit_core-3.7.1.ebuild 976 BLAKE2B c9ea3d52f6cccce01d879f9a8e2e69ab536ed107c6059b4a6be2043f8723d2dbd14d3fc506c8286d9cc56e94bd00206feb2abd677745cc368161534f96ba7758 SHA512 f30bb2f019951b85e8d7cd3511ebf6263339a997e061a3377ac44e3e35ef7399d5daba4779b056601f8bb24d2dbe6e3f16910d79fec2ab1d3db6456112aeda54
+EBUILD flit_core-3.7.1.ebuild 968 BLAKE2B f4eea254f7e1e3c140924019ee2da8fa37acf8e27e64b6d4451023f56c729e6762987fb7e0d7e8bbed838438a19d48e8b262add19e8bd8db43ee93b55e3eaec1 SHA512 48d579e588dd5c1088bf127e9e8d27db1a22b8d70f8fc8e7198172730d67f902cff8bd6322b554aff01af0bf9c50583650bee8ab962ee9a04cbd0484ae3ced66
 MISC metadata.xml 515 BLAKE2B 33956c683d7d81bef0a8929619cedb0f3eb0ef050ba213edd65ee37d152bbe9e51cfe1d0d3a4a56b43fedbfb7cd408ddc1d9beb34dfd8973c3377fb21c618794 SHA512 d34cb6fa917368fb550d001ef8bb10c18d27f8e8536c049e21085267ecd26a9a22f1caf80e1c835b1f98426aace9d7548502c38aa9edd78ba67032823a23b0ca
diff --git a/dev-python/flit_core/flit_core-3.5.1-r1.ebuild b/dev-python/flit_core/flit_core-3.5.1-r1.ebuild
deleted file mode 100644
index f3ff41e05535..000000000000
--- a/dev-python/flit_core/flit_core-3.5.1-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Simplified packaging of Python modules (core module)"
-HOMEPAGE="https://pypi.org/project/flit-core/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	dev-python/tomli[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/pyproject2setuppy-11[${PYTHON_USEDEP}]
-	test? ( dev-python/testpath[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/flit_core/flit_core-3.6.0-r1.ebuild b/dev-python/flit_core/flit_core-3.6.0-r1.ebuild
deleted file mode 100644
index cdb0efbe5b50..000000000000
--- a/dev-python/flit_core/flit_core-3.6.0-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Simplified packaging of Python modules (core module)"
-HOMEPAGE="
-	https://pypi.org/project/flit-core/
-	https://github.com/pypa/flit/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	dev-python/tomli[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/pyproject2setuppy-11[${PYTHON_USEDEP}]
-	test? ( dev-python/testpath[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	rm -r flit_core/vendor || die
-	sed -i -e 's:from \.vendor ::' flit_core/*.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/flit_core/flit_core-3.6.0-r2.ebuild b/dev-python/flit_core/flit_core-3.6.0-r2.ebuild
deleted file mode 100644
index 8cc33350a196..000000000000
--- a/dev-python/flit_core/flit_core-3.6.0-r2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
-EAPI=7
-
-DISTUTILS_USE_PEP517=standalone
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Simplified packaging of Python modules (core module)"
-HOMEPAGE="
-	https://pypi.org/project/flit-core/
-	https://github.com/pypa/flit/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	dev-python/tomli[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? ( dev-python/testpath[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	rm -r flit_core/vendor || die
-	sed -i -e 's:from \.vendor ::' flit_core/*.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/flit_core/flit_core-3.7.1.ebuild b/dev-python/flit_core/flit_core-3.7.1.ebuild
index 76276275fcb7..f765725ef52c 100644
--- a/dev-python/flit_core/flit_core-3.7.1.ebuild
+++ b/dev-python/flit_core/flit_core-3.7.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	dev-python/tomli[${PYTHON_USEDEP}]
diff --git a/dev-python/fsspec/Manifest b/dev-python/fsspec/Manifest
index 7b17e110141a..3f37cb8a9a92 100644
--- a/dev-python/fsspec/Manifest
+++ b/dev-python/fsspec/Manifest
@@ -1,5 +1,5 @@
-DIST filesystem_spec-2022.01.0.tar.gz 325470 BLAKE2B 1a6dccad133a449ba9b78516f968586a0f300e97150a6aa887f2f65fafe6e2bae708620ef185789024a7248877405d736839292011f3db2221c119fb80bbb5ac SHA512 50e36c9aded9ee9824694bad563b8e92ee564c6fb6fc30d3a51b8b2e8b4a1e5f605fdbaff00eefb354b0201cce4bced0ed95b48817c5ef15ad1f09965d311ac0
 DIST filesystem_spec-2022.02.0.tar.gz 329625 BLAKE2B c3d3815ece4cc3a0713d2ee6fd70c55a3236c926dd389dd55866bd6a11c63e6225cd4415dd310876b8e271bf82534826452a3327693f94bd8c8b5b7aa7893222 SHA512 6cc26cb61c75fea4ab7af37190a623a4fa07d85ff540accc4d85e8ebab5f6bcc78099e85a6196f93c9d7f4e0e0380395ad2625b485858fb8db40f7c2682f8c4d
-EBUILD fsspec-2022.01.0.ebuild 1172 BLAKE2B c03726ec85343c3c260e41d2ecce2442d3ab4e003afe6097eac0192059fa50a8c9cc37a6d8d05ad2da43f70fe5ff4168588938e9e01fc5036202166a9cf240c0 SHA512 e64827859757d0e46bfc879e92e60503671a9c3b431fd18aeaa5d175addd8ed0697be23de34f120c61705146afe786bf156e3c533fb3838e46c51a5431d96012
-EBUILD fsspec-2022.02.0.ebuild 1297 BLAKE2B b2ab7365ca035afa2cea98dea034e1a8e65233b7defcff3a415f57d633d9b5bff37f43e822d53b58232b26d386b09ae6a6f60cb66f80af0900a0056a73380961 SHA512 9a1df7ef3b705efd95abc8ddcae8357747c6897b4f9fb8a079ec60373ae89472b9a6867e6bbce5440031d5aae33db7000c94f557957c572eb6103b2235001f5a
+DIST filesystem_spec-2022.3.0.tar.gz 331768 BLAKE2B 8f4e75f839419f7445a9291e3b67914338b0371742f1d3a556962b6e5abb31379cfeba52e0101f7660fd69569dabb49190820323b7e067a0c33c2184422ba067 SHA512 7c793b506e93f727bc4533a778f6108f82c9ab9274a8d259ecf483e0acbbfc97e3c8b07735f772f996867053d7e1f9c22687865f4f64cae6eb4fb511de2e9220
+EBUILD fsspec-2022.02.0.ebuild 1295 BLAKE2B 2b32ba25448d9f566929572e1966bb0625f05e032978deed0dab3f4638eba9437e4d8bcf5e448ad005792e6b94ff7ed68f9d0cd6af77394dd5c2411f4b8910f5 SHA512 9cc1bb6e9d76ad35b0204ba10de4bad1d2f9392376a1927650bcd548a8e66758d7b9468e31753489b83fdae1ab139f7bc6d333a82086fcf6848dbe48733a97e3
+EBUILD fsspec-2022.3.0.ebuild 1297 BLAKE2B b2ab7365ca035afa2cea98dea034e1a8e65233b7defcff3a415f57d633d9b5bff37f43e822d53b58232b26d386b09ae6a6f60cb66f80af0900a0056a73380961 SHA512 9a1df7ef3b705efd95abc8ddcae8357747c6897b4f9fb8a079ec60373ae89472b9a6867e6bbce5440031d5aae33db7000c94f557957c572eb6103b2235001f5a
 MISC metadata.xml 374 BLAKE2B 6c0b18a0ad3b85713ae6f618ac0646ed63f08549bd7d1ed5bd94b80d89d79efaf2f97ce913a0a7d6e54e77cc602994416520a22deadcc71e484cf7ca22bc6dde SHA512 5bf051387d6bcffb3022d023f60ee8f76ca277bb8d626dda988a0baaf1d1e3a71e872d8316607ee7e269e579b5a17c23ab93c56fade533150171d3ce44e4bb71
diff --git a/dev-python/fsspec/fsspec-2022.02.0.ebuild b/dev-python/fsspec/fsspec-2022.02.0.ebuild
index ede5cd75981b..db0485f6ba02 100644
--- a/dev-python/fsspec/fsspec-2022.02.0.ebuild
+++ b/dev-python/fsspec/fsspec-2022.02.0.ebuild
@@ -19,7 +19,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 
 BDEPEND="
 	dev-python/versioneer[${PYTHON_USEDEP}]
diff --git a/dev-python/fsspec/fsspec-2022.01.0.ebuild b/dev-python/fsspec/fsspec-2022.3.0.ebuild
index a3c732053c68..ede5cd75981b 100644
--- a/dev-python/fsspec/fsspec-2022.01.0.ebuild
+++ b/dev-python/fsspec/fsspec-2022.3.0.ebuild
@@ -3,7 +3,9 @@
 
 EAPI=8
 
+DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{8..10} )
+
 inherit distutils-r1
 
 MY_P=filesystem_spec-${PV}
@@ -17,16 +19,19 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 
 BDEPEND="
 	dev-python/versioneer[${PYTHON_USEDEP}]
 	test? (
 		dev-python/aiohttp[${PYTHON_USEDEP}]
 		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
 		dev-python/requests[${PYTHON_USEDEP}]
 		dev-vcs/git
-	)"
+	)
+"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/geventhttpclient/Manifest b/dev-python/geventhttpclient/Manifest
index a1a6ae8fd857..fd45003b9703 100644
--- a/dev-python/geventhttpclient/Manifest
+++ b/dev-python/geventhttpclient/Manifest
@@ -1,3 +1,3 @@
 DIST geventhttpclient-1.5.3.tar.gz 58447 BLAKE2B a1cf529c6d40ee81ebe17cb066f2d837cf3d5ce2511bb735c1a63503b612c98c17c91f08de99d604c9ff6ebfa7e6502c338e7fbbc86de954ae7e559966aa8006 SHA512 9a0ed907f73f7f5ff8675502ef6fc82bff7b543d0a2d22e1eca5aba3592675a87fe09c48981f496b7f63a660e7eab5f68801ae74da8c33ac9d9bf55a0425eed1
-EBUILD geventhttpclient-1.5.3.ebuild 1490 BLAKE2B 622a8087fa75439016589a047175430c6e22eb6f51feb65a3b65b650d0ef2dc169807b1c60fedc8381e2364394005f2abb7d98784c5ffedcc180b972f2f81891 SHA512 36d645727fde1ad8ec5abca3704d4a9da49ce5d93d36ab41dc0fda80be985abbf198e8cc930c2714f6450bb5e726c9285e12fe5a74300b11334f94d2b276608d
+EBUILD geventhttpclient-1.5.3.ebuild 1497 BLAKE2B 500fba9aefe32214d5896c9ad01f6dfa60b5c6b317764f64177cc590a5179dbe2e1f822571e2e1983f5b66b562ed7dc88ae37eab8243cd268a8d7419bf746fc6 SHA512 ccb07a069c62871956206cc0c98e0378d75edad600ec449a715b459968c225ed442ffd8189c2fa03359daff0de89c11fc2eec2cc027205ac768d45e47174b32d
 MISC metadata.xml 556 BLAKE2B b8a8f2fd8ff23ea4bf828d0dbf673da0345f832124a526f533e4beb36ca168acb13bd4fd92e7842a5361c38d9437960322a0c29f4c11a79696ede0544148d2da SHA512 c7bec846363a0fb54edeb145718d0acf56e6c2d0c1b2eed68f24412a9f328dac86f78e39d636e0b234cd556c334fd413b810bb1e5689651a17e2cd31cae7bd8d
diff --git a/dev-python/geventhttpclient/geventhttpclient-1.5.3.ebuild b/dev-python/geventhttpclient/geventhttpclient-1.5.3.ebuild
index 866d10a94b8a..60cf23a6fc98 100644
--- a/dev-python/geventhttpclient/geventhttpclient-1.5.3.ebuild
+++ b/dev-python/geventhttpclient/geventhttpclient-1.5.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	app-arch/brotli[python,${PYTHON_USEDEP}]
diff --git a/dev-python/google-api-python-client/Manifest b/dev-python/google-api-python-client/Manifest
index bbf4ebed72da..e7dffdd4f999 100644
--- a/dev-python/google-api-python-client/Manifest
+++ b/dev-python/google-api-python-client/Manifest
@@ -1,11 +1,9 @@
-DIST google-api-python-client-2.37.0.tar.gz 28868090 BLAKE2B 971fa3a873c902a34c100066a026ab6698d142a4875282d8be890b403a2edf1f00ea5a3dc4bcf90a30ad9dfb8aa5e1d5eb1b60e64a6718a6e054d49b7ff94afc SHA512 72543f78779403a5d16cfae8f84718d7a6dc08e9fcaa4e97d7a1f6e5ba6594b3a87762e229b94ccfc3a3ca196bbe0cd17c5fde949d101d5975b61cdc57a32622
 DIST google-api-python-client-2.38.0.tar.gz 29194978 BLAKE2B 741cf925256f0bd648e68c339233cfc13a9eaa12e123e202eab64b8389bc493755838c3da8ca4e7f4ffeecacec783c41f37df1847edf0fb54387d58163c112fc SHA512 b93f1f946ebab226b9fdd9012c3ae70563197a895d9069f09c7eb8926cd8fe5567535d3677a6824f66720b9ed1f0a732f02be9440dc800a13cb7e335728a3ce8
-DIST google-api-python-client-2.40.0.tar.gz 29463380 BLAKE2B f70067d3afe614e34cf84480d7a653620b516689560033cf3ad72a963e53c76632d1254ed1ac5f492e9e4639a6d717889f0f84c283363892efa99ce1007bbb82 SHA512 ae345d46bcb13509dd631039079c3ef96899899c206bc19b47a873d8ebc9372e70f55bcada1c8ba9775d826dbe8b1fde96a8f496f5574bb15b3c73c7d848f189
 DIST google-api-python-client-2.41.0.tar.gz 29608471 BLAKE2B 5a6f9eb414f02b9528d0ee8f8777da6596bd298f6aea8191966d1ebaa67219f8ea2e44a77bc667bfedab39c4ab0352a13ba04fd805f0df9a6936247cd4cf3481 SHA512 b9ee6a4374438d019d0efd09d02426c1c773fd2ca561e2bf91e426535fec2865a47a32cc5cf780e5e7da193ca3d8b5677339fee2a4983e7f4af9612d901c883d
 DIST google-api-python-client-2.42.0.tar.gz 29772877 BLAKE2B f478a719c3a6ef2f78d1fa16c231d47f2d72b55e67746612579f644b92dbd93ebd7f320f0684d85c1c1e253ed2f5163d7f6ce2904343bbe7a4f6746889663970 SHA512 e55cd75dec478a3410829a7eb7ee5478b52b44450d4ade69e3a7ee11b30e5ab5690c93ff6444f4b723db6cd1f26ac70553b3f1b9c77dc0b428db271b773faa9f
-EBUILD google-api-python-client-2.37.0.ebuild 1368 BLAKE2B bbee6bb0dec4e07887e0bd99c736c2702ca3a3fd10ed304b19dc63eeaed76b31af5289fbc862421aebc0ed0c1efd5454306d233b7b572d2600c123d9db017dbe SHA512 8c5c9dcc8d85824ac1667e6079b1da7f628ad7125d5caff22d3ba161dac2bf951d717199280379e962251abf3ffd102211d1c46e1530024e00d36448739b37cc
-EBUILD google-api-python-client-2.38.0-r1.ebuild 1372 BLAKE2B eba2c5a44d78732985e2d016052285a01dd3b0c5ff1128e4c8a72eba2b58ddcf77f749668bcf3e7fccc756ec56281a28951290630c44a2c1003801f067c21f4a SHA512 a7f2bd3bbc9b8ac65944e7f6b5cc52ef0775b945b04754ca7f36a7069babd5855413a1e2421b180f19579a3535a3dfe6a1561406387c8891f6d339b82c76b129
-EBUILD google-api-python-client-2.40.0.ebuild 1380 BLAKE2B 5f6f5d2cc37bb4692c28dfd840683d4993f6c63def00904491dbe76e541ae90b01b11db178a55154baec88a9449b85d177ac961ed7b457f30d14507ac4181e75 SHA512 14caa36d73eb43ae96919dfa3a0a36c3ab8e73dd966b4383b21472488ee0394977d9a0b01ba0c31d30bd1f3dea52067341311b5986053913a2d7f7c7c0b6b201
+DIST google-api-python-client-2.43.0.tar.gz 29820752 BLAKE2B d0f7337f2d63d9db2da3526670a5f034103cb1b2e3eefcc77fea6d15258d185c06c238662de6d304e73b4f9ea25f8b202386eae8b7b94d7c52ad2b6c15d2ea76 SHA512 0e59f22b0c03d1b29247219e39a83bf6b637afe3eddfa302ecd34acc30bebb850f771e4b7b5c24e5a607ddd74ef6833fe0597465776d00675ed868612ebd1d70
+EBUILD google-api-python-client-2.38.0-r1.ebuild 1370 BLAKE2B 4beaa5e82d45beb27773ac3a4d52bfe2b20da5c887c72cba5b0cd74fa5341f77d75c62ecf6f74a52a67f2f81b3897513e553845866c39350d2e41dbeb4edb1c7 SHA512 b2a516e55f37ea19f437186343cdbffaa0ba7b6aa49aa541fd19535f3ea2b8d7ef32f57eb4282fa38fdbc05855fc8630cc2aeff067cda43850e6c5f573cc8f41
 EBUILD google-api-python-client-2.41.0.ebuild 1380 BLAKE2B 5f6f5d2cc37bb4692c28dfd840683d4993f6c63def00904491dbe76e541ae90b01b11db178a55154baec88a9449b85d177ac961ed7b457f30d14507ac4181e75 SHA512 14caa36d73eb43ae96919dfa3a0a36c3ab8e73dd966b4383b21472488ee0394977d9a0b01ba0c31d30bd1f3dea52067341311b5986053913a2d7f7c7c0b6b201
 EBUILD google-api-python-client-2.42.0.ebuild 1380 BLAKE2B 5f6f5d2cc37bb4692c28dfd840683d4993f6c63def00904491dbe76e541ae90b01b11db178a55154baec88a9449b85d177ac961ed7b457f30d14507ac4181e75 SHA512 14caa36d73eb43ae96919dfa3a0a36c3ab8e73dd966b4383b21472488ee0394977d9a0b01ba0c31d30bd1f3dea52067341311b5986053913a2d7f7c7c0b6b201
+EBUILD google-api-python-client-2.43.0.ebuild 1385 BLAKE2B 9513e20b8c3d7363ae1e6b1c794736718d29771800919094b95342bf25ab27d550b9349d6d7da9d1c7a5667e5fb138ecd2f831a586ebf2d0c0bc3f6e74fd4486 SHA512 adcddc960675f548fcc8f981399d2ff9582b4245a00eab7d113ea02fe3c1118c34c338fa70b367f049041427ca86cb6b0529ae8472025b9bec0114dd2e3fabc3
 MISC metadata.xml 538 BLAKE2B bf0b8ab3a89ce9ab1d2159f4c0ebfe3f2646aced20bd2006485510c12d22e83cc130fac979f699ae6431a610c8d2acf86c04b39bc262abaf167c20571a860810 SHA512 30d004d944055660165954f8475e57ba45cef56423c80a324118836d78e5376261409955155a40c9bd988f230f3e2fc44c6aeb6fae3028c78c55a382ccd83bff
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.37.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.37.0.ebuild
deleted file mode 100644
index 5300090662b2..000000000000
--- a/dev-python/google-api-python-client/google-api-python-client-2.37.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..9} )
-inherit distutils-r1
-
-DESCRIPTION="Google API Client for Python"
-HOMEPAGE="https://github.com/googleapis/google-api-python-client"
-SRC_URI="https://github.com/googleapis/google-api-python-client/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-RDEPEND="
-	>=dev-python/httplib2-0.15[${PYTHON_USEDEP}]
-	<dev-python/httplib2-1[${PYTHON_USEDEP}]
-	dev-python/google-api-core[${PYTHON_USEDEP}]
-	>=dev-python/google-auth-1.35.0[${PYTHON_USEDEP}]
-	>=dev-python/google-auth-httplib2-0.1.0[${PYTHON_USEDEP}]
-	>=dev-python/uritemplate-3.0.0[${PYTHON_USEDEP}]
-	<dev-python/uritemplate-5[${PYTHON_USEDEP}]
-	"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/oauth2client[${PYTHON_USEDEP}]
-		dev-python/pandas[${PYTHON_USEDEP}]
-		dev-python/parameterized[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# require Internet access (and credentials)
-		tests/test_discovery.py::DiscoveryErrors::test_credentials_and_credentials_file_mutually_exclusive
-		tests/test_discovery.py::DiscoveryFromDocument::test_api_endpoint_override_from_client_options_mapping_object
-	)
-
-	epytest tests
-}
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.38.0-r1.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.38.0-r1.ebuild
index b529ec6ab503..58251aa2b4e3 100644
--- a/dev-python/google-api-python-client/google-api-python-client-2.38.0-r1.ebuild
+++ b/dev-python/google-api-python-client/google-api-python-client-2.38.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/googleapis/google-api-python-client/archive/v${PV}.t
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 RDEPEND="
 	>=dev-python/httplib2-0.15[${PYTHON_USEDEP}]
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.40.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.43.0.ebuild
index 8c829ff884d3..9ffc1aa432ce 100644
--- a/dev-python/google-api-python-client/google-api-python-client-2.40.0.ebuild
+++ b/dev-python/google-api-python-client/google-api-python-client-2.43.0.ebuild
@@ -10,7 +10,10 @@ inherit distutils-r1
 
 DESCRIPTION="Google API Client for Python"
 HOMEPAGE="https://github.com/googleapis/google-api-python-client"
-SRC_URI="https://github.com/googleapis/google-api-python-client/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="
+	https://github.com/googleapis/google-api-python-client/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz
+"
 
 LICENSE="Apache-2.0"
 SLOT="0"
diff --git a/dev-python/google-auth-httplib2/Manifest b/dev-python/google-auth-httplib2/Manifest
index 3df4e1a1209a..8b643388c081 100644
--- a/dev-python/google-auth-httplib2/Manifest
+++ b/dev-python/google-auth-httplib2/Manifest
@@ -1,4 +1,3 @@
 DIST google-auth-library-python-httplib2-0.1.0.tar.gz 25116 BLAKE2B dbb0393bafb1bbe67b99ac0783e687271c42256c7b283422b884b86d4c8a83222392a5514b812aae683ec7f887afa4bf81307079e676f793f02eb87e52a375e5 SHA512 52b0faf70e185cb89420377a06c77e2c45f6b910b85371fc2c42fdfb06a4ebca28b476201f9d179fbaa4a8bf7b6015703d023ddd95d482113e2cdbf79fd376b5
-EBUILD google-auth-httplib2-0.1.0-r1.ebuild 906 BLAKE2B 3c7834c0af615372c4dd568de34a4c3d97763b8475af77c120e44970da51c1ed4f5d9dd23279ede80d035868a9274dcc347c87927960e4c0b8be8affd9ff3652 SHA512 a7f09fa815b444af688563ede5abeb74fd67ad657ec8a4c6e96815dc508ecbe67a3b79ddd3a8d6d9d626fd4ae31deacf04edbc54c0d68896bfbc2dc0a6938644
-EBUILD google-auth-httplib2-0.1.0.ebuild 871 BLAKE2B 25da43187da93a88b038f743c9028d5c1eb28439c71b26ebc9e3eee1b61bc6b3a02c84ea35fd452f27894efed28cfaae74a44512ba9f504aeea37c72d935ce86 SHA512 58b0a290f0821563d72671c087dcf31985fa2e9baebaa7d8fb159c50c808f2c1f608b7f7a873a266567bd310b9b7d6617f9a80db76309a2484ed1bf023f32ae2
+EBUILD google-auth-httplib2-0.1.0-r1.ebuild 904 BLAKE2B 9b79ac338c6dda59973e0f44c2be00bb2272bc0cdaa20af1130728018fddccc728f1eab1baa25bcce7fffc0d81fdd494b3c3fbffc3ebf8391f1e67602a60d67b SHA512 33d1f59785aa5a36b47117f3778f83ba7cdac47030816e0dc9680127d07cfefd2f9b8cd008db0fd9d18a1f2b9ba72c89e897aa816fb5b918eb75f6af3e5cc286
 MISC metadata.xml 539 BLAKE2B eefbb5db5d696a71dbc67ace7becb705ac048632e0434e516aa2fbc6e963ea86713beb4b1a2109e29e16b9844c2bf62ebbec527379c13f0f390d2cdae23e77e8 SHA512 03b6328fffb6014d3cccac0687e2b652b5522f345c125ec69c62dc020a8a6baaef444dbdfadef6dd8119d1a19449d57893e207ae4f2ac35d5592c23cad931c2c
diff --git a/dev-python/google-auth-httplib2/google-auth-httplib2-0.1.0-r1.ebuild b/dev-python/google-auth-httplib2/google-auth-httplib2-0.1.0-r1.ebuild
index c086d756d5e9..ba2fdabc7269 100644
--- a/dev-python/google-auth-httplib2/google-auth-httplib2-0.1.0-r1.ebuild
+++ b/dev-python/google-auth-httplib2/google-auth-httplib2-0.1.0-r1.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 RDEPEND="
 	dev-python/httplib2[${PYTHON_USEDEP}]
diff --git a/dev-python/google-auth-httplib2/google-auth-httplib2-0.1.0.ebuild b/dev-python/google-auth-httplib2/google-auth-httplib2-0.1.0.ebuild
deleted file mode 100644
index a92f61e6f672..000000000000
--- a/dev-python/google-auth-httplib2/google-auth-httplib2-0.1.0.ebuild
+++ /dev/null
@@ -1,34 +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
-
-MY_P="google-auth-library-python-httplib2-${PV}"
-DESCRIPTION="httplib2 Transport for Google Auth"
-HOMEPAGE="https://pypi.org/project/google-auth-httplib2/
-	https://github.com/googleapis/google-auth-library-python-httplib2"
-SRC_URI="
-	https://github.com/googleapis/google-auth-library-python-httplib2/archive/v${PV}.tar.gz
-		-> ${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-RDEPEND="
-	dev-python/httplib2[${PYTHON_USEDEP}]
-	dev-python/google-auth[${PYTHON_USEDEP}]
-	"
-BDEPEND="
-	test? (
-		dev-python/flask[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-localserver[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/googleapis-common-protos/Manifest b/dev-python/googleapis-common-protos/Manifest
index db32c8ff702b..5e5a82f3ec0e 100644
--- a/dev-python/googleapis-common-protos/Manifest
+++ b/dev-python/googleapis-common-protos/Manifest
@@ -1,7 +1,5 @@
-DIST googleapis-common-protos-1.54.0.tar.gz 112874 BLAKE2B 95d2429d8bf27299ff406d0a06f31b2b499f66533cf884a8ec77ed6defa10bdabd6460232265efc9606e5f890ab14c571a0240e842fbdf7117ff3d7bff5ef28d SHA512 535cf6e4e5331a99232cb3eec1bc56676fcf87c522bd5b06f3452c7b22abd51479f3e4c69c8654bba4d789e8267360e11573d357ac90bb63854281e227eb8bc6
 DIST googleapis-common-protos-1.55.0.tar.gz 115218 BLAKE2B e0091aa07e42c56a0e8f9502d786b7d775672dab1b19dc9cff41e9dc4a0eb8b4aa05b2ba22d8353466ee6d1a40e94a423dd7ab94564166d0575f827a08dc5dd9 SHA512 3fe171bb54b9f508e524bf6e25e7533549346f3d70f0a55f2117c0031d823646b6384491ab059eddedfaf23ddcf7bdee4f6a66dcd50930403a1b7da5ee0ac9f8
 DIST googleapis-common-protos-1.56.0.tar.gz 132706 BLAKE2B a0adf6527c24aaa30922800a80ef4af8abf3d83c4639c227a859c92e02d248f44b408f98820387a51b310dedf005872cb0fa7824bd27ac6309f31f85810edd40 SHA512 ef6ed067457aad3b46d81bacbb66abe3b36b0640290e0047ef7c6d612dfd8bf865dad47c77275f0d5a1e03cd4e5dca32d08f44c7a7bfe7b264ee59e5c5bb9a27
-EBUILD googleapis-common-protos-1.54.0.ebuild 696 BLAKE2B e6eb8b2afed603f1478358b2d5e08dd77f3688c8b6bf2f816f906f9c32a8c412cb51ba55a63efe2cb15fe38a362aeeeca944f2e5a187fc306a65408e115fc28f SHA512 2438af0469bb0fc4b590284258f2b3dc762f8bc62193c3c7646ca3de046996b66a449aa28da17b7a8c4d22cfd28b857297de4d12bbbc2d0a3b790d8f2972e538
-EBUILD googleapis-common-protos-1.55.0.ebuild 698 BLAKE2B fe2b949b68e4200d0d11b924a3d47bc8e7851ab25ab4dfb9ee1237ceb705f780a6b7cb4641428c2d926d5a39b9de1d6441f5965baa4de3196e2bd97c36b0b292 SHA512 6c357469904028df1cff7feae42deddc67d3a700f37229cd472bcea0adbd552f153372cf0f3c486b2e29489b49f45b71d48c740ed8e32c5d305fee5242d61bb2
+EBUILD googleapis-common-protos-1.55.0.ebuild 696 BLAKE2B e6eb8b2afed603f1478358b2d5e08dd77f3688c8b6bf2f816f906f9c32a8c412cb51ba55a63efe2cb15fe38a362aeeeca944f2e5a187fc306a65408e115fc28f SHA512 2438af0469bb0fc4b590284258f2b3dc762f8bc62193c3c7646ca3de046996b66a449aa28da17b7a8c4d22cfd28b857297de4d12bbbc2d0a3b790d8f2972e538
 EBUILD googleapis-common-protos-1.56.0.ebuild 731 BLAKE2B f0c01a85626158810c098abba3a7e2945f4ffbe72cf82fe1540d1442431d72eb3e3378ef71bf484df766640fb32af660fb8389a0b84e5bc387d3fcd51a1a5146 SHA512 c9676d4cba7f1e3e1d9558bf66b6c2bdcd62d7c4577c392c5e947225159cdc2e186d5b608cafe42ea7baf5c65be961fefb59ce50a5f7ed7d7fd2680a68f9e2c3
 MISC metadata.xml 537 BLAKE2B 7b81f41f34a3c0fa53340ad298440f67727eb1830009899ffa10835485f66e727844735a88bed94b8a0bba14fa01a78d8a04f5ca3edf48a72781c7e1a797459e SHA512 6013da3540915e13a0cc60336bbefada12fbf71c04d4f40634f24015ada732d0d8b86600401bdadb2c7df2ea84f7097669f4efe6cf176ccca5efe46e9a3869d9
diff --git a/dev-python/googleapis-common-protos/googleapis-common-protos-1.54.0.ebuild b/dev-python/googleapis-common-protos/googleapis-common-protos-1.54.0.ebuild
deleted file mode 100644
index 0a47dd50e56c..000000000000
--- a/dev-python/googleapis-common-protos/googleapis-common-protos-1.54.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2020-2022 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 classes generated from the common protos in the googleapis repository"
-HOMEPAGE="https://pypi.org/project/googleapis-common-protos/"
-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/protobuf-python-3.12.0[${PYTHON_USEDEP}]
-"
-
-python_install_all() {
-	distutils-r1_python_install_all
-	find "${D}" -name '*.pth' -delete || die
-}
-
-# no tests as this is all generated code
diff --git a/dev-python/googleapis-common-protos/googleapis-common-protos-1.55.0.ebuild b/dev-python/googleapis-common-protos/googleapis-common-protos-1.55.0.ebuild
index d712f38c2e38..0a47dd50e56c 100644
--- a/dev-python/googleapis-common-protos/googleapis-common-protos-1.55.0.ebuild
+++ b/dev-python/googleapis-common-protos/googleapis-common-protos-1.55.0.ebuild
@@ -12,7 +12,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/gpep517/Manifest b/dev-python/gpep517/Manifest
new file mode 100644
index 000000000000..2904f7bb62a2
--- /dev/null
+++ b/dev-python/gpep517/Manifest
@@ -0,0 +1,3 @@
+DIST gpep517-1.gh.tar.gz 6871 BLAKE2B a298a445cb24dbc708985ebe0be266ed6549525a2b9d250ddb53129502f04a442927ca4c29445f4caf4ada82e106e5498c9586e78dd8a4bd676c7aff747544b6 SHA512 83ccf6124e388aefcdece391d12daf6a337d52b7bb794268effd2abc9bdab6b00d935d01cac774b4a66704578160e44617b16a5b8b9ef821012d419848145e9c
+EBUILD gpep517-1.ebuild 942 BLAKE2B e660a9ef46d43a7f785322dd4f721bc2781408eab83900d9686e9301f211fd9d627a4f3f2505663ba5de5ccd14f864b1fb38d28eedf5893cd19cc35d05ad1592 SHA512 e34237abbcf1869a388eae98636858d0dcee35103aaa8eb714450b7da0989bf5f302067616681902f4d88f666da0a16c19b7213bbe36508ec2c99461171f09ed
+MISC metadata.xml 396 BLAKE2B a3f6d1cea383a38b4b6e5f80d2306ca320a66c0d3b0131601ef6f0ea48483757b9123d74ba99fe972dde06a998c15290cbc4243285c240493ae0293d2f8e1141 SHA512 8c584869f2fc7a0947b9e5ffa330652d8b6e61a6a472fcddf0422f1719422fb8d477cdf17d87e6d0e9f6994d608a77202c24e531dd146b0f8d731a047f80d14e
diff --git a/dev-python/gpep517/gpep517-1.ebuild b/dev-python/gpep517/gpep517-1.ebuild
new file mode 100644
index 000000000000..0fbf09a24da9
--- /dev/null
+++ b/dev-python/gpep517/gpep517-1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=manual
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="A backend script to aid installing Python packages in Gentoo"
+HOMEPAGE="
+	https://pypi.org/project/gpep517/
+	https://github.com/mgorny/gpep517/
+"
+SRC_URI="
+	https://github.com/mgorny/gpep517/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-python/installer-0.5.0[${PYTHON_USEDEP}]
+	>=dev-python/tomli-1.2.3[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+# do not use any build system to avoid circular deps
+python_compile() { :; }
+
+python_install() {
+	python_domodule gpep517
+	python_newscript - gpep517 <<-EOF
+		#!/usr/bin/python
+		import sys
+		from gpep517.__main__ import main
+		sys.exit(main())
+	EOF
+}
diff --git a/dev-python/gpep517/metadata.xml b/dev-python/gpep517/metadata.xml
new file mode 100644
index 000000000000..802f821d7abc
--- /dev/null
+++ b/dev-python/gpep517/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="github">mgorny/gpep517</remote-id>
+		<remote-id type="pypi">gpep517</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/graphviz/Manifest b/dev-python/graphviz/Manifest
index 736b024280f9..7d071e0f20e0 100644
--- a/dev-python/graphviz/Manifest
+++ b/dev-python/graphviz/Manifest
@@ -1,4 +1,3 @@
 DIST graphviz-0.19.1.zip 247779 BLAKE2B c0b226c2ae66f8b583a30cf2842b8cfdecd926f0e7f32fbbfb4dae17ce14792d0af8d8cf6de53cc9a7facdeb8b0a4a078b962eabf64460e1fd42dd995e069428 SHA512 3aa078887458d7bcd173c46ee6e4d8dbdae0c9103755e61e5a027c18e5d8913990aa16a595e80228607c17db1aa9dffdb93e264cafafc8b6318bc3a87547bc5d
-EBUILD graphviz-0.19.1-r1.ebuild 898 BLAKE2B 3dddeb7524daaf6bbd7bfa3f1757965bac5abd840cc318b5b5e8f763597ef20dcf0e945b06d71e903e3642ef9f9b7c759c59262cdae3a676d6e4d3cf20317f10 SHA512 62649e574b6ec47412b45eb2b1c360d9a0fdd5d5c9efd2b154bd1a0bbae875e6ec6d01493257124ad204ee159e60d9a0981bb4ea01061fb5b18005ea5c985511
-EBUILD graphviz-0.19.1.ebuild 860 BLAKE2B 405c4ec93ccf9ecaf7e95370593cb289b792e51a4fd8f5144dd4847fcd3941088bd16eb842a2dda9cb33928bffb39e78d16234da6d94f67f4f86515671ade103 SHA512 c947ecae0691f1b93b4fda210ebfe1f1f1008a71572de9719276a3fb020e956edfed8a2ce0360f662ccfd7a62927867ad814955715a04101de7a34db58ef8d77
+EBUILD graphviz-0.19.1-r1.ebuild 896 BLAKE2B 333c4c8c91c00d41a41792be40924859ef4a8357f95c56bf817dd90601ed1ee5183c154f70a3448069a64b17fd6a661e0421ce3ff6be663dd81ae13e3641d0af SHA512 e8a1fe619f5df8c0ecb3257e97dcf73b3c6fc387c5e0b86f3604dc935d87be54b0b69b6eaa095b3dcb6cc452491a85689f7c4d73f82233f9f01f5e2bf3ca8cc6
 MISC metadata.xml 553 BLAKE2B d974f24c488a83d7c1510825d5e157644a4df70113af1283224a847d1cce2535ff4cb0633833a8671f6508fdd38c9079bc21239fdc1d1e9ac85f2ad08ea3a297 SHA512 72d2ce4887aa23136d689bf51b94f17ea3c8803464f623b0f4380381b9639a15a34858f26f129d5db2025d2ccda82dc80f22f5984ef58cffdf4dfcd7b8c51127
diff --git a/dev-python/graphviz/graphviz-0.19.1-r1.ebuild b/dev-python/graphviz/graphviz-0.19.1-r1.ebuild
index 2b0922565359..af0ea7c0cb75 100644
--- a/dev-python/graphviz/graphviz-0.19.1-r1.ebuild
+++ b/dev-python/graphviz/graphviz-0.19.1-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://graphviz.readthedocs.io/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
 
 LICENSE="MIT"
-KEYWORDS="~amd64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~riscv x86 ~amd64-linux ~x86-linux"
 SLOT="0"
 
 RDEPEND="
diff --git a/dev-python/graphviz/graphviz-0.19.1.ebuild b/dev-python/graphviz/graphviz-0.19.1.ebuild
deleted file mode 100644
index 4600484d191c..000000000000
--- a/dev-python/graphviz/graphviz-0.19.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Simple Python interface for Graphviz"
-HOMEPAGE="https://graphviz.readthedocs.io/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-
-LICENSE="MIT"
-KEYWORDS="amd64 ~riscv x86 ~amd64-linux ~x86-linux"
-SLOT="0"
-
-RDEPEND="media-gfx/graphviz"
-BDEPEND="
-	app-arch/unzip
-	test? (
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/pytest-mock-1.8[${PYTHON_USEDEP}]
-		media-gfx/graphviz[gts,pdf]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -e 's:--cov --cov-report=term --cov-report=html::' \
-		-i setup.cfg || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	"${EPYTHON}" run-tests.py -vv -ra -l -Wdefault -p no:xdoctest ||
-		die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/gst-python/Manifest b/dev-python/gst-python/Manifest
index 0b4c6b477b64..3ed293b4efe8 100644
--- a/dev-python/gst-python/Manifest
+++ b/dev-python/gst-python/Manifest
@@ -5,6 +5,6 @@ DIST gst-python-1.18.6.tar.xz 163648 BLAKE2B 2a72d323f3620b976f537d91ac579824c65
 DIST gst-python-1.20.1.tar.xz 151020 BLAKE2B 49d6730eeff90cc967e96fc1c9600f82690ff1136e46f65777d057880b239c65c6d88aa519a7558af94822f9ea57faf9b55a11c27bf9b8b567c1cea3fbbdfbf0 SHA512 16819b7b8c564af8d0cc5f3d5a64921c45523865d705d5f4580bf644aeaacf24fd1922f27c3729e8334e710d318646ee5250ac26045f863fedaf1c8481724750
 EBUILD gst-python-1.16.3.ebuild 1556 BLAKE2B 5a5f9dc90cdbc2262f226b00ee166afd8b8df17c64714694ddc73c87c96a06e537dac794a627d94a1f8874ec5adab74be1dc790e494a48b97f41c9e3134f5240 SHA512 d9663bb501c02dc98be963bb6ba6f4dc514154460084de9cb9d079da1af11daebe2b54f575461707024ed2627d6ea44f5897fb981c2463c3c8e07356fcfbd371
 EBUILD gst-python-1.18.4.ebuild 1698 BLAKE2B 0e59a331c3d541409d4cd30fd4222bd468f8931cd877d43801e90947774a5441391ed6b9e8d6750e6e45afb91108d77841251a7d0d3829f2c1164ddd7d284de3 SHA512 3255646772f025767c7e73159ccf06eb75e3421adf0f0c5bb3364f347516e4aedc230e7c35350d9588d6d8145e97d533e945d375aa5df116008047a9c7b253a8
-EBUILD gst-python-1.18.6.ebuild 1637 BLAKE2B c58fbc16ef1dce5236e8a6dbb326cac3aac4be3d85a7faf349b5984e5545ce25e420533fbbfae582f60e3dfbf9be2d80462d0d5e85fc875a8204741a27ded058 SHA512 22afc8437c0627599779f923cad9c2f0f9e6b0a04f4a244b997f7f5e9166758b7f52d82ffb40e4e64f275f154d6d1ad6dc30300030bf5f17963d916cb5e44bef
+EBUILD gst-python-1.18.6.ebuild 1631 BLAKE2B c365d5b9958e7f95f2c78e5e29b5d12589526b8e5be98c78e810872d8fe332250aed63e4e51ca25e45a9dc894c7d9151d762ec595848a064541af3eb78f9fed1 SHA512 4d82a2a5def91828763c71099eea382c407fd84d5dfc8b1c3eb76deaf5bc8563171f050d2db4fde2d830c64af94217fb489e7dfc87b0bbb97de1f1eddd23d3b4
 EBUILD gst-python-1.20.1.ebuild 1637 BLAKE2B c58fbc16ef1dce5236e8a6dbb326cac3aac4be3d85a7faf349b5984e5545ce25e420533fbbfae582f60e3dfbf9be2d80462d0d5e85fc875a8204741a27ded058 SHA512 22afc8437c0627599779f923cad9c2f0f9e6b0a04f4a244b997f7f5e9166758b7f52d82ffb40e4e64f275f154d6d1ad6dc30300030bf5f17963d916cb5e44bef
 MISC metadata.xml 267 BLAKE2B 331be70b2fa90cce1bf91ded1dac141de6a9bec40c1736bcb90d280ac7fabf22cfd0a701c7fd5864f007d1159954f7ee55701d5e68b47a1a9a217ca34b7ee619 SHA512 4dcdd6bc6d148a0e02a0f1b766bd0c5712d373d898c06078d8630e0067e858b815117392a11332b257156e95da6337494d99c2724d24cadb97432089908644b5
diff --git a/dev-python/gst-python/gst-python-1.18.6.ebuild b/dev-python/gst-python/gst-python-1.18.6.ebuild
index 5df02dbb593b..911b008ead42 100644
--- a/dev-python/gst-python/gst-python-1.18.6.ebuild
+++ b/dev-python/gst-python/gst-python-1.18.6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://gstreamer.freedesktop.org/src/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2+"
 SLOT="1.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
diff --git a/dev-python/hatchling/Manifest b/dev-python/hatchling/Manifest
new file mode 100644
index 000000000000..ac468fea20a0
--- /dev/null
+++ b/dev-python/hatchling/Manifest
@@ -0,0 +1,3 @@
+DIST hatch-hatchling-v0.22.0.tar.gz 201590 BLAKE2B c75e48a19e10f04d9bb1d09beea0ec6598bded5dc9e595f363a076731b7708bae55169ee780931b548478c16db093053c65e30a5510f7b0136c1d339caf29d39 SHA512 cc532b66752d0494b62fb4ed88c8b7870d5618c991b301f46b644aa90b656cfe842efd2fa96797a6b96015deb3468ff8ff69058bd146133360de340d367a5489
+EBUILD hatchling-0.22.0.ebuild 1691 BLAKE2B f4a997908afc327a4348f71136e9ad3ba774ed2294d44351aa41941ae8973d34e9ccb55f5118e15881d287305e1089b4f2c25376fa085d48e82171a9cca1d3d5 SHA512 5cedb82d42b3bb3a60900c7c34625e9be918bbb086dcd9e003c6a36ba3a6943378d5e08b1378571758a87608fae0c09bbae9d6a3d94a23fa54577712e6b6de7b
+MISC metadata.xml 341 BLAKE2B 94a9d7b86eadbbbe1f9ff17aba7e7df351f0368e354ea9e0d35da99099f46001c5f63e96b3d3cdea486b17f26bc2e04b309413e9aaf3aaab7386534d46ea9a3a SHA512 b844b05e46d727699a6bd5adee91734b02caf21ad537032235b4cfc3f2a2d715ac49cc713269babf18b34e2a72450668fc18f8cbb6ca950ead37b97406c5ec97
diff --git a/dev-python/hatchling/hatchling-0.22.0.ebuild b/dev-python/hatchling/hatchling-0.22.0.ebuild
new file mode 100644
index 000000000000..2129e316e6e4
--- /dev/null
+++ b/dev-python/hatchling/hatchling-0.22.0.ebuild
@@ -0,0 +1,69 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=standalone
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+TAG=${P/-/-v}
+MY_P=hatch-${TAG}
+DESCRIPTION="Modern, extensible Python build backend"
+HOMEPAGE="
+	https://pypi.org/project/hatchling/
+	https://github.com/ofek/hatch/
+"
+SRC_URI="
+	https://github.com/ofek/hatch/archive/${TAG}.tar.gz
+		-> ${MY_P}.tar.gz
+"
+S=${WORKDIR}/${MY_P}/backend
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-python/editables-0.2[${PYTHON_USEDEP}]
+	>=dev-python/packaging-21.3[${PYTHON_USEDEP}]
+	>=dev-python/pathspec-0.9[${PYTHON_USEDEP}]
+	>=dev-python/pluggy-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/tomli-1.2.2[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	${RDEPEND}
+	test? (
+		dev-python/atomicwrites[${PYTHON_USEDEP}]
+		dev-python/click[${PYTHON_USEDEP}]
+		dev-python/httpx[${PYTHON_USEDEP}]
+		dev-python/rich[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_compile() {
+	# TODO: remove this when gpep517 is the norm
+	local -x PYTHONPATH=src
+	distutils-r1_python_compile
+}
+
+python_test() {
+	local -x EPYTEST_DESELECT=(
+		# these run pip to install stuff
+		tests/backend/dep/test_core.py::test_dependency_found
+		tests/backend/dep/test_core.py::test_extra_met
+		tests/backend/dep/test_core.py::test_extra_no_dependencies
+		tests/backend/dep/test_core.py::test_extra_unmet
+		tests/backend/dep/test_core.py::test_unknown_extra
+		tests/backend/dep/test_core.py::test_version_unmet
+	)
+
+	# top-level "tests" directory contains tests both for hatch
+	# and hatchling
+	cd "${WORKDIR}/${MY_P}" || die
+	local -x PYTHONPATH="src:${PYTHONPATH}"
+	epytest -x tests/backend
+}
diff --git a/dev-python/hatchling/metadata.xml b/dev-python/hatchling/metadata.xml
new file mode 100644
index 000000000000..d4956b531605
--- /dev/null
+++ b/dev-python/hatchling/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">ofek/hatch</remote-id>
+		<remote-id type="pypi">hatchling</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/httpbin/Manifest b/dev-python/httpbin/Manifest
index 17a1f9de39b6..300ccafdb673 100644
--- a/dev-python/httpbin/Manifest
+++ b/dev-python/httpbin/Manifest
@@ -2,6 +2,5 @@ AUX httpbin-0.7.0-brotlicffi.patch 1362 BLAKE2B 524973fe131181c6601ea7b973c25e55
 AUX httpbin-0.7.0-optional-raven.patch 1218 BLAKE2B 010a13db882711af3cd74175b87371d0c9c6e279168653836ce4a445357f4ca3fbd77fc262a57de5cbfccbc4da514e1e89253595b4fdab03553ed9adffddbc57 SHA512 2feb379c4b888560f825f5fce0130999705bfe83cff190da1651ffb9842243036ecb28d1f54cc92d7a855f73b45f0cf5164df75732f4ac2c9035b583941a9560
 AUX httpbin-0.7.0-test-werkzeug.patch 1108 BLAKE2B a7118afed382eeedcfb3e8ff9a31b31fb80c01cf97f19948f9d208d77289f829d3ef24f4cbdde74cc87d2d640b61a51994292fcdf5058f94b8768fd4c37a3cc1 SHA512 3556b921a6daed3dc561d78912b41ca9a3cea1274384f849bba1d7cd7e7014798ce5c9e93491351ca5225e26762be03c73cd0d09c60c90b8a55ff6e6ce0bf81f
 DIST httpbin-0.7.0.tar.gz 92613 BLAKE2B 59252df1d4d0ef853ec65263b472d3ba6c597336d844f9b457f2d0a009048d4222f715a7f6fb120aca00fa641d1687e302036dc151bd2fd67ba98cf5fc47a63a SHA512 82e80058b58943637e9f8191764cea79bf7a6e40f36069f9b5d3f908585dbef20a03ef070d1f865d350920b6e874a93a48a544b05c14ff4911038ec2c20f6f63
-EBUILD httpbin-0.7.0-r3.ebuild 1447 BLAKE2B 23daabb436681521559ffcf07f1e7eacadfb3ec4eceec3c135606725fb036ff0025444e0202bb94ba1d9c35210eb61faf8584287865df01c47c27f7a34e555f2 SHA512 7e992cadf4038d63795bb1d78d6106a89ca396db508d52eaf376b3fd3a50ae0fb0faee8d185245c2957ec61628af5adf0d7087c169e9f7c81e8c529d1d0b123a
-EBUILD httpbin-0.7.0-r4.ebuild 1487 BLAKE2B 0eea48a0d90924df2b77f1fe34baf8273b22e4a206c41d3511707603080c6bea470f596cfb15ed6ed214ead4733256c9209ff56edc63c747f6ac41784a9aea15 SHA512 34f635860b5cc49b2e06cdc63d6fc27113b192c308ea46df5a8c69a9c526a0166312f362abf59e5a078d70a6767ad9ee39f63f9f22eb74b2662af540c5968d61
+EBUILD httpbin-0.7.0-r4.ebuild 1479 BLAKE2B 339d4a06a326d7f39384bc1f64dc2b5eec411e73936f7ef010b2f679e50e260bdc01075365c8ef44faffc5047de55622448f934fe5209fe36d74364d021b207f SHA512 3ee535b21153c5dee80734a27a86234a8ac031b31f786505787961da54dbe43bf749d32f232140f865823ebac6e10d40fdc0949d53cafd6f40903995a577c6ae
 MISC metadata.xml 394 BLAKE2B 73c2d6f27f957cfeaddc8c69cc0d7a7bf68514f1d840a982de1eaf9a62be8cf066d7b77b4b5f69fc42806979934e26d497ddf9d66d8f18dcaa32168fd83f7a0e SHA512 70c529e2d1b716a1997773f999902547010bd9406cfde38408a5941a70400e13c949f1a8fb20a53e0f0da4da91742cc259910e97cce8917dc029f3cb84d72bdd
diff --git a/dev-python/httpbin/httpbin-0.7.0-r3.ebuild b/dev-python/httpbin/httpbin-0.7.0-r3.ebuild
deleted file mode 100644
index 99f8b0295ddd..000000000000
--- a/dev-python/httpbin/httpbin-0.7.0-r3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="HTTP Request and Response Service"
-HOMEPAGE="https://github.com/postmanlabs/httpbin
-	https://pypi.org/project/httpbin/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-RDEPEND="
-	dev-python/brotlicffi[${PYTHON_USEDEP}]
-	dev-python/decorator[${PYTHON_USEDEP}]
-	dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/itsdangerous[${PYTHON_USEDEP}]
-	dev-python/markupsafe[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	>=dev-python/werkzeug-0.14.1[${PYTHON_USEDEP}]"
-
-PATCHES=(
-	# do not import raven if it's not going to be used
-	# (upstream removed it completely in git anyway)
-	"${FILESDIR}"/httpbin-0.7.0-optional-raven.patch
-	# fix tests with new versions of werkzeug
-	"${FILESDIR}"/httpbin-0.7.0-test-werkzeug.patch
-	# use brotlicffi instead of brotlipy
-	"${FILESDIR}"/httpbin-0.7.0-brotlicffi.patch
-)
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	# a new version of flask or whatever converts relative redirects
-	# to absolute; this package is dead anyway, so just skip
-	# the relevant tests
-	sed -e 's:test_redirect:_&:' \
-		-e 's:test_relative:_&:' \
-		-i test_httpbin.py || die
-
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/httpbin/httpbin-0.7.0-r4.ebuild b/dev-python/httpbin/httpbin-0.7.0-r4.ebuild
index f684abd4f2b0..df999b5429a0 100644
--- a/dev-python/httpbin/httpbin-0.7.0-r4.ebuild
+++ b/dev-python/httpbin/httpbin-0.7.0-r4.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 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 RDEPEND="
 	dev-python/brotlicffi[${PYTHON_USEDEP}]
diff --git a/dev-python/httpx/Manifest b/dev-python/httpx/Manifest
index 78ca8683cab9..6b0f554d91e6 100644
--- a/dev-python/httpx/Manifest
+++ b/dev-python/httpx/Manifest
@@ -1,3 +1,3 @@
 DIST httpx-0.22.0.gh.tar.gz 2157682 BLAKE2B bb08a7c4b72478d24264c0dca5630205ff386af73294dca66dcd12b646de602ad64e308feedaabd58742cb7a9d799fa23cd2f922e685e74f8181e1b5e9f1c4ee SHA512 a7360f5355f75f07425b42d49697e480319f3fe606d4601bb6d64b870c8a8fce6fad8bd857ef422fc48e6141201307ee94876d5bc54a68557c7dc32ce8f1451b
-EBUILD httpx-0.22.0-r1.ebuild 2347 BLAKE2B c93a7eca057f2579bae1d9527173c3a6c2ce273bc546a871a6726fa294d47d17b23e339f2cdb4aa69c3b2b398d12468c03f505835759894bf9fd2d31185a1b71 SHA512 c53027397ff0bc118f7031e5f9f481b227e3e5f4b13ec2dd05101d74b842ef5cadbaf02950f699e33e5322178111430b054544794664c33bd1a282a4c25c855c
+EBUILD httpx-0.22.0-r2.ebuild 2347 BLAKE2B cd51dfd1ddb9bed6806e5965861067b6913127140b897233b9e507c3c04036598c51b4fa957e8f9cf26fd35718176f93c3fedb7aa76c1eaacfee900250db1e9e SHA512 bf78d15e518d754eda0fba02f13e964c148881d2be6a87eef0e072156eccdfa5d6efb3e86ec35064d87b59d54e5b9583f7c1b7d77dc9d263da458ae0c66e9fba
 MISC metadata.xml 518 BLAKE2B 063b5b95529cd5a31aac83998c0acbdfef208c34e931c96ae8ee767a326301a597a8297514b5c97bef2b3b706b8938d38c0e5f5d752307a9dd06984792c799a2 SHA512 3a29dffa0f951255a67468b28917590d4108ca12e14af03bfddef80f6d48e266fcccdd991e778ab9e267c0bc76ff0017e07905c1f2f45dc440a9af89f6cae6aa
diff --git a/dev-python/httpx/httpx-0.22.0-r1.ebuild b/dev-python/httpx/httpx-0.22.0-r2.ebuild
index 638410ba75dd..b756e1bf9e56 100644
--- a/dev-python/httpx/httpx-0.22.0-r1.ebuild
+++ b/dev-python/httpx/httpx-0.22.0-r2.ebuild
@@ -33,7 +33,7 @@ RDEPEND="
 	cli? (
 		=dev-python/click-8*[${PYTHON_USEDEP}]
 		=dev-python/pygments-2*[${PYTHON_USEDEP}]
-		<dev-python/rich-12[${PYTHON_USEDEP}]
+		<dev-python/rich-13[${PYTHON_USEDEP}]
 	)
 "
 BDEPEND="
@@ -54,7 +54,7 @@ BDEPEND="
 distutils_enable_tests pytest
 
 src_prepare() {
-	sed -i -e '/rich/s:==10[.][*]:<12:' setup.py || die
+	sed -i -e '/rich/s:==10[.][*]:<13:' setup.py || die
 	if ! use cli; then
 		sed -i -e '/console_scripts/d' setup.py || die
 	fi
diff --git a/dev-python/huawei-lte-api/Manifest b/dev-python/huawei-lte-api/Manifest
index 8aad18d225e8..0dcda099046d 100644
--- a/dev-python/huawei-lte-api/Manifest
+++ b/dev-python/huawei-lte-api/Manifest
@@ -1,3 +1,5 @@
 DIST huawei-lte-api-1.5.4.tar.gz 32433 BLAKE2B 36ba5729f7016c07955f87b85745314f683345e06e174efa90e2fdfd59a8a68c8425b549f8e25293dc2d65d0681a588feb062c3067b275d4e0ed2b56dc3ebbb6 SHA512 549373bf6d00aa1fb3f9f6443446520e068ec2c5412c84472b687102b2590cd22a742805f8c7fab67b7a4482e37cb3b03900aaf078ed777c3b1c111194e69da6
+DIST huawei-lte-api-1.6.tar.gz 32617 BLAKE2B 194d2d983e7bd5bd456d3557b16795cda350ea157545c1ce37aa6d4dd0bace8a8a0c724b9d0ae4315e6f95585598b147a03acb77d84837bf879fa9b83737cafc SHA512 62f70853bba0fbd863e07e2d91309fc15c41508857486d01a02ec30ed513567d0880551744eed5a61517cc33a2f56583df892d22cca45124e95e24605ab23678
 EBUILD huawei-lte-api-1.5.4-r1.ebuild 790 BLAKE2B e988b09c36f03198b5236e4407f370c510147b64dde9a7dd9dcfb475f2f0a84dfad470c067c12138b828188a3d22ddc3ba627587eddbdc0f9fd003abf09b6092 SHA512 b5f90e135f7785acc9695379ed06033ad7dc505d4d991aa4d8a7e553676bb69873caf9b1603f43269d3eef30d4268ed3c335bafa4da3b2ed6ba8e6ed3b645158
+EBUILD huawei-lte-api-1.6.ebuild 818 BLAKE2B fc4573bd6757dd0c0cefeced0ab991d589724238e8e856bc2164eb30613ade82ff0f6ac112d73fb6022641e6d2142bca35a5d25ba5679f7108133128d7399101 SHA512 5eaf1cf40bfdaef4f65cf7cdb48707ccff950e111f715f2ddf0ba36ad31da345ddbe4cb39931c4c3cf5773de0e30b72bb81b3ab0a676aee51320f3cb9158fc4d
 MISC metadata.xml 487 BLAKE2B a4aa976286ea3cc4e02227109277faa4506f73a4b7f6c47ef9a318ae5d1c3fe61cc6eeb50ab99c0b10e5edb4ae02101d8e4d6267e7dc8f20520e9259b1d17fd2 SHA512 2ea5ccd73098a9c4d074340c9d6eb433bdaf4530d8fdb899f2a9632c097d2021d9162aa92fb9ffb54eaad2f41050d0323ddc68d0d29ec2f13060e5fe9e26f74d
diff --git a/dev-python/huawei-lte-api/huawei-lte-api-1.6.ebuild b/dev-python/huawei-lte-api/huawei-lte-api-1.6.ebuild
new file mode 100644
index 000000000000..fc365b79c31f
--- /dev/null
+++ b/dev-python/huawei-lte-api/huawei-lte-api-1.6.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="API For huawei LAN/WAN LTE Modems"
+HOMEPAGE="https://github.com/Salamek/huawei-lte-api"
+SRC_URI="https://github.com/Salamek/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-python/pycryptodome[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/xmltodict[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	# make cryptodome-friendly
+	sed -i -e 's:pycryptodomex:pycryptodome:' setup.py || die
+	find -name '*.py' -exec \
+		sed -i -e 's:Cryptodome:Crypto:g' {} + || die
+
+	distutils-r1_python_prepare_all
+}
+
+distutils_enable_tests pytest
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index a1e87f352583..198948a7042b 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -1,7 +1,17 @@
 DIST hypothesis-python-6.38.0.tar.gz 9180960 BLAKE2B a62cb0cb31cfe4ece8ee829207befb729aebf2be802c57b398547c87ecbd4769955c5c2919a0eb653d41cc3f4998c5326fdb184b6409d5fcb632c037df6a542f SHA512 2d57b783a71a905470ca088ebd91c0ea96be1bd76648d30d52b0b43914844712bbf3eaad54d66607b149a1238bb9a0258f920a6e262e54bed5cef36e3ca227e1
 DIST hypothesis-python-6.39.3.tar.gz 9182758 BLAKE2B 3641e5a9fd7e3e3e9f6432fa5bd5b8f6e4508fd840c781a65f11e8e99cee40dbd343bb17c37c60a4aabff00d5faca98a3a49b756eb754763ffc26a63a8450b38 SHA512 6dcbecdbd564aced4b0e14608a226d71adccaccfd54a3b9029f85a3e616372b7422f97029b5254bf1b08e44f74c714d65c1cb5fc21b6a0e0bdcedff2cc539ed2
 DIST hypothesis-python-6.39.4.tar.gz 9182794 BLAKE2B 16c1867e2ea4dc08d6bb31aee14ec4c8fc7c7e21e57723d69184b227c1b2081e7f03a7d1f3a4975c485cbfc6011cb832de761874bddcfef716775a5bdd933927 SHA512 100e0b591980280b8a674e0c596fee65eee0428e0f116045b65f22a3bf2c114ff7068eac0b59764bbf5dc02b67711ca105fb655b705cbba7c1932cbbfc7da670
+DIST hypothesis-python-6.39.5.tar.gz 9182972 BLAKE2B ecd92b759f574d2abed5310815c603adb2585e9a724532feea2fe1818c1693eabd3523ecda57c42b5e714684c53e80bce437156b49a7a23e5d0a87ef103d367f SHA512 da6ebb225a58b177870f9848ad44eb71af6c9a502ffa104ba023a24139b427b647c33b622063bd1c6050b5922c5a17ef0cbcff64dc85e5a9379b9503738dabd8
+DIST hypothesis-python-6.39.6.tar.gz 9183382 BLAKE2B c1112dc11d9129c7685eccac563232c978fcb470b0537e468b802ecf1f758af8dfce323514f923605662e720d0d54f525e5aac3e871407255f5f0732856748fe SHA512 985645265e9644bd2731a08ab942984fae5cb35e04e27e60450bfcf237c375dae1f2d3bf3694031a452866669ae2e19a05085ce9e35630965938c066b265595a
+DIST hypothesis-python-6.40.0.tar.gz 9184563 BLAKE2B 7087baa8eed9849e639bc1d67e77a3426702e64e31252e893a19efb1457dd3c9994ed7459084b9c88f3574b89268369ee63bc1ed8dd6f0c257c0af50dc5a3eb1 SHA512 51b062b934c90137cb55fea58c639ebdbfdae21d0af8bf951add83b36c1286f959de47442219174fe80d0a98ffbe0c53cb9cd1b3908b63742c5d7662c84518e0
+DIST hypothesis-python-6.40.1.tar.gz 9184638 BLAKE2B bc1900b5328514f1f1f5753d9370229a30108e626400fa93aebcb43d33caa6301108b277ccd8356ef944f2d54387444f67efa4e041f553e40f889b233be03ed8 SHA512 9ae09a8a337fb2d4a94b83ecc02dc5c62759ca9c9043bdd2326084413ff3106c52a654c2c7a99b22fcef28909387ef0450207d0883cf15303c84f3a7f42987d9
+DIST hypothesis-python-6.41.0.tar.gz 9186412 BLAKE2B 406cc13a7f341fa9844fe7ae7e65509e161244dec2e52d62f3177b84746562ffd09eb5aaba21f6c3fb8137bf26c7b4ea2d7064e8ef12bf59c0bbe7b99154ce13 SHA512 71884130be8a0474918172b8fd754e944831de2a6f34cf5a4f32c318820026ece8e0ab2f04ac1c9cae47329eec84c5006337556420eb523f4df57dd43dadb916
 EBUILD hypothesis-6.38.0.ebuild 1897 BLAKE2B df5374e41c08af822a7b677117abd3ec310ff3dd9d71ff5a83e4c1480acc49f9b85b0305865e4241277f69bc3861db617419ee9bf5ee26c41f60ae67a4841f1c SHA512 c5d89ebafbe4e5ad70191afebff8934983c29fa77a4b7a757a72d4f43f9fbe6577fd13bfce99e5fdf43b8537b85ed2d4dbb2d6be166923bd5a1166020236277a
 EBUILD hypothesis-6.39.3.ebuild 1905 BLAKE2B 4f6dca8600ca23fd1f938fbece6afe6a125dd2f4f625854f9797f4a073cc1661bbef5bcf8f7e23ea441f0383471124e43672f0fdb3800eec38eb518e2c824ead SHA512 eb54cb4da1e730b687d9bc09c8698000e0d7ebd1c70f0ff4557d7d789400399d4067074ebc5d1b29edcea0dda7774874d06e3ccba1b65de9dec9e220f8a6c490
 EBUILD hypothesis-6.39.4.ebuild 1946 BLAKE2B 4daef9c38314a33596d32aad67429379c9f7fd9bbaf5a10b19f1ccc5bcf2490dac7eba0e606f14d6e54039ff9a7b0827c9ca00ec3323ad2c245859b1e9486ad5 SHA512 9ef63a9cfb3d8a30da63d2e0f61989597b96093c6324c94d03881a1ac93dd0d83c9f6db57acf2d00344bed30596fc9d2a5fa4e7ee8ebba40d2f925287aa8f20e
+EBUILD hypothesis-6.39.5.ebuild 1946 BLAKE2B 4daef9c38314a33596d32aad67429379c9f7fd9bbaf5a10b19f1ccc5bcf2490dac7eba0e606f14d6e54039ff9a7b0827c9ca00ec3323ad2c245859b1e9486ad5 SHA512 9ef63a9cfb3d8a30da63d2e0f61989597b96093c6324c94d03881a1ac93dd0d83c9f6db57acf2d00344bed30596fc9d2a5fa4e7ee8ebba40d2f925287aa8f20e
+EBUILD hypothesis-6.39.6.ebuild 1946 BLAKE2B 4daef9c38314a33596d32aad67429379c9f7fd9bbaf5a10b19f1ccc5bcf2490dac7eba0e606f14d6e54039ff9a7b0827c9ca00ec3323ad2c245859b1e9486ad5 SHA512 9ef63a9cfb3d8a30da63d2e0f61989597b96093c6324c94d03881a1ac93dd0d83c9f6db57acf2d00344bed30596fc9d2a5fa4e7ee8ebba40d2f925287aa8f20e
+EBUILD hypothesis-6.40.0.ebuild 1946 BLAKE2B 4daef9c38314a33596d32aad67429379c9f7fd9bbaf5a10b19f1ccc5bcf2490dac7eba0e606f14d6e54039ff9a7b0827c9ca00ec3323ad2c245859b1e9486ad5 SHA512 9ef63a9cfb3d8a30da63d2e0f61989597b96093c6324c94d03881a1ac93dd0d83c9f6db57acf2d00344bed30596fc9d2a5fa4e7ee8ebba40d2f925287aa8f20e
+EBUILD hypothesis-6.40.1.ebuild 1946 BLAKE2B 4daef9c38314a33596d32aad67429379c9f7fd9bbaf5a10b19f1ccc5bcf2490dac7eba0e606f14d6e54039ff9a7b0827c9ca00ec3323ad2c245859b1e9486ad5 SHA512 9ef63a9cfb3d8a30da63d2e0f61989597b96093c6324c94d03881a1ac93dd0d83c9f6db57acf2d00344bed30596fc9d2a5fa4e7ee8ebba40d2f925287aa8f20e
+EBUILD hypothesis-6.41.0.ebuild 1946 BLAKE2B 4daef9c38314a33596d32aad67429379c9f7fd9bbaf5a10b19f1ccc5bcf2490dac7eba0e606f14d6e54039ff9a7b0827c9ca00ec3323ad2c245859b1e9486ad5 SHA512 9ef63a9cfb3d8a30da63d2e0f61989597b96093c6324c94d03881a1ac93dd0d83c9f6db57acf2d00344bed30596fc9d2a5fa4e7ee8ebba40d2f925287aa8f20e
 MISC metadata.xml 756 BLAKE2B 26e40ab96ddcbd5751023e3c0cc9aa86e96d73ba02bca750ad15eb4301beb0318d3d694c54c2c2a2cb50937731af727411e8afb67e1a21e58e0ff611eeea9149 SHA512 cd48d35c5fe41aa9efcfea9eb7b2d78a4646658b5aab7533ca6492d4700032099fd34ca2dc45a6198c27351650c9e901c8b7c4d53ade2b56695d5e26ca371238
diff --git a/dev-python/hypothesis/hypothesis-6.39.5.ebuild b/dev-python/hypothesis/hypothesis-6.39.5.ebuild
new file mode 100644
index 000000000000..1bf4b6813bee
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-6.39.5.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_REQ_USE="threads(+),sqlite"
+
+inherit distutils-r1 multiprocessing optfeature
+
+DESCRIPTION="A library for property based testing"
+HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
+SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar.gz"
+S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+IUSE="cli"
+
+RDEPEND="
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
+	cli? (
+		$(python_gen_cond_dep '
+			dev-python/black[${PYTHON_USEDEP}]
+			dev-python/click[${PYTHON_USEDEP}]
+		' python3_{8..10})
+	)
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		!!<dev-python/typing-3.7.4.1
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	# subtests are broken by warnings from random plugins
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=xdist.plugin,pytest_forked,_hypothesis_pytestplugin
+
+	epytest tests/cover tests/pytest tests/quality \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+}
+
+python_install() {
+	distutils-r1_python_install
+	if ! use cli || ! has "${EPYTHON}" python3.{8..10}; then
+		rm -r "${ED}/usr/bin" "${D}$(python_get_scriptdir)" || die
+	fi
+}
+
+pkg_postinst() {
+	optfeature "datetime support" dev-python/pytz
+	optfeature "dateutil support" dev-python/python-dateutil
+	optfeature "numpy support" dev-python/numpy
+	optfeature "django support" dev-python/django dev-python/pytz
+	optfeature "pandas support" dev-python/pandas
+	optfeature "pytest support" dev-python/pytest
+}
diff --git a/dev-python/hypothesis/hypothesis-6.39.6.ebuild b/dev-python/hypothesis/hypothesis-6.39.6.ebuild
new file mode 100644
index 000000000000..1bf4b6813bee
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-6.39.6.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_REQ_USE="threads(+),sqlite"
+
+inherit distutils-r1 multiprocessing optfeature
+
+DESCRIPTION="A library for property based testing"
+HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
+SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar.gz"
+S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+IUSE="cli"
+
+RDEPEND="
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
+	cli? (
+		$(python_gen_cond_dep '
+			dev-python/black[${PYTHON_USEDEP}]
+			dev-python/click[${PYTHON_USEDEP}]
+		' python3_{8..10})
+	)
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		!!<dev-python/typing-3.7.4.1
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	# subtests are broken by warnings from random plugins
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=xdist.plugin,pytest_forked,_hypothesis_pytestplugin
+
+	epytest tests/cover tests/pytest tests/quality \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+}
+
+python_install() {
+	distutils-r1_python_install
+	if ! use cli || ! has "${EPYTHON}" python3.{8..10}; then
+		rm -r "${ED}/usr/bin" "${D}$(python_get_scriptdir)" || die
+	fi
+}
+
+pkg_postinst() {
+	optfeature "datetime support" dev-python/pytz
+	optfeature "dateutil support" dev-python/python-dateutil
+	optfeature "numpy support" dev-python/numpy
+	optfeature "django support" dev-python/django dev-python/pytz
+	optfeature "pandas support" dev-python/pandas
+	optfeature "pytest support" dev-python/pytest
+}
diff --git a/dev-python/hypothesis/hypothesis-6.40.0.ebuild b/dev-python/hypothesis/hypothesis-6.40.0.ebuild
new file mode 100644
index 000000000000..1bf4b6813bee
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-6.40.0.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_REQ_USE="threads(+),sqlite"
+
+inherit distutils-r1 multiprocessing optfeature
+
+DESCRIPTION="A library for property based testing"
+HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
+SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar.gz"
+S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+IUSE="cli"
+
+RDEPEND="
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
+	cli? (
+		$(python_gen_cond_dep '
+			dev-python/black[${PYTHON_USEDEP}]
+			dev-python/click[${PYTHON_USEDEP}]
+		' python3_{8..10})
+	)
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		!!<dev-python/typing-3.7.4.1
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	# subtests are broken by warnings from random plugins
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=xdist.plugin,pytest_forked,_hypothesis_pytestplugin
+
+	epytest tests/cover tests/pytest tests/quality \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+}
+
+python_install() {
+	distutils-r1_python_install
+	if ! use cli || ! has "${EPYTHON}" python3.{8..10}; then
+		rm -r "${ED}/usr/bin" "${D}$(python_get_scriptdir)" || die
+	fi
+}
+
+pkg_postinst() {
+	optfeature "datetime support" dev-python/pytz
+	optfeature "dateutil support" dev-python/python-dateutil
+	optfeature "numpy support" dev-python/numpy
+	optfeature "django support" dev-python/django dev-python/pytz
+	optfeature "pandas support" dev-python/pandas
+	optfeature "pytest support" dev-python/pytest
+}
diff --git a/dev-python/hypothesis/hypothesis-6.40.1.ebuild b/dev-python/hypothesis/hypothesis-6.40.1.ebuild
new file mode 100644
index 000000000000..1bf4b6813bee
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-6.40.1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_REQ_USE="threads(+),sqlite"
+
+inherit distutils-r1 multiprocessing optfeature
+
+DESCRIPTION="A library for property based testing"
+HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
+SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar.gz"
+S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+IUSE="cli"
+
+RDEPEND="
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
+	cli? (
+		$(python_gen_cond_dep '
+			dev-python/black[${PYTHON_USEDEP}]
+			dev-python/click[${PYTHON_USEDEP}]
+		' python3_{8..10})
+	)
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		!!<dev-python/typing-3.7.4.1
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	# subtests are broken by warnings from random plugins
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=xdist.plugin,pytest_forked,_hypothesis_pytestplugin
+
+	epytest tests/cover tests/pytest tests/quality \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+}
+
+python_install() {
+	distutils-r1_python_install
+	if ! use cli || ! has "${EPYTHON}" python3.{8..10}; then
+		rm -r "${ED}/usr/bin" "${D}$(python_get_scriptdir)" || die
+	fi
+}
+
+pkg_postinst() {
+	optfeature "datetime support" dev-python/pytz
+	optfeature "dateutil support" dev-python/python-dateutil
+	optfeature "numpy support" dev-python/numpy
+	optfeature "django support" dev-python/django dev-python/pytz
+	optfeature "pandas support" dev-python/pandas
+	optfeature "pytest support" dev-python/pytest
+}
diff --git a/dev-python/hypothesis/hypothesis-6.41.0.ebuild b/dev-python/hypothesis/hypothesis-6.41.0.ebuild
new file mode 100644
index 000000000000..1bf4b6813bee
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-6.41.0.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_REQ_USE="threads(+),sqlite"
+
+inherit distutils-r1 multiprocessing optfeature
+
+DESCRIPTION="A library for property based testing"
+HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
+SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar.gz"
+S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+IUSE="cli"
+
+RDEPEND="
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
+	cli? (
+		$(python_gen_cond_dep '
+			dev-python/black[${PYTHON_USEDEP}]
+			dev-python/click[${PYTHON_USEDEP}]
+		' python3_{8..10})
+	)
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		!!<dev-python/typing-3.7.4.1
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	# subtests are broken by warnings from random plugins
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=xdist.plugin,pytest_forked,_hypothesis_pytestplugin
+
+	epytest tests/cover tests/pytest tests/quality \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+}
+
+python_install() {
+	distutils-r1_python_install
+	if ! use cli || ! has "${EPYTHON}" python3.{8..10}; then
+		rm -r "${ED}/usr/bin" "${D}$(python_get_scriptdir)" || die
+	fi
+}
+
+pkg_postinst() {
+	optfeature "datetime support" dev-python/pytz
+	optfeature "dateutil support" dev-python/python-dateutil
+	optfeature "numpy support" dev-python/numpy
+	optfeature "django support" dev-python/django dev-python/pytz
+	optfeature "pandas support" dev-python/pandas
+	optfeature "pytest support" dev-python/pytest
+}
diff --git a/dev-python/iminuit/Manifest b/dev-python/iminuit/Manifest
index 799c6a3e6ebf..4e86bae717cb 100644
--- a/dev-python/iminuit/Manifest
+++ b/dev-python/iminuit/Manifest
@@ -1,6 +1,8 @@
 DIST iminuit-2.10.0.tar.gz 408625 BLAKE2B 8876f4e94958a9154d517b91859d0c3a58ea919d53271f372eb4f648157567cf39e6639f5cdee7e137bb5a3011eadcfc28b52e3ba87333b2d7dafb0f8b58a7f1 SHA512 0f40a7f775ff814004d6fd5b331887eef2c9d389462b2c3585eca7568cd4babe5f83c85a002c6b47f047008a3ffc0a9e2c6f29cdc4acaf3d4c7208637a16d1e8
+DIST iminuit-2.11.2.tar.gz 411984 BLAKE2B 8fa47b24890f26718ebb8f053c2f908d982a7b6cc7f71f6523f387128ab0bd894bb851f18e2f8611ff5ab1c113651f526893445f465fbbfa10d487dc15effcbd SHA512 b60755f21ae38bd19860e0d711bab9c6e37dd361cc8cf43bdd1a583e8c06abca38e42ae0a6c4631be05c5082c9ab169bddb51e4d84397ce8f81833fd4c46cdd7
 DIST iminuit-2.9.0.tar.gz 408294 BLAKE2B d924d5ca5bef0e5b2dbc1fcfc12daab196c6937feff1badd73f9f8f20601989b21673165e758df7dabe072cb4a14cbda12823cfaf30fa5687de4184238465c50 SHA512 55d1d855b23862a4205b6c12ff53ddc088739945523670f3959edfe859abdbd3600da78cc219af6ed792156e2da7d8ae844e76e49ac759af433af875eab26714
 EBUILD iminuit-2.10.0.ebuild 905 BLAKE2B 2479a6ab793907917ba57ab1aab34e4701e53001450c1e2e3f3aa68eea555adb0650ecea26aa5ddb3ae12787ec6d32caba93af6dd44918f93353ba9029fb6fc1 SHA512 82e97833ccd58ca8675a2d6f06848d960c0797c0ec18e3a26880d473d49f0e99be1e6417888171178f4f0f9dc711eeede872b1294234be6bb5dfeb1bc9b7295a
+EBUILD iminuit-2.11.2.ebuild 905 BLAKE2B 2479a6ab793907917ba57ab1aab34e4701e53001450c1e2e3f3aa68eea555adb0650ecea26aa5ddb3ae12787ec6d32caba93af6dd44918f93353ba9029fb6fc1 SHA512 82e97833ccd58ca8675a2d6f06848d960c0797c0ec18e3a26880d473d49f0e99be1e6417888171178f4f0f9dc711eeede872b1294234be6bb5dfeb1bc9b7295a
 EBUILD iminuit-2.9.0-r1.ebuild 905 BLAKE2B 2479a6ab793907917ba57ab1aab34e4701e53001450c1e2e3f3aa68eea555adb0650ecea26aa5ddb3ae12787ec6d32caba93af6dd44918f93353ba9029fb6fc1 SHA512 82e97833ccd58ca8675a2d6f06848d960c0797c0ec18e3a26880d473d49f0e99be1e6417888171178f4f0f9dc711eeede872b1294234be6bb5dfeb1bc9b7295a
 EBUILD iminuit-2.9.0.ebuild 791 BLAKE2B 4ad5fa85546390f0ba4d56492ae8e5862fe0c980374bbf5c03342ef5e715be1e30e5640c85d2fa1085a03c7db906aaa823a6ad6c3a2b369f7d04f0ab02731fb2 SHA512 471a3c46bc369b9b6bc9e88aa713e6feb6f3a0d84806448b8802cac7e3a7b34633fae8e95d45d49e03cdf62f990787b161299fb8b5305ef841488a5e7e2e5845
 MISC metadata.xml 494 BLAKE2B c97d7fad530773c29b5e723843f13c8305aa1f011e678ad4e9625181ca633c1dfaa3847cb7b3aa09433b6ce665cbf4eb39fde7f80ead402292bc75bb8442beba SHA512 04413a2cbdc7f6843f89560a519ccdb00bcfcf0c9254e9fff7a8901ed992cd7121ba052191399fd60f76f35e495f84c2297acd0a9a1898d4fbcadb7a60841d99
diff --git a/dev-python/iminuit/iminuit-2.11.2.ebuild b/dev-python/iminuit/iminuit-2.11.2.ebuild
new file mode 100644
index 000000000000..3a700725da54
--- /dev/null
+++ b/dev-python/iminuit/iminuit-2.11.2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+# forced implicitly
+CMAKE_MAKEFILE_GENERATOR=emake
+inherit cmake distutils-r1 virtualx
+
+DESCRIPTION="Minuit numerical function minimization in Python"
+HOMEPAGE="https://github.com/scikit-hep/iminuit/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT LGPL-2.1"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	dev-python/numpy[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	test? (
+		dev-python/ipython[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		dev-python/scipy[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	epytest -p no:pytest-describe || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/immutables/Manifest b/dev-python/immutables/Manifest
index 729a9ec24ab2..d3bc6d209f72 100644
--- a/dev-python/immutables/Manifest
+++ b/dev-python/immutables/Manifest
@@ -1,3 +1,5 @@
 DIST immutables-0.16.tar.gz 84916 BLAKE2B e699aaa1135fa9f7db9589276dc0801a67c5f98bd3c5b247913d8263f9baf02a8772d7715cc3eb2c9392694d48d3808d50f45e9fe8e66c4d507586d0e3fdc319 SHA512 5b883cfe43f8a042b617e719dccd3cbdded3b1d1df160ba26b6bb2f0816a7171698bdd2ba3d450e76f135b236e777052a22c09b8bd1a9183227f1ccc90617cf8
-EBUILD immutables-0.16.ebuild 802 BLAKE2B b1fa66cd9b5505adca97738b3bcb91e7fce2dbd6054b03a27ae45448888616125b56a8339040a6c4271b4c0cbbcb38281cbc17e6f9cb87fc605eab60a50d5a5a SHA512 c5648301f7b7531c070f57df71d95b79753681ce6b32fd89daa0560a63102ca06c2d19e28576c28a8ab6bb9df757826bd42ea7a2159d647193965525f0272a12
+DIST immutables-0.17.gh.tar.gz 84660 BLAKE2B 475042d6342e3ffe5b4aa68e2e8c27a438658214ec2aa6439e077d59d2e2257313f644f535ebfbdb171b0e7dac33cde590f8a84a8da9da717b249e5b2e11ca92 SHA512 d5853de6b7c6064c93b6dbf66819873c982dd2e155ddcbf6b5dd321475374e9f52eb683c853a6944c71ca15fb194ac9480ad2d444407c885ee574c244c4f081a
+EBUILD immutables-0.16.ebuild 808 BLAKE2B e44502bc80f8b03f2028fd527b99691634b2a46162d6985bbf472097155e4720909a508a8e9ba69d0b16cabd36cf28bbe1bc2e52d40c7635b27164915245244d SHA512 a2503b67bbb2d585c91f5aec43d5d984df29db6fd240e501db473b3416d676ef3c83a0eb1f59b5935ca110e5be975b17643a99a639bf61fb3059601d76d1d816
+EBUILD immutables-0.17.ebuild 738 BLAKE2B af9952ad6f1c59b5d3062a18f803e9208ee4ac13dab705566fda5b4ac6f3debfc87f81874d348dfcdbe709a693da500feef9c163c638c98dfac412dffd9b68c2 SHA512 caf06ed9a9fb2a9a8db201662a81e3e7808dc158e34172061bfb8201b6e12e592a0d9c314fd8d6627a6f24ada4302e70b0d936847b0cc04738551863a6c5735a
 MISC metadata.xml 353 BLAKE2B 5ba3a63b6d65aa989535ec78a5e097fb15e6bcb392e846471fb01efd4a4b546a3ba861cc3829d13e71f1f5c31b582a99e1f5e4adf6b60c2b6fb17bdfb9265c99 SHA512 ede81f3aec8f6ee374c8d39d60f4193cfb701f2561858f2ddfadbe68d531849cec13fb8c13cc671e14d8ab1f18b08759d030c562cc496f959517c6ce67ac9781
diff --git a/dev-python/immutables/immutables-0.16.ebuild b/dev-python/immutables/immutables-0.16.ebuild
index 0fba54b02046..bff5d2a27f79 100644
--- a/dev-python/immutables/immutables-0.16.ebuild
+++ b/dev-python/immutables/immutables-0.16.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="A high-performance immutable mapping type for Python"
diff --git a/dev-python/immutables/immutables-0.17.ebuild b/dev-python/immutables/immutables-0.17.ebuild
new file mode 100644
index 000000000000..02ca6370a27a
--- /dev/null
+++ b/dev-python/immutables/immutables-0.17.ebuild
@@ -0,0 +1,32 @@
+# Copyright 2019-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 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}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/mypy/d' tests/conftest.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	cd "${T}" || die
+	epytest "${S}"/tests --ignore "${S}"/tests/test_mypy.py
+}
diff --git a/dev-python/importlib_metadata/Manifest b/dev-python/importlib_metadata/Manifest
index 644dcd8b2e9f..5ba60644bea1 100644
--- a/dev-python/importlib_metadata/Manifest
+++ b/dev-python/importlib_metadata/Manifest
@@ -1,5 +1,5 @@
 DIST importlib_metadata-4.11.2.tar.gz 43293 BLAKE2B ea515da66eed404d7d6bdf09fc3ade31c34a48656a6e37219c2d86eed3004ef2c82dc80f916de54b45e4b462a3b142d40b8e2ee959614e9be011844ba12eb3fc SHA512 114a8078b15905a898d63934f208d6409ec043cd5ac35f9455f532956fb7e5262df26aadcd8618ca8b2baf69333147a15d456fdb0d8e50163aecedfccb6003d9
 DIST importlib_metadata-4.11.3.tar.gz 43607 BLAKE2B 661f8ce68869540995dbee39c6be07d7b88e8339267d4d49744691f2347ab2bcc9ac33c4cafd6caed5fa9ce3d4a3640a816e4659eee9a59b5ccc1df2edd2f6aa SHA512 d33efa2abba5f6f770615f133c940a61948ce5091d59526ee2c7e3866aebd74d79ac464f72602404c2b56fe284a93a9cd1b0cac251ceea53666019485bdddf23
 EBUILD importlib_metadata-4.11.2.ebuild 1467 BLAKE2B 5ff1523d641eeb12c1188d2da0c267968d03e73767f0cb5647147445cdcbb35d51e9b330b20d3f6d64e46ff3fe5d062614b5825c009bd2c22765054242ca3260 SHA512 0202201ab7a8be0cf1c8cc34c35e5b95e44792bc979efb9d07fabdec08b2a9810c9ab48b9accc1d8cdc20a64e605cb92a0c29f568542d2f9942c55a0906056f0
-EBUILD importlib_metadata-4.11.3.ebuild 1475 BLAKE2B f6ef6dd43a4314a8025de3369eb24ad5570aceeb3cfd6a86a0a20e24f47b7d5d23955037e2c3903d04a444584e1bc4fd93161fb39705eab879486c9336b2df6a SHA512 227ed3d264ca9372d522535fba49b7b942a94ba2eca1735d64de22d28e196e4dc1a04c02b313364103de1380b9603529bd18b1b1df2ffa1879ef93937b62d80c
+EBUILD importlib_metadata-4.11.3.ebuild 1568 BLAKE2B bf112d58a247f33c6322a09bc9b5f0e8ccf6f88197b5a4ab79af686aa66c37245001798be4c16fd0219e048804ffa012ede5edc7346e25d0751b0f43dd2d1601 SHA512 47f19d733a155f81b9591b04e763340b427f3640584ac7d3199a002328526a27049f9fd24d66e2ff22d6576c25c86eb268692e1f62bf10aa7d1a110c7b7fbf9b
 MISC metadata.xml 646 BLAKE2B c3f9ff98b5090d22a37a5a5b36b6c8523b4d1ee804c05c880bffe6a45ee482023d4c037b49332bfa93cb60cc5892d1178b486cf1d2e0d4c44d7da8d292e406d5 SHA512 e558c5ae62e98685a43bfafbff6fc5d5339965a9bf8c6bf0bd8cd5b542c94ae6ecaf0a04e5210b211a32abb65b37c5db6af64dc7d74ae79ec31075fcc659c9f4
diff --git a/dev-python/importlib_metadata/importlib_metadata-4.11.3.ebuild b/dev-python/importlib_metadata/importlib_metadata-4.11.3.ebuild
index 4a5821a20865..8d86215cd48f 100644
--- a/dev-python/importlib_metadata/importlib_metadata-4.11.3.ebuild
+++ b/dev-python/importlib_metadata/importlib_metadata-4.11.3.ebuild
@@ -17,7 +17,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 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	dev-python/zipp[${PYTHON_USEDEP}]
diff --git a/dev-python/importlib_resources/Manifest b/dev-python/importlib_resources/Manifest
index 07d72d62f596..1f09ff757693 100644
--- a/dev-python/importlib_resources/Manifest
+++ b/dev-python/importlib_resources/Manifest
@@ -1,3 +1,5 @@
 DIST importlib_resources-5.4.0.tar.gz 30554 BLAKE2B f5be47cb63813aea15f65d251115cf398f695041871fdf6e8885fee11d9a9d7a2fbfd07efd494bd7c91077f99ab871e06d45f49de9f7e501a1691601206bfb55 SHA512 9262c185bdf79fad0a11caabc5c5df836702a74e140a9f60ace857e3f6a60fdb091639b2fb7129b17bad5a46968f43dda7d176fe39af495370dd31f04891fb1b
-EBUILD importlib_resources-5.4.0-r3.ebuild 1263 BLAKE2B cc9fe735356485a558359d02179da0933cd0b1eb29e9b8c673cdb0414dddcfc4869e870b3e2e4ab9dad5a481b4340df8ee1ea0b637ceb4df2bd6cdaea7ddf437 SHA512 b466aa4cee49a552bd65e85b5add38a41648a7fc0df3c31b18b20a70644df0e5653dde765c80bab379f5e99b7f8f713c902ab6f0d3b2ef98c7a854b43854887d
+DIST importlib_resources-5.6.0.tar.gz 30846 BLAKE2B 9a83554cd65b7851c4a8c977509f3fc255de3c5927661764e702eeae142b7d0cc75f809fe2a438b6f3acdb2facbdc3dadbf3f9dfed5615643dc15e04545dcf8c SHA512 d3c88dd5f1877b205b4c53ab9c8d4180ae87be0ff9dd11483024de40c84fe7da359f70337aeacc5df3b6deca88b903bb01850da8a54fd057e4174806ae767deb
+EBUILD importlib_resources-5.4.0-r3.ebuild 1356 BLAKE2B bcd93a64fea459fa5a31cfd0c58725dd57ac7d8c2997d0546ebff6127f6eed5957de915adc0acd8eaee1493324210fe1a04a4c9d854299f9d3f814895bbf7b9b SHA512 edc37725b572e6812b89489c8d8f731eafa47896f0aa79237b6510e5e08227d32ca6e6e80e12607667e25dff141a0943a96481c977d4cfab4c2c82275cfe4b7d
+EBUILD importlib_resources-5.6.0.ebuild 1259 BLAKE2B de740e96002e512e8478b57a40415a58fbe0fc3c0f77b910b7087751ccdd7618fcad1c9cd87016e83f6b4d196dd548aa5b28b545d0f672253c02742373f1cf51 SHA512 78edbe5e74dd8e1952b293aeff9f036b2ec1aa1d8181840bc22f359426c03f5d18906147d40c015e54e3cfb03c6c6d99d94a07bf67ae76d855716a1bb0fc07fd
 MISC metadata.xml 945 BLAKE2B 130dc56a13a8416168baf91e804e1fdef0d65978641c3fca5eb663b8accb5b1adc066bc4033751f03a9c729e27d0448925a7b623431922056fb7d282db052734 SHA512 ccb23df48a89f69133469722fb37acf516127b207b946cdea240cf82e2ba5422ee4e2166d1a9419031408a7624a52256e322fe7e478a9a7b8214ab4bc5c9b92b
diff --git a/dev-python/importlib_resources/importlib_resources-5.4.0-r3.ebuild b/dev-python/importlib_resources/importlib_resources-5.4.0-r3.ebuild
index 9852a5a01ffc..8d55ed4b701a 100644
--- a/dev-python/importlib_resources/importlib_resources-5.4.0-r3.ebuild
+++ b/dev-python/importlib_resources/importlib_resources-5.4.0-r3.ebuild
@@ -16,7 +16,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 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-python/importlib_resources/importlib_resources-5.6.0.ebuild b/dev-python/importlib_resources/importlib_resources-5.6.0.ebuild
new file mode 100644
index 000000000000..31f3ce7d8000
--- /dev/null
+++ b/dev-python/importlib_resources/importlib_resources-5.6.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
+EAPI=7
+
+DISTUTILS_USE_PEP517=flit
+# 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 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		>=dev-python/zipp-3.7.0-r1[${PYTHON_USEDEP}]
+	' 3.8 3.9)"
+
+distutils_enable_tests unittest
+distutils_enable_sphinx docs dev-python/rst-linker dev-python/jaraco-packaging
+
+src_configure() {
+	grep -q 'build-backend = "setuptools' pyproject.toml ||
+		die "Upstream changed build-backend, recheck"
+	# write a custom pyproject.toml to ease setuptools bootstrap
+	cat > pyproject.toml <<-EOF || die
+		[build-system]
+		requires = ["flit_core >=3.2,<4"]
+		build-backend = "flit_core.buildapi"
+
+		[project]
+		name = "importlib_resources"
+		version = "${PV}"
+		description = "Read resources from Python packages"
+	EOF
+}
diff --git a/dev-python/inflect/Manifest b/dev-python/inflect/Manifest
index c2c519062f46..bef2bbee4e40 100644
--- a/dev-python/inflect/Manifest
+++ b/dev-python/inflect/Manifest
@@ -1,3 +1,5 @@
 DIST inflect-5.4.0.tar.gz 68594 BLAKE2B 60898e019c04b9d86a1591c341f48e7e3093eaa4f93bb4f902f4d405f1151d705f902b792028ca97a85ed47ffe509bab758b3ec74878ec82f5dac3c953197ca0 SHA512 48b7d38faf41b3f682226b66ea5493b7d4ff58a8db52c9b90092fc329aee761b090791deeda24234b9f9fa47d8db9b499e1f4304367ef3637c441959e8b8d005
+DIST inflect-5.5.2.tar.gz 68843 BLAKE2B 60bfeedc6a106b5b2715aebe158670fe18c097f7b28a353b6225d71366723113ff247fc9d23d5e740385811dfa335f1c67fa1497712854e3140ff3b0a150459a SHA512 836ae6ec8dd450d6ffca5e69ac1b4889c631fa0caf9326716b571a56aec9feace33894a35cd87a56dadd7ecdd2586cde12345a6b06368ef485ef9ce2b117d137
 EBUILD inflect-5.4.0.ebuild 690 BLAKE2B 905ffa487fd40ac991687bde1991f21bc3af6b240ebdd6fcced4e19280354facce3e1b78e72ad292110c981e9e237f6197061c927854963b16c1e1c5f025b3b1 SHA512 4ca033179255a49e010ca3fc2f3d21dc24626deff10f0ddcab5a334c25c8f02b08486df8f12a1f8426c17b748283d7635d24e2247441fafff7c1508778b0429c
+EBUILD inflect-5.5.2.ebuild 743 BLAKE2B 2ed33430e6b7c453fd583cfe7d5ac8f17aa7ba85ae22514b61a7719d503ec9bb5e76e5a5d91a829bb65a18ba875af9d7a04cbd353e5dc7af955e4337b9fcbc8c SHA512 2b18415a3cb9710c2168083b1167302fc76a90309a1fb9446c42ea5e712c9ec3344d27555b04949925b72c39d7b8cd3b7c7a0a5dd070e7989f9482cf95c0e758
 MISC metadata.xml 557 BLAKE2B 1a327bb3ea2f7ecb0b3100d9f443c9c0c20a89f1e560eac79cef20a6f12855355dab9c71bab94881774e2be6fc2b4bd9530e1155caecdf687228db259ed34bba SHA512 d719ba7da2f6544cada37998dbc6b104cebb6419ab65bd164411928953c5898da2f5f2f789b72d41f7b46ee7a5570fc6646d331e0df39b34c1fa0685fb9165ab
diff --git a/dev-python/inflect/inflect-5.5.2.ebuild b/dev-python/inflect/inflect-5.5.2.ebuild
new file mode 100644
index 000000000000..e399f735ad98
--- /dev/null
+++ b/dev-python/inflect/inflect-5.5.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Correctly inflect words and numbers"
+HOMEPAGE="
+	https://pypi.org/project/inflect/
+	https://github.com/jaraco/inflect/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+BDEPEND="
+	>=dev-python/setuptools_scm-3.4.1[${PYTHON_USEDEP}]
+"
+
+distutils_enable_sphinx docs \
+	'>=dev-python/jaraco-packaging-8.2' \
+	'>=dev-python/rst-linker-1.9' \
+	dev-python/alabaster
+distutils_enable_tests pytest
diff --git a/dev-python/ini2toml/Manifest b/dev-python/ini2toml/Manifest
new file mode 100644
index 000000000000..dfc04af6a83d
--- /dev/null
+++ b/dev-python/ini2toml/Manifest
@@ -0,0 +1,4 @@
+AUX ini2toml-0.10-test.patch 1883 BLAKE2B 88402feed5aa7e51587f7297b8c3afa058d04e0f878acf1a6af5dfab77cb50d0c5708cfe9e1a45d704f7fbaca068cf9f3d0838bdcb6e1aa3145129f6239180c9 SHA512 1df613aa1e793716e4b0e7a83b3f15bb69f7abd5c43831e0d09dd4ec42ee8ed617586188bfb9bfc6863f93f4cdeb0114226e9da44c8b3a73b04705f7c9139c87
+DIST ini2toml-0.10.gh.tar.gz 93535 BLAKE2B 8d8a5b31c53b9194e578b473dfd562b1b569d701b36b267ec4f59ea75ec03abd6e1df5541327b9414a2f1c04b1cb41ec57c6f900007f69a3c51a172143d2eacd SHA512 3d88f97c50a13fe3878e3fa35d70c9051874bec99d278411dcc7098d86898deb0e490be26f293e9a304d4c9a2842274e68126a2d20dac77b526161fde682dd75
+EBUILD ini2toml-0.10.ebuild 1694 BLAKE2B e2393f284853fb5577642854c77ec5f45224a40095e468b7c2d09893d4775d37473aa903e50dba701946897f97273c8a10dd96804e0702418e310ab31beb7f65 SHA512 9f08476fe9e7f5ed3cb22a2c2e4e4f4e46c1374fbb983f345e2030c7be18c737ac6e185dc995a46b429b93873c8f11dfb93926c93ef3253a9195e6d126078adb
+MISC metadata.xml 373 BLAKE2B 589d20ff2e2db3152d2d107842ed6627f4fabfaaa0a5ee2981fd8cb23429caf40cf1b8894bbb720a9ed83e690623acd3d7f7bdb1be5e45328dfe0627b6125389 SHA512 6f99f7a92a6095308ed4c9817418c11b8f9017d15017908af7c42962b4a3591768415239df700fccd7a46d5c3b0e03538fef43f8858bbbbc5a87b2c1bfaffced
diff --git a/dev-python/ini2toml/files/ini2toml-0.10-test.patch b/dev-python/ini2toml/files/ini2toml-0.10-test.patch
new file mode 100644
index 000000000000..bd1d8b093a33
--- /dev/null
+++ b/dev-python/ini2toml/files/ini2toml-0.10-test.patch
@@ -0,0 +1,39 @@
+From 1a40d273d6671657ef10081123a675bd22e4bf06 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Sat, 2 Apr 2022 18:21:39 +0200
+Subject: [PATCH] Support duplicate plugin instances in
+ test_list_from_entry_points
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Account for the possibility of the isort plugin occurring more than
+once in the plugin list, in test_list_from_entry_points.  This is needed
+to avoid test failures on Gentoo where tests are run in a venv
+with --system-site-packages.  As a result, if ini2toml is installed
+already, it grabs all plugins twice — once from the venv, and then again
+from system site-packages directory.
+---
+ AUTHORS.rst           | 1 +
+ tests/test_plugins.py | 3 ++-
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/tests/test_plugins.py b/tests/test_plugins.py
+index a1e96eb..9b52432 100644
+--- a/tests/test_plugins.py
++++ b/tests/test_plugins.py
+@@ -46,6 +46,7 @@ def test_list_from_entry_points():
+     # Should return a list with all the plugins registered in the entrypoints
+     pluging_list = plugins.list_from_entry_points()
+     orig_len = len(pluging_list)
++    isort_count = len([e for e in pluging_list if "isort" in str(e.__module__)])
+     assert all(callable(e) for e in pluging_list)
+     plugin_names = " ".join(str(e.__module__) for e in pluging_list)
+     for example in EXISTING:
+@@ -54,5 +55,5 @@ def test_list_from_entry_points():
+     # a filtering function can be passed to avoid loading plugins that are not needed
+     pluging_list = plugins.list_from_entry_points(filtering=lambda e: e.name != "isort")
+     plugin_names = " ".join(str(e.__module__) for e in pluging_list)
+-    assert len(pluging_list) == orig_len - 1
++    assert len(pluging_list) == orig_len - isort_count
+     assert "isort" not in plugin_names
diff --git a/dev-python/ini2toml/ini2toml-0.10.ebuild b/dev-python/ini2toml/ini2toml-0.10.ebuild
new file mode 100644
index 000000000000..d855885d7eef
--- /dev/null
+++ b/dev-python/ini2toml/ini2toml-0.10.ebuild
@@ -0,0 +1,68 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Automatically conversion of .ini/.cfg files to TOML equivalents"
+HOMEPAGE="
+	https://pypi.org/project/ini2toml/
+	https://github.com/abravalheri/ini2toml/
+"
+SRC_URI="
+	https://github.com/abravalheri/ini2toml/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~m68k ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/packaging-20.7[${PYTHON_USEDEP}]
+	>=dev-python/tomli-w-0.4.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/tomli[${PYTHON_USEDEP}]
+		dev-python/tomlkit[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+PATCHES=(
+	"${FILESDIR}"/${P}-test.patch
+)
+
+EPYTEST_DESELECT=(
+	# pyproject_fmt is not packaged
+	tests/test_cli.py::test_auto_formatting
+
+	# fails on whitespace/comments/formatting
+	tests/test_translator.py::test_simple_example
+	tests/test_translator.py::test_parser_opts
+	tests/plugins/test_setuptools_pep621.py::test_move_entry_points_and_apply_value_processing
+	tests/plugins/test_setuptools_pep621.py::test_split_subtables
+	tests/plugins/test_setuptools_pep621.py::test_entrypoints_and_split_subtables
+	tests/plugins/test_setuptools_pep621.py::test_handle_dynamic
+)
+
+EPYTEST_IGNORE=(
+	# configupdater is not packaged
+	tests/test_examples.py
+	tests/test_transformations.py
+	tests/drivers/test_configupdater.py
+)
+
+src_prepare() {
+	sed -i -e 's:--cov ini2toml --cov-report term-missing::' setup.cfg || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/ini2toml/metadata.xml b/dev-python/ini2toml/metadata.xml
new file mode 100644
index 000000000000..23719e79daa5
--- /dev/null
+++ b/dev-python/ini2toml/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>python@gentoo.org</email>
+	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="github">abravalheri/ini2toml</remote-id>
+		<remote-id type="pypi">ini2toml</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/ioflo/Manifest b/dev-python/ioflo/Manifest
index f1e924e49415..3080798b1a6c 100644
--- a/dev-python/ioflo/Manifest
+++ b/dev-python/ioflo/Manifest
@@ -4,4 +4,5 @@ AUX ioflo-2.0.2-python39.patch 3813 BLAKE2B a21f5829b5a2fd4200350949d66d4fd77f5b
 AUX ioflo-2.0.2-tests.patch 1059 BLAKE2B a093cf0db0e00c4f06f0eeda76acee4515951e0dca1a77688e2cd4ccc33a3b10402228d76aa25f787cbfa8771d12f0613fe62e5fa38e09b6d8238870c2b25951 SHA512 5642963e6c29941c2803c6833d229b9fab62f60e7534fb6bfd7a101746eff1704dcfe3bdbbc72bfb466317562d995ede5a70a8ffc83ae9e76ab2d9c01bcab349
 DIST ioflo-2.0.2.tar.gz 837382 BLAKE2B 1fe878c8a9a47a9be5083e392e15256f1a566433b4341e2ee234e84332bb72af0c426d04c77ccace33cfb05664745caaa63e910913c3d63bbb2e5d8360a1ec90 SHA512 7485924ce329889afb1c3e0555b54fdbfb11eafce48fb0ac15bacd229fea512c44fcc118bbc4368ebc7c770d62129ee6b895b982f73a269de7131ea37daac02b
 EBUILD ioflo-2.0.2-r1.ebuild 963 BLAKE2B 9838b1c970433daeb79bb877f5ed72db9150249d0d5307a299ad969c35c880750d66fee3426dc4569c45afa3cca57bd51a49ddf77ee9dcf694af6f983272a7af SHA512 fb4eeb959d214349c17aa82c8c6a01e33c6f81a4d512c84c67e6d9d6de3f7ce590acaa70d00d1fbf6685c3a380972bd14aaf5c00430fab77c6d741e82f39ac6e
+EBUILD ioflo-2.0.2-r2.ebuild 961 BLAKE2B a38dc70591cdb50076baef144cb10400640c01095e0ed09d03ecb14d2ee6559cd73d702be20f82a8d64f1670fa634d3e7776db1fb38263d5d2f29bf70830de7c SHA512 145e79dab3608897d4bc2f05107b0175fd3b9490e4c7ca12ba66aad9536793f2ea6f0a749b85d36dbd1895af223c6ee41c2d3bbd2b3ae94423fb2a9684e584e2
 MISC metadata.xml 494 BLAKE2B dc398c0ee508c0c1cf9ee17712efcbf7f994ed053416da6bdd236fe80402b80ce251272824bebbdcc7ea79cf98b6b5dd812de11fca55eb625bf19e5cf93228e3 SHA512 7364c6b7a37dd8ed762fc7d609e71ff93cd3321f6f94f88d795bd0a3082749571644cbdfd3c9d63a916249122fdfb47ff5377907159782ddf5744c5ea4a13f39
diff --git a/dev-python/ioflo/ioflo-2.0.2-r2.ebuild b/dev-python/ioflo/ioflo-2.0.2-r2.ebuild
new file mode 100644
index 000000000000..450633f76998
--- /dev/null
+++ b/dev-python/ioflo/ioflo-2.0.2-r2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Automated Reasoning Engine and Flow Based Programming Framework"
+HOMEPAGE="https://github.com/ioflo/ioflo/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64"
+IUSE="test"
+
+RDEPEND="
+	$(python_gen_cond_dep '>=dev-lang/python-3.7.4' python3_7)
+"
+BDEPEND="${RDEPEND}
+	test? (
+		dev-python/pytest-salt-factories[${PYTHON_USEDEP}]
+		app-admin/salt[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/ioflo-1.7.8-network-test.patch"
+	"${FILESDIR}/ioflo-2.0.2-python39.patch"
+	"${FILESDIR}/ioflo-2.0.2-tests.patch"
+	"${FILESDIR}/ioflo-2.0.2-py310.patch"
+)
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	sed -e 's:"setuptools_git[^"]*",::' -i setup.py || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/ipykernel/Manifest b/dev-python/ipykernel/Manifest
index 6967236f4bac..9c49c6870d7b 100644
--- a/dev-python/ipykernel/Manifest
+++ b/dev-python/ipykernel/Manifest
@@ -1,8 +1,10 @@
 AUX ipykernel-6.5.0-drop-pytest-cov.patch 420 BLAKE2B 89c6eafcf86a9033122a59a94414debec73ae849ceab34f69fe3dfe6ae225c31503f33f09d3c0460b5ed98677a2eba71285948e9b8f75b1704d7328b9a4eb0d9 SHA512 df15b568d93709ffa2a8ad2e28c8f3c6ad7aac8108c0306a1922041ccda82c5871149aa5eb4e507bfad0cf948bccdfac7e49d63f4cb6b9302c71673d6c0fa038
-DIST ipykernel-6.6.1.tar.gz 123915 BLAKE2B 136a3acdea6790d4666c3f5b0d040a91be405ff35e510456d920d0d2d2fb4f4076eb8e74089d08c42f0eba50caa48da929c1a684ad414919a67748f13d6fdf78 SHA512 bfe37f3d69c9b05f9bbbdec7f2103c353433b402474507a9d17c02f224e3a80eaea010b5a8bcebfd4410fbba661feae74107a4904c0af7835c6c1aa6bd0c1159
-DIST ipykernel-6.9.1.tar.gz 127244 BLAKE2B 13f3860f4d565bb4b362841bdcdd81ed5e3284ca6b4750c491cf5895d09fa1a1671acc8529066355cf2f549f89099dfaf8024281ab445b5db0e5ae52062c36d4 SHA512 5c977b01068153762817a372a20e8f3c7055f1cca16d4a4a03f73f4d9c5ce78597a106a4d153fd04dc601129fd8e1993d686e8ff6e299c2169a9d6f1272de58a
+DIST ipykernel-6.10.0.tar.gz 129057 BLAKE2B e50fd0b5d041236002d29360eb670e5bcf97ad6e0eff091e62a4189567d14832b6fa95915bbd29818b897430fa3f37b930c54155a407cc46d7a9607aa19caf2b SHA512 9f2c9e24244e5c3aafbfd2da6a131cbf19abfeb8164e6a64c69aa4b65dad92101137482c71f53eb5d8395944d6714938a73556e5dbfc8a6c92303c716d6244b5
+DIST ipykernel-6.11.0.tar.gz 129429 BLAKE2B 746cff0b32a1282f8abe02bd339d35061ceb04d3f4d7fc325bc97b744185958ed91beaff83c19d269e0d8ec7b35c5c88412c135c1aa2dcbf770846986eddc82f SHA512 69b88e3c8b552f5277f392a004a33a5c64c2edc93aeea0d2c2d03b0d8ee649f41fc1378068c1dd8322807cce188f5579c0d92730760baeca8170a98f585f500b
+DIST ipykernel-6.12.1.tar.gz 129979 BLAKE2B 96ee301974c9353374b6869003995238068f4abcdaa0cf4c2b6294c1ef8c4e6358e93a41feaa49fcba587fb94ca719f3180eac2b47fbbf6c54fa9fb315d784ad SHA512 309701a287e8b87d0f8b07eac402e2fc163515f471f3b5b3187bc210c47714d4cfb496f40e34ebad47be5e7eca8157ef0eea7da141fb16a6fd943f4a2095f360
 DIST ipykernel-6.9.2.tar.gz 128759 BLAKE2B 74740bdbe420d14cbb75e5a1dee9bfb0894c3e10ebf029bd7ceb29eb5112489ef83bc9a2075f6dd1cf16745f893d3782ee22144edfec66d650246eaa0d97215c SHA512 a452d7a44c4e33cb2d79262916045fe3044803f20db7d525bca3277dd49e9d216d07a832312b29a5a61293ecf7863641a45e0f188136059799287c5983beb0d4
-EBUILD ipykernel-6.6.1.ebuild 2101 BLAKE2B 02eb02ab1ede7442c1342ea76fcf7b38304f3f022c543b858279048b9d652401623b1fa01b05311466bdcc14a92f641e7a233144bb13e185f6d4015109ed842d SHA512 086142ba984c98fa9db935bc47782e7c928539f22b13635945a2c8c1cc919f6547ee6b264e4481e696c06d4d2ca4d6f508018acbbb6feeb72006feedb3674663
-EBUILD ipykernel-6.9.1.ebuild 2162 BLAKE2B 2394d09ca12b0c2cc3dcf0ef4b66019df0fa930358b5d7619b8ae3d806ac2fece5b73ef6668358c89838cac1710921d73d8fb47236a4b1334406dc7bd1b95d67 SHA512 3e88c7926c1893224a33a479d9f564d975329081f995c49b6a88ac1b5211d7afadf551d2c2194ea3e5f8537ac6f7dc6b4ecf6f5ac1c9055c61e622856c76e891
-EBUILD ipykernel-6.9.2.ebuild 2200 BLAKE2B 7b8865b5814bc08aae20ce307db4e71f1a6440abbb769e90536e14974566d7b44d84bfb9286732db640b69ea1440809f835e94dd228ec59451a8a235457ea5ee SHA512 c3b864965a71e4e94056f49ab9419c4e4104d32d8d68ac3ce1fcc584c30dcb8515b1d6b43ef89b500ccb8fc75031f90528d2c104bb985e27184a18ed3620e947
+EBUILD ipykernel-6.10.0.ebuild 2200 BLAKE2B 77c1722799ea3d15759b3ab31da3627dbf9a9fd994072a215b4b4fe1323b336e01b62594cdf9d0ba4ac3a063bc9652f88479d40a67c77c8b1a6ea716ea48380e SHA512 49901d9c9d20c82449be2d408bc4ad48558772f2f998561673e7c049983ba3683e68766ad0858b62f16f12f6b6cd9da9b9d8212137fd850745d625cd8b7a200f
+EBUILD ipykernel-6.11.0.ebuild 1954 BLAKE2B 9274963c4e0e9610c258eebe67233a42be41cabf038cf9fd923cd5b71bfdd2800b0473740fb63649a62cf1a72ddb00376497daa6ea34b6fe72f566257f710376 SHA512 e5ca662cabb40d34df9271ec094f67c82d71a20327582ebc2419265fcd809adbf352949ac31c0cc58f93c7d7d950a9c32c171c060e2e377a6c06a9948d9f226a
+EBUILD ipykernel-6.12.1.ebuild 2027 BLAKE2B f0e464beeb603d1096bd5650dc3a2c3f52cb860156e43075c52d88bd8da014cd560f87f7b772025af89c723234f4d2b3e6d34f8588752a1e5599826a9ce5c720 SHA512 488d7c57ce1df00cec65e0556d1540ac2085da3e24dbd7806766b3da683a049d22ff60b687b4bb99f9d22fa4ff1a48b5e8587b1f70f793b3624a156e40aa8e7a
+EBUILD ipykernel-6.9.2.ebuild 2192 BLAKE2B 5770e09eb90f1d2155cebd9dbce1a4c41ef2b90bb5122c2b25102e55c8d5e03632f6cc65673ee1e89396a0ab17c4ea4b28f19234690d66253648800697e46daa SHA512 928f2cd0c55b57f36f52955d17a491416e661e3520d0c8b6bb12a8a85fb9e7d5017dda0a1f5570759ae8a7eb55cece93d93ed2c3217b48ed82b595c0028a5369
 MISC metadata.xml 527 BLAKE2B 4a24cb9d5b801bf94c71c47d0c90b04bc249fb41a794c7b688a5762f08545d1fcfe9e4976aa4f583ecb456458b5f6dfc394349633959444584c0abad0da4be42 SHA512 ed9f0ef12ec5de67a646783243555f1737604a84c78c57b9f7c65137cec8cbc396991411501927f92bd393daad2238c27363ecc9c115031450231c2a4fb2cbb9
diff --git a/dev-python/ipykernel/ipykernel-6.9.1.ebuild b/dev-python/ipykernel/ipykernel-6.10.0.ebuild
index 8c593a257ad4..24ffa9580d59 100644
--- a/dev-python/ipykernel/ipykernel-6.9.1.ebuild
+++ b/dev-python/ipykernel/ipykernel-6.10.0.ebuild
@@ -24,11 +24,12 @@ RDEPEND="
 	>=dev-python/traitlets-5.1.0[${PYTHON_USEDEP}]
 	<dev-python/traitlets-6.0[${PYTHON_USEDEP}]
 	<dev-python/jupyter_client-8.0[${PYTHON_USEDEP}]
-	>=www-servers/tornado-4.2[${PYTHON_USEDEP}]
+	>=www-servers/tornado-5.0[${PYTHON_USEDEP}]
 	<www-servers/tornado-7.0[${PYTHON_USEDEP}]
 	>=dev-python/matplotlib-inline-0.1.0[${PYTHON_USEDEP}]
 	<dev-python/matplotlib-inline-0.2.0[${PYTHON_USEDEP}]
 	dev-python/nest_asyncio[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
 "
 # RDEPEND seems specifically needed in BDEPEND, at least jupyter
 # bug #816486
@@ -39,7 +40,8 @@ BDEPEND="
 		dev-python/nose[${PYTHON_USEDEP}]
 		dev-python/nose_warnings_filters[${PYTHON_USEDEP}]
 		dev-python/ipyparallel[${PYTHON_USEDEP}]
-	)"
+	)
+"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-6.5.0-drop-pytest-cov.patch
diff --git a/dev-python/ipykernel/ipykernel-6.6.1.ebuild b/dev-python/ipykernel/ipykernel-6.11.0.ebuild
index d87d63c16af8..63c34c5dcd79 100644
--- a/dev-python/ipykernel/ipykernel-6.6.1.ebuild
+++ b/dev-python/ipykernel/ipykernel-6.11.0.ebuild
@@ -3,8 +3,10 @@
 
 EAPI=8
 
+DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE="threads(+)"
+
 inherit distutils-r1
 
 DESCRIPTION="IPython Kernel for Jupyter"
@@ -13,24 +15,18 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND="
-	$(python_gen_cond_dep '
-		<dev-python/importlib_metadata-5.0.0[${PYTHON_USEDEP}]
-		>=dev-python/argcomplete-1.12.3[${PYTHON_USEDEP}]
-	' python3_8 pypy3)
-	>=dev-python/debugpy-1.0.0[${PYTHON_USEDEP}]
-	<dev-python/debugpy-2.0[${PYTHON_USEDEP}]
+	>=dev-python/debugpy-1.0[${PYTHON_USEDEP}]
 	>=dev-python/ipython-7.23.1[${PYTHON_USEDEP}]
 	>=dev-python/traitlets-5.1.0[${PYTHON_USEDEP}]
-	<dev-python/traitlets-6.0[${PYTHON_USEDEP}]
-	<dev-python/jupyter_client-8.0[${PYTHON_USEDEP}]
-	>=www-servers/tornado-4.2[${PYTHON_USEDEP}]
-	<www-servers/tornado-7.0[${PYTHON_USEDEP}]
-	>=dev-python/matplotlib-inline-0.1.0[${PYTHON_USEDEP}]
-	<dev-python/matplotlib-inline-0.2.0[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_client-6.1.12[${PYTHON_USEDEP}]
+	>=www-servers/tornado-6.1[${PYTHON_USEDEP}]
+	>=dev-python/matplotlib-inline-0.1[${PYTHON_USEDEP}]
 	dev-python/nest_asyncio[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-60[${PYTHON_USEDEP}]
 "
 # RDEPEND seems specifically needed in BDEPEND, at least jupyter
 # bug #816486
@@ -38,14 +34,10 @@ BDEPEND="
 	${RDEPEND}
 	test? (
 		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/nose_warnings_filters[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
 		dev-python/ipyparallel[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.5.0-drop-pytest-cov.patch
-)
+	)
+"
 
 distutils_enable_tests pytest
 
@@ -53,6 +45,8 @@ EPYTEST_DESELECT=(
 	# TODO
 	ipykernel/tests/test_debugger.py::test_attach_debug
 	ipykernel/tests/test_debugger.py::test_set_breakpoints
+	ipykernel/tests/test_debugger.py::test_stop_on_breakpoint
+	ipykernel/tests/test_debugger.py::test_breakpoint_in_cell_with_leading_empty_lines
 	ipykernel/tests/test_debugger.py::test_rich_inspect_not_at_breakpoint
 	ipykernel/tests/test_debugger.py::test_rich_inspect_at_breakpoint
 )
@@ -62,9 +56,9 @@ src_prepare() {
 	distutils-r1_src_prepare
 }
 
-src_install() {
-	distutils-r1_src_install
+python_compile() {
+	distutils-r1_python_compile
 	# Use python3 in kernel.json configuration, bug #784764
 	sed -i -e '/python3.[0-9]\+/s//python3/' \
-		"${ED}"/usr/share/jupyter/kernels/python3/kernel.json || die
+		"${BUILD_DIR}/install${EPREFIX}/usr/share/jupyter/kernels/python3/kernel.json" || die
 }
diff --git a/dev-python/ipykernel/ipykernel-6.12.1.ebuild b/dev-python/ipykernel/ipykernel-6.12.1.ebuild
new file mode 100644
index 000000000000..f3c45991a014
--- /dev/null
+++ b/dev-python/ipykernel/ipykernel-6.12.1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="IPython Kernel for Jupyter"
+HOMEPAGE="https://github.com/ipython/ipykernel"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/debugpy-1.0[${PYTHON_USEDEP}]
+	>=dev-python/ipython-7.23.1[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-5.1.0[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_client-6.1.12[${PYTHON_USEDEP}]
+	>=www-servers/tornado-6.1[${PYTHON_USEDEP}]
+	>=dev-python/matplotlib-inline-0.1[${PYTHON_USEDEP}]
+	dev-python/nest_asyncio[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+"
+# RDEPEND seems specifically needed in BDEPEND, at least jupyter
+# bug #816486
+BDEPEND="
+	${RDEPEND}
+	test? (
+		dev-python/flaky[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		dev-python/ipyparallel[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# TODO
+	ipykernel/inprocess/tests/test_kernel.py::InProcessKernelTestCase::test_pylab
+	ipykernel/tests/test_debugger.py::test_attach_debug
+	ipykernel/tests/test_debugger.py::test_breakpoint_in_cell_with_leading_empty_lines
+	ipykernel/tests/test_debugger.py::test_rich_inspect_at_breakpoint
+	ipykernel/tests/test_debugger.py::test_rich_inspect_not_at_breakpoint
+	ipykernel/tests/test_debugger.py::test_set_breakpoints
+	ipykernel/tests/test_debugger.py::test_stop_on_breakpoint
+)
+
+src_prepare() {
+	sed -i -e 's:^TIMEOUT = .*:TIMEOUT = 120:' ipykernel/tests/*.py || die
+	distutils-r1_src_prepare
+}
+
+python_compile() {
+	distutils-r1_python_compile
+	# Use python3 in kernel.json configuration, bug #784764
+	sed -i -e '/python3.[0-9]\+/s//python3/' \
+		"${BUILD_DIR}/install${EPREFIX}/usr/share/jupyter/kernels/python3/kernel.json" || die
+}
diff --git a/dev-python/ipykernel/ipykernel-6.9.2.ebuild b/dev-python/ipykernel/ipykernel-6.9.2.ebuild
index 7e1e1d1c91b5..61cbf240cb0a 100644
--- a/dev-python/ipykernel/ipykernel-6.9.2.ebuild
+++ b/dev-python/ipykernel/ipykernel-6.9.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/debugpy-1.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/ipyparallel/Manifest b/dev-python/ipyparallel/Manifest
index 14f6ed802820..981896a00fe5 100644
--- a/dev-python/ipyparallel/Manifest
+++ b/dev-python/ipyparallel/Manifest
@@ -3,9 +3,11 @@ DIST ipyparallel-6.3.0.tar.gz 2380153 BLAKE2B b8312102e1d2b5fc963491ebe8530e2fd7
 DIST ipyparallel-7.1.0.tar.gz 4029033 BLAKE2B badf4bdad0dca0898e62abee3e5a48b06460160bd1f2ae096bc05beb00dbd6dc2b52681aa699d69a76f5a51e4cd3f0bb107fa6b1d20109e76bc78da8f08b69f9 SHA512 9a629bd92176dbace1724efe0a5a698b2d684128567513f8809fd25e4901227d1c7fc7b02427fd3c14b3743b47956ff8387098a1cc8759d8987aa5e3d8ca60d5
 DIST ipyparallel-8.1.0.tar.gz 9365732 BLAKE2B 847931de17f61b537a6350358a1fcc8e629b843e1216fcc0f60333f7baf42b0739f864bd1a02daefb839b90cfb4c65b6101de3271e89d529dd8493513b686ced SHA512 21e1d3d9e04c7567889e923ff0f1b140251518efd331dd2180a42142eedbb4c92eaeafce17bf2287e1d36ef4e5951f2f50021d9b9a96c266e4e94e1a3ac34347
 DIST ipyparallel-8.2.0.tar.gz 9367069 BLAKE2B e4e881f774422ead72778d40d85e5732d7da8e8e66107c06d65557c6701c94bd5c2592cea2def8b2ad405db78fe70c87944e4b89eb9fe3a4bcf38464b008979a SHA512 f6e62eaa86fa63ef1417e850de3eaf5ba228a1ad1da99c66b64b371010b57ba805201f18c97485ded24899afe7b22edbec23ca0e21344e9c2c2eacfcd6fd8adf
+DIST ipyparallel-8.2.1.tar.gz 9367709 BLAKE2B 5be16c1060a31295e6b1908cfa3530d7ade6337de78ee057f595ab94ed5dc6c4c49b08f39ded0e8b6aa11ee7eda788f27b2f57bad851908f805d681e0b98efc3 SHA512 d06d1e272e27c0941f0fd6799cc78bbaf188ba1fb22f03016925ffbbf6b3e273eb8c372d7c0509b2f044ccfbfe3f35071547712e79a26a802e673340021921ac
 EBUILD ipyparallel-6.3.0-r1.ebuild 2305 BLAKE2B 80b0818f788962604a564ce9c74068b27c8740e59b84405c297f314e65d7d459f6e638885570babbff88d861f5e48e8353c6ce30f4ae698f5213dd285104f0af SHA512 c6e4d5005fb46c79f5a19f00bfa60cafd8e57ce98f5083aa2d975710ec05678fe8319f66722dfe065d27bba4ae38984da0f5cfb51ce64c5d21671bce35226c19
 EBUILD ipyparallel-7.1.0.ebuild 2913 BLAKE2B 409329a470efa0b9e6996925ff3d57084c1aeede7fcf9e588d7d7131633a83db3528d701a31d1cd3b39cc45ad7f2c89d41e775c91eade506e34a0bf99d9609e0 SHA512 4baf3ffad4747bd01ecfd498b4ac30dfc33765c8f441ec5016fe3985de2671c1e0cedc9a180554690e4ee5e4587f4f20b9fdc14b3f508320967e83fc0ecd97cf
 EBUILD ipyparallel-8.1.0-r1.ebuild 2947 BLAKE2B 07bf5ed3bbe999930722dadfb936cc2433a8e46a90bb07d5669a70e9482be045d4fd2c1e640e8c3c58be9cb7d39f45a0b600cc1e682f43320ad5cd0098e2b37c SHA512 d8b38eb7115f9452fd379f8196a97d2d37acac28565eb6108eb0e546da10a6b2a5418790a0b56ab60aa9b1e0cf10d93ad3fc7ba471ea35a62a1311f9647dc99e
 EBUILD ipyparallel-8.1.0.ebuild 2921 BLAKE2B 43a62f3289899d1eed402d15a6393a8be916cebfd459e30ca98d7a37015dad7e8de44a0b309de2a18af8a9f20e08c343a740294406890c742ce8228d937bca3e SHA512 3bb9008ce9355d4282b196b67d8fe0fa5aa70850bd7b1e2ab6bc256893ab8947617e0fdfb784d772d1cb4a2b2c86b1b63c184f940393107f93be383228f7fbdb
 EBUILD ipyparallel-8.2.0.ebuild 3032 BLAKE2B ec5ec16a1c5f0d8d430fcc3f8832775e2d08651717454f8866d0b9ed7156a9c53ae804eb148d084afe1f10045b037828023a051f3da92fe98f9e3a3e8b5d0810 SHA512 a5ebf9bb1b97ddfa2f0b5006bd685b7291f1e50025a103541b89c298b6756f9295ad7bfda7f06e9ebad4bbd70b6a01cd4984b9f3de15528e053557ade50ca717
+EBUILD ipyparallel-8.2.1.ebuild 3032 BLAKE2B ec5ec16a1c5f0d8d430fcc3f8832775e2d08651717454f8866d0b9ed7156a9c53ae804eb148d084afe1f10045b037828023a051f3da92fe98f9e3a3e8b5d0810 SHA512 a5ebf9bb1b97ddfa2f0b5006bd685b7291f1e50025a103541b89c298b6756f9295ad7bfda7f06e9ebad4bbd70b6a01cd4984b9f3de15528e053557ade50ca717
 MISC metadata.xml 531 BLAKE2B 92dd755dd3036f653f24eda893979487b8d5bbf3c369f3f10c3fc2e69ad6aef03cb6eca295bcb8c6f89f0838780c20132bfd2a33bb38b56b227e97258447c2e0 SHA512 fcd131d18b012d1511468777dd72e07ed28a514419923911082229c0256b9003d9afe2048b6c339cb5c94307026b52bc4e9b6781d45660178d18385d71af8f21
diff --git a/dev-python/ipyparallel/ipyparallel-8.2.1.ebuild b/dev-python/ipyparallel/ipyparallel-8.2.1.ebuild
new file mode 100644
index 000000000000..14ba1f0ef224
--- /dev/null
+++ b/dev-python/ipyparallel/ipyparallel-8.2.1.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Interactive Parallel Computing with IPython"
+HOMEPAGE="https://ipyparallel.readthedocs.io/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/entrypoints[${PYTHON_USEDEP}]
+	dev-python/decorator[${PYTHON_USEDEP}]
+	>=dev-python/pyzmq-18[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-4.3[${PYTHON_USEDEP}]
+	>=dev-python/ipython-4[${PYTHON_USEDEP}]
+	dev-python/jupyter_client[${PYTHON_USEDEP}]
+	dev-python/jupyter_server[${PYTHON_USEDEP}]
+	>=dev-python/ipykernel-4.4[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
+	dev-python/tqdm[${PYTHON_USEDEP}]
+	>=www-servers/tornado-5.1[${PYTHON_USEDEP}]
+	"
+BDEPEND="${RDEPEND}
+	test? (
+		dev-python/ipython[test]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/pytest-tornado[${PYTHON_USEDEP}]
+		dev-python/testpath[${PYTHON_USEDEP}]
+	)
+	"
+
+# TODO: package myst_parser
+# distutils_enable_sphinx docs/source
+distutils_enable_tests pytest
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-7.1.0-test-timeouts.patch
+)
+
+src_configure() {
+	export IPP_DISABLE_JS=1
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# we don't run a mongo instance for tests
+		ipyparallel/tests/test_mongodb.py::TestMongoBackend
+		# TODO
+		ipyparallel/tests/test_util.py::test_disambiguate_ip
+		ipyparallel/tests/test_view.py::TestView::test_temp_flags
+		ipyparallel/tests/test_view.py::TestView::test_unicode_apply_arg
+		ipyparallel/tests/test_view.py::TestView::test_unicode_apply_result
+		ipyparallel/tests/test_view.py::TestView::test_unicode_execute
+		ipyparallel/tests/test_view.py::TestView::test_sync_imports_quiet
+		# Gets upset that a timeout _doesn't_ occur, presumably because
+		# we're cranking up too many test timeouts. Oh well.
+		# bug #823458#c3
+		ipyparallel/tests/test_asyncresult.py::AsyncResultTest::test_wait_for_send
+		# We could patch the timeout for these too but they're going to be inherently
+		# fragile anyway based on what they do.
+		ipyparallel/tests/test_client.py::TestClient::test_activate
+		ipyparallel/tests/test_client.py::TestClient::test_lazy_all_targets
+		ipyparallel/tests/test_client.py::TestClient::test_wait_for_engines
+	)
+	[[ ${EPYTHON} == python3.10 ]] && EPYTEST_DESELECT+=(
+		# failing due to irrelevant warnings
+		ipyparallel/tests/test_client.py::TestClient::test_local_ip_true_doesnt_trigger_warning
+		ipyparallel/tests/test_client.py::TestClient::test_warning_on_hostname_match
+	)
+	epytest
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	# move /usr/etc stuff to /etc
+	mv "${ED}/usr/etc" "${ED}/etc" || die
+}
+
+pkg_postinst() {
+	optfeature "Jupyter Notebook integration" dev-python/notebook
+}
diff --git a/dev-python/ipython/Manifest b/dev-python/ipython/Manifest
index b7c9f16c6a6a..f884ceea2dd3 100644
--- a/dev-python/ipython/Manifest
+++ b/dev-python/ipython/Manifest
@@ -3,8 +3,10 @@ DIST ipython-7.31.1.tar.gz 5156314 BLAKE2B e6528c9d3920078918180c4c2fae5d0ac20cd
 DIST ipython-8.0.1.tar.gz 5306811 BLAKE2B 9088faf779e2783ce97c6a45f0baa3c7163e12f63546aa65eb961de2b2fbacaac8ba1cf0c3c705bc326b4c999fe3ce672f31e3abaa7168d912504880ad8d3c2f SHA512 c4f3cf6e4aa7dab1e4e8cec2d669e5fe4ea3eeac9063132a38544596fafbaaed0f287bbdce12e8bc3d7613766c51b0e1ff8c7c86fdbd53e387caade6bbcdb828
 DIST ipython-8.1.0.tar.gz 5312523 BLAKE2B 9a44555dcb91655c5d483a7ba5d99074b9c2c4af3ec272d0adabc345352359b061ea4fd92198c3910945139edb80c8837afe1ae3c34b0bddb517d226584f28a1 SHA512 847ddab96ecfe06e46921b081fe3a51910c3fde1fa440c9955e374614b1ae6a7d20fc2e78d286178366893d342126a01a160a4efb0aa7be0b2234229638e95bc
 DIST ipython-8.1.1.tar.gz 5313998 BLAKE2B 0972b2f4a8072c5775f5cc4637aeb8e684b342d097d77e2d9d0a3e659d7a10f94f741bafc7f33595cbb205d8dbbc72e88b820e5407cb9ab506189d44e8c19cf0 SHA512 ce93d4d0839f32256461ff53c510f694db6ec0358a487a6af016d41f811e1b78b3244f1c67097e14afd32635ae392b4bff5d6eb2fc823c299c699335dc43bdc0
+DIST ipython-8.2.0.tar.gz 5400583 BLAKE2B 6af50e671823005b035a8463e65463b06dacb3bf4d43c4d3bd9720d1747ebda8abe3d73a49f59ae0e6e2651035db20bcfa1e82dbb0a73e40b4e2507e63118921 SHA512 0bf93527bcafe5dfbfe034b901dff2f002e0fc732159073f0371263e23784f45eb6c9e3f7f2cb9567e93ea4ee313773f836157afe9d23256e71bc4b2fcac15af
 EBUILD ipython-7.31.1.ebuild 4651 BLAKE2B ebe9ec2ae2f606efb76fed9ca1e3e04c78a13c8d86ec3223d02c980289e215bec65f01714d7758b707784c98f59fb7c934ff6f207cfe8943c9c0712217457637 SHA512 27e831552e274196810f5e88fbd7242dfdd8a233f60e8767c040d70557f0389f973105905eae473d8136d10b4f566ef3245afeb286065156d0b87ed3d451267d
 EBUILD ipython-8.0.1.ebuild 4503 BLAKE2B 1e152762209f46d4a20f8eaeda4cfe351ea0719131f667d03e5efde42eb18cf09128b6274b61afde42a4e2e88a35b6c0ae533dfa5053124d757d79aa8af4631d SHA512 1d42837b4e311c3e56e8be0ed0e076d1bf118cdbd4c5ef8038951629de21d5e7c4d1749fd3f7378c5080f3e9bd78d4a43c6cab087a5abbf8e0ee5ce9dda42e2f
 EBUILD ipython-8.1.0.ebuild 4522 BLAKE2B d260913823293f3314687bc8a9a9177c5de9543162e5c02b2331bc823b412335bd01435c349b7df2474a23a6abed79a17d40f98b69e125b6fa80e6dc80d56e91 SHA512 ba55f3888f8fa6b8d7a9052af96d01f1d9edac4d0cf4f969c5fc317e6321ecdb32b2f661b8c3bd6a3bd743e280e7bfad657f5c2d7c6b54befce8d92b0a0ddc3f
 EBUILD ipython-8.1.1.ebuild 4535 BLAKE2B 6c5613de80033d7a78fae46482b13f79abd65ab927774b682fe3da6afd02dca5e63dfd3e46962b72f1aabca936808eec43957daa031a3053bbd1ea92b289e30c SHA512 0acc5242b42bf9aef8e20fa2267ce6b1309077ec359f4a0cd2f3b18463dd21872ce3eb54468046d92317ce31d5d91bc654ddd97895503b27e6c14ecfdd430874
+EBUILD ipython-8.2.0.ebuild 4542 BLAKE2B 98ffcdf4c31a115165ac78fd383f0b7030a856952bcf03c4f8bff726189508b87d0f2c4a6cf807187a71fa5bb3419a7005a8401476a3cd51c8f3b6ae79299c07 SHA512 abb280e25136c3118b5842e069b7e0b50aa90932adae5c1708b1e8474200fececa1a7be8f9106604a2c8b73b5d5634a39c984f6875af6aa9a44f6e1c0881252c
 MISC metadata.xml 2883 BLAKE2B f61d1c66cdc9a956f3fdc9fcbc93fbc2051e9d0872beb9229e87a8fdabbce656efee9702e66bf30bec68009702f42e4036202e02208a428a8ed87b448f625536 SHA512 617f19e859544079d2680e9796e3ff0b7af41577776847d4c4dccfffc460dfc887631169289e5271120f375bea7c7836395abb9bf8a7628b3b55a7c1beefda9b
diff --git a/dev-python/ipython/ipython-8.2.0.ebuild b/dev-python/ipython/ipython-8.2.0.ebuild
new file mode 100644
index 000000000000..f4c7b535daeb
--- /dev/null
+++ b/dev-python/ipython/ipython-8.2.0.ebuild
@@ -0,0 +1,160 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+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 ~hppa ~ia64 ~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/matplotlib-inline[${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-2.4.0[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/stack_data[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-5.0[${PYTHON_USEDEP}]
+	matplotlib? (
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+	)
+"
+
+BDEPEND="
+	test? (
+		app-text/dvipng[truetype]
+		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
+		dev-python/matplotlib-inline[${PYTHON_USEDEP}]
+		dev-python/nbformat[${PYTHON_USEDEP}]
+		>=dev-python/numpy-1.19[${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 )
+
+python_prepare_all() {
+	# Remove out of date insource files
+	#rm IPython/extensions/cythonmagic.py || die
+	#rm IPython/extensions/rmagic.py || die
+
+	# Prevent un-needed download during build
+	if use doc; then
+		sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/source/conf.py || die
+	fi
+
+	# Rename the test directory to reduce sys.path pollution
+	# https://github.com/ipython/ipython/issues/12892
+	mv IPython/extensions/{,ipython_}tests || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		emake -C docs html_noapi
+		HTML_DOCS=( docs/build/html/. )
+	fi
+}
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	local -x IPYTHON_TESTING_TIMEOUT_SCALE=20
+	local EPYTEST_DESELECT=(
+		# Internet
+		IPython/core/display.py::IPython.core.display.Image.__init__
+		# TODO: looks to be a regression due to a newer dep
+		IPython/core/tests/test_oinspect.py::test_class_signature
+		IPython/core/tests/test_oinspect.py::test_render_signature_long
+	)
+	[[ ${EPYTHON} == python3.10 ]] && EPYTEST_DESELECT+=(
+		# TODO
+		IPython/core/tests/test_completer.py::TestCompleter::test_all_completions_dups
+		IPython/core/tests/test_completer.py::TestCompleter::test_deduplicate_completions
+	)
+	epytest || die "Tests failed with ${EPYTHON}"
+}
+
+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 "code formatting" dev-python/black
+	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/ipywidgets/Manifest b/dev-python/ipywidgets/Manifest
index 1ec8cee46ba3..407214e426e8 100644
--- a/dev-python/ipywidgets/Manifest
+++ b/dev-python/ipywidgets/Manifest
@@ -1,7 +1,6 @@
 AUX ipywidgets-7.6.3-py310.patch 1526 BLAKE2B 102af6c7656f938aa6019a3e1cb82868d879f8bd233ec5ee6df99bb6e7f2f06bc9b4b90f13813844bf607f4b72908ad98823e7e2714b0919e9f61bb469471a90 SHA512 6a539b3c1d617facb0e9ebe0121c390d524a2181e4bfa11c59494a56f41265483bcedda06b9b3b6f60d81eccea971bf94a108014baa4aef78712f624ce0b956d
 DIST ipywidgets-7.6.5.tar.gz 4072535 BLAKE2B bc2347863af42254e740454e1d91ca8b7fc03de9dc6a2fdddaf9dbb13da2fe7af0f429733166865ebcdda9840189fc65dc677b7181b34f1c0dc697905aa3af4f SHA512 4952f1cd293f1a4bf1721222579273c95f59adfa9385963617924f5f28232e1940ec045e18aeae83ad138176e4d887e952fe875b960279f3e0b7d982a790a4dc
 DIST ipywidgets-7.7.0.tar.gz 4074763 BLAKE2B cff338dd635c57943161c78708e6a69abccaa46878e0bedb11ead76590b858ba57ce4dcfa8052533a4849da0dc9d5472987a7918fd2043462a21a908105d7910 SHA512 038da040912e6701762fb66fb3b6996ce0a59706afb05405b5932c02d34733842b227426f0b29eea115196bab384617425b0553c5db13a9dc832bddef63dfb92
-EBUILD ipywidgets-7.6.5-r2.ebuild 1050 BLAKE2B d1ac63007203daf77ba2db5616181628287b95da188f912e94a97cab7d2b18646ba53a05de7c28095ade06fe4d0f57a77a2502a0d3ac92a7f4e2d261fd4422bf SHA512 058001c187538af4ba765ff098a05d6536d7e5d33c1983a93071b70ffe256bb8bd84377b7ed14852e3dc26bd95cff958abbd2efcb0123ffa352bb4a664248326
-EBUILD ipywidgets-7.6.5.ebuild 844 BLAKE2B afd6b3a33e87cdfb5ad1d1d00677d744157a974def510e44dded5eabf24f2d4ed00907777a78262aa8bc7157200a4698a6f3d2c2ab2fba3009ce43c4c46496bc SHA512 e6055431b12d52e8de4df7c20328403af816f2fee7221349de66582781d810465ac336771a30f82f8293ddadfc105dff5b64e480fdd48f8b88a257b4e2fbb39d
+EBUILD ipywidgets-7.6.5-r2.ebuild 1044 BLAKE2B a4a1331cc4077b6bfa780bc1d0824bfd7f5420a5fdaae397b1fbe3147620a7125cc7946ce514020592ef2665d580fb0028059cfbf2a1db127633f5ad38112190 SHA512 02cf286b027827a5588008fc14dc116a272742f1b1c1e89261d40f56f07d8d84159985421179936f7af8869a66704f9763ae6197d89ed1edcfaa3f54c15abb5f
 EBUILD ipywidgets-7.7.0.ebuild 998 BLAKE2B 16610a5b3a60cc31b47b4083c6e88167631793dee5d4ba152b0a963092d1167dad181dcf91e11636824d614ecea4801004a350dbfb5f373f45eb9bfd6e80b973 SHA512 e775a3e1b9b70ec9465f14591b6d20becd6a48b8e76554dc115779ff6779ee77b7b6d4ff81e5f4406f4c6f64c941a546665fe3318d5405c9efd83999eab68017
 MISC metadata.xml 537 BLAKE2B 1f3b91be328b958870a72b5ce438c3e5bf67efd072b59dcb5ae77a9b89334e726af4fe8771221a7b728905cef4175cf7e0a49b11c651a7c0520b5cb032085985 SHA512 cb8092ea7a06e309a26abb78f5ddfd4a91f416e15374d2b59fb5086a64cc13f3dd408e18caa6719d12b1f18f762469a72a1027b2a047db626c51d22a5f304e54
diff --git a/dev-python/ipywidgets/ipywidgets-7.6.5-r2.ebuild b/dev-python/ipywidgets/ipywidgets-7.6.5-r2.ebuild
index ef21542a3c78..a3cebfe5cd69 100644
--- a/dev-python/ipywidgets/ipywidgets-7.6.5-r2.ebuild
+++ b/dev-python/ipywidgets/ipywidgets-7.6.5-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/ipykernel-4.5.1[${PYTHON_USEDEP}]
diff --git a/dev-python/ipywidgets/ipywidgets-7.6.5.ebuild b/dev-python/ipywidgets/ipywidgets-7.6.5.ebuild
deleted file mode 100644
index 07187169d9a6..000000000000
--- a/dev-python/ipywidgets/ipywidgets-7.6.5.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="IPython HTML widgets for Jupyter"
-HOMEPAGE="https://ipywidgets.readthedocs.io/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 hppa ~ia64 ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/ipykernel-4.5.1[${PYTHON_USEDEP}]
-	>=dev-python/ipython_genutils-0.2.0[${PYTHON_USEDEP}]
-	>=dev-python/nbformat-4.2.0[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-4.3.1[${PYTHON_USEDEP}]
-	>=dev-python/widgetsnbextension-3.5.0[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}/${PN}-7.6.3-py310.patch"
-)
diff --git a/dev-python/irc/Manifest b/dev-python/irc/Manifest
index d263bb8ff232..0ce0dffd9a1b 100644
--- a/dev-python/irc/Manifest
+++ b/dev-python/irc/Manifest
@@ -1,4 +1,3 @@
 DIST irc-20.0.0.tar.gz 88662 BLAKE2B 627354a051964e53322484c8a2c28487e25738b21c485121589af331e2da59b80c5704ef4268ff0bac3e84d26f77af031ba6ce0064a46496e846c7160462a5f9 SHA512 cd54e20075e97d7c8259275514741f9bb2f93712b1cc8628399fb7d4b37ff7d1d6515be14f5326fa30e59f49cfb853b954f4f095b4d3cac870a63a9946cfbed2
-EBUILD irc-20.0.0-r1.ebuild 1181 BLAKE2B 2a5ee79696133a26e06061f168f20c73af3f2bd14907402fb8ab364af387d9b193a382554c421aa104e23290c6973402310035ba5663706cac120ddc6a18b75b SHA512 5b097667fcbf5a9c2e3f3fff522ada4dd6eccd46d234adcb28b022f30890c4239a999dff058b49293d09e9a2ebb90c91883e047eb9ad736641e672ad46b4a448
-EBUILD irc-20.0.0.ebuild 1178 BLAKE2B 4143267d1f69fbbe0afdbd9537c48a160c2ae805154f37ab8a302dc3bdbab7a2e5f0774ffb2b5a9f3d3f98e80bcb56dd621e8ff70a1b3dd186db421ab6f09792 SHA512 9312938db841f09f7d4aa5b8b3d81536db66fb7c8c5b95ca0a0d8334b83cd5707676a587cd1fe201615092af0bc81cdb81b847dcfa16440a25c856b41cd0b385
+EBUILD irc-20.0.0-r1.ebuild 1179 BLAKE2B f0052096a5e6a40104ea5a9f281ebbf5312d8a28ba2b94b36d801c0813c078a54e68105b24d8816941e48ac7561173dbf100c3450689a7497a27ae68400c3e43 SHA512 0f8eb5b5c2f87afd279a4ecc0162352317959950a6e1dcc703d0fb46f21770e9fbccae9655622efe9b9654e373bd81954b4db802f8186495654b7f4b24fe876f
 MISC metadata.xml 816 BLAKE2B 8390d70debcbbd36f9d4cf9e7bf204f108a3aa04bab4b1b7166e807899c402b94e4aca435df16c80feebe73caffe180846ae4116132111377951663dedd64b68 SHA512 04478d5d9ab60c09105e6594a19957e1aa059489f389918baed7ebd185f31cbe513ebf7816f565e40d42d27477842e2bd92ca17ba845a4a4de2e7a4f71df42a1
diff --git a/dev-python/irc/irc-20.0.0-r1.ebuild b/dev-python/irc/irc-20.0.0-r1.ebuild
index 03c44d6ea35d..bb8df2685890 100644
--- a/dev-python/irc/irc-20.0.0-r1.ebuild
+++ b/dev-python/irc/irc-20.0.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="examples"
 
 RDEPEND="
diff --git a/dev-python/irc/irc-20.0.0.ebuild b/dev-python/irc/irc-20.0.0.ebuild
deleted file mode 100644
index 08a3edec28f4..000000000000
--- a/dev-python/irc/irc-20.0.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="IRC client framework written in Python"
-HOMEPAGE="https://github.com/jaraco/irc"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/jaraco-collections[${PYTHON_USEDEP}]
-	>=dev-python/jaraco-functools-1.20[${PYTHON_USEDEP}]
-	>=dev-python/jaraco-itertools-1.8[${PYTHON_USEDEP}]
-	dev-python/jaraco-logging[${PYTHON_USEDEP}]
-	dev-python/jaraco-stream[${PYTHON_USEDEP}]
-	dev-python/jaraco-text[${PYTHON_USEDEP}]
-	dev-python/more-itertools[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	>=dev-python/tempora-1.6[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/setuptools_scm-3.4.1[${PYTHON_USEDEP}]
-"
-
-distutils_enable_sphinx docs '>=dev-python/jaraco-packaging-3.2' \
-	'>=dev-python/rst-linker-1.9'
-distutils_enable_tests pytest
-
-python_install_all() {
-	if use examples; then
-		docompress -x "/usr/share/doc/${PF}/scripts"
-		dodoc -r scripts
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/itsdangerous/Manifest b/dev-python/itsdangerous/Manifest
index 00bb643cc80c..77d1f6848e36 100644
--- a/dev-python/itsdangerous/Manifest
+++ b/dev-python/itsdangerous/Manifest
@@ -1,5 +1,7 @@
 DIST itsdangerous-1.1.0.tar.gz 53219 BLAKE2B 6ad74dacb9728e77d57ac5e364e79e3cc749be206fa03e82a407cdd77b5b72ddb4861bf181772915e684539e6404c6a45f6081c7c8e17a33a2d532b4fc3fed80 SHA512 61bab3fce5f87a3b5fc8fad61e735a63df6aa039416ee3494e1c99a2a1162b4fb72793bc5dc949de0985724c40121810b159513606c4c3976a7666dba3a1b93d
 DIST itsdangerous-2.1.1.tar.gz 56217 BLAKE2B 8b35b32ce0d9a5432079199165f9d7a43dee80775737bfde637820a86c6c2c4cf122914958d4e88466446b75deaf4dfe995c9cda64c254793056e5773136d07d SHA512 54ec17e540fc7c39e5880c044c1ce222260b1141355cc341dc96eefbfd8f12e3018eadd531081a00aa719736b9af437bafe147dd5fee456d8b4478f7107aacdb
+DIST itsdangerous-2.1.2.tar.gz 56143 BLAKE2B 4c36cb26bcc6b6821b92b88b0254711ebe00bfda2193cecf0a7eb1fd514806f366fc0b4dc587a383003ec1272a2bc732418a46b44fa711beaedc06c379635ddc SHA512 e4d870a33992b309ed778f403c0c1e098983a693d1165260748bf36385ebfadb583811e05ddd48001a33cf6a4e963b7dd8a8c68919c5b4b86f63621d8869e259
 EBUILD itsdangerous-1.1.0-r1.ebuild 645 BLAKE2B 687fe2d1170956390af9295f8dd795d9427df893ce91e279e7cbb073eb4d61ae78cc86faea0adaa5c38d39299332bbfe192544eb2754ffb1d455ee34feb7ac11 SHA512 fa6d71b62c656868ebaf2ad451bde2ce9967ba2983a63871bc58be31903dde7969a551d84c918d6241385fe4328163301a3446582918e071536828f326009dc1
 EBUILD itsdangerous-2.1.1.ebuild 676 BLAKE2B 97f74e38628d9f4c6c7919d383fc9fab63e3572e8a0b5210fa10248aa4306038c01451245a21611fbbecd9e1e1e41f5699c3ca2c45480cea00f4c686c354b168 SHA512 4669d394702ad8cd90e4545ddf021e39c0a0eaef68ac069f9be1b0785d60b2e3ec80d21183b611366d19817016e3b308347c40d5fb9cfa985c0622f4d42538e3
+EBUILD itsdangerous-2.1.2.ebuild 688 BLAKE2B fae2ba1205c7b0d87a2fcec67a9ec32da769ba6425d05fbe531ce7343da0b3549ed7c23edce1125b3e223bc0c5745bc1d7482deda4c277b81cacdfbee016f451 SHA512 1be3663dcbae28ce3bc34c4c860d8bfe3cdc5e394dd7a67f5b0f3222d70bb3b098812785f7860e23de6c4a195bc3c3a9f2acdc4f6d875025c46f77595d50d67e
 MISC metadata.xml 413 BLAKE2B ad79fd7ab99377da744c95b7c63f70259d48b1c4ebee05d86f0c8a9118d2b640234b1e7375382779963218c6e54a1408cb1a5e2597ab82488823228c5e38445c SHA512 0ab4fb52051951fc2ba0cf6d825405b14e71f5793c0a81508e977caf55f1c47718303153cf5ba41e3009fe157ab0be96143ded4df2959196af334545c1601e44
diff --git a/dev-python/markupsafe/markupsafe-2.1.0.ebuild b/dev-python/itsdangerous/itsdangerous-2.1.2.ebuild
index 29487b01ac74..629fdcbd42a3 100644
--- a/dev-python/markupsafe/markupsafe-2.1.0.ebuild
+++ b/dev-python/itsdangerous/itsdangerous-2.1.2.ebuild
@@ -8,16 +8,18 @@ PYTHON_COMPAT=( python3_{8..10} pypy3 )
 
 inherit distutils-r1
 
-MY_PN="MarkupSafe"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Implements a XML/HTML/XHTML Markup safe string for Python"
-HOMEPAGE="https://pypi.org/project/MarkupSafe/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
+DESCRIPTION="Various helpers to pass trusted data to untrusted environments and back"
+HOMEPAGE="https://pythonhosted.org/itsdangerous/ https://pypi.org/project/itsdangerous/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+BDEPEND="
+	test? (
+		dev-python/freezegun[${PYTHON_USEDEP}]
+	)
+"
 
 distutils_enable_tests pytest
diff --git a/dev-python/itunespy/Manifest b/dev-python/itunespy/Manifest
new file mode 100644
index 000000000000..84e2540d8afc
--- /dev/null
+++ b/dev-python/itunespy/Manifest
@@ -0,0 +1,4 @@
+AUX itunespy-1.6-setup.cfg-description_file.patch 206 BLAKE2B a2df4fa4391a17e823cb0e389adf33a6b9045da604663007d4d43c533bc992244306f30f282a0022963882f6237f332e547186ee4fef15bab68e45a70d8c1c19 SHA512 3cfc66283030f9a2caae086afaedee858cae4a322c001fd7716e7751a6e3228c8d059a0f68a15ff0f508d0f1b54e61d38c1fd3b4b5e58aa276b0b6a8a9a114d6
+DIST itunespy-1.6.tar.gz 9724 BLAKE2B c46ccfd00a3dec1772499d3299dae7c20355628176db4e660aca0b2b819b81423ac78ce55319c822c15e1c4bf0641c2fc3c4d9ba94dafad1ffdeb503be4f76f9 SHA512 d91428e23a71bdbc62e6b8126b379aa48f06a365056147cf30eb4fa6132243d35c8a8d6dc536174a53f206bf7bcb4dcebb5a3697fac0fd88cbcb38205202ad81
+EBUILD itunespy-1.6-r1.ebuild 735 BLAKE2B fff57c918202e4de83b8b291a68df703516bd7d588e3d5d9544353e2652db8cff1038e39120a4d5cf798c1484cd106b10757d1588c56b6e37dd443683bced267 SHA512 d320d16839c9e43a4a05c85f1bba5c6dd353c5e61107191fcfbce9b6a5aaeb182e7ce864d095898d7febbb5f667787699fd3cf412cd411515a9d91cef6a9c2f3
+MISC metadata.xml 409 BLAKE2B 88afe27e4e9962a63bd257732b539d187aa00d88ee0446d7b70b0d239d22229002c0f7ec5db4f9888eabff8832e5698a1813dbe66e9ab0efd1fbcc6ca9b47a18 SHA512 d90439813c6027846bed561d8f0085c5aa9f024794d5aa3b8639644a4f62720cffcc91967bcbd31309bc1d88eef9dff91e97cd089e8814402c942c301bc99941
diff --git a/dev-python/itunespy/files/itunespy-1.6-setup.cfg-description_file.patch b/dev-python/itunespy/files/itunespy-1.6-setup.cfg-description_file.patch
new file mode 100644
index 000000000000..5c65eeb354b7
--- /dev/null
+++ b/dev-python/itunespy/files/itunespy-1.6-setup.cfg-description_file.patch
@@ -0,0 +1,9 @@
+index 224a779..0f94f37 100644
+--- a/setup.cfg
++++ b/setup.cfg
+@@ -1,2 +1,2 @@
+ [metadata]
+-description-file = README.md
+\ No newline at end of file
++description_file = README.md
+\ No newline at end of file
diff --git a/dev-python/itunespy/itunespy-1.6-r1.ebuild b/dev-python/itunespy/itunespy-1.6-r1.ebuild
new file mode 100644
index 000000000000..8992a4973c9a
--- /dev/null
+++ b/dev-python/itunespy/itunespy-1.6-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="A simple library to fetch data from the iTunes Store API"
+HOMEPAGE="https://github.com/sleepyfran/itunespy/"
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/sleepyfran/${PN}.git"
+else
+	SRC_URI="https://github.com/sleepyfran/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+RDEPEND="
+	dev-python/pycountry[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+"
+
+PATCHES=( "${FILESDIR}"/${P}-setup.cfg-description_file.patch )
diff --git a/dev-python/itunespy/metadata.xml b/dev-python/itunespy/metadata.xml
new file mode 100644
index 000000000000..f449f0046a80
--- /dev/null
+++ b/dev-python/itunespy/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+  <maintainer type="person">
+    <email>xgqt@gentoo.org</email>
+    <name>Maciej Barć</name>
+  </maintainer>
+  <upstream>
+    <bugs-to>https://github.com/sleepyfran/itunespy/issues/</bugs-to>
+    <remote-id type="github">sleepyfran/itunespy</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/jaraco-context/Manifest b/dev-python/jaraco-context/Manifest
index ab1dbc2900c7..c78bae374d7d 100644
--- a/dev-python/jaraco-context/Manifest
+++ b/dev-python/jaraco-context/Manifest
@@ -1,3 +1,3 @@
 DIST jaraco.context-4.1.1.tar.gz 7615 BLAKE2B 5734da1c55420c45520aea57398e66a3d880a555c76650bcaf3427911a7814be92f4a879219c8ccf3c808fdf00d3a77b76e68a93ef3fdad4ea50550188118317 SHA512 e01d3bd7b4eb712d00aba3fc40a78a5484141fcacf5bc772287a35ac81eca4c9744963679daadf6a170cf2ec26234243e602c89f71833fe84175ac39fb401453
-EBUILD jaraco-context-4.1.1-r2.ebuild 1227 BLAKE2B 71cd095b0ff838c6371336ecf01e0b0d48bfaca3b93488c5324d56d54f533fa4816b4b2451113bf3a5d5803052cd3b63b7c7129348d50ab15aab345b7999bcc9 SHA512 decabc7609f8db04d19bef45c05dbb7f86faf2cfa7a2fa874369637372b61a02a2ed1862546334b5fdc8fc998fbbdf223852a4e674251d50223f9a18ab3f51b6
+EBUILD jaraco-context-4.1.1-r2.ebuild 1331 BLAKE2B b267bf53fbc6d8958f0e8e1f9393e04797c6ee29e822135d5403464e1ce86478de117816116a8bc10b80d943ff33c029b607a931ba9d14e316e3592af6b0d42b SHA512 7da5bd7d73d4d1954506390275bc6ae4e1d93f43c2abcf79622174f6969de50450d69a76f634ab28fceb2805e25bde2b447dc8f098c39c96a13f276a2daa5040
 MISC metadata.xml 342 BLAKE2B 814e419c25d4719a2cd0ee3f8d9d5e82f594fcf1a88fc6547a7b9e0f893451be84b099b35d32536fee97c6ecf401e7b93749968ab4ec5e67d352e4ab9777ee34 SHA512 958abf9745fd7fc9896bad75cb4802b9056e023d854ec3539568ceccbbc4f246327ad794999d083ccac5addc98f56e1bd20e2d705a34c4bab3035ca04e93d63a
diff --git a/dev-python/jaraco-context/jaraco-context-4.1.1-r2.ebuild b/dev-python/jaraco-context/jaraco-context-4.1.1-r2.ebuild
index 67029c2cd032..2c1dd04b6915 100644
--- a/dev-python/jaraco-context/jaraco-context-4.1.1-r2.ebuild
+++ b/dev-python/jaraco-context/jaraco-context-4.1.1-r2.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/jaraco-envs/Manifest b/dev-python/jaraco-envs/Manifest
index 5eafa3f816a2..77f71b4d4bc7 100644
--- a/dev-python/jaraco-envs/Manifest
+++ b/dev-python/jaraco-envs/Manifest
@@ -1,5 +1,3 @@
-DIST jaraco.envs-2.2.0.tar.gz 6151 BLAKE2B a620bb64ffad881e9b31569d90b621ac79f27ff78c6531f0e89e7f4cf386a4a8045aa9676e561b51d75ce1bef82b4f86342fb51dfe1a1acc32eeae58b4237373 SHA512 b852168f718c133142b592402d17891cad821493842324263c195d0c6d15592946c89431d278b4860f8802363debce87f35e11f1357a52b94620bcc3f90d99ec
 DIST jaraco.envs-2.3.0.tar.gz 6939 BLAKE2B 6cbdc2dff26d29c6985175851072278cdec1f4811ef609017870d133547ab69f3e98e6cf09bf6f9770b2cadd62281b806ddbd6d1cab3f5793ec185aa019edd8f SHA512 c0f1e8e515d18d1f5c181c1072fe72b3f99ad06971ec420e3aae6631daa734e0fef05e720cb7770e37de07d65c02578f9be916354d0507761a5fde749c7cb643
-EBUILD jaraco-envs-2.2.0-r1.ebuild 811 BLAKE2B 1066b20567816a938f5ad5c9952daab4ed460fd90680beddecec0c1f49603303ac2796738c61c5e8ff2ab706f257a1fdfe427d922843be5bdf5bf24a4f66f7cd SHA512 01ce97167707c48a77124a86038ae68737de6d21400f9452dd07d8e83b64f343615b0b28cea3821c03db7a142953b0b6556a6df328674588bd4e6d4d0c0d7889
-EBUILD jaraco-envs-2.3.0.ebuild 853 BLAKE2B 44fef6500adff9555639f9ebe223c05e2f4c9e0393d196de07ebce4a2176347a88e6e73494c6df22bd45ea6c142a152bca354e62432087fb73c16b35b11b2fe3 SHA512 baeddacdf2fee3bd7036614f9ff5d1174869d69215c69caef0496988c90aa7c54cf722c805d408f9020eea0fe7974356b2d950eb3f1ae25bacb051d819385e3f
+EBUILD jaraco-envs-2.3.0.ebuild 845 BLAKE2B 64c210b9ce46c0dbc80c44e0277c21ba4162a5c43dd57e4210545fabf4c3868232eb15304cbf95d4de89277c43c08ef2a91f84a96c05ba8d0b8aecf991359b45 SHA512 bfe3d05eb4a7848d992589b65ace9bc672409c174ecf7c00b4ba196796be9e0ff8a90947ef988fd94a802e412fd778026073b62d0f6b46456824f41a6266aa01
 MISC metadata.xml 397 BLAKE2B cbc21ddb91498528ec05a5e31285357c633b9646bcbf517229c9ae206f26f50152ea8f709bc19ede09952e2eea715de4586914021d61714108f853fafc5b2742 SHA512 8f1646816b5e3a753963acd82aa950465e2c14f80ce7305b07a67d366882b19b54d80cbd85b988ce84f08fe24a31c8d6aa604a0e4f7da52886ccfada36b226c6
diff --git a/dev-python/jaraco-envs/jaraco-envs-2.2.0-r1.ebuild b/dev-python/jaraco-envs/jaraco-envs-2.2.0-r1.ebuild
deleted file mode 100644
index bdead9d57157..000000000000
--- a/dev-python/jaraco-envs/jaraco-envs-2.2.0-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-inherit distutils-r1
-
-MY_P=${P/-/.}
-DESCRIPTION="Classes for orchestrating Python (virtual) environments"
-HOMEPAGE="https://github.com/jaraco/jaraco.envs"
-SRC_URI="mirror://pypi/${MY_P::1}/${PN/-/.}/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv sparc x86 ~x64-macos"
-
-RDEPEND="
-	dev-python/path-py[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-"
-
-# there are no actual tests, just flake8 etc
-RESTRICT="test"
-
-src_prepare() {
-	# optional runtime dep, not used by anything in ::gentoo
-	sed -i -e '/tox/d' setup.cfg || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/jaraco-envs/jaraco-envs-2.3.0.ebuild b/dev-python/jaraco-envs/jaraco-envs-2.3.0.ebuild
index f5cc4c263157..e403490faa67 100644
--- a/dev-python/jaraco-envs/jaraco-envs-2.3.0.ebuild
+++ b/dev-python/jaraco-envs/jaraco-envs-2.3.0.ebuild
@@ -16,7 +16,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv sparc x86 ~x64-macos"
 
 RDEPEND="
 	dev-python/path-py[${PYTHON_USEDEP}]
diff --git a/dev-python/jaraco-functools/Manifest b/dev-python/jaraco-functools/Manifest
index 6aa4a8a535ac..fb87fbcec8bb 100644
--- a/dev-python/jaraco-functools/Manifest
+++ b/dev-python/jaraco-functools/Manifest
@@ -1,3 +1,3 @@
 DIST jaraco.functools-3.5.0.tar.gz 13254 BLAKE2B 9165f901106278da562c6b59c3cc29e0b1c4689c5db7955f57a76fca3c12e90d30a80a7dde3420a719b093c41b889e54170bfa6f6f18b6f078e3f4291e59736f SHA512 7257f41506f90ca2fda1bd12fed58fa4d4ff5738547f8cdae8ccad1901e0c818afb701dd8e9050fc77ca1271bc2466d5a542990138bc3db2cf9b04d12850844c
-EBUILD jaraco-functools-3.5.0-r2.ebuild 1526 BLAKE2B c54e6e1173a141f2233529c68e4f09a3e523180d8a95ff1b99d9abbb75bd5cdbaf85ff35fad3e6ef4701a71d43b5773bf958a3047abf27c1f9342d12be739200 SHA512 3c9b2ac4c7592c88cd7f539c5e4fc7c66ab904837b1831f96517c61478f708d1aad6431f8c1944a493fd40632a33b1c7b1b6690942032ccb1f1e42ab286e760a
+EBUILD jaraco-functools-3.5.0-r2.ebuild 1619 BLAKE2B bbc88bca067c4d42e0ebde9bae45f2aa8c8a4cc3d5009b11e6d626064f4c8a9d2ed3d1ae34b0d362db2a981f0b59a5017033fd80e2467a7f87ca3c553a30a8f2 SHA512 bc2c609351519cad1842e18fee1d12e9eff546f32cbed05be51267f79725ba6a05f66a0959c80e9e8af956c160cad1acb13d8ae9262f526d540b67f0ca9f1a7e
 MISC metadata.xml 676 BLAKE2B b437d010c92db7c16013c9e2dbdb0071c793900189cdd0ec1918abc587ea5fcff10f36b5822e0912797fd2baf3aab5e8a25cf30ad8bb7f3e8e65608a52cd41cc SHA512 95fbff54e3f761dc323dd6c590ad093d301f5438db7a46c90be8a22ab59e1531ea1785317c764e98e278629ff8cd4db976ff1e25d00de46fe741c65ff655201d
diff --git a/dev-python/jaraco-functools/jaraco-functools-3.5.0-r2.ebuild b/dev-python/jaraco-functools/jaraco-functools-3.5.0-r2.ebuild
index 2e1c4bb4a95d..3f7e75f6a647 100644
--- a/dev-python/jaraco-functools/jaraco-functools-3.5.0-r2.ebuild
+++ b/dev-python/jaraco-functools/jaraco-functools-3.5.0-r2.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	>=dev-python/more-itertools-0.12.0-r1[${PYTHON_USEDEP}]
diff --git a/dev-python/jaraco-text/Manifest b/dev-python/jaraco-text/Manifest
index 8c3aa02e75a4..b854dc5b36a1 100644
--- a/dev-python/jaraco-text/Manifest
+++ b/dev-python/jaraco-text/Manifest
@@ -1,3 +1,3 @@
 DIST jaraco.text-3.7.0.tar.gz 12054 BLAKE2B 54528808695e2f1f04165e3de42d1715bb3e3ee1450ee8d8759814d209ba98c181d1746a916816dd50703e5a4e26ad7986f389619324ffbabaa89be90fd3908c SHA512 559dc5ed0f2c0b46dd0cbbc112ab01bbdb68bc12923cff8f745a5e233696ca9f50cef6dbf60116df5121f4761457574deebea142c2a23ca6c4664d7395b5607e
-EBUILD jaraco-text-3.7.0-r2.ebuild 1584 BLAKE2B 7ce1ef8a1959f13e89b2b21b1979eaeba157a44a8f42b8b2410c36c1c52ecbd3a7fea7da0d3e25080eef9ceb621aff84cb890c2304f4572de60103512682eb2f SHA512 ae355f28dd6886c433f55fe7d809402f402264406098b23d38f371243174083f0f3cc920fcef63d5ea61aaf9d16181b60d9cf20e4320c5a9169ec952dbbc4da7
+EBUILD jaraco-text-3.7.0-r2.ebuild 1688 BLAKE2B 670543cb4d68e8ed8d60296d9c42d588ec6d9c2fee7428e1e2aa29757053d3486eb43973b747d4f565aae7bb881440d7725d7fbe6fec9c4feaf358b05828cadb SHA512 2c736b3ece6e98838815759151430c74436baab659fd8aa8be427fb31926b981c940a0e21b7b752f9b4dab52af5fd157f8e8b1fdbef9e8f4604456703f0a1b51
 MISC metadata.xml 656 BLAKE2B 0a887f3b936ada76caabedd24bcfc8d1d53047705761370fdf5c2cbe204b4d7c8449813268e9a45b48409f713e038f5742db12029bb3974b703317e7c3eaa28c SHA512 c8dc08d4347fec9076d6c23899ccb6fadbeee43d64875d8ea727ce20c2c5429a2683d162d602b763ef740c8eeb213762b17b2c964132923a647b769e2372763c
diff --git a/dev-python/jaraco-text/jaraco-text-3.7.0-r2.ebuild b/dev-python/jaraco-text/jaraco-text-3.7.0-r2.ebuild
index 46813048fae9..ca615b49accf 100644
--- a/dev-python/jaraco-text/jaraco-text-3.7.0-r2.ebuild
+++ b/dev-python/jaraco-text/jaraco-text-3.7.0-r2.ebuild
@@ -17,7 +17,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	>=dev-python/jaraco-context-4.1.1-r1[${PYTHON_USEDEP}]
diff --git a/dev-python/jc/Manifest b/dev-python/jc/Manifest
index 59a683bafcb3..a7ff49f79381 100644
--- a/dev-python/jc/Manifest
+++ b/dev-python/jc/Manifest
@@ -1,13 +1,5 @@
-DIST jc-1.17.7.tar.gz 3922848 BLAKE2B e075e5e2c7bd06d7c4310a2cb94b1ddd55014d9d8a920c100fcba01735188a7a9ed221224cc73e62efab02a9feb8d1f208a30964e41111063f1147299f098ce6 SHA512 be565377f3f776b387e4a8ff6bc07ac39c93bcf1a21e71cf96dd3474f459e07f050fd30b0b9281331a39c361155463b63c5a61f4271885126406029b5f9546a0
-DIST jc-1.18.1.tar.gz 3927394 BLAKE2B f87744e2cfdda10e6d2b1ea021f304e533ab1838de37f09b534e8ed1cf522d6267c96ac22d9ab665fdd593d27adcfa6da34f2f2471bae783585745882796ff8d SHA512 00fb9bfd2ebf9419c866ed56113310f3917e5dbbe538b0d48f5e66979773108f430168186fb350ed9494344f1ceb80e0bcef51344994b78e852b5c6305e9c474
-DIST jc-1.18.2.tar.gz 3928302 BLAKE2B 5deb67c56d3fc32728da6e67d7941c8ba01482c1ead86c82f68ed49c8aa53de8e88a77c3840db1f4d9c4d00ea5c96fdb9f7631d99f1dd9a288a41e2e9d50b797 SHA512 f425cc225fd4f993bb0a3c5065f0e90894e7330976dc4bfae08acd4559d0cad5a4cd14d93976814ea03f853ec0faf11bfc1c3b6b8b9d7a61071398d628ab57dc
-DIST jc-1.18.3.tar.gz 3970152 BLAKE2B bd37c2f4128005b39c4fd6b44664d2443f77830ca3158f0b4bb7133527e2543657f3d9654c8d845ada55c2940fc18cc7232117d3e298e3bfc62188250ee1b1c6 SHA512 8076668caaef2559537f828b45d0624f2a2ed35893e1c5af82671f3d97e1f71ebc22817f4036a0d60af183a5b3e717854672b2cfc65f776532ea8ca99ddfec35
-DIST jc-1.18.4.tar.gz 3981817 BLAKE2B f73f153913b02a29e88d75d49cf3f072124be0f23a5a65bf8c85e77bce3934d81406fabfaf5fb4cb9df57bb001b2772a6d31e6e3a3eb17b1cf71afb7d71178f1 SHA512 74eb22cfa7743ddb9477f7f0ab0afa24079e6003f4c25fc41cdfa492fefeda2a35b09bfd600e87c2cb1502667cd71c298af7f6995c097cee4e17df7476ce879b
 DIST jc-1.18.5.tar.gz 3981643 BLAKE2B 9eebaef4e2ee0a014df5fa73f0fecf9d91c62483594d529d6ae9b1d538ee4c62ec1ab6f673f0f3fbb32220920c843e8fd6a487ecaaa9662b63128ff9df786dcc SHA512 f105aa3aa6e5059d06976d089f52eb9c8a1005e2b2c0b9ee2b4229e2f82028277a45979d34a6f81679c22472d7a99903711ac6946accdb86c796e790d121112e
-EBUILD jc-1.17.7.ebuild 595 BLAKE2B 1bb002fc60911bb430e13ff166e84fffd0d0a22bfa2e08750a305f11a6ca8d57df1cbd009e91b23cbaeb068564ac57001ff613c0a63f643b5cb7fdfe934c3092 SHA512 76036c213cdee21957dc20dfc8a90b3cdee04b2458a5849ca05eac747949e90eb54a42a65a33081a2e467ad34e5c9c389f1a7be36fda28cd760267039baa82b3
-EBUILD jc-1.18.1.ebuild 602 BLAKE2B f4e29bab941025fae82cb2c6fabcd67f41b5be09eb8abfbec9d562b9c27f6b2d5b731acbda8799ddc0c9c698841ee686123c6633053a28067c3284b0ed9aeec2 SHA512 ba7d57f4a408acefe90fb7e0dbe4b4d9037fbe250bfd7bd1e3c3d91a224f30ad881c1afb25c22ab087a6b05c063e8cfebeeebb29bd278a6184417a324ba5691e
-EBUILD jc-1.18.2.ebuild 634 BLAKE2B fad123be15481daefa1628e338055aa19c3e34dd252d3ac24c68f343a0ddd9b6313f51ff4207db46f35875c54fc047b47e10f5e281ad1080f3beaf2fd9a1e063 SHA512 e225e4b726d4e81f874bf4e5bdef2517d206ae8c5d178db47f31b6a9bbd0b35f1c39f100bf6ba47f951306b58be2ff1b3dd61a0045762581cf519a953295269d
-EBUILD jc-1.18.3.ebuild 634 BLAKE2B fad123be15481daefa1628e338055aa19c3e34dd252d3ac24c68f343a0ddd9b6313f51ff4207db46f35875c54fc047b47e10f5e281ad1080f3beaf2fd9a1e063 SHA512 e225e4b726d4e81f874bf4e5bdef2517d206ae8c5d178db47f31b6a9bbd0b35f1c39f100bf6ba47f951306b58be2ff1b3dd61a0045762581cf519a953295269d
-EBUILD jc-1.18.4.ebuild 634 BLAKE2B fad123be15481daefa1628e338055aa19c3e34dd252d3ac24c68f343a0ddd9b6313f51ff4207db46f35875c54fc047b47e10f5e281ad1080f3beaf2fd9a1e063 SHA512 e225e4b726d4e81f874bf4e5bdef2517d206ae8c5d178db47f31b6a9bbd0b35f1c39f100bf6ba47f951306b58be2ff1b3dd61a0045762581cf519a953295269d
+DIST jc-1.18.6.tar.gz 4007477 BLAKE2B 9380e8a254df921983f486d8d9d0e8479e477e391075ace3fcaa40029f72b733abd6d55ed62f4cd436bb280fa37d9bdec6398418e24c714caa833fcef2991d35 SHA512 ae291ea271e12cebd1e0287cdc8e3f52c72959711d9da752880a1a90257b3add23c6a4b97d34ee0ebfa2332e355b90f8388cd425d18f03aa37c4979765101086
 EBUILD jc-1.18.5.ebuild 634 BLAKE2B fad123be15481daefa1628e338055aa19c3e34dd252d3ac24c68f343a0ddd9b6313f51ff4207db46f35875c54fc047b47e10f5e281ad1080f3beaf2fd9a1e063 SHA512 e225e4b726d4e81f874bf4e5bdef2517d206ae8c5d178db47f31b6a9bbd0b35f1c39f100bf6ba47f951306b58be2ff1b3dd61a0045762581cf519a953295269d
+EBUILD jc-1.18.6.ebuild 634 BLAKE2B fad123be15481daefa1628e338055aa19c3e34dd252d3ac24c68f343a0ddd9b6313f51ff4207db46f35875c54fc047b47e10f5e281ad1080f3beaf2fd9a1e063 SHA512 e225e4b726d4e81f874bf4e5bdef2517d206ae8c5d178db47f31b6a9bbd0b35f1c39f100bf6ba47f951306b58be2ff1b3dd61a0045762581cf519a953295269d
 MISC metadata.xml 391 BLAKE2B 7ae27439328a8823bbc95bbd4877e91d858db314b7ad708b10abec19d8bfa818a0dfa6821aee0825497353e071771bac4ddbeddb78749ca841d882c6a5f5493c SHA512 7d4760729571e0b5e055248a89dec389682cc4da6dfbd117d5a42ec016d4ea3c1f8fbd99118c3b62fd32195c6cae6aedab956678da48d61d6a0cee801a2ccf04
diff --git a/dev-python/jc/jc-1.17.7.ebuild b/dev-python/jc/jc-1.17.7.ebuild
deleted file mode 100644
index 5d846f299830..000000000000
--- a/dev-python/jc/jc-1.17.7.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Converts the output of popular command-line tools and file-types to JSON"
-HOMEPAGE="https://github.com/kellyjonbrazil/jc"
-SRC_URI="
-	https://github.com/kellyjonbrazil/jc/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/ruamel-yaml[${PYTHON_USEDEP}]
-	dev-python/xmltodict[${PYTHON_USEDEP}]"
-
-distutils_enable_tests unittest
diff --git a/dev-python/jc/jc-1.18.1.ebuild b/dev-python/jc/jc-1.18.1.ebuild
deleted file mode 100644
index eb0e616c0a64..000000000000
--- a/dev-python/jc/jc-1.18.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Converts the output of popular command-line tools and file-types to JSON"
-HOMEPAGE="https://github.com/kellyjonbrazil/jc"
-SRC_URI="
-	https://github.com/kellyjonbrazil/jc/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64"
-
-RDEPEND="dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/ruamel-yaml[${PYTHON_USEDEP}]
-	dev-python/xmltodict[${PYTHON_USEDEP}]"
-
-distutils_enable_tests unittest
diff --git a/dev-python/jc/jc-1.18.3.ebuild b/dev-python/jc/jc-1.18.3.ebuild
deleted file mode 100644
index f4014eac3167..000000000000
--- a/dev-python/jc/jc-1.18.3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Converts the output of popular command-line tools and file-types to JSON"
-HOMEPAGE="https://github.com/kellyjonbrazil/jc"
-SRC_URI="
-	https://github.com/kellyjonbrazil/jc/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64"
-
-RDEPEND="dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/ruamel-yaml[${PYTHON_USEDEP}]
-	dev-python/xmltodict[${PYTHON_USEDEP}]"
-
-distutils_enable_tests unittest
diff --git a/dev-python/jc/jc-1.18.4.ebuild b/dev-python/jc/jc-1.18.4.ebuild
deleted file mode 100644
index f4014eac3167..000000000000
--- a/dev-python/jc/jc-1.18.4.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Converts the output of popular command-line tools and file-types to JSON"
-HOMEPAGE="https://github.com/kellyjonbrazil/jc"
-SRC_URI="
-	https://github.com/kellyjonbrazil/jc/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64"
-
-RDEPEND="dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/ruamel-yaml[${PYTHON_USEDEP}]
-	dev-python/xmltodict[${PYTHON_USEDEP}]"
-
-distutils_enable_tests unittest
diff --git a/dev-python/jc/jc-1.18.2.ebuild b/dev-python/jc/jc-1.18.6.ebuild
index f4014eac3167..f4014eac3167 100644
--- a/dev-python/jc/jc-1.18.2.ebuild
+++ b/dev-python/jc/jc-1.18.6.ebuild
diff --git a/dev-python/jeepney/Manifest b/dev-python/jeepney/Manifest
index 712d63e8f20d..a990a08acad2 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.1.tar.gz 61833 BLAKE2B 626d4c921d0548ea898197ac5459f20b4c73fd52d3579c5b74f257158c82803011655c1d418d7d10afe8ba803100530bc08dbcce41e12727888de5be5995adb3 SHA512 f0af5a18a669f1a6322925201cad83ee01bc5a1b91577565042fd8a18b506a3650ff67b0ba333c8fb3b179f43ef243d16b07a9a1f7a7e5baec825dda0e6b0571
+DIST jeepney-0.8.0.tar.gz 106005 BLAKE2B 23dbd876915ca364202b6e1888d5b6892c56020a492f9dbdd22c1e04f40c2627bfb90ce209c69be000e176cc6b144b6c2232a21ce1ab089971911ffa2c22cd2c SHA512 823675f262c2c9778ccf9c1083601d936cca534fc0d2d9309b52aa6beeb7f73d225a37c5f18f6b0683c4829a93b1299a2cb4f8f341e55b92bedf58c8dce0aa75
 EBUILD jeepney-0.6.0.ebuild 1038 BLAKE2B 2c7df2b5380f85a8f19645135db863eac3038e58a031065d2a5f491fd5327651a774e37e7e434f1846bbe49abeeec90229c6874081b6c39a5116b08860f4b1b3 SHA512 f6143bbffb239ff02ee46ef558ae5296b98abb3e0a8387abf49a8776d7acf131ec348ba98ae63bfc83b9bb0cc454e0637eeb8e5bd435533edb9277fbf87de9f7
 EBUILD jeepney-0.7.1-r1.ebuild 1410 BLAKE2B c5106644e6f757020ea05da966c9fb6a233c0214c25f955e506f346647a57fe81c29c33fe34a3bcd6992b00c547b1886b9c1eba9cf29f0f7f1199e2f799c9a19 SHA512 a4a29104012412528195fbf48302cfc96c22eed701dd52a2f5f0d5093480dd215f7e04bde33918c0f3a5f1e65f6c2070ab6f8109dfefaace0949ce9a820ae737
+EBUILD jeepney-0.8.0.ebuild 1427 BLAKE2B 14708ee6deb8d7183774963c53e6cefed40a9e2291cb6dd692386d3ffb3f17972d33843b6e77ba3763077e772e8ad0147cd2ffa57a9b565c2f68bd9a6219f267 SHA512 433aa4b287035dfab31a66519e7946ecd5dbdaceba851f97df9e9935fc73bcfe23525426a196d456debfe588d23c3f44b998fc5643eff8913fd12546367569d6
 MISC metadata.xml 457 BLAKE2B 8128c212049aa1ed733a297b9b0d36ada9bf76f6e88fdd87207f3f8c7b71b96733bc080746795088e30a8238f6381951e0be72af28ce82bf4b99e41275c71d7b SHA512 2ce1e347f419b0047615eed4be61962c18b325c75a7ee98feac55b8372ffbc04a9290ca7d1426b5fdf8286f3130ac9712277d510b1a4a35471e3b6542bd5c2b9
diff --git a/dev-python/jeepney/jeepney-0.8.0.ebuild b/dev-python/jeepney/jeepney-0.8.0.ebuild
new file mode 100644
index 000000000000..18ca1de03898
--- /dev/null
+++ b/dev-python/jeepney/jeepney-0.8.0.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+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 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="examples"
+
+BDEPEND="
+	test? (
+		dev-python/async_timeout[${PYTHON_USEDEP}]
+		>=dev-python/pytest-asyncio-0.7.1[${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*')
+	)
+"
+
+distutils_enable_tests pytest
+
+distutils_enable_sphinx docs \
+	dev-python/sphinx_rtd_theme
+
+src_test() {
+	local dbus_params=(
+		$(dbus-daemon --session --print-address --fork --print-pid)
+	)
+	local -x DBUS_SESSION_BUS_ADDRESS=${dbus_params[0]}
+
+	distutils-r1_src_test
+
+	kill "${dbus_params[1]}" || die
+}
+
+python_test() {
+	local EPYTEST_IGNORE=()
+	# keep in sync with python_gen_cond_dep!
+	if [[ ${EPYTHON} != python3* ]]; then
+		EPYTEST_IGNORE+=( jeepney/io/tests/test_trio.py )
+	fi
+	epytest
+}
+
+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 cbf20e1b9a96..3439682bc8e7 100644
--- a/dev-python/jellyfish/Manifest
+++ b/dev-python/jellyfish/Manifest
@@ -1,4 +1,3 @@
 DIST jellyfish-0.9.0.tar.gz 132588 BLAKE2B e7490da91d1a53b775ef145151c6dba5b16c938f59773e205b5cf01e1a262d36bb07a49d8c5d823fa722e2d244fc8af1bf9a603911411461a97b155cfdd0ce83 SHA512 1faa3ea03ec8b26085b5db34339f0aea061d3e4897f29235eca56995bea36ae8c152ae0ab0c67279dab4844d92d89293e2de2126c1d449407652b77da258e9f0
-EBUILD jellyfish-0.9.0-r1.ebuild 685 BLAKE2B ef8006f723cfe2c9bfb4e6b63e35cad6e5e74e6b8afc90e1a7728630ed01a91faeeba79133d4bf95017c2a16f5e00a6023b38efd8d09040541b5af41cbf066be SHA512 65a0bd6bef2b6c8c4c4dc53f7bd1e5adcbeacca410f130a2f7bf1ad8767fb1b04ce4cbd13cf772f9c3483a559bf58d10b889028c737f04a320764cf8ea3fe0ac
-EBUILD jellyfish-0.9.0.ebuild 649 BLAKE2B fce80cdaf18910da755f972a28185d3d2b8f55ccfbb4aa04941a3dce7f7c57752ee7589bde4e156126d784414d25ca6e0894d892ded69604c18ccea8e2b139b9 SHA512 437ed3bb5386bbe3f801c19ba2116393facec952876e622da37e48f6d6d3b4e88ad5484258f9dde4d7a90aff9f8c1ea78700eac05ea92149fe3004a97afa5953
+EBUILD jellyfish-0.9.0-r1.ebuild 683 BLAKE2B 414925bb3f90fcfff9403c354d9ad890155a9ca193fbfb12c3a1b6469c23c866747f847495f3efce1e6d62b99a5e0e173f73f11d4c7daa850b8b76e9d2d7a7be SHA512 a1f44672d8b9379d1ec3068f079af571fd70cce55260f00008932c6e8b6a10cb4efb5e78b23ae8e54b06b87bc806cf4a4cb18e102e4fa365386a486a96aaab25
 MISC metadata.xml 504 BLAKE2B 65ba00e0a27d233e6850c5606eac6eacf7d1684bfeb64155c52cee5a196e54a0454465df8c310a91cf30d696b4812fa23014e3a8a483b197e8955a4ad751ee61 SHA512 51396a920abaed74a87aca55c00ee46404b4ed1773a4443eebe19b2e7b64b258b5b526a97bd4afc7e7aa495d7989192e3658105b69efba0bf280f57b52299738
diff --git a/dev-python/jellyfish/jellyfish-0.9.0-r1.ebuild b/dev-python/jellyfish/jellyfish-0.9.0-r1.ebuild
index 144312e581c6..f7d0da40ba81 100644
--- a/dev-python/jellyfish/jellyfish-0.9.0-r1.ebuild
+++ b/dev-python/jellyfish/jellyfish-0.9.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/jellyfish/jellyfish-0.9.0.ebuild b/dev-python/jellyfish/jellyfish-0.9.0.ebuild
deleted file mode 100644
index 8f92bc86d14a..000000000000
--- a/dev-python/jellyfish/jellyfish-0.9.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2022 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_tests pytest
-
-python_test() {
-	cp -r testdata "${BUILD_DIR}" || die
-	cd "${BUILD_DIR}" || die
-	epytest lib/jellyfish/test.py
-}
diff --git a/dev-python/jinja/Manifest b/dev-python/jinja/Manifest
index 096b0c2bf780..9adaafcf1d54 100644
--- a/dev-python/jinja/Manifest
+++ b/dev-python/jinja/Manifest
@@ -1,5 +1,9 @@
 DIST jinja-2.11.3.tar.gz 258057 BLAKE2B 4735464d044718ce1e6b2663ecb1b238b38fbf0f37ed683257775fe9e853186c089b98494209e511be5aa96bf6df8f6d472be132b6184a7d9213e182099c0433 SHA512 f8e2951edf780d7b44ac74d36579c89b0a5c076b4250faf643ae7e3ff6a431fedaabed640e5efb496cda1a79a4057bf312ae652484c8d4631d521689eb0adbc1
 DIST jinja-3.0.3.tar.gz 273634 BLAKE2B 3f72840f3f895471896b918b0d3173aa7b40a077fe78a014064e66ac74c3d1ef1ae811723a84ea56d32edde23ee26ab6091bd5ce7ee4e46a9693f34d2538b491 SHA512 8a364620a4660add0593f4b252a2f20423aa3017193dffe6e8aa80710444da0cae5e6c4b77247d39f33e90185f475714fb892f6b5f01d3055a88b0f669a748be
-EBUILD jinja-2.11.3.ebuild 1424 BLAKE2B 7bcbae35bbe865ed8af3601e3f22b8d70eb48952e1553240c24578ada0067ce91a9e82dcd334e40c6d1f015d8b21cf8d1ebfba6bb9db6a0d9fc11bcaa107862c SHA512 2e0165b30306a15270bec7163f23497324c76c3cb921616c3c14b60514c5c0e522b85b32b2191b9908322c156253f01154a26285e450688d151ef6d4d5438ffb
+DIST jinja-3.1.0.tar.gz 271851 BLAKE2B de55a518aa63e3c6ca88bd107709172f73fcb9419c75254b2c23c531b598af7860a303e7da6e61f03cf18edf6935c92f5c12c8b91a7f4eb955c64f472a506b02 SHA512 1bd75c752f8e1c45f05f881598c257a6a357658892307e1352dd4752f45ede9b23f0ce3c16909e1885243199c2b845357c3ea33af8d6848fe346c29eeaf22b60
+DIST jinja-3.1.1.tar.gz 272001 BLAKE2B 4787ee89d7e10cea24d3bf2810e391d5c17c00ffee8fd2f9244a9e24b219bc126e4111cc6b788107cbc07dd96732a2d1fc51dd87506545dc8beb7fdce5cd89b1 SHA512 285b3a2e09fbf891ce1d18e2692e400a9fe9d8968a36be50229972d9bdbb590bbea099cd26443de0fbe5ed7a2c6419eb211bfdac15c27a61b8db903e88855478
+EBUILD jinja-2.11.3-r1.ebuild 1460 BLAKE2B b2d08f495cec01d2d02143638b19e8848a80b822c3fca915771c3762580d779df413bb7f9b1160fdbeec0fb62dd4ae172e4c90e69245a848cb7f4bf66e35a2e6 SHA512 5a8ea50157dbacf032b3e7c13cc654a425bd12d38d662c0d040adc38e2fa61e4cdbc0bec7e01c9da4006230c17bc35a96dce158853026de5aec22b9799822a58
 EBUILD jinja-3.0.3.ebuild 1316 BLAKE2B 622e3f7fd3b54d2e960d69af59c62f0fbfd6756941383267b6a716e271612c6f857c1ddbc2870f68f19f2f318b89b3e4d2df3a547c91c26f1e345415e782f48c SHA512 fdf83e7f59fe8d5890650f698a11868a048c0d9c9ec4272d09de839c800085ed4681d920a2609094c4ae9992529a04cdea5898603e1853ab4fecbe6241256d99
+EBUILD jinja-3.1.0.ebuild 1299 BLAKE2B a62b5f7f4749e0d81264df1a21853884b6182f4ecbb2fc927c9de1773807fff4b634e0f2b9ffabe5f193ad8ef2b1af04c53d211afb2afb02b2e9a54d0bca1efb SHA512 bb9fdca49feddd19b6e3977718bf38403a122bb96d1f785a20b69a23c93d97164a73b99ad069ab06a2353ef42e108dd97e550e80823505091273eafb43f78456
+EBUILD jinja-3.1.1.ebuild 1299 BLAKE2B a62b5f7f4749e0d81264df1a21853884b6182f4ecbb2fc927c9de1773807fff4b634e0f2b9ffabe5f193ad8ef2b1af04c53d211afb2afb02b2e9a54d0bca1efb SHA512 bb9fdca49feddd19b6e3977718bf38403a122bb96d1f785a20b69a23c93d97164a73b99ad069ab06a2353ef42e108dd97e550e80823505091273eafb43f78456
 MISC metadata.xml 467 BLAKE2B 5cba0288a395e281e76810639b6e74153f1fe7532addb41ab9ff1e7e3d23616f2cd6cce9ef266ec3545fe6694fb3e25457f9ad383d5de3e2612dedd5609f2a6f SHA512 04f6f784b771602d2ad23afba5d8c9d10fb44b68873ea20a92904f0350081265852c9e4874866e8684c6a163e99f88053b5ea367357fd74790861f6e7d9cb1e3
diff --git a/dev-python/jinja/jinja-2.11.3.ebuild b/dev-python/jinja/jinja-2.11.3-r1.ebuild
index 2daebbcea91d..8bed8a3c2310 100644
--- a/dev-python/jinja/jinja-2.11.3.ebuild
+++ b/dev-python/jinja/jinja-2.11.3-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
+PYTHON_COMPAT=( python3_{8,9} pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
@@ -31,15 +31,13 @@ distutils_enable_tests pytest
 
 src_prepare() {
 	# avoid unnecessary dep on extra sphinxcontrib modules
-	sed -i '/sphinxcontrib.log_cabinet/ d' docs/conf.py || die
+	sed -i -e '/sphinxcontrib.log_cabinet/ d' docs/conf.py || die
+	# fix compat with markupsafe-2.1.0+
+	sed -i -e 's:soft_unicode:soft_str:g' src/jinja2/*.py || die
 
 	distutils-r1_src_prepare
 }
 
-python_install() {
-	distutils-r1_python_install --skip-build
-}
-
 python_install_all() {
 	if use examples ; then
 		docinto examples
diff --git a/dev-python/jinja/jinja-3.1.0.ebuild b/dev-python/jinja/jinja-3.1.0.ebuild
new file mode 100644
index 000000000000..008e162474da
--- /dev/null
+++ b/dev-python/jinja/jinja-3.1.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="A full-featured template engine for Python"
+HOMEPAGE="https://jinja.palletsprojects.com/ https://pypi.org/project/Jinja2/"
+SRC_URI="https://github.com/pallets/jinja/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
+IUSE="examples"
+
+RDEPEND="
+	>=dev-python/markupsafe-2.0.0[${PYTHON_USEDEP}]
+"
+
+distutils_enable_sphinx docs \
+	dev-python/sphinx-issues \
+	dev-python/pallets-sphinx-themes
+distutils_enable_tests pytest
+
+# XXX: handle Babel better?
+
+src_prepare() {
+	# avoid unnecessary dep on extra sphinxcontrib modules
+	sed -i '/sphinxcontrib.log_cabinet/ d' docs/conf.py || die
+
+	distutils-r1_src_prepare
+}
+
+python_install_all() {
+	if use examples ; then
+		docinto examples
+		dodoc -r examples/.
+	fi
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	if ! has_version dev-python/Babel; then
+		elog "For i18n support, please emerge dev-python/Babel."
+	fi
+}
diff --git a/dev-python/jinja/jinja-3.1.1.ebuild b/dev-python/jinja/jinja-3.1.1.ebuild
new file mode 100644
index 000000000000..008e162474da
--- /dev/null
+++ b/dev-python/jinja/jinja-3.1.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="A full-featured template engine for Python"
+HOMEPAGE="https://jinja.palletsprojects.com/ https://pypi.org/project/Jinja2/"
+SRC_URI="https://github.com/pallets/jinja/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
+IUSE="examples"
+
+RDEPEND="
+	>=dev-python/markupsafe-2.0.0[${PYTHON_USEDEP}]
+"
+
+distutils_enable_sphinx docs \
+	dev-python/sphinx-issues \
+	dev-python/pallets-sphinx-themes
+distutils_enable_tests pytest
+
+# XXX: handle Babel better?
+
+src_prepare() {
+	# avoid unnecessary dep on extra sphinxcontrib modules
+	sed -i '/sphinxcontrib.log_cabinet/ d' docs/conf.py || die
+
+	distutils-r1_src_prepare
+}
+
+python_install_all() {
+	if use examples ; then
+		docinto examples
+		dodoc -r examples/.
+	fi
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	if ! has_version dev-python/Babel; then
+		elog "For i18n support, please emerge dev-python/Babel."
+	fi
+}
diff --git a/dev-python/jsonschema/Manifest b/dev-python/jsonschema/Manifest
index b6e9ccf70144..10fd0c7ca352 100644
--- a/dev-python/jsonschema/Manifest
+++ b/dev-python/jsonschema/Manifest
@@ -1,3 +1,4 @@
 DIST jsonschema-4.4.0.tar.gz 313519 BLAKE2B 6339c4ac9e99b55e41c133861baacb6644e04d15e915d3199955512530c946973ca6d5348746688660ea7392d53102754dba3f3380fc8aa3a4ab284a9dcde684 SHA512 8e5c138f4debf7540e2cd131f3f208d1778927ac9036f5fa67bcf5db8c62fe1bb454c7818ee61acef64e856ea4b498ef6ab08be314a3c6b1e461e0bb44db41c7
 EBUILD jsonschema-4.4.0-r1.ebuild 1406 BLAKE2B e814d987746c27b388942acf0abfc55028aa5a4bb27bd4e6a6482e8b3fc31bd01c71316cec2c6552246d2c8fa119b41a13dd32c686fd70dd664cfa425f468c88 SHA512 da2f8ee25cc403494e713832cc5b1b7a187ec41589c868c5ca763d2ffc368e92a61d3136986e0a2e5132b0139bb59195e1dc27649b9075730ffc59b3e9b2ae50
-MISC metadata.xml 692 BLAKE2B 16ae14e9b64feca61846e85fc4b7346bcd19e0264fb04fbba4e14aaeb391d43ad230bd148486936744248b1b49627c775dd3b56afbfedb2b6b3b1d8465c8aa4c SHA512 dc301a6bbebb6c0b131db43dfb6c7de88decb1c362ef0097cfea617eeed7935dcf5d5be5a1e8bdf74d60910f2733e45f15805e2a98d8e8693117df9af64ee9e6
+EBUILD jsonschema-4.4.0-r2.ebuild 1380 BLAKE2B 5f69bcff8f627f459bdf133ba1c2c5e677698062cf091ddc2249f7910f14867ccc5323147c83a4c32bbd839dbbbad9a90f8474f62df3df8d84e37bd8c08c0f79 SHA512 672022f340738db3659d9ae265b5bf9ba2157215bf8eaa9a6575d994fa0ea15d8692df47ea7cad44ea8d4ba7594de27b15d0acdbfd5e9aff4c67cf790505e1a2
+MISC metadata.xml 703 BLAKE2B 240a82a967bf7e2c200a2359dc691cbfa119fbc415f41c594c981a0da551a779b9d6afd6f8aadc7daab074579d6964455cf8bc8de36f01e986d344d1082095c5 SHA512 88cf98273ec371942846bba05ec8cc38939b1ff1a4f35e16f5764d09e67830e6f86b741ccb11ca487071eef205d193f5d0ca5ab156eb429c89d10c90778594b4
diff --git a/dev-python/jsonschema/jsonschema-4.4.0-r2.ebuild b/dev-python/jsonschema/jsonschema-4.4.0-r2.ebuild
new file mode 100644
index 000000000000..847c8ba98403
--- /dev/null
+++ b/dev-python/jsonschema/jsonschema-4.4.0-r2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="An implementation of JSON-Schema validation for Python"
+HOMEPAGE="
+	https://pypi.org/project/jsonschema/
+	https://github.com/python-jsonschema/jsonschema/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~m68k ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	dev-python/attrs[${PYTHON_USEDEP}]
+	>=dev-python/pyrsistent-0.18.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_resources-1.4.0[${PYTHON_USEDEP}]
+	' 3.8)
+"
+
+# formatter deps
+RDEPEND+="
+	dev-python/fqdn[${PYTHON_USEDEP}]
+	dev-python/idna[${PYTHON_USEDEP}]
+	dev-python/isoduration[${PYTHON_USEDEP}]
+	>=dev-python/jsonpointer-1.13[${PYTHON_USEDEP}]
+	dev-python/rfc3339-validator[${PYTHON_USEDEP}]
+	dev-python/rfc3986-validator[${PYTHON_USEDEP}]
+	dev-python/rfc3987[${PYTHON_USEDEP}]
+	dev-python/uri_template[${PYTHON_USEDEP}]
+	>=dev-python/webcolors-1.11[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# requires pip, does not make much sense for the users
+	jsonschema/tests/test_cli.py::TestCLIIntegration::test_license
+	# wtf?
+	jsonschema/tests/test_deprecations.py::TestDeprecations::test_version
+)
diff --git a/dev-python/jsonschema/metadata.xml b/dev-python/jsonschema/metadata.xml
index bb56d4b870fe..6c4a82118957 100644
--- a/dev-python/jsonschema/metadata.xml
+++ b/dev-python/jsonschema/metadata.xml
@@ -16,6 +16,6 @@ Python (supporting 2.6+ including Python 3).
   <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">jsonschema</remote-id>
-    <remote-id type="github">Julian/jsonschema</remote-id>
+    <remote-id type="github">python-jsonschema/jsonschema</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/jupyter_client/Manifest b/dev-python/jupyter_client/Manifest
index 18312669ac22..7231768e26b6 100644
--- a/dev-python/jupyter_client/Manifest
+++ b/dev-python/jupyter_client/Manifest
@@ -1,6 +1,4 @@
 AUX jupyter_client-7.0.6-test-timeout.patch 1270 BLAKE2B c039b22d8f0c2893738a1b832bb82fa19c746dae8bfa839fd16056076e9a905218201d2cfe8896c4e826a09424656657d109b12893d21fee0d8e6b6952d55ae3 SHA512 66d57b9efae86bc2531d35634f35a5d74de6d467329aaea7a487b010b582440cdb8a91e318a3c6ce7f26d9fdae6aff7adff3a59c57d053695076b9f1c092fbf1
-DIST jupyter_client-7.1.0.tar.gz 323501 BLAKE2B fa431f70b327a98be3958b2c39a2aa07ab0ec3752f069bc5e6d0645ac0660074974c871b159002dcbf3054c97860dc6b0e289c34826d929f0493479cd9f37ed2 SHA512 eb9456088c19d3780d943fb9457ded5e006afb7e7ebd726d8a253f91107d8e1839cac16e25466c902ff33ed2777e97e18b08e24092ddbb062aa9cf6336dc8921
 DIST jupyter_client-7.1.2.tar.gz 326163 BLAKE2B 0cc11210cc3a472585d21acb836e316540d768c8c9ccc4a024720b278f3e2425e645080d8dcd501c118b3759bd354bf4f384821e87f1be0b7525addad6c267e0 SHA512 7baadc7d508c25ea588d0d7a6da8eb5a28fe4dbce32c9dfa1f9b2b82c7c3d7ae8c034cc03414b3eafec620931bd760c0844421197c01a3d25597af18f6e60060
-EBUILD jupyter_client-7.1.0.ebuild 1355 BLAKE2B 4d3df20a281cc1ff2eae77c676d55c29b27d6b74b0660af06f4746d4e1e899ed7c9728c2244ffdfaf0d3482fe1d909505665e9a57c54b89baf43a63cdbdfb44c SHA512 c4a9895e4cf60b8c93a3a253967d9797ba2c19a3738c88a35dc9e6ff629817746481b4091b59691dcfa77d29101fad23318112ee05ba95abbfb4e2381d52e41f
-EBUILD jupyter_client-7.1.2.ebuild 1395 BLAKE2B d008c76575dbdae64c7245ef586f27cd4411fbafce9ee336b4c23ed67c96793d1e4d1594bea2b16616549bef297f2483f86510d14615ae8e9ebf77c02d08c371 SHA512 a25b528cd3152105949b67876d16bf1a649b6d4e6a0f7016af41b3f729738abef633986ba701e754e5258a5ad24ae5dc06a559953ed063fc6cdbca063b2b9e13
+EBUILD jupyter_client-7.1.2.ebuild 1387 BLAKE2B 1e2aafece99bb7e7933846a18baa7b27391123f0434cf38409992f53bdda1351816f395965ee02d405a52185bcf1c33db9cbb930cd421cb7598fd53f9e44a4e6 SHA512 dc9a1c8ad7b2fa51d292df61468fed638fa41afdbd1585b710e4ce120b39e7d9049bbc7f28775b71175c9e183a39b7c0cd7b26c0d2fdadfb3ab34b00c97508f4
 MISC metadata.xml 780 BLAKE2B 98556448199bd8a63d493b16bdde3942dca45b907f3e2da4f94fdf77bedf05c55b08e5b8f05b01c818f6440ebd21552ea8edd7b2a970ff07ce03e88873197df6 SHA512 76411204bca5fef604cbbf1d320eb7de0ba3faf66ce86f4f1a8488de43fb854a21ad8f4137b365b129e6e565dfd276169161e183b18fe9b7b0960beb1b790293
diff --git a/dev-python/jupyter_client/jupyter_client-7.1.0.ebuild b/dev-python/jupyter_client/jupyter_client-7.1.0.ebuild
deleted file mode 100644
index 33d4c5b50950..000000000000
--- a/dev-python/jupyter_client/jupyter_client-7.1.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# 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
-
-DESCRIPTION="Jupyter protocol implementation and client libraries"
-HOMEPAGE="https://jupyter.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/entrypoints[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_core-4.6.0[${PYTHON_USEDEP}]
-	>=dev-python/nest_asyncio-1.5[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
-	>=dev-python/pyzmq-14.4.0[${PYTHON_USEDEP}]
-	>=www-servers/tornado-4.1[${PYTHON_USEDEP}]
-	dev-python/traitlets[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/ipykernel[${PYTHON_USEDEP}]
-		dev-python/ipython[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-7.0.6-test-timeout.patch
-)
-
-EPYTEST_DESELECT=(
-	jupyter_client/tests/test_kernelmanager.py::TestKernelManagerShutDownGracefully::test_signal_kernel_subprocesses
-	jupyter_client/tests/test_kernelmanager.py::TestKernelManagerShutDownGracefully::test_async_signal_kernel_subprocesses
-)
-
-distutils_enable_tests pytest
diff --git a/dev-python/jupyter_client/jupyter_client-7.1.2.ebuild b/dev-python/jupyter_client/jupyter_client-7.1.2.ebuild
index 36be213d7b35..57c632a5c3bb 100644
--- a/dev-python/jupyter_client/jupyter_client-7.1.2.ebuild
+++ b/dev-python/jupyter_client/jupyter_client-7.1.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/entrypoints[${PYTHON_USEDEP}]
diff --git a/dev-python/jupyter_packaging/Manifest b/dev-python/jupyter_packaging/Manifest
index 9e87a6121d26..6a3c692bb6cd 100644
--- a/dev-python/jupyter_packaging/Manifest
+++ b/dev-python/jupyter_packaging/Manifest
@@ -1,3 +1,5 @@
 DIST jupyter_packaging-0.11.1.tar.gz 21715 BLAKE2B 68cde8becbe10710bc68912da43877db2704f59bbde5247bc2f27553b90cce47f16665326650e3cc2d1de8008d82ff22b8d485b0d2c782ecbb732e7bd059038c SHA512 1027e909222f9dbe9d317030fa07d7a71a91ef9de961681e6842e486e5e12cda03f998e0a7c2c0fc52e9c3ec3f527bf9643bc1640fa94b16b20b500fc69eff42
+DIST jupyter_packaging-0.12.0.tar.gz 25258 BLAKE2B 1e8897297e6d1e592a5e3d934f850a9fadc27b7fd97484c6ef3dda9ae5d6da0c48116846e0f3fe7757c3c4794a7a8e2e3eaa69b3fe3a68f73cc952707fa27ec1 SHA512 2a34b64a34f6931b7ba0578a9c1c270285a970043136f65c4a7afbc8e9a5e70feb1bffdc00f682d1fa49fe1f5f91bd3a093437f0f05232e6a57c97eda7f1fc29
 EBUILD jupyter_packaging-0.11.1.ebuild 1114 BLAKE2B 7bfbf351121df796e515b80000d631735f1d4f1b7a210ce9c6e31a959176289b43f717d1c62c1dfdc0b07419363d5c506f008aed72186796527f28fa892d734f SHA512 5cf4c216e3d08c3c6f647f8c20014cefe2e4819d99bb0157f7799af32b84f26cdaac4c1dcb5fe87d9fdc2036713cf395d3eb42b8a21344c771b9947828bd5a74
+EBUILD jupyter_packaging-0.12.0.ebuild 1077 BLAKE2B 96f4954ae02a7f0f2b145797cab13d010ff1390164a9d80608bd714a9df400f212cc14cf5035a045f389b3d4ec4e805fc19bf5f44b634d8f62ec5ba9488967b4 SHA512 df3b1266a76cd450a8c8c9a9c14be049a15c7f624160843838dbaa09d41db75871e224d7bc3264e980a49a631bf92821ca95a847239f149a0c142909dee0883d
 MISC metadata.xml 436 BLAKE2B f17433d8ea516577cca652a0bb111cc9879ab5de87e056bb2cf28b3440858c92d8a942672f1d9e8be219c0aa7cbc255ccd603eef1920660366384b642c04430f SHA512 f7bd149e6c92e1164a5fc424a99bf44a1e15fcde8000171ad5d35828221ab38bedafb9460969bdde5151013f80a5197c1c1940d8434fe950104f149e9e8c449d
diff --git a/dev-python/jupyter_packaging/jupyter_packaging-0.12.0.ebuild b/dev-python/jupyter_packaging/jupyter_packaging-0.12.0.ebuild
new file mode 100644
index 000000000000..5d4545dcf81d
--- /dev/null
+++ b/dev-python/jupyter_packaging/jupyter_packaging-0.12.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Tools to help build and install Jupyter Python packages"
+HOMEPAGE="https://jupyter.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/tomlkit[${PYTHON_USEDEP}]
+	dev-python/wheel[${PYTHON_USEDEP}]
+	dev-python/deprecation[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/build[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# require Internet
+	tests/test_build_api.py::test_build_package
+	tests/test_build_api.py::test_deprecated_metadata
+)
+
+src_prepare() {
+	# https://github.com/jupyter/jupyter-packaging/pull/135
+	cat >> setup.cfg <<-EOF
+		[options.packages.find]
+		exclude = tests
+	EOF
+
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/keep/Manifest b/dev-python/keep/Manifest
index d249edf8eb91..d25c70626619 100644
--- a/dev-python/keep/Manifest
+++ b/dev-python/keep/Manifest
@@ -1,3 +1,3 @@
 DIST keep-2.10.1.tar.gz 13044 BLAKE2B 178207ccad7f0feec2d9a57f0e5345e0ef9853bedd3f8efc8afac5f81c35e74ee6d3dab66b75ceeac4a3d76f2297ec645bae61f2f1e78218e910a2537984f4cd SHA512 d4144bd7f6f623b1c9c9468f5596818f47cba8a9bc80e75ebaf75f147823a01da53ef84c76b9f24240a8d0fbdb770c5cdf108c276ecdcd882ac9db0c1608480f
 EBUILD keep-2.10.1.ebuild 624 BLAKE2B 71b63bb00343bdadd30fe67a72e0ba24cb1a98a6aa45a16d86a3050883aff14c8c1c4299276bbc3ee41fdfc8e64f141949be93662fd4b82822d8d7298e7746ad SHA512 2c3561ecb11bca2eda34c78bf2ca927df661db333e9dd28147e2f3b6649688d520059eb8d5d54e2efe9308b38ec5b33446be0e2985b53adc2baf5b9c441dc987
-MISC metadata.xml 368 BLAKE2B 1eba5dd09fa29cb73599816569604adafabb1814f56657672d3b3efea3129d151ae976bfc5f5f2dba79ff2ab733019ef799abb7db6313c6dfd5c0bc2878f4aab SHA512 1c7f0c0e57551d2526129f48185d26bdc1e2f4f4ed28b61bdb791bdb1e155955859f819c6a964c4aaadc819862dad3196bc2b8e69f3c4cb50dfaaf9e2898ccc1
+MISC metadata.xml 400 BLAKE2B 62327dcf8653077772b2af0a0c3ca33cb4e3ddc06f53803a01a257611ea828ca8536bd2e6b6ed6f0d86010580f590ced0931d09e8cf9aa9a79aff8def238cd43 SHA512 87ed56a0bfb1fc56de91e0b59a1dd0b8ec08b90d5b2746a27195d3a100856bde29dbda8594eb3fb301a64c58f3a9edb0d4a739c96e30e8ac19aebd6b1c8fed2d
diff --git a/dev-python/keep/metadata.xml b/dev-python/keep/metadata.xml
index de41a522d38c..c0085185fab3 100644
--- a/dev-python/keep/metadata.xml
+++ b/dev-python/keep/metadata.xml
@@ -3,6 +3,7 @@
 <pkgmetadata>
 	<maintainer type="person">
 		<email>kensington@gentoo.org</email>
+		<name>Michael Palimaka</name>
 	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
diff --git a/dev-python/keystoneauth/Manifest b/dev-python/keystoneauth/Manifest
index 5d52213e3a1f..b0e285643cf1 100644
--- a/dev-python/keystoneauth/Manifest
+++ b/dev-python/keystoneauth/Manifest
@@ -1,6 +1,3 @@
-DIST keystoneauth1-4.4.0.tar.gz 266308 BLAKE2B 471b6662c27b5cc36dfde76e17f6855d5e840280a05c5c23bbda97b2e75b8fbc44e815994de514a475424476ed4d627930f993ed5fc7109fa3a2a99acf42dde2 SHA512 208b02c8df8a5cbdad1ca66c665d547b375eac2fa0d3aeb6dea3f9ed7ba0e799568e4407b8771df5a362d4275fb6a9b2fe2e3a9287b3817da43463356bc593a3
 DIST keystoneauth1-4.5.0.tar.gz 266418 BLAKE2B cd56e6d62e185ded667b2e9a53478e65fdea7eea203e3598193b34137297a5b75e315433882a08d16f360936208eb55c6d4e5c80e64161f1ce00db2633e59d7a SHA512 eebf9f15624d4544351b26e80af4023dab3a60ad2848b14c1cf6ab4deab50d2c9812747f3e737aacd9e49eacaff3960d8cb1432067d2648d7d2552fdad907457
-EBUILD keystoneauth-4.4.0-r1.ebuild 1796 BLAKE2B 05d8f80e43c39615fc80c06af39d269a652c6c79e29dff0c16e77eb2bfe61a04b68a83f41ebf8ec0cd0d73030a0987ff168b439c70e2a8bfd895861bc3791ad4 SHA512 ec0028c09785bf6cbacec676580c7a6e46757b9c74f7b95eb9ed24390dd92dc59b1f31a49b3ceb57d76ebcba3ece6f64467a03b690d677f7535a40c845bdfa13
-EBUILD keystoneauth-4.4.0.ebuild 1774 BLAKE2B 16762466eb36990fd9c88270f55dd24c6d615762be75aaa3111654a9b7ff2e25b287a3c4568287d579868286cec19cebb6d17ec3215597cbe7fef99832d84d6d SHA512 20d8cfac67b9b6d3b054fcb9c42264cb23488267ad3f3f55e8bf9195cf072ca96f6a57edfeaf11ee3b9ee12d7b8d533423d0dd294696f305f1ec53972b801296
-EBUILD keystoneauth-4.5.0.ebuild 1795 BLAKE2B f25b46ccd0d4aa806cef0c8ec8d70e0f38c2a23f04cbf5958dfd6cdb49f9ec06ce235ad96ec28da432fa40e385191f09cee63a2b8eb2164fc80d26c94144c1de SHA512 6a60a114eda593f1d93defbfced5e2469ec13af6fad61046ec2f550d19fbe3ada56db087d7c8d13a0e22d51ddc4d03723f9cb7ff249155f71b719a12730063bb
+EBUILD keystoneauth-4.5.0.ebuild 1792 BLAKE2B 8d6e3f459551b0c39eb6b262f247385671cdfa6bedf68ae7fe05f0f72ab7c2a12ec148b37a876a0973adbf09d011c2ad7317429dccc1134940b615a7860559db SHA512 c3b0c4d2ad7e9f7fc855a792d40b8efa8dfbc5074f1ad27e6dbd3df76001f02d3f2425e0ef73aec232feab45307cde4ac2576a3cd342f381051b32d7995ed1d3
 MISC metadata.xml 518 BLAKE2B 8a84b6a7146096e67c0517623f0680cbe7772a48d8167b1aaf34dd12f7f626c84e60c0a15b3d90ae9df6483c33d7b51fc5cbf51d35e4f409e04573eb8fe18d1b SHA512 9a5b7fe8f29deed8ed59d6b3a96cfbacd5b566d6aa6eabd55545f02521d3dcc7ef7347632cdbead0735d28004ffe55a18550ee45cf8634253900f0190f140434
diff --git a/dev-python/keystoneauth/keystoneauth-4.4.0-r1.ebuild b/dev-python/keystoneauth/keystoneauth-4.4.0-r1.ebuild
deleted file mode 100644
index 3ca12335eaae..000000000000
--- a/dev-python/keystoneauth/keystoneauth-4.4.0-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="This package contains tools for authenticating to an OpenStack-based cloud"
-HOMEPAGE="https://github.com/openstack/keystoneauth"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}1/${PN}1-${PV}.tar.gz"
-S="${WORKDIR}/${PN}1-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-CDEPEND="
-	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/os-service-types-1.2.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	${CDEPEND}
-	test? (
-		>=dev-python/betamax-0.7.0[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/lxml-4.2.0[${PYTHON_USEDEP}]
-		>=dev-python/oauthlib-0.6.2[${PYTHON_USEDEP}]
-		>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/pyyaml-3.12[${PYTHON_USEDEP}]
-		>=dev-python/requests-kerberos-0.8.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/testresources-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	# relies on specific test runner name
-	sed -i -e 's:run\.py:unittest_or_fail.py:' \
-		keystoneauth1/tests/unit/test_session.py || die
-	# remove the test that requires hacking
-	rm keystoneauth1/tests/unit/test_hacking_checks.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	eunittest -b
-}
diff --git a/dev-python/keystoneauth/keystoneauth-4.4.0.ebuild b/dev-python/keystoneauth/keystoneauth-4.4.0.ebuild
deleted file mode 100644
index b9dd7b905ece..000000000000
--- a/dev-python/keystoneauth/keystoneauth-4.4.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..9} )
-inherit distutils-r1
-
-DESCRIPTION="This package contains tools for authenticating to an OpenStack-based cloud"
-HOMEPAGE="https://github.com/openstack/keystoneauth"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}1/${PN}1-${PV}.tar.gz"
-S="${WORKDIR}/${PN}1-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
-RDEPEND="${CDEPEND}
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/os-service-types-1.2.0[${PYTHON_USEDEP}]"
-BDEPEND="${CDEPEND}
-	test? (
-		>=dev-python/betamax-0.7.0[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/lxml-4.2.0[${PYTHON_USEDEP}]
-		>=dev-python/oauthlib-0.6.2[${PYTHON_USEDEP}]
-		>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/pyyaml-3.12[${PYTHON_USEDEP}]
-		>=dev-python/requests-kerberos-0.8.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/testresources-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	# relies on specific test runner name
-	sed -i -e 's:run\.py:unittest_or_fail.py:' \
-		keystoneauth1/tests/unit/test_session.py || die
-	# remove the test that requires hacking
-	rm keystoneauth1/tests/unit/test_hacking_checks.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	eunittest -b
-}
diff --git a/dev-python/keystoneauth/keystoneauth-4.5.0.ebuild b/dev-python/keystoneauth/keystoneauth-4.5.0.ebuild
index 3be77a24f5f4..af58d970b6dd 100644
--- a/dev-python/keystoneauth/keystoneauth-4.5.0.ebuild
+++ b/dev-python/keystoneauth/keystoneauth-4.5.0.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${PN}1-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 
 CDEPEND="
 	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/kiwisolver/Manifest b/dev-python/kiwisolver/Manifest
index 2132f9897785..cd7386b8158e 100644
--- a/dev-python/kiwisolver/Manifest
+++ b/dev-python/kiwisolver/Manifest
@@ -1,6 +1,10 @@
 AUX kiwisolver-1.3.1-darwin-build.patch 793 BLAKE2B fdcbfd2966f7f5e18859ca02bc85ef2928f053e49d4fa9bf9db5f086b32d74fd6d04488566ca63915cbd57b7a5b5fd0f3a9329c0b79918e40d487fcc3938f365 SHA512 e3031229d0e0ca18d3f0a9abe84aa3e0d8d62e212ea93551cecdd1be11698d2a73db5bc52c49b65a59681b0620f1718fab8c4093951edbffa6891495ec116931
 DIST kiwi-1.4.0.tar.gz 92361 BLAKE2B 773da71557d4c9fcd7778fa1771a1c52d0ca6aa4d698a33467a5a3fac8fd4bd3135aec9e836c96c4c18b2873e17743ce5cbc79c5dd1ea189f28adadcf2030e51 SHA512 6f69e232d5620be5f316d273066a1f8a78ebbef2dd8ee1ba56a2a57581fcc0c985fb0a51e6cca8436bcfeb51c4a95a865cde408c497bdec9c7e025f030744f54
+DIST kiwi-1.4.1.tar.gz 91319 BLAKE2B ac8d9cf1e8960f436566e2ff8d589ff6707fc4458299bc33ff96387c36246d583e67ef84610b710b3d9364d8a4ae963577b4abfc3ddbfc18a417f956512479d9 SHA512 7178f26c96ebf4a173b563bc95d2a07a9f75b618fc953aa0d45a8c2719cf868e4409ad2c95280704ee593fc99d9e2c83b0628940b3571d1be712241464a9cd6d
+DIST kiwi-1.4.2.tar.gz 91150 BLAKE2B 8441d52267b3b436d9f05baabbd3beafc51d2f257fc982f1cf90b6296ccdbc24511de6b55b6201eb1df37ec9487282cc40142e9083cf4c1e925976a098927e1a SHA512 e7726ac7985bea1020fd3a26bf54b941acfffffb1f47b462c74f9829c5a89e7abd0732b5a11685b20d6a17ac9625178c68ea71052e852f91491a308d07111b01
 DIST kiwisolver-1.3.2.tar.gz 89075 BLAKE2B 729880e3b18ac8c6c3e48d2fb32f00b4232118eb753f60837c7736c75a0f22e7a259aec46b76bc91286541847929eb4a92fcf9991650dea16d263f4d16beffc1 SHA512 e9ef20756df587b49f7b8e52ff388db6e2e551548ae7d60b6916586fb35249b10bda895a7be7635b300e6100ec1c7daf7d641de6d26d9b2c36055ac6c176302b
 EBUILD kiwisolver-1.3.2.ebuild 706 BLAKE2B c175a1023424a2be6873caa02cab3d65413cc14ba6ee937263f2aadd333b2ed6356e22e25850409a3f2516cd71faa4a7a87307669062da8e8e7a7a0b5f6b3c3e SHA512 bf0d8b1d4b03c8fcd0f00d2847cc7416b7ef93b2dc40f4b8f0f5696a6866092bed3f03da90b6cb8d1a71eaedac5516953cf2ee3585c69e9d96e918c68d251e8b
 EBUILD kiwisolver-1.4.0.ebuild 778 BLAKE2B da3f09da6a4812934d86dae664d7f498600d8989976eaa1f67fe0d1f8803d86305ca68bcc08effc79557ec2de9cf8b9e9d9300c68cc975ec57be6060941449c3 SHA512 4672f4f83ee84463eeabed2d6bbb6ab770a754c0d2713e7e60939f41c811462d28d381528e7a2701a160f3af76df314d0ca7d264ceb43ce436e8c9d50946e6f7
+EBUILD kiwisolver-1.4.1.ebuild 778 BLAKE2B da3f09da6a4812934d86dae664d7f498600d8989976eaa1f67fe0d1f8803d86305ca68bcc08effc79557ec2de9cf8b9e9d9300c68cc975ec57be6060941449c3 SHA512 4672f4f83ee84463eeabed2d6bbb6ab770a754c0d2713e7e60939f41c811462d28d381528e7a2701a160f3af76df314d0ca7d264ceb43ce436e8c9d50946e6f7
+EBUILD kiwisolver-1.4.2.ebuild 833 BLAKE2B ba5665051e0279ea758a1fc115b590427870790d8b974fa36079bc121735adc25237781ba6a46d7bdf2f46e721d94e968bd37cc3194d9eaf8771922e94332e17 SHA512 4395f6d1c8c9ad23927411e43cf4a7863d317ede88687e314b4fd00026f43eaa56e9322aa64583782f50d45423648480f877b14bbe4c1342e4bed6d070470330
 MISC metadata.xml 366 BLAKE2B d724248e9950219de4990e67822a16781e1a28f41d863fde04b3e1212b982a86819636a621b6e23089b76042ebbb23e0944a88ef9ab4c4abe62103f12197e5c2 SHA512 526fe3a81426edfc4c050631133799d948d1becb016319e954491090b9f3f6d410958db7027b5c2e2386b40c783f8c984b2588cda56e3ac58f3d2b1a5a8af0f0
diff --git a/dev-python/kiwisolver/kiwisolver-1.4.1.ebuild b/dev-python/kiwisolver/kiwisolver-1.4.1.ebuild
new file mode 100644
index 000000000000..aa5a5cacb378
--- /dev/null
+++ b/dev-python/kiwisolver/kiwisolver-1.4.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+MY_P=kiwi-${PV}
+DESCRIPTION="An efficient C++ implementation of the Cassowary constraint solving algorithm"
+HOMEPAGE="https://github.com/nucleic/kiwi/"
+SRC_URI="
+	https://github.com/nucleic/kiwi/archive/${PV}.tar.gz -> ${MY_P}.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Clear-BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/cppy-1.2.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/setuptools_scm-3.4.3[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/kiwisolver/kiwisolver-1.4.2.ebuild b/dev-python/kiwisolver/kiwisolver-1.4.2.ebuild
new file mode 100644
index 000000000000..40058f5337fe
--- /dev/null
+++ b/dev-python/kiwisolver/kiwisolver-1.4.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+MY_P=kiwi-${PV}
+DESCRIPTION="An efficient C++ implementation of the Cassowary constraint solving algorithm"
+HOMEPAGE="https://github.com/nucleic/kiwi/"
+SRC_URI="
+	https://github.com/nucleic/kiwi/archive/${PV}.tar.gz -> ${MY_P}.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Clear-BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+COMMON_DEPEND="
+	>=dev-python/cppy-1.2.0[${PYTHON_USEDEP}]
+"
+
+RDEPEND="
+	${COMMON_DEPEND}
+"
+BDEPEND="
+	${COMMON_DEPEND}
+	>=dev-python/setuptools_scm-3.4.3[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/leather/Manifest b/dev-python/leather/Manifest
index c8601bfe10a6..f46df7b8bf32 100644
--- a/dev-python/leather/Manifest
+++ b/dev-python/leather/Manifest
@@ -1,3 +1,3 @@
 DIST leather-0.3.4.gh.tar.gz 41368 BLAKE2B a1181da5904234677290134726da33a71e0f37e6f0161beb0ec7a73efca1b2b26e973221f2f42b72fd2640ef503a8adc905273885deef212ee9d1aae6d91f804 SHA512 0547adf5d455afe9397cf9c597cc7edbcdbe25bb56e32d764c67119bfe1329d959834f2a41720adb51ec926065e044feb27f7a5e3f800c8636a22d4f96752212
-EBUILD leather-0.3.4.ebuild 659 BLAKE2B feb742b0c9b99c969c3e2c71c6618267596428158de6016564be9cfc621bbda598d623426eaa5bd29fcefb7141beb534648252c0e69df3f8bac911583eb3bb6f SHA512 55cdeb650156a7b362090837f22ee78a6f181b8f96ae47bf622c2367a56ae743050cc38e626c75050b6aa4e73c4a0147c45f34999a5d18a4eb2dcd2c6e7e9e0a
+EBUILD leather-0.3.4.ebuild 666 BLAKE2B 3397d40ce6b919698daa154f0de30b0bc5156194d930a9d1e43d044972261bc77025326513c856027b90ba1b290ef798015118723939837a9f9451c0f61cbd4c SHA512 6d30176630bfc724fa5dc9213de82fe1df2ec75a48023b01e65b1872e2e48f659a2acf4f1ce7ef71883eb0da4f60ff6f6f6af22c3be48d890a487a709c01a0dd
 MISC metadata.xml 518 BLAKE2B 648219c9f1fc5535618ef0aa644fae01ddd4dbeeaa18abe51d6d3b78294bba210382c27ba9ff7f8ff62a649354663da3d483e46639d50b908a32993e27262ce2 SHA512 62a25d54f7de231344d7a3ddfa38f5ca145f6daa099e2a5666dc15ebee2448b2ee328d349b8a27db8d61fc2348186eae55507194338937f3bd33d1526ee0b33f
diff --git a/dev-python/leather/leather-0.3.4.ebuild b/dev-python/leather/leather-0.3.4.ebuild
index 0b16ba2fc747..1766784895a1 100644
--- a/dev-python/leather/leather-0.3.4.ebuild
+++ b/dev-python/leather/leather-0.3.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/wireservice/leather/archive/${PV}.tar.gz -> ${P}.gh.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~riscv"
 
 RDEPEND="
 	dev-python/cssselect[${PYTHON_USEDEP}]
diff --git a/dev-python/leechcorepyc/Manifest b/dev-python/leechcorepyc/Manifest
new file mode 100644
index 000000000000..ffea115b790d
--- /dev/null
+++ b/dev-python/leechcorepyc/Manifest
@@ -0,0 +1,4 @@
+AUX leechcorepyc-2.10.2-respect-CC.patch 2049 BLAKE2B e867abd473e3adde11c3c2c09bb8f5ebc3058b71f53035b84490c4c622c7d7ada4f660450069297516227fe8a9b704d64c4a7f148037085788714773e90fa99f SHA512 48325f1b794f1deadf760e534280ee06f06554dff3e44bca498aba9dcb3e62b46f213400e891499b0147809b8d6f238c7b9a2ac200b2ee9be9df24e11c1be6ac
+DIST leechcorepyc-2.10.2.tar.gz 119984 BLAKE2B e9bba5dd548ce5ce8c3a367d1ae21b66fca796e5614fe3cc86cdc16ddd1b589261534b551992a3964542f6d61fb6fb64bc9e2e03f8775486761107a4ffbeb958 SHA512 16048f3494452ff75fa946d65dfa36a7b0dd30c132db10c01fdc1dbe0de051c69856bf7b9830d68ee17ec1e4ce5fb29ba17a14f0facb928b81e4094ac5009716
+EBUILD leechcorepyc-2.10.2.ebuild 838 BLAKE2B 014d1fcc492d87191a9c0e4aa5a998d6ca74d4c1b4fa45af32b4a5f5fa8d60ba0133eba5c8ff8ca9f70be1e4367a5a24a244d1d00c1b86d285a375697a55b62d SHA512 bfef6c16890fb0d2056b55c3d48fd7c950a7dabf5657b31b7ae8752915d83a74689643d887917873528b67b89a411a7857fe62e2ab17955b72eb463612804817
+MISC metadata.xml 552 BLAKE2B 0c85ae8a9b8cfe95395bce89ea4e3e83bc5c3f9dc15d78c10de598efabc5c637f3ef979ca87a4807ecc5df03fee7ad97a6e0302813d863364fe57652e1907e73 SHA512 2591667487be3293718cc5f0df738bfbbe9b6a7318a2fafa4b1c7ad8e9e9377c3ec7fb0f507695f0ea2826fde0e3774e8ab32c1a93f3495758d3224f08ccffa1
diff --git a/dev-python/leechcorepyc/files/leechcorepyc-2.10.2-respect-CC.patch b/dev-python/leechcorepyc/files/leechcorepyc-2.10.2-respect-CC.patch
new file mode 100644
index 000000000000..62c5669ae6c1
--- /dev/null
+++ b/dev-python/leechcorepyc/files/leechcorepyc-2.10.2-respect-CC.patch
@@ -0,0 +1,49 @@
+diff --git a/leechcore/Makefile b/leechcore/Makefile
+index 4f4ff0f..bb04781 100755
+--- a/leechcore/Makefile
++++ b/leechcore/Makefile
+@@ -1,7 +1,8 @@
+-CC=gcc
+-CFLAGS  += -I. -D LINUX -D _GNU_SOURCE -shared -fPIC -fvisibility=hidden -pthread `pkg-config libusb-1.0 --libs --cflags`
++CC?=gcc
++PKG_CONFIG ?= pkg-config
++CFLAGS  += -I. -D LINUX -D _GNU_SOURCE -shared -fPIC -fvisibility=hidden -pthread `$(PKG_CONFIG) libusb-1.0 --libs --cflags`
+ #CFLAGS  += -g -O0
+-CFLAGS  += -fPIE -fPIC -pie -fstack-protector -D_FORTIFY_SOURCE=2 -O1 -Wl,-z,noexecstack
++CFLAGS  += -fPIE -fPIC -pie -D_FORTIFY_SOURCE=2 -Wl,-z,noexecstack
+ CFLAGS  += -Wall -Wno-unused-result -Wno-unused-variable -Wno-unused-value -Wno-pointer-to-int-cast -Wno-int-to-pointer-cast
+ LDFLAGS += -g -ldl -shared
+ DEPS = leechcore.h
+diff --git a/leechcore_device_rawtcp/Makefile b/leechcore_device_rawtcp/Makefile
+index 6ce9a8b..b3e7990 100755
+--- a/leechcore_device_rawtcp/Makefile
++++ b/leechcore_device_rawtcp/Makefile
+@@ -1,4 +1,4 @@
+-CC=gcc
++CC?=gcc
+ CFLAGS  += -I. -I../includes -D LINUX -shared -fPIC -fvisibility=hidden
+ LDFLAGS += -g -shared
+ DEPS = 
+diff --git a/leechcore_device_sp605tcp/Makefile b/leechcore_device_sp605tcp/Makefile
+index b3e4db4..f727c04 100755
+--- a/leechcore_device_sp605tcp/Makefile
++++ b/leechcore_device_sp605tcp/Makefile
+@@ -1,4 +1,4 @@
+-CC=gcc
++CC?=gcc
+ CFLAGS  += -I. -I../includes -D LINUX -shared -fPIC -fvisibility=hidden
+ LDFLAGS += -g -shared
+ DEPS = 
+diff --git a/leechcore_ft601_driver_linux/Makefile b/leechcore_ft601_driver_linux/Makefile
+index 7afbf33..6b62aa8 100755
+--- a/leechcore_ft601_driver_linux/Makefile
++++ b/leechcore_ft601_driver_linux/Makefile
+@@ -1,5 +1,6 @@
+-CC=gcc
+-CFLAGS  += -I. -D LINUX -shared -fPIC -fvisibility=hidden `pkg-config libusb-1.0 --libs --cflags`
++CC?=gcc
++PKG_CONFIG ?= pkg-config
++CFLAGS  += -I. -D LINUX -shared -fPIC -fvisibility=hidden `$(PKG_CONFIG) libusb-1.0 --libs --cflags`
+ LDFLAGS += -g -shared
+ DEPS = leechcore_ft601_driver_linux.h
+ OBJ = fpga_libusb.o leechcore_ft601_driver_linux.o
diff --git a/dev-python/leechcorepyc/leechcorepyc-2.10.2.ebuild b/dev-python/leechcorepyc/leechcorepyc-2.10.2.ebuild
new file mode 100644
index 000000000000..fc294ddf5e5b
--- /dev/null
+++ b/dev-python/leechcorepyc/leechcorepyc-2.10.2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1 toolchain-funcs
+
+DESCRIPTION="Python binding for LeechCore Physical Memory Acquisition Library"
+HOMEPAGE="https://github.com/ufrisk/LeechCore"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="GPL-3"
+SLOT="0"
+
+# leechcorepyc ships with a bundled version of the LeechCore library. So we
+# dont't depend on the library here. But we must be aware this module doesn't
+# use the system library.
+DEPEND="virtual/libusb:="
+RDEPEND="${DEPEND}
+	${PYTHON_DEPS}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.10.2-respect-CC.patch
+)
+
+src_configure() {
+	tc-export CC
+
+	distutils-r1_src_configure
+}
diff --git a/dev-python/leechcorepyc/metadata.xml b/dev-python/leechcorepyc/metadata.xml
new file mode 100644
index 000000000000..ea0d9f1880bf
--- /dev/null
+++ b/dev-python/leechcorepyc/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person" proxied="yes">
+		<email>mario.haustein@hrz.tu-chemnitz.de</email>
+		<name>Mario Haustein</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>sam@gentoo.org</email>
+		<name>Sam James</name>
+	</maintainer>
+	<longdescription>
+		The LeechCore Memory Acquisition Library focuses on Physical Memory
+		Acquisition using various hardware and software based methods.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-python/libcloud/Manifest b/dev-python/libcloud/Manifest
index fe9c513a223e..6f81e7548463 100644
--- a/dev-python/libcloud/Manifest
+++ b/dev-python/libcloud/Manifest
@@ -1,3 +1,5 @@
 DIST apache-libcloud-3.4.1.tar.bz2 1851322 BLAKE2B f141b85423babc41c4dc61f4ef27228da10f2d6d7c9a0dfff0a292cc226a36a7626f8398a8e04202417955720ea5eb0b48736b704cc1379ab05a2bc4e3e0c86e SHA512 72a745a689229901277b347a45e86c6b66836b490d177bfa078062f54d28a149da158b8224b7c8ad6c278de18ed87b2d22bcc119f2577159ef5ecc3fa1ec621f
+DIST apache-libcloud-3.5.1.tar.bz2 1859270 BLAKE2B c2e49a79ac4feccb5285d9bf55a4a6e8486d32968216b68e8c8f5b049ef5fa8caae853b4e4cc31ec2c323aedf3de275ab79758b1a055d7f20bbde994c58ba882 SHA512 22d6facf344687bfcfd32e53ede12227882f55bf54ffcf75d5584652c4cd257905c56e359d9c6b050635faa2305c344a6dfdc17007eb41143ccff772bd31d91e
 EBUILD libcloud-3.4.1.ebuild 1446 BLAKE2B dbffb60c458059be1e0bce32dedb66b4b6b9ceb49d37e7fe8ed796a4ec330e856f829f7880b6fe037f0fe8b8d5ac1507cf121dd7a3676daeb943e9109dc0575a SHA512 327523f1c7b5dd650053c8a34f9cb25d13efeda0feb8a1423d23190705610f75d417dc0e4526f2c478345fdcaeb2ffde8369dc14908735bd0c7ef8c32eee5879
+EBUILD libcloud-3.5.1.ebuild 1558 BLAKE2B 4c4eb8d62b64e04c20b6640cda6f9dca2c4159de6145f88bfe16910ec964fc885a90fd17c3b17e8f3ea37c07e085c156ca9d2948787bd4511c91147958e5ecef SHA512 83640ef416ef65309b6a2fd9fb8033640c163e3ff61c537866df7130597f20eed88b562812d8a4c9671c137cee9c4b626ffc13746d4ac536ec8bd57579c5dac1
 MISC metadata.xml 325 BLAKE2B 8e7ccf2783bad88105c9409b119c1affb4f963a605571d042026e7ce3c05ecc862156d10a7ff55524560721b3d2a39a3ceeb3cd685faaa24fe3fa9f433e02a56 SHA512 0122a0aa5d238ccbace5e66c47d95e072c74274ee16c32823c81e800288a9eefb7e76dce3c5f887c98ee54c5f9ed83894311fe317f1eea7e9bb97a1efdcf2bd1
diff --git a/dev-python/libcloud/libcloud-3.5.1.ebuild b/dev-python/libcloud/libcloud-3.5.1.ebuild
new file mode 100644
index 000000000000..954153c4156f
--- /dev/null
+++ b/dev-python/libcloud/libcloud-3.5.1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="ssl(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Unified Interface to the Cloud - python support libs"
+HOMEPAGE="https://libcloud.apache.org/"
+SRC_URI="mirror://apache/${PN}/apache-${P}.tar.bz2"
+S="${WORKDIR}/apache-${P}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="examples"
+
+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}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/requests-mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# Needs network access
+	libcloud/test/compute/test_ovh.py::OvhTests::test_list_nodes_invalid_region
+	libcloud/test/test_connection.py::BaseConnectionClassTestCase::test_connection_timeout_raised
+	libcloud/test/test_connection.py::ConnectionClassTestCase::test_retry_on_all_default_retry_exception_classes
+	# TODO
+	libcloud/test/compute/test_ssh_client.py::ParamikoSSHClientTests::test_key_file_non_pem_format_error
+)
+
+src_prepare() {
+	if use examples; then
+		mkdir examples || die
+		mv example_*.py examples || die
+	fi
+
+	# needed for tests
+	cp libcloud/test/secrets.py-dist libcloud/test/secrets.py || die
+
+	distutils-r1_src_prepare
+}
+
+src_install() {
+	use examples && dodoc -r examples
+	distutils-r1_src_install
+}
diff --git a/dev-python/libvirt-python/Manifest b/dev-python/libvirt-python/Manifest
index 7984e67e5688..6ca6b6109ffb 100644
--- a/dev-python/libvirt-python/Manifest
+++ b/dev-python/libvirt-python/Manifest
@@ -6,9 +6,12 @@ DIST libvirt-python-8.0.0.tar.gz 218832 BLAKE2B be86e423607f90fb9e93fdb3b1ea768e
 DIST libvirt-python-8.0.0.tar.gz.asc 833 BLAKE2B 12aec1acbf41811d9aa33a99038e1987624a2964579ef8ec236ba63fa8507cbe47d17e654221753a8d53af7d44ec53c2daca54f3b2dce18d8aea3e6d1012beaa SHA512 d6652f5d694a2b12d595fd78eb8ebc4f03ee02d20ed06187edfca5611b4784469af1cfd8c3ba009b799e7adf500775ede9d9c53544b995a072dc599797460d16
 DIST libvirt-python-8.1.0.tar.gz 221567 BLAKE2B aaf296f60c991c2877a2bb4ed47f1f2c4f75dd16b6831f53baab23883030cf20675ea61f636f0483e0c9a2f362638c860dd68eeb23b5ad82f43c66cd5f91b825 SHA512 507742d7b6503fdab45dad0b1e3b320f49a5cb01c1e0077f777bf41d53d2e6be4df0671e379d9a69330623ae362b725c7511d44d2c48489b21a657cf17efbd93
 DIST libvirt-python-8.1.0.tar.gz.asc 833 BLAKE2B a4fb10816ee50c1979926db87fa85e838e6caf74d086b612f07fb37730003030c16ce9f538fa8765a705b9a51d398e0284410a53aed31ac3452af4a4e5aae30e SHA512 2ca4bf7393f60267e0d7d32dcc50219847a86dbde76e1a83a9723c07133ff90d930dde32f454631c474fd36ac3837ccf94629576ddfb93288dfdb2490ce20724
+DIST libvirt-python-8.2.0.tar.gz 223589 BLAKE2B 6c8d39e6af1167aa24a1c0710177188aa0a73e54d9dbd6015d6a3b60726b78c45442fc756e68c61d54352a5fa9466f538ff986712e775bc54d46c885bcbcc8da SHA512 8d3eceb36651dbb903f51ec198dcf6bcd4dc3d3b31ce6a41df10928bbbf43b32a2f80c006c1fb9fc3e1cf2d7ffed95efc1209e0d20018135fb32c50876987d58
+DIST libvirt-python-8.2.0.tar.gz.asc 833 BLAKE2B 262a8072b58b19f871a72ed81d8dcab907130ce6f25f6478c72e6f3e7d8d51226fda1844a37baf82667d2f35ef3e64e84e47de1d33217a356ea1d78fec6aa548 SHA512 11ea846816a3300940b9792a5a778c633bb2d9e0523f442588ae82f8fb46ecc0256267b2efece655331112e3912c9bfcf46247555e48d1861999d1363f6034b1
 EBUILD libvirt-python-7.10.0.ebuild 1206 BLAKE2B 3760bb8f2fc8f0a97e12f650674955db6a6281bb5530b2a9caa4aff864e4ccaab19d42a3bc3ced123cb8df70e0709a4ae351254ec0068246ed46706234c4a56c SHA512 937b9fa13db6ffe188c73271fdf8c0e0a8ec19dcb0debb1b1952b2189f03a35289e8542f3f42ccd1913a100ae8ef0bf10d47bfe82ad15b4a54d2f8161feb79b4
 EBUILD libvirt-python-7.7.0.ebuild 1204 BLAKE2B eb29010dcf2599840ad832c909cdceb84a28394454cef6ed237e8d15053f09c75cb823a8b9bb4e1a9c68ad95780402e8cfb0e3cadc2a1b7cca5b27d34e3c1a8b SHA512 011fe53e40d9e563269b8a141cf0f50f14030938b4b8a39aff69824275895f11182b1f10c6d49d18b1bcc62aa8249a3fabe0a6b75903fe8ea204187dc523de8a
 EBUILD libvirt-python-8.0.0.ebuild 1206 BLAKE2B d40e5ad4f0bc0b5d29f590713ad09d7657cc74c16588022a3294f9e0d73a6103ad3198ef5196f9c88ccfc91115b6740eb91e6ee13513e85ab076d980fa96ad76 SHA512 1f47d02f05b4303e6d17b70387178b30856c8e993d807a49083be35fc437f9c2ee67bb87aa71fec25d84009d79d366ed3b962a951ebb3efb0b08ab67ee2cdb43
-EBUILD libvirt-python-8.1.0.ebuild 1206 BLAKE2B d40e5ad4f0bc0b5d29f590713ad09d7657cc74c16588022a3294f9e0d73a6103ad3198ef5196f9c88ccfc91115b6740eb91e6ee13513e85ab076d980fa96ad76 SHA512 1f47d02f05b4303e6d17b70387178b30856c8e993d807a49083be35fc437f9c2ee67bb87aa71fec25d84009d79d366ed3b962a951ebb3efb0b08ab67ee2cdb43
-EBUILD libvirt-python-9999.ebuild 1206 BLAKE2B 3760bb8f2fc8f0a97e12f650674955db6a6281bb5530b2a9caa4aff864e4ccaab19d42a3bc3ced123cb8df70e0709a4ae351254ec0068246ed46706234c4a56c SHA512 937b9fa13db6ffe188c73271fdf8c0e0a8ec19dcb0debb1b1952b2189f03a35289e8542f3f42ccd1913a100ae8ef0bf10d47bfe82ad15b4a54d2f8161feb79b4
+EBUILD libvirt-python-8.1.0.ebuild 1249 BLAKE2B a6ff9e65f24e40ca5ce1657c72f8537306e4b27fc8e8f1d2ed70f4217e6bdee1bbe64ca508cd3e083b8f5c320ee79e4d3313aa25169bc9eb291afeaffeb46262 SHA512 713ad435529d28998e564c0afab383fcfad61c8926239226b360ada632ddd35b89697a42ee2eec941799e5d7c0f72d1e06d9f2cb0ca80c82a5aedb02b1e337c4
+EBUILD libvirt-python-8.2.0.ebuild 1251 BLAKE2B 94dadcd723e88005a2aeaf28671d66ccf267d64c4aac6cb60635600d2117bb3523d0278a0a4124b44e9cf7cefea34c41267ec2927c85578eece1154dda7cf860 SHA512 e6bb041858081043dee36f1c8267928ff413d09a72df14c23c9c21f1319907294de10559717fb0bbb4e1bacb4a5fd29b32bb38e70da7778f0035f866a2d953fb
+EBUILD libvirt-python-9999.ebuild 1251 BLAKE2B 94dadcd723e88005a2aeaf28671d66ccf267d64c4aac6cb60635600d2117bb3523d0278a0a4124b44e9cf7cefea34c41267ec2927c85578eece1154dda7cf860 SHA512 e6bb041858081043dee36f1c8267928ff413d09a72df14c23c9c21f1319907294de10559717fb0bbb4e1bacb4a5fd29b32bb38e70da7778f0035f866a2d953fb
 MISC metadata.xml 581 BLAKE2B b0ce75afc6b03055de71b4903b3d8ea2198790873051f4aaa5e15a2c3e77b50f320ec3d9fb7f379194889e771296f81c65f2826ca2283ba4d4a9a5ccc8af932f SHA512 a123b9833c1154c96842d234f5c8b729bd6be5a987a5d09035109261a27b0c6f2b26c3bed5865f4cc3b5b262e8a3d2c69908550fb804da15ea47d297ed9e39c8
diff --git a/dev-python/libvirt-python/libvirt-python-8.1.0.ebuild b/dev-python/libvirt-python/libvirt-python-8.1.0.ebuild
index 6000240c3d04..13e15986dc34 100644
--- a/dev-python/libvirt-python/libvirt-python-8.1.0.ebuild
+++ b/dev-python/libvirt-python/libvirt-python-8.1.0.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=7
 
+# Please bump with app-emulation/libvirt!
+
 PYTHON_COMPAT=( python3_{8..10} )
 
 DISTUTILS_USE_SETUPTOOLS=no
diff --git a/dev-python/libvirt-python/libvirt-python-8.2.0.ebuild b/dev-python/libvirt-python/libvirt-python-8.2.0.ebuild
new file mode 100644
index 000000000000..d88122f6fa4f
--- /dev/null
+++ b/dev-python/libvirt-python/libvirt-python-8.2.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# Please bump with app-emulation/libvirt!
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_SETUPTOOLS=no
+MY_P="${P/_rc/-rc}"
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/libvirt.org.asc
+inherit distutils-r1 verify-sig
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.com/libvirt/libvirt-python.git"
+	RDEPEND="app-emulation/libvirt:=[-python(-)]"
+else
+	SRC_URI="https://libvirt.org/sources/python/${MY_P}.tar.gz
+		verify-sig? ( https://libvirt.org/sources/python/${MY_P}.tar.gz.asc )"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+	RDEPEND="app-emulation/libvirt:0/${PV}"
+fi
+S="${WORKDIR}/${P%_rc*}"
+
+DESCRIPTION="libvirt Python bindings"
+HOMEPAGE="https://www.libvirt.org"
+
+LICENSE="LGPL-2"
+SLOT="0"
+IUSE="examples test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	virtual/pkgconfig
+	test? (
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+	verify-sig? ( sec-keys/openpgp-keys-libvirt )
+"
+
+distutils_enable_tests setup.py
+
+python_install_all() {
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/libvirt-python/libvirt-python-9999.ebuild b/dev-python/libvirt-python/libvirt-python-9999.ebuild
index 6dbe00052c00..d88122f6fa4f 100644
--- a/dev-python/libvirt-python/libvirt-python-9999.ebuild
+++ b/dev-python/libvirt-python/libvirt-python-9999.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8..10} )
+# Please bump with app-emulation/libvirt!
 
+PYTHON_COMPAT=( python3_{8..10} )
 DISTUTILS_USE_SETUPTOOLS=no
-
 MY_P="${P/_rc/-rc}"
-
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/libvirt.org.asc
 inherit distutils-r1 verify-sig
 
-if [[ ${PV} = *9999* ]]; then
+if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://gitlab.com/libvirt/libvirt-python.git"
 	RDEPEND="app-emulation/libvirt:=[-python(-)]"
@@ -25,9 +25,9 @@ S="${WORKDIR}/${P%_rc*}"
 
 DESCRIPTION="libvirt Python bindings"
 HOMEPAGE="https://www.libvirt.org"
+
 LICENSE="LGPL-2"
 SLOT="0"
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/libvirt.org.asc
 IUSE="examples test"
 RESTRICT="!test? ( test )"
 
@@ -47,5 +47,6 @@ python_install_all() {
 		dodoc -r examples
 		docompress -x /usr/share/doc/${PF}/examples
 	fi
+
 	distutils-r1_python_install_all
 }
diff --git a/dev-python/line_profiler/Manifest b/dev-python/line_profiler/Manifest
index d159a5dfb7f3..7c54761e0cef 100644
--- a/dev-python/line_profiler/Manifest
+++ b/dev-python/line_profiler/Manifest
@@ -1,7 +1,9 @@
 DIST line_profiler-3.3.1.gh.tar.gz 56700 BLAKE2B 030c0fc742a6773ebb55a54a3c21d3d5e5d6d5d258a2c3cd2071ff93917411b65e100bfc6549d9c60d9a7c361c53b291d8b81538acaf5b83665c04129d25bc02 SHA512 8a3704a6df2abe71283cb2da23b738932c6f4b42aedcdefda0d318fd4b894d56831a855c4be4430657308530a04d1e96b0e15a60edca06621bdd5370c0bf9911
 DIST line_profiler-3.4.0.gh.tar.gz 49076 BLAKE2B 1fa2d7462913b21b5c3d69be64492fd5002d10c6c454cb3129860e4156cf04fbbd839b140f229b586ff9f0b195baae435bc461c4bab1405c38da49bf348827c3 SHA512 79a6e71ec083aacbc95fab5e044a2a38119bced505e5b9720288e32103773dc64a8bbbf6c2c7913b7b5057420cb31c3943cc1dce2d7d029df82b6b59e451c357
 DIST line_profiler-3.5.0.gh.tar.gz 51142 BLAKE2B 1dade129a8913f6fe42fcd646c1f8850b5a948bad476755dd54bf04815e293508d77b9160157623a6060a864722c81466690722b79a603bba9b7651ba3e7e25d SHA512 4c797bb9990e77a5ef8cb38113fe28c4925a631ca8f034f33fe2aeeeb77bf9b24cfc1fb6217ddec07b767a2dec325f388e402ca38da43790f58c644a4a147a75
+DIST line_profiler-3.5.1.gh.tar.gz 51241 BLAKE2B a3f3cceab9d34062a0b96ce772941bb945f96f7e88f59bb72d08a09fb96db3d9354ce33b0c0088065df5aeb7349c7da37d8697654d9f5130d8bd0b7997306d13 SHA512 4618e57e52b7d7d5ece034735a4ce38dd3a8af57e5b897790be4c8e1ee1757d822d7c1bb76d3c7248432c49c13708bffb9bebbbbf61442de98c5a6ec657cbd57
 EBUILD line_profiler-3.3.1.ebuild 1072 BLAKE2B 6b412fbfd938cf1a646c17aed4cf97a308e8d5af97791ffed24ecdabb3b93e3fdf5f7da2b866cb2023dda6bfeddada7bbf79c9f7d408f5369f383b4924926f48 SHA512 12d0eb3477bd386b3394ad9acb65c5dd120fa67fc8928072aa5da84758a72dd4e11e2c7e3dd69873d6a45a2748709cadcd875c7b92747997d8ca18e7367b8a62
 EBUILD line_profiler-3.4.0.ebuild 1073 BLAKE2B 171915773afd9869541a1be2f2e32136d30012501fcc264ced89f882d4898e4d65f013277a75c409c42d469fba5e3e957dee496122fd7d6d72025355e729d6bf SHA512 f450adefc1c623201ee85cb3beac0a877cd1b30706dd829cf3b5452e5457a18e3fcf9bf1729d4ca7e3a9e7d516fd7bf4ba17cbe9b2f56448a4ec9a0da34ba0be
 EBUILD line_profiler-3.5.0.ebuild 1004 BLAKE2B 3ae5eb967e59fa65ad0b2d7e7c17f0d6a20f1e768d80eeeb817474e1d3f9095370fa8b48c78d1c05c8c195748d87202094c58eb805dc6bfdc10a4da384610d46 SHA512 bbc8f218be66e5c0d8dc7f206901892aa516d37fdf14b301c3b335d5ac0f3041eaa092642223b1b143544f4bb59aebcbf98a6515faa249023726734ed763585b
+EBUILD line_profiler-3.5.1.ebuild 1004 BLAKE2B 3ae5eb967e59fa65ad0b2d7e7c17f0d6a20f1e768d80eeeb817474e1d3f9095370fa8b48c78d1c05c8c195748d87202094c58eb805dc6bfdc10a4da384610d46 SHA512 bbc8f218be66e5c0d8dc7f206901892aa516d37fdf14b301c3b335d5ac0f3041eaa092642223b1b143544f4bb59aebcbf98a6515faa249023726734ed763585b
 MISC metadata.xml 775 BLAKE2B 6d817146b4f2379141f3def2ab8cb2d69f40e1e7645e714c09ad30a425d14c85c50749ffe2c4d6dec9bf146e294caaf8a1647d2a15d672667932ca7543d0df59 SHA512 745e91051af76df1a7344923dfdfad748fc11bf663c60f3c83a5d434ebfeb218ccc91a314244008bf6a39a4be77b3b3c5457739e1102ba188ddf7c8203b75695
diff --git a/dev-python/line_profiler/line_profiler-3.5.1.ebuild b/dev-python/line_profiler/line_profiler-3.5.1.ebuild
new file mode 100644
index 000000000000..a631bb642adf
--- /dev/null
+++ b/dev-python/line_profiler/line_profiler-3.5.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+# force it to match scikit-build
+CMAKE_MAKEFILE_GENERATOR=ninja
+
+inherit cmake distutils-r1
+
+DESCRIPTION="Line-by-line profiler"
+HOMEPAGE="
+	https://github.com/pyutils/line_profiler/
+"
+SRC_URI="
+	https://github.com/pyutils/line_profiler/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/ipython[${PYTHON_USEDEP}]
+"
+# technically, the package claims to support non-scikit-build build
+# but it's clearly unmaintained and broken at the moment
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	dev-python/scikit-build[${PYTHON_USEDEP}]
+	test? (
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/ubelt[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	cmake_src_prepare
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	cd tests || die
+	epytest
+}
diff --git a/dev-python/lit/Manifest b/dev-python/lit/Manifest
index 29341890e477..d9e40a25b132 100644
--- a/dev-python/lit/Manifest
+++ b/dev-python/lit/Manifest
@@ -6,7 +6,7 @@ DIST llvmorg-14.0.0.tar.gz 158057350 BLAKE2B 7052684c620a5eaf52beeee4591adf58cfe
 EBUILD lit-11.1.0.ebuild 901 BLAKE2B 03656b1026178d703dc2274b8c8e64504d9f84f9946a34efc1e6a03d3b3038f2a6c23e3c16efc6666314f695315a1995d3cbb5a385a17811fb44a372d6caa6bc SHA512 7a09406d817d5110a489686aefb87d85bb0b8b0a958cb2c4a2065b02e2eb6152023a1f06391be934629c27032b73dbca971404bd848a93a9ab602baf7591b838
 EBUILD lit-12.0.1.ebuild 874 BLAKE2B b81a41897a2bf7e2c266cc70bc77c694f6d49423b6d7e8eec56d2702377abf4df9dad93126232808dd913ecbdf489fc2a21f4a4281b266e74498f241815a858e SHA512 584c8ef14481ac16ebe461ce0fd7680eef44f743caf51a30fc78e4b4b840a335cd37e2a767140fb65daad543633b8922174892d47bdc1dee8055b6a97237167e
 EBUILD lit-13.0.0.ebuild 874 BLAKE2B b81a41897a2bf7e2c266cc70bc77c694f6d49423b6d7e8eec56d2702377abf4df9dad93126232808dd913ecbdf489fc2a21f4a4281b266e74498f241815a858e SHA512 584c8ef14481ac16ebe461ce0fd7680eef44f743caf51a30fc78e4b4b840a335cd37e2a767140fb65daad543633b8922174892d47bdc1dee8055b6a97237167e
-EBUILD lit-13.0.1.ebuild 909 BLAKE2B 75a0e073d22d2a8afc5a3074c27746431d4fbd41d115f91502994564da1428924dc5ecf92a0311879ab2579b0c6ab272a14bea5c143b087bac0966c3ce3704cc SHA512 f1c3c88c1483b3e9813b897b4386ce850f143b418d30291319214b57b4557caae8d1f577398bccba38cc7884b61d02b06bab29faa4550204a488f2b32957ab72
+EBUILD lit-13.0.1.ebuild 908 BLAKE2B 3e658cc76ecbfc7cccf38ff2f3a67c35aa3b49d233543206ccebeedbeca0ec74f60e73c36b8b7fe3b3b031bda3d9ea8cb7b9de07d81c07807b91e6215c9d8846 SHA512 1238cba11ad1afdfece30782d8f3e4d3e452ba23aa352b9b7f833a1130eed839d768bccf7c223e29396a72237fec6691e3f1756c74512b2e865e9b1d5296e909
 EBUILD lit-14.0.0.9999.ebuild 870 BLAKE2B f2ead6cc71c782a468f5e8b4e8c55c32e477173594bd62544d6a1cb73186f4abc77629c03ff8314c04f2ff74152f6c26d117e4491047bc8f79056e751cd6b9be SHA512 5be9a463e0e43a52a7f997fe281f792ab6c32cf18acd578fc2df291318d53bd6a1f38475133304a9c0f7fb28a33822c779890809ddcae7232d83682a24a164ba
 EBUILD lit-14.0.0.ebuild 912 BLAKE2B 8c97416bca64d16cd0ca09b93e3012171f2febccb93e78e6fe65ac4d0a7758f926cb5e7a39a470456e9746055b3da9c29290b226d597430fe21535421c97cf8d SHA512 d18c4e602580097812614746fe0e2f6670bfbae0d5a99b9012c1f44e9e4bcb85b64eac0b43f0b9a16d4b615ef22654c470f379fe32e9789f98d4a1b09276e02f
 EBUILD lit-15.0.0.9999.ebuild 870 BLAKE2B f2ead6cc71c782a468f5e8b4e8c55c32e477173594bd62544d6a1cb73186f4abc77629c03ff8314c04f2ff74152f6c26d117e4491047bc8f79056e751cd6b9be SHA512 5be9a463e0e43a52a7f997fe281f792ab6c32cf18acd578fc2df291318d53bd6a1f38475133304a9c0f7fb28a33822c779890809ddcae7232d83682a24a164ba
diff --git a/dev-python/lit/lit-13.0.1.ebuild b/dev-python/lit/lit-13.0.1.ebuild
index 1ac603b98c4f..14ef9e82415a 100644
--- a/dev-python/lit/lit-13.0.1.ebuild
+++ b/dev-python/lit/lit-13.0.1.ebuild
@@ -13,7 +13,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/lockfile/Manifest b/dev-python/lockfile/Manifest
index d34d16bb91bb..d3ed00d96eea 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 0aa9d7128aaf9004988c8806bf4b9860f1fba87b14cd71bbbb8b6b76d901a2e96d08165be610d0504fa17cc63f7c09ef7f53300c1fc7744df6bcb9696318e83d SHA512 f6499069f6f9c6f9b260255c15bd9f2c0fc18ff802b6165c417d87d08d5ab0c8c6f4f6e076e8ea8020905373a3428180136eb91d1c8fedc658b0c23d40267a73
+EBUILD lockfile-0.12.2-r2.ebuild 604 BLAKE2B 62be6c81752a789814ef9484d5366cfe6eb5aa2785b07b68262b63ffdadd96d0ac65309f8c5bdb6759dea8cf76d539a87b8f0c9370f529981e6baa721adb5cee SHA512 e82a2397cb8c51db5f52ed768f41299076a43bce83471278bc8e83a55b24411227f98efc3847010dfd0295dcf020bad2d42feb092fe1bbae8b1b10f842713f8a
 MISC metadata.xml 389 BLAKE2B 00c71a4c10b51971e512ff1c19e18566370966282421bf8cf108c1950fb76c9e01a56b6ead6b5fe6102ca6375365a18466b4c887458914fecd7fa67b438d4d84 SHA512 2d558396239b2e3b9c4e79bbc89a6bd510554d76e875ba91b3a0192085b62974d278fcc6d16724d05e007e28931bef38b95246f80b74166ef151f50e62b6211f
diff --git a/dev-python/lockfile/lockfile-0.12.2-r2.ebuild b/dev-python/lockfile/lockfile-0.12.2-r2.ebuild
index 1e2e089dd5cc..1d9b54e15ac9 100644
--- a/dev-python/lockfile/lockfile-0.12.2-r2.ebuild
+++ b/dev-python/lockfile/lockfile-0.12.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 BDEPEND=">dev-python/pbr-1.8[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/loky/Manifest b/dev-python/loky/Manifest
index 524942a29c65..c31a51deff9e 100644
--- a/dev-python/loky/Manifest
+++ b/dev-python/loky/Manifest
@@ -1,5 +1,3 @@
-DIST loky-3.0.0.tar.gz 152463 BLAKE2B 99f0a1fc85e879626d12402dd4fee4b92345eab9520b1afaf95bbf869d2dc9e429f1f9810554e10d97f0ecbc4add28b1cbaee0477de05aa366faeb335eaef7c8 SHA512 ad171bfac031ab4d6749bde416031e905eb29adb97dab9c3348791c9df78b17e1e3eab8a354954d7c16fb2095ccc03d26cf2153fe53a546007a7a89c6046cb36
 DIST loky-3.1.0.tar.gz 139211 BLAKE2B 32e95312c40d6f8d8f9fc8daf5a1e85f1b874cbb902a4885621983d84a5fa9da42f05ff7d5d6bf58cf04a320c04c6e698ff0105cdad9ddd3248a109cc71c9883 SHA512 8bf6b032bb4f770d89c8de93d95c5805fa90dae34f2754f14c3a9fe7860230e8ce8ea97e1b09fa2cdf67f8aecdbd6d1e47ae4fb746fb1c6912d2dd65033f5b6f
-EBUILD loky-3.0.0.ebuild 1018 BLAKE2B 83cdb4c6a4baabf372962df394342bf21454b8f399eef21162fe32e419f54dae00194b17797d9bbe3b14be2b0927a723060843ff6bf7f13c2ffff1265c2cca0c SHA512 8ac89a930e757fb6add9d719f0faa731cb7d86ba64bcec4980cf3f49bbc65dbe5714e732c26ce80b32f15911333257ca2f62cee839f797867a1942eef2a93f6b
-EBUILD loky-3.1.0.ebuild 1036 BLAKE2B 3a1fab14065bf8903dc479a5c6091b35ac01078aa0630c87be1af6a087c4aa0604f95299e1d8fac3ade49c7711417145121d2a16cecbb792bba3ba818b0b428c SHA512 745a0c1f749244ef47f45c22b8b465f5224336534454bc539a4319fcf8285a87f1580ef1f6651304b52379468cbded3cc041c69f33c0d8ce41d731f651d7b960
+EBUILD loky-3.1.0.ebuild 1033 BLAKE2B f79794b101f8d44370fb2737704cc0a5a1c041609511ae00377d211f2d47f2fbc08095d63977a953ad196e49ee95c34b580660b8ba2beea102724f0e82968ec9 SHA512 c25fef6ea4878ebaf8143f02136d6ceb642993947af976e465d23355e60fbad088dd3e5fe2773f4326d85097b9bf04264da7a2fccee17388338f7d0e446ff132
 MISC metadata.xml 383 BLAKE2B 9d990e2f5b4fbf959925d9d7c1f03ecb3acddcc8564c9362f14741d531d79f3e4c6d98a8c84695d8b1f761fa11a80e768b8e8b48ff8be314732d7f574d767223 SHA512 89d9a1f5c253bf99992d16b974d81175d1ae0d17649ffe1a485430735bec38f45e8e1a35c9ba2d99cb1610db3b200adb5af847b2a161c348e29f0cfa89f8076f
diff --git a/dev-python/loky/loky-3.0.0.ebuild b/dev-python/loky/loky-3.0.0.ebuild
deleted file mode 100644
index c7368a937698..000000000000
--- a/dev-python/loky/loky-3.0.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 2020-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="Robust and reusable Executor for joblib"
-HOMEPAGE="https://github.com/joblib/loky"
-SRC_URI="
-	https://github.com/joblib/loky/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 ~riscv x86"
-
-RDEPEND="
-	dev-python/cloudpickle[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/numpy[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local args=(
-		# docker, seriously?
-		--deselect 'tests/test_loky_module.py::test_cpu_count_cfs_limit'
-		# hangs, and even pytest-timeout does not help
-		--deselect 'tests/test_reusable_executor.py::TestExecutorDeadLock::test_deadlock_kill'
-		# one test that uses a lot of memory, also broken on 32-bit
-		# platforms
-		--skip-high-memory
-		# breaks teardown
-		-p no:xvfb
-	)
-
-	epytest "${args[@]}"
-}
diff --git a/dev-python/loky/loky-3.1.0.ebuild b/dev-python/loky/loky-3.1.0.ebuild
index 61f9d0dae1c4..5444599a1da2 100644
--- a/dev-python/loky/loky-3.1.0.ebuild
+++ b/dev-python/loky/loky-3.1.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 ~riscv x86"
 
 RDEPEND="
 	dev-python/cloudpickle[${PYTHON_USEDEP}]
diff --git a/dev-python/lxml/Manifest b/dev-python/lxml/Manifest
index 0a487be04f16..1a33d2621258 100644
--- a/dev-python/lxml/Manifest
+++ b/dev-python/lxml/Manifest
@@ -1,7 +1,4 @@
 AUX lxml-4.6.0-tests-pypy.patch 18051 BLAKE2B 99d97fa2e874c9bec4a866c3303b54ea2ab1e6abddf148d142cb66ee035b1eab1e05eed924d34451c5db38dc37f77104539cbfc2fe45815c17445b6359dcb857 SHA512 f6c6c2b00a49e6ca19d8b9123c364003a682c2e8df0c42d8600085d1cb094ba5cedd162bfc794e7d9acfff93aac771953dca5a879c3b957af1e2e8bd1db05515
-DIST lxml-4.7.1.tar.gz 958025 BLAKE2B d48a7aec9537235207fa387af7c49fe055ffa8e03bcea3e59807dfe35c72f1b1e01586aded550b53d5b7fac733baa1d47fbeea8fba937844de6dab10e02a3832 SHA512 33c88ff07152437a09268f3348ada97549686b5a59e2135631991ecc79ad02f35c20aae5d8363d2795bf058b05ef70fa6fbb56b081308cd89b073e176f4872d9
 DIST lxml-4.8.0.tar.gz 959376 BLAKE2B a40be5e058153e1dc3f8501b645b0211f4498928ed71b161df54a67501356e9968064401b6d17e17dc8d62223b29e794eaa2bee7ff78ffee203d9f9a22f3e1c2 SHA512 bbcd8ea001cfa2820dcac4e00de6ded81700b2f0bd4a58bcdd4da05a19a107f57cd56280c4838fe19ee7ecd6be105878bf8c2f1c0e5111899c4ad1a2ba03537f
-EBUILD lxml-4.7.1.ebuild 2643 BLAKE2B 0eba2e12108dc7b1debf04912682524684a35fde4458e196cccc06cd42c914a1904d802c25468f91425d1fb566ee8a62b5afb7153e122b7ec59aedaa1e697699 SHA512 72d3f6ff99ec404f2396b60083c3ea883fa00b4c01380488fb8ee7aa21714728b2c9e5b83db58f625ace4bc10d39cd261730e962b95ab7071612d61098757e8d
-EBUILD lxml-4.8.0-r1.ebuild 2764 BLAKE2B e3b1c677a670643444def2df6450eff05d31fd0ac03e44504cbec4aaa7557a87449785774de62293db6bbb5018c10b6656e474cf8044a2e458db9746b9f89479 SHA512 08b4a92cc2a07871997095effecb8a6eac32b5af1578d241b3a630d3e48322036c8c5dedbae17b80b5d24f52f4dc53f42c730750b9bf290d1e2332d859907cee
-EBUILD lxml-4.8.0.ebuild 2651 BLAKE2B 3943071d73535c50312a3f1d7a54117848bbed0ab50513e2a1ab9db60286f93ee425ad0f7b34aea83c65499df261da8ab0f2d522e23c3aecc37624b1cadcdeb9 SHA512 3e8216f025f490516caedcdfa960a194bc456e0f09d5f7389dca5b3c8c5acf1dda6c687f26fe2290764f8eff19ce2f0899a1d1eec2ac232c409784534fb96e81
+EBUILD lxml-4.8.0-r1.ebuild 2763 BLAKE2B 803fbb5e920c61a7f65a75f8078d333ac019c16c7554ab4fefffc1b36ef2fae5cb9bebda815dbd1804d09748c5ac5a50285f44fd12ea8354ae267e7348bd3fd2 SHA512 f44a1310cf07e2309b811bdf4f1483694175ba4c59ef7b58b6419d429946e9ec0b349fdbe8621fe869ea328d72049b5f5e1e713ead0ae1aa32be7d7124d6a95f
 MISC metadata.xml 410 BLAKE2B 3e45012300d43f9a7169f47a5778a7e6eb87511166f8769bdeb3397672747924f64fbcb64ef532df6665acd139311fb265f050ae44e51eda53716aa126d28cf1 SHA512 c84744f005bfdc76280d50aca4903fe8c2584bb272dbb56c588722e55a765f5f8b232ed634a6553c82de959909e809773a9f1d992a5f7f54fe5b21ead1f2934d
diff --git a/dev-python/lxml/lxml-4.7.1.ebuild b/dev-python/lxml/lxml-4.7.1.ebuild
deleted file mode 100644
index 8ddbda82c77d..000000000000
--- a/dev-python/lxml/lxml-4.7.1.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-
-inherit distutils-r1 optfeature toolchain-funcs
-
-DESCRIPTION="A Pythonic binding for the libxml2 and libxslt libraries"
-HOMEPAGE="https://lxml.de/ https://pypi.org/project/lxml/ https://github.com/lxml/lxml"
-SRC_URI="https://github.com/lxml/lxml/archive/${P}.tar.gz"
-S=${WORKDIR}/lxml-${P}
-
-LICENSE="BSD ElementTree GPL-2 PSF-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc examples +threads test"
-RESTRICT="!test? ( test )"
-
-# Note: lib{xml2,xslt} are used as C libraries, not Python modules.
-RDEPEND="
-	>=dev-libs/libxml2-2.9.12-r2
-	>=dev-libs/libxslt-1.1.28"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	dev-python/cython[${PYTHON_USEDEP}]
-	doc? (
-		$(python_gen_any_dep '
-			dev-python/docutils[${PYTHON_USEDEP}]
-			dev-python/pygments[${PYTHON_USEDEP}]
-			dev-python/sphinx[${PYTHON_USEDEP}]
-			dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
-		')
-	)
-	test? ( dev-python/cssselect[${PYTHON_USEDEP}] )
-	"
-
-DISTUTILS_IN_SOURCE_BUILD=1
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.6.0-tests-pypy.patch
-)
-
-python_check_deps() {
-	use doc || return 0
-	has_version "dev-python/docutils[${PYTHON_USEDEP}]" &&
-	has_version "dev-python/pygments[${PYTHON_USEDEP}]" &&
-	has_version "dev-python/sphinx[${PYTHON_USEDEP}]" &&
-	has_version "dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]"
-}
-
-python_prepare_all() {
-	# avoid replacing PYTHONPATH in tests.
-	sed -i -e '/sys\.path/d' test.py || die
-
-	# don't use some random SDK on Darwin
-	sed -i -e '/_ldflags =/s/=.*isysroot.*darwin.*None/= None/' \
-		setupinfo.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	tc-export PKG_CONFIG
-	distutils-r1_python_compile
-}
-
-python_compile_all() {
-	use doc && emake html
-}
-
-python_test() {
-	cp -r -l src/lxml/tests "${BUILD_DIR}"/lib/lxml/ || die
-	cp -r -l src/lxml/html/tests "${BUILD_DIR}"/lib/lxml/html/ || die
-	ln -s "${S}"/doc "${BUILD_DIR}"/ || die
-
-	"${EPYTHON}" test.py -vv --all-levels -p || die "Test ${test} fails with ${EPYTHON}"
-}
-
-python_install_all() {
-	if use doc; then
-		local DOCS=( README.rst *.txt doc/*.txt )
-		local HTML_DOCS=( doc/html/. )
-	fi
-	if use examples; then
-		dodoc -r samples
-	fi
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature "Support for BeautifulSoup as a parser backend" dev-python/beautifulsoup4
-	optfeature "Translates CSS selectors to XPath 1.0 expressions" dev-python/cssselect
-}
diff --git a/dev-python/lxml/lxml-4.8.0-r1.ebuild b/dev-python/lxml/lxml-4.8.0-r1.ebuild
index 95b8b1160b32..12333f0a0945 100644
--- a/dev-python/lxml/lxml-4.8.0-r1.ebuild
+++ b/dev-python/lxml/lxml-4.8.0-r1.ebuild
@@ -15,7 +15,7 @@ S=${WORKDIR}/lxml-${P}
 
 LICENSE="BSD ElementTree GPL-2 PSF-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc examples +threads test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/lxml/lxml-4.8.0.ebuild b/dev-python/lxml/lxml-4.8.0.ebuild
deleted file mode 100644
index b5b167c0f56f..000000000000
--- a/dev-python/lxml/lxml-4.8.0.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-
-inherit distutils-r1 optfeature toolchain-funcs
-
-DESCRIPTION="A Pythonic binding for the libxml2 and libxslt libraries"
-HOMEPAGE="https://lxml.de/ https://pypi.org/project/lxml/ https://github.com/lxml/lxml"
-SRC_URI="https://github.com/lxml/lxml/archive/${P}.tar.gz"
-S=${WORKDIR}/lxml-${P}
-
-LICENSE="BSD ElementTree GPL-2 PSF-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc examples +threads test"
-RESTRICT="!test? ( test )"
-
-# Note: lib{xml2,xslt} are used as C libraries, not Python modules.
-RDEPEND="
-	>=dev-libs/libxml2-2.9.12-r2
-	>=dev-libs/libxslt-1.1.28"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	dev-python/cython[${PYTHON_USEDEP}]
-	doc? (
-		$(python_gen_any_dep '
-			dev-python/docutils[${PYTHON_USEDEP}]
-			dev-python/pygments[${PYTHON_USEDEP}]
-			dev-python/sphinx[${PYTHON_USEDEP}]
-			dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
-		')
-	)
-	test? ( dev-python/cssselect[${PYTHON_USEDEP}] )
-	"
-
-DISTUTILS_IN_SOURCE_BUILD=1
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.6.0-tests-pypy.patch
-)
-
-python_check_deps() {
-	use doc || return 0
-	has_version "dev-python/docutils[${PYTHON_USEDEP}]" &&
-	has_version "dev-python/pygments[${PYTHON_USEDEP}]" &&
-	has_version "dev-python/sphinx[${PYTHON_USEDEP}]" &&
-	has_version "dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]"
-}
-
-python_prepare_all() {
-	# avoid replacing PYTHONPATH in tests.
-	sed -i -e '/sys\.path/d' test.py || die
-
-	# don't use some random SDK on Darwin
-	sed -i -e '/_ldflags =/s/=.*isysroot.*darwin.*None/= None/' \
-		setupinfo.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	tc-export PKG_CONFIG
-	distutils-r1_python_compile
-}
-
-python_compile_all() {
-	use doc && emake html
-}
-
-python_test() {
-	cp -r -l src/lxml/tests "${BUILD_DIR}"/lib/lxml/ || die
-	cp -r -l src/lxml/html/tests "${BUILD_DIR}"/lib/lxml/html/ || die
-	ln -s "${S}"/doc "${BUILD_DIR}"/ || die
-
-	"${EPYTHON}" test.py -vv --all-levels -p || die "Test ${test} fails with ${EPYTHON}"
-}
-
-python_install_all() {
-	if use doc; then
-		local DOCS=( README.rst *.txt doc/*.txt )
-		local HTML_DOCS=( doc/html/. )
-	fi
-	if use examples; then
-		dodoc -r samples
-	fi
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature "Support for BeautifulSoup as a parser backend" dev-python/beautifulsoup4
-	optfeature "Translates CSS selectors to XPath 1.0 expressions" dev-python/cssselect
-}
diff --git a/dev-python/mando/Manifest b/dev-python/mando/Manifest
index c7557ffc9951..8f8c31abe376 100644
--- a/dev-python/mando/Manifest
+++ b/dev-python/mando/Manifest
@@ -1,5 +1,5 @@
 DIST mando-0.6.4.tar.gz 36560 BLAKE2B 9878746485d4b896c3e32512b77ac02739940a1398eee12056fd6719cc3c99f8c526c8e573d2556b6a9d0d8d26e20fb45c97119e626b1d44f0a5b5f4655adba1 SHA512 457fa0db4e8e5dbfac6146d254181213814ef1975c919b4573007face27749ec3a50eda850558ebdc0fdff94a5e9819fd825b10cb3023078b2b426c2825fdbf0
 DIST mando-0.7.1.gh.tar.gz 37802 BLAKE2B 1caf437248f1b1397888674fff0171680fd1d2cffd1d3394869edce4fef0d214fb52fc0eb7435ef162722f128f129f8d19385e65661914c51f78108b64f8db38 SHA512 a25dfd57e833416cbd64933ca3970712d28c2e2ed172091a0d0c082f486c707d0061afb071e3973e7e42b654d1a6e70f4909b1254fdef493471dc0ae9d3eb62b
 EBUILD mando-0.6.4-r1.ebuild 856 BLAKE2B 2d0824bd50c40be72ddaec4bd4faaafdf4deb66c8326109200ef1388514108986beccce63ec42f669d52d4449ae7979afdd76f9a50d8d5bae76e79b4850e2b62 SHA512 d5ebbd5641b3f17463916b4b6ee614f5f18e3bbe41a87a235d3b5c31b245f7481ac49691be8aad0d75e8cc256cfaf3cb8366a09c3fb006bf30e640725c436402
-EBUILD mando-0.7.1.ebuild 808 BLAKE2B fa2a352cc3a5ff4c57cd0fd7b36ed53871cd9f3cae60462dba5f69a8d5fc04ef6a4475f39a9a5b9894b0f479b3b4aa55f4ebc24c3535a1e5c351834274b43a32 SHA512 64d50cc39616f2e15e86cc2fcaf6463cd511433292dfc157d3bd24a552c0278cfda9f8e031d4996f7c67a02450352d9ed3cbd3e00d3834c1e4bdc30e5ac05736
+EBUILD mando-0.7.1.ebuild 802 BLAKE2B 3fbc0e06634082c9befea4c943d9c302f1666803675f60158e476d0db1f037bfe880099f8acd3b9c24c1a5e22bb828bc3282ffc0ce48f118ee323bf8deba8f6a SHA512 9489094c66d68d0627d6154aeb207e2924d7c94346f5975938884b321c79743e1de765f9b573ea7dc111b614ddbd474569052251ced5755799156696ed93172c
 MISC metadata.xml 285 BLAKE2B 3f0f1cbd9283919ed3b4fb89de7ce5a23a535844ca1d04dd416f2a9d7d64ebcd84a8f89736c56452418014c4574bc4cb75156038f100eb87b5f7ad663be5ca38 SHA512 78b7d0ede36474cdd7d887cc2d74b69ff28f4c2ddf3f8dd449396b454dd48308e1ac912331b8f03aff18ebcd0168f656dc1affdda0f88dbcfb39dd14ba2a7d42
diff --git a/dev-python/mando/mando-0.7.1.ebuild b/dev-python/mando/mando-0.7.1.ebuild
index 89f6b4003d36..f0a0c56eefa5 100644
--- a/dev-python/mando/mando-0.7.1.ebuild
+++ b/dev-python/mando/mando-0.7.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/rubik/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="examples"
 
 RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
diff --git a/dev-python/markupsafe/Manifest b/dev-python/markupsafe/Manifest
index 61526c346b1d..9c3616b0201a 100644
--- a/dev-python/markupsafe/Manifest
+++ b/dev-python/markupsafe/Manifest
@@ -1,9 +1,5 @@
 DIST MarkupSafe-1.1.1.tar.gz 19151 BLAKE2B 184ab0bc42f8d254ef4239f700f019c0a380bdf2117dfe1abe2eb4dfa0f037158d181a120d8654a6971e9c8badb078f997e3a8bf231898e0f4bb3e8496d9abd3 SHA512 f3014e6131a3ab866914c5635b5397ef71906bffb1b6f8c5f2ed2acf167429ff7914236d38943e872683a57a9be9669f4c5aace6274f3307ab21ef25373db0b6
-DIST MarkupSafe-2.0.1.tar.gz 18596 BLAKE2B 3f6d576733a0033ca46df5e92892c1f052c1b0c03a92f27926383279f81531981139e5a659a7d21d436643795706480dd9e6aa979f70a81a2b95f2b9d0ac9f8c SHA512 77249bda784111ece15d59eb3de1cbb37a58fb9f22902fe6b73fea9eb0f23857ccbe53dc55463278e3b91f78dc35e2b027fd823ca50d88d8985d5a98ce2327f1
-DIST MarkupSafe-2.1.0.tar.gz 18546 BLAKE2B b6279b4ff3ad4c2ee33ee303c8d8c5213488b87297314e99547ebccfcac5897a3893814fb8cff46a5ae098552f9510351b4076497e3b299c1bba686cee32dcf4 SHA512 2a340f4f4cc7de0638cc32bf04f0daa8a0db579ebe7b514b296498c5c05ea0e36e164bfcce929a92bea9051e8211b6683602431dac1aaf490bc0e279dee520a6
 DIST MarkupSafe-2.1.1.tar.gz 18668 BLAKE2B c15bddc89bec9a6558b797b825314d9db3ac03978c44aed42d98ab534613e5bffa2eb0ffe500ff675e78491e3f6039981c468711bdf398ff56277b2bd93932c4 SHA512 1d9bf55614b4e0aeca726ebda7bab2829452212f03f2295efdd0340f3dd05eefc9733d6dd0e37f0d06a432ce00ed7d06b28c9e817fc25212675006577f468b3e
 EBUILD markupsafe-1.1.1-r1.ebuild 639 BLAKE2B 267a221a71d8dc36f34fdfb818298e268a7cd2759d1e0ab49099c6f57d934516e71ecea2b7c529c745c4aefe6124a7d52eab880e3c157f8d40384eb0cd6e59e1 SHA512 ae11b1f75420b8d4f142856ffeeb2e68929243bbaeceb8d08e19523bde4cb659e1b08ccbc68a87cee2bc97225bc35bb73268cf61b6b2c63fbd47bb9ec39209a0
-EBUILD markupsafe-2.0.1.ebuild 645 BLAKE2B 1774cf1a543d05bbdd7c2ba7bf08c151c02a51fc0677ec462dee1cd92880c1e928509387b80368e72a426a8d792a6a6caaa6aebd8f4c4c80f6d6fb32758ee870 SHA512 6313433cd4b4785de1d23aefc6af8e935cae6cece5488eb2175fb4c4c0daab2e9e53ba018d85eed31772b60e34d38a40b6c64339d0bbad70d151f8ac2e2f84c8
-EBUILD markupsafe-2.1.0.ebuild 685 BLAKE2B 88235db4b43f4bffa8fb818b4dfa07b961fdae8d54b9cbfbecee53923308e02b2c7f096e5eb8e7e3cbf14c34fba4c618b0f0acfbf22f62fc07a6c3985d7650dc SHA512 42a3c18cfbfa221c2ab830a18716f7b667880bb42cc0da8e176407d840f055cfb02fed817eeba6863922b05946b7662813e2ab0404a448fa5a69b8d99fab6a16
-EBUILD markupsafe-2.1.1.ebuild 678 BLAKE2B 92003536c91a33035eca366fcf18eb6d3f186a6d9f7a6ce00029ae37f86ff6937db41af7ea0f696a38ba6696e40993098f9eedc1a4c3fd860fb26fc89fdf40be SHA512 fd332df0e4f76908d7fe64e9099afdce7f4bc3ed458025d1a18135b06e145e20a78431af65bbece45cc6d3ddc10b53d8065e8c091e775871047db0f35c69cc6a
+EBUILD markupsafe-2.1.1.ebuild 677 BLAKE2B 34a134baf898bd564e538c0f5cc58e4a59f3c816a4a643181ac886e631a7217170119cbb3e6125c8e710b1aee23753e8501eeb2739ffb9af1f316282aa74042b SHA512 8102c14c13701f8353bbc27371ea2581c1b8bd76a14123c50aa78bef6d565daaa9191528c78204428f0d38a4224d2272160dfbeca66c3aec390d6736a7f4de1a
 MISC metadata.xml 314 BLAKE2B 88acc343a3395dcf3833ea690d3e5f7992abf67c6ab16a53cb039d253cc17302b24da6751d5706ec3c3495cef37494028de4516a7b3f25c78780d23ace4a0f72 SHA512 f240b32e7c30116769eccc16b6746e29bc28931dfff65bb3020782be3abc7791c7464a3a686ca076ccf371ef6280c2285d97e55b522d88d07babd843a51b4fa9
diff --git a/dev-python/markupsafe/markupsafe-2.0.1.ebuild b/dev-python/markupsafe/markupsafe-2.0.1.ebuild
deleted file mode 100644
index a1ed5ec07f51..000000000000
--- a/dev-python/markupsafe/markupsafe-2.0.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
-
-inherit distutils-r1
-
-MY_PN="MarkupSafe"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Implements a XML/HTML/XHTML Markup safe string for Python"
-HOMEPAGE="https://pypi.org/project/MarkupSafe/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
-
-distutils_enable_tests pytest
diff --git a/dev-python/markupsafe/markupsafe-2.1.1.ebuild b/dev-python/markupsafe/markupsafe-2.1.1.ebuild
index e2a6ee77f14b..fd27c0fb925d 100644
--- a/dev-python/markupsafe/markupsafe-2.1.1.ebuild
+++ b/dev-python/markupsafe/markupsafe-2.1.1.ebuild
@@ -18,6 +18,6 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
 
 distutils_enable_tests pytest
diff --git a/dev-python/matplotlib-inline/Manifest b/dev-python/matplotlib-inline/Manifest
index 077acb2b5361..733d9b46e7f5 100644
--- a/dev-python/matplotlib-inline/Manifest
+++ b/dev-python/matplotlib-inline/Manifest
@@ -1,4 +1,3 @@
 DIST matplotlib-inline-0.1.3.gh.tar.gz 7337 BLAKE2B 995b6e5ce9068760e701e3b429d2187bdc7e7c5b989d54a9fb1f8b5f385f91c6a3621a54d5a1e62c9000737f5f42d9ceae5be7f36b664b7e06ff9c712e6d76ac SHA512 684821204faa3cb35c46663b8c8cb8f0ba5d4f761d15bc708de69c98753685c89da1d330087bcfa970792de592188768dc068accc471d55360f551e44cf4a79a
-EBUILD matplotlib-inline-0.1.3-r1.ebuild 607 BLAKE2B 13c82e35a3ec7a034fe7097f223cadba64f099f9636145c1d944bbb22fd678058d4d47bc38612e9c2126a8a05b2e70f92675eef3f4b912fb881ff528681a5063 SHA512 7fd545c8df886ebf1ed91cddbfa13febadaa1109c90793c4b9a61002ab4bffd53b7bafd7f7afda9f6bc6185a4a1ce729f0b407cd0c4d18c3f2fda180dc275ae0
-EBUILD matplotlib-inline-0.1.3.ebuild 559 BLAKE2B da8b774f30bcbe673312467edd47a9994627cfa478562fee3f2d0bf386e3f80f79bc7df71a5c32c350ff0196fba0eeab11b388b44d0bc5d464661646aa8b24eb SHA512 03c060079930f1997f3a54e5261c0c8558c47c31dfa1397a4af3164b77bf227241d395b7be29b06cc1789ffb202537fe9cf2b109c7bfb495fb5abd5c8f55e5dc
+EBUILD matplotlib-inline-0.1.3-r1.ebuild 599 BLAKE2B e98c4a7618ca510b8deae074473bb7b9d8e1c0dbc65d56fce2dad5c9c30d256ca3daf05ff5d143e4d6debfb8f003ad471479a1bcc902225f349109b1612a31c0 SHA512 066cb1abc7d8d2773f97181a62f9ae266c39d1cfa1617ae68a4dc1e5c8f2aea7f95865b3dd0725577ae1ed87bd2738957f5e5b7860b36756490ab7a8ef078685
 MISC metadata.xml 388 BLAKE2B 2c15ea9d7f572bfd693b7b715ad5d32b0528889b07e7b7d2b58e2f99d1884acf376ed5bcbcf527179b232bc761c3aa31a59b112acd7b3a82f07f19d2592d167d SHA512 a40bc579234e3f6f4cb7cf12c0851ff23be0e9a2af94af099d503214f626d03a26dff3fc5d1aebedb5c3b4adfb13f1b6fb72ec10d62d3fea6bc2772271cea027
diff --git a/dev-python/matplotlib-inline/matplotlib-inline-0.1.3-r1.ebuild b/dev-python/matplotlib-inline/matplotlib-inline-0.1.3-r1.ebuild
index ddc247e6a9b8..4b448be54c8b 100644
--- a/dev-python/matplotlib-inline/matplotlib-inline-0.1.3-r1.ebuild
+++ b/dev-python/matplotlib-inline/matplotlib-inline-0.1.3-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/matplotlib[${PYTHON_USEDEP}]
diff --git a/dev-python/matplotlib-inline/matplotlib-inline-0.1.3.ebuild b/dev-python/matplotlib-inline/matplotlib-inline-0.1.3.ebuild
deleted file mode 100644
index e2785b5e9e27..000000000000
--- a/dev-python/matplotlib-inline/matplotlib-inline-0.1.3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# 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="Inline Matplotlib backend for Jupyter"
-HOMEPAGE="https://github.com/ipython/matplotlib-inline/"
-SRC_URI="
-	https://github.com/ipython/matplotlib-inline/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/matplotlib[${PYTHON_USEDEP}]
-	dev-python/traitlets[${PYTHON_USEDEP}]"
diff --git a/dev-python/mergedict/Manifest b/dev-python/mergedict/Manifest
index 086c187766f6..0f9144465765 100644
--- a/dev-python/mergedict/Manifest
+++ b/dev-python/mergedict/Manifest
@@ -1,3 +1,3 @@
 DIST mergedict-1.0.0.tar.gz 5188 BLAKE2B 6ec3a5df1b9c366cbb8b87b4c02ff18f15953d1e10469c5d20e170f0a1deca949edab6f0bd0100fb085401375cce51b9e323279d296153144548b93a8d072e7e SHA512 0f9f619961d2840995d2c2498debcf8b47c54fae76f419588562311d5bc43483c994cbeb618f2a1220a9ab33c56f12e3e257323c40ecd0db3a7181d7dd80ef27
-EBUILD mergedict-1.0.0.ebuild 403 BLAKE2B 78ec3ff49b7a67415315f78e7d52c0a48bf0b870316058a960cfb4c8af60f725a4c861be0a255709b59fd0e1bc420a2d79aedf1c97ded04b289c71d0a3e4ac6a SHA512 e88a21ba794547ca720b15912972979d677ae2865a5479d48e584b9570528003cc5f759c010fc9103a3b0c8f25d2b25a8ea7ddb4c715b1874facd8a9187fdcee
+EBUILD mergedict-1.0.0.ebuild 410 BLAKE2B c6b49b61287107c1591a3fda81c39362878c5fb2a35bf78767e559fe2f58a53c300f36d3adc24873133557ae0a501e2e9a8b33f0dd7130cf22d0b750dd911ead SHA512 65d25b201ee2d1db73eb62d52203a261b8d3890344bc3b9b2c7cfe4ee32fb43b89c6a6a6446d320448034b64c1643cce9b904291400354a442d56ef0f4c76229
 MISC metadata.xml 376 BLAKE2B 187fde54addef683a9c1fd63cebaf56d1a9e7be22bff5635291785a7f5cd15c26f2bbae8d09033364849d3a955db8e3736c4180e72ef1df38179a5764cac4d2e SHA512 60ece1ab0999b9fb136fcfc52237285a8dcb7f54f73ee1d6b4ec2051361883f04237117f6e8f5d6558b61ca94d55ebab3b40b683d075b060c99eb6aad5c29ef3
diff --git a/dev-python/mergedict/mergedict-1.0.0.ebuild b/dev-python/mergedict/mergedict-1.0.0.ebuild
index e3ca27fe737f..25e1a968b531 100644
--- a/dev-python/mergedict/mergedict-1.0.0.ebuild
+++ b/dev-python/mergedict/mergedict-1.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,6 +13,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~riscv x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/meshio/Manifest b/dev-python/meshio/Manifest
index 2e8b984091f2..66b7676663d8 100644
--- a/dev-python/meshio/Manifest
+++ b/dev-python/meshio/Manifest
@@ -1,5 +1,3 @@
-DIST meshio-5.3.2.tar.gz 491651 BLAKE2B 537f76f7b69a64777b631344da4b6a3e1cee33be1df05726406aceeddb68ed6589abb210f30cb74dbd899688a417ec9140fa6d8a5f7eb94ce5d85e99f315a731 SHA512 91a5d6064b69b8e631a60c613e0b06e784b475c296cc9572d4f9111dac932b0e75cf7ef1e6849329354a9708de1d32bafc1b297297d94a5554962f6807123921
 DIST meshio-5.3.4.tar.gz 492100 BLAKE2B 2eda13879b5cfd777201a668accfea82ee852ba729f5037584b9760eb1e9a2482a8d2e3ef7774271a38d88fba2533f012049040783e8abbd35ec4c3bb720ae52 SHA512 d8e7228045aa70d0a3ca5b113a24889f97aa327abe10d2c7bbc54ec358735117b6ba37b40fbf1a168f00f96a055d6940fd2f5cd0250e20c43c50ea7827e4d53d
-EBUILD meshio-5.3.2.ebuild 683 BLAKE2B dda4f2cdf19c533bc0fe85c3ac06f545f24aeb15b623b0887706f022b2b751a0feefcd305945f6de4faeb499cf0ec2f73a41e9947803b0fbd3635124c1786fc0 SHA512 c51a95f00e523b720d4f41f6979c50d6caefe68ddf6a05559f751456c58b9b489f373d5eb4114acd8400f544d1eee3efaee57239912e88b5a1ce4cc469ef73ec
 EBUILD meshio-5.3.4.ebuild 692 BLAKE2B f13a4b288475688c4f2b291464841c1c136ee5752c378db91fbd5886cf52a8861903b860e2067a121f0ccf3386939590ee56b89ca98199b3572540458b02789a SHA512 cd3a33a1c9d28f705ee53bac0e1857d1bfc15b0528f0a73b3d4592e0b7ef322430a64772192bf018fd3e09651ec27aa9b448025875b9606815ea057bc9829766
 MISC metadata.xml 393 BLAKE2B a7e1dec79a05362bda35e9fc80b49bf2957ceee7365ae565525af1a882c0ab3ea5f8a006d3262820579fc6e486ab5ee4d9ea46611d022576bd1cf0d9a0d90cf5 SHA512 25a78dee1c87895b6c4c5588ca527297743cdc76c472f51abc1bf2b2e658bbc3eeaa791c41525ed5b116d86e2de91b883057e0e0ae2424d78018490f905d654a
diff --git a/dev-python/meshio/meshio-5.3.2.ebuild b/dev-python/meshio/meshio-5.3.2.ebuild
deleted file mode 100644
index 8a22053a774c..000000000000
--- a/dev-python/meshio/meshio-5.3.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_USE_PEP517=setuptools
-
-inherit distutils-r1
-
-DESCRIPTION="Input/output for many mesh formats"
-HOMEPAGE="https://github.com/nschloe/meshio"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="hdf5 netcdf"
-
-RDEPEND="
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/rich[${PYTHON_USEDEP}]
-	hdf5? ( dev-python/h5py[${PYTHON_USEDEP}] )
-	netcdf? ( dev-python/netcdf4-python[${PYTHON_USEDEP}] )
-"
-BDEPEND="
-	test? ( dev-python/h5py[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/micawber/Manifest b/dev-python/micawber/Manifest
index b54c27f260c5..c291e3b35f3e 100644
--- a/dev-python/micawber/Manifest
+++ b/dev-python/micawber/Manifest
@@ -1,3 +1,3 @@
 DIST micawber-0.5.4.tar.gz 34963 BLAKE2B 1c311e2d1c8f32f81be466893bf1eb34f8c38901b168a97c88f2043aba1624fa8b6d12460c7470c3bbd720ae29af23ab808a9464b13ebf5ec193f5818b6f3aa1 SHA512 26879174071256fd3f95e92b0ea01b11a44eab767aa7bb43ff62221212ea0ab1ad33b67060e2dec33963abad599b864573f6a9d5a98fcd8f1a6633a3c73d7c80
-EBUILD micawber-0.5.4.ebuild 669 BLAKE2B a41bbae5432875ef0614855a56850858378c9d02336ba1dbdaffa6c593ed450f4f38a4c9a4e1e99bfe16ed8af56ef5c650209f6fd90ead913c34e5c829893b74 SHA512 68aa80d472d7fc663aa22ffc775273635ef25233e18b6974782885ea2e794b0464653f10e1747650f90ea0ecd9d05f04da239d097a660db6445f2a7718a85585
+EBUILD micawber-0.5.4.ebuild 676 BLAKE2B e462eabe739ab39e3f6efe581b106f6ab51d66596faef31efcf67e09de67ecfc969cc5fdd7157b9ba722ee51ff3018b803bef06d8868f86cca97b5a648a0110f SHA512 846e7c5a834d4b744db791c58b2cb680449a549a8d2f93c22d4e65e7f2141bc52278df441d0114781525c3fdde5211d87ef16e122b59d6d158d8aafc3207475a
 MISC metadata.xml 393 BLAKE2B 242d3f01823c212076395d92bb9fce8d535794bf544e5cc3fb878cca3261e1d7247453588ef5cec22f5aa7926c540ff8d028ae231e87413f32dbfb346ac18f21 SHA512 951e67958b37cdcf0cef853500c7b9589b2d7ed4f6a7179f04ab477409bbdff938614d3577fe0c41ac25d1eed9eed32ed23a75d8ed74444e2c2e8ad34f3cb468
diff --git a/dev-python/micawber/micawber-0.5.4.ebuild b/dev-python/micawber/micawber-0.5.4.ebuild
index bcebcf389f48..902dd82d6148 100644
--- a/dev-python/micawber/micawber-0.5.4.ebuild
+++ b/dev-python/micawber/micawber-0.5.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/coleifer/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="amd64 ~riscv"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/mkdocs-git-revision-date-localized-plugin/Manifest b/dev-python/mkdocs-git-revision-date-localized-plugin/Manifest
index a372395dc2aa..8fa55e3a5e1f 100644
--- a/dev-python/mkdocs-git-revision-date-localized-plugin/Manifest
+++ b/dev-python/mkdocs-git-revision-date-localized-plugin/Manifest
@@ -3,5 +3,5 @@ DIST mkdocs-git-revision-date-localized-plugin-0.12.1.tar.gz 370763 BLAKE2B 6b69
 DIST mkdocs-git-revision-date-localized-plugin-1.0.0.tar.gz 375656 BLAKE2B 3dc850f219ca0396015c474d714412253b05075f5ad55fbfdcc4ed90468466e6c6735904517d598b66cf408c222e83ed35d176b1379a26a97b64d88bcbff06b6 SHA512 632f4e2d0ce8fc0f90707918526e49e2752ecc36c2623eb0df76d49476f6e4b347265166f5f1d6148475bb01bdb61a6337a3edf6ccba2cccb2c372a9aba70cac
 EBUILD mkdocs-git-revision-date-localized-plugin-0.11.1.ebuild 1320 BLAKE2B b079b62494e9b4f0b4f6b4dbc6d073d5f2dfb9839b462b880490765bf79c09d0946845847372f22a0588408d39c63227790673312545a030aa05fef641954ea0 SHA512 f8551f29bf0fcaa2727c7454cf3fb57d5b067e6d44a4e905bdd3004176ce8fa373febd0bca18e56f488a0d56d8f9ebecd4e3381ef0d57a9bb304b17d07ed01c7
 EBUILD mkdocs-git-revision-date-localized-plugin-0.12.1.ebuild 1346 BLAKE2B 7125ec011a060758f986229f87c2c456d8a9931e156ce68842e6808e49d61aab7f653ca240e70eb823d166cc134ed93d720ac31b44b39643ab09b4938986babc SHA512 78f577fe4a2770ace8f4d3096e58480c92e0fb2f426081c9cc032a784ede5e3da76068bb4cbe76231cffcf85903bb90fd08c945876f42d98ad76c3cb7eaae234
-EBUILD mkdocs-git-revision-date-localized-plugin-1.0.0.ebuild 1467 BLAKE2B 6bc43c17f0a85006ee50ff6f22a4293d023fc623ec0666e9e4770325a55eefad38aa3264eac8745f763a81d30f5d7ca54814a3a922cd0dec752519e2e052a912 SHA512 6344a596c3afc900a83eb12df2fea094d113ecdb65fbcf20cc2e2aeb995b58615cc5bf13083b849df21373823ed99a7f8156be3afb93b4ee4f1b56fe68e77540
+EBUILD mkdocs-git-revision-date-localized-plugin-1.0.0.ebuild 1465 BLAKE2B b52c4659e785f4e87cb36e39941dba488d0e3e6c9b1ebec114c28cd019c4bfc25245e6c517c2e6320582f468c803719735852b5d485982ddfd13045c7929419d SHA512 08560f6d0a2a02094eb1110ae436d9093fc0dca72cfdbfd28691f62f4eb5ef64b17429f62d119acd1d7614d988a34ff53f3aacad8c2e9eac1acf066a4a43877f
 MISC metadata.xml 596 BLAKE2B 9010c7fd37265b6770544a605f918524b75d7b1afea8809075c3b5afb5e56f6848aff4c7fe98367b3dcb3de16f0d21682f9a2fc80f441783f32f904dd8f9a152 SHA512 431dff95204b056afa3a4dab48eec1559d72d0c1ae9a65d89d95fb97454f858c9022578043238a34ce205ac5a16871e6f6d68a3bfe3231c20852437c4fd66254
diff --git a/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-1.0.0.ebuild b/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-1.0.0.ebuild
index d39737874f73..0a6513c1f589 100644
--- a/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-1.0.0.ebuild
+++ b/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-1.0.0.ebuild
@@ -25,7 +25,7 @@ SRC_URI="https://github.com/timvink/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/Babel-2.7.0[${PYTHON_USEDEP}]
diff --git a/dev-python/mkdocs-i18n/Manifest b/dev-python/mkdocs-i18n/Manifest
index 187bc85f21c9..51e699c7d3eb 100644
--- a/dev-python/mkdocs-i18n/Manifest
+++ b/dev-python/mkdocs-i18n/Manifest
@@ -1,3 +1,3 @@
 DIST mkdocs-i18n-0.4.4.tar.gz 17191 BLAKE2B 4ab926befac2c90b6b9ff55fd6887c8b78e88f801c820749df125ea97418fbfb0a8531b2168b508737e7dffbf426826433211ee80f25b80a42ae160f78a93670 SHA512 f9f27c0f274aa7ee5c64cee46d4165d51022cac0171f95a238b62c911e1be16b6a4ff227fea3b78de2ffa0095b9c95280e8919e207e6947db300a136fe16e659
-EBUILD mkdocs-i18n-0.4.4.ebuild 555 BLAKE2B 3726fac4c417fd948747925485d8d4e722feaf09339b74510ae5301cd95d04dae1f27c9e660bfd9e0e123e41dc9c967a44fff65b0b0dede9fa766c4f6d27d904 SHA512 cd4682b5901e4fb90ed7e703e63cbda58495b83287de0a83b14164b207a592e34ee66f2c797169a9506f3c125b838a2978a6bab50cc4848e40f3150913056c72
+EBUILD mkdocs-i18n-0.4.4.ebuild 553 BLAKE2B 64f5acdf89cfbff5370c2e06a46b726f3818a148618098d7a2e9b9364ddd472a54e73ba8a02e9f5a36a119311d810d33d1c4592d83c36757a75dfdcfbeade8ca SHA512 a132747c5cf88ae8cffbb5fd23c9fa9e80ea7e4850398700d42c3f2196fba31716e63cd6b993af865627d97a697b3b18cff05150de8cf12ea308c43488b62330
 MISC metadata.xml 540 BLAKE2B 0b6e023e1903f143668642c8a150cb0610500b8ced2082fb31586a1157281fe21535c249e67dc19789cd36318e255efc914f7f5e29dc2af97e6f0866214b8523 SHA512 6bf089cea5ea6ce4547fd616ecfed754f68cc17d7caeed4f633ef41c4349cfca1c68585a1bab548db284dcfa672348b73e53a5e6610a73480913694df92cace6
diff --git a/dev-python/mkdocs-i18n/mkdocs-i18n-0.4.4.ebuild b/dev-python/mkdocs-i18n/mkdocs-i18n-0.4.4.ebuild
index a695656900cf..2d4d9700e6d1 100644
--- a/dev-python/mkdocs-i18n/mkdocs-i18n-0.4.4.ebuild
+++ b/dev-python/mkdocs-i18n/mkdocs-i18n-0.4.4.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/mkdocs-1.1[${PYTHON_USEDEP}]
diff --git a/dev-python/mkdocs-material-extensions/Manifest b/dev-python/mkdocs-material-extensions/Manifest
index b836569de71c..ec67d5a90a87 100644
--- a/dev-python/mkdocs-material-extensions/Manifest
+++ b/dev-python/mkdocs-material-extensions/Manifest
@@ -1,3 +1,4 @@
 DIST mkdocs-material-extensions-1.0.3.tar.gz 11983 BLAKE2B 0a9594c85df0782543275598368497bc5bd902c2e96dd75628b94eefc2f7998b948cc659577db6b27fe2787fe2a6547bdecac823f4a9533bb6b8d781922f9a6a SHA512 af6ec96db5628527d6dbdeb6557276cdf297ab5926cebf5508d6e5c4c5b8493b9f55b967230e2853d28bcbb17129a32778936ccd0264ab75c870be2eecf2e8ef
+EBUILD mkdocs-material-extensions-1.0.3-r1.ebuild 697 BLAKE2B 6dd3bf4edb898669f94364873f3ee5d1b45b226f2d06d4f508584122dd2e21e18f2299924604402c43cb4f291a535ceb05d357af4ded12fb5d55bc3fb3896927 SHA512 4ea1dffadf8660264dc5108ade6db768016ceca2e3b2d7c8f0b33b0acd141ba0af0e3f2bf00916ee02900648d5a1ff9a6d73123e9f2e7341210eeb9532a4e3b0
 EBUILD mkdocs-material-extensions-1.0.3.ebuild 844 BLAKE2B d8615b3ef223237d8cd38d8614e66e245dceee30813a0f08b802612cb7ce0774d6d92f8039a68a476a13806ff3b101dd00e45369607b21a3c7bc41e6c24edab9 SHA512 4f3df244db4233718d023359fdb82d244722f6976b9c4697ba9a185625afc11b7c751629afae8335d9e1ca3df3baca266f3559e5f72f51c8ecb66f9d4f89f32f
 MISC metadata.xml 451 BLAKE2B 3deb46d9e68b98525a9d7d31d2ccc0cf3c142d2988dd01636f037bec1b0ebfb07bd675c402fba89f6c7d171444e693b1c070eaee27c9a0ce94d48a1edd73b58e SHA512 add6b4dc2b6a8032aa3edf9ad22f02edaebf4cfae392c2920db40c201adedb20e6f085de59f2224a3fa037060c7cdb3dc238d3174a97f95aa35bc3bc8618f3da
diff --git a/dev-python/mkdocs-material-extensions/mkdocs-material-extensions-1.0.3-r1.ebuild b/dev-python/mkdocs-material-extensions/mkdocs-material-extensions-1.0.3-r1.ebuild
new file mode 100644
index 000000000000..9d358fcc0d72
--- /dev/null
+++ b/dev-python/mkdocs-material-extensions/mkdocs-material-extensions-1.0.3-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1
+
+DESCRIPTION="Extension pack for Python Markdown"
+HOMEPAGE="
+	https://github.com/facelessuser/mkdocs-material-extensions
+	https://pypi.org/project/mkdocs-material-extensions
+"
+SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+RESTRICT="test"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+
+RDEPEND=">=dev-python/mkdocs-material-5.0.0[${PYTHON_USEDEP}]"
+
+BDEPEND="
+	test? (
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/mkdocs-material/Manifest b/dev-python/mkdocs-material/Manifest
index 73b507d6dc64..53d52a9c6c0c 100644
--- a/dev-python/mkdocs-material/Manifest
+++ b/dev-python/mkdocs-material/Manifest
@@ -1,7 +1,9 @@
 DIST mkdocs-material-8.2.1.gh.tar.gz 8102602 BLAKE2B 04e8e3230d44376ace16a34d78a19c290a3c87013a2193983a60d8b8fa8bf456d407e11be250750135ad7cfe8633152e7c031c4b4e9a99093ac98885caacacca SHA512 2a79504d882360152bc130f5ee2903ed360685294e4f57ab5cb6fef6095fa6ca68da2c5d580837a30cc50e3c6f89d3b7a2ff1c62e768faa080e65d8220e43db7
 DIST mkdocs-material-8.2.2.gh.tar.gz 8217637 BLAKE2B 2186f8e5a57cd4331e916cad922c6f0f859674d3775ff80cbc4e455b23d2ad154e3b1a7044d8d8ee20148e236c8224a831d6cd58db7b005cbafa62f42ff15b48 SHA512 fe5aef449793ed0137a122f7b00e9700ff4e142fe24d23600ec113eff1c2e939da9548d5098187839ff2d56e562c641b2bf24d41ec9accb984c85ced36c21782
 DIST mkdocs-material-8.2.5.gh.tar.gz 8229554 BLAKE2B 7c41595b8fde073bcced12a0087b3b5303c141a27762d9c7c2698bd52ca31862c629a0562c1eab4f4dfabdc6730ce84557361c6f499c736e4ffbbe7e32a28d0a SHA512 1b648c1318071cd72d7f9721fa93d7546f0fadd515c2f0aa61673abb516c5efb3b694df33f2048af00a7ed9399c72bdbacd1966681d34ecf201494807a5a58b7
+DIST mkdocs-material-8.2.8.gh.tar.gz 8304608 BLAKE2B ff44912e812a32c7bc99fb7a07178864a952ecfbe953fe8e4d06188e2cf79f87276a881aeba1b2e5b5c290b4e12afa72761b35988290b7039163c643ec51c154 SHA512 fd2308f78c2dfff81d917f958903fee44fdd214a209464c4279d399812a686a26084e40367b0809889f682adfe5d1fe3b4707dc206621f3aa216be59e13d5d0a
 EBUILD mkdocs-material-8.2.1.ebuild 911 BLAKE2B 485a8f628de12a6ec49433f457f54c422c5f918825bae01d4f62a95f2733c75c1ea18e5e5c384236689f5482c13408fd386778af5f1d8cea412d03e20d68bf84 SHA512 08cd7abf0654255f66f5865e6f08b1103476a53d7d9e0d08aea7ff6c210a2f25ce6eff0b0d9579e54be6235518f1c011357aa7bd77430044c9622f923ec3bf69
 EBUILD mkdocs-material-8.2.2.ebuild 913 BLAKE2B d5644402b86922c4bbe4840686f2ea5644beecbcdd2481f04dc776bf8cfdf94152c7db62d2dac7311d7258ab344aaf4a7cd2c7499f5f56a13fe3ce8d8de64967 SHA512 63d4cd09a8ca6c1293903837a528d80528ab590bdbc022cf24fef21e4c1dfcce1cfb20107726f63b939a0b39cd129e3dd01259695c80fef0dc3e9d92805fa429
 EBUILD mkdocs-material-8.2.5.ebuild 913 BLAKE2B d5644402b86922c4bbe4840686f2ea5644beecbcdd2481f04dc776bf8cfdf94152c7db62d2dac7311d7258ab344aaf4a7cd2c7499f5f56a13fe3ce8d8de64967 SHA512 63d4cd09a8ca6c1293903837a528d80528ab590bdbc022cf24fef21e4c1dfcce1cfb20107726f63b939a0b39cd129e3dd01259695c80fef0dc3e9d92805fa429
+EBUILD mkdocs-material-8.2.8.ebuild 1044 BLAKE2B 5191087856a6daaa579300c2c5cd32b2810a2e86d4f233982f3a0f03f472ddd4a1b1acbdc3e7d0672988f3d10b2a6f8d978ddef823458cba2d81cf055b5df9b4 SHA512 9e3a52f02adc5cb473611b064d6038b1e020ef1f406803a1af12ddc35072be3a7bd37d1199a043c16905378e3b70165ad3900d3b23c97f13d09acbc47d6acbdc
 MISC metadata.xml 1037 BLAKE2B 6997d0f85e31152c58092081b697d8934c54f933e188082eb55e5e9f252f57274f673e1d8e5b657907da2d1658f969cd67bdb32bdc05324746f211b718f3a4b2 SHA512 ccd4f4aa6e6e780d0aff5894b260eedb602d29cc25427c202561525d27de4a31d1e13f59267d8d732d0e12f3ca0485996bca6ef2a114e96b030259899e8ad47c
diff --git a/dev-python/mkdocs-material/mkdocs-material-8.2.8.ebuild b/dev-python/mkdocs-material/mkdocs-material-8.2.8.ebuild
new file mode 100644
index 000000000000..59df7b0699c9
--- /dev/null
+++ b/dev-python/mkdocs-material/mkdocs-material-8.2.8.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+DOCS_BUILDER="mkdocs"
+DOCS_DEPEND="
+	dev-python/mkdocs-material-extensions
+	dev-python/mkdocs-minify-plugin
+	dev-python/mkdocs-redirects
+"
+
+inherit distutils-r1 docs
+
+DESCRIPTION="A Material Design theme for MkDocs"
+HOMEPAGE="
+	https://github.com/squidfunk/mkdocs-material
+	https://pypi.org/project/mkdocs-material
+"
+SRC_URI="
+	https://github.com/squidfunk/${PN}/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/jinja-2.11.1[${PYTHON_USEDEP}]
+	>=dev-python/markdown-3.2[${PYTHON_USEDEP}]
+	>=dev-python/mkdocs-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.10[${PYTHON_USEDEP}]
+	>=dev-python/pymdown-extensions-9.0[${PYTHON_USEDEP}]
+"
+
+# mkdocs-material-extensions depends on mkdocs-material creating a circular dep
+PDEPEND=">=dev-python/mkdocs-material-extensions-1.0.3[${PYTHON_USEDEP}]"
diff --git a/dev-python/mkdocs/Manifest b/dev-python/mkdocs/Manifest
index 05de9bda4773..0ba53c9bf316 100644
--- a/dev-python/mkdocs/Manifest
+++ b/dev-python/mkdocs/Manifest
@@ -1,3 +1,5 @@
 DIST mkdocs-1.2.3.tar.gz 6919177 BLAKE2B 43ff118149a497dd366f7132487564be51ffeaff644a519c7bf9e52a3e3239e9696c21616e5d7494f7c4af8ee60ec77f27fd15e80f5c5c6c1b2db4cf1f672e44 SHA512 03385bc940df8a6b3668300f3752afe973b95f149bee58217ace82063aacb661dbd000a2a7a383c4804434473c3945cec3cb41d6608388350da3098c32709541
+DIST mkdocs-1.3.0.tar.gz 4085674 BLAKE2B e34605c2d1122ff86ed5cfb6134cdda67450e8f32d7628626ff4ac8c36c45b127312ad693efe35237b714adb9efd244f12f90cf8ecacf6009b75786db30ebb1b SHA512 d33d728eaff4e39106c1187cf04f579706ce28af364852c67706ab85f6b9ccdcd26ae84cd4d5ea7572e52fde1d1137eb3e424679dd4c8ef043c9637aac062270
 EBUILD mkdocs-1.2.3.ebuild 2091 BLAKE2B 0ab4bb1d6c05831ce87ab30676287989eafb1a73d47af083042c7a93a2f10195d1fa553d4b5ea2497e3cf6f5e889eefede27a72c84a5929412de4bbbb90b5571 SHA512 cbc592271a13958d634192c363f3fb008d637a06d59aa296e62fae3a5fa78937a393bc8a8e3c5b617414e6e2865f131baedd6fc1d3a44bd0379d0a5a6a772002
+EBUILD mkdocs-1.3.0.ebuild 2245 BLAKE2B 4547d9184efa1004fc54006552034e962f973ff5c36ba3d84e521663d43ea8ea44bd00a9242f47ba4d610404653ea62deddf1637b5713b89da11d3496d4ef8ba SHA512 86652d5ec55cdfc17d1a098909217494fa2598a973d5de1a53fb4fdbbcfe20b75cfee2b72de679e1a010fa9d22e0349e18a35037c6dda8caf88e2fe77fbf6677
 MISC metadata.xml 405 BLAKE2B de9dd789fea13afc3622c6961674d046806db1025e9d0475c0ff8bfe1c6d91a741b6112ccaafb46cb19b9dac971c50095ac89b13353c7c0e1571961a19a90387 SHA512 7a19785dbacb67aa5679d6e7c9617b52b25f724430fa3471b645e31df04157efc4060dbd4fccbfc37b5709138164d8ec89c2e94cddfd727b3ee4c705ddd38dcf
diff --git a/dev-python/mkdocs/mkdocs-1.3.0.ebuild b/dev-python/mkdocs/mkdocs-1.3.0.ebuild
new file mode 100644
index 000000000000..2cebf8fb770c
--- /dev/null
+++ b/dev-python/mkdocs/mkdocs-1.3.0.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1
+
+DESCRIPTION="Project documentation with Markdown"
+HOMEPAGE="https://www.mkdocs.org https://github.com/mkdocs/mkdocs"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+
+IUSE="doc"
+
+BDEPEND="
+	doc? (
+		$(python_gen_any_dep '
+			dev-python/mdx_gh_links[${PYTHON_USEDEP}]
+			dev-python/mkdocs-redirects[${PYTHON_USEDEP}]
+		')
+	)
+"
+
+RDEPEND="
+	>=dev-python/Babel-2.9.0[${PYTHON_USEDEP}]
+	>=dev-python/click-3.3[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.10.2[${PYTHON_USEDEP}]
+	>=dev-python/markdown-3.2.1[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
+	>=dev-python/watchdog-2.0[${PYTHON_USEDEP}]
+	>=dev-python/ghp-import-1.0[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml_env_tag-0.1[${PYTHON_USEDEP}]
+	>=dev-python/importlib_metadata-3.10[${PYTHON_USEDEP}]
+	>=dev-python/packaging-20.5[${PYTHON_USEDEP}]
+	>=dev-python/mergedeep-1.3.4[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests nose
+
+python_prepare_all() {
+	# Tests fails if additional themes are installed
+	sed -i -e 's:test_get_themes:_&:' \
+		mkdocs/tests/utils/utils_tests.py || die
+
+	# Skip this network test, "does not appear to be an IPv4 or IPv6 address"
+	sed -i -e 's/test_IP_normalization/_&/' \
+		mkdocs/tests/config/config_options_tests.py || die
+
+	# livereload has been dropped in this release, this test is a remnant
+	rm mkdocs/tests/livereload_tests.py || die
+
+	# fix apparent typo in test (importing wrong thing)
+	sed -i -e 's/from localization import/from mkdocs.localization import/g' \
+		mkdocs/tests/theme_tests.py || die
+
+	# Does not work in emerge env
+	sed -i -e 's/test_paths_localized_to_config/_&/' \
+		mkdocs/tests/config/config_options_tests.py
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	default
+	if use doc; then
+		# cannot just do mkdocs build, because that fails if
+		# the package isn't already installed
+		python -m mkdocs build || die "Failed to make docs"
+		# Colliding files found by ecompress:
+		rm site/sitemap.xml.gz || die
+		HTML_DOCS=( "site/." )
+	fi
+}
diff --git a/dev-python/mkdocs_pymdownx_material_extras/Manifest b/dev-python/mkdocs_pymdownx_material_extras/Manifest
index fe653eeb02a6..a84c0a0159d5 100644
--- a/dev-python/mkdocs_pymdownx_material_extras/Manifest
+++ b/dev-python/mkdocs_pymdownx_material_extras/Manifest
@@ -1,9 +1,9 @@
 DIST mkdocs_pymdownx_material_extras-1.0.7.tar.gz 17995 BLAKE2B a7a8715ec07b9ef5551eadb37e618f45ca2f8f3c707aa5269eb7d2587db70ba29cfaa8027bb606c4264bbf93d7b3950d7a5dc03640b71afc677658b044d064fa SHA512 33fe8fddd0ee5856fdfb02068e2698f26a8db139458d7736715b776fbc2d8ae8ccb3170dbb786c52338e4e7a1612006046eb429f2268469f6f2bb5ba7f8e256d
 DIST mkdocs_pymdownx_material_extras-1.1.3.tar.gz 40029 BLAKE2B faa17e6e4d27a5d5e34a98a6830e34b934f8623fafb87a73051eb424cf95d29c5dd185bbfbbe49dd3e93eeee00a8310ac0543d480ab70e5abee4047b1cecc774 SHA512 340818ebcd8f9cf175e5049028d0932a0d6208de3d8f86cf5ea47747680079c6b9b3bf27e0c32ee10ee6a1bc7ab8ffc6cc3aa48470be43ed32adfde74f44d5dd
-DIST mkdocs_pymdownx_material_extras-1.5.7.tar.gz 24006 BLAKE2B 8c8b23bc86829bd8ce1760d6d538db94606a4ebffbfb6e0e92a656474d814861985a087a241c3bb34e1ba0f856e519ead36f83d2262b6692effcc9d745f74e55 SHA512 bfb73202f7e9a11feecd10812c90ffabf6e687bbf618002f6252281b432f35cd46e27820e170eaa6c7b84a587d40cde26652da54ec70cd744da7df1544e302c5
 DIST mkdocs_pymdownx_material_extras-1.6.tar.gz 25764 BLAKE2B d28f98f82818aaaf81d70b80ed656d94f2454e366d1ebdf6ed6448adac112f6f5876ae43f791c29aab5d7f2da1d48f67d413f7e9dab57f1a85a497317fed36b0 SHA512 b815d773476d6a5a76c7a483907164870e37cfec31dc3a3596ccf21f4f93b8ea1ca52654cd1dfc64df67380e1c6f4dccb1d6534fa6425fb29cf0654f9cb094e1
+DIST mkdocs_pymdownx_material_extras-2.0.2.tar.gz 25789 BLAKE2B c1da5c38264e9186802e24a49c2c46f1f0da70640c3e806f26cb19f1f947b3eb5bdba31cc722fd566d40643504aa63adb8f59792c51be95f4baa2324cd0729f2 SHA512 fffc5982ef7127b2e990d9206de0f09e240250da2d56c1efed6e841dad759980300209f65faa0edf61bb1a882ebff367be6533fb3f47e7ebb606520def6143dc
 EBUILD mkdocs_pymdownx_material_extras-1.0.7.ebuild 557 BLAKE2B 2854ff1077a941e23e2d51fce318bd41b8239e10c1d6be3fb65ecd8f08397f00ec46991021a23ff1d454d7abe5e6779d9aa4d36340e9fe84ff238c8e69e4be10 SHA512 6bd3f7d6daae3de6152502f9cc7ff522f6220f5111e80cfee6e0d400c9492dcbe1ab5baafd709f67d11a132df8261df60ad89cf82dc57c6f47ca72de1f34f389
 EBUILD mkdocs_pymdownx_material_extras-1.1.3.ebuild 557 BLAKE2B 2854ff1077a941e23e2d51fce318bd41b8239e10c1d6be3fb65ecd8f08397f00ec46991021a23ff1d454d7abe5e6779d9aa4d36340e9fe84ff238c8e69e4be10 SHA512 6bd3f7d6daae3de6152502f9cc7ff522f6220f5111e80cfee6e0d400c9492dcbe1ab5baafd709f67d11a132df8261df60ad89cf82dc57c6f47ca72de1f34f389
-EBUILD mkdocs_pymdownx_material_extras-1.5.7.ebuild 566 BLAKE2B fec41da8b402aca6154fcf87ffd62c7f888d0f27b788125d58cbe44235f0ebef9de8a44643ee45162fe9bbad063149dd6ac782171c7d2725a74498943affe55d SHA512 797a8ba43ecab4b7ef54f13e8873607d383d3ef155a7a4dab7315ecb2142d23befed1a83750ec59fcec9e9efe18621b2da4fd6c4371fdb4293797c182aaf6eb7
-EBUILD mkdocs_pymdownx_material_extras-1.6.ebuild 570 BLAKE2B d5d672a9cd31c501dc76faff1d9eedd35a63a989abb154d05e28c21b9c5b0ecd8d8f8c805e3c4c97e49ed99f2c62ab1f3d9404601e6c64502fcf70ce4b914612 SHA512 54d8eb4b16d643b665372a8deaaa103e42f40d87da2916c4fe86a20700eca6848c603ca21b790c50586fedb583be5522963489da0b337fc28b2dcfebf452cb06
+EBUILD mkdocs_pymdownx_material_extras-1.6.ebuild 568 BLAKE2B 17a5dc79e64a572492b3594934f7ed0b2bea9ebd9acf6bd7fe905c7387c0b52e7476ff9d4c9e1168649034c12a6cd625333bd06d4cd1d396e762f97eede9966e SHA512 c55f3deaa636949169f107ffb4e9fd0d8b35a31e4c2d004994f3465bb19b7e346da676d0e222e63c6f9cdf9873af00b563375035a42011a318b0950188720a1b
+EBUILD mkdocs_pymdownx_material_extras-2.0.2.ebuild 568 BLAKE2B 7b453b9fa57b127d4f7b63a360d76354029d917e8a2e7b251f5f4828cf1481449bb9715ec17c49c35edec93c41cfaf6c6e0f29e378835f7e7ba082b83d92cc6e SHA512 1b405681eff718ac0a3b0a064aaa5d78a6b6449a55c4827b7a6748e61379b6a7a50cc8992b6888d0d028822d34138e2711f1b48fa9bd0c41818c2776b98c040f
 MISC metadata.xml 1167 BLAKE2B a4efd99b0128f99bb7a8da17fde37695cff1f9e50ddec9d3b71e5eae4a09b8ba6646259c724220ee5905faa420efcdaf4be1d0828c8cc4d9e7040ebf1398bd0e SHA512 37d5b8e942796e54f31d0a2d592157d7a50d8fe5bdedf6f0e57305d60b4d7fd99f649e2604bb53cba5cf457227c3c1debfd607b3f5b97fcaee7e8209fbc900ec
diff --git a/dev-python/mkdocs_pymdownx_material_extras/mkdocs_pymdownx_material_extras-1.6.ebuild b/dev-python/mkdocs_pymdownx_material_extras/mkdocs_pymdownx_material_extras-1.6.ebuild
index 13f9ddfa5e88..02e6c383fbeb 100644
--- a/dev-python/mkdocs_pymdownx_material_extras/mkdocs_pymdownx_material_extras-1.6.ebuild
+++ b/dev-python/mkdocs_pymdownx_material_extras/mkdocs_pymdownx_material_extras-1.6.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/mkdocs-material-5.0.2[${PYTHON_USEDEP}]
diff --git a/dev-python/mkdocs_pymdownx_material_extras/mkdocs_pymdownx_material_extras-1.5.7.ebuild b/dev-python/mkdocs_pymdownx_material_extras/mkdocs_pymdownx_material_extras-2.0.2.ebuild
index f9f8f517dd6a..2025f4982282 100644
--- a/dev-python/mkdocs_pymdownx_material_extras/mkdocs_pymdownx_material_extras-1.5.7.ebuild
+++ b/dev-python/mkdocs_pymdownx_material_extras/mkdocs_pymdownx_material_extras-2.0.2.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=8
 
+DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
@@ -11,11 +12,11 @@ DESCRIPTION="Custom alterations based on Mkdocs-Material"
 HOMEPAGE="
 	https://github.com/facelessuser/mkdocs_pymdownx_material_extras
 	https://pypi.org/project/mkdocs-pymdownx-material-extras"
-SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
+KEYWORDS="~amd64 ~riscv ~x86"
 
 RDEPEND="
 	>=dev-python/mkdocs-material-5.0.2[${PYTHON_USEDEP}]
diff --git a/dev-python/mongomock/Manifest b/dev-python/mongomock/Manifest
index 825d662ad2c5..942d226e81bd 100644
--- a/dev-python/mongomock/Manifest
+++ b/dev-python/mongomock/Manifest
@@ -1,3 +1,3 @@
 DIST mongomock-4.0.0.tar.gz 145478 BLAKE2B fad07cd15f250f81dd483814d6a3c15e69a86f4ee9a27308a3a08961f11a38c1abfc3bfa0a36dd81e14c902946c9aefd6ac29a9dde95dbf3e5b0781e7f9c8aca SHA512 e489dd9f312762f0322dfcc34b85912b5e47fa838bd48561aab9c195f19002c8e5f3617a1cc45929e9476aede7733286b5f6246f54be7396c422da5920bd89d5
-EBUILD mongomock-4.0.0.ebuild 925 BLAKE2B cf58cb91b4413d3ce104b74342985eda758b25cf5b19c9585e95d5252d0b711e50dd8779066201736098d8ce70d05efa0cb1ccf9018c917308190dbe8c2348b7 SHA512 e545d8011cb6bc53df1fda1ee0c90c9627c4a95a7847b3d21dfdb13b83bccd4e8b859fcb934bfde3c2f87ce327dd98b36cbdb1cd72d4ce45455e63da06a94451
+EBUILD mongomock-4.0.0.ebuild 932 BLAKE2B 659c9d954e6bde9482700acfac331e5dd2ce680dc807d90c1acdcdd72b0bf68e5889d2f5795c817c87d60f4bbc5ee984057556138dcff28b8259afd6b2cd5a25 SHA512 3e6f1f95aaed60ac8e24f03e42a7bdaf49b64c3ba1de8e29c3145839063f7d76b155a8310e6a69f8eaf0e2ef591f6e0e0eddcf255d5d445f9312d1ab265c57c1
 MISC metadata.xml 396 BLAKE2B 8a8168fa634a76d7bd5d134b5fddf01b1d11fa83055503f096e8c3fc8fe22dca1f601534af6d9fad70e331bd4ca23d041eb4dc7ae2cc0f899db1d23c73a5b0d6 SHA512 6135b3022dd6145d8fe56d4bd7702d335f1d876e3eeacc4ca1c811a374b31dba541db1475849346ca94445a1a5489fcdd08875369b1f6f52fa8bc49750a92682
diff --git a/dev-python/mongomock/mongomock-4.0.0.ebuild b/dev-python/mongomock/mongomock-4.0.0.ebuild
index 486e75c45198..83be201d3df2 100644
--- a/dev-python/mongomock/mongomock-4.0.0.ebuild
+++ b/dev-python/mongomock/mongomock-4.0.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~riscv x86"
 
 BDEPEND=">=dev-python/pbr-5.1.1[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/more-itertools/Manifest b/dev-python/more-itertools/Manifest
index 0a996a9ac79a..a37069258549 100644
--- a/dev-python/more-itertools/Manifest
+++ b/dev-python/more-itertools/Manifest
@@ -1,3 +1,3 @@
 DIST more-itertools-8.12.0.tar.gz 108698 BLAKE2B 2bc48aea5b8508381ac909a963d0fcbf08a17d2d96f17de1dd582bc8ced080be540322ee3f65c66eab1186d024bb2957e7bbddd62041242a7cc4cfff1ad67bc2 SHA512 73759f05d178bd6fe98cadac401707faf90a4f7b456c4aac3f0b3f6c13a2284600971e0b271f1768cacd3ae9b69848404f85432199ca51b8160fbe67045dfd17
-EBUILD more-itertools-8.12.0-r1.ebuild 1177 BLAKE2B f5dc20abbb57a0a7160e1deaee633e408ee217f03ee1fa99400c83b7597537565c579b4097e7ceb7f544c3ca434ac219230e02a69d74677868571ce36b1a81d9 SHA512 893e90f4924632fc0f337651723fffe40ae6e001e2b999fececaa7a228cf6466cbd19a21fda43ede0f15a999f0ce0434f7231ad0c030f1bb76c787ddc50c388a
+EBUILD more-itertools-8.12.0-r1.ebuild 1212 BLAKE2B 074a3ea74842184a8c9c158d6afdfb9f6dbc957920f89352ba0b9cf3513c60fe76771357c40f0b6a0b7e91dd6a004779054bac8ee6eeef02c791559ca308c870 SHA512 17738b4de2a8f1358b3917b94251e2c1da0ce475bb6fd64d479da3fdfda9b03cdccfdfaab69ac9c18d8879e6dca4ad41914ae924ccc1171331d80c31efbf79ef
 MISC metadata.xml 488 BLAKE2B b2b63c92548ad22348cd8801eacf52c7cb9e7eae7f3db303986891d6aa0e69c28aadf815aab089a199d6238b00da43f609a5e1f0b730bbce6cce7f76bd57e6a6 SHA512 d8ee6881bd90416c5e3aaa68a3158675d3e65fd786f70287d12a2bc6d79e7e5e8e16f291d0c6d673f8c1d182953ccbee0fb4fd80faf9fca6176a16679f334070
diff --git a/dev-python/more-itertools/more-itertools-8.12.0-r1.ebuild b/dev-python/more-itertools/more-itertools-8.12.0-r1.ebuild
index e6a409eb0ce2..cc6892714019 100644
--- a/dev-python/more-itertools/more-itertools-8.12.0-r1.ebuild
+++ b/dev-python/more-itertools/more-itertools-8.12.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 distutils_enable_sphinx docs \
 	dev-python/sphinx_rtd_theme
diff --git a/dev-python/moto/Manifest b/dev-python/moto/Manifest
index 0e004fe95dc3..e167fbb89a20 100644
--- a/dev-python/moto/Manifest
+++ b/dev-python/moto/Manifest
@@ -1,6 +1,12 @@
 AUX moto-3.1.1-32bit-time_t.patch 2672 BLAKE2B f83b1eaf96cf79396714e1f335dc4a18b288fba36acc9b71b69e0fbde793dbb4b3c6751e4a5cfc08d6a9918268e9c9cd86e7ae12977d437b5fc3a5deea2f2c02 SHA512 16e40775c2c1ce8b13e015da8ee5ce0b57b04a4d557aebea9b592a18f23f291e1190f8565408d18a643fee0da34efc94b3252ab706b94149538a93ce646d0141
 DIST moto-3.0.5.tar.gz 2219507 BLAKE2B 019e0f66d8a183f9d758c372252488e79692e140db19820b568279148d88181b944f547d3a213072a29fb61115b73b40b656d3a0657078c54ca1c6de001c65ab SHA512 0529711897a25ff969bf945abfda9e86ab0a310b6b273240b35c981960e04ed14f879a4a86e2251f9824d1d5bc9241afe4a0b964981c8a02a176bca459025359
 DIST moto-3.1.1.tar.gz 2236948 BLAKE2B 8ab52a59dc09f4819c1169d26fd198b13159635c2571fd27e38eaedc0a83fa5e7af0a7adba90db1c48658a849ff0b17e8d9c9750a47c6981960ac786f3d9a4e0 SHA512 2354886a9b3b46bb33b832495a94f1dcd10cf5cb00454b6e8b6b6838618842ca06f8577c1826bca02a10e2f723cf474a7c492cd9fb587bdb660deb118c17aa4d
+DIST moto-3.1.2.tar.gz 2245068 BLAKE2B f25a4476bfbbbd3cab77efc1ef2ceeb74b2b7ee9067aac4a02f90c6fd385c5ed0d66d3fd8171945e22dcd78555c9fdbec78656109b9f61fd15950c44b456d4ea SHA512 51dfef58069f09b4654aa59bef2ee0426c0e662af51d78013c19671b664ade78d2c664c20f19592236808ba7bcc50613700232e87be1ac8dcead4be2df36d39b
+DIST moto-3.1.3.tar.gz 2246198 BLAKE2B 935271da2b09b160c7ed8c8b1e2466b352d879c7b8bbe4406a410c301f9659fde3187ed76f2ad6695c79a667a44c698570dcb30206a0fe0b525a5e5bef72f40c SHA512 20963f9a1a99a2ac1654660284b3cb60439538da0d363baba92e813dd3c7bde815c125bc39cd1cf5c0cd883fba024dfda85b7e98a54141ad3e25311986c68c9a
+DIST moto-3.1.4.tar.gz 2256325 BLAKE2B d0b90eee9f77370ea48e95a5920b139825550850276760842e16ddbe340e09746a0ec6c4e4d9a57f8a68232d807b17920fff4bd88a9a75d0a72c8153cb5cbfb1 SHA512 3ec226dc19b46af50f4a266957e54292b65b9b198a5daf2f5eba6242cf2ab9a42ba743d0af1f30695de625e9fa222871890b497717ac2b9ed111b033f3804b25
 EBUILD moto-3.0.5.ebuild 4140 BLAKE2B b4bf0790620a560b228fccf99e0035fe9fdf58af326537f37d45ff0abd3f8ddf929062c348dcf39ea78f379b24d79ae1b102d1fa65c340c8bdcd911f71e71404 SHA512 ba1fd72d320c33566a46e1529ce4d1ea18622e0f91dc4f0ddb101ec9a8cdd5f6feccae97cd6acaadac0f4cbf4fd50e80c84c5c5d960ddbea81a36d40ac67cf40
 EBUILD moto-3.1.1.ebuild 3440 BLAKE2B 39962f6d7c6c4afa396c6c8fcb0214fd21b752e94f99533e6183a75be845b2b4d70a321905df41de36955e84e72161c50336b5753fca67deb19fdec95ed6983d SHA512 b41d702c3330cb04698e4def1f33d56300f381a2818f0dc33b0fa471a1f43c7837230daf26e4df6d40c95f1ca89950d29ec2a639512af59a5e4431e190de3a6b
+EBUILD moto-3.1.2.ebuild 3382 BLAKE2B 121f513d2e3bf850eb5c566f94b4b12f70e07f682c502920cf6fac95b3a6f8f542c3b6fc29e0499e7d03849532a4eae3a376a2bc40c50f5fb41573ca5d3fdd28 SHA512 f931acc8fc8dfb1f901469b3837f46acc2b4ed7058757c0705f64f4ed0336ff537a669eb8a5fc453dd14ad4e72ee81d223cb6377e749c0ead36a393f805d9432
+EBUILD moto-3.1.3.ebuild 3382 BLAKE2B 121f513d2e3bf850eb5c566f94b4b12f70e07f682c502920cf6fac95b3a6f8f542c3b6fc29e0499e7d03849532a4eae3a376a2bc40c50f5fb41573ca5d3fdd28 SHA512 f931acc8fc8dfb1f901469b3837f46acc2b4ed7058757c0705f64f4ed0336ff537a669eb8a5fc453dd14ad4e72ee81d223cb6377e749c0ead36a393f805d9432
+EBUILD moto-3.1.4.ebuild 3382 BLAKE2B 121f513d2e3bf850eb5c566f94b4b12f70e07f682c502920cf6fac95b3a6f8f542c3b6fc29e0499e7d03849532a4eae3a376a2bc40c50f5fb41573ca5d3fdd28 SHA512 f931acc8fc8dfb1f901469b3837f46acc2b4ed7058757c0705f64f4ed0336ff537a669eb8a5fc453dd14ad4e72ee81d223cb6377e749c0ead36a393f805d9432
 MISC metadata.xml 552 BLAKE2B c0162cc80007c1fda211c105b3e7391e3596ef11deb9257bab489f4b112f79ed115ca3f250bdf1b87aee0af258aa59056c8d062acebca7dec631acf3ec9eb2bb SHA512 3f7b3c5709bca51588e58f9eeb9bb363e2657a7e6483519ec7782eb047a5311d434e2459ccd3b495340f85f72a92da2f7cc6eb3de617e979bade7b8fc7b3c01d
diff --git a/dev-python/moto/moto-3.1.2.ebuild b/dev-python/moto/moto-3.1.2.ebuild
new file mode 100644
index 000000000000..49b6647dfd22
--- /dev/null
+++ b/dev-python/moto/moto-3.1.2.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Mock library for boto"
+HOMEPAGE="https://github.com/spulec/moto"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/aws-xray-sdk-python-0.93[${PYTHON_USEDEP}]
+	dev-python/boto[${PYTHON_USEDEP}]
+	dev-python/cfn-lint[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-3.3.1[${PYTHON_USEDEP}]
+	dev-python/cookies[${PYTHON_USEDEP}]
+	>=dev-python/docker-py-2.5.1[${PYTHON_USEDEP}]
+	>=dev-python/idna-2.5[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
+	>=dev-python/jsondiff-1.1.2[${PYTHON_USEDEP}]
+	dev-python/boto3[${PYTHON_USEDEP}]
+	dev-python/botocore[${PYTHON_USEDEP}]
+	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/flask-cors[${PYTHON_USEDEP}]
+	dev-python/more-itertools[${PYTHON_USEDEP}]
+	dev-python/pretty-yaml[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/python-jose[${PYTHON_USEDEP}]
+	dev-python/python-sshpubkeys[${PYTHON_USEDEP}]
+	>=dev-python/responses-0.9.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.5[${PYTHON_USEDEP}]
+	dev-python/xmltodict[${PYTHON_USEDEP}]
+	dev-python/werkzeug[${PYTHON_USEDEP}]
+	dev-python/zipp[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/responses[${PYTHON_USEDEP}]
+		>=dev-python/sure-1.4.11[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# TODO
+		tests/test_firehose/test_firehose_put.py::test_put_record_http_destination
+		tests/test_firehose/test_firehose_put.py::test_put_record_batch_http_destination
+		tests/test_swf/responses/test_decision_tasks.py::test_respond_decision_task_completed_with_schedule_activity_task_boto3
+		tests/test_swf/responses/test_timeouts.py::test_activity_task_heartbeat_timeout_boto3
+		tests/test_swf/responses/test_timeouts.py::test_decision_task_start_to_close_timeout_boto3
+		tests/test_swf/responses/test_timeouts.py::test_workflow_execution_start_to_close_timeout_boto3
+		# broken code (local variable used referenced before definition)
+		tests/test_appsync/test_appsync_schema.py
+		# Needs network (or docker?) but not marked as such, bug #807031
+		# TODO: report upstream
+		tests/test_batch/test_batch_jobs.py::test_terminate_job
+		tests/test_batch/test_batch_jobs.py::test_cancel_pending_job
+		tests/test_batch/test_batch_jobs.py::test_cancel_running_job
+		tests/test_batch/test_batch_jobs.py::test_dependencies
+		tests/test_batch/test_batch_jobs.py::test_container_overrides
+		tests/test_cloudformation/test_cloudformation_custom_resources.py::test_create_custom_lambda_resource__verify_cfnresponse_failed
+		tests/test_cloudformation/test_cloudformation_stack_integration.py::test_lambda_function
+		tests/test_sqs/test_integration.py::test_invoke_function_from_sqs_exception
+		tests/test_sqs/test_sqs_integration.py::test_invoke_function_from_sqs_exception
+	)
+
+	# pytest-django causes freezegun try to mangle stuff inside django
+	# which fails when django is not really used
+	epytest -p no:django -m 'not network'
+}
diff --git a/dev-python/moto/moto-3.1.3.ebuild b/dev-python/moto/moto-3.1.3.ebuild
new file mode 100644
index 000000000000..49b6647dfd22
--- /dev/null
+++ b/dev-python/moto/moto-3.1.3.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Mock library for boto"
+HOMEPAGE="https://github.com/spulec/moto"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/aws-xray-sdk-python-0.93[${PYTHON_USEDEP}]
+	dev-python/boto[${PYTHON_USEDEP}]
+	dev-python/cfn-lint[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-3.3.1[${PYTHON_USEDEP}]
+	dev-python/cookies[${PYTHON_USEDEP}]
+	>=dev-python/docker-py-2.5.1[${PYTHON_USEDEP}]
+	>=dev-python/idna-2.5[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
+	>=dev-python/jsondiff-1.1.2[${PYTHON_USEDEP}]
+	dev-python/boto3[${PYTHON_USEDEP}]
+	dev-python/botocore[${PYTHON_USEDEP}]
+	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/flask-cors[${PYTHON_USEDEP}]
+	dev-python/more-itertools[${PYTHON_USEDEP}]
+	dev-python/pretty-yaml[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/python-jose[${PYTHON_USEDEP}]
+	dev-python/python-sshpubkeys[${PYTHON_USEDEP}]
+	>=dev-python/responses-0.9.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.5[${PYTHON_USEDEP}]
+	dev-python/xmltodict[${PYTHON_USEDEP}]
+	dev-python/werkzeug[${PYTHON_USEDEP}]
+	dev-python/zipp[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/responses[${PYTHON_USEDEP}]
+		>=dev-python/sure-1.4.11[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# TODO
+		tests/test_firehose/test_firehose_put.py::test_put_record_http_destination
+		tests/test_firehose/test_firehose_put.py::test_put_record_batch_http_destination
+		tests/test_swf/responses/test_decision_tasks.py::test_respond_decision_task_completed_with_schedule_activity_task_boto3
+		tests/test_swf/responses/test_timeouts.py::test_activity_task_heartbeat_timeout_boto3
+		tests/test_swf/responses/test_timeouts.py::test_decision_task_start_to_close_timeout_boto3
+		tests/test_swf/responses/test_timeouts.py::test_workflow_execution_start_to_close_timeout_boto3
+		# broken code (local variable used referenced before definition)
+		tests/test_appsync/test_appsync_schema.py
+		# Needs network (or docker?) but not marked as such, bug #807031
+		# TODO: report upstream
+		tests/test_batch/test_batch_jobs.py::test_terminate_job
+		tests/test_batch/test_batch_jobs.py::test_cancel_pending_job
+		tests/test_batch/test_batch_jobs.py::test_cancel_running_job
+		tests/test_batch/test_batch_jobs.py::test_dependencies
+		tests/test_batch/test_batch_jobs.py::test_container_overrides
+		tests/test_cloudformation/test_cloudformation_custom_resources.py::test_create_custom_lambda_resource__verify_cfnresponse_failed
+		tests/test_cloudformation/test_cloudformation_stack_integration.py::test_lambda_function
+		tests/test_sqs/test_integration.py::test_invoke_function_from_sqs_exception
+		tests/test_sqs/test_sqs_integration.py::test_invoke_function_from_sqs_exception
+	)
+
+	# pytest-django causes freezegun try to mangle stuff inside django
+	# which fails when django is not really used
+	epytest -p no:django -m 'not network'
+}
diff --git a/dev-python/moto/moto-3.1.4.ebuild b/dev-python/moto/moto-3.1.4.ebuild
new file mode 100644
index 000000000000..49b6647dfd22
--- /dev/null
+++ b/dev-python/moto/moto-3.1.4.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Mock library for boto"
+HOMEPAGE="https://github.com/spulec/moto"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/aws-xray-sdk-python-0.93[${PYTHON_USEDEP}]
+	dev-python/boto[${PYTHON_USEDEP}]
+	dev-python/cfn-lint[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-3.3.1[${PYTHON_USEDEP}]
+	dev-python/cookies[${PYTHON_USEDEP}]
+	>=dev-python/docker-py-2.5.1[${PYTHON_USEDEP}]
+	>=dev-python/idna-2.5[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
+	>=dev-python/jsondiff-1.1.2[${PYTHON_USEDEP}]
+	dev-python/boto3[${PYTHON_USEDEP}]
+	dev-python/botocore[${PYTHON_USEDEP}]
+	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/flask-cors[${PYTHON_USEDEP}]
+	dev-python/more-itertools[${PYTHON_USEDEP}]
+	dev-python/pretty-yaml[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/python-jose[${PYTHON_USEDEP}]
+	dev-python/python-sshpubkeys[${PYTHON_USEDEP}]
+	>=dev-python/responses-0.9.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.5[${PYTHON_USEDEP}]
+	dev-python/xmltodict[${PYTHON_USEDEP}]
+	dev-python/werkzeug[${PYTHON_USEDEP}]
+	dev-python/zipp[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/responses[${PYTHON_USEDEP}]
+		>=dev-python/sure-1.4.11[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# TODO
+		tests/test_firehose/test_firehose_put.py::test_put_record_http_destination
+		tests/test_firehose/test_firehose_put.py::test_put_record_batch_http_destination
+		tests/test_swf/responses/test_decision_tasks.py::test_respond_decision_task_completed_with_schedule_activity_task_boto3
+		tests/test_swf/responses/test_timeouts.py::test_activity_task_heartbeat_timeout_boto3
+		tests/test_swf/responses/test_timeouts.py::test_decision_task_start_to_close_timeout_boto3
+		tests/test_swf/responses/test_timeouts.py::test_workflow_execution_start_to_close_timeout_boto3
+		# broken code (local variable used referenced before definition)
+		tests/test_appsync/test_appsync_schema.py
+		# Needs network (or docker?) but not marked as such, bug #807031
+		# TODO: report upstream
+		tests/test_batch/test_batch_jobs.py::test_terminate_job
+		tests/test_batch/test_batch_jobs.py::test_cancel_pending_job
+		tests/test_batch/test_batch_jobs.py::test_cancel_running_job
+		tests/test_batch/test_batch_jobs.py::test_dependencies
+		tests/test_batch/test_batch_jobs.py::test_container_overrides
+		tests/test_cloudformation/test_cloudformation_custom_resources.py::test_create_custom_lambda_resource__verify_cfnresponse_failed
+		tests/test_cloudformation/test_cloudformation_stack_integration.py::test_lambda_function
+		tests/test_sqs/test_integration.py::test_invoke_function_from_sqs_exception
+		tests/test_sqs/test_sqs_integration.py::test_invoke_function_from_sqs_exception
+	)
+
+	# pytest-django causes freezegun try to mangle stuff inside django
+	# which fails when django is not really used
+	epytest -p no:django -m 'not network'
+}
diff --git a/dev-python/mypy/Manifest b/dev-python/mypy/Manifest
index 6909694e504e..0f9503e9bea0 100644
--- a/dev-python/mypy/Manifest
+++ b/dev-python/mypy/Manifest
@@ -5,10 +5,12 @@ DIST mypy-0.930.tar.gz 2777310 BLAKE2B 4681991993b04679d21c8f6bf8327a02eb628addc
 DIST mypy-0.931.tar.gz 2779826 BLAKE2B 11986102c6bc498a23bae52002e6ac515fa03724eed867b5356e3fb9aaa9a6eb7e699b612ab81b99dac215119402beecc702421fa82d655913976889dd4cb833 SHA512 8a336ae2f784c8ff912fc6b7dd53ed106cf14f435cee65604de74b8d4d7ab39ad65af0646060ef78e958d5a51a1de090fad628461412f2eef9593a8c032aa87a
 DIST mypy-0.940.tar.gz 2700469 BLAKE2B 4ac13002c3752566ade30a720c4de56d600552221c42f930af54a68573e6b5eb10de90ce66e2cd42f9eb419d5d09e354e4bf2d09cbcf0d6b841ab0e6710d7058 SHA512 5131ea3fe8d96f12442c68dddf04261582a063dcdd031804276263949af9f9af967be3dd775868d289709987773e1911f33e1f43951389f93cabf91c771e271f
 DIST mypy-0.941.tar.gz 2700297 BLAKE2B 1d0369336b82c167dc25da8bcc21817b351a65a2543727f08c2e14aa15a75fec21b0937eb09b8060b405c09703b8052d4ed2df65d6e27f5dd429998b110a9e35 SHA512 39ef6e0d9215f0f530ca572d3b701a877f9b968034c2ca5a04549bf6a337a8d3609c23bc45bf45b16209128d26ab2b74bca27ecbdc5de53581429b47fb348aa8
+DIST mypy-0.942.tar.gz 2701940 BLAKE2B 5501466e57b4afb8825e6c804cbdc270c79ff457c39f2e5834f4b68df70263c05b2b9abb08fe58202ee65f5e22d2291f39fcb1fc47168416134538c5f6e12ab3 SHA512 79b83587eefad10d7d20d3bfd8484a9e8b2d363e68c1e5ffaa3a82ca8b8f8d9183036ea46695a634f9156911d6f918af684ac636105b37b3a5d0e958f5d661f4
 EBUILD mypy-0.910-r1.ebuild 2064 BLAKE2B 1414bf4e87e49d283ad99c621792f1a8c9d47adff14f426949b3825fa8136db03bb6289fecf9cabb311eadbb7b11e4d808e5d5698224c4b028dd9aff2fcfd98f SHA512 48ac5b30de896c4e4191edc20f6c435aa7fd6d0388a99e00ed51e8d27d7a40298e7ae070c6dc786d6e55d62c0963b809a427f066ef96fc3a2e2d17a33164147c
 EBUILD mypy-0.921.ebuild 1879 BLAKE2B 0939ecbed7865716f208ea6683ffd6c076e769e4e0931d036b57640981e2a7b105dbbf49ade6a35e0eeea376439a58cc781e5ee69c1499dafcb053f9f18488d9 SHA512 5aace31c9a2df86b445ae25c44a2d3e0fd64912add86510de7baea42a3ad77a0fd4e3f86776eea493cb7975955a59f7243e281f1b62e1d84db44dc605a07d9a6
 EBUILD mypy-0.930.ebuild 2035 BLAKE2B 0674851d3f13ea99dbc5ff3e0f220fb83102115ccd6a018a6d4e260264346a9a2994cd3f87b4949f796955c00f84c4e618be969ad944c25060fb8be8ab362032 SHA512 7c27537237030313f6c6a7a5e34de80b6c384181f789e0a90984d96b10249b9c3905e18cb58c981cb645fba85843faec804072b7822cd27150c3175b5eaa9730
 EBUILD mypy-0.931.ebuild 2035 BLAKE2B 58a0dc91ae249505d41ebd2fd0295bed2b83604c7b33280dcfdbcbcd868905faefc4e5f1dcf170651423e7d559730552c7508b67cf987682f739513f04a689ed SHA512 1df3e91820bf6728405582b6722e270d63dd8ec346499abeaa19ff8d7152e1c6fec9a92306df8c3ddf1a6b4b7a069499865c67fabd3141537f739d739a047c06
 EBUILD mypy-0.940.ebuild 2075 BLAKE2B c89447e07672a9fb8ad7e2cd014b5f170d3fc24c980f538a35c3ec71239b307a6a8f72737dbb7c254e957b279205cc573c24846c3e78e628f5dbcdc10008c290 SHA512 bf9708f8a7c0f2cad02993c92f840ffcfc05060f283567a5331d10a6efa87cfe605a175308f7cf78514be0283845c2c050c1797a36e7a255e5609864102d83cc
 EBUILD mypy-0.941.ebuild 2075 BLAKE2B c89447e07672a9fb8ad7e2cd014b5f170d3fc24c980f538a35c3ec71239b307a6a8f72737dbb7c254e957b279205cc573c24846c3e78e628f5dbcdc10008c290 SHA512 bf9708f8a7c0f2cad02993c92f840ffcfc05060f283567a5331d10a6efa87cfe605a175308f7cf78514be0283845c2c050c1797a36e7a255e5609864102d83cc
+EBUILD mypy-0.942.ebuild 2075 BLAKE2B c89447e07672a9fb8ad7e2cd014b5f170d3fc24c980f538a35c3ec71239b307a6a8f72737dbb7c254e957b279205cc573c24846c3e78e628f5dbcdc10008c290 SHA512 bf9708f8a7c0f2cad02993c92f840ffcfc05060f283567a5331d10a6efa87cfe605a175308f7cf78514be0283845c2c050c1797a36e7a255e5609864102d83cc
 MISC metadata.xml 515 BLAKE2B 75827bbbeb70fd4b9295ab4689068d2d4b686b32d4059acde94fb0d08048e9e56ecaf3eec39dc5567b2753e2552353e273cdf2f4e27d077cc9b03320ee09c64b SHA512 c1c3c7a3651e61e0b63ab4462f0370cce9cbdce33e64c5e7a1fbefe8116d5d3d3b35bc4095d8a5ce28caf69b0644af3f13c9a27b683f2f981e52f8bfe4ac8615
diff --git a/dev-python/mypy/mypy-0.942.ebuild b/dev-python/mypy/mypy-0.942.ebuild
new file mode 100644
index 000000000000..aa40a8f0ad7f
--- /dev/null
+++ b/dev-python/mypy/mypy-0.942.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="Optional static typing for Python"
+HOMEPAGE="http://www.mypy-lang.org/"
+SRC_URI="https://github.com/python/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+# stubgen collides with this package: https://bugs.gentoo.org/585594
+RDEPEND="
+	!dev-util/stubgen
+	>=dev-python/psutil-4[${PYTHON_USEDEP}]
+	>=dev-python/typed-ast-1.4.0[${PYTHON_USEDEP}]
+	<dev-python/typed-ast-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/typing-extensions-3.7.4[${PYTHON_USEDEP}]
+	>=dev-python/mypy_extensions-0.4.3[${PYTHON_USEDEP}]
+	<dev-python/mypy_extensions-0.5.0[${PYTHON_USEDEP}]
+	dev-python/tomli[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		>=dev-python/attrs-18.0[${PYTHON_USEDEP}]
+		>=dev-python/lxml-4.4.0[${PYTHON_USEDEP}]
+		>=dev-python/pytest-6.1.0[${PYTHON_USEDEP}]
+		>=dev-python/pytest-xdist-1.18[${PYTHON_USEDEP}]
+		>=dev-python/py-1.5.2[${PYTHON_USEDEP}]
+		>=dev-python/typed-ast-1.4.0[${PYTHON_USEDEP}]
+		>=dev-python/virtualenv-16.0.0[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source dev-python/sphinx_rtd_theme
+distutils_enable_tests pytest
+
+# this requires packaging a lot of type stubs
+export MYPY_USE_MYPYC=0
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# Fails with pytest-xdist 2.3.0
+		# https://github.com/python/mypy/issues/11019
+		mypy/test/teststubtest.py
+		# fails due to setuptools deprecation warnings
+		mypyc/test/test_run.py::TestRun::run-imports.test::testImports
+	)
+
+	[[ "${EPYTHON}" == "python3.10" ]] && EPYTEST_DESELECT+=(
+		# https://github.com/python/mypy/issues/11018
+		mypyc/test/test_commandline.py::TestCommandLine::testErrorOutput
+	)
+
+	# Some mypy/test/testcmdline.py::PythonCmdlineSuite tests
+	# fail with high COLUMNS values
+	local -x COLUMNS=80
+	epytest -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+}
diff --git a/dev-python/namespace-google/Manifest b/dev-python/namespace-google/Manifest
index 25de215348ab..84bf18f3e1f4 100644
--- a/dev-python/namespace-google/Manifest
+++ b/dev-python/namespace-google/Manifest
@@ -1,2 +1,2 @@
-EBUILD namespace-google-1-r1.ebuild 828 BLAKE2B 889abcf94a09c70ca87fbc3efe1a17e9ae32b5e91b45362dd835b06382199126cf1b07db41821184bed94d2b87d855485e4fd4355cbd2af655ba97a5f6891bbc SHA512 a985b8607227b9114efd9b4a176bf6a23fb7c71b39a1624a76d2425078ffe78bc317561d2c0020dfb64831efcd229d4d41fe74d366915ab2fd319da7d4e9cf62
+EBUILD namespace-google-1-r1.ebuild 827 BLAKE2B e80654f7f488e9a3893b952df6a3ccf7a6986215825e7d915a1fc89381d67c11a2ff345f88bbb94f3e8238e81c2a719ae3dffd50928d66be91c21008977dd218 SHA512 6b74b7c1bc778ab77bbd59ca2867cabf06c5743938564f4c869c8dc87e1b00e5f7d512767500cd277b6313e09ea54a2cdb40534a304ab239b9541f635cd44b1d
 MISC metadata.xml 219 BLAKE2B f7cf6cd41e0433b323b2c16caf31baef1c0b5ea00980018722e5fae803f92216e39343892928605454b0c756e121929eace02b4925a6bd7f10421e91a1845357 SHA512 27c6aca9eb36b7d427c10b6daedc4bc6c0d744fb464e5322ef6823073bb9be648a60ba2fff5f855282a5a5a3da3ce379d9419cde175d462f1fa443ff6b3a4bdf
diff --git a/dev-python/namespace-google/namespace-google-1-r1.ebuild b/dev-python/namespace-google/namespace-google-1-r1.ebuild
index c7361b9a2cdd..285076609031 100644
--- a/dev-python/namespace-google/namespace-google-1-r1.ebuild
+++ b/dev-python/namespace-google/namespace-google-1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI=""
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE=""
 
 RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/nbclient/Manifest b/dev-python/nbclient/Manifest
index b5b4196062b6..58932b2cc2a2 100644
--- a/dev-python/nbclient/Manifest
+++ b/dev-python/nbclient/Manifest
@@ -1,3 +1,3 @@
 DIST nbclient-0.5.13.gh.tar.gz 75335 BLAKE2B 02a1d7d84b51c3af81f4d511e3a68a94d28478d09241a174309d9338a10be9c2e7cc48601bfb844dcad979eca867890e96df47d0e2aa6d7f7881a2e899b79ab5 SHA512 cebb9c4216d4c1668908a0b332a32d63825e7c3cfcf78b3e918df16364a04a12c396646f4e0b215a9bbc40d1be907a361f90aff3721e299d17c852f8acec0d04
-EBUILD nbclient-0.5.13.ebuild 1003 BLAKE2B acd57e17097f4c31a83c6be486ea68e104d1ea79fc7ce935e08250312058c1b16e5bc77ad37dddbfc7d57f30c6e097aa28f769de6bdba2415e83d247b88f48ad SHA512 277f53437d914f2a942fba7598e8492e69fe4aa4449f2bfd9643d923e47201b6100fe5f62b5660ecbc1ab5a71fd7b318d5935cc75b2c09b782f79ae9aae6d839
+EBUILD nbclient-0.5.13.ebuild 1002 BLAKE2B bb5c800b48a69084a08eada6f4a1ba07948903d8b5172fd11f30298cc2c4061b68b8a88ba2a26f62da7d279b071ce5aa658a7bc52ecc8c8d685fe2d20a80d167 SHA512 23c081e6666a235c9cc2594c61be6b94347728a5fc7eacd49b556915187c0d5a7492b07940661d844e78e9a68ba1d20e939bd084b671f4cd53473c7b59c83d6a
 MISC metadata.xml 405 BLAKE2B d1efa5f7bb2a959bdbc6093b1bd3930e6cdb9bffbe872c6775c15dfc1024ae24d6bcb4651c8e1fb06242b17d6a86f683de3b528bbf1a60b5656a90c1f4ac81b7 SHA512 5b0de690d37dd5928e3bfd0b380336d154cced094e342b41dfd16d0caddd2b792a2158b209404a36461cf4d1b12d836024eae2aedf15093b90f4e363382b38bf
diff --git a/dev-python/nbclient/nbclient-0.5.13.ebuild b/dev-python/nbclient/nbclient-0.5.13.ebuild
index 958c41f4405c..8af84eaa2b01 100644
--- a/dev-python/nbclient/nbclient-0.5.13.ebuild
+++ b/dev-python/nbclient/nbclient-0.5.13.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 hppa ~ia64 ppc ~ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/jupyter_client-6.1.5[${PYTHON_USEDEP}]
diff --git a/dev-python/nbconvert/Manifest b/dev-python/nbconvert/Manifest
index 0ca62b5613c6..a77b989c5690 100644
--- a/dev-python/nbconvert/Manifest
+++ b/dev-python/nbconvert/Manifest
@@ -1,5 +1,7 @@
 DIST nbconvert-6.4.2.tar.gz 902691 BLAKE2B ee61836ac423db0803d90b92f5cfce7e53e311637dfff7e31e5506fc1588a41515e984860bc56f617b0e0add033c41e6d2099f2abfdda7f31015f6e751110639 SHA512 325637844044ff4a118ca7803e9803fd6909667e017dae04859f58a02e1aadc8b8c699f9b9612bd47991a4c06a23acd526abdcbf1a219e29d985001ae01237bb
 DIST nbconvert-6.4.4.tar.gz 906988 BLAKE2B 84ea6726804ccb738995df1e2e961a9816d3bf9c77034d464afbfa2ba0cf3ce19c1f6af1775fa027795ba3faeaacac765decce2d309f8a60a27e76934cdb356a SHA512 2b319fcc13c6b2addc7e1ca319f36e8a37e8390eb0d8d8df9f9456e7ae816b93ec30ab00a1003894c92091030658920729f0e31fdb5031dccb3f36b38b5d8f99
-EBUILD nbconvert-6.4.2.ebuild 1951 BLAKE2B 4b16d7f5fd67d498a9eddf4c83326888d34a1ef2e4887e78a6bc5cb3981a6966b0c6f03ab700550e74df6add290c0a60bfcce7e04e0f2792aa2bb457d0214bec SHA512 7d45586edc68357d71a74a84e0fa4f0398fccb3aa11f0b500d7c96a0f45d74cd9add874af6081246087cda435cc92446117199a9c9f53e7615874238342abb59
+DIST nbconvert-6.4.5.tar.gz 906309 BLAKE2B 5aee22eb9ce6bb36e04cc3b3db5460041b0a2dfb4afeb1e4787e941d6815f22b7621104ca6d14cb0977c5d09f9a0fade8a5787416b5f55ca1b09149730560bf7 SHA512 9a32eceaff065016baea9fc79478aeb8981f55a2cd47889e640815f2bf924df201d9ce72a4b615d533bcadbd681900678d30de61f777ae4f12bd9fce62d73622
+EBUILD nbconvert-6.4.2.ebuild 1950 BLAKE2B 57c46c9cb91a9184828662f72e1ff8829c4300dd261d7880c8474f111aad9118e91008e43796460b868400189f4d7f1038dff09f33388d1fe628b30d5d9dc4b0 SHA512 cf15a34a5eab40af2ac832a52d599cd3ae45588975730c0fe30436ebb1cf9242c8596512724ec8bf9d26d829f6312c03114c3e8fe19b5131cfb62994f990ab3e
 EBUILD nbconvert-6.4.4.ebuild 2001 BLAKE2B 52386a9cbcadce8335a3c690b78911381d3146945897583b320c727ca5a0e49a552ccda1585c4d1ffde6ef233148267701244faf032870c0876f74fdf997d5d8 SHA512 64a2adb2595bc9a99473df2f8111fafb95e1d7b9d8a313930c582453e2bc6f35de280daa2196708ad81d2394ac489b290b176c368e74cd3651105e1480185032
+EBUILD nbconvert-6.4.5.ebuild 2048 BLAKE2B 284e671a8d0aa7bd34c14ef3fdaa3c746576126ecf7f0bd1a285dd3cc625146f8c7b8832434c8ff8727bee6fed82602ceed0734dfb5ac486902e0349052290f3 SHA512 c206b09549758c34e3940ce0c9fa846e1127b9e4eab924c6748589653df4acfd5ec99b63b1113e17c676ac52917bdf0069b79c964c295564c6d49dca2e191082
 MISC metadata.xml 527 BLAKE2B a915103b3eaf57236f4257c98354a1e3733771369ac825fa8bbc4f79f0d1a23272dc86e744513620fbee37792e813a15dbb955e633a7c57597c3c38657ed05d3 SHA512 b60a311ce52915dbc12addd4a882670ac96ff8b3be2aa651eaac3d0963d6e73a72eaafd53f90fb685599504857e6bcd0568071962d7696c2605462b77260ad6a
diff --git a/dev-python/nbconvert/nbconvert-6.4.2.ebuild b/dev-python/nbconvert/nbconvert-6.4.2.ebuild
index 6dbfc1b185b8..1bd34c3eaef3 100644
--- a/dev-python/nbconvert/nbconvert-6.4.2.ebuild
+++ b/dev-python/nbconvert/nbconvert-6.4.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 hppa ~ia64 ppc ~ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/bleach[${PYTHON_USEDEP}]
diff --git a/dev-python/nbconvert/nbconvert-6.4.5.ebuild b/dev-python/nbconvert/nbconvert-6.4.5.ebuild
new file mode 100644
index 000000000000..ed66dc80cf13
--- /dev/null
+++ b/dev-python/nbconvert/nbconvert-6.4.5.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Converting Jupyter Notebooks"
+HOMEPAGE="https://nbconvert.readthedocs.io/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+	dev-python/bleach[${PYTHON_USEDEP}]
+	dev-python/defusedxml[${PYTHON_USEDEP}]
+	>=dev-python/entrypoints-0.2.2[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/jupyter_core[${PYTHON_USEDEP}]
+	dev-python/jupyterlab_pygments[${PYTHON_USEDEP}]
+	>=dev-python/markupsafe-2.0[${PYTHON_USEDEP}]
+	>=dev-python/mistune-0.8.1[${PYTHON_USEDEP}]
+	<dev-python/mistune-2[${PYTHON_USEDEP}]
+	dev-python/nbclient[${PYTHON_USEDEP}]
+	dev-python/nbformat[${PYTHON_USEDEP}]
+	>=dev-python/pandocfilters-1.4.1[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-5.1.1[${PYTHON_USEDEP}]
+	dev-python/testpath[${PYTHON_USEDEP}]
+	www-servers/tornado[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pebble[${PYTHON_USEDEP}]
+		dev-python/ipykernel[${PYTHON_USEDEP}]
+		dev-python/ipywidgets[${PYTHON_USEDEP}]
+		>=dev-python/jupyter_client-4.2[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_test() {
+	mkdir -p "${HOME}/.local" || die
+	cp -r share "${HOME}/.local/" || die
+	distutils-r1_src_test
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# Missing pyppeteer for now
+		# TODO: Doesn't skip?
+		nbconvert/exporters/tests/test_webpdf.py
+		# Needs pyppeteer too
+		'nbconvert/tests/test_nbconvertapp.py::TestNbConvertApp::test_webpdf_with_chromium'
+	)
+
+	epytest --pyargs nbconvert
+}
+
+pkg_postinst() {
+	if ! has_version app-text/pandoc ; then
+		einfo "Pandoc is required for converting to formats other than Python,"
+		einfo "HTML, and Markdown. If you need this functionality, install"
+		einfo "app-text/pandoc."
+	fi
+}
diff --git a/dev-python/nbformat/Manifest b/dev-python/nbformat/Manifest
index fd08aad50354..32c64939af2e 100644
--- a/dev-python/nbformat/Manifest
+++ b/dev-python/nbformat/Manifest
@@ -1,5 +1,7 @@
 DIST nbformat-5.1.3.gh.tar.gz 130922 BLAKE2B 866eb53dd3f04c09f4a08303c5e84b672cc826d2d9b369cd85038b6c4075e74dce88fbcae80fc9b5450faf1c4971d121abe35e0a2ce2a8e73e020d2bed3a5594 SHA512 b4bc3d51d6e940ce1e2b1f5ca1005cf3d466b2b7b589383a31c4d2908c4e539344f4c8fb9e92993469d4d66f363c35082f0c16b8a63aa61e19fb24fa5ac910fd
 DIST nbformat-5.2.0.gh.tar.gz 133519 BLAKE2B aa9ff18ff879fe4b85af6d552a7d2f44d10bb96366e7af15214f7ae4c9d193a24bee8d0dc0ae1b71da13f44abaf4093e412f32b8357b4846985940c002a17b7e SHA512 55718e84a5125f8c28c8cd1be0725669f4d56bc22e6dd92b907a0e8cda27e17f8f56aad29806ee9f1c2c58641dd80455f04241fe5a54f8b6309575bb7656fc87
+DIST nbformat-5.3.0.gh.tar.gz 133531 BLAKE2B 7d4e0fdee7c2b5cfdb09bf90ff225b6be184cb6e02e36319e52c5a021283b2ae884c189f1e98a9fd40f1e12811bafe37cc59d27f1e34433d38c00e5fb0cc9fbe SHA512 50cb0b98501c2ee640ae1e6036346912ebc58f63faa8f1e4535681eb3f468072d5bc462d3788cc4233108612239fe03a1da41acfe30c915e13e7428f35415a91
 EBUILD nbformat-5.1.3-r1.ebuild 922 BLAKE2B dcbbcf1465eb24317cf56a1042c020dd39d810297fe7f00a9cc372b21810bd63239687ba1289415251899bc9d4722525c2f2722f96d00ac4189dd6693e55c84f SHA512 8e238f819ab89c8596cad50912b4e770ee87d6f370272db59bf8add9563f117ecc457c0d310a6121ad69b5ecd3fc7b044ab395df1e4296a28c96b6aad168339b
 EBUILD nbformat-5.2.0.ebuild 864 BLAKE2B 3ecf8643664a97dd62d9e7125ab6c0f3467838661b7bb57dce7d240419afbf063e7411a0dbbfb5863bda1c072566d93d3b216bbd68bde91bf6aad920ce8d2f93 SHA512 0776ed55aa2963de7575b543b4e7a51116a4eaa5c6ae52a185d44e560465afbb70658b8289698825ef000015754dc01d7f422057b2038b97b2d916e98ad8cadf
+EBUILD nbformat-5.3.0.ebuild 864 BLAKE2B 3ecf8643664a97dd62d9e7125ab6c0f3467838661b7bb57dce7d240419afbf063e7411a0dbbfb5863bda1c072566d93d3b216bbd68bde91bf6aad920ce8d2f93 SHA512 0776ed55aa2963de7575b543b4e7a51116a4eaa5c6ae52a185d44e560465afbb70658b8289698825ef000015754dc01d7f422057b2038b97b2d916e98ad8cadf
 MISC metadata.xml 780 BLAKE2B d44b94d8d10d01e2b8f465b6a0351308e7c219295f34713ea2f26f0cc1c9ee4c156bae3a33977a8adc0bd2cef177d468a5221d0d7a5bce946bcd3aa1a1ff0623 SHA512 0d15f8e0ef1d3f675cfabd0a9d4db7a8844be4ae1c9ff06825bc9a0771ef7e2430d1ff66a3ded9ee64df42ab4277c3eba65ed256d6a672cad20154272a0a2c96
diff --git a/dev-python/nbformat/nbformat-5.3.0.ebuild b/dev-python/nbformat/nbformat-5.3.0.ebuild
new file mode 100644
index 000000000000..b21a6cd7e450
--- /dev/null
+++ b/dev-python/nbformat/nbformat-5.3.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE='sqlite'
+
+inherit distutils-r1
+
+DESCRIPTION="Reference implementation of the Jupyter Notebook format"
+HOMEPAGE="https://jupyter.org"
+SRC_URI="
+	https://github.com/jupyter/nbformat/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/jsonschema-2.4.0[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-4.1[${PYTHON_USEDEP}]
+	dev-python/jupyter_core[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/fastjsonschema[${PYTHON_USEDEP}]
+		dev-python/testpath[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs \
+	dev-python/numpydoc
+distutils_enable_tests pytest
diff --git a/dev-python/nbsphinx/Manifest b/dev-python/nbsphinx/Manifest
index 7e808db48891..ed93fba2652d 100644
--- a/dev-python/nbsphinx/Manifest
+++ b/dev-python/nbsphinx/Manifest
@@ -1,4 +1,3 @@
 DIST nbsphinx-0.8.8.tar.gz 146831 BLAKE2B 26687d74900e7667dff644a91d58eeed57e2b2e91391d4a8024d5ee2c858d5d8bb132db5b025357817004480bc161d8ad6f5c003240d6bbc23420e1633a63abd SHA512 8a791171d6fffc414e19224d29e323644e141c5c51522b7914549aa066f2757cb4e88318a1bf20e4abbd7130cf85c4e8c3fb5537802098342a32c896e3caf3bf
-EBUILD nbsphinx-0.8.8-r1.ebuild 659 BLAKE2B 3ba2e01021506a57e0b070c1551e9850e4a718614a61b428a5e2a1e3266897e23bc1526c2147c58d552955184c9ee0704c834ba7cbb15954be5d44fff79d896e SHA512 2d4d1d203d4ac456eefb7bdd8175c1c76b55e543ae5cdf21fdbd11a1d15bdcb88aafed1a333c755be35760b750f0b3a3f8fbea8f8a02ba7623b8ff8dd822c6ce
-EBUILD nbsphinx-0.8.8.ebuild 623 BLAKE2B 561c6910d9c9dc45aa44ba25d6008b349d2f7701a5a7df6bf73680ea39c79cdfcfe15fa8edf5746777f033e62db942881f99fdd5fb31d4d0e9120666f0ecfd8d SHA512 391587958d87302089377304a24d6caeec875b7ce4fe6420808616bdb18368a47fca5afa57c0b91d3b1941c908cc1f2557642ec57071af9022cca41a8d5113cf
+EBUILD nbsphinx-0.8.8-r1.ebuild 657 BLAKE2B 9acffd8bd796fe9839905437a964556c3d8c2d0be4ae34af284b20dc6e86df026953a6057bae6cfed81a834864b23138844860526d7a34855a1cb7e5ca62642f SHA512 87d6c305a07397c94577664e8f4ab14cf7d5cb46a4f12093391944927b302aaced354d97130b2ef4e258d9ec18bfe3a6460872e9e081f8be43517524319d2cf7
 MISC metadata.xml 835 BLAKE2B a3a10c9fb26688d90ad6f4e2ddb8b174eae9fdc2637d4aabdb86f63093982c7c9a42c4eaa3b2adee6ddb12ba2d537aec79d324c0a3c7355424a4255cea90eda6 SHA512 9ac5cebe164b19f80e0eb07f7c4fb5cb2cf5251af1f81290931f8fd01223261cb6224500387c131c7bc8738d7bb07eb790fd9ea426a295d0688489510e58d55c
diff --git a/dev-python/nbsphinx/nbsphinx-0.8.8-r1.ebuild b/dev-python/nbsphinx/nbsphinx-0.8.8-r1.ebuild
index 841a5816068f..7336997763ca 100644
--- a/dev-python/nbsphinx/nbsphinx-0.8.8-r1.ebuild
+++ b/dev-python/nbsphinx/nbsphinx-0.8.8-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"
 
 RDEPEND="
 	dev-python/docutils[${PYTHON_USEDEP}]
diff --git a/dev-python/nbsphinx/nbsphinx-0.8.8.ebuild b/dev-python/nbsphinx/nbsphinx-0.8.8.ebuild
deleted file mode 100644
index f2712d962b15..000000000000
--- a/dev-python/nbsphinx/nbsphinx-0.8.8.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Jupyter Notebook Tools for Sphinx"
-HOMEPAGE="https://github.com/spatialaudio/nbsphinx/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-RDEPEND="
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/nbconvert[${PYTHON_USEDEP}]
-	dev-python/nbformat[${PYTHON_USEDEP}]
-	>=dev-python/sphinx-1.8[${PYTHON_USEDEP}]
-	dev-python/traitlets[${PYTHON_USEDEP}]"
diff --git a/dev-python/nest_asyncio/Manifest b/dev-python/nest_asyncio/Manifest
index 2191c4d3ef6e..9b328525db26 100644
--- a/dev-python/nest_asyncio/Manifest
+++ b/dev-python/nest_asyncio/Manifest
@@ -1,3 +1,5 @@
 DIST nest_asyncio-1.5.4.tar.gz 5893 BLAKE2B d3f693e251d5f0e9f7f31e0aa3e88962aaf927320268a31d53fc2b2eb71bb45eb3a8f9d7f733d0ca96a848beb1d8c505121325749226e962a44b3c2988873190 SHA512 982e274712ec8a8004108492708f28fbf459c5f2d274e754387b0afa0f92425fe29be075e3402bbc319accf17974efcbb3015799421f6a10ed15cfa424f82310
+DIST nest_asyncio-1.5.5.tar.gz 7386 BLAKE2B c5d3704dae962ec82a515e2c056c24bd0fbabcf1cd2347379e1d58fc23c922325c89ed0941aead4dc90e0a94fc39ddb5e38fe4decc6e444b0c1261ae955520cb SHA512 8f28b4495f1d595f5943fb8a40c8894183398865059c42686483d6c4af6634b5119ff6e694b98662bfdd71046ec0bed70f5fcceb67971637c0fed91cb6d6eaea
 EBUILD nest_asyncio-1.5.4.ebuild 470 BLAKE2B 9f0a2582479181a5441167a40c7fe222a14bc9c294e974c56183803fd7c17713aa4a10c938d7ba89105da0959725b1194400028833ee2aafeed0fc3e28c07eec SHA512 ee0dd26434426af4b93b8a9a65f4bdfa722f44f9a311f5a396a4a1570fb4acfaf154250f8aec9a27a31f309a8644f062dd7c02facd7beb5ec6cca4ae16f6bfc4
+EBUILD nest_asyncio-1.5.5.ebuild 511 BLAKE2B a09136755a429969a64395f918b330950af617c508cb782af8e0395b28d975a66e91b8a1a92255b3218b2e8ab81397865dcaa69e1b4ad11aa98e1f014e30abc6 SHA512 e7657c84b6a3b69633aef3ef431a20c6a2e33e030cec0a8577a439b6ebc9c3a6cf2e8cbfa9862cc585e385cde6e6fa0335d80616455aadfb73ef3660decebbfe
 MISC metadata.xml 389 BLAKE2B 7725ccfe525c9aa2f6b3330e97fad88e1dbc5dd829573d9c32bcf0b492af7303e33668e1370dc6cd8fc89cd55f0be20110d72de0caf87eedf61869e8231f6ad0 SHA512 f1ab8ce0f9568dc9d533d5c47135a937bb5f109ff49315b63444d963c4572602d3bcef96f182ca54df7bbce676e50ee2f0ba795f5310f022922b0b49edc23518
diff --git a/dev-python/nest_asyncio/nest_asyncio-1.5.5.ebuild b/dev-python/nest_asyncio/nest_asyncio-1.5.5.ebuild
new file mode 100644
index 000000000000..9bae0a7c1f05
--- /dev/null
+++ b/dev-python/nest_asyncio/nest_asyncio-1.5.5.ebuild
@@ -0,0 +1,19 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Patch asyncio to allow nested event loops"
+HOMEPAGE="https://github.com/erdewit/nest_asyncio/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+distutils_enable_tests pytest
diff --git a/dev-python/notebook/Manifest b/dev-python/notebook/Manifest
index 4ddcd4d5dd6c..05cc17fdaf87 100644
--- a/dev-python/notebook/Manifest
+++ b/dev-python/notebook/Manifest
@@ -3,6 +3,6 @@ DIST notebook-6.4.10.tar.gz 14357395 BLAKE2B 32415b7d303b18c380ea6bab398246307a2
 DIST notebook-6.4.8.tar.gz 14347639 BLAKE2B c2201562f0d672f16d6ae2388a443fcd87e81ae7de78c3a42acef82ff3e78c8e94e2be61e6156f622a9339138a2f14edef5057a3e601a7c15c8793f56d1071e2 SHA512 0e87aa155635ae536eb5a152c46cadbf85907a5af2ca15d063e718ff566ac6b76f4ce0f06f8adacae3be05ea970f1059d793e3121be855efd6c9072e9aa51719
 DIST notebook-6.4.9.tar.gz 14348373 BLAKE2B 3a89c1765d4866e148f104fb0b5a9c6303576589e30547a3cf152824b57bcff3a543ac370f2e76bd35c5198c99edf23f8e80cdd7a76b06f14107051ab77c08db SHA512 21c7ce0ae48ae17da27397b5c0d0579ad11a2525decf96288977d8d56a232a0e6cca05cff3e3bd4633b4abbf7f57d82b4fb36b8fccf9159f74f9cf2bbf023ff8
 EBUILD notebook-6.4.10.ebuild 3168 BLAKE2B 319a3acbf7e77dfb48840a90442abc43e65ef69309430e34d2f5e39e78618ab78c4d803147f29f9bba8a7f0a40bfdd37014badc39631645db1e300b0e3ca44d2 SHA512 4c4b7ce3e7eeffc7badef25b4773f7716f6a890dd2679270f3f3842415bd06ccd1764119c9e7426565653b59eee970c4b5ed3f899f7bc2e7bb7915505c70af00
-EBUILD notebook-6.4.8.ebuild 3163 BLAKE2B 5f87ab9d0c3ebf24d1ebe1a886f110e785039562a15ad42f54b310dfb8026b0300d9dd5af2c5537a6897e86c95eeba95a327c4bf48568189397d38cf23804069 SHA512 4ecb486fc92f63f9c8c75dfe9e80463423a3d49eea9d3d4be89efdf1d4274f15a513954eadcef91579ebbfb5a23505f7545b68acef95852f7fc55764e6482474
+EBUILD notebook-6.4.8.ebuild 3162 BLAKE2B 247080bcad54f283b1724493c8af5e05dda75ee3c709a7c18994af41fe4821bf6a4f46854239c6d6303da44eacda03bf215c4e45d42f42ca19581dc4aa1de3e5 SHA512 de785d3ee72f669351d9b80bca5f59d625e5cf0ccfeb6fda364686b6a046a78ac9d9151d16bb344a245bba086e88c27cf137b2a1254a6476df9f17933d8a085a
 EBUILD notebook-6.4.9.ebuild 3168 BLAKE2B 319a3acbf7e77dfb48840a90442abc43e65ef69309430e34d2f5e39e78618ab78c4d803147f29f9bba8a7f0a40bfdd37014badc39631645db1e300b0e3ca44d2 SHA512 4c4b7ce3e7eeffc7badef25b4773f7716f6a890dd2679270f3f3842415bd06ccd1764119c9e7426565653b59eee970c4b5ed3f899f7bc2e7bb7915505c70af00
 MISC metadata.xml 525 BLAKE2B 03602bbd7c6b55aaa4c4d6011a91127090359079ed2d7e6b9e3cefe63b2b249b36cd172a40d1ce69234de2440d9248e933dd94a636b95c07f06a658ecb929227 SHA512 18f6bd5cb4b1c90cc228a5ee506cea17c4aa9d60174e00c7cb4df654d5d7158aa20ea6346bf9a0734877402a0e0916aa7f9e82f0bdce0cca78c877c5e87550e3
diff --git a/dev-python/notebook/notebook-6.4.8.ebuild b/dev-python/notebook/notebook-6.4.8.ebuild
index a0517ed5f5ac..c88fc0c7752d 100644
--- a/dev-python/notebook/notebook-6.4.8.ebuild
+++ b/dev-python/notebook/notebook-6.4.8.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 hppa ~ia64 ppc ~ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-libs/mathjax-2.4
diff --git a/dev-python/nspektr/Manifest b/dev-python/nspektr/Manifest
index 8538a88bf272..b23f72d6f169 100644
--- a/dev-python/nspektr/Manifest
+++ b/dev-python/nspektr/Manifest
@@ -1,3 +1,3 @@
 DIST nspektr-0.3.0.tar.gz 6314 BLAKE2B cb7b9b5b35a455d4e72e78d93db49b4f8e274c7d7a6c8bf7ccca52cce2598a937d31b76f1a30c4aa6d673e4ce52c4645ce7392965df35b0888d1c69226e08f00 SHA512 6fc22ad7858858f3b956ba5918ca92468f13d4b7db0e4861b836e63153f7e4319c6468e4f73969ce3fb7845ca8d97808b9db2eb2705a47fe1a8c4c19b9c2ef33
-EBUILD nspektr-0.3.0.ebuild 1557 BLAKE2B ba2e147088fc7a7585bd49bc440ca9b04aed321798523a7c5dc7133019d4f442edbc8dce6e1158fb48a2b7f2b231bf4f8387ebb312ac5019b19178e107b7d4ff SHA512 da68bd11d288ae1178c0385c822c57a73fcdfed35ace5ac99b78bea5d0be6ba95f43ac77aa92cb1797468e0e6e1607ba228f7abea903b9e617124981496e551d
+EBUILD nspektr-0.3.0.ebuild 1661 BLAKE2B 3b995fe730fa870638ec4b072e7ff2f960783520bee0137aee4d874378b718db1668754d609530b88cc28bfcd0fbb6c51b92292dc9523b6793e6b2d1ed97c669 SHA512 8d4c76387ae2d43fc65d24ca45a0d76d61eab05bea9085a8c9f98db624d3c8994e2fb6c35584c0b3006099581019bd7d239b03ce0a96816dfbe2428edfc5d1ba
 MISC metadata.xml 343 BLAKE2B c5ec4b6c1f41692875fcb9a93dea4c0f253339788b94fd667709898e2cc49470f113258137093fd29986ed8fbadf2ea64f95319c51568f12259b8869558bfdab SHA512 da052d5ee619430fbfc021b9eb8d3967dc4d6ca3ce0bc5c9b1badb067d7c0babe12abde3fbc9c4710bc6a0cf081e6bc445504b852ec714f819781e1c4780779a
diff --git a/dev-python/nspektr/nspektr-0.3.0.ebuild b/dev-python/nspektr/nspektr-0.3.0.ebuild
index 664b424a9047..f7b39a54bef1 100644
--- a/dev-python/nspektr/nspektr-0.3.0.ebuild
+++ b/dev-python/nspektr/nspektr-0.3.0.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	>=dev-python/jaraco-context-4.1.1-r2[${PYTHON_USEDEP}]
diff --git a/dev-python/nuitka/Manifest b/dev-python/nuitka/Manifest
index b725ec8050e0..0c9a63e66fc6 100644
--- a/dev-python/nuitka/Manifest
+++ b/dev-python/nuitka/Manifest
@@ -4,10 +4,12 @@ DIST Nuitka-0.7.3.tar.gz 3784700 BLAKE2B 016c8c88c40c07e97e56c8a37f60c4a6a1a1a1b
 DIST Nuitka-0.7.4.tar.gz 3785037 BLAKE2B 4bf1e5980071ca34059e5c4aec098a3ab2e2d33884f2bd4673972dbff490f6ed20b200525c3220d0652ede8c06374d0e086fee8c611e9ecd663c9ac4a13f016e SHA512 5066f01cb4ffc99550d0bef816201cb988180144ac9d0d4aa587fb894196c286c44a96637d956f8ef05b803d3bdc79f4d926ccf3db4a320eabd02fe5bd984beb
 DIST Nuitka-0.7.5.tar.gz 3785194 BLAKE2B a97a617dcf55fd12966b9e464398f5bda770a6bf7a026e90aa2adbe3ed43f1e0a6feb0741626f6eb24b07f5a8acfc1e17b54f53720a9a33f24f7da4fe321a9c1 SHA512 e31b2d4014cd533f916e5f023a9633d7f96ae7f4ca8da6bc3911dd23864c42e62f73d8f7e13345d0cdbfdfec0205be2ba75d6acbfd687949ed4091e978e6d455
 DIST Nuitka-0.7.6.tar.gz 3785026 BLAKE2B f8e3f58dedbe9688ae86741b61fd8a56a0d87ba8a2323d0379f09aa93aa954a4b8bc5f6aa736dc57bfd5bfeef2cc06ce76321d7af7cec585904111aaa86c0083 SHA512 dc30e29d671704f6be0c15a9da5d0122dd8b2ee1a764e0274529959cea0a6cb8d0e923027d91a7f4a58dfa2886a5d5a93afacf60354ced66b7f723310bedf188
+DIST Nuitka-0.7.7.tar.gz 3785340 BLAKE2B e856bcb3ecf69ecaa447ea73219f544bfceae8ee3a480fbd13b0a763efb8c8ec3c856a6142cff6a91273a88fc0aec15a6bb6c28fab1d9ca0c4dfeca229c11b68 SHA512 124e2d405b1104d0ba42a69b20a5c6168bb0643a13a4de789279401e09c30091853a8e464d9c4877a01f93a5a63934617cf52678994d0ae179560cd21d5b196e
 EBUILD nuitka-0.7.1.ebuild 1133 BLAKE2B 96da659251cd7e57699f3abd46f7cf3e862b74cb2cd846f61ddc8324afab9fa6a1c4ef5dbd986c713c3a43739f07dcbbfc0cf222028bb07da92a055d2a438ae9 SHA512 774bc6ec699d9ce8bfe1470e85a2cbe4df4b6de3efd9473372c7338c1b4d4297798d28070f15aa68b0462c550cc8389f64ee75b153d038019d69e2766cb5505d
 EBUILD nuitka-0.7.2.ebuild 1133 BLAKE2B 96da659251cd7e57699f3abd46f7cf3e862b74cb2cd846f61ddc8324afab9fa6a1c4ef5dbd986c713c3a43739f07dcbbfc0cf222028bb07da92a055d2a438ae9 SHA512 774bc6ec699d9ce8bfe1470e85a2cbe4df4b6de3efd9473372c7338c1b4d4297798d28070f15aa68b0462c550cc8389f64ee75b153d038019d69e2766cb5505d
 EBUILD nuitka-0.7.3.ebuild 1133 BLAKE2B 96da659251cd7e57699f3abd46f7cf3e862b74cb2cd846f61ddc8324afab9fa6a1c4ef5dbd986c713c3a43739f07dcbbfc0cf222028bb07da92a055d2a438ae9 SHA512 774bc6ec699d9ce8bfe1470e85a2cbe4df4b6de3efd9473372c7338c1b4d4297798d28070f15aa68b0462c550cc8389f64ee75b153d038019d69e2766cb5505d
 EBUILD nuitka-0.7.4.ebuild 1133 BLAKE2B 96da659251cd7e57699f3abd46f7cf3e862b74cb2cd846f61ddc8324afab9fa6a1c4ef5dbd986c713c3a43739f07dcbbfc0cf222028bb07da92a055d2a438ae9 SHA512 774bc6ec699d9ce8bfe1470e85a2cbe4df4b6de3efd9473372c7338c1b4d4297798d28070f15aa68b0462c550cc8389f64ee75b153d038019d69e2766cb5505d
 EBUILD nuitka-0.7.5.ebuild 1133 BLAKE2B 96da659251cd7e57699f3abd46f7cf3e862b74cb2cd846f61ddc8324afab9fa6a1c4ef5dbd986c713c3a43739f07dcbbfc0cf222028bb07da92a055d2a438ae9 SHA512 774bc6ec699d9ce8bfe1470e85a2cbe4df4b6de3efd9473372c7338c1b4d4297798d28070f15aa68b0462c550cc8389f64ee75b153d038019d69e2766cb5505d
 EBUILD nuitka-0.7.6.ebuild 1133 BLAKE2B 96da659251cd7e57699f3abd46f7cf3e862b74cb2cd846f61ddc8324afab9fa6a1c4ef5dbd986c713c3a43739f07dcbbfc0cf222028bb07da92a055d2a438ae9 SHA512 774bc6ec699d9ce8bfe1470e85a2cbe4df4b6de3efd9473372c7338c1b4d4297798d28070f15aa68b0462c550cc8389f64ee75b153d038019d69e2766cb5505d
+EBUILD nuitka-0.7.7.ebuild 1133 BLAKE2B 96da659251cd7e57699f3abd46f7cf3e862b74cb2cd846f61ddc8324afab9fa6a1c4ef5dbd986c713c3a43739f07dcbbfc0cf222028bb07da92a055d2a438ae9 SHA512 774bc6ec699d9ce8bfe1470e85a2cbe4df4b6de3efd9473372c7338c1b4d4297798d28070f15aa68b0462c550cc8389f64ee75b153d038019d69e2766cb5505d
 MISC metadata.xml 943 BLAKE2B d7ab883773e7480dcfb4b79932a3874e2274669169a24a54aa622a2a0ac079e0296da4bd196d166cb11fcff785985da0b10d0fae351032914ccf312c9bb9833c SHA512 625d8760b8e849c6e014856f584cb42f50bb5ebb1fa648cb704a5a1baf175e7d2ce9f43f6f724d11c81a68e364b6ac1c38459540b58f2ccd6a675902af5b1cc9
diff --git a/dev-python/nuitka/nuitka-0.7.7.ebuild b/dev-python/nuitka/nuitka-0.7.7.ebuild
new file mode 100644
index 000000000000..1a35fde421ee
--- /dev/null
+++ b/dev-python/nuitka/nuitka-0.7.7.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1 flag-o-matic optfeature
+
+DESCRIPTION="Python to native compiler"
+HOMEPAGE="https://www.nuitka.net"
+SRC_URI="https://nuitka.net/releases/${P^}.tar.gz"
+S="${WORKDIR}/${P^}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-util/scons[${PYTHON_USEDEP}]"
+BDEPEND="
+	${RDEPEND}
+	test? ( dev-util/ccache )
+"
+
+DOCS=( Changelog.pdf Developer_Manual.pdf README.pdf )
+
+distutils-r1_src_prepare() {
+	# remove vendored version of SCons that is Python2 only
+	# this should be removed when upstream removes support for Python2
+	rm -vR "${PN}/build/inline_copy/lib/scons-2.3.2/SCons" || die
+	eapply_user
+}
+
+python_install() {
+	distutils-r1_python_install
+	doman doc/nuitka3.1 doc/nuitka3-run.1
+}
+
+python_test() {
+	append-ldflags -Wl,--no-warn-search-mismatch
+	./tests/basics/run_all.py search || die
+}
+
+pkg_postinst() {
+	optfeature "support for stand-alone executables" app-admin/chrpath
+}
diff --git a/dev-python/oauth2client/Manifest b/dev-python/oauth2client/Manifest
index 789c252f232a..defa374d519c 100644
--- a/dev-python/oauth2client/Manifest
+++ b/dev-python/oauth2client/Manifest
@@ -1,5 +1,4 @@
 AUX oauth2client-4.1.3-py38.patch 1782 BLAKE2B 751b62649cd7222230f809c7e957636e351cddb3588c1da112443b09067c73cc6ada588697dd36f9b6ed2115238f8f811bc5502b17c75b2f65be655b4199dc9f SHA512 3e03d7105e76206e63858a32a25dfd5bbf997ced6abafd75d0f4973528ee91cb28200854ccfa519945573992f454c18d2acad5784693acffc7509ddcb13908a8
 DIST oauth2client-4.1.3.tar.gz 185589 BLAKE2B 6cd61448e0d55cef7f2ba640c8cbb50ac83e76d0993391eb0acb3e156f937fcdee80576c9d45d505235a9f266495069664ccbfafd649a4e2d7a0990517ee8cb6 SHA512 80f49e09a6dd6767307a2c278544926fbf20b4f55e4cf83563ac7a7c1043622bd3c8c7fcf6de62896b623ca8c7947b309a5e6bf2b7cb0fccff3ff7634386b287
-EBUILD oauth2client-4.1.3-r1.ebuild 1722 BLAKE2B 3229060062fc40acb5ea8a5028c94cae5979959d698b76341f8cfb1615b055e46327dd517fc491c0298256b67b553dfe7e4e6d2565dbd160e80097e808e7effb SHA512 38c7d3524591fa24547a6d2a37aa66c39cf002c2867a99c46de06361e7f4d162bcf4a88950117a58a5ea422c85dbf2f74598874d9deb3a2fe62564e5361bddf8
-EBUILD oauth2client-4.1.3-r2.ebuild 1427 BLAKE2B ecd3ee975db3d8063346ef9692e147108b1f192c31f978fb019034f3a062c70ef604052736c79d0d489558eb58381ca031d62fb870b9a4cb3b5b371b9b516f47 SHA512 bee11a308927b96f41311aa9aba21f7aaddc303c00f7702c74a11d65e8478ae21984f0ac6034c52a4cccfa7346987541bdcd71956dba61dc7a00d1f2fbef5cbf
+EBUILD oauth2client-4.1.3-r2.ebuild 1425 BLAKE2B 84c5c4fd7aa75b495d23118c53f28085a010e6eb8adafcb8550cfff329216e868ea9d5679d09e4c45dad4f85a90af6c79a4190f0ec4f62a39397c493ece02b95 SHA512 dc9ff81c0a2d69e44441ec3acd48587fbde8bfaa6c91b93e2bc12d6b130b44c94edad14dc3d564b4e48be9d6527c121f336d67c72ecc59ea657755180b7ed267
 MISC metadata.xml 403 BLAKE2B 53ea3fd7507fa9760d7af00c61e4598779e775fd3ab7e498908aa39f3472dff0cdd8246d7c2e7b62ebbfbf01c7ed9c1725dbb276e8685cb46ea77bcc2c02f9d2 SHA512 1cdf21510872f686912e699627a0252119ca25a3198183d74608a12e07bf14538398794e235ccdfdec06e1aafc52cbb693748bfde50855c083a59e3f1ada3870
diff --git a/dev-python/oauth2client/oauth2client-4.1.3-r1.ebuild b/dev-python/oauth2client/oauth2client-4.1.3-r1.ebuild
deleted file mode 100644
index 21462801d204..000000000000
--- a/dev-python/oauth2client/oauth2client-4.1.3-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Library for accessing resources protected by OAuth 2.0"
-HOMEPAGE="https://github.com/googleapis/oauth2client"
-SRC_URI="https://github.com/googleapis/oauth2client/archive/v${PV/_p/-post}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}"/${P/_p/-post}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
-	>=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
-	>=dev-python/pyasn1-modules-0.0.5[${PYTHON_USEDEP}]
-	>=dev-python/rsa-3.1.4[${PYTHON_USEDEP}]
-	>=dev-python/six-1.6.1[${PYTHON_USEDEP}]
-	dev-python/keyring[${PYTHON_USEDEP}]
-	!<=dev-python/google-api-python-client-1.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/flask[${PYTHON_USEDEP}]
-		dev-python/sqlalchemy[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests nose
-
-PATCHES=(
-	"${FILESDIR}/oauth2client-4.1.3-py38.patch"
-)
-
-python_prepare() {
-	# keyring is not fuly supported by pypy yet, because dbus-python can't support pypy
-	# oauth2client -> keyring -> secretstorage -> dbus-python
-	# https://github.com/mitya57/secretstorage/issues/10
-	case $PYTHON in
-		pypy|*pypy|*pypy3|pypy3) \
-			find "${BUILD_DIR}/.." -name '*keyring*py' -delete ;;
-	esac
-}
-
-python_test() {
-	nosetests -v \
-		-e appengine \
-		-e django_util \
-		-e test_multiprocess_file_storage \
-		-e test_bad_positional || die "tests fail with ${EPYTHON}"
-	# appengine - requires appengine
-	# django_util - requires django
-	# test_multiprocess_file_storage - requires fasteners
-	# test_bad_positional - expects TypeError, gets ValueError
-}
diff --git a/dev-python/oauth2client/oauth2client-4.1.3-r2.ebuild b/dev-python/oauth2client/oauth2client-4.1.3-r2.ebuild
index 29d0198dbeb8..134a99098d66 100644
--- a/dev-python/oauth2client/oauth2client-4.1.3-r2.ebuild
+++ b/dev-python/oauth2client/oauth2client-4.1.3-r2.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}"/${P/_p/-post}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
diff --git a/dev-python/oauthlib/Manifest b/dev-python/oauthlib/Manifest
index 95b52299aee8..7eda22880f9f 100644
--- a/dev-python/oauthlib/Manifest
+++ b/dev-python/oauthlib/Manifest
@@ -1,3 +1,3 @@
 DIST oauthlib-3.2.0.tar.gz 163829 BLAKE2B cf14aeea253bc25f696bb638f364ff74d1a695a0f72dc8a77e2a5433e20672a5cf4a7b25f222940a08a5a26b503e671258ef26ee96e121fa016fbec3d6c5c874 SHA512 abb052cbaccb00a61e9a6c0028102927310d2d864d853cd0826c9a8eae8a9e921da33b79be554a3c6f6067cbcf43b25140f5224c8ab1e7f0a4eb6ab227d418a3
-EBUILD oauthlib-3.2.0.ebuild 765 BLAKE2B 8857d3cd6ae39f643f0be97dcf9142215cc0160c1c04cb911661a04a8048352f471fb58e4859a6056ffb953db271de5031a619fed458abd2f32d88fcb329f641 SHA512 16d3f74379fdbc1cf17ebdccfa9e4f01e12706ec082dbd7ee80fefa2cd42afcadb8106ceac2e411d0ee6833892db849afea49a081f60710714f11e9b5a7b9bdb
+EBUILD oauthlib-3.2.0.ebuild 772 BLAKE2B 9bd46d81d710148a77698bb03fc547876e6caefe9df412c10804131eba618b35a76d9b2ad78d2cdd83d0a9a6cf2ddfb90557884b7c8b237be70d35fdad4f34ef SHA512 37c43d2b2e7325212841004f4536bd2150a8f02a81df3ef922ca9c371313eb299867564683df1307b348650ce78faa68ae808b2f50ead6d18ecaf1f2e2416dc5
 MISC metadata.xml 393 BLAKE2B 7b784c5d6a94cb2eee22f2b92b154fb6a975d752a6af15822fbbd055175078ca3070a75ae575ce65619b9a09420ad5197f320f117a60e72db2ce47fef16ebf34 SHA512 30ceec289fd200942c38e63e9ac46e2caed0db9e990f89b3c04484cf11b8c584040bfb58c827d6a4d3425071b66b099e6dd7ac99397edbd2d58e943e04c2d9e6
diff --git a/dev-python/oauthlib/oauthlib-3.2.0.ebuild b/dev-python/oauthlib/oauthlib-3.2.0.ebuild
index 51c675e8a55d..08d73a5fcf23 100644
--- a/dev-python/oauthlib/oauthlib-3.2.0.ebuild
+++ b/dev-python/oauthlib/oauthlib-3.2.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 
 # optional extras hard set as RDEPs. See setup.py
 RDEPEND="
diff --git a/dev-python/openpyxl/Manifest b/dev-python/openpyxl/Manifest
index fa1afe1d19e2..9e61751aaad2 100644
--- a/dev-python/openpyxl/Manifest
+++ b/dev-python/openpyxl/Manifest
@@ -1,4 +1,3 @@
 DIST openpyxl-3.0.9.tar.bz2 2428070 BLAKE2B b62133ee8e732142428b4f9eaf158e6f33daf314ed1ad620d921ad10265d1db93e2fcef807a61b3277e96f245392fd19b48da715eb0c560c882683fb1407f7a1 SHA512 33c313c842a43003a6e056b58869652377bef74bcaf267c50cc49f6abb7caa8a1b4e8f3b400a054f7d1776e03763ebebc984d331520bd63411ec4acfa8a03787
-EBUILD openpyxl-3.0.9-r1.ebuild 737 BLAKE2B ef79eea2762957192b74c697fd24970c07f931d928ee564fc136d7e5dcc743e8336e22c4e96a079e058bd3f47d2b200fae2091b6ecd18c7f5e2488116a5a8fa5 SHA512 019557f2b6355ea9adb0238232252826820fcf975c82ceb71c0e0866de21347d8dfa334ee880f035b6649049d660b215d143186d20746a575cb92f9faa620dbb
-EBUILD openpyxl-3.0.9.ebuild 756 BLAKE2B cf1dc48dd4b2dc41444b802e2351b60d83eb86b4312260b5c76cd424016181a07da21313d439ebfc9a34ec1f96ff32e654c9b22f4eae895d47913cde39cf1a9e SHA512 3b4903606ac18d0607141f36bea3de51150d38d4d1bb7f8930878223831f015d65de5a8ec5ff184127203ba170472868e22d031f02037c21e8473fc114be57cd
+EBUILD openpyxl-3.0.9-r1.ebuild 731 BLAKE2B e97f38fb620be1e3b8ef50ec5cbca43b80d618013a4170eec5c38f427b06e6bac7698818ad8a6303e01a92fdb3c5637106e968b390a0f9c813a965adf3dcc669 SHA512 edabd3402a0639895c9967ee0566ff567f734e7328c3b848a332ddd3e98915caa326ef7a890e6f39fc55b3f67acc48adf4263db33f8acd201c169098d5c7e304
 MISC metadata.xml 595 BLAKE2B c843c395f1b6a40fea607fa7f851af887fce236ad6fc5b6b77eea0b208954a3340f49ab66a5503f6951346718ecfaf5d43f1a0bbee9b86f4b11c29b1e4cb6394 SHA512 a0cc42713e9c67438050b44c810f17ab4946f8a1eece0159e71d4abe749047dd44ff430605bf5c34af12de2abe4937955c7aade0c5af708ed7f6b816684c8763
diff --git a/dev-python/openpyxl/openpyxl-3.0.9-r1.ebuild b/dev-python/openpyxl/openpyxl-3.0.9-r1.ebuild
index 83a8c222caa7..a758545ba7b6 100644
--- a/dev-python/openpyxl/openpyxl-3.0.9-r1.ebuild
+++ b/dev-python/openpyxl/openpyxl-3.0.9-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://foss.heptapod.net/openpyxl/openpyxl/-/archive/${PV}/${P}.tar.bz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	dev-python/et_xmlfile[${PYTHON_USEDEP}]
diff --git a/dev-python/openpyxl/openpyxl-3.0.9.ebuild b/dev-python/openpyxl/openpyxl-3.0.9.ebuild
deleted file mode 100644
index 92626c108446..000000000000
--- a/dev-python/openpyxl/openpyxl-3.0.9.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Pure python reader and writer of Excel OpenXML files"
-HOMEPAGE="https://openpyxl.readthedocs.io/en/stable/"
-# Upstream doesn't want to include tests in PyPI tarballs
-SRC_URI="https://foss.heptapod.net/openpyxl/openpyxl/-/archive/${PV}/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86"
-
-RDEPEND="
-	dev-python/et_xmlfile[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP},tiff,jpeg]
-	)"
-
-distutils_enable_sphinx doc
-distutils_enable_tests pytest
diff --git a/dev-python/openstacksdk/Manifest b/dev-python/openstacksdk/Manifest
index 8ce0e0e31b0d..794fce35675e 100644
--- a/dev-python/openstacksdk/Manifest
+++ b/dev-python/openstacksdk/Manifest
@@ -1,4 +1,3 @@
 DIST openstacksdk-0.61.0.tar.gz 1029483 BLAKE2B 5add768f12bc42562bcdaddf0379e1f59af80b34c5a7f808aaa7469788a685b093b47a4c2a8a771f6cf426f6ac11e188fca0843aaa5173266f3c69a0ac69c4f9 SHA512 6f02486b9de8c540cf43f49f55b67dede34a24a96229d42b43aa215f6286566579f726b53732a9b3b952cee5df1fa8d3cf2f6ccc7c0ca7f9a1a96888640ff734
-EBUILD openstacksdk-0.61.0-r1.ebuild 2625 BLAKE2B f1c6a27554c53f1e77223ec3c16920ee3bd8e281499b5d9b53bb78e89e01524a650a9ca56b14d8afadb7d946af4442126dc8beba56dd331deda996b2b6ab7962 SHA512 9075a98ba1a70555f3ec2b683cf36c90c0c14d4091d827bcd260961a2c99347fba6268fb9fe9609d09bf862061f3f26675f188cd1f0b0ffc4b66f2321d580ef3
-EBUILD openstacksdk-0.61.0.ebuild 2612 BLAKE2B d991f8ee79b1dc1387a9826811c4cf71f9a42b9a71592bbe4b56ca60bf2ebf647ab3280b6e5b7a5cdbf93c01266de3cad6ac7eae2a9c9a87d6b529180eccc4be SHA512 2b3b5f023ad4b40ace4a426295cf6eaaf25f5472b26abbd0868dc419f4d96c0127fdaa4c1a0bcfb82be3d404c3f4decdd69e89151b7e29acd86feb5ae77b2df2
+EBUILD openstacksdk-0.61.0-r1.ebuild 2622 BLAKE2B 7cdd297b2b2f0bcbb710bf80c9e41545e4d5258250adcbb91342c872d34658add7827a17c6c64e1513ddf72fa4ef18a82605f1a535ba8813c651505a12efbfcb SHA512 ab1d8911500f274961686147f1e028d1974480b434bda034880bce8afb77ef160d2d7643bad5a726f3e4fc4ef75921b2c399883a5137252b77e71d0c0e6c0568
 MISC metadata.xml 517 BLAKE2B 661ad1e9eae06e7b36a5ff753e73bd4434042966cff3fd6fbc11bf70a1acc3eb8de29ad2a033d6d715e1152a5454d84077e99db3b588199b317f925864dc1403 SHA512 e6dbfbb3546c2a62b204b33ebb3bb33611079698212f098bd4da072200fe43e3bb350cc998b255ec4a15aa2ff3a04c89a9553dd7930db48e658dbcaff78526d6
diff --git a/dev-python/openstacksdk/openstacksdk-0.61.0-r1.ebuild b/dev-python/openstacksdk/openstacksdk-0.61.0-r1.ebuild
index 6e6dbaa5bb04..52ad9fbcf7da 100644
--- a/dev-python/openstacksdk/openstacksdk-0.61.0-r1.ebuild
+++ b/dev-python/openstacksdk/openstacksdk-0.61.0-r1.ebuild
@@ -14,7 +14,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"
 
 CDEPEND="
 	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/openstacksdk/openstacksdk-0.61.0.ebuild b/dev-python/openstacksdk/openstacksdk-0.61.0.ebuild
deleted file mode 100644
index 8d37e11c56e1..000000000000
--- a/dev-python/openstacksdk/openstacksdk-0.61.0.ebuild
+++ /dev/null
@@ -1,80 +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} )
-inherit distutils-r1
-
-DESCRIPTION="A collection of libraries for building applications to work with OpenStack"
-HOMEPAGE="https://github.com/openstack/openstacksdk/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
-
-CDEPEND=">dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
-RDEPEND="${CDEPEND}
-	>=dev-python/pyyaml-3.13[${PYTHON_USEDEP}]
-	>=dev-python/appdirs-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/requestsexceptions-1.2.0[${PYTHON_USEDEP}]
-	>dev-python/jsonpatch-1.20[${PYTHON_USEDEP}]
-	>=dev-python/os-service-types-1.7.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.18.0[${PYTHON_USEDEP}]
-	>=dev-python/munch-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/decorator-4.4.1[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.9.0[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
-	>=dev-python/dogpile-cache-0.6.5[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-2.7.0[${PYTHON_USEDEP}]
-	dev-python/importlib_metadata[${PYTHON_USEDEP}]
-"
-BDEPEND="${CDEPEND}
-	test? (
-		>=dev-python/ddt-1.0.1[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/prometheus_client-0.4.2[${PYTHON_USEDEP}]
-		>=dev-python/oslo-config-6.1.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/statsd-3.3.0[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	# Internet?
-	sed -e 's:test_create_dynamic_large_object:_&:' \
-		-i openstack/tests/unit/cloud/test_object.py || die
-
-	# TODO
-	sed -e 's:test_generate_form:_&:' \
-		-e 's:test_create_static_large_object:_&:' \
-		-e 's:test_object_segment_retries:_&:' \
-		-e 's:test_object_segment_retry_failure:_&:' \
-		-e 's:test_slo_manifest_retry:_&:' \
-		-i openstack/tests/unit/cloud/test_object.py || die
-
-	# unhappy about paths due to test runner
-	sed -e 's:test_method_not_supported:_&:' \
-		-i openstack/tests/unit/test_exceptions.py || die
-	sed -e 's:test_repr:_&:' \
-		-i openstack/tests/unit/test_resource.py || die
-
-	# requires hacking
-	rm openstack/tests/unit/test_hacking.py || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	distutils_install_for_testing
-
-	# functional tests require cloud instance access
-	eunittest -b openstack/tests/unit
-}
diff --git a/dev-python/ordered-set/Manifest b/dev-python/ordered-set/Manifest
index bf50d3d3927d..0f36e465a1a0 100644
--- a/dev-python/ordered-set/Manifest
+++ b/dev-python/ordered-set/Manifest
@@ -1,3 +1,3 @@
 DIST ordered-set-4.1.0.tar.gz 12826 BLAKE2B 8e1d1510fec429c002062584cadb1dd64a1131889345629cb73f6fbc7dbd1ab06a4f97d43ae54c8dc1f21bb243ab0706cefe33cf4fd634fc5af28b10806cee1e SHA512 f12d19f7d9cf0ebcc414d97798f0959ff69a77146839cc6a9067c864f9e0be795795c4d648f736fd7448ddf89666ce37f23e7380d1c9b1678a4787961e4e1e79
-EBUILD ordered-set-4.1.0.ebuild 575 BLAKE2B 2deaf859f36f1597f5e8c0f1c69c5e03c088aff30377af9f254b39fee01e7a198ea9e8047d43d70857df9572d773b3da1da6b059901112bc8e5951d94595a0ee SHA512 07dd45c0c7433706bf5a018d8d5d851c48c785c6e2b413021399346a9ffda8fb51f361a3a0c5f281fb37f1cf5bddb66f6d703f2b51715677b1ad11910c4e0a85
+EBUILD ordered-set-4.1.0.ebuild 679 BLAKE2B 65d7f96376dd92b6339ad77a80a0e6fc62eac3c791369bd0945753a718a70eed2ca3083d16e8716e7dd0e5f5d5ab8ec8d330f59c46d51685ee22445c03d6ced6 SHA512 cef415f64a14e57570799dead8e1af8757f940076723f0dccbc6ab0a6bae943e4feb769680a49b46791ab72f09216ad7646c742c2c877176ca574f982fc0ffd4
 MISC metadata.xml 722 BLAKE2B 6ab35195f031d4e51864fb4f82979f2b9f5f3f2c38c34130cdfb654febbd65b51071a03963f0c92d819f44709096830574909341d3ba94b106c1f41df3d97ed7 SHA512 5306b40b389a91022912aedaf00d907c849ba16031a0cb14f3959364446f6b5c3bcfeb707a5eb3f908e55fafd31fe0b7b9c0a8e57a08d4a7fefee759159f4910
diff --git a/dev-python/ordered-set/ordered-set-4.1.0.ebuild b/dev-python/ordered-set/ordered-set-4.1.0.ebuild
index 5d092b9ac647..81311a6c52ee 100644
--- a/dev-python/ordered-set/ordered-set-4.1.0.ebuild
+++ b/dev-python/ordered-set/ordered-set-4.1.0.ebuild
@@ -14,6 +14,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 distutils_enable_tests pytest
diff --git a/dev-python/os-client-config/Manifest b/dev-python/os-client-config/Manifest
index b0f195467384..5666e96ff5fc 100644
--- a/dev-python/os-client-config/Manifest
+++ b/dev-python/os-client-config/Manifest
@@ -1,5 +1,4 @@
 AUX test_get_all_clouds.patch 662 BLAKE2B 33ae4a1400073519cb41bf048b274dcec6a0182260e60a126adbee68d39b2fc031114432b966ee6ae96661a0487fb9846edaac1c032a767cf7ede1be25d53a33 SHA512 614e0bd874ec282b9b90d5cfe7d3693056fc5811d0fbb8f436f57a9f9a55abf4609fc6a647313c3d83ba733f7f57e69b3eb5df4ab8b0664a730f6e9197502cd3
 DIST os-client-config-2.1.0.tar.gz 48257 BLAKE2B c88d2c9c34103abfa60c3d983ed50309a2a552cf275f48e3c1dde9837b98849d09062546c5bc096d978a059afbae54eed9eadb8aa53375aae67f409bf3cf3e05 SHA512 31f53e5bafced1d7d57ac8818a7b889506b45347655ee41db6d5d9c0a6f2ead2a6d820553aec4a6ad9fd817abf9d6b666938a24ba85ab3745e06bb10b312e33a
-EBUILD os-client-config-2.1.0-r1.ebuild 1075 BLAKE2B 40482e6b1f842a0b4e340d6627b444107927cdcae675a11fd2771de08c6c7d3c74f0a718582f933aed1e6e5e92e16e01094a7078b0f8465b2190584a7ca9bb71 SHA512 cdebe642b0963ad30667ff3bbe43fecae118c26bb85ed5e512dbc9069446e73cbf79f4579e9c81bd14255cad4d3fec83946b045f67728e86eeaa57ac89359973
-EBUILD os-client-config-2.1.0-r2.ebuild 1112 BLAKE2B ad9ca1b908641e0ce2aa0eb722156df56282325c44194690ce3e5f3d06fc1d0aab98350b09710c6423962f9e005c0fa9d31484599b07ca7888da81d345ecb8a0 SHA512 1e674e4d2f86d839d656de3513054cec42702b39961e93d1f270174fc56e849451e9398e2bba1f19713b184202707196b5462234ead78b68a738b61f6344e306
+EBUILD os-client-config-2.1.0-r2.ebuild 1109 BLAKE2B 821c011b7b4eb20e1a26d18ed05e7c9b85867bdaed4d47d6047315d307a398ab9130da8f24a265ed44c9406a175ccca068110ba0ddb721b916824f06c8105f55 SHA512 27bccc9fbe1510a593018e04c83d3a356392f44e533af01b338738a7013dc105cc97ff313bf52dc0365ab2fcb39afa95dd1edff6b5cbd7ec374b0eb2c6dacdda
 MISC metadata.xml 476 BLAKE2B 5522345b88cd6cb95631c8b391617d6c42ec4c32ccb78321caa7cfb6649d30dc20710ab0ff15d976b3cd3439483c08c44b354c44e2ea2f9e9dbbb72812f89975 SHA512 30b3055b7e24c72808c5c196e42eb755c9cf48e0be6ecd808c0725118c5de54634c36ff7d2972df59c240aaa129fa3032f8a1a5c372b1ef68f71fa2263211774
diff --git a/dev-python/os-client-config/os-client-config-2.1.0-r1.ebuild b/dev-python/os-client-config/os-client-config-2.1.0-r1.ebuild
deleted file mode 100644
index 549a242c5982..000000000000
--- a/dev-python/os-client-config/os-client-config-2.1.0-r1.ebuild
+++ /dev/null
@@ -1,40 +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} )
-inherit distutils-r1
-
-DESCRIPTION="OpenStack Client Configuation Library"
-HOMEPAGE="https://www.openstack.org/"
-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/pbr-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/openstacksdk-0.13.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/prometheus_client-0.4.2[${PYTHON_USEDEP}]
-		dev-python/python-glanceclient[${PYTHON_USEDEP}]
-		>=dev-python/oslo-config-6.1.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		dev-python/subunit[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/test_get_all_clouds.patch
-)
-
-distutils_enable_tests unittest
diff --git a/dev-python/os-client-config/os-client-config-2.1.0-r2.ebuild b/dev-python/os-client-config/os-client-config-2.1.0-r2.ebuild
index 1a1d4c35c34d..5d9314515e08 100644
--- a/dev-python/os-client-config/os-client-config-2.1.0-r2.ebuild
+++ b/dev-python/os-client-config/os-client-config-2.1.0-r2.ebuild
@@ -14,7 +14,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/pbr-2.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/os-service-types/Manifest b/dev-python/os-service-types/Manifest
index 65d5755af8ee..3a4d92a178e9 100644
--- a/dev-python/os-service-types/Manifest
+++ b/dev-python/os-service-types/Manifest
@@ -1,4 +1,3 @@
 DIST os-service-types-1.7.0.tar.gz 24474 BLAKE2B 8adf1cf29d61cc37d08e7282d5b07312345a59ed94898da71f13702f51d4f3651b18d34cb51789fbc560a10c5dfeb8d760aca0fe25f630c7c00fbfd0fd4072c1 SHA512 d73f826134ce9d26720e027a352d8a91a8a029ac92bbcf0ace022a041f3c0aaea900a4e50fa00027f699a793b53ecc538bad5ec3bd8e2efbbe8b18540322ee57
-EBUILD os-service-types-1.7.0-r1.ebuild 806 BLAKE2B b320270bc472b169720ce108170f62b41926a09bfe575546e4bcddcfd9d6196542c2a628611f60a1a18def86f53982139a05685edd0bf6977d96449900f538ee SHA512 a3a885f06ec7f1243241dbdaa3008bd07f6c192a7b89d5b380d150aae0a4340efbd1cc3bd3bca996f24e42fb9de8c75444a6525f84854d8fd7994e94d0d68099
-EBUILD os-service-types-1.7.0-r2.ebuild 801 BLAKE2B 66745e3a1589034234d16e62089b5cff6533d1ccb9461c5087940ecb4f247a54cbfd5deedb59313664215a1e8fcd49d9c3a6127df78a926fc2479d82f100cc9b SHA512 cebc00fa0a7fde75558d0ad8e2ebde3b7a5e51d5250d54569dff5eeb31bab7db7a4d45cfae5d92a12be196f39c1234635a190159069ccf2a9638df3fe80df87f
+EBUILD os-service-types-1.7.0-r2.ebuild 798 BLAKE2B 98b6098724350499089a1ca38da8856c711b2bd51afe8402a2492f3fdfe485748a72359a6ccac6af531b6f523592fc3da27e95fc380805fc8fcdfc7f613925c0 SHA512 18fe3bc3680495c4b296b16ff7e0c128f0c17fb34c4cef465b7217389a764276be1ff41e41d52867fa7185b1f846d0e0279d63f127be26aaec25406748c6fe44
 MISC metadata.xml 479 BLAKE2B 4938f0bd922ecbb31533b39c79b0dd063ea3cf3516714a66fe60d3e683c0064d7d3fbc8dd0bef95ee6f701dac3d6a22ed0528b014626464ebc6b762c4ad96aa8 SHA512 a41c9dccd4965c90e599a5ef74687e33f334b4d6a2f5bc0949a30b3e8a71a3689973c34e4e4eb3ed048a6653ccddc81cd9ce9f6c18fdc4015ff4418794052e00
diff --git a/dev-python/os-service-types/os-service-types-1.7.0-r1.ebuild b/dev-python/os-service-types/os-service-types-1.7.0-r1.ebuild
deleted file mode 100644
index 7d6650c7421f..000000000000
--- a/dev-python/os-service-types/os-service-types-1.7.0-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="A library to handle official service types for OpenStack and it's aliases"
-HOMEPAGE="https://github.com/openstack/os-service-types"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
-IUSE=""
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
-RDEPEND="${CDEPEND}"
-BDEPEND="
-	${CDEPEND}
-	test? (
-		>=dev-python/keystoneauth-3.4.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
diff --git a/dev-python/os-service-types/os-service-types-1.7.0-r2.ebuild b/dev-python/os-service-types/os-service-types-1.7.0-r2.ebuild
index d8de2d912307..2b3295f88abe 100644
--- a/dev-python/os-service-types/os-service-types-1.7.0-r2.ebuild
+++ b/dev-python/os-service-types/os-service-types-1.7.0-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-python/osc-lib/Manifest b/dev-python/osc-lib/Manifest
index 4f52b185d27f..65c906aa372a 100644
--- a/dev-python/osc-lib/Manifest
+++ b/dev-python/osc-lib/Manifest
@@ -1,5 +1,3 @@
-DIST osc-lib-2.4.2.tar.gz 97648 BLAKE2B f5d34e4a13408f7eea8289c68f938ed47c8818fa9928da6b4d21c9b20f722360c155287e5167d445de18d2f00b8856390f995cd40812f967683d7c6e395e6d75 SHA512 4d6a0016fa17eba5c14c9db919719e6dea2ff13ca64ad6be6e0c3af88b8a1bf75ad2b47475efa3a7d262d73fcdb433afd372f573f00cb0854b5ac4c64ecab4bb
 DIST osc-lib-2.5.0.tar.gz 97942 BLAKE2B 92c2d80463d966c96b3aa18edefc6044a8f20c21484a6ce52e81b57d7e1cf9ea4f3fc5d4a95f01a23c5480a4c4fa06c29d492d48a36f3b6a8df5608203d82045 SHA512 00351402b1048f3efaff2d21673c5dfc9cb41683a0ccb40defb6e8aeedd60271172e63fe25394f048dd4aed22a6bd185946d4d324b30ce111264fa6fd85acfd5
-EBUILD osc-lib-2.4.2.ebuild 1418 BLAKE2B 00c9232e06e7240a71225078f525d6391a8095b33b76045449006c49bf396dbb2d401265a775a2f4fab7f43bdf0766be7ab836240bcdc05122a148f998e0f4b4 SHA512 8daa6a2f47f075e37e64b629527085e66d4d78ff81e98830dfadc1687b0af819e956f34196145effc3d68c60ff492d360df1327c2d076ea8fc8020472ce499b0
-EBUILD osc-lib-2.5.0.ebuild 1454 BLAKE2B 7e2a1591b5abd8005d03c52291b8a7b8f8c35960687c58179bb41d6923e1af4d58d41329b6dae3b1c704ec14760fb8492c0283449f4f921c6232e3201b0837de SHA512 d8da7307d95d7dff2845c7357b9929cdae285b0b98a0f04d671af2071cd2dde086e6349b37a3e2e54d142bf72628c161a2e71c1fa7f9eeb8ded9c548b4af5399
+EBUILD osc-lib-2.5.0.ebuild 1452 BLAKE2B fe813cc9357a60162bfd4955a2b5fff2c20995d4583d5d4bcead5ecfcb3fa56fb8d02d9950a784eb2d990cf379a721e2dba6490a60195b0bb8b205b3308662ed SHA512 8fed060a1362110c35d934ee45a3ffb14a31f36496b130c32ae6708cd92793a01591ac67b7ab1ffc38e82367db3fba85e1302a5b65e23a22b3a070440490dc16
 MISC metadata.xml 729 BLAKE2B 176bf470c3c3bbe5474967ab8123237244d26e811aa6ef251e88cfb3a6ac6b7cf3b96085dc670cf2053b700e2d98534867ec043e8c3f26249d4152f9ed70d4c0 SHA512 d75db35ea445e03ca7adbfffe78946519cbd7a44251735193fab8a0a1cc3c80cf60ffaeed5b9c2f9ea92bea2ee367271f6c068690625562c8c96341f38141d7e
diff --git a/dev-python/osc-lib/osc-lib-2.4.2.ebuild b/dev-python/osc-lib/osc-lib-2.4.2.ebuild
deleted file mode 100644
index c25c542728fa..000000000000
--- a/dev-python/osc-lib/osc-lib-2.4.2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..9} )
-inherit distutils-r1
-
-DESCRIPTION="A package of common support modules for writing OSC plugins"
-HOMEPAGE="https://github.com/openstack/osc-lib"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/cliff-3.2.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.14.0[${PYTHON_USEDEP}]
-	>=dev-python/openstacksdk-0.15.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/simplejson-3.5.1[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/statsd-3.3.0[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	# need to skip all tests under TestTagHelps class
-	# checks exact help message, based on another unittest runner
-	sed -e '179,$s/test_add_tag_/_&/' -i osc_lib/tests/utils/test_tags.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/osc-lib/osc-lib-2.5.0.ebuild b/dev-python/osc-lib/osc-lib-2.5.0.ebuild
index 1a9f3f2779ef..2ffd12bd9455 100644
--- a/dev-python/osc-lib/osc-lib-2.5.0.ebuild
+++ b/dev-python/osc-lib/osc-lib-2.5.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/cliff-3.2.0[${PYTHON_USEDEP}]
diff --git a/dev-python/oslo-concurrency/Manifest b/dev-python/oslo-concurrency/Manifest
index 325ed1a185d0..711db0358eab 100644
--- a/dev-python/oslo-concurrency/Manifest
+++ b/dev-python/oslo-concurrency/Manifest
@@ -1,4 +1,3 @@
 DIST oslo.concurrency-4.5.0.tar.gz 58979 BLAKE2B 9e2eb4a233985a33994aeaf335c195c980e1e9dd8b48a7c4e53ae502599f12c0dc65466ee45569a97b72f1face0e80ce166922ca3e42f6ad28fd5b27bdf884a3 SHA512 13a2f4d39d3241370374e6fe4ea6047dfc4d20da6116aaebd27f085fdbce089d58b0ebab4f1224234c88237cdefafc2f96229e6527bf5cda13ef1e471e25a50c
-EBUILD oslo-concurrency-4.5.0-r1.ebuild 1291 BLAKE2B 744b645eb2734c1bd1add2c93eae991518123f5a0999fbdcfc4d02b5dd26b34c671574dbf34a503c16ea2b9f434c1e576bf6ffe2acaa70e68d4c7bdc8b0d2228 SHA512 8375fdd3152fec41007b67dc5a0cb37adbe97c6cbbcc1b331d3d871f7eb1726e11cc3ab219b999a09eb852f22508319d401532b024c352dfc1fe31d9272835cd
-EBUILD oslo-concurrency-4.5.0.ebuild 946 BLAKE2B fba90551b9b739889b64a3fe6d0eab520790aa40dc178d86fc02b1674d9924fcf490e0b865ed4a4aa59b4e99e7916b1688c43347255968f54fe7d0bd7ff89f85 SHA512 87225b52d725468e6daf317069398a08cd5c0897e62bcfe8c2eea2d55276a41eae3226de5c137e9b829e2ab5227ea410ff66122d0f06bc63cfa24a9808519d88
+EBUILD oslo-concurrency-4.5.0-r1.ebuild 1288 BLAKE2B 979ce66648dff0255feaddbc99ada6574aef396c476a0230fca12ab4a12642b4c3f50764c64977d9bc1efaf493b0bd2be01fff2d31a9c1dc3f9a866fd31e5305 SHA512 0872c65dd1f4fd0e36382264cc2085538b22249a1040b4858ad6e8a61938aee3ddc330c0dd9d5551a3443b3319780a8f51727e7d65ba679682be46b7f0318f50
 MISC metadata.xml 540 BLAKE2B 3cf35ead27deb8915aafded620fabef948d56e3feff9a6936bf8b80cf4ca3a84a000a0f56c2fee944dbd5c0ad7fb5211656ae861c64257d2ef83629e914521ad SHA512 a10fd1f009c73620ae68719bda0304ee3d8b64c0edb05d6bc818d14475499a1a78c613815b9fd29991c9b90b830e099139f263861e10b696432651da65a7d637
diff --git a/dev-python/oslo-concurrency/oslo-concurrency-4.5.0-r1.ebuild b/dev-python/oslo-concurrency/oslo-concurrency-4.5.0-r1.ebuild
index 0a3d0cbb71c0..3de625739047 100644
--- a/dev-python/oslo-concurrency/oslo-concurrency-4.5.0-r1.ebuild
+++ b/dev-python/oslo-concurrency/oslo-concurrency-4.5.0-r1.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${PN/-/.}-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 
 RDEPEND="
 	>=dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/oslo-concurrency/oslo-concurrency-4.5.0.ebuild b/dev-python/oslo-concurrency/oslo-concurrency-4.5.0.ebuild
deleted file mode 100644
index 214470582b89..000000000000
--- a/dev-python/oslo-concurrency/oslo-concurrency-4.5.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 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="Oslo Concurrency library"
-HOMEPAGE="https://pypi.org/project/oslo.concurrency/ https://github.com/openstack/oslo.concurrency"
-SRC_URI="mirror://pypi/o/${PN/-/.}/${PN/-/.}-${PV}.tar.gz"
-S="${WORKDIR}/${PN/-/.}-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
-
-RDEPEND="
-	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/fasteners-0.7.0[${PYTHON_USEDEP}]
-"
-BDEPEND=">dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/eventlet-0.19.0[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests unittest
diff --git a/dev-python/oslo-config/Manifest b/dev-python/oslo-config/Manifest
index 6f3b072c4b45..f00b69c36bcc 100644
--- a/dev-python/oslo-config/Manifest
+++ b/dev-python/oslo-config/Manifest
@@ -1,5 +1,3 @@
-DIST oslo-config-8.7.1.tar.gz 160536 BLAKE2B 71221141226024b6e7257c74afd082f297980bd45091de1a30c526d52c5514b970983c9389b82bb49283ef2176b7fc408f4b7f3fc29f9d6cdccb513652b7bee2 SHA512 a76995ff12204968fd9a52ca2922a89039858392b21befff827bf02c3466e365251d90e2d02894a50bece32751e9f5f86a651768665f404de2d3a438e53f158d
 DIST oslo-config-8.8.0.tar.gz 160783 BLAKE2B ebc9cdd7ba9ad3e1bbca932f7c87dc5573a5453808baccd2885345efad4d62ad23819945b5a30645983489312d3fc083cdb414c13d1b772a8de49d74aa1f8797 SHA512 8ddb6a631421737fe9c08b5a5fadfa68a53ef6bac396b86b4d30b5be0449f0e000a40b09939513c3651eca49dd750c324a01656792a68ed42cdcf1539d65cf44
-EBUILD oslo-config-8.7.1.ebuild 1340 BLAKE2B a3e81e3b00e5a5b403dddf6c34d06ee5bd2778e0ac001965274e87e68c13c591e5a0f94608ebf19f46f6b6b5c42fdf77982ae11dfa0584f16dcc95ac3bd11119 SHA512 fcc50610b959eb1e5e3a6c9ae4eee396a2004390f46188fdd73fb93f62b899bb76231515fe7cc1f270c07440adf14cc48c102d629676f2812922d03a1f4b070a
-EBUILD oslo-config-8.8.0.ebuild 1379 BLAKE2B 607827401adbb2faf06e5169d8f5155377356318ab252c85add12aae471b72a91df460560cd39990f369a0b0914edde601ab0887bf27818f0823e84c82707714 SHA512 236a93da1296fec2aec5650ba4c5d678dc34ef5124f233e78208015167829c17fa82fff6b35331b13f46600b79a72393f87301fe4df0221d0f834a8991cba402
+EBUILD oslo-config-8.8.0.ebuild 1376 BLAKE2B e294d772b72b6a280cb2fa2f23c0166e639705cdc883adc457029eaf8c9f3d1352db747e20f9ffb3e2bb922a51772f0f147370e86a7f06e9fcb0a0e5fc1bdfdc SHA512 326bb1c25a68abcda7cc566313940b37ee7cbc438ef66ff7a601be580532931ece0884733de5b87afeddf66549ded018dd7249ec9f7348a50455d0caef0dd586
 MISC metadata.xml 696 BLAKE2B de9409262056cc13ab81347edaca214867f49fcd909ce16a21023c70baab5a888d8db7a9cb5ec094951b4e2617c82bc5778bdd85c18aaa683369c093c42045a8 SHA512 24f2510fbbad8f21fed9ee4b171ae33a1d271980bf227288c957497ac305c890578a93bc0ff93997e73010bae82d933b4a7cd3aeaebb762bb3a36baee0e07014
diff --git a/dev-python/oslo-config/oslo-config-8.7.1.ebuild b/dev-python/oslo-config/oslo-config-8.7.1.ebuild
deleted file mode 100644
index c13a669cb2ab..000000000000
--- a/dev-python/oslo-config/oslo-config-8.7.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..9} )
-inherit distutils-r1
-
-MY_PN=${PN/-/.}
-
-DESCRIPTION="Oslo Configuration API"
-HOMEPAGE="https://launchpad.net/oslo"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86 ~amd64-linux ~x86-linux"
-
-RDEPEND=">=dev-python/pbr-1.3[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/rfc3986-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.18.0[${PYTHON_USEDEP}]
-	dev-python/importlib_metadata[${PYTHON_USEDEP}]
-"
-BDEPEND=">=dev-python/pbr-1.3[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-1.5.0[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests unittest
-
-python_test() {
-	local -x COLUMNS=80
-	eunittest -b
-}
diff --git a/dev-python/oslo-config/oslo-config-8.8.0.ebuild b/dev-python/oslo-config/oslo-config-8.8.0.ebuild
index 32f6c15f2a6a..2c3d56e2b930 100644
--- a/dev-python/oslo-config/oslo-config-8.8.0.ebuild
+++ b/dev-python/oslo-config/oslo-config-8.8.0.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND=">=dev-python/pbr-1.3[${PYTHON_USEDEP}]
 	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
diff --git a/dev-python/oslo-log/Manifest b/dev-python/oslo-log/Manifest
index 8c7ac322637c..ee227f211713 100644
--- a/dev-python/oslo-log/Manifest
+++ b/dev-python/oslo-log/Manifest
@@ -1,6 +1,3 @@
-DIST oslo.log-4.6.1.tar.gz 92280 BLAKE2B d85cfde57e8ae094a81ad5e28e9a715bdb484272da1aab7dbb29c71e24ed24a5090448da8787a4083bef8ed0018bfb954aecda85f548cb35cf6ca2a9aa5b229a SHA512 8e34133096a011d24396990ed904f1efa5a46e7aec471ab36553b7b0e6736fc3bc22e7d628d6f304f584ea3a162e2945652d9bd0a82c0a1a53efb8e58824ea33
 DIST oslo.log-4.7.0.tar.gz 92502 BLAKE2B 092a3673d769be807db90790d68aae3ffa219bb31edf7477bd8ef5a8d290d2cb7978d1c088d7048fd31f519091170627d433b496bd1532b8eeb2dc47e3ac854b SHA512 eeb7e158c940e35b28f736e8ae5fe0beadedf821f1f54f340490307c3a7dac58b2c62393bc4cd26af43b1be37372422323987e4f830d5c4c25e4ec01bc327856
-EBUILD oslo-log-4.6.1-r1.ebuild 1368 BLAKE2B 39a84d41b1725fee6040175421f6aa99dfe7fcb533425f5be875748571f95baf3254f1b80d9fadf2d3b56301c1511f9728d9cadf16160eb42d756397a5efa9bb SHA512 86c86ba753728ef81d89181b2f17596508e41eb9143a0c4cdfd1fb68bbf47408fefc9bb19432d4cfacef41ef7a95bb87cd3308df38a2658fa0cd5855e6a74e2e
-EBUILD oslo-log-4.6.1.ebuild 1325 BLAKE2B 020b0a792e07ed22d5cd4f691122b1111df57232ca9ce8066dd6378aa40dd57123a8c7f58d82a5921a21fd15a0d67c549452a21cfab5c9655c9b64d569842a77 SHA512 51b2fe9503e7adec250a2237994bdb0216ebccfc4ac4c143f7558e7f0ef8f537e8bf37e307488725c3853b2144bc327bd00c70e57f5f64aa418c2ef51df2af28
-EBUILD oslo-log-4.7.0.ebuild 1368 BLAKE2B 39a84d41b1725fee6040175421f6aa99dfe7fcb533425f5be875748571f95baf3254f1b80d9fadf2d3b56301c1511f9728d9cadf16160eb42d756397a5efa9bb SHA512 86c86ba753728ef81d89181b2f17596508e41eb9143a0c4cdfd1fb68bbf47408fefc9bb19432d4cfacef41ef7a95bb87cd3308df38a2658fa0cd5855e6a74e2e
+EBUILD oslo-log-4.7.0.ebuild 1365 BLAKE2B 430d2e2915630c7d1cb5219e065650faec75a555b6270ad5e7ffa668a9668c71b7dcd1ef61d062c5f85f972d597dd2c2bc795622fd43b5f6c0f21d367f125688 SHA512 1a3123249272a4e406b2044c21cd742c5855da64c26f9d4a050592aa3a5c1d79c73c6fbfc662ec78ab4ace2d1aafa17387b648dd671b07acd2bc1fb2742ae25c
 MISC metadata.xml 908 BLAKE2B 49c859acb4b62996a3f4a9beb659b8e1169e700cb4da456d030da25d9c38f05de603e03e5e6a7fe56486b0d5dff6ba2953825d95358b32f53f1e66ce76b9e57e SHA512 9eb901e9f165d84402bcbfc048d2ca08533dd2f6450da96586ec536269662ae68518f50abd5413dc65f9bd817798e2cc10b219f6b5c0805a38d7992ef82cf7db
diff --git a/dev-python/oslo-log/oslo-log-4.6.1-r1.ebuild b/dev-python/oslo-log/oslo-log-4.6.1-r1.ebuild
deleted file mode 100644
index eaf985b0c766..000000000000
--- a/dev-python/oslo-log/oslo-log-4.6.1-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="OpenStack logging config library, configuration for all openstack projects"
-HOMEPAGE="https://pypi.org/project/oslo.log/ https://github.com/openstack/oslo.log"
-SRC_URI="mirror://pypi/o/oslo.log/oslo.log-${PV}.tar.gz"
-S="${WORKDIR}/oslo.log-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-RDEPEND="
-	>=dev-python/pbr-3.1.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.20.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.20.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.36.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.25.0[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.19.0[${PYTHON_USEDEP}]
-	>=dev-python/pyinotify-0.9.6[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.7.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/pbr-3.1.1[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/testtools-2.3.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-3.3.0[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-distutils_enable_sphinx doc/source \
-	dev-python/openstackdocstheme \
-	dev-python/oslo-config
-
-python_test() {
-	eunittest -b
-}
diff --git a/dev-python/oslo-log/oslo-log-4.6.1.ebuild b/dev-python/oslo-log/oslo-log-4.6.1.ebuild
deleted file mode 100644
index 0b429af5cc2b..000000000000
--- a/dev-python/oslo-log/oslo-log-4.6.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..9} )
-inherit distutils-r1
-
-DESCRIPTION="OpenStack logging config library, configuration for all openstack projects"
-HOMEPAGE="https://pypi.org/project/oslo.log/ https://github.com/openstack/oslo.log"
-SRC_URI="mirror://pypi/o/oslo.log/oslo.log-${PV}.tar.gz"
-S="${WORKDIR}/oslo.log-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
-
-RDEPEND=">=dev-python/pbr-3.1.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.20.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.20.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.36.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.25.0[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.19.0[${PYTHON_USEDEP}]
-	>=dev-python/pyinotify-0.9.6[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.7.0[${PYTHON_USEDEP}]"
-BDEPEND=">=dev-python/pbr-3.1.1[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/testtools-2.3.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-3.3.0[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests unittest
-distutils_enable_sphinx doc/source \
-	dev-python/openstackdocstheme \
-	dev-python/oslo-config
-
-python_test() {
-	eunittest -b
-}
diff --git a/dev-python/oslo-log/oslo-log-4.7.0.ebuild b/dev-python/oslo-log/oslo-log-4.7.0.ebuild
index eaf985b0c766..e77ab076a87a 100644
--- a/dev-python/oslo-log/oslo-log-4.7.0.ebuild
+++ b/dev-python/oslo-log/oslo-log-4.7.0.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/oslo.log-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 
 RDEPEND="
 	>=dev-python/pbr-3.1.1[${PYTHON_USEDEP}]
diff --git a/dev-python/oslotest/Manifest b/dev-python/oslotest/Manifest
index 52f13834f0e1..a7e5081e8e4a 100644
--- a/dev-python/oslotest/Manifest
+++ b/dev-python/oslotest/Manifest
@@ -1,4 +1,3 @@
 DIST oslotest-4.5.0.tar.gz 38233 BLAKE2B 73fbf056467c5d86c647b0ff49ce2e75654c8a2ffbcda78f8ea49edddb55a4c5e0f065c7a95291468b2d5d73ec5f5152d16a2129ab17fc5e6d457284e684ec31 SHA512 2dc0644365621fe271e09f2f7be631f697749c9d343f1ce9b635986df41ec5be8787350b3f2eb6b6501f4baac1ec597b2f0ecada7936db967075ebce837e1517
-EBUILD oslotest-4.5.0-r1.ebuild 705 BLAKE2B 28da497b081a064c99048a5edd23eec7cb7d793f19354b23ca0fdf4a7ada3d8ac611d817c1c68cab44c6b137c64ac65e460ca938bbfb5afce28ab72018ab1bd6 SHA512 e6a9c9d204f09dad21777bde786faa1262bdba55076f4aa73d6a27f3b1e3df7d88812c24b0b8cb12d81e9f5f67b0b56c8a7fbcac84478dbf478a1ae857d8afc8
-EBUILD oslotest-4.5.0.ebuild 666 BLAKE2B edbf5c29cd229a491b942c5c852f83629be3b2e7efc1892c39c05dd177a976db5962838717f6bf5f901400f91e9550988aec4ae495c8135c5e0c2512a9126206 SHA512 2bcf2db74ccc92802508a56713716c7eca182da760005d718adf0c58ad33535892d86cb4657ac48aa161c822a4e641ea393f3bc735646c43161b52bb793f5cd4
+EBUILD oslotest-4.5.0-r1.ebuild 702 BLAKE2B eb94404e26d4f495ce8626b52f4dab3bcba925e8bfc6d4f3d0f61b0f5eac87c1128b491f087997cb9c861914f88f79a58633552861305a186412373a7beb06f3 SHA512 31742bd2eaf6db6d2e3db6e88be688e6718204905c7c18dd4ffd0c59d269aa4e3bfaf2f4aaa84e1390ad2c64a5f7005d89a569773b586de832a783d024d07e17
 MISC metadata.xml 935 BLAKE2B ec63aed42de004f150dad32092560db0c3e76297cffdd791fa4f717af68ed6e88ee012923e1a41583ae56568e9e7ce8dcefa58d38cc66f675d78d9bf6a17601d SHA512 b116d2489597a1088c189a0db83950551c2da239d7a27319b63f886b63deb047fc6ef1b021db8044b14420bddbd759856d655e7d114df11bd918c1263ec8a1ed
diff --git a/dev-python/oslotest/oslotest-4.5.0-r1.ebuild b/dev-python/oslotest/oslotest-4.5.0-r1.ebuild
index 0759ca463b55..edc449cfe072 100644
--- a/dev-python/oslotest/oslotest-4.5.0-r1.ebuild
+++ b/dev-python/oslotest/oslotest-4.5.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="
 	>=dev-python/pbr-1.8[${PYTHON_USEDEP}]
diff --git a/dev-python/oslotest/oslotest-4.5.0.ebuild b/dev-python/oslotest/oslotest-4.5.0.ebuild
deleted file mode 100644
index f4fed812a0d8..000000000000
--- a/dev-python/oslotest/oslotest-4.5.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# 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="Oslo test framework"
-HOMEPAGE="https://launchpad.net/oslo"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86 ~amd64-linux ~x86-linux"
-
-BDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
-RDEPEND="
-	>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/subunit-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests unittest
diff --git a/dev-python/outcome/Manifest b/dev-python/outcome/Manifest
index 73a9ce08c95b..770f86b753c1 100644
--- a/dev-python/outcome/Manifest
+++ b/dev-python/outcome/Manifest
@@ -1,3 +1,4 @@
 DIST outcome-1.1.0.tar.gz 18675 BLAKE2B eef22274bb4d1ddd19fa223167b6c8ce96f015ac0b3b0609aed3717deb306087457ab068fd2466d492fcc5859d561e6d3172ad14611a937ec59a75b604565953 SHA512 65de1c0a38b8cbb041a9fc3a79518eeacea54ec87341846ae80a9a2075369f72a397f5aa747ae179eaac8f341a7e07cc1641555fbb809cc7924b2171f7f3d90e
-EBUILD outcome-1.1.0.ebuild 762 BLAKE2B 514a40b5b28baaae33f55cf985ba493b1306a1a0666b1920a1f5b2d0e629490b0b5bf0ecb2fc55f1364166b4939a7ab152d8ffc91b64f08cc51dddd5829e4367 SHA512 6791e15dd493ad592d43ea8d63bcbe1625e0cc76dbe22035b6ba4961661add073e3721d1b832ebef36b46d68418d6aac340b9fedf75d554014c145b74de0dd74
+EBUILD outcome-1.1.0-r1.ebuild 822 BLAKE2B 7d39fb1354c81c74263d2d75e0079766177d2eeb862f48918499fc30927d07e73cd1d05b977da223a771f0d0ff2714cb59599de2b03b090891a20ea121011f7f SHA512 1cd0c51b7e1859111c461dd4a06d5c457faa0287aceaab349f78820f30e38ed1aac445d544a4f640e70eacb355d989b5bac2b5808d8c469b3600169a9fe7f3d1
+EBUILD outcome-1.1.0.ebuild 777 BLAKE2B cf2dbdeb7aa6c9db4e9e87733533235c0ff5357d949582c03f85ecaaa05e35aa7777406a692e9c9104c19e7171ab5e62a7a0a6ee95c9a5995dd87dd0bdf33fba SHA512 d435bef3694e0b2593a628a56a3c258c4e9ce9d079cbe8cc228dfa8856c12ce33065ccde3e2bda4f5f85428ff51d19e340351971abf45ebd86982fdf2772189a
 MISC metadata.xml 413 BLAKE2B 375ed97b3bcb2ba5392f09962f6376e5ec8ecb842a70eb8c94647968f2f59e326ddacba74f0e65b7bb5733a05779d464b38d589f3a3dd364ba510bec2825eb5c SHA512 b9b9b94031580858aae25d0733688ce39f5026b4c1a59415370ed50dc27b63654927c36536d4c4cdf6389e68db0b397ddaa7e0aeb786713fdffca4bddaa217d2
diff --git a/dev-python/outcome/outcome-1.1.0-r1.ebuild b/dev-python/outcome/outcome-1.1.0-r1.ebuild
new file mode 100644
index 000000000000..8da627573eeb
--- /dev/null
+++ b/dev-python/outcome/outcome-1.1.0-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Capture the outcome of Python function calls"
+HOMEPAGE="
+	https://github.com/python-trio/outcome
+	https://pypi.org/project/outcome
+"
+SRC_URI="
+	https://github.com/python-trio/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz
+"
+
+LICENSE="|| ( Apache-2.0 MIT )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	dev-python/attrs[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		dev-python/async_generator[${PYTHON_USEDEP}]
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs/source dev-python/sphinxcontrib-trio
diff --git a/dev-python/outcome/outcome-1.1.0.ebuild b/dev-python/outcome/outcome-1.1.0.ebuild
index 9f4c94e538b5..722e60e24ead 100644
--- a/dev-python/outcome/outcome-1.1.0.ebuild
+++ b/dev-python/outcome/outcome-1.1.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
 
 inherit distutils-r1
 
@@ -18,12 +18,16 @@ LICENSE="|| ( Apache-2.0 MIT )"
 SLOT="0"
 KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 
-RDEPEND="dev-python/attrs[${PYTHON_USEDEP}]"
+RDEPEND="
+	dev-python/attrs[${PYTHON_USEDEP}]
+"
 
-BDEPEND="test? (
-	dev-python/async_generator[${PYTHON_USEDEP}]
-	dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-)"
+BDEPEND="
+	test? (
+		dev-python/async_generator[${PYTHON_USEDEP}]
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+	)
+"
 
 distutils_enable_tests pytest
 distutils_enable_sphinx docs/source dev-python/sphinxcontrib-trio
diff --git a/dev-python/pandas/Manifest b/dev-python/pandas/Manifest
index 518c4b7a0a3b..199458d34379 100644
--- a/dev-python/pandas/Manifest
+++ b/dev-python/pandas/Manifest
@@ -1,4 +1,6 @@
 AUX pandas-1.4.0-distutils-hack-assertion.patch 439 BLAKE2B 6753d2a86071109b586a0ea957acb2db1d394bed2a6ad0ede53d7ae4bce81e034ba8e929611aae701cc51ab8d9ef95c8c2d608ad3f9def16aed6fc5ae237fb68 SHA512 04a3644dbc5d07859fea162877a528124b8b0af8288464dc86c394675006710f73653af58ad188d3d628c356c66c201190dbc6d3e77c9d9d0a3b2f4c758e014b
 DIST pandas-1.4.1.tar.gz 4941369 BLAKE2B ce85253b32c3be6baad74e2bca98d24b43f42c311ffad128615b711e461a76067035e238cf1693eed12d4ca8e354aef56f711e45cd934a4af6222f4727838b1e SHA512 2d8ba8f3152b5bd5495e406ce21d896342ef77473ed3c0207f77b6503c3f4353bbeb5ec573696eb6748e65e956d9d1b97d314a136104151ecb5ba822afa72422
+DIST pandas-1.4.2.tar.gz 4940242 BLAKE2B b44c9e46458b4e2919b2d215c8678601ef0976118197172ddc74fa712cf07b02cdb09b79940e90bf6907a45e7e3c63615292f7141a4fb8ed4ae22a36decd1e39 SHA512 6406241e30e9ed386610dd90bbb7407cfe3e94ff20c8fd1241aa75288894666f06e59f7c74b5f916080a3745254ba22ec9dad1195f040b613639b5712aced571
 EBUILD pandas-1.4.1.ebuild 6289 BLAKE2B 65cea796ac18b0a0599a2ef6b222bf48e2e8ac968b9f62424e5092df4bbc6ce1f84e8ea259be38ec7c32b0b414eb23622990f04e5f3ea8bb5e1066f0b867dbff SHA512 072c72cb0c109e2e364fa5f1fe2aa0f7567ca76245cd1e1c323a43ad6ed923b19e5806e18e771a15208e4ac931c24904c062c27e6d93a9484715287a4622fc69
+EBUILD pandas-1.4.2.ebuild 6555 BLAKE2B 193fbe1b353f2b5b3835f6c0863efef3522ea3a94a6b224a310886c9a30db3d74dffe7c80b1b0db2b9fd85b6f7ed5eec1d93b97a9f0c283b6ca1a8a432797f4f SHA512 95e1d624a1c98e037551bdc017ea7538926e70e031f6179903c8138c4d9632f5c394fe17c6000e9eb2d25fc51a6bfdae988b8e4daf20456c3fe61345bffdb23f
 MISC metadata.xml 918 BLAKE2B 09b6ef472cbceaade61bfec8780ba3659838cd73f0a19b277d731db75655ac7e65d396f9fa74c19a2d5e03269c541dfe2af59296c048e77744f00bdb55295d4d SHA512 0b1fd089b0ce35a4e3408cd7224a249d427571a638961a8d63dee73b386d03b5a22e4ff085e2e548749f9fc03e9beb18317010d0b67f608dafe305bb4a87ddb2
diff --git a/dev-python/pandas/pandas-1.4.2.ebuild b/dev-python/pandas/pandas-1.4.2.ebuild
new file mode 100644
index 000000000000..4e3961affad0
--- /dev/null
+++ b/dev-python/pandas/pandas-1.4.2.ebuild
@@ -0,0 +1,201 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="threads(+)"
+
+VIRTUALX_REQUIRED="manual"
+
+inherit distutils-r1 multiprocessing optfeature virtualx
+
+DESCRIPTION="Powerful data structures for data analysis and statistics"
+HOMEPAGE="https://pandas.pydata.org/ https://github.com/pandas-dev/pandas/"
+SRC_URI="
+	https://github.com/pandas-dev/pandas/releases/download/v${PV}/${P}.tar.gz
+"
+S="${WORKDIR}/${P/_/}"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="doc full-support minimal test X"
+RESTRICT="!test? ( test )"
+
+RECOMMENDED_DEPEND="
+	>=dev-python/bottleneck-1.2.1[${PYTHON_USEDEP}]
+	>=dev-python/numexpr-2.7.0[${PYTHON_USEDEP}]
+"
+
+# TODO: add pandas-gbq to the tree
+OPTIONAL_DEPEND="
+	dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+	dev-python/blosc[${PYTHON_USEDEP}]
+	|| (
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+	)
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/matplotlib[${PYTHON_USEDEP}]
+	|| (
+		dev-python/openpyxl[${PYTHON_USEDEP}]
+		dev-python/xlsxwriter[${PYTHON_USEDEP}]
+	)
+	>=dev-python/pytables-3.2.1[${PYTHON_USEDEP}]
+	>=dev-python/xarray-0.12.3[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/xlrd-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/xlwt-1.3.0[${PYTHON_USEDEP}]
+	!hppa? (
+		dev-python/statsmodels[${PYTHON_USEDEP}]
+		>=dev-python/scipy-1.1[${PYTHON_USEDEP}]
+	)
+	X? (
+		|| (
+			dev-python/PyQt5[${PYTHON_USEDEP}]
+			x11-misc/xclip
+			x11-misc/xsel
+		)
+	)
+"
+COMMON_DEPEND="
+	>=dev-python/numpy-1.21.0[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.8.1-r3[${PYTHON_USEDEP}]
+	>=dev-python/pytz-2020.1[${PYTHON_USEDEP}]
+"
+DEPEND="
+	${COMMON_DEPEND}
+	>=dev-python/cython-0.29.24[${PYTHON_USEDEP}]
+	doc? (
+		${VIRTUALX_DEPEND}
+		app-text/pandoc
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		dev-python/ipython[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		dev-python/nbsphinx[${PYTHON_USEDEP}]
+		>=dev-python/numpydoc-0.9.1[${PYTHON_USEDEP}]
+		>=dev-python/openpyxl-1.6.1[${PYTHON_USEDEP}]
+		>=dev-python/pytables-3.0.0[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+		dev-python/rpy[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/xlrd[${PYTHON_USEDEP}]
+		dev-python/xlwt[${PYTHON_USEDEP}]
+		dev-python/scipy[${PYTHON_USEDEP}]
+		x11-misc/xclip
+	)
+	test? (
+		${VIRTUALX_DEPEND}
+		${RECOMMENDED_DEPEND}
+		${OPTIONAL_DEPEND}
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+		>=dev-python/hypothesis-5.5.3[${PYTHON_USEDEP}]
+		dev-python/openpyxl[${PYTHON_USEDEP}]
+		dev-python/pymysql[${PYTHON_USEDEP}]
+		>=dev-python/pytest-6[${PYTHON_USEDEP}]
+		>=dev-python/pytest-xdist-1.31[${PYTHON_USEDEP}]
+		dev-python/psycopg:2[${PYTHON_USEDEP}]
+		dev-python/xlsxwriter[${PYTHON_USEDEP}]
+		x11-misc/xclip
+		x11-misc/xsel
+	)
+"
+# dev-python/statsmodels invokes a circular dep
+#  hence rm from doc? ( ), again
+RDEPEND="
+	${COMMON_DEPEND}
+	!minimal? ( ${RECOMMENDED_DEPEND} )
+	full-support? ( ${OPTIONAL_DEPEND} )
+"
+
+python_prepare_all() {
+	local PATCHES=(
+		# https://github.com/pandas-dev/pandas/issues/44980
+		"${FILESDIR}"/pandas-1.4.0-distutils-hack-assertion.patch
+	)
+
+	# Prevent un-needed download during build
+	sed -e "/^              'sphinx.ext.intersphinx',/d" \
+		-i doc/source/conf.py || die
+
+	# requires package installed
+	sed -e '/extra_compile_args =/s:"-Werror"::' \
+		-i setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	distutils-r1_python_compile -j1
+}
+
+python_compile_all() {
+	# To build docs the need be located in $BUILD_DIR,
+	# else PYTHONPATH points to unusable modules.
+	if use doc; then
+		cd "${BUILD_DIR}"/lib || die
+		cp -ar "${S}"/doc . && cd doc || die
+		LANG=C PYTHONPATH=. virtx ${EPYTHON} make.py html
+	fi
+}
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# test for rounding errors, fails if we have better precision
+		# e.g. on amd64 with FMA or on arm64
+		# https://github.com/pandas-dev/pandas/issues/38921
+		pandas/tests/window/test_rolling.py::test_rolling_var_numerical_issues
+
+		# TODO
+		pandas/tests/api/test_api.py::TestTesting::test_util_testing_deprecated
+		pandas/tests/api/test_api.py::TestTesting::test_util_testing_deprecated_direct
+
+		# TODO: these require a running db server
+		pandas/tests/io/test_sql.py::TestMySQLAlchemy
+		pandas/tests/io/test_sql.py::TestMySQLAlchemyConn
+		pandas/tests/io/test_sql.py::TestPostgreSQLAlchemy
+		pandas/tests/io/test_sql.py::TestPostgreSQLAlchemyConn
+	)
+
+	local -x LC_ALL=C.UTF-8
+	cd "${BUILD_DIR}/install$(python_get_sitedir)" || die
+	"${EPYTHON}" -c "import pandas; pandas.show_versions()" || die
+	epytest pandas --skip-slow --skip-network -m "not single" \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" ||
+		die "Tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	if use doc; then
+		dodoc -r "${BUILD_DIR}"/lib/doc/build/html
+		einfo "An initial build of docs is absent of references to statsmodels"
+		einfo "due to circular dependency. To have them included, emerge"
+		einfo "statsmodels next and re-emerge pandas with USE doc"
+	fi
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "accelerating certain types of NaN evaluations, using specialized cython routines to achieve large speedups." dev-python/bottleneck
+	optfeature "accelerating certain numerical operations, using multiple cores as well as smart chunking and caching to achieve large speedups" ">=dev-python/numexpr-2.1"
+	optfeature "needed for pandas.io.html.read_html" dev-python/beautifulsoup4 dev-python/html5lib dev-python/lxml
+	optfeature "for msgpack compression using blosc" dev-python/blosc
+	optfeature "Template engine for conditional HTML formatting" dev-python/jinja
+	optfeature "Plotting support" dev-python/matplotlib
+	optfeature "Needed for Excel I/O" ">=dev-python/openpyxl-3.0.0" dev-python/xlsxwriter dev-python/xlrd dev-python/xlwt
+	optfeature "necessary for HDF5-based storage" ">=dev-python/pytables-3.2.1"
+	optfeature "R I/O support" dev-python/rpy
+	optfeature "Needed for parts of pandas.stats" dev-python/statsmodels
+	optfeature "SQL database support" ">=dev-python/sqlalchemy-1.3.0"
+	optfeature "miscellaneous statistical functions" dev-python/scipy
+	optfeature "necessary to use pandas.io.clipboard.read_clipboard support" dev-python/PyQt5 dev-python/pygtk x11-misc/xclip x11-misc/xsel
+}
diff --git a/dev-python/parameterized/Manifest b/dev-python/parameterized/Manifest
index 04c1ef214deb..239428b51c49 100644
--- a/dev-python/parameterized/Manifest
+++ b/dev-python/parameterized/Manifest
@@ -1,4 +1,3 @@
 DIST parameterized-0.8.1.tar.gz 23936 BLAKE2B 3d36b049071907f66ef17dcae0ef9480210344f2466744b2bee8e964f46e2553411a07b233fab032d1acbc2523dc32890bc5e6e4ffc5b37d1fee3f0db3a70cbb SHA512 ad6e31b2bb27623bf070ee5c30686a5bd6a531bc71602f77ca6aa01a77fc246caaacca121098dcbe13b1a174cdcfafa6545bf6e62f6a5337a647821c02fac64a
-EBUILD parameterized-0.8.1-r1.ebuild 586 BLAKE2B 886ad98e0a4e82ea9586c532d113fec657226c04e807b1cdba4c0ee919d410dc1f8f5962284d2fe330fa64e21c204f29ae66b39ec317472cfad1c9a13286200d SHA512 e3a88e14eb5145c9e992ae0715fea1451734ffbd58bb5653f493bd56ea234d01b874ffb3f509152edb79360019e469c0df412395dc93ef5cef9a4bd58aab24a2
-EBUILD parameterized-0.8.1.ebuild 545 BLAKE2B 01700589abe77a40453026c84ace00369fa4ae74530664d910a2b21a7d2e8e63b4b2d7ec09e36a6d5640bf48eff17c5b46a457ee6a9ba26f8ae7d07a9ea08399 SHA512 6eddb8d72d2d9789371bf4d7dabd5b3ea841d4b1f7e94d85fc328e59bf96ad2f0c3c5f99205aaf8387a7324271cd70ac81e3a3b2da7e69feb9b2d702ec515926
+EBUILD parameterized-0.8.1-r1.ebuild 578 BLAKE2B d848a8132abec3b7f0cfac8d4faf7c3f1aafe084b89eb65fe4c7e4f080ccb31ae2c04962e713b95f971f264f83dddb89cb9e0c085038ec283e8c2d9e9849e0fc SHA512 f6ef7a9caa515db7eb9b718fd1a051d8e17a8f4695c40518871b97c9925b30e1776218fe6790653e4a4f12df7c33d27b743ea1b51096445edd64e537f8a3b045
 MISC metadata.xml 318 BLAKE2B dd75a28765343d56c2a8b29bedc13e347e9357dff3b2533ba98794a9734d71b1a1779d005077a5cc827407ceadf617abee16ea8e140f58358faf40f4ab9d6d51 SHA512 363278e4c6b8fc56a8f3290dbd6814721e14f768339a0c5cf23665162d9e268db7b57df364d63500e9b6269e146733d405092c36bd74cb6907042f8488bc39c3
diff --git a/dev-python/parameterized/parameterized-0.8.1-r1.ebuild b/dev-python/parameterized/parameterized-0.8.1-r1.ebuild
index 884e6e1ca7c0..c709de8701c6 100644
--- a/dev-python/parameterized/parameterized-0.8.1-r1.ebuild
+++ b/dev-python/parameterized/parameterized-0.8.1-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/parameterized/parameterized-0.8.1.ebuild b/dev-python/parameterized/parameterized-0.8.1.ebuild
deleted file mode 100644
index 77c693d484b4..000000000000
--- a/dev-python/parameterized/parameterized-0.8.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Parameterized testing with any Python test framework"
-HOMEPAGE="https://github.com/wolever/parameterized"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests nose
diff --git a/dev-python/pastel/Manifest b/dev-python/pastel/Manifest
index 737fcfb0beff..fb06baed711f 100644
--- a/dev-python/pastel/Manifest
+++ b/dev-python/pastel/Manifest
@@ -1,3 +1,3 @@
 DIST pastel-0.2.1.tar.gz 125760 BLAKE2B f9b3c29444bb6bd0e710cd80d4e48cdc9099ad6512cd99b0224559b87504f5b61cfcb90165f97b101b8ff5e9f8b7e230878c5cf50ae2b0555447f5be28977cb0 SHA512 585834d035fe208313a77e0c824f6b67630a85697d4aef802800911cb1da72bfd6c9ba47fe5502359bdf244a98b8f6dea300a788ff1cfd56a8bc19eb7b7dcc16
-EBUILD pastel-0.2.1.ebuild 472 BLAKE2B ff232367ae799c04ce3030654fb6eb399ac9bb84ca6ec43ffca0701d9707b943d7297f1f04eff5b467f0c8e2a035a1f655a328a1c7ea7ace817b590ed7b839d5 SHA512 3e37ce2d3b49ee233e933fcba84c25c8f15650631593831d45aca70aef36fc73e0afe19b7584b6a08ceb699cb1440b7ab10f38c132e814c28cdb3340e4bfae53
+EBUILD pastel-0.2.1.ebuild 473 BLAKE2B b434fa66ad50c00cf75c2e500015f0ef87807bb7739466b09430d9d0f10aa86dbad8208f3f4ccb5047697ab90770fa1a84960ad3e63e0a51e977ba5aeb17a1c4 SHA512 2720d4c9d29d4fcf53835181fbf0a40d1d4e5126ccc2a89cb62d12394d6cb8fe783b174192c369a7f649ff42f89f2e8ba230351702d8160f478cb3a1b844d722
 MISC metadata.xml 410 BLAKE2B 18a88d7d54f70b7717fa2bf578f7dbe5d77a620ceca418b6e23475eecc0d8df3111752d9b83b3239332aba848a727618964c85da30e86f9c502b8cb762dbb7d0 SHA512 333dee2056a389ddf44615833dab45587f88d14d4c5c33ffc3c005b0872334d2d8558d41e37a9edb615f6b0dbaf8a4983eaef51e2167553ad5d5f7cbca563491
diff --git a/dev-python/pastel/pastel-0.2.1.ebuild b/dev-python/pastel/pastel-0.2.1.ebuild
index b27b9ad4c249..bb1eb0dae447 100644
--- a/dev-python/pastel/pastel-0.2.1.ebuild
+++ b/dev-python/pastel/pastel-0.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,6 +13,6 @@ SRC_URI="https://github.com/sdispater/pastel/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/path-py/Manifest b/dev-python/path-py/Manifest
index 57e55d8ad092..87b7cf9d57b1 100644
--- a/dev-python/path-py/Manifest
+++ b/dev-python/path-py/Manifest
@@ -1,5 +1,3 @@
-DIST path-16.2.0.tar.gz 45276 BLAKE2B 40b8eacc7e28398324f24b955adef11e5fc0bd512cd711cd3117f35a322ce0c3959b55255d4c96bbae64f914b5f3768088eb73fb45511c09f2e21bf99b3e9911 SHA512 f893d9fe3539eff0b43e4945076f770ffa7c3125151774d6accaa3a609fce351bc121562deb7ef695c0b1fc7aba12ce7487ae09a0b5daba2d5340586fc41ec79
 DIST path-16.4.0.tar.gz 48289 BLAKE2B 5ae3272ecc92689c18ffc612b8b11923225dcface88fa47dc4f42b0dc960034fa6a3c856a9521ed83c9507616577efc3d1c0a5119b0c5605ea6f6b758cfe6d2b SHA512 bb78119f929fe3b160646b06db8911e737060695ae89c28bcce84835213dfbaa12a34300b540be6b51e9462c5b378b235e1e72536524750ec910255399c513d3
-EBUILD path-py-16.2.0.ebuild 956 BLAKE2B 23a0b85ef969159260e14a5469c3011248188b2769c9e89374e8bc72ddd4122a6dab7776692e8b8a0f76aa0c29b056842a34af7ed7e6ba32843cfc924ad1e3e8 SHA512 835271632f5560cb95c8eba6f8d5d3a535e6a5b4d0940d828842e4dd1cb0dbe033a2a0f778c3638e0e276b87a811f4782bfe080fa8b3024c14e219cbf195efb3
-EBUILD path-py-16.4.0.ebuild 940 BLAKE2B d1c6fadefc5a649f943e2500193ae5becd514030a020139e0ae1c98412f49142a13fc6940b58b3fcd5f6220496b0f1baed94808ad3436571e73a8ca5640230ba SHA512 10cbd0d31ee620d5f14e02c9c71b79e6c62df5227679f193c6148bd05277e21b1e117052ba5cda3a6dfe14405f839afecea7a65bf756d5af9af9cb364ebbd805
+EBUILD path-py-16.4.0.ebuild 932 BLAKE2B ced3d7552f5cf51defdfe1f46a5c324944ac6ad3b885aa23646670fde95d545b04a50dbebb1f9782689488fe2379921b119c9b7305dfca9d2bc466be5d44b3d0 SHA512 90684912bcc7535fd493993d5837cdba14d9a8c93823717686a1e720d3a4e8636c4a77e38a78b39b414688f8077a7987bcc2e08e1654f3acc09fd456bdb31dee
 MISC metadata.xml 383 BLAKE2B 30f12776bf4f9c1995774d7dc68cd8d9a85b74d514e8239ba76af336e6b08979e496ddaffce999bf0a3557f88ced148335024628b61f765b5bd08bf90b453c5a SHA512 aaceff1caa2714c0b8b3f7373c8721358e63833cfac824e3feda8a34fd1d6a961a27805c012a1125cad1f76d8bf7b1a92d7719480d90b344e5b4d0260ccf0547
diff --git a/dev-python/path-py/path-py-16.2.0.ebuild b/dev-python/path-py/path-py-16.2.0.ebuild
deleted file mode 100644
index 161aeaf60c7a..000000000000
--- a/dev-python/path-py/path-py-16.2.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-inherit distutils-r1
-
-MY_P="path-${PV}"
-DESCRIPTION="A module wrapper for os.path"
-HOMEPAGE="https://pypi.org/project/path/ https://github.com/jaraco/path"
-SRC_URI="mirror://pypi/p/path/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-RDEPEND="
-	dev-python/appdirs[${PYTHON_USEDEP}]
-	!<dev-python/pytest-shutil-1.7.0-r1
-	!<dev-python/pytest-virtualenv-1.7.0-r1"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/packaging[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local deselect=(
-		# unreliable, not really meaningful for end users
-		test_path.py::TestPerformance
-	)
-
-	epytest ${deselect[@]/#/--deselect }
-}
diff --git a/dev-python/path-py/path-py-16.4.0.ebuild b/dev-python/path-py/path-py-16.4.0.ebuild
index 559b393dcf0e..124fb2891c29 100644
--- a/dev-python/path-py/path-py-16.4.0.ebuild
+++ b/dev-python/path-py/path-py-16.4.0.ebuild
@@ -16,7 +16,7 @@ S=${WORKDIR}/${MY_P}
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 RDEPEND="
 	dev-python/appdirs[${PYTHON_USEDEP}]
diff --git a/dev-python/pdm-pep517/Manifest b/dev-python/pdm-pep517/Manifest
index e0bb121e75b7..ca1effa69102 100644
--- a/dev-python/pdm-pep517/Manifest
+++ b/dev-python/pdm-pep517/Manifest
@@ -1,14 +1,5 @@
-DIST pdm-pep517-0.10.0.gh.tar.gz 189457 BLAKE2B 5a51b62dbc828aec5bca6ada8c7ecb479dd7491f22251392198a3d8e183f2d3d86fd4264addd9a428c37a24041365f3eeecec0a33c3f1a39ea8a1a8e6827be91 SHA512 7eb76bdf3db99ec1cf76a467617ce15423eaa465800efa9ccb248efb3c3cb5644b8e6a9ce04d6181dc9f3b5287a167f62f25d5e3334929f3e947a62ca9633d01
-DIST pdm-pep517-0.10.1.gh.tar.gz 189525 BLAKE2B 10d80fee2ac45fd68c61baf9a8ee7365da19a5daa085fdecd3164b3271cf0c0ee8ad110b1f96a33a4eecdceace72c2d4ee1ce789331c208eb4a67e3b4e3fe56a SHA512 acdf36eeb2baf90c1c80b676901ac06946fbb32f2a5c2bfbdfd85d0889ae22a0851dede4f5898d109d20583504b311cbec6903deadfb77e3f1dd7ff6a1098e04
-DIST pdm-pep517-0.10.2.gh.tar.gz 189817 BLAKE2B 47e773ac38197d898c50821d272c155d6749952bcce1492416291c02fa370965ca438e68268a56b8366b18f8a786883c9101e4dc325c9d4741f6cc509862d823 SHA512 6cdbd2cd96a784317356f4c5c52697279b720de03e7059c287872725baa10333b2f352e9a1c5ace727907bd6179cd879fcb4f6770eae1dd23294bf1b60cc233b
-DIST pdm-pep517-0.11.0.gh.tar.gz 211783 BLAKE2B 10a112a29ce8cef047d5dea79169fbc590a953e201da5fb3cde631dfc0b0a4ebdbe6e82e28971773db4b913d6b6ab468eb611564f59137beb3df4bd961decbc1 SHA512 71a12512660f85af2a50133f67cb0dc15a2d848d6500fe7dbc9e63ea0e7b916cb00a6c392abc8eb7383db81b1f46b53779a0befbeee4d6831d2586d65be1676c
-DIST pdm-pep517-0.11.2.gh.tar.gz 211796 BLAKE2B d1f6ea59a4a8d1188bc19c857d3fd9cb93bbb27e905bce5eb40454a1062c2086233a282119e4b8eee4264a885f58317ce7e1e9c78d588f9612240e220bc4fc07 SHA512 36b75526da84541a21672755ecb9b6ddede46d062e4db60b9b89acaa4febb59c4b0378f402095b678c9f902acce39e4649bbf2539ff6a8f9b3a33e284f84fb16
 DIST pdm-pep517-0.12.1.gh.tar.gz 303954 BLAKE2B 65344c2571264b9fadcffcf5ae05f42246912dce3e7029a1ea5e91df72f1c9425d603024099146cb7d9ed95d8e3ab0fcf5058ab35346893e28d3595d430548f6 SHA512 a7c27c685eec274798b5d9fa7fd3d7ec7ca77d204110c7c9962a53b1522c4c6dbc56d7413ce5ff6fe8e8f091b0d4e4914b9e3296dc226bcae9f5fbc2cb28444e
-EBUILD pdm-pep517-0.10.0.ebuild 1002 BLAKE2B d712807a535cecccf0a87b21d654c20952bd8296bd5b4d1b685dd9c5e7c79d84ebadf7e85916cca37cb14e4609a16ddfd6c9d9ef7aa42fb979b29a83d828be78 SHA512 1d65f76806f5bcde4f574bdb8aaf13d381ef3f45da40bc607f1e3f6c11719f27fd776b6be3636f074c62f68d9bdb2113f5f482fb8c349045ee32dc4ec69cc624
-EBUILD pdm-pep517-0.10.1-r1.ebuild 1382 BLAKE2B 3cd20c2999ee92ab00cfed186418158517139ff98728bd1241f420fd593afa9670c3867544c4086d09d9fba7a49df4c4471163089eae295d45a6affc5497d364 SHA512 80c342b3e59f8b250a35fa66923746935c9e76a9441115855041575c8be2439c6d16ec241890779e04dd31de7f5c6eebbac4775a8c77eb76dbe23384c875468a
-EBUILD pdm-pep517-0.10.1.ebuild 1002 BLAKE2B d712807a535cecccf0a87b21d654c20952bd8296bd5b4d1b685dd9c5e7c79d84ebadf7e85916cca37cb14e4609a16ddfd6c9d9ef7aa42fb979b29a83d828be78 SHA512 1d65f76806f5bcde4f574bdb8aaf13d381ef3f45da40bc607f1e3f6c11719f27fd776b6be3636f074c62f68d9bdb2113f5f482fb8c349045ee32dc4ec69cc624
-EBUILD pdm-pep517-0.10.2.ebuild 1200 BLAKE2B 6aac48feb01e0a2798bb89fdced74b862e4d56bc90bf48181eedb848cdb33da5589639749fe3da7d0c4c968556ca6e4a5202567d7d9bb14b2b4a795a9e9acf9a SHA512 5871da531274e7122df93319564a3bf64577c4a0ccf2cef055f61aad3bdf50f9efcc9780b19305cc1bdc2b4124e9c6c60b1455951bd5682ffc9fb0776ac0c4ed
-EBUILD pdm-pep517-0.11.0.ebuild 1234 BLAKE2B 65f179b8c3020fca369a7e0ea7ba6e5791c8d81c76b4c1901c9fcd1c554164907531ac967a13cd39b90a57428d666540098983a46e843aef24d5bd15dcfae59c SHA512 db85dba39f303629acde32852543e1b652c2bd5dc9c7d05aad6dd93818c7e955aa33ef44f90a59af6a065fcb8736a4b20305e3ba161908722fb565b347539173
-EBUILD pdm-pep517-0.11.2.ebuild 1235 BLAKE2B c587d408bd0fb38f4450ea64b67f7ee3fbb7bfc5b105a558d2084b10b33524e13e7c7e9d7c71898f5be8b528e101e0fd4aa6f4bea8499339254c16fe5885ede3 SHA512 e1cafab88d4e48a2b5e6bd51790de9b01ef93dcee5f9e6b209d5e723f2046ce1deb8a1b8de18f8c9698e6adee08b8478233bed91d2225846a5e267e66820dc1e
+DIST pdm-pep517-0.12.3.gh.tar.gz 304242 BLAKE2B ad4beb6ab35c219e1991b585bf9ce087be3e7e957f34b1dbc9de676f7b49c3084471e2b55c634eb6fd1cf6cb88dd4161b5060a17a5ca7e5e3ae57c9610303f6e SHA512 4c0f098d5237353fea73ef62149b8177987881239cb6b1b112bd6789931acd7484c56d413f780db4f23c60f4ff3a37c6956de3e1de472fed114487925b0e3553
 EBUILD pdm-pep517-0.12.1.ebuild 1284 BLAKE2B de8507d9fb7a4202ba5f5322679d07fa5ec9aeff63be7a82fc2812d747f25e2714c85633d72f9f29045a8cda1ac99eb3d98b734d9d15419ea2ea98b7e8e0af35 SHA512 000f54f4f4460432478f558536758face9e999aa42061c13a5f1e1011eb3b4ed10ba2e3fb280855235764cc9e7fc977403986934fbd2030cc09d3bd0d4259e47
+EBUILD pdm-pep517-0.12.3.ebuild 1284 BLAKE2B de8507d9fb7a4202ba5f5322679d07fa5ec9aeff63be7a82fc2812d747f25e2714c85633d72f9f29045a8cda1ac99eb3d98b734d9d15419ea2ea98b7e8e0af35 SHA512 000f54f4f4460432478f558536758face9e999aa42061c13a5f1e1011eb3b4ed10ba2e3fb280855235764cc9e7fc977403986934fbd2030cc09d3bd0d4259e47
 MISC metadata.xml 400 BLAKE2B 0882adff4040585d2881a8712b035a5204909639f80f637526b793fd9e31e9d6cda6119cc069d8ff2e768b9d5807eab16bc27bfd35beb5a613722afead2d8b0c SHA512 484e17561642cf1d26d61a1d95554614b9e77b1ee985cba61ad35dad9c9470d0f64e99385200b8eb7e2cdd5e1427cf7835d6e39c10dece1fb90dd6e81cd15d91
diff --git a/dev-python/pdm-pep517/pdm-pep517-0.10.0.ebuild b/dev-python/pdm-pep517/pdm-pep517-0.10.0.ebuild
deleted file mode 100644
index 9c1dcf99a0c9..000000000000
--- a/dev-python/pdm-pep517/pdm-pep517-0.10.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=standalone
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="A PEP 517 backend for PDM that supports PEP 621 metadata"
-HOMEPAGE="
-	https://pypi.org/project/pdm-pep517/
-	https://github.com/pdm-project/pdm-pep517/
-"
-SRC_URI="
-	https://github.com/pdm-project/pdm-pep517/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-# setuptools are used to build C extensions
-RDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-vcs/git
-	)
-"
-
-distutils_enable_tests pytest
-
-src_test() {
-	git config --global user.email "test@example.com" || die
-	git config --global user.name "Test User" || die
-	distutils-r1_src_test
-}
-
-python_test() {
-	local EPYTEST_DESELECT=()
-	if [[ ${EPYTHON} == pypy3 ]]; then
-		EPYTEST_DESELECT+=(
-			tests/test_wheel.py::test_override_tags_in_wheel_filename
-		)
-	fi
-	epytest
-}
diff --git a/dev-python/pdm-pep517/pdm-pep517-0.10.1-r1.ebuild b/dev-python/pdm-pep517/pdm-pep517-0.10.1-r1.ebuild
deleted file mode 100644
index 885cf88721b3..000000000000
--- a/dev-python/pdm-pep517/pdm-pep517-0.10.1-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=standalone
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="A PEP 517 backend for PDM that supports PEP 621 metadata"
-HOMEPAGE="
-	https://pypi.org/project/pdm-pep517/
-	https://github.com/pdm-project/pdm-pep517/
-"
-SRC_URI="
-	https://github.com/pdm-project/pdm-pep517/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/cerberus-1.3.4[${PYTHON_USEDEP}]
-	>=dev-python/packaging-21.0[${PYTHON_USEDEP}]
-	>=dev-python/toml-0.10.2[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	${RDEPEND}
-	test? (
-		dev-vcs/git
-	)
-"
-# setuptools are used to build C extensions
-RDEPEND+="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	rm -r pdm/pep517/_vendor || die
-	find -name '*.py' -exec sed \
-		-e 's:from pdm\.pep517\._vendor\.:from :' \
-		-e 's:from pdm\.pep517\._vendor ::' \
-		-i {} + || die
-	distutils-r1_src_prepare
-}
-
-src_test() {
-	git config --global user.email "test@example.com" || die
-	git config --global user.name "Test User" || die
-	distutils-r1_src_test
-}
-
-python_test() {
-	local EPYTEST_DESELECT=()
-	if [[ ${EPYTHON} == pypy3 ]]; then
-		EPYTEST_DESELECT+=(
-			tests/test_wheel.py::test_override_tags_in_wheel_filename
-		)
-	fi
-	epytest
-}
diff --git a/dev-python/pdm-pep517/pdm-pep517-0.10.1.ebuild b/dev-python/pdm-pep517/pdm-pep517-0.10.1.ebuild
deleted file mode 100644
index 9c1dcf99a0c9..000000000000
--- a/dev-python/pdm-pep517/pdm-pep517-0.10.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=standalone
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="A PEP 517 backend for PDM that supports PEP 621 metadata"
-HOMEPAGE="
-	https://pypi.org/project/pdm-pep517/
-	https://github.com/pdm-project/pdm-pep517/
-"
-SRC_URI="
-	https://github.com/pdm-project/pdm-pep517/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-# setuptools are used to build C extensions
-RDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-vcs/git
-	)
-"
-
-distutils_enable_tests pytest
-
-src_test() {
-	git config --global user.email "test@example.com" || die
-	git config --global user.name "Test User" || die
-	distutils-r1_src_test
-}
-
-python_test() {
-	local EPYTEST_DESELECT=()
-	if [[ ${EPYTHON} == pypy3 ]]; then
-		EPYTEST_DESELECT+=(
-			tests/test_wheel.py::test_override_tags_in_wheel_filename
-		)
-	fi
-	epytest
-}
diff --git a/dev-python/pdm-pep517/pdm-pep517-0.10.2.ebuild b/dev-python/pdm-pep517/pdm-pep517-0.10.2.ebuild
deleted file mode 100644
index 91fedb91351a..000000000000
--- a/dev-python/pdm-pep517/pdm-pep517-0.10.2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=standalone
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="A PEP 517 backend for PDM that supports PEP 621 metadata"
-HOMEPAGE="
-	https://pypi.org/project/pdm-pep517/
-	https://github.com/pdm-project/pdm-pep517/
-"
-SRC_URI="
-	https://github.com/pdm-project/pdm-pep517/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/cerberus-1.3.4[${PYTHON_USEDEP}]
-	>=dev-python/packaging-21.0[${PYTHON_USEDEP}]
-	>=dev-python/toml-0.10.2[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	${RDEPEND}
-	test? (
-		dev-vcs/git
-	)
-"
-# setuptools are used to build C extensions
-RDEPEND+="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	rm -r pdm/pep517/_vendor || die
-	find -name '*.py' -exec sed \
-		-e 's:from pdm\.pep517\._vendor\.:from :' \
-		-e 's:from pdm\.pep517\._vendor ::' \
-		-i {} + || die
-	distutils-r1_src_prepare
-}
-
-src_test() {
-	git config --global user.email "test@example.com" || die
-	git config --global user.name "Test User" || die
-	distutils-r1_src_test
-}
diff --git a/dev-python/pdm-pep517/pdm-pep517-0.11.0.ebuild b/dev-python/pdm-pep517/pdm-pep517-0.11.0.ebuild
deleted file mode 100644
index deda6c869be7..000000000000
--- a/dev-python/pdm-pep517/pdm-pep517-0.11.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=standalone
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="A PEP 517 backend for PDM that supports PEP 621 metadata"
-HOMEPAGE="
-	https://pypi.org/project/pdm-pep517/
-	https://github.com/pdm-project/pdm-pep517/
-"
-SRC_URI="
-	https://github.com/pdm-project/pdm-pep517/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/cerberus-1.3.4[${PYTHON_USEDEP}]
-	>=dev-python/packaging-21.0[${PYTHON_USEDEP}]
-	>=dev-python/tomli-2[${PYTHON_USEDEP}]
-	dev-python/tomli-w[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	${RDEPEND}
-	test? (
-		dev-vcs/git
-	)
-"
-# setuptools are used to build C extensions
-RDEPEND+="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	rm -r pdm/pep517/_vendor || die
-	find -name '*.py' -exec sed \
-		-e 's:from pdm\.pep517\._vendor\.:from :' \
-		-e 's:from pdm\.pep517\._vendor ::' \
-		-i {} + || die
-	distutils-r1_src_prepare
-}
-
-src_test() {
-	git config --global user.email "test@example.com" || die
-	git config --global user.name "Test User" || die
-	distutils-r1_src_test
-}
diff --git a/dev-python/pdm-pep517/pdm-pep517-0.11.2.ebuild b/dev-python/pdm-pep517/pdm-pep517-0.12.3.ebuild
index ca2e2aa9749f..c95abf912f72 100644
--- a/dev-python/pdm-pep517/pdm-pep517-0.11.2.ebuild
+++ b/dev-python/pdm-pep517/pdm-pep517-0.12.3.ebuild
@@ -24,6 +24,7 @@ KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
 	>=dev-python/cerberus-1.3.4[${PYTHON_USEDEP}]
+	dev-python/license-expression[${PYTHON_USEDEP}]
 	>=dev-python/packaging-21.0[${PYTHON_USEDEP}]
 	>=dev-python/tomli-2[${PYTHON_USEDEP}]
 	dev-python/tomli-w[${PYTHON_USEDEP}]
diff --git a/dev-python/peewee/Manifest b/dev-python/peewee/Manifest
index 973faa150909..28823cad79ae 100644
--- a/dev-python/peewee/Manifest
+++ b/dev-python/peewee/Manifest
@@ -1,5 +1,5 @@
 DIST peewee-3.14.10.tar.gz 896121 BLAKE2B c6d42dbca418475325e704e86dbf1d420426b1276a63ad1d49f3361478325b5a4b01bcbd875b32439bb497c4e18248efa6fe44c589c3247ee84043ca1bfc1a74 SHA512 1f423097c67c6a3976ed77586e3ea9db6db42e3c18e6f4c6046176a0e8942a9ce228cefd2a09e39fde359479e70a04e4c06030682442d96657d24984666b13d1
 DIST peewee-3.14.8.tar.gz 891123 BLAKE2B 67c64ad5c8ca52987c329592dc436e3c27db5b3baa7f7c68ee4fcb06e338e38a71bfce30dcd62b7562d85a3ab7fa554f1ba8093e9a59536ffb4289c186852853 SHA512 d736e5dfc139656cba7caf488d68907683893d5a2537f96269af9ed693ec79c089d2822d355be4a9c6136b5cd813b0cccf774afd585f9bd420d57a8700cabfbe
-EBUILD peewee-3.14.10.ebuild 793 BLAKE2B e222617a304fe97fd4acfb868949f5fe0b0b28d49619f3bee2489389d81e310244c972903753633ed42578af36439d1e58a56ed993b069a400efdfa7218d8c27 SHA512 4e6117a9ccc4ff7585971b85c1cc7f98ec6389838f0be10d799ddcd5ba6525f5a7df15b216dcf1b9fe951117d9f77cb257b73f691b5a18baf1452fde112059d7
+EBUILD peewee-3.14.10.ebuild 800 BLAKE2B f9a88a4bcc919a2751f1ef41310f58d53454b5989d4ab0d160e3898311a3472fd614a8fa21c50e2e242289ae8542bd36f0f548875a09128e0f96c3b6995e77f5 SHA512 61ee2b1080af7621731b87574f1393ee4cb85c41b22273ecee1b3629649f2fe402cb58d7fd03d2a487051852bda8ace9f93590c6c1be4e9ea22db065e74ccd1c
 EBUILD peewee-3.14.8.ebuild 759 BLAKE2B 1da1b8a9389236731f4038b398a2348ca6d05ab86980425899ba2ee0c9a83de27145a21051480af8e8d16bb53a8d6f05425ff3738c6abaf63329e251429cfd8e SHA512 8ebf803c73b2f4580022770f3321c9b8d368b739fa32683b350b53f9cbb919e5e062684e4fcb8e832cada701ac6cfea39466c16313bd602722e63c9f8c74f2ba
 MISC metadata.xml 365 BLAKE2B 144b870f5470e3de971f47316313980f95a3453c684fb7c326da025bef8a4e29dc0731808eefdecbb059a49ad77dd4166b3595554ac42d0578bda75c17fc06bf SHA512 9445bc6cf059e5c95c1e9ce5eebad887a43133ea0fad3fb7b70f60395e79bf30a42d893aa65d4c328e7c304b24a86fbdf3939b9ecccad318db01e95c3b4521f3
diff --git a/dev-python/peewee/peewee-3.14.10.ebuild b/dev-python/peewee/peewee-3.14.10.ebuild
index c471bcb506de..31af69dcc2ba 100644
--- a/dev-python/peewee/peewee-3.14.10.ebuild
+++ b/dev-python/peewee/peewee-3.14.10.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/coleifer/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~riscv ~x86"
 IUSE="examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pefile/Manifest b/dev-python/pefile/Manifest
new file mode 100644
index 000000000000..e185c7d61758
--- /dev/null
+++ b/dev-python/pefile/Manifest
@@ -0,0 +1,4 @@
+DIST pefile-2021.9.3.tar.gz 72179 BLAKE2B a1b5390936e6c307b1d7d30f317ae77b432b17300941bfe71c4c8ed9dfecf95d623ce98eb762378ee1ff7ae938e4105e4dbcb2f6b8fe32c502b725c43b3a1154 SHA512 1960a6301823387c76e61dff73250686a32dabe009ff0410691ab9be4e57fd5f7ceca2b78302c935b74465a1e0b8faac659045c8a2be07b21dcf1baf510b1b33
+EBUILD pefile-2021.9.3.ebuild 856 BLAKE2B f8204fde291e54d945b1302c7a7c17a89a8b7a991124c7475aece43b64b3963cda90efbd0944b672bf7876474e1b282bf138d431445843b5ecbf195484ff3358 SHA512 27492df698e28b6be1845423210e3f87fec8bd7d097baf448cb3018c7fa89f437f817e6b51134b33cd68023c0c3fc1f168a16dd910e4ce8c21ccc2c0ec9120b7
+EBUILD pefile-9999.ebuild 856 BLAKE2B f8204fde291e54d945b1302c7a7c17a89a8b7a991124c7475aece43b64b3963cda90efbd0944b672bf7876474e1b282bf138d431445843b5ecbf195484ff3358 SHA512 27492df698e28b6be1845423210e3f87fec8bd7d097baf448cb3018c7fa89f437f817e6b51134b33cd68023c0c3fc1f168a16dd910e4ce8c21ccc2c0ec9120b7
+MISC metadata.xml 722 BLAKE2B f4aa26277a0e5cdb995dfbd5c8a7371ac52b935a31ef27f6a04a6bcdc1c7f46adfbb5466d340026f8221f46f46de6321951eb77a15b7e20b20dbfb8be5761caa SHA512 5379818139d4d185e3437212060c261ef1d4ac049b3c64f02b6d9d9cc68cc3be6bf80e04a83d87bb6eb9fffad18fac8f0755c71d0119bfeb125d2053dfdc0b79
diff --git a/dev-python/pefile/metadata.xml b/dev-python/pefile/metadata.xml
new file mode 100644
index 000000000000..53ac969c885d
--- /dev/null
+++ b/dev-python/pefile/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person" proxied="yes">
+		<email>mario.haustein@hrz.tu-chemnitz.de</email>
+		<name>Mario Haustein</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>sam@gentoo.org</email>
+		<name>Sam James</name>
+	</maintainer>
+	<longdescription>
+		pefile is a multi-platform Python module to parse and work with
+		Portable Executable (PE) files. Most of the information contained in
+		the PE file headers is accessible, as well as all the sections' details
+		and data.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">erocarrera/pefile</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pefile/pefile-2021.9.3.ebuild b/dev-python/pefile/pefile-2021.9.3.ebuild
new file mode 100644
index 000000000000..e80b72dea457
--- /dev/null
+++ b/dev-python/pefile/pefile-2021.9.3.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Module to read and work with Portable Executable (PE) files"
+HOMEPAGE="https://github.com/erocarrera/pefile"
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/erocarrera/pefile.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/erocarrera/pefile/releases/download/v${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-python/future[${PYTHON_USEDEP}]"
+
+# Unfortunately there is nothing we can test here. Upstream doesn't ship a test
+# suite inside the release files. The test fixtures in the source repo is
+# encrypted so that only their CI pipeline is able to run the tests.
diff --git a/dev-python/pefile/pefile-9999.ebuild b/dev-python/pefile/pefile-9999.ebuild
new file mode 100644
index 000000000000..e80b72dea457
--- /dev/null
+++ b/dev-python/pefile/pefile-9999.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Module to read and work with Portable Executable (PE) files"
+HOMEPAGE="https://github.com/erocarrera/pefile"
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/erocarrera/pefile.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/erocarrera/pefile/releases/download/v${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-python/future[${PYTHON_USEDEP}]"
+
+# Unfortunately there is nothing we can test here. Upstream doesn't ship a test
+# suite inside the release files. The test fixtures in the source repo is
+# encrypted so that only their CI pipeline is able to run the tests.
diff --git a/dev-python/pendulum/Manifest b/dev-python/pendulum/Manifest
index 507a9dab6ae5..d102be6e6fc3 100644
--- a/dev-python/pendulum/Manifest
+++ b/dev-python/pendulum/Manifest
@@ -1,3 +1,3 @@
 DIST pendulum-2.1.2.tar.gz 159885 BLAKE2B c95cd131fc95a0d19ef11f180cc42126cb8a6ea3aaf4b3bbedbc5ce4c1b37a6624f2a1be92f1a6fd6b1f14f5d20fa5f32e8230f896ab7a216f02f00e85b98738 SHA512 c367320ade0d10b7eb9c880286176161b925d7df052f7de85ddd169594bbe778776ea74df451f00186df98be3e32b7399c68ca4b40123e2c456206410e3a1ab2
-EBUILD pendulum-2.1.2-r1.ebuild 1012 BLAKE2B 3e955eea1323fa65eef885518e0773b2f0fe727e420c015c6cdafb95ae8e47b55caf3e21884d69ff3cf367004843ad3bfc584db22edeb2b0bf13ecdfcb5c9d23 SHA512 a980cf7abd15c607ec43ab5761c2c96909d4fb21204099cec3cafd8b3b0bbd91a80dca7d1439ece4eac1308397335c43d9a2f845b0909f58024122039ecd4d67
+EBUILD pendulum-2.1.2-r1.ebuild 1013 BLAKE2B 40c2a747b6cc90b7dc80630264b37264ae131d60ca2d36656be3f3906e7ad21257f312bc367ad5ead9977e9f88440664925eb863830ec992f10eae8999e15235 SHA512 30195b48695885b3fe0b1c3771d4b671c3e7eb142b2b7464b9954ed47f22de1ecc733b61e47a77fd9edf6f542782efc21f42865fb753ac1ce9b95b5de420d869
 MISC metadata.xml 414 BLAKE2B 5f77b163192f5fd8ec655fe630948c160f8e31017cc78527fa379b7e6afab44fe51ed6b0acf2188d82cc4804f6377872646076e3bfb3362e4a5a46ca62acb058 SHA512 32aa44b3f154c7bf634244963e28d196fc629ba2415bd60ed66339a664075a0db8c31f093f13ac268b551d260e6c05220eceacff8d0f784b52e1fa62e71cacaf
diff --git a/dev-python/pendulum/pendulum-2.1.2-r1.ebuild b/dev-python/pendulum/pendulum-2.1.2-r1.ebuild
index d02f38eea836..32b705122dca 100644
--- a/dev-python/pendulum/pendulum-2.1.2-r1.ebuild
+++ b/dev-python/pendulum/pendulum-2.1.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/sdispater/pendulum/archive/${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~x86"
 
 # Requires timezone information which is not installed by default
 # with dev-python/pytzdata, and otherwise approx. 50 out of 1600
diff --git a/dev-python/phonenumbers/Manifest b/dev-python/phonenumbers/Manifest
index 78a6acc03bb8..a912535f35fa 100644
--- a/dev-python/phonenumbers/Manifest
+++ b/dev-python/phonenumbers/Manifest
@@ -1,7 +1,5 @@
-DIST phonenumbers-8.12.43.tar.gz 2270278 BLAKE2B 7cae8ad1180231b7a3f6a852563fe8a4e3c515d72e3b969fe37412714cd4e36cb61b96d779b1ee2e8610e648342d6dd9f743b1a049ee7889bf592292641aead3 SHA512 bc0dbfb78f490b70215c33b284761cd0a88183fb51a602359913617f512579862d5b216d2899bc19a143e3a1d9fd16163e5c54bfaded1fe59ba1158b3e7e68a6
-DIST python-phonenumbers-8.12.44.gh.tar.gz 4897962 BLAKE2B 27deab5c717dfc4aa697d2bb4b764fb933101cfd6ad8b9cf573cd6b9027556cabf6d471decadff5dd317ff3fdffc8346b2ee72ea6c48505dc9bb9410c13fe393 SHA512 e3531cf9895bbb40c7444743ec2896fa2df0c4282bbfe085e51afaac5c6b0a76d6245ee899409f72bcbef64ce757aff0db4c9edc399ac0138a03ad1a6580bab1
 DIST python-phonenumbers-8.12.45.gh.tar.gz 4898103 BLAKE2B e1102bd6f0911a7d1098fbe020f71b8ffb1020ff0acecc2f58383ecb538ba09b9fcbc3febd09ca8863093a6a017c74a9e834bea50c44c9b87bf775a4057825d4 SHA512 539170a363541a7bbf04d3448786d4ab4da2928eedef3d02ce0ba075e5b7c43a36d0e7071ad764026bac01e445da340756e6ef8cf484e39ea4f9d8e8897c6fa5
-EBUILD phonenumbers-8.12.43.ebuild 476 BLAKE2B 40e56991ffa17c9284de67ca23da02baf4a868292757c4e536c88e3e5f02b5db53e45c04adf1857a312cbf802b64e65d28796b59ccf70f9d843fa0e0284521f8 SHA512 a7f4f4ad21b87fa87986602ab9ec6410b735fbd392e4f6eba55c46d47b1c219bc0d694c75a93c56bc08b65f44dd55f9d55c6fbc40dd015a3cb75d0f259f64946
-EBUILD phonenumbers-8.12.44.ebuild 796 BLAKE2B 3e2cd47f60e114181646d4fa64c34d825c97d22457ccce2d6e78774e759d98b6a519b7a6741d904d04d29c5588baace4e6c98a3b92076af25cb237ec18f7f1a4 SHA512 30d3bd6e9ababe084d40c0a39adb5d6aedd63daeb0ddc03f05555f882ad3e9bb6363862eabd3e477c9d0e0e0f90292db260e4cc9e314dd83bca5af35dca89eb8
-EBUILD phonenumbers-8.12.45.ebuild 796 BLAKE2B 3e2cd47f60e114181646d4fa64c34d825c97d22457ccce2d6e78774e759d98b6a519b7a6741d904d04d29c5588baace4e6c98a3b92076af25cb237ec18f7f1a4 SHA512 30d3bd6e9ababe084d40c0a39adb5d6aedd63daeb0ddc03f05555f882ad3e9bb6363862eabd3e477c9d0e0e0f90292db260e4cc9e314dd83bca5af35dca89eb8
+DIST python-phonenumbers-8.12.46.gh.tar.gz 4898411 BLAKE2B f776e98f6cfb8178d7a87a5aa694eb19d997ad98ddc7edb4f01ef268189773a198d2a98568d2bdb8eea56115187dbeea610da9c59193ec6930430fdf76f7bb7c SHA512 0a73fd1577de51be86bd01893c97de0f0e1c555d85f3827367d5afee96c88b7c2187b2ae65a433e0a381835c0abd4e7af1aab27a24bdd0e0b973c812a9e77e7d
+EBUILD phonenumbers-8.12.45.ebuild 801 BLAKE2B 6a2726b7845d46717aacb23295f6248b11475b197ff1a37c0de0d2a4e409cac62e941f005057f715fced24909943303ee1f0e975e40484368d82a81578c26b14 SHA512 8b5f322852d39eeec3bf3f023765fda596f6459eba5fa70f9f7074bf5e45428a5f292b394bfcc7786cb25049e198c410d794aade497539b6f0e8964a9f72bbc4
+EBUILD phonenumbers-8.12.46.ebuild 803 BLAKE2B dd6c1b554ced6eca28935fbd1f727c43f0b418398d373e1da3e7903d0e03d2db7ee8bb62cdd74a82de71d9842be842d3a2ac738fd88bf491d4547de83d27c656 SHA512 6e3f8ca8e44af7478eab31426c4df3fccccc74675f8a4d73d600bf66b4883cba399188d863010af45c9c65b1345f1693634c2ed3c6b992ef13759726c0d2290d
 MISC metadata.xml 413 BLAKE2B 4fa9965e76205ab35de37314b8c06fae26ccf34a944401e672487d7ad42b0046b4de85c8dd4c500d2703b5ecca49755b3f6d9047a20d7226fdbdf63e0aca3220 SHA512 de88d4162ba8f97748a1d2a17a8bea48f59b84f67c76aec11a9bad8ab0d0b66bc9cc2395dfff446bbad591f52f755a38ccd0daf2480b4f2e22e80ce5d44a42c1
diff --git a/dev-python/phonenumbers/phonenumbers-8.12.45.ebuild b/dev-python/phonenumbers/phonenumbers-8.12.45.ebuild
index 46dbfb8b29a0..8e4b363b03b6 100644
--- a/dev-python/phonenumbers/phonenumbers-8.12.45.ebuild
+++ b/dev-python/phonenumbers/phonenumbers-8.12.45.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}/python
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~riscv x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/phonenumbers/phonenumbers-8.12.44.ebuild b/dev-python/phonenumbers/phonenumbers-8.12.46.ebuild
index 46dbfb8b29a0..3b1d20a349fc 100644
--- a/dev-python/phonenumbers/phonenumbers-8.12.44.ebuild
+++ b/dev-python/phonenumbers/phonenumbers-8.12.46.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}/python
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~riscv ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/piexif/Manifest b/dev-python/piexif/Manifest
index c0008248f7ec..e24c38997012 100644
--- a/dev-python/piexif/Manifest
+++ b/dev-python/piexif/Manifest
@@ -1,4 +1,4 @@
 AUX piexif-1.1.3-tests-pillow-7.2.0.patch 1382 BLAKE2B c7ea03ffe0708b975d64602910bf9c228f0093d9cb717a1b1b9f3e7b6358b94f3bcbd6da8f9bac12fe2ee0745d17defccd196bdd8ec018fea50b7d131e148616 SHA512 be1ee541e3bb6c219d6fd9ab68e9143c2131f695a2001d36a0d63b0566d71a542a09d58dc0bcbdb8c1353297156ea7853d483b9a44407cb31c30acc4252310bf
 DIST piexif-1.1.3.zip 1011134 BLAKE2B b27d4419cf545f6205b13c5646dff9fc7b1ce6e5de538f6a7189e6cadb54d301e11cbf0feaed8b073cbf16de95d67c621b68657b35fc0ba2025281ee64be4e51 SHA512 df5f7793c39911af58bbae76cf998e2a7bc820b84dcf9808ee8f6a38f766f824fef28392ef88387e18b10c270c4b27881be310f0368076b6fb65379a11a93270
-EBUILD piexif-1.1.3-r1.ebuild 820 BLAKE2B e07d5f0dffa67a1d3d44b23a9b5389c7bb5218a92205661bac6c6e8ff589f717360070e72f83b7180ae4516cc9e6ed14afe20adad47155209a52c46e0e018425 SHA512 973fdf18c0d4628ce07efeec4b48987627d22599215b80963f0e00c69f09b8f6de903ff93cdcbe0ea75c85eced3400ab0f31577b7eb35a8d5fa3fdfc19dcf77f
+EBUILD piexif-1.1.3-r1.ebuild 827 BLAKE2B cae7df00b4c42c480ceaa0b6cfae4e39d42ab44c1779b88d4ca19241ac0ccee8846a614c8ee1bb705e35e60a4a9482b587453f7b58709579031d76775ce99dbf SHA512 f34dde462ce0954cdafd78ca71a87e64451a8af44e3a74cab1fe578385e9c81b03beb4446db4e63d0d8d2e8a20104bc30b18aba8574c3824044b08b3a2d95152
 MISC metadata.xml 364 BLAKE2B 2ef968ac973776979f74c1ff510b657d691d7cfd1b963b04faed752e4dedfea8f325357b95ea9abede883a8ead27016bd2b657be119902fa21f9bef6ea2ebb0c SHA512 c62c0ee0303599f10b04701183db691da926fb3176f5ad5efcf58782c50280e03dcf5772ab1d033d3dc96730a2ad87c19ce9749a9c0ce2dd3dfdde76d2466eb7
diff --git a/dev-python/piexif/piexif-1.1.3-r1.ebuild b/dev-python/piexif/piexif-1.1.3-r1.ebuild
index 70599e5bd248..3927fcd5f2b1 100644
--- a/dev-python/piexif/piexif-1.1.3-r1.ebuild
+++ b/dev-python/piexif/piexif-1.1.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 ~riscv ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pikepdf/Manifest b/dev-python/pikepdf/Manifest
index de4f7ff582b3..ad7289a93414 100644
--- a/dev-python/pikepdf/Manifest
+++ b/dev-python/pikepdf/Manifest
@@ -1,9 +1,7 @@
-DIST pikepdf-4.5.0.tar.gz 2353720 BLAKE2B 6c15a07b686a6279d1c8bbccc1534a153ae6e809f2b1b63bf4a44f9d49f064cd8b102aa2bb50cb824689c25cc4850d84fb04355fa66dea1e0fc8582d9a2743ad SHA512 d664a192cee28143c06cd7653ba225c7fb559a6480b9fab3b87cfb5231678967af5ec1f896b8c48938cc1f1ca3ff00b1dd5a0df1807a84d17fa104a7dcd98dec
-DIST pikepdf-5.0.0.tar.gz 2353902 BLAKE2B f6c73372b73d303f0c17b68d8e317c0aeecf6515d720e8eb748123385f57fc49b7eba54243462864a5d6fe9b19acce85140bc3ece15695c086faec69c60ed98a SHA512 8ac3d2682b1490dc9fa4509d0db14508e3bbf001b34d5ba495eaee0d29d6a189309b6a71b3f92e620cfc3422218152edb4103e9e30cad87e4202571d23c04dfe
 DIST pikepdf-5.0.1.tar.gz 2354060 BLAKE2B 0aafaa27642dc2ee5994e670cbc7c7f828027111ce6a7aeb0ff71db8a07a271a1335c60ee9cbbbdbaaf9f8403e206df2c3083cc735cf5bc7f8810b4b113d1634 SHA512 d259806303a3faed861b91cc838efb1317b0d865220708f379d9a674e4ffc0a2752be9b09bcad9950edff7fe8a1c1511c56d9348cfd8ce7c0ca8893316a3ce78
 DIST pikepdf-5.1.0.tar.gz 2354197 BLAKE2B dd6fdfac9a5050ed0f935f4a17a4ce6561f5e67b02b8f651d3d9944aee329086827eda06c6fba95d4371147ab148394cde7040d003efcdad14dcf0fbe89690c5 SHA512 2b7aeb5156e296957c6f7a0c9c1e46e75368b6683f0c79d11a6e01c04c7cb58839d831990c8203f2d6ad5759b95e7766cf2e6fd831e582744eb830d3483fac68
-EBUILD pikepdf-4.5.0.ebuild 1612 BLAKE2B 34966388a2cba3665dfe6244f94cea16838d3a11c6761546cd45b0664a8906b280f1915554c4e73f8088b34c9674b694a1b9c8aff1effb23160345c27a208f5f SHA512 d44ff6b700f2c746eed927926e218b6c660a54bf23fea19b515ebcf0d5a24dc318c14184fe29915f8731aefa796d88fd2a1f445b4a378f34b5f6be3c7efd36a4
-EBUILD pikepdf-5.0.0.ebuild 1613 BLAKE2B 74c97bea4b029c3ad58ec60700d7fed34c53be43087ac1910a96e6b7dd46e8467f3daf478fd8e2a1837b10299df281c9183acbf6e4a7a2c6baee33a7e241fc03 SHA512 e5e9adbe684324eeb3e648bb25112833e51d9092a83076263913f79b8ec0d1d35532cfd6e2817178d4d2715b5c71ce31c79e142ae5ee9b9ff668dda4bd5c9ecd
-EBUILD pikepdf-5.0.1.ebuild 1614 BLAKE2B f45e2d4ad1fd6341de5f91b3472b483c335873ed5734ff7e5396d61ed3642a7e6c2d95d377c3b02a4ae20e3fda0264f578afd5ac011bfe0dce2a0f8541758777 SHA512 b2a1527edd8ef3036f74468a829a1bb9ee04692e4160a2db6daa0bf7c33790c3586cac160280df2b460db7e4da2e3a782689ebcbb3db38c62a5bfda00de045b0
+DIST pikepdf-5.1.1.tar.gz 2354977 BLAKE2B e9cdeac42fe49fd4497931ee1a45dea43b36059b485fd81bef0a7c73fda018c60db55d686a4016c6c10d39b85730da72cb064a3dec0619e8ad5f9ea72a451b5a SHA512 63e44381404a15d29a81d1b6ec0d547ada93f43cfea8ef5bd9310b9ffc60bc17a55f32fcfd3c5f92e8818817f167ff549cf88df0c95ef960c353bc3d7efd2f25
+EBUILD pikepdf-5.0.1.ebuild 1613 BLAKE2B 4469b42f9af1b9b8437b78cb3d82bad36d3d96ae67e26104cc61988d3b1b96bfae810952e730c21dcc6a7952ce77457fff18396b47ecd04c5e89614a110111a2 SHA512 104022140b93853d9434ccdffb9060fb22e1d2335fb03866dee48288f77a280da0fcfca1606883e82cf0ae47a5f0cc30bc693f89b12ce9f820a43923c80c5d0c
 EBUILD pikepdf-5.1.0.ebuild 1614 BLAKE2B f45e2d4ad1fd6341de5f91b3472b483c335873ed5734ff7e5396d61ed3642a7e6c2d95d377c3b02a4ae20e3fda0264f578afd5ac011bfe0dce2a0f8541758777 SHA512 b2a1527edd8ef3036f74468a829a1bb9ee04692e4160a2db6daa0bf7c33790c3586cac160280df2b460db7e4da2e3a782689ebcbb3db38c62a5bfda00de045b0
+EBUILD pikepdf-5.1.1.ebuild 1614 BLAKE2B f45e2d4ad1fd6341de5f91b3472b483c335873ed5734ff7e5396d61ed3642a7e6c2d95d377c3b02a4ae20e3fda0264f578afd5ac011bfe0dce2a0f8541758777 SHA512 b2a1527edd8ef3036f74468a829a1bb9ee04692e4160a2db6daa0bf7c33790c3586cac160280df2b460db7e4da2e3a782689ebcbb3db38c62a5bfda00de045b0
 MISC metadata.xml 687 BLAKE2B 07c94d9dac5323202f955fd9c1e5a6fc78518a0a6f703c54c73b70e774900c41a4823beb3f8be7068d83878d1e60df0d7e30efd53bbc1ba31019477de82b092f SHA512 1be3ec00342e8079363db0c57f75ae88bd05e873869fbbb27442e9fe98eb6917c55b4eaf03ed22c4c44ca3aec9b84839cbc254202460a3266bbc42ff8f0f84b3
diff --git a/dev-python/pikepdf/pikepdf-4.5.0.ebuild b/dev-python/pikepdf/pikepdf-4.5.0.ebuild
deleted file mode 100644
index c89fb12406fd..000000000000
--- a/dev-python/pikepdf/pikepdf-4.5.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-MY_P=${P/_p/.post}
-DESCRIPTION="Python library to work with pdf files based on qpdf"
-HOMEPAGE="https://pypi.org/project/pikepdf/ https://github.com/pikepdf/pikepdf"
-SRC_URI="
-	https://github.com/${PN}/${PN}/archive/v${PV/_p/.post}.tar.gz
-		-> ${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-
-DEPEND=">=app-text/qpdf-10.3.1:0="
-RDEPEND="${DEPEND}
-	<dev-python/pillow-10[${PYTHON_USEDEP}]
-	>=dev-python/lxml-4.0[${PYTHON_USEDEP}]
-	>=dev-python/packaging-20[${PYTHON_USEDEP}]
-	>=dev-python/pybind11-2.7.1[${PYTHON_USEDEP}]"
-BDEPEND="
-	>=dev-python/pybind11-2.7.1[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm-4.1[${PYTHON_USEDEP}]
-	dev-python/tomli[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/attrs-20.2.0[${PYTHON_USEDEP}]
-		>=dev-python/hypothesis-5[${PYTHON_USEDEP}]
-		>=dev-python/pillow-5.0.0[${PYTHON_USEDEP},jpeg,lcms,tiff]
-		>=dev-python/psutil-5[${PYTHON_USEDEP}]
-		>=dev-python/pytest-6[${PYTHON_USEDEP}]
-		>=dev-python/pytest-timeout-1.4.2[${PYTHON_USEDEP}]
-		>=dev-python/python-dateutil-2.8.0[${PYTHON_USEDEP}]
-		>=dev-python/python-xmp-toolkit-2.0.1[${PYTHON_USEDEP}]
-	)"
-
-#distutils_enable_sphinx docs \
-#	dev-python/ipython \
-#	dev-python/matplotlib \
-#	dev-python/sphinx_rtd_theme
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e '/-n auto/d' pyproject.toml || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/pikepdf/pikepdf-5.0.1.ebuild b/dev-python/pikepdf/pikepdf-5.0.1.ebuild
index d3aa52613582..2a2524c3004e 100644
--- a/dev-python/pikepdf/pikepdf-5.0.1.ebuild
+++ b/dev-python/pikepdf/pikepdf-5.0.1.ebuild
@@ -18,7 +18,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 DEPEND=">=app-text/qpdf-10.6.2:0="
 RDEPEND="${DEPEND}
diff --git a/dev-python/pikepdf/pikepdf-5.0.0.ebuild b/dev-python/pikepdf/pikepdf-5.1.1.ebuild
index f84824f5f56d..d3aa52613582 100644
--- a/dev-python/pikepdf/pikepdf-5.0.0.ebuild
+++ b/dev-python/pikepdf/pikepdf-5.1.1.ebuild
@@ -5,6 +5,7 @@ EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{8..10} )
+
 inherit distutils-r1
 
 MY_P=${P/_p/.post}
diff --git a/dev-python/pillow/Manifest b/dev-python/pillow/Manifest
index 622a4e8292f0..0161a241cc7d 100644
--- a/dev-python/pillow/Manifest
+++ b/dev-python/pillow/Manifest
@@ -1,7 +1,9 @@
 DIST pillow-9.0.0.tar.gz 49510604 BLAKE2B c3b0d07e8fe280e3a253067c4da18ac2dee40d216280632d58ddaa7848e13a165587b9aca61c98f8b5380e53d6d59a4097320bacf6e016e236239af518ec7780 SHA512 d2fd74dd1b8824d994e3767ef9794175dd2f4adc8173612432a3e171705723ee8757d299a87fb1c010b40919792c1ca76578f41977ee3303ccb6f75165deb791
 DIST pillow-9.0.1.tar.gz 49512045 BLAKE2B 14f0969c87c57bad8fc38d873bba7a118d666e8b2e62e777ea17197e5ca973b3994bafb56b4464cde4059f2fc4040d73e7ddeec2a1053aeb1f201bf2ec2b38e2 SHA512 73893fe079bb2405c87b73b13b6eff198fb8970a891a7c9586bd2620ea0310d54cb35b1d594c6c6d3859e47d8d467700f987ae32aa6d3dc4a2e9286e8749869e
+DIST pillow-9.1.0.tar.gz 49748153 BLAKE2B 0051ea9c06c86f004f0708b3aa38f234e9b1fec32ef2ebaddfe47b3717b8ebb4834a2c8c2fe68cfeb44d24abe3a9039732679705f7aec790e62105ac5b51545f SHA512 22ef3a98a36ca8162447b6c716a0a9cff79ae9bf1007b7f835e0a8529fc6a062bea77afff17f444586989fff3e30589a595db34dc78e1e4000b966e8d10172f1
 EBUILD pillow-9.0.0-r1.ebuild 2889 BLAKE2B 5aa19477632d17ae9ce031f5dbcab51e1b315fd7b8a82cd3e3cf4c1ef200180d8bbdd607dedcbf390e319bdcfe8960d966d4f5ae1544de413b408aaa74549546 SHA512 d902760494cd2d8dcfc32da0808678ab5198d8eaf4c1e8534ec586f380de317b15944627d07ae0984b11e9a06afc98fe0b115e981a5844b73af0370572f41ebb
 EBUILD pillow-9.0.0.ebuild 2637 BLAKE2B 393b8e2fa5dbb13ef28acfbaf87709496617eaa904ada6f5503745e933a960aef982f5e11df5e4204b8cd754eb505508b79db01bce3d15089d9f56621753eb7e SHA512 af0aed73003e291f08aba7ae98bf803daadb1fceac2ca058a994c62865773648e04aa310fdf445ce2c8d5d7d965bfc113d40df52447e11ce340f6997f2da91fc
-EBUILD pillow-9.0.1-r1.ebuild 2886 BLAKE2B 140c4bcc03263f063958eda8516af17d34bc0d8864280283655bd75f6c82bc1a15f6c14ab613f69ce8a323d183e027b68e6759a8d0fe8e73d83f9283e52ffbe9 SHA512 a5334c4c8b0c3dc7678a764c2aa5305f820d7af8bc211f6cc0d918a4a5fe0300392b129affcb286e372304dfcb248087816e2cb427b13581e0c02fedb6638fd9
+EBUILD pillow-9.0.1-r1.ebuild 2885 BLAKE2B 2ac64ea8ec3f59376cbfbe0722a32f2c9ec0c8c485bb4fed0e46c4fc339e74c291fd3418163fd6af2179bd1b7ad70b02bbc2ed9035a0a1063c401bd83b22989e SHA512 a61d94afc10f40d56b6b20a6d7da8382f011976d1be46ccce2fde8b54da96301b0d363736812ebbe5bd32c890904cea9e84efa735ec5749e5fc8977ad92a2d6b
 EBUILD pillow-9.0.1.ebuild 2639 BLAKE2B a77660a7c500f3df1f1e0af026ce44610a9f63476bd52e48c215ddd32d692f0da1b565f37752014409f711626dabac600e18c66b032e38feeff8f48b5f2dc1dd SHA512 7200c180661b56943c1df9a6161e06a9afa041cdeb78965fcde758d5dd1cf5d5ade8acfdc954f4bc8fbd741f3511b32b3509c79690bbbc7f50f54c5a5312fb4b
+EBUILD pillow-9.1.0.ebuild 3128 BLAKE2B 31fe441968f5dd2860e5f703beddf6da18b4123f9b3049b744d4fe4cba62d5897e213623dc3743737fbc5755ff024e87f14355fe7ea5f60799a45871beb27d03 SHA512 8ddd411ce52932d7d84f64a6d30365f4a32d56cb1b55686abbb1ddf2ea9b5faee91e34020cab0350e8bbc0271637df51ec1d0ea1ea96591e7e369c92471f718d
 MISC metadata.xml 480 BLAKE2B b42e6b01b1572a0688ef93025a0baaa95b9fd0c3a5eabcddcea7145dd880a95f11859b255ae24a376ca792559ffcf940c67da1b19f2f579dbc6ef6de68903749 SHA512 b98a33136aef4498051370bce3295b000687ddb80b4d909b26b32af61b4e4638d07269f7924ae039420af63236aa74b51e23d2feae1c83349683073c69714582
diff --git a/dev-python/pillow/pillow-9.0.1-r1.ebuild b/dev-python/pillow/pillow-9.0.1-r1.ebuild
index f534df0431d8..390287bf5a92 100644
--- a/dev-python/pillow/pillow-9.0.1-r1.ebuild
+++ b/dev-python/pillow/pillow-9.0.1-r1.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="examples imagequant +jpeg jpeg2k lcms test tiff tk truetype webp xcb zlib"
 REQUIRED_USE="test? ( jpeg jpeg2k tiff truetype )"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/pillow/pillow-9.1.0.ebuild b/dev-python/pillow/pillow-9.1.0.ebuild
new file mode 100644
index 000000000000..4b2101d1e1b2
--- /dev/null
+++ b/dev-python/pillow/pillow-9.1.0.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_REQ_USE='tk?,threads(+)'
+
+inherit distutils-r1 toolchain-funcs virtualx
+
+MY_PN=Pillow
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Python Imaging Library (fork)"
+HOMEPAGE="https://python-pillow.org/"
+SRC_URI="https://github.com/python-pillow/Pillow/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="HPND"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples imagequant +jpeg jpeg2k lcms test tiff tk truetype webp xcb zlib"
+REQUIRED_USE="test? ( jpeg jpeg2k tiff truetype )"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	imagequant? ( media-gfx/libimagequant:0 )
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( media-libs/openjpeg:2= )
+	lcms? ( media-libs/lcms:2= )
+	tiff? ( media-libs/tiff:0=[jpeg,zlib] )
+	truetype? ( media-libs/freetype:2= )
+	webp? ( media-libs/libwebp:0= )
+	xcb? ( x11-libs/libxcb )
+	zlib? ( sys-libs/zlib:0= )
+"
+RDEPEND="
+	${DEPEND}
+	dev-python/olefile[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	virtual/pkgconfig
+	test? (
+		${RDEPEND}
+		dev-python/defusedxml[${PYTHON_USEDEP}]
+		dev-python/packaging[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		|| (
+			media-gfx/imagemagick[png]
+			media-gfx/graphicsmagick[png]
+		)
+	)
+"
+
+EPYTEST_DESELECT=(
+	# TODO; incompatible Qt version?
+	Tests/test_qt_image_qapplication.py::test_sanity
+)
+
+usepil() {
+	usex "${1}" enable disable
+}
+
+python_configure_all() {
+	# It's important that these flags are also passed during the install phase
+	# as well. Make sure of that if you change the lines below. See bug 661308.
+	cat >> setup.cfg <<-EOF || die
+		[build_ext]
+		disable_platform_guessing = True
+		$(usepil truetype)_freetype = True
+		$(usepil jpeg)_jpeg = True
+		$(usepil jpeg2k)_jpeg2000 = True
+		$(usepil lcms)_lcms = True
+		$(usepil tiff)_tiff = True
+		$(usepil imagequant)_imagequant = True
+		$(usepil webp)_webp = True
+		$(usepil webp)_webpmux = True
+		$(usepil xcb)_xcb = True
+		$(usepil zlib)_zlib = True
+	EOF
+
+	# setup.py won't let us add the right toolchain paths but it does
+	# accept additional ones from INCLUDE and LIB so set these. You
+	# wouldn't normally need these at all as the toolchain should look
+	# here anyway but it doesn't for this setup.py.
+	export \
+		INCLUDE="${ESYSROOT}"/usr/include \
+		LIB="${ESYSROOT}"/usr/$(get_libdir)
+
+	# We have patched in this env var.
+	tc-export PKG_CONFIG
+}
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	"${EPYTHON}" selftest.py --installed || die "selftest failed with ${EPYTHON}"
+	# no:relaxed: pytest-relaxed plugin make our tests fail. deactivate if installed
+	epytest -p no:relaxed || die "Tests failed with ${EPYTHON}"
+}
+
+python_install() {
+	python_doheader src/libImaging/*.h
+	distutils-r1_python_install
+}
+
+python_install_all() {
+	if use examples ; then
+		docinto example
+		dodoc docs/example/*
+		docompress -x /usr/share/doc/${PF}/example
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pipenv/Manifest b/dev-python/pipenv/Manifest
index f12a7e1257d2..f7feedd0d0c7 100644
--- a/dev-python/pipenv/Manifest
+++ b/dev-python/pipenv/Manifest
@@ -6,5 +6,5 @@ DIST pipenv-2021.11.9.tar.gz 11652360 BLAKE2B ab7d733e0c44a8551d2b786680646f5efa
 DIST pipenv-2022.1.8.tar.gz 11379235 BLAKE2B b73df14688ebe6d0c6153c64c2f3cd5106f184466061177cebfac120fc49af403a5d27919a8ff0e5a40e04a9950ab9949938c1d4c8d0c1a4df98440a3a2a2ae0 SHA512 9bad380548723172eddbbb9ebfc35a46effbd8eeeff47ad347d0ab5ae9f52e20de8dfc205dab6fb8ae8763edc488cf867a64ed443895242feb444d1bc0d9b8e0
 EBUILD pipenv-2021.11.23.ebuild 2551 BLAKE2B 3633bd637db21a8830b388f1438d9531ffa2cf99fd43a1664ea9bdf9a555c695e29c84701d7b2241bdeafeb0ae449d8f709f1fd2a40ec137a97af8a7739e7be8 SHA512 03e32c60df6889d5d710d96fd84dbef61723c938337c8cd5684402517e90160b75a4aa14462c2a1cff22c8e9af0ca783e5d5894aeb3966bac697f2c102300a4c
 EBUILD pipenv-2021.11.9.ebuild 1793 BLAKE2B e17672eacd26f09bd912adeb2fc5995cd28899a2e7f7e04b94d6af12a4468a1248897c1ce587a2f88c36d002de74d90447a0fcf9713398f36dc36d6965e077ba SHA512 e07d6ab4da4c1868cb412cf8987b23490c70665b3d71b4b603ff45fff812d66967cd91dac21333497eba9edc77a2516c2839eecb78707a6c7725ca6838fc1ba2
-EBUILD pipenv-2022.1.8.ebuild 3358 BLAKE2B d1e9a1fc1069730b87f85b7d02157e7abc0ca88e982cf77cb9261014f20ba3d1212830f4d85e3a0002c687bb16f8ab501c1d009aa5f43ff639ddfd20881fba49 SHA512 651760326fdc6a1736ef5b50b9deb32684ba2715c87424bdfff37067fea40f74d2bdcf1735b38ece211039568886fbdd1f35fcb04dfa1ae13fe60affba868996
+EBUILD pipenv-2022.1.8.ebuild 3365 BLAKE2B b13df7340dfb388eae6a4cb7a831dc0472cb0678f38daf20a8c913403661543cefc94544b424dff01deee484ca26af0846c931c302bcb1e9ade43e3a36557d3f SHA512 fec8ff3224b567e354f23f07f1e49e8fab58db34030aaad611770b5ec61cebe353ad79b93e5f75628787061908dbefde19fd7e3a533a592d13bf2d077ceacc2f
 MISC metadata.xml 643 BLAKE2B ff3557d9ae32b553c85455436683e2ca94bc16c6ec7c6d2ceb1113a69dc841b9ac2f0e4b96eec4c6c84ca899ad6a99b0747d7bf3f9289110a8bbdfb80f2cb2eb SHA512 7a611950572c2d700fb1680e0aa307069d80d992528144da781eca9f1fee729defa6f8b28382ddd8f66e58c5f68de9a17815989a4a39473bbf830a7be42ea282
diff --git a/dev-python/pipenv/pipenv-2022.1.8.ebuild b/dev-python/pipenv/pipenv-2022.1.8.ebuild
index 8261c2f78a91..36de6a9b7856 100644
--- a/dev-python/pipenv/pipenv-2022.1.8.ebuild
+++ b/dev-python/pipenv/pipenv-2022.1.8.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}"/${PN}-${MY_PV}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~riscv ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pivy/Manifest b/dev-python/pivy/Manifest
index 0224812c494a..04b0b598f982 100644
--- a/dev-python/pivy/Manifest
+++ b/dev-python/pivy/Manifest
@@ -1,5 +1,5 @@
 AUX pivy-0.6.6-0001-fix-CMakeLists.txt-for-distutils_cmake.patch 703 BLAKE2B b2a183cd4a5d20a1ede7427a1c895766c63f694c38e559e4c7d12a1b8a0a88cfd596b26e31ca35489dc637110dae13f89c671fe52c9555624694ef494f8fcd2d SHA512 7ecc957ac8209aee41c010768d9953fc4820a3e6929dd45be16732385f6e1edd12febc2e05786090835eb35235bb976e1122df2b7da6d0d68c6ae3bdbf9dd9c0
 AUX pivy-0.6.6-0002-Gentoo-specific-clear-swig-deprecation-warning.patch 940 BLAKE2B d7e25c5690a7ea665d923753bcb0811ec9e9702f5085f6a368f1ffbeb84f7b17e8ee6dc02a5374bc5dd45c195cc068bf825b284a97a69be762e9348e7645067e SHA512 75ea0c401cf35b97c119c5a652b91911151ed878136860a90aa53730632dfb89dcd69fb66149145ae59005a93c89e89d1153c8cc23d4d978f9a68fd9ef65c7e2
 DIST pivy-0.6.6.tar.gz 6618471 BLAKE2B 5bcf2479bf26628e3dfe59c1440901368442de2f32a5680ef1af10d49239d8c73b79809495d7227937fd7784af1e1ded27f93f0255793e713add0c1cc35b8e5d SHA512 e260c6abd0aede7621d5fed66eeceb98a32634af84370ef713d70d583ec017cded4be682fd7e70e5faa19988a5e032a9d2f2308b8ae6dd9495d76e884de1d80c
-EBUILD pivy-0.6.6-r1.ebuild 977 BLAKE2B 333f054f42e29b9e4581658159ae86cf03e088893a2826ac6947c35364ff0b89205f0969262fe73679b23a99b4b40e41392b0efdf72f9606b00291c6cd1fb493 SHA512 d34d24de3a6b17178c83ac2efed342c9a4f0db3bbb8d633225acbb8e5c55e0c65813139163a262de82ff9db3684d8585ae7b2b95a46c491df1a3fb1fe1045e9c
+EBUILD pivy-0.6.6-r1.ebuild 978 BLAKE2B 0a8c8a54756eee2d06fddba0a4b1f06e35367f990391574bc68f72a8a4e7df24a80ccce426603421346c2ba2bd202f19695f648adaf095d3600202760d5883fb SHA512 7fde8ab0057aba362c92c25f61e75934c4d7717dfa9e1d0a5aac2ec36caf70ebfbaf1b16cab9eb0d61d23aace87884c7a3364cd410ce755f376734810ea5d804
 MISC metadata.xml 619 BLAKE2B 56498bc9920e301de3dacb10db1c2bee59120b8cd3d15508c3549868700574641916e1d3d6f2a734f87eaa91290fd3b1b7ff1373297ca61cea11e33fbd0fed9f SHA512 fd7b9a70a84749a1eab30c3e4ea56bd15d43266e23298a5be1cf3bbee85c38e34bf062ea2555af724766daa7ed755cf586d8c66dfa2286dbcce9c23535661e66
diff --git a/dev-python/pivy/pivy-0.6.6-r1.ebuild b/dev-python/pivy/pivy-0.6.6-r1.ebuild
index be384a054672..50ca56ff2739 100644
--- a/dev-python/pivy/pivy-0.6.6-r1.ebuild
+++ b/dev-python/pivy/pivy-0.6.6-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/plotly/Manifest b/dev-python/plotly/Manifest
index 03f9f0df8cd4..37768e6cb383 100644
--- a/dev-python/plotly/Manifest
+++ b/dev-python/plotly/Manifest
@@ -1,5 +1,7 @@
 DIST plotly-5.2.2.tar.gz 7293292 BLAKE2B baef3accf8f5a3085908fcea558f8003687e18a1f97471c620c378c10d23d4222ef87dc47d64f45199b594414890db5b8ca5e3d7867c871d926c2ae441128c4a SHA512 4d6d79f7cc2063e73e7c17ff90a7d13324497ea8034d8ce62d79ec62b0530a59b2eaec8913fb05efb804cf5be8387b6f96d1710f41b9993233b5a13cf64dd310
 DIST plotly-5.6.0.tar.gz 8599746 BLAKE2B e76ac48e79a2470c320f21991a75c51c29ec959b9bbc50b1176df2f40572d794b2073f16964445a3d6dee4643063c7ccbee90fee1673b9bfd850e239fb39d0e1 SHA512 3ba91bd1b2a9cb1cd778985a0253b11f36e891e01cb734d6c88c40266f1852f2b2d02b12bc712c0b58b93dd68dd1c9b4378bcbb462bd63b3a67334cb83564c82
+DIST plotly-5.7.0.tar.gz 8609793 BLAKE2B 12318f837c248c54fd3a8723bc772e8348186942565ba5a4c095f348dc338cc098318889900500ec333d7ec352801926ec91d312f2ccd98a89f804159223057f SHA512 01675470ef5218f06b4e9e485f23155a8e8550748fdf86afdb2a2969f838464b70d4452811427ab6bed2846093e8cfba7e891f7d0ea3a621e1fbffe22182d933
 EBUILD plotly-5.2.2.ebuild 795 BLAKE2B e609d220f61b73ca3c11255e0fc28cf9c3a2ed316be1f39044cab25679683300d6281e80ce2f5ead3be391b3c537be7531c9148ec1a1bb069a04ba621ba1784d SHA512 a1bac18949480f19c68891497effdfe60cc3ca474ca24ce27134f2a1da5cd894426fca9b00ad8d6d24138da141fafefd09a40723b1314197068422cd988574cb
 EBUILD plotly-5.6.0.ebuild 1602 BLAKE2B e4c9fad96ba8756789aaa0a3789bedd7f5e68ed7c35d4645b9ec97207a080634d9b65587b9aa008de9271c9df47944d1fbbf68878bbf85c54b0299b6ba23655b SHA512 6aa34892331d5e551bf2962073349fdb9cd9a2844f064dd5e21c8551e384dd632bebd71a86ae508cbbec4c9a3480ee9339c10079d55ce00cb493fced05c56a07
+EBUILD plotly-5.7.0.ebuild 1595 BLAKE2B 3acd8461e2c34c67636e13bed9bf5d39d7be205ffea561aba2281960ed113fea3fe0814904457ff966cabceb40d5a4d8808014cee069bdb8177b1471e939189d SHA512 f724cd1973e94956edfa46b8e100911d2eec0851c0b68758a4cb3f16ed4f47614c35ab65c7c752d6d081d565078893ca5b68e7fb08a08f487817f326a0de4022
 MISC metadata.xml 627 BLAKE2B 453adb04f4caba9790fe5223635245c8bca7ca5c6dc1930f09537045580b88b5fa1649e47158b13be6cc5cb09b4479a47690e37ef13208b47a95f82d14793a91 SHA512 a5183e9d217d1312e8d383ccb4ade66b92575492b6c8ed8987e3af18e9e456836b62b2d572ce62f9e01aae47b4a2bcbd12f79b4bb6acabfe69c2b63b20315bd3
diff --git a/dev-python/plotly/plotly-5.7.0.ebuild b/dev-python/plotly/plotly-5.7.0.ebuild
new file mode 100644
index 000000000000..5bd40591e1d8
--- /dev/null
+++ b/dev-python/plotly/plotly-5.7.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1
+
+DESCRIPTION="Browser-based graphing library for Python"
+HOMEPAGE="https://plotly.com/python/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+# TODO: package plotly-orca and kaleido
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-python/tenacity-6.2.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.15.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/backports-tempfile[${PYTHON_USEDEP}]
+		' 3.8)
+		dev-python/inflect[${PYTHON_USEDEP}]
+		dev-python/ipykernel[${PYTHON_USEDEP}]
+		dev-python/ipython[${PYTHON_USEDEP}]
+		dev-python/jupyter[${PYTHON_USEDEP}]
+		dev-python/jupyterlab[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pandas[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+		dev-python/scipy[${PYTHON_USEDEP}]
+		dev-python/statsmodels[${PYTHON_USEDEP}]
+		dev-python/xarray[${PYTHON_USEDEP}]
+		sci-libs/pyshp[${PYTHON_USEDEP}]
+		sci-libs/scikit-image[${PYTHON_USEDEP}]
+		sci-libs/shapely[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	mkdir -p "${ED}"/etc/ || die
+	mv "${ED}"/usr/etc/jupyter "${ED}"/etc/ || die
+	rmdir "${ED}"/usr/etc || die
+}
diff --git a/dev-python/plumbum/Manifest b/dev-python/plumbum/Manifest
index cb9a530775cd..2c2bcb90cbc3 100644
--- a/dev-python/plumbum/Manifest
+++ b/dev-python/plumbum/Manifest
@@ -1,4 +1,3 @@
 DIST plumbum-1.7.2.tar.gz 323051 BLAKE2B a16d9210606ac67abd425fcff109d40836dc969729cc5bf78a5d224c0beabf09d56d35f17809994d758153c6e18e4af91403f7ae0111912447367be68f6592c1 SHA512 77e75988255ca78fa5c253c6d076d63f8f9250a2b153ef23e40f35315e255ea09403d854a19bb265fd658bb9e5f0f705dc7530ecacc40b4b48e33acdf50dddf9
-EBUILD plumbum-1.7.2-r1.ebuild 1351 BLAKE2B ed382fa4f048cf9b39acc62988c6861ca4aafea393d338d77e5901884e3dde18ab424715c0756a04729e62427276e5ed39b7a2302c4dff0545ff78a2c2e7caf2 SHA512 63b9e3d7ebd4bd6ed44e4354e5222169619c31efb8c8b10f28b56bf85be5fff24ae615884095bb54ccc81b747cefbea9847e9c523939e8dec66056ce78fb0c4b
-EBUILD plumbum-1.7.2.ebuild 1315 BLAKE2B 11233b942f7b26e8393ece3e0b0cea492afecd622e645527689eb3a01932e8e108c0f0101a669434643b82bee993221921e811f4fafa960004cf308fedb94ace SHA512 98dd03672a5d8ca42ff237dbb86061bd2d5720e0615c3927abc90290019ae9d4241a684f7ea8c81c080aa611f7ee288a81bf2c51010136ce95116a7576280f8d
+EBUILD plumbum-1.7.2-r1.ebuild 1349 BLAKE2B 0bd3562a8e693869d886507384e3797cf3c8b4032c6ec2b403b2f1b466569f52d82d65caab4bda619538d9a5752024b44692a3ac995ea93a1af7ed431f96ef93 SHA512 29bee99a54ed7441b6e107ba63fceb7114db50110e68f370cd27f7a4baddbd173634ee702a626b7f9663ea6471c038e36609ea58a2e68292eed218cf3d688f7f
 MISC metadata.xml 754 BLAKE2B b6d00fe0747da15445953a29abdd6f14112d02f2162746992f2fca80a321cd10f3cad40294e4bdbcf3f04d432b4d81902667296a0a5b8f99da2df2a5c58b18c1 SHA512 fbadbb7e5edd1573994cfc843e4a254ae5d12be5a3372f4fb061647983e360c2b0ea4a9e41ea8c9ff26028db75ad9cd5de881b8fdd9bf35864442e215aa42175
diff --git a/dev-python/plumbum/plumbum-1.7.2-r1.ebuild b/dev-python/plumbum/plumbum-1.7.2-r1.ebuild
index 6a5214728397..1e6e36a83392 100644
--- a/dev-python/plumbum/plumbum-1.7.2-r1.ebuild
+++ b/dev-python/plumbum/plumbum-1.7.2-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/plumbum/plumbum-1.7.2.ebuild b/dev-python/plumbum/plumbum-1.7.2.ebuild
deleted file mode 100644
index 1c7d193c0d43..000000000000
--- a/dev-python/plumbum/plumbum-1.7.2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1 optfeature
-
-DESCRIPTION="A library for shell script-like programs in python"
-HOMEPAGE="https://plumbum.readthedocs.io/en/latest/ https://github.com/tomerfiliba/plumbum"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-BDEPEND="
-	test? (
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# Need sshd running
-	tests/test_remote.py
-	tests/test_utils.py
-	# Windows specific
-	tests/test_putty.py
-	# Needs sudo without password
-	tests/test_sudo.py
-	# Wrong assumptions about env handling
-	tests/test_env.py::TestEnv::test_change_env
-	tests/test_env.py::TestEnv::test_dictlike
-	tests/test_local.py::TestLocalPath::test_iterdir
-)
-
-src_prepare() {
-	sed -e '/addopts/d' -i setup.cfg || die
-	distutils-r1_src_prepare
-}
-
-pkg_postinst() {
-	optfeature "remote commands via ssh" dev-python/paramiko
-	optfeature "progress bars in jupyter" dev-python/ipywidgets
-	optfeature "colored output in jupyter" dev-python/ipython
-	optfeature "images on the command line" dev-python/pillow
-}
diff --git a/dev-python/pony/Manifest b/dev-python/pony/Manifest
index c0a874e5ed13..733dd4eb5f82 100644
--- a/dev-python/pony/Manifest
+++ b/dev-python/pony/Manifest
@@ -1,3 +1,3 @@
 DIST pony-0.7.16.gh.tar.gz 268683 BLAKE2B bee6447116f215cd586e69f29fea37ba3f9953d0a72b28acf612da2d6e1be07e424b704593e42ae1755e898580aaf4f2e61923ff81e6e58fe0cc8ec04a3b8399 SHA512 db9bb06f0e718866eb6f137d5650a2b484119c42f1ade83a7bc1c9e3c27a852ed25e451a226a80bebd050ca3217c0993e59f3b66719a3fe41a98e45349172495
-EBUILD pony-0.7.16.ebuild 589 BLAKE2B bd89982597cd17805538f425ff5e55bdd096226140629e1de19b67568a640c59279b7379413777dd457400ecabef65b21c807c7a12bbd391157d67f71835a635 SHA512 905d473127a98bdd2697b3a83bfa8720c00aed18a582c0cb501327cf3b2ccc9c1d953d4e7352871c02080c236ea2b4c6218beb749305ca234ae34124d0dbd36e
+EBUILD pony-0.7.16.ebuild 596 BLAKE2B 5aefdfd05543d74e31bc26a34a37bb977b1cdbc57d37aa4ed4dcb7d8c0722df46e915eea474d71824d8f21e50080610ca018a55012674799890a88ee2e7c4723 SHA512 a895dde2b3d93df2321765a7c16387d6a42a821d5bbb3ac3d52a89b0e8c2912e9fbcb416684191044326f4425b615d9967c2fb8c8bf23b6d1ca35dcd5aa8379f
 MISC metadata.xml 310 BLAKE2B ed4d2ed3e7c512043c05677c507475616cd70192c0f9360f57e7c3bf35ebfe739a8fe51d6027abf10b1027891c9f13aabcc85a2e7808a6f065b79a72c17541ea SHA512 8379f9a411ed18e95da3caf48ba6e5e4d6f86003e5b633f3393e2fe82d4b8c0afa1a77202f637f1144ff0eb07fea115542f346f360bf853697f3559fd26b4333
diff --git a/dev-python/pony/pony-0.7.16.ebuild b/dev-python/pony/pony-0.7.16.ebuild
index 68f54e9d7234..9740d4224f24 100644
--- a/dev-python/pony/pony-0.7.16.ebuild
+++ b/dev-python/pony/pony-0.7.16.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~riscv x86"
 
 RDEPEND="dev-python/flask[${PYTHON_USEDEP}]"
 BDEPEND="test? ( $(python_gen_impl_dep sqlite) )"
diff --git a/dev-python/prometheus_client/Manifest b/dev-python/prometheus_client/Manifest
index c7563ca654fb..f964058a7b15 100644
--- a/dev-python/prometheus_client/Manifest
+++ b/dev-python/prometheus_client/Manifest
@@ -1,3 +1,5 @@
 DIST prometheus_client-0.13.1.gh.tar.gz 73480 BLAKE2B 53b2572373024a452731c055fc115ddb3c029b905d455cf9dc6289af91866c13187e58008770aa20969b371cd0852ef20651603e153195fb4658d21a628df5a3 SHA512 8d5263ff00fc4797fa65a446bdab4dc3c717cc091f8cee571fdd2130febc480cc61e73e11145ac2bf9bc0eee132efc92d88a4d4facd61d515234748791a92255
+DIST prometheus_client-0.14.0.gh.tar.gz 76115 BLAKE2B 08cffa53fd97be8ee48e91b69f1091ac52179fb48f2001aea23755e0ffd2e09cb34d97f052b0f38762bbe1f6597aed9bc630cda393bf5cd2f723dcb939f2471a SHA512 6543756b7fcd4b4a1734397c3fc25b14e00c9910133afc89f9836591e554c73a4a9fa4f3bc14b4fca2c922b6c160c769a4da435b337d0709f1884bde67008f7e
 EBUILD prometheus_client-0.13.1.ebuild 687 BLAKE2B 6bb446d51b21afa54359a1d7fb33fbaa24f6c7cb07a31469a5a74f95d88d417030eadc15f11f4d0ec582391e0533aa7eb228390958923567a923b8ed66178b18 SHA512 ae10aa9cc3709809c870f582886bd0a4adac727310d42c31d3f8dfb3b58cfb3e52fc81d2f1a1155d24b2d1eabee987641b5c56c777f00ecb40153ce93743baa4
+EBUILD prometheus_client-0.14.0.ebuild 703 BLAKE2B 5c819aee2d211899f68327db5959bc8a5fc7f011c8ce98350945a6dbe0574cdb4ae664e99d825f4ec69f756cf64ae47b100d98e4a2f5f974580c58de0724c9d7 SHA512 27ce6b1a88910d59051f8b9d9eaba723f2d8076666f386d9dee1070aac26995a1b9b7adff0687a24a327f73b59e786ce8451bf93574e0161a23b927887e65221
 MISC metadata.xml 409 BLAKE2B 900f1046ec87679dabe88792bfea55cdf6dbbc1f332260e5487628530a1e5b2e07a1b5776313c484ed2355c205dea165547628297da3fd3e0d9e7c352f4f7a54 SHA512 beee1bb3823aa235e8c2667b18157254335777dbf1169beaee54190d41819dd0e82c58a8ea09c4981740370d7e5463ce11d327e02bf411093dfb653a557077ff
diff --git a/dev-python/prometheus_client/prometheus_client-0.14.0.ebuild b/dev-python/prometheus_client/prometheus_client-0.14.0.ebuild
new file mode 100644
index 000000000000..4c182f58d21a
--- /dev/null
+++ b/dev-python/prometheus_client/prometheus_client-0.14.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python client for the Prometheus monitoring system"
+HOMEPAGE="
+	https://pypi.org/project/prometheus-client/
+	https://github.com/prometheus/client_python/
+"
+SRC_URI="
+	https://github.com/prometheus/client_python/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S="${WORKDIR}/client_python-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/twisted[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/prompt_toolkit/Manifest b/dev-python/prompt_toolkit/Manifest
index 18ba6e41f10b..a52d099f6c1a 100644
--- a/dev-python/prompt_toolkit/Manifest
+++ b/dev-python/prompt_toolkit/Manifest
@@ -1,3 +1,5 @@
 DIST prompt_toolkit-3.0.28.tar.gz 3057388 BLAKE2B 87e5723f0c28a60e0241d051746c3e1124cb0e95bfcfead5da3594b89da3e190a139c0fda2597b3c435e3c3cae9bde8e75c16745faaad624d7c10c698eeb2c95 SHA512 143771bbb96ca761ba1e47dbe22b532081f39a6769935d90e320217f8566b15be5407aba5e7ff48d9e3e71782c9c9604536b0284c6e322179101adecbedd5ee5
+DIST prompt_toolkit-3.0.29.tar.gz 417831 BLAKE2B f46ff507c991f6bf9536f0161cc79734013c53dddd9053076a8da7532233138fd179c6adb009af575329b3a78ab5bf6ef34e3d8eba1f5cf80cca951a32cfcc04 SHA512 a0d1562fe4ced52972ca7ee3bc9fe158865461b28be393436651f326cf2ddf0553d49ac8051ed700ef95d3ce2a76b9fcc10d92b6890203aca4e27e050cb814c0
 EBUILD prompt_toolkit-3.0.28.ebuild 620 BLAKE2B 196ebaa518a101177bfb21a23009c4f66373bbf3afafe7e3bae37284d9f4564b7335ea30991d604d58f97eb16c0c517bb68ba64461354ee37847727c76554eef SHA512 f28f390e9c893e0b5e0a6ae9ae04f674a2f473d22c16a8f9929ca526fc49f55b99b754ad7a17bfe5286ea8dd35bdabd129fa4d604452ec3f45ab179e014d1c25
+EBUILD prompt_toolkit-3.0.29.ebuild 632 BLAKE2B c3f562e980e285d304e959c71daeb78aed088c1a7c56708ddf14e1952ea310cc1c34a18872f22898249c4e375151d98d9119852c31ce4539d2ff942750396d1e SHA512 06853f9a25d50f98f7177cd571433989ebce7b5366a1643dd755a086623f73aa0325f6b007c75430f3c6e45302b168976ec6d4809474acb41167e2ec0f22cfe6
 MISC metadata.xml 431 BLAKE2B 534336484c65b57df5e672729ff722b67445948e0485c3a62c2f7081724cb951b5157c600dc6162a3bb857c2be0f378b18670786279ff8b5cff2858588f8ebc9 SHA512 a9bf68326839069c61e70d4ef3fe304706f2543b9b91eb291566dd66f36d1abec00382ae205549a35f10dfc730f4613c5cc5c0ee4d6858538d50c4145bd3b15e
diff --git a/dev-python/prompt_toolkit/prompt_toolkit-3.0.29.ebuild b/dev-python/prompt_toolkit/prompt_toolkit-3.0.29.ebuild
new file mode 100644
index 000000000000..f768088b0976
--- /dev/null
+++ b/dev-python/prompt_toolkit/prompt_toolkit-3.0.29.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Building powerful interactive command lines in Python"
+HOMEPAGE="
+	https://pypi.org/project/prompt-toolkit/
+	https://github.com/prompt-toolkit/python-prompt-toolkit
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/wcwidth[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/protobuf-python/Manifest b/dev-python/protobuf-python/Manifest
index 3d071ebe02bc..eeee626c72ee 100644
--- a/dev-python/protobuf-python/Manifest
+++ b/dev-python/protobuf-python/Manifest
@@ -2,7 +2,7 @@ AUX protobuf-python-3.19.0-google.protobuf.pyext._message.PyUnknownFieldRef.patc
 AUX protobuf-python-3.19.1-google.protobuf.pyext._message.PyUnknownFieldRef.patch 883 BLAKE2B 94a9a2b41aca33be4439d7f1ad951d66126c42b04a36da0bcba40032377573ff6fc6cff6dd222b6921357ef1a4dffeee8131d124b3ce7f6322b6a8579eeeba97 SHA512 2641531a4c57f5a9f12f536a4a9418776f791062bab6802b19ab212c0dcc6dec3276ed94cbdbf73c2893fbcd4082df4740e09620a7e0db5f79ef4535dde88fb7
 DIST protobuf-3.19.1.tar.gz 5291573 BLAKE2B a34f1a7cf99ecb6cb8a26bc858de6273bfd26aa9be1e89e48c16cb5df0f1e9576479344c8250017238dbac0d0c4ac33001125b5fc622cb64ed6b91023198b03a SHA512 f1271f5159a7be363a5f60ce4921dfea68a8468d66808330bacaeaa1cb7f652d045ab080b5d82816a6fd4e6d7d7fe79aaa6c8d66d81692721d36ce3bbf619f31
 DIST protobuf-3.19.3.tar.gz 5293258 BLAKE2B c05b70ffca97f7166ea6a511a36907eed125edf1ebf17f908718221d9b851be84dfb2b1b39973f2faf35f6ade630e6ba4f9e8b91b8fbc922c5db97079323ee6e SHA512 1c003e7cbc8eae6a038f46e688b401ee202ba47f502561e909df79770f6e8b7daf3dc1ccc727e31bfb5b52cd04cb4fef7d2d2a28d650c13f396872ad4aa076c6
-EBUILD protobuf-python-3.19.1.ebuild 1317 BLAKE2B 0a2241fc51156c87406a4cca000cfae417a2dd9117544baa9583967691161b1ebab2eed47f626e1f20e022ab9181ad31aab8ae5c99857cc2457e93e7fa44b7b9 SHA512 91495148d7a72eaff5b23b86d5200d693998083e3c495a698cba4840d3b7850aea8bbf3648072c6a54ef6dbe57c3a94e5a5658cd53774e53f8b030d352193723
-EBUILD protobuf-python-3.19.3.ebuild 1559 BLAKE2B e649f87236a997a83491c6d1032b5dfa490b44b2e573900ca741db96a57c7d10dc5a3406b33691c37b2d9bdfefafbd132e96455133f5baf67c1cda76a59b9b49 SHA512 4c518b64fbef48f2c176470282bafb5b812c0ad221846e44ed21d42408ccf59aaf6d519326358b592d8c858163cb584605ac49d9dab8b69ceae1da0def08d226
+EBUILD protobuf-python-3.19.1.ebuild 1316 BLAKE2B bbe5716cf480132506b3764849c1f89b00e5fe55c20ee526068989d35b581e1897eb3d67807fd6502590baff044e341630d6e185c630a7622616bdcda5687486 SHA512 47c81eda428c26a326618082aafe22b86e2f9efe8a81efbf78a03bfd874bcc4ed6d53c75332d4b82b82d14440d533143f6ca95a1e98f2bdb032a60eff0a6e806
+EBUILD protobuf-python-3.19.3.ebuild 1558 BLAKE2B c518816f05766547a6a6d51d8e63998316bd8a1b06168e2174526b7068fa0c8d77f86fadad614917ea451c93038428f2a85fa6b3fb2148c19cd357216f682bae SHA512 29a8e3b48a88578af46c3fcfd2e9402100ca04b30c5e850e986ff14e924619a3f865fa84c17d44536389979328b1299e28bd3a605481fa88ba534cd6586b64f8
 EBUILD protobuf-python-9999.ebuild 1361 BLAKE2B 3eff9b195b3b375f4208a634c70bc900b12af2563aba12248c288e463ca9e35246ea88c2303cd0e3f08e18a21bd8800fdc9e4456cde35d3934bce9c384eca685 SHA512 60996706e6895fe4e1cb107f4d2e506bd0d3a026a84466ae6a3a2d28beeb6d03001274e8e02f304b490d93d442f2c74bf3383c42a5d66c88341cd7223081477f
 MISC metadata.xml 548 BLAKE2B 2468487e12d536d67daebf5b7a21cd63a9c4af321a8979132e63d9b8394bf577e347f891326c73bfa6907e82ca355ea0d4ec40a37bb297db0da1e55a62b6ef33 SHA512 c0c2556fbf8821f3a75ed344daa59b4fc355029f96efb8f9784f54c819916adeb46b2c5d8c2e8d405dc58395c2f18b30cda69c6d406948a066bd1d78a55df80b
diff --git a/dev-python/protobuf-python/protobuf-python-3.19.1.ebuild b/dev-python/protobuf-python/protobuf-python-3.19.1.ebuild
index b940f8d7436e..3e158f4d10aa 100644
--- a/dev-python/protobuf-python/protobuf-python-3.19.1.ebuild
+++ b/dev-python/protobuf-python/protobuf-python-3.19.1.ebuild
@@ -23,7 +23,7 @@ HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/pro
 
 LICENSE="BSD"
 SLOT="0/30"
-KEYWORDS="~alpha amd64 arm ~arm64 -hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 -hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 BDEPEND="${PYTHON_DEPS}
 	~dev-libs/protobuf-${PV}
diff --git a/dev-python/protobuf-python/protobuf-python-3.19.3.ebuild b/dev-python/protobuf-python/protobuf-python-3.19.3.ebuild
index bd84f9bac0d7..01d4fc29d612 100644
--- a/dev-python/protobuf-python/protobuf-python-3.19.3.ebuild
+++ b/dev-python/protobuf-python/protobuf-python-3.19.3.ebuild
@@ -23,7 +23,7 @@ fi
 
 LICENSE="BSD"
 SLOT="0/30"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE=""
 
 BDEPEND="${PYTHON_DEPS}
diff --git a/dev-python/psutil/Manifest b/dev-python/psutil/Manifest
index 578f4d6d83c1..2b559d6bd2a1 100644
--- a/dev-python/psutil/Manifest
+++ b/dev-python/psutil/Manifest
@@ -3,5 +3,5 @@ AUX psutil-5.9.0-tests.patch 8186 BLAKE2B d94b5fb91bbe0f05d5452a95aa855d9c3fd50b
 DIST psutil-5.7.3.tar.gz 465556 BLAKE2B 6a9f31fcba571f381c1f4c904a9ff65659d13ed64e91df478aa7df4dabb87a35c4fbd9c0491a3d10b9eaf0fdcc8f2407fcf7144e729043eda605dfe6e6f93844 SHA512 8fcff56dd4e4c1b877c09023721e6f562424f7f84ae5304d518976a1e7f21dd026772f1abfc063bdd0857a375bc869f42febde090dc0b65918d1ebf44e3ad71d
 DIST psutil-5.9.0.tar.gz 478322 BLAKE2B 763c8ae14ae546bed64a360047d2ce38783e9e7e939160f751c4ccc94b8e023aaa4cdca426f584e05dae8b1326333660e216d7cb3edd820e24a931dddfa5160f SHA512 b521cfce51e90fdf87ba19bf8069877e3210aede92c17460ea0b00324a36e133168e4bff550462d07ab6d93c597c6560d68954340031ff43168d54a8e5d4c4e7
 EBUILD psutil-5.7.3.ebuild 1159 BLAKE2B 4fa7f8b093a37f710ce13ef630afa8086774d7a2b01bafd38c73f423480bf44ac8bffcaae38af7f2ffb5e7e4115d1703adabeeba3de454f5fe420b9cac404928 SHA512 6303bce4bfeab4a1aded7dc91ef498a4beb4a92d48484421c650f92909d29964bd63e105f6ba96621ad9e80b79c87b5cc77f32bae9a268e71bf5b72dda738a70
-EBUILD psutil-5.9.0.ebuild 1274 BLAKE2B 530351df4a3f5cae2bc9e74fc6737b10929f9a4a635cbc18c97882b5525249b5d4f3d23760b86de0b43c3f626f90beef49053b7a561ef908561f746b63c4aa72 SHA512 cbc0ba759e5354427c668f9dcbee882404d12e171803f6014a535f0a402a0dce7b044df0c45ed23bba79dd236422fa01ce4d4faf68b148b20f006aa170c10d13
+EBUILD psutil-5.9.0.ebuild 1270 BLAKE2B d34d9682e7ccf7e19412752051a4ac7f87e31009589f72c043be9733ae90c6763f5fbaf5da2da8ead14bde3f49dcb64e26e388c3b4c09a2c54d4487390b1de6a SHA512 a4392f2517443b52d23bd2aacc7ef4be3c53ad17334b27b4333a6168939b1377b40cb3137662ea30033edd4197527a06add8db45308d03dcae6437792ac3e6c4
 MISC metadata.xml 378 BLAKE2B 235c056a427ab18383c401143074ec62b91d471087c34e2bd48d5192c6221e089e32170d18cd0d69d51eb2bb02fb8a0efe59245af9224b284557812b32c341b5 SHA512 96492308dac753fb176e4810efa71757e66413d16589e52a942b02c91256b48f9873b53a698006923aef12aa7d1539d6fd7aa07632c073b6a92cc8920f6ce6c0
diff --git a/dev-python/psutil/psutil-5.9.0.ebuild b/dev-python/psutil/psutil-5.9.0.ebuild
index 00a12bc0d760..729fee6b6dc2 100644
--- a/dev-python/psutil/psutil-5.9.0.ebuild
+++ b/dev-python/psutil/psutil-5.9.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/py-amqp/Manifest b/dev-python/py-amqp/Manifest
index 70650e7fae78..d52cd9b37122 100644
--- a/dev-python/py-amqp/Manifest
+++ b/dev-python/py-amqp/Manifest
@@ -1,6 +1,3 @@
-DIST amqp-5.0.9.tar.gz 127478 BLAKE2B f4e23c43ad66cf88e076e9542d8825daac9ad3cf93ca954fe0f1baf3648bfc00afa0002b86d73a95936fad7c859b0a75ee2996cc0d19c6bfcd3ec556e0c1eab3 SHA512 b94bf176e816b1dad4bbc2891a5324f7eb8e27fd475c34a01e6f39d27caf66447cfceab6a3cb3538fd1b610a250eed1423682deef4a174fdd201e0b3a7368bc9
 DIST amqp-5.1.0.tar.gz 128629 BLAKE2B 8fe0b07233fce04b84b46e0ab4da1badf2de8a2ac53494dbb33b246d149ccec728de42c4f9f7d40752701a8e02851805456d8d54c2e519bbbfdbbb1274edf124 SHA512 9f4f3fd4cea6c214ff03a80a9aec7c5bff65a964ff1e77fbc937f1b6daf45f7b06be0b0873b2998afc3de22b4693a3327f0b439f70a4496060997b9f1aa73331
-EBUILD py-amqp-5.0.9-r1.ebuild 1172 BLAKE2B 9c2e6894e4ec7afb444a8573103b0aad4d9b8b3ac3fc56e860b62bc2816c00134bd2eea04d8372c61bb290abf28e5fe48894e0ee49ba50cb834ca53f6534d689 SHA512 5c8994f652a6afa29c8918fb442796304361210b634afd7692e8279a44d242100832942c75820819c2a1c1cb0761a084b451f8b0b1ad618ace21eceabee2b6b4
-EBUILD py-amqp-5.0.9.ebuild 1137 BLAKE2B b9d0049187d067af40405204549dd446b31e680f967116cec120af0b608dd36a09a31d095cadb6a7658a658def2ce32b15e58b2202d49a22f40baa586742cbf0 SHA512 1c35351dd0b9df3faf915c25b6c2078cce87f2b38ce58affa7deb04828b522f18add8f1f8df71fe208e7a456d1a0ea6a8ea764a2350d5ffb2b95d0f38f4f24aa
-EBUILD py-amqp-5.1.0.ebuild 1175 BLAKE2B 326bea2c919ec5b19f3b3cd5408544d37c8d85824f297f07c59335ce4793fc9392676fba914485f2e6e34eaf02a5e9cf4a76540e51f1ae3708bbeefa4ea65b88 SHA512 2adb31fd982366b81ddf932bd2bab3b12913e6564f4537bf0a2f1b50ade0a85bf82b5fa1ed0e8378b94aec2639d7186aa640a793253a54c5bdcca0d04815fe7f
+EBUILD py-amqp-5.1.0.ebuild 1173 BLAKE2B 57ffcc4a2cfdaa50524687f0dae4326ea0c6da60e996b9dd1ecb9fdf438d9533b71456f95d2e2e2a285f90ae775181fe743e93d3245e71aa5fe4f5019e800804 SHA512 ea8523316837c7c580cdd2f4e3f5abb50cd061257131287fe09f1410f1d6229a8a3f804b94d9c9f74e8a5c1b6d1d63c6b9dcdc2da224939bbd16e11dd190deaf
 MISC metadata.xml 505 BLAKE2B edee860b2641c1f220cca3efcf400391018389615234d72cf2a48e499c410608ddb664d65c7a3aba925b882bab96ba7b4f0c1173e28c385fe0a73b377e950af9 SHA512 b9b969cfcdc38791dec5c54ce96dcddc2eaf29bd023dc6a7c8e2f95dd00ece57abf02bf7d9e0179eb5716a20a041c2216dda94904e5d0a73007e775c14149552
diff --git a/dev-python/py-amqp/py-amqp-5.0.9-r1.ebuild b/dev-python/py-amqp/py-amqp-5.0.9-r1.ebuild
deleted file mode 100644
index 50a5621b9a9c..000000000000
--- a/dev-python/py-amqp/py-amqp-5.0.9-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-MY_P="amqp-${PV}"
-DESCRIPTION="Low-level AMQP client for Python (fork of amqplib)"
-HOMEPAGE="https://github.com/celery/py-amqp https://pypi.org/project/amqp/"
-SRC_URI="mirror://pypi/${MY_P:0:1}/amqp/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="extras"
-
-BDEPEND="
-	>=dev-python/vine-5.0.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/case-1.3.1[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		>=dev-python/pytest-rerunfailures-6.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs dev-python/sphinx_celery
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	# rmq tests require a rabbitmq instance
-	t/integration/test_rmq.py
-)
-
-EPYTEST_DESELECT=(
-	# fails when gssapi is installed (how does that test make sense?!)
-	t/unit/test_sasl.py::test_SASL::test_gssapi_missing
-)
-
-python_install_all() {
-	if use extras; then
-		insinto /usr/share/${PF}/extras
-		doins -r extra
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/py-amqp/py-amqp-5.0.9.ebuild b/dev-python/py-amqp/py-amqp-5.0.9.ebuild
deleted file mode 100644
index 6b40a30bd15d..000000000000
--- a/dev-python/py-amqp/py-amqp-5.0.9.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-MY_P="amqp-${PV}"
-DESCRIPTION="Low-level AMQP client for Python (fork of amqplib)"
-HOMEPAGE="https://github.com/celery/py-amqp https://pypi.org/project/amqp/"
-SRC_URI="mirror://pypi/${MY_P:0:1}/amqp/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="extras"
-
-BDEPEND="
-	>=dev-python/vine-5.0.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/case-1.3.1[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		>=dev-python/pytest-rerunfailures-6.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs dev-python/sphinx_celery
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	# rmq tests require a rabbitmq instance
-	t/integration/test_rmq.py
-)
-
-EPYTEST_DESELECT=(
-	# fails when gssapi is installed (how does that test make sense?!)
-	t/unit/test_sasl.py::test_SASL::test_gssapi_missing
-)
-
-python_install_all() {
-	if use extras; then
-		insinto /usr/share/${PF}/extras
-		doins -r extra
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/py-amqp/py-amqp-5.1.0.ebuild b/dev-python/py-amqp/py-amqp-5.1.0.ebuild
index fa1bdc3c1c25..0492c0df1c89 100644
--- a/dev-python/py-amqp/py-amqp-5.1.0.ebuild
+++ b/dev-python/py-amqp/py-amqp-5.1.0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="extras"
 
 BDEPEND="
diff --git a/dev-python/pyDes/Manifest b/dev-python/pyDes/Manifest
new file mode 100644
index 000000000000..0c5bf895aadc
--- /dev/null
+++ b/dev-python/pyDes/Manifest
@@ -0,0 +1,3 @@
+DIST pyDes-2.0.1.tar.gz 9878 BLAKE2B 45a2d0575519afc389abe080f2c3a6751c5ee1f973e9e4370f24c5dbf9d85882e875682005eae3d749a2e11bffc3cd46868f83baa58f9e7e4feb7a25db641a14 SHA512 9d2a048dd6f629713d93d5cfcf5eaccb45a28fd3942f6837baf492bc6d9f0fcd16a1611e467231e9abfa6756d1684b0848c2190195e9e772bed2e6574327885c
+EBUILD pyDes-2.0.1.ebuild 410 BLAKE2B a46713dcf80199358c91069fe810cee071574f60242cd91dc190f678b191e7abcdef51e51d5a516020529fa52f68a3aad43856402c0f81d1c4a6aeaf366c8647 SHA512 6c085f5b156fc2c6549567fd52a8aa0a31f463718941c3ea6d6b9423a73cf97cb47e42f3153dbf466437ddc541a807e187b231c112dc7ccfbd58fed0cf336c31
+MISC metadata.xml 401 BLAKE2B d2e507ac1fbff3f6f0f61baceb9baba2b2d40e7400a1a892f2a230ba09f243236fb2d9efb619d43a8667736a1df822c31fbf00d26361636b8b0765b07329faa5 SHA512 b9dd93cbf9f77d53a9a51f96d0c0aaec3ba3d83db52e66f0e65bf075f02fc9b8593cf595f2710924203f64f70bdb4dc5143d1fb40ca6c2fc4f9f37adf3c3c555
diff --git a/dev-python/pyDes/metadata.xml b/dev-python/pyDes/metadata.xml
new file mode 100644
index 000000000000..3f3432b413f8
--- /dev/null
+++ b/dev-python/pyDes/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+  <maintainer type="person">
+    <email>xgqt@gentoo.org</email>
+    <name>Maciej Barć</name>
+  </maintainer>
+  <upstream>
+    <bugs-to>https://github.com/twhiteman/pyDes/issues/</bugs-to>
+    <remote-id type="github">twhiteman/pyDes</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/phonenumbers/phonenumbers-8.12.43.ebuild b/dev-python/pyDes/pyDes-2.0.1.ebuild
index 9c3b78fd4c38..2668e53c17dd 100644
--- a/dev-python/phonenumbers/phonenumbers-8.12.43.ebuild
+++ b/dev-python/pyDes/pyDes-2.0.1.ebuild
@@ -8,14 +8,10 @@ PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
-DESCRIPTION="Python port of Google's libphonenumber"
-HOMEPAGE="https://github.com/daviddrysdale/python-phonenumbers"
+DESCRIPTION="Python implementation of DES and TRIPLE DES"
+HOMEPAGE="https://twhiteman.netfirms.com/des.html"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-LICENSE="Apache-2.0"
+LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 x86"
-
-DOCS=( README.md )
-
-distutils_enable_tests setup.py
+KEYWORDS="~amd64 ~x86"
diff --git a/dev-python/pyFFTW/Manifest b/dev-python/pyFFTW/Manifest
index f7af749ccb94..5c9a86340b06 100644
--- a/dev-python/pyFFTW/Manifest
+++ b/dev-python/pyFFTW/Manifest
@@ -1,6 +1,4 @@
-DIST pyFFTW-0.12.0.tar.gz 147372 BLAKE2B 1ea1f1f8de6759c42781a535b30d7119c0cb02dffea3abfe4130a97c465e000aa9b3064a219718569552304513a77ac51aa309f1be29f9eecae25c63cce70c6c SHA512 e4d7258d5c053b5367d8c4f1892eba8e595f9d540c1c3e6caf61e0c113d598ba872b5e72a21edace66be70d9ad75c599e4b1fbc692e0015c3c1ae35e9a7ba599
 DIST pyFFTW-0.13.0.tar.gz 158660 BLAKE2B c54096f0814625d49832094a6d823c6d258801a0831b07846993da97a713238a5df5b59beddc38b7e940685403178b2f3100f5713334fc9861757420bc87303a SHA512 1d4c69cc19dd00f2433037f25ea90335544403b542c0c5ca00cb055e0fde076ec9e00990f02da2385466be171ed8c910a5ce06a7cfa5efbc6544b2383bbce599
-EBUILD pyFFTW-0.12.0-r1.ebuild 898 BLAKE2B 036d3ce450d070ba141eef9a14b6a370fd3d4a49f12fda27b53e08ff5f492a22071f8ed5555ba4e50b02138da7c40e3f58cfc37392896391d8fbff6e9c787722 SHA512 c9a5a7296d07d6b9fbebdafc868ec4ae987d671dda45d568d7564d66829e6f3de7b234d045e938a268a850ed31761a041171f2077ed9d40715ad5c645cf2c584
 EBUILD pyFFTW-0.13.0.ebuild 932 BLAKE2B eb8d1dc786c8ddec960824a495b7495a1fbd3c14d495546156eed8de0105f055e231cb231aea105b403bbfc0c42343855e8b57bf83747d2e458d6dc5500bf16f SHA512 dcdea264e5c14a2da73c4dcccd444970b0ca9249bad11f9071ad89eef4c49285de8402232eb71e218e0644d3e0ee7051d9db5510fcd0d567761f94b27c45516e
 EBUILD pyFFTW-9999.ebuild 932 BLAKE2B eb8d1dc786c8ddec960824a495b7495a1fbd3c14d495546156eed8de0105f055e231cb231aea105b403bbfc0c42343855e8b57bf83747d2e458d6dc5500bf16f SHA512 dcdea264e5c14a2da73c4dcccd444970b0ca9249bad11f9071ad89eef4c49285de8402232eb71e218e0644d3e0ee7051d9db5510fcd0d567761f94b27c45516e
 MISC metadata.xml 469 BLAKE2B f5f6504ccb53aaf8fb993ea0fd780430f54d8500762ababa8992b22a3b20c3511a8b4d581e4ec7c90ad6593c355ddcca36f2b66d5f1aada806514fab272207c7 SHA512 b2dcfff7de1c959732800e56377e74a23fff5d1d7b6a818d720845be576a9640865a329d99599fbc95fb1b853550760769ce7df0ebac33082b7468419c93a80c
diff --git a/dev-python/pyFFTW/pyFFTW-0.12.0-r1.ebuild b/dev-python/pyFFTW/pyFFTW-0.12.0-r1.ebuild
deleted file mode 100644
index 8ec87a34fe67..000000000000
--- a/dev-python/pyFFTW/pyFFTW-0.12.0-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..9} )
-inherit distutils-r1
-
-DESCRIPTION="A pythonic python wrapper around FFTW"
-HOMEPAGE="https://github.com/pyFFTW/pyFFTW"
-
-LICENSE="BSD"
-SLOT="0"
-if [[ "${PV}" = "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/pyFFTW/pyFFTW.git"
-else
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/pyFFTW/pyFFTW/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-DEPEND="
-	dev-python/numpy[${PYTHON_USEDEP}]
-	>=sci-libs/fftw-3.3:3.0=[threads]
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-	test? (
-		dev-python/dask[${PYTHON_USEDEP}]
-		dev-python/scipy[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-python_test() {
-	cp -r -l -n test/ "${BUILD_DIR}/lib" || die
-	cd "${BUILD_DIR}/lib" || die
-	eunittest
-	rm -r test/ || die
-}
diff --git a/dev-python/pybind11/Manifest b/dev-python/pybind11/Manifest
index fd4970e7882e..a58c32623932 100644
--- a/dev-python/pybind11/Manifest
+++ b/dev-python/pybind11/Manifest
@@ -1,6 +1,6 @@
 AUX pybind11-2.9.1-numpy-1.22.patch 7014 BLAKE2B 1031edbb4985778b791562c499cb85262c2164b3386ceeb7d91f92a9ac61b79d799c3dadddb1fc75d63409aaead5cfeca2d301f37271ded184a10f8f1c49a83e SHA512 815e6b076a149928e91318afbb2d3664d1226be231cec1d35c27fb4f85315884bd58efc18dfd57352b5278673c0a3ca14b1ad5892c5d0a80670b9f76f338e421
-DIST pybind11-2.9.0.tar.gz 698784 BLAKE2B bfbe173d580131e445d759bd9b1a8929ceb9fc357a1ed8873aa8024fb9226a37bb97293dc0189a67ae61a232f3790ca6f635a30d0a0401c867cde98f1010438c SHA512 87184c9e09e1340f2d34786a66560fe77684a3629b517f78321073a1f0dfdb766365d3698dcf6f08e5141b1f4da50ec917e61b36538e5a1ec9fd1b68f29cd396
 DIST pybind11-2.9.1.tar.gz 703882 BLAKE2B cc162332b637f81ea5d3098a2e9882f16a9c889e83e6ccd36d2a2da2f90361d8d188abd559f2313b45ff1de7d9ee56ee198c1193b47829d1fdf6d8871ce35b0c SHA512 1f268cc6df1f572658bfc3e60f7f010bec9b9444d6a6d6c95f7b26f7b4b7dd42846e65ae5a611c01c0341335fdfa84b01272b5c1b2cc11a418f64fecabfa0588
-EBUILD pybind11-2.9.0.ebuild 1079 BLAKE2B c35aef66a8e3213e7e3a017fd00db9f37c5683ff4aef60bc3ac4c5715ae508baf501b424b412bfce3d9fc0b920f3da61f963d59fc6e2a6d305b8c357ab2aec20 SHA512 24b94bf416689f894e3b79172fa803d2367af012a2519de3ea89236abacf6b7aefc36411f27c882832e6616b10ac28136012cca816a9147b7a16b094d02f3ca2
-EBUILD pybind11-2.9.1.ebuild 1187 BLAKE2B 0933f0578e879cde8da9bb2c1a9748cb7638bf5e3758f8894e09ef073ee3a5d8e004e86fe5799962e77663f013e954ca93293cb6de5f6bc27d3f3b3027abf9cb SHA512 e60cb0dd9c382de727ca49281ff8bb30a79914e9a2eab898730a20f6a2d23f4b55c67924cd59c53d23097f90416d65cfa485c37a5b093caa34d6a13d3c648c4b
+DIST pybind11-2.9.2.tar.gz 709521 BLAKE2B 76ae9c72faad805885eabbe4dadf1092fe814f04f2a8d834da035c7389dcc996c09a63149911aa7a5c0b70d2da9f7c32e94aaf1c941f13345e0aef40a5748dfc SHA512 c6c18e5f59873adb3692640ade26472abd257607e7bb9fd48cfd1949878811e83d6ac6eb8c8dd926622d52ca4f13e5e6a58e0abaaaa1fa814ee831ea2b515272
+EBUILD pybind11-2.9.1.ebuild 1186 BLAKE2B 0a6cc7beac716379b93bde15a0362b6945f094930c1375479e9b987415099ec8a2a66dd6d7b8d0384bb3f50fcf8136218199faadd2a52279871b4ee66a842831 SHA512 4c14dafd7cf0ce56efde3d9517a17f084ba52dbb68bf9d641ab7bdf0df04e118b43a80fbb054c70e8bde877f6859406cf4d0a6db8e4e5f0f826fb37dc6fccb7c
+EBUILD pybind11-2.9.2.ebuild 1085 BLAKE2B cd17b2e69554c47ae0721717a87393d7dcae27ff85d2eaf1b637e7fc4b215823b35c3fcd2e61e90dec23d3812e0811748ecd3593f03335cb203585b99b08127b SHA512 383a75b60624c0a5e5c5a3690e6af6f1116e9c936a69e86739aab0c9e78f204a603c6d9bea6e80a842ac8f6ba093b3cb163725659087903a5ed7d5f24bbd0a76
 MISC metadata.xml 420 BLAKE2B 8a3480ac275b7e2893d696bf4fd0d70f41ea941fab9e24b19d8561c0efeee81024ba6fea0ab26333346f3c176d1a87b35229e31ecefc74de2e7614600a64013e SHA512 8140e933878a75968420deab189bab1decd030b5209baada2857a7659dc32980bbc46678c6612ef56e4b4f6b598579bb8227e6c7fd00fbde63a40eb13bccf86c
diff --git a/dev-python/pybind11/pybind11-2.9.1.ebuild b/dev-python/pybind11/pybind11-2.9.1.ebuild
index fa7b38ae4c8f..1db1018861b4 100644
--- a/dev-python/pybind11/pybind11-2.9.1.ebuild
+++ b/dev-python/pybind11/pybind11-2.9.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/pybind/pybind11/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 RDEPEND="
 	dev-cpp/eigen:3
diff --git a/dev-python/pybind11/pybind11-2.9.0.ebuild b/dev-python/pybind11/pybind11-2.9.2.ebuild
index 6dbfed6ba055..485ce7a8a969 100644
--- a/dev-python/pybind11/pybind11-2.9.0.ebuild
+++ b/dev-python/pybind11/pybind11-2.9.2.ebuild
@@ -12,17 +12,22 @@ SRC_URI="https://github.com/pybind/pybind11/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 
 RDEPEND="
 	dev-cpp/eigen:3
 "
+BDEPEND="
+	test? (
+		>=dev-cpp/catch-2.13.5
+		>=dev-libs/boost-1.56
+	)
+"
 
 distutils_enable_tests pytest
 
 python_prepare_all() {
 	export PYBIND11_USE_CMAKE=1
-
 	cmake_src_prepare
 	distutils-r1_python_prepare_all
 }
diff --git a/dev-python/pygal/Manifest b/dev-python/pygal/Manifest
index 3e10d5239e40..d78e228ac9f1 100644
--- a/dev-python/pygal/Manifest
+++ b/dev-python/pygal/Manifest
@@ -1,4 +1,4 @@
 DIST pygal-3.0.0.tar.gz 3575455 BLAKE2B 9b64cf441aeb25b0a0b9834f07e5892fe163f28a5da796d37083f8f3a10d8737a69bad39e503d722e6a36f2de4367b4fd2bdc3a06c5bc30bce66a370690d9c88 SHA512 71ac9f197d711c8cf5bb47caef128754f81b1cb0ba98c4cc67de78b68fca5d40baae9fbb5c978f6abaed4c73b8edfea2de07de2fda1aa7c15e0d81387518cc49
 EBUILD pygal-3.0.0-r1.ebuild 1042 BLAKE2B 9887d6c9360f5ef4d757e8c4e0523db12a688a973ae69bc9f243e911d5e592b7e425da9c79a771194391878a7f85c3741217a278b333144210eb4ecb38935834 SHA512 a85c464b5e2ec3d59a22c608ea62f738ea20259772febdacc502d75df0f7d36cbe6b27ae93a3b23fe420a6ff322134ff73e993376ef6573160cefdac8b19201e
-EBUILD pygal-3.0.0-r2.ebuild 1076 BLAKE2B c98408713c8342726081df60e5aed7832e83f137c0f22100ecbadd572282c974f0c9eea456a815930836b530b9d1210579967d410beb3a0f6b2617a1b9b52056 SHA512 3845f8e5752d9310766217f5c5b5243f9c91c24d04bfb6771980a16ffbac72c14615aad405457c57f5d313738729a930adf24d728652d0de52230948ee0d2e4a
+EBUILD pygal-3.0.0-r2.ebuild 1083 BLAKE2B f88a23309a41877aeb38b47a937d09a5839287fe7d8125d2e72d0196412efe4e3f4183387b7e123a81f2583b6b19c5d5c047c1e8462339202303821b6d50b601 SHA512 a334a0917f0387ad8de39f5a4d5f179a9349dee7e3ab133eaa36af71e059bea5d568ddf8628e3c5b3b199c0987c905a522443c75423e8a3df739bacaed45eeba
 MISC metadata.xml 458 BLAKE2B 70473091a8343d255501ff6d306cbf376b57c42ba842e36a3948649f30ffa3f29ff502254cf265512b024878b8faa7d77b4164b5cf70ae6f851a5d2d51a3997c SHA512 3bcd119c30b25e2f821c10d1b2c58efc109d8049a446acb4960b47ddef18d3c1ed4efc6bb4dc551abbb42f17828c4898acdad3172523b7576a6a548e43a8e8b9
diff --git a/dev-python/pygal/pygal-3.0.0-r2.ebuild b/dev-python/pygal/pygal-3.0.0-r2.ebuild
index 59615d98fba6..8d72c43a0b78 100644
--- a/dev-python/pygal/pygal-3.0.0-r2.ebuild
+++ b/dev-python/pygal/pygal-3.0.0-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/Kozea/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~riscv ~x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/pygame/Manifest b/dev-python/pygame/Manifest
index 364a518dfac8..7a2027954d4e 100644
--- a/dev-python/pygame/Manifest
+++ b/dev-python/pygame/Manifest
@@ -1,4 +1,3 @@
 DIST pygame-2.1.2.gh.tar.gz 6100415 BLAKE2B 4b81c2f0abc2c2c4732ddb8f8e6d4bffa5169e3d3ee2d9ea2798d294623a9c70e2ff004825030606285124ef1347177b46adc676db450785e8420de45f37db34 SHA512 531cb0371853def7a3ddb8eb0110fbd58acaf1b2351d7518402c9a960baca705bb34da879015e7a6cd5f2f8af98c57e7bc732021a8f62ed9f90cacf068c9c2d6
-EBUILD pygame-2.1.2-r1.ebuild 1960 BLAKE2B 4fa5b9e73d3360ab6dad558bbfc7d6e529f72ae79484007e7e642c574f210d52b3b3914e5adeff76139cb51b6da13e52ec7bb5c9c25c4e5c17bbf8eee47316e3 SHA512 d54c61c0d762be8f56b0546554997acf4e960ff0e422e0075a6ffcbe0912f43e6cbb79ed3b31598962890a0a4ad6e1e51b537da9ac0b717922cc8d9669a94f52
-EBUILD pygame-2.1.2.ebuild 1955 BLAKE2B 1c105c7955e03ca34573e6152edbf56affaff1b20aa1d47e68f3ca4ffa94b6d174f17628d41ae759873c8c53f484de349ca608dc6609b5c95d7531506f3916cd SHA512 1fdb5fcc7f0f06e8374af02014f58169f84fdb96dd187852ebbdd9e58e9b65a7d5b0d71c81534c8e842c3df0ee9c5deef32eac2b322237e9e9ee0240b5aa1734
+EBUILD pygame-2.1.2-r1.ebuild 1953 BLAKE2B a05ca22809238a165a2f4243943a046b2edd28820a81cae80c40b3a98c185067b6015e8fefe5b79d2b3a5913aa232ab058efd753578f7d18b029e9d46a5ad927 SHA512 f198608b732ba8a872bd95c85f9d8048fadce97477a606039b45a6889e0616149f1330b791b106ca303565085d22aef4d5b1d99bb4296d0f3db51ede95a8322b
 MISC metadata.xml 462 BLAKE2B 398db1c050bbf14a65ac770e980ca91269277ecb00d94457502532ef7c407145cc2438ead46d370d1195331fd3d2f9602ecbb381c9f178240d031d1c665a9324 SHA512 2e95b731a4cb49372e6af00bb059bd179dc167aaac07f412c51970cf27b0fdddda616fb59bbbd62101c1b6f272cc0263123e334df01ebf6d1697ef8b55b62fef
diff --git a/dev-python/pygame/pygame-2.1.2-r1.ebuild b/dev-python/pygame/pygame-2.1.2-r1.ebuild
index b088b19e215d..c7da382d8d6c 100644
--- a/dev-python/pygame/pygame-2.1.2-r1.ebuild
+++ b/dev-python/pygame/pygame-2.1.2-r1.ebuild
@@ -15,7 +15,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"
 IUSE="examples midi opengl test X"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pygame/pygame-2.1.2.ebuild b/dev-python/pygame/pygame-2.1.2.ebuild
deleted file mode 100644
index 0a8ee188120a..000000000000
--- a/dev-python/pygame/pygame-2.1.2.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2022 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 bindings for SDL multimedia library"
-HOMEPAGE="https://www.pygame.org/"
-SRC_URI="
-	https://github.com/pygame/pygame/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
-IUSE="examples midi opengl test X"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]
-	media-libs/freetype
-	media-libs/libpng:0=
-	>=media-libs/sdl2-image-1.2.2
-	>=media-libs/sdl2-mixer-1.2.4
-	>=media-libs/sdl2-ttf-2.0.6
-	>=media-libs/smpeg2-0.4.4-r1
-	virtual/jpeg
-	midi? ( media-libs/portmidi )
-	X? ( >=media-libs/libsdl2-1.2.5[opengl?,threads,video,X] )
-	!X? ( >=media-libs/libsdl2-1.2.5[threads] )"
-DEPEND="${RDEPEND}
-	test? (
-		media-libs/sdl2-image[gif,jpeg,png,tiff]
-		media-libs/sdl2-mixer[mp3,vorbis,wav]
-	)"
-# fontconfig used for fc-list
-RDEPEND+="
-	media-libs/fontconfig"
-# util-linux provides script
-BDEPEND="
-	test? (
-		media-libs/fontconfig
-		sys-apps/util-linux
-	)"
-
-src_prepare() {
-	if ! use midi; then
-		rm test/midi_test.py || die
-	fi
-	distutils-r1_src_prepare
-}
-
-python_configure() {
-	PORTMIDI_INC_PORTTIME=1 LOCALBASE="${EPREFIX}/usr" \
-		"${EPYTHON}" "${S}"/buildconfig/config.py -auto || die
-
-	# Disable automagic dependency on PortMidi.
-	if ! use midi; then
-		sed -e "s:^pypm :#&:" -i Setup || die "sed failed"
-	fi
-}
-
-python_test() {
-	local -x PYTHONPATH=${BUILD_DIR}/install/lib
-	local -x SDL_VIDEODRIVER=dummy
-	local -x SDL_AUDIODRIVER=disk
-	distutils_install_for_testing --via-root
-	script -eqc "${EPYTHON} -m pygame.tests -v" || die
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	# Bug #497720
-	rm -fr "${D}"$(python_get_sitedir)/pygame/{docs,examples,tests}/ || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	use examples && dodoc -r examples
-}
diff --git a/dev-python/pygresql/Manifest b/dev-python/pygresql/Manifest
index 79286d242b4a..2fa5681989e2 100644
--- a/dev-python/pygresql/Manifest
+++ b/dev-python/pygresql/Manifest
@@ -1,6 +1,8 @@
 AUX pygresql-5.2-CFLAGS.patch 333 BLAKE2B caa18ab6ba4da14437637faf6cea4d27e829c4f547f9c08e33a452b1e5912a24235af823c9ea385bbd1516c0c80a08d3225e373ad64ad4d13873ff4dc5155695 SHA512 ddafaadb4ebfb68af71727f840f36800d3dd78323f8ab0324a16b50498206c8ac33c76a80f24fff7984195ed5ac0fc383bdcacb9ea334f4b47e5046864728cd0
 DIST PyGreSQL-5.2.2.tar.gz 268818 BLAKE2B 4b74c5496f63208164efa10e70222b63512f3afb928bdc612f9874556ee2084b42a80ba05e9ebc6951c68c1c8a70c71320396aabb20b9d5c00d5edd46e287f3f SHA512 a88af2590a515ece19b7f64796e241c6e7b53c8aef90c6e2ae064298a4c71d44695dcf43e0e84595a704c4fdafb9abe35e1779492d3a9ad3708759215cb188a1
 DIST PyGreSQL-5.2.3.tar.gz 269952 BLAKE2B 9588f4e97dcc2b52e070405df3869c50bb9968716f19fa2154b6aa248d015c7b80aa6d2bf12a3bb30a77e4572b96939b5a6a98043fe70c911f80a54e09cb034e SHA512 94fe212801e89a97ccaac0cd72df4a79e28acc0992e855dfc2e8e8fd08750c97d2f2801eef07fdfa8a258061cc63c4aa9e4127852ba58c845414ec2d5e5f1483
+DIST PyGreSQL-5.2.4.tar.gz 270319 BLAKE2B 6ec2bf9786dd97f8649585bd00b87569d2cd668e43e8cc28443126ec2ee00943f044775b756785002c32aef516c4141e126e7d458b232bf8bfa1413bfdbd2db0 SHA512 3dbb90391e0a12f1ce4676dd5fa89d586d33a4bcb710779583beb05ae71131fbcf0412e702b542d856f3fd6ceeb145952c2f7bdede25efd08fe61ffcf0296212
 EBUILD pygresql-5.2.2.ebuild 1181 BLAKE2B 4f3e79479615b2a7380a8c7933913456b91f8f038a7e4574ea1d33e81bac106ac0524d447514e4fe8f036774434cd14c624e3c07aa2068c08b6bc0d484b82e5b SHA512 f083dc3787267513a68f4edf04543e537e4432f0d8a541b33fb864abe1919151f1b4cb79bc1e56513bf5ea8cceb1bbbd7c0f531e6f93b0ca5453b1c6f9584b34
 EBUILD pygresql-5.2.3.ebuild 1216 BLAKE2B dbbb05d4c716da7f9f586dbf86d660df4c83cbf6e44e3c7ac91c89c673762fa4dc5d8b7d3af243b02f6a143d8b1c90521ca969dfd05e0fb3d763aeda4529a8d5 SHA512 0d3aefdcab8c5328e9a138338d6201523f9f8c6b166730ad9d251c95e2550db56551867d17d705b7e45c040e27f05b22022eb9097a417e90ea15520aa0b3e88e
+EBUILD pygresql-5.2.4.ebuild 1216 BLAKE2B dbbb05d4c716da7f9f586dbf86d660df4c83cbf6e44e3c7ac91c89c673762fa4dc5d8b7d3af243b02f6a143d8b1c90521ca969dfd05e0fb3d763aeda4529a8d5 SHA512 0d3aefdcab8c5328e9a138338d6201523f9f8c6b166730ad9d251c95e2550db56551867d17d705b7e45c040e27f05b22022eb9097a417e90ea15520aa0b3e88e
 MISC metadata.xml 510 BLAKE2B cde75458658f9434322620377e1f5b99c9a0aa484e164ab5dcdbee94e4beebe646ff052783984c95245791bb4006545037768928a6e2664e1bb72df5aea49ae7 SHA512 e5750c6fc17dc5368142847318bf1842a17e2f46ac1ef01aa4658ec1c51705c5f160e75018567f83f41b0b4fd226ef019779f406513cc2d5b9e68bf420b51b81
diff --git a/dev-python/pygresql/pygresql-5.2.4.ebuild b/dev-python/pygresql/pygresql-5.2.4.ebuild
new file mode 100644
index 000000000000..b9bd244ac38a
--- /dev/null
+++ b/dev-python/pygresql/pygresql-5.2.4.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_PEP517=setuptools
+POSTGRES_COMPAT=( 9.6 {10..14} )
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1 postgres
+
+MY_P="PyGreSQL-${PV}"
+
+DESCRIPTION="A Python interface for the PostgreSQL database"
+HOMEPAGE="https://pygresql.org/"
+SRC_URI="mirror://pypi/P/PyGreSQL/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="POSTGRESQL"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86"
+
+DEPEND="${POSTGRES_DEP}"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.2-CFLAGS.patch
+)
+
+distutils_enable_tests unittest
+
+src_test() {
+	local db="${T}/pgsql"
+	initdb --username=portage -D "${db}" || die
+	pg_ctl -w -D "${db}" start \
+		-o "-h '127.0.0.1' -p 5432 -k '${T}'" || die
+	psql -h "${T}" -U portage -d postgres \
+		-c "ALTER ROLE portage WITH PASSWORD 'postgres';" || die
+	createdb -h "${T}" -U portage unittest || die
+
+	cat > tests/LOCAL_PyGreSQL.py <<-EOF || die
+		dbhost = '${T}'
+	EOF
+
+	distutils-r1_src_test
+
+	pg_ctl -w -D "${db}" stop || die
+}
+
+python_install_all() {
+	local DOCS=( docs/*.rst docs/community/* docs/contents/tutorial.rst )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pyicu/Manifest b/dev-python/pyicu/Manifest
index c38f7b219aea..9003ef2e99c6 100644
--- a/dev-python/pyicu/Manifest
+++ b/dev-python/pyicu/Manifest
@@ -1,3 +1,3 @@
 DIST pyicu-v2.8.1.tar.bz2 242774 BLAKE2B eeb3c45124301b7072addcbfc3c97521d21fbdb5bdf2b0fe94f0181c225927a0b3bd6ab6271140fa9928d0220e5cb33c800b367cf4b0cf844ad64a2438aa016b SHA512 dc7fb292322c565da045db9d91e9b4cd58a559d6f78bf3f050bf25fbab942179b463b977340e08bbeb107e3a2be8a2eb0a0a91911e0c0b8b96327ba85fd13c46
-EBUILD pyicu-2.8.1.ebuild 662 BLAKE2B 26589c529d608bdafcf731c843d2d1f3b7dae6c2ca5f2f7bd7ec8213ee42013e46d633cd4f5107fcddd4f9fe47297dedb5f9e87e1beffcc5b5e438444a024741 SHA512 3959b8aada85e29867f46c1e1a8bca2cd6d8e4f88982f9aececf357f53552b0afbfbe668eaaccdeef6f8469c2b129ef8e25cc66be221f6b3779bcee06f4cc2c6
+EBUILD pyicu-2.8.1.ebuild 669 BLAKE2B 900d64afbf23856b71df56b9bc381edb87f16a19ed3149531a3b798a05738e2e7ab5a650ea9b4b8e909d6e92e8d5490b101439cac61894202346b0af22e586ca SHA512 6a9d1daf4af8d70c3acd9284017c1284aea9b80b96243bc192ad8486f46d2219c922c608949a9a8d727ff0a070ab63b4e6c817935a852ef79e4ce55501381d8e
 MISC metadata.xml 415 BLAKE2B a96dc033850e25f2afcd4128d38becd7c86263e5bb366a701c88a2bc81118aef03217bbfe0c2ff0719f636104b2a12995815c36f2a3e6539136509c7900c25e4 SHA512 e8d901e2276b0a92ae8e0cdd4b0e1cacd29d9eda86491a31a2057d013b7c4f8c340d0e83dbfd53500906f79a827d837cc7e445c24e6cf5b50ee809ec2c35eb13
diff --git a/dev-python/pyicu/pyicu-2.8.1.ebuild b/dev-python/pyicu/pyicu-2.8.1.ebuild
index 4db1f6f6b820..40b49e45feb8 100644
--- a/dev-python/pyicu/pyicu-2.8.1.ebuild
+++ b/dev-python/pyicu/pyicu-2.8.1.ebuild
@@ -19,7 +19,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~riscv x86"
 
 RDEPEND="dev-libs/icu:="
 DEPEND="${RDEPEND}"
diff --git a/dev-python/pylatex/Manifest b/dev-python/pylatex/Manifest
index b0dad6ea01aa..79f874acfc6e 100644
--- a/dev-python/pylatex/Manifest
+++ b/dev-python/pylatex/Manifest
@@ -1,3 +1,3 @@
 DIST pylatex-1.4.1.tar.gz 301482 BLAKE2B c68c8bbf70c5099b3c3146922afe94dcf4f90bfc8644fa165ee27835f4a24642645f9849f2f9fd69656dc07dcc4807869275aacf33a1e5b9c59e539801f8e821 SHA512 55a5734e4d239cef4bcaafa0ba64eea013ba3e86d137de5a5f8311d70c949d783e2e7aad24d39d16a6febbe4bddc34e47248068e1328fe3f95f39a7c7019a3a9
-EBUILD pylatex-1.4.1.ebuild 1237 BLAKE2B a2a2413d8371e5e176fd5b74de83e42ca5c4346365eb0d4b269cfa90b94fb66107cf93fdb9dd67ee5dabc3b6565e1f88d1d097c244ccc34325d1ec12bce2bcf1 SHA512 bd359f5b8784095fdf4da77bff25d2b7d3e785cb5e934b02e1eb6b494b5555c6e6bcec10df7072d33a72ca9d7364ee8025881d3f4c7089b628f82c1703a8ea9c
+EBUILD pylatex-1.4.1.ebuild 1409 BLAKE2B e699611ab2ecd1383b6cfd2952f115784a6a32f32bcde9ddc0c24027bbf6f85e4ae404d44ba2ec1491ae3c33ae5681cef3a44654511647722b1d78aa265a5a78 SHA512 c78ffb0f982f4f7e7f0471086283033a106cf72e76d8e9fdb6c8a92c60aa89ac7e44b86ca0fada23f33865180aefbe363aa1a3c526843fdbde0e49633574c548
 MISC metadata.xml 773 BLAKE2B 6e83ff33dacabd0cd0d37fc902a0c83bc9d2b88930ef576a8ffa05667883c850fe446633ed1f31db424b22d383e37a2ded031d60e9c2de506067d957a2e9dbdf SHA512 446f83c157525df727f80d94c0ececb8b68d7f9af6821b707b34bfb38a139d040759b9dfa1f4cca426b4dedd55b9844251e2f9a184e7475139ce1a1081c2ccf0
diff --git a/dev-python/pylatex/pylatex-1.4.1.ebuild b/dev-python/pylatex/pylatex-1.4.1.ebuild
index e22369be0021..bb22065092e9 100644
--- a/dev-python/pylatex/pylatex-1.4.1.ebuild
+++ b/dev-python/pylatex/pylatex-1.4.1.ebuild
@@ -1,12 +1,13 @@
-# Copyright 2020-2021 Gentoo Authors
+# Copyright 2020-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 MY_PN="PyLaTeX"
 MY_P="${MY_PN}-${PV}"
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7..10} )
+DISTUTILS_USE_PEP517=setuptools
 
 inherit distutils-r1 optfeature
 
@@ -35,6 +36,12 @@ BDEPEND+="
 		dev-texlive/texlive-latexextra
 	)"
 
+python_prepare_all() {
+	sed -i -e 's:description-file:description_file:' setup.cfg || die # bug 798381
+
+	distutils-r1_python_prepare_all
+}
+
 python_install_all() {
 	if use examples ; then
 		dodoc -r examples
diff --git a/dev-python/pylev/Manifest b/dev-python/pylev/Manifest
index e43fbd28114d..73c15d1b2474 100644
--- a/dev-python/pylev/Manifest
+++ b/dev-python/pylev/Manifest
@@ -1,3 +1,3 @@
 DIST pylev-1.4.0.tar.gz 4895 BLAKE2B d49e153d308165dcdc06bad94013afa4ccc6d2a6ecff943a2718a8f9ab71bbacb9c0cf8b604dbf0c77322a8d0cbeba5ffaed13531a31210507f144f716f8e740 SHA512 3999adf04b159499a199b1aa66e2540904c689c50a407bf7e0cc0affe834ea289006d2fc73f65e4fcd486c755c580e9657dc5c67290dccb4704bebc6a4348de3
-EBUILD pylev-1.4.0.ebuild 441 BLAKE2B 4e5f9a0525d29296877b66f58b367656c8b7e6a846cf8898af9dd85bfd3eb88de20c26d5378d4178d9b3bf21f3c6bd32cb6d7520f08c38ef4be774bcc6517ba1 SHA512 61ed9b46eba2ed2713e7f5a1e74634d619f7b8f5406c46985afbc03f2756ab291b57bb11d5d879f579a9c39a63f7b50e4ab84553853ab03d594124a6bea7b197
+EBUILD pylev-1.4.0.ebuild 442 BLAKE2B 0a02d80061aae3ee78912d371ec93c78c6165cb67fdd5afb040eaf8a6b08724e84c49bb95ad1664997c6ec4fbd40596a82d63fdc04952a597fc2d8e3b17f7872 SHA512 6b885db8bc7dfc68b191a0d737c143c4ec2179b9a902b6fcd6f4a33cdf5fe720ff7d4c0910aad3493fe2c0eef662ca94e1252478c3d565959f9967b49ca4fbd6
 MISC metadata.xml 517 BLAKE2B 973c0b1763978894a7321a94ed825a760b3bf710a249a1d46403bdbe904894b135b2058af4dce526bec97bedb9a09eaf768b8ad43da0ece8e0fa8d56b5b988e9 SHA512 16fc055d5944a6c2f678629b51314a605e5bf70d94d9cbf51e3a9def96f5b40239a863dfb83588475f3c9759e15df51fdff8f62399a3de3af056a0b38abf45a7
diff --git a/dev-python/pylev/pylev-1.4.0.ebuild b/dev-python/pylev/pylev-1.4.0.ebuild
index c392e0f2c2bd..bb9015c80a5f 100644
--- a/dev-python/pylev/pylev-1.4.0.ebuild
+++ b/dev-python/pylev/pylev-1.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,6 +12,6 @@ SRC_URI="https://github.com/toastdriven/pylev/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
 
 distutils_enable_tests unittest
diff --git a/dev-python/pylint/Manifest b/dev-python/pylint/Manifest
index 14e9ba129116..f9e2e58502bb 100644
--- a/dev-python/pylint/Manifest
+++ b/dev-python/pylint/Manifest
@@ -1,4 +1,14 @@
 AUX pylint-2.4.4-sphinx-theme.patch 468 BLAKE2B 741a362b51d35f574b245b4df81309b1b08be7a38ca7fd5c04d6c9ce39bc830e32531a29103d1261d9fea6eecf5f52fb1d4cf74ab0ec3bda5f6299e4edfecf94 SHA512 7f1896819d4f2766a83ce2600754d7a698ce13388de9127e83b42b76b332ae5eb54eb538b9dd5d81dafe1cd5798e703c1f3fd7fa318a8582aa7c2c0db7cc7a30
 DIST pylint-2.12.2.gh.tar.gz 1032702 BLAKE2B de7dce04159b332baa5c23f4034ee249e49f9239c5c9190213a51a84a47ac2129f8a2265e1ad9c01ab448ec58f4f36653c6de5b0be6bfdf6aa286c8887313759 SHA512 0d2b9b785371af0a1c809271153abbab58f50455b34f12370461ded2c4f3d62656e4c0391adff48e179b95da945a2f44e762863e2b7d63808976bf5f684e20d2
+DIST pylint-2.13.0.gh.tar.gz 1114326 BLAKE2B 2d99ae38474a13ecf0b306b2de445b93ef39c4ed286abdbc62e08580b34ea22615983bded024f87eb4ad5e9cfdd12edbab6e7bf841d4e7827c945e798f31771f SHA512 7ca5fdf6d5835886ae01937fad56319cc9b71248d7a8aa6c6d92ba4bf5d35340ec0a16c1b2029d1ca5170f8c3abd29b1d6915a415d5df3c0949f4f9c0d6a690c
+DIST pylint-2.13.1.gh.tar.gz 1116054 BLAKE2B 633636f97e284a8a93c598261b90019ea359fd61cf2e833936749a6a650098772c46008f465b118634cfa3cc8d873d9bbdd7d4b0e54621e47b7c33a33938b01d SHA512 9e5f6f2578d240a4984e00fd9e9a33a39bac4855060054f96c4414d8e1c6c16cd6a27d4d5e82fde52f91b2d25595d638e66e928c82aa3eb72a37c61f7aa6e038
+DIST pylint-2.13.2.gh.tar.gz 1116482 BLAKE2B da35c9f39781bbd796e2ec055b41c44211588d7da360fd27f81eef57a3f5c65e27931ca927b41692627c9914f5c28e3262c0f34a45c38b20aa1b83710ab1d1f1 SHA512 15274658cf3067ffa6635a94f2c75d8854b3843be45ea5dc5896bc12583b156428858baeed19eed4bfab35489326d70d0cce1375354d9ec97d00cfd895fc4a47
+DIST pylint-2.13.3.gh.tar.gz 1116747 BLAKE2B 9ab6ff4746f78472de9c248754d102e55e8cb60d3ead8c5079cfe851b2b7c8e16afc9b0be02041cf24e789784200b90751ad0bcf172eb6d4edd88463863d18ac SHA512 0bda6d89219ad6f7f64f1361f95b85a34e3bc70f9f18f71eaa3d69deb47ab6fc056000c13a11c8c5644f0a9789eac2a5c262ddcf96302aeebfa16aa2e3b3086c
+DIST pylint-2.13.4.gh.tar.gz 1117488 BLAKE2B a660c15c41b529d932a21d438c7cf0f3b97683d6b1452f4383193f97dd22ba6e216a7dc8c3677cb1cb0ab5b76ddb936afa2d87df38d41950e2249bd8867bf44d SHA512 2c0c60908f89bf7a2552f65e0b4957ee6223f5429a6c2ec997aaf75572b11e4247e159da744937dbc7752ebd5eab0a0c873d129983de09ea0954f35f47a1f524
 EBUILD pylint-2.12.2.ebuild 1724 BLAKE2B 289f62e0ad940e80b8b7de06a9ee52d043d4e2f6f16d99fd17f0d97dae0cac9687d960688a622db8159daae22e579c21bdee56c24acd40685a43446a365de22f SHA512 9798ca63f8d988f1a2818e36f059e644372d9a6c8d60dcc34e3042dd8360da75d2b8bfcedbc4b69e9a079b077885595586dc6ddfb41345fb5165847f15655df0
-MISC metadata.xml 1100 BLAKE2B 98ac44b343a44471afed50ea76c658142056bba3e3e0a75e7a3854c6e196eb55eeb466611c4d2976787fe4e5d4c13c1f434cad8afaece76f3ba04cd94197906f SHA512 78b52b43ebc944c60d037adb4874fcbe72a2ac713b713ac3b9a226966db2fabf0b31a11e16dcf26243cc19c62841928ac4bb32f5eef69f9d6ef9cb0222362bbf
+EBUILD pylint-2.13.0.ebuild 2199 BLAKE2B d5d46d9ed305d41bb4d2169801219d056bc091a42e64dda9c2564829cf886ecfc8ff8f05d43cb7efbf7b749c6ecabd6d2b6f4073cd61bc747c4df0b67704b48d SHA512 13c57314739c875b68fd3d15de7b61923028d5e507443e6193430ba8419e0ea699561b3e876d42272213bd15329270043fa7e15c6656974b0fb6b88758997f57
+EBUILD pylint-2.13.1.ebuild 2210 BLAKE2B b57c755ea980cc98de17048e730fef7bf5258bd9e2f1ed09ea42816f2d2fbd361f14f457bf5e7ffe0e988bba81ac0573ba009281d30966a27a75ba6682444126 SHA512 79a800eb6e9946d5bc8bfa0e0e2638944f9bd9db73f3ade0499eec8775e49e2cdcaf61e3f1f7b33fe5223d7d2cbacbd21f3bc6dcdf80faf22c66264639483031
+EBUILD pylint-2.13.2.ebuild 2210 BLAKE2B b57c755ea980cc98de17048e730fef7bf5258bd9e2f1ed09ea42816f2d2fbd361f14f457bf5e7ffe0e988bba81ac0573ba009281d30966a27a75ba6682444126 SHA512 79a800eb6e9946d5bc8bfa0e0e2638944f9bd9db73f3ade0499eec8775e49e2cdcaf61e3f1f7b33fe5223d7d2cbacbd21f3bc6dcdf80faf22c66264639483031
+EBUILD pylint-2.13.3.ebuild 2210 BLAKE2B b57c755ea980cc98de17048e730fef7bf5258bd9e2f1ed09ea42816f2d2fbd361f14f457bf5e7ffe0e988bba81ac0573ba009281d30966a27a75ba6682444126 SHA512 79a800eb6e9946d5bc8bfa0e0e2638944f9bd9db73f3ade0499eec8775e49e2cdcaf61e3f1f7b33fe5223d7d2cbacbd21f3bc6dcdf80faf22c66264639483031
+EBUILD pylint-2.13.4.ebuild 2170 BLAKE2B 2a1bb371fb7022285e11c31b44a9dafff7283aaae648993608756a7753bd1544612a8d33e4d5f78e6cd16b27a6bdcbadc2d80da72e7bb0c3c7ec6d0beb5a5fc8 SHA512 bed3e85cef6ee2c61847eae4c030cab9529cfa6324d4c0cf09d347f79ba5124a8400b6418249351261ab1a1fe2f2cd5245c8c71c4841b2d6dff5f42d61652f36
+MISC metadata.xml 1100 BLAKE2B 97ec6bd2f6cf487afb93136e9ee58d0d5f8ad37e2ded456ed4f196e73fd37cddead2462d3592b44ca1a6c3722b1f194905238299f0c066945d1e22bdb18acc9b SHA512 0418d987879446fd76fe9b7fc4ee8b1c3c0d9bbab1d1fc3eb66eada0bc52f6b6480cf9852dc3a18b1915d2093642b9c87f24207e89b34d3e48c29a282a3ba979
diff --git a/dev-python/pylint/metadata.xml b/dev-python/pylint/metadata.xml
index 85203feb60d4..7cf165680362 100644
--- a/dev-python/pylint/metadata.xml
+++ b/dev-python/pylint/metadata.xml
@@ -19,6 +19,6 @@
   <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">pylint</remote-id>
-    <remote-id type="github">pycqa/pylint</remote-id>
+    <remote-id type="github">PyCQA/pylint</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/pylint/pylint-2.13.0.ebuild b/dev-python/pylint/pylint-2.13.0.ebuild
new file mode 100644
index 000000000000..00f7749a1f55
--- /dev/null
+++ b/dev-python/pylint/pylint-2.13.0.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Python code static checker"
+HOMEPAGE="
+	https://www.logilab.org/project/pylint
+	https://pypi.org/project/pylint/
+	https://github.com/pycqa/pylint/
+"
+SRC_URI="
+	https://github.com/pycqa/pylint/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~riscv ~x86"
+IUSE="examples"
+
+# Make sure to check https://github.com/PyCQA/pylint/blob/main/setup.cfg#L43 on bumps
+# Adjust dep bounds!
+RDEPEND="
+	<dev-python/astroid-2.12[${PYTHON_USEDEP}]
+	>=dev-python/astroid-2.11.0[${PYTHON_USEDEP}]
+	>=dev-python/dill-0.2[${PYTHON_USEDEP}]
+	>=dev-python/isort-4.2.5[${PYTHON_USEDEP}]
+	<dev-python/isort-6[${PYTHON_USEDEP}]
+	>=dev-python/mccabe-0.6[${PYTHON_USEDEP}]
+	<dev-python/mccabe-0.8[${PYTHON_USEDEP}]
+	>=dev-python/platformdirs-2.2.0[${PYTHON_USEDEP}]
+	>=dev-python/tomli-1.1.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	' 3.8 3.9)
+"
+BDEPEND="
+	test? (
+		>=dev-python/GitPython-3[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.4.4-sphinx-theme.patch"
+)
+
+distutils_enable_sphinx doc --no-autodoc
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# No need to run the benchmarks
+		tests/benchmark/test_baseline_benchmarks.py
+
+		# TODO
+		'tests/test_functional.py::test_functional[forgotten_debug_statement_py37]'
+		'tests/test_functional.py::test_functional[dataclass_with_field]'
+		tests/checkers/unittest_typecheck.py::TestTypeChecker::test_nomember_on_c_extension_error_msg
+		tests/checkers/unittest_typecheck.py::TestTypeChecker::test_nomember_on_c_extension_info_msg
+	)
+	# Specify the test directory explicitly to avoid import file mismatches
+	epytest tests
+}
+
+python_install_all() {
+	if use examples ; then
+		docompress -x "/usr/share/doc/${PF}/examples"
+		docinto examples
+		dodoc -r examples/.
+	fi
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pylint/pylint-2.13.1.ebuild b/dev-python/pylint/pylint-2.13.1.ebuild
new file mode 100644
index 000000000000..f3e46e1cdb7e
--- /dev/null
+++ b/dev-python/pylint/pylint-2.13.1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Python code static checker"
+HOMEPAGE="
+	https://www.logilab.org/project/pylint
+	https://pypi.org/project/pylint/
+	https://github.com/pycqa/pylint/
+"
+SRC_URI="
+	https://github.com/pycqa/pylint/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~m68k ~ppc ~riscv ~x86"
+IUSE="examples"
+
+# Make sure to check https://github.com/PyCQA/pylint/blob/main/setup.cfg#L43 on bumps
+# Adjust dep bounds!
+RDEPEND="
+	<dev-python/astroid-2.12[${PYTHON_USEDEP}]
+	>=dev-python/astroid-2.11.0[${PYTHON_USEDEP}]
+	>=dev-python/dill-0.2[${PYTHON_USEDEP}]
+	>=dev-python/isort-4.2.5[${PYTHON_USEDEP}]
+	<dev-python/isort-6[${PYTHON_USEDEP}]
+	>=dev-python/mccabe-0.6[${PYTHON_USEDEP}]
+	<dev-python/mccabe-0.8[${PYTHON_USEDEP}]
+	>=dev-python/platformdirs-2.2.0[${PYTHON_USEDEP}]
+	>=dev-python/tomli-1.1.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	' 3.8 3.9)
+"
+BDEPEND="
+	test? (
+		>=dev-python/GitPython-3[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.4.4-sphinx-theme.patch"
+)
+
+distutils_enable_sphinx doc --no-autodoc
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# No need to run the benchmarks
+		tests/benchmark/test_baseline_benchmarks.py
+
+		# TODO
+		'tests/test_functional.py::test_functional[forgotten_debug_statement_py37]'
+		'tests/test_functional.py::test_functional[dataclass_with_field]'
+		tests/checkers/unittest_typecheck.py::TestTypeChecker::test_nomember_on_c_extension_error_msg
+		tests/checkers/unittest_typecheck.py::TestTypeChecker::test_nomember_on_c_extension_info_msg
+	)
+	# Specify the test directory explicitly to avoid import file mismatches
+	epytest tests
+}
+
+python_install_all() {
+	if use examples ; then
+		docompress -x "/usr/share/doc/${PF}/examples"
+		docinto examples
+		dodoc -r examples/.
+	fi
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pylint/pylint-2.13.2.ebuild b/dev-python/pylint/pylint-2.13.2.ebuild
new file mode 100644
index 000000000000..f3e46e1cdb7e
--- /dev/null
+++ b/dev-python/pylint/pylint-2.13.2.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Python code static checker"
+HOMEPAGE="
+	https://www.logilab.org/project/pylint
+	https://pypi.org/project/pylint/
+	https://github.com/pycqa/pylint/
+"
+SRC_URI="
+	https://github.com/pycqa/pylint/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~m68k ~ppc ~riscv ~x86"
+IUSE="examples"
+
+# Make sure to check https://github.com/PyCQA/pylint/blob/main/setup.cfg#L43 on bumps
+# Adjust dep bounds!
+RDEPEND="
+	<dev-python/astroid-2.12[${PYTHON_USEDEP}]
+	>=dev-python/astroid-2.11.0[${PYTHON_USEDEP}]
+	>=dev-python/dill-0.2[${PYTHON_USEDEP}]
+	>=dev-python/isort-4.2.5[${PYTHON_USEDEP}]
+	<dev-python/isort-6[${PYTHON_USEDEP}]
+	>=dev-python/mccabe-0.6[${PYTHON_USEDEP}]
+	<dev-python/mccabe-0.8[${PYTHON_USEDEP}]
+	>=dev-python/platformdirs-2.2.0[${PYTHON_USEDEP}]
+	>=dev-python/tomli-1.1.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	' 3.8 3.9)
+"
+BDEPEND="
+	test? (
+		>=dev-python/GitPython-3[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.4.4-sphinx-theme.patch"
+)
+
+distutils_enable_sphinx doc --no-autodoc
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# No need to run the benchmarks
+		tests/benchmark/test_baseline_benchmarks.py
+
+		# TODO
+		'tests/test_functional.py::test_functional[forgotten_debug_statement_py37]'
+		'tests/test_functional.py::test_functional[dataclass_with_field]'
+		tests/checkers/unittest_typecheck.py::TestTypeChecker::test_nomember_on_c_extension_error_msg
+		tests/checkers/unittest_typecheck.py::TestTypeChecker::test_nomember_on_c_extension_info_msg
+	)
+	# Specify the test directory explicitly to avoid import file mismatches
+	epytest tests
+}
+
+python_install_all() {
+	if use examples ; then
+		docompress -x "/usr/share/doc/${PF}/examples"
+		docinto examples
+		dodoc -r examples/.
+	fi
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pylint/pylint-2.13.3.ebuild b/dev-python/pylint/pylint-2.13.3.ebuild
new file mode 100644
index 000000000000..f3e46e1cdb7e
--- /dev/null
+++ b/dev-python/pylint/pylint-2.13.3.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Python code static checker"
+HOMEPAGE="
+	https://www.logilab.org/project/pylint
+	https://pypi.org/project/pylint/
+	https://github.com/pycqa/pylint/
+"
+SRC_URI="
+	https://github.com/pycqa/pylint/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~m68k ~ppc ~riscv ~x86"
+IUSE="examples"
+
+# Make sure to check https://github.com/PyCQA/pylint/blob/main/setup.cfg#L43 on bumps
+# Adjust dep bounds!
+RDEPEND="
+	<dev-python/astroid-2.12[${PYTHON_USEDEP}]
+	>=dev-python/astroid-2.11.0[${PYTHON_USEDEP}]
+	>=dev-python/dill-0.2[${PYTHON_USEDEP}]
+	>=dev-python/isort-4.2.5[${PYTHON_USEDEP}]
+	<dev-python/isort-6[${PYTHON_USEDEP}]
+	>=dev-python/mccabe-0.6[${PYTHON_USEDEP}]
+	<dev-python/mccabe-0.8[${PYTHON_USEDEP}]
+	>=dev-python/platformdirs-2.2.0[${PYTHON_USEDEP}]
+	>=dev-python/tomli-1.1.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	' 3.8 3.9)
+"
+BDEPEND="
+	test? (
+		>=dev-python/GitPython-3[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.4.4-sphinx-theme.patch"
+)
+
+distutils_enable_sphinx doc --no-autodoc
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# No need to run the benchmarks
+		tests/benchmark/test_baseline_benchmarks.py
+
+		# TODO
+		'tests/test_functional.py::test_functional[forgotten_debug_statement_py37]'
+		'tests/test_functional.py::test_functional[dataclass_with_field]'
+		tests/checkers/unittest_typecheck.py::TestTypeChecker::test_nomember_on_c_extension_error_msg
+		tests/checkers/unittest_typecheck.py::TestTypeChecker::test_nomember_on_c_extension_info_msg
+	)
+	# Specify the test directory explicitly to avoid import file mismatches
+	epytest tests
+}
+
+python_install_all() {
+	if use examples ; then
+		docompress -x "/usr/share/doc/${PF}/examples"
+		docinto examples
+		dodoc -r examples/.
+	fi
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pylint/pylint-2.13.4.ebuild b/dev-python/pylint/pylint-2.13.4.ebuild
new file mode 100644
index 000000000000..168eae7e434b
--- /dev/null
+++ b/dev-python/pylint/pylint-2.13.4.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Python code static checker"
+HOMEPAGE="
+	https://pypi.org/project/pylint/
+	https://github.com/PyCQA/pylint/
+"
+SRC_URI="
+	https://github.com/pycqa/pylint/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~m68k ~ppc ~riscv ~x86"
+IUSE="examples"
+
+# Make sure to check https://github.com/PyCQA/pylint/blob/main/setup.cfg#L43 on bumps
+# Adjust dep bounds!
+RDEPEND="
+	<dev-python/astroid-2.12[${PYTHON_USEDEP}]
+	>=dev-python/astroid-2.11.0[${PYTHON_USEDEP}]
+	>=dev-python/dill-0.2[${PYTHON_USEDEP}]
+	>=dev-python/isort-4.2.5[${PYTHON_USEDEP}]
+	<dev-python/isort-6[${PYTHON_USEDEP}]
+	>=dev-python/mccabe-0.6[${PYTHON_USEDEP}]
+	<dev-python/mccabe-0.8[${PYTHON_USEDEP}]
+	>=dev-python/platformdirs-2.2.0[${PYTHON_USEDEP}]
+	>=dev-python/tomli-1.1.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	' 3.8 3.9)
+"
+BDEPEND="
+	test? (
+		>=dev-python/GitPython-3[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.4.4-sphinx-theme.patch"
+)
+
+distutils_enable_sphinx doc --no-autodoc
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# No need to run the benchmarks
+		tests/benchmark/test_baseline_benchmarks.py
+
+		# TODO
+		'tests/test_functional.py::test_functional[forgotten_debug_statement_py37]'
+		'tests/test_functional.py::test_functional[dataclass_with_field]'
+		tests/checkers/unittest_typecheck.py::TestTypeChecker::test_nomember_on_c_extension_error_msg
+		tests/checkers/unittest_typecheck.py::TestTypeChecker::test_nomember_on_c_extension_info_msg
+	)
+	# Specify the test directory explicitly to avoid import file mismatches
+	epytest tests
+}
+
+python_install_all() {
+	if use examples ; then
+		docompress -x "/usr/share/doc/${PF}/examples"
+		docinto examples
+		dodoc -r examples/.
+	fi
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pymetar/Manifest b/dev-python/pymetar/Manifest
index f554183cbe15..f89b1604af20 100644
--- a/dev-python/pymetar/Manifest
+++ b/dev-python/pymetar/Manifest
@@ -1,3 +1,3 @@
 DIST pymetar-1.4.tar.gz 3162928 BLAKE2B b92686204e84070722b3351ce04c1e65e3b47c7802767fbdb95027bcaea566518e61ac4c3e02dd0345c6672a87e2d50239a679dd7db426f7fa183023357763d3 SHA512 d5c5d382c68ffacefe07d63239f3b56984bf2becef922c945b0014a210ddf9ce1f96f99028e0ec9e649f70f6262925a836dbeb83309407aa2c4ddb4769db3dbd
 EBUILD pymetar-1.4.ebuild 584 BLAKE2B 33ff4940decdb60e07aac80e53a72821e1220d5d8124c1052078776fe14d416e01ae3596a7efdc279d9fd2fbbea7c299bf1f3ea008253a3000c0869e7e056bd6 SHA512 2818639d2bd71c7a8702f6b31ec3c27f4f0bd8380f20d2c4ca8bb182394cd64a79e3e557c145ee0d52c7bdb4a5c709188d2d3d0642e84b5a9095e5bdc4c71607
-MISC metadata.xml 1147 BLAKE2B 78d064c2dc37e9e9897c85a21a8a75642c7872480174224720e94a88d7a4ff1a557b75e9267c29adb8aba68c21619ed23de52fd35fc188d2b6dc9b6059a2b854 SHA512 d110dd1e9a77f823cbc77d8df281cbd4e822c8028501cb4b8341848171b093b52971725aec49c54cab73fdad92dac22fa203b8defcfbb4ea4d1e3a54f351ae57
+MISC metadata.xml 1036 BLAKE2B 67594afc8ff3a4b74b89d55a22e2493e0e99e46e92909140317004ce83e37b6f6c864b6d7a58683f8e0eaa9557159e8f6ce7c07969893db8ee6d116904997f51 SHA512 3ea100f741d9635d5d512f91d1ab1be74910f40330da6ec7f2225e09ac8b53cb0b659d1d66f0f585ab3d6b8a2e1ceb6e9890f84d7bde20f01739dbc9656e0232
diff --git a/dev-python/pymetar/metadata.xml b/dev-python/pymetar/metadata.xml
index 1c67844b0ffa..86d9aa756992 100644
--- a/dev-python/pymetar/metadata.xml
+++ b/dev-python/pymetar/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>klausman@gentoo.org</email>
-		<name>Tobias Klausman</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 		<name>Python</name>
diff --git a/dev-python/pymongo/Manifest b/dev-python/pymongo/Manifest
index c2f74e9dfa28..e47f6dd363b5 100644
--- a/dev-python/pymongo/Manifest
+++ b/dev-python/pymongo/Manifest
@@ -1,5 +1,7 @@
 DIST mongo-python-driver-4.0.1.tar.gz 1030722 BLAKE2B b820901a433ffa2e82db0ef3c014aaa1e7d53bbc3ab94a5432fcb713d9789cbbf411a4ad5085ef3896cbf2aeff6d0e79f3f7bd5936d3aa615080a0421d8818c2 SHA512 1aead66d21c032e6d42b3aa408b0193bcac6a5a293ecfc513fadb634c574dccdcd351c693352f23cfe577c73fec901cdc2aa635dfe9afe8d9108ed917f55b53b
 DIST mongo-python-driver-4.0.2.tar.gz 1027101 BLAKE2B d95eea08e09101f1db5df5dcbd5d843273ebd0c63b228420748a1663620ea18e05853372e876abc8b6480238de2b035c4e5a3c9f9b7c206228870a66e5d5f053 SHA512 eacb24d110de645a70b16b4d11f7a6b019f741fba2222f8ecee47d9f638fd71e579d3a46f5f539bc89d1ea53ddf0b72745b667a0f05479bb4b53ed72fb075b5b
+DIST mongo-python-driver-4.1.0.tar.gz 1069416 BLAKE2B ea7d81e405f4db4ec0e03591909541f5452f516d359e42fc6fde74435899353f4718b7dbfe3dc1802e79c9277fcfe6203ecd33a5e2ad2682c604b9de44c46c7c SHA512 558d321a335742fc3399e9f5cb4917605353f55a1912f9fa34ac46f6107ed6522f952dc9ef584f4cbe1ffcfc600b49963a4bdf606146c38b94379bbb6a382202
 EBUILD pymongo-4.0.1.ebuild 2757 BLAKE2B 90fe6d42de8365992624e829541dcfbeda794a0730c2f78faa8a7d5b55e15a769ae1c05078828294ce3c5559a24a44253dda9f6fe6742f590bad274ce5fb60e7 SHA512 72cf6aaed3d38fc225210904be1335ecbbb5b5eb2940242bcfb3a7658bdcc9183faf8412042c2a68c68d658fe59e5b2fc683bf8e3cb0b8cfc35686dce027c0e9
 EBUILD pymongo-4.0.2.ebuild 2765 BLAKE2B 9e0daa5786bfcdd3997d91dc81d73edf1c3cce0c9e72a4e9e957940079b6c1d37c09f0ca9f52a02e7dd4cb36ca5ddcb0f36b8848b049dbb2f6727d44139e5230 SHA512 90c9917a2c760694bf8f82632a35c7a56974bb2a6e45d27677aacf5487ec4da55705bcf9cfe88935170bc25d69d820eba24834bc22857c2689acec1457ad2b1b
+EBUILD pymongo-4.1.0.ebuild 2765 BLAKE2B 9e0daa5786bfcdd3997d91dc81d73edf1c3cce0c9e72a4e9e957940079b6c1d37c09f0ca9f52a02e7dd4cb36ca5ddcb0f36b8848b049dbb2f6727d44139e5230 SHA512 90c9917a2c760694bf8f82632a35c7a56974bb2a6e45d27677aacf5487ec4da55705bcf9cfe88935170bc25d69d820eba24834bc22857c2689acec1457ad2b1b
 MISC metadata.xml 673 BLAKE2B fb66f76592841f2647a94e24e07fafa8be2bc31583bac35dc3933a3feeea87f0c4105ab6b480bce5f2b8aeced8c113c8a3ce9714b22ff909f92eccceffa8f9a9 SHA512 9e758aa60153da583ed21bdf6addd001c560894fc6d429217405e7dfbdc673a9e22bc5a41afcc1281f7613ae1059c0824a7bba246006aa66c6eced75ab975e51
diff --git a/dev-python/pymongo/pymongo-4.1.0.ebuild b/dev-python/pymongo/pymongo-4.1.0.ebuild
new file mode 100644
index 000000000000..0a91e8ab7cdf
--- /dev/null
+++ b/dev-python/pymongo/pymongo-4.1.0.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit check-reqs distutils-r1
+
+MY_P=mongo-python-driver-${PV}
+DESCRIPTION="Python driver for MongoDB"
+HOMEPAGE="https://github.com/mongodb/mongo-python-driver https://pypi.org/project/pymongo/"
+SRC_URI="
+	https://github.com/mongodb/mongo-python-driver/archive/${PV}.tar.gz
+		-> ${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~hppa ~riscv ~x86"
+IUSE="doc kerberos"
+
+RDEPEND="
+	kerberos? ( dev-python/pykerberos[${PYTHON_USEDEP}] )
+"
+BDEPEND="
+	test? (
+		>=dev-db/mongodb-2.6.0
+	)
+"
+
+distutils_enable_sphinx doc
+distutils_enable_tests unittest
+
+reqcheck() {
+	if use test; then
+		# During the tests, database size reaches 1.5G.
+		local CHECKREQS_DISK_BUILD=1536M
+
+		check-reqs_${1}
+	fi
+}
+
+pkg_pretend() {
+	reqcheck pkg_pretend
+}
+
+pkg_setup() {
+	reqcheck pkg_setup
+}
+
+src_prepare() {
+	# network-sandbox
+	rm test/test_srv_polling.py || die
+	sed -e 's:test_connection_timeout_ms_propagates_to_DNS_resolver:_&:' \
+		-e 's:test_service_name_from_kwargs:_&:' \
+		-e 's:test_srv_max_hosts_kwarg:_&:' \
+		-i test/test_client.py || die
+	sed -e '/SRV_SCHEME/s:_HAVE_DNSPYTHON:False:' \
+		-i test/test_uri_spec.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# Yes, we need TCP/IP for that...
+	local DB_IP=127.0.0.1
+	local DB_PORT=27000
+
+	export DB_IP DB_PORT
+
+	local dbpath=${TMPDIR}/mongo.db
+	local logpath=${TMPDIR}/mongod.log
+
+	# Now, the hard part: we need to find a free port for mongod.
+	# We're just trying to run it random port numbers and check the log
+	# for bind errors. It shall be noted that 'mongod --fork' does not
+	# return failure when it fails to bind.
+
+	mkdir -p "${dbpath}" || die
+	while true; do
+		ebegin "Trying to start mongod on port ${DB_PORT}"
+
+		LC_ALL=C \
+		mongod --dbpath "${dbpath}" --nojournal \
+			--bind_ip ${DB_IP} --port ${DB_PORT} \
+			--unixSocketPrefix "${TMPDIR}" \
+			--logpath "${logpath}" --fork \
+		&& sleep 2
+
+		# Now we need to check if the server actually started...
+		if [[ ${?} -eq 0 && -S "${TMPDIR}"/mongodb-${DB_PORT}.sock ]]; then
+			# yay!
+			eend 0
+			break
+		elif grep -q 'Address already in use' "${logpath}"; then
+			# ay, someone took our port!
+			eend 1
+			: $(( DB_PORT += 1 ))
+			continue
+		else
+			eend 1
+			eerror "Unable to start mongod for tests. See the server log:"
+			eerror "	${logpath}"
+			die "Unable to start mongod for tests."
+		fi
+	done
+
+	local failed
+	DB_PORT2=$(( DB_PORT + 1 )) DB_PORT3=$(( DB_PORT + 2 )) esetup.py test || failed=1
+
+	mongod --dbpath "${dbpath}" --shutdown || die
+
+	[[ ${failed} ]] && die "Tests fail with ${EPYTHON}"
+
+	rm -rf "${dbpath}" || die
+}
diff --git a/dev-python/pyopencl/Manifest b/dev-python/pyopencl/Manifest
index 9adfc0452b90..56feab344aac 100644
--- a/dev-python/pyopencl/Manifest
+++ b/dev-python/pyopencl/Manifest
@@ -1,5 +1,3 @@
-DIST pyopencl-2021.2.13.tar.gz 452397 BLAKE2B 8764fe1caf14e73b39aa455e7ea9e00b1733df4ef0d21fd1e2b6383db60eae33a1e1569d71dbd56617dc463e31426e3814cfe0201f8c891293fb32f4fad6a96e SHA512 16b527f69d4fa8bb8dd16cea67e7403893c813c625e0eb1f465fa8a94c9e4a878a5d5d589592b017bb548e1ff7ec5c36c79acd3cb55dee57592ca360a524ac7c
 DIST pyopencl-2022.1.tar.gz 452537 BLAKE2B 0d4d178a6bdf14dc3769dcb78c42bc894c0a443a6811fe9b25dedbc4a43debc06d1a1c32cb2a0df06fe16d1b2e78e65ef4f3ca8e9931be39384b3c8c813336de SHA512 e873807e757c19b59dbac2a0522fbb9c6e8af955d62bdcf06d8f3d792db3c9d2ce15372a6eefdca5b3f6756c35a85b5ff8d7dc1b6449bfd12c2b588576dd6f24
-EBUILD pyopencl-2021.2.13.ebuild 1520 BLAKE2B 5ff0a66be8d8d323038a93879aaf5a00d8559a4271c7c1ecb3b7ce484b5b33b00ec6fd860f4ce0af533b690cea87c74ffb8f6e4b4b9c6840bbbc72c82a19a016 SHA512 e5257aa3af1faa3ab801b1765b25175f45baec990c3033243a71d3ac36908fc2d1bdb24f34d33163f59636cc5d7bab7399fad4e5eeb6f13ffb3891036452bacc
-EBUILD pyopencl-2022.1.ebuild 1521 BLAKE2B 1bec17b7785817b5e7a145ac0ef655007fa5b19987eeee9aaafa08da955a8252859ffb34b1dbd4bf5a585401cea6122f064085fa3acdd0a2df60da42a94faf47 SHA512 3d8d860d1a47bcd0c52e33bb614ca85cf6b64e4015715850acd5b8af4945e588156a1d0ab3767a8c40ef542005df28b61aaa1f286cd3784f676d8b05652c9eeb
+EBUILD pyopencl-2022.1.ebuild 1520 BLAKE2B 5ff0a66be8d8d323038a93879aaf5a00d8559a4271c7c1ecb3b7ce484b5b33b00ec6fd860f4ce0af533b690cea87c74ffb8f6e4b4b9c6840bbbc72c82a19a016 SHA512 e5257aa3af1faa3ab801b1765b25175f45baec990c3033243a71d3ac36908fc2d1bdb24f34d33163f59636cc5d7bab7399fad4e5eeb6f13ffb3891036452bacc
 MISC metadata.xml 317 BLAKE2B ba532c522d5fd599dfd41180c9813f8124dc64cd3bc7a3a7b1ecdc121b216db4b43f6cae9c32c52a430fbf6e9a22c0cf27ffaf0041ca372d81666991bcf0e979 SHA512 845a8b83a5d7729ea0fca8b704de297b8b8c0d8f315fad0bea7c0c645bc79dd993209e9ca5e89ec9c8ddbe6db2b1f142c3e1f7e5b8e4b6259fe927527ce6a919
diff --git a/dev-python/pyopencl/pyopencl-2021.2.13.ebuild b/dev-python/pyopencl/pyopencl-2021.2.13.ebuild
deleted file mode 100644
index ddb481845549..000000000000
--- a/dev-python/pyopencl/pyopencl-2021.2.13.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_USE_PEP517=setuptools
-
-inherit distutils-r1
-
-DESCRIPTION="Python wrapper for OpenCL"
-HOMEPAGE="https://mathema.tician.de/software/pyopencl/
-	https://pypi.org/project/pyopencl/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="examples opengl"
-
-DEPEND=">=virtual/opencl-2"
-RDEPEND="${DEPEND}
-	>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/mako-0.3.6[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	>=dev-python/pytools-2021.2.7[${PYTHON_USEDEP}]"
-# libglvnd is only needed for the headers
-BDEPEND="dev-python/numpy[${PYTHON_USEDEP}]
-	>=dev-python/pybind11-2.5.0[${PYTHON_USEDEP}]
-	opengl? ( media-libs/libglvnd )"
-
-# The test suite fails if there are no OpenCL platforms available, and
-# even if there is one (which requires the presence of both an OpenCL
-# runtime *and* hardware supported by it - simply emerging any runtime
-# is not enough) the vast majority of tests end up skipped because by
-# default the portage user hasn't got sufficient privileges to talk
-# to the GPU.
-RESTRICT="test"
-
-python_configure_all() {
-	local myconf=()
-	if use opengl; then
-		myconf+=(--cl-enable-gl)
-	fi
-
-	"${EPYTHON}" configure.py \
-		"${myconf[@]}"
-}
-
-python_install_all() {
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pyopencl/pyopencl-2022.1.ebuild b/dev-python/pyopencl/pyopencl-2022.1.ebuild
index 239c5dd9b960..ddb481845549 100644
--- a/dev-python/pyopencl/pyopencl-2022.1.ebuild
+++ b/dev-python/pyopencl/pyopencl-2022.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="examples opengl"
 
 DEPEND=">=virtual/opencl-2"
diff --git a/dev-python/pyopengl/Manifest b/dev-python/pyopengl/Manifest
index c53726719f83..78baebf7e798 100644
--- a/dev-python/pyopengl/Manifest
+++ b/dev-python/pyopengl/Manifest
@@ -1,5 +1,5 @@
 DIST PyOpenGL-3.1.5.tar.gz 1835295 BLAKE2B fd3b3e9970b3e704b09128402b401e23c584ba20de23082d019f5ab9e1e222efdfbd2e11ecff6ee748f41bad3a5ff089c57a5c354092e2f717b13e18108de2af SHA512 5d90fc68040b4886e46ff69a59be9e3a8e31e3e1295283756db86d50a1efe681986928e18eb55d20fd2660f863653301ea483425bbe24046f55085b44f4906eb
 DIST PyOpenGL-3.1.6.tar.gz 1903892 BLAKE2B 7d1109a09703a7113aa9cc02994662df77bea1da63e81a8adbdc812514b71e04bfa51dad9e48c0e0b98327e4f7deda7a8590c340a38127d38e91659f38739220 SHA512 b6f2f083df0fd7cf8f8a1077f42fa388bce94c0edde00ed6492104af8306c9925b74649cd2c222be4205b0892e7975de2f7591d0f0bcd9540eb53c0de95fec00
 EBUILD pyopengl-3.1.5.ebuild 1183 BLAKE2B 0e3c7bdd8dfbd8085f40db9af606f41c80fdc78e56496faaab00b61e654b9207868ecb1f0c5399b4083d8a81f4a391b94ba6eca636b5f4f24b7589cd5bcab5ee SHA512 ccfabba236734d24beafc29c8b02d8f773835a3a1eee78d44bcab273d7e032fec12e20b787b6c45be4fd9629d8354f1f65e425de330f71889c6cf1b893993556
-EBUILD pyopengl-3.1.6.ebuild 1148 BLAKE2B a030a09b8d8a017679c6de8b3edde77919290fc67515a618f123051f9830cda5ad97a1c5e381113c54ee658fbd6ae7ee7de897af7ccfb99303104f2beea37201 SHA512 96276895b4729f602bb20885a9f8f018b8972718418577ac1dd4b6edadfa1810a046f546e0a3b9cdda294e816f63ce280c4aad12667e6d7c27624f730f08157b
+EBUILD pyopengl-3.1.6.ebuild 1142 BLAKE2B 73fbc3c34e6cc2d867dbca9b2984552ce35000262073e8b6a2affda51ee9f3b62371151ea92eeaf3686ca6bd512daa133ce412c35ff604ac6adceddc1f7889e4 SHA512 62f2a286473c2ee07ebcb3326084b046d9f6512cdeb17c521ad0809bd667cc02fcf41deecd39ab6b15e50857c29aae5388bc50a948d56a67a7980e2623ec8ea4
 MISC metadata.xml 365 BLAKE2B 4f4ed59d889195fb5f979daa14ace3f8a77f9ae1330fda3eb454fca4aa5447e285a4f31c5993358d20ecc413b368cf70a7f5e55796b9b81557cff06bc7a4a5fb SHA512 2059e35cf4377763e16007e867897acfdba791681687ec0c45c9c78ea8cf89889e71dc3f4fe6720618f5adf6fe26a3440aaf938a5c1b592654fadcca7ff5ee3b
diff --git a/dev-python/pyopengl/pyopengl-3.1.6.ebuild b/dev-python/pyopengl/pyopengl-3.1.6.ebuild
index dddfdebc064a..61a493cbba4f 100644
--- a/dev-python/pyopengl/pyopengl-3.1.6.ebuild
+++ b/dev-python/pyopengl/pyopengl-3.1.6.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="tk"
 
 RDEPEND="
diff --git a/dev-python/pyopengl_accelerate/Manifest b/dev-python/pyopengl_accelerate/Manifest
index f9fe72d1506f..d4419831b294 100644
--- a/dev-python/pyopengl_accelerate/Manifest
+++ b/dev-python/pyopengl_accelerate/Manifest
@@ -1,5 +1,3 @@
 DIST pyopengl-227f9c66976d9f5dadf62b9a97e6beaec84831ca.gh.tar.gz 3296655 BLAKE2B 74aca52a9566eb667a36e4e75470da8eca0d4aaa42dce246bcfc4b28e3581235ca6119efaadafa4354c915046931d30bf0b2cd2d0fffb9d87611468a34704b24 SHA512 dad3b4377708d7c7331384e0b3aa3ca69ac943bb22e4136f93b7790092e29ee4cdc254295bd9243203981834bc22a7a02163523177b7f7c581f9384d55ee13c8
-DIST pyopengl-3.1.5.gh.tar.gz 3287132 BLAKE2B a1d683715f4a57c0374cac827e7bd9c93ca303ac578f50a71edff983c6bf3c32858be454bf6ac00f757c52a0adc3b7df7f03181abf69304ed3621d168f2166d8 SHA512 66a6e07b4cee4d80d5b01cd6a506b54995e499611979f8a02fef76d95d6178fe9644fa4ad794812599be0aad293424be980f4a9d47480983503e09887250560d
-EBUILD pyopengl_accelerate-3.1.5.ebuild 815 BLAKE2B d4186a4f95580682bf7e024a9b52e68e7635b5b7f20649c64e7539bec321f451004e80bc0af97d559f487ef0121bc7edaf247dd55b80918b8616580f0820d0a5 SHA512 4a06a595bd7bba135817323ed7adf22a1887c3733546e038ca86476ef25687d5b951c0e01e4eb4276a705c713e6c544e3593fd198272f1993eef3a388bf16d4d
-EBUILD pyopengl_accelerate-3.1.6.ebuild 878 BLAKE2B cfbce9620bfba05cce05e20a672fa9e94d6abbaf55a58b02c0b32700c5f865f9ee5de82847b8f2ac4b0c25c15a62dcc53e424a45dc4fe853cefaa918e81cd77d SHA512 2c43f32e4d0cb4cf989a046fa41dcc4ffff1a013456f61876476a20fd7e35aeb49e6559ae99d24a6ea4fd76d67a2aec49b045ea010a236c01ab47ee920d2b251
+EBUILD pyopengl_accelerate-3.1.6.ebuild 876 BLAKE2B b80faeeb06fbe81ad0e1a91b18f44b7ed43523306e880128618c1933de524222dcb8fdbad21a745dc56a17e64fe96947b604ac1723a2eee0160f1a79e10829fb SHA512 f2daa9edf3f9cf6444d8ccb9dcf5c99e1d8431f4f2fffce1b2756a3aa048f28e384d93f59d1e6953a7f3666180f47cc5737ee485f3d2716da8bf1ab236661aeb
 MISC metadata.xml 433 BLAKE2B 0c80e4858e421b6274774a3e9c1e594c976cbbc11d4ec234e116c2b8bead90cbf8da62760991f0f5a3d47c8d480dc245d77532c7ba2c2a393938f2946c9dc0df SHA512 1c088169530a2b9ad3c0471b52f2ddf76ca3317d071822fb2ae20e68cee14877318270b56f68ac4887d472e1d2e777b2e0b96676eb993705ce7afa103aaf9b7e
diff --git a/dev-python/pyopengl_accelerate/pyopengl_accelerate-3.1.5.ebuild b/dev-python/pyopengl_accelerate/pyopengl_accelerate-3.1.5.ebuild
deleted file mode 100644
index 35ea0e63e580..000000000000
--- a/dev-python/pyopengl_accelerate/pyopengl_accelerate-3.1.5.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Accelerate module for PyOpenGL"
-HOMEPAGE="
-	http://pyopengl.sourceforge.net/
-	https://github.com/mcfletch/pyopengl/
-	https://pypi.org/project/PyOpenGL-accelerate/"
-# pypi archive is missing tests
-EGIT_COMMIT="02d11dad9ff18e50db10e975c4756e17bf198464"
-SRC_URI="
-	https://github.com/mcfletch/pyopengl/archive/${EGIT_COMMIT}.tar.gz
-		-> pyopengl-${PV}.gh.tar.gz"
-S=${WORKDIR}/pyopengl-${EGIT_COMMIT}/accelerate
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="dev-python/pyopengl[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/numpy[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pyopengl_accelerate/pyopengl_accelerate-3.1.6.ebuild b/dev-python/pyopengl_accelerate/pyopengl_accelerate-3.1.6.ebuild
index 0e545374f395..84add25d0527 100644
--- a/dev-python/pyopengl_accelerate/pyopengl_accelerate-3.1.6.ebuild
+++ b/dev-python/pyopengl_accelerate/pyopengl_accelerate-3.1.6.ebuild
@@ -21,7 +21,7 @@ S=${WORKDIR}/pyopengl-${EGIT_COMMIT}/accelerate
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="dev-python/pyopengl[${PYTHON_USEDEP}]"
diff --git a/dev-python/pyperclip/Manifest b/dev-python/pyperclip/Manifest
index f904c6b655c2..58fc49c78b5a 100644
--- a/dev-python/pyperclip/Manifest
+++ b/dev-python/pyperclip/Manifest
@@ -1,3 +1,3 @@
 DIST pyperclip-1.8.2.tar.gz 20920 BLAKE2B d14a7d977b434db5ae3218792ccd73428bab244a6f6a92d3fd7f059ee99f841853b69a8e039a8192a6cca693adc943a93f24835d25471888975b306b7be4a36a SHA512 ade0cdf2bfdbe3ce807a02b64bb1e839afc9955254ddeb3e0fe7c1dd9fd9fddc11f8386a02590690b039045b46e9103e4d094f1bad3e272f532fda4db5ed1c1a
-EBUILD pyperclip-1.8.2.ebuild 1232 BLAKE2B 9b6cf9f797f2ec4eead4cb28e4c3bfa1b612a9e8922060b4d867bfc3b464bc7edb99d4d5fe7e769b74ffdfaf05ea8fc3969f5c90c856bcd41be0bc30de6c8f36 SHA512 cef46e69b955d8caeaf5e78537080e34e4f3a754d1bc69d86b1068d114fe567d3b7a3fe3626fbbe764125ff6491d507a2de38fbdd3000ae87c059c35612cc04c
+EBUILD pyperclip-1.8.2.ebuild 1239 BLAKE2B 30eefea79d7afdf90f55ee0955a495a3c7479afd6dd465899ad0814e29541fe66cc272b2cacf7bf8343bf0c0402d336eefe2c09634ed8aeced93bb78496b1247 SHA512 910202b3100257d2fea2e1d38f1acbda16bf98615e6b2b70d7ce94f2347d7dd2a9cd6df6a971141394e48363706b92437c905e34ec372a74f91035aa4bc9ef4e
 MISC metadata.xml 430 BLAKE2B 4205f6477eeb2f1fa19813598e3c4bccf7b1f463771598a998096c6940e57ee9615aa56e5f440b674d49b51fd201f53016d3a79b3d1499652155a1dc0aab6fe8 SHA512 4b4cb2d92f223826c241816864aaa2dae6d16db257244a416779dceec48e3dd55dd3e3e4f5b75e10f94dbe5acfc12d4a43c31ddf3cde0b5859982b2e0a37ab6b
diff --git a/dev-python/pyperclip/pyperclip-1.8.2.ebuild b/dev-python/pyperclip/pyperclip-1.8.2.ebuild
index 52f1e6012ae0..4afd4fe116a3 100644
--- a/dev-python/pyperclip/pyperclip-1.8.2.ebuild
+++ b/dev-python/pyperclip/pyperclip-1.8.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc64 ~riscv sparc x86"
 
 RDEPEND="
 	|| (
diff --git a/dev-python/pyphen/Manifest b/dev-python/pyphen/Manifest
index 70eb48356168..42d92bcf15b0 100644
--- a/dev-python/pyphen/Manifest
+++ b/dev-python/pyphen/Manifest
@@ -1,3 +1,3 @@
 DIST Pyphen-0.12.0.tar.gz 1969022 BLAKE2B 9b7f6712a2085507684ddde52401a75b05d0a13a530572f0f08b9143168a8ea61a5ee73983606b19f88ff23f3c5344aa87722c3986291c7349f82e95dd3b1f19 SHA512 abecf0773f59b7a757b47c6512f1bf8e98f4709b285f04cf235c085ab4767eb95deab8ede4b792d6f4a6156d47287f9f712cb658939ed5afc475644e282adbd3
-EBUILD pyphen-0.12.0-r1.ebuild 625 BLAKE2B 45e0d1d1dadfce554c797675ba5f8fdc31ff1c60b8411e5cb54574702de7764946962077d870eecaf2e53dcf2dbb0fb2563ef4edf1c2711ca7141b1ee3a863a5 SHA512 3ddf3ce34d5fe454db862179821d30e6691129181e08c93e10b0c4faa826425dd7f856367cc8fd604a35ae507b017e3938bdaa59ca2636922b59642255fc2f17
+EBUILD pyphen-0.12.0-r1.ebuild 632 BLAKE2B 178a56a9f11d1352421a3d1495df40dc7a780aa6eeba1b5360ab0c53074ac64a4b1bc64ce0240ee3d9bcf70d82c4edd0131c1d2cb9d042e8dba9b70f8c6787ec SHA512 0fcdb35530f17013773fbdc3bac737c735ef68e7cb367f77ae83c9de1c31e8ec3691a767e3b1271965461225d2b24e11ec3d8e55c2737b9fa36117ebbf98fee3
 MISC metadata.xml 498 BLAKE2B fbe488a6cdb4ec1dffbc8455b1369b35ebdce6f86f7ea0afc7451b838eab586c2b4d7579ce77844412978bf3a1de964793f2a3766d9402b143921d5d00373e85 SHA512 3a9f7942d0c87655067e13537ffd7f050f87c964a25be650ff38ea4d217dfe84e3a0508f7c14333d8be5f8c191711720d83837e447f0fb1d0213dc439c5a9fb7
diff --git a/dev-python/pyphen/pyphen-0.12.0-r1.ebuild b/dev-python/pyphen/pyphen-0.12.0-r1.ebuild
index bdb51ac4775c..56755fa62959 100644
--- a/dev-python/pyphen/pyphen-0.12.0-r1.ebuild
+++ b/dev-python/pyphen/pyphen-0.12.0-r1.ebuild
@@ -15,7 +15,7 @@ S=${WORKDIR}/${P^}
 
 LICENSE="GPL-2+ LGPL-2+ MPL-1.1"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~riscv x86"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/pypugjs/Manifest b/dev-python/pypugjs/Manifest
index 50af08f798aa..9ddb6195c837 100644
--- a/dev-python/pypugjs/Manifest
+++ b/dev-python/pypugjs/Manifest
@@ -1,5 +1,7 @@
 DIST pypugjs-5.9.10.tar.gz 48890 BLAKE2B 474a7d4bffaac17e282d7cd910cafc58d9d25d2d1250159cafe454e6a706eaaa9937c31129061c96b8a1f5eb008344e446ea3d86d0e9f02cefc614653ce6cdfe SHA512 f7bfe3567c40f485e048710c31d40ed008a85353f48169056a6f5e48907bf7999b0142b32b45ff413e08aef81811039af9384c86c259adb4d8458cbca422eefb
+DIST pypugjs-5.9.11.tar.gz 51440 BLAKE2B 19aa91fadb1bcfe871420001429ac17559e136015649b94d2a0ec4b80fffa5dcbed672ac036f8865623acdf51b6188bf195a9a27b55612cf7f1c8285fd8d4a68 SHA512 512f5e0296166e73fc12fff816acf35729173a0d275661df36e536ea9a86300f2eea01440d028fa6faeab0d7bfe6e634acab22ed89d97558eec948d3726197c6
 DIST pypugjs-5.9.9.tar.gz 49022 BLAKE2B 26bdad4bd951eb8e515a0c181a56f68a8fdf8131dbd9e61c32c266bd91575143006f3cb6c2f477a2406110b22ed279a1167821a1b1f403a73bb333013173db2a SHA512 f34fab60e4f9d0680a36e5d2a28c5f99668c13b296a1bb70778dced235d223c592d49adbadc2f70b1a7e350f28a2f29dbce8febe2b8e99d60a0e050254180c71
 EBUILD pypugjs-5.9.10.ebuild 1124 BLAKE2B 690feaa0e12cb860d254af786d53ab33fb5d82aa180c551029bc8be9da2553fc60fbd435a5787bab30aaa65173db672be60eee459fbd029073aa099b5dc5d671 SHA512 f84a692f968127b260c89b5cd5005098f2cc5252bee6a070b66e3f06835d150537b19537a63fd1d4921acaa335d22075ee26783d1fba645daaa278478702d4f1
+EBUILD pypugjs-5.9.11.ebuild 1194 BLAKE2B 8ada222997eadcfdbfaeef250454a730129c96301782440366e5914f5a1bc0157a2533621e8ee159f2802d84178770dcb214330212f792a7f9ec342bf1a93e99 SHA512 373ace770d2f596f067d44038d4f01c0de834c4b8aea0c2d4086e0a3c29f60cb82eb17b7b992d374349ee7bd53e5af4a579be72d73f81cc23baeb85c55ab829c
 EBUILD pypugjs-5.9.9.ebuild 1117 BLAKE2B 81d4c83a00f438b23a5e3e969291309d61185b5c7559f626c5d53746a0c6161d84fb5451321bf533bae5b94cabfae48fbb1ee48867f8c5ede4ccbd8e0cfd81da SHA512 1e3894ecafdaa82d6af1c928f026e3711186e2344def94c791bd5022163935fa0dbed8ab6040986ce3640bf6f8b29b7f3d22bd8c36989d24f1d69a2b69157080
 MISC metadata.xml 755 BLAKE2B 9ff779edea415203b9433d398d03a465465e53dd1cf767914d870b1e0388f691d40e30eab978485373835a959d2104e41d1918c99bceb09063b671566149e4c1 SHA512 a8b75ce0bfa50bdfa05ed7744e1600c1e427f5b850fadcb2631d041d78beb48291726e87c981cc0594e8d56ef7a53255db4a32cb32c4965a4f9ba6f558c49618
diff --git a/dev-python/pypugjs/pypugjs-5.9.11.ebuild b/dev-python/pypugjs/pypugjs-5.9.11.ebuild
new file mode 100644
index 000000000000..9e4b4ca3d236
--- /dev/null
+++ b/dev-python/pypugjs/pypugjs-5.9.11.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Pug (Jade) syntax adapter for Django, Jinja2 and Mako templates"
+HOMEPAGE="https://github.com/kakulukia/pypugjs"
+SRC_URI="https://github.com/kakulukia/pypugjs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv"
+
+RDEPEND="
+	>=dev-python/six-1.15.0[${PYTHON_USEDEP}]
+	>=dev-python/chardet-4.0.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/django[${PYTHON_USEDEP}]
+		>=dev-python/jinja-3.1.1[${PYTHON_USEDEP}]
+		>=dev-python/mako-1.1.3[${PYTHON_USEDEP}]
+		>=www-servers/tornado-6.0.4[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests nose
+
+src_prepare() {
+	# Remove pyramid backend as pyramid isn't packaged
+	rm -r pypugjs/ext/pyramid || die
+	distutils-r1_src_prepare
+}
+
+pkg_postinst() {
+	optfeature "converting to Django output" dev-python/django
+	optfeature "converting to Jinja2 output" dev-python/jinja
+	optfeature "converting to Mako output" dev-python/mako
+	optfeature "converting to Tornado output" www-servers/tornado
+}
diff --git a/dev-python/pypy-exe-bin/Manifest b/dev-python/pypy-exe-bin/Manifest
index b92a4d13fb85..75df5f3732bd 100644
--- a/dev-python/pypy-exe-bin/Manifest
+++ b/dev-python/pypy-exe-bin/Manifest
@@ -1,4 +1,7 @@
 DIST pypy-exe-7.3.8-1.amd64.xpak 13659803 BLAKE2B 438206eb417422b749d21ba0de71611147df9d0a40b6bef12bfc068fab92e7cd39878b1f15c97b6efe3f2751b29efd2f7ee9a6d084fc405384012b3c3e327552 SHA512 2c88e383302b8c873e1dcab1d24e0fc0455f751c2e5617926e97aa2414d84a437477ab029b9ae0751c418658250f13b54cb8abc871bd543ec58e392acdf4195f
 DIST pypy-exe-7.3.8-1.x86.xpak 10179209 BLAKE2B e7d32ca389ab1dd92acc848caca0fb8e965f25f0ec9b3ca433984417d5979e4742926fcd5d6566eb89e19513b6fd02adcc1c5ef3305c52db84107cf14af1010a SHA512 df6086c046e6ad1da3d4d04dbc1bd6889b0ff760e6e10d4fd85c7add22cfaa31d6873dabaa18593aadc3e52d837043b3be1fec474c829debd79612adb7b0d07a
+DIST pypy-exe-7.3.9-1.amd64.xpak 13757730 BLAKE2B d5e2bddc32a9cd199d01280dfbe2ff6e73583094583bf9ec3bc469911754df86270c8cfc5a9284cf06dba7ce267d897f864f6f357418e96e853a6e0f31d627e6 SHA512 570ca27d1ca411281a002c9c33ebb54d088032d6aa1898967e637f6bf06c8a32a16576f8c637fc13a0fb8294e7ba5b0b9b16600902037680b7d7f2b4edd6cfe7
+DIST pypy-exe-7.3.9-1.x86.xpak 10132659 BLAKE2B 2a7e1e587f38178861f958ab40864f3d4f1df80dd7495eb31ac493d0bfa1b4a42278bb1fe9219148b6d04377588c33e8606e59e93c53c08b867f5408a39b2efb SHA512 57cfdd0c9e9b44aae882069f356935be1719bf737d9fbd1fde75b724269bd69cffc62c8cec77a863eab5260d76bfe689dcc6c78fda55a4952b496a6d5ac5acc0
 EBUILD pypy-exe-bin-7.3.8.ebuild 1126 BLAKE2B 76dc66d2136deded08828868e447174826745f6fa32b24ef4a552a9bf0f401e113c650aa634a7ef93a81a2ae46deeabfab10174c6a97e7daf32ef0a296012a93 SHA512 4c4a9818436532ed18dc1070eb7d3b57940f1c4e90f5591a180d913423947b9520bd1fe986d003258de474a443bb9c0ab21eb692722f0283c4089c3ae9c12c70
+EBUILD pypy-exe-bin-7.3.9.ebuild 1133 BLAKE2B 459339686056ed66e5c4edc95436e0d07f149454132d12041b1ee070d20375e46b83111a76b6839d4203ed0c9de56a386f866ce3397e3b5c05cd06c4c6e68daa SHA512 599ae1fcb65cc50df7d2627a17f265ca155bdcc23e0cd429cb21334222c45688202cb3f60ce0790d48347733da2f83e2449585e67f773d2842b89410e78dbdae
 MISC metadata.xml 241 BLAKE2B 4f18c355c71824c25df283b2d463a5abbf2295446e74b960e868dd78d4910ac066725450478087567a6e66b7a8948d99e053f13a7e58dbf2b89fdaf5c2f3436c SHA512 c46e70ffd66754ad84c64806f2bbff25ba9a688f035176a4565afc95351ce10fffba64bbde89965501460b05978c7e59b3d84db6a8cb6efff4055d4b7a5ab5d8
diff --git a/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.9.ebuild b/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.9.ebuild
new file mode 100644
index 000000000000..d76fbfe03b24
--- /dev/null
+++ b/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.9.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit pax-utils
+
+MY_P=pypy-exe-${PV}-1
+DESCRIPTION="PyPy executable (pre-built version)"
+HOMEPAGE="https://www.pypy.org/"
+SRC_URI="
+	amd64? (
+		https://dev.gentoo.org/~mgorny/binpkg/amd64/pypy/dev-python/pypy-exe/${MY_P}.xpak
+			-> ${MY_P}.amd64.xpak
+	)
+	x86? (
+		https://dev.gentoo.org/~mgorny/binpkg/x86/pypy/dev-python/pypy-exe/${MY_P}.xpak
+			-> ${MY_P}.x86.xpak
+	)
+"
+S="${WORKDIR}"
+
+LICENSE="MIT"
+SLOT="${PV%_p*}"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=sys-libs/zlib-1.1.3:0/1
+	|| (
+		dev-libs/libffi-compat:7
+		dev-libs/libffi:0/7
+	)
+	virtual/libintl:0/0
+	dev-libs/expat:0/0
+	app-arch/bzip2:0/1
+	sys-libs/ncurses:0/6
+	!dev-python/pypy-exe:${SLOT}
+"
+
+QA_PREBUILT="
+	usr/lib/pypy2.7/pypy-c-${SLOT}
+"
+
+src_unpack() {
+	ebegin "Unpacking ${MY_P}.${ARCH}.xpak"
+	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${MY_P}.${ARCH}.xpak")
+	eend ${?} || die "Unpacking ${MY_P} failed"
+}
+
+src_install() {
+	insinto /
+	doins -r usr
+	fperms +x "/usr/lib/pypy2.7/pypy-c-${SLOT}"
+	pax-mark m "${ED}/usr/lib/pypy2.7/pypy-c-${SLOT}"
+}
diff --git a/dev-python/pypy-exe/Manifest b/dev-python/pypy-exe/Manifest
index de793f667912..a890f381e988 100644
--- a/dev-python/pypy-exe/Manifest
+++ b/dev-python/pypy-exe/Manifest
@@ -1,4 +1,7 @@
 DIST pypy2.7-gentoo-patches-7.3.8.tar.xz 7428 BLAKE2B 5362c34929e2053fc9a806e9894f35cce02ba1ebfad66cc64acc200ade4317934ee50dbc072194d19e201dea2a678abd609001ffe7e39bd6890a3b26c9d6d00e SHA512 6a7bfadac8f638e69419a6a1536af595a63bb2b4e3028da6423bd164d3df5399901b217468b1b374a5162ca8d2e5a61c4a19996f9e63109ed414a1aedcaac5d6
+DIST pypy2.7-gentoo-patches-7.3.9.tar.xz 7428 BLAKE2B 0a42e3c04ac0e560d56ce7218db81fa55f74ad45a4a033ccda8c5fba34e3a0b1f06587b5b18e947170cc635bd44e5a7799daeec9319c6a09165a73b32554a4b6 SHA512 3a52d40ccf8d77f3493a763b51e4bf86a808f6478191ed4eeaa4f2c2ce8b75769c3880d07cbc7614d8af5573f3e8edfe694be41626b947f3d06c321cf4f59abd
 DIST pypy2.7-v7.3.8-src.tar.bz2 23279006 BLAKE2B 7b2f5bfaffb99d3444f355039f743a21016dea22cc78cd5feca05eb12ce0e5ed39dafd22a8726994d0aff789e68b506197680e7181087313d2c5cd17b674ae4d SHA512 6ff90fad998c25aec5823e61d65266c169e89cba2ee2e3b6d0864d34d69a6b9fe7ad4d591bc8b38a48c5c22ea3dd468d3188cd34e03746c258752eaa24ac3ae2
+DIST pypy2.7-v7.3.9-src.tar.bz2 23328628 BLAKE2B 50d015439b6a6f15dd24eb4524726a2054f0d8e7ef209b54dc4eb9365b41b333f3dad525422316af3ff19e6ffb5866859db4455e05fc1529a81ce3b6e7c621db SHA512 8d7513d4efe924f2456dd65a45a82dd16171f7962c81ba90f2a168c332cdad78ceffa3ed1af379c09e61082b39d5c2a8385cd77c89b698c47cc75e9df1bb4d2a
 EBUILD pypy-exe-7.3.8.ebuild 4304 BLAKE2B f43f62bfec5b1b28710c0020d24fe303c8bb66a305ab0f0a7091ae6828ded8bd1321b03beb429c6771d7d54ef9fac0e03467906db9bc144c5ef713dac17fb486 SHA512 04c045e764b54631267bf9f5aa76e999cd6b8a262998ce2c9170c2b70c705aee0d8273d2c822cfd1cccbd608fd093d5583895c84e236f0a5db82baab15e1658e
+EBUILD pypy-exe-7.3.9.ebuild 4316 BLAKE2B 62198a42b061d89c38f0bf548959d647381e495e205811eee0b043b5529a0cc2ab2f06a2fd853691fa591b865ee1c0c421af12eefd37768cf1f0f9bc336ac1d8 SHA512 95ee0453a3fc51476e82169ce42a74abeec2eaf95415486c62aa2f17e90cadb3780d94cc058df61775c632856103fa4d5ffbfa906a12fd86172233cdfbb6ad34
 MISC metadata.xml 498 BLAKE2B 8dbcdb7c3a4a2fa5d1a922fd5197fb5e3337adcaec1e7d382f25f8696c80726e5b79843477bf8e5ce131aecde6e2c4c283548c5b337e54cb58aaa066013c445a SHA512 8a9bb514bbf3bf328aa63734e1fdc106f6aaf5ccb88c29ad8a686ab2724f3d1f4727163500013dd16e7b34232b881cf47d2f174212b5428ee076af27cf43628d
diff --git a/dev-python/pypy-exe/pypy-exe-7.3.9.ebuild b/dev-python/pypy-exe/pypy-exe-7.3.9.ebuild
new file mode 100644
index 000000000000..c502c75abbe3
--- /dev/null
+++ b/dev-python/pypy-exe/pypy-exe-7.3.9.ebuild
@@ -0,0 +1,185 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python2_7 )
+inherit check-reqs pax-utils python-any-r1 toolchain-funcs
+
+PYPY_PV=${PV%_p*}
+MY_P=pypy2.7-v${PYPY_PV/_}
+PATCHSET="pypy2.7-gentoo-patches-${PV/_}"
+
+DESCRIPTION="PyPy executable (build from source)"
+HOMEPAGE="https://www.pypy.org/"
+SRC_URI="
+	https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2
+	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
+"
+S="${WORKDIR}/${MY_P}-src"
+
+LICENSE="MIT"
+SLOT="${PYPY_PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="bzip2 +jit low-memory ncurses cpu_flags_x86_sse2"
+
+RDEPEND="
+	>=sys-libs/zlib-1.1.3:0=
+	dev-libs/libffi:0=
+	virtual/libintl:0=
+	dev-libs/expat:0=
+	bzip2? ( app-arch/bzip2:0= )
+	ncurses? ( sys-libs/ncurses:0= )
+	!dev-python/pypy-exe-bin:${PYPY_PV}
+"
+# don't enforce the dep on pypy with USE=low-memory since it's going
+# to cause either collisions or circular dep on itself
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	!low-memory? (
+		|| (
+			dev-python/pypy
+			dev-lang/python:2.7
+		)
+	)
+"
+
+check_env() {
+	if use low-memory; then
+		if ! has_version -b dev-python/pypy &&
+				! has_version -b dev-python/pypy-bin
+		then
+			eerror "USE=low-memory requires a (possibly old) version of dev-python/pypy"
+			eerror "being installed. Please install it using e.g.:"
+			eerror
+			eerror "  $ emerge -1v dev-python/pypy dev-python/pypy-exe-bin"
+			eerror
+			eerror "before attempting to build dev-python/pypy-exe[low-memory]."
+			die "dev-python/pypy needs to be installed for USE=low-memory"
+		fi
+
+		CHECKREQS_MEMORY="1750M"
+		use amd64 && CHECKREQS_MEMORY="3500M"
+	else
+		CHECKREQS_MEMORY="3G"
+		use amd64 && CHECKREQS_MEMORY="6G"
+	fi
+
+	check-reqs_pkg_pretend
+}
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && check_env
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		check_env
+
+		use low-memory && EPYTHON=
+		if [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]] &&
+				{ has_version -b dev-python/pypy ||
+				has_version -b dev-python/pypy-bin; }
+		then
+			einfo "Using already-installed PyPy to perform the translation."
+			EPYTHON=pypy
+		else
+			einfo "Using ${EPYTHON} to perform the translation. Please note that upstream"
+			einfo "recommends using PyPy for that. If you wish to do so, please unset"
+			einfo "the EPYTHON variable."
+			python-any-r1_pkg_setup
+		fi
+	fi
+}
+
+src_prepare() {
+	local PATCHES=(
+		"${WORKDIR}/${PATCHSET}"
+	)
+	default
+}
+
+src_configure() {
+	tc-export CC
+
+	local jit_backend
+	if use jit; then
+		jit_backend='--jit-backend='
+
+		# We only need the explicit sse2 switch for x86.
+		# On other arches we can rely on autodetection which uses
+		# compiler macros. Plus, --jit-backend= doesn't accept all
+		# the modern values...
+
+		if use x86; then
+			if use cpu_flags_x86_sse2; then
+				jit_backend+=x86
+			else
+				jit_backend+=x86-without-sse2
+			fi
+		else
+			jit_backend+=auto
+		fi
+	fi
+
+	local args=(
+		--no-shared
+		$(usex jit -Ojit -O2)
+
+		${jit_backend}
+
+		pypy/goal/targetpypystandalone
+	)
+
+	# Avoid linking against libraries disabled by use flags
+	local opts=(
+		bzip2:bz2
+		ncurses:_minimal_curses
+	)
+
+	local opt
+	for opt in "${opts[@]}"; do
+		local flag=${opt%:*}
+		local mod=${opt#*:}
+
+		args+=(
+			$(usex ${flag} --withmod --withoutmod)-${mod}
+		)
+	done
+
+	local interp=( "${EPYTHON}" )
+	if use low-memory; then
+		interp=( env PYPY_GC_MAX_DELTA=200MB
+			"${EPYTHON}" --jit loop_longevity=300 )
+	fi
+
+	if [[ ${EPYTHON} != pypy ]]; then
+		# reuse bundled pycparser to avoid external dep
+		mkdir -p "${T}"/pymod/cffi || die
+		: > "${T}"/pymod/cffi/__init__.py || die
+		cp -r lib_pypy/cffi/_pycparser "${T}"/pymod/cffi/ || die
+		local -x PYTHONPATH=${T}/pymod:${PYTHONPATH}
+	fi
+
+	# translate into the C sources
+	# we're going to build them ourselves since otherwise pypy does not
+	# free up the unneeded memory before spawning the compiler
+	set -- "${interp[@]}" rpython/bin/rpython --batch --source "${args[@]}"
+	echo -e "\033[1m${@}\033[0m"
+	"${@}" || die "translation failed"
+}
+
+src_compile() {
+	emake -C "${T}"/usession*-0/testing_1
+}
+
+src_install() {
+	local dest=/usr/lib/pypy2.7
+	exeinto "${dest}"
+	newexe "${T}"/usession*-0/testing_1/pypy-c pypy-c-${PYPY_PV}
+	insinto "${dest}"/include/${PYPY_PV}
+	doins include/pypy_*
+	pax-mark m "${ED}${dest}/pypy-c-${PYPY_PV}"
+}
diff --git a/dev-python/pypy/Manifest b/dev-python/pypy/Manifest
index 33870ff83bef..694eb63fd10f 100644
--- a/dev-python/pypy/Manifest
+++ b/dev-python/pypy/Manifest
@@ -1,4 +1,7 @@
 DIST pypy2.7-gentoo-patches-7.3.8.tar.xz 7428 BLAKE2B 5362c34929e2053fc9a806e9894f35cce02ba1ebfad66cc64acc200ade4317934ee50dbc072194d19e201dea2a678abd609001ffe7e39bd6890a3b26c9d6d00e SHA512 6a7bfadac8f638e69419a6a1536af595a63bb2b4e3028da6423bd164d3df5399901b217468b1b374a5162ca8d2e5a61c4a19996f9e63109ed414a1aedcaac5d6
+DIST pypy2.7-gentoo-patches-7.3.9.tar.xz 7428 BLAKE2B 0a42e3c04ac0e560d56ce7218db81fa55f74ad45a4a033ccda8c5fba34e3a0b1f06587b5b18e947170cc635bd44e5a7799daeec9319c6a09165a73b32554a4b6 SHA512 3a52d40ccf8d77f3493a763b51e4bf86a808f6478191ed4eeaa4f2c2ce8b75769c3880d07cbc7614d8af5573f3e8edfe694be41626b947f3d06c321cf4f59abd
 DIST pypy2.7-v7.3.8-src.tar.bz2 23279006 BLAKE2B 7b2f5bfaffb99d3444f355039f743a21016dea22cc78cd5feca05eb12ce0e5ed39dafd22a8726994d0aff789e68b506197680e7181087313d2c5cd17b674ae4d SHA512 6ff90fad998c25aec5823e61d65266c169e89cba2ee2e3b6d0864d34d69a6b9fe7ad4d591bc8b38a48c5c22ea3dd468d3188cd34e03746c258752eaa24ac3ae2
+DIST pypy2.7-v7.3.9-src.tar.bz2 23328628 BLAKE2B 50d015439b6a6f15dd24eb4524726a2054f0d8e7ef209b54dc4eb9365b41b333f3dad525422316af3ff19e6ffb5866859db4455e05fc1529a81ce3b6e7c621db SHA512 8d7513d4efe924f2456dd65a45a82dd16171f7962c81ba90f2a168c332cdad78ceffa3ed1af379c09e61082b39d5c2a8385cd77c89b698c47cc75e9df1bb4d2a
 EBUILD pypy-7.3.8.ebuild 4970 BLAKE2B 5a02ea5af0d28b944b26cb51ad2be044cc724351e3c9a89237a75520cd0f436eb539f095ea101e221c359bac6802cb12856e5a0445f35864176685d5c1e0206c SHA512 dcbbe30c25a792d9bc85908ce80744f5c6b968188073ff48aa1242b6861945edf2d375b16095b31a00a2aabe8057b4ad6508fc76ddc618c1942edcd164b117a4
+EBUILD pypy-7.3.9.ebuild 5045 BLAKE2B 6cff2ae266e691218b2f0d301b6bbdffe421efaaf129e59911d20b9be9392b7fc1c8b39477621039241a2d42662daf98fdadd053b8d5927e1b713dcf061478ae SHA512 29440549351c8ca4716733aabb32310986d1c1df2c30b627752718d5b5dd20e739c0adf4d987cd2c7f54ffba7d02ca3fcbd859be7f5b64e3e3fab00f8767655d
 MISC metadata.xml 241 BLAKE2B 4f18c355c71824c25df283b2d463a5abbf2295446e74b960e868dd78d4910ac066725450478087567a6e66b7a8948d99e053f13a7e58dbf2b89fdaf5c2f3436c SHA512 c46e70ffd66754ad84c64806f2bbff25ba9a688f035176a4565afc95351ce10fffba64bbde89965501460b05978c7e59b3d84db6a8cb6efff4055d4b7a5ab5d8
diff --git a/dev-python/pypy/pypy-7.3.9.ebuild b/dev-python/pypy/pypy-7.3.9.ebuild
new file mode 100644
index 000000000000..0ba6e357497b
--- /dev/null
+++ b/dev-python/pypy/pypy-7.3.9.ebuild
@@ -0,0 +1,183 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit pax-utils python-utils-r1
+
+PYPY_PV=${PV%_p*}
+MY_P=pypy2.7-v${PYPY_PV/_}
+PATCHSET="pypy2.7-gentoo-patches-${PV/_rc/rc}"
+
+DESCRIPTION="A fast, compliant alternative implementation of the Python language"
+HOMEPAGE="https://www.pypy.org/"
+SRC_URI="
+	https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2
+	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
+"
+S="${WORKDIR}/${MY_P}-src"
+
+LICENSE="MIT"
+# pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")'
+SLOT="0/73"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="bzip2 gdbm +jit ncurses sqlite tk"
+
+RDEPEND="
+	|| (
+		>=dev-python/pypy-exe-${PYPY_PV}:${PYPY_PV}[bzip2?,ncurses?]
+		>=dev-python/pypy-exe-bin-${PYPY_PV}:${PYPY_PV}
+	)
+	dev-libs/openssl:0=
+	gdbm? ( sys-libs/gdbm:0= )
+	sqlite? ( dev-db/sqlite:3= )
+	tk? (
+		dev-lang/tk:0=
+		dev-tcltk/tix:0=
+	)
+	!<dev-python/pypy-bin-7.3.0:0
+"
+DEPEND="
+	${RDEPEND}
+"
+
+src_prepare() {
+	local PATCHES=(
+		"${WORKDIR}/${PATCHSET}"
+	)
+	default
+}
+
+src_compile() {
+	# copy over to make sys.prefix happy
+	cp -p "${BROOT}"/usr/lib/pypy2.7/pypy-c-${PYPY_PV} pypy-c || die
+	cp -p "${BROOT}"/usr/lib/pypy2.7/include/${PYPY_PV}/* include/ || die
+	# (not installed by pypy)
+	rm pypy/module/cpyext/include/_numpypy/numpy/README || die
+	mv pypy/module/cpyext/include/* include/ || die
+	mv pypy/module/cpyext/parse/*.h include/ || die
+	pax-mark m pypy-c
+
+	# verify the subslot
+	local soabi=$(
+		./pypy-c - <<-EOF
+			import sysconfig
+			print sysconfig.get_config_var("SOABI")
+		EOF
+	)
+	[[ ${soabi#pypy-} == ${SLOT#*/} ]] || die "update subslot to ${soabi}"
+
+	einfo "Generating caches and CFFI modules ..."
+
+	# Generate Grammar and PatternGrammar pickles.
+	./pypy-c - <<-EOF || die "Generation of Grammar and PatternGrammar pickles failed"
+		import lib2to3.pygram
+		import lib2to3.patcomp
+		lib2to3.patcomp.PatternCompiler()
+	EOF
+
+	# Generate cffi modules
+	# Please keep in sync with pypy/tool/build_cffi_imports.py!
+	cffi_targets=( pypy_util ssl audioop syslog pwdgrp resource )
+	use gdbm && cffi_targets+=( gdbm )
+	use ncurses && cffi_targets+=( curses )
+	use sqlite && cffi_targets+=( sqlite3 )
+	use tk && cffi_targets+=( tkinter/tklib )
+
+	local t
+	# all modules except tkinter output to .
+	# tkinter outputs to the correct dir ...
+	cd lib_pypy || die
+	for t in "${cffi_targets[@]}"; do
+		# tkinter doesn't work via -m
+		../pypy-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
+	done
+
+	# Verify that CFFI module list is up-to-date
+	local expected_cksum=2d3acf18
+	local local_cksum=$(
+		../pypy-c - <<-EOF
+			import binascii
+			import json
+			from pypy_tools.build_cffi_imports import cffi_build_scripts as x
+			print("%08x" % (binascii.crc32(json.dumps(x)),))
+		EOF
+	)
+	if [[ ${local_cksum} != ${expected_cksum} ]]; then
+		die "Please verify cffi_targets and update checksum to ${local_cksum}"
+	fi
+
+	# Cleanup temporary objects
+	find -name "_cffi_*.[co]" -delete || die
+	find -type d -empty -delete || die
+}
+
+src_test() {
+	# (unset)
+	local -x PYTHONDONTWRITEBYTECODE=
+	local -x COLUMNS=80
+
+	local ignored_tests=(
+		# network
+		--ignore=lib-python/2.7/test/test_urllibnet.py
+		--ignore=lib-python/2.7/test/test_urllib2net.py
+		# lots of free space
+		--ignore=lib-python/2.7/test/test_zipfile64.py
+
+		# broken by expat-2.4.5
+		--ignore=lib-python/2.7/test/test_minidom.py
+		--ignore=lib-python/2.7/test/test_xml_etree.py
+		--ignore=lib-python/2.7/test/test_xml_etree_c.py
+	)
+
+	./pypy-c ./pypy/test_all.py --pypy=./pypy-c -vv \
+		"${ignored_tests[@]}" lib-python || die
+}
+
+src_install() {
+	local dest=/usr/lib/pypy2.7
+	einfo "Installing PyPy ..."
+	dosym pypy-c-${PYPY_PV} "${dest}/pypy-c"
+	insinto "${dest}"
+	# preserve mtimes to avoid obsoleting caches
+	insopts -p
+	doins -r include lib_pypy lib-python
+
+	# replace copied headers with symlinks
+	for x in "${BROOT}"/usr/lib/pypy2.7/include/${PYPY_PV}/*; do
+		dosym "${PYPY_PV}/${x##*/}" "${dest}/include/${x##*/}"
+	done
+
+	dosym ../lib/pypy2.7/pypy-c /usr/bin/pypy
+	dodoc README.rst
+
+	if ! use gdbm; then
+		rm -r "${ED}${dest}"/lib_pypy/gdbm.py \
+			"${ED}${dest}"/lib-python/*2.7/test/test_gdbm.py || die
+	fi
+	if ! use sqlite; then
+		rm -r "${ED}${dest}"/lib-python/*2.7/sqlite3 \
+			"${ED}${dest}"/lib_pypy/_sqlite3.py \
+			"${ED}${dest}"/lib-python/*2.7/test/test_sqlite.py || die
+	fi
+	if ! use tk; then
+		rm -r "${ED}${dest}"/lib-python/*2.7/{idlelib,lib-tk} \
+			"${ED}${dest}"/lib_pypy/_tkinter \
+			"${ED}${dest}"/lib-python/*2.7/test/test_{tcl,tk,ttk*}.py || die
+	fi
+
+	local -x EPYTHON=pypy
+	local -x PYTHON=${ED}${dest}/pypy-c-${PYPY_PV}
+	# temporarily copy to build tree to facilitate module builds
+	cp -p "${BROOT}${dest}/pypy-c-${PYPY_PV}" "${PYTHON}" || die
+
+	echo "EPYTHON='${EPYTHON}'" > epython.py || die
+	python_moduleinto /usr/lib/pypy2.7/site-packages
+	python_domodule epython.py
+
+	einfo "Byte-compiling Python standard library..."
+	python_optimize "${ED}${dest}"
+
+	# remove to avoid collisions
+	rm "${PYTHON}" || die
+}
diff --git a/dev-python/pypy3-exe-bin/Manifest b/dev-python/pypy3-exe-bin/Manifest
index 00921c6f92fb..28495b03bf3d 100644
--- a/dev-python/pypy3-exe-bin/Manifest
+++ b/dev-python/pypy3-exe-bin/Manifest
@@ -1,7 +1,7 @@
-DIST pypy3-exe-7.3.7-1.amd64.xpak 12149428 BLAKE2B 468fe50d8b607793438bc59179acb32cafdebed4400142e01db7e6af2d920ae5527067b6e83999fa3ab0cf61e420b9ceff5ed1a755675d364520ff9afbb67ca0 SHA512 b7d508f7718216c9ea4c36189ab952bc672a4c5167e406f0d0a335a630ee45b4939c8ab738ec3a201fd74e818196b8519bdbb0eca594d3e713b1d0b36f2d4a81
-DIST pypy3-exe-7.3.7-1.x86.xpak 9221421 BLAKE2B fc24f93533127f48ffc5974dfd3eb4611442489aee6318ccb911a2f3e3d234bc44c659309006ffe55eb6de3a00915fa3aaf6dc50e4efb1adb668d0d38281cf3c SHA512 9322a25ad230615cc96b81448a0591f730a5d09b57c02259412d427290934074baeb48f58f3829d393137252d5cf1b3f0fdd3b50d9194d69ea3ab38fbe83abac
 DIST pypy3-exe-7.3.8-1.amd64.xpak 12480863 BLAKE2B 4db76687e1662a9674dcf2ac863cf837b27551874613ee94281cd0d2e701214fc65181ae54a52246d8d0cd01631e0a35fe0c044ea916a488e53aa6e8850c95c4 SHA512 dee849a1e066ef28ab1bedd37cc3a89a087f5cf44d2144862df7825880a1b6bd3238dbe94e4ca47a2009945cb716b8720bec42e32228afeaebd69d5ac6c1e077
 DIST pypy3-exe-7.3.8-1.x86.xpak 9211472 BLAKE2B d0fd9fc64fb29367dfa017ac9654c699f11386f4a661cfad12cbb2b543f6ab4bf74a9f5131da3ae1307d03fce1d801d4b04c9bdd43c2ee42592e8658c91fae39 SHA512 5311a7aa24b8ea24ee408f3f0ff1efb14ca9875d36991f3e842819841d304a3df000679712b6e2d00095590bc684c262c44a4f9ad8e41fadaf0b0e0ffb0fc220
-EBUILD pypy3-exe-bin-7.3.7.ebuild 1138 BLAKE2B c2fad37fb85673233047e0dfa7b20a9be8ae1b1950988a2d658225a0b6a3888dd051eef3db1d5f6e63839595664e01b88ac3beba5f5a83f218ac3993f36c70ac SHA512 01e0cf7a073ed790bb092d60b37810c34a907016ba7d2ffa7788bf611a0341d818f6ebd5c7436abe5ed4aef5999cf10c04a04dae8da164353f60406a43174c65
-EBUILD pypy3-exe-bin-7.3.8.ebuild 1148 BLAKE2B 8b42ecdec4f2ccbedc97abe63db58dbce8d3d2d57fbda09d361767fc1686ee66c2528c035c68570155f7a575bd3ef6a3fc1c4d1a7350ba3a2b4a31be12e4a683 SHA512 ddd505e5a8d92f4103a13f6bb8a9430b60f10caa6c6518e11510a54f04f4bb9fb458777530bffe5c2c536241c3e612bf04447fd98ef40d8da31c6111a54f7491
+DIST pypy3-exe-7.3.9-1.amd64.xpak 12455132 BLAKE2B 09ad89ca1d7ba84ff1b5c0d925c02617567d8d6c659774e980dc9e56fd1bd5eef9b612631d64ace8218bdd2c5723cad174d49ac3c5ef442d244f2ba21ebb6d0d SHA512 078f57a0027680ff061f137a47fa5349254a086e1c28eb81fd9d89079bd3894902b532cde39c5214b0a686fd1a1dba2589f1fb0f9c5e6ff43cc7f4db97b3c181
+DIST pypy3-exe-7.3.9-1.x86.xpak 9239282 BLAKE2B d44b9f3410a94ad41c1f49abe641460464ae6266478e7c38a994ded97fd70f50a041977fc72fe11a1c7fcfc9aeae4782564c2cbaaf8477a0eef60e443ec837e1 SHA512 1a073254e0c6bef089169a138a84ff6efe377374b9f263f58f856bba937f8e6249d835e3bdc9a68792e7178105e03a67dee3a3e5307089b6ed3b846ae8ee73ed
+EBUILD pypy3-exe-bin-7.3.8.ebuild 1147 BLAKE2B 2adb00d3f373ce4bb089240da7d0b2dda2cd7b5f99050a079e06f503ca963a987e94c91ff5b63a43867abdd6ed5f950a6bd89290a1ebacd235ef4bd6e126e218 SHA512 b8d9dd7cf28d2e7d162dca6d45ab2febecfaf6f8df8e026fcb1d73f1fbba4316d4660b3fe9332ebbee13c688952d1809385d34a3572b5bd6d3f7cdb12f6af64d
+EBUILD pypy3-exe-bin-7.3.9.ebuild 1154 BLAKE2B a715fbbe2bf6618044a5df7897b480e538d79445d949633fa10aa34062bbc500bcf98f89adbeaffd4e4398dc3a93206fae8ac5b3d895bce27adc7e2a39dfd047 SHA512 02178eec47c5d9c97d91556222a37322a76304229dee296b90429468cf0324bdc640c16b016a98886ee7b6ab5e9d24bfa0aa054f6940baa56014cc56960b3081
 MISC metadata.xml 241 BLAKE2B 4f18c355c71824c25df283b2d463a5abbf2295446e74b960e868dd78d4910ac066725450478087567a6e66b7a8948d99e053f13a7e58dbf2b89fdaf5c2f3436c SHA512 c46e70ffd66754ad84c64806f2bbff25ba9a688f035176a4565afc95351ce10fffba64bbde89965501460b05978c7e59b3d84db6a8cb6efff4055d4b7a5ab5d8
diff --git a/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.8.ebuild b/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.8.ebuild
index d55bb03c5536..49406f826995 100644
--- a/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.8.ebuild
+++ b/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.8.ebuild
@@ -21,7 +21,7 @@ S="${WORKDIR}"
 
 LICENSE="MIT"
 SLOT="3.9-${PV%_p*}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND=">=sys-libs/zlib-1.1.3:0/1
 	|| (
@@ -32,7 +32,7 @@ RDEPEND=">=sys-libs/zlib-1.1.3:0/1
 	dev-libs/expat:0/0
 	app-arch/bzip2:0/1
 	sys-libs/ncurses:0/6
-	!dev-python/pypy-exe:${SLOT}"
+	!dev-python/pypy3-exe:${SLOT}"
 
 PYPY_PV=${PV%_p*}
 QA_PREBUILT="
diff --git a/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.7.ebuild b/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.9.ebuild
index a74793cbe913..0648b4f51293 100644
--- a/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.7.ebuild
+++ b/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,14 +16,16 @@ SRC_URI="
 	x86? (
 		https://dev.gentoo.org/~mgorny/binpkg/x86/pypy/dev-python/pypy3-exe/${MY_P}.xpak
 			-> ${MY_P}.x86.xpak
-	)"
+	)
+"
 S="${WORKDIR}"
 
 LICENSE="MIT"
-SLOT="${PV%_p*}"
-KEYWORDS="amd64 x86"
+SLOT="3.9-${PV%_p*}"
+KEYWORDS="~amd64 ~x86"
 
-RDEPEND=">=sys-libs/zlib-1.1.3:0/1
+RDEPEND="
+	>=sys-libs/zlib-1.1.3:0/1
 	|| (
 		dev-libs/libffi-compat:7
 		dev-libs/libffi:0/7
@@ -32,11 +34,13 @@ RDEPEND=">=sys-libs/zlib-1.1.3:0/1
 	dev-libs/expat:0/0
 	app-arch/bzip2:0/1
 	sys-libs/ncurses:0/6
-	!dev-python/pypy-exe:${SLOT}"
+	!dev-python/pypy3-exe:${SLOT}
+"
 
-PYPY_PV=${SLOT%_p*}
+PYPY_PV=${PV%_p*}
 QA_PREBUILT="
-	usr/bin/pypy3-c-${PYPY_PV}"
+	usr/bin/pypy3.9-c-${PYPY_PV}
+"
 
 src_unpack() {
 	ebegin "Unpacking ${MY_P}.${ARCH}.xpak"
@@ -47,6 +51,6 @@ src_unpack() {
 src_install() {
 	insinto /
 	doins -r usr
-	fperms +x "/usr/bin/pypy3-c-${PYPY_PV}"
-	pax-mark m "${ED}/usr/bin/pypy3-c-${PYPY_PV}"
+	fperms +x "/usr/bin/pypy3.9-c-${PYPY_PV}"
+	pax-mark m "${ED}/usr/bin/pypy3.9-c-${PYPY_PV}"
 }
diff --git a/dev-python/pypy3-exe/Manifest b/dev-python/pypy3-exe/Manifest
index bca60559b28f..655bdd5951ea 100644
--- a/dev-python/pypy3-exe/Manifest
+++ b/dev-python/pypy3-exe/Manifest
@@ -1,7 +1,7 @@
-DIST pypy3.8-gentoo-patches-7.3.7.tar.xz 4396 BLAKE2B adc33a02ada4d22eae0484292ec6cc295805d9f254b7a9110c622628aa40011621a1833ca62d3251e4e5056c406f648e7ad0439bd60e77c38808dd9df46973a5 SHA512 1cda8467de2d749d98fa20d7d200b5f96dae0ca68cf44a054d03f3f148bc3946ba1f1c474ac0336560f79c78b3eddcd4ba24386e83de283c83475b8e4b75bdf8
-DIST pypy3.8-v7.3.7-src.tar.bz2 24375444 BLAKE2B 44fe19ee63d95243c499ecb0b84e77873c73da93320b1e028a5c6c4b167441d223812dc66b16e070308cba48c4d8774738f827319cce9d1769b3f4346e15487c SHA512 9e6701cc441d5535968656cfb0cfa9076c364f9ba32bc6f0ef64f06ab343281e2458dbe88791c0e02401457fbf80d367f397fc904f6146bff68e04a15e05fda2
 DIST pypy3.9-gentoo-patches-7.3.8.tar.xz 1568 BLAKE2B 0011188de7b5757964bd13c49d5995a656a721acd54e1d77f7e77fac7420a2a56ca75eb42709e2304a771fa69c982fc6901e9fc9580ab8e8b35e7bb8b0cc83a6 SHA512 1064e987b7233fc55f94bd49aeeab9a9fd9322e90798439ad9a4c35020ca923fe0670e47406ab180a6f8e7afd65d03be23427d4fa43befa3c0ce172028e1a09f
+DIST pypy3.9-gentoo-patches-7.3.9.tar.xz 1564 BLAKE2B fe0875ef002842a78fb31589f6d0b255c3dea10f2bd014231ae9b17641f65f810ac84fe7961de1a4614249b0166f2127c3aa37947f7d1d4c85860a31b89110f1 SHA512 a1dc3ee36e908e29b2bbbb100a97b7910bd4325c5dc55c0455cdca450d6b272d1463708b383e0607e9499b1932da4442f97d2da57e47ed3a4ff8fd3c78a54732
 DIST pypy3.9-v7.3.8-src.tar.bz2 26277823 BLAKE2B 343fa4a57b69936a586acb036506e25c8de3a9761eb6622ef7266c136a1dc977cabc23969917bc2369fd73b1ae6fef731d81536179107f2d731352e6f5387bf9 SHA512 aed018738af7a225f516ec37d059d539f486d9dd427fe000805147b197f496d5fcb0387e47008524753ad18224aebeb1e68f9e2093acbe37468e02bff92f7126
-EBUILD pypy3-exe-7.3.7.ebuild 3832 BLAKE2B 764497f707495532cce107edc6b8713848bed0ca751715032d15bee05b19ebce42ff6f2d8fd27a5435a18f903bdb1e833245202e642330dd67f5b674901add50 SHA512 696560eae5755631ba98f876095e7e7451a4fe5c52a28117cf6310c57344359089dbab1854e789a20683e0068585874bfd11f4b223be8360a000b51a4e9cc56e
-EBUILD pypy3-exe-7.3.8.ebuild 3795 BLAKE2B 1ff1411d1faed6811e58bae134b50793665be8ffd8e39e256f4b154f033673cb7e0fc3c1943d5ef1bb84217b4e832c2a90a9c387dd8bf723bde04f8e70125d87 SHA512 76721248dc75e7db421f4a3f1c4a5b0639d1ed557e2654171d17200b7dbca8dfd34606b9ce9dfa238fde1400284a2c42eec92a87d450de9a60f173be5768a017
+DIST pypy3.9-v7.3.9-src.tar.bz2 26976726 BLAKE2B bf1ed21c575901abac020120aaff07ab57f1404713211b19cbd1eb4d6ffc675b7933be8c6fffc2b69ab467963d6598534cd5aa90c02feddad596611d2a6b6581 SHA512 83f8a6a2da351c190d2d224242cbc35e35529c7a8e8d842eaf5c945cbce2e172b02a340f32af3d49df8d5288370d794d5bc95fc12dd4a13d817c925abf06198a
+EBUILD pypy3-exe-7.3.8.ebuild 3790 BLAKE2B 58e5d01860e5f9b540df21627c84bf8c7c77e707f3480cf9b0a71b76b799365d82eddc6ae8235d83d2cef4c1f4792ef6fa6a06b40cb9587828897a5b7997df6e SHA512 1e15d3deaa345a12102cebc2f46eb0c8ac0e4260f621fabd3cd53ad2674ca3aca34a84f8867c8e33bb012b7914a8558c71b4edf3fa6c196ec74f25d87805a517
+EBUILD pypy3-exe-7.3.9.ebuild 3802 BLAKE2B 52eb6b7fbc7cc08dadb668d133a70eb92e9e882029b6a4a6dc95747637016ede113e34ad5c24a0b8487eeffbd280b3d012946dbde5a4f212b48f0345f0a49218 SHA512 624842844d2dd444c611d03eeed8932f4462bcd205641f697ee9f5884e3cf71b3cd80d4e6eecb0948b02dc20a2e33118f440ee95681bffadc3d2b8fe3b6116f6
 MISC metadata.xml 498 BLAKE2B 8dbcdb7c3a4a2fa5d1a922fd5197fb5e3337adcaec1e7d382f25f8696c80726e5b79843477bf8e5ce131aecde6e2c4c283548c5b337e54cb58aaa066013c445a SHA512 8a9bb514bbf3bf328aa63734e1fdc106f6aaf5ccb88c29ad8a686ab2724f3d1f4727163500013dd16e7b34232b881cf47d2f174212b5428ee076af27cf43628d
diff --git a/dev-python/pypy3-exe/pypy3-exe-7.3.8.ebuild b/dev-python/pypy3-exe/pypy3-exe-7.3.8.ebuild
index 259314b5d362..e7aa12b834f3 100644
--- a/dev-python/pypy3-exe/pypy3-exe-7.3.8.ebuild
+++ b/dev-python/pypy3-exe/pypy3-exe-7.3.8.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/${MY_P}-src"
 
 LICENSE="MIT"
 SLOT="3.9-${PYPY_PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="bzip2 +jit low-memory ncurses cpu_flags_x86_sse2"
 
 RDEPEND=">=sys-libs/zlib-1.1.3:0=
@@ -28,7 +28,7 @@ RDEPEND=">=sys-libs/zlib-1.1.3:0=
 	dev-libs/expat:0=
 	bzip2? ( app-arch/bzip2:0= )
 	ncurses? ( sys-libs/ncurses:0= )
-	!dev-python/pypy3-exe-bin:${PYPY_PV}"
+	!dev-python/pypy3-exe-bin:${SLOT}"
 DEPEND="${RDEPEND}"
 BDEPEND="
 	low-memory? ( dev-python/pypy )
diff --git a/dev-python/pypy3-exe/pypy3-exe-7.3.7.ebuild b/dev-python/pypy3-exe/pypy3-exe-7.3.9.ebuild
index deff4b1a5c6c..9a7da2c99e68 100644
--- a/dev-python/pypy3-exe/pypy3-exe-7.3.7.ebuild
+++ b/dev-python/pypy3-exe/pypy3-exe-7.3.9.ebuild
@@ -1,35 +1,41 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 # pypy3 needs to be built using python 2
 PYTHON_COMPAT=( python2_7 )
 inherit check-reqs pax-utils python-any-r1 toolchain-funcs
 
 PYPY_PV=${PV%_p*}
-MY_P=pypy3.8-v${PYPY_PV/_}
-PATCHSET="pypy3.8-gentoo-patches-${PV/_}"
+MY_P=pypy3.9-v${PYPY_PV/_}
+PATCHSET="pypy3.9-gentoo-patches-${PV/_}"
 
 DESCRIPTION="PyPy3 executable (build from source)"
 HOMEPAGE="https://www.pypy.org/"
-SRC_URI="https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2
-	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz"
+SRC_URI="
+	https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2
+	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
+"
 S="${WORKDIR}/${MY_P}-src"
 
 LICENSE="MIT"
-SLOT="${PYPY_PV}"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
+SLOT="3.9-${PYPY_PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="bzip2 +jit low-memory ncurses cpu_flags_x86_sse2"
 
-RDEPEND=">=sys-libs/zlib-1.1.3:0=
+RDEPEND="
+	>=sys-libs/zlib-1.1.3:0=
 	dev-libs/libffi:0=
 	virtual/libintl:0=
 	dev-libs/expat:0=
 	bzip2? ( app-arch/bzip2:0= )
 	ncurses? ( sys-libs/ncurses:0= )
-	!dev-python/pypy3-exe-bin:${PYPY_PV}"
-DEPEND="${RDEPEND}"
+	!dev-python/pypy3-exe-bin:${SLOT}
+"
+DEPEND="
+	${RDEPEND}
+"
 BDEPEND="
 	low-memory? ( dev-python/pypy )
 	!low-memory? (
@@ -37,7 +43,8 @@ BDEPEND="
 			dev-python/pypy
 			dev-lang/python:2.7
 		)
-	)"
+	)
+"
 
 check_env() {
 	if use low-memory; then
@@ -139,9 +146,8 @@ src_configure() {
 
 	if [[ ${EPYTHON} != pypy ]]; then
 		# reuse bundled pycparser to avoid external dep
-		mkdir -p "${T}"/pymod/cffi || die
-		: > "${T}"/pymod/cffi/__init__.py || die
-		cp -r lib_pypy/cffi/_pycparser "${T}"/pymod/cffi/ || die
+		mkdir -p "${T}"/pymod || die
+		cp -r lib_pypy/cffi/_pycparser "${T}"/pymod/pycparser || die
 		local -x PYTHONPATH=${T}/pymod:${PYTHONPATH}
 	fi
 
@@ -159,8 +165,8 @@ src_compile() {
 
 src_install() {
 	cd "${T}"/usession*-0 || die
-	newbin testing_1/pypy3-c pypy3-c-${PYPY_PV}
-	insinto /usr/include/pypy3.8/${PYPY_PV}
-	doins pypy_*.h
-	pax-mark m "${ED}/usr/bin/pypy3-c-${PYPY_PV}"
+	newbin testing_1/pypy3.9-c pypy3.9-c-${PYPY_PV}
+	insinto /usr/include/pypy3.9/${PYPY_PV}
+	doins *.h
+	pax-mark m "${ED}/usr/bin/pypy3.9-c-${PYPY_PV}"
 }
diff --git a/dev-python/pypy3/Manifest b/dev-python/pypy3/Manifest
index 637031c22240..126eeef91d50 100644
--- a/dev-python/pypy3/Manifest
+++ b/dev-python/pypy3/Manifest
@@ -1,7 +1,7 @@
-DIST pypy3.8-gentoo-patches-7.3.7.tar.xz 4396 BLAKE2B adc33a02ada4d22eae0484292ec6cc295805d9f254b7a9110c622628aa40011621a1833ca62d3251e4e5056c406f648e7ad0439bd60e77c38808dd9df46973a5 SHA512 1cda8467de2d749d98fa20d7d200b5f96dae0ca68cf44a054d03f3f148bc3946ba1f1c474ac0336560f79c78b3eddcd4ba24386e83de283c83475b8e4b75bdf8
-DIST pypy3.8-v7.3.7-src.tar.bz2 24375444 BLAKE2B 44fe19ee63d95243c499ecb0b84e77873c73da93320b1e028a5c6c4b167441d223812dc66b16e070308cba48c4d8774738f827319cce9d1769b3f4346e15487c SHA512 9e6701cc441d5535968656cfb0cfa9076c364f9ba32bc6f0ef64f06ab343281e2458dbe88791c0e02401457fbf80d367f397fc904f6146bff68e04a15e05fda2
 DIST pypy3.9-gentoo-patches-7.3.8.tar.xz 1568 BLAKE2B 0011188de7b5757964bd13c49d5995a656a721acd54e1d77f7e77fac7420a2a56ca75eb42709e2304a771fa69c982fc6901e9fc9580ab8e8b35e7bb8b0cc83a6 SHA512 1064e987b7233fc55f94bd49aeeab9a9fd9322e90798439ad9a4c35020ca923fe0670e47406ab180a6f8e7afd65d03be23427d4fa43befa3c0ce172028e1a09f
+DIST pypy3.9-gentoo-patches-7.3.9.tar.xz 1564 BLAKE2B fe0875ef002842a78fb31589f6d0b255c3dea10f2bd014231ae9b17641f65f810ac84fe7961de1a4614249b0166f2127c3aa37947f7d1d4c85860a31b89110f1 SHA512 a1dc3ee36e908e29b2bbbb100a97b7910bd4325c5dc55c0455cdca450d6b272d1463708b383e0607e9499b1932da4442f97d2da57e47ed3a4ff8fd3c78a54732
 DIST pypy3.9-v7.3.8-src.tar.bz2 26277823 BLAKE2B 343fa4a57b69936a586acb036506e25c8de3a9761eb6622ef7266c136a1dc977cabc23969917bc2369fd73b1ae6fef731d81536179107f2d731352e6f5387bf9 SHA512 aed018738af7a225f516ec37d059d539f486d9dd427fe000805147b197f496d5fcb0387e47008524753ad18224aebeb1e68f9e2093acbe37468e02bff92f7126
-EBUILD pypy3-7.3.7-r1.ebuild 5332 BLAKE2B a096f5cbe2cd11561e1f8d8e06a4d4c1d426f09a7498b254a2826053d5d10c4ba69ed8f5eb94931a08559e3f3612a65375adb28006d063664c4865558d8364f0 SHA512 38e7bda1dbbf4e91b5b787c988b9bc8f08a38a3a49bc2af83c9e4f0571705bd34d3b201f2b2e3f8f7be351146b68aae10c40f104a3fe0f4d1da5cc3313629406
-EBUILD pypy3-7.3.8.ebuild 5388 BLAKE2B 15a7511b60b18b122f530e6fe65afacf9e00ae31a0c0e99d2f3dc8fd503eb4d887942ce9afeb1147f74cab0c09dbb05bf53f4258e1b2aedb22aa7c70ed4c7e0d SHA512 943d90bf38aa99682cf68eb555597eff89fbceeea357bf10048ae2f764fbb739b264f5729a61ee170d90f68932ae0c47231395de12edcece789d2f22f5831b64
+DIST pypy3.9-v7.3.9-src.tar.bz2 26976726 BLAKE2B bf1ed21c575901abac020120aaff07ab57f1404713211b19cbd1eb4d6ffc675b7933be8c6fffc2b69ab467963d6598534cd5aa90c02feddad596611d2a6b6581 SHA512 83f8a6a2da351c190d2d224242cbc35e35529c7a8e8d842eaf5c945cbce2e172b02a340f32af3d49df8d5288370d794d5bc95fc12dd4a13d817c925abf06198a
+EBUILD pypy3-7.3.8.ebuild 5386 BLAKE2B 45baf647e79ec118eca81b5e4d77c90ead85905173a0e3f1e4f8855382103999afbca328e852680f2242dcaa85f71fe2ffe159a5b0a18fb83ac68324e1681e00 SHA512 e819d64bc18863463e64c55bbe7f6363fbc7c8cb18b79f08877f2729103270cea9972e4673c970659b9fea48c258ba499c6f9e61d715dc101c7fb4f51d3eb775
+EBUILD pypy3-7.3.9.ebuild 5461 BLAKE2B 4086916df9196af0dfbc8cf9e2ca0bd4cd6d4d7b927d4d157abae2ff7f7460492d3c30ba4525d1140e4eee8f7f87067bcf6981a0982936cc3f60cd49f332e2fd SHA512 3a24f51744b66a511152a0c52c4d5bb4a41330e452b6d6d67abe87e74a6ffdc8eeb989b8657226c41bd18cdb600eca7ab924cd16839c0e0e6ac49db6a2e8ba9d
 MISC metadata.xml 241 BLAKE2B 4f18c355c71824c25df283b2d463a5abbf2295446e74b960e868dd78d4910ac066725450478087567a6e66b7a8948d99e053f13a7e58dbf2b89fdaf5c2f3436c SHA512 c46e70ffd66754ad84c64806f2bbff25ba9a688f035176a4565afc95351ce10fffba64bbde89965501460b05978c7e59b3d84db6a8cb6efff4055d4b7a5ab5d8
diff --git a/dev-python/pypy3/pypy3-7.3.8.ebuild b/dev-python/pypy3/pypy3-7.3.8.ebuild
index 1882ac559133..11b0caeedc1d 100644
--- a/dev-python/pypy3/pypy3-7.3.8.ebuild
+++ b/dev-python/pypy3/pypy3-7.3.8.ebuild
@@ -20,7 +20,7 @@ LICENSE="MIT"
 # pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))'
 # also check pypy/interpreter/pycode.py -> pypy_incremental_magic
 SLOT="0/pypy39-pp73"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="bzip2 gdbm +jit ncurses sqlite test tk"
 # many tests are failing upstream
 # see https://buildbot.pypy.org/summary?branch=py3.9
diff --git a/dev-python/pypy3/pypy3-7.3.7-r1.ebuild b/dev-python/pypy3/pypy3-7.3.9.ebuild
index ccc3af660ca2..536c3974f232 100644
--- a/dev-python/pypy3/pypy3-7.3.7-r1.ebuild
+++ b/dev-python/pypy3/pypy3-7.3.9.ebuild
@@ -1,34 +1,37 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=( python2_7 )
 inherit pax-utils python-any-r1 toolchain-funcs
 
 PYPY_PV=${PV%_p*}
-MY_P=pypy3.8-v${PYPY_PV/_rc/rc}
-PATCHSET="pypy3.8-gentoo-patches-${PV/_rc/rc}"
+MY_P=pypy3.9-v${PYPY_PV/_rc/rc}
+PATCHSET="pypy3.9-gentoo-patches-${PV/_rc/rc}"
 
-DESCRIPTION="A fast, compliant alternative implementation of the Python (3.8) language"
+DESCRIPTION="A fast, compliant alternative implementation of the Python (3.9) language"
 HOMEPAGE="https://www.pypy.org/"
-SRC_URI="https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2
-	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz"
+SRC_URI="
+	https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2
+	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
+"
 S="${WORKDIR}/${MY_P}-src"
 
 LICENSE="MIT"
 # pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))'
 # also check pypy/interpreter/pycode.py -> pypy_incremental_magic
-SLOT="0/pypy38-pp73"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
+SLOT="0/pypy39-pp73"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="bzip2 gdbm +jit ncurses sqlite test tk"
-# pypy3.8 is in alpha state and many tests are failing
+# many tests are failing upstream
+# see https://buildbot.pypy.org/summary?branch=py3.9
 RESTRICT="test"
 
 RDEPEND="
 	|| (
-		>=dev-python/pypy3-exe-${PYPY_PV}:${PYPY_PV}[bzip2?,ncurses?]
-		>=dev-python/pypy3-exe-bin-${PYPY_PV}:${PYPY_PV}
+		>=dev-python/pypy3-exe-${PYPY_PV}:3.9-${PYPY_PV}[bzip2?,ncurses?]
+		>=dev-python/pypy3-exe-bin-${PYPY_PV}:3.9-${PYPY_PV}
 	)
 	dev-lang/python-exec[python_targets_pypy3(-)]
 	dev-libs/openssl:0=
@@ -38,12 +41,15 @@ RDEPEND="
 		dev-lang/tk:0=
 		dev-tcltk/tix:0=
 	)
-	!<dev-python/pypy3-bin-7.3.0:0"
-DEPEND="${RDEPEND}
+	!<dev-python/pypy3-bin-7.3.0:0
+"
+DEPEND="
+	${RDEPEND}
 	test? (
 		${PYTHON_DEPS}
 		!!dev-python/pytest-forked
-	)"
+	)
+"
 
 pkg_setup() {
 	use test && python-any-r1_pkg_setup
@@ -65,26 +71,33 @@ src_configure() {
 src_compile() {
 	mkdir bin || die
 	# switch to the layout expected for cffi module builds
-	mkdir include/pypy3.8 || die
-	cp include/*.h include/pypy3.8/ || die
+	mkdir include/pypy3.9 || die
 	# copy over to make sys.prefix happy
-	cp -p "${BROOT}"/usr/bin/pypy3-c-${PYPY_PV} pypy3-c || die
-	cp -p "${BROOT}"/usr/include/pypy3.8/${PYPY_PV}/* include/pypy3.8/ || die
+	cp -p "${BROOT}"/usr/bin/pypy3.9-c-${PYPY_PV} pypy3.9-c || die
+	cp -p "${BROOT}"/usr/include/pypy3.9/${PYPY_PV}/* include/pypy3.9/ || die
 	# (not installed by pypy-exe)
 	rm pypy/module/cpyext/include/_numpypy/numpy/README || die
-	mv pypy/module/cpyext/include/* include/pypy3.8/ || die
-	mv pypy/module/cpyext/parse/*.h include/pypy3.8/ || die
-	pax-mark m pypy3-c
+	mv pypy/module/cpyext/include/* include/pypy3.9/ || die
+	mv pypy/module/cpyext/parse/*.h include/pypy3.9/ || die
+	pax-mark m pypy3.9-c
 
 	# verify the subslot
-	local soabi=$(./pypy3-c -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))')
+	local soabi=$(
+		./pypy3.9-c - <<-EOF
+			import sysconfig
+			print(sysconfig.get_config_var("SOABI"))
+		EOF
+	)
 	[[ ${soabi} == ${SLOT#*/} ]] || die "update subslot to ${soabi}"
 
 	einfo "Generating caches and CFFI modules ..."
 
 	# Generate Grammar and PatternGrammar pickles.
-	./pypy3-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
-		|| die "Generation of Grammar and PatternGrammar pickles failed"
+	./pypy3.9-c - <<-EOF || die "Generation of Grammar and PatternGrammar pickles failed"
+		import lib2to3.pygram
+		import lib2to3.patcomp
+		lib2to3.patcomp.PatternCompiler()
+	EOF
 
 	# Generate cffi modules
 	# Please keep in sync with pypy/tool/build_cffi_imports.py!
@@ -103,15 +116,19 @@ src_compile() {
 	cd lib_pypy || die
 	for t in "${cffi_targets[@]}"; do
 		# tkinter doesn't work via -m
-		../pypy3-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
+		../pypy3.9-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
 	done
 
 	# Verify that CFFI module list is up-to-date
 	local expected_cksum=63d4659f
-	local local_cksum=$(../pypy3-c -c '
-from pypy_tools.build_cffi_imports import cffi_build_scripts as x;
-import binascii, json;
-print("%08x" % (binascii.crc32(json.dumps(x).encode()),))')
+	local local_cksum=$(
+		../pypy3.9-c - <<-EOF
+			import binascii
+			import json
+			from pypy_tools.build_cffi_imports import cffi_build_scripts as x
+			print("%08x" % (binascii.crc32(json.dumps(x).encode()),))
+		EOF
+	)
 	if [[ ${local_cksum} != ${expected_cksum} ]]; then
 		die "Please verify cffi_targets and update checksum to ${local_cksum}"
 	fi
@@ -129,28 +146,29 @@ src_test() {
 	# Test runner requires Python 2 too. However, it spawns PyPy3
 	# internally so that we end up testing the correct interpreter.
 	# (--deselect for failing doctests)
-	"${EPYTHON}" ./pypy/test_all.py --pypy=./pypy3-c -vv lib-python || die
+	"${EPYTHON}" ./pypy/test_all.py --pypy=./pypy3.9-c -vv lib-python || die
 }
 
 src_install() {
 	einfo "Installing PyPy ..."
 	dodir /usr/bin
-	dosym pypy3-c-${PYPY_PV} /usr/bin/pypy3
-	insinto /usr/lib/pypy3.8
+	dosym pypy3.9-c-${PYPY_PV} /usr/bin/pypy3.9
+	dosym pypy3.9 /usr/bin/pypy3
+	insinto /usr/lib/pypy3.9
 	# preserve mtimes to avoid obsoleting caches
 	insopts -p
 	doins -r lib-python/3/. lib_pypy/.
 	insinto /usr/include
-	doins -r include/pypy3.8
+	doins -r include/pypy3.9
 
 	# replace copied headers with symlinks
-	for x in "${BROOT}"/usr/include/pypy3.8/${PYPY_PV}/*; do
-		dosym "${PYPY_PV}/${x##*/}" "/usr/include/pypy3.8/${x##*/}"
+	for x in "${BROOT}"/usr/include/pypy3.9/${PYPY_PV}/*; do
+		dosym "${PYPY_PV}/${x##*/}" "/usr/include/pypy3.9/${x##*/}"
 	done
 
 	dodoc README.rst
 
-	local dest=/usr/lib/pypy3.8
+	local dest=/usr/lib/pypy3.9
 	if ! use gdbm; then
 		rm -r "${ED}${dest}"/_gdbm* || die
 	fi
@@ -166,9 +184,9 @@ src_install() {
 	fi
 
 	local -x EPYTHON=pypy3
-	local -x PYTHON=${ED}/usr/bin/pypy3-c-${PYPY_PV}
+	local -x PYTHON=${ED}/usr/bin/pypy3.9-c-${PYPY_PV}
 	# temporarily copy to build tree to facilitate module builds
-	cp -p "${BROOT}/usr/bin/pypy3-c-${PYPY_PV}" "${PYTHON}" || die
+	cp -p "${BROOT}/usr/bin/pypy3.9-c-${PYPY_PV}" "${PYTHON}" || die
 
 	echo "EPYTHON='${EPYTHON}'" > epython.py || die
 	python_moduleinto "${dest}"/site-packages
diff --git a/dev-python/pyte/Manifest b/dev-python/pyte/Manifest
index bdf5ffcd750a..1db9c43ca108 100644
--- a/dev-python/pyte/Manifest
+++ b/dev-python/pyte/Manifest
@@ -1,3 +1,3 @@
 DIST pyte-0.8.0.tar.gz 91320 BLAKE2B b973050912c7d3b67393208a5b17f382705fe78964528e003b71addc12586353a3a9c7eeb68c224dfb945b5f9d3b52823cd254885dd5ac6901be119583a71a2e SHA512 c488fd0a61c1dc34b27e12ed9ba1109bb2c331626c982da06e7540bdd168008cb5106a17c71e60e38c493f2dd9f21ba3cf05118928744dfa192d62e511b4c4e8
-EBUILD pyte-0.8.0-r1.ebuild 791 BLAKE2B 595150082cf740e624cff609729d3cff186cecf37929d38f7d2d218767d721cc8568084e49a9249079c6f92c198526c41991823f02c7684fb64fc8acd3fd4808 SHA512 eba133d9fb9efd8e151d123da940a3bfd67cffa5970d110f95e770e95f617e8d5c22b6646f15f3baa35b31fb597bcf356e4960c3a0307114faa957f4156c3a2f
+EBUILD pyte-0.8.0-r1.ebuild 798 BLAKE2B eead274cc268188b967a4e13e863b5d5a31d1b46beb9a351955aa97f7e89bdc7522a0fb7f90fdfe4af19fab9dc47ccaf4ea88d1bef7e97a8e9d63407427982d2 SHA512 0cd58575ceac136485ffcac21c1b02134155d531e5c04f309065d716f7f809f3bc57dada8acc8d1b36bc881f2c8323a5e7d9196651e24b686f3656d302881a44
 MISC metadata.xml 373 BLAKE2B 0d75ebf59f26354f2efdcdb8803173e129847f5599c8bdc80bf990174d09adbc43d0d0e9b8a01f5757bcbc93db3ce0dfb08b485816777fb699156ace03e0a0a5 SHA512 b58c0a13ea3c23d2a9534e139b8691d17a69f43d3c04192b1a8a3750d44fdb0ee4d043c8fd04740680e1f3967a9ea4b578becb307b1a1628e35006d7ca987e23
diff --git a/dev-python/pyte/pyte-0.8.0-r1.ebuild b/dev-python/pyte/pyte-0.8.0-r1.ebuild
index 7093b8d8c9d5..eebd4e957b7a 100644
--- a/dev-python/pyte/pyte-0.8.0-r1.ebuild
+++ b/dev-python/pyte/pyte-0.8.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/selectel/pyte/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 SLOT="0"
 LICENSE="LGPL-3"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~riscv x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="dev-python/wcwidth[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/pytest-asyncio/Manifest b/dev-python/pytest-asyncio/Manifest
index 5bfb5fc813a6..c966cd2d34a4 100644
--- a/dev-python/pytest-asyncio/Manifest
+++ b/dev-python/pytest-asyncio/Manifest
@@ -1,5 +1,7 @@
 DIST pytest-asyncio-0.17.2.tar.gz 23805 BLAKE2B 0501a193518cefb0596b1595a58e8f18915b61ba2b502726b457e78c10b5849e5fc1980192d4b5aceb7499af15556c185efc42b76153e2b8f72ab4e36249ad23 SHA512 f1f6a586a7a3a1672ed76e8758a76e8bd427b0da055461597ab3b6296e3ae50002a9a259aba57f0b6191d606db6fa61377dbf03099d3437272a4a1f4144aa58e
 DIST pytest-asyncio-0.18.2.tar.gz 24515 BLAKE2B d583abe16c215f12a3cc93588d40b9b75188b3a19eb3b4a018551f7fe616e92c73e12c0be6e6a3eadd7357b2396f397013829e1827bf0fc0cb4b96cdd1e64ff4 SHA512 377d219e731ac97a69e143c2de2e327f7293baf4af4bf370cb84dde4f94f705e315bf6deaea4b7d8c1d6cbc54ed753e15ccc0b21a0cef6c3397a560aae684f9e
+DIST pytest-asyncio-0.18.3.tar.gz 25049 BLAKE2B 5439675fd03b7fdd4cd3dbf1f37daa83d6b18b199ccc7b54acc648187dffcf59154f8f0ec5d4144ed40554290343a0890952e67d4184b17b0a3817196592023e SHA512 04d2046c039131598cb593afc1908be0dff2b24a91c89f36fca75d2d65916571e48fe149c1ba90244f299586277320cf6f130a02824fde9ee0a4d2429bf58a54
 EBUILD pytest-asyncio-0.17.2.ebuild 958 BLAKE2B 4852d2d0ecbf808dffbd9e76e86850b2616aa8bcea74d5c62ee14a5ca884df4d787874cb59f137c02e0d78fe5e3cdb7192b71cd2d25ac06b06c34f48cb4d9626 SHA512 1464b7a2a69a2aeec396e6dedca2c740b8231d704ad9da4a5931d73af483a5a166a554e566428e6e655ae98ab6d88f653172c07f3b26c6cdd68a6df0f2a001dc
 EBUILD pytest-asyncio-0.18.2.ebuild 966 BLAKE2B 33befc28a63ac9adb792606c7c991d510970bac16b3b8abca8277b725d694b7a540db452a2bcf2523445627254e957982aa79f540c70e36f0fb3894759e5142b SHA512 267a48cc5c6c0b588ba2e84dba0f84557dc145575add05b85e936e13b8d75ef52cabf428f71548d18f1b022d9514da41656b2bf8e5eaaae9fddf731a24814cf1
+EBUILD pytest-asyncio-0.18.3.ebuild 1035 BLAKE2B 98a43e95a46e7c10654b9a12925be852906b4e52509b728192abd03d300dc566da11cb89cd58935c4c009ee0d79eb92c6f6991d8288660e9da188016c2df15b0 SHA512 71a6035c938223a4f63610df5bfa7f9a962f82bd543fd16d67cc15b2980c0d661dcb943bc417600c3c711f0529786b5dbebe34b0a4658e7b5c656d96a7a99db6
 MISC metadata.xml 385 BLAKE2B 3d8faba48e1b3e531ea338f08f2de4b7bf637190e65fc61df2bd4d994cc97707016f83927f4a5181ac27d412a8c91255e90caba15f2d687f2339bc8ea61b18f2 SHA512 71178d3fba362e7532c87cb519f3661b25018771b86c302660de11f1bc7817b8352a2c8fcf60084a5e62b15148307a360267381ac38e8c856784034d80327d4d
diff --git a/dev-python/pytest-asyncio/pytest-asyncio-0.18.3.ebuild b/dev-python/pytest-asyncio/pytest-asyncio-0.18.3.ebuild
new file mode 100644
index 000000000000..160168fbf8b3
--- /dev/null
+++ b/dev-python/pytest-asyncio/pytest-asyncio-0.18.3.ebuild
@@ -0,0 +1,36 @@
+# Copyright 2019-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="Library for testing asyncio code with pytest"
+HOMEPAGE="https://github.com/pytest-dev/pytest-asyncio
+	https://pypi.org/project/pytest-asyncio/"
+SRC_URI="https://github.com/pytest-dev/pytest-asyncio/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	>=dev-python/pytest-5.4.0[${PYTHON_USEDEP}]"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/flaky[${PYTHON_USEDEP}]
+		>=dev-python/hypothesis-3.64[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+EPYTEST_DESELECT=(
+	# rely on precise warning counts
+	tests/modes/test_legacy_mode.py
+	tests/trio/test_fixtures.py::test_strict_mode_ignores_trio_fixtures
+)
diff --git a/dev-python/pytest-check/Manifest b/dev-python/pytest-check/Manifest
index 266c69292f3c..e598a765be58 100644
--- a/dev-python/pytest-check/Manifest
+++ b/dev-python/pytest-check/Manifest
@@ -1,3 +1,5 @@
 DIST pytest-check-1.0.4.gh.tar.gz 7738 BLAKE2B 179575dfd4f9e50715fd5a664039fe882b0e14c9369afb6f7aca65e9ab276147b2a0b7fe580d2a249721152d891c12cedfa06ae7e26027c6b7d3b34da17d4a53 SHA512 ca71295fc5a831df295c8ce40c6a57cde9a1b98ca25354a3954fc44c9094096ea0c9c6a49139659d4c9aa4e3d3d81d80893edb657bfd3f4d988c75864e843447
+DIST pytest-check-1.0.5.gh.tar.gz 10296 BLAKE2B 8eac4185e223736181e9465c8d4220874553d9e12d068069b40e7a1ea150c93d533facc8b3483649eb00da9a2286544c58e2c530138f830155466e3bb71aeedc SHA512 73c42c98639bf3026e62f5c2c9ce404ddbd4711afa1ff31d207886329a45cfc1c0f263dd3321a9b203b9b68cad87f76bbff61894ed7a67d0bd26e7d0d20ede21
 EBUILD pytest-check-1.0.4.ebuild 953 BLAKE2B 0405cb40ce9e5950d13c725c528503dc1831213583adb4e5d8a8543ff5dbd4a498ba4bdf55ac6b56d63a2f84b0514bdaeda3f2a102cb09692e9bff4058078ae3 SHA512 5ae1d8766ed28057331b24a8687ecc8e2038e6e0309d87e06a19e26c048c3e1f1e8613a65e7b6196dc0e6a4961a6ba44dd8c6b5336e9a6558018636d6a3febb5
+EBUILD pytest-check-1.0.5.ebuild 854 BLAKE2B b1a1d12fb5bc2428b30884120106eb5d15e596428908b3d96bdc8c9d5742aa72145225fd65aacd68eafb2247744757437e0a9759b1e05f1a318848743c1cf46b SHA512 d63acb087271228674312e96b7974cfa00d6b546dbaa9dcc5a45c8b91b3615dce392fb44d9c32cc995f86a73d54579a85671ca82c27f9e98f3d510bcafd629a4
 MISC metadata.xml 408 BLAKE2B 3f2a2f62298e5b17ecbb0c11d87eed1d6b841cbc832438951ebc6a1f7b4c530be4744bd655752b5b659aa271094949075032b239d47b459cc68753a2a94e22d9 SHA512 8404e883e6d145b26cba45c3344a41f7622fe6cbe77a2b36f4c8c08fad8d71c30e09b93067977f01324759214b7943e903ad9d4ca1b27ba9c6335993d5bf51d8
diff --git a/dev-python/pytest-check/pytest-check-1.0.5.ebuild b/dev-python/pytest-check/pytest-check-1.0.5.ebuild
new file mode 100644
index 000000000000..e1cd60cccca9
--- /dev/null
+++ b/dev-python/pytest-check/pytest-check-1.0.5.ebuild
@@ -0,0 +1,38 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="pytest plugin that allows multiple failures per test"
+HOMEPAGE="
+	https://github.com/okken/pytest-check/
+	https://pypi.org/project/pytest_check/
+"
+SRC_URI="
+	https://github.com/okken/pytest-check/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/pytest-6[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# Fix expecting result in case pytest throws deprecation warnings
+	sed -e '/fnmatch_lines/s/\* /\*/g' \
+		-e '/fnmatch_lines/s/ \*/\*/g' \
+		-i tests/test_check.py || die
+
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/pytest-console-scripts/Manifest b/dev-python/pytest-console-scripts/Manifest
index 937d49671f0d..aaabc7620574 100644
--- a/dev-python/pytest-console-scripts/Manifest
+++ b/dev-python/pytest-console-scripts/Manifest
@@ -1,7 +1,5 @@
-DIST pytest-console-scripts-1.2.2.tar.gz 14314 BLAKE2B 1e4c210fe9fa6a4e9dbe308cf3d6c1a1829f2155185fe3911ee0a299c0292db6bceeeeb7efd5ace9a166c90ae8376d3cdfec8b0c0b585467f157e175709afe6d SHA512 c749b76c8370734f9ab7fe93284f9ac25a38e4bef61181a3b61b3b0d229532f1876e668e5a6e1449dcb939d9cb53527e021f79fd9132f3a28bdf45d95bdcb40e
 DIST pytest-console-scripts-1.3.1.tar.gz 14238 BLAKE2B 2c00af468d19500078f48ca38d20430ed426e66b2277b7ad233356969d2a72d51cf60e90a46ae7808e6d33172fa053cc34d45b1f618d866dd14e917e6b225935 SHA512 344e9379976d9a7541f9683f7646b47f7fc25d2ab8d941351811ada7fddd77497cc24f4bc6a6d5ab9388dd5b289ed125bcbfad869009fb3b80aaaa1b951d656d
 DIST pytest-console-scripts-1.3.tar.gz 14365 BLAKE2B 7a9b83f53ef9911e5f336375389e6c6311e64e7b4880ea2cb1f996221d4dbf119bf6fc487f7bb7bfda4355df8f797981e99ac9db2fff3e4871173a878a4fbd64 SHA512 8b66df3a8ff700817f8ec34aa95385ff82c4df47fd67974e91cf4d2fdae578d4683032b0a8162723adfcd461e5da7f1c5bb99339d62ed9cbdca4fd1be001b0f6
-EBUILD pytest-console-scripts-1.2.2.ebuild 632 BLAKE2B 2a72f494c8c9cfa51c1a2966e02cddc5d3aecf87d909f6056d4d047c1720b3b77bbb955ed3a613b0ba75d80a56d6d192c9a944088a9c36b6d93607c99ed4b9b2 SHA512 7d8092785b429228086feb486008e20542e4cd6dd4f829f8680fed5dc09ac2a3d8a9f246b17091d6a904fc47b634150c12848cdf804333b8f82ee89c6257253a
 EBUILD pytest-console-scripts-1.3.1.ebuild 883 BLAKE2B a4ff0391d58e1e267f66fd2db5bef2f1d55d7c621b6c323d1c6342aabf501bfa7eb6af6bbae1dd584c4d1714e2b1e7bad40aa241e84ff96971b5a077671d89ce SHA512 54da98ebeba024e4a897aaa40da50da6daa10237b1b04c46c394e0bafc89c88d65e24bac4201f4c08ee220efd151cf7f76f4d3ae9174c6f5aefc1592590627a7
-EBUILD pytest-console-scripts-1.3.ebuild 926 BLAKE2B 88535684cf66d2fb2c8746bfe4ef6733bff89f62a216a53d5ca659d85d0c783673befa567d4dc19456ab06d9ed7131040ebeb69c7a18d27965c2cf8ead066795 SHA512 c03114a7c443cedf0552cfee56f3e7012349b74f9dbd427a036717626868121a0a7a81473efd300cadfd26e49c41a0eeeaf8efa82a7262be7853623f493e36b2
+EBUILD pytest-console-scripts-1.3.ebuild 918 BLAKE2B f9d5e5e76a1bf541e7e81bd05d586748d991b5f4967902d88eb3c6c8fe8e4338464166f297d8ba6e83907931eece271da1394a93bf8e8cf5d3734ebf2de89d55 SHA512 13d048d7f39ffe5515e6b1316c61607c61fd22dfa94e283c3bd023b91c522309e974ced39b6d1873d50cf98fb71356ecc57d8e539046e1773c10d752005cb956
 MISC metadata.xml 433 BLAKE2B 89f8e1d9dac848739320e06de4b6212f72538d6b9ae39d8266fb70f0849c529174ae89afae16e7282fe22f78e8970c3e2043f4d7e7327ea10d2659ef49b649d4 SHA512 58636b71252ea9aacbcf2c4640d4f63bef22710dfed931b3a081de2c92ba89499711df90aed069e71cbb8006d6ce515fb5ee46ec5f2631406cc01dcc92493fcf
diff --git a/dev-python/pytest-console-scripts/pytest-console-scripts-1.2.2.ebuild b/dev-python/pytest-console-scripts/pytest-console-scripts-1.2.2.ebuild
deleted file mode 100644
index 5555d0c3dfbf..000000000000
--- a/dev-python/pytest-console-scripts/pytest-console-scripts-1.2.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Pytest plugin for testing console scripts"
-HOMEPAGE="https://github.com/kvas-it/pytest-console-scripts"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/pytest-4.0.0[${PYTHON_USEDEP}]
-	>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests --install pytest
diff --git a/dev-python/pytest-console-scripts/pytest-console-scripts-1.3.ebuild b/dev-python/pytest-console-scripts/pytest-console-scripts-1.3.ebuild
index c63120a98ecc..8ba921cb08bb 100644
--- a/dev-python/pytest-console-scripts/pytest-console-scripts-1.3.ebuild
+++ b/dev-python/pytest-console-scripts/pytest-console-scripts-1.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/pytest-4.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-helpers-namespace/Manifest b/dev-python/pytest-helpers-namespace/Manifest
index b05f0b812123..5b9c1692e32a 100644
--- a/dev-python/pytest-helpers-namespace/Manifest
+++ b/dev-python/pytest-helpers-namespace/Manifest
@@ -1,4 +1,4 @@
 AUX pytest-helpers-namespace-2021.3.24-remove-extra-dep.patch 1218 BLAKE2B 1126c43aa209aa989f969e9ef04e1ddbd9502b697f46f4920234f022b380f5098f06b12fd1b9aae42d29ee61480f0db617af261da01b6ce2cf749e4b20fc06b9 SHA512 67fac2cd8ff09b6e104ceb2c7c239316444a9ac9e361ca2dfb152118bf540ab64eb336dd6a02a2c30a1579d47f3aad64789a5f95f9298f28a696219312af1bc6
 DIST pytest-helpers-namespace-2021.3.24.gh.tar.gz 25881 BLAKE2B d13e82eebf09b4acb1d8fb9d3609f8814a49bfd0df56f23fe6f3fe3fa1508c4f1ac338b3f75e1e97ae90f71cae548dd100548d23cdbaa6c4bdb76cdb6e3d4a41 SHA512 1914427a4805a168d4067cd5db5663d28e3ff680f612e70a169a7efbc6c2c7ba0e2dc74132595aa70e13b651886bd10a6947e56558edf22b871618c967537073
-EBUILD pytest-helpers-namespace-2021.3.24.ebuild 812 BLAKE2B 5bf07cbe8fcf78a703f8512b9614b33694066fbc704607339c2e885dc89f31b8aabe6c9703dc0f16b1589882194f811becc012eb7ad91217b83220dddc271750 SHA512 4f4ce789791bb86f282346c5d35a59710db31aa727c5a38849b1738e200bb3965bb5c7156aa504ffde37e988ac7d1c4587c9aa6fda7e2115b8abaff4cdbb2261
+EBUILD pytest-helpers-namespace-2021.3.24.ebuild 819 BLAKE2B 18b08e19e531e108b235a6795dedd86b46b9ad7fdd2d26521a8a825fead3461586a516e93d9f045a50f6f837d5ab511a09fc691e8057c364fedff98bf2b69187 SHA512 452ac5e8c6a884c25218b1aa5f549688edb972560822534d35edafdb49574a5efd7e4b42fb2c03b983b08f646a6e5e70a71fb530d343c6e7cdb04107b8fec588
 MISC metadata.xml 514 BLAKE2B d2cf552d0b34b0556bffdb2afb6524b5c0ce81d503a6a1dc2b4957beea0c96c1eb3ea4f6e61bd4351a26fa2983d10b155a58bbf04fcfba1fe4e55f720a7db09a SHA512 9aa9a28164597c7a6bec22f6c07f269c5954b02a4a7523373866e60f2d6824c83dd4912ca2e05081a2257f7e01e135f2544a0732d3c2f51266b331c753314108
diff --git a/dev-python/pytest-helpers-namespace/pytest-helpers-namespace-2021.3.24.ebuild b/dev-python/pytest-helpers-namespace/pytest-helpers-namespace-2021.3.24.ebuild
index b8308edaf17e..4022f5c76182 100644
--- a/dev-python/pytest-helpers-namespace/pytest-helpers-namespace-2021.3.24.ebuild
+++ b/dev-python/pytest-helpers-namespace/pytest-helpers-namespace-2021.3.24.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 
 RDEPEND="dev-python/pytest[${PYTHON_USEDEP}]"
 BDEPEND="
diff --git a/dev-python/pytest-httpbin/Manifest b/dev-python/pytest-httpbin/Manifest
index 8bb7638ed17b..4565e235d914 100644
--- a/dev-python/pytest-httpbin/Manifest
+++ b/dev-python/pytest-httpbin/Manifest
@@ -1,6 +1,4 @@
 AUX pytest-httpbin-1.0.0-pypy3-hang.patch 1099 BLAKE2B 4bb8dd686aadc35aab144a6467d52e7de675bcc7d6de8f130bc5942c17fd19c0c914d9aef81af3ed0a815ce21caf40ad8e7c8f724710fe07290dcc8fb92d6a24 SHA512 b0f417e7fdf658783e9297a895f50587d7b997de5065f5322fb46644028caa7cd10cf6130c578f6dd1f8b6aefbd281342f6aa8f5477284de3d4037b799604f72
-DIST pytest-httpbin-1.0.1.gh.tar.gz 18036 BLAKE2B 1277118a83d059f23c06758d6a5e83b78f09ba3bd44458f18aebdad06b7266a3deb9ee00f10732c552fddb42673dfe3f5862195f44ce48a224961b5df81dcae7 SHA512 3a11073d85478e7b748cfae5a7f639b2cf6ebc396ebb9972f39ead3d869ab1abaf0afa90f113e2393652ed08621716e54c9c5dcb41c59ff67341f7b28445544d
 DIST pytest-httpbin-1.0.2.gh.tar.gz 18727 BLAKE2B 56a7fa1c1694cad98815fc6c6f676b509942fa1fca192ecb4cb5a0d9f325d7df6ddb3a3ac67d884c8f8caba807677351c42c28a3bcba80b9196e74d666951cc2 SHA512 b4adac1c37506391d83f7772814b4a9ce5134cc6834d8758e71d39610f8b29e57e72b11b2233be51e41b2c36bc305d40fc4b260a7f83d10390f4e940df8aa366
-EBUILD pytest-httpbin-1.0.1.ebuild 822 BLAKE2B f734a554b33f569c8aa96cd7d01a685815d155195f5b3b5f8e42601d28656cb7351f0e4007efb98deab0cd80fc9d1fea40ad8bb5a6420e9c4e4d10532a009ff1 SHA512 1709ad360abcfcf7fcaef27b38f116992ed16345deeb80877bfb5cf30dd2d6c8e213fb0fe980a348f9a67293a38822fc272cd6d7fcaf88a9510610f68dd25ea3
-EBUILD pytest-httpbin-1.0.2.ebuild 866 BLAKE2B b25743ceb148b42dce6abd2386a9aabe3f624861e96f9a5de5349c0a5ca62b13796068d622eb8e8b5d0a53d566b815b8640078c477cdde4c564dd5fb5d3dd671 SHA512 30535871fcd8fb3256f75d9fc0b05e57d48d8c418c9e261deb73dc906cb1a338b97a9a4494b684bc67f197eb4d5b823aa8cb9695dbacfa6654831f2a21696ad5
+EBUILD pytest-httpbin-1.0.2.ebuild 858 BLAKE2B e727b39e19f3dce662332e1f87382bccf8d7c2b2660fb1269eb6adb37955804df32c92245aec34b010c285703b2e6bcb01866dc7a1ad5159ab524ad8824517f5 SHA512 192a62f86107d4d556b5ca769b8e539dd6fa9e9c3ce6c00bc31775aefa9d33540f0bd28acf40a12cfde1085db2f6f63263fbe44637c0cfc375a51edc7097bab9
 MISC metadata.xml 547 BLAKE2B d60e6b3e6c7d0c37dcc42dcffeed9e08fb7ad3dec5e4f5fdc0ffd1f7a2c46d89ef57a9576028457ee433d0ecbd100ae200ef507b22bb326838732751a7c644fc SHA512 4629dfe7e4cf27d5d52e7ce3e646f590b4d80a490c638cb035352416a587b494328d3f23e088d13ae1677c415080a7249301d9830be0cfbce7a44023302bf582
diff --git a/dev-python/pytest-httpbin/pytest-httpbin-1.0.1.ebuild b/dev-python/pytest-httpbin/pytest-httpbin-1.0.1.ebuild
deleted file mode 100644
index 0c28c50beb95..000000000000
--- a/dev-python/pytest-httpbin/pytest-httpbin-1.0.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2022 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="Easily test your HTTP library against a local copy of httpbin"
-HOMEPAGE="https://github.com/kevin1024/pytest-httpbin
-	https://pypi.org/project/pytest-httpbin/"
-SRC_URI="https://github.com/kevin1024/pytest-httpbin/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-RDEPEND="
-	dev-python/httpbin[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? ( dev-python/requests[${PYTHON_USEDEP}] )
-"
-
-PATCHES=(
-	"${FILESDIR}"/pytest-httpbin-1.0.0-pypy3-hang.patch
-)
-
-distutils_enable_tests pytest
diff --git a/dev-python/pytest-httpbin/pytest-httpbin-1.0.2.ebuild b/dev-python/pytest-httpbin/pytest-httpbin-1.0.2.ebuild
index 9be90f10c07d..a77dced7b2a8 100644
--- a/dev-python/pytest-httpbin/pytest-httpbin-1.0.2.ebuild
+++ b/dev-python/pytest-httpbin/pytest-httpbin-1.0.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/kevin1024/pytest-httpbin/archive/v${PV}.tar.gz -> ${
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 RDEPEND="
 	dev-python/httpbin[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-markdown/Manifest b/dev-python/pytest-markdown/Manifest
index 22f1e46303a7..8d571380a692 100644
--- a/dev-python/pytest-markdown/Manifest
+++ b/dev-python/pytest-markdown/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-markdown-1.0.2.tar.gz 2991 BLAKE2B 489bd1ccd6060b9588515772ff1f269dc57c328b3695405d0dd755340968899a2b912644e325ce5792528da90e5eac828314dbb9d1396eb34dffe0da04261848 SHA512 a2d5b38982f004a362ec2bda7aec45a6fb9e0b33dfd212647d8eab38fdadf6501b7fec8ad8838b286d81a156429aeb0ad3aa63361a580c2c7528fe19e474a7f6
-EBUILD pytest-markdown-1.0.2.ebuild 635 BLAKE2B e85bbc942a7c17666ff89fff7b08d61813453fa6ad6e6d0a8fc0b65e47d0b1185aab7864af6a62d434649d39a92c89e48eda47e2ef63cbb263c3577c683fa2ad SHA512 67c48ec626c4c2f6a43d570dd3740a1f09272e76621b38222623673b986dbe765e4f3343ccba285ca9afbbbeec412c9c0725b438df93039f5f83bf38c4c43204
+EBUILD pytest-markdown-1.0.2.ebuild 642 BLAKE2B 9efb5b62998f05e99ae581db0894849bf96a1bdc034d07d36336f294438a27ee6d80fc78102054922fed4393736c7a45f88b2b14a143af594971ee9fe09b2ea0 SHA512 e1891dd14a72843038f7d420f69e4cf6ac387a0e845e371eccf4b1bef391c1381cc3c4fa5b7f9f64f9d96c8f0a1a1cf8d117c3d809f57adef158528f67c8be85
 MISC metadata.xml 408 BLAKE2B 5bf707e04d11ff64f66112fb2a097ff7791ba883fd96492ccf59856d7840e2de34e6945f04943effa82b4f60b6b48c29b75de310c395da989bd82dbc7088154b SHA512 4c381e16ede235dff63ab6b5525900b66ad160c3e5fd3dfd013358c55266a799c2e10a310ca673ea4a931d671908f28e3e284a44b2fe3f9fbfaabb162ff39ea1
diff --git a/dev-python/pytest-markdown/pytest-markdown-1.0.2.ebuild b/dev-python/pytest-markdown/pytest-markdown-1.0.2.ebuild
index 0ce68968e085..47c5476a6d1a 100644
--- a/dev-python/pytest-markdown/pytest-markdown-1.0.2.ebuild
+++ b/dev-python/pytest-markdown/pytest-markdown-1.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~riscv"
 
 RDEPEND=">=dev-python/commonmark-0.9.1[${PYTHON_USEDEP}]
 	>=dev-python/pytest-6.0.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/pytest-metadata/Manifest b/dev-python/pytest-metadata/Manifest
index f3a29c284fdc..e99bc86ee738 100644
--- a/dev-python/pytest-metadata/Manifest
+++ b/dev-python/pytest-metadata/Manifest
@@ -1,5 +1,7 @@
 DIST pytest-metadata-1.11.0.tar.gz 14135 BLAKE2B 1de1c47b1d7775040075de479722fd07cb187f14cd37c5fe73458fb54ce01653295288fd11add8066170b8dc39f80c8749e739deb01ac8d579ef5e6f4339478d SHA512 09867df6158ba66f55a0a812b3731b4372f874b6bdc91301ed0c4d4c38f6fe9a4f936006d4e27f8c68d4a2d6b0fe5fedee3c6269bc6867eb1c7d73a42bda0361
 DIST pytest-metadata-2.0.0.gh.tar.gz 20152 BLAKE2B 8ce06c327a3242a049c9af2476536a85e99d56925ba4ac98d7e07f72900f8b50c59950f25f4ccbc9c6c17eb2310ad381862f24d26410bbd68a6c2868cdf83547 SHA512 b22cf7925d3f38242670efde5e5482c7f971af78edf7bcccc765602dd4d688502c9b3b5b2a9723b37334bb8ad2218eb2318a82b8b2d6576ab8d69fa1ca321245
+DIST pytest-metadata-2.0.1.gh.tar.gz 19945 BLAKE2B 931ede3b58471e3092eb26af38f380810140539c7c50b5e3e9a63bdddedd9577b1f23aafb24ce80de55078f772b0dae8715368559f79a3f31f33e15870134f45 SHA512 03981b4fbcd812cf5896d6db2b74cbc1e6c84cc13613f916248767cacfc7650580f668a5ea8892be85c87fa08101a8a2f440ee6e0cc1342d4fa9919d41153a6b
 EBUILD pytest-metadata-1.11.0.ebuild 548 BLAKE2B 2565f81c140adb4a9e66c369115800afcb4812e017557b6bcba37790e6951d35c0a5928c6854ed679c5811158066a4d763cff8a477589a308d1a590180f2674e SHA512 0ba35808b470c5adcb6a76eaa5f7381ba97d6eb2328f122bf41ee5a08b9a6b66596190fdcc622be2e777b3f513f338d0adeaff3ee44e9c73383bf764d6ac3fcc
 EBUILD pytest-metadata-2.0.0.ebuild 697 BLAKE2B 1a977ae128dd0c636a295c74c5bac65625b4a2e43ac500464efa503e488c55b3ef4fc0a26759268a2192db72bca5819a1ef2122b78fcedb7c0f34380b5b54e5a SHA512 adcc4371dd2ae2d209641c64d7339a64c1283555bf992ee959e94d11ff94fdb15e3c370a2e07841b20d0e69ba7dfce40bd9c8ab50eceed662a912f0a5a8318ad
+EBUILD pytest-metadata-2.0.1.ebuild 733 BLAKE2B 77ffc6ae911da0cdbd609b263a30520063a2d64a5387b78759b1c814246d1256ab19d48f621306497f45ad3bd0d68247883d916363240c7b867cc5321b190b04 SHA512 b9a4dfa2dc40da7c3b2247834dfd572d11ce4bf1ea2ed4030caf1bab09e425055d2461876f01bc2fdce61b71810946c1377a51c213c06de6dd6b5df65da38e02
 MISC metadata.xml 385 BLAKE2B a888886c89fe52cd8e209fc9638fc3cdbf9b7dde0114c46d57b4f9b91f1ef49ebdb3f967e913036109054547d3840c8bd5ca24e5b80ac541889c48ef63748233 SHA512 20094512c77c3ea6f5501aaff0fc9b6ef07aa0580c555e3da5d6ad25e1ecf2f9f42443b7a43256f3fb99aab029a83a2d2696e9a0c8b2ce81e95ef15ab0c33b23
diff --git a/dev-python/pytest-metadata/pytest-metadata-2.0.1.ebuild b/dev-python/pytest-metadata/pytest-metadata-2.0.1.ebuild
new file mode 100644
index 000000000000..c3d5cc6860f6
--- /dev/null
+++ b/dev-python/pytest-metadata/pytest-metadata-2.0.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A plugin for pytest that provides access to test session metadata"
+HOMEPAGE="https://github.com/pytest-dev/pytest-metadata/"
+SRC_URI="
+	https://github.com/pytest-dev/pytest-metadata/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	<dev-python/pytest-8[${PYTHON_USEDEP}]
+	>=dev-python/pytest-7.1.1[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/setuptools_scm-6.2.3[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/pytest-plus/Manifest b/dev-python/pytest-plus/Manifest
index b0fbf7b075fa..f4e68ab672e5 100644
--- a/dev-python/pytest-plus/Manifest
+++ b/dev-python/pytest-plus/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-plus-0.2.tar.gz 8210 BLAKE2B b8a28e72cfb4e10daa021528de9b5df2e9eb0bc4e911557c7c14a0825284787e94992132c0b74881867a41b55a67785c60b9b87a1594ad33fb57ebac8de391a6 SHA512 e16a03433cb6eb30b6881bec99482bc65cb7d1fa3d0db855befe666c0645d4b5ec02debde9dec4322ed0a0b77d3ac3f1cabda0cf98f375ffd68dc29fb55f5139
-EBUILD pytest-plus-0.2.ebuild 615 BLAKE2B d21357de62f51b1adfbcb572bfc67332679e7d26896bbf03e44c5d9e1fb09ff29fa799b4ea4a892f546202512900ebebee5f2cd0683536569d66c5cc917eed0f SHA512 cd1f394a7ee7e7523af9363ee9b5f459ac41a6d10eab8bb5a5014f90ccff804e5ec9b82b58a8442d34d19f1a13ecd0a7a2b4fa871952dac7c757780f1e3bccbe
+EBUILD pytest-plus-0.2.ebuild 622 BLAKE2B ce7062baf929233ad5c8e1c89efe7fa85ace4740b4fbb5e55a8a0eee397b0970e18e613ad1ccd8160e149ebf025779ac5baa6e3aa332fdc254eacee485c6326d SHA512 0ca7038df407ce27686687b054d4404639870ee278a5efa355ce7cd56f7f85dbea5b4f00cca5c5d63db717f9d31809b396d9887f5e465a4e481fa03a08407127
 MISC metadata.xml 406 BLAKE2B ae1b1a2c28f45b4dd7f752125161396de88cf2ed3881f37f72dc7938cd2ea6485c995d0409c6fbaebeb7b1d4cf59736496549702d7a9d825a2ee5eb1e6a65fdf SHA512 33668115e05810055fa79f5d74c5d3b6eca5bb53e0108a257cb57bb496ebd0292c1dd3f5b33feee58c20c2c381a926c870f9576355171a91106c21fea41d6ab3
diff --git a/dev-python/pytest-plus/pytest-plus-0.2.ebuild b/dev-python/pytest-plus/pytest-plus-0.2.ebuild
index 3bd50d2af4a9..0e691d690afb 100644
--- a/dev-python/pytest-plus/pytest-plus-0.2.ebuild
+++ b/dev-python/pytest-plus/pytest-plus-0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~riscv"
 
 RDEPEND="dev-python/more-itertools[${PYTHON_USEDEP}]
 	dev-python/pytest[${PYTHON_USEDEP}]"
diff --git a/dev-python/pytest-qt/Manifest b/dev-python/pytest-qt/Manifest
index 964a2a6b1a83..9c5c1921898a 100644
--- a/dev-python/pytest-qt/Manifest
+++ b/dev-python/pytest-qt/Manifest
@@ -3,6 +3,5 @@ AUX pytest-qt-3.3.0-skip-show-window-test.patch 1318 BLAKE2B 7e1c628c13f02d6219d
 DIST pytest-qt-3.3.0.tar.gz 113439 BLAKE2B 1eb486d2d44825058577306ed3b9ade34e6cbad0d90038fe314114bb22c82ae069c9fe66c170591de6c97bad99f5f9e0021c8b3dc38c858b8293a22c448bed74 SHA512 8b3ce7b62621c55fb319966b162cb60663c5ef290f34e62e6a9329e67f530c2bde1329ae0b045b15c99ae14f5f6a5fef9ee930475fa700922c50ee725adf7983
 DIST pytest-qt-4.0.2.tar.gz 113466 BLAKE2B 73ba6571958f3f4cd76c3e891eaa014d464b94a7965afac6cee5b43bafdc63d4d640f84c7bfa1666146ab5139f79c760bd9f5a2a44f788b6384df200ac48ad0d SHA512 7f59c499e1395460c2ff20a969cec16ca104f742c648faa0d7eb1528c04d8ee52c04c52798478bc01c5467bee33d3389b141424491ba5442f9df4e82f0dff173
 EBUILD pytest-qt-3.3.0.ebuild 1661 BLAKE2B 8af76902d54c81283ed1627278746fd874a0bf91eede889ec3de5a0be397e8b9cc5633abd67466e6bc9508bd56c84da0b5c069d3dc9bf339dc11b7cecb51ee37 SHA512 f39627d2dd504df4601390d1a310302d3e132db8d27a8e1d801560c921a87754691798bdbe60cc7b9337417cef993229f2c7673f9c91da8f9ffd4eac8aa9540f
-EBUILD pytest-qt-4.0.2-r1.ebuild 1438 BLAKE2B 601e3c05000b993654b34e5d4a0723f4f05813a1d40f2232d16fa24686d9725922f997235678e4e27def2055baff1a47405747223d93e13f6730837498677e6e SHA512 cba99408b2d80091efe20daad5f15762606bf969d810419a9513ad229f307f3ecefcd05c622b8928016bd79682530859b32e252a0e0b29d738ffda99000cff10
-EBUILD pytest-qt-4.0.2.ebuild 1559 BLAKE2B d30b57baff4a1ca49fe57e4e7f237a1e5e436de325bc5787c569489f5320d8a1ed74789a16a819023ce47c53d3f3446fa55fba7fe1c6772864c2a23964aa2970 SHA512 329ac5e69877480a345569f4863ec6518bbe046930c20693f948b5b3eac99ae00a19fa53386f4e35391fbcebb5aa515995e897e701dd11621afaa64e25715a64
+EBUILD pytest-qt-4.0.2-r1.ebuild 1436 BLAKE2B 8e671b876c92f5984e487c6bc3b6cfe411a526255bda40b60dc25867d9af3c3db20a7f6bae7b8f0d3ac5077522ab0c9430b44cea86be74487f96d4bc47fdd054 SHA512 e76bb5e8499495eae1d8f5ba060e06f4b69d93d04552eaf218ce84bd0addd05f69c19cd4436d99e33124fc5b63da5b5ef54b04e200a03500a4206466c5d87fbf
 MISC metadata.xml 516 BLAKE2B be5241e39f672681b27a003d02eca0e047644cad7da57de6b3393f58760c094c1661b9d168e44bea4efd56b38225d49abd5be6e71031a0d854b878716286d3ed SHA512 77981d63d3214fd2c052f8a7eac1a439899318973807299237a9105730893ce01d4423b060f532bd4f4496418683fc5128508c7d8747ba6ee6ed0eae67e5569f
diff --git a/dev-python/pytest-qt/pytest-qt-4.0.2-r1.ebuild b/dev-python/pytest-qt/pytest-qt-4.0.2-r1.ebuild
index ce2a9e32d833..11a6bd58b0a3 100644
--- a/dev-python/pytest-qt/pytest-qt-4.0.2-r1.ebuild
+++ b/dev-python/pytest-qt/pytest-qt-4.0.2-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 RDEPEND="dev-python/QtPy[gui,testlib,widgets(+),${PYTHON_USEDEP}]"
 BDEPEND="
diff --git a/dev-python/pytest-qt/pytest-qt-4.0.2.ebuild b/dev-python/pytest-qt/pytest-qt-4.0.2.ebuild
deleted file mode 100644
index 2e1cc477fd82..000000000000
--- a/dev-python/pytest-qt/pytest-qt-4.0.2.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Pytest plugin for PyQt5 and PySide2 applications"
-HOMEPAGE="
-	https://pypi.org/project/pytest-qt/
-	https://github.com/pytest-dev/pytest-qt/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-RDEPEND="dev-python/QtPy[gui,testlib,widgets(+),${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/PyQt5[gui,testlib,widgets,${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/pyside2[gui,testlib,widgets,${PYTHON_USEDEP}]
-			' python3_{8..9} )
-	)
-"
-
-distutils_enable_tests --install pytest
-distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	# warnings from other plugins cause the test output matchers to fail
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=pytestqt.plugin
-
-	local EPYTEST_DESELECT=(
-		# requires the window to be activated; that doesn't seem
-		# to be possible inside Xvfb
-		"tests/test_basics.py::test_wait_window[waitActive-True]"
-
-		# we are forcing a specific module via envvar, effectively
-		# overriding the config
-		tests/test_basics.py::test_qt_api_ini_config
-		tests/test_basics.py::test_qt_api_ini_config_with_envvar
-	)
-
-	distutils_install_for_testing
-	PYTEST_QT_API="pyqt5" epytest || die
-	if [[ "${EPYTHON}" == "python3.10" ]]; then
-		return
-	else
-		PYTEST_QT_API="pyside2" epytest || die
-	fi
-}
diff --git a/dev-python/pytest-salt-factories/Manifest b/dev-python/pytest-salt-factories/Manifest
index e07c8abef946..c0672c531684 100644
--- a/dev-python/pytest-salt-factories/Manifest
+++ b/dev-python/pytest-salt-factories/Manifest
@@ -1,4 +1,7 @@
-AUX pytest-salt-factories-0.911.0-tests.patch 18802 BLAKE2B 96ffe39243ca88c9fe14c3eed3ddea6727a609b7b869ee480c6d005fc9d0c57894757fcd9767507f90fccf2bc3b95ed72f99cf93b2e7c8970cad7e0be46902b0 SHA512 d57a0730c1a7d66fab577a6e0c477f3acd42005066f101ef96ff705546f6f43cdc3a1083fd0d1040c033d880c324b2c8146982747e965da997308002255e5063
-DIST pytest-salt-factories-0.911.0.tar.gz 161682 BLAKE2B b5a827c9a9acc55c53bc4152b648f96845f513e2d1c8425cbde0862909996a653df4debbf798a3d7461da4fc221acd5fc8e6052e123f3e64e0c8f4345557f141 SHA512 bada21cfe990ccb10b0e298cb05a7f3842d0fe24e2c8664352ae991363d0094dd1ff877adea5fcc0c1040e3f20f82ba616607c595511cade93ebadddd336a26b
-EBUILD pytest-salt-factories-0.911.0.ebuild 1889 BLAKE2B 021387b93fd3e24614a6b9d462de471b0b88ae9d92f6d1e1141477133c0bccd83a2567823adf540bb1a29b2725dcbb582d85d115246ec28d3c2e4ea7615199e1 SHA512 d2e18edd8015c4c554559d48f8a6cee6e86e2103eaeea68c354ce4473abd64091fac471cad51ab5e5fee3141af945d48d39074fe96156e6d1f2aeaec3e7b9c24
+AUX pytest-salt-factories-0.121.1-tests.patch 12284 BLAKE2B 4374c59c530d5e0171763b376ecf883354ada4255943017ac60361309dc5799ef563233474a5fa1756e7193285e46d7186973c8413b558dfcb3408cd42aecb6f SHA512 08ef49871ca4882dcd57a51c99e40fb87267ff07c666c54ba475061fb113f5e985c0c23f586366c33cb00b07bc190b98e6d7bb080004ee8b7c171bdb016f9ef8
+AUX pytest-salt-factories-1.0.0_rc13-tests.patch 16967 BLAKE2B 804b5e2ce678e732f8e01b3f652bb9f6a82caed3886e552dd359e27da40e5bb7fbff336828f944b2e0455399d78b7bc2defce37b641b1737e155beff5a4e72bd SHA512 bc6abcd079afc560815c00c900e350b468b572d67417f18d3a4f559bc5fb02b7e703a17afda7011c9682f55c09eb19b09250ac06c5135478235e03233c588fe1
+DIST pytest-salt-factories-0.121.1.tar.gz 102121 BLAKE2B 92cd5953b11377f1646f01b86a677a50216d16bcb944235a3f04176aecbb005974c415adcbf23cc391aab41b1ee9596984516ab61ecdd8c944d4ce707c39ab00 SHA512 32252695c6e8b17ef17d3330c4b0b38bdce89201d5573b4efa3531a72e826ee1fb26fea3ad0408401dec867cee405f21031804c32eb8fe6ceaa00925b17725a1
+DIST pytest-salt-factories-1.0.0_rc13.tar.gz 148418 BLAKE2B 3688f05d137df23266ebc7e999bc3b3a8ec198173b38dc98bd4a1e2655b982a37485278691e970da0be700cee6f609c57933b041a6d8403e75fb197f5d23d5d4 SHA512 f3713410704540ee48b7263973d3a9bf3159fb63e53e5ef5002201aea3fdcf0b4eaf00e1dd1e67d869b42242985d8117a117568d63abf5ad366e247fb3e1d83f
+EBUILD pytest-salt-factories-0.121.1-r1.ebuild 1724 BLAKE2B 83786447369717e7f414a154abf586dd1c87581f5809ba313ed954767f65ffb176b31c2e7d50523524619a703b601f8643c0134e0b564a2bbfa97d99a51ecc82 SHA512 889d5bfba0d62b48a9fef8327f11f31f7683d6d9107e9b9b537fa51eea66b7aa37f598da10f1836f68c95ad86eedda0ed5c0649aefde063cfa38b8402776fd23
+EBUILD pytest-salt-factories-1.0.0_rc13.ebuild 1994 BLAKE2B 17d059be013ddad9f20f5a49398c814aa566181ce3df09fe9da126f606b72954ea83db171b767aa204f045cd044274fd2630a558711dffef80fa22bf3c021ff0 SHA512 c186cb7816d1efc96ec6b90e55f074b65910e116c7592fdc959f1423d76b260c949667ef0346acf81976c0f77fc6fc907e1211ff96081c9dcd99cfadd13cb2e1
 MISC metadata.xml 358 BLAKE2B 0ca310e1a7269e532dfe3610bf5c9a1d93ff8dcc46ee3f26322cfb0ba1fb572b521359547f49b0deb3f463efd0321e3b3bee0403878df676e3c54dbcac14753a SHA512 8eaf37e98efe76ff401c536368d1537255d09db93b4f84254b7eb291b603f6ee83d80a65e9529c7bcea8324baaff708dc12f97662dd87c57fece36a1d5d8e1c9
diff --git a/dev-python/pytest-salt-factories/files/pytest-salt-factories-0.121.1-tests.patch b/dev-python/pytest-salt-factories/files/pytest-salt-factories-0.121.1-tests.patch
new file mode 100644
index 000000000000..3e85580c9158
--- /dev/null
+++ b/dev-python/pytest-salt-factories/files/pytest-salt-factories-0.121.1-tests.patch
@@ -0,0 +1,294 @@
+diff --git a/saltfactories/plugin.py b/saltfactories/plugin.py
+index b29a115..9d68c34 100644
+--- a/saltfactories/plugin.py
++++ b/saltfactories/plugin.py
+@@ -21,7 +21,7 @@ def pytest_tempdir_temproot():
+         tempdir = os.environ.get("TMPDIR") or tempfile.gettempdir()
+     else:
+         tempdir = "/tmp"
+-    return os.path.abspath(os.path.realpath(tempdir))
++    return os.path.abspath(tempdir)
+ 
+ 
+ def pytest_tempdir_basename():
+diff --git a/tests/functional/markers/test_requires_network.py b/tests/functional/markers/test_requires_network.py
+index 8b57368..d58f0a1 100644
+--- a/tests/functional/markers/test_requires_network.py
++++ b/tests/functional/markers/test_requires_network.py
+@@ -9,7 +9,10 @@ from unittest import mock
+ from saltfactories.utils import ports
+ from saltfactories.utils import socket
+ 
++import pytest
+ 
++
++@pytest.mark.skip("not compatible with network-sandbox")
+ def test_has_local_network(testdir):
+     testdir.makepyfile(
+         """
+diff --git a/tests/integration/factories/cli/test_salt.py b/tests/integration/factories/cli/test_salt.py
+index 17fce6c..7bd2789 100644
+--- a/tests/integration/factories/cli/test_salt.py
++++ b/tests/integration/factories/cli/test_salt.py
+@@ -17,6 +17,7 @@ def salt_minion_2(salt_master, salt_minion):
+         yield factory
+ 
+ 
++@pytest.mark.skip("not compatible with network-sandbox")
+ def test_merged_json_out(salt_cli, salt_minion, salt_minion_2):
+     ret = salt_cli.run("test.ping", minion_tgt="*")
+     assert ret.exitcode == 0, ret
+@@ -27,6 +28,7 @@ def test_merged_json_out(salt_cli, salt_minion, salt_minion_2):
+     assert ret.json[salt_minion_2.id] is True
+ 
+ 
++@pytest.mark.skip("not compatible with network-sandbox")
+ def test_merged_json_out_disabled(salt_cli, salt_minion, salt_minion_2):
+     ret = salt_cli.run("test.ping", minion_tgt="*", merge_json_output=False)
+     assert ret.exitcode == 0, ret
+diff --git a/tests/integration/factories/daemons/api/test_api.py b/tests/integration/factories/daemons/api/test_api.py
+index 78b8bb7..e20f28c 100644
+--- a/tests/integration/factories/daemons/api/test_api.py
++++ b/tests/integration/factories/daemons/api/test_api.py
+@@ -23,5 +23,6 @@ def salt_api(master):
+         yield factory
+ 
+ 
++@pytest.mark.skip("not compatible with network-sandbox")
+ def test_api(salt_api):
+     assert salt_api.is_running()
+diff --git a/tests/integration/factories/daemons/api/test_restarts.py b/tests/integration/factories/daemons/api/test_restarts.py
+index a6c5472..dd15c17 100644
+--- a/tests/integration/factories/daemons/api/test_restarts.py
++++ b/tests/integration/factories/daemons/api/test_restarts.py
+@@ -16,6 +16,7 @@ def master(salt_factories):
+         yield factory
+ 
+ 
++@pytest.mark.skip("not compatible with network-sandbox")
+ def test_multiple_start_stops(master):
+     factory = master.get_salt_api_daemon()
+     assert factory.is_running() is False
+diff --git a/tests/integration/factories/daemons/master/test_master.py b/tests/integration/factories/daemons/master/test_master.py
+index 2676dfa..cbf598e 100644
+--- a/tests/integration/factories/daemons/master/test_master.py
++++ b/tests/integration/factories/daemons/master/test_master.py
+@@ -46,10 +46,12 @@ def salt_key(master):
+     return master.get_salt_key_cli()
+ 
+ 
++@pytest.mark.skip("not compatible with network-sandbox")
+ def test_master(master):
+     assert master.is_running()
+ 
+ 
++@pytest.mark.skip("not compatible with network-sandbox")
+ def test_salt_run(master, salt_run):
+     max_open_files_config_value = master.config["max_open_files"]
+     ret = salt_run.run("config.get", "max_open_files")
+@@ -57,6 +59,7 @@ def test_salt_run(master, salt_run):
+     assert ret.json == max_open_files_config_value
+ 
+ 
++@pytest.mark.skip("not compatible with network-sandbox")
+ def test_salt_cp(master, minion, salt_cp, tempfiles):
+     """
+     Test copying a file from the master to the minion
+@@ -98,6 +101,7 @@ def test_salt_cp(master, minion, salt_cp, tempfiles):
+             os.unlink(dest)
+ 
+ 
++@pytest.mark.skip("not compatible with network-sandbox")
+ def test_salt_cp_no_match(master, minion, salt_cp, tempfiles):
+     assert master.is_running()
+     assert minion.is_running()
+@@ -119,6 +123,7 @@ def test_salt_cp_no_match(master, minion, salt_cp, tempfiles):
+             os.unlink(dest)
+ 
+ 
++@pytest.mark.skip("not compatible with sandbox")
+ @pytest.mark.skip_on_salt_system_install
+ def test_salt_key(master, minion, minion_3, salt_key):
+     ret = salt_key.run("--list-all")
+diff --git a/tests/integration/factories/daemons/master/test_restarts.py b/tests/integration/factories/daemons/master/test_restarts.py
+index 6a6852d..70415d0 100644
+--- a/tests/integration/factories/daemons/master/test_restarts.py
++++ b/tests/integration/factories/daemons/master/test_restarts.py
+@@ -11,6 +11,7 @@ def master(salt_factories):
+     return factory
+ 
+ 
++@pytest.mark.skip("not compatible with network")
+ def test_multiple_start_stops(master):
+     assert master.is_running() is False
+     pid = None
+diff --git a/tests/integration/factories/daemons/minion/test_event_forwarder_engine.py b/tests/integration/factories/daemons/minion/test_event_forwarder_engine.py
+index d63e640..653693e 100644
+--- a/tests/integration/factories/daemons/minion/test_event_forwarder_engine.py
++++ b/tests/integration/factories/daemons/minion/test_event_forwarder_engine.py
+@@ -28,6 +28,7 @@ def salt_call_cli(minion):
+     return minion.get_salt_call_cli()
+ 
+ 
++@pytest.mark.skip("not compatible with network-sandbox")
+ def test_event_listener_engine(minion, salt_call_cli, event_listener):
+     """
+     There are some events which the minion fires internally that never reach the master.
+diff --git a/tests/integration/factories/daemons/minion/test_minion.py b/tests/integration/factories/daemons/minion/test_minion.py
+index 64a3df6..ab82e55 100644
+--- a/tests/integration/factories/daemons/minion/test_minion.py
++++ b/tests/integration/factories/daemons/minion/test_minion.py
+@@ -27,6 +27,7 @@ def salt_call_cli(minion):
+     return minion.get_salt_call_cli()
+ 
+ 
++@pytest.mark.skip("not compatible with network-sandbox")
+ def test_minion(minion, salt_cli):
+     assert minion.is_running()
+     ret = salt_cli.run("test.ping", minion_tgt=minion.id)
+@@ -34,6 +35,7 @@ def test_minion(minion, salt_cli):
+     assert ret.json is True
+ 
+ 
++@pytest.mark.skip("not compatible with network-sandbox")
+ def test_no_match(minion, salt_cli):
+     assert minion.is_running()
+     ret = salt_cli.run("test.ping", minion_tgt="minion-2")
+@@ -41,6 +43,7 @@ def test_no_match(minion, salt_cli):
+     assert not ret.json
+ 
+ 
++@pytest.mark.skip("not compatible with network-sandbox")
+ def test_show_jid(minion, salt_cli):
+     assert minion.is_running()
+     ret = salt_cli.run("--show-jid", "test.ping", minion_tgt=minion.id)
+@@ -48,6 +51,7 @@ def test_show_jid(minion, salt_cli):
+     assert ret.json is True
+ 
+ 
++@pytest.mark.skip("not compatible with network-sandbox")
+ def test_minion_salt_call(minion, salt_call_cli):
+     assert minion.is_running()
+     ret = salt_call_cli.run("test.ping")
+@@ -59,6 +63,7 @@ def test_minion_salt_call(minion, salt_call_cli):
+     assert ret.json is True
+ 
+ 
++@pytest.mark.skip("not compatible with network-sandbox")
+ def test_salt_call_exception_handling_doesnt_timeout(minion, salt_call_cli):
+     ret = salt_call_cli.run(
+         "test.raise_exception", "OSError", "2", "No such file or directory", "/tmp/foo.txt"
+diff --git a/tests/integration/factories/daemons/minion/test_restarts.py b/tests/integration/factories/daemons/minion/test_restarts.py
+index a7d9ae0..8f0401b 100644
+--- a/tests/integration/factories/daemons/minion/test_restarts.py
++++ b/tests/integration/factories/daemons/minion/test_restarts.py
+@@ -10,6 +10,7 @@ def master(salt_factories):
+         yield factory
+ 
+ 
++@pytest.mark.skip("not compatible with network-sandbox")
+ def test_multiple_start_stops(master):
+     factory = master.get_salt_minion_daemon(random_string("minion-"))
+     assert factory.is_running() is False
+diff --git a/tests/integration/factories/daemons/proxy/test_proxy_minion.py b/tests/integration/factories/daemons/proxy/test_proxy_minion.py
+index 3bbca21..2e2fb8b 100644
+--- a/tests/integration/factories/daemons/proxy/test_proxy_minion.py
++++ b/tests/integration/factories/daemons/proxy/test_proxy_minion.py
+@@ -35,6 +35,7 @@ def salt_call_cli(proxy_minion):
+     return proxy_minion.get_salt_call_cli()
+ 
+ 
++@pytest.mark.skip("not compatible with network-sandbox")
+ def test_proxy_minion(proxy_minion, salt_cli):
+     assert proxy_minion.is_running()
+     ret = salt_cli.run("test.ping", minion_tgt=proxy_minion.id)
+@@ -42,6 +43,7 @@ def test_proxy_minion(proxy_minion, salt_cli):
+     assert ret.json is True
+ 
+ 
++@pytest.mark.skip("not compatible with network-sandbox")
+ def test_no_match(proxy_minion, salt_cli):
+     assert proxy_minion.is_running()
+     ret = salt_cli.run("test.ping", minion_tgt="proxy-minion-2")
+@@ -49,6 +51,7 @@ def test_no_match(proxy_minion, salt_cli):
+     assert not ret.json
+ 
+ 
++@pytest.mark.skip("not compatible with network-sandbox")
+ def test_show_jid(proxy_minion, salt_cli):
+     if platform.is_darwin() and sys.version_info[:2] == (3, 7):
+         pytest.skip(
+@@ -61,6 +64,7 @@ def test_show_jid(proxy_minion, salt_cli):
+     assert ret.json is True
+ 
+ 
++@pytest.mark.skip("not compatible with network-sandbox")
+ def test_proxy_minion_salt_call(proxy_minion, salt_call_cli):
+     assert proxy_minion.is_running()
+     ret = salt_call_cli.run("test.ping")
+diff --git a/tests/integration/factories/daemons/proxy/test_restarts.py b/tests/integration/factories/daemons/proxy/test_restarts.py
+index 3101204..28652ff 100644
+--- a/tests/integration/factories/daemons/proxy/test_restarts.py
++++ b/tests/integration/factories/daemons/proxy/test_restarts.py
+@@ -17,6 +17,7 @@ def master(salt_factories):
+         yield factory
+ 
+ 
++@pytest.mark.skip("not compatible with sandbox")
+ def test_multiple_start_stops(master):
+     factory = master.get_salt_proxy_minion_daemon(random_string("proxy-minion-"))
+     assert factory.is_running() is False
+diff --git a/tests/integration/factories/daemons/ssh/test_salt_ssh.py b/tests/integration/factories/daemons/ssh/test_salt_ssh.py
+index f58eac4..c3df3de 100644
+--- a/tests/integration/factories/daemons/ssh/test_salt_ssh.py
++++ b/tests/integration/factories/daemons/ssh/test_salt_ssh.py
+@@ -51,6 +51,7 @@ def salt_ssh_cli(sshd, salt_factories, master):
+ 
+ 
+ @pytest.mark.skip_on_windows
++@pytest.mark.skip("not compatible with network-sandbox")
+ def test_salt_ssh(salt_ssh_cli):
+     ret = salt_ssh_cli.run("--ignore-host-keys", "test.echo", "It Works!", minion_tgt="localhost")
+     assert ret.exitcode == 0
+diff --git a/tests/integration/factories/daemons/sshd/test_sshd.py b/tests/integration/factories/daemons/sshd/test_sshd.py
+index 3b425fc..3e03636 100644
+--- a/tests/integration/factories/daemons/sshd/test_sshd.py
++++ b/tests/integration/factories/daemons/sshd/test_sshd.py
+@@ -5,6 +5,7 @@ import pytest
+ 
+ @pytest.fixture(scope="module")
+ @pytest.mark.skip_if_binaries_missing("sshd", "ssh-keygen")
++@pytest.mark.skip("not compatible with network-sandbox")
+ def sshd(salt_factories):
+     # Set StrictModes to no because our config directory lives in /tmp and those permissions
+     # are not acceptable by sshd strict paranoia.
+@@ -15,12 +16,14 @@ def sshd(salt_factories):
+ 
+ 
+ @pytest.mark.skip_on_windows
++@pytest.mark.skip("not compatible with network-sandbox")
+ def test_sshd(sshd):
+     assert sshd.is_running()
+ 
+ 
+ @pytest.mark.skip_on_windows
+ @pytest.mark.skip_if_binaries_missing("ssh")
++@pytest.mark.skip("not compatible with network-sandbox")
+ def test_connect(sshd):
+     cmd = subprocess.run(
+         [
+diff --git a/tests/unit/utils/markers/test_skip_if_no_remote_network.py b/tests/unit/utils/markers/test_skip_if_no_remote_network.py
+index 1aa72dc..c4d079e 100644
+--- a/tests/unit/utils/markers/test_skip_if_no_remote_network.py
++++ b/tests/unit/utils/markers/test_skip_if_no_remote_network.py
+@@ -9,7 +9,10 @@ from unittest import mock
+ import saltfactories.utils.markers as markers
+ from saltfactories.utils import socket
+ 
++import pytest
+ 
++
++@pytest.mark.skip("not compatible with network-sandbox")
+ def test_has_remote_network():
+     assert markers.skip_if_no_remote_network() is None
+ 
diff --git a/dev-python/pytest-salt-factories/files/pytest-salt-factories-0.911.0-tests.patch b/dev-python/pytest-salt-factories/files/pytest-salt-factories-1.0.0_rc13-tests.patch
index 687b6a41b901..b021dcccf280 100644
--- a/dev-python/pytest-salt-factories/files/pytest-salt-factories-0.911.0-tests.patch
+++ b/dev-python/pytest-salt-factories/files/pytest-salt-factories-1.0.0_rc13-tests.patch
@@ -1,5 +1,5 @@
 diff --git a/src/saltfactories/plugins/__init__.py b/src/saltfactories/plugins/__init__.py
-index 679acad..ea6f23f 100644
+index 361414a..55469e4 100644
 --- a/src/saltfactories/plugins/__init__.py
 +++ b/src/saltfactories/plugins/__init__.py
 @@ -27,7 +27,7 @@ def pytest_tempdir_temproot():
@@ -12,7 +12,7 @@ index 679acad..ea6f23f 100644
  
  def pytest_tempdir_basename():
 diff --git a/tests/functional/factories/base/test_salt_daemon_factory.py b/tests/functional/factories/base/test_salt_daemon_factory.py
-index 813e36c..2b2b3d8 100644
+index eae5670..fd312df 100644
 --- a/tests/functional/factories/base/test_salt_daemon_factory.py
 +++ b/tests/functional/factories/base/test_salt_daemon_factory.py
 @@ -35,7 +35,7 @@ def test_extra_cli_arguments_after_first_failure(
@@ -24,27 +24,25 @@ index 813e36c..2b2b3d8 100644
      config = {"conf_file": config_file, "id": master_id}
      script = tempfiles.makepyfile(
          r"""
-diff --git a/tests/functional/markers/test_requires_network.py b/tests/functional/markers/test_requires_network.py
-index 0b21ede..70343fb 100644
---- a/tests/functional/markers/test_requires_network.py
-+++ b/tests/functional/markers/test_requires_network.py
-@@ -9,7 +9,9 @@ from unittest import mock
- from saltfactories.utils import ports
- from saltfactories.utils import socket
+diff --git a/tests/functional/factories/daemons/test_container_factory.py b/tests/functional/factories/daemons/test_container_factory.py
+index 1642d57..8b085eb 100644
+--- a/tests/functional/factories/daemons/test_container_factory.py
++++ b/tests/functional/factories/daemons/test_container_factory.py
+@@ -3,6 +3,7 @@ from unittest import mock
+ import pytest
  
-+import pytest
  
-+@pytest.mark.skip("Incompatible with network-sandbox")
- def test_has_local_network(pytester):
++@pytest.mark.skip("Needs network access")
+ @pytest.mark.parametrize("skip_on_pull_failure", [True, False])
+ def test_skip_on_pull_failure(pytester, skip_on_pull_failure):
      pytester.makepyfile(
-         """
 diff --git a/tests/functional/markers/test_requires_salt_modules.py b/tests/functional/markers/test_requires_salt_modules.py
-index 034d5e6..6e50a22 100644
+index 97ed1ec..53ff0dd 100644
 --- a/tests/functional/markers/test_requires_salt_modules.py
 +++ b/tests/functional/markers/test_requires_salt_modules.py
-@@ -4,9 +4,11 @@
- 
-     Test the ``@pytest.mark.requires_salt_modules`` marker
+@@ -1,9 +1,11 @@
+ """
+ Test the ``@pytest.mark.requires_salt_modules`` marker.
  """
 +import sys
  import pytest
@@ -54,7 +52,7 @@ index 034d5e6..6e50a22 100644
  @pytest.mark.parametrize(
      "modules",
      [
-@@ -31,6 +33,7 @@ def test_has_required_salt_module(pytester, modules):
+@@ -29,6 +31,7 @@ def test_has_required_salt_module(pytester, modules):
      res.stdout.no_fnmatch_line("*PytestUnknownMarkWarning*")
  
  
@@ -62,7 +60,7 @@ index 034d5e6..6e50a22 100644
  @pytest.mark.parametrize(
      "modules",
      [
-@@ -55,6 +58,7 @@ def test_missing_required_salt_module(pytester, modules):
+@@ -54,6 +57,7 @@ def test_missing_required_salt_module(pytester, modules):
      res.stdout.no_fnmatch_line("*PytestUnknownMarkWarning*")
  
  
@@ -71,12 +69,12 @@ index 034d5e6..6e50a22 100644
      pytester.makepyfile(
          r"""
 diff --git a/tests/functional/markers/test_requires_salt_states.py b/tests/functional/markers/test_requires_salt_states.py
-index 6ec469d..79d9052 100644
+index f6d63a9..ec4b431 100644
 --- a/tests/functional/markers/test_requires_salt_states.py
 +++ b/tests/functional/markers/test_requires_salt_states.py
-@@ -4,9 +4,11 @@
- 
-     Test the ``@pytest.mark.requires_salt_states`` marker
+@@ -1,9 +1,11 @@
+ """
+ Test the ``@pytest.mark.requires_salt_states`` marker.
  """
 +import sys
  import pytest
@@ -86,7 +84,7 @@ index 6ec469d..79d9052 100644
  @pytest.mark.parametrize(
      "modules",
      [
-@@ -31,6 +33,7 @@ def test_has_required_salt_state(pytester, modules):
+@@ -29,6 +31,7 @@ def test_has_required_salt_state(pytester, modules):
      res.stdout.no_fnmatch_line("*PytestUnknownMarkWarning*")
  
  
@@ -94,7 +92,7 @@ index 6ec469d..79d9052 100644
  @pytest.mark.parametrize(
      "modules",
      [
-@@ -55,6 +58,7 @@ def test_missing_required_salt_state(pytester, modules):
+@@ -54,6 +57,7 @@ def test_missing_required_salt_state(pytester, modules):
      res.stdout.no_fnmatch_line("*PytestUnknownMarkWarning*")
  
  
@@ -103,12 +101,12 @@ index 6ec469d..79d9052 100644
      pytester.makepyfile(
          r"""
 diff --git a/tests/functional/test_sys_info.py b/tests/functional/test_sys_info.py
-index 61963e0..e1e7531 100644
+index c8fbf6e..f18c85d 100644
 --- a/tests/functional/test_sys_info.py
 +++ b/tests/functional/test_sys_info.py
-@@ -4,9 +4,11 @@
- 
-     Tests related to system information reports enabled by the `--sys-info` flag.
+@@ -1,9 +1,11 @@
+ """
+ Tests related to system information reports enabled by the `--sys-info` flag..
  """
 +import sys
  import pytest
@@ -118,7 +116,7 @@ index 61963e0..e1e7531 100644
  @pytest.mark.parametrize("flag", ["--sysinfo", "--sys-info"])
  def test_sysinfo(pytester, flag):
      pytester.makepyfile(
-@@ -30,6 +32,7 @@ def test_sysinfo(pytester, flag):
+@@ -27,6 +29,7 @@ def test_sysinfo(pytester, flag):
      )
  
  
@@ -127,27 +125,27 @@ index 61963e0..e1e7531 100644
      pytester.makepyfile(
          """
 diff --git a/tests/integration/factories/cli/test_salt.py b/tests/integration/factories/cli/test_salt.py
-index 91babb9..bc9e854 100644
+index 9c4fdb0..0766fe7 100644
 --- a/tests/integration/factories/cli/test_salt.py
 +++ b/tests/integration/factories/cli/test_salt.py
-@@ -17,6 +17,7 @@ def salt_minion_2(salt_master, salt_minion):
+@@ -14,6 +14,7 @@ def salt_minion_2(salt_master, salt_minion):
          yield factory
  
  
 +@pytest.mark.skip("not compatible with network-sandbox")
  def test_merged_json_out(salt_cli, salt_minion, salt_minion_2):
      ret = salt_cli.run("test.ping", minion_tgt="*")
-     assert ret.exitcode == 0, ret
-@@ -27,6 +28,7 @@ def test_merged_json_out(salt_cli, salt_minion, salt_minion_2):
-     assert ret.json[salt_minion_2.id] is True
+     assert ret.returncode == 0, ret
+@@ -24,6 +25,7 @@ def test_merged_json_out(salt_cli, salt_minion, salt_minion_2):
+     assert ret.data[salt_minion_2.id] is True
  
  
 +@pytest.mark.skip("not compatible with network-sandbox")
  def test_merged_json_out_disabled(salt_cli, salt_minion, salt_minion_2):
      ret = salt_cli.run("test.ping", minion_tgt="*", merge_json_output=False)
-     assert ret.exitcode == 0, ret
+     assert ret.returncode == 0, ret
 diff --git a/tests/integration/factories/daemons/api/test_api.py b/tests/integration/factories/daemons/api/test_api.py
-index 8202585..0e57d98 100644
+index d6fd060..aade16e 100644
 --- a/tests/integration/factories/daemons/api/test_api.py
 +++ b/tests/integration/factories/daemons/api/test_api.py
 @@ -19,5 +19,6 @@ def salt_api(master):
@@ -158,7 +156,7 @@ index 8202585..0e57d98 100644
  def test_api(salt_api):
      assert salt_api.is_running()
 diff --git a/tests/integration/factories/daemons/api/test_restarts.py b/tests/integration/factories/daemons/api/test_restarts.py
-index 7b91c33..7cd633a 100644
+index bfab01f..0494ebb 100644
 --- a/tests/integration/factories/daemons/api/test_restarts.py
 +++ b/tests/integration/factories/daemons/api/test_restarts.py
 @@ -12,6 +12,7 @@ def master(salt_factories):
@@ -170,16 +168,15 @@ index 7b91c33..7cd633a 100644
      factory = master.salt_api_daemon()
      assert factory.is_running() is False
 diff --git a/tests/integration/factories/daemons/master/test_master.py b/tests/integration/factories/daemons/master/test_master.py
-index e3c20e4..9be3631 100644
+index 6ae19f0..b93f773 100644
 --- a/tests/integration/factories/daemons/master/test_master.py
 +++ b/tests/integration/factories/daemons/master/test_master.py
-@@ -1,4 +1,5 @@
- import os
+@@ -1,3 +1,4 @@
 +import sys
- import tempfile
- 
  import pytest
-@@ -51,10 +52,12 @@ def salt_call(minion):
+ import salt.defaults.exitcodes
+ from pytestshellutils.exceptions import FactoryNotStarted
+@@ -48,10 +49,12 @@ def salt_call(minion):
      return minion.salt_call_cli()
  
  
@@ -192,31 +189,15 @@ index e3c20e4..9be3631 100644
  def test_salt_run(master, salt_run):
      max_open_files_config_value = master.config["max_open_files"]
      ret = salt_run.run("config.get", "max_open_files")
-@@ -62,6 +65,7 @@ def test_salt_run(master, salt_run):
-     assert ret.json == max_open_files_config_value
- 
- 
-+@pytest.mark.skip("not compatible with network-sandbox")
- def test_salt_cp(master, minion, salt_cp, tempfiles):
-     """
-     Test copying a file from the master to the minion
-@@ -103,6 +107,7 @@ def test_salt_cp(master, minion, salt_cp, tempfiles):
-             os.unlink(dest)
- 
- 
-+@pytest.mark.skip("not compatible with network-sandbox")
- def test_salt_cp_no_match(master, minion, salt_cp, tempfiles):
-     assert master.is_running()
-     assert minion.is_running()
-@@ -124,6 +129,7 @@ def test_salt_cp_no_match(master, minion, salt_cp, tempfiles):
-             os.unlink(dest)
+@@ -117,6 +120,7 @@ def test_state_tree(master, salt_call, minion):
+         assert ret.returncode == 0
  
  
 +@pytest.mark.skip("not compatible with sandbox")
  @pytest.mark.skip_on_salt_system_install
- def test_salt_key(master, minion, minion_3, salt_key):
+ def test_salt_key(minion, minion_3, salt_key):
      ret = salt_key.run("--list-all")
-@@ -138,6 +144,7 @@ def test_salt_key(master, minion, minion_3, salt_key):
+@@ -131,6 +135,7 @@ def test_salt_key(minion, minion_3, salt_key):
  
  @pytest.mark.skip_on_windows
  @pytest.mark.skip_on_salt_system_install
@@ -224,14 +205,6 @@ index e3c20e4..9be3631 100644
  def test_exit_status_unknown_user(salt_factories):
      master = salt_factories.salt_master_daemon("set-exitcodes", overrides={"user": "unknown-user"})
      with pytest.raises(FactoryNotStarted) as exc:
-@@ -147,6 +154,7 @@ def test_exit_status_unknown_user(salt_factories):
-     assert "The user is not available." in exc.value.stderr, str(exc.value)
- 
- 
-+@pytest.mark.skip("not compatible with sandbox")
- def test_state_tree(master, salt_call):
-     sls_contents = """
-     test:
 diff --git a/tests/integration/factories/daemons/master/test_restarts.py b/tests/integration/factories/daemons/master/test_restarts.py
 index 683970a..443dcfb 100644
 --- a/tests/integration/factories/daemons/master/test_restarts.py
@@ -245,7 +218,7 @@ index 683970a..443dcfb 100644
      assert master.is_running() is False
      pid = None
 diff --git a/tests/integration/factories/daemons/minion/test_event_forwarder_engine.py b/tests/integration/factories/daemons/minion/test_event_forwarder_engine.py
-index 7983e29..ac1085d 100644
+index a6c6420..10626cd 100644
 --- a/tests/integration/factories/daemons/minion/test_event_forwarder_engine.py
 +++ b/tests/integration/factories/daemons/minion/test_event_forwarder_engine.py
 @@ -28,6 +28,7 @@ def salt_call_cli(minion):
@@ -257,7 +230,7 @@ index 7983e29..ac1085d 100644
      """
      There are some events which the minion fires internally that never reach the master.
 diff --git a/tests/integration/factories/daemons/minion/test_minion.py b/tests/integration/factories/daemons/minion/test_minion.py
-index 8e73efc..4501f9d 100644
+index 387e789..1e4ecfd 100644
 --- a/tests/integration/factories/daemons/minion/test_minion.py
 +++ b/tests/integration/factories/daemons/minion/test_minion.py
 @@ -27,6 +27,7 @@ def salt_call_cli(minion):
@@ -269,7 +242,7 @@ index 8e73efc..4501f9d 100644
      assert minion.is_running()
      ret = salt_cli.run("test.ping", minion_tgt=minion.id)
 @@ -34,6 +35,7 @@ def test_minion(minion, salt_cli):
-     assert ret.json is True
+     assert ret.data is True
  
  
 +@pytest.mark.skip("not compatible with network-sandbox")
@@ -277,7 +250,7 @@ index 8e73efc..4501f9d 100644
      assert minion.is_running()
      ret = salt_cli.run("test.ping", minion_tgt="minion-2")
 @@ -41,6 +43,7 @@ def test_no_match(minion, salt_cli):
-     assert not ret.json
+     assert not ret.data
  
  
 +@pytest.mark.skip("not compatible with network-sandbox")
@@ -285,7 +258,7 @@ index 8e73efc..4501f9d 100644
      assert minion.is_running()
      ret = salt_cli.run("--show-jid", "test.ping", minion_tgt=minion.id)
 @@ -48,6 +51,7 @@ def test_show_jid(minion, salt_cli):
-     assert ret.json is True
+     assert ret.data is True
  
  
 +@pytest.mark.skip("not compatible with network-sandbox")
@@ -293,7 +266,7 @@ index 8e73efc..4501f9d 100644
      assert minion.is_running()
      ret = salt_call_cli.run("test.ping")
 @@ -59,6 +63,7 @@ def test_minion_salt_call(minion, salt_call_cli):
-     assert ret.json is True
+     assert ret.data is True
  
  
 +@pytest.mark.skip("not compatible with network-sandbox")
@@ -301,7 +274,7 @@ index 8e73efc..4501f9d 100644
      ret = salt_call_cli.run(
          "test.raise_exception", "OSError", "2", "No such file or directory", "/tmp/foo.txt"
 @@ -66,6 +71,7 @@ def test_salt_call_exception_handling_doesnt_timeout(minion, salt_call_cli):
-     assert ret.exitcode == 1, ret
+     assert ret.returncode == 1, ret
  
  
 +@pytest.mark.skip("not compatible with sandbox")
@@ -321,10 +294,10 @@ index ab1f044..4ac417d 100644
      factory = master.salt_minion_daemon(random_string("minion-"))
      assert factory.is_running() is False
 diff --git a/tests/integration/factories/daemons/proxy/test_proxy_minion.py b/tests/integration/factories/daemons/proxy/test_proxy_minion.py
-index 926e6ac..f30c986 100644
+index 1c58628..807cbe7 100644
 --- a/tests/integration/factories/daemons/proxy/test_proxy_minion.py
 +++ b/tests/integration/factories/daemons/proxy/test_proxy_minion.py
-@@ -35,6 +35,7 @@ def salt_call_cli(proxy_minion):
+@@ -36,6 +36,7 @@ def salt_call_cli(proxy_minion):
      return proxy_minion.salt_call_cli()
  
  
@@ -332,32 +305,32 @@ index 926e6ac..f30c986 100644
  def test_proxy_minion(proxy_minion, salt_cli):
      assert proxy_minion.is_running()
      ret = salt_cli.run("test.ping", minion_tgt=proxy_minion.id)
-@@ -42,6 +43,7 @@ def test_proxy_minion(proxy_minion, salt_cli):
-     assert ret.json is True
+@@ -43,6 +44,7 @@ def test_proxy_minion(proxy_minion, salt_cli):
+     assert ret.data is True
  
  
 +@pytest.mark.skip("not compatible with network-sandbox")
  def test_no_match(proxy_minion, salt_cli):
      assert proxy_minion.is_running()
      ret = salt_cli.run("test.ping", minion_tgt="proxy-minion-2")
-@@ -49,6 +51,7 @@ def test_no_match(proxy_minion, salt_cli):
-     assert not ret.json
+@@ -50,6 +52,7 @@ def test_no_match(proxy_minion, salt_cli):
+     assert not ret.data
  
  
 +@pytest.mark.skip("not compatible with network-sandbox")
  def test_show_jid(proxy_minion, salt_cli):
      if platform.is_darwin() and sys.version_info[:2] == (3, 7):
          pytest.skip(
-@@ -61,6 +64,7 @@ def test_show_jid(proxy_minion, salt_cli):
-     assert ret.json is True
+@@ -62,6 +65,7 @@ def test_show_jid(proxy_minion, salt_cli):
+     assert ret.data is True
  
  
 +@pytest.mark.skip("not compatible with network-sandbox")
  def test_proxy_minion_salt_call(proxy_minion, salt_call_cli):
      assert proxy_minion.is_running()
      ret = salt_call_cli.run("test.ping")
-@@ -72,6 +76,7 @@ def test_proxy_minion_salt_call(proxy_minion, salt_call_cli):
-     assert ret.json is True
+@@ -73,6 +77,7 @@ def test_proxy_minion_salt_call(proxy_minion, salt_call_cli):
+     assert ret.data is True
  
  
 +@pytest.mark.skip("not compatible with sandbox")
@@ -365,10 +338,10 @@ index 926e6ac..f30c986 100644
      sls_contents = """
      test:
 diff --git a/tests/integration/factories/daemons/proxy/test_restarts.py b/tests/integration/factories/daemons/proxy/test_restarts.py
-index 22ef97d..c781059 100644
+index a243c6d..7758c96 100644
 --- a/tests/integration/factories/daemons/proxy/test_restarts.py
 +++ b/tests/integration/factories/daemons/proxy/test_restarts.py
-@@ -17,6 +17,7 @@ def master(salt_factories):
+@@ -16,6 +16,7 @@ def master(salt_factories):
          yield factory
  
  
@@ -377,7 +350,7 @@ index 22ef97d..c781059 100644
      factory = master.salt_proxy_minion_daemon(random_string("proxy-minion-"))
      assert factory.is_running() is False
 diff --git a/tests/integration/factories/daemons/ssh/test_salt_ssh.py b/tests/integration/factories/daemons/ssh/test_salt_ssh.py
-index e74471a..a288b6b 100644
+index 37e2449..73ac893 100644
 --- a/tests/integration/factories/daemons/ssh/test_salt_ssh.py
 +++ b/tests/integration/factories/daemons/ssh/test_salt_ssh.py
 @@ -51,6 +51,7 @@ def salt_ssh_cli(sshd, salt_factories, master):
@@ -387,7 +360,7 @@ index e74471a..a288b6b 100644
 +@pytest.mark.skip("not compatible with network-sandbox")
  def test_salt_ssh(salt_ssh_cli):
      ret = salt_ssh_cli.run("--ignore-host-keys", "test.echo", "It Works!", minion_tgt="localhost")
-     assert ret.exitcode == 0
+     assert ret.returncode == 0
 diff --git a/tests/integration/factories/daemons/sshd/test_sshd.py b/tests/integration/factories/daemons/sshd/test_sshd.py
 index 3b425fc..3e03636 100644
 --- a/tests/integration/factories/daemons/sshd/test_sshd.py
@@ -416,7 +389,7 @@ index 3b425fc..3e03636 100644
      cmd = subprocess.run(
          [
 diff --git a/tests/integration/utils/saltext/test_log_handlers.py b/tests/integration/utils/saltext/test_log_handlers.py
-index 96ad66d..118062b 100644
+index 6d5b9c0..edc5b5a 100644
 --- a/tests/integration/utils/saltext/test_log_handlers.py
 +++ b/tests/integration/utils/saltext/test_log_handlers.py
 @@ -24,6 +24,7 @@ def salt_cli(master):
@@ -428,7 +401,7 @@ index 96ad66d..118062b 100644
      assert minion.is_running()
  
 diff --git a/tests/scenarios/examples/test_echoext.py b/tests/scenarios/examples/test_echoext.py
-index 3d5ce65..5fd503f 100644
+index 238a442..d827467 100644
 --- a/tests/scenarios/examples/test_echoext.py
 +++ b/tests/scenarios/examples/test_echoext.py
 @@ -1,6 +1,8 @@
@@ -440,30 +413,3 @@ index 3d5ce65..5fd503f 100644
  def test_echoext(extension_venv):
      extension_path = CODE_ROOT_DIR.parent.parent / "examples" / "echo-extension"
      with extension_venv(extension_path) as venv:
-diff --git a/tests/unit/utils/markers/test_skip_if_no_remote_network.py b/tests/unit/utils/markers/test_skip_if_no_remote_network.py
-index 1aa72dc..c4d079e 100644
---- a/tests/unit/utils/markers/test_skip_if_no_remote_network.py
-+++ b/tests/unit/utils/markers/test_skip_if_no_remote_network.py
-@@ -9,7 +9,10 @@ from unittest import mock
- import saltfactories.utils.markers as markers
- from saltfactories.utils import socket
- 
-+import pytest
- 
-+
-+@pytest.mark.skip("not compatible with network-sandbox")
- def test_has_remote_network():
-     assert markers.skip_if_no_remote_network() is None
- 
-diff --git a/tests/unit/utils/test_platform.py b/tests/unit/utils/test_platform.py
-index 28dac0c..b28bcbb 100644
---- a/tests/unit/utils/test_platform.py
-+++ b/tests/unit/utils/test_platform.py
-@@ -120,6 +120,7 @@ def test_is_not_aix():
-         assert saltfactories.utils.platform.is_aix() is return_value
- 
- 
-+@pytest.mark.skip("Doesn't work with salt-3004")
- def test_is_aarch64():
-     return_value = True
-     with mock.patch("sys.platform", "aarch64"):
diff --git a/dev-python/pytest-salt-factories/pytest-salt-factories-0.911.0.ebuild b/dev-python/pytest-salt-factories/pytest-salt-factories-0.121.1-r1.ebuild
index 92e0c7b41f95..e4d2f0f1ee31 100644
--- a/dev-python/pytest-salt-factories/pytest-salt-factories-0.911.0.ebuild
+++ b/dev-python/pytest-salt-factories/pytest-salt-factories-0.121.1-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 2020-2022 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=8
+EAPI=7
 
 PYTHON_COMPAT=( python3_{7..9} )
 inherit distutils-r1
@@ -16,25 +16,18 @@ KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="test"
 
 RDEPEND="
+	>=dev-python/pytest-6.1.1[${PYTHON_USEDEP}]
 	dev-python/attrs[${PYTHON_USEDEP}]
 	dev-python/pytest-tempdir[${PYTHON_USEDEP}]
 	dev-python/psutil[${PYTHON_USEDEP}]
-	>=dev-python/pytest-6.0.0[${PYTHON_USEDEP}]
-	dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}]
 	dev-python/pyzmq[${PYTHON_USEDEP}]
 	dev-python/msgpack[${PYTHON_USEDEP}]
 	>=app-admin/salt-3001.0[${PYTHON_USEDEP}]
 "
-BDEPEND="
-	${RDEPEND}
-	test? (
-		dev-python/pyfakefs[${PYTHON_USEDEP}]
-		dev-python/pytest-subtests[${PYTHON_USEDEP}]
-	)
-"
+BDEPEND="${RDEPEND}"
 
 PATCHES=(
-	"${FILESDIR}/pytest-salt-factories-0.911.0-tests.patch"
+	"${FILESDIR}/pytest-salt-factories-0.121.1-tests.patch"
 )
 
 distutils_enable_tests --install pytest
@@ -44,7 +37,7 @@ python_prepare_all() {
 	sed -r -e '/(setuptools|setup_requires)/ d' -i setup.cfg || die
 
 	sed -i 's:tool.setuptools_scm:tool.disabled:' pyproject.toml || die
-	printf '__version__ = "%s"\n' "${PV}" > src/saltfactories/version.py || die
+	printf '__version__ = "%s"\n' "${PV}" > saltfactories/version.py || die
 	distutils-r1_python_prepare_all
 }
 
@@ -64,7 +57,7 @@ python_test() {
 		cleanup() { rm -f "${tempdir}" || die; }
 
 		trap cleanup EXIT
-		env SHELL="/bin/bash" TMPDIR="${tempdir}" \
+		SHELL="/bin/bash" TMPDIR="${tempdir}" \
 			pytest -vv || die "Tests failed with ${EPYTHON}"
 	)
 }
diff --git a/dev-python/pytest-salt-factories/pytest-salt-factories-1.0.0_rc13.ebuild b/dev-python/pytest-salt-factories/pytest-salt-factories-1.0.0_rc13.ebuild
new file mode 100644
index 000000000000..b6350e8a385e
--- /dev/null
+++ b/dev-python/pytest-salt-factories/pytest-salt-factories-1.0.0_rc13.ebuild
@@ -0,0 +1,72 @@
+# Copyright 2020-2022 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 new generation of the pytest-salt Plugin"
+HOMEPAGE="https://github.com/saltstack/pytest-salt-factories"
+SRC_URI="https://github.com/saltstack/${PN}/archive/${PV//_/}.tar.gz -> ${P}.tar.gz"
+S=${WORKDIR}/${PN}-${PV//_/}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64"
+IUSE="test"
+
+RDEPEND="
+	dev-python/attrs[${PYTHON_USEDEP}]
+	dev-python/pytest-tempdir[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	>=dev-python/pytest-6.0.0[${PYTHON_USEDEP}]
+	dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}]
+	dev-python/pytest-skip-markers[${PYTHON_USEDEP}]
+	dev-python/pytest-system-statistics[${PYTHON_USEDEP}]
+	dev-python/pytest-shell-utilities[${PYTHON_USEDEP}]
+	dev-python/pyzmq[${PYTHON_USEDEP}]
+	dev-python/msgpack[${PYTHON_USEDEP}]
+	dev-python/virtualenv[${PYTHON_USEDEP}]
+	>=app-admin/salt-3001.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	${RDEPEND}
+	test? (
+		dev-python/pyfakefs[${PYTHON_USEDEP}]
+		dev-python/pytest-subtests[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/pytest-salt-factories-1.0.0_rc13-tests.patch"
+)
+
+distutils_enable_tests --install pytest
+
+python_prepare_all() {
+	sed -r -e "s:use_scm_version=True:version='${PV}', name='${PN//-/.}':" -i setup.py || die
+	sed -r -e '/(setuptools|setup_requires)/ d' -i setup.cfg || die
+
+	sed -i 's:tool.setuptools_scm:tool.disabled:' pyproject.toml || die
+	printf '__version__ = "%s"\n' "${PV}" > src/saltfactories/version.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local tempdir
+
+	# ${T} is too long a path for the tests to work
+	tempdir="$(mktemp -du --tmpdir=/tmp salt-XXX)"
+	addwrite "${tempdir}"
+
+	distutils_install_for_testing --via-root
+
+	(
+		cleanup() { rm -rf "${tempdir}" || die; }
+
+		trap cleanup EXIT
+		env SHELL="/bin/bash" TMPDIR="${tempdir}" \
+			pytest -vv -x || die "Tests failed with ${EPYTHON}"
+	)
+}
diff --git a/dev-python/pytest-services/Manifest b/dev-python/pytest-services/Manifest
index 8c1fa1747bab..8d72bc579b94 100644
--- a/dev-python/pytest-services/Manifest
+++ b/dev-python/pytest-services/Manifest
@@ -1,5 +1,5 @@
 AUX pytest-services-2.0.1-lockdir.patch 1085 BLAKE2B 09982cf4874d82a332b441e4538d1fb177735af3acb2ba2d7fed9c0a2ef006841ca0c4221fc51c0472a0a94c49bbcb72877c67b5c7630333f550e3fda1b5aa91 SHA512 7b5d4d5adb722936bd3593ed4e12fa2ca9bc3aa764565d9cbbea2d70424d9811d5838e97bbbe8fafa2f73acb8bdfa6c705e8c4aec12b5b6556b1e4c8db629ea9
 AUX pytest-services-2.0.1-no-mysql.patch 821 BLAKE2B 3a041e51c0e2c08ce8727eccdbfac36eacec2542d8d8cc7ab7544f46916b47a62e960437821f8fa85fe968b9e68808b94d9ac51fe06daf487008bfaf305ba81e SHA512 68788f6b6700793df2de4fbae85a41fad095f09ac9af717c786305fc1ca6b29438a65d096076b9469dc543a54ce8f72a40dc0f211eb9d517e658ce068e60ee23
 DIST pytest-services-2.2.1.tar.gz 21303 BLAKE2B 6f4b66b713ca4976eae61bf516bfecf13b8d6f56e03ae772ba9465e7c4c52b8d5ffa713b9441c73538a0b05665da7b7aa53d5f5da1626c6c208edf1c8239b1b1 SHA512 95d70431a7c3fa3b1602e6ad0e72975cecf5f0464e1bbc21d5b4eee6aefee52794c7b1d8dacf0681cc4cbb5ae7910075a7d0b3859647cc55298a2792489c4bfb
-EBUILD pytest-services-2.2.1.ebuild 1199 BLAKE2B 6ab0517e243c86f0956e9aee260ac74ce2cdfc618608d5c5788fad170787163a6f39ecc560de4ae4cb73e5c10f4439c0acae3070f6a2a7ab20171764f3e40141 SHA512 100aef188e3753b321f0dd913949255e4393a650993253af5bcbd64e226c26dbc057f67bd1c05c22e7886b16242d91bad481cbc09ddaa4c68f8cae97baa5327f
+EBUILD pytest-services-2.2.1.ebuild 1206 BLAKE2B 6201c98783409c49e60e3daa8ff3fae828ba4734072676547c5180a72aadbbd55515c9a417452ad74eb8ffd48c8d22bea9acd0dd2778126d57da281ad7af5291 SHA512 cafe8b1a9f537b19cf759e201b355a349da457deaf0761ff4eb0db2616cc88e77da79d48c9413eebeac894c3e83cdba73126b7fa0f891e5330b63af04a97963c
 MISC metadata.xml 409 BLAKE2B 9404f6ceb2072dddeb6dee14b62e76bfe75c0123c352feea87c5ef43793efa7ce778203fe44727ba56dbf21b408fef027a479f66c3f5542b71e140aeac5624eb SHA512 3dd74088fbe606f8188e121dc76a269ebcc1ed7cebeb6a3ad9fe153c9f1097b468aae12a1e86ce4c1a8a6c7a10136b8a9889e2a96dfd9f0fe252440e3edae1c8
diff --git a/dev-python/pytest-services/pytest-services-2.2.1.ebuild b/dev-python/pytest-services/pytest-services-2.2.1.ebuild
index d8f31829ec9c..67efd3025477 100644
--- a/dev-python/pytest-services/pytest-services-2.2.1.ebuild
+++ b/dev-python/pytest-services/pytest-services-2.2.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/pytest-dev/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ~ppc64 x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ~ppc64 ~riscv x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/pytest-shell-utilities/Manifest b/dev-python/pytest-shell-utilities/Manifest
new file mode 100644
index 000000000000..6bdb66dd7b62
--- /dev/null
+++ b/dev-python/pytest-shell-utilities/Manifest
@@ -0,0 +1,3 @@
+DIST pytest-shell-utilities-1.0.5.tar.gz 89489 BLAKE2B 9cd7f95c9c1691e19c320378d1c2a4e147cb6fdc35ec6f3c80dc288e70416fce67b60ac86427f1ad322b2c17de3cd762e483d63076fa291b4b7d22d7a29c9e45 SHA512 395107af9eaa13ef39d01858e1674b6dedddc2cf93b9aba61316fd8d847031e1b535cc3bf4f2899dbc7828609b7d45b500aad29bb47668be6e0453ac099e99e4
+EBUILD pytest-shell-utilities-1.0.5.ebuild 1304 BLAKE2B 28d74fec94d30a5357a5bbcffef4c36775f820e710461bed050f95d4d8ee47a386458f2bf86ab2ebb51585538bea0fec4e3b5e44a12437bc728dbc4df76e246b SHA512 491eb767646e338d5f4e18da297fc691010ab4f0779ca97c0e5a5cf9bf6b1b902cd43c9342f0cdbfff02e242d28214c7e597089518a9df2125070d56e3771c0a
+MISC metadata.xml 335 BLAKE2B 62e842ec4ec614a557cbe0360488a306fafb8db8c858615403965bbfa7766ee9388f4786c027b303e9e550b7104a3b600d678239feba18a66d77d46a51e2d33b SHA512 62b9164ddb9f3e2c9d3869027bf116bccdf3ec05f35ec6e8094fd4ab79d1ee5c142c810b2c47dc281e23b4aa0c1dfa8f48573d97ae7f45e001dbc0288203b1da
diff --git a/dev-python/pytest-shell-utilities/metadata.xml b/dev-python/pytest-shell-utilities/metadata.xml
new file mode 100644
index 000000000000..16b2592b889f
--- /dev/null
+++ b/dev-python/pytest-shell-utilities/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<name>Patrick McLean</name>
+		<email>chutzpah@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">pytest-shell-utilities</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pytest-shell-utilities/pytest-shell-utilities-1.0.5.ebuild b/dev-python/pytest-shell-utilities/pytest-shell-utilities-1.0.5.ebuild
new file mode 100644
index 000000000000..dc95817ce4f9
--- /dev/null
+++ b/dev-python/pytest-shell-utilities/pytest-shell-utilities-1.0.5.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="pytest plugin: fixtures and code to help with running shell commands on tests"
+HOMEPAGE="
+	https://pypi.org/project/pytest-shell-utilities/
+	https://github.com/saltstack/pytest-shell-utilities
+"
+SRC_URI="https://github.com/saltstack/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64"
+
+RDEPEND="
+	>=dev-python/pytest-6.0.0[${PYTHON_USEDEP}]
+	dev-python/attrs[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	dev-python/typing-extensions[${PYTHON_USEDEP}]
+	dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}]
+	dev-python/pytest-skip-markers[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/wheel[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest-subtests[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	sed -e "s/use_scm_version=True/version='${PV}'/" -i setup.py || die
+	sed -e "/setuptools_scm/ d" -i setup.cfg || die
+	sed -e "s/tool.setuptools_scm/tool.disabled/" -i pyproject.toml || die
+
+	printf '__version__ = "${PV}"\n' > src/pytestshellutils/version.py || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/pytest-skip-markers/Manifest b/dev-python/pytest-skip-markers/Manifest
new file mode 100644
index 000000000000..52b6f6eb19ad
--- /dev/null
+++ b/dev-python/pytest-skip-markers/Manifest
@@ -0,0 +1,3 @@
+DIST pytest-skip-markers-1.2.0.tar.gz 79343 BLAKE2B 7f24b454fe19210d9ecadf10317a5a32830d722b64adbaf0fa6fad70a4c0cb598fa93b782a2b0f71bd23c4f91f2007d21383b488d725f61519d064e98ddd48f8 SHA512 76c1d0f0af7f7a56fa95d33bd5cb078792df3f054714d2ca1baa6d861e9404e2ec734a88a0768985388b1226c399ee6b54fe082ef7fcce6fc190fcae6201a416
+EBUILD pytest-skip-markers-1.2.0.ebuild 1519 BLAKE2B b5fc487ae418f4881ae612209e259b15a6c66b8a8eda0d201d90877cfa55872bc057319a4cc0dca2bade2ad302958a1ce2cf8400307a6c0751e51226f2cda064 SHA512 c6b032f12f2a81655eee78ccf203b48c7fbdb8302107a3942b1679adb1816d0902059ee3a1be296c3041766cc4d0ba8a44e47b3662978a45babdb61d5f1bcc27
+MISC metadata.xml 332 BLAKE2B 444e088c986bc7bcfa6ede30c807c1ada0a8c3dba264ebea0469df16858c0adae29bf5dfdc0ca6b1039ee02d092f6470156b161c88bb9f2bb03989f4ff117855 SHA512 b4251ca80a18902ed8be25eca4830de8fb9ce23bee47b013a992c1250a84788ccf82e5c6029d655884f71ff78feb1915482c9405882657f0b99846df01c174a8
diff --git a/dev-python/pytest-skip-markers/metadata.xml b/dev-python/pytest-skip-markers/metadata.xml
new file mode 100644
index 000000000000..fe019e56f6a8
--- /dev/null
+++ b/dev-python/pytest-skip-markers/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<name>Patrick McLean</name>
+		<email>chutzpah@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">pytest-skip-markers</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pytest-skip-markers/pytest-skip-markers-1.2.0.ebuild b/dev-python/pytest-skip-markers/pytest-skip-markers-1.2.0.ebuild
new file mode 100644
index 000000000000..a8de6b438280
--- /dev/null
+++ b/dev-python/pytest-skip-markers/pytest-skip-markers-1.2.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION=""
+HOMEPAGE="
+	https://pytest-skip-markers.readthedocs.io/en/latest/
+	https://github.com/saltstack/pytest-skip-markers
+"
+SRC_URI="https://github.com/saltstack/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64"
+
+RDEPEND="
+	>=dev-python/pytest-6.0.0[${PYTHON_USEDEP}]
+	dev-python/attrs[${PYTHON_USEDEP}]
+	dev-python/pytest-tempdir[${PYTHON_USEDEP}]
+	dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}]
+	dev-python/pytest-system-statistics[${PYTHON_USEDEP}]
+	dev-python/pytest-shell-utilities[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	dev-python/pyzmq[${PYTHON_USEDEP}]
+	dev-python/msgpack[${PYTHON_USEDEP}]
+	dev-python/virtualenv[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/wheel[${PYTHON_USEDEP}]
+	dev-python/setuptools-declarative-requirements[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/pyfakefs[${PYTHON_USEDEP}]
+		dev-python/pytest-subtests[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	sed -e "s/use_scm_version=True/version='${PV}'/" -i setup.py || die
+	sed -e "/setuptools_scm/ d" -i setup.cfg || die
+	sed -e "s/tool.setuptools_scm/tool.disabled/" -i pyproject.toml || die
+
+	printf '__version__ = "${PV}"\n' > src/pytestskipmarkers/version.py || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/pytest-system-statistics/Manifest b/dev-python/pytest-system-statistics/Manifest
new file mode 100644
index 000000000000..41a79fe0ded2
--- /dev/null
+++ b/dev-python/pytest-system-statistics/Manifest
@@ -0,0 +1,3 @@
+DIST pytest-system-statistics-1.0.2.tar.gz 55147 BLAKE2B 9b1217102a23e723090e04652fdd727818e2404bf110e4f54289251eb92f4abb59861ba6c6fc611c843960cf0595fa5cbd636071033327d4e602606e8ab63abf SHA512 1fab5038dde504ab0d5d0f4da851c9a8260849adb38a1196c6399131d77cc24a1926e68310dd0701ed001a20a7fcfb57c5202c5ebfd6de4c85aac4be49fc7347
+EBUILD pytest-system-statistics-1.0.2.ebuild 1277 BLAKE2B 2874b460e755830f2644bd071d6f5336a8fd906825ff350c7a5da8f3cffdd740b6c86c9289761c2b02b6381b9642b2f45ac5668f93f3f5addc8afcd3dd0784f6 SHA512 6804ab2305f8a9cd8ee90ce669e9906b5e58fb90c77ee494f0197331edaf5f09cb0a91ceafabe3a0da4e2ec0f4ad278798b13a77c6d5196c6ce2e81de1913bd7
+MISC metadata.xml 337 BLAKE2B 00bcf31ed6a7b0b94fe3bc0f3031d64bdd682be4797a4f2878ac0d66012d8c026a7295c923f9081f9e7b1b2dc1fd7c6dc7a4e33dfcd97f80785a737815979313 SHA512 a28c702734f0907afdb667a42e8d2672ab938bb4802f4e55e69de872694176b5424cd7073a9b2caee7dbe856fa511e41447ed30e49cc64d053a14b9ad830766a
diff --git a/dev-python/pytest-system-statistics/metadata.xml b/dev-python/pytest-system-statistics/metadata.xml
new file mode 100644
index 000000000000..227706a29106
--- /dev/null
+++ b/dev-python/pytest-system-statistics/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<name>Patrick McLean</name>
+		<email>chutzpah@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">pytest-system-statistics</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pytest-system-statistics/pytest-system-statistics-1.0.2.ebuild b/dev-python/pytest-system-statistics/pytest-system-statistics-1.0.2.ebuild
new file mode 100644
index 000000000000..27a2d008b30a
--- /dev/null
+++ b/dev-python/pytest-system-statistics/pytest-system-statistics-1.0.2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Pytest Plugin Which Reports System Usage Statistics"
+HOMEPAGE="
+	https://pypi.org/project/pytest-system-statistics/
+	https://github.com/saltstack/pytest-system-statistics
+"
+SRC_URI="https://github.com/saltstack/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64"
+
+RDEPEND="
+	>=dev-python/pytest-6.0.0[${PYTHON_USEDEP}]
+	dev-python/attrs[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	dev-python/typing-extensions[${PYTHON_USEDEP}]
+	dev-python/pytest-skip-markers[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/wheel[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest-subtests[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	sed -e "s/use_scm_version=True/version='${PV}'/" -i setup.py || die
+	sed -e "/setuptools_scm/ d" -i setup.cfg || die
+	sed -e "s/tool.setuptools_scm/tool.disabled/" -i pyproject.toml || die
+
+	printf '__version__ = "${PV}"\n' > src/pytestsysstats/version.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	epytest -k 'not proc_sys_stats'
+}
diff --git a/dev-python/pytest-tempdir/Manifest b/dev-python/pytest-tempdir/Manifest
index c57ea24365e4..7b97ea635053 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 503 BLAKE2B 44d5b57db6b9363c3cddb58d89acee79e8dc187b03357fe5c42b2daac4e57a8a8cd9e398942fbeb1968b02deb1a3e86f6efc0206c17a513c084a97e7d709c278 SHA512 c06d8895372f04ee94bd850bcc067199a0e75e50869ac57fae7e1155e27c09da8aab264c6b9c189aa83aed782bdaa5cb829f2709b2801ae3b51b0b78bd0d9dd2
+EBUILD pytest-tempdir-2019.10.12.ebuild 510 BLAKE2B f88d5c7052b9f24f80566433a9083e2cc6bf73d4f21cb8f993edb48601e1f53a76b032f14874bc3ce6e4bc6a99949cc53b275dde7c236f213ffabd7059dd07e9 SHA512 57a555d0b5f4cf035aaefa93e9959222616dac812ece07b5d68828ae775f4351a2c8a14ce5fe8adca23405706768618803f499bfbf5ac5ee1ffeafeb5d900f81
 MISC metadata.xml 327 BLAKE2B 0280ea518e1e366316adc1f2ee8f5ee2a787d190b409efccc1e7d001f95b39ce64f9ce4a2366172589e9128f541ad0312ee2d56d0f37f763def05ed8f0e12759 SHA512 7ba82ed730777df1be39f18030e1149819eb6a0e36dfea4dda4e2866920133ff584f6e4ec635a5fe05ea81739d02e3991c19e835ed769223d2d9a229ac48c570
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 0720ff8875bd..8975450b6b5f 100644
--- a/dev-python/pytest-tempdir/pytest-tempdir-2019.10.12.ebuild
+++ b/dev-python/pytest-tempdir/pytest-tempdir-2019.10.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2021 Gentoo Authors
+# Copyright 2020-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,6 +12,6 @@ SRC_URI="https://github.com/saltstack/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 
 distutils_enable_tests --install pytest
diff --git a/dev-python/pytest-testinfra/Manifest b/dev-python/pytest-testinfra/Manifest
index 6a72648ab15b..e799c37ebfa6 100644
--- a/dev-python/pytest-testinfra/Manifest
+++ b/dev-python/pytest-testinfra/Manifest
@@ -1,7 +1,3 @@
-DIST pytest-testinfra-6.4.0.tar.gz 77516 BLAKE2B 2baf5940e8736cbe78d8017a82b3a8fdb6df95b89acccd49ecd354447b7ea88079f48211e0acea46a0d8702b67609fe6f85f730c66e781a99d8a92b52b3c99b9 SHA512 acd2c7f9daeb391815a32c972a3542c0d643a716f3cffcb66f4203435ebac789333edb91c83d2778ae8da93b676b245fd47821bca9218faa3e7b50e6764087f4
-DIST pytest-testinfra-6.5.0.tar.gz 77177 BLAKE2B 98a8f10f7cf62f204c117d295496a7dfa4de476f5cde457af6f5bc71b22e12e9f02b4893adc6b0d1be11915ed652f628c2574fd44750c82c690e3d8326e29c4c SHA512 f7fcf8facafc0d99b06f55f4241c39b610ff7648b0049c584a75b46944b522b957c98c353f147d74bc8a72f677a179380c456b0868f9dae9af514a9c95d55b13
 DIST pytest-testinfra-6.6.0.tar.gz 78285 BLAKE2B c7583685aeb770f76e4679730599909b8fff53d1909664f55e2d35f7f5a6a96741e3aa56b81da464c2d474d1d5f646892e36a4f9b6938327cb526476536b0b6c SHA512 f78f1cd5240e157d4e2949178f29900a7b85a6065b4113b18273af3f1fef6b19c859192f59426b93eba48418bb89d163ad1d951e97d4fdfcea4394635a05140a
-EBUILD pytest-testinfra-6.4.0.ebuild 894 BLAKE2B 1027b8c0a4d13d2db3612bd989f32414316fef63fb7a265682ae8dc5b992f886e6c2592f2645789abdf70bad3a4a12742c584645bbce974fe513b680cc5890cc SHA512 2b957be685f8e7961aa05093dfaa14783e79107becf42c6668a7b3c0d75b660bff45c05ac9f7f9c50e4c2cf068cefb8d3e4d6f78477ac5f9553ae8478c0438e0
-EBUILD pytest-testinfra-6.5.0.ebuild 1205 BLAKE2B d83a040bd2d0ef6574868f4cd11aed122ba7d1e706780d1e900e652294124c06faeb6b655387fe314c092a7b9a310a89a6b5f7e6d1f3dc5cd0e211340a02ec6e SHA512 08d9b9ceb8c48be5aeff346272775aabd6e915776bf50261a8db9146f73e832eb18e68e86bc336c9cbc0211357a90e057643e7a80551891fe4e462dd9d2539ad
 EBUILD pytest-testinfra-6.6.0.ebuild 1240 BLAKE2B da9f1bf50090dcdc689931c5e29da618b771ca18a9560befe5e9b4d7c9a8f62105caa9ee01085ae9e9a9ac8cbe0d8d394736a00f33b031e2636329a4293e432d SHA512 c8770bd3050cd08b1da5e0f819f9c8342b805b358d5222babdc8f68d56fd8e241723e63c317fa7d235360f5cfe3323a7a4075b0a5dab03d252da11009805d300
 MISC metadata.xml 680 BLAKE2B feb779de8bbaf041a3aa00046c4b17fcad0e863ebd365732c9f1e0bbdf6c68edf7ec2b7d546c2bdf458c134f7cb17a65ba07fe6edb5af7675d4bb79af75a23a6 SHA512 386a4877ca43ef6a1408ecc0871ba40c40b4654ee3824b4a99f5ff6f4769284d54c9377cebcd5456815fc5470110a337d83f8016a6598cef8ce29d93cd3645fc
diff --git a/dev-python/pytest-testinfra/pytest-testinfra-6.4.0.ebuild b/dev-python/pytest-testinfra/pytest-testinfra-6.4.0.ebuild
deleted file mode 100644
index c336646d0373..000000000000
--- a/dev-python/pytest-testinfra/pytest-testinfra-6.4.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Write unit tests in Python to test actual state of your servers"
-HOMEPAGE="https://github.com/pytest-dev/pytest-testinfra"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="dev-python/pytest[${PYTHON_USEDEP}]"
-# Ansible is called via its CLI
-BDEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		app-admin/ansible
-		app-admin/salt[${PYTHON_USEDEP}]
-		dev-python/paramiko[${PYTHON_USEDEP}]
-		dev-python/pywinrm[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-pkg_postinst() {
-	elog "For the list of available connection back-ends and their dependencies,"
-	elog "please consult https://testinfra.readthedocs.io/en/latest/backends.html"
-}
diff --git a/dev-python/pytest-testinfra/pytest-testinfra-6.5.0.ebuild b/dev-python/pytest-testinfra/pytest-testinfra-6.5.0.ebuild
deleted file mode 100644
index a10a5d492b91..000000000000
--- a/dev-python/pytest-testinfra/pytest-testinfra-6.5.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Write unit tests in Python to test actual state of your servers"
-HOMEPAGE="https://github.com/pytest-dev/pytest-testinfra"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="dev-python/pytest[${PYTHON_USEDEP}]"
-# Ansible is called via its CLI
-BDEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		app-admin/ansible
-		dev-python/paramiko[${PYTHON_USEDEP}]
-		dev-python/pywinrm[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			app-admin/salt[${PYTHON_USEDEP}]
-		' python3_{8..9} )
-	)"
-
-distutils_enable_tests pytest
-
-python_test() {
-	if [[ ${EPYTHON} == "python3.10" ]]; then
-		ewarn "Some of the tests are skipped on ${EPYTHON} because it still isn't supported by app-admin/salt"
-		local EPYTEST_DESELECT=(
-			test/test_backends.py::test_backend_importables
-		)
-	fi
-	epytest
-}
-
-pkg_postinst() {
-	elog "For the list of available connection back-ends and their dependencies,"
-	elog "please consult https://testinfra.readthedocs.io/en/latest/backends.html"
-}
diff --git a/dev-python/python-cinderclient/Manifest b/dev-python/python-cinderclient/Manifest
index 14a4c2ed785a..de1658a240ca 100644
--- a/dev-python/python-cinderclient/Manifest
+++ b/dev-python/python-cinderclient/Manifest
@@ -1,6 +1,3 @@
-DIST python-cinderclient-8.2.0.tar.gz 233148 BLAKE2B 4ada4562ff1e51a284cf98e7ca4b324a05a4524951d6193bb4683a3986bc8a26a48373ef78613f3b94ed475992fb781b409fe58f9f3655f3f721b38f7eab770b SHA512 86e7a0c18d960f00448e20485d91443d185902db281014c99f35af463843be6d4bca80712edf44189b53e25853af064c14de18e943d9fdee29446180d9b91bbc
 DIST python-cinderclient-8.3.0.tar.gz 234371 BLAKE2B 092d7abdd348f5fac750efb3f3f4df1575584684ad613d22c558630576ad2f82c399af671aad7070dd224a89fa01d73333c2505dc0166d2e4c70e21ac01f298d SHA512 4d633b39a3c59cfdc2fc2c6235b3b87093f7617c89a80b50cf26d8f6fd63e8c3197d788e0b9e81347b9427cf363289b09b85376512d5820031472a735e0ca839
-EBUILD python-cinderclient-8.2.0-r1.ebuild 1271 BLAKE2B 789b54874ef69bd8a34dab5550718229b3c712a0a4f17816f9a53b22b869fd8f3319dec2bf4f17c6d04f4c7f71e0b8eff5892a5389f6c4865ec77c3f92f71177 SHA512 a8e0aec5428a04bd15b7bf174a9cb7ca7a8a91e9620182ab159255ca1afd0ee16e756e9f91989f379bd7a4314168eb39124b981ab6eb265fdf45bd9d07222f93
-EBUILD python-cinderclient-8.2.0.ebuild 1235 BLAKE2B 118a465b5e9a78a33e41ecbb0154128271057def69e81cf9088fccbb3ccaaaf43da98f7a6f501aa8b541ec7911884dd328e1e59087fd9ab10ac35110253c6914 SHA512 f914ff39f18eeadd27dad0e5883b4305999f7a032e07a6ce84ccd945aa931129d586b45d8e6eb634f0a262c53c42f6893c694ee886e64ac7ad196205b3783f51
-EBUILD python-cinderclient-8.3.0.ebuild 1232 BLAKE2B 326ea275604c7c94a8994ae45e20de0b34ea057fec8e03c7f05bc18f4225b454920dbdcc9550a5c2e85721d57831f12928b7ddb28135eea20778d6f5982b586f SHA512 ea989eb9447f560b4eaeed498f8b6d976590ed221e58a5b9a0bd1225000923efde974005b386bc7e4b1b66d35b0173c1fd174d89f097c477370bfea9c992892d
+EBUILD python-cinderclient-8.3.0.ebuild 1230 BLAKE2B 4ef8d54a5919be9090bd62d63bcc89d86696221ef5dada366b663a705f34feaf67120cd633b21eda59eb6213d030633aa9f3928fdc593e26f29e8d10e53cc0f7 SHA512 072b26a6b28e3729f1484abb9f010dff33f8485dd46b480be2799041f831f2d22a1e7fdb071be02e46923ad680dadbec7d3796eb55c8b05957d4eaea0aa77afc
 MISC metadata.xml 620 BLAKE2B 0ae868352f45097f3cf441ccf11551a05c6264d441f7b42452ed40e8ae9b6f68a5413b4e2cf91e20eb7bbf8bef7cc8f1dcf203e0378e42b9d27f04f96dfceca3 SHA512 cae62ef195e410efe40d9b693c2526c6c966790701006a773c931ea02cf5f2f6cefc1c08f27ddc07d3306794130fe99a87e4e2fc49f573741b599145e1017915
diff --git a/dev-python/python-cinderclient/python-cinderclient-8.2.0-r1.ebuild b/dev-python/python-cinderclient/python-cinderclient-8.2.0-r1.ebuild
deleted file mode 100644
index 285508bda622..000000000000
--- a/dev-python/python-cinderclient/python-cinderclient-8.2.0-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="A client for the OpenStack Cinder API"
-HOMEPAGE="https://launchpad.net/python-cinderclient"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-RDEPEND="
-	>=dev-python/keystoneauth-4.2.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-5.0.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-4.8.0[${PYTHON_USEDEP}]
-	>=dev-python/pbr-5.5.0[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7.2[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.25.1[${PYTHON_USEDEP}]
-	>=dev-python/simplejson-3.5.1[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-3.3.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/pbr[${PYTHON_USEDEP}]
-	test? (
-		dev-python/ddt[${PYTHON_USEDEP}]
-		dev-python/fixtures[${PYTHON_USEDEP}]
-		dev-python/oslo-serialization[${PYTHON_USEDEP}]
-		dev-python/requests-mock[${PYTHON_USEDEP}]
-		dev-python/testtools[${PYTHON_USEDEP}]
-		dev-python/tempest[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-python_test() {
-	# functional tests require cloud instance access
-	eunittest -b cinderclient/tests/unit
-}
diff --git a/dev-python/python-cinderclient/python-cinderclient-8.2.0.ebuild b/dev-python/python-cinderclient/python-cinderclient-8.2.0.ebuild
deleted file mode 100644
index 2b4a90fd2153..000000000000
--- a/dev-python/python-cinderclient/python-cinderclient-8.2.0.ebuild
+++ /dev/null
@@ -1,44 +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} )
-inherit distutils-r1
-
-DESCRIPTION="A client for the OpenStack Cinder API"
-HOMEPAGE="https://launchpad.net/python-cinderclient"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-RDEPEND="
-	>=dev-python/keystoneauth-4.2.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-5.0.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-4.8.0[${PYTHON_USEDEP}]
-	>=dev-python/pbr-5.5.0[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7.2[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.25.1[${PYTHON_USEDEP}]
-	>=dev-python/simplejson-3.5.1[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-3.3.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/pbr[${PYTHON_USEDEP}]
-	test? (
-		dev-python/ddt[${PYTHON_USEDEP}]
-		dev-python/fixtures[${PYTHON_USEDEP}]
-		dev-python/oslo-serialization[${PYTHON_USEDEP}]
-		dev-python/requests-mock[${PYTHON_USEDEP}]
-		dev-python/testtools[${PYTHON_USEDEP}]
-		dev-python/tempest[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-python_test() {
-	# functional tests require cloud instance access
-	eunittest -b cinderclient/tests/unit
-}
diff --git a/dev-python/python-cinderclient/python-cinderclient-8.3.0.ebuild b/dev-python/python-cinderclient/python-cinderclient-8.3.0.ebuild
index 610b988ad6b8..6b385327639c 100644
--- a/dev-python/python-cinderclient/python-cinderclient-8.3.0.ebuild
+++ b/dev-python/python-cinderclient/python-cinderclient-8.3.0.ebuild
@@ -14,7 +14,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/keystoneauth-4.2.1[${PYTHON_USEDEP}]
diff --git a/dev-python/python-dbusmock/Manifest b/dev-python/python-dbusmock/Manifest
index d41902121971..53b26b7d4081 100644
--- a/dev-python/python-dbusmock/Manifest
+++ b/dev-python/python-dbusmock/Manifest
@@ -1,7 +1,7 @@
-DIST python-dbusmock-0.25.0.tar.gz 86674 BLAKE2B 9a9f5aefece0f48725f8a453d298fde78e86c86901f5dd3c67032be41cbc52753b8b0da8e8ba3845772e68ba6dcf0938af405f961fc5425808017dd8b30e1419 SHA512 5d7c2f4ea75c7a0f2c6bf63b673c180f3a468239082e0248778441d8f07b78fa3786c1d37498f758954a4727bdb24dc83ffc0671bfc4b2956402aee52c363045
 DIST python-dbusmock-0.26.1.tar.gz 87707 BLAKE2B 9f4761ab5f227e78dd5343f3ddd4b83d0494e77d3b381f719890447998baab8096b3bf817259b080dda78619f8407ad532044cb60aaf7a5280459f423754df0f SHA512 dcb46f6dbd17471e2135c0d8fb63cbaecbc9445ae7bf74691abb03b93d5283ab41ea71071ece03870aaac19eaedd546f01c0839116421047f1ac77619f2c73f3
 DIST python-dbusmock-0.27.0.tar.gz 89469 BLAKE2B b6fcdb5ded2b4f50d4c3edafecf028df57c3aae6e2a1e87d78c41f879f495d06ab097be0996b7b1781aebd4235a5ce7c6b58f48f5c74e2d4c2b49a3439ce9cae SHA512 4f3a7326b27d7b86d9a77019c419209077021a88994b8e5ae302686fcaa8b7c7736644ab26d9e3b5a2157634eb56a0b2dbe304a092d93104c94a13a43d53b5a1
-EBUILD python-dbusmock-0.25.0.ebuild 833 BLAKE2B 63f487cc0082f793112dc4da582efdb98aed150387d4f18f1d16ce2929796181ce404f5f78795cd4e944251da212c97efc5708410d6840a03888f5ef7185b081 SHA512 492b3531f9aed8eef1b5245d2c2c838e38cb109d3d45bcdda2919c9402699ff66d1a5057fe3935c67bced404a6e3174c5608c8e2652409bc6b39c7d1cc8aa4b4
-EBUILD python-dbusmock-0.26.1.ebuild 874 BLAKE2B 6365190ef0b6c86d3dd7a71afebb394cfd29cc52b87bde74f7f7128968137a66ce4534a9caa1f3ddbb4c145fd6b8d4eeb12d63bd8cabc5b1224fbd01810caf6a SHA512 1cbe9fcfb47a23e5b0cd446a1b6a260776959828ed311471463b91f315142b50a577b19e5a135e11053b1bb9bd8fad81c9eb785ff9124d3467c98cc55c400d93
+DIST python-dbusmock-0.27.5.tar.gz 89775 BLAKE2B 316bb1ae06c894702d54b7a54d0c422a877c50fb7e8aa4a1bb3c9ac342acdec8f6adaafea86afa5aa041414a283fdd284e27b58728efa234fb8bcbbf92b25f27 SHA512 6e5f5eddfc949c610b64a766434988c142397893e088b8522e6895e31383ec3c14d2f053f9aab17f00137e883a01bf95be35326f7ca97ee8c9780d6704e7d1dc
+EBUILD python-dbusmock-0.26.1.ebuild 867 BLAKE2B d3dcbd61ae8ff67fc1aad8d00efe070aa0bca6c18b87865d687ac2836adcd11a1fec9ce369081485a6b58f3d355699ecb4255eefefc238fa5d3b2259feb6888f SHA512 f1c3fdf3f54ca594f4420d5ef7cb21fc0f861cc67f3bc1bc6290caf46d85df9a4b90e301dbb26cf7f8d856916d11f7ded13b81c016fca2400bbc66f128778496
 EBUILD python-dbusmock-0.27.0.ebuild 874 BLAKE2B 6365190ef0b6c86d3dd7a71afebb394cfd29cc52b87bde74f7f7128968137a66ce4534a9caa1f3ddbb4c145fd6b8d4eeb12d63bd8cabc5b1224fbd01810caf6a SHA512 1cbe9fcfb47a23e5b0cd446a1b6a260776959828ed311471463b91f315142b50a577b19e5a135e11053b1bb9bd8fad81c9eb785ff9124d3467c98cc55c400d93
+EBUILD python-dbusmock-0.27.5.ebuild 874 BLAKE2B 6365190ef0b6c86d3dd7a71afebb394cfd29cc52b87bde74f7f7128968137a66ce4534a9caa1f3ddbb4c145fd6b8d4eeb12d63bd8cabc5b1224fbd01810caf6a SHA512 1cbe9fcfb47a23e5b0cd446a1b6a260776959828ed311471463b91f315142b50a577b19e5a135e11053b1bb9bd8fad81c9eb785ff9124d3467c98cc55c400d93
 MISC metadata.xml 457 BLAKE2B 7c93de164cfb7badf62932420c9fff4eb07e2247ab2293f5299649e79fd1b8b8d51b30a3c685d9d88043e4e4067c557961be45d9cf2fdf1a13bee5547934eb98 SHA512 0b9ece97d74dc9a74fc9a3f55b1561c7f1473ce483ee7be53f875c740d433409b846161821d44e48c0a5988b5999e5704cf5f6afa2436f57fd1b654518ce1f87
diff --git a/dev-python/python-dbusmock/python-dbusmock-0.26.1.ebuild b/dev-python/python-dbusmock/python-dbusmock-0.26.1.ebuild
index 4b29c538cdd6..73574b585de1 100644
--- a/dev-python/python-dbusmock/python-dbusmock-0.26.1.ebuild
+++ b/dev-python/python-dbusmock/python-dbusmock-0.26.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="LGPL-3+"
 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="
 	dev-python/dbus-python[${PYTHON_USEDEP}]
diff --git a/dev-python/python-dbusmock/python-dbusmock-0.25.0.ebuild b/dev-python/python-dbusmock/python-dbusmock-0.27.5.ebuild
index c65ba7b4ab42..4b29c538cdd6 100644
--- a/dev-python/python-dbusmock/python-dbusmock-0.25.0.ebuild
+++ b/dev-python/python-dbusmock/python-dbusmock-0.27.5.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=8
 
+DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE="xml(+)"
 
@@ -11,15 +12,17 @@ inherit distutils-r1
 DESCRIPTION="Easily create mock objects on D-Bus for software testing"
 HOMEPAGE="https://github.com/martinpitt/python-dbusmock"
 SRC_URI="
-	https://github.com/martinpitt/python-dbusmock/releases/download/${PV}/${P}.tar.gz"
+	https://github.com/martinpitt/python-dbusmock/releases/download/${PV}/${P}.tar.gz
+"
 
 LICENSE="LGPL-3+"
 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="
 	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]"
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+"
 
 distutils_enable_tests unittest
 
diff --git a/dev-python/python-dotenv/Manifest b/dev-python/python-dotenv/Manifest
index f2faec4416d4..517966ab8f02 100644
--- a/dev-python/python-dotenv/Manifest
+++ b/dev-python/python-dotenv/Manifest
@@ -1,4 +1,6 @@
 AUX python-dotenv-0.19.2-entry-points.patch 531 BLAKE2B fdb966643534cc91b89bfc6776d7fb805c3caf803ccd6cbfc507e385aa42baadca0472bc827b77e6f3a85b28d030ef862f14033f48444e54aea7a3d285a4bc4d SHA512 5eca6b19360ef71c2af6a636fa6148fa087d570810622e95a6132d6946643449c15b7c09a100e544415c6e963aa7d94cb23b101a10edd0c6c01be7ea7fa9477f
 DIST python-dotenv-0.19.2.tar.gz 31508 BLAKE2B f92285090b680d3cbf842f99b6ca49ab9af877a1ed6543cbc3a41ba592240739fdf94f2ea21f2e2e3c9b9e68eeb36c5b1c12004fa953674e3f47942176e125c6 SHA512 da411fa02326ec7407bbb6760dd4e5f22eaca60d725ade3ac89302ec4e33d00fe8c231e8a64d0bc22698a93701143085c098b6703e598c6d8c2e4c57b9bafa20
+DIST python-dotenv-0.20.0.tar.gz 32069 BLAKE2B 360c878241fe4df4cee2ef59a2a4967e3b5fff7250297e4adb4b7f2c50deaf66bdc76b97bc9a1998bcf3d7da7c5e40c98f93d3e3cc044a2e73e159a85a2d93fa SHA512 85e3953f296ec59130ea212b794557d479efde0ef519303dd3a8fe8da0be2d445728b9b8fd5a4bc13372a0fa322f49d290038538ddca580841d0df1f3758f0b7
 EBUILD python-dotenv-0.19.2-r2.ebuild 1055 BLAKE2B 732e045c61d042e9e95fb4ab9d4623f6de566cb2fb5aaf2a1bf089cc0fef3156412101be4076f89a0434d0c52bd9f71a06965d81fcbf4884d0eeab4a181fbb37 SHA512 44e11bd7c2ad62bf1679a31aa4ec9f70d799120b2e0b7da2a06056b9516e90f6c9be16dfdfa9ff261768cf80f68d36bb1f77a72acff134b8e53d9b50f987851f
+EBUILD python-dotenv-0.20.0.ebuild 936 BLAKE2B 5af9ac17669cc86a8ed00d85320f314b782e53bd0b6676becb876c01c5c9cbda9776b8f62809ba4dd32b6c6d0cd99a005f1e58284f67e42764f04576b9f42d19 SHA512 99bd5f85cfad76969b1bfc942ac0b6c1ff8785a921de07c630192db82bd7f2d636775e18f51826515d097aa102602262ce8b2e24caeb04c153b0d45f81316bab
 MISC metadata.xml 466 BLAKE2B 2e6368e01f6c9d9ab8e69a62196a10765ebc30365a3c2fab3e171386c7f26adcb93e7e4d0796696e531db66236c2c7f31b6c948a76682ff385993cc5504eba00 SHA512 45b35de8b5108267b28a1d6975824440d821cfe3e3a1c99dcadbe8d64b4ef78feadb9b0b7434c7292250e7f4615c13f2f37d5b5d41956d136f9bf25d175c356a
diff --git a/dev-python/python-dotenv/python-dotenv-0.20.0.ebuild b/dev-python/python-dotenv/python-dotenv-0.20.0.ebuild
new file mode 100644
index 000000000000..5ad0c94536ce
--- /dev/null
+++ b/dev-python/python-dotenv/python-dotenv-0.20.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Manage .env files"
+HOMEPAGE="https://github.com/theskumar/python-dotenv"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+DEPEND="
+	test? (
+		>=dev-python/click-5[${PYTHON_USEDEP}]
+		dev-python/ipython[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		>=dev-python/sh-1.09[${PYTHON_USEDEP}]
+	)
+"
+
+DOCS=( CHANGELOG.md README.md )
+
+distutils_enable_tests pytest
+
+python_install() {
+	distutils-r1_python_install
+	ln -s dotenv "${D}$(python_get_scriptdir)"/python-dotenv || die
+}
+
+src_install() {
+	distutils-r1_src_install
+
+	# Avoid collision with dev-ruby/dotenv (bug #798648)
+	mv "${ED}"/usr/bin/{,python-}dotenv || die
+}
diff --git a/dev-python/python-glanceclient/Manifest b/dev-python/python-glanceclient/Manifest
index 78f6dad723dd..b1abac560fcd 100644
--- a/dev-python/python-glanceclient/Manifest
+++ b/dev-python/python-glanceclient/Manifest
@@ -1,5 +1,3 @@
-DIST python-glanceclient-3.5.0.tar.gz 198273 BLAKE2B 7861a2124a9474c4f6267f5b82e6d7fa9825d3cdc8411fbb05afabf69928dd230a881452de57cf54f9cd1a52157f806826036d85f6a93651980ce65e86afd520 SHA512 e5db1afeea7e3f653d7afac7961aeb3ec28df5dc40bba6b8b70795efcfc66928c2af45ecc0e4bbcc0d59a0157599e4ef3af090a8b0ccd0d727e8a94d4f8c866e
 DIST python-glanceclient-3.6.0.tar.gz 202581 BLAKE2B 20bf5ee863cc3d319cc7b670f4a218c9b84b49c392f7a7756636a93643ddf81781f808d6d966ca1982246b66b7963354c433239f554eb2aa0291bd1d57da2e79 SHA512 7bcf08386cfe6d4787dd8e6616907814a53fcc35bdac1818aef7ba094dcd37dfddddda43a1451d55f22d175f400f8680801d1a43508c5d85ce39f15164b71a5d
-EBUILD python-glanceclient-3.5.0.ebuild 1327 BLAKE2B 9ccd77c947ef67f2f5283040de020fd90aac4cb0201e81b2e79999c6eb34f929c0cb15c2d64067edf5fda8a2570ff5032cda12ab7776b4c974049c6b71e68f9e SHA512 a859f94cbe72fabe854e73f2593c3dd1049e51f93b868f82492d1df8d39b4d1eab1f96074964e8fbea678e826a83bf17ebc1e30782c47a064336385b56b97157
-EBUILD python-glanceclient-3.6.0.ebuild 1364 BLAKE2B 3aca14cf800c49306b79ad29da6872945d7448c270724c297e1699bbee851e9914553d5d5988edbdc5e67f6d7eec5267534c05fadc4ca8fa82a3868b185ffb23 SHA512 1d0dba6aa08eb4296204371885bc9e77d366878a4a49b50c2bfb2a483c4406c166bd389891923828d8b399c7beb90a0ed0226a52fb5a8c422c1b561a5d7b47f8
+EBUILD python-glanceclient-3.6.0.ebuild 1361 BLAKE2B 15a65849cb2717b5b58a93b0d1fe741eac75df7018ad46625af80e208ea9139d260278cd0816337d94accdee84d49be5fb5032e1cf9a886dfbdda09f555390c9 SHA512 aac93dfabd708f2a3fe4d3fa90c0dab1aa32048ab3aafbb32d0165afefc4957d3e464136e143aa1eaa91ce00a5d299968f518effefc0460939b8e80f3489e596
 MISC metadata.xml 556 BLAKE2B 1007f5d86b8a7a5feb6018997ad5126f31c10d619d480adaf28db855ae9745c1395632b1d0fb9c915106e7678b7148487c3a2de800e8bf19e1abe55b00df7ecd SHA512 43aa944c6c8a91dfe59aa8261718fe144c852f0e036cddbf4453cfcfde21816e619388de98713de965d03c63ae242ee4fc27be103263cd1d44a5985b3c905fd0
diff --git a/dev-python/python-glanceclient/python-glanceclient-3.5.0.ebuild b/dev-python/python-glanceclient/python-glanceclient-3.5.0.ebuild
deleted file mode 100644
index 0838967ec8c5..000000000000
--- a/dev-python/python-glanceclient/python-glanceclient-3.5.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..9} )
-inherit distutils-r1
-
-DESCRIPTION="A client for the OpenStack Glance API"
-HOMEPAGE="https://github.com/openstack/python-glanceclient"
-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/keystoneauth-3.6.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-17.1.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/warlock-1.2.0[${PYTHON_USEDEP}]
-	<dev-python/warlock-2[${PYTHON_USEDEP}]
-	>=dev-python/wrapt-1.7.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	test? (
-		dev-python/ddt[${PYTHON_USEDEP}]
-		dev-python/fixtures[${PYTHON_USEDEP}]
-		dev-python/requests-mock[${PYTHON_USEDEP}]
-		dev-python/tempest[${PYTHON_USEDEP}]
-		dev-python/testscenarios[${PYTHON_USEDEP}]
-		dev-python/testtools[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-python_test() {
-	# functional tests require cloud instance access
-	eunittest -b glanceclient/tests/unit
-}
diff --git a/dev-python/python-glanceclient/python-glanceclient-3.6.0.ebuild b/dev-python/python-glanceclient/python-glanceclient-3.6.0.ebuild
index e4df4bd7c457..02139d725b25 100644
--- a/dev-python/python-glanceclient/python-glanceclient-3.6.0.ebuild
+++ b/dev-python/python-glanceclient/python-glanceclient-3.6.0.ebuild
@@ -14,7 +14,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/keystoneauth-3.6.2[${PYTHON_USEDEP}]
diff --git a/dev-python/python-ironicclient/Manifest b/dev-python/python-ironicclient/Manifest
index e529245d9a5f..83a4d3fdfab1 100644
--- a/dev-python/python-ironicclient/Manifest
+++ b/dev-python/python-ironicclient/Manifest
@@ -1,5 +1,3 @@
-DIST python-ironicclient-4.10.0.tar.gz 219314 BLAKE2B 3c4c7d26ac06fa6f79fcc144b3bc5adf2956ccb5685c65da3a01b314f69626df72963b21e32c2208d7de8e0741acf0fce0bf9886b0e623454cd44e5e7b4eb314 SHA512 451ecd31f02c20e237353a2b5d8a5878fdc09dea0ed5d0f12c31f1e4f9d80324cb18b6838199be91a565cf21479a4fbd4dc67cb94b4e8b09847393c8d3581448
 DIST python-ironicclient-4.11.0.tar.gz 220770 BLAKE2B a653cf04497a4df9627ed5026094690d0569dd7d6c55abf3a3223fee8cbc14e450106645ed1e4461cb3931f2ca49c8df47ca9e8e2ec9478cf15fcc0623d19379 SHA512 863429269807f759a864e427206d29a68b7431ce33009e1b6d3a630ab154e66b85b9f61dd90303a681a5ed459005af1686edf056eb9a63cfb6de1f1eda85bbb5
-EBUILD python-ironicclient-4.10.0.ebuild 1408 BLAKE2B 922418786e2161fb55664b3de22cfe334e20e889c9464389bf26f7ea199eb86c0dbcf219d7a8d60a3f80325b775b51d58e3d1f01e5ebf64468f444ddefbfd3c2 SHA512 f0bcd1bc644de1320f20a8370e137e6e71b56c27c2ba49bc75ac56b05dd47ba7f635d929632df010ba7653c85073769d44965e71b595c4481a1cb225640dfcd6
-EBUILD python-ironicclient-4.11.0.ebuild 1444 BLAKE2B cdea4e287b563283cdd269bbb0319412922f6cbd22407e2187dd902f7c597f2d1dd182586aee2d466bca070444704264ba1a1905f7ac051ce3891cddcf41728f SHA512 7d0a62f8f30a81537f51af27e8692f3ebc54ec101ae43a2d9df6546388d776550abe7f54596f884b97fce5efadf54f4cc3f4b5536a85ea3ae4fe611bda9a62ab
+EBUILD python-ironicclient-4.11.0.ebuild 1442 BLAKE2B 091cccb364fd3149797fa0119175c0be1db34db55ddd1be37c7566777fd2802fbf216f7eba59c6e21588d919c4ded935bff74a08497cec771db20e4f605ef262 SHA512 8af3ff0dc6a4704bb04c934235f317d2e69d9a6ca9ab1e2b122055674e71d0ed3da765eaf3bc081d0de522595165a74acbde4c161ac461d4d17c6716f1a5c3a6
 MISC metadata.xml 337 BLAKE2B 15cacc055a0d30f7e002d10388af0533f089c7b694b70a8bd2d9be2b74b093b87268e710b7c6be7a88cce3946882eef807203090f1c7484c895c8254b7ef959c SHA512 739d5e13560065dc8e4931a15e0a6af7c650209675b660d2571ee904184bef9fa7d5e27e0d73ea9976742b188b109d8634687e6d9b6b6acabc4dc3950ae995a6
diff --git a/dev-python/python-ironicclient/python-ironicclient-4.10.0.ebuild b/dev-python/python-ironicclient/python-ironicclient-4.10.0.ebuild
deleted file mode 100644
index bb4feb0d953b..000000000000
--- a/dev-python/python-ironicclient/python-ironicclient-4.10.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2022 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 bindings for the Ironic API"
-HOMEPAGE="https://www.openstack.org/"
-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/pbr-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/appdirs-1.3.0[${PYTHON_USEDEP}]
-	>dev-python/cliff-2.9.0[${PYTHON_USEDEP}]
-	>=dev-python/dogpile-cache-0.8.0[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.11.0[${PYTHON_USEDEP}]
-	>=dev-python/openstacksdk-0.18.0[${PYTHON_USEDEP}]
-	>=dev-python/osc-lib-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.13.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/tempest-17.1.0[${PYTHON_USEDEP}]
-		>=dev-python/ddt-1.0.1[${PYTHON_USEDEP}]
-		>=dev-python/python-openstackclient-3.12.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
diff --git a/dev-python/python-ironicclient/python-ironicclient-4.11.0.ebuild b/dev-python/python-ironicclient/python-ironicclient-4.11.0.ebuild
index 39d952acbce6..f27563650b66 100644
--- a/dev-python/python-ironicclient/python-ironicclient-4.11.0.ebuild
+++ b/dev-python/python-ironicclient/python-ironicclient-4.11.0.ebuild
@@ -14,7 +14,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/pbr-2.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/python-keystoneclient/Manifest b/dev-python/python-keystoneclient/Manifest
index a28828e4c3aa..08c7d5e99b06 100644
--- a/dev-python/python-keystoneclient/Manifest
+++ b/dev-python/python-keystoneclient/Manifest
@@ -1,4 +1,3 @@
 DIST python-keystoneclient-4.4.0.tar.gz 325003 BLAKE2B 4c375ce3c3e0c5c97c20ef89fe240c8d36fa6f2cbd32adc91759cf4a94c95eea8b7a90a08be77322253adf8982f12523ec6cb49c4e0997245bc9dbd5f5d9c5ac SHA512 04e601bd193ea6301cf6350618221f857ff7c43cda350368954417559892101aa47ff9e053255bc4c7ca5dd5bfa6ef724eeec49dfcf29c2296033d80a8aa0252
-EBUILD python-keystoneclient-4.4.0-r1.ebuild 1598 BLAKE2B f70c73d41a33331b78cb06f78e400e6dbf42cdb69e3ba1bd5a451868a799089f9b7e42ef491fa1ffa2f49bd53c093872482faca5cc1d50b3c3c2a9429827d9d7 SHA512 cccb9c45aaa51d262ae39a3b9584f0571fefbb55152908091a76daec7daf89f672605edc09ebaf3c9424b8bfeb9b3b5a223bc0ba05359156cbe53d71b044050d
-EBUILD python-keystoneclient-4.4.0.ebuild 1562 BLAKE2B 4f3ae4d27708be7d0262a999cab7b8bd0edc3c9865328b2c473c1aacaaf6452d9c3c5cf35be78dd11ea4b0ecfda8dc949c64a0f7a3302de4d329aef8d7b2316c SHA512 d2d0e99bcd90f5f85a5f037e8f2fe31d9308fb9c85d506f6a09c44591cdcafd37cdeebb8aed4a32f50b360c13923ba12d482277b45b7a6ceba4a8659325e93b1
+EBUILD python-keystoneclient-4.4.0-r1.ebuild 1596 BLAKE2B 8dbfb36ce7c6feaad6d10fe07ebcd885ccc698f8d93c1204c304048750d62b94e6425df95be2158bc9c9d01f533af1facaedcf10040c1a8abb0ed1c969de74fe SHA512 62d8eb6b41948f3f15e14a36e18c669c8c1517d019085fb3fa53836a1a3fd1ec9b3179bbb732765811e46a362927fe696fae89598b80af5f03673c7cadc73b5e
 MISC metadata.xml 487 BLAKE2B c7f320cf61a9bfbf677834c4376e5cbbe9485702895086a48f4ad8c858f21713e6c727a94d6e0d80c114fdcda9d06b0bed06ea82444c5e39e27f0a3509c9cd17 SHA512 af483e3154dd91801e946b454974fce5cd9178c35c18068bf5aa6ed6a031cca79b2fd8c268bf6a5e8d12412731144ff5b9819220bf2213e107db4aed7e3edda4
diff --git a/dev-python/python-keystoneclient/python-keystoneclient-4.4.0-r1.ebuild b/dev-python/python-keystoneclient/python-keystoneclient-4.4.0-r1.ebuild
index c7ca29f24d85..ac801e9b8d4d 100644
--- a/dev-python/python-keystoneclient/python-keystoneclient-4.4.0-r1.ebuild
+++ b/dev-python/python-keystoneclient/python-keystoneclient-4.4.0-r1.ebuild
@@ -14,7 +14,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/pbr-2.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/python-keystoneclient/python-keystoneclient-4.4.0.ebuild b/dev-python/python-keystoneclient/python-keystoneclient-4.4.0.ebuild
deleted file mode 100644
index 0551d5295315..000000000000
--- a/dev-python/python-keystoneclient/python-keystoneclient-4.4.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..9} )
-inherit distutils-r1
-
-DESCRIPTION="Client Library for OpenStack Identity"
-HOMEPAGE="https://www.openstack.org/"
-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/pbr-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.4.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/lxml-4.5.0[${PYTHON_USEDEP}]
-		>=dev-python/oauthlib-0.6.2[${PYTHON_USEDEP}]
-		>=dev-python/os-client-config-1.28.0
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/tempest-17.1.0[${PYTHON_USEDEP}]
-		>=dev-python/testresources-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-python_test() {
-	# functional tests require cloud instance access
-	eunittest keystoneclient/tests/unit
-}
diff --git a/dev-python/python-ldap/Manifest b/dev-python/python-ldap/Manifest
index e8784d43e3b6..d8d36f97cdab 100644
--- a/dev-python/python-ldap/Manifest
+++ b/dev-python/python-ldap/Manifest
@@ -1,4 +1,4 @@
 DIST python-ldap-3.4.0.tar.gz 376169 BLAKE2B f514ddb6267fd8c21a1c4595669921a1256a8087a3a272b3751636313e7d79de9d34f4213aa57128679dc5a93db4ef7a71f7f92894a1802deb8c2ca9dfd92fe2 SHA512 d10c10f1d416a0f67e7669c6c0b5460a3484bc31f4af471d581a9207689e5687c08d1ad78ba8d47e0ce0c35d24d79e4b848b4c503534f211a36c1b882bee3605
-EBUILD python-ldap-3.4.0.ebuild 2026 BLAKE2B b6cdb8c1c3de0c11d05625deaa7fca40ca7a9f82f8d219d674aa02def6e29e42b132f3e222ea81123d31936029226b1ec25ead54f3292d025194b91f1282d03e SHA512 21b1953aa5fb0efb195763f2129ed4357b3b5d37eaeea7da602f8a215221f9e73dfdca44fed1d94705c446acd2b3f8212b77967bf225c6a45772ee0e9c9e2f55
+EBUILD python-ldap-3.4.0.ebuild 2033 BLAKE2B 56f792253b2b02f694f0ed917a80b07e6d83df03da2b5f80da04a5a376a3af618889c02a32b319c67c5be0107dcd66a52d2fcea11ceab8bd351f321f0c66ca6c SHA512 5d0bbeeb940ce633aa11215c56c1648c66041bcda37c4ca996031185f92f1266659b961d18da8f546a7c347a1a11f4a97b77a11cc0f4b5a966e23593c44f9a82
 EBUILD python-ldap-9999.ebuild 2030 BLAKE2B 32a24852de09d6b86c045942bbbf194513b4bb5c314fc8d3d17d333bc0467261bfed6fe43bc9187247d59e55ed89e87e9d29d1f2d74264e4274ac4a0234e4089 SHA512 6cdffdf419e5167a658e950552a78d50b4217e43c7cf1c8f90e2c47a32ecf5860d377d65c79703816b6b139468744dd9350449d1cfb632167ed3ebc5c6c142a8
 MISC metadata.xml 449 BLAKE2B 14ffa18ca09eb663d3ef4ff5bd0ebc8511fa408a4e96c93885ba2beaccdf3bb82a9733a01149e088c8b66d6cb938f94fc3940c0c0cca5685599191e772443cb6 SHA512 2f5c014e55f838b84abf6ba630b000620a01e2fca6d1f1bd1b30db309f820df50c2ef7feddc17c69ee0188c3cbc91a388933b4bccfc8d2ea0cb18c6dae85cda6
diff --git a/dev-python/python-ldap/python-ldap-3.4.0.ebuild b/dev-python/python-ldap/python-ldap-3.4.0.ebuild
index f4d62b66991f..382194ce39e0 100644
--- a/dev-python/python-ldap/python-ldap-3.4.0.ebuild
+++ b/dev-python/python-ldap/python-ldap-3.4.0.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 sparc x86 ~x86-solaris"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv sparc x86 ~x86-solaris"
 fi
 
 LICENSE="MIT PSF-2"
diff --git a/dev-python/python-lsp-black/Manifest b/dev-python/python-lsp-black/Manifest
index 53bc5b77199c..d34c39cbf6d4 100644
--- a/dev-python/python-lsp-black/Manifest
+++ b/dev-python/python-lsp-black/Manifest
@@ -1,5 +1,7 @@
 DIST python-lsp-black-1.0.1.gh.tar.gz 7013 BLAKE2B 596ef3f468524269fb2765ad7ba0f8305c9e67ec4cf826dbe68ea20058f1fc595c004b34c5228c14a70b6a489e29f370fef93cd7a9ef48d24ace3464ec7cd011 SHA512 43699438bf64b9cfb5dfa97b30385870a06d15be90d5a023c5282f1b969188e8536961c2a2ee6f1016d4b8188e4df6a81d6127dd628242bbcd3fbcc640504a24
 DIST python-lsp-black-1.1.0.gh.tar.gz 7547 BLAKE2B e362e3800763b28c9505e9548f2324299fac5db792cc98755b2f3e5db02cec3cf0061193aa5dda40a843f2db0abfc252b8ebf6ae12a403953bb334155e90b028 SHA512 47c1652e7c1732a01d0eaa29c3b36adaa484b4b61aed8f6a99967c734d43353173716946cd15ea247974ee7801daa57e34979f5ed9b52eb88fdf96830af8bd19
+DIST python-lsp-black-1.2.0.gh.tar.gz 9226 BLAKE2B a9efe698c32ac86060f360e1d1129620783d0dd1588cf16b6f96a4f805845d5c94e862b265d63643e877afc68916ad0fbbe922fc0c17e224ea08f61756a3fb41 SHA512 b5f999b0e02abc63dc194a2973f028aa5f74b3110d0ac35e6aefb45a4260bf3fb5b1f142f71a85feec431765af98409977a47039d28a79cfac5746cc677794c7
 EBUILD python-lsp-black-1.0.1.ebuild 598 BLAKE2B 0483ce22694575062b150aff7ed7d7930680542d437cf795fa0c932328989127072a432498d6b338dbb40e9dab2d66c6266fb4540929e68bb67c2284fa170ded SHA512 a3efbd9b3274d7b90dc91661caa1a16ac0eddbf62d2acd8f5fc7a7b1cdf6c5071ed5d0b71057b4654c5592c47b31e9101c32bcd1f598621c654df89d21241ec7
 EBUILD python-lsp-black-1.1.0.ebuild 679 BLAKE2B 463d6b6becb428d15435c2ad9495d20ecb88c700da5a06d9f1c818dbb10a02b5b24b8a0e3946bb644eeaf247d19f23a47fdf4fad3aa1a8a14980c1ef7da339ae SHA512 84ef8bb4f5dea61c4225ab11f9f21d9b09ac99f59f445be536529e5accfa8f8180462636866cd7bf1edcde813337d32bea2b90b4315a92cce6c04e49623dc32b
+EBUILD python-lsp-black-1.2.0.ebuild 705 BLAKE2B da5d5e47dd34785ed6dabe68e3496a34b93de7048398f2667f45d535a3e4c35ac0dc4e223b28805acf5cb78a011ae0098f8e57121f231d12246e01b2867c12ec SHA512 540bcade3c3b7f0ef35b63addee25aa7b0bd16579ce0b158af6342b1b58468019baf06c680fa1cad51a2db4005f313e3efe12db3b2c02c1d78dd3aef96a82d2a
 MISC metadata.xml 429 BLAKE2B fcfbbc17f713e9f33164eac55cde53fb505d550a9049bf843809cb688f038912770764332e8eed56ef39972ff82e39e1a27a2d8248d887950857fb790e6a7bc1 SHA512 6a1438c96853dd9fe11eceaddc7e350311db01a95f17fa05b3f2cf651ae778b5361b9612423c2d124bf4dfdaccea836538a3aade91dc58efd4feb81dba23ada7
diff --git a/dev-python/python-lsp-black/python-lsp-black-1.2.0.ebuild b/dev-python/python-lsp-black/python-lsp-black-1.2.0.ebuild
new file mode 100644
index 000000000000..8525c6e386f5
--- /dev/null
+++ b/dev-python/python-lsp-black/python-lsp-black-1.2.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Black plugin for the Python LSP Server"
+HOMEPAGE="
+	https://github.com/python-lsp/python-lsp-black/
+	https://pypi.org/project/python-lsp-black/
+"
+SRC_URI="
+	https://github.com/python-lsp/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/python-lsp-server-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/black-22.1.0[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		dev-python/toml[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/python-lsp-server/Manifest b/dev-python/python-lsp-server/Manifest
index f23780772e98..d7216c0774bd 100644
--- a/dev-python/python-lsp-server/Manifest
+++ b/dev-python/python-lsp-server/Manifest
@@ -1,5 +1,7 @@
 DIST python-lsp-server-1.3.3.tar.gz 62604 BLAKE2B 16f49013ccefc0dabcf58c6007c05828a930d0bc873805543fde79630bdc8bd020cb63d0d0ba56c181282a96c57c6084acde30dc2a8011d208040c2a93c3644b SHA512 94e9bf1e74799c395589451c02c1220bc79336e1c1cdc243e95e891f61c7977b2438d78da3db3da572022870e67305b8caca22241e0cfab23d3b546639c69aa7
 DIST python-lsp-server-1.4.0.tar.gz 75443 BLAKE2B 7522ff0d5c9a0c9300f288debc4f606168f968cad80e32d612a674803046c91dc777d9ee320cf844224f6da791b6d66413c643fc48799ef5f57c19bca4f09858 SHA512 9f53e288b9bdb22575b06ec8a89022f533a323457746ef8e2cb52c84f06ac48b3408b4ebfbf96754ce68cdc9ddf1a745365d5ea21ba188a4372064fc87c1e6f4
+DIST python-lsp-server-1.4.1.tar.gz 76416 BLAKE2B 65638b876182c478434c563371b802367fb8439820ccf57e4404dc1507f3cd514ae5d738d418386607db606025fe5126a533c656ec3fede53fdcfd364a4292cf SHA512 4c9171adc88d219c80055ebbc76566583925129969467c156277b52de9b5981b74b11b9961247045ea98cd9e51e146b2d606c8351a7be5db76f6f4e0e4d7195c
 EBUILD python-lsp-server-1.3.3.ebuild 3226 BLAKE2B 539d592055d3ee03e4b0a01944fa1ec3157c325220e93285d27577acb2939b7cb5ed13b94d2e0a1af798639f3210df96e248c07c1d12d81ca43fe8554e985522 SHA512 51de2e1dd4bd169a4bd70c61ce6533c1a6f55d3ab50261d80fd58d70c72e70c90b8870bf945d7da316fa1f144fb0ad5ee02a235c8f12e18501e5cddae23d7528
 EBUILD python-lsp-server-1.4.0.ebuild 3225 BLAKE2B 0293ecb93bafa11e8bb2878053946d54e7f1893ab66787ca896b47cca187e6dde081ade14918506de9ae12a1d0d22e53c0c6bb104ce5a328bd80ff7efe644502 SHA512 067561897f72054192d95c5cf1cb6cebed22c12998d90c4422069c4fef9e9dc0a4a0705f8ba1eab9b8c07f6f78884b370b96a825a1c6c318760a35cb95109804
+EBUILD python-lsp-server-1.4.1.ebuild 3024 BLAKE2B d7e3a48b0034580ae677a84b446c68e05792a4bc91ed5a3bfb2c018b319bc54ecf0727541d951652161964e3f188df016dcc7f8410109dd53efc9c7220421522 SHA512 6b1d48ffd2983f94e916740899dc0aef6e9ff210772bcd33c3202ef5fe7c22b900da4c721ada2bba3790efbafbdf94b910792c25d815be0f55e06139e0e2f6c3
 MISC metadata.xml 542 BLAKE2B ca71a08385d37c7f5cc562986630ae482970842054ffa944151d2e4a5d8449329b71c16c61e2a81f3d3d93f02a61ce637fe0bd0961ba3f86b7182b9728b62d5c SHA512 2d5103643838ba8aec53e7d3e924517cc3d735c724b6dfea249bcce3716aebb9f54e3264cb2cccc15dfe7d0ad4b7d052388122144fe6248d4faeef3482d197e7
diff --git a/dev-python/python-lsp-server/python-lsp-server-1.4.1.ebuild b/dev-python/python-lsp-server/python-lsp-server-1.4.1.ebuild
new file mode 100644
index 000000000000..f36d3cf1600b
--- /dev/null
+++ b/dev-python/python-lsp-server/python-lsp-server-1.4.1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+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-1.6.0[${PYTHON_USEDEP}]
+		<dev-python/autopep8-1.7.0[${PYTHON_USEDEP}]
+		dev-python/flaky[${PYTHON_USEDEP}]
+		>=dev-python/flake8-4.0.0[${PYTHON_USEDEP}]
+		<dev-python/flake8-4.1.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.8.0[${PYTHON_USEDEP}]
+		<dev-python/pycodestyle-2.9.0[${PYTHON_USEDEP}]
+		>=dev-python/pydocstyle-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/pyflakes-2.4.0[${PYTHON_USEDEP}]
+		<dev-python/pyflakes-2.5.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-1.6.0[${PYTHON_USEDEP}]
+		<dev-python/autopep8-1.7.0[${PYTHON_USEDEP}]
+		>=dev-python/flake8-4.0.0[${PYTHON_USEDEP}]
+		<dev-python/flake8-4.1.0[${PYTHON_USEDEP}]
+		>=dev-python/mccabe-0.6.0[${PYTHON_USEDEP}]
+		<dev-python/mccabe-0.7.0[${PYTHON_USEDEP}]
+		>=dev-python/pycodestyle-2.8.0[${PYTHON_USEDEP}]
+		<dev-python/pycodestyle-2.9.0[${PYTHON_USEDEP}]
+		>=dev-python/pydocstyle-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/pyflakes-2.4.0[${PYTHON_USEDEP}]
+		<dev-python/pyflakes-2.5.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
+	distutils-r1_python_prepare_all
+}
+
+pkg_postinst() {
+	optfeature "Automatically format 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-neutronclient/Manifest b/dev-python/python-neutronclient/Manifest
index 098c078ae727..ce989ce6f17a 100644
--- a/dev-python/python-neutronclient/Manifest
+++ b/dev-python/python-neutronclient/Manifest
@@ -1,5 +1,3 @@
-DIST python-neutronclient-7.7.0.tar.gz 304440 BLAKE2B 391ecdfe4f4df927c0c626ca644543b9ef4a3a926cfb9bdc68676836185898a141d9fc60277ee4ddf61336eec785656f45ffd2bb74cf9b6250f2b1934883f870 SHA512 ecd6bc4e229f992b9a320d247f5af89e819c308f9360d5f86c297d4daf634498e4a2f3953e5713bef06ac17cce37e86d2b0a4ff1ba3178e78fc082a148eeac8e
 DIST python-neutronclient-7.8.0.tar.gz 304872 BLAKE2B 780e1b2942a43bca93888683d1c2e713cfc0927d49135004a6f6d42dff7962def6b0fc7f308b75b4392f4fb5df4d26fcea107b9006d4ba957c0d76294395e5c9 SHA512 3022d79348334632ab3afa142aab11e424b168a4ba04223722da80e59de2695b477c2d829bb14a37e7baf387f9d63b8c4456fc5712f8d591d3de51fad76d6c78
-EBUILD python-neutronclient-7.7.0.ebuild 2234 BLAKE2B 0256b9b8f839a2bce4cf8d07505126a62f392fc5bc10530f899967f075b1fc14893ec63b5823df4135002bdab256d3995d1c01bbfb312fdceae6235404adcdf8 SHA512 606de056b46ea12e8f0fb72dbc31a43c9cffc159c1410a8ebe871024aab99c1f57922f8d035e7757108188e645ecac144c8aaffc58704e163c9f1aac3068e88e
-EBUILD python-neutronclient-7.8.0.ebuild 2237 BLAKE2B 0763bd427fbd95170d27683b661ff472a4c8cabda32ca5f56940c855f290082907cf0f822fb93921c47104adf1a66de1d2bc1774094980db5d1d7424aba792d9 SHA512 4269bfacf8d03c6ea3c3492d77f931968965b8b1711a6868c91f52092d3d96590848b8bcfe4e5df77c6bd9cc5fc0f5aa434a921d46cee70e980478b18286076b
+EBUILD python-neutronclient-7.8.0.ebuild 2235 BLAKE2B 20567491e93584820a02fd7e6a5e795dffb6d58476f9470ca3383bff0d2e3adc8489fb7281b672c5d5975430fc22c4b7ada367d12231d3eca48a4d434aa27477 SHA512 d94be5286f4358af9b4406f30d7296b6819009c66f26685dec17ca7d23cfaa2f1b27662a6e84b79a07c924eec127aafc22ce5e865179d587fa1f66dc594d7847
 MISC metadata.xml 538 BLAKE2B 13ead632c3a584fb1e8393993fef34cf6e9e61c3d80b90ffea2ab5280abf61235c8823f62154741fc9dcb7bac9be9565c4e8a1e3c4aa4c24af9a6673b0fa2f79 SHA512 50378bab897481da3809a9d9c82d53d7b3e0470e1decd432ca18ea1e57875aed3ef5b8c993f23099529ab74d7e0575b664d53b4abf8d737a1c7933ff781cfee9
diff --git a/dev-python/python-neutronclient/python-neutronclient-7.7.0.ebuild b/dev-python/python-neutronclient/python-neutronclient-7.7.0.ebuild
deleted file mode 100644
index 301c45ee0c4d..000000000000
--- a/dev-python/python-neutronclient/python-neutronclient-7.7.0.ebuild
+++ /dev/null
@@ -1,72 +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} )
-inherit distutils-r1
-
-DESCRIPTION="A client for the OpenStack Quantum API"
-HOMEPAGE="https://launchpad.net/neutron"
-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/pbr-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/cliff-3.4.0[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
-	>=dev-python/osc-lib-1.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
-	>dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/os-client-config-1.28.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/simplejson-3.5.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	test? (
-		dev-python/bandit[${PYTHON_USEDEP}]
-		dev-python/fixtures[${PYTHON_USEDEP}]
-		dev-python/oslotest[${PYTHON_USEDEP}]
-		dev-python/python-openstackclient[${PYTHON_USEDEP}]
-		dev-python/subunit[${PYTHON_USEDEP}]
-		dev-python/requests-mock[${PYTHON_USEDEP}]
-		dev-python/testtools[${PYTHON_USEDEP}]
-		dev-python/testscenarios[${PYTHON_USEDEP}]
-		dev-python/tempest[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	# Needs osprofile
-	rm neutronclient/tests/unit/test_http.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# functional tests require cloud instance access
-	eunittest -b neutronclient.tests.unit
-}
-
-python_install() {
-	distutils-r1_python_install
-	#stupid stupid
-	local SITEDIR="${D}$(python_get_sitedir)" || die
-	cd "${SITEDIR}" || die
-	local egg=( python_neutronclient*.egg-info )
-	#[[ -f ${egg[0]} ]] || die "python_quantumclient*.egg-info not found"
-	ln -s "${egg[0]}" "${egg[0]/neutron/quantum}" || die
-	ln -s neutronclient quantumclient || die
-	ln -s neutron quantumclient/quantum || die
-}
diff --git a/dev-python/python-neutronclient/python-neutronclient-7.8.0.ebuild b/dev-python/python-neutronclient/python-neutronclient-7.8.0.ebuild
index aa9b4efc8c54..d4d3c305f1ad 100644
--- a/dev-python/python-neutronclient/python-neutronclient-7.8.0.ebuild
+++ b/dev-python/python-neutronclient/python-neutronclient-7.8.0.ebuild
@@ -12,7 +12,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/pbr-2.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/python-novaclient/Manifest b/dev-python/python-novaclient/Manifest
index 048f2e60ca47..0a534350bd25 100644
--- a/dev-python/python-novaclient/Manifest
+++ b/dev-python/python-novaclient/Manifest
@@ -1,6 +1,3 @@
-DIST python-novaclient-17.6.0.tar.gz 335297 BLAKE2B 24fcc869e71ef4ca382d6a684f5823331c49e84bced80e5f3e0a5e00efeeffc6cc6e554b7d97c571085dddcdd9bc6145442c5b7100bc9e833cb5bf883d860ba7 SHA512 54cc617e2698cdf50697b35153489f6fe64e84416d05987b7c60ed78241299631a0c03d893c462ad2f93788a5fc1336082acb5d22317d5733e9c033a91b1c34f
 DIST python-novaclient-17.7.0.tar.gz 335462 BLAKE2B bfd7853a5100df1d9a0e17f905c9a2d4ea0d13e1345438d42e4af21e348e78c3f4ddca6408f31fb164f4bf3b2770088118e24ec12edd1afb2a4c22b3b0461092 SHA512 3942088f2636d186434b7ae4184ee84f5e1e4862a526b33befae09219eb7d08ab02fed64589aa9eefd0ab263ea231969b0e4e59a0427eaae5daaa26516d92ffd
-EBUILD python-novaclient-17.6.0-r1.ebuild 1797 BLAKE2B fcfc007a3b54819f11e828200c76152824340782c6e742ddbeb99e3dc9fa281ab50b8448cc54643401c51d76604565f50e469961f38fd4af8ceaaf90b23dd5d3 SHA512 743356dfafcf1ed966d838ea006bef29beb7a3318423e3b04c4bbe9d2b97af0abe80456ba3ef3f98f83a716b7c88ada5934d8e32a93a224b020de5770af4c244
-EBUILD python-novaclient-17.6.0-r2.ebuild 1833 BLAKE2B 28596ece5271b6cf08ec0d09f0a29a4db9381f94d773550222423a962c0f75cbf4defc6d809d171e1ea023dd72a185140a1c576bf4a10c69825b1b3af31b2471 SHA512 ba66cdc5a156d00ff1a99888ea00e60f6b8d5becfe6c43c123c590b6ed8760b84c890e22f4cf6d2659a21276b8aa021b77028254f344a20a30ebe58c531dd977
-EBUILD python-novaclient-17.7.0.ebuild 1834 BLAKE2B 381796471e1602f85fb810cd60f748081c19e1273ca2e132c250301a48cfaa30e2d8dcde2751f165954f6d7d995c1018d2fd0e6161399548b4942210cc8223c1 SHA512 56e71db3011a061f09b3bbff3a8a5d94358b8f87bed700a02240dd13b7eb02223afe33798322bdc6cc32a89dac1266e860a107e4ef0e35120185c8ad5a4cfe11
+EBUILD python-novaclient-17.7.0.ebuild 1832 BLAKE2B f8e0ecd415f4fc41a00b45f6ad910c197ccdc893d827b68e9e9d65f751af0bdb60e51f3626e19140a964dcd076ee13880ecb6d02810c7efd6f87a1b382193a37 SHA512 88456332de00a57d5b4500bf432df5227c28a94f8cf0996893bb6f6147d836c5876516cc2b7906c298593ab111c4858957f6dcabb9fbf0fbd881a44a19e3b180
 MISC metadata.xml 786 BLAKE2B 8e3cf9379a274131833f3a6ad3f5582cd9517ac8361aed04e3a39f14da4074de9f462ab890107db966f553726067b4109aa18d21e747545dd4a25c8794366a80 SHA512 568595965bb99b0f0cfea9e502d1876652a3184e54a963ad3841e28ff5205479a525fbd8252998a4df5505b6a50bccd59bb10288cb0244851c47b967f58208d7
diff --git a/dev-python/python-novaclient/python-novaclient-17.6.0-r1.ebuild b/dev-python/python-novaclient/python-novaclient-17.6.0-r1.ebuild
deleted file mode 100644
index a782449770a8..000000000000
--- a/dev-python/python-novaclient/python-novaclient-17.6.0-r1.ebuild
+++ /dev/null
@@ -1,56 +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} )
-inherit distutils-r1
-
-DESCRIPTION="A client for the OpenStack Nova API"
-HOMEPAGE="https://github.com/openstack/python-novaclient"
-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/pbr-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.5.0[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7.2[${PYTHON_USEDEP}]
-	>dev-python/requests-2.12.2[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-2.0.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	test? (
-		dev-python/bandit[${PYTHON_USEDEP}]
-		dev-python/ddt[${PYTHON_USEDEP}]
-		dev-python/fixtures[${PYTHON_USEDEP}]
-		dev-python/python-keystoneclient[${PYTHON_USEDEP}]
-		dev-python/python-cinderclient[${PYTHON_USEDEP}]
-		dev-python/python-glanceclient[${PYTHON_USEDEP}]
-		dev-python/python-neutronclient[${PYTHON_USEDEP}]
-		dev-python/requests-mock[${PYTHON_USEDEP}]
-		dev-python/openstacksdk[${PYTHON_USEDEP}]
-		dev-python/testscenarios[${PYTHON_USEDEP}]
-		dev-python/testtools[${PYTHON_USEDEP}]
-		dev-python/tempest[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	sed -e 's/test_osprofiler/_&/' -i novaclient/tests/unit/test_shell.py || die
-	sed -e 's/novaclient\.tests\.unit\.//' -i novaclient/tests/unit/test_api_versions.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# functional tests require cloud instance access
-	eunittest -b novaclient/tests/unit
-}
diff --git a/dev-python/python-novaclient/python-novaclient-17.6.0-r2.ebuild b/dev-python/python-novaclient/python-novaclient-17.6.0-r2.ebuild
deleted file mode 100644
index 655d26e0c73d..000000000000
--- a/dev-python/python-novaclient/python-novaclient-17.6.0-r2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="A client for the OpenStack Nova API"
-HOMEPAGE="https://github.com/openstack/python-novaclient"
-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/pbr-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.5.0[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7.2[${PYTHON_USEDEP}]
-	>dev-python/requests-2.12.2[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-2.0.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	test? (
-		dev-python/bandit[${PYTHON_USEDEP}]
-		dev-python/ddt[${PYTHON_USEDEP}]
-		dev-python/fixtures[${PYTHON_USEDEP}]
-		dev-python/python-keystoneclient[${PYTHON_USEDEP}]
-		dev-python/python-cinderclient[${PYTHON_USEDEP}]
-		dev-python/python-glanceclient[${PYTHON_USEDEP}]
-		dev-python/python-neutronclient[${PYTHON_USEDEP}]
-		dev-python/requests-mock[${PYTHON_USEDEP}]
-		dev-python/openstacksdk[${PYTHON_USEDEP}]
-		dev-python/testscenarios[${PYTHON_USEDEP}]
-		dev-python/testtools[${PYTHON_USEDEP}]
-		dev-python/tempest[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	sed -e 's/test_osprofiler/_&/' -i novaclient/tests/unit/test_shell.py || die
-	sed -e 's/novaclient\.tests\.unit\.//' -i novaclient/tests/unit/test_api_versions.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# functional tests require cloud instance access
-	eunittest -b novaclient/tests/unit
-}
diff --git a/dev-python/python-novaclient/python-novaclient-17.7.0.ebuild b/dev-python/python-novaclient/python-novaclient-17.7.0.ebuild
index b699f25b31ce..d277d815c735 100644
--- a/dev-python/python-novaclient/python-novaclient-17.7.0.ebuild
+++ b/dev-python/python-novaclient/python-novaclient-17.7.0.ebuild
@@ -14,7 +14,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/pbr-2.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/python-openstackclient/Manifest b/dev-python/python-openstackclient/Manifest
index 5bf70eec73de..047f6ff0c0db 100644
--- a/dev-python/python-openstackclient/Manifest
+++ b/dev-python/python-openstackclient/Manifest
@@ -1,6 +1,3 @@
-DIST python-openstackclient-5.7.0.tar.gz 817269 BLAKE2B ce44a0c7466c473ae55c9c2198535f3333f361295121a517cabc61178b1363a8e51078a332f3297123138f3bcea021d1c2a610942099e4710d7e61a0cdfab721 SHA512 ca789640d1cc5c6ceae206652ac9629865dce07158e4f01ef28e841b6c362974add16de3047d520986cf7690a0c49ab308221b4e657d8484cedae892d1d5c3ce
 DIST python-openstackclient-5.8.0.tar.gz 827602 BLAKE2B 07893ae405532614605560d4d3423e501e2d86da5ad5a529fdc62113d55ad7a010407d45143a4d7ae8adc731804e6698a5cd527089ff9de809ac117f08e4e959 SHA512 ebd288fbdcd18245bed4262ab191ba06dbe6fb54ad4247c332f9c11b1439c3158e557bf20a7a7205e7913becb6c59126121521a32bce1f70092dc2d7f648b808
-EBUILD python-openstackclient-5.7.0-r1.ebuild 1715 BLAKE2B 89373a54182d75efb8a7c1b05f76659df9f887d13ab727e780a9ef6d18e5bf55e5bd75761ca95ba3236ae8911be56df668a29d5dcbae0890ebf2dcaffd636149 SHA512 0f62aa0449a5df347e64978a945a2d6aa6575ebe5400dc4d6a1dded88239487d4a2b91bc0f5f2beffe79ac1a2c432a8bc148416820122bada1366647f999692b
-EBUILD python-openstackclient-5.7.0.ebuild 1679 BLAKE2B 8dd87ad6e99f1073957a41e68bd8454796500e91ec69eb03068f1543957ad77cc5d809bc096a091afca0f7472f56d3ecc795a4c865478a6e60b2df9cad34e725 SHA512 62fc0723d71ce56506aae2638cd3d64002a0c2a086c445829723afd1140f75b7dd58bcc290672047dfa6c1fea807ad6e2a569e6fe1e6e0ccaa35e744a9bb807c
-EBUILD python-openstackclient-5.8.0.ebuild 1715 BLAKE2B 89373a54182d75efb8a7c1b05f76659df9f887d13ab727e780a9ef6d18e5bf55e5bd75761ca95ba3236ae8911be56df668a29d5dcbae0890ebf2dcaffd636149 SHA512 0f62aa0449a5df347e64978a945a2d6aa6575ebe5400dc4d6a1dded88239487d4a2b91bc0f5f2beffe79ac1a2c432a8bc148416820122bada1366647f999692b
+EBUILD python-openstackclient-5.8.0.ebuild 1713 BLAKE2B 92df6e375d5f83d65d9dbfe62485875cd3f66019218780c67a686efbd120c99701cca9907840d4f93a48bbd5b7e1b82b180c4f466848fc4dc4cfe75c41281586 SHA512 df9c235d692412a1765eb970a28015eeea7146d85924e4d27ba1f3d08222e39a5247dfff13833f67d08d34c8c328aa8971253f0fbddcdf9d638913070a42c945
 MISC metadata.xml 562 BLAKE2B e4f7a3fccc9c2c798962efb6dda973ad71c19e5db8efd57869b6a8cd565784d5f4a6c581bf11a28eed826bb8c3451b5938e43974b91291609d177050fc654603 SHA512 3fdb3a9300dcaa310ec02266127a998ac4587fa9fde5e381342a5c18d0435442dfdafd0b326730e1cee26f72b43fccb6a15df7d5d1fd8f5a9bb3783983b0dcca
diff --git a/dev-python/python-openstackclient/python-openstackclient-5.7.0-r1.ebuild b/dev-python/python-openstackclient/python-openstackclient-5.7.0-r1.ebuild
deleted file mode 100644
index d07f74c85f64..000000000000
--- a/dev-python/python-openstackclient/python-openstackclient-5.7.0-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="A client for the OpenStack APIs"
-HOMEPAGE="https://github.com/openstack/python-openstackclient"
-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/pbr-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/cliff-3.5.0[${PYTHON_USEDEP}]
-	>=dev-python/openstacksdk-0.56.0[${PYTHON_USEDEP}]
-	>=dev-python/osc-lib-2.3.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-3.22.0[${PYTHON_USEDEP}]
-	>=dev-python/python-novaclient-17.0.0[${PYTHON_USEDEP}]
-	>=dev-python/python-cinderclient-3.3.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-2.0.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/tempest-17.1.0[${PYTHON_USEDEP}]
-		>=dev-python/wrapt-1.7.0[${PYTHON_USEDEP}]
-		>=dev-python/ddt-1.0.1[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	# Depends on specific runner
-	sed -e 's/test_command_has_logger/_&/' -i openstackclient/tests/unit/common/test_command.py || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# functional tests require cloud instance access
-	eunittest -b openstackclient/tests/unit
-}
diff --git a/dev-python/python-openstackclient/python-openstackclient-5.7.0.ebuild b/dev-python/python-openstackclient/python-openstackclient-5.7.0.ebuild
deleted file mode 100644
index 8386fd5c0364..000000000000
--- a/dev-python/python-openstackclient/python-openstackclient-5.7.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..9} )
-inherit distutils-r1
-
-DESCRIPTION="A client for the OpenStack APIs"
-HOMEPAGE="https://github.com/openstack/python-openstackclient"
-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/pbr-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/cliff-3.5.0[${PYTHON_USEDEP}]
-	>=dev-python/openstacksdk-0.56.0[${PYTHON_USEDEP}]
-	>=dev-python/osc-lib-2.3.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-3.22.0[${PYTHON_USEDEP}]
-	>=dev-python/python-novaclient-17.0.0[${PYTHON_USEDEP}]
-	>=dev-python/python-cinderclient-3.3.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-2.0.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/tempest-17.1.0[${PYTHON_USEDEP}]
-		>=dev-python/wrapt-1.7.0[${PYTHON_USEDEP}]
-		>=dev-python/ddt-1.0.1[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	# Depends on specific runner
-	sed -e 's/test_command_has_logger/_&/' -i openstackclient/tests/unit/common/test_command.py || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# functional tests require cloud instance access
-	eunittest -b openstackclient/tests/unit
-}
diff --git a/dev-python/python-openstackclient/python-openstackclient-5.8.0.ebuild b/dev-python/python-openstackclient/python-openstackclient-5.8.0.ebuild
index d07f74c85f64..e262f189ad35 100644
--- a/dev-python/python-openstackclient/python-openstackclient-5.8.0.ebuild
+++ b/dev-python/python-openstackclient/python-openstackclient-5.8.0.ebuild
@@ -14,7 +14,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/pbr-2.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/python-ptrace/Manifest b/dev-python/python-ptrace/Manifest
new file mode 100644
index 000000000000..5ecaaa3f31a1
--- /dev/null
+++ b/dev-python/python-ptrace/Manifest
@@ -0,0 +1,4 @@
+DIST python-ptrace-0.9.8.tar.gz 104079 BLAKE2B 3d387beca9c92c0e3bbd5cf2c9d2af447c233b631e894ce1af2cdc697a1a48e24a299bbc998cd187ac9ad0f45bfc886f476afdb69329d761e8730a047731126b SHA512 f50ba7d457bf20a161a99913a552f2e829e97975d7cfbf8cf5d89b4f2320772b537678f2e70b9aaa88341c4f01d4bf41f62683e913628db503152f3510a013a3
+EBUILD python-ptrace-0.9.8.ebuild 711 BLAKE2B 4671311f3170342ab4aa0cfa2aebea4cc9a3e7e582939b36fb2f293fb3098ea4c1051eae02b9e118cbf89acb2b2faf220b0edca0e4e9996bf1ca24d59d7ed40c SHA512 1a982e3c59e605fd3c16d1d28df5dc74d9d11dfe8659d8f379664ea679f8b69e4f8bfd82be11bdedca82552f1cdbde6bbb48ceb06b8b320ba261591584092db2
+EBUILD python-ptrace-9999.ebuild 680 BLAKE2B 15cc0d82169e51bf51139a47669eeb3ceda9d07591a769331f6e76a5d87411f18f500941ebae09c4bb0c1f4a4b5ca8897a6d209b01a8156abd8b5c9dfdfbd541 SHA512 3a8137451ba0af29b4544af22c2e4fb68500a8323f3f07c1f24e32b42cc7c51a0a0025b723eab31fc308620279d160b1d96d0bc7cbacf2c9f85adb47229edddc
+MISC metadata.xml 623 BLAKE2B e65db6770448631a0d3f54edac2fe84163a165939245caf020371eeae4f0f4c77a6ae79c14b92391f65b8a315f33946f0045d1771ff2a256e0e5ff550b72a7a2 SHA512 cde30b944c24bbea008e7bb0f7a357b76be54418d067a83c5cff55252a147670de45918318741076925fc04ab1a6f4f320a3f9b328bcf45b9adbdd8683324ecb
diff --git a/dev-python/python-ptrace/metadata.xml b/dev-python/python-ptrace/metadata.xml
new file mode 100644
index 000000000000..c5f4fb2ed06e
--- /dev/null
+++ b/dev-python/python-ptrace/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person" proxied="yes">
+		<email>mario.haustein@hrz.tu-chemnitz.de</email>
+		<name>Mario Haustein</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>sam@gentoo.org</email>
+		<name>Sam James</name>
+	</maintainer>
+	<longdescription>
+		python-ptrace is a debugger using ptrace (Linux, BSD and Darwin system
+		call to trace processes) written in Python.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">vstinner/python-ptrace</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/python-ptrace/python-ptrace-0.9.8.ebuild b/dev-python/python-ptrace/python-ptrace-0.9.8.ebuild
new file mode 100644
index 000000000000..a97f40f69773
--- /dev/null
+++ b/dev-python/python-ptrace/python-ptrace-0.9.8.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="A Python binding of ptrace library"
+HOMEPAGE="https://github.com/vstinner/python-ptrace"
+
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/vstinner/python-ptrace"
+else
+	SRC_URI="https://github.com/vstinner/python-ptrace/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-python/six[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+src_test() {
+	./runtests.py --tests tests/ || die
+}
diff --git a/dev-python/python-ptrace/python-ptrace-9999.ebuild b/dev-python/python-ptrace/python-ptrace-9999.ebuild
new file mode 100644
index 000000000000..c87c6168a30e
--- /dev/null
+++ b/dev-python/python-ptrace/python-ptrace-9999.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2022 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 binding of ptrace library"
+HOMEPAGE="https://github.com/vstinner/python-ptrace"
+
+if [[ ${PV} == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/vstinner/python-ptrace"
+else
+	SRC_URI="https://github.com/vstinner/python-ptrace/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-python/six[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+src_test() {
+	./runtests.py --tests tests/ || die
+}
diff --git a/dev-python/python-slugify/Manifest b/dev-python/python-slugify/Manifest
index 8ca226b0338f..80fc3fbb884c 100644
--- a/dev-python/python-slugify/Manifest
+++ b/dev-python/python-slugify/Manifest
@@ -1,3 +1,3 @@
 DIST python-slugify-6.1.1.tar.gz 13259 BLAKE2B 2f85061775d9e921bf5679ab47d9a5b4fed2d2e1703aa2717e21c1d43fd1b93ef5d7060151bb4b473cd901aef16d3d905d2ca5004ae7bc61e906464bb52494a2 SHA512 2ffe8420b2f0504c57f42bf20aa0145ae521dab8d1bbefcaff1a815aa04377c7eb48eab929890915a9c9632a5c1cac4d3e7e093dcdfdda59f8ecee1ab787cbb7
-EBUILD python-slugify-6.1.1.ebuild 584 BLAKE2B 340b7cd01febad318a054b9bdff0db899a326d1b21b87ec9505d4369294a64ccf3ec5d1e7204c5cad17d650231c2e96580c055a6c2b0bf9e46ed5df2b6e86b56 SHA512 506777e50cb53983e3daa0e5394dc1ff0f0180e20b8e22feacb42d75e3f0438d5a772aa433bd60f650fed6971875cbba99ada2f47500f01cbd7d0f5f8eb8c0df
+EBUILD python-slugify-6.1.1.ebuild 591 BLAKE2B e4f15f7bba14d47063751e5546897361a4887a38536e23e64b983cfbd8f43da0e596303548534105bbc30466d3d57fb71cf9e20be1be0cf9e538db6bb9169345 SHA512 c0d8e4c73c6568e165f279ca09d4bd792a2f56b5fa68638e25c4d957bb4f2c51d0045ed909e5c45c17104b04dd82715c7e8752f92a3c5e3361847a7a2d8c2810
 MISC metadata.xml 637 BLAKE2B 4869f272370af0065e6d0479d660a8fba6665ad019a3072cb3a2f1b003fa0cd7ae57dc8e19ad8ceda33d97355c1e4d1ebebb96978935d016fa8bcd2b7fd72660 SHA512 bc09a7914759371c03436e5dd0ef50bc1972cfbf2b815e91048d78d277402d8431be59673f4106483b690dfe3b3cde7ca5e39719effc23dc77e1e9b505e14a01
diff --git a/dev-python/python-slugify/python-slugify-6.1.1.ebuild b/dev-python/python-slugify/python-slugify-6.1.1.ebuild
index b21f1c70787b..c7d0437e556d 100644
--- a/dev-python/python-slugify/python-slugify-6.1.1.ebuild
+++ b/dev-python/python-slugify/python-slugify-6.1.1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
+KEYWORDS="amd64 ~ppc64 ~riscv x86"
 
 RDEPEND="dev-python/text-unidecode[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/python-swiftclient/Manifest b/dev-python/python-swiftclient/Manifest
index a24e0fbee320..b275196210c5 100644
--- a/dev-python/python-swiftclient/Manifest
+++ b/dev-python/python-swiftclient/Manifest
@@ -1,5 +1,3 @@
-DIST python-swiftclient-3.13.0.tar.gz 201575 BLAKE2B b098f3980590a562278417f572a762064fdc04c643a50767bab15f07679148854d373e0418f9996327fca6fca4ab53b4363b1d681706f96d0c25925bb84a6525 SHA512 b228337d1ecd3adc1bbb9f9ac5bd16cc068feadaf4faf398fd84c2a05ee226fa2dd5b4af639229b62271a4546f6db3e02bc0479288e0269745b1a9ff82e6c841
 DIST python-swiftclient-3.13.1.tar.gz 201632 BLAKE2B f7cdf7e30ea333f568c8ef06d065b18908b1e4c9f8f0b777906bdfa8f6c998292136859f62f0d2e58465ee9eec3452d29e3e69ed7567a07bfcddcf6ad1bf321c SHA512 bd958fb8cfde6f72bcf82d381ce06e0e94c383aee85abab5a111c408bacf2578eaf53244ae12438d4454fcefe8d867246aef952d1d15012364e20817cc90042d
-EBUILD python-swiftclient-3.13.0.ebuild 921 BLAKE2B 8ebb668fd3a6259bbfbfa9d1db8ea789473eb241630b02c6812f542432e4d54b067cfe00cf1d5342df41bdacedd4babec9a7195e0317d46823dbff5d974b6133 SHA512 12a2827ccf0c6f920d265c583ff8dd91b6bed4a17492d927b37d446ea4cf852f4c842cbe1ae5faafc9a437cbe1725f68be1527c3182e5e2a29a6ad0315be3465
-EBUILD python-swiftclient-3.13.1.ebuild 926 BLAKE2B 5f4a4327b81c951545fb6bec0a6122d5ad4087c1f156a906c6f30c413afb2abd07a21019e8190f2f5b7612913a24b539839e732931f37c1e389023bbfb96e108 SHA512 0b312e8ee23b917cfcb2f03c4771f08bd30fc9d93cd38810a2f51af2122f5501946b716ba610a65592815db1b62408b61e8876cf6f4072ccd3bd0451c5828a4e
+EBUILD python-swiftclient-3.13.1.ebuild 924 BLAKE2B 34f8cd9501e62c88efaeb8375456f5dba26d6a867c674f68a201e1f3302fdcaf4858ff45ce99260741f86f7d4e02efb7d14fad8adcb01871cedd130096cc45e6 SHA512 f78fdb10af2083b561f1c276e5dab1ca0deaa1a5acd1357525121d90360e05273b7245e161ab6ef46b5857719d568e1f7307e834cc08e46f7fb3cb69ba5e7e86
 MISC metadata.xml 516 BLAKE2B fc43b031ba021a2a1cc6dbcb86764ef6f9cab62794220d4f3850050550a18a80dc112d0dd6d1be8562f1d6fd6d961057992e22abb4b4774c79bc69ac7c5402c2 SHA512 8858489aa10114c604eecd42e954d560a04d02e22c139f418b5d085c1be3fddac5d3e3c2ced39c2e4684d970569284ac988cb24d492e8997c3caad7e9ce59f05
diff --git a/dev-python/python-swiftclient/python-swiftclient-3.13.0.ebuild b/dev-python/python-swiftclient/python-swiftclient-3.13.0.ebuild
deleted file mode 100644
index 3263bc37bf67..000000000000
--- a/dev-python/python-swiftclient/python-swiftclient-3.13.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=8
-
-PYTHON_COMPAT=( python3_{8..9} )
-inherit distutils-r1
-
-DESCRIPTION="Python bindings to the OpenStack Object Storage API"
-HOMEPAGE="https://launchpad.net/python-swiftclient"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-RDEPEND="
-	>=dev-python/requests-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/pbr[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/keystoneauth-3.4.0[${PYTHON_USEDEP}]
-		dev-python/python-keystoneclient[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/openstacksdk-0.11.0[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests unittest
-
-python_prepare_all() {
-	sed -e 's/test_password_prompt/_&/' -i test/unit/test_shell.py || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/python-swiftclient/python-swiftclient-3.13.1.ebuild b/dev-python/python-swiftclient/python-swiftclient-3.13.1.ebuild
index c6468b9e5dcc..3bbc276c77e9 100644
--- a/dev-python/python-swiftclient/python-swiftclient-3.13.1.ebuild
+++ b/dev-python/python-swiftclient/python-swiftclient-3.13.1.ebuild
@@ -13,7 +13,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/requests-1.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/python-systemd/Manifest b/dev-python/python-systemd/Manifest
index 85bf01e0bfd7..7919febe36b1 100644
--- a/dev-python/python-systemd/Manifest
+++ b/dev-python/python-systemd/Manifest
@@ -1,5 +1,5 @@
 AUX python-systemd-234-fix-py3.10.patch 1539 BLAKE2B c41b20fea9165c62620c2b7262ddb0e331d24c2e950bcd0cf78c92d5f5f79804a9f0eb4a52a7203d353a6be297118e3b951823a973f9a99a8211efb5a31be458 SHA512 92a4497733efa551d9c966f39ba31bc9d3443ece6591f4d664c3732f01f10c928c07de13e2b9e65725f30fa18da7a4a9ee172e0b627d98e1d991c19b7762e2ab
 DIST python-systemd-234.tar.gz 53900 BLAKE2B 2658ee7083036ed8259e5f4ad0714ea15227ee836ad34c7fbbdb55dd9df48751b8d9998350d789b4f47e78fe7b4a7134e12d637e5a6ebeb29a0b31e5a4575d91 SHA512 164e34ba46827711e9c6ff9ed58b2706d9a22abfc7001de030ed7d463d8ddf783eb5fee93b207c29950a3c566018cc3f1a21a549421cf3e05c1287b433367eb2
 EBUILD python-systemd-234-r1.ebuild 871 BLAKE2B 73fc1d2f7b2d4132160693a44c812b1e7942103c07ab573c7bb4164c56fd6581fb53d7e301789d4568dcf80eb07e47537a8c810223d07f28c37b762519670aa0 SHA512 39ca70a0b48121556fa32546524eb19d2905b6eb9de81258f507c4652e1c9f9db1fcac70cb94950dd295ad63be380b8fce2d485d34b4e395368193c35ce037d9
-EBUILD python-systemd-234-r2.ebuild 861 BLAKE2B 31fd788ae45ca2523e7ad600146da59b1851fa8537866e002b92e945614814e790e8b306a622465c4a1a94a24d201cec7805af63fe507f8afff66089559b4037 SHA512 61fb065aa41b853ccb8e0d55ed1283bccf1386b56c13baa0cee88fd6e478c0414ba0826615a305e7c48b99d18b165cdf04e5792516f2b1538ef0508b14cb2c00
+EBUILD python-systemd-234-r2.ebuild 860 BLAKE2B c37fcc8c102bda4994704c4c62ad4934ac7f83ea0b747f8a0103a9b2ba1f8e8409fd6dfa799afc66414653c7c7eb2c2e5803c995dd17c8966d493c33dbada04f SHA512 9967cb0eda01d99f32a4b100817acd7233099a01b1c736bccba390bd7f1794e6abf91dc8a68fec907b783c8de39a8462a8c0e33f350dc33768acac6b58036da2
 MISC metadata.xml 359 BLAKE2B 458599dbb5364bdf58f0cabf3fe07f03f79a4cdfb3f707ef6db328c453e606b587e13fa3349e0e0c899a7b1655e558ccae00e6a9ea22146b9e68099e0ac1a981 SHA512 73e524d826bb08d80fbe3e643be5f08e39620ddb343006752729ea41e594ad13eb6241c30da78a58f67e6e5e3c51f567a9e761af498f882f1e23ce0308bfd690
diff --git a/dev-python/python-systemd/python-systemd-234-r2.ebuild b/dev-python/python-systemd/python-systemd-234-r2.ebuild
index 0e308e0bb637..823b5a85823c 100644
--- a/dev-python/python-systemd/python-systemd-234-r2.ebuild
+++ b/dev-python/python-systemd/python-systemd-234-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/systemd/python-systemd/archive/v${PV}.tar.gz -> ${P}
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ppc ppc64 ~sparc x86"
 
 DEPEND="sys-apps/systemd:0="
 RDEPEND="${DEPEND}
diff --git a/dev-python/python-xmlsec/Manifest b/dev-python/python-xmlsec/Manifest
index 4be3843b7f2e..fd45c37e6bf2 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.12.tar.gz 77722 BLAKE2B b5ecece8063b823cdbe4d58967d10026bdc6f3774954021a3739d579ba3c5a08130af1792921c7892e6bc3d00f88ac83ab30e862775e419e0dad40b990b10cbe SHA512 19c5e3bf58b4b0f8a1cca3e60c08348b02ae298620f8c02b8cfb325aecf0313cb2bd1af89507b754ebe4c35af3b031e232d15ddcd42deae0821c9c0d7571aa7c
-EBUILD python-xmlsec-1.3.12-r1.ebuild 979 BLAKE2B 948e8a3ae7bd6a829bbbc75dc8a271aa95ac49801f490411dc07486b35c68030ea328318bba1301175426c39d8dcc0ac3e045ef100aaac5962725f91ba35affb SHA512 abdb24b19c722b6197c207c2ee195a71fa2289644e444e9ffe6160931f699841ffe6b5dfa857ed107b756f350d1caaf55a3337a3f1f245971d3898ca8c942fb0
-EBUILD python-xmlsec-1.3.12.ebuild 1013 BLAKE2B f2fbe94c204ed68c7ee60192e29ae1120a41e59aa09748be1139bfb0383aa099186e2a4305aaa42d4a03e5cc57080b22fbc07d3cdb7d0e68a299003f11fe8637 SHA512 58730e58867afda94833fea263fae525f0c49db745c7c626241faf4c6cc217bb9d27cd3e550295f7249d5d280723e8a33e0281651e7f80bc76d9268683286afa
+EBUILD python-xmlsec-1.3.12-r1.ebuild 977 BLAKE2B 23e49e6dbf4120fefca28b20a5c032048a4a5be6637a8b734a60b564600a3309ca1273560c8e83c0ac890d723ce1e8c943f879a2d503d7dcf59748038ba5a4ce SHA512 c08254a07de8ca2e544a8898ed445c9910030f1933f6aa459b2f2503948e294b4c5f4bc655ddc2930797237dd018c0fe805a382a7b811d13dbcee11d0ff7819f
 MISC metadata.xml 420 BLAKE2B 8aeda69d8870ff72e5ff7476fa1e6fe2bde1bdbdc12093821a29aa905abb644bf4a78a8e5f8b2247f8bc89662f6055f26bd05eadf2f31371c2aa75f59f5b62da SHA512 96532b3a747f1a669b50ed86fb22f986e86f6456239c432c754ba12f5f3303a67037d25584eead27c6f9398d5d48275b558a8b0517a1128d9960b96e5962e474
diff --git a/dev-python/python-xmlsec/python-xmlsec-1.3.12-r1.ebuild b/dev-python/python-xmlsec/python-xmlsec-1.3.12-r1.ebuild
index a2fd13f2a349..1485fcbd3d64 100644
--- a/dev-python/python-xmlsec/python-xmlsec-1.3.12-r1.ebuild
+++ b/dev-python/python-xmlsec/python-xmlsec-1.3.12-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/mehcode/python-xmlsec/archive/${PV}.tar.gz -> ${P}.t
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 x86"
 
 RDEPEND="
 	dev-libs/xmlsec:=
diff --git a/dev-python/python-xmlsec/python-xmlsec-1.3.12.ebuild b/dev-python/python-xmlsec/python-xmlsec-1.3.12.ebuild
deleted file mode 100644
index 1fcfd448ae45..000000000000
--- a/dev-python/python-xmlsec/python-xmlsec-1.3.12.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# 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="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"
-
-RDEPEND="dev-libs/xmlsec:=
-	dev-python/lxml[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-BDEPEND="dev-python/pkgconfig[${PYTHON_USEDEP}]
-	dev-python/wheel[${PYTHON_USEDEP}]
-	test? (
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.3.11-fix-xml-testfail.patch"
-)
-
-EPYTEST_DESELECT=(
-	# Fragile based on black version?
-	tests/test_type_stubs.py::test_xmlsec_constants_stub
-)
-
-distutils_enable_tests --install 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/python-xmp-toolkit/Manifest b/dev-python/python-xmp-toolkit/Manifest
index 94a9c791bd60..a87d4161e9e7 100644
--- a/dev-python/python-xmp-toolkit/Manifest
+++ b/dev-python/python-xmp-toolkit/Manifest
@@ -1,5 +1,4 @@
 AUX python-xmp-toolkit-2.0.1-test.patch 397 BLAKE2B 059d415194f4544de5e4f6bfcbc2bec466b14e72e46792ac762115dd8b33bcd87ebfcdc9412695bd5b75483ac6e82024c083725ed73713c1bad100c30f22448a SHA512 f70eb11fe5b46ec0fac9a4a5c56a7a5b9dc75427b53e8159ec873a74afde23ca4bf5940b185932fc566a10f8a47d2ff8e56fa514eac1b06c94135cfa7070747b
 DIST python-xmp-toolkit-2.0.1.tar.gz 3576384 BLAKE2B cbe73d08d101d0d44c368fd1f1c6f1c8308ece5ca26f164f78312d901fb5d0387a5d2a6519d527b3625d11e338df5c366bed8a7361ac822ac887ef8be3a74948 SHA512 46f83b03574b2d742f6c6efb5b94a549068557ad6338e74fc62368c265d05f0b66a4dd36b17cd51b39f7b6cfbfb1210d54cc44c69e9a9e3da3392ee5f11de3bd
-EBUILD python-xmp-toolkit-2.0.1-r1.ebuild 1012 BLAKE2B 303795178f2d142e10479c62be2b4f998181d0c67d2927a7a804ea2bcaa0e9d501733088a26970151f9173e59cb925607c49a9a96bb9fff166735ccef1ecda5b SHA512 6e7151238e7532857ffc2162ac79194656dd762470867e39f12bdb13443fc3533eebae3cbe56d03db08769c4553cab613bc4156aefd73c41610570fb8ec1fbc0
-EBUILD python-xmp-toolkit-2.0.1-r2.ebuild 1050 BLAKE2B 40cfc5eac7af68882f51ccec4e27e3dee3c5cd4309fac1852d6b71275931aab1d0aa73b1047ed2948b38be4461e7cf3be36660195928dd29c6916f3e1e3af392 SHA512 675cb74d2f0e84058a10188da22dcab7d6edeaccafa5f65ccfe8223971f7ce68dfbf695d2ef419f1b64b95003b0b16f988682088743408c79dde5c98c4ae38c5
+EBUILD python-xmp-toolkit-2.0.1-r2.ebuild 1049 BLAKE2B 28c96605a27ecc0c056aab4e61b377b24ef982149c4d00d4f3b8bc10312cda18ce326af28f3855865b651b6107ca76cfb08cc7baa0dd80bc5e4d2be0a2f68124 SHA512 a9fb8fa005bc20ed8544e9e31d1e8c7e1edda419839a588e5ed8dcf3ff3106c7c7f96b7b473451a4c39fc166bce22e756f5118ce7be0a1078a043c822b1090c8
 MISC metadata.xml 417 BLAKE2B 818d54b619c9571b00493c9c463f4e2899c187071918f9e74189d8be23b97f4cd9a8ca0313c5f26507f9e581d8e268be3fe17f03c3f409b1eb333540fb48d380 SHA512 dc5ef8f44af10a54da69fc6bbd392c4da30ecc49c829f2f8c26022e2d42da3ab0a705f31bd72f404454fe76daf1162ecb72ea1e106c93a48cdf100b59f492a91
diff --git a/dev-python/python-xmp-toolkit/python-xmp-toolkit-2.0.1-r1.ebuild b/dev-python/python-xmp-toolkit/python-xmp-toolkit-2.0.1-r1.ebuild
deleted file mode 100644
index 5bca8d059a5b..000000000000
--- a/dev-python/python-xmp-toolkit/python-xmp-toolkit-2.0.1-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/python-xmp-toolkit/${PN}.git"
-else
-	SRC_URI="https://github.com/python-xmp-toolkit/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~x86"
-fi
-
-DESCRIPTION="Library for working with XMP metadata"
-HOMEPAGE="https://github.com/python-xmp-toolkit/python-xmp-toolkit/ https://pypi.org/project/python-xmp-toolkit/"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-DEPEND="doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( media-libs/exempi )"
-RDEPEND="dev-python/pytz[${PYTHON_USEDEP}]"
-
-PATCHES=( "${FILESDIR}"/${P}-test.patch )
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/.build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/python-xmp-toolkit/python-xmp-toolkit-2.0.1-r2.ebuild b/dev-python/python-xmp-toolkit/python-xmp-toolkit-2.0.1-r2.ebuild
index 721ab686b127..beb8ea247ada 100644
--- a/dev-python/python-xmp-toolkit/python-xmp-toolkit-2.0.1-r2.ebuild
+++ b/dev-python/python-xmp-toolkit/python-xmp-toolkit-2.0.1-r2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/python-xmp-toolkit/${PN}.git"
 else
 	SRC_URI="https://github.com/python-xmp-toolkit/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 fi
 
 DESCRIPTION="Library for working with XMP metadata"
diff --git a/dev-python/pythondialog/Manifest b/dev-python/pythondialog/Manifest
index 0c984fca38ff..aab735a1926b 100644
--- a/dev-python/pythondialog/Manifest
+++ b/dev-python/pythondialog/Manifest
@@ -1,3 +1,5 @@
 DIST python3-pythondialog-3.5.1.tar.bz2 1418034 BLAKE2B 28dbb76a213d702abd6fb4571ddd28acea0bd9757424e99432aa58c1336fce2aa9b248e4de0631fe34c7ac52b928c8b3dc65afc42a826cc268ca4247be4dafb8 SHA512 f032e425ce1ebac53ade1401e48625b5869497367f788831d08fd22eb3b3b14fa5aebd26fd3681b47222ef0247ebb5c1ead127f111ca296197e258650dd675ad
+DIST python3-pythondialog-3.5.3.tar.bz2 1428518 BLAKE2B 032735d2df318b4e94c138475148c71ab8322c52181550ea13ddd27ac63d715cb59124a2fc1f09f7d835d4453583c449c665f5efd16a2418fe3ca3348f53ed8e SHA512 69ae3e3894dbd56136989699fee7a7f459ce9a024e0e06d22193f5fd306f0f2bf2f4d300460f7de7898db347acdf6111652878948a78468a1aa23158c5f7ae98
 EBUILD pythondialog-3.5.1.ebuild 732 BLAKE2B 8b7bbf72082e9d2f771e5bad198e36200dcd7304e68acbdaaaba13b029703b48e24e4ecbf7f67a2c49286b93d543686f9aeac630679cc5c1b5a41948a1a56e52 SHA512 e98bc26387aacf553f07319696a93db711e146671c062bfd28478c1d32fd7860cb691f609ec19a26cca00a9ec42096885be7741c2d515667fc943f69b53c2f02
+EBUILD pythondialog-3.5.3.ebuild 793 BLAKE2B 9d7aba101bbe808dd6ec8feb341f5d1f85d9da7b6bea7f2c4b6524b132b85c93147ab903de9aa5071aa1e14b0b89ce5f30077c0e0048fbb81a55b6549e265463 SHA512 c63a186af9df6701ed6beaa99c315489dae92f47a502bc584282d8fdbd004903ec844e1751d2364b87a0e6d861af0efa8e95680bf22388e1c5e432391e2f5d39
 MISC metadata.xml 507 BLAKE2B 000faacd874d118fffc98e576774e75db2a00a0f9a3dff71d0e6676d5ed887c9e3020f9cc5949263d1a2e3344ade0cbca5a79055031428917a8f71e184c66d23 SHA512 a798ca22c3869f0dbbc402fde4eb0b82ef7a794a47b91f3540bb1edce78f5618d7cdcc69bc62f9fcbda24a0e301e68457fa88d028bf348d06edbef517e72ec24
diff --git a/dev-python/pythondialog/pythondialog-3.5.3.ebuild b/dev-python/pythondialog/pythondialog-3.5.3.ebuild
new file mode 100644
index 000000000000..731f6758d226
--- /dev/null
+++ b/dev-python/pythondialog/pythondialog-3.5.3.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A Python module for making simple text/console-mode user interfaces"
+HOMEPAGE="http://pythondialog.sourceforge.net/"
+SRC_URI="mirror://sourceforge/pythondialog/${PV}/python3-${P}.tar.bz2"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+
+RDEPEND="dev-util/dialog"
+
+distutils_enable_sphinx doc
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+	sed -e "/^    'sphinx.ext.intersphinx',/d" -i doc/conf.py || die
+}
+
+python_install_all() {
+	dodoc -r examples
+	docompress -x /usr/share/doc/${PF}/examples
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pytimeparse/Manifest b/dev-python/pytimeparse/Manifest
index 32ca1aaf5ec3..ea1589436b60 100644
--- a/dev-python/pytimeparse/Manifest
+++ b/dev-python/pytimeparse/Manifest
@@ -1,3 +1,3 @@
 DIST pytimeparse-1.1.8.tar.gz 9403 BLAKE2B 671a96f0f7d517e6cd137b8ec7bda17976993a683ece5e06f857cb07063cd4d7fdd08a98f838dbf35251a8403b68f7dc538e5450db3abe644e8c7c4f6c76b645 SHA512 9eb4530d779b940d66412920eefa4f4d3c43719aa3e4104da4f337c05421bcbb6ad4cb2d6459ddfac770fc9f19960a9d8ce578e67f2513499a7bee8efe9541ec
-EBUILD pytimeparse-1.1.8.ebuild 646 BLAKE2B 4f33bd8585b344369f7fbe237d0cd4c9bcb7482157937db7b5bee158e4e26bef0a0b5c0331bef15fffa376d754f765caa2b452aa24d5348d06a68bbcdb8afcb8 SHA512 318c34cf2654c58bc5c1faeb8b0fd2e8b04041f0da9f9d276303b9394c4bb06a9f83e85c694bf5d60de714145183f619846669ed69c1acd944932167edafb0f0
+EBUILD pytimeparse-1.1.8.ebuild 653 BLAKE2B c0a653a8eff39bc3490601ea744d0023aa2ed66c5908725f49677b5552c8897072d53f716b30bf24c34d5bf7f8f83fd364809c361f0ed80708a6c2c80dfe2d81 SHA512 3d5a6399d3734baf680b5b5f5afb7359b51b85ecbc4e078d36ff9f6fd1ca04c161f6d88b7a15d2f61a08d38f799893c1fb7b6031c77152d7da48eb8f64419897
 MISC metadata.xml 501 BLAKE2B 9ad6298b97c2882d63f95eebd4e055745b736b15b28c9268096b08e8a1376169614795b2b5138ae03fdb22c75be6c30776bc8b998955b88aaf1b3ab2ee60d44c SHA512 2a01bcf9ca0e6a9b285f5aff31e05e8b31c00487ddb09036c69d86fcdd3c28ce89f89a309d9510436a0b27bf922778f46914b215918ed9e1ab9b31887d1e08b2
diff --git a/dev-python/pytimeparse/pytimeparse-1.1.8.ebuild b/dev-python/pytimeparse/pytimeparse-1.1.8.ebuild
index 21a4c122bebd..536667deb9cd 100644
--- a/dev-python/pytimeparse/pytimeparse-1.1.8.ebuild
+++ b/dev-python/pytimeparse/pytimeparse-1.1.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ HOMEPAGE="https://github.com/wroberts/pytimeparse https://pypi.org/project/pytim
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~riscv"
 
 python_test() {
 	local unittest_args=(
diff --git a/dev-python/pytools/Manifest b/dev-python/pytools/Manifest
index 92bd32a22ce2..e8feb79210c5 100644
--- a/dev-python/pytools/Manifest
+++ b/dev-python/pytools/Manifest
@@ -2,5 +2,4 @@ DIST pytools-2022.1.1.tar.gz 67883 BLAKE2B 915d0a40de77589b3ec7d463f44b677cf4766
 DIST pytools-2022.1.2.tar.gz 67910 BLAKE2B 7c8cb65ae2ce5a790a2f5985c9d464d156ea49e9d8f17d5ff1bb456fc9d8f297fc2aa738aeadab45b472c08ced4995de487a6d59f1cb62aeb92a783b01292f6c SHA512 eb594188f55fa4d4e5696dbe7ac322675e75683a932369d641b52787af9fbb9eaa9e2697e1db811fd61065472836aaf9875edd73538db40d3b0760fa937547c9
 EBUILD pytools-2022.1.1.ebuild 583 BLAKE2B 67858b7ec936cbcb9e6102b271391de8aa0bfdf7d5bd6b04f392eecf905e3260b3a2d2fb0115ac5cf4cbce6fb9ad169f26cd4321f3d4805b0f2f719cadd96aae SHA512 68022a736523b10cfd86ff32d1b9212f25fa353e1888167f0d730a43799aa6da37e4756df60a2126a2f5c894482e18591954c3bbde5e7a94646558fb4f02b3a6
 EBUILD pytools-2022.1.2.ebuild 584 BLAKE2B ed94ee52263de95711b0e307417ae6fde9fb9ebe09c7527d22cecdaf3fb4165de045e6e02395c4bd49cdb80e1178cf25bf973b25e9f4f714fcb44f5c718cfd5e SHA512 6d7525d245911631ccab5363503cd045bce9ea41ec07176dd4e9e44057634771dcddc6da3723bf138d0d5c1580937bb37ef2e433581862d11c986d71434f59de
-EBUILD pytools-9999.ebuild 540 BLAKE2B 79935eaf65d8de5623d628068ae537aab12ecc18588272ced9da06c7c3f9343cd83423baf7c56308fa596809f4b2f28607b5f7cba9810958df8ca8157751a3dd SHA512 41da1b9e57b251a497a6040bb95503534a262b1481dfc92a52534874d7268857ada753d36cad384e78878c05221bfd4efc0f427538c829add7be996f68f28d43
 MISC metadata.xml 395 BLAKE2B aaf2add895c8e4001828d7b4e34a251d6690ae783d129b5a75e7676aca5f7e655597343df4eba3dffd40cbb9f4321766885a94ef8ae5c31f57aba4b23b8d6d67 SHA512 3201eaa7dccb492b48ec3143ed91696519c420d99d453e5e2a489592c50e532c7c270be8c6ab8c09da0eb8dac85dad9ba3ca0c98ec57b5fa850efb912c557917
diff --git a/dev-python/pytools/pytools-9999.ebuild b/dev-python/pytools/pytools-9999.ebuild
deleted file mode 100644
index 2bd2c25235ec..000000000000
--- a/dev-python/pytools/pytools-9999.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# 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='sqlite'
-
-inherit distutils-r1 git-r3
-
-DESCRIPTION="Collection of tools missing from the Python standard library"
-HOMEPAGE="https://mathema.tician.de/software/pytools/"
-EGIT_REPO_URI="https://github.com/inducer/pytools"
-
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND="
-	>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.6.0[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pytzdata/Manifest b/dev-python/pytzdata/Manifest
index d4a926aadf81..5e1f5d050f13 100644
--- a/dev-python/pytzdata/Manifest
+++ b/dev-python/pytzdata/Manifest
@@ -1,4 +1,4 @@
 AUX pytzdata-2020.1-system-zoneinfo.patch 3482 BLAKE2B 26c62593303e02d4037aba6e7b4ec7645610f3e73eadef9fcf483db5567e31d407efe92859d4157e672ce9683d135c2fcf2e63d427898d8bab1b0ead8db09299 SHA512 707afdd4bff5fb70f3bc4e20c88a1962f3fd56c15b3ff3e5896446d1eff55aaceefd53509fef1b4941d797e2c2aea41b72a87276fa64e562ad71609fa717a78e
 DIST pytzdata-2020.1.tar.gz 249045 BLAKE2B 6f07a7577edc87030fd70e720b32146e9044a8c6f74d0bafb9239ad666d0d6fd0ac7c3cca070914701af301b1a3368ace2985f8169b9747937fa6ed066be7302 SHA512 fd154bfbe90ce07a90f769063b772234036d2627c1e6d78a465d9ddbc894e50cb9d821c04ebff1a7cc6a327266f7843fe54e5592d37c41db023329d6e0f668c2
-EBUILD pytzdata-2020.1-r1.ebuild 596 BLAKE2B 1f71f2f2b37402896bd22daa5aa22e4adb9bf8c0d68049ee1288cea91c10e8ee632139fe56fd166be23936167d6ed3687ca0039217c844b5b349c33c9938c1c0 SHA512 78add3f430db0a1499b01e2ecc99440f5281459179af3815f93603536d6578631eab303ed125ce7f622e48db32276ff2879eb1d5c02288593388cfd0831ddf11
+EBUILD pytzdata-2020.1-r1.ebuild 597 BLAKE2B 95aff29b6e118ea5d7b4b01258ed43e16077768beabe3852253218d2ecedf353674a1acf8fe48560088ac61028645bd3e76092e8a962fef3ca18152e6bef8b65 SHA512 792134adf5178151260f68bc4469a2ea45472d7007ea41cf452e81dc9b857b42a90e67150409120e0a683a066853e094e1a6377953c53224781b8d696d7c06a1
 MISC metadata.xml 414 BLAKE2B 4b6e7f935a42ed815b92d7fec75b4db6fd3fa46386b5055462bb317bb6ac8526e3a965c803d6e207382ec396bc132d514ef083af91c9ac45ad2eaf67998b0b9e SHA512 80c0e415716770a0f18bd237e9039f72bdab0056c11e98ad2359431b14d0b239ae7a88840d774aa6d3b390fbc86bcf30e42a4981e52acda8e99666219982f445
diff --git a/dev-python/pytzdata/pytzdata-2020.1-r1.ebuild b/dev-python/pytzdata/pytzdata-2020.1-r1.ebuild
index 33f586f16db4..56781a4e3dd0 100644
--- a/dev-python/pytzdata/pytzdata-2020.1-r1.ebuild
+++ b/dev-python/pytzdata/pytzdata-2020.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/sdispater/pytzdata/archive/${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
 
 RDEPEND="dev-python/cleo[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/pywinrm/Manifest b/dev-python/pywinrm/Manifest
index 6bfc70092432..f1b69f5026ef 100644
--- a/dev-python/pywinrm/Manifest
+++ b/dev-python/pywinrm/Manifest
@@ -1,4 +1,3 @@
 DIST pywinrm-0.4.2.tar.gz 37842 BLAKE2B cf9eb683b77f9a2cc2da9343ebcbbd27404024aea23784721fbea0bce4f8a2359c3647e81bb5fce7f9317bcd8d84cef2c5ec76b17d15153348e66897a6fe1319 SHA512 c5ff02606d6c887ef199cf814d931575728947bbbbff3c2ae7e52bed355408df06ea9351a4ae0b47a947a05ca3476054e501b3abcfca5a36643ef4cd6855a0e4
-EBUILD pywinrm-0.4.2-r1.ebuild 808 BLAKE2B 33f668c5d0fbe7a988180d836182a363210aa255489625bd2077b3b9afc25d3c287316f972bb156091549aa357c8c3bf5e6afb34e4af5804a4dfa0e9d1298852 SHA512 7346963f9dbb9d5d8ecab78970eedd994c5579d91b60550f5b42ff0fff67300407cf42f626a97189df7d6b27845a697315204376979b23d2b0fd8dc9ef3d18a6
-EBUILD pywinrm-0.4.2.ebuild 767 BLAKE2B 93be8b6ae1b809882ddb9e7bb64d62b889b3e699431b26e579173702b6afa62eefdeaf744ac009709e173da5b98ba0cba5ba35ba2c8c79a33ce0870c6f7c7040 SHA512 3fe7699998e251f02bae13551bb022cb9890175d6c218fff83fa934441cae18fa5e36a291d8534c709a5ccfeaaf7fb6dfe7176329fad60d6dffa1d11170da3ee
+EBUILD pywinrm-0.4.2-r1.ebuild 815 BLAKE2B 71ff99fbf494e38904c73c61083aa6aa86eec82a0a820f6e3300ecbf2b4cd3f74944eb0314b1e1e9704e14cd406f53cbd6a798f9c6f9a28dfb0f323da737fe4b SHA512 9bcb06c863036554a8b1efc2dede5461c693b6bd6fcc19e870dd8a953e346bc1c12f7b9bbece3830eef91e90c44af221c8b12f39eaac5a02af2d6a59148c6838
 MISC metadata.xml 393 BLAKE2B c3656e83163c2e04cb1e313d4aefbaefa6ced59e186495763decafcc2a6ecbd57f55afddb8cf23f6dec82327821951ee086b5461351cd439818847f5e8eed1f5 SHA512 041088b77f748863dd04f869d6ddc17188e25cb78434525ec17e25c7d0530002d1321aa35f7a9c773646873281ecbf09a7d8312af5ce6a59a1a55cacc7106e43
diff --git a/dev-python/pywinrm/pywinrm-0.4.2-r1.ebuild b/dev-python/pywinrm/pywinrm-0.4.2-r1.ebuild
index 2eaa56b25615..b5ab98e4499c 100644
--- a/dev-python/pywinrm/pywinrm-0.4.2-r1.ebuild
+++ b/dev-python/pywinrm/pywinrm-0.4.2-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~riscv"
 IUSE="kerberos"
 
 RDEPEND="
diff --git a/dev-python/pywinrm/pywinrm-0.4.2.ebuild b/dev-python/pywinrm/pywinrm-0.4.2.ebuild
deleted file mode 100644
index d5323322e7ba..000000000000
--- a/dev-python/pywinrm/pywinrm-0.4.2.ebuild
+++ /dev/null
@@ -1,29 +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 client for the Windows Remote Management (WinRM) service"
-HOMEPAGE="https://github.com/diyan/pywinrm/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="kerberos"
-
-RDEPEND="dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/requests-ntlm[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/xmltodict[${PYTHON_USEDEP}]
-	kerberos? (
-		<dev-python/pykerberos-2.0.0[${PYTHON_USEDEP}]
-		dev-python/requests-credssp[${PYTHON_USEDEP}]
-	)"
-BDEPEND="test? ( dev-python/mock[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests pytest
diff --git a/dev-python/qtconsole/Manifest b/dev-python/qtconsole/Manifest
index b945aacd19b6..0eaca0a14a70 100644
--- a/dev-python/qtconsole/Manifest
+++ b/dev-python/qtconsole/Manifest
@@ -1,7 +1,9 @@
 DIST qtconsole-5.1.1.tar.gz 428840 BLAKE2B eb5f6dacf576133c07bc45a9f0fcfdfd041f72012d9564e288a40ac060a6843f6438c80836bcf2f35ffa1f575383bdffe347a498930fe96e2d99a1f1fbe3a032 SHA512 dd9f725fc6e55dea3910650c4c5641336ed1ed56e6eeaad91e6567743bc02fbd0ca567295c3c8897bb800df305ec0bf9f2d8caa8ad0099cdfa2d20c7ca96fbdc
 DIST qtconsole-5.2.1.tar.gz 429573 BLAKE2B 57d42dee8710576785dd1e2e054469b5b2325fad1c30aab1b071f1aac80f3146edc057b03b025d72f0c8691d002a06dbe45bf51d51876ff730d39106d4e4aaa4 SHA512 86e310da66f36e38a584758b18482da927acd70f095600554d4bef3c0b0fcfab5df9d9990b94943a14932afbb8d5ec1db5810c40ef2a7e59172788291684d9aa
 DIST qtconsole-5.2.2.tar.gz 429610 BLAKE2B 1a9f163dfa8a2d38829b2db5a5589b80605b82f144d95e51e3668f296b8e839fd3045c813505926a4c8690e438e79d82c0307c33416152d28899b2f0324aec1e SHA512 43727a08a0b828421bb051063055b3306a2111bedfd148aea6bccc04e103bbffb798c35440bfdb82ffa6bf17a2b0ce9e1ad2d0b3df9aaea294a23dcf582dfd57
+DIST qtconsole-5.3.0.tar.gz 430258 BLAKE2B 883c95124d911b17a1cebedc357f207e042a9679a09eb63bace09f7f39eac4b1f3a24ccd372760e3142494208119dc4131939cd82e8cab364dacecca184c8545 SHA512 6fcfaa7ad842f3f45d4e2286ce816a0b4c71e3c3fb07b86589934efcc637e2cd6f5712fa8a10c375b8e86d1e1e6ce32de9f2be2fc0decd554b51c658e106b120
 EBUILD qtconsole-5.1.1.ebuild 1256 BLAKE2B cb31c8fc5ab44fd088cf922da2cce87ac7be31fd4b6cc25486bdb6be5deb4d8ac68fc61d8a63708df73899730671807caa34f60e82295cf2167da8d0b99a3f9c SHA512 ec28716597e72806ebe96ba822cea86d294798f6ae16871f8059ac342427ca2ef2025d8663ee1d30f5d9a89ebafc2ed4216301edbd689e6c8cdcdced6fd029c7
 EBUILD qtconsole-5.2.1.ebuild 1400 BLAKE2B 46b54271d309c64eb4580ada2e220af9d73f96021b47603b2557aa78736dfddb735af5e7f927976d9b4dc3a5c00c5315e981edbd84a3d6305b5d053642d5b5be SHA512 ee5c6c63e25530b765b4f5e146a417579ffd8d341613ec7dd9f6697958754db14500c51bdcef7db94fd740e0a20436aa882e5a158b3a5fb08b1f80566e69b1ed
 EBUILD qtconsole-5.2.2.ebuild 1398 BLAKE2B 14777fb565b0fe92a0969759480454137145650bc9c1c977a97dc745f20f5b519318374d7ccba0012cf81088ac8270be4605e6720d4dca1583953a6e9964e71b SHA512 e554d7506288ec0359771d6467da6d0cc41f9d726a510b07cb119cecb9a8fbc2e50a41d1eaad588de4e5e58ee92d47bf38a67fba9b952bc4bfaf4e2e15d46d48
+EBUILD qtconsole-5.3.0.ebuild 1469 BLAKE2B 78717d4b5b034d72af1e4e11b6fb6c5950858727450153ad9f855d81985f63cef04563c51c566d84344aa0fa0d60023f0a0551903fb2367f6f80c23fe0e6b8c7 SHA512 d0eafe8c8ddd8275faf7e67017871020c2f3d9444108a1c8a168f90b69a4317965ef791f639ef075d079572e9616111be9d44a847a98446730a8d0ee5f1cb229
 MISC metadata.xml 690 BLAKE2B f2ddc6515f66ac4549e99bd6f152c16431875508bf12b6319e0e6a2b1596d86abc50b87ee424d3876eb55e92d1a506ade6567cbad535b4b2b54fad924a1891a7 SHA512 28bb7360ac7775d9c72c4d0f34d4c9a35c63905c4e870722236cc6c66e98f6c0eb165c8d7a9ce28948b25808a053dd1bb667d1f4783ca95319bb216310dc9f60
diff --git a/dev-python/qtconsole/qtconsole-5.3.0.ebuild b/dev-python/qtconsole/qtconsole-5.3.0.ebuild
new file mode 100644
index 000000000000..e0d4c909ce7a
--- /dev/null
+++ b/dev-python/qtconsole/qtconsole-5.3.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2022 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
+
+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 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/ipykernel-4.1[${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/pyzmq-17.1[${PYTHON_USEDEP}]
+	dev-python/traitlets[${PYTHON_USEDEP}]
+	>=dev-python/QtPy-2.0.1[${PYTHON_USEDEP},gui,printsupport,svg]
+"
+# The test suite tests both against pyqt5 *and* pyside2
+BDEPEND="
+	test? (
+		dev-python/QtPy[pyqt5,pyside2,${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 dev-python/sphinx_rtd_theme
+distutils_enable_tests pytest
+
+python_test() {
+	# TODO: these tests require virtx; however, running under virtx
+	# causes pytest to segv on exit (even though tests pass)
+	EPYTEST_IGNORE=(
+		qtconsole/tests/test_00_console_widget.py
+		qtconsole/tests/test_jupyter_widget.py
+	)
+	epytest
+}
diff --git a/dev-python/raet/Manifest b/dev-python/raet/Manifest
index 950be4247614..aa887a9ebec2 100644
--- a/dev-python/raet/Manifest
+++ b/dev-python/raet/Manifest
@@ -2,4 +2,5 @@ AUX raet-0.6.8-msgpack-1.0.patch 8061 BLAKE2B 90607848542b8ba5a219a872f6f4f4e125
 AUX raet-0.6.8-py310.patch 1893 BLAKE2B 26dfeb901c64aa8b0c8a63f8be4e02ce65a99eea5e2f81d15be9eacb686a0d13bfe2e41588ed214a78906db2e607e1468f8c477a1c5dbe67cdf7cfae2d16da6a SHA512 d15618790b20e4843ed04a1ffe17acd3b31cf51388a9764c0f8ee33a28d503345dddea8da93418c6b46291ca61e4faf6fe3351935365909d1cfde5fc18d43f6d
 DIST raet-0.6.8.tar.gz 807419 BLAKE2B 2370eb55b76a52cf89363f9891a411ea7fa2f27b84bd216c44010fd9afb5dcd9261570f916db00ff7bd922c485cd6123b3a6522154b6e05f7869d7e790177f7b SHA512 01279e7414ec3edc9f2bc0641cb9e0606ebf5700b5ce37a05fd5919f3274b3b43aad64110baf4c4b1fda3843cb1a87b6be4ab592a8f62e82b3a716a86ae61b20
 EBUILD raet-0.6.8-r3.ebuild 990 BLAKE2B 5f814796ebeaac37661648964eb6110509d9548859a9d47aa9f248e1c887b6125ec4847b25f7ef04560178bc43517434c57efe24748910c1353bf741d4237fc8 SHA512 de32ce5d3c5615f460b01201a51669f1b039fca99b3683239054a9ca126a2d0cf33b32eb69491b62d3f236fb411db3a2a6fcd49326e3f9090ba4ccf57e7df6ea
+EBUILD raet-0.6.8-r4.ebuild 988 BLAKE2B db6ae1ee2019ed883ba16cc24594fa135fdf6a9d7f2a778089c7d319d1282c54df3c4026d0cb68c1f9c032e398d80ea66bd04e9c2fb228b2fa72e50c8d648d4d SHA512 b64c5f3bbb7f5a0d988124b441b689aa4b97e3523a8bbd9844106afba7d739033447361417df8d8f795f863cdd869d7ea11587f3b781d0780a8ee25c0f8dee6d
 MISC metadata.xml 475 BLAKE2B a717b6ad3a8b2cdd4b4c48c6fae1226e92080952af627757ac935a6bc8beb3fbf941d6aa0c631281cedadfba5d10d95d6a9b5c8e4a3a47c8da800a7e89fbf8ca SHA512 605d31af6fa66007c18033eea24b7de74b8529996d9a9a19e9e188fd83831f83c5d621aff03e423d25388fca790970de9add12a10ce300aa90bbe08226f6a8e7
diff --git a/dev-python/raet/raet-0.6.8-r4.ebuild b/dev-python/raet/raet-0.6.8-r4.ebuild
new file mode 100644
index 000000000000..2be8b93ebc9e
--- /dev/null
+++ b/dev-python/raet/raet-0.6.8-r4.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Reliable Asynchronous Event Transport Protocol"
+HOMEPAGE="https://github.com/RaetProtocol/raet"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND=">=dev-python/six-1.6.1[${PYTHON_USEDEP}]
+	>=dev-python/libnacl-1.4.3[${PYTHON_USEDEP}]
+	>=dev-python/ioflo-2.0[${PYTHON_USEDEP}]"
+BDEPEND="${RDEPEND}
+	test? (
+		>=dev-python/msgpack-1.0.0[${PYTHON_USEDEP}]
+	)"
+
+PATCHES=(
+	"${FILESDIR}/raet-0.6.8-msgpack-1.0.patch"
+	"${FILESDIR}/raet-0.6.8-py310.patch"
+)
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+	sed -e "/setuptools_git/d" -i setup.py || die
+}
+
+python_test() {
+	pushd "${BUILD_DIR}"/lib || die
+	${EPYTHON} ${PN}/test/__init__.py || die "tests failed for ${EPYTHON}"
+	popd || die
+}
diff --git a/dev-python/random2/Manifest b/dev-python/random2/Manifest
index 5bc6faba7233..95daa4b382f9 100644
--- a/dev-python/random2/Manifest
+++ b/dev-python/random2/Manifest
@@ -1,5 +1,4 @@
 AUX random2-1.0.1-py39-tests.patch 1264 BLAKE2B 8a9010deebf3529bc968c6b05a84a2034994455874a1b011d0a711da5ca863ad1aef4e462e7d5f6183121bd0f01e2f2270e057cb2c54d907541e9a0e491f09c7 SHA512 20164add503f8a6cf8750cc2e95baec382f3faafac8ed50046b61e5b81a9a2da4033f8a9f196e3ce1516dfe21228c2d25e3957eed3c85bb1c8aeda284a864d1b
 DIST random2-1.0.1.zip 21088 BLAKE2B 69747711e355d3dea2b16562a6b9cdaa170732172e9eaac9a5cee4b8058f569e0c4527aec89e408e6472168fdecfc52b87703d23f153ec04f6ed2c049bcd162a SHA512 31de31c27bc6e07e99c24d30e97d9ddc3085fe557bcb0725881d4ab0b4c06e6208f64ba6267098c7b1be4f115ad45b399e841beecc90f71da2fb7d82982e75ff
-EBUILD random2-1.0.1-r1.ebuild 489 BLAKE2B c68f751030f162eef9fcf6ef416994fc4ed3ac7541a93be2521cac0786aa822846ef65acb237962bdf36243df1c5c9dedb8e03d6f937c360e6576e89f2491533 SHA512 bd645124c18cd0c0d217802014f534e70512ca42384f10b3cfd25571d7eb84cf1f5684a2337c4e740f2983b0254053d5250f455bffa5ba453296a04b46fb9ba1
-EBUILD random2-1.0.1-r2.ebuild 525 BLAKE2B 4a36090009e43397e7ab63699333abeb30cbb41ec703574500a4ea0d01c4719b9fd8b455f402e8415afcba298723cbabbb5a7dee62b0e84bb2cbff44aaed944d SHA512 02ad94cc43dcf2aa945e41f38cffa8354688ae9bd549f7783e359e71bc2b1ddc81e35ff17ba3ed81734e33023b6cf58d73822577ebec93eff29216ed9bad5f3f
+EBUILD random2-1.0.1-r2.ebuild 522 BLAKE2B 7879648d7168d78e20c3f3abe9f8399d03492d65a84daaa5098550c5d034d75a699c9e7559a9251a722aa1dc77b3dda9780747a4d5afb8dea6dca22dd51fae00 SHA512 84605bf1a71cbad616668fd5e3752eef2a5a688b7e01a85ad5b047d5c8dba16692492896e70e14bef28fa5e3144d11cc92683e6487b3eab5e444f045e291c60d
 MISC metadata.xml 317 BLAKE2B 8308aafb7ac32af516a3ae84ce565e825a376fa226b11657b4175a847961159468bf474e0b293ebde604ef2ec7881b2fe8f71aaf4c326f9cdcf39acea3edc2dd SHA512 f569e09a6f9d184b6261fdf01b7568727d267c3e66b1f450b55b31248b757269d7c0bef6e87e4b3a4b1937c8dd4115338b484fa32a84fc3b4cc8b41450f3576f
diff --git a/dev-python/random2/random2-1.0.1-r1.ebuild b/dev-python/random2/random2-1.0.1-r1.ebuild
deleted file mode 100644
index a78c5fe055be..000000000000
--- a/dev-python/random2/random2-1.0.1-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-inherit distutils-r1
-
-DESCRIPTION="Python-2.7 random module ported to python-3"
-HOMEPAGE="https://pypi.org/project/random2/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~riscv x86"
-
-BDEPEND="app-arch/unzip"
-
-distutils_enable_tests setup.py
-
-PATCHES=( "${FILESDIR}/${P}-py39-tests.patch" )
diff --git a/dev-python/random2/random2-1.0.1-r2.ebuild b/dev-python/random2/random2-1.0.1-r2.ebuild
index 2a366d4c7b1b..abc7460ee960 100644
--- a/dev-python/random2/random2-1.0.1-r2.ebuild
+++ b/dev-python/random2/random2-1.0.1-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 
 BDEPEND="app-arch/unzip"
 
diff --git a/dev-python/redis-py/Manifest b/dev-python/redis-py/Manifest
index bff13c7ef2f1..5cc7d2a3f3be 100644
--- a/dev-python/redis-py/Manifest
+++ b/dev-python/redis-py/Manifest
@@ -1,5 +1,9 @@
 DIST redis-py-4.1.4.tar.gz 2352106 BLAKE2B a7f40d381e3e1d295d2ce88f0adb897704d0065ee7d5bb00108c2c8c67ef649ea63d4ca06dbbe2b21b2f92d70d96f8e2d32a7992ecf702bb4c73589f30c1bae8 SHA512 6dd1bc7622529382901b2fe6e63a5f9d6a4b89175b486c879a63cc8f0e708737431dfe5b834124f0d33f34540ac54813a0e6953bbed3a9dbd226597b4b1cb3ae
 DIST redis-py-4.2.0.tar.gz 2419627 BLAKE2B a4429e17dc90289032c5b98cd482fc6e1349b4b63b2c3f289be1df9d0c667a9f568cbee71d34f88c140fbebf2b0061e9bb3426f1548bccf3c0767c040419251b SHA512 3c4c7f859e63ebadf8d4b01ce14d789caffa18b1f177b6a2269737cb20259dc0165773b1c838c3c08edeea790976183b156f886815b42ea709b4b3a0f2aa3354
+DIST redis-py-4.2.1.tar.gz 2420026 BLAKE2B 2e2ef024dc22ad8447bd0b0c9e2318b5c55568e7a93a73f8f264e5af839d50c7c44d98669d19ddc2a9a6440eaafa8842ebeb749b9b22db83d691dab5421fd774 SHA512 3499126d2c19f599e5bc026c3b66ec99639b2746ef0091ba8bea45cf969d39831e1f2ad47f0ba4c65131d4f248320a8b7d2862c5abb289e46555cd3fc6239674
+DIST redis-py-4.2.2.tar.gz 2421362 BLAKE2B ab59a649e8bc08d706536f994f0462505cea39828072884739b1a6434b45fd120e3b8acb51e8e88ec9fe0ce9acc0bfd6a5ff92bb67080724c7b121ef539af16f SHA512 80673d48cd97af1c5ebc67e919f16891ccb20cd30bc06619ddffeb117ad87f82b73f9b9bda6d36829bc51a35aa3c9b2af7c879ec665cc9664bdd86ac6510095b
 EBUILD redis-py-4.1.4.ebuild 1918 BLAKE2B c1646652b418e9c7e7e19c086f387f517f0e2f1367e3d93b83c6bb63eae38f376f1cc82d2ad49946f2b51f580e3170487416be43a796bf6f68b1ca2b138cb3af SHA512 9733635fffe6f1334cd371dafa897be7820fdc2e4bf9ffc01ebb563586c27bd84f3f51f15ad49c2790ea83cf6598362aed272cffbb6b50596e0912f3d64578a2
 EBUILD redis-py-4.2.0.ebuild 2200 BLAKE2B 4f827a862840d98e49e27189f630fa3d1cc5dbbd5c90b48b9884ba6b688ece4fc1e727e04cad0bf110a27f03ae5397a547c207544dffb830eee1eb1626ae8149 SHA512 ff10a2bd560af96b6062ec38cdb6b2a87b6522e3d30fa963a08a44c3701d224401ea1a16648ec5ed442a90f43683b05660ad5eb26872c6d14f8f36f639a16920
+EBUILD redis-py-4.2.1.ebuild 2033 BLAKE2B a0ad790fc560b7f9c6f269b4424c31b0ad51238006bfa86427dd023fd935bf8a05b9fd06e6ac17978ed1fde90882c1a5ea080fdea522483fae21f5f02784c822 SHA512 b860888698f10e59e5e38374359c91dffb5646657b9e44db24618353137278a0a5e82fcb641ab8596ef5ec325149050c5b91a3d4842e50bca2502d0a0fbc7f6d
+EBUILD redis-py-4.2.2.ebuild 2079 BLAKE2B 24be762f7de76fdbdc517d971111d35175525f4f7f56909490572e57496590e451b0d636787425c74f67619cb9691ec1840bfa0e6b9d4405a54fe751ceab79dc SHA512 713a7e8c8f602e7675d8fcf24eb3256ea3179d76e5d33ce45b1b1ed1d0960d6caed95484c26b72cb7450d0fdfe2b67ef8eed97770f0e649445bdf7d41c5f7267
 MISC metadata.xml 506 BLAKE2B 0e5747e826132dd365bdf6d3a63f0936ed476bc69c4c4d55126e692039046f51f69b193ead0baa181090b11f69ab2a49220d8f906f9fe3fc18331b76ff9e0b0f SHA512 725d650bfe345b132588930a18ade44182ec07f6697d2fd8806dc208ab1556939926e8899fc6d43691101d971f9c1e011fb8a5675fdde4698dbf4c230db15c75
diff --git a/dev-python/redis-py/redis-py-4.2.1.ebuild b/dev-python/redis-py/redis-py-4.2.1.ebuild
new file mode 100644
index 000000000000..bdf92ea29be5
--- /dev/null
+++ b/dev-python/redis-py/redis-py-4.2.1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+
+inherit distutils-r1
+
+MY_PN="redis"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Python client for Redis key-value store"
+HOMEPAGE="https://github.com/redis/redis-py"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/async_timeout-4.0.2[${PYTHON_USEDEP}]
+	>=dev-python/deprecated-1.2.3[${PYTHON_USEDEP}]
+	>=dev-python/packaging-20.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-db/redis
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# Flaky test
+		tests/test_pubsub.py::TestPubSubDeadlock::test_pubsub_deadlock
+
+		# Needs a second Redis running
+		tests/test_commands.py::TestRedisCommands::test_sync
+		tests/test_commands.py::TestRedisCommands::test_psync
+	)
+
+	local EPYTEST_IGNORE=(
+		# SSL tests need Docker/stunnel:
+		# https://github.com/redis/redis-py/commit/18c6809b761bc6755349e1d7e08e74e857ec2c65
+		tests/test_ssl.py
+
+		# Needs multiple Redises running
+		tests/test_cluster.py
+	)
+
+	epytest -k "not redismod and not ssl"
+}
+
+src_test() {
+	local redis_pid="${T}"/redis.pid
+	local redis_port=6379
+
+	# 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.
+	einfo "Spawning Redis"
+	einfo "NOTE: Port ${redis_port} must be free"
+	# "${EPREFIX}"/usr/sbin/redis-server - <<< "${redis_test_config}" || die
+	"${EPREFIX}"/usr/sbin/redis-server - <<- EOF || die "Unable to start redis server"
+		daemonize yes
+		pidfile ${redis_pid}
+		port ${redis_port}
+		bind 127.0.0.1
+	EOF
+
+	# Run the tests
+	distutils-r1_src_test
+
+	# Clean up afterwards
+	kill "$(<"${redis_pid}")" || die
+}
diff --git a/dev-python/redis-py/redis-py-4.2.2.ebuild b/dev-python/redis-py/redis-py-4.2.2.ebuild
new file mode 100644
index 000000000000..b9f87178642f
--- /dev/null
+++ b/dev-python/redis-py/redis-py-4.2.2.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+
+inherit distutils-r1
+
+MY_PN="redis"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Python client for Redis key-value store"
+HOMEPAGE="https://github.com/redis/redis-py"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/async_timeout-4.0.2[${PYTHON_USEDEP}]
+	>=dev-python/deprecated-1.2.3[${PYTHON_USEDEP}]
+	>=dev-python/packaging-20.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-db/redis
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# Flaky test
+		tests/test_pubsub.py::TestPubSubDeadlock::test_pubsub_deadlock
+
+		# Needs a second Redis running
+		tests/test_commands.py::TestRedisCommands::test_sync
+		tests/test_commands.py::TestRedisCommands::test_psync
+	)
+
+	local EPYTEST_IGNORE=(
+		# SSL tests need Docker/stunnel:
+		# https://github.com/redis/redis-py/commit/18c6809b761bc6755349e1d7e08e74e857ec2c65
+		tests/test_ssl.py
+
+		# Needs multiple Redises running
+		tests/test_cluster.py
+	)
+
+	epytest -k "not redismod and not ssl"
+}
+
+src_test() {
+	local redis_pid="${T}"/redis.pid
+	local redis_port=6379
+
+	# 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.
+	einfo "Spawning Redis"
+	einfo "NOTE: Port ${redis_port} must be free"
+	# "${EPREFIX}"/usr/sbin/redis-server - <<< "${redis_test_config}" || die
+	"${EPREFIX}"/usr/sbin/redis-server - <<- EOF || die "Unable to start redis server"
+		daemonize yes
+		pidfile ${redis_pid}
+		port ${redis_port}
+		bind 127.0.0.1
+	EOF
+
+	# Run the tests
+	distutils-r1_src_test
+
+	# Clean up afterwards
+	kill "$(<"${redis_pid}")" || die
+}
diff --git a/dev-python/reedsolomon/Manifest b/dev-python/reedsolomon/Manifest
index 7a8763feef24..da0e236fcc6c 100644
--- a/dev-python/reedsolomon/Manifest
+++ b/dev-python/reedsolomon/Manifest
@@ -1,4 +1,4 @@
 DIST reedsolomon-1.5.4.tar.gz 283778 BLAKE2B 5354b8d320db1533469ae1fd706c0412a81bb408675041af5dbf42b42014e4b779b937fa8e3b3d0a5e67e62d9fd7ce9ac519022dd98dbc82a156ee0cda7914ce SHA512 c738f817c8f536ee86e5bcd3de73a4cf6a3e606ba196a359b6c09e7372dba31316ddb8b134d7c335100e4c2ff0158ff07caa35fee9bc20768bde23cd803e274a
-EBUILD reedsolomon-1.5.4-r1.ebuild 793 BLAKE2B 3042fa9e8a5366b40d64811c5a14234975cea55bc5b653866b3bee33f6d066ac09d83c9022b8ea512b5f240fc5957cf7d885dbce11af26ada3a2309bd60f6b53 SHA512 3adf358ba1ce183cc1c68b270f31e9a2e546751a8df028361f8b8a3bde06cd949086acf7f666ac16b08ab4e3e24e7bc89ff17b29b8caea501782fc2f6eb348c3
+EBUILD reedsolomon-1.5.4-r1.ebuild 792 BLAKE2B 59396597d6bbb79b24d85c05327fbcbca83e383ab3cc952183d736bdc3b291a9b2116e28a381d5e8f37343fa3e298f4195fd14b3a81a58bb68486aedf2dac9c4 SHA512 6bd05a3d2f96737b0b6ecf89526a922315e6d024c98045151a49fe2e217a2d27cf64735910f8e18a9aacb7f21b6b292274d1b142058d863eb7064d24687ebd54
 EBUILD reedsolomon-1.5.4.ebuild 735 BLAKE2B 9b7d02ff45b23fe1d17c01f3121e5a4261064053d6c833aa27adaa711414b89e28cfb55554bfc799a4e2e4d5e4b551824e326a7b79ba9d692efd4e2a335fe96e SHA512 5fe2437acd179a366049de32d5a89f0e83e28a2c18a6b6af257fdbe0f0c9045252c6ff58cdf2517ec403d27dbc5a0407f709b1e13e69bf412275d85ef5b37a26
 MISC metadata.xml 532 BLAKE2B 90e7740e649abc65ccee0b33c6515689b33c33199bbaad9b30ebe8bcd4e86467526d8a85e50af308c69b82930506a942a57a8b50580c892cb9e6fa902b19a3b1 SHA512 76556763e4d00a4796435298017646c45f26c7bc913adc444dc97300cad75a91609fed422ed0f9dd6bca9f0e193d43ab8efea22d321e59e110f0e523be971eb2
diff --git a/dev-python/reedsolomon/reedsolomon-1.5.4-r1.ebuild b/dev-python/reedsolomon/reedsolomon-1.5.4-r1.ebuild
index 25842d39935f..dc269813e559 100644
--- a/dev-python/reedsolomon/reedsolomon-1.5.4-r1.ebuild
+++ b/dev-python/reedsolomon/reedsolomon-1.5.4-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/tomerfiliba/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/reportlab/Manifest b/dev-python/reportlab/Manifest
index e3fcf1338e83..1db104834355 100644
--- a/dev-python/reportlab/Manifest
+++ b/dev-python/reportlab/Manifest
@@ -1,9 +1,12 @@
 AUX reportlab-3.5.48-usr-lib-LLD.patch 1601 BLAKE2B 34ff1ce6b0cc2fa8ea3b2bec79ccab0eb7ccc28ed306b524b0fced1a37605c0c957090c39c5a0b71dd6d3c47c60cb7b714142a2f339170b7dcd965363ff2df66 SHA512 32fbd4410846ba4d0a3a8a5521f21f445f76ee75d0adde6ade210816901f1bcffc511efe3822c9b473d71b3541a716f9b2a3aa39181afb21de3aad9d13026476
+AUX reportlab-3.6.9-paths.patch 996 BLAKE2B a003ce69d7aff12e04fac914d44a0af58555da9858d96f23be26455836ee1105d76136cdfbe52b888f9779f1b8463fda9a04587b3ef045c8354d840f3f92caac SHA512 f71ebfdb07c87a7bd39a5578355a2a800654204e38f722106dcfbe848332eb1ef6ce8b6ffebe08fd0a07214c0fcfade69e0eee1f47b1055c877efc64e70e0bfc
 DIST pfbfer-20070710.zip 677333 BLAKE2B 100214476a361a5e5d1f3da0999591345f6e3a3f8c6bc3f6a3e9eca734190c6259758a43302c6e41254d33491fe535eb7d5dd07aa9727c912424bebc31fc18df SHA512 6fd4a5d955464b10d13a7b748703450c1fe120d5ed09e8cfa1b4dfa9c183c59fe001df29433af551796b0df62544b7ddc364f9bb1bdcc2cd300434340ffcc4f2
 DIST reportlab-3.6.6.tar.gz 4509457 BLAKE2B d2cb5c764aa86000dd97798b5aea25fdc07e4230015dda6c11099e379884ca74532327dfe723069d5e56569dd7e120d94918f64a5f705bfef212b484f812aa7b SHA512 6f05e5f7c6b6c0b6f8d65fe11e2900ecd427f6c293672b12a4cc094476da1cdebc0df59198660614251d388241d7c886c345f958d337d351ea048b3b25a71ba5
 DIST reportlab-3.6.7.tar.gz 4504447 BLAKE2B 3e691294d20f94850840ddc70565d2235bdcb37d47b5e869e34e5fea93dc9ba017d09f088e18b6479266354076b89461849dd1eb7d1d4e8b12a9c4a95706bf66 SHA512 51f98900ccf7ef34fefc237bf1c787931a525cd82284685bda26f411760b97d1b85fce5bffa59b133705f6c1769a8d3616ef85ea368ed59dfc72f24d5faf6e88
 DIST reportlab-3.6.8.tar.gz 4503191 BLAKE2B 3d61ac2554309a8dfff2107ba6157152b558355fc6ebd7d2337b0f3152ceb9644ae2dc20b6e0f2ed312a579fc5f172e05eeda69e3b6acbbf921b62f27ce50f77 SHA512 7eb2381a8020f751f03008bb8dc1eb07f954a97c0c3d38646602a22ed7f69dd73e11bbd1251a471da141c98492be7f3867cf120e489c58911ae6e9f29c926507
+DIST reportlab-3.6.9.tar.gz 4507750 BLAKE2B 881eeaa36fb3934a75e420822d5b0d0f1718da190741190e58756c952bc3efac304e2c7747d8748713ef3f9449ead40c44d6774d6ca90218db51c16790d9e8cd SHA512 401127eaa3e4c9f303f5c13f96151a563a16efb15d1e9aaf6dab04cb23f275b552cdd8fb9a3a49bca420a8ddf83423c481dacdd11e39220592cf0ad911b70c42
 EBUILD reportlab-3.6.6.ebuild 1284 BLAKE2B 683ec85fd62b21c3c733e6717ae8fbea631bd0e43034b0f8783d01ee25fd232ba822bd69a41b6396612df5f197d562b95890cda3a885dcc7664a872fece7ac27 SHA512 9205853da42741a5b61a65ac1084aba232a1289aeee924ffc478e1cab80cbb90345254342ab5629da423a51434ea4a92d30a237202184188889fb88feb02b97d
-EBUILD reportlab-3.6.7.ebuild 1291 BLAKE2B 374edfecdf5d1a23eb6f3ef306599774540dce2d3edc218ebe2d5938261685198ca2997d67e9de515104f78c2d5b6d116a9cfead77df1a4208bb25f9f4cf608b SHA512 aed4856070f053ee91e93ac5cbc049f86655150a9f0acc6844146975e0fbafb02d84650d0075b0aafa8e96482a0bc345084cd9d62fde79ed03604fc170d03855
+EBUILD reportlab-3.6.7.ebuild 1284 BLAKE2B 683ec85fd62b21c3c733e6717ae8fbea631bd0e43034b0f8783d01ee25fd232ba822bd69a41b6396612df5f197d562b95890cda3a885dcc7664a872fece7ac27 SHA512 9205853da42741a5b61a65ac1084aba232a1289aeee924ffc478e1cab80cbb90345254342ab5629da423a51434ea4a92d30a237202184188889fb88feb02b97d
 EBUILD reportlab-3.6.8.ebuild 1294 BLAKE2B 4f05f621cebd0f1bf5c81731b305f6c95223ace2e0f41f5202780b12137f9bfcef709b40d16fd3f3893da4a2bed0daa6826b3968d48f64852cee6deedaf29eef SHA512 38aef3cc5db138fb2356a5752e8b8c50a85964c368c211efc12c6e9b989d43d06bd8d59d05e4a7ed43c0f5711c985973010275d65e35659ead775dfadc0b8d29
+EBUILD reportlab-3.6.9.ebuild 1243 BLAKE2B 6e86a759beaf3f131cb101aaa1a4692596b960b4282d7333f4d054f8b0220ef0ca85c015e4352898eaf80126782eec4030beae4f2e3bf7fe98806528053f889e SHA512 03fd9ae9510266ebe02d98233558601d43d0c9eaa153806b306b250e094e4b121bf5d9ae6142b77c421ceb740151510218c427c14dfdb19b7c11dc1939470eb3
 MISC metadata.xml 1974 BLAKE2B bfccbbc451ae8cc0a7eae60e9b6134e01a8eb9be40506c51b2b8fc23845daaf4bf6e0c97d854b5e58f1ede8ee32a97280f526949e772e06288f0a237bd32baf6 SHA512 0c46c2bb1021b7b098446fb4005b524104f3a28e0a8a497c0f60e3f89668e9198eb57be2d2b01aef36896a519244ba32ebd1a63f3840161390fc901dac6d9daf
diff --git a/dev-python/reportlab/files/reportlab-3.6.9-paths.patch b/dev-python/reportlab/files/reportlab-3.6.9-paths.patch
new file mode 100644
index 000000000000..e5ed7c43478d
--- /dev/null
+++ b/dev-python/reportlab/files/reportlab-3.6.9-paths.patch
@@ -0,0 +1,21 @@
+Disable broken logic for finding freetype2 that hits symlink loops.
+
+diff -dupr reportlab-3.6.9.orig/setup.py reportlab-3.6.9/setup.py
+--- reportlab-3.6.9.orig/setup.py	2022-03-28 10:13:33.892516135 +0200
++++ reportlab-3.6.9/setup.py	2022-03-28 10:49:11.048573739 +0200
+@@ -737,13 +737,10 @@ def main():
+             else:
+                 FT_LIB=FT_LIB_DIR=FT_INC_DIR=FT_MACROS=[]
+         else:
+-            ftv, I, L = inc_lib_dirs('freetype')
+             FT_LIB=['freetype']
+-            FT_LIB_DIR=L
+-            FT_INC_DIR=I
++            FT_LIB_DIR=[]
++            FT_INC_DIR=['/usr/include/freetype2']
+             FT_MACROS = [('RENDERPM_FT',None)]
+-            infoline('installing with freetype version %s' % ftv)
+-            infoline('FT_LIB_DIR=%r FT_INC_DIR=%r' % (FT_LIB_DIR,FT_INC_DIR))
+         if not FT_LIB:
+             infoline('# installing without freetype no ttf, sorry!')
+             infoline('# You need to install a static library version of the freetype2 software')
diff --git a/dev-python/reportlab/reportlab-3.6.7.ebuild b/dev-python/reportlab/reportlab-3.6.7.ebuild
index ad9b82a2e744..39cae44658d1 100644
--- a/dev-python/reportlab/reportlab-3.6.7.ebuild
+++ b/dev-python/reportlab/reportlab-3.6.7.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 
 DEPEND="
 	media-libs/freetype
diff --git a/dev-python/reportlab/reportlab-3.6.9.ebuild b/dev-python/reportlab/reportlab-3.6.9.ebuild
new file mode 100644
index 000000000000..a78215c6e3bf
--- /dev/null
+++ b/dev-python/reportlab/reportlab-3.6.9.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+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
+"
+
+PATCHES=(
+	"${FILESDIR}"/reportlab-3.6.9-paths.patch
+)
+
+distutils_enable_sphinx docs/source
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	cd ${P}/src/reportlab/fonts || die
+	unpack pfbfer-20070710.zip
+}
+
+src_configure() {
+	cat > local-setup.cfg <<-EOF || die
+		[OPTIONS]
+		no-download-t1-files = 1
+		use-system-libart = 1
+	EOF
+}
+
+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-credssp/Manifest b/dev-python/requests-credssp/Manifest
index 6c1578255bd3..17711acd3335 100644
--- a/dev-python/requests-credssp/Manifest
+++ b/dev-python/requests-credssp/Manifest
@@ -1,7 +1,3 @@
-DIST requests-credssp-1.3.0.tar.gz 23666 BLAKE2B 3ab7db4c06a65483b26012b282a85174a50c9e9449fc33b90a22f7963bcd33c2b4642ce83f0632383e8c1fbc8dd4761fc00bc6d1adccb5cee020f0d67971f225 SHA512 6281ecd5d7e14792bd175603dfbb95237b990d5cad6e4c7252fd503b76c579590217194ecd3eb3120cb33cc4f2958be459e63fa3fa8d7411a8aa40d1666276b7
-DIST requests-credssp-1.3.1.tar.gz 23672 BLAKE2B e1c0134c02c3779301a8a8a803a6cc500779e9bfc319d3fa3f53bf5b8f5ce9f2624b5961d7586b205f3c1b005305d15b909ae05387a8af7448012ebe3f45bfbe SHA512 ff051b63705fca755a65202b930f622b6a3037455d43bdd2d1bb8726ed4a3a47f76b2d73c005d75d39f7c21048ac91a06abfdd5e88c014ea686a966d37535657
 DIST requests-credssp-2.0.0.tar.gz 15225 BLAKE2B 3cd2a6bafcef5803d89ab13c42385709308998187eda514a598d262ab5e8c94bc3c0e9b9bf3756de1454d570012863a01f650b4fc6e3a17fb2845d8e52f0bf3b SHA512 d11a76bc9577f3054e5955aad513ee27ff2cf3a70414a1d4a81e721a7b40510d45fa33abc5957724ead6c04958a009153f670e154f38f32f2331cc14dd44ee27
-EBUILD requests-credssp-1.3.0.ebuild 744 BLAKE2B 0ce38948b565871f92c528b2b597e798c268818af981e9430c494fa97444050f1bc79508123c8085c168c7baa04a9f6d0e376ae27418f5ed4dffe72761cf4610 SHA512 552f3f01c49c9b72c5e4c60f1c27929983c446a34242fb0fc59e4bcc69176904cb1d158d49181f13b8689e0562a89323f26f201f0a62da11e3aec145c85c38b2
-EBUILD requests-credssp-1.3.1.ebuild 848 BLAKE2B e27e526b9ddea0cb23e2da635a3d56f662657edef4dd2790e4a44c29130ce9b0a98cd0ed77490f1bcda942490b5f336a8f1edfd0faee4cbc6bd34cf3cc6b4ea8 SHA512 91c4b34664868380d5cd928fc85b745a303325c04a85b527bfef7da91913425cc9c2a93b3378ed176c8ba838a76a74bbeadcb93c4750f6de451e8b7a9a97a5ed
 EBUILD requests-credssp-2.0.0.ebuild 762 BLAKE2B 55d67aee98dd7c0976a8914056dd1decbb7e340c55e0a44f57714b25916ed6ada29bb73e287a9c6cb59183f17124dfe7d4a1efee16d3b485a9ad8603ff4fc0df SHA512 39e6b8adf49c12a0df6fff543dbf6ca8e169a6248449b5521311669a857c67d9816a48dce7b87e4ec96a13ae08fa9fda52967e1072a8af5e32acff9a7a91acd2
 MISC metadata.xml 516 BLAKE2B 23322b5685c76f093b1569624640bfaffda45012b99b24e988f938f3ee7099257e91b9bd86efdd294e5cb6b2ccd5135a109496ba3978cc691faa4a194c07b69b SHA512 fc4361579097ac7192abc556577cbecf45eec46c06537077eff9c97f7a65e66a7cb57c9d4668d95ceb15b354333b86048f45661a2b91c6fcc9464b9ffad6b938
diff --git a/dev-python/requests-credssp/requests-credssp-1.3.0.ebuild b/dev-python/requests-credssp/requests-credssp-1.3.0.ebuild
deleted file mode 100644
index 73883daf58cb..000000000000
--- a/dev-python/requests-credssp/requests-credssp-1.3.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="HTTPS CredSSP authentication with the requests library"
-HOMEPAGE="https://pypi.org/project/requests-credssp/ https://github.com/jborean93/requests-credssp"
-SRC_URI="https://github.com/jborean93/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv"
-
-RDEPEND="dev-python/cryptography[${PYTHON_USEDEP}]
-	>=dev-python/pyasn1-0.3.1[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}]
-	dev-python/pyspnego[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.0.0[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
diff --git a/dev-python/requests-credssp/requests-credssp-1.3.1.ebuild b/dev-python/requests-credssp/requests-credssp-1.3.1.ebuild
deleted file mode 100644
index e0a776837c10..000000000000
--- a/dev-python/requests-credssp/requests-credssp-1.3.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="HTTPS CredSSP authentication with the requests library"
-HOMEPAGE="https://pypi.org/project/requests-credssp/ https://github.com/jborean93/requests-credssp"
-SRC_URI="https://github.com/jborean93/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv"
-
-RDEPEND="dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/gssapi[${PYTHON_USEDEP}]
-	dev-python/krb5[${PYTHON_USEDEP}]
-	>=dev-python/pyasn1-0.3.1[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}]
-	dev-python/pyspnego[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.0.0[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
diff --git a/dev-python/requests-futures/Manifest b/dev-python/requests-futures/Manifest
index 814929210c36..a8f43692524e 100644
--- a/dev-python/requests-futures/Manifest
+++ b/dev-python/requests-futures/Manifest
@@ -1,3 +1,3 @@
 DIST requests-futures-1.0.0.tar.gz 10897 BLAKE2B deccf99ffecf3dd04eaaa7692b93b046b027109346555ca9b4172f29600615fb78bd46528c2ae925587d06f24e5b52dc2f02f5d5da04eda18cd97037e1b28440 SHA512 64b39ed99712df8f1be74b2de97500d89711c0d5d3ba0f2b64e3bab755d0bf82029d7ced13b755ce12a2b86f3b673305b651ba6ff4cfb60aed40c8d5876f202c
-EBUILD requests-futures-1.0.0.ebuild 967 BLAKE2B d0be961f4c7942c3604b888fc5498bb7a84782b3f64d1abd132bfdf54afad7ce43a2eec5baebae39835873a4ceef3b5f1144e2f0f45aa53f1723f31728b13cc5 SHA512 0c8b2f7a4ae34a72237395bfd0676400a93ad374a50808000b3e9643b976981356a6ca56fb2d5fa121249d8f644acfa1c18e5085dd00b905e525ea3da692e733
+EBUILD requests-futures-1.0.0.ebuild 966 BLAKE2B 3fb624452834017f69502431ddd9385c9f3185fb334ab738615126fda5fa394957b07df574a8479c1d6f14c08dab22a4032a3b0a05a22ed4bc6e6170b5eefc96 SHA512 e4a56f1c76334d4bb959218cdb0b4867ce573dcf7cee4befea48e014946b4d3474f03f6b5c8583e4ec03ba56da3987ec9b57388324061cea68fe582173881932
 MISC metadata.xml 562 BLAKE2B 116ce554daf71a47d20efa98708554d50185eca1272c26556666152459feb42ef8187fb74da72a5b365f360ea397ed1056b932e9339ca4c3fdb82b2f12983278 SHA512 fc998b8ee8cf4a4d01b02db9890632eb793c8f3ffa021c3eb2466e1ec221c5d36aa5875804989c6ec0897ed243019673e0b185a371d728a86d2d5238fdcaa25f
diff --git a/dev-python/requests-futures/requests-futures-1.0.0.ebuild b/dev-python/requests-futures/requests-futures-1.0.0.ebuild
index fb52803aeb04..bf53eea21a67 100644
--- a/dev-python/requests-futures/requests-futures-1.0.0.ebuild
+++ b/dev-python/requests-futures/requests-futures-1.0.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 ~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"
 RESTRICT="test"
 PROPERTIES="test_network"
 
diff --git a/dev-python/requests-kerberos/Manifest b/dev-python/requests-kerberos/Manifest
index 1ae4903f5fd7..6ca461f742fd 100644
--- a/dev-python/requests-kerberos/Manifest
+++ b/dev-python/requests-kerberos/Manifest
@@ -1,4 +1,3 @@
 DIST requests-kerberos-0.14.0.tar.gz 21275 BLAKE2B d64c92bf70df07a8dd38626a6699ecb95aaf82b6aa93797eefa80af2b9760f5b064e0aa3a3bca5242ef73ce1efc4b6ef0ef1bb1802c7c59a20b6655bd3894aae SHA512 9dd6eed0d6afe4b852ba96f621be3af2965e9011bf372c5dce77e0bca18191255ea407ba313904271615d722d60029807db2d6815b24437b021b02b026eb60d6
-EBUILD requests-kerberos-0.14.0-r1.ebuild 780 BLAKE2B 41e4769a08e6d3dc633c61e3f096edb93d77a7661aeae5fd1f68c881a57066471fb7fb4ec91d2a46d66fb669831a857d7949f66f5878bb7317c7b8299b85896f SHA512 32c96c726f413fd1f863ddbbb97db63756ce856b7631076d99476dc78d9d194b207434fb5de4fdaad947e5a52da3be73ea7b5e670ba250d722269c5801e2d5a9
-EBUILD requests-kerberos-0.14.0.ebuild 744 BLAKE2B 6f521ba4fe9b4ac6d324f9aa31fd5f7d11e9eebb838ea91dcc79b3970451104986576c87f175364b1a2eb8154dd649feb2090be3637f65af5a683fc8a2bb8b42 SHA512 4bda6aadc15477c1f65df5bfa1f4ab6d5cfdb1d26f0953b7019a093174a205413d06c860c5afe3b5b0434e988b0c6b74e1343b69f4bb208fffb05dec07fea060
+EBUILD requests-kerberos-0.14.0-r1.ebuild 777 BLAKE2B ceb7d7249dd99be0bd10a30cdaa1aefe8612bf55605c189e76be2c5708ea55dc0b91180b14b940fccf09d49a8e7a8e7886a5a14af9d4f53add18e0a9eeaec764 SHA512 d7cb3ad990cc42f4057d4d868ddf1ebc90aa5b1078e7e0c9c7fe7f9d076e0c8f03db4b62086c5339f89ec54acbd0ddf4b3d68edd346173a7a3c474ad3adeba5a
 MISC metadata.xml 411 BLAKE2B 06c28d67859801b83b28b32e12abeac09bb3a3d0ed02546ae211b8b8a3ac5a6b464ef3d5d6e6e5f6bac20d9201adc4e543ae02b701a374c50f8e475b7472e240 SHA512 656422babdd89a9afe5c96344c625ea5a5f0e541972636366176f77e39623773907dd0de9bbd53ed664b63bd3215ab40780e6010ea8f1febb73640920a800aba
diff --git a/dev-python/requests-kerberos/requests-kerberos-0.14.0-r1.ebuild b/dev-python/requests-kerberos/requests-kerberos-0.14.0-r1.ebuild
index 61a177448944..14f7c689de73 100644
--- a/dev-python/requests-kerberos/requests-kerberos-0.14.0-r1.ebuild
+++ b/dev-python/requests-kerberos/requests-kerberos-0.14.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/requests/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 
 RDEPEND="
 	dev-python/cryptography[${PYTHON_USEDEP}]
diff --git a/dev-python/requests-kerberos/requests-kerberos-0.14.0.ebuild b/dev-python/requests-kerberos/requests-kerberos-0.14.0.ebuild
deleted file mode 100644
index a1396938fd1b..000000000000
--- a/dev-python/requests-kerberos/requests-kerberos-0.14.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-HOMEPAGE="https://github.com/requests/requests-kerberos/"
-DESCRIPTION="A Kerberos authentication handler for python-requests"
-SRC_URI="https://github.com/requests/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
-
-RDEPEND="
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	>=dev-python/requests-1.1.0[${PYTHON_USEDEP}]
-	dev-python/pyspnego[${PYTHON_USEDEP}]
-	dev-python/gssapi[${PYTHON_USEDEP}]
-	dev-python/krb5[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/requests-ntlm/Manifest b/dev-python/requests-ntlm/Manifest
index ce2310ddcbd2..a0559b1ee1c4 100644
--- a/dev-python/requests-ntlm/Manifest
+++ b/dev-python/requests-ntlm/Manifest
@@ -1,3 +1,3 @@
 DIST requests_ntlm-1.1.0.tar.gz 5183 BLAKE2B 190a75d3f82ae2216e05295f855aa072f98908ef8a0d4dda68d6e39239655ccf175c707af137290cd78cf622c0a3d1741a0afbb1363f8b170f408c34a2682fa6 SHA512 9a74ecd6e4ed5c5e4381d2ee3fb9ff233352b49baa5fae4e0ecc30aaad12fc7a5c1b9dd936f35d4a3815ae7f6ec5bb8581e84128d63ff0e961181408daddb807
-EBUILD requests-ntlm-1.1.0-r1.ebuild 567 BLAKE2B 9965d550f7807b03bffd9187f80487ed04db64f3ae5a41d68d1e90990e5a16cb7559e7ec993ee9647c6d8b9f1f42715ca5863dccaca717de1d58d793ce96d104 SHA512 b2ac448540d33430c1713b49643068408c95668b4e9e8af277eed02bceecf27bd8d25783571bd8a1ef2314f74c66b36f981353bae907e235efff0888259f62c2
+EBUILD requests-ntlm-1.1.0-r1.ebuild 574 BLAKE2B 26010a489ca55ca9cb4afb61d29f6463b036435bb2d766389e2ecca0b8c33fb3d685dc7f93f50c083a0110bcd3ab4b150d4592fdf80fdc82a45d48ac862a4a87 SHA512 57575e91ed6c1e46095b12e602319ed177d423bd5772c358d1c182c9dceaf1b3b5c50d14281170145e1d7d6438ccc29e2ffc5f956283a51b3d11a167e0323c12
 MISC metadata.xml 492 BLAKE2B 231a8ed89e03d2b0c91946207dd30659352b661514b7094ac1a85705d12d7dfc4db9d63de62a0fb4ca901bf4ded8ba9046fada0daf8e8d134645a4330f911dd2 SHA512 ba72fd707b3b3dc5c65677a0d2fbb0f2e66cdb8bdcdce1a75e8565341fd3afb716a05034a0cffef2d4be78b6ffb5ae2184d7b1a129d3abea6b563f6f28e39e2f
diff --git a/dev-python/requests-ntlm/requests-ntlm-1.1.0-r1.ebuild b/dev-python/requests-ntlm/requests-ntlm-1.1.0-r1.ebuild
index 0e6022f76976..3a7860f9a482 100644
--- a/dev-python/requests-ntlm/requests-ntlm-1.1.0-r1.ebuild
+++ b/dev-python/requests-ntlm/requests-ntlm-1.1.0-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 SLOT="0"
 LICENSE="ISC"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-python/restructuredtext-lint/Manifest b/dev-python/restructuredtext-lint/Manifest
index e4cf6c16b0ae..d38789c195a9 100644
--- a/dev-python/restructuredtext-lint/Manifest
+++ b/dev-python/restructuredtext-lint/Manifest
@@ -1,5 +1,3 @@
-DIST restructuredtext_lint-1.3.0.tar.gz 19008 BLAKE2B 45d4a0d02691dbd0f46e57cf637c7b61f6cd93daa5f98a6795b119555913d6dcec7035857ae6a3f73b777d02e7662c2775fa288f3ad7b7ecc3d26c961595f203 SHA512 983f38e51943cb7fd6a36181f99cd9c24c40deaf932ea8f69ae6568255a1ca8800aecd753067304ea596cd84bee4fdd5d96e935e06bf602613c57ad24113520d
 DIST restructuredtext_lint-1.4.0.tar.gz 16723 BLAKE2B 2beaa565391fd1a130f8ef998b140e0ebb4695759a61c0526f066e71c3bd42e981115f267c48d30e19eb45c240907ea71d9f49a03d74e9ce1d4b80a2c0b511c9 SHA512 8e16e2a43cb1e52bb3b4ac60da53130bd4a8d0b823fc95b32e62068bed95728084de3b55820cfcaba70eecaaa93bdf3f956b8bb6c55155115b40c7151ef58a2c
-EBUILD restructuredtext-lint-1.3.0.ebuild 634 BLAKE2B 1a79e4e00b9c3fd7af435b136f01dd845830c25af25d81c1de964f38980284a1b93947c655d1bad2c3130490f67527a26c46327601f36db4074ecb6653c3649a SHA512 00ae4be9908f32010162c73679b1127c7636d16dfd3815fc6ecd5c6a56afb3f7ad9eb0a9d03a995be0199558660c451fef0f76fd8a187bd494af551b26ea7b59
-EBUILD restructuredtext-lint-1.4.0.ebuild 613 BLAKE2B 2516c00e11e7a0367f50daa928b102f1f70be04c75ce6794f8b798e5835898347b31cb6a09b2cf8d99779555ad2082488b5461bd2e63c4c021bf153635255c80 SHA512 7b22e039262209706f8b8e9fffd262e0b5e9a8ca542a5f687e87a4ac3365313fe6386c2e37c47969fea9ef2caecd87cd419d80c1a0085c345b6e6c2bbfe5dd79
+EBUILD restructuredtext-lint-1.4.0.ebuild 610 BLAKE2B 5c6a736fb2ef184fb2d8b55122cc6bf768117ea689445f59fc0236507e64b638e133598ed4ca9781b82cac807673aad0b6b69a7f34a98b6b7524187cc25cdd94 SHA512 39422db38b573904a85f3b62cb1924307652de63a29c8b48531f82ef8dec2e3f7b3af351c7b8d169560e4fd43944be85ac20d5065eacb0b51595d9a63fbf77ee
 MISC metadata.xml 464 BLAKE2B 25d6d2cbc0a5fa141d5102f0065fd2a1edb3027d75b93cbd421dc732b24c350ca04c4286abf324ce8bb86af9b48e1805cd737b8987852661942043749b818dd6 SHA512 71919795b1be966904361cf818dc689bfec9db3c48b03d30a8b13817fc3dbe0ada1b898c34bd5fb1859018f079f9cd3ca35a478ca0390d51a3da2baae703c337
diff --git a/dev-python/restructuredtext-lint/restructuredtext-lint-1.3.0.ebuild b/dev-python/restructuredtext-lint/restructuredtext-lint-1.3.0.ebuild
deleted file mode 100644
index d71a4addd03d..000000000000
--- a/dev-python/restructuredtext-lint/restructuredtext-lint-1.3.0.ebuild
+++ /dev/null
@@ -1,28 +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="${P/-/_}"
-DESCRIPTION="Checks PyPI validity of reStructuredText"
-HOMEPAGE="https://pypi.org/project/restructuredtext_lint/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN/-/_}/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Unlicense"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
-
-BDEPEND="
-	test? (
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	>=dev-python/docutils-0.11[${PYTHON_USEDEP}]
-	<dev-python/docutils-1.0[${PYTHON_USEDEP}]"
-
-distutils_enable_tests nose
diff --git a/dev-python/restructuredtext-lint/restructuredtext-lint-1.4.0.ebuild b/dev-python/restructuredtext-lint/restructuredtext-lint-1.4.0.ebuild
index cc280168548d..1c41fb8575ef 100644
--- a/dev-python/restructuredtext-lint/restructuredtext-lint-1.4.0.ebuild
+++ b/dev-python/restructuredtext-lint/restructuredtext-lint-1.4.0.ebuild
@@ -16,7 +16,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Unlicense"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 
 RDEPEND="
 	>=dev-python/docutils-0.11[${PYTHON_USEDEP}]
diff --git a/dev-python/rich/Manifest b/dev-python/rich/Manifest
index de955ff02d4d..8d91cfe38202 100644
--- a/dev-python/rich/Manifest
+++ b/dev-python/rich/Manifest
@@ -2,7 +2,11 @@ AUX rich-11.1.0-pypy3.patch 2986 BLAKE2B 29f1c880febeb774666f27ebd333f0ee93eb880
 DIST rich-11.2.0.gh.tar.gz 16300346 BLAKE2B 520f512a7e26613a4cc881834f8c150963b84a6dc3a43029dde6d64d1e405d82422b9c6f0098293b6f9bdb55749c7929426dad14840c9a287889c1a6a70f6bf2 SHA512 ec1178a6a320a48f589ead5163e974725f79ae63ddf9a2deb66400e43619ade8d366dbef6b524e66e603647a957b8e26266845a0bcb85912fd9ad2a81dd92f5e
 DIST rich-12.0.0.gh.tar.gz 14727980 BLAKE2B b9f7761ab1084765f804fd22f9fb18e659f91b917bb452217752683f6d61320d2703eee28de3be3bd70009fc06d04165528393c4c0ec32a49b1dc7e94989a224 SHA512 4e47e48709180ef844bcf1cd516b22de8a4f22c5121ca0582a2cff7297d97afe63232926d518cd2bf4d6d1a7cea362ab12e71eedacce6b6d378ef1a1528d9e4c
 DIST rich-12.0.1.gh.tar.gz 14857207 BLAKE2B 8e6419904ef0ba91d4b15059630f63769a28323600cb212f07c2a239201489e2078b8c4c792f486bde75efd9d09afe832fa2e2235ac91433ee24b33fcda02e68 SHA512 61077663b46a7e615b29df3b75b15ef97979c804abd283cc26f217ee8128b74a514fd7b92831d1d8928f768d2ec8230d8cd1da733106b424704a3187ee18ce95
+DIST rich-12.1.0.gh.tar.gz 14883003 BLAKE2B f11642b5a90934e95dd7d71707617c8a3a1680644dafa9535f86ed5648f14389cddd968c329d4d94649c15123dd00045e0e9e7bb3314be3e6bbc72ba67c100e1 SHA512 6144af9b8843592d586e1c54d5bd97b6974a2510746319c7c0e961f04515ab837088bde2d0876e1a3d33eff40f4dfd8babc3c3f8123f6a4472b7a3eca580d131
+DIST rich-12.2.0.gh.tar.gz 14884722 BLAKE2B fb3720724d2441cddd85ac22249aa232bd31f664019f9eb02e10fda913b98c0220a4fadff47fc0f6884ff77b7ee9f98a96e036fb76d0492e0c040d752a9e9c79 SHA512 8f8108557ca21e41b35c03242d203c229f7af0d7abf5b394fc894e71ae098bbc14e046b166e5452d7a9f9d7d6e8cc0e13784d64cd721d2f7acec9f624d14db77
 EBUILD rich-11.2.0.ebuild 1125 BLAKE2B e26b876bc97c0844fb95f221eb0a82f7b59a18d633c4514a376dbc0bda68aa7cd4a0aaf61011f22bc2945b4292e4dff65a5a7c55607f569d120aadaed079fee2 SHA512 2745e1b93ce8024596923269e0263427c149a654b3082ba6df45e59fee1bd11734d3ef0f85011acb8e427106a5f84dbe4bf0944ca5f40013f6e32427a334b927
 EBUILD rich-12.0.0.ebuild 1081 BLAKE2B 20aa21c4eaeb5e2b9b7c7fe701743a00e2d2f7811b657b89b07c021624df6738bdb6c2eb1c9c3da2827524c7e7e77dd7fdc423d8eac93eb9e80bdcd6d375fb8b SHA512 d26e8692de7610fee7751c6d2620ee442dbb3a00e73d39aff1df1bc5a01f2424cd5640e72d32f87576a869ba60cb71298dc20cc27bdf598175b8c5cb61ab6a99
 EBUILD rich-12.0.1.ebuild 1081 BLAKE2B 20aa21c4eaeb5e2b9b7c7fe701743a00e2d2f7811b657b89b07c021624df6738bdb6c2eb1c9c3da2827524c7e7e77dd7fdc423d8eac93eb9e80bdcd6d375fb8b SHA512 d26e8692de7610fee7751c6d2620ee442dbb3a00e73d39aff1df1bc5a01f2424cd5640e72d32f87576a869ba60cb71298dc20cc27bdf598175b8c5cb61ab6a99
+EBUILD rich-12.1.0.ebuild 929 BLAKE2B cb244334040e91a1b6e1cf367294422a19343e796d8f41c487b6e4c2bc8adda2090537d091425181499cc0d8e71799f48d8c9934b41ce70e71b349e4ff51763f SHA512 6b4ea7312d7c9b431c06b64400478ae4231584255fef4af4ffb926ef8d3ae5e94ea9f24365a4716fe037d58e07d38956576decb98746390831a4decf398d0cc0
+EBUILD rich-12.2.0.ebuild 929 BLAKE2B cb244334040e91a1b6e1cf367294422a19343e796d8f41c487b6e4c2bc8adda2090537d091425181499cc0d8e71799f48d8c9934b41ce70e71b349e4ff51763f SHA512 6b4ea7312d7c9b431c06b64400478ae4231584255fef4af4ffb926ef8d3ae5e94ea9f24365a4716fe037d58e07d38956576decb98746390831a4decf398d0cc0
 MISC metadata.xml 387 BLAKE2B 049491e034ba233f33c76dc5e3f1b887ba5d2da9d65b09bda51a7cf4eb30a9c66f3ddf714f52407a73e51da78523084064bccd4fc687e0bc0fc2b32dbb4c513b SHA512 448ce879331748e3166f670981a27ee5c3ef20b51af442ccc684cb6514c0d6a0d4e433a8bc1ddb3bdf68c734bac013c1ba04d38adf90644b062231ab1c1d2c0b
diff --git a/dev-python/rich/rich-12.1.0.ebuild b/dev-python/rich/rich-12.1.0.ebuild
new file mode 100644
index 000000000000..4cbcc9174b3c
--- /dev/null
+++ b/dev-python/rich/rich-12.1.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Python library for renrering rich text, tables, etc. to the terminal"
+HOMEPAGE="https://github.com/Textualize/rich"
+SRC_URI="
+	https://github.com/Textualize/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/commonmark[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	' 3.8)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local -x COLUMNS=80
+	epytest -p no:pytest-qt
+}
+
+pkg_postinst() {
+	optfeature "integration with HTML widgets for Jupyter" dev-python/ipywidgets
+}
diff --git a/dev-python/rich/rich-12.2.0.ebuild b/dev-python/rich/rich-12.2.0.ebuild
new file mode 100644
index 000000000000..4cbcc9174b3c
--- /dev/null
+++ b/dev-python/rich/rich-12.2.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Python library for renrering rich text, tables, etc. to the terminal"
+HOMEPAGE="https://github.com/Textualize/rich"
+SRC_URI="
+	https://github.com/Textualize/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/commonmark[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	' 3.8)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local -x COLUMNS=80
+	epytest -p no:pytest-qt
+}
+
+pkg_postinst() {
+	optfeature "integration with HTML widgets for Jupyter" dev-python/ipywidgets
+}
diff --git a/dev-python/rope/Manifest b/dev-python/rope/Manifest
index 840c41f0d8fb..a000b7b23d26 100644
--- a/dev-python/rope/Manifest
+++ b/dev-python/rope/Manifest
@@ -1,6 +1,3 @@
-DIST rope-0.22.0.tar.gz 260138 BLAKE2B 11aff47af50225d66ade44a63a2c747bc11f0adcec1abed2dff71466f088f1460b3eec541db326af545f89907eb9d4f518c24ec8a445ca07b3116573883123ec SHA512 ead82eba834890d90a6972cc432d153b977a123588621712b50decf1f1bfff03cd411e3615dff63a5272cf4a46b32791ea625f30e3dfdf9d1969081a99544396
 DIST rope-0.23.0.tar.gz 260990 BLAKE2B 34064f45f72d6c9c5613eb5d9480dde25aeb5426ab3ea9b56e7ba5e4da1d9930735bd87757e3e885d4504ddcb24b23aa96b0d5be7c23ca4969201aedbaa3aa24 SHA512 1ab0a36c792fdc4d0fd1e554deec0fb6d1e877d91164fb8ee2e5f99240087f8a8d4608d1975be100bca87be0321d672b91579cf36795acffc742aa021cdf5e1b
-EBUILD rope-0.22.0-r1.ebuild 902 BLAKE2B db31a48188488d8a7cfe99cecaef0a7913bb789e42d15cb8bea78085793d31a527a2b0f7af9a8eb9e0467cda75e957de0b240801bd6f8ec2d912149d43f8be5b SHA512 12f87e02cf408a0cae13a0a3fe2c8d048325887687564382478e9c9bb9c92efac76053ec4ede891e8528044313bf02b611dc15c5da5e822ba91c5e76990840e0
-EBUILD rope-0.22.0.ebuild 990 BLAKE2B a74b53e9e04cc39d8d846c41412a1ddf72f7650687aca675dcae1df48330ac7bfe7bdefd212c8a2621565052eb256e687501a692d505c78f369f419b88d90e88 SHA512 958473927b7a9426efa2a3360fb7d6c0418416fc45478ce153ed21c0b8e3f24ac206664027af558bcc1b7b4fdb21b64396863a05775e71311fdc30512ddbe96a
-EBUILD rope-0.23.0.ebuild 902 BLAKE2B db31a48188488d8a7cfe99cecaef0a7913bb789e42d15cb8bea78085793d31a527a2b0f7af9a8eb9e0467cda75e957de0b240801bd6f8ec2d912149d43f8be5b SHA512 12f87e02cf408a0cae13a0a3fe2c8d048325887687564382478e9c9bb9c92efac76053ec4ede891e8528044313bf02b611dc15c5da5e822ba91c5e76990840e0
+EBUILD rope-0.23.0.ebuild 900 BLAKE2B 63c7cad00245d18aff4aa980e5b08d8274347945a9dc3309edbe9c2c10946bf3a759ba59d2767f72f7877294c0dec8a3ef1a1d62cd4c2ae4e882a714e8a270f0 SHA512 668782c00200534bcfbf52338c812034824eaea0ff6c55c7dc123a3a85a68980de65f011b8a5ae9c4ff1f3b0f8479ac987d129d29b07e53d0e0e803c273f57b7
 MISC metadata.xml 452 BLAKE2B 6bee424d801bad8728f10ec3a1618e3a48776a7b0af2a04efafd07e6ae5ac8e0b88253ebc35e457c791e820f8c3b1dabde73aabbfd3636cac5e169e8aca75aa7 SHA512 4f88e1157e4838f321b6f208ba6b89fbf2b7a72ea6e038cdd6cf3e9e211c2788dda137e3adf76072c1d52026c554750193d9938054670dd995a91db24ea8da76
diff --git a/dev-python/rope/rope-0.22.0-r1.ebuild b/dev-python/rope/rope-0.22.0-r1.ebuild
deleted file mode 100644
index f461efcc5f5f..000000000000
--- a/dev-python/rope/rope-0.22.0-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python refactoring library"
-HOMEPAGE="https://github.com/python-rope/rope"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc"
-
-BDEPEND="
-	doc? ( dev-python/docutils[${PYTHON_USEDEP}] )
-	test? ( dev-python/pytest-timeout[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_tests pytest
-
-python_compile_all() {
-	if use doc; then
-		pushd docs > /dev/null || die
-		mkdir build || die
-		local i
-		for i in ./*.rst; do
-			rst2html.py $i > ./build/${i/rst/html} || die
-		done
-		popd > /dev/null || die
-	fi
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/build/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/rope/rope-0.22.0.ebuild b/dev-python/rope/rope-0.22.0.ebuild
deleted file mode 100644
index 942d69b834a9..000000000000
--- a/dev-python/rope/rope-0.22.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Python refactoring library"
-HOMEPAGE="https://github.com/python-rope/rope"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc"
-
-# Dependency for docbuild documentation which is not noted in
-# setup.py, using standard docutils builds docs successfully.
-BDEPEND="
-	doc? ( dev-python/docutils[${PYTHON_USEDEP}] )
-	test? ( dev-python/pytest-timeout[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests pytest
-
-python_compile_all() {
-	if use doc; then
-		pushd docs > /dev/null || die
-		mkdir build || die
-		local i
-		for i in ./*.rst; do
-			rst2html.py $i > ./build/${i/rst/html} || die
-		done
-		popd > /dev/null || die
-	fi
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/build/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/rope/rope-0.23.0.ebuild b/dev-python/rope/rope-0.23.0.ebuild
index f461efcc5f5f..b78327bdeb9f 100644
--- a/dev-python/rope/rope-0.23.0.ebuild
+++ b/dev-python/rope/rope-0.23.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 BDEPEND="
diff --git a/dev-python/rpyc/Manifest b/dev-python/rpyc/Manifest
index 2e8162722337..b1baa8b4ef6e 100644
--- a/dev-python/rpyc/Manifest
+++ b/dev-python/rpyc/Manifest
@@ -1,3 +1,5 @@
 DIST rpyc-5.0.1.tar.gz 1258657 BLAKE2B 84d0bee67004928c26a1765a26267e3e8eb5dc09a8fd53c1d75ca691cf313a7563398626b7e89a8893415294721623206204784da01444708edb56aec8101719 SHA512 57b0d6b2dba33c7f6c9d204b4deae8ab08ed56e5799aa2c7ae4bcb8ab98486055090e3079d8b0d615fcd517111a6e02893dff85607aaca5497ae76429abe3148
+DIST rpyc-5.1.0.tar.gz 1260651 BLAKE2B 4be17e5de4b0475cd63b99bf20e55e3221149f974b9efec638e0387d71815a5a2e4ea782578152690e019e7b8a4ece17405eed6626578a9c9e379d0f4b589008 SHA512 e9783392f423abca6b488dff5be36dae066980004bd221ca5a1c451f0f9dc7e1daf749650106802f9159de619a8d5e2cd6dc90e9a5f49d16f01bbedd59b504cf
 EBUILD rpyc-5.0.1.ebuild 1641 BLAKE2B 47e8397bba1ad5cfa3a673411f279690f495cf45c3b85d728d21b8f437ee533376d58543835ba89398e505b1686e5e9c3826e80722539021a7c0454947b29ff8 SHA512 73b40edd8bc5683efd9a6ff31fa49fda929bb0171ec91d765166317184bf5a4c124716b04030a816b00ba6fe16c000310f94e4e7c75949ebbcf9f05a887e2220
+EBUILD rpyc-5.1.0.ebuild 1743 BLAKE2B 65a34e082274af61faba254f133dc7c749ab71dcbd27201d299249bbf873e55707e819d5c7954336c958e47654fbdac9ada79b9010c696a3bc1c931f5b456f29 SHA512 13120fdfb51f2b62ee6ff0725739e3e250053fa35220d2e9bb58db62eec6b4a37e6948175272b4a2db30af87a25e4b5392f4cc27ca480f4796cb2def918ff879
 MISC metadata.xml 654 BLAKE2B f84ea5b5fb66c2661bdcbed8566a77c872b6f1b3a6b0cb021269657b21fd414e70edf03f205ee2038d9d83a20e25d32b15760d915b98066aa7fe1a4cfeb3bd16 SHA512 6ea40af97501443c8d4ae783137bb9547c5a4cc3685c01b9d684691d110f67eb43056acfcebcc510c06fc40ff596ad9e3e30cf76cb07807f23250721e93b4954
diff --git a/dev-python/rpyc/rpyc-5.1.0.ebuild b/dev-python/rpyc/rpyc-5.1.0.ebuild
new file mode 100644
index 000000000000..9e44ad9daed5
--- /dev/null
+++ b/dev-python/rpyc/rpyc-5.1.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Remote Python Call (RPyC), a transparent and symmetric RPC library"
+HOMEPAGE="https://rpyc.readthedocs.io/en/latest/
+	https://pypi.org/project/rpyc/
+	https://github.com/tomerfiliba-org/rpyc"
+SRC_URI="https://github.com/tomerfiliba-org/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# USE flags gdb, numpy are used *only* to run tests depending on these packages
+IUSE="test numpy gdb"
+RESTRICT="!test? ( test )"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	numpy? ( dev-python/numpy[${PYTHON_USEDEP}] dev-python/pandas[${PYTHON_USEDEP}] )
+	gdb? ( sys-devel/gdb )"
+
+RDEPEND="dev-python/plumbum[${PYTHON_USEDEP}]
+	dev-python/gevent[${PYTHON_USEDEP}]"
+
+src_prepare() {
+	default
+
+	# Windows specific test
+	rm tests/test_win32pipes.py || die "rm tests/test_win32pipes.py failed"
+
+	# These tests require running sshd
+	rm tests/test_ssh.py tests/test_deploy.py || die "rm test_ssh.py test_deploy.py failed"
+
+	# This test requires internet access
+	rm tests/test_registry.py || die "rm test_registry.py failed"
+
+	# This test fails with NO_CIPHERS_AVAILABLE
+	rm tests/test_ssl.py || die "rm test_ssl.py failed"
+
+	if ! use numpy
+	then rm tests/test_service_pickle.py || die "rm test_service_pickle.py failed"
+	fi
+
+	if ! use gdb
+	then rm tests/test_gdb.py || die "rm test_gdb.py failed"
+	fi
+}
+
+python_test() {
+	# for some reason, when tests are run via pytest or nose, some of them hung
+	pushd tests > /dev/null || die "pushd tests failed"
+	for x in test_*.py
+	do ${PYTHON} ${x} || die "${x} failed"
+	done
+	popd > /dev/null
+}
diff --git a/dev-python/rst-linker/Manifest b/dev-python/rst-linker/Manifest
index f136d62fdd4e..0e155446068b 100644
--- a/dev-python/rst-linker/Manifest
+++ b/dev-python/rst-linker/Manifest
@@ -1,3 +1,5 @@
 DIST rst.linker-2.2.0.tar.gz 14339 BLAKE2B fedeb8deea3ba3dc1f084a08476d2117787dd33c3ff2cd4c7881283e3c3e6813ffc143373812adfb4e578d21034d2c287a5af2b1e3dc9ae2f087cae9364d2ce3 SHA512 3e51103eb5111e1dd6e4e6f8c546a366eeb669d27b050de41a0580ac992117c530c322ed7cf31fd26a2f4a872ce8a7a41e801630e9291a6a644befd7272351a1
+DIST rst.linker-2.3.0.tar.gz 10146 BLAKE2B a2c1a97a8e734644f5124f89878d770d186c16a44d1eaa98281592754e0a8db4be1e019001448890e712b4e4fea3f4a0f0675009d5285ae94483ef8e8d34ae6f SHA512 a4190c3349c85ee52d17498c99c7879be3f0a98cfc0b5966cc2f6161f9b374d52a64be7035691256d96d4c2ebb2272d5d10802e5e716efedf78859e418e561e0
 EBUILD rst-linker-2.2.0-r1.ebuild 796 BLAKE2B 5f58b99b749d02902289e6ecb3e0deca2f46e3d266a09c3f054f1c60ab085c79d12912dc7988d07f2315e47cc748a2f54a4d13508023f9e43a7511caedf1e651 SHA512 8810804adb79d7fec6ff25582c41fa2635a2183be5be4c0c2a6cd2a29f8b0ba58a3139a58854d4048de26af6b2aabc061e17e674017ef004d4174588755d5551
+EBUILD rst-linker-2.3.0.ebuild 770 BLAKE2B 18c38e3a95978639fccfb43c8ecc5b7949ee795aa72c9154db06a9a12039ac6a60ce5e067624b4af0f6b95223e39e63831b7f17aa601734dd9afa3ebf5782f6a SHA512 57547176fc3cb0a29a9dedd3d7877568468448cd41cc8d6645a267c7859cd9e0a4c4a1cff63f39042e1bdbfb7a75a625dc7bd3779e8da95e56c308c127aff346
 MISC metadata.xml 465 BLAKE2B b8b71e857bae63cd24248002a557047895ac4f19937b5854920738c3c3b67a424d7d705cb42f203061d6eae63acdd9d0a3c564fedc6f0f7a22567498c9963dc2 SHA512 bbaef22ff0b07cc50559a1c718e240832ff3640053aff3483f3d5615a864c5a176bf77f6077a7f691390c794949448517ab017c75026fdbc8ffe7f9cebeeaefd
diff --git a/dev-python/rst-linker/rst-linker-2.3.0.ebuild b/dev-python/rst-linker/rst-linker-2.3.0.ebuild
new file mode 100644
index 000000000000..dfa0d9406050
--- /dev/null
+++ b/dev-python/rst-linker/rst-linker-2.3.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
+
+inherit distutils-r1
+
+MY_PN="${PN/-/.}"
+DESCRIPTION="Sphinx plugin to add links and timestamps to the changelog"
+HOMEPAGE="https://github.com/jaraco/rst.linker"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/setuptools_scm-3.4.1[${PYTHON_USEDEP}]
+	test? (
+		dev-python/path-py[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/scipy/Manifest b/dev-python/scipy/Manifest
index 5d37464cb58a..2b689450ba0a 100644
--- a/dev-python/scipy/Manifest
+++ b/dev-python/scipy/Manifest
@@ -5,5 +5,5 @@ DIST scipy-1.8.0.tar.gz 38313602 BLAKE2B 3f071ad3dfa350bba7eaf8e06c8bdb660f9dc1e
 DIST scipy-html-1.7.1.zip 32435246 BLAKE2B fd8173da41aba95a14b1376f848bc668c4659bf1bbbdd0f87d926633d36f29c039957d38be145a5583010ebd83f6458090f75bdad773cc0f1591664e13c04c20 SHA512 ee59722878f6ef2d2319cdf4e6a60d3d1184f7c22752f9a8859eaa46fb677ebac9e8eef9c0826998e12bac9399e336799843341ef203224a82c9101347149672
 DIST scipy-ref-1.7.1.pdf 33542025 BLAKE2B 6c978f06b770805f0fae06db740e8596658d98bbbc93c865127eae909957503bb38e02a9c97319aed07608718f8f373374b1cf3a8c3bd624aa3143f1d21bc428 SHA512 45720dc299594bac5c7539f950a0ff135b125d86bfe9847032cbff1f294601fefd0a1ac3fd7e3928b2702390c318ae2f8adca6403ba06ea1ded705fcff94ab79
 EBUILD scipy-1.7.3.ebuild 5504 BLAKE2B 7ae97cc6ad67b52f498f142c1be014921409c660d4f424157dc520913027eb733bc76e25d63aae15b449dc0ec30319f7be88f3655f5f391f2e6d8eeed9cd936b SHA512 f3e37d183e960b0481522f40998d767d0a86e9068d87c3ab40dc33aeb269bd98981efba5f0494d153f86e28f43c7249edeab8b3a4e497407819e4171d2555fad
-EBUILD scipy-1.8.0.ebuild 5273 BLAKE2B 6f0aa850ef56f9e57b983ec370aae52a5aac85b8e45f3d73c51a4ee1e92446dd9b3ecffed38b8d45ad75790bda15b1e4f42397a59cf10ce081d8e97bcb9befde SHA512 5f064fb4f8373dfb7efd61bcf41dd7bfd6ada5c74fab52ba6ab1c68e0bea4dc75c131a18c7ab7fe698c837c98a80d3992761aad236f9d92f7cc1ebe35f9b4e13
+EBUILD scipy-1.8.0.ebuild 5272 BLAKE2B e51e22dd575cd521406fd3e23c0045f1e7df15edda9bd4492bedecff4ee174c07f72e57259d6a26c92ff9b31d102fbf547d585a681cc70de005eb720dadeab67 SHA512 0609b27065b0a0143878f30f5a9ed00debe15b8590275c77610d4b5bedf92873d07f146c1062b2c785176dd94ece9c0d7548984814bf4e902d64b4a5b7463ea0
 MISC metadata.xml 1127 BLAKE2B 6019c7fe056a0198db927c1b149d5a60bd583a523d749e57c86ad899a880fd83e688e040cb693ec3f34be63cae1e5b785d5f6f7a378b98e992d6cb9368ea1b2c SHA512 f7c45d801c3344b3d8de3fabad26a95814cfdf92b604e8215bfac2cfd1cfb181cc8a9a9fa46c0b95c7fb55a34e44bab51c2d1cd7a5adcf421cd965a755722e73
diff --git a/dev-python/scipy/scipy-1.8.0.ebuild b/dev-python/scipy/scipy-1.8.0.ebuild
index 7dc252a8212a..135a57522290 100644
--- a/dev-python/scipy/scipy-1.8.0.ebuild
+++ b/dev-python/scipy/scipy-1.8.0.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="BSD LGPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 -hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 -hppa ~ia64 ~ppc ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="doc +pythran sparse"
 
 DEPEND="
diff --git a/dev-python/scrypt/Manifest b/dev-python/scrypt/Manifest
index 25abc7ee39b2..00e1f23109b5 100644
--- a/dev-python/scrypt/Manifest
+++ b/dev-python/scrypt/Manifest
@@ -1,5 +1,5 @@
 DIST scrypt-0.8.18.tar.gz 56651 BLAKE2B d0e71e0677ab5f159da829eaf8e794fab9fa9290ff3688e525c4f2e9c60fda532d1c302fe4088bd8e88e06e926ef95d06bad145697e8a13e2662eda7027479b7 SHA512 b033203f65dd63c1e915eeff6232c01f806eb01d3ce18e753b6161ae667555095fe775585dd0d4e15ae228f2d4862860093c1a18d5b810b438d032df9fb24d81
 DIST scrypt-0.8.20.tar.gz 55874 BLAKE2B b31c7dcec735944f6162709ba6ceb90160b3c9c403121a47e62563f8d2fc50f0505f180d7c18fa2c8e9037a097ca3bffea4c54c1f3b6861004f65a189a20b576 SHA512 da8d34755d4b6c98dc57ff7baf17839cf2434a6d7eb9f6fdc69b3e458d41b4fc49f7fd3a5631318b82bc4b2e46dedb806035897bf1be5a4670b4120f6b46efbc
 EBUILD scrypt-0.8.18.ebuild 552 BLAKE2B 6b41426d34fd7aabaaf7873d8ecd6bebf79352d9dd12ea75e605e5555deb3a7690eee2e5aed59e20f3b7ad3ff8856e37d8e7ff654974630d6dfe2c94254ae4db SHA512 575835b0439e7df0074cc35deaa4b55f3e6b9e682bfaf903273ee21d9850abec7bd7975ee00fa298df6f0533861fc5ea9188a05c6b06813ecb9d4916118a579c
-EBUILD scrypt-0.8.20.ebuild 592 BLAKE2B db4e3df522fa0b248d3285920fc9c00b171145c8af9eec42466418d0e15f5c6bbf627320ef46477f41a1a7e1ab78f64b3a3a8def6174fa365cdfb7ebce0c9465 SHA512 fe4145f94f1a305a5f0e66917e05214d810ffee1bfbc3027c8a0077aef5463470fafa7f34b2a18dbae3f8ac980da1947bf4ae56d368ecb79d148ec23375342f7
+EBUILD scrypt-0.8.20.ebuild 585 BLAKE2B 8223fe0b5b021e572984358839715618e8fe8cdc7e97ce21e3e011dff877e1bf135f36a08dd191945a25c0d0ccbf4122d5ee586c7cdd27a70a49a06f48fa5dcd SHA512 25d33ba1f295c686adc55b62d30610d2c0f0f9cbb9f61b760e4925557a13e5e40fc1f60113a6c60f84d7e2d560de9fa9d8d5e64c9c99b7b5ebeb402b8cda6ed4
 MISC metadata.xml 477 BLAKE2B eeb9120e1d43440497244d45f746ed7582d5a2fcbd3883bf72183c4164f63e87d57fc54d77be71bb873807b8bb6e0c878362aba21ca28a2c02209ef7aa2fb666 SHA512 151f92893c8b3b34dbf2f9145caae7e031be75f7f79f3517c9b645973454fe1910e0b5b2f4c37b6d3768038baaec126d8aa1a36626218f896a8f5b9cde82591c
diff --git a/dev-python/scrypt/scrypt-0.8.20.ebuild b/dev-python/scrypt/scrypt-0.8.20.ebuild
index df17f0b1fb84..e06cd312d6d9 100644
--- a/dev-python/scrypt/scrypt-0.8.20.ebuild
+++ b/dev-python/scrypt/scrypt-0.8.20.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~x64-macos"
 
 RDEPEND="dev-libs/openssl:0="
 DEPEND="${RDEPEND}"
diff --git a/dev-python/sentinels/Manifest b/dev-python/sentinels/Manifest
index 52090581dfc7..cd6f38c2e9e5 100644
--- a/dev-python/sentinels/Manifest
+++ b/dev-python/sentinels/Manifest
@@ -1,3 +1,3 @@
 DIST sentinels-1.0.0.tar.gz 4074 BLAKE2B 5fdbe488430685e24218b4c1a2ead75272c2024f6653c5f1363ee0e1180878e91ad1e6500ce8f7199b7a95f9680f427927ffa8e573fb5c7ff45ede2894a9fa9f SHA512 06aebf28a3074d377b4257ce3e07ced51425f738b3f2e3e4c1764e946137a363c6e94b247e0eb165c6c87eb749751aac36b580b9c550fe513dc0e126738e8794
-EBUILD sentinels-1.0.0.ebuild 419 BLAKE2B 0e7c06177e6d134480c74c756f6054405772498333a7ad6bfb9eb21b0ae59948aa02b65cfcc8948c8d1ac106c274b655a0ee4d6e080575a664cdb2c8508660a9 SHA512 7b5d70a9c35a4596c7c3f2841416e552ce85f643bcd2b0ec09f5da4259934409f1b01b260d57a1c92734a8ca3d0af713ee5cdb0c6214c2105ce0eeb729cd2d90
+EBUILD sentinels-1.0.0.ebuild 426 BLAKE2B 24902023dec38b4933b58a16c31f7cc90520c16be868174df83d16f506d9f421bac7219351160dcd17ca3941f4f2b9aff141d7c09bc724f09492a0fbf46458fa SHA512 16984b3cb042b24a26e4318c023004e75f283928000be938832a7f3da6bde60121fa97a922df624adfc2a4dee0509ddeaaa37bea0daec883009d5e4df7d3eb65
 MISC metadata.xml 532 BLAKE2B d26d54675103cb7b7f83ee94e862ac5cab3049ef4e45663cb184de3cbc38dfbe1029ee85d23f8007e5cf624cdd8871fdced1c1c70898b13d47c629437cec40ef SHA512 382e950733c4ddde73dc00be08dd01066e59e9fb5cdabccb9535526c6457e2d1c7c0e11ae27ab63c87692a8a6eefb3dd90004315e91456b2e4f1257ba480d5a4
diff --git a/dev-python/sentinels/sentinels-1.0.0.ebuild b/dev-python/sentinels/sentinels-1.0.0.ebuild
index 307785c1fa29..5ab83cb8e8d4 100644
--- a/dev-python/sentinels/sentinels-1.0.0.ebuild
+++ b/dev-python/sentinels/sentinels-1.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,6 +13,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~riscv x86"
 
 distutils_enable_tests nose
diff --git a/dev-python/setuptools-declarative-requirements/Manifest b/dev-python/setuptools-declarative-requirements/Manifest
new file mode 100644
index 000000000000..a27ad9864a01
--- /dev/null
+++ b/dev-python/setuptools-declarative-requirements/Manifest
@@ -0,0 +1,3 @@
+DIST setuptools-declarative-requirements-1.2.0.tar.gz 17936 BLAKE2B a5be2b64fc22d5a45136ec2b98c1d4cc6c20e17dc81070d12948b6f536a517ec8a660c105dfc13a4319d1de54409fb4f7a4c6bacaf1291afa13c7ecc27fd933f SHA512 ce0eeb8692ff2ea80db91cad981853da74c0ca80f58b698753de92f6df3ef5e1c158e314d0ac4d0b4fa99a2ad8ee2d7d80a9d1a13f334966c948dee1a0ae3d98
+EBUILD setuptools-declarative-requirements-1.2.0-r1.ebuild 1253 BLAKE2B 50afe3baf77dde70721d6bfed0a46aed6722351c41d16d63577761dcf5f560bb76e4f52ead870a7e714f9e37e7118f4d3bcd0a347efa4b429e9bcfff35fe3b8e SHA512 6cf0036fecdac95cc03605a66c956b68c1d3d3165307d763ee1befe86329294e0d86e53a4c223b2d56100945ccd6d4fa356dc91878247b5f52dd95eb0192714e
+MISC metadata.xml 348 BLAKE2B bb75dc7a62dfbe1f2128ad84e77dbff5498ba9eac61044d8914ec119b42e53c1119082bf66fa980f2b14df9ba8c48ac13fb0cdddeea60c9d6b9260dea90a8c4b SHA512 8df4f211960c247df43cccb8d2c31ad12f3699c8ef790de81602cde2fb62917c441ec2a85743b194ab716e1ecd4c64a378b3e7139bfc8d6547b768b2acbfd7c8
diff --git a/dev-python/setuptools-declarative-requirements/metadata.xml b/dev-python/setuptools-declarative-requirements/metadata.xml
new file mode 100644
index 000000000000..5e3f363fee8e
--- /dev/null
+++ b/dev-python/setuptools-declarative-requirements/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<name>Patrick McLean</name>
+		<email>chutzpah@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">setuptools-declarative-requirements</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/setuptools-declarative-requirements/setuptools-declarative-requirements-1.2.0-r1.ebuild b/dev-python/setuptools-declarative-requirements/setuptools-declarative-requirements-1.2.0-r1.ebuild
new file mode 100644
index 000000000000..c6f4b338ae64
--- /dev/null
+++ b/dev-python/setuptools-declarative-requirements/setuptools-declarative-requirements-1.2.0-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Requirements Support For Setuptools Declarative setup.cfg"
+HOMEPAGE="
+	https://pypi.org/project/setuptools-declarative-requirements/
+	https://github.com/s0undt3ch/setuptools-declarative-requirements
+"
+SRC_URI="https://github.com/s0undt3ch/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64"
+
+RDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/wheel[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pypiserver[${PYTHON_USEDEP}]
+		dev-python/virtualenv[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	sed -e "s/use_scm_version=True/version='${PV}'/" -i setup.py || die
+	sed -e "/setuptools_scm/ d" -i setup.cfg || die
+	printf '__version__ = "${PV}"\n' > declarative_requirements/version.py || die
+	sed -e "s/localhost/127.0.0.1/g" -i tests/conftest.py || die
+	rm pyproject.toml || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	PIP_DEFAULT_TIMEOUT=3 \
+		PIP_INDEX_URL="http://127.0.0.1:8080" \
+		epytest -k 'not sdist'
+}
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index 1fae40c7d249..b0fc4a3777a2 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -1,8 +1,15 @@
 DIST python-gentoo-patches-3.10.0_p1.tar.xz 10068 BLAKE2B 1c9817b449831559f0a0b722c02a5f55d94b3dfde98e5882c1403fe24a4addf7074ab39c09b91cff6fd7ace2e4b6e8ed899d9a0b9ffd6612ce315c4c192bd309 SHA512 39aa41dbf17b6dc5255491c75031a3dae6962b44125e426dbfdce365a6533c5dae9856b1fff8016a189124b7cff72d2665ce99da344c2f9dff005ba685e8c2c4
+DIST python-gentoo-patches-3.10.4.tar.xz 8592 BLAKE2B 67fba3e1fedb17430e5cd93da995b4acaf714db512031b5a2f775a25f793f007941561663cfa413d645ccddc2e22d65d250a40fa166cafda8805488d877ff57d SHA512 3ed2b8ff8f1eb8febe7dcd4b5d13d6d54468be1d525f8f1118977d3bbc78f690a597b09383939d023b03380a306e4bff1693382e29ff562312d803305b1709b2
 DIST setuptools-60.10.0.tar.gz 2420706 BLAKE2B 66d7f3b648b1e3222736ddf46ff97441bc9ed4dc528e0d4ee32ef18c99b2d3488e7525a1598a18df4f2cbdac409a4096a40539807c343d99707068a15003111d SHA512 e679bd84d31cb68f92899e0b25d5a6bf85cf63d9c8e1dfbfe974d7bf819cb36f451596b8715000be6a93656b972dc6c4d90a8a8534a6c88874a0be8140f2f091
 DIST setuptools-60.5.0.tar.gz 2292478 BLAKE2B e41b2717b34d454b3959ee5b6f4fdc70dfec13d97fe6962bd1c1ea2296be8ee2d27bb14ed2cc5e6fb9a757661a0415984b3cf7cf1665347c62a50965f651f9d4 SHA512 b2cf7d99e60d0c862a7a4fd8e806019db52502de48ff77556df26ce39a8620f476de767e2e8be8aa260366f54d1429db8a42d538345ec2cd2cfd5286e62e770d
 DIST setuptools-60.9.2.tar.gz 2425956 BLAKE2B 09baded7eef555ebd76db1672d69cd06cf6bcfc1126ba0fb0143b038d6599998f53460afc914f761d44ff25710802f6f371a793dca60040240cc328da0a3ea92 SHA512 be99bee951797632a68d08b94e0b604763662c13f58cecc872615081036081b3d72c5c468af47649449d6f7422f52ee99cf2f87fa9c840d10f98cd0217c0cff2
-EBUILD setuptools-60.10.0.ebuild 4056 BLAKE2B c12c9851a8b099e6bf7772879397c1ed0186ad299605636e1cbd1aa07376e4609cc5d5652977406fe35942eca2968c408dc116b77a2d8cc6876f719e5b107b21 SHA512 08b794ccb16b3c9175304f6ccfdc12aa0e20d1168bbd5b42c8217b18a74ee6ace2079b66fe9de041ffb804ad0b99abda589742eaad001fd1fd8e8d6968b4a072
+DIST setuptools-61.3.0.gh.tar.gz 2643769 BLAKE2B 4ede87e7a597a6916dc089c311b0e4d098b08debbd1c4a9cb97078730e9cdc8dbcacd4236ca98a42e3cfafdf66d8f39bb64bc9135291335224b1c3b0bf79deff SHA512 35e2b848cf79e577b8c469562cb68a80b27d42d2d9c1c94f84fea9beb85e2db0796ed64d414add67a404d801c4f4e6cd489a72153de4dc8ed8b45fab24c28fd9
+DIST setuptools-61.3.1.tar.gz 2508220 BLAKE2B be59b7f666d8cc583b98b73d681eddf2d15e1437f05ddb534cb6e95bf458aed01a6e136ddc10bef2b2f66fe3f888187ece8262906079f1321f194e03a93fccca SHA512 463f2203416a298f65b66199fd62941ed32fc0914a4b6afff74b4abb8db37c063ab208a67383b5a7e6108a8c1ed0fda0fbb6b47d8fbc95c68b9e23e4ba152aec
+DIST setuptools-62.0.0.tar.gz 2512032 BLAKE2B 688afed5a19e70a0fd7ab91a8d137e6641597d9f9acf31826216cd59e4632872a9661fe9ca18e45aec5cd40e52956147aa8d40ac2c376380ffa0f01dc2997e63 SHA512 9017ab055c81063eaf741d45bd2479fcf85d15795bdcf0fa55522d194a69b5a912cbdba94e9eeaa6cf2a6cdaa5dda09604205d6e02d56e7c9fd3be4c1c79ba0a
+EBUILD setuptools-60.10.0.ebuild 4160 BLAKE2B 1b04acd31df87b7c8911c3f8b6e12920bb108583921245f0c733028476b7d521048c89cfa23c39b77fa1f508d2ba147b5809b4613a23bc220ca49f8214daf47a SHA512 7072f7b4825b9d972c55e0a5d6e117b99f81df7f8e942793bf0fe954ff44d7d2f90a26d22fdf1402d96f2626345f726a0d30b600e826a9c9c1b279b05c84c065
 EBUILD setuptools-60.5.0.ebuild 3392 BLAKE2B 93280ff6c52f3f0e6bfc94057bcf5e60db4d71d50f20d2aab7589996a625ab09c3645a5232711386d304517af149f2fc460c1e04d4f86658415b028de61a254a SHA512 6a55a979216217d7f6c39460e8058541423c33bb1474128dc6e2c5bdd69e13a10a4581057b37ccc2f5c600ed6f495e96f9aa8b0d4f9cb0a6e0fb2ec4b687d0c9
 EBUILD setuptools-60.9.2.ebuild 3958 BLAKE2B d9ab297e87453adc0395b0aabbaeea1b71f9ddf4137cc6276bb3ccda55e4b8138301c2008dc437a71919dc080cf3c171bc0b46ccef0bf9bc5ae948a335d684ac SHA512 af7c6a4b1c370e160fcebb0ab6502c770ec64064fb8fe803d9432c8f252ea132d2ae5cacec41ececcedf9888fab9910a11051215cd8a7c2f6c6c83efbf0a3256
+EBUILD setuptools-61.3.0.ebuild 4528 BLAKE2B 0bbfcbe4a56263e867aadb744bab3b28902fb8965f422654e72e9c0c5ff3b48328f2f3ccbe8eedf292c1d76f9e151aba6878b275203f83ff6aa7e0a42c6bafc0 SHA512 4b14c8bbfedf9398ebe393298cd3b70cfafff4510b43e44fe6badbd79b38c6ee14abae25c530913efa677dedc068d7045f8e2b0e2f44fa50e17d500c8cd387c9
+EBUILD setuptools-61.3.1-r1.ebuild 4687 BLAKE2B 5a5f6931fc312d20c04fc677885abae94cf466a127fa68b761fbe45803af0f1e2ca4ac83e089fdbacad32cf9f9c39fb3f84d19a7d0186fa7709a817f2da580c5 SHA512 71f8ab62ae73b2f293af7c12d7da08859a935c867cd8098aa4627a766c930644cc7e9195e5baec7cd54d926314afcfb1563eb2ac61e26ce827a5fb0ff51e131d
+EBUILD setuptools-62.0.0.ebuild 4684 BLAKE2B b2d7a04877db9472f4794af65bce35132f4e5fb8d661b2b93ae6a55ee51d1ba944d20ac140f9e970ae2bd763807c168b18f2503c9967e9215ba32eacb0028708 SHA512 e28ba4a94596a3164f8e876cb3578234836ef0e5c5047c9c51cc19d0753fbf90e4d2885a6d7f2e83aa398ad20ee62783cbc8cca3672f208e019b54fab6344fea
 MISC metadata.xml 469 BLAKE2B 4a26769b09a3785586b22db850b7fc5c4818f31c3ace9cc94476d35df05e50edf6721f3c95ec615c3b2efe071ef284a54ea2d53566316ba653f7830bb48f80bf SHA512 dd682c4ad2e59a97094ebdabe4d1063e2319ed05e1fe9d8c2fafe069badb3b4cf8bb6d9f50e09d2128e2a081c1c69827407ac8aed644ebf70eb4ca1bc9a57319
diff --git a/dev-python/setuptools/setuptools-60.10.0.ebuild b/dev-python/setuptools/setuptools-60.10.0.ebuild
index 664c89e0ecdc..cf905613fe22 100644
--- a/dev-python/setuptools/setuptools-60.10.0.ebuild
+++ b/dev-python/setuptools/setuptools-60.10.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/setuptools/setuptools-61.3.0.ebuild b/dev-python/setuptools/setuptools-61.3.0.ebuild
new file mode 100644
index 000000000000..1f21e4970f84
--- /dev/null
+++ b/dev-python/setuptools/setuptools-61.3.0.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
+EAPI=7
+
+DISTUTILS_USE_PEP517=standalone
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1 multiprocessing
+
+CPY_PATCHSET="python-gentoo-patches-3.10.0_p1"
+DESCRIPTION="Collection of extensions to Distutils"
+HOMEPAGE="
+	https://github.com/pypa/setuptools/
+	https://pypi.org/project/setuptools/
+"
+SRC_URI="
+	https://github.com/pypa/setuptools/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+	https://dev.gentoo.org/~floppym/python/${CPY_PATCHSET}.tar.xz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/appdirs-1.4.4-r2[${PYTHON_USEDEP}]
+	>=dev-python/jaraco-text-3.7.0-r1[${PYTHON_USEDEP}]
+	>=dev-python/more-itertools-8.12.0-r1[${PYTHON_USEDEP}]
+	dev-python/nspektr[${PYTHON_USEDEP}]
+	>=dev-python/ordered-set-4.0.2-r1[${PYTHON_USEDEP}]
+	>=dev-python/packaging-21.3-r2[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_metadata-4.10.1-r1[${PYTHON_USEDEP}]
+	' 3.8 3.9)
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_resources-5.4.0-r3[${PYTHON_USEDEP}]
+	' 3.8)
+"
+BDEPEND="
+	${RDEPEND}
+	>=dev-python/wheel-0.37.1-r1[${PYTHON_USEDEP}]
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/build[${PYTHON_USEDEP}]
+			>=dev-python/ini2toml-0.9[${PYTHON_USEDEP}]
+			>=dev-python/filelock-3.4.0[${PYTHON_USEDEP}]
+			>=dev-python/jaraco-envs-2.2[${PYTHON_USEDEP}]
+			>=dev-python/jaraco-path-3.2.0[${PYTHON_USEDEP}]
+			dev-python/mock[${PYTHON_USEDEP}]
+			dev-python/pip[${PYTHON_USEDEP}]
+			dev-python/pip-run[${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/tomli[${PYTHON_USEDEP}]
+			>=dev-python/tomli-w-1.0.0[${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}]
+"
+
+DOCS=( {CHANGES,README}.rst )
+
+src_prepare() {
+	# remove bundled dependencies, setuptools will switch to system deps
+	# automatically
+	rm -r */_vendor || die
+
+	# remove the ugly */extern hack that breaks on unvendored deps
+	rm -r */extern || die
+	find -name '*.py' -exec sed \
+		-e 's:from \w*[.]\+extern ::' -e 's:\w*[.]\+extern[.]::' \
+		-i {} + || die
+
+	# 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
+
+	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+}
+
+python_test() {
+	local -x SETUPTOOLS_USE_DISTUTILS=stdlib
+
+	# keep in sync with python_gen_cond_dep above!
+	has "${EPYTHON}" python3.{8..10} pypy3 || continue
+
+	local EPYTEST_DESELECT=(
+		# network
+		# TODO: see if PRE_BUILT_SETUPTOOLS_* helps
+		setuptools/tests/integration/test_pip_install_sdist.py::test_install_sdist
+		setuptools/tests/test_distutils_adoption.py
+		setuptools/tests/test_virtualenv.py::test_clean_env_install
+		setuptools/tests/test_virtualenv.py::test_no_missing_dependencies
+		'setuptools/tests/test_virtualenv.py::test_pip_upgrade_from_source[None]'
+		setuptools/tests/test_virtualenv.py::test_test_command_install_requirements
+		setuptools/tests/test_setuptools.py::test_its_own_wheel_does_not_contain_tests
+		setuptools/tests/config/test_apply_pyprojecttoml.py::test_apply_pyproject_equivalent_to_setupcfg
+		# unhappy with pytest-xdist?
+		setuptools/tests/test_easy_install.py::TestUserInstallTest::test_local_index
+		# TODO
+		setuptools/tests/test_easy_install.py::TestSetupRequires::test_setup_requires_with_allow_hosts
+		setuptools/tests/test_test.py::test_tests_are_run_once
+		setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_basic
+		setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_ignore_errors
+		# expects bundled deps in virtualenv
+		setuptools/tests/test_editable_install.py::test_editable_with_pyproject
+	)
+
+	# test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
+	# It tries to sandbox the test in a tempdir
+	HOME="${PWD}" epytest \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" setuptools
+}
diff --git a/dev-python/setuptools/setuptools-61.3.1-r1.ebuild b/dev-python/setuptools/setuptools-61.3.1-r1.ebuild
new file mode 100644
index 000000000000..add5da08ce1c
--- /dev/null
+++ b/dev-python/setuptools/setuptools-61.3.1-r1.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
+EAPI=7
+
+DISTUTILS_USE_PEP517=standalone
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1 multiprocessing
+
+CPY_PATCHSET="python-gentoo-patches-3.10.0_p1"
+DESCRIPTION="Collection of extensions to Distutils"
+HOMEPAGE="
+	https://github.com/pypa/setuptools/
+	https://pypi.org/project/setuptools/
+"
+SRC_URI="
+	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+	https://dev.gentoo.org/~floppym/python/${CPY_PATCHSET}.tar.xz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~m68k ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/appdirs-1.4.4-r2[${PYTHON_USEDEP}]
+	>=dev-python/jaraco-text-3.7.0-r1[${PYTHON_USEDEP}]
+	>=dev-python/more-itertools-8.12.0-r1[${PYTHON_USEDEP}]
+	dev-python/nspektr[${PYTHON_USEDEP}]
+	>=dev-python/ordered-set-4.0.2-r1[${PYTHON_USEDEP}]
+	>=dev-python/packaging-21.3-r2[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_metadata-4.10.1-r1[${PYTHON_USEDEP}]
+	' 3.8 3.9)
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_resources-5.4.0-r3[${PYTHON_USEDEP}]
+	' 3.8)
+"
+BDEPEND="
+	${RDEPEND}
+	>=dev-python/wheel-0.37.1-r1[${PYTHON_USEDEP}]
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/build[${PYTHON_USEDEP}]
+			>=dev-python/ini2toml-0.9[${PYTHON_USEDEP}]
+			>=dev-python/filelock-3.4.0[${PYTHON_USEDEP}]
+			>=dev-python/jaraco-envs-2.2[${PYTHON_USEDEP}]
+			>=dev-python/jaraco-path-3.2.0[${PYTHON_USEDEP}]
+			dev-python/mock[${PYTHON_USEDEP}]
+			dev-python/pip[${PYTHON_USEDEP}]
+			dev-python/pip-run[${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/tomli[${PYTHON_USEDEP}]
+			>=dev-python/tomli-w-1.0.0[${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}]
+"
+
+DOCS=( {CHANGES,README}.rst )
+
+src_prepare() {
+	# remove bundled dependencies, setuptools will switch to system deps
+	# automatically
+	rm -r */_vendor || die
+
+	# remove the ugly */extern hack that breaks on unvendored deps
+	rm -r */extern || die
+	find -name '*.py' -exec sed \
+		-e 's:from \w*[.]\+extern ::' -e 's:\w*[.]\+extern[.]::' \
+		-i {} + || die
+
+	# 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
+
+	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+}
+
+python_test() {
+	local -x SETUPTOOLS_USE_DISTUTILS=stdlib
+
+	# keep in sync with python_gen_cond_dep above!
+	has "${EPYTHON}" python3.{8..10} pypy3 || continue
+
+	local EPYTEST_DESELECT=(
+		# network
+		# TODO: see if PRE_BUILT_SETUPTOOLS_* helps
+		setuptools/tests/integration/test_pip_install_sdist.py::test_install_sdist
+		setuptools/tests/test_distutils_adoption.py
+		setuptools/tests/test_virtualenv.py::test_clean_env_install
+		setuptools/tests/test_virtualenv.py::test_no_missing_dependencies
+		'setuptools/tests/test_virtualenv.py::test_pip_upgrade_from_source[None]'
+		setuptools/tests/test_virtualenv.py::test_test_command_install_requirements
+		setuptools/tests/test_setuptools.py::test_its_own_wheel_does_not_contain_tests
+		setuptools/tests/config/test_apply_pyprojecttoml.py::test_apply_pyproject_equivalent_to_setupcfg
+		# unhappy with pytest-xdist?
+		setuptools/tests/test_easy_install.py::TestUserInstallTest::test_local_index
+		# TODO
+		setuptools/tests/test_easy_install.py::TestSetupRequires::test_setup_requires_with_allow_hosts
+		setuptools/tests/test_test.py::test_tests_are_run_once
+		setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_basic
+		setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_ignore_errors
+		# expects bundled deps in virtualenv
+		setuptools/tests/test_editable_install.py::test_editable_with_pyproject
+		setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_in_sdist
+		setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_not_in_wheel
+	)
+
+	# test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
+	# It tries to sandbox the test in a tempdir
+	HOME="${PWD}" epytest \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" setuptools
+}
diff --git a/dev-python/setuptools/setuptools-62.0.0.ebuild b/dev-python/setuptools/setuptools-62.0.0.ebuild
new file mode 100644
index 000000000000..0e8e6c351cfc
--- /dev/null
+++ b/dev-python/setuptools/setuptools-62.0.0.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
+EAPI=7
+
+DISTUTILS_USE_PEP517=standalone
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1 multiprocessing
+
+CPY_PATCHSET="python-gentoo-patches-3.10.4"
+DESCRIPTION="Collection of extensions to Distutils"
+HOMEPAGE="
+	https://github.com/pypa/setuptools/
+	https://pypi.org/project/setuptools/
+"
+SRC_URI="
+	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+	https://dev.gentoo.org/~floppym/python/${CPY_PATCHSET}.tar.xz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~m68k ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/appdirs-1.4.4-r2[${PYTHON_USEDEP}]
+	>=dev-python/jaraco-text-3.7.0-r1[${PYTHON_USEDEP}]
+	>=dev-python/more-itertools-8.12.0-r1[${PYTHON_USEDEP}]
+	dev-python/nspektr[${PYTHON_USEDEP}]
+	>=dev-python/ordered-set-4.0.2-r1[${PYTHON_USEDEP}]
+	>=dev-python/packaging-21.3-r2[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_metadata-4.10.1-r1[${PYTHON_USEDEP}]
+	' 3.8 3.9)
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_resources-5.4.0-r3[${PYTHON_USEDEP}]
+	' 3.8)
+"
+BDEPEND="
+	${RDEPEND}
+	>=dev-python/wheel-0.37.1-r1[${PYTHON_USEDEP}]
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/build[${PYTHON_USEDEP}]
+			>=dev-python/ini2toml-0.9[${PYTHON_USEDEP}]
+			>=dev-python/filelock-3.4.0[${PYTHON_USEDEP}]
+			>=dev-python/jaraco-envs-2.2[${PYTHON_USEDEP}]
+			>=dev-python/jaraco-path-3.2.0[${PYTHON_USEDEP}]
+			dev-python/mock[${PYTHON_USEDEP}]
+			dev-python/pip[${PYTHON_USEDEP}]
+			dev-python/pip-run[${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/tomli[${PYTHON_USEDEP}]
+			>=dev-python/tomli-w-1.0.0[${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}]
+"
+
+DOCS=( {CHANGES,README}.rst )
+
+src_prepare() {
+	# remove bundled dependencies, setuptools will switch to system deps
+	# automatically
+	rm -r */_vendor || die
+
+	# remove the ugly */extern hack that breaks on unvendored deps
+	rm -r */extern || die
+	find -name '*.py' -exec sed \
+		-e 's:from \w*[.]\+extern ::' -e 's:\w*[.]\+extern[.]::' \
+		-i {} + || die
+
+	# 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
+
+	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+}
+
+python_test() {
+	local -x SETUPTOOLS_USE_DISTUTILS=stdlib
+
+	# keep in sync with python_gen_cond_dep above!
+	has "${EPYTHON}" python3.{8..10} pypy3 || continue
+
+	local EPYTEST_DESELECT=(
+		# network
+		# TODO: see if PRE_BUILT_SETUPTOOLS_* helps
+		setuptools/tests/integration/test_pip_install_sdist.py::test_install_sdist
+		setuptools/tests/test_distutils_adoption.py
+		setuptools/tests/test_virtualenv.py::test_clean_env_install
+		setuptools/tests/test_virtualenv.py::test_no_missing_dependencies
+		'setuptools/tests/test_virtualenv.py::test_pip_upgrade_from_source[None]'
+		setuptools/tests/test_virtualenv.py::test_test_command_install_requirements
+		setuptools/tests/test_setuptools.py::test_its_own_wheel_does_not_contain_tests
+		setuptools/tests/config/test_apply_pyprojecttoml.py::test_apply_pyproject_equivalent_to_setupcfg
+		# unhappy with pytest-xdist?
+		setuptools/tests/test_easy_install.py::TestUserInstallTest::test_local_index
+		# TODO
+		setuptools/tests/test_easy_install.py::TestSetupRequires::test_setup_requires_with_allow_hosts
+		setuptools/tests/test_test.py::test_tests_are_run_once
+		setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_basic
+		setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_ignore_errors
+		# expects bundled deps in virtualenv
+		setuptools/tests/test_editable_install.py::test_editable_with_pyproject
+		setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_in_sdist
+		setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_not_in_wheel
+	)
+
+	# test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
+	# It tries to sandbox the test in a tempdir
+	HOME="${PWD}" epytest \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" setuptools
+}
diff --git a/dev-python/simber/Manifest b/dev-python/simber/Manifest
new file mode 100644
index 000000000000..1735f077acf1
--- /dev/null
+++ b/dev-python/simber/Manifest
@@ -0,0 +1,3 @@
+DIST simber-0.2.4.tar.gz 91600 BLAKE2B 64ef49a8458fc98bfe87ceaeaa7bfcf9f76c8283f8a80cd918dcc8709ca5f4c2b1d657fda345812b3cb280855f3bc7bc9e3d8045b593bc8dd9dbc134f84e0e81 SHA512 17def9e8c6f0695ec36b5e48011d2db892436b7076203fe008aac7c8c2ce0e0ab9cc5be45f6eb136984f41997a7e91549c77cb1761b65694039619bdb8397ae1
+EBUILD simber-0.2.4.ebuild 525 BLAKE2B 5dc000b26f7f5953205b63e363c24bdeac3205c8c45676f4e4813b2008f8ac0eda602d8abac1be854b4d55652cd3f68553a4138f515d824c3a2e3bbb3265a0e2 SHA512 05ef7a43e748d1373aebfc2726a4f7e93346596bceee7bf2a3bef7f73ccb326be76cbb7e17e1084719d459b28648d79b35d7c9a1725fdb359de28b41834ce510
+MISC metadata.xml 407 BLAKE2B 0b9b67af0e14ef3c6e5b7e07a25cddb39407a31c4d0de9f095031860bf733bba270c04bd437523fe5348d9a4653358e46e6bfe91612c5926eb6cbc933a01360c SHA512 5e4edab466055ddaffd4c51c9d6ed44872b20b58be2a27631a3df6cfe92ba42db29d45272d00488dad22faed7beb8c2efe08cc573f40e2e968a994ca334d5adf
diff --git a/dev-python/simber/metadata.xml b/dev-python/simber/metadata.xml
new file mode 100644
index 000000000000..bc2c7ed4c7f4
--- /dev/null
+++ b/dev-python/simber/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+  <maintainer type="person">
+    <email>xgqt@gentoo.org</email>
+    <name>Maciej Barć</name>
+  </maintainer>
+  <upstream>
+    <bugs-to>https://github.com/deepjyoti30/simber/issues/</bugs-to>
+    <remote-id type="github">deepjyoti30/simber</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/simber/simber-0.2.4.ebuild b/dev-python/simber/simber-0.2.4.ebuild
new file mode 100644
index 000000000000..00d98b96fe71
--- /dev/null
+++ b/dev-python/simber/simber-0.2.4.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Simple, minimal and powerful logging library for Python"
+HOMEPAGE="https://simber.deepjyoti30.dev/"
+SRC_URI="https://github.com/deepjyoti30/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/colorama[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
diff --git a/dev-python/slixmpp/Manifest b/dev-python/slixmpp/Manifest
index ced95ca8e6ac..ac5fd2262461 100644
--- a/dev-python/slixmpp/Manifest
+++ b/dev-python/slixmpp/Manifest
@@ -1,9 +1,4 @@
-AUX slixmpp-1.7.1-fix-py3.10.patch 828 BLAKE2B 639e86be2d2289386ee782adfaf8fb05e6e994f21f65edf5bea552cc3838db440b753177fa3f4f76f200dabb6600618fbfdbdb8547d3e781a88d45c926a32b54 SHA512 1894d101d2d0afe6a59342e8aeffa530ab0a3732e18f0b7599b7abffcf559d0791f85cda9b5e87b181bd4c473ec3d88dee9be7be8c07c1e8db6943e18b000bf7
-DIST slixmpp-1.7.1.tar.gz 931753 BLAKE2B 3de14be36353bc5f5f2cfbe002c44c5e843a7b36fa31a9dd315e363fc67e36d080df0dc70d82e65c6802c41377c2e98f56ff4e23cc5e9a92165c3d3b7565493f SHA512 5a59fcbb901e6f4456049f1ec2bbf781b1ec7c5a3ad4b66216d4c5daffa7f0606f74b941647fe2b53e6c8cdc476371305c7b7a2ca24d21450e19548f888be3b1
-DIST slixmpp-1.8.0.1.tar.gz 532519 BLAKE2B c4cda06d1d16ef92404263a90a6abbba46e526b4f9edc54228757b73c9faa0f04e9340ea80b5f0491017bad04094512bd25fe04fc095742b639cecba73db058b SHA512 0bfa39f126f2154702e160117b619f41319362723226ebf0ed4b803aafef0302d4df9d9a4cff5fd890507a10ac7424a07cc3bece519451bd56be400998dc0178
 DIST slixmpp-1.8.1.tar.gz 532622 BLAKE2B d0c12c240c8a14df0a0765f8bac02eb545951a0b9749ec9569d651caa3457af1a71f1c6b3a10db879fe25648b1c3c456b78e48042a83124b0a8d4d35df60134d SHA512 13b355592d564b7e211e6007fa19099e619480d0a87332b68163115852840ad2f0c70063b4260fc88d4da67e13ea97c88972fc05999c1870256b0de0257409f9
-EBUILD slixmpp-1.7.1.ebuild 757 BLAKE2B 396df75ba07ec319cf7301f00c5e8350299f7150270f01674112492f392678f65ce4690f7879df7332e2b9cc83f017826da4fa49fda2eed7327342d8d1267af7 SHA512 1bc48e432662641a7878fd8ef6b55821192b39f1217624a1a1ecf4b64508107c18e76a0b03895ecba9b5cd31c9c6df25d27a1764d24c21b5bf867855b0ad49e8
-EBUILD slixmpp-1.8.0.1.ebuild 781 BLAKE2B b8ad5eb2383051194b23e1fea137214f427591852a0944776fda66f06074eb44af0e37835eed92019585bc50b663e9e6dc8fc955796a88f0919f9548ff535f23 SHA512 e34094e3919cd5eeaa7cfe90d8f143d41c899f586eb401249cd00a439e55ac8f1a21626d8ee2b2ac8846f293f88fbc735c8f0161896c0c93745a7dd193474908
-EBUILD slixmpp-1.8.1.ebuild 781 BLAKE2B b8ad5eb2383051194b23e1fea137214f427591852a0944776fda66f06074eb44af0e37835eed92019585bc50b663e9e6dc8fc955796a88f0919f9548ff535f23 SHA512 e34094e3919cd5eeaa7cfe90d8f143d41c899f586eb401249cd00a439e55ac8f1a21626d8ee2b2ac8846f293f88fbc735c8f0161896c0c93745a7dd193474908
+EBUILD slixmpp-1.8.1.ebuild 780 BLAKE2B 0c5b230859f98185cba66555bc3a6bdd07a4ee851846c37068b6d829e1372d3bbbdd023263933337e4c2c0173bbd33df16cb127e1e2f9d2ee5b7a31e4dc97304 SHA512 ca16523dde2654b6fe8a107ec313da73da94fad32dd337867b4f5f61b763c61cc385c8868f349634759674b903a71ac1be2c863a69cdfe02baeaa15f1fc7ee17
 EBUILD slixmpp-9999.ebuild 781 BLAKE2B b8ad5eb2383051194b23e1fea137214f427591852a0944776fda66f06074eb44af0e37835eed92019585bc50b663e9e6dc8fc955796a88f0919f9548ff535f23 SHA512 e34094e3919cd5eeaa7cfe90d8f143d41c899f586eb401249cd00a439e55ac8f1a21626d8ee2b2ac8846f293f88fbc735c8f0161896c0c93745a7dd193474908
 MISC metadata.xml 530 BLAKE2B 33851d8e4b4acade2d0349540d63047db59627a7c0c84c9cab868360a8d53671336bce427fabaef795fb17c235740e3bc6ded84549d89cd433becf04de97566a SHA512 b14827992560c3f6010721507e7c9b6344525ca347a2f54987cb5678083beca92cd095a421d4fa45a18cc7c64c6c0b6f86f2f3af0bdcfc44267e30e63922f48b
diff --git a/dev-python/slixmpp/files/slixmpp-1.7.1-fix-py3.10.patch b/dev-python/slixmpp/files/slixmpp-1.7.1-fix-py3.10.patch
deleted file mode 100644
index 0901090e4651..000000000000
--- a/dev-python/slixmpp/files/slixmpp-1.7.1-fix-py3.10.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 8b7648502b003d433a08333b041baf1d4960c9d4 Mon Sep 17 00:00:00 2001
-From: Nicolas Cedilnik <nicoco@nicoco.fr>
-Date: Mon, 22 Feb 2021 13:07:15 +0100
-Subject: [PATCH] Fix deprecation warning
-
----
- slixmpp/thirdparty/orderedset.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/slixmpp/thirdparty/orderedset.py b/slixmpp/thirdparty/orderedset.py
-index f6642db3..43023af4 100644
---- a/slixmpp/thirdparty/orderedset.py
-+++ b/slixmpp/thirdparty/orderedset.py
-@@ -20,9 +20,9 @@
- #     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- #     OTHER DEALINGS IN THE SOFTWARE.
- 
--import collections
-+from collections.abc import MutableSet
- 
--class OrderedSet(collections.MutableSet):
-+class OrderedSet(MutableSet):
- 
-     def __init__(self, iterable=None):
-         self.end = end = []
--- 
-GitLab
-
diff --git a/dev-python/slixmpp/slixmpp-1.7.1.ebuild b/dev-python/slixmpp/slixmpp-1.7.1.ebuild
deleted file mode 100644
index e37f059d7d37..000000000000
--- a/dev-python/slixmpp/slixmpp-1.7.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python 3 library for XMPP"
-HOMEPAGE="https://lab.louiz.org/poezio/slixmpp"
-LICENSE="MIT"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://lab.louiz.org/poezio/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64"
-fi
-
-DEPEND="
-	net-dns/libidn
-"
-RDEPEND="
-	dev-python/aiodns[${PYTHON_USEDEP}]
-	dev-python/aiohttp[${PYTHON_USEDEP}]
-	dev-python/pyasn1-modules[${PYTHON_USEDEP}]
-	dev-python/pyasn1[${PYTHON_USEDEP}]
-	${DEPEND}
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-py3.10.patch"
-)
-
-distutils_enable_tests unittest
diff --git a/dev-python/slixmpp/slixmpp-1.8.0.1.ebuild b/dev-python/slixmpp/slixmpp-1.8.0.1.ebuild
deleted file mode 100644
index 1a7f67fcb5c6..000000000000
--- a/dev-python/slixmpp/slixmpp-1.8.0.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python 3 library for XMPP"
-HOMEPAGE="https://lab.louiz.org/poezio/slixmpp"
-LICENSE="MIT"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://lab.louiz.org/poezio/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-DEPEND="
-	net-dns/libidn
-"
-RDEPEND="
-	dev-python/aiodns[${PYTHON_USEDEP}]
-	dev-python/aiohttp[${PYTHON_USEDEP}]
-	dev-python/defusedxml[${PYTHON_USEDEP}]
-	dev-python/pyasn1-modules[${PYTHON_USEDEP}]
-	dev-python/pyasn1[${PYTHON_USEDEP}]
-	${DEPEND}
-"
-
-distutils_enable_tests unittest
diff --git a/dev-python/slixmpp/slixmpp-1.8.1.ebuild b/dev-python/slixmpp/slixmpp-1.8.1.ebuild
index 1a7f67fcb5c6..ab71fc2be310 100644
--- a/dev-python/slixmpp/slixmpp-1.8.1.ebuild
+++ b/dev-python/slixmpp/slixmpp-1.8.1.ebuild
@@ -18,7 +18,7 @@ if [[ "${PV}" == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64"
+	KEYWORDS="amd64"
 fi
 
 DEPEND="
diff --git a/dev-python/speaklater/Manifest b/dev-python/speaklater/Manifest
index 739befc678e1..782cb6ea4c0f 100644
--- a/dev-python/speaklater/Manifest
+++ b/dev-python/speaklater/Manifest
@@ -1,3 +1,3 @@
 DIST speaklater-1.3.tar.gz 3582 BLAKE2B cddf87583670ae185336b73631b28da3dc26b74b75df82224da23df6c528ee074ca31c95d5fbe2971eb87c50480be022493164de62f02f1987a5768d7ae69092 SHA512 ae137d94c497cd4214e230c8906f3ba40e092f248206d37b61de2571567e39e27b7f58bcf2145bd0c81c195c3c5ed03fc0428e0a50c657c5c909ec82719454ef
-EBUILD speaklater-1.3-r1.ebuild 690 BLAKE2B 4f87980c5e31f48c1af242b2e9459b2aa226afc4c424783563130e10b8b820b41a1097c2877ba32362bfd12ca5d02ee5213dad54e77194fe8f104ff4fb41617d SHA512 4144d0b134c8a0b56c525807324577bff76a2026b6c8c884e5815036cc37e5fd53bf9a6de57f3ae99a985142a4076f67315f223ec07019abd8ea69d5e997adfa
+EBUILD speaklater-1.3-r1.ebuild 697 BLAKE2B dacb7e253bbe84f19ad2fc8410f3757dc8e4aa6663fab87f3489fbaa79cfa5cc6e1ff636f9191ea95164531c6afd7641d85814cdb8662952cf13f4807d92a6ff SHA512 aa33d5dfaac18691da36df51b43d4a5b9e83c43eab0b780d21396b8e70d1162ca0dc367dc56b8cbc877df11e2acfdd2f55f7f2db8656d3c5fb78cfa81bc42125
 MISC metadata.xml 456 BLAKE2B 270cc0b048d307dc0ca38d60e0c12757f3a6475827bb71f6b02d38dd4018d4e05be80f0c167a86d1b4e156d1bbb557d9426e33d26d36bb5fe1ddc2a2ab0708dd SHA512 edec8125ab7219b122b44918f15b168cc2edbfc9887d457ed50f4b4fa588f5bc67400e4a5a661623388e437a42d75a08cfa93738a8ce1615dc7c1f01ce2513e1
diff --git a/dev-python/speaklater/speaklater-1.3-r1.ebuild b/dev-python/speaklater/speaklater-1.3-r1.ebuild
index 53f4c0eb1415..d6fc15239d81 100644
--- a/dev-python/speaklater/speaklater-1.3-r1.ebuild
+++ b/dev-python/speaklater/speaklater-1.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~riscv x86"
 
 python_configure_all() {
 	# https://github.com/mitsuhiko/speaklater/issues/2
diff --git a/dev-python/sphinx-testing/Manifest b/dev-python/sphinx-testing/Manifest
index 3c6d5234d58e..ec5c3019f19d 100644
--- a/dev-python/sphinx-testing/Manifest
+++ b/dev-python/sphinx-testing/Manifest
@@ -1,4 +1,3 @@
 DIST sphinx-testing-1.0.1.tar.gz 11513 BLAKE2B 46ede243507a0d90b2ad4b918deadb818491bb0ed15ce41886040c52650f9fd348ff57c03766fd1e7719bbb54726f8915e091cf94a5396da946102ca49fd07b2 SHA512 2d377c0c6fe8e34a463b35e96938507a3ca35fa06cd19a2682eb55825e1b88982a80a02ebb9a02a47f11ca5e8fe6a5b9e5c8114d955fa3b774e0148e82121818
-EBUILD sphinx-testing-1.0.1-r1.ebuild 573 BLAKE2B 60f7f65cddc1a4d4c0ac346e1f7d4f39efaf7359284ca275a9a1fad793832f5f0d85f20a03112d69fcb924502b74e09ebbd9691eea758ea55952e3cb55189a40 SHA512 dc857b6145fbc3fc8c4be486d34bcf9c9c2a37135011f76c32964ed4c8acc07f54e8b9a046abca140de1b57adee0bf003ca3f76c9078e3b57a0ae37ebbc4072f
-EBUILD sphinx-testing-1.0.1-r2.ebuild 616 BLAKE2B a0cd3277bf2e7a99d0dcc7c6bad45aed8e56992f741dddcbe774e42de2a8216e42da9cd51d98af280d0c9bd1bec1bd0f1734d9ec1e7b493157294759b03e256a SHA512 d4a32e043e94393ffbe47c535120949af8e22f77dce747014630b2b27cb443aa2600073aceb4bdc66cb7d308c9e6883c608e6f97e4e6ac7bdf2ba3da518562b4
+EBUILD sphinx-testing-1.0.1-r2.ebuild 609 BLAKE2B bc444324ea3656cf320e78dbf43179bdf9e7d22d81964a1a0f34b65ca832b224fd5f8494f5c167c0cbbb0bdf8ef3bd1a6b3cb3700c6fb71b5ba70fc80a29abf4 SHA512 cb1a574cb48e36cb867189cfa3d37cf6467b8781b6cbc12b7a99dddf8c30e2d29888774698be8126949ceaa606370c9fe67d81f49058ae9f13a8f86ce409dc08
 MISC metadata.xml 383 BLAKE2B 41e841d52facd1baa27b1792d1200e275c4925c84d45ab17fe3ed243107de05e0cd70b9e73227bf7cdeabee8ef03175da471a7d357228e546df35fd1c7de9d24 SHA512 2fe1d7bc1e88c836b2ed8ce0f2cd6e71b5ea52fd94c0581c29a285402ba8f81f62cdece2b86776a02a9082ce7ee52f0881088fa28c263c7a2a8a85b1614b7ae6
diff --git a/dev-python/sphinx-testing/sphinx-testing-1.0.1-r1.ebuild b/dev-python/sphinx-testing/sphinx-testing-1.0.1-r1.ebuild
deleted file mode 100644
index 12fe9917ca1b..000000000000
--- a/dev-python/sphinx-testing/sphinx-testing-1.0.1-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Testing utility classes and functions for Sphinx extensions"
-HOMEPAGE="https://github.com/sphinx-doc/sphinx-testing"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/sphinx[${PYTHON_USEDEP}]"
-
-distutils_enable_tests nose
diff --git a/dev-python/sphinx-testing/sphinx-testing-1.0.1-r2.ebuild b/dev-python/sphinx-testing/sphinx-testing-1.0.1-r2.ebuild
index ad296d151157..ed04dc7675d3 100644
--- a/dev-python/sphinx-testing/sphinx-testing-1.0.1-r2.ebuild
+++ b/dev-python/sphinx-testing/sphinx-testing-1.0.1-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinx/Manifest b/dev-python/sphinx/Manifest
index 2eae184f0dd1..fd75fff20145 100644
--- a/dev-python/sphinx/Manifest
+++ b/dev-python/sphinx/Manifest
@@ -1,5 +1,7 @@
 AUX sphinx-3.2.1-doc-link.patch 604 BLAKE2B f23f8f9a0a48b170e2b6daaeded1e65aebe830da463d4e30f2405b511cb72dde12767d0113b2d1efdce821c16837d700c71c60de38d20950ca5d6579f19a80ff SHA512 3088ba8768b4ba9e6a187e4c52fcc226efd5125fd01526b4a724504f4c445d69d6964fe79c1325ff7f58edcefc7f3489393ab085ea0458d94c44b186aa16e2f1
 AUX sphinx-4.3.2-doc-link.patch 745 BLAKE2B 94f190d63168be99c4719a917f0a1210c56284c278c3909d9de34a319b4d5afa2337133509c06f87e53d5ae488efd88b0f79542719e8870c137f160732c25189 SHA512 aed97412a49212856ea6ccb392c2aa210862ec25d49c4b81a7ff17bd2d0cfe4811d80f4047622f7b23473e31aad968c34098b590045c1d0592b19f4cb6ec8b3c
 DIST Sphinx-4.4.0.tar.gz 6690021 BLAKE2B 5f63a6a70b8fb663ff1729766183f8936c9cd3bab81437526fb099ccc2a49c2abd42b602e2fc37af79254a9c8f1238fb4c99f2659142e9b9c2c1a2bd385ac100 SHA512 f5780a7da7a5d758b0e145ab9a7f191a9c65fd3ca4624ca3a04f0d161e3cd6c7133df53ff56e42f012687cbce0460178c2e7957974b5b929b341c98db996c640
+DIST Sphinx-4.5.0.tar.gz 6698212 BLAKE2B e6c46d35492c3d3068c4f97e497d33973ca86b40934578804fcec901fa89d2c52b45a7546b835b873846dd16936c1bd34a7b053aec8206c688d974671155fd56 SHA512 b44d2a81ed67adaefe16a07ae0cf053b5e6c775023aaa6c57d7b3950f171deac410e8004f787b151c3c2fc350650aa69a4dc2dc7239d1fd3d351e5194617cb2c
 EBUILD sphinx-4.4.0.ebuild 4127 BLAKE2B beac47d1a7587a49c0966c51c5a8c762bffc116192da1df828e8d4d4cc92c9b2b077fc891f5a4ad493334fad5b6e2743bf4749d536d17dbfcb203a6dc70b5829 SHA512 d79f179dd905866a0dc8f8e9ac67f1d1e7318df5e9386757f0b97b9a712fd4e91d96451316bd55330dd67e83f79b8b50d6ca46caea95706e75c8ebf41a1bbf7d
+EBUILD sphinx-4.5.0.ebuild 4255 BLAKE2B 10d7680e7fcf03f1935ac16f750ed3ed406d37473fbaacff902f2df544a8414d89d02b1f6e6724c0dbcd537ffe4eb42de266bc093d4286157af244e3a0659819 SHA512 691fe50e6294f4cbe2603eef236028d30d376e7dc3e2108b8195cc345f9c1e007686d46fa507ef30b27fe122694d3255956f528dfce8d55a7b47b4b90cf7df31
 MISC metadata.xml 568 BLAKE2B ddb7175070df6da4088813cc6b66f25bb4364e2619b1e7da94370f7ce8e73b68b12f618412f81e6be57fcb0c60c10e3913f26a6a578b0f9defa7b9ee8091fcde SHA512 d32b37cbe88f5e3db0c6968bc7aa22c7edfb3794bf7c62facd17e7ae1f4f0fbfc7c9f5512230cce16ed32e2ebb70c23dfe9b36ce38785c5f5b76585410313214
diff --git a/dev-python/sphinx/sphinx-4.5.0.ebuild b/dev-python/sphinx/sphinx-4.5.0.ebuild
new file mode 100644
index 000000000000..2229e8a7a853
--- /dev/null
+++ b/dev-python/sphinx/sphinx-4.5.0.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+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-0.18[${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}]
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_metadata-4.4[${PYTHON_USEDEP}]
+	' python3_{8,9} pypy3)
+	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"
+	"${FILESDIR}/${PN}-4.3.2-doc-link.patch"
+)
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# disable internet access
+	sed -i -e 's:^intersphinx_mapping:disabled_&:' \
+		doc/conf.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+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 EPYTEST_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
+		tests/test_build_linkcheck.py::test_linkcheck_exclude_documents
+		# TODO
+		tests/test_ext_autodoc_autoclass.py::test_classes
+		tests/test_ext_autodoc_autofunction.py::test_classes
+	)
+	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_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_decendants_of_generic_type
+		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
+		tests/test_util_inspect.py::test_isattributedescriptor
+		tests/test_util_typing.py::test_stringify_type_hints_pep_585
+	)
+
+	epytest
+}
diff --git a/dev-python/sphinx_ansible_theme/Manifest b/dev-python/sphinx_ansible_theme/Manifest
index c81c1e840279..eb2de2464871 100644
--- a/dev-python/sphinx_ansible_theme/Manifest
+++ b/dev-python/sphinx_ansible_theme/Manifest
@@ -1,7 +1,5 @@
 DIST sphinx-ansible-theme-0.8.0.tar.gz 34401 BLAKE2B 493663331e593da8d56683991762452419fd5fdb48e2c59ee3a38b6242216bccf56e047e59294ae73cccfb48a66606e55fac6c9a19d91e6ea778920f9919dbd1 SHA512 399af992428dd3212681efa66036af9ae7dbd9a9dd507452686cc76aa3e365aabee0ba7b599fbbed85f1f252075d5158ade9a816a9aad17b4e5ed696be1c962e
-DIST sphinx-ansible-theme-0.9.0.tar.gz 34533 BLAKE2B 53e4169f8deb88c9b0398e745cb249a596b3e63086afd3543d2465e1f2048f587f0a5964ac4a4cdc7a81c2cf78239ec59cd808a4dd644b3faec39b7a2b6487cd SHA512 0610a8422950252d88469dde274e3ac3df85034a886e87dbc9a19d621a55a7fc45d8ffdaf047cf78c556d6eacc09832d718fa5ab8f5019621b37579d84ed4951
 DIST sphinx-ansible-theme-0.9.1.tar.gz 34505 BLAKE2B 533e665b30f5aa450e4a2240c55c4992340b9f6ee03d27758bf119dfe2eef987fbd4b98136349af376557d8e9a78e5391a648b9886136995d05410b0c26561f2 SHA512 f78602af8affe7be59988f466cf6a2aa67e174086f338cad855369a7bbee5a76d07bcffa8406dea5a819127b26d69e29b0d90dab38b82524b3e317f9082d0379
 EBUILD sphinx_ansible_theme-0.8.0.ebuild 746 BLAKE2B 3a42d0e2c5df94b96941b931c8432af452c9e5f4efd436f68a9d21b76c6126e4772b4f644b489de7216fcc7982d45acf870200d8ef0acddfeb9ecbb3fc46a218 SHA512 433b01f1077e8b2fedb24acfb71d2f70f7dd8ca0546240c461a7e6503bac0cd0e363728ad6caf1a93e84c7d4b823df5917de3240e2a0c3a7825639c8ce38ec74
-EBUILD sphinx_ansible_theme-0.9.0.ebuild 744 BLAKE2B 3818d39cff04ac777bfd35965f5189f25bb194fb6c10f5a0083d23842173166782d20fb8f18684c14c8a8f16ce62ca2eacfe2f36bdf9689d0463e20d796e9119 SHA512 8050ddfbfabde5fd9d086a3153d12e88b655af66b36292159c848a3c4c9ddca6af3210df3c7bc11730c1468ce91d7df2951395c4a64c76e021c6db45fcd3835b
 EBUILD sphinx_ansible_theme-0.9.1.ebuild 780 BLAKE2B 0507e1b0a2166e4eded12ebbc8a022614ee44cff204632f414a178f8cf4da9795d673152256d19eb5e2f09359aa86fb86a2dd2499d9111d86c3ae4ca3a3d4588 SHA512 fbb6d09a9f737d083c4bbdc881eed15d4ecd5e3c548dd03beb1cb52f59b5188bf227e716eb78b76d421a8c813007d5ba867d7f2459e9ee4746b41e3c1fece2fb
 MISC metadata.xml 431 BLAKE2B 67a8ecd46eb70f203dbe1d988f4533cc8973b0c92958fb6c6795730c8662a714f0d4a8ca847c9ddb83df100767e6e2108e29fa512b109ecce8ed04724aad8473 SHA512 5689d031e76d4f2387ad0bed91d367a3f180b57f200ed74fdcafac600f0a3284946ba6bc722cf1cb3be66514c56c81d2eaed50c49497bc83feb6b4eeb903d4f3
diff --git a/dev-python/sphinx_ansible_theme/sphinx_ansible_theme-0.9.0.ebuild b/dev-python/sphinx_ansible_theme/sphinx_ansible_theme-0.9.0.ebuild
deleted file mode 100644
index ea5f4402b368..000000000000
--- a/dev-python/sphinx_ansible_theme/sphinx_ansible_theme-0.9.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-MY_PN="${PN//_/-}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A reusable Ansible Sphinx theme"
-HOMEPAGE="https://github.com/ansible-community/sphinx_ansible_theme"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S="${WORKDIR}"/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv"
-
-RDEPEND="dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]"
-BDEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]
-	doc? ( dev-python/ansible-pygments[${PYTHON_USEDEP}] )"
-
-distutils_enable_sphinx docs 'dev-python/sphinx-notfound-page'
diff --git a/dev-python/spotipy/Manifest b/dev-python/spotipy/Manifest
new file mode 100644
index 000000000000..13de582c7400
--- /dev/null
+++ b/dev-python/spotipy/Manifest
@@ -0,0 +1,3 @@
+DIST spotipy-2.19.0.tar.gz 102703 BLAKE2B bc132edb972236b43097c0bbc9d86932a3305d8bd3807e44e20767b123455950b8e01060efd83c87b3a162e329f5c48614205f131686af7f9312a44894a7f1e7 SHA512 fbaecd1a2cab3ef458d30de46cb89462021dfc3cfc85516d8bfe509af016a0b19af2f8de4f5cae36188b1ce1f5718c75edff0e71af2a87f4d720ee99d4541a6a
+EBUILD spotipy-2.19.0.ebuild 1142 BLAKE2B e5758cedfe1043cdd44513808189a9414f51779f213488bf8fd10f047caff435329a1fb4f1e51c731d63e3cacf817c7f2268205cda6d1a46eff49472dcaf00fb SHA512 060ac664853b219996e5fa75f82601c07bdcbf25c657d6a22c17cba3c38c740caa0d5eda4513b336e69c82d4f22209982dcfe37ce8836a416f55968c6409c7d9
+MISC metadata.xml 401 BLAKE2B 431a96f43d9ed792a38755d916c3f50bc0f25be327504226513a9d40cf1632485bd27c83494f8043d629c3827d214db1bda49dc38fe0b648e5498bbcc6ede387 SHA512 d976ffef1ddd34a9d58ed9b5e04aa8d1ba3655b2fd8a7c9d1546239ae8a8763faace560b1eaf2dac91ae58101826b2aa1680123d0f19f66a80a8caac60593522
diff --git a/dev-python/spotipy/metadata.xml b/dev-python/spotipy/metadata.xml
new file mode 100644
index 000000000000..d6cea39e5dcb
--- /dev/null
+++ b/dev-python/spotipy/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+  <maintainer type="person">
+    <email>xgqt@gentoo.org</email>
+    <name>Maciej Barć</name>
+  </maintainer>
+  <upstream>
+    <bugs-to>https://github.com/plamere/spotipy/issues/</bugs-to>
+    <remote-id type="github">plamere/spotipy</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/spotipy/spotipy-2.19.0.ebuild b/dev-python/spotipy/spotipy-2.19.0.ebuild
new file mode 100644
index 000000000000..91857474e8f3
--- /dev/null
+++ b/dev-python/spotipy/spotipy-2.19.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="A light weight Python library for the Spotify Web API"
+HOMEPAGE="https://spotipy.readthedocs.io"
+SRC_URI="https://github.com/plamere/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="examples"
+
+RDEPEND="
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/urllib3[${PYTHON_USEDEP}]
+"
+BDEPEND="test? ( dev-python/mock[${PYTHON_USEDEP}] )"
+
+distutils_enable_sphinx docs
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# Requires user credentials
+	rm tests/integration/test_user_endpoints.py || die
+
+	# Requires a spotify client ID
+	rm tests/integration/test_non_user_endpoints.py || die
+
+	# Needs internet access
+	sed -i -e 's:test_spotify_client_credentials_get_access_token:_&:' \
+		tests/unit/test_oauth.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	use examples && dodoc -r examples
+}
diff --git a/dev-python/spyder-kernels/Manifest b/dev-python/spyder-kernels/Manifest
index 7114add3d0be..9b6e10f5ce5c 100644
--- a/dev-python/spyder-kernels/Manifest
+++ b/dev-python/spyder-kernels/Manifest
@@ -1,3 +1,5 @@
 DIST spyder-kernels-2.2.1.tar.gz 86912 BLAKE2B 290c7cd1c89ebccf1b25bd120488fef25369a1d44262f2eea4924068fd6626b8048f0ad65250824352c2888ae7aa267cc219bc5e5b539de81d3c7e09360cbc74 SHA512 0b2a92ba2d3bc9da73532f57fddc873c0a1c36390aec479c689254689ab9ded2692a407b5b5754357ec6edfe36081c735200da933a4232c5b8a4d4701f597359
+DIST spyder-kernels-2.3.0.tar.gz 89425 BLAKE2B 60f9894ef83e1e4df828b35da4a1453721bfe4fe5f9c5655a120835e936a10c90cfc0431553b57e89e1a4cd81b5290709d9b0389bf961f29e5dfdc3caabeb190 SHA512 86b523b8c5a873ded6f222a42a0137143d134f1cdbe54a2d3d7019f4514eea9c117d7e56586092c568eda5eb101a7779b4e9b757d50649bb7ba314b1afaaa836
 EBUILD spyder-kernels-2.2.1.ebuild 1512 BLAKE2B c3b5e997d0598074d64004cf40581be1f6f91dc83b3cc4d419ee21af8fd860786f0cfeea04a8a34256c6eb8bfc61893cd49aff57260106ec475c07ff2aac13b9 SHA512 42f62480c074bcd578b7ed8df96118b7dcfdbbe0970c671b6243bb6e4d3d788caa61d7faad634efbdf923f50098086589dadefb2cb9be2d41cc7b70e2ebed97d
+EBUILD spyder-kernels-2.3.0.ebuild 2064 BLAKE2B 8a23fa0129495273e94c5960193fcd3b8ad94a59ac32cb85f49c7a40e18889bb6025cc60607008d3afa2c6b2726f2b40ca0169743098db702068f6329ff1dc2f SHA512 915fc3307eec6687735107216833d72e5c86be66575bcb59d4388c23cf880c58a69c38c0971d76d9d2cb6b99e894af6d8b1ef04ba6525033306cacd71109fdf9
 MISC metadata.xml 545 BLAKE2B 52be79edfbfdd86e7f895c53d088399b649901b76c7b69cf6363dfba6954971ce75b14624c2fc4254810112e32721e215255d59035f70850e1c1073f9784e65b SHA512 62ad725aab52d7071ccd5297bd15fcdd5e02e97854fc412a43b5c97b7995c77661251994850616743ce39eee0d0673b3bd4189b00876ed6124bf1871f6fb100c
diff --git a/dev-python/spyder-kernels/spyder-kernels-2.3.0.ebuild b/dev-python/spyder-kernels/spyder-kernels-2.3.0.ebuild
new file mode 100644
index 000000000000..0b456bcdab65
--- /dev/null
+++ b/dev-python/spyder-kernels/spyder-kernels-2.3.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_PEP517=setuptools
+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}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/cloudpickle[${PYTHON_USEDEP}]
+	>=dev-python/ipykernel-6.9.2[${PYTHON_USEDEP}]
+	>=dev-python/ipython-7.31.1[${PYTHON_USEDEP}]
+	<dev-python/ipython-8[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_client-7.1.0[${PYTHON_USEDEP}]
+	dev-python/matplotlib-inline[${PYTHON_USEDEP}]
+	>=dev-python/pyzmq-22.1.0[${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[tk,${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
+		# RuntimeError: There is no current event loop in thread 'MainThread'.
+		# https://bugs.gentoo.org/834893
+		spyder_kernels/console/tests/test_console_kernel.py::test_cwd_in_sys_path
+		spyder_kernels/console/tests/test_console_kernel.py::test_multiprocessing
+		spyder_kernels/console/tests/test_console_kernel.py::test_multiprocessing_2
+		spyder_kernels/console/tests/test_console_kernel.py::test_runfile
+		spyder_kernels/console/tests/test_console_kernel.py::test_np_threshold
+		spyder_kernels/console/tests/test_console_kernel.py::test_matplotlib_inline
+	)
+
+	epytest ${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/spyder-terminal/Manifest b/dev-python/spyder-terminal/Manifest
index 65050ca6112a..985864451e97 100644
--- a/dev-python/spyder-terminal/Manifest
+++ b/dev-python/spyder-terminal/Manifest
@@ -1,3 +1,5 @@
 DIST spyder-terminal-1.2.1.tar.gz 9286045 BLAKE2B 239d0ae4f4e015cb5105de89fad600db44cbcc6fe3ad3419658e4e161d788ef1c32724404d081f36c69027ca49bbae66133979b72afc09146d72d964026cc8f6 SHA512 d0ff71d53090ef3b0d9535209c87217187ce08bf332153928a6c69afebeec5ece7dad01c4c7710118ebf1e0bff5fba1193fb2f5fd56b65321037ef76b9dbfae3
+DIST spyder-terminal-1.2.2.tar.gz 9486091 BLAKE2B 0ac3178bddf82704bd1414999388248c83f9becaf96341a44a4117db88089730882acd08d4688b3ef8a09e52d06b5dc595edcd0fca07b3855fd9c82100af2f0e SHA512 7a4e7ca82553bf870650e0f3ce22f4ab93d54c539799ff855599e17452e4b0887854c30cadba1106b4feece021326709ec7c599e2953d0e72fae8e268db93cce
 EBUILD spyder-terminal-1.2.1.ebuild 650 BLAKE2B fe7ced973db22bdcbfb24849e260fbb680fb55fa5c7ed53eb459006def6b2e7cd7c218cef728b8d88432da06c9711172fa501c950d04c518cf0cf4b3d1af6e99 SHA512 b589430b8a329de746da81e8c28fc2c60714a2fe879ec3936211bb95012da2d0b7b937d53e9fec8be199f5f2d8f1c01374bcd9b934889eb022526c8a199edf3e
+EBUILD spyder-terminal-1.2.2.ebuild 681 BLAKE2B ebe4c7e39874550bed5dd26618cb37e805635db7155e561668eaaba8ad0631d5861928809314fcd2d43e0400c836ff5bd78c43cc9d5fd5bd715643254288e4ff SHA512 4d1fbaca4db5173608c96afe7432a457c88ba36d470c93bb548ecd142732acf85a2c77bbbdfa381341dfa25b3ab690913b3ee221141b6262165ba15b76de2c20
 MISC metadata.xml 361 BLAKE2B 3c50e1e63c16e0423ebdfc0a862920dd2efc2c47c2a88d6e5568fe8950434c7dd8219bde8a31cfe3046b480c217172705b1fca29562e10524fb644bba59680ba SHA512 73cb744181ea407855879710431ec23f4bc3ec09419bcd129b3ab9c89b2d9a26d619ae00018f5eb3a59afacaa1605de302cfb3e5739ed688e466f6463901c103
diff --git a/dev-python/spyder-terminal/spyder-terminal-1.2.2.ebuild b/dev-python/spyder-terminal/spyder-terminal-1.2.2.ebuild
new file mode 100644
index 000000000000..a0e0411785d2
--- /dev/null
+++ b/dev-python/spyder-terminal/spyder-terminal-1.2.2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1
+
+DESCRIPTION="Run system terminals inside Spyder"
+HOMEPAGE="https://github.com/spyder-ide/spyder-terminal"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT BSD Apache-2.0 BSD-2 ISC CC-BY-4.0 ZLIB WTFPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/coloredlogs[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	>=dev-python/spyder-5.2.0[${PYTHON_USEDEP}]
+	>=dev-python/terminado-0.13.1[${PYTHON_USEDEP}]
+	www-servers/tornado[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/spyder/Manifest b/dev-python/spyder/Manifest
index 1c2fb4d7f519..e0bbd1975cf4 100644
--- a/dev-python/spyder/Manifest
+++ b/dev-python/spyder/Manifest
@@ -1,6 +1,9 @@
 AUX spyder-5.0.0-build.patch 1147 BLAKE2B 68e62f6bd7a021d82f1da8d86c16e2289faac7f760f9bb5dc975053c7f8bb409c79b90eeaf06c5121ca5833442b61929cc640e4f25e6cc27f6118f0fa8f27b5e SHA512 e88cbbeca42ac2720f4e0888df9432d912d3907af267d3fe6a5e658d18d1242c998a70dee88fa0efe9edfcf87a46a40cf75685037d75fce1d596b708acc32096
 AUX spyder-5.2.0-doc-theme-renamed.patch 356 BLAKE2B 666ba289498026ab0679776b8af8f6efe7561a9a736ff19b32eaefcac87d142a55a055556c09f94373869711e81a35ef90832fbfe68acc6cee0f2023742de0be SHA512 396944e6f242bf3b6a27ac9d47f0cc07fd99a55c50f174dbee2fccd1f0b3edf355347bf6291943c3003f55996304d96ce2d2fe45ae7c4291e8425bff73a3a861
 DIST spyder-5.2.2.tar.gz 23913924 BLAKE2B 40bf968212f4b5d343b59ce6fd069f1e6a0d7f8bccbd3ff6eb76960638e9d4ff8f232a764673a75dcea9d8048ed6a5c36d3bd52719c6773cc26e922f5597e35a SHA512 e88a1332da503fcbd55496b7600a7b7dbfa5aa8d2d248b2f4a6cb4e394c07a38b6681db3ac7c0997ff87984a561f1d794a5bec6492f7c7c131c5cfee55c445b2
+DIST spyder-5.3.0.tar.gz 24404638 BLAKE2B 558c0d1ce8cda61786a772bf7ea471eab69755e3852f5701363b3c52cf1cac388a3800d2e59f266ca9e99007c7096582fbd341956752385b23c3af12ef097204 SHA512 c556deb8bed91ad6c59761e70e1e69f2402a216d8c87a57b3fc55f3624418d95114b015f5fc5baf0cb7e405955cd2ae82372105830b405ea52c50d7329ba7f42
 DIST spyder-docs-cd0c65d943595da438410559811a5809bf0227a3.tar.gz 90033347 BLAKE2B 11c17ff2e7fd58ca29c927add366490e0e9a218551b2d5b5be8b2e2eaa955cec52983273bfc3630a9b96a76c5650aa2b36a18a44cbcf78ac624758c8f41ed816 SHA512 d0814775026d76156c5c5a3d3a00b764b0803a71416e72c6b974d60dde0b661f06a4cc0940cd3f391a1903a07ceb078918267d332a94e09773906fec4c15eea2
+DIST spyder-docs-f99196cc267b07fa7ad56f0134744b545fa21fcd.tar.gz 90037460 BLAKE2B 8d279e2c2e397a63919c4ba8723ce674d2c5660793330dc578b9a6e05034af016085faedd73894f16241c0ffe1f734217d9e237f7589e59fe2186511552cefe1 SHA512 6c7d35274fd2f627b3b9371c7a2a9f0446c8aee3754b7c7dda6c5a2b9fd4ab04e73637648a188960c71d43f348c6f9ef1911979fec4c281515937e1069e68500
 EBUILD spyder-5.2.2.ebuild 7509 BLAKE2B cab02a0f4a9369c92d934ad511492a0be1f3d343693a93d625e328e6f9cc7ab85d6465ffd399aa9adc2e3513fba0761b84e763099c8c67d39386df9a9311e5a5 SHA512 ed1a100c5831a67f59ebddb8568cc5f83265a9bdaa624f75cbd6ddff458a81c859e3aaa974812aa4f8e76801c41d0994426f5d07f23c55abbe3437a1250ee565
+EBUILD spyder-5.3.0.ebuild 7561 BLAKE2B 0e968790e7440cd4b481cbbb657b29de749385a7c8348a1811abaf58bac0be8fe3d9c93270e6428f30c52cf3745388b5c82cbecf78754b09aa24b20f88e35610 SHA512 b1eb805fbd823aa7a3c7b5aca38e151fac23171a6dd4a4a1f12b277561a45e07aa7feb653ca96ee46adedf183c91c0caf5fa70c2005559ff57153086ceded714
 MISC metadata.xml 1316 BLAKE2B 996e794aec3c0a7f3b192fb9a66ebe7afaddc3f1ef2057d36a007770becf3d11ec0d05cf30a520cfb8537c1ae34bc9d89e8bc54224def1f4f2f4b30c657ead53 SHA512 b3cd21a16e51414d22b0f102f88da30ca1c3e596eb032ee7bde3c0d7b396659485c2565f0ed79c437eaca07b535fa3305796386e6023606ad1896edf7d347493
diff --git a/dev-python/spyder/spyder-5.3.0.ebuild b/dev-python/spyder/spyder-5.3.0.ebuild
new file mode 100644
index 000000000000..b12d9ce717ad
--- /dev/null
+++ b/dev-python/spyder/spyder-5.3.0.ebuild
@@ -0,0 +1,200 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_PEP517=setuptools
+
+inherit optfeature xdg distutils-r1
+
+# Commit of documentation to fetch
+DOCS_PV="f99196cc267b07fa7ad56f0134744b545fa21fcd"
+
+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/jellyfish-0.7[${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.2.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/qdarkstyle-3.1.0[${PYTHON_USEDEP}]
+	>=dev-python/qstylizer-0.1.10[${PYTHON_USEDEP}]
+	>=dev-python/qtawesome-1.0.2[${PYTHON_USEDEP}]
+	>=dev-python/qtconsole-5.3.0[${PYTHON_USEDEP}]
+	<dev-python/qtconsole-5.4.0[${PYTHON_USEDEP}]
+	>=dev-python/QtPy-2.0.1[${PYTHON_USEDEP},svg,webengine]
+	>=sci-libs/rtree-0.9.7[${PYTHON_USEDEP}]
+	>=dev-python/sphinx-0.6.6[${PYTHON_USEDEP}]
+	>=dev-python/spyder-kernels-2.3.0[${PYTHON_USEDEP}]
+	<dev-python/spyder-kernels-2.4.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-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.2.0-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.16, this dependency is carried by QtPy[pyqt5]
+	# Do not depend on pyqtwebengine<5.16, 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' \
+		-e '/pylint/d' \
+			requirements/conda.txt || die
+	sed -i \
+		-e "/'pyqt5[ 0-9<=>.,]*',/d" \
+		-e "/'pyqtwebengine[ 0-9<=>.,]*',/d" \
+		-e "/'python-lsp-server\[all\][ 0-9<=>.,]*',/d" \
+		-e "/'parso[ 0-9<=>.,]*',/d" \
+		-e "/'jedi[ 0-9<=>.,]*',/d" \
+		-e "/'pylint[ 0-9<=>.,]*',/d" \
+			setup.py || 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'" \
+		-e "/^PYLINT_REQVER/c\PYLINT_REQVER = '>=0.0.1'" \
+			spyder/dependencies.py || die
+
+	# do not check deps, fails because we removed dependencies 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 9ec1e8eda75e..cbc7fdeff834 100644
--- a/dev-python/sqlalchemy/Manifest
+++ b/dev-python/sqlalchemy/Manifest
@@ -1,9 +1,12 @@
 AUX sqlalchemy-1.3.20-pypy3.patch 7321 BLAKE2B 706ff7da1f25a667784f462effb85593e8ad9a3fe893000866e487ec32328a571f4440ce4dcce61e2b5f1ded5c8145f5cd12a141c40f4bb64e87135aa18a8274 SHA512 40944c59cc6cb17f512d0df1e2cf50626dfa6a53e2e8b182c0ccb4007c2338d8058459a9158e9e72ee6aa89394275cf818f0c7572b249175d3acd52f5a1c2827
-AUX sqlalchemy-1.4.27-drop-greenlet.patch 1422 BLAKE2B 7ed9aae160a3b2d3a68c08f32d7a271f5c6ec1b2d93dd9afdb77b73655b1245feeb2982e8dfa9ae7ef0e5e55bd2e2ac7146c95e9eb605a067ee309df5115b28c SHA512 abcc4a546a879fcf7b491259cc520365ead64948fefc47847f6761501a463577a9787f024360d25c2061829e431866d309f5c28b4e2af592f9b4224f583229b7
 DIST SQLAlchemy-1.3.24.tar.gz 6353598 BLAKE2B 6eb92b20fa3412a1f1398e18e902e3338320973287afa4a37477ec28d47e7422a19c3a60e6290a6da7b23512c0d818a26400958d02097def778c917f098bb3db SHA512 4f5f0a23e80e1cebe541f8748a7e794e8964d986252803b3289a7cea732ad22557e00221775332e2766b6ff16ad5d9069223f441f8880ca6d0c47011f15fee5b
 DIST SQLAlchemy-1.4.31.tar.gz 7999646 BLAKE2B 4c394aaa4bc5636cc90f06017466c227b5e16fc54c3a9a42b18cc13906640e4710146325e870598f8905074bf6dad42ea524febc029b1dd5f063e978ebc9a442 SHA512 e54261fcf992845b2e6be47d23f530aec28c7517e6741b1b6a101b9888d3dc3162c1eeab0acc1edb33f56f1360bae3cdccdbcbff0e1e88e477c93d0cd910c17c
 DIST SQLAlchemy-1.4.32.tar.gz 8077546 BLAKE2B 8eb0b617cdc147da21722f3e9b7c9c0659c9bc02f0530c724a7c8afafa9ea018c0558b58baa0387d84627115d474e87996fe8c7768ac53d55a0c817bc8f167b7 SHA512 e9bc125cb531182c97c9588bc7b87028ec334efe63d81d0bee0e7f74b0ce88ac183236298a05cdac42f3a0241b543528bf6f225d199e4bf6d8199caca63581bd
+DIST SQLAlchemy-1.4.34.tar.gz 8133799 BLAKE2B ec8b14bf4df2d9188805bf49aac394d5944e234099bcb9f20cbbb4114c757bee5933d1fd7025e6eda01bf7be6603cae83ff751928783134031ddf1ccf5d36da7 SHA512 c3158dc2c52dd865d98b84ce4cf0adde38300504d5f5ff61f953927baf8f2264d53255f6e83e2ce2f720529f1e8b3e57e684d56a57fd6a0881bd4f1ba10b373f
+DIST SQLAlchemy-1.4.35.tar.gz 8136388 BLAKE2B 01a47eab8e11daef133a218a7ef13fa149fb4616b531c3c6d227cc26e3264c259f42770b72335a9fbda5e66ae1ce242fcbe676a528ca1af896d990a84a1f1a57 SHA512 195ab35934bca36e7c4c2127f153eff31775f7f150163912f79143efae63911eded67d8645e08ede2c533c675d18c3c5796235e0c0f6d1e6ebb97664ac13f171
 EBUILD sqlalchemy-1.3.24.ebuild 1817 BLAKE2B 7cf908d3be350140f1f1744ed3361bd2fa12f1cdd3d5cd08b2abb5d408c796a0837d3a585c8b299065f4da4f231dd83fdb6e9a3982aed6ef8465e7e1edd9d6f2 SHA512 3ff6fa141d32dbe4c96715eaaf88e3aa616eb98f19ca9913eee74f573b05bf91f57430d1c3b30060b28e1846b2a613f6ede62224f9163b28818e5b306a6b7125
 EBUILD sqlalchemy-1.4.31.ebuild 1904 BLAKE2B 0e84fa418b508f4793ceabbe655c227b3f2cd92bd626e5ecde35a9996182f24690db87cfaf5172eec8d0ec27e425824180fa1f5fddf4b68ed026d7c6ad95a373 SHA512 9dad795092985c87f6929f9e8f4184ec3ae99458e2bf2518da13769c059bb24b91782d8fb4d5b00e7eb5e477428cd1eb7c1dc2dfc03c521bc7576aafe52153a5
 EBUILD sqlalchemy-1.4.32.ebuild 1918 BLAKE2B bea31a01db2aced03a30892bda95b78b949a3f7cc3f447a9657b12b2c2c42680b8426bce9d2033b3e752d28c2ac23766c3ddd154ded311986bc0606114ac0533 SHA512 ec947ce600497e7dd9c46f1d318315a209a84c22bcc42d67949e1310eccbd8b706dfa93805123ea935d793e4299de61004c3693fd695af5c0dbc02f351d0d4c4
+EBUILD sqlalchemy-1.4.34.ebuild 2082 BLAKE2B 0afdbc46dc7e213d0d7d8a4ccd20f6610cd631a2ac6898db3b6c8e95701e09caa8871e4942033fd44fff23890c0be7a8a768517ea970f7c5fb080068cc239964 SHA512 cb939b3f14a15cd546b5cadfbae406607fa95be07436167586b424aee80fc382988daf07f77c60d09c55d0846825a3a30bed64b10bfcf520e1e09caeb0375f77
+EBUILD sqlalchemy-1.4.35.ebuild 2137 BLAKE2B d00bc47b9c2cdd92164ece6932d886b6dfadfb7a10df80dd6d4b827f2120d2dd188e61a234740a4c6597436904b3fb4a4b08e92c4b701d918c50991a3463c7ef SHA512 97a09f7f2c1442daec6490bd98d59d0eae4bcb12c7f4bf41b466ba92a0645c87b02586e1a21e40ab1ec6cbd210e63a5fe389b76d0534bfc0a490e6d1bd75bc13
 MISC metadata.xml 444 BLAKE2B 5fbfcf8f16e52ab5bb691b0b33a8491d94e42a80409114cd9b306af7d4b0eb8b6660fabc663adee53080c635217961301b78df536995b91afe9288d255f73d62 SHA512 b432b65ed3033d34ac0784d007909eb838b309b6a4785eebb1a3f808e43dfc41c786cd55e4dd048776c65127aac170bdd9fb9e5a8ae63accb5f65e300bca9676
diff --git a/dev-python/sqlalchemy/files/sqlalchemy-1.4.27-drop-greenlet.patch b/dev-python/sqlalchemy/files/sqlalchemy-1.4.27-drop-greenlet.patch
deleted file mode 100644
index 07184b843c9e..000000000000
--- a/dev-python/sqlalchemy/files/sqlalchemy-1.4.27-drop-greenlet.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-Not available on all arches we support and is only needed for
-a few consumers.
-
-https://bugs.gentoo.org/828482
-
-From: Sam James <sam@gentoo.org>
-Date: Wed, 8 Dec 2021 00:31:01 +0000
-Subject: [PATCH] Drop greenlet dependency
-
---- a/setup.cfg
-+++ b/setup.cfg
-@@ -36,11 +36,8 @@ package_dir =
- 	=lib
- install_requires = 
- 	importlib-metadata;python_version<"3.8"
--	greenlet != 0.4.17;python_version>='3' and (platform_machine=='aarch64' or (platform_machine=='ppc64le' or (platform_machine=='x86_64' or (platform_machine=='amd64' or (platform_machine=='AMD64' or (platform_machine=='win32' or platform_machine=='WIN32'))))))
- 
- [options.extras_require]
--asyncio = 
--	greenlet!=0.4.17;python_version>="3"
- mypy = 
- 	mypy >= 0.910;python_version>="3"
- 	sqlalchemy2-stubs
-diff --git a/setup.cfg b/setup.cfg
-index b7f69e9..91993f7 100644
---- a/setup.cfg
-+++ b/setup.cfg
-@@ -57,7 +57,6 @@ oracle =
- postgresql = psycopg2>=2.7
- postgresql_pg8000 = pg8000>=1.16.6
- postgresql_asyncpg = 
--	%(asyncio)s
- 	asyncpg;python_version>="3"
- postgresql_psycopg2binary = psycopg2-binary
- postgresql_psycopg2cffi = psycopg2cffi
-@@ -65,13 +64,10 @@ pymysql =
- 	pymysql;python_version>="3"
- 	pymysql<1;python_version<"3"
- aiomysql = 
--	%(asyncio)s
- 	aiomysql;python_version>="3"
- asyncmy = 
--	%(asyncio)s
- 	asyncmy>=0.2.3;python_version>="3"
- aiosqlite = 
--	%(asyncio)s
- 	aiosqlite;python_version>="3"
- 	typing_extensions!=3.10.0.1
- sqlcipher = 
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.4.34.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.34.ebuild
new file mode 100644
index 000000000000..1bb418de0bfe
--- /dev/null
+++ b/dev-python/sqlalchemy/sqlalchemy-1.4.34.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
+PYTHON_REQ_USE="sqlite?"
+
+inherit distutils-r1 optfeature
+
+MY_PN="SQLAlchemy"
+MY_P="${MY_PN}-${PV/_beta/b}"
+
+DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
+HOMEPAGE="https://www.sqlalchemy.org/ https://pypi.org/project/SQLAlchemy/"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="examples +sqlite test"
+
+BDEPEND="
+	test? (
+		$(python_gen_impl_dep sqlite)
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_IGNORE=(
+	# hardcode call counts specific to Python versions
+	test/aaa_profiling
+)
+
+src_prepare() {
+	sed -i -e '/greenlet/d' setup.cfg || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=()
+	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
+		test/ext/test_associationproxy.py::ProxyHybridTest::test_msg_fails_on_cls_access
+	)
+
+	# upstream's test suite is horribly hacky; it relies on disabling
+	# the warnings plugin and turning warnings into errors;  this also
+	# means that any DeprecationWarnings from third-party plugins cause
+	# everything to explode
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=
+	# upstream automagically depends on xdist when it is importable
+	if has_version "dev-python/pytest-xdist[${PYTHON_USEDEP}]"; then
+		PYTEST_PLUGINS+=xdist.plugin
+	fi
+	epytest
+}
+
+python_install_all() {
+	if use examples; then
+		docompress -x "/usr/share/doc/${PF}/examples"
+		dodoc -r examples
+	fi
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "asyncio support" dev-python/greenlet
+	optfeature "MySQL support" dev-python/mysqlclient dev-python/pymysql \
+		dev-python/mysql-connector-python
+	optfeature "mssql support" dev-python/pymssql
+	optfeature "postgresql support" dev-python/psycopg:2
+}
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.4.35.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.35.ebuild
new file mode 100644
index 000000000000..00bf1bc4a0bc
--- /dev/null
+++ b/dev-python/sqlalchemy/sqlalchemy-1.4.35.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
+PYTHON_REQ_USE="sqlite?"
+
+inherit distutils-r1 optfeature
+
+MY_PN="SQLAlchemy"
+MY_P="${MY_PN}-${PV/_beta/b}"
+
+DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
+HOMEPAGE="
+	https://www.sqlalchemy.org/
+	https://pypi.org/project/SQLAlchemy/
+	https://github.com/sqlalchemy/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 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="examples +sqlite test"
+
+BDEPEND="
+	test? (
+		$(python_gen_impl_dep sqlite)
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_IGNORE=(
+	# hardcode call counts specific to Python versions
+	test/aaa_profiling
+)
+
+src_prepare() {
+	sed -i -e '/greenlet/d' setup.cfg || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=()
+	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
+		test/ext/test_associationproxy.py::ProxyHybridTest::test_msg_fails_on_cls_access
+	)
+
+	# upstream's test suite is horribly hacky; it relies on disabling
+	# the warnings plugin and turning warnings into errors;  this also
+	# means that any DeprecationWarnings from third-party plugins cause
+	# everything to explode
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=
+	# upstream automagically depends on xdist when it is importable
+	if has_version "dev-python/pytest-xdist[${PYTHON_USEDEP}]"; then
+		PYTEST_PLUGINS+=xdist.plugin
+	fi
+	epytest
+}
+
+python_install_all() {
+	if use examples; then
+		docompress -x "/usr/share/doc/${PF}/examples"
+		dodoc -r examples
+	fi
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "asyncio support" dev-python/greenlet
+	optfeature "MySQL support" \
+		dev-python/mysqlclient \
+		dev-python/pymysql \
+		dev-python/mysql-connector-python
+	optfeature "mssql support" dev-python/pymssql
+	optfeature "postgresql support" dev-python/psycopg:2
+}
diff --git a/dev-python/stripe/Manifest b/dev-python/stripe/Manifest
index 891418e6cf30..a8d7dba597b1 100644
--- a/dev-python/stripe/Manifest
+++ b/dev-python/stripe/Manifest
@@ -1,5 +1,7 @@
 DIST stripe-2.66.0.tar.gz 234929 BLAKE2B 289c3464c3aa9ef5ebeccaffde383271ca23e704303d5b5499d1f5f1f197483088781d16878749bca03c8ea56209a22173c376ef00510f53d81c733f0a626af8 SHA512 d716e82580757ec0b187a74de1f8ef7bbe2f32468f13c551886bcbadf631eef001df9f4d249f091856b009545ca8b6d60f16c07e79345fee33651e7d27fb31c0
 DIST stripe-2.67.0.tar.gz 235426 BLAKE2B ee396b0b7d3991afdd81e6b051fad0168a7b3dcfaddccc7700292878fc437788dcc40480fea2131dd52e3b787dc6e7b420d6023079f55d9365f76076cc51070d SHA512 099208259c6ca8d69fd6f39f72b9f12f41eace2f0a2a08b017f6141ad06882df742749941326fb8d9898db7c59e32ed74a464ad372d6f7f0a929c9ae4e4d2475
+DIST stripe-2.70.0.tar.gz 239653 BLAKE2B d59d7b452e91169e83e4d4bc10b544fc94c48aa3a967c899136b1b9ea60e835d998c1a5a0c5e131989d9628c36b77e3fe133952dddbede69d0bcfa11dc9fc640 SHA512 62f40d82e4a5d37ce070a2457b8372d903993e209f6a042ab97a93f5ee98eb994c0cac070451e2b130df9a72f4a9ece65600266735b438aff3cc5cf09e217b27
 EBUILD stripe-2.66.0.ebuild 1741 BLAKE2B ce808e22b32aa90b2b443b6ae2f260de4838b9301bf8c5207e40030f52f7ce1d5cc6de83c0eeafa8dd946c611af50e8daf13883f6a7946678cedbbb9af30bf44 SHA512 b5f11d966b8537860176b4407909def3e7a4e07fa885308966e350b3cb88c8414ecc0792a61e727d348ef75e98b35ecf50ed338c738ac8c7ec08836b224a4ff8
 EBUILD stripe-2.67.0.ebuild 1743 BLAKE2B ce960764e254ee10db75b8f17b5a43886e22ababa16e31b7a1b19a1c8b897168e0aab74df63db394eb4d3be666639fa1fc91d0178566575401e25d7b2f150688 SHA512 384a3d9ffcd3b3c2e3c832181a3a998aa5f6d3058028a4dc7b161ca2994309975458fb6c51190d7b7686e65ddaadbe21d2fd273f35a60f8cf8c0126b03e4112f
+EBUILD stripe-2.70.0.ebuild 1780 BLAKE2B d186d93808b240a9318f12557c6ff7278e1f3ff48b166ad1485acb9aac1e4fd386a28b3266f78319fc3ffd23ff0202c6161b89306eb1f806d5e7ba2125af3ccf SHA512 9289b51079bfe0af4bf6f30c15bdabbea2fcf9dd7f4d9d128b1a1be80fef2913810f24f62b7a6bf7f735b27f2ecad88493a276b6f141b63f0fc8eaf9c3fbaaca
 MISC metadata.xml 372 BLAKE2B e6a38fdec6fc016068e7a0522ba15e83bf358ba1475e54a9630b1e86c75bc14b790c59716317bd81438a1c770e4d31afbe04400ddcd5dd272715c251fd6cb1a2 SHA512 2d9672b242f2d38654f7906097e597dfbdf75afa3583ea331f61772db95d19a802e83ed523c67a6cf3da18411036055c0996fd04d99199618d5205be8a61bd77
diff --git a/dev-python/stripe/stripe-2.70.0.ebuild b/dev-python/stripe/stripe-2.70.0.ebuild
new file mode 100644
index 000000000000..b88af4c76c63
--- /dev/null
+++ b/dev-python/stripe/stripe-2.70.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Stripe python bindings"
+HOMEPAGE="https://github.com/stripe/stripe-python"
+SRC_URI="mirror://pypi/s/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/requests-2.20[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		>=dev-util/stripe-mock-0.122.0
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		net-misc/curl
+	)
+"
+
+distutils_enable_tests pytest
+
+DOCS=( LONG_DESCRIPTION.rst CHANGELOG.md README.md )
+
+python_test() {
+	epytest tests
+}
+
+src_test() {
+	local stripe_mock_port=12111
+	local stripe_mock_max_port=12121
+	local stripe_mock_logfile="${T}/stripe_mock_${EPYTHON}.log"
+	# Try to start stripe-mock until we find a free port
+	while [[ "${stripe_mock_port}" -le "${stripe_mock_max_port}" ]]; do
+		ebegin "Trying to start stripe-mock on port ${stripe_mock_port}"
+		stripe-mock --http-port ${stripe_mock_port} &> "${stripe_mock_logfile}" &
+		local stripe_mock_pid=$!
+		sleep 2
+		# Did stripe-mock start?
+		curl --fail -u "sk_test_123:" \
+			http://127.0.0.1:${stripe_mock_port}/v1/customers &> /dev/null
+		eend $? "Port ${stripe_mock_port} unavailable"
+		if [[ $? -eq 0 ]]; then
+			einfo "stripe-mock running on port ${stripe_mock_port}"
+			break
+		fi
+		(( stripe_mock_port++ ))
+	done
+	if [[ "${stripe_mock_port}" -gt "${stripe_mock_max_port}" ]]; then
+		eerror "Unable to start stripe-mock for tests"
+		die "Please see the logfile located at: ${stripe_mock_logfile}"
+	fi
+
+	local -x STRIPE_MOCK_PORT=${stripe_mock_port}
+	distutils-r1_src_test
+
+	# Tear down stripe-mock
+	kill "${stripe_mock_pid}" || die "Unable to stop stripe-mock"
+}
diff --git a/dev-python/subprocess-tee/Manifest b/dev-python/subprocess-tee/Manifest
index 37a31e197956..7b6aa94ee6da 100644
--- a/dev-python/subprocess-tee/Manifest
+++ b/dev-python/subprocess-tee/Manifest
@@ -1,3 +1,3 @@
 DIST subprocess-tee-0.3.5.tar.gz 16887 BLAKE2B 6eb25085eb2b2ee4557efd556d8035ab8f6b781b47783f24f227db04b3f82fffcfa29d69f0e3588c3fa6188446a3d96d4421e6b1ea5b3292f42635e19a404bab SHA512 47de075e7b6c75598dac0ad1899e1cce9dc1131b49c35ccade2b67c8d2a2d0248ce22a20c336519ff00bfd57269613bc663012e48cf0afa087c93ee74e18e4d4
-EBUILD subprocess-tee-0.3.5.ebuild 905 BLAKE2B de2686e446d4b33872fd24c684efa8ec1267d4e3249b2f2b7277886d73199656ae1d2b5900f3b8c9ccb54e3b335f4c021da5d05daf1f7d493f3071ef283e9a05 SHA512 1ab63e698a0ecf79eca1fa1d11dd836790a4af3f7a513e68b194d368d0ecff784b8504d05a8978cc84b2930cd08cf9d065e23cb4b70829a56980069c3d835014
+EBUILD subprocess-tee-0.3.5.ebuild 912 BLAKE2B 69cfb68207fc4dc69ea1343ab5beca0108e70fa45a2e8a933df0182149d755f22fb283d5ccd34be82c309e89322de52a22fe916e13e9b1593176b3fd9b519229 SHA512 b8a1b3bedcbb0ef5941503150a1b5c9aef496aae4b77563aae0430d7a545f1192d62e980e60a57ebce1163ea1e248c47554246bea8e743f3df8c651b4e503414
 MISC metadata.xml 632 BLAKE2B 5764da49dca8c701e0fc0c3446d82bc24b361450df134cf5abe1c72af30d124da17186bda4a775b101e9ff7def515b45a42936ffeb8baf25dec69dd5f6b887a3 SHA512 4d71f7ced279578327551ca7913f02c8a88be17a841c7adb8e2c3e931a879560e12b54f387a714dd8bb327181549c94fb0fd00028aecd7eb4dc6e4f35c4ad4c0
diff --git a/dev-python/subprocess-tee/subprocess-tee-0.3.5.ebuild b/dev-python/subprocess-tee/subprocess-tee-0.3.5.ebuild
index c715a596b1ae..ea05ad858dc4 100644
--- a/dev-python/subprocess-tee/subprocess-tee-0.3.5.ebuild
+++ b/dev-python/subprocess-tee/subprocess-tee-0.3.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~riscv"
 IUSE="test-full"
 REQUIRED_USE="test-full? ( test )"
 
diff --git a/dev-python/sybil/Manifest b/dev-python/sybil/Manifest
index a2667ddf6444..609c645e7eaa 100644
--- a/dev-python/sybil/Manifest
+++ b/dev-python/sybil/Manifest
@@ -1,6 +1,3 @@
-AUX sybil-3.0.0-test-order.patch 1864 BLAKE2B 8b84a7148a51c5f7ac6f2c0a2c296ae6833c80dd27f5a3d260aa40c7ed88f5a90480b8961266620d91fd67acffe462fa63d206df2e9f0bd35b50912f9d9716c4 SHA512 f2b11a7a7f53a8ead589efdb89e84fa1508833d5ab248e23da386f96bc949ad17e3c45aea7afbc5bfbe0148f5ad368ccafef37dcef0d2ba6877cdb112b6f8bb0
-DIST sybil-3.0.0.tar.gz 38011 BLAKE2B 7a42d5b0f3f13ac111d9edc9f74cb4d968f49680bb33d267ee762e830b134fa8c2e1697834d6a6a7aa09c9cd1dc52552379ca43e6667ee844f54f34b8bd3ffc7 SHA512 b6f5b5ebdeeab2ecbe17b6f83f0bc7e83e68f8e784b6a0eea292020db42294f8a1d0288d208f8a5803d5866038c3226f0b7d0d177c91469c4651364078d1bb4d
 DIST sybil-3.0.1.tar.gz 38265 BLAKE2B 3a9dd8d85a5a6228944f104d255826b4dfee80f5a349da3a0fa69edcfa0953145378f002c1bf834e21c0d382fc96a993b927bdc92bb3e9a84d34998ad6ade62f SHA512 312c57f0de646b1e7a3b992806362c1020b2d567c805d248e94ab22a336a8fc77704234e123e1ec74987bfea620b2f8c4d3714d32aee03587c615d3d90fe5558
-EBUILD sybil-3.0.0.ebuild 483 BLAKE2B 25e7d4f64ffc583bb8dbedaba6e4b4623586bd91c479dad9c848f1805739f4edb3016437f16a5e34093c427fe88b0fd98e1d30ac9006e4b48540bafb91bae616 SHA512 2399e1fbd9dfeaeebefb21afba3f3f4e50cf04661771342c6ab9776efff2d0cd3f07d3471925d002ebb65507528969f92321e0a5f486ef71a7ca8205430dbbf6
-EBUILD sybil-3.0.1.ebuild 469 BLAKE2B f7b62253ba979cef9b9fef5745156ba2b1b72c10442b5d506ab80b46a656616a5f3f584e7d474fcf78c4054af89bd73c451271abea8fa9d1aebfed5296540a35 SHA512 a6dd01c8beb01ced8abba4195a8e05d9e0a5511b3b65c1134da2bd1fa032556264e7ca9e2535b5f03d615aa7d1c9afb418cc6a1f2b0536efa92d82e339f6d69b
+EBUILD sybil-3.0.1.ebuild 466 BLAKE2B df5ab70c7279e7661e351c045c7210f81a9db8f2acdd5f29906503ae30af5e6e2f0165c5e7baf90b984cd047861c099f97f006e16cc9beca9987f8bcd0111e24 SHA512 09d5cbc6dd13b18e35bdfe5fd611e72627d1126061f12560ca7991a952da7ec8c2e9aed30787274b25ad119723299e7f840a08843f95f2733e095100be37bf8e
 MISC metadata.xml 402 BLAKE2B 3fcce3ac9ff731e24a3f6e761da2d840b3a7c9107b3d9a46afe00fed61b475d1400580b4ccf49dd71f6a1ab8098dc2aaf895e529a723cd96301d1400ee211edf SHA512 138106c714dc33871ccf535cc47d669580b665c842adfea5442a03067fe507236d8fde4158f006e1188003abe53c9c25db98632dadd1cfa0e41efd1755c2c75c
diff --git a/dev-python/sybil/files/sybil-3.0.0-test-order.patch b/dev-python/sybil/files/sybil-3.0.0-test-order.patch
deleted file mode 100644
index 1badf5b06a19..000000000000
--- a/dev-python/sybil/files/sybil-3.0.0-test-order.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 4d1e1c891bd619a0dec0a265a930bf49050833d1 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Wed, 27 Oct 2021 13:07:01 +0200
-Subject: [PATCH] Restore sorting of test paths to make tests reliable again
-
-11496eb5761761b687ad4889b4173d3124caa844 has replaced the all_documents
-method with a direct call to glob.  This has implicitly resulted
-in removal of path sorting that in turn means that the test output
-depends on filesystem order now and is no longer reliable.
-In particular, the tests can now fail randomly depending
-on the underlying filesystem, unpack/checkout order, etc.  Restore
-explicit sorting to make test order predictable again.
-
-Fixes #34
----
- sybil/integration/unittest.py | 2 +-
- tests/test_sybil.py           | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/sybil/integration/unittest.py b/sybil/integration/unittest.py
-index 7129ddf..ce34caf 100644
---- a/sybil/integration/unittest.py
-+++ b/sybil/integration/unittest.py
-@@ -38,7 +38,7 @@ def unittest_integration(sybil: 'Sybil'):
- 
-     def load_tests(loader=None, tests=None, pattern=None):
-         suite = TestSuite()
--        for path in sybil.path.glob('**/*'):
-+        for path in sorted(sybil.path.glob('**/*')):
-             if path.is_file() and sybil.should_parse(path):
-                 document = sybil.parse(path)
- 
-diff --git a/tests/test_sybil.py b/tests/test_sybil.py
-index 74a04ea..72a5aea 100644
---- a/tests/test_sybil.py
-+++ b/tests/test_sybil.py
-@@ -243,7 +243,7 @@ def parse(document):
- 
- def test_namespace(capsys):
-     sybil = Sybil([parse], path='./samples')
--    documents = [sybil.parse(p) for p in sybil.path.glob('sample*.txt')]
-+    documents = [sybil.parse(p) for p in sorted(sybil.path.glob('sample*.txt'))]
-     actual = []
-     for document in documents:
-         for example in document:
diff --git a/dev-python/sybil/sybil-3.0.0.ebuild b/dev-python/sybil/sybil-3.0.0.ebuild
deleted file mode 100644
index 0b0c9f2b1cfe..000000000000
--- a/dev-python/sybil/sybil-3.0.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 2019-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="Automated testing for the examples in your documentation"
-HOMEPAGE="https://github.com/simplistix/sybil"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}"/${P}-test-order.patch
-)
diff --git a/dev-python/sybil/sybil-3.0.1.ebuild b/dev-python/sybil/sybil-3.0.1.ebuild
index 15c8b5282f0d..1254f47d97fb 100644
--- a/dev-python/sybil/sybil-3.0.1.ebuild
+++ b/dev-python/sybil/sybil-3.0.1.ebuild
@@ -14,6 +14,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/symengine/Manifest b/dev-python/symengine/Manifest
index e908ca2e5e5c..bb18cfcc2e2e 100644
--- a/dev-python/symengine/Manifest
+++ b/dev-python/symengine/Manifest
@@ -2,6 +2,6 @@ DIST symengine.py-0.8.1.tar.gz 108857 BLAKE2B ff721982af3448d63074e599d56d38eef3
 DIST symengine.py-0.9.1.tar.gz 110693 BLAKE2B 16ac7a36ebf7ef6642f8fde1b8463b63177753db3c5d87ed3cacc547c94561df504e5ae92af0e121010cabf70f6b123c73f5eb8e77809bed1de779dbf18f2e7c SHA512 560c809b0a5628752aefe4be5aaa8f1f8482abcbb50d018d9ffee395d7c956b4f5cedd13953f0641594d468fcbbe0465576d16543d22dbbc84b270b285970786
 DIST symengine.py-0.9.2.tar.gz 110856 BLAKE2B 11330acc04970d367fe66787521776dbd803929d91802ea09d1bc54a96c8fd87e85114042f57fc8c007de2dcaa1b0503a8389ac677797cc2efc866d71d76d1db SHA512 ea9e8cb7dd789b551f5372c32b98365ab251bac838204b5c832783f9866c2774f5d411f2f59e5e60f17939a1c341702acfc3e3f7e77246330ab3cb74f5ba7cca
 EBUILD symengine-0.8.1-r1.ebuild 1056 BLAKE2B bd814c938fb24bb0a1364120f9e26167a13692c09cfadbd3f0ef14451990dd1762deeba4c77267ca3f5a0695a783fce6c327de5155d873dbbd6566882986ff73 SHA512 276055d95e31eb4439c8c516b7c7c0fe70935ecba4c125e17148d03632a29b09d6106d2746f0cfd9010c7a9e4a4fc85e34b0344a033c3d1acafb9264f5ad2d9d
-EBUILD symengine-0.9.1.ebuild 1164 BLAKE2B 492d971aabd1d49b60ed489d354570ebab70561dd12ed8969d0b78f1952088235d6059ffb298d445aa06af1e70bbc2550f200a8601dae60ae63be60a885b5a27 SHA512 3956eedfc1d7bdf0da367f945c9128a00052dbdcd033f5ce1636d99a1cfcb158f49245c9c030178d2224e25fcd6c2e0676683ad78aab39ed64e10648bf5ec58a
-EBUILD symengine-0.9.2.ebuild 1097 BLAKE2B 9bd9113da027aaca93cc52a43c46fe25d3911a5a64bb073f1a34f55d27cc8f2ccaa59a6dd4dd3954e3672bacee6e6bf0a273bacd7ed19c432f02dd098aa749e4 SHA512 476684b73a4d3228bd729d1d5fdb4e1016e32167108a0f390223666a8953399da844990124d3bd503bc9097e48bfebcdd410f35269a3ea570316aa5456bf8b6a
+EBUILD symengine-0.9.1.ebuild 1162 BLAKE2B 91494f4a445353378f5663dd3bf2572dcfadf549ff5ca2edc48a78e464360d57b3202762d66234665e303b2324398147a1ac27f09bb3cd2f64bb730d5d8c3c9c SHA512 4929ae2ea4d4879bd516a4d3ecc828a65e7a4b8cb004133a152b8aa27a22207c6df628fe3b5b3c3aea012954bcd583a0ee1d89ee771a2b2d28d9f1bed97adf63
+EBUILD symengine-0.9.2.ebuild 1100 BLAKE2B 4693049f2ff325cc6aa7c20b01e765fef54ecf6690674806479975045ca691d984033cca5f0e048f20b6fb6a3d8c358c623f309070ab6b0ea2480c396d7ebe1c SHA512 cc031fc4770b67d955122b1cad1a113e2211a820949334809ac5d1b0f4afd7cc16c9f614edb1abd7265e24be970f007dbba427f9e4d5f7dd6d473d7c6c087c7a
 MISC metadata.xml 404 BLAKE2B 5ff5d7b399605db96aeac08c73ce653dd7b24354e49fb316e4e943ceaa51b272d5f6bad8d44f8a6f4ab6d23a2b322b96b21f4600335d169ef8c1ad3bf0b1976d SHA512 73306bcbdecf7935f187df67b4ff819dec323f4ae8cfadaa4e1d99fef4165af7f085cc2a0b8ade29a68cbcc3e692d5b278e33fcc06303d6c54a24fe6470e792d
diff --git a/dev-python/symengine/symengine-0.9.1.ebuild b/dev-python/symengine/symengine-0.9.1.ebuild
index 8de23b56c62e..2d68a11c36b1 100644
--- a/dev-python/symengine/symengine-0.9.1.ebuild
+++ b/dev-python/symengine/symengine-0.9.1.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~riscv x86"
 
 BDEPEND="dev-util/cmake
 	dev-python/cython[${PYTHON_USEDEP}]
diff --git a/dev-python/symengine/symengine-0.9.2.ebuild b/dev-python/symengine/symengine-0.9.2.ebuild
index bd092eae52a7..e65a2353d4c8 100644
--- a/dev-python/symengine/symengine-0.9.2.ebuild
+++ b/dev-python/symengine/symengine-0.9.2.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 
 BDEPEND="
 	dev-util/cmake
diff --git a/dev-python/tempest/Manifest b/dev-python/tempest/Manifest
index f1320c78fb0c..315aff19f48b 100644
--- a/dev-python/tempest/Manifest
+++ b/dev-python/tempest/Manifest
@@ -1,6 +1,3 @@
-DIST tempest-29.2.0.tar.gz 1092824 BLAKE2B cad7284ab5a5a39a1a5bdf9f2365a85d337e4ebe17243bc3692a98402ef7f11b27b94e0252d9d427f358c343b736b500db5386098950c88b09f23d87de9ad856 SHA512 4042bce9c5d7cd26d652189d82ee91ac43d73a515b690820dfe05b70c2e792ec6f3bb0be5566bb37e81965015f62773414c8a16cc77512b1e52f141eafbd542d
 DIST tempest-30.0.0.tar.gz 1110715 BLAKE2B b697ecbced21124719e6b1d7ebd2c4f8ba83528a84da0b8f8109c155b61124581b97c180bbdc6885ae53850fb28daed25772d12be5026c44ecc3fe4f0dad98a3 SHA512 fa9be713ccb130ad065628592f59bebda3dc1fa8222ab3c382ec5b299504dc0a730f2110ef80f98bbdd1288b5785ab745fe39b721b77f7343983c1bc0a036f19
-EBUILD tempest-29.2.0-r1.ebuild 2083 BLAKE2B b7dfd73418ce1b7421e9603f345970011ad0e418f8f40140b6587803e1f89275b8e5be2867c527a8c3a1ac0c467710e8fa61eb25bdcaf21d4b3d3441e3b44848 SHA512 9bae7147ffa34b9126d8e2c2fb4acd1b2ad38abbf249537dd255f45232cc27eb97f65be3f0e7a6eccee4ab9add9802e99fd0a5e1e514dcadcc9f930f1193f8fb
-EBUILD tempest-29.2.0.ebuild 2072 BLAKE2B a49c534b16aa4c138274636e0768bde40baa83e18adf7ab2c4dcadb3ac6fbae72dc9731e1f7232db167be6dd22809885be6fc32e572ec1167594135c769dfa6b SHA512 b4263e8b54261bcb63397995c7afd21cca4027c6a6d9d43d08cf99b7092284a69f18c8b0e96931d9e3347ce69bbdd0eb75d8f5691b646a56a2d991cab0fb2a36
-EBUILD tempest-30.0.0.ebuild 2083 BLAKE2B b7dfd73418ce1b7421e9603f345970011ad0e418f8f40140b6587803e1f89275b8e5be2867c527a8c3a1ac0c467710e8fa61eb25bdcaf21d4b3d3441e3b44848 SHA512 9bae7147ffa34b9126d8e2c2fb4acd1b2ad38abbf249537dd255f45232cc27eb97f65be3f0e7a6eccee4ab9add9802e99fd0a5e1e514dcadcc9f930f1193f8fb
+EBUILD tempest-30.0.0.ebuild 2080 BLAKE2B 08756fd5379f4accc888100a62ff0fdc1cc498dc538537603bc9c860944f543d0562c40550feba5b0c1a38483d80118c3f938531f01c380146a7495d426cc712 SHA512 80a1009431495512478aaa8a749156a2ff12a09ee8cadf6ec68fe3a715a52b14e4db1325ee666c1514086fe30e3a9dc2e5a27b338ac186ec176fde81ea580a6f
 MISC metadata.xml 402 BLAKE2B 9a28d185d29e8844299c1f6276b80759cb0ba7d0b9de14f70cb92f4bd69a4604aaffb7ed0cd0e65764099007a87de3e15c519dbdbc8a247d8ffe884613c7af5e SHA512 e9ef089f055cb4d6bb527f58d2e386d7796b2df34a8bb850c90f86cb98d08259b5ecd5e785389cfa6351f1319502c6822e3cf6a6250ac7dcd1838923b3deac87
diff --git a/dev-python/tempest/tempest-29.2.0-r1.ebuild b/dev-python/tempest/tempest-29.2.0-r1.ebuild
deleted file mode 100644
index e9f0d2aad3d1..000000000000
--- a/dev-python/tempest/tempest-29.2.0-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="OpenStack Integration Testing"
-HOMEPAGE="https://pypi.org/project/tempest/ https://docs.openstack.org/tempest/latest/"
-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/pbr-2.1.0[${PYTHON_USEDEP}]
-	>dev-python/cliff-2.9.0[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
-	>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/paramiko-2.7.0[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-4.7.0[${PYTHON_USEDEP}]
-	>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.12[${PYTHON_USEDEP}]
-	>=dev-python/subunit-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.21.1[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		dev-python/stestr[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	# Small subset of tests, which fail as result of not using specific
-	# testing environment. Others expect to run suite using stestr.
-	rm -r tempest/tests/lib/services/volume/v3/ || die
-	rm tempest/tests/test_list_tests.py || die
-	rm tempest/tests/lib/cmd/test_check_uuid.py || die
-
-	# remove dep on hacking
-	rm tempest/tests/test_hacking.py || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local -x OS_LOG_CAPTURE=1 OS_STDOUT_CAPTURE=1 OS_STDERR_CAPTURE=1 OS_TEST_TIMEOUT=320
-	eunittest -b -s tempest/tests -t .
-}
-
-src_install() {
-	distutils-r1_src_install
-	mv "${ED}/usr/etc" "${ED}/etc" || die
-}
diff --git a/dev-python/tempest/tempest-29.2.0.ebuild b/dev-python/tempest/tempest-29.2.0.ebuild
deleted file mode 100644
index 5db5ba750c7a..000000000000
--- a/dev-python/tempest/tempest-29.2.0.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 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="OpenStack Integration Testing"
-HOMEPAGE="https://pypi.org/project/tempest/ https://docs.openstack.org/tempest/latest/"
-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/pbr-2.1.0[${PYTHON_USEDEP}]
-	>dev-python/cliff-2.9.0[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
-	>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/paramiko-2.7.0[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-4.7.0[${PYTHON_USEDEP}]
-	>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.12[${PYTHON_USEDEP}]
-	>=dev-python/subunit-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.21.1[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		dev-python/stestr[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	# Small subset of tests, which fail as result of not using specific
-	# testing environment. Others expect to run suite using stestr.
-	rm -r tempest/tests/lib/services/volume/v3/ || die
-	rm tempest/tests/test_list_tests.py || die
-	rm tempest/tests/lib/cmd/test_check_uuid.py || die
-
-	# remove dep on hacking
-	rm tempest/tests/test_hacking.py || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	distutils_install_for_testing
-	local -x OS_LOG_CAPTURE=1 OS_STDOUT_CAPTURE=1 OS_STDERR_CAPTURE=1 OS_TEST_TIMEOUT=320
-	eunittest -b -s tempest/tests -t .
-}
-
-src_install() {
-	distutils-r1_src_install
-	mv "${ED}/usr/etc" "${ED}/etc" || die
-}
diff --git a/dev-python/tempest/tempest-30.0.0.ebuild b/dev-python/tempest/tempest-30.0.0.ebuild
index e9f0d2aad3d1..94fc2e0d97c9 100644
--- a/dev-python/tempest/tempest-30.0.0.ebuild
+++ b/dev-python/tempest/tempest-30.0.0.ebuild
@@ -14,7 +14,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/pbr-2.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/testfixtures/Manifest b/dev-python/testfixtures/Manifest
index abb020824947..cf5273ace072 100644
--- a/dev-python/testfixtures/Manifest
+++ b/dev-python/testfixtures/Manifest
@@ -1,8 +1,3 @@
-AUX testfixtures-6.18.1-py3.10.patch 6506 BLAKE2B 09db867dfaf8b76098681ce2b74731a8224b54e72b96362a34187e3e55309095bac8459d40b3c54fc6cedebe13c9f76ac9cc18ff43c2bf9e88b9dbfa369dff5a SHA512 d91b46005525cbefa2100eee25720b1229c6ca8213aaf36578635ffc82edc50aeef278d8e009d13bdb14ab791d7969b5fd39ae70fb2becce8f255edee1256792
-DIST testfixtures-6.18.3.tar.gz 122142 BLAKE2B 014cc2245d5fbe0d39310c8e2c21cd5f289d6ec7a6a561d055e86d4cd25b79f1aa535067746219e2382df2aeec050dfa24cdae674636d92ee61016fa9861e705 SHA512 e556e7cb28f122526ef19550b1e593b61f01923d0be53951344f917f89b3d4cae29e525ceda3d0290bc18c3641b509dd7236e7b55ae50da0157fe11ca9f04cca
-DIST testfixtures-6.18.4.tar.gz 124910 BLAKE2B 8c19672903d3b6ba5139b95f1d060c0d71ae8891e8c190a8891fded6d79af3549a91809b73a114f69cf2b0de49740e49a9e38e44981addcd09d7b4c343ea3ced SHA512 2643ddfd7c4be7b514070e2df8e52479ad51f50a8b69507faf36d90bd92aa0201f1c3033eb00e644bac194601b0a9190c02727f18d899629ab09abfa3546ecd7
 DIST testfixtures-6.18.5.tar.gz 124944 BLAKE2B 6f1431b3e7201a3c12bf683cfcb123329b186f42a64fdfe3ee7897ab0c5e9ba3995deb88934ae59f0d35b64710ac04b421d07f1c496429b18a0b6a03e600885d SHA512 4d4ec7295bb056102995dc1c872b86059109b114ab921769d3aa2c2de96a3789fef30558f51826655b6d2d668ea1b1bc9f161a4584aab628f59d4da1fa95940e
-EBUILD testfixtures-6.18.3.ebuild 1262 BLAKE2B ccc00540e6492949a0755223af5b40813c4c15319b4d13a797d884bff52be2e2a7ec88d2257946174fc7818ff4bb54309e30eabff7337d4ce00cb097a647c23d SHA512 1100995ba017e4b626d0a7806db5704115af9bacfa852e5f97e00f1f8598531e2af189b1a418ba0dfa7d49aa97a0f821d647475f54893f7f9d4d279efd8d98a5
-EBUILD testfixtures-6.18.4.ebuild 1311 BLAKE2B 62614aba8e5939f210dfd3b8b3fbe8108acbc24336a5936686a3ed1ea132126e18559d564cf2884b32c46f0b730785b60499a90a041c6d16a40bbb14264c27fd SHA512 2d548b941f16a1bc7ccc0a6548773cbf2c6e8156443b1c783bc667d9940c8298794781564ad318b55eaf6c28f3ebbdf17b53633a9429596cf0aeaac7a8fdcbce
-EBUILD testfixtures-6.18.5.ebuild 1311 BLAKE2B 62614aba8e5939f210dfd3b8b3fbe8108acbc24336a5936686a3ed1ea132126e18559d564cf2884b32c46f0b730785b60499a90a041c6d16a40bbb14264c27fd SHA512 2d548b941f16a1bc7ccc0a6548773cbf2c6e8156443b1c783bc667d9940c8298794781564ad318b55eaf6c28f3ebbdf17b53633a9429596cf0aeaac7a8fdcbce
+EBUILD testfixtures-6.18.5.ebuild 1308 BLAKE2B 5c215745d5c2fda7dd17e2652f3ba0b48408312ac1c451c965b774064b0bb8e67f0d46da61815a4da1e1d401a067450905d3ba0c43def2c80f48f9f0fa5a528b SHA512 cc95fe44a119ec66e3b3b7ffb3559f2b217f27a529c649692a7264d5fc185d5e5d08d714f6dc03397767eba0a6ae5af571096bdb1c0b93bd6dbb5fa3a0c957ca
 MISC metadata.xml 416 BLAKE2B 19f5d275458874364d2719ecf363f7a5627f9e612b7d3a3f2c075e306063ed899dec0b2e59ea5e5d7ba65209c9a6d91045d80b2fe50e74278e61247d0426b940 SHA512 8a5776feee4d6758da67dc0b413e2d0ddc0c843075ca96c9b44adace1f7669a6abf820c5b73b86652b27e9feed19a4a30e1004a021b24bda0829b5690a1687ec
diff --git a/dev-python/testfixtures/files/testfixtures-6.18.1-py3.10.patch b/dev-python/testfixtures/files/testfixtures-6.18.1-py3.10.patch
deleted file mode 100644
index cd1ecbd8133d..000000000000
--- a/dev-python/testfixtures/files/testfixtures-6.18.1-py3.10.patch
+++ /dev/null
@@ -1,172 +0,0 @@
-From 8fb2122eea0f1d0de1ccca7a3a0f5426bc6d4964 Mon Sep 17 00:00:00 2001
-From: Louis Sautier <sautier.louis@gmail.com>
-Date: Sat, 21 Aug 2021 03:00:51 +0200
-Subject: [PATCH] tests: fix with Python 3.10 (changed exception messages)
-
----
- testfixtures/compat.py             |  1 +
- testfixtures/tests/test_popen.py   | 41 ++++++++++++++++++------------
- testfixtures/tests/test_replace.py | 24 ++++++++++-------
- 3 files changed, 41 insertions(+), 25 deletions(-)
-
-diff --git a/testfixtures/compat.py b/testfixtures/compat.py
-index 1042d27..ca00f32 100644
---- a/testfixtures/compat.py
-+++ b/testfixtures/compat.py
-@@ -5,6 +5,7 @@
- 
- PY_36_PLUS = PY_VERSION >= (3, 6)
- PY_37_PLUS = PY_VERSION >= (3, 7)
-+PY_310_PLUS = PY_VERSION >= (3, 10)
- 
- 
- if PY_VERSION > (3, 0):
-diff --git a/testfixtures/tests/test_popen.py b/testfixtures/tests/test_popen.py
-index aa211da..4ec3186 100644
---- a/testfixtures/tests/test_popen.py
-+++ b/testfixtures/tests/test_popen.py
-@@ -6,7 +6,7 @@
- from testfixtures import ShouldRaise, compare, Replacer
- 
- from testfixtures.popen import MockPopen, PopenBehaviour
--from testfixtures.compat import BytesLiteral, PY2
-+from testfixtures.compat import BytesLiteral, PY2, PY_310_PLUS
- 
- import signal
- 
-@@ -471,10 +471,11 @@ def test_default_command_max_args(self):
-         ], Popen.mock.method_calls)
- 
-     def test_invalid_parameters(self):
-+        message = "__init__() got an unexpected keyword argument 'foo'"
-+        if PY_310_PLUS:
-+            message = "MockPopenInstance." + message
-         Popen = MockPopen()
--        with ShouldRaise(TypeError(
--                "__init__() got an unexpected keyword argument 'foo'"
--        )):
-+        with ShouldRaise(TypeError(message)):
-             Popen(foo='bar')
- 
-     def test_invalid_method_or_attr(self):
-@@ -492,39 +493,43 @@ def test_invalid_attribute(self):
-             process.foo
- 
-     def test_invalid_communicate_call(self):
-+        message = "communicate() got an unexpected keyword argument 'foo'"
-+        if PY_310_PLUS:
-+            message = "MockPopenInstance." + message
-         Popen = MockPopen()
-         Popen.set_command('bar')
-         process = Popen('bar')
--        with ShouldRaise(TypeError(
--                "communicate() got an unexpected keyword argument 'foo'"
--        )):
-+        with ShouldRaise(TypeError(message)):
-             process.communicate(foo='bar')
- 
-     def test_invalid_wait_call(self):
-+        message = "wait() got an unexpected keyword argument 'foo'"
-+        if PY_310_PLUS:
-+            message = "MockPopenInstance." + message
-         Popen = MockPopen()
-         Popen.set_command('bar')
-         process = Popen('bar')
--        with ShouldRaise(TypeError(
--                "wait() got an unexpected keyword argument 'foo'"
--        )):
-+        with ShouldRaise(TypeError(message)):
-             process.wait(foo='bar')
- 
-     def test_invalid_send_signal(self):
-+        message = "send_signal() got an unexpected keyword argument 'foo'"
-+        if PY_310_PLUS:
-+            message = "MockPopenInstance." + message
-         Popen = MockPopen()
-         Popen.set_command('bar')
-         process = Popen('bar')
--        with ShouldRaise(TypeError(
--                "send_signal() got an unexpected keyword argument 'foo'"
--        )):
-+        with ShouldRaise(TypeError(message)):
-             process.send_signal(foo='bar')
- 
-     def test_invalid_terminate(self):
-+        message = "terminate() got an unexpected keyword argument 'foo'"
-+        if PY_310_PLUS:
-+            message = "MockPopenInstance." + message
-         Popen = MockPopen()
-         Popen.set_command('bar')
-         process = Popen('bar')
--        with ShouldRaise(TypeError(
--                "terminate() got an unexpected keyword argument 'foo'"
--        )):
-+        with ShouldRaise(TypeError(message)):
-             process.terminate(foo='bar')
- 
-     def test_invalid_kill(self):
-@@ -535,6 +540,8 @@ def test_invalid_kill(self):
-             text = 'kill() takes exactly 1 argument (2 given)'
-         else:
-             text = 'kill() takes 1 positional argument but 2 were given'
-+            if PY_310_PLUS:
-+                text = "MockPopenInstance." + text
-         with ShouldRaise(TypeError(text)):
-             process.kill('moo')
- 
-@@ -546,6 +553,8 @@ def test_invalid_poll(self):
-             text = 'poll() takes exactly 1 argument (2 given)'
-         else:
-             text = 'poll() takes 1 positional argument but 2 were given'
-+            if PY_310_PLUS:
-+                text = "MockPopenInstance." + text
-         with ShouldRaise(TypeError(text)):
-             process.poll('moo')
- 
-diff --git a/testfixtures/tests/test_replace.py b/testfixtures/tests/test_replace.py
-index 5a77e23..d3544a8 100644
---- a/testfixtures/tests/test_replace.py
-+++ b/testfixtures/tests/test_replace.py
-@@ -13,7 +13,7 @@
- 
- from testfixtures.tests import sample1
- from testfixtures.tests import sample2
--from ..compat import PY3
-+from ..compat import PY3, PY_310_PLUS
- 
- from warnings import catch_warnings
- 
-@@ -259,19 +259,25 @@ def test_something(obj):
-         self.failIf(hasattr(sample1, 'foo'))
- 
-     def test_replace_delattr_cant_remove(self):
-+        if PY_310_PLUS:
-+            message = "cannot set 'today' attribute of " \
-+                      "immutable type 'datetime.datetime'"
-+        else:
-+            message = "can't set attributes of " \
-+                      "built-in/extension type 'datetime.datetime'"
-         with Replacer() as r:
--            with ShouldRaise(TypeError(
--                "can't set attributes of "
--                "built-in/extension type 'datetime.datetime'"
--                    )):
-+            with ShouldRaise(TypeError(message)):
-                 r.replace('datetime.datetime.today', not_there)
- 
-     def test_replace_delattr_cant_remove_not_strict(self):
-+        if PY_310_PLUS:
-+            message = "cannot set 'today' attribute of " \
-+                      "immutable type 'datetime.datetime'"
-+        else:
-+            message = "can't set attributes of " \
-+                      "built-in/extension type 'datetime.datetime'"
-         with Replacer() as r:
--            with ShouldRaise(TypeError(
--                "can't set attributes of "
--                "built-in/extension type 'datetime.datetime'"
--                    )):
-+            with ShouldRaise(TypeError(message)):
-                 r.replace('datetime.datetime.today', not_there, strict=False)
- 
-     def test_replace_dict_remove_key(self):
diff --git a/dev-python/testfixtures/testfixtures-6.18.3.ebuild b/dev-python/testfixtures/testfixtures-6.18.3.ebuild
deleted file mode 100644
index 46c5fddf9f53..000000000000
--- a/dev-python/testfixtures/testfixtures-6.18.3.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="A collection of helpers and mock objects for unit tests and doc tests"
-HOMEPAGE="https://pypi.org/project/testfixtures/ https://github.com/Simplistix/testfixtures"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86 ~amd64-linux ~x86-linux"
-
-BDEPEND="
-	test? (
-		$(python_gen_impl_dep sqlite)
-		dev-python/django[${PYTHON_USEDEP}]
-		dev-python/pytest-django[${PYTHON_USEDEP}]
-		dev-python/sybil[${PYTHON_USEDEP}]
-		>=dev-python/twisted-18[${PYTHON_USEDEP}]
-		dev-python/zope-component[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_sphinx docs
-distutils_enable_tests pytest
-
-PATCHES=(
-	# https://github.com/Simplistix/testfixtures/commit/8fb2122eea0f1d0de1ccca7a3a0f5426bc6d4964
-	"${FILESDIR}/testfixtures-6.18.1-py3.10.patch"
-)
-
-python_prepare_all() {
-	# kill weird way of declaring build deps
-	sed -e '/build=/d' -i setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local -x PYTHONPATH="."
-	local -x DJANGO_SETTINGS_MODULE=testfixtures.tests.test_django.settings
-	epytest -Wignore::DeprecationWarning
-}
diff --git a/dev-python/testfixtures/testfixtures-6.18.4.ebuild b/dev-python/testfixtures/testfixtures-6.18.4.ebuild
deleted file mode 100644
index 8755772cbbc7..000000000000
--- a/dev-python/testfixtures/testfixtures-6.18.4.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="A collection of helpers and mock objects for unit tests and doc tests"
-HOMEPAGE="https://pypi.org/project/testfixtures/ https://github.com/Simplistix/testfixtures"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux"
-
-BDEPEND="
-	test? (
-		$(python_gen_impl_dep sqlite)
-		dev-python/django[${PYTHON_USEDEP}]
-		dev-python/pytest-django[${PYTHON_USEDEP}]
-		dev-python/sybil[${PYTHON_USEDEP}]
-		>=dev-python/twisted-18[${PYTHON_USEDEP}]
-		dev-python/zope-component[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# kill weird way of declaring build deps
-	sed -e '/build=/d' -i setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local -x PYTHONPATH="."
-	local -x DJANGO_SETTINGS_MODULE=testfixtures.tests.test_django.settings
-
-	local EPYTEST_DESELECT=(
-		# TODO
-		testfixtures/tests/test_shouldwarn.py::ShouldWarnTests::test_filter_missing
-		testfixtures/tests/test_shouldwarn.py::ShouldWarnTests::test_filter_present
-	)
-
-	epytest
-}
diff --git a/dev-python/testfixtures/testfixtures-6.18.5.ebuild b/dev-python/testfixtures/testfixtures-6.18.5.ebuild
index 8755772cbbc7..2d62c3463591 100644
--- a/dev-python/testfixtures/testfixtures-6.18.5.ebuild
+++ b/dev-python/testfixtures/testfixtures-6.18.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/text-unidecode/Manifest b/dev-python/text-unidecode/Manifest
index f3ef1eb6950b..fe329df3874c 100644
--- a/dev-python/text-unidecode/Manifest
+++ b/dev-python/text-unidecode/Manifest
@@ -1,4 +1,4 @@
 DIST text-unidecode-1.3.tar.gz 76885 BLAKE2B b783963b4fce6588d45d48a498de566c08df83ae62c72caf599648df195eb94b7c02090503590ab8c747af0d210847ddfbf0772289e170361914db20c049828e SHA512 aeaf0e79bd0545ca7a4fe700d5a7dac1d5900841fcfe8a5a568c84ba7d3bee5f75eaac0531f4a01d689a550ac5bc7e1acaeb8132293f220db8387fae2eb6a150
-EBUILD text-unidecode-1.3-r1.ebuild 524 BLAKE2B 22331c30e686b0a896ce08eed244b0a786bb41609c82690fd9eb5893ced007cd93279472b52cdd99370b320f6f762cb7b0474b9bc4217c788ac8e147b8d7c6ed SHA512 14e3a91906ffa00a15d37809fe10bba0b818257e853d2a72743e1970be890f378ee4cecf1fcc8782082e6c575545e3dd00c8b33d71c13f14f7cc17a80f7f8bff
+EBUILD text-unidecode-1.3-r1.ebuild 531 BLAKE2B 93e4444f29944c631b0c0528e4a8a6efd91166c32110688abcbdbf81167b5de3f4415349d0925d621ee00e216fff5e35a84bd437d81de0c0f2ff62405881c7e2 SHA512 ecc9859d161f00b6387abdf4d6738cb20a7dbaaa39630c8724d2aff8ffdaf93b57101ad8873446c5278c7624bd787335391930ed7a4625ba8f6572ad949c0ad1
 EBUILD text-unidecode-1.3.ebuild 488 BLAKE2B 123d6061dc9eb18111d9e70451d0d211db040e3248feb27f9c9b8339d4d95d3e3c87e45f9a98f63d182929c4f4e9a2458d3f5a3c064e97eb454e1fa281fa6c98 SHA512 7ebf2cb707db440a082d9041408386331bda832535068bf36cc8c702582002fe6e66591b46e3f662834935040f28097a913f4c360e3e3d5ea0627913f54eecc1
 MISC metadata.xml 356 BLAKE2B bc31b0dfed91be054b75af4688b79ed74e6b55511377248068e2bfa54da07eecef31bbc1abeebb7e55fe2e5eed7594bf13b0169cf61ff16c522fef08535223dc SHA512 0769235a37895d6778dd153901bbe6424effe034e1847b686201c19eb81bf16439e10ecf8ef9442149a08cce6d4dcd695cd286ec48d36cd1744f256cb03d8e40
diff --git a/dev-python/text-unidecode/text-unidecode-1.3-r1.ebuild b/dev-python/text-unidecode/text-unidecode-1.3-r1.ebuild
index 97c613f06659..65d0b9d372af 100644
--- a/dev-python/text-unidecode/text-unidecode-1.3-r1.ebuild
+++ b/dev-python/text-unidecode/text-unidecode-1.3-r1.ebuild
@@ -17,6 +17,6 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( Artistic GPL-2+ )"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~riscv ~x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/tifffile/Manifest b/dev-python/tifffile/Manifest
index b348071ce7c8..24fe96e96c1f 100644
--- a/dev-python/tifffile/Manifest
+++ b/dev-python/tifffile/Manifest
@@ -1,3 +1,5 @@
 DIST tifffile-2022.3.16.gh.tar.gz 263653 BLAKE2B fcd30e2fd38a12438332badb17e937ab095a8088f9c878b84166a67c7486f436a76d39832df22362f7a74de5da537602da82c982fb4dc0699fba1603adefdcef SHA512 8069a87b241cbb11b3efa8ff679106f2f11ff9045d790fb1612076a60b87791f30afffb55b57d19b70ab4441935f418ad91fb0956ab572890704023e63dea84a
+DIST tifffile-2022.3.25.gh.tar.gz 265082 BLAKE2B dd5f3705cb7203fe943b97a5ed5c000b44abf48ec748f38a1468e27e82bd980e4100dd14af5cfd6af5bdee9d0036c5dce37efca1e515f2eb283c0e221150915a SHA512 dc9018991989ca4b89be6f315aaa45ff2fb94c504dd4c1790af1ec68e05a1da85560f5098df2f460b726cea0d4b0e4fc3f12d493dc1a1db8e2cc35d86f547ddf
 EBUILD tifffile-2022.3.16.ebuild 1269 BLAKE2B 95a1bc97800e704cce4b621fb47933d4eaa4f12338ef912dc3a3f75ca49d622a27371f30bb40295f04ea1ad421f55787fc1087533ba256bb01f75d31264cfd77 SHA512 b84b2b9b77d23e2c7fb322e38437f6704f92dcec6c3ab7c71153f3982a339ac9b4fe8c96462cbe76898d78c6ec33bb9199f23f78e129e485ff9aba14c0acf310
+EBUILD tifffile-2022.3.25.ebuild 1269 BLAKE2B 95a1bc97800e704cce4b621fb47933d4eaa4f12338ef912dc3a3f75ca49d622a27371f30bb40295f04ea1ad421f55787fc1087533ba256bb01f75d31264cfd77 SHA512 b84b2b9b77d23e2c7fb322e38437f6704f92dcec6c3ab7c71153f3982a339ac9b4fe8c96462cbe76898d78c6ec33bb9199f23f78e129e485ff9aba14c0acf310
 MISC metadata.xml 346 BLAKE2B 8cecb51fe01826a2a190c4e3020836f5706a918515a3ef5b4624fc3e9985411a8fd3c261fb7b6d8ad4f4486164487d11bdc2b071eeb5a95083db4c5323ae2dbe SHA512 81f8f6f5231d6cc9a8e7f95416a63cc52027f58fa54ce16bacfaa0ae285a48c5a3850d83d5ab50ca89be248ce386528db32811b23d61fa0d0e1e0cc737150465
diff --git a/dev-python/tifffile/tifffile-2022.3.25.ebuild b/dev-python/tifffile/tifffile-2022.3.25.ebuild
new file mode 100644
index 000000000000..bcfdee9f5d5f
--- /dev/null
+++ b/dev-python/tifffile/tifffile-2022.3.25.ebuild
@@ -0,0 +1,52 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Read and write TIFF files"
+HOMEPAGE="
+	https://pypi.org/project/tifffile/
+	https://github.com/cgohlke/tifffile/
+	https://www.lfd.uci.edu/~gohlke/
+"
+SRC_URI="
+	https://github.com/cgohlke/tifffile/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/numpy-1.19.2[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/dask[${PYTHON_USEDEP}]
+		>=dev-python/fsspec-2021.5.0[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# Internet
+	tests/test_tifffile.py::test_class_omexml
+	tests/test_tifffile.py::test_class_omexml_fail
+	tests/test_tifffile.py::test_class_omexml_modulo
+	tests/test_tifffile.py::test_class_omexml_attributes
+	tests/test_tifffile.py::test_class_omexml_multiimage
+	tests/test_tifffile.py::test_write_ome
+	tests/test_tifffile.py::test_write_ome_manual
+	# requires tons of free space
+	tests/test_tifffile.py::test_write_3gb
+	tests/test_tifffile.py::test_write_bigtiff
+	'tests/test_tifffile.py::test_write_imagej_raw'
+)
diff --git a/dev-python/tldextract/Manifest b/dev-python/tldextract/Manifest
index 4eea4af6c1fb..9c6e0328ac12 100644
--- a/dev-python/tldextract/Manifest
+++ b/dev-python/tldextract/Manifest
@@ -1,5 +1,3 @@
-DIST tldextract-3.1.2.tar.gz 103248 BLAKE2B 5612016be7e8cd9b75dc5225f87ebc28635d66a7cacee54af2bd8db6ed6bb26ffe6ee5b4ab9b24473f19f0ad8d9d536e24236106288cd82cf635abef81f9babd SHA512 2c2340a9142d49aa7c0db71b5a7fb1a63e19354a5da8edd7de923e55c8ec03d8a8551f4710c66d6d1aece1d0d78701229ef5ed2ed49bcce44972b7b96747bd77
 DIST tldextract-3.2.0.tar.gz 103653 BLAKE2B 74b85da2e5a8c953075636f908bd32ba825c53fbea145a691cb681596376318b63729e2c6b7291f1ef21a55fa927d48e31cf0db241bb94be47f706fb68239515 SHA512 4e0731792793eb0a6d0da8387d15e8b9de17f20108361230703fd9f66f2aaad6260073b611e27135e571b1899844b271f3dae4e77122186cc78fbb05f3b3f237
-EBUILD tldextract-3.1.2.ebuild 769 BLAKE2B fb946df8da5ebfcab8fa70b002460a6b4c22fbaaac9027b664b9212f988e38ce2d207151557dd978e931be7dcc28c50e74b05288ac39fdb49224606114a8551c SHA512 aa79517f7bfe621563a6183cc26feddda875a49e87589a921d5fa34246a3a2cfb23b827a7e4e8e0a3394833f88dfce8924706a7df26ae7dcfb4d0cfc78fd8b13
-EBUILD tldextract-3.2.0.ebuild 803 BLAKE2B f7dcf8234d9ba6fcfa8d177635c555bbd2a2095ebd645d5ca9cb15f5ff6d8bc86d02623a2bb1d95acbefa51bac665341d62e84957f047000c7a412ecfb15e22f SHA512 c311e1c94bd2189a456c920e03a3cc1dd3495c4e63be9dbff607e0aad4f2ff94bb5f8467aa13947ba3c3fa846f5423315c96c7876b9989a226bfad9fbf0c4187
+EBUILD tldextract-3.2.0.ebuild 802 BLAKE2B 8491f4cbad91fcd225ea5c3165281e00b81b281608a058c86809f48613a59c278ce79122bb2e25255bb5044fb3b5b33dcfd65678d06dedc50880f01a67004862 SHA512 6293156ffb7b880fa379edb0860cce5d51c2d29372726c41ab38070b581a416a41a292732f751470b36ccad67ef6a26d0d0ecc03ab3aed0a4bbf21954a436d36
 MISC metadata.xml 560 BLAKE2B 4d6e6aa7507ce4734371e8b8442e8d4840db0d2896f7e7430438bc9b700edf6c8546fc3beb1e17d489013b6cc49d1daf805581d6fda29f51109e7a643b0e8965 SHA512 4e7ed8a1876afc62954ee58937557182099ea2289633d2d279a2982bb32a8de261163f0b83ba44c257b8c087c007b1bb462ecad69df1115a024a3a9c8ea1fe9e
diff --git a/dev-python/tldextract/tldextract-3.1.2.ebuild b/dev-python/tldextract/tldextract-3.1.2.ebuild
deleted file mode 100644
index aff90323169d..000000000000
--- a/dev-python/tldextract/tldextract-3.1.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# 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="Accurately separate the TLD from the registered domain and subdomains of a URL"
-HOMEPAGE="https://pypi.org/project/tldextract/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
-
-RDEPEND="
-	dev-python/filelock[${PYTHON_USEDEP}]
-	dev-python/idna[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/requests-file[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/tldextract/tldextract-3.2.0.ebuild b/dev-python/tldextract/tldextract-3.2.0.ebuild
index ef7d2500fe3e..07a0d69c5bdb 100644
--- a/dev-python/tldextract/tldextract-3.2.0.ebuild
+++ b/dev-python/tldextract/tldextract-3.2.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 
 RDEPEND="
 	dev-python/filelock[${PYTHON_USEDEP}]
diff --git a/dev-python/tomlkit/Manifest b/dev-python/tomlkit/Manifest
index 587e0af8be65..d988f03c48ce 100644
--- a/dev-python/tomlkit/Manifest
+++ b/dev-python/tomlkit/Manifest
@@ -1,3 +1,5 @@
 DIST tomlkit-0.10.0.tar.gz 183499 BLAKE2B b9906dea2dd8867dca0208f3ce86b3d587f8504addfe25cf29f9164f50dc12d244010df53791ed01e0e7dd16e71ad77ce22c9ea7a37a6216880059c058f112e8 SHA512 05d03ae71a1d72ca0e03276f2b2530ca9fab7d6f366166a79839c66eaa00b55abb5f70a669ecb4d762dbbd655f10e4c4a373a7683cd781ae034d0910a0c3eccf
+DIST tomlkit-0.10.1.tar.gz 183650 BLAKE2B 373ab028b60503cfb9983a969e97318a61004a8db1bafed32b775e2a26a5557f8493ea9026ac9dbeff707d198c2913c34bf25c7e424345bb6b5ea3aa211e3a4a SHA512 a5082b88a9b3832393d860258dd7584ed05788777d4c1dd98415bfb7c64acf8f77eaf18c3fcf824913d999ffa37b4481675b3fce9b8af8ef9c1be0712ad622a9
 EBUILD tomlkit-0.10.0.ebuild 767 BLAKE2B 7ad977e65116339b9540af40b167a129ffd4f0e26c682410d4317fb7d2855ca4602371e0abd9f6a3f8c5c96a862af78c44d749f744386fdf5813455fdbeb0ec8 SHA512 6f63e46e9dd16bf2d62dd35e40a8323073baf387f23337ea0f873ee9099294cf26db035efd0dfb12803d1bea1efc6441b6016edf9c7f2d2a65eab96366375f17
+EBUILD tomlkit-0.10.1.ebuild 775 BLAKE2B d26dcfea2fe0d866c74db9c7133375c2026a9a2cdfa0e71f8b9ee80b3dbb6ad5983a5cae92afa2b37940745b0b53cb611959f5be003696a60775e03f10b42b0b SHA512 e3c60ef19c64bf2478d9afd5c264864314b005f59fdd1e3e7d45c63cd040785345ec5060806d2d8c50e955253fea7a5d885ab3f8f803deaba3aa2e5114e4e1b7
 MISC metadata.xml 418 BLAKE2B 6013d98bdc27197495bc61306e7038b81c725d392ee57611d451b9289885f4b019c76721ef3877d5ec1183ceb8b40f8b199556b4e1b63ccc61ba033b33308140 SHA512 f2c3c72396d6c073701a5dfa574cbc95243649cb964a08e179e707ef23098f018c2b5de6c92a110a9329e78880541ef54590c50c31128c1ce6b4698e76388a16
diff --git a/dev-python/tomlkit/tomlkit-0.10.1.ebuild b/dev-python/tomlkit/tomlkit-0.10.1.ebuild
new file mode 100644
index 000000000000..4de45e362c79
--- /dev/null
+++ b/dev-python/tomlkit/tomlkit-0.10.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Style preserving TOML library"
+HOMEPAGE="https://github.com/sdispater/tomlkit"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+BDEPEND="test? ( dev-python/pyyaml[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
+
+src_configure() {
+	# use setup.py to avoid circular dep with poetry-core
+	cat > pyproject.toml <<-EOF || die
+		[build-system]
+		requires = ["setuptools", "wheel"]
+		build-backend = "setuptools.build_meta"
+	EOF
+}
diff --git a/dev-python/tqdm/Manifest b/dev-python/tqdm/Manifest
index 1402de436aef..ec0efe77e329 100644
--- a/dev-python/tqdm/Manifest
+++ b/dev-python/tqdm/Manifest
@@ -1,7 +1,5 @@
-DIST tqdm-4.62.3.tar.gz 167952 BLAKE2B d5732fc97256e1fc4f55bd1a0f69f98a87e7132cc1d8484baa12b7615da5a95ce20268515539c595c2b2aaf20f9a9434c17d581b3b90ea3cad3515150e469471 SHA512 1083ca2080163c98bbb55e124ce9d47c790e47c83cd8dad60e4c93773d1d97a50aacb5a25ddb8a2ae3691738e4f4942c88d55dab406c3e810cac18b8929d20ee
-DIST tqdm-4.63.0.tar.gz 168556 BLAKE2B f4fa47290f580f0923fa4325e88b103c4175344c928844149bf4b4445816bb7e87bd176d666b93a94a5981b246541017f0a34d710becf082110caca68b9ee45d SHA512 939ac7e310204094cb0c6a935ba6a91af45cd63fa8fa83865b75d1bcea440d5ff21a4d3405f5bcce864b43159921d3ef7b92d9c390fe30902f24e4e724c7eaf9
 DIST tqdm-4.63.1.tar.gz 168619 BLAKE2B c5d282f07bd1042097ba24cfc7c5311ce53fa5b66e4f9d4b8504c5d102a4c380dfbc8bb59deee469c90d9726b7d36a34cf9c88ed07b412378f51819f789e8e9c SHA512 3d7dfb81ca6b8b72f26d6b3ef4309af19e1679d3ee805e3c1326e804df4204acc20de8d935394eac736a1598d9c5485165f3cbd2b83b746c2bbf202d3b1e4c5c
-EBUILD tqdm-4.62.3.ebuild 1133 BLAKE2B 9d2263838294e0c9e732aeebb2b7678e55b6648a11e5d926e85f4c1b6f500a34b54add9296822aece3611b088546b5ba21b2f90d9a82df4c152f31e84a294e10 SHA512 13d1199dec270b4f4621be8f290ef3b8f40480063e4779957842ef3c3679289a42295d56b2990e9622bcaf3bf59817d6a4924d7b869726bf4e67dab0bde39b9c
-EBUILD tqdm-4.63.0.ebuild 1035 BLAKE2B f0383d863cea778d6d99ef48b23abc0b0a18ce160feb5ab2e0599316f05e6f713f98f6b12598643c3fecd294cdf63ce2015caffe2d83b765fefa428f3d93889d SHA512 9efede6c14ec866dab9c29d8366ad0de0dae269d19380addbe196ca395d7bc0cb078fc2e492b7e60f29ea1be8f40017c0ff03498e5d53311c2a089b9d57c205c
-EBUILD tqdm-4.63.1.ebuild 1035 BLAKE2B f0383d863cea778d6d99ef48b23abc0b0a18ce160feb5ab2e0599316f05e6f713f98f6b12598643c3fecd294cdf63ce2015caffe2d83b765fefa428f3d93889d SHA512 9efede6c14ec866dab9c29d8366ad0de0dae269d19380addbe196ca395d7bc0cb078fc2e492b7e60f29ea1be8f40017c0ff03498e5d53311c2a089b9d57c205c
+DIST tqdm-4.64.0.tar.gz 169499 BLAKE2B a6b9587a366c026716c63af4358ddba693b52be3490a161071bc750fffcd50429bc639255635d96c950a130d9fe994dc2abc98f3fbaf0a0c344140c8ae972596 SHA512 84d243b86ea3665e915e6a79e7887a4d0487b166971d211e34229b7a46429f4e4f5808c03f24420b20fb85d274e1e6b36ed852af99c5c9d177c8ce71f0ce0c17
+EBUILD tqdm-4.63.1.ebuild 1027 BLAKE2B af0457f83ae96fdb7d5feef7d3f86f45e6d1f5dcd67180f521d6598a76d98a4ec1c92f356f5d93c844fbdbdc245df3768638735ead3fc8ba35d8fef3cf4ab78a SHA512 679fa6c09148fe359e9bb54f5bc36f68e4b368bdf99c83d5294436e89fb2fd045393057d56ac10e7d66c90eb20d4496cc93fdea4021c71873e98af02748b4e41
+EBUILD tqdm-4.64.0.ebuild 1035 BLAKE2B f0383d863cea778d6d99ef48b23abc0b0a18ce160feb5ab2e0599316f05e6f713f98f6b12598643c3fecd294cdf63ce2015caffe2d83b765fefa428f3d93889d SHA512 9efede6c14ec866dab9c29d8366ad0de0dae269d19380addbe196ca395d7bc0cb078fc2e492b7e60f29ea1be8f40017c0ff03498e5d53311c2a089b9d57c205c
 MISC metadata.xml 605 BLAKE2B ed20e6f11f20cdc6525b98d9fd37c0b8f0781dd1c4be85e8aa4a3f5644a20fde3179bd44bb99ef4c14913168113a58963b36281ccf4807a694624a1e2df578f8 SHA512 b5f096a0256312e6ab5098bb6d9965b567bd735813d9c97fa49f08de640f2c5ebb292ba747eb284ff043dc29d4bb1cab1ac947ecaab6b4e94aa51e96a0cac636
diff --git a/dev-python/tqdm/tqdm-4.62.3.ebuild b/dev-python/tqdm/tqdm-4.62.3.ebuild
deleted file mode 100644
index 3ebaec9089ff..000000000000
--- a/dev-python/tqdm/tqdm-4.62.3.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
-inherit distutils-r1
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/tqdm/tqdm"
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-fi
-
-DESCRIPTION="Add a progress meter to your loops in a second"
-HOMEPAGE="https://github.com/tqdm/tqdm"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="examples"
-
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-python_test() {
-	# Skip unpredictable performance tests
-	epytest --ignore 'tests/tests_perf.py'
-}
-
-python_install() {
-	doman "${BUILD_DIR}"/lib/tqdm/tqdm.1
-	rm "${BUILD_DIR}"/lib/tqdm/tqdm.1 || die
-	distutils-r1_python_install
-}
-
-python_install_all() {
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/tqdm/tqdm-4.63.1.ebuild b/dev-python/tqdm/tqdm-4.63.1.ebuild
index e8dbfbed9a0d..32cdaf0a2e13 100644
--- a/dev-python/tqdm/tqdm-4.63.1.ebuild
+++ b/dev-python/tqdm/tqdm-4.63.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 IUSE="examples"
 
 BDEPEND="
diff --git a/dev-python/tqdm/tqdm-4.63.0.ebuild b/dev-python/tqdm/tqdm-4.64.0.ebuild
index e8dbfbed9a0d..e8dbfbed9a0d 100644
--- a/dev-python/tqdm/tqdm-4.63.0.ebuild
+++ b/dev-python/tqdm/tqdm-4.64.0.ebuild
diff --git a/dev-python/transitions/Manifest b/dev-python/transitions/Manifest
index 7fe18a792913..70401402f36f 100644
--- a/dev-python/transitions/Manifest
+++ b/dev-python/transitions/Manifest
@@ -1,5 +1,3 @@
-DIST transitions-0.8.10.tar.gz 1103547 BLAKE2B caeeb97406d1d2ba926f5ff14c4961acb7c2b9b979a1a20614e1017e4b20a664b069f384cfe878df95dffe832f00cfeb4c0ce96efe2156cc858e14eba5746137 SHA512 a598d65431a2d0241b5ea4c806631edf2e1f06537224e8716d531e86bcb10817d1cf32a62672147d1c1b398fd755a9ef046d884dcd0b4de6a9f8c1bfd04af62a
 DIST transitions-0.8.11.tar.gz 1103585 BLAKE2B e91800baa5101e2654b4e88fecec8bc795329a0e43890e32f42f7777136379d9852702f7cef14da3f3c26b50ce7bf9dcf2f6d2980d4af82149d2d16ea343d826 SHA512 96c91c988db990326f50b06c7538fb806c2a5d19f950f23cd0304b40517657c888df6c09445917d5e7224c1aa1b1d8d719bd10b0e210001f15eec947681c3847
-EBUILD transitions-0.8.10.ebuild 849 BLAKE2B 0e98284db86f20f07ed26c2b70e214900d914a399638a5b22b9c6447703af784774c70d93a6f88c820b929802c138515944141730248f3f9c476caaa8d9305b6 SHA512 0fcb6deef7812447d30d04e3c6b323cbef1e1c01c1259ba3adcd46faf8f6ab2ae675af4c8434ac8dfe664201a24733f226e524bfe70c05d52c77353e1ea3d54c
-EBUILD transitions-0.8.11.ebuild 883 BLAKE2B 5f9c3a122bdac480f5759679645c8ad4b662923356f4d8a947cb991541f1ba9351eaa218dc718a5ca316d4f62cfeb3556908746b083f9fdbed586b0bc5abf391 SHA512 213026cce41ace2779293d16e8dbcd1ea8d10186f5bc573cc7722a677db85e6c6c58d4bf2a242bd382d8d41500ccc615bc74c3dd233f7b8b26c02ffb0f95adc7
+EBUILD transitions-0.8.11.ebuild 882 BLAKE2B 5f6869b12eff237f02117910de002a6465481d535b54a28551e3cbd6e207b41aa5c73efe63a6b45e05e937bc41798fbe7255b86c002e3201caba1406d1b5787b SHA512 e06d69b9f70b83b8bd0ef8b4708f205fd97d8e6aff833ba3b2471a57e5b84401d9a4dc06ec776bf8e05008874e096d2e74a99ff4830f906de4b70815862e6da3
 MISC metadata.xml 863 BLAKE2B 8ab7f50602ca6a7723c10c29c0bf436beb742e389fea5d4b98acf1828fb3287af27fed05f6c9e61cb65059d51a2290e0fe69515c1a67b138cfdac4cbaa7752bb SHA512 6e440169ae4a16c53f2a451d9f32e3d4831151b3af8a5f95f157e32a01cb2fde56bbab13e438c88f10e79fe37fa5ca6b48e18bfa9aaa81b96b7c703e2125356f
diff --git a/dev-python/transitions/transitions-0.8.10.ebuild b/dev-python/transitions/transitions-0.8.10.ebuild
deleted file mode 100644
index ae88c5e1102b..000000000000
--- a/dev-python/transitions/transitions-0.8.10.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# 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 lightweight, object-oriented state machine implementation in Python"
-HOMEPAGE="https://github.com/pytransitions/transitions"
-SRC_URI="https://github.com/pytransitions/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="examples"
-
-RDEPEND="
-	|| (
-		dev-python/pygraphviz[${PYTHON_USEDEP}]
-		dev-python/graphviz[${PYTHON_USEDEP}]
-	)
-	dev-python/six[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		dev-python/dill[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pycodestyle[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_install() {
-	distutils-r1_src_install
-	use examples && dodoc examples/*.ipynb
-}
diff --git a/dev-python/transitions/transitions-0.8.11.ebuild b/dev-python/transitions/transitions-0.8.11.ebuild
index 17976958da7d..b809687c46ad 100644
--- a/dev-python/transitions/transitions-0.8.11.ebuild
+++ b/dev-python/transitions/transitions-0.8.11.ebuild
@@ -5,6 +5,7 @@ EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{8..10} )
+
 inherit distutils-r1
 
 DESCRIPTION="A lightweight, object-oriented state machine implementation in Python"
@@ -13,7 +14,7 @@ SRC_URI="https://github.com/pytransitions/${PN}/archive/${PV}.tar.gz -> ${P}.tar
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="examples"
 
 RDEPEND="
diff --git a/dev-python/translate-toolkit/Manifest b/dev-python/translate-toolkit/Manifest
index fc4fd0d60a6d..02277660ddd5 100644
--- a/dev-python/translate-toolkit/Manifest
+++ b/dev-python/translate-toolkit/Manifest
@@ -1,6 +1,4 @@
 AUX translate-toolkit-3.3.0-no-install-docs.patch 652 BLAKE2B 202cfd408059115cfdb5933320b5a560eeee37e2c045cedcdd80cf808ab1e1a5569a964e9eab8114a2ab27e2c470285b254406c754b5289f7cff2f22afcebb6c SHA512 d98e2d7519ca630d41407d01f20543a84c3f408628832d4e79a5a52437d204f872aaef8eca80687565e6981dddb59480a313217eddf8a4084d8b6d71c3d2c0da
-DIST translate-3.5.3.gh.tar.gz 1148120 BLAKE2B e848a089281ab7f1e17b28beefbea50245025bc3db0616bab3f5e1d288b2aacc0df636dca11f17481af863a4845594ecff9fc66dbc33d403a8fe0575ff90581d SHA512 3ad1bc4742e4d91dbdd8b4662597d07c792e306426dac42b6f8720cefdf1f4cf502d587941df3e6a93dd5648a1b92f5951bd1b5e79a41e5476f1b9ca06624656
 DIST translate-3.6.0.gh.tar.gz 1150765 BLAKE2B 0b69d21782d8d6b3ae322b480ad2205e577d87a3a9448f8a428f666d3d141063ad06f83eaa38f5d5903cc4263bbdcf261523fef57111c1ba705b640835c11416 SHA512 3ce371cb688dcfa656676fdc3ca920d76088fad67dbfb112511a0439250913e1f4587df681752bf1b288b9c4af3e4ebd11b8f8db51670f0fe14e9db68d7917f7
-EBUILD translate-toolkit-3.5.3.ebuild 2554 BLAKE2B 3afd37b94ccfb0bae8bc4bcb72987abcebb2ca8d668b7d782d5f12ff54bfafd6bf497b51a2f7ea6c857a28de7bd7154f99bee321ff9406d53bd872e15b183cb0 SHA512 4ddb9b2de3252c26db3ce3691638584b9c6ac38beec3ffa53df5e302a82df0f1b157504a61640ba9ae054b7029c4d5a980d57a49a9001e84e21859dce3770a06
-EBUILD translate-toolkit-3.6.0.ebuild 2524 BLAKE2B 75c253a5bfbd770ec6dfbc21c359014ce4f7df779d14d75902f55ef2dcbc51ce526f921666d7f39afcacd083a0716222b7f73cc9962b9b5946aa15102584bb46 SHA512 1158fc636df324981fb53303a112bcb6401255b6f1ea7ddb4aaaf47fb0bfa4538c52631493b945c296f595db1faae490c21d305d5a88ed49b58dc395be2be056
+EBUILD translate-toolkit-3.6.0.ebuild 2521 BLAKE2B 415a34c66319672dc9ce3d0bde31824d8ed0bcb13d728795650eda5332ff8f2fc496fb5293805f9d08ab418bb403263b2125ae20a697741a6aad7581af925a33 SHA512 ec024534b6af2e1cb0f99444540a6d897f53543bca2cfd7145a87b13732492d62e3dd51b799b75b69124a24d7114c245c35a0579770ae46dac61bcf311954169
 MISC metadata.xml 746 BLAKE2B d11f99224b1dd6ccb5a64b2f3346f3963f7874197fc5cd13a9bc84036d7f6d78e62d4f92d80b41b3a71426978c605d599207ba7d20ee94ca195e6be3b60f41cb SHA512 07dfd2ab55c6eb0ab346e66a3f03dd82e193382c6bdec0d2b8826cde7e4e11bb5d6f3bc1a5885b08d9c2aa51f8afedc6ec6684f224951e6dd80bc500c783cbb3
diff --git a/dev-python/translate-toolkit/translate-toolkit-3.5.3.ebuild b/dev-python/translate-toolkit/translate-toolkit-3.5.3.ebuild
deleted file mode 100644
index 27305a40ae05..000000000000
--- a/dev-python/translate-toolkit/translate-toolkit-3.5.3.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="sqlite"
-
-inherit distutils-r1
-
-MY_P=translate-${PV}
-DESCRIPTION="Toolkit to convert between many translation formats"
-HOMEPAGE="https://github.com/translate/translate"
-SRC_URI="
-	https://github.com/translate/translate/archive/refs/tags/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-IUSE="+html +ical +ini +subtitles +yaml"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-BDEPEND=">=dev-python/six-1.11.0[${PYTHON_USEDEP}]"
-RDEPEND="${BDEPEND}
-	!dev-python/pydiff
-	app-text/iso-codes
-	>=dev-python/chardet-3.0.4[${PYTHON_USEDEP}]
-	dev-python/cheroot[${PYTHON_USEDEP}]
-	>=dev-python/lxml-4.3.1[${PYTHON_USEDEP}]
-	>=dev-python/pycountry-19.8.18[${PYTHON_USEDEP}]
-	>=dev-python/python-levenshtein-0.12.0[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-3[${PYTHON_USEDEP}]
-	dev-python/ruamel-yaml[${PYTHON_USEDEP}]
-	sys-devel/gettext
-	html? ( dev-python/utidylib[${PYTHON_USEDEP}] )
-	ical? ( dev-python/vobject[${PYTHON_USEDEP}] )
-	ini? ( >=dev-python/iniparse-0.5[${PYTHON_USEDEP}] )
-	subtitles? ( media-video/gaupol[${PYTHON_USEDEP}] )
-	yaml? ( dev-python/pyyaml[${PYTHON_USEDEP}] )
-"
-BDEPEND+="
-	test? ( dev-python/phply[${PYTHON_USEDEP}] )"
-
-distutils_enable_sphinx docs \
-	dev-python/sphinx-bootstrap-theme
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}"/translate-toolkit-3.3.0-no-install-docs.patch
-)
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# Fails with network-sandbox (and even with it off but w/ softer fail)
-		'tests/xliff_conformance/test_xliff_conformance.py::test_open_office_to_xliff'
-		'tests/xliff_conformance/test_xliff_conformance.py::test_po_to_xliff'
-	)
-	local EPYTEST_IGNORE=(
-		# unpackaged fluent.*
-		translate/storage/test_fluent.py
-	)
-
-	if ! use ini; then
-		EPYTEST_IGNORE+=(
-			translate/convert/test_ini2po.py
-			translate/convert/test_po2ini.py
-		)
-	fi
-
-	if ! use subtitles; then
-		EPYTEST_IGNORE+=(
-			translate/storage/test_subtitles.py
-		)
-	fi
-
-	# translate/storage/test_mo.py needs 'pocompile'
-	distutils_install_for_testing
-	epytest
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if ! use html; then
-		rm "${ED}"/usr/bin/{html2po,po2html} || die
-	fi
-	if ! use ical; then
-		rm "${ED}"/usr/bin/{ical2po,po2ical} || die
-	fi
-	if ! use ini; then
-		rm "${ED}"/usr/bin/{ini2po,po2ini} || die
-	fi
-	if ! use subtitles; then
-		rm "${ED}"/usr/bin/{sub2po,po2sub} || die
-	fi
-
-	python_optimize
-}
diff --git a/dev-python/translate-toolkit/translate-toolkit-3.6.0.ebuild b/dev-python/translate-toolkit/translate-toolkit-3.6.0.ebuild
index c9ba581f8597..476d408a194d 100644
--- a/dev-python/translate-toolkit/translate-toolkit-3.6.0.ebuild
+++ b/dev-python/translate-toolkit/translate-toolkit-3.6.0.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="+html +ical +ini +subtitles +yaml"
 
 BDEPEND="
diff --git a/dev-python/trimesh/Manifest b/dev-python/trimesh/Manifest
index 1f450cda2298..2ac3ce947e3f 100644
--- a/dev-python/trimesh/Manifest
+++ b/dev-python/trimesh/Manifest
@@ -1,9 +1,7 @@
-DIST trimesh-3.10.0.tar.gz 10736418 BLAKE2B 9e65e9e5bc3984d1dca5c5d4a0498ff1f6357760a2337091a07953572c057a1807903f1a412246472f71d7fa344532ed13a8082b91de56be6c5b22d473a24e70 SHA512 33db340d8b840d4771f3d09b0529e311cdb3712a4eb43b9090a47b557632b2e97ac61ae2fed0e5ebc3da27574eb03ff96e1af1c52b2758dbcb8ae1e37737b5b7
-DIST trimesh-3.10.1.tar.gz 10738596 BLAKE2B 9dc310b3e2b26fcf85f8c15841e5db1cf0edfb52593b3d89ee7ccb0678df2e9261f79cc9ed6709b5cad2ed633b220daa4f0fcb88da27bd942d1973d89968f147 SHA512 555777569c5bbfda2b93cc52ec21dfb9efecda30f3c0283415249a742b3717df8dcea9ce9cf79e42419d1bdafcad34795dd198f80b5e8a791f7cfb1a9cc2a17a
 DIST trimesh-3.10.2.gh.tar.gz 10738967 BLAKE2B 70aecc2d7524eec7eb5499f2926072139bab26cadd24a7f2200975ba1d15d7ee2a264efa124be69669f70c2a3026aa67ff3c6f56156dbf940027b48b57de4f9f SHA512 3fed75b26187dc8b682e7befd7c23c96a33cb3375255a26b3c80513d8ea9b2308f7570940a8c11da1455bd7acf5b89aead65a9743d76d2adf8e6faf5260a6b77
 DIST trimesh-3.10.3.gh.tar.gz 10739164 BLAKE2B 558e9b66b6398b10ffaa1117f07d1ea7464d5e230d201473cf24efbb2e88e534883cc33fc13a6e217f76d5d40dc5f507b5fdca73f4275a79e67ac8a654c8199d SHA512 0f20e77bb4c94a723aa50a15cb0c401d410d4112ef936e4340ad45ca2b88ee42881a02c280bc51635f443c4c38078db218b334405c3de9fc7236f6bc3cef3855
-EBUILD trimesh-3.10.0.ebuild 1753 BLAKE2B e3f4f0dd0c319b1425b92bb00d9f480d17157a34bcd1b2751f11eb480db3895e0e8750e0e422b976989083a142af1a590b95dde228f87dfb0097e9d74240700d SHA512 f1a84719063029069f370889d115f550a54fce542a5dea0c48bcf876dee2840048e09b65a7c5414b30d3d316ca4bef9d41c068a3ba7ac3101729a0eda87c420f
-EBUILD trimesh-3.10.1.ebuild 1707 BLAKE2B abd7f3f50208c41538cb9fee8311f21c7390aca504ed9cd85c4bd1758e07280025f823c8d077b7e4f6dfd9a5ef01df4323aafebfe90befd697a6f69eb5c8e1e1 SHA512 7aaed077a286bfe712ab933871a505b35ea42afc73fc4bb41a0c16a0bf946fb06cf033a267b03647da87f8dccefb8eed3cc3bfae74e7c2580f19bbc90c8e65f4
+DIST trimesh-3.10.6.gh.tar.gz 10740778 BLAKE2B 3e0b456f44b557d0176e8c2bcde36e49c01c2d95468329453dd4bbbc3253d2f2a2e5ad6ee3201def0c8c657e9521fcad9d2b33c43fc1d44337cca3b0ec6f1826 SHA512 df83d2b31f33d448ab321cf32c8ca37689ca201dbd8a963166e33be8266120db9ac4749c7360f3739f8289a755a7d40ea2c4b09cd4c2e07851adce0be743081c
 EBUILD trimesh-3.10.2.ebuild 1870 BLAKE2B 41bfe4d282c0059d7b387fbf80ebb60ee7c007b9412a2369a4622ce7dec3fa558969d14db1521cb9c40f6847ab362ab3e7c54b4dde3da17bffe5f15ec0434c5b SHA512 f7936baf035c50a8954ae4b07dbc0c9a196970bab9ca8dee06e52d65fbad134ef38d4d28f46441561e404d06f27daf4cec4773c3cf8e3161411b253be7cea6b4
 EBUILD trimesh-3.10.3.ebuild 1871 BLAKE2B 51a2dc4f7ec685c5671aa9a961dd877f831ece420a648ed61f907eac08100eb66c2ed3af7edeb29576a8a427364841774d8be777779a8182a7bb1d1c60ea9533 SHA512 58d15d967ecb642f66893035533a1e11061fc3bf0d1e76f3871afac381b6f6a342aecc4d787c75e1de21d1095822becdd006af454d0377d77978396d6d966adf
+EBUILD trimesh-3.10.6.ebuild 1871 BLAKE2B 51a2dc4f7ec685c5671aa9a961dd877f831ece420a648ed61f907eac08100eb66c2ed3af7edeb29576a8a427364841774d8be777779a8182a7bb1d1c60ea9533 SHA512 58d15d967ecb642f66893035533a1e11061fc3bf0d1e76f3871afac381b6f6a342aecc4d787c75e1de21d1095822becdd006af454d0377d77978396d6d966adf
 MISC metadata.xml 495 BLAKE2B b8b403f7bfbac53ed234c2ba50324041502a28465d70e9406867f05741e0313845307491fcfd85f05e2993b21daf14117a4b6863b45422fd4c62c6e28902e3ff SHA512 3deec8ab4b513536a7fe182be8f1b96e06fd06b2480d3e516c2b3462cc26fcbdeb1d165b4d0297465e93c0cce584ab40a8f905b81a59dcb4040a39655028783d
diff --git a/dev-python/trimesh/trimesh-3.10.0.ebuild b/dev-python/trimesh/trimesh-3.10.0.ebuild
deleted file mode 100644
index 3b5b5cb5019f..000000000000
--- a/dev-python/trimesh/trimesh-3.10.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_USE_PEP517=setuptools
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Python library for loading and using triangular meshes"
-HOMEPAGE="https://trimsh.org/ https://github.com/mikedh/trimesh"
-# No tests in PyPI tarballs
-SRC_URI="https://github.com/mikedh/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-# Almost 70 tests require rtree, which is currently unpackaged
-RESTRICT="test"
-
-RDEPEND="dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/colorlog[${PYTHON_USEDEP}]
-	dev-python/jsonschema[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/msgpack[${PYTHON_USEDEP}]
-	dev-python/networkx[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/pycollada[${PYTHON_USEDEP}]
-	dev-python/pyglet[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/scipy[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/svg-path[${PYTHON_USEDEP}]
-	dev-python/sympy[${PYTHON_USEDEP}]
-	dev-python/xxhash[${PYTHON_USEDEP}]
-	sci-libs/shapely[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-pkg_postinst() {
-	optfeature_header "${PN} functionality can be extended by installing the following packages:"
-	optfeature "making GUI applications with 3D stuff" dev-python/glooey
-	optfeature "2D triangulations of polygons" dev-python/mapbox_earcut
-	optfeature "loading a number of additional mesh formats" dev-python/meshio
-	optfeature "figuring out how much memory we have" dev-python/psutil
-	optfeature "marching cubes and other nice stuff" sci-libs/scikit-image
-}
diff --git a/dev-python/trimesh/trimesh-3.10.1.ebuild b/dev-python/trimesh/trimesh-3.10.6.ebuild
index 47d49d1627bc..45da22f2c5ec 100644
--- a/dev-python/trimesh/trimesh-3.10.1.ebuild
+++ b/dev-python/trimesh/trimesh-3.10.6.ebuild
@@ -3,21 +3,25 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
 DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
 
-inherit distutils-r1 optfeature
+inherit distutils-r1 multiprocessing optfeature
 
 DESCRIPTION="Python library for loading and using triangular meshes"
 HOMEPAGE="https://trimsh.org/ https://github.com/mikedh/trimesh"
 # No tests in PyPI tarballs
-SRC_URI="https://github.com/mikedh/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="
+	https://github.com/mikedh/${PN}/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~x86"
 
-RDEPEND="dev-python/chardet[${PYTHON_USEDEP}]
+RDEPEND="
+	dev-python/chardet[${PYTHON_USEDEP}]
 	dev-python/colorlog[${PYTHON_USEDEP}]
 	dev-python/jsonschema[${PYTHON_USEDEP}]
 	dev-python/lxml[${PYTHON_USEDEP}]
@@ -34,10 +38,20 @@ RDEPEND="dev-python/chardet[${PYTHON_USEDEP}]
 	dev-python/sympy[${PYTHON_USEDEP}]
 	dev-python/xxhash[${PYTHON_USEDEP}]
 	sci-libs/rtree[${PYTHON_USEDEP}]
-	sci-libs/shapely[${PYTHON_USEDEP}]"
+	sci-libs/shapely[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
 
 distutils_enable_tests pytest
 
+python_test() {
+	epytest -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+}
+
 pkg_postinst() {
 	optfeature_header "${PN} functionality can be extended by installing the following packages:"
 	optfeature "making GUI applications with 3D stuff" dev-python/glooey
diff --git a/dev-python/trio/Manifest b/dev-python/trio/Manifest
index 052b080bceac..e63a9e2b7444 100644
--- a/dev-python/trio/Manifest
+++ b/dev-python/trio/Manifest
@@ -1,6 +1,3 @@
-AUX trio-0.19.0-python3.10.patch 967 BLAKE2B 78989da73496beb5058feedb8218a718b67dfe5b2bb3d6f975a89f972f14f2ac6cb4a21e1beac626aeaf9b4d8678b54a4899cf9714962309c241b4d09e08f17b SHA512 c1e01e0a1b74132cd2421def3c8e78d777e1ae45aa3b8abe234ce4212182769df3241c29ccbe173ba17b247dbc84edbf292cc38e5f9d7c2c8984816197efe669
-DIST trio-0.19.0.tar.gz 486036 BLAKE2B 052cadb8d251960b20349659b92f4d26c5b65128cbbfafee21a4a4b90463e43d9c9db6b35f3659d2b062c7d0b8b8914b31b38d2faed6c9d948c0ccbe85a0a250 SHA512 5297a3f48b786eac05b686f1e8bb0603a9c0133d6c4872a307cdc8f1e37aedb57d668b61c2568c82b7d1058b6604a22d2c5c2298f13d13f0daf8e9259aa76d7c
 DIST trio-0.20.0.tar.gz 491254 BLAKE2B 354e8019d1ba8ac35bbb00477806ab87d62de0e9a94b1ff3a4d63c024af8cd40261c46a2c9449f38550e809938f3c6ee620a47e866bc31203c3c4a4984446fa5 SHA512 9aa431d0bc28737dd48a7358446acaffbf34860dc467ac121166f7241ebf4a4ed8bcdc8dc0277034e3c3fd70f1f8a57d790e98bdda7a1141f2c53c6b85a97a3c
-EBUILD trio-0.19.0.ebuild 1877 BLAKE2B b2c6229033d38538835aa347d95b701c1a30ed6d859a43620c000c2d2b1824387281e0bc7f160a22c08c339c73140fcd5839fb0dabc8e91199cc0a1949b0fe1e SHA512 9a544a686b564b82010adcd93076306f12e9a4749c7dc07fed656dc401add9ce6f049f04a7f0de14bbde5081befd7676731721a587ce7e2532be4082da2a2fc4
-EBUILD trio-0.20.0.ebuild 1856 BLAKE2B b4cc219897103ac2464f4a241afa68253deacc52db3c669b37c37207bf52d50bcb9e7ebe243615ce0ce12d843acfab9229076efd49d4b0184a4247e01c7b8ecf SHA512 4f8eb4e531e126ba478ba84770a9d1fa71f3df134039cbd2003060a62ec72bf7b3c304d62c35b18a0ca1833b28b5efccde4abf8b8d3c5e2b762d38751f4dc0ad
+EBUILD trio-0.20.0.ebuild 1848 BLAKE2B f243d34756433855c9964a4978e2956894a1ea5e3dbe1a67b9a52af6ee1295c54111ec86b1508ec03dc83d505ca2fd6dead72791b50489544a5fd549d920b969 SHA512 8cc77add9c6335bc4e3cad922c8e0452ef5e38565bd73800bf8de3e1707f78a8a0d31bd53060bb418c7659d68a25b49346f109357db93345d467539290061502
 MISC metadata.xml 1959 BLAKE2B 8b8c53b057e11c334de01db932a4b7cb9dba98c200142765224af1252be7e3e756ebd2e8c1295212d8930df2afecafdaf252375e3e842c58d8149432ed038606 SHA512 d7ad911af38df2e7ef4e0659b3a8abf25c334e10d0a637c1d901a05e517e5caeee68932e4263c1bdedbee6af6e15b80cb1bb377ababe4078a507fc5096073b1a
diff --git a/dev-python/trio/files/trio-0.19.0-python3.10.patch b/dev-python/trio/files/trio-0.19.0-python3.10.patch
deleted file mode 100644
index 45af8955df3e..000000000000
--- a/dev-python/trio/files/trio-0.19.0-python3.10.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-https://github.com/python-trio/trio/commit/0a0b75c914e63366f23790d72caa10bdfcc186f6
-https://github.com/python-trio/trio/pull/2061
-
-From a9c54747b90129776f6d2d384e0f64efaac324ee Mon Sep 17 00:00:00 2001
-From: "Nathaniel J. Smith" <njs@pobox.com>
-Date: Tue, 13 Jul 2021 17:34:26 -0700
-Subject: [PATCH] Export IP_RECVTOS, newly added in python 3.10
-
----
- trio/socket.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/trio/socket.py b/trio/socket.py
-index 5402f5bc7..afbcefa1d 100644
---- a/trio/socket.py
-+++ b/trio/socket.py
-@@ -117,7 +117,7 @@
-         J1939_PGN_MAX, J1939_PGN_PDU1_MAX, J1939_PGN_REQUEST,
-         SCM_J1939_DEST_ADDR, SCM_J1939_DEST_NAME, SCM_J1939_ERRQUEUE,
-         SCM_J1939_PRIO, SO_J1939_ERRQUEUE, SO_J1939_FILTER, SO_J1939_PROMISC,
--        SO_J1939_SEND_PRIO, UDPLITE_RECV_CSCOV, UDPLITE_SEND_CSCOV
-+        SO_J1939_SEND_PRIO, UDPLITE_RECV_CSCOV, UDPLITE_SEND_CSCOV, IP_RECVTOS
-     )
-     # fmt: on
- except ImportError:
diff --git a/dev-python/trio/trio-0.19.0.ebuild b/dev-python/trio/trio-0.19.0.ebuild
deleted file mode 100644
index b02ca40ed6e5..000000000000
--- a/dev-python/trio/trio-0.19.0.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library for async concurrency and I/O"
-HOMEPAGE="
-	https://github.com/python-trio/trio
-	https://pypi.org/project/trio
-"
-SRC_URI="https://github.com/python-trio/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="|| ( Apache-2.0 MIT )"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86"
-
-RDEPEND="
-	>=dev-python/async_generator-1.9[${PYTHON_USEDEP}]
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	dev-python/idna[${PYTHON_USEDEP}]
-	dev-python/outcome[${PYTHON_USEDEP}]
-	dev-python/sniffio[${PYTHON_USEDEP}]
-	dev-python/sortedcontainers[${PYTHON_USEDEP}]
-"
-# NB: we're ignoring tests that require trustme+pyopenssl
-BDEPEND="
-	test? (
-		>=dev-python/astor-0.8.0[${PYTHON_USEDEP}]
-		>=dev-python/immutables-0.6[${PYTHON_USEDEP}]
-		dev-python/ipython[${PYTHON_USEDEP}]
-		>=dev-python/jedi-0.18.0[${PYTHON_USEDEP}]
-		dev-python/pylint[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-python3.10.patch
-)
-
-EPYTEST_DESELECT=(
-	# Times out on slower arches (ia64 in this case)
-	# https://github.com/python-trio/trio/issues/1753
-	trio/tests/test_unix_pipes.py::test_close_at_bad_time_for_send_all
-
-	# Fail with Python 3.10 on 'IPPROTO_MPTCP'
-	# Everything else passes and this is a simple check for exported symbols
-	# Let's try again with the next release (after 0.19.0).
-	trio/tests/test_exports.py::test_static_tool_sees_all_symbols
-)
-
-EPYTEST_IGNORE=(
-	# these tests require internet access
-	trio/tests/test_ssl.py
-	trio/tests/test_highlevel_ssl_helpers.py
-)
-
-distutils_enable_tests --install pytest
-distutils_enable_sphinx docs/source \
-					dev-python/immutables \
-					dev-python/sphinxcontrib-trio \
-					dev-python/sphinx_rtd_theme \
-					dev-python/towncrier
diff --git a/dev-python/trio/trio-0.20.0.ebuild b/dev-python/trio/trio-0.20.0.ebuild
index 4d8c69bb7ba7..5611597d176c 100644
--- a/dev-python/trio/trio-0.20.0.ebuild
+++ b/dev-python/trio/trio-0.20.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/python-trio/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="|| ( Apache-2.0 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"
 
 RDEPEND="
 	>=dev-python/async_generator-1.9[${PYTHON_USEDEP}]
diff --git a/dev-python/twine/Manifest b/dev-python/twine/Manifest
index 643fdd0b064d..2414cd9b9da2 100644
--- a/dev-python/twine/Manifest
+++ b/dev-python/twine/Manifest
@@ -1,3 +1,5 @@
 DIST twine-3.8.0.tar.gz 213157 BLAKE2B c7c013a01b0f1f5ec24c76ebfea2c645da07eae0bb816978a37ed95bca4a2193cea627bdddefcd4beaadbe4bd7ee51315b309fbf06555cc75d509bc61578ac7d SHA512 d6ede7241d4825665054811ad657916281426eda6ee88f0e83295b5498876830b6c69284056e409539c792c24ebeb5af2eedf45108261490a72812b9e86e08f2
+DIST twine-4.0.0.tar.gz 214420 BLAKE2B 0a1dc91ed9308252d5db3825c8b642e015720bfe7a95dd9a92ba347cbf1eedede85b18b9c310fe20322928db8e44f988bffb3845748ce9817ecbd5b521fb25c8 SHA512 c97a4315bd2a923979aa3a6cebf826ef022a9e510383f7f1debf941b6eedc47642c999702bdc3377a9740f381ed4dc442a542f02a44e521040cb67fb342e9b7e
 EBUILD twine-3.8.0.ebuild 1796 BLAKE2B 91ec25e976a59f265628e184440f38bb3bcf90392f201e251c2744be56dd5a5249afb0898ee44fd6ee75935fa1e4abcd48cc04dde2484c5e44ba2755d5c5e6f9 SHA512 1c40051f1a959d2057f68bb8da4bdf0a24518a1347984aef0f9d34cd34ac8d719474f2b4965fc7071c5ff65729af3e5e545a760976395109ab6c0c7af3d38f2d
+EBUILD twine-4.0.0.ebuild 1880 BLAKE2B 3cdbee6724820b4b11f5d67460398db1b7c3d25e1a8a45d91ce0dc2bf0491c01679ad8f36de4ed1d8d4de45050d56908bc03e6f4b522dbb147b669ba2d5fa046 SHA512 f362636409e47f4ff81f1a6a4d75d188e1dab68b4d7eefcc3469fd64aba1acade525e3d4f71fbcdd264b5611ae5fc20deac3972254f655cd61be4b36c21cb09c
 MISC metadata.xml 383 BLAKE2B e2a596604a2f3e40ddd0196ea79105e318f8a04d9e5a2c7e458d403d215af1371f2a526fa7d8cbc430f20747f7b65ed6c8546263fb8a54ddd8a6db487c358634 SHA512 cd5c1f1ed89dc5c314975fc5b503108d6828db37826ebba98d6edd580b72cd41867e19e65a9a022f8c07babadecd810f21febeb8a015c51eecec412b9df4f0d5
diff --git a/dev-python/twine/twine-4.0.0.ebuild b/dev-python/twine/twine-4.0.0.ebuild
new file mode 100644
index 000000000000..3e9baf0f1b84
--- /dev/null
+++ b/dev-python/twine/twine-4.0.0.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="Collection of utilities for publishing packages on PyPI"
+HOMEPAGE="
+	https://twine.readthedocs.io/
+	https://github.com/pypa/twine/
+	https://pypi.org/project/twine/
+"
+SRC_URI="https://github.com/pypa/twine/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/colorama-0.4.3[${PYTHON_USEDEP}]
+	>=dev-python/importlib_metadata-3.6[${PYTHON_USEDEP}]
+	>=dev-python/keyring-15.1[${PYTHON_USEDEP}]
+	>=dev-python/pkginfo-1.8.1[${PYTHON_USEDEP}]
+	>=dev-python/readme_renderer-21.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.20.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-toolbelt-0.8.0[${PYTHON_USEDEP}]
+	>=dev-python/rfc3986-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/rich-12.0.0[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.26.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/build[${PYTHON_USEDEP}]
+		dev-python/jaraco-envs[${PYTHON_USEDEP}]
+		dev-python/jaraco-functools[${PYTHON_USEDEP}]
+		dev-python/munch[${PYTHON_USEDEP}]
+		dev-python/portend[${PYTHON_USEDEP}]
+		dev-python/pretend[${PYTHON_USEDEP}]
+		dev-python/pypiserver[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# requires internet
+	rm -f tests/test_integration.py || die
+	# pytest-socket dep relevant only to test_integration, and upstream
+	# disables it anyway
+	sed -i -e '/--disable-socket/d' pytest.ini || die
+	sed -i -e '/--cov/d' pytest.ini || die
+
+	distutils-r1_python_prepare_all
+	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+}
+
+python_test() {
+	local -x COLUMNS=80
+	epytest
+}
diff --git a/dev-python/twisted/Manifest b/dev-python/twisted/Manifest
index f69d52712d42..ecd0007ba31b 100644
--- a/dev-python/twisted/Manifest
+++ b/dev-python/twisted/Manifest
@@ -4,7 +4,7 @@ AUX twisted-22.1.0-force-gtk3.patch 2634 BLAKE2B bf297589d56a59149e1a269aef416a9
 DIST twisted-22.1.0.tar.gz 3883519 BLAKE2B 0b438481af94fbfe08c7470a71421e176ca4994efaf7144b2bd3bc7e69c774295e04831d5356af104d087d970856c1c153b30331cb1598226f83e761b624a53c SHA512 1db52865d00e07044bc755b25bef2fa260cf269a8b51512bec97a015fa484d0b331b41154b52f97b5e8c477d3e5ad1d003f5ac15c7361988d073d097c6e7355d
 DIST twisted-22.2.0.tar.gz 3887750 BLAKE2B 43b50aa33f9a70f2123930ebfc0e9fec08a6faa791dc8fb73c1252fc1de3e00844e421f653d920e5f651aff89557750c6dc6c4557689e01bc9a0793c15de8eea SHA512 a2f66055f0ea6658a04888316b9eb90bd0f389c72db8315fe1722a70f16bb290805d98acc8cfd8a5d22b4817683603aaea50bb04a204927898bd74fc58a1db6d
 DIST twisted-regen-cache.gz 911 BLAKE2B ffd3fcda6c67ffe6fd3ef581c8d507548396b66ed0708e9a5c790095e579c0d5f0f71596acf05712989da2ddef2b8d437eca973bc4d80ef8a9fa852915f38305 SHA512 95a9b931c73017d16d1b5e6b41345dddffe62b6af1a8e93b5e40d06d3d15be17b0dd0181c767ffeeb791534d463764ef9e066fa6c2ee2ac4b53c86d1da8fce03
-EBUILD twisted-22.1.0-r1.ebuild 4699 BLAKE2B 702416deee826241ebfe2a9be2caf0a40383b8ff070f35197cf29bfbc66cdb6c0b44519a7282f7f3576a2359ca19677a2f14692c8a8a29a0bdcb2a8308811151 SHA512 e0068302eeb8f2de38d6a86e2d9410e5668a383a56b0e17ad832ef8e4d341297854db76afd6f0efa477f18e9aa6b1b2238c6fc7d0876b54bea75f2f1a9e4a6c6
+EBUILD twisted-22.1.0-r1.ebuild 4698 BLAKE2B bb60d1c5f7c7f1db5475fb630014efd2362627ac1dcac9b77c85086c993bfc423be25f09001d88738c5691f2cb34dd6edfb26e4565947c0b0e86a780565bd26d SHA512 db2b1908397c98b97db86f5005e1c485c3b4dce7adc8144533eeb78a039f8372dd2bd041297339efb74444c0b91a15b62ce8b9921b188a9ed7aca3f616275826
 EBUILD twisted-22.1.0.ebuild 4740 BLAKE2B 20fd3b47a7880c92c2d44ff6509147b3a7fe66a27bd960236b14b5d1b31c51cbf8ddd0b0ddacbd41cd18920a4da07c102deab13643bf2e82e62a49027e6887c7 SHA512 717b0f7fc47f8ff0a5b470b5a9a0bf21f4c76d75681aec55763d8b0bcd0996c75242950fe7498e07e46046fa383fccf6f572ad6f83db97fbfa11da0b3111d575
 EBUILD twisted-22.2.0.ebuild 4328 BLAKE2B d8106f754f5244bf13d1e3b9c1a3be76c1b36816a2e36e0fcfaceea9b193ecfc6da4e4b5fad53b8c13f5bf84d787cdcb90c51a5457134f6c18cc27ae2221c508 SHA512 a5049f1f33c2d765708ca836bb62f081931572ff57669a9aa13c04d4d117642276e257fc848a4b9699811492eec497250be3c4741eca67b8815aecde3ace6387
 MISC metadata.xml 1352 BLAKE2B da3eecfbfd73709ff8fb48b985d64fa80d134c38a0c04d8c7b08e0ebd936cb2179f579deb6f91f38fd08b74e9454b693b4a89c9ab194296104c519e6f80ddc8a SHA512 f244db7eb7a13e35f8825e2b16cf3cb953c47e68be234efc9d922462cc7ee66e1748e09bf4735bee59cd1016eb38c64ca23f70a25da5bb7311f869cebbb45569
diff --git a/dev-python/twisted/twisted-22.1.0-r1.ebuild b/dev-python/twisted/twisted-22.1.0-r1.ebuild
index 19ad414849ca..19bfac9dd47f 100644
--- a/dev-python/twisted/twisted-22.1.0-r1.ebuild
+++ b/dev-python/twisted/twisted-22.1.0-r1.ebuild
@@ -18,7 +18,7 @@ S=${WORKDIR}/${PN}-${P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 hppa ~ia64 ~m68k ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="conch crypt http2 serial test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/twython/Manifest b/dev-python/twython/Manifest
index 664ec9e01784..71781bbdb8bc 100644
--- a/dev-python/twython/Manifest
+++ b/dev-python/twython/Manifest
@@ -1,4 +1,3 @@
 DIST twython-3.9.1.gh.tar.gz 372933 BLAKE2B 3db7f37e284ec83546e4f93a23e34c21ce9853e6206b62353e36b738ba591acadc55fd3dbbdf8cf7d74e63ab9966b9cdc7f49c5caa06e165bb7107b350509835 SHA512 e64d623dfa7ba2e81e09f9d8e784851b44201493d128ec576c4b5a9abc88debf1ca78f8a12933e0cd0a6b495012fa951bb62ea5d92db11186b37747b8576174f
-EBUILD twython-3.9.1-r1.ebuild 1250 BLAKE2B 6b8f9f8b6e09469c079ca557b31b689a98f83659241cbbccfd57bb801c8a193f6dc0906ef0cda134a4138860169434e21c246afa4f220edeac96b587c4530f85 SHA512 5808274521ae80615a439cded11351fa2707610d5d5c454549d42a0627751a57d9aa5b4794049909a77c76f9d01055e383cf15e63d090e1dfd48b27e57982c54
-EBUILD twython-3.9.1.ebuild 1189 BLAKE2B 1e71e613cf822bfd6ddf7f323398f147a6084b4f77e8ff319235a6e87480b5529437252945c3dd7e8153f59436a9b3b00b4946fd51993fc1efc989685d52b7db SHA512 008d484c8d4f93ac9d4a9ae8b2536b0215887e65217293678df20ee848449fab6a4711920cc727932653ee81c2347247d19943af624c3ba0a02fd89bb7ee037b
+EBUILD twython-3.9.1-r1.ebuild 1248 BLAKE2B 38ff6993f10e30da5857c4d0c0b5624582917d0bda729c4fa9c934ad9f6aea445d2e629cc71ae606bb2e2662b55c00ea38a0afb565214d0e7366ed911b96d67d SHA512 982a23fe240b94667fbb36e327f564cc577ea952794cda446f46ed0addd55f6c7345757927ceb641321b341c1d8471f19ed885d24d8d54e8b874a7dad08bd7af
 MISC metadata.xml 407 BLAKE2B b4aac660a7929463899fafba57aab22c8175ae0f72587bb28fb765a8b0ec326085730bf3931562c27666917fe4d6d1ffa44462cb0856f46997f72d917201b7dd SHA512 cb71d9c30b5639d240bbb046479415d6520d42e3cff07fc30f8fc35366bcb188bf12f3a1088e8447964c824f264f98df29384f0ddc3fac7e11d1da0279df6414
diff --git a/dev-python/twython/twython-3.9.1-r1.ebuild b/dev-python/twython/twython-3.9.1-r1.ebuild
index 6e483bc423d5..9887d7cfb70e 100644
--- a/dev-python/twython/twython-3.9.1-r1.ebuild
+++ b/dev-python/twython/twython-3.9.1-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	>=dev-python/requests-2.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/twython/twython-3.9.1.ebuild b/dev-python/twython/twython-3.9.1.ebuild
deleted file mode 100644
index 3562cdc0d51a..000000000000
--- a/dev-python/twython/twython-3.9.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# 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="An easy way to access Twitter data with Python"
-HOMEPAGE="https://github.com/ryanmcgrath/twython"
-SRC_URI="
-	https://github.com/ryanmcgrath/twython/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	>=dev-python/requests-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-oauthlib-0.4.0[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? ( dev-python/responses[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local deselect=(
-		# tests are largely unmaintained and outdated
-		tests/test_core.py::TwythonAPITestCase::test_get_lastfunction_header_should_return_header
-		tests/test_core.py::TwythonAPITestCase::test_request_should_handle_400_for_missing_auth_data
-		tests/test_core.py::TwythonAPITestCase::test_request_should_handle_400_that_is_not_auth_related
-		tests/test_core.py::TwythonAPITestCase::test_request_should_handle_401
-		tests/test_core.py::TwythonAPITestCase::test_request_should_handle_rate_limit
-	)
-	epytest ${deselect[@]/#/--deselect }
-}
diff --git a/dev-python/tzlocal/Manifest b/dev-python/tzlocal/Manifest
index 99975bbdd18e..cc8e30ec3445 100644
--- a/dev-python/tzlocal/Manifest
+++ b/dev-python/tzlocal/Manifest
@@ -1,5 +1,7 @@
 DIST tzlocal-2.1.gh.tar.gz 18463 BLAKE2B 73e886cfb6d13bebc1a15a222da60f368a15dc5a097acac74990b1d76bdaa229be8f12ff735d1828ccd78c4c8d06eb5bc0a07da695d70251af1e67e4fb71037e SHA512 2679cebdc2692d9e0e1c9b714994ad881896f53e75ef407229a67c9fee9d27617638a2919865cb67e21e2bbd6e3bc13f2568343037e06603236f25a96aa6863d
 DIST tzlocal-4.1.gh.tar.gz 23449 BLAKE2B 1ed3518395674af5b8066825f6a9f1dde411aa0bb534e65e9da44399042bb25ca45b61650bd7ce81d4912c3d5e1fde132d002d189fe388cd6bd4b7ed6d05bb79 SHA512 f6518c95b1e0ac0424a9f51f8ae0d39a50cacb510c8358a4fab077059e57959dd7b83d82ba455e9f7cca9bfc9224662f979d391a09d5516d172f1d6d3292779a
+DIST tzlocal-4.2.gh.tar.gz 23649 BLAKE2B 8b50f13854543a3ba5506bf7562ef0f3a7e7b5a20c7af037dd6eece0af16ead2b762b652b9bee0aaeede73178137293773e428a347e78ae7df999be609a34e3b SHA512 574c2f886fa6d1f2973e1ce817bd3347a77bd3beb0535bf5ba93e028e31388987f3f55369bd5a4a4a86c72af226256cdd7803f5bbe3ca6ce891b5adefdce776e
 EBUILD tzlocal-2.1.ebuild 560 BLAKE2B bec1fa354916a092e040524beab0626b96eb84692ae23ced8b2d007dca0a74d1c3dcf6b7bf487e378277dedc409414cc1403fc9fd5ef5ab5959e9cfeb92c1125 SHA512 bb842cde84a808b63fa0c54b9d7594b044b712dd47ecebc35ff1ab43884d9a586e1656232a6547553c3eaf6c7179314c4d5fc58f153ed849a14616454b4a439d
 EBUILD tzlocal-4.1-r1.ebuild 763 BLAKE2B 5b9a26e974027634e318d1cf492beb2a90aebf6803ed005be4cab9622485d0ede3d4c569cf94fe2000994e12fe53814d25a14468b7c393772b6ed6f2e4a874f1 SHA512 b6af5d66db791f8d673e512d8d64365b1ae8765d05e30c7fc589de07cdf3c89301fe9fee5b90f5b64f5ef7f4ab7e1476d3d1632cbd3f0171185e4bb066244cde
+EBUILD tzlocal-4.2.ebuild 762 BLAKE2B 64bf640155e221bfa33f81ff2971503c7d352d1b859ebf1c507d9b674974b68843a7407610f177dc3c2b93830f19e9042ff49cecf9023780d1d64f6f100dc579 SHA512 7932fcc75f21a56377d7617db75641cca6211b6444fc38be1495eddd2ddcc0051cd16b7c8def3ce0a36cec13f3b10924a0ecc3606fb08899daa65f172ca4284e
 MISC metadata.xml 403 BLAKE2B c2fbd81151ee69075c53b7c7d353ac2eb207e92b5bee234591f839c751c54e20abfeb10a8ef1c7cf074d5b94c4745dd23ca1e935b41619dfdc551d2fbb955ac5 SHA512 73c29b14ace10a0b23ef59f9a10abf5f9367dfecc89743cd29a01ece71689c08f83a14612fd3a4779fcbe5382e4e33f6ffbae183c498cba8ba7776d2afbea8ab
diff --git a/dev-python/tzlocal/tzlocal-4.2.ebuild b/dev-python/tzlocal/tzlocal-4.2.ebuild
new file mode 100644
index 000000000000..3e838f9a103f
--- /dev/null
+++ b/dev-python/tzlocal/tzlocal-4.2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="tzinfo object for the local timezone"
+HOMEPAGE="https://github.com/regebro/tzlocal"
+SRC_URI="
+	https://github.com/regebro/tzlocal/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/pytz_deprecation_shim[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/backports-zoneinfo[${PYTHON_USEDEP}]
+	' 3.8)
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/ujson/Manifest b/dev-python/ujson/Manifest
index 4d0a80cc4f84..0d0aaaaa75d0 100644
--- a/dev-python/ujson/Manifest
+++ b/dev-python/ujson/Manifest
@@ -1,3 +1,5 @@
 DIST ujson-5.1.0.tar.gz 7128147 BLAKE2B edd5b944e98790f3b98c4e2dbeebd1bb058c7b10e07d7919d3354cc2bcc1c8398b5bea08d27cdad438f2aa4a5d340da377ca9ef9b4b03b3d5b0e3053787ee618 SHA512 8988696918402f9e540e878eeafb2d29ed2819d4fa6ca801251a0411981eab2663eb16599a37ffa531e2e036706bd27cb1467bac17c33579e010d106da488951
+DIST ujson-5.2.0.tar.gz 7135591 BLAKE2B 1207e1eae65f859018bbb7a868c2b2010c0e4b41214ea63c1aef00a41600f69e941a1a02d22f1702f3974a3f12e90a731717681e6e9a9e782fc49716b4b13cef SHA512 c0ef90bdaa2d5e02109ea3e01288ff9ab4e4bd865ea0a33d915de2878cb13a04f24fe278f86582e042b430e6b20077f2b337d6a4349777a803e9725666952fd6
 EBUILD ujson-5.1.0.ebuild 700 BLAKE2B 8623a8cf255d688321437699fdfb60b67025747fc1db44bee130c57f9fc0e94ba9b0b9fdd5d8e2a806c8c9b1f62d28c7bc975476d2f86cba0b6e3b9c5a7a84f7 SHA512 8033e0b4a6dfcc82dd5e4268147ef22c5237a0f2f58abe108ea72e645790b788b92bfba8ee6e543842d7bb943da650fcb157b2610056982c61845b71f47a61f1
+EBUILD ujson-5.2.0-r1.ebuild 829 BLAKE2B 39332063a9b9818930ebde7fbd5723696c1abbbc089c1c1289ce12a61863435f41d69c53088b4e71d37dd101717cd41e3a72583ae0b6948083ab760bb5092444 SHA512 245e46b6ed61a9b3e39ca0817c68801eedfade481eb7838245538eddc97d60d64ada021b200054a1182654252ff2fbb8d9c5bba0a31529cdb3c7d5f2e81ed6ae
 MISC metadata.xml 494 BLAKE2B 8e20150926d62643e7ff2110cba22313db0c0e3112290ce08302d57103aa35c42a56921d0b46e0acca2ef83756eb4f7384f23ddb06fe41ef6c4a28921f11ec33 SHA512 d9c0a59f916b84d50e51a21152c1815fea90a909dc9bd44ea620b2a33ca6a92ee237aafe29debcc9d1a2bf63c84112300845309eb0ab1265e5d2b0c05dd313f0
diff --git a/dev-python/ujson/ujson-5.2.0-r1.ebuild b/dev-python/ujson/ujson-5.2.0-r1.ebuild
new file mode 100644
index 000000000000..9f40e7878480
--- /dev/null
+++ b/dev-python/ujson/ujson-5.2.0-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Ultra fast JSON encoder and decoder for Python"
+HOMEPAGE="https://pypi.org/project/ujson/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+
+DEPEND="
+	dev-libs/double-conversion:=
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytz[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_configure() {
+	export UJSON_BUILD_DC_INCLUDES="/usr/include/double-conversion"
+	export UJSON_BUILD_DC_LIBS="-ldouble-conversion"
+	export UJSON_BUILD_NO_STRIP=1
+}
diff --git a/dev-python/unicodecsv/Manifest b/dev-python/unicodecsv/Manifest
index b94600e65f0b..47c78d8202d2 100644
--- a/dev-python/unicodecsv/Manifest
+++ b/dev-python/unicodecsv/Manifest
@@ -1,4 +1,3 @@
 DIST unicodecsv-0.14.1.tar.gz 10267 BLAKE2B 06a8dcd8de319422fe85b10e87fe759ae23f0f375bef3c03fd7b2bd37c25a8e2b46d632e1a4849f0799a9702fd8f1d2d0ddb8eb9e8f41d7b3113e92bec11828f SHA512 fdd7696c4ccfd478dbf1ff846714b7bab4711ca294fb212ae173b66becd2f9220cbcf69afb8e00162312373d9e59a6336bd7be2f5c270ac0dee359a830290bd9
-EBUILD unicodecsv-0.14.1-r1.ebuild 645 BLAKE2B f3a39a0bbdb49ef5cc28054871cd434f9670ebeeebcbfd130a3d28207b7c1374bc4f165b37bd0c9a4086aee88ca13d6de002d6793a25349c26bb86dc684d00be SHA512 0fdbc2c172f6068e18f9b5bd326c22765b1f1fc014370062664811931312636e901e5e758e173d8eb47499ae7da3545b06b59c3efce1b54c9a97e17eadd93afe
-EBUILD unicodecsv-0.14.1-r2.ebuild 686 BLAKE2B 2974b9d261c86a3fb3044b79298ee28d2d4dd92a8e9deee81e9f55d89f6a55b8d0af535db08021166e79fbc665bf306f0fef7a7c62b2c422d11fb74ea460d1dc SHA512 62b593e0ebc316e606f6862e96e3cce3a50768c12c76fd5158b341f53860a3600890a3705790bf6ab7c69c97728f23d3a81fac2d063d927ee588384f096b0438
+EBUILD unicodecsv-0.14.1-r2.ebuild 682 BLAKE2B a35ae45b46bab85265db4ea23266bff01a94857adc7a64fe7c3e42a29a1e8f546b9fdca28ad1e88d4df8f1d438ec6832e11181e347e8bd0feaf0e68ed229e3c4 SHA512 979d7a1e2f12f14133f825d11bb51097d1c3e7859b1eac02364a829b70559ea83a7ea1cfecf9f2e21ed5a7c276a1f5c575c2ef720acb9d6d128138b345b30e61
 MISC metadata.xml 402 BLAKE2B cfdc79e02e047edae2f1b9542ace868ff7103131bd85d2563ea4a97c7bc82811cc93f523832502ad61d2f6bddb591a2d977e02154b549565a3914ae2388d5b9c SHA512 7f60cf22a3e47d85311905d0ced4a1efd984bc95dc351ae529dd016cc34ae70f88a38901625967cf15ba42895830693ed43976a93cc5cb1644884cf725bc7a95
diff --git a/dev-python/unicodecsv/unicodecsv-0.14.1-r1.ebuild b/dev-python/unicodecsv/unicodecsv-0.14.1-r1.ebuild
deleted file mode 100644
index 41975d674716..000000000000
--- a/dev-python/unicodecsv/unicodecsv-0.14.1-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Drop-in replacement for python stdlib csv module supporting unicode"
-HOMEPAGE="https://pypi.org/project/unicodecsv/ https://github.com/jdunck/python-unicodecsv"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	# un-depend on unittest2
-	sed -i -e 's:unittest2 as ::' unicodecsv/test.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/unicodecsv/unicodecsv-0.14.1-r2.ebuild b/dev-python/unicodecsv/unicodecsv-0.14.1-r2.ebuild
index 7b08a0159317..38bd2462fbc4 100644
--- a/dev-python/unicodecsv/unicodecsv-0.14.1-r2.ebuild
+++ b/dev-python/unicodecsv/unicodecsv-0.14.1-r2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
 
 distutils_enable_tests unittest
 
diff --git a/dev-python/unidecode/Manifest b/dev-python/unidecode/Manifest
index a9e366e68a9d..0a23929d2a38 100644
--- a/dev-python/unidecode/Manifest
+++ b/dev-python/unidecode/Manifest
@@ -1,7 +1,5 @@
-DIST Unidecode-1.3.0.tar.gz 191814 BLAKE2B ca995b91d802eff3dc07b78359f73a5b44d0197ba522d43c7cbe36c85682c20e943214d671ac2203829196d472456f853ad0988d21fa2e568b13ef865932bed6 SHA512 98682ce5c844bfb74466d0c4c16cb74b358f50ce7fc8ca8dd56836d1b8745cb5c78692b8027ff9caf59394df6050ae2f36f888bb95ef8fc7c84cabe2a596b185
 DIST Unidecode-1.3.3.tar.gz 192050 BLAKE2B 74fe777ad25e78357499ed80f3cd9e43ef42d0a08e3b14e4916c57d43e0e296c6852722f84a3fd1c57911f7d97962cbe12043e3b68adad15d785793912ec53ed SHA512 1c42f2530fa68c56ded097a92b580a3b1c223c957711778b81dd92c8543068a76a87379db7fbe4d2dcb6a9a6c2fc2aef28ed950e0c07d411ae2891c00a8ffea7
 DIST Unidecode-1.3.4.tar.gz 192346 BLAKE2B 34edea805896022fa42f47929a55ba01850475cb49431c4c50329caa2f198455704224320887ac7dcad5fba3517ab42cafc8ade726e785be0d0141814a5ad455 SHA512 bdbf482abd0d93ea8d891b95aea9f95cca6f85dbe71cd2bef4664216b3aa1d672c2f4ecf3b8bf356cdb1d8e4a1141c296728498473d9d0067d9774d0a7de8d48
-EBUILD unidecode-1.3.0.ebuild 522 BLAKE2B 5f9476abcc279eabe1dfb9f186e76a019656b88c7abdf5fb9d1239f4ccc801be937c7a8ce32c1d8ef80ff7e9f127e24b693494bfed2cba5fbc8c53fe456cf897 SHA512 dac569b3d9b46f7d3ba38cf6d279776c3ed2bc4b2e6fd3a0def6fbfdc11bd68107e9a9309ab89a3db5aede17cde341919ec96fe65429d0809d76769d86ac3930
-EBUILD unidecode-1.3.3.ebuild 561 BLAKE2B 967d50549f1f2b0d1f7ed6824803bb83c00e3a7ae04d7522286782c25bd2e8c3a7bd7404bd0008d54a679efaea72f0abefc30238ab5f61249968517386046a03 SHA512 a4e304b44906a35cdcf6c5bbad364c72093c852e5a7d16c14ce18934f421c285e607d62bb2f99bdf3d0de05e00c08f844144a105b7f8e091c9b97ed543711bc5
+EBUILD unidecode-1.3.3.ebuild 554 BLAKE2B efb1600b24baaddd38e4b47bd4db352f6f6ac772f07bae722b9a93496b1eadf242ef912095c2558bb87300bf38951b99b9e0853c8e2cc2c0c2f48832379f71ba SHA512 6c55e524ac4b758fdd5d15f5967bbdc7cb5e2422bd43a966c3565913b4cae0ca0d86a89b8e41dbde24f05cdcd18c4c43cb2a8b3ac3f774a99d76d86cdb6aa3b3
 EBUILD unidecode-1.3.4.ebuild 561 BLAKE2B 967d50549f1f2b0d1f7ed6824803bb83c00e3a7ae04d7522286782c25bd2e8c3a7bd7404bd0008d54a679efaea72f0abefc30238ab5f61249968517386046a03 SHA512 a4e304b44906a35cdcf6c5bbad364c72093c852e5a7d16c14ce18934f421c285e607d62bb2f99bdf3d0de05e00c08f844144a105b7f8e091c9b97ed543711bc5
 MISC metadata.xml 457 BLAKE2B 43e1b676ecfc82f845bfc1b3dd2409756ca419086ccb693b39f73e2598b5de9a463fecb3dbda76d7e375b23a6ba06589231d6184a92872bd4f3c16080bef6353 SHA512 7cded888473c7a7829aaba7d63d5a54bc22f5e9829733d961d520a7d3f0ff57ee00e16c42811a6b63c0d02f9e3f93a1d0f539c8c79242038bcdfd594ab7d07c6
diff --git a/dev-python/unidecode/unidecode-1.3.0.ebuild b/dev-python/unidecode/unidecode-1.3.0.ebuild
deleted file mode 100644
index b65e0127f070..000000000000
--- a/dev-python/unidecode/unidecode-1.3.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# 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
-
-MY_P=Unidecode-${PV}
-DESCRIPTION="Module providing ASCII transliterations of Unicode text"
-HOMEPAGE="https://pypi.org/project/Unidecode/"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${PN^}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86"
-
-distutils_enable_tests setup.py
diff --git a/dev-python/unidecode/unidecode-1.3.3.ebuild b/dev-python/unidecode/unidecode-1.3.3.ebuild
index 9e1d88d80414..b672c007a086 100644
--- a/dev-python/unidecode/unidecode-1.3.3.ebuild
+++ b/dev-python/unidecode/unidecode-1.3.3.ebuild
@@ -16,6 +16,6 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86"
 
 distutils_enable_tests unittest
diff --git a/dev-python/unittest-or-fail/Manifest b/dev-python/unittest-or-fail/Manifest
index d5846dd365b4..4d08689baa64 100644
--- a/dev-python/unittest-or-fail/Manifest
+++ b/dev-python/unittest-or-fail/Manifest
@@ -1,3 +1,5 @@
 DIST unittest-or-fail-1.tar.gz 2739 BLAKE2B 781fff33d12e2ebbf408875d8677a73fe3d5025c6d7e5e67ce23e1f5a36479e7680ffafc9ec73830a70114ddb8bb0c784095f15e8ee13fcf95fe4712c2d8a080 SHA512 c58a2b6a3723d1327d74fb528a5742f576a70453c81bcd55b551a6eac05bb6af4555b9274ca939df70ada85a0be42edd258ea7644ab1d24fbf897a1e96b23055
+DIST unittest-or-fail-2.tar.gz 3177 BLAKE2B 862a406f3faea7bdf47b8e3f9dfa0057cb45669d9ed47f94dd51b2db107be62d1a332e7e6f0fc8f8f1f6719db90a9ebe19a8379d12a3f0908b073f1dd1dc4643 SHA512 f5b34ed5f312618e174147d1717142fe817fca3f993606f572a6e3f7481f055f793c3b4bc56481e259513ca7ac1b94b8a27ac6e319ccf909f55492edd5f14951
 EBUILD unittest-or-fail-1-r1.ebuild 843 BLAKE2B d062094a965ba4276131b5f987d624530d432e4db4220ccb08789ad3de4beaf7ae4f872acf40f117495eab68116b6789c753ebdbd1a63aaeeb7f240238aec3e3 SHA512 ebfcabcb3853c9a7ecdba29d31ebcdcb3836a14751d9aeaa255c05ac00ec5840c25788b87fa549201bac31e9994f501970cc79dd549a30e55d12358e1b0765d2
+EBUILD unittest-or-fail-2.ebuild 846 BLAKE2B dfb87cb7c0ab3680c4564342e6256e1f36dd0b4b187890005c8e85e60c34c509cfd743d0bd49cb0938ed4b35455f1a9b370094e1b1767df2ff34e68311ee4882 SHA512 463a75211f22268d7788fd1f36527f777cea04cfa6b5ff7d2f918573c6182fde50edb3ee56664d0b095e6e4a90906524ebf16fdb89e32f685c7ea7994386a9d5
 MISC metadata.xml 373 BLAKE2B 3ad42807c91c3c0d7cbba503afc38ae94534c8fed72986c171a16f5e8a59630570b647aff0ae0237cd95a9ef8a202e022aa95cd7161f310b84cf75867aedfc54 SHA512 9f4e48a463886ae1b99fc6d16451e580ed8e861248233c0aed47d874323ffe9bf3a9b11079640f9e15f17d34950a0dcc80b93113ca623fb35e419ddca3851783
diff --git a/dev-python/unittest-or-fail/unittest-or-fail-2.ebuild b/dev-python/unittest-or-fail/unittest-or-fail-2.ebuild
new file mode 100644
index 000000000000..9700930bf33c
--- /dev/null
+++ b/dev-python/unittest-or-fail/unittest-or-fail-2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Run unittests or fail if no tests were found"
+HOMEPAGE="https://github.com/mgorny/unittest-or-fail/"
+SRC_URI="
+	https://github.com/mgorny/unittest-or-fail/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz
+"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+# Warning: do not use distutils_enable_tests to avoid a circular
+# dependency on itself!
+python_test() {
+	"${EPYTHON}" -m unittest -v test/test_unittest_or_fail.py ||
+		die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/uri_template/Manifest b/dev-python/uri_template/Manifest
new file mode 100644
index 000000000000..22420c876d9b
--- /dev/null
+++ b/dev-python/uri_template/Manifest
@@ -0,0 +1,3 @@
+DIST uri_template-v1.1.0.tar.gz 18014 BLAKE2B 01ac4439b6661d0d1e7adb5b5ebcc594497cdaeef24b33cbfc8a26f607e779a72ae20838dbbcce28278886c87df475adfd53c73287a4768d848f65b95ba2ce58 SHA512 b6d34931e750acc6c160e7157fc000984acc099023e9794163777679cbe706b8a646bab89e82171c0318827b7a7b9cfcfb997768120cabcf36e7982214321665
+EBUILD uri_template-1.1.0.ebuild 633 BLAKE2B 03e897c036d01e568d282cf88af4cf6aa3581f7c1ac050ef1ad0d216372df807d7f89f1bb0d784fa570af7195b0b1230dd3af9a43670c1d57c8ddcbeb352829e SHA512 471769f23935ba3194dce78436b59deb845dcab374ba80daa6edf07eeab66e5496d7bab699ea05476105db024e3e30eb695ffcc55ad86f8c354c21b4104d1ea8
+MISC metadata.xml 595 BLAKE2B 06f55493da74b24bd7ee6266accaa73b33e3f48a1d7d0f176a6278231e281fe269e6825f34ad1fa122b6d11ac1f66b21696410ae51d0917868f02d2ea57814ec SHA512 148737f47b030bb76659503ca70582385c005ffa5168e46ccdcfc8f7729299c38bd3b6b20a875e69690ff1bbf117da61d92f0f4657b97cf172ac358241fd4709
diff --git a/dev-python/uri_template/metadata.xml b/dev-python/uri_template/metadata.xml
new file mode 100644
index 000000000000..582b879aa5bb
--- /dev/null
+++ b/dev-python/uri_template/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person" proxied="yes">
+		<email>gentoo@chymera.eu</email>
+		<name>Horea Christian</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">uri-template</remote-id>
+	</upstream>
+	<stabilize-allarches/>
+</pkgmetadata>
diff --git a/dev-python/uri_template/uri_template-1.1.0.ebuild b/dev-python/uri_template/uri_template-1.1.0.ebuild
new file mode 100644
index 000000000000..d8cf7ad1ea00
--- /dev/null
+++ b/dev-python/uri_template/uri_template-1.1.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
+
+inherit distutils-r1
+
+MY_P="${PN}-v${PV}"
+DESCRIPTION="URI Template expansion in strict adherence to RFC 6570"
+HOMEPAGE="https://gitlab.linss.com/open-source/uri_template/"
+SRC_URI="https://gitlab.linss.com/open-source/${PN}/-/archive/v${PV}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~m68k ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+python_test() {
+	"${EPYTHON}" "test.py" || die "Tests fail with ${EPYTHON}."
+}
diff --git a/dev-python/virtualenv-clone/Manifest b/dev-python/virtualenv-clone/Manifest
index f6b58c6fb5dc..3ec91f18b6d9 100644
--- a/dev-python/virtualenv-clone/Manifest
+++ b/dev-python/virtualenv-clone/Manifest
@@ -1,3 +1,3 @@
 DIST virtualenv-clone-0.5.6.gh.tar.gz 8723 BLAKE2B 2bac625f85a26ac2224fb982230fdf592963ac462d6d86c59100bf960fc37dd4ae7ae9da0e6234e1b2952d77ce55e0a0c60c06c7db4868709638f21479e8150b SHA512 5788a3d2994b3cbf4ec4668e2d0597e7a033a5eb13465b3964aeb2a38c5798a879e818a88a9cfa37b87a9aae534416c157cd82959af556b6ec94ffbc755ba844
-EBUILD virtualenv-clone-0.5.6.ebuild 535 BLAKE2B 6928e69c60923dd37bc5b5f582fac41402380f250dbe003cc1fbdaff5da11beea474dd0e219c1d9eaf829f5e4f490343fd83308726564db6ff30e5ac77ec7170 SHA512 c3a7ee4bd4bd02d436c70af2aad7c1288607255854b11c82642da38b6acf427dba099a96aa08239202835bbc32de2be54436912b24ed29fe583cfc8d892f3eed
+EBUILD virtualenv-clone-0.5.6.ebuild 542 BLAKE2B 2517a446c43be2c54a21a6f3e3ed81602b6869646d17a970de0944b4e92abaf7174c5ba2c74b613e280aff05a3c8f22dd4e56b297f25f79df5841ce39d37cdef SHA512 d7e7d5f02ac680f4fcac9c37c66551d7fb78505d8323689807d931392d5e28a375089497845bd327049046d2e09269c044ed7f7c7407b0dbde5b1313a09252c6
 MISC metadata.xml 426 BLAKE2B e1f7d7fac506cfd33a89fc1824aecc183c8791629fba4d5dd807042b37b22cac47eec7e4ee8f3cdfc721bbeddb675f8174f97d53f68f64a4ee96370f4b13fa57 SHA512 b3f17e3ad784a814d5107944877612f80353fd0719fdb9875430cc0c327a4b8bf8d62ae9dd5aecaa300b56e2c85d8f8b8ea8b54d1e7d93392a38f0645e1319f2
diff --git a/dev-python/virtualenv-clone/virtualenv-clone-0.5.6.ebuild b/dev-python/virtualenv-clone/virtualenv-clone-0.5.6.ebuild
index d26b54951793..2a8e50329b7f 100644
--- a/dev-python/virtualenv-clone/virtualenv-clone-0.5.6.ebuild
+++ b/dev-python/virtualenv-clone/virtualenv-clone-0.5.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~riscv x86"
 
 BDEPEND="
 	test? ( dev-python/virtualenv[${PYTHON_USEDEP}] )"
diff --git a/dev-python/virtualenv/Manifest b/dev-python/virtualenv/Manifest
index d9f58f5b9e59..c6abe59df1ef 100644
--- a/dev-python/virtualenv/Manifest
+++ b/dev-python/virtualenv/Manifest
@@ -1,5 +1,7 @@
 DIST virtualenv-20.13.3.tar.gz 12152717 BLAKE2B 791eff66e02d0e7b563d68136cf9652ca0e7422cde94ddf558053778e7677937f7f3ddd9e2d6d0a5fd56c79d9061474685b39aa8519471cea230f4dc5ea71c83 SHA512 e9e05e6e6aba10bb6c0813484f508aede9fe2a78401272bb12ea68b80e8f4059f4292de51e37c2487efb92d27f6eeda6e108dd12f45623984966d8fe821352c0
 DIST virtualenv-20.13.4.tar.gz 12153741 BLAKE2B 050553253f2576917b71eccb94b9a4f370d8c131c61fd84e1d4e6445181c793435ca7ce988ff62cffedb406d357c52337ba5ad921f1837ac29d81896958b58e0 SHA512 d2800ce3830ac154e9c0f03fe96535286a4322b89ef94c01638065ec353ee1dc439f7dbdbd9647836e514e828781c5a48fce3723f80c32bfa9ce96243610a396
+DIST virtualenv-20.14.0.tar.gz 12209889 BLAKE2B d6b89f71009109ec688045b92fa2907baa2a174a8736b66e3635b125d05f9cedf2b0cf26497e47193d3c99d44b94b899205e8b94d20beeeacab0b22b47e3eb41 SHA512 c4f1b40187d847602cb2ccef1be9ecce6acd234d08abf5967219d8cf900e641337ce027018c2cca566409a5ab3dda1f363d7381a0d2f676000c04e10677bfada
 EBUILD virtualenv-20.13.3.ebuild 4468 BLAKE2B a2199bef63bb6af77b329a569fd38622a7c8021cbf81cd06702a2ead3bff972890e5201c14e6d89338881848e769e809aa1a17993208e6d4b1053f49fc049e3c SHA512 71fa926c8dc8a1221a8b7c6336e2e090c799438f96d9c4c4091654e327b78af164e63c53d206a523df5003bdf19bc175db255be3657b09e78c572418edff7bbc
 EBUILD virtualenv-20.13.4.ebuild 4476 BLAKE2B 058657b5fba38d0b0c3cf8f49d145a2c562b755d681eb5b5f52bd424f6c01e9812dcb73ec64bc5441946ab07e26dfd7d78693d85f792233760de209b1fe35fd9 SHA512 c24faf2bd0c46df5d323318ac59e71ded0be5cad21ce8aee517f7a2288cef0db9cd28fb0622110ab525fec36868ecfc7d28af68e889fe138aaa45e23092ca790
+EBUILD virtualenv-20.14.0.ebuild 4478 BLAKE2B 411c1f672c7699e487be6bc4f5ea748e560dcfe5281fbe014169cd6dc920409c56e94d3cf44624ef11c8dc70fe1cbe8f1ead373022e89a8c6c83213c71cb967d SHA512 1e6aa35a36c9c5823c57d7cfcb1eb18a979e385a03002dbd3db60c81b2f3e5cab537ba27c33a842274e1254cdc950ca4f6eaa1d87b1260f6289f75840e89056d
 MISC metadata.xml 406 BLAKE2B 97fee04c2662c5c36b6e16538284def46eb2454424770f42edf2567ed804ca15c4e969c714c57573f897b0946246577ab6e35204ed1f3f1735713d8ab5d24667 SHA512 356d42db463b63a3b3a55c1e98eb661de0a10aa6a5fde4f8b3f888ec73020c6679e86efd8dbb0b3e4a5a720af95e658612ba460fe548e081a90beec75fb9c1b2
diff --git a/dev-python/virtualenv/virtualenv-20.14.0.ebuild b/dev-python/virtualenv/virtualenv-20.14.0.ebuild
new file mode 100644
index 000000000000..049e901dc93d
--- /dev/null
+++ b/dev-python/virtualenv/virtualenv-20.14.0.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Virtual Python Environment builder"
+HOMEPAGE="
+	https://virtualenv.pypa.io/en/stable/
+	https://pypi.org/project/virtualenv/
+	https://github.com/pypa/virtualenv/
+"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+SLOT="0"
+
+RDEPEND="
+	>=dev-python/backports-entry_points_selectable-1.0.4[${PYTHON_USEDEP}]
+	>=dev-python/distlib-0.3.1[${PYTHON_USEDEP}]
+	>=dev-python/filelock-3[${PYTHON_USEDEP}]
+	>=dev-python/platformdirs-2[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-41[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+"
+# coverage is used somehow magically in virtualenv, maybe it actually
+# tests something useful
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/flaky[${PYTHON_USEDEP}]
+		>=dev-python/pip-20.0.2[${PYTHON_USEDEP}]
+		>=dev-python/pytest-freezegun-0.4.1[${PYTHON_USEDEP}]
+		>=dev-python/pytest-mock-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/pytest-timeout-1.3.4[${PYTHON_USEDEP}]
+		dev-python/wheel[${PYTHON_USEDEP}]
+		>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
+	)
+"
+
+# (unpackaged deps)
+#distutils_enable_sphinx docs \
+#	dev-python/sphinx-argparse \
+#	dev-python/sphinx_rtd_theme \
+#	dev-python/towncrier
+distutils_enable_tests pytest
+
+src_configure() {
+	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		tests/unit/activation/test_xonsh.py
+		tests/unit/seed/embed/test_bootstrap_link_via_app_data.py::test_seed_link_via_app_data
+		tests/unit/create/test_creator.py::test_cross_major
+	)
+	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
+		'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-isolated]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-global]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-isolated]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-global]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[root-venv-copies-isolated]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[root-venv-copies-global]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[venv-venv-copies-isolated]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[venv-venv-copies-global]'
+		'tests/unit/create/test_creator.py::test_zip_importer_can_import_setuptools'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.10-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.10--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.10-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.10--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3--bin-]'
+	)
+
+	epytest
+}
+
+pkg_postinst() {
+	elog "Please note that while virtualenv package no longer supports"
+	elog "Python 2.7, you can still create py2.7 virtualenvs via:"
+	elog "  $ virtualenv -p 2.7 ..."
+}
diff --git a/dev-python/voluptuous/Manifest b/dev-python/voluptuous/Manifest
index fc5c1c6ea1f2..d2f41354833b 100644
--- a/dev-python/voluptuous/Manifest
+++ b/dev-python/voluptuous/Manifest
@@ -1,4 +1,6 @@
 AUX voluptuous-0.11.5-fix-doctest.patch 193 BLAKE2B 7880210f220cc65a4ac3692da728fe607e2accea6722232dd0bbef2fcc29187e661afb326741caa0d47f9dc96b6b5bb1cfcd064019dae66636054e1b2704f01f SHA512 d261e24685e551de96cdd68e1e0090aa639198f2647ad5d68f7d0d45b834ede99c52e5439ed0b41f3271aaf934519105c8e0820ead288b1748b18b0ee734e977
 DIST voluptuous-0.12.2.tar.gz 48477 BLAKE2B c1cc26b3ac87bcd357d522c8a5210397f1a16e68f812727f2e8ab18c6731d12a04c2e9a96735e25926854eb378feaaeb8bafc083f394b7e9c2dfa2a503abeeb9 SHA512 86193294c1c6a593f6556f23a9a2c093690a06cbdabb7e268db135e36af6a15c113e78f3e05d000276b6ff54b8e17a0a01d589e9232da9eb5320500fdb5757e1
+DIST voluptuous-0.13.0.tar.gz 47117 BLAKE2B 101cb8bb2e06cde87e1f19306188a9b7df9fa93cf940f69443b6730b678db09c93d2999b22cb22ad108b9f08c1096e4f9055330d77d31dded9bda1ae99a158d0 SHA512 a4b76a7d7e3f1f2697c09b025c2386b77c48e7f9d001e05ab0b93c91167e438352ac682d52527e2cc01d009787fedd4674cf7c926ed908022fe381c09d488f29
 EBUILD voluptuous-0.12.2.ebuild 536 BLAKE2B 04f57c2f4664acbe66e367a89382fe5435a41793057485cc0320c0db426b199b7fea8261af7288cfdb265833c5025e1b5e8651a9b2c764761573028990f7e81a SHA512 715d8bd22fe9b3ed4b535e643f890ba70c7cac4b4d2871368585a1a66ab9d18fa4a56746de9f39ca5ca5b362729d4308ed2d99ac707d823be7399b50f942d4e8
+EBUILD voluptuous-0.13.0.ebuild 574 BLAKE2B f51ad7ea6f572d6e312c840e12473d07d916555db0f578b00dadb8118ed9fa130a2ff2cc8105d8f624a5bc122247a892adc78334ef90ce57add57f7be42546b2 SHA512 3af229275742788af15ea3f2af637927345a52a00cd312cb083059af1c50c3d21be53a656da981202a954507331440b28735bde8b731bc323d0096824109afa1
 MISC metadata.xml 716 BLAKE2B 1298492f8a89ce4babc23481dc56da06e4d9007546ed2804fdf42906f6d90d3b1327ee2d54724fa3621a387429544931d30a0334312a68a17edaeba735c9d7b8 SHA512 80636ea29257b1ff070427dc759f9d0abf02ba2037676725627308c69a1e9bc49353c09507523a739c3f07a4cb284e2df76d3935f4f9dadb64005ad7204ddf60
diff --git a/dev-python/voluptuous/voluptuous-0.13.0.ebuild b/dev-python/voluptuous/voluptuous-0.13.0.ebuild
new file mode 100644
index 000000000000..7bd4bed29249
--- /dev/null
+++ b/dev-python/voluptuous/voluptuous-0.13.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="A Python data validation library"
+HOMEPAGE="https://github.com/alecthomas/voluptuous/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.11.5-fix-doctest.patch )
+
+distutils_enable_tests nose
diff --git a/dev-python/warlock/Manifest b/dev-python/warlock/Manifest
index 20e6d11ac31f..a7081c529c1c 100644
--- a/dev-python/warlock/Manifest
+++ b/dev-python/warlock/Manifest
@@ -1,4 +1,3 @@
 DIST warlock-1.3.3.gh.tar.gz 11147 BLAKE2B 1281348076500315c5aa105691b8e5a50ccf2ba79335fb8581a0b89bfc96bb3076a797c4ebe011f6c347667a0971bbbdd2b1bf413d0692ae5977216c524cbee0 SHA512 8a9135a17ccc0d0939ad98eee16100ec68b911d672b3af549f7629edcd6e08129f9e4ab707082593274fc896bc405ab6d6ba9e4bf6fc40b8522ec99327c983ec
-EBUILD warlock-1.3.3-r1.ebuild 904 BLAKE2B 68cfb0dec958bc903025eff0c018364d8d3583bb59484362736e9d7d62298ca3da992cd05f27ce8f80bf63050911c2987ebeed8b8cce3301ec534790f5f66a40 SHA512 ef54efdf539e26a4705af902a7b4705e13c75211d9b47f0f782b272f572509ffe5f66b448d8a3eb05a02e0fada7785763e5ea4edf7b3ed9b8a7192cb5fc0d415
-EBUILD warlock-1.3.3-r3.ebuild 1081 BLAKE2B 02b380c5e446289ae0fc8e28676b7e03d79325367bf582091f5a094aa32a1a04be6fbe8cd578fc02251b1db11930fee9a6fa7e4eabde4ae8fdd28e8ebe80f3b7 SHA512 09d9414cd2189bb8b89e7a3d670feb8a340660611b55c760cda777ae03e386aec0643b4f5428f616860a94bd1869051f34f5dde70d0843eb033dbe7e2f86b575
+EBUILD warlock-1.3.3-r3.ebuild 1078 BLAKE2B 7576aa9dfd4f451836217e93294b753ca3befdb51008d1c0143e66ed5b591e62391b15d1261a71d890b2d1c0cd0bcd2f8c4d87f55b9f9973c4e5bd657624b9b9 SHA512 3860477675b907dbdbe2fa217e801e7a8678a6f5880d3a981e0752009bf81133397bb020398cee248fcef52ad9542df953cdd215273554e13fc2f2491e55cca7
 MISC metadata.xml 482 BLAKE2B 28941971c8e9ae4f5d1685ac1b9e53497235a62180a4c18093b54c576211b39f3048433d317ffb587a1335042b3894b8bee32cd903a97eee249c4864cfdec357 SHA512 99840c6ff45fdd5a4cb6a06a9322cfcd167b89a540d092fd75851ceb5a03ebce26c7c4adf702b41cc209eb1efd924aab50809c2840799fbb711578185cfbd61b
diff --git a/dev-python/warlock/warlock-1.3.3-r1.ebuild b/dev-python/warlock/warlock-1.3.3-r1.ebuild
deleted file mode 100644
index 0086c8697dbe..000000000000
--- a/dev-python/warlock/warlock-1.3.3-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2022 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 object model built on JSON schema and JSON patch"
-HOMEPAGE="https://github.com/bcwaldon/warlock"
-SRC_URI="https://github.com/bcwaldon/${PN}/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	>=dev-python/jsonpatch-0.10[${PYTHON_USEDEP}]
-	<dev-python/jsonpatch-2[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-0.7[${PYTHON_USEDEP}]
-	<dev-python/jsonschema-5[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# broken by jsonschema-4 but this package is dead and glanceclient
-	# (its only dep) does not seem to be affected
-	tests/test_core.py::TestCore::test_recursive_models
-)
diff --git a/dev-python/warlock/warlock-1.3.3-r3.ebuild b/dev-python/warlock/warlock-1.3.3-r3.ebuild
index b2d5e92ccb69..7949151efc2d 100644
--- a/dev-python/warlock/warlock-1.3.3-r3.ebuild
+++ b/dev-python/warlock/warlock-1.3.3-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/bcwaldon/${PN}/archive/${PV}.tar.gz -> ${P}.gh.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]
diff --git a/dev-python/watchdog/Manifest b/dev-python/watchdog/Manifest
index 53cc85975aa0..31fa83daffef 100644
--- a/dev-python/watchdog/Manifest
+++ b/dev-python/watchdog/Manifest
@@ -1,5 +1,7 @@
 DIST watchdog-1.0.2.tar.gz 91796 BLAKE2B 001cbe82ff8aff0c4e56e4d1f02519047580cccb48466566ad7c9c1f462f90a9a036cf90846eb38ec4fb24ff1df2a1ddfec20b3f0587afdc1f938ada1bb0b1ef SHA512 e87a0955ce822daabd7d030804876698f98ed2aad58486e26a94585763655302063f091b653abd385ea99642361b6253d8e051d96019b243a77b078ba86b0d6e
 DIST watchdog-2.1.6.tar.gz 99756 BLAKE2B 5ea08660c28f77be02b261a22e6fbfdfaaa59f79af1eecb396fda2e56ab4b5b290dc2c791b31a6841ac6d96c7974d51e846ce0232e9de6728f6031685685e761 SHA512 810ee2c40d92102815685c6e06bee403dfb85df7c8de5f1b7066b27cef2a8e25f506f8d9cc0ff0ec3213b889a7844138692fd9d1ab0c40d0aa2097c55e85f531
+DIST watchdog-2.1.7.gh.tar.gz 100442 BLAKE2B 21247e1790077eb1eb2f1dc2bb8ddebc1b7f6a2c503238c52c660246fee8c1d3483119184a62114efb81c44665321d4e3aa18ffd73b3244a44c4c6df5204c834 SHA512 f69265aac6e8a840d230c15cfe88c803f043cb540785446113617c0fd1a3c5dce8a885a376bbadc75372a718800948dd4b00c618e18e033d510b8e2bc2bbb36b
 EBUILD watchdog-1.0.2.ebuild 965 BLAKE2B 35bf7d74d9da00f8a7b69e6394619867c4cf6947e5c14d8aa833ea1a099515529f7bdb5bb02a59a76c5629e7e38dfd560df0fc63d23fef5210d5b42ac0dd9a7e SHA512 a709f107fce0b758f9a4e522052fc8a6b7bcc0c7b87aa79fb53cf8c8ce035bdd4141df117b983d869f21af7410c7d6cc373fb65069f74c049e2b703863c06fbe
 EBUILD watchdog-2.1.6.ebuild 1001 BLAKE2B 80d535d6767a94b297b2c917da112ba1849a448dc8deac3a022eec5cac62a9931b988afc2f36aa32a005dea5aeb0392981c19bd4d1b6f48bc0f2193479279c87 SHA512 e154129f731ad7043d5a38df80319b1270ff4e2cd3267064f2a4a408fce62a7fc63f4f636f79c6e857fa60f8d447384bacc3a8319881e0f7b446a2ccd001abc7
+EBUILD watchdog-2.1.7.ebuild 893 BLAKE2B 9b2f7145085b6abce480f5145d8c5407b22dd0304e27e39a9e5521aa67f4d80f1bb0c14f0c5c0e99ad89892a024d26912b4a57f5ed39055a6190228d7e67712b SHA512 eb797a8cbe384ce1ff34bb5c8f660db40a62a3365fe5d577059471607c36849c464a9f2617c4d44bba7927d36bf63588fb4ed59985739561a695e31fb6690a83
 MISC metadata.xml 463 BLAKE2B d4f4a77cbba45384d34ac533c223e6640f75460ebfa46ae029a57297ab1a8711f8c10bcd0c11926651bd61d5a2ae98e316ebe40c6011de06f8ee46ad5fcab5b2 SHA512 5eaf8c60e47afa3933115e23cec07340d8cb708c9c9568cf943030db2ed7e05771f51369d6d7d8e21ab598dc872af275784939a243a37abb1e3661b41f479721
diff --git a/dev-python/watchdog/watchdog-2.1.7.ebuild b/dev-python/watchdog/watchdog-2.1.7.ebuild
new file mode 100644
index 000000000000..c7201e2d04e8
--- /dev/null
+++ b/dev-python/watchdog/watchdog-2.1.7.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Python API and shell utilities to monitor file system events"
+HOMEPAGE="https://github.com/gorakhargosh/watchdog"
+SRC_URI="
+	https://github.com/gorakhargosh/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		>=dev-python/pytest-timeout-0.3[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/--cov/d' setup.cfg || die
+	default
+}
+
+python_test() {
+	epytest -p no:django
+}
+
+pkg_postinst() {
+	optfeature "Bash completion" dev-python/argcomplete
+}
diff --git a/dev-python/weasyprint/Manifest b/dev-python/weasyprint/Manifest
index e145236e4b04..744572dc228a 100644
--- a/dev-python/weasyprint/Manifest
+++ b/dev-python/weasyprint/Manifest
@@ -2,8 +2,10 @@ DIST weasyprint-53.3.tar.gz 387448 BLAKE2B bc575a150ce3af4b33dc36b1d4148d5059c8a
 DIST weasyprint-53.4.tar.gz 388163 BLAKE2B c4a15be4f11f7d6be1bc96da39defb3420f0e96181998f0f20a1da94ea2c942fd1b23f0c4257da122647a88c6950c519b01910476711d4b482a8a9ae0354d95c SHA512 7fcdedbecfa13434217b08491db62b9afd3e716d4ac6378490a04120c407ab1b20883227c32a77c9bd8c8dd7324fb505920264db3c9105d712fa4d7dcf3a1578
 DIST weasyprint-54.0.tar.gz 402453 BLAKE2B 57c086a0ddf71e5eecf3860f5efcac327c927689e726694d59122a1ad6e7065c828497eacc04866bd4896a12016a75fc227e5f278f7ee987c8c489db3f7474c4 SHA512 3f6595fa856a5ef97e6c0009de34c3c614b829618fc9a28d5728047bbb6edf4972576a5577ef57d588a645d09a76e87ceb8928cc5536fb3900e6525559bf643b
 DIST weasyprint-54.2.tar.gz 403906 BLAKE2B 47fae441ed7186d30de3c32d20fc9503624b06ee5b6a76ec499914852e198b8e85234a779e5f96a48dc310883b8870afea734006dc2a20545537ad66ceff435f SHA512 fd7d07085f104958872a7ccf82d3ffc748936a4fd2d7757847b54de5248e1517a5f244b406cb052c809daa8194d0fa0701e05703b66afe8a809eff70d2cde8f3
+DIST weasyprint-54.3.tar.gz 404544 BLAKE2B 52eabcab05a6806fd137648ab1a9c0cf00865f98c59a7ca43052b98b6eb54c503465285a4ceca86557a5461cd737ce9174fcda0fead08ddcd8cf632e09108bfa SHA512 4b11a2fedb2ae41b0752093a9af26c23122337ade0289e36045c2e666677f2234c43f27f12d22d571365294705458c7b34f8b2656ab3d9337f145d5b0292e92b
 EBUILD weasyprint-53.3.ebuild 1077 BLAKE2B 3921ee1d9975cdb5e384118122fd7416e139138a190178ce5bad6209fb4dc8c67722015816229119438a8a0f85046d83465bba65ee32d7a265e3622f875b3d5b SHA512 9be92a78f9151511482ed4ab7b4fc5d4818416d5d6e0bf5d72bc3d6275f3c6fb6f8d354fb75cf1be88bf1909c315395ebc1e6b1ff8a85f881fd1f2a2619ce19b
 EBUILD weasyprint-53.4.ebuild 1077 BLAKE2B 3921ee1d9975cdb5e384118122fd7416e139138a190178ce5bad6209fb4dc8c67722015816229119438a8a0f85046d83465bba65ee32d7a265e3622f875b3d5b SHA512 9be92a78f9151511482ed4ab7b4fc5d4818416d5d6e0bf5d72bc3d6275f3c6fb6f8d354fb75cf1be88bf1909c315395ebc1e6b1ff8a85f881fd1f2a2619ce19b
 EBUILD weasyprint-54.0.ebuild 1077 BLAKE2B d1a7363d7945cc5495380370b7c5241cb9172fe03abe20708293211e2707b40a95d80a3e661d401fafe4fefa78c61ce937205793b434a22804fe46a5642b9933 SHA512 08e8fc0fe59a71f48299c29fa70df7ac99f21c9f06f8f17aec1636d573d22c6f1bdc1382061b96b354aaf39be30209923637bf81bd36694ce389b859fdd09f0c
 EBUILD weasyprint-54.2.ebuild 1063 BLAKE2B 32e90f633885f2907121412b9899662b9b6b9de3d15762e6d49301b8f5e4c02e32a1e274f983acdf8dcd6f7c8e9b600e64ecfd2192ad71f76053fa1d854d89eb SHA512 cbdf16f634644f5aa14c6e0ef35b33c152f0ae5e2594e1cba4927563486eec067c31239fbbe5f3ba8045824507e2124390811d3a1f4198ab1845af251c105ed1
+EBUILD weasyprint-54.3.ebuild 1063 BLAKE2B 32e90f633885f2907121412b9899662b9b6b9de3d15762e6d49301b8f5e4c02e32a1e274f983acdf8dcd6f7c8e9b600e64ecfd2192ad71f76053fa1d854d89eb SHA512 cbdf16f634644f5aa14c6e0ef35b33c152f0ae5e2594e1cba4927563486eec067c31239fbbe5f3ba8045824507e2124390811d3a1f4198ab1845af251c105ed1
 MISC metadata.xml 382 BLAKE2B 3e5d142b055354e1ea440d9efd4bf92458b1da3f777dd90929ce2041ca6e0969fa6e58aacfb4a5a93ff90805e0d8ec4c9c6253559ca54698f5029639ce35ac8a SHA512 43415064a6f56eaca974031e51d63118d1c65b33e4399302fc72cc2cd6f15e0a47cf411b18d3c5136e866115855deb19b6a9e058a18049151959ce5ee29ececf
diff --git a/dev-python/weasyprint/weasyprint-54.3.ebuild b/dev-python/weasyprint/weasyprint-54.3.ebuild
new file mode 100644
index 000000000000..b59226baf8d9
--- /dev/null
+++ b/dev-python/weasyprint/weasyprint-54.3.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Visual rendering engine for HTML and CSS that can export to PDF"
+HOMEPAGE="https://weasyprint.org https://github.com/Kozea/WeasyPrint"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/cffi-0.6:=[${PYTHON_USEDEP}]
+	>=dev-python/cssselect2-0.1[${PYTHON_USEDEP}]
+	>=dev-python/fonttools-4.0.0[${PYTHON_USEDEP}]
+	>=dev-python/html5lib-1.0.1[${PYTHON_USEDEP}]
+	>=dev-python/pillow-4.0.0[jpeg,jpeg2k,${PYTHON_USEDEP}]
+	>=dev-python/pydyf-0.0.3[${PYTHON_USEDEP}]
+	>=dev-python/pyphen-0.9.1[${PYTHON_USEDEP}]
+	>=dev-python/tinycss2-1.0.0[${PYTHON_USEDEP}]
+	x11-libs/pango
+"
+
+BDEPEND="
+	test? (
+		app-text/ghostscript-gpl
+		media-fonts/ahem
+		media-fonts/dejavu
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/addopts/d' pyproject.toml || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/webassets/Manifest b/dev-python/webassets/Manifest
index b3da9562d6ef..443cb6ec2680 100644
--- a/dev-python/webassets/Manifest
+++ b/dev-python/webassets/Manifest
@@ -1,4 +1,4 @@
 AUX webassets-2.0-python39.patch 898 BLAKE2B 7d350d5a7d35a49598229b3d559ecbf4a870f24de5f2aa2bb83f7d7e6374b150b6bdcdebfbba304b2ee74783c648f1dfa98dbb3044be966342c00cb16bcc943d SHA512 6e2073ed553fcb2523a26aeff30f36de68a45dbe032a207fe12906424021d0aae7bd6bc4934f79352644ceffb9147e39bc09d824a36f23093d8a2dc58d57e28f
 DIST webassets-2.0.tar.gz 185864 BLAKE2B 8aaa7091c27644c6c464d13d106218e28531415458e67696c0243943a92a3869e23c7ff0aa8461abb876a178e3ad44f4b47a5366edb885d308dd8ec0f17ad034 SHA512 6d62d4e5c1ed81a2d235c24776b632574f3670ae3d863c5f5a79d0e1afc7acfa7965e532b7975503df758dbe6c8dbd857b250a6ea8e4b414c8f1ae12fb8addd7
-EBUILD webassets-2.0.ebuild 1065 BLAKE2B 526a3151f03604cbe32ef8e0256eecb11b6e5ed5aa70e6596ff9fafb3f596e679cfc4022a5a5fed47b8bb715615e0ecb32e1c8e1afd15f21bb5d0896bf135f91 SHA512 550d7e1e2e9e0a6a4d227047b893cb3890796c1aa7548bc9c7be9a08485ce20072564edb9039a1a09e32ad6fd9e63f33aad3246ad03f422e87541bba27aaf8dc
+EBUILD webassets-2.0.ebuild 1072 BLAKE2B 2e1a77aa66b1606d74466c307d81c4bde4f5388c5cb8ed43ac64cdd98ca07f2ac54cad3eb939e498811f961e59321666bd18762f7ea839870aca5a7bcdc9f31d SHA512 c0f0063220a81aae2f28c43f411d13a1324387c5808178a62b142f14e0469d0e480f43a9bce137e42e84c0150659f5fc0939fcc4b39da4dbff473174e14f28c3
 MISC metadata.xml 372 BLAKE2B c1a1dfc335a04122b142c199b9041d4deff42cd971fa988ca7018fc3a26c62147fb2bd8a582f990382213e7d8791e13e67ba1cf570fd6c50ee003bcaa3fa7549 SHA512 cc5ca9432c6b229d8e5c23e39ed634624589f33958131ece0b09256c964aa0ef3678a0c6a4549ab80cebba55e73b833eaabf18c929431067c9747d029cc50e80
diff --git a/dev-python/webassets/webassets-2.0.ebuild b/dev-python/webassets/webassets-2.0.ebuild
index c5a300af7a64..0f25c54ae40d 100644
--- a/dev-python/webassets/webassets-2.0.ebuild
+++ b/dev-python/webassets/webassets-2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/miracle2k/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 
 # dev-ruby/sass confuses the tests, they expect 'sass' as the reference
 # compiler
diff --git a/dev-python/websocket-client/Manifest b/dev-python/websocket-client/Manifest
index 9beb997d25be..b1c49874b7b7 100644
--- a/dev-python/websocket-client/Manifest
+++ b/dev-python/websocket-client/Manifest
@@ -1,5 +1,5 @@
-DIST websocket-client-1.2.3.tar.gz 46434 BLAKE2B e1e294938b41e6d82fa5cf8cd58fd9653e5170e11e546a04bce6dc0c8a9752cc25a21dbc1352fc614651f9fee43410a269a35e4c8dbacffec14f1ed8e8526f89 SHA512 5e5e00d43b7b4da5e2cb0d00d1e743e420791856e51e2b3d28d78219edcd7a2eace834ae4d7ee2faf89ab27c2b65f063e508f0e470a47ff9d88c36748b3dd113
 DIST websocket-client-1.3.1.tar.gz 47672 BLAKE2B c28af7684750e5d678a2e3bb5440eee2ff96effdc6f08a7312b7f596e39b29fd96936f04735b737fe00426869a3d8bb9eaf51c2aac32cbc845e7386d0a653780 SHA512 d60c5e755944ed0b2d426c75da9650a6624ee5718061a0cfb71b9a700e5bd3db9143702657175d7988b57e81117bad9cbb58636fb14ca55ad6addd90ff02ce0f
-EBUILD websocket-client-1.2.3.ebuild 726 BLAKE2B 94f6df8d02d75ad0f184f9f7b0cb1d41e824aafa70b50ded54f8d7ba7416dc0ed26f3de4d70939e5def508675ebd84b2c7838f2034f7cb1dc270264655918db3 SHA512 09f17feb4eeccb8b813aaaa8d6aad06299ba134a181835f15edad3d4f0efeb96aa9d756b7de71ef16bdbad1a0d6885e48a141facb7ce36ca50c93de7fb0ed8b2
-EBUILD websocket-client-1.3.1.ebuild 768 BLAKE2B ac6058810797ef17701f1dd88408dd9a3c3370dff30a7d0e1965dab286bab26e26fb7893008bc9f89763083a48f9cbd6bb6330b4bb970f20c100e4996f09a057 SHA512 00768aa12367da003b02bb15557d83582e36bd66cf66a734bf9f62634e771d448799aa5ad63086d5742d6c854198cc03eccb537991d338fc0323f633166299fa
+DIST websocket-client-1.3.2.tar.gz 47821 BLAKE2B bdd398885f1c76646e094f6e2efa3c886bfddb0d5f1a2961ad2586444c9bff7272f61d880567e7826aa49c36ac48d6cad1583d0cc4bdb73d0f1702e9b4bf2e2b SHA512 c2a38aa3fff0e7f94433cec1939ce75074d9f89d403c0627f34e3a0486dc35fe00230ba7c05f9172a89d3ee49f0ef53ae367eca864f34ec95932966b31d6c3a8
+EBUILD websocket-client-1.3.1.ebuild 760 BLAKE2B 337853a44a530b579af732fa05bd06791b68d9eb1f6a3d5cab5196d8105e516bceec83c2f82183e9d217b23d9cad706390b922779c2df0322973b67f24ec6148 SHA512 a23f3bb351133e73099fda4441a567bb68689689b72e2a06375a04b482436ec1e0d5b5fb9f7909cee85d6720a05d5268e773cdc5920c888b2c01bd938ab8500d
+EBUILD websocket-client-1.3.2.ebuild 768 BLAKE2B ac6058810797ef17701f1dd88408dd9a3c3370dff30a7d0e1965dab286bab26e26fb7893008bc9f89763083a48f9cbd6bb6330b4bb970f20c100e4996f09a057 SHA512 00768aa12367da003b02bb15557d83582e36bd66cf66a734bf9f62634e771d448799aa5ad63086d5742d6c854198cc03eccb537991d338fc0323f633166299fa
 MISC metadata.xml 498 BLAKE2B de7c287e513c7e64b4bec29693e6eb9104ff963e0d4d942ed37402bf341739fb17b2ebdb1bf0aaa0081934bae34e16f025d0549f94c1a863be95d64a338eede4 SHA512 13dd8cf0f3e363a3fbf2b246bcc1ccd78a898d5ca830e30fb1606947ce129d99f2d8065c3668dc2c7749bbd4e24e39e5a7c483065737a580246a89dd4d41eaa7
diff --git a/dev-python/websocket-client/websocket-client-1.3.1.ebuild b/dev-python/websocket-client/websocket-client-1.3.1.ebuild
index ec8a093a7efb..b192b8c16b12 100644
--- a/dev-python/websocket-client/websocket-client-1.3.1.ebuild
+++ b/dev-python/websocket-client/websocket-client-1.3.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="examples"
 
 BDEPEND="
diff --git a/dev-python/websocket-client/websocket-client-1.2.3.ebuild b/dev-python/websocket-client/websocket-client-1.3.2.ebuild
index 82c01d8f51ba..ec8a093a7efb 100644
--- a/dev-python/websocket-client/websocket-client-1.2.3.ebuild
+++ b/dev-python/websocket-client/websocket-client-1.3.2.ebuild
@@ -3,7 +3,9 @@
 
 EAPI=8
 
+DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( pypy3 python3_{8..10} )
+
 inherit distutils-r1
 
 DESCRIPTION="WebSocket client for python with hybi13 support"
@@ -12,13 +14,14 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="examples"
 
 BDEPEND="
 	test? (
 		dev-python/python-socks[${PYTHON_USEDEP}]
-	)"
+	)
+"
 
 distutils_enable_tests unittest
 
diff --git a/dev-python/websockets/Manifest b/dev-python/websockets/Manifest
index 83d06d83f26d..585cc259e7cc 100644
--- a/dev-python/websockets/Manifest
+++ b/dev-python/websockets/Manifest
@@ -4,5 +4,5 @@ DIST websockets-10.1-src.tar.gz 299315 BLAKE2B 425e7c8597f081874127ac75003aed11e
 DIST websockets-10.2-src.tar.gz 302766 BLAKE2B 2313bab904de3671f973191f1c43d275ede44c87811d82f22c6bd76145610ba5d4ba4d7a1b3a564bfc8c4a9b7921b2edc640af9304733e85deac1e728f0050f3 SHA512 b8c7fbe627e1c411112b0d66e561aa9bcf15d6de07a9cccd203211e0e6af49762774e09f8c5f4523fe214731ae7a96ed4b63639c7ed66fee062cdda3e5fba350
 EBUILD websockets-10.0.ebuild 860 BLAKE2B b99a1ce2f84978152bfa893a3b3279a790206bd12f538387729c1d1f035d7a020bdeca156cbf879fd5625e4fd9ceb32955a4c106c7fb8bd9e1a74c38970e9874 SHA512 47facb76b64ff4e6816e7f352cac5b39f2a4e2d6a0bcfd44f52e958c6bcaa422205e6961807853684afce58446d99f3b76270943c5e079baaa27101dd249909f
 EBUILD websockets-10.1.ebuild 726 BLAKE2B 86a28906af41f3b704bc9ff3b5b696e7b88bffab9915269b343794414d9fbf80f92c96f840c8126961c4a8801cee3a167369a42982a3612e9d57253c87e82df5 SHA512 0a6fd4666459490052dfd85b66a4d3229abc3ee974c8f6ab1bf39b3f2bd2d2bf5d65b6919ee13cd8a8eb2609dc00a11a21b3e721c41ceaa888499bbeda283655
-EBUILD websockets-10.2.ebuild 766 BLAKE2B 88350ddb6f3da796ceae4715c3f306e2359bfaee9e435f19eea17ff936315de33ceb166d3aff5b293da942e090b5795f1549e2440c8821d2a6f612749188cb5e SHA512 d77859aacbbdef39327ae213406812073b97fedfc8ea716c338bd93857afc4a71ebbffda02c362b6e4d7b33d02ffd2afd56114df7c621fbbf28b66dfe481d388
+EBUILD websockets-10.2.ebuild 759 BLAKE2B a6818274ee9b50f1261f0b9a86d76301e8bcc483b148e87e3ce46638b224674f450c2d5916f7f6e9bc33e452e9b1dcb386215e78c6a1e65a3f22faf9b23621fd SHA512 f4e0e2511b67d33435e3f36e8679af880b7430ab1945738ba15876ead88b239e91f3ffeaf75668402588bf175a9669db3fa81f96ffab0c7aa50f0bd38b175fd4
 MISC metadata.xml 488 BLAKE2B 06ed81aa4ffa49d1951a8ef639752bc701d798fa531737d4cb367ca198e65178f430d6b1e7f3b24ffcc332343dd58a0cc8ff5f2632a225e6c0f36ee50148aebd SHA512 8335bde47d396c018b32db406e18636edd7f3fe5704c901888d56690ec726aeb7d6f9e42fb7dbb1869c78b494c9cbc17ded3ca78b7576d6fdc0a8097bf996f60
diff --git a/dev-python/websockets/websockets-10.2.ebuild b/dev-python/websockets/websockets-10.2.ebuild
index c13fcdc2d0a3..e43c8d5084ee 100644
--- a/dev-python/websockets/websockets-10.2.ebuild
+++ b/dev-python/websockets/websockets-10.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86"
 
 distutils_enable_tests unittest
 
diff --git a/dev-python/werkzeug/Manifest b/dev-python/werkzeug/Manifest
index b184f0cc586c..ef3f85fa52ac 100644
--- a/dev-python/werkzeug/Manifest
+++ b/dev-python/werkzeug/Manifest
@@ -1,5 +1,9 @@
 DIST werkzeug-1.0.1.gh.tar.gz 907482 BLAKE2B d2dcdce8b1bcbb177b52b0915f2c0ac17d235dee3c77b23e81e4b35412d1f53a194d3c7c7f2a5c065ade99797effe72cc464cf6980b12c761a8a919338021660 SHA512 ba82120fb3e96e3a1334c6452d5ba1950fc016d2d147d643bbc2168ccec496f1dea799982ae8c578167155082c0bdbda5d56a23f64b4b6865f97e90e22df022e
 DIST werkzeug-2.0.3.gh.tar.gz 897523 BLAKE2B 1f97a2f7184e8e11bb85722becae7cc032ada38a642a2f925f7b81e89c881011889189999d50dab4591fc2e874aac4ab92b0f1531c211468cf352e31b0b8c8d0 SHA512 a205cd981b3e1b481436e483190427ff3808a5ea80abc616ca08d899d0e6a39893a5cb60adc65c99dcab3af47c24b321c71996d719cb7f224de7942b44b1fd69
+DIST werkzeug-2.1.0.gh.tar.gz 833188 BLAKE2B eed6ddc3acec9a69ca983d440d14693750fc0d09cd1f30f66e27267c266ac5a2c81b21cb8d617e8f6fcfb7426bb427c2dc1cafeec92a238424a005d915dffc4f SHA512 acda1e4037e1d525cbd82ed2310ddf55968d14df6656018b910d7200b51569e88cf58957f94f377deb7fe100db03d30016e9dc91e033a298ad54cb34922be30e
+DIST werkzeug-2.1.1.gh.tar.gz 833268 BLAKE2B 28d922f99259b606c431b224222fe6474c68f8a11f9910fe9e4eedbdf30d18a101c25490dee205035ea7b3675e644f619a81cbf493c7d5540c6141ff3840d84a SHA512 992b5b0a95db5266d025e06683b04f932def72c3967b2c9903f718c5f2672cf0abadb247cf77029d99b567c9588f5ae03b6b07d566bfd764c738ede53501ba1b
 EBUILD werkzeug-1.0.1-r1.ebuild 1391 BLAKE2B 38d11b9aa090f534d7b48d796281d517b9e9f109b587d52f07aaf87404a58c67f3a59b1b5494ad3fb1636327bf705f8fc90d1657c49456530ef6c54c8334644c SHA512 abd534057abb560b7fe9809c3575c17529b255cf6a1aca65a159f8b46b6e3d9f4e21a226f1d5460e8a49ec1dcd9224bde5d27df468922d487044fca3891462a3
 EBUILD werkzeug-2.0.3.ebuild 1384 BLAKE2B f2e1407bb9826c6f715e51fa8e71d22e6978f64d568994d887cd18570078501f5ce432eb9ec8e8c0b787d85653b5cccd718d3401f8e39e5a7ef1d3e7d9e9622c SHA512 c5c0ffb9e3daa37ebe0f006b2e3a6d9bb515323f326168924d84babb8dcd449de3cb234f9f909b5570914be570ed0c3069f3b418d46c7d8922f4545998e2196c
+EBUILD werkzeug-2.1.0.ebuild 1385 BLAKE2B 9e332629b9e9b22f63075ef34292ad306b1ff1c2f098750ad7ec650b70abe813353c5e7833c3b1dfdebee93ce4579ecfd078d5363cb4efcf56cf5506bc1ba5ce SHA512 e176dafed63127e91178a0178438ba95b39ff56385257c1d1361a7db3bb926255d324554be0ba35b8b50b7b55b065abad0e13c2dcb8a60d63bfeda057fc41ec3
+EBUILD werkzeug-2.1.1.ebuild 1406 BLAKE2B e01b4a42e482ebb5434b04f0d080f172b3e009f5ef6a9ddbd741eccf610816b40e4044f9dc00cfd722fad4f939128a4d4a4bf964c127aced5c9d2f0961c3fdb9 SHA512 f3d863e8ae00660593a3c28840598a6aece3f19576d5e7ca011f05d1d0165a505dfc3c7a7c64ac9824bd4e59fa33d4ce85b4023c38f774d8681993366fa088c5
 MISC metadata.xml 368 BLAKE2B 81932229098620395623f9149ac974f19fae9b65ad09943ee5c5d8d03c1e37e76061291c959fe5f004f531a244b3bb335c2a43dd66949c0be43493e45674d0e3 SHA512 67e5b5fea8052c0723820125271ea031ad984e0fe2af21d2423fc559bdc51dfe1d40f2fa5fe11e6d2b8b32216e716900080b859aad146c079ad2b390dd9844cf
diff --git a/dev-python/werkzeug/werkzeug-2.1.0.ebuild b/dev-python/werkzeug/werkzeug-2.1.0.ebuild
new file mode 100644
index 000000000000..dd6a762d9b32
--- /dev/null
+++ b/dev-python/werkzeug/werkzeug-2.1.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Collection of various utilities for WSGI applications"
+HOMEPAGE="
+	https://werkzeug.palletsprojects.com/
+	https://pypi.org/project/Werkzeug/
+	https://github.com/pallets/werkzeug/"
+SRC_URI="
+	https://github.com/pallets/werkzeug/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+
+BDEPEND="
+	test? (
+		dev-python/ephemeral-port-reserve[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		dev-python/pytest-xprocess[${PYTHON_USEDEP}]
+		dev-python/watchdog[${PYTHON_USEDEP}]
+		!alpha? ( !hppa? ( !ia64? (
+			dev-python/cryptography[${PYTHON_USEDEP}]
+		) ) )
+		!hppa? ( !ia64? (
+			$(python_gen_cond_dep '
+				dev-python/greenlet[${PYTHON_USEDEP}]
+			' 'python*')
+		) )
+	)"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=()
+	if ! has_version "dev-python/cryptography[${PYTHON_USEDEP}]"; then
+		EPYTEST_DESELECT+=(
+			"tests/test_serving.py::test_server[https]"
+			tests/test_serving.py::test_ssl_dev_cert
+			tests/test_serving.py::test_ssl_object
+		)
+	fi
+
+	# the default portage tempdir is too long for AF_UNIX sockets
+	local -x TMPDIR=/tmp
+	epytest -p no:django -p no:httpbin tests
+}
diff --git a/dev-python/werkzeug/werkzeug-2.1.1.ebuild b/dev-python/werkzeug/werkzeug-2.1.1.ebuild
new file mode 100644
index 000000000000..59d0226f521a
--- /dev/null
+++ b/dev-python/werkzeug/werkzeug-2.1.1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Collection of various utilities for WSGI applications"
+HOMEPAGE="
+	https://werkzeug.palletsprojects.com/
+	https://pypi.org/project/Werkzeug/
+	https://github.com/pallets/werkzeug/
+"
+SRC_URI="
+	https://github.com/pallets/werkzeug/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~m68k ~riscv ~x86"
+
+BDEPEND="
+	test? (
+		dev-python/ephemeral-port-reserve[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		dev-python/pytest-xprocess[${PYTHON_USEDEP}]
+		dev-python/watchdog[${PYTHON_USEDEP}]
+		!alpha? ( !hppa? ( !ia64? (
+			dev-python/cryptography[${PYTHON_USEDEP}]
+		) ) )
+		!hppa? ( !ia64? (
+			$(python_gen_cond_dep '
+				dev-python/greenlet[${PYTHON_USEDEP}]
+			' 'python*')
+		) )
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=()
+	if ! has_version "dev-python/cryptography[${PYTHON_USEDEP}]"; then
+		EPYTEST_DESELECT+=(
+			"tests/test_serving.py::test_server[https]"
+			tests/test_serving.py::test_ssl_dev_cert
+			tests/test_serving.py::test_ssl_object
+		)
+	fi
+
+	# the default portage tempdir is too long for AF_UNIX sockets
+	local -x TMPDIR=/tmp
+	epytest -p no:django -p no:httpbin tests
+}
diff --git a/dev-python/widgetsnbextension/Manifest b/dev-python/widgetsnbextension/Manifest
index 4aa72bfa3b2a..32638935dc95 100644
--- a/dev-python/widgetsnbextension/Manifest
+++ b/dev-python/widgetsnbextension/Manifest
@@ -1,5 +1,5 @@
 DIST widgetsnbextension-3.5.1.tar.gz 1112877 BLAKE2B 9608a4bb385e697685383e52ee3a17127b87dded4e8edd22233ed03ec837818798a8c08709a83ef7c13995797ebc1b43961e2bc8592e542c5b4fe7c2f5f08f7b SHA512 484f6d91e36ab734c02675973e9007b1f379f1a1cb762c863ad0d80c8c6eb8c9c49a138b3280894ed17ed86775f517a13790cb4537e1cf8bcbdc57e72d13cc2b
 DIST widgetsnbextension-3.6.0.tar.gz 802154 BLAKE2B ef6b56c9ba2e40dde4a6ca40687488fd823886ab5eae474558b994f8a4206c4665e3ed4d953deb93a6261d3f55f3b514ec44eae3aa10bf699e8d2378f1669631 SHA512 d00b0e8d5edfc85ea1a9ac036dbdbe0b0ac6cb0eb694fc999f81e8f615e2a637890a2d5383c0f0ea041d886dbddf2e7036f8163fae0b8c3b5aa315a072b3ff7a
-EBUILD widgetsnbextension-3.5.1-r1.ebuild 527 BLAKE2B 35cd57a8b6b0de38dbcdebe08d661d048d9fb90bd11ae6e75120bf1d9d90bb60047c149052ae9bd968d48a6b207064aa650e9fb16dba0ce7cf5edf1f2a1aa919 SHA512 cdf6df54599837eb19d399b12bbaccaaeb6af5a432a5aae4ac1b87817aaa1c0adbb77fa4aaa642ed249b10d4ca958d1639da787b057c119d27a4a21019896750
+EBUILD widgetsnbextension-3.5.1-r1.ebuild 526 BLAKE2B 48c05d920679dd98a16609aa6bea9226a62e0c6ba7324037b9f41a22b51f24589ebc3bf6ab75afdb20ce99242f277d97ea96877a73bf12abfae0dc1e3fc3b9d6 SHA512 70f6068652f86d1e7c399d45dcfeefbf1932d5e11b87057e6ee7ce8bfe2f39fc4337d3d0702033cba071161e94353670e6df19e3523b656872ab0a23e2aa4bc8
 EBUILD widgetsnbextension-3.6.0.ebuild 547 BLAKE2B f0590281f19f6d04ea690d37f6059d98e876a9130984ceafd71a5e004f0e16584f4af74076844bd78d6cc5dc5a843a7f5604751dbace0f94527c3325783b6a23 SHA512 380499fb67e35e30e14d3434f83ea922d11e92d254a267d3762e91af9161ed4de65d4ad3bfdf7b25777a22ca334c5e1abb4bc425ec70c407a4cf7d013c92bdc5
 MISC metadata.xml 545 BLAKE2B 5127e5910c792643b4594231c8c04ebd2db8bb3f0d12f41d33642126970f8ff36f60503bd0bf7c5863b39a4ea4358f1b0ae786653d2c086a49d5305a879a0f66 SHA512 fa7da731b4f342572c0c284c7e03a521dcf754160223016fa77890e8de0bf05b65fca0bd096ba65e303dc034473654dfe5e9b5d2a556f0e2bdc861e24d462cf1
diff --git a/dev-python/widgetsnbextension/widgetsnbextension-3.5.1-r1.ebuild b/dev-python/widgetsnbextension/widgetsnbextension-3.5.1-r1.ebuild
index e4ef44ff580d..0e10987da8fa 100644
--- a/dev-python/widgetsnbextension/widgetsnbextension-3.5.1-r1.ebuild
+++ b/dev-python/widgetsnbextension/widgetsnbextension-3.5.1-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 hppa ~ia64 ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="dev-python/notebook[${PYTHON_USEDEP}]"
diff --git a/dev-python/wsproto/Manifest b/dev-python/wsproto/Manifest
index 1570c53206ce..03391729ae0c 100644
--- a/dev-python/wsproto/Manifest
+++ b/dev-python/wsproto/Manifest
@@ -2,5 +2,5 @@ DIST wsproto-1.0.0.tar.gz 53423 BLAKE2B b4cc8c1ef0ccf324821b893b57fc86ab744c639d
 DIST wsproto-1.1.0.tar.gz 52928 BLAKE2B 837f5d8411a55b026d8c5df8b03b44c92f71fe2856884e5199e639a5c060fabbe8eec39cb6861e8f88ae7fc366cbeef4f9d62dade2c95857d27339fa73e90638 SHA512 0cd726bc62ca4d11e96f470f51511008bd43dbb9e99a17633d2a40da7bdaf19716e0a1c995350f5c8f418f906848dd6f2b9b0a853c1b6858ddafa1cc02fab710
 EBUILD wsproto-1.0.0-r1.ebuild 588 BLAKE2B fa45c32be2ad668303bbd06e1ad6681c67457f58759242ec02e901061fd6fad38e98766af0ab47a8b37259593788797e19e983dbcff0c9e7a2481bcb4fef7e84 SHA512 86b34223876ec072aed04291b086b24399901d7b4e7fbe55945980d95f4d27163279f40f7d346192607f5961eebc76c0b760cfe3e5718a921ce773bebdead889
 EBUILD wsproto-1.0.0.ebuild 544 BLAKE2B 9678dcca95910abefd0ed33304317ba86df4fb037ab0baad31a43efdb401acc794e72a425d773fdf82c482721180327a22ca080a5c943cac75988d9fcf6b5133 SHA512 a075f9d88605aab03e8aebea4df9155e492f6844ad6fb8b105022df86db0ab3bc3679e32ed89b4b100502de67e8d0945eab7a17875df35d162e5065829bae177
-EBUILD wsproto-1.1.0.ebuild 588 BLAKE2B fa45c32be2ad668303bbd06e1ad6681c67457f58759242ec02e901061fd6fad38e98766af0ab47a8b37259593788797e19e983dbcff0c9e7a2481bcb4fef7e84 SHA512 86b34223876ec072aed04291b086b24399901d7b4e7fbe55945980d95f4d27163279f40f7d346192607f5961eebc76c0b760cfe3e5718a921ce773bebdead889
+EBUILD wsproto-1.1.0.ebuild 582 BLAKE2B 24399a0255b02c54e4dea045ee9d0dc05ce773d8c20b7983e5c135d7af5e2e855dfc0fdbebc4f75ac81c51a1aa1ce0a829f5074295eccb2c05b72f193babfaa4 SHA512 94067923ccdde0f705be1120ce200606dfa9e45443a3470ae8a5979836a81c1bab4c307fb825c53be1faaabc14cfe49957bdf64e98dbf17796419db96319cc82
 MISC metadata.xml 494 BLAKE2B 144d8a2efbedf70327d0f862e9e1b9d70d8ec72939cea4239e877f183485c9d4075cbadb9423f74b08e8c0ae806b8786467363ff0aae0845be227059e33304ba SHA512 c5818f8c26a0aa8b88b54259ed81c570bee27ca44a20a2f487109477608724f857a306c2b9b82a2a8a03d5852edbfe4ec27f81b60ccf743e58dade14ab992da0
diff --git a/dev-python/wsproto/wsproto-1.1.0.ebuild b/dev-python/wsproto/wsproto-1.1.0.ebuild
index b28abfcd3c2d..00807d1900fc 100644
--- a/dev-python/wsproto/wsproto-1.1.0.ebuild
+++ b/dev-python/wsproto/wsproto-1.1.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	>=dev-python/h11-0.9[${PYTHON_USEDEP}]
diff --git a/dev-python/wtforms/Manifest b/dev-python/wtforms/Manifest
index d64ac65d3caa..67fe1bf5a1d5 100644
--- a/dev-python/wtforms/Manifest
+++ b/dev-python/wtforms/Manifest
@@ -1,3 +1,3 @@
 DIST WTForms-3.0.1.tar.gz 137513 BLAKE2B 17fbb385a28baefaf3fe368b7c7dbd3d6671aaef887ee89617e60e0537ae060248442d4990e7ea926b15d4b85585a1c80ffb61c0fdad2627e5cca90799eb01d7 SHA512 a6db54a7ef9bc96b8fdf69cd65d3810fab9436ff9c056e1cfc580f5ecd0ed8837dcbb7c2adf92419cc5f74e865bb3a023e316407a87d5c5277da5d30e6836fb3
-EBUILD wtforms-3.0.1.ebuild 800 BLAKE2B 6c47f8246dacd19491922c6dde4266de934bf243fbc74dd4b74ae2a97689a766fd388838dc3a29c34b6ef0262f81d5846c7dcddce29fe5e730c28c8bde7ec50f SHA512 815d74de43f7d1adfc33ebd7e29ff6c62aa0c0511758ac9d28269d12f1cb228f7b5d6329c11ff5cea9f8b308308ef0abc789d991a59b8ef9e91008a0c06e6434
+EBUILD wtforms-3.0.1.ebuild 807 BLAKE2B ead5fdbf4b9e5db6482f8226ee1a43c8649488d071faa6a1de62ccc28b7a9fe9f168e89964140c82b3c59b0dce384759f8ff84d7b913f68e7d5cda47a00e006e SHA512 551abe4ea16ff680a2ca2ddda3049da215ecf8beddcb2601a4f55fea512b41ba1b2e9c0134bb895a26a3fd6c27d97d2ed92d0cd6d1094ed4679b77ee6ea80ef3
 MISC metadata.xml 453 BLAKE2B 24b826025af54d17f8773a9583b369eabc3be6265d26d5fed67d562ff5e2abdb6318e8905d1c1173d399587017c35efe68486f1616e3c1ebb08f1283e2c28985 SHA512 de936c361da6f4b1e64374215c3d2502c77c083a7544e77c77d5b7dc8e6570622a218047651845907d26fb60ab972dc00cc70979df42b888c0cd3373f63e2ebb
diff --git a/dev-python/wtforms/wtforms-3.0.1.ebuild b/dev-python/wtforms/wtforms-3.0.1.ebuild
index 42359fdbfdfc..d10688438784 100644
--- a/dev-python/wtforms/wtforms-3.0.1.ebuild
+++ b/dev-python/wtforms/wtforms-3.0.1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~riscv x86"
 
 RDEPEND="
 	dev-python/markupsafe[${PYTHON_USEDEP}]"
diff --git a/dev-python/xdoctest/Manifest b/dev-python/xdoctest/Manifest
index 3494e5ccaee6..6ef80869df1e 100644
--- a/dev-python/xdoctest/Manifest
+++ b/dev-python/xdoctest/Manifest
@@ -1,3 +1,5 @@
 DIST xdoctest-0.15.10.gh.tar.gz 191579 BLAKE2B 4836b773c3cf664c825433199b13ab7d3fe2c68538517bf5594797ad3f2f894d0132034fdafbc4502a00ec7393c19473fafe15fcf0257e3565592dc9907e3d71 SHA512 18c1a2774ae9331582610e3459a02f4e4de838218e7250af071570b2318f4c14330084b9fb903d88651fc40a4ba12b686ee6f2ca165edd8155e908ae4992a840
+DIST xdoctest-1.0.0.gh.tar.gz 193294 BLAKE2B 95725757faafd2a15652557e07753ad8c4a8ee57b545169ba29b6e8f0ef5c7a021eff3c092cfe123da91311db98ef7700b29d52b1418a8160869402fb4ecfcab SHA512 8c77fbd8fcd1a3030b33651d35567dd4506ece3aa2c6155223d5cdea6e16510b59bcbd5b9ebb6dc13e20af92c5d07dc205485566b836874e835b18a53cbe7355
 EBUILD xdoctest-0.15.10.ebuild 765 BLAKE2B 76106ed120b3af56642290aa67371e3390daee4881b9d64f4b376a365a3723c57981327108b8e37bf80a2b875ae2981e2f5c4e531e581c9952c000d141fa7aa6 SHA512 226ade6502c30804020c18ac7707105cf0aeee16a0e08382d4dcafaf8590da738880f7e391edf64ea1ed8da7b6affdd1c6c280fad26c978bee0d4d9d97b65805
+EBUILD xdoctest-1.0.0.ebuild 793 BLAKE2B 6bd200b884b62e4f6e378a60e071a6a5689c35e0a0520623e0497a57db4e8ec5acf89afbd93e30a8d5a74f9fe62ef06ed53c028e8b34f668bddae48953b8e6dd SHA512 83c4d2e75cf7e7bd059c3ba50ab24a3c3256efb380c802df97b8bf27f4a675f0485051cba7f53cd00cce808ef124bd79cb2f692def1e523ce40089dfbcb5ee05
 MISC metadata.xml 426 BLAKE2B c5bbac93c627fdf15490b4867f0bd1e4d1fde469552cb8c7140c83e13130a4190f0dbfb3b67608ae454683630b937e3e8dc38ddf37b344aabff20ac4dc04e9d8 SHA512 0cb726bc6ef7d28b3ab744da3e3e770287826c8d4b1ef87fa404d9aa4b8d1e8fa3c8a2191cf2679bbc16335fbd50e5d887a1759c2866ac9b1cc48c2189b16637
diff --git a/dev-python/xdoctest/xdoctest-1.0.0.ebuild b/dev-python/xdoctest/xdoctest-1.0.0.ebuild
new file mode 100644
index 000000000000..9ca86944c988
--- /dev/null
+++ b/dev-python/xdoctest/xdoctest-1.0.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="A rewrite of Python's builtin doctest module but without all the weirdness"
+HOMEPAGE="https://github.com/Erotemic/xdoctest/"
+SRC_URI="
+	https://github.com/Erotemic/xdoctest/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+SLOT="0"
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+"
+# dev-python/nbformat-5.1.{0..2} did not install package data
+BDEPEND="
+	test? (
+		>=dev-python/nbformat-5.1.2-r1[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+#distutils_enable_sphinx docs/source \
+#	dev-python/autoapi \
+#	dev-python/sphinx_rtd_theme
diff --git a/dev-python/xlrd/Manifest b/dev-python/xlrd/Manifest
index 3f24cc5274b7..0b7af25ba8c0 100644
--- a/dev-python/xlrd/Manifest
+++ b/dev-python/xlrd/Manifest
@@ -1,4 +1,3 @@
 DIST xlrd-2.0.1.gh.tar.gz 368304 BLAKE2B eaf6dbefde00954452a96214c6a48e5d35526168445d15d721851da690bd99e53bd765a73495b00c8ee7ce243c487da0afbc6d6217abd7a5956820357dc97104 SHA512 b3e2efa216fc73bf55bb0b165ef63e797d16a00c62f0f2f2a2114d2db7204208f2623835697a045abe185f52c426ed5e9ef38a4f5f8e1880f0cfdf642af3c57e
-EBUILD xlrd-2.0.1-r1.ebuild 641 BLAKE2B 9b3c9de52dd7998c3b7da255bcf602ff6cd70ff2b39b7ec5c1060c8d4f0e518fa1df60cebde75ae9afc50fa964183dba54e2469aeeba7ff30bceb91edd9da17c SHA512 8af28af3a8bd13722fb75b094d0cd1fd83638151ac84380c15595a3fb5432dc169bdde61c576af6f9c873dc9de3e12dcc3d4ed5340cab636fc45af5b52779b90
-EBUILD xlrd-2.0.1.ebuild 601 BLAKE2B 66cd8f6aa1f76971c4204299106b5362ac1136a376a0aaecf9b87c1950256378a40143818362d22888b445e8351c0846162aa59e101c999d8180cd28944c9428 SHA512 daf9a3075b267e2abcbd3443f1c6b6eb58e023def414aed68ab39cbd9bce1a236aa5cdcb4eedb8ee8234518ab792694dbb3985d600cf2c57db0d2897bcb9f963
+EBUILD xlrd-2.0.1-r1.ebuild 635 BLAKE2B eedc9817d3b0f00450cbeb9c545704f791d3b565e095f591854c171bae37f673b6867c17fd60e0ed951b997709da3bf30cc337bf2e0814e399a4713de404b55f SHA512 b0b21e9e3d967388887f92e46859971ab4388e8494d8437b70fed0b6bd1318c749b01c23aca4f687e1b17807adfe86d65250244ef7fab8e64c62b89b891599e6
 MISC metadata.xml 576 BLAKE2B 7146486fa8a2bab5361906374c81a7557837ba2408b34178f1c30c48dcb09a696151b9a4a14c98ae80108bab329215d13fd57695cbe710cf4da0d9fc10fb3030 SHA512 db59cf6c70ffb69390c0f9a7b9682c48ea3b786aa53e7fdd92343efee0c2aaf8791529237fa826cc041eeecf290d95fe69b6ff099b304da945cb62b4e3452832
diff --git a/dev-python/xlrd/xlrd-2.0.1-r1.ebuild b/dev-python/xlrd/xlrd-2.0.1-r1.ebuild
index 33f76f0072a9..4ac0074b5408 100644
--- a/dev-python/xlrd/xlrd-2.0.1-r1.ebuild
+++ b/dev-python/xlrd/xlrd-2.0.1-r1.ebuild
@@ -20,6 +20,6 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 
 distutils_enable_tests pytest
diff --git a/dev-python/xlrd/xlrd-2.0.1.ebuild b/dev-python/xlrd/xlrd-2.0.1.ebuild
deleted file mode 100644
index fb3c6883e7b4..000000000000
--- a/dev-python/xlrd/xlrd-2.0.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Library to extract data from Microsoft Excel spreadsheets"
-HOMEPAGE="
-	https://www.python-excel.org/
-	https://github.com/python-excel/xlrd/"
-SRC_URI="
-	https://github.com/python-excel/xlrd/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-
-distutils_enable_tests pytest
diff --git a/dev-python/xlsxwriter/Manifest b/dev-python/xlsxwriter/Manifest
index d62d4cb2c561..7d0e71336183 100644
--- a/dev-python/xlsxwriter/Manifest
+++ b/dev-python/xlsxwriter/Manifest
@@ -1,5 +1,3 @@
-DIST XlsxWriter-RELEASE_3.0.2.tar.gz 34433041 BLAKE2B 748d710d3f953ae22154022a75f3a67898846914cab67302167ba34ba5e449041a95dbc984883e4ff58c078b940ebd429898109abb7a39f57ea499e5fcff83fa SHA512 790eb7fb93d25987adf5d30bfa28e0fa137f809dc9a293edfe86105e0a948263759df85b5a0f9fb19b89c256a33b5b68179d95a210964b6f82345972ee9e6108
 DIST XlsxWriter-RELEASE_3.0.3.tar.gz 35519702 BLAKE2B f4dfa6b286dda94a1a44d8168b8e17f7a37f2f59a23aa3a5ed0efa46b5d8bdcdb831e99a61924e22755c6a921c23f5c540c048152cd07363841ff09a49549c79 SHA512 92a53226aa9ee9f8493fe7171ce752f3a13ef8f3107aecbef896f17022e93bd7dbccb5e619fcbbb3598102030b190d75508d4dacce20b9643eead59a4441f6aa
-EBUILD xlsxwriter-3.0.2.ebuild 599 BLAKE2B d82ff90cd5827d146f5fa375193d3cb419d668f66b6285626c264365b3ff5d3c38dcb0628f8dc67f60151f1092921156e1233367ce24f77d8b288689588e7468 SHA512 e797996bef521cff87f2794b2e7d867b3576ba63b44dd7aa2843800437757019692d6aebb54655f31248d206849f8052041d802d7a640b73df73f3e71ec33029
-EBUILD xlsxwriter-3.0.3.ebuild 639 BLAKE2B 3bfa216952632a4d9f664d17e1d351be00f2245eb26495ae3d7828ea1f7767ee3c9633e8e250ca7d832260bcc14ace6bf1d9933f85ae618dde7f670fe4c9eff4 SHA512 d222ecf50e7fb174619ae861223161bdbf92cc1ca87f158a831c7402602192967eaf30d21b8d2d9713b5c4c046e17a192cf64396df8adafcc4ede7210e7bd43f
+EBUILD xlsxwriter-3.0.3.ebuild 633 BLAKE2B 928c42c2d8a497583c2b1e62102d06f6ce68c11894ae40d8c5340c81410620fbb802645803a310bc067438b87d2f23eed119a8f76e05e94b9012e9571fecc83b SHA512 bf9814e74eba56260bae3795685b0f5f2cd0d15c2a0e6cdc5c660665e523688edfdc8d5011d9c4346b5a405d7a73b6a6d1fc9557db2554c026ccde2da7c6ff97
 MISC metadata.xml 411 BLAKE2B e41e1e6dddecef73fff1c0bd74d51b023694ea6eb162022679a2939819f5c3339b1e76d00e25f761c46f66d323a5ad7085ed86fb13fbe3f53526c75004a68e93 SHA512 63242ff274e1dde596e50f9360e1247084b7bae05cd42d60605700c49e33b53849529578cf532415b899bd2ccd04066f99e97c6e80d53c13f71522a041579976
diff --git a/dev-python/xlsxwriter/xlsxwriter-3.0.2.ebuild b/dev-python/xlsxwriter/xlsxwriter-3.0.2.ebuild
deleted file mode 100644
index bef28e4d0b94..000000000000
--- a/dev-python/xlsxwriter/xlsxwriter-3.0.2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-inherit distutils-r1
-
-TAG=RELEASE_${PV}
-MY_P=XlsxWriter-${TAG}
-DESCRIPTION="Python module for creating Excel XLSX files"
-HOMEPAGE="https://github.com/jmcnamara/XlsxWriter"
-SRC_URI="
-	https://github.com/jmcnamara/XlsxWriter/archive/${TAG}.tar.gz
-		-> ${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
-
-distutils_enable_tests pytest
diff --git a/dev-python/xlsxwriter/xlsxwriter-3.0.3.ebuild b/dev-python/xlsxwriter/xlsxwriter-3.0.3.ebuild
index bdb4f9202a13..1b8cf78574f4 100644
--- a/dev-python/xlsxwriter/xlsxwriter-3.0.3.ebuild
+++ b/dev-python/xlsxwriter/xlsxwriter-3.0.3.ebuild
@@ -20,6 +20,6 @@ S=${WORKDIR}/${MY_P}
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 
 distutils_enable_tests pytest
diff --git a/dev-python/xlwt/Manifest b/dev-python/xlwt/Manifest
index 7dfab3526648..3622b1f5301b 100644
--- a/dev-python/xlwt/Manifest
+++ b/dev-python/xlwt/Manifest
@@ -1,4 +1,3 @@
 DIST xlwt-1.3.0.tar.gz 153929 BLAKE2B f0edb823201e477aca23af1edaa2a7bcf95aeb5b9b191f4d9a8be9e052d68699887cd829c2304b26334fb3e92d4a1fc1d0dbfabb477889a1295255170408715c SHA512 e09c515bda7edadb9624b842796a537316c1e2e06f3e74aca5440a5797dbc259036539fd64ea61648a30894f4091d3be829411d36e6170894980728c798c5963
-EBUILD xlwt-1.3.0-r1.ebuild 707 BLAKE2B f4d2332f1ce8ecae8d698a606ef0f460009f05c82325cece86acbce55de9c76a5fbe59e9da6064b48f0b39946c44ccaf04be066e7cf321bc93b69f3eb876b753 SHA512 5c030f282253e23a809d09e0ca1bbc5d1629b87c0c16fbaf0c378cb2899a3bb7952e336b77627645ce0d31bd613a2ffbb2c36bd96b418cdb3e60b2eb6cf900be
-EBUILD xlwt-1.3.0-r2.ebuild 748 BLAKE2B 04a83472da1546544b48b5d852582cb1ea63415cff42a2424e8294b1098694771527f1cf5f71d36f50a0396f735577e0a4b71cbe0e5c674a4d5b64f72074d7e0 SHA512 4ef1b36cf15474ac078b8188e642a8180cf0a44f1c2a861b8e4bdb00e9d72d8dcb35f468cec93a9361c86a48c31c4027b1d006031a775ef93b9f3fc18f4df4fb
+EBUILD xlwt-1.3.0-r2.ebuild 740 BLAKE2B a92761f7bb13fe908fb68599de206cf6019b59e5efaeaf537c91804adb882bdf3a52906487655643fe432819aa54a56fca97c9dde50b0d170612263e458f4ea3 SHA512 1bfb83f89313f764476f432cb4346a187200dd477c1e057d3aaae2cab5c6d90fa509aa150443a6b25181bcb77ddba910ffe36ecaf70d4b609e5373fd5635459d
 MISC metadata.xml 684 BLAKE2B 7069281bea7b838c27970185e2cd1702da78b66083ec0bae258aaf694d0a6dc73053b4acdc53523341dbead4a8c91fe415cb0a9bdada435e29b7aeb1f1b739cf SHA512 b7daf40465334b500fb65a753f737b41f0b5fcafa58c90fbf693f48dbed8fbc8c6f044ba6af02ffc57303c7ea7aa40182afba75731148450054e700de69d7cde
diff --git a/dev-python/xlwt/xlwt-1.3.0-r1.ebuild b/dev-python/xlwt/xlwt-1.3.0-r1.ebuild
deleted file mode 100644
index f10929904606..000000000000
--- a/dev-python/xlwt/xlwt-1.3.0-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2022 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 library to create spreadsheet files compatible with Excel"
-HOMEPAGE="https://pypi.org/project/xlwt/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="examples"
-
-distutils_enable_sphinx docs \
-	dev-python/pkginfo
-distutils_enable_tests nose
-
-python_install_all() {
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/xlwt/xlwt-1.3.0-r2.ebuild b/dev-python/xlwt/xlwt-1.3.0-r2.ebuild
index 42a90bd7410c..b44e9116c0b8 100644
--- a/dev-python/xlwt/xlwt-1.3.0-r2.ebuild
+++ b/dev-python/xlwt/xlwt-1.3.0-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="examples"
 
 distutils_enable_sphinx docs \
diff --git a/dev-python/yappi/Manifest b/dev-python/yappi/Manifest
index 4a356ada8512..49dba1ebb624 100644
--- a/dev-python/yappi/Manifest
+++ b/dev-python/yappi/Manifest
@@ -1,5 +1,5 @@
 AUX yappi-1.2.5-warnings.patch 483 BLAKE2B e084ebde1a6769ace82ed1d1b878f656ffd283678acf474af866f26951231a823a930323c1d7fbdb06c01b4b06b98522ba1bfb427973261627cb9967949d8b8a SHA512 81dde3661720814ca89fb3cd20786601ae7a5362a288c7f9ebbafd4095006b863dfa3c544821b917d9abb8a2532b08d415440a21f19e14e3a67c517064f1ab61
 AUX yappi-1.3.0-tests.patch 563 BLAKE2B 7415bb3e8c69634aadc605871414a17101e91e3ed8c7cf0878fab338996d386916db07fd82c4ce2e3eee32889e40a76f63b383b2a3ba4e2de9f7a9fa383cbdf1 SHA512 4f112e61bd3b38aa997b84af581d1926ae0b3078c59ec14979422a182a825a2e6e108c1066a67d7f6cdd4eff9d70b9f46f3e5c66a054b114eef9bd241a214865
 DIST yappi-1.3.3.gh.tar.gz 936700 BLAKE2B 45e974949dfeaf6487dd76ef13a1b7f4456e805e50d85d089a366c5dc4ac852ccc117224ce5f17affa1f1ba1950a86b6f666cbc8e76edf51bf21cf2f527b877f SHA512 5634b8af997a082031ad1ec12eb83498949f1a56be3a324137d118f55ee51758af8c129da30138fa54f165eafed1572fb2289476e6d0cd838a884ee9118fd8da
-EBUILD yappi-1.3.3.ebuild 844 BLAKE2B 24a7ccd0e341fb9e8a8a85ffab92ad7007620cef525b80deef53854233e399a4556cdd758ed1af1f99be6ceddf2e24d9b3d1b208f71044ec1bd61d0f5b762cc8 SHA512 81aca97d963f4c4e72e7eb77ec151529c0280e4a6c016c2dd5fd2832639f016bf16943717e86124da69fec338eb783810d35ecb3e9678e2da4ad208b965cfe99
+EBUILD yappi-1.3.3.ebuild 851 BLAKE2B de825a8be1efdbe55587c7911774955efd9286258f4f1eb37b1c9e6ef6f5345ae84d3b94db26320b57813c80bd703cb10f56f1154ba08e98d5cc5262e419b933 SHA512 b63ef3ecf8e3d558cd55d5e37f6163ae6dfdad0361ead365e00333c79ed9d829905389680d0e135dfe1a95d987b75264c8564a8b05b915e2c5fc0e43fa073a70
 MISC metadata.xml 489 BLAKE2B 243541f7de9fca044073eb0f35d32b751738c9172dc1ef15599eed56c0c8b2e9758d703e555aadfbdd4d1f96def39f88798be495d80fcbb763e0f1e0f3590822 SHA512 2eeeb6c6b73f5077584150d05e9c1d8bef00d0fb83283c6f5804ec31151f3e59d2de91ecd86508a2fc2a61aaab7e82455c633487f64a4c6dcbe5ca9229fe20ed
diff --git a/dev-python/yappi/yappi-1.3.3.ebuild b/dev-python/yappi/yappi-1.3.3.ebuild
index 58c7f2ec81a7..5f43f725efa2 100644
--- a/dev-python/yappi/yappi-1.3.3.ebuild
+++ b/dev-python/yappi/yappi-1.3.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,7 +19,7 @@ S="${WORKDIR}/${PN}-${COMMIT_HASH}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 
 BDEPEND="test? ( dev-python/gevent[${PYTHON_USEDEP}] )"
 
diff --git a/dev-python/yapsy/Manifest b/dev-python/yapsy/Manifest
index bb721c1a9d94..a744c52288ac 100644
--- a/dev-python/yapsy/Manifest
+++ b/dev-python/yapsy/Manifest
@@ -1,3 +1,3 @@
 DIST Yapsy-1.12.2.tar.gz 83986 BLAKE2B e6a2650383a7f0c9bf72d4abf21fffb2abcfdc4115a2a1578a2987b7eef1fc04de9099947c1b9dd510d54a89d9b11f86ac0ca3b13510c6417e94ff92dfec12b6 SHA512 3fdb4de1a6d8f836e22d82354492b99ec9883443c389393d25ea40a08bb0b6ae03db9c947af55237b67764facd4d55a09a36cdba107c8d9202f3700fd55c31fa
-EBUILD yapsy-1.12.2.ebuild 481 BLAKE2B bc9f0dc4a2aa8c289590fe3250d5cd47065c444786a03f3c0d192099be8913fe3c84ff2a7e671d9b8a6e1a4cd3034e807cbf8320e7cb5b1fabd2f4ae6735d9a7 SHA512 f354165cf2b16454c217d4cab29df7ac82666ffd55cbe5b1849527d461f3750459f7334e85a34c0b26b3f6e356cfa8bab1a236ba93150db9497516c22d598a07
+EBUILD yapsy-1.12.2.ebuild 488 BLAKE2B bcfeedaab79f0b94ee987001c4f801dbe264f815198a176ab5fefbbcdaa2e44cd2e9cb8a2c2204cb4b8354758f4c4900a55d08962df150016cd06b27a6c05dab SHA512 83b2d0f5bdbdbd0a23c7d09e10cd917f8f3b8ce06263306b35afe3f62379537c13797d3c2af50426bf7206787cd148ecfc672c63fa5a4150e24dcb0c0bcaf8e2
 MISC metadata.xml 467 BLAKE2B 07730135f88b1b359fbdbb3cafbc7877c1b6e256a983af131418a537212daf1a0f3ecf6506e94ea23c65878d17522ce9fe5e248da641a5459885fe3591347528 SHA512 61e4b1da195d12ef84bcb77f767da67051da9be3ba08e0c7c45d943f7056e7164fbdf864e8282cd6a9b183cf41322c18d6ea9b2957466e4ab94546e3d974d06c
diff --git a/dev-python/yapsy/yapsy-1.12.2.ebuild b/dev-python/yapsy/yapsy-1.12.2.ebuild
index e4ffd85300fb..5d0398c40a5e 100644
--- a/dev-python/yapsy/yapsy-1.12.2.ebuild
+++ b/dev-python/yapsy/yapsy-1.12.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~riscv x86"
 
 distutils_enable_sphinx doc
 distutils_enable_tests setup.py
diff --git a/dev-python/yara-python/Manifest b/dev-python/yara-python/Manifest
index 73c3cce3c47c..d2e4cb25214c 100644
--- a/dev-python/yara-python/Manifest
+++ b/dev-python/yara-python/Manifest
@@ -1,3 +1,5 @@
 DIST yara-python-4.1.3.tar.gz 33712 BLAKE2B 7878d12620f2834578c98a99bc259422d8ac54efc04ebd29ffa604c15b0462607ce950b3e19f8e80db07195e61dedb4efc8c2ffb18a0c5de0bf2755fe62776d1 SHA512 9c96ae78df7694dd55b8bdde4fad49043f120b94477fa9d7090610665072626eba4fa410cd9292205e0b18bb9f384f07288c0340232e163294b91051b84dcab2
+DIST yara-python-4.2.0.tar.gz 34459 BLAKE2B fce460385eaa75dd1779fe49c7937ff36d7604433deb310b6fe9e66af9ea521952f92bee61829372cf19c7efee170329609530f1f9e863991720e4887c3c1349 SHA512 ba08d709fc51679ec9fe36165e0864b79fc241f85c681bf59823fe7bb0e34e928cded050ff296147eb5bcb837485f39949aa93425a0eb9ca8b3730e60fac93f4
 EBUILD yara-python-4.1.3.ebuild 723 BLAKE2B 8e48ea383239015f2b3ae08028463ec314e4c9666237d8a03c3f321e86cad5336779b2acd6695b075ab951e586764a95750ba3d100b895f7b550b198613e6dc2 SHA512 1968179a083dcad4a3e4b13c795672af700bb8ca634c2e4bf1ffa067c145caf14e934eb4249fbe1daf45569c5a50f3d0fe3e5c98854e63b2d5f38640ab032d2e
+EBUILD yara-python-4.2.0.ebuild 801 BLAKE2B d3bc9bb4b97035346f9ba9044157e2041c8c6aef42c019fd1e9c96840794d39a60ad65a6a2e15aab7ca1dced6f17c38910633023dfaafca890c26b6c6f13a0e5 SHA512 8704c04cb423c518c454d3128d0fca22aef5b0f1a5481d5bb259e90587801eea38f952eb5624f7434c8894167afaf4d293fba53337e1fc5d3d9bcbec569147ed
 MISC metadata.xml 686 BLAKE2B 47aab79f1d9d1ba937d6dd955647f9a88f85b73d4d033aaebd27b0a404e9423396656a5cafebe2a5b3853b573fca2cdfc0c05b3c7b47654e31a1e58d1fe3ddb2 SHA512 ee02751cd8579395eaba2da6b7d9bfeb02e13d90130d5f9cbd79dc3932c89c19759a2aec51915882f6b6fd7907c3dcb3d8efe02af138bcbb899fbe40abc911c9
diff --git a/dev-python/yara-python/yara-python-4.2.0.ebuild b/dev-python/yara-python/yara-python-4.2.0.ebuild
new file mode 100644
index 000000000000..c9eca9c95ffd
--- /dev/null
+++ b/dev-python/yara-python/yara-python-4.2.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Python interface for a malware identification and classification tool"
+HOMEPAGE="https://github.com/VirusTotal/yara-python"
+SRC_URI="https://github.com/virustotal/yara-python/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="${PYTHON_DEPS}
+	=app-forensics/yara-$(ver_cut 1-2)*"
+DEPEND="${RDEPEND}"
+
+distutils_enable_tests unittest
+
+src_compile() {
+	compile_python() {
+		distutils-r1_python_compile --dynamic-linking
+	}
+	python_foreach_impl compile_python
+}
+
+python_test() {
+	"${EPYTHON}" tests.py || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/youtube-search-python/Manifest b/dev-python/youtube-search-python/Manifest
new file mode 100644
index 000000000000..b115ca9dcb62
--- /dev/null
+++ b/dev-python/youtube-search-python/Manifest
@@ -0,0 +1,3 @@
+DIST youtube-search-python-1.6.3.tar.gz 115934 BLAKE2B 1151a29da0d66206424a88a2ac3839269f11d970b4a829f9d33ede4ef7ffec39c6762bfe138edd5da9c57308444021be93054c34cbc71e12a031a8d798d94975 SHA512 16d0dfbc95387bb3ccac9224e53ea087cdfa41d1330abd96fc3ad0136af227359fc2d8409a2eca81ae2fe9790efdb86a42e409748ba1a49c595df2629216e331
+EBUILD youtube-search-python-1.6.3.ebuild 535 BLAKE2B 878846d79f99acecef667a7942eec2304f87529f97c7cfe250682ee37add76eeb5ccb2285ca50ec9cef97eb53ef1cb3503a1c38f61d8d8673a61f64d2ea55b43 SHA512 c43886ce2d34f39ae3c41a80d94f1823cc77efd550ece662e5408f1f8804ee1bde59ccfe63c12f4ad30b26fd4e54b710fd2a05eeeb2e41e8f33d78cdea1aff4f
+MISC metadata.xml 441 BLAKE2B 886bea7098ee9959e832ebff56473617460048fba908c5273e76b40a6452d6a2bb637365985eeffd937b1ff5793168b0336971c609d3ef6eebd1decffa4f8471 SHA512 3c53fe9194609683298cd17417ab00bf0767bcbba364511e491b26b251dd634d902ef5fc13d114e03b0e7860666d0ff20f2018640ad84fe581e0c853d2ee9db0
diff --git a/dev-python/youtube-search-python/metadata.xml b/dev-python/youtube-search-python/metadata.xml
new file mode 100644
index 000000000000..bc129c31ebbe
--- /dev/null
+++ b/dev-python/youtube-search-python/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+  <maintainer type="person">
+    <email>xgqt@gentoo.org</email>
+    <name>Maciej Barć</name>
+  </maintainer>
+  <upstream>
+    <bugs-to>https://github.com/alexmercerind/youtube-search-python/issues/</bugs-to>
+    <remote-id type="github">alexmercerind/youtube-search-python</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/youtube-search-python/youtube-search-python-1.6.3.ebuild b/dev-python/youtube-search-python/youtube-search-python-1.6.3.ebuild
new file mode 100644
index 000000000000..923cfa88f17f
--- /dev/null
+++ b/dev-python/youtube-search-python/youtube-search-python-1.6.3.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Get YouTube video information using link WITHOUT YouTube Data API v3"
+HOMEPAGE="https://github.com/alexmercerind/youtube-search-python/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/httpx[${PYTHON_USEDEP}]
+	net-misc/yt-dlp[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/ytmusicapi/Manifest b/dev-python/ytmusicapi/Manifest
new file mode 100644
index 000000000000..f1e7884fd4a6
--- /dev/null
+++ b/dev-python/ytmusicapi/Manifest
@@ -0,0 +1,3 @@
+DIST ytmusicapi-0.21.0.tar.gz 48457 BLAKE2B ace8818c2a6859bb17d98fa608ac8cf7a806745741e634f639f4022527021089dc9b0b7bc48c0f999937a4599847a144afcb9f7e5585daa5d7b0ea1d5d12e399 SHA512 c34abbe8ba8d3b92ac162ffc9679ab21ce6c618a349aaeaa6c06b5597a3aed14e9b9f78a6b351ba545729da1c0bd57c2b7f999957bd8e56b0b453c04624bca4b
+EBUILD ytmusicapi-0.21.0.ebuild 535 BLAKE2B a58ef20fb67c130a7b70d53c2c47fc4e92db5526161cd98f7b518d145f6c15489b33759f2e4db135676f960c50b31daf46f1d0a7b0194c15b4fcfd1ea0ef0390 SHA512 d604121b1ed2182763677998afdca3aab24dde4ab0cf4b5c019e652d4aa6e2dfff9bc2000010ed539eaa9185dcf7efbbc4ed4a4950e5813a7f9406ad4f3d477f
+MISC metadata.xml 407 BLAKE2B c51bff212087de6c6b73454cee783eba2cfb957777a4a15640275dc9ba8c29c4a56ec6d52a8f7775e74df19ed6456f1a5102939a8dcdd1a2ffd4427cd39868be SHA512 cda71d030fbdea3a4b60e357211050132b23c5f45e2ac63216586c4424c7dc9b46876e666272ed33f497129f8d40c3827420962380e40706a043d22f193acba7
diff --git a/dev-python/ytmusicapi/metadata.xml b/dev-python/ytmusicapi/metadata.xml
new file mode 100644
index 000000000000..2bfd4cd3600b
--- /dev/null
+++ b/dev-python/ytmusicapi/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+  <maintainer type="person">
+    <email>xgqt@gentoo.org</email>
+    <name>Maciej Barć</name>
+  </maintainer>
+  <upstream>
+    <bugs-to>https://github.com/sigma67/ytmusicapi/issues/</bugs-to>
+    <remote-id type="github">sigma67/ytmusicapi</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/ytmusicapi/ytmusicapi-0.21.0.ebuild b/dev-python/ytmusicapi/ytmusicapi-0.21.0.ebuild
new file mode 100644
index 000000000000..a7e9f3db10d4
--- /dev/null
+++ b/dev-python/ytmusicapi/ytmusicapi-0.21.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Unofficial API for YouTube Music"
+HOMEPAGE="https://ytmusicapi.readthedocs.io/"
+SRC_URI="https://github.com/sigma67/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+
+RDEPEND="dev-python/requests[${PYTHON_USEDEP}]"
+
+distutils_enable_sphinx docs/source dev-python/sphinx_rtd_theme
diff --git a/dev-python/zeep/Manifest b/dev-python/zeep/Manifest
index f83565340a22..c51068dab81b 100644
--- a/dev-python/zeep/Manifest
+++ b/dev-python/zeep/Manifest
@@ -1,5 +1,4 @@
 AUX zeep-4.1.0-cached-prop.patch 3247 BLAKE2B 2ecbafe7bd1dae935dcb6dc0596e68a4d709b04e205cbc58c736fd235e7dc69f66ce5fad86893f1af1d3d77187de92f9f12a7055f8dbbc01c56b273ff500a56c SHA512 36971cc3ab540392cd702edc6cfb8c5db5812f05bcb9e28308c53514e18de2dfd1a29dbac3d6bd53f38f1d315f1a447d974e1a61fb59664bec18567879e080e0
 DIST zeep-4.1.0.tar.gz 160333 BLAKE2B d29db92efe048ba854ff14cde062993c3f334cab6cfc122f6db9aa7a1a490c82f93a50ca5028a5f86e316d9ecf567ac40aef10f3e7d8db89376c7d8dea2a2e23 SHA512 acc54f99d21fe401e06418223591bcf8e7f8819e225f892beb0f6e2a1ee359a0da6f9d0aa4212899197c084af37cc56126879b93a22cdad2458e57674bf66ed5
-EBUILD zeep-4.1.0-r1.ebuild 1321 BLAKE2B f4597c09cf92a6a9096204c453ef2a3d152748a81c25ff3ddf115c64863677dac46460f57846909a23be7de910b9035aff8c413c0c868d89fa4fb46a9b3a9124 SHA512 a44e8888b3e43d13db40e11e42608be050eae18e2f9f133a4e136d1308ec66afcfd93d2c90f9dd3c9d1383400968996fcdb1b9cfb43593b1d72be990cf134447
-EBUILD zeep-4.1.0-r2.ebuild 1588 BLAKE2B b6c08ae621d6c61d2d57e1ed8d76ee8764da68b99b5625567b764c2665edc051a75f2a6320a67da41791ea12cab6c304abcbf44d5d9ba44649beb7128babedd7 SHA512 06468db239a228576dffff163fc66f594f1acb92985a005d39a656c42df729824453f9b6153573b9944416724ddc4ee29df291f96df9180c56e9e1cd31f708f3
+EBUILD zeep-4.1.0-r2.ebuild 1586 BLAKE2B 3570b2b277148998c037be5f6628c5a290160debca06e5c720dce824f5ca66658e6a70a02898b98371d157487b18989d26ecc86e59bbfa98bada41beaf948862 SHA512 17e2705d7204aa5adfed81382c5412b59c4207d398b3f693a8a2e769e394d555870e34f8503f86743071780dbf23a4a1b0e108702e0d08b99600c2ae762ecac5
 MISC metadata.xml 485 BLAKE2B 7bf7fe5fa8c3803d58acb9b572a9b8cf5250f5bb95c95eb385748bd87da46fed52a6c13c48c5c623c61256289b598873c05c7bd24aeac331651708c365974557 SHA512 e4af11481fdcdc75c3e5f31d457707c7ea8baacee3c0e912a93b2d224e60685d821347f6cb7f6f12483e2051043ea25f5560446ef11f210cdd41b13e1e4e1fcc
diff --git a/dev-python/zeep/zeep-4.1.0-r1.ebuild b/dev-python/zeep/zeep-4.1.0-r1.ebuild
deleted file mode 100644
index e9a0162f28d2..000000000000
--- a/dev-python/zeep/zeep-4.1.0-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# 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 modern/fast Python SOAP client based on lxml / requests"
-HOMEPAGE="https://docs.python-zeep.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="async"
-
-RDEPEND="
-	>=dev-python/attrs-17.2.0[${PYTHON_USEDEP}]
-	>=dev-python/isodate-0.5.4[${PYTHON_USEDEP}]
-	>=dev-python/lxml-4.6.0[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-file-1.5.1[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.7.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-toolbelt-0.7.1[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	async? ( >=dev-python/aiohttp-1.0[${PYTHON_USEDEP}] )
-"
-BDEPEND="
-	test? (
-		dev-python/aiohttp[${PYTHON_USEDEP}]
-		dev-python/aioresponses[${PYTHON_USEDEP}]
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pretend[${PYTHON_USEDEP}]
-		dev-python/python-xmlsec[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-httpx[${PYTHON_USEDEP}]
-		dev-python/requests-mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}"/${P}-cached-prop.patch
-)
diff --git a/dev-python/zeep/zeep-4.1.0-r2.ebuild b/dev-python/zeep/zeep-4.1.0-r2.ebuild
index 081164474d79..a04730a0cc9e 100644
--- a/dev-python/zeep/zeep-4.1.0-r2.ebuild
+++ b/dev-python/zeep/zeep-4.1.0-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="async"
 
 RDEPEND="
diff --git a/dev-python/zipp/Manifest b/dev-python/zipp/Manifest
index 4aab72e624a2..ec7bbd6591c6 100644
--- a/dev-python/zipp/Manifest
+++ b/dev-python/zipp/Manifest
@@ -1,3 +1,5 @@
 DIST zipp-3.7.0.tar.gz 12989 BLAKE2B 8a315dfd28c8aa1d5a568699886ea47b34000381981d1f4e578bcc10d7c9dc772bfd99ae9d720836e300dd1aaa5e12f0667bbe40d69668306f90aed23ec0cc8f SHA512 bf0c00382273453286ce597fb5a0059b8b279edd01dc4f2d5accef41cc53d69ddda1a2b00f4c38ed4057eeac69ef225ba4bd3a70a16da025b33947cdd6a69ed8
-EBUILD zipp-3.7.0-r1.ebuild 1436 BLAKE2B c26f81e605ca162225e00c97e2c5caa4cc6564ff0e93c2fc0ba658c3f128cae620e783c6a6566b706f393c08c425f30a5e4186601a458d7d86eb55e4629af28c SHA512 03e68ea9b8195170365a26250783fe778c0537c75f3bd48f25aa98645bcda7d3c139293635b8573e68bb1d6f26c22836c51fe9c4f7ec2b53775d85c6b1482df4
+DIST zipp-3.8.0.tar.gz 13344 BLAKE2B 0da3ca4ff683ac840759030b6ee5125bb1a1b1b8737f0ff0499f3193d13dc3163c6c1fd29c5f1667f347728c991930e3d9e3a325ffb89b6fecb9f6590887bcaa SHA512 d677f941dc92a784b8bd197ca2e1f6f3a570dc236c9eeddcb6108d6f55ad3d35a82462abeeb4bac6ea434442737aea960d941c2a7d0bd416da9abee153c99bb8
+EBUILD zipp-3.7.0-r1.ebuild 1529 BLAKE2B 6f91dd611ee1545f13e35a637e37346107f9887632b980c41e97e7c44a15ea18df760c0b8e34d4e29d21dd7cc69ace856a28e411f3903382f9d307e7342a4bf3 SHA512 09cbd40537c10a7b9a169bdc23910a7232413cc78c5d36acecedc0611f67833c7acc38856405c61c1778d9abb810e6642d43cf01f93b8f9aabdac113d36737a5
+EBUILD zipp-3.8.0.ebuild 1540 BLAKE2B 10fbfc3cc593ee3173865a881d84cd6ec94a812bbf66b682afda814e1674eba973ef6a122198145678093cff8950feb6773d667344d43186435397ccdb0f921a SHA512 a89979afb3a214058a6a0de818455245ea79ae61e49d36faf8c317c7076a3a460330502862e110cd7bd651de737ef7a8bda2b249b6115b5a75be86f1aac0910b
 MISC metadata.xml 548 BLAKE2B 0bcd7b95c50e9e14ada6f3f02145bec64ee365beacf3447659276c1a5454355714f83fd2dc81a035a56d11ba1eb989f32bc0209a540b28fb72c3126d4d45a5fa SHA512 f214f6711b3197a44ec5c03b418aab3c9b907e0b3a297cb1c4e2ac3a499acefeb4de411443495db9678cbfd75460f89c9c40a57fc1bc404acbab844223a129d2
diff --git a/dev-python/zipp/zipp-3.7.0-r1.ebuild b/dev-python/zipp/zipp-3.7.0-r1.ebuild
index c14f9e544eeb..7c26fbe3ad53 100644
--- a/dev-python/zipp/zipp-3.7.0-r1.ebuild
+++ b/dev-python/zipp/zipp-3.7.0-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 BDEPEND="
 	test? ( dev-python/jaraco-itertools[${PYTHON_USEDEP}] )
diff --git a/dev-python/zipp/zipp-3.8.0.ebuild b/dev-python/zipp/zipp-3.8.0.ebuild
new file mode 100644
index 000000000000..e12ba8698422
--- /dev/null
+++ b/dev-python/zipp/zipp-3.8.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
+EAPI=7
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Backport of pathlib-compatible object wrapper for zip files"
+HOMEPAGE="https://github.com/jaraco/zipp/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+BDEPEND="
+	test? (
+		dev-python/jaraco-itertools[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs \
+	">=dev-python/jaraco-packaging-3.2" \
+	">=dev-python/rst-linker-1.9"
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# speed tests are flaky by design
+	test_zipp.py::TestPath::test_implied_dirs_performance
+)
+
+src_prepare() {
+	# dep of disabled test
+	sed -i -e '/func_timeout/d' test_zipp.py || die
+	distutils-r1_src_prepare
+}
+
+src_configure() {
+	grep -q 'build-backend = "setuptools' pyproject.toml ||
+		die "Upstream changed build-backend, recheck"
+	# write a custom pyproject.toml to ease setuptools bootstrap
+	cat > pyproject.toml <<-EOF || die
+		[build-system]
+		requires = ["flit_core >=3.2,<4"]
+		build-backend = "flit_core.buildapi"
+
+		[project]
+		name = "zipp"
+		version = "${PV}"
+		description = "Backport of pathlib-compatible object wrapper for zip files"
+	EOF
+}
diff --git a/dev-python/zxcvbn/Manifest b/dev-python/zxcvbn/Manifest
index b17366b3a400..a642b03dce0b 100644
--- a/dev-python/zxcvbn/Manifest
+++ b/dev-python/zxcvbn/Manifest
@@ -1,3 +1,3 @@
 DIST zxcvbn-4.4.28.gh.tar.gz 9392042 BLAKE2B e3baf57df00819243f9588c8203598b14b9f03e0a232d53152584b3b74872baef7050fdf8f11f25e8a8776e2e4a7a0af15c9045f07700fe686c6cb021f794f2b SHA512 be85f976dcf685e2885edff116147cc4549f9c86dee4317b61b84dc4f36ab2c8c2f3468d5d1a55e8890693c852a09104b14360f9ce43feb3727f8fc164eb78f1
-EBUILD zxcvbn-4.4.28.ebuild 481 BLAKE2B 88807de63c5b53324168f5ea4a80a547e177601938c3f8930d1f8cdfe46cda222fc418dc0f57a19791f7a29de321e5da236fca5cf4c468259e6443c17813cf72 SHA512 5b98610c07efbbbf6a57671f752f7c586e0846a46da47e2975f1f950111d203c746d597427c1e9f4e8fc844e3b9e7ff1d6afa76a07f7ce01b249315dbc0fbbe5
+EBUILD zxcvbn-4.4.28.ebuild 488 BLAKE2B b177efc88ecf5373f5cf9f32df7bed73469fc8ee7cdf0d7b76abab56da06f21e94ee68688ea01413cb3b25d324cbc4f4be2fd945126a4cbe57ad6650bce5fd9e SHA512 9ae7e22020052433d7f8a6bd0363c4ee75e16edfaa0a93ec9373d4c029a51eae3d576cad4b45aef815193d67ac7f1f59c9a7a44abc00cdc6f76cfa50f108c7fc
 MISC metadata.xml 288 BLAKE2B 403df6aa04290e4479aaf55960dc96232729c30172d8b84307aebd658451123feb6c913e0e5bfcdb126060df13ce49ffc7c9aaad648ba5b648f058871c759798 SHA512 c227ff9a49fb729298a1f05f6385557cb614c78b6b45f663f17fd90183dceed644f4d86f6306d921955a92d0f60f9d99f34fc1545f12303b71612a8f6f504ced
diff --git a/dev-python/zxcvbn/zxcvbn-4.4.28.ebuild b/dev-python/zxcvbn/zxcvbn-4.4.28.ebuild
index 66bdf399468d..6493a5eab967 100644
--- a/dev-python/zxcvbn/zxcvbn-4.4.28.ebuild
+++ b/dev-python/zxcvbn/zxcvbn-4.4.28.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2021 Gentoo Authors
+# Copyright 2020-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,6 +15,6 @@ S=${WORKDIR}/zxcvbn-python-${PV}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~riscv x86"
 
 distutils_enable_tests pytest
author	V3n3RiX <venerix@koprulu.sector>	2022-04-06 22:33:41 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2022-04-06 22:33:41 +0100
commit	e68d405c5d712af4387159df07e226217bdda049 (patch)
tree	009ab0f3d427f0813e62930d71802cb054c07e30 /dev-python
parent	401101f9c8077911929d3f2b60a37098460a5d89 (diff)