gentoo auto-resync : 05:11:2022 - 21:18:38

42 files changed, 296 insertions, 176 deletions

diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index c5f91d7856de..ac3318b17fde 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/boolean-py/Manifest b/dev-python/boolean-py/Manifest
index 32b64619e57f..defd79410088 100644
--- a/dev-python/boolean-py/Manifest
+++ b/dev-python/boolean-py/Manifest
@@ -1,3 +1,3 @@
 DIST boolean.py-4.0.gh.tar.gz 33855 BLAKE2B 68e183c670684d2f92ad94f2b88616c932c2a85db40fa1a2552bc60c9bf03999bb456e0a91623afba2af4f2c89ef6cacf0c6f0267ac55aadcf02e67c8324c8f6 SHA512 2c92188645c4949478b40c2879f02a0eb6f3f92c0781a910862fcccebaa3476b9f2668ef40a5faec9d5c3a9c7361043a8e1b92ed98e282d6ce89c56b8ac0c2ad
-EBUILD boolean-py-4.0.ebuild 606 BLAKE2B 26db1e694d4992a892575af54d2ca93434af686210160b8154546ecea841230132b2350978f30fc596996cab69709d69acfff36152c2d5c48c1e2c62c98c16ec SHA512 addb4f7319de50b56a001b5e6e4783d1d196fb65a32d9f3c3590870f27d680d9a817eb417d89a1f583b2f832315499967d559c17ee1b6d952616e7f82c9e4c70
+EBUILD boolean-py-4.0.ebuild 605 BLAKE2B 1cb193d2c23fdca8201806d50c60aee374239c87c7c20a843c610db3ddcff4894464f6c628b7714bc409787e514c962b15febb0202655502b9af84a24f25fa5e SHA512 11706e495a4e39756cdc0c12d2bddc2ca47de537eefa9e91ce85a346869d84ecfedf6670a9a3272fc26fbccde25a5b3b8b793ef835fcb9885e69105a77721af1
 MISC metadata.xml 374 BLAKE2B 4dc485dc736f6d9e3e47ca111cb85e0770d8701bd7a10587f6aaa035723a66f225eecb633f2a127255051637c7f64d17f69d9f449a50f00b00cda766b88503c2 SHA512 940cc16f6dddb68c7154bab0be91f5c5639e4f3563a1efa2d56a4a17ec8dbe70f86f7e53be6cb082283d2c650edbfcddc406419a6acdfe2ebc8035a12b17c35f
diff --git a/dev-python/boolean-py/boolean-py-4.0.ebuild b/dev-python/boolean-py/boolean-py-4.0.ebuild
index 7cc0e5662410..3e1e9059cbbe 100644
--- a/dev-python/boolean-py/boolean-py-4.0.ebuild
+++ b/dev-python/boolean-py/boolean-py-4.0.ebuild
@@ -22,6 +22,6 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/cerberus/Manifest b/dev-python/cerberus/Manifest
index 4fb83a694c5b..7db462d4b6aa 100644
--- a/dev-python/cerberus/Manifest
+++ b/dev-python/cerberus/Manifest
@@ -3,5 +3,5 @@ AUX cerberus-1.3.4-raw_docstrings.patch 695 BLAKE2B af53c17d8b683e1d88e744330ff9
 DIST cerberus-1.3.2.tar.gz 149344 BLAKE2B ce65f3c4c612f87562c28f913cac95c1c7af9b2dfa72955bce3f0e0459e4ff9024a126ceea4587e2c72cf606be2a249046a090a2e2d5e908bfe4b700ba5e9b92 SHA512 e9cfef5a936783eb0576afd3d23397dab38d8c88b6b43f98de0ad7e20739e5ff983eaf4ac769206adb7fe9692c651583f6a5f2bab263b81b8de96f45707c84fb
 DIST cerberus-1.3.4.tar.gz 926258 BLAKE2B 6fabfcf32e26ee7f4881b64ce9c3098a27949d95fd0998e09b7adcc3b834033f904a07b6e9b2cadea218b952142f6c2bc6051d8c208a14d6e8172a0c3823c38b SHA512 c816b426ed1b32367d1e8f1c26d6ddd4b49c6578540e688baf693e3094a05800f645cfe879be6378c1e9be9899cad7bc2ad1ed9844d6762d2ef6e0cc54a7476a
 EBUILD cerberus-1.3.2.ebuild 555 BLAKE2B a2daf7c5987368b3c9c85ac67137f263200fa99819c204ecd89f7175a91a39a7415d9b567a944be7dc4e71d4adf0efb0c0faa97040eafde1772931c0f684b8fa SHA512 7be0b457e94d62f49d6b24c448ec98c07394a31c8f9f773aa0f8d0090664a23ac7d0b232d26a3b9546bf0d48ef8b7da9078b160026282388c3e8aefa5000afb1
-EBUILD cerberus-1.3.4-r1.ebuild 841 BLAKE2B 2fb27b20cf2685a8f2a9ef5c752f42c2e79d91d5323b50e1e7642c6245655c5523d234026f10e28c719016fe5980bdc44971c184694e46a0285b21f49e2e3d11 SHA512 97f4a87ba7d609125ce912c778b9a6601614376638619a00a54d506efc0830b0a9a5b54034078ac5538beff365ca08ea20609264e4b23de7c54a42fe265b2ae1
+EBUILD cerberus-1.3.4-r1.ebuild 840 BLAKE2B 8aab56c9925ff85f2af729345453c14d5c6d93ebfcd05da5ba327683c16e8beaa123093cd85955f124be55b7a20fceb452b3417d9fdb1279381789c65a46558c SHA512 439d133cd9d66516de5a9da7d2fac468b69b993cdb2d3bb3bea22fec978497c3a58906433a032077f03de411b74cdb40147c59afa7feb02d2b6fbf09753b173e
 MISC metadata.xml 395 BLAKE2B c9dc795ac8b1daba3bb10e3aef517b28be2e88b26f5e1192c380bca300ef929608e2b2bcef23adc710e01d41fcbc640c97429d6d8ee61fe4a78014aa181b528d SHA512 c1abc73709d977c4f7a3e989c335f0d1312d07dc843dd88faadc633e2dbfa3371c1cee566a481ebfaabdba60e0a8f00068ce8a83ce9b05ab091c35917b8c146a
diff --git a/dev-python/cerberus/cerberus-1.3.4-r1.ebuild b/dev-python/cerberus/cerberus-1.3.4-r1.ebuild
index c8a27d829a9f..9d62663bcc83 100644
--- a/dev-python/cerberus/cerberus-1.3.4-r1.ebuild
+++ b/dev-python/cerberus/cerberus-1.3.4-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.3.2_no-pytest-runner.patch
diff --git a/dev-python/flit/Manifest b/dev-python/flit/Manifest
index b5220756cf4f..3be778ff3b29 100644
--- a/dev-python/flit/Manifest
+++ b/dev-python/flit/Manifest
@@ -1,3 +1,5 @@
 DIST flit-3.7.1.tar.gz 136642 BLAKE2B b94f8bbe00c2c5fb28bddbdcf240255ed53ec3b24d2eab1a33e37261cf32a92a0171ea01ad1488384c15f46acbf84d47c4679b318932a3ee78f22c1d161156b0 SHA512 336e81b034da2f38d7decb32c8961ce62d30f6fd2cb4778b09c956eb400277673d4c94cd57cf08fa7f115f8836aadb0469197d0096f833da9317db8a4f75baed
-EBUILD flit-3.7.1.ebuild 1473 BLAKE2B 260fb336b5102e129b216efa6a5cba93c8d9cfac8c47918c03a3dafc05bc6dfe1b3e8703a0615edc65588666500c9579c8b11c91f06a4cf94047ca411d3a98e9 SHA512 5c67f919d8ca5817a3855394b165cb821eb996180bd81f8831f6935b21b249c46443909ab9c58eaf7f0a063935d664e110aa6b3c6f2318a99bb5b0aac1b4aa0d
+DIST flit-3.8.0.tar.gz 139496 BLAKE2B 85ee9fb13af35bf6716713bd7cf3f5893cd729826ad362aa5ec22077f9b4d16db4d785f183dee37c725b771188f31f2cf38c8e4aedc3af25a3efdc8ff1460bc6 SHA512 08170ee710857fcbfc1f72dbb94c535d70a2477c7598eacacc9a0e2f90f4fe11f4d910f1fcc11de210a6b50d89049e5835127090c6acabb00c69a821919e68cc
+EBUILD flit-3.7.1.ebuild 1502 BLAKE2B d9f0011c34dd1cd297b8259044f918bbb390f59b01a38c1fabb11138dae125ab22373e9ac87582868c2836f2b0144841d2fab3c3647e91640595ec8fce86a679 SHA512 92b4c34b593ea266e3ddf5379edd65eed5517073b36af5c2f797c06d5b275ed701484de3d60a603a47f775ca67ad95d5134e2ec38206eae981eb47fb2af951e6
+EBUILD flit-3.8.0.ebuild 1502 BLAKE2B d9f0011c34dd1cd297b8259044f918bbb390f59b01a38c1fabb11138dae125ab22373e9ac87582868c2836f2b0144841d2fab3c3647e91640595ec8fce86a679 SHA512 92b4c34b593ea266e3ddf5379edd65eed5517073b36af5c2f797c06d5b275ed701484de3d60a603a47f775ca67ad95d5134e2ec38206eae981eb47fb2af951e6
 MISC metadata.xml 467 BLAKE2B 534a82783fa3ff1642fc8400689549e75223fa01b175f4ac164d4a636a4c9eaef5bdd9fdd339ffc30239436449788b4d01ebc5e3609034d440c01a5c699176ea SHA512 ad8f3f98a35aa88255bafa81ea9cb109e14b8a544b053cff3f1325dfda3c4c6343a5060353c43a08e030e80a60186eb7dae248d7f6739ea95a7e72e747b1b194
diff --git a/dev-python/flit/flit-3.7.1.ebuild b/dev-python/flit/flit-3.7.1.ebuild
index 5b1ac297822c..a2c1e11caabf 100644
--- a/dev-python/flit/flit-3.7.1.ebuild
+++ b/dev-python/flit/flit-3.7.1.ebuild
@@ -46,6 +46,7 @@ distutils_enable_tests pytest
 distutils_enable_sphinx doc \
 	dev-python/sphinxcontrib-github-alt \
 	dev-python/pygments-github-lexers \
