gentoo auto-resync : 26:10:2022 - 09:55:31

42 files changed, 996 insertions, 2 deletions

diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 09525c7a3a9a..49c8e786dac2 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/bpython/Manifest b/dev-python/bpython/Manifest
index 8b1547043bc0..5b6b4be21160 100644
--- a/dev-python/bpython/Manifest
+++ b/dev-python/bpython/Manifest
@@ -1,3 +1,4 @@
 DIST bpython-0.23.tar.gz 222241 BLAKE2B eae70242323534dacada4d3d181ec4fba5fd384dc124bec7f28db887d2f1fb5b49ec6bc169d4a93db9de88dee82d714d502f2b2b1de5d9d01073f7504430cc23 SHA512 b25b68a690b838fef0c5dbb05565db4373ebb3611278b9f94db792ef25a43f59e3e9b7ac1ad0f571ae442948748b6c5e28888c6aa0f592cdf8499223cfded217
+EBUILD bpython-0.23-r1.ebuild 1161 BLAKE2B 28282068a0669f57e70ae8a57cb3533f2af877b978e64ec10b575905b9af1da63db710fbe6ad6d1034c816045ec0f94287fd99dc9e78db16ed96feb6e898a6ce SHA512 5631358cf26602a5f5f1b01cbfb700837c420b9753a9711a054ed44afb9d89d3727c87121617f828022f802218e854e1972146bf805d372013f4d4dde31f30cc
 EBUILD bpython-0.23.ebuild 1212 BLAKE2B dc94f2f28a65b0f0bebdb58275ce816456e72634f45502538502d675fcdc05695bc0834c20e3982aad4d0d63de02a7ecfb8e024697aaff704b1923dbb0d803dd SHA512 7879958ab5dad7a499e00dc56a7dcb101d54a047cb59782dda4a8cbfde9c5af833c18f1f62ea03148332d1a78d4b7f990919f1118f64531daa4e418441933465
 MISC metadata.xml 866 BLAKE2B 0abfdfadfdd88b477380ca383047987b12e2a4f6f8e666e1e8ac9a245da606fe587fec0ff406e0784396e41f8897dba84b02618b63fb8ffe56dbdb990b1bd2d4 SHA512 cc3b9f87ae93e16094cf7a227e5bd84db52f82dc7ed5e36d5d0f6b07a7242e314dcf8911e12ebf6d1e6574ff7d05833798b9a095d0696094b93941aaf68da45f
