gentoo auto-resync : 09:09:2023 - 10:33:01

32 files changed, 860 insertions, 6 deletions

diff --git a/dev-python/Faker/Faker-19.6.0.ebuild b/dev-python/Faker/Faker-19.6.0.ebuild
new file mode 100644
index 000000000000..fbbb3c11a92d
--- /dev/null
+++ b/dev-python/Faker/Faker-19.6.0.ebuild
@@ -0,0 +1,40 @@
+# 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_{10..12} )
+
+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 ~arm ~arm64 ~ppc ~ppc64 ~s390 ~sparc ~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
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=faker.contrib.pytest.plugin
+	epytest
+}
diff --git a/dev-python/Faker/Manifest b/dev-python/Faker/Manifest
index a8e169df4329..a81cf5424a3f 100644
--- a/dev-python/Faker/Manifest
+++ b/dev-python/Faker/Manifest
@@ -1,7 +1,9 @@
 DIST Faker-19.3.0.tar.gz 1677117 BLAKE2B 855e3cc49e56d9c690add2b9bda9fc8c6e42a157543c44206803e794bc5a5da440f2a5151d959bff6aa438af465f7d4bf986e596af592251e64c80c861fdb8fb SHA512 cfbb81d8751fbe1c90260f806f36a8c95e7bcfe5f30555bb168b80e5e438a4e427482eb4220b55a6bd0f04ce4d64e9bd24b757b852b5a22de5f2b127e3f3fe25
 DIST Faker-19.3.1.tar.gz 1677746 BLAKE2B 1cf0c80daf23bbce824ebd81a3c31e6b12c353f4a75092dc482225ef27b1e55c9784a1bcde4305ffafb131471f4c5b886c8619c980e1d830530440c0c917e919 SHA512 4c9e073d46526830e4b561b61c8286c642668368b6a35ec269dd60cd56933b7e46bb699dceaab13330ade2e0928b27e8d5688fce555820c6a9abd34ecea2d37a
 DIST Faker-19.4.0.tar.gz 1678303 BLAKE2B afb893836e9e85cbf130875274284107f621d443e80d4872c12467bad3c9cc4f6a8ea68aa829c95439e6a88f319323767d997ad9bca88870f0883392710cc858 SHA512 14e86b2f95d2e59aee71bae9017b8e6f4cde3752d9a64749c174bba2bbd3a060067adc269a22ba0083140b2f8376384bf67cce4b48af407d3b25e3cbebf682d2
+DIST Faker-19.6.0.tar.gz 1679938 BLAKE2B af083363853fbb084f124971276986b459e93ec9e73470c227eab452bf688e480e37fb1f82f92bb21f40a7a52034f2ccf00e30f47d1b9c6b56da375a783c595d SHA512 130c51bdd50ef3a9a1026b0f1160ed0e1ceed86cb89646160d7cb2419a77fc21f969487e57c2ca080d7f7729c7a485f3bc12eb572efa6db308de54a15ffa493f
 EBUILD Faker-19.3.0.ebuild 720 BLAKE2B 1622a45722bdbe31e07f0edbf3dc3bebeef97305e38cbeaf7a216550e7c509244b1779d4e0c529e0742e6e4c80bafb8a44c49f9682bfc1f12741c79fc7562f97 SHA512 ef69ab3f17f6c1161b33f069abc68ff0ba294165b85c9a31c6795880121d301e14bf7c12d99e933fb67f81b4d79e8b15889683a1d2072c863b1639f05f568dba
 EBUILD Faker-19.3.1.ebuild 721 BLAKE2B bf998f25542a8833e6aa765af951e897b775d1d4d6270843de8db406186ce8b5f4b815487e4cd95cb11a88cc5cb9cd891663d533d727b97ff3aa6a7b39a255dd SHA512 2195e8b637bbd53ebbe6b2e8c52cb07dedb26b597196af730085321290fd8d85e3322d9f4440358865fcdd11566f786f089a354e50536619c3b361947e060e22
 EBUILD Faker-19.4.0.ebuild 845 BLAKE2B 02cbfd8fd0ab2bb4a78d577f082d52d6bcaf4ee4cc45bdd6eabda7ce48aec5bb2ad7e8111f93f89c498d87276f9350968afe47c0da4bbad0e7fcc14c9b951ada SHA512 5ef0803b4e548ebe131dbd8e76909aaa580ea752de895b7964e34502371a70a35fb6053aaf879283ed64624438fc5f58320b7c951d1f6fa7038f3e91c7a09667
+EBUILD Faker-19.6.0.ebuild 845 BLAKE2B 02cbfd8fd0ab2bb4a78d577f082d52d6bcaf4ee4cc45bdd6eabda7ce48aec5bb2ad7e8111f93f89c498d87276f9350968afe47c0da4bbad0e7fcc14c9b951ada SHA512 5ef0803b4e548ebe131dbd8e76909aaa580ea752de895b7964e34502371a70a35fb6053aaf879283ed64624438fc5f58320b7c951d1f6fa7038f3e91c7a09667
 MISC metadata.xml 498 BLAKE2B c9b7885dc7d34f2263068624a6b07ac6f1ec8078cc11abb6137612ba57edffefc48dae2708284aa83ecc941ebb2d3b8a87a143648e404a0683e75bb6c078f4e2 SHA512 0b385bbbfbb026803526e43c6c43965ff75f42d3ab133603708b187686aac29de508856e5e8ae7622a66b99032efa97f95c21625e10d074c858d8aff7446a312
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 9278319d8800..2627591d0ab9 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index e073a1cdb10d..a24a2d5c5bf6 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -6,6 +6,7 @@ DIST boto3-1.28.40.gh.tar.gz 696495 BLAKE2B 297a32f989dc0c1bc8f0a5cd797c5f2d52ea
 DIST boto3-1.28.41.gh.tar.gz 697348 BLAKE2B 83ec56d2e2a4f9ebad061f1b7650425a074d53427f4c691c23d5d9746c14bf6c4326bdca17b13a13d70723dd8e62d2e9977452ab9664556cfa63a93043c9b832 SHA512 bdd62739f532919803cab3303d11cf5362fbca8f1b6045e53b584705b8dcce7eb0d17fd1fdac02ccd49386937f1d6edaadfca5b1b3ac02d42dfe629123e31ceb
 DIST boto3-1.28.42.gh.tar.gz 697860 BLAKE2B c5a4550a222a7ec7d2f09af1e06bfdbcac9251d5bb0dea089ce6a87fae2f62852cde76c0931755a2a343c4e8d38953a87e6ba32d377edfd7519b3ab9d0346962 SHA512 e63eb26f7498794578ebe9bd599b8c50b6c765cc87903dcee729d8a169d5768d5bffe56535afdde139db0db887882b306fdc45e54cbef322e4607cf6318fa1d5
 DIST boto3-1.28.43.gh.tar.gz 698144 BLAKE2B ff0565b2fa023cb00adc6eab8b151fc2cca2f75cfec35845cb317a6e7aceede5c9b4c69f0e7e62daaefb1d7797d7a396154bfecb37c0d1c8baac81a5d8a7e352 SHA512 bdcb483f080c7fb3019c32347834e6096a1fb5f8ccad3cd9a50dc4fd1fcc66cc0810ad70d7a831a22e2e3a416f01415bbf80cf1d48b0c2c11714089e184d6c09
+DIST boto3-1.28.44.gh.tar.gz 698689 BLAKE2B 9c23bd7aa680f59ad686ad5ec46dd751d22b5d9769597b34c3210d2da732c0751a168f6f90488909e76820bb99c222861f68dc0e9998604094a02a30da213ddc SHA512 2c027372afbcbcdc60a77933a92b5e48757f2b19deb7b5fbaf8ff7eb7dfe24af1919ac4b8c5e619233ffe88f22e51d927ff648e43a9ccf76863959bbe07b5f31
 EBUILD boto3-1.28.30.ebuild 1508 BLAKE2B d38a9300c2cfd40239efbe4b7bad251a3fa5e723b438fbfafbaea76fbfb252832aba45f875aa0afb984a9ae2f4e8a4e64499d9ddff4ea1e3d1ddb0ea3fac5f65 SHA512 9c1ce9d3f807344d2040fa6200070589fbbc6f0ac0eea1146255c18412faa70a90632836ad2f0450c902ef57bd274ed537ec1633438c91b27fc76af981c7b895
 EBUILD boto3-1.28.35.ebuild 1532 BLAKE2B d9c16eb4938ac7488765eca7dc3d5d55402c5aeed4b4e380c9d0433a4e18a94cd11938b43fbe3584b95bc36fec90557a1cfb6017a41fa70807bc06b941e3eca6 SHA512 2d6bd178dd4b7b9b30ed092f69ffdf01e4450eae8e5ee86bd5dcced4370f6f49a440067ae598e126d7ca0f50f9c1212e734ccbd5073fb4fcdef8850327b57763
 EBUILD boto3-1.28.38.ebuild 1532 BLAKE2B d9c16eb4938ac7488765eca7dc3d5d55402c5aeed4b4e380c9d0433a4e18a94cd11938b43fbe3584b95bc36fec90557a1cfb6017a41fa70807bc06b941e3eca6 SHA512 2d6bd178dd4b7b9b30ed092f69ffdf01e4450eae8e5ee86bd5dcced4370f6f49a440067ae598e126d7ca0f50f9c1212e734ccbd5073fb4fcdef8850327b57763
@@ -14,5 +15,6 @@ EBUILD boto3-1.28.40.ebuild 1532 BLAKE2B d9c16eb4938ac7488765eca7dc3d5d55402c5ae
 EBUILD boto3-1.28.41.ebuild 1588 BLAKE2B 7868e2dbbe0ec485326e70c75cd785d0d369de83650d28b6501faaa4d21a8c1952c68c1e06659d1c4f70baf420b70edfb714e82d60dc9dfac2f494cc42066317 SHA512 a16a292694a5fd614ab03939fa6131614b287c8e475a83f40f463f0051f6404aa85413713038de60089b6489fc5fa9688bedd1d66ce578ed3fb0cd1b3c237d72
 EBUILD boto3-1.28.42.ebuild 1588 BLAKE2B 7868e2dbbe0ec485326e70c75cd785d0d369de83650d28b6501faaa4d21a8c1952c68c1e06659d1c4f70baf420b70edfb714e82d60dc9dfac2f494cc42066317 SHA512 a16a292694a5fd614ab03939fa6131614b287c8e475a83f40f463f0051f6404aa85413713038de60089b6489fc5fa9688bedd1d66ce578ed3fb0cd1b3c237d72
 EBUILD boto3-1.28.43.ebuild 1588 BLAKE2B 7868e2dbbe0ec485326e70c75cd785d0d369de83650d28b6501faaa4d21a8c1952c68c1e06659d1c4f70baf420b70edfb714e82d60dc9dfac2f494cc42066317 SHA512 a16a292694a5fd614ab03939fa6131614b287c8e475a83f40f463f0051f6404aa85413713038de60089b6489fc5fa9688bedd1d66ce578ed3fb0cd1b3c237d72