+	dev-python/sphinx_rtd_theme
 
 src_prepare() {
 	# make sure system install is used
diff --git a/dev-python/flit/flit-3.8.0.ebuild b/dev-python/flit/flit-3.8.0.ebuild
new file mode 100644
index 000000000000..a2c1e11caabf
--- /dev/null
+++ b/dev-python/flit/flit-3.8.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 2019-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="Simplified packaging of Python modules"
+HOMEPAGE="https://github.com/pypa/flit https://flit.readthedocs.io/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~x86"
+
+RDEPEND="
+	dev-python/docutils[${PYTHON_USEDEP}]
+	>=dev-python/flit_core-${PV}[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/requests_download[${PYTHON_USEDEP}]
+	dev-python/tomli[${PYTHON_USEDEP}]
+	dev-python/tomli-w[${PYTHON_USEDEP}]
+"
+BDEPEND="${RDEPEND}
+	sys-apps/grep
+	test? (
+		dev-python/pip[${PYTHON_USEDEP}]
+		dev-python/responses[${PYTHON_USEDEP}]
+		dev-python/testpath[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_DESELECT=(
+	# requires Internet
+	tests/test_config.py::test_invalid_classifier
+	# failing due to Gentoo pip patches
+	tests/test_install.py::InstallTests::test_install_data_dir
+	tests/test_install.py::InstallTests::test_install_module_pep621
+	tests/test_install.py::InstallTests::test_symlink_data_dir
+	tests/test_install.py::InstallTests::test_symlink_module_pep621
+)
+
+distutils_enable_tests pytest
+distutils_enable_sphinx doc \
+	dev-python/sphinxcontrib-github-alt \
+	dev-python/pygments-github-lexers \
+	dev-python/sphinx_rtd_theme
+
+src_prepare() {
+	# make sure system install is used
+	rm -r flit_core || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/flit_core/Manifest b/dev-python/flit_core/Manifest
index ed53bdcae8b0..2d2582f92c03 100644
--- a/dev-python/flit_core/Manifest
+++ b/dev-python/flit_core/Manifest
@@ -1,3 +1,5 @@
 DIST flit_core-3.7.1.tar.gz 40330 BLAKE2B 67a938ef576a70ce1bfe1f1bf996f1d2e468ea46f76ed2a363b278cebc42602b38fbf44a6bc45294996549d673d3145e2db2293780b8d157fd4f3b3876dc88cd SHA512 8c477bcd2924a93b51e6f3d8bbc3599929663c8d5addf16062e8e1b6c5acd740a4e4905b144092efb6e38e9700479525013831a53e055438f94c1e53ff5c6f8d
+DIST flit_core-3.8.0.tar.gz 41224 BLAKE2B 20d0b1e245280938b1edfa83531907775af9da30cc6e1446d578eafc7e14184d3c8fb80f446d265456ea5ea587c51edfdb706793a8894916525b3ebba322b3b0 SHA512 914804e3f2040762381afe039272d9d6fdbcd3f3cf8b9eea854f2f1d95edcb01718fd6685476bc1cdc251dfc46ef80b40f087df881d8b963dcc3f3332fd32a46
 EBUILD flit_core-3.7.1.ebuild 975 BLAKE2B fb5a32383c27ce42f9b7871214acf3709aa0277186c345286b3be0303f88fc398c427fcb56059fbe4956bccbdef889f7a744d6bc06b29fcb67d94cf2d591e800 SHA512 cac15d7aa34847e6de8da04576297023f1803a47744681f9c41406afc6e693cfe9483772dd122419fa40ff0bbaa81b72af7c448c3464da0a25e1d66cf76e6eb6
+EBUILD flit_core-3.8.0.ebuild 983 BLAKE2B 94f1986f12a76354c8e68641fee45ad5f2d8b416aa3a0788a594d9f1d932be0b7dd545ccf996a7ddafa16b276e6ec50be1c3614fd26c709319d79e9e7f95b03b SHA512 50c49027fe488668636ee261768654e3d85edb4231698da2c61d6a52d3ca695beb028bc517d4523c6d5082cda4ad8a5712f0fc3255b6f43b8726c8227f865530
 MISC metadata.xml 515 BLAKE2B 33956c683d7d81bef0a8929619cedb0f3eb0ef050ba213edd65ee37d152bbe9e51cfe1d0d3a4a56b43fedbfb7cd408ddc1d9beb34dfd8973c3377fb21c618794 SHA512 d34cb6fa917368fb550d001ef8bb10c18d27f8e8536c049e21085267ecd26a9a22f1caf80e1c835b1f98426aace9d7548502c38aa9edd78ba67032823a23b0ca
diff --git a/dev-python/flit_core/flit_core-3.8.0.ebuild b/dev-python/flit_core/flit_core-3.8.0.ebuild
new file mode 100644
index 000000000000..69a2fb57c5e6
--- /dev/null
+++ b/dev-python/flit_core/flit_core-3.8.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 2019-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
+
+DISTUTILS_USE_PEP517=standalone
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Simplified packaging of Python modules (core module)"
+HOMEPAGE="
+	https://pypi.org/project/flit_core/
+	https://github.com/pypa/flit/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="
+	dev-python/tomli[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? ( dev-python/testpath[${PYTHON_USEDEP}] )
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	rm -r flit_core/vendor || die
+	sed -i -e 's:from \.vendor ::' flit_core/*.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/keyring/Manifest b/dev-python/keyring/Manifest
index f9a9f29a6094..70cb4ce7abd2 100644
--- a/dev-python/keyring/Manifest
+++ b/dev-python/keyring/Manifest
@@ -1,7 +1,9 @@
 DIST keyring-23.10.0.gh.tar.gz 47127 BLAKE2B 1179cd0b835d2c394f9649782c692ff719d55ee15e975266951df356f97d946a0d7270e454bcaf4dca902ab511d90460c935369773ddf8f553835e0a83123479 SHA512 74d0049b300c2740b00d89de1a9688fc5901006d1d499af9a33f6f12d8634b749450d2527420404086ac7ec7606ca9fad4cb002fd217dfa82ccef173aa8e61e9
+DIST keyring-23.11.0.gh.tar.gz 47229 BLAKE2B cb5f4a771bc94db058d5783e6bcfc84a29359d8445f55a38b125fe5e751a7e13ce54533fcdf7ab47b50f5fb37a20858c4113ad7ec683b2123f136a7059763bff SHA512 8f200455229ef944729bab557845b2e4220fdd5146d3610105c907fe14ae4358ce85fab0c63c2a0598968871fc01e8b564c8e4d436930f3d39f11e93ae0b209c
 DIST keyring-23.9.1.gh.tar.gz 46768 BLAKE2B 4b1acd33f53244a8932efbd54a8edc065071cf2ce2049d590a7804b171b90719fb18d982aa7bea217f76beab80e2cce5d4ff4f5440d23342879aed5ee79d7c82 SHA512 e384c4e592b2c4b9b6505c1fe22d9192c6d577add52e874490833dadaf1aba9dfc708593762471de0f5995bc6bb35f61ba541590a152528b489128fca629c623
 DIST keyring-23.9.3.gh.tar.gz 46913 BLAKE2B d55425c8e18f65362aab531b707e261b0990ab9c4f890286a63964fd2b29380ad9e2c19eae4c723848e3fcfff0eb6d3dcd4377e7151fa2dc5731987f2b468121 SHA512 8ee5da4f464fae90237f246037e2c675740dfda4945d6afcf2e5a4fdaf076766442590db92f9d32bda2dc820446a95a6e8ee3ccbccdb9c09e6c71bbd0e52f5b1
 EBUILD keyring-23.10.0.ebuild 1261 BLAKE2B 70abd801d8dc9ea52709ac35074da87e29248ffc11a020c89b71c63d90f5542c4708d8d3201ceca6b1e95a72679a2964ee381f465d4bdc9429af934593bf03aa SHA512 c75a0c8924d213728dd6e37d1d9ed6e3eeaed53d5bbc912ad2744679c382e8050be7fb1a9c64e4cb5c82ff15939564442893355905d8d37dda73cdc7831e88a6
+EBUILD keyring-23.11.0.ebuild 1261 BLAKE2B 70abd801d8dc9ea52709ac35074da87e29248ffc11a020c89b71c63d90f5542c4708d8d3201ceca6b1e95a72679a2964ee381f465d4bdc9429af934593bf03aa SHA512 c75a0c8924d213728dd6e37d1d9ed6e3eeaed53d5bbc912ad2744679c382e8050be7fb1a9c64e4cb5c82ff15939564442893355905d8d37dda73cdc7831e88a6
 EBUILD keyring-23.9.1.ebuild 1196 BLAKE2B 7d2f2f2a4882d589ab30a8f790400ce677967ff48e9c6943ed5a5f8eab48c140756fe6f8bc7f9bb068d76ebdbf9eed8593c3ef1e5f0ce14938d5a42518226c21 SHA512 5a884c745d5a228d19a175d8fad76fb749a04fc5fccceec4c068719ffebb9e0455a8904c0ea28c435780389986eae0cc5f44fce1c40286bcd48d39e021b9363f
 EBUILD keyring-23.9.3-r1.ebuild 1248 BLAKE2B 0c7e9b679ff2cd25a9b055684a2b94e28ff5c8510fd4e756bdd595264dd89734187e08a64bc8b2ec25b1ffde0ea7ad3ca1a57bb545050abce72248b38f8c692a SHA512 594ce9d4271d6b19f2e441c095213f797d5b7685ccf1a351902586811b1d5a046a9fa94e5f14d489f816c36d40f8ab4b5f4da567f371fdc9acad73768f3ca1db
 MISC metadata.xml 611 BLAKE2B 7f938075d992467e01da200f0c859e9bc6a6128296151b3529b2168b68364605bd7dbadf69f7820d459d5db6950908e0b0acb09a636f1fc45862093df6d08334 SHA512 a0ad1729c53b18fedf227053648b04541f5adcf56bfaa73218e214f8c2409ebe2574a5917442c5218084b38da34691b6566f2c65390ef6487985a123f62f9efb
diff --git a/dev-python/keyring/keyring-23.11.0.ebuild b/dev-python/keyring/keyring-23.11.0.ebuild
new file mode 100644
index 000000000000..e3c99b84fc3b
--- /dev/null
+++ b/dev-python/keyring/keyring-23.11.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} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Provides access to the system keyring service"
+HOMEPAGE="
+	https://github.com/jaraco/keyring/
+	https://pypi.org/project/keyring/
+"
+SRC_URI="
+	https://github.com/jaraco/keyring/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+SLOT="0"
+LICENSE="PSF-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	>=dev-python/secretstorage-3.2[${PYTHON_USEDEP}]
+	dev-python/jaraco-classes[${PYTHON_USEDEP}]
+	>=dev-python/jeepney-0.4.2[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_metadata-4.11.4[${PYTHON_USEDEP}]
+	' 3.8 3.9 3.10 3.11)
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+EPYTEST_DESELECT=(
+	# this test fails if importlib-metadata returns more than one
+	# entry, i.e. when keyring is installed already
+	tests/test_packaging.py::test_entry_point
+)
+
+EPYTEST_IGNORE=(
+	# apparently does not unlock the keyring properly
+	tests/backends/test_libsecret.py
+	# hangs
+	tests/backends/test_kwallet.py
+)
diff --git a/dev-python/libtmux/Manifest b/dev-python/libtmux/Manifest
index 34524a6afa7f..9048ffa14fb5 100644
--- a/dev-python/libtmux/Manifest
+++ b/dev-python/libtmux/Manifest
@@ -1,9 +1,11 @@
 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.10.gh.tar.gz 240378 BLAKE2B 81841a25b01bb26d2c612a14cd4518c48b12162d4aafa280fe0d6de269d149bddaffe72f4ce2c735e41b00cd2bfec19773d7cd3b9fd927c892f11f0cdf8e8a88 SHA512 8ee870c94bd3e3a9fffc19854f978d4faad747ea395e53c3576adc9cc2dcdd3cbdedeeb589a2dc11b0ac836931ffbdcea06a4a850b2ead163235dda2334defb5
 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
 DIST libtmux-0.15.9.gh.tar.gz 239611 BLAKE2B 7a171c827fde0ddf3fa0191c00d4e22e5027d925781f7231497c09a038f16d3408ba894d4f8d71470a0d8dbb8f1fc387971d3c8ec94d9f03a3f0af0e2ac0c7c7 SHA512 e7599dece70188cd210de7a1e554d86ba12b8479757dd03903cf3e0608e8e9cf3d181e4c0afc7432d6977dece931707120399690932099ed7d07d847ac76655c
 EBUILD libtmux-0.14.2.ebuild 1045 BLAKE2B 15271b0d210c5a18446c2db48a545c5011681b45f428860d4ce0f203164f48808a31de53574924dab1488119714124d12e8cc0a6272418cf960ec4c44180ce65 SHA512 b613a238fa185740af567aac8ad73753d82cd27c962d76bc3d7a5991b123dcdd42c9f64e6fcdc35a36f0e762066c839eb4e18dfb19ac5d9aa289c5eab06690d2
+EBUILD libtmux-0.15.10.ebuild 1226 BLAKE2B bb2a762509d92843cc06117970cd13f281f240d940b9f643a4b32269cdfd123e59062abe40e1b6384220032809694e0c175f1f644029984928db7d904323c38a SHA512 fd07446e27ab0c2161d361da0cebc671f65735778ace25a935c2b37127a04bb92b7b80da4182634f1d6afa299246ef061ed2785432328bd7abe1accfd86573b9
 EBUILD libtmux-0.15.4.ebuild 1105 BLAKE2B a246a6c5f674b6ce925f464defc95d227b13d0df27da418cd7a17264d9514f46311e152f186f7c22e03bee1c561d8b5a68624cc5b1d9f980d62769ab1a1d7b27 SHA512 39b9d27fafa9ef35f1efdd8f8f98136a9bb5eb233df86a8ed418117e7280e2bfd7df15c0a5c47a33ca19b1a9238433f76b3cd5a209da8201d239c835316e1cf5
 EBUILD libtmux-0.15.7.ebuild 1107 BLAKE2B 86d2a4be1375dd000a50e988048b68ebb71018fc2d7cdbd551afdee3356167806c98016a0d0d683a4979a56fbf2cd0984a57baa3d4e44aafe295378ba3db4b5c SHA512 f064c66e296cf4627d93efedf796f71c84183e27355d39b5275df582ad2992e8bb4f286f337d24aba7eacfdd1e31c04ebf577672c5e2815a3341b2b56a3b83a3
 EBUILD libtmux-0.15.9.ebuild 1226 BLAKE2B bb2a762509d92843cc06117970cd13f281f240d940b9f643a4b32269cdfd123e59062abe40e1b6384220032809694e0c175f1f644029984928db7d904323c38a SHA512 fd07446e27ab0c2161d361da0cebc671f65735778ace25a935c2b37127a04bb92b7b80da4182634f1d6afa299246ef061ed2785432328bd7abe1accfd86573b9
diff --git a/dev-python/libtmux/libtmux-0.15.10.ebuild b/dev-python/libtmux/libtmux-0.15.10.ebuild
new file mode 100644
index 000000000000..6782f5641a27
--- /dev/null
+++ b/dev-python/libtmux/libtmux-0.15.10.ebuild
@@ -0,0 +1,56 @@
+# 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/
+	https://github.com/tmux-python/libtmux/
+	https://pypi.org/project/libtmux/
+"
+SRC_URI="
+	https://github.com/tmux-python/libtmux/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}]
+	)
+"
+
+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
+
+	sed -e '/addopts/s:--doctest-docutils-modules::' \
+		-e '/README\.md/d' \
+		-i setup.cfg || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/license-expression/Manifest b/dev-python/license-expression/Manifest
index efa3372be971..f03c66fe04ac 100644
--- a/dev-python/license-expression/Manifest
+++ b/dev-python/license-expression/Manifest
@@ -1,3 +1,3 @@
 DIST license-expression-30.0.0.gh.tar.gz 153630 BLAKE2B 4231bf14e69705fbf40cc4af5f17a1070c780d595db5ab0098b318eeb7289740b86319c683e61aaf844a1cc5b8598d832f14e4eeac354aff37f7b82e5437df1d SHA512 ce6e3a48c1e035e98c3831180bdafb1d70afe94b1d0148c47941129a8223b8b39e11af9407b255ed7a3d1247873c18848f8236c0a805e9b2333c6d59506aad12
-EBUILD license-expression-30.0.0.ebuild 754 BLAKE2B 51ca3fff4ac84900470632f7c53ca3a4c82b33ec903ec322b710fbe05288fbe2e1aea9022c8b75ced0e79acd5c848dee1ccaf7d7c177c7446d79bb921beaf1d1 SHA512 52ad224a5c617709261e8fc10f2d9c6a94b66bbe4a530ac08c77e83c0ff6b77fc17c9b8922d387600f00697c12ac219ca314de53935418cde08d698b9d874382
+EBUILD license-expression-30.0.0.ebuild 753 BLAKE2B 451fd82c64d76c7324a588c2247735bf419200d4649d62ac2db4c5d3e11bde6b52478c4312ab8047486368a4897e04eb570e192ff670d415ee65233a14887f4f SHA512 d415c0e29e0ee64b40aaecce695be52f03e0ffddca8092b14e38592d0d5c1ba2a59c6237cdd5523d3416491cf0d8f0a6d9c3bb29f5f697ca0858474bcd8907e9
 MISC metadata.xml 387 BLAKE2B 52d862f7ede77b8ab90dbd9ed2949f1c4a2b289458cff0f2e7042bf43be07b7d7e63ff94f0a10aa1db41027b3441be721656def8d59ba54155d3226e4bd30b57 SHA512 7ba89c3d94ef921fad190a85655d032a7e3a0c5794d0957c3a30ff73c75b717e87517f5f2547408426479d646ac3d157f7e659d66a18d4081689b6b41136b268
diff --git a/dev-python/license-expression/license-expression-30.0.0.ebuild b/dev-python/license-expression/license-expression-30.0.0.ebuild
index f2da65df50fe..31511614c9b5 100644
--- a/dev-python/license-expression/license-expression-30.0.0.ebuild
+++ b/dev-python/license-expression/license-expression-30.0.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/boolean-py-4.0[${PYTHON_USEDEP}]
diff --git a/dev-python/pdm-pep517/Manifest b/dev-python/pdm-pep517/Manifest
index 3e072ca649fd..f9e4e070c5a5 100644
--- a/dev-python/pdm-pep517/Manifest
+++ b/dev-python/pdm-pep517/Manifest
@@ -1,5 +1,5 @@
 DIST pdm-pep517-1.0.4.gh.tar.gz 314677 BLAKE2B dc6fad5bf6bd4aa6d9d490c6fb1df0d1a1543ae93f90ac4d53bbd515de6f6582a4fd032cc5c67aeebf71755fec6aac3b5a462a18eb08087c6a4da279e3c989ad SHA512 4edd016873c054f20efc39b8a044c2ff5dee70509c45ba1227e6982043dabb5ed0353afef4af73c88106ffe5a2c27f569077448fb27a0d58169710d2c6573c2f
 DIST pdm-pep517-1.0.5.gh.tar.gz 314932 BLAKE2B 5a0adce25de4aaa1d57d859223a3632c01f31d9be947384c9a1707fcb413f0a1d1434c9c6bee868ee0c668fa89cc78ef6d4831a4a2b1150607bc5f8173e61cd9 SHA512 e5cde819476187f4ad5caaa0dddb9409fbefb241e0548fb4ad9df4722de3c7b532aba969b399afade0bfd3d774ee5cdcd3bc9ece3a5ebfb2d5a2a6f3280a6ab5
-EBUILD pdm-pep517-1.0.4.ebuild 1309 BLAKE2B c2c29ad327bed8054de90d8be424dce64baef3dcc76fad1a3516166b9d189d907b3dbf0d342120f7575671adea9b3c2d2d4c129fcc1fc116300e590673ccca2c SHA512 4a9cf172f4a931fe130ae95eca978031fc931bf8821e0a67c65521bae94b76b1bb4736e8b7bc0fab5e41e0da083e76e196844c7db6c9e3b602febfa4b34ec53c
+EBUILD pdm-pep517-1.0.4.ebuild 1308 BLAKE2B 0c890bfc9e6e47e6b06040df4c3ca16071055d7e74e1981283d698df73e4e7638c5dc90af0e3e22935f96b68330c31833d51a3180a74a357a24399b9ddb45cea SHA512 132748053bdfb7b72b743f3228fa70af78a179285f8c607fdb81e3aa4cffa331ef7a239f397eb5644b2efdc4ee7476b5ff4035c6a468d5e3a4110e5ebc08a419
 EBUILD pdm-pep517-1.0.5.ebuild 1310 BLAKE2B e6a8fa64a13b0369a7951479ca8417f2a06232b3d7f2ff99eb81250a5c09f71f7f769477f34d45737ffdc340bc6da6ace23f2a86fd6aceffc40001dcae5a4dd9 SHA512 c77a0526f4797346a2f55e7bdc5eee41f47e021935ca83afbf948fd8f088a48eaec9b86beea655b3c449d1a4f79f02f3b9f724669f84f5fe7f2719d76ce5c5c6
 MISC metadata.xml 400 BLAKE2B 0882adff4040585d2881a8712b035a5204909639f80f637526b793fd9e31e9d6cda6119cc069d8ff2e768b9d5807eab16bc27bfd35beb5a613722afead2d8b0c SHA512 484e17561642cf1d26d61a1d95554614b9e77b1ee985cba61ad35dad9c9470d0f64e99385200b8eb7e2cdd5e1427cf7835d6e39c10dece1fb90dd6e81cd15d91
diff --git a/dev-python/pdm-pep517/pdm-pep517-1.0.4.ebuild b/dev-python/pdm-pep517/pdm-pep517-1.0.4.ebuild
index 1033ec44b0ee..28197c2edb5c 100644
--- a/dev-python/pdm-pep517/pdm-pep517-1.0.4.ebuild
+++ b/dev-python/pdm-pep517/pdm-pep517-1.0.4.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/cerberus-1.3.4[${PYTHON_USEDEP}]
diff --git a/dev-python/psycopg/Manifest b/dev-python/psycopg/Manifest
index eb5350c4cf0c..8ddc2e0cb4ea 100644
--- a/dev-python/psycopg/Manifest
+++ b/dev-python/psycopg/Manifest
@@ -6,6 +6,6 @@ DIST psycopg2-2.9.4.tar.gz 384017 BLAKE2B 4bc0afcc890c8a257c1ccd5c6e4e5301857a80
 EBUILD psycopg-2.9.3.ebuild 1306 BLAKE2B 166f519f6e4694fb2725e0f4e736a9ab907dc398c4fadee579da96e37f29faf6f6fe735e56dc9156eefa74302bc516915499d827b3762655863bda1162716e19 SHA512 ecb1f931618b74393cace6f850b35c7512fe5902bdf97eadf0cc1f54e60797c863fe558cda3117ca8a5cd025bd6a761545d6fc1d837aed8ec095c48e98cd7c1b
 EBUILD psycopg-2.9.4.ebuild 1348 BLAKE2B 15b9a3244a73a769cda7236d9bc85f36eee993498672911b121973196f1462f88a7175e26d24e1f772c4f099f2f43b3cc07c603821e13844a103de73abaf7cc7 SHA512 7e63185760b05025ebe0b1eb53673926a4f68d242f4ec2e28a7e1192e72dd876b1982e85f7418a22efada373486edaa2ccd6bd8ff3bebfd2a77d39c295fc1ee8
 EBUILD psycopg-3.1.2.ebuild 1725 BLAKE2B c78cc5299f68452a34fedef960e3ad1bab4d2ab350e06717813bb6972bc0b71c138d1b7d8da12fbea9c36d6b107d9be137e278d43e3a31e74a9fb0df09cbb404 SHA512 2efabffff8d9ae101f2207e694f60bb47daa54454274c8c7abfd69e7b21189628c088e9f8b2677a8bb2a9dde4a345abb165a538a35be7c7dc436a0f886b88ed0
-EBUILD psycopg-3.1.3.ebuild 1730 BLAKE2B 6ec365165188b846b4ba95c6f5e6765abbcfba168dbe86389d71a5a25418fdcb9eec792c7ab59a9da440dcba84b94d0385708f84e5f944ff9da5c4f405627f7c SHA512 599585858fe8620d83cdd58f41e758c4b9b9247ccda20c2a3ed55242bf74d33244129fa5de4a983bd987684d7e4393eabb0f4c90e728b73ec23f11018284dfd7
+EBUILD psycopg-3.1.3.ebuild 1725 BLAKE2B c78cc5299f68452a34fedef960e3ad1bab4d2ab350e06717813bb6972bc0b71c138d1b7d8da12fbea9c36d6b107d9be137e278d43e3a31e74a9fb0df09cbb404 SHA512 2efabffff8d9ae101f2207e694f60bb47daa54454274c8c7abfd69e7b21189628c088e9f8b2677a8bb2a9dde4a345abb165a538a35be7c7dc436a0f886b88ed0
 EBUILD psycopg-3.1.4.ebuild 1732 BLAKE2B 346e6e31a3be765833c4a1d75009d3c8e7347aea9a4a38d35d0cc5c7da722d23abfc41c5b4943331a008b19238a7544c0b181eec83a23a68ae1bc68e5748757f SHA512 f808046857d7400d55ebd1e10ab5f090c26f78b181ded703798acd5a9531bff61bbb450350f904533e265f0fcd2c5032db53a9c1503ced826dc26002cc2a844e
 MISC metadata.xml 369 BLAKE2B 042788638a82318248d4e4ea1e12bf1631af6ffc435fc0110e13849dad600854e8b57f5ba3397c4d4e5d103e165b342f8aba869e72e9b63efc500382d3423414 SHA512 5b216575e8cae847f71a09ed6b676a73fccf2070f3bea3b35f1bfbde95fb0154b2fbb356948e112cc9f2298fc9868ac3994a139e72939f80d59c084ec58d80bf
diff --git a/dev-python/psycopg/psycopg-3.1.3.ebuild b/dev-python/psycopg/psycopg-3.1.3.ebuild
index 4d7be6287448..da15e1f0a432 100644
--- a/dev-python/psycopg/psycopg-3.1.3.ebuild
+++ b/dev-python/psycopg/psycopg-3.1.3.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${P}/psycopg
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 
 DEPEND="
 	>=dev-db/postgresql-8.1:*
diff --git a/dev-python/pydevd/Manifest b/dev-python/pydevd/Manifest
index 1500614d7a47..131641abb1b6 100644
--- a/dev-python/pydevd/Manifest
+++ b/dev-python/pydevd/Manifest
@@ -1,5 +1,5 @@
 DIST pydev_debugger_2_8_0.tar.gz 4171117 BLAKE2B 4f0ea0eeb228cb66f71e2046438396ff5ce59b42e620a067bc515ff504fa2da151e05f8ea6cf2d1aaa0768122431ccb45708a88c0616fb2859e96671b172e822 SHA512 b0189f1824b52f8ad35d1d1cfba0bd734806541ae2ff4f410c110763201630d296d10c2b7eaac8c656dfb3ff0f3c31bfdf2de28323778000cc7821e123a877d3
 DIST pydev_debugger_2_9_1.tar.gz 3974089 BLAKE2B 73e0cea547964e313120af2d27ce0166b5afc2d613428ce96cbc58786dddae99507058a217c0eac7cb071bead8d52b2e9bda8e0c88aff31566a979edc420278b SHA512 67f4d31fa59512ec6738a777537a6f856d312f3a81d7bee497ddc50bf02dcab8c04c64c7e5181e48afea01f9de4300a1cafeb3745cea841d7bb7c26b15ced40b
 EBUILD pydevd-2.8.0-r1.ebuild 2535 BLAKE2B 18ce93e55e8ab42920d85fdca24c3523014cfc3df61a6f17eb06caf09ba07d9ab15902f03fe150983bf027bfcbe0f63d4ab084a49badc28295ee41522b347667 SHA512 dfc41379f6d0fa9aedc028bc0e09a082854c532379f8fc1242cc9e6aeb615a08390042ae1c2974e683c908b29b7ef5ea3abe0c3e4e1ae89ce65ae7489461e6be
-EBUILD pydevd-2.9.1.ebuild 2536 BLAKE2B 71855b244952a3b34acdb715c472982d0bf5bdc9e9570da67f2d7b1d59f5d0ec6dfa3f53a5b4cd193d9405f56d9addb05f27b7cac1b8c8b855298c63cd121ca8 SHA512 52697d6a2e8d904d43f2749b76fad5490058e7a8a433a4e3b925a5cc2aee71dbd29e36ef15d9e7b15ea3aa88676124aa61408b0e08413c8554f41031d023b6f2
+EBUILD pydevd-2.9.1.ebuild 2535 BLAKE2B 18ce93e55e8ab42920d85fdca24c3523014cfc3df61a6f17eb06caf09ba07d9ab15902f03fe150983bf027bfcbe0f63d4ab084a49badc28295ee41522b347667 SHA512 dfc41379f6d0fa9aedc028bc0e09a082854c532379f8fc1242cc9e6aeb615a08390042ae1c2974e683c908b29b7ef5ea3abe0c3e4e1ae89ce65ae7489461e6be
 MISC metadata.xml 384 BLAKE2B 37a4caa01a28f98ec8d141129c08754e6ba4dee5910a81c26f3eafcd7ac832962e91d3e39783e4859ac7e5ae5754837c89e496c4c2c205d12626359adf7dddae SHA512 5cf80b2e0eaf21e900c83341e9bef5c74a36d3c0a7354e3b6a832184cc60c42eeef6a22236e4fd9d484dc8834e5d4f98facd2578c223da2cc187dd76f91db764
diff --git a/dev-python/pydevd/pydevd-2.9.1.ebuild b/dev-python/pydevd/pydevd-2.9.1.ebuild
index c784fce3bf06..26d973b1c209 100644
--- a/dev-python/pydevd/pydevd-2.9.1.ebuild
+++ b/dev-python/pydevd/pydevd-2.9.1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/PyDev.Debugger-${MY_P}"
 
 LICENSE="EPL-1.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 # After removing and recompiling the prebuilt lib the tests fail?
 # For some reason the test suite is executing a slightly different gdb command
diff --git a/dev-python/pytest-bdd/Manifest b/dev-python/pytest-bdd/Manifest
index 1dc5c0a88595..d34dce2df41c 100644
--- a/dev-python/pytest-bdd/Manifest
+++ b/dev-python/pytest-bdd/Manifest
@@ -1,3 +1,5 @@
 DIST pytest-bdd-6.0.1.gh.tar.gz 60932 BLAKE2B 67e0dbc251ce94da40033641f37e6c9ad70ca947f71db1a78907a6890d96d8d3112d57a2a63dda526c8f846010d39a575cb5d93a102f4653705d4229ee14ab07 SHA512 30bc697ae177e3f311af0c781e99bde5b491dfef28109359c0d80f33feb8b0b170ffe15c288fe73a624144a1d1c3223b220d591b4acc30d1ad53600482bef87d
+DIST pytest-bdd-6.1.0.gh.tar.gz 79270 BLAKE2B 145d1adc6dae8098b30bfd68ce78dcf3c0b6626a32f8da05805f78f176111dd367a62e76eb61d520391c88bf9eda234f63d983bcfa36f00d39d85a026c78f883 SHA512 957b39a9c7c48b8d5e42d301de875579d062744766c55ffa32aed78a5a8a5c9fd9bb3ba281183841bc1da19604659c94ecaa4487dfc7a6dd69b507f5fc9f2dc7
 EBUILD pytest-bdd-6.0.1.ebuild 1084 BLAKE2B baa7bbb71d57683cb4b03dc4fb15ffb510d214df05fdf714767767a73846b6543188ab4af6b931db3c3362cad3b945e271979837f1168a04dcb32c9acdf06549 SHA512 2df002e33e225db79ddb3f6afc9c70e7d1d6f0ef29aad3c8f44189cb9b86faa430053dcba31c3ddb2ce6f8ba5367873d61688b0cc6ffc3208af49868eb566118
+EBUILD pytest-bdd-6.1.0.ebuild 1012 BLAKE2B 8e35ca6650469bd1e9405cac2b134cbf2dbc9fc89343840e6ff0b38aba5f6cfede418a055424bce54bb640c43202dd4cf1666cb2c175751decd86372e5a15e7c SHA512 4307a29333661ac4960ef2d355b643b16716e0fed85584d5c6d126cbbcd1fdd3401d42419207b193db90163619101cfaacc71b8e19d0b8ec7dc509d95c3bca32
 MISC metadata.xml 404 BLAKE2B b5bdea28ab998a54bd0b76e38c37a77af74d4ae149bfc5af47e7466b7c13ae6a5784be0ecc3e6cd8ccbbd5164dea02d704f596b7e00d22b0d640c4ad3dd13b41 SHA512 97800a5877bd8f3aa880a0cdff19cc89de983ec1a0cd9fbe2c74178b6fc214a0ca7fbb013b2ac490e1c4109f03ded7055e1517a3b57f6da0d79c9f5ea5864e77
diff --git a/dev-python/pytest-bdd/pytest-bdd-6.1.0.ebuild b/dev-python/pytest-bdd/pytest-bdd-6.1.0.ebuild
new file mode 100644
index 000000000000..a8fc183a60ad
--- /dev/null
+++ b/dev-python/pytest-bdd/pytest-bdd-6.1.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 2021-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} )
+inherit distutils-r1
+
+DESCRIPTION="BDD library for the pytest runner"
+HOMEPAGE="https://pypi.org/project/pytest-bdd/"
+SRC_URI="https://github.com/pytest-dev/pytest-bdd/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/mako[${PYTHON_USEDEP}]
+	dev-python/parse[${PYTHON_USEDEP}]
+	dev-python/parse_type[${PYTHON_USEDEP}]
+	dev-python/pytest[${PYTHON_USEDEP}]"
+BDEPEND="test? ( dev-python/packaging[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
+
+DOCS=( AUTHORS.rst CHANGES.rst README.rst )
+
+src_test() {
+	# terminal_reporter test needs exact wrapping
+	local -x COLUMNS=80
+
+	# hooks output parsing may be affected by other pytest-*, e.g. tornasync
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=pytest_bdd.plugin
+
+	distutils-r1_src_test
+}
diff --git a/dev-python/python-dbusmock/Manifest b/dev-python/python-dbusmock/Manifest
index 896c9d3d0858..76f23514624b 100644
--- a/dev-python/python-dbusmock/Manifest
+++ b/dev-python/python-dbusmock/Manifest
@@ -1,5 +1,5 @@
 DIST python-dbusmock-0.28.4.gh.tar.gz 86900 BLAKE2B af6ca30e15e803e66aec63d40d56d121c93e9fe253d7640111104c8e8c0ea5e0491b53f551d6b454ae7370cbbb7f8fb14c07b5be92a8425efa39e04f962311f5 SHA512 f388425ebb68c20b5110a831879bee0d7d0a3941687fd61c9975c4aaa9950b05709e7fc2a9b885c89935a915f473bb7a9b97e93ca79cf3dc6769911a66aeaea7
 DIST python-dbusmock-0.28.6.gh.tar.gz 90579 BLAKE2B 12b4ee02ae6b828b908b203a351f5b88d25193bb1250a0d25bc90b0ac2a244c4ef577bdacb2dbbb9220ba93d785791d900c9035d8d5c3a21aa744b5f850d16c9 SHA512 1efc1a42fc5cc56d683f0f4d022877020f15d81a557c54f47619c704ca2f67716c1fbdb890f987d01f78b7786528a71de8dbfe84228baa41351eb751fc4cce61
 EBUILD python-dbusmock-0.28.4.ebuild 947 BLAKE2B 6591f8f209ed1bfe25b271ec08ae8eb32d504897924556c5062c5308c2d6df2f9a249e40ed251af237a96e0609397d3278f0c6e73abd6c73df22edfb63731e29 SHA512 a6f95e9d34445f875d6374ae906f68f57b96aae002d1b3047a7071266991a28c3eb2660b8ac919ecb1a38978e1d51c32e65d859555e68cd459ea427d2d817450
-EBUILD python-dbusmock-0.28.6.ebuild 950 BLAKE2B baf0a2ff7bea5d2b36b4749fb490b7ec1e6d947d577ceaeb3134fd3be7f683cb5ad364ca3578dc294d3f5350d497ac14121042e8c7d6bf0baeb34df58760460c SHA512 3c2d3028d47a0c10467467f408cc32b7a2eb50c0314f2d75586b850f716e0bd8f69a666e069a98a7dbb8231d7f42ff5b4685adfb1327666fb146826d92bb45bb
+EBUILD python-dbusmock-0.28.6.ebuild 949 BLAKE2B 7a2ab53527bb14d83d4168ebfa9a82440b60431fa0783f2d1abd3904568aa3b4e766b49702c40ecb9c8379555a6a882fd0085e22cea9a8fce666e23434d653bc SHA512 fa1f6f4b133de110bf388dd6409f74a23673794faad83e4395828a5dbef9f278cbe8cd29406690d34925063e8db940da8954120720c27f7ad7a743dee2983bce
 MISC metadata.xml 523 BLAKE2B 85fe2f51626a9c5de1376ebb88d908ea3c0a4e47d940f4a6730c72762f8e457b056a2ef080da519fec5ec15338eb2eb0d590cf5f20a7f711e40e7c97def84c51 SHA512 6718af48a4b968687e8eb1ddfefc1e21d4fda774d3e3d94e198c77c745761d3ab13e1bb4c34b65e6dff11c9a1b5f6018d53b113967784445bea71788fb3344b1
diff --git a/dev-python/python-dbusmock/python-dbusmock-0.28.6.ebuild b/dev-python/python-dbusmock/python-dbusmock-0.28.6.ebuild
index 3f920f77f942..e00233e4854f 100644
--- a/dev-python/python-dbusmock/python-dbusmock-0.28.6.ebuild
+++ b/dev-python/python-dbusmock/python-dbusmock-0.28.6.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc ~x86"
 
 RDEPEND="
 	dev-python/dbus-python[${PYTHON_USEDEP}]
diff --git a/dev-python/rpyc/Manifest b/dev-python/rpyc/Manifest
index 8dbb9f4658c3..8482dd994d19 100644
--- a/dev-python/rpyc/Manifest
+++ b/dev-python/rpyc/Manifest
@@ -1,6 +1,5 @@
 DIST rpyc-5.1.0.tar.gz 1260651 BLAKE2B 4be17e5de4b0475cd63b99bf20e55e3221149f974b9efec638e0387d71815a5a2e4ea782578152690e019e7b8a4ece17405eed6626578a9c9e379d0f4b589008 SHA512 e9783392f423abca6b488dff5be36dae066980004bd221ca5a1c451f0f9dc7e1daf749650106802f9159de619a8d5e2cd6dc90e9a5f49d16f01bbedd59b504cf
 DIST rpyc-5.2.3.tar.gz 1267934 BLAKE2B 3c03d587293375f875de31d6a89ba07b47bd4f4ff9fd5c7b23ed0c83e420e9d2bab08844c3538299797203ac90e7e81b955db02de70bf1cee5ea59d8475a6848 SHA512 4be189a719be100886e08d9c2c0769d12b7d1c5e167c197ebee1a3db542e228f2124fea976e5af3680136b298ce4632c79b2f302128dff31ebf45dcf52a9743f
 EBUILD rpyc-5.1.0.ebuild 1741 BLAKE2B aff12ad540be96c4cc71c5cdf2d0f4c8494d6a41757a9e57e0e5ef0030768f0829d8c088611178ffa244d3f6ec6ce2db1b46c0092d3b7e4154a40ac1e44d654a SHA512 b84c7a5cb1e053a8fcb2722b7d66ebff5d4e9030462b2ab078301549c5a037360120dfebab6cb0c453f6efd7fb2a2e37bd47e6f97a04e3e7b023f6a174d9d325
-EBUILD rpyc-5.2.3-r1.ebuild 1970 BLAKE2B 778eb4be38cf382fc870384f544454233cefab9c33db89cab92e9d62fc9df581bde9e4b86bcf0b5dbc63fbbae4c91793837feda3c1ad94272e0830f7896429a5 SHA512 98048a4fb69a2f8a45e06687b40e7bf18327bec7c428f163cdbf5f9d8bb6ff9840ae4641b9c9a7d68450a67e6f9dd53d54599ebf94651f94908add8b089e48c2
-EBUILD rpyc-5.2.3.ebuild 1774 BLAKE2B 787218825fce9fa0f9740333c30adb975fde0ecd20ae3e5e48f10d5a8119c1c87fe8807abe980af27ec9ffefc02b46b36c1242467214b7b18fabccc3866e743c SHA512 520219c1f37b09cc7df8148afb4f67b0566d4f56452d30d4e2385ed6e5ebeb310af4bbdad340bd9d80715a5addcb1e101191bf1694d4bfabc215360b3140c795
-MISC metadata.xml 654 BLAKE2B f84ea5b5fb66c2661bdcbed8566a77c872b6f1b3a6b0cb021269657b21fd414e70edf03f205ee2038d9d83a20e25d32b15760d915b98066aa7fe1a4cfeb3bd16 SHA512 6ea40af97501443c8d4ae783137bb9547c5a4cc3685c01b9d684691d110f67eb43056acfcebcc510c06fc40ff596ad9e3e30cf76cb07807f23250721e93b4954
+EBUILD rpyc-5.2.3-r3.ebuild 2091 BLAKE2B 386a4726b34d58870e09d6aa8453b5994125496e124ebb7466371b3ad3d4a4bfa59bb50a4f571146cc5e91a0695732a57195c5217a822eaf697d58392e5acfe1 SHA512 5f6eae0c2d6da571904b612ea197ed68cae8dcb67c8ee2e02cd05c734ae819c505f7d895d37f79fea5edd73153aa366cd0222a6696c985e468a9324753c0f2dd
+MISC metadata.xml 736 BLAKE2B d6f6d76b5118e6f8aef119b975572ba95875f89bc2a4b2bb072e1b1ccccfb4593845e16ea0c62a4436ce419a3792b89b7a995c36a2ce979cf85db0dbd5f6754f SHA512 7714c32ffeb31611fe41d2ec674b774fdd46b137a90bb52245b1dcc229f2577739d33d61788ec123cce0c4dec3da49a19fdcc4eb307ea3af26ae8c4195bb0d93
diff --git a/dev-python/rpyc/metadata.xml b/dev-python/rpyc/metadata.xml
index 9bb47af5f2a2..0cc85787c0c5 100644
--- a/dev-python/rpyc/metadata.xml
+++ b/dev-python/rpyc/metadata.xml
@@ -15,6 +15,8 @@
 		<flag name="numpy">Run tests depending on
 			<pkg>dev-python/numpy</pkg>, <pkg>dev-python/pandas</pkg>
 		</flag>
+		<flag name="gevent">Use <pkg>dev-python/gevent</pkg> for GeventServer
+		</flag>
 		<flag name="gdb">Run tests depending on <pkg>sys-devel/gdb</pkg>
 		</flag>
 	</use>
diff --git a/dev-python/rpyc/rpyc-5.2.3-r1.ebuild b/dev-python/rpyc/rpyc-5.2.3-r3.ebuild
index 94f50daaf6dd..457166812a05 100644
--- a/dev-python/rpyc/rpyc-5.2.3-r1.ebuild
+++ b/dev-python/rpyc/rpyc-5.2.3-r3.ebuild
@@ -3,7 +3,9 @@
 
 EAPI=8
 DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{8..11} )
+PYTHON_COMPAT=( python3_{8..10} )
+# Teleporting currently does not work with python-3.11
+# see https://github.com/tomerfiliba-org/rpyc/issues/513
 
 inherit distutils-r1
 
@@ -11,21 +13,25 @@ DESCRIPTION="Remote Python Call (RPyC), a transparent and symmetric RPC library"
 HOMEPAGE="https://rpyc.readthedocs.io/en/latest/
 	https://pypi.org/project/rpyc/
 	https://github.com/tomerfiliba-org/rpyc"
-SRC_URI="https://github.com/tomerfiliba-org/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 # USE flags gdb, numpy are used *only* to run tests depending on these packages
-IUSE="test numpy gdb"
+IUSE="test numpy gdb gevent"
 RESTRICT="!test? ( test )"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	numpy? ( dev-python/numpy[${PYTHON_USEDEP}] dev-python/pandas[${PYTHON_USEDEP}] )
+
+CDEPEND="numpy? ( dev-python/numpy[${PYTHON_USEDEP}] dev-python/pandas[${PYTHON_USEDEP}] )
+	gevent? ( dev-python/gevent[${PYTHON_USEDEP}] )
 	gdb? ( sys-devel/gdb )"
 
-RDEPEND="dev-python/plumbum[${PYTHON_USEDEP}]
-	dev-python/gevent[${PYTHON_USEDEP}]"
+DEPEND="${CDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+RDEPEND="${CDEPEND}
+	dev-python/plumbum[${PYTHON_USEDEP}]"
 
 src_prepare() {
 	default
@@ -42,14 +48,14 @@ src_prepare() {
 	# This test fails with NO_CIPHERS_AVAILABLE
 	rm tests/test_ssl.py || die "rm test_ssl.py failed"
 
-	# Temporarily removed
-	# https://github.com/tomerfiliba-org/rpyc/issues/513
-	rm tests/test_teleportation.py
-
 	if ! use numpy
 	then rm tests/test_service_pickle.py || die "rm test_service_pickle.py failed"
 	fi
 
+	if ! use gevent
+	then rm tests/test_gevent_server.py || die "rm test_gevent_server.py failed"
+	fi
+
 	if ! use gdb
 	then rm tests/test_gdb.py || die "rm test_gdb.py failed"
 	fi
diff --git a/dev-python/rpyc/rpyc-5.2.3.ebuild b/dev-python/rpyc/rpyc-5.2.3.ebuild
deleted file mode 100644
index 0f85434abd00..000000000000
--- a/dev-python/rpyc/rpyc-5.2.3.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Remote Python Call (RPyC), a transparent and symmetric RPC library"
-HOMEPAGE="https://rpyc.readthedocs.io/en/latest/
-	https://pypi.org/project/rpyc/
-	https://github.com/tomerfiliba-org/rpyc"
-SRC_URI="https://github.com/tomerfiliba-org/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-# USE flags gdb, numpy are used *only* to run tests depending on these packages
-IUSE="test numpy gdb"
-RESTRICT="!test? ( test )"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	numpy? ( dev-python/numpy[${PYTHON_USEDEP}] dev-python/pandas[${PYTHON_USEDEP}] )
-	gdb? ( sys-devel/gdb )"
-
-RDEPEND="dev-python/plumbum[${PYTHON_USEDEP}]
-	dev-python/gevent[${PYTHON_USEDEP}]"
-
-src_prepare() {
-	default
-
-	# Windows specific test
-	rm tests/test_win32pipes.py || die "rm tests/test_win32pipes.py failed"
-
-	# These tests require running sshd
-	rm tests/test_ssh.py tests/test_deploy.py || die "rm test_ssh.py test_deploy.py failed"
-
-	# This test requires internet access
-	rm tests/test_registry.py || die "rm test_registry.py failed"
-
-	# This test fails with NO_CIPHERS_AVAILABLE
-	rm tests/test_ssl.py || die "rm test_ssl.py failed"
-
-	if ! use numpy
-	then rm tests/test_service_pickle.py || die "rm test_service_pickle.py failed"
-	fi
-
-	if ! use gdb
-	then rm tests/test_gdb.py || die "rm test_gdb.py failed"
-	fi
-}
-
-python_test() {
-	# for some reason, when tests are run via pytest or nose, some of them hung
-	pushd tests > /dev/null || die "pushd tests failed"
-	for x in test_*.py
-	do ${PYTHON} ${x} || die "${x} failed"
-	done
-	popd > /dev/null
-}
diff --git a/dev-python/snakeoil/Manifest b/dev-python/snakeoil/Manifest
index 253e87ee8833..f6a5bfc94b84 100644
--- a/dev-python/snakeoil/Manifest
+++ b/dev-python/snakeoil/Manifest
@@ -1,6 +1,4 @@
 DIST snakeoil-0.10.1.tar.gz 176054 BLAKE2B bd056911c993d274d6c0c79ee4660629d8a6b8c276835a1b29bea16f977907b76a5edebe142b168b282fce3baa9c97b465233d91f5a279fba26a2c04aec0c784 SHA512 9e16652663dab1bd88f620a4fb80ca6602a181d4738a34bef89116f962a2035988cf9fb036b6a12de39b05a5251ade0e933b1df63c020b900338a89169619397
-DIST snakeoil-0.9.12.tar.gz 265877 BLAKE2B dda01bbe16b1cd9f0d6c064f6ce165291d96217c9f722a9b32b7443f96a266278c84297d24ee46aa32ffc6b17f0f6c6f41010868c0d54ff33de8fcc404bb76a9 SHA512 8178c7e7dba2366629a3b016cc662152d70347a4167dfb425f5d659a19c17e3d478a5d4f3098e8b2b82d9effbf3e54b269e1e73c0306d537989f4ab7bda4b577
 EBUILD snakeoil-0.10.1.ebuild 742 BLAKE2B 23db231ebf45f375349d27597b38b9e7efdb74852d4a5b45bf0257110645783174b23b5246bd0120dcd4eec8aa559c42132f05db459195e9de1e7e8014470602 SHA512 a745ee474c394c0dc010e2c8190b1c7b61cca96c6b2489a490a98ed461742c6b7526d84533c5188262a6182354b7ffaa73023a541ae571f5762d7274883ce2f1
-EBUILD snakeoil-0.9.12.ebuild 820 BLAKE2B 99f25344b62f708ac74ce1095ef93e72a3a01a1530d679aae81c3a54aa06a7ccc8352a7bfe67c8636e23e32ab17a6f51e9901d9d06cc8159b975066dafab3b96 SHA512 b4f47f4f2a428aad4c89fc0640869aec465e9fb8d81f0b26185d35e73f29eaac898cf3f564791ee626718a3c5d6c4aa714f8dda5b1004e859c68d2bbd1600884
-EBUILD snakeoil-9999.ebuild 750 BLAKE2B beee47d0a57a3dfc567552b8f96fe89588d5997c3078aee59a513cdd3f26afc77aca7966e52804b8a63930dddf1a23177c94c9e874142ff3a865e4f08ec4d2dc SHA512 153c8aa013eda1340cd3d9a190887e3e19d78f5e1563803c392d21c4f0eb3c2d4e4f244bbd956f388c24ced7cd4e16c6de8ea38366bbb1eb70953b46bb622fe3
-MISC metadata.xml 587 BLAKE2B 900b8c54a2f534b722e6b7bac5784911e475422dfa222b49cc3eb8dff316de2f619cfdbd93ef0093ad66d4f14c465f8ecad59b073a75a0cc7e1eb44f250fea1c SHA512 3599db4056b8d2b7807f677f43f2830eaf7f94124ec483da8a3386c3789b6526c8204f823c1a366ecfd08207195bfd26e31156759afeccb313b0d841181b0963
+EBUILD snakeoil-9999.ebuild 750 BLAKE2B 16634522190a35b2f64d910c2626361868262666c2fd4a5485f7ecc03b5095136dfce26645f97d83777608e8c94aa808a19c4bca98f724384cf810f8a4ea3906 SHA512 fcd756dd4d82effe8b72455812fcb52aad333a6acf5e017fbb8752f2639a98cec0ff68b4ffb8181feb3a328553376c9035e668af58960dbb4da5618476ec9dc9
+MISC metadata.xml 394 BLAKE2B 1f11a6a69a1ed5736bdddaf949b97760d2986eaf848bbceafa706dae01dd8e84f2977d130179324856e35353702e8f84e2cf7b2e30587b5f21a7113237825c3e SHA512 71abd7d9037eb4412a992bcf6933999f0dfec0c39465fe5bcb63e6a8437ff901764c03ad65e363f4ce5d8789f364b7f732542c7f298f1d04a2a68343acbc2129
diff --git a/dev-python/snakeoil/metadata.xml b/dev-python/snakeoil/metadata.xml
index 34099b24a766..82a7321ef27c 100644
--- a/dev-python/snakeoil/metadata.xml
+++ b/dev-python/snakeoil/metadata.xml
@@ -1,18 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>arthurzam@gentoo.org</email>
-		<name>Arthur Zamarin</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>mgorny@gentoo.org</email>
-		<name>Michał Górny</name>
-	</maintainer>
 	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
+		<email>pkgcore@gentoo.org</email>
+		<name>Pkgcore</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">pkgcore/snakeoil</remote-id>
 		<remote-id type="pypi">snakeoil</remote-id>
diff --git a/dev-python/snakeoil/snakeoil-0.9.12.ebuild b/dev-python/snakeoil/snakeoil-0.9.12.ebuild
deleted file mode 100644
index 1d7e0e67de55..000000000000
--- a/dev-python/snakeoil/snakeoil-0.9.12.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# 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 )
-PYTHON_REQ_USE="threads(+)"
-inherit distutils-r1
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/pkgcore/snakeoil.git"
-	inherit git-r3
-else
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-fi
-
-DESCRIPTION="misc common functionality and useful optimizations"
-HOMEPAGE="https://github.com/pkgcore/snakeoil"
-
-LICENSE="BSD BSD-2 MIT"
-SLOT="0"
-
-RDEPEND="
-	dev-python/lazy-object-proxy[${PYTHON_USEDEP}]
-"
-
-[[ ${PV} == 9999 ]] && BDEPEND+=" dev-python/cython[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
diff --git a/dev-python/snakeoil/snakeoil-9999.ebuild b/dev-python/snakeoil/snakeoil-9999.ebuild
index a2c4c4cf4928..94c9f789cbbf 100644
--- a/dev-python/snakeoil/snakeoil-9999.ebuild
+++ b/dev-python/snakeoil/snakeoil-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{8..11} pypy3 )
+PYTHON_COMPAT=( python3_{9..11} pypy3 )
 PYTHON_REQ_USE="threads(+)"
 inherit distutils-r1
 
diff --git a/dev-python/statsmodels/Manifest b/dev-python/statsmodels/Manifest
index 4f0077333de7..96eb828a0ba3 100644
--- a/dev-python/statsmodels/Manifest
+++ b/dev-python/statsmodels/Manifest
@@ -1,5 +1,5 @@
 DIST statsmodels-0.13.2.tar.gz 17874260 BLAKE2B 93f7a308217ba938b3cd2e11d75e8f5ad19e2d4e6ab2abbea702143129bb53e7b9be54864375dbfec805624538bc73850357eb944d6c9a4c1252cc8a7606b904 SHA512 79d8dd63f667d4019e462d93e007a5ef8e11972fe35fb4d657931d6d68f3e35d29978a865682133db12fd6742f3362c2d77dfb5735c82ae454570388dd84d59a
 DIST statsmodels-0.13.5.tar.gz 18364957 BLAKE2B 8357416b015b152612aca88a9ff42b81db4d97f61b1c255bc2baf8978440cd43fa1a5301d1c60e92b3a634008c5c001c00770685864d296587ff75e37d29ff4f SHA512 9aeeea80c69f52459140179523a0155429834b2951325c9781b28f8c4cbbd0593ff1867e2212078f2b898e4da953689c2fe78183d3c7959caa874e9d758b4ea4
 EBUILD statsmodels-0.13.2.ebuild 2165 BLAKE2B 0ee013541fc993d9bdff9e0ddfb756beedae828680a2f94793ca723571ccd59659123398c3cbe4bc5d497760dd0712a96393a056ee1aa8d9eb50481dbd4bad63 SHA512 58a1c0605040d7dd217fbfea2595d96e3363f7229bde53d137de5cb0a0624ab73053649fb447220596b2e147c00f7d9a965d4b0ae9f01ddab63f72a43394a0f2
-EBUILD statsmodels-0.13.5.ebuild 2146 BLAKE2B dfe3acdf486f819f5725b681fec4c579fd2595cd24ed122f3a4dcc760c0b98ddc262f685f107df3d9c9859be8b28df449629a8e6eb32cf15e6d05152a911649d SHA512 93daeb895eb219db4e160408da62358311e496a25351d63501c631079206abe5f3a0b9145886d88605c44661a30942017940a0d38f588482b729a5cc92db388a
+EBUILD statsmodels-0.13.5.ebuild 2180 BLAKE2B 8c7809385584aebcd59e81777316ad1c336707cd741604b6446d662c1efab0625f1dd0bbc51b4f1a2738a4660cf125a3a4910afd84468b44c55a4932003c043b SHA512 ce6cfbc45e9c16ab8423535675f1e8a3aed34c267471e98209586edf0c03588253d64286753370dff8435da41eb0bd52d29fdb9eb4eeba03391b2f7fc052c65e
 MISC metadata.xml 1356 BLAKE2B 0eca47b1f489954f26e6a726216f678ea5f9284ce52c00df51117d3414c549e9e43f5f307cff8fc17eb897f00abeb23cdeb4f70c2ec594860875464e0955f13a SHA512 a59057a6fad33b7dddbf7ad1b822934c9f12a45a829bea039f8773c5c778639aa3273d623ec78df653cfb2c4e88355f4a8cb809f4cb80b9dd3e7616cd06cc376
diff --git a/dev-python/statsmodels/statsmodels-0.13.5.ebuild b/dev-python/statsmodels/statsmodels-0.13.5.ebuild
index ee45e827714e..330bac270be0 100644
--- a/dev-python/statsmodels/statsmodels-0.13.5.ebuild
+++ b/dev-python/statsmodels/statsmodels-0.13.5.ebuild
@@ -71,6 +71,7 @@ python_test() {
 
 	cd "${BUILD_DIR}/install$(python_get_sitedir)" || die
 	epytest ${PN} -n "$(makeopts_jobs)"
+	rm -r ${PN}/.pytest_cache || die
 }
 
 python_install_all() {
diff --git a/dev-python/testfixtures/Manifest b/dev-python/testfixtures/Manifest
index f94a4800c982..25e651dfbc96 100644
--- a/dev-python/testfixtures/Manifest
+++ b/dev-python/testfixtures/Manifest
@@ -1,5 +1,5 @@
 DIST testfixtures-7.0.0.tar.gz 126163 BLAKE2B e9f31180878e7645a62b93242344c6cd8335067cf8158b03dbfb46b4ab79d57380809a20d6fdc6a6d4b0aca2d22f5d7c18636607a54c70de4bea39e79a9df6b1 SHA512 5fe56e0a654586c266aab5cebcdbf1e6b9988227605395c3198c759759be0fa98ff3c0a1885711ede5ef6d262a60cd19a29dc6e7a90a1f9f8b57df3cb2d9b97b
 DIST testfixtures-7.0.3.tar.gz 127280 BLAKE2B 14725f5a04a77453f1a6e1cb07b2ee8e907dcf49a845c9c75951d77160448c1037c7bfa0a759cf4061d92448203b8f4b14d611cdde32f46269b484985e654e67 SHA512 875aba5102bd43800b2f6464dc93185cd2bb5e117523cb4b3c458b2f8f8eb71f309c0a5266eeca70a7928f9992ccfe7807c67e42531c17fd82ca1c3b838d02a5
 EBUILD testfixtures-7.0.0.ebuild 1309 BLAKE2B e36f0bbe797a2bd27e3b4a8f192196bc2ddedd5b823eb488b951b296115bbc2cdd7d27e73902a70feebabbcdb1f429fc2193b85c26d09a28e7eb2577cc32a42d SHA512 b8d55688da3922d7bd3c03753a596b189f59981d3d86a31aa51a91796cccda3b7888166a4f47595eda1d4fbb77932b8ba14b79c9dea6cd9d01d1203210a41d6a
-EBUILD testfixtures-7.0.3.ebuild 1312 BLAKE2B 1080faecee935533c3477f6e7757e38e337babe3aecc67b3163a89c38f992df1b6ebc611905a79d147c3794a1ad555e467b27060ac509463b0ab35968656f786 SHA512 1bb689497c182537d7c7041311634895a1608836a029b2d82aef7ab3240ea9c259cda6971189628470e0992cd8b0f3017f95e591a03cf9a05fcfa8cabcbdabe2
+EBUILD testfixtures-7.0.3.ebuild 1331 BLAKE2B 763aae90d64ea8985eedb49b24a23e647f3c126808503d1f0781375324360e2fdb5419e91c09eaa2178503e3cc5fa987da0c11a35f62af45213599280b4d5296 SHA512 1e39b6481c9d1e773c8dc911bdef0c67cb6b32f9b5d9a993ecd87fbb2a442594fdeb4a0a1d0ede8c0b3d37717f7219775d715d211b3d7905e70ccaefd74b9396
 MISC metadata.xml 416 BLAKE2B 19f5d275458874364d2719ecf363f7a5627f9e612b7d3a3f2c075e306063ed899dec0b2e59ea5e5d7ba65209c9a6d91045d80b2fe50e74278e61247d0426b940 SHA512 8a5776feee4d6758da67dc0b413e2d0ddc0c843075ca96c9b44adace1f7669a6abf820c5b73b86652b27e9feed19a4a30e1004a021b24bda0829b5690a1687ec
diff --git a/dev-python/testfixtures/testfixtures-7.0.3.ebuild b/dev-python/testfixtures/testfixtures-7.0.3.ebuild
index 8d96b3520597..4bd8f44cf8f7 100644
--- a/dev-python/testfixtures/testfixtures-7.0.3.ebuild
+++ b/dev-python/testfixtures/testfixtures-7.0.3.ebuild
@@ -28,7 +28,8 @@ BDEPEND="
 	)
 "
 
-distutils_enable_sphinx docs
+distutils_enable_sphinx docs \
+	dev-python/furo
 distutils_enable_tests pytest
 
 python_prepare_all() {
diff --git a/dev-python/tldextract/Manifest b/dev-python/tldextract/Manifest
index 02811383b211..540840cc2ec1 100644
--- a/dev-python/tldextract/Manifest
+++ b/dev-python/tldextract/Manifest
@@ -1,5 +1,3 @@
-DIST tldextract-3.3.1.tar.gz 110819 BLAKE2B 18fda8d78783c3da7949fc9d019921dc4188686d932033dea8f393c0964adb935d104475836df188390c4dc5d0d67b4d5be45baf7f0dda1264fc4b8adf73be7d SHA512 ec1c8f326772cad04caecb65fc4b6c0bd168233ca59c14b4baf0d365420fda6c740febb8399bb8ead747f259bf81b513a7edef3b3e832576703d56ab8fda1bc1
 DIST tldextract-3.4.0.tar.gz 111437 BLAKE2B 94a3a77144fcaddebdf2129cea8fd43e971f0ac9b40029c6c1735ee06f499f4bf48823fc61540d99f71fd62192742c10168ef8f25b534eec9e2a04d3879be63a SHA512 6cd6b079c35af62e4f8da67c687630471d1a57ebfab7d982abe411b03fb6673dd238a1f676de5624d13bd2eb42b91ae0a97708e33579217916d88bca4db218db
-EBUILD tldextract-3.3.1.ebuild 802 BLAKE2B 6d7fa552d193ee908dfd772a52d520f48e321b22598a95e72528a38323807a7e8a843fc41c352ebfff7831fa5a47b89e8d4e93628efef1ce8da47eddff794551 SHA512 a8b488ddd8468259464c428c5468d83eae68dda9590994c494fe0a6ad0a8587d2724c86c937052e62c6df4dc87978f131d7f121c73f11d810d5e3fcaf0cd5466
 EBUILD tldextract-3.4.0.ebuild 852 BLAKE2B 82d13a183cb55785dd817735f4211f318e33bb47b699c143fc06a23175511bf77718a5639a7d73722aad78c5d673dcc277700230fafa73a4cd85890de4b99f20 SHA512 c7a775ae5e3295860d4e530dcedccf1cfa1d5861ccf5777a4ce70b65213ac095727bb4fefcc56a2e035fab6a829e21e0298d705402f4b1251afb8f814354aa0b
 MISC metadata.xml 560 BLAKE2B 4d6e6aa7507ce4734371e8b8442e8d4840db0d2896f7e7430438bc9b700edf6c8546fc3beb1e17d489013b6cc49d1daf805581d6fda29f51109e7a643b0e8965 SHA512 4e7ed8a1876afc62954ee58937557182099ea2289633d2d279a2982bb32a8de261163f0b83ba44c257b8c087c007b1bb462ecad69df1115a024a3a9c8ea1fe9e
diff --git a/dev-python/tldextract/tldextract-3.3.1.ebuild b/dev-python/tldextract/tldextract-3.3.1.ebuild
deleted file mode 100644
index feb404aac8d8..000000000000
--- a/dev-python/tldextract/tldextract-3.3.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# 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="Accurately separate the TLD from the registered domain and subdomains of a URL"
-HOMEPAGE="https://pypi.org/project/tldextract/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
-
-RDEPEND="
-	dev-python/filelock[${PYTHON_USEDEP}]
-	dev-python/idna[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/requests-file[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/wheel/Manifest b/dev-python/wheel/Manifest
index f81c62af1c03..cc17e819bd07 100644
--- a/dev-python/wheel/Manifest
+++ b/dev-python/wheel/Manifest
@@ -1,7 +1,7 @@
 DIST wheel-0.37.1.gh.tar.gz 68751 BLAKE2B 55919649f82668565d3b5907d14d0758984bb7d29d8857807ad034288ed8c9e8660957dc16f418f18408e89a97cf0d3c30df874a17f56deb56918388b18246a7 SHA512 9493db2f29e16d17ca06a4d47854b3df5dfd17f21c77efd42befd54470858256fd59f56aa9585cbf0a09830927b657d546324f793e1b1153665bf0b74d0c0457
 DIST wheel-0.38.0.gh.tar.gz 68696 BLAKE2B 38dbc8ba7cf67d202c6c98b277e590b3b31b46b698f59f988af1710e9fa6e5d2125378029475060cf3142cd9666bb318005619d085ea2e8b501bb10cd9694fe3 SHA512 0ffdf531c03d1f0866632002b163fdf8642b613604e74d1cfa5844e8c327946baf303bc0410fc7ec034f8a79cb4ad59536dfdaaa5cc8fa23a3b7d21faf5e6161
-DIST wheel-0.38.1.gh.tar.gz 69293 BLAKE2B 68f65a8a50e18e869106aa535faaebf6445bee8ccf31a78519ed325f1b98cbabc7e4a34028c0211324852163666481bc167eeeaee5f3febefbb008c9286f9d05 SHA512 1818b50a4ee50861aac3c9ac4058c5fee2de4a428ca04e7a9b1ce570dab6f1b64f4528f812aa23e87705ed15e360d0bd5b01523bd4360875c25054b1ccbf9179
+DIST wheel-0.38.2.gh.tar.gz 69346 BLAKE2B 619da7f17d82837d70cb86bf6481738a4959c70f1be56ad68f87380f4f03efc588ada7af1b6892079833df50e4aa57f7453b811b616b8440e388bad701726572 SHA512 59a55e35f641dc6e97bcd58755ef39dd771f8ed442843321878054db3c54234befde368ae500a93fffde6ea1bbcb0e3981975b2c7574fc5a58693a70430e474b
 EBUILD wheel-0.37.1-r1.ebuild 1580 BLAKE2B 72328d5044bdfb5ba5bf171cba5e783a6bf3bd08adcd01cef117122849fa035f7cbf1220852a639799cc2b1f25ff8487ec3bd3bd714ba4249c0aad2f1e89cf73 SHA512 4e0c40b131019be19d6cd47cef04181745abfeea461fcdc6e698b7724f3cd0159ac877acfe81f715ef95c0dd3d6b475cc24c5377e86070a362aeb9e2aa3dd3d3
 EBUILD wheel-0.38.0.ebuild 1468 BLAKE2B 7246978d927b63a37167e815bfd1d88124b927bb905114d2a3a94894d120253170844c2a911e41a9e93ebbc60b33b3b0614be1d9917cd4b7c8926c420e11f037 SHA512 7c83a56754208a125cb43b312b7a6e0298b875ecb2edf1f64d31032b100fefba8db8d458cc6cd464333430189b9c97bdf367641d4514f5bd77069e6282c16477
-EBUILD wheel-0.38.1.ebuild 1521 BLAKE2B 8a7d51d4045bfa65549b1fe3a60ef464634e3a849e25853756b020b24e1a0ec042415b0fcf9182d8a02dbfcbbfdfcf1e691586b46576d7601be750ac927a1ff6 SHA512 5df9e0320c3a3e526854aeda7ba22fb55cad24ce8cc63261253047af806128652a2492d3dab7f351f529d5659dc6432ab920ac09be7bd6aa66c1e8d83cc92c3c
+EBUILD wheel-0.38.2.ebuild 1521 BLAKE2B 8a7d51d4045bfa65549b1fe3a60ef464634e3a849e25853756b020b24e1a0ec042415b0fcf9182d8a02dbfcbbfdfcf1e691586b46576d7601be750ac927a1ff6 SHA512 5df9e0320c3a3e526854aeda7ba22fb55cad24ce8cc63261253047af806128652a2492d3dab7f351f529d5659dc6432ab920ac09be7bd6aa66c1e8d83cc92c3c
 MISC metadata.xml 383 BLAKE2B 352e8b44b3c4f7008c6ac73b8d4454602785ea86ad52ba4601b1c598a0da4831ecdf1b36cfbeaaa1635e52a924a3317d6abff9dc1b26d3f77f04c681208265d3 SHA512 a810c2c7bdff95154a907ce2a00ed2ccc63174e0ba7dea21c6faf62624aac12c2f772557f4f26406693b8963d3bfa77b95dc9e4156493ee991d64021ad8f6c44
diff --git a/dev-python/wheel/wheel-0.38.1.ebuild b/dev-python/wheel/wheel-0.38.2.ebuild
index 24e78cab73d7..24e78cab73d7 100644
--- a/dev-python/wheel/wheel-0.38.1.ebuild
+++ b/dev-python/wheel/wheel-0.38.2.ebuild