gentoo auto-resync : 30:12:2022 - 08:16:57

23 files changed, 564 insertions, 188 deletions

diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index e07348675c2a..3cab35d4143e 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index c4ac5b1e1f6f..1b7c74fc3992 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -8,6 +8,7 @@ DIST boto3-1.26.36.gh.tar.gz 584205 BLAKE2B d5aad2ab0b8ee3392c636309454859e30cbe
 DIST boto3-1.26.37.gh.tar.gz 584822 BLAKE2B 08c08502f3defee6365aa19a55cb5bb6c006ce9685421119d1469f90f35e0aeb49fc11a6c5dd133cdfe1138248c0952338adb7b864010825f6f32f40398c2f4f SHA512 4c73b45cae0ed42f219b77d5b58f26560f3ac660d66eaea0c8452053ed38b4c8cc7ab168062483a52e091f7241623466a473368e0545a9fa07c0ac12d0185e31
 DIST boto3-1.26.38.gh.tar.gz 585100 BLAKE2B 22bbaad5e5ba59c29300ac1331e570b763d7544c9feddff307b2eba3e3da9076c6d64ed189d115ff63fd2deb156f6edd2a767121489c5d02e9ee0b897cb39712 SHA512 f97bd9cffd6d4c4d03841038940edb592962b72a3595e9255fc0af491aee1eb1742e819861c8f207383062f6ec284f8ecc37e9a30c59eb1e7702066b4a7c988f
 DIST boto3-1.26.39.gh.tar.gz 585471 BLAKE2B acf5631bccdc96f540bdd9396084f09d0b3d070f6b0d3a85267eeb54b1c1b1e5e38b662114dd8a52fb839f168f6d5694647a87559c389f4acbc23ee6bc0dd38d SHA512 d795dd9a553932d75317cf0f528757be201e6655e088499733318068fd8d15bb04dc67d370b1d5160b46eb3fc4ed489dc66181ac12e2d91c0b3a3c86043abdd0
+DIST boto3-1.26.40.gh.tar.gz 585787 BLAKE2B b738ffbae9d03b3f1d87dbdd0296007f69b7665e5aafa63c986205dc0bf77e1fab60e6079845a7a2419a81bfbc681c5a48d7557be348532df13b09284c417dba SHA512 b86f3109a55c244e231e00bc9d098da0a797f0d88cc9b033e39decc49c5288d437d26db7ee403cbbc48f3e66d3646117824167f5eed4629d315686da24b6511b
 EBUILD boto3-1.26.20.ebuild 1579 BLAKE2B 394d8a1bb7a1036ab4821bc789c9eea285f8a6a7c21e751d60c94a53d5fdd37119eab54bfd19bfe0856b7557df04340f50c7cebbe631234e8f582e7d62af13ec SHA512 beee3b634e3b1d66365beb2e97b9d09188fa795e00d9d05f2101de423128741ee1f8ad8ae4b0c35f1e6c6473ce73cc3acf47d9141029b4435d39a9803a5fe1b2
 EBUILD boto3-1.26.29.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
 EBUILD boto3-1.26.31.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
@@ -18,5 +19,6 @@ EBUILD boto3-1.26.36.ebuild 1587 BLAKE2B 2fff9e50b68aab4197c1dda600ba71e8ee090ea
 EBUILD boto3-1.26.37.ebuild 1587 BLAKE2B 2fff9e50b68aab4197c1dda600ba71e8ee090ea02195375d9a54afe0eaaccec42d917a8057878e5a0bb1a19adc79ff40ec8f3074888145409bd240cd5a28ee48 SHA512 819fea2080e15d23d5bc642aa56cabcf38852c77f06a495e08dea653deafa588284d5569070acdc2a5c534f9e217e8ea4d045cf39ab735437d81589fd97d639b
 EBUILD boto3-1.26.38.ebuild 1587 BLAKE2B 2fff9e50b68aab4197c1dda600ba71e8ee090ea02195375d9a54afe0eaaccec42d917a8057878e5a0bb1a19adc79ff40ec8f3074888145409bd240cd5a28ee48 SHA512 819fea2080e15d23d5bc642aa56cabcf38852c77f06a495e08dea653deafa588284d5569070acdc2a5c534f9e217e8ea4d045cf39ab735437d81589fd97d639b
 EBUILD boto3-1.26.39.ebuild 1587 BLAKE2B 2fff9e50b68aab4197c1dda600ba71e8ee090ea02195375d9a54afe0eaaccec42d917a8057878e5a0bb1a19adc79ff40ec8f3074888145409bd240cd5a28ee48 SHA512 819fea2080e15d23d5bc642aa56cabcf38852c77f06a495e08dea653deafa588284d5569070acdc2a5c534f9e217e8ea4d045cf39ab735437d81589fd97d639b
+EBUILD boto3-1.26.40.ebuild 1587 BLAKE2B 2fff9e50b68aab4197c1dda600ba71e8ee090ea02195375d9a54afe0eaaccec42d917a8057878e5a0bb1a19adc79ff40ec8f3074888145409bd240cd5a28ee48 SHA512 819fea2080e15d23d5bc642aa56cabcf38852c77f06a495e08dea653deafa588284d5569070acdc2a5c534f9e217e8ea4d045cf39ab735437d81589fd97d639b
 EBUILD boto3-9999.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
 MISC metadata.xml 493 BLAKE2B 7d6324fc877ffe1d20c5369c2af0b09a7028f94d28f1841188913d0d8be7ea699c9d3f92c624992c4c96bd69615d3a1211a2483c76c56b7d3082492e43512523 SHA512 44420d8c03d5986f990b76369edfa8dfd7659b4952db3ad946fd05392ec594628a28745ad888d055d4f074d5214f61fcffafe6c04c4ab54109d45ac0371582bd
diff --git a/dev-python/boto3/boto3-1.26.40.ebuild b/dev-python/boto3/boto3-1.26.40.ebuild
new file mode 100644
index 000000000000..aa8071e64d5e
--- /dev/null
+++ b/dev-python/boto3/boto3-1.26.40.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_{10..11} )
+
+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 f62d51aaba9e..04aa7bccd5b1 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -8,6 +8,7 @@ DIST botocore-1.29.36.gh.tar.gz 11075582 BLAKE2B 4db73c753acc1eba93bc5fc3a2486b3
 DIST botocore-1.29.37.gh.tar.gz 11077206 BLAKE2B 59c877edba074d4d5858dbf0a4026c0884cc4fce5bc2c9a7d933cfbff8317825663955205ebc754f8a4713b817b7d775fe208d6946f788a1943989949da58a04 SHA512 e79447fe66a506326c5f6396a32b5f4f6560038c57ab03457c36c838f52c1e48a94cba7624350a738eb937d0f3954984b77fd97ffb4becfa72cc4c61005efd40
 DIST botocore-1.29.38.gh.tar.gz 11079677 BLAKE2B 3edca40f575278b24c4b65ccaba3432715f8d7908f6e561cc475963f0865ef777a53845a1e8579f023a4943d69f33c8e1071afa6dd214d480dd48bacc8c132e1 SHA512 814863a6653f36f58bb20d4c7e154ba6d731f4046f3183ce696f515b1baa5ce342620bdfdd09eeea3847c6494add5611651487ad4d8f9c773823cf20393cb940
 DIST botocore-1.29.39.gh.tar.gz 11079996 BLAKE2B 5354766665b3402861cd497ee2831cb82c7d6db977c6573cb43cd70ec06291a4eba6c39a601c798414c2fb47c92f14df6e302623c1d5a5523edfdd9c977bf579 SHA512 bf7c30313737792eea1506855aa166cac63fcba48b764ec5e5b2313c9c66fe48970cfeef1f7405f329db715ee0b9d49ff4550d6d69ccd4c7db09923e77bcbe8d
