gentoo auto-resync : 09:11:2022 - 09:25:48

41 files changed, 184 insertions, 735 deletions

diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index b49a5d0a3505..881e1821f72b 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/backoff/Manifest b/dev-python/backoff/Manifest
index e02ba5b5abfc..bf1412efe74c 100644
--- a/dev-python/backoff/Manifest
+++ b/dev-python/backoff/Manifest
@@ -1,5 +1,3 @@
-DIST backoff-2.1.2.gh.tar.gz 19622 BLAKE2B 937dbdcf1bad5d3c68703aa08bfec46176a6021afb70d52b71bb52e744881832d9010e3db70112ec40beaf26155a9140fafb5b726b80f8fe1078d69ca011378e SHA512 e0a81def797007a342ca37af6657e6b8a0861a41cb4c78b325e8cbf58e93df3ff900763833c5d5ff97fb9d2e83521ef4f8652ac49bcc6cfb6c0fd92e44356996
 DIST backoff-2.2.1.gh.tar.gz 20194 BLAKE2B a137ad67574b20535d5c29fad5781d0f7baaeeead23a5c8ccc3f1c48a952bf4436e75753e329861fb20bdc6fbe2b5e6d75b30d0fdca9908edfa540a593b3b353 SHA512 ed98c50d544d4ac3214b03005e5d183b0aeefd568c89769b59115ecc67ba7f7ea29a58e6ebf8488026a95ff2a1155e798782b04bebc9315c6a3682540bb38dff
-EBUILD backoff-2.1.2.ebuild 673 BLAKE2B f610104a4dbc494b7802b22dedc03a16047b9d6a8b7e835eb242c61bbd87cf8815df472769d801509e77491f430592c29e5e82337d90a8439f08b0868b2b52b3 SHA512 8c6bb90b06b73dbf4907ec59d4a2f3dc82f129b34c59e76223234bcf60d0f57ac142d58568a1df758415d4a271cd68d7b67be8b34189560a7b0052efa4c3921c
 EBUILD backoff-2.2.1.ebuild 673 BLAKE2B f610104a4dbc494b7802b22dedc03a16047b9d6a8b7e835eb242c61bbd87cf8815df472769d801509e77491f430592c29e5e82337d90a8439f08b0868b2b52b3 SHA512 8c6bb90b06b73dbf4907ec59d4a2f3dc82f129b34c59e76223234bcf60d0f57ac142d58568a1df758415d4a271cd68d7b67be8b34189560a7b0052efa4c3921c
 MISC metadata.xml 387 BLAKE2B 4f92bcc32f0e26aa86b9f1968002d6c43a454ca27996158ca2a4b98b467c80d7ed6cd4a23e0807e813ae73ba2cb5ccae5fc8612c4d7292f2d4981374e9ab4f10 SHA512 52f3668afe9b067c240ad5db519b08a3e054e2864233eb6f079d339f704acd73cc66e239308c90eaadff09c630a6788886c978fb622f2e29b081a27c23525489
diff --git a/dev-python/backoff/backoff-2.1.2.ebuild b/dev-python/backoff/backoff-2.1.2.ebuild
deleted file mode 100644
index 009799e13fb7..000000000000
--- a/dev-python/backoff/backoff-2.1.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# 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} )
-
-inherit distutils-r1
-
-DESCRIPTION="Function decoration for backoff and retry"
-HOMEPAGE="
-	https://github.com/litl/backoff/
-	https://pypi.org/project/backoff/
-"
-SRC_URI="
-	https://github.com/litl/backoff/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-
-DOCS=( README.rst )
-
-BDEPEND="
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/bashate/Manifest b/dev-python/bashate/Manifest
index bf3928d6a69a..8c137a023bed 100644
--- a/dev-python/bashate/Manifest
+++ b/dev-python/bashate/Manifest
@@ -1,5 +1,3 @@
-DIST bashate-2.1.0.tar.gz 34717 BLAKE2B 6d25c9fe35f976f5ef24d580cb7ee5a30eb79f68f05de2b6784b79ec93ae090ecbc2a2a09b0cabd4a6a997adef6ccb73f8f258044b0443fa231a403115591202 SHA512 6ef17da86113195d8dae093fddb7c17a365b4cd7816ef0ebb98ac6cda61f52526092f7da6c39c11fba9d709a124970e18e93e267f7d0fb38190e313208f66e98
 DIST bashate-2.1.1.tar.gz 34875 BLAKE2B 9af27813697be12132f58fa13b4f415ce4991795d3e831e651f24a884438775ecaf938f27120ea0fc990f72d8edc5def8ed4bfbc163ca47fabf10a8e350b0b41 SHA512 093ad491b41b73402d316baba894b5f327f07702641f13ece4beb1578d5dfaccbff1e3e0773a799f1acd84443d5a8606288b7c586d5120bb10adcf4427d6f96c
-EBUILD bashate-2.1.0-r1.ebuild 579 BLAKE2B 5fd9a07b53cd6940b8a1aa8516b37212d16ad60b6eb80af15ff06d459e93fa97a0d9fbad1224352a3a2bf20289ab10d4f61196cd5eab5343f3c05b03a566b6c1 SHA512 b9f9b3b03ecb06fb08c0b90684d2da1d80b9565cac5071699b2d4a715c0c0a997ec82b432afe9ed17df6355b5b4566e219b3be4e9d4e0cc4ca518e4d8c9049b0
 EBUILD bashate-2.1.1.ebuild 579 BLAKE2B 5fd9a07b53cd6940b8a1aa8516b37212d16ad60b6eb80af15ff06d459e93fa97a0d9fbad1224352a3a2bf20289ab10d4f61196cd5eab5343f3c05b03a566b6c1 SHA512 b9f9b3b03ecb06fb08c0b90684d2da1d80b9565cac5071699b2d4a715c0c0a997ec82b432afe9ed17df6355b5b4566e219b3be4e9d4e0cc4ca518e4d8c9049b0
 MISC metadata.xml 614 BLAKE2B d48b05b8c07bd3cc56d7121723ff87bd397f2a21816c0348e8e0a7789f893dd9f1c3137c7f296f641e3ec2db57d2929a218be93f2d7073fe65c89f9e2ffe1573 SHA512 622dc67c54dc352a5d3e0f193073eea0bded5c62ced58b3f349fc45fd7ca2c592e634035650ba7b3b01fb647518e2f3bb9cf57622c4796210b9d4d81bbd47e85
