15 files changed, 375 insertions, 0 deletions

diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 019a229819c7..21b55458fd68 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/ansible-compat/Manifest b/dev-python/ansible-compat/Manifest
index 8a72a4159ce4..d9e3acd1e336 100644
--- a/dev-python/ansible-compat/Manifest
+++ b/dev-python/ansible-compat/Manifest
@@ -1,5 +1,7 @@
 DIST ansible-compat-2.1.0.tar.gz 37840 BLAKE2B 5ac74cdaef1c932094996f331ed94418836b3351cbd376ae35ef22046b68dad0a8ab68fd293015db9954e0a5e1df4b5c529b3845cee5778daed2bb207733ca4f SHA512 a85681aff3d34ef4a4cdad8f419017a174bf315034495bc032a7e33d586cbcf72de74d163b6faf3cd21988704e5dbb922872b83a23981891311dbb18e53797a3
 DIST ansible-compat-2.2.0.tar.gz 38772 BLAKE2B dbe74d23d2f2e4275bd9df2303417ea83517e780e65c6a34bd6ae1022be265ac816b50b309fc45f88e0c7fac7d7a22c83a826cc15be050698a6f35b267a36ac3 SHA512 3bd199431659ecba52743c6c985d2cdc6ee55396444241ba2456bc5430bbc87e26087dffbfff62ac341fa854e19baa0d7052cf79f20511222fd9e001dd020136
+DIST ansible-compat-2.2.1.tar.gz 39126 BLAKE2B c4d0512606c99ba8f07e0287620c94af6b46d7bf0077f12dcbfd9689fc7106f164a87db25de1625249ac2930858bfa655bd93d83aba0d85ed4f8bdd42cd345dc SHA512 3e941eb2c5303f83b7e7c057d08801f192889b636d9c6e56a2ac21cf75144a52ba2916eaedeba7bf848dd268387bf4d3261541d75145b213cc3f6baca6a06e5e
 EBUILD ansible-compat-2.1.0.ebuild 1801 BLAKE2B 631de4e8e8071eed1197c11e500cf4108e879a6e4912417d66bf793e8dce0a28af76a4da7666aac77631f869d0f0eeb763b399c81de0bd08171891b1c0e7df89 SHA512 36d1c856bacbecf6eda95f0f603269a716e9e29090a92cf4c10f6bbd38ab3a7d045258cb2cf7f1ba4dc31b25d03b64b45968817fefe402b4ff15344b71d72d19
 EBUILD ansible-compat-2.2.0.ebuild 1841 BLAKE2B 904c48ad161c04d567bcbcda9595c9a477645fc2e142611227719e11a8df77aa5a2715bb8fdc1a01013941759baad984f923e49a66a0c831b046a9abab9c0cbe SHA512 7d77e77637814d7df743ca402e38a2815526dfc629e46653283d9f804cf688f699e13a06df2cf4c10b345ec9b5631aafbed9673d402315caa90f6a007ce69803
+EBUILD ansible-compat-2.2.1.ebuild 1841 BLAKE2B 904c48ad161c04d567bcbcda9595c9a477645fc2e142611227719e11a8df77aa5a2715bb8fdc1a01013941759baad984f923e49a66a0c831b046a9abab9c0cbe SHA512 7d77e77637814d7df743ca402e38a2815526dfc629e46653283d9f804cf688f699e13a06df2cf4c10b345ec9b5631aafbed9673d402315caa90f6a007ce69803
 MISC metadata.xml 510 BLAKE2B 3f47270866cb9acc5944b71547640b69003891268ffc07b5cd10e6ba8842b6f644ab4dea3b3da2d20b17f34d90e565b6f03a4dbb8ea38fa282fed283ac22fac1 SHA512 65d8604e46581bf9ecb3d8e358f3a211b18c51beea22c92a1cd3668ba86140e3bd8d91a38c221e73fe13a3e0da1cbfc2030b3f7733ee55e045530b49cd77d46d
