gentoo auto-resync : 01:03:2023 - 10:06:27

32 files changed, 555 insertions, 33 deletions

diff --git a/dev-python/Babel/Babel-2.12.1.ebuild b/dev-python/Babel/Babel-2.12.1.ebuild
new file mode 100644
index 000000000000..818272ef77fa
--- /dev/null
+++ b/dev-python/Babel/Babel-2.12.1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+PYTHON_COMPAT=( pypy3 python3_{9..11} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 pypi
+
+# see scripts/download_import_cldr.py
+CLDR_PV=42.0
+DESCRIPTION="Collection of tools for internationalizing Python applications"
+HOMEPAGE="
+	https://babel.pocoo.org/
+	https://pypi.org/project/Babel/
+	https://github.com/python-babel/babel/
+"
+SRC_URI+="
+	https://unicode.org/Public/cldr/${CLDR_PV%.*}/cldr-common-${CLDR_PV}.zip
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/backports-zoneinfo[${PYTHON_USEDEP}]
+	' 3.8)
+"
+# RDEPEND in BDEPEND for import_cldr.py usage, bug #852158
+BDEPEND="
+	app-arch/unzip
+	${RDEPEND}
+	test? (
+		dev-python/freezegun[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs
+distutils_enable_tests pytest
+
+src_prepare() {
+	rm babel/locale-data/*.dat || die
+	rm babel/global.dat || die
+	distutils-r1_src_prepare
+}
+
+python_configure() {
+	if [[ ! -f babel/global.dat ]]; then
+		"${EPYTHON}" scripts/import_cldr.py "${WORKDIR}"/common || die
+	fi
+}
+
+python_test() {
+	local -x TZ=UTC
+	epytest
+}
diff --git a/dev-python/Babel/Manifest b/dev-python/Babel/Manifest
index d86a151fad1f..0447d02cf525 100644
--- a/dev-python/Babel/Manifest
+++ b/dev-python/Babel/Manifest
@@ -1,5 +1,8 @@
 AUX Babel-2.11.0-sphinx-6.patch 983 BLAKE2B abd902e9b37f4c67a2697a6405a9559b0b2e0f19a3f1439e1460d11343974000b35e4519b6180c8e2f9d45cd8141f9a5e93c451ab32207573cf87b7163066221 SHA512 9b428ac9f53b420d3081cc7eb560fb24f9ebc2db4eff2fd12fe7e51626dc95f449173cfbf51096d442dc0f0983f086d3430ab21202560bb084d6fa0c62e20e2b
 DIST Babel-2.11.0.tar.gz 9346097 BLAKE2B 99ae97e4dc16e1757ae6f054f9f346c6728d087bbfba33786d59211ac4b6c12bf861c79ac7c12a3efd89539220126ea1ea9a3578a9008daaa464aed315102b60 SHA512 526368dc5e44f2d93c52f2fcb544130eea6c6b7c78325bd56c6d9a6706890a4cd9daa1498d639aab65059801d87977da626e64585083c58c4b328001991eea0b
+DIST Babel-2.12.1.tar.gz 9906735 BLAKE2B d78838f9a2032eae998f1d751ad803fec81c03be498db934e34e0702d28e0815a7848e55af73ea4dff45e3cf063b9e45ab06c749b8d3f15b7742e209bf3d06ef SHA512 93c4bf343d99a1f47f43f8b828eb79098cb429bac1034d58b5aa49adff68116e458067f3784d997f34515828a7432fd18f7abbaeee59b47a4ee8ea744908b33b
 DIST cldr-common-41.0.zip 29364494 BLAKE2B 1960e860017c3e5f31d935d66a1ff551720975dca0af459adc72b8dc54100938fbd2d2ef00eb457f3fd04d4f1e90a4783229c350b125029dcda5c1e6903f9a54 SHA512 c64f3338e292962817b043dd11e9c47f533c9b70d432f83e80654e20f4937c72b37e66a60485df43f734b1ff94ebf0452547a063076917889303c9653b4d6ce5
+DIST cldr-common-42.0.zip 30178050 BLAKE2B 076e3eca12534feff8e0e54bdc1fa38fc0db0f78cac8b4e35b343763a8ac6787745aa36be165684f4d6dda423409c4431a8e4941c53ae7d340ead0b35edbca30 SHA512 315448fe6a9ac2d5a6a7fd1a27b38c5db30fed053654a803d50e3a8d06aa08ad153e8e57089fa094c561f41a54f37eecda0701b47a1813879902be71945aa38a
 EBUILD Babel-2.11.0.ebuild 1412 BLAKE2B 2848c8cbe3ee7373d29be5d58f7e4de2a11bf1d31b11617c8c7b1185a4e59e2379c3bbc9136870dfd143e9b7e8639e28fbea5fd1c29d68f64d5ae93c8100457e SHA512 676b287df6475892a20057b108d16c660c998e102b1ec821b2d62bd77012f00f63591d4b0a8aa6895931ef1f7ed8dc748dbedbbaec35b6e0bf334039448d32ba
+EBUILD Babel-2.12.1.ebuild 1320 BLAKE2B 801afa7de5be408c19ac57a20bc7b41a96588028606a770c830a7e202a61e1d42efb1944514dc599082a286b15bdc9229390a3f735c311b681c20747cb9acf81 SHA512 680f3a8e3fc4851c91f11042b72ae21c7270150ba554c5b535ec970ab5022090580d957568df6b0feeb33d146cceff73f79560a713693c30eb7ed9230eb06c1f
 MISC metadata.xml 840 BLAKE2B b0f46186ca0a319d3e4e1a658007b2cc59fe3a3ea9ede567af5084593f907e88dbe714d2b70c6a882ec95a5f90d4c0e3620ea0a939ad6e52650e770de88a45ba SHA512 621b66293259fd20c94a62ecf64673f7afcd714c18f054c8c0afe2d14e6e98c8abbdf6b4c5cc0043b5d30e513acab292d85c5587a02a9ae99ca007a28720c921
diff --git a/dev-python/Faker/Faker-17.4.0.ebuild b/dev-python/Faker/Faker-17.4.0.ebuild
new file mode 100644
index 000000000000..f1e5f5fe409a
--- /dev/null
+++ b/dev-python/Faker/Faker-17.4.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="A Python package that generates fake data for you"
+HOMEPAGE="
+	https://github.com/joke2k/faker/
+	https://pypi.org/project/Faker/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
+	!dev-ruby/faker
+"
+BDEPEND="
+	test? (
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP},tiff]
+		dev-python/validators[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/Faker/Manifest b/dev-python/Faker/Manifest
index 2d1ce5d0a419..a7bcd3e9feca 100644
--- a/dev-python/Faker/Manifest
+++ b/dev-python/Faker/Manifest
@@ -2,8 +2,10 @@ DIST Faker-16.6.1.tar.gz 1626043 BLAKE2B 2fc44018b76fffa1f0e249905d20fbc78bc1ab4
 DIST Faker-16.8.1.tar.gz 1649844 BLAKE2B 3ec9b7566342e569580fa8db4df20708ef9b1b6ab0ccdb31b9a33dbe0c7ff3c77ff1b7698e1cf478254d3625d9c516b2b84bcda9bb1d1bdff2161b6d5fcb1056 SHA512 9ea00ec96af0de6a939b9ab3812c75627f2a76514ac6236614d7455b123e4909f9ffe12e9e84f161e0b0b0f2b0f0ddc4ff6661dce788653dd4b8c12098a871fa
 DIST Faker-17.0.0.tar.gz 1650338 BLAKE2B 4e3e9723d9016481e7b7d3e9a27060881833ab1e8309f93fffcade696679da64345bcc6fce12ce6bcb2a237b317ea697a5ff4344d929e66c2b6778ec39fdb282 SHA512 9fcd79a6e8a3db592edaa83c30d89d86a0018181d4c778c3c3566cb6d95181b033639eaf92a332539b4436138cc868192d5a21f1c12c9ba180da0dacd8bee493
 DIST Faker-17.3.0.tar.gz 1651539 BLAKE2B 5695edf10d246bd776f63f0a2d26d0e3b36f7c20a0553333359d91f013522256c93bfe967655003b61832132d38dcc5d1909468d391b2a017605df32c31f0d41 SHA512 685dedd1d73210d58008f8898c0a95a6616c16852c59e7993e33fbb187a63ba8db72ef2a6fc37f0cb8c0da2b4e1521f6f4b82a8674bbf843219b0ee25d88d950
+DIST Faker-17.4.0.tar.gz 1651645 BLAKE2B f4cde3f203e3d8abe0762f9b68785c495bc85080177d85610f023648b88b13c903a42e39eb0b1d86c120752aa683f6a399ea8377c492eb938742e883710d7f51 SHA512 58821d9fae04363508ffe1be58f8df9830772b6531958842633e9a6d3f88928d0927beaf978288ce96c269f66df61dc137efd3977f6746f0d374017b6f4c5b05
 EBUILD Faker-16.6.1.ebuild 682 BLAKE2B 6e4f513383d927ae62995083ce32a75635a14844754fcaaa52313a7aaa98118e82f018a82c381a5347a2df0ddf9e7bc68f78438fbd4336b8cd51562bf335b9d8 SHA512 83e54f767935b0a45f0f50b4df871213cf7cd968fd73c9c1502895fe4fe1d0f533fb249c478aa89b78414f8198b6b2d123931c0096e1582fa5e8a76bf3767069
 EBUILD Faker-16.8.1.ebuild 683 BLAKE2B ed6805e59f23a4bc570266b7f6e806d8861a1caedd84cf7eaffff58932fe5347469a303402748e82fcc02734d78356d076dfe1b054bc0b33c6e546e295382b18 SHA512 4ea11d603431b14a105c5b67b56ab168bb6fae6ea40760bbeb53076fdbd8e98452c7f8e53e3657911423f33af76b910c5c4bb10fbf365e9c68a3b5e571f5aa44
 EBUILD Faker-17.0.0.ebuild 683 BLAKE2B ed6805e59f23a4bc570266b7f6e806d8861a1caedd84cf7eaffff58932fe5347469a303402748e82fcc02734d78356d076dfe1b054bc0b33c6e546e295382b18 SHA512 4ea11d603431b14a105c5b67b56ab168bb6fae6ea40760bbeb53076fdbd8e98452c7f8e53e3657911423f33af76b910c5c4bb10fbf365e9c68a3b5e571f5aa44
 EBUILD Faker-17.3.0.ebuild 683 BLAKE2B ed6805e59f23a4bc570266b7f6e806d8861a1caedd84cf7eaffff58932fe5347469a303402748e82fcc02734d78356d076dfe1b054bc0b33c6e546e295382b18 SHA512 4ea11d603431b14a105c5b67b56ab168bb6fae6ea40760bbeb53076fdbd8e98452c7f8e53e3657911423f33af76b910c5c4bb10fbf365e9c68a3b5e571f5aa44
+EBUILD Faker-17.4.0.ebuild 683 BLAKE2B ed6805e59f23a4bc570266b7f6e806d8861a1caedd84cf7eaffff58932fe5347469a303402748e82fcc02734d78356d076dfe1b054bc0b33c6e546e295382b18 SHA512 4ea11d603431b14a105c5b67b56ab168bb6fae6ea40760bbeb53076fdbd8e98452c7f8e53e3657911423f33af76b910c5c4bb10fbf365e9c68a3b5e571f5aa44
 MISC metadata.xml 498 BLAKE2B c9b7885dc7d34f2263068624a6b07ac6f1ec8078cc11abb6137612ba57edffefc48dae2708284aa83ecc941ebb2d3b8a87a143648e404a0683e75bb6c078f4e2 SHA512 0b385bbbfbb026803526e43c6c43965ff75f42d3ab133603708b187686aac29de508856e5e8ae7622a66b99032efa97f95c21625e10d074c858d8aff7446a312
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index e17fe883f41b..b338482b0a6b 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/aws-sam-translator/Manifest b/dev-python/aws-sam-translator/Manifest
index eb8ee0dba768..f63ce1358f30 100644
--- a/dev-python/aws-sam-translator/Manifest
+++ b/dev-python/aws-sam-translator/Manifest
@@ -1,7 +1,9 @@
 DIST aws-sam-translator-1.58.1.gh.tar.gz 1151817 BLAKE2B a3ba2cc304e25a5d527fdef793deb232c1852ceda51df1bfe75ccbe150c8b08d8dfebfa1933f1722e20cecad6f88af596bbeffd203fce7855c3faaaee2f434bf SHA512 341d6346f7daaab3713962613a89b53d0e852d274222e408d9f314a01ec55fa1bc4ac0111bab54ab802caaa956923f0504c2bf620f06073a85c70c8fa28d15ad
 DIST aws-sam-translator-1.59.0.gh.tar.gz 1688806 BLAKE2B 66e63f5d008b120d95b2258552ba7ea531b6dc2d0090360c3777bcac167f95a0167cf200a8b29d798699e87a060befee71f7e8316ed395eded073960b4f1a18b SHA512 558b5dfe586c0badb7b5b5f35a6b841ffe94f2e6fb68acf7c492529abfe3756760fc5d8cdb16550ebbc47671fa12e09620b445d086f008d05f80606710ec67a9
 DIST serverless-application-model-1.60.0.gh.tar.gz 4600046 BLAKE2B 8a73c303389930fcee728cfe2d5829a6dab7bd8491722b5416ea28db4504eff710da97f91e054fc53b631128783e54dd9071f5e0d6fdd194bf72796555850c9f SHA512 543f2f7a3bbaace552dd954c28d61633f4315e251e426dac2acdef91b4e82c102e1108b54f67cd45efe41d1827b0287bf5752e8411abeb252a2367bfb5536ae3
+DIST serverless-application-model-1.60.1.gh.tar.gz 4600439 BLAKE2B fabd84e66da433410ff7d54a9db9ae6aed5dd67de16669450146adb5f86ef3b0b90a1c6165b935eb1aef0df0c116a687da6c43e75f332a8a5f3f93c79338f2e4 SHA512 75e3aca9248ce599837f87bdc633fc48e9f5980f878884aef7e3b1b41a2cbe1d982d9eb6b5bd41a2057fc53b9edc4ce6fd9e016750d0757f58feaeb08f02fe3a
 EBUILD aws-sam-translator-1.58.1.ebuild 2759 BLAKE2B c20a1a6a5eb91fe0c98cbcb9ffe3fb06c0a1026090d3b2c1a4b31a8c97a9fe3270ce61256fc1667ed870275b4894879ce1e40409a2b20578aedf5b2ec86dd9e2 SHA512 11e6a5b37517c835f3fd316ae6bafb910f058ccff33a97ac5366dbb94d95289f14610a8b61ecb849570d48ef7fbfd208cc129c3648039868b4e5b9ce9044b102
 EBUILD aws-sam-translator-1.59.0.ebuild 1433 BLAKE2B 72b92841ce88a4b41bb6782e571ff7202b5d0a08dd80a1bb9d51b44b68b2f87661b48e7712daa8bf2ac4e185d70232ec06384382d8ef0456542d7b5c46726735 SHA512 6f37e955b6ed1378f8a0567f4563f7bf0b3d90028e83d7b8b53db60cb3a2f24ad3e728fc4cee44be3682ef7a9c7156e7cdb71329c564a2914a24038e88ce50ca
 EBUILD aws-sam-translator-1.60.0.ebuild 1447 BLAKE2B a02b63bf23efed53753bb4e775305e1fa04382241257382c23d47b54eb2a37d887fb19eddb4407f93f1e6701845979620092d4cd4786cbb97a62512db391d42d SHA512 0360076a43b8f88e60b9deacfd3de8dc3bf35d10eeeab71d94ade2c7225aff1021aa9d97a1cdddf6e75ce19b08f77d47feb43ebb111807d81d0a86f5f2d2f41b
+EBUILD aws-sam-translator-1.60.1.ebuild 1447 BLAKE2B a02b63bf23efed53753bb4e775305e1fa04382241257382c23d47b54eb2a37d887fb19eddb4407f93f1e6701845979620092d4cd4786cbb97a62512db391d42d SHA512 0360076a43b8f88e60b9deacfd3de8dc3bf35d10eeeab71d94ade2c7225aff1021aa9d97a1cdddf6e75ce19b08f77d47feb43ebb111807d81d0a86f5f2d2f41b
 MISC metadata.xml 603 BLAKE2B 89556267393186cf69a585c58efeb6fa599bfb42ef221bea955ea807a28edee89036a2ee0d0ca81ae55d96702a01b171b837754dabf38047ecc2789157bb7116 SHA512 106b6d241eadf7807dadf03329073703f8b51e7443eddc4db8752878b6dd84cc4357689cd4b796b3a083192e9d98eacbe9e7b8af0273160c7b89846e78230a88
diff --git a/dev-python/aws-sam-translator/aws-sam-translator-1.60.1.ebuild b/dev-python/aws-sam-translator/aws-sam-translator-1.60.1.ebuild
new file mode 100644
index 000000000000..2fa677eb180f
--- /dev/null
+++ b/dev-python/aws-sam-translator/aws-sam-translator-1.60.1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2023 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
+
+MY_P=serverless-application-model-${PV}
+DESCRIPTION="A library that transform SAM templates into AWS CloudFormation templates"
+HOMEPAGE="
+	https://github.com/aws/serverless-application-model/
+	https://pypi.org/project/aws-sam-translator/
+"
+SRC_URI="
+	https://github.com/aws/serverless-application-model/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	<dev-python/boto3-2[${PYTHON_USEDEP}]
+	>=dev-python/boto3-1.19.5[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-3.2[${PYTHON_USEDEP}]
+	>=dev-python/pydantic-1.8[${PYTHON_USEDEP}]
+	dev-python/typing-extensions[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/parameterized[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# so much noise...
+	sed -i -e '/log_cli/d' pytest.ini || die
+
+	# deps are installed by ebuild, don't try to reinstall them via pip
+	truncate --size=0 requirements/*.txt || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x AWS_DEFAULT_REGION=us-east-1
+	epytest -o addopts=
+}
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index cb07552b96ed..a963084b704f 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -1,8 +1,10 @@
 DIST boto3-1.26.74.gh.tar.gz 602525 BLAKE2B 6d9b397864649ecd9b3f46bcee832c57cdce809545522f3beaf0d2eb98ca1f99e5fcab132f3389a4b2edcd585d9f6759de961b1f83f5912420629b6b03092c36 SHA512 eba11711dbd77988deb1695b954b6eb931b8ad49f96971e221415355de9bd2f3015b5a58be34a7378180f59500f9c15135192ccb97454141dbcaa664f0183627
 DIST boto3-1.26.79.gh.tar.gz 605312 BLAKE2B c36b86ab289be9c08a1ab43274a4f4db71cede08598b6f8092af8404bc9994e345b263b144ee3a1974ea276fce63c330d7ffa6335bb889bea32e380e9003a8c7 SHA512 cfc789296b904c0c3bd3999153067f4fb174b323f0fbd22e8f4a49aed98338e20fd238876e2f55f608f5d6b60b584e15d370400e8d0a8a00b0689e0867d00f05
 DIST boto3-1.26.80.gh.tar.gz 606204 BLAKE2B ae80c1ec7e99f48844c4eec39df1f6802df1fbbf2d94f1b7ddc04c7a21cb885823ebadb11cf9e81b51af9aa5f09775c02e52e926b94c49331307873b86702446 SHA512 e4ab89f2afe506d7d1ba9e1615e3a92ba4bf5dc9a85d3a14f034c1b14733d99cebf594bb6dc80914bf444da34d09c045c8933cf3c97e6ccfa9e31901e99d76ee
+DIST boto3-1.26.81.gh.tar.gz 611431 BLAKE2B e3f607e4bbd4ae7002168a697c6c3081b3713acbf7d7c8abdb1016b63f9ac5b16ae44255f707272db6a7b4c657210af0ed1c355889b01434683889b28de9d4e7 SHA512 30faa2d60f5f661e4d56a57c5b9d258ad3de260be2a21723b921f2383e290ca0b3d417a4a970ba3defd8f8196deaade2741117393c664b5fe267deab2e210e06
 EBUILD boto3-1.26.74.ebuild 1580 BLAKE2B 6c2b0aa540898e7461c165b8cb755ceec1cf0b94ba8cf4e2183bcd3a7a242b1e78f4c9a61bcb0c01230f625735a59ce3cd437098b19620d87c76fa022327af45 SHA512 f792df64912dbb7af89eac9c95518624a26c37387e16b96f46db928912c01ce20503cf8f9685de1b314ca7120e353c5fb26c900962f8c05e2c275b3bcd297555
 EBUILD boto3-1.26.79.ebuild 1587 BLAKE2B db535a9938316c0564a32f4e05e74349251daef0db47afee54fe6907409d11ba1d660027cf059e2d4889c580ab8fe2fd6b252dd25a9c1906c878df6cb52e49d2 SHA512 8f2d0fdfbe2fa3916821a5d884cf579d55f97c21853c2f0990402e9ebbe4f1b0d21fda262f6e0ed997890b0cfe1e7ac42b1b6832a683c6b27f4aa2b6d4697469
 EBUILD boto3-1.26.80.ebuild 1587 BLAKE2B db535a9938316c0564a32f4e05e74349251daef0db47afee54fe6907409d11ba1d660027cf059e2d4889c580ab8fe2fd6b252dd25a9c1906c878df6cb52e49d2 SHA512 8f2d0fdfbe2fa3916821a5d884cf579d55f97c21853c2f0990402e9ebbe4f1b0d21fda262f6e0ed997890b0cfe1e7ac42b1b6832a683c6b27f4aa2b6d4697469
+EBUILD boto3-1.26.81.ebuild 1587 BLAKE2B db535a9938316c0564a32f4e05e74349251daef0db47afee54fe6907409d11ba1d660027cf059e2d4889c580ab8fe2fd6b252dd25a9c1906c878df6cb52e49d2 SHA512 8f2d0fdfbe2fa3916821a5d884cf579d55f97c21853c2f0990402e9ebbe4f1b0d21fda262f6e0ed997890b0cfe1e7ac42b1b6832a683c6b27f4aa2b6d4697469
 EBUILD boto3-9999.ebuild 1586 BLAKE2B 44b7d2804e4a484ed5fb864ca2c60348f4e4eb2265c1ba946adf27b31052dd9041f148c1ec935af0bdcabc66109ad3b479dac167613c679a2d9e42f689182734 SHA512 bf11d1114aaff8762b6162a7ba94223e2eb180868e8395aafd1f466c48683514a3ae755baac40d7e0e1afb26ab49e14d30f39266382661b01e8f7ec53d71f145
 MISC metadata.xml 493 BLAKE2B 7d6324fc877ffe1d20c5369c2af0b09a7028f94d28f1841188913d0d8be7ea699c9d3f92c624992c4c96bd69615d3a1211a2483c76c56b7d3082492e43512523 SHA512 44420d8c03d5986f990b76369edfa8dfd7659b4952db3ad946fd05392ec594628a28745ad888d055d4f074d5214f61fcffafe6c04c4ab54109d45ac0371582bd
diff --git a/dev-python/boto3/boto3-1.26.81.ebuild b/dev-python/boto3/boto3-1.26.81.ebuild
new file mode 100644
index 000000000000..9523f65d5fb9
--- /dev/null
+++ b/dev-python/boto3/boto3-1.26.81.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2023 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 3c8d5cf4622f..1919d546e807 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -1,8 +1,10 @@
 DIST botocore-1.29.74.gh.tar.gz 11153254 BLAKE2B b3d3b75643cd5e3fac54a09e971daa23a043ba9f7ab773c2fd57dc15417c1b30c6f503515bad8734332bc40c4210e4ac09566c0742649c6ac3592e81ae9f8d79 SHA512 944ebbf1268fa9e8bb68ce5960da347613bcab585bf54c2fd6dbecb499088c1dc426357cde0a0f0d1780ecbc06acc33d8587f37c7f3d13577283b4549a353406
 DIST botocore-1.29.79.gh.tar.gz 11184048 BLAKE2B 062326a477fb27844ec47af28b77424863d6ff407dbcfd95bc9aa26d4009f503364f3d438997fe437b4830b8ef8c7bfb7e026313364bb3e9429cd3b7c2eae261 SHA512 260cf6a533e32c6f514774e5c5ef6830feb77058e1074e730d7fa05fb7067dac093f1a612ed11e02db116671ca9f7301ed29e1625f6e47724301d25b03eb3c30
 DIST botocore-1.29.80.gh.tar.gz 11197756 BLAKE2B 62f70c71f6b5892ff4daaede65389c75a159ebc29da69b2b2f9b59fabcf1818d91b968cbb04f48acce8310f34b96dbb30189c1fdc609e124202a6743d5b3e65a SHA512 27f31ba27448c5ea3214dcd585d60901761f6cd26e384a861aa377842dd3561f293c261a6a3fd91e78cc3ea75f48b9369e77f4a8d1a4b4dd08fbdde9335ee5a8
+DIST botocore-1.29.81.gh.tar.gz 11211684 BLAKE2B c89f683ab6fd238f975af4a30eea6191d1a6c2a8cf5ec1ac640a34de801bc289545dc2a98e9a76824afdb650b9d173751b23af3a3f3e9438f8cd1cdeb0fb64e3 SHA512 91b0d34652f68a3f41e768ff35d342c50868fb9e6f9da2b97a64cf08cac03e959395ac499b9fea7cf5997273700b06499f0d870661b9104709fead4a87c0a1ee
 EBUILD botocore-1.29.74.ebuild 1899 BLAKE2B 94938a1edb8da9279816e2302442deef5adc1edef43deb21369c8dfc62c569eb34d4198cf55dc6acdad0c718eba5ddce0040b6f269e866e6eff95bc36fd41be3 SHA512 a0d875a4dec85116eaae0a20182832dedeb84e6a8946093473b99a1746ed5ff8b49ef7e7a4ad5b70afdfbb1098fabc5ddbbc40b895c2b7e0559e3d10cd02e0bd
 EBUILD botocore-1.29.79.ebuild 1906 BLAKE2B 0502a7409355212185525e104ab8763d13886570efdb9cbdc01425e1cd36e81b0381d7eccd4de0ade28ab9ddce3d39e24760157a3544602969369e98bcf1ffcd SHA512 eee3fbf350bf335637a962a1cd061141b4b2db43d3cd19c95cc9d6e29bc44092c26477994c260f6df56ad626a537758c177567d38feadbb0b0be4626ec63276a
 EBUILD botocore-1.29.80.ebuild 1906 BLAKE2B 0502a7409355212185525e104ab8763d13886570efdb9cbdc01425e1cd36e81b0381d7eccd4de0ade28ab9ddce3d39e24760157a3544602969369e98bcf1ffcd SHA512 eee3fbf350bf335637a962a1cd061141b4b2db43d3cd19c95cc9d6e29bc44092c26477994c260f6df56ad626a537758c177567d38feadbb0b0be4626ec63276a
+EBUILD botocore-1.29.81.ebuild 1906 BLAKE2B 0502a7409355212185525e104ab8763d13886570efdb9cbdc01425e1cd36e81b0381d7eccd4de0ade28ab9ddce3d39e24760157a3544602969369e98bcf1ffcd SHA512 eee3fbf350bf335637a962a1cd061141b4b2db43d3cd19c95cc9d6e29bc44092c26477994c260f6df56ad626a537758c177567d38feadbb0b0be4626ec63276a
 EBUILD botocore-9999.ebuild 1808 BLAKE2B c88307d04e9daf86db23c54e39fb14931a6e60ab83593db191859652e67c90cfac45263f60c0211f81bfa10fe755b9023924713f2855324c929322d557b4ec17 SHA512 16e3144cef752302fa7ad350f5bb86301d41c0223f9ea41ed784083f2475d48efae095d82da95f93f77fadc86dea96b6aad1f1bce96bd926be01ef2d519fe230
 MISC metadata.xml 499 BLAKE2B e5aaa7da26f200c09adfdf38b68f656bbccbec627cb5d966b280ac2165334e7eec659c89075bcace748f58e2ec3e7d2998e54a688d56ecea2d30653c67dfd35a SHA512 103c554d5dbd967bf9b6e418b3913d9235e7e910d012160909ce0715134ed2e37b06e6a345395f9d16ce08d1cf51f3ce458bce93c6a978fd3dca6610f2acdbd0
diff --git a/dev-python/botocore/botocore-1.29.81.ebuild b/dev-python/botocore/botocore-1.29.81.ebuild
new file mode 100644
index 000000000000..0f4daaa48e81
--- /dev/null
+++ b/dev-python/botocore/botocore-1.29.81.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2023 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/breathe/Manifest b/dev-python/breathe/Manifest
index b6c2dae4b161..1bf96f9c3a4b 100644
--- a/dev-python/breathe/Manifest
+++ b/dev-python/breathe/Manifest
@@ -1,4 +1,6 @@
 AUX breathe-4.34.0-sphinx-5.3.0.patch 1354 BLAKE2B 2cead0e34ec7a0c4e140f794f0212f9dc2e5e5fbc61981d1d7ca906bc462d36fec3032279874f41b893949b34dea43bbd28ef8a3f7c30663ac432330b5088ff9 SHA512 14beb1825fe1cdbc8de14cafe47cf9b855465929bd55f72b8c81239afa2115ec3d390abaa9ec0a16194f60a93776eef89cc04a8d4b246f69318b2fa923b03a26
 DIST breathe-4.34.0.gh.tar.gz 206989 BLAKE2B 1c899165ae30de373f90c0fd0b3428d7f4d74e3f66720731c2d02bc2a8bd9c6e5bbd81909b8ab186304975f877d276ed0170c611105335032bee3b689cadef73 SHA512 7f3134575f1b8c4d7c96ebc735e33f656b5c6046de3fa2aee95d5e895fb33f0a83fb4b1c64dd69b9deca20b785868b42d6b1d5e39741500ff5f9d82bf3f130b4
+DIST breathe-4.35.0.gh.tar.gz 212932 BLAKE2B 9423cc99cd1dc45fa1c93f1e2adfe59be4f3398842d3c6f98ee7a17285e108de4eb88e149c4ee179fa1008e30b69c8fa4f3934506aa53892c2eb612fa7652ba3 SHA512 76e36fceb89c21e2c62471a37b856f8e7077f946ca8ebffdd068297d7d447ba4f42f8f9d91e231f7a181d7dba2cb8650479f35f8bef342184e5ccbd3dd951f91
 EBUILD breathe-4.34.0.ebuild 945 BLAKE2B 775be55667f201880f819b3c9891ab261602a1346feb2ba2a7e1964cc78733075d4ad96f3153fa2595e19881fe3622c763a67a60bb1c33c8e484d6d8d3be3dd1 SHA512 c0fa2b7f7f6e299b3dad9290b99db735a5015e48ee10c8e50a3535d47fa66fc39a7dd5756cb6b39fbe2e6f46db4cb849af9390b04df13bd01201d150d39ee0f1
+EBUILD breathe-4.35.0.ebuild 900 BLAKE2B b3ddc56b3223fb272ebfd2763dbb32968c60c21961f8de52fe298674527f2715b7d762db3073a852da97865537cd1f41cfe19c1adae263b729c4e0ec06be5dd2 SHA512 9155eb9c23dc76e7a0e04a3db6709b698c03cb0447f2870fbea4d9b68ada9e9ba73761d89b845a1303603d22ab18e52d606985283c8de8d567d7e9001bde9cdf
 MISC metadata.xml 821 BLAKE2B 4df48e03f2ad66f9a802bb6c238ee2459435e58153ce5cb8556b7b9feda45dd86017266bdf259faaa3e49963976bd61fbff5eccf18f2d9d95d61319995974fa1 SHA512 a14c0334a7029f762133252fcf7b8ae313be23059326876cd64d81fedaac4c37023288779450ff99524b6c3c99f62e7809befeb60476a9e838e6fa2f3169deb7
diff --git a/dev-python/breathe/breathe-4.35.0.ebuild b/dev-python/breathe/breathe-4.35.0.ebuild
new file mode 100644
index 000000000000..ecc0d3520dc9
--- /dev/null
+++ b/dev-python/breathe/breathe-4.35.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Sphinx Doxygen renderer"
+HOMEPAGE="
+	https://breathe.readthedocs.io/en/latest/
+	https://github.com/breathe-doc/breathe/
+	https://pypi.org/project/breathe/
+"
+SRC_URI="
+	https://github.com/breathe-doc/breathe/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	app-doc/doxygen
+	dev-python/docutils[${PYTHON_USEDEP}]
+	>=dev-python/sphinx-4.0.0[${PYTHON_USEDEP}]
+	dev-texlive/texlive-bibtexextra
+	dev-texlive/texlive-fontsextra
+	dev-texlive/texlive-fontutils
+	dev-texlive/texlive-latex
+	dev-texlive/texlive-latexextra
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/ewmh/Manifest b/dev-python/ewmh/Manifest
index ae9f3cfdd467..15dacf0be2e8 100644
--- a/dev-python/ewmh/Manifest
+++ b/dev-python/ewmh/Manifest
@@ -1,3 +1,3 @@
 DIST ewmh-0.1.6.tar.gz 13065 BLAKE2B ba26d28f8976792b07e0bb200e1a2edcd7a04442bd17606a5d786ca41f01f4f3f96243134dde638fa228e49b79556d6ccbf25cf032c278e0b5233557746f34e9 SHA512 96c498cbd45bf03dca8b0c982cbb7e5644b00ce35b49df6abf119d36a18c08f907b635fc0ab12493d6351ba2c6645c75440d7c92d09d6feb06f6121bfd41391b
-EBUILD ewmh-0.1.6.ebuild 482 BLAKE2B 1b1f623bf6bcaaff2b3157f3ac0e2fa16d6c9b6739aaaee8254495e0ba0486debe6e272e2928c49a2bdfdac64cc4d1379377988964058e30e069bc7f10a5a66f SHA512 7894f7e3de6dbd659342341bbb0334e484bfd19e9322e936384bcd786455555e873c4becee323d178f1ec3fd4faf1e5bba7deb60933f91bbcc430a9ccd3ba8aa
+EBUILD ewmh-0.1.6.ebuild 482 BLAKE2B d568442a37a918279db025caec578e57954e7ae771ed7ee93f30004f977fe4467056fb0155e14ef585408e509b95ba3e514e88dc6991b80a96e22c9fad43b8fa SHA512 8fb044d7072edcc61314750a801153553c4b5dfa80d759beb609a676a61d2568e2584b71a607d54b0fb1fd4cd0eb6f4bfb721a708d6f228aa6ff86812f8e9803
 MISC metadata.xml 594 BLAKE2B 49fa37ffaeee99799a3a9ff1ff8207ea6c7c79205a5e86cecc33f40ba0324ac24d4110a1cad31802e3483985d6b8b9daf3ae55f33b1a358605b6d5cbb78d44b0 SHA512 8cae00e5008b902aa4cf4eab32670b449d4142d701d6454ce659773a9d00b511af4fd33fa5627b5aac600cdb56bc71a0274c55560296ae214bbe7739a24bbc7c
diff --git a/dev-python/ewmh/ewmh-0.1.6.ebuild b/dev-python/ewmh/ewmh-0.1.6.ebuild
index eaee900fa347..abb9eb9c8520 100644
--- a/dev-python/ewmh/ewmh-0.1.6.ebuild
+++ b/dev-python/ewmh/ewmh-0.1.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 
 inherit distutils-r1
 
diff --git a/dev-python/funcy/Manifest b/dev-python/funcy/Manifest
index a883b4a009b6..e8ea4ece965d 100644
--- a/dev-python/funcy/Manifest
+++ b/dev-python/funcy/Manifest
@@ -1,5 +1,3 @@
-DIST funcy-1.17.tar.gz 112383 BLAKE2B 150133f72ed165bdc9adc3a9f4954dfd5b846dea7b1ee2cae0d6621ebaec3e2ba986cd6596fd86482036aad6476913caec0868db9cf55c067fdbf62ac10953e2 SHA512 d48ce3b7a7b8ee7512df109d651f40ca4dadf681acca6ab0a4857a2ea408f20f6345b9b416ca8b1e924050a842648192b8fe79381c202361bc4d2e25bd55ad05
 DIST funcy-1.18.tar.gz 277530 BLAKE2B 78e86e23b3908924de1de62dd567ff8ff52079a9a7529923c84f67a3c5f768d232164d758763db1ce941986c28012dbcb3c146412998b1d1d6064efcc0ff4bf9 SHA512 274fec59c1fddc58248b5f8c81686955706333bbd33a1d567f62694c70449ef2488fae6bf76418b8ff3c6655fad12ed344cc6c90a84c5b10412e32fbdda016fe
-EBUILD funcy-1.17.ebuild 484 BLAKE2B 570a5c1969cf16e65fb2fc7a840f777f5aa4b9fa95439e05c277f69848929b72a15b9ceb22f5fbd877371e03856d50b555e02c7550ca0fc692d9da8722842c24 SHA512 dc7963bf04635626b278b8011ab47c7e3529ce442d78b7a898721269c57b9abb3641ef19a8f965d9b5565769e3b14afbde67b7dd714a1ecfb0ac215237179234
-EBUILD funcy-1.18.ebuild 550 BLAKE2B 9a1d4c1d31d118dbc598ef1d26c9e3bb381b7ff4aa073182ca61ca4d820f475c797cf16a101ddb62532b89a528f0ed30728c056d4fc9bea7340b8a213037bcfd SHA512 150903850bb3bfb7c1885be890b02b97929189e5a8d7425f9beda86425896b15c83c1250c6495eb2445df1e0e76b7f4b971860c789960420a6496d626768bd53
+EBUILD funcy-1.18.ebuild 503 BLAKE2B 46dedafb64b363f8c4298869380f7f236ebd7426e748b46c936197d62a8b6244c37cca844b7c11c040c239d171a0b6f626cb09b3bc1e0d167351adeb550d7443 SHA512 505c8797e1a4661166ebded8bcb853621747685f72e4361e912cd9a688a61793c2a20fe89a1d469ef5361c31d18f6cccf01354b985eb5c0cfe54e4f11c7c7349
 MISC metadata.xml 491 BLAKE2B 70c6646bc4496af1ef98d1178b2b4bf9d876ee0a3664e878af184d12b162c9c926d14bd8dd7987355c4bef86ce53fb65ea96abe2384198f2c054c3835e78f982 SHA512 31d13ddb7d20c36c98e5a4068e96881200122425608e8877c133483117b565b44d65800bcc61dc6ad7e407b6c9953a3f53afd52aebd1a5c25aa1ceacc067c744
diff --git a/dev-python/funcy/funcy-1.17.ebuild b/dev-python/funcy/funcy-1.17.ebuild
deleted file mode 100644
index b18c07ac76ce..000000000000
--- a/dev-python/funcy/funcy-1.17.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..10} )
-inherit distutils-r1
-
-DESCRIPTION="A collection of fancy functional tools focused on practicality"
-HOMEPAGE="https://github.com/Suor/funcy"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-BDEPEND="test? ( dev-python/whatever[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests --install pytest
diff --git a/dev-python/funcy/funcy-1.18.ebuild b/dev-python/funcy/funcy-1.18.ebuild
index 25585ead3b4b..b9e11f377890 100644
--- a/dev-python/funcy/funcy-1.18.ebuild
+++ b/dev-python/funcy/funcy-1.18.ebuild
@@ -6,14 +6,13 @@ EAPI=8
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{9..11} )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="A collection of fancy functional tools focused on practicality"
 HOMEPAGE="
 	https://github.com/Suor/funcy/
 	https://pypi.org/project/funcy/
 "
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/dev-python/ipython/Manifest b/dev-python/ipython/Manifest
index 6e7126c8658a..e3c7f08d647f 100644
--- a/dev-python/ipython/Manifest
+++ b/dev-python/ipython/Manifest
@@ -3,6 +3,6 @@ DIST ipython-8.10.0.tar.gz 5456256 BLAKE2B 8ca8781326396ffa1e8012bab3b539b857a68
 DIST ipython-8.11.0.tar.gz 5462176 BLAKE2B 6024c191f327d04f7a26f2f371b200e2e3f26029d84a3a53fc7421cb4751f0e29fb8741a2aa0447026b43cc1d9a7674a07e06c30578812cc33220c55df72c497 SHA512 9b07da3fed304f6739396883d0219386bb08d4860853b30f308c2e9b9017f48d1228dedb511c872b706881ee80dc7bf03f541720ffb816c35b66f6f53ac289a3
 DIST ipython-8.9.0.tar.gz 5454595 BLAKE2B bb091bf9c2d9571ded5e1007d9fe60d34b9b0010747759ccceee3368822e3e190766439e3dd9b26df2dbb136ed2b81bc0d89d9b8857baae6e4d86a3524c07972 SHA512 2a9df79ff26bb34866dc523e75ba8e8d8de25d510fc273cbbf762b3011e53ff5331869f1d6fc8c44df6c9a8b5745a0545fe301a556b7f20e3a3dfca994316735
 EBUILD ipython-8.10.0.ebuild 4310 BLAKE2B 31229f426f00af56849726238810901f850ed9a01f5e7818d56131aa8cc33bbd1ed5936e6f881ef40de73b1e8201c94182e5a2079bc4f4cdd179358e4bf04880 SHA512 247d41e8ee8ccc7dd2e1f7d77f25dc9cb60550bc785a0faaec0bdf9e5dce724f1744db7218f6cf53fc6e19c1cfbb17323bc7a69e2ad17d2cbf6fa6a4303bb7fd
-EBUILD ipython-8.11.0.ebuild 4341 BLAKE2B a1cd59d62fb806302c994d1a05b13aa741c19ba8b8127dc898b98dfc1276a9528a0a027c70856f2eefed5a56aede90c3f852c45e4450ad8a8db6417a919739d7 SHA512 7fca0bb06d1713293984d3869e5e4436485851b5dc7251a465fdfa5fd2cbd2e11923d039eb9ead440fe56dd3f2df8237143ff8d718372e20a8d2f69e858b1e73
+EBUILD ipython-8.11.0.ebuild 4341 BLAKE2B c657404f0bf7fa6c9bed0772292859fa45456c702e3825651531efc1eaff7a2fb740c9ea52a2ad1fee18584670112b3cbe2e760d83bbd87b575062334c323375 SHA512 179cf02ed16f0f8a760bd1d53a92a60c3001813c89f84e78f7cc1ab4fd93a11d7997257166ec4804378d2b611cc0ba3902a9d5ad4f9fc0b3b17ec7f0fb17ec4b
 EBUILD ipython-8.9.0.ebuild 4302 BLAKE2B c2200d33b442a2103486ab6590f9b1e45f89959d87e5b38c3ad421f37c43903e867c38dc66610dbd851b67dcd6ac612653612f149e0db888e0bb49454b069c9f SHA512 bd1c44809e986a131d402ac8782b7283fb2246bbed0cbdb51c32dc369f397584c6056d60ceb7d3146d8c926767b6e598f4bbe20e3b47aabc467a52cef46fb8d1
 MISC metadata.xml 2886 BLAKE2B 88c80f5eef5c89c8939e60c1944be4c63a5a318e55a3490b38bf864e7919debf8e3c3a32f1fa0a43766ceec6462fb20fd4d943194fe2c08208f0839783c20916 SHA512 f4ed7c1898930ade11983fb0666dc25dce7907f017145e1ad903651dcd95ead2734893d55b4548c4ae23425388485a86bffc9d885eae17d12ae1ac2c0058aac2
diff --git a/dev-python/ipython/ipython-8.11.0.ebuild b/dev-python/ipython/ipython-8.11.0.ebuild
index a27077f31a94..a85928b28699 100644
--- a/dev-python/ipython/ipython-8.11.0.ebuild
+++ b/dev-python/ipython/ipython-8.11.0.ebuild
@@ -30,7 +30,7 @@ RDEPEND="
 	dev-python/matplotlib-inline[${PYTHON_USEDEP}]
 	>=dev-python/pexpect-4.3[${PYTHON_USEDEP}]
 	dev-python/pickleshare[${PYTHON_USEDEP}]
-	>=dev-python/prompt-toolkit-3.0.30[${PYTHON_USEDEP}]
+	>=dev-python/prompt-toolkit-3.0.38[${PYTHON_USEDEP}]
 	<dev-python/prompt-toolkit-3.1[${PYTHON_USEDEP}]
 	>=dev-python/pygments-2.4.0[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/pdoc3/Manifest b/dev-python/pdoc3/Manifest
index 3c3469c452f6..cda3405e4943 100644
--- a/dev-python/pdoc3/Manifest
+++ b/dev-python/pdoc3/Manifest
@@ -1,4 +1,4 @@
 AUX pdoc3-TST-use-explicit-ClassWithNew-instead-of-typing.Gene.patch 1352 BLAKE2B c0e950e1f84f0e10e977e89eb84abdc52f80c242d2b0285142fd32830ce3f8825c3565b99720df249521a667860dadabfed4bc39503156a72158082f4b5e15e7 SHA512 df89ca51799dca760f22899eba9f12af590d9473235bee36d152fc00e7e9406aa3daa20a97dab012e2ca354076beb54961d90819373a5517fc9a49e5bb9a1bc5
 DIST pdoc3-0.10.0.tar.gz 86133 BLAKE2B 3bada6fb1b048c4eff7556108c29d7f92ee988332d160c4ff765c47bf0cf7a461ed90f93e7be25a7a3251f5d3e70492d23be7230a5ec4abb12612b7e0dd4b5b6 SHA512 646ffb9bceb4456a1ab36c840eb384858aab430443905bc71e62e9c71112a769b69e22cbd18a9d75b7968e2336cbbaa9072103f96dc2d0829ccc7515b057ca85
-EBUILD pdoc3-0.10.0.ebuild 760 BLAKE2B 610a1d2fd2c09c9e8bea7b3952299c1c16e9a9c88ae420f8a7f4eeb6aca2393edf5c4ad578de1046e178bcfd62cd9e8d2e60d290d37f0f063f1bb9ea81a314cd SHA512 99cb932b86daeab48a2f719f1e1f065513c5ed8e15611685220e9aad6e42406509e72438334e56a99b501c90234fc7f1a753bb6fdff2a22e05a5bab61f9f342e
+EBUILD pdoc3-0.10.0.ebuild 760 BLAKE2B d5934960709799302b6c468fa94946a8b84922376e843254c73af3f1cda5123aa5d6014293ab1caffd7c083850b1219c5611ba12a5391a4ccc3cb95388b90083 SHA512 a6b091ebea34563e55cd29b7c462e615dcf545ccac3b6cfb35195e37a4903dac533ac6c53001c91f0a78e33185a51a54e2af5ab99db060ae835760d6ff084478
 MISC metadata.xml 365 BLAKE2B 3339f5c2a1488984619c510a3f5bd81ca80ee26fb27fc01e0612632a43e57d1a69be9c4dc509d6a88e3f73cad88bbef3230020eeed1d20f1ec8d2010a335a6a9 SHA512 1614ffd6e83e036b288bcce03d2926429d0b5d41c1b7385053de1bcf5656bb6e03878b5c826f474cf4209f9036c533839ee6bce20780dbe626761ee0c295bf48
diff --git a/dev-python/pdoc3/pdoc3-0.10.0.ebuild b/dev-python/pdoc3/pdoc3-0.10.0.ebuild
index f7c8f5f90348..f8a76f0a2dea 100644
--- a/dev-python/pdoc3/pdoc3-0.10.0.ebuild
+++ b/dev-python/pdoc3/pdoc3-0.10.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 
 inherit distutils-r1
 
diff --git a/dev-python/tempest/Manifest b/dev-python/tempest/Manifest
index 243d76a1571a..a18205e2bf1f 100644
--- a/dev-python/tempest/Manifest
+++ b/dev-python/tempest/Manifest
@@ -1,5 +1,5 @@
 DIST tempest-33.0.0.tar.gz 1126464 BLAKE2B 14bce9e0baf1878fc30cc5026c7849cda5abc0291706c7cd051827ffb1e15670e653a20ba6c0c898e86a7e1bee498d14139f82887606f5587b7775d18f96595f SHA512 1a34bc81a18121e3be05ab1a2b637aa8bfc41a0a8e11824294c78468762fb5f303ebf9607f5e72aed1cc5b130b26e22bf72c0574472a0de4eca083e899ff6eb0
 DIST tempest-34.0.0.tar.gz 1138466 BLAKE2B fb08579592445ad9d7bebff5c828b507ddd4d3db560d3d6548a1f26e3ee942f0fda74082eaeee8bba224f284942a4dcf1cabeab9a35821b1a03d0d9d1d126b45 SHA512 83d23d8e6cf6507eec175733372a4f8a4e95e9cb66cdb0ad716bdd4de211a8ae290ba0f56f6ebd1262ff8769619aa6b9e4cba4bc6e7e3dabf1c702167077a962
 EBUILD tempest-33.0.0.ebuild 2194 BLAKE2B b89f9a0c397fcc3af7aeb34415b0e57409488580d73fd084e72751fd5819435d65242b993283c6c1ba940d2e0b60d75f6317d2a229175d0fed0b8daa66ddf5c9 SHA512 b71f8a02f7d2d4cc33f167562db39740eb5785e69deca32392106e9139eae21c379ed453be64aa399991483766c914a4ad31419594bdc3617ba9638916d0bccf
-EBUILD tempest-34.0.0.ebuild 2150 BLAKE2B c1c4ee199844130d10744d9fef83fb2f017fd6b8533aea97d994fee7ca17622113e0c5b350757034e94172d036e38b95ce91367b6b3ba6536807964a5f35065a SHA512 a9ca6495d7b39a8be4f573e1c2392575c60dee4ec43891428f17bff79d6e4c93c9f637e5bddc214cd1f74afb5a1668d112363b60d361b4a72094d3d83367e7c7
+EBUILD tempest-34.0.0-r1.ebuild 2199 BLAKE2B 807c0e451c8c8b24dc94429e5451dec69642328e3751d97dc62f572f6fe474f76042c332212cfbb4b1243b0729d8ff21eb1fbd8795f00a4058835b58f44c3858 SHA512 0f45ab8a3b36314818963e09372288de07325a79d28c4cfae116250d1ae962bf37938deac4c280ad61100470c39f1886a10fc7ea8d72de8e5521a5fd0924c7c2
 MISC metadata.xml 442 BLAKE2B 30b474d10a59f53672390e029ffaf894cfe52862af42814ca09500372d4c94afc596177100b9ba69cfd12965e98809de363527d9db345c3b4cf499eaab0375f9 SHA512 d84466ecac31486c92a6c5f87089616b65a1f3cbe9447c3382021af57bec3964a80d4d4421783560528e80e70afb4f4ba604bf2a4e23ac7fcbd873ef3d789859
diff --git a/dev-python/tempest/tempest-34.0.0.ebuild b/dev-python/tempest/tempest-34.0.0-r1.ebuild
index 551a3d439257..9143d3959fb9 100644
--- a/dev-python/tempest/tempest-34.0.0.ebuild
+++ b/dev-python/tempest/tempest-34.0.0-r1.ebuild
@@ -38,6 +38,7 @@ RDEPEND="
 	>=dev-python/urllib3-1.21.1[${PYTHON_USEDEP}]
 	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
 	>=dev-python/defusedxml-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/fasteners-0.16.0[${PYTHON_USEDEP}]
 "
 BDEPEND="
 	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/ubelt/Manifest b/dev-python/ubelt/Manifest
index 85a9a5983f28..5bfaed58b334 100644
--- a/dev-python/ubelt/Manifest
+++ b/dev-python/ubelt/Manifest
@@ -1,3 +1,5 @@
 DIST ubelt-1.2.3.gh.tar.gz 324632 BLAKE2B bafb67048a8a6525fc0aa1393fff22a3bf56d3843d195dc29125b8f452c4700dff77282349fbb44e0fc23a5495bcf48d6626879603f6c68a14ee04435d0f1831 SHA512 2a0a3e8b40ebaa5d2c7856cd197cdd8113ff58be6827ce57f394284f824e310078ef2a754247575c9eec2d3d1eecce2ec22239102eade025d556a79552e5f9d3
+DIST ubelt-1.2.4.gh.tar.gz 337670 BLAKE2B 4c8b1c05cbed0f28e69b43445f12881e4c619be4a513b9263a6eb4d674e56b0a869d1e78072e1e89a505a12b3b40dddbb48424bccdcfbae1a7eabf7746bc79d0 SHA512 5fbe36598a035d1504b24a06e8f0fcd1c9d0ccc238f81bfad582288aced9ebc8323e7acf2705d47e60f36513cbf665051f554cce122d75d55247b5fc122af419
 EBUILD ubelt-1.2.3.ebuild 1024 BLAKE2B 96a8aca73668d4903a5aab51fe6f6f38d7c865c9083016d6c9477fea42805c9caa690d0780e87b813e57f53bea701832b9e2d6cfe72e924dabf7d1d3be92618e SHA512 c9186dfe2ee83ea51219c57b6b1b8e85acc9eab9370710aefc6af088c5a65a2f493e0232891766c6fce829bdcdc4fb8da2e121a525c458002fd39b070434eb20
-MISC metadata.xml 423 BLAKE2B 3327e3ecc16b8971759b84617779a2b4d5072a34547815c8314809a911e6d557fdea620c90a255ef7f89cb2c941a46a7e1dcbc62e5e6b46f19255758f42890fc SHA512 967c14f809f73fc1bb48d730406512d3f87531486701ad4be8dfb4e5cd0c1265c082596768d36c4950734c653cec56484fb3e5b79ce13dddde38977f88889124
+EBUILD ubelt-1.2.4.ebuild 1024 BLAKE2B 96a8aca73668d4903a5aab51fe6f6f38d7c865c9083016d6c9477fea42805c9caa690d0780e87b813e57f53bea701832b9e2d6cfe72e924dabf7d1d3be92618e SHA512 c9186dfe2ee83ea51219c57b6b1b8e85acc9eab9370710aefc6af088c5a65a2f493e0232891766c6fce829bdcdc4fb8da2e121a525c458002fd39b070434eb20
+MISC metadata.xml 477 BLAKE2B 6fed6e411576ba35dd7e10ba964f3a5edb97a44c3e1794f841a4e5e91b554c74f7065bdb7dc697df5b280494d24aec7cd21511793cdb180775e809df1c8ff1b3 SHA512 aa5d2dea34583835caeffde7a8abf42bb2d154818675e210b96c9f152582224d9eb101771f3e00a67be143298eca4075fade67c6f47b5c19dd18e78df62e2adb
diff --git a/dev-python/ubelt/metadata.xml b/dev-python/ubelt/metadata.xml
index 3714117854ff..1cb34565e417 100644
--- a/dev-python/ubelt/metadata.xml
+++ b/dev-python/ubelt/metadata.xml
@@ -10,6 +10,7 @@
 		<name>Python</name>
 	</maintainer>
 	<upstream>
+		<remote-id type="github">Erotemic/ubelt</remote-id>
 		<remote-id type="pypi">ubelt</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/ubelt/ubelt-1.2.4.ebuild b/dev-python/ubelt/ubelt-1.2.4.ebuild
new file mode 100644
index 000000000000..1900b772e9f4
--- /dev/null
+++ b/dev-python/ubelt/ubelt-1.2.4.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+
+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=(
+	tests/test_editable_modules.py::test_import_of_editable_install
+	# relies on passwd home being equal to ${HOME}
+	ubelt/util_path.py::userhome:0
+)
diff --git a/dev-python/virtualenv/Manifest b/dev-python/virtualenv/Manifest
index 30dcba412cbb..3e2c69376a6c 100644
--- a/dev-python/virtualenv/Manifest
+++ b/dev-python/virtualenv/Manifest
@@ -1,7 +1,9 @@
 DIST virtualenv-20.17.1.tar.gz 12269737 BLAKE2B 5caa223d549ecb69de3a17dec84a608f34f01c5abd39ab478c27438f71e36e6878a719f9002464dbf0f335bc90a2f4552e201d59e0e757fabef6f3caaaf857fb SHA512 6b32145f431f6b1f4c2a2ed888e8b9e5cb941e04ea1e68830053dceac80ee8bbf2286c1f353951d50d4b8417b8d81ee4b30dae597c94f2a3baf50f174f7ef4d4
 DIST virtualenv-20.18.0.tar.gz 12063086 BLAKE2B 272957077dd0a5868e8979c7c34bda1ae28af857d1d5bbafeef6955bcf44a7c5d38f4f131b57a2593180ffdc5a034b18998ba3e4307b7191ebafccc80ef46278 SHA512 b02533878b8d8859f10b51dbdb9fecddf9b49aa2cf1437ddc10cadba82e5361fdeb8b8c94efcc3c8268ddecef31651c28c213e87588aa917479e8d0e2e823493
 DIST virtualenv-20.19.0.tar.gz 12063084 BLAKE2B 6a6d94c7099aa841523909173b04821697c7fc8b284325dbf191f6b2184bce19802924e0a001267448a785c35f8bbd7cee74f7514a375e4e47a9d3275404f756 SHA512 75c63fea11ad070985cb2ba17adfcb7e1739e8798b80919cc17a527d7180f68a04197436b44146cd07423d8d2e4982d1716b0e18159add5ce6a748b31f6b2776
+DIST virtualenv-20.20.0.tar.gz 12069625 BLAKE2B 3db53d2859c542953be233af0d195d992eecef345700ad7c229b88519f7042189907263d312d3613b45c5c069bec2440a8639bcc58b2c6894ed79301735e65b2 SHA512 6710efcbead1358479961c84ec3f6b9c3a1fc59c2f6b33fa13e2609554f7072aee7ef8cc07b4aa2fbc27ac950a78e447529fb8ceb2e4ee0881a4356a67d26641
 EBUILD virtualenv-20.17.1.ebuild 4921 BLAKE2B 45ad54890f9f7bc7fbbc911d38114bb3e646d86f0eca7156486d16ec8ec7e21b9ced8396350a391343bf29bbf7e4a872cd5236f9ab1454542e868d0422b253bf SHA512 5e003f514735abafffd6621179178c52455b3bae7eb67da170186110cc96794d086a49b6a9fa33564c320fb2d3dc1257501955e4fe567cab1176d2ad610bb68b
 EBUILD virtualenv-20.18.0.ebuild 5012 BLAKE2B 9254d23d00755994534a17315ac32795634bc2f29a65cca17c59ce5c9f9d3bb3bbfaca59afdce96daea7bb773640135827d5a78caceefe5a60dce13e13bc7a6b SHA512 95bafcdf488a146aea8d3aea945466ede8f7e98c364c43973dda5130560dc9f927751b742ef4ea37a8e4129a907bcc86b49485a64a7e2b8c06d9a45bdfbe5e5c
 EBUILD virtualenv-20.19.0.ebuild 4956 BLAKE2B 519d903e8449c44867db84ad230e14bc90317f6088ec65a5f5aeb82c069e3b597582c22b26cfc27f04eb0894a8b154e3ac0d0f32203f8ed5754e4eed7e59dc4b SHA512 bac83db65b2f129cdc1b3dfae131a79b4f1c7d5435d07baf11fe4714c186034b944546654b70ad58e6c295d2c0146daa210e33e8d067910d37e53739b8753933
+EBUILD virtualenv-20.20.0.ebuild 4769 BLAKE2B b2641b3d910b24c0d5b52ef5a3a4d79b8b7256b2a86cb17994d6ce64f79a4c14103f75ae76d8f4f1426defa853ca884c5da1983685bf2e22cca553408a54e472 SHA512 49ee545c8b6898126d138665f88b3018ebdb6c7f2580b7e8be13626103680f051a61017038f53429f0caf7913265e0092076619c50fd5b12bb593a8e36ab7e9a
 MISC metadata.xml 406 BLAKE2B 97fee04c2662c5c36b6e16538284def46eb2454424770f42edf2567ed804ca15c4e969c714c57573f897b0946246577ab6e35204ed1f3f1735713d8ab5d24667 SHA512 356d42db463b63a3b3a55c1e98eb661de0a10aa6a5fde4f8b3f888ec73020c6679e86efd8dbb0b3e4a5a720af95e658612ba460fe548e081a90beec75fb9c1b2
diff --git a/dev-python/virtualenv/virtualenv-20.20.0.ebuild b/dev-python/virtualenv/virtualenv-20.20.0.ebuild
new file mode 100644
index 000000000000..d32afc1e8df6
--- /dev/null
+++ b/dev-python/virtualenv/virtualenv-20.20.0.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{9..11} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Virtual Python Environment builder"
+HOMEPAGE="
+	https://virtualenv.pypa.io/en/stable/
+	https://pypi.org/project/virtualenv/
+	https://github.com/pypa/virtualenv/
+"
+
+LICENSE="MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+SLOT="0"
+
+RDEPEND="
+	<dev-python/distlib-1[${PYTHON_USEDEP}]
+	>=dev-python/distlib-0.3.6[${PYTHON_USEDEP}]
+	<dev-python/filelock-4[${PYTHON_USEDEP}]
+	>=dev-python/filelock-3.4.1[${PYTHON_USEDEP}]
+	<dev-python/platformdirs-4[${PYTHON_USEDEP}]
+	>=dev-python/platformdirs-2.4[${PYTHON_USEDEP}]
+"
+# coverage is used somehow magically in virtualenv, maybe it actually
+# tests something useful
+BDEPEND="
+	dev-python/hatch-vcs[${PYTHON_USEDEP}]
+	test? (
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/flaky[${PYTHON_USEDEP}]
+		>=dev-python/pip-22.2.1[${PYTHON_USEDEP}]
+		>=dev-python/pytest-freezegun-0.4.2[${PYTHON_USEDEP}]
+		>=dev-python/pytest-mock-3.6.1[${PYTHON_USEDEP}]
+		>=dev-python/pytest-timeout-2.1[${PYTHON_USEDEP}]
+		>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+		dev-python/wheel[${PYTHON_USEDEP}]
+		>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
+	)
+"
+
+# (unpackaged deps)
+#distutils_enable_sphinx docs \
+#	dev-python/sphinx-argparse \
+#	dev-python/sphinx-rtd-theme \
+#	dev-python/towncrier
+distutils_enable_tests pytest
+
+src_configure() {
+	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		tests/unit/activation/test_xonsh.py
+		tests/unit/seed/embed/test_bootstrap_link_via_app_data.py::test_seed_link_via_app_data
+		tests/unit/create/test_creator.py::test_cross_major
+		# tests failing without python2 installed
+		"tests/unit/create/test_creator.py::test_py_pyc_missing[True-False]"
+		"tests/unit/create/test_creator.py::test_py_pyc_missing[False-False]"
+	)
+	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
+		'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-isolated]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-global]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-isolated]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-global]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[root-venv-copies-isolated]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[root-venv-copies-global]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[venv-venv-copies-isolated]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[venv-venv-copies-global]'
+		'tests/unit/create/test_creator.py::test_zip_importer_can_import_setuptools'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.10-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.10--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.10-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.10--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3--bin-]'
+	)
+	[[ ${EPYTHON} == python3.11 ]] && EPYTEST_DESELECT+=(
+		# TODO
+		tests/unit/discovery/py_info/test_py_info.py::test_py_info_setuptools
+		tests/unit/discovery/py_info/test_py_info.py::test_custom_venv_install_scheme_is_prefered
+		tests/unit/discovery/py_info/test_py_info.py::test_fallback_existent_system_executable
+	)
+
+	epytest
+}
diff --git a/dev-python/zc-lockfile/Manifest b/dev-python/zc-lockfile/Manifest
index dc7f7f847cac..db69f8e155ae 100644
--- a/dev-python/zc-lockfile/Manifest
+++ b/dev-python/zc-lockfile/Manifest
@@ -1,5 +1,7 @@
 DIST zc.lockfile-2.0.tar.gz 11923 BLAKE2B 7609f64eef4521f0aa95dc899b253570a317bd997cced00665a2dbe22cf7f834ce75daaf4fdf79520157dee31742758aad1844d49c5eccb780e7d5fd2e8e5ac5 SHA512 2586bafacb12540383695a24cb01fd284e61bfa3fcb16431ed0e91278e547c68983363fb69c1ffbd54f7c22db43300ba018ccd2fb3e21666c98860415b7a3c3b
+DIST zc.lockfile-3.0.post1.tar.gz 10190 BLAKE2B 80f732b758581b25f7d45c843b73b35985ad24185a04d207b612b448e6a1c52e49103d214e9a8b1fa0c3965037c8bcd73c504c5e0e8267814a380e08dc6f1256 SHA512 180d167ffd5760d8f9de02fcbf8e715ad04382d530f3b2970b92e346a588bb3da16926871be944441b2c0d4c8501a9d59fed2dc3c0a733b6c4478b6571d4b911
 DIST zc.lockfile-3.0.tar.gz 10043 BLAKE2B 9435f9999f976e6bfd6302b3d24960e21992f54755c6dadd9f0392254ff89b474039d7502c81c9667b4bb741300ced33bca35634f8990840809692cb025cb7f5 SHA512 65662d03933b0e295d69971a74a1d1ddf67086287bd98752d6d23d793130b0c612413c0dba365f7fa2213a5ef0981fc20bccbde304dc36a4092ad1f702ee9429
 EBUILD zc-lockfile-2.0-r1.ebuild 1098 BLAKE2B ecb9cb1eb75e0241c6a7b441c58757d01e25072943a12e66174d75879bda410b4190d287e5b44d55cbfcc9f94f989e6cb4b77a4657707e506f4fa4b9129dae90 SHA512 37a3eab995ae4cbb5061ca3d5decbf152815bf878c4e54c515a4b2d94d07a6f425c4ec2660b77c387a2fd7a07433d98a2d1bf500cce83c32cea7bdeb3ab46f91
 EBUILD zc-lockfile-3.0.ebuild 1086 BLAKE2B b71b61031d645a05490b81aaee609fb70504cfeb7acb9b8ce6f863e00b3cbb4f1b29fc60ea2b2dbd66382e6c74226753836bf46d54add5c94a170b22d3bbaf65 SHA512 d070f29fe9cb87feb50bcc850969805733da16cc8e788f9d0b912a356f062032fc7d5ab9893c93caafadbf59009d4a70a5693312cd45c41f77df0a81649c6071
-MISC metadata.xml 424 BLAKE2B 91d244951c549a683899bf54f792936273ff3e444def80249e6baeb9e3dfb810cd35fd822cec023574994dc06ce3168061832b31f489df3e0ee7c8303e80d4c8 SHA512 cb88901bf9146f663211ad373b2cd83ffe35ef7c30b87a13336143e0543f5f2aa38651079f92be17b05edf5f156bf4823cb58b1b69df6282c35a0007356098ea
+EBUILD zc-lockfile-3.0_p1.ebuild 1102 BLAKE2B fc5d06780ea2cd3acbb291bbc2dbaf5c9f91814992abff1e3391c70bd1a212a61bdcd824170d4519d7cfd01dbbe6a1860ed9922e0e1f663545149481d14578f2 SHA512 9fe2c34c3638214ea4550d2f70a80f8549a3c3f90a86d6d60c081c7d6cd268d0213bfdd8b387c1f241a370da8fad34992890cf195b5838035a1f67b85eec5ae1
+MISC metadata.xml 490 BLAKE2B 83ea2053e029d9373261556a5b77af2ccab69294cbc6465029365293a893eee3ac7ae9e3b5b282e46ff27a6aa859c74a76f401e52b3dd62f6d4646c1c8bd4c2b SHA512 98bbbb79c61aa6f3b725676a77381b505d7738e40dd64a590b44f10d9496c346edb64595b39cb586cf2fe8f7d5cc96fb3b3410ec023d648cf96d92ce30130636
diff --git a/dev-python/zc-lockfile/metadata.xml b/dev-python/zc-lockfile/metadata.xml
index 681f8ff378db..ad9c502a6d7a 100644
--- a/dev-python/zc-lockfile/metadata.xml
+++ b/dev-python/zc-lockfile/metadata.xml
@@ -10,6 +10,7 @@
 		<name>Python</name>
 	</maintainer>
 	<upstream>
+		<remote-id type="github">zopefoundation/zc.lockfile</remote-id>
 		<remote-id type="pypi">zc.lockfile</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/zc-lockfile/zc-lockfile-3.0_p1.ebuild b/dev-python/zc-lockfile/zc-lockfile-3.0_p1.ebuild
new file mode 100644
index 000000000000..db027ffcd598
--- /dev/null
+++ b/dev-python/zc-lockfile/zc-lockfile-3.0_p1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Basic inter-process locks"
+HOMEPAGE="
+	https://github.com/zopefoundation/zc.lockfile/
+	https://pypi.org/project/zc.lockfile/
+"
+SRC_URI="$(pypi_sdist_url --no-normalize "${PN/-/.}")"
+S=${WORKDIR}/${PN/-/.}-${PV/_p/.post}
+
+LICENSE="ZPL"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+BDEPEND="
+	test? (
+		dev-python/zope-testing[${PYTHON_USEDEP}]
+	)
+"
+
+DOCS=( CHANGES.rst README.rst )
+
+distutils_enable_tests unittest
+
+python_prepare_all() {
+	# rdep is only needed for namespace
+	sed -i -e '/install_requires.*setuptools/d' setup.py || die
+	# use implicit namespace
+	sed -i -e '/namespace_packages/d' setup.py || die
+	# do not install README into site-packages
+	sed -e '/^    include_package_data/d' -i setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	"${EPYTHON}" -m unittest zc.lockfile.tests -v || die
+}