+DIST botocore-1.29.40.gh.tar.gz 11081508 BLAKE2B f303b055083d41646367ed8d1c72cbb51cd229d5a2e5268265e90ed9ddb1fe99bc314b1ca5ed44e537b4056e7f2cf14acf610e2d2b448419b7b735e26c57f81d SHA512 ad8c90fd4a6de0ef28bd48a870a5918ad12cc842b7c5abbc1fdd77a1a0dc9231f40ef76eab5f367009bb590437e2c109d40883cec2af961f379345d5da89b761
 EBUILD botocore-1.29.20.ebuild 1898 BLAKE2B 96ba15f9361114f85df2e6d1d2d17a1e1e1e88f9ede3d0dbb528ac195589670eddb17a452353eb3c91014fee6e5737a7e581e0aebd62bc25ff752ffbb22b0572 SHA512 a44a1049cfc316267502dd278d62eb7850a63b94191ac8ea017af4d0836fb6007a41082d14182fd0c679fdc4b5431e0bb2588084b95453fd587de2fffe801882
 EBUILD botocore-1.29.29.ebuild 1905 BLAKE2B 27d2867aaea19612f4561f65e9c018f7caa73a78b627988165703230bd47488a99b1b38bfbdf1dae735806a0de9ca9a17db8afb526121f8c5402e97ca659a6b9 SHA512 9aa2a546360c0bc286bfabb5adb2c95af40d4d405d89fc4186856814b9b88d158fa952d82fd42126876270615e88a24820ac61132e8fba8414db4ac01da2f72b
 EBUILD botocore-1.29.31.ebuild 1905 BLAKE2B 27d2867aaea19612f4561f65e9c018f7caa73a78b627988165703230bd47488a99b1b38bfbdf1dae735806a0de9ca9a17db8afb526121f8c5402e97ca659a6b9 SHA512 9aa2a546360c0bc286bfabb5adb2c95af40d4d405d89fc4186856814b9b88d158fa952d82fd42126876270615e88a24820ac61132e8fba8414db4ac01da2f72b
@@ -18,5 +19,6 @@ EBUILD botocore-1.29.36.ebuild 1906 BLAKE2B 6bb6097b84adeb172e43d2cccb963d8912fa
 EBUILD botocore-1.29.37.ebuild 1906 BLAKE2B 6bb6097b84adeb172e43d2cccb963d8912fa0b3f6d9a59a0a41ef645ceb5cb22e35aaf763a39e0e6905721e68f129f0bd14f01edf8d3706f5b666f3075023fa9 SHA512 1cc91fc5b2e9478efe06571396a67a94c582d2032f7d2c973ec4748a8ce490d2d0218fd8fbf49a94f74617f472040bf58c957f44a69498a0c2d3c47647ca99f6
 EBUILD botocore-1.29.38.ebuild 1906 BLAKE2B 6bb6097b84adeb172e43d2cccb963d8912fa0b3f6d9a59a0a41ef645ceb5cb22e35aaf763a39e0e6905721e68f129f0bd14f01edf8d3706f5b666f3075023fa9 SHA512 1cc91fc5b2e9478efe06571396a67a94c582d2032f7d2c973ec4748a8ce490d2d0218fd8fbf49a94f74617f472040bf58c957f44a69498a0c2d3c47647ca99f6
 EBUILD botocore-1.29.39.ebuild 1906 BLAKE2B 6bb6097b84adeb172e43d2cccb963d8912fa0b3f6d9a59a0a41ef645ceb5cb22e35aaf763a39e0e6905721e68f129f0bd14f01edf8d3706f5b666f3075023fa9 SHA512 1cc91fc5b2e9478efe06571396a67a94c582d2032f7d2c973ec4748a8ce490d2d0218fd8fbf49a94f74617f472040bf58c957f44a69498a0c2d3c47647ca99f6
+EBUILD botocore-1.29.40.ebuild 1906 BLAKE2B 6bb6097b84adeb172e43d2cccb963d8912fa0b3f6d9a59a0a41ef645ceb5cb22e35aaf763a39e0e6905721e68f129f0bd14f01edf8d3706f5b666f3075023fa9 SHA512 1cc91fc5b2e9478efe06571396a67a94c582d2032f7d2c973ec4748a8ce490d2d0218fd8fbf49a94f74617f472040bf58c957f44a69498a0c2d3c47647ca99f6
 EBUILD botocore-9999.ebuild 1808 BLAKE2B 720965dfc40c51389a8ca4ac210039f79bbe3047f583cb1bd4d52bdb9720cb2283a13a9f4337a62aca6869cd75d78dac6cc07436524e9720386177c733d686f3 SHA512 d3a3fbc0f957b58e8161ae3fffedb44462000077aa368dd2fb183bf6a084771bff4db46344a4d0b451833ea05d326b452155af92d190c313e1d982da7d72fc10
 MISC metadata.xml 499 BLAKE2B e5aaa7da26f200c09adfdf38b68f656bbccbec627cb5d966b280ac2165334e7eec659c89075bcace748f58e2ec3e7d2998e54a688d56ecea2d30653c67dfd35a SHA512 103c554d5dbd967bf9b6e418b3913d9235e7e910d012160909ce0715134ed2e37b06e6a345395f9d16ce08d1cf51f3ce458bce93c6a978fd3dca6610f2acdbd0
diff --git a/dev-python/botocore/botocore-1.29.40.ebuild b/dev-python/botocore/botocore-1.29.40.ebuild
new file mode 100644
index 000000000000..36f6e1eb862b
--- /dev/null
+++ b/dev-python/botocore/botocore-1.29.40.ebuild
@@ -0,0 +1,74 @@
+# 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_{10..11} )
+
+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="
+		https://github.com/boto/botocore/archive/${PV}.tar.gz
+			-> ${P}.gh.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}]
+	)
+"
+
+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
+		# fails on unrelated warnings
+		tests/unit/test_client.py::TestAutoGeneratedClient::test_BOTO_DISABLE_COMMONNAME
+		tests/unit/test_client.py::TestClientErrors::test_BOTO_DISABLE_COMMONNAME
+		# TODO
+		tests/functional/test_credentials.py::SSOSessionTest::test_token_chosen_from_provider
+	)
+
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/icalendar/Manifest b/dev-python/icalendar/Manifest
index 28b4c21d414d..4d37f2db2025 100644
--- a/dev-python/icalendar/Manifest
+++ b/dev-python/icalendar/Manifest
@@ -1,3 +1,5 @@
 DIST icalendar-5.0.3.tar.gz 101431 BLAKE2B 4c98880f661c5cd8025e7e281dbd392ff9333c3a4c3850d7826cbbb15401d0916e24c1478ac3098c58709a065f3de21b7d8fea56ad7df40aec06b989a77deac5 SHA512 ee278a4776cbac3dfa99e8931fc48be49b06e3354689c8d5132ff53092edb913c24a61a69dac7f5de3defdb929a6b53374209d3f7a8dd5af53f414e5aadfa44f
+DIST icalendar-5.0.4.tar.gz 102093 BLAKE2B 5bb618f8abfa8c96cdf45b0fd85f97ecfbe99361fb2eda08fe6ba43da1d01642e116218bc01353a745f6dc401278887d5ffc616fcf666691360174459c896362 SHA512 5b9b1b770c903bec4d8e5a4dc20b82d8e35eb86e6421d62abad640e65db20ccc71757a939e9ccb051653962ab5725e80dbc024703de158fee2cb0d608b8b5732
 EBUILD icalendar-5.0.3.ebuild 1015 BLAKE2B 215e568a91ba34b61a865fba669f4a6dbe1ef15bbd972d05f4e4eae20502a7363708a36ef279dee651841fcd80007d223dee84d86035e705e8de0f3eb4ee2928 SHA512 2c954a2f3b4d5053cf284e1692753dfe305a496100ea5630f6ab1bce2e8d4ec23db22c57ebf8a5e14c2611f7c4aec284790cb6b7bd7455b4f0b69a55065082f9
