Adding metadata

128 files changed, 1178 insertions, 1568 deletions

diff --git a/dev-python/Babel/Babel-2.10.1.ebuild b/dev-python/Babel/Babel-2.10.1.ebuild
index 8062a3fc5920..f4cd6bd3a6c0 100644
--- a/dev-python/Babel/Babel-2.10.1.ebuild
+++ b/dev-python/Babel/Babel-2.10.1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	dev-python/pytz[${PYTHON_USEDEP}]
diff --git a/dev-python/Babel/Babel-2.9.1.ebuild b/dev-python/Babel/Babel-2.9.1.ebuild
deleted file mode 100644
index d8049517f9b1..000000000000
--- a/dev-python/Babel/Babel-2.9.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Collection of tools for internationalizing Python applications"
-HOMEPAGE="https://babel.pocoo.org/ https://pypi.org/project/Babel/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-RDEPEND="dev-python/pytz[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/backports-zoneinfo[${PYTHON_USEDEP}]
-	' python3_{7..8} pypy3)"
-BDEPEND="test? ( dev-python/freezegun[${PYTHON_USEDEP}] )"
-
-distutils_enable_sphinx docs
-distutils_enable_tests pytest
-
-python_test() {
-	local -x TZ=UTC
-	local deselect=()
-	[[ ${EPYTHON} == pypy3 ]] && deselect+=(
-		tests/messages/test_extract.py::ExtractPythonTestCase::test_extract_strip_comment_tags
-	)
-	epytest ${deselect[@]/#/--deselect }
-}
diff --git a/dev-python/Babel/Manifest b/dev-python/Babel/Manifest
index ab7204da213c..052c66a72536 100644
--- a/dev-python/Babel/Manifest
+++ b/dev-python/Babel/Manifest
@@ -1,2 +1 @@
 DIST Babel-2.10.1.tar.gz 9342917 BLAKE2B fe9f4cff416a57b4964481afcf9cf154b3d9e2c0c88b2b97786cbede1cb068f9637a2168a819dd94770ce3a5836ee8096b2fe7131d2dff16eb0a31a924b9fae1 SHA512 d6f8876bc47d2ad88277f5a9512abb177518b79d4f477cdba11d1cd1af8fb92bfd033c2c05c7a6c32dbd087a28189288f8ac80f9b654027b3e026a06c4ade127
-DIST Babel-2.9.1.tar.gz 8683505 BLAKE2B e4c6fe7284f03cd9e3e712156d87a520a437316955679f765aa68ca941bf668c544c96598486f3dad1bbb1f1d9a0719ccd527f23a2b1fb0274e453bdba557bd7 SHA512 89a2ce18301b522907bb66ec5453cbcd4c6b2d494d6928c9c62dc07bd8b6983982db571a85e251a1ea413b6f76fbd515f65c67c9bccf5441c62d351a57f2f4d0
diff --git a/dev-python/apipkg/Manifest b/dev-python/apipkg/Manifest
index 15384b5390f1..02fa73b91a88 100644
--- a/dev-python/apipkg/Manifest
+++ b/dev-python/apipkg/Manifest
@@ -1,4 +1,2 @@
-DIST apipkg-2.1.0.gh.tar.gz 13489 BLAKE2B 2ad670c6971b3fd6f56e35d3dceed25cd3950efbd9fb562595ea4313d50e9711a6099458eba3720dd5405335bef0ad1932bb2ad1e6db65c93df9f3b57b5caf56 SHA512 af74217f283be6dd1a674e12a2fc95739f90d9783caa095eccdea814a1da70b3cc1f756c2e150e5e5e75d1207857071aff97aa10bb2eadc83e04c42954c47df5
 DIST apipkg-2.1.1.gh.tar.gz 13541 BLAKE2B bba34b21d967512e2b08a1726dd97dfb432c3f4083661fd9f237948e5c962ebacf7ddf73ef7a34b24ee0a8481d203496504146b5b7627b195f1654fad338061e SHA512 be403398361bd88e04a676346e92df51fb410340858ca446a6a50af565183f15a88efd3d3bdcaa4d042680db35633c780466f4e8b4c9523cd0956fd04f84947a
-DIST apipkg-3.0.0.gh.tar.gz 13798 BLAKE2B 1061004d8efcd0b76c20eb72a2e36f784c4ba586bc32c99a904ceb9cf545460123fc763f40cb664cf48769e9e777dbf276d523a0ebf44a354f05f9214b97054b SHA512 389ab58df6ecf28c37c485affb8fa94e76e91205d1249913ab1ce2b602739b1635904827a9ab6a215c4e80aecf6a1e7a0e8dc1fe0c32cc65a09dcca23b69b0a7
 DIST apipkg-3.0.1.gh.tar.gz 14026 BLAKE2B da16bea557cf870c96d44a383232344d10cfbb682c483468e20755dd378c64e64d72b379901eb59ed0df590b5c3b577c882beb882377f7d759b181cf1b672b50 SHA512 89251f02a49b5191879bcf6e35c6a8755d6b29f1ca1c6061eab004385b11433ec86e2968ab23994c6a74515d6a673e445b3bcf8cbdd21b2ec644fcef0d19b419
diff --git a/dev-python/apipkg/apipkg-2.1.0.ebuild b/dev-python/apipkg/apipkg-2.1.0.ebuild
deleted file mode 100644
index a9c7aa16c4b6..000000000000
--- a/dev-python/apipkg/apipkg-2.1.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-inherit distutils-r1
-
-MY_P=${P/_/}
-DESCRIPTION="Namespace control and lazy-import mechanism"
-HOMEPAGE="https://pypi.org/project/apipkg/"
-SRC_URI="
-	https://github.com/pytest-dev/apipkg/archive/v${PV/_/}.tar.gz
-		-> ${MY_P}.gh.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/apipkg/apipkg-2.1.1.ebuild b/dev-python/apipkg/apipkg-2.1.1.ebuild
index 4e3dda3d9987..d829e95e3f5c 100644
--- a/dev-python/apipkg/apipkg-2.1.1.ebuild
+++ b/dev-python/apipkg/apipkg-2.1.1.ebuild
@@ -21,7 +21,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="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
diff --git a/dev-python/apipkg/apipkg-3.0.0.ebuild b/dev-python/apipkg/apipkg-3.0.0.ebuild
deleted file mode 100644
index c4c17081f7dd..000000000000
--- a/dev-python/apipkg/apipkg-3.0.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-MY_P=${P/_/}
-DESCRIPTION="Namespace control and lazy-import mechanism"
-HOMEPAGE="
-	https://github.com/pytest-dev/apipkg/
-	https://pypi.org/project/apipkg/
-"
-SRC_URI="
-	https://github.com/pytest-dev/apipkg/archive/v${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"
-
-BDEPEND="
-	dev-python/hatch-vcs[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/argcomplete/argcomplete-2.0.0-r1.ebuild b/dev-python/argcomplete/argcomplete-2.0.0-r1.ebuild
index 5d93d6afef16..d38b12ca93bb 100644
--- a/dev-python/argcomplete/argcomplete-2.0.0-r1.ebuild
+++ b/dev-python/argcomplete/argcomplete-2.0.0-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/argcomplete/argcomplete-2.0.0.ebuild b/dev-python/argcomplete/argcomplete-2.0.0.ebuild
deleted file mode 100644
index 261d094375f0..000000000000
--- a/dev-python/argcomplete/argcomplete-2.0.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Bash tab completion for argparse"
-HOMEPAGE="https://pypi.org/project/argcomplete/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# pip is called as an external tool
-BDEPEND="
-	test? (
-		app-shells/fish
-		app-shells/tcsh
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		>=dev-python/pip-19
-	)"
-
-src_test() {
-	# workaround new readline defaults
-	echo "set enable-bracketed-paste off" > "${T}"/inputrc || die
-	local -x INPUTRC="${T}"/inputrc
-	distutils-r1_src_test
-}
-
-python_test() {
-	"${EPYTHON}" test/test.py -v || die
-}
diff --git a/dev-python/atomicwrites/atomicwrites-1.4.0-r1.ebuild b/dev-python/atomicwrites/atomicwrites-1.4.0-r1.ebuild
deleted file mode 100644
index 8291efadfbe0..000000000000
--- a/dev-python/atomicwrites/atomicwrites-1.4.0-r1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Atomic file writes"
-HOMEPAGE="https://github.com/untitaker/python-atomicwrites"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs \
-	dev-python/sphinx_rtd_theme
diff --git a/dev-python/atomicwrites/atomicwrites-1.4.0-r2.ebuild b/dev-python/atomicwrites/atomicwrites-1.4.0-r2.ebuild
index d63eff7142cb..0b5b55d64baf 100644
--- a/dev-python/atomicwrites/atomicwrites-1.4.0-r2.ebuild
+++ b/dev-python/atomicwrites/atomicwrites-1.4.0-r2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 distutils_enable_tests pytest
 distutils_enable_sphinx docs \
diff --git a/dev-python/attrs/attrs-21.4.0-r1.ebuild b/dev-python/attrs/attrs-21.4.0-r1.ebuild
index fc5839c4f37e..c843135f57ac 100644
--- a/dev-python/attrs/attrs-21.4.0-r1.ebuild
+++ b/dev-python/attrs/attrs-21.4.0-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	dev-python/zope-interface[${PYTHON_USEDEP}]
diff --git a/dev-python/attrs/attrs-21.4.0.ebuild b/dev-python/attrs/attrs-21.4.0.ebuild
deleted file mode 100644
index b16b8b651690..000000000000
--- a/dev-python/attrs/attrs-21.4.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Attributes without boilerplate"
-HOMEPAGE="
-	https://github.com/python-attrs/attrs/
-	https://attrs.readthedocs.io/
-	https://pypi.org/project/attrs/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	dev-python/zope-interface[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		$(python_gen_impl_dep sqlite)
-		$(python_gen_cond_dep '
-			dev-python/cloudpickle[${PYTHON_USEDEP}]
-		' 'python*')
-		>=dev-python/hypothesis-3.6.0[${PYTHON_USEDEP}]
-		>=dev-python/pytest-4.3.0[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/backports-entry_points_selectable/Manifest b/dev-python/backports-entry_points_selectable/Manifest
deleted file mode 100644
index 0280dea045b6..000000000000
--- a/dev-python/backports-entry_points_selectable/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST backports.entry_points_selectable-1.1.0.gh.tar.gz 7689 BLAKE2B e7fb4372838b47e65e50d91acb034afaf326947bd76bbdf14b57834b94c72fb62afa6526931a96cc1e10b43eca9d95dce7fde431c24a4e15a4b2569ddf42faeb SHA512 abf8f5d228b52281160cedfd017f1a4273b8fce01ed29e9f0417f750125abacaf97a3cc6f363849702d1dc6f3c40602461f79bfcc2a36a3dfb962af1112046d2
-DIST backports.entry_points_selectable-1.1.1.gh.tar.gz 7688 BLAKE2B d142a4c608b05c708b01487bf2810324fe2e5229de0d57844949a4596f710f736252a3111d67a602a84a70eb32b53752a3483edf39454272bb483c8555a46cbb SHA512 b811a473e13ebb3dafe94d726bfe98d7569a9d9a98ab77f1ed975b17deecf84e93e04a4ee263c3721b4e9fbbfae2f307b8c88a83441f792dd88511bb99f19c1d
diff --git a/dev-python/backports-entry_points_selectable/backports-entry_points_selectable-1.1.0-r1.ebuild b/dev-python/backports-entry_points_selectable/backports-entry_points_selectable-1.1.0-r1.ebuild
deleted file mode 100644
index 7e9ad0c70373..000000000000
--- a/dev-python/backports-entry_points_selectable/backports-entry_points_selectable-1.1.0-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-inherit distutils-r1
-
-MY_P=${P/-/.}
-DESCRIPTION="Compatibility shim providing selectable entry points"
-HOMEPAGE="
-	https://github.com/jaraco/backports.entry_points_selectable/
-	https://pypi.org/project/backports.entry-points-selectable/"
-SRC_URI="
-	https://github.com/jaraco/backports.entry_points_selectable/archive/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/backports-entry_points_selectable/backports-entry_points_selectable-1.1.1.ebuild b/dev-python/backports-entry_points_selectable/backports-entry_points_selectable-1.1.1.ebuild
deleted file mode 100644
index 9bd3681c8c0a..000000000000
--- a/dev-python/backports-entry_points_selectable/backports-entry_points_selectable-1.1.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-MY_P=${P/-/.}
-DESCRIPTION="Compatibility shim providing selectable entry points"
-HOMEPAGE="
-	https://github.com/jaraco/backports.entry_points_selectable/
-	https://pypi.org/project/backports.entry-points-selectable/
-"
-SRC_URI="
-	https://github.com/jaraco/backports.entry_points_selectable/archive/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-python_compile() {
-	distutils-r1_python_compile
-	rm "${BUILD_DIR}/install$(python_get_sitedir)"/backports/__init__.py || die
-}
diff --git a/dev-python/bcrypt/Manifest b/dev-python/bcrypt/Manifest
index 5fc8e84dc519..9c68b699b24a 100644
--- a/dev-python/bcrypt/Manifest
+++ b/dev-python/bcrypt/Manifest
@@ -1,3 +1 @@
-DIST bcrypt-3.2.0.tar.gz 42416 BLAKE2B ff9cca995e38fe27c6f02e9770e9349dfe528a1c9c18f41c72f29dfc01e981373fc0964f3a74161f2a7dddea63c5f48708539221adcd5a8ae99b7c30d7b1afd8 SHA512 aa782aa6a725434e0b0737973e33e6c2bf4e82d39e8dfba0913da5d7dd051d55217adab8004c3eaf896fc3c3e145ba543da1b5162a667a3d82a4eb6b07430b80
-DIST bcrypt-3.2.1.tar.gz 42371 BLAKE2B b2157dbde3412cfc643bed9e847999bfc02a2d6f41b6527e85e52ddb04b462fdacd2fd40f2794fdfcdd6a7be6a153dfd98a50212bb78bfd870262a040b2de592 SHA512 16fdb1740d635eba11f6786cf02684cd9012899e4136347e95ec7944c41f838014dd8b5c73c47070bce50f475aa9ff3ba9078f68de4450d2d92a94761fb6de44
 DIST bcrypt-3.2.2.tar.gz 42455 BLAKE2B 01cfd126662b16bd9df782effd58cf8fa1bc518af95d814fb5a857ff8d8a4a9bc302241341e656247c49e0f39a7d69feb0d40dec9dd8463bc150b6ebdd165c2b SHA512 2f3b88bffaa9ff820aba6fb3143253b7936a1440ae93caff13cbdff58c1f8427f132cce60299cda523659b7026751a954b476857f2b9841cdd2a1a50c430a626
diff --git a/dev-python/bcrypt/bcrypt-3.2.0.ebuild b/dev-python/bcrypt/bcrypt-3.2.0.ebuild
deleted file mode 100644
index f4cafe005552..000000000000
--- a/dev-python/bcrypt/bcrypt-3.2.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Modern password hashing for software and servers"
-HOMEPAGE="https://github.com/pyca/bcrypt/ https://pypi.org/project/bcrypt/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="Apache-2.0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris"
-
-RDEPEND="
-	$(python_gen_cond_dep '>=dev-python/cffi-1.1:=[${PYTHON_USEDEP}]' 'python*')
-	>=dev-python/six-1.4.1[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-distutils_enable_tests pytest
diff --git a/dev-python/bcrypt/bcrypt-3.2.1.ebuild b/dev-python/bcrypt/bcrypt-3.2.1.ebuild
deleted file mode 100644
index e5a5ee0bebdb..000000000000
--- a/dev-python/bcrypt/bcrypt-3.2.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1
-
-DESCRIPTION="Modern password hashing for software and servers"
-HOMEPAGE="https://github.com/pyca/bcrypt/ https://pypi.org/project/bcrypt/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="Apache-2.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		>=dev-python/cffi-1.1:=[${PYTHON_USEDEP}]
-	' 'python*')
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/bcrypt/bcrypt-3.2.2.ebuild b/dev-python/bcrypt/bcrypt-3.2.2.ebuild
index 36b45c145761..b9a12403f583 100644
--- a/dev-python/bcrypt/bcrypt-3.2.2.ebuild
+++ b/dev-python/bcrypt/bcrypt-3.2.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="Apache-2.0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 926562a64f7b..820c1eb62ff6 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -3,3 +3,4 @@ DIST boto3-1.24.2.gh.tar.gz 505904 BLAKE2B e5fe9aa089caaa91aa41554a07ba97da55b04
 DIST boto3-1.24.3.gh.tar.gz 506694 BLAKE2B 5049ad69810c0fcb4d4133fae8efb7d5f44a5b766c3a53710692136231c2f147b08a6782e51f12ab0e22189cb8bbaf90805ca03d0f6eeffe047678b1b21cf72f SHA512 7652ffbfb41df2dde924e85c251dba84643d67b719ea7dc366dcb0f6988815474b0e2a44dba74ebda5f9b1f5576df715dbd16b70ad4109e846766bf34e9d92d0
 DIST boto3-1.24.4.gh.tar.gz 507020 BLAKE2B 2689aa84d0cc5a8c7978d18c480576015bb212a2714eb4edf3f9dd59e0be09da4a866e64fad1f3033cf02b807af7f827cceb56716bec5f04048c2eeb49b12804 SHA512 d23d1d7cb11d45d4419a5c4c1fcadacbfff8e8ebae69c8e522aa00e966048cd341bff8587e18bd0f043f1abd0558522aecede3aa83b84498df95c5a06068f15b
 DIST boto3-1.24.5.gh.tar.gz 508100 BLAKE2B 5ad9e6325a507ea94738eebee58200b4c4e967db5afb5a3076ad55b64df8637f961074377375d9bf4df233c1d53444738e82a868515d04dbd9632dad0889e2c0 SHA512 9387c70c54e05b1007135a896e69934d128a31735cdf0b61ccadd9412c7be5d53259c60a2b4410157037f9a95afaf8ef4f4a97d35e290ff12b7deb125a73d903
+DIST boto3-1.24.6.gh.tar.gz 508258 BLAKE2B 705b01006dfa63e386b39a0c4e791e0d9f2e4c5ae72bda3245843ba802556b1328214f80df788497d8b646882af816cfdba6d2769fe5bef82cbaf629fe9fcac6 SHA512 198df4e2f1e5f42bf0faa8baaea0bbc3d88fffda435afc3eccfdcc56940773dcdf43e8cb533a48265907bd118d8e969c7f9b37affb6508a8147ecee486017d92
diff --git a/dev-python/boto3/boto3-1.24.6.ebuild b/dev-python/boto3/boto3-1.24.6.ebuild
new file mode 100644
index 000000000000..e4a98e2e28f5
--- /dev/null
+++ b/dev-python/boto3/boto3-1.24.6.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="
+	https://github.com/boto/boto3/
+	https://pypi.org/project/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/boto3/archive/${PV}.tar.gz
+			-> ${P}.gh.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.6.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index 0ff17db55407..539e0dc071c7 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -3,3 +3,4 @@ DIST botocore-1.27.2.tar.gz 9026413 BLAKE2B 013724df76fb87c8e7731401d09774bec303
 DIST botocore-1.27.3.tar.gz 9078424 BLAKE2B 62414c2474ec44b3385c589793fd0c54984d2302239b78295bfbdc3739160bbae5bb910207dc7252b7adb96d6cd69add7413000399bcb20b671e3fbdad860c02 SHA512 47ed3e68c10e4175cdbe2122dab9319b9059f9457e27258a142224311042c5ae4692d293d29dc9b4855e65eea561fb7b703f7ddc663064413144aaf72fda33a5
 DIST botocore-1.27.4.tar.gz 9079162 BLAKE2B 3707e0b53022185248d5c086860ddf99f6d43803414929252a6b090fbeb765606e1fa97896f6d9016e97a0a6b5388d754941f3a88645f5c1ea18f206d73127a7 SHA512 3743d79febcf33302de20b364267ae39a0887c7fa5e116a7209b1281b4985e593b5d3f0ea7bb6e608036d99d4df46931192f5a3a63c98f7b3da26a16ea6b5a3f
 DIST botocore-1.27.5.tar.gz 9110489 BLAKE2B 0cafef7d573de45613b3a03e94c7ddedc6fcf13bc450c5a7509748062d29e5ac2de96982a606cd7af007a2c01004bead3575e7150c4120964edb290d0002c9c9 SHA512 8fc4a81da092e3b3bfa5b347d6a03fc6b969aeecc7a13b0b5de75d96d8c826411cf82bd22e373d6a8b5a9da323468bf1fd9b036b2b72d1801c49056c5c991858
+DIST botocore-1.27.6.tar.gz 9109990 BLAKE2B ca3b1f4d14f4bbce87dcd989caf2fa79e475471c951ae13b2804e89f21a1dbf4949cbaba0abcf766f7a324f2b214135643b8d33f02a0866a06a5d81a1e50aa33 SHA512 a2e40d6b875b50bc8fe4180d8ad74a6f72c01f79d0130f9f4107436027fd0b40634359a5b9273bc9fd2eded16d14f40bd297467e57cc65707a495c312618d766
diff --git a/dev-python/botocore/botocore-1.27.6.ebuild b/dev-python/botocore/botocore-1.27.6.ebuild
new file mode 100644
index 000000000000..97701266bf61
--- /dev/null
+++ b/dev-python/botocore/botocore-1.27.6.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="
+	https://github.com/boto/botocore/
+	https://pypi.org/project/botocore/
+"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	<dev-python/jmespath-2[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/botocore-1.26.0-py311.patch"
+)
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests pytest
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+
+	# unbundle deps
+	rm -r botocore/vendored || die
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# rely on bundled six
+		tests/functional/test_six_imports.py::test_no_bare_six_imports
+		tests/functional/test_six_threading.py::test_six_thread_safety
+	)
+
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/build/Manifest b/dev-python/build/Manifest
index 4c7f19a605b3..34a325b4b6e6 100644
--- a/dev-python/build/Manifest
+++ b/dev-python/build/Manifest
@@ -1,2 +1 @@
-DIST build-0.7.0.gh.tar.gz 37127 BLAKE2B b06ba16c154087046bd5efddb5fd6f60dad9ee79a204a0c1124fb4885d3692bcf4bd88b75c9665ade3f8457e12742d32e3cef40a0ffb5a894b049a6e942c09e3 SHA512 fd8410dc91333ba94c5141dd78f8052b66f947839752a5d0f401630f6bceed5be2e1f45eceaa2a98908c0e3ddb88a00e3ccca341a3890fa99202bc560ab6ff42
 DIST build-0.8.0.gh.tar.gz 40020 BLAKE2B 17422c8fe23d4103c78bd9d98702646f0863abfea4ff5df425942eb71aa905d8171567976228681afa90f453131ccce4701128b4f73b61acf4158ea2758c5c9e SHA512 62eaabef36fae592b06c41623f8f36750a029263a65c8fa21ad58b24ef30d4fa8eef7588237a68efb9a9784676f35605a8c9a6b2ed1bc6844c32924f9b5ec377
diff --git a/dev-python/build/build-0.7.0-r1.ebuild b/dev-python/build/build-0.7.0-r1.ebuild
deleted file mode 100644
index 1116c9cd8941..000000000000
--- a/dev-python/build/build-0.7.0-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="A simple, correct PEP517 package builder"
-HOMEPAGE="
-	https://pypi.org/project/build/
-	https://github.com/pypa/build/
-"
-SRC_URI="
-	https://github.com/pypa/build/archive/${PV}.tar.gz -> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	>=dev-python/packaging-19.0[${PYTHON_USEDEP}]
-	>=dev-python/pep517-0.9.1[${PYTHON_USEDEP}]
-	>=dev-python/tomli-1.0.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-python/filelock-3[${PYTHON_USEDEP}]
-		>=dev-python/pytest-mock-2[${PYTHON_USEDEP}]
-		>=dev-python/pytest-rerunfailures-9.1[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		>=dev-python/setuptools-56.0.0[${PYTHON_USEDEP}]
-		>=dev-python/wheel-0.36.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# broken by the presence of flit_core
-		tests/test_util.py::test_wheel_metadata_isolation
-		# broken by the presence of virtualenv (it changes the error
-		# messages, sic!)
-		tests/test_env.py::test_isolated_env_log
-		tests/test_main.py::test_output_env_subprocess_error
-		'tests/test_main.py::test_output[via-sdist-isolation]'
-		'tests/test_main.py::test_output[wheel-direct-isolation]'
-		# Internet
-		tests/test_main.py::test_build_package
-		tests/test_main.py::test_build_package_via_sdist
-		'tests/test_util.py::test_wheel_metadata[True]'
-		tests/test_util.py::test_with_get_requires
-		# we don't really have to test that fallback
-		# (requires dev-python/toml that we'd like to lastrite eventually)
-		tests/test_projectbuilder.py::test_toml_instead_of_tomli
-	)
-	[[ ${EPYTHON} == python3.11 ]] && EPYTEST_DESELECT+=(
-		# fixed in git but the patch is large-ish
-		tests/test_env.py::test_executable_missing_post_creation
-	)
-
-	epytest -p no:flaky -n "$(makeopts_jobs)" \
-		-W"ignore:path is deprecated.:DeprecationWarning"
-}
diff --git a/dev-python/build/build-0.7.0.ebuild b/dev-python/build/build-0.7.0.ebuild
deleted file mode 100644
index 8583ada6f20a..000000000000
--- a/dev-python/build/build-0.7.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="A simple, correct PEP517 package builder"
-HOMEPAGE="
-	https://pypi.org/project/build/
-	https://github.com/pypa/build/"
-SRC_URI="
-	https://github.com/pypa/build/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/packaging-19.0[${PYTHON_USEDEP}]
-	>=dev-python/pep517-0.9.1[${PYTHON_USEDEP}]
-	>=dev-python/tomli-1.0.0[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		>=dev-python/filelock-3[${PYTHON_USEDEP}]
-		>=dev-python/pytest-mock-2[${PYTHON_USEDEP}]
-		>=dev-python/pytest-rerunfailures-9.1[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		>=dev-python/setuptools-56.0.0[${PYTHON_USEDEP}]
-		>=dev-python/wheel-0.36.0[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# broken by the presence of flit_core
-		tests/test_util.py::test_wheel_metadata_isolation
-		# broken by the presence of virtualenv (it changes the error
-		# messages, sic!)
-		tests/test_env.py::test_isolated_env_log
-		tests/test_main.py::test_output_env_subprocess_error
-		'tests/test_main.py::test_output[via-sdist-isolation]'
-		'tests/test_main.py::test_output[wheel-direct-isolation]'
-		# Internet
-		tests/test_main.py::test_build_package
-		tests/test_main.py::test_build_package_via_sdist
-		'tests/test_util.py::test_wheel_metadata[True]'
-		tests/test_util.py::test_with_get_requires
-	)
-
-	epytest -p no:flaky \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
diff --git a/dev-python/build/build-0.8.0.ebuild b/dev-python/build/build-0.8.0.ebuild
index ea2522895df1..0d59e9c30f58 100644
--- a/dev-python/build/build-0.8.0.ebuild
+++ b/dev-python/build/build-0.8.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/packaging-19.0[${PYTHON_USEDEP}]
diff --git a/dev-python/characteristic/characteristic-14.3.0-r3.ebuild b/dev-python/characteristic/characteristic-14.3.0-r3.ebuild
deleted file mode 100644
index 4c2dc6436df8..000000000000
--- a/dev-python/characteristic/characteristic-14.3.0-r3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python attributes without the boilerplate"
-HOMEPAGE="https://characteristic.readthedocs.org/ https://github.com/hynek/characteristic"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs
-
-python_prepare_all() {
-	sed -e 's|\[pytest\]|\[tool:pytest\]|' -i setup.cfg || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/characteristic/characteristic-14.3.0-r4.ebuild b/dev-python/characteristic/characteristic-14.3.0-r4.ebuild
index 357ec0715395..94c023d01ca4 100644
--- a/dev-python/characteristic/characteristic-14.3.0-r4.ebuild
+++ b/dev-python/characteristic/characteristic-14.3.0-r4.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 distutils_enable_tests pytest
 distutils_enable_sphinx docs
diff --git a/dev-python/check-manifest/Manifest b/dev-python/check-manifest/Manifest
index 1990a386a057..3b26630be303 100644
--- a/dev-python/check-manifest/Manifest
+++ b/dev-python/check-manifest/Manifest
@@ -1 +1 @@
-DIST check-manifest-0.46.tar.gz 34419 BLAKE2B 9152ca60756c503c744192ab72668858ba7fe491745c48337aab2b135f9d491319bb383af901110abf61a7b439e01bba4d5c22f2042aca6cf1e0b990ce15726f SHA512 301caa9c95f4ae3655c290217867df7e9de9967c1a603a32e4a0e220651de555c3dd716b109b1b1dda8e2547396bce8b742fd08091a4879943aefc56e8008d96
+DIST check-manifest-0.48.tar.gz 34732 BLAKE2B 9142ec4b4fb4ea96662ae5f1335127b2adb2c148e29d287384335e4b15f82597451bd7cfde856e80c485e00de20bd5591551b0e0a8446870c57d7ea3eb658708 SHA512 79df1ef54e2af669ce08b87d3ca9eb58bc02c6541687be11b270a30f83d89982583a470aff2c6bde0454476b27258c268cabfbb0f90c1188212375d0f95328d9
diff --git a/dev-python/check-manifest/check-manifest-0.46.ebuild b/dev-python/check-manifest/check-manifest-0.48.ebuild
index d1c4d7b68107..73548a16a34c 100644
--- a/dev-python/check-manifest/check-manifest-0.46.ebuild
+++ b/dev-python/check-manifest/check-manifest-0.48.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI=8
 
 PYTHON_COMPAT=( python3_{7,8,9,10} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
+DISTUTILS_USE_PEP517=setuptools
 inherit distutils-r1
 
 DESCRIPTION="Tool to check the completeness of MANIFEST.in for Python packages"
@@ -20,7 +19,8 @@ SLOT="0"
 KEYWORDS="~amd64"
 
 RDEPEND="
-	dev-python/toml[${PYTHON_USEDEP}]
+	dev-python/build[${PYTHON_USEDEP}]
+	dev-python/tomli[${PYTHON_USEDEP}]
 "
 DEPEND="
 	${RDEPEND}
@@ -29,10 +29,9 @@ DEPEND="
 	)
 "
 
-distutils_enable_tests pytest
+EPYTEST_DESELECT=(
+	# Need internet
+	tests.py::Tests::test_build_sdist_pep517_isolated
+)
 
-python_test() {
-	epytest \
-		--deselect tests.py::Tests::test_build_sdist_pep517_isolated \
-		--deselect tests.py::Tests::test_build_sdist_pep517_no_isolation
-}
+distutils_enable_tests pytest
diff --git a/dev-python/check-manifest/metadata.xml b/dev-python/check-manifest/metadata.xml
index 8e14cec339b9..a324fb273a55 100644
--- a/dev-python/check-manifest/metadata.xml
+++ b/dev-python/check-manifest/metadata.xml
@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
+ <maintainer type="project">
+  <email>python@gentoo.org</email>
+ </maintainer>
  <longdescription lang="en">
-Are you a Python developer? Have you uploaded packages to the Python Package Index? Have you accidentally uploaded broken packages with some files missing? If so, check-manifest is for you.
+    Are you a Python developer? Have you uploaded packages to the Python Package Index? Have you accidentally uploaded broken packages with some files missing? If so, check-manifest is for you.
   </longdescription>
  
- <origin>gentoo-guru-overlay</origin>
+ <origin>gentoo-staging</origin>
+ <stabilize-allarches/>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/debugpy/Manifest b/dev-python/debugpy/Manifest
index 319bc0505a84..ee60328d2071 100644
--- a/dev-python/debugpy/Manifest
+++ b/dev-python/debugpy/Manifest
@@ -1 +1,2 @@
 DIST debugpy-1.5.1.gh.tar.gz 6675322 BLAKE2B a8e3a07d5dbd1b5ca39301e703b279514653606f98743a396693738c9a89403c73a6b6942e5dc368dd89eb8b74277e1808f9247573f330e3a94596c26af7e5be SHA512 93ee526ca7cb3d44b85106a33d8f930f4f2b307eb26ede3ab6b5653de986a101b10f545f5de12cd8ee6ff9e9a12c5e4b57c4c40b1b3003c2f555676bd34482ce
+DIST debugpy-1.6.0.gh.tar.gz 6366079 BLAKE2B 134d2adcae6ec926dcdb7161f0874b830a1d0e3c55abb991f4861fa5a58045437ee4f4cb4c9572b902e3e33634bc3f9970ae055985b983d89d0ef1d99561bda8 SHA512 fe245d4ff751a6c2ef0e75a5249f99661b78075ac62c931c20e3ccbc9389d39a08dc2fda44a33eb23a0a76e5ee339edae439b0004d130cdfe421048f3cc83962
diff --git a/dev-python/debugpy/debugpy-1.6.0.ebuild b/dev-python/debugpy/debugpy-1.6.0.ebuild
new file mode 100644
index 000000000000..94ff7ba99cc3
--- /dev/null
+++ b/dev-python/debugpy/debugpy-1.6.0.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_{7,8,9,10} )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1
+
+DESCRIPTION="An implementation of the Debug Adapter Protocol for Python"
+HOMEPAGE="https://github.com/microsoft/debugpy/ https://pypi.org/project/debugpy/"
+SRC_URI="
+	https://github.com/microsoft/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+# This is completely broken
+RESTRICT="test"
+
+RDEPEND="dev-python/pydevd[${PYTHON_USEDEP}]"
+BDEPEND="test? ( dev-python/pytest-timeout[${PYTHON_USEDEP}] )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.6.0-unbundle-pydevd.patch"
+)
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# Drop unnecessary and unrecognized option
+	# __main__.py: error: unrecognized arguments: -n8
+	# Do not timeout
+	sed -e '/addopts/d' -e '/timeout/d' -i pytest.ini || die
+
+	# Unbundle dev-python/pydevd
+	rm -r src/debugpy/_vendored || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/debugpy/files/debugpy-1.4.2-unbundle-pydevd.patch b/dev-python/debugpy/files/debugpy-1.4.2-unbundle-pydevd.patch
index 7047877ef279..3d60bcd18cbc 100644
--- a/dev-python/debugpy/files/debugpy-1.4.2-unbundle-pydevd.patch
+++ b/dev-python/debugpy/files/debugpy-1.4.2-unbundle-pydevd.patch
@@ -1,78 +1,78 @@
-diff --git a/setup.py b/setup.py
-index ee5bbba..f69dc95 100644
---- a/setup.py
-+++ b/setup.py
-@@ -21,12 +21,10 @@ del sys.path[0]
- 
- sys.path.insert(0, os.path.join(os.path.dirname(os.path.abspath(__file__)), "src"))
- import debugpy
--import debugpy._vendored
- 
- del sys.path[0]
- 
- 
--PYDEVD_ROOT = debugpy._vendored.project_root("pydevd")
- DEBUGBY_ROOT = os.path.dirname(os.path.abspath(debugpy.__file__))
- 
- 
-@@ -36,27 +34,6 @@ def get_buildplatform():
-     return None
- 
- 
--def cython_build():
--    print("Compiling extension modules (set SKIP_CYTHON_BUILD=1 to omit)")
--    subprocess.call(
--        [
--            sys.executable,
--            os.path.join(PYDEVD_ROOT, "setup_cython.py"),
--            "build_ext",
--            "-i",
--        ]
--    )
--
--
--def iter_vendored_files():
--    # Add pydevd files as data files for this package. They are not
--    # treated as a package of their own, because we don't actually
--    # want to provide pydevd - just use our own copy internally.
--    for project in debugpy._vendored.list_all():
--        for filename in debugpy._vendored.iter_packaging_files(project):
--            yield filename
--
--
- # bdist_wheel determines whether the package is pure or not based on ext_modules.
- # However, all pydevd native modules are prebuilt and packaged as data, so they
- # should not be in the list.
-@@ -121,8 +98,6 @@ with open("DESCRIPTION.md", "r") as fh:
- 
- 
- if __name__ == "__main__":
--    if not os.getenv("SKIP_CYTHON_BUILD"):
--        cython_build()
- 
-     extras = {}
-     platforms = get_buildplatform()
-@@ -165,11 +140,9 @@ if __name__ == "__main__":
-             "debugpy.common",
-             "debugpy.launcher",
-             "debugpy.server",
--            "debugpy._vendored",
-         ],
-         package_data={
-             "debugpy": ["ThirdPartyNotices.txt"],
--            "debugpy._vendored": list(iter_vendored_files()),
-         },
-         ext_modules=ExtModules(),
-         has_ext_modules=lambda: True,
-diff --git a/src/debugpy/server/__init__.py b/src/debugpy/server/__init__.py
-index e6a1ad6..a79a86b 100644
---- a/src/debugpy/server/__init__.py
-+++ b/src/debugpy/server/__init__.py
-@@ -3,7 +3,3 @@
- # for license information.
- 
- from __future__ import absolute_import, division, print_function, unicode_literals
--
--# "force_pydevd" must be imported first to ensure (via side effects)
--# that the debugpy-vendored copy of pydevd gets used.
--import debugpy._vendored.force_pydevd  # noqa
+diff --git a/setup.py b/setup.py

+index ee5bbba..f69dc95 100644

+--- a/setup.py

++++ b/setup.py

+@@ -21,12 +21,10 @@ del sys.path[0]

+ 

+ sys.path.insert(0, os.path.join(os.path.dirname(os.path.abspath(__file__)), "src"))

+ import debugpy

+-import debugpy._vendored

+ 

+ del sys.path[0]

+ 

+ 

+-PYDEVD_ROOT = debugpy._vendored.project_root("pydevd")

+ DEBUGBY_ROOT = os.path.dirname(os.path.abspath(debugpy.__file__))

+ 

+ 

+@@ -36,27 +34,6 @@ def get_buildplatform():

+     return None

+ 

+ 

+-def cython_build():

+-    print("Compiling extension modules (set SKIP_CYTHON_BUILD=1 to omit)")

+-    subprocess.call(

+-        [

+-            sys.executable,

+-            os.path.join(PYDEVD_ROOT, "setup_cython.py"),

+-            "build_ext",

+-            "-i",

+-        ]

+-    )

+-

+-

+-def iter_vendored_files():

+-    # Add pydevd files as data files for this package. They are not

+-    # treated as a package of their own, because we don't actually

+-    # want to provide pydevd - just use our own copy internally.

+-    for project in debugpy._vendored.list_all():

+-        for filename in debugpy._vendored.iter_packaging_files(project):

+-            yield filename

+-

+-

+ # bdist_wheel determines whether the package is pure or not based on ext_modules.

+ # However, all pydevd native modules are prebuilt and packaged as data, so they

+ # should not be in the list.

+@@ -121,8 +98,6 @@ with open("DESCRIPTION.md", "r") as fh:

+ 

+ 

+ if __name__ == "__main__":

+-    if not os.getenv("SKIP_CYTHON_BUILD"):

+-        cython_build()

+ 

+     extras = {}

+     platforms = get_buildplatform()

+@@ -165,11 +140,9 @@ if __name__ == "__main__":

+             "debugpy.common",

+             "debugpy.launcher",

+             "debugpy.server",

+-            "debugpy._vendored",

+         ],

+         package_data={

+             "debugpy": ["ThirdPartyNotices.txt"],

+-            "debugpy._vendored": list(iter_vendored_files()),

+         },

+         ext_modules=ExtModules(),

+         has_ext_modules=lambda: True,

+diff --git a/src/debugpy/server/__init__.py b/src/debugpy/server/__init__.py

+index e6a1ad6..a79a86b 100644

+--- a/src/debugpy/server/__init__.py

++++ b/src/debugpy/server/__init__.py

+@@ -3,7 +3,3 @@

+ # for license information.

+ 

+ from __future__ import absolute_import, division, print_function, unicode_literals

+-

+-# "force_pydevd" must be imported first to ensure (via side effects)

+-# that the debugpy-vendored copy of pydevd gets used.

+-import debugpy._vendored.force_pydevd  # noqa

diff --git a/dev-python/debugpy/files/debugpy-1.6.0-unbundle-pydevd.patch b/dev-python/debugpy/files/debugpy-1.6.0-unbundle-pydevd.patch
new file mode 100644
index 000000000000..41a0b8e39ba6
--- /dev/null
+++ b/dev-python/debugpy/files/debugpy-1.6.0-unbundle-pydevd.patch
@@ -0,0 +1,102 @@
+diff --git a/pyproject.toml b/pyproject.toml

+index 15ea7e1..d3a2764 100644

+--- a/pyproject.toml

++++ b/pyproject.toml

+@@ -8,7 +8,6 @@ exclude = '''

+ ( __pycache__

+ | ^/.tox

+ | ^/versioneer.py

+-| ^/src/debugpy/_vendored

+ | ^/src/debugpy/_version.py

+ )

+ '''

+diff --git a/setup.py b/setup.py

+index 2c0a2d6..7c22c0c 100644

+--- a/setup.py

++++ b/setup.py

+@@ -18,12 +18,10 @@ del sys.path[0]

+ 

+ sys.path.insert(0, os.path.join(os.path.dirname(os.path.abspath(__file__)), "src"))

+ import debugpy

+-import debugpy._vendored

+ 

+ del sys.path[0]

+ 

+ 

+-PYDEVD_ROOT = debugpy._vendored.project_root("pydevd")

+ DEBUGBY_ROOT = os.path.dirname(os.path.abspath(debugpy.__file__))

+ 

+ 

+@@ -33,27 +31,6 @@ def get_buildplatform():

+     return None

+ 

+ 

+-def cython_build():

+-    print("Compiling extension modules (set SKIP_CYTHON_BUILD=1 to omit)")

+-    subprocess.call(

+-        [

+-            sys.executable,

+-            os.path.join(PYDEVD_ROOT, "setup_pydevd_cython.py"),

+-            "build_ext",

+-            "-i",

+-        ]

+-    )

+-

+-

+-def iter_vendored_files():

+-    # Add pydevd files as data files for this package. They are not

+-    # treated as a package of their own, because we don't actually

+-    # want to provide pydevd - just use our own copy internally.

+-    for project in debugpy._vendored.list_all():

+-        for filename in debugpy._vendored.iter_packaging_files(project):

+-            yield filename

+-

+-

+ # bdist_wheel determines whether the package is pure or not based on ext_modules.

+ # However, all pydevd native modules are prebuilt and packaged as data, so they

+ # should not be in the list.

+@@ -133,8 +110,6 @@ with open("DESCRIPTION.md", "r") as fh:

+ 

+ 

+ if __name__ == "__main__":

+-    if not os.getenv("SKIP_CYTHON_BUILD"):

+-        cython_build()

+ 

+     extras = {}

+     platforms = get_buildplatform()

+@@ -179,11 +154,9 @@ if __name__ == "__main__":

+             "debugpy.common",

+             "debugpy.launcher",

+             "debugpy.server",

+-            "debugpy._vendored",

+         ],