diff --git a/dev-python/bpython/bpython-0.23-r1.ebuild b/dev-python/bpython/bpython-0.23-r1.ebuild
new file mode 100644
index 000000000000..1bcd139c79b6
--- /dev/null
+++ b/dev-python/bpython/bpython-0.23-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Syntax highlighting and autocompletion for the Python interpreter"
+HOMEPAGE="
+	https://www.bpython-interpreter.org/
+	https://github.com/bpython/bpython/
+	https://pypi.org/project/bpython/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="clipboard +jedi watch"
+KEYWORDS="~amd64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/curtsies-0.4.0[${PYTHON_USEDEP}]
+	dev-python/cwcwidth[${PYTHON_USEDEP}]
+	dev-python/greenlet[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/pyxdg[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	clipboard? ( dev-python/pyperclip[${PYTHON_USEDEP}] )
+	jedi? ( dev-python/jedi[${PYTHON_USEDEP}] )
+	watch? ( dev-python/watchdog[${PYTHON_USEDEP}] )
+"
+# sphinx is used implicitly to build manpages
+BDEPEND="
+	dev-python/sphinx[${PYTHON_USEDEP}]
+"
+
+DOCS=( AUTHORS.rst CHANGELOG.rst )
+
+distutils_enable_sphinx doc/sphinx/source --no-autodoc
+distutils_enable_tests unittest
diff --git a/dev-python/cfn-lint/Manifest b/dev-python/cfn-lint/Manifest
index c3ee340d0a9e..c6602cd9fa93 100644
--- a/dev-python/cfn-lint/Manifest
+++ b/dev-python/cfn-lint/Manifest
@@ -1,7 +1,9 @@
 DIST cfn-lint-0.67.0.gh.tar.gz 9787161 BLAKE2B 5299c956e7ca7c63c0c7608d51b01487cf4669f7af54c33f3d9917feae85565a2ce73a96a8d0a5d32cfe1c0a6db6d61b118f2994bb66700145787b650eefe6ea SHA512 35d4686da1f610a970dc1976d7a72ff58c884446f5967b069cc4826b2d9a1b75e2b8a10e676585009c918317186b4dac1c6dc78bf26215eefd5aadd4dce03e0e
 DIST cfn-lint-0.68.1.gh.tar.gz 9858724 BLAKE2B 469a23daa717add95140913d85861df44445464d80291430ec42aa2a83c2e125fc395428033c5b82c571297200b28412cc8531bf8e26a0491acfbc5536037cd6 SHA512 a81a1877b9efea411b71d485e66965ca6427998ea13d088c67849a2e8c3f9dd1c125ba0531cb48a27ad75638bde54270654b6da8576fc2fdb15088a0bfb543fe
 DIST cfn-lint-0.69.0.gh.tar.gz 9862506 BLAKE2B 68e6e5e93d7f07bda3eedda71d79943ef97fd0c2e972f475380f7943f88d843effa8cd23b4534bcf4ce0918ca7a634ecf32cef7c309711f9dbc6f899324f3f97 SHA512 9972fb1be897451116e269245d7302af31a53e54c1615daa65bd6b71b9a0ff3f62c1068d86c239510737ac95a6ab3ba2746838792680f701a404008f35857c64
+DIST cfn-lint-0.69.1.gh.tar.gz 9871037 BLAKE2B a6c4d1b3b892eee01231771dfbe7831737f8f6f89cf096a4ea0c1b945aa47574a51938d4b8ecdd7e3c2cd18df87ba343c07f3e379b49b78b07d7ec676f12e0d1 SHA512 1823485a0d2273a6a1c6632944a095bc4f9b7999f4e0dc81a47cb8673a3d02f822865b08ca3dfcf518b38a9c68a0f0bc5c3235904aca5ce94919ec627b9c3ddc
 EBUILD cfn-lint-0.67.0.ebuild 1638 BLAKE2B a439d73d2d83ca8489c2bcbf2c1034f650ad4216d6600e2163c60976ef0133fba36316e9cb263dbb7c3d12d756d8cad188c762732952d0392371a8e74bb58743 SHA512 1426c30e2dc1d63b765a109ee707fa8d466046789694cc1d3afa111c3263b3da11560c72ec6fdd180f213bd5619d9bc5f9b23bd0e9d230eef66d24b647fd2acf
 EBUILD cfn-lint-0.68.1.ebuild 1640 BLAKE2B ec6a9bdbdbb86461f0f2acb66fd1734ea65367182fef0d7b0baf080350972f8c701fa18d7b52bc4b243f5565c5b1ef0f98232bc8e9fcab71d19ffef9d413f016 SHA512 2bf2da99cc45b67e70c61127f855007d89bf82af5e39af3d48099da70794b83e1b2e959c1d89cf832fef080beee3d80a8f758cdb0a2b30a8f41c55d323cd97b7
 EBUILD cfn-lint-0.69.0.ebuild 1640 BLAKE2B ec6a9bdbdbb86461f0f2acb66fd1734ea65367182fef0d7b0baf080350972f8c701fa18d7b52bc4b243f5565c5b1ef0f98232bc8e9fcab71d19ffef9d413f016 SHA512 2bf2da99cc45b67e70c61127f855007d89bf82af5e39af3d48099da70794b83e1b2e959c1d89cf832fef080beee3d80a8f758cdb0a2b30a8f41c55d323cd97b7
+EBUILD cfn-lint-0.69.1.ebuild 1640 BLAKE2B ec6a9bdbdbb86461f0f2acb66fd1734ea65367182fef0d7b0baf080350972f8c701fa18d7b52bc4b243f5565c5b1ef0f98232bc8e9fcab71d19ffef9d413f016 SHA512 2bf2da99cc45b67e70c61127f855007d89bf82af5e39af3d48099da70794b83e1b2e959c1d89cf832fef080beee3d80a8f758cdb0a2b30a8f41c55d323cd97b7
 MISC metadata.xml 583 BLAKE2B 9f73e2b92e5cfa2ad59f5c8e5d91bdd3aa9eba3fa722b93b388cffea42020db7e7441bab5749432812934a4514d3e9104e6d897e1d115afa5ed237757bd48c03 SHA512 1866a349855ae4e248498b7aabd6ce4c4e10ea58731df4bfa13500f61dc041da6dbd7420e7d6a78fad46d5cf00bd7ef2d0c4c7d6819a21b3a5031b0d49588a19
diff --git a/dev-python/cfn-lint/cfn-lint-0.69.1.ebuild b/dev-python/cfn-lint/cfn-lint-0.69.1.ebuild
new file mode 100644
index 000000000000..0916420e1790
--- /dev/null
+++ b/dev-python/cfn-lint/cfn-lint-0.69.1.ebuild
@@ -0,0 +1,54 @@
+# 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="CloudFormation Linter"
+HOMEPAGE="
+	https://github.com/aws-cloudformation/cfn-lint/
+	https://pypi.org/project/cfn-lint/
+"
+SRC_URI="
+	https://github.com/aws-cloudformation/cfn-lint/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/aws-sam-translator-1.53.0[${PYTHON_USEDEP}]
+	dev-python/jsonpatch[${PYTHON_USEDEP}]
+	>=dev-python/jschema_to_python-1.2.3[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
+	dev-python/junit-xml[${PYTHON_USEDEP}]
+	dev-python/networkx[${PYTHON_USEDEP}]
+	>dev-python/pyyaml-5.4[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.15.0[${PYTHON_USEDEP}]
+	>=dev-python/sarif_om-1.0.4[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# TODO
+	test/unit/module/test_template.py::TestTemplate::test_build_graph
+	# requires git repo
+	test/unit/module/maintenance/test_update_documentation.py::TestUpdateDocumentation::test_update_docs
+	# Internet
+	test/unit/module/formatters/test_formatters.py::TestFormatters::test_sarif_formatter
+	test/unit/module/maintenance/test_update_resource_specs.py::TestUpdateResourceSpecs::test_update_resource_specs_python_2
+	test/unit/module/maintenance/test_update_resource_specs.py::TestUpdateResourceSpecs::test_update_resource_specs_python_3
+)
+
+src_prepare() {
+	# unpin the deps
+	sed -e 's:~=[0-9.]*::' -i setup.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/google-auth-oauthlib/Manifest b/dev-python/google-auth-oauthlib/Manifest
index f7926ade1cce..6a48d0731dc1 100644
--- a/dev-python/google-auth-oauthlib/Manifest
+++ b/dev-python/google-auth-oauthlib/Manifest
@@ -1,7 +1,9 @@
 DIST google-auth-library-python-oauthlib-0.5.2.gh.tar.gz 53842 BLAKE2B 7adcd9f339ec9a5528308fcc0fee1cbbe96440e1bfe5c7cc9c94808668e22801b612d291a2419333888194c3224838ac40f9d0656381825bd660067470f58910 SHA512 eaf296a0e0504e8249637a8db7531c10b120f28abeeab3e1fe8f366b4279c396509188e83f8a0ec56be85063430ceb691d6d926cee33d4f166bbcc4425e538db
 DIST google-auth-library-python-oauthlib-0.5.3.gh.tar.gz 69613 BLAKE2B 74338894f35fd1cd8802ea56952561ce0e801fecb2f994b71caf3c6b62a22e8b85f8a5b40f5571b05225a565b373865377d321625aeea2dafcc0cafb89da1492 SHA512 76c855e9becd57d3cb3bb0b203ad77ef17dc04e8be8b96d17a9c1f29474a8b180edb725e835d0552c5eddbb387cc463e88b076dd6d11635e6d45798224f09188
 DIST google-auth-library-python-oauthlib-0.6.0.gh.tar.gz 70025 BLAKE2B 2d87390a629d967b0f2aef5f56712d3defc2b460a67f2bf633bb628875161f9ddbb4f229426ce2b42dcf805feefe8101ed3bacd72ced630c0be4fe40bd926c7e SHA512 1aa42498a5875812db922b30eb20cdf124935f95f5cabd224acfb82c9ed61714cfc3c6af2168e75cf11aaa8550e41c48f30fc1d467d1b7be511bf5cb522104e8
+DIST google-auth-library-python-oauthlib-0.7.0.gh.tar.gz 70179 BLAKE2B d0e70d796c11a0f3a9be8dba58dc030ef1dfd6dc3dd13e3dc74530c5d1edba3863b7a9bb4c1f90879b70a585f1d193344dea96aa45fbb08a7e28a25a31a22b6f SHA512 fe33b0a4528f6f6602b73de50c017779e7aba5d8891ef43cb3350d337e3e62a78a4126479fae0a8732dd7c4bd35210182f4a1b7f61da06af043dfff7d91ffe24
 EBUILD google-auth-oauthlib-0.5.2.ebuild 876 BLAKE2B 97153977e671f5a8e24315290ce154c41bf478add7b9103141df177381631adfb7a4e7001888a8362ee09f11213c1d461b480436d649d59f9f089ff95c1a25db SHA512 eb04ca36f3939bf0f76b0118ba8c629e39b9bec056c5afd322a2d73b3d655d9af6c2786db17b16f0f7010e0e9f150c14f11cc56671b43e3f876e4477f8ed48b9
 EBUILD google-auth-oauthlib-0.5.3.ebuild 876 BLAKE2B 97153977e671f5a8e24315290ce154c41bf478add7b9103141df177381631adfb7a4e7001888a8362ee09f11213c1d461b480436d649d59f9f089ff95c1a25db SHA512 eb04ca36f3939bf0f76b0118ba8c629e39b9bec056c5afd322a2d73b3d655d9af6c2786db17b16f0f7010e0e9f150c14f11cc56671b43e3f876e4477f8ed48b9
 EBUILD google-auth-oauthlib-0.6.0.ebuild 876 BLAKE2B 97153977e671f5a8e24315290ce154c41bf478add7b9103141df177381631adfb7a4e7001888a8362ee09f11213c1d461b480436d649d59f9f089ff95c1a25db SHA512 eb04ca36f3939bf0f76b0118ba8c629e39b9bec056c5afd322a2d73b3d655d9af6c2786db17b16f0f7010e0e9f150c14f11cc56671b43e3f876e4477f8ed48b9
+EBUILD google-auth-oauthlib-0.7.0.ebuild 877 BLAKE2B e01c55a12bf9897a5df0d230a0e9d9266b3de3a1c2c6b1a5623bc94f46c5ab5435a6e26acd88fd5bb952bfb7a68b08d7fd56948511852fd4b0587519014a29b6 SHA512 043abcce2d9143bd5c029b9eb7ebeb006bcc4153f7d2adffccbcd2d381325432d76cfd6d553c4dc0f25a760944d828ce3b10b2ed80713df6dd256f5dbcbe3542
 MISC metadata.xml 410 BLAKE2B 23af42a2aa614f119e10cf5d57c3c37abb69ad8d9b1e16445fb92c9f00bdd78f6b1a6a51dff4ebb98bbb03e0002e73eb68cffcf857372dd94848187637c60219 SHA512 c19dd3af098644d5068ec677be51615885bb1267ba9bfb867609725e2a824a74934e2fe25909ea7406c91ca405d44e4c7191a14d3d1bc7b3a60c29445456d3d1
diff --git a/dev-python/google-auth-oauthlib/google-auth-oauthlib-0.7.0.ebuild b/dev-python/google-auth-oauthlib/google-auth-oauthlib-0.7.0.ebuild
new file mode 100644
index 000000000000..9f0dd721dba7
--- /dev/null
+++ b/dev-python/google-auth-oauthlib/google-auth-oauthlib-0.7.0.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=google-auth-library-python-oauthlib-${PV}
+DESCRIPTION="Google Authentication Library"
+HOMEPAGE="
+	https://github.com/googleapis/google-auth-library-python-oauthlib/
+	https://pypi.org/project/google-auth-oauthlib/
+"
+SRC_URI="
+	https://github.com/googleapis/google-auth-library-python-oauthlib/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/click-6.0.0[${PYTHON_USEDEP}]
+	>=dev-python/google-auth-2.13.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-oauthlib-0.7.0[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/ipykernel/Manifest b/dev-python/ipykernel/Manifest
index 4ff4440502c8..04f8b9d643c2 100644
--- a/dev-python/ipykernel/Manifest
+++ b/dev-python/ipykernel/Manifest
@@ -1,7 +1,9 @@
 DIST ipykernel-6.15.3.tar.gz 136470 BLAKE2B 45279a6cfc85c3c2bafe9913b78077a3212bc61b961824f449cdf6ed6a34fe777e0fef1585bc7e4062f4e73124efd24a1c6a16e4168a03d31420836105c3ba55 SHA512 52e9b20b4b9ce691a42a64f535b41b9567a9849c87c0c9903d0b14dc6a00c57ab42d93b6bca8d955be8a31354722268006ce8b576664eb8a4b7f6a3400164c1d
 DIST ipykernel-6.16.0.tar.gz 136212 BLAKE2B efb779c4585d5594dcf8beaf03f2cd0174aa3b22e184a4c5f54e0e9e97f5bcb81af27c19f503a8b8883720a4380bfb483a952858a75c5b08b19030cc84c0cbec SHA512 04c43c83d17f451b7139e3f7301b35598ff3644ac1542bed9eb2584a558ee202e66c3e36553f96484bb4ee5cc369cfe2ad2bf0054799ad29ffd0e065bdcade98
 DIST ipykernel-6.16.1.tar.gz 136501 BLAKE2B 01f335319a7fe3749f770a721bd287f357dd9d5a948368d6495642607eb43f085f529be8759cfaa72acddc4973b814599492b9a87632d48373564f668696264c SHA512 748e538a99db913bf5fa8a3bfd83f59f4209e84e262f0fbb93d65100dd70502315ba7fafa7e55445c58f5de38c09e6d155b4ec9ed12e2ac53214e041e7345aa5
+DIST ipykernel-6.16.2.tar.gz 136606 BLAKE2B 596cae97c6e4d170c51a2f2f481c306a93833cf62959837bde129ed080f70e730cb083ff0a608b7539f633898b7f79f8c5ee3495580fe2821382f0be10417ccc SHA512 3a3bae6cc8ace33b7b8c9d335c7da73c1983824b74b29b77c14cbe24239d556c9c967a759a37a60745823cb6ab698a21262457082464cf33ec1b02ebbe2240d9
 EBUILD ipykernel-6.15.3.ebuild 2058 BLAKE2B 324e8d1609ee1eb272589138f8f22822a9fafbd836dbfbbfc2e710fb3e9cbb602564071c3e2f8904cf0a6f3c6770279517fd51152dfdddc7b13e001084020d85 SHA512 3f757852e4ca13da13ccdfa0615fe6342d3605ca447431eb35c80b44cb8cb36f57bef1bd12f0afbd2175dca461d0d23d8f9ccf194227634cf4fdfb0fb735aa79
 EBUILD ipykernel-6.16.0.ebuild 2107 BLAKE2B 1c64d458e4fbf2f3775c635a1a7e575a03a3b597ec02df0f545c2525a62a5d67ef16ee2c010d0de8b4899848197783977a466fdfdb449eaada78b5c134881e1f SHA512 f88cfc3f92a72f8b06b7ca89874c8ee650a2cfbe738fcb6e7d6a820cb7ddd5500f9442dd82c1d01bc5862ab84e9c7e49abb22625e7d346e61b6ea2ae883b799e
 EBUILD ipykernel-6.16.1.ebuild 2107 BLAKE2B 1c64d458e4fbf2f3775c635a1a7e575a03a3b597ec02df0f545c2525a62a5d67ef16ee2c010d0de8b4899848197783977a466fdfdb449eaada78b5c134881e1f SHA512 f88cfc3f92a72f8b06b7ca89874c8ee650a2cfbe738fcb6e7d6a820cb7ddd5500f9442dd82c1d01bc5862ab84e9c7e49abb22625e7d346e61b6ea2ae883b799e
+EBUILD ipykernel-6.16.2.ebuild 2107 BLAKE2B 1c64d458e4fbf2f3775c635a1a7e575a03a3b597ec02df0f545c2525a62a5d67ef16ee2c010d0de8b4899848197783977a466fdfdb449eaada78b5c134881e1f SHA512 f88cfc3f92a72f8b06b7ca89874c8ee650a2cfbe738fcb6e7d6a820cb7ddd5500f9442dd82c1d01bc5862ab84e9c7e49abb22625e7d346e61b6ea2ae883b799e
 MISC metadata.xml 527 BLAKE2B 4a24cb9d5b801bf94c71c47d0c90b04bc249fb41a794c7b688a5762f08545d1fcfe9e4976aa4f583ecb456458b5f6dfc394349633959444584c0abad0da4be42 SHA512 ed9f0ef12ec5de67a646783243555f1737604a84c78c57b9f7c65137cec8cbc396991411501927f92bd393daad2238c27363ecc9c115031450231c2a4fb2cbb9
diff --git a/dev-python/ipykernel/ipykernel-6.16.2.ebuild b/dev-python/ipykernel/ipykernel-6.16.2.ebuild
new file mode 100644
index 000000000000..d474b45cde71
--- /dev/null
+++ b/dev-python/ipykernel/ipykernel-6.16.2.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="IPython Kernel for Jupyter"
+HOMEPAGE="
+	https://github.com/ipython/ipykernel/
+	https://pypi.org/project/ipykernel/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/debugpy-1.0[${PYTHON_USEDEP}]
+	>=dev-python/ipython-7.23.1[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_client-6.1.12[${PYTHON_USEDEP}]
+	>=dev-python/matplotlib-inline-0.1[${PYTHON_USEDEP}]
+	dev-python/nest_asyncio[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	>=dev-python/pyzmq-17[${PYTHON_USEDEP}]
+	>=dev-python/tornado-6.1[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-5.1.0[${PYTHON_USEDEP}]
+"
+# RDEPEND seems specifically needed in BDEPEND, at least jupyter
+# bug #816486
+BDEPEND="
+	${RDEPEND}
+	test? (
+		dev-python/flaky[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		dev-python/ipyparallel[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# TODO
+	ipykernel/inprocess/tests/test_kernel.py::InProcessKernelTestCase::test_pylab
+	ipykernel/tests/test_debugger.py::test_attach_debug
+	ipykernel/tests/test_debugger.py::test_breakpoint_in_cell_with_leading_empty_lines
+	ipykernel/tests/test_debugger.py::test_rich_inspect_at_breakpoint
+	ipykernel/tests/test_debugger.py::test_rich_inspect_not_at_breakpoint
+	ipykernel/tests/test_debugger.py::test_set_breakpoints
+	ipykernel/tests/test_debugger.py::test_stop_on_breakpoint
+)
+
+src_prepare() {
+	sed -i -e 's:^TIMEOUT = .*:TIMEOUT = 120:' ipykernel/tests/*.py || die
+	distutils-r1_src_prepare
+}
+
+python_compile() {
+	distutils-r1_python_compile
+	# Use python3 in kernel.json configuration, bug #784764
+	sed -i -e '/python3.[0-9]\+/s//python3/' \
+		"${BUILD_DIR}/install${EPREFIX}/usr/share/jupyter/kernels/python3/kernel.json" || die
+}
diff --git a/dev-python/jupyter_client/Manifest b/dev-python/jupyter_client/Manifest
index ec23a118488e..d767facd208d 100644
--- a/dev-python/jupyter_client/Manifest
+++ b/dev-python/jupyter_client/Manifest
@@ -2,7 +2,9 @@ AUX jupyter_client-7.0.6-test-timeout.patch 1270 BLAKE2B c039b22d8f0c2893738a1b8
 DIST jupyter_client-7.3.5.tar.gz 326758 BLAKE2B c2ac76eb6511b29c38d7e7441e1191bae1f931da27f2eb95d6cb842a0e36f36a6f7a1421253b62abf52243f9fdad36b34828e6d5cd13a0411fa4ce09b447c3bc SHA512 5a3471fe03f44671fc2a06f8c78c11197084c8c951a1f8b55b89d651a6aea2ae1bdbb451ed463e52519954e7dba99b4e2298a6511eef2a3618f095dc864758d9
 DIST jupyter_client-7.4.2.tar.gz 327079 BLAKE2B 71e1f2d7a84a308b37105887ab7851e1f8a8e1f3019d937ec2c48493396dd757f3b7bcd75be180187f2a2855f20f5c0db924b058d316a34d503a2964c63b65c9 SHA512 4e22cb0dccdc96d16c560dba2f9b19616015143d5bd709b9dafed9fa2419ab3d8e6f9091f8a94ab78a0a1d16db2db86def23300b6a39485c0c978f145da4eb47
 DIST jupyter_client-7.4.3.tar.gz 327186 BLAKE2B 04b601d0b492879b2a5f06c53610a354c640376707188fb75394df42ee4ea426ff87a9df5537e242115ea86a9db64bb625b0911407bfe5b00d667843cd78118a SHA512 620ebd31518b6161a32503c1fbb1f18c11e50c15bafd6a46747cc5de682d025aad626fae226ddcf9f2843fa9eb3580825c08474f7309906738da7a02c8d75193
+DIST jupyter_client-7.4.4.tar.gz 327373 BLAKE2B 02f70be181779352706f86515f705addbf68383f16d899a4d30c9d6cb0970e955435a8c934f611f93c9fe2eeb5c0fe3b124f31571ae396995564fb450bf03201 SHA512 6de3b271be03ff90d906fc176ce107799abbf8ac882d32d26d86ab91fd3f8a6fa09e5df4f3955e00bc939a31472d423a0d74396f8ba473440c4bc17cc1a28c2f
 EBUILD jupyter_client-7.3.5.ebuild 1201 BLAKE2B 1bb5254e1b8e6abacb76347519bdc9f253266d78a73632b6e59e96ab78e06f5f4f374f0a714cfbebaa8af1d846832f2d2858829c2d71168753612839cc739ff0 SHA512 25b1ca50613961e8c2160d105dd5639a3314ee1d306a4008fe79d377e5f5fcad496ecfd6c55cce976898fa680792c867bb26c45f3ffdbcff2eef4d03c8fa4f58
 EBUILD jupyter_client-7.4.2.ebuild 1209 BLAKE2B 4a526660630dfef0bd566a2139f6738cf40fd16e899d65a2f626c0c51ce9b50e6ac427bf74e91508081302b87eb06b743c524f29f46223f70a90760c2c07bf81 SHA512 684fadb1a2c4512f97fe576c44fa8a1baf8ee0b30529c26a2c615ac3989e2d77196fb3d6f303463e770be767109d3f0a47ba1000604bdf033a748ff8ffdb7181
 EBUILD jupyter_client-7.4.3.ebuild 1210 BLAKE2B 3b5fff2fc4927e1a7ec473e07203f8d476ee22f088e5ab66def6771b2e7f4019d3ac3dbb2c0c0abfd35bf68003558bbfa93b5142596764ece4d981974b815855 SHA512 021767266d1ab448bfb0fe09c1a7987469d2938d545a8c3c3d850419bc1043374baaf490b549b021d463db0c7a5703132a058ed56323246a6d3b06d5da048755
+EBUILD jupyter_client-7.4.4.ebuild 1210 BLAKE2B 3b5fff2fc4927e1a7ec473e07203f8d476ee22f088e5ab66def6771b2e7f4019d3ac3dbb2c0c0abfd35bf68003558bbfa93b5142596764ece4d981974b815855 SHA512 021767266d1ab448bfb0fe09c1a7987469d2938d545a8c3c3d850419bc1043374baaf490b549b021d463db0c7a5703132a058ed56323246a6d3b06d5da048755
 MISC metadata.xml 844 BLAKE2B 8beea01f144f8e28b58b1bd4d0d2a32eda4b5e50e479c83ed940cd6894d581aa22418bc2733910465cb6980134c3a29b63a6e31f595d037b9492337285837ac6 SHA512 73f427cc561e728c6f941052a4b6f9c6ec5c9d6ba3bb601bc58313687dfc8d6ed3602e1fb2f7f0ea00aec4360c8c1200334675917d22092ed79585b117865ebd
diff --git a/dev-python/jupyter_client/jupyter_client-7.4.4.ebuild b/dev-python/jupyter_client/jupyter_client-7.4.4.ebuild
new file mode 100644
index 000000000000..58a093cf850d
--- /dev/null
+++ b/dev-python/jupyter_client/jupyter_client-7.4.4.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Jupyter protocol implementation and client libraries"
+HOMEPAGE="
+	https://jupyter.org/
+	https://github.com/jupyter/jupyter_client/
+	https://pypi.org/project/jupyter-client/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/entrypoints[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_core-4.9.2[${PYTHON_USEDEP}]
+	>=dev-python/nest_asyncio-1.5.4[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.8.2[${PYTHON_USEDEP}]
+	>=dev-python/pyzmq-23.0[${PYTHON_USEDEP}]
+	>=dev-python/tornado-6.0[${PYTHON_USEDEP}]
+	dev-python/traitlets[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		>=dev-python/ipykernel-6.12[${PYTHON_USEDEP}]
+		dev-python/ipython[${PYTHON_USEDEP}]
+		>=dev-python/pytest-asyncio-0.18[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-7.0.6-test-timeout.patch
+)
+
+distutils_enable_tests pytest
diff --git a/dev-python/k5test/Manifest b/dev-python/k5test/Manifest
index 741d9de34986..aa7c5dbe65a7 100644
--- a/dev-python/k5test/Manifest
+++ b/dev-python/k5test/Manifest
@@ -1,3 +1,4 @@
+AUX k5test-0.10.1-which.patch 1399 BLAKE2B 0ddd4f99103c94c4e73eb3be54c1844206b366e99bcc1a026ee6981fb1a02f09e98061ee79a03dff91f8fba16945141cb64025b1416f4ded03c1d672768d4b88 SHA512 fd699ffe140a90a961a18b1df30eec08b7fb4d4ade24a23d5d6586bd76dbc15e4c2b5a9b342346d81eab0d7d3bcbae9a62489423de641c26414cc964c9586009
 DIST k5test-0.10.1.tar.gz 13664 BLAKE2B 4be24a8c9b154f5ec7b83b6743d0f756cb813bdfe4496c6f8ed873a2fc5a725c17b34f7b243d106d7a985aa53351f9bdc354fabba6a8c5fa3d25927513441cb4 SHA512 eaf451f0a932fdb8758f23e17ec52b2c1617074f186dddfba1d9c6844291fb2f4b003e05f4a0e02ce1bae37ee4251ea8295d2ebc8d9002c83d3179000fa4785e
-EBUILD k5test-0.10.1-r1.ebuild 479 BLAKE2B 01ae8e651203cf165a4dc7f7a163ce5036a00aaf0d2638533feb7b9353d8c0ff7ca10c86770f2315d21d56a7d8cf41a8ed5ed9b5bbcd6df093a2aeac8d15317c SHA512 de3422fb304b01735cc2d26bd1d6fa44e29e20f1b6475809881abaa17fc6aa56697caf47377efdfe2ef7d2dcba0fbe75c85e93a146e3296414fe66a6811de0e4
+EBUILD k5test-0.10.1-r2.ebuild 530 BLAKE2B a4c87827876715a4135958971a8c5dd6c572cfaa9dea1a2e38023602d5840a5977ff7311f37300f367651d486d507331383f7bb92c2b214e1b31f8cac500a81d SHA512 fcc787ef30afae89d07e4fe4776b36bb641ce4e2e3e88decd48db4890221862021f4038862f71d10c04e96f6ff150e9f5c778a439ab178563567f37524c0bb62
 MISC metadata.xml 393 BLAKE2B dc1fec37db82ae2baa97fe324533b9105879142442ac6072b20721dc5233981d726fa56dbefaa0d51b85917ba64110395c2f7c57a9d8e88cb8ecb5bd9d116996 SHA512 b8dd2d38e1d2d95d9fac8a77be33973457a64afc771f3122f161db721b2b1ed71a9e569e498bd85494e498dba340e9a7d3137ea1c239d9ba8d8c19332ebfb1be
diff --git a/dev-python/k5test/files/k5test-0.10.1-which.patch b/dev-python/k5test/files/k5test-0.10.1-which.patch
new file mode 100644
index 000000000000..c5a72b5dc091
--- /dev/null
+++ b/dev-python/k5test/files/k5test-0.10.1-which.patch
@@ -0,0 +1,41 @@
+From cff2138124cb7461fe2b1a270d0c0132e6f66f6b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Wed, 26 Oct 2022 05:31:22 +0200
+Subject: [PATCH] Use built-in shutil.which() instead of which(1) tool
+
+Use the built-in shutil.which() function that is available since Python
+3.3 instead of the external which(1) program.  The latter is not part
+of POSIX and may be missing entirely (Gentoo is activately working
+towards removing it)>
+---
+ k5test/realm.py | 11 ++++-------
+ 1 file changed, 4 insertions(+), 7 deletions(-)
+
+diff --git a/k5test/realm.py b/k5test/realm.py
+index 8b24141..2260258 100644
+--- a/k5test/realm.py
++++ b/k5test/realm.py
+@@ -68,16 +68,13 @@ def _cfg_merge(cfg1, cfg2):
+ 
+ 
+ def _discover_path(name, default, paths):
+-    stderr_out = subprocess.DEVNULL
+-    try:
+-        path = subprocess.check_output(["which", name], stderr=stderr_out).strip()
+-        path = path.decode(sys.getfilesystemencoding() or sys.getdefaultencoding())
++    path = shutil.which(name)
++    if path is not None:
+         _LOG.debug(f"Using discovered path for {name} ({path})")
+-        return path
+-    except subprocess.CalledProcessError as e:
++    else:
+         path = paths.get(name, default)
+         _LOG.debug(f"Using default path for {name} ({path}): {e}")
+-        return path
++    return path
+ 
+ 
+ class K5Realm(metaclass=abc.ABCMeta):
+-- 
+2.38.1
+
diff --git a/dev-python/k5test/k5test-0.10.1-r1.ebuild b/dev-python/k5test/k5test-0.10.1-r2.ebuild
index cd681b4fed98..aa48a24cd102 100644
--- a/dev-python/k5test/k5test-0.10.1-r1.ebuild
+++ b/dev-python/k5test/k5test-0.10.1-r2.ebuild
@@ -5,12 +5,20 @@ EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{8..11} )
+
 inherit distutils-r1
 
 DESCRIPTION="Library for testing Python applications in Kerberos 5 environments"
-HOMEPAGE="https://pypi.org/project/k5test/ https://github.com/pythongssapi/k5test"
+HOMEPAGE="
+	https://github.com/pythongssapi/k5test/
+	https://pypi.org/project/k5test/
+"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 ~arm arm64 ~riscv x86"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-which.patch
+)
diff --git a/dev-python/krb5/Manifest b/dev-python/krb5/Manifest
index 77ff9c51d223..9904413c3d09 100644
--- a/dev-python/krb5/Manifest
+++ b/dev-python/krb5/Manifest
@@ -1,3 +1,5 @@
 DIST krb5-0.4.0.tar.gz 218774 BLAKE2B 44bfe2226eda7b9175b059d4e634c64870ad03a34dcc6595bf7770e21e83b11b000a2bf076a749f88cfb0912b3dcc28974db1ba1273c03bcfab63a868c2165ed SHA512 d51b58b84985ccbb5440bea71a09c23889dd8ee2b14fa594f0f2330b0e318993e8c9627f5cc568585fe5e86847a3eb5f4a4775ea07d7936c03f69ce0fd141950
+DIST krb5-0.4.1.tar.gz 218745 BLAKE2B 8b7e6ab921462ec03c4ca23d83dcfbb8f03b2538edac1a920e68bc3f53c518c942a5f54a96c201a11667e0f4d82882d321808683efa0e5ed1d00df569aa73f2f SHA512 089b3abf3a9402248ed04ab4b47672e0de88c5c73c0c705ac129e499ff53931ffcf7fc6a6bdf9b0f9e03e9010f25dcc61b9a2d33c6b67f5b741a477fb5199265
 EBUILD krb5-0.4.0.ebuild 595 BLAKE2B aeb73041409fe9acc2b19a75bc89c773e8ef088c12471866600bd18432d85703775e515c49019de9624570fc52d6d13e95ecc9aae27251c2433e4ef579bcc9d0 SHA512 cfb552fe44a27bf7e4935d1c6b0e49419394775e1dbb1fcf5bd0d8a567de654455c320b9712083da5bcaa4a4a24ffc24366309162731f0ea5beaa48cc1b92361
+EBUILD krb5-0.4.1.ebuild 606 BLAKE2B 9b0d464687995e75ec99f7f9a0f3d950d43529f26418e2ccd448d84d06b7a8e6828c688ee05be0fbfb60bcb8dee5ffc2b404cb88cc982833e8117e9a239f6b1d SHA512 69d8efe92ae56125e3acb183387ff9b450011c650b3aff37aa77b2572c8d1a268fe83f216340f17f69c4992223c20fdb1496d210a17297a1da00ed4e9ccab975
 MISC metadata.xml 364 BLAKE2B e69a14082c08f32db33234a5738190f54374c13a2f114d65e26a8e224c96f23be90e0cf602830b757fdadfaa058d723ab2cd51e6980f08fb090ca7b014416935 SHA512 f65eb368468d221f55e0701f8ae3790dbf083be2d3f210e9688b27db892b6d3e566a0cea3912d45a4e1e6da7aa092bc82eb6a4b861b459bb8decf914c5192d6a
diff --git a/dev-python/krb5/krb5-0.4.1.ebuild b/dev-python/krb5/krb5-0.4.1.ebuild
new file mode 100644
index 000000000000..ab0d23e77af0
--- /dev/null
+++ b/dev-python/krb5/krb5-0.4.1.ebuild
@@ -0,0 +1,32 @@
+# 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="Kerberos API bindings for Python"
+HOMEPAGE="
+	https://github.com/jborean93/pykrb5/
+	https://pypi.org/project/krb5/
+"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	virtual/krb5
+"
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	test? (
+		dev-python/k5test[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/mediafile/Manifest b/dev-python/mediafile/Manifest
index 488bee8976d5..1b1711d0b1f1 100644
--- a/dev-python/mediafile/Manifest
+++ b/dev-python/mediafile/Manifest
@@ -1,5 +1,7 @@
 DIST mediafile-0.10.0.gh.tar.gz 568779 BLAKE2B 26e8fed5a0c590bf1d5de1b28c3576573f795a3df74186361318745a6efc375685be95676d3cb6d331cb2fa3db63018dc660dc82ff4f6652d62fb4e14c48ca4a SHA512 b753bc0c97fd47df4626f21199eef5f22bc3d0a08f780524103e2f33a4008a64e2a25556650eb1c1a14e093cb4d3e704ef51910818fab30be723f7aece382b3c
+DIST mediafile-0.10.1.gh.tar.gz 568722 BLAKE2B 4da5fe76cc6e3e41d8591c962d9cfde1e16a64b57192d795714955aeab4d49d608a977685352de8e55ac83d1dde56435a31c4577a4a4743499393c051c471c7c SHA512 db9d82d23eb3f1a6b2e19f1b635805e84ed54ed06641a0e1ab80d7350415d1297cec64f18c66b38a7552abdaf2c1a8bfc6bb0c8543d9c618368184e6d6bb6405
 DIST mediafile-0.9.0.tar.gz 568726 BLAKE2B 22466b54c890c8a1bef88a0d08e729d0b1efab12309299c64ea227a5662c263402e8e4ace4b7c9d2d0d06ba41b6f74465ebf88d090f0fd4f41d91fb6cba941ef SHA512 8b432d81c7c1fc8340a2003220a0d96b448ac64e551b0b95528a37fa5923a97358fac574573dece344cda88f4f206f1cf7bc457bdd310a7a003c395908864218
 EBUILD mediafile-0.10.0.ebuild 645 BLAKE2B 4552bc8bfda59197594023c47e42f67e422172f257b6fff1235e4f77fe887447bba19345e55fd0eeacd16e95d6a33f6939a006e4d5cc6781adbd0e5897656196 SHA512 b60009437474029feb342f2067caed570c60427c39fad1481ea5cd6d5197e64d4cdc45d1fd01ab65d886ec4fa00a8ac067a92bfd2148b8e4f61f46ac66520a79
+EBUILD mediafile-0.10.1.ebuild 645 BLAKE2B c76f7fe256e3b51e5412b1d1f0e53dbd2d69323aa86f41393c2b733a29c300a7b11f2192dd63f4c7669d32aae6373e7c5e9e2fde8ba528819dcd81d5860bb154 SHA512 491edbb98d7807bf1473702671cb6232e1e40612b10fa439364df6896d8bc4ce755c2f7a9bcdb7cb4192d8bd3206ddf1f3bbfc523c34b22f85e874bbaffa84e3
 EBUILD mediafile-0.9.0-r1.ebuild 590 BLAKE2B 0cf76f278b68239bb0e9ca568420ddfbbf9e42dae61e750d5c9c0fd8f1740e23e8f9de968c3e8bb733ca1f2a544b4f61541b75a1b6e79bbb5a7ca9a1c08a8824 SHA512 6e7299345d2ff4adba8eb317a9a24d40b981ef23db07aec52e16fcdcc8f151b23dd03e420d6c1e206f1bf2fcc35a6575f34c58f4e7b3e5a17606fa394acc2070
 MISC metadata.xml 680 BLAKE2B 0b6b669509378e4377452e3f0020f16f41cb1c162b5596aaca7459c794b7f5c818df76969b5829d3b2e72ca0a4463a5d8b946c133acdbc063e5c4cb6a55ee1b6 SHA512 70109bda3921ac9eb6f0f09f748d3afdb977b6cb6699a457e5ad439d341a88cca2a28c229c0a7c5cbc50937ce7e8b2448156f829b9603f911b5c07807e3eebd1
diff --git a/dev-python/mediafile/mediafile-0.10.1.ebuild b/dev-python/mediafile/mediafile-0.10.1.ebuild
new file mode 100644
index 000000000000..4129f0a02852
--- /dev/null
+++ b/dev-python/mediafile/mediafile-0.10.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Read and write audio files' tags in Python"
+HOMEPAGE="
+	https://github.com/beetbox/mediafile/
+	https://pypi.org/project/mediafile/
+"
+SRC_URI="
+	https://github.com/beetbox/mediafile/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=media-libs/mutagen-1.46.0[${PYTHON_USEDEP}]
+"
+
+distutils_enable_sphinx docs
+distutils_enable_tests unittest
diff --git a/dev-python/py-cpuinfo/Manifest b/dev-python/py-cpuinfo/Manifest
index f0dd7fe3ae5d..1ae08f4e9e8d 100644
--- a/dev-python/py-cpuinfo/Manifest
+++ b/dev-python/py-cpuinfo/Manifest
@@ -1,3 +1,5 @@
 DIST py-cpuinfo-8.0.0.tar.gz 99791 BLAKE2B 95024b488142e3bbb2eaa69ffef229ac27f1cb55e297fb8de050ec4c410c1b13dbf674936365d84c5c473158338dd047f6dfba58c2a7dde4e21232af356ab20c SHA512 77351f9f2fd33b09d0ee998dd2b3eb971bbe9094bee5636356d5a5a2747ebba3c112cccfdf929f77e3b7de3c745f98ecfac8edeb0d84fede100b637b554d4fd9
+DIST py-cpuinfo-9.0.0.tar.gz 104716 BLAKE2B 667f5d420fd7eeff74e5047ee05220717585332c0b8b2a61422c3b4505f9c71c6b3091bbf3ebe29a3460b574a873cea423cffb5a83c49ceec3654a1558e435af SHA512 c7711137d60ad52bcbef8738a70fb48ceaa69e1e1632d135d0ee95c282b02df6170c3dd88a1e14b3e9a386d3286a15ca9722fcfb596107da022161a7cf84509a
 EBUILD py-cpuinfo-8.0.0.ebuild 479 BLAKE2B 42b5bba08824cc62f278a9045f6e8db6b33f04abfbbe9fe47ebf04b51fc2face05a23577e1bb89200c50aa51ab4ec669e7ee60de06b188ea6defcf292e29827b SHA512 30164a051144fcc2d4f5878b1a789459414fb4341d4d567126cc1725004a42618650ebc7aa7388a25f005ae7882650e2e72895210551947e5c1fdd93f835eb5f
+EBUILD py-cpuinfo-9.0.0.ebuild 513 BLAKE2B 7bcf9fb5d63ac756d340f2eb0adc4281c1723634f5ef9c6525260698d7a7226fcbb2e354dcc466c07d301117cd396d4e591c90b203eee099a4bc5474abf7ab2b SHA512 d3e64604f136bfc2fd7f8af758790af91a054f4c445a6ba02f7e5e9120aa3b87549130075be93825d90807a40061646c5519f704f862e4c6b15e8e537f95545a
 MISC metadata.xml 532 BLAKE2B 32c0f690bf91102b46b486db560e99ee94400c0c1bfa5ae00d4dff415d92d9c57931571d6f4c233221c1a8ea82c1f16629ba68dfa76abd462d953152643d098a SHA512 88a5a900b83df3680f1f437329758489d0de63da450921397b4c3256decd455ad134da5a1311fddee4bf9843b3466a6c6e70b0e6bad6bb7d90de9b73c8e67dcb
diff --git a/dev-python/py-cpuinfo/py-cpuinfo-9.0.0.ebuild b/dev-python/py-cpuinfo/py-cpuinfo-9.0.0.ebuild
new file mode 100644
index 000000000000..44d377ce96c7
--- /dev/null
+++ b/dev-python/py-cpuinfo/py-cpuinfo-9.0.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Get CPU info with pure Python 2 & 3"
+HOMEPAGE="
+	https://github.com/workhorsy/py-cpuinfo/
+	https://pypi.org/project/py-cpuinfo/
+"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+
+distutils_enable_tests unittest
diff --git a/dev-python/pyicu/Manifest b/dev-python/pyicu/Manifest
index 98e56e8bd353..e5fc6118e183 100644
--- a/dev-python/pyicu/Manifest
+++ b/dev-python/pyicu/Manifest
@@ -1,7 +1,9 @@
 DIST pyicu-v2.10.1.tar.bz2 192780 BLAKE2B 0a8dea0091e07b889fbe79895b1a1fd030e29f9be02303e9b70b7380defaea14eeecc87031e4c1e57bab4a56680fad51f1489d117f31492a50c0323eefaa288d SHA512 a542fafdd1c64971ac4cf7fe0189324969cc4039319950663819e7040d9406ea200a84d3f2821a9a94c944087d0dbfe74fecebb430a01476114b6963ba83c739
+DIST pyicu-v2.10.2.tar.bz2 192890 BLAKE2B b865e2777d922d7ec7ec1abab5e745670affa6e31704db7b23f906eab8ac99ac612c756f433119380a0fed2d180373dba05003722a1ba0990cafc7c4d9d3fbdd SHA512 687f48e0315cc72917b54c7431ee29d503ec79354842e5f6db564cc951a13d32cb4df97435d04c4b125a2a654f70429592ef2197e154624dd9a246b9bacfa4a9
 DIST pyicu-v2.10.tar.bz2 192789 BLAKE2B 824b83177b420bb78633a2d7b93bdcc781ec87ea105e7441be59547c6f56fadf292aa331decac96f095672a4d2741d709ed32dec4841b070bc056e7f0f8d65d0 SHA512 8f752ba97fc5ffc3004591826b47bd76c9b99d73a3784b2bba746cb611969a47a98971c89fe0b35dc817fd14b93b1bf0e85f4bf23986af22bcf5401485899c9e
 DIST pyicu-v2.9.tar.bz2 243533 BLAKE2B c2ea32f69637e2d12a57ded96b570ba7fd41c92aed4a0dea36ebe5c224b80fa8d1672251f8218e0a35d463957ab4291cff778c3e690f0763e465dc6f0a1af26d SHA512 f10025afe1a0de5a1726c3d4aaec5b10ba62064c33205117efe643185dcd3560e8971b600606e9699269cca795477bf86ed2f9e604e9c0e04bb75a86f31cd114
 EBUILD pyicu-2.10.1.ebuild 679 BLAKE2B 71d32386564aec1da6ffe1a59ed68ad9bd15693f5363ce51f4287cc8f1290055f69d79e9a79dc75943c29265ee3764f83f146232b081662968785a8045392baf SHA512 f06004ecf0a8eb878bee56049f3ceb84843f6179f45efcbdb5a07396b5e101af12df84decd3902b54582cd8ee05c613c0f676e7e610feab9c82c751769194696
+EBUILD pyicu-2.10.2.ebuild 679 BLAKE2B 71d32386564aec1da6ffe1a59ed68ad9bd15693f5363ce51f4287cc8f1290055f69d79e9a79dc75943c29265ee3764f83f146232b081662968785a8045392baf SHA512 f06004ecf0a8eb878bee56049f3ceb84843f6179f45efcbdb5a07396b5e101af12df84decd3902b54582cd8ee05c613c0f676e7e610feab9c82c751769194696
 EBUILD pyicu-2.10.ebuild 682 BLAKE2B 4c6fc8f74ba34a6f83fa9039e094e16d387acaa6ede225ac6a9709a197f29dc9377be3d8c4d01b7bbb07ce3c01a6106eb43529cbceae635245097fc8e99ce70c SHA512 3b954ad2a3bda2105ea90b95b61d082d7036eb9ca7140104521e0414a2c611711a85405810ad39b4eb3e5db234a07d9032fa27c262c4e69791f56e604ed0aaf1
 EBUILD pyicu-2.9.ebuild 681 BLAKE2B bf4d51d2df8c47b221d6e7c11a0bd7503b846a3f3f208dd8d7cfb7b6840ac476e486a42caf0466205c2e86a46509924a76938cdad64e8a7e5d966c7b54b4306f SHA512 c7fa76c08368699425e01e2bc22667a6541afc75c1c0400c409e7935c186f345c29e400c06ea35e6e43d19c880bee645ae308c5495ce2bbdf54d72995ee8e4f4
 MISC metadata.xml 415 BLAKE2B a96dc033850e25f2afcd4128d38becd7c86263e5bb366a701c88a2bc81118aef03217bbfe0c2ff0719f636104b2a12995815c36f2a3e6539136509c7900c25e4 SHA512 e8d901e2276b0a92ae8e0cdd4b0e1cacd29d9eda86491a31a2057d013b7c4f8c340d0e83dbfd53500906f79a827d837cc7e445c24e6cf5b50ee809ec2c35eb13
diff --git a/dev-python/pyicu/pyicu-2.10.2.ebuild b/dev-python/pyicu/pyicu-2.10.2.ebuild
new file mode 100644
index 000000000000..1759ece5b608
--- /dev/null
+++ b/dev-python/pyicu/pyicu-2.10.2.ebuild
@@ -0,0 +1,38 @@
+# 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
+
+MY_P=${P/-/-v}
+DESCRIPTION="Python bindings for dev-libs/icu"
+HOMEPAGE="
+	https://gitlab.pyicu.org/main/pyicu/
+	https://pypi.org/project/PyICU/
+"
+SRC_URI="
+	https://gitlab.pyicu.org/main/pyicu/-/archive/v${PV}/${MY_P}.tar.bz2
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+
+DEPEND="
+	dev-libs/icu:=
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	test? (
+		dev-python/six[${PYTHON_USEDEP}]
+	)
+"
+
+DOCS=( CHANGES CREDITS README.md )
+
+distutils_enable_tests pytest
diff --git a/dev-python/pyspnego/Manifest b/dev-python/pyspnego/Manifest
index ceb266de0d6a..e1582959b45a 100644
--- a/dev-python/pyspnego/Manifest
+++ b/dev-python/pyspnego/Manifest
@@ -1,3 +1,5 @@
 DIST pyspnego-0.6.0.tar.gz 200621 BLAKE2B cb6b44ccfb87600c480f67ddae686a424ad75a7f16c8f78d3539159c523069b71c534a3dfb8ec06ee26b75261d87d54e8b96aaa2d0f477f2488438075d6212a5 SHA512 65f877a2fcff4671606063223d1499be19368040a0f70d0d9363dd84c0b09a195a5e6bc7da1d3745fbf81af822f20f3d903ca2a9372898a2973ba93b6661a708
+DIST pyspnego-0.6.1.tar.gz 200508 BLAKE2B e284b42da97919a63a5ff51687cdd0d8891492ab2e296686b88242fb4db6326ac56c5b04488e47be04764c75fefdf2a9073cc8983150f6d0e5d4819bd49fa86d SHA512 eab37ad3691da06e91221107483c2ae4504d4e7f3b7d288843387dbe2c8611b3839b6cf378b2418b977f835fc5a4ea4b9a8b9995d9ee07d25069fea05bc4b876
 EBUILD pyspnego-0.6.0.ebuild 959 BLAKE2B 0e327cdd2fb3d9e16f09f374bf0002b3395a009cf558b2935841781f2e778677802acf9d3176345a8b445b2ebd617c4307d72b7f53dcadddb7c01347125718aa SHA512 99ce279a54ff8dc4ff6eaadcf0850de1e91d764d6dcf5da30024168d27fd4dc50db7f70f7e222ba0b56fcd7ae74c7be0ee355dca68975fd42035ab979922ca4b
+EBUILD pyspnego-0.6.1.ebuild 962 BLAKE2B 4485e98511dc8b04baf037b35d29bb09f498161a2ad0754737ae15f7791eac27efae62ed8d1049038726f296c284acfe138b27ad8a24f050acebfdc3c1739170 SHA512 c9f62764d03e6baeb4ed3d01a7f1d816a017cf81f270fa36f4e3b6eb1bbdeee2f9e0f78328f344dbda2a252df979f732b904d060b4805de285607d412f74601a
 MISC metadata.xml 445 BLAKE2B 2d30af32987aa7118331cb4c199b44069f6a6efc62d73eab62a31b29308848b7f7e56e026327af6c2197ee31c05fbe1885524bba7b6a84cdc0d97cc58c5fb43b SHA512 c7bbe6f161ce61409f6865f998fb4c8bd77c39011f5bbd148379912e31805773a41451163517cb7ebef99a57d6abe8f13dcdc568408ce182c0def6adf35afc9c
diff --git a/dev-python/pyspnego/pyspnego-0.6.1.ebuild b/dev-python/pyspnego/pyspnego-0.6.1.ebuild
new file mode 100644
index 000000000000..372520083949
--- /dev/null
+++ b/dev-python/pyspnego/pyspnego-0.6.1.ebuild
@@ -0,0 +1,40 @@
+# 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 optfeature
+
+DESCRIPTION="Library to handle SPNEGO and CredSSP authentication"
+HOMEPAGE="
+	https://github.com/jborean93/pyspnego/
+	https://pypi.org/project/pyspnego/
+"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	dev-python/cryptography[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	test? (
+		dev-python/gssapi[${PYTHON_USEDEP}]
+		>=dev-python/krb5-0.3.0[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/ruamel-yaml[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+pkg_postinst() {
+	optfeature "Kerberos authentication" "dev-python/gssapi >=dev-python/krb5-0.3.0"
+	optfeature "YAML output support" "dev-python/ruamel-yaml"
+}
diff --git a/dev-python/pytest-metadata/Manifest b/dev-python/pytest-metadata/Manifest
index 13afbd5e70c6..1cda6dc82987 100644
--- a/dev-python/pytest-metadata/Manifest
+++ b/dev-python/pytest-metadata/Manifest
@@ -1,5 +1,7 @@
 DIST pytest-metadata-2.0.1.gh.tar.gz 19945 BLAKE2B 931ede3b58471e3092eb26af38f380810140539c7c50b5e3e9a63bdddedd9577b1f23aafb24ce80de55078f772b0dae8715368559f79a3f31f33e15870134f45 SHA512 03981b4fbcd812cf5896d6db2b74cbc1e6c84cc13613f916248767cacfc7650580f668a5ea8892be85c87fa08101a8a2f440ee6e0cc1342d4fa9919d41153a6b
 DIST pytest-metadata-2.0.2.gh.tar.gz 19993 BLAKE2B 274ce5532fe96b6e4116d6ed1bf20911342f8b239b00a9b6cc1b553ad2819a619691e34bd93ef82676ffdcd4ba32adebba481c65168ce76eef2099eb7295d65d SHA512 b35c0b1a357a246aa12b65dd67b48b6c4201d75d4a23db9026659407583e97517971ba6af1054cff7812f2c6ae54019b26d1108664d632a45c0514a716b321b2
+DIST pytest-metadata-2.0.3.gh.tar.gz 20078 BLAKE2B 269f8b10aad3dda94ea3f1e2655d6e0be371211138774e8662395197f483917ec8098c3acb2b792f4dfe08d7ada21fd062754dbd2be49cfadb50823a32858e09 SHA512 423b61ffd038fe94b7d09a7e2cf2ef71782c8b41504831e0f9479b3423bdd24da730464ba5e90ea1c4dda32a9f2ad935448caf48427f08f7e93c9021f1e73625
 EBUILD pytest-metadata-2.0.1.ebuild 740 BLAKE2B ff12af000c7ee94f06b187a64b6174955b875eda17c5828997ad5705c93bb67bb5ecb4279dd0944ae7514ef528dd6a2857a5c6ac1c34e92616238bef15e08192 SHA512 a3ed0507ff666e97be6547d53b7d6d19f4c1657223a3de1ca120a068b9ab9477d29b670f6ff65c283e1928771949c0ab5860642716dc0e6a767fa3fe2127b26f
 EBUILD pytest-metadata-2.0.2.ebuild 740 BLAKE2B 1866863702a685214239761a41f942c183dcabc8005393d24b1ea579e6a0f2a166ccaf0415e3acc76a1e0c78e82a850ed24601fbddf1a9d6b484fdb4d43956ff SHA512 52b7c96b0786d0a7115e0feb5f8bdc1ced78e663de01cdb2bd5aab8eda8b17c21c5455895b40b22c7021eec0924c952d1ff121b229cf97da423171fa40b43e94
+EBUILD pytest-metadata-2.0.3.ebuild 786 BLAKE2B f7687b0e20151e2ed9c2f0be6f55449b93e3487b3202360c9b925f69e7dfa370b505d38062f5a7583f359e4cec7e6746febcda02fb31f25936b9a08e04c1798e SHA512 138ac38976762b11739a0a88e1c73039d60260067360754fe79b6e62b2fce5c56b051399173e9c9ef298cb12e7a97c95128f0a5f178aca9cee0ed7a9ccabcd42
 MISC metadata.xml 385 BLAKE2B a888886c89fe52cd8e209fc9638fc3cdbf9b7dde0114c46d57b4f9b91f1ef49ebdb3f967e913036109054547d3840c8bd5ca24e5b80ac541889c48ef63748233 SHA512 20094512c77c3ea6f5501aaff0fc9b6ef07aa0580c555e3da5d6ad25e1ecf2f9f42443b7a43256f3fb99aab029a83a2d2696e9a0c8b2ce81e95ef15ab0c33b23
diff --git a/dev-python/pytest-metadata/pytest-metadata-2.0.3.ebuild b/dev-python/pytest-metadata/pytest-metadata-2.0.3.ebuild
new file mode 100644
index 000000000000..9d0247fc2385
--- /dev/null
+++ b/dev-python/pytest-metadata/pytest-metadata-2.0.3.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A plugin for pytest that provides access to test session metadata"
+HOMEPAGE="
+	https://github.com/pytest-dev/pytest-metadata/
+	https://pypi.org/project/pytest-metadata/
+"
+SRC_URI="
+	https://github.com/pytest-dev/pytest-metadata/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+
+RDEPEND="
+	<dev-python/pytest-8[${PYTHON_USEDEP}]
+	>=dev-python/pytest-7.1.1[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/setuptools_scm-6.2.3[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/pytest-qt/Manifest b/dev-python/pytest-qt/Manifest
index f76b85617927..43523771667c 100644
--- a/dev-python/pytest-qt/Manifest
+++ b/dev-python/pytest-qt/Manifest
@@ -1,3 +1,5 @@
 DIST pytest-qt-4.1.0.tar.gz 119702 BLAKE2B 7c906c94761df6472ae65a6ebb38dff07de8156730e3e10615ea8e08f0bd9f9fee07127ee6e8616055117b1db1911bc9b4486345d84b249664d317561195ad77 SHA512 bfb56abbaac47bf9da26eb19d6913d59872f2a9923da339e9a30a2145d0a094ddec36bcfa21d39c4cf318f95a83c72c249fe70034294a6791f9d84345f77451d
+DIST pytest-qt-4.2.0.tar.gz 120749 BLAKE2B 1986bbf4ebc578ad548d2fcc8888b0d0fb42f75ad8a03f315f51c04ae466587d3299fca8ec3a49bc5d023fc8ca76cbe6c45728bc88609e20d6f68ea8c6ea204e SHA512 57e175bada0e33101eeb7d85579f6e804658d74168714b117b3a1ba564826405e70860b258caf28c917ddca7acd1842de2133a55b342862762fc37ca1a758b69
 EBUILD pytest-qt-4.1.0.ebuild 1693 BLAKE2B 33e32b2abcf8bc6cc3bf74dad84f5fef6644e66e8a8a7fe24a27b4c28c371aa35c410c2ac712dd0cc5722c504bdc323100c67b2e687f2726791712e23cdb7f53 SHA512 7003c9b7b2cdc7d0e91db559e55413361bae52046613c60004656860b229dbe18ce1118f9f305769444cb3609207da2f21c44088231cd9335559a0753c960a2d
+EBUILD pytest-qt-4.2.0.ebuild 1695 BLAKE2B 11efdcf4e0ce3ef578e9a803476c0928f94ed3a8fe41caba28c6263c3d1996896370002347b8c9b7dc109faa26986971e0950e705394a02b222c7ce1306ccbd6 SHA512 238e661ac00081736d35fa3284f83f7e57d72e21c5ba34a91ccb171de511cee4c566dc197a397e8e44471fe1c4f9d34f53911754ecdf41c52ea591e18e4bda82
 MISC metadata.xml 516 BLAKE2B be5241e39f672681b27a003d02eca0e047644cad7da57de6b3393f58760c094c1661b9d168e44bea4efd56b38225d49abd5be6e71031a0d854b878716286d3ed SHA512 77981d63d3214fd2c052f8a7eac1a439899318973807299237a9105730893ce01d4423b060f532bd4f4496418683fc5128508c7d8747ba6ee6ed0eae67e5569f
diff --git a/dev-python/pytest-qt/pytest-qt-4.2.0.ebuild b/dev-python/pytest-qt/pytest-qt-4.2.0.ebuild
new file mode 100644
index 000000000000..69dbc6a6d79f
--- /dev/null
+++ b/dev-python/pytest-qt/pytest-qt-4.2.0.ebuild
@@ -0,0 +1,65 @@
+# 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} )
+PYSIDE2_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Pytest plugin for PyQt5 and PySide2 applications"
+HOMEPAGE="
+	https://pypi.org/project/pytest-qt/
+	https://github.com/pytest-dev/pytest-qt/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/QtPy[gui,testlib,widgets(+),${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/PyQt5[gui,testlib,widgets,${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/pyside2[gui,testlib,widgets,${PYTHON_USEDEP}]
+		' "${PYSIDE2_COMPAT[@]}")
+	)
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	# warnings from other plugins cause the test output matchers to fail
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=pytestqt.plugin
+
+	local EPYTEST_DESELECT=(
+		# requires the window to be activated; that doesn't seem
+		# to be possible inside Xvfb
+		"tests/test_basics.py::test_wait_window[waitActive-True]"
+
+		# we are forcing a specific module via envvar, effectively
+		# overriding the config
+		tests/test_basics.py::test_qt_api_ini_config
+		tests/test_basics.py::test_qt_api_ini_config_with_envvar
+	)
+
+	einfo "Testing with PyQt5"
+	PYTEST_QT_API="pyqt5" epytest || die
+	# Pyside2 is not compatible with python3.11
+	if has "${EPYTHON}" "${PYSIDE2_COMPAT[@]/_/.}"; then
+		einfo "Testing with PySide2"
+		PYTEST_QT_API="pyside2" epytest || die
+	fi
+}
diff --git a/dev-python/readthedocs-sphinx-ext/Manifest b/dev-python/readthedocs-sphinx-ext/Manifest
index ff34d9a88b32..a78897e49148 100644
--- a/dev-python/readthedocs-sphinx-ext/Manifest
+++ b/dev-python/readthedocs-sphinx-ext/Manifest
@@ -1,3 +1,5 @@
 DIST readthedocs-sphinx-ext-2.1.9.tar.gz 12465 BLAKE2B 2ee1e0a5e7202dbe57c0dcfc796f8019d057178b59cf832e77b742d5e1b039804aca830109ba10b393577549b5c55ab5707b8071b230f998ea2b91653be2176e SHA512 dc99335ce01a882d9e5509216d5830ef1b943b41f92836433c3a06592edc127a9ed2de39091d6a4fcad941f90be135293592394f4b2c4d8f13955cdbb92f3887
+DIST readthedocs-sphinx-ext-2.2.0.tar.gz 12721 BLAKE2B 3ac02a96a059e6d6b94af4318a5e816f8664e1164edb315d7540d1bfcce3b0edbbe9d567b0dc2931179cb309714175c64a3684b9d568551cc240ccbefc77a10a SHA512 8f7009a0716751de2fe2fed726aa08bb382d15ef6c4fb66e6c29537f985a92ab7cc137f81a4f6200e794cb7f495ebf561356194f57c694509b67e7686bef52c5
 EBUILD readthedocs-sphinx-ext-2.1.9.ebuild 823 BLAKE2B 0315f24a0f84660a5572569cd485559106953f0f13b66ab7a0d7a29b2b10948c720511ae623733a63afa1b4d5e2962f0a970793b9a34bde4d2797376f625078e SHA512 fe1ba4d670fed36c614e85dbf514c8cfc867da1aafde25a2b22ede98ab3e404b7b6bd8f902977b317344158cc14000c82760bd4851939ada06277e797e88f9c2
+EBUILD readthedocs-sphinx-ext-2.2.0.ebuild 831 BLAKE2B c269465fcd830134702ca6675b0d529b083f645d933852dd36fb9b64e2578c740caa1f8e01d9575acebf483cbd99050c7bffbbe83ef9f60ab0f6475d85638ad3 SHA512 0274c7639e327018b640dcd5de2cb0d0d029eeb008b66f5d0ef948fc52c250766a3bee9af246c4174c338f759bfed54351860eb73d85ab721f328f8694f27a16
 MISC metadata.xml 350 BLAKE2B 39fca03d3a995a65683f45a330e386123ae2efaa952f3bc0a6153708008941ddabff9045b480b85551c3fc26166db3aec9daafbe87a91d18dbb4041015d7ec66 SHA512 c116ddd2f8b70bb1c5d0bfc876e60ce35dff1fa7ee2c83a26992f96960beef17c0fb743a7ac5b5c41a3028422c2f342dd683ed503752f7f6390d9987ff8a3057
diff --git a/dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-2.2.0.ebuild b/dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-2.2.0.ebuild
new file mode 100644
index 000000000000..5daa4f214a46
--- /dev/null
+++ b/dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-2.2.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 2020-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="Code specific for Read the Docs and Sphinx"
+HOMEPAGE="
+	https://github.com/readthedocs/readthedocs-sphinx-ext/
+	https://pypi.org/project/readthedocs-sphinx-ext/
+"
+SRC_URI="mirror://pypi/${PN::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"
+
+RDEPEND="
+	>=dev-python/jinja-2.9[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/sphinx[${PYTHON_USEDEP}]
+"
+
+# unittest should be sufficient but tests are very verbose, so pytest's
+# output capture is most welcome
+distutils_enable_tests pytest
diff --git a/dev-python/terminado/Manifest b/dev-python/terminado/Manifest
index cb3634d9d470..b93a0f804043 100644
--- a/dev-python/terminado/Manifest
+++ b/dev-python/terminado/Manifest
@@ -1,5 +1,7 @@
 DIST terminado-0.15.0.tar.gz 29599 BLAKE2B b287e5c28fccbf9116d727e11e0a9d3d89f45a16374c7ee950b30427c8f52064dbb59c36fdb7b4d1457a3526e51254708ee13ef3505303c6052da050460046d1 SHA512 9aa00b7e6d442a7358f007be9d45c6a5326243e64d51a2e9fda863ab5ac8f12b72b1684aed91da376e2c45347635fe64a66da5ff2792b2b15d538080fa6f832b
 DIST terminado-0.16.0.tar.gz 28839 BLAKE2B d74846455e1a91e1c16c7cabb42be4e6915d130149a660ac3d555f6bf5a9ce47c7af1f802eb5c065ca99e9cd733b51b31df2bb799c82cc482ba0d0e3c0b36265 SHA512 1b52d6c60b0bd21d19633ae586c7a974035f43dafbf711fc86d667f965de783efc6712e8fe586685ab65b63b3a689b01f730cac6c68a9517e5421b1814f9f897
+DIST terminado-0.17.0.tar.gz 29184 BLAKE2B 2c86d69e08bebe54f451ed2ad0786397e8ef6fb320c233b6361209e9c4e7a996c5b55824a853ec3a9668b265f02f7cde2ed124a6615e0f364cdddaa6270e39e8 SHA512 41e5ee052e8b688d136fd494db3897d703f3666a0b02df71ce3488f2e462ca2e79c631f251cd7721892035c97e7a29662238293010897d7c5fab10f9290adfc9
 EBUILD terminado-0.15.0.ebuild 830 BLAKE2B 7057e5b326c7ccf9d6161d605305649e2e5d40ede784d545d78cc643744a3635a9ca5816902b61031499e4eb5be680a8b92242f73ba2ac41ed67fe2fe73a8383 SHA512 661d79d5eee9d676a19161118105178a2c7db5ac11c32497ecd4851b3abb9e7862275cb2e5b427726ad4e9d8779faf8dc54401d540584cfb956fc92f270cd254
 EBUILD terminado-0.16.0.ebuild 838 BLAKE2B 04a0470130e47523e8fa82cc795bccc9b241b173c0566c3e04baba80e28ab98456e4eeea2e246a80ca0f3169899b19d2781823848492608e7b6f5e6d67f56f07 SHA512 3de45b9c351e2b351d0c3eadc5f2a76809b44edb3622c31529e4baded2dec2abdd3a645d969a6c30572a4bad948a82893f529ae792753bae2e849f5d5b2ecf88
+EBUILD terminado-0.17.0.ebuild 838 BLAKE2B 04a0470130e47523e8fa82cc795bccc9b241b173c0566c3e04baba80e28ab98456e4eeea2e246a80ca0f3169899b19d2781823848492608e7b6f5e6d67f56f07 SHA512 3de45b9c351e2b351d0c3eadc5f2a76809b44edb3622c31529e4baded2dec2abdd3a645d969a6c30572a4bad948a82893f529ae792753bae2e849f5d5b2ecf88
 MISC metadata.xml 407 BLAKE2B 11da32addf98212561629b99650880eca0a6c057414d8a97f535f40b046c6587d326e3193eab264f439caf38e5d6d8f3f5d1a5891746262494ced39effb2651f SHA512 6c993bf16c0413aea33e06efef79dc6189d3b62b71574fffb2bdce7ddb27b4b12f1d5c0d2a3a80a51ae8894c60efb83a9966cabd53662d358f3f1ec52d27590b
diff --git a/dev-python/terminado/terminado-0.17.0.ebuild b/dev-python/terminado/terminado-0.17.0.ebuild
new file mode 100644
index 000000000000..c0e795c0426f
--- /dev/null
+++ b/dev-python/terminado/terminado-0.17.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Terminals served to term.js using Tornado websockets"
+HOMEPAGE="
+	https://github.com/jupyter/terminado/
+	https://pypi.org/project/terminado/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	dev-python/ptyprocess[${PYTHON_USEDEP}]
+	dev-python/tornado[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+src_test() {
+	# workaround new readline defaults
+	echo "set enable-bracketed-paste off" > "${T}"/inputrc || die
+	local -x INPUTRC="${T}"/inputrc
+	distutils-r1_src_test
+}
diff --git a/dev-python/tox/Manifest b/dev-python/tox/Manifest
index 4c679e16e173..70b77f39d7d6 100644
--- a/dev-python/tox/Manifest
+++ b/dev-python/tox/Manifest
@@ -1,3 +1,5 @@
 DIST tox-3.26.0.gh.tar.gz 308035 BLAKE2B 745d1aef11c230971a7b6b1df919440c2be1b9b0f726ab314e1a27fe6fa72b568efc8e336058249721028cc18d2c3453e4806079abb8099baa608bf6b1e98ad7 SHA512 8c2635a640bcc221735f59da633b3ae696d97c076280400f6086703c2e00d8dbad943073e0c63618e5e041199dfebd010a16a00b1498ca9ea8e884648ed40ae5
+DIST tox-3.27.0.gh.tar.gz 308774 BLAKE2B efb3d40aa3045f984fd2534124de506c166fc8fde46d655c608ffcb7a85637ebda5c8bdef6cf4d414d84433fd361143fb91f98877d8112489c479049ec4f01be SHA512 e42cb0c203afb053c8bd6b29e90384fe6c32ab2ee3fb64fe0323474ca0b7f94d3e035d9d15218da28bc93d852c5f266c04b89d4b38db7d843d1098207f99a9bf
 EBUILD tox-3.26.0.ebuild 1916 BLAKE2B ab2496317d588c05936d57132d1c759c9a14f18c10fb50d6188b7bee5bd20de9f06b5d8945a908cbf021f4b7036ba6d23dcf19aad63af9d6cd6bf6baa598ad32 SHA512 b038f9976de8af46ac663faa169a06fad1bd28ef61738679fd70faa5e655c0c85ed3a8e4efddee2dd2aff8cc3fe9f5ec133311d122c6bab15c487a5a074a6c11
+EBUILD tox-3.27.0.ebuild 1924 BLAKE2B d2a5ac59691e8ad704bb64840925d192df827d533c2b17bafa31b95da83a235c28109e911f78e294b12924a99114adad5bbe44cbba67fe8d2d584c9839a70d59 SHA512 aa919c8b15403b9992a772bf0296f4cae2bef39c4ded509f732a13869504f7af15cf43f26c9f401e31794c481a5e1dc4e91c18e65c31a4e159d7b9a2cb1c99ea
 MISC metadata.xml 382 BLAKE2B 7c0704c5c187ce4a7972fe0372b23c5537a81a8d62fd83436d9558a61761f10764adb5a4d5f6795f0dd1fe905afa604c0be77fe1d48d291847f6ae65dc1b032c SHA512 9d0ced4df9352a81034a50d5766a01534ae8fa889985d99cc9e2a8d0889e31c6c11550677d9a5a74e2aab57c320192ce3a42708a6d23b0419ee34a6054398344
diff --git a/dev-python/tox/tox-3.27.0.ebuild b/dev-python/tox/tox-3.27.0.ebuild
new file mode 100644
index 000000000000..87ba6799d964
--- /dev/null
+++ b/dev-python/tox/tox-3.27.0.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="virtualenv-based automation of test activities"
+HOMEPAGE="
+	https://tox.readthedocs.io/
+	https://github.com/tox-dev/tox/
+	https://pypi.org/project/tox/
+"
+SRC_URI="
+	https://github.com/tox-dev/tox/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/filelock[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	>=dev-python/pluggy-0.12[${PYTHON_USEDEP}]
+	dev-python/py[${PYTHON_USEDEP}]
+	>=dev-python/six-1.14[${PYTHON_USEDEP}]
+	>=dev-python/virtualenv-20.1.0[${PYTHON_USEDEP}]
+	dev-python/pip[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/tomli-1.0.0[${PYTHON_USEDEP}]
+	' 3.8 3.9 3.10)
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/flaky-3.4.0[${PYTHON_USEDEP}]
+		>=dev-python/freezegun-0.3.11[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# broken without Internet
+		tests/unit/session/test_provision.py::test_provision_non_canonical_dep
+		tests/integration/test_provision_int.py::test_provision_interrupt_child
+
+		# expects python2 to exist
+		tests/unit/interpreters/test_interpreters.py::test_tox_get_python_executable
+	)
+
+	[[ ${EPYTHON} != pypy3 ]] && EPYTEST_DESELECT+=(
+		# capfd doesn't seem to work for some non-obvious reason
+		tests/unit/test_z_cmdline.py::TestSession::test_summary_status
+		tests/unit/session/test_provision.py::test_provision_bad_requires
+
+		# TODO?
+		tests/unit/interpreters/test_interpreters.py::test_find_alias_on_path
+	)
+
+	epytest --no-network
+}
diff --git a/dev-python/trimesh/Manifest b/dev-python/trimesh/Manifest
index 9be42660b38a..ae08a45973f4 100644
--- a/dev-python/trimesh/Manifest
+++ b/dev-python/trimesh/Manifest
@@ -3,9 +3,11 @@ DIST trimesh-3.15.2.gh.tar.gz 11956076 BLAKE2B 4ec701056efd29eb24eaf4edc82d07af4
 DIST trimesh-3.15.3.gh.tar.gz 11955970 BLAKE2B 050a1330ff0d3d308f3f54bee9080907b839e8cfcc9bdc831d3c5033225a9868aefe2ceb39313949288c779a1af577911a7e43fe2745f50c4983c178dcf02742 SHA512 e01192496af519be7f4d04b6268f82227a0d00c2feebf294572cdd6cce151d10d271cb8b8558c48200338d2f6ea4137fe75d92d115ea8b42f0117ad135566d05
 DIST trimesh-3.15.4.gh.tar.gz 11956349 BLAKE2B 5d67b4e7ce0183fb9031c4cf032caf56e366b0ff05713a22d83258d13283b5bca5b08174044aa29af1d02112717c21be668315d99ea3ce203f318416b9eff583 SHA512 98e2711d46f8299132f0fd32b347393a4fc300f08c93f81e6e82b662bac57044678c425455549899ef839467d9a0dc249a4a03c14c816f0377545b74e6523e00
 DIST trimesh-3.15.5.gh.tar.gz 11956403 BLAKE2B 5e36a7fd57689f5151ee710a707bf44ff4c9538c3f541cd3d29bb08722b4bfeead7f138dab02a58a80d18b4831044d1ac674e3defd0e378420540976c422fc22 SHA512 4433480ff96be561d32412870c71420699713c53d34b2f84eabb1fa1eaa9e70d74940674e62a547c31e22dd941bb036179785a35ff2c8d27288300033497d5ac
+DIST trimesh-3.15.7.gh.tar.gz 11972453 BLAKE2B 0f1c10d096289122bb1cc853f4879718f3e03dd9b4297a25be4db2a232a08b0e8d496ec5cc98b2d4c4214ba296666291fe24b7dcc5d2e430105ba46cb4fb5838 SHA512 c09862de650829e853d7d4f2b53b72ddeac48ad313975dc2919c0bbb11d16d0fe5aa69810d488291b187e827b63caeb03847c143cd6812ae09c2d98d51e42270
 EBUILD trimesh-3.14.1.ebuild 1863 BLAKE2B 7b8f0fc5c878d18b0ac6ff779474555e6ce2eef6f86fdf2da2e8e547351de67485d6d7c0092bc19e0e0be29ea9e0eb9c9180fb387c3075b8ee3f38869d4848d2 SHA512 f015e4269fa2282a8827c764d5d23c5fbbf5f1de5c509e651e29fb91983157114b13fb832c80a3600b6ae2ccf48a0e9b1ac15dd0880d56443c24632980e2b3e7
 EBUILD trimesh-3.15.2.ebuild 1864 BLAKE2B 6342098e247117e1d01b4709787765b5a12c9ae1e74fc0b7f028f397bb72ce8478ffa7364add4d5886ac1dd1a9d1e2e167f25d55cf9109dcc0d11148bed89e2e SHA512 7518ddb6538df22b9b56e1e097e597f276d12b8e333051c88fc5c9370b745e72feaf355495268003ee9001a8c57f88aa7822cf80635525ff295f1e3f241ca7e9
 EBUILD trimesh-3.15.3.ebuild 1864 BLAKE2B 6342098e247117e1d01b4709787765b5a12c9ae1e74fc0b7f028f397bb72ce8478ffa7364add4d5886ac1dd1a9d1e2e167f25d55cf9109dcc0d11148bed89e2e SHA512 7518ddb6538df22b9b56e1e097e597f276d12b8e333051c88fc5c9370b745e72feaf355495268003ee9001a8c57f88aa7822cf80635525ff295f1e3f241ca7e9
 EBUILD trimesh-3.15.4.ebuild 1864 BLAKE2B 6342098e247117e1d01b4709787765b5a12c9ae1e74fc0b7f028f397bb72ce8478ffa7364add4d5886ac1dd1a9d1e2e167f25d55cf9109dcc0d11148bed89e2e SHA512 7518ddb6538df22b9b56e1e097e597f276d12b8e333051c88fc5c9370b745e72feaf355495268003ee9001a8c57f88aa7822cf80635525ff295f1e3f241ca7e9
 EBUILD trimesh-3.15.5.ebuild 1864 BLAKE2B 6342098e247117e1d01b4709787765b5a12c9ae1e74fc0b7f028f397bb72ce8478ffa7364add4d5886ac1dd1a9d1e2e167f25d55cf9109dcc0d11148bed89e2e SHA512 7518ddb6538df22b9b56e1e097e597f276d12b8e333051c88fc5c9370b745e72feaf355495268003ee9001a8c57f88aa7822cf80635525ff295f1e3f241ca7e9
+EBUILD trimesh-3.15.7.ebuild 1864 BLAKE2B 6342098e247117e1d01b4709787765b5a12c9ae1e74fc0b7f028f397bb72ce8478ffa7364add4d5886ac1dd1a9d1e2e167f25d55cf9109dcc0d11148bed89e2e SHA512 7518ddb6538df22b9b56e1e097e597f276d12b8e333051c88fc5c9370b745e72feaf355495268003ee9001a8c57f88aa7822cf80635525ff295f1e3f241ca7e9
 MISC metadata.xml 495 BLAKE2B b8b403f7bfbac53ed234c2ba50324041502a28465d70e9406867f05741e0313845307491fcfd85f05e2993b21daf14117a4b6863b45422fd4c62c6e28902e3ff SHA512 3deec8ab4b513536a7fe182be8f1b96e06fd06b2480d3e516c2b3462cc26fcbdeb1d165b4d0297465e93c0cce584ab40a8f905b81a59dcb4040a39655028783d
diff --git a/dev-python/trimesh/trimesh-3.15.7.ebuild b/dev-python/trimesh/trimesh-3.15.7.ebuild
new file mode 100644
index 000000000000..11e1a73dfac5
--- /dev/null
+++ b/dev-python/trimesh/trimesh-3.15.7.ebuild
@@ -0,0 +1,65 @@
+# 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 multiprocessing optfeature
+
+DESCRIPTION="Python library for loading and using triangular meshes"
+HOMEPAGE="
+	https://trimsh.org/
+	https://github.com/mikedh/trimesh/
+	https://pypi.org/project/trimesh/
+"
+SRC_URI="
+	https://github.com/mikedh/${PN}/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/chardet[${PYTHON_USEDEP}]
+	dev-python/colorlog[${PYTHON_USEDEP}]
+	dev-python/jsonschema[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/msgpack[${PYTHON_USEDEP}]
+	dev-python/networkx[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/pycollada[${PYTHON_USEDEP}]
+	dev-python/pyglet[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/scipy[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/shapely-1.8.2[${PYTHON_USEDEP}]
+	dev-python/svg-path[${PYTHON_USEDEP}]
+	dev-python/sympy[${PYTHON_USEDEP}]
+	dev-python/xxhash[${PYTHON_USEDEP}]
+	sci-libs/rtree[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	epytest -n "$(makeopts_jobs)"
+}
+
+pkg_postinst() {
+	optfeature_header "${PN} functionality can be extended by installing the following packages:"
+	optfeature "making GUI applications with 3D stuff" dev-python/glooey
+	optfeature "2D triangulations of polygons" dev-python/mapbox_earcut
+	optfeature "loading a number of additional mesh formats" dev-python/meshio
+	optfeature "figuring out how much memory we have" dev-python/psutil
+	optfeature "marching cubes and other nice stuff" sci-libs/scikit-image
+}
diff --git a/dev-python/versioningit/Manifest b/dev-python/versioningit/Manifest
index 0d1e746d9663..b94f293e4c9e 100644
--- a/dev-python/versioningit/Manifest
+++ b/dev-python/versioningit/Manifest
@@ -1,5 +1,7 @@
 DIST versioningit-2.0.0.tar.gz 735138 BLAKE2B 59247c0a2ec85f828b1b36c7f7ff6981fdd430b242c262f7325586e8ab35410083e0a795e72204c9ad9c0c50bb02c047f8baa01c556f74d69a8ddfc9e911474b SHA512 d700e25f3b58efd87943a950ede66ad8814e3aeea1927bb68b51312a636684b16695c44492f4357595305a5a85a3fc8c411d80a02e9b157162844d731dcab93f
 DIST versioningit-2.0.1.tar.gz 735415 BLAKE2B 92aefa4c565ba1e7e707e7ea53a139c64e645ca5e68c74f8ee516122996037061174f703b566458d947e131ed56cc0a9922ce23bf82680607591900a7cc88e36 SHA512 b6f8c578d36607731429e43a7bd349ac69e44943a7b9a79c9f70e1dd44201ee6af239a575ebb36a44e870ee2a121a91d1d63c8e63dadaac71139431ef2eb36e5
+DIST versioningit-2.1.0.tar.gz 735718 BLAKE2B edceb4b5a76ecc5e4f5549a348cd5c72bd1c77be1fb6d8c1694af4c94ff38e773b2e288ad22cecd93a3cd14d602dd6c50634db74a51e486856472098cf18bf89 SHA512 0cea71e8b21edefba008d947d8527810e1e38c8e2f208707dbc913b3734b51a57b20444fa4dd703574f0106068518057496292ae5997d85ba047ff4795ba64fa
 EBUILD versioningit-2.0.0.ebuild 860 BLAKE2B 5b99a6099f118843506107b7738b12588971c23e63a73f9394457b364bbd852cb9af74d69db6226d94ab219cde4549bba8a6e4887b5ff6df9956fbc01e7cd1cc SHA512 fa0ad9816f14251306d7564691737a54e1f29a59be9f420a307737092c774a53eb920d3f0c5380f8c5c6b7381b0fb276be0efecc81201af7fc90f49c08350ef9
 EBUILD versioningit-2.0.1.ebuild 929 BLAKE2B 8199783dd855462257cabbf7a9e0cd4410c56ebdacebe366942d96419e1166f8e46efa17057c7d42f2ac9b0cb5d2e8b3f78b7fc665be5ec79ad5d9b148136103 SHA512 48a02043ff2dc4ac192f968dd73fd562bb3f1b190beff1e667b4e6dd7ae5e0dd103785310047f1bc45347f1178c1c7ee94c3da3004750787bf4c6fc232653573
+EBUILD versioningit-2.1.0.ebuild 1070 BLAKE2B 1c30c64ad22abf66d00c0af9928e8a0c2dc3e6282ea1003be1873c514e5bbb5a419af988872d4a1ef97c28879396506d9a3de420ded558e09808516e95de833b SHA512 fa96caba1dba1107d7a7b0f7fbf4b237fedb04172d4c255e3c9e6aa94ec0a765529c87f4808323c43e5e52e14b5cf22feec12f1425e9b2034ff9711842e35fed
 MISC metadata.xml 400 BLAKE2B 96934adb9ade5b51537765da51d530a644f87328688415cfd5b239048adede18db1ec7cbb2a234cc2e28fea368aa9c815176bb22262c9053fdc2c85c6c6e3f56 SHA512 9070b850fff35058a11cc7504bbc5fbef17cc9154df5419a64bae10fd3cb160a043ffd0880fc3c5054bd1d2eb4891bcbf5764c56f2441ab79366336caf91e379
diff --git a/dev-python/versioningit/versioningit-2.1.0.ebuild b/dev-python/versioningit/versioningit-2.1.0.ebuild
new file mode 100644
index 000000000000..0cf6927c80d4
--- /dev/null
+++ b/dev-python/versioningit/versioningit-2.1.0.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=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="A setuptools plugin for versioning based on git tags"
+HOMEPAGE="
+	https://github.com/jwodder/versioningit/
+	https://pypi.org/project/versioningit/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/packaging-17.1[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/importlib_metadata[${PYTHON_USEDEP}]
+	' 3.8 3.9)
+	$(python_gen_cond_dep '
+		<dev-python/tomli-3[${PYTHON_USEDEP}]
+	' 3.8 3.9 3.10)
+"
+BDEPEND="
+	test? (
+		dev-python/pydantic[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_IGNORE=(
+	# Tries to do wheel/pip installs
+	test/test_end2end.py
+)
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	sed -i -e '/-cov/d' tox.ini || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	epytest -p no:pytest-describe
+}
diff --git a/dev-python/virtualenv/Manifest b/dev-python/virtualenv/Manifest
index 72b8eff7d8bd..b13789cdb145 100644
--- a/dev-python/virtualenv/Manifest
+++ b/dev-python/virtualenv/Manifest
@@ -1,3 +1,5 @@
 DIST virtualenv-20.16.5.tar.gz 12223925 BLAKE2B 4f87f955d2d2c2b722d7a3699a74dc06aff7f2898203e87e607d1cabf182954fdf5eb2ba847d7b5641ded88e068d6e133441082703f8d874fbb92583f72eb6b1 SHA512 2d4f96057eb8fea5da07126bbc656306b8ebc2db1c82a84b784fcb82cd1959a571dc1f016dead9561e1d073a8b06e10f2e225d6484b363b960adaa64239826d3
+DIST virtualenv-20.16.6.tar.gz 12233333 BLAKE2B 3165de2c5350185f06ad2c1b105987b6bca421d5172a07dbef6486a285c2c5e7f8e095901241c894daec11f2e9bc565ddb2a7605eb5ff5ec9f84ea77296ab206 SHA512 24ca5038cc4e9cd72cf99a8bd4b96bda10cdc8deae2e6e7a0bef5000fd8fbeda87c4fda21aeb3b109a3763e47e0a7c7a5f383914a1bb1edcd8ed6791117d91cb
 EBUILD virtualenv-20.16.5.ebuild 4831 BLAKE2B cba04409dcadfcf6c9b740b8b2fa86fc9df4556976a59ae709ec9a4ecf6313c82aa8dd33bc0c21fddf9b60c52315cb41df2d0beee85d2f0e22c7d766fb6fe882 SHA512 f18f48920f7115b97b7ce4bc2a1f179a47f5a52956b4ad0190c15e1181a987e0cf2a8de4347016d4e7ba593790ad6125d763f20250fc5fe0f6c46631b74163fe
+EBUILD virtualenv-20.16.6.ebuild 4839 BLAKE2B 259bdef9e234b3bca21b50185633b6965e193ccdb9e09d7dcd2efcd88d8727f75bd3324efb6f0520735b3bef65c2e1f464a10fe0b899c7c29a874e3a82c2d843 SHA512 75d3fa99788c16f6688aec27f6e60f6cddb24e41c1a34f521b1cc4e5817580791050a900e78de126d826914bb2d5872c265ac4ad469c42a9c25f9f378d30023d
 MISC metadata.xml 406 BLAKE2B 97fee04c2662c5c36b6e16538284def46eb2454424770f42edf2567ed804ca15c4e969c714c57573f897b0946246577ab6e35204ed1f3f1735713d8ab5d24667 SHA512 356d42db463b63a3b3a55c1e98eb661de0a10aa6a5fde4f8b3f888ec73020c6679e86efd8dbb0b3e4a5a720af95e658612ba460fe548e081a90beec75fb9c1b2
diff --git a/dev-python/virtualenv/virtualenv-20.16.6.ebuild b/dev-python/virtualenv/virtualenv-20.16.6.ebuild
new file mode 100644
index 000000000000..23c6be3b691c
--- /dev/null
+++ b/dev-python/virtualenv/virtualenv-20.16.6.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Virtual Python Environment builder"
+HOMEPAGE="
+	https://virtualenv.pypa.io/en/stable/
+	https://pypi.org/project/virtualenv/
+	https://github.com/pypa/virtualenv/
+"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+SLOT="0"
+
+RDEPEND="
+	>=dev-python/distlib-0.3.6[${PYTHON_USEDEP}]
+	>=dev-python/filelock-3.4.1[${PYTHON_USEDEP}]
+	>=dev-python/platformdirs-2.4[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-63.2.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+"
+# coverage is used somehow magically in virtualenv, maybe it actually
+# tests something useful
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/flaky[${PYTHON_USEDEP}]
+		>=dev-python/pip-22.2.1[${PYTHON_USEDEP}]
+		>=dev-python/pytest-freezegun-0.4.2[${PYTHON_USEDEP}]
+		>=dev-python/pytest-mock-3.6.1[${PYTHON_USEDEP}]
+		>=dev-python/pytest-timeout-2.1[${PYTHON_USEDEP}]
+		dev-python/wheel[${PYTHON_USEDEP}]
+		>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
+	)
+"
+
+# (unpackaged deps)
+#distutils_enable_sphinx docs \
+#	dev-python/sphinx-argparse \
+#	dev-python/sphinx_rtd_theme \
+#	dev-python/towncrier
+distutils_enable_tests pytest
+
+src_configure() {
+	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		tests/unit/activation/test_xonsh.py
+		tests/unit/seed/embed/test_bootstrap_link_via_app_data.py::test_seed_link_via_app_data
+		tests/unit/create/test_creator.py::test_cross_major
+		# tests failing without python2 installed
+		"tests/unit/create/test_creator.py::test_py_pyc_missing[True-False]"
+		"tests/unit/create/test_creator.py::test_py_pyc_missing[False-False]"
+	)
+	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
+		'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-isolated]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-global]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-isolated]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-global]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[root-venv-copies-isolated]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[root-venv-copies-global]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[venv-venv-copies-isolated]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[venv-venv-copies-global]'
+		'tests/unit/create/test_creator.py::test_zip_importer_can_import_setuptools'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.10-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.10--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.10-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.10--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3--bin-]'
+	)
+	[[ ${EPYTHON} == python3.11 ]] && EPYTEST_DESELECT+=(
+		# TODO
+		tests/unit/discovery/py_info/test_py_info.py::test_py_info_setuptools
+		tests/unit/discovery/py_info/test_py_info.py::test_custom_venv_install_scheme_is_prefered
+	)
+
+	epytest
+}
+
+pkg_postinst() {
+	elog "Please note that while virtualenv package no longer supports"
+	elog "Python 2.7, you can still create py2.7 virtualenvs via:"
+	elog "  $ virtualenv -p 2.7 ..."
+}
diff --git a/dev-python/websockets/Manifest b/dev-python/websockets/Manifest
index 00868d572959..45f1372bc8e9 100644
--- a/dev-python/websockets/Manifest
+++ b/dev-python/websockets/Manifest
@@ -1,4 +1,6 @@
 AUX websockets-10.3-py311.patch 1065 BLAKE2B 16e66f28b0b1bd68b28bafd91ff83fd72d295ff52fa53420ec4a9be31ae66c4b0f4e515b8c62feba616cd6d3650af30566c97f157dec469f2f3de5e584eb0b7f SHA512 94c34e96b9d6ee75599be33bb246ac21a41763f51dc59255632273f8d46d0553f275c9e888615adda93047ab65eeb577dab64a5153c1cb3155c27f9618c0c961
 DIST websockets-10.3.gh.tar.gz 304375 BLAKE2B db6075304613ff74ad5928a0c57e90a7d418ac0b9532adba4c6a17b3c3f1982cc94db8ac4c0da5f65343a915f3b2e7ccedce4e6d5d4960cb72fc93c3db6e041c SHA512 75a11dd7605808954c5f59decda5b115db73de96ed4023d8d7ee3c9966551a9ded2d771f76b086c76f49b0787f19349dadcd9010eb5fea8eeddf3d9bba1c6cbb
+DIST websockets-10.4.gh.tar.gz 309611 BLAKE2B f3a739368ff9d78fef79324af59d1e77b3fb654b8b1a847373a29f19b11ae9266b9a938d235ee27d12b59d9b4cf29825fc7298ff2f35e5b260df2c7a41a1bd78 SHA512 087b1920ff26e21b8d3b80b53249d44b841fc45a4992df1ad725112404f724a41aaa2d759a2bd521dfe337459f8bf0d2ae048c423489f527c68f6825f928b582
 EBUILD websockets-10.3.ebuild 871 BLAKE2B b97e0aee91257ce1bb254f0e81017bc49d488d332d6206ad3dd9a429218f6d7f9ba0d185b6bc59160f638a4e0d1b81caa046e70afa9829bd3f615a1006f420c6 SHA512 d25050228fe2fcffad26943fa4b54e4cefedb73e4894cdab4e301e5f5d942e53edb769daa7cea808e09c29c85f0da202f52fa209339dd6ada1e87e56a2682154
+EBUILD websockets-10.4.ebuild 834 BLAKE2B d4e9f008874c530ac2bec8b35045011a4e70a28cfea69521aa4a5d53da0131366d194edc94140fb4e18ab21050d6ebc30601283318e558b74c1bf68885fbdcd6 SHA512 31377f86cd37787f32a8e049afd59e28510a2f23746927d2530374bf5a9267721b36958d162896827975904411a847ae7ca195b3383b9c6b911c7aa2011c7312
 MISC metadata.xml 488 BLAKE2B 06ed81aa4ffa49d1951a8ef639752bc701d798fa531737d4cb367ca198e65178f430d6b1e7f3b24ffcc332343dd58a0cc8ff5f2632a225e6c0f36ee50148aebd SHA512 8335bde47d396c018b32db406e18636edd7f3fe5704c901888d56690ec726aeb7d6f9e42fb7dbb1869c78b494c9cbc17ded3ca78b7576d6fdc0a8097bf996f60
diff --git a/dev-python/websockets/websockets-10.4.ebuild b/dev-python/websockets/websockets-10.4.ebuild
new file mode 100644
index 000000000000..12d175fce31a
--- /dev/null
+++ b/dev-python/websockets/websockets-10.4.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Library for building WebSocket servers and clients in Python"
+HOMEPAGE="
+	https://websockets.readthedocs.io/
+	https://github.com/aaugustin/websockets/
+	https://pypi.org/project/websockets/
+"
+SRC_URI="
+	https://github.com/aaugustin/websockets/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# very fragile to speed
+		tests/legacy/test_protocol.py::ServerTests::test_local_close_receive_close_frame_timeout
+	)
+
+	epytest tests
+}