+EBUILD icalendar-5.0.4.ebuild 1017 BLAKE2B b67fda0e16185d243a0989256bdd1342469293c0f127692e354bc2b3dfb8e0e797d87d2d4b02a597179b6c92ee50820eaaa15d98ecb3847b2cbb4ee8d31d94dd SHA512 da2af57bca5c43ba592151bd627afd8bc021f0d7649d2eee88af88c551cfd86d43439fd32f8c2d63f999793af9bb153d6985350e4d5be38ca5b8049bf5ee34a8
 MISC metadata.xml 503 BLAKE2B 284f63e95eb2d3015979a14774f8ff9df0df701b81f8aa2c7583f52d05973cfede1db8eb7904203b854165e10640cc50a0e3cf14d9aff090d9ff657c53098cee SHA512 d206db3c1255c8e475c4289c548f0224c7fc507aae513d3c15706998892ef8450400a97bd07dc7d52142a03cad4abae3595d5315d8912586440df74096edea67
diff --git a/dev-python/icalendar/icalendar-5.0.4.ebuild b/dev-python/icalendar/icalendar-5.0.4.ebuild
new file mode 100644
index 000000000000..c68083d1dacb
--- /dev/null
+++ b/dev-python/icalendar/icalendar-5.0.4.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Package used for parsing and generating iCalendar files (RFC 2445)"
+HOMEPAGE="
+	https://github.com/collective/icalendar/
+	https://pypi.org/project/icalendar/
+"
+SRC_URI="mirror://pypi/${P::1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/backports-zoneinfo[${PYTHON_USEDEP}]
+	' 3.8)
+"
+BDEPEND="
+	test? (
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# reset conf.py to not read version from an installed instance
+	sed -e "s:pkg_resources.get_distribution('icalendar').version:'${PV}':" \
+		-i docs/conf.py || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/lz4/Manifest b/dev-python/lz4/Manifest
index 54304b4cf97a..503ae6e32a75 100644
--- a/dev-python/lz4/Manifest
+++ b/dev-python/lz4/Manifest
@@ -1,3 +1,5 @@
 DIST lz4-4.0.2.tar.gz 164309 BLAKE2B ea08c9786ee224aaf668a74269413c836a4288ab1a3c27497012621bdda9c8c1729c4cb6ba49cb74e7e5302fabbfddba94f8ed94a9612fdf21018a5cbdc70566 SHA512 f2fdd133b9c7389cd7d45b41e61944093b65bcbf529146740fa3721e683a9b4554166c2ad719298e6153e61facc4a4cb021ffd969cd16d4a5b6555fd8f14728f
+DIST lz4-4.3.1.tar.gz 170970 BLAKE2B dcc2f67860f60a7805c2d302aca3b610198e128e2dbd1c54d78ffb65c4baec3cf4ab7dfe2aebf713397e67d9c8b9a95a0dbb493c16692f2591d657bfe1a3da43 SHA512 4dbb3179892d44fe7d7b5280931c39434d28f5750b4588a16a5547588c756e4279daf8a5f0edcfaf958c7cb25e65188c0a9bb36509d0dc7a7083072a19ee6d55
 EBUILD lz4-4.0.2.ebuild 845 BLAKE2B 29d2fb2769362cfabf157882f7c75e790f0ad390a9d1b6c1d51ea7e6421aebe73419a366bc20f717e364d86e4c0854029c31c619e3947f8afcee673c78e9df9c SHA512 e5574d41eae03b184952862dff8cc36b14684358b5ce4a6d30c45449ddd6e499f45e536625b1f04c5ea105b522df87187c37132e29e3561f32fbe2e7330f2a60
+EBUILD lz4-4.3.1.ebuild 854 BLAKE2B dcbec0b2284927a0a4a512be0125a0e5b9245e9a0e5517545afcf1599f95fb5606438c1007271c141e4889a5a986e1f8fb4ee62b9d1127a36bedae83fb8c11b8 SHA512 d044f9d8c035e08a44b259ce7ba6038ade49fa3fd23062de7ca9b57b6897fe9a4a3bd1cc012a61f063bf153461a2a9ed69c5c7bbd0c697cff50eacd921d84780
 MISC metadata.xml 454 BLAKE2B b02d4acc9eb7d4fb35bf36371cb660d099c77f807fc08fc351b7e0e1d2e0199fdab82d83bb6bc31a56bfdb9a5b020b2f57aa9b89b59a7e5c22fcce554b6b0859 SHA512 a1b61eb4d3ce636b10abcff25ee3315bf5ecb3bdee58e1c45ff99f0b40717b13e3a8ec33c9abcb926bd716990a31749b1bf6729d8137b7859857318c386a8ec7
diff --git a/dev-python/lz4/lz4-4.3.1.ebuild b/dev-python/lz4/lz4-4.3.1.ebuild
new file mode 100644
index 000000000000..358b79f49818
--- /dev/null
+++ b/dev-python/lz4/lz4-4.3.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="LZ4 Bindings for Python"
+HOMEPAGE="
+	https://github.com/python-lz4/python-lz4/
+	https://pypi.org/project/lz4/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+
+DEPEND="
+	app-arch/lz4:=
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/pkgconfig[${PYTHON_USEDEP}]
+	test? (
+		dev-python/psutil[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_IGNORE=(
+	# lz4.stream is not officially supported and not installed by default
+	# (we do not support installing it at the moment)
+	tests/stream
+)
diff --git a/dev-python/nbsphinx/Manifest b/dev-python/nbsphinx/Manifest
index c7bd340ed96c..8433a695c85c 100644
--- a/dev-python/nbsphinx/Manifest
+++ b/dev-python/nbsphinx/Manifest
@@ -1,3 +1,5 @@
 DIST nbsphinx-0.8.10.tar.gz 177352 BLAKE2B e9fce12b59afe4b364be36ecfe4abc98e9444feafd52fa647ca2832622d875f78389928961d2c53235f466c55e9e1aee8ecf9db6751dfe7d0db8d40502876459 SHA512 a010ceff90d59d3cbff7953c1c807b9ff23661e1fb2255d5af151f6a1b4a2441f7a836a4fbea5ed11eda42ca8a0eae091ffe7d87c09940480d5f4e3311bb177b
+DIST nbsphinx-0.8.11.tar.gz 177598 BLAKE2B 5a8db76cdc39b19ec883f1ee58331248cc952786ffbe1a5ac75261a8258a9f36370366bf7654c6eecfdae17b324dab6ff2981c791dcdfb15cabeb0eea3b3f9ba SHA512 fb3e6d8074b639adc810ec0970e22d7f50bcadc072cacb0601bd9da3eece16c8af052360ecdd5c66b61ce4146deae10e44c3acd431073bd6086cc524b6861002
 EBUILD nbsphinx-0.8.10.ebuild 700 BLAKE2B 41f6b858efc06c285c604dff3cdc05d563494787e0579d3b77ba3d2321a74228c57db88988474636b65dcf9c433613aecd7b50efbd69937e610a035f9d7764ae SHA512 8732fe6d3ecf2aadbcca2ee9337702ab6b9b20794799bcdbd829bc94b42da2f90e7c5450392bbc507cda0ce8a1dccc3a2b055a869ea05dbcb865fb31085835a4
+EBUILD nbsphinx-0.8.11.ebuild 702 BLAKE2B fed2b8f87d466700aac2ffb1a3b2c03bdaf4be53ebd26b06369235411a2058bbf5bd127ed52c75727381dad9bf29b5c1430b4279b980f447fdb91e114e0d8785 SHA512 1a8e1107b5834f1de51e0cdca36dc76af5d0d96f6a876c939d8eff6501ee780489f85faf9d427a6b52892340c67552d66bb2f74308a70cc153e93b8573198159
 MISC metadata.xml 835 BLAKE2B a3a10c9fb26688d90ad6f4e2ddb8b174eae9fdc2637d4aabdb86f63093982c7c9a42c4eaa3b2adee6ddb12ba2d537aec79d324c0a3c7355424a4255cea90eda6 SHA512 9ac5cebe164b19f80e0eb07f7c4fb5cb2cf5251af1f81290931f8fd01223261cb6224500387c131c7bc8738d7bb07eb790fd9ea426a295d0688489510e58d55c
diff --git a/dev-python/nbsphinx/nbsphinx-0.8.11.ebuild b/dev-python/nbsphinx/nbsphinx-0.8.11.ebuild
new file mode 100644
index 000000000000..c39328378976
--- /dev/null
+++ b/dev-python/nbsphinx/nbsphinx-0.8.11.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Jupyter Notebook Tools for Sphinx"
+HOMEPAGE="
+	https://github.com/spatialaudio/nbsphinx/
+	https://pypi.org/project/nbsphinx/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/nbconvert[${PYTHON_USEDEP}]
+	dev-python/nbformat[${PYTHON_USEDEP}]
+	>=dev-python/sphinx-1.8[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-5[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/pip-run/Manifest b/dev-python/pip-run/Manifest
index 01fc1b46c690..770d64afeae2 100644
--- a/dev-python/pip-run/Manifest
+++ b/dev-python/pip-run/Manifest
@@ -1,7 +1,9 @@
 DIST pip-run-9.0.0.gh.tar.gz 23171 BLAKE2B ca1bee27f4d1826029aa2520dbad9807d22ce66326fd917f0b7687284ce3daf9abcd45e593d735633fb86186ea88ffa0b71780f9b56e27458798763db309bd9d SHA512 117b2260fe628dcc5aae47335ab645c2db47ca9b4d5cd0446ef11bb399c0e91df3a32b61aa7a228aca4d7b837228ddb41fe010896f7debf5fbca6111398cce73
 DIST pip-run-9.2.1.gh.tar.gz 24104 BLAKE2B ebb26cd5356a5919d74c6601b36deed0046c0d67d7533f5817b62b7b7ba74240ef44dd2425be7143f8432d3f8a3f611a051f099b6059e64479eadd77e8f39b45 SHA512 f320da7641817df5c9418094fb49792e3368907ddac551ef22d97ab45b5183cb84f40338da106d5a47d238ca68ca376cbfc6d6c3528b9fca1db02bf910bd3d28
 DIST pip-run-9.4.0.gh.tar.gz 25821 BLAKE2B 8d4d9712f0563d3edf8d963e14221fde89cffc14c3fb26afc2b18bdeca9917cacb27c88a815d398d2b67f10112e888c9f60b497c3c1bf59d0105a4c972aef15d SHA512 c266e6eb30f21ddfd89cc25dee5c56542b3734497d59315751c190e7bd985c6746b95802255ec05da19d5cec8822f4fa169eba4218989013e36a2c118d560f4d
+DIST pip-run-9.5.0.gh.tar.gz 25620 BLAKE2B 156b33f6978ae7c26e4f73be931f887b0a6d793414dee5b69290b88eb849b487d366ce722d6cc6eb58a10074c779cf7dd4bbbdf192bb57494757a6f9c11adbee SHA512 5f1a59e60203dc5e5fd818687112f23ef93117af315161a4ce31e2de183e097aa205af12bd81f45aac91ab2b6a18fbd6a0275b9ad3ce3a7942140b345f49a7a9
 EBUILD pip-run-9.0.0.ebuild 963 BLAKE2B e176a68ad10beab276e7150bd917d9d3dd5507e8000932e6afae6bc662838af36d5f377b9515208b12e4464eb5fbc2c137c1f1531e3891eb616d7f96c4b9c56a SHA512 7f72c4b7def3b9b29fa49dffe2accb678a696f9742846e2a812908f1bba2039867a003f45f005d2f61a1c7604c1f100ff447601a05e5718b8651454737f87191
 EBUILD pip-run-9.2.1.ebuild 1144 BLAKE2B f521960057405acc8f2ed3e52b051e90da48a3655d344776956602ef749543289eb30879acf63fdfd8065cc1edd6ff00ff908bfc3731ff7733f47d7e9dcf11fd SHA512 5822639fa79991d6a9b09ab296e94dbbb5d1f31f75ee3c4de74a141603ee9ff542f5ad9229b71fc9711abb088ac5b982987d3a62fe0178bb5bd4242cb8dce8a7
 EBUILD pip-run-9.4.0.ebuild 1187 BLAKE2B 327330f7d8a2dff27d8cc73f04c7a11c3ac78819abdd343bd5cb6634bd59f79e17849c0dacbb2dfddbc2c8aee9d68e68bf2e36886f07ade3065f2c991bfff7af SHA512 ca895f4f7849d554d280ab6b87fd64506bba42a76d0695af9501d1a9e223e9f45e6a510eabc5ca3bd88e88ea76754521245dde55cba18d123e6f5bebd5811693
+EBUILD pip-run-9.5.0.ebuild 1187 BLAKE2B 327330f7d8a2dff27d8cc73f04c7a11c3ac78819abdd343bd5cb6634bd59f79e17849c0dacbb2dfddbc2c8aee9d68e68bf2e36886f07ade3065f2c991bfff7af SHA512 ca895f4f7849d554d280ab6b87fd64506bba42a76d0695af9501d1a9e223e9f45e6a510eabc5ca3bd88e88ea76754521245dde55cba18d123e6f5bebd5811693
 MISC metadata.xml 389 BLAKE2B bc573b4f57b4f8371ecef97266b8441d47e66d551f7088a7f312ca049f7debd90e989d24d59d7aff182795ae27e553d131f3875c789dc793532ff9c812bcaf20 SHA512 00b81cba684e7118a3ce79ec5cb6a27d6ad67064a2745ffead8dec51c7786c9441139b800868cad8854ff39d7e38163ab2c8fa5c7d3f328390b628f8342fb0ca
diff --git a/dev-python/pip-run/pip-run-9.5.0.ebuild b/dev-python/pip-run/pip-run-9.5.0.ebuild
new file mode 100644
index 000000000000..ad6c04401b19
--- /dev/null
+++ b/dev-python/pip-run/pip-run-9.5.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Install packages and run Python with them"
+HOMEPAGE="
+	https://github.com/jaraco/pip-run/
+	https://pypi.org/project/pip-run/
+"
+SRC_URI="
+	https://github.com/jaraco/pip-run/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"
+
+RDEPEND="
+	dev-python/autocommand[${PYTHON_USEDEP}]
+	dev-python/jaraco-context[${PYTHON_USEDEP}]
+	dev-python/jaraco-text[${PYTHON_USEDEP}]
+	>=dev-python/more-itertools-8.3[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/path[${PYTHON_USEDEP}]
+	dev-python/pip[${PYTHON_USEDEP}]
+	dev-python/platformdirs[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/jaraco-path[${PYTHON_USEDEP}]
+		dev-python/pygments[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_IGNORE=(
+	# Needs network access, and another test dep nbformat
+	tests/test_scripts.py
+)
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/pydantic/Manifest b/dev-python/pydantic/Manifest
index a835532131e7..2c0af2f88350 100644
--- a/dev-python/pydantic/Manifest
+++ b/dev-python/pydantic/Manifest
@@ -1,3 +1,5 @@
 DIST pydantic-1.10.2.gh.tar.gz 888288 BLAKE2B 9aac69ace185ccc56255cf36f9af472caf4c6bcbdcbb81eec66353f755673e9a240e7713c0a2ecff00a02e07b0069e4b3f1edda41f345698a979b79dd54b354a SHA512 dc2acfb271cd62b6de08bbaa48dbc76ec8d3a3f3142778ffa2cb9a2a1cad62dbdb3c7470a50e9a2825837b65a48c6aefb8736411f32c398aa9ca779841b53ac5
+DIST pydantic-1.10.3.gh.tar.gz 898768 BLAKE2B e8cec71f0d3f66e2c71e421505f624f7e92827f8fe4ef3a7c637b4f2cbc543d43e63739f8fed1a84246458d6675f19de9f83c7fc2a1d8f6e9fb18807ad5ace6f SHA512 7c9db4a010f14ab41b0e7782e59e51caded5de31798e4dd83e01037e3365e34537b30c79c12a6451fdee875e1bfe1a3d981cae58aa373917f71489231df2e6a6
 EBUILD pydantic-1.10.2.ebuild 2051 BLAKE2B e604c2f97eb44b3831cbc38286f9d7772c6fefec8fecfa704f634932e0cbfdf4636820f4f56666138ff84f208e4a83d3baf91f8c2def4dc383f73b125bcc9cf6 SHA512 794200edec67fa333ac403f3a504494f2e8a55295d1ff74ac360b70614db192852044b29bf2075a56143cc323303f87c7993b3df8946d4a66eaef2d7eaf303f1
+EBUILD pydantic-1.10.3.ebuild 2131 BLAKE2B 9cc5abeaa24167397e194ffe104fdf442adefe5664080764ac43f0ed02f819409b354378d1ab7477711dfb6788ece010820d470a9e00f7479a4867487844112e SHA512 61a67313323f0899636db89a48f9082f32225620820f94bc09e2e086a1738521b096e4328684773ffd87e0a2acf6d64fea7ac2c04ae14f74d7840ca4e532a548
 MISC metadata.xml 571 BLAKE2B 11d9b5831b90a37433b357349ad2fd9b0e908e054f849fee2cc16071c57b8d2d465c70275247f81d605a689ab16edaa160be3d802eaa00f3ecea4b884a5d18a1 SHA512 3f34f3708ad8fa0014f5f8ca4988225e03bb707a5ab91e295946fc480dc56eff04cff1746605e3ce1b33f9c5f94f390a74aeeb49f0d8fc5e8801bb85714117e6
diff --git a/dev-python/pydantic/pydantic-1.10.3.ebuild b/dev-python/pydantic/pydantic-1.10.3.ebuild
new file mode 100644
index 000000000000..6f11c38ea2f5
--- /dev/null
+++ b/dev-python/pydantic/pydantic-1.10.3.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+
+inherit distutils-r1
+
+MY_P=${P/_beta/b}
+DESCRIPTION="Data parsing and validation using Python type hints"
+HOMEPAGE="
+	https://github.com/pydantic/pydantic/
+	https://pypi.org/project/pydantic/
+"
+SRC_URI="
+	https://github.com/pydantic/pydantic/archive/v${PV/_beta/b}.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"
+IUSE="+native-extensions"
+
+RDEPEND="
+	>=dev-python/typing-extensions-4.1.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	native-extensions? (
+		dev-python/cython[${PYTHON_USEDEP}]
+	)
+	test? (
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/python-dotenv[${PYTHON_USEDEP}]
+		>=dev-python/python-email-validator-1.2.1[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/CFLAGS/d' setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_compile() {
+	if [[ ${EPYTHON} == pypy3 ]] || ! use native-extensions; then
+		# do not build extensions on PyPy to workaround
+		# https://github.com/cython/cython/issues/4763
+		local -x SKIP_CYTHON=1
+	fi
+	distutils-r1_python_compile
+}
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=pytest_mock
+
+	local EPYTEST_DESELECT=(
+		# flaky test, known upstream
+		tests/test_hypothesis_plugin.py::test_can_construct_models_with_all_fields
+		# mypy linting causes regressions with new mypy versions
+		tests/mypy
+	)
+	case ${EPYTHON} in
+		pypy3)
+			EPYTEST_DESELECT+=(
+				tests/test_private_attributes.py::test_private_attribute
+				tests/test_private_attributes.py::test_private_attribute_annotation
+				tests/test_private_attributes.py::test_private_attribute_factory
+				tests/test_private_attributes.py::test_private_attribute_multiple_inheritance
+				tests/test_private_attributes.py::test_underscore_attrs_are_private
+			)
+			;;
+	esac
+	rm -rf pydantic || die
+	epytest
+}
diff --git a/dev-python/pyrsistent/Manifest b/dev-python/pyrsistent/Manifest
index 887a49c3e364..682bbc356e2c 100644
--- a/dev-python/pyrsistent/Manifest
+++ b/dev-python/pyrsistent/Manifest
@@ -1,3 +1,5 @@
 DIST pyrsistent-0.19.2.tar.gz 102438 BLAKE2B aa231a7c300d2f1501abdf2fc74dfa9672ad8000d87e3fa9beaa51aff4816dad4f142e9a2e609dee402352cf5a0477b6d4dc31460a71e7d98a592604fcaa97d6 SHA512 fdaadb65e72db4f90ecb1526fd68eb2b60b278071978d4b5a1b1379be83c60d30fd653dd7e6527c217d4e50f05c7d641290172aa5d5e4741dfe5e08f0b0c282b
+DIST pyrsistent-0.19.3.tar.gz 102640 BLAKE2B 60c5ef9d3f26c4529d05804df13453c75b6ff70e12fbbbbe22312686da929766fc903b18ca77d626192e1f3fc9fbdfdbbbd4eef102f1504b38feeeedf00450d5 SHA512 6bb70b6fd65b5cd9f961a3199c2d90725aaa66fb869e4eba2143735e2f3a7e4ecdc782b3498acc2d92e263c3bed14cec8cc77324f4ebd08c300ba6735db5ecf7
 EBUILD pyrsistent-0.19.2.ebuild 653 BLAKE2B a0e141f6e4cc27b30ffa4d7fc77d91b2a62c0b21ed6d098b6aafb9243bda9ad0bfea46b3ad866dc4b369baad8d09552b7f2578b56bf4b4214de6eec4477f5da0 SHA512 38a60e54664c6865abcec9f02931cc92b4ed4427fcd6c278faa9b9d6acf39674a4487ba636e0587927ca39a353297bb86a686a1763183c941eb049411862c551
+EBUILD pyrsistent-0.19.3.ebuild 661 BLAKE2B 5ad77e6fd913eb877eefa8d08bc13b9fb449a1807d095097fa1bec0601749c9164d3ab2f51ec84b7e3ec6837aa461da68a6b4f2b00ea27454a386a8894007c09 SHA512 be6bed4b86d2ba4c2c276acde3bc4fe1ea1041b8a6b5c60c96b55620edb3c522d029503816040c79fec1a0d0169bd4e5714b6a0486b9df9f3cd83c39b12dc2c9
 MISC metadata.xml 522 BLAKE2B fbf571fd4d833fea0dc9942620655c45bb91b07ca02e2e0fccb23980de26303b9e9c3963453cae3775f7db33dfd485a4a55782a1b1b2b635af0d62e331596b99 SHA512 fe358befc92e29769bc2f84a516da1a26026e4ab84e812326da72ee02b18c79c3d6acdfb71cb6027d2d0f1e559cc00cf39406e335fb8f38d4479353a7dbb4ff2
diff --git a/dev-python/pyrsistent/pyrsistent-0.19.3.ebuild b/dev-python/pyrsistent/pyrsistent-0.19.3.ebuild
new file mode 100644
index 000000000000..7a4e9ef1fc6d
--- /dev/null
+++ b/dev-python/pyrsistent/pyrsistent-0.19.3.ebuild
@@ -0,0 +1,28 @@
+# 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="Persistent/Functional/Immutable data structures"
+HOMEPAGE="
+	https://github.com/tobgu/pyrsistent/
+	https://pypi.org/project/pyrsistent/
+"
+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"
+
+BDEPEND="
+	test? (
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/sphinx/Manifest b/dev-python/sphinx/Manifest
index f1fe0fe5bccb..fb5fac08c16d 100644
--- a/dev-python/sphinx/Manifest
+++ b/dev-python/sphinx/Manifest
@@ -2,6 +2,8 @@ AUX sphinx-3.2.1-doc-link.patch 604 BLAKE2B f23f8f9a0a48b170e2b6daaeded1e65aebe8
 AUX sphinx-4.3.2-doc-link.patch 745 BLAKE2B 94f190d63168be99c4719a917f0a1210c56284c278c3909d9de34a319b4d5afa2337133509c06f87e53d5ae488efd88b0f79542719e8870c137f160732c25189 SHA512 aed97412a49212856ea6ccb392c2aa210862ec25d49c4b81a7ff17bd2d0cfe4811d80f4047622f7b23473e31aad968c34098b590045c1d0592b19f4cb6ec8b3c
 DIST Sphinx-4.5.0.tar.gz 6698212 BLAKE2B e6c46d35492c3d3068c4f97e497d33973ca86b40934578804fcec901fa89d2c52b45a7546b835b873846dd16936c1bd34a7b053aec8206c688d974671155fd56 SHA512 b44d2a81ed67adaefe16a07ae0cf053b5e6c775023aaa6c57d7b3950f171deac410e8004f787b151c3c2fc350650aa69a4dc2dc7239d1fd3d351e5194617cb2c
 DIST sphinx-5.3.0.gh.tar.gz 6873479 BLAKE2B c57ede5e3d83447c6152d050d45df73bced62ce0cdcd84ea6316a48bff072590ad036c469dee053a9dc5eb1a7ae53b350aa25b5fe14c3378dc6543186552f720 SHA512 6877635d46f2e1f2b4cf4edaca463d85bf740a13bbeb867486efd57904aacc42626e6a4f58ad971e50808d31391d068702c4f2910a95e5c86dbd68d87e2552c8
+DIST sphinx-6.0.0.gh.tar.gz 6713685 BLAKE2B b2e333efdbbd319c82203a0ee731ae8b0bc8a848b92773bdaa93b52c3841ab3802f68f698155b8ce4f65af93fdbe741c3e37775defde6111ee6ad5db89f968d8 SHA512 6efcbe57170cacec6f3c7f11f09094d096dc2afb7e0470c7cbdb9ea209dcbb782a6227a32de41974258555fa01986406a6564587f6b414594c452dcc6b8a06fc
 EBUILD sphinx-4.5.0-r1.ebuild 4293 BLAKE2B 4bef871b4129b6048a45ca8bf8752a45543191caf84c18e80d826fc8d8c87c012cae76279ec25c9656b5e2e5f3801f15744e122d187514f1a41638efcca794b9 SHA512 331f455811a822b44a398eca904857fc6db2f91f447468029a855d87a5d72378caf9e504cd168511e24896425820c833c5cc10c6dfac005f952471f5808c1d80
 EBUILD sphinx-5.3.0.ebuild 4159 BLAKE2B accde61b8fbdf543a216f6847d34216b9f8762738c16372f86f2dd8588ca98aa22f697e7035490c7881c089ae52971ae35f7f807a703070ecdd01c52f8240810 SHA512 7e5eeb5fe0994d041d9e117acead996974d32c8b5f3dca1410035e62cc405ba417d5ba0be51b77bc4317f93f61822dd8d534aef2dbf8256e4790f9c2fa57a470
+EBUILD sphinx-6.0.0.ebuild 4214 BLAKE2B 86f400e52ff6701012808eb2fed8a0adfc8932f262a2f1c6f218a93136e36747960964542446fcbef3094cf04a13aab65f168e2beabc7afa2504f1297c26985e SHA512 0db69130926473882e99ee203a2955e4afe7ad1273fe2bc5a99c40be6d92f97a91d0601473411169957d1a78e063dbc064f91a9a0e1175db5aaf6fca9c3b7f2b
 MISC metadata.xml 568 BLAKE2B ddb7175070df6da4088813cc6b66f25bb4364e2619b1e7da94370f7ce8e73b68b12f618412f81e6be57fcb0c60c10e3913f26a6a578b0f9defa7b9ee8091fcde SHA512 d32b37cbe88f5e3db0c6968bc7aa22c7edfb3794bf7c62facd17e7ae1f4f0fbfc7c9f5512230cce16ed32e2ebb70c23dfe9b36ce38785c5f5b76585410313214
diff --git a/dev-python/sphinx/sphinx-6.0.0.ebuild b/dev-python/sphinx/sphinx-6.0.0.ebuild
new file mode 100644
index 000000000000..b7f342d8090b
--- /dev/null
+++ b/dev-python/sphinx/sphinx-6.0.0.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Python documentation generator"
+HOMEPAGE="
+	https://www.sphinx-doc.org/
+	https://github.com/sphinx-doc/sphinx/
+	https://pypi.org/project/Sphinx/
+"
+SRC_URI="
+	https://github.com/sphinx-doc/sphinx/archive/v${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 ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="doc latex"
+
+RDEPEND="
+	<dev-python/alabaster-0.8[${PYTHON_USEDEP}]
+	>=dev-python/Babel-2.9[${PYTHON_USEDEP}]
+	<dev-python/docutils-0.20[${PYTHON_USEDEP}]
+	>=dev-python/docutils-0.18[${PYTHON_USEDEP}]
+	>=dev-python/imagesize-1.3[${PYTHON_USEDEP}]
+	>=dev-python/jinja-3.0[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.12[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.25.0[${PYTHON_USEDEP}]
+	>=dev-python/snowballstemmer-2.0[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-applehelp[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-devhelp[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-jsmath[${PYTHON_USEDEP}]
+	>=dev-python/sphinxcontrib-htmlhelp-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/sphinxcontrib-serializinghtml-1.1.5[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-qthelp[${PYTHON_USEDEP}]
+	>=dev-python/packaging-21.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_metadata-4.8[${PYTHON_USEDEP}]
+	' 3.8 3.9)
+	latex? (
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-luatex
+		app-text/dvipng
+	)
+	!dev-python/namespace-sphinxcontrib
+"
+BDEPEND="
+	doc? (
+		dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
+		media-gfx/graphviz
+	)
+	test? (
+		app-text/dvipng
+		dev-python/cython[${PYTHON_USEDEP}]
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		dev-texlive/texlive-fontsextra
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-luatex
+		virtual/imagemagick-tools[jpeg,png,svg]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/sphinx-3.2.1-doc-link.patch"
+	"${FILESDIR}/sphinx-4.3.2-doc-link.patch"
+)
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# disable internet access
+	sed -i -e 's:^intersphinx_mapping:disabled_&:' \
+		doc/conf.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		esetup.py build_sphinx
+		HTML_DOCS=( build/sphinx/html/. )
+	fi
+}
+
+python_test() {
+	mkdir -p "${BUILD_DIR}/sphinx_tempdir" || die
+	local -x SPHINX_TEST_TEMPDIR="${BUILD_DIR}/sphinx_tempdir"
+
+	local EPYTEST_DESELECT=(
+		# these tests require Internet access
+		tests/test_build_latex.py::test_latex_images
+		tests/test_build_linkcheck.py::test_defaults
+		tests/test_build_linkcheck.py::test_defaults_json
+		tests/test_build_linkcheck.py::test_anchors_ignored
+		# TODO
+		tests/test_ext_autodoc_autoclass.py::test_classes
+		tests/test_ext_autodoc_autofunction.py::test_classes
+		tests/test_ext_inheritance_diagram.py::test_import_classes
+		# looks like a bug in lualatex
+		"tests/test_build_latex.py::test_build_latex_doc[lualatex-howto]"
+		"tests/test_build_latex.py::test_build_latex_doc[lualatex-manual]"
+	)
+	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
+		tests/test_ext_autodoc.py::test_autodoc_inherited_members_None
+		tests/test_ext_autodoc.py::test_automethod_for_builtin
+		tests/test_ext_autodoc.py::test_cython
+		tests/test_ext_autodoc.py::test_partialfunction
+		tests/test_ext_autodoc_autoclass.py::test_autodoc_process_bases
+		tests/test_ext_autodoc_autoclass.py::test_show_inheritance_for_decendants_of_generic_type
+		tests/test_ext_autodoc_autoclass.py::test_show_inheritance_for_subclass_of_generic_type
+		tests/test_ext_autodoc_autofunction.py::test_builtin_function
+		tests/test_ext_autodoc_autofunction.py::test_methoddescriptor
+		tests/test_ext_autodoc_automodule.py::test_automodule_inherited_members
+		tests/test_ext_autosummary.py::test_autosummary_generate_content_for_module
+		tests/test_ext_autosummary.py::test_autosummary_generate_content_for_module_skipped
+		tests/test_util_inspect.py::test_isattributedescriptor
+		tests/test_util_typing.py::test_stringify_type_hints_pep_585
+	)
+
+	epytest
+}
diff --git a/dev-python/tox/Manifest b/dev-python/tox/Manifest
index a7ecb7458766..6193289a9140 100644
--- a/dev-python/tox/Manifest
+++ b/dev-python/tox/Manifest
@@ -1,13 +1,9 @@
 DIST tox-3.27.1.gh.tar.gz 309006 BLAKE2B fa8aaa9cd5b03e54c166bb6b748290420b91498b26d2d124d9f88a64806b9ac0578c1886845b25aa024907f6a782c45609fa6c7657d9e1f538b59c2d9f0f4e14 SHA512 5f568bc6c53f871aae91928681dd6f2419b876a8e6ca925e65abae845b548ee3d00513741882875bbbacb78bf64935228d98213f940d3da8c3f788b73f177b79
 DIST tox-3.28.0.gh.tar.gz 309472 BLAKE2B 9896411426f6aebb3efa468c01696ecc5f17ec3e67825672d0efc74c1b1468bc8b8d9c14b6177c181750ba4b9a5e77d616068dd83e21f5641acfc8e2a271cc1f SHA512 64816754e6800661bb564c5c7d21c4139522d540a04fafe3c4591d596072d48d1cbe0ee2abee9c8faf3d5007774f5371431b5a7a8f49912bc879c7b168aab2ca
-DIST tox-4.0.16.gh.tar.gz 283676 BLAKE2B b9b8149dcfa141518cb18a0ac3263c65f4928fc068357d7a513971d7037cc60cb4b3627d61d3e3479622b9fcbdc235356ca97cde993ab47db7abf4755854b17d SHA512 db4428b576dd3b669969b2390203ba6a0efa85f60073374b32c7ff1273745dde59ef0ffd404a7db98ca9056c5d5b5bd1811b51af7b475c116816c150c4d88c4c
-DIST tox-4.0.17.gh.tar.gz 284062 BLAKE2B 65055fd793fa5d4006d0082a89d7f42452cc5b3d1507a87875175db334bf177efeefa8b3e671d9042b795d8f21898ea1b1650cb1337bb9581a3b83ce8b42fec7 SHA512 065f4b91c32902fc8a65b5529e615af428a5ee8f8ad5cebee6c4ba14ceea315844cda8c6d2a882ba34baf7369d5676f210752d89d1cb3f9e2c7d7af790481193
-DIST tox-4.0.18.gh.tar.gz 284137 BLAKE2B b507b0a15664656f381bc06356adb04c5fdfbe52deeef673e4ccc3d7a45d8cec10de80f6fe141a35bf529b020d5d8579c4dd6e4e3aa323bad320c7fcc6c34d18 SHA512 cd10cd4194002644d57fc63295099fccf6ffdaa2eeaf7bfe2f47c85d76dc115f9faa78ce0cfc43603b11ec04abaf4d41fe653fa48bff71e71ab7d102356ec5b8
 DIST tox-4.0.19.gh.tar.gz 284319 BLAKE2B f0ed3d300e0fadfaa5725589cea91511ed0c37937dc3761b203cfd1f0a5cf4033b6006e693521c932d3af64feb150951c046f5853a8b9bb9e37dcf3c5db4de95 SHA512 27d01b96acf4f7650b5a4a3ad80293ea884ee6791ff2e734cb64c94551943af1fb91804944f7ae82937fe4172522c0d5e4f24e84d35012d11657adc49702fc88
+DIST tox-4.1.1.gh.tar.gz 285048 BLAKE2B 78f810889102328a9b1e56d86b2f5d833311a5148fe9eca0f2076892d4ef15c6eee8fdf58c5390a273842cd3f0c50731fc82f10a54a025b6802526711513453b SHA512 7367a2ac9d2233d96affff7cfd357fad516661834db31aee740d77983977ad6136a58c2979eaafbc504844f6ec5bbeeed9b5bd67ba53f2b7d24cf5d83e59d42b
 EBUILD tox-3.27.1.ebuild 1916 BLAKE2B ab2496317d588c05936d57132d1c759c9a14f18c10fb50d6188b7bee5bd20de9f06b5d8945a908cbf021f4b7036ba6d23dcf19aad63af9d6cd6bf6baa598ad32 SHA512 b038f9976de8af46ac663faa169a06fad1bd28ef61738679fd70faa5e655c0c85ed3a8e4efddee2dd2aff8cc3fe9f5ec133311d122c6bab15c487a5a074a6c11
 EBUILD tox-3.28.0.ebuild 1924 BLAKE2B d2a5ac59691e8ad704bb64840925d192df827d533c2b17bafa31b95da83a235c28109e911f78e294b12924a99114adad5bbe44cbba67fe8d2d584c9839a70d59 SHA512 aa919c8b15403b9992a772bf0296f4cae2bef39c4ded509f732a13869504f7af15cf43f26c9f401e31794c481a5e1dc4e91c18e65c31a4e159d7b9a2cb1c99ea
-EBUILD tox-4.0.16.ebuild 2396 BLAKE2B a5c1a60c46d8c215c763101be08df17dba5366f23f1e9e4d619b451a82d4df721378f012b7e3a88ad7dc91a5a12fd8c46e57b724eca3d1c0f4e3dc0e2ac12627 SHA512 55f2e10601f9c8d5f942bd58748292ffdf0661426e0c8cac38808eb819080e5b1a8fb7fb6022cfdf701c58dd40646651a5efd3608d3857ace31597019c9ff679
-EBUILD tox-4.0.17.ebuild 2401 BLAKE2B c637640a6adefa4dce637fb723174ca35d3214c8a4f656cdd8558aeebc2f3ba0e826473131a852a330cb5d26201d58eba226c0bb7a407c783c6e76d98abbc67d SHA512 568a571e2c2d68f3fb4f8783a00a19d76a18a9cb8e481411005461d474582199d82e8a1830b531bb52950ba7ed850330d09e37a520a77ee9b875c6d091e4eb0d
-EBUILD tox-4.0.18.ebuild 2401 BLAKE2B c637640a6adefa4dce637fb723174ca35d3214c8a4f656cdd8558aeebc2f3ba0e826473131a852a330cb5d26201d58eba226c0bb7a407c783c6e76d98abbc67d SHA512 568a571e2c2d68f3fb4f8783a00a19d76a18a9cb8e481411005461d474582199d82e8a1830b531bb52950ba7ed850330d09e37a520a77ee9b875c6d091e4eb0d
 EBUILD tox-4.0.19.ebuild 2401 BLAKE2B c637640a6adefa4dce637fb723174ca35d3214c8a4f656cdd8558aeebc2f3ba0e826473131a852a330cb5d26201d58eba226c0bb7a407c783c6e76d98abbc67d SHA512 568a571e2c2d68f3fb4f8783a00a19d76a18a9cb8e481411005461d474582199d82e8a1830b531bb52950ba7ed850330d09e37a520a77ee9b875c6d091e4eb0d
+EBUILD tox-4.1.1.ebuild 2401 BLAKE2B c637640a6adefa4dce637fb723174ca35d3214c8a4f656cdd8558aeebc2f3ba0e826473131a852a330cb5d26201d58eba226c0bb7a407c783c6e76d98abbc67d SHA512 568a571e2c2d68f3fb4f8783a00a19d76a18a9cb8e481411005461d474582199d82e8a1830b531bb52950ba7ed850330d09e37a520a77ee9b875c6d091e4eb0d
 MISC metadata.xml 382 BLAKE2B 7c0704c5c187ce4a7972fe0372b23c5537a81a8d62fd83436d9558a61761f10764adb5a4d5f6795f0dd1fe905afa604c0be77fe1d48d291847f6ae65dc1b032c SHA512 9d0ced4df9352a81034a50d5766a01534ae8fa889985d99cc9e2a8d0889e31c6c11550677d9a5a74e2aab57c320192ce3a42708a6d23b0419ee34a6054398344
diff --git a/dev-python/tox/tox-4.0.16.ebuild b/dev-python/tox/tox-4.0.16.ebuild
deleted file mode 100644
index 533a8c9ff12d..000000000000
--- a/dev-python/tox/tox-4.0.16.ebuild
+++ /dev/null
@@ -1,91 +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_{8..11} pypy3 )
-
-inherit distutils-r1
-
-MY_P=${P/_}
-DESCRIPTION="virtualenv-based automation of test activities"
-HOMEPAGE="
-	https://tox.readthedocs.io/
-	https://github.com/tox-dev/tox/
-	https://pypi.org/project/tox/
-"
-SRC_URI="
-	https://github.com/tox-dev/tox/archive/${PV/_}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	>=dev-python/cachetools-5.2[${PYTHON_USEDEP}]
-	>=dev-python/chardet-5.1[${PYTHON_USEDEP}]
-	>=dev-python/colorama-0.4.6[${PYTHON_USEDEP}]
-	>=dev-python/filelock-3.8.2[${PYTHON_USEDEP}]
-	>=dev-python/packaging-21.3[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-2.6[${PYTHON_USEDEP}]
-	>=dev-python/pluggy-1[${PYTHON_USEDEP}]
-	>=dev-python/pyproject-api-1.2.1[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
-	' 3.8 3.9 3.10)
-	>=dev-python/virtualenv-20.17.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/hatch-vcs-0.3[${PYTHON_USEDEP}]
-	test? (
-		dev-python/build[${PYTHON_USEDEP}]
-		>=dev-python/distlib-0.3.6[${PYTHON_USEDEP}]
-		>=dev-python/flaky-3.7[${PYTHON_USEDEP}]
-		>=dev-python/psutil-5.9.4[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		>=dev-python/pytest-xdist-3.1[${PYTHON_USEDEP}]
-		>=dev-python/re-assert-1.1[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			>=dev-python/time-machine-2.8.2[${PYTHON_USEDEP}]
-		' 'python*')
-	)
-"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-src_prepare() {
-	# the minimal bounds in tox are entirely meaningless and new packaging
-	# breaks setuptools
-	sed -i -e '/packaging/s:>=22::' pyproject.toml || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# devpi_process is not packaged, and has lots of dependencies
-	cat > "${T}"/devpi_process.py <<-EOF || die
-		def IndexServer(*args, **kwargs): raise NotImplementedError()
-	EOF
-
-	local -x PYTHONPATH=${T}:${PYTHONPATH}
-	local EPYTEST_DESELECT=(
-		# Internet
-		tests/tox_env/python/virtual_env/package/test_package_cmd_builder.py::test_build_wheel_external
-	)
-	local EPYTEST_IGNORE=(
-		# requires devpi*
-		tests/test_provision.py
-	)
-	if ! has_version "dev-python/time_machine[${PYTHON_USEDEP}]"; then
-		EPYTEST_IGNORE+=(
-			tests/util/test_spinner.py
-		)
-	fi
-
-	epytest
-}
diff --git a/dev-python/tox/tox-4.0.18.ebuild b/dev-python/tox/tox-4.0.18.ebuild
deleted file mode 100644
index 98dc8a8f2545..000000000000
--- a/dev-python/tox/tox-4.0.18.ebuild
+++ /dev/null
@@ -1,91 +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_{8..11} pypy3 )
-
-inherit distutils-r1
-
-MY_P=${P/_}
-DESCRIPTION="virtualenv-based automation of test activities"
-HOMEPAGE="
-	https://tox.readthedocs.io/
-	https://github.com/tox-dev/tox/
-	https://pypi.org/project/tox/
-"
-SRC_URI="
-	https://github.com/tox-dev/tox/archive/${PV/_}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc"
-
-RDEPEND="
-	>=dev-python/cachetools-5.2[${PYTHON_USEDEP}]
-	>=dev-python/chardet-5.1[${PYTHON_USEDEP}]
-	>=dev-python/colorama-0.4.6[${PYTHON_USEDEP}]
-	>=dev-python/filelock-3.8.2[${PYTHON_USEDEP}]
-	>=dev-python/packaging-21.3[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-2.6[${PYTHON_USEDEP}]
-	>=dev-python/pluggy-1[${PYTHON_USEDEP}]
-	>=dev-python/pyproject-api-1.2.1[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
-	' 3.8 3.9 3.10)
-	>=dev-python/virtualenv-20.17.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/hatch-vcs-0.3[${PYTHON_USEDEP}]
-	test? (
-		dev-python/build[${PYTHON_USEDEP}]
-		>=dev-python/distlib-0.3.6[${PYTHON_USEDEP}]
-		>=dev-python/flaky-3.7[${PYTHON_USEDEP}]
-		>=dev-python/psutil-5.9.4[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		>=dev-python/pytest-xdist-3.1[${PYTHON_USEDEP}]
-		>=dev-python/re-assert-1.1[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			>=dev-python/time-machine-2.8.2[${PYTHON_USEDEP}]
-		' 'python*')
-	)
-"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-src_prepare() {
-	# the minimal bounds in tox are entirely meaningless and new packaging
-	# breaks setuptools
-	sed -i -e '/packaging/s:>=22::' pyproject.toml || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# devpi_process is not packaged, and has lots of dependencies
-	cat > "${T}"/devpi_process.py <<-EOF || die
-		def IndexServer(*args, **kwargs): raise NotImplementedError()
-	EOF
-
-	local -x PYTHONPATH=${T}:${PYTHONPATH}
-	local EPYTEST_DESELECT=(
-		# Internet
-		tests/tox_env/python/virtual_env/package/test_package_cmd_builder.py::test_build_wheel_external
-	)
-	local EPYTEST_IGNORE=(
-		# requires devpi*
-		tests/test_provision.py
-	)
-	if ! has_version "dev-python/time_machine[${PYTHON_USEDEP}]"; then
-		EPYTEST_IGNORE+=(
-			tests/util/test_spinner.py
-		)
-	fi
-
-	epytest
-}
diff --git a/dev-python/tox/tox-4.0.17.ebuild b/dev-python/tox/tox-4.1.1.ebuild
index 98dc8a8f2545..98dc8a8f2545 100644
--- a/dev-python/tox/tox-4.0.17.ebuild
+++ b/dev-python/tox/tox-4.1.1.ebuild