gentoo auto-resync : 07:08:2022 - 14:12:00

26 files changed, 689 insertions, 39 deletions

diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 71471060c014..55623347e142 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/anyqt/Manifest b/dev-python/anyqt/Manifest
index a2fa6351c8cb..a0da552d355d 100644
--- a/dev-python/anyqt/Manifest
+++ b/dev-python/anyqt/Manifest
@@ -1,3 +1,5 @@
 DIST anyqt-0.1.1.gh.tar.gz 54461 BLAKE2B ec78ecf5d326412b953f95379203bc81c92f13ad7b11e44630cf43062a08b9cfa8436b7c18ef6762d43968c87cebc0eadb33b1cecd159c3278e65538cfb80967 SHA512 5e3f6784fe3826b3017365945bc7053a58c4d7db5745c664fa845780212bf89db2b136459afe90df00d63d1507b56fa5b4a579526d9a9f4169943e5d52e230c4
+DIST anyqt-0.2.0.gh.tar.gz 57920 BLAKE2B b8fcf98706a2f1e8a0553044223fb5b46f471ca4a91436e828507d031c39d20cb4f3f9d556785d0614cc43b02b3134990606f51e002e238674144d9b94ca8528 SHA512 78162ca2758c1fee83b357c1dfe316499e74f9aa918f0bde40b94eb33f9f2b113b38c2883a21612a5455949fe9bb79f2f6c5a70fd4a0b64147eb4a88a94d9d1c
 EBUILD anyqt-0.1.1.ebuild 1131 BLAKE2B 55597d93bea192f212e3581105cf0fcb7535ba0a4b0a67bde02b48fc1f16c883c4066be43e3e09fb3d267809ed7d86b87777d3d4cef3a16319d03bce81b638e0 SHA512 00a6dac4d70f251545103d16bdc7f881fb74787f952edd31f503ded446176b0e26efa05d11110018895f8492298e661c91e6709ffb42db6bc911da83d66a6243
+EBUILD anyqt-0.2.0.ebuild 1131 BLAKE2B 55597d93bea192f212e3581105cf0fcb7535ba0a4b0a67bde02b48fc1f16c883c4066be43e3e09fb3d267809ed7d86b87777d3d4cef3a16319d03bce81b638e0 SHA512 00a6dac4d70f251545103d16bdc7f881fb74787f952edd31f503ded446176b0e26efa05d11110018895f8492298e661c91e6709ffb42db6bc911da83d66a6243
 MISC metadata.xml 286 BLAKE2B 0498e01030909d49b890a4174b0b198548a3cb324b4c85e3cb29108004bcfb71adf01ca64be576bd5a1ac9b36a09a6b600d799e6a0c29152018b4519f18f567b SHA512 0797b1c07ad778e31012eb93070599ddfd687dedf0a073f463c950dd1c213d417708d0a95b26dbf07d4aa11c66c24a22891d285896d87bc2a29728519e5f2cf2