diff --git a/dev-python/bashate/bashate-2.1.0-r1.ebuild b/dev-python/bashate/bashate-2.1.0-r1.ebuild
deleted file mode 100644
index 6684d7303e58..000000000000
--- a/dev-python/bashate/bashate-2.1.0-r1.ebuild
+++ /dev/null
@@ -1,26 +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="A pep8 equivalent for bash scripts"
-HOMEPAGE="https://pypi.org/project/bashate/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-BDEPEND="
-	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	test? (
-		dev-python/fixtures[${PYTHON_USEDEP}]
-		dev-python/testtools[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
diff --git a/dev-python/curtsies/Manifest b/dev-python/curtsies/Manifest
index 3e15a7a6a085..68acbbc84437 100644
--- a/dev-python/curtsies/Manifest
+++ b/dev-python/curtsies/Manifest
@@ -1,5 +1,4 @@
-DIST curtsies-0.4.0.tar.gz 53652 BLAKE2B da6b982b8c4bf5430fc31ca2b6eab996a4660403538e73eba253b1e4476f8f4355a0acb9b4ad89c0c3ef3d379b89f1532d8946cc2c716ff5a2f7a4d4ce60a6af SHA512 fea577e356ddee7f2f3c55e405405af835b84a5f00d998a702396f8f40827b18ee88a46cd98607a1c8e33068f040a092c8d9f17463366fb88fcb3cb8cd6f2158
 DIST curtsies-0.4.1.tar.gz 53583 BLAKE2B 311c538dfc782566fefeac5bc085fda57200f1d42118393aee1de89486100d9777d6b5c9de8d7dda9a8d3e8564b56cfeb2cde8d1ed638d5f791e24f37eff7a02 SHA512 f49c5874b0e0e4cf92b05ca979bed8608e5e4e4bebfc78f8558e8b32b06876e680fe4d6bb8723bb2050ab3eed0b5379d065c69a3007e6c399b4f60bd410fc947
-EBUILD curtsies-0.4.0.ebuild 596 BLAKE2B deef0197b6cabe00c10416c445c6faded9e1395a8614f68571f2b00b7fcb0c121484b646491427523ba3253c5204d487197f020dc04e061c9a5c742ac4e467fd SHA512 f9d687d75cb582ed56536daf8ec61b8c3a112e827f3a51e583d3a0c7c7eb9e6e64c26482e3aae011c441930cda24b50905bb79d1a4a462bcdf0a6c4ba317f10b
+EBUILD curtsies-0.4.1-r1.ebuild 671 BLAKE2B de119098aa305031aa1cc0acaa812d593fe9afe94ab7f7dc8e130d82a6244cb5b8ba0397964cb1b89975dee52e07cb21053fec185c61ffead2865384ebe58941 SHA512 b1b38fe46e7f85c91542702bc56ab94c3684e5c9f0f070c6de633954d03654716c3be4372056ea2aa3d82f13312a1bd0150a0dde30f57e412de152761ec7bfab
 EBUILD curtsies-0.4.1.ebuild 596 BLAKE2B deef0197b6cabe00c10416c445c6faded9e1395a8614f68571f2b00b7fcb0c121484b646491427523ba3253c5204d487197f020dc04e061c9a5c742ac4e467fd SHA512 f9d687d75cb582ed56536daf8ec61b8c3a112e827f3a51e583d3a0c7c7eb9e6e64c26482e3aae011c441930cda24b50905bb79d1a4a462bcdf0a6c4ba317f10b
 MISC metadata.xml 405 BLAKE2B 7c57f4c632fddcb41ee10c615862a68010cc66fce074a430f5cf2e0aa82e008d47b10da7fe6c30f39b86bae57019f2db6f7a65c3c1731643b465aad17047073e SHA512 32a4bcd62ffc656cacd01c3f86a06206f643a23e1d44bb760b1ac0b36e01363a491722084f1f7836f218b0637087d7067f33c86dd4cd636c8b258cb0e1731c38
diff --git a/dev-python/curtsies/curtsies-0.4.0.ebuild b/dev-python/curtsies/curtsies-0.4.1-r1.ebuild
index 08c85466166b..feac078070d8 100644
--- a/dev-python/curtsies/curtsies-0.4.0.ebuild
+++ b/dev-python/curtsies/curtsies-0.4.1-r1.ebuild
@@ -3,16 +3,21 @@
 
 EAPI=8
 
+DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{8..11} )
+
 inherit distutils-r1
 
 DESCRIPTION="Curses-like terminal wrapper, with colored strings"
-HOMEPAGE="https://github.com/bpython/curtsies"
+HOMEPAGE="
+	https://github.com/bpython/curtsies/
+	https://pypi.org/project/curtsies/
+"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="amd64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/blessed-1.5[${PYTHON_USEDEP}]
diff --git a/dev-python/eyeD3/Manifest b/dev-python/eyeD3/Manifest
index f2bb82b7f638..e9007b8fde80 100644
--- a/dev-python/eyeD3/Manifest
+++ b/dev-python/eyeD3/Manifest
@@ -1,7 +1,4 @@
-DIST eyeD3-0.9.6.tar.gz 250445 BLAKE2B 11f8bef4b17af07f08144e922634e4c6e467bd8856da9d445a70006b5bf32d442a52e234845a3f146129403fcc16047cc759102b93c433a0466bf0afd9576230 SHA512 0c993e9bf0a27ca41a8a2964a3347a6b0ffa472f833b3dada39ae09a5a2b40e0afb6bfd8c0ea5ed71d3dc2bf3cd062c1fb5fe79abe6ad867221b779786247173
 DIST eyeD3-0.9.7.gh.tar.gz 249705 BLAKE2B b015ab5f7269de8f32830153b848e9a862328515e29f5d1a9cd5739d57a1c0ee63efc93cd3849ceca51b8f67d8eaf1746ab145baf16cda7e7b19bbb8e1249982 SHA512 863ce609ea939588e246d48c6d31f9688049334f874a4c400c02777bbef7379b6403150e7459430c92cff8047d45e33cbaa406b3d6e5b2cf3f9d7d7201438c1f
 DIST eyeD3-test-data-r1.tgz 97336666 BLAKE2B e982f21ba29aaca15c6975a836bed322d5203bca57b93ab0c9343de13259d9e2f56b98e5e7402ccf9138a9dc79951e68c4b37cd2c891d2c9e94815256d49adc4 SHA512 4e6daca06380492c0048f1ffd94d92e511fc3695b3e5f64f805d3f3aa2d0fef05a3be1d67a459fb13ab6d9861b86146487f31321f979c464fc516047b66735ab
-DIST eyeD3-test-data.tgz 97281754 BLAKE2B 9b667a5f8be157ace06d773d575c08f4a8e8b7a7b81ba9cb39b1e2c924b2e3f98597607ed3076b13150e02ef7768e89d1ff8a9913021e5f4b9ac6b59344ed397 SHA512 937971dcefc53812c59adb97df27d200e92de04e12391c735ab85cd547e2a168aa1212d88c206ec71ac2fa85a504a9faa91dcc444b45149aca7c8f3a794e9a95
-EBUILD eyeD3-0.9.6-r1.ebuild 1259 BLAKE2B bf2bd70202050108801b87c3fa7f4e37de1edd1f71440a81a1f9b3f9d68a41cfdf6187ed07cfe90e02181eb829ceae984a815c7a5fdcc014e9dd907a7df94132 SHA512 47257122e9758aff6535cd4e881c9910fe82bb96d92cd52112de1e05cdf0375db1e6e406a312a11081af8d2c482d470a1819dc517883f280b704966558fa22d9
 EBUILD eyeD3-0.9.7.ebuild 1350 BLAKE2B 7e56e885e2ece7fcdb21c9ad8ab1dd650df8a43914f38d1be21ded35f9dfc0a98fa8a707234a39b9a2c320da153cb7e59e4faa1c19fcfb9a3979229ce4e12197 SHA512 86d8f273cfc6d0fb4c88a2c9d6ee983a32e4968501b4862944ed491839eba01a5175383cdca607504a9d478d1b89f638eb267e7ff68c24b0efce4ac368df5fb9
 MISC metadata.xml 499 BLAKE2B 0bd6552d10ad9f18cc93c65439b61f6de2b0e24ce1321e2172262ddd361573fa1891192c83556341c1f25805759bdea36b8d524204272dcdaf27fadb571df24b SHA512 77df82bbf9c8f11537a3a3a49e16d05a7cf558711b60af65fc646aa9cb52c3f463b808e9cff45758b823a30abd96404e0856057d92cffbc2f72d81b6c74fc19b
diff --git a/dev-python/eyeD3/eyeD3-0.9.6-r1.ebuild b/dev-python/eyeD3/eyeD3-0.9.6-r1.ebuild
deleted file mode 100644
index 7a7bba08a967..000000000000
--- a/dev-python/eyeD3/eyeD3-0.9.6-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Module for manipulating ID3 (v1 + v2) tags in Python"
-HOMEPAGE="https://eyed3.nicfit.net/"
-SRC_URI="https://github.com/nicfit/eyeD3/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	test? ( https://eyed3.nicfit.net/releases/eyeD3-test-data.tgz )"
-
-LICENSE="GPL-2"
-SLOT="0.7"
-KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
-
-RDEPEND="
-	dev-python/deprecation[${PYTHON_USEDEP}]
-	dev-python/filetype[${PYTHON_USEDEP}]
-	|| (
-		dev-python/ruamel-yaml[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-	)"
-# note: most of the deps are optional runtime deps / plugin deps
-BDEPEND="
-	test? (
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/pylast[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# requires unpackaged factory-boy, doesn't seem to relevant
-	# to anything but eyeD3 usage with factory-boy
-	rm tests/test_factory.py || die
-	# requires unpackaged grako
-	rm tests/test_display_plugin.py || die
-
-	if use test; then
-		mv "${WORKDIR}"/eyeD3-test-data tests/data || die
-	fi
-
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/gpep517/Manifest b/dev-python/gpep517/Manifest
index 10a3f20de93b..dc28a57de751 100644
--- a/dev-python/gpep517/Manifest
+++ b/dev-python/gpep517/Manifest
@@ -1,3 +1,5 @@
+DIST gpep517-11.gh.tar.gz 15344 BLAKE2B 14f3f4b284eb4f7de8a78a9215cf2ec7fc84cb4028d83555b595a245d5ff2eb78be5049b30ccca944c35c40db0cc61e1afeaa68b25a0d6f3608363af75059762 SHA512 5ce840841d99c20d62b5b6c8dcb6ec353e40c75537aa99e44fa7dc13bff37444cd66d4cbc97eb1b107b6df85edfda853343d5e8ef1865d0d5ccd293c1496b5c0
 DIST gpep517-9.gh.tar.gz 15227 BLAKE2B b3c2b3e4452a7e27725eea0a6a0b1b362e1ea6bbdae44d99a2992c9edac80a4fdbf2ed75a231004534039c6d6f6db54d9fdbdc7c2c7044bb85cbc3f88484be41 SHA512 94cd1ddb1de7844504906b056ec5eb9d0e80da4f6bde6b561075c754a78a97e6db6025a793592c9498fad54ebab48c5497b29268c40d6992f5ef793a698b9da1
+EBUILD gpep517-11.ebuild 1057 BLAKE2B 22ce3d5726012ff9f928ef925f1134c97f9dbd8f15bf7c172e21bdd056934618f0fb4f44cc90940e8b4af60bc2022a03f2eaf99f1a2c74b07937cbf585480601 SHA512 1d46019f25e7de6dbbe0c3628a03b46a9a8ced619958dc1494cbb91d5cca7c609f9efbb2d8923b9d6250ff5d129825f604284fa95d24b6a1d026079ee0fa0bdb
 EBUILD gpep517-9.ebuild 1049 BLAKE2B cfe9acadcafdacc7967b2454c2548e074d056d4dda35939109b0fca25bf475746f2f3e1f3f70fac4c08533c8281808e2db743e5092dcabce813bfe56d1978be0 SHA512 d2a67868146a6b6f3324b058781dd29b641b0674f738b472ad6afcebf775dc1bccc5eac65b1fb0792885287baac9ba1fa13441a5dfcb3c95e904320d7697ea56
 MISC metadata.xml 396 BLAKE2B b67a7e2109f002e48023fc60f19fe2aa7f224010795434815a4c7c0d075dba6cb27e9d443ff86b84ba582a12b30dec5dc8ce9c91419dc2d04c1c61f45e901192 SHA512 402dc1c9cad90e122443599282d03d317a29d31189aa1532041104ae4b6292340b5744488075c9f52877f450561072ef4d8750db65412bcb81b2af5648078b37
diff --git a/dev-python/gpep517/gpep517-11.ebuild b/dev-python/gpep517/gpep517-11.ebuild
new file mode 100644
index 000000000000..5cd8e4b1d379
--- /dev/null
+++ b/dev-python/gpep517/gpep517-11.ebuild
@@ -0,0 +1,41 @@
+# Copyright 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=no
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="A backend script to aid installing Python packages in Gentoo"
+HOMEPAGE="
+	https://pypi.org/project/gpep517/
+	https://github.com/projg2/gpep517/
+"
+SRC_URI="
+	https://github.com/projg2/gpep517/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="
+	>=dev-python/installer-0.5.0[${PYTHON_USEDEP}]
+	>=dev-python/tomli-1.2.3[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+python_install() {
+	python_domodule gpep517
+	python_newscript - gpep517 <<-EOF
+		#!${EPREFIX}/usr/bin/python
+		import sys
+		from gpep517.__main__ import main
+		sys.exit(main())
+	EOF
+}
diff --git a/dev-python/importlib_resources/Manifest b/dev-python/importlib_resources/Manifest
index 5f85b7d00ec1..310a741e532e 100644
--- a/dev-python/importlib_resources/Manifest
+++ b/dev-python/importlib_resources/Manifest
@@ -1,5 +1,3 @@
 DIST importlib_resources-5.10.0.gh.tar.gz 34195 BLAKE2B 9b9fc1c33de8a0072edb28a0a67ae73b6830a4d0e16ebfa28bdeaff1409b2f9aeafc84e24f1187cc4ac1b36de78fdecc25acb4a1839ff5fd32f1c38124a98ff2 SHA512 3cf2bdea4fa4572402236ff71678376398d8cae4e87f08487100792275976047a5ee4f024308f1727758ba15ba2f03ed02d8cb95f2d9875c77842a5d24f7f384
-DIST importlib_resources-5.9.0.gh.tar.gz 32691 BLAKE2B bc922945d0577222e704ac3a5aa24cd6abb31c9b44f42c342e78f45fb035ee2b3843c437eba31bc8a73f609f6126390f4141c52b9eef15ff8bc7efc44233e81b SHA512 9054b633f3c9b3523ccfa2be93774d0aa4b0c2ab8bfb228f1e0bfbbc076362b416c9714409ff365aa5eae579554feedc8f2aeaa49c766db37ab669414eb22827
 EBUILD importlib_resources-5.10.0.ebuild 1293 BLAKE2B 96d73479edc320ca0f2b1689535980d56773491287220d6660255b61688ea5828a4b17e6c381e32942dded7fa732bd13f5823ca01210734e5f1e99f7abc2e67d SHA512 ba3f9d137fb65cc8ac5077fd77fba18c7969de6ddf065294a2bca5c33db1e331523091a3a232512d5bdeacb96405d169ce8136ae44061b3b5633ed8cf420fd0f
-EBUILD importlib_resources-5.9.0.ebuild 1293 BLAKE2B 96d73479edc320ca0f2b1689535980d56773491287220d6660255b61688ea5828a4b17e6c381e32942dded7fa732bd13f5823ca01210734e5f1e99f7abc2e67d SHA512 ba3f9d137fb65cc8ac5077fd77fba18c7969de6ddf065294a2bca5c33db1e331523091a3a232512d5bdeacb96405d169ce8136ae44061b3b5633ed8cf420fd0f
 MISC metadata.xml 945 BLAKE2B 130dc56a13a8416168baf91e804e1fdef0d65978641c3fca5eb663b8accb5b1adc066bc4033751f03a9c729e27d0448925a7b623431922056fb7d282db052734 SHA512 ccb23df48a89f69133469722fb37acf516127b207b946cdea240cf82e2ba5422ee4e2166d1a9419031408a7624a52256e322fe7e478a9a7b8214ab4bc5c9b92b
diff --git a/dev-python/importlib_resources/importlib_resources-5.9.0.ebuild b/dev-python/importlib_resources/importlib_resources-5.9.0.ebuild
deleted file mode 100644
index ebd2929dda83..000000000000
--- a/dev-python/importlib_resources/importlib_resources-5.9.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
-EAPI=7
-
-DISTUTILS_USE_PEP517=flit
-# This is a backport of Python 3.9's importlib.resources
-PYTHON_COMPAT=( pypy3 python3_8 )
-
-inherit distutils-r1
-
-DESCRIPTION="Read resources from Python packages"
-HOMEPAGE="
-	https://github.com/python/importlib_resources/
-	https://pypi.org/project/importlib-resources/
-"
-SRC_URI="
-	https://github.com/python/importlib_resources/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos ~x64-solaris"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		>=dev-python/zipp-3.7.0-r1[${PYTHON_USEDEP}]
-	' 3.8 3.9)
-"
-
-distutils_enable_tests unittest
-
-src_configure() {
-	grep -q 'build-backend = "setuptools' pyproject.toml ||
-		die "Upstream changed build-backend, recheck"
-	# write a custom pyproject.toml to ease setuptools bootstrap
-	cat > pyproject.toml <<-EOF || die
-		[build-system]
-		requires = ["flit_core >=3.2,<4"]
-		build-backend = "flit_core.buildapi"
-
-		[project]
-		name = "importlib_resources"
-		version = "${PV}"
-		description = "Read resources from Python packages"
-	EOF
-}
diff --git a/dev-python/manuel/Manifest b/dev-python/manuel/Manifest
index 013bdb296573..54107bdcc5b8 100644
--- a/dev-python/manuel/Manifest
+++ b/dev-python/manuel/Manifest
@@ -1,3 +1,4 @@
+AUX manuel-1.12.4-tests-python311.patch 793 BLAKE2B b5af04ad5b1508d35683e44c6fcfaf5c5d364c14f81d569c7971179a959c2eea98d70d077c45fa9473e4ae79f4a471f51e587c421588bb2e0795cbfc2cbd3c55 SHA512 1a89e91cbb63c5d040aa08afbb86e5fecf4fd8fb4d43079ac0fcb71d1e9d6cde7ba0c7eb042016e5e5eff8c594785662be3972c4667dc4e18ad7dcc1fa856eb8
 DIST manuel-1.12.4.tar.gz 45369 BLAKE2B e15f9261854fbad8ee1e1dc8645ec286a212c460a78fff1576b6886d8bf462ffe9a5484338fd9efc2bf053a7689e16b08de55f763ae319e66a363c5c28cf2a60 SHA512 cd65307f2ca94e66d88bc0c7c75702d49f505b358ebb812fd20906036ba10f2d1d11d2d69404b88c5f10b584dea05a988b5dc8ba07210b9d20ebd8a11b701633
-EBUILD manuel-1.12.4.ebuild 752 BLAKE2B f4927ae883af1e7591d18f7bf4628c277ae705545f6be141815fdbd3a2b7b1ed7bb93bfd2813647c7dd98c2a9852b20d88164b6dbe10a77506c82d6b87f11f17 SHA512 e905aa42718cdf3ffb0caabc283ec84a1b8e580e32f22a1e06fb7d5e6c11adc4eb1be5c94e6ef6e335b8ce0a566185ad5081236d48c03cc460aa0b131e8b8e35
+EBUILD manuel-1.12.4.ebuild 807 BLAKE2B b5459f14b99e6b266a62a33943d9bdab51ba030302c180e4ab219b4e52ca8c8e3fa6c2109e204db3f74b291a8370aca756fa530ac29ae3eb89b8bbef5f8c8d3d SHA512 e9dad73f7ab25f52ee8a33f87dab645b77d80abf53bd20a340ad007132976828034f964089a962fa3c35d7e5ff5039acc0e601e366043834c183ca20e47c5c94
 MISC metadata.xml 391 BLAKE2B 6b95f9d29d8df2b9f0cfd85012a7d751f443c3bc67f6254c376f8cd3c1c66e2972bc165edc8db6b5ef2851edf3e870cc2ca76d3f6f3c06daeb247ee349407f45 SHA512 ace493867fc08487876a55331b619a62b01e269d7b5307b2ae9e016d75ee9058f2e1354bd2e3243ef1b0cfff30cc3f8f661675e03c1ac07fb805f443b31c64ad
diff --git a/dev-python/manuel/files/manuel-1.12.4-tests-python311.patch b/dev-python/manuel/files/manuel-1.12.4-tests-python311.patch
new file mode 100644
index 000000000000..5a6ef9dc3b7d
--- /dev/null
+++ b/dev-python/manuel/files/manuel-1.12.4-tests-python311.patch
@@ -0,0 +1,22 @@
+https://github.com/benji-york/manuel/pull/32
+
+From d9f12d03e39bb76e4bb3ba43ad51af6d3e9d45c0 Mon Sep 17 00:00:00 2001
+From: Matt Jolly <Matt.Jolly@footclan.ninja>
+Date: Mon, 6 Jun 2022 22:44:22 +1000
+Subject: [PATCH] Replace TextTestResult with TestResult for Py3.11
+
+--- a/src/manuel/index.txt
++++ b/src/manuel/index.txt
+@@ -211,10 +211,7 @@ When tests are run this way:
+ 
+     >>> sys.stdout.writeln = lambda s: sys.stdout.write(s+'\n')
+     >>> suite = loader.loadTestsFromTestCase(MyTest)
+-    >>> result = suite.run(unittest.TextTestResult(sys.stdout, True, 3))
+-    test1 (tests.MyTest) ... ok
+-    test2 (tests.MyTest) ... ok
+-    test3 (tests.MyTest) ... FAIL
++    >>> result = suite.run(unittest.TestResult(True, 3))
+ 
+     >>> for _, e in result.errors:
+     ...     print(e); print
+
diff --git a/dev-python/manuel/manuel-1.12.4.ebuild b/dev-python/manuel/manuel-1.12.4.ebuild
index 53d57dc4f904..51d2168b7d8b 100644
--- a/dev-python/manuel/manuel-1.12.4.ebuild
+++ b/dev-python/manuel/manuel-1.12.4.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
@@ -28,6 +28,10 @@ BDEPEND="
 	)
 "
 
+PATCHES=(
+	"${FILESDIR}"/${P}-tests-python311.patch
+)
+
 distutils_enable_tests setup.py
 
 src_prepare() {
diff --git a/dev-python/plumbum/Manifest b/dev-python/plumbum/Manifest
index a0469d1a8510..3b712c6f6eb9 100644
--- a/dev-python/plumbum/Manifest
+++ b/dev-python/plumbum/Manifest
@@ -1,5 +1,3 @@
-DIST plumbum-1.7.2.tar.gz 323051 BLAKE2B a16d9210606ac67abd425fcff109d40836dc969729cc5bf78a5d224c0beabf09d56d35f17809994d758153c6e18e4af91403f7ae0111912447367be68f6592c1 SHA512 77e75988255ca78fa5c253c6d076d63f8f9250a2b153ef23e40f35315e255ea09403d854a19bb265fd658bb9e5f0f705dc7530ecacc40b4b48e33acdf50dddf9
 DIST plumbum-1.8.0.tar.gz 325060 BLAKE2B 30006fa3826bbdd9482592d825931fd7dcb05b2aca6d762093c4f722f0426aaa6f07fde55754f115e4fba4a45997d2995a657c5a1cfa34c417bb4f5fb2e5834d SHA512 47874c42081d385fad85b9073fbeb711112b8fa847fc79035be1277a1fdabcfb06e7822a4dbba271d86502b9b297a70742f30b1158c363b668a47e783c9990cd
-EBUILD plumbum-1.7.2-r1.ebuild 1349 BLAKE2B 0bd3562a8e693869d886507384e3797cf3c8b4032c6ec2b403b2f1b466569f52d82d65caab4bda619538d9a5752024b44692a3ac995ea93a1af7ed431f96ef93 SHA512 29bee99a54ed7441b6e107ba63fceb7114db50110e68f370cd27f7a4baddbd173634ee702a626b7f9663ea6471c038e36609ea58a2e68292eed218cf3d688f7f
 EBUILD plumbum-1.8.0.ebuild 1354 BLAKE2B 9141a3ee5b1a2c6fe5a4981c986a911026df7a0a69e524c55e37c315bf2fa5b64600eef458141be122f97f1f310f1ca3a56b1c03b9fcf04c4cfda183cf6affa1 SHA512 be90b82291e43da729897cdcdd9d0efb84d8cd4abdb325d83334315fe4c333c0283ea08af374693676877b031bab28718e250ddd33041d5177353822a909255f
 MISC metadata.xml 754 BLAKE2B b6d00fe0747da15445953a29abdd6f14112d02f2162746992f2fca80a321cd10f3cad40294e4bdbcf3f04d432b4d81902667296a0a5b8f99da2df2a5c58b18c1 SHA512 fbadbb7e5edd1573994cfc843e4a254ae5d12be5a3372f4fb061647983e360c2b0ea4a9e41ea8c9ff26028db75ad9cd5de881b8fdd9bf35864442e215aa42175
diff --git a/dev-python/plumbum/plumbum-1.7.2-r1.ebuild b/dev-python/plumbum/plumbum-1.7.2-r1.ebuild
deleted file mode 100644
index 1e6e36a83392..000000000000
--- a/dev-python/plumbum/plumbum-1.7.2-r1.ebuild
+++ /dev/null
@@ -1,53 +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..10} )
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="A library for shell script-like programs in python"
-HOMEPAGE="https://plumbum.readthedocs.io/en/latest/ https://github.com/tomerfiliba/plumbum"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-BDEPEND="
-	test? (
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# Need sshd running
-	tests/test_remote.py
-	tests/test_utils.py
-	# Windows specific
-	tests/test_putty.py
-	# Needs sudo without password
-	tests/test_sudo.py
-	# Wrong assumptions about env handling
-	tests/test_env.py::TestEnv::test_change_env
-	tests/test_env.py::TestEnv::test_dictlike
-	tests/test_local.py::TestLocalPath::test_iterdir
-)
-
-src_prepare() {
-	sed -e '/addopts/d' -i setup.cfg || die
-	distutils-r1_src_prepare
-}
-
-pkg_postinst() {
-	optfeature "remote commands via ssh" dev-python/paramiko
-	optfeature "progress bars in jupyter" dev-python/ipywidgets
-	optfeature "colored output in jupyter" dev-python/ipython
-	optfeature "images on the command line" dev-python/pillow
-}
diff --git a/dev-python/poetry-core/Manifest b/dev-python/poetry-core/Manifest
index 4872bc7a9d09..8796aeb96df6 100644
--- a/dev-python/poetry-core/Manifest
+++ b/dev-python/poetry-core/Manifest
@@ -1,7 +1,3 @@
-DIST poetry-core-1.2.0.gh.tar.gz 536297 BLAKE2B 0ba82bfa320d65ce794a4f2346198d252139c03960298ede02f55d8b23367e05e9336b3d5030032b1feab4ffa327974af26ce2918d4d40889f68fbec79ccb490 SHA512 f6d79d7d66a25aa127b5decf46df861ecc101af0438b892196505b4ece5cc55f6ff8796eb603789b3259d213162236b7698305523b2eda414ad1f3a5b659eab9
-DIST poetry-core-1.3.1.gh.tar.gz 539214 BLAKE2B 12db16f06e5b7f94e0aa6edf6d5cc6c8c15c6389e3e1f517884c5532b211982d34682c035b69e53dfef60506c8be16ed36b0c8cc66651c88d83436d6cfc5182f SHA512 c61b7edeb0c821c0a1cd983965a3140cb8183147740e3b242d0cb0bfa375d6ee352314dd81e243d03c31e403c4a01353657cf771b84130ef058815068ecfdd5e
 DIST poetry-core-1.3.2.gh.tar.gz 539267 BLAKE2B 43845f344f8b492aa5dae5608b8d67b41efab33c60999cc61d8476e08a9ec9870328174b371d0735624c5f11dd2ce15e19e2c984653c7349dd0c3a687dec0123 SHA512 57fca4925889bfcff9335c0f76ea0cf8b48de1cb7bdc83bab8ceee452d6a6d64c4eaa169be17fb32ee59f453256fde1191e5c36382c4be27b74b5e3c8dce7703
-EBUILD poetry-core-1.2.0.ebuild 1620 BLAKE2B 41931afbcf5767a54fb5df962676cfbd0fda0274de861431ab0f343717f1d725ff42be41b5268f5aa760013163164a07bf5b417065607a2ceb3d230b5cd84534 SHA512 541c765d3e42be2192d490a2cc86d668ffc5940909d47197de21d95e0863bd37fdf2eb41c625f44d9611c2fe81bbf9f7008756dad00951cd49c0e9988fee6df0
-EBUILD poetry-core-1.3.1.ebuild 1628 BLAKE2B d21b2534abea4c369eeadde7fd2d2ff6a1b1baf557a44454fbbc5dbd8ba506656aae294a35b64efa5f33127a76ad9ec32b71c0105bd3a90e2e58bd9253e724e9 SHA512 fe519e3c99aa9daf15bc60f3074b492381cd54a86bf915399ee45f54b6765412a653a537ace5fe817f01bb3dcb6143618ee80f7a3714f8837b6ccb6440a44c0e
 EBUILD poetry-core-1.3.2.ebuild 1620 BLAKE2B 41931afbcf5767a54fb5df962676cfbd0fda0274de861431ab0f343717f1d725ff42be41b5268f5aa760013163164a07bf5b417065607a2ceb3d230b5cd84534 SHA512 541c765d3e42be2192d490a2cc86d668ffc5940909d47197de21d95e0863bd37fdf2eb41c625f44d9611c2fe81bbf9f7008756dad00951cd49c0e9988fee6df0
 MISC metadata.xml 382 BLAKE2B 82dfc3f146cf3b669fed67ab2e21694b00d5473fdf855cae9fb3a0481785b32c4cf1ed9743a5d64cd055c1cb544377f936a9ec26c9d1dec2cf5fbef6749f5587 SHA512 032fd4dca8f8138c2b527e517f041889e15600ccca876fc3c9e53050196186ad2a9346168bce9c4bae7ffd8a77ff4dd19cc2559fd1da1fd4c7c181056fd49a13
diff --git a/dev-python/poetry-core/poetry-core-1.2.0.ebuild b/dev-python/poetry-core/poetry-core-1.2.0.ebuild
deleted file mode 100644
index 8427d857ecdb..000000000000
--- a/dev-python/poetry-core/poetry-core-1.2.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=standalone
-PYTHON_COMPAT=( pypy3 python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Poetry PEP 517 Build Backend"
-HOMEPAGE="
-	https://github.com/python-poetry/poetry-core/
-	https://pypi.org/project/poetry-core/
-"
-SRC_URI="
-	https://github.com/python-poetry/poetry-core/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-# check inside src/poetry/core/_vendor/vendor.txt
-# (note that some are indirect deps)
-RDEPEND="
-	dev-python/jsonschema[${PYTHON_USEDEP}]
-	dev-python/lark[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/tomlkit[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/build[${PYTHON_USEDEP}]
-		dev-python/pep517[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/virtualenv[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# These "fail" bacause of glob file path resulting from newer versions
-	# in our tree than vendored. But those don't affect anything.
-	tests/masonry/builders/test_sdist.py::test_default_with_excluded_data
-	tests/masonry/builders/test_wheel.py::test_default_src_with_excluded_data
-)
-
-src_prepare() {
-	# remove vendoring of dependencies
-	rm -r src/poetry/core/_vendor || die
-	sed -e '/__vendor_site__/d' -i src/poetry/core/__init__.py || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# needed for migration from <1.1
-	distutils_write_namespace poetry
-	epytest
-}
diff --git a/dev-python/poetry-core/poetry-core-1.3.1.ebuild b/dev-python/poetry-core/poetry-core-1.3.1.ebuild
deleted file mode 100644
index c76206f1717a..000000000000
--- a/dev-python/poetry-core/poetry-core-1.3.1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=standalone
-PYTHON_COMPAT=( pypy3 python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Poetry PEP 517 Build Backend"
-HOMEPAGE="
-	https://github.com/python-poetry/poetry-core/
-	https://pypi.org/project/poetry-core/
-"
-SRC_URI="
-	https://github.com/python-poetry/poetry-core/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-# check inside src/poetry/core/_vendor/vendor.txt
-# (note that some are indirect deps)
-RDEPEND="
-	dev-python/jsonschema[${PYTHON_USEDEP}]
-	dev-python/lark[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/tomlkit[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/build[${PYTHON_USEDEP}]
-		dev-python/pep517[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/virtualenv[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# These "fail" bacause of glob file path resulting from newer versions
-	# in our tree than vendored. But those don't affect anything.
-	tests/masonry/builders/test_sdist.py::test_default_with_excluded_data
-	tests/masonry/builders/test_wheel.py::test_default_src_with_excluded_data
-)
-
-src_prepare() {
-	# remove vendoring of dependencies
-	rm -r src/poetry/core/_vendor || die
-	sed -e '/__vendor_site__/d' -i src/poetry/core/__init__.py || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# needed for migration from <1.1
-	distutils_write_namespace poetry
-	epytest
-}
diff --git a/dev-python/pykwalify/Manifest b/dev-python/pykwalify/Manifest
index 20296ea2b77d..1939b993d490 100644
--- a/dev-python/pykwalify/Manifest
+++ b/dev-python/pykwalify/Manifest
@@ -1,4 +1,5 @@
 AUX pykwalify-1.4.0-S.patch 862 BLAKE2B d92c4e8d4d85d28f6df574bfe2f1ab0aa82c32ba8ce2b4a2d6ecdc21fe1db4056351b6aa6dde04d897525ce596ed492781bd7dcf0fba2ca5970a3af79a9abf3b SHA512 f7d9189993cd73a0412ef01fcb01a99fcbc61edc6863a1997333de085294b9c5772d026f7ab8f16703568404f2ff76bb1aeed760d7908c7865e0891ad5752dc9
 DIST pykwalify-1.8.0.tar.gz 62462 BLAKE2B 1593f5e3e15188929574ece60bf6818438258bf024d105ae26323a97a202ac69001a15ca6daaa430970af3659c49da745bcf1f77c23ac72bed2ddca14440d943 SHA512 c77d3072995bb3f61336e725227eeece1dafe2182513e5f67eedeeca3437825b53ac691a991055aad8298db252e2012bc9a61c23d766335fcfbb10a3b587b45d
 EBUILD pykwalify-1.8.0-r2.ebuild 797 BLAKE2B 2ebf9eb9f7427e1050c110e7bd3c7d9a91358b5cc13a01c36bdc7bf40064e5fbe911215892e4c82a5d8922a849fc8aa4d9ecc45978821066765dfb0161874a17 SHA512 51b38900d9848a01e8de7d67ba15a9656b30578e2089cd1d73dfa0ccd90c93cb885a5496649d1c125139005112177ced9ede305f1433b86f8167e4d2f9a8e3eb
+EBUILD pykwalify-1.8.0-r3.ebuild 799 BLAKE2B 5a506e7a27eae67ee48ced4e336992e6207bd6facab2f86c3430f39fe25e86907471a98c58abeb4a13165b678421b7ef0e7a69e99795c6e20b9bedf65d6a5fc2 SHA512 76b7dd09c7acb80e8a1add940d3805e10ca1a4c52e5d871a0a9ffb057dd791a13691227cf2f3277f35e5b8f88767e2ca01aab242abcea141c41cb7f1b7667fc0
 MISC metadata.xml 394 BLAKE2B e7262ef0692f68f8fd8c2d8b45cc7a18efc5c2759a7998d3c065f17450d2f4de09d4432961c7327f68fbd52cd61a9183122f19fc829a9c93a6a40b36ac3d9952 SHA512 0d96c9c00d4cd4a64afd790df32cc1536afaeb952d6172a7c3efd227c9686c7fe743e30f94c218e73ef5911c59b23aa40a9e5f19ded5474987d79e7337fcc6b1
diff --git a/dev-python/pykwalify/pykwalify-1.8.0-r3.ebuild b/dev-python/pykwalify/pykwalify-1.8.0-r3.ebuild
new file mode 100644
index 000000000000..2a4148505387
--- /dev/null
+++ b/dev-python/pykwalify/pykwalify-1.8.0-r3.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=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python lib/cli for JSON/YAML schema validation"
+HOMEPAGE="https://pypi.org/project/pykwalify/ https://github.com/Grokzen/pykwalify"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/docopt-0.6.2[${PYTHON_USEDEP}]
+	>=dev-python/ruamel-yaml-0.16.0[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.8.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/testfixtures[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.4.0-S.patch
+)
diff --git a/dev-python/requests-toolbelt/Manifest b/dev-python/requests-toolbelt/Manifest
index e1e4dbe03203..2de693e326a3 100644
--- a/dev-python/requests-toolbelt/Manifest
+++ b/dev-python/requests-toolbelt/Manifest
@@ -1,10 +1,3 @@
-AUX requests-toolbelt-0.8.0-test-tracebacks.patch 1428 BLAKE2B 6f9645f2a456cde3a080337c00697493958d9bfd424eef9b9998233336ccea06ecea345cd55ff1321939421bbbb5c7ea566de8ed3d5d8133d62083c80f2bc2a6 SHA512 22332dceb704750d1d6ca7d640251dacea764dbbda4e530977f6788e19c1d1a857471d8cd94d99465e146bc96be9c35b67a9608a31997725b6284e7c10117f8f
-AUX requests-toolbelt-0.9.1-py310.patch 1470 BLAKE2B 864c496f712b9667de991afe7d8db0071b15e6c546fb495c3df5aa25d354bb2873f697d5777f5e6f1a9890289bad192a5c5053d11ab71eb0967762b30c35a977 SHA512 3780eeef7835319d5696f1ac8273c682c4b2a97171b7fed889c1960e3887f1fa6eecf13d4c961a9c2aa9e02e919e885f18bfde8eeabf452e16267ff671d07703
-AUX requests-toolbelt-0.9.1-tests.patch 5781 BLAKE2B ff7339a1daf0ba2df49914847000f0b8b5ff2d097a59bcb02bcb2b20a885f18223a1da1f44a99d846dcff423239108411c193da5092bbb27fdf50bf211dd59f7 SHA512 86919154164274efe8bceb42eb9fc17524d4e144a541e82bc10692da66e533220cdc7186362d77fd4f3acdc639744cdf5273c2e4e2091eb4d33c1fdc6c631ec5
-DIST requests-toolbelt-0.10.0.tar.gz 211210 BLAKE2B 73196e33d42ff6f4532cd2904537451cc237627a149fa759fca7a66e360c0ddb8baf8c4537c880baf03a25065226380788449bae05434aad37962034e1324acb SHA512 75e3a3e609625254e1f078d3c48c664b3118f5a406c84e59c4e9acdeb20a79b5d38ceaaf9578920063f063aa8385139310c06331499aaa92d3c51146f908f1a1
 DIST requests-toolbelt-0.10.1.gh.tar.gz 201504 BLAKE2B 48c5b9f46000d9809e482278626bbce805b93ed2a4a5d074bad4f7fbda75984dd55919eca31909c98c9a74ca7b323e73c90691dced0734964621d4ba5748d464 SHA512 ad6dfe3329c8be5a4521d223d25ec303201e706b34199c084efd0a30b8bc8cfb3382e80a502dc25bd5f7e5b2774a119d2255c49408979aaec45e221f412a7b52
-DIST requests-toolbelt-0.9.1.tar.gz 207286 BLAKE2B 6123677a9abafebddf7dffde2150b2426b5132ebe0c330ff891322ecc3d69232a5b15a0c66e3e1fb4832dc04f5a636a939613fba041e499e9fbca9814f548c7e SHA512 12229928df5df71cb57bc65ef453dc0e4a2bbe190c1579811b2c2823673bd81aeba856b00000fa20b253d0f0fa4fff55ea1e750794ca3785f71c376b1df7fd93
-EBUILD requests-toolbelt-0.10.0.ebuild 1237 BLAKE2B 9b0e5ce0fbecf76dbe13094860c77cb79fcec54fe7ee79ea3e8c42a8396850bee3d1cb1e64d15596221e79fc3ffbafe92e445c6ae0a6abc86c257463d1916a18 SHA512 22b05a4b17fde32b56a4c4b43bdc655e3a7b31c3f8f765c3575cbd00cde45831c8b1ef4314113e374ac094110ec77acf4d753e87d10220617b0123ec12c29052
 EBUILD requests-toolbelt-0.10.1.ebuild 1296 BLAKE2B 23469d02d25136cec8cb3a96be71643230626a36d614102570e29613323c1101c382fb71e7d254f036d1e28a6b86b46e4f1618a50e0dacccfb01106cda3c84f5 SHA512 3004fa2f358512b874722a7e2e00fd176da8b6f57bb09e6865b7d21328eddd558659a5ca5c8edba9010de57b87ec1968160e0146c7e267797107fe900dcc51e8
-EBUILD requests-toolbelt-0.9.1-r1.ebuild 1441 BLAKE2B ed064f4ee21e74de5a5474fd741e6fd047d4def4f1ce3c887dfb643d965a18105c4914395d9156353218b5a9e160dbe3ad6e84f7896f64ff8ffa4cd059a7cd7b SHA512 567bb53929f4e20ee443f882510f6c53a635e648206120a15da32c345fac935bb39eb8acc36fe6ddcd9f2f78f601458e14d3b6aead926e7be293dccca63bcc3f
 MISC metadata.xml 423 BLAKE2B 71af8f087b4bf8d805a70aed1dcb46128b0252f68a1e892530c5393bc6666c8d203e147558214935803a34b5be32bc90f6bb3fa103af4406c0fe6d974acbd739 SHA512 1c875ab992aa1d463fdd52468597f5bebb7aff54c6d665660d2b4df1d41b78e78575be4629b11eef10b783ef1dd4b048b86742ce20eb4584558bc8d87b17988f
diff --git a/dev-python/requests-toolbelt/files/requests-toolbelt-0.8.0-test-tracebacks.patch b/dev-python/requests-toolbelt/files/requests-toolbelt-0.8.0-test-tracebacks.patch
deleted file mode 100644
index 418039bc7f94..000000000000
--- a/dev-python/requests-toolbelt/files/requests-toolbelt-0.8.0-test-tracebacks.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From e130ad521d3b5a14cd9494213e6ca9f52d0d9a2e Mon Sep 17 00:00:00 2001
-From: Brian Dolbec <brian.dolbec@sony.com>
-Date: Wed, 7 Mar 2018 21:52:25 +0000
-Subject: [PATCH] threaded/thread.py: Fix unhandled Nonetype job queue
-
-Adding this check and return prevents numerous test tracebacks:
-
-Exception in thread 12f554d5-f61f-44d9-bc69-023714627952:
-Traceback (most recent call last):
-  File "/usr/lib64/python3.4/threading.py", line 911, in _bootstrap_inner
-    self.run()
-  File "/usr/lib64/python3.4/threading.py", line 859, in run
-    self._target(*self._args, **self._kwargs)
-  File "/home/bdolbec/git/toolbelt/requests_toolbelt/threaded/thread.py", line 43, in _make_request
-    kwargs = self._jobs.get_nowait()
-AttributeError: 'NoneType' object has no attribute 'get_nowait'
-
-Signed-off-by: Brian Dolbec <brian.dolbec@sony.com>
-Signed-off-by: Brian Dolbec <dolsen@gentoo.org>
----
- requests_toolbelt/threaded/thread.py | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/requests_toolbelt/threaded/thread.py b/requests_toolbelt/threaded/thread.py
-index 542813c..f33b759 100644
---- a/requests_toolbelt/threaded/thread.py
-+++ b/requests_toolbelt/threaded/thread.py
-@@ -36,6 +36,8 @@ def _handle_request(self, kwargs):
-             self._jobs.task_done()
- 
-     def _make_request(self):
-+        if self._jobs is None:
-+            return
-         while True:
-             try:
-                 kwargs = self._jobs.get_nowait()
diff --git a/dev-python/requests-toolbelt/files/requests-toolbelt-0.9.1-py310.patch b/dev-python/requests-toolbelt/files/requests-toolbelt-0.9.1-py310.patch
deleted file mode 100644
index 182e413158cd..000000000000
--- a/dev-python/requests-toolbelt/files/requests-toolbelt-0.9.1-py310.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 7188b06330e5260be20bce8cbcf0d5ae44e34eaf Mon Sep 17 00:00:00 2001
-From: Jon Dufresne <jon.dufresne@gmail.com>
-Date: Fri, 1 Feb 2019 16:30:01 -0800
-Subject: [PATCH] Fix collections.abc deprecation warning in downloadutils
-
-Warning appears as:
-
-tests/test_downloadutils.py::test_stream_response_to_specific_filename
-  requests_toolbelt/downloadutils/stream.py:161: DeprecationWarning: Using or importing the ABCs from 'collections' instead of from 'collections.abc' is deprecated, and in 3.8 it will stop working
-    if path and isinstance(getattr(path, 'write', None), collections.Callable):
----
- requests_toolbelt/downloadutils/stream.py | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/requests_toolbelt/downloadutils/stream.py b/requests_toolbelt/downloadutils/stream.py
-index eed60a7..1d1c31b 100644
---- a/requests_toolbelt/downloadutils/stream.py
-+++ b/requests_toolbelt/downloadutils/stream.py
-@@ -1,6 +1,5 @@
- # -*- coding: utf-8 -*-
- """Utilities for dealing with streamed requests."""
--import collections
- import os.path
- import re
- 
-@@ -158,7 +157,7 @@ def stream_response_to_file(response, path=None, chunksize=_DEFAULT_CHUNKSIZE):
-     pre_opened = False
-     fd = None
-     filename = None
--    if path and isinstance(getattr(path, 'write', None), collections.Callable):
-+    if path and callable(getattr(path, 'write', None)):
-         pre_opened = True
-         fd = path
-         filename = getattr(fd, 'name', None)
--- 
-2.31.1
-
diff --git a/dev-python/requests-toolbelt/files/requests-toolbelt-0.9.1-tests.patch b/dev-python/requests-toolbelt/files/requests-toolbelt-0.9.1-tests.patch
deleted file mode 100644
index a2a8929b08d4..000000000000
--- a/dev-python/requests-toolbelt/files/requests-toolbelt-0.9.1-tests.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-From c4f918572751151eb3bfc7dfa94580b3e2867a9e Mon Sep 17 00:00:00 2001
-From: Jon Dufresne <jon.dufresne@gmail.com>
-Date: Sun, 3 Feb 2019 09:02:24 -0800
-Subject: [PATCH] Fix unhandled exceptions from threads during tests
-
-A queue.Queue() object was not always passed to SessionThread. In this
-case, SessionThread._make_request() would raise an exception trying to
-call methods on the expected object. Now, always pass a usable object to
-SessionThread.
-
-Previously appeared as:
-
-    Traceback (most recent call last):
-      File "/usr/lib64/python3.7/threading.py", line 917, in _bootstrap_inner
-        self.run()
-      File "/usr/lib64/python3.7/threading.py", line 865, in run
-        self._target(*self._args, **self._kwargs)
-      File "toolbelt/requests_toolbelt/threaded/thread.py", line 41, in _make_request
-        kwargs = self._jobs.get_nowait()
-    AttributeError: 'NoneType' object has no attribute 'get_nowait'
-
-    Exception in thread cd08fad6-d21d-41b0-921e-737a149b12be:
-    Traceback (most recent call last):
-      File "/usr/lib64/python3.7/threading.py", line 917, in _bootstrap_inner
-        self.run()
-      File "/usr/lib64/python3.7/threading.py", line 865, in run
-        self._target(*self._args, **self._kwargs)
-      File "toolbelt/requests_toolbelt/threaded/thread.py", line 41, in _make_request
-        kwargs = self._jobs.get_nowait()
-    AttributeError: 'NoneType' object has no attribute 'get_nowait'
-
-    Exception in thread 4fb72f0d-ba1c-4a78-97a2-4a7283ea01fe:
-    Traceback (most recent call last):
-      File "/usr/lib64/python3.7/threading.py", line 917, in _bootstrap_inner
-        self.run()
-      File "/usr/lib64/python3.7/threading.py", line 865, in run
-        self._target(*self._args, **self._kwargs)
-      File "toolbelt/requests_toolbelt/threaded/thread.py", line 41, in _make_request
-        kwargs = self._jobs.get_nowait()
-    AttributeError: 'NoneType' object has no attribute 'get_nowait'
-
-    Exception in thread 5f3711af-0c01-4821-9e25-8074bbbf769b:
-    Traceback (most recent call last):
-      File "/usr/lib64/python3.7/threading.py", line 917, in _bootstrap_inner
-        self.run()
-      File "/usr/lib64/python3.7/threading.py", line 865, in run
-        self._target(*self._args, **self._kwargs)
-      File "toolbelt/requests_toolbelt/threaded/thread.py", line 41, in _make_request
-        kwargs = self._jobs.get_nowait()
-    AttributeError: 'NoneType' object has no attribute 'get_nowait'
----
- tests/threaded/test_pool.py   | 15 ++++++++++-----
- tests/threaded/test_thread.py |  5 ++++-
- 2 files changed, 14 insertions(+), 6 deletions(-)
-
-diff --git a/tests/threaded/test_pool.py b/tests/threaded/test_pool.py
-index b0653bb..b949dd8 100644
---- a/tests/threaded/test_pool.py
-+++ b/tests/threaded/test_pool.py
-@@ -26,32 +26,37 @@ def test_requires_positive_number_of_processes(self):
- 
-     def test_number_of_processes_can_be_arbitrary(self):
-         """Show that the number of processes can be set."""
--        p = pool.Pool(None, num_processes=100)
-+        job_queue = queue.Queue()
-+        p = pool.Pool(job_queue, num_processes=100)
-         assert p._processes == 100
-         assert len(p._pool) == 100
- 
--        p = pool.Pool(None, num_processes=1)
-+        job_queue = queue.Queue()
-+        p = pool.Pool(job_queue, num_processes=1)
-         assert p._processes == 1
-         assert len(p._pool) == 1
- 
-     def test_initializer_is_called(self):
-         """Ensure that the initializer function is called."""
-+        job_queue = queue.Queue()
-         initializer = mock.MagicMock()
--        pool.Pool(None, num_processes=1, initializer=initializer)
-+        pool.Pool(job_queue, num_processes=1, initializer=initializer)
-         assert initializer.called is True
-         initializer.assert_called_once_with(mock.ANY)
- 
-     def test_auth_generator_is_called(self):
-         """Ensure that the auth_generator function is called."""
-+        job_queue = queue.Queue()
-         auth_generator = mock.MagicMock()
--        pool.Pool(None, num_processes=1, auth_generator=auth_generator)
-+        pool.Pool(job_queue, num_processes=1, auth_generator=auth_generator)
-         assert auth_generator.called is True
-         auth_generator.assert_called_once_with(mock.ANY)
- 
-     def test_session_is_called(self):
-         """Ensure that the session function is called."""
-+        job_queue = queue.Queue()
-         session = mock.MagicMock()
--        pool.Pool(None, num_processes=1, session=session)
-+        pool.Pool(job_queue, num_processes=1, session=session)
-         assert session.called is True
-         session.assert_called_once_with()
- 
-diff --git a/tests/threaded/test_thread.py b/tests/threaded/test_thread.py
-index bb92f7f..fd7e96b 100644
---- a/tests/threaded/test_thread.py
-+++ b/tests/threaded/test_thread.py
-@@ -19,6 +19,8 @@ def _make_mocks():
- 
- def _initialize_a_session_thread(session=None, job_queue=None,
-                                  response_queue=None, exception_queue=None):
-+    if job_queue is None:
-+        job_queue = queue.Queue()
-     with mock.patch.object(threading, 'Thread') as Thread:
-         thread_instance = mock.MagicMock()
-         Thread.return_value = thread_instance
-@@ -52,10 +54,11 @@ def test_thread_initialization(self):
- 
-     def test_is_alive_proxies_to_worker(self):
-         """Test that we proxy the is_alive method to the Thread."""
-+        job_queue = queue.Queue()
-         with mock.patch.object(threading, 'Thread') as Thread:
-             thread_instance = mock.MagicMock()
-             Thread.return_value = thread_instance
--            st = thread.SessionThread(None, None, None, None)
-+            st = thread.SessionThread(None, job_queue, None, None)
- 
-         st.is_alive()
-         thread_instance.is_alive.assert_called_once_with()
diff --git a/dev-python/requests-toolbelt/requests-toolbelt-0.10.0.ebuild b/dev-python/requests-toolbelt/requests-toolbelt-0.10.0.ebuild
deleted file mode 100644
index cffab8d53c1e..000000000000
--- a/dev-python/requests-toolbelt/requests-toolbelt-0.10.0.ebuild
+++ /dev/null
@@ -1,48 +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 )
-
-inherit distutils-r1
-
-DESCRIPTION="A utility belt for advanced users of python-requests"
-HOMEPAGE="
-	https://toolbelt.readthedocs.io/
-	https://github.com/requests/toolbelt/
-	https://pypi.org/project/requests-toolbelt/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-
-RDEPEND="
-	<dev-python/requests-3.0.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/betamax[${PYTHON_USEDEP}]
-	)
-"
-
-DOCS=( AUTHORS.rst HISTORY.rst README.rst )
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# Internet
-	tests/test_multipart_encoder.py::TestFileFromURLWrapper::test_no_content_length_header
-	tests/test_multipart_encoder.py::TestFileFromURLWrapper::test_read_file
-	tests/test_multipart_encoder.py::TestMultipartEncoder::test_reads_file_from_url_wrapper
-)
-
-EPYTEST_IGNORE=(
-	# certs have expired
-	# (if you ever fix this, look into git history for proper
-	# cryptography/pyopenssl logic)
-	tests/test_x509_adapter.py
-)
diff --git a/dev-python/requests-toolbelt/requests-toolbelt-0.9.1-r1.ebuild b/dev-python/requests-toolbelt/requests-toolbelt-0.9.1-r1.ebuild
deleted file mode 100644
index a5fc91d08018..000000000000
--- a/dev-python/requests-toolbelt/requests-toolbelt-0.9.1-r1.ebuild
+++ /dev/null
@@ -1,55 +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 )
-
-inherit distutils-r1
-
-DESCRIPTION="A utility belt for advanced users of python-requests"
-HOMEPAGE="
-	https://toolbelt.readthedocs.io/
-	https://github.com/requests/toolbelt/
-	https://pypi.org/project/requests-toolbelt/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-RDEPEND="
-	<dev-python/requests-3.0.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/betamax[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-DOCS=( AUTHORS.rst HISTORY.rst README.rst )
-
-PATCHES=(
-	"${FILESDIR}/requests-toolbelt-0.8.0-test-tracebacks.patch"
-	"${FILESDIR}/requests-toolbelt-0.9.1-tests.patch"
-	"${FILESDIR}/requests-toolbelt-0.9.1-py310.patch"
-)
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# Internet
-	tests/test_multipart_encoder.py::TestFileFromURLWrapper::test_no_content_length_header
-	tests/test_multipart_encoder.py::TestFileFromURLWrapper::test_read_file
-	tests/test_multipart_encoder.py::TestMultipartEncoder::test_reads_file_from_url_wrapper
-)
-
-EPYTEST_IGNORE=(
-	# certs have expired
-	# (if you ever fix this, look into git history for proper
-	# cryptography/pyopenssl logic)
-	tests/test_x509_adapter.py
-)
diff --git a/dev-python/sybil/Manifest b/dev-python/sybil/Manifest
index 609c645e7eaa..89dc06d766f9 100644
--- a/dev-python/sybil/Manifest
+++ b/dev-python/sybil/Manifest
@@ -1,3 +1,3 @@
 DIST sybil-3.0.1.tar.gz 38265 BLAKE2B 3a9dd8d85a5a6228944f104d255826b4dfee80f5a349da3a0fa69edcfa0953145378f002c1bf834e21c0d382fc96a993b927bdc92bb3e9a84d34998ad6ade62f SHA512 312c57f0de646b1e7a3b992806362c1020b2d567c805d248e94ab22a336a8fc77704234e123e1ec74987bfea620b2f8c4d3714d32aee03587c615d3d90fe5558
-EBUILD sybil-3.0.1.ebuild 466 BLAKE2B df5ab70c7279e7661e351c045c7210f81a9db8f2acdd5f29906503ae30af5e6e2f0165c5e7baf90b984cd047861c099f97f006e16cc9beca9987f8bcd0111e24 SHA512 09d5cbc6dd13b18e35bdfe5fd611e72627d1126061f12560ca7991a952da7ec8c2e9aed30787274b25ad119723299e7f840a08843f95f2733e095100be37bf8e
+EBUILD sybil-3.0.1.ebuild 466 BLAKE2B e7f8d067705ef95e0c0de18dd57bdfe732db6641fdd598f75c94bbfd1db07b4a3f1a6f48dceca424605f00b4191097a6195fe72d98176639a738536fa9fea31e SHA512 eb28765e157618a19e335787ec52116da493bc0a5e64328f49dfa28dabd525f508e430eba7ea1dc798a9269249cfad16611b9a05a3d55f2ffc1745a90e8f4a23
 MISC metadata.xml 402 BLAKE2B 3fcce3ac9ff731e24a3f6e761da2d840b3a7c9107b3d9a46afe00fed61b475d1400580b4ccf49dd71f6a1ab8098dc2aaf895e529a723cd96301d1400ee211edf SHA512 138106c714dc33871ccf535cc47d669580b665c842adfea5442a03067fe507236d8fde4158f006e1188003abe53c9c25db98632dadd1cfa0e41efd1755c2c75c
diff --git a/dev-python/sybil/sybil-3.0.1.ebuild b/dev-python/sybil/sybil-3.0.1.ebuild
index 1254f47d97fb..81b6917eab4f 100644
--- a/dev-python/sybil/sybil-3.0.1.ebuild
+++ b/dev-python/sybil/sybil-3.0.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
diff --git a/dev-python/tabulate/Manifest b/dev-python/tabulate/Manifest
index 28d5c13b4c79..3d0072d17a8a 100644
--- a/dev-python/tabulate/Manifest
+++ b/dev-python/tabulate/Manifest
@@ -1,5 +1,3 @@
-DIST python-tabulate-0.8.10.gh.tar.gz 49453 BLAKE2B 9bf5c9e937f8ef051792fc57dcd56f1150636bf29493fabe56d4b706df04add41fdffbe1108cb93aa561edc96245ba85e621d4a8b402ace513b55710e6e5498c SHA512 d216076112c0d0f0879c1eeecf2d2c0c30edc84d7289396f1a8d24bca862ef90fcf221a09812b409547696c3b7d4472d431043e359c3a7f67bb8392ce1e95ddc
 DIST python-tabulate-0.9.0.gh.tar.gz 59342 BLAKE2B dc101ab8d1411196619c3d77dd83c84e48f31e148ec3878c2b844a1e26ea1187cc948cfb1eb740d61a667d6b669806a5288c397ea7fcbd59685fedaa9bd0bd2e SHA512 26b0f079f1aca48578883147cb1a2e30e96e0bb85d5af3b72b26eba5f73cea41cf1a0686f666487c8374f95ca0412703168e480c947f1567e6408f941756498b
-EBUILD tabulate-0.8.10.ebuild 1287 BLAKE2B f05fe2089ed8092f04ca65d90e1e1fdbbb0870bed8cc56948f16e30a5200ccec8a6379734c68c07b9989a55185d1fad682cb7f17096948ad39abdc613697cc72 SHA512 00b891e8cb2a64e594555a94dfdddc604ba18c587f680664762d9279004d1f38d75525421e080d27e32de702b11265d7fea374c34ac15a1d6cac38a3c930b220
 EBUILD tabulate-0.9.0.ebuild 1332 BLAKE2B 2d83659a91876ffecd8f8aed4bfd6ccac5e1eea61bf97c8f0372faeb8e2eb2819020112576a1cfb6b294457338efe4a74edc947d92e3f225876e42b5339e5a32 SHA512 f822cc919e9ad3c43e04122f1a7895d83f848f4f1ecfb28feb1af4ee31da0c4e060788b77620d8bc7be6357dc702a39f7e9593b8f6046adb41ec5370825ac9e7
 MISC metadata.xml 399 BLAKE2B b92bc308afead78cb604ddc6bc288fb28ed5a2a523c890270ee87eb5bfee21133748c5861829bafcc8a7b3401b430dff84dd99264ebf3e7ea74342f99ee8cfc5 SHA512 2d8c4dca9558e5a5d6413a6bd5e2cd6e15d1d0d447e6c692af84c8575be899f3d78246782e6c908a626326662aaffde56b2c3f96f4e9cfa0473c976109e3dcac
diff --git a/dev-python/tabulate/tabulate-0.8.10.ebuild b/dev-python/tabulate/tabulate-0.8.10.ebuild
deleted file mode 100644
index 8c3e9b4a5657..000000000000
--- a/dev-python/tabulate/tabulate-0.8.10.ebuild
+++ /dev/null
@@ -1,56 +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 )
-
-inherit distutils-r1
-
-MY_P=python-${P}
-DESCRIPTION="Pretty-print tabular data"
-HOMEPAGE="
-	https://github.com/astanin/python-tabulate/
-	https://pypi.org/project/tabulate/
-"
-SRC_URI="
-	https://github.com/astanin/python-${PN}/archive/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	dev-python/wcwidth[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		$(python_gen_impl_dep 'sqlite')
-		dev-python/colorclass[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/numpy[${PYTHON_USEDEP}]
-		' 'python3*')
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=()
-	if ! has_version "dev-python/pandas[${PYTHON_USEDEP}]"; then
-		EPYTEST_DESELECT+=(
-			test/test_input.py::test_pandas
-			test/test_input.py::test_pandas_firstrow
-			test/test_input.py::test_pandas_keys
-			test/test_output.py::test_pandas_with_index
-			test/test_output.py::test_pandas_without_index
-			test/test_output.py::test_pandas_rst_with_index
-			test/test_output.py::test_pandas_rst_with_named_index
-		)
-	fi
-	epytest
-}
diff --git a/dev-python/testfixtures/Manifest b/dev-python/testfixtures/Manifest
index 25e651dfbc96..a6be00512c03 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 1331 BLAKE2B 763aae90d64ea8985eedb49b24a23e647f3c126808503d1f0781375324360e2fdb5419e91c09eaa2178503e3cc5fa987da0c11a35f62af45213599280b4d5296 SHA512 1e39b6481c9d1e773c8dc911bdef0c67cb6b32f9b5d9a993ecd87fbb2a442594fdeb4a0a1d0ede8c0b3d37717f7219775d715d211b3d7905e70ccaefd74b9396
+EBUILD testfixtures-7.0.3.ebuild 1331 BLAKE2B 2b0d2fe30048503f0d4638a951dfa0b11c234e92b898bee5497289410dbd4e628ce77d1c83bccddcb8d72e49fe614d48ef6bed887e6d2b460fea7e5b1db630af SHA512 2c94440eb400cf6e954ba76c879d40d28952b85969245b55ab37285bbc12cc6cf24044f51fa19b6a3e9a09b4b050942fed163fd81fa90fd2a6ced1321ce7aabf
 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 4bd8f44cf8f7..2cfe8b90ee71 100644
--- a/dev-python/testfixtures/testfixtures-7.0.3.ebuild
+++ b/dev-python/testfixtures/testfixtures-7.0.3.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
diff --git a/dev-python/thriftpy2/Manifest b/dev-python/thriftpy2/Manifest
index 0968c25de5bf..b999e8d4c565 100644
--- a/dev-python/thriftpy2/Manifest
+++ b/dev-python/thriftpy2/Manifest
@@ -1,3 +1,5 @@
 DIST thriftpy2-0.4.14.gh.tar.gz 127552 BLAKE2B 4061642fb14b60ba53e0c4e6342ead25f781ee923b718a6c557235fcbfe4219b4d8944894afe9783062e7950b689b909af6be5cefe3b634a476ec582adfefbed SHA512 0b248c4999b0a97287d8db3e5b79ac687bc7e25a5478ef125b479e0baf9be9d0aa5f9eaadf0612c228133295743ba913bfe69e7fe59a8d5f854a682da9d31c50
+DIST thriftpy2-0.4.15.gh.tar.gz 136581 BLAKE2B 68287057e76ec6f2b91d9fca9a63e1814e2e17f4fb074b5f227b177137452f88921adf4912c66fee206b29d9f32cd0eb43cbbbe275574c21babc12b1f949672e SHA512 c5a17e42ac8a4051714938a4db926a25f41c84e4935fcf18c62ef8b115d9a1df3853800ca6c9fa01cafd6cbdfe31b6b4eabc7a81169a4773e0bda2241c4a26fb
 EBUILD thriftpy2-0.4.14-r1.ebuild 938 BLAKE2B e227e4c8c80ecb497fc990788a394a916ae88526f14ce1201408cbc796f77fa7551575bc0b4ef627f0a5884b8f3b9243e601f406d5427946c519155f7bc4e359 SHA512 b254759b808ef1600035829d4e6c10bc5328fd482c363716b0718781c92e1769b5080c6d957d1827c1e2e078a327a3ce19610adcfe4ef9a395653f2d5dafc0c7
+EBUILD thriftpy2-0.4.15.ebuild 1392 BLAKE2B 4ecc4bc5f8ca79ed9d08a93c7dc47a4c951d88d6292ca74c5ad2d2cae3186407f83fcee562fbbe022900675f19bd1e60277b9d264a88decb4de4b4b956f47183 SHA512 681682afa1a3d8bc73f98e3caee2f4cd121adf0d776d33e964a74649bb46dbdc304e2dc619339db4c27626b84b43f88e4e919d05557f989e198568cdbe067e6e
 MISC metadata.xml 380 BLAKE2B 570746c7985eab098e590e49d267c406ce02cbf612dda6bf2a60439aee62cbf6eefebac14af29bf5fa52c8b5fd4846b2872beb7034364abb722f706978b55987 SHA512 d20d8641eea699cfa6d1930b8c5a9a8edfe76b5ef837551c52105d2fe8d70d481862c5d5cdbe389971588b3bdf62e9fb7e1cec2e89d635650cbabed7f7f53070
diff --git a/dev-python/thriftpy2/thriftpy2-0.4.15.ebuild b/dev-python/thriftpy2/thriftpy2-0.4.15.ebuild
new file mode 100644
index 000000000000..f9d60e1c27f2
--- /dev/null
+++ b/dev-python/thriftpy2/thriftpy2-0.4.15.ebuild
@@ -0,0 +1,59 @@
+# 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="Pure python approach of Apache Thrift"
+HOMEPAGE="
+	https://github.com/Thriftpy/thriftpy2/
+	https://pypi.org/project/thriftpy2/
+"
+SRC_URI="
+	https://github.com/Thriftpy/thriftpy2/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/ply[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/tornado[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# broken by modern OpenSSL defaults
+		tests/test_rpc.py::test_clients
+		tests/test_rpc.py::test_void_api_with_ssl
+		tests/test_rpc.py::test_string_api_with_ssl
+		tests/test_rpc.py::test_huge_res_with_ssl
+		tests/test_rpc.py::test_tstruct_req_with_ssl
+		tests/test_rpc.py::test_tstruct_res_with_ssl
+		tests/test_rpc.py::test_complex_tstruct_with_ssl
+		tests/test_rpc.py::test_exception_iwth_ssl
+		tests/test_sslsocket.py
+
+		# TODO
+		tests/test_tornado.py::TornadoRPCTestCase::test_asynchronous_exception
+		tests/test_tornado.py::TornadoRPCTestCase::test_asynchronous_result
+	)
+
+	cd tests || die
+	epytest
+}
diff --git a/dev-python/zope-component/Manifest b/dev-python/zope-component/Manifest
index 996e0a6125ec..9df275b07c21 100644
--- a/dev-python/zope-component/Manifest
+++ b/dev-python/zope-component/Manifest
@@ -1,5 +1,5 @@
 DIST zope.component-4.4.1.tar.gz 84745 BLAKE2B 3b8a58bdaf1de1bc57e9642bf76100bd8aa0bbccfc8d6682e7f78363f08f13ac98c7ff37d4892c3558e26537294dd184b75810afaf95c6f8d6a529c9938ea8dc SHA512 dc9f6a725cc49ac94a164d11786ef977e94e1c9a7c88de4aaeb0f62621cfe00284007ae44937ec92ae6cffc5b16ab4af1548db2237b0ba4b818e2c8f6355ecbd
 DIST zope.component-5.0.1.tar.gz 91130 BLAKE2B 4dbd78b003ba3688c0468573f4552c87333fd5fb7e0cd89d4844633f28c19443b3ea884438ff7f7ba8b056790f008c246c1e7ad52403d7b72b146d0d53edd8ad SHA512 fad011816fe5bb869bb2e43e11a66841a6be2abf9002e41207ef1dfe69b1afb5ca486d275daeddf71d2a0e79e1a9c839c4735190dddcd118b675a976bde07a64
 EBUILD zope-component-4.4.1-r2.ebuild 1224 BLAKE2B b9e1b8010bcdaf9c0ef54751c812439887fa86649af66065cb6f51f6710f1c9b8c100c55a72318e1a31a3a28621bbfad7454311caafae5a3e19f5a332f7b61b7 SHA512 73a3b1173a18d61ada6dc728ba4f8755c4b4fc0de97f6ad5b5047fcc834ba564041038127e6687a4ca1c437d2ae84d3a4229e81b4d2a9448a0a9beb3f1af415f
-EBUILD zope-component-5.0.1.ebuild 1277 BLAKE2B 256e34c44d0b53c8a4ff9c2df35ad090f6f33d34eb126260ee9c1be3e1a32db3443b7aea10a2ae18c49cdd3a2fb644eb9cf46e57ef09a5a91d971266549f8546 SHA512 0aa0222b285db04d71a98c1ca34e2d8d6b343278eecc32a65ab9dd62a16e4726481da8efccbe9ba6e817c64ad4ad88eeb7440c7278a911cb4c69880bf1ad6b44
+EBUILD zope-component-5.0.1.ebuild 1277 BLAKE2B 6f267b727e12e4dbc116a9a0aba765a3b0752adea667083784c8fd5a767e7677056dacf1ad568eeb958f51a01944895d301a021f6c800b74aaa3e037ee7b249c SHA512 21f0fd9caef8adf9a8ce4e022737d64c118cd206958c62af7aede34c4da1df07dbb18f83e0854c5a652c9e5ffcd1da25b5c43241b46a134d3f86257e18068942
 MISC metadata.xml 411 BLAKE2B a02a8232c9878cc8c569bf818b81e1b0c2d3cd5e18386f14d8fa228a12c9745a68644e362189ccca52673ca6071f196ebd4603d6f12d6de7839e732f63e4d2ef SHA512 ce4f88684c8c16affe79487c03e5ff4d06fa26c27dc6dc4ffebae514bf498b1f794fbe86f038ea342f08e6ec62eb3722ed118134bca27b0110ef43b155c4cadf
diff --git a/dev-python/zope-component/zope-component-5.0.1.ebuild b/dev-python/zope-component/zope-component-5.0.1.ebuild
index 345dcc41784e..5c72fb00cc0e 100644
--- a/dev-python/zope-component/zope-component-5.0.1.ebuild
+++ b/dev-python/zope-component/zope-component-5.0.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
diff --git a/dev-python/zope-configuration/Manifest b/dev-python/zope-configuration/Manifest
index 0524d774282e..e039e6ecb479 100644
--- a/dev-python/zope-configuration/Manifest
+++ b/dev-python/zope-configuration/Manifest
@@ -1,3 +1,3 @@
 DIST zope.configuration-4.4.1.tar.gz 83825 BLAKE2B 9cf55417710c364611f0548cd1249dfb61d16c4f1a5f8f3918b2f9f38ba9904698317b922dccf736ab83f2b9cdd2bb4f7ca7330cd311d00e8d48afbd29f9cd86 SHA512 61e3e5cc6220c3ef86881d49c09b208d12491a5d7f5d82810ff1713f68ff1657dfb505b511e78e86b39d204c4ff8bc687695ad8b2ed816b457b52f913c70669b
-EBUILD zope-configuration-4.4.1-r2.ebuild 1268 BLAKE2B e4b1b7cb8b273388a781955719376f6c59d3f6ae90003d7e10aff8b3649486f8b0d3e94cb6abc85bfc2eee65b9ed1bd6bf9ad0b399c73c3b8c3dd6b62e98c85c SHA512 ff6a46846a1f00dee770d106fd0483cec512e02391cef66eabaf77d1fdf8c0cf824d662417cffa5f8f9b2ba90a4ed2284a87b7df37bdcea44d7d2f7bda27fa85
+EBUILD zope-configuration-4.4.1-r2.ebuild 1268 BLAKE2B 821c36e78eac282ad7f284821e0fbcb362bdb868962382bb44494ea12e013ab6c9a56c1b5f9450acfc051aece9573e30bcd87aacac80563203411e9d2b49bae8 SHA512 7c246958ebd5a779bef6fda9d02dc9312315cdd064f1d0caaf3ac5f84bb0690272c775f2d7a5b658e8dc58887a0b6df7c0007ad93c1c648b641139ffebeaf3b6
 MISC metadata.xml 671 BLAKE2B ebe65df9424a7f5e93a1095224dcbed784cdcef2f463dd9ee6e9580883ff93ea11e72463a897d5a1756c7f5c4f6c9fff562ba5d30dd8de8913aec58547ce3280 SHA512 e72a1d422e9c322fd92bd53f4bd8a5d9f0e5505fdb18dec30b9605d8ef5b943c1893f0fa78398fb8610fd7f3b9bcee5a602a3ce1cef8821239cd9681a340dbeb
diff --git a/dev-python/zope-configuration/zope-configuration-4.4.1-r2.ebuild b/dev-python/zope-configuration/zope-configuration-4.4.1-r2.ebuild
index 70766bc00aa2..ff8ef6e737e6 100644
--- a/dev-python/zope-configuration/zope-configuration-4.4.1-r2.ebuild
+++ b/dev-python/zope-configuration/zope-configuration-4.4.1-r2.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1