gentoo resync : 07.01.2022

author: V3n3RiX <venerix@koprulu.sector> 2022-01-07 22:48:01 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2022-01-07 22:48:01 +0000
commit: c3bc61051d7f12b4c682efa7a5460bbc8815649e (patch)
tree: b6d19e96ba3c397fb8278eeb9b68170db92630ba /dev-python
parent: 3517852e3b8a68d1e997770fc0650c5053bafc6c (diff)
177 files changed, 2674 insertions, 2011 deletions
diff --git a/dev-python/Faker/Faker-11.3.0.ebuild b/dev-python/Faker/Faker-11.3.0.ebuild
new file mode 100644
index 000000000000..c1675ccca639
--- /dev/null
+++ b/dev-python/Faker/Faker-11.3.0.ebuild
@@ -0,0 +1,29 @@
+# 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="A Python package that generates fake data for you"
+HOMEPAGE="https://github.com/joke2k/faker"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
+	>=dev-python/text-unidecode-1.3[${PYTHON_USEDEP}]
+	!dev-ruby/faker"
+BDEPEND="
+	test? (
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP},tiff]
+		dev-python/random2[${PYTHON_USEDEP}]
+		dev-python/validators[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/Faker/Manifest b/dev-python/Faker/Manifest
index cd12d547c4b6..fb94e5e9759c 100644
--- a/dev-python/Faker/Manifest
+++ b/dev-python/Faker/Manifest
@@ -1,7 +1,9 @@
 DIST Faker-10.0.0.tar.gz 1198872 BLAKE2B 60e4f34a597ca11b0699c330f6cdb0f7f387bb6c54d769513f8e091d00242c7ba4e62fa6b3411ad313a4713e9311b729fb6068acfc4a02b66f07c66656677f33 SHA512 0c22b18d16815ee37d2ea79b4142100479c7b9b9f169817dc9e0fe39495f0646e8d61d704ddba7d36eefb6cb3fb744d179a57216abb15c15ee357c8b12b8b5a4
 DIST Faker-11.0.0.tar.gz 1199121 BLAKE2B e5c4e17daa969249dbf1ae69630a79c50e6e51d63db9997872bd22a7e91db1771fdef984ec5912d42815632598339062be20005e4921c846abf3013e6efc8c89 SHA512 687f47ba613bd2117c412da54e293281bf1943eccde8165cc749be5d176a025d250c831d55a509a6923b3542dba4fe5abce23bd80b980bdca742ecaa837d4334
 DIST Faker-11.1.0.tar.gz 1214021 BLAKE2B c4b7b44d19566037135d47bce19895da7bb0eba17c64086ad5f0019bbd49a77aaf4231e6aef8f40aec4811bbe4df209b796773ac5cca6a859ff9b43ea57fe9bc SHA512 646d16bceb3fc5ca8a9004ab7369d7fc6012f0766b2f6b58922a1a415a4bf1ae1af0d5977d58f15792bd794fa2235fb44e626e28f5af168d4e4def8112bab0ca
+DIST Faker-11.3.0.tar.gz 1215886 BLAKE2B 01a0e9cff30597536cc1d6f4ae3f67c43e0e1ec5268d5c544a0cf6ea905c4528f07567515e615b74f32ea4622c9090e63141b0b526d656cbb96a449c23e7b047 SHA512 cb95ecd4cd781c6a08621fe75a1d019349232f8be65d4c9b5825987cb98bb6d031569d6e3253cb36a68986707515540f6ebd7503085aea68d56642b08f86192f
 EBUILD Faker-10.0.0.ebuild 723 BLAKE2B ae3fb5bd83c431960a804754b0c50ff925028373c5f40a1e11c7c4caf4fcea02787b7514251151fc92e74c9cb2a90c5d736b24e4e54ded6f619df731b1130039 SHA512 4a865912859241052c5921798bc53e045798ac4008af9c5f1f9b4954a1057ae5ab1afdb58291502bcbe6e6fc2c8370f0a42da1c7433029b0c2775d6bf91d8653
 EBUILD Faker-11.0.0.ebuild 723 BLAKE2B ae3fb5bd83c431960a804754b0c50ff925028373c5f40a1e11c7c4caf4fcea02787b7514251151fc92e74c9cb2a90c5d736b24e4e54ded6f619df731b1130039 SHA512 4a865912859241052c5921798bc53e045798ac4008af9c5f1f9b4954a1057ae5ab1afdb58291502bcbe6e6fc2c8370f0a42da1c7433029b0c2775d6bf91d8653
 EBUILD Faker-11.1.0.ebuild 723 BLAKE2B ae3fb5bd83c431960a804754b0c50ff925028373c5f40a1e11c7c4caf4fcea02787b7514251151fc92e74c9cb2a90c5d736b24e4e54ded6f619df731b1130039 SHA512 4a865912859241052c5921798bc53e045798ac4008af9c5f1f9b4954a1057ae5ab1afdb58291502bcbe6e6fc2c8370f0a42da1c7433029b0c2775d6bf91d8653
+EBUILD Faker-11.3.0.ebuild 723 BLAKE2B a041a53fcb013d95d7f4d112cdcfbfca8f1f37e7272d091a9d1bcfb338f549dc192b9f640d66a7ae2ab165855341c1ee4a0faeda231b87cafaab6ae483fc1180 SHA512 e753ca5e5ab62029a7107e492d6c6f0ff2a422979e59dddfcb7cd5db21f11f3d1475fa9016e3ff2e8db9bb01ad024dda668589c457e82baaefb08b159b68e88f
 MISC metadata.xml 474 BLAKE2B 337c8b17b4ca092edc2e59bd61dd847e4b9f2bd7e0651d07dad5b3e3eb4f311de9e27e6cad1f6a4835f618446cfa4cdb95e578a8af11498cf7bed1ec697990ce SHA512 35f4a2a50ad5589ba50e619670d1f1eac423fec920bb9c07b3f8bd7d7f2a0bb4e88dde286b062339b30ba304bd1a834bf3318c0b0ad0552ce9eb45fa72e5f44e
diff --git a/dev-python/GitPython/GitPython-3.1.24-r1.ebuild b/dev-python/GitPython/GitPython-3.1.24-r1.ebuild
index 3d2c69324381..24380890aa1d 100644
--- a/dev-python/GitPython/GitPython-3.1.24-r1.ebuild
+++ b/dev-python/GitPython/GitPython-3.1.24-r1.ebuild
@@ -23,7 +23,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-vcs/git
diff --git a/dev-python/GitPython/Manifest b/dev-python/GitPython/Manifest
index ed74e69701d3..f4c7fc286983 100644
--- a/dev-python/GitPython/Manifest
+++ b/dev-python/GitPython/Manifest
@@ -2,5 +2,5 @@ DIST GitPython-3.1.24.gitbundle 9658020 BLAKE2B 4ac2c1a238de1d6e5be9f2d65ec486a1
 DIST GitPython-3.1.24.tar.gz 191249 BLAKE2B b60f5186aea33434d77b63997e5e9dc277b49a97934bfe250795af9c0ed92d00c478dd4475a00faa2f5867882f81161dcd21ed46c86883a48b8397266b5318de SHA512 af2aa85574287827e5d2b78f7a19776be57518aa0b8af7a3fb92bef0d97c6a27b3272ed39adf2080b39cd5a9eb114164de7a2a9bbf73cfe1fe2647e0b053b092
 DIST gitdb-4.0.7.gitbundle 1498536 BLAKE2B 1e0aff67259c04d2932dbdefb0ae07bd9fb51c5dcb99ee8431e78bf428095250ed45f5e12e2484b407bb4257050b0864e67096b3501d4829491cb7714a7b5ddf SHA512 f8b1b3de00f0597d65f528dd30495fd3dd9e1e4d494987899ef2064d23947ede799db391a59688dfa27e4fcdc9379b5352a378b39e6fb2421e6c850f81157bec
 DIST smmap-4.0.0.gitbundle 322820 BLAKE2B 20ac688cafa9ad036f3e21ac1bb9323ae55e618eb0806634fe4c885d2b12fe802779adcffb0fea3da9707e94109a168738d63abe990d1ce9b141c779aa6798d6 SHA512 03296099303eb38ac9ca46733255024355aed2e64a2f9409552ae34af76beb9685a6dd2458df986593fe426e428bc184617abe22c8b92ee01c8c7e1d98de8592
-EBUILD GitPython-3.1.24-r1.ebuild 2166 BLAKE2B 8b84d6a445e9cdf5a373f4b53a43d6786f57a3a13eef21be82f319299a27c9281bd21931240d3e2f8880533e33f05ab0ab0e124948bfca9379bde1b461019efb SHA512 23b06217dcd50ff684940a28251edccb821631a3514b9983fec390f25ed4069bb79f8ee9fb12482293e49aa9bf8104a274761e6930922d8ffdd089d97ace2bf9
+EBUILD GitPython-3.1.24-r1.ebuild 2163 BLAKE2B cd8eb4b81dc761a1eb7ff72bff395e0a41e152a627c18381b9df146a2c926965c2df24c24d1aa0e03a5bee03e18d22bd4b1e05eb6e701c51a7cf9fe66ef0d0f0 SHA512 c474013015c57fd446010c5f7b48c6138d5ef4822451c22885552e4e6b4b989d94c2d07df000dca4a1516a7649f9a945d7efddb06b04e7e58b5fad2d5dca51ec
 MISC metadata.xml 407 BLAKE2B 49fd8d520d575be1489c299f22595120fad882f055b9cf2d02b87382c6d8f0ff38af694e5584b4da579aa84b82c2f1032e4afb64cafd9f4fe9212a6d67b4a752 SHA512 1bebe1e134eb86a4745cf7e297d45118a2bdd3d8a71d0034294b5c799a9cee763c63b61b34c6707c52f61058f727f4b827dd020d285fc297712b29eb7c1129ef
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 120c76d5dd72..5d423a39db06 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/astroid/Manifest b/dev-python/astroid/Manifest
index f3d45d528852..9834b50b506f 100644
--- a/dev-python/astroid/Manifest
+++ b/dev-python/astroid/Manifest
@@ -2,8 +2,10 @@ DIST astroid-2.7.3.tar.gz 378876 BLAKE2B 016ab6e798f1a608c0e0ce0bd81865145349c70
 DIST astroid-2.8.6.tar.gz 394852 BLAKE2B 400531227ce5a8b0f284f51ccb2d37aeb0463ee0fc7faceb3fd33b4bd727b7283421fb69c50eba3246217e06dca2cecfac49030d33c7e2a7cf252144860b50a3 SHA512 8fae723f0b7df34ba51d7f97634b09173956ae1eaa1543b81af8a80b5d9c9fcbdd96de709da2432a935dd5fc7369f9f1ea03cf2b7e3f0b09dac8485145d8f1d9
 DIST astroid-2.9.0.tar.gz 404906 BLAKE2B 2aefe21392289b95a4ea3bde047e6f33b6915f4feac722164b4c35cc97dedb83f7d2e7f277485c5a3a8c7abc7865ccd88923266aa675755eeb17b0bd22077931 SHA512 949520268303a257102c2348920df9ff779bf5736739be5985b0441fae664212bee476445dc5d52478e789e08bbd5826ef83cf8a730a73d4e2d6eb04251c3cee
 DIST astroid-2.9.1.tar.gz 408617 BLAKE2B 921178fc6be9f3905c0e93c755fbf0ff70da4bf6242cb10a6881e78b66f9636fa39d7aef1ba9435ec69ae314968d33126a64d2d11a8da2aa2ee0dc9010d58ce3 SHA512 b6c69a316bd9f21be34b5e15505e38719721991c0b9a9162233c2c8c7b0fcef792027f6564fa58f083448d00bbae910f8dad1a2957aad5d3bf23c1bfb6727e31
+DIST astroid-2.9.2.tar.gz 408664 BLAKE2B 918fcf1e90667a9f3c69689557026f282e5fbbb40a8e3c184569f53d9a005d9822538cd15401e984256f928731d44a04d1a618ca818eb1eeae57b32e94d06425 SHA512 e9523f5874dec8cc3f252efc2b2f6707999772cc9809cf982d92693182052e575eac31c7d759c9aea22068e90a9bb25d89a20bc8d89dfe2ba44ebcc04f78471e
 EBUILD astroid-2.7.3-r1.ebuild 1244 BLAKE2B 67ee476429bfe190bae26848a03d506782e7fbdcc57563101253321537fb8123a5d45c81f9710f236d8fe471f7b58f66f15c2725d0bf36cca6205123aa1b4bea SHA512 15b5ff612fd7d0b10eb60e3c45a7e5f45f1980e3aa8d38e0cfdf3f349313da5e7cc0df59ac655570c47d00d14586b5151179d14dd74d30240637317a1e4d0d8f
 EBUILD astroid-2.8.6.ebuild 1299 BLAKE2B c093e88206d0f820547b7afaf95b13c97c8c0635fa096fc98923cd711dd7fc7c05478beba6c42aa099c5645813d37cbecca4157c2369d9eb013880c32f6e2124 SHA512 e853ca621bd253db6498b0d16c941cb13ebe8f2c4bdece39094592b7567f6504a72db8444151915982484748e10898efdbb41aa7b47f872fb0b5488534036340
 EBUILD astroid-2.9.0.ebuild 1305 BLAKE2B 5563d28361824789351a923225d6b25fc1f4329dc1260326b80113c2fbd24df8387d645c9bc9ebfe9560d994707dc59918b26847e6c2e61b5a3be18303e440a1 SHA512 134a3d5ce85471c35c3fd363211b127cc9f83feb5cfe839478df7dbb1191924d3e508a6c41e391c08da96096c396d6749ea5c42210401fb95e525bd8c054aa92
 EBUILD astroid-2.9.1.ebuild 1313 BLAKE2B a31e17f61abf894bedbea61d9d53b09363d5ec7dc8c36d09e03c08b3d5b84b62ed5fdf6f0092a33be7d90a04c0c9cf82159b28a1f2ff0181c896819a72194490 SHA512 ac9165d1ef3484d4ec21033ad961f140b8762b88672fecb68adea38d5008ac992ce4a5a6c976c1c560441bee0afba1ca27e4516d46085a196ae851487dfc8714
+EBUILD astroid-2.9.2.ebuild 1313 BLAKE2B a31e17f61abf894bedbea61d9d53b09363d5ec7dc8c36d09e03c08b3d5b84b62ed5fdf6f0092a33be7d90a04c0c9cf82159b28a1f2ff0181c896819a72194490 SHA512 ac9165d1ef3484d4ec21033ad961f140b8762b88672fecb68adea38d5008ac992ce4a5a6c976c1c560441bee0afba1ca27e4516d46085a196ae851487dfc8714
 MISC metadata.xml 1143 BLAKE2B 1f6c4e004277eebed2e29cb935ef01e5f18fb0a526f99f0e875ae3815308dce0483b5274b4e23bed076464aa62a035937a7a3817e2d4a5fb9211b9043271e04c SHA512 56b07d0f08a49772661bc3d233cf1f628aa7c241c51b91d75dfbd44995e169d8ab5bbd99863d7b9b67792486346982a7b8eebefb462e7e212cd7dff920d80840
diff --git a/dev-python/astroid/astroid-2.9.2.ebuild b/dev-python/astroid/astroid-2.9.2.ebuild
new file mode 100644
index 000000000000..7d421ea6fce4
--- /dev/null
+++ b/dev-python/astroid/astroid-2.9.2.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_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Abstract Syntax Tree for logilab packages"
+HOMEPAGE="
+	https://github.com/PyCQA/astroid/
+	https://pypi.org/project/astroid/"
+SRC_URI="
+	https://github.com/PyCQA/astroid/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~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/typing-extensions-3.10[${PYTHON_USEDEP}]
+	<dev-python/wrapt-1.14[${PYTHON_USEDEP}]"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/python-dateutil[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+python_test() {
+	local deselect=(
+		# no clue why it's broken
+		tests/unittest_modutils.py::GetModulePartTest::test_known_values_get_builtin_module_part
+	)
+
+	# Faker causes sys.path_importer_cache keys to be overwritten
+	# with PosixPaths
+	epytest -p no:faker ${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/bitarray/Manifest b/dev-python/bitarray/Manifest
index e660610e5895..848c6a3325c5 100644
--- a/dev-python/bitarray/Manifest
+++ b/dev-python/bitarray/Manifest
@@ -1,3 +1,5 @@
 DIST bitarray-2.3.4.tar.gz 88229 BLAKE2B adf9c6e0cd1ebab3aa36af82d15fac2d7772289c3969134540154863decb7f58f532ad2a721127774c931b2fdb8f2a9698f990f8778b744a1eb267666140c66d SHA512 ba77ade534044bf19298c886958600cbf90c907ef08fbc70ad0975981942a213622a68a9c7e2708d89f19a8d127d6189cdcf365b27b0ae4c4f553b4febb3fcce
+DIST bitarray-2.3.5.tar.gz 88403 BLAKE2B ebd2b41f3282765a8fe754c421f6813f1d35f105b52148dc3db158d937f0ab0e1ab09590d45f9e09301090bd113e28e9e45bf7a5d76ee0696018cb4e2fe2cca7 SHA512 8d409c8dad077774f4622afbb89435a6f6e5785ab4e53bc1a286e0d5a167a17152ccad78fb7569649c8a28674e269095c8ecb63bf26ac1ee4ed131c41552f55f
 EBUILD bitarray-2.3.4.ebuild 554 BLAKE2B d4d380693ac4207efd7d9f3a1de6cd09cb4ee3ec03465adb3613d298da5947e9822534cfe1fa3d5bab1e9c886e2a57813551359be719f01f247e440641144f60 SHA512 95ee6a48997190a986a0e97f8b94c38afb8fadc78c18e22629377bd4b2e83ba096278f8af1617a5952cce7db6e9736fe8c30255713ae3e9662c923bd9ec0250d
+EBUILD bitarray-2.3.5.ebuild 556 BLAKE2B af0cfbd2f2106e87a9502c69c29f17d3b03ea6839483713a833a88507a5ef2d31e0109f04f00eac4ee62ed5cb5dd83e51eaac5b8ed7687521785d7c29352ff16 SHA512 8589b161c157d3fd74cff0edaf247aebaed6287e074a13369ca07334feb4bf6a5e5dfc0851370eaf060fa10cfa246cf9f91e64e54c22c15bb6877ee8a786f988
 MISC metadata.xml 1195 BLAKE2B 4b6e3f2c8304d9a1af4382a876987ea116ae62c369b70468e9791a075c343a6901c0642ca76826577a8ba85480915e7297e1476aff0295188904c016cdeaa5cb SHA512 4943b61fa1dd60662510f27d3ff5d8ef135c327be620c1eb948e8a1e9e4ccbd5e386be7af7e5c7b04614ac9a11e7c14f4a0a8c35a9580d631b41df09b5033f19
diff --git a/dev-python/bitarray/bitarray-2.3.5.ebuild b/dev-python/bitarray/bitarray-2.3.5.ebuild
new file mode 100644
index 000000000000..189faf37ccde
--- /dev/null
+++ b/dev-python/bitarray/bitarray-2.3.5.ebuild
@@ -0,0 +1,20 @@
+# 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=no
+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/boto3/Manifest b/dev-python/boto3/Manifest
index 5d391462976d..58e04d3a7ce8 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -3,12 +3,14 @@ DIST boto3-1.20.23.tar.gz 456315 BLAKE2B 9f74a1822c631fdcc666db1d2cda5ab464b150c
 DIST boto3-1.20.24.tar.gz 456338 BLAKE2B 4192f20a7a5c247a72b381506697034d744fd62c60d06402759942c3dc1ef0c136ea7b85ab80920831f876e098af549bcdff688ff287a0350ed00ed88aaf0adf SHA512 96a2d6dabaca0aa0d85efcbc2f98f8e41b568e2190352c00101c3df85623867036f64ad9935681ad2a104abd9f6aa9e79de8f7136a846e256185d065afed23a1
 DIST boto3-1.20.25.tar.gz 457371 BLAKE2B f1e6ab3add86f0ba25b22d92f58580e4ab86affdfb5c3b6f9a53938a2a647d0fc8cd23975cd60b909e5db339d442820e557497e232bda836ac9f2028b376afcf SHA512 2693134800ad3313785922c654296ca04a5b561e135fc60a45784e8190cdeb1dd525e6a81f314fda9f14f9dfddd5ffd8bde9af2d2be50b61921b9ec1248fee07
 DIST boto3-1.20.26.tar.gz 458382 BLAKE2B a2123120c07bc8e53004f6c76f6631f3363d5d8e58057a08d2edf914d3a7ea1d2d6a771529abf7031604ac1c366a5b8ee4934e6d34d27eb3dd0716bc16cd6d22 SHA512 5ad18954f8347f240031c2dfab2664bf760b334b12ae90f1d2613f53194843f500164e645445d17fd4e7e7061beb3e2fe34a5a2651a92fdef5efecb18324cd36
+DIST boto3-1.20.29.tar.gz 457663 BLAKE2B 8bb10de51a0250c3bf18b339ca6d9aa54985ebb0ff860862ced57ca1f0455f4c95834a689530e3bad043711735c22fee41e2e860602d7024bb8128ecaee7aa85 SHA512 c19e24a70d68919a2953a1f8060b519782a422183385276e0a439da2150fb20bf24e89153ecd9a134ee0fd631921569739aebf226815ca9c63244c8f2bc3c59a
 DIST boto3-1.20.5.tar.gz 439166 BLAKE2B c140e15e497e6cdf6b4b77bb99e0a0f5ac01d5b5793f8bfb210b52bbc09e39e6fe06a957951375e0795210dc1c3b2a0afd2f498bc88e449d9e6846f2b357f016 SHA512 2823466e4851684253d4ce42a8c34e5cbdad6d04c823040fe2cebdf0cffb14d5d3f40e28d57ebec14533fab04ba74f27c25f078ddb8791b8f52d0424e11b39fc
 EBUILD boto3-1.20.14.ebuild 1416 BLAKE2B 089d128962ec5e55846a7a0c0af7bec14201267edcdef77a8b6e17d72081c025a686210aeecec47b4ff6ddeb772d1e239ef8f49b50cf0901a5c7dd8bd027cd9b SHA512 6fc35112e805b4d9f7ff1a20f7096d49d52fec6edd6fd1feb0762686778b2b9fb20d1edcbc90fe94545200525473c974f8af9d386aad59231c8d1bb88eb8a112
 EBUILD boto3-1.20.23.ebuild 1423 BLAKE2B 23c9d455b8d9a7db524b3452b203b35b075318890aaebb1602b0870ccdc47131e0eb6c3a66eb78782d51133f22e5698c13f2b21d3b125ad92bf96329e82fbc1b SHA512 e67197872e4193cf40cbeeb2812c6dee68a3b580a25d8b343312641cd0f54cb6fab7d6b14ba60a8fe0a708c0611308d1bc5579fc358e5b7421d4c6eede3a337f
 EBUILD boto3-1.20.24.ebuild 1423 BLAKE2B 23c9d455b8d9a7db524b3452b203b35b075318890aaebb1602b0870ccdc47131e0eb6c3a66eb78782d51133f22e5698c13f2b21d3b125ad92bf96329e82fbc1b SHA512 e67197872e4193cf40cbeeb2812c6dee68a3b580a25d8b343312641cd0f54cb6fab7d6b14ba60a8fe0a708c0611308d1bc5579fc358e5b7421d4c6eede3a337f
 EBUILD boto3-1.20.25.ebuild 1423 BLAKE2B 23c9d455b8d9a7db524b3452b203b35b075318890aaebb1602b0870ccdc47131e0eb6c3a66eb78782d51133f22e5698c13f2b21d3b125ad92bf96329e82fbc1b SHA512 e67197872e4193cf40cbeeb2812c6dee68a3b580a25d8b343312641cd0f54cb6fab7d6b14ba60a8fe0a708c0611308d1bc5579fc358e5b7421d4c6eede3a337f
 EBUILD boto3-1.20.26.ebuild 1423 BLAKE2B 23c9d455b8d9a7db524b3452b203b35b075318890aaebb1602b0870ccdc47131e0eb6c3a66eb78782d51133f22e5698c13f2b21d3b125ad92bf96329e82fbc1b SHA512 e67197872e4193cf40cbeeb2812c6dee68a3b580a25d8b343312641cd0f54cb6fab7d6b14ba60a8fe0a708c0611308d1bc5579fc358e5b7421d4c6eede3a337f
+EBUILD boto3-1.20.29.ebuild 1423 BLAKE2B adf122753f3f34b4c12637d48c28310d9989dbcab37330a6badda36fee76aff46e613d4bf45280b802e5d99610b63a9baaf46709ddb7e4039dd2a0f2aef88081 SHA512 2f0f3e9c965119bed75901f60727dc8ca909dc8ed3d4dce571710a887d32e1fda53cddfd578c8bc76fe979212e937accd45aaff8c4b70f4e7565751ce3e9d700
 EBUILD boto3-1.20.5.ebuild 1409 BLAKE2B 09669b67946f26bccb5f8886bc2ef412c4575263c129de5ebf5a1b9799077f44e2939a6c64e213f49ba54959d75ac2265e21eed71ce67e432a7f5d81d1ec4e7d SHA512 cc3047469af35dbc9e7e7963bec4b29c5af79680fd7aeb98aad094e751d13ae8dcf7b1f9f2e79e44531a086423a26a02a5b980314f2ded366b2a99fda8abd9bb
 EBUILD boto3-9999.ebuild 1343 BLAKE2B b2887132265c9ba8dc7ee25f402103f3384553d7cf921f2f0280ad04c508adeb21a27baa344a0a7bdfbe38bc5c822e93b2d7a04ff2dfb57e988f234eaf0fe642 SHA512 766f1cdc7617ae2cc9cceccc7ff8dbfddc200d84fef7edc6c9b5a7b42fd599715ab221054854b3f5a4f050f4f4a27d7a8f5216e063b340ef75aa82b2d2d2da8d
 MISC metadata.xml 493 BLAKE2B 7d6324fc877ffe1d20c5369c2af0b09a7028f94d28f1841188913d0d8be7ea699c9d3f92c624992c4c96bd69615d3a1211a2483c76c56b7d3082492e43512523 SHA512 44420d8c03d5986f990b76369edfa8dfd7659b4952db3ad946fd05392ec594628a28745ad888d055d4f074d5214f61fcffafe6c04c4ab54109d45ac0371582bd
diff --git a/dev-python/boto3/boto3-1.20.29.ebuild b/dev-python/boto3/boto3-1.20.29.ebuild
new file mode 100644
index 000000000000..0d5810a8ffe0
--- /dev/null
+++ b/dev-python/boto3/boto3-1.20.29.ebuild
@@ -0,0 +1,59 @@
+# 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="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}]
+	)
+"
+
+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}
+}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index 44f4dd6017e7..656840c17b07 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -4,12 +4,14 @@ DIST botocore-1.23.23.tar.gz 8679727 BLAKE2B 89e54120caec616ffb539ef9df93923d951
 DIST botocore-1.23.24.tar.gz 8677151 BLAKE2B c12382994208f673cfcfa71e17fed028abfd299595734af7f604612fc6f1fc45dd67a1de17d36accf831d296a5eafedb75b6249e219fb3de75a6a4dbb6e41d59 SHA512 a03b64236c61fcfc7111d8218fa5cb6a305522c20f8eee28dc83983560cfd5a32c9bf5933e6005b49f188b7b673614389a9b79fd5f81701acb09b0816e5bac54
 DIST botocore-1.23.25.tar.gz 8685879 BLAKE2B 6eff15d35c66ded69a07ee0a276efe1e42dac9a3924a1d9735cf55ad89307a6a695e2ab6ee092e6454d1b6d682d329afdcf40644a8a6b89099dab1d53543adda SHA512 f09cb0564e0208816b05ec827d534bf866d4de827466ce53d91bcf21b08060934c937e38f756d02735412bc965bb831283f0c44a4c957af4271ba754215a6545
 DIST botocore-1.23.26.tar.gz 8688841 BLAKE2B eec8481bef3096d7173281138e072364fb2eebf0d22e7ef7edcd1fc7878b3c9888279f8bc063d57deb0e8410bd77da43a243c0fe57f3b34d3ddeabe1134a8d9a SHA512 050e0e63506b1d3161811c570c81e5d574f8f96ea000729453650fd3c5df9422d8a23959256f0867a17cfe4db426fb79b2f47e5875eb0c3574e6c6fa8d061e6c
+DIST botocore-1.23.29.tar.gz 8705067 BLAKE2B b5c2358a263f93b4808a2527b7ce8a1bbc36dcd44ebf5d987bdc39713d494cdca8dc7499081f54a03467c5b7e998897d651672b586c2430da99ac67e92c8c3c4 SHA512 e5d282c69a4180f3d8e0a496a703df36ccc79cf23a63549167267b59ee44dcd06b5e6a7aa0234728467b0787517687f5b5e75db3b9a1e9c35776902b772f409d
 DIST botocore-1.23.5.tar.gz 8374467 BLAKE2B 467092e7d8aa5ccb756132669049865445a47205913964c1c944b20caaf100b1efdd1bf3af9c5416ff079b487e6d4d08ffe6208e2b352d09655cc5be21c88739 SHA512 6afca19b724f9019f21e5993ce970d605b95d31c1a4e969ec1b4080510a5a120b3fa0cfd5ade973a9203bd6b7983a3dbca2f7a03108a9167392efd60d5e2fe9b
 EBUILD botocore-1.23.14.ebuild 1534 BLAKE2B 259fabf9a72774556dfa48afa21dcc83d8f3c98f13c55f838d617c64461e24aca98faf226bebf05f0bd7c36759c73d7d3d8447752dc10278d3fe1152296e6722 SHA512 af520fd2e28dcab33131776421d99ed2cd15a688ca5446a9cd21bdcff9d629592e0a3b4f09727167f2ba1ff227b7ca16cdd06620a98b99e3d0283d8d71c2c747
 EBUILD botocore-1.23.23.ebuild 1541 BLAKE2B 0370a506cfc0e77dc87c1d569fe402d51ba31a5c08477364350beeee739b042240a6b22d142600c213277576db24fd77e43bae7fb3aaf538e14e051696dd4dee SHA512 3bffa81a4c9ce291b805b3037992d3d46f6b960b4964bbbe74d5038617908c7320c2b12787167e356f837781c91dd934e0e100abd0e89b5d5929edc5a4a5f4aa
 EBUILD botocore-1.23.24.ebuild 1541 BLAKE2B 0370a506cfc0e77dc87c1d569fe402d51ba31a5c08477364350beeee739b042240a6b22d142600c213277576db24fd77e43bae7fb3aaf538e14e051696dd4dee SHA512 3bffa81a4c9ce291b805b3037992d3d46f6b960b4964bbbe74d5038617908c7320c2b12787167e356f837781c91dd934e0e100abd0e89b5d5929edc5a4a5f4aa
 EBUILD botocore-1.23.25.ebuild 1541 BLAKE2B 0370a506cfc0e77dc87c1d569fe402d51ba31a5c08477364350beeee739b042240a6b22d142600c213277576db24fd77e43bae7fb3aaf538e14e051696dd4dee SHA512 3bffa81a4c9ce291b805b3037992d3d46f6b960b4964bbbe74d5038617908c7320c2b12787167e356f837781c91dd934e0e100abd0e89b5d5929edc5a4a5f4aa
 EBUILD botocore-1.23.26.ebuild 1541 BLAKE2B 0370a506cfc0e77dc87c1d569fe402d51ba31a5c08477364350beeee739b042240a6b22d142600c213277576db24fd77e43bae7fb3aaf538e14e051696dd4dee SHA512 3bffa81a4c9ce291b805b3037992d3d46f6b960b4964bbbe74d5038617908c7320c2b12787167e356f837781c91dd934e0e100abd0e89b5d5929edc5a4a5f4aa
+EBUILD botocore-1.23.29.ebuild 1541 BLAKE2B e3de7fa6d2bbf369edb511b6d377edcc9ff28181cd371e51e808d06f5b57edfa7b3ebe1c67a0deb882113962df1f29dd2b92bdffcbc52abf87dd6a67dbc502e5 SHA512 c9d8f86707d8e1ca8f0168a96e19b8f893855c62bc138105d21bd55ee6f7acac3de963378edb8df0b186c06d234c07b3a07f8fc2e46229050371b0d4a39648ed
 EBUILD botocore-1.23.5.ebuild 1485 BLAKE2B 9b21d94811fb8d5254dba77700f691180d481a90767817b99f88d581d758f04bc4f9adbb6aeca10874feb1244a185f6857e893244e42eefd3eabb85acfd99489 SHA512 2911847bde3fc7a321362a0adbcf67fa548a012d3625efb9d2512b04b279c19780925cd508aff6af5a96705e904c560f4c2a2a23d7aa7dae6421814a9545328b
 EBUILD botocore-9999.ebuild 1534 BLAKE2B 259fabf9a72774556dfa48afa21dcc83d8f3c98f13c55f838d617c64461e24aca98faf226bebf05f0bd7c36759c73d7d3d8447752dc10278d3fe1152296e6722 SHA512 af520fd2e28dcab33131776421d99ed2cd15a688ca5446a9cd21bdcff9d629592e0a3b4f09727167f2ba1ff227b7ca16cdd06620a98b99e3d0283d8d71c2c747
 MISC metadata.xml 499 BLAKE2B e5aaa7da26f200c09adfdf38b68f656bbccbec627cb5d966b280ac2165334e7eec659c89075bcace748f58e2ec3e7d2998e54a688d56ecea2d30653c67dfd35a SHA512 103c554d5dbd967bf9b6e418b3913d9235e7e910d012160909ce0715134ed2e37b06e6a345395f9d16ce08d1cf51f3ce458bce93c6a978fd3dca6610f2acdbd0
diff --git a/dev-python/botocore/botocore-1.23.29.ebuild b/dev-python/botocore/botocore-1.23.29.ebuild
new file mode 100644
index 000000000000..5a7d2c6fb0f2
--- /dev/null
+++ b/dev-python/botocore/botocore-1.23.29.ebuild
@@ -0,0 +1,65 @@
+# 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="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[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
+)
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests 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
+	)
+
+	distutils_install_for_testing --via-venv
+	epytest tests/{functional,unit}
+}
diff --git a/dev-python/cattrs/Manifest b/dev-python/cattrs/Manifest
index 179b8cdfc36b..e2b0ca39128a 100644
--- a/dev-python/cattrs/Manifest
+++ b/dev-python/cattrs/Manifest
@@ -1,5 +1,7 @@
+DIST cattrs-1.10.0.gh.tar.gz 100657 BLAKE2B b0475644bdd31e12dabf7b969e1890932309497e66b45a311e97d56062e99837af11677c24e33c6d1bed6ec2c6373eab6535874115960ed450f52804a6e5d73e SHA512 51cda84d30627f9d0eb6842c45f7c91dd2f3d9a21b1a635ad21d0648d409b576f52e6127392d60bdd1b6a803f8f897f970706b9cc64b703c06387bc85cd3740e
 DIST cattrs-1.7.1.gh.tar.gz 85853 BLAKE2B 36c411ffa92eb263b85d48c81daeea1deea10d5779c6cd1f57988792ef5ec68bedc20b59620077e6500c2e41bb91e83f110467083f90219be7e2419c3880ed94 SHA512 a72370541cbec8928f9e1ae0c130c94e71d826ac522eb39062840d4b78a7f6aacd13395b677f6ff1453e327af31a71af0e5f81893f57ba33edbb53b7683835b2
 DIST cattrs-1.9.0.gh.tar.gz 102241 BLAKE2B 89cc71de97e1e63d3cfe3a4169c20e44d9fb8b85c6f939a0503d569dbf521d97ac325ead7c8bd58d4d32b6c6097a70effdf58553e334300639d6ef6c26b40bc7 SHA512 e1e4e59f802baf63cf931b3798bf39e4f18d5ab12a9aea000c2b649d34905d29ccb94f9ccdc5b2c52e48114fb9b292e59ab86da4c747243cae8a9d9ba25e768c
+EBUILD cattrs-1.10.0.ebuild 1157 BLAKE2B ed97e41ebb576b00dfe8d40c24ba4cb85926ff6bd126e9f0bc016e24744eefb4b98192aade0e259576906c3102d87ff16b05393ecab9b9d00c650ce605d8d4fa SHA512 d61fadf3fb97535a7e6dca93a9b637ca004625be751085eccb7a7d9940c1ea7c2175dc85b2524d75ad0a9ee3e3eacc99c082e3cf8c04c5eecd024ceb0f5c54e3
 EBUILD cattrs-1.7.1.ebuild 1122 BLAKE2B 9a9337e76f37fd7fc464bdb95bd3d94d3bbb89a6d8888b3e77a7e3d2c2078b4e011c85aec2e5a6671659bcb0491b975739375f4970db09bdf8758441fc0b5759 SHA512 97146e8004249d2da53b181c20f3ad69e77555b5fbe3e8c4e75f0e418a23fe2ab570dbd1d348d2b0dd71445a3da0f005e2fae62bfb4133474572632f898572e5
 EBUILD cattrs-1.9.0.ebuild 1136 BLAKE2B 343966dbc3bda0577f5d24b3f53deacd14ac7839cd800f3f59d1f55d3e4e0bcb0f7ee59047e3c5c3783ce0a5f7d85b124f5fededa962f91aa92842ded8172aaf SHA512 406e8f006dd84a0f99f94c90228ba03e7998c4aa54736084106a76d2d8425b9d3954d0259f7f5d02e97a1df7c32d29206aa896c66890108975c49259a196a334
 MISC metadata.xml 347 BLAKE2B 94165f2a8e62f3dc7e195f872944300ffff5ba23b9a7e6c30c18d61bc469ea8ff9b70e516f854bfc52d55a0fd27daff0df58145e34bfe26dbcde8070b8a22630 SHA512 5bb37b39b9574256358a623cff942a95162f5f9dcb32ddf28bd167504c7619be54488fae10044a5c765291f8fa28a5aa346973365dcca867be0eef4e232a4999
diff --git a/dev-python/cattrs/cattrs-1.10.0.ebuild b/dev-python/cattrs/cattrs-1.10.0.ebuild
new file mode 100644
index 000000000000..cd5e38f65158
--- /dev/null
+++ b/dev-python/cattrs/cattrs-1.10.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 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} )
+inherit distutils-r1
+
+DESCRIPTION="Composable complex class support for attrs and dataclasses"
+HOMEPAGE="
+	https://pypi.org/project/cattrs/
+	https://github.com/python-attrs/cattrs/"
+SRC_URI="
+	https://github.com/python-attrs/cattrs/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/attrs-20.1.0[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		dev-python/immutables[${PYTHON_USEDEP}]
+	)"
+# test_preconf:
+#		dev-python/bson[${PYTHON_USEDEP}]
+#		dev-python/msgpack[${PYTHON_USEDEP}]
+#		dev-python/orjson[${PYTHON_USEDEP}]
+#		dev-python/pyyaml[${PYTHON_USEDEP}]
+#		dev-python/tomlkit[${PYTHON_USEDEP}]
+#		dev-python/ujson[${PYTHON_USEDEP}]
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -e 's:--benchmark.*::' -e '/addopts/d' -i pyproject.toml || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# unpackaged deps, see above
+	epytest tests --ignore tests/test_preconf.py
+}
diff --git a/dev-python/charset_normalizer/Manifest b/dev-python/charset_normalizer/Manifest
index de56c2e75d28..921f062c4d8f 100644
--- a/dev-python/charset_normalizer/Manifest
+++ b/dev-python/charset_normalizer/Manifest
@@ -1,3 +1,5 @@
+DIST charset_normalizer-2.0.10.gh.tar.gz 82368 BLAKE2B 935af7625c138f8751de60c4179ee6b0195e99366c7bbecd8e9dfdf09ea557e2eb7cb86830321f91b3b7aa3fc1b3cc376266a4c22d23aabc6dfa6b9db57beb45 SHA512 87c8cbadef8c57121f0f6e2ea9558a9d2124dc444789dd984beadae020349a4e48a484e8937399f0e99f8c87edc621d55d26a9f22fa738e468e70ed17564d7ae
 DIST charset_normalizer-2.0.9.gh.tar.gz 79757 BLAKE2B 9e4b3f65689791739f6b7509bcf9cce8f0a9c536251452b1130aa4476fa218c11087db719d8273087884a9e96b9daf32599d1386e95bda42ca31600b0b37299e SHA512 0957752c1083897193fbdfbeec453a2b279b0834c0074f9f1ae08faac51d3e281eeb0a6d8fb217885101fd04761296555364a9f957e89bf8103fdc569d249056
+EBUILD charset_normalizer-2.0.10.ebuild 728 BLAKE2B 49647691c8934cb9aed2a5cd82a0903ad7e1009173b88d7bc5bc7453ec015663be1bc6af834353466e7cb5e9b5c6e7ec5083cc1716c866126fde86e8649267f5 SHA512 de67ee3bf8b4f789a68627d29b622b764e24abd2fd5d3c1828f863843b21b067df79db1695f9c1b35dd210ca7e450cefa339768a171786eae8ffa626aab6fa3a
 EBUILD charset_normalizer-2.0.9.ebuild 720 BLAKE2B f0b524d361c70b90cf281e2bcf5e7c01ff3ae3e25131f6bd828a8a688e2debee5310a80b832c5ee55b0cfdc12591d800b526602d89388cb2eb837b6c95127152 SHA512 ec16b79a1ca81bce04b17d87f012dbc2303ee92e98e624b274b4a4716f5dca1cbfca727c0c8146df26a2a460f894cc0986fc7a153bbec55037d8997ace924869
 MISC metadata.xml 389 BLAKE2B fe6651ec35ff7c5054d923af3f01983ffbdc6c9b47712b511e6b64eac8cfc0879ebfec52400f06ddc20cc582ed5e619883a86581b89c6e4bbd1177869b2d941e SHA512 b3c9c62aca7ff0691a5ea2ba8da2793316145890417dfaf847c9a6031cd7b3b5419b03ace05a4d2a94f8da61e8138f12c0d8998ea460ea2e25a29a2e95063f57
diff --git a/dev-python/charset_normalizer/charset_normalizer-2.0.10.ebuild b/dev-python/charset_normalizer/charset_normalizer-2.0.10.ebuild
new file mode 100644
index 000000000000..34243bc62c2c
--- /dev/null
+++ b/dev-python/charset_normalizer/charset_normalizer-2.0.10.ebuild
@@ -0,0 +1,27 @@
+# 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
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="The Real First Universal Charset Detector"
+HOMEPAGE="
+	https://pypi.org/project/charset-normalizer/
+	https://github.com/ousret/charset_normalizer/"
+SRC_URI="
+	https://github.com/Ousret/charset_normalizer/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"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/addopts/d' setup.cfg || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/cheroot/Manifest b/dev-python/cheroot/Manifest
index ede6ab15074e..c1e84d44f5f6 100644
--- a/dev-python/cheroot/Manifest
+++ b/dev-python/cheroot/Manifest
@@ -1,3 +1,6 @@
+AUX cheroot-8.6.0-remove-pypytools-dep.patch 2757 BLAKE2B 97628fd6590dbe41e34bf0b93bc1062c424097aeea26a86891e2d2fc049fb7ee7a990fc9b9d3dba9406bdd344e3c25cdd08907aaac11e64d78c73b3ccd9b3fa5 SHA512 ddc88d93c795ea25c56d0b2a1bfee1b0f9c900ec2594d69aa91c639575c86c1fb89accc95992587db76d5c4e438a34f2eceac480c60a5470aee5ecd996140e44
 DIST cheroot-8.5.2.tar.gz 113183 BLAKE2B a3b60a9df3f34913cfb8c99fbdc8580ea436710c7979e296c18a6981f54bb959d6a300f4cf9d4e608fe2987f58d5fc6d2b8f57bca800e461d31c77ac61fd6b01 SHA512 245c4157f5e11741d94375099878ef5b31945412a2b02961502e762b9770fd968f4f977fe2d74744aa6596c668079d7f07b6f129fa11438783a95d3a5ee088fa
+DIST cheroot-8.6.0.tar.gz 134779 BLAKE2B 97d1a9bf0a8d72d3204972934aa3ac4c97246b413edebd9f38caa802a5343acc426f137addfdc0faec58f6af2d62bc22023e93b14e1b0b07f6be9ffb12e78306 SHA512 26e48c935fe32d4ce3cf6ae20b5b272416ca53bd8496527c2958ec2ebe87529c831f283ae900e13271b610e39531b682df0376935ecc3bcfcca11c299cd2a893
 EBUILD cheroot-8.5.2.ebuild 1766 BLAKE2B 4505d71f0eb92f9352ef79bb2616caa299aa77533309ea3e4d4314eae613b3f3c21110b2eb5486974f958fb500c5c06c7c2f66c1ebc3e035a39f98cdfd5e73c4 SHA512 d5fbefb34a262e4fecc00c3d09371e0d51b61cb71f5f48ca5e0ec6afbda4b93dfdac6a218fc86c62c87e845177a3cc296ae89fe64a41dedbfcb0df87041205f0
+EBUILD cheroot-8.6.0.ebuild 1903 BLAKE2B 94e615d297253e4e1c3d14db1582973df7d064b1550f9bc7af1c0d6bb09c1fc93c2f34f8a9be43c2bf516bbdbd104132144f682e8be11e8656bbe8d917ac56e4 SHA512 e51b4d0bbb1dcf94c19e0a365276c4b3099ff294df23488879825b5adb4433e0f09d24e31b8934b042fe84c1ad3b53911bda4e066b79feadd48ae64615b028a2
 MISC metadata.xml 496 BLAKE2B cd878a31050fec99c8440433368e7e017670a9f7e8c0a921f532f1de73860bff076bab0d841fdc9fe94a7f8182aff6671fd9188925cf72f3059ea81f7f7cf613 SHA512 cdab3fb8b4a1d7eb1cb2a7d8d72537139bbd452c9f7915024028c3526c7b903ee70c3e2e4c912611a8ae02569ba961df86d08cbddf329c7db27d64220b52aaaf
diff --git a/dev-python/cheroot/cheroot-8.6.0.ebuild b/dev-python/cheroot/cheroot-8.6.0.ebuild
new file mode 100644
index 000000000000..7cf72b10dda7
--- /dev/null
+++ b/dev-python/cheroot/cheroot-8.6.0.ebuild
@@ -0,0 +1,76 @@
+# 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="High-performance, pure-Python HTTP server used by CherryPy"
+HOMEPAGE="https://cherrypy.org/
+	https://pypi.org/project/cheroot/
+	https://github.com/cherrypy/cheroot/"
+SRC_URI="mirror://pypi/C/${PN/c/C}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/six-1.11.0[${PYTHON_USEDEP}]
+	>=dev-python/more-itertools-2.6[${PYTHON_USEDEP}]
+	dev-python/jaraco-functools[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/jaraco-context[${PYTHON_USEDEP}]
+		dev-python/jaraco-text[${PYTHON_USEDEP}]
+		dev-python/portend[${PYTHON_USEDEP}]
+		dev-python/pytest-forked[${PYTHON_USEDEP}]
+		>=dev-python/pytest-mock-1.11.0[${PYTHON_USEDEP}]
+		dev-python/requests-toolbelt[${PYTHON_USEDEP}]
+		dev-python/requests-unixsocket[${PYTHON_USEDEP}]
+		dev-python/urllib3[${PYTHON_USEDEP}]
+		!ia64? (
+			dev-python/pyopenssl[${PYTHON_USEDEP}]
+			dev-python/trustme[${PYTHON_USEDEP}]
+		)
+	)
+"
+
+PATCHES=(
+	# Bad dep (upstream gone, only PyPi package, has py2 code, etc)
+	"${FILESDIR}/${PN}-8.6.0-remove-pypytools-dep.patch"
+)
+
+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 '/--cov/d' \
+		-e '/--testmon/d' \
+		-e '/--numproc/d' \
+		-i pytest.ini || die
+
+	# broken
+	sed -e '/False.*localhost/d' \
+		-i cheroot/test/test_ssl.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local EPYTEST_IGNORE=()
+	if ! has_version "dev-python/pyopenssl[${PYTHON_USEDEP}]" ||
+		! has_version "dev-python/trustme[${PYTHON_USEDEP}]"
+	then
+		EPYTEST_IGNORE+=(
+			lib/cheroot/test/test_ssl.py
+		)
+	fi
+
+	cd "${BUILD_DIR}" || die
+	epytest
+}
diff --git a/dev-python/cheroot/files/cheroot-8.6.0-remove-pypytools-dep.patch b/dev-python/cheroot/files/cheroot-8.6.0-remove-pypytools-dep.patch
new file mode 100644
index 000000000000..f1f4fac26557
--- /dev/null
+++ b/dev-python/cheroot/files/cheroot-8.6.0-remove-pypytools-dep.patch
@@ -0,0 +1,74 @@
+diff --git a/cheroot/test/test_server.py b/cheroot/test/test_server.py
+index 8305c78c..39e4e066 100644
+--- a/cheroot/test/test_server.py
++++ b/cheroot/test/test_server.py
+@@ -16,7 +16,6 @@ import requests
+ import requests_unixsocket
+ import six
+ 
+-from pypytools.gc.custom import DefaultGc
+ from six.moves import queue, urllib
+ 
+ from .._compat import bton, ntob
+@@ -330,8 +329,7 @@ def test_peercreds_unix_sock_with_lookup(peercreds_enabled_server):
+     ),
+     indirect=('resource_limit',),
+ )
+-@pytest.mark.usefixtures('many_open_sockets')
+-def test_high_number_of_file_descriptors(native_server_client, resource_limit):
++def _test_high_number_of_file_descriptors(native_server_client, resource_limit):
+     """Test the server does not crash with a high file-descriptor value.
+ 
+     This test shouldn't cause a server crash when trying to access
+@@ -363,18 +361,6 @@ def test_high_number_of_file_descriptors(native_server_client, resource_limit):
+     assert any(fn >= resource_limit for fn in native_process_conn.filenos)
+ 
+ 
+-if not IS_WINDOWS:
+-    test_high_number_of_file_descriptors = pytest.mark.forked(
+-        test_high_number_of_file_descriptors,
+-    )
+-
+-
+-@pytest.fixture
+-def _garbage_bin():
+-    """Disable garbage collection when this fixture is in use."""
+-    with DefaultGc().nogc():
+-        yield
+-
+ 
+ @pytest.fixture
+ def resource_limit(request):
+@@ -400,32 +386,3 @@ def resource_limit(request):
+     finally:
+         # Reset the resource limit back to the original soft limit
+         resource.setrlimit(resource.RLIMIT_NOFILE, (soft_limit, hard_limit))
+-
+-
+-@pytest.fixture
+-def many_open_sockets(request, resource_limit):
+-    """Allocate a lot of file descriptors by opening dummy sockets."""
+-    # NOTE: `@pytest.mark.usefixtures` doesn't work on fixtures which
+-    # NOTE: forces us to invoke this one dynamically to avoid having an
+-    # NOTE: unused argument.
+-    request.getfixturevalue('_garbage_bin')
+-
+-    # Hoard a lot of file descriptors by opening and storing a lot of sockets
+-    test_sockets = []
+-    # Open a lot of file descriptors, so the next one the server
+-    # opens is a high number
+-    try:
+-        for _ in range(resource_limit):
+-            sock = socket.socket()
+-            test_sockets.append(sock)
+-            # If we reach a high enough number, we don't need to open more
+-            if sock.fileno() >= resource_limit:
+-                break
+-        # Check we opened enough descriptors to reach a high number
+-        the_highest_fileno = test_sockets[-1].fileno()
+-        assert the_highest_fileno >= resource_limit
+-        yield the_highest_fileno
+-    finally:
+-        # Close our open resources
+-        for test_socket in test_sockets:
+-            test_socket.close()
diff --git a/dev-python/cython/Manifest b/dev-python/cython/Manifest
index 69e3fd958e76..cfcc9f74fea7 100644
--- a/dev-python/cython/Manifest
+++ b/dev-python/cython/Manifest
@@ -14,6 +14,6 @@ DIST cython-0.29.26.gh.tar.gz 2100616 BLAKE2B 9990d8fd14a8042b1a27a4f60fcc8f6d4b
 EBUILD cython-0.29.21.ebuild 1987 BLAKE2B 1df83b6ef7f839622cd73c07384ccf0a6e722fe5ae9f42374ff9df2995e5b624e78a534c078534c341d034f984f73fc5c3abe954166ba8ef0f3fcc6aff2fbf06 SHA512 aa85e5d5ea9a1413686d8903af4c2c310f504ba0fc1ca469253010dae7a2abbb434b5d2e59f18b1a22f1149cfaade4b942466973e9559b913146abdf3b191155
 EBUILD cython-0.29.23.ebuild 1952 BLAKE2B e8d88577efb70db3f75a7c0068bc1b9659132bde1927c3a50a92822020d6d575761ccacd66f2efea021570439c5c052cb352834071d8ef505247ba427d045da9 SHA512 cc6643d4a19a075e0e54184775596251060bcc9b73c6b9d6a26564c5588ab81734d30127c42b723d3c1e62d9afdc5f268dddf1a26df5c138634b9cabc5caca44
 EBUILD cython-0.29.24-r1.ebuild 1932 BLAKE2B a2ecc222a291fc50a5e8f6f6149a7702b7430cf413a34ec748a62520098c755af92e6f945bf47df0a3be80faca57a21baefd7da6c6479a8abdc6462ba9a8b7a2 SHA512 6d1b1c269003c998d6fb2b326e58efd0bd434d494d9dccda5fbc0512b9e75c3f2be0a677a9b42755141a642dcc06f5eada7b7c7f16c5557be1d797be45a80115
-EBUILD cython-0.29.25.ebuild 1832 BLAKE2B 8c16b823cd4559572787a1b135050bd7cda1301e902b393b537363b4657764aa8386810b9d57fd25b66231fc47d9502be265b1bd4822170ee3020af709e95d1a SHA512 68bcd199642518860b62784d718138510cb3e0036803e856642dbbd53ef50126c2d9df17fefb16d82929f8547973cbf20a4fd73897e6adb17fe6fa90d95d3b2f
+EBUILD cython-0.29.25.ebuild 1825 BLAKE2B 93ddf306ea56ae40708fb45e7e597dd7048784becc0de6211b1d731f3b2e231f849db143b620a9652b541a54d10c07b640a8b5c01637100b3f2eb8def41191a3 SHA512 ac0701ccaaa308283ae1f244ca2eeba8f0d6024f9511f162b00ba7809b00253c6a377f66dd1a2dfe7e85a66992d279d7b997d96c4de6ec032ff98fab4d18d945
 EBUILD cython-0.29.26.ebuild 1832 BLAKE2B 8c16b823cd4559572787a1b135050bd7cda1301e902b393b537363b4657764aa8386810b9d57fd25b66231fc47d9502be265b1bd4822170ee3020af709e95d1a SHA512 68bcd199642518860b62784d718138510cb3e0036803e856642dbbd53ef50126c2d9df17fefb16d82929f8547973cbf20a4fd73897e6adb17fe6fa90d95d3b2f
 MISC metadata.xml 606 BLAKE2B 1ee3fc75852383aa0618afeb7521c3ae0e95b518c85b2c58ff958905092cf68017d313a09d25031a50b649f9dd1b452e751036f2552df9d91447baaeff0a8f0b SHA512 b7917c2e417cee9e59c8011246f7223f5095c87f0294ea140dbfc8fda0b09cf61c9f055380a9d3f74a07e71bb49d75f219d6224ea95f1f4d4b451e5688c13f78
diff --git a/dev-python/cython/cython-0.29.25.ebuild b/dev-python/cython/cython-0.29.25.ebuild
index 0c107a31d2b0..9a05a3bf7890 100644
--- a/dev-python/cython/cython-0.29.25.ebuild
+++ b/dev-python/cython/cython-0.29.25.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="https://github.com/cython/cython/archive/${PV}.tar.gz -> ${P}.gh.tar.gz
 
 LICENSE="Apache-2.0"
 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 ~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 ~x64-solaris ~x86-solaris"
 IUSE="emacs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/ddt/Manifest b/dev-python/ddt/Manifest
index 6632ccd5a5d1..3822e23aa96f 100644
--- a/dev-python/ddt/Manifest
+++ b/dev-python/ddt/Manifest
@@ -1,3 +1,3 @@
 DIST ddt-1.4.4.tar.gz 18527 BLAKE2B d83df38dc54197063418eacad242269bbc130a8dbac61a9b0dcf473ca1e9fe0f4101f8f96839d81acd1e16d9386870c108dc4aa2c3e206670360fee6066e9e59 SHA512 a7cb4565254d47aeaccaa98cc1bf5a605d5dc323b7f15130d16f6322af3d084e5fae34da5e793be1d197b1ca6213306ab1a907277982766ba38bdfd20f53ea59
-EBUILD ddt-1.4.4.ebuild 640 BLAKE2B 02b40a061eb40f5c7dbbe9685a95b3644deb0552aa90fa5b9ae42ca415d6afdcd3e58a1bdb9bdc1838a3a64163b8b6ca21a98e2529242ca13045572a0b06d106 SHA512 88258dfc16150a30841a38d19b4c54199ce8594c086a3220ae0e84705cc25320389fedc977c2f26a0e7950d6dd2e99dc54d9b0bb3b3d8facb62dbd255d1bc59c
+EBUILD ddt-1.4.4.ebuild 638 BLAKE2B 8388f5257f11334290a4428484a08ca4d07155d1b4bb40a725dd412721d0db3f27628a15c7dc875afe291b81c848e00abd4d9987072b313e3ad4cea362faac72 SHA512 f79b1229544af846fb4744e06f5c9c56c2ad3299a26f61d1e9bd4e7cdf5e497f6316277fbeb928c6713c9e28bf7ca0e7692ce3dd775ccb8fce9d132bc1a7012b
 MISC metadata.xml 637 BLAKE2B d7aca1ac2fde8171ceb8fab19b6be2f32125d3ceb411adb504e66a024bbaebb3be0234f17ea0c07073c647d4e613cac889cb241c49ade87f168218056fb8afee SHA512 7416856917a9b619b7884f9a8fde9fb30ee03223e9c8dd45920c43f296a469ee70d79ba999bf495d97ac41d310d17949674f87c0d365ac940eae37aca2ef8d94
diff --git a/dev-python/ddt/ddt-1.4.4.ebuild b/dev-python/ddt/ddt-1.4.4.ebuild
index bf36dbe2687e..88b208f9e859 100644
--- a/dev-python/ddt/ddt-1.4.4.ebuild
+++ b/dev-python/ddt/ddt-1.4.4.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 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"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/decorator/Manifest b/dev-python/decorator/Manifest
index b54265e004d3..3be022dc963a 100644
--- a/dev-python/decorator/Manifest
+++ b/dev-python/decorator/Manifest
@@ -1,3 +1,5 @@
 DIST decorator-5.1.0.tar.gz 34900 BLAKE2B f6f4964411a31ac0904a98ec9b9e172012bd1b769122241bb0220a217da007baabe4f9173fa2283a46e25485c42910283d0e0dfc88b4bc3b68f5683448ddf84a SHA512 4acc0967af79f61c56adea3084c4e9f9de1c34fcbc7906db4bb1b0759e07ffed6eff0e4b21645dda5f37e96662742621f3d043e8c06a401841c7199a915afe18
+DIST decorator-5.1.1.tar.gz 35016 BLAKE2B 0e38ee2dea6793d489f5c50692549022f1b252ab3a7b75da5b785f856b7f18faaf5570dde2c68f6936c11460599839063e9eb8a133789a00f683761393a5103d SHA512 584857ffb0c3e52344b473ceb9e28adfd7d789d480a528471f8ab37be055ebe5feb170f41077010e25350e1c311189d45b90773cf12f0043de98ea8ebcde20ab
 EBUILD decorator-5.1.0.ebuild 644 BLAKE2B 880225329f8c7e8fde7b6ab747677d99fce669a9f86470bac227c2feab7004f8b0c26bcebe5425d75e751300c764081893ec5b926029648d67fd7564f1441063 SHA512 b12e09620b449240fdf4ca634e524d201ac8c45770bd96608f48a295e18c59fb10f9d2f4201d95c43c820b4534dc3c3a3a6e5fb259ff134607d2bb010ce44c14
+EBUILD decorator-5.1.1.ebuild 652 BLAKE2B 0e1fd6ce3caa346213fc693e8af0147dbad89f049b437a6c78a200a2c0e28d36776cdc8a8bbe27f230182086a8adabf18b53d57771c36c4850ffb5b8276c746e SHA512 ae6a3bbfd6e12575323b7a331bd8e07dc27649f20cdb566f1d805bc480cc26cc83d1aa4895e285cdb9fc5e8b46e00b8f1b0c384785928ffb68ac3d9ee8905fba
 MISC metadata.xml 756 BLAKE2B 231d25578555eda8a5f6d5598dafdebbb3695656eff92178f664eb29eee5d9f18f82235c40d974c58959aa1f4692d4818edca6c640f146520186cf5390cd21d2 SHA512 a9d79d6dd55a349e41d861f1c4b2526c8bc71261fc5ea796675ebed8a9389b3945da86814acbd0a67edd4379dee36b4d99f2cf788fba5d2eadf77e87f6c0dde9
diff --git a/dev-python/decorator/decorator-5.1.1.ebuild b/dev-python/decorator/decorator-5.1.1.ebuild
new file mode 100644
index 000000000000..8a219708d389
--- /dev/null
+++ b/dev-python/decorator/decorator-5.1.1.ebuild
@@ -0,0 +1,21 @@
+# 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
+
+DESCRIPTION="Simplifies the usage of decorators for the average programmer"
+HOMEPAGE="https://github.com/micheles/decorator https://pypi.org/project/decorator/"
+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 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+DOCS=( CHANGES.md )
+
+python_test() {
+	"${EPYTHON}" src/tests/test.py -v || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/django/Manifest b/dev-python/django/Manifest
index 5b2957288f7a..e58da6f3e627 100644
--- a/dev-python/django/Manifest
+++ b/dev-python/django/Manifest
@@ -1,16 +1,13 @@
 AUX django-2.0.7-bashcomp.patch 1507 BLAKE2B 8aeb494087dbccffc69ad43f370e791d9fbfb1908d45f55d5f8be01ec0f3af6b2aff591da84a06c0858fecd44180579a4647d622ef57d8235ccb4b3b80fd3a2a SHA512 5a3867b8e4f2fafe4c53a741d41e8c6e8e28a55463f7d8007afd669a04daa8b93f911e4ef8d5ad38ba300558f21ac8090b00337d0c0bfb93b2aea73a179334a4
 AUX django-3.1-bashcomp.patch 2085 BLAKE2B 36a0aa4d3413f13089ac104f5d3f98ecbb152a9a5a35f8c1ff2e5ffc9824153b0ac89f1cbca76c31a1afefde471e4d6ed801e405551b25cb31da89c20f3019cc SHA512 82dceede4292bad6e3e4966a6dba01bd2bbc7db494fce592e25dc4a64236485d88d8ad67b247239a80f8fe96dff054d20afea6f48a5518b67cf88404d399e61c
 AUX django-4.0-bashcomp.patch 2021 BLAKE2B f04c83b500a92ea8ef9609225191e38a41b3349a295beca8f8575ab05395d0cf37e1aefe295004b11c1bcf34cce9074ac7d274034cb50e1ae43e2fcb5d6952b2 SHA512 2215dca4120023b0fd839738bd602443c49e9adaa98d182bc74081ebe70613649c2dc11e2b5f6242701dceac25755adb8605774895091360b56ed1195a7e629e
-DIST Django-2.2.25.checksum.txt 2556 BLAKE2B 81743dc51043d12af7dce1f70190a1e53a6be7a8ae6f34fe10fa713321f8d432119f6e4e58679866a8d61dbe640c8c18d97dfa9a3767bbafb5732b9619ecb475 SHA512 1cc2982c3ab83c4af47adad14a07badc301f1b03640c34ac043ca663ac0e8c3c0a9c4de8ebd01e29f2e2c8441ae29826c91faa8f1d4e6f6824e7c849a868ddf7
-DIST Django-2.2.25.tar.gz 9185326 BLAKE2B 54df79f3ee75d588cdf46c931a53331894bc113563d2e472cf5472ba66eac1ed62f9e54798dd726837be2ef9598ed20936dbe5e3ff395249e7011af3d551e672 SHA512 c3d377c8d1ce54c93477615cff1cc74fc21791bc9db6b059787e07d0bc25b4d0c1a5804bf781d45ebba1f5f5c280957cff2bba063fea4fc005a1e945b9a7fa8f
-DIST Django-3.1.14.checksum.txt 2556 BLAKE2B bb17e596d076489ac00b6b3eb98ab2949692a82fbc542537f3758c2a53ea4aaeca15bf00c49b363e00d32c2d6face05e6b6e07000219cb8e5ceea2f9d9918ec2 SHA512 a0dd1e9dd739e6891435a02ce4711560c7f0c869a04d540fdb1b90d2cedfdd7d9892e442fb991c4f4cb8ca1862fd8f3a55d88a10645ecf0178d1ea63e17e8e89
-DIST Django-3.1.14.tar.gz 9659386 BLAKE2B 5e9317e777e3879f2cea3eea98018884c073eed47c3da9aab09858bc0869f4f34f48d20860c32344446498879b6c9b5cb9d5ba12f0528b703436a2c37325d286 SHA512 5356f453e23a33092221137769a594608771c5832c0dc00453e571fee056438b5366eba720b1fefa33099356980ee56a9665fc6ed7c86f5412e45d6432940e64
-DIST Django-3.2.10.checksum.txt 2556 BLAKE2B cdc1b28f213e43b27b0534587b8475bd68979f3c179357a7978109fa85ee0a4bbd5d0bba4625e6850aca603f688483dbdcb102a7411e74394079d2b0c0ef767e SHA512 852f867a5a11f11f98710cf27fdba2774de537dbe1e5edc402214acb65a6e00bf05a7b4fe5eb663cc21aa6ee9da890d7c74172a17c1b084db89ada1ff1db3745
-DIST Django-3.2.10.tar.gz 9811341 BLAKE2B a2ed3dda0d88a884443cc07446921fcd9cc9f302b5f578910f2e4027f8d87b92717bb22a7bf73cdb44fb7ddf4c178349e31eee6b796a45727356cde24e41d318 SHA512 6b793a1e544ab988d909d9fc5152d9dbba864c4916bb1f703a07c72f1a945ba93ba53b2f8843b67a16d0e68a736c43faf2f3d8aaa0867de1668c3845c24da7da
-DIST Django-4.0.checksum.txt 2529 BLAKE2B 0488acaf4fe37c99e3bd2370d47c47db81ffcad961212a88e7d53349299fdb3cbdc4a10fea3729d6d2353405216b8073abe8fcb2596b845760f16f2539ba4417 SHA512 26ac6ce6118d60d7bd0f0ef4c24c590eef7a102f546c3163000ad392d8f64b1c24648b8a4110df81170d60e3528466ceae974d408a700cf238dfdb8f9386d1ce
-DIST Django-4.0.tar.gz 9980403 BLAKE2B fb3cdaa8beae6983930d1e2760d617f1a96e52d7f538269709b07cc31ef049511b0517c1538934cf9ede5e374cd466df05ebabe29f1f8fb8c4c3928e8a08a1fc SHA512 6fec0521ee7da209f3b0fb1487ef4e8ef16bf3bf4ea108efc7a2ee3a9d28c7c33e5e3b2bd92e231641b0be902b45d1fd8b712c48a33496ae2c865a3698b25e14
-EBUILD django-2.2.25.ebuild 2676 BLAKE2B 0c278d54063d1fef974e72611a50fc3973c8dffff93c3d2b62d72f78dd686c100ff19cf8768487177de46f66a17b39c40d2ef7e92afc960f363af19c1c55d259 SHA512 5771facbf2515fe895a28e4efbf1b7e95b6b7f98835aae5defc4c7a04dfdaaa60de4f37dfef69c90a33e292802f85eb89ff57b16978cca6db202748e44307792
-EBUILD django-3.1.14.ebuild 2771 BLAKE2B cb8c69f33caeab2452657c4354120dd5b662557291a223a6a260da8db1b82d0a57ba8a4f9cafe17de0a91d4433f07c314c5730763a149246c699f177214755ff SHA512 af2ff5a64329854b87edc3509bc5fd681ba8bbb7d0db9fd0ab13844d42b2e5d3eb0101a277e0dace6b15aff651713b9060ea2e6dc5fcb24350020316e3feeaf3
-EBUILD django-3.2.10.ebuild 2896 BLAKE2B 10e46ab3e1c6443c7ac115c505fa6e0dc4fdf2fe78feec35c5050ef4751fbcc87159758b36855506a354eef1eb1c4e58f8c8398dfc65b8f3fde2b025eb5c159a SHA512 5fde5a41a754164b72282e18376bb1043ffeff4df808a80c2dcdd225ef91caad57937b70831290fa13c4f7d2306f62e93c1c6df37faf0551a5bb30fe328614f3
-EBUILD django-4.0.ebuild 2960 BLAKE2B 0188adcaf76b4197443e36fba4797a853da2b3f0df773bb47745b9dc90735a8834eab59b2a30ba59db25518c8d9786cf140ef22efdf98c51e3eeea1d003237c8 SHA512 b3f11eec2f4a8e25e017ab6cdb3de8d4850943c7b88a8d75a02e88f49cf4affcb48b0e990925daf34b98794b3088de9caadd08aa963aeffbadaee367458d7b89
+DIST Django-2.2.26.checksum.txt 2561 BLAKE2B a974c7d5c8cef76e781e4fa1559725cc7d77de3d16b08ec20d034b38cb39a986b62397532bbc81d4414b3eae8a5487a9fef9615eed73946a54a2b43cdf34a6ad SHA512 7c1d3e04913237ed0dc9955eedd02cfb5113b9536ed0b471d873269ec82099561714a061b74bf212c2e99bbe47e6cf72e639358a2f9134f751fdd7cd53e6ce17
+DIST Django-2.2.26.tar.gz 9207984 BLAKE2B abd520bc5681b8450e51c4248eb97558daa6a87f74915bea8857843a5ea9be6bf3a04c9f5871c35d2076adb644da266c7b88ac39bb2837ff1eaa71f885bd08bf SHA512 2005b081e7347f6f8fd4837219043bd1728cd85aca00c62a16432f63272abec7d30b7461675708fa0f55e3273af5bbd67c26d31934f8a4a38f48e65ea721916f
+DIST Django-3.2.11.checksum.txt 2561 BLAKE2B ece4f40d4d368e2e5ad3cc3ed6072aa8d1693b47d68b76020059508bfc10a30f6291f5e84c68bb959fa973c4e060bf4fd408beefaedc13b68e81b721cb78aab3 SHA512 4f2c12088cfb69f547ba687e9cac34b68a9bd28c793482430bda078f51e780b1272de7ec7816dc31d2fa93bf1c68973f847d67c01414fc8bf07fa6f6ea09dc39
+DIST Django-3.2.11.tar.gz 9821958 BLAKE2B 8f83db578e31c3cbeca67bd826b4c639b346e449de83aba6ddf6bf4eef1fc58ebcbbddf91227012e592516d7796d9f3cc468ae4ce51d684b4aa0a417bb39ddb1 SHA512 ea1ca9a76afcd7e20d0ce518efc0497bbd11f4ab7ed20bd4490561bfcfc6c80db8922a22d8aca94c1dc2743e7366b28a0ae76c3d64f55afc142c38a744dd5120
+DIST Django-4.0.1.checksum.txt 2552 BLAKE2B 123a613af7ff1ccb423c11086501a4419d86cf07c0ae7a4751f12d32f1592916e72e3e47cee13192944a3fc05ce5ee7ac81038118e346545536f313a10783de6 SHA512 979a7c5efafd4d8923d6c769ddd7d73c67482c33fd1a76c64d75aee0a03399e35703e7cbde9f5ad25baab969c33ab53690400e39c879e54066a146944e5d0ee1
+DIST Django-4.0.1.tar.gz 9995484 BLAKE2B af05ec1ec1d079e383efc590de78413b7fd769e7f03c5d4bdcfd26f193a46f783b4c3428558f5d3281cab9a7fa8be4cfecdc4edaf1bea72f37e8e983b3c061f1 SHA512 7753c516b080c10673c3a95e8ec4af00984aeed5f288e4d6e7ab1efd461222a343701b21cfd27bc61ee4e63df5ce3f3be49398490a995f6839e63b40c3fe306c
+EBUILD django-2.2.26.ebuild 2676 BLAKE2B fac142da15bc8f27726191808b107e7e49be0d68d779259ce4a1730aba104d3fc978292dd8c5ce7fbe9020a802eedad02d5cf1c50e6cbb314e540a254f78e2d9 SHA512 a7cb898618b31a624561389e19fd318bfa9afaf7609e9fedf1d049b7f3dd99b45c39d619d0db3c895f305dac09ac39c33c947cb60422908c394a2a31690d8a8c
+EBUILD django-3.2.11.ebuild 2896 BLAKE2B e152a21beddeb46f0b5ca0210bf362fb4eafbd8ac1152964bab008d4fe47d7c250e6f8d082055797a89c0ef34a9fe1137d9f9fe46a45376c53ba433d78fd5e60 SHA512 9a0788fb8f1c916d79871eeb24b67e8f9fe803db707533994e3087c641e430f6eba308f95775b4006f06b7576bb5b9a19c9bf906c4f50cba1f54fd281331532b
+EBUILD django-4.0.1.ebuild 2960 BLAKE2B d04166c92cbcd1fbd20884f198d3dedc26215f31501d17d10dabd240302a96be117a4b793af6161aefdffe82d2a23de9c2f5d445d00519fbf9bfcee5d7d39dbc SHA512 6dce1aa3cf814809d01b6c69a02d6f2c979d4755c709b606106b62ed4f71e0883203f50bd1ef0b12d0d8a135ca89d57da2ee27855a068b0b427e753f1be36bec
 MISC metadata.xml 400 BLAKE2B 6b3414ac734f078d90c82b44edd2f9f70e494e98da8a3d874d18006ae5e0eb5f7060b98b402094d6045e800bf525586f2566e6f554a8b2999cce37bdcc5472a0 SHA512 1cf0bb6ef93da3abbd1a66878462b1b8672a9b8fccd7f968b427e429caa6ecf30cb703a6060d621ccad1ba77b927d2b0e632b04b0a47975918ccbfcc5f2b85f7
diff --git a/dev-python/django/django-2.2.25.ebuild b/dev-python/django/django-2.2.26.ebuild
index 3736087882ce..6f0e46e6ba74 100644
--- a/dev-python/django/django-2.2.25.ebuild
+++ b/dev-python/django/django-2.2.26.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
diff --git a/dev-python/django/django-3.1.14.ebuild b/dev-python/django/django-3.1.14.ebuild
deleted file mode 100644
index 1acd30dd125e..000000000000
--- a/dev-python/django/django-3.1.14.ebuild
+++ /dev/null
@@ -1,95 +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} )
-PYTHON_REQ_USE='sqlite?,threads(+)'
-
-inherit bash-completion-r1 distutils-r1 optfeature verify-sig
-
-MY_P=${P^}
-DESCRIPTION="High-level Python web framework"
-HOMEPAGE="https://www.djangoproject.com/ https://pypi.org/project/Django/"
-SRC_URI="
-	https://media.djangoproject.com/releases/$(ver_cut 1-2)/${MY_P}.tar.gz
-	verify-sig? ( https://media.djangoproject.com/pgp/${MY_P}.checksum.txt )"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="BSD"
-# admin fonts: Roboto (media-fonts/roboto)
-LICENSE+=" Apache-2.0"
-# admin icons, jquery, xregexp.js
-LICENSE+=" MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~sparc x86 ~x64-macos"
-IUSE="doc sqlite test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/asgiref-3.3.4[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	>=dev-python/sqlparse-0.2.2[${PYTHON_USEDEP}]"
-BDEPEND="
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		$(python_gen_impl_dep sqlite)
-		${RDEPEND}
-		dev-python/docutils[${PYTHON_USEDEP}]
-		dev-python/jinja[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pillow[webp,${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/selenium[${PYTHON_USEDEP}]
-		dev-python/tblib[${PYTHON_USEDEP}]
-		sys-devel/gettext
-		!!<dev-python/ipython-7.21.0-r1
-		!!=dev-python/ipython-7.22.0-r0
-	)
-	verify-sig? ( >=sec-keys/openpgp-keys-django-20201201 )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.1-bashcomp.patch
-)
-
-distutils_enable_sphinx docs --no-autodoc
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/django.asc
-
-src_unpack() {
-	if use verify-sig; then
-		cd "${DISTDIR}" || die
-		verify-sig_verify_signed_checksums \
-			"${MY_P}.checksum.txt" sha256 "${MY_P}.tar.gz"
-		cd "${WORKDIR}" || die
-	fi
-
-	default
-}
-
-python_test() {
-	# Tests have non-standard assumptions about PYTHONPATH,
-	# and don't work with ${BUILD_DIR}/lib.
-	PYTHONPATH=. "${EPYTHON}" tests/runtests.py --settings=test_sqlite -v2 ||
-		die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	newbashcomp extras/django_bash_completion ${PN}-admin
-	bashcomp_alias ${PN}-admin django-admin.py
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature_header "Additional Backend support can be enabled via:"
-	optfeature "MySQL backend support" dev-python/mysqlclient
-	optfeature "PostgreSQL backend support" dev-python/psycopg:2
-	optfeature_header
-	optfeature "GEO Django" "sci-libs/gdal[geos]"
-	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
-	optfeature "ImageField Support" dev-python/pillow
-	optfeature "Password encryption" dev-python/bcrypt
-	optfeature "High-level abstractions for Django forms" dev-python/django-formtools
-}
diff --git a/dev-python/django/django-3.2.10.ebuild b/dev-python/django/django-3.2.11.ebuild
index f3ebf76cca94..497bdd348c2e 100644
--- a/dev-python/django/django-3.2.10.ebuild
+++ b/dev-python/django/django-3.2.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=8
diff --git a/dev-python/django/django-4.0.ebuild b/dev-python/django/django-4.0.1.ebuild
index e75b65ed859d..69f33e23fb87 100644
--- a/dev-python/django/django-4.0.ebuild
+++ b/dev-python/django/django-4.0.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=8
diff --git a/dev-python/dns-lexicon/Manifest b/dev-python/dns-lexicon/Manifest
index 8061816f4a38..1c3c61b092cb 100644
--- a/dev-python/dns-lexicon/Manifest
+++ b/dev-python/dns-lexicon/Manifest
@@ -1,7 +1,9 @@
 DIST dns-lexicon-3.8.3.tar.gz 7834913 BLAKE2B a72b356d10d0af8367ce9d51d2c4d4a3a1cc8aa26d5edfa2cb1aca4b2eb67acdcadc46f46d5457430708f94fda9654a87ded76fa796c44a4b4e2a0d4f3accd13 SHA512 3035e9c5d073feb0dd910b79d8de02f2e9bfc81f922bce34ad33c22b583896a781e50f85104799a13133121ab5e88a372667cf0014399df50c5a829747d98073
 DIST dns-lexicon-3.8.4.tar.gz 7850337 BLAKE2B f72a338c00346091df2cf53fa01cbc34e81b235cb5100b4993ccf46f738e2588b08b7a57316c07c7eff1c039437e49371193c9952b6fd870f30a2c6b538d3e1e SHA512 7a598b38a847e384fda243b76af523701d80d84a2338ef5745ca9f82284675ace5f84bf93cccfeda101584194c15fdbd0d4d8f69fdd0db60ec42d4c063a7916c
 DIST dns-lexicon-3.8.5.tar.gz 7850115 BLAKE2B 27dfb837385e370142d82bc682627fa96efc8a4868f9a5532ace608e2739afbecee82dcb531e9a4e0cdf9b2c68e639ae5c7ad1f4774e80f989c13eaa86c93d7a SHA512 e50fdb5c0b0d250babaff0a2d485f9112732a9e975cb853329dbcec33fe592e80a28c469b17cc0a5544909285805c1c20578b5e5f4b22ff6259b624be8c6acde
+DIST dns-lexicon-3.9.0.tar.gz 7843652 BLAKE2B de6339c8f739d00aefca831adfccaed3914c0d9103e7dd5a175215761a27e29eca3c2e26c08239df2e6a34afbe7228013cab7123572c6481ed4e31fa2a20236d SHA512 4bc26018e0702345e86fa352eddff89358b34e878864e6273e89798cce81c4ef9e4ff06a1298481c8496237bb26d8d7c3286c82aac99117a49faa64ea329c307
 EBUILD dns-lexicon-3.8.3.ebuild 1614 BLAKE2B e4491c94ba6fcd657c124325374c1adf65ed6fd14ffff2362335c9c3821fc640c18454bbc7d817930e6aff2cdb0a43fcfef80685b95ce471b6dc3abb0135ba1e SHA512 ce2f6bb1dd6bdfc1636efc74d98e910364f804f2e7a13955138a0f07bd7aac50ada97ea66bd862cbb93fc1882a3b4bfcc9ed4fc03675588cb44253154413685d
 EBUILD dns-lexicon-3.8.4.ebuild 1614 BLAKE2B e4491c94ba6fcd657c124325374c1adf65ed6fd14ffff2362335c9c3821fc640c18454bbc7d817930e6aff2cdb0a43fcfef80685b95ce471b6dc3abb0135ba1e SHA512 ce2f6bb1dd6bdfc1636efc74d98e910364f804f2e7a13955138a0f07bd7aac50ada97ea66bd862cbb93fc1882a3b4bfcc9ed4fc03675588cb44253154413685d
 EBUILD dns-lexicon-3.8.5.ebuild 1614 BLAKE2B e4491c94ba6fcd657c124325374c1adf65ed6fd14ffff2362335c9c3821fc640c18454bbc7d817930e6aff2cdb0a43fcfef80685b95ce471b6dc3abb0135ba1e SHA512 ce2f6bb1dd6bdfc1636efc74d98e910364f804f2e7a13955138a0f07bd7aac50ada97ea66bd862cbb93fc1882a3b4bfcc9ed4fc03675588cb44253154413685d
+EBUILD dns-lexicon-3.9.0.ebuild 1614 BLAKE2B 251f0f664ff2c63515d8c18b704399f9600cf7730a3e93349fc40c5159411d6d4a90858d17aa4ad3ccd90ee831139a1ab1e9ba4819eb058f9df1cf2dcde78ee5 SHA512 810fae393f72752a98df4e82963e1d6bcdc79fd064c87cb0739620fb893c073c98a3cfbf9862859c07423f5f2067f6b3e05073051ec8e094412d306ff80160d0
 MISC metadata.xml 541 BLAKE2B a22266eac0bc7b4c22d9552cf64cbf88bbc1c2953e3ef0daaf059b81519909e0f8808e0d74cec6db3296e43f98082d57b8ae3779d694432e8578112ac18c3ea6 SHA512 79e2b43a685bfcc8dace1faa1c1a08cc648b39a3fef2834a57b6e801f72e7309276604253089db7a2fbe1d5d776b2ba1427c90a9cb9c44a0c1b2812d4e1901db
diff --git a/dev-python/dns-lexicon/dns-lexicon-3.9.0.ebuild b/dev-python/dns-lexicon/dns-lexicon-3.9.0.ebuild
new file mode 100644
index 000000000000..ae7ae0b978ff
--- /dev/null
+++ b/dev-python/dns-lexicon/dns-lexicon-3.9.0.ebuild
@@ -0,0 +1,58 @@
+# 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 optfeature
+
+DESCRIPTION="Manipulate DNS records on various DNS providers in a standardized/agnostic way"
+HOMEPAGE="https://pypi.org/project/dns-lexicon/"
+SRC_URI="https://github.com/AnalogJ/lexicon/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/lexicon-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/tldextract[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/boto3[${PYTHON_USEDEP}]
+		dev-python/zeep[${PYTHON_USEDEP}]
+		dev-python/vcrpy[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_IGNORE=(
+	# Requires the "localzone" module
+	lexicon/tests/providers/test_localzone.py
+	# Requires the "softlayer" module
+	lexicon/tests/providers/test_softlayer.py
+	# Requires the "transip" module
+	lexicon/tests/providers/test_transip.py
+	# Requires the "oci" module
+	lexicon/tests/providers/test_oci.py
+	# Uses tldextract which needs Internet access to download its database
+	lexicon/tests/providers/test_auto.py
+)
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		optfeature_header \
+			"Install the following packages to enable support for additional DNS providers:"
+		optfeature Gransy dev-python/zeep
+		optfeature Route53 dev-python/boto3
+		optfeature DDNS dev-python/dnspython
+	fi
+}
diff --git a/dev-python/dulwich/Manifest b/dev-python/dulwich/Manifest
index 723090a86447..41fd3a63c9e5 100644
--- a/dev-python/dulwich/Manifest
+++ b/dev-python/dulwich/Manifest
@@ -1,3 +1,7 @@
 DIST dulwich-0.20.23.tar.gz 414150 BLAKE2B 0f7bfb237acc6bad874465a5bfed21adc29a2ef23875fbcbb92e7e3ff0ed6a4191a30b3975f90ef20b8320575e42abf31f8ec2199d558382c917d0510c2a8d96 SHA512 8bad3528dc87e70b39b59b2f7218579327db4dbd15937b63db76c9b8e7ba6d22e963eaec45b8d675c92f250516a541c395fdac391db68d0932dc5d8cd7ed9fb9
+DIST dulwich-0.20.27.tar.gz 416618 BLAKE2B 73ed04d9fc871a82126e212bdac0eaf235e44aa76f3e54c98bd50f71379fdd3082b2a3af12a22f3276a45909ef17e38a116deb6adfd650cdbfa19afa41803dd1 SHA512 dc82250c5b3cbccc1ccbb55ca2d871f4d17ddb3616cd92146468fc5f0d805d3fe349b2cedfb4e814e027c07f9352e87c72ca7e97ed6218aa621fa9311dc075c5
+DIST dulwich-0.20.28.tar.gz 416723 BLAKE2B ddbb36c65e1372e1c2fbab5d85ef26a77f40e4763eee8dc5d2ba249a6b4e37bd6e38197eaebbcb46f16df577c0ff4730ec69fff39a549adf2e5d147e7a3eabfc SHA512 5eb90dd888909f787ef5e9f0a79d7db9a31c5897e334a862c1d0593c4f115ff30047f108c7b315e0145e267f581ba0f4fd0fafb7b1b2316d3def4f70697f2e20
 EBUILD dulwich-0.20.23.ebuild 1588 BLAKE2B 8f042ad848f62019a8522e80d50698015fcf0a0a88eade0368a04c1daa3e6ba129d41e70fb967b3bc5b3fc49b0b034bb6c6e315e29fd010a761e0f1fc2c138ed SHA512 3304d877079090d89300bba68e08b6b9bebe98fc10d30c184d7b97c42bc3b48e040fda9ed7cea6568a585eaa37eb67189e069cc529e8b87e53e6f549e3a297a6
+EBUILD dulwich-0.20.27.ebuild 1592 BLAKE2B 37af2761b526bb4d41c4708fc7c237822bcf4027ee0c47773960e033e6a5e844be6ae8590de5148a0365a6a9bd7ad4c8bbbcc14e26a3297d0aafd2654cd7b3d6 SHA512 1f2f03fff9e1198897cc07c3e618e794b6da173aa182f6fa62686e216cd4bea1dc72af3dbca5892e63acd8c4c0212a9adfcd77f9c66a4f56539f9cb658cee2b5
+EBUILD dulwich-0.20.28.ebuild 1592 BLAKE2B 37af2761b526bb4d41c4708fc7c237822bcf4027ee0c47773960e033e6a5e844be6ae8590de5148a0365a6a9bd7ad4c8bbbcc14e26a3297d0aafd2654cd7b3d6 SHA512 1f2f03fff9e1198897cc07c3e618e794b6da173aa182f6fa62686e216cd4bea1dc72af3dbca5892e63acd8c4c0212a9adfcd77f9c66a4f56539f9cb658cee2b5
 MISC metadata.xml 558 BLAKE2B 72c574d6eb1a3d94686fe9aeeb53fa8d96532f4477ee94bfcd6c0dd3e0d6fc9e313dba9642b68a57ba0b38830fbe1f8d953c3ae79bcafcb6bbf6eba0e35f61a1 SHA512 de70aed32ec0b362668a6fd33d8be5251d57048bd6396e09608f040fe71fe8e3262f1c96fbc8058ea776e09a59ac465652f4f7d778fb4e3933c7fea4bf64d7f4
diff --git a/dev-python/dulwich/dulwich-0.20.27.ebuild b/dev-python/dulwich/dulwich-0.20.27.ebuild
new file mode 100644
index 000000000000..e282dc27d571
--- /dev/null
+++ b/dev-python/dulwich/dulwich-0.20.27.ebuild
@@ -0,0 +1,55 @@
+# 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 implementation of the Git file formats and protocols"
+HOMEPAGE="
+	https://github.com/dulwich/dulwich/
+	https://pypi.org/project/dulwich/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2+ Apache-2.0"
+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"
+IUSE="doc examples test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/certifi[${PYTHON_USEDEP}]
+	dev-python/urllib3[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		!hppa? ( !ia64? (
+			dev-python/gevent[${PYTHON_USEDEP}]
+			dev-python/geventhttpclient[${PYTHON_USEDEP}]
+		) )
+		app-crypt/gpgme[python,${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/fastimport[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_sphinx docs
+
+python_test() {
+	# remove interference from the tests that do stuff like user.name
+	unset GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_AUTHOR_DATE \
+		GIT_COMMITTER_NAME GIT_COMMITTER_EMAIL GIT_COMMITTER_DATE EMAIL
+	# Do not use make check which rebuilds the extension and uses -Werror,
+	# causing unexpected failures.
+	"${EPYTHON}" -m unittest -v dulwich.tests.test_suite \
+		|| die "tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	if use examples; then
+		docompress -x "/usr/share/doc/${PF}/examples"
+		dodoc -r examples
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/dulwich/dulwich-0.20.28.ebuild b/dev-python/dulwich/dulwich-0.20.28.ebuild
new file mode 100644
index 000000000000..e282dc27d571
--- /dev/null
+++ b/dev-python/dulwich/dulwich-0.20.28.ebuild
@@ -0,0 +1,55 @@
+# 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 implementation of the Git file formats and protocols"
+HOMEPAGE="
+	https://github.com/dulwich/dulwich/
+	https://pypi.org/project/dulwich/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2+ Apache-2.0"
+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"
+IUSE="doc examples test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/certifi[${PYTHON_USEDEP}]
+	dev-python/urllib3[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		!hppa? ( !ia64? (
+			dev-python/gevent[${PYTHON_USEDEP}]
+			dev-python/geventhttpclient[${PYTHON_USEDEP}]
+		) )
+		app-crypt/gpgme[python,${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/fastimport[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_sphinx docs
+
+python_test() {
+	# remove interference from the tests that do stuff like user.name
+	unset GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_AUTHOR_DATE \
+		GIT_COMMITTER_NAME GIT_COMMITTER_EMAIL GIT_COMMITTER_DATE EMAIL
+	# Do not use make check which rebuilds the extension and uses -Werror,
+	# causing unexpected failures.
+	"${EPYTHON}" -m unittest -v dulwich.tests.test_suite \
+		|| die "tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	if use examples; then
+		docompress -x "/usr/share/doc/${PF}/examples"
+		dodoc -r examples
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/flexmock/Manifest b/dev-python/flexmock/Manifest
index 52269a2e0c47..d8847536c429 100644
--- a/dev-python/flexmock/Manifest
+++ b/dev-python/flexmock/Manifest
@@ -1,3 +1,5 @@
 DIST flexmock-0.11.1.tar.gz 48331 BLAKE2B b4a670530050098706133d531f162516163e8bed5fe867277d8d729c3afbd21747d53f17e8cd0f2f087550137c864aa8ac912cb404103426e3fdb17e98d79645 SHA512 6b5ce669e29dc24313e94b0c0c24d75e25c99343c33d787987c6707532598fb0d28df751148a4f7183d4bbdb54822c07d88ded394358545fe8d822564e1408e6
+DIST flexmock-0.11.2.tar.gz 51330 BLAKE2B 3ebeea60c19a9234a362117009610802f10c68c55885ae9dd72c16b19af19fdfbf18634bbc56a80efb0c985f0c339bab234304088dc482b0ccf937c1d7c2fd0f SHA512 208876131155dd0febc9e6aad7a6e98082fccf52573758ac9280f9f767d81ece7af425c901a4a094b3eb56bd711219a55dcfc0d7747f9060b3ad6630c37e6618
 EBUILD flexmock-0.11.1.ebuild 539 BLAKE2B 9cad4c94838d0e0f77072f9d89f879f6820235df21627fe7a2b3b2590d3fce4e36737ab574754fcdaeab42e5b79f60d6f085e7ccc40b7540dd6adedea31c40bb SHA512 aa708a3248d53a9765e23bb54ee0e9787764f7a6a63925b52d8fea444630697461fd8f3568c7bca9ba3ef0545f8fc6b6e36a9cd3fca410549c8cd85879bb4c19
+EBUILD flexmock-0.11.2.ebuild 643 BLAKE2B 92939349c6736eb57f30d41710d31ec12d53deeeb3de16ffa1385a356a9f533ca62df46730c2b3600a25a9db66263a8cc375cfaf30796cffd20f1b18f00034c6 SHA512 1cd2b9dca7731d9f52fa3371cd8c4060fe1bf799f19f80fcf9a255b55ec1bce2a89efc090809257d93e29dc6f184e9e5521cf268e618941ce93ced173b95b01b
 MISC metadata.xml 397 BLAKE2B d876f426fea0e14ea3518dcf7cf685ec697bfaa09c83b93ad7bf4ecf97dff87cf1ef491e91d759625ee9c8d7f64c4be8419024ad087acac4779a69c283dfde12 SHA512 f8694424c9fe17611fd882f205df6dbe6085b8214a4f1c26e4d5c216e3e018971f85e643a473efd330d61a7759ab9464f9a7fe6e04e2c0d7e02b1e3ce37aab19
diff --git a/dev-python/flexmock/flexmock-0.11.2.ebuild b/dev-python/flexmock/flexmock-0.11.2.ebuild
new file mode 100644
index 000000000000..db8b214775f5
--- /dev/null
+++ b/dev-python/flexmock/flexmock-0.11.2.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} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="Testing library to create mocks, stubs and fakes"
+HOMEPAGE="https://flexmock.readthedocs.io/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_IGNORE=(
+		tests/test_teamcity.py
+		tests/test_testtools.py
+		tests/test_unittest.py
+	)
+	epytest -p no:flaky
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	dodoc -r docs
+}
diff --git a/dev-python/flit/Manifest b/dev-python/flit/Manifest
index 01e42a88ed80..b582b4625bed 100644
--- a/dev-python/flit/Manifest
+++ b/dev-python/flit/Manifest
@@ -3,8 +3,8 @@ DIST flit-3.4.0.tar.gz 120418 BLAKE2B e99eb67daa9a1d8e738ff9b917117edaf7372bbe26
 DIST flit-3.5.0.tar.gz 122519 BLAKE2B 3c3eee652f090afd1c07e8a5cd1b154e7390ed621ab202ded3b4664d59ccfa2fd827928451f6d8928573d012cb9f6b44544c48540e03b2918d32ae3ba9169838 SHA512 e2239c209f735f11aeec8672aa14449fe4b6e1d2ed6523d661edb730f0b9f93b2794c6676bf878c09bd27966a9f8b9c19e6a7f14063c6efed4d8bc043b4cd2db
 DIST flit-3.5.1.tar.gz 122689 BLAKE2B 49be251df549783114c6758fa688d00fe18ed88d215f91783ce78eda722ee3d8578d83781a1a5c9ee61dd001c82df010c879dc742a1829c2ba8bcf5edb930556 SHA512 00e884774c7f59dfb54d6db09f65ac0ed47f1dd23872d6913f3a41de7242fb3829b2edacd03d08e080635c0a515521333aa74e6d26a2faa5fc02e56454b2b37a
 DIST flit-3.6.0.tar.gz 133365 BLAKE2B c4170eeded3c15a93c8e89b9483459247228136bc5ff32c6edb8cd9a4b5c3171fe381d0a1b4e325ed863457c2bce476efe3276455d5b9e4279a702dd35ed4512 SHA512 6506ecc73f9e0373e84b5b90a3d567f1edad6d95561886ff1f08f37addfc39006e75ab199c376a7d18452f6b8e2cbdd9e8f59a1fc96037702c3c682dc0b5a757
-EBUILD flit-3.4.0.ebuild 1082 BLAKE2B cc125fd9b21f3b781d6b648f034a67f11ea27c242db8b21e6e4e43fedf1c967e0bbd008b8b1ed16210cbab4ac783f0ab20703ef4003b69b61903c6e4c0bc1ecc SHA512 19b373cded16e7c9d5da02d6606bf8b19577d291186547332b55720c16d8be0376822860dfb1369b5f68f8c938dc9ea9301cd868ef6142e3f045016d445fe011
-EBUILD flit-3.5.0.ebuild 1082 BLAKE2B cc125fd9b21f3b781d6b648f034a67f11ea27c242db8b21e6e4e43fedf1c967e0bbd008b8b1ed16210cbab4ac783f0ab20703ef4003b69b61903c6e4c0bc1ecc SHA512 19b373cded16e7c9d5da02d6606bf8b19577d291186547332b55720c16d8be0376822860dfb1369b5f68f8c938dc9ea9301cd868ef6142e3f045016d445fe011
-EBUILD flit-3.5.1.ebuild 1117 BLAKE2B 2981528b0eff441668be998110681f73680733b9c060b302bcc2bfca070909fc2269e1c1ca1c13ea0ae8441acc986368b05ea4d7fbba4f2b14fc21be2d778e23 SHA512 e56ecb71887eb7f49b41add0a29c267cbdcf92e03ba89ec37fd52c0e91d578f78f6f8d87428b0889e2983515f266fd20de11e5625783d629fc3ac3425765c1a7
-EBUILD flit-3.6.0.ebuild 1217 BLAKE2B 22edae23125f25813b23d49829564bd217e3897dbc144f77e5fbca4487353421316036c5b03c029db2db5ae968ec6ddd6ecb0c0d3cf925fa4a7f151bc8b5b290 SHA512 82b85d6ded2c3b22a052e0bc050e5189d04ebad30da904f6f439a7452e048c65785b47bc9773ab2db67717c3cb49ca699b81a05ae3733486ed3bee0a8f849e24
+EBUILD flit-3.4.0.ebuild 1062 BLAKE2B 681ffd2a329ca0a9de0b3304cdb932c65110e0a0f9c782529522b8083111cb68bd1d543dd97d90b64172e9c77032b1900a6d4780bd81cea362d5523102463313 SHA512 53d0857b74f962c56db386ccb9013bf090b5ea2f39ef9196ad845318952696f64935871990ea594553721cb51522cd83d7601362043eb96dbe11d67daf5e7195
+EBUILD flit-3.5.0.ebuild 1062 BLAKE2B 681ffd2a329ca0a9de0b3304cdb932c65110e0a0f9c782529522b8083111cb68bd1d543dd97d90b64172e9c77032b1900a6d4780bd81cea362d5523102463313 SHA512 53d0857b74f962c56db386ccb9013bf090b5ea2f39ef9196ad845318952696f64935871990ea594553721cb51522cd83d7601362043eb96dbe11d67daf5e7195
+EBUILD flit-3.5.1.ebuild 1097 BLAKE2B 0af46d0abee286c9a500f011de2584fc035cc9aa65ad6a07cab71072a628d4d15a9124375ca6bff884726225eb021940db3ec8355fcbcc14e15eb7217c65524e SHA512 2803b1180f4b39dcc931e129ae5b4b490dde87983a02cfbcd1df19a839dc62e69797877d68e9a268e866570143da88f77732d3fa05ae41f8aa918a5fa5f9ea79
+EBUILD flit-3.6.0.ebuild 1197 BLAKE2B ae16f5e045d0b9b79f0b3d7038a709e23705c81bf3def9a364bcdd70bad5dcb3046b13eeac91b18c007b6fefa27bac3aca7d2519a16438c04246a987b2e23655 SHA512 78440671617715a630f885c23f1a9505d523862326d3aeffe237df9e7d5fe38f322d583400d1c11816125fc9ba7163b63d2173b0d9da6b99834f1afe78ad5f63
 MISC metadata.xml 467 BLAKE2B 534a82783fa3ff1642fc8400689549e75223fa01b175f4ac164d4a636a4c9eaef5bdd9fdd339ffc30239436449788b4d01ebc5e3609034d440c01a5c699176ea SHA512 ad8f3f98a35aa88255bafa81ea9cb109e14b8a544b053cff3f1325dfda3c4c6343a5060353c43a08e030e80a60186eb7dae248d7f6739ea95a7e72e747b1b194
diff --git a/dev-python/flit/flit-3.4.0.ebuild b/dev-python/flit/flit-3.4.0.ebuild
index 1bc9a7f33b5c..e0ffe8a26ea2 100644
--- a/dev-python/flit/flit-3.4.0.ebuild
+++ b/dev-python/flit/flit-3.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -26,7 +26,6 @@ RDEPEND="
 "
 BDEPEND="${RDEPEND}
 	sys-apps/grep
-	sys-apps/findutils
 	test? (
 		dev-python/responses[${PYTHON_USEDEP}]
 		dev-python/testpath[${PYTHON_USEDEP}]
diff --git a/dev-python/flit/flit-3.5.0.ebuild b/dev-python/flit/flit-3.5.0.ebuild
index 1bc9a7f33b5c..e0ffe8a26ea2 100644
--- a/dev-python/flit/flit-3.5.0.ebuild
+++ b/dev-python/flit/flit-3.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -26,7 +26,6 @@ RDEPEND="
 "
 BDEPEND="${RDEPEND}
 	sys-apps/grep
-	sys-apps/findutils
 	test? (
 		dev-python/responses[${PYTHON_USEDEP}]
 		dev-python/testpath[${PYTHON_USEDEP}]
diff --git a/dev-python/flit/flit-3.5.1.ebuild b/dev-python/flit/flit-3.5.1.ebuild
index a5cc9637395b..0b4c68459970 100644
--- a/dev-python/flit/flit-3.5.1.ebuild
+++ b/dev-python/flit/flit-3.5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -26,7 +26,6 @@ RDEPEND="
 "
 BDEPEND="${RDEPEND}
 	sys-apps/grep
-	sys-apps/findutils
 	test? (
 		dev-python/pip[${PYTHON_USEDEP}]
 		dev-python/responses[${PYTHON_USEDEP}]
diff --git a/dev-python/flit/flit-3.6.0.ebuild b/dev-python/flit/flit-3.6.0.ebuild
index 13ed55109146..d5541742237d 100644
--- a/dev-python/flit/flit-3.6.0.ebuild
+++ b/dev-python/flit/flit-3.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -26,7 +26,6 @@ RDEPEND="
 "
 BDEPEND="${RDEPEND}
 	sys-apps/grep
-	sys-apps/findutils
 	test? (
 		dev-python/pip[${PYTHON_USEDEP}]
 		dev-python/responses[${PYTHON_USEDEP}]
diff --git a/dev-python/fonttools/Manifest b/dev-python/fonttools/Manifest
index 8853d3581346..d9c8e76f3746 100644
--- a/dev-python/fonttools/Manifest
+++ b/dev-python/fonttools/Manifest
@@ -1,9 +1,5 @@
-DIST fonttools-4.28.2.tar.gz 2940111 BLAKE2B 32f67f2c270520d9e2091052242e504b9a8e459a87f233e22f50bfe3d17309a09a3c7ad5da20a3411df1c7c58b790dd395535407fdeddb02e7391c28d8d08fa3 SHA512 0295c571e92e71f6467b06bd89afacae76861e374147a2051fe3f5323176c3f3458b977ba2ed25cadcdba9e55b325b6febc50bc9c539d8806471730a15faed47
-DIST fonttools-4.28.3.tar.gz 2944993 BLAKE2B bac7408759ae2854023d5e6f840eb34d431daf0e14ec9fd8d4ac2ecc4ea8e473456611c3531b9131035164f69ba2363a3835206d068b71d4a2ae6ec179d2a32d SHA512 b90d05cedbd06f476c210f2961ebd11c64043785ef43fda2b81fd22126b12642ab63e51363bc22524bb18ee781fa9a8a71edb187b6c69fbf838e0c20f3c9ba0b
 DIST fonttools-4.28.4.tar.gz 2945369 BLAKE2B f178552aca7b41dcec1c03d2a7c3de17cdb5f4b2e057a75e196e78a098b9959a038a9a3b14ee8546d5ea12e3546c22d2a8d9b34a922c0822bf52f78bc03f4f54 SHA512 9ecdf4186e24a8a44c6010432d71f1689ebf8461a404dde71259eb4712c4987d94bbe31b33ad6943fb2e0105fc9f8e9032a94e6ccbb4ac01fe330bb700a39c63
 DIST fonttools-4.28.5.tar.gz 2948092 BLAKE2B b35f4be68cfc2be6afb209c2caee38f7088a1a17dea85fac0f40183b61a3eded59fab47f703587097669f8823a8dbc2e84b0df58305597784bed7f8c2e2b0f28 SHA512 5d87f4fadbcb447d1c1a1e97550f6a477d74bfe8647d14b35097e03e6a45a1a01632d2092483d675c523f97d4a04f39aa9b3175e535b1e1a4f19d619eb40ad5f
-EBUILD fonttools-4.28.2.ebuild 1425 BLAKE2B 9b49382579b1109705992110410e478991e56efb35a99e75502676c7c8a7b61e347db5ffa1dd18a0bb8c34711dd3a97254eeb925a34e4958333a0e1cd9c96330 SHA512 f4c18a02bc8a8fad2fe52a675b0a3cacf9c46f36d69854c05190280dcda515c0a8cf8299240a76bd6feadbfde6fc1ff15b049e10707fe045ee5c0f55d1246b5a
-EBUILD fonttools-4.28.3.ebuild 1433 BLAKE2B 2a02667f5d12f60c59537260cc91a2ec99f7915ba6663e78bfb374d9a00258fe377fe9e9b0995f2a0670342cd174193056caf7e62e7e443d35df133556a4e144 SHA512 d4f4356c0282a32ff1b624b664d7ec539a8e111f7186d06ba2cbdf19a46695258399261f2b0f58cbe2f77a7905798bbb2c80fa0762df472ee4a06627196dd2b4
-EBUILD fonttools-4.28.4.ebuild 1430 BLAKE2B a585ed0f36d34f40899f459715a4c919f53846b6cc7b0f787d6fd1c095f2807631302a763a79502bedca9cfce19c2fc427d71dfbb33b780a434aa106aacf1c07 SHA512 28531f9362a7d65143696e1fdaf3f13113f8864fba3276d3ac4dcc97def3f4639004f74b3b5032ced4362337943122d21fe79867d9b9600975f4950483e80c49
+EBUILD fonttools-4.28.4.ebuild 1425 BLAKE2B 4a2f7de50c982ee26701066d6f1dce56018299c7d2f0ba41c5c50eba6017277870c0fb564ec570d17dac33ce5acdefe509ab3f6fd60680f3ca08420e22140d35 SHA512 8b003d64c12b4f9dfc988f096df762305d10e0d21d66d5ae8bd98dd885a42d1525d8559709b64e36193b819ae9da7ab6a71b3c8f10d55a5394f3c069cbc22145
 EBUILD fonttools-4.28.5.ebuild 1433 BLAKE2B 2a02667f5d12f60c59537260cc91a2ec99f7915ba6663e78bfb374d9a00258fe377fe9e9b0995f2a0670342cd174193056caf7e62e7e443d35df133556a4e144 SHA512 d4f4356c0282a32ff1b624b664d7ec539a8e111f7186d06ba2cbdf19a46695258399261f2b0f58cbe2f77a7905798bbb2c80fa0762df472ee4a06627196dd2b4
 MISC metadata.xml 372 BLAKE2B 950ec78bf127250847c6513c22a5108b251afdb000d361068edf9d00d64a5baf6925ba4058bb889724febb28d92abc044c29af5936a48d8e8951b12314b64357 SHA512 03e76e28959bab83fe41c3ee4b55692ced9b1360e73e38a6e8f6e5c06fd1185dcbe0214aea2edff18d248abf252c1877d0d2c2b78b8e088e606c09c34e93e7ac
diff --git a/dev-python/fonttools/fonttools-4.28.2.ebuild b/dev-python/fonttools/fonttools-4.28.2.ebuild
deleted file mode 100644
index 1a9728384281..000000000000
--- a/dev-python/fonttools/fonttools-4.28.2.ebuild
+++ /dev/null
@@ -1,54 +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="xml(+)"
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Library for manipulating TrueType, OpenType, AFM and Type1 fonts"
-HOMEPAGE="https://github.com/fonttools/fonttools/"
-SRC_URI="https://github.com/fonttools/fonttools/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv sparc x86 ~x64-macos"
-
-RDEPEND=">=dev-python/fs-2.4.9[${PYTHON_USEDEP}]"
-BDEPEND="
-	${RDEPEND}
-	dev-python/cython[${PYTHON_USEDEP}]
-	test? (
-		app-arch/brotli[python,${PYTHON_USEDEP}]
-		app-arch/zopfli
-	)"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# When dev-python/pytest-shutil is installed, we get weird import errors.
-	# This is due to incomplete nesting in the Tests/ tree:
-	#
-	#   Tests/feaLib/__init__.py
-	#   Tests/ufoLib/__init__.py
-	#   Tests/svgLib/path/__init__.py
-	#   Tests/otlLib/__init__.py
-	#   Tests/varLib/__init__.py
-	#
-	# This tree requires an __init__.py in Tests/svgLib/ too, bug #701148.
-	touch Tests/svgLib/__init__.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-src_configure() {
-	DISTUTILS_ARGS=( --with-cython )
-}
-
-python_test() {
-	distutils_install_for_testing
-	# virtualx used when matplotlib is installed causing plot module tests to run
-	virtx epytest Tests fontTools
-}
diff --git a/dev-python/fonttools/fonttools-4.28.3.ebuild b/dev-python/fonttools/fonttools-4.28.3.ebuild
deleted file mode 100644
index b98e2fa9734d..000000000000
--- a/dev-python/fonttools/fonttools-4.28.3.ebuild
+++ /dev/null
@@ -1,54 +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="xml(+)"
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Library for manipulating TrueType, OpenType, AFM and Type1 fonts"
-HOMEPAGE="https://github.com/fonttools/fonttools/"
-SRC_URI="https://github.com/fonttools/fonttools/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
-
-RDEPEND=">=dev-python/fs-2.4.9[${PYTHON_USEDEP}]"
-BDEPEND="
-	${RDEPEND}
-	dev-python/cython[${PYTHON_USEDEP}]
-	test? (
-		app-arch/brotli[python,${PYTHON_USEDEP}]
-		app-arch/zopfli
-	)"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# When dev-python/pytest-shutil is installed, we get weird import errors.
-	# This is due to incomplete nesting in the Tests/ tree:
-	#
-	#   Tests/feaLib/__init__.py
-	#   Tests/ufoLib/__init__.py
-	#   Tests/svgLib/path/__init__.py
-	#   Tests/otlLib/__init__.py
-	#   Tests/varLib/__init__.py
-	#
-	# This tree requires an __init__.py in Tests/svgLib/ too, bug #701148.
-	touch Tests/svgLib/__init__.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-src_configure() {
-	DISTUTILS_ARGS=( --with-cython )
-}
-
-python_test() {
-	distutils_install_for_testing
-	# virtualx used when matplotlib is installed causing plot module tests to run
-	virtx epytest Tests fontTools
-}
diff --git a/dev-python/fonttools/fonttools-4.28.4.ebuild b/dev-python/fonttools/fonttools-4.28.4.ebuild
index b397a908a4ca..9735a1293094 100644
--- a/dev-python/fonttools/fonttools-4.28.4.ebuild
+++ b/dev-python/fonttools/fonttools-4.28.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/fonttools/fonttools/archive/${PV}.tar.gz -> ${P}.tar
 
 LICENSE="BSD"
 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/fs-2.4.9[${PYTHON_USEDEP}]"
 BDEPEND="
diff --git a/dev-python/fritzconnection/Manifest b/dev-python/fritzconnection/Manifest
index 8bfde1599bc3..0c14d9411c17 100644
--- a/dev-python/fritzconnection/Manifest
+++ b/dev-python/fritzconnection/Manifest
@@ -1,7 +1,9 @@
 DIST fritzconnection-1.7.1.tar.gz 77805 BLAKE2B 4012975205320cc1c65ace64f515e1a934da5e330e9f9090021f20989d300df38f042cc8defd794ab6d4f2935cc2973141b50b1aea74a472d42f2dd5c1b2da57 SHA512 f3ca91b41a6255a743a00d34733e4755f1f675c150414c794bce9c52da292cc267a60520d5bc4e6b0e5ba4dc1ce27b7083fa4e2c226bafa3ca39ee6d63c80ae2
 DIST fritzconnection-1.7.2.tar.gz 77880 BLAKE2B bb27d1cc8ccdce17a73ddc6a1f3fcb1187976dcaca28f773a6aad9c07f3dfa80be686d065d060fbf174b60b31bc589f26e6f48ae655a69b4a7ad2864d434156b SHA512 2ab6b010750e7dc7dd010fc51c3fa41ab2eee58c5f310f187e998183950a2ed2668a13a4a4a39bdb27fb1b0a8f69cfff47256ebd3b543128710368689551dc87
 DIST fritzconnection-1.8.0.tar.gz 77615 BLAKE2B aedcc3b116b6ce7ce14feb75714ee6e5a5ea667f7cb5e3124caa61e9b638e91e95a2520184869d088ceee7a6fd242c649660e7bb9ca81920f22954fc01ae3682 SHA512 4a65e715151fcd356ece60b9966560d80e4144d53f0684774af8f669fb83aa87124870ec1dfb29cbd381c73a711797f837b09abb620dfbb94722cba007fdf80c
+DIST fritzconnection-1.9.0.tar.gz 79389 BLAKE2B 58ffebd4451dea16ec4739d77f02e3e67cda4e332df94688cf6b293f6cb6d15277f4d7231805425782d3214f926f74f51da4b988e60cbea5d336bec7436f664c SHA512 cf6710dffa8e76ecd5217d592824735e2bbcd8e2860a333a64e75530fd18da2cf6578181173614a2169d81c4db17f657708809db6d67e092f740558b8b8fd3fd
 EBUILD fritzconnection-1.7.1.ebuild 709 BLAKE2B cef17e67cea0fa5d19d974311fdaac993e1c30993c47c718fca642350c8cddbfa83effd7696ad789243f58b48eb4724fa5b6f16b6bd0c9faced9b48fd35999ad SHA512 2c30c321a06ad5e52b18cb071736a144051bc074884d12f08e4f704ebacff7fef36a152cbf7070072eb7b04f10ffce8b91af56bba50fb9db96e464520eecedd5
 EBUILD fritzconnection-1.7.2.ebuild 709 BLAKE2B cef17e67cea0fa5d19d974311fdaac993e1c30993c47c718fca642350c8cddbfa83effd7696ad789243f58b48eb4724fa5b6f16b6bd0c9faced9b48fd35999ad SHA512 2c30c321a06ad5e52b18cb071736a144051bc074884d12f08e4f704ebacff7fef36a152cbf7070072eb7b04f10ffce8b91af56bba50fb9db96e464520eecedd5
 EBUILD fritzconnection-1.8.0.ebuild 709 BLAKE2B cef17e67cea0fa5d19d974311fdaac993e1c30993c47c718fca642350c8cddbfa83effd7696ad789243f58b48eb4724fa5b6f16b6bd0c9faced9b48fd35999ad SHA512 2c30c321a06ad5e52b18cb071736a144051bc074884d12f08e4f704ebacff7fef36a152cbf7070072eb7b04f10ffce8b91af56bba50fb9db96e464520eecedd5
+EBUILD fritzconnection-1.9.0.ebuild 709 BLAKE2B ca93c126c489aa8053ca5de9611b9561b0b863ba0a2a15b77809ed7cc7d6114f664ac28e8caeffbf065e9c59260483d4fe291d0d470f7198333619bda9096cef SHA512 f3ad894dade204cfc05ed4721a19779388cbb3c8e61e99457ffa05dafd31f9e099f7f8db2a3b53ba8fd66ed5ed48002ecf82fe74a7f4586e76d978084c438f80
 MISC metadata.xml 456 BLAKE2B 4dfba055d7915535f8244669fc083d906366209ea857f71e34c6579f8b0c14e31db6cabac34897a8baed2189199c303dc29a1fb06a9a11c0f993513877192e33 SHA512 70692ccf90eb73e8bc884b2b75e580c9b20a91a988387696f76258c183df2623c55aeb02a34389769c34a3fd997f11d5bb7feb93ea1b497f58c6ec60cc60e71f
diff --git a/dev-python/fritzconnection/fritzconnection-1.9.0.ebuild b/dev-python/fritzconnection/fritzconnection-1.9.0.ebuild
new file mode 100644
index 000000000000..a30f7148426d
--- /dev/null
+++ b/dev-python/fritzconnection/fritzconnection-1.9.0.ebuild
@@ -0,0 +1,29 @@
+# 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="Lib/tool to communicate with AVM FRITZ! devices using TR-064 protocol over UPnP"
+HOMEPAGE="https://github.com/kbr/fritzconnection"
+LICENSE="MIT"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/kbr/fritzconnection"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/kbr/fritzconnection/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+RDEPEND=">=dev-python/requests-2.22[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/gitdb/Manifest b/dev-python/gitdb/Manifest
index b03275819edd..141e8c55d435 100644
--- a/dev-python/gitdb/Manifest
+++ b/dev-python/gitdb/Manifest
@@ -1,3 +1,3 @@
 DIST gitdb-4.0.8.tar.gz 394637 BLAKE2B 8eb3b04664df0fb40b93ee814d94a2526d62127c3dd7d0908f8c3ab9c3fc4d7ad368ad6a4288e509ce2f6e43348cb4f3761aaf404040bad1c59bc920517888af SHA512 fa883bf135080a9defa039bf1f13aebdb91c7e8d397c870e24d7c13acc1b30fc32c6299b43c117657382c1908ace748b0967bc53e02c2d73633cc8603fcb8003
-EBUILD gitdb-4.0.8.ebuild 1213 BLAKE2B b453536571a26cf14a5b7c7e414c027affe87f29f7b056303e2e6fea4ea2a343919ba39e909a5f76fc923ae745cae2f48ca7854186576de5ee0ce4ae1279b808 SHA512 5ff47e4daed0d67903cdbbab67e84a3aaded49375e2ab65431e0f2fcbdd8f54d3133699b6d4c4e09753c84703d37e17e265ca6d7b7cba4cd82327fa793fcb7ca
+EBUILD gitdb-4.0.8.ebuild 1210 BLAKE2B 2cfb09cb610f1a5cb04830d1cff5732089579704213d9768960e223984e41abfa6b456a8c632b48d7144ef5c340da6bfc418dab727e29cce9274b8ba9718128e SHA512 7fc5047271f575640e157f8449ae1771365c74eb12b3f7f51932f17965975344f8619cdd2cf2c2c11fec0493e82b741b2b7214488829c799ee18bfb394d0419d
 MISC metadata.xml 412 BLAKE2B 102f815a0eee2ea04a3c77b8b26f08760bbd64ee1f0b6b2523164f3b3fb576003865198574529332c2da8f6548f232b4cbc1bbc2e93fd7a437fe77dbde934ca7 SHA512 1f94c86c4366e0be10f89e3dbf935025bbf51d547b0ba65d99d2e97da0590de0d05fbe05e0277b0177fb1b2a9cea55cf824d332a224336d71cd49b0257fc31da
diff --git a/dev-python/gitdb/gitdb-4.0.8.ebuild b/dev-python/gitdb/gitdb-4.0.8.ebuild
index 56a76174a288..ee2d0fc2620e 100644
--- a/dev-python/gitdb/gitdb-4.0.8.ebuild
+++ b/dev-python/gitdb/gitdb-4.0.8.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 ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/smmap-3.0.1[${PYTHON_USEDEP}]"
diff --git a/dev-python/gmpy/Manifest b/dev-python/gmpy/Manifest
index e4e44bd93d9c..3222afcd874d 100644
--- a/dev-python/gmpy/Manifest
+++ b/dev-python/gmpy/Manifest
@@ -4,7 +4,9 @@ AUX gmpy-2.1.0_beta5-test-input.patch 436 BLAKE2B c0cea44d17b1a44470c13893500dba
 DIST gmpy2-2.1.0.tar.gz 258571 BLAKE2B 942786c9a2e1220ecad15e97c26cbea0b93c7719e5081f6defe7b71d43be0c4ce259355eb34fa013a0b90679022535a271f26425c615e65103d3a2705b27ec8e SHA512 0d62354a1446708548b8dfdc6d7f8000151eb5901251f87f935144f615fd586726617c7a2bd05b91dc3e2a0cfc8797cd81d60afb8c705da153b537345eaddb34
 DIST gmpy2-2.1.0b5.tar.gz 264742 BLAKE2B 1dd6dc66f9ec8cb2738f449112aa44feb40ba983f6da5f7a0760016e79ffed19037d77d47c0c0b816f9088725207e50ba3bd423349ed4c744ff03059c4c6a19a SHA512 7dc647642d7b61af77258881a7b91ab967dd11a86ba88ff5b7fd41cd4c999d2bb4cfe586511e79cc5f21f0f00d0823bbd2620d69df051c8cead15090423a657a
 DIST gmpy2-2.1.1.tar.gz 258607 BLAKE2B 3c070d101066fb0ba5da61b8c1eacf6bbd334aed987161091f31bccc1e836430cb844e0fdcb5017718341761f54c0fc3290e37ace28a5c4fc07930a194e77256 SHA512 37a08b546476f1b49cdfdb04b3a6d4da266615f789eb03896d5e2dd326c91f0fb9523504414b0de30e7265840e2ef77362a5ff011906952100c8b1da4d88d709
+DIST gmpy2-2.1.2.tar.gz 258445 BLAKE2B 5fd89478bb7c48c317a7af74fd872e5a9c1141f8f23c110aba7298d1a325caa13e24f1a2e601d6b3c6f6af30d60505f9161a03def16df59dddabe611fb600ef4 SHA512 abfeb0d8a155235e3aa797ca7b34ab6947f0714273e9d381167a9f6273bad34689e1985c139080b146e072b5bfbb4fa2b937566a14f4b94cc09ed21b3f2082b7
 EBUILD gmpy-2.1.0.ebuild 927 BLAKE2B 7d668d55e78861a97798d3a9b0e9bd6da7744e4e103ece13bc1780af70dddfbcba660baf18555a8ecac461dd8d9f62a57719c56c0e3c3052b41a847225b4e091 SHA512 fac4132e89bb5eddc058e7c3116a71b7f96b0e8b0ad524adeaca62c7a09c2e968ecbe0c4b2fb771ea27ab2c7da6f59b57ec3e9dde4dbaeac417ec14475bc1d2f
 EBUILD gmpy-2.1.0_beta5.ebuild 1288 BLAKE2B b340097a38ecfdf08bd687c28087c1dc1f4673c70f2f1684c546b27cfece75b748a47496e123c3cb34ee9e358a6438f48125b1cf1c2e25912e053452033af806 SHA512 f77c84add0eedee24a6318587bb5fc78b4fe67765dac5cd51827807c1292267fca48abeb7189643698eee7b88342776567a941a965009f8ea82086d4b85f8e30
 EBUILD gmpy-2.1.1.ebuild 927 BLAKE2B 7d668d55e78861a97798d3a9b0e9bd6da7744e4e103ece13bc1780af70dddfbcba660baf18555a8ecac461dd8d9f62a57719c56c0e3c3052b41a847225b4e091 SHA512 fac4132e89bb5eddc058e7c3116a71b7f96b0e8b0ad524adeaca62c7a09c2e968ecbe0c4b2fb771ea27ab2c7da6f59b57ec3e9dde4dbaeac417ec14475bc1d2f
+EBUILD gmpy-2.1.2.ebuild 927 BLAKE2B 2fb9638e1fd8141e095508bbad8399bf0d13f8e38280df0c7fe252efe4f9a064cf2fbcf3c98b0add631e45eedc52d6a8441c92a2016a6a50f7a18d914832267f SHA512 c139a66f332f18aa0a6cc54e5adf2955f2b7354b64202ed80fa3dd8c77210896d9d473ee371fb5aad30e67b2cd947cf175c6a688e59389bc07d577c2017da514
 MISC metadata.xml 687 BLAKE2B 9cf9e1c3dad11819000600a2ce28b5f140101cfa37553df7bf07edeb8513d7b8d80b15d561e37ca960a23d3470fc7f83608f9163d46b54fe7c41782302c53963 SHA512 eb1aacdf09d56ac73a1ce37d4562987c900f658bc517ccb6bd34cafefdf9a790d0e0d4318f70b57d68c5ec0c2832d0960b2bd619002fe690f484cd2702b77f79
diff --git a/dev-python/gmpy/gmpy-2.1.2.ebuild b/dev-python/gmpy/gmpy-2.1.2.ebuild
new file mode 100644
index 000000000000..2ef96fbfc3bf
--- /dev/null
+++ b/dev-python/gmpy/gmpy-2.1.2.ebuild
@@ -0,0 +1,38 @@
+# 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_PN="${PN}2"
+MY_P="${MY_PN}-${PV/_beta/b}"
+
+DESCRIPTION="Python bindings for GMP, MPC, MPFR and MPIR libraries"
+HOMEPAGE="https://github.com/aleaxit/gmpy"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="LGPL-3+"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+
+RDEPEND="
+	>=dev-libs/mpc-1.0.2:=
+	>=dev-libs/mpfr-3.1.2:=
+	dev-libs/gmp:0=
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	# The tests program asks for input when running, disable that
+	"${FILESDIR}"/gmpy-2.1.0_beta5-test-input.patch
+)
+
+distutils_enable_sphinx docs
+
+python_test() {
+	cd test || die
+	"${EPYTHON}" runtests.py || die "tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/google-api-python-client/Manifest b/dev-python/google-api-python-client/Manifest
index bd21a9e67254..d8e5098b0c35 100644
--- a/dev-python/google-api-python-client/Manifest
+++ b/dev-python/google-api-python-client/Manifest
@@ -1,3 +1,5 @@
 DIST google-api-python-client-2.33.0.tar.gz 28292803 BLAKE2B b7e285a78d06aa9c0cb5609521443aa048220bb4b83e900b5915603c3cc1bd2eb6ff009c43503a8178f4ca2281fed0488bae9fbe0c29bf7a9df9ac2d4cf294e4 SHA512 47c8352440a2ffd3beca049a200c4a0cb1a2299b5fbce70b64a913f6121e731325831b229102d9940b386e082592efd49fdfc9409055b32f172551862740bd63
+DIST google-api-python-client-2.34.0.tar.gz 28469433 BLAKE2B aa2c8849b629fe489cf39cddd410a40a0af0bddfa5f370a4a41c1446aeadf69cd4592eeb1d76e6c63da9737906801aea9c8a4d706328b63a7bf5b34a43b83e00 SHA512 321dfdd3ba821beabc6c3a96575afd06c75a0c8e3db61b1ff5fa9db472e62de81b037c435a1051d6294c2a37e471bcaa068cd27ad7434a3416231d31931dd74e
 EBUILD google-api-python-client-2.33.0.ebuild 1377 BLAKE2B be3e2d39923cc9be436e5b0f60e55f58789b1b1f1b64095ecce75037fa823b288016e74e2c3f6eef4370fdd5037e6d7f7aed9ccea86119b4e2497843a83283c3 SHA512 d3dc2686aa60ffef541f4dfb2cb1707403cc180e845d6d7ea3d27de4c1cefc19baa9a64eb6ca21741d69e9626bd8295df395d21ffca5216221534a7ef16404c8
+EBUILD google-api-python-client-2.34.0.ebuild 1379 BLAKE2B 642429bd1cae61fd100116b60e2e44acae4bd61f2b905deeaf397539b267974778d533e56a8b65a14bf8e4ade6778508591e4928ec711861c20ac59e75bba9ec SHA512 a7b60dc3f434c0c42322279ac14d691f40697c47828758ffd2860a1ad6b50cc57969a75ad5f605b08adf7fd4f34f335e779bad38d06f77aa05d347a4050a91af
 MISC metadata.xml 538 BLAKE2B bf0b8ab3a89ce9ab1d2159f4c0ebfe3f2646aced20bd2006485510c12d22e83cc130fac979f699ae6431a610c8d2acf86c04b39bc262abaf167c20571a860810 SHA512 30d004d944055660165954f8475e57ba45cef56423c80a324118836d78e5376261409955155a40c9bd988f230f3e2fc44c6aeb6fae3028c78c55a382ccd83bff
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.34.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.34.0.ebuild
new file mode 100644
index 000000000000..b7db8f42faf4
--- /dev/null
+++ b/dev-python/google-api-python-client/google-api-python-client-2.34.0.ebuild
@@ -0,0 +1,45 @@
+# 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="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 --install 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
+	)
+
+	distutils_install_for_testing
+	epytest tests
+}
diff --git a/dev-python/graph-tool/Manifest b/dev-python/graph-tool/Manifest
index 48ff5650df31..1376b688a5e6 100644
--- a/dev-python/graph-tool/Manifest
+++ b/dev-python/graph-tool/Manifest
@@ -1,4 +1,6 @@
 DIST graph-tool-2.43.tar.bz2 15170272 BLAKE2B 96570242cf2003c262024545a074bcd0f0cf9351b0c8c68035529d38d535411386d5440bb5166cfb70f24ba1540d9ce65324c659564f2ab50358dbd77bafed99 SHA512 e72dec9656acb2bb7ba43e19673fa4ff70ff4819e76bb5f00e9943e4cfe6a85f1e0eaa58c8be2921ebd783ef3d978294a347238f3700a457aaff8a98ea8ed4fc
+DIST graph-tool-2.44.tar.bz2 15149379 BLAKE2B d15413f4e8642b96f62d88631c216e600e24aa878b08a173f1a00f1700aa3c6f4b1b3f806956b811b209a2d42ec1178e2488946d96f056f528a046cbd6cc330a SHA512 b90dc541ec77f89fdbb64697ec5e200d9c7c4ec4b8849c75d008b83dab8f54c95bd230f5d72e32d656f86a201ab66eee25aa774b7983355f7af9304b52527e40
 EBUILD graph-tool-2.43.ebuild 1828 BLAKE2B 129b774dac80943f0b78f5931a99d14e973bf68fbc9021c0bb9dcf2c9e341f3dfc4265b9e2676688f4a0cb0943dc695aae92bbeef4f7c40c4e1a0088961384ea SHA512 a3d9b51f8bf4023ae67cbf06c912c1acea0dcfd760a05d48e8733755c0f9cb619a7f65d77799250346f94c6bd09357acc87b230efa459f0771c46223aad855db
-EBUILD graph-tool-9999.ebuild 1765 BLAKE2B d6bed5ca6e70ec4abf95d1205fb26709b716dd086146b580a0bd4a3b5c3acc97d1a16184a41ae8de1ee43d45223f5875ef52c01ff95a76594029eab7525518ff SHA512 e56fbf37c71b68ff5593ff534c9cb8ebf153022152492498b81ba332fa88099600f58cfebe6acad77f83c45eac98e9067fa703d34a1e8e15375a552ba0662c48
+EBUILD graph-tool-2.44.ebuild 1765 BLAKE2B 0c5b4551e786534df3c7ecb0e6838fd9d72935c6136dad2867a77e3736b588617f4d2ec8ceb0c350511226a857d77eb1d4b3ea4f9828d05180d917e758012f74 SHA512 446b719bf4901da5db5adf2f781461868e8046f72e5a0a408c522f299b91ccdaab6547bcc8f5bad9ddeaa8e042abf1ce29da243605faebca2bf546b790b5a34f
+EBUILD graph-tool-9999.ebuild 1765 BLAKE2B 0c5b4551e786534df3c7ecb0e6838fd9d72935c6136dad2867a77e3736b588617f4d2ec8ceb0c350511226a857d77eb1d4b3ea4f9828d05180d917e758012f74 SHA512 446b719bf4901da5db5adf2f781461868e8046f72e5a0a408c522f299b91ccdaab6547bcc8f5bad9ddeaa8e042abf1ce29da243605faebca2bf546b790b5a34f
 MISC metadata.xml 437 BLAKE2B da394a6ff65e5104c8cad22c123355d6cce752578627e74eaccdbb4ac11ef44c131f2133bc7fb9a35016e47b09dbf5a60a88d5ba25be0a7c6b131747aa85c310 SHA512 460b62839edfaba3f15bcc80aac5900258e243dda4bb85dc3a77492077bf1a09aa308458d40831bc5efd785f40c4a643a7b8360c36045e977102302c03d5877f
diff --git a/dev-python/graph-tool/graph-tool-2.44.ebuild b/dev-python/graph-tool/graph-tool-2.44.ebuild
new file mode 100644
index 000000000000..5078373af0e5
--- /dev/null
+++ b/dev-python/graph-tool/graph-tool-2.44.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit check-reqs python-r1 toolchain-funcs
+
+if [[ ${PV} == *9999 ]]; then
+	EGIT_REPO_URI="https://git.skewed.de/count0/graph-tool.git"
+	inherit autotools git-r3
+else
+	SRC_URI="https://downloads.skewed.de/${PN}/${P}.tar.bz2"
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="An efficient python module for manipulation and statistical analysis of graphs"
+HOMEPAGE="https://graph-tool.skewed.de/"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="+cairo openmp"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	>=dev-libs/boost-1.70:=[context,python,${PYTHON_USEDEP}]
+	dev-libs/expat
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/scipy[${PYTHON_USEDEP}]
+	sci-mathematics/cgal:=
+	dev-python/matplotlib[${PYTHON_USEDEP}]
+	cairo? (
+		dev-cpp/cairomm:0
+		dev-python/pycairo[${PYTHON_USEDEP}]
+	)"
+DEPEND="${RDEPEND}
+	dev-cpp/sparsehash"
+BDEPEND="virtual/pkgconfig"
+
+# bug 453544
+CHECKREQS_DISK_BUILD="6G"
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+	check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_prepare() {
+	default
+	[[ ${PV} == *9999 ]] && eautoreconf
+	python_copy_sources
+}
+
+src_configure() {
+	my_configure() {
+		econf \
+			--disable-static \
+			$(use_enable openmp) \
+			$(use_enable cairo) \
+			--with-boost-python="boost_${EPYTHON/./}"
+	}
+	python_foreach_impl run_in_build_dir my_configure
+}
+
+src_compile() {
+	python_foreach_impl run_in_build_dir emake
+}
+
+src_install() {
+	my_python_install() {
+		default
+		python_optimize
+	}
+	python_foreach_impl run_in_build_dir my_python_install
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-python/graph-tool/graph-tool-9999.ebuild b/dev-python/graph-tool/graph-tool-9999.ebuild
index 560f14da24f9..5078373af0e5 100644
--- a/dev-python/graph-tool/graph-tool-9999.ebuild
+++ b/dev-python/graph-tool/graph-tool-9999.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
diff --git a/dev-python/httpcore/Manifest b/dev-python/httpcore/Manifest
index dc01f098c783..35bb0b74be48 100644
--- a/dev-python/httpcore/Manifest
+++ b/dev-python/httpcore/Manifest
@@ -1,5 +1,7 @@
 DIST httpcore-0.13.7.tar.gz 64734 BLAKE2B e6c4b1720ce4bf62689995d3e1c648c4702bb416f3b3586eb8dd2f0cfd2155046e64181c4c04e65f721a5f0fcbc23b5ffd01c2930c7c69d37ee4c36e37b7d0d4 SHA512 0cc48828d0710066b3ef89998ec85975285763ac63a8b59106952ef2dac5a02dac71e7e106c4b6ea1022eb4d06a9cb5ee3e634eb564bad49c5508beff75279d6
 DIST httpcore-0.14.3.tar.gz 64650 BLAKE2B 140c55af60f54ff13db958cecef50af2b8857837c00c2e5b1ec48d8866bc08146f608864a3dcaed0014505ba0ea10b8d457a763ecf434a0d40a2e11debdd4003 SHA512 05e92109839c2e2f7ec81fea9507fb15a12d1bf6ae92048170953b1cb0139237b81c892feff1bc3840e06887e8916cadcc4124725874344524e45e3640a00379
+DIST httpcore-0.14.4.tar.gz 68463 BLAKE2B cc6c17da3b97c2a8fb9edb0aeb6247904240748645f605b2f3c84194fc06bab10f568ce21b8beaf1dee9a8d68166f1691e00f17e44d89efce0a18a6fbd91d5a5 SHA512 4dfb2d0dd10df1de45f4e78ddedddf02bf500a81a0132919894bd5c07f02a2975ce589ba3f6d79dd92ec882128f86f338bd32f35cdecb6618307e446ed369310
 EBUILD httpcore-0.13.7.ebuild 2313 BLAKE2B 9db573d0b47b5ee5bb72a62c9a6d6252bcff472f65869c0128679c088bb1a8554eba78975fe65c9b91f4b6b3063c0a102b5f55d13f87c3e9a869cd5d705a82fa SHA512 e391456b9ce1bbe3bf17b90af599e036db2f5c394d9cf0afcb487f1e74cd1114e1eee341a52bc76d5cce752270099b5f8f976cb466d35627ab65858719cd3e27
 EBUILD httpcore-0.14.3.ebuild 901 BLAKE2B e5d9dd3e19bb107c4dfb4e97556ba22eb5f42303aaff3725b7dd5d2850d1eb0b25b49f20183514ff984b312830d6c11a19907bc909705c316b40742c7fe54d57 SHA512 c4ba83058c06178e52da1d7c72765d393d329348e62715c6ed9f61b902637ba3a1990acc7affde56eb69efbe17792b987fe2fc83d6fbfcd2a3264b5775f9c9bf
+EBUILD httpcore-0.14.4.ebuild 901 BLAKE2B 2d32262d4e40e0fdd5cece3eb4bea760d259103562e0c0b4cb1435348926d730d0cf05b61c5b8558566971322cb483a0e57375855fb46c6239f11cb65daabef8 SHA512 e86bc03f6842dae44677cc1a32f5bb12ca8238b0906c45a5c51ae4be39ec0cd473c3cef7bfa3a36727d85a62ef45696ee6799e2c0bb146a5913cc95b888a2066
 MISC metadata.xml 454 BLAKE2B f8a48d9ab81e5f74623dd0c8490e5de5cc711fda7f4614932e7ac6caa80bd23436037ddf9327d6bddc3d39c8b601b4ee74a85c0a10bacb20514cbf8278e34d1f SHA512 af962141bd55f51b27e0d4b61bcf7d5426e816df4f8c65be257d8fddd597664afe04e78ebe7e11caaebf06ae4fe17b88f568dc440403865ba6b8e3b47d796aa6
diff --git a/dev-python/httpcore/httpcore-0.14.4.ebuild b/dev-python/httpcore/httpcore-0.14.4.ebuild
new file mode 100644
index 000000000000..e5dcbd6373f9
--- /dev/null
+++ b/dev-python/httpcore/httpcore-0.14.4.ebuild
@@ -0,0 +1,34 @@
+# 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 minimal low-level HTTP client"
+HOMEPAGE="https://www.encode.io/httpcore/"
+SRC_URI="https://github.com/encode/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	=dev-python/anyio-3*[${PYTHON_USEDEP}]
+	dev-python/certifi[${PYTHON_USEDEP}]
+	<dev-python/h11-0.13[${PYTHON_USEDEP}]
+	<dev-python/h2-5[${PYTHON_USEDEP}]
+	=dev-python/sniffio-1*[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/pytest-httpbin[${PYTHON_USEDEP}]
+		dev-python/pytest-trio[${PYTHON_USEDEP}]
+		dev-python/trio[${PYTHON_USEDEP}]
+		dev-python/trustme[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/httpx/Manifest b/dev-python/httpx/Manifest
index aae934c0aff2..c5bd6a950c70 100644
--- a/dev-python/httpx/Manifest
+++ b/dev-python/httpx/Manifest
@@ -1,5 +1,7 @@
 DIST httpx-0.19.0.tar.gz 1667455 BLAKE2B b8d4cb0b6e7f643b62b507930ccf1534d73d93261cab9281ef57d6392f00da325e897d5339aebacfa07aeae8278d3a81b78d6501a1587ffeaef68cc5087bfdaa SHA512 3b327f07d62cf0430672d4f1a4f884618e588496f049522de327f5c34f7260eb21739b7f1fbd6f43a21962bc8737547f3eddbc22751546647f56c9cd7212840a
 DIST httpx-0.21.1.tar.gz 2155133 BLAKE2B c3c800657abaed461ab6f44e3cd9799be4b6499070a5db2ee8d5d61c776d86591c74192eb1c88d4072dc361ea4c9448a3ed061c715fa4504fc931fdd96ccde62 SHA512 a4f737f6c6ae909fd3ea811e0ff3b78ed6496da8d797ef49746f744216e055f8225d613fe935d5e2780aa1b233053ad436e8849eef578e662ca8ee34513ad12e
+DIST httpx-0.21.3.tar.gz 2157078 BLAKE2B 08a9328a7350534abe646f0bf60bd15600a1cb3eb8d06578c87ed9a7d4e55efdddd2be597650cddec9f6456e89a1b159f3e23aa657f379f78157c12670cdadb0 SHA512 0a551de52954db5ed2c33d1b5c172607516031a7c86c0f235bd04f12f4cf82f63980a9f53115dac801748b0c282890b3ed4a53b2c912adbd245c10ad61dbf67e
 EBUILD httpx-0.19.0.ebuild 1862 BLAKE2B da0efba0380fef0876d7b5bd389372f5ffe15487384447ef47982f0c58ec1475f48e0d5a4150aeaab7a92a3848a892b208dd38bf2725a27d5dd41e3d6c60e385 SHA512 f4a670603c4e6dbd0795580b2b6645e2f701c52a3eb776fbb31abdb1fafec49388888468b36fcee2f46b053dfddbbec2ba3bde36582b8c112116383439564f14
 EBUILD httpx-0.21.1.ebuild 2021 BLAKE2B 97f01bb5a571fdb8f6af0f9c8f2980862c95860a46682600f683d2da35e33f9a0278606cdd61c84bd97de09b9339711f0c51064e3a076bc3570d0a0f7aa1aba5 SHA512 d4fa31fd69abbf41c4cbb2eb2e7eba4c4d9d941335d30cc4850a47f7c2950a5e957783f147691d9784a2b1335b19b9447c411b0e4b019e4344938f6ef5469d9c
+EBUILD httpx-0.21.3.ebuild 2021 BLAKE2B 872c7de3d09855bdc2c2294e25858664c2e3d16a0d06d6f7c40284f4abce0877ae6b42ba84ce43b1f28c1734b9816763bc6d23d93cf3a35916854ea0be4da9ac SHA512 7ced5b855a9ee84d8c55514fdbc97584e3e004077b62187d328fed1a72123f401420aebc7289a2993bfe3152c7ccb45c317e434613e6bc51bb6d4ead776a700d
 MISC metadata.xml 518 BLAKE2B 063b5b95529cd5a31aac83998c0acbdfef208c34e931c96ae8ee767a326301a597a8297514b5c97bef2b3b706b8938d38c0e5f5d752307a9dd06984792c799a2 SHA512 3a29dffa0f951255a67468b28917590d4108ca12e14af03bfddef80f6d48e266fcccdd991e778ab9e267c0bc76ff0017e07905c1f2f45dc440a9af89f6cae6aa
diff --git a/dev-python/httpx/httpx-0.21.3.ebuild b/dev-python/httpx/httpx-0.21.3.ebuild
new file mode 100644
index 000000000000..3171fdff7f8b
--- /dev/null
+++ b/dev-python/httpx/httpx-0.21.3.ebuild
@@ -0,0 +1,76 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Docs builder mkdocs not keyworded on all these arches yet
+# DOCS_BUILDER="mkdocs"
+# DOCS_DEPEND="dev-python/mkdocs-material"
+# DOCS_AUTODOC=1
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1 # docs
+
+DESCRIPTION="Fully-featured HTTP client which provides sync and async APIs"
+HOMEPAGE="https://www.python-httpx.org/"
+SRC_URI="https://github.com/encode/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="cli"
+
+RDEPEND="
+	dev-python/certifi[${PYTHON_USEDEP}]
+	dev-python/charset_normalizer[${PYTHON_USEDEP}]
+	dev-python/sniffio[${PYTHON_USEDEP}]
+	=dev-python/httpcore-0.14*[${PYTHON_USEDEP}]
+	>=dev-python/rfc3986-1.3[${PYTHON_USEDEP}]
+	<dev-python/rfc3986-2[${PYTHON_USEDEP}]
+	cli? (
+		=dev-python/click-8*[${PYTHON_USEDEP}]
+		=dev-python/pygments-2*[${PYTHON_USEDEP}]
+		=dev-python/rich-10*[${PYTHON_USEDEP}]
+	)
+"
+BDEPEND="
+	test? (
+		dev-python/brotlicffi[${PYTHON_USEDEP}]
+		dev-python/cryptography[${PYTHON_USEDEP}]
+		dev-python/h2[${PYTHON_USEDEP}]
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/pytest-trio[${PYTHON_USEDEP}]
+		dev-python/trio[${PYTHON_USEDEP}]
+		dev-python/trustme[${PYTHON_USEDEP}]
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+		dev-python/uvicorn[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	if ! use cli; then
+		sed -i -e '/console_scripts/d' setup.py || die
+	fi
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# Internet
+		tests/client/test_proxies.py::test_async_proxy_close
+		tests/client/test_proxies.py::test_sync_proxy_close
+
+		# Result change in charset-normalizer-2.0.7+
+		'tests/test_decoders.py::test_text_decoder[data3-iso-8859-1]'
+		'tests/models/test_responses.py::test_response_no_charset_with_iso_8859_1_content'
+	)
+	local EPYTEST_IGNORE=()
+
+	use cli || EPYTEST_IGNORE+=(
+		tests/test_main.py
+	)
+
+	epytest
+}
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index 2f518fed692a..79b2ed4a697c 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -3,9 +3,11 @@ DIST hypothesis-python-6.31.4.tar.gz 9183157 BLAKE2B a8c82cd2e798b7dc0b149a09d52
 DIST hypothesis-python-6.32.1.tar.gz 9176925 BLAKE2B 0b57c8b46b766055a19c8831620b6ad780bd1a3b3e4835496cbd01f4fb861c64679171c685797458ec56ff07fe9524840cffce1e1930390de71225b707163880 SHA512 f64b0ca16a47d9f4dbce4986aa2c4414e86e596b6e167bd8be373fda05f8bbb626de7a615861a71313faebde50b1fe55e54c8b20247c71fa4ecb2223de171502
 DIST hypothesis-python-6.33.0.tar.gz 9177426 BLAKE2B ad1b1a358345f9b92bf41cee196c7bba5374054c84b7ca96500cf41b095e7ae6df12499dcb3b656907df30b360d167630d3d4c640c9d5d903125158af6db3089 SHA512 0165b7c431980d7758be50e834dbe04356478590d5fc54656ea9d31508bbae81f9fbb53b38178862b2d4959e17fa3564bc6971d466ba95555c8e80a6fb208639
 DIST hypothesis-python-6.34.1.tar.gz 9178792 BLAKE2B 72cbb1b372fb23da8ecf4eb8355cb054216c78b6464b5ddbc7ee5534652d69e4f3cc094241c0434bc0d80cc555c87699504f87bcf4659724f77d70deaa19b871 SHA512 234b8a814994b0e93cae24233cc30ab8eba853a081d4cce4309b4af5e13234a3de8d704f3255cce11195603645c2641fa1985529d64631df90a61cfd1c4a7f06
+DIST hypothesis-python-6.34.2.tar.gz 9178843 BLAKE2B 24bbc19ea5c207880d577a3c451f6e90c4b124a934aa1cd103c11ec77cbb5076d75e3860abd2b9bd2fc75640ba562b81d3fa038cc7752109625990e0ac0e1039 SHA512 a03233a2b84b1e009ad246663b0c7f6b56f2c04d08d69297ff50b02b8af292fdee37f877ca2f709e6ef64192d31e3d9bf18f78a6f5c92b8f03bf04ba398d063c
 EBUILD hypothesis-6.30.1.ebuild 1754 BLAKE2B afe7c86d0907a4c0500ff94249349431c435567753fba197261ce9bceedb03da6ecab286780b66ac4c83361528fe93ff4422c8615bbc6ef20faf289efaa3dcf6 SHA512 b3199308c4981d523366fb48c5d6bee4e1d0eeaa3e9854627cdd23b5d81d22ba4bde02b2669368a5d8bbcccdfb3941aa692c78b18524e907d70c24470e284385
 EBUILD hypothesis-6.31.4.ebuild 1762 BLAKE2B 160ab670a5db81e8ff41937a560cbb11efc1e9ae4bf41fc85176e9ab7c640e81da405ba4d477261def8f04c3a6b479ced41b7bb1c9b109e82a024bfaae62819f SHA512 2158da223e25cd54f10fd64167d3d25032e1d3647b5dca501f6c2ca8f977ee829550f7526d538b31dc192a9fdacdd9b4fea2f61204db4d0dc94571358af2b2dc
 EBUILD hypothesis-6.32.1.ebuild 1762 BLAKE2B 160ab670a5db81e8ff41937a560cbb11efc1e9ae4bf41fc85176e9ab7c640e81da405ba4d477261def8f04c3a6b479ced41b7bb1c9b109e82a024bfaae62819f SHA512 2158da223e25cd54f10fd64167d3d25032e1d3647b5dca501f6c2ca8f977ee829550f7526d538b31dc192a9fdacdd9b4fea2f61204db4d0dc94571358af2b2dc
 EBUILD hypothesis-6.33.0.ebuild 1919 BLAKE2B 0c970e7d2910f7d6c270ef62d2de074f8095a0a03efc71bd166e84d4a1abe635d6410e46018f6803ebb2c26378df5bb50c54ab4545fe281e5a1e125e6355f5b0 SHA512 adb7968c328f2985ae3533a7925859d6804a15b5c14d0a34a5e49d7362aba1e9918634e5f09e2c53a3f615d191ad91373f52a593745089a9fac239dcc50234df
 EBUILD hypothesis-6.34.1.ebuild 1919 BLAKE2B 0c970e7d2910f7d6c270ef62d2de074f8095a0a03efc71bd166e84d4a1abe635d6410e46018f6803ebb2c26378df5bb50c54ab4545fe281e5a1e125e6355f5b0 SHA512 adb7968c328f2985ae3533a7925859d6804a15b5c14d0a34a5e49d7362aba1e9918634e5f09e2c53a3f615d191ad91373f52a593745089a9fac239dcc50234df
+EBUILD hypothesis-6.34.2.ebuild 1919 BLAKE2B 6b445f0902299913e613578ca46b6cd8cfb22a7de4a07d8fcb18b3ddcd8fc145e9ab24053dc0afc0ebdb64b32fbbbbc37c85db140d9d90699fa75f1d9d8ebdc5 SHA512 3e6b41f3ac713598f82ff5bc36138b7d36904f4f7a6040f0022da4e5300be83b2f3c79adb5da4fa90909fc852ce306621badeddc0ce6498dcace25f991bda1a9
 MISC metadata.xml 756 BLAKE2B 26e40ab96ddcbd5751023e3c0cc9aa86e96d73ba02bca750ad15eb4301beb0318d3d694c54c2c2a2cb50937731af727411e8afb67e1a21e58e0ff611eeea9149 SHA512 cd48d35c5fe41aa9efcfea9eb7b2d78a4646658b5aab7533ca6492d4700032099fd34ca2dc45a6198c27351650c9e901c8b7c4d53ade2b56695d5e26ca371238
diff --git a/dev-python/hypothesis/hypothesis-6.34.2.ebuild b/dev-python/hypothesis/hypothesis-6.34.2.ebuild
new file mode 100644
index 000000000000..0d2f0a38a35b
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-6.34.2.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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..9})
+	)
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		!!<dev-python/typing-3.7.4.1
+	)
+"
+
+distutils_enable_tests --install pytest
+
+python_prepare() {
+	if ! use cli || ! has "${EPYTHON}" python3.{8..9}; then
+		sed -i -e '/console_scripts/d' setup.py || die
+	fi
+}
+
+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
+
+	distutils_install_for_testing
+	epytest tests/cover tests/pytest tests/quality \
+		-x \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+}
+
+pkg_postinst() {
+	optfeature "datetime support" dev-python/pytz
+	optfeature "dateutil support" dev-python/python-dateutil
+	optfeature "numpy support" dev-python/numpy
+	optfeature "django support" dev-python/django dev-python/pytz
+	optfeature "pandas support" dev-python/pandas
+	optfeature "pytest support" dev-python/pytest
+}
diff --git a/dev-python/identify/Manifest b/dev-python/identify/Manifest
index b8ff3d1e1cc2..31955be19170 100644
--- a/dev-python/identify/Manifest
+++ b/dev-python/identify/Manifest
@@ -1,5 +1,7 @@
 DIST identify-2.4.0.tar.gz 101312 BLAKE2B 1ba4fcf235518427fba8a59eb30ceb0c20ed23f5a3c4f56d6039ab530aaaba6b83ee395626a7d086f193f57f00a8d34a659883d897a21dc0fae5018cb0a4e87a SHA512 f0806d3785ef5db9cb1b5354c146fc0d33b4a4f04b3ff899945e9e93273a0bf8e4c8ff07ace22b5d71721c953148c007630dc400b82849321e8399ecdfffbc85
 DIST identify-2.4.1.tar.gz 101282 BLAKE2B e7c04480159062ec25063d956dda6d904031bbcc30fdab6011ad24a8c3816490d0dfe08cec19fdfe660509a246da820ccfe41d4dcd909daa9c59b622bf506148 SHA512 69253bd364ed96ae64d83ee25da0d9aae97731e602f193008471dd99f47db2b87aa33dda1f87fb9edf939992e0452ca45f07f1d7d5e628352b50d4c2e68b7d0e
+DIST identify-2.4.2.tar.gz 101279 BLAKE2B f70bc1d493fb1fd94f95ea7cedfba6c522fb79ad9d94e1bc3c8937ff728e82fd450ea7b64f5769811dea4788eeac0e0b5fcbddd0c817443bf6005d59de1d9b83 SHA512 73b139effb62ec047aa3285a5e0e9b196b459e9e8efd5dfb82090dbdd8f020055680fbc381778a1c7a298e72ed6c1778fc74213812b2f30abe9b18b401e053e3
 EBUILD identify-2.4.0.ebuild 516 BLAKE2B 9e67c4cbb998fad7f8fee2583b0553822dc9dc7d589a092b1127938f48999afc05e1aaef3ba5d3eb1f85d9ae399268c82869eb4bf3ae4274bdbd65b41f14ede8 SHA512 47c7d88fda8e395b105ea8ecbcff161729a21d89717292d393b31e538bcd8c5cf6fe46b0f7249ce20ebe9b10eb7105bbb99a383358bb8843b0754d95d2fc2e3e
 EBUILD identify-2.4.1.ebuild 518 BLAKE2B 4327428e4d169fceba95c9d444157fd626ec810e3e1036514f1e241497cbd1f72c7fa014f7011d8b65e94b0fb750ff442ced7d5047ef9c04ce79a7e26f947148 SHA512 9d8f344351ebbf673680e90335a49802ad3534da08ec2d1fe81df6fd5e8f5489974f17c264a6d34ebe26e99fe27331fbae9f808f498b554e8d3aed0e163f31f0
+EBUILD identify-2.4.2.ebuild 516 BLAKE2B d159a4b902c9d2fad00ebcff53ad1471c6a7b9a7b10b559fa2b57e5770e7e64f2716e2958b06fb9e2b52d876654e154e9faae1ffc719c081d94e6012dfba1d77 SHA512 c64e7c382a9d414517639662faad17d774b2338df7320446d56307d817c7a0317b4b0c7941613b53030d88a1cfd0f2857fa10b33c5506d3115d8afcf32a5b528
 MISC metadata.xml 477 BLAKE2B 068a0df0204ecc3f2ad9729c0a6b66b0895f94a08852453c4dcafeb784068857a4baaef55eaf0d9b742d4bfad98a2734b11f8647b52182b7ffaaa04656d8e457 SHA512 79798b3778c546a0105fa02b2cb0b682577ed630bfa7a5ff70a188441f6f847a59cf9179eb6284e7159127b180c990ed6265fdd88e78cecd00fff9a8a7461518
diff --git a/dev-python/identify/identify-2.4.2.ebuild b/dev-python/identify/identify-2.4.2.ebuild
new file mode 100644
index 000000000000..eb1a8e60e930
--- /dev/null
+++ b/dev-python/identify/identify-2.4.2.ebuild
@@ -0,0 +1,19 @@
+# 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="File identification library for Python"
+HOMEPAGE="https://github.com/pre-commit/identify"
+SRC_URI="https://github.com/pre-commit/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+
+RDEPEND="dev-python/ukkonen[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
diff --git a/dev-python/ipykernel/Manifest b/dev-python/ipykernel/Manifest
index 23dcb8c03c65..b02b3d3d9b73 100644
--- a/dev-python/ipykernel/Manifest
+++ b/dev-python/ipykernel/Manifest
@@ -2,7 +2,9 @@ AUX ipykernel-6.5.0-drop-pytest-cov.patch 420 BLAKE2B 89c6eafcf86a9033122a59a944
 DIST ipykernel-6.4.2.tar.gz 121253 BLAKE2B 26f8f94df823dd7a4ac41cac574e70ae98eed64f88bbcd8ce600ce6dfe1c43c224d65b5d0f9586ad05829692142e37fbb685a5d577047791831f6138b8309556 SHA512 56f0a15a1f06628e8f74749e4bad4a65dcc78ba7ff45e4fa5802d232e427e4ec152a6b6697302488d2e05d6b0cfa0cbc106ea2a593ab43de9d9defa9c169d5a6
 DIST ipykernel-6.5.0.tar.gz 122962 BLAKE2B fa36ea41d7f2dc8d0d75144f421ea2a72dd50dcda6c6a91f625f18c35ed2ebb950aadfb1715dd57a1fda77bfb49e360bca87f0bd8b9ee8380399d41691db2b9a SHA512 440407818ed6f388f10a727a9be1a2588bf8c9699d66e1b954a1f64575c08b5bddb3978dd13f5ab26220a210ce7177e2be0374d48d3968df681d2d5311ce42d1
 DIST ipykernel-6.6.0.tar.gz 123747 BLAKE2B b1e836ac08e24baf3311e34e1323362bec94f8a59ba4cd824703f03370031226f9af41f864930c6fb59216d185e3c7e8798d6b91e88aa6ca0c214df33c6d7d37 SHA512 bf55e26a4bca0d02f4bbb87ce53a224d22a4765596f0f5d7a6d576bfa100436f676df59fa934e1d6ec66f8d802a1c7f787a9a31b906ecaa1ffd8a77fa3d96127
+DIST ipykernel-6.6.1.tar.gz 123915 BLAKE2B 136a3acdea6790d4666c3f5b0d040a91be405ff35e510456d920d0d2d2fb4f4076eb8e74089d08c42f0eba50caa48da929c1a684ad414919a67748f13d6fdf78 SHA512 bfe37f3d69c9b05f9bbbdec7f2103c353433b402474507a9d17c02f224e3a80eaea010b5a8bcebfd4410fbba661feae74107a4904c0af7835c6c1aa6bd0c1159
 EBUILD ipykernel-6.4.2-r1.ebuild 1643 BLAKE2B 518a656392d3ab77593bb3c27114d5938016ece504c32144685ae1b7d4826ced4dbb394e9b689041943f1e84e9cde651e781e016bdf1f0e6d60c8322163dfb48 SHA512 dbba4abf3d6efb658e692086a78f6e4877df3fe61a84263008ec21f85c7de5a445f1d2943bb32715de89dc091dcd0e7c5b082543a1bd37e4b7c355e564304ad2
 EBUILD ipykernel-6.5.0-r1.ebuild 1832 BLAKE2B ea220d7c228ff8ec86671cc4fbc75cd4814f11655cd211ee6343f47367d715bca5bbfb56232f69504c19d6f917a5d753967c4ae5384e1673d65e4ab785bb7733 SHA512 017a8d52cfda02f49e51fb3a000844898fa42362220c611024910eaba805669ad66ac257ee7a425820654cd9cc4a979fec5dd82a12dd9d16dc41a17c8ba70832
 EBUILD ipykernel-6.6.0.ebuild 1789 BLAKE2B 52353c8ba04ff29bd3f94a7fedbe9f8af3c966f0ba6254ab13dca3314a31765ccd5da49e42e081b6ef7819f360cecc04ea692d9783aa6d3cc68c2e26a7c3dd3d SHA512 1cc3552b0b6967501c5ac31bef55dbb674f6821b32e96dd92ca8aa7101fe4f4860f4c4add6753673ceba7a21c2613a01aee0c869e04524d7643f95aa36464ba8
+EBUILD ipykernel-6.6.1.ebuild 1832 BLAKE2B 80d935a7994fa00923c4bc12a48bf3f6d10a452ce1794405e64e113fc6612b127a4d2b0ec0d6b7910aa3fbfae516dfdf664fbbe61bf0931f7b2098b4d594cc19 SHA512 57ff481b5779d75c9ffef6688fa23398f0e566b7b19576302a5a756e40ebac9139412e4219ab8f63edecad738f7bb2d8c8340ca14361ab8911d1e6ecc8114707
 MISC metadata.xml 527 BLAKE2B 4a24cb9d5b801bf94c71c47d0c90b04bc249fb41a794c7b688a5762f08545d1fcfe9e4976aa4f583ecb456458b5f6dfc394349633959444584c0abad0da4be42 SHA512 ed9f0ef12ec5de67a646783243555f1737604a84c78c57b9f7c65137cec8cbc396991411501927f92bd393daad2238c27363ecc9c115031450231c2a4fb2cbb9
diff --git a/dev-python/ipykernel/ipykernel-6.6.1.ebuild b/dev-python/ipykernel/ipykernel-6.6.1.ebuild
new file mode 100644
index 000000000000..b44f76dc1217
--- /dev/null
+++ b/dev-python/ipykernel/ipykernel-6.6.1.ebuild
@@ -0,0 +1,62 @@
+# 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="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="
+	$(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/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/nest_asyncio[${PYTHON_USEDEP}]
+"
+# RDEPEND seems specifically needed in BDEPEND, at least jupyter
+# bug #816486
+BDEPEND="
+	${RDEPEND}
+	test? (
+		dev-python/flaky[${PYTHON_USEDEP}]
+		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
+)
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e 's:^TIMEOUT = .*:TIMEOUT = 120:' ipykernel/tests/*.py || die
+	distutils-r1_src_prepare
+}
+
+src_install() {
+	distutils-r1_src_install
+	# 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
+}
diff --git a/dev-python/ipython/Manifest b/dev-python/ipython/Manifest
index d4740bf95edf..cbf33c79e74b 100644
--- a/dev-python/ipython/Manifest
+++ b/dev-python/ipython/Manifest
@@ -1,6 +1,8 @@
 AUX 2.1.0-substitute-files.patch 1017 BLAKE2B 70577eb950a18345804a2a4b750bd233dc6a0b6bbdb524dfc66e0f4a7c69b0eeb2d35efb9d1845d567a11d1afa7881068b4757e42b9baf24dc01ba3026608a38 SHA512 fc4c9e12267ac5f04a2e16ad27334a093638538b8149ff380099fcbeb674a276ab9eb624a508010e37f82c05d5f7ab527a80e386b3e7b61c123ecb8effd9d542
 DIST ipython-7.29.0.tar.gz 5151803 BLAKE2B 685bb7df39513fe262c07dbb10de4d795860bf2958c626d030bfa3e18052a98d7c9d5f0f96c0c9a5d4b9fdcfab09c492457d409f05ce522f607456ff3a4b35fd SHA512 b8e9cc07a0f77bbfaa88183546ed9d7e4a4c37e7c1704b1a3716d605a04339f986c7767f3c0920a94039eda99e75afb62a7bb43fa0cde6699a902f3b8f83a398
 DIST ipython-7.30.1.tar.gz 5154336 BLAKE2B 0753433eea2ee6a5a6451db6aa537c9c9469c749b970ecdd040123787064e7be78363060a785c7ea4175b8e0f4f2bfefa15485f6f5412ec34690fe505a1cfb97 SHA512 839f709e019dd5efe32730f2e4c457e6dae0db5490844805d30f12a1fd17bfb2f991f1374a84542b2392d3ce332096d3922471c6b14149331075be8719b14734
+DIST ipython-7.31.0.tar.gz 5154974 BLAKE2B 5debac9a1011cc6541a2ce97df5d8793465ce4c289d1293c33c29eacc23cbd2271f0a8d7362c3445a88d080edefd85046aebc8782cd930c3dd8b6837ec682bf6 SHA512 705122ca63df17812ab360da06d58431b51d3a1f3bba47df7131e882de64de54c6986e7ba3d55f4b77c4b1049981b0100ba64825e952b25712c843ef7e975e2f
 EBUILD ipython-7.29.0.ebuild 4469 BLAKE2B 953d54ebb8837bdc34c55a1cf15e0f7bca2b367608e6082523e7a7dafa9df86025ccf127de6b9dcdad767108f992f14cdc662416ad8d5beddfb1ec9216a24921 SHA512 952c6093b489d5b7e95f842630fe4dbbf05ecc5acc2750953a9cddd9184032468f72b6c44f86621b13227b41896f021625f1bbe55cd608b03851458817ad9dd6
 EBUILD ipython-7.30.1.ebuild 4469 BLAKE2B a4fe701945791cc17bc043316eea80a3c350f56c8f621e1eda6d05182c6d1a656c2ac874826777690ede2f36483b98c3632c88c64501bc76fd0ecf63b109e9d7 SHA512 2b157b63f61fbaed1a2dd5dc6c76f3d27a8303a738cac99ed7b27b9829dfaf1929e7690b41e8b84c24cf0af268aebf80e45709f3a1f15d69ad82ac1999501fb9
+EBUILD ipython-7.31.0.ebuild 4477 BLAKE2B 6c74574a989cc388ca07628230ad56d8a75cf0cd304a1d11f9313df5b7316ee9a37a7c6050c696a6499a4484f80df14eabea78e241d989c604ba0bfb66021989 SHA512 145c220398ff972009aedb123db8d8c276d44adb4bf984cdb6183baafcb854b1cd68a39a0710775af62ca72238323c458a2c80e0ee67cfd9920122b6a95aa9ac
 MISC metadata.xml 2883 BLAKE2B f61d1c66cdc9a956f3fdc9fcbc93fbc2051e9d0872beb9229e87a8fdabbce656efee9702e66bf30bec68009702f42e4036202e02208a428a8ed87b448f625536 SHA512 617f19e859544079d2680e9796e3ff0b7af41577776847d4c4dccfffc460dfc887631169289e5271120f375bea7c7836395abb9bf8a7628b3b55a7c1beefda9b
diff --git a/dev-python/ipython/ipython-7.31.0.ebuild b/dev-python/ipython/ipython-7.31.0.ebuild
new file mode 100644
index 000000000000..dfb591368fb8
--- /dev/null
+++ b/dev-python/ipython/ipython-7.31.0.ebuild
@@ -0,0 +1,153 @@
+# 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='readline,sqlite,threads(+)'
+
+inherit distutils-r1 optfeature virtualx
+
+DESCRIPTION="Advanced interactive shell for Python"
+HOMEPAGE="https://ipython.org/ https://github.com/ipython/ipython/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="doc examples matplotlib notebook nbconvert qt5 +smp test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/backcall[${PYTHON_USEDEP}]
+	dev-python/decorator[${PYTHON_USEDEP}]
+	>=dev-python/jedi-0.16[${PYTHON_USEDEP}]
+	>=dev-python/pexpect-4.3[${PYTHON_USEDEP}]
+	dev-python/pickleshare[${PYTHON_USEDEP}]
+	>=dev-python/prompt_toolkit-2[${PYTHON_USEDEP}]
+	<dev-python/prompt_toolkit-3.1[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/traitlets[${PYTHON_USEDEP}]
+	matplotlib? (
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		dev-python/matplotlib-inline[${PYTHON_USEDEP}]
+	)
+"
+
+BDEPEND="
+	test? (
+		app-text/dvipng[truetype]
+		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		dev-python/matplotlib-inline[${PYTHON_USEDEP}]
+		dev-python/nbformat[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		>=dev-python/numpy-1.17[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/testpath[${PYTHON_USEDEP}]
+	)
+	doc? (
+		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-2[${PYTHON_USEDEP}]
+		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+RDEPEND+="
+	nbconvert? (
+		dev-python/nbconvert[${PYTHON_USEDEP}]
+	)"
+PDEPEND="
+	notebook? (
+		dev-python/notebook[${PYTHON_USEDEP}]
+		dev-python/ipywidgets[${PYTHON_USEDEP}]
+		dev-python/widgetsnbextension[${PYTHON_USEDEP}]
+	)
+	qt5? ( dev-python/qtconsole[${PYTHON_USEDEP}] )
+	smp? (
+		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
+		>=dev-python/ipyparallel-6.2.3[${PYTHON_USEDEP}]
+	)"
+
+PATCHES=( "${FILESDIR}"/2.1.0-substitute-files.patch )
+
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_prepare_all() {
+	# Remove out of date insource files
+	rm IPython/extensions/cythonmagic.py || die
+	rm IPython/extensions/rmagic.py || die
+
+	# Prevent un-needed download during build
+	if use doc; then
+		sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/source/conf.py || die
+	fi
+
+	# Rename the test directory to reduce sys.path pollution
+	# https://github.com/ipython/ipython/issues/12892
+	mv IPython/extensions/{,ipython_}tests || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		emake -C docs html_noapi
+		HTML_DOCS=( docs/build/html/. )
+	fi
+}
+
+python_test() {
+	local -x IPYTHON_TESTING_TIMEOUT_SCALE=20
+	local EPYTEST_DESELECT=()
+	[[ ${EPYTHON} == python3.10 ]] && EPYTEST_DESELECT+=(
+		# TODO
+		IPython/core/tests/test_completer.py::TestCompleter::test_all_completions_dups
+		IPython/core/tests/test_completer.py::TestCompleter::test_deduplicate_completions
+		IPython/core/tests/test_oinspect.py::test_pinfo_docstring_if_detail_and_no_source
+		# fails due to changed argparse output
+		IPython/core/tests/test_magic_arguments.py::test_magic_arguments
+		# py3.10 API incompat, doesn't look important
+		IPython/lib/tests/test_pretty.py::test_pprint_heap_allocated_type
+	)
+	virtx epytest
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	# Create ipythonX.Y symlinks.
+	# TODO:
+	# 1. do we want them for pypy? No.  pypy has no numpy
+	# 2. handle it in the eclass instead (use _python_ln_rel).
+	# With pypy not an option the dosym becomes unconditional
+	dosym ../lib/python-exec/${EPYTHON}/ipython \
+		/usr/bin/ipython${EPYTHON#python}
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
+
+pkg_postinst() {
+	optfeature "sympyprinting" dev-python/sympy
+	optfeature "cythonmagic" dev-python/cython
+	optfeature "%lprun magic command" dev-python/line_profiler
+	optfeature "%mprun magic command" dev-python/memory_profiler
+
+	if use nbconvert; then
+		if ! has_version app-text/pandoc ; then
+			einfo "Node.js will be used to convert notebooks to other formats"
+			einfo "like HTML. Support for that is still experimental. If you"
+			einfo "encounter any problems, please use app-text/pandoc instead."
+		fi
+	fi
+}
diff --git a/dev-python/jaraco-collections/Manifest b/dev-python/jaraco-collections/Manifest
index f7f530c64667..62b1e5e560fc 100644
--- a/dev-python/jaraco-collections/Manifest
+++ b/dev-python/jaraco-collections/Manifest
@@ -1,5 +1,7 @@
 DIST jaraco.collections-3.4.0.tar.gz 14887 BLAKE2B 2c1e87b18dc3ca68fb5b849b30cc0284b8a8daed9b6b2b075a753f7ccf91feb487734a38bb7fc88d29020b0b1980346109551a8bba5d0b3a7f4a491c0dcb1615 SHA512 8e427f98dbcfad3f9042d1f080b2bf8012fdaaf084e230f9b46ff078623b047c2d9dab41ed0303df5dd070abce2a25289281113a97e8ab8d819048d30b8d314a
 DIST jaraco.collections-3.5.0.tar.gz 15001 BLAKE2B 3ddc63fdc8d9c9cf9f25aee0cfa1c6d10c93b337bb77f7f33527986f58bb80ae35fbcc1dcb21aadebb3303a3ee20122134fe27f95ecd4b17c64b6f5ea6e94ae2 SHA512 cf0646b388beefe1aed26c96ae725b2934b7bd9df63e57c51c9c84ad6c758c135e6bb3487e0a6a68fba149234c54f2b0eacd4b260c945f8ffed632bdcb03d88f
+DIST jaraco.collections-3.5.1.tar.gz 15053 BLAKE2B afba813636464b6776f244eab31a0cd86418410f313e171cff1c8ac64e5d902f4a6c2f88d87c61d55292baa338aee45866d3a459c5b5b73fd4e751278b869316 SHA512 2918be537296ca81e5f78a3966a47451dc9dc2d233d997c3f01461c489b44051c497dab55496f85883ac1b91a28850a9d77ff154a3f5e074da1ed07f3259c246
 EBUILD jaraco-collections-3.4.0.ebuild 789 BLAKE2B c7833c57621d2c522a6fff4a80a214720a055073a51eee68604000beb38ef1ba8e40eb744d5b57c65edb19e1e83d119e4f4629006889b39e26123f4b7b2e6bc8 SHA512 f5ee37a6a33ad54eaad6496733e3fcceb377af67b1b557ac8463cd45487df54f166ea61cd0279321125e2725c46a977bc554726a8df088b2ad4b75f64e1e549e
 EBUILD jaraco-collections-3.5.0.ebuild 797 BLAKE2B 86b83939e206562ce0e8a2a724810cf314d16e80e731b7d473e33cbc0b417ada773e486897701a06d07d7008ffffccec835da231ea21c7629134e12635f7f705 SHA512 6becd7811e7f03a8106f62e140fdd77aa92f3074196a9bac7ed351ceaf7c2cccc3e88ee3b44acc745ce35acc31ea27f63e1e18bf8a42ac998c232e1f301697c0
+EBUILD jaraco-collections-3.5.1.ebuild 797 BLAKE2B 86b83939e206562ce0e8a2a724810cf314d16e80e731b7d473e33cbc0b417ada773e486897701a06d07d7008ffffccec835da231ea21c7629134e12635f7f705 SHA512 6becd7811e7f03a8106f62e140fdd77aa92f3074196a9bac7ed351ceaf7c2cccc3e88ee3b44acc745ce35acc31ea27f63e1e18bf8a42ac998c232e1f301697c0
 MISC metadata.xml 684 BLAKE2B 2da0cbb4ee979b83d045c4c402ff420db27d1a4176c7009bf56027b9b3a7df9395e67f881dce945849870955998e65dcd13c4e77926a8e2e7d1084b475a71ddc SHA512 30743b4d3616dc141a9ce814262304d21ac20475fa70414679dd5f028dcf83021c4cf9b39b3817957f5feb623076f94df1e7a951b0ab6cf57cf635b7eaf3ef8e
diff --git a/dev-python/jaraco-collections/jaraco-collections-3.5.1.ebuild b/dev-python/jaraco-collections/jaraco-collections-3.5.1.ebuild
new file mode 100644
index 000000000000..010f9dbceca2
--- /dev/null
+++ b/dev-python/jaraco-collections/jaraco-collections-3.5.1.ebuild
@@ -0,0 +1,30 @@
+# 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_PN="${PN/-/.}"
+DESCRIPTION="Models and classes to supplement the stdlib collections module"
+HOMEPAGE="https://github.com/jaraco/jaraco.collections"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	dev-python/jaraco-classes[${PYTHON_USEDEP}]
+	dev-python/jaraco-text[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
+"
+
+distutils_enable_sphinx docs \
+	'>=dev-python/jaraco-packaging-3.2' \
+	'>=dev-python/rst-linker-1.9'
+distutils_enable_tests pytest
diff --git a/dev-python/jc/Manifest b/dev-python/jc/Manifest
index 4f1837307a20..71b789ef2384 100644
--- a/dev-python/jc/Manifest
+++ b/dev-python/jc/Manifest
@@ -2,8 +2,10 @@ DIST jc-1.16.0.tar.gz 2532019 BLAKE2B 583d52102a2e27a53171d300fb6e9ac094d5b09496
 DIST jc-1.17.3.tar.gz 3814789 BLAKE2B 09134b85c881b2701d7db68f0a16eb6f696aeb5e4fa8b6a0b1aff148adbad302fcc9019944acc45b5830966f0ffae90ff4c006895d559ca47595347442e72a5c SHA512 6cc36abcb9d57eb95b36968647a0923f3d6d39aed478df83e9d4437b0ea4aba49a5f08d9f61ba88f3a76ce3b57c2e019e7cec5b89e71ce7be8186e9e18ab4ad7
 DIST jc-1.17.4.tar.gz 3818285 BLAKE2B 0761e923916c61125967451f3b4806e3080184106c84e2c85f5de8b37d03106bde98d1b4d99f4d00308b7d935898e81cd5c7d112ed611dd4707074019becc968 SHA512 b5fc437be425d60c5e859ed9107be8a3190bc5e1eb157b01cd3b4cdcf27ccab51b6d0299f0c462b1e595d741bf905c11b25d49568159f04aa4443f51889027b6
 DIST jc-1.17.5.tar.gz 3851890 BLAKE2B 86b6c1b9786bbe30138cb7ba5171fd14682b420c3ff11716ab5d1bd4e4cc3d95067ca836c6217040799607933037b3cd6dc49e6395831140c10906e8be530685 SHA512 6e7207af158be41cf55ac7f9400c1a676075e85de0fecd63d9ddcffeed5d903a9619ac52b955d10e0db354f97e73fb9766b96e51c5648104907426000ecd1594
+DIST jc-1.17.6.tar.gz 3876556 BLAKE2B 97f84a6d1351102bc016e104c4f6d5aa8a7a47fa5ecbdad66df75253adee323259961d555d728b11090df9a05d74dfae0720655f8ea21864479b7e59f95dffa7 SHA512 a70dd9dc79a99c147aca8e647722820ba69f7668415eeea24be336e2c14728808938fa2d9e19122849ad0c1d89684f08d1ff0dc6361137eb9fbacba6546857ca
 EBUILD jc-1.16.0.ebuild 595 BLAKE2B aebf8b7d84bc184c357991e91245af6dc8d3bf1cacfb50a531c3e902c5dd3b5d0c0b1d1781700666a0c3e184d6d31e46bd9916fa7c5739f90bad1645cb852607 SHA512 338695073de1b66cb89b56520dfcc6b02c3f1c65496d59a7b8ca18a2eaf0a71d84fe4c65549fd911c9468dcfaf4b33537df53fa665bc2360d5250b0581ff2aee
 EBUILD jc-1.17.3.ebuild 595 BLAKE2B aebf8b7d84bc184c357991e91245af6dc8d3bf1cacfb50a531c3e902c5dd3b5d0c0b1d1781700666a0c3e184d6d31e46bd9916fa7c5739f90bad1645cb852607 SHA512 338695073de1b66cb89b56520dfcc6b02c3f1c65496d59a7b8ca18a2eaf0a71d84fe4c65549fd911c9468dcfaf4b33537df53fa665bc2360d5250b0581ff2aee
 EBUILD jc-1.17.4.ebuild 595 BLAKE2B aebf8b7d84bc184c357991e91245af6dc8d3bf1cacfb50a531c3e902c5dd3b5d0c0b1d1781700666a0c3e184d6d31e46bd9916fa7c5739f90bad1645cb852607 SHA512 338695073de1b66cb89b56520dfcc6b02c3f1c65496d59a7b8ca18a2eaf0a71d84fe4c65549fd911c9468dcfaf4b33537df53fa665bc2360d5250b0581ff2aee
 EBUILD jc-1.17.5.ebuild 595 BLAKE2B aebf8b7d84bc184c357991e91245af6dc8d3bf1cacfb50a531c3e902c5dd3b5d0c0b1d1781700666a0c3e184d6d31e46bd9916fa7c5739f90bad1645cb852607 SHA512 338695073de1b66cb89b56520dfcc6b02c3f1c65496d59a7b8ca18a2eaf0a71d84fe4c65549fd911c9468dcfaf4b33537df53fa665bc2360d5250b0581ff2aee
+EBUILD jc-1.17.6.ebuild 595 BLAKE2B 1bb002fc60911bb430e13ff166e84fffd0d0a22bfa2e08750a305f11a6ca8d57df1cbd009e91b23cbaeb068564ac57001ff613c0a63f643b5cb7fdfe934c3092 SHA512 76036c213cdee21957dc20dfc8a90b3cdee04b2458a5849ca05eac747949e90eb54a42a65a33081a2e467ad34e5c9c389f1a7be36fda28cd760267039baa82b3
 MISC metadata.xml 391 BLAKE2B 7ae27439328a8823bbc95bbd4877e91d858db314b7ad708b10abec19d8bfa818a0dfa6821aee0825497353e071771bac4ddbeddb78749ca841d882c6a5f5493c SHA512 7d4760729571e0b5e055248a89dec389682cc4da6dfbd117d5a42ec016d4ea3c1f8fbd99118c3b62fd32195c6cae6aedab956678da48d61d6a0cee801a2ccf04
diff --git a/dev-python/jc/jc-1.17.6.ebuild b/dev-python/jc/jc-1.17.6.ebuild
new file mode 100644
index 000000000000..5d846f299830
--- /dev/null
+++ b/dev-python/jc/jc-1.17.6.ebuild
@@ -0,0 +1,25 @@
+# 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/libarchive-c/Manifest b/dev-python/libarchive-c/Manifest
index b1deb323b031..0f350b9e338b 100644
--- a/dev-python/libarchive-c/Manifest
+++ b/dev-python/libarchive-c/Manifest
@@ -1,5 +1,3 @@
-DIST libarchive-c-3.1.tar.gz 11145 BLAKE2B 80d8918423ec23065cfd7dc391f458bdd44ade765c5e16c23f6cd1ff760e750551d1ff16ccd524a409f466512cb4caed9d25716d12021eafc915a9904bfd0f63 SHA512 1863e2981475839aebce50aa649f603dae7d54772fb864a83613e1d94ead48b64e0edfa0046fb91d1fc985a351911dcd13a24cddfefbb5b7403da1107dc3353c
 DIST libarchive-c-3.2.tar.gz 44896 BLAKE2B 9e984c8e23422ceb552d34d4560b2c8279e1c2d52ffedcc893af3a1a8420eb03b735058d2f8dbe542f3920d0f0bf53777f0679a238cc0368e8e680c44358a72c SHA512 d11a7da0e592b7fce5044b9ff2930e50004c15b166a76f7871b9d0d584cb6da5989c4ec79969439b00baffa564738af607cdf5e37141c6e879b8a76ae68c325c
-EBUILD libarchive-c-3.1.ebuild 466 BLAKE2B 51c6f2bf1b36b72e1882e76caf3905bebb19ebb855a90a8e56ddf3183c41864437abccf46835c280e99c76f4b5b3d97de466e4d85e78505bf9ea5a1f96132d0d SHA512 6f57b45b62ad9236376ae380ad5ad78889c31005788a1c12901695d227181cd9c44b0f5b16dea18c0639da3faff97fba6526907b867cf5e72b273ac83fb06be8
-EBUILD libarchive-c-3.2-r1.ebuild 631 BLAKE2B ad8b464d7599dc870b769574810394887728e104b1ac714834154851ce016e6d62223a62cda77144263b6e704a662e2424f4119195cf03c7a12a06ed6147a8a3 SHA512 228639fa3b627b8041d865b9834e7a335eccc27a6f72abe3573a08f2500ba3b77c26aaa12455716c62ef82e83c7797c6e19e4edaff6681909c852c21ca9111af
+EBUILD libarchive-c-3.2-r1.ebuild 630 BLAKE2B aba428c539f202d53ce2621d95adfdaea5721e34d2bd0a58d873aec4da12b4723962a4cf1411434f7d6fbb5bb3b343a3ecd96c7f96594b67d7be8c777b859eff SHA512 6d25650d657b7b54104357a666ef546166221270d88d647b738146bbd1162853195e5c57c578379793b30b35e4b4adf8cf6957dbc3b9fb8c1e4a726ad7c24e18
 MISC metadata.xml 562 BLAKE2B 5b9cebc30209b517fc5ed60eea8e340dd36b16fb1c593bb857a05bc6a8cba3b6ac45a54891c72429a775b15afcd7f56b453ae628aa61d029db1df633e764518b SHA512 200c3fd7789d21103719ba2693f8298a8be1842535ff086ad487a66e9d4ae39f6dd1b2435d60fc0443add133923cf047f37c2de17f581fd66f786f935e203c43
diff --git a/dev-python/libarchive-c/libarchive-c-3.1.ebuild b/dev-python/libarchive-c/libarchive-c-3.1.ebuild
deleted file mode 100644
index a51f7d77879b..000000000000
--- a/dev-python/libarchive-c/libarchive-c-3.1.ebuild
+++ /dev/null
@@ -1,17 +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 Python interface to libarchive"
-HOMEPAGE="https://github.com/Changaco/python-libarchive-c/ https://pypi.org/project/libarchive-c/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="CC0-1.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-
-RDEPEND="app-arch/libarchive"
diff --git a/dev-python/libarchive-c/libarchive-c-3.2-r1.ebuild b/dev-python/libarchive-c/libarchive-c-3.2-r1.ebuild
index 147604f129d3..07b3b940883d 100644
--- a/dev-python/libarchive-c/libarchive-c-3.2-r1.ebuild
+++ b/dev-python/libarchive-c/libarchive-c-3.2-r1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}"/python-${P}
 
 LICENSE="CC0-1.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 
 RDEPEND="app-arch/libarchive"
 BDEPEND="test? ( dev-python/mock[${PYTHON_USEDEP}] )"
diff --git a/dev-python/libvirt-python/Manifest b/dev-python/libvirt-python/Manifest
index 4ff00f9c2daa..a077df915b77 100644
--- a/dev-python/libvirt-python/Manifest
+++ b/dev-python/libvirt-python/Manifest
@@ -1,32 +1,8 @@
-DIST libvirt-python-7.0.0.tar.gz 214945 BLAKE2B 9ab616fa6336a284dbb1dcebf0be6a06d9ca0c41e83ca403cb335c61ff217e1e9f0343fc915e20e16f3e59adc5c7b1c51e493143c45cd50f48f627ebe2e9c211 SHA512 c56bc53da06a81d330389f684df204d0ae8edb28127eccd81ac551342a0965341d20832f6e2b044e02e9217320349f6f5cb36098c5cc46508a4026fb1e59c4ac
-DIST libvirt-python-7.0.0.tar.gz.asc 833 BLAKE2B 54102c29a46900dc5439ca5b96d17d0f3923fb1cb5fa74ef7671a49645c5e5d7f43b608099f542410ca38d675a384e2ad3fdfd7494bda6e66b889ec3d9f04e9e SHA512 4ca5cf4e3687e3cbdb3bf9991076ef4d0427db4b7eb27738d4463c5645d684581dd20377339e6bdac66e790f10709df9f483dd9f360a1b978776fe5d3e2dcc64
-DIST libvirt-python-7.1.0.tar.gz 215468 BLAKE2B 5734f686760d118bc326c68d93714db31b65d0d2f8495c8fb7788aa59658680cc07b8c522e5854bafc6a75989cee4b7c817ec0f54ae5ebcb76ed74418fa1c0f0 SHA512 9c4adf0107b2b6d8ac3f84f4a201733b851b5c518e498b4bb8fe3531ec8923b2a96e5593ee0fe309b9501884a83e77a6a0347a6714293febf907c9a4dc742cd4
-DIST libvirt-python-7.1.0.tar.gz.asc 833 BLAKE2B be4101dcff4f95e36929dc70657a527e7b0b30fe9556c8d42f240459f86f7ba71980cf483f4d828d63cf94ce3c4521e7303d72f6df5e6c4c2a6de1b160970073 SHA512 db0213bb95d77c690ef8726ae559cae7970d31e633104993e715dd4e34e2f3c52bdcf7303e90419055d571d21417ac6375d78463143e20e94bf4aaf666684174
 DIST libvirt-python-7.10.0.tar.gz 218394 BLAKE2B be1b64489503ca2e8bcaafc516ab228052b4e3e486aef1ef5310a95051a9549fe262feb009356f3735a3656e7b445ef6943b1932373be3618c36445042da8565 SHA512 db3c6ccffa3c2f38b788964f7a9cedee3e8de64fb5ecb65ac859eeac1450bea1ade8a7259a6035d7ee25af7d861b2e87f6eba24c21cab3f483c1a97318181d7e
 DIST libvirt-python-7.10.0.tar.gz.asc 833 BLAKE2B cf9d661bafd7e2ee52e895d3b5aa7d569226f90b4924a95c4178fb724847bfdcd085b04ae33a315480b20115318604809bc4a7edce5c801fd1286581cd8989a5 SHA512 f36d47b4b78daa1e848954acb3032750fc9bec58723b9bd04c48ca1a9b45e1a0252b85adef239080f6aef199c836d04db283510b099c69792e1c4b403c7d3685
-DIST libvirt-python-7.2.0.tar.gz 215380 BLAKE2B e9c55a193c571b8fdf3f7f2545ae82470ff74e74e4f2fb58dda6278bc484eb26ae84f2991bc34adc6030973e7d53d364576247e1f8ab836edea06a5da0f8575e SHA512 6df5be4d98884751e4a098b54ec1d8827268993b6df5769c1a687420dd5889c629ca0bd286f5a0c22a9c81974fa02565b36628f8026c697ae414137f0c1d8441
-DIST libvirt-python-7.2.0.tar.gz.asc 833 BLAKE2B 3f93f4841da3d86c6a0ba073b70c44e3732eb0ca91fd80a7089c1731851173d163101428d07f82f688478a7967e71bd66b49cd70673157428d2c4802a5df3bae SHA512 fe4f7bf6a9ea6e008ed73fac588785281582dd5eaa738e5ca05b88534659096af137408e1222f791d5a13190358fcf5d30eaa8d8a24791e3b5a15622516fe05f
-DIST libvirt-python-7.3.0.tar.gz 216823 BLAKE2B 2f7ff569e1dc05ac013e21046eab26290d1977401cda063f9f60e27f09cbe7ab1f30e17c2d9dfb11b36930a7af8496f2d36b19760819c64836844ce8daf8da01 SHA512 a99c0d7258364464df6a68e5fee3137daab3e6ef0dc8924b95a2b7bb69bcaf221d6be17d004ec994e9fae223db920360352b5b32945586ecc1407cb6bd86682a
-DIST libvirt-python-7.3.0.tar.gz.asc 833 BLAKE2B b5c26dbf520570ab0b66f3b31a2570a6bab0e252970d0a952411b91d08141edb1a7b53a7404e29426558502dec3f9260bfc815209c524a761b87a70004acd008 SHA512 8467a0af37849b64aab33ff1083f6feb82c39f6c732f53f407037d3f7add5c5007e16d5906e268576239d61ab8d871356fd3e476b8a64fa7aeb51b018383dcf0
-DIST libvirt-python-7.4.0.tar.gz 217038 BLAKE2B a8cec1ab8652b2579daea23b746d01c58bff32cb59a0c3b18a93ff309dcfd2b60915c52cb907c3961289427da5e73c4cae973d4204c352b5892222255e05b576 SHA512 e266b04604a21c0c35cb6c080ca5279f3162dfc489fd5ed9542b9ff49567b02074bcac135897d1a8f2375a744c000dbd93b67831621744c2f596b16ca9116d1d
-DIST libvirt-python-7.4.0.tar.gz.asc 833 BLAKE2B c092743b62ed256267c129d253332322ffd1ee46b054938eb99404db81379cb8c6422e045f1855076f6420ce08e4482ab77db71e2ef6d38bc35136e95858684c SHA512 bca8a981517782e204f51eba465cf101aa0bcbf60e0e26a655c5fa2faaf1585b17988e627bd26b98bef2b95536ae852590773806365cff94860845acf2534d54
-DIST libvirt-python-7.5.0.tar.gz 217284 BLAKE2B 65bae31bc484da061e116c5fe0da68df07ec42160db852c9fb83a5c6f91762d762638fec918ea6164400622178e4cacc416ff343fd2df1bd94a62f1b1a6b93a7 SHA512 ae111e4b7db5662af5315642232e2308ebc349bf80a3f9fd372b0fa0ebcde8e25690368187c86d425faef397550caad3366e7b6a3e6a0c4b56fa58df5e8bc276
-DIST libvirt-python-7.5.0.tar.gz.asc 833 BLAKE2B a6963fe069985a3c4f24007f45dc04b26517dff38ff5f14b00816a65651d83ca5e68cc6e168a318240152da5e20d75176ece9108e50f1e1d3d074dc5d4942f5e SHA512 029ada81b25445df8107651b11299a9ad259c6f990ad5d1aad617e65af49493fe824989fd9ade2703c927c59f1a15ea50c4af2d90ddf3da41aabeccdd399730f
 DIST libvirt-python-7.7.0.tar.gz 217406 BLAKE2B 4e3e887f9778ca817028d9147913618dcbdc83d05ce01b05b80661bb4cc823de6dc0e9d9b0837bf344774e5a8cdbaec7d4a7e55ce902b2867159795b85800cdc SHA512 07aa75a19dc94f3bde49b1af50fa73a6c920059b3b9ca943354c59f174d756aa5d1dca1394844dc3197b6a22c440028d347480a17858bc18fe1b5b19cf7d797f
 DIST libvirt-python-7.7.0.tar.gz.asc 833 BLAKE2B 159f5b5ec60d3b7966f3f99c185eddb8d2d03480b203473ae47e6139b21f8a4ee8bb8ba28ccacb88ad42c7b47d45862ccb48c90151203fb4e2295f355984e538 SHA512 b58579e648b82ec51de5f15e30dee39f7c42edf47ade4ad6f580bef21191f649b03eb05906bf31baa19afb6fadb57662c5326edb53b056a7235308d9c3bd551d
-DIST libvirt-python-7.8.0.tar.gz 218185 BLAKE2B bc975dfacb73517a3c9771d8d692411a6ec1cdfc2e8605d6cae28e8b6e3b74e15e882cd45b8369802b07e4b583795377d2f005cf1462a76e9f98c33591b472fd SHA512 e50dacc8214849dc2fa752e21061826463753b912765c3186948c9d634c18f0be8b579acd7765878aea27b2cd6f65e7113a8f8b90791ad76c69834d4e947b6cd
-DIST libvirt-python-7.8.0.tar.gz.asc 833 BLAKE2B 47a4b7a582caf04a9cf805e530af507733102fc13d952a5107ca9b25e62dd4159fddd9325055b1f647eecb17dd311811325f421a31e76b86e401815e11c65196 SHA512 2b5464b982881bc2927ce3932bb73a7bec2204b549aa3068bdfcf52232bd40141b09064280864a4c1dbcfe7fe31041bbee070d5ce7ce33afccb3d431f7119d4f
-DIST libvirt-python-7.9.0.tar.gz 218332 BLAKE2B 421dfe2b3eb4103516ed124fc6a4b0d5d0c7c3d30e17a2a16eb3763433f53bb72ae0d95034fa41b01e331e9090c18618ee57493afae4757f8e864fa208cdcc42 SHA512 d147da38710853c1dcf93dc271b1d1ff32afb45e3eb5c24c931da4943827ecec0c3840b975fb40e240ec7038cc81cb7848d387e7550e4f4803f35e2d08cbedff
-DIST libvirt-python-7.9.0.tar.gz.asc 833 BLAKE2B 3037a0fd66ad0c0706b76c6b64552d69b5f93ef2377c5cb02dbf62f85e47ee7d76970fa5bf3aa5653751f022e4f44e081d009dedbdffe677b1b288e2e8f9c498 SHA512 4bbd38d27c5b4ccc5623425de8dc3c0e1bec2560a4e52bbf2ec7b0ea2984563501e77157d234ad03a988ddaa9ba20545b3086582c93cd51cf8e756c7c7e55ff5
-EBUILD libvirt-python-7.0.0.ebuild 1198 BLAKE2B 824a49883b9527b2d737d5f16d2dcaa0d350e45bb14d67e158cf7bd672d51cb870d8c003777b65f88feed7f1502a66fcc329eebf61c9140014d5eca1f5748ac4 SHA512 2b8998758fef849da36258408f2b9804f32e8fe11d094c2176d37677f44d2d5c1942f2a5d2bfb75b8bd95809239e03c1a6a719fd03fd9234ba480099f7542919
-EBUILD libvirt-python-7.1.0.ebuild 1200 BLAKE2B fe3f5a9bce237d2c24eb1db4de048343c5241f49194a0c38a70e5ad53858fa84293657b5820ca1ed777f7950f8ee70c9b286ac3eee690fd3381b0ebb3ac5aa1b SHA512 80e0846c70759e4bf162fa62e2a6d2b27caf2a307f8d8c3d153f5a4781e7a760b0d9830a42ddf8be7f0bed3713fafff214c3aaf5073e3e563bd5b8b4a7629026
 EBUILD libvirt-python-7.10.0.ebuild 1203 BLAKE2B 04462f68c88c301e83c72cd433aad02f57c59eb7dcac859e95274884ef402228e0fb763192ca386000c7cfcf01aa912e2e57a3cfad74f31b5c29d19f4093c9a4 SHA512 048071b092f9d23cba1b7120ebd1c965d527e1ee43555c673f85a86744742d8ae280dc118936e4a7a0dd4bf1be8934e16d1615de6f0f74d0e1237759dba35930
-EBUILD libvirt-python-7.2.0.ebuild 1200 BLAKE2B fe3f5a9bce237d2c24eb1db4de048343c5241f49194a0c38a70e5ad53858fa84293657b5820ca1ed777f7950f8ee70c9b286ac3eee690fd3381b0ebb3ac5aa1b SHA512 80e0846c70759e4bf162fa62e2a6d2b27caf2a307f8d8c3d153f5a4781e7a760b0d9830a42ddf8be7f0bed3713fafff214c3aaf5073e3e563bd5b8b4a7629026
-EBUILD libvirt-python-7.3.0.ebuild 1200 BLAKE2B 1093fde59894e1be59ed7f2cfc8551adc1fd734062c6177231f83705dcd031dea87b453096ce48ac00b591d84c4abffb05128cc0774da032a02209dc822da332 SHA512 0fdc2cbf25f273ce92b9a2946b4f55793925750d77e8656d1ad2f1bc0b8b20ae1a84e3ad142395dca13eb7b83637ecae5cadf15b832c630f8a0b7e4ec6bd4acb
-EBUILD libvirt-python-7.4.0.ebuild 1202 BLAKE2B 49fe5fffcbc1a0e9e01423fda696df32a6a0f53fdc6da3ae2cd360c2836af364643de2e134ce1aebe156f9e20dbef9e7430895a53e17cb651aec67f15eddd3ba SHA512 3921ab21258d2279f36bb5476a9a43d85f3949b808c267249c0d817440c4dd19ab4237455667a3f9e0ff8d392f4c5fabafd3f0982b5ab76934c4c25e8e334d62
-EBUILD libvirt-python-7.5.0.ebuild 1202 BLAKE2B 49fe5fffcbc1a0e9e01423fda696df32a6a0f53fdc6da3ae2cd360c2836af364643de2e134ce1aebe156f9e20dbef9e7430895a53e17cb651aec67f15eddd3ba SHA512 3921ab21258d2279f36bb5476a9a43d85f3949b808c267249c0d817440c4dd19ab4237455667a3f9e0ff8d392f4c5fabafd3f0982b5ab76934c4c25e8e334d62
 EBUILD libvirt-python-7.7.0.ebuild 1201 BLAKE2B 9d90ed12d8dcdf52c9ff606f0d9d4b192bc740719727746d6044831b7f186f24fbee7730aa1e3861058d2b1647d5904119e5d453b0ec2793aee23f636717cba8 SHA512 517049311c58c4c8d16414519b0d66bbce431ca9452bd3555c3b0c68bf246afc0f1dd1bd97f867178c001d0fed4b45fb9f5d115a233f4f64828198e22fae1432
-EBUILD libvirt-python-7.8.0.ebuild 1203 BLAKE2B 04462f68c88c301e83c72cd433aad02f57c59eb7dcac859e95274884ef402228e0fb763192ca386000c7cfcf01aa912e2e57a3cfad74f31b5c29d19f4093c9a4 SHA512 048071b092f9d23cba1b7120ebd1c965d527e1ee43555c673f85a86744742d8ae280dc118936e4a7a0dd4bf1be8934e16d1615de6f0f74d0e1237759dba35930
-EBUILD libvirt-python-7.9.0.ebuild 1203 BLAKE2B 04462f68c88c301e83c72cd433aad02f57c59eb7dcac859e95274884ef402228e0fb763192ca386000c7cfcf01aa912e2e57a3cfad74f31b5c29d19f4093c9a4 SHA512 048071b092f9d23cba1b7120ebd1c965d527e1ee43555c673f85a86744742d8ae280dc118936e4a7a0dd4bf1be8934e16d1615de6f0f74d0e1237759dba35930
 EBUILD libvirt-python-9999.ebuild 1203 BLAKE2B 04462f68c88c301e83c72cd433aad02f57c59eb7dcac859e95274884ef402228e0fb763192ca386000c7cfcf01aa912e2e57a3cfad74f31b5c29d19f4093c9a4 SHA512 048071b092f9d23cba1b7120ebd1c965d527e1ee43555c673f85a86744742d8ae280dc118936e4a7a0dd4bf1be8934e16d1615de6f0f74d0e1237759dba35930
 MISC metadata.xml 581 BLAKE2B b0ce75afc6b03055de71b4903b3d8ea2198790873051f4aaa5e15a2c3e77b50f320ec3d9fb7f379194889e771296f81c65f2826ca2283ba4d4a9a5ccc8af932f SHA512 a123b9833c1154c96842d234f5c8b729bd6be5a987a5d09035109261a27b0c6f2b26c3bed5865f4cc3b5b262e8a3d2c69908550fb804da15ea47d297ed9e39c8
diff --git a/dev-python/libvirt-python/libvirt-python-7.0.0.ebuild b/dev-python/libvirt-python/libvirt-python-7.0.0.ebuild
deleted file mode 100644
index bf9ab56e5f05..000000000000
--- a/dev-python/libvirt-python/libvirt-python-7.0.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-DISTUTILS_USE_SETUPTOOLS=no
-
-MY_P="${P/_rc/-rc}"
-
-inherit distutils-r1 verify-sig
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://libvirt.org/git/libvirt-python.git"
-	RDEPEND="app-emulation/libvirt:=[-python(-)]"
-else
-	SRC_URI="https://libvirt.org/sources/python/${MY_P}.tar.gz
-		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"
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/libvirt.org.asc
-IUSE="examples test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	virtual/pkgconfig
-	test? (
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/nose[${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-7.1.0.ebuild b/dev-python/libvirt-python/libvirt-python-7.1.0.ebuild
deleted file mode 100644
index 7d20168281cc..000000000000
--- a/dev-python/libvirt-python/libvirt-python-7.1.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-DISTUTILS_USE_SETUPTOOLS=no
-
-MY_P="${P/_rc/-rc}"
-
-inherit distutils-r1 verify-sig
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://libvirt.org/git/libvirt-python.git"
-	RDEPEND="app-emulation/libvirt:=[-python(-)]"
-else
-	SRC_URI="https://libvirt.org/sources/python/${MY_P}.tar.gz
-		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"
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/libvirt.org.asc
-IUSE="examples test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	virtual/pkgconfig
-	test? (
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/nose[${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-7.2.0.ebuild b/dev-python/libvirt-python/libvirt-python-7.2.0.ebuild
deleted file mode 100644
index 7d20168281cc..000000000000
--- a/dev-python/libvirt-python/libvirt-python-7.2.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-DISTUTILS_USE_SETUPTOOLS=no
-
-MY_P="${P/_rc/-rc}"
-
-inherit distutils-r1 verify-sig
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://libvirt.org/git/libvirt-python.git"
-	RDEPEND="app-emulation/libvirt:=[-python(-)]"
-else
-	SRC_URI="https://libvirt.org/sources/python/${MY_P}.tar.gz
-		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"
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/libvirt.org.asc
-IUSE="examples test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	virtual/pkgconfig
-	test? (
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/nose[${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-7.3.0.ebuild b/dev-python/libvirt-python/libvirt-python-7.3.0.ebuild
deleted file mode 100644
index e3d4ceacd974..000000000000
--- a/dev-python/libvirt-python/libvirt-python-7.3.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-DISTUTILS_USE_SETUPTOOLS=no
-
-MY_P="${P/_rc/-rc}"
-
-inherit distutils-r1 verify-sig
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://libvirt.org/git/libvirt-python.git"
-	RDEPEND="app-emulation/libvirt:=[-python(-)]"
-else
-	SRC_URI="https://libvirt.org/sources/python/${MY_P}.tar.gz
-		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"
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/libvirt.org.asc
-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-7.4.0.ebuild b/dev-python/libvirt-python/libvirt-python-7.4.0.ebuild
deleted file mode 100644
index 0497fc27682b..000000000000
--- a/dev-python/libvirt-python/libvirt-python-7.4.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-DISTUTILS_USE_SETUPTOOLS=no
-
-MY_P="${P/_rc/-rc}"
-
-inherit distutils-r1 verify-sig
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://libvirt.org/git/libvirt-python.git"
-	RDEPEND="app-emulation/libvirt:=[-python(-)]"
-else
-	SRC_URI="https://libvirt.org/sources/python/${MY_P}.tar.gz
-		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"
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/libvirt.org.asc
-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-7.5.0.ebuild b/dev-python/libvirt-python/libvirt-python-7.5.0.ebuild
deleted file mode 100644
index 0497fc27682b..000000000000
--- a/dev-python/libvirt-python/libvirt-python-7.5.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-DISTUTILS_USE_SETUPTOOLS=no
-
-MY_P="${P/_rc/-rc}"
-
-inherit distutils-r1 verify-sig
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://libvirt.org/git/libvirt-python.git"
-	RDEPEND="app-emulation/libvirt:=[-python(-)]"
-else
-	SRC_URI="https://libvirt.org/sources/python/${MY_P}.tar.gz
-		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"
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/libvirt.org.asc
-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-7.8.0.ebuild b/dev-python/libvirt-python/libvirt-python-7.8.0.ebuild
deleted file mode 100644
index b689d4232481..000000000000
--- a/dev-python/libvirt-python/libvirt-python-7.8.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-DISTUTILS_USE_SETUPTOOLS=no
-
-MY_P="${P/_rc/-rc}"
-
-inherit distutils-r1 verify-sig
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://libvirt.org/git/libvirt-python.git"
-	RDEPEND="app-emulation/libvirt:=[-python(-)]"
-else
-	SRC_URI="https://libvirt.org/sources/python/${MY_P}.tar.gz
-		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"
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/libvirt.org.asc
-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-7.9.0.ebuild b/dev-python/libvirt-python/libvirt-python-7.9.0.ebuild
deleted file mode 100644
index b689d4232481..000000000000
--- a/dev-python/libvirt-python/libvirt-python-7.9.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-DISTUTILS_USE_SETUPTOOLS=no
-
-MY_P="${P/_rc/-rc}"
-
-inherit distutils-r1 verify-sig
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://libvirt.org/git/libvirt-python.git"
-	RDEPEND="app-emulation/libvirt:=[-python(-)]"
-else
-	SRC_URI="https://libvirt.org/sources/python/${MY_P}.tar.gz
-		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"
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/libvirt.org.asc
-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/mistune/Manifest b/dev-python/mistune/Manifest
index be082bef921f..05cfc2faf71a 100644
--- a/dev-python/mistune/Manifest
+++ b/dev-python/mistune/Manifest
@@ -1,7 +1,5 @@
 DIST mistune-0.8.4.tar.gz 58322 BLAKE2B e65d45c5c95706a49a7fd407afe5f10e82a475766ca272ec3bebba8c89e670fe6efced7b09537efb69d3fd36e75091e370170a15ad7488b5cbe9186e2ccaf4db SHA512 36c3ef5d5537f5cceaa43e4da20a84b27c378cb744a93f0380024faefde490bcb42c453f79002ca049083fc437278f4afb3e10de5462f9eeb9077ca2a2fcaea7
-DIST mistune-2.0.0.tar.gz 75635 BLAKE2B 0704b5043178c553961bfd5d99ea92ee097849e6a4cc6196c7e97e0caa4560541b4ae4b9e61e62e21592be6f2f0c142081200c5a398e68d7b7f7d54f0bbade15 SHA512 cdb1ad001a95680b048f4363e95c00e4d597007fc2ae72adeca483ffed3fae3aa55c7774d96a1dd7400568b24c73cc6f877bb7b0f63b48689a97a1e4ce0b1c5d
 DIST mistune-2.0.1.tar.gz 75657 BLAKE2B 399ad8902aeb88e8e3645f5200bbfea5011157d3251af33188d2a0298c46dfb5f8e70cd951b216762942a84d29df1bc12e0750bc928f2e0c8e96034246438f53 SHA512 f6a0e08fecfeaad7d4eb0cae155bdd5ab67c66ae15a3a067c9f6cbf47a229cb9b540d49ecdb5c2fa98c8344863e1249ef86f84bc4d966fe473ade18a266c1ec6
 EBUILD mistune-0.8.4-r1.ebuild 537 BLAKE2B 8215da3fb65ba6b4fb9e8068b87f5298e998895ccc9e2af1355fed21f4f9af6da11883dfca2fdc4925563fee272b26489c582074394f41ffb6a3ed6731e5ef34 SHA512 ba25b829d4b24647d6a7890d425a77abc6fe35fc2c8d5124de769444260fec78bba7dd6839b48bee989071f2194b1374997f8bc704611cb293bbfbeff2fc7431
-EBUILD mistune-2.0.0.ebuild 718 BLAKE2B b01bdb7a2a4742729df6d4fe9d26ef9cd220971bc6c628484666e91b260ee1636ace7103da269afd313ecd7f9b0bc6f9102540afb784c043fad394a6a6940ddd SHA512 5a63be1ae5084596145f91d91a4543852e477f36c8364d0cc76234672b97ed274116d087c86d365ccf03ed820681734dcac835ab0bedf6ad5fac1e8ea6aa708a
-EBUILD mistune-2.0.1.ebuild 586 BLAKE2B 8ccdc956f44ec9fa98d434be92675d52aee56ad6cc5ba8c2fcbfc87530c4f7e7223d3fdfa9959965a8e1e70e3eaed7816d3970555f7f706a75c366f54c6af86f SHA512 3b62aed713b3f476492ebf888f21c03aac6474eadc03856bbc9dda9c5868c9f482f279cb35de65c9af95f2db82a0ce3eb2d85d7ded908c08a651fee12daf9aa5
+EBUILD mistune-2.0.1.ebuild 578 BLAKE2B 4301d37b66a5b118cc7be39a0520c01e72307a27edbe6e8873cfe013ea15856f5b8de776a6636b82bb5bdf92c11ae0548ed8d1d1c078d7c86cfb834bbf3ec45b SHA512 6810a93b3a8646d2ae2456149d329b7655c559d216a67f36d4ca6529e60f563345cebee05edde9402fb2a46d8a5d0e123639270b8f6f04387a98d89ae17e0fdf
 MISC metadata.xml 403 BLAKE2B ed684a2a6de8b40c202467abc3277bfd280cff4441bd265b2ceb36105a4d3315a5147db7ec555a01c7cdd5c2ed26521254c75586cd44edbeaf0c59766800fc71 SHA512 a14b77e8fca2f7c7c51803f15a53ab82198d5a0682f7ebc53d5565e5b50d22c2ae196607da6fc67ef2c07c11a5469d394b1753546c270735dfa56a99bffc0f28
diff --git a/dev-python/mistune/mistune-2.0.0.ebuild b/dev-python/mistune/mistune-2.0.0.ebuild
deleted file mode 100644
index ca582a8ab68a..000000000000
--- a/dev-python/mistune/mistune-2.0.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
-
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="The fastest markdown parser in pure Python"
-HOMEPAGE="https://pypi.org/project/mistune/ https://github.com/lepture/mistune"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# seriously?
-	echo 'build-backend = "setuptools.build_meta"' >> pyproject.toml || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/mistune/mistune-2.0.1.ebuild b/dev-python/mistune/mistune-2.0.1.ebuild
index f47293cf44a9..3e58d84a5cee 100644
--- a/dev-python/mistune/mistune-2.0.1.ebuild
+++ b/dev-python/mistune/mistune-2.0.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=8
@@ -13,6 +13,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD"
-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"
 
 distutils_enable_tests pytest
diff --git a/dev-python/mypy/Manifest b/dev-python/mypy/Manifest
index 5f7305a9e1f9..49fc698755d6 100644
--- a/dev-python/mypy/Manifest
+++ b/dev-python/mypy/Manifest
@@ -2,7 +2,9 @@ AUX mypy-0.910-py3.10-tests.patch 1821 BLAKE2B fda18540f14b0fcba8d57bb7e072135f7
 DIST mypy-0.910.tar.gz 2551057 BLAKE2B a3c6939c8f0e2ea19a3a3f91031330df2fb25a93cc3f9239535f15c17eedcca5716cc75c5412a1d345d8572d396c3d7128e38989fd694833cb6aec8366ac4afe SHA512 49060c13da8bf17385b6b1db6efa9ac5771f2bac92d26760c4087cf128de22846b8a062f38e83ecff524e7893f8c9cd0647a2ef89e10387138544436a2840459
 DIST mypy-0.921.tar.gz 2730985 BLAKE2B cfb7b54165b961758891fcf225f1a7d6bd9c6a7b14e6bb6d8adb990ed047bc4983b5e82de6709d3b8db85a3914e1bae2be4fd36e878d37db7387ebe6e81daac1 SHA512 f592d440b45a1bbcab973aeb717ffc805164168f1369793067a46bd2884fedcb9f981bfadd3447c6801120042553a7a7110d8cfc4e1649241d3b8685dffef653
 DIST mypy-0.930.tar.gz 2777310 BLAKE2B 4681991993b04679d21c8f6bf8327a02eb628addc289ed22fbf06e4865ee9e60b90ab41a0d0b069d0a50924bf210816bdb87cff902d4424741f4e141f0957684 SHA512 f7f7ed762eb0f56b46a174c51c34423633d72b5046129617e456c41647705380b014c0c27bd0a104319e4872f2a7d7900a260bf6151d4419c95c93e4c01c6e9d
+DIST mypy-0.931.tar.gz 2779826 BLAKE2B 11986102c6bc498a23bae52002e6ac515fa03724eed867b5356e3fb9aaa9a6eb7e699b612ab81b99dac215119402beecc702421fa82d655913976889dd4cb833 SHA512 8a336ae2f784c8ff912fc6b7dd53ed106cf14f435cee65604de74b8d4d7ab39ad65af0646060ef78e958d5a51a1de090fad628461412f2eef9593a8c032aa87a
 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 2042 BLAKE2B e5cee0db531f573d356a2313b4348c38e510f66e5cc37019d9ed4c8c01ab3c6174b6ec18bb488152683e906457c00ab1d06b130de20fb7d8319d43485f03cb6f SHA512 6aa132958b989fa0e578c1bd4f203cd9d8a79189f9c6a5596fcf10eafc8370518072ed5a6da5aa2be32baf94942194d9e71d300cb6fa9b7068b0e3171c1d2c93
+EBUILD mypy-0.931.ebuild 2042 BLAKE2B 08d6e5062ddd8ce938816a4467b9194c7babac3bdbcda97152b6d1e635010d21371c9c8ebaca2c074dd92ef8f255b1558c8e39cbab368e1afb56960ff028cba3 SHA512 421b3870e40137701fbc4de731db259a30090aee750788b935abd5f84ba0cb1f9749387c5b3cb61faefaaa24e2a505480fff65f438b90061816fdd9a6d90e389
 MISC metadata.xml 515 BLAKE2B 75827bbbeb70fd4b9295ab4689068d2d4b686b32d4059acde94fb0d08048e9e56ecaf3eec39dc5567b2753e2552353e273cdf2f4e27d077cc9b03320ee09c64b SHA512 c1c3c7a3651e61e0b63ab4462f0370cce9cbdce33e64c5e7a1fbefe8116d5d3d3b35bc4095d8a5ce28caf69b0644af3f13c9a27b683f2f981e52f8bfe4ac8615
diff --git a/dev-python/mypy/mypy-0.931.ebuild b/dev-python/mypy/mypy-0.931.ebuild
new file mode 100644
index 000000000000..6b38a61e74be
--- /dev/null
+++ b/dev-python/mypy/mypy-0.931.ebuild
@@ -0,0 +1,64 @@
+# 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 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/nbconvert/Manifest b/dev-python/nbconvert/Manifest
index 2a67b9e8cbbd..8dfceee43f23 100644
--- a/dev-python/nbconvert/Manifest
+++ b/dev-python/nbconvert/Manifest
@@ -1,3 +1,5 @@
 DIST nbconvert-6.3.0.tar.gz 900850 BLAKE2B 8ef7d3bfcb914bf4be064ef440faab283fcc71e53579a681deb343d307a8b39cca2d0b83828b9df7c45ee7e9e06164ba6daa234b678197bc8a3202cd7e560c06 SHA512 efbe18c50e408fcb7d920c5ee070d19e19f0347f7073cf86b45046f3e30bd30ab8174115c539020fbf404faf5fc6e55dc7df1ad27accb45f1b2acf2db1d325e6
+DIST nbconvert-6.4.0.tar.gz 901586 BLAKE2B 85087046fe9a211c077165f47c03e7b025c770e2d409278703ddeef3c84b3d60e1ad28650f67fb9d68b72ad077db5bbd99af5c81ddf94fd7bf67471701dbdc4a SHA512 12662cca240a4c57a41e3bc7fedebd51c6fb83a0740afa7acfcc25424ca544a44b4dbfecfb9edb396360866de0b8fafad124fbb87c46c6f796661a7f40e96f68
 EBUILD nbconvert-6.3.0-r1.ebuild 2081 BLAKE2B d46b5917df34f5cf2b1eebc0e33de809f609f00dfd8b8f0226aa604599692904a966d2295c003dfc20a344ea8cddb05f15eab87635fecf67d62fa841f6bc18f5 SHA512 164265eee260d5f10b5eda9f69701ff771eb3c0f0b556f2226bfa01212f91d2410ef0b651ceeaf7eb3a8349f96a8b07ac92c950d8c77dce9f875ac27408991bf
+EBUILD nbconvert-6.4.0.ebuild 2085 BLAKE2B 30dc55c2f3c140c5228f792429f4d124256c1528b814fd4499aee29e411cf0edc7fc7aa6be5ac5ded3b1987576797643e7b1771fc8cb541d0c2a5970e2590f11 SHA512 405a203e63a8aa512d243652a4aea8fbe426b7efb263fa5611235d7438b16067b4eb41eca7fb227d9df2905429a5d4ad415799fd3e2a990ab39bc2eb9e3d1054
 MISC metadata.xml 527 BLAKE2B a915103b3eaf57236f4257c98354a1e3733771369ac825fa8bbc4f79f0d1a23272dc86e744513620fbee37792e813a15dbb955e633a7c57597c3c38657ed05d3 SHA512 b60a311ce52915dbc12addd4a882670ac96ff8b3be2aa651eaac3d0963d6e73a72eaafd53f90fb685599504857e6bcd0568071962d7696c2605462b77260ad6a
diff --git a/dev-python/nbconvert/nbconvert-6.4.0.ebuild b/dev-python/nbconvert/nbconvert-6.4.0.ebuild
new file mode 100644
index 000000000000..3b031affd2a1
--- /dev/null
+++ b/dev-python/nbconvert/nbconvert-6.4.0.ebuild
@@ -0,0 +1,73 @@
+# 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="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/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/mistune-0.7.4[${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}]
+"
+# Skip inkscape on hppa b/c tests should skip it gracefully if not around
+# It's a heavy dependency.
+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}]
+		!hppa? ( media-gfx/inkscape )
+	)
+"
+
+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'
+	)
+
+	distutils_install_for_testing bdist_egg
+	cd "${TEST_DIR}"/lib || die
+	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/nltk/Manifest b/dev-python/nltk/Manifest
index ae58612991f2..e6a420aa5615 100644
--- a/dev-python/nltk/Manifest
+++ b/dev-python/nltk/Manifest
@@ -10,6 +10,6 @@ EBUILD nltk-3.6.2-r1.ebuild 1634 BLAKE2B 85e25a760e7c94b0b4cf463d7ab89eb34a7d235
 EBUILD nltk-3.6.3.ebuild 1588 BLAKE2B 8f84fa992e8b0c66338d34f070525b0dffb12ee67db46afee7f15e9816bbf543f1545e011b033baca9b21b162d2b1a11d7b9377fd638a92810d899657f51d53d SHA512 a56930b8055184d820bdbcd2a3bcdbe056957d9707319b31b0282514471a41ca539e406da318001b647e2b50daa1ed075eeacee529270c58969ee9570522f0b3
 EBUILD nltk-3.6.4.ebuild 1588 BLAKE2B 8f84fa992e8b0c66338d34f070525b0dffb12ee67db46afee7f15e9816bbf543f1545e011b033baca9b21b162d2b1a11d7b9377fd638a92810d899657f51d53d SHA512 a56930b8055184d820bdbcd2a3bcdbe056957d9707319b31b0282514471a41ca539e406da318001b647e2b50daa1ed075eeacee529270c58969ee9570522f0b3
 EBUILD nltk-3.6.5.ebuild 1573 BLAKE2B f7a727c64cfdc6304534c42311cea15e3111dda24b6aed909a12b2be8acb994a7e3fa4352e8422ac1855715615aa1a33e823d8f818dd259b02de950886859efb SHA512 62b52f1a52bc7ef661a592ecdd867b7a6782db4c38d12a9f4ca5162976fd2d6ecfdb5f2e24ab82602505917ed2340ff21f0bc86ab43ba0f1b432dd694e28f387
-EBUILD nltk-3.6.6.ebuild 1711 BLAKE2B 12b8920aabb3a2627b20fcacd819cfe6e13d94ee30954151ca4e2d4f9f332becd23aa88da6f81d79d25a8725bde7b0acea0bdaa6432b88749298fcecf10ea6f8 SHA512 5b64de91071339bedcf51437c4752973865abe59f23c0645ace1a6163adfb61e703145557d212485191df3478a743d04166942372fc81c5251d3404ed4cf9817
+EBUILD nltk-3.6.6.ebuild 1709 BLAKE2B e82f62c7342c4f6ff19ba93e414c220b711332d6d251e91567b58f24e149ac588025c9fb64f5aca9d79ecebece637e1a8c8a5d13cc2a83e5d285dbe0355c82c1 SHA512 d284e6658716115ac89ca6a6ae864ef57a4d30d53d4836b8e1ab19d30f8f286a1dbbb532cd1ed51b347a468990965778fc95cabf0f82f8942a35f024adb0c1ff
 EBUILD nltk-3.6.7.ebuild 1711 BLAKE2B 12b8920aabb3a2627b20fcacd819cfe6e13d94ee30954151ca4e2d4f9f332becd23aa88da6f81d79d25a8725bde7b0acea0bdaa6432b88749298fcecf10ea6f8 SHA512 5b64de91071339bedcf51437c4752973865abe59f23c0645ace1a6163adfb61e703145557d212485191df3478a743d04166942372fc81c5251d3404ed4cf9817
 MISC metadata.xml 430 BLAKE2B 9c67c091a126c4af98c56de2d8227c1da65fbfad00671825642daefa117d711475b804bd90d72345e43d519a9219e195c1de1579dd6d60f6663c9813fc9c0d81 SHA512 5707c61031544a51e298d9c4c70685011f06b9d65c2370ecba6ecc23491c92fcc30988b6c0c28cb16f21eddebe412fff978a8f9661e5e95b9cff249f81420018
diff --git a/dev-python/nltk/nltk-3.6.6.ebuild b/dev-python/nltk/nltk-3.6.6.ebuild
index 192950405d9d..186d7f12a356 100644
--- a/dev-python/nltk/nltk-3.6.6.ebuild
+++ b/dev-python/nltk/nltk-3.6.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="https://github.com/nltk/nltk/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="tk"
 
 RDEPEND="
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index a12bcf7eed5a..6499ef1a626a 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -2,7 +2,7 @@ AUX numpy-1.21.0-no-hardcode-blasv2.patch 2839 BLAKE2B fcb8c6d538b00a1a5796ac58b
 AUX numpy-1.21.3-unaligned-array.patch 1787 BLAKE2B cbc8e231e04582965d5ce60d285ec3e9c23a685b6c78f65e2d32e6b1a9e838653ae1d3f1ad5bf602159d1a63d5ee2347153df11d5aeeade6bbe2a39dd71c1388 SHA512 e0f410838a88c7c6892c972b8084ea5153453e90bd65922fb83772fca8052798173c9b450a1384032c39e9a82e91572cef39e4dc006d44def125debb404d0fd6
 AUX numpy-1.21.4-build-compiler-args-ceph.patch 2033 BLAKE2B 63aae1b73e41332d5179d822aeefd5da3289505e9d6f6d7755a34746af5506113fb81eaccc08f1582ac5820d6fb2a1d00ee4ba98ef482f4adc72c7288069c6d1 SHA512 ffad960980048603012c0d435013f0f3326a8ecd26eba8ad27c1287b3eb624733c53ddeb270108c1d26339fefc1cb8faaea233ec6e2ac7a072a023ddb12868d0
 AUX numpy-1.21.4-copy-python-3.9.patch 1698 BLAKE2B 7274c22c38820a01b02ed899f45afce95a3e5fda74f0417809caab1bf28c1e56348785c9209233ad46b00138606364548a80b5b4120b2d96f0a8cccda0d5187f SHA512 92635f37f4de7992cce2c96861fc28151fe5b6adb979db4b6a4ec456c8a84d58a8bf3ab612c1b83a5a507d96b4084d250c5d7855d245057f6977bc6a899f5a14
-AUX numpy-1.22.0-no-hardcode-blasv2.patch 3903 BLAKE2B 94f9a3f5b53d843b9568c87c88755cdb910d3b1077f6e1c7210ca0a7757a82551f86da8b997fb50dbee3b61a3616a447a587d0fd50ffb488d19b71e99e44bade SHA512 74749cd71d9f24de49f16615a3b918a0aa24b67a317699608e6518b7f661c1cf56b4e8b70c2aeda0e3e030849f7a228d0d9caf8aa8d76553af504c021d5950f9
+AUX numpy-1.22.0-no-hardcode-blasv2.patch 2710 BLAKE2B 71da07805e25acc58120da2b8d8692ec5893040eee3c2842620e2a9186062936082f34610d3056c44e44a921116f99158dfb7481c4eccc82d33b3b18a63b379e SHA512 87bcecee3435dedcd87128c81d0002a786b4b23928973216f32c8d12b797d6a9948c3e7b41142235abe35734683e6ef84c02ffe255ba492a0ad43626071dc5a9
 DIST numpy-1.21.1.zip 10259878 BLAKE2B ba5d8eb2d294e199c86d8e96026d148098f5716398e730e0fdfee3b710fd01cb6e877973471d7751a2e558c2eaeb626fe9ce5ea4b03a7e4f8e5dc42b852d5b7c SHA512 694100915f4e2917d70a83e7fcdad30c85ffad8f5ad8d164c89287846c1b746c2b577233bacf53e8d8ca5147391f46065a2cabf100957bb8841dee4a042bc1f5
 DIST numpy-1.21.2.zip 10264801 BLAKE2B 2d88506faa5bc767a16c000f201559917d800fd205c75f30c1e61d4b34e214b376da9876e96186914f9fe23bf033a305bf9212f593841407e3bf4e516b5982a6 SHA512 ad08110d9a73a73ef1a546de5fcd6dfe600c17b396f629c3a19ade7b3f226688cf7524fed78c035fd4ddda135e2bcf9facb5e061fb59640b424da2ed070c4184
 DIST numpy-1.21.3.zip 10269351 BLAKE2B 60fc96d91e2c4e0b1c6ee409e02640686fe257f5addbb17229568f591551ea3c415c4aac97b7cdb161b88ce436e42a766b161bd5a82f8cb66fff6771c0097bd3 SHA512 8fbe4e8543b72ad5203d5b122eb3d875e48965682945898e54f4ce82cf790713dfd9185b8b12439aefa86bf25209ea25d04ec3ca2aa2b8d2f32d69358421b792
@@ -33,5 +33,5 @@ EBUILD numpy-1.21.3-r1.ebuild 3944 BLAKE2B 8c946e32d5743994a702b6887929b4709c462
 EBUILD numpy-1.21.4-r2.ebuild 4300 BLAKE2B 57d1e35b092af83be85ea6983b9bd9e167f7abf727f7067d2472a8bf60183f6976db3610e74c0deec77af9bdad2a79648346db6f6df5676cf6b0d194047e589f SHA512 e3857a12a4878b1e0327878d91a6d6b891b00b97a61c6d11588b7508bb135b800543fc7afc107de3eecd92cc283983ee90d0de5d6b5445a34388c8f0aa84ba75
 EBUILD numpy-1.21.4.ebuild 3902 BLAKE2B 52a370dc3c788eb51782b27c451ea5b96777f4cb1bb54d239bcdd807d5d944790429b904ccef1c7b131ad59ba61584c01903dffce06b899b0eb07e01e98e7af9 SHA512 ff3c0a57f5d3b7b2f74c4cb76fc6e39f045531ab754ac83c07894e3b71944f4e2c938a288227139073f5b495b14ba9c85c3ef8de321755509856a29bcd710fb6
 EBUILD numpy-1.21.5.ebuild 4258 BLAKE2B d5a8b9f09593169b1e114e8c0e0cf49ef2291c8429a81b40921c3cd1c2cf81681677b01ee4b39a5f51d078341992a2289e65735fe4eb0de7dfb43156499bccfc SHA512 8d189ab55bf3b79d73fce583998ac27ba57b7b9e53d59f02f56cdd3ac21c5452908d728c92e270c835f01d434c2aa6d0df30571f72ae7bf7589781b65b06985b
-EBUILD numpy-1.22.0.ebuild 4230 BLAKE2B e21c2a042f4306ed70a68419da634b4c460a9dbcff51d96fed648893b2ab2c668ccffc3bf9e46e2ed2d49fafb6b5d3506ef12b523c36ab69f4af5bd1646546b4 SHA512 1f7cf483e6004f470fe8ef32dc7c0a17d824e1a1224fc12c1bde800d4e694311618db5b54333b17d6903c42177585bac17bf12fe0a2f9fe9e7b981f345bd270b
+EBUILD numpy-1.22.0-r1.ebuild 4230 BLAKE2B 25c3b4283ea4a58cbcd8c1ef2ea539fa0d378c00a873a633bb81a40d146eb43bda016d98689e9306e4050cab65a265ad5908e8a8a3bbc755d82e42c99a68aa77 SHA512 9aeda8408565e61c7f1b18b909fac304f13b3ab59606a5f5957cc19905803b62656d3035cb7c4588ac37ca150b3d6d2fa1c06c5c882fc02b65d15b418778a750
 MISC metadata.xml 930 BLAKE2B 8731116ae6d997dc77539b6ff9a8aff2466986888e3fc2c2a77499522360ba5ba11ec61e4eb6756b7cdbb9d7dafe05a862708dcc0735260e8af038a42dea3419 SHA512 1db89ba1a99457bef29a9501e2d14c11904251163172604fe58001048beb477eba5b1e4784c8636d0eb6767614b80a7341823a9d264a5663cc055a5a2c437390
diff --git a/dev-python/numpy/files/numpy-1.22.0-no-hardcode-blasv2.patch b/dev-python/numpy/files/numpy-1.22.0-no-hardcode-blasv2.patch
index 7c9d7768607f..d87a16a4b6c9 100644
--- a/dev-python/numpy/files/numpy-1.22.0-no-hardcode-blasv2.patch
+++ b/dev-python/numpy/files/numpy-1.22.0-no-hardcode-blasv2.patch
@@ -2,12 +2,9 @@ Originally added in: https://gitweb.gentoo.org/repo/gentoo.git/commit/dev-python
 https://bugs.gentoo.org/567938
 --- a/numpy/distutils/system_info.py
 +++ b/numpy/distutils/system_info.py
-@@ -502,36 +502,7 @@ def get_info(name, notfound_action=0):
-       2 - raise error
-     """
-     cl = {'armpl': armpl_info,
--          'blas_armpl': blas_armpl_info,
--          'lapack_armpl': lapack_armpl_info,
+@@ -505,33 +505,7 @@ def get_info(name, notfound_action=0):
+           'blas_armpl': blas_armpl_info,
+           'lapack_armpl': lapack_armpl_info,
            'fftw3_armpl': fftw3_armpl_info,
 -          'atlas': atlas_info,  # use lapack_opt or blas_opt instead
 -          'atlas_threads': atlas_threads_info,                # ditto
@@ -31,7 +28,7 @@ https://bugs.gentoo.org/567938
 -          'blis': blis_info,                  # use blas_opt instead
 -          'lapack_mkl': lapack_mkl_info,      # use lapack_opt instead
 -          'blas_mkl': blas_mkl_info,          # use blas_opt instead
--          'accelerate': accelerate_info,      # use blas_opt instead
+           'accelerate': accelerate_info,      # use blas_opt instead
 -          'openblas64_': openblas64__info,
 -          'openblas64__lapack': openblas64__lapack_info,
 -          'openblas_ilp64': openblas_ilp64_info,
@@ -39,32 +36,7 @@ https://bugs.gentoo.org/567938
            'x11': x11_info,
            'fft_opt': fft_opt_info,
            'fftw': fftw_info,
-@@ -543,24 +514,12 @@ def get_info(name, notfound_action=0):
-           'dfftw_threads': dfftw_threads_info,
-           'sfftw_threads': sfftw_threads_info,
-           'djbfft': djbfft_info,
--          'blas': blas_info,                  # use blas_opt instead
--          'lapack': lapack_info,              # use lapack_opt instead
--          'lapack_src': lapack_src_info,
--          'blas_src': blas_src_info,
-           'numpy': numpy_info,
-           'f2py': f2py_info,
-           'Numeric': Numeric_info,
-           'numeric': Numeric_info,
-           'numarray': numarray_info,
-           'numerix': numerix_info,
--          'lapack_opt': lapack_opt_info,
--          'lapack_ilp64_opt': lapack_ilp64_opt_info,
--          'lapack_ilp64_plain_opt': lapack_ilp64_plain_opt_info,
--          'lapack64__opt': lapack64__opt_info,
--          'blas_opt': blas_opt_info,
--          'blas_ilp64_opt': blas_ilp64_opt_info,
--          'blas_ilp64_plain_opt': blas_ilp64_plain_opt_info,
--          'blas64__opt': blas64__opt_info,
-           'boost_python': boost_python_info,
-           'agg2': agg2_info,
-           'wx': wx_info,
-@@ -951,10 +910,7 @@ class system_info:
+@@ -951,10 +925,7 @@ class system_info:
          return [b for b in [a.strip() for a in libs.split(',')] if b]
  
      def get_libraries(self, key='libraries'):
@@ -72,7 +44,7 @@ https://bugs.gentoo.org/567938
 -            return self.get_libs(key, default=self._lib_names)
 -        else:
 -            return self.get_libs(key, '')
-+        return self.get_libs(key, '')
++      return self.get_libs(key, '')
  
      def library_extensions(self):
          c = customized_ccompiler()
diff --git a/dev-python/numpy/numpy-1.22.0.ebuild b/dev-python/numpy/numpy-1.22.0-r1.ebuild
index 886b232fc2f1..6037152ed67b 100644
--- a/dev-python/numpy/numpy-1.22.0.ebuild
+++ b/dev-python/numpy/numpy-1.22.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
diff --git a/dev-python/olefile/Manifest b/dev-python/olefile/Manifest
index d376c7e9d58e..d74d23ebb016 100644
--- a/dev-python/olefile/Manifest
+++ b/dev-python/olefile/Manifest
@@ -1,3 +1,3 @@
 DIST olefile-0.46.tar.gz 97587 BLAKE2B e6dbadda6f18ec287f5b1b59ab4b92ceee25b4ca47499ed31a03992ae4e3a7269ba0c641f631c4beafdfe43eccab4881d06f7ba372ec47b376b5eb3ed788f45d SHA512 e70975cdda11004ab331908085e0cbd9cf3e44f49fa1453a7af5373bfed0a98729bb7600fee7a1042be6c40c58649f3650972d9e4520bbab218cf715f6264f98
-EBUILD olefile-0.46-r1.ebuild 592 BLAKE2B faa7909db88ff9e4e415c61ae3fb4fbd5a354b61fd4a94ecaedc80f30764c412447066d1bcfcccf7c012cbd9e7e13f07a726920e46f496be6dadfc19e29335cb SHA512 73f92df9ae312e35fb75747bc7a44557833b16eef441c851d4127bcbcc57af15a0ef83aca16c010e20463266b55b1b12bb2780b701d06f3495cb47a2b735f31c
+EBUILD olefile-0.46-r1.ebuild 598 BLAKE2B a4858917fb9c4535f5bd4f500531baa8df69ad1ba15aef8ebc9d7ce56fd4fff3246f1b2337aa7b6816cdc971df1556b7bf9342e866129dc203d53a4038a114e9 SHA512 753393229fd9dc9fcf43d32fd83ea851a88c191d2c91d18e2ab9dc075fa853c0cbc73cfffdc0e6e681ef945b4d5bfec181b075ee68045164679532f20e642d48
 MISC metadata.xml 405 BLAKE2B 0624bf86d3688ac305571048b0dd8229d8789c7c28cd8d3e5536a7e653390400a2aa7615da7b2b32dc54eb11762d9c72db9d3b5cd19518fb52c4ec479a42f15d SHA512 2dfba1b0cb3bd235952c0ecad910354a1589243f66a2d04ff93a9975aa3395e50cea3230947e8db884442951a8871c1457c1a9b99e8657a04432185b3e9acaaa
diff --git a/dev-python/olefile/olefile-0.46-r1.ebuild b/dev-python/olefile/olefile-0.46-r1.ebuild
index be4a231cb844..3eecbb5845d1 100644
--- a/dev-python/olefile/olefile-0.46-r1.ebuild
+++ b/dev-python/olefile/olefile-0.46-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
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/decalage2/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD-2"
 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 ~m68k ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 
 distutils_enable_sphinx doc \
 	dev-python/sphinx_rtd_theme
diff --git a/dev-python/pillow/Manifest b/dev-python/pillow/Manifest
index cfc00ab71c3d..c7a3412ff0a6 100644
--- a/dev-python/pillow/Manifest
+++ b/dev-python/pillow/Manifest
@@ -1,5 +1,5 @@
 DIST pillow-8.4.0.tar.gz 49364586 BLAKE2B f6a0fbafc0869c952bf88ad96146f27cf70c5680f372763bc9989cc49515bc74886a9d7648114797880ca06defc79e2e50d7ecf36bfa7adbd969450615ac0bd1 SHA512 d395f69ccb37c52a3b6f45836700ffbc3173afae31848cc61d7b47db88ca1594541023beb9a14fd9067aca664e182c7d6e3300ab3e3095c31afe8dcbc6e08233
 DIST pillow-9.0.0.tar.gz 49510604 BLAKE2B c3b0d07e8fe280e3a253067c4da18ac2dee40d216280632d58ddaa7848e13a165587b9aca61c98f8b5380e53d6d59a4097320bacf6e016e236239af518ec7780 SHA512 d2fd74dd1b8824d994e3767ef9794175dd2f4adc8173612432a3e171705723ee8757d299a87fb1c010b40919792c1ca76578f41977ee3303ccb6f75165deb791
 EBUILD pillow-8.4.0.ebuild 2630 BLAKE2B 35acb4e2123562d6060a3987ace19eef820440419d6a12e12b45d49b43c97db02874b18161e40eb5fc528142b06564d90ff02c40efc4eaaba18d939bc0684ede SHA512 c92d71605566aed06473690ccfc80b4c7fea02b877e1a8cf287f35b6a263cb5ca28577cddc2a07d8487219a9573e0359eb7f6cd8cf47bedbc303775184f6c8bb
-EBUILD pillow-9.0.0.ebuild 2642 BLAKE2B b1775157b3cc8fd72f93e53c8cebed5b739070901407213fdf098ab207096eb51d24a1e5c1f7915168f2434775ce342da180f8c614dc6fe54063737c0f43fba4 SHA512 62d5ad8d8fa23f2ad5239cd076b313445d9687f16bc5e0613ec94d42ea70107c2a6498394eb9f0de23b9c3560e24806fefeeceb0f1f293119502dc22ad4d19ce
+EBUILD pillow-9.0.0.ebuild 2648 BLAKE2B 8d421470d09feb1602f69f6a0a419b6709187bc9ca5b24dd958020b6332051d387dc6e10e89b145f39d372adfa77d7d4df495bfcd5c7824ec41476fc807e4abf SHA512 55090f6ce934803074d35630752a64639023c971905d66cf463ad3ce260f63869414a858762f9392d91280b5989763397b485e347eda87ee2b01b86e51dc8942
 MISC metadata.xml 480 BLAKE2B b42e6b01b1572a0688ef93025a0baaa95b9fd0c3a5eabcddcea7145dd880a95f11859b255ae24a376ca792559ffcf940c67da1b19f2f579dbc6ef6de68903749 SHA512 b98a33136aef4498051370bce3295b000687ddb80b4d909b26b32af61b4e4638d07269f7924ae039420af63236aa74b51e23d2feae1c83349683073c69714582
diff --git a/dev-python/pillow/pillow-9.0.0.ebuild b/dev-python/pillow/pillow-9.0.0.ebuild
index ac36da1d605f..caa5fbbcd092 100644
--- a/dev-python/pillow/pillow-9.0.0.ebuild
+++ b/dev-python/pillow/pillow-9.0.0.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="HPND"
 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 ~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/pip/Manifest b/dev-python/pip/Manifest
index c36fa411681a..0c5ad306235b 100644
--- a/dev-python/pip/Manifest
+++ b/dev-python/pip/Manifest
@@ -6,5 +6,4 @@ DIST setuptools-57.4.0-py3-none-any.whl 819017 BLAKE2B afba86cf9aeea58ee869fdc11
 DIST virtualenv-16.7.11.tar.gz 8134533 BLAKE2B ea81e11c210d911bf9576edf7b1754721b270adcc5d9633415d33b8f659149d64932fe2d366200121ec00c266c25dae380e248add438fc357477114eba4dfb4e SHA512 82d0d2a964508511e8e1686703581ff543f65791dc2449d9741d46ea57c4c89673947d2477ba374176f05fcea2a5ca572aa650c61c4f3271c4d73d1ff9d9ff42
 DIST wheel-0.36.2-py2.py3-none-any.whl 35046 BLAKE2B bc4e8dab7c74eea34d3b4a813b7eaf6295a99a396a861b6cdd76f743043e89140bad132bdd13e385e8945ce02e0798e1d3ac73fc1b23bde5b2a83e4bb4dd5cdc SHA512 6bb5119b4d3704fe1e3c1eaaa3124edab13f61b46f8a0a8e75974fac4e5b25d8b53606071a03a8d8990ad1cfe2ab247ddea260098df2c0c35ae965be47080284
 EBUILD pip-21.3.1-r1.ebuild 4977 BLAKE2B 805a9a129b523b8359bfb0c2f6cae48bba39c7c352d435111fee65627660c0bcb35bb5de381d36404c4bb7246f0f93310b685802b134c49620dcafd86f93103e SHA512 ede7c0e28c6e1d3b5283613766cb4544d945dc71240f62cc5d909702284accb061a8e486bd9a203fd4467880f8c1c8c9e2571ee3eb6f3c82c85c0f121c96ac0c
-EBUILD pip-21.3.1.ebuild 5086 BLAKE2B fb28ecdcc8efe3ff881f853071f3d588bde8f32dc415919e39b0ac8f2e004c4b50ebe4c23a369ac9df8bca620578b8c7498ea44d9ce3012ed954b44645e948d3 SHA512 8bb100dcb2a996d09c5ddc500fc610646c3b8fdc00af49cc39bbc1bf399db761284392e1a2958a54a230498fedec16fcf4494c7e8017a51b71c2446d82484234
 MISC metadata.xml 392 BLAKE2B 94ea3de1220cb9ca64ae1186597789cc83a54adfe44695932c07dd5065df0e5f9ee5078a495e3a12563b36809d781d8ab86bb6c92c485c023199d92547b74f27 SHA512 603199f6547105f3bb64f4fcaf004e9ef62fa2e0f8ec6eab56078119684b0f5119161e0f164fe02b2cf6dd6b115588c9ef77d727eeb6d138e281f1cb0bcb5de9
diff --git a/dev-python/pip/pip-21.3.1.ebuild b/dev-python/pip/pip-21.3.1.ebuild
deleted file mode 100644
index deed1e87f702..000000000000
--- a/dev-python/pip/pip-21.3.1.ebuild
+++ /dev/null
@@ -1,149 +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} pypy3 )
-PYTHON_REQ_USE="ssl(+),threads(+)"
-
-inherit bash-completion-r1 distutils-r1
-
-# setuptools & wheel .whl files are required for testing,
-# the exact version is not very important.
-SETUPTOOLS_WHL="setuptools-57.4.0-py3-none-any.whl"
-WHEEL_WHL="wheel-0.36.2-py2.py3-none-any.whl"
-# upstream still requires virtualenv-16 for testing, we are now fetching
-# it directly to avoid blockers with virtualenv-20
-VENV_PV=16.7.11
-
-DESCRIPTION="Installs python packages -- replacement for easy_install"
-HOMEPAGE="
-	https://pip.pypa.io/en/stable/
-	https://pypi.org/project/pip/
-	https://github.com/pypa/pip/"
-SRC_URI="
-	https://github.com/pypa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-	test? (
-		https://files.pythonhosted.org/packages/py3/s/setuptools/${SETUPTOOLS_WHL}
-		https://files.pythonhosted.org/packages/py2.py3/w/wheel/${WHEEL_WHL}
-		https://github.com/pypa/virtualenv/archive/${VENV_PV}.tar.gz
-			-> virtualenv-${VENV_PV}.tar.gz
-	)
-"
-
-LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~x64-macos"
-SLOT="0"
-IUSE="test vanilla"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/setuptools-39.2.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	${RDEPEND}
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/pretend[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/scripttest[${PYTHON_USEDEP}]
-		dev-python/werkzeug[${PYTHON_USEDEP}]
-		dev-python/wheel[${PYTHON_USEDEP}]
-		!alpha? ( !hppa? ( !ia64? (
-			dev-python/cryptography[${PYTHON_USEDEP}]
-		) ) )
-	)
-"
-
-python_prepare_all() {
-	local PATCHES=(
-		"${FILESDIR}/${PN}-21.3-no-coverage.patch"
-		"${FILESDIR}/${P}-cryptography-tests.patch"
-	)
-	if ! use vanilla; then
-		PATCHES+=( "${FILESDIR}/pip-20.0.2-disable-system-install.patch" )
-	fi
-
-	distutils-r1_python_prepare_all
-
-	if use test; then
-		mkdir tests/data/common_wheels/ || die
-		cp "${DISTDIR}"/{${SETUPTOOLS_WHL},${WHEEL_WHL}} \
-			tests/data/common_wheels/ || die
-	fi
-}
-
-python_test() {
-	if [[ ${EPYTHON} == pypy* ]]; then
-		ewarn "Skipping tests on ${EPYTHON} since they are very broken"
-		return 0
-	fi
-
-	local EPYTEST_DESELECT=(
-		tests/functional/test_install.py::test_double_install_fail
-		tests/functional/test_list.py::test_multiple_exclude_and_normalization
-		'tests/unit/test_commands.py::test_index_group_handle_pip_version_check[False-False-True-download]'
-		'tests/unit/test_commands.py::test_index_group_handle_pip_version_check[False-False-True-install]'
-		'tests/unit/test_commands.py::test_index_group_handle_pip_version_check[False-False-True-list]'
-		'tests/unit/test_commands.py::test_index_group_handle_pip_version_check[False-False-True-wheel]'
-		tests/functional/test_install.py::test_install_pip_does_not_modify_pip_when_satisfied
-		# Internet
-		tests/functional/test_install.py::test_install_editable_with_prefix_setup_cfg
-		tests/functional/test_install.py::test_editable_install__local_dir_no_setup_py_with_pyproject
-		tests/functional/test_install.py::test_editable_install__local_dir_setup_requires_with_pyproject
-	)
-
-	local EPYTEST_IGNORE=(
-		# require tomli-w that needs to be keyworded (added in -r1)
-		tests/functional/test_pep517.py
-		tests/functional/test_pep660.py
-	)
-
-	[[ ${EPYTHON} == python3.10 ]] && EPYTEST_DESELECT+=(
-		tests/lib/test_lib.py::test_correct_pip_version
-		# uses vendored packaging that uses deprecated distutils
-		tests/functional/test_warning.py::test_pip_works_with_warnings_as_errors
-	)
-
-	if ! has_version "dev-python/cryptography[${PYTHON_USEDEP}]"; then
-		EPYTEST_DESELECT+=(
-			tests/functional/test_install.py::test_install_sends_client_cert
-			tests/functional/test_install_config.py::test_do_not_prompt_for_authentication
-			tests/functional/test_install_config.py::test_prompt_for_authentication
-			tests/functional/test_install_config.py::test_prompt_for_keyring_if_needed
-		)
-	fi
-
-	distutils_install_for_testing
-	pushd "${WORKDIR}/virtualenv-${VENV_PV}" >/dev/null || die
-	distutils_install_for_testing
-	popd >/dev/null || die
-
-	local -x GENTOO_PIP_TESTING=1 \
-		PATH="${TEST_DIR}/scripts:${PATH}" \
-		PYTHONPATH="${TEST_DIR}/lib:${BUILD_DIR}/lib"
-	epytest -m "not network"
-}
-
-python_install_all() {
-	# Prevent dbus auto-launch
-	# https://bugs.gentoo.org/692178
-	export DBUS_SESSION_BUS_ADDRESS="disabled:"
-
-	local DOCS=( AUTHORS.txt docs/html/**/*.rst )
-	distutils-r1_python_install_all
-
-	COMPLETION="${T}"/completion.tmp
-
-	# 'pip completion' command embeds full $0 into completion script, which confuses
-	# 'complete' and causes QA warning when running as "${PYTHON} -m pip".
-	# This trick sets correct $0 while still calling just installed pip.
-	local pipcmd='import sys; sys.argv[0] = "pip"; from pip._internal.cli.main import main; sys.exit(main())'
-
-	${PYTHON} -c "${pipcmd}" completion --bash > "${COMPLETION}" || die
-	newbashcomp "${COMPLETION}" ${PN}
-
-	${PYTHON} -c "${pipcmd}" completion --zsh > "${COMPLETION}" || die
-	insinto /usr/share/zsh/site-functions
-	newins "${COMPLETION}" _pip
-}
diff --git a/dev-python/prettytable/Manifest b/dev-python/prettytable/Manifest
index 9159bc05fc40..8d92688d2b71 100644
--- a/dev-python/prettytable/Manifest
+++ b/dev-python/prettytable/Manifest
@@ -3,9 +3,11 @@ DIST prettytable-2.2.1.tar.gz 45102 BLAKE2B 59fe355603791c8b3a584b1d1f2864559a7e
 DIST prettytable-2.3.0.tar.gz 49386 BLAKE2B 368dd454da9dde3900009ed52c0d55c30ed69315b36fb53eaebc764af419851b858dc648ac5d8ca62592c2aaa68dac91ac03a1a1bf29d10ee5162981f2937c22 SHA512 feeaeeb0a1897c0aaa2bc0ac7f470244529e8c70debb26976494719607840c8b8a80698b7e463402031b250fe152091e947555be2a6f983764e01bdaa1a71a22
 DIST prettytable-2.4.0.tar.gz 49756 BLAKE2B 594dea7e1c3c9ba070420c83960b9fc4016d25bd883126ed2331cb5ce06909fad92e94ec141e1b4838233f00cfabc394e1a7025aa02cf246e8608903bb45533c SHA512 50983855868d23a590004dcb81ad9a3f22191c656532683f71260a369df5bd2a0001db946268944cc169528f64f36833eb524fc46efabe562434ec32832ce011
 DIST prettytable-2.5.0.tar.gz 50015 BLAKE2B 75bf06625ee8aaa495ce86f69d751bf89edb8fd0c530009cd4eec9f44b6155d0168d2f4b9f55bef6c3c591a3be17bd87eefc447315f9ed867f6a7edd8c0225c5 SHA512 e4f07e842668b3874ecb329b5e9d6b61433c6ef78f3df6b9872bd7edd1d7266bf61e80b8aab641d42eb7dce1f2fc3463e1598128763ca4998618ea835cd74fef
+DIST prettytable-3.0.0.tar.gz 50012 BLAKE2B 9a1c57abf46fd00fa74022ad9a8bd19c5f501610ac4dcd806511f5cd9e0ab17cbf24ce90b8f1c3f98db5601e1df75cf57c7709c84e0c3b703ebe2d69f57294d3 SHA512 f7b03ee1c1371187708b1cd7724f1afead1249a796928d2abdce42fa834ee128e930f20aef1df579426c65f1fb574b1a831e521ade6e9e65977d5dd88bafc5af
 EBUILD prettytable-0.7.2-r1.ebuild 606 BLAKE2B 5ee8d1567cbcc4ba9ac75bc7ade72ee37f9dd658bcbcd8097ad3104b021e121b02fc93dfa31ffd711afceca065b4b9557ef8668e7b6da73fc01379a16f152ae0 SHA512 1a1016c21f70ef304875c21a1a2660c0433c2e68ff2d630695a123b581b15d0846a97d705f7f91ec1a4f3010fa90baf28e4c7fc29c42fb3ed63d709f10ccbae8
 EBUILD prettytable-2.2.1-r1.ebuild 724 BLAKE2B ee6d7f2911b6961caf7caa38ec0792d73b4b7fdb53b84cf291f3cc369938554f57cd9092dda5d91c3260fe207b238386e07fb6ba33a889e57b5f526850ad1b0b SHA512 10ac1970ff510415ee154301dcf09ac7a5f5712f5b294b89efabea646d2df118d3e494c5deec89e1eae17f0b1d9c42ac29511c5db9a78a53bacebe200975a0ea
 EBUILD prettytable-2.3.0.ebuild 712 BLAKE2B d8d49d6e021584bbfee35d9869fecf78c283ebf5a9917a810d401c4908c6640eb687cb8440f0396b75ba6b82a1fdc52e8a1fe35d2ffda72867043e3746bdcc38 SHA512 b0ddaa4db38497a0e05ef5f59b76b98f48fa349b744e1329ff9de6e2a29f320670c6c4da19b068d5f10a202067849b19e91cdfb6752c1eceae5a847a820de6bf
 EBUILD prettytable-2.4.0-r1.ebuild 738 BLAKE2B 2951d8b52cb1086162a7bfd9879d4bd3a78967ffafdfe02cf97e71d9571143774ba4e75a9e20fb13b61088a17078076896b8d95caddacd888dd75b6f033f2c7d SHA512 e433889002c61db5730988c6809fb8a17e5cb8cebce6bde5a9e9e3f1ec53e76b6f0d767db650ef66d82335749c6ff86d424fe639ad60d79a5d168ada1444fbd7
 EBUILD prettytable-2.5.0.ebuild 750 BLAKE2B 8106a23954b2522391ebf759d85c7c04b0a136d1642e6553c700ba8e6f3eec7bbcf0a28a2f97f1b5b1232b01faf025f2a4c57c6f06bd49ca0ca0d444a9033b67 SHA512 3de663b5ba3a386c76be91a09e70320d3882ba7d14c6523dee66243c199a3b9e6fecdd61c393d776bdf820f307affe5bee13da85adbab701c8f451a4eb9ef7a9
+EBUILD prettytable-3.0.0.ebuild 750 BLAKE2B 0b3cccf64e4f0ead2a18e9ca1c78dff1d750210931a9c5bba2bfeb844ed002b14d51695d729004e576cc12bd9867a12a6c9ba2f23e5136890501579f24e72ad1 SHA512 7012cafe8164004f4fb1915640c9d06c0fd35c6e22080ebe365ad7c0b2f80a02df6316b9104b38f060e3053a09b69aec4b53baf9efc0c80d52e70802168a3c7d
 MISC metadata.xml 583 BLAKE2B b82fa13dd76ee47e012c03499081072c737cb63f2d23190dc3622dae1bc50ba054c7cf492a1feda7147c3a8710bd8ad509bc653e5b40f89b93ffd63da69c3f65 SHA512 e7d331df0ec72f98acc9abfc70424a619e67e559e4b02b357658e9e48efd080440a0d890ce5df2cb8cbffc53640b2068f39f803aa180bf2607d02a9df1acb5b3
diff --git a/dev-python/prettytable/prettytable-3.0.0.ebuild b/dev-python/prettytable/prettytable-3.0.0.ebuild
new file mode 100644
index 000000000000..51b2783bead9
--- /dev/null
+++ b/dev-python/prettytable/prettytable-3.0.0.ebuild
@@ -0,0 +1,29 @@
+# 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 displaying tabular data in a visually appealing ASCII table format"
+HOMEPAGE="
+	https://github.com/jazzband/prettytable/
+	https://pypi.org/project/prettytable/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	dev-python/wcwidth[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		$(python_gen_impl_dep sqlite)
+		dev-python/pytest-lazy-fixture[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests --install pytest
diff --git a/dev-python/progressbar2/Manifest b/dev-python/progressbar2/Manifest
index 9ead771d90c4..99145e42d3b2 100644
--- a/dev-python/progressbar2/Manifest
+++ b/dev-python/progressbar2/Manifest
@@ -1,3 +1,5 @@
 DIST progressbar2-3.55.0.tar.gz 371356 BLAKE2B 89034af2cc623063e98c9de1683f159c2eeb491354c66357d9c3fb5a7ac0503b5c9d2dd6ebf36d3e2803558f3841820188eaf6dc931e992c352e0e02fa020f87 SHA512 16dcdffeba6e9cb6696ac41c16701874c5f314432332d7ae2d898d1040e603c428240a8ca5718789d0d431750e2ae923a6f63fe75785213e80494bcc5825aab5
+DIST progressbar2-4.0.0.tar.gz 663046 BLAKE2B 1616f1b9c5f720f370dc9eb02ba37cf83391c853a525fca523fb33af1b580f38647b835a83558674a78dacc33bf7652cb9af8799ad13763f62d33417abaa35cf SHA512 b9b9dabb3093e42bc6f40c0e284caae2d29ebfa450db379c214a5ae39e7ccb8c690655da21a44882d0b68f24d83f55a3342671087a25ada168bce9d236685666
 EBUILD progressbar2-3.55.0.ebuild 710 BLAKE2B c09403f2a4ea6f7d0a66464ad56f2616b76d6e295b245ebe276b7d977049cd6f118519fa80b4b5337d849f294db2cd35299b4041e8d0536de73b9abf2dbf9990 SHA512 18b87894960e502e0a7ee90c56e1df7890f2124ca9821ee2cfcc7a28015913f495e487b4804d37a8de4f91bf1cf328250f93d45b551be7ae2c9e3fa2da9113e4
+EBUILD progressbar2-4.0.0.ebuild 719 BLAKE2B 75cadb578e94910520fa2a29d8c553cf9db20eeb654f5f88e0bc90605e48d6399a95814cfcc9cd612f001f41573d5004e3db5b9dbbc10a119b664fb53f18748f SHA512 e49b3fd184f5f809fedac8f71ce6d0e5242c7123b67f5c688c81dc0f31c39f05f1ca52b51e9db2e6beed3844de3922f8897c58f4bb19abae7baa5b18d826acf0
 MISC metadata.xml 331 BLAKE2B d2dac5a8c7f9c61da26e79aa470a02db594999812eaec2915c46039eb2b616d4575fc24aa40b6526201782d5fcc66c4558629636f584276f6087280c74da450d SHA512 bc73b6b943bd29892d00a18b0018ed79f8eb727f4f359234920adfb35db95b6becd79735ee10b473932a63f37e869fa0379414b9532f7360caddfa057b609446
diff --git a/dev-python/progressbar2/progressbar2-4.0.0.ebuild b/dev-python/progressbar2/progressbar2-4.0.0.ebuild
new file mode 100644
index 000000000000..4508bebf68fd
--- /dev/null
+++ b/dev-python/progressbar2/progressbar2-4.0.0.ebuild
@@ -0,0 +1,33 @@
+# 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="Text progressbar library for python"
+HOMEPAGE="https://progressbar-2.readthedocs.io/ https://pypi.org/project/progressbar2/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/python-utils-3.0.0[${PYTHON_USEDEP}]
+	!dev-python/progressbar
+"
+BDEPEND="
+	test? ( dev-python/freezegun[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/cov/d' pytest.ini || die
+	default
+}
+
+python_test() {
+	PYTHONDONTWRITEBYTECODE=1 epytest tests
+}
diff --git a/dev-python/pudb/Manifest b/dev-python/pudb/Manifest
index 0733e295e66a..262d1efe8b83 100644
--- a/dev-python/pudb/Manifest
+++ b/dev-python/pudb/Manifest
@@ -1,5 +1,7 @@
 DIST pudb-2021.1.tar.gz 216707 BLAKE2B 1287fa48607e9b73dd0bed063b29933dd4de6ab598ad99217ab13a719a6b9654765bc44c28150962ba22703733a4e956c39e843414444c3b7fff67cefe70d7d8 SHA512 54d62f1342ab461e58a382c0eb654ecc9d3bd759844bab2f0a339e91ba805670e4dc7ccd84e8188f34e06a07ac770f1c0cddd4a4ef916885af0bdc638db81fcf
 DIST pudb-2021.2.tar.gz 216306 BLAKE2B a3c4fce5515e49851ac0e2ec73aa4364d3311dbd64060181198315ec0aeeb860d95f34d09004a86bb73269252362a966e541547d19c6db74ffd51a0535a0942c SHA512 f6d07b752268115b8e833e5aac5e5984e77beaf02fd7d2ab91e0b94c61f4c32d639f4ed75d262e66526c00bec03c6c3cefb92d77d8bdb330eb5cb73f9bec009c
+DIST pudb-2022.1.tar.gz 218423 BLAKE2B cb31d6fda07f15593f6b8af1c99ce3e88f1bfd745358db0a9c22171b6db3c30d4501b68263a5ca53681daf864d9d43654e2cf0b3808fb2008204c6071f8fb33b SHA512 89b26c531254fe1a234b41a21ac3f2fc6ba4f0786b4d0ac49c34bc965dd53301a8111a077342b8a5dcc32c214bcdc76e28ce5983ad43fb36211f80d1a68c10cf
 EBUILD pudb-2021.1.ebuild 584 BLAKE2B a18c48f12cf4aa2110e4e8c05ded78ab9daf439f3bdeed7b28c5aa1b58184b409d8f8e65c567200bedc2429a664553eb0d40c2537428679c15461d11ffa25b58 SHA512 daf65f67d1a4d6d36a7b81bee844c73a080b8e0691098b1fce75b17f7b6dfdf7a4ff696ae5081c50e27956b6d74647e1cbbdd9135919ad69a41dc2b13708268a
 EBUILD pudb-2021.2.ebuild 605 BLAKE2B 29315e7bfab1d3ba5d72feab3823a4a1e88f592607bef8819f4fd88ae3af9129ffee3b49f6878d5b6357057e76db6e29732ae196262639c41bc0758e71bad612 SHA512 b456d183ca4750ea01a7f49118e52746ca7c9e611cbc1a856f51fa582e1728f6c72e29acdc8ed5fd10cbb85c9c5189c8c632af5832b15e0574b827a2a7ae7fae
+EBUILD pudb-2022.1.ebuild 605 BLAKE2B 66914325889ba9f2a46a3aa0a6d37fc5d58b595403f5f077af3ffaafd62510d18fed793b42d9d75417d2c000ddabbdce93336ec4507061cc435ab4f9897bfae9 SHA512 332dde3f878144a2c886976389568219c19292ad589f6eb5622288db8d336dbaf65d7ab2719c331b9438975fd9d12a137b14927cbe53cd17763dd4696f2b44f1
 MISC metadata.xml 415 BLAKE2B e36096d9569f60ef1e2f1c412a4e17007880c5b3433545f3f7486532968a7502532f0ae614368d8bbc62f3f6550f08a63890d81a5ccf509db2047c0cdd9e6b27 SHA512 1c1de7a23e74095aa20edc4fe5de9c8c88eb5f3537d0bb0fcce345287170d77bf1f1b13fe17d5f100d71782c34940836f27a1778530af58312f3e22f21460dd6
diff --git a/dev-python/pudb/pudb-2022.1.ebuild b/dev-python/pudb/pudb-2022.1.ebuild
new file mode 100644
index 000000000000..bcd5082fed3e
--- /dev/null
+++ b/dev-python/pudb/pudb-2022.1.ebuild
@@ -0,0 +1,26 @@
+# 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 full-screen, console-based Python debugger"
+HOMEPAGE="https://pypi.org/project/pudb/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/urwid[${PYTHON_USEDEP}]
+	dev-python/urwid_readline[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pycryptodome/Manifest b/dev-python/pycryptodome/Manifest
index 27a7fd6b6020..c615a349dce0 100644
--- a/dev-python/pycryptodome/Manifest
+++ b/dev-python/pycryptodome/Manifest
@@ -2,5 +2,5 @@ AUX pycryptodome-3.10.1-system-libtomcrypt.patch 1729 BLAKE2B 57a2022ef17e0b86e9
 DIST pycryptodome-3.11.0.tar.gz 15555515 BLAKE2B fee6a2f2ac0659c82efed2cfdaf7c4d1e4813aaa2203c41c249a7e512a4ec1c955f443022e81847fbfd095cd95f205c054b8c3ef90f4741063c679798cd8c5e5 SHA512 9a6f94a78909b236e9b9224915495f092891951b76836396706c11e8e87717ff84fd92fe04ad641d6a5a0ef1f3b339990d7f21a326e72b95b166a76169240964
 DIST pycryptodome-3.12.0.tar.gz 15130980 BLAKE2B 5eb34a03523652d990ddfdd1eebcbbacea30bffbe4838289c195b07658a98814ebec322aaffbed7b3fa564bc005d52ea1e483dedcb9f40b65d00e50c28d78582 SHA512 67f2a814d74305614fdf9dfb633c4fd9d80d2064119d0ecab24ae52fd8ce4b6de1a1e82c6ba7bcf22fb7db1a5a850adf078e22317b4c07229cd7cb8cb7f1ffd4
 EBUILD pycryptodome-3.11.0.ebuild 1129 BLAKE2B 056c7b2398f90792d0789065d053681705eaa5cf9fe6f90dad15bc17d014f9669d9397a0500566b40e63330198cf15f471e636c138dd130deba9ffc862f83682 SHA512 eb9b2874efe1b7142442ab88cede0c620e57e14cfe2c3d0f2462aa7175c60e51084b9304f6de51757ad4631d42919c411c094ea0cfc9bbf761756a4f20bd059c
-EBUILD pycryptodome-3.12.0.ebuild 1136 BLAKE2B d7480af38272aa6066b81227f00853f76bfa1e6880462ac4d93212a349a635a297751c39aac3e9201cecba770da284d5140db60dc04f589365284fedcc871824 SHA512 87e615c6b7d88402969d6df51a72ce335015239a197ddd10d30b4d0a72c0f50b154229a797095c464631b2051cef43be94787fd205ed76ad1d442c786d4c7d7b
+EBUILD pycryptodome-3.12.0.ebuild 1130 BLAKE2B 51d04088878d1af2d03c38e511f3f9ec8a168920872da675756c564b9347e15b5eaa38e9d905121d9a8bc53c5ec7d2b237a1eb94763e0d371a3ab079c20046a8 SHA512 d06289f6f3e415f216f23aa3322ef295126344d67b1d085d76cc8c7a7ca84cbb405494de7bc5409e54b158c70a5dc9da28b7042dae13e7e810898c0b76c80faa
 MISC metadata.xml 386 BLAKE2B 1ec04c0cb752414f063177e637f1fc3e3c401db0c1f245cb33a3690e25597098b25fb2cd5f3ab99838a8bf8339906e2b23e325af5c7248fd880563c872c6fb60 SHA512 f19e2537c5a985389182860eaa45ae68a37ef1167c4b76b452513987fae6fcfb3534d102a079a003770372bbdb4f1997460c982b355f76d09f2387996e18091b
diff --git a/dev-python/pycryptodome/pycryptodome-3.12.0.ebuild b/dev-python/pycryptodome/pycryptodome-3.12.0.ebuild
index 9bf29ac5892e..e116386f00b8 100644
--- a/dev-python/pycryptodome/pycryptodome-3.12.0.ebuild
+++ b/dev-python/pycryptodome/pycryptodome-3.12.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
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="BSD-2 Unlicense"
 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=""
 
 DEPEND="
diff --git a/dev-python/pygal/Manifest b/dev-python/pygal/Manifest
index f1d4de053dba..bcc3e67f6cd7 100644
--- a/dev-python/pygal/Manifest
+++ b/dev-python/pygal/Manifest
@@ -1,3 +1,4 @@
 DIST pygal-3.0.0.tar.gz 3575455 BLAKE2B 9b64cf441aeb25b0a0b9834f07e5892fe163f28a5da796d37083f8f3a10d8737a69bad39e503d722e6a36f2de4367b4fd2bdc3a06c5bc30bce66a370690d9c88 SHA512 71ac9f197d711c8cf5bb47caef128754f81b1cb0ba98c4cc67de78b68fca5d40baae9fbb5c978f6abaed4c73b8edfea2de07de2fda1aa7c15e0d81387518cc49
+EBUILD pygal-3.0.0-r1.ebuild 1044 BLAKE2B 65448adb9fc89f49adc16a65abd60b10e61c547fa293a5587e5f4810a45c4526c00ebbebf3807b75bd8fb2cc3f1daaa056b108b0ee6af26fb9e350b3cb1e8a4a SHA512 cbec83a23c5ac93ee0715c7b68c40381fc6d37d8c22f43183005300ad9265edab8ae7dbfecccc9021894feafd232a1461a60f034fe7eff8d8e8018666b848ecb
 EBUILD pygal-3.0.0.ebuild 909 BLAKE2B e25937aa0570290e59d3f61ba9b2cf33cd65303099e9430c0ac36c29360767e73b52ce2d45f103692d9a90f5a6197f78ab1b5a86f8c99141c302dc36e9585e3d SHA512 a7dd8e3a3feb97fde0074c8b31473316f5fc73eed558115f658976a9a981c255a598e6943cdcc4d1df2ff82b921d264b50a933b1cafaf537e198f2b1145b0b89
 MISC metadata.xml 458 BLAKE2B 70473091a8343d255501ff6d306cbf376b57c42ba842e36a3948649f30ffa3f29ff502254cf265512b024878b8faa7d77b4164b5cf70ae6f851a5d2d51a3997c SHA512 3bcd119c30b25e2f821c10d1b2c58efc109d8049a446acb4960b47ddef18d3c1ed4efc6bb4dc551abbb42f17828c4898acdad3172523b7576a6a548e43a8e8b9
diff --git a/dev-python/pygal/pygal-3.0.0-r1.ebuild b/dev-python/pygal/pygal-3.0.0-r1.ebuild
new file mode 100644
index 000000000000..fa1e92660d0c
--- /dev/null
+++ b/dev-python/pygal/pygal-3.0.0-r1.ebuild
@@ -0,0 +1,43 @@
+# 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="xml(+)"
+
+inherit distutils-r1 optfeature
+
+DESCRIPTION="A python SVG charts generator"
+HOMEPAGE="https://github.com/Kozea/pygal/"
+SRC_URI="https://github.com/Kozea/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	test? (
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/pyquery[${PYTHON_USEDEP}]
+		media-gfx/cairosvg[${PYTHON_USEDEP}]
+	)
+"
+
+# CHANGELOG is a symlink to docs/changelog.rst
+DOCS=( docs/changelog.rst README.md )
+
+distutils_enable_sphinx docs
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# Not actually required unless we want to do setup.py test
+	# https://github.com/Kozea/pygal/issues/430
+	sed -i -e "/setup_requires/d" setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+pkg_postinst() {
+	optfeature "improving rendering speed" "dev-python/lxml"
+	optfeature "png rendering" "dev-python/cairosvg"
+}
diff --git a/dev-python/pyghmi/Manifest b/dev-python/pyghmi/Manifest
index 510a45f9e885..42ee51a15bc2 100644
--- a/dev-python/pyghmi/Manifest
+++ b/dev-python/pyghmi/Manifest
@@ -1,5 +1,7 @@
 DIST pyghmi-1.5.22.tar.gz 221963 BLAKE2B 6705e904c481ddbb241fc8f8089e6bc9bcc142bfca9aaa518b2293b5dd387113fa4bbb418e748584f69fac5e8d1049d669eb73d24463adaaec3a891cae98f928 SHA512 cc665f8b9f4a0c9c127b9e895ba62e650cdb589f5c9edae6accaa5558f347d31725e8da446fcafb4f71ffadc17121d8b293160413f4a41055cb1720e9fa1ecde
 DIST pyghmi-1.5.31.tar.gz 236574 BLAKE2B 9ee7250bae2d87f552686845ae3056f0f646cd1a383587c195bfcc6dfa476b8582509c909f0008fc6751295e2e4e7d33bf822e8b529d67306fcc85412fc9af22 SHA512 d7c9c05b51780bef9d2b417c1a586f84ec87a9f1ff578ab019bfdc1a462decd907b2634fb1c830d0e369eb97122bfcba62ce79a4386c73c9854cde8f9fdeb65c
+DIST pyghmi-1.5.32.tar.gz 236662 BLAKE2B e2a58d1eb9c5000d1a7f6b795836fa617ac0847ff2e7c817a6bd65ffb9a1162546a25f890ba20400e4c8d5f72dda538f696c17a35542506cc171b80f99cb5a30 SHA512 b30ad1e200d23ed99280794e4e8e12c1a2412daa27e435183edbdcf57cb1d8ace8790845dd5ab0579f2a22b26eabc11e1d1f5845fb94fed019f461b9419d2763
 EBUILD pyghmi-1.5.22.ebuild 1116 BLAKE2B 0d96964ae13baa9be846aaf23d1dddc9f8364edc68a56aa57d3ae71588eed61712ac0af7800bae9109e448ecc9ec773abf1716b7be4dafb7ce3a238f2b87ad7e SHA512 959e0352c804d14a947009c1cbecdf76e306aad9b1d4f6c7b162147cb4e44475dc067ba11adc50d69ff5f794f2bf9dd97533b6ba19ac091f9b33f6484d837a98
 EBUILD pyghmi-1.5.31.ebuild 926 BLAKE2B c5f51260e37a649e0b96cf7615fc3e26b9cd13c1f993ae84d6787fa6c0c026fbf461751306c1456470d4516f57906a4b58416ee9c5888c27139fdae5a99bd76e SHA512 4e1734960b8b5458380e20ce75fada6aa7bf7e2b678ffbe0087bc756bef36b034cd897a6f66c21bcfed47c9e765bd8fc305b4baae968bfbcedf463a256ac2ef9
+EBUILD pyghmi-1.5.32.ebuild 926 BLAKE2B 13abf28137bdc5cf790245e3da6b6e248eace5bfee1ccd092994f4e70ff9cba9547fe50259cf013d022045e9c29e786b21c0a16cf07aca11ef60c9063060e5fc SHA512 df407e2f894a3a50cb1530b3ff4e7f78aa86688a4b8e51e8617dbc92ffc282bb72510416385b6705c54b87fd15ad090fe665b535cbce071117d27c3cd720cd1f
 MISC metadata.xml 402 BLAKE2B 066a72f969a0f47e94441c75fb078fad0bbbd8a28520a4a309f15f30c5993c52042efe207f60b66460488296336fb0c94520ed66247a7de636b2b040b76788c7 SHA512 25d7b4fba1980d03289330d65623cd00f0a81d693234a624e23c6c9991a2764a8d704011de2fb7a54d0cc6165558519dec26b893d1c93b4b76ffbf1957ba20f0
diff --git a/dev-python/pyghmi/pyghmi-1.5.32.ebuild b/dev-python/pyghmi/pyghmi-1.5.32.ebuild
new file mode 100644
index 000000000000..8c831160b805
--- /dev/null
+++ b/dev-python/pyghmi/pyghmi-1.5.32.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 pure python implementation of IPMI protocol"
+HOMEPAGE="https://github.com/openstack-archive/pyghmi/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=dev-python/cryptography-2.1[${PYTHON_USEDEP}]
+	dev-python/pbr[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.8.1[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.6.5[${PYTHON_USEDEP}]
+		>=dev-python/subunit-1.0.0[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests unittest
diff --git a/dev-python/pygments/Manifest b/dev-python/pygments/Manifest
index 767bafe87a49..22481211d5fe 100644
--- a/dev-python/pygments/Manifest
+++ b/dev-python/pygments/Manifest
@@ -1,7 +1,9 @@
 DIST Pygments-2.10.0.tar.gz 4052321 BLAKE2B 003d13344a2c5fe448a23d7bb45a401dc839cac10be262f5831c9547444d395811c92b74d1b18663a11a2e6cedf29b5a74cbd75267157429d61375bd9df6eb49 SHA512 28fdf35e333717795f199e0ef936d6df16ac0752324839ac36cabd2f9f6759a57663527d37f1c2f470258d63c3cf190f6dd4b631b21c849fc76575036fbdae12
 DIST Pygments-2.11.0.tar.gz 4157814 BLAKE2B de70a1de48083a9a0f281e4eb7f164cb551bd2fa2e7682c26c4513e1ebadf9da4ba6b2ccb50cc16955df484d313dff2b0431d6de2f5590c59c775f9ebd3884db SHA512 761b722cdcbc41bc730843e8120ae3c0d634db9918c1c1870d89b79002b55f245c896ed9301c44b665e573a8584d5f8504623fe9d4c63820b57a2cfcae576b33
 DIST Pygments-2.11.1.tar.gz 4206490 BLAKE2B 116efe4eb71b276eb860a1de04191b8cb01abc0c879a764715d6d6290a523360c7b195e81a6f32516ad5830410534f2ad01498393c36959ce934e1ccf1520fb9 SHA512 77bc1c7fa10ce945591f6d0546f0e9da8d65df58954348fe3b5a4dd8628c9697bd500e74eec3e2a095c5cb3378b8dee1cb0396cd52d7c36c0f2ca719a6d023b9
+DIST Pygments-2.11.2.tar.gz 4206258 BLAKE2B d9b7ac03ab564051df8eebf390586387d824584f5485eb6af2048cec181412fe2812409251c9c042421125a2579d9ac6de4006c1c0de025ed7b010482482b9f9 SHA512 606ff0c35fa47882f4c5c3794827132e1ee6ccbb4895ae858f9c93ea0c92b73163c9f4d630b51a8bb782ba0b4944a66d1059ad5d017d3191a0a5b30c1e5b8f9f
 EBUILD pygments-2.10.0.ebuild 911 BLAKE2B fb910522498e3303072b67f2a4a70fb6e1644b76cd737a4897ad8c3a766807d718e25a57c981abd922a0d57fe3ef64def519dd4d64f52ec16cad0b83474334cf SHA512 fd273c2cfa43daec4adc42a8cf04f20bf08efcbfc7fe15a1eaa83f22c5d2e0155677d4f155092aba35683123b3c1d45ac631a2f24f094b5c7e4aa743c58d5265
 EBUILD pygments-2.11.0.ebuild 926 BLAKE2B 541ccd3809727ff287283d2d048ffe77bfc1042c2b1d76871b3da6fe8bd957f5e6df5ab6df900752821536237c6cf56b4d9f2838cc5fb88e070f959af2506112 SHA512 6320b2d9822b0df84d5d2d7d56e61a1abbbeeafabfa07351ab3f6c2a289b667d475ab0d674031af169e4f6d87d426dc48534d2fa85870f8bdb39f658d27ca5f2
-EBUILD pygments-2.11.1.ebuild 933 BLAKE2B 15b78d4b817d05c0fe892b12e08b3b59ea389b99924f0f583284b57a58620b31c1d73f4f5617db9c66c5e8f2dc85ac7cc11005565014a485230e64ac480f2115 SHA512 c91849804fdb37b2a516473d1833fa5a116aa4c7a61a6318a05b5862fe797a5895598c760e40d416c663758b77d1791084bfd6d007176ae4797e1433b810d752
+EBUILD pygments-2.11.1.ebuild 939 BLAKE2B b95f0d718a732c39f3a3a26612b7a042a23ac0bdf519dca2c1d4840b4ba0803d26a8de5d9e6628def55047caff063200f1d2c61f0213b4edbff437b5e9c23ce1 SHA512 240c0d700e351bf007191244ff7ff5c7ca06bf83f23f3b181fca87a1967e2f48c304068aac0d92cc8112f69ae65ac6501f456485802893a6eaf1d92feea1f9d1
+EBUILD pygments-2.11.2.ebuild 951 BLAKE2B 4b716b6ffbfc6f066e80a7cb50ed2d9ac8131bc298bcb50e46b2b91499c4675d3b3825ad3959ea0dbb8645239f47596fedc067dd92fe96e7ade0735c5f1b37c4 SHA512 dd9ceb1f3ca588020ca380fa8cfca081358e9945b307cb031ecff827f0c5870abf7c859277e87277b303883dcd5d597985650cfd2b9b88fade3151e5f5c77a10
 MISC metadata.xml 557 BLAKE2B 59b5fbb74f5d0b8f65127b36871561853ec6afde94f0a31986067c1f6f24aa18e648c38752ae7bcaebe0ef43fc457ef32d017e463006f1c2c9e92932675e03ca SHA512 0810f5412085ff458230b3137845bebf5841a1bab0f729f2bc5152ee44b570e855323cefbc24eee54c5febb1ea2c90a5a4357106a15c8fa250d77eaa057c01fe
diff --git a/dev-python/pygments/pygments-2.11.1.ebuild b/dev-python/pygments/pygments-2.11.1.ebuild
index 3f05c9c6c07a..d278cefb452e 100644
--- a/dev-python/pygments/pygments-2.11.1.ebuild
+++ b/dev-python/pygments/pygments-2.11.1.ebuild
@@ -17,7 +17,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/pygments/pygments-2.11.2.ebuild b/dev-python/pygments/pygments-2.11.2.ebuild
new file mode 100644
index 000000000000..933278c2e707
--- /dev/null
+++ b/dev-python/pygments/pygments-2.11.2.ebuild
@@ -0,0 +1,37 @@
+# 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 bash-completion-r1
+
+MY_P=${P^}
+DESCRIPTION="Pygments is a syntax highlighting package written in Python"
+HOMEPAGE="
+	https://pygments.org/
+	https://github.com/pygments/pygments/
+	https://pypi.org/project/Pygments/"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${PN^}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc"
+
+BDEPEND="
+	test? (
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/wcag-contrast-ratio[${PYTHON_USEDEP}]
+		virtual/ttf-fonts
+	)"
+
+distutils_enable_sphinx doc \
+	dev-python/wcag-contrast-ratio
+distutils_enable_tests pytest
+
+python_install_all() {
+	distutils-r1_python_install_all
+	newbashcomp external/pygments.bashcomp pygmentize
+}
diff --git a/dev-python/pylint/Manifest b/dev-python/pylint/Manifest
index 9735884cc016..6223d15c8bb3 100644
--- a/dev-python/pylint/Manifest
+++ b/dev-python/pylint/Manifest
@@ -2,5 +2,5 @@ AUX pylint-2.4.4-sphinx-theme.patch 468 BLAKE2B 741a362b51d35f574b245b4df81309b1
 DIST pylint-2.11.1.gh.tar.gz 967223 BLAKE2B 435bb4589fa6dbfadfa234f8cb968a1d5c39efaf9b37fd20dfadc6feb1e997b34124386dab777b1aa1657bd9a36055d535e231181c71834517528cbbc04c698f SHA512 fe283b6eb8090414ea99809158b4e7f9fe85187ef6488ec37c5f34430793b0b4ff8afd9c97452fe0bb88efb9be001c0fd9f9a09a23081cb79084ae409b277f34
 DIST pylint-2.12.2.gh.tar.gz 1032702 BLAKE2B de7dce04159b332baa5c23f4034ee249e49f9239c5c9190213a51a84a47ac2129f8a2265e1ad9c01ab448ec58f4f36653c6de5b0be6bfdf6aa286c8887313759 SHA512 0d2b9b785371af0a1c809271153abbab58f50455b34f12370461ded2c4f3d62656e4c0391adff48e179b95da945a2f44e762863e2b7d63808976bf5f684e20d2
 EBUILD pylint-2.11.1.ebuild 1455 BLAKE2B 58acfc0c54021ddf56ce16cb7788e621807418d4054278ab33852cc41150921b3da2a8851c4a9b7978e839ae85faca611fc5e9c0e8a69007e1d11700d0854abc SHA512 a46543d41dcde85017cbcc8cab08ac8e74c24cd9ec7d6489d33982c9f8233d9dbaed4f231d647c31883200e2ddec7a79dc189243d64091deca1dbc18b4856f0e
-EBUILD pylint-2.12.2.ebuild 1729 BLAKE2B c62665d94d38c96e24c698cde490f2a3e11515cfa01aa471f5fad7fdb59306f3219d14b0d6c0050a612cb332fc45f3a58992578ce16fbf006ebccaaeb3a87cc7 SHA512 d0bfcc70815033b6c63dacd7f3e9eb95f24655f0ba576e3e45760862ef6e0d478529db5974810a49edb2ce3fb9144e0ee831b8e70a8ac2b698c9f8d5e1b7155c
+EBUILD pylint-2.12.2.ebuild 1725 BLAKE2B f43be54f1bd55b286a0b94571de2a74ed52999ae803db94bdee3dab79339c4bb9b7d968f503f1cbaf23bac96ad90a129e218405c9d2074f1c62f7665062de32e SHA512 2b12bb303414f561b9e6971b1d1dca74e788d5eca2356732ceb35bb45be89fe9d18e609303ac668acf254bc5ba29c266f2e71869e9b0d758d3b22743a5c669b4
 MISC metadata.xml 1100 BLAKE2B 98ac44b343a44471afed50ea76c658142056bba3e3e0a75e7a3854c6e196eb55eeb466611c4d2976787fe4e5d4c13c1f434cad8afaece76f3ba04cd94197906f SHA512 78b52b43ebc944c60d037adb4874fcbe72a2ac713b713ac3b9a226966db2fabf0b31a11e16dcf26243cc19c62841928ac4bb32f5eef69f9d6ef9cb0222362bbf
diff --git a/dev-python/pylint/pylint-2.12.2.ebuild b/dev-python/pylint/pylint-2.12.2.ebuild
index 519a8a829e05..a0daced3712e 100644
--- a/dev-python/pylint/pylint-2.12.2.ebuild
+++ b/dev-python/pylint/pylint-2.12.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 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"
 IUSE="examples"
 
 # Make sure to check https://github.com/PyCQA/pylint/blob/main/setup.cfg#L43 on bumps
diff --git a/dev-python/pymongo/Manifest b/dev-python/pymongo/Manifest
index 719f05aa66a1..a21e84d6b847 100644
--- a/dev-python/pymongo/Manifest
+++ b/dev-python/pymongo/Manifest
@@ -1,15 +1,3 @@
-DIST mongo-python-driver-3.11.4.tar.gz 983009 BLAKE2B b2ca8d90a34b41c0991b545626853137b6a7f5f006dbb5d7a93fd8312759b53b99415583ca5ba982abb420db8502cb9de745f1ac0962efa05eb05ecb4289c323 SHA512 ecd2ff41ab902423dc58901cd9a8355e200f5b00a4eea4a8e950de75674fd59f7367df1ab7ee6c09bf515b8fa110cac0f7de084fbe14527486a9c38a0c8c9c27
-DIST mongo-python-driver-3.12.0.tar.gz 1062091 BLAKE2B 636a34a42d43a6ecd549c51e9e5b3a617291b64a1ba91d7473c365f8df88d59efd7b2906dd80147ffab4309d38cce30a3475bbe142e347312823236f8657c801 SHA512 fc2734b8821b42cca1b67930d5c7612526e51292144a376425627ea6254b09128ccd894af3be293184f940c7f8faa1c0cd3a0d069f9b4143a15cb32279c3bdb1
-DIST mongo-python-driver-3.12.1.tar.gz 1067667 BLAKE2B 3f18c5aa92ce180067f9c86e1fcbd80543274a2ee33ce1fad5741f0e7f5a9cb0520c33b8fe885ea69c2c8ce168747a44129fe79a5df389b83bd5e77a6ec4a687 SHA512 1fc98c33d8140ab045804130fc27b655a8622318f7030967d841e7a296dcdfb89a125cb2574a9b08eef15d3fdc089f268631501743b46d04a7b465cc45c0c04e
-DIST mongo-python-driver-3.12.2.tar.gz 1069372 BLAKE2B 962dc2ee42f01586d9e8fb07d3ba7a74f4379af268b6213c1a5b67b901c805719b9c164fc3d270dd77b3c627f998b291330eeb02968246f2a68e5925bcb608fc SHA512 0e6ac0eafb8fb71db22e7ce27e6acc5c17ea80ac8c0100c358302582da68e03d7bd33eed320f5c8c43b067c3f1e75b4ed4f8c63c4c9705bf9a1c764917d973cb
-DIST mongo-python-driver-3.12.3.tar.gz 1069576 BLAKE2B accb8d1598c3f7d3fb4bec05390521562abf3a067abf82e25b62ebfdb95ed000f6a77edc60f0bcb816b85b1f7fc32c1e4dd54580c203a5d383d30e144a61dfa9 SHA512 21a723985c7846879d3b81ca41060fa6063b187c91c0c7797227f0b7b174880114aec9412d37821cb3d839bf98039b87f03c7c559b9599626705d3f790a8e11c
 DIST mongo-python-driver-4.0.1.tar.gz 1030722 BLAKE2B b820901a433ffa2e82db0ef3c014aaa1e7d53bbc3ab94a5432fcb713d9789cbbf411a4ad5085ef3896cbf2aeff6d0e79f3f7bd5936d3aa615080a0421d8818c2 SHA512 1aead66d21c032e6d42b3aa408b0193bcac6a5a293ecfc513fadb634c574dccdcd351c693352f23cfe577c73fec901cdc2aa635dfe9afe8d9108ed917f55b53b
-DIST mongo-python-driver-4.0.tar.gz 1029687 BLAKE2B d8ae35b68bff288388a797c51b40d453c3e2197a0b639689bbb43f7e4470f3c4d5bf861d6ae77805b950e8c8daadcef5043b93c6d6a4b094fcb95521caf4c751 SHA512 b29acfcbd92b8f46780039cd0688cb03c083dfaf1ec6793906029f1e03635edc9a9ef6eb7104fa3dc16eca6df4ccfedd7bd4a8da495f754157edec371211fe15
-EBUILD pymongo-3.11.4.ebuild 2709 BLAKE2B 9c805d2fdb0427c015d0dca59c4d718c10e3799d8f00745d109566f9e6a6c9f68a0d63137bcd5e1ca756eb889bd5a4d0fd01d8ac182a3bcdee0e96ae3dbbed36 SHA512 4fb36123d4b2c50362386f7ceb545fd756433781c033565ba4881e8570b2c69f2eaf45f2c93da589776b5fce5da40a9489bae1768c569e9c626543db3d96b679
-EBUILD pymongo-3.12.0.ebuild 2713 BLAKE2B 73c23556f161f9dcf0601026ef3f7d07b308d65e2c4c41aba631d0c6a7e21a11bc8789727f90b205eb0c1adce66ec5c883c740babd1affac4f99205bc9c9d4d4 SHA512 689f54b4e4db3c3d4ffa986d0a941201ad2948d1f9f9fb768706b88f01b979a35222cb75ef7edb84c0593f2222044635817791798cc0ad87a07e892cfc4f23c0
-EBUILD pymongo-3.12.1.ebuild 2715 BLAKE2B f94b39bf3c4e2bdedd2b20448b020058af9753238710e8e5b7681649477c1694aa3980f04088328baf2fc363e39f5025cc71622b3dd061832b52d5fbc017e31f SHA512 0ece2364102b8be2863f8a959c36368dfaff18332400be7f7c4aa984d7c16fb77f123d0715304fa4f3f94d39a4072f01903c9c2e75e467982b7eb99eb868a967
-EBUILD pymongo-3.12.2.ebuild 2601 BLAKE2B 17bffdbdb1b764286f90dde0682d7d5f1e1606be2fc96590bb1b9232dd8e4f803d05d59c4c4c707c3ad3ba6eb60f9bc2e93f9b3d78542155091bb8cd22729a06 SHA512 0f0de0adfa60b6cde3bdc618ceaac05fd9b595a859dccf08a6523a3dcc50b3eff6c7d296fe813ea0180d5f282d99de86efd425f68795fe8f5977aa61edb05793
-EBUILD pymongo-3.12.3.ebuild 2601 BLAKE2B 17bffdbdb1b764286f90dde0682d7d5f1e1606be2fc96590bb1b9232dd8e4f803d05d59c4c4c707c3ad3ba6eb60f9bc2e93f9b3d78542155091bb8cd22729a06 SHA512 0f0de0adfa60b6cde3bdc618ceaac05fd9b595a859dccf08a6523a3dcc50b3eff6c7d296fe813ea0180d5f282d99de86efd425f68795fe8f5977aa61edb05793
-EBUILD pymongo-4.0.1.ebuild 2758 BLAKE2B 7ec224db050ec3cb820787484fb11c798aeef1ee128b31ae46d1c0a573974b05a8a2e1e39a7b714afa21ce0b03d704eab9946b14f1af3ce347d36f7be257bff1 SHA512 4cc0cf390e545751920856461b7c1c11faf8b036cad653a4b5638dcc5f75a0188925943ea9e701fe68cdb0593526102224e147a8f068ab2e4a85bb22c6a50ae4
-EBUILD pymongo-4.0.ebuild 2601 BLAKE2B 17bffdbdb1b764286f90dde0682d7d5f1e1606be2fc96590bb1b9232dd8e4f803d05d59c4c4c707c3ad3ba6eb60f9bc2e93f9b3d78542155091bb8cd22729a06 SHA512 0f0de0adfa60b6cde3bdc618ceaac05fd9b595a859dccf08a6523a3dcc50b3eff6c7d296fe813ea0180d5f282d99de86efd425f68795fe8f5977aa61edb05793
+EBUILD pymongo-4.0.1.ebuild 2757 BLAKE2B 90fe6d42de8365992624e829541dcfbeda794a0730c2f78faa8a7d5b55e15a769ae1c05078828294ce3c5559a24a44253dda9f6fe6742f590bad274ce5fb60e7 SHA512 72cf6aaed3d38fc225210904be1335ecbbb5b5eb2940242bcfb3a7658bdcc9183faf8412042c2a68c68d658fe59e5b2fc683bf8e3cb0b8cfc35686dce027c0e9
 MISC metadata.xml 673 BLAKE2B fb66f76592841f2647a94e24e07fafa8be2bc31583bac35dc3933a3feeea87f0c4105ab6b480bce5f2b8aeced8c113c8a3ce9714b22ff909f92eccceffa8f9a9 SHA512 9e758aa60153da583ed21bdf6addd001c560894fc6d429217405e7dfbdc673a9e22bc5a41afcc1281f7613ae1059c0824a7bba246006aa66c6eced75ab975e51
diff --git a/dev-python/pymongo/pymongo-3.11.4.ebuild b/dev-python/pymongo/pymongo-3.11.4.ebuild
deleted file mode 100644
index 9bf6b48d8df0..000000000000
--- a/dev-python/pymongo/pymongo-3.11.4.ebuild
+++ /dev/null
@@ -1,115 +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 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_IN_SOURCE_BUILD=1
-
-distutils_enable_sphinx doc
-distutils_enable_tests nose
-
-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 probably
-	rm test/test_srv_polling.py || die
-	sed -e 's:test_connection_timeout_ms_propagates_to_DNS_resolver:_&:' \
-		-i test/test_client.py || die
-	# relies on exact exception message
-	sed -e 's:abstract methods:abstract:' \
-		-i test/test_custom_types.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/pymongo/pymongo-3.12.0.ebuild b/dev-python/pymongo/pymongo-3.12.0.ebuild
deleted file mode 100644
index 07abe794cd9d..000000000000
--- a/dev-python/pymongo/pymongo-3.12.0.ebuild
+++ /dev/null
@@ -1,115 +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 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_IN_SOURCE_BUILD=1
-
-distutils_enable_sphinx doc
-distutils_enable_tests nose
-
-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 probably
-	rm test/test_srv_polling.py || die
-	sed -e 's:test_connection_timeout_ms_propagates_to_DNS_resolver:_&:' \
-		-i test/test_client.py || die
-	# relies on exact exception message
-	sed -e 's:abstract methods:abstract:' \
-		-i test/test_custom_types.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/pymongo/pymongo-3.12.1.ebuild b/dev-python/pymongo/pymongo-3.12.1.ebuild
deleted file mode 100644
index 5ae5fdd073c2..000000000000
--- a/dev-python/pymongo/pymongo-3.12.1.ebuild
+++ /dev/null
@@ -1,115 +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 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_IN_SOURCE_BUILD=1
-
-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 probably
-	rm test/test_srv_polling.py || die
-	sed -e 's:test_connection_timeout_ms_propagates_to_DNS_resolver:_&:' \
-		-i test/test_client.py || die
-	# relies on exact exception message
-	sed -e 's:abstract methods:abstract:' \
-		-i test/test_custom_types.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/pymongo/pymongo-3.12.2.ebuild b/dev-python/pymongo/pymongo-3.12.2.ebuild
deleted file mode 100644
index c45af7c0a672..000000000000
--- a/dev-python/pymongo/pymongo-3.12.2.ebuild
+++ /dev/null
@@ -1,112 +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 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_IN_SOURCE_BUILD=1
-
-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 probably
-	rm test/test_srv_polling.py || die
-	sed -e 's:test_connection_timeout_ms_propagates_to_DNS_resolver:_&:' \
-		-i test/test_client.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/pymongo/pymongo-3.12.3.ebuild b/dev-python/pymongo/pymongo-3.12.3.ebuild
deleted file mode 100644
index c45af7c0a672..000000000000
--- a/dev-python/pymongo/pymongo-3.12.3.ebuild
+++ /dev/null
@@ -1,112 +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 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_IN_SOURCE_BUILD=1
-
-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 probably
-	rm test/test_srv_polling.py || die
-	sed -e 's:test_connection_timeout_ms_propagates_to_DNS_resolver:_&:' \
-		-i test/test_client.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/pymongo/pymongo-4.0.1.ebuild b/dev-python/pymongo/pymongo-4.0.1.ebuild
index c0baf1f0d81e..0ba6ac9eb00a 100644
--- a/dev-python/pymongo/pymongo-4.0.1.ebuild
+++ b/dev-python/pymongo/pymongo-4.0.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=8
@@ -16,7 +16,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~hppa ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~hppa ~riscv x86"
 IUSE="doc kerberos"
 
 RDEPEND="
diff --git a/dev-python/pymongo/pymongo-4.0.ebuild b/dev-python/pymongo/pymongo-4.0.ebuild
deleted file mode 100644
index c45af7c0a672..000000000000
--- a/dev-python/pymongo/pymongo-4.0.ebuild
+++ /dev/null
@@ -1,112 +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 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_IN_SOURCE_BUILD=1
-
-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 probably
-	rm test/test_srv_polling.py || die
-	sed -e 's:test_connection_timeout_ms_propagates_to_DNS_resolver:_&:' \
-		-i test/test_client.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/pytest-console-scripts/Manifest b/dev-python/pytest-console-scripts/Manifest
index f2e16421a1df..1e2e1079b1c6 100644
--- a/dev-python/pytest-console-scripts/Manifest
+++ b/dev-python/pytest-console-scripts/Manifest
@@ -1,3 +1,5 @@
 DIST pytest-console-scripts-1.2.0.tar.gz 13976 BLAKE2B 1452ecfdc47d3341d8f3f30d49f371ae89d6138d56e4dc3a230f6a3803c6c36f542df40e2785c99c3cfd5080fa03b5b3d4926bb742dc99bd2127d47305fbf788 SHA512 07c9baab85035265ab6a21cc0c754b076dba87f08e1ab51319ef47a0a8af0b44f7d42422014c68cf93ed28b508138a70e14b968707cc831682885b3ca8106aa7
+DIST pytest-console-scripts-1.2.2.tar.gz 14314 BLAKE2B 1e4c210fe9fa6a4e9dbe308cf3d6c1a1829f2155185fe3911ee0a299c0292db6bceeeeb7efd5ace9a166c90ae8376d3cdfec8b0c0b585467f157e175709afe6d SHA512 c749b76c8370734f9ab7fe93284f9ac25a38e4bef61181a3b61b3b0d229532f1876e668e5a6e1449dcb939d9cb53527e021f79fd9132f3a28bdf45d95bdcb40e
 EBUILD pytest-console-scripts-1.2.0.ebuild 735 BLAKE2B 8ac179b58ed92b13dda8e3bc3b0f1173d1732e542d079b731cfd9f60c4c4d6ac35675d3a8142a6a420da00ec78416b56f62a744f20ee04a812cd8d94115460cf SHA512 f94d3a820169b8662aa409fafada9a72748cb11084bfe0ca8d2e55200a8c05dae90acc12dda1788810a0de4113e9adea6d904c3cd464c1c1dece2eafefc288f2
+EBUILD pytest-console-scripts-1.2.2.ebuild 579 BLAKE2B be0f5006c2a193c1f05d1d3d2d35bd483ab9877d2f0573977afd2df7edac98382589e7f7d7db91489c2f3a5f49077c28811c672b63af59a3b8e4567468351845 SHA512 ebfee08e3fc10bbf7c483ed1c36525ce6d87d6f6684faf196a49c23a8aec66a688ae9b5867f700472bec19eb4eb06d2c743ada629fe1efa9b417f11f80d087a9
 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
new file mode 100644
index 000000000000..4553e3197f27
--- /dev/null
+++ b/dev-python/pytest-console-scripts/pytest-console-scripts-1.2.2.ebuild
@@ -0,0 +1,25 @@
+# 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"
+
+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-regressions/Manifest b/dev-python/pytest-regressions/Manifest
index 3c48445fd55e..a8903e6f074f 100644
--- a/dev-python/pytest-regressions/Manifest
+++ b/dev-python/pytest-regressions/Manifest
@@ -1,3 +1,5 @@
 DIST pytest-regressions-2.2.0.tar.gz 98162 BLAKE2B d87b331a35a988e8da6a6c827b594eea6ac64adb17a5b4a054ff0e9526d8d0153d84e0f59ffc805f76a96c1b100961ae12d05849fe2dd35ff4c18f42e235b3b0 SHA512 a4c91590f6e3825eef97da4fb21c1b852b68b60d6dc61ca9e1581737c0cb02831b091ae215aa16a5c50d06d413dabf243de4e98ebd01ce2af7fd2ddbaedec3fb
+DIST pytest-regressions-2.3.0.tar.gz 109181 BLAKE2B 1b47d437c46c134b76b724859b6ebdca6aabee9932a7d63b64f3ee1561a2d84dca9c09b5d7fe7847af97814570cfa85a1eb26ef6c0e6bc14f9ce5684cca0874d SHA512 6013f468c522711eade949d814917ffcd77ef2f3505926d9529a8cfea6c8ee33b5520fa48369160767efdd70e6c54230fc8c77a4c5105c783339a3d7fca93bf7
 EBUILD pytest-regressions-2.2.0.ebuild 1118 BLAKE2B 51376b105099e5593beb7e00ec5a914de21eb6b9ef212325c74f5c8d1f9c6e7f6a40bc59714b200c4c6cb52bc0d51dbe9e0b9826e92a035b4ed55dd9f0175458 SHA512 914aa6eae033f5fec8744b586b953c4c90f2f3b6abef7740e3f34c30fe1115bedc9320b85562d6b79b9d15385121b26c215b50a619f25e8c51726142fca3dd63
+EBUILD pytest-regressions-2.3.0.ebuild 1124 BLAKE2B 73a3ced4cc5792c82acb0d8ec5d1e1ef0434987a651748c58b315f2bf27aeabb05a35056130cedd75527c5e6df99863d9416a4af9042e5b07449a31f4bb3e1ab SHA512 b19c5efada994191508d1c0a85d63a2899ad91b0ae587fa6ceb0f9cfa7ba0be95275a407a1e459925f8034cb8a9b0ffa675c57bdf127331e8a450e301951f5d5
 MISC metadata.xml 465 BLAKE2B ae41a884052ebc7399af62f7c8375c1f32088f7ebc23625b521b1dedb31a9844b86fd05a55008178d248f2c9e2a552868301bc35649418cc0a767038f4a484ed SHA512 b698190fc24eff3235795959a1b165860a21a001bb0e05cfefca7d0fa6ee7e987b1b31bea3c69c8dad82ffd9df24ef665a57f8c39a6f17e872b9d2946a69c010
diff --git a/dev-python/pytest-regressions/pytest-regressions-2.3.0.ebuild b/dev-python/pytest-regressions/pytest-regressions-2.3.0.ebuild
new file mode 100644
index 000000000000..8a4c7910c67a
--- /dev/null
+++ b/dev-python/pytest-regressions/pytest-regressions-2.3.0.ebuild
@@ -0,0 +1,43 @@
+# 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="Easy to use fixtures to write regression tests"
+HOMEPAGE="https://github.com/ESSS/pytest-regressions"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~x86"
+
+RDEPEND="
+	dev-python/pytest[${PYTHON_USEDEP}]
+	dev-python/pytest-datadir[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pandas[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/tox[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests --install pytest
+distutils_enable_sphinx doc dev-python/sphinx_rtd_theme
+
+python_prepare_all() {
+	# Does not work with the panda's version in ::gentoo
+	sed -i -e 's:test_non_numeric_data:_&:' \
+		-e 's:test_non_pandas_dataframe:_&:' \
+		tests/test_dataframe_regression.py || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/pytest/Manifest b/dev-python/pytest/Manifest
index b55694060b24..bffa24125919 100644
--- a/dev-python/pytest/Manifest
+++ b/dev-python/pytest/Manifest
@@ -1,4 +1,3 @@
-AUX pytest-4.5.0-strip-setuptools_scm.patch 674 BLAKE2B 4eab3e26423d81614223a88a0124dc4f35892b18ecbcce34280a00774012822fced0045ac7113a50f8f88d042b88e404dbf4d8d3760140c66a48daa3da2a44c6 SHA512 d34d7c1db57804f0d1ff71f3f51c9a736592945fdf564f54c0c20c398c86f08616eb21f75d77457a71738df4d254ec3d69e46aa3378dea6f7913933bcdf45c08
 DIST pytest-6.2.5.tar.gz 1118720 BLAKE2B 9dfc87279617be58353566009325f929e6fa53d54fd4c665a75f3b359ab5415972d745a680eb85ab21ca9eaec84450bc1decd50566b0ccdf90d7551f3d03ee70 SHA512 7624563a9d967da4cbf82cfff90bae8c0cca07b32e291dc7c5efa787725ed1a255edd066bf0d5fbd89b8cbed8cf5b619fe7c7017f44a7f8a014e3310c06bdbf9
 EBUILD pytest-6.2.5-r2.ebuild 1456 BLAKE2B f2cc845bffc5ac26d1bcb985a5e5af6db12b70e6cb04ef79d86783fccadfb005dd67b22d5122939cb8f2465b36f88f4de9ceb9f0fe38183bdf2947cb99128bc8 SHA512 1a739dd169ccbb693f61f5ea8c3b2f4294b0055c4210d53600e9abaeaa1f90658dd3c13ebb6ff7dcd476e6b4f40420127bf2f508de31c554761bb41997c8e6d5
 MISC metadata.xml 391 BLAKE2B 48d31ecb4c8b171ee4e84a58399211368ddc00dfb5dbe0999f96e03d744294cd4fd5263e90600c93d1f13c7da21052faef84b6d0d56709f3559e37b3392ca31d SHA512 6e9caa57eda23995d21df6f52c52d5868e1ff56abb6c1351ffc0fe14b771639473481a2630e659caaff83f0255379aa2d012175af52a0de41221b27d3ab2f425
diff --git a/dev-python/pytest/files/pytest-4.5.0-strip-setuptools_scm.patch b/dev-python/pytest/files/pytest-4.5.0-strip-setuptools_scm.patch
deleted file mode 100644
index ae6be933bca6..000000000000
--- a/dev-python/pytest/files/pytest-4.5.0-strip-setuptools_scm.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/setup.py b/setup.py
-index 0fb5a58a..302b5dda 100644
---- a/setup.py
-+++ b/setup.py
-@@ -1,4 +1,5 @@
- from setuptools import setup
-+import os
- 
- # TODO: if py gets upgrade to >=1.6,
- #       remove _width_of_current_line in terminal.py
-@@ -18,10 +19,12 @@ INSTALL_REQUIRES = [
- ]
- 
- 
-+with open("src/_pytest/_version.py", 'wt') as fp:
-+    fp.write('version = "{}"'.format(os.environ['PV']))
-+
- def main():
-     setup(
--        use_scm_version={"write_to": "src/_pytest/_version.py"},
--        setup_requires=["setuptools-scm", "setuptools>=40.0"],
-+        version=os.environ['PV'],
-         package_dir={"": "src"},
-         # fmt: off
-         extras_require={
diff --git a/dev-python/python-ironicclient/Manifest b/dev-python/python-ironicclient/Manifest
index 91699a6c7e3e..0d078ebf0059 100644
--- a/dev-python/python-ironicclient/Manifest
+++ b/dev-python/python-ironicclient/Manifest
@@ -1,3 +1,5 @@
+DIST python-ironicclient-4.10.0.tar.gz 219314 BLAKE2B 3c4c7d26ac06fa6f79fcc144b3bc5adf2956ccb5685c65da3a01b314f69626df72963b21e32c2208d7de8e0741acf0fce0bf9886b0e623454cd44e5e7b4eb314 SHA512 451ecd31f02c20e237353a2b5d8a5878fdc09dea0ed5d0f12c31f1e4f9d80324cb18b6838199be91a565cf21479a4fbd4dc67cb94b4e8b09847393c8d3581448
 DIST python-ironicclient-4.9.0.tar.gz 219045 BLAKE2B 75caa9e12a8ecc63ee49313e619d931a194b9db1df6a09f102bb6730cc6a14fdccf369ba04eb436505d7dd5e04a38e5fce6e584e1f3810a2407cda4648de5a10 SHA512 ebcbed362099b465f0e7602ef1db29fdc6bc6c163f50bfb32a5130fc33e0e99339ba0e2c6cc4c86f7aa4b525015051629b3c55c5a544145b2ddb72fc233b4663
+EBUILD python-ironicclient-4.10.0.ebuild 1410 BLAKE2B ce1884a9d1a4d4ed6336a3734dd82e3e984e13f67d22f0ea02bf53812a8de12d25abe22be982a8b03e4a871516ae413405848d75d9b2a4d3ad1a6f56c883ada5 SHA512 b837efccc592469864b34122d33ed892967c3beac377fbc0269af6e8a3151a5e9f5c1fdaca4937fb712a77040a5cc4747af91cf117c7c6350f291b7819547465
 EBUILD python-ironicclient-4.9.0.ebuild 1408 BLAKE2B 8d1256389ea75e21e9eb3f2bd826881e14b95ac46284154c094179b5c8c3cafccc5eb72ce9e2642a8925d21ec53a127a3d04f28293370768a6cb1ccdc824a5dd SHA512 b2fed0204318c6c1da227e5c7f9feeaa86952e6d0031f2bd136e8c3f3500f9bf40bc2862c7714288176ae586e757e4fb58811dfe6f2b492e87f0a4b8748b82ae
 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
new file mode 100644
index 000000000000..c5c9326b35b9
--- /dev/null
+++ b/dev-python/python-ironicclient/python-ironicclient-4.10.0.ebuild
@@ -0,0 +1,44 @@
+# 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-keystoneclient/Manifest b/dev-python/python-keystoneclient/Manifest
index e76d585f1658..e56702ac5da6 100644
--- a/dev-python/python-keystoneclient/Manifest
+++ b/dev-python/python-keystoneclient/Manifest
@@ -1,5 +1,7 @@
 DIST python-keystoneclient-4.1.1.tar.gz 316920 BLAKE2B f42ab0648f43fc6424cb502a996c7f81e688171aea4c94ae664d128d31eed04c6936e763ed996af990dda6dbc42d2cc7fcb0aeb8638b75133609521e704d2b55 SHA512 a88f992dfdb196a66ad3b173ac8f7c006524225d426c240e1ed27ae4007df5d5e74251e273c11316ba451f6fb31de6250e51203e70dec670f7f1e0b65d24fdd1
 DIST python-keystoneclient-4.3.0.tar.gz 324711 BLAKE2B ac32c2e4a2a86562cd694506c83e05a4373e86ff619c96772c8bc38329a4e1f52d2cf332b16cccd9690ffbd79c5046e08d44fe2dbc520ce2c2a9b92abe3cf634 SHA512 08131026648a03e03f5bea4505c7fc4922317c8e9d584729c569433a66416cb1584dc932132c5bb7b7d892b1d2545a731b0d77aadc321b1370e332c8fa9eb5ed
+DIST python-keystoneclient-4.4.0.tar.gz 325003 BLAKE2B 4c375ce3c3e0c5c97c20ef89fe240c8d36fa6f2cbd32adc91759cf4a94c95eea8b7a90a08be77322253adf8982f12523ec6cb49c4e0997245bc9dbd5f5d9c5ac SHA512 04e601bd193ea6301cf6350618221f857ff7c43cda350368954417559892101aa47ff9e053255bc4c7ca5dd5bfa6ef724eeec49dfcf29c2296033d80a8aa0252
 EBUILD python-keystoneclient-4.1.1.ebuild 1066 BLAKE2B 722ed128639b4e17552819cfec52325b404f3c6fb6172135109cfe03fee81a84cb52048b0e2e372d64d2757b8d4afc98e146e6424023b409458b7e83c5700275 SHA512 1f239bd6bf7a1223cfcfdac2bb36aa5cc87c9ef46a596b43b1c83df4af7a4f0913fce50d6195093cc474f0ee67152b29494abfbc9420ccfa480f7446a8d6f701
 EBUILD python-keystoneclient-4.3.0.ebuild 1562 BLAKE2B 3f45dc8c76140e692770534c1ad6a3d5d604faf72ec2e6b7f03acc48943a9009296a5d5829491f6b56c8f185b34b9545adf61e331a9f5340d89b1baf22ec95c4 SHA512 fefd5838714c4f0ef0a0aeff178d083a6b8ca1ae42f255dbb2118bde0daea8a20d586eed33e66b92878a11f75b6b0c8a134f71190bb21a6198b1e8e708cda9da
+EBUILD python-keystoneclient-4.4.0.ebuild 1564 BLAKE2B d53039874f7e3581777471f1e19438bfb33f4a60bb0ddaa95fdf25d6575f47780c15cf42705c44630c9da588dad94b254ebd8331a63d3bc245d4b215a4fc53e2 SHA512 c1a3ba919d2b5565e50a0424301d40df39a3aae4d80615b9cb22c90e2bdd5085efb0dabfaa548a6d46126be06e1a967190b9137918ec4e72e455e2f219b7b562
 MISC metadata.xml 487 BLAKE2B c7f320cf61a9bfbf677834c4376e5cbbe9485702895086a48f4ad8c858f21713e6c727a94d6e0d80c114fdcda9d06b0bed06ea82444c5e39e27f0a3509c9cd17 SHA512 af483e3154dd91801e946b454974fce5cd9178c35c18068bf5aa6ed6a031cca79b2fd8c268bf6a5e8d12412731144ff5b9819220bf2213e107db4aed7e3edda4
diff --git a/dev-python/python-keystoneclient/python-keystoneclient-4.4.0.ebuild b/dev-python/python-keystoneclient/python-keystoneclient-4.4.0.ebuild
new file mode 100644
index 000000000000..28411aa54124
--- /dev/null
+++ b/dev-python/python-keystoneclient/python-keystoneclient-4.4.0.ebuild
@@ -0,0 +1,50 @@
+# 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-lsp-server/Manifest b/dev-python/python-lsp-server/Manifest
index 35d13ec5a927..3c5d78f5f06a 100644
--- a/dev-python/python-lsp-server/Manifest
+++ b/dev-python/python-lsp-server/Manifest
@@ -1,4 +1,3 @@
-AUX python-lsp-server-1.2.4-unpin-pylint.patch 9732 BLAKE2B 059b449e70def94d333e1c5f967187ebd2896a296b93412b62476a233ccb55607c49181d81749f78e51f822e4e34d89274b28b82fdb418ed26462ff44690936b SHA512 05d7d29beb835ecb00f89266288539289bbeac07d51d1a4bdca9d336588e0087eec48d50dfb3660e7f814a1ca5c988334e378acde641d85a3d6b6ca9dac20f8a
 DIST python-lsp-server-1.3.3.tar.gz 62604 BLAKE2B 16f49013ccefc0dabcf58c6007c05828a930d0bc873805543fde79630bdc8bd020cb63d0d0ba56c181282a96c57c6084acde30dc2a8011d208040c2a93c3644b SHA512 94e9bf1e74799c395589451c02c1220bc79336e1c1cdc243e95e891f61c7977b2438d78da3db3da572022870e67305b8caca22241e0cfab23d3b546639c69aa7
 EBUILD python-lsp-server-1.3.3.ebuild 3226 BLAKE2B 539d592055d3ee03e4b0a01944fa1ec3157c325220e93285d27577acb2939b7cb5ed13b94d2e0a1af798639f3210df96e248c07c1d12d81ca43fe8554e985522 SHA512 51de2e1dd4bd169a4bd70c61ce6533c1a6f55d3ab50261d80fd58d70c72e70c90b8870bf945d7da316fa1f144fb0ad5ee02a235c8f12e18501e5cddae23d7528
 MISC metadata.xml 542 BLAKE2B ca71a08385d37c7f5cc562986630ae482970842054ffa944151d2e4a5d8449329b71c16c61e2a81f3d3d93f02a61ce637fe0bd0961ba3f86b7182b9728b62d5c SHA512 2d5103643838ba8aec53e7d3e924517cc3d735c724b6dfea249bcce3716aebb9f54e3264cb2cccc15dfe7d0ad4b7d052388122144fe6248d4faeef3482d197e7
diff --git a/dev-python/python-lsp-server/files/python-lsp-server-1.2.4-unpin-pylint.patch b/dev-python/python-lsp-server/files/python-lsp-server-1.2.4-unpin-pylint.patch
deleted file mode 100644
index 8c849720447e..000000000000
--- a/dev-python/python-lsp-server/files/python-lsp-server-1.2.4-unpin-pylint.patch
+++ /dev/null
@@ -1,254 +0,0 @@
-diff --git a/.pylintrc b/.pylintrc
-index 4249ac5..326751f 100644
---- a/.pylintrc
-+++ b/.pylintrc
-@@ -16,7 +16,8 @@ disable =
-     too-few-public-methods,
-     too-many-arguments,
-     too-many-instance-attributes,
--    import-error
-+    import-error,
-+    consider-using-f-string,
- 
- [REPORTS]
- 
-diff --git a/pylsp/__main__.py b/pylsp/__main__.py
-index a480823..4698d5c 100644
---- a/pylsp/__main__.py
-+++ b/pylsp/__main__.py
-@@ -92,7 +92,7 @@ def _configure_logger(verbose=0, log_config=None, log_file=None):
-     root_logger = logging.root
- 
-     if log_config:
--        with open(log_config, 'r') as f:
-+        with open(log_config, 'r', encoding='utf-8') as f:
-             logging.config.dictConfig(json.load(f))
-     else:
-         formatter = logging.Formatter(LOG_FORMAT)
-diff --git a/pylsp/_utils.py b/pylsp/_utils.py
-index 92376f6..9ac30cf 100644
---- a/pylsp/_utils.py
-+++ b/pylsp/_utils.py
-@@ -144,8 +144,8 @@ def format_docstring(contents):
-     Until we can find a fast enough way of discovering and parsing each format,
-     we can do a little better by at least preserving indentation.
-     """
--    contents = contents.replace('\t', u'\u00A0' * 4)
--    contents = contents.replace('  ', u'\u00A0' * 2)
-+    contents = contents.replace('\t', '\u00A0' * 4)
-+    contents = contents.replace('  ', '\u00A0' * 2)
-     return contents
- 
- 
-diff --git a/pylsp/plugins/flake8_lint.py b/pylsp/plugins/flake8_lint.py
-index 7ac8c62..aefd09e 100644
---- a/pylsp/plugins/flake8_lint.py
-+++ b/pylsp/plugins/flake8_lint.py
-@@ -79,7 +79,7 @@ def run_flake8(flake8_executable, args, document):
-     try:
-         cmd = [flake8_executable]
-         cmd.extend(args)
--        p = Popen(cmd, stdin=PIPE, stdout=PIPE, stderr=PIPE)  # pylint: disable=consider-using-with
-+        p = Popen(cmd, stdin=PIPE, stdout=PIPE, stderr=PIPE)
-     except IOError:
-         log.debug("Can't execute %s. Trying with 'python -m flake8'", flake8_executable)
-         cmd = ['python', '-m', 'flake8']
-diff --git a/pylsp/plugins/pylint_lint.py b/pylsp/plugins/pylint_lint.py
-index bdb65fe..69bad1c 100644
---- a/pylsp/plugins/pylint_lint.py
-+++ b/pylsp/plugins/pylint_lint.py
-@@ -236,7 +236,7 @@ def _run_pylint_stdio(pylint_executable, document, flags):
-         cmd = [pylint_executable]
-         cmd.extend(flags)
-         cmd.extend(['--from-stdin', document.path])
--        p = Popen(cmd, stdin=PIPE, stdout=PIPE, stderr=PIPE)  # pylint: disable=consider-using-with
-+        p = Popen(cmd, stdin=PIPE, stdout=PIPE, stderr=PIPE)
-     except IOError:
-         log.debug("Can't execute %s. Trying with 'python -m pylint'", pylint_executable)
-         cmd = ['python', '-m', 'pylint']
-diff --git a/pylsp/workspace.py b/pylsp/workspace.py
-index ec031b6..bf312f6 100644
---- a/pylsp/workspace.py
-+++ b/pylsp/workspace.py
-@@ -76,7 +76,7 @@ def root_uri(self):
-         return self._root_uri
- 
-     def is_local(self):
--        return (self._root_uri_scheme == '' or self._root_uri_scheme == 'file') and os.path.exists(self._root_path)
-+        return (self._root_uri_scheme in ['', 'file']) and os.path.exists(self._root_path)
- 
-     def get_document(self, doc_uri):
-         """Return a managed document if-present, else create one pointing at disk.
-diff --git a/setup.py b/setup.py
-index 3f79774..14ade20 100755
---- a/setup.py
-+++ b/setup.py
-@@ -52,7 +52,7 @@ def get_version(module='pylsp'):
-             'pycodestyle>=2.7.0',
-             'pydocstyle>=2.0.0',
-             'pyflakes>=2.3.0,<2.4.0',
--            'pylint>=2.5.0,<2.10.0',
-+            'pylint>=2.5.0',
-             'rope>=0.10.5',
-             'yapf',
-         ],
-@@ -62,10 +62,10 @@ def get_version(module='pylsp'):
-         'pycodestyle': ['pycodestyle>=2.7.0'],
-         'pydocstyle': ['pydocstyle>=2.0.0'],
-         'pyflakes': ['pyflakes>=2.3.0,<2.4.0'],
--        'pylint': ['pylint>=2.5.0,<2.10.0'],
-+        'pylint': ['pylint>=2.5.0'],
-         'rope': ['rope>0.10.5'],
-         'yapf': ['yapf'],
--        'test': ['pylint>=2.5.0,<2.10.0', 'pytest', 'pytest-cov', 'coverage',
-+        'test': ['pylint>=2.5.0', 'pytest', 'pytest-cov', 'coverage',
-                  'numpy', 'pandas', 'matplotlib', 'pyqt5', 'flaky'],
-     },
-     entry_points={
-diff --git a/test/fixtures.py b/test/fixtures.py
-index 3ced0d5..e57bda6 100644
---- a/test/fixtures.py
-+++ b/test/fixtures.py
-@@ -101,7 +101,7 @@ def temp_workspace_factory(workspace):  # pylint: disable=redefined-outer-name
-     def fn(files):
-         def create_file(name, content):
-             fn = os.path.join(workspace.root_path, name)
--            with open(fn, 'w') as f:
-+            with open(fn, 'w', encoding='utf-8') as f:
-                 f.write(content)
-             workspace.put_document(uris.from_fs_path(fn), content)
- 
-diff --git a/test/plugins/test_flake8_lint.py b/test/plugins/test_flake8_lint.py
-index 046127c..e82a226 100644
---- a/test/plugins/test_flake8_lint.py
-+++ b/test/plugins/test_flake8_lint.py
-@@ -93,7 +93,7 @@ def get_flake8_cfg_settings(workspace, config_str):
-     This function creates a ``setup.cfg``; you'll have to delete it yourself.
-     """
- 
--    with open(os.path.join(workspace.root_path, "setup.cfg"), "w+") as f:
-+    with open(os.path.join(workspace.root_path, "setup.cfg"), "w+", encoding='utf-8') as f:
-         f.write(config_str)
- 
-     workspace.update_config({"pylsp": {"configurationSources": ["flake8"]}})
-diff --git a/test/plugins/test_pycodestyle_lint.py b/test/plugins/test_pycodestyle_lint.py
-index c0d1d7e..e238147 100644
---- a/test/plugins/test_pycodestyle_lint.py
-+++ b/test/plugins/test_pycodestyle_lint.py
-@@ -91,7 +91,7 @@ def test_pycodestyle_config(workspace):
- 
-     for conf_file, (content, working) in list(content.items()):
-         # Now we'll add config file to ignore it
--        with open(os.path.join(workspace.root_path, conf_file), 'w+') as f:
-+        with open(os.path.join(workspace.root_path, conf_file), 'w+', encoding='utf-8') as f:
-             f.write(content)
-         workspace._config.settings.cache_clear()
- 
-diff --git a/test/plugins/test_pyflakes_lint.py b/test/plugins/test_pyflakes_lint.py
-index 494cb63..d52ac63 100644
---- a/test/plugins/test_pyflakes_lint.py
-+++ b/test/plugins/test_pyflakes_lint.py
-@@ -21,7 +21,7 @@ def hello():
- DOC_UNDEFINED_NAME_ERR = "a = b"
- 
- 
--DOC_ENCODING = u"""# encoding=utf-8
-+DOC_ENCODING = """# encoding=utf-8
- import sys
- """
- 
-diff --git a/test/plugins/test_pylint_lint.py b/test/plugins/test_pylint_lint.py
-index cf7a7e4..5b5b99c 100644
---- a/test/plugins/test_pylint_lint.py
-+++ b/test/plugins/test_pylint_lint.py
-@@ -37,7 +37,7 @@ def temp_document(doc_text, workspace):
- 
- 
- def write_temp_doc(document, contents):
--    with open(document.path, 'w') as temp_file:
-+    with open(document.path, 'w', encoding='utf-8') as temp_file:
-         temp_file.write(contents)
- 
- 
-diff --git a/test/test_document.py b/test/test_document.py
-index b543a40..3dcabb6 100644
---- a/test/test_document.py
-+++ b/test/test_document.py
-@@ -16,7 +16,7 @@ def test_document_lines(doc):
- 
- 
- def test_document_source_unicode(workspace):
--    document_mem = Document(DOC_URI, workspace, u'my source')
-+    document_mem = Document(DOC_URI, workspace, 'my source')
-     document_disk = Document(DOC_URI, workspace)
-     assert isinstance(document_mem.source, type(document_disk.source))
- 
-@@ -44,27 +44,27 @@ def test_word_at_position(doc):
- 
- 
- def test_document_empty_edit(workspace):
--    doc = Document('file:///uri', workspace, u'')
-+    doc = Document('file:///uri', workspace, '')
-     doc.apply_change({
-         'range': {
-             'start': {'line': 0, 'character': 0},
-             'end': {'line': 0, 'character': 0}
-         },
--        'text': u'f'
-+        'text': 'f'
-     })
--    assert doc.source == u'f'
-+    assert doc.source == 'f'
- 
- 
- def test_document_line_edit(workspace):
--    doc = Document('file:///uri', workspace, u'itshelloworld')
-+    doc = Document('file:///uri', workspace, 'itshelloworld')
-     doc.apply_change({
--        'text': u'goodbye',
-+        'text': 'goodbye',
-         'range': {
-             'start': {'line': 0, 'character': 3},
-             'end': {'line': 0, 'character': 8}
-         }
-     })
--    assert doc.source == u'itsgoodbyeworld'
-+    assert doc.source == 'itsgoodbyeworld'
- 
- 
- def test_document_multiline_edit(workspace):
-@@ -73,8 +73,8 @@ def test_document_multiline_edit(workspace):
-         "    print a\n",
-         "    print b\n"
-     ]
--    doc = Document('file:///uri', workspace, u''.join(old))
--    doc.apply_change({'text': u'print a, b', 'range': {
-+    doc = Document('file:///uri', workspace, ''.join(old))
-+    doc.apply_change({'text': 'print a, b', 'range': {
-         'start': {'line': 1, 'character': 4},
-         'end': {'line': 2, 'character': 11}
-     }})
-@@ -89,8 +89,8 @@ def test_document_end_of_file_edit(workspace):
-         "print 'a'\n",
-         "print 'b'\n"
-     ]
--    doc = Document('file:///uri', workspace, u''.join(old))
--    doc.apply_change({'text': u'o', 'range': {
-+    doc = Document('file:///uri', workspace, ''.join(old))
-+    doc.apply_change({'text': 'o', 'range': {
-         'start': {'line': 2, 'character': 0},
-         'end': {'line': 2, 'character': 0}
-     }})
-diff --git a/test/test_workspace.py b/test/test_workspace.py
-index a008e7e..44d754b 100644
---- a/test/test_workspace.py
-+++ b/test/test_workspace.py
-@@ -51,7 +51,7 @@ def test_non_root_project(pylsp, metafiles):
-     os.mkdir(project_root)
- 
-     for metafile in metafiles:
--        with open(os.path.join(project_root, metafile), 'w+') as f:
-+        with open(os.path.join(project_root, metafile), 'w+', encoding='utf-8') as f:
-             f.write('# ' + metafile)
- 
-     test_uri = uris.from_fs_path(os.path.join(project_root, 'hello/test.py'))
diff --git a/dev-python/python-utils/Manifest b/dev-python/python-utils/Manifest
index 6173bd9b930f..cba71dbffde5 100644
--- a/dev-python/python-utils/Manifest
+++ b/dev-python/python-utils/Manifest
@@ -3,9 +3,11 @@ DIST python-utils-2.6.0.tar.gz 14885 BLAKE2B 089d7a57a8469968bed147a01907f35d143
 DIST python-utils-2.6.3.tar.gz 14914 BLAKE2B 6df19348feba000dccc516704db38af299613c70505cd7fa16a2e37c4a46b1cff7ee9bf164be13da33a3b4eb6b9577b76202bfbffdaed47b1b7b60e948d349ac SHA512 3c5834976408eae6b37aa07581960ee5511765f9ea1e6347523465a93ca801bc2d71f785a73a2050706dad2c09ffcfb5227715a9b4d0700904d31eb1295b30b6
 DIST python-utils-2.7.0.tar.gz 27743 BLAKE2B 5cd0671ad1e003932aed0bf0b69326d907013d3f739e833f218600ee056d76bc87dd2a424f5459654de30dacc3378c14f10af1664344ac66813410d261718c61 SHA512 3401c9ad2e4933d0d40d4bc90f1dbe212e672289e7239a4a46d79a04e80f85bb0def67324f0184ca397ec3708cb935839ffe922a202de9c911198ea86d88e2c5
 DIST python-utils-2.7.1.tar.gz 28997 BLAKE2B 3da11dcb297cace3c2c48ae91e6011be2f484a83f264be375437775eb99d9bafe703626ab0d2217da79ec096f90648d387ec7b41611e915ef33fce152553a18c SHA512 9f74a33089886dcd28dfd45602c53a7c6cfc90b151a053dd7e49a5fd502479e889d08bd8b10fdd2ec3bc26e334ae66238740ff59291f4ac95fb486b64f925d4a
+DIST python-utils-3.0.0.tar.gz 23243 BLAKE2B 640ebc1b3e59a30be5a5c40291d121919b9f90a71476acf66741cb4b8af691c50c3826d9e8e6b30464f2be8e5ba0ac4683f79962c8833073b8a43a108ead281d SHA512 b03f97b66b71af8eb023ecfa1b671f2d566d139464f63cd512b129a5830651172843285fe7ef028047ca03f345221f5208eac8e1647361f173f1c7b3aed866a6
 EBUILD python-utils-2.5.6.ebuild 574 BLAKE2B 49716b98a6d7a997149be3fb8b0daf5386c5ab180b9eb7c022fff18c73101314807f498f332db2a6b555bdbe67be68bddcf48ac28860727baa10f2c54cd1ea6a SHA512 6a91b1a761fe2f60d6810d6cd3b676dfb87a34982be3284a7d74fda7794874f358fcd4e97b89189e0db4839d6b0f126889abca8c0b6b926fc0db33c3849d3201
 EBUILD python-utils-2.6.0.ebuild 575 BLAKE2B ffb8a2711fb4f8fc1f96ce30f2425619d0849af1d42ec8bcaa97d9c7f0a737d475255f76cceb8e93a55e5bccde4988b0e4ecd7bc1deb2b65b7b230595088b3e4 SHA512 85e20c3c8cd71d72039a1c0c83bcf10aa390c712b47c219dfa67c2de00bb68b0700f9a0a3ab140955d0ae320c6d7160946640d7f4202a28ba09ae342af7a5d78
 EBUILD python-utils-2.6.3.ebuild 575 BLAKE2B 5791d01204f77da103781b305bbf1e4b88e5377fca285b03835886b9f26f04900ca436a11b4653a9d240d934b160a3268b4e3ebaa7b58b59e6b219c31dab55ec SHA512 a1cad83a0ba5ccabad120e4a65c9712bb1824b7ff8db6b9a64222bce4e4e141a6af94214ae2791109c875a078caaea494ed6d33fce6c2fd81e8bdc9b0ca28e00
 EBUILD python-utils-2.7.0.ebuild 601 BLAKE2B d54cb31071edb852dbd7867c2d1922881aaebc3d312a38f8b53809a4e305a2d34d663c9938868f936ea08bd72c62fb6eaff19b10769b2745e78551f2628ecc04 SHA512 11416eee8cce36e4d4776e5890a514e108879ffa56303a01d25f9a04757463689a5b2933b2418188fc7c7aae0a0cc227f831de75d840ba186dfd23dad993fac5
 EBUILD python-utils-2.7.1.ebuild 601 BLAKE2B d54cb31071edb852dbd7867c2d1922881aaebc3d312a38f8b53809a4e305a2d34d663c9938868f936ea08bd72c62fb6eaff19b10769b2745e78551f2628ecc04 SHA512 11416eee8cce36e4d4776e5890a514e108879ffa56303a01d25f9a04757463689a5b2933b2418188fc7c7aae0a0cc227f831de75d840ba186dfd23dad993fac5
+EBUILD python-utils-3.0.0.ebuild 663 BLAKE2B ed14d748640a91c766b1a293eba5aafb0a623556ae540988b5b63e9db3640daf6ddce676e38fe5d378b56645dedd96abcefeb04702502cba0a60d2131cba338a SHA512 3c967b4035b58371c13a06be7ddacb1d861e6cce74575ed8ff8688f9ecfa3588503202b978026ca2ffab80c0ba22ba9c2f90c4528ca5200b22cf322ef1112059
 MISC metadata.xml 340 BLAKE2B dc9b0299a4b93a0e53cc8e8e5ab494a8bf04ea54da4c2f9a658ca485925f86b5a765299c6680ecbff1e29a4e94a88dcac1891e440c788ada76b2123e352ac6f2 SHA512 68222ff7625c88a73f918e1864b67a2a44ef128023668b2a8706e873b4a8703928f1961baa0b304fe8fa075261edcd183bae02a2416813b283aa57c16bf6e200
diff --git a/dev-python/python-utils/python-utils-3.0.0.ebuild b/dev-python/python-utils/python-utils-3.0.0.ebuild
new file mode 100644
index 000000000000..4b9e510e0bc3
--- /dev/null
+++ b/dev-python/python-utils/python-utils-3.0.0.ebuild
@@ -0,0 +1,29 @@
+# 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="Collection of small Python functions & classes"
+HOMEPAGE="https://pypi.org/project/python-utils/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
+BDEPEND="test? ( dev-python/pytest-asyncio[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
+
+EPYTEST_IGNORE=(
+	docs
+)
+
+python_prepare_all() {
+	sed -i -e '/--cov/d' -e '/--mypy/d' pytest.ini || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/pyzotero/Manifest b/dev-python/pyzotero/Manifest
index a328320753f6..163dd08c7d45 100644
--- a/dev-python/pyzotero/Manifest
+++ b/dev-python/pyzotero/Manifest
@@ -1,3 +1,7 @@
 DIST pyzotero-1.4.26.tar.gz 520629 BLAKE2B 7ddcd55a1c21d6dcc4b610a9a29bc86ff002afdf2e2a90513219b9fd13b3d5b504736e122850fc81acf7a4bbca0b8c5da3a92c8eb3a6f07392e3d17a9dc7d73c SHA512 a0b0bf92458746b0dd0c01511efb05dd8fb471434c9e813c9d6dab7741a2eb1a10af2b9c5f68daa4c681353ba8c93cab140ec2da5962d06c76e8a229d4742009
+DIST pyzotero-1.5.1.gh.tar.gz 520410 BLAKE2B ac3aeb0f55f4685135bcf35594fc925f471a92ac9dfe866a4cffffc62d06b1447c80fedc566100d5fc9550ebcc54c7bcaa0b3d8494229791a4b51c806b40dc1c SHA512 76a498a6d16cef0024cd0e1a6d5011a4c2639a573746d0acd2d18616e452ad1f0eabbb92ae073e7e36ebc208870dedb2b3a01b0d70442b10ae81148e9b1cfd73
+DIST pyzotero-1.5.gh.tar.gz 520234 BLAKE2B 0bb64710d7cb4701006884417b46d1fe6a76ae8bdcfbd3b30cc413c8cd3ab7ba024318a28cb8c49a1bf280bf3098ece3267a3580a4ecc55af48f47a436476d8b SHA512 9a2080e1e9886c8e4a2410dc7687637d844a2614d40e38403b408bf584f0b1e5d5a4e517bdcba2f4e0602e5a7a3f2a3c9195cfde20242cc9d1da2ca5d3aa8f4c
 EBUILD pyzotero-1.4.26.ebuild 934 BLAKE2B 17beebe38c8d1d8256409e69d7630cc5f177dd0dd7f1c6f2b81beaf32bd41bb88320bc4749c73ccd2a64bb0b4769e38d162021cda81284e0fa7bf64e3f438e3e SHA512 893cfaa677002b9bd7094dac7b18d7ee8b540a7976ce139d602608b1cf7ede1791d0d9a1d2c45f0e17a7a643ab9a48d625d2cb471bef560221dd2bf622a78412
+EBUILD pyzotero-1.5.1.ebuild 771 BLAKE2B 34d60aa5032e4878ab8a554394a5121cd51461250a03a41931242c9b9d2dda6480b1eec7c3fcba8c7f45b5f816475ee740a9ff28fe19c13e77293ee06153bf3f SHA512 ec5cc0d52752f21be0871cf5dcbf22ec53b0d9ab232c6ac0fed59bd825d3d841c48c3dce6dcb492bca42d2e7e2d58e29ac4f646215c8102964fceff6c6c820e3
+EBUILD pyzotero-1.5.ebuild 771 BLAKE2B 34d60aa5032e4878ab8a554394a5121cd51461250a03a41931242c9b9d2dda6480b1eec7c3fcba8c7f45b5f816475ee740a9ff28fe19c13e77293ee06153bf3f SHA512 ec5cc0d52752f21be0871cf5dcbf22ec53b0d9ab232c6ac0fed59bd825d3d841c48c3dce6dcb492bca42d2e7e2d58e29ac4f646215c8102964fceff6c6c820e3
 MISC metadata.xml 512 BLAKE2B 3369ec5041d7c1819a6a871b5b84733165166c5d32dcf0a271bc431198f2989710e0e3d1d334c3d44840a7fc786530d91beb1d3727ffa4bfb2a235afa05dcb3d SHA512 b6ca7abf0757b75bf25a3e53a5686c17722db174f741144ddc4897a1f3fb864af0d5defa356dec5a65aa324f19cf44847eca44f4b31c0677d01dccda938e089b
diff --git a/dev-python/pyzotero/pyzotero-1.5.1.ebuild b/dev-python/pyzotero/pyzotero-1.5.1.ebuild
new file mode 100644
index 000000000000..00400f165dfc
--- /dev/null
+++ b/dev-python/pyzotero/pyzotero-1.5.1.ebuild
@@ -0,0 +1,32 @@
+# 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 client for the Zotero API"
+HOMEPAGE="https://github.com/urschrei/pyzotero"
+SRC_URI="https://github.com/urschrei/pyzotero/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	app-text/zotero-bin
+	dev-python/bibtexparser[${PYTHON_USEDEP}]
+	dev-python/feedparser[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		dev-python/python-dateutil[${PYTHON_USEDEP}]
+		dev-python/httpretty[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_sphinx doc --no-autodoc
+distutils_enable_tests pytest
diff --git a/dev-python/pyzotero/pyzotero-1.5.ebuild b/dev-python/pyzotero/pyzotero-1.5.ebuild
new file mode 100644
index 000000000000..00400f165dfc
--- /dev/null
+++ b/dev-python/pyzotero/pyzotero-1.5.ebuild
@@ -0,0 +1,32 @@
+# 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 client for the Zotero API"
+HOMEPAGE="https://github.com/urschrei/pyzotero"
+SRC_URI="https://github.com/urschrei/pyzotero/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	app-text/zotero-bin
+	dev-python/bibtexparser[${PYTHON_USEDEP}]
+	dev-python/feedparser[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		dev-python/python-dateutil[${PYTHON_USEDEP}]
+		dev-python/httpretty[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_sphinx doc --no-autodoc
+distutils_enable_tests pytest
diff --git a/dev-python/requests-kerberos/Manifest b/dev-python/requests-kerberos/Manifest
index 0d27a6bdcfe7..22151199a9ef 100644
--- a/dev-python/requests-kerberos/Manifest
+++ b/dev-python/requests-kerberos/Manifest
@@ -1,5 +1,3 @@
-DIST requests-kerberos-0.13.0.tar.gz 20882 BLAKE2B 17dd394165d085d1f47661f87648c9b9104268f0b3c2b0ea68cbb2624e42886c1cba65096b2736b4059e3cf0b387cb0e991a66ce49bf232b965f5e6b5f8f7e17 SHA512 f6ede080ef1dc3a6e0400e401f4627b294c1d660b62bcbaab518d27f7647bc53cbd6ca2a33ba865388a7a5dc16c3b9feeed779f3a1d6783f556f8c9e580180e9
 DIST requests-kerberos-0.14.0.tar.gz 21275 BLAKE2B d64c92bf70df07a8dd38626a6699ecb95aaf82b6aa93797eefa80af2b9760f5b064e0aa3a3bca5242ef73ce1efc4b6ef0ef1bb1802c7c59a20b6655bd3894aae SHA512 9dd6eed0d6afe4b852ba96f621be3af2965e9011bf372c5dce77e0bca18191255ea407ba313904271615d722d60029807db2d6815b24437b021b02b026eb60d6
-EBUILD requests-kerberos-0.13.0.ebuild 745 BLAKE2B 4014e6046d8e099654129772ffd2fb2436636ac1e389af5ea6c54600f4a7d95c594bf304b5e0f5599e57c572f92b64301c5cbed0c6a01dfa5ecf4ecc829339d8 SHA512 26b488fea5845907e2132675667140cadf2dcd58a4fa6e920efc22dc912da763c419bdea08e4e98400107bbbe3dd8f3f548c2fd3dcbcb59149e9a8dbeffc0b10
-EBUILD requests-kerberos-0.14.0.ebuild 747 BLAKE2B e6673275e74065ba0a2dcdfc5ffc1d48769266163690379da4e4627fd82eac4d1f505ad3da1a38f978f2ba2397f91cdbe5b6b5a1e4ac0e00e423ee3f2da9d8b9 SHA512 77c844ff4907eecace2b0e94d8274d8c438d54123ebd3f84633775ad01d03be67a160e8d9fe0f669f1fd5c7c43464f12d6b035d12a398b0b06291a114d73c3e3
+EBUILD requests-kerberos-0.14.0.ebuild 744 BLAKE2B 6f521ba4fe9b4ac6d324f9aa31fd5f7d11e9eebb838ea91dcc79b3970451104986576c87f175364b1a2eb8154dd649feb2090be3637f65af5a683fc8a2bb8b42 SHA512 4bda6aadc15477c1f65df5bfa1f4ab6d5cfdb1d26f0953b7019a093174a205413d06c860c5afe3b5b0434e988b0c6b74e1343b69f4bb208fffb05dec07fea060
 MISC metadata.xml 411 BLAKE2B 06c28d67859801b83b28b32e12abeac09bb3a3d0ed02546ae211b8b8a3ac5a6b464ef3d5d6e6e5f6bac20d9201adc4e543ae02b701a374c50f8e475b7472e240 SHA512 656422babdd89a9afe5c96344c625ea5a5f0e541972636366176f77e39623773907dd0de9bbd53ed664b63bd3215ab40780e6010ea8f1febb73640920a800aba
diff --git a/dev-python/requests-kerberos/requests-kerberos-0.13.0.ebuild b/dev-python/requests-kerberos/requests-kerberos-0.13.0.ebuild
deleted file mode 100644
index 2978e643cb68..000000000000
--- a/dev-python/requests-kerberos/requests-kerberos-0.13.0.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..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-kerberos/requests-kerberos-0.14.0.ebuild b/dev-python/requests-kerberos/requests-kerberos-0.14.0.ebuild
index b70035e03de9..a1396938fd1b 100644
--- a/dev-python/requests-kerberos/requests-kerberos-0.14.0.ebuild
+++ b/dev-python/requests-kerberos/requests-kerberos-0.14.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
@@ -12,7 +12,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-unixsocket/Manifest b/dev-python/requests-unixsocket/Manifest
index 9ef17e1d69a4..c54d3d279e55 100644
--- a/dev-python/requests-unixsocket/Manifest
+++ b/dev-python/requests-unixsocket/Manifest
@@ -2,5 +2,5 @@ AUX requests-unixsocket-0.2.0-no-pbr.patch 981 BLAKE2B 1a722beac18bfb67074f7a4cc
 DIST requests-unixsocket-0.2.0.tar.gz 13303 BLAKE2B cda02b5d963b00fb06cf86819bcbf552ecc21e30064198da338f502f47547a1f93184fd06052047c6cb8a6181f0a2f7b7a7cc53183b18dc22165a41dc14144b5 SHA512 a670f136ff1d8fb427cd017d92d388fd48a8a853d50aaa6eed685f3b453e28c6dbf5a710d7394face3eec42f8bdd84f798c7c4c82dab7b53d7a8c229ade52405
 DIST requests-unixsocket-0.3.0.tar.gz 14478 BLAKE2B 5b46ea051729326498f50ba7a952429d271deb102060f8e3019d259ddc21dbffdca8960e140c7ccb25898034cf37fb90dd143c970e75bdc6e6442e9515f14d6e SHA512 21c887b0c3fa526a2debb3960e0ea4dc3b3015cdd517459b6484501176321408d1b4c87dd2840c7d8b71d08fa9114f655ae03f8bc9ff1fca33c914900ef82f5b
 EBUILD requests-unixsocket-0.2.0.ebuild 761 BLAKE2B 5226171b768931f0f4038466dbe79d79c20d01485d44795bdc3e395fd7318306609246d38a3d7e1ed47834176b70b4a8d68fd432092d26c5081f41be5553a8b3 SHA512 15847825ebf5ff19307f70951b61535af33548a2b2ea55ab568f16b8aae5e0191c707fa1992915cf81eb5539def6e59f7c020dd12b75620e1190901838fcd499
-EBUILD requests-unixsocket-0.3.0.ebuild 714 BLAKE2B 6b35522dcf0c49a8d07e90deb355fd0717addb09593749aa099013364f9f0b23e02891b68df7224fb1ee7a46c26930f445f1ffdf02dabced163c3db36aa91cd6 SHA512 a7d4d7b3cbc661b486e9325b33d1143dbd46a691a6d4abbbf93c1198c8bcbdb08239400889dfeee60e3b6f5bd00606bfa998a43739f092c7c8dab4c6d9df9cf1
+EBUILD requests-unixsocket-0.3.0-r1.ebuild 628 BLAKE2B eef1089804590813a00daca18307af6554d67247e19774e92d3b1e0f6358c93acb41bdada193c395123e357cf8e52ef1597544d646f72b0066559d9def352dfe SHA512 642e7e0d896bc8789fdb1ea481f2c9121f87c7a2e79079f364953263b17c17bb69a8cb069027893f104e67d952cd22bc9c0eda9906a73e3523f21e419c17901d
 MISC metadata.xml 301 BLAKE2B ace08d89c89c1ba3494d4b9854d62d73076548f77d87f2047859af61f30dc94495fecd254baf8ff7243bc9d914fb832210965491e1e832ceb7390e47b784dce0 SHA512 66f048263f3bc94edceb5a0439dcdbd74b5c8dd362eddf77cfa2e888925f73cd4c74163c8cb935795310c317eadd989ecc3dff422bb3008e7fc15c498bcbffa5
diff --git a/dev-python/requests-unixsocket/requests-unixsocket-0.3.0.ebuild b/dev-python/requests-unixsocket/requests-unixsocket-0.3.0-r1.ebuild
index 516dfaa7a3fa..6e7c4fcb3bf0 100644
--- a/dev-python/requests-unixsocket/requests-unixsocket-0.3.0.ebuild
+++ b/dev-python/requests-unixsocket/requests-unixsocket-0.3.0-r1.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=8
@@ -14,15 +14,9 @@ LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
-RDEPEND="
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/urllib3[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/requests[${PYTHON_USEDEP}]"
 BDEPEND="
+	dev-python/pbr[${PYTHON_USEDEP}]
 	test? ( dev-python/waitress[${PYTHON_USEDEP}] )"
 
 distutils_enable_tests pytest
-
-src_prepare() {
-	sed -e '/pbr/d' -i setup.py|| die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/requests/Manifest b/dev-python/requests/Manifest
index 4696a9a09b73..5f56d3ad93b6 100644
--- a/dev-python/requests/Manifest
+++ b/dev-python/requests/Manifest
@@ -2,6 +2,8 @@ AUX requests-2.26.0-test.patch 1328 BLAKE2B 4f9e66505a4acfe7b4bd62c6c95c28fc01eb
 AUX requests-2.26.0-trustme-dep.patch 1134 BLAKE2B c432d6edf75d37e62d529ce06ea5dc0ba88593f7c7b40900388bbfc2b8d8503870fe4226c256d36de9ca42f3b638ed5ea11176cb22ffe2e5d4828418e21619f6 SHA512 9f9383836d0bf5dd4f86ccf7e6f5d6d8f4601a68f42465958f431a8cc471d74584f616d1145fe21ae26c6b182a95758593a947b3dca7ad6fcd5f868421e182f2
 DIST requests-2.26.0.tar.gz 104433 BLAKE2B 49872a0602ab0e6b3838c4ff84d6611c5265dd584a1902b51d5903a2fc566b97f7a70973a9244adf190e9249bc6d1fa448a2164a31d125ab6b3dac172ae62e1c SHA512 c3397d77f0d2f1afb05661c4b98adad6c1ddaf360906254150b33ab0d9479fd306905bd6d61b8cf8becd9a40bdcf9b03542e8267c644ef19f03f44bfca0bc461
 DIST requests-2.27.0.tar.gz 108487 BLAKE2B a24e9071d39b8677309c5a847910cfb8bf91b22b522bebc8166e9fb3a36ce9783bb23ad725d43aa19da5cf3a1b11bfc21766a2995ba9810b6c973b03a7acdd1b SHA512 9d43c637bebb1b98fc25f895308673153686ef0b97e5d568526fb63c348dc939fab620fd7c550fef0a2977e98a466c8dae0710cef5b969b28b9a4f3a1f9940f5
+DIST requests-2.27.1.tar.gz 106758 BLAKE2B a7fed53998fa61b3d03abd254a0cee76450c5b60d76f80aa6b91f32dca1dae5d2c51987b3d3f2138d72c50790e35c36cb03eb5974554ac4eb1a902eff79b5bdd SHA512 e51916abea8125254c5ee72c97e84a73e6981cab09961486873387522d2ce041ee3fe8fa2ff0b9bbe6707eefdc05145e9adcf127bcd999dea127acdfabd5312f
 EBUILD requests-2.26.0.ebuild 1806 BLAKE2B 986e2e35b139c752321d3d3034c8fa474531abafa2d3855f9ab3be0e6f86fab99565b2e98fc17fe82252a65e892bdda986373ffc63043953ca3eaf0b29623eb2 SHA512 c64c06742ba604d261512b92082984b6b1ad6534cc4de96f71efdbb7407ff94fbe6b42c303d6450d6f402e52576e55d515d60e148b4d7ef2e9a358f7f7a31a66
 EBUILD requests-2.27.0.ebuild 1732 BLAKE2B a7d032736c07d988f3e4553cc2454fbea11db684fb7d5044803ed67f1ed05ab773bd0a7d7e02d13ec4a365f5819ab451f659931e42161d9a898bdc3c190965fa SHA512 73810ad0ce77e28e8210c52511d3fae26cfc895577d248cc85e520ea22a0093e64edae7c14d95bbe34808fa94fb84186904e697e13ebc7e829c42a9d49bf4a8c
+EBUILD requests-2.27.1.ebuild 1732 BLAKE2B a7d032736c07d988f3e4553cc2454fbea11db684fb7d5044803ed67f1ed05ab773bd0a7d7e02d13ec4a365f5819ab451f659931e42161d9a898bdc3c190965fa SHA512 73810ad0ce77e28e8210c52511d3fae26cfc895577d248cc85e520ea22a0093e64edae7c14d95bbe34808fa94fb84186904e697e13ebc7e829c42a9d49bf4a8c
 MISC metadata.xml 770 BLAKE2B a085a3bdbcc34c2297ad7d5a0e811c553aa77f12bba1ee8164cf63af2cd86adcef7b6080c984ea73a417ec690252540a0fc6072ee97b068b70f0f695696fc65c SHA512 de5c6a99ae18955f25895a93911570d41cb458eaaa9dc8b6edd09021c6dff3dda7bc2611d090b933837f83b8a7035769bb275bb844e1ac91b89a088dde3c7222
diff --git a/dev-python/requests/requests-2.27.1.ebuild b/dev-python/requests/requests-2.27.1.ebuild
new file mode 100644
index 000000000000..eac11c53b979
--- /dev/null
+++ b/dev-python/requests/requests-2.27.1.ebuild
@@ -0,0 +1,63 @@
+# 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
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="HTTP library for human beings"
+HOMEPAGE="https://requests.readthedocs.io/"
+SRC_URI="mirror://pypi/${P: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"
+IUSE="socks5"
+
+RDEPEND="
+	>=dev-python/certifi-2017.4.17[${PYTHON_USEDEP}]
+	dev-python/charset_normalizer[${PYTHON_USEDEP}]
+	<dev-python/idna-4[${PYTHON_USEDEP}]
+	<dev-python/urllib3-1.27[${PYTHON_USEDEP}]
+	socks5? ( >=dev-python/PySocks-1.5.6[${PYTHON_USEDEP}] )
+"
+
+BDEPEND="
+	test? (
+		dev-python/pytest-httpbin[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		>=dev-python/PySocks-1.5.6[${PYTHON_USEDEP}]
+		!alpha? ( !hppa? ( !ia64? (
+			dev-python/trustme[${PYTHON_USEDEP}]
+		) ) )
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# Internet (doctests)
+		requests/__init__.py::requests
+		requests/api.py::requests.api.request
+		requests/models.py::requests.models.PreparedRequest
+		requests/sessions.py::requests.sessions.Session
+		# require IPv4 interface in 10.* range
+		tests/test_requests.py::TestTimeout::test_connect_timeout
+		tests/test_requests.py::TestTimeout::test_total_timeout_connect
+		# TODO: openssl?
+		tests/test_requests.py::TestRequests::test_pyopenssl_redirect
+	)
+
+	if ! has_version "dev-python/trustme[${PYTHON_USEDEP}]"; then
+		EPYTEST_DESELECT+=(
+			tests/test_requests.py::TestRequests::test_https_warnings
+		)
+	fi
+
+	epytest
+}
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index 6b06669d2ff5..31abd83967d9 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -1,6 +1,10 @@
 DIST python-gentoo-patches-3.10.0_p1.tar.xz 10068 BLAKE2B 1c9817b449831559f0a0b722c02a5f55d94b3dfde98e5882c1403fe24a4addf7074ab39c09b91cff6fd7ace2e4b6e8ed899d9a0b9ffd6612ce315c4c192bd309 SHA512 39aa41dbf17b6dc5255491c75031a3dae6962b44125e426dbfdce365a6533c5dae9856b1fff8016a189124b7cff72d2665ce99da344c2f9dff005ba685e8c2c4
 DIST setuptools-59.8.0.tar.gz 2282358 BLAKE2B 2f1b49285fc70420e24f958c4955200ef0407a7f3aa52fd581a165fd47c7bbde8366c26963f1bbb36f0f77797c12cbb9016fdc69e1a5cc696bb67aacca16d140 SHA512 d906558b498bda8abf28831224502c6f0290a4cdbf087fe07af8321dba3dfd1e19fa5b4a820033e54c4561b82ea8ec54c287b4fd657892ed28c2a7de91a9107e
 DIST setuptools-60.2.0.tar.gz 2282807 BLAKE2B 97d54353050d4e8a009e617a112c23d70726ad00625994d78639665f41245cee6f92544d5d5fc9962841ac0b2db3302ebbf0b5c6ee8f544f003fa05358c7ccf2 SHA512 9c7185843ead283ef97311018f1bb683c2e969f0333d5b246c7f1687c5ec6a9d6a2dafc39540ea7354e969d5a3f84e74c07dbce010970dd0ed46ebb48300a0bf
+DIST setuptools-60.3.0.tar.gz 2283824 BLAKE2B c0e1ffb6c19fd4c85aed2878a95e23372131e5c069551b39af477c72d591608e73d1bd9710d34a8540c226a0dbb91dd9def170121672daf2928d039f589c238e SHA512 71c19147e8f34a5eb2c830ad0942bcb1a468a3ae07c91035fb19eb50d549dbc3b9e992dd2b654383843ac6ba088a46dedfe928850417da92c24f1c5bf3e8b6c9
+DIST setuptools-60.3.1.tar.gz 2284193 BLAKE2B 0138acaf830d7f29db95c759e60d77986113385b13e96446974b63abf3621db2d2fd033f0f45bf380b6cfb2066ed66ff008446ca595f741c3f5446107f2a554b SHA512 7a2434d857b2914136d5ec0a7b9fbd89352a5dd3452bf2e3f7c0e2ef7317b45a3cfe6d3921b7f61a1f0a99a7c06f73428f9871dac0d7ae481fa1a1a0b97042cb
 EBUILD setuptools-59.8.0.ebuild 2933 BLAKE2B d5f4b008152d6a1324ea2a63da229f71fda4f6e20f1d7790f69257e9945ad98c02d765dc5c4e76fe44b476eeb19df6b21f582c684ab13e7b6452e280babfa0fb SHA512 e627a7c69f998d01dcd24c446efddf1af40e97065b13df3398e1c6e8c320f42cf1d5b04d2e84325f32298e0c91c8d789def20d4e947d6aca6e66ddda8058d14e
 EBUILD setuptools-60.2.0.ebuild 2984 BLAKE2B 3cd9bfbbc75d022caf3c2b8e8596d58834a62325ad8089077775eccbf149c65a680a0fd3551e396d9ad9764379ee4d4850ac4a0ad4afeb75f342a0816f77acd6 SHA512 f609442d4acece1735eb444e91db94f2b6a49c48edad30fa58b8fd27bd02cc1583a873b9cbdd3608dc592bed69cc3b1d2a86c80c8589a99218e16b65ae7d589c
+EBUILD setuptools-60.3.0.ebuild 2984 BLAKE2B 9ab197c08df349c69257acdad4b2d57575a46dd98ba9902c9da91efce00979f37f2b4438d10fb351ec326728f800ee77dd1e12fea51f7861fc155ed5b631af47 SHA512 db92760d43946b30f82ddb53bd651f4fe09ca84318533e55d548de9649f20df6a04ecab4c237648e73f0ff9fe4ae7b179dfa1ada006089b36bcbdaf73e656c1c
+EBUILD setuptools-60.3.1.ebuild 2984 BLAKE2B 9ab197c08df349c69257acdad4b2d57575a46dd98ba9902c9da91efce00979f37f2b4438d10fb351ec326728f800ee77dd1e12fea51f7861fc155ed5b631af47 SHA512 db92760d43946b30f82ddb53bd651f4fe09ca84318533e55d548de9649f20df6a04ecab4c237648e73f0ff9fe4ae7b179dfa1ada006089b36bcbdaf73e656c1c
 MISC metadata.xml 469 BLAKE2B 4a26769b09a3785586b22db850b7fc5c4818f31c3ace9cc94476d35df05e50edf6721f3c95ec615c3b2efe071ef284a54ea2d53566316ba653f7830bb48f80bf SHA512 dd682c4ad2e59a97094ebdabe4d1063e2319ed05e1fe9d8c2fafe069badb3b4cf8bb6d9f50e09d2128e2a081c1c69827407ac8aed644ebf70eb4ca1bc9a57319
diff --git a/dev-python/setuptools/setuptools-60.3.0.ebuild b/dev-python/setuptools/setuptools-60.3.0.ebuild
new file mode 100644
index 000000000000..eae813972e97
--- /dev/null
+++ b/dev-python/setuptools/setuptools-60.3.0.ebuild
@@ -0,0 +1,89 @@
+# 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
+
+# Set to 'manual' to avoid triggering install QA check
+DISTUTILS_USE_SETUPTOOLS=manual
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1 multiprocessing
+
+CPY_PATCHSET="python-gentoo-patches-3.10.0_p1"
+DESCRIPTION="Collection of extensions to Distutils"
+HOMEPAGE="https://github.com/pypa/setuptools https://pypi.org/project/setuptools/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+	https://dev.gentoo.org/~floppym/python/${CPY_PATCHSET}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/jaraco-envs[${PYTHON_USEDEP}]
+			>=dev-python/jaraco-path-3.2.0[${PYTHON_USEDEP}]
+			dev-python/mock[${PYTHON_USEDEP}]
+			dev-python/pip[${PYTHON_USEDEP}]
+			dev-python/sphinx[${PYTHON_USEDEP}]
+			dev-python/pytest[${PYTHON_USEDEP}]
+			dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
+			dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
+			dev-python/pytest-xdist[${PYTHON_USEDEP}]
+			>=dev-python/virtualenv-20[${PYTHON_USEDEP}]
+			dev-python/wheel[${PYTHON_USEDEP}]
+		' python3_{8..10} pypy3)
+	)
+"
+PDEPEND="
+	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
+
+# Force in-source build because build system modifies sources.
+DISTUTILS_IN_SOURCE_BUILD=1
+
+DOCS=( {CHANGES,README}.rst )
+
+src_prepare() {
+	# apply distutils patches to the bundled distutils
+	pushd setuptools/_distutils >/dev/null || die
+	# TODO: distutils C++ patch?
+	eapply -p3 "${WORKDIR}/${CPY_PATCHSET}/0006-distutils-make-OO-enable-both-opt-1-and-opt-2-optimi.patch"
+	popd >/dev/null || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local -x SETUPTOOLS_USE_DISTUTILS=stdlib
+
+	# keep in sync with python_gen_cond_dep above!
+	has "${EPYTHON}" python3.{8..10} pypy3 || continue
+
+	distutils_install_for_testing
+	local EPYTEST_DESELECT=(
+		# network
+		setuptools/tests/test_distutils_adoption.py
+		'setuptools/tests/test_virtualenv.py::test_pip_upgrade_from_source[None]'
+		# unhappy with pytest-xdist?
+		setuptools/tests/test_easy_install.py::TestUserInstallTest::test_local_index
+		# TODO
+		setuptools/tests/test_easy_install.py::TestSetupRequires::test_setup_requires_with_allow_hosts
+		setuptools/tests/test_test.py::test_tests_are_run_once
+	)
+
+	# test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
+	# It tries to sandbox the test in a tempdir
+	HOME="${PWD}" epytest \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" setuptools
+}
+
+python_install() {
+	export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
+	distutils-r1_python_install
+}
diff --git a/dev-python/setuptools/setuptools-60.3.1.ebuild b/dev-python/setuptools/setuptools-60.3.1.ebuild
new file mode 100644
index 000000000000..eae813972e97
--- /dev/null
+++ b/dev-python/setuptools/setuptools-60.3.1.ebuild
@@ -0,0 +1,89 @@
+# 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
+
+# Set to 'manual' to avoid triggering install QA check
+DISTUTILS_USE_SETUPTOOLS=manual
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1 multiprocessing
+
+CPY_PATCHSET="python-gentoo-patches-3.10.0_p1"
+DESCRIPTION="Collection of extensions to Distutils"
+HOMEPAGE="https://github.com/pypa/setuptools https://pypi.org/project/setuptools/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+	https://dev.gentoo.org/~floppym/python/${CPY_PATCHSET}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/jaraco-envs[${PYTHON_USEDEP}]
+			>=dev-python/jaraco-path-3.2.0[${PYTHON_USEDEP}]
+			dev-python/mock[${PYTHON_USEDEP}]
+			dev-python/pip[${PYTHON_USEDEP}]
+			dev-python/sphinx[${PYTHON_USEDEP}]
+			dev-python/pytest[${PYTHON_USEDEP}]
+			dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
+			dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
+			dev-python/pytest-xdist[${PYTHON_USEDEP}]
+			>=dev-python/virtualenv-20[${PYTHON_USEDEP}]
+			dev-python/wheel[${PYTHON_USEDEP}]
+		' python3_{8..10} pypy3)
+	)
+"
+PDEPEND="
+	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
+
+# Force in-source build because build system modifies sources.
+DISTUTILS_IN_SOURCE_BUILD=1
+
+DOCS=( {CHANGES,README}.rst )
+
+src_prepare() {
+	# apply distutils patches to the bundled distutils
+	pushd setuptools/_distutils >/dev/null || die
+	# TODO: distutils C++ patch?
+	eapply -p3 "${WORKDIR}/${CPY_PATCHSET}/0006-distutils-make-OO-enable-both-opt-1-and-opt-2-optimi.patch"
+	popd >/dev/null || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local -x SETUPTOOLS_USE_DISTUTILS=stdlib
+
+	# keep in sync with python_gen_cond_dep above!
+	has "${EPYTHON}" python3.{8..10} pypy3 || continue
+
+	distutils_install_for_testing
+	local EPYTEST_DESELECT=(
+		# network
+		setuptools/tests/test_distutils_adoption.py
+		'setuptools/tests/test_virtualenv.py::test_pip_upgrade_from_source[None]'
+		# unhappy with pytest-xdist?
+		setuptools/tests/test_easy_install.py::TestUserInstallTest::test_local_index
+		# TODO
+		setuptools/tests/test_easy_install.py::TestSetupRequires::test_setup_requires_with_allow_hosts
+		setuptools/tests/test_test.py::test_tests_are_run_once
+	)
+
+	# test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
+	# It tries to sandbox the test in a tempdir
+	HOME="${PWD}" epytest \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" setuptools
+}
+
+python_install() {
+	export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
+	distutils-r1_python_install
+}
diff --git a/dev-python/smmap/Manifest b/dev-python/smmap/Manifest
index aa09d0e69aff..3c436af94d03 100644
--- a/dev-python/smmap/Manifest
+++ b/dev-python/smmap/Manifest
@@ -1,3 +1,3 @@
 DIST smmap-5.0.0.tar.gz 22437 BLAKE2B 2ff55ff412b10fe6c431df5f1589deb9f6f1c3277ee1ac651513e302d31b4f7ff986bfc548c5fefd66775f0eb7aef11dd8f2821f0e50a2e76d9bfcfaa9c047bd SHA512 03ae478bc83d02416f57bb3f6afc9c80bcb2d4249f3169390ac139b88be94258463dee7744fdf0fd54a7cfe109795a110c43f2b81ffd8546601de274667d353d
-EBUILD smmap-5.0.0.ebuild 541 BLAKE2B b0cec135f180c2f7dd49f59ac7b1a3aeb3a5f57509afed08f6ec35016830a0107ff188c8ebfe6631d442d89f61837a37c7a67317f67757087443301da3591ce9 SHA512 fb211d8fb9df1729ef4813e8c1f6070a19b3f8c08248893b223ce36485bdac545afabbba2c0c8d9e85a4d31eb871dff45c8eba5051262ecbc1fa0d11afb53091
+EBUILD smmap-5.0.0.ebuild 538 BLAKE2B 4aeb4db363ccab5383a25f87a4b456153b256be093435796b42dce1df25237ae771ebd0dd5fddddaa6236e9c9926378f6551535db6d78913633fc01729cc4230 SHA512 f73f09614c1fdd8ca7793cad5f0dbc4d113b64724323f696bc87ad96f42af2de826e279d52b384b68a52f967238350af70ee7ff1eda71b41ba22d3a31be0201f
 MISC metadata.xml 412 BLAKE2B d2178c6214bed671ee1ed50e3d2f098f8091af04f475867685a618df09f91d4340a28557d050ddc0849eea20e16662dccf62d015d565e1ed560e7c3144fbe0cb SHA512 57cfbc2aff045b2b9da66046c29d33523f0ba708861d98cf7c87e3363673dfa9b3d26bbddf794664faaf12c6efb38eb937299158199ab0fc989841cf5e4707fc
diff --git a/dev-python/smmap/smmap-5.0.0.ebuild b/dev-python/smmap/smmap-5.0.0.ebuild
index e0ed7318d574..e6b08bef95e2 100644
--- a/dev-python/smmap/smmap-5.0.0.ebuild
+++ b/dev-python/smmap/smmap-5.0.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
-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"
 SLOT="0"
 
 distutils_enable_tests unittest
diff --git a/dev-python/sphinx-autodoc-typehints/Manifest b/dev-python/sphinx-autodoc-typehints/Manifest
index 6876ab6ad479..f5447afdd976 100644
--- a/dev-python/sphinx-autodoc-typehints/Manifest
+++ b/dev-python/sphinx-autodoc-typehints/Manifest
@@ -1,5 +1,11 @@
 DIST sphinx-autodoc-typehints-1.12.0.tar.gz 19494 BLAKE2B beacc4f8ab453612dfd5264f1c65fd6bdd957269a28ee5b71b762d0baf5a3d4be58398b32d4263f996648281c1139f47a7564e8fc6444a94095f6a970b4cc27a SHA512 92fa340495a48111fa3d600d8c46d83214505ac2a5c71cb1303e846ac439f1e0ff14f8ce8dfd5ffdb6a62a9fa15dde8a5227f946840d9377ad5f7fde25894b75
 DIST sphinx-autodoc-typehints-1.13.0.gh.tar.gz 19898 BLAKE2B a927802a9daec5a2755c06a974aaea30fa92dfd16712d705c9ecb1c9a7b15d5285ade1d8e83d20e9220823500e0257e278b7e48942d9ee6cafdbc36793e9698f SHA512 cc2f91da6b76eb4ccd7579ce27c4d8f2117707b253bd2246711a5179faecc61c4873b3a5e8c1346e03d1db4c59ae76bea0160f34c66f1a0c2dbba1ac2a8086a1
+DIST sphinx-autodoc-typehints-1.13.1.gh.tar.gz 19923 BLAKE2B d0f72b814c83dd8987b80bdbaffbab5c3a7c671d9e56e9bb62d3cf44dec1df7b5fb9c591928b89680427069ce8d5953f4dea52de9eb4a4add07a332be96c730a SHA512 50e2958aafaa661cb209da04bb456dadddc4782dd2168c3f6524fba26d906479c66e5b22b3f49fff0c4022acb4b5b99ff73b250cb3e4d5dd9f083c4a5ab12531
+DIST sphinx-autodoc-typehints-1.14.0.gh.tar.gz 21541 BLAKE2B 77b0e80e5518d64be9dde3d3d2af3d9e0e325daa6683ce8aabe6ac88373ee76e11273b98cf3a18c1391a451354b9cec164c8c14e81354092181b959223500669 SHA512 eba927531b074edd1bf4ce0f3e5af53b07d1be3f013b5f39babc81101b32a942040f7b72380f9f485a99bdb8bfec69f7f81d50b0ceaf73b2859f292e47416d59
+DIST sphinx-autodoc-typehints-1.14.1.gh.tar.gz 22095 BLAKE2B 43fff7ad0ce83d4a7b50da7b3d0f9936754cb1897defe5d91bfef44dfae4df7bb6a0472fe5012bd2526a642149710e96b407fee3096dfb1474187273133079be SHA512 a720195d8792f3b6f5b8b5ce84b709872e7034c38640c15ab83b1676b5f0c26c650b0e74c34dbf9652e32f8b7f66edb94dcf4447ff2e0a1b196b721583294f49
 EBUILD sphinx-autodoc-typehints-1.12.0.ebuild 1095 BLAKE2B db30b26cc511a28979f07d8509209c124c37b5cb3625dd5bee615b4799bb8574c775a6cf4d19193845be408506f1179ccd3741827066199caf9a55bdfb0edf23 SHA512 b6a223d1c0ad0154485613c17044fb3d482aee2a65c28de8f44dce5aa079bc61685b1feef744bc79f035b2b797afc0e62b85357d6f1aa0fb6383169e7de1d419
 EBUILD sphinx-autodoc-typehints-1.13.0.ebuild 957 BLAKE2B 766c4ace65c37b39de066f20ce2030ad4d3edfa463ea7ce7811ffd3bfb651c52f80d19b08924d5089cbc4ed358d9a93f1338277baec17b4df9d23a361587dce3 SHA512 4bd81844cedcdb40354f87143264a805906f30fc281ff1296a46f86448cd5dc4862311aab78ce3eca5619ec767eaec6460145a3294effcf587de4a2dd267cfa0
+EBUILD sphinx-autodoc-typehints-1.13.1.ebuild 957 BLAKE2B 766c4ace65c37b39de066f20ce2030ad4d3edfa463ea7ce7811ffd3bfb651c52f80d19b08924d5089cbc4ed358d9a93f1338277baec17b4df9d23a361587dce3 SHA512 4bd81844cedcdb40354f87143264a805906f30fc281ff1296a46f86448cd5dc4862311aab78ce3eca5619ec767eaec6460145a3294effcf587de4a2dd267cfa0
+EBUILD sphinx-autodoc-typehints-1.14.0.ebuild 957 BLAKE2B 766c4ace65c37b39de066f20ce2030ad4d3edfa463ea7ce7811ffd3bfb651c52f80d19b08924d5089cbc4ed358d9a93f1338277baec17b4df9d23a361587dce3 SHA512 4bd81844cedcdb40354f87143264a805906f30fc281ff1296a46f86448cd5dc4862311aab78ce3eca5619ec767eaec6460145a3294effcf587de4a2dd267cfa0
+EBUILD sphinx-autodoc-typehints-1.14.1.ebuild 957 BLAKE2B 766c4ace65c37b39de066f20ce2030ad4d3edfa463ea7ce7811ffd3bfb651c52f80d19b08924d5089cbc4ed358d9a93f1338277baec17b4df9d23a361587dce3 SHA512 4bd81844cedcdb40354f87143264a805906f30fc281ff1296a46f86448cd5dc4862311aab78ce3eca5619ec767eaec6460145a3294effcf587de4a2dd267cfa0
 MISC metadata.xml 700 BLAKE2B 6e748d584e7640fa73a7f481ba91d37e983e97b332416acae73a87043693e5174b0f98c667e0a41abb7684a29b1136ccf681080b84a7bb8a7db73cbb14b85b69 SHA512 a149590e27acdc56ec0de8d57b5f378134480d24df0f0406a641b27b6cdff14a05dddb99a8e58781c23cc5112b1468fe06e9df28e8532a23b33ca817bd05c137
diff --git a/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.13.1.ebuild b/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.13.1.ebuild
new file mode 100644
index 000000000000..2791bdf02bb4
--- /dev/null
+++ b/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.13.1.ebuild
@@ -0,0 +1,39 @@
+# 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="Type hints support for the Sphinx autodoc extension "
+HOMEPAGE="
+	https://github.com/tox-dev/sphinx-autodoc-typehints/
+	https://pypi.org/project/sphinx-autodoc-typehints/
+"
+SRC_URI="
+	https://github.com/tox-dev/sphinx-autodoc-typehints/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+SLOT="0"
+
+RDEPEND=">=dev-python/sphinx-4[${PYTHON_USEDEP}]"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/sphobjinv[${PYTHON_USEDEP}]
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# this package is addicted to Internet
+	tests/test_sphinx_autodoc_typehints.py::test_format_annotation
+)
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.14.0.ebuild b/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.14.0.ebuild
new file mode 100644
index 000000000000..2791bdf02bb4
--- /dev/null
+++ b/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.14.0.ebuild
@@ -0,0 +1,39 @@
+# 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="Type hints support for the Sphinx autodoc extension "
+HOMEPAGE="
+	https://github.com/tox-dev/sphinx-autodoc-typehints/
+	https://pypi.org/project/sphinx-autodoc-typehints/
+"
+SRC_URI="
+	https://github.com/tox-dev/sphinx-autodoc-typehints/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+SLOT="0"
+
+RDEPEND=">=dev-python/sphinx-4[${PYTHON_USEDEP}]"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/sphobjinv[${PYTHON_USEDEP}]
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# this package is addicted to Internet
+	tests/test_sphinx_autodoc_typehints.py::test_format_annotation
+)
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.14.1.ebuild b/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.14.1.ebuild
new file mode 100644
index 000000000000..2791bdf02bb4
--- /dev/null
+++ b/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.14.1.ebuild
@@ -0,0 +1,39 @@
+# 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="Type hints support for the Sphinx autodoc extension "
+HOMEPAGE="
+	https://github.com/tox-dev/sphinx-autodoc-typehints/
+	https://pypi.org/project/sphinx-autodoc-typehints/
+"
+SRC_URI="
+	https://github.com/tox-dev/sphinx-autodoc-typehints/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+SLOT="0"
+
+RDEPEND=">=dev-python/sphinx-4[${PYTHON_USEDEP}]"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/sphobjinv[${PYTHON_USEDEP}]
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# this package is addicted to Internet
+	tests/test_sphinx_autodoc_typehints.py::test_format_annotation
+)
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/sphinxcontrib-spelling/Manifest b/dev-python/sphinxcontrib-spelling/Manifest
index 5f5102ec3ae4..62bfee3793bb 100644
--- a/dev-python/sphinxcontrib-spelling/Manifest
+++ b/dev-python/sphinxcontrib-spelling/Manifest
@@ -1,9 +1,7 @@
-DIST sphinxcontrib-spelling-7.2.1.tar.gz 49584 BLAKE2B 7211acfe344b157c0d44f356aef4c31fabcb1b30256cec1693fa67d2652d80c8f3657441c193f82ef26e0e7acd7d141732bef0704462a292355d70a18ab3c2be SHA512 e9b9709b627545e1191d64753c97c0cf65e100d5379e7cc1da46faf9c5d5ea0eeb6c7aafe99331f9518488fb0801c245e0c1fa9853360bb6cf373515a4fed2ed
 DIST sphinxcontrib-spelling-7.3.0.tar.gz 49853 BLAKE2B 3bf7c6433a5de6b109891f1546f109ce7dc5870c0932f49a2dfbc1356c365ba48f885af21e0873284112d8b7b67dbb24730373a16e6786ba7e15f2bc23dc8360 SHA512 25b1902547e4ed172ec437aca0868f458c60aab8dacbeeec7ec1c57a93716672986b815aadb9c129fc6b068b5e4d7e96f6200160c0b688e67314abf290e4ff17
 DIST sphinxcontrib-spelling-7.3.1.tar.gz 51104 BLAKE2B 8d757b492ce5bcb103bc604923da928f0440d4d0b882743d14b60fef21cfb423ea93a1e79f309b7cf27e8385ac94c01b24163a17407609ee20b9ec82dff63f62 SHA512 53f2532ff31a82c1cf568400a6066f319da3331c960446478bcd37e9293f4d080061b9c4914ac308e89878f432b6573ff782c5faba0f557384da55f202e68479
 DIST sphinxcontrib-spelling-7.3.2.tar.gz 51813 BLAKE2B 7c96f3b102fa33ea4d9e35100930a157200a1c01c51d8ec5145c45c5a24e3b5de35f6c4669177363c6098cb96275e10c39ff660c36d209cb6fa658e50cb8e169 SHA512 043a50f694366de4a3aedc24ca2ea7d89c85087097264f4e4fc860f68a3df5a67f19ec7172e4a67074377846d013d24edecd751885136c7263bc30b034c0f0e9
-EBUILD sphinxcontrib-spelling-7.2.1.ebuild 1091 BLAKE2B 23635ac63b9beb80c4f7203856d2175f478421f5c2c9f1e906a7403063571f767d7291491054db6a434d7c31429925d697c67583bc61f64a99506b194d45e69a SHA512 2c1d241cd97a2e665a855e13a01c2ddd5542b9ab21da2525bccb2ed8a9e040effa87acf123946bd0b9b8c668119cfd59faaa42822f5d83e80c6b749feb60b43d
-EBUILD sphinxcontrib-spelling-7.3.0.ebuild 1097 BLAKE2B a01212e0e871fdc5b58a03813ac93fb33e5d1c4137061bc94ed0f6b5a1edf27fb330ca69792af96549f24716eeb11b94d75cc7b781bfb774dc665f4b33e49ae9 SHA512 e37a45f9ae5b8a0bc68a61b3ae714ae4df1ae2df4e0e3d210d6d2190ef9bac14c00f73f2f63cc5a745a72c7d9edce420f5a5022a588b49f678a417081106d513
+EBUILD sphinxcontrib-spelling-7.3.0.ebuild 1090 BLAKE2B 796a81c9aa8c8b3cea24ce8bba255171f0e65c6fb48a042aa80b37f4a578e5ea54e01e0bd2f2326b9f53e885090aca261c687f7a6678d9ffe64643e7b1774a95 SHA512 f1f20db72956ee86dbbe335b5df4a317f65f408fc0aecd2be4bf780949f365fae407cc03d27026129840aeb6457be8c9d3f434ee42e0d78078e3da0d76ca0818
 EBUILD sphinxcontrib-spelling-7.3.1.ebuild 1236 BLAKE2B bf7ac9ad246651bcdc4ec2648ea4bc546c053c577268664b4ef74944e757d2471ae1486913303e9df33a0304c866be9a8afc866c0c1fc48a5162a0037c8211ab SHA512 fa6337fc1e3d2652c6fa95b8be7d07cc2ba3b7424b6e28a5ce2c94a02cb08eb52db05a8663d3bd6eb866da956054e75f5af627e9770ebb0ed9290dc0dd141ccd
 EBUILD sphinxcontrib-spelling-7.3.2.ebuild 1122 BLAKE2B 94392162b4c2869efeb81eb56b3351302e486f680e4a704b4677d41b69403c69c16dd65e8416c2d554b40bed0e4a0459bd4a35858bf29ad02bd6181db520e69a SHA512 2c1b7b8bf9bc8b32ded02b3914852437592fbdd8bbfadd4c9417cea23dcb872572a9c55acb67725c2ba6315a8684e950d51f1a78282a00a950d079eacd2f8e92
 MISC metadata.xml 451 BLAKE2B fa659ac4949e98ca8c5a11a9b72ecba8a69ca94d95f8ab5f07c0d43d9684cd1cd21dbd63f42928a9920001904a6f75aa5663a3d924b02910c78b7894f6011722 SHA512 fead100dcd4c1d85e29260a60178e1b866ceb1f944c73fffcc051e2cfb1e96cc2e61bcf94379c0dcf84bed1349abaceb86ca9a89f2b1a8ddd384c14997d1a159
diff --git a/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-7.2.1.ebuild b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-7.2.1.ebuild
deleted file mode 100644
index e499df72fce5..000000000000
--- a/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-7.2.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Sphinx spelling extension"
-HOMEPAGE="https://github.com/sphinx-contrib/spelling"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	dev-python/pyenchant[${PYTHON_USEDEP}]
-	dev-python/sphinx[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/pbr[${PYTHON_USEDEP}]
-	test? (
-		app-dicts/myspell-en
-	)
-"
-
-# The doc can only be built from a git repository
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	tests/test_filter.py::test_contributors
-)
-
-# We don't want distutils_enable_tests to add the namespace
-# package to BDEPEND under "test?". Therefore we add it to RDEPEND
-# after running distutils_enable_tests.
-RDEPEND+="
-	dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]
-"
-
-python_install_all() {
-	distutils-r1_python_install_all
-	find "${ED}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-7.3.0.ebuild b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-7.3.0.ebuild
index 1bbda9a87600..b55591464ce7 100644
--- a/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-7.3.0.ebuild
+++ b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-7.3.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
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 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"
 
 RDEPEND="
 	dev-python/pyenchant[${PYTHON_USEDEP}]
diff --git a/dev-python/translate-toolkit/Manifest b/dev-python/translate-toolkit/Manifest
index 162215199667..8bb478d0afaa 100644
--- a/dev-python/translate-toolkit/Manifest
+++ b/dev-python/translate-toolkit/Manifest
@@ -1,4 +1,6 @@
 AUX translate-toolkit-3.3.0-no-install-docs.patch 652 BLAKE2B 202cfd408059115cfdb5933320b5a560eeee37e2c045cedcdd80cf808ab1e1a5569a964e9eab8114a2ab27e2c470285b254406c754b5289f7cff2f22afcebb6c SHA512 d98e2d7519ca630d41407d01f20543a84c3f408628832d4e79a5a52437d204f872aaef8eca80687565e6981dddb59480a313217eddf8a4084d8b6d71c3d2c0da
 DIST translate-3.5.1.gh.tar.gz 1147898 BLAKE2B f9fc96065727e0016e61fd581690dafc3021471de9ccc9012b223c24778669b984e0bf0ab5f83a910af0e543b0e4793afa110c5b2ced890a257f72512bcaf58d SHA512 2125e3ab019a6b721327d6979482562d5984df28b04aaa69d11e44b6a7396ee387f79d8242a20a84157f9b62457839b52599eb0fe13abac33c9a312a84d55d30
+DIST translate-3.5.2.gh.tar.gz 1147847 BLAKE2B 6ca8458975018c3645f3fcead99812b5f91c2a3e621060c1cf9599ecd2fdee8914ae1d70b70f8bc76f5d941f43e69e55555a35a5792d0c8c9d9e06458e670617 SHA512 e04c195d0f33aaf9c2368955c4c399be3c23702ce0fcb41705f727b65e129b652b5637a9b56ad2879f836548b77c266382ce41220a23aa9058828ee2f2ba1b3e
 EBUILD translate-toolkit-3.5.1.ebuild 2552 BLAKE2B 869dbfc79a91565e7a340d6e743f6cad1f1e46a0d5550fedc49cae0d87ae393347da7eab091f36375bed52ca2f326645c576f8fdf11a8219f991d6142fabd8f1 SHA512 824a78b456dfecf137d5b561b77710f2183dd2552eda82ea4777f9513905a014523df19d56e2c84517a7b1fe316969ba526ea17e4a45db6f95e59b07dd1003fb
+EBUILD translate-toolkit-3.5.2.ebuild 2557 BLAKE2B daf364d5d0ecd9be5c5023912159b449b61bbfc892063923ad00ebacc57f1edb68ce66052ba89a483bd7b5771e5408b7306c2b8dbdbf9c776878a71669ba8346 SHA512 ce8c0d106ecc240dff8e52a53bd8352e6910af0191fbeaea446bcd40963fbaaa5290ee7f03147dfea1498ff6ff6f88822ec629d3fddd9ea1e3f92f41c0157ddf
 MISC metadata.xml 746 BLAKE2B d11f99224b1dd6ccb5a64b2f3346f3963f7874197fc5cd13a9bc84036d7f6d78e62d4f92d80b41b3a71426978c605d599207ba7d20ee94ca195e6be3b60f41cb SHA512 07dfd2ab55c6eb0ab346e66a3f03dd82e193382c6bdec0d2b8826cde7e4e11bb5d6f3bc1a5885b08d9c2aa51f8afedc6ec6684f224951e6dd80bc500c783cbb3
diff --git a/dev-python/translate-toolkit/translate-toolkit-3.5.2.ebuild b/dev-python/translate-toolkit/translate-toolkit-3.5.2.ebuild
new file mode 100644
index 000000000000..768d499ebbb3
--- /dev/null
+++ b/dev-python/translate-toolkit/translate-toolkit-3.5.2.ebuild
@@ -0,0 +1,100 @@
+# 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/typed-ast/Manifest b/dev-python/typed-ast/Manifest
index b073bb7d0361..7868adb8ab03 100644
--- a/dev-python/typed-ast/Manifest
+++ b/dev-python/typed-ast/Manifest
@@ -1,5 +1,5 @@
 DIST typed_ast-1.4.3.tar.gz 210893 BLAKE2B 9e0bbaac73d97c13303c783d4e91b015570d9b9ad74361e1bcfe67259982459003ea6c24602ce004fe1447c4375090d5fa58006e18af28da256f6b25d9aa20b1 SHA512 7ac06e277c883afd1a7161601ffca0114aa63db257695a4bf4c64d819a7192fe52167edb57991aefc7accc6a9902b5faf2ba9e4032c4b9be31f1db7a091607c9
 DIST typed_ast-1.5.1.tar.gz 252316 BLAKE2B 4bb2987cc84277a595c8297563f257e495a4b298885f54b82ce177f5ce610809f462d0022a549e83c4c991e441720f36bd2451eef3487fc68ceda76b845a01d2 SHA512 9e1b1e5da242f29c52857a5a683be47d95b592c788a7c603fc38f637ee64f687253aa58994061681c703addd2405532dfdc0765dd1cadf16b339623901f61355
 EBUILD typed-ast-1.4.3.ebuild 587 BLAKE2B 03f1c0f0d4df770c80c34ebaa1cac6e35afa55d562c0d9c27547c57dd2813b6c2ba14d85818be4b915217e4fdcffd7e871b184800830d878dbb272caedbbc563 SHA512 99ca17b7525f72b80157fc50cb944c56e0b82f705676a0e6105630ad0f623aa834456a357326d64e5cc23ba7b3064b63d56c55a191c496a9d2e06702001b2103
-EBUILD typed-ast-1.5.1.ebuild 592 BLAKE2B d88aac9fdea6ba249e409df2d9111005ec3d819cfa344b51b1e62a1de06d6db4477c866fa5512dd7cd34a95a40fd3575d5b7b37283726f4e289cc2fdaee41c67 SHA512 03d5a317b2fba88b7e2e45cb0d47149332c2d6961e8f2220afb7eb657ddd2dab961011bb4bf89457776c2cd3c604c3700e8d4e24f63efb87ef5fa4a5ef6e45a7
+EBUILD typed-ast-1.5.1.ebuild 587 BLAKE2B 4556b9517b700617dee15a518cb379192320b806da7da36be14e0bef83c3ecc4e8493bc45d86a03b27df3f7c489241fdc34b7426d94cb0cc6520717c9c2884d0 SHA512 2b7e3fd47d4f070078e99e50d3ec4cf979d5e22635243d88d7f5f55d6b285e4595e5d03993a7b2b40f2cc09747896b710a501088b7b2fd905f3639c52eeeb506
 MISC metadata.xml 369 BLAKE2B b92a11c32ddd0afacac11717dacfa997976da54d30c6330873eaf36cf1f9a748ab089b5e5d586302abe57d1579054df38a036cbd8534779f7daa59ed92e7bdae SHA512 fc1961ab74c1a975ba3423568be93e6bff1358cb29e3e7209043d890e1d6a9d8659b21a6a5d5c04f42377e608d547c55d008d77811d37bf46c6ccb44d5b931c0
diff --git a/dev-python/typed-ast/typed-ast-1.5.1.ebuild b/dev-python/typed-ast/typed-ast-1.5.1.ebuild
index eea9b15aaaea..e95163583b3a 100644
--- a/dev-python/typed-ast/typed-ast-1.5.1.ebuild
+++ b/dev-python/typed-ast/typed-ast-1.5.1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${P/-/_}"
 
 LICENSE="Apache-2.0 MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~x64-macos"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/ubelt/Manifest b/dev-python/ubelt/Manifest
index c473bb95160c..89bb330a212a 100644
--- a/dev-python/ubelt/Manifest
+++ b/dev-python/ubelt/Manifest
@@ -1,5 +1,7 @@
 DIST ubelt-0.10.1.tar.gz 216033 BLAKE2B e481b2cf61788b50038ad69f0e2b637dfa0259d24ecca1a5587fe283d2270de205cb085112b9285cf57f664ce8a9d107f08b9b6735c8bea6fb97f6f48935dba9 SHA512 c15af249e6b94f69050703a4004307d91854e2ac7e25c5ac8d467b5b5f3363989f93bf2917eaf3c0f2485258b3530d7317f39449d5ac7ad5ed9b4615d916decb
 DIST ubelt-0.10.2.tar.gz 240069 BLAKE2B 34a24781264dd910e7a3afd87287f8ec9d1e4d1b4dd205f249fdc878861cd9c511121c61a5ca208b3f8ced785a0cec26c715b6a9ef3fee4a8f903e8557d3790f SHA512 8666a05f53d29d39ddd0fca213a9465948fd108bef9e95fc6160cb8331ae6876b9e7297d380cac37383c602d7ad4c248a4d7e03b4306dad5c6b26e0423720afb
+DIST ubelt-0.11.0.tar.gz 251931 BLAKE2B 628c62395b38da5fe70cf5c4eaef74f411cb431ca3837aadc0bfafd28d9ba15a75850d22b317d207e79d81c7e015a7adad28fb14804c25b3e9ef1a473d5af8c2 SHA512 ae95f719238e89ece2bd8ef525d7acc72058a770ff8c0be58e27d9fd0f50b1ae978d71589474133ce1065130562cae63282c4c97f69756ce1c64ce4330a5da1e
 EBUILD ubelt-0.10.1.ebuild 775 BLAKE2B 5e7006b75c8b72ca38c30dc33a724ff3c2fcb542082751d2ad2d3afe4fbf6c5b8bc8792789cfa5bf5cc1baab341e4473eafa74bcc5914b3da7d686525190943f SHA512 8bcbecaa55aa653608069d2274307338aa9765cdb5030598b9cd6553bcdabcba3cb09eba97c93ef54aae483e2b122f3d6c742ffe0a0b9b775b1a1847936e7bff
 EBUILD ubelt-0.10.2.ebuild 716 BLAKE2B ba7181bebb9772cca1d187331805221712160dc9be4157bf84204abc114b26355fb8150f41f584a3ee91af1f2fae933d1f31cf9b852fe48bf3c652f91287a2cc SHA512 57aaaef033c0b0b3c5cc707f3198bd214d02eda7372ac5794decbb24edbe6be8cea25a03d05b62f4ca6ba6fcbe36333feeb0ceaa9970bcf6b69d5382cd28e6a6
+EBUILD ubelt-0.11.0.ebuild 716 BLAKE2B d2ed8e7ac49d20c17634e968bf4de595029006fead40b612516c5ee1302ad75a5a1a2da2288669678b8ed50edd9f80281349c82489fbefc6c9dfdd112ea57597 SHA512 1c9903d7ce314b9727fb3ad0d42fd1d05b1b25a2d2948afc944eefa7398996984f17d7b549fce2f5d81e69a0a64908664629b83ed8d20d5b2701e9fe69db82f6
 MISC metadata.xml 322 BLAKE2B 99d2f0199fb7c359744ebc7cc3e285843c34c405c1a0e057ab9be81b8c662d01043f3ec0dd46903765b41bb8a69925b89fcbd91edfffb7f8872984ac4d59cd6b SHA512 ccc60ab6a64bf6cf92cc805f14df5ff46aa3af8024f32e764d6e98121ad6d96e506cc29e8ebde9696caa80d019a72e6f1f14803aba2eeb95dde5f9114bb34845
diff --git a/dev-python/ubelt/ubelt-0.11.0.ebuild b/dev-python/ubelt/ubelt-0.11.0.ebuild
new file mode 100644
index 000000000000..05531fa0f9eb
--- /dev/null
+++ b/dev-python/ubelt/ubelt-0.11.0.ebuild
@@ -0,0 +1,27 @@
+# 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 stdlib like feel, and extra batteries. Hashing, Caching, Timing, Progress"
+HOMEPAGE="https://github.com/Erotemic/ubelt"
+SRC_URI="https://github.com/Erotemic/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]
+	dev-python/ordered-set[${PYTHON_USEDEP}]"
+
+DEPEND="test? ( dev-python/xdoctest[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# relies on passwd home being equal to ${HOME}
+	ubelt/util_path.py::userhome:0
+)
diff --git a/dev-python/urllib3/Manifest b/dev-python/urllib3/Manifest
index 611824236c2b..06b35e9c491b 100644
--- a/dev-python/urllib3/Manifest
+++ b/dev-python/urllib3/Manifest
@@ -1,3 +1,5 @@
 DIST urllib3-1.26.7.tar.gz 291350 BLAKE2B 5a95ea4df2e5a66ac7f3059b5453e122ae0e40531a23cb743e5a9574778a370d0cee3cb63fe6b29483b27c4a6ec498266ec5a0434db882ce0a79fb8d8400e08d SHA512 6f5a5e6dd5ff99950fcc051495e0a698153b57e20b6c83d869b54c7fece9616909bcf2fe99efc40815f8722996ad93e430bf765ce5c629b912690c286014b86f
+DIST urllib3-1.26.8.tar.gz 294280 BLAKE2B 401801b16c0c5152cabdfe3317cc53bc79a5aec103cc53a22189dcefcf0d022a05f6afac0bd99274a2fe48b6e86da8eb544b78e4c3a1534f000a9756ff15ccd9 SHA512 bcb56faa5dbe6019f70b63c076e118ec5f89e2d0c25f0e415d9db079532c98ced7e636cec5bf26210d4b0a08bb7b5b7a33a5c8648ccdaad129eea3a212a53bc5
 EBUILD urllib3-1.26.7.ebuild 1816 BLAKE2B 13b91ca18d4fc18d8772f91d9150aa43a8bb176458fded726511c516367e6767e22db572f439ea1a2c78dd6d8c7b0962f7680097243b70f382adfa619a93ec75 SHA512 49dc88eea220b6226b53eb411e8645e7bf38ec0d16f94e553f8895550995ad021ec1e258f911d5f960fc707889ea96efa345131ee0d2d3aa4d81d9ec1aef55f4
+EBUILD urllib3-1.26.8.ebuild 1824 BLAKE2B dbaacaebb7e726916f4799170e30b71852226758c93bbddedd02ab1f6c3708de55889ba613c222437c52515178e19bc04b16cceac25632e087ed51d02636382e SHA512 0bb5ba86435fa4f47bf32a9cb47230f7343283723f785ae9a57add22a4caa9719e823826861445df2b7620537eec8a98a3b4afbac426bf7da0fdf644c1633dd1
 MISC metadata.xml 531 BLAKE2B 3ddfea4b8817c827437a79abae8cf4e9cda95addb1c6505ef13018587720bba0cf0788041c0b4cc8b25f319e7cb1c94117ae25b3cbb567f24373e8e89bedaa7b SHA512 7e7191f0338c4c47f01bdceb3d2c6ed94de2241e77fb3be6cbf3ecf8a0682730392a9ee5adf24304d9a322acc06bd84f4f90f1dddcb258cb2e9ba0de9952b693
diff --git a/dev-python/urllib3/urllib3-1.26.8.ebuild b/dev-python/urllib3/urllib3-1.26.8.ebuild
new file mode 100644
index 000000000000..01b718ef8c5b
--- /dev/null
+++ b/dev-python/urllib3/urllib3-1.26.8.ebuild
@@ -0,0 +1,60 @@
+# 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
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_REQ_USE="ssl(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="HTTP library with thread-safe connection pooling, file post, and more"
+HOMEPAGE="https://github.com/urllib3/urllib3"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="brotli test"
+RESTRICT="!test? ( test )"
+
+# dev-python/{pyopenssl,cryptography,idna,certifi} are optional runtime
+# dependencies. Do not add them to RDEPEND. They should be unnecessary with
+# modern versions of python (>= 3.2).
+RDEPEND="
+	>=dev-python/PySocks-1.5.8[${PYTHON_USEDEP}]
+	<dev-python/PySocks-2.0[${PYTHON_USEDEP}]
+	brotli? ( dev-python/brotlicffi[${PYTHON_USEDEP}] )
+"
+BDEPEND="
+	test? (
+		$(python_gen_cond_dep "
+			${RDEPEND}
+			dev-python/brotlicffi[\${PYTHON_USEDEP}]
+			dev-python/mock[\${PYTHON_USEDEP}]
+			dev-python/pytest[\${PYTHON_USEDEP}]
+			dev-python/pytest-freezegun[\${PYTHON_USEDEP}]
+			>=dev-python/trustme-0.5.3[\${PYTHON_USEDEP}]
+			>=www-servers/tornado-4.2.1[\${PYTHON_USEDEP}]
+		" python3_{8..10})
+	)
+"
+
+python_test() {
+	local -x CI=1
+	# FIXME: get tornado ported
+	# please keep in sync with BDEPEND!
+	if ! has "${EPYTHON}" python3.{8..10}; then
+		einfo "Skipping tests on ${EPYTHON}"
+		return
+	fi
+
+	local EPYTEST_DESELECT=(
+		# TODO?
+		test/contrib/test_pyopenssl.py::TestHTTPS_TLSv1_3::test_verified
+		test/with_dummyserver/test_socketlevel.py::TestSocketClosing::test_timeout_errors_cause_retries
+	)
+
+	epytest
+}
diff --git a/dev-python/vecrec/Manifest b/dev-python/vecrec/Manifest
index 3bdf57964423..864b75302c28 100644
--- a/dev-python/vecrec/Manifest
+++ b/dev-python/vecrec/Manifest
@@ -1,3 +1,5 @@
 DIST vecrec-0.3.0.tar.gz 118946 BLAKE2B 04ecb6be616b0d65e93feb3e238f068e68d95a2d90e9ab7c0b0aaf3d257924cf14f46cf403661b26b74691ed41afad9f16c52b426da23e0209d8849fe01bf42b SHA512 9208bacac7e32380fce3d0e3fca8b3353776d4154ffe2eb2360020f76eace5ced38ad30253cad377716c9a0979ee0d038debd0e6187bc72caeb17505225597b5
+DIST vecrec-0.3.1.tar.gz 18893 BLAKE2B 1b04e2ccda949d45aea083c03f963efbe3f52cf23e4c73b66b4bbe2084ad0d2690b13db9ccbd852f60e01384e85131aa36768bf26d7722f85db7856f0238fd5e SHA512 8fb8257036204efde07e739c698586e4cff81b391d21db79413002b35cffb9e02f5348acbbb374208be1c25eb96d1d8877b6a8b20be501a7541b46c43eb1dbfc
 EBUILD vecrec-0.3.0.ebuild 454 BLAKE2B be9d2a577e5d1e73a8d1b97ea9d685fe95a7e72bf9929c41cc381d0789a883177d0012e859b44e46493f0c719d641d2208efe8fbf3eb6739f8ea6130e87e3452 SHA512 6e48eb64e9057795bd916aeca01ea5b7285970cbcbab318e5d9ddc43567711cfe9030b1b0e43fbed9af350a9b466391ad5d8d125d176f4fbe34635ca1ed1ae86
+EBUILD vecrec-0.3.1.ebuild 654 BLAKE2B 0e0477ad86c8484dcb4c0d0b4f5e69185867002bc3d2957ce23cf0534c8f847bba4234bfcee44efb2a3847f0d8f240947a792d6c30c3d30e068e5e48543eb9a7 SHA512 81cedccf4deed1dfdf772195d9499aeb4763e1f8119bfcac8412a219524d0b18398eb78c18a8f72f470a4242b383ef7f530a550b007f4b11bcfc5e61fda5f81d
 MISC metadata.xml 767 BLAKE2B aec0262db4d0adaf1c3a829b973860ca035f74d2e8cb1ab86af5cba9700ece310c532c58c83b4aabcec940bd42da774f95179f6bcae6749c44717a4550e6e4d5 SHA512 69e1cc79fc85bde614dd7556addf550cf31384371dcb740f3925f81d0475a3c920679b9c3d62d0e51b115a78a26cf1d324c2cc86ccc4af2d66b341409fca37aa
diff --git a/dev-python/vecrec/vecrec-0.3.1.ebuild b/dev-python/vecrec/vecrec-0.3.1.ebuild
new file mode 100644
index 000000000000..c784a58d1ffe
--- /dev/null
+++ b/dev-python/vecrec/vecrec-0.3.1.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="2D vector and rectangle classes"
+HOMEPAGE="https://github.com/kxgames/vecrec
+	https://pypi.org/project/vecrec/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~amd64"
+SLOT="0"
+
+RDEPEND="dev-python/autoprop[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -e '/addopts/d' -i tests/pytest.ini || die
+	sed -e 's/distutils.core/setuptools/' -i setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	epytest tests
+}
diff --git a/dev-python/wcag-contrast-ratio/Manifest b/dev-python/wcag-contrast-ratio/Manifest
index 39c084b9a5ea..6625def0c6dd 100644
--- a/dev-python/wcag-contrast-ratio/Manifest
+++ b/dev-python/wcag-contrast-ratio/Manifest
@@ -1,3 +1,3 @@
 DIST wcag-contrast-ratio-0.9.gh.tar.gz 3347 BLAKE2B c32765e7011faf9128bd4c53673c4663b972e225e0f7249dd1b9f07b4184ae9ca93116f31de6a0538f04612a72ee1e805b37e1070ae62347508f29df2bbf9ec4 SHA512 70ff827b092cec884ba7e969deb8b5de944844b8d5536669f2c607061fbf569c217cec93268215deb9fdebc041efd992ed0cc89e0da013f9a1be8eeeb420cec5
-EBUILD wcag-contrast-ratio-0.9.ebuild 715 BLAKE2B 586c0393b2f485bfcfc4d9e30042a5698a5b87dd44a7507d5a81744e86619dcd7c4fc73fb7fda9e49fffb280f7b6ae0730a1a9a76beacb313baf5e4ab75ae674 SHA512 659865d13abf08c67ec6cdca57a616961989d1e9d525e30c01d7e69acc6ccefb066e9ea84dd0365518620037dcc9ca0e2ce334bc351e53533a066b6c7051bc57
+EBUILD wcag-contrast-ratio-0.9.ebuild 733 BLAKE2B 4d8ad4d971ee744bf7ee779eae91ee3303aa7ebe765547941002833a2d6ff483ff22f906963182fcd6df4b8ad591dae18ee0ab9625fb22d029a68e79987738b8 SHA512 13c87b751ee5d5d96b3474b2b6e6df6ef7accd178cdc0a4cab8d21213226088d10dc8c17c76bbb9705a9be3ee3e011b4cf107738828ff70f04d082adad89c8d5
 MISC metadata.xml 416 BLAKE2B 5363613fc828bc1398b25b81947464f6c71a2d972914b14744da29c723493843fd0d949b0070c5af3d67428694b7c7a2b0a40c8884a62e56d9caf3fa8882ed42 SHA512 c416ea13e371d17d90bb2c1362119431eb0241dc89d0be5c003e92604c66125b7a66e5648a179d1c166b2a4e3a990be86e502da621ebca8e7ba560f1b0558f58
diff --git a/dev-python/wcag-contrast-ratio/wcag-contrast-ratio-0.9.ebuild b/dev-python/wcag-contrast-ratio/wcag-contrast-ratio-0.9.ebuild
index 830d26ee8aaf..3de21e6b6a7c 100644
--- a/dev-python/wcag-contrast-ratio/wcag-contrast-ratio-0.9.ebuild
+++ b/dev-python/wcag-contrast-ratio/wcag-contrast-ratio-0.9.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc"
 
 BDEPEND="
 	test? (
author	V3n3RiX <venerix@koprulu.sector>	2022-01-07 22:48:01 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2022-01-07 22:48:01 +0000
commit	c3bc61051d7f12b4c682efa7a5460bbc8815649e (patch)
tree	b6d19e96ba3c397fb8278eeb9b68170db92630ba /dev-python
parent	3517852e3b8a68d1e997770fc0650c5053bafc6c (diff)