+         package_data={

+             "debugpy": ["ThirdPartyNotices.txt"],

+-            "debugpy._vendored": list(iter_vendored_files()),

+         },

+         ext_modules=ExtModules(),

+         has_ext_modules=lambda: True,

+diff --git a/src/debugpy/server/__init__.py b/src/debugpy/server/__init__.py

+index 642c776..947cd7d 100644

+--- a/src/debugpy/server/__init__.py

++++ b/src/debugpy/server/__init__.py

+@@ -3,7 +3,3 @@

+ # for license information.

+ 

+ from __future__ import absolute_import, division, print_function, unicode_literals

+-

+-# "force_pydevd" must be imported first to ensure (via side effects)

+-# that the debugpy-vendored copy of pydevd gets used.

+-import debugpy._vendored.force_pydevd  # noqa

+diff --git a/src/debugpy/server/attach_pid_injected.py b/src/debugpy/server/attach_pid_injected.py

+index 6016545..9bd2e2c 100644

+--- a/src/debugpy/server/attach_pid_injected.py

++++ b/src/debugpy/server/attach_pid_injected.py

+@@ -33,7 +33,6 @@ def attach(setup):

+                 pydevd_attach_to_process_path = os.path.join(

+                     _debugpy_dir,

+                     "debugpy",

+-                    "_vendored",

+                     "pydevd",

+                     "pydevd_attach_to_process",

+                 )