+EBUILD boto3-1.28.44.ebuild 1588 BLAKE2B 7868e2dbbe0ec485326e70c75cd785d0d369de83650d28b6501faaa4d21a8c1952c68c1e06659d1c4f70baf420b70edfb714e82d60dc9dfac2f494cc42066317 SHA512 a16a292694a5fd614ab03939fa6131614b287c8e475a83f40f463f0051f6404aa85413713038de60089b6489fc5fa9688bedd1d66ce578ed3fb0cd1b3c237d72
 EBUILD boto3-9999.ebuild 1532 BLAKE2B d9c16eb4938ac7488765eca7dc3d5d55402c5aeed4b4e380c9d0433a4e18a94cd11938b43fbe3584b95bc36fec90557a1cfb6017a41fa70807bc06b941e3eca6 SHA512 2d6bd178dd4b7b9b30ed092f69ffdf01e4450eae8e5ee86bd5dcced4370f6f49a440067ae598e126d7ca0f50f9c1212e734ccbd5073fb4fcdef8850327b57763
 MISC metadata.xml 493 BLAKE2B 7d6324fc877ffe1d20c5369c2af0b09a7028f94d28f1841188913d0d8be7ea699c9d3f92c624992c4c96bd69615d3a1211a2483c76c56b7d3082492e43512523 SHA512 44420d8c03d5986f990b76369edfa8dfd7659b4952db3ad946fd05392ec594628a28745ad888d055d4f074d5214f61fcffafe6c04c4ab54109d45ac0371582bd
diff --git a/dev-python/boto3/boto3-1.28.44.ebuild b/dev-python/boto3/boto3-1.28.44.ebuild
new file mode 100644
index 000000000000..90e1b0ce7382
--- /dev/null
+++ b/dev-python/boto3/boto3-1.28.44.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..12} )
+
+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_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() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest tests/{functional,unit} \
+		-p xdist -n "$(makeopts_jobs)" --dist=worksteal
+}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index b35c82daaf88..3400da678da2 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -6,6 +6,7 @@ DIST botocore-1.31.40.gh.tar.gz 11933400 BLAKE2B c01958831fd477db79c7b723f799abf
 DIST botocore-1.31.41.gh.tar.gz 11935773 BLAKE2B 6bf4c1f7c3b3d9115c53f5cc833688097d0282eaacc868156fc9d29721e9d9cbf75e31d34ebba5c65b543be7bdccd6848de7cac5f8fb43d1fac63896b6e3f39e SHA512 add75b55a3c6941cd96100ca9ce846f616d638ce18bad658776acfc8b9ab9526da48069393a2ea54d24e93a25141ef2496837b04395956f82319f9a3d8fe5ad4
 DIST botocore-1.31.42.gh.tar.gz 11936544 BLAKE2B a1da9ec08885f84c458f621420560429fa4705bef5790c2ca7c39758c7caa407fb9ec415414c8c5e604f06cc52dc085f0061e4f926dad87c8cb25631ec9d64de SHA512 767903bce078f61780beeff0c1fa47f753c8eb4a0beacc78934a7d16dac27944f3ef20c4f9533b296bbb1edaefb1c5e244ccc3fb908d57273b733a062892d25f
 DIST botocore-1.31.43.gh.tar.gz 11936649 BLAKE2B ad663783c71255afac612f96f06b2a64f73bd41f32c02386d613d2c6b9f492943c7194f4e58aa62ece2df748d3812728ebdb0636acb3beb53278448829bad50c SHA512 71a718000c46102bcac50f34b1a477c5f788a2feea74629e4db8ad0b482711dbe8f5799424a304ff04d3bbff4acc68407a960008a1c9fe376972ca05b0c01ac0
+DIST botocore-1.31.44.gh.tar.gz 11937780 BLAKE2B 38660a6025cef328a4df7e3f0170a79d86f3febd68056993a0aeb8b30a2729abaa914cd6def8c38c3b61a905eb4736cb6232daa4f2e6d7e7140a3a1e23193206 SHA512 29fa176a6b753fc9005f79a19eed4f1a065e1e34d71cc462647c2260b45cc3c10ee720b06a5c8d4471f6d4e6a7b24ee2ae2d70d7973792c64985edb1e0578d99
 EBUILD botocore-1.31.30.ebuild 1827 BLAKE2B 52ad52588a26e5f1af6dc5f75059fc5d4821e7b7cbb583b07713f3f6af6d6076593df2f22c957ea39813f70b9c0b00eab67b9a9dc174baafa3594326debc3540 SHA512 e4e23357c944e848d0d638977e7053de952e90c6b8d74ca16a25b0ff37a70b0f5bcb6e60022dfdee7c81d8d792d0a28c6acc6f37eac69c2274e36f9a7c808750
 EBUILD botocore-1.31.35.ebuild 1834 BLAKE2B 8209ad43b9caa70c98744edf36645c8a660c86e61d2640787b8fd452c6ead5ebaad53ab332d74bb242a32ed673577231abd7a39b60b1122c9c30a6e1c46e9eff SHA512 8f2ff2d43225813fbba24106ed6df42810fe25cb3012288d3922dd57717e2608df205c7e2e6a6687f4089448ad7f8eb6b6e1575b4b51b76727351d4bcbea9155
 EBUILD botocore-1.31.38.ebuild 1834 BLAKE2B 8209ad43b9caa70c98744edf36645c8a660c86e61d2640787b8fd452c6ead5ebaad53ab332d74bb242a32ed673577231abd7a39b60b1122c9c30a6e1c46e9eff SHA512 8f2ff2d43225813fbba24106ed6df42810fe25cb3012288d3922dd57717e2608df205c7e2e6a6687f4089448ad7f8eb6b6e1575b4b51b76727351d4bcbea9155
@@ -14,5 +15,6 @@ EBUILD botocore-1.31.40.ebuild 1834 BLAKE2B 8209ad43b9caa70c98744edf36645c8a660c
 EBUILD botocore-1.31.41.ebuild 1599 BLAKE2B 8325845842cef976827216365bd3f88b7865bb4ce82764b121a42bb99d98952042223281fa66e6e31ec83e39c4fc585672fbab6426a7df79aa945df720d42a1b SHA512 ade15b4567ae00f08a0f5895d967ad3f37af15c24b3169e9319fd7d3c3a3316f34d989b225a928c8c72c2656e4c8f79d61e8b7ddd17e179adf7ff67bcbac6efb
 EBUILD botocore-1.31.42.ebuild 1599 BLAKE2B 8325845842cef976827216365bd3f88b7865bb4ce82764b121a42bb99d98952042223281fa66e6e31ec83e39c4fc585672fbab6426a7df79aa945df720d42a1b SHA512 ade15b4567ae00f08a0f5895d967ad3f37af15c24b3169e9319fd7d3c3a3316f34d989b225a928c8c72c2656e4c8f79d61e8b7ddd17e179adf7ff67bcbac6efb
 EBUILD botocore-1.31.43.ebuild 1599 BLAKE2B 8325845842cef976827216365bd3f88b7865bb4ce82764b121a42bb99d98952042223281fa66e6e31ec83e39c4fc585672fbab6426a7df79aa945df720d42a1b SHA512 ade15b4567ae00f08a0f5895d967ad3f37af15c24b3169e9319fd7d3c3a3316f34d989b225a928c8c72c2656e4c8f79d61e8b7ddd17e179adf7ff67bcbac6efb
+EBUILD botocore-1.31.44.ebuild 1599 BLAKE2B 8325845842cef976827216365bd3f88b7865bb4ce82764b121a42bb99d98952042223281fa66e6e31ec83e39c4fc585672fbab6426a7df79aa945df720d42a1b SHA512 ade15b4567ae00f08a0f5895d967ad3f37af15c24b3169e9319fd7d3c3a3316f34d989b225a928c8c72c2656e4c8f79d61e8b7ddd17e179adf7ff67bcbac6efb
 EBUILD botocore-9999.ebuild 1834 BLAKE2B 8209ad43b9caa70c98744edf36645c8a660c86e61d2640787b8fd452c6ead5ebaad53ab332d74bb242a32ed673577231abd7a39b60b1122c9c30a6e1c46e9eff SHA512 8f2ff2d43225813fbba24106ed6df42810fe25cb3012288d3922dd57717e2608df205c7e2e6a6687f4089448ad7f8eb6b6e1575b4b51b76727351d4bcbea9155
 MISC metadata.xml 499 BLAKE2B e5aaa7da26f200c09adfdf38b68f656bbccbec627cb5d966b280ac2165334e7eec659c89075bcace748f58e2ec3e7d2998e54a688d56ecea2d30653c67dfd35a SHA512 103c554d5dbd967bf9b6e418b3913d9235e7e910d012160909ce0715134ed2e37b06e6a345395f9d16ce08d1cf51f3ce458bce93c6a978fd3dca6610f2acdbd0
diff --git a/dev-python/botocore/botocore-1.31.44.ebuild b/dev-python/botocore/botocore-1.31.44.ebuild
new file mode 100644
index 000000000000..7cacb5c3f634
--- /dev/null
+++ b/dev-python/botocore/botocore-1.31.44.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..12} )
+
+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_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
+	)
+
+	local -x EPYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest tests/{functional,unit} -p xdist -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/fakeredis/Manifest b/dev-python/fakeredis/Manifest
index 0c27ae106397..a9368555d262 100644
--- a/dev-python/fakeredis/Manifest
+++ b/dev-python/fakeredis/Manifest
@@ -1,5 +1,7 @@
 DIST fakeredis-2.17.0.tar.gz 110121 BLAKE2B 21b8ce15236aa918d519e2d5c045d1664d6edc4d9f1fd10923bde4779c0a4605685519e17b5edfddec83f6b9e9421539cce037e8a787673b12733ef9cb28df00 SHA512 31da92e0617a6999bb29261b9efdb1b8ac9f790eb1f4500f71d65b7e2ec700095ac30a55230f3c3efe9cd9c535d04a9138596944e2aa684a1e6e9e7158b5c2be
 DIST fakeredis-2.18.0.tar.gz 111601 BLAKE2B 56a7d2e113fa0d2d98f95b4e8d5b7462a311e2e505a19cd5d3067650a0b950ad272b86aae42b748e5854c7f24287fac03f8c61865c05612697324e9f328dfbe9 SHA512 2d67866bbac8f8a12a6414cfae0a8ba925b769c0cb420bfe74ca233de40792f369678752a0d71ce4c0c145f03944fb071ecb234ee40f3f52005587db1929134e
+DIST fakeredis-2.18.1.tar.gz 113919 BLAKE2B da6fa335a755c5f9675fc89ecf714af37c3e56c93332d6a8003130c435fe1b5abfa426851f293ada1109f1aec439c2daa70d0bec8681077d28ffae62c34cb29f SHA512 78ad0e7b25519de60ad11a24c6fcd2ffc938014ec9c040cbea9d2155f3670fe18c65cf3387bc21b856e7caba1df5ef1e79a6ef77ab7201c1eb68949f775002c8
 EBUILD fakeredis-2.17.0.ebuild 1936 BLAKE2B 52420a8751cd0dfef8e72b327ef46fcfd4c2d7573c59b49d1b7dce891b93491c63fccd3f56feec9d781762bc587a79d378dd309541ef2d84a03c3819b507a425 SHA512 59fd320c46eeb78cc495fd55b57cc893b5aa7a9478c0bf70b73d9d3d0d399b97b1b39526c42f45cfa378702ffa409d332cf4324cb05f58bbff082289e7a214c2
 EBUILD fakeredis-2.18.0.ebuild 1940 BLAKE2B c59da6750ce8a65df5412720e650369db11a28ad5ca64eb00b6fcc31243f7cdf30113839a4ca0f14b2528d5a8ca46372cfbd2efc53bd5431b0432ab0c72a31a1 SHA512 4e6c3bd98e2f86eecabae913e2bf59ad509f00ac2ef3b398a0e291392e71ef9e56b7c7d18abc5fe0c0b93b98675bf6dfdfbe1a6822c5e2570daa7c9dfd2719f8
+EBUILD fakeredis-2.18.1.ebuild 2045 BLAKE2B dd95b063ef62361cdcba3aeb8154ac37bffdaade6e70439c8d068bccfdeb4bde1a48f0b44069f03541ef5a32c9242bd47ee0d627757d59ebc74f16b0e6cbcb30 SHA512 56f19555c0f2ef7aa7a96309c302f67a665078303cdce35481aa22ef093ab83e1dff729c5d2c2ce4984310819c11bfad3f429aba4106df9162ae171091c554f3
 MISC metadata.xml 373 BLAKE2B 1de33db59658e6190cd0346be58208cae6c9143a52f49dc289e68aaa0d860b5bd68dfb54f2e0b005f60a67f5caa430e2ce94fc69e64bd27e1bbebb07ad29e602 SHA512 24bfcf4919363fef45c182b6de66221e580ee0e9e99ce46e91b767655dc0b6f8a9fa6c3512ba84d1040698c43a0b6a853ad8d63c1ee5fbc00a1d192defb24db5
diff --git a/dev-python/fakeredis/fakeredis-2.18.1.ebuild b/dev-python/fakeredis/fakeredis-2.18.1.ebuild
new file mode 100644
index 000000000000..b4855051813f
--- /dev/null
+++ b/dev-python/fakeredis/fakeredis-2.18.1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( pypy3 python3_{10..12} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Fake implementation of redis API for testing purposes"
+HOMEPAGE="
+	https://github.com/cunla/fakeredis-py/
+	https://pypi.org/project/fakeredis/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	dev-python/packaging[${PYTHON_USEDEP}]
+	>=dev-python/redis-4.2[${PYTHON_USEDEP}]
+	<dev-python/sortedcontainers-3[${PYTHON_USEDEP}]
+	>=dev-python/sortedcontainers-2[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-db/redis
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# also lupa
+		test/test_aioredis2.py::test_failed_script_error
+		# TODO
+		"test/test_fakeredis.py::test_set_get_nx[StrictRedis]"
+		"test/test_fakeredis.py::test_lpop_count[StrictRedis]"
+		"test/test_fakeredis.py::test_rpop_count[StrictRedis]"
+		"test/test_fakeredis.py::test_zadd_minus_zero[StrictRedis]"
+		"test/test_mixins/test_pubsub_commands.py::test_pubsub_channels[StrictRedis]"
+		test/test_mixins/test_set_commands.py::test_smismember_wrong_type
+		# new redis-server?
+		"test/test_mixins/test_pubsub_commands.py::test_pubsub_shardnumsub[StrictRedis]"
+	)
+	local EPYTEST_IGNORE=(
+		# these tests fail a lot...
+		test/test_hypothesis.py
+	)
+	local args=(
+		# tests requiring lupa (lua support)
+		-k 'not test_eval and not test_lua and not test_script'
+	)
+	epytest "${args[@]}"
+}
+
+src_test() {
+	local redis_pid="${T}"/redis.pid
+	local redis_port=6379
+
+	einfo "Spawning Redis"
+	einfo "NOTE: Port ${redis_port} must be free"
+	"${EPREFIX}"/usr/sbin/redis-server - <<- EOF || die "Unable to start redis server"
+		daemonize yes
+		pidfile ${redis_pid}
+		port ${redis_port}
+		bind 127.0.0.1
+	EOF
+
+	# Run the tests
+	distutils-r1_src_test
+
+	# Clean up afterwards
+	kill "$(<"${redis_pid}")" || die
+}
diff --git a/dev-python/fastbencode/Manifest b/dev-python/fastbencode/Manifest
index f7fa23749f2f..fc42848cfde7 100644
--- a/dev-python/fastbencode/Manifest
+++ b/dev-python/fastbencode/Manifest
@@ -1,4 +1,4 @@
 AUX fastbencode-0.2-py312.patch 1383 BLAKE2B 466f78bd521426d49bb0030ec215bb3d21c7d018184416ace8dbac168c2a1f6b152eff3a00f391731a6c5528ae1def31b491cc92548bcf2860acdff5676a781c SHA512 0dcaf639cd2b25798d76deb8213d28478e790689607d571ed27eabb0edcd466b9a3b4aa1eb93cd814b6d13b56a3c052921f64a41f7af45a04c9c7ff095118b3b
 DIST fastbencode-0.2.tar.gz 22580 BLAKE2B 87e14260cf7174ee1b40372879efed7b8fef3302ec0783cf9ebd103e9730c0f415ccd96c2ada944849b7cf63bf2998d2ddc644307619449b29177c680730233b SHA512 4cc62d8ed54fcf1d989e026ad2b4d0c1f4a2fa762d9c2f7da182501af7454f802202c47763b714072009357858a3f93ea6ad9b3e9f80742b749f5014f84e1598
-EBUILD fastbencode-0.2.ebuild 721 BLAKE2B e4119d8cfc48c70c1597783fec34381673eb08f0d1281fb178792ee87b2e608e5eaa33dac12c3edd7d42199d2f10c906bc08b2bd15e16d00ab76a50220f143c7 SHA512 61222fbd891d997828349a629cf9d17a83b1f427546190d79592688e22fcdf7a4d43d6d6f103d456a3c9145cc462472ea628574f62443e4b460e8a0b5cf506ee
+EBUILD fastbencode-0.2.ebuild 726 BLAKE2B 651160c4466317a6e73143a3dc99d332a133b75129780d84312df84d959b16fa73a77a6d3757096681be5fbfa67c8c118c856138fc95a983f42a700d15ba22ab SHA512 a4c9c64ce2802fe9f163eadb795065531041fe2d11a0366f8daa3cad14e5c85b8541e10b12d6c365029cfbbebc3a90c8a1b164f2ece9e39b1857392c4227e756
 MISC metadata.xml 378 BLAKE2B 7e1f98ba9526fccbb5a725843f28115a903ea41f4fa53928cff3799e7389dc79cbe423634f642c5c38c989a52857563389792912e2ae697e92dca8d2ee52fd0f SHA512 225d52d476e400a16f0892a8bfd82c238f3850b0f3353993a5815956d66c86923e123cfefaa04d2b3fe0d96d746f12c910ae9f4d4eeec09d6d443d52f9740ac8
diff --git a/dev-python/fastbencode/fastbencode-0.2.ebuild b/dev-python/fastbencode/fastbencode-0.2.ebuild
index 068bcff75e2d..badf0a63432d 100644
--- a/dev-python/fastbencode/fastbencode-0.2.ebuild
+++ b/dev-python/fastbencode/fastbencode-0.2.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="~amd64 ~arm64 ~x86"
 
 BDEPEND="
 	dev-python/cython[${PYTHON_USEDEP}]
diff --git a/dev-python/httpcore/Manifest b/dev-python/httpcore/Manifest
index bdc94dab468d..994913530ed7 100644
--- a/dev-python/httpcore/Manifest
+++ b/dev-python/httpcore/Manifest
@@ -1,3 +1,5 @@
 DIST httpcore-0.17.3.gh.tar.gz 91500 BLAKE2B 65e6ac917f215fb3c2f6651633db29cf58b7c936b1554102bb1c2e777a289527d44472c2b92fb7c62e7e1a812a1cf9573796051f90ea088dc37fcc2052dfe10b SHA512 41f48d32caa7d7a3456528404392a257927d047f0a1c733e2a68c0fec97c7454c7f8d7d1b6851c5722cfac292dfaa478a4033c656e66d389c81c72dee8e7a7d2
+DIST httpcore-0.18.0.gh.tar.gz 94594 BLAKE2B 9602397bc2aa5941e9bfbffb7ba3e751c4ecac29a76dede6fa45f190ac7514f2e081cc67b781a8b6152c85ca3bfb051bdbc34628b95d05eba25a307e8877faa7 SHA512 3dc8114bf02226fc4ac87408163e599f4e9f70f9e5663c9eb7dc9a65b2b72861f3b19ed2f87e29ac90a8b85c5dc32a3fffdaf88e83b15df838fcbd89737b1c57
 EBUILD httpcore-0.17.3.ebuild 1168 BLAKE2B 6406a80927fef46e2fc4aa55039e426d01313059f7ccf85c9946a5db7aaa3dae418233bd954d540a6bcb45014227b45b87a0c1f040ead23a62415927e5800d8a SHA512 1097c0bea70f9872c359decdc20b9e146dd2cc4c567fe1750ff578325107ffc148c54320730dace3100c0ab320086ae1360d1a36ea21730082116edaac304eae
+EBUILD httpcore-0.18.0.ebuild 1175 BLAKE2B c71241c774bdcca2535e59ff65cd9013308b1d7e10740c23e495a7b7674f20c85872e5a4095b9857590ebc416c69757ed0a2d1d12b7a9d062bcef0582737332a SHA512 d0133073741c2118ae16e9948edfd29f3eda424dc47b7d5015303a47bc5d41ca0b9ab2aaad8fe509cd51c4e292861a70b860db3b037e8f6510cbbbf00828cfd0
 MISC metadata.xml 454 BLAKE2B f8a48d9ab81e5f74623dd0c8490e5de5cc711fda7f4614932e7ac6caa80bd23436037ddf9327d6bddc3d39c8b601b4ee74a85c0a10bacb20514cbf8278e34d1f SHA512 af962141bd55f51b27e0d4b61bcf7d5426e816df4f8c65be257d8fddd597664afe04e78ebe7e11caaebf06ae4fe17b88f568dc440403865ba6b8e3b47d796aa6