diff --git a/dev-python/anyqt/anyqt-0.2.0.ebuild b/dev-python/anyqt/anyqt-0.2.0.ebuild
new file mode 100644
index 000000000000..66988862ec73
--- /dev/null
+++ b/dev-python/anyqt/anyqt-0.2.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="PyQt4/PyQt5 compatibility layer"
+HOMEPAGE="
+	https://github.com/ales-erjavec/anyqt/
+	https://pypi.org/project/AnyQt/
+"
+SRC_URI="
+	https://github.com/ales-erjavec/anyqt/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	|| (
+		dev-python/pyside2[${PYTHON_USEDEP}]
+		dev-python/PyQt5[${PYTHON_USEDEP}]
+	)
+"
+BDEPEND="
+	test? (
+		dev-python/pyside2[${PYTHON_USEDEP}]
+		dev-python/PyQt5[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	local -x QT_API
+	# plugins may preload Qt modules
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	for QT_API in pyqt5 pyside2; do
+		local EPYTEST_IGNORE=()
+		[[ ${QT_API} == pyside2 ]] && EPYTEST_IGNORE+=(
+			tests/test_qaction_set_menu.py
+		)
+
+		einfo "Testing ${QT_API}"
+		nonfatal epytest tests ||
+			die "Tests failed with ${EPYTHON} / ${QT_API}"
+	done
+}
diff --git a/dev-python/coverage/Manifest b/dev-python/coverage/Manifest
index 6843497b0322..22b59ca11e41 100644
--- a/dev-python/coverage/Manifest
+++ b/dev-python/coverage/Manifest
@@ -1,5 +1,7 @@
 DIST coverage-6.4.1.tar.gz 719971 BLAKE2B 047c57ffae092a9e04470a64d090ee7c3274c5ab60dd69d67c8151e85954b5cf2c34748f2e2641ac8229ed66a238e994d93b17f7ac4c92bce3eb919a5b7f1795 SHA512 d7b40bae4fee36c71befb490ee3341b023c0bff38ed2c97cf57a65e47be44b71685b130879640b1c8560359dbc31b0da523f5c363f3544ff666b804c7af122f0
 DIST coverage-6.4.2.tar.gz 721847 BLAKE2B d4a36a4a8e6f70654be0b9f6c0a660419d31087ed6e05208e60f2919b6d46c1cff39c0d9db7aabb214d212b3b7ed325a862e2471735bf411b7b81f6d50debe79 SHA512 10254089ee51d09928831b01b5b6f30a9077ed0ee08594312dab5a3804be1539533d9cec7381dc2a4332471681d75a5b0cd6e3dec6d67e47906b7ae820b8aed3
+DIST coverage-6.4.3.tar.gz 722764 BLAKE2B f4d45aa9f0494bfe43e244907bda14e4a99bce7d4cdc4f6610abed3a2600a6f836dccd6c4c795f6bf0f8eeab2ab3df4f0ddc3f9e2d1285d57415f9bc06b47635 SHA512 7ff93dfb58f9d00a9016c86cc4425932c6dfc700954e5174b6a39c23900915f3dc1c5951a60d4ccb2155d82e2c552c07894670440dc17574e0ef5e0ba7bb4a81
 EBUILD coverage-6.4.1.ebuild 1678 BLAKE2B c7e457ab2b0d46e6550793f295ee6294b70f099aa0c6be6a3a3a8505cfd8dc8dce1270b550dd6a73c838d4aaea0c99d20c12c6fdab32bc05e62e45c902df6275 SHA512 a9a31b2d0883fb30bf389104f9d884313bb6906bc71f8093931021f7c9c5e441304ae536a33c2948c5df69a45532dad6ff9c531533ff23511853901d7d8ec224
 EBUILD coverage-6.4.2.ebuild 1686 BLAKE2B 433e48ff442b0b5523eb1bcc841e54baaa77704328ec322fbf2431b3e249022cce2007cca81b5e074024c83b5382eeb934543a38d1be54b1aa4b840a13be64dd SHA512 a339c3326b111097b5812beaf12da90ba021ea9bb2dff68f97754af3ca4e21d28de607445441709180a3d14c847bc8021bfab657f79b310f2d5b7745b564ce2b
+EBUILD coverage-6.4.3.ebuild 1686 BLAKE2B 433e48ff442b0b5523eb1bcc841e54baaa77704328ec322fbf2431b3e249022cce2007cca81b5e074024c83b5382eeb934543a38d1be54b1aa4b840a13be64dd SHA512 a339c3326b111097b5812beaf12da90ba021ea9bb2dff68f97754af3ca4e21d28de607445441709180a3d14c847bc8021bfab657f79b310f2d5b7745b564ce2b
 MISC metadata.xml 714 BLAKE2B c0d2641f795a21a80b6fa36206973f41421effe055e4c5e41bf752869759eb48e8fe42a0ab00af55b5d5111bfaccd330676d63e263013dc9bd3c344cb038a3a6 SHA512 412d70b7c9c2871bb93ae6ed6ae110a9f29c26957f6e1b24cc531c7d49f292ecb5206df10b409f2e44d2f814b119ef4ed973bca608df999026bda8df2156df24
diff --git a/dev-python/coverage/coverage-6.4.3.ebuild b/dev-python/coverage/coverage-6.4.3.ebuild
new file mode 100644
index 000000000000..8a27c2c95f30
--- /dev/null
+++ b/dev-python/coverage/coverage-6.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
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+PYTHON_REQ_USE="threads(+),sqlite(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Code coverage measurement for Python"
+HOMEPAGE="
+	https://coverage.readthedocs.io/en/latest/
+	https://github.com/nedbat/coveragepy/
+	https://pypi.org/project/coverage/
+"
+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"
+
+BDEPEND="
+	test? (
+		dev-python/flaky[${PYTHON_USEDEP}]
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		>=dev-python/unittest-mixins-1.4[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/^addopts/s:-q -n auto::' setup.cfg || die
+	distutils-r1_src_prepare
+}
+
+test_tracer() {
+	local -x COVERAGE_TEST_TRACER=${1}
+	einfo "  Testing with the ${COVERAGE_TEST_TRACER} tracer ..."
+	epytest tests
+}
+
+python_test() {
+	"${EPYTHON}" igor.py zip_mods || die
+
+	local -x COVERAGE_TESTING=True
+	# TODO: figure out why they can't be imported inside test env
+	local -x COVERAGE_NO_CONTRACTS=1
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=_hypothesis_pytestplugin,flaky.flaky_pytest_plugin,xdist.plugin
+
+	local prev_opt=$(shopt -p nullglob)
+	shopt -s nullglob
+	local c_ext=( "${BUILD_DIR}/install$(python_get_sitedir)"/coverage/*.so )
+	${prev_opt}
+
+	if [[ -n ${c_ext} ]]; then
+		cp "${c_ext}" \
+			coverage/ || die
+		test_tracer c
+		rm coverage/*.so || die
+	else
+		test_tracer py
+	fi
+}
diff --git a/dev-python/django/Manifest b/dev-python/django/Manifest
index 44486b31e4e1..55f287b86ddc 100644
--- a/dev-python/django/Manifest
+++ b/dev-python/django/Manifest
@@ -1,10 +1,14 @@
 AUX django-3.1-bashcomp.patch 2085 BLAKE2B 36a0aa4d3413f13089ac104f5d3f98ecbb152a9a5a35f8c1ff2e5ffc9824153b0ac89f1cbca76c31a1afefde471e4d6ed801e405551b25cb31da89c20f3019cc SHA512 82dceede4292bad6e3e4966a6dba01bd2bbc7db494fce592e25dc4a64236485d88d8ad67b247239a80f8fe96dff054d20afea6f48a5518b67cf88404d399e61c
 AUX django-4.0-bashcomp.patch 2021 BLAKE2B f04c83b500a92ea8ef9609225191e38a41b3349a295beca8f8575ab05395d0cf37e1aefe295004b11c1bcf34cce9074ac7d274034cb50e1ae43e2fcb5d6952b2 SHA512 2215dca4120023b0fd839738bd602443c49e9adaa98d182bc74081ebe70613649c2dc11e2b5f6242701dceac25755adb8605774895091360b56ed1195a7e629e
 AUX django-4.0.5-py311.patch 9279 BLAKE2B 3082f4f9da3f127807402a55655b059019787143dd8c2cb14b1a27d2fbf66464179c2f08381284340fccb4e6bc1c25a1e36291a0dd8cbd83c754ee1f78d220b8 SHA512 d48f29fa5fe9e434a4220825d1592a03a0667d956db4e6c4119e74f91524b8d02b295a5a600516a993adc2dd3e1f5ca4bde83acd8a6a8e0838382116d2703a28
+AUX django-4.1-test.patch 1683 BLAKE2B b332eeea0a5aae5a4b8f3d9baf464928e68ddf63d7ca4375e0f30f4ee1a6b54427826b9d81c9a3533b1cad26d75eabd442855f8fac8fcc6e5eb96a70369c891f SHA512 a73210312f62afa90db63e168b97cf1fad97e085e716dd12b64f4b83ded3c70e684d21aced3c7a8b6274ad3dec576c88dc6678677b43446468401deda4f6f054
 DIST Django-3.2.15.checksum.txt 2560 BLAKE2B 35a4f28005a07cee0b667ec55838d846cb7f1970be41ce08f2191992b1247263f7632bb9dcaa3d20f9df4e050b370416a2a9af6f0e5cc3523484016161a7a47e SHA512 b3d00d18e14be7dec77901ddd8818b41e2b592dbafb2c66b314478f0b2ac0f8486ce41a73a71da9bed4d9ad92a6d6bf21765ede79055c1fb2a9972e3f16cfac7
 DIST Django-3.2.15.tar.gz 9833828 BLAKE2B 4b914b1e3c192340d9a1bbd68b7d3bf3d1c1b3f41da6e4a67149e811a2312f646e2ced83af23ae035cf590e526dad00537aa5b4aee14a657f6952675eca94b30 SHA512 fccdad52d39c8757972d5e987b94b13d8ce5ce08ad480ef79407b0d9b88cff69336770409cbe18ce9529bf10966ad63105a0b0f1ffe39b681a41be3718ec886b
 DIST Django-4.0.7.checksum.txt 2551 BLAKE2B 6fa44707d33af485d3c55096dcc650b4e2384421c57c30cedee9f9577488783836a3ad8261dceaf5c718c1a5fcbe5852b081596525b22639c310c9aa6e86c639 SHA512 4b2453be8090c2a9d48bbe34f6e5dd55859b9debc3a116519c69da39d04ecca202e6da62ae9114790a9da8c55cfcfe176a972bb25576305a8e23736e2e063e3e
 DIST Django-4.0.7.tar.gz 10407810 BLAKE2B 77c994d042ace329699aa33e14098cbcd4f24fa4db880dd78ed87828b02c25298a1c1664511547de53eb80ebade7bdfb16412a615027e512ded437ae7de79b54 SHA512 51574ab7423a3948318a5985f74bd781269bf1c95dc77838c11e8f9d5e9233f0a3be5dfa4798d523473b9f1fd3196d4c10284e3a28d9543084b2a63179167731
+DIST Django-4.1.checksum.txt 2533 BLAKE2B 263c3719c572347cb5d2087b960a47f0e6ac409a94499cd5ee8ec619c3388d29354c10813d4b3d2a0d6bd73ca52f562a6ae89a3d9340d5ea478a80cc30284467 SHA512 96d0a66c40261530d65bdde34ba1fc2e650690821b0f52900d60ab85162debc64e33e089f90e2b106235fc47581a54dc6432968534837c1a71a887b40fdd4f36
+DIST Django-4.1.tar.gz 10484595 BLAKE2B 29a833330862abcf69bf082af6df08986443d34abfe821bd307fba6ddd73dd00be7ae8d3e809fe97db0b22f9062daa760cbe01da8d773e1528f583938959f775 SHA512 f0f7e627b3c474c886cb2476f900222d2623e1ed1da1ac6b23ac618ff49e330edc2efd47b275cb02b8bcb254126bf3c926462c616bb0abee1cd433715f5184da
 EBUILD django-3.2.15.ebuild 3050 BLAKE2B da552703a81abf12dc9f104268237438fcc8b9003a9d4789706ee2c812799aef24e4476039cd64bb65c7821f844138e22220006ea14c1475cf3d1705babc6298 SHA512 59e9aa4a66d7b804578fab30b0db04ad2f07d482c07260bfdec986c921d321e4a79b03c046b877a2ffb7d0bc204f0799d4f2557abdc01560879db2c75d68f536
 EBUILD django-4.0.7.ebuild 3014 BLAKE2B b7cf6af18b777fe0953f5b8d86f973052f91deebb13b4098389501492fa0154a219a92f73f4c7d4f7837f213b3d577dc8019adc45f166c7168d35e7c86d8263b SHA512 4fadb585365955d6d3e9fabbc0657b35435266bb27fd1515712f91844e21fd5adf6a24c42b02ec6e58c031c40fc9909cb4f25f610acdc752b6046cc19d9840ad
+EBUILD django-4.1.ebuild 3014 BLAKE2B 2e1a238d9c1e3d3256111d2153f9bc4ec6e4ffc5d084f87d7fc699290999dfb8ef870ab94607ba8777753be053b888230be3a31d820e53be522edb32a352c698 SHA512 fae3486b9008e457b4b65bee3fc919e82a81786cf79b54cfc6a4823f1c2f9d9f7e551ab3e8db6b4d9c8c3bca217278a165d49dd5648bc591ec4096d34fbf811e
 MISC metadata.xml 400 BLAKE2B 6b3414ac734f078d90c82b44edd2f9f70e494e98da8a3d874d18006ae5e0eb5f7060b98b402094d6045e800bf525586f2566e6f554a8b2999cce37bdcc5472a0 SHA512 1cf0bb6ef93da3abbd1a66878462b1b8672a9b8fccd7f968b427e429caa6ecf30cb703a6060d621ccad1ba77b927d2b0e632b04b0a47975918ccbfcc5f2b85f7
diff --git a/dev-python/django/django-4.1.ebuild b/dev-python/django/django-4.1.ebuild
new file mode 100644
index 000000000000..5c62178ef58f
--- /dev/null
+++ b/dev-python/django/django-4.1.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+PYTHON_REQ_USE='sqlite?,threads(+)'
+
+inherit bash-completion-r1 distutils-r1 optfeature verify-sig
+
+MY_P=${P^}
+DESCRIPTION="High-level Python web framework"
+HOMEPAGE="
+	https://www.djangoproject.com/
+	https://github.com/django/django/
+	https://pypi.org/project/Django/
+"
+SRC_URI="
+	https://media.djangoproject.com/releases/$(ver_cut 1-2)/${MY_P}.tar.gz
+	verify-sig? ( https://media.djangoproject.com/pgp/${MY_P}.checksum.txt )
+"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+# admin fonts: Roboto (media-fonts/roboto)
+LICENSE+=" Apache-2.0"
+# admin icons, jquery, xregexp.js
+LICENSE+=" MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+IUSE="doc sqlite test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	<dev-python/asgiref-4[${PYTHON_USEDEP}]
+	>=dev-python/asgiref-3.5.2[${PYTHON_USEDEP}]
+	>=dev-python/sqlparse-0.2.2[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/backports-zoneinfo[${PYTHON_USEDEP}]
+	' 3.8)
+"
+BDEPEND="
+	test? (
+		$(python_gen_impl_dep sqlite)
+		${RDEPEND}
+		dev-python/docutils[${PYTHON_USEDEP}]
+		dev-python/jinja[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pillow[webp,${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/selenium[${PYTHON_USEDEP}]
+		dev-python/tblib[${PYTHON_USEDEP}]
+		sys-devel/gettext
+		!!<dev-python/ipython-7.21.0-r1
+		!!=dev-python/ipython-7.22.0-r0
+	)
+	verify-sig? ( >=sec-keys/openpgp-keys-django-20201201 )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.0-bashcomp.patch
+	# https://github.com/django/django/commit/9e9bdf8dbd6e2354a2e23aa7e37d5b491338085e
+	"${FILESDIR}"/${P}-test.patch
+)
+
+distutils_enable_sphinx docs --no-autodoc
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/django.asc
+
+src_unpack() {
+	if use verify-sig; then
+		cd "${DISTDIR}" || die
+		verify-sig_verify_signed_checksums \
+			"${MY_P}.checksum.txt" sha256 "${MY_P}.tar.gz"
+		cd "${WORKDIR}" || die
+	fi
+
+	default
+}
+
+python_test() {
+	# Tests have non-standard assumptions about PYTHONPATH,
+	# and don't work with ${BUILD_DIR}/lib.
+	PYTHONPATH=. "${EPYTHON}" tests/runtests.py --settings=test_sqlite -v2 ||
+		die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	newbashcomp extras/django_bash_completion ${PN}-admin
+	bashcomp_alias ${PN}-admin django-admin.py
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature_header "Additional Backend support can be enabled via:"
+	optfeature "MySQL backend support" dev-python/mysqlclient
+	optfeature "PostgreSQL backend support" dev-python/psycopg:2
+	optfeature_header
+	optfeature "GEO Django" "sci-libs/gdal[geos]"
+	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
+	optfeature "ImageField Support" dev-python/pillow
+	optfeature "Password encryption" dev-python/bcrypt
+	optfeature "High-level abstractions for Django forms" dev-python/django-formtools
+}
diff --git a/dev-python/django/files/django-4.1-test.patch b/dev-python/django/files/django-4.1-test.patch
new file mode 100644
index 000000000000..d50c3df89bec
--- /dev/null
+++ b/dev-python/django/files/django-4.1-test.patch
@@ -0,0 +1,33 @@
+From 9e9bdf8dbd6e2354a2e23aa7e37d5b491338085e Mon Sep 17 00:00:00 2001
+From: Alberto Planas <aplanas@gmail.com>
+Date: Wed, 3 Aug 2022 16:36:04 +0200
+Subject: [PATCH] [4.1.x] Fixed #33887 -- Fixed
+ test_fails_squash_migration_manual_porting() on final tags.
+
+Regression in 7c318a8bdd66f8c5241864c9970dddb525d0ca4c.
+Backport of 4e13b40a764cfdae50416338c5d077e9d9a6d0f1 from main
+---
+ tests/migrations/test_commands.py | 9 +++++----
+ 1 file changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/tests/migrations/test_commands.py b/tests/migrations/test_commands.py
+index a3e1efc924bd..0d4fb52bbb82 100644
+--- a/tests/migrations/test_commands.py
++++ b/tests/migrations/test_commands.py
+@@ -3005,11 +3005,12 @@ def test_fails_squash_migration_manual_porting(self):
+         with self.temporary_migration_module(
+             module="migrations.test_migrations_manual_porting"
+         ) as migration_dir:
++            version = get_docs_version()
+             msg = (
+-                "Migration will require manual porting but is already a squashed "
+-                "migration.\nTransition to a normal migration first: "
+-                "https://docs.djangoproject.com/en/dev/topics/migrations/"
+-                "#squashing-migrations"
++                f"Migration will require manual porting but is already a squashed "
++                f"migration.\nTransition to a normal migration first: "
++                f"https://docs.djangoproject.com/en/{version}/topics/migrations/"
++                f"#squashing-migrations"
+             )
+             with self.assertRaisesMessage(CommandError, msg):
+                 call_command("optimizemigration", "migrations", "0004", stdout=out)
diff --git a/dev-python/ensurepip-wheels/Manifest b/dev-python/ensurepip-wheels/Manifest
index 2a40183307e5..5af914d9f5d6 100644
--- a/dev-python/ensurepip-wheels/Manifest
+++ b/dev-python/ensurepip-wheels/Manifest
@@ -2,6 +2,8 @@ DIST pip-22.2.1-py3-none-any.whl 2044666 BLAKE2B 702699d059273182f248acb48f6f6c9
 DIST pip-22.2.2-py3-none-any.whl 2044706 BLAKE2B 254427e593e44d9f1ce48276fd40f214e8ca9d27b6c31b7a6ed5fa4566df6b1f723215c6a1766a534ce18174f2363c383dbff19368d1b89f1519a53bebd34215 SHA512 142d3144c14b692c645613d98bf35dd91193128d5e21b61a8a702548f1247fac662499d6e39b65c0aa9a0444d2d92983fd8c410439796626485a4e1be99a102f
 DIST setuptools-63.3.0-py3-none-any.whl 1228351 BLAKE2B 5a7a8d864b5fc992952a4c7f0230c3ebb6f33c7b4fc965ca8bfa4cf3b57948e8353f59074f7374e3d002866333d3ad5fd072ccd479f8470cbfcd14aa635efc54 SHA512 f2df66493fb9520b50e3e93560b17e5aa6f01e5fde27028a550249beb54f3ea6b2d8f0a2bcc57afaff193e38d5b217544c0623b254ac300652aed444abf06a14
 DIST setuptools-63.4.1-py3-none-any.whl 1228875 BLAKE2B 8f5a91764f509311f217d9cec6030c8318138d2d60bf8e8cf8ab0d7e9a9d578c1f644aaf30988846c4f22b962b10fa47c2e92cf63ffe0186acaf697c8eb96cc9 SHA512 c73f075f80a97d77906ed9acc1850ab4e458c1d4423a3f9a4b71bd677d7bd0e3ea291683942cd2cc9a91d454e905ea9732e169711c5218a8047997049e0c5536
+DIST setuptools-63.4.2-py3-none-any.whl 1230330 BLAKE2B 8190129907edb6a5a3607fc8caae995070d5740c849cd31510efa43271fddd58c5c21cb1d60a4647473b10ba90a6220e06db92413847cbf71e11e43571def2ab SHA512 8b2a56c840220c616a13ec19b424981b9767f4e39b98a3ba0b99904beb63f4d6d6c28ada37a25d482c1838063ccd09d260b12cc7d00aeca78b95cde49928211e
 EBUILD ensurepip-wheels-63.3.0.22.2.1.ebuild 848 BLAKE2B 2d4062dcde645e944dcc73a9fe8150ded2473bdeb0656832223cc1071b8fbc9b99522eff3eef11778ac9f12e97a85a8c99bdd78a4fd85b7b87b6711439d5e0c4 SHA512 cd12ffe723070c282e9f92ce6c0b125ba0f336e73d063c68f49ad4c91e29dba542ed877dcfe1afd5913c71cfc1f0cc8333d0cb8f7f9ee36050e8f42610a3498d
 EBUILD ensurepip-wheels-63.4.1.22.2.2.ebuild 848 BLAKE2B 2d4062dcde645e944dcc73a9fe8150ded2473bdeb0656832223cc1071b8fbc9b99522eff3eef11778ac9f12e97a85a8c99bdd78a4fd85b7b87b6711439d5e0c4 SHA512 cd12ffe723070c282e9f92ce6c0b125ba0f336e73d063c68f49ad4c91e29dba542ed877dcfe1afd5913c71cfc1f0cc8333d0cb8f7f9ee36050e8f42610a3498d
+EBUILD ensurepip-wheels-63.4.2.22.2.2.ebuild 848 BLAKE2B 2d4062dcde645e944dcc73a9fe8150ded2473bdeb0656832223cc1071b8fbc9b99522eff3eef11778ac9f12e97a85a8c99bdd78a4fd85b7b87b6711439d5e0c4 SHA512 cd12ffe723070c282e9f92ce6c0b125ba0f336e73d063c68f49ad4c91e29dba542ed877dcfe1afd5913c71cfc1f0cc8333d0cb8f7f9ee36050e8f42610a3498d
 MISC metadata.xml 333 BLAKE2B 800dafc25b6f76bebd9f1d47d42e3427c7024ea0114c00201a766fd33d2cd2a466587da9e1cb22b2cd6e45637e8b8f93af7b6a52afd5fbbd460bea880f55a2e8 SHA512 40ee1087f3b5575c3a86368a5ee56c606442e8ace9396eb409bcfda734cc480e781f75d861253772cf9ef113d3cc4a05687b76df45ad5ecff984460ce54583e7
diff --git a/dev-python/ensurepip-wheels/ensurepip-wheels-63.4.2.22.2.2.ebuild b/dev-python/ensurepip-wheels/ensurepip-wheels-63.4.2.22.2.2.ebuild
new file mode 100644
index 000000000000..691136b4b5bb
--- /dev/null
+++ b/dev-python/ensurepip-wheels/ensurepip-wheels-63.4.2.22.2.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+SETUPTOOLS_WHL=setuptools-$(ver_cut 1-3)-py3-none-any.whl
+PIP_WHL=pip-$(ver_cut 4-)-py3-none-any.whl
+
+DESCRIPTION="Shared wheels for ensurepip Python module"
+HOMEPAGE="
+	https://pypi.org/project/pip/
+	https://pypi.org/project/setuptools/
+"
+SRC_URI="
+	https://files.pythonhosted.org/packages/py3/p/pip/${PIP_WHL}
+	https://files.pythonhosted.org/packages/py3/s/setuptools/${SETUPTOOLS_WHL}
+"
+S=${DISTDIR}
+
+# combined license of setuptools and pip (with its bundled deps)
+LICENSE="Apache-2.0 BSD BSD-2 ISC LGPL-2.1+ MIT MPL-2.0 PSF-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+src_install() {
+	insinto /usr/lib/python/ensurepip
+	doins "${PIP_WHL}" "${SETUPTOOLS_WHL}"
+}
diff --git a/dev-python/kgb/Manifest b/dev-python/kgb/Manifest
index b96d2ee46b60..3f6078f54e7e 100644
--- a/dev-python/kgb/Manifest
+++ b/dev-python/kgb/Manifest
@@ -1,5 +1,3 @@
-DIST kgb-7.1.tar.gz 60779 BLAKE2B 86fdcc6c0bbcd178df16110e2330c620f43417ab7986fa16c9d9d58822701d87aa6639b414d3ccb9bd40117635a309ed747653b3984c91b2f8bee50a29291b2b SHA512 0e3f03a53ea4c21e4e0d7ffa83e272c2de0893cdb230519ecf241fef7a8b982cc84811ecfe74536308fca8591864efe31c2f61c5eed351965be0705d359f55cf
-DIST kgb-release-7.0.tar.gz 54742 BLAKE2B 22193a573c797221382f5f6117f67dd5fbc00322e43d67079882a251fd3fd361672fbbadb523bcb14e8671b274789cc39dd591ee0b20f3b28649c8f39b58711c SHA512 571f077b4c4be10044d05ab1f88d75315afe4ebf7661851daff68e2782fd408dcf994c6db2bd620f38a56ffd89c1f52f41139defc30f05ec792663ae5f351364
-EBUILD kgb-7.0-r1.ebuild 687 BLAKE2B a055e3a10ec4bc41a2b2fb3dd00e21932d57cf98a5456b2e121cfacbc2442a8608b9727cf6cf9fc81e4b78a918d22fea3f7203539534a6836164a72c00c03bf3 SHA512 7d1e603b1248753a1db47187c0b314779925a3b5219864729c208e3409b3a4550e8f2b9c7c1bc34a665a018ac9be32efa2cd20d573b7201e8443b925a13eb10f
-EBUILD kgb-7.1.ebuild 622 BLAKE2B 92b469a51da23a3327bcca2ccf8ee32572443f7ad5303c569fd7d088cf558744c00b10b565f1ce9aa4943f2c2665689bf5e78893aa5b03684a6b99d1bef11d3f SHA512 cbcf89bc8b5ca4fa5c97baefdc978ab5ad3812524de30fcc9c2ddac0450dc1b405e90a4fdd622171a244106c370d68535c93ff352c03d1e30a3e7f5e519fcd8a
+DIST kgb-7.1.1.tar.gz 61504 BLAKE2B 37aa4c78e0e74c2ad10db047453229d903c72dc9f359ce916f66b24ddc390e89126869e8e52942854911952e995b45f9a304e48574c7c79319f388d0f70d148f SHA512 29e5d78270f55b82b917a1e448307397f813502cc3a262fd6af082417f3875c88732b3f7c11c6001120bb0cba4079c2c6351b2b24287b1f5a3b3c891cf3f8d55
+EBUILD kgb-7.1.1.ebuild 622 BLAKE2B 92b469a51da23a3327bcca2ccf8ee32572443f7ad5303c569fd7d088cf558744c00b10b565f1ce9aa4943f2c2665689bf5e78893aa5b03684a6b99d1bef11d3f SHA512 cbcf89bc8b5ca4fa5c97baefdc978ab5ad3812524de30fcc9c2ddac0450dc1b405e90a4fdd622171a244106c370d68535c93ff352c03d1e30a3e7f5e519fcd8a
 MISC metadata.xml 385 BLAKE2B a36cb8262ed3d2fd3114e8c84bdd732dbbb661b8fea7a9705ff329f56659c020e5b9e00756a9e9dbbf073b894ddf5f811367b8c4d9b11dddd7c866588987e96e SHA512 5ee33147dec8e3fee8dc4856ca8a363674cd1854f36e9a01559751ec6799d8f8c995c8d0f82dcf794161b1f91acec387d7a18d7cdee2638fddbc177f0a069c81
diff --git a/dev-python/kgb/kgb-7.0-r1.ebuild b/dev-python/kgb/kgb-7.0-r1.ebuild
deleted file mode 100644
index 843408951a14..000000000000
--- a/dev-python/kgb/kgb-7.0-r1.ebuild
+++ /dev/null
@@ -1,33 +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=( pypy3 python3_{8..10} )
-
-inherit distutils-r1
-
-MY_P=${PN}-release-${PV}
-DESCRIPTION="Python function spy support for unit tests"
-HOMEPAGE="
-	https://github.com/beanbaginc/kgb/
-	https://pypi.org/project/kgb/
-"
-SRC_URI="
-	https://github.com/beanbaginc/kgb/archive/release-${PV}.tar.gz
-		-> ${MY_P}.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# remove .dev tag that breaks revdeps
-	sed -i -e '/tag_build/d' setup.cfg || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/kgb/kgb-7.1.ebuild b/dev-python/kgb/kgb-7.1.1.ebuild
index c7f92d10cca2..c7f92d10cca2 100644
--- a/dev-python/kgb/kgb-7.1.ebuild
+++ b/dev-python/kgb/kgb-7.1.1.ebuild
diff --git a/dev-python/pdm-pep517/Manifest b/dev-python/pdm-pep517/Manifest
index 5030267efc02..cfd3a5b49c5e 100644
--- a/dev-python/pdm-pep517/Manifest
+++ b/dev-python/pdm-pep517/Manifest
@@ -1,7 +1,9 @@
 DIST pdm-pep517-1.0.1.gh.tar.gz 307357 BLAKE2B f833179b0ea011c4304625f08d3eca85b17163d4af6144f72e6faa2fe1091f9607f53ae051fca4e837009c3132ad6f06ae69cc5288ca8731ffb1ff2ef555d0d0 SHA512 7d90829a351e95f7b53f53d356a60cb170036059f5e6311df46989253b33f126f384a93cd6aa22c95b1ec7aa501e13773ccafabbb41e5237e84537b73dc43f58
 DIST pdm-pep517-1.0.2.gh.tar.gz 307938 BLAKE2B 711cc77c4ec4a3002557b5537c931215254d6fd724bf80f5457750100d55aba580b0f5fdbf8b17a31e5b02b42a94b62bc72eb99693fb59c3ab76364666b51b15 SHA512 bb827a6130299acab18714c7380f81fa530b95e3bc1e78bca810c116472269f050df45d04ef69d90a1ad96dd6bc965a50edc01bc9c429b96eefb76d62c66b8ae
 DIST pdm-pep517-1.0.3.gh.tar.gz 314957 BLAKE2B d0beff961b3f324c4d4c74943387e82cbeca90e5441391347b2ea06639af9965ea27426cab9e8dbbdceb296eb1461319fb375a3e078d673bbdf386b578b8f35c SHA512 ca9983e95f803243fb04b1add424449adfac472a94973013f669440d18d2118bdaf6610830f686cc700e86973935df26a7fea0ceed415b2c7604330de3325d05
+DIST pdm-pep517-1.0.4.gh.tar.gz 314677 BLAKE2B dc6fad5bf6bd4aa6d9d490c6fb1df0d1a1543ae93f90ac4d53bbd515de6f6582a4fd032cc5c67aeebf71755fec6aac3b5a462a18eb08087c6a4da279e3c989ad SHA512 4edd016873c054f20efc39b8a044c2ff5dee70509c45ba1227e6982043dabb5ed0353afef4af73c88106ffe5a2c27f569077448fb27a0d58169710d2c6573c2f
 EBUILD pdm-pep517-1.0.1.ebuild 1291 BLAKE2B 6089f1611fc324431bbbf3beaa921932bc04b2383457b511fdeca14c963e3e50a5c0fcdb80d80606870bccdb75072f02b08aea1c8a3e2461175c8ef6001849fd SHA512 d94576e6ef3ad7154ea8d7ea494402e514f54e153d21e9e98bdc8220193750d76bb6719400c56a5fc62a4b1c27e0b5ba24de41f090c0a7f4876031c2ba716241
 EBUILD pdm-pep517-1.0.2.ebuild 1291 BLAKE2B 6089f1611fc324431bbbf3beaa921932bc04b2383457b511fdeca14c963e3e50a5c0fcdb80d80606870bccdb75072f02b08aea1c8a3e2461175c8ef6001849fd SHA512 d94576e6ef3ad7154ea8d7ea494402e514f54e153d21e9e98bdc8220193750d76bb6719400c56a5fc62a4b1c27e0b5ba24de41f090c0a7f4876031c2ba716241
 EBUILD pdm-pep517-1.0.3.ebuild 1290 BLAKE2B 7381d250bca6b84e1e8645b319588c34015bba4dbc74bbaa31cd0bf038d00a3cf0d5d6f6034ad19402ec356922afeb03f7df4a1db6bf15b07712077aa74cb1c2 SHA512 09471709e972ba932b1a23a240ebb6dac574c2503383cafd5f3d3187b5abbb7b63ad0ebcac57c9930b4c625bf978c074f97c0676b4772187853bc817a1386da1
+EBUILD pdm-pep517-1.0.4.ebuild 1291 BLAKE2B 6089f1611fc324431bbbf3beaa921932bc04b2383457b511fdeca14c963e3e50a5c0fcdb80d80606870bccdb75072f02b08aea1c8a3e2461175c8ef6001849fd SHA512 d94576e6ef3ad7154ea8d7ea494402e514f54e153d21e9e98bdc8220193750d76bb6719400c56a5fc62a4b1c27e0b5ba24de41f090c0a7f4876031c2ba716241
 MISC metadata.xml 400 BLAKE2B 0882adff4040585d2881a8712b035a5204909639f80f637526b793fd9e31e9d6cda6119cc069d8ff2e768b9d5807eab16bc27bfd35beb5a613722afead2d8b0c SHA512 484e17561642cf1d26d61a1d95554614b9e77b1ee985cba61ad35dad9c9470d0f64e99385200b8eb7e2cdd5e1427cf7835d6e39c10dece1fb90dd6e81cd15d91
diff --git a/dev-python/pdm-pep517/pdm-pep517-1.0.4.ebuild b/dev-python/pdm-pep517/pdm-pep517-1.0.4.ebuild
new file mode 100644
index 000000000000..65915f36678c
--- /dev/null
+++ b/dev-python/pdm-pep517/pdm-pep517-1.0.4.ebuild
@@ -0,0 +1,58 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=standalone
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A PEP 517 backend for PDM that supports PEP 621 metadata"
+HOMEPAGE="
+	https://pypi.org/project/pdm-pep517/
+	https://github.com/pdm-project/pdm-pep517/
+"
+SRC_URI="
+	https://github.com/pdm-project/pdm-pep517/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/cerberus-1.3.4[${PYTHON_USEDEP}]
+	dev-python/license-expression[${PYTHON_USEDEP}]
+	>=dev-python/packaging-21.0[${PYTHON_USEDEP}]
+	>=dev-python/tomli-2[${PYTHON_USEDEP}]
+	dev-python/tomli-w[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	${RDEPEND}
+	test? (
+		dev-vcs/git
+	)
+"
+# setuptools are used to build C extensions
+RDEPEND+="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	rm -r pdm/pep517/_vendor || die
+	find -name '*.py' -exec sed \
+		-e 's:from pdm\.pep517\._vendor\.:from :' \
+		-e 's:from pdm\.pep517\._vendor ::' \
+		-i {} + || die
+	distutils-r1_src_prepare
+}
+
+src_test() {
+	git config --global user.email "test@example.com" || die
+	git config --global user.name "Test User" || die
+	distutils-r1_src_test
+}
diff --git a/dev-python/pyxDamerauLevenshtein/Manifest b/dev-python/pyxDamerauLevenshtein/Manifest
index 05f9fd2812c9..81763a4bf957 100644
--- a/dev-python/pyxDamerauLevenshtein/Manifest
+++ b/dev-python/pyxDamerauLevenshtein/Manifest
@@ -1,3 +1,5 @@
 DIST pyxDamerauLevenshtein-1.7.0.tar.gz 41867 BLAKE2B a8fe379a10bfd37e1675dab83d83d1b53308b5539c86e31f507a0243da898d57c4d320661642e23be439c4aabf88b1aaa559bc620e193e58586568cdfd8040df SHA512 11704d3968261cd844ce248c913f1b9baf813d0f8c712971ac4ec05466f8aa5719932e282b49e378d6799ae88483804055765a881d3cef8e7adff486b450e98e
+DIST pyxDamerauLevenshtein-1.7.1.gh.tar.gz 43690 BLAKE2B 52950fa10667775828ee57ae9f68ea06bf8cf4e794c3cf27189fbc1affe877ee2537a5dfc3173a58a8b9ccfae664190e4eac250ddbc7cbeda748af033dd3fbbb SHA512 d16be05305ac8cdabecae90353e68cc51ac99ea88338fafe8379f6969434a9e3e3ac95ba58f71d15ccfcadfb3a9fbe30af563ec848e54115c64c83c69596e116
 EBUILD pyxDamerauLevenshtein-1.7.0.ebuild 543 BLAKE2B dbb6d96fa9e0d67483603cdea1e148f3ea0da215afb7912fa3ad6c0d72162b06414a2b5607ee465761795fd7c2779df0d413afa8bf3827b5528273e0a771865a SHA512 def118bcf9987323851d3e51a2d94c5b612fc42cc771b1121dac9cba59f7584d59c781082b39ce9113cb510debc366fed710213991fd40c27d42de7546bc54fe
-MISC metadata.xml 516 BLAKE2B e5677cda6ad803bdc75b1958e40bfcf4ca2134400d4b93f821e217977d441b8ed09872699b512897eddaefb3b5676e5bbbe3f2199542940ed5010fc58e048152 SHA512 8d724bfe477be076c126ceae44f1b94b12d24fa0bdfc62ba95783ef1ab8d1e46f421b533cfd5184433ff876230c3c09c77516a9ac9248b4a683b977f07733f98
+EBUILD pyxDamerauLevenshtein-1.7.1.ebuild 797 BLAKE2B 6d6d832a3a2ec26a3ddd906c30ebf34867a547dbcea9a7f0b62ef39376e2740a52f5632cb0f72b8833918921d29a76357b4a0b5feaaa164e86efb290687f21c7 SHA512 66f37ac1a53451d7ec222540477af8d48b29e6048573556d634e3927d6566b8d7d3245c0801c863c58e39f9c26ce0b289609a50cf4315fb558ad85c54abfb19b
+MISC metadata.xml 510 BLAKE2B dd0d5b9fec3a47497224256828fbcbe3be48a96f134e77819c59fa1a3feaf1203bef6db6d92f857304e9507f548d25ddc969035b644a56f7941cf60528989fc0 SHA512 0db8a2056ebd89f91e65589e70ec28330e8a653464f6361e795595c16f478e7e2e0e6ad7edf12281cde8ae302ad9ef08a7f160b8eb9e6f8a6bc7ebb290f2ef96
diff --git a/dev-python/pyxDamerauLevenshtein/metadata.xml b/dev-python/pyxDamerauLevenshtein/metadata.xml
index 0fd668f7517e..053dcd413581 100644
--- a/dev-python/pyxDamerauLevenshtein/metadata.xml
+++ b/dev-python/pyxDamerauLevenshtein/metadata.xml
@@ -11,6 +11,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="pypi">pyxDamerauLevenshtein</remote-id>
-		<remote-id type="github">gfairchild/pyxDamerauLevenshtein</remote-id>
+		<remote-id type="github">lanl/pyxDamerauLevenshtein</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pyxDamerauLevenshtein/pyxDamerauLevenshtein-1.7.1.ebuild b/dev-python/pyxDamerauLevenshtein/pyxDamerauLevenshtein-1.7.1.ebuild
new file mode 100644
index 000000000000..0a2eac2f69e0
--- /dev/null
+++ b/dev-python/pyxDamerauLevenshtein/pyxDamerauLevenshtein-1.7.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_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Implements the Damerau-Levenshtein edit distance algorithm for Python in Cython"
+HOMEPAGE="
+	https://github.com/lanl/pyxDamerauLevenshtein/
+	https://pypi.org/project/pyxDamerauLevenshtein/
+"
+SRC_URI="
+	https://github.com/lanl/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+
+RDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+src_configure() {
+	# recythonize
+	cd pyxdameraulevenshtein || die
+	cython -3 -f *.pyx || die
+}
+
+src_test() {
+	rm -r pyxdameraulevenshtein || die
+	distutils-r1_src_test
+}
diff --git a/dev-python/readme_renderer/Manifest b/dev-python/readme_renderer/Manifest
index 49bda4599199..9d33505f937e 100644
--- a/dev-python/readme_renderer/Manifest
+++ b/dev-python/readme_renderer/Manifest
@@ -1,3 +1,5 @@
 DIST readme_renderer-35.0.tar.gz 27224 BLAKE2B bb58a6cb39aace47714aa351c710663ca9f43f04055e21a5ea3954b2d1fff58dce073b0a41bdfb07f34ffe16f2fbba9ba59c2a6b8f84c0eacfb7d9f7cd881380 SHA512 29377cea5a029f7c4cf2ec0362771a280936e84fc39117c13fc6557172581570af298520ea6f5df53260e1da539ebe3fe4183bd1fb5620af48824bee04fefc75
+DIST readme_renderer-36.0.tar.gz 28680 BLAKE2B e356690bc791d5f4a27ef59c61e356b3932595623434feae8d0fc9cf99d1bd4a724d5c202e47f989017821ce2bd69604338912c37b879699677496b789453c56 SHA512 1e208e830060d2a94e608dbbef36376c7720b8b4e2c8619665e82c64b7111153f4b764c1c7a77b36d3c0d652adb1f49a14bc7306b7bb5c65598db7acec6e984e
 EBUILD readme_renderer-35.0.ebuild 826 BLAKE2B 07790975b0eeae82f5171b2694c92ab376a2f8195d05c68113e2852ca22c6e86f8a41c4c90d483d8a66253ed2651751f5c19e0f62363338287286afbbaf4b696 SHA512 58c1d989ce5bda468254c7971de1c00ce8f22a8159cf4364f182e589cd89632d7885e755ef276f6eda529aecfd78d65fb8e71ad075dd1e848a7bcb53e825c0f2
+EBUILD readme_renderer-36.0.ebuild 834 BLAKE2B a0917e8b520a5babb97322d4ad68418d431dcc7b12b180a7875c749f38149fe0750ac6f8768e2eb83e94a4b0329d60d2aa5d76d58f74d59918f8a9a415cd6302 SHA512 0746feea0ae0ad4cc1aa10a6b7021c53b24c52cf951c578366a8aa08997973f981557cbdaf464840911f7963251a0aa2a3d0160622536c1751c5fe31bc20b1e4
 MISC metadata.xml 416 BLAKE2B 1441314990a3eca464ea227d76e458a42b3c9bf44076f64a59d22cdddaace1fdbe219b3e6f8fb963cc40174aaf473852698facbc8816f55278821df0f452a1ed SHA512 50abec4287629f7982049959696e8f21e0a773618c40b42815d53e709d080ff6051235453a4659c50bd4cf856829d0489cdd0f4e1f56cc65f28d5de45d849b86
diff --git a/dev-python/readme_renderer/readme_renderer-36.0.ebuild b/dev-python/readme_renderer/readme_renderer-36.0.ebuild
new file mode 100644
index 000000000000..4ce1fe0bd41c
--- /dev/null
+++ b/dev-python/readme_renderer/readme_renderer-36.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="a library for rendering \"readme\" descriptions for Warehouse"
+HOMEPAGE="
+	https://github.com/pypa/readme_renderer/
+	https://pypi.org/project/readme-renderer/
+"
+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 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	>=dev-python/bleach-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/docutils-0.13.1[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.5.2[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+DOCS=( README.rst )
+
+distutils_enable_tests pytest
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index 10ed9361150d..2e562e662d24 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -4,9 +4,11 @@ DIST setuptools-63.1.0.tar.gz 2599380 BLAKE2B 532f484ea0e40a820ac266e878e6210c95
 DIST setuptools-63.2.0.tar.gz 2605892 BLAKE2B c9475a64fbe22be348277d25582a0c1789544822a891ebfb8e8e79b122631d31bf3535aac1b408a254c1f29ea9ca20bd9b270e4d78ddc539aea4e3c59a6e7f7b SHA512 e55c19bb95415a5f831fd23dfc32cb79fdad71867bc225f2a76caecb3c188fa6a5dac8d13e131a97d1833672a245b28a53a11ceafd67ac19cacd4a247ba7d291
 DIST setuptools-63.3.0.tar.gz 2598685 BLAKE2B 8562824cf6e45f2757cbaf4360c0b7c8e592233875a00e5490de5f2af47ca2d43a6feac5876ca9e866fb840c62dc1b0aa2b2d7c1e5e9baf34741404803b02d31 SHA512 01f3b658862f70e8ce2dd74d9dd82a293216b356f1f3abb3b6b4fa77dd5347156a58959da6e6df349a1c114d58f617890e4bc8c6603f06be0fb3caec9bf21fe2
 DIST setuptools-63.4.1.tar.gz 2598515 BLAKE2B ae75b12d18e35c0d7d48c43eaf8f114dafc739253f672eb3ff2646a8951d0895df95c2d46fd77bb42aeca49a460e652eff41ac109fff24460fbcf02f7400faa1 SHA512 525bba1c07370a633c827629879bd4bf0147aec461ed2d935eaade21635527515eef6bdd1c8809304522cc890929ae0b12a5357e0035807d04cb8fb5a65fbf39
+DIST setuptools-63.4.2.tar.gz 2600520 BLAKE2B e5cedf9f5e58044ec74e45b7232ef64680854ba7be8f2c22e33373c7a8f5fc80578f99c9103eb81bc609fef56021fc7a311b03682842facea019d14387031f89 SHA512 a9cb002f3c9fd3e8ed189f800c45a9ab7bc51640430585226f290c2d6b24655999fbe827ddcc30fdd7f8a6ebd5e87dfc085d2ae1efbf35968213bb7dc77eeaee
 EBUILD setuptools-62.6.0.ebuild 4077 BLAKE2B df8d3d5974d76cf4ee9089f73dacf365659432ee527e27b394d53311f3cf7ee69b3e612b5f1e8d634d0c30a8875c14924438a48b3466afdfdccb506ffbe5328a SHA512 d2173d8c251e7f2f4dec2e52887674d5ca31a3ba209b7455e9e9871befb96814852da137b5acb9a86364b0d8c1c0b394a306d8c4995aaa517a9eb950553b33bc
 EBUILD setuptools-63.1.0.ebuild 4085 BLAKE2B 3e4892512482fc1bc3adcb90bfc4f1a44b698957d6486f078fb6629ee73d7603eeddd768b072bde066a968a7c48900518d87336318c21b809e5c408623f8013c SHA512 49275430700aa47bb6df62e10d0252190437334078a6728c2cd24e9f8157e00e7266ce4f887aa98789819fa19b5aea1f8997f74686800a98be074c87f711063c
 EBUILD setuptools-63.2.0.ebuild 4085 BLAKE2B 3e4892512482fc1bc3adcb90bfc4f1a44b698957d6486f078fb6629ee73d7603eeddd768b072bde066a968a7c48900518d87336318c21b809e5c408623f8013c SHA512 49275430700aa47bb6df62e10d0252190437334078a6728c2cd24e9f8157e00e7266ce4f887aa98789819fa19b5aea1f8997f74686800a98be074c87f711063c
 EBUILD setuptools-63.3.0.ebuild 4153 BLAKE2B f91982c6f07cc0f4ac55572fc6aa1fe06697502e805f045236fc90bca0aae3e2dd2b9fdecf912290cc978be9dfee705d18c43e05c5da78f9030ae1e6bbefd672 SHA512 d047b71d51c1aa37f517649e96968cc1f741b47d7368c2c18b966737e39d29e427b123dcd96f3a0f8f7f19ca9f3264b79269bae2e87eda700233612fb8bd9a19
 EBUILD setuptools-63.4.1.ebuild 4153 BLAKE2B f91982c6f07cc0f4ac55572fc6aa1fe06697502e805f045236fc90bca0aae3e2dd2b9fdecf912290cc978be9dfee705d18c43e05c5da78f9030ae1e6bbefd672 SHA512 d047b71d51c1aa37f517649e96968cc1f741b47d7368c2c18b966737e39d29e427b123dcd96f3a0f8f7f19ca9f3264b79269bae2e87eda700233612fb8bd9a19
+EBUILD setuptools-63.4.2.ebuild 4153 BLAKE2B f91982c6f07cc0f4ac55572fc6aa1fe06697502e805f045236fc90bca0aae3e2dd2b9fdecf912290cc978be9dfee705d18c43e05c5da78f9030ae1e6bbefd672 SHA512 d047b71d51c1aa37f517649e96968cc1f741b47d7368c2c18b966737e39d29e427b123dcd96f3a0f8f7f19ca9f3264b79269bae2e87eda700233612fb8bd9a19
 MISC metadata.xml 469 BLAKE2B 4a26769b09a3785586b22db850b7fc5c4818f31c3ace9cc94476d35df05e50edf6721f3c95ec615c3b2efe071ef284a54ea2d53566316ba653f7830bb48f80bf SHA512 dd682c4ad2e59a97094ebdabe4d1063e2319ed05e1fe9d8c2fafe069badb3b4cf8bb6d9f50e09d2128e2a081c1c69827407ac8aed644ebf70eb4ca1bc9a57319
diff --git a/dev-python/setuptools/setuptools-63.4.2.ebuild b/dev-python/setuptools/setuptools-63.4.2.ebuild
new file mode 100644
index 000000000000..e6015c0fc03f
--- /dev/null
+++ b/dev-python/setuptools/setuptools-63.4.2.ebuild
@@ -0,0 +1,125 @@
+# 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
+
+# please bump dev-python/ensurepip-wheels along with this package!
+
+DISTUTILS_USE_PEP517=standalone
+PYTHON_TESTED=( python3_{8..11} pypy3 )
+PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="Collection of extensions to Distutils"
+HOMEPAGE="
+	https://github.com/pypa/setuptools/
+	https://pypi.org/project/setuptools/
+"
+SRC_URI="
+	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/appdirs-1.4.4-r2[${PYTHON_USEDEP}]
+	>=dev-python/jaraco-text-3.7.0-r1[${PYTHON_USEDEP}]
+	>=dev-python/more-itertools-8.12.0-r1[${PYTHON_USEDEP}]
+	>=dev-python/nspektr-0.3.0[${PYTHON_USEDEP}]
+	>=dev-python/ordered-set-4.0.2-r1[${PYTHON_USEDEP}]
+	>=dev-python/packaging-21.3-r2[${PYTHON_USEDEP}]
+	>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_metadata-4.11.1[${PYTHON_USEDEP}]
+	' 3.8 3.9)
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_resources-5.4.0-r3[${PYTHON_USEDEP}]
+	' 3.8)
+"
+BDEPEND="
+	${RDEPEND}
+	>=dev-python/wheel-0.37.1-r1[${PYTHON_USEDEP}]
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/build[${PYTHON_USEDEP}]
+			>=dev-python/ini2toml-0.9[${PYTHON_USEDEP}]
+			>=dev-python/filelock-3.4.0[${PYTHON_USEDEP}]
+			>=dev-python/jaraco-envs-2.2[${PYTHON_USEDEP}]
+			>=dev-python/jaraco-path-3.2.0[${PYTHON_USEDEP}]
+			dev-python/mock[${PYTHON_USEDEP}]
+			dev-python/pip[${PYTHON_USEDEP}]
+			dev-python/pip-run[${PYTHON_USEDEP}]
+			dev-python/pytest[${PYTHON_USEDEP}]
+			dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
+			dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
+			dev-python/pytest-xdist[${PYTHON_USEDEP}]
+			>=dev-python/tomli-w-1.0.0[${PYTHON_USEDEP}]
+			>=dev-python/virtualenv-20[${PYTHON_USEDEP}]
+			dev-python/wheel[${PYTHON_USEDEP}]
+		' "${PYTHON_TESTED[@]}")
+	)
+"
+PDEPEND="
+	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+"
+
+DOCS=( {CHANGES,README}.rst )
+
+src_prepare() {
+	local PATCHES=(
+		# TODO: remove this when we're 100% PEP517 mode
+		"${FILESDIR}"/setuptools-62.4.0-py-compile.patch
+	)
+
+	# remove bundled dependencies, setuptools will switch to system deps
+	# automatically
+	rm -r */_vendor || die
+
+	# remove the ugly */extern hack that breaks on unvendored deps
+	rm -r */extern || die
+	find -name '*.py' -exec sed \
+		-e 's:from \w*[.]\+extern ::' -e 's:\w*[.]\+extern[.]::' \
+		-i {} + || die
+
+	distutils-r1_src_prepare
+
+	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+}
+
+python_test() {
+	local -x SETUPTOOLS_USE_DISTUTILS=stdlib
+
+	if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then
+		return
+	fi
+
+	local EPYTEST_DESELECT=(
+		# network
+		# TODO: see if PRE_BUILT_SETUPTOOLS_* helps
+		setuptools/tests/config/test_apply_pyprojecttoml.py::test_apply_pyproject_equivalent_to_setupcfg
+		setuptools/tests/integration/test_pip_install_sdist.py::test_install_sdist
+		setuptools/tests/test_distutils_adoption.py
+		setuptools/tests/test_setuptools.py::test_its_own_wheel_does_not_contain_tests
+		setuptools/tests/test_virtualenv.py::test_clean_env_install
+		setuptools/tests/test_virtualenv.py::test_no_missing_dependencies
+		setuptools/tests/test_virtualenv.py::test_test_command_install_requirements
+		# TODO
+		setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_basic
+		setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_ignore_errors
+		setuptools/tests/test_extern.py::test_distribution_picklable
+		# expects bundled deps in virtualenv
+		setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_in_sdist
+		setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_not_in_wheel
+		setuptools/tests/test_editable_install.py::test_editable_with_pyproject
+	)
+
+	epytest -n "$(makeopts_jobs)" setuptools
+}
diff --git a/dev-python/stripe/Manifest b/dev-python/stripe/Manifest
index ecee8e4e6c02..e477eaf4fedd 100644
--- a/dev-python/stripe/Manifest
+++ b/dev-python/stripe/Manifest
@@ -1,3 +1,5 @@
 DIST stripe-3.5.0.tar.gz 247698 BLAKE2B 8c47b3f4af21934d4dddea2d95831d5d4772c0cf42f8a5d3cff90dbd2dfd51a37c34f92b6df30ddcafbb1ccbde766744ec63fe62881acabbf1437a626ec0ef6c SHA512 67e63f95b489e049d81d9b3929342a8cc2bc3638060d9f278752459d32408bfe8d5f09c4c047a1ed0deedce875b0a84873a3b120f6bb5f30c0668eda5129e4ee
+DIST stripe-4.0.2.tar.gz 252436 BLAKE2B d05153e4ddc58b5cbb9f42202a5b8dbcaeff39fab51b5415c59bbbfd615003b4d76881a408fd067a0e17d275a663e7ac8d574af6ead90f9c51e677617ef6117b SHA512 b13ace2419555e21a93f37a328bd59d9ac8af69787dc89ed4851ce5a5a616a34e63d5667b9981f43c486dafee18186a9dc32524c047c9db204dc8ba831198c91
 EBUILD stripe-3.5.0.ebuild 1816 BLAKE2B dd5c528e14494869144732d3737c4476da4508ea7547f3bcafa23738d25bf033982ea0c2af17052e6a34c614cda01ec807cb59c0603ed28741f1cfd19716c04f SHA512 a9d6b9a3ab36381b744e7ea7e81b3816ecdafc58c1fe8aa5452ded3aafec785ac9121feb4cb5d08e85c13d8f635fb3952450b361bb7908f200c6e4ff6817bdf1
+EBUILD stripe-4.0.2.ebuild 1818 BLAKE2B 62e5d31e23a51d274c3ce0c6adfc6793f79574e94f82ad6959472b84dd476f9843117c91fa28becb41262dd2f5a857c48c78c39d9b09fcc1c0be9757bd60c4fa SHA512 31bedf5400003a964b3294dc070a19ae1a5e622a22f69ccfd4b095498dad40807c34dcc23866e65933600e702cd02538d704ac098eb32f3d978a6a92df3e2d88
 MISC metadata.xml 372 BLAKE2B e6a38fdec6fc016068e7a0522ba15e83bf358ba1475e54a9630b1e86c75bc14b790c59716317bd81438a1c770e4d31afbe04400ddcd5dd272715c251fd6cb1a2 SHA512 2d9672b242f2d38654f7906097e597dfbdf75afa3583ea331f61772db95d19a802e83ed523c67a6cf3da18411036055c0996fd04d99199618d5205be8a61bd77
diff --git a/dev-python/stripe/stripe-4.0.2.ebuild b/dev-python/stripe/stripe-4.0.2.ebuild
new file mode 100644
index 000000000000..85f74b80fdad
--- /dev/null
+++ b/dev-python/stripe/stripe-4.0.2.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Stripe python bindings"
+HOMEPAGE="
+	https://github.com/stripe/stripe-python/
+	https://pypi.org/project/stripe/
+"
+SRC_URI="mirror://pypi/s/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/requests-2.20[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		>=dev-util/stripe-mock-0.141.0
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		net-misc/curl
+	)
+"
+
+distutils_enable_tests pytest
+
+DOCS=( LONG_DESCRIPTION.rst CHANGELOG.md README.md )
+
+python_test() {
+	epytest tests
+}
+
+src_test() {
+	local stripe_mock_port=12111
+	local stripe_mock_max_port=12121
+	local stripe_mock_logfile="${T}/stripe_mock_${EPYTHON}.log"
+	# Try to start stripe-mock until we find a free port
+	while [[ "${stripe_mock_port}" -le "${stripe_mock_max_port}" ]]; do
+		ebegin "Trying to start stripe-mock on port ${stripe_mock_port}"
+		stripe-mock --http-port ${stripe_mock_port} &> "${stripe_mock_logfile}" &
+		local stripe_mock_pid=$!
+		sleep 2
+		# Did stripe-mock start?
+		curl --fail -u "sk_test_123:" \
+			http://127.0.0.1:${stripe_mock_port}/v1/customers &> /dev/null
+		eend $? "Port ${stripe_mock_port} unavailable"
+		if [[ $? -eq 0 ]]; then
+			einfo "stripe-mock running on port ${stripe_mock_port}"
+			break
+		fi
+		(( stripe_mock_port++ ))
+	done
+	if [[ "${stripe_mock_port}" -gt "${stripe_mock_max_port}" ]]; then
+		eerror "Unable to start stripe-mock for tests"
+		die "Please see the logfile located at: ${stripe_mock_logfile}"
+	fi
+
+	local -x STRIPE_MOCK_PORT=${stripe_mock_port}
+	distutils-r1_src_test
+
+	# Tear down stripe-mock
+	kill "${stripe_mock_pid}" || die "Unable to stop stripe-mock"
+}
diff --git a/dev-python/ubelt/Manifest b/dev-python/ubelt/Manifest
index 941a44d7df41..ef422cd6620a 100644
--- a/dev-python/ubelt/Manifest
+++ b/dev-python/ubelt/Manifest
@@ -1,7 +1,9 @@
 DIST ubelt-1.1.1.gh.tar.gz 263082 BLAKE2B c146cfa7084b1d04d5a16443e5f8bdd4858992c2de1ff68a28c0febc74728da6320f45661cea69f88530a2fb88ca421cfc103f7f9f6ff420cf65152cbd61576d SHA512 d4d77013920563f3b2e5f47365624a4a794d84047eeb2eccaf2888f8d574c38b047393e550399e0d7ea7df373dabd40acce05ac56db4f0099da8f2a39113fc5c
 DIST ubelt-1.1.2.gh.tar.gz 267530 BLAKE2B c00c0b9d548b324090c012a0b1786c7011e9a3ccbdf055e5db39597fe8b695c785f0499a0f089c63c61ea7da76cd6cd802122d0f0e2f77aef4c08568331a6be6 SHA512 e2e77b1736870a010a3256cef2d4071294fdb525c0c6ad8d4665cc85b05148b7381e66f06c2ff74d1ae3588d78daaa71fb8a1907ae1585edb3ff9f2c9fb62b59
 DIST ubelt-1.2.0.gh.tar.gz 290425 BLAKE2B f4bae0580dc70461082e906892dbe7bc635bbb3ce9f4cf82ec101deb7ac5b23633232ebb6fe579258c9b0add00fd9fc08d01312c140ae3fca431c646945f0d67 SHA512 4009a3de269140340dcdc70cf150ec55576a10506942195261b4420bb471d00a11771bae5366b72f901c89f74843a281a2b147e9b565c2d256f1a0fdcc2c665d
+DIST ubelt-1.2.1.gh.tar.gz 294026 BLAKE2B 7c1050a1107ebbc833c19adeb6c53377842634b8f7a861825d637d578ad7e1a5cab4410c9b07913c3a29fe9eb1f84bc61694269ce86b02cef5170eed4c3e5dd5 SHA512 6ac74a09a00693d8f4091952e1c7ec06646c48b0d8cf3affe7154e20c708ceb95ba9e113c4f10fa73fb971e6d932e3aea04b1aa7d2c9d446f1de5269f91cafa0
 EBUILD ubelt-1.1.1.ebuild 910 BLAKE2B e54c0a82b1b0b881cb42008ec7ed95fe931ec28bf910562fbf8c98f980ada79a2c61f9735e1bc50cbd8d4bbffe5ad2a91a2207c3463e7c8740a271ce3392b668 SHA512 bae44559a7367a187d032c306920c41382ad7f912a8319ae922de94caa5fdac9319a016c8da0f034214d13b61f2b698485d238ed5e7e3c9b050d1a765f976e39
 EBUILD ubelt-1.1.2.ebuild 910 BLAKE2B e54c0a82b1b0b881cb42008ec7ed95fe931ec28bf910562fbf8c98f980ada79a2c61f9735e1bc50cbd8d4bbffe5ad2a91a2207c3463e7c8740a271ce3392b668 SHA512 bae44559a7367a187d032c306920c41382ad7f912a8319ae922de94caa5fdac9319a016c8da0f034214d13b61f2b698485d238ed5e7e3c9b050d1a765f976e39
 EBUILD ubelt-1.2.0.ebuild 959 BLAKE2B a839b46f82ff9e2cc8652f779fd1e4b5a6e290fff28ebc946b0f8bdbd96bbf275a8093f403f07a15554d84438a62e818c2cd8b57513743fff0849cde649e3681 SHA512 4f276af50c72065e70b807233f1f395b26d968afc9c6e903df277f3d685118f6c74e8d95088757eee6965c01672ba1d268be66594c6819d45c62ae7e022e4c10
+EBUILD ubelt-1.2.1.ebuild 959 BLAKE2B a839b46f82ff9e2cc8652f779fd1e4b5a6e290fff28ebc946b0f8bdbd96bbf275a8093f403f07a15554d84438a62e818c2cd8b57513743fff0849cde649e3681 SHA512 4f276af50c72065e70b807233f1f395b26d968afc9c6e903df277f3d685118f6c74e8d95088757eee6965c01672ba1d268be66594c6819d45c62ae7e022e4c10
 MISC metadata.xml 423 BLAKE2B 3327e3ecc16b8971759b84617779a2b4d5072a34547815c8314809a911e6d557fdea620c90a255ef7f89cb2c941a46a7e1dcbc62e5e6b46f19255758f42890fc SHA512 967c14f809f73fc1bb48d730406512d3f87531486701ad4be8dfb4e5cd0c1265c082596768d36c4950734c653cec56484fb3e5b79ce13dddde38977f88889124
diff --git a/dev-python/ubelt/ubelt-1.2.1.ebuild b/dev-python/ubelt/ubelt-1.2.1.ebuild
new file mode 100644
index 000000000000..222d3a32f9b1
--- /dev/null
+++ b/dev-python/ubelt/ubelt-1.2.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+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/requests-2.25.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
+)