diff --git a/dev-python/dictpath/Manifest b/dev-python/dictpath/Manifest
new file mode 100644
index 000000000000..67f266fb4845
--- /dev/null
+++ b/dev-python/dictpath/Manifest
@@ -0,0 +1 @@
+DIST dictpath-0.1.3.gh.tar.gz 10823 BLAKE2B 4b9ef37810f9267790dbea8d858fd768c2bed7f7c1987a83bb2bd2ac81cc2c61b334a473c73dfa300adba77522d4d5c985a4278828a85c04fe330e94570a5dcc SHA512 bc5929856401854588b570a8b22cae66d4ea190d344ce1417f7406ab8a9859a10310a454d9f3d380eae1061ed93346a43f4ee6c19b1afedf6b5d8a1ba1431ed5
diff --git a/dev-python/dictpath/dictpath-0.1.3.ebuild b/dev-python/dictpath/dictpath-0.1.3.ebuild
new file mode 100644
index 000000000000..21371f088ba9
--- /dev/null
+++ b/dev-python/dictpath/dictpath-0.1.3.ebuild
@@ -0,0 +1,39 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+
+inherit distutils-r1
+
+# Upstream has renamed to pathable after v0.1.3
+DESCRIPTION="Object-oriented dictionary paths"
+HOMEPAGE="
+	https://pypi.org/project/dictpath/
+"
+SRC_URI="
+	https://github.com/p1c2u/pathable/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S="${WORKDIR}/pathable-${PV}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+"
+
+BDEPEND="test? (
+	dev-python/mock[${PYTHON_USEDEP}]
+)"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/--cov/d' setup.cfg || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/backports-entry_points_selectable/metadata.xml b/dev-python/dictpath/metadata.xml
index 7ad11570cc7d..7ad11570cc7d 100644
--- a/dev-python/backports-entry_points_selectable/metadata.xml
+++ b/dev-python/dictpath/metadata.xml
diff --git a/dev-python/execnet/execnet-1.9.0-r1.ebuild b/dev-python/execnet/execnet-1.9.0-r1.ebuild
index 7be2ea03bedf..5ef19e3c2751 100644
--- a/dev-python/execnet/execnet-1.9.0-r1.ebuild
+++ b/dev-python/execnet/execnet-1.9.0-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
diff --git a/dev-python/execnet/execnet-1.9.0.ebuild b/dev-python/execnet/execnet-1.9.0.ebuild
deleted file mode 100644
index 9ff791661e99..000000000000
--- a/dev-python/execnet/execnet-1.9.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Rapid multi-Python deployment"
-HOMEPAGE="https://codespeak.net/execnet/
-	https://pypi.org/project/execnet/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
-
-distutils_enable_sphinx doc
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	sed -i -r 's:(,[[:space:]]*|)"eventlet":: ; s:(,[[:space:]]*|)"gevent"(,|)::' \
-		testing/conftest.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local deselect=(
-		# needs python2.7 with apipkg?
-		'testing/test_termination.py::test_close_initiating_remote_no_error[python2.7]'
-		# tries to run python2
-		testing/test_channel.py::TestStringCoerce::test_3to2
-		testing/test_gateway.py::TestStringCoerce::test_3to2
-		# does not like Gentoo defaults
-		testing/test_gateway.py::TestPopenGateway::test_dont_write_bytecode
-		# almost all tests call py2, not worth filtering for the rest
-		testing/test_serializer.py
-	)
-
-	epytest ${deselect[@]/#/--deselect }
-}
diff --git a/dev-python/fields/fields-5.0.0-r2.ebuild b/dev-python/fields/fields-5.0.0-r2.ebuild
deleted file mode 100644
index 672226ce0a49..000000000000
--- a/dev-python/fields/fields-5.0.0-r2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Container class boilerplate killer"
-HOMEPAGE="https://github.com/ionelmc/python-fields"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-BDEPEND="
-	test? (
-		dev-python/attrs[${PYTHON_USEDEP}]
-		dev-python/characteristic[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	sed -r \
-		-e "/--benchmark-disable/d" \
-		-e 's|\[pytest\]|\[tool:pytest\]|' \
-		-i setup.cfg || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	epytest --ignore tests/test_perf.py tests
-}
diff --git a/dev-python/fields/fields-5.0.0-r3.ebuild b/dev-python/fields/fields-5.0.0-r3.ebuild
index 25edcc10ac39..c9c649f7aae5 100644
--- a/dev-python/fields/fields-5.0.0-r3.ebuild
+++ b/dev-python/fields/fields-5.0.0-r3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/flaky/flaky-3.7.0-r1.ebuild b/dev-python/flaky/flaky-3.7.0-r1.ebuild
deleted file mode 100644
index da10ba7b4b2d..000000000000
--- a/dev-python/flaky/flaky-3.7.0-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=bdepend
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Plugin for nose or py.test that automatically reruns flaky tests"
-HOMEPAGE="https://pypi.org/project/flaky/ https://github.com/box/flaky"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="Apache-2.0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	test? (
-		dev-python/genty[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-python_test() {
-	nosetests --with-flaky --exclude="test_nose_options_example" test/test_nose/ || die
-	pytest -k 'example and not options' --doctest-modules test/test_pytest/ || die
-	pytest -p no:flaky test/test_pytest/test_flaky_pytest_plugin.py || die
-	nosetests --with-flaky --force-flaky --max-runs 2 test/test_nose/test_nose_options_example.py || die
-	pytest --force-flaky --max-runs 2  test/test_pytest/test_pytest_options_example.py || die
-}
diff --git a/dev-python/flaky/flaky-3.7.0-r2.ebuild b/dev-python/flaky/flaky-3.7.0-r2.ebuild
index e6b8ab3fd05b..0a5c44558c67 100644
--- a/dev-python/flaky/flaky-3.7.0-r2.ebuild
+++ b/dev-python/flaky/flaky-3.7.0-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="Apache-2.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/genty/genty-1.3.2-r1.ebuild b/dev-python/genty/genty-1.3.2-r1.ebuild
deleted file mode 100644
index 4e0d9a257278..000000000000
--- a/dev-python/genty/genty-1.3.2-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Allows you to run a test with multiple data sets"
-HOMEPAGE="https://pypi.org/project/genty/ https://github.com/box/genty"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="Apache-2.0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-"
-DEPEND="
-	test? ( dev-python/mock[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_tests setup.py
diff --git a/dev-python/genty/genty-1.3.2-r2.ebuild b/dev-python/genty/genty-1.3.2-r2.ebuild
index cb3cb73defad..2cfc0f9a012e 100644
--- a/dev-python/genty/genty-1.3.2-r2.ebuild
+++ b/dev-python/genty/genty-1.3.2-r2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="Apache-2.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]
diff --git a/dev-python/iniconfig/iniconfig-1.1.1-r1.ebuild b/dev-python/iniconfig/iniconfig-1.1.1-r1.ebuild
index d74022f1b7f4..8e971a415b1a 100644
--- a/dev-python/iniconfig/iniconfig-1.1.1-r1.ebuild
+++ b/dev-python/iniconfig/iniconfig-1.1.1-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
diff --git a/dev-python/iniconfig/iniconfig-1.1.1.ebuild b/dev-python/iniconfig/iniconfig-1.1.1.ebuild
deleted file mode 100644
index 9f09f5031f29..000000000000
--- a/dev-python/iniconfig/iniconfig-1.1.1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Brain-dead simple config-ini parsing"
-HOMEPAGE="https://github.com/RonnyPfannschmidt/iniconfig"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-BDEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
diff --git a/dev-python/ipython/ipython-8.2.0.ebuild b/dev-python/ipython/ipython-8.2.0.ebuild
index ad6feedb54e5..6e720199d702 100644
--- a/dev-python/ipython/ipython-8.2.0.ebuild
+++ b/dev-python/ipython/ipython-8.2.0.ebuild
@@ -91,6 +91,10 @@ python_prepare_all() {
 	# https://github.com/ipython/ipython/issues/12892
 	mv IPython/extensions/{,ipython_}tests || die
 
+	# remove pyproject.toml that specifies incorrect backend; since
+	# the package actually requires the legacy backend, force it implicitly
+	rm pyproject.toml || die
+
 	distutils-r1_python_prepare_all
 }
 
diff --git a/dev-python/ipython/ipython-8.3.0-r1.ebuild b/dev-python/ipython/ipython-8.3.0-r1.ebuild
index aec3251c185b..e92336d2116e 100644
--- a/dev-python/ipython/ipython-8.3.0-r1.ebuild
+++ b/dev-python/ipython/ipython-8.3.0-r1.ebuild
@@ -89,6 +89,10 @@ python_prepare_all() {
 	# https://github.com/ipython/ipython/issues/12892
 	mv IPython/extensions/{,ipython_}tests || die
 
+	# remove pyproject.toml that specifies incorrect backend; since
+	# the package actually requires the legacy backend, force it implicitly
+	rm pyproject.toml || die
+
 	distutils-r1_python_prepare_all
 }
 
diff --git a/dev-python/ipython/ipython-8.4.0.ebuild b/dev-python/ipython/ipython-8.4.0.ebuild
index ef5f9e4f2c54..4228789faec3 100644
--- a/dev-python/ipython/ipython-8.4.0.ebuild
+++ b/dev-python/ipython/ipython-8.4.0.ebuild
@@ -89,6 +89,14 @@ python_prepare_all() {
 	# https://github.com/ipython/ipython/issues/12892
 	mv IPython/extensions/{,ipython_}tests || die
 
+	if ! grep -q __legacy__ pyproject.toml; then
+		die "pyproject.toml changed, please recheck"
+	fi
+
+	# remove pyproject.toml that specifies incorrect backend; since
+	# the package actually requires the legacy backend, force it implicitly
+	rm pyproject.toml || die
+
 	distutils-r1_python_prepare_all
 }
 
diff --git a/dev-python/jaraco-classes/jaraco-classes-3.2.1-r1.ebuild b/dev-python/jaraco-classes/jaraco-classes-3.2.1-r1.ebuild
index 0eb3935f21ee..330efd39d8d2 100644
--- a/dev-python/jaraco-classes/jaraco-classes-3.2.1-r1.ebuild
+++ b/dev-python/jaraco-classes/jaraco-classes-3.2.1-r1.ebuild
@@ -19,7 +19,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
diff --git a/dev-python/jaraco-classes/jaraco-classes-3.2.1.ebuild b/dev-python/jaraco-classes/jaraco-classes-3.2.1.ebuild
deleted file mode 100644
index 5178cc911a3e..000000000000
--- a/dev-python/jaraco-classes/jaraco-classes-3.2.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-MY_P="${P/-/.}"
-DESCRIPTION="Classes used by other projects by developer jaraco"
-HOMEPAGE="https://github.com/jaraco/jaraco.classes"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN/-/.}/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-BDEPEND="
-	dev-python/setuptools_scm[${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/jupyterlab/Manifest b/dev-python/jupyterlab/Manifest
index 3b21a71e7224..266dd10afaca 100644
--- a/dev-python/jupyterlab/Manifest
+++ b/dev-python/jupyterlab/Manifest
@@ -1 +1,2 @@
 DIST jupyterlab-3.3.4.tar.gz 17147292 BLAKE2B 0ae9895a96deaa81f5da9f6ddc74c9127c579722a8275df82e10a0da849552369d34259877acbf6c1ae5de4519fbce96c8923437db913d44cc8b8db4ff5433ea SHA512 d5002e86c4d84664271e735069db2bdaa8ab3a567861433793ca388a601e6f582bf884680992e0c2238f3bc2880a05c3a1ffd4e95aa0f7df91c4bed58f7692b6
+DIST jupyterlab-3.4.3.tar.gz 17074198 BLAKE2B 08a0aa4ddaeb6b48a742ef78e1b8cefb95fbf89ec077a1f3687c4498b7c4dbdd50e1773194c4f3c2e21d36a2010dcbcf2be0141df9383b2d05159bcb7f99ab9c SHA512 27c8d6b6636e14ea9a500764ea97b6ef16a1580728077264b662cc23b0e34ac0fd9eebe1eb5a79a64b18a2d93acc996553a6152fa135e2688b5eae21d184da57
diff --git a/dev-python/jupyterlab/jupyterlab-3.4.3.ebuild b/dev-python/jupyterlab/jupyterlab-3.4.3.ebuild
new file mode 100644
index 000000000000..b3212c3c1ac8
--- /dev/null
+++ b/dev-python/jupyterlab/jupyterlab-3.4.3.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+DISTUTILS_USE_PEP517=jupyter
+inherit distutils-r1
+
+DESCRIPTION="JupyterLab computational environment"
+HOMEPAGE="https://jupyter.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD MIT GPL-3 Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+BDEPEND="dev-python/jupyter_packaging[${PYTHON_USEDEP}]"
+
+RDEPEND="
+	dev-python/ipython[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/jupyter_core[${PYTHON_USEDEP}]
+	>=dev-python/jupyterlab_server-2.10[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_server-1.16[${PYTHON_USEDEP}]
+	>=dev-python/nbclassic-0.2[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.1[${PYTHON_USEDEP}]
+	>=www-servers/tornado-6.1[${PYTHON_USEDEP}]
+	net-libs/nodejs
+"
+
+BDEPEND="test? (
+	dev-python/check-manifest[${PYTHON_USEDEP}]
+	dev-python/ipykernel[${PYTHON_USEDEP}]
+	dev-python/jupyterlab_server[${PYTHON_USEDEP}]
+	dev-python/openapi-core[${PYTHON_USEDEP}]
+	dev-python/openapi-spec-validator[${PYTHON_USEDEP}]
+	dev-python/pytest-console-scripts[${PYTHON_USEDEP}]
+	dev-python/pytest-tornasync[${PYTHON_USEDEP}]
+	dev-python/pytest-timeout[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/ruamel-yaml[${PYTHON_USEDEP}]
+	dev-python/requests-cache[${PYTHON_USEDEP}]
+	dev-python/strict-rfc3339[${PYTHON_USEDEP}]
+	dev-python/virtualenv[${PYTHON_USEDEP}]
+)"
+
+EPYTEST_DESELECT=(
+	# These tests call npm and want internet
+	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_uninstall_core_extension
+	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_install_and_uninstall_pinned_folder
+	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_install_and_uninstall_pinned
+	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_build_custom_minimal_core_config
+	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_build_custom
+	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_build_check
+	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_build
+	jupyterlab/tests/test_build_api.py::TestBuildAPI::test_clear
+	jupyterlab/tests/test_build_api.py::TestBuildAPI::test_build
+)
+
+distutils_enable_tests pytest
+# TODO: package sphinx_copybutton
+#distutils_enable_sphinx docs/source dev-python/sphinx_rtd_theme dev-python/myst_parser
+
+python_install_all() {
+	distutils-r1_python_install_all
+	mv "${ED}/usr/etc" "${ED}/etc" || die
+}
diff --git a/dev-python/jupyterlab_server/Manifest b/dev-python/jupyterlab_server/Manifest
index 43a454876c50..6d4fd77fb486 100644
--- a/dev-python/jupyterlab_server/Manifest
+++ b/dev-python/jupyterlab_server/Manifest
@@ -1 +1,2 @@
 DIST jupyterlab_server-2.13.0.tar.gz 63896 BLAKE2B 4dd1f643cc68c9676ebab347a6ea01a58176a35d45262174e66c2e5b49881b21aa24692996d0622b96d0453793d04164f6eba710c2d7a31420ce12e52ac2c7fd SHA512 b7243c77765c811bce8ba82a612c034da22aa8ac7bc889a5d246a7db283bca29bf555f4ca849b8615c28d3d4cab57fbf08b0a15e08e045e9032792805cee59f8
+DIST jupyterlab_server-2.14.0.tar.gz 62704 BLAKE2B 93277a6880a9395622e6c0ec1da9522c5e30e7a8144c8629de89f45845964008f0a435ec84289efe56043c8ebb998ea65df1d09f3da72096f255fcafa29fab53 SHA512 21ecf749879663378d865bd06161fb3e331f3675038917e405df0cb77d4a4cec55340a35d6511676fa4d91ecaedcd1e7f8aec3a13ad3a39298d10911ab215cc6
diff --git a/dev-python/jupyterlab_server/jupyterlab_server-2.14.0.ebuild b/dev-python/jupyterlab_server/jupyterlab_server-2.14.0.ebuild
new file mode 100644
index 000000000000..c58b53b2af06
--- /dev/null
+++ b/dev-python/jupyterlab_server/jupyterlab_server-2.14.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+DISTUTILS_USE_PEP517=hatchling
+inherit distutils-r1
+
+DESCRIPTION="Server components for JupyterLab and JupyterLab like applications"
+HOMEPAGE="https://jupyter.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-python/Babel[${PYTHON_USEDEP}]
+	>=dev-python/importlib_metadata-3.6[${PYTHON_USEDEP}]
+	>=dev-python/jinja-3.0.3[${PYTHON_USEDEP}]
+	dev-python/json5[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-3.0.1[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_server-1.8[${PYTHON_USEDEP}]
+	<dev-python/jupyter_server-2[${PYTHON_USEDEP}]
+"
+
+BDEPEND="test? (
+	dev-python/ipykernel[${PYTHON_USEDEP}]
+	dev-python/jupyter_server[${PYTHON_USEDEP}]
+	dev-python/openapi-core[${PYTHON_USEDEP}]
+	dev-python/openapi-spec-validator[${PYTHON_USEDEP}]
+	dev-python/pytest-console-scripts[${PYTHON_USEDEP}]
+	dev-python/pytest-tornasync[${PYTHON_USEDEP}]
+	dev-python/pytest-timeout[${PYTHON_USEDEP}]
+	dev-python/ruamel-yaml[${PYTHON_USEDEP}]
+	dev-python/strict-rfc3339[${PYTHON_USEDEP}]
+)"
+
+distutils_enable_tests pytest
+# TODO: package autodoc_traits
+#distutils_enable_sphinx docs/source dev-python/pydata-sphinx-theme dev-python/myst_parser
+
+python_prepare_all() {
+	# This seems to not work for us, can only find english
+	rm tests/test_translation_api.py || die
+
+	# Do not depend on pytest-cov
+	sed -i -e '/addopts/d' pyproject.toml || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/mkdocs_pymdownx_material_extras/Manifest b/dev-python/mkdocs_pymdownx_material_extras/Manifest
index 100e0818469d..911f292f293a 100644
--- a/dev-python/mkdocs_pymdownx_material_extras/Manifest
+++ b/dev-python/mkdocs_pymdownx_material_extras/Manifest
@@ -1,3 +1,4 @@
 DIST mkdocs_pymdownx_material_extras-1.0.7.tar.gz 17995 BLAKE2B a7a8715ec07b9ef5551eadb37e618f45ca2f8f3c707aa5269eb7d2587db70ba29cfaa8027bb606c4264bbf93d7b3950d7a5dc03640b71afc677658b044d064fa SHA512 33fe8fddd0ee5856fdfb02068e2698f26a8db139458d7736715b776fbc2d8ae8ccb3170dbb786c52338e4e7a1612006046eb429f2268469f6f2bb5ba7f8e256d
 DIST mkdocs_pymdownx_material_extras-1.1.3.tar.gz 40029 BLAKE2B faa17e6e4d27a5d5e34a98a6830e34b934f8623fafb87a73051eb424cf95d29c5dd185bbfbbe49dd3e93eeee00a8310ac0543d480ab70e5abee4047b1cecc774 SHA512 340818ebcd8f9cf175e5049028d0932a0d6208de3d8f86cf5ea47747680079c6b9b3bf27e0c32ee10ee6a1bc7ab8ffc6cc3aa48470be43ed32adfde74f44d5dd
 DIST mkdocs_pymdownx_material_extras-2.0.3.tar.gz 25866 BLAKE2B 6d14f7591c7519bed30de4ffde15a7fcf8d5ac20440609dc8cac0beb8adcd72f6882d1c4f15b809a423b657f951f8393b50832d125c45d946c420514615df624 SHA512 23964157be8773b9532580801498c4a31b29dfcb713e70e6adcc0d2c6a56350b7edd5d36dbbf58f6d946cf2fdcb4eb6cde72a63e4b40b5ca140d83f18e011375
+DIST mkdocs_pymdownx_material_extras-2.1.tar.gz 24220 BLAKE2B bc16a3f4b7f471a14b3f5189ce7749f49a72b33c0b4ac9d67f6c7324004532103136898a2cec49adabba37c93c2ac1189e637ed4f2c6f4611f1fcbb9628ac707 SHA512 e10545455adf58643147a802ab422a3b3e293a8853c5e20c0c91cb97f8ee1bd3cb1f2ce23bb73f30f0b92872ab549e8d8fbd41bd783b1d9af3e995e313ebfa4b
diff --git a/dev-python/mkdocs_pymdownx_material_extras/mkdocs_pymdownx_material_extras-2.1.ebuild b/dev-python/mkdocs_pymdownx_material_extras/mkdocs_pymdownx_material_extras-2.1.ebuild
new file mode 100644
index 000000000000..60ea3b658c90
--- /dev/null
+++ b/dev-python/mkdocs_pymdownx_material_extras/mkdocs_pymdownx_material_extras-2.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Custom alterations based on Mkdocs-Material"
+HOMEPAGE="
+	https://github.com/facelessuser/mkdocs_pymdownx_material_extras
+	https://pypi.org/project/mkdocs-pymdownx-material-extras"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/mkdocs-material-5.0.2[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/mock/mock-4.0.3-r1.ebuild b/dev-python/mock/mock-4.0.3-r1.ebuild
index 61a3042e5684..2deddc2adaef 100644
--- a/dev-python/mock/mock-4.0.3-r1.ebuild
+++ b/dev-python/mock/mock-4.0.3-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	>=dev-python/six-1.9[${PYTHON_USEDEP}]
diff --git a/dev-python/mock/mock-4.0.3.ebuild b/dev-python/mock/mock-4.0.3.ebuild
deleted file mode 100644
index 4a6c4eb620e8..000000000000
--- a/dev-python/mock/mock-4.0.3.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Rolling backport of unittest.mock for all Pythons"
-HOMEPAGE="https://github.com/testing-cabal/mock"
-SRC_URI="https://github.com/testing-cabal/mock/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
-
-RDEPEND="
-	>=dev-python/six-1.9[${PYTHON_USEDEP}]"
-BDEPEND=${RDEPEND}
-
-PATCHES=(
-	"${FILESDIR}"/${P}-py310.patch
-)
-
-src_prepare() {
-	sed -i -e '/  pytest.*/d' setup.cfg || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# Upstream supports running tests only in their dream pristine
-	# environment.  pytest doesn't work at all if mock is already
-	# installed.  We can use plain unittest but we have to reinvent
-	# test filtering.
-	cp -r mock/tests "${BUILD_DIR}"/lib/mock/ || die
-	cd "${BUILD_DIR}"/lib || die
-
-	# https://github.com/testing-cabal/mock/commit/d6b42149bb87cf38729eef8a100c473f602ef7fa
-	if [[ ${EPYTHON} == pypy* ]]; then
-		sed -i -e 's:def test_copy:def _test_copy:' \
-			mock/tests/testmock.py || die
-	fi
-
-	# Avoid pytest dependency
-	sed -i -e '/import pytest/d' mock/tests/testhelpers.py || die
-
-	"${EPYTHON}" -m unittest discover -v || die "Tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	local DOCS=( CHANGELOG.rst README.rst )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/more-itertools/Manifest b/dev-python/more-itertools/Manifest
index 48344304bfcb..e83ed95fa51d 100644
--- a/dev-python/more-itertools/Manifest
+++ b/dev-python/more-itertools/Manifest
@@ -1,2 +1 @@
-DIST more-itertools-8.12.0.tar.gz 108698 BLAKE2B 2bc48aea5b8508381ac909a963d0fcbf08a17d2d96f17de1dd582bc8ced080be540322ee3f65c66eab1186d024bb2957e7bbddd62041242a7cc4cfff1ad67bc2 SHA512 73759f05d178bd6fe98cadac401707faf90a4f7b456c4aac3f0b3f6c13a2284600971e0b271f1768cacd3ae9b69848404f85432199ca51b8160fbe67045dfd17
 DIST more-itertools-8.13.0.tar.gz 101264 BLAKE2B 28c212e76f18081301c6d946e06112beb2a6a3fef3b99582d5ea98c2142e1e47b0f5300f441a4d206f5950120466212a9fde40eae53bce0098097063468f56f5 SHA512 2f3473cdd67ddcb2c658f60638b91a25c4ce9d9a92bbda5ca937dd4748857408bfe8dd9d4e699f53bd9f10d7b433db57e499bd28f184b8faa58b2004f2c92004
diff --git a/dev-python/more-itertools/more-itertools-8.12.0-r1.ebuild b/dev-python/more-itertools/more-itertools-8.12.0-r1.ebuild
deleted file mode 100644
index 1c131dcb9fa0..000000000000
--- a/dev-python/more-itertools/more-itertools-8.12.0-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
-EAPI=7
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="More routines for operating on iterables, beyond itertools"
-HOMEPAGE="https://pypi.org/project/more-itertools/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-distutils_enable_sphinx docs \
-	dev-python/sphinx_rtd_theme
-distutils_enable_tests unittest
-
-src_configure() {
-	grep -q '\[build-system\]' pyproject.toml &&
-		die "Upstream added [build-system] to pyproject.toml, recheck"
-	# write a custom pyproject.toml to ease setuptools bootstrap
-	cat > pyproject.toml <<-EOF || die
-		[build-system]
-		requires = ["flit_core >=3.2,<4"]
-		build-backend = "flit_core.buildapi"
-
-		[project]
-		name = "more_itertools"
-		version = "${PV}"
-		description = "More routines for operating on iterables, beyond itertools"
-	EOF
-}
diff --git a/dev-python/more-itertools/more-itertools-8.13.0.ebuild b/dev-python/more-itertools/more-itertools-8.13.0.ebuild
index dca758b066f6..7aa5034d172f 100644
--- a/dev-python/more-itertools/more-itertools-8.13.0.ebuild
+++ b/dev-python/more-itertools/more-itertools-8.13.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 distutils_enable_sphinx docs \
 	dev-python/sphinx_rtd_theme
diff --git a/dev-python/myst_parser/myst_parser-0.18.0.ebuild b/dev-python/myst_parser/myst_parser-0.18.0.ebuild
index 42696db8c03b..4e8457c62471 100644
--- a/dev-python/myst_parser/myst_parser-0.18.0.ebuild
+++ b/dev-python/myst_parser/myst_parser-0.18.0.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv"
 
 RDEPEND="
 	<dev-python/docutils-0.19[${PYTHON_USEDEP}]
diff --git a/dev-python/nose/nose-1.3.7_p20211111_p1-r1.ebuild b/dev-python/nose/nose-1.3.7_p20211111_p1-r1.ebuild
index 59b987ede74e..856aa8c7b7a4 100644
--- a/dev-python/nose/nose-1.3.7_p20211111_p1-r1.ebuild
+++ b/dev-python/nose/nose-1.3.7_p20211111_p1-r1.ebuild
@@ -24,7 +24,7 @@ S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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 ~loong ~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="examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/nose/nose-1.3.7_p20211111_p1.ebuild b/dev-python/nose/nose-1.3.7_p20211111_p1.ebuild
deleted file mode 100644
index f986fb0663d5..000000000000
--- a/dev-python/nose/nose-1.3.7_p20211111_p1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-inherit distutils-r1
-
-COMMIT="94fd6746619ee8728f2b8740ebf2d1582b03cb15"
-
-DESCRIPTION="Unittest extension with automatic test suite discovery and easy test authoring"
-HOMEPAGE="
-	https://pypi.org/project/nose/
-	https://nose.readthedocs.io/en/latest/
-	https://github.com/nose-devs/nose"
-SRC_URI="
-	https://github.com/arthurzam/nose/archive/${COMMIT}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/${PN}-${COMMIT}"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~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="examples test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	test? (
-		$(python_gen_cond_dep '
-			!hppa? ( dev-python/coverage[${PYTHON_USEDEP}] )
-		' python3_{8..10} pypy3)
-		$(python_gen_cond_dep '
-			dev-python/twisted[${PYTHON_USEDEP}]
-		' python3_{8..10})
-	)"
-
-src_prepare() {
-	# failing to find configuration file
-	sed -e 's/test_cover_options_config_file/_&/' \
-		-i unit_tests/test_cover_plugin.py || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	"${EPYTHON}" -m nose -v -a "!network" || die "Tests fail with ${EPYTHON}"
-}
-
-src_install() {
-	distutils-r1_src_install
-	use examples && dodoc -r examples
-}
diff --git a/dev-python/nspektr/Manifest b/dev-python/nspektr/Manifest
index 0bb0507f2ad8..4078f92f3a3a 100644
--- a/dev-python/nspektr/Manifest
+++ b/dev-python/nspektr/Manifest
@@ -1 +1,2 @@
 DIST nspektr-0.3.0.tar.gz 6314 BLAKE2B cb7b9b5b35a455d4e72e78d93db49b4f8e274c7d7a6c8bf7ccca52cce2598a937d31b76f1a30c4aa6d673e4ce52c4645ce7392965df35b0888d1c69226e08f00 SHA512 6fc22ad7858858f3b956ba5918ca92468f13d4b7db0e4861b836e63153f7e4319c6468e4f73969ce3fb7845ca8d97808b9db2eb2705a47fe1a8c4c19b9c2ef33
+DIST nspektr-0.4.0.gh.tar.gz 6763 BLAKE2B 6393a2d16825cbd580758ba09a7f2277417fc0eb4e7c6f23d49ff1af89a7c6947d4c0bae7158424b96f8f0e3e3aab6ac3f5bb624a8d7edf61eb571b28e690d70 SHA512 c106091e949ce8236c1cf54543bebd2b63484dff95e161fb57668bd6bcb4b17ddf0ecc440c15a0df36cc8c4398ccc439b642eab49b528ba2cbedc75ff009179d
diff --git a/dev-python/nspektr/nspektr-0.4.0.ebuild b/dev-python/nspektr/nspektr-0.4.0.ebuild
new file mode 100644
index 000000000000..847501b18e45
--- /dev/null
+++ b/dev-python/nspektr/nspektr-0.4.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
+EAPI=7
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Distribution package dependency inspector"
+HOMEPAGE="
+	https://github.com/jaraco/nspektr/
+	https://pypi.org/project/nspektr/
+"
+SRC_URI="
+	https://github.com/jaraco/nspektr/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="
+	>=dev-python/jaraco-context-4.1.1-r2[${PYTHON_USEDEP}]
+	>=dev-python/jaraco-functools-3.5.0-r2[${PYTHON_USEDEP}]
+	>=dev-python/more-itertools-8.12.0-r1[${PYTHON_USEDEP}]
+	>=dev-python/packaging-21.3-r2[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_metadata-4.11.2[${PYTHON_USEDEP}]
+	' 3.8 3.9)
+"
+
+distutils_enable_tests pytest
+
+src_configure() {
+	grep -q 'build-backend = "setuptools' pyproject.toml ||
+		die "Upstream changed build-backend, recheck"
+	# write a custom pyproject.toml to ease setuptools bootstrap
+	cat > pyproject.toml <<-EOF || die
+		[build-system]
+		requires = ["flit_core >=3.2,<4"]
+		build-backend = "flit_core.buildapi"
+
+		[project]
+		name = "nspektr"
+		version = "${PV}"
+		description = "package inspector"
+
+		# tests inspect itself
+		[project.optional-dependencies]
+		docs = [
+			"fake-nonexisting",
+		]
+		testing = [
+			"pytest",
+		]
+	EOF
+}
diff --git a/dev-python/numpydoc/Manifest b/dev-python/numpydoc/Manifest
index d6eb28d0c4bd..f58526425ca7 100644
--- a/dev-python/numpydoc/Manifest
+++ b/dev-python/numpydoc/Manifest
@@ -1 +1,2 @@
 DIST numpydoc-1.3.1.gh.tar.gz 70432 BLAKE2B bcf1214625671e89fcffedb7a90b1ef7f5993a43bff5e632e21bde647bb1b1ae1f4d21d4cf653622879121ea72c58486b78266d73b51d239243394b177b80078 SHA512 2b2ba50444765460d2df756c65893e59236bf3e47ab5980ed2279c0f3930bd841c68b2cb1438c3e25d0f2416fe4f2670dba9ebad4809c63a8db479fc8068916c
+DIST numpydoc-1.4.0.gh.tar.gz 70041 BLAKE2B 34df315b65a034da1bd4742dbbaef77164eaf16c8e56b0b941c6084bf32c0e116d7b4d9795d936380ea4a92ee73b31d61540ff87ed9c129c193f4ead211b47f2 SHA512 24a267149cd696bac552433cf64353aed6f0a3040127ff7cabc42dc0a44e8d7e0cc99d903a6554249c888ef7198adead5aba20c67b0af2e7c738a391e9a9ef02
diff --git a/dev-python/numpydoc/numpydoc-1.4.0.ebuild b/dev-python/numpydoc/numpydoc-1.4.0.ebuild
new file mode 100644
index 000000000000..f0a0d3662f18
--- /dev/null
+++ b/dev-python/numpydoc/numpydoc-1.4.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Sphinx extension to support docstrings in Numpy format"
+HOMEPAGE="
+	https://numpydoc.readthedocs.io/en/latest/
+	https://github.com/numpy/numpydoc/
+	https://pypi.org/project/numpydoc/
+"
+SRC_URI="
+	https://github.com/numpy/numpydoc/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	>=dev-python/jinja-2.10[${PYTHON_USEDEP}]
+	>=dev-python/sphinx-3[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		>=dev-python/matplotlib-3.2.1[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e 's:--cov-report= --cov=numpydoc::' setup.cfg || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# these require Internet (intersphinx)
+		numpydoc/tests/test_full.py::test_MyClass
+		numpydoc/tests/test_full.py::test_my_function
+	)
+	epytest --pyargs numpydoc
+}
diff --git a/dev-python/openapi-core/Manifest b/dev-python/openapi-core/Manifest
new file mode 100644
index 000000000000..3d8678cf8eea
--- /dev/null
+++ b/dev-python/openapi-core/Manifest
@@ -0,0 +1 @@
+DIST openapi-core-0.14.2.gh.tar.gz 57519 BLAKE2B 06dfd284612ca11a271f075444db9b859ca5416e31594680d6b32abec1fe917105f213209d1bfcb9664b265ea3d62839579134e8e104754075cd692d1ba7a99a SHA512 19a2508d56053214993abed7d173d17b55a80dac6421681d7c64082f910bf9cb03c99d4006a2cd883d51d54f11a18f90188f141a78b9d69a9a031c284a14f8f1
diff --git a/dev-python/openapi-core/metadata.xml b/dev-python/openapi-core/metadata.xml
new file mode 100644
index 000000000000..a0d4c5913ba0
--- /dev/null
+++ b/dev-python/openapi-core/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+  <email>python@gentoo.org</email>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+ <stabilize-allarches/>
+</pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/openapi-core/openapi-core-0.14.2.ebuild b/dev-python/openapi-core/openapi-core-0.14.2.ebuild
new file mode 100644
index 000000000000..e7a0d56d1c67
--- /dev/null
+++ b/dev-python/openapi-core/openapi-core-0.14.2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Client-side and server-side support for the OpenAPI Specification v3"
+HOMEPAGE="
+	https://github.com/p1c2u/openapi-core/
+	https://pypi.org/project/openapi-core/
+"
+SRC_URI="
+	https://github.com/p1c2u/openapi-core/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-python/isodate[${PYTHON_USEDEP}]
+	dev-python/dictpath[${PYTHON_USEDEP}]
+	dev-python/openapi-schema-validator[${PYTHON_USEDEP}]
+	dev-python/openapi-spec-validator[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/lazy-object-proxy[${PYTHON_USEDEP}]
+	dev-python/attrs[${PYTHON_USEDEP}]
+	dev-python/werkzeug[${PYTHON_USEDEP}]
+	dev-python/parse[${PYTHON_USEDEP}]
+	dev-python/more-itertools[${PYTHON_USEDEP}]
+"
+
+BDEPEND="test? (
+	dev-python/django[${PYTHON_USEDEP}]
+	dev-python/djangorestframework[${PYTHON_USEDEP}]
+	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/responses[${PYTHON_USEDEP}]
+	dev-python/webob[${PYTHON_USEDEP}]
+)"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# falcon not packaged
+	rm -r tests/integration/contrib/falcon || die
+
+	# Theses tests fail to collect
+	rm tests/integration/validation/test_security_override.py || die
+	rm tests/integration/validation/test_read_only_write_only.py || die
+
+	# There's a problem in the test suite here
+	rm tests/unit/unmarshalling/test_unmarshal.py || die
+	rm tests/integration/contrib/django/test_django_rest_framework_apiview.py || die
+
+	sed -i -e '/--cov/d' setup.cfg || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/phonenumbers/Manifest b/dev-python/phonenumbers/Manifest
index c6d3161d7e89..702d48ad2b0a 100644
--- a/dev-python/phonenumbers/Manifest
+++ b/dev-python/phonenumbers/Manifest
@@ -1,3 +1 @@
-DIST python-phonenumbers-8.12.47.gh.tar.gz 4899215 BLAKE2B 102caf51e4cb01140b43273b13a8ce44f51a3617fb48261f81e9d125475e34eafc6d8163e2baef861d0057d5f4f7e683b2934d4a15144277b203d69b12473819 SHA512 a7c24e469cd50b60ec9eb96dee6ef1540d90b20260c6ff6bf2eb8c0e6bf9c1e759d718de052805bb285135e2bd4927c469e901c811580a1cb4d6223757784b16
-DIST python-phonenumbers-8.12.48.gh.tar.gz 4899266 BLAKE2B 560af7966d06aaf116d2fcd3b0f7ecaddf9ce6d01b31f66461e54b9bf12fd724edb099352d5d7639491ad970ed94228deb1a648a3f7602b9a247cd97d4ec754c SHA512 d983ff0703c45517a3657f3beca63437a6d653ab34ee5124a6d7d2af31630472e985dfd28718b6730046460b7959d3733c39237fa861fe2c5ef30f5007e0eeae
 DIST python-phonenumbers-8.12.49.gh.tar.gz 4904202 BLAKE2B 20974162d5a8668c1d15021de71795983c4eda1f3afc931822b3593c80249481bcb4ea9f8b80066a71f7f2821284534991d3307eddea0e8f0270e75eced0573e SHA512 0504a84b3a6047c7ca4bc1667a0418d60c7f43052911751572820e7f4e40b430b8847e4c8f6e4d88dd7a2684b5ad8de2dfda8891d81fd8e1af1c595be152f9fc
diff --git a/dev-python/phonenumbers/phonenumbers-8.12.47.ebuild b/dev-python/phonenumbers/phonenumbers-8.12.47.ebuild
deleted file mode 100644
index 184fb765cb50..000000000000
--- a/dev-python/phonenumbers/phonenumbers-8.12.47.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1
-
-MY_P=python-${P}
-DESCRIPTION="Python port of Google's libphonenumber"
-HOMEPAGE="
-	https://github.com/daviddrysdale/python-phonenumbers/
-	https://pypi.org/project/phonenumbers/
-"
-SRC_URI="
-	https://github.com/daviddrysdale/python-phonenumbers/archive/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}/python
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	test? (
-		dev-python/protobuf-python[${PYTHON_USEDEP}]
-	)
-"
-
-DOCS=( ../README.md )
-
-python_test() {
-	"${EPYTHON}" testwrapper.py -v || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/phonenumbers/phonenumbers-8.12.48.ebuild b/dev-python/phonenumbers/phonenumbers-8.12.48.ebuild
deleted file mode 100644
index ec95c5a695a3..000000000000
--- a/dev-python/phonenumbers/phonenumbers-8.12.48.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1
-
-MY_P=python-${P}
-DESCRIPTION="Python port of Google's libphonenumber"
-HOMEPAGE="
-	https://github.com/daviddrysdale/python-phonenumbers/
-	https://pypi.org/project/phonenumbers/
-"
-SRC_URI="
-	https://github.com/daviddrysdale/python-phonenumbers/archive/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}/python
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	test? (
-		dev-python/protobuf-python[${PYTHON_USEDEP}]
-	)
-"
-
-DOCS=( ../README.md )
-
-python_test() {
-	"${EPYTHON}" testwrapper.py -v || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/phonenumbers/phonenumbers-8.12.49.ebuild b/dev-python/phonenumbers/phonenumbers-8.12.49.ebuild
index ec95c5a695a3..184fb765cb50 100644
--- a/dev-python/phonenumbers/phonenumbers-8.12.49.ebuild
+++ b/dev-python/phonenumbers/phonenumbers-8.12.49.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}/python
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pikepdf/Manifest b/dev-python/pikepdf/Manifest
index 2ccfaa521fc4..26b41d1ed22d 100644
--- a/dev-python/pikepdf/Manifest
+++ b/dev-python/pikepdf/Manifest
@@ -1,3 +1,4 @@
 DIST pikepdf-5.1.2.tar.gz 2355023 BLAKE2B 1186174a8375b63035157a65a23d62d2e52447719de8b0182a4d6892334eea52f140ce113415941e9f096716b5bc71d9c4967658428d87bd45a14e0a43b70caf SHA512 1b18c3ddb3826a1a74e82cf341a4ebeb5c98b587e148dbc6b479768cad14860700b39ebbcb421459f720bea63a4aa9ee4987f1c2cb944620e56c71193741a5ec
 DIST pikepdf-5.1.3.tar.gz 2356111 BLAKE2B 5a9ec1d06f91be44b4eacc68d7d9449a2bb74b59214ce3d1b10d3cdf81533d38450a2150834d0008cf81475e07e4de241ea16e438450dff6dadd5c15da533223 SHA512 d38a6203b9a4150e4daf4980517b72b0e8e797c57bd82009d6f95a1275c0e6f767e415e14fe6d1614bd51edaf660febafd0f0b85cc46482125aeced8f6912285
 DIST pikepdf-5.1.4.gh.tar.gz 2356865 BLAKE2B 7ebeedd7a2bb29371325b0cd6cb89cd56843eee1847cb26f0487d0114a3268e9a15171769abc16502c48684bb1bbe59050a2c692e17857f161ccd10a4663eeb0 SHA512 390c8f07bb5602715a061bf26b272cc8301dbb610ea06b8e5e5560282b7256c03e87717ab62a657c662ef51f549f5d52f0133f3806ff536451664ac93add625a
+DIST pikepdf-5.1.5.gh.tar.gz 2356890 BLAKE2B e08f311ad2714f856eb29510e847ca2ddf2b3919cc372d4bedb59c7449be69574a32ea6cd23f51c34d56096bb8d2936f70c52a6a948d513277ff2a5d13e35725 SHA512 e6da0471abdd2a8133fb5789f72eb948e32eae24ee61956fb71f5e279151bc6df5d18ac9b6d73987fd9b891739892111df8c5f93c90ba8ae022dbb2821858350
diff --git a/dev-python/pikepdf/pikepdf-5.1.5.ebuild b/dev-python/pikepdf/pikepdf-5.1.5.ebuild
new file mode 100644
index 000000000000..b2fdd139b01a
--- /dev/null
+++ b/dev-python/pikepdf/pikepdf-5.1.5.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+
+inherit distutils-r1
+
+MY_P=${P/_p/.post}
+DESCRIPTION="Python library to work with pdf files based on qpdf"
+HOMEPAGE="
+	https://github.com/pikepdf/pikepdf/
+	https://pypi.org/project/pikepdf/
+"
+SRC_URI="
+	https://github.com/${PN}/${PN}/archive/v${PV/_p/.post}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	>=app-text/qpdf-10.6.2:0=
+"
+RDEPEND="
+	${DEPEND}
+	>=dev-python/lxml-4.0[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	>=dev-python/pillow-9[${PYTHON_USEDEP}]
+	>=dev-python/pybind11-2.9.1[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/pybind11-2.9.1[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-6.4[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]
+	dev-python/tomli[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/attrs-20.2.0[${PYTHON_USEDEP}]
+		>=dev-python/hypothesis-5[${PYTHON_USEDEP}]
+		>=dev-python/pillow-5.0.0[${PYTHON_USEDEP},jpeg,lcms,tiff]
+		>=dev-python/psutil-5[${PYTHON_USEDEP}]
+		>=dev-python/pytest-6[${PYTHON_USEDEP}]
+		>=dev-python/pytest-timeout-1.4.2[${PYTHON_USEDEP}]
+		>=dev-python/python-dateutil-2.8.0[${PYTHON_USEDEP}]
+		>=dev-python/python-xmp-toolkit-2.0.1[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/-n auto/d' pyproject.toml || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/pivy/Manifest b/dev-python/pivy/Manifest
index 4c03580a9fd3..6ed1272ceb91 100644
--- a/dev-python/pivy/Manifest
+++ b/dev-python/pivy/Manifest
@@ -1 +1,2 @@
 DIST pivy-0.6.6.tar.gz 6618471 BLAKE2B 5bcf2479bf26628e3dfe59c1440901368442de2f32a5680ef1af10d49239d8c73b79809495d7227937fd7784af1e1ded27f93f0255793e713add0c1cc35b8e5d SHA512 e260c6abd0aede7621d5fed66eeceb98a32634af84370ef713d70d583ec017cded4be682fd7e70e5faa19988a5e032a9d2f2308b8ae6dd9495d76e884de1d80c
+DIST pivy-0.6.7.tar.gz 6618410 BLAKE2B 22ebe63a75fa624b772cb3d3ff6f03336258f6c8b638613413c19fcea072f83f73396bc91d35f0e06bc27ec57471ae67965ee492e62a7e73919f7827de645175 SHA512 606eac3527b5906ad6884c25775b5625bfd2a1b1c78f75017b05e662d622c75d30e70fd5785ec2145902f5a02d99098b52cc776aee12fab02f0319762ee104b0
diff --git a/dev-python/pivy/files/pivy-0.6.7-find-qmake.patch b/dev-python/pivy/files/pivy-0.6.7-find-qmake.patch
new file mode 100644
index 000000000000..6332afa97a3c
--- /dev/null
+++ b/dev-python/pivy/files/pivy-0.6.7-find-qmake.patch
@@ -0,0 +1,29 @@
+https://github.com/gentoo/gentoo/pull/25823#issuecomment-1150748775
+
+From 2d654ef2837f2ca934f636fc8a63de47a9d5853d Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Thu, 9 Jun 2022 18:26:29 +0200
+Subject: [PATCH] find qmake
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+--- a/qtinfo.py
++++ b/qtinfo.py
+@@ -7,7 +7,7 @@ class QtInfo(object):
+         if qmake_command:
+             self._qmake_command = qmake_command
+         else:
+-            self._qmake_command = [find_executable("qmake"),]
++            self._qmake_command = [find_executable("qmake5"),]
+         self._dict = {}
+         # bind all variables early at __init__ time.
+         for thing in self.__class__.__dict__:
+@@ -79,4 +79,4 @@ class QtInfo(object):
+     translations_dir = property(getTranslationsPath)
+     headers_dir = property(getHeadersPath)
+     docs_dir = property(getDocsPath)
+-    qml_dir = property(getQmlPath)
+\ No newline at end of file
++    qml_dir = property(getQmlPath)
+-- 
+2.35.1
+
diff --git a/dev-python/pivy/pivy-0.6.7.ebuild b/dev-python/pivy/pivy-0.6.7.ebuild
new file mode 100644
index 000000000000..76c74c211af8
--- /dev/null
+++ b/dev-python/pivy/pivy-0.6.7.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Coin3D bindings for Python"
+HOMEPAGE="https://github.com/coin3d/pivy"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	PIVY_REPO_URI="https://github.com/coin3d/pivy.git"
+else
+	SRC_URI="https://github.com/coin3d/pivy/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="ISC"
+SLOT="0"
+IUSE="+quarter soqt test"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	|| ( quarter soqt )
+"
+
+RDEPEND="
+	>=media-libs/coin-4.0.0
+	quarter? ( media-libs/quarter )
+	soqt? ( >=media-libs/SoQt-1.6.0 )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-lang/swig
+	dev-util/cmake
+	test? ( ${RDEPEND} )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.6.6-0001-fix-CMakeLists.txt-for-distutils_cmake.patch
+	"${FILESDIR}"/${PN}-0.6.6-0002-Gentoo-specific-clear-swig-deprecation-warning.patch
+	"${FILESDIR}"/${P}-find-qmake.patch
+)
+
+DOCS=( AUTHORS HACKING NEWS README.md THANKS )
+
+python_test() {
+	# visual_test.py is interactive
+	# pyside_test.py currently fails
+	# quarter_tests.py needs pyside2, which currently lacks py3_11 support
+	for f in tests/coin_tests.py; do
+		"${EPYTHON}" "${f}" || die "Test ${f} failed with ${EPYTHON}"
+	done
+}
diff --git a/dev-python/pluggy/pluggy-1.0.0-r1.ebuild b/dev-python/pluggy/pluggy-1.0.0-r1.ebuild
deleted file mode 100644
index ef7e93939ed3..000000000000
--- a/dev-python/pluggy/pluggy-1.0.0-r1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="plugin and hook calling mechanisms for python"
-HOMEPAGE="https://pluggy.readthedocs.io/ https://github.com/pytest-dev/pluggy https://pypi.org/project/pluggy/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pluggy/pluggy-1.0.0-r2.ebuild b/dev-python/pluggy/pluggy-1.0.0-r2.ebuild
index e226dc2bf04e..e5a9c57f819c 100644
--- a/dev-python/pluggy/pluggy-1.0.0-r2.ebuild
+++ b/dev-python/pluggy/pluggy-1.0.0-r2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
diff --git a/dev-python/pretend/pretend-1.0.9-r1.ebuild b/dev-python/pretend/pretend-1.0.9-r1.ebuild
deleted file mode 100644
index 49916c989916..000000000000
--- a/dev-python/pretend/pretend-1.0.9-r1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A library for stubbing in Python"
-HOMEPAGE="https://github.com/alex/pretend/ https://pypi.org/project/pretend/"
-SRC_URI="https://github.com/alex/pretend/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pretend/pretend-1.0.9-r2.ebuild b/dev-python/pretend/pretend-1.0.9-r2.ebuild
index ab334af09dd7..523928c14d99 100644
--- a/dev-python/pretend/pretend-1.0.9-r2.ebuild
+++ b/dev-python/pretend/pretend-1.0.9-r2.ebuild
@@ -20,6 +20,6 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 distutils_enable_tests pytest
diff --git a/dev-python/pytest-codeblocks/Manifest b/dev-python/pytest-codeblocks/Manifest
index 512bb993b050..09f700d40bb3 100644
--- a/dev-python/pytest-codeblocks/Manifest
+++ b/dev-python/pytest-codeblocks/Manifest
@@ -1,2 +1,3 @@
 DIST pytest-codeblocks-0.15.0.tar.gz 8559 BLAKE2B 0f8cf91d333e233e480353ab55283f9d97af17e5265f7a9e6db5c7cd98aaf6075b33a44e850aad21de5112fcc233fe7f65e23710f6b1804a85fd6269d042c406 SHA512 57d14aefc0cd49aa1b8fc54dfaec47965d4b1c867cad78ba9e8fd53da85898b7eac303ac402abe10b2d63d7621979bb8bad91f66f1e264568d56f4ff70488021
 DIST pytest-codeblocks-0.16.0.gh.tar.gz 8781 BLAKE2B f6146c78cc8b2bca88533e6a1f18a1abf7af6dc028dc07c37878656b29eb3dc5a838b64791587d9b2888fab00f5ccb2f3c392b7f8d80fbfe7576450e126b1cb3 SHA512 e841ed11c8cd8e73b888bdee3ceda82193e0ed0441d623c586c69c45412039656a09e9f872f187c72d4e245ac8ee99b4a099ed9ae1a13f88f564bc0b9fae69f6
+DIST pytest-codeblocks-0.16.1.gh.tar.gz 8900 BLAKE2B 1e884f445975c4c685e763560a8bb5516bd7213b09a8c967948347e455816766dccfd0984fb5746949f90afdf00e0fe21a52f41be65933532d8763ed6ea716a1 SHA512 4c3d91488550373832c8dd45b39873ae3810b423147b3b9524afc8e205605324092b4462b62acf2e34e70b5456795834cae511d9c9a06e08288a46cdb38b1778
diff --git a/dev-python/pytest-codeblocks/pytest-codeblocks-0.16.1.ebuild b/dev-python/pytest-codeblocks/pytest-codeblocks-0.16.1.ebuild
new file mode 100644
index 000000000000..5759a2c965d6
--- /dev/null
+++ b/dev-python/pytest-codeblocks/pytest-codeblocks-0.16.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 2019-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Extract code blocks from markdown"
+HOMEPAGE="
+	https://github.com/nschloe/pytest-codeblocks/
+	https://pypi.org/project/pytest_codeblocks/
+"
+SRC_URI="
+	https://github.com/nschloe/pytest-codeblocks/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/pytest-7.0.0[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	epytest -p pytester
+}
diff --git a/dev-python/pytest-datadir/pytest-datadir-1.3.1-r1.ebuild b/dev-python/pytest-datadir/pytest-datadir-1.3.1-r1.ebuild
index b2ead24e2927..7440cf7957cd 100644
--- a/dev-python/pytest-datadir/pytest-datadir-1.3.1-r1.ebuild
+++ b/dev-python/pytest-datadir/pytest-datadir-1.3.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~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/pytest[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/pytest-datadir/pytest-datadir-1.3.1.ebuild b/dev-python/pytest-datadir/pytest-datadir-1.3.1.ebuild
deleted file mode 100644
index f3151d1b61b8..000000000000
--- a/dev-python/pytest-datadir/pytest-datadir-1.3.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Pytest plugin for manipulating test data directories and files"
-HOMEPAGE="https://github.com/gabrielcnr/pytest-datadir"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="dev-python/pytest[${PYTHON_USEDEP}]"
-
-distutils_enable_tests --install pytest
-
-python_install_all() {
-	distutils-r1_python_install
-
-	# Do not install license to /usr
-	rm "${D}/usr/LICENSE" || die
-}
diff --git a/dev-python/pytest-forked/pytest-forked-1.4.0-r1.ebuild b/dev-python/pytest-forked/pytest-forked-1.4.0-r1.ebuild
index cdbb50ccd490..b097f59629d6 100644
--- a/dev-python/pytest-forked/pytest-forked-1.4.0-r1.ebuild
+++ b/dev-python/pytest-forked/pytest-forked-1.4.0-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 # Please do not RDEPEND on pytest; this package won't do anything
 # without pytest installed, and there is no reason to force older
diff --git a/dev-python/pytest-forked/pytest-forked-1.4.0.ebuild b/dev-python/pytest-forked/pytest-forked-1.4.0.ebuild
deleted file mode 100644
index c90850fc86b4..000000000000
--- a/dev-python/pytest-forked/pytest-forked-1.4.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="run tests in isolated forked subprocesses"
-HOMEPAGE="https://pypi.org/project/pytest-forked/ https://github.com/pytest-dev/pytest-forked"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-# Please do not RDEPEND on pytest; this package won't do anything
-# without pytest installed, and there is no reason to force older
-# implementations on pytest.
-RDEPEND="dev-python/py[${PYTHON_USEDEP}]"
-BDEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-python_test() {
-	distutils_install_for_testing
-	epytest -p no:flaky
-}
diff --git a/dev-python/pytest-xdist/pytest-xdist-2.5.0-r1.ebuild b/dev-python/pytest-xdist/pytest-xdist-2.5.0-r1.ebuild
index a13bed692773..f6721e0f3956 100644
--- a/dev-python/pytest-xdist/pytest-xdist-2.5.0-r1.ebuild
+++ b/dev-python/pytest-xdist/pytest-xdist-2.5.0-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	dev-python/execnet[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-xdist/pytest-xdist-2.5.0.ebuild b/dev-python/pytest-xdist/pytest-xdist-2.5.0.ebuild
deleted file mode 100644
index 2f3872412f5a..000000000000
--- a/dev-python/pytest-xdist/pytest-xdist-2.5.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Distributed testing and loop-on-failing modes"
-HOMEPAGE="https://pypi.org/project/pytest-xdist/ https://github.com/pytest-dev/pytest-xdist"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-# pytest-xdist >= 2 fails with pytest < 6
-RDEPEND="
-	dev-python/execnet[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	>=dev-python/pytest-6.2.0[${PYTHON_USEDEP}]
-	dev-python/pytest-forked[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/filelock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests --install pytest
-
-python_test() {
-	# disable autoloading plugins in nested pytest calls
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	# since we disabled autoloading, force loading necessary plugins
-	local -x PYTEST_PLUGINS=xdist.plugin,xdist.looponfail,pytest_forked
-
-	distutils_install_for_testing
-	epytest
-}
diff --git a/dev-python/python-nbxmpp/Manifest b/dev-python/python-nbxmpp/Manifest
index f5836bfda417..d905f3e01f67 100644
--- a/dev-python/python-nbxmpp/Manifest
+++ b/dev-python/python-nbxmpp/Manifest
@@ -1,4 +1,3 @@
 DIST python-nbxmpp-3.1.0.tar.bz2 128551 BLAKE2B bbff0bd92b12addb73e661136531df7629baa7936a1d52a86a17b59047681d30744dbc3618143a0b4ff5460bb64ad01a70b1bfb018f32bd78cfd9dc848f18668 SHA512 6676da4a21915305952118b9d35d91f3b420a23f1f3bc1fa22ee885face3f9b4474417f58e4a2c6446fec48ff632822ab83343e104df480d33d75f1b46cf8fec
 DIST python-nbxmpp-nbxmpp-2.0.6.tar.bz2 122203 BLAKE2B 925604002f4363f1e0b72f05c13742f4652ba565a9faa48faf8d47688f480a7f1d7585c593b0dcf07bded8c4aa3a1d02e9697742a07b9e815daec062dfb93104 SHA512 a536b25c8a6298892a51adef4b64b75ffab88ce02fb08fc07ecd1cfe2bc794262d4d58a93248439723e6e0544485da7351bb98189b0e422a1f77b01c6f6d238e
-DIST python-nbxmpp-nbxmpp-3.0.1.tar.bz2 125866 BLAKE2B 9338dc599a1a3ad1daa455877c5078a7dbd3b76f9914ca7f43b4defceb4f62dc84d77e9def7e08cd42d970d7e1461befb7208bde1c6db784de69c4bf92d3ada6 SHA512 3cf8de99f418b8f4e52b03147b305573e7fbaf79277f27b9b4b05f88686390d28cb8c3437c511d291cf677fdb96ac15589422b7395827b8a9f2298e15eb1a48b
 DIST python-nbxmpp-nbxmpp-3.0.2.tar.bz2 126796 BLAKE2B 1a9c42db9358ac0d453ee7ae88dcc35900e6a68b0d158a3491e99f748d792dc6047a24e605c9538128ed4e84447e341289cfd8384affe8b0bf1b9853a5325e08 SHA512 04759631960110c2d60be29cf00f93c8d0079a883f2011c27b35a9846203cefe8c0c42a90d93ee3283cd400fde0d5a5748f5b21b35b5328f5465e95a1e3ba861
diff --git a/dev-python/python-nbxmpp/python-nbxmpp-3.0.1.ebuild b/dev-python/python-nbxmpp/python-nbxmpp-3.0.1.ebuild
deleted file mode 100644
index dd07f83a5940..000000000000
--- a/dev-python/python-nbxmpp/python-nbxmpp-3.0.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1
-
-MY_P=python-nbxmpp-nbxmpp-${PV}
-DESCRIPTION="Python library to use Jabber/XMPP networks in a non-blocking way"
-HOMEPAGE="
-	https://dev.gajim.org/gajim/python-nbxmpp/
-	https://pypi.org/project/nbxmpp/
-"
-SRC_URI="
-	https://dev.gajim.org/gajim/python-nbxmpp/-/archive/nbxmpp-${PV}/${MY_P}.tar.bz2
-"
-S=${WORKDIR}/${MY_P}
-
-SLOT="0"
-LICENSE="GPL-3"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-
-RDEPEND="
-	dev-libs/gobject-introspection
-	net-libs/libsoup[introspection]
-	dev-python/idna[${PYTHON_USEDEP}]
-	dev-python/precis-i18n[${PYTHON_USEDEP}]
-	dev-python/pygobject[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests unittest
diff --git a/dev-python/python-nbxmpp/python-nbxmpp-3.0.2.ebuild b/dev-python/python-nbxmpp/python-nbxmpp-3.0.2.ebuild
index dd07f83a5940..40ac0f24ed69 100644
--- a/dev-python/python-nbxmpp/python-nbxmpp-3.0.2.ebuild
+++ b/dev-python/python-nbxmpp/python-nbxmpp-3.0.2.ebuild
@@ -21,7 +21,7 @@ S=${WORKDIR}/${MY_P}
 
 SLOT="0"
 LICENSE="GPL-3"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~riscv x86"
 
 RDEPEND="
 	dev-libs/gobject-introspection
diff --git a/dev-python/pyzmq/Manifest b/dev-python/pyzmq/Manifest
index 761935c79bdd..14f4823505b3 100644
--- a/dev-python/pyzmq/Manifest
+++ b/dev-python/pyzmq/Manifest
@@ -1,2 +1,3 @@
 DIST pyzmq-22.1.0.gh.tar.gz 401919 BLAKE2B ec43c62e68633a7e0ac06e7a717b6409e444dbd1347154c2a29a2dfb00916829656308122fa2cf0fc1e3013c82ba6bcc5e11b86582f95d46f43e9e81f6d8ff74 SHA512 aa135279927bff07339b99b4ebbc7d47effbfba7df99d3576088fe0e7d4a3ad44174a928e8b94afdeaf531c6a30cbb7bb88bce7fe19e7e5420b079ffb8e8690e
 DIST pyzmq-23.0.0.gh.tar.gz 399818 BLAKE2B ebd99acb5270f4ba2f851f3df9a7cb81f986730eba81d54c2c4bc55f24f98ebafdd7a24fcdce1dc5727a1e2e1ce57a9b52160800c6eb29c08bb9ee94450c5a83 SHA512 aaee7af933467daf56db660b84cf79972042aee6b2c9640c00e09e0d7c78cafe61346df567beb8eebadb4408c1887eb355beee04c4a6b1efa0d8dde8a4c82283
+DIST pyzmq-23.1.0.gh.tar.gz 401651 BLAKE2B 8e78f993bc7ee0212c6fa598d7993fc7b9cff8ebfa25ee833039d69214a00a6cf82ecb388ed6fb06caf8a63f7cea3be84aeaabf6f451f5889ef20943edcb9fab SHA512 06b71c641381f6efa57e1dc21864855694bf6a160ea388dc55da6092482257dcf776bd777edd318bd39d1462450e8c8873336cc0c1c5e15639f8f77ce7bff46f
diff --git a/dev-python/pyzmq/pyzmq-23.1.0.ebuild b/dev-python/pyzmq/pyzmq-23.1.0.ebuild
new file mode 100644
index 000000000000..1aebe04d93cb
--- /dev/null
+++ b/dev-python/pyzmq/pyzmq-23.1.0.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+# TODO: Find out exactly where this error comes from
+# error: '<' not supported between instances of 'str' and 'int'
+#DISTUTILS_USE_PEP517=setuptools
+PYTHON_REQ_USE="threads(+)"
+
+inherit flag-o-matic distutils-r1 toolchain-funcs
+
+DESCRIPTION="Lightweight and super-fast messaging library built on top of the ZeroMQ library"
+HOMEPAGE="
+	https://zeromq.org/languages/python/
+	https://pypi.org/project/pyzmq/
+	https://github.com/zeromq/pyzmq/"
+SRC_URI="
+	https://github.com/zeromq/pyzmq/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="+draft"
+
+DEPEND="
+	>=net-libs/zeromq-4.2.2-r2:=[drafts]
+"
+# it uses cffi backend for pypy, cython backend for cpython
+RDEPEND="${DEPEND}
+	$(python_gen_cond_dep '
+		dev-python/py[${PYTHON_USEDEP}]
+		dev-python/cffi:=[${PYTHON_USEDEP}]
+	' pypy3)
+"
+BDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/cython[${PYTHON_USEDEP}]
+	' 'python*')
+	test? (
+		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
+		>=www-servers/tornado-5.0.2[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs \
+	"dev-python/numpydoc"
+
+python_configure_all() {
+	tc-export CC
+	append-cppflags -DZMQ_BUILD_DRAFT_API=$(usex draft '1' '0')
+}
+
+python_compile() {
+	esetup.py cython --force
+	ZMQ_PREFIX="${EPREFIX}/usr" distutils-r1_python_compile
+}
+
+python_test() {
+	EPYTEST_DESELECT=(
+		# TODO
+		zmq/tests/test_constants.py::TestConstants::test_draft
+		zmq/tests/test_cython.py::test_cython
+
+		# hangs often
+		zmq/tests/test_log.py::TestPubLog::test_blank_root_topic
+	)
+	EPYTEST_IGNORE=(
+		zmq/tests/test_mypy.py
+	)
+
+	cd "${BUILD_DIR}/lib" || die
+	epytest
+}
diff --git a/dev-python/rq/rq-1.10.1-r1.ebuild b/dev-python/rq/rq-1.10.1-r1.ebuild
deleted file mode 100644
index 60568a10e8a4..000000000000
--- a/dev-python/rq/rq-1.10.1-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="simple, lightweight library for creating and processing background jobs"
-HOMEPAGE="https://python-rq.org https://github.com/rq/rq"
-SRC_URI="https://github.com/rq/rq/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
-
-RDEPEND="
-	>=dev-python/click-5.0[${PYTHON_USEDEP}]
-	>=dev-python/redis-py-3.5.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-db/redis
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/sentry-sdk[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests --install pytest
-
-src_test() {
-	local redis_pid="${T}"/redis.pid
-	local redis_port=6379
-	local redis_test_config="daemonize yes
-		pidfile ${redis_pid}
-		port ${redis_port}
-		bind 127.0.0.1
-	"
-
-	# Spawn Redis itself for testing purposes
-	# NOTE: On sam@'s machine, spawning Redis can hang in the sandbox.
-	# I'm not restricting tests yet because this doesn't happen for anyone else AFAICT.
-	einfo "Spawning Redis"
-	einfo "NOTE: Port ${redis_port} must be free"
-	/usr/sbin/redis-server - <<< "${redis_test_config}" || die
-
-	# Run the actual tests
-	distutils-r1_src_test
-
-	# Clean up afterwards
-	kill "$(<"${redis_pid}")" || die
-}
diff --git a/dev-python/rq/rq-1.10.1-r2.ebuild b/dev-python/rq/rq-1.10.1-r2.ebuild
index c10b3622d488..c8c681172ef6 100644
--- a/dev-python/rq/rq-1.10.1-r2.ebuild
+++ b/dev-python/rq/rq-1.10.1-r2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/rq/rq/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	>=dev-python/click-5.0[${PYTHON_USEDEP}]
diff --git a/dev-python/six/six-1.16.0-r1.ebuild b/dev-python/six/six-1.16.0-r1.ebuild
index a4ec5472afc4..9eaa29dd67ea 100644
--- a/dev-python/six/six-1.16.0-r1.ebuild
+++ b/dev-python/six/six-1.16.0-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~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"
 
 distutils_enable_sphinx documentation --no-autodoc
 distutils_enable_tests pytest
diff --git a/dev-python/six/six-1.16.0.ebuild b/dev-python/six/six-1.16.0.ebuild
deleted file mode 100644
index 6b5ee367352a..000000000000
--- a/dev-python/six/six-1.16.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python 2 and 3 compatibility library"
-HOMEPAGE="https://github.com/benjaminp/six https://pypi.org/project/six/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~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"
-
-distutils_enable_sphinx documentation --no-autodoc
-distutils_enable_tests pytest
-
-python_test() {
-	local deselect=()
-	[[ ${EPYTHON} == pypy3 ]] && deselect+=(
-		'test_six.py::test_move_items[dbm_ndbm]'
-	)
-
-	epytest ${deselect[@]/#/--deselect }
-}
diff --git a/dev-python/sortedcontainers/sortedcontainers-2.4.0-r1.ebuild b/dev-python/sortedcontainers/sortedcontainers-2.4.0-r1.ebuild
index be1744312611..90c547d30311 100644
--- a/dev-python/sortedcontainers/sortedcontainers-2.4.0-r1.ebuild
+++ b/dev-python/sortedcontainers/sortedcontainers-2.4.0-r1.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/sortedcontainers/sortedcontainers-2.4.0.ebuild b/dev-python/sortedcontainers/sortedcontainers-2.4.0.ebuild
deleted file mode 100644
index fe9aed506fc3..000000000000
--- a/dev-python/sortedcontainers/sortedcontainers-2.4.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-MY_P=python-${P}
-DESCRIPTION="Python library to sort collections and containers"
-HOMEPAGE="http://www.grantjenks.com/docs/sortedcontainers/
-	https://pypi.org/project/sortedcontainers/
-	https://github.com/grantjenks/python-sortedcontainers/"
-SRC_URI="
-	https://github.com/grantjenks/python-sortedcontainers/archive/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local -x PYTHONPATH=.
-	epytest --ignore docs/conf.py
-}
diff --git a/dev-python/sphinx-pytest/sphinx-pytest-0.0.3.ebuild b/dev-python/sphinx-pytest/sphinx-pytest-0.0.3.ebuild
index 1ab74ab942a0..cfacc801d924 100644
--- a/dev-python/sphinx-pytest/sphinx-pytest-0.0.3.ebuild
+++ b/dev-python/sphinx-pytest/sphinx-pytest-0.0.3.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv"
 
 RDEPEND="
 	dev-python/pytest[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinxcontrib-autoprogram/sphinxcontrib-autoprogram-0.1.7.ebuild b/dev-python/sphinxcontrib-autoprogram/sphinxcontrib-autoprogram-0.1.7.ebuild
index 8a91b5e517e4..7cf158c3545a 100644
--- a/dev-python/sphinxcontrib-autoprogram/sphinxcontrib-autoprogram-0.1.7.ebuild
+++ b/dev-python/sphinxcontrib-autoprogram/sphinxcontrib-autoprogram-0.1.7.ebuild
@@ -20,7 +20,9 @@ RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]
 "
 
-distutils_enable_sphinx doc dev-python/sphinxcontrib-websupport
+distutils_enable_sphinx doc \
+	dev-python/sphinxcontrib-websupport \
+	dev-python/sphinxcontrib-serializinghtml
 
 python_install_all() {
 	distutils-r1_python_install_all
diff --git a/dev-python/starlette/Manifest b/dev-python/starlette/Manifest
index aaf1f33c4d01..6a054111b580 100644
--- a/dev-python/starlette/Manifest
+++ b/dev-python/starlette/Manifest
@@ -2,3 +2,4 @@ DIST starlette-0.18.0.gh.tar.gz 408097 BLAKE2B ddc85690d9eb962a8d82544a1667d1731
 DIST starlette-0.20.0.gh.tar.gz 414497 BLAKE2B 47c6ef632a600bd18075c8ea65811ed18e08c285ed01cb34e5f74c00b2349430703ac041beacb35b91d941501001d2b93b79b777b403f5b6bef4682f6c13b02a SHA512 f28aff53732ec5950b2432ea644667d408e80cb4b51a177652a9bfe6731c6fa1208cba644fcaa84405bf51ef00f500a277c86e48f5446e2014369c1d1edda357
 DIST starlette-0.20.1.gh.tar.gz 416665 BLAKE2B 1b02f220dd6a8ebfdba405e3b9907030f006ec7ede43022fcef7911f5ac103da0eba16e7175e31e14529e64c711eac87b00c98534fbb18e784217ccca45f0c12 SHA512 4b10cf402bb3b3f96ec0bbb8e5fbd1e2abac4cbcf25a099bafad88fe02653d45e602e683f712251bb6dc230bc0d0754b2c960be2361239dc62e7e96b8b20ce6b
 DIST starlette-0.20.2.gh.tar.gz 417198 BLAKE2B 17ddd8fe5cd91e022fbe4f092a8bb731503294898dcddb2ac577a4f106f0e9db8901aaef01f6e07be082ba19636bdda799753e1f3a21d12e31454b29b5136fec SHA512 fb30c475779c4cf21cc43dc7e0aff58700c6356b692bc662edf93004054539ce80a97cb36e14636e33fa969b291f160cbf148b5aed749da197c13d4fec4eacda
+DIST starlette-0.20.3.gh.tar.gz 417054 BLAKE2B 5564026142cb45075aa3ea3fabbc3e0eb39d4e2d776c6577d79b9c28522befaa92869e5f4211bc77235f6d25102f8d90e3811c972b74bb295abd0d186e29ceef SHA512 fa7f8de299ee452a52bf43ff6c39851fc7985775e1938b38cb564d5cb19705a84fbb173229a090295bca3be87b71214fdf7c80e3db0f870cf018510e1bd06b1b
diff --git a/dev-python/starlette/starlette-0.20.3.ebuild b/dev-python/starlette/starlette-0.20.3.ebuild
new file mode 100644
index 000000000000..c427526ff72c
--- /dev/null
+++ b/dev-python/starlette/starlette-0.20.3.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="The little ASGI framework that shines"
+HOMEPAGE="
+	https://www.starlette.io/
+	https://github.com/encode/starlette/
+	https://pypi.org/project/starlette/
+"
+SRC_URI="
+	https://github.com/encode/starlette/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	<dev-python/anyio-5[${PYTHON_USEDEP}]
+	>=dev-python/anyio-3.4.0[${PYTHON_USEDEP}]
+	dev-python/itsdangerous[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	' 3.8 3.9)
+"
+# brotli needed for consistent test output
+BDEPEND="
+	test? (
+		|| (
+			dev-python/brotlicffi[${PYTHON_USEDEP}]
+			app-arch/brotli[python,${PYTHON_USEDEP}]
+		)
+		dev-python/trio[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_IGNORE=(
+	# Unpackaged 'databases' dependency
+	tests/test_database.py
+
+	# Unpackaged 'multipart' dependency
+	tests/test_formparsers.py
+)
+
+EPYTEST_DESELECT=(
+	# Unpackaged 'multipart' dependency
+	tests/test_requests.py::test_request_form_urlencoded
+)
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# fix accept-encoding, as new support was added with newer versions
+	sed -e '/accept-encoding/s/",/, br&/' -i tests/test_{websockets,requests}.py || die
+
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/toml/toml-0.10.2-r1.ebuild b/dev-python/toml/toml-0.10.2-r1.ebuild
index 07a4363e7981..4af62ecb485b 100644
--- a/dev-python/toml/toml-0.10.2-r1.ebuild
+++ b/dev-python/toml/toml-0.10.2-r1.ebuild
@@ -25,7 +25,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/toml/toml-0.10.2.ebuild b/dev-python/toml/toml-0.10.2.ebuild
deleted file mode 100644
index 6f1b3a2a523f..000000000000
--- a/dev-python/toml/toml-0.10.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# 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_{7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-TOML_TEST_VER="280497fa5f12e43d7233aed0d74e07ca61ef176b"
-
-DESCRIPTION="Python library for handling TOML files"
-HOMEPAGE="https://github.com/uiri/toml"
-SRC_URI="https://github.com/uiri/${PN}/archive/${PV}.tar.gz -> ${P}-1.tar.gz
-	test? ( https://github.com/BurntSushi/toml-test/archive/${TOML_TEST_VER}.tar.gz -> toml-test-${TOML_TEST_VER}.tar.gz )"
-IUSE="test"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
-
-BDEPEND="
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/numpy[${PYTHON_USEDEP}]
-		' python3_{7..9})
-	)"
-
-DOCS=( README.rst )
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	if use test; then
-		mv "${WORKDIR}/toml-test-${TOML_TEST_VER#v}" "${S}/toml-test" || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/translate-toolkit/Manifest b/dev-python/translate-toolkit/Manifest
index 864d1a4ec1f6..695c65c8f58a 100644
--- a/dev-python/translate-toolkit/Manifest
+++ b/dev-python/translate-toolkit/Manifest
@@ -1,3 +1 @@
-DIST translate-3.6.0.gh.tar.gz 1150765 BLAKE2B 0b69d21782d8d6b3ae322b480ad2205e577d87a3a9448f8a428f666d3d141063ad06f83eaa38f5d5903cc4263bbdcf261523fef57111c1ba705b640835c11416 SHA512 3ce371cb688dcfa656676fdc3ca920d76088fad67dbfb112511a0439250913e1f4587df681752bf1b288b9c4af3e4ebd11b8f8db51670f0fe14e9db68d7917f7
-DIST translate-3.6.1.gh.tar.gz 1151674 BLAKE2B df730fe08f0f52c41acec8429adfaae7691a2776032106acfa4f14dad65d38cf3e3ee5288b992f4aa481e12e6bb8ae42aedff9da007c5396df7a4d45d5a879cd SHA512 4fb433ce9b39a53ab0c9a809a5dc509a678f06907a6279835b077740a5b39991e42db372953c3c51d39d9a9e5754a3d6747a87b53b3594f2a93aac8760083078
 DIST translate-3.6.2.gh.tar.gz 1152569 BLAKE2B 44c9a5878a177b53d34e48d8b642f293ed475c90de8a530f53462384420b8afaaf107cb62c0cdd45e6d0633f53cd8eedb73dd0dcd81d6f876dc5389ba4230c94 SHA512 fb1fc2f6abb766814269d7051f571cbfb25ecd6b7267e2080e5ab0bb41338ace430a8bb01084abe176e2fd0a934cdf6492bf79f5e27c1f8ce99b021175efcec9
diff --git a/dev-python/translate-toolkit/translate-toolkit-3.6.0.ebuild b/dev-python/translate-toolkit/translate-toolkit-3.6.0.ebuild
deleted file mode 100644
index 7b2354445d2d..000000000000
--- a/dev-python/translate-toolkit/translate-toolkit-3.6.0.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,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"
-
-BDEPEND="
-	>=dev-python/six-1.11.0[${PYTHON_USEDEP}]
-"
-RDEPEND="${BDEPEND}
-	!dev-python/pydiff
-	app-text/iso-codes
-	>=dev-python/chardet-3.0.4[${PYTHON_USEDEP}]
-	dev-python/cheroot[${PYTHON_USEDEP}]
-	>=dev-python/lxml-4.3.1[${PYTHON_USEDEP}]
-	>=dev-python/pycountry-19.8.18[${PYTHON_USEDEP}]
-	>=dev-python/python-levenshtein-0.12.0[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-3[${PYTHON_USEDEP}]
-	dev-python/ruamel-yaml[${PYTHON_USEDEP}]
-	sys-devel/gettext
-	html? ( dev-python/utidylib[${PYTHON_USEDEP}] )
-	ical? ( dev-python/vobject[${PYTHON_USEDEP}] )
-	ini? ( >=dev-python/iniparse-0.5[${PYTHON_USEDEP}] )
-	subtitles? ( media-video/gaupol[${PYTHON_USEDEP}] )
-	yaml? ( dev-python/pyyaml[${PYTHON_USEDEP}] )
-"
-BDEPEND+="
-	test? ( dev-python/phply[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_sphinx docs \
-	dev-python/sphinx-bootstrap-theme
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}"/translate-toolkit-3.3.0-no-install-docs.patch
-)
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# Fails with network-sandbox (and even with it off but w/ softer fail)
-		'tests/xliff_conformance/test_xliff_conformance.py::test_open_office_to_xliff'
-		'tests/xliff_conformance/test_xliff_conformance.py::test_po_to_xliff'
-	)
-	local EPYTEST_IGNORE=(
-		# unpackaged fluent.*
-		translate/storage/test_fluent.py
-	)
-
-	if ! use ini; then
-		EPYTEST_IGNORE+=(
-			translate/convert/test_ini2po.py
-			translate/convert/test_po2ini.py
-		)
-	fi
-
-	if ! use subtitles; then
-		EPYTEST_IGNORE+=(
-			translate/storage/test_subtitles.py
-		)
-	fi
-
-	# translate/storage/test_mo.py needs 'pocompile'
-	distutils_install_for_testing
-	epytest
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if ! use html; then
-		rm "${ED}"/usr/bin/{html2po,po2html} || die
-	fi
-	if ! use ical; then
-		rm "${ED}"/usr/bin/{ical2po,po2ical} || die
-	fi
-	if ! use ini; then
-		rm "${ED}"/usr/bin/{ini2po,po2ini} || die
-	fi
-	if ! use subtitles; then
-		rm "${ED}"/usr/bin/{sub2po,po2sub} || die
-	fi
-
-	python_optimize
-}
diff --git a/dev-python/translate-toolkit/translate-toolkit-3.6.1.ebuild b/dev-python/translate-toolkit/translate-toolkit-3.6.1.ebuild
deleted file mode 100644
index 18599f013a77..000000000000
--- a/dev-python/translate-toolkit/translate-toolkit-3.6.1.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,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"
-
-BDEPEND="
-	>=dev-python/six-1.11.0[${PYTHON_USEDEP}]
-"
-RDEPEND="${BDEPEND}
-	!dev-python/pydiff
-	app-text/iso-codes
-	>=dev-python/chardet-3.0.4[${PYTHON_USEDEP}]
-	dev-python/cheroot[${PYTHON_USEDEP}]
-	>=dev-python/lxml-4.3.1[${PYTHON_USEDEP}]
-	>=dev-python/pycountry-19.8.18[${PYTHON_USEDEP}]
-	>=dev-python/python-levenshtein-0.12.0[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-3[${PYTHON_USEDEP}]
-	dev-python/ruamel-yaml[${PYTHON_USEDEP}]
-	sys-devel/gettext
-	html? ( dev-python/utidylib[${PYTHON_USEDEP}] )
-	ical? ( dev-python/vobject[${PYTHON_USEDEP}] )
-	ini? ( >=dev-python/iniparse-0.5[${PYTHON_USEDEP}] )
-	subtitles? ( media-video/gaupol[${PYTHON_USEDEP}] )
-	yaml? ( dev-python/pyyaml[${PYTHON_USEDEP}] )
-"
-BDEPEND+="
-	test? ( dev-python/phply[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_sphinx docs \
-	dev-python/sphinx-bootstrap-theme
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}"/translate-toolkit-3.3.0-no-install-docs.patch
-)
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# Fails with network-sandbox (and even with it off but w/ softer fail)
-		'tests/xliff_conformance/test_xliff_conformance.py::test_open_office_to_xliff'
-		'tests/xliff_conformance/test_xliff_conformance.py::test_po_to_xliff'
-	)
-	local EPYTEST_IGNORE=(
-		# unpackaged fluent.*
-		translate/storage/test_fluent.py
-	)
-
-	if ! use ini; then
-		EPYTEST_IGNORE+=(
-			translate/convert/test_ini2po.py
-			translate/convert/test_po2ini.py
-		)
-	fi
-
-	if ! use subtitles; then
-		EPYTEST_IGNORE+=(
-			translate/storage/test_subtitles.py
-		)
-	fi
-
-	# translate/storage/test_mo.py needs 'pocompile'
-	distutils_install_for_testing
-	epytest
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if ! use html; then
-		rm "${ED}"/usr/bin/{html2po,po2html} || die
-	fi
-	if ! use ical; then
-		rm "${ED}"/usr/bin/{ical2po,po2ical} || die
-	fi
-	if ! use ini; then
-		rm "${ED}"/usr/bin/{ini2po,po2ini} || die
-	fi
-	if ! use subtitles; then
-		rm "${ED}"/usr/bin/{sub2po,po2sub} || die
-	fi
-
-	python_optimize
-}
diff --git a/dev-python/translate-toolkit/translate-toolkit-3.6.2.ebuild b/dev-python/translate-toolkit/translate-toolkit-3.6.2.ebuild
index f48fa83e53af..18ec944883b0 100644
--- a/dev-python/translate-toolkit/translate-toolkit-3.6.2.ebuild
+++ b/dev-python/translate-toolkit/translate-toolkit-3.6.2.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="+html +ical +ini +subtitles +yaml"
 
 BDEPEND="
diff --git a/dev-python/ubelt/Manifest b/dev-python/ubelt/Manifest
index bdf228c9bd92..838a925fd567 100644
--- a/dev-python/ubelt/Manifest
+++ b/dev-python/ubelt/Manifest
@@ -1,2 +1,3 @@
 DIST ubelt-1.0.1.tar.gz 242552 BLAKE2B da4ceb039b926f942c593563e77b42ebfb39a75bfc2953a6eadf2430bda8ebe25faeb4a00714fc110486715da15515fa316d3705d9853a7eb93320ee694d1127 SHA512 150f1c76b5814441fe0bfd50017f37ede4d463cc4e23f152ac634e7531d83f28560415ad26527cd40a7ebdab546d7edd711a1ba0c728ef63791219bf4866099c
 DIST ubelt-1.1.0.gh.tar.gz 259127 BLAKE2B 064b106d5f03b106828079e024c3845ed55077f6bc4a69be4a7d05aa803b172104f2271626c9ab287b7b225711eb6490b49f0fa69f24729899e62a094069de16 SHA512 5a256f91d70ff218e595b852de11080f31ddd8ba29cc67a4a38f4c85ae69c0bda23c494d117926290901c5e6267b2d5eb2fc440951e0b598cca23cca6bf45c79
+DIST ubelt-1.1.1.gh.tar.gz 263082 BLAKE2B c146cfa7084b1d04d5a16443e5f8bdd4858992c2de1ff68a28c0febc74728da6320f45661cea69f88530a2fb88ca421cfc103f7f9f6ff420cf65152cbd61576d SHA512 d4d77013920563f3b2e5f47365624a4a794d84047eeb2eccaf2888f8d574c38b047393e550399e0d7ea7df373dabd40acce05ac56db4f0099da8f2a39113fc5c
diff --git a/dev-python/ubelt/ubelt-1.1.1.ebuild b/dev-python/ubelt/ubelt-1.1.1.ebuild
new file mode 100644
index 000000000000..941b2652076d
--- /dev/null
+++ b/dev-python/ubelt/ubelt-1.1.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="A stdlib like feel, and extra batteries. Hashing, Caching, Timing, Progress"
+HOMEPAGE="
+	https://github.com/Erotemic/ubelt/
+	https://pypi.org/project/ubelt/
+"
+SRC_URI="
+	https://github.com/Erotemic/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+SLOT="0"
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	test? (
+		>=dev-python/numpy-1.19.2[${PYTHON_USEDEP}]
+		>=dev-python/pygments-2.2.0[${PYTHON_USEDEP}]
+		>=dev-python/python-dateutil-2.8.1[${PYTHON_USEDEP}]
+		dev-python/xdoctest[${PYTHON_USEDEP}]
+		>=dev-python/xxhash-1.0.1[${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/unittest-mixins/metadata.xml b/dev-python/unittest-mixins/metadata.xml
index 853174b8f2ab..ea8988e8af6a 100644
--- a/dev-python/unittest-mixins/metadata.xml
+++ b/dev-python/unittest-mixins/metadata.xml
@@ -7,4 +7,5 @@
  </maintainer>
  
  <origin>gentoo-staging</origin>
+ <stabilize-allarches/>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/unittest-mixins/unittest-mixins-1.6-r1.ebuild b/dev-python/unittest-mixins/unittest-mixins-1.6-r1.ebuild
deleted file mode 100644
index c9c35c149746..000000000000
--- a/dev-python/unittest-mixins/unittest-mixins-1.6-r1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A set of mixin classes and other helpers for unittest test case classes"
-HOMEPAGE="https://github.com/nedbat/unittest-mixins https://pypi.org/project/unittest-mixins/"
-SRC_URI="https://github.com/nedbat/unittest-mixins/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND=">=dev-python/six-1.10.0[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
diff --git a/dev-python/unittest-mixins/unittest-mixins-1.6-r2.ebuild b/dev-python/unittest-mixins/unittest-mixins-1.6-r2.ebuild
index f3ef1e0337ed..36d26314002e 100644
--- a/dev-python/unittest-mixins/unittest-mixins-1.6-r2.ebuild
+++ b/dev-python/unittest-mixins/unittest-mixins-1.6-r2.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
diff --git a/dev-python/xmltodict/Manifest b/dev-python/xmltodict/Manifest
index 2bca56b29a77..6922b2c24b8c 100644
--- a/dev-python/xmltodict/Manifest
+++ b/dev-python/xmltodict/Manifest
@@ -1,2 +1 @@
-DIST xmltodict-0.12.0.tar.gz 18481 BLAKE2B f7b7b71a6eaacc833a54369be38aa988b5c27845b19001c1d13e955df1f3a26c04dd2a1b45f0c0e704c4df6f4d380abdda7189944cc45b001eeef55405c43299 SHA512 1ec3de3ebd05adbe032ca569a71048e72097c0f5fc864b63f168d661f72d13d0981e6e62bb9ca2ffe925a3b2f7c2fb90a44177427d4bdf68137842342a9cd2c8
 DIST xmltodict-0.13.0.tar.gz 33813 BLAKE2B 54fd4532323d8682e81e8db9ec811c772aa1b772ee5a9fa2debb93030a44a165e282901a445f76c8a477626b151ec9ed210f1e790bd9426b5f071c9a4ad60bdf SHA512 fea256017e9806074f0b1dbece393a6e90cdb045842970015daeef2c035d210b3333196a57635192f889b1d2e570731707f7725e020c678db34f590f8c9ad400
diff --git a/dev-python/xmltodict/metadata.xml b/dev-python/xmltodict/metadata.xml
index 853174b8f2ab..ea8988e8af6a 100644
--- a/dev-python/xmltodict/metadata.xml
+++ b/dev-python/xmltodict/metadata.xml
@@ -7,4 +7,5 @@
  </maintainer>
  
  <origin>gentoo-staging</origin>
+ <stabilize-allarches/>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/xmltodict/xmltodict-0.12.0-r1.ebuild b/dev-python/xmltodict/xmltodict-0.12.0-r1.ebuild
deleted file mode 100644
index e4482a6ae563..000000000000
--- a/dev-python/xmltodict/xmltodict-0.12.0-r1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Makes working with XML feel like you are working with JSON"
-HOMEPAGE="https://github.com/martinblech/xmltodict/ https://pypi.org/project/xmltodict/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
-
-distutils_enable_tests nose
diff --git a/dev-python/xmltodict/xmltodict-0.13.0-r1.ebuild b/dev-python/xmltodict/xmltodict-0.13.0-r1.ebuild
index 5c77ea02f7bc..2543407e01c8 100644
--- a/dev-python/xmltodict/xmltodict-0.13.0-r1.ebuild
+++ b/dev-python/xmltodict/xmltodict-0.13.0-r1.ebuild
@@ -15,6 +15,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/xmltodict/xmltodict-0.13.0.ebuild b/dev-python/xmltodict/xmltodict-0.13.0.ebuild
deleted file mode 100644
index 9f12ab571576..000000000000
--- a/dev-python/xmltodict/xmltodict-0.13.0.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Makes working with XML feel like you are working with JSON"
-HOMEPAGE="https://github.com/martinblech/xmltodict/
-	https://pypi.org/project/xmltodict/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-distutils_enable_tests nose