diff --git a/dev-python/ansible-compat/ansible-compat-2.2.1.ebuild b/dev-python/ansible-compat/ansible-compat-2.2.1.ebuild
new file mode 100644
index 000000000000..0a8b7add6886
--- /dev/null
+++ b/dev-python/ansible-compat/ansible-compat-2.2.1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Contains functions that facilitate working with various versions of Ansible"
+HOMEPAGE="
+	https://pypi.org/project/ansible-compat/
+	https://github.com/ansible/ansible-compat/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
+
+RDEPEND="
+	>=app-admin/ansible-core-2.9.0[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-4.6.0[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	>=dev-python/subprocess-tee-0.3.5[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/setuptools_scm-6.3.1[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm_git_archive-1.0[${PYTHON_USEDEP}]
+	test? (
+		dev-python/flaky[${PYTHON_USEDEP}]
+		dev-python/pytest-markdown[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/pytest-plus[${PYTHON_USEDEP}]
+	)
+"
+
+# All these tests attempt to connect to galaxy.ansible.com
+EPYTEST_DESELECT=(
+	test/test_runtime.py::test_install_collection
+	test/test_runtime.py::test_install_collection_dest
+	test/test_runtime.py::test_prepare_environment_with_collections
+	test/test_runtime.py::test_prerun_reqs_v1
+	test/test_runtime.py::test_prerun_reqs_v2
+	test/test_runtime.py::test_require_collection_no_cache_dir
+	test/test_runtime.py::test_require_collection_wrong_version
+	test/test_runtime.py::test_require_collection
+	test/test_runtime.py::test_upgrade_collection
+	test/test_runtime_example.py::test_runtime
+)
+
+distutils_enable_sphinx docs \
+	dev-python/ansible-pygments \
+	dev-python/myst_parser \
+	dev-python/sphinx_ansible_theme
+
+distutils_enable_tests pytest
+
+python_test() {
+	epytest -p pytest_markdown.plugin
+}
diff --git a/dev-python/dj-email-url/Manifest b/dev-python/dj-email-url/Manifest
index aae0f4a4e2ea..f200343c3433 100644
--- a/dev-python/dj-email-url/Manifest
+++ b/dev-python/dj-email-url/Manifest
@@ -1,3 +1,5 @@
 DIST dj-email-url-1.0.5.gh.tar.gz 7950 BLAKE2B 1d159023f9b49f3a13fba39c29c51bb06bb6dd9d3c5303a4d246ad9f72daec9a273c15d214ad94a219883c9c210955d84bacc5861f5411845e152fedc7ee6880 SHA512 7de79a4f1f7416634c5877bc45d290d20d841e5ec470bc40ea900f04531037e2337c81788792b8f70a11318633a42f86700a5b27e611fac466b373d2d3b7f355
+DIST dj-email-url-1.0.6.gh.tar.gz 15944 BLAKE2B d10a428cca05e93129be9acb4947c534cd897a39995f8224b17017405942defc977c19457b69b07be9518b203fbe50c6302da5ef089cd54301fe3ee46c091f90 SHA512 f41f4c7cb6c2ce9ff99d9dd4d5676fcd3d82814a929fe4c64c52409ec1b12fc87e657fcb39d40d7ec24fef8fed633418ef7d7537563f753532e1348290672faa
 EBUILD dj-email-url-1.0.5.ebuild 637 BLAKE2B fb7523bb42e18110a96fa88624e9c909d1cec1bbdd7079fc8eac936fbe004e367aee517496e87f387bbd58cbbfbbab9d6695f0c21ea951e600a13ede5e5d3f12 SHA512 ac53c75740823aac7ebe7f0d817ab2eaf93adcf22cefe3f7d0a6121e58d550ae9f957f1c104002c908708ad4383acfe030a4f48a3c4cf06cb54fe966e0442f21
+EBUILD dj-email-url-1.0.6.ebuild 641 BLAKE2B fa3f6d3d934755c324fa9277800c2e208967790bf101d3885b621d14f87841c3cc71311d870654e24d316a9d0e85d0487d550e8d8ef466caacb838fe1043719a SHA512 08707b800d0cc80e2953409397ffde9db0768ade83787ccae424630f928c82ebb248a4d4523ac7df0061c6e986e09607e172b0d09301d2766f61c76f2541c522
 MISC metadata.xml 408 BLAKE2B 13c4c985a274eb0e762a0b20976081102ff640bf9b69f6ee54639476236aea5ba08696d17cce07835c7c3bc989d8474c051e6c3d24eb78aff29c8b43b5fa6b60 SHA512 73288f6d7e447be7c42dc5014a48bdf57755e9e38ccb165a33e535463468cdef0fd55f6bc7994add0e58a624881dc73594e6cf495bbf190a7cc0c1ab18678d12
diff --git a/dev-python/dj-email-url/dj-email-url-1.0.6.ebuild b/dev-python/dj-email-url/dj-email-url-1.0.6.ebuild
new file mode 100644
index 000000000000..fabe7b1d5f7a
--- /dev/null
+++ b/dev-python/dj-email-url/dj-email-url-1.0.6.ebuild
@@ -0,0 +1,27 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Use an URL to configure email backend settings in your Django Application"
+HOMEPAGE="
+	https://github.com/migonzalvar/dj-email-url/
+	https://pypi.org/project/dj-email-url/
+"
+SRC_URI="
+	https://github.com/migonzalvar/dj-email-url/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+DOCS=( CHANGELOG.rst README.rst )
+
+distutils_enable_tests unittest
diff --git a/dev-python/libtmux/Manifest b/dev-python/libtmux/Manifest
index 67fa929b2497..f07ad3bf0a63 100644
--- a/dev-python/libtmux/Manifest
+++ b/dev-python/libtmux/Manifest
@@ -1,6 +1,8 @@
 AUX libtmux-0.15.4-no-doctest.patch 476 BLAKE2B 66dc3c6e28be115f64bca53012ae11307ad7b75ed2c01595c42503ddf5898ee2b8f3f643767a26f06e97a05a5c3898d7de8fd57331b5f1cf8b676877bbdaf1b9 SHA512 33b3e7d470780cce59bf3b4c00baed75d640c99aa709f83bf5f17e7a1e7f2873aed7621a3718d873934911de7d9d16923e26f454192f9a0135fe5ff24010139b
 DIST libtmux-0.14.2.gh.tar.gz 234682 BLAKE2B e93b0a280c3cfdfab4c9a313d251d15665c530813f00aa78151efe62a6a566f2d8986afed015de4a8be80b48f31ac197e98d3efa592eb8895e8d9626ff34ef72 SHA512 1565529ecf555dac8f896146e2d802c0e5460458ea1da6ba5496d5d2c394f56cc8c5f7650c5d4aebd1750659bbdc529e439e60dff6a0ccef8806bb65305d2421
 DIST libtmux-0.15.4.gh.tar.gz 237928 BLAKE2B b12643336717fbba079df884aa7b8a3029c393afd0dbcfe7be07d7c08f15a8252ec73479f5423fbe86efe63fb990529f68ed5690b40e2c7938df7edd2c6e51e5 SHA512 41adc83fde64a00385bb6885243b50c73e4cedd4d0860b1eb5c9a533b73d2f7fedef1e23f1b994c809abb834b666931c3fbdccd417969865172777e34a1cc5fe
+DIST libtmux-0.15.7.gh.tar.gz 237820 BLAKE2B b398fb9c44ebf916e99d442094bee9925e129e67a32becdfdda9d5ec4c8e30bebe937ebde58e2fb5654807251cd00076117646974430a0c608b1b89637fdfe94 SHA512 ac33aeecc579b018af2e09d0aaf86f97dafa7782893bee065798247ebd5e2a5a4a8d14b1b3314e0050e39bceefeadef6600d3881fbb30a8e3e9b4831b4df339b
 EBUILD libtmux-0.14.2.ebuild 1045 BLAKE2B 15271b0d210c5a18446c2db48a545c5011681b45f428860d4ce0f203164f48808a31de53574924dab1488119714124d12e8cc0a6272418cf960ec4c44180ce65 SHA512 b613a238fa185740af567aac8ad73753d82cd27c962d76bc3d7a5991b123dcdd42c9f64e6fcdc35a36f0e762066c839eb4e18dfb19ac5d9aa289c5eab06690d2
 EBUILD libtmux-0.15.4.ebuild 1105 BLAKE2B a246a6c5f674b6ce925f464defc95d227b13d0df27da418cd7a17264d9514f46311e152f186f7c22e03bee1c561d8b5a68624cc5b1d9f980d62769ab1a1d7b27 SHA512 39b9d27fafa9ef35f1efdd8f8f98136a9bb5eb233df86a8ed418117e7280e2bfd7df15c0a5c47a33ca19b1a9238433f76b3cd5a209da8201d239c835316e1cf5
+EBUILD libtmux-0.15.7.ebuild 1107 BLAKE2B 86d2a4be1375dd000a50e988048b68ebb71018fc2d7cdbd551afdee3356167806c98016a0d0d683a4979a56fbf2cd0984a57baa3d4e44aafe295378ba3db4b5c SHA512 f064c66e296cf4627d93efedf796f71c84183e27355d39b5275df582ad2992e8bb4f286f337d24aba7eacfdd1e31c04ebf577672c5e2815a3341b2b56a3b83a3
 MISC metadata.xml 403 BLAKE2B 68af7251349c8999bbdbfb7b55ca4632f8752468d7e478fd985097af86d00afe93b231667a25e3c997a3bc86b708d4e6d6ef5c35a783871cdc83519fc1db1ab1 SHA512 2a88df695e94f1da966bb72f7e90d00f2e343e40fe1924837f8c087dfc9a9a84fe0b2909a98f2f41ba72f6ba01796888a80cbac3f1bf9f05984a06385037d977
diff --git a/dev-python/libtmux/libtmux-0.15.7.ebuild b/dev-python/libtmux/libtmux-0.15.7.ebuild
new file mode 100644
index 000000000000..68646aad4b62
--- /dev/null
+++ b/dev-python/libtmux/libtmux-0.15.7.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="python api for tmux"
+HOMEPAGE="https://libtmux.git-pull.com/"
+SRC_URI="
+	https://github.com/tmux-python/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	>=app-misc/tmux-3.0a
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/twine[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/libtmux-0.15.4-no-doctest.patch"
+)
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	libtmux/pane.py::libtmux.pane.Pane.send_keys
+)
+
+python_prepare_all() {
+	local issues="https://github.com/tmux-python/libtmux/issues/"
+	sed -r -i "s|:issue:\`([[:digit:]]+)\`|\`issue \1 ${issues}\1\`|" CHANGES || die
+	rm requirements/doc.txt || die
+
+	# increase timeouts for tests
+	sed -e 's/0.01/0.1/' -i tests/test_test.py || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/phonenumbers/Manifest b/dev-python/phonenumbers/Manifest
index 092dbd2d2454..b97ee49ac25a 100644
--- a/dev-python/phonenumbers/Manifest
+++ b/dev-python/phonenumbers/Manifest
@@ -1,5 +1,7 @@
 DIST python-phonenumbers-8.12.54.gh.tar.gz 4905001 BLAKE2B 5fc206b3dd5f5cc96ecfc91b33369fb12d8a11245f846039478bf77f9dbc8e1bfe0e169eb6f1c360ac2a730f79b512178b115f82434790baeb3b2d26d5eaa370 SHA512 0da4f3ffa57f0c2ddaf843eea1440b33844be7ee45122a21d00b5630b720eac059777dca2051e00baf39158737478d5077f97ec6b9293528b11a9844294a621c
 DIST python-phonenumbers-8.12.55.gh.tar.gz 4905987 BLAKE2B 3c05fbe261f9c347bdccb9e664f0005f3f67120df5a494b105780ac5f00a407289bd6be6bbaefbf843937193b760b772e1d8c298a6676770f97d7e6a3d16f25a SHA512 f1aaecd70d761aaa2b6b53d5dc03624f1a64cfb8733b2ac3260bb295be527238755659b55b5d79b6a49a06c56616517afb2cd56b3f39f5eba8dcc27b61e4a6b5
+DIST python-phonenumbers-8.12.56.gh.tar.gz 4906531 BLAKE2B d55d828a26bc3a86660b6341c9577de6f489d3511971c5a843f10c14c05f0c82340109f13cc86c261119d6598ade95c2c3c9afdea485b09f3f73be891ee2a16e SHA512 675cf8d15536efd156a230cff9e027cdba718a32ca2facb493b235f39dc1a0c86f6a376d3d501690b25a5e52d6d411309626b8ecce9a065456e42774da04ea49
 EBUILD phonenumbers-8.12.54.ebuild 808 BLAKE2B ef45a7f57cab5aa38bb958cae5b0bb0bbca327073d8d4bc41aa56552037a2ae91e5e01b3e6af6e9d948ad4f7edd5ff7fd0808c2a7d742845040fbcd55a6b3b77 SHA512 2786479b7b053e0c900d5548a1339a0d81c0d4c44a25d0b33ce6058e06a872710d7c887d4ee20b7c705065e2a2e4eee6519bb76960902afc45f86c3806819108
 EBUILD phonenumbers-8.12.55.ebuild 810 BLAKE2B 3b18782b7466900c6dcf66ada03d333fefd3df0a6a02bc1417de82a4e692e0baf316db5d1b4bf070d4a73b7f8b5133018c22587f5549fbe8863b8e3ec6859441 SHA512 9f1fc8118ab9fc7284723238e398f9152d6e491bfe0be97fa5b181f1bb30a0d96900c1e1674b6ca325daefb8813bc25dfae44f1ab172361e367725c5a040ba4e
+EBUILD phonenumbers-8.12.56.ebuild 810 BLAKE2B 3b18782b7466900c6dcf66ada03d333fefd3df0a6a02bc1417de82a4e692e0baf316db5d1b4bf070d4a73b7f8b5133018c22587f5549fbe8863b8e3ec6859441 SHA512 9f1fc8118ab9fc7284723238e398f9152d6e491bfe0be97fa5b181f1bb30a0d96900c1e1674b6ca325daefb8813bc25dfae44f1ab172361e367725c5a040ba4e
 MISC metadata.xml 413 BLAKE2B 4fa9965e76205ab35de37314b8c06fae26ccf34a944401e672487d7ad42b0046b4de85c8dd4c500d2703b5ecca49755b3f6d9047a20d7226fdbdf63e0aca3220 SHA512 de88d4162ba8f97748a1d2a17a8bea48f59b84f67c76aec11a9bad8ab0d0b66bc9cc2395dfff446bbad591f52f755a38ccd0daf2480b4f2e22e80ce5d44a42c1
diff --git a/dev-python/phonenumbers/phonenumbers-8.12.56.ebuild b/dev-python/phonenumbers/phonenumbers-8.12.56.ebuild
new file mode 100644
index 000000000000..baab22b23fc7
--- /dev/null
+++ b/dev-python/phonenumbers/phonenumbers-8.12.56.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+MY_P=python-${P}
+DESCRIPTION="Python port of Google's libphonenumber"
+HOMEPAGE="
+	https://github.com/daviddrysdale/python-phonenumbers/
+	https://pypi.org/project/phonenumbers/
+"
+SRC_URI="
+	https://github.com/daviddrysdale/python-phonenumbers/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}/python
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~riscv ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	test? (
+		dev-python/protobuf-python[${PYTHON_USEDEP}]
+	)
+"
+
+DOCS=( ../README.md )
+
+python_test() {
+	"${EPYTHON}" testwrapper.py -v || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/pyupgrade/Manifest b/dev-python/pyupgrade/Manifest
index b2e76217f1aa..91ab6c35b8ab 100644
--- a/dev-python/pyupgrade/Manifest
+++ b/dev-python/pyupgrade/Manifest
@@ -1,3 +1,5 @@
 DIST pyupgrade-2.38.0.gh.tar.gz 63620 BLAKE2B 73f551e92a6d68e0e1e2b1f21a3afd0f26ece7889450135fe7c68ad3ce094799cba669547965ff3c5589f1e667568e8dcf60709e8d1b3699fd36680494b79f96 SHA512 c65534c59f1810730cd039375678c648565023e1fbb03df4bd14846be95757b33d712c51197f54009e907da647a04700dd8d8ff1094188ef7ba0dbf2352084cf
+DIST pyupgrade-2.38.1.gh.tar.gz 63637 BLAKE2B 348346d82f85c8df4edfaf2b09e8e519b5ee1d895920a896ae4c0a23f0af0da338ec2c1c2d2c175977da725313b4b5ace6ced65a3a54f5722146f35986485a9c SHA512 056e9886a8bacaf58d74461a7cbce8b7e67392b6758a7e42363404b4822df837067a7a2ec5da6a97411ce8297955ff260901f95b17d1a9e84835bce755071fca
 EBUILD pyupgrade-2.38.0.ebuild 555 BLAKE2B 46e3ea0d4ddcbee0f27f1754f29eca45cac1cc219f599b5b5eecdf50e924f5ef5fff6425785c046942a1e98185066d6b6b703090dc7b9e917bc6da617751a51a SHA512 79027c18626cca68143da7fa0b88a1f14f5f54cdc5108386a33541eddc49aa891e3483eb354c5c7a94a03c8f36893fde3d55e7b4cf7b54bbbdd5faa28c60037e
+EBUILD pyupgrade-2.38.1.ebuild 560 BLAKE2B c3f69d916c22a42e0142e80e73d026c410db0993b56e93460154c18c6ca3b350b245c32d5638f853e955c63b9b17eaa28827728b7d7fc8178586b22f6bfbf173 SHA512 3a02fe86c170b1495b69db39760ced415cce26f9b871c1e0b5dd4a45b27710a8868d7fc6303c6db0e32fb8f91d13931aac1e48b97804f247cbb08f37e1f64b2d
 MISC metadata.xml 603 BLAKE2B a9513a08115930ae37b1a3dc5bd2c0649e646bfdad961f10478b9575c597ffad2847b13642e9433ed7ffa41a2ffae0410616e7eb1cc2a00dfdc181f98639419a SHA512 f9da5ac513c1ee7e1411642119344abf4d409bffc2b1cac997bee625add8ceb5982931d9cddeee082d1943f405a70bea617b06b3bbc6f3787ea987b8e43554b1
diff --git a/dev-python/pyupgrade/pyupgrade-2.38.1.ebuild b/dev-python/pyupgrade/pyupgrade-2.38.1.ebuild
new file mode 100644
index 000000000000..06b14263e479
--- /dev/null
+++ b/dev-python/pyupgrade/pyupgrade-2.38.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+inherit distutils-r1
+
+DESCRIPTION="Tool + pre-commit hook to automatically upgrade syntax for newer Pythons"
+HOMEPAGE="https://github.com/asottile/pyupgrade"
+SRC_URI="
+	https://github.com/asottile/pyupgrade/archive/refs/tags/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="dev-python/tokenize-rt[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
diff --git a/dev-python/readme_renderer/Manifest b/dev-python/readme_renderer/Manifest
index 60a8f6ff7aa4..0c2c9237c455 100644
--- a/dev-python/readme_renderer/Manifest
+++ b/dev-python/readme_renderer/Manifest
@@ -1,5 +1,7 @@
 DIST readme_renderer-36.0.tar.gz 28680 BLAKE2B e356690bc791d5f4a27ef59c61e356b3932595623434feae8d0fc9cf99d1bd4a724d5c202e47f989017821ce2bd69604338912c37b879699677496b789453c56 SHA512 1e208e830060d2a94e608dbbef36376c7720b8b4e2c8619665e82c64b7111153f4b764c1c7a77b36d3c0d652adb1f49a14bc7306b7bb5c65598db7acec6e984e
 DIST readme_renderer-37.1.tar.gz 29234 BLAKE2B 42a78cb5d19ee1d5cddd1d35c82801468bb2911c49037c4d4a07bc06cb1652046da99e306ed6b2864c2d26569092f824f1b7eeca53c147e6dcf6d60701679de9 SHA512 065dc1ee9baf88cea15d278dc130189b282c4bc04ccdb3d25cba423d4e32d41c8614b978ea96956913b925e1a2bdab0c2c162a369708ec253e8fae275b1c795b
+DIST readme_renderer-37.2.tar.gz 29493 BLAKE2B c517a25b2f48646a38f12cba313fec8e9292c773704f4a7a4790e14d1d403c73ca64883894d1193de582ac80573f331df9f9779d329c67d8e675a777b38e5d46 SHA512 d8bc03ba77eec8ee493705ed9b19d4695630b2f07e342f0e27a3d23c1e9c74e1d33e8a091ef5a82f42de154e7c11da33850c2e158057000c9bc097299f8c4fab
 EBUILD readme_renderer-36.0.ebuild 826 BLAKE2B 07790975b0eeae82f5171b2694c92ab376a2f8195d05c68113e2852ca22c6e86f8a41c4c90d483d8a66253ed2651751f5c19e0f62363338287286afbbaf4b696 SHA512 58c1d989ce5bda468254c7971de1c00ce8f22a8159cf4364f182e589cd89632d7885e755ef276f6eda529aecfd78d65fb8e71ad075dd1e848a7bcb53e825c0f2
 EBUILD readme_renderer-37.1.ebuild 834 BLAKE2B a0917e8b520a5babb97322d4ad68418d431dcc7b12b180a7875c749f38149fe0750ac6f8768e2eb83e94a4b0329d60d2aa5d76d58f74d59918f8a9a415cd6302 SHA512 0746feea0ae0ad4cc1aa10a6b7021c53b24c52cf951c578366a8aa08997973f981557cbdaf464840911f7963251a0aa2a3d0160622536c1751c5fe31bc20b1e4
+EBUILD readme_renderer-37.2.ebuild 774 BLAKE2B 0a90e438312e013b8097b073dae97fd668e230a102d35d2bae59a7e8b3bbf10c09c9a10ff4111547c0f8df1cf9088e35f8c5b572d8978e30c29644b13cf731ac SHA512 26677f7a65e5f004aa073f6250651f0574758585b7cf39f3e2c9c5421a6ce7f397f8f3659efbeda815d0932668386477c5a5548e29ed1411431241dada20bf70
 MISC metadata.xml 416 BLAKE2B 1441314990a3eca464ea227d76e458a42b3c9bf44076f64a59d22cdddaace1fdbe219b3e6f8fb963cc40174aaf473852698facbc8816f55278821df0f452a1ed SHA512 50abec4287629f7982049959696e8f21e0a773618c40b42815d53e709d080ff6051235453a4659c50bd4cf856829d0489cdd0f4e1f56cc65f28d5de45d849b86
diff --git a/dev-python/readme_renderer/readme_renderer-37.2.ebuild b/dev-python/readme_renderer/readme_renderer-37.2.ebuild
new file mode 100644
index 000000000000..7acc6cb8c4f4
--- /dev/null
+++ b/dev-python/readme_renderer/readme_renderer-37.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="a library for rendering \"readme\" descriptions for Warehouse"
+HOMEPAGE="
+	https://github.com/pypa/readme_renderer/
+	https://pypi.org/project/readme-renderer/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	>=dev-python/bleach-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/docutils-0.13.1[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.5.2[${PYTHON_USEDEP}]
+"
+
+DOCS=( README.rst )
+
+distutils_enable_tests pytest
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index 358cbb20b441..a101ea785a06 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -6,6 +6,7 @@ DIST setuptools-65.1.0.tar.gz 2614949 BLAKE2B 89f4556b292afa7b46e558ff059647798a
 DIST setuptools-65.1.1.tar.gz 2615020 BLAKE2B 1c45d7106e5845b95e6eec52b72749f80f799f1c5695b39e79ae7b49f52c0eab39fba305a7d2cb54a852679479db3c512e562b52a931e6a325d640479e5d4399 SHA512 29ec01558d6f6432c82797313cf12f1b3125c2000d9582e89fff415f59362c44fbfa00340cfbc4f7f4f9898161b3b585058115d1bc5b4bbcdfc0991812f858a8
 DIST setuptools-65.2.0.tar.gz 2614890 BLAKE2B a2da0870eaa0d36200dcfcab3fc63ea641d7b8451467ada32e834e94a9d33f84428e517a402d5e64ee999b5b8c2a0fff20044781fa5227ce3e2cc2fcb8f0796a SHA512 84e6e23780e6ef2e0010d4574bebf373f25f6c1e833b4e914f510e2fb3eabdbe1155c8b7d2cfeb93fd59c73fd3ad5b47c7b54e00ffaffa9ea84cf33fa5a6ee69
 DIST setuptools-65.3.0.tar.gz 2615722 BLAKE2B 1344fe17c1c2a4ec60dbf37b3e1cbad56bb5299bed9f8e30a21015f2457e1e90d6782369dfc2d804973e7348d22a356ec0ef75d1aeabba7d77e20e5ddf36e576 SHA512 3c173b1e1a8dbbed0bf3bf600df1256aeabf1b9dec34d5f5d0b1429b0fe16f2aa61fa6c4f400a5b6da24b9d679954866b76e019130bcf2246b138fe017025de9
+DIST setuptools-65.4.0.tar.gz 2615629 BLAKE2B 778b0acf1a447fbc72043113da757d73ca5dc0df8e6be8dceff7e35d64a920793dca6098d8747bd66bfe1159236570bffb6f2545a0f89a2a7916f94f849b89a7 SHA512 4c8c6348fc5e9e2cc2d7b143b050103e7ed4252dd58ca5aae8d50ee9ec522789ecfbe61dd87513d47bfd1d4afc290a7abc07fd0a6e8d27155c6732111702032d
 EBUILD setuptools-63.4.3.ebuild 4145 BLAKE2B d81e28c9628dd01a3249b6d774c081c550f501be6056ac62a36e7208464240269841f78c8ab257132159a0281b60adb95b8203efdd98cbf116ba0b2d84568db9 SHA512 830f2c7c85c4e8e7373075025109b0b37b896f0126ffb3a032a4f57edb694fde68fb48500034a9c58b9e80fec6398909654c53b48881492a3b0193061f07a9a7
 EBUILD setuptools-64.0.3.ebuild 4265 BLAKE2B 90a66c5ece54c235bc5a0a0adc1fe880458bf8629e61f12877bb8fd9fc363f4a1b2e1bedfb9f809229de227dd2ac31b7c42a44b0bc7efa3f11173a58d48d5ee7 SHA512 ad5c82bb94c2c97dd4af5216b1cf1e53bfa9a58445ad5e76dedb346a4bcf5b2e51c2c9eaa03681d4428f8d5b19685b7644c4d9064e7af752d2be13a0b6dc3b67
 EBUILD setuptools-65.0.2.ebuild 4269 BLAKE2B 5df1501305bd2717a5671d8e0d9ec0b0f9b5da733e09d54858884ea3ef1fe0d1444f476295c8a42133e566e9db836d8ccc3be8709b6a35a9a02ab2c3a7a0e1a5 SHA512 3fbf979376dfe61f354af1b80d452203161411eb0538ccc1138852aa5daeac044af3a5a579a1c0f0beec41df16414af0b0f0c25c06a265a36c6e076ee3614fc6
@@ -13,4 +14,5 @@ EBUILD setuptools-65.1.0.ebuild 4269 BLAKE2B 5df1501305bd2717a5671d8e0d9ec0b0f9b
 EBUILD setuptools-65.1.1.ebuild 4269 BLAKE2B 5df1501305bd2717a5671d8e0d9ec0b0f9b5da733e09d54858884ea3ef1fe0d1444f476295c8a42133e566e9db836d8ccc3be8709b6a35a9a02ab2c3a7a0e1a5 SHA512 3fbf979376dfe61f354af1b80d452203161411eb0538ccc1138852aa5daeac044af3a5a579a1c0f0beec41df16414af0b0f0c25c06a265a36c6e076ee3614fc6
 EBUILD setuptools-65.2.0.ebuild 4269 BLAKE2B 5df1501305bd2717a5671d8e0d9ec0b0f9b5da733e09d54858884ea3ef1fe0d1444f476295c8a42133e566e9db836d8ccc3be8709b6a35a9a02ab2c3a7a0e1a5 SHA512 3fbf979376dfe61f354af1b80d452203161411eb0538ccc1138852aa5daeac044af3a5a579a1c0f0beec41df16414af0b0f0c25c06a265a36c6e076ee3614fc6
 EBUILD setuptools-65.3.0.ebuild 4269 BLAKE2B 5df1501305bd2717a5671d8e0d9ec0b0f9b5da733e09d54858884ea3ef1fe0d1444f476295c8a42133e566e9db836d8ccc3be8709b6a35a9a02ab2c3a7a0e1a5 SHA512 3fbf979376dfe61f354af1b80d452203161411eb0538ccc1138852aa5daeac044af3a5a579a1c0f0beec41df16414af0b0f0c25c06a265a36c6e076ee3614fc6
+EBUILD setuptools-65.4.0.ebuild 4269 BLAKE2B 5df1501305bd2717a5671d8e0d9ec0b0f9b5da733e09d54858884ea3ef1fe0d1444f476295c8a42133e566e9db836d8ccc3be8709b6a35a9a02ab2c3a7a0e1a5 SHA512 3fbf979376dfe61f354af1b80d452203161411eb0538ccc1138852aa5daeac044af3a5a579a1c0f0beec41df16414af0b0f0c25c06a265a36c6e076ee3614fc6
 MISC metadata.xml 469 BLAKE2B 4a26769b09a3785586b22db850b7fc5c4818f31c3ace9cc94476d35df05e50edf6721f3c95ec615c3b2efe071ef284a54ea2d53566316ba653f7830bb48f80bf SHA512 dd682c4ad2e59a97094ebdabe4d1063e2319ed05e1fe9d8c2fafe069badb3b4cf8bb6d9f50e09d2128e2a081c1c69827407ac8aed644ebf70eb4ca1bc9a57319
diff --git a/dev-python/setuptools/setuptools-65.4.0.ebuild b/dev-python/setuptools/setuptools-65.4.0.ebuild
new file mode 100644
index 000000000000..c11a0923e907
--- /dev/null
+++ b/dev-python/setuptools/setuptools-65.4.0.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
+EAPI=7
+
+# please bump dev-python/ensurepip-setuptools along with this package!
+
+DISTUTILS_USE_PEP517=standalone
+PYTHON_TESTED=( python3_{8..11} pypy3 )
+PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="Collection of extensions to Distutils"
+HOMEPAGE="
+	https://github.com/pypa/setuptools/
+	https://pypi.org/project/setuptools/
+"
+SRC_URI="
+	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/appdirs-1.4.4-r2[${PYTHON_USEDEP}]
+	>=dev-python/jaraco-text-3.7.0-r1[${PYTHON_USEDEP}]
+	>=dev-python/more-itertools-8.12.0-r1[${PYTHON_USEDEP}]
+	>=dev-python/nspektr-0.3.0[${PYTHON_USEDEP}]
+	>=dev-python/ordered-set-4.0.2-r1[${PYTHON_USEDEP}]
+	>=dev-python/packaging-21.3-r2[${PYTHON_USEDEP}]
+	>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_metadata-4.11.1[${PYTHON_USEDEP}]
+	' 3.8 3.9)
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_resources-5.4.0-r3[${PYTHON_USEDEP}]
+	' 3.8)
+"
+BDEPEND="
+	${RDEPEND}
+	>=dev-python/wheel-0.37.1-r1[${PYTHON_USEDEP}]
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/build[${PYTHON_USEDEP}]
+			>=dev-python/ini2toml-0.9[${PYTHON_USEDEP}]
+			>=dev-python/filelock-3.4.0[${PYTHON_USEDEP}]
+			>=dev-python/jaraco-envs-2.2[${PYTHON_USEDEP}]
+			>=dev-python/jaraco-path-3.2.0[${PYTHON_USEDEP}]
+			dev-python/mock[${PYTHON_USEDEP}]
+			dev-python/pip[${PYTHON_USEDEP}]
+			dev-python/pip-run[${PYTHON_USEDEP}]
+			dev-python/pytest[${PYTHON_USEDEP}]
+			dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
+			dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
+			dev-python/pytest-xdist[${PYTHON_USEDEP}]
+			>=dev-python/tomli-w-1.0.0[${PYTHON_USEDEP}]
+			>=dev-python/virtualenv-20[${PYTHON_USEDEP}]
+			dev-python/wheel[${PYTHON_USEDEP}]
+		' "${PYTHON_TESTED[@]}")
+	)
+"
+PDEPEND="
+	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+"
+
+DOCS=( {CHANGES,README}.rst )
+
+src_prepare() {
+	local PATCHES=(
+		# TODO: remove this when we're 100% PEP517 mode
+		"${FILESDIR}"/setuptools-62.4.0-py-compile.patch
+	)
+
+	# remove bundled dependencies, setuptools will switch to system deps
+	# automatically
+	rm -r */_vendor || die
+
+	# remove the ugly */extern hack that breaks on unvendored deps
+	rm -r */extern || die
+	find -name '*.py' -exec sed \
+		-e 's:from \w*[.]\+extern ::' -e 's:\w*[.]\+extern[.]::' \
+		-i {} + || die
+
+	distutils-r1_src_prepare
+
+	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+}
+
+python_test() {
+	local -x SETUPTOOLS_USE_DISTUTILS=stdlib
+
+	if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then
+		return
+	fi
+
+	local EPYTEST_DESELECT=(
+		# network
+		# TODO: see if PRE_BUILT_SETUPTOOLS_* helps
+		setuptools/tests/config/test_apply_pyprojecttoml.py::test_apply_pyproject_equivalent_to_setupcfg
+		setuptools/tests/integration/test_pip_install_sdist.py::test_install_sdist
+		setuptools/tests/test_build_meta.py::test_legacy_editable_install
+		setuptools/tests/test_distutils_adoption.py
+		setuptools/tests/test_editable_install.py
+		setuptools/tests/test_setuptools.py::test_its_own_wheel_does_not_contain_tests
+		setuptools/tests/test_virtualenv.py::test_clean_env_install
+		setuptools/tests/test_virtualenv.py::test_no_missing_dependencies
+		setuptools/tests/test_virtualenv.py::test_test_command_install_requirements
+		# TODO
+		setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_basic
+		setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_ignore_errors
+		setuptools/tests/test_extern.py::test_distribution_picklable
+		# expects bundled deps in virtualenv
+		setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_in_sdist
+		setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_not_in_wheel
+		setuptools/tests/test_editable_install.py::test_editable_with_pyproject
+	)
+
+	epytest -n "$(makeopts_jobs)" setuptools
+}