diff --git a/dev-python/httpcore/httpcore-0.18.0.ebuild b/dev-python/httpcore/httpcore-0.18.0.ebuild
new file mode 100644
index 000000000000..03a72f4ae1f8
--- /dev/null
+++ b/dev-python/httpcore/httpcore-0.18.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( pypy3 python3_{10..12} )
+
+inherit distutils-r1 optfeature
+
+DESCRIPTION="A minimal low-level HTTP client"
+HOMEPAGE="
+	https://www.encode.io/httpcore/
+	https://github.com/encode/httpcore/
+	https://pypi.org/project/httpcore/
+"
+SRC_URI="
+	https://github.com/encode/httpcore/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	<dev-python/anyio-5[${PYTHON_USEDEP}]
+	dev-python/certifi[${PYTHON_USEDEP}]
+	<dev-python/h11-0.15[${PYTHON_USEDEP}]
+	<dev-python/h2-5[${PYTHON_USEDEP}]
+	=dev-python/sniffio-1*[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/pytest-httpbin[${PYTHON_USEDEP}]
+		dev-python/pytest-trio[${PYTHON_USEDEP}]
+		dev-python/socksio[${PYTHON_USEDEP}]
+		dev-python/trio[${PYTHON_USEDEP}]
+		dev-python/trustme[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+pkg_postinst() {
+	optfeature "SOCKS support" dev-python/socksio
+}
diff --git a/dev-python/jq/Manifest b/dev-python/jq/Manifest
index f24f8d932e3e..8de1aa42b7cb 100644
--- a/dev-python/jq/Manifest
+++ b/dev-python/jq/Manifest
@@ -1,5 +1,7 @@
+AUX jq-1.5.0-cython3.patch 752 BLAKE2B ec9bb79fb0ae51791d120c8194fdefbd78faea0e6cff391e35ff223f28932bdfe677c68edadf05648e0f10f0662893761e4d08fcb5fc8518963ef12208e149eb SHA512 2f93667c56e273c93ecd8cad82f031315c5028d29435cf4c3d58e44344035d21faf6f0fbb91f35614b2abedd931b6e440990b8e899a927768765c4280b651f28
 DIST jq.py-1.4.1.gh.tar.gz 2648592 BLAKE2B b1413a07ba03f61d3b2e8cfa3f2c646408e24139f76fb9637d23968d953fa78f82b1dd04c355d5a6e6c6761095a4814d8cfd1f012382ca810ad5a44e007c7878 SHA512 03924793e8cab8041b4b2ecb8ef45bafdf31f14b4502170358ddecc027ead7cc17eda37fc04743eeef073e29144d2f7e6c4428e2a92f1bb8aa859100dce4521b
 DIST jq.py-1.5.0.gh.tar.gz 2649404 BLAKE2B 9dfe8f17e061eaea44de31be17cbb18607dc118d526a652a80e2d69b30fa532f412b9b20b1c72418f4d6904b43126611344b2257bc9cb3441086ef3e8f131a6e SHA512 826771ced7d707111b7bc6d1f7a408944690daa8bfb6ec135627a15c3fcfba95a525b8ee3005f8a6e5d23afbeaacc06ad7464e3c3a0a15cf5582d97121c64248
 EBUILD jq-1.4.1.ebuild 810 BLAKE2B 0e0c8737a3c664855b380365e17f4e3576071f0e2c937319a269cfa80a6cfcf82a2578085bc1770e2e98913bdc2c383bfb37102e25484f457d01aa1d3170c045 SHA512 89e838594713de630f260e4dd6db08774ab2101c05749b4eccd0c6f93ef15e04399827e4e47a345d4330b7e825c2a98ff74c4378ecd88686a0bfbc4af0f36a69
+EBUILD jq-1.5.0-r1.ebuild 869 BLAKE2B e3921add0fe770640332e78ab17c5e872eecd8e492de174ddcbcb668ea18344b448e9ead8e72d054a158a9f76c893802c2a26f8a795a3aa1f9770c56195dd07d SHA512 cb3a7845c77bb0ef57b8b918b6f1200795d1e9ef6056bddd575ff960fd38c31d5cece17b8a4476c1a6bec2f31bcae64d887b28e6f614a76214c2905368eccc3a
 EBUILD jq-1.5.0.ebuild 812 BLAKE2B 598a47ca1c9a48097faba953e144856102e3efbaaeb6adaa1c6974aa1a99f7d9ddfc0d1d926c2989d9993f60db08b91efd6cf9a63cc18d539e98505134f7cd98 SHA512 17e42a1686f8cd8f2fd4c2c6faac51b36158989b9f411283b72af240173ae93f054c6c599901567d2e63ce5ed53cf53a6cd25050f28b0b8ff492474bd2f8bc5e
 MISC metadata.xml 367 BLAKE2B b17eb2d9c460774d98ba18faf8a09d1c9c711433d0dfcff08df4f769411db66fdb2241d12ebc706664cdef98d9dbeb290614446112f53ecede571f77aa085174 SHA512 399b63613673deaef747fd380d6bdc086a4e4b57c5509b15fd6e031ea613ccf59641c95064fc7dbbf61f8d879fe03faf7e8298e4e8792a8a0b7a2bb3225e77c9
diff --git a/dev-python/jq/files/jq-1.5.0-cython3.patch b/dev-python/jq/files/jq-1.5.0-cython3.patch
new file mode 100644
index 000000000000..b4b66b65139c
--- /dev/null
+++ b/dev-python/jq/files/jq-1.5.0-cython3.patch
@@ -0,0 +1,20 @@
+https://bugs.gentoo.org/898684
+https://github.com/mwilliamson/jq.py/commit/c2c7ed1f25b51947ebb690f6b8464c78fe83bb2b
+
+From c2c7ed1f25b51947ebb690f6b8464c78fe83bb2b Mon Sep 17 00:00:00 2001
+From: Michael Williamson <mike@zwobble.org>
+Date: Thu, 31 Aug 2023 23:11:28 +0100
+Subject: [PATCH] Add explicit noexcept to _store_error for Cython 3
+ compatibility
+
+--- a/jq.pyx
++++ b/jq.pyx
+@@ -172,7 +172,7 @@ cdef jq_state* _compile(object program_bytes, object args) except NULL:
+     return jq
+ 
+ 
+-cdef void _store_error(void* store_ptr, jv error):
++cdef void _store_error(void* store_ptr, jv error) noexcept:
+     # TODO: handle errors not of JV_KIND_STRING
+     cdef _ErrorStore store = <_ErrorStore>store_ptr
+     if jv_get_kind(error) == JV_KIND_STRING:
diff --git a/dev-python/jq/jq-1.5.0-r1.ebuild b/dev-python/jq/jq-1.5.0-r1.ebuild
new file mode 100644
index 000000000000..cabe52d95c3b
--- /dev/null
+++ b/dev-python/jq/jq-1.5.0-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1
+
+MY_P="jq.py-${PV}"
+DESCRIPTION="Python bindings for jq"
+HOMEPAGE="
+	https://github.com/mwilliamson/jq.py/
+	https://pypi.org/project/jq/
+"
+SRC_URI="
+	https://github.com/mwilliamson/jq.py/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-cython3.patch
+)
+
+distutils_enable_tests pytest
+
+python_compile() {
+	# TODO: export JQPY_USE_SYSTEM_LIBS=1 on next release
+
+	# Cython compilation isn't part of setup.py, so do it manually
+	"${EPYTHON}" -m cython -3 jq.pyx -o jq.c || die
+	distutils-r1_python_compile
+}
diff --git a/dev-python/merge3/Manifest b/dev-python/merge3/Manifest
index 34021c5ad9fe..f6364f4a0e6c 100644
--- a/dev-python/merge3/Manifest
+++ b/dev-python/merge3/Manifest
@@ -1,3 +1,3 @@
 DIST merge3-0.0.13.gh.tar.gz 15980 BLAKE2B c194573667f9e1f5ad60627a26f90f8c7ff28c160f5c0e9fe3e76e95cea8d0ce17d0d0241a2d20f3169d57ae35cada3dcabc25604331014180cea352e1f0e4cf SHA512 235f5f99c0156511ebe25a7a5568ac10ed26645a395cc464800b1417b1d7655c9de218afbe1c612409608e0d34fafa57ce44de362965d6bd381bf7e45742e9e0
-EBUILD merge3-0.0.13.ebuild 513 BLAKE2B 8049f969a23af4dbb746723d8d7084506c19e886233b16cb7075bed86e1d277bbd380b428815cadc3c05f62b28bd9b6555ed70ea2aa22e0630af4c0f78b38d53 SHA512 f02dc7baabd76065408e26dce4e09fa6aed54e7e2c558304d7149c005467d3ec351232e32962fcc8ae8d93039b684e3d12519d2a7bf0502aca764279289b8e12
+EBUILD merge3-0.0.13.ebuild 518 BLAKE2B 4e06164448463fd2452e24bdcd65e94aa5236677871d876e441ebf3c391f64ef7dacbc4b5ee5de099e7590bf7c9326bce699bf8f02238012d388bfd0d653adbb SHA512 307f4997b3005fc0de24b68a072ffc812c8e07fc1527f3d04efdf0e02a49e9d451d3cf209e64e006759f674652d2892937abe40e66fd6612248d92f07cfaa665
 MISC metadata.xml 392 BLAKE2B 151736f3c81068ca500e08ec4b3af9fa4b037208b434b00c0f4c6f5425f7a83494a420850124ad8d0e4dde6bb790ec0185c6228afead752a361762e5a67b8309 SHA512 1fe3084232da7079cba8abb30d760d3b474fd01fe8671ac6d001dea800118981dda41999df1f060d4b32a2b69fb9c4764bb6cae6712f557ce87fd3fd0a75eaf8
diff --git a/dev-python/merge3/merge3-0.0.13.ebuild b/dev-python/merge3/merge3-0.0.13.ebuild
index 5ea88529976e..43b8cbc8211a 100644
--- a/dev-python/merge3/merge3-0.0.13.ebuild
+++ b/dev-python/merge3/merge3-0.0.13.ebuild
@@ -17,6 +17,6 @@ SRC_URI="https://github.com/breezy-team/merge3/archive/v${PV}.tar.gz -> ${P}.gh.
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="~amd64 ~arm64 ~x86"
 
 distutils_enable_tests unittest
diff --git a/dev-python/orjson/Manifest b/dev-python/orjson/Manifest
index 8c274b907f4a..1bacd0fec235 100644
--- a/dev-python/orjson/Manifest
+++ b/dev-python/orjson/Manifest
@@ -30,6 +30,7 @@ DIST orjson-3.9.2.tar.gz 4207405 BLAKE2B d4c157b7e60a00ce48773b3befe9b3ed312b384
 DIST orjson-3.9.4.tar.gz 4601888 BLAKE2B 77ee0fccad4e04408700d78f23a5cac0d8bac9df94419809dccb03406c7fcb83185d282715e727da0ea351b6c97f33c70f6bf0b451377fcd885bdeccfe7ddbfb SHA512 75192e144ee54edfdbfe83cd069cb3e2da80b7ec379235832508010dd6c45f1a993906c48a992b93b5802cdf7472340129c5a27c91190e6fb4dc818254d0a194
 DIST orjson-3.9.5.tar.gz 4604499 BLAKE2B 24ba14b5d3bf499045be299bb731869cae07e9e2c1990be8d6ceac86919781cce34eab8c5d84cdb546c4a334041012b8ff0e3977d0fcef3f5c776207f45bd23e SHA512 d3a5726a4bd10a2d6ad2ec7f7a6d358c65c2270bbc42a00f8d1b2a6ef538b87920f8b2b10cd8cc0e1bbb66fc070b6f836ea62f4d7d84b99cb8341bbbe50aaa5c
 DIST orjson-3.9.6.tar.gz 4897179 BLAKE2B 4c3974cdf25b683e4ce8e2843107e3ba1800b257cc1d2dc589c57d4357a0d037fdcb28b994b319675b31ea77a99f3d7cea3805a6f65db62c35624bb546f57194 SHA512 9b403cdbe8a218f3937892610ef7d137a3ad457b3cc8f68a67f5ab6877479e989168297144a6edf04f398918981c840175357b6e79772ac3d7bb71a281332e50
+DIST orjson-3.9.7.tar.gz 4895035 BLAKE2B 0f9d24e7b6552a3edb4c2377b30b86c17f9402b8cf9f924d34ad72f6569f6d9d0c0a49c37c15811309481c9b8f22e63af8a9cd7859bc52dddf58d4a08f1bece2 SHA512 8d36e10960fa362d26926a1dd48922abdb6dc0085d50907b9885aadc645983b26789b3682d9fbfd7734a97cfa580a374eb7e7c99e05be7dcd3a68442afe5e9f5
 DIST packed_simd-0.3.9.crate 98340 BLAKE2B 8668038eb213cec44afded5164ccf368fbecea21aa3de64d49e798d7f0fac638af9616a435cb79cf0435387f67fe97a7eb00748eaf39be14bb6d50ecbb4c938e SHA512 1336ed8aee50a580784f38388f0cc2f0a8639149333e94b7f83aa7cc314a80c60b66ac203a7302cd4cf01f3d0b89da58d2ce9038b7685840fbc1b758217dbd1b
 DIST packed_simd_2-0.3.8.crate 97388 BLAKE2B 89d2a1401efef8e0a665d883b41a587601cd4704a6acf80c542f3e6e274a6fa9c975a03799857c409c8764bf6698784cf85f1fb73b4fab2c4f98b368326760c4 SHA512 de1ff7cc43f6d0f6e2a94073ab80bd178864d375d334c4d8aaf30f8ae3320b6aa470f14b25babc264d9032af0c4fa7663e442321fc91acbd7adc7550b5177984
 DIST proc-macro2-1.0.66.crate 43575 BLAKE2B 9eb3e816b00fcf625c280ba14ad269f5893d0523473a24de07c21945f6f932fbd08efb3c339b35d903245510e3f065e1478439b024a325f2bb9f97bc7bcbb18d SHA512 85f5a762f9411142e5ac28144bd380f07f0633ed2e44d8a2545be9fb8f42abaca6b5d45631b4be83b8e8b9beca7438bc52f25615c3a410a3a1249474b1aca407
@@ -64,4 +65,5 @@ EBUILD orjson-3.9.2.ebuild 1486 BLAKE2B 8cbe2583bb93dee5c1c57332f0205f07456befcb
 EBUILD orjson-3.9.4.ebuild 1625 BLAKE2B f97169d7ef2f171f39469dd642022e3943eba638d1eae178a169ffe207f3dfeb3b639c5e079fbd27fcc4467ad664b5339aca704d20a8c17b5ef6d75d24263c25 SHA512 eac134eb76479a2a5d4d47e332014df24f8acd72f45daf0aa42012b3483218b22dcbeae4e9aabb2ad31492f66a1498bda4d719a8ccfcd350a2c390fdef428fa4
 EBUILD orjson-3.9.5.ebuild 1630 BLAKE2B 99cbd82b4f62fa962a867c2f6515029ad25cd194f817aaf55ffbbc7c94897cf3ba73d0e3c1d8af10faa0d2d968787b6dfeac24e09ed6fca848915e0395c81a6b SHA512 48d38eaa4d23bcd900faab8a2c8d838a9b559d6b5f3931f579e7e92e00b7e73ae268dda2de0dac1466c10300a6cd4cb0515f319939d145a6a35c9a97de983da2
 EBUILD orjson-3.9.6.ebuild 1661 BLAKE2B c04eb082768766b7e0877fd63ccc7b77f6b3e3d9f0e8b59ca554b0601fd96df86eb64da36b503fb199a4d8971326386305c99fa94c9f5cadf7de900d1a07b38e SHA512 fc804c4916b1378e37903c863df55cfc03d4f569cba7694d6a7567af90fe228d2a5d33ae6ead8508bd2b61d887535201a7e907b39b5a021edf4c1f458ea48fbf
+EBUILD orjson-3.9.7.ebuild 1661 BLAKE2B c04eb082768766b7e0877fd63ccc7b77f6b3e3d9f0e8b59ca554b0601fd96df86eb64da36b503fb199a4d8971326386305c99fa94c9f5cadf7de900d1a07b38e SHA512 fc804c4916b1378e37903c863df55cfc03d4f569cba7694d6a7567af90fe228d2a5d33ae6ead8508bd2b61d887535201a7e907b39b5a021edf4c1f458ea48fbf
 MISC metadata.xml 360 BLAKE2B b19f85a4e5055dc309e35bf1706b10ebcc1961c96884bec0c9efd7ee7bf58adf53c0f61d8c1d1094c38f0e0bf78fa00c5be1e7ee58c85939ac1c6fff40fcbd07 SHA512 e168db6bda3fbb7f801aeb7a91733fad54441e21913a16447e7b8fc694fdeb0fe3216c15de2864efbf92f2ca8e1a0743eb3d62e8c250648e91be68a465c21ae0
diff --git a/dev-python/orjson/orjson-3.9.7.ebuild b/dev-python/orjson/orjson-3.9.7.ebuild
new file mode 100644
index 000000000000..4bed043e7dd2
--- /dev/null
+++ b/dev-python/orjson/orjson-3.9.7.ebuild
@@ -0,0 +1,86 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Autogenerated by pycargoebuild 0.6.1
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=maturin
+PYTHON_COMPAT=( python3_{10..11} )
+
+CRATES="
+	ahash@0.8.3
+	arrayvec@0.7.4
+	associative-cache@1.0.1
+	autocfg@1.1.0
+	beef@0.5.2
+	bytecount@0.6.3
+	castaway@0.2.2
+	cc@1.0.83
+	cfg-if@1.0.0
+	chrono@0.4.30
+	compact_str@0.7.1
+	encoding_rs@0.8.33
+	itoa@1.0.9
+	itoap@1.0.1
+	libc@0.2.147
+	libm@0.1.4
+	libm@0.2.7
+	no-panic@0.1.26
+	num-traits@0.2.16
+	once_cell@1.18.0
+	packed_simd@0.3.9
+	packed_simd_2@0.3.8
+	proc-macro2@1.0.66
+	pyo3-build-config@0.19.2
+	pyo3-ffi@0.19.2
+	quote@1.0.33
+	rustversion@1.0.14
+	ryu@1.0.15
+	serde@1.0.188
+	serde_derive@1.0.188
+	serde_json@1.0.105
+	simdutf8@0.1.4
+	smallvec@1.11.0
+	static_assertions@1.1.0
+	syn@2.0.31
+	target-lexicon@0.12.11
+	unicode-ident@1.0.11
+	version_check@0.9.4
+"
+
+inherit cargo distutils-r1 pypi
+
+DESCRIPTION="Fast, correct Python JSON library supporting dataclasses, datetimes, and numpy"
+HOMEPAGE="
+	https://github.com/ijl/orjson/
+	https://pypi.org/project/orjson/
+"
+SRC_URI+="
+	${CARGO_CRATE_URIS}
+"
+
+LICENSE="|| ( Apache-2.0 MIT )"
+# Dependent crate licenses
+LICENSE+="
+	Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD MIT Unicode-DFS-2016
+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+BDEPEND="
+	test? (
+		dev-python/arrow[${PYTHON_USEDEP}]
+		dev-python/pendulum[${PYTHON_USEDEP}]
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/numpy[${PYTHON_USEDEP}]
+		' 'python3*')
+	)
+"
+
+QA_FLAGS_IGNORED=".*"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pip-run/Manifest b/dev-python/pip-run/Manifest
index be6093ee004b..93bcd24ae5b4 100644
--- a/dev-python/pip-run/Manifest
+++ b/dev-python/pip-run/Manifest
@@ -1,5 +1,7 @@
 DIST pip-run-10.2.0.tar.gz 33523 BLAKE2B 7d19c089da98dbba2faec969f490fcd5ea48881f4ccbbfaa283465ef083521aee7d82b9de8b03a89ec8b08005db1232cd9577030cb98c111b4a0e0f7294cca84 SHA512 b26a00c6ebd8e9e505e6b218fea7070b23b5926de44e1d5a762abb2a4ebd62b1bdda7e19c4092012daf068b518a2e127ab08099f6d1a7ddc643b3ba5bf999ed0
 DIST pip-run-12.1.0.tar.gz 34387 BLAKE2B 306dce020589a0cdcaddc70baf75a41621c72a450af58a2f54c5128f8210b02f4ee2b4df5b8bca1e0617ef53e79ab89969765b053801dc4f9d60bddf7c40e76e SHA512 fa1c36b6b5befada7b54841723f9cd7ef6289bb723b46cbe000ccfc7a6e894181fbf58f472330830e5812aab8feb40dab8708cd82532696e510bd56ab0b70a20
+DIST pip-run-12.2.0.tar.gz 36557 BLAKE2B a711b984895937546b066accf6e51213ddce2c5a7fff77fd018d3588054968fd3b1560f343f98474944302fe12629272ba1fe374c97b5ab8b6ca4694d4b05081 SHA512 a49a94f163a1344d289d53402b41ba31dceab360040e936a3129a7ac7f8c85eb71d4da5a37e517c8a626e6beac2a3265e617b8e63050f0e952bc94969b3dc6ee
 EBUILD pip-run-10.2.0.ebuild 1418 BLAKE2B 31ea88eff01d38dca9a2c12a727f4c7ffeeeb88f780831a43b27ae3310c5f9b29da23e337fd9ee1050c09e38c612fbcb34875d9dc21aa13bd92018c23096e7bf SHA512 83203da0063c82eabb1889140e4f35427f47e94f3f87cf4272fddc1a7a0d241910102da7082669cb8de4e709cc5764e27512b686443464daa26fefbc6097f7b0
 EBUILD pip-run-12.1.0.ebuild 1466 BLAKE2B 38f3a7cc312d49547fef7535268bd07ddc5500c6e078c2d292bcfdaf6b44fd0d6f961f87288a00ae967d9eb9c5e4a73136a16340f9f91972ab063cf113d1ff0e SHA512 a55513e33b6ca5dc1a0d4cefc07db6a161bb0cc64264d9855bb7fc6902a1fb2a4df7233fdbe0937f611afc1f57c4e205b8ff45ff4b1f12067622d43d950119ee
+EBUILD pip-run-12.2.0.ebuild 1435 BLAKE2B 7702c4930541e182376a8c80ed23f0a77fbdd9f05fb12e8b819bf51178d69ad77c46486dc960450305d5e2f89116af6b8b141cd73feb8e9581cd80fa0b3646af SHA512 2743360fb150d1157bc125fade2d584134c009b9bd9d0ca36f7c25791701d5ba6cf5d17ff1e96596616ead138dfbd951f47f06005d9ac9834a886370e0513fe5
 MISC metadata.xml 389 BLAKE2B bc573b4f57b4f8371ecef97266b8441d47e66d551f7088a7f312ca049f7debd90e989d24d59d7aff182795ae27e553d131f3875c789dc793532ff9c812bcaf20 SHA512 00b81cba684e7118a3ce79ec5cb6a27d6ad67064a2745ffead8dec51c7786c9441139b800868cad8854ff39d7e38163ab2c8fa5c7d3f328390b628f8342fb0ca
diff --git a/dev-python/pip-run/pip-run-12.2.0.ebuild b/dev-python/pip-run/pip-run-12.2.0.ebuild
new file mode 100644
index 000000000000..5cc2fbb52d69
--- /dev/null
+++ b/dev-python/pip-run/pip-run-12.2.0.ebuild
@@ -0,0 +1,58 @@
+# 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_{10..12} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Install packages and run Python with them"
+HOMEPAGE="
+	https://github.com/jaraco/pip-run/
+	https://pypi.org/project/pip-run/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/autocommand[${PYTHON_USEDEP}]
+	dev-python/jaraco-context[${PYTHON_USEDEP}]
+	dev-python/jaraco-env[${PYTHON_USEDEP}]
+	>=dev-python/jaraco-functools-3.7[${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/flit-core[${PYTHON_USEDEP}]
+		dev-python/jaraco-path[${PYTHON_USEDEP}]
+		>=dev-python/jaraco-test-5.3[${PYTHON_USEDEP}]
+		dev-python/pygments[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/nbformat[${PYTHON_USEDEP}]
+		' python3_{10..11})
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_IGNORE=()
+
+	if ! has_version "dev-python/nbformat[${PYTHON_USEDEP}]"; then
+		EPYTEST_IGNORE+=(
+			tests/test_scripts.py
+		)
+	fi
+
+	epytest -m "not network"
+}
diff --git a/dev-python/python-lsp-server/Manifest b/dev-python/python-lsp-server/Manifest
index d087e350efa3..62fbdeae03e0 100644
--- a/dev-python/python-lsp-server/Manifest
+++ b/dev-python/python-lsp-server/Manifest
@@ -1,3 +1,5 @@
 DIST python-lsp-server-1.7.4.tar.gz 97864 BLAKE2B 9832298391d72bf2f035f388694a7879d66546ead5a36837220cb3af5d8181eba198c04dd82747cba75f0478d256b001476c24b02bc679fc07cb41c7aedb0e66 SHA512 7aa96de6e51548e2854b55690698fe6c7bda60103c11ad5982df611c65569cec1ab13691727c92ec47d9ac44c34f233f872211a41041ea0969223e10e87d7e08
+DIST python-lsp-server-1.8.0.tar.gz 105548 BLAKE2B aa7f714bbc7e88d68224f9a51c3c811168ade36afce02fcdf95d3ffef55f7efc964aea6fb3c26bc88c3439744928f70914c136987c89a8bd146a2f54df579ead SHA512 b8050037e313261b653f0df170762126886ceef780d7ca35651c79967270d78d9930e464ccecc71a40ceee10b0265fd262d200e1e38c50ce04490ab364bc8389
 EBUILD python-lsp-server-1.7.4.ebuild 2926 BLAKE2B 3f7e5f4f6225f660e373754725b7a26f49a8f7e31b5726fed0e80178c11f67a52ef7f57eb0b6247c6813f0aff56ba6369e4a6c9e38d37aea1a26e3d5bfb61622 SHA512 30973ec2c9f0f0788000159ff40ab2152f1dcb37b3af9f02911ac0d4336fcf0542f6b86ffe82d9f057d63ba130f67f3b34ddada07259dd833f4b4a78d4fc0bd8
+EBUILD python-lsp-server-1.8.0.ebuild 3057 BLAKE2B 0d00f2c6c96329b39fa8eafc6f6601fbf884862bdaef411384d24900a496a9d18a5706fc1c7c5b4add0ef615278e76eb2283b584bf05052a81220b67dc297f9a SHA512 121d84cc2ac8b23e66d4e32cfd5844c8a2744b243f8db83a23f611443ff08903a34e319f0019846636a16c25b3b303321c318fe4d2b02482acf6de62f2d5c0a0
 MISC metadata.xml 610 BLAKE2B e111007adc2612409df72955babe0c4725fd5726449435988cf13c1142049d78089d38e54783712e2c70c74437157ffb2049bd9d63322cec084204eb5038e724 SHA512 5e1e4b43a5bfacb6a2fcae57413ebf79c6aed917b00022140d855acd773d82e56b2d73ae8270d42675a34d9f37f9ad53c8f61930c3f447d8a9e45a521a20e9bb
diff --git a/dev-python/python-lsp-server/python-lsp-server-1.8.0.ebuild b/dev-python/python-lsp-server/python-lsp-server-1.8.0.ebuild
new file mode 100644
index 000000000000..a201af3d084e
--- /dev/null
+++ b/dev-python/python-lsp-server/python-lsp-server-1.8.0.ebuild
@@ -0,0 +1,93 @@
+# 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=( python3_{10..11} )
+
+inherit distutils-r1 optfeature pypi
+
+DESCRIPTION="Python Language Server for the Language Server Protocol"
+HOMEPAGE="
+	https://github.com/python-lsp/python-lsp-server/
+	https://pypi.org/project/python-lsp-server/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="all-plugins"
+
+RDEPEND="
+	dev-python/docstring-to-markdown[${PYTHON_USEDEP}]
+	>=dev-python/jedi-0.17.2[${PYTHON_USEDEP}]
+	>=dev-python/python-lsp-jsonrpc-1.0.0[${PYTHON_USEDEP}]
+	dev-python/pluggy[${PYTHON_USEDEP}]
+	all-plugins? (
+		>=dev-python/autopep8-1.6.0[${PYTHON_USEDEP}]
+		>=dev-python/flake8-5.0.0[${PYTHON_USEDEP}]
+		>=dev-python/mccabe-0.7.0[${PYTHON_USEDEP}]
+		>=dev-python/pycodestyle-2.9.0[${PYTHON_USEDEP}]
+		>=dev-python/pydocstyle-6.3.0[${PYTHON_USEDEP}]
+		<dev-python/pydocstyle-6.4.0[${PYTHON_USEDEP}]
+		>=dev-python/pyflakes-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/pylint-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/rope-1.2.0[${PYTHON_USEDEP}]
+		>=dev-python/yapf-0.33.0[${PYTHON_USEDEP}]
+		>=dev-python/whatthepatch-1.0.2[${PYTHON_USEDEP}]
+	)
+"
+BDEPEND="
+	test? (
+		>=dev-python/autopep8-1.6.0[${PYTHON_USEDEP}]
+		dev-python/flaky[${PYTHON_USEDEP}]
+		>=dev-python/flake8-5.0.0[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		>=dev-python/mccabe-0.7.0[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pandas[${PYTHON_USEDEP}]
+		>=dev-python/pycodestyle-2.9.0[${PYTHON_USEDEP}]
+		>=dev-python/pydocstyle-6.3.0[${PYTHON_USEDEP}]
+		<dev-python/pydocstyle-6.4.0[${PYTHON_USEDEP}]
+		>=dev-python/pyflakes-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/pylint-2.5.0[${PYTHON_USEDEP}]
+		dev-python/QtPy[gui,testlib,${PYTHON_USEDEP}]
+		>=dev-python/rope-1.2.0[${PYTHON_USEDEP}]
+		>=dev-python/yapf-0.33.0[${PYTHON_USEDEP}]
+		>=dev-python/whatthepatch-1.0.2[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# remove pytest-cov dep
+	sed -i -e '/addopts =/d' pyproject.toml || die
+	# unpin all the deps
+	sed -i -e 's:,<[0-9.]*::' pyproject.toml || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# broken by presence of pathlib2
+		'test/plugins/test_autoimport.py'
+	)
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest
+}
+
+pkg_postinst() {
+	optfeature "Automatically format Python code to conform to the PEP 8 style guide" dev-python/autopep8
+	optfeature "A wrapper around PyFlakes, pep8 & mccabe" dev-python/flake8
+	optfeature "flake8 plugin: McCabe complexity checker" dev-python/mccabe
+	optfeature "Python style guide checker (fka pep8)" dev-python/pycodestyle
+	optfeature "Python docstring style checker" dev-python/pydocstyle
+	optfeature "Passive checker for Python programs" dev-python/pyflakes
+	optfeature "Python code static checker" dev-python/pylint
+	optfeature "Python refactoring library" dev-python/rope
+	optfeature "A formatter for Python files" dev-python/yapf
+}
diff --git a/dev-python/setuptools-gettext/Manifest b/dev-python/setuptools-gettext/Manifest
index a85a86bf58a1..b96fa24fbc6b 100644
--- a/dev-python/setuptools-gettext/Manifest
+++ b/dev-python/setuptools-gettext/Manifest
@@ -1,3 +1,3 @@
 DIST setuptools-gettext-0.1.3.tar.gz 10654 BLAKE2B 801adc5f09facff215009ee61cef6996866efced51424a9dbcc6ace76e132b75d3cc8293eecbe0958372966e9faa64c73d7f743d2bb6187b448d9becf6106c8c SHA512 786e9f9280013759e96fe16551ba2dafef033d7d1faadc9bf9306c6442ba242d638778b45c8c228a2ff04038903958bc1db435c4982b665d73ba15fcc4bd9eee
-EBUILD setuptools-gettext-0.1.3.ebuild 512 BLAKE2B 56e127d26c05ea59a5cccba24105c21852837da2ee2db247ef3544b7fd9778eaa463fbf0ada70a9e9dfdb5bb99974f8e69bb59b49ab931cb99653bb488c5caff SHA512 e897767b9c87a46e8431e2879f3a57c16fc6856475900f905f910a833676d69a7633274f0a0a54fc149a1bbeb856889b3f122a34467e1422d11deddd2b93da06
+EBUILD setuptools-gettext-0.1.3.ebuild 517 BLAKE2B 60ca4f4fa0163fe39fdb7b9283c1c16a2d78c375d17b5305a51230b8f0bae6fb76a35e3d1167912c0bfbdb09279f5e86ad24186f960282943962f0a6287d0b65 SHA512 53323d5e513ca190a873d1cca56e015bfdc927dfbc9ab4fbef21adcdb15054ffa531db0e53765d96dd2e017d350d8b41715060cccdb6687feacf47987491a61f
 MISC metadata.xml 416 BLAKE2B 23190f0b876ad7c5d8e0bf7ee48a9a5f8b0acfad89720261cfa2641846c68b6566106295028f0e62cfdf946f5dc31c566eaf0875796c706ac70e4acd5f1cd2ab SHA512 95a4bc35002104a6d4edcf3009e0b1d3182b6cc15146bb6e69592e5f49ab7784746e71faf438496abad9666f29cc301ff31d68469e25ee23efbae016fd46211c
diff --git a/dev-python/setuptools-gettext/setuptools-gettext-0.1.3.ebuild b/dev-python/setuptools-gettext/setuptools-gettext-0.1.3.ebuild
index e1b4bb7bebc9..9c786ed070d2 100644
--- a/dev-python/setuptools-gettext/setuptools-gettext-0.1.3.ebuild
+++ b/dev-python/setuptools-gettext/setuptools-gettext-0.1.3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="~amd64 ~arm64 ~x86"
 
 RDEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/tox/Manifest b/dev-python/tox/Manifest
index 8faf71852053..64b464137b29 100644
--- a/dev-python/tox/Manifest
+++ b/dev-python/tox/Manifest
@@ -3,6 +3,7 @@ DIST tox-4.10.0.tar.gz 174296 BLAKE2B 8369108d8fe4b64e0089bc9ea38c7d858b71fc2ea8
 DIST tox-4.11.0.tar.gz 175086 BLAKE2B 7ddacab75674d5738543cc0deedfb8ba49b94be1e75d95f068162ea2443d3120bfa85b6ca31fa8141c8168e171a5731d829ec493d35b21aad7981685b937e78a SHA512 3e2e9f09874c39f6928d2502e5d01ca48721fc777d758f1d4b3df012261c3adc9e93a89ff6dcf7950fb4245df2624ff8c7cb84feb9424a8fcb6ab12117728692
 DIST tox-4.11.1.tar.gz 175185 BLAKE2B 24926218c45f9d05e926ee2f0583a49e6ae11c6aa0344ea1b88c636ef67e945f5b54db565c1a5e242ca3e1bb7c065f92a7ce2ceb836b02e239b2321ad3d6c359 SHA512 8dc99f98a72ece1cae60e9a0d99fe44b66bd6d9fe6f2d45b0f4e7ab10a5e4a65049cced4b212fe8bfe34ded65b8e4b76d642e5c014d385d2d2cd7f87d8cf6816
 DIST tox-4.11.2.tar.gz 175238 BLAKE2B 7f6d87941923004d7547cfe24cc55b0c02a78f3086e1df900d45e0c6ec5acd6d24bac26b6613df35064f8bc94730a57d39eccd3504c943acf18eba0e0adfb06e SHA512 200fe089ffd80e44726a6fb624d8a4bb95be1c541483f2eb29f45f47d0661cb7b7d77c7f429440e14f8894b0cba3be2cb19e7cc5daf5a4afdb1fec83a87f45df
+DIST tox-4.11.3.tar.gz 175528 BLAKE2B 521e26cf11127b51089e1f5c20ec73bfa2ec36fc098f03cdca398769ae9d6d67f75e4bd0a4b661fcdfbc614d9971fd8e4e801648459456d690493a071aaa25f1 SHA512 326023cf8011957ea4b1e7c8765ca9da3a2387a78810ade09b71be56c26481cd020ca99217a3c7fe7f95da365840dfb5c7c7ee6ed63caeda2b326abdd66b7438
 DIST tox-4.5.1.tar.gz 170137 BLAKE2B 38ab00eb577e66211db0ecf8931087a8c5a14f8219eb7ebecb7be9938221d1c680edc09a38a5c72b9ec63825d4cbb2d4fd9157a52aed8cdb0d22a1c1bbb70cba SHA512 75d495d6dba134c3fe537fc190c1f428ff188ee67c346911c02ee151a8369425b22956eea52be5d434735e1590edce57b3487d5f4b277022bf8cfe8bf4660cf8
 DIST tox-4.6.4.tar.gz 172650 BLAKE2B 84164dbb02002d398e779b0c5e4617213fbfc711ded95faddde93711549eab9e69675f0a459ce60ba8357baf4e7d361f86b4cb85818972e5d018a61db179ba1a SHA512 b6a4673ea58e21b5e8b3d1330244d46ac7a36563a089b2e03cfcd7039386ab6afc437ebf4c516bbe373133a7beb54ebb380d39ab126be69f3601226f2273f3c2
 DIST tox-4.9.0.tar.gz 173479 BLAKE2B 00fc440bbcafa6e0d521ce745af0fa7b9a33196fec4f29f2dcad10079d494e3703fa06558ceb26762162687f71f7c77b386f64bdff6b4ac0a78706d2b7fd0743 SHA512 62f0cdb4d425d935315babf90ab331fb772352e68b6c67cf96f1d13007245427e67968a08073cc07a4adf850a991bbbcbff742567808ca22bc231acc1e3692e2
@@ -11,6 +12,7 @@ EBUILD tox-4.10.0.ebuild 2847 BLAKE2B 1b9389dd6de0acce0fd28030c93128c5f0a5d38ee3
 EBUILD tox-4.11.0.ebuild 2840 BLAKE2B 59fcc5acfeef9ea8523fc8d4c8e16c0e099bb70e489b2acc649bb92057f0d457486b0bbac3081d4c4d22ff781866c429e56f8e76422b9296ba67d7b37ccc32ba SHA512 4fe229c7e1fbf6c785e5bfb5ac59d68949de65cce3f5e2bdd0063d7278acbf82fec77cfd9c50d6b8d04b3c983cfc8de8870a3ca129b4afe9b6091bc9bc863dfc
 EBUILD tox-4.11.1.ebuild 2840 BLAKE2B 59fcc5acfeef9ea8523fc8d4c8e16c0e099bb70e489b2acc649bb92057f0d457486b0bbac3081d4c4d22ff781866c429e56f8e76422b9296ba67d7b37ccc32ba SHA512 4fe229c7e1fbf6c785e5bfb5ac59d68949de65cce3f5e2bdd0063d7278acbf82fec77cfd9c50d6b8d04b3c983cfc8de8870a3ca129b4afe9b6091bc9bc863dfc
 EBUILD tox-4.11.2.ebuild 2840 BLAKE2B 59fcc5acfeef9ea8523fc8d4c8e16c0e099bb70e489b2acc649bb92057f0d457486b0bbac3081d4c4d22ff781866c429e56f8e76422b9296ba67d7b37ccc32ba SHA512 4fe229c7e1fbf6c785e5bfb5ac59d68949de65cce3f5e2bdd0063d7278acbf82fec77cfd9c50d6b8d04b3c983cfc8de8870a3ca129b4afe9b6091bc9bc863dfc
+EBUILD tox-4.11.3.ebuild 2840 BLAKE2B 59fcc5acfeef9ea8523fc8d4c8e16c0e099bb70e489b2acc649bb92057f0d457486b0bbac3081d4c4d22ff781866c429e56f8e76422b9296ba67d7b37ccc32ba SHA512 4fe229c7e1fbf6c785e5bfb5ac59d68949de65cce3f5e2bdd0063d7278acbf82fec77cfd9c50d6b8d04b3c983cfc8de8870a3ca129b4afe9b6091bc9bc863dfc
 EBUILD tox-4.5.1.ebuild 2677 BLAKE2B 0f93d46d9c831f6b320286b38c2f2b5677442c9fd2c756a109355addba5d7e2efb0657c6ae736f391891508e5d247c1f06afb338ae2a2fb639f962c81939a1a5 SHA512 7a2e2f268c69f8438c6265737f1222561e5707350f6822cdc6d15c425c34f59415b5f7c9bc4993c996c885048f590a696f680ef5a9e41f9daa16cd07b62cc591
 EBUILD tox-4.6.4.ebuild 2702 BLAKE2B 2067ee00b17cf2923e47311c8347481ef1e65b10837bb29aed7c0574da01ca824bceff001ee25142cf1772976ec1d6aa108640074d66d2edba7f5f44b5ba2e55 SHA512 2cb45c6dcf1c70413c86abc6b92b6a544e3c96263218c845a76e33c994578083dd112cd47ba8b1c78399a1559d75f425cbaed48f31aa7662c6cf2f88521873e0
 EBUILD tox-4.9.0.ebuild 2847 BLAKE2B 1b9389dd6de0acce0fd28030c93128c5f0a5d38ee3b6d2931f1cf2e33a1ce5d13a9e5a922b4d8a0c8b1ef5af6ece1eb30db3ccbfe48a6214186467f9f3fb3cf1 SHA512 43a1665dceb2ca34842191679e65dd1c52f44fadea9ef672b2c78d0f68650788c8707e97b0fd7654d67235f67ae14eeb90921c10543b934c9f9d7922786a806d
diff --git a/dev-python/tox/tox-4.11.3.ebuild b/dev-python/tox/tox-4.11.3.ebuild
new file mode 100644
index 000000000000..dfbf0fa8708d
--- /dev/null
+++ b/dev-python/tox/tox-4.11.3.ebuild
@@ -0,0 +1,90 @@
+# 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_{10..11} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="virtualenv-based automation of test activities"
+HOMEPAGE="
+	https://tox.readthedocs.io/
+	https://github.com/tox-dev/tox/
+	https://pypi.org/project/tox/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/cachetools[${PYTHON_USEDEP}]
+	dev-python/chardet[${PYTHON_USEDEP}]
+	dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/filelock[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/platformdirs[${PYTHON_USEDEP}]
+	dev-python/pluggy[${PYTHON_USEDEP}]
+	dev-python/pyproject-api[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/tomli[${PYTHON_USEDEP}]
+	' 3.{9..10})
+	dev-python/virtualenv[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/hatch-vcs[${PYTHON_USEDEP}]
+	test? (
+		dev-python/build[${PYTHON_USEDEP}]
+		dev-python/distlib[${PYTHON_USEDEP}]
+		dev-python/flaky[${PYTHON_USEDEP}]
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		dev-python/re-assert[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/time-machine[${PYTHON_USEDEP}]
+		' 'python*')
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# upstream lower bounds are meaningless
+	sed -i -e 's:>=[0-9.]*::' 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
+	)
+
+	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
+		'tests/tox_env/python/pip/test_pip_install.py::test_constrain_package_deps[explicit-True-True]'
+		'tests/tox_env/python/pip/test_pip_install.py::test_constrain_package_deps[requirements-True-True]'
+		'tests/tox_env/python/pip/test_pip_install.py::test_constrain_package_deps[constraints-True-True]'
+		'tests/tox_env/python/pip/test_pip_install.py::test_constrain_package_deps[explicit+requirements-True-True]'
+		'tests/tox_env/python/pip/test_pip_install.py::test_constrain_package_deps[requirements_indirect-True-True]'
+		'tests/tox_env/python/pip/test_pip_install.py::test_constrain_package_deps[requirements_constraints_indirect-True-True]'
+	)
+
+	epytest
+
+	# tox leaves a *humonogous* tempdir which easily leads to ENOSPC
+	# when running in parallel with other packages
+	rm -r "${T}"/pytest* || die
+}
diff --git a/dev-python/virtualenv/Manifest b/dev-python/virtualenv/Manifest
index 463acbf2b622..69ef47d92fc3 100644
--- a/dev-python/virtualenv/Manifest
+++ b/dev-python/virtualenv/Manifest
@@ -1,7 +1,9 @@
 DIST virtualenv-20.24.1.tar.gz 6338055 BLAKE2B b5d6ff2fa230a094699cd5ef3a289d9f79c35a843e8709009b44c7d5861dffe2072d51c62a623624c3f7b1656d126781ae454a81e3510474e2514ec66d85637f SHA512 7ac4c130df7eb4b7bf2b393505c80ed07824c9d0c09535f1d7483f3926324e0d1c54c0b8310c228e529a9b3839820e943a1d2ff2b06174782f13735c2a1ed472
 DIST virtualenv-20.24.3.tar.gz 6345661 BLAKE2B b6e9db2b59114de0aa419f558b863aa980daaca278e658f7dce55b5b2bef16e88915162d4b5ea31bb5c549582debd22d02b2a0edc7db08c168428395251448c3 SHA512 9cf6f03b50bae773cca2a01be4f74251d3054ea997a0b1236c4e6650e779f219ca51f736eff86a6e25548d5bc0c84e85a1d0cf7d3099848d773d205837c76fc3
 DIST virtualenv-20.24.4.tar.gz 7115923 BLAKE2B bd3b002da91673d33b8da9766e81319deee86959a0bc71fe0be9e920bddb24969c096ad31c246f170ccde0b6de55d4126d425419629fd08d065af37835278253 SHA512 2bf9ea5878be0140dba3a6d781fd820d8eb60f0de1e49ea3209f53f3b9bf0f6b063b905a90c0d7bb670c03a3a50638367d5598a8402009d5e9b001271ddedaac
+DIST virtualenv-20.24.5.tar.gz 7119883 BLAKE2B bc4a0e81feeac8975f259b329f223a286be41af11c9a8f27b68b6a42611668942ba18b691a848195609e47695e3104602d6563cabb930d7fed9f07cc57d2468e SHA512 f77961ed26c3e7314f26c0c18d41ab843572b0a1d157eb7b5e51f955a289da8ecf633d2ad9c936b9292e5b06e4ce9f5b11a100681fbb63dd1fb9fc9bef37f4c4
 EBUILD virtualenv-20.24.1.ebuild 4836 BLAKE2B 1cff43a4eb81126c501ad1e7f11ea24763d8d1d273a58f0fe2f1be726ecbb88213585eaa909a75c1aa917ea107f2aeb4d23674d536d022a151501ac310263362 SHA512 7f1d6d589bec6431acf06c21bc8fcbe82ce45d73011a24f3325b700646be977184edc3fc64ed7a4624071331bba19fa8ca6c5a4859b91bc4e8bcf6018fbdb9e7
 EBUILD virtualenv-20.24.3.ebuild 4846 BLAKE2B 190a1de9689045a7361e202fbefe8a7bb6e91ad3eb576e4ab0f74a032893c21be7305ab9f323a75b4e1d341140b66453ef1d706670108e705394ddb9ac51173b SHA512 44d4b8e1a742e454e7df7bef51ee0cd6d5d5e6635e0cd9d322c39920945a56163f3d2cd611d37759bdac4828841db087cba2b378a58a9df55f91bbd49de32941
 EBUILD virtualenv-20.24.4.ebuild 4846 BLAKE2B 190a1de9689045a7361e202fbefe8a7bb6e91ad3eb576e4ab0f74a032893c21be7305ab9f323a75b4e1d341140b66453ef1d706670108e705394ddb9ac51173b SHA512 44d4b8e1a742e454e7df7bef51ee0cd6d5d5e6635e0cd9d322c39920945a56163f3d2cd611d37759bdac4828841db087cba2b378a58a9df55f91bbd49de32941
+EBUILD virtualenv-20.24.5.ebuild 4846 BLAKE2B 190a1de9689045a7361e202fbefe8a7bb6e91ad3eb576e4ab0f74a032893c21be7305ab9f323a75b4e1d341140b66453ef1d706670108e705394ddb9ac51173b SHA512 44d4b8e1a742e454e7df7bef51ee0cd6d5d5e6635e0cd9d322c39920945a56163f3d2cd611d37759bdac4828841db087cba2b378a58a9df55f91bbd49de32941
 MISC metadata.xml 406 BLAKE2B 97fee04c2662c5c36b6e16538284def46eb2454424770f42edf2567ed804ca15c4e969c714c57573f897b0946246577ab6e35204ed1f3f1735713d8ab5d24667 SHA512 356d42db463b63a3b3a55c1e98eb661de0a10aa6a5fde4f8b3f888ec73020c6679e86efd8dbb0b3e4a5a720af95e658612ba460fe548e081a90beec75fb9c1b2
diff --git a/dev-python/virtualenv/virtualenv-20.24.5.ebuild b/dev-python/virtualenv/virtualenv-20.24.5.ebuild
new file mode 100644
index 000000000000..c811380a9aa7
--- /dev/null
+++ b/dev-python/virtualenv/virtualenv-20.24.5.ebuild
@@ -0,0 +1,107 @@
+# 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_{10..12} 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="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+SLOT="0"
+
+RDEPEND="
+	<dev-python/distlib-1[${PYTHON_USEDEP}]
+	>=dev-python/distlib-0.3.7[${PYTHON_USEDEP}]
+	<dev-python/filelock-4[${PYTHON_USEDEP}]
+	>=dev-python/filelock-3.12.2[${PYTHON_USEDEP}]
+	<dev-python/platformdirs-4[${PYTHON_USEDEP}]
+	>=dev-python/platformdirs-3.9.1[${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}]
+		$(python_gen_cond_dep '
+			>=dev-python/pytest-freezer-0.4.6[${PYTHON_USEDEP}]
+		' pypy3)
+		>=dev-python/pytest-mock-3.6.1[${PYTHON_USEDEP}]
+		>=dev-python/setuptools-67.8[${PYTHON_USEDEP}]
+		>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/time-machine[${PYTHON_USEDEP}]
+		' 'python3*')
+		dev-python/wheel[${PYTHON_USEDEP}]
+		>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+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.1[12] ]] && EPYTEST_DESELECT+=(
+		# TODO
+		tests/unit/discovery/py_info/test_py_info.py::test_fallback_existent_system_executable
+	)
+	[[ ${EPYTHON} == python3.12 ]] && EPYTEST_DESELECT+=(
+		tests/unit/create/via_global_ref/test_build_c_ext.py
+	)
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x TZ=UTC
+	local plugins=( -p flaky -p pytest_mock )
+	if [[ ${EPYTHON} == pypy3 ]]; then
+		plugins+=( -p freezegun )
+	else
+		plugins+=( -p time_machine )
+	fi
+	epytest "${plugins[@]}"
+}
diff --git a/dev-python/xlsxwriter/Manifest b/dev-python/xlsxwriter/Manifest
index 314b68a33d7d..9ddf4781fc24 100644
--- a/dev-python/xlsxwriter/Manifest
+++ b/dev-python/xlsxwriter/Manifest
@@ -1,3 +1,5 @@
 DIST XlsxWriter-RELEASE_3.1.2.gh.tar.gz 36697835 BLAKE2B 055d0ac2e70ce5f86167f630044136f984bf19b494cb2ea5d7b98ce2098942e4c89eb0c3c3a8eeb48b1a4dcff30b71d45c2f2528634ed2f652d27f358d4778f7 SHA512 05f70721e6c55d54acdc143681ec581d3bf16c5d07725790bc648c169507e3cd9bd600ac4fcb4ff03fa449a6efc469d0745b92fcdb89afbf27ee1e2998c09613
+DIST XlsxWriter-RELEASE_3.1.3.gh.tar.gz 37317330 BLAKE2B 08dd76cfb7bcb336d0fa64276d11d0cee90809169cf0597739a262b970cc82741ac56beb681e78e7f3d88bec65f4a5c4b7a368ea800aab8bcfc4814e5b679638 SHA512 673b51d7d25fae462fb0b40fbb131ffd32237ee0078d235cbe1bb2fb4cee67bf72955aa555e3f5950bee9be7d256dad9ddadba2df4f50dc774cf1fda7503f43c
 EBUILD xlsxwriter-3.1.2.ebuild 686 BLAKE2B 52fa33088302e9839c34ca28f8d538dbc558014e41631b7034021195ddb88d1a9ce638976cbfd2151bc80cfa4e047a9f0393f3811c9241010412c2f5d1f3dacc SHA512 8e354be247dbb23e8575d0294ff5c55291fee6ebbdf0263a9b5fc1f20c624032cacc2b428db458b792200ea5d96e17839d7c20f9d82924dbdbdfe723aac9329e
+EBUILD xlsxwriter-3.1.3.ebuild 692 BLAKE2B 7f9b0f52f78f33779786237a3545ed4e5aeeee39c7dac130ef35a3712e836335ccbbaa4ed4026c2193f0113576d90abc2b5f39bf5dc214020af90ae379d4f9a6 SHA512 435f5cc3459a2d86fddbc1f5cd47e9309e8d4b7775ae3fe12670a22b45f013b2da8cb0be038397a50846c4ac5c13276add71498d8a0a6368566acdf406769c79
 MISC metadata.xml 411 BLAKE2B e41e1e6dddecef73fff1c0bd74d51b023694ea6eb162022679a2939819f5c3339b1e76d00e25f761c46f66d323a5ad7085ed86fb13fbe3f53526c75004a68e93 SHA512 63242ff274e1dde596e50f9360e1247084b7bae05cd42d60605700c49e33b53849529578cf532415b899bd2ccd04066f99e97c6e80d53c13f71522a041579976
diff --git a/dev-python/xlsxwriter/xlsxwriter-3.1.3.ebuild b/dev-python/xlsxwriter/xlsxwriter-3.1.3.ebuild
new file mode 100644
index 000000000000..de882ad03167
--- /dev/null
+++ b/dev-python/xlsxwriter/xlsxwriter-3.1.3.ebuild
@@ -0,0 +1,28 @@
+# 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} pypy3 )
+
+inherit distutils-r1
+
+TAG=RELEASE_${PV}
+MY_P=XlsxWriter-${TAG}
+DESCRIPTION="Python module for creating Excel XLSX files"
+HOMEPAGE="
+	https://github.com/jmcnamara/XlsxWriter/
+	https://pypi.org/project/XlsxWriter/
+"
+SRC_URI="
+	https://github.com/jmcnamara/XlsxWriter/archive/${TAG}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+distutils_enable_tests pytest