gentoo auto-resync : 04:11:2022 - 15:14:18

author: V3n3RiX <venerix@koprulu.sector> 2022-11-04 15:14:18 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2022-11-04 15:14:18 +0000
commit: f5f1e7d30401ef31b8776c96a80cf5caae0a4e81 (patch)
tree: cf79465586b83d032475fad7f33894f6cf4efd1f /dev-python
parent: 0bb8253b38dc8638a46b66ba909c1bfd1054e1ef (diff)
84 files changed, 838 insertions, 1252 deletions
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 64c72f6c403c..1641f56eb02a 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/PyPDF2/Manifest b/dev-python/PyPDF2/Manifest
index 3fd62a3f8ac1..62c761a1c414 100644
--- a/dev-python/PyPDF2/Manifest
+++ b/dev-python/PyPDF2/Manifest
@@ -1,8 +1,4 @@
-DIST PyPDF2-2.10.9.gh.tar.gz 6448504 BLAKE2B 5508ce0b2b0d3cb00f1057a4e52dafde3ff0dbf5eaa79be46e9d20a5041b76968fd46ba74b86f15e9fb2948f2c053fd1f722f11806cfbed552d241a768d01f00 SHA512 43aec1a381e97b26145b7c8e3414a4cab33d0d03520be73b3e5e4c9565db10e9bfd764280b56f328ec5931cc41d1a6f558b29d59d0930d92de8da00b52e2f7da
-DIST PyPDF2-2.11.0.gh.tar.gz 6452850 BLAKE2B 695e39336cb93f138b06182b221aa7ed1f90a582bbfff9111763b60b26b37fd13f70ed3ef67c2237d19dbb845c1703944190d04fbfe6694d0afe67671b188d73 SHA512 b0574d31d7487b3346d093229cb768baa2668619c1a3b8dde135c40f9b65cc6e291cd8e012c4fcae403f3163a3ded6445491e42efdf49c36653b3167544ce64b
 DIST PyPDF2-2.11.1.gh.tar.gz 6460157 BLAKE2B b9b6d1801b24c2d522200636700d26f651a5c877d31d3a72a8b9a8748a8063e163644d8ce115975a122cdfa4ad9f566f932ddd5b8f2f4545c57332f6c9f34154 SHA512 d1742a96db4b1385c0d670c682dd326d2a12e4ef36bff281bdf56b5df463c1a6ae023e40a4c591afc3c7176a73ceb610f23819cdcfebd2ecca7b327c1d21cec3
 DIST PyPDF2-sample-files-bedcbe077c4898e1b97c6c6f81d937f5048b4630.gh.tar.gz 7198720 BLAKE2B 91d177e7329fd137322972a3a38841cb0611de7f839071fe2fa5ecff0343cbffdf6976f42f4a779f520a8a2bac2d6573c5cd65bf2f1bc68395077e6e9c7322d9 SHA512 0cdaee85f1da12cf678165f06c8d351aa0808137d25f68c07f19f1bd3c929eeb52e604041dfaa0df94665379aeb7d19a43426d724a5e6602b7e4fbe7a62e753d
-EBUILD PyPDF2-2.10.9.ebuild 1258 BLAKE2B 6b3d8dab29c80f5a4bb715b5935ca5144b85efca71c1094a30a1e969a381380b89e05c3b4c1a94706f4f9353c129b07364cf27c100149a5c2b2d28ec46b4d7eb SHA512 db495ae72d58abda661e34fd6d0298abde29081fe9b7c2fdddf4643d0b918ad26f656845cd86f1b9ab0b4a3b8a22055da5412708a76bcff7e4f8ac29e39d2c0f
-EBUILD PyPDF2-2.11.0.ebuild 1260 BLAKE2B b26dabdaa3cd175093c5fdca86afeebab8502152c59b54b066787c1eadfb6633543492a25bdc160c1397895559f17267025caaac2b959f1e3efa8528b8712f66 SHA512 f015b0bfaf7b51eb2463ac2e57f331519c9d43447449a7623ffbfa274acc935ebdaf04e7b9d02d85b312ee1451f67db692f6067f9141072b216fb31a5c279f67
-EBUILD PyPDF2-2.11.1.ebuild 1259 BLAKE2B 1f4b49e168cd2cdf873306fbec2cd1f714ce7f1b6c3c21b7259e47bfaf66ad0e27b245eb0c402d9867b095e75ad98ef2543564d0d05a9460c5975b414d0152c3 SHA512 a6586eea026dafc3cc15577c5efe0e41242975684e9db2cc98a6edcab40d5725cfc6c4a06081033be420b620415f0eadeda7fa84d1a308ac1227860f489a32bf
+EBUILD PyPDF2-2.11.1.ebuild 1258 BLAKE2B 6b3d8dab29c80f5a4bb715b5935ca5144b85efca71c1094a30a1e969a381380b89e05c3b4c1a94706f4f9353c129b07364cf27c100149a5c2b2d28ec46b4d7eb SHA512 db495ae72d58abda661e34fd6d0298abde29081fe9b7c2fdddf4643d0b918ad26f656845cd86f1b9ab0b4a3b8a22055da5412708a76bcff7e4f8ac29e39d2c0f
 MISC metadata.xml 375 BLAKE2B 2493f7d2ef79342af0ef890e3683fa55255d869c684bba7224ab3afab61e77a239e323c8e63138ce4fea23c32348458cd27a0c58a3b6640854ec27b26cdb40cb SHA512 5e0d6e18e0005e4f323468b8fbfa26dc7ba33d26a94d5fda11c40f62ece84578c1f08843c9f0cf96f0d918d22063f494d486a6d692cecb5b407efaaf92aa9b8b
diff --git a/dev-python/PyPDF2/PyPDF2-2.10.9.ebuild b/dev-python/PyPDF2/PyPDF2-2.10.9.ebuild
deleted file mode 100644
index 6604847c81bd..000000000000
--- a/dev-python/PyPDF2/PyPDF2-2.10.9.ebuild
+++ /dev/null
@@ -1,58 +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
-
-SAMPLE_COMMIT=bedcbe077c4898e1b97c6c6f81d937f5048b4630
-DESCRIPTION="Python library to work with PDF files"
-HOMEPAGE="
-	https://pypi.org/project/PyPDF2/
-	https://github.com/py-pdf/PyPDF2/
-"
-SRC_URI="
-	https://github.com/py-pdf/PyPDF2/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-	test? (
-		https://github.com/py-pdf/sample-files/archive/${SAMPLE_COMMIT}.tar.gz
-			-> ${PN}-sample-files-${SAMPLE_COMMIT}.gh.tar.gz
-	)
-"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
-RESTRICT="test"
-# 150+ tests require network, too many to deselect
-PROPERTIES="test_network"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	' 3.8 3.9)
-"
-BDEPEND="
-	dev-python/pillow[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pycryptodome[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# rely on -Werror
-	tests/test_utils.py::test_deprecate_no_replacement
-	tests/test_workflows.py::test_orientations
-)
-
-src_unpack() {
-	default
-	if use test; then
-		mv "sample-files-${SAMPLE_COMMIT}"/* "${P}"/sample-files/ || die
-	fi
-}
diff --git a/dev-python/PyPDF2/PyPDF2-2.11.0.ebuild b/dev-python/PyPDF2/PyPDF2-2.11.0.ebuild
deleted file mode 100644
index 66b49dd2cca4..000000000000
--- a/dev-python/PyPDF2/PyPDF2-2.11.0.ebuild
+++ /dev/null
@@ -1,58 +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
-
-SAMPLE_COMMIT=bedcbe077c4898e1b97c6c6f81d937f5048b4630
-DESCRIPTION="Python library to work with PDF files"
-HOMEPAGE="
-	https://pypi.org/project/PyPDF2/
-	https://github.com/py-pdf/PyPDF2/
-"
-SRC_URI="
-	https://github.com/py-pdf/PyPDF2/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-	test? (
-		https://github.com/py-pdf/sample-files/archive/${SAMPLE_COMMIT}.tar.gz
-			-> ${PN}-sample-files-${SAMPLE_COMMIT}.gh.tar.gz
-	)
-"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-RESTRICT="test"
-# 150+ tests require network, too many to deselect
-PROPERTIES="test_network"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	' 3.8 3.9)
-"
-BDEPEND="
-	dev-python/pillow[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pycryptodome[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# rely on -Werror
-	tests/test_utils.py::test_deprecate_no_replacement
-	tests/test_workflows.py::test_orientations
-)
-
-src_unpack() {
-	default
-	if use test; then
-		mv "sample-files-${SAMPLE_COMMIT}"/* "${P}"/sample-files/ || die
-	fi
-}
diff --git a/dev-python/PyPDF2/PyPDF2-2.11.1.ebuild b/dev-python/PyPDF2/PyPDF2-2.11.1.ebuild
index 623ecd7bb407..6604847c81bd 100644
--- a/dev-python/PyPDF2/PyPDF2-2.11.1.ebuild
+++ b/dev-python/PyPDF2/PyPDF2-2.11.1.ebuild
@@ -25,7 +25,7 @@ SRC_URI="
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 RESTRICT="test"
 # 150+ tests require network, too many to deselect
 PROPERTIES="test_network"
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index ac8aeb6ba1e5..7c8b6cafbc29 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -8,6 +8,7 @@ DIST boto3-1.25.4.gh.tar.gz 549950 BLAKE2B f9dfb94d2bfc3f11ac0e98b4ca1755157cf5d
 DIST boto3-1.25.5.gh.tar.gz 550814 BLAKE2B 85f345b635fe16a978853d21192f49804837b050539aba650195bf788c7912f8713aa3a826de6f5ae4c28c4c3795e7053a2105622757f3087579e827eda3487f SHA512 6f4cd909b7a6670f74df6c7cac4a140114a0e05f736ed23c5a53351c5c6505f02d40e81ad1314db86db67d16429b38f78708e9cc8ce2cb08f28742ec209c2755
 DIST boto3-1.26.0.gh.tar.gz 551306 BLAKE2B fb72315724321f1f41b7ff8f90eb5386b5361f049913ed87ac884140c405587ee0dc7acfc13300851566e96d12de16d3c6f1db52af44b27ea320c4e6deaaf2c9 SHA512 eafff7ba7792fb62d2ba93213588e1a034b6d51fcc7e8167dcf15e0276c3b499440d3ff340cb2145aedf2f432c0de563cbc69111543530c5b4a4705cd08871bf
 DIST boto3-1.26.1.gh.tar.gz 551830 BLAKE2B 85dff3350796fcb06ea927d469d5afdbe43c448cc5c267364edc2641d25aac8d33a76a3cae06cf414a52874bce626d88f15252f3273530c1a2a791791134fafa SHA512 d1ccea2a2155d22c765504597dfb185190c52f99e7b1c9210eedf9832d9a191d7bbb1205930682f906a7bf6316226836b61dbece5b54ca24dbc91073b0a41591
+DIST boto3-1.26.2.gh.tar.gz 552193 BLAKE2B 07b12ab669bc0eae08d4f74b8b8f0b979b90b75b24c87172bb2bda7d9a7051e41a6971d758c48b764da35b4e38ff02c0ba2a57971f70aed6e79517225e4f2461 SHA512 ce5362af3109d412de633f74ebb08d60c229ff7644c02c86e2692c2d85611269254be05041e0eedf88dda7e76e7f5d81a20abad6a3367c87585b7b52f7968a08
 EBUILD boto3-1.24.88.ebuild 1579 BLAKE2B 394d8a1bb7a1036ab4821bc789c9eea285f8a6a7c21e751d60c94a53d5fdd37119eab54bfd19bfe0856b7557df04340f50c7cebbe631234e8f582e7d62af13ec SHA512 beee3b634e3b1d66365beb2e97b9d09188fa795e00d9d05f2101de423128741ee1f8ad8ae4b0c35f1e6c6473ce73cc3acf47d9141029b4435d39a9803a5fe1b2
 EBUILD boto3-1.24.96.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
 EBUILD boto3-1.25.0.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
@@ -18,5 +19,6 @@ EBUILD boto3-1.25.4.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd5365
 EBUILD boto3-1.25.5.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
 EBUILD boto3-1.26.0.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
 EBUILD boto3-1.26.1.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
+EBUILD boto3-1.26.2.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
 EBUILD boto3-9999.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
 MISC metadata.xml 493 BLAKE2B 7d6324fc877ffe1d20c5369c2af0b09a7028f94d28f1841188913d0d8be7ea699c9d3f92c624992c4c96bd69615d3a1211a2483c76c56b7d3082492e43512523 SHA512 44420d8c03d5986f990b76369edfa8dfd7659b4952db3ad946fd05392ec594628a28745ad888d055d4f074d5214f61fcffafe6c04c4ab54109d45ac0371582bd
diff --git a/dev-python/boto3/boto3-1.26.2.ebuild b/dev-python/boto3/boto3-1.26.2.ebuild
new file mode 100644
index 000000000000..6edcc751d54b
--- /dev/null
+++ b/dev-python/boto3/boto3-1.26.2.ebuild
@@ -0,0 +1,68 @@
+# 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 multiprocessing
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="
+	https://github.com/boto/boto3/
+	https://pypi.org/project/boto3/
+"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/boto3"
+	inherit git-r3
+	BOTOCORE_PV=${PV}
+else
+	SRC_URI="
+		https://github.com/boto/boto3/archive/${PV}.tar.gz
+			-> ${P}.gh.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index a2f911cbf686..6541ec033f6b 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -8,6 +8,7 @@ DIST botocore-1.28.4.gh.tar.gz 9830940 BLAKE2B a4f7148ff4ef77dab59b088e241f19cf0
 DIST botocore-1.28.5.gh.tar.gz 9842427 BLAKE2B ed185346c21eeb0d05b39b55e99e065d9a5448fbe8206de49b3c128d12f4aabe1f6258153710350783846d10e5e10a22ccf77f6d27345297ec64e7ce74e51b87 SHA512 8b41b79826a71ed31c27534129e959e0896d9f4cb1769b4f14f1760d173500563a579aa0e00aaff5058275d5b5e8b921fed34b12825cf16ba4e216b174e4bba5
 DIST botocore-1.29.0.gh.tar.gz 10570614 BLAKE2B 08c48caba9516cb7345204d426942779dc8e2060cd3b95f634fe6293f6314c6a825c3c75371a446c22365f855f888c86ce303f50b53ecb6348f3453c5c9b9cab SHA512 b35322e8636fbf9d1743e234889dd370f8cc4853eb0318ad55e563de7a3f3be47fe0842be1ead8fa7c4eaf455264aa7bc15c0a8313fc2343f82d419b7cad781b
 DIST botocore-1.29.1.gh.tar.gz 10572059 BLAKE2B d0adb21a47ae4e4b092a7965630b599e8ad7322e11f808bc18632e7bc79afacf743e5149aecad788fe8d6479a68e99b125fd07bd48e3b3bc5901784b3ca12423 SHA512 ce9b7d2b8a2a590993a3fad259ec3a7b038cad8234cad3e8fdbb5523db278e682a391f40e59811dfda3f312f8e5a158246f8654b7e08bfafe817a7e62ee5ef04
+DIST botocore-1.29.2.gh.tar.gz 10572801 BLAKE2B 3a2512deabf0780fa8ca112753a161c066de19757999c3b948f2e25c4954600ef7477e645b92b706493c0b973478e6f246eb18bb83256946e538fd720c9f5c3b SHA512 efc6229adc9f48ce23432609832de0d20d385217087a23006ede4cc0e415c52a7c80774c57b7a86b804ecd3b1fecd437c7d15d05582c3f585afb670969dbca9d
 EBUILD botocore-1.27.88.ebuild 1801 BLAKE2B 224b9b1ebd6786f36115c25699b06ef4ace30f13c8c97fbac20f37ec3dec7219e89fae3fdc70ef2b808342e7dab564755b758952cd565f06ef68b1e387c1ee7e SHA512 f26fd77fbbc424dc20e7844807bb7650e73e989e15fa5c20c9733e3bc322f4a2fffda47fcd29f82490be7262648582b162f86b4951c8d338d9ebbb1312df8294
 EBUILD botocore-1.27.96.ebuild 1808 BLAKE2B 720965dfc40c51389a8ca4ac210039f79bbe3047f583cb1bd4d52bdb9720cb2283a13a9f4337a62aca6869cd75d78dac6cc07436524e9720386177c733d686f3 SHA512 d3a3fbc0f957b58e8161ae3fffedb44462000077aa368dd2fb183bf6a084771bff4db46344a4d0b451833ea05d326b452155af92d190c313e1d982da7d72fc10
 EBUILD botocore-1.28.0.ebuild 1808 BLAKE2B 720965dfc40c51389a8ca4ac210039f79bbe3047f583cb1bd4d52bdb9720cb2283a13a9f4337a62aca6869cd75d78dac6cc07436524e9720386177c733d686f3 SHA512 d3a3fbc0f957b58e8161ae3fffedb44462000077aa368dd2fb183bf6a084771bff4db46344a4d0b451833ea05d326b452155af92d190c313e1d982da7d72fc10
@@ -18,5 +19,6 @@ EBUILD botocore-1.28.4.ebuild 1808 BLAKE2B 720965dfc40c51389a8ca4ac210039f79bbe3
 EBUILD botocore-1.28.5.ebuild 1808 BLAKE2B 720965dfc40c51389a8ca4ac210039f79bbe3047f583cb1bd4d52bdb9720cb2283a13a9f4337a62aca6869cd75d78dac6cc07436524e9720386177c733d686f3 SHA512 d3a3fbc0f957b58e8161ae3fffedb44462000077aa368dd2fb183bf6a084771bff4db46344a4d0b451833ea05d326b452155af92d190c313e1d982da7d72fc10
 EBUILD botocore-1.29.0.ebuild 1808 BLAKE2B 720965dfc40c51389a8ca4ac210039f79bbe3047f583cb1bd4d52bdb9720cb2283a13a9f4337a62aca6869cd75d78dac6cc07436524e9720386177c733d686f3 SHA512 d3a3fbc0f957b58e8161ae3fffedb44462000077aa368dd2fb183bf6a084771bff4db46344a4d0b451833ea05d326b452155af92d190c313e1d982da7d72fc10
 EBUILD botocore-1.29.1.ebuild 1808 BLAKE2B 720965dfc40c51389a8ca4ac210039f79bbe3047f583cb1bd4d52bdb9720cb2283a13a9f4337a62aca6869cd75d78dac6cc07436524e9720386177c733d686f3 SHA512 d3a3fbc0f957b58e8161ae3fffedb44462000077aa368dd2fb183bf6a084771bff4db46344a4d0b451833ea05d326b452155af92d190c313e1d982da7d72fc10
+EBUILD botocore-1.29.2.ebuild 1808 BLAKE2B 720965dfc40c51389a8ca4ac210039f79bbe3047f583cb1bd4d52bdb9720cb2283a13a9f4337a62aca6869cd75d78dac6cc07436524e9720386177c733d686f3 SHA512 d3a3fbc0f957b58e8161ae3fffedb44462000077aa368dd2fb183bf6a084771bff4db46344a4d0b451833ea05d326b452155af92d190c313e1d982da7d72fc10
 EBUILD botocore-9999.ebuild 1808 BLAKE2B 720965dfc40c51389a8ca4ac210039f79bbe3047f583cb1bd4d52bdb9720cb2283a13a9f4337a62aca6869cd75d78dac6cc07436524e9720386177c733d686f3 SHA512 d3a3fbc0f957b58e8161ae3fffedb44462000077aa368dd2fb183bf6a084771bff4db46344a4d0b451833ea05d326b452155af92d190c313e1d982da7d72fc10
 MISC metadata.xml 499 BLAKE2B e5aaa7da26f200c09adfdf38b68f656bbccbec627cb5d966b280ac2165334e7eec659c89075bcace748f58e2ec3e7d2998e54a688d56ecea2d30653c67dfd35a SHA512 103c554d5dbd967bf9b6e418b3913d9235e7e910d012160909ce0715134ed2e37b06e6a345395f9d16ce08d1cf51f3ce458bce93c6a978fd3dca6610f2acdbd0
diff --git a/dev-python/botocore/botocore-1.29.2.ebuild b/dev-python/botocore/botocore-1.29.2.ebuild
new file mode 100644
index 000000000000..d1a6948e70e5
--- /dev/null
+++ b/dev-python/botocore/botocore-1.29.2.ebuild
@@ -0,0 +1,72 @@
+# 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 multiprocessing
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="
+	https://github.com/boto/botocore/
+	https://pypi.org/project/botocore/
+"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="
+		https://github.com/boto/botocore/archive/${PV}.tar.gz
+			-> ${P}.gh.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	<dev-python/jmespath-2[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests pytest
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+
+	# unbundle deps
+	rm -r botocore/vendored || die
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# rely on bundled six
+		tests/functional/test_six_imports.py::test_no_bare_six_imports
+		tests/functional/test_six_threading.py::test_six_thread_safety
+		# fails on unrelated warnings
+		tests/unit/test_client.py::TestAutoGeneratedClient::test_BOTO_DISABLE_COMMONNAME
+		tests/unit/test_client.py::TestClientErrors::test_BOTO_DISABLE_COMMONNAME
+	)
+
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/cattrs/Manifest b/dev-python/cattrs/Manifest
index 205a822e0758..11086f71c47b 100644
--- a/dev-python/cattrs/Manifest
+++ b/dev-python/cattrs/Manifest
@@ -1,5 +1,3 @@
-DIST cattrs-22.1.0.gh.tar.gz 108033 BLAKE2B 823e3ab466fd73385a4aaefb547b3457ee9cd100f38b6778c26bbe3d93e23ed9a00f071d6a5d7626da91e6660e2a8118e70cfa53a5960d550b9038fffec58eef SHA512 db1effb8d632dc3843d38b18bcd439c35d8bae0e4379b075417eaedbc130f6426186c0d299bc5b5d68a7354d7c5e53927ba5e0e989d498841a73237c588febb8
 DIST cattrs-22.2.0.gh.tar.gz 117001 BLAKE2B 34601cf48c582da2d9aa8d741a08919b5f06043bc6ba6b072d8b0934e90e781349b1325ced478ca0b42b50db1f7fe2a6d3cd16ac29609efd72c9aa894debfe9e SHA512 d198864402f56d4e9403c61ee3d9d109c5eac3350908afa1e244dbe31e4bc986271fcb4c72bde9cdaa9ee865c6a8b81de68ec0d51490ed658b410714e1fc550c
-EBUILD cattrs-22.1.0.ebuild 1244 BLAKE2B 71e0c191ad6230fc545c7f699c8c988e9ee8fd4b192b745da79622d279bfadc13eda8c92896644b2a1f5e9b1d1af2cca46f98aaf9668d4d069d0aa60ddb03d55 SHA512 b965e2cbbe64412017238da2341134448355cd1a9577a84e7d704b4b228093a9e5984e4a56c51494792b664a1ec5ad203a399df87fe4a3c285eab0bd505baa1f
-EBUILD cattrs-22.2.0.ebuild 1261 BLAKE2B 71149344936cc24f01870aae6daeef8ce510249464ab83d18bd1f6245ca6586aa66d45395860253f2a6a9308bfd56029467401f296a165f2689ba3d2053b7ad0 SHA512 3a4a289ef37e332fa6a4986f53d9a23065fad14dec788063be261ec1576c185f96335422a688dcec1274be1cded467a6425313c9c19cf7d2ec11061aacd16eaa
+EBUILD cattrs-22.2.0.ebuild 1260 BLAKE2B b74878089682377e6d30a6d1265ef1ce8a5400a7f47000eaf5c03ccb58b2f22a5e78d0526ae326e5e57eee2b49b1971b7d2d69c4584b30b6e5f3cbe6151e7b51 SHA512 143478d9315a283a5a0047372bd29efa50575089f63e9a81df04459105a19b3dbaa4c60b0bc45cda062bafddae8bc7c60acaebc092e85a1da31a449ed9a697c5
 MISC metadata.xml 347 BLAKE2B 94165f2a8e62f3dc7e195f872944300ffff5ba23b9a7e6c30c18d61bc469ea8ff9b70e516f854bfc52d55a0fd27daff0df58145e34bfe26dbcde8070b8a22630 SHA512 5bb37b39b9574256358a623cff942a95162f5f9dcb32ddf28bd167504c7619be54488fae10044a5c765291f8fa28a5aa346973365dcca867be0eef4e232a4999
diff --git a/dev-python/cattrs/cattrs-22.1.0.ebuild b/dev-python/cattrs/cattrs-22.1.0.ebuild
deleted file mode 100644
index b7aab0ff36c4..000000000000
--- a/dev-python/cattrs/cattrs-22.1.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Composable complex class support for attrs and dataclasses"
-HOMEPAGE="
-	https://pypi.org/project/cattrs/
-	https://github.com/python-attrs/cattrs/
-"
-SRC_URI="
-	https://github.com/python-attrs/cattrs/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	>=dev-python/attrs-20.1.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/exceptiongroup[${PYTHON_USEDEP}]
-	' 3.8 3.9 3.10)
-"
-BDEPEND="
-	test? (
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/immutables[${PYTHON_USEDEP}]
-	)
-"
-# test_preconf:
-#		dev-python/bson[${PYTHON_USEDEP}]
-#		dev-python/msgpack[${PYTHON_USEDEP}]
-#		dev-python/orjson[${PYTHON_USEDEP}]
-#		dev-python/pyyaml[${PYTHON_USEDEP}]
-#		dev-python/tomlkit[${PYTHON_USEDEP}]
-#		dev-python/ujson[${PYTHON_USEDEP}]
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -e 's:--benchmark.*::' \
-		-e '/addopts/d' \
-		-i pyproject.toml || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# unpackaged deps, see above
-	epytest tests --ignore tests/test_preconf.py
-}
diff --git a/dev-python/cattrs/cattrs-22.2.0.ebuild b/dev-python/cattrs/cattrs-22.2.0.ebuild
index 83ba8e4cb04e..8338eb2d5339 100644
--- a/dev-python/cattrs/cattrs-22.2.0.ebuild
+++ b/dev-python/cattrs/cattrs-22.2.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	>=dev-python/attrs-20.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/clang-python/Manifest b/dev-python/clang-python/Manifest
index 536925c4c94e..6972dd03727f 100644
--- a/dev-python/clang-python/Manifest
+++ b/dev-python/clang-python/Manifest
@@ -1,6 +1,5 @@
 DIST llvm-project-14.0.6.src.tar.xz 105618228 BLAKE2B ee67c5407df8cef493b9c0004f15e428f22a536a17e5f4e3eb29a003b8a8ec0abe0fa3e072591161d5f30ef7d8867c1ce34d1b341ad858e93c00263499941a99 SHA512 6fc6eeb60fac698702d1aac495fc0161eb7216a1f8db2020af8fccec5837831f7cc20dc2a169bf4f0b5f520748280b4a86621f3697d622aa58faaa45dbfaad13
 DIST llvm-project-14.0.6.src.tar.xz.sig 566 BLAKE2B cb658ad43d8ab6c43a5773aedadf0569c97b5ee4b1bd58eceb10e1879a30880c741c3d66bedd462c892309b688fb7b2673115a62d1f74d71ee375a578de9547f SHA512 b4a7b368532a7a4a24376cfa7db8f6d3478f6d4446474342fc00b474ecf466330cd0f16783209263c4c72d5fc7ddedfb11b95578842e700cfb7ee0bb34cc95d6
-DIST llvm-project-14f996dca8a2b5b17d6917528bfd9ee71ba6192a.tar.gz 169054148 BLAKE2B a23af6658a6ea8a7cb4272faef151937da229e39383ec068d7ef81e72a25d2a46dc2a86255a7f1148b7385b339d1c17e62f627df834d8eccc39be8921575f88d SHA512 e719d296016e7af718d022424c337a5df8d7124fdb49b9f219ab2a5dc592e6a59f6c09064775ea9349bcf4eed9d72214abb648de649ab872174c35635c945c04
 DIST llvm-project-15.0.3.src.tar.xz 112069972 BLAKE2B 3d29bab890467ba87fedcc4e76522f444e63e3dfbe546793f8e67821bcd403bad460ea176254c9e0b72d60ea56b8480e498a7f610477c1108732d178804c26cd SHA512 d378d417f01c56534f301cfe6cb4958d811c04ae22acaacc917e7e5f0380859d40ce19dffb265d046b70fff95dbc2e759f492e4d5af0ade52f21ebaa8da65856
 DIST llvm-project-15.0.3.src.tar.xz.sig 438 BLAKE2B e7e0614e144eb878f694c12e97cf42ff8476e47cb55e8f259eb2ec52e303463ad753771271512e89baf0137c1382b11cfa028c85324174ebcd054a124000f537 SHA512 41229bebdb0c2df9a5e3a4d6f02d39fac7dc91f21895a659523beab4fa3ef99ff06eff5e4386221369b6e2b6f8fe974d67b7d8496d5911ce484d09ae0db8b916
 DIST llvm-project-15.0.4.src.tar.xz 110936424 BLAKE2B a02b76ad161e352b4d3d84baffdada9c6a0e704de7a2c4017df4d4d05a9e9d02113791cd7d91c3edfa1f5bcb7ab95e1772d60f7061514928c6828600f41a8322 SHA512 9d5b664dd77c08130601636f9d6c006b257f369470ce823aa56d06698a9f0edfec42f2c90da934b9ad52c4d7960d9a024ea46dc9640275be6d191b1ba9869459
@@ -13,6 +12,5 @@ EBUILD clang-python-15.0.3.ebuild 1167 BLAKE2B 5a32b05a4e7c8b41511a2652be3d1a383
 EBUILD clang-python-15.0.4.9999.ebuild 1145 BLAKE2B 2c0006ee4c9c1d509374c1ec3673c162736786cf5d869ea7611fe5f34ac781a0e955b1da61576e40f945a1b8965142954ee2b30a30f496c94965af52c3202674 SHA512 9380040980974d397c5a38be33bbc932826b2adcbfd89abb95e67c26027459ee160b59a5b47466816fdda44cca3d89fa8177642a30404c6c4dcd695c20a81156
 EBUILD clang-python-15.0.4.ebuild 1168 BLAKE2B b393d5cbb5e01f46da90232e0dd5b265e01643a33085108fe6ada27b6407742814d6c61d37d23cbb93ed1cbe47bd2b4301d37d8e03ae5243e13fe0b92df4b492 SHA512 1337fb232189df580021eaa06c732bf5f2e5f59a506cc28e674913c048e81053d440eff05332510ecb4ab3596fb88ffae6d6eb9fecf9732424d83865b853c6c4
 EBUILD clang-python-16.0.0.9999.ebuild 1145 BLAKE2B 2c0006ee4c9c1d509374c1ec3673c162736786cf5d869ea7611fe5f34ac781a0e955b1da61576e40f945a1b8965142954ee2b30a30f496c94965af52c3202674 SHA512 9380040980974d397c5a38be33bbc932826b2adcbfd89abb95e67c26027459ee160b59a5b47466816fdda44cca3d89fa8177642a30404c6c4dcd695c20a81156
-EBUILD clang-python-16.0.0_pre20221016.ebuild 1145 BLAKE2B 2c0006ee4c9c1d509374c1ec3673c162736786cf5d869ea7611fe5f34ac781a0e955b1da61576e40f945a1b8965142954ee2b30a30f496c94965af52c3202674 SHA512 9380040980974d397c5a38be33bbc932826b2adcbfd89abb95e67c26027459ee160b59a5b47466816fdda44cca3d89fa8177642a30404c6c4dcd695c20a81156
 EBUILD clang-python-16.0.0_pre20221023.ebuild 1145 BLAKE2B 2c0006ee4c9c1d509374c1ec3673c162736786cf5d869ea7611fe5f34ac781a0e955b1da61576e40f945a1b8965142954ee2b30a30f496c94965af52c3202674 SHA512 9380040980974d397c5a38be33bbc932826b2adcbfd89abb95e67c26027459ee160b59a5b47466816fdda44cca3d89fa8177642a30404c6c4dcd695c20a81156
 MISC metadata.xml 299 BLAKE2B 2feead2cd1b35b3a43335ddd7711f8181b52bc63ee7166608914260c67528add5251349063afbef4f8cf0ec09b2cd4c3ffdd90f2c14ed60bb69ebc03888f6333 SHA512 cd745c54ab18d25bdaff18582105072574103a36cfe7c175ef740f266d00e9fc6f44c332904d23b911c939cf5bdf52973b388923099d8dd5dfef3c283b5cb685
diff --git a/dev-python/clang-python/clang-python-16.0.0_pre20221016.ebuild b/dev-python/clang-python/clang-python-16.0.0_pre20221016.ebuild
deleted file mode 100644
index 9b34adc8ac6f..000000000000
--- a/dev-python/clang-python/clang-python-16.0.0_pre20221016.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
-
-PYTHON_COMPAT=( python3_{8..11} )
-inherit llvm.org python-r1
-
-DESCRIPTION="Python bindings for sys-devel/clang"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-KEYWORDS=""
-IUSE="test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# The module is opening libclang.so directly, and doing some blasphemy
-# on top of it.
-DEPEND="
-	>=sys-devel/clang-${PV}:*
-	!sys-devel/llvm:0[clang(-),python(-)]
-	!sys-devel/clang:0[python(-)]
-"
-RDEPEND="
-	${DEPEND}
-	${PYTHON_DEPS}
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	test? (
-		sys-devel/clang:${LLVM_MAJOR}
-	)
-"
-
-LLVM_COMPONENTS=( clang/bindings/python )
-llvm.org_set_globals
-
-python_test() {
-	# tests rely on results from a specific clang version, so override
-	# the search path
-	local -x CLANG_LIBRARY_PATH=${BROOT}/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)
-	"${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
-}
-
-src_test() {
-	python_foreach_impl python_test
-}
-
-src_install() {
-	python_foreach_impl python_domodule clang
-}
diff --git a/dev-python/funcparserlib/Manifest b/dev-python/funcparserlib/Manifest
index f117d0da671c..6ef2a838a8c0 100644
--- a/dev-python/funcparserlib/Manifest
+++ b/dev-python/funcparserlib/Manifest
@@ -1,3 +1,5 @@
 DIST funcparserlib-1.0.0.gh.tar.gz 66709 BLAKE2B 76229795e88b5b880667e41b2cd3d534649893019824e7206f41d188f44e7a67bc1cdb97b0cbcf731eb840ed128f29434d0748d0923a16ea0a3130b3ee10d206 SHA512 431d6b639c46dc84a0a12c8de976cb2c1369f0172a18d1eadbffba31aff12e9cfeded5ebec3ec63065384547000144d65d60003c55e2b23a1a40818d910aaef3
+DIST funcparserlib-1.0.1.gh.tar.gz 66860 BLAKE2B eb6d70ff37f75bb1452be7b2103a1e756d79231b2d862964e383e4d4317e1ba7de6b744ee8d29f08d81b176d267bf93ceba21e6d47c04bc7f467866d0cd6c8c9 SHA512 d64fe07337822077a0aab6d5049cd81f2ac56ccd9d1db2522c245cadf8cc8421ff1c7931f6a075d821a8634ac8aea51c7ae30fe763e679b70b35955a3f6aa8c7
 EBUILD funcparserlib-1.0.0.ebuild 669 BLAKE2B aff216da08adbb2c1445ced33a3479a90c40d2274828576da8228839a361f7389674232a3e7ff3736e91acc8bbc3a75c2d7fb12e74e1a00efb21fb88a30688d3 SHA512 b07dd9975a716fafe570899f2f6e158c8f532776f87ae479ecabea16e5fc6df4ce2b113a08b0e21e809d89923c5006dd4cab80ae1b3527f6cd4fb0a81a316595
+EBUILD funcparserlib-1.0.1.ebuild 676 BLAKE2B c625b09da5282bee65646e8ef9f1bbdc12e917c439c3b254759967a76da45df254a4d2922ac9b23cc82938c5b6997487e7494417561b6de71b8943ae84fa4354 SHA512 b6d04efdcf2aa1ed205e7249b28f3a6c6c717fd03f9486ddaefafcee7b8be5fd2d0a95637afff5cc521c32a39c0aca17fd4bb2f339fdd2704bc4fccd856ad9f7
 MISC metadata.xml 406 BLAKE2B 0d7fe946eef963283c35b6cf68e714b4c0e09e0c6c132d568b71ed8f646357dc22af1de032258fef3a013f988a2876a392fbd080b271925de52aa7de0736ec40 SHA512 372cfba71b6342d5eab47086dead58bbe506a8da0d3f32b4538d7e5ad03a6c1916410c5f2f3296a9a07d1b5a7a87a1c93fc109a657a1e94b4a5dc2924fb744d3
diff --git a/dev-python/funcparserlib/funcparserlib-1.0.1.ebuild b/dev-python/funcparserlib/funcparserlib-1.0.1.ebuild
new file mode 100644
index 000000000000..332f7b6a5ad9
--- /dev/null
+++ b/dev-python/funcparserlib/funcparserlib-1.0.1.ebuild
@@ -0,0 +1,28 @@
+# 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..10} )
+inherit distutils-r1
+
+DESCRIPTION="Recursive descent parsing library based on functional combinators"
+HOMEPAGE="https://pypi.org/project/funcparserlib/
+	https://github.com/vlasovskikh/funcparserlib"
+SRC_URI="
+	https://github.com/vlasovskikh/funcparserlib/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+BDEPEND="
+	test? (
+		dev-python/six[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
diff --git a/dev-python/google-auth-oauthlib/Manifest b/dev-python/google-auth-oauthlib/Manifest
index 6a48d0731dc1..0ae73f38db35 100644
--- a/dev-python/google-auth-oauthlib/Manifest
+++ b/dev-python/google-auth-oauthlib/Manifest
@@ -2,8 +2,10 @@ DIST google-auth-library-python-oauthlib-0.5.2.gh.tar.gz 53842 BLAKE2B 7adcd9f33
 DIST google-auth-library-python-oauthlib-0.5.3.gh.tar.gz 69613 BLAKE2B 74338894f35fd1cd8802ea56952561ce0e801fecb2f994b71caf3c6b62a22e8b85f8a5b40f5571b05225a565b373865377d321625aeea2dafcc0cafb89da1492 SHA512 76c855e9becd57d3cb3bb0b203ad77ef17dc04e8be8b96d17a9c1f29474a8b180edb725e835d0552c5eddbb387cc463e88b076dd6d11635e6d45798224f09188
 DIST google-auth-library-python-oauthlib-0.6.0.gh.tar.gz 70025 BLAKE2B 2d87390a629d967b0f2aef5f56712d3defc2b460a67f2bf633bb628875161f9ddbb4f229426ce2b42dcf805feefe8101ed3bacd72ced630c0be4fe40bd926c7e SHA512 1aa42498a5875812db922b30eb20cdf124935f95f5cabd224acfb82c9ed61714cfc3c6af2168e75cf11aaa8550e41c48f30fc1d467d1b7be511bf5cb522104e8
 DIST google-auth-library-python-oauthlib-0.7.0.gh.tar.gz 70179 BLAKE2B d0e70d796c11a0f3a9be8dba58dc030ef1dfd6dc3dd13e3dc74530c5d1edba3863b7a9bb4c1f90879b70a585f1d193344dea96aa45fbb08a7e28a25a31a22b6f SHA512 fe33b0a4528f6f6602b73de50c017779e7aba5d8891ef43cb3350d337e3e62a78a4126479fae0a8732dd7c4bd35210182f4a1b7f61da06af043dfff7d91ffe24
+DIST google-auth-library-python-oauthlib-0.7.1.gh.tar.gz 70325 BLAKE2B 969b6de0b873ab9532b46549e82bef14c71777f67d4c8813ab7d94cb66239469e3647f683f074b0f495d7db6578e87c57e4e96e8920891d6912e5b807644c559 SHA512 e35d5090d83015ca4c7a5f7166ad4e7ed1c845845239bfe1fc56df6a9ce925afaa47db435c6eac5a66364e2a4c866d1e8ae49dcf34066e90b4f8d6dcdb670bfb
 EBUILD google-auth-oauthlib-0.5.2.ebuild 876 BLAKE2B 97153977e671f5a8e24315290ce154c41bf478add7b9103141df177381631adfb7a4e7001888a8362ee09f11213c1d461b480436d649d59f9f089ff95c1a25db SHA512 eb04ca36f3939bf0f76b0118ba8c629e39b9bec056c5afd322a2d73b3d655d9af6c2786db17b16f0f7010e0e9f150c14f11cc56671b43e3f876e4477f8ed48b9
 EBUILD google-auth-oauthlib-0.5.3.ebuild 876 BLAKE2B 97153977e671f5a8e24315290ce154c41bf478add7b9103141df177381631adfb7a4e7001888a8362ee09f11213c1d461b480436d649d59f9f089ff95c1a25db SHA512 eb04ca36f3939bf0f76b0118ba8c629e39b9bec056c5afd322a2d73b3d655d9af6c2786db17b16f0f7010e0e9f150c14f11cc56671b43e3f876e4477f8ed48b9
 EBUILD google-auth-oauthlib-0.6.0.ebuild 876 BLAKE2B 97153977e671f5a8e24315290ce154c41bf478add7b9103141df177381631adfb7a4e7001888a8362ee09f11213c1d461b480436d649d59f9f089ff95c1a25db SHA512 eb04ca36f3939bf0f76b0118ba8c629e39b9bec056c5afd322a2d73b3d655d9af6c2786db17b16f0f7010e0e9f150c14f11cc56671b43e3f876e4477f8ed48b9
 EBUILD google-auth-oauthlib-0.7.0.ebuild 877 BLAKE2B e01c55a12bf9897a5df0d230a0e9d9266b3de3a1c2c6b1a5623bc94f46c5ab5435a6e26acd88fd5bb952bfb7a68b08d7fd56948511852fd4b0587519014a29b6 SHA512 043abcce2d9143bd5c029b9eb7ebeb006bcc4153f7d2adffccbcd2d381325432d76cfd6d553c4dc0f25a760944d828ce3b10b2ed80713df6dd256f5dbcbe3542
+EBUILD google-auth-oauthlib-0.7.1.ebuild 877 BLAKE2B e01c55a12bf9897a5df0d230a0e9d9266b3de3a1c2c6b1a5623bc94f46c5ab5435a6e26acd88fd5bb952bfb7a68b08d7fd56948511852fd4b0587519014a29b6 SHA512 043abcce2d9143bd5c029b9eb7ebeb006bcc4153f7d2adffccbcd2d381325432d76cfd6d553c4dc0f25a760944d828ce3b10b2ed80713df6dd256f5dbcbe3542
 MISC metadata.xml 410 BLAKE2B 23af42a2aa614f119e10cf5d57c3c37abb69ad8d9b1e16445fb92c9f00bdd78f6b1a6a51dff4ebb98bbb03e0002e73eb68cffcf857372dd94848187637c60219 SHA512 c19dd3af098644d5068ec677be51615885bb1267ba9bfb867609725e2a824a74934e2fe25909ea7406c91ca405d44e4c7191a14d3d1bc7b3a60c29445456d3d1
diff --git a/dev-python/google-auth-oauthlib/google-auth-oauthlib-0.7.1.ebuild b/dev-python/google-auth-oauthlib/google-auth-oauthlib-0.7.1.ebuild
new file mode 100644
index 000000000000..9f0dd721dba7
--- /dev/null
+++ b/dev-python/google-auth-oauthlib/google-auth-oauthlib-0.7.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+MY_P=google-auth-library-python-oauthlib-${PV}
+DESCRIPTION="Google Authentication Library"
+HOMEPAGE="
+	https://github.com/googleapis/google-auth-library-python-oauthlib/
+	https://pypi.org/project/google-auth-oauthlib/
+"
+SRC_URI="
+	https://github.com/googleapis/google-auth-library-python-oauthlib/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/click-6.0.0[${PYTHON_USEDEP}]
+	>=dev-python/google-auth-2.13.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-oauthlib-0.7.0[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/jsonref/Manifest b/dev-python/jsonref/Manifest
index 0cdef82bdc01..19ed186e9511 100644
--- a/dev-python/jsonref/Manifest
+++ b/dev-python/jsonref/Manifest
@@ -1,7 +1,9 @@
 DIST jsonref-0.2.tar.gz 13032 BLAKE2B 0db36904f6914c889d608ac6a368cc8a80b0f81b6bf9f77bb229042c484084c6a06f31099440a48f49f5efea248e0e4f498269bdf89e240be8e149a0f221747d SHA512 415eaefcaf2c7a02bf70749522fef0d96f1e0cc5772edd50ca016a564258df21dd3eb178b7a33ee61e606125fb802a29b0cb8855a81c6116baf6393208927b0f
 DIST jsonref-0.3.0.gh.tar.gz 17143 BLAKE2B 69873c69e88059899fde3d1c6d335ae68f80b9524132a3aff6c1ed5c795679f612051a225e902abeb9c1c73357dafceedf24df432eb32ebfc45162c9bcc38b57 SHA512 af5c1fa910b2354b8da29772f1e67a498b1836a43771784240f72ec71e8d9bab83ed553dd0559311cabf19502fbe431f03663e728188b6c1b31e680f5e24bbfe
 DIST jsonref-1.0.0.gh.tar.gz 19814 BLAKE2B b380a0bf9a179ca61cd52ebb6ba37498ce19055f6e1e596ac3acf82f791277669dd760c0e6fe0b7e0ba25b8f5da4657e4e27e28a32a786686e341ed21e1c7bac SHA512 147c4ba90798fdcc0eba754e6cfb22665e2099038c0891b65353a6e68fa870eebcbce3e768beca53ee5d3535697e85eb8bdf62c7c160f2b50f6b81b2a184217d
+DIST jsonref-1.0.1.gh.tar.gz 20163 BLAKE2B c70dfc59059845cb7e3e6db2aaaf8f69b0030c124a2dc52ef5b11296e42d46635a7cb4608a276e093023c7450ca5bc342a6f112476cb6444df69d5a93cfcf306 SHA512 95602997cf4ed798ab8e55d38f0d81a5530ebd08546fd1f63bad6c8f4076d155d007317812f01f9bf6b2f15e30663bdf0a4e2cab96ebba87552ecb5c712364b9
 EBUILD jsonref-0.2.ebuild 514 BLAKE2B f5860e65f0ae599d799b6d82078c6f556053c76e43ec3703f71bd68ade0f6ed4c521ab7f42febc5fbe15f38878d7fc604d88a258776d6d3792e12bacd264ac29 SHA512 9bcc6b9d5f52e10cf02981fe2b25fd4df07689e1f5e58431186a190b5010a4f57db33730665d317dae25f3c232b8095984eea3758fd1caa8775c46170d231e5b
 EBUILD jsonref-0.3.0.ebuild 554 BLAKE2B d6791d3bbfa8044625d4e919ee1bb2e565bea5ff36a0a6fe0f168a0fa6546d613ec325b1a3fce0fc079bb096417dc7196a4569de501c92f7d3b855f916bdfff5 SHA512 f90fcf3d9c2fcdeb9978d8388183e44aa42500dec3385aaeccb9b1648c8345a2f9d6290ee427393fc7f0115709038681392b7b8e3b9419772e8551f3ea636a70
 EBUILD jsonref-1.0.0.ebuild 554 BLAKE2B d6791d3bbfa8044625d4e919ee1bb2e565bea5ff36a0a6fe0f168a0fa6546d613ec325b1a3fce0fc079bb096417dc7196a4569de501c92f7d3b855f916bdfff5 SHA512 f90fcf3d9c2fcdeb9978d8388183e44aa42500dec3385aaeccb9b1648c8345a2f9d6290ee427393fc7f0115709038681392b7b8e3b9419772e8551f3ea636a70
+EBUILD jsonref-1.0.1.ebuild 554 BLAKE2B d6791d3bbfa8044625d4e919ee1bb2e565bea5ff36a0a6fe0f168a0fa6546d613ec325b1a3fce0fc079bb096417dc7196a4569de501c92f7d3b855f916bdfff5 SHA512 f90fcf3d9c2fcdeb9978d8388183e44aa42500dec3385aaeccb9b1648c8345a2f9d6290ee427393fc7f0115709038681392b7b8e3b9419772e8551f3ea636a70
 MISC metadata.xml 797 BLAKE2B 4afca797d34cb036eefde373c1c02ac9619153670c8f3d9612b5687f248639942a51cb23e18119f61e3cb3dada9566113334662514a89bc6bb2de9ec9f49b4a4 SHA512 803607e8f9a7391f97aa104a4f3997023d341772eac6af0934bea84cbe45dfc1aff59928d8d45116ef52a4b86edc3ff3e28d3547b2f4ceaf37eeb7f2fde0ea7a
diff --git a/dev-python/jsonref/jsonref-1.0.1.ebuild b/dev-python/jsonref/jsonref-1.0.1.ebuild
new file mode 100644
index 000000000000..e69ac8248519
--- /dev/null
+++ b/dev-python/jsonref/jsonref-1.0.1.ebuild
@@ -0,0 +1,29 @@
+# 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="An implementation of JSON Reference for Python"
+HOMEPAGE="
+	https://github.com/gazpachoking/jsonref/
+	https://pypi.org/project/jsonref/
+"
+SRC_URI="
+	https://github.com/gazpachoking/jsonref/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+distutils_enable_tests pytest
+
+python_test() {
+	epytest tests.py
+}
diff --git a/dev-python/lit/Manifest b/dev-python/lit/Manifest
index 377c3e62c10b..fb35fa83b966 100644
--- a/dev-python/lit/Manifest
+++ b/dev-python/lit/Manifest
@@ -1,6 +1,5 @@
 DIST llvm-project-14.0.6.src.tar.xz 105618228 BLAKE2B ee67c5407df8cef493b9c0004f15e428f22a536a17e5f4e3eb29a003b8a8ec0abe0fa3e072591161d5f30ef7d8867c1ce34d1b341ad858e93c00263499941a99 SHA512 6fc6eeb60fac698702d1aac495fc0161eb7216a1f8db2020af8fccec5837831f7cc20dc2a169bf4f0b5f520748280b4a86621f3697d622aa58faaa45dbfaad13
 DIST llvm-project-14.0.6.src.tar.xz.sig 566 BLAKE2B cb658ad43d8ab6c43a5773aedadf0569c97b5ee4b1bd58eceb10e1879a30880c741c3d66bedd462c892309b688fb7b2673115a62d1f74d71ee375a578de9547f SHA512 b4a7b368532a7a4a24376cfa7db8f6d3478f6d4446474342fc00b474ecf466330cd0f16783209263c4c72d5fc7ddedfb11b95578842e700cfb7ee0bb34cc95d6
-DIST llvm-project-14f996dca8a2b5b17d6917528bfd9ee71ba6192a.tar.gz 169054148 BLAKE2B a23af6658a6ea8a7cb4272faef151937da229e39383ec068d7ef81e72a25d2a46dc2a86255a7f1148b7385b339d1c17e62f627df834d8eccc39be8921575f88d SHA512 e719d296016e7af718d022424c337a5df8d7124fdb49b9f219ab2a5dc592e6a59f6c09064775ea9349bcf4eed9d72214abb648de649ab872174c35635c945c04
 DIST llvm-project-15.0.3.src.tar.xz 112069972 BLAKE2B 3d29bab890467ba87fedcc4e76522f444e63e3dfbe546793f8e67821bcd403bad460ea176254c9e0b72d60ea56b8480e498a7f610477c1108732d178804c26cd SHA512 d378d417f01c56534f301cfe6cb4958d811c04ae22acaacc917e7e5f0380859d40ce19dffb265d046b70fff95dbc2e759f492e4d5af0ade52f21ebaa8da65856
 DIST llvm-project-15.0.3.src.tar.xz.sig 438 BLAKE2B e7e0614e144eb878f694c12e97cf42ff8476e47cb55e8f259eb2ec52e303463ad753771271512e89baf0137c1382b11cfa028c85324174ebcd054a124000f537 SHA512 41229bebdb0c2df9a5e3a4d6f02d39fac7dc91f21895a659523beab4fa3ef99ff06eff5e4386221369b6e2b6f8fe974d67b7d8496d5911ce484d09ae0db8b916
 DIST llvm-project-15.0.4.src.tar.xz 110936424 BLAKE2B a02b76ad161e352b4d3d84baffdada9c6a0e704de7a2c4017df4d4d05a9e9d02113791cd7d91c3edfa1f5bcb7ab95e1772d60f7061514928c6828600f41a8322 SHA512 9d5b664dd77c08130601636f9d6c006b257f369470ce823aa56d06698a9f0edfec42f2c90da934b9ad52c4d7960d9a024ea46dc9640275be6d191b1ba9869459
@@ -13,6 +12,5 @@ EBUILD lit-15.0.3.ebuild 915 BLAKE2B 39561af9fa2c903cdd5d329a48305c2bdd6862dd5cc
 EBUILD lit-15.0.4.9999.ebuild 871 BLAKE2B 5ab6cc094e95685501304ebac41e07a919505fb6ce9b2db04e0c671e6a494df35ba81f6a43d8448cb2f94e982e32850658085daa98ca60e652da887dffc400a6 SHA512 d4cf8c7c2bc71376c998ff0d9796c6713b20e972014f13369d7658667f23cd97ec237df2818aa96add88cb4e2c36d1f272494fbab8d6b15014d5529d95616186
 EBUILD lit-15.0.4.ebuild 920 BLAKE2B 44ddfc3adf60ca1c1a328ecda0d28b7fcbc416a0d472cdf31f978fa25beebec533686b71292a7b36be1654633026e029f04e2b496c06845e088bd9b416b1b6c0 SHA512 d4a2442ead255c0664f4a4946034632658d39dd36ccf3d88b5aaad7f7ebe25b0969dbfb368ad6a487c277f845c47a54f8f548df79db2da84bf3714883ec0fbea
 EBUILD lit-16.0.0.9999.ebuild 871 BLAKE2B 5ab6cc094e95685501304ebac41e07a919505fb6ce9b2db04e0c671e6a494df35ba81f6a43d8448cb2f94e982e32850658085daa98ca60e652da887dffc400a6 SHA512 d4cf8c7c2bc71376c998ff0d9796c6713b20e972014f13369d7658667f23cd97ec237df2818aa96add88cb4e2c36d1f272494fbab8d6b15014d5529d95616186
-EBUILD lit-16.0.0_pre20221016.ebuild 871 BLAKE2B 5ab6cc094e95685501304ebac41e07a919505fb6ce9b2db04e0c671e6a494df35ba81f6a43d8448cb2f94e982e32850658085daa98ca60e652da887dffc400a6 SHA512 d4cf8c7c2bc71376c998ff0d9796c6713b20e972014f13369d7658667f23cd97ec237df2818aa96add88cb4e2c36d1f272494fbab8d6b15014d5529d95616186
 EBUILD lit-16.0.0_pre20221023.ebuild 871 BLAKE2B 5ab6cc094e95685501304ebac41e07a919505fb6ce9b2db04e0c671e6a494df35ba81f6a43d8448cb2f94e982e32850658085daa98ca60e652da887dffc400a6 SHA512 d4cf8c7c2bc71376c998ff0d9796c6713b20e972014f13369d7658667f23cd97ec237df2818aa96add88cb4e2c36d1f272494fbab8d6b15014d5529d95616186
 MISC metadata.xml 340 BLAKE2B c9ca851e49b4ab48c015686e983ec988f60c34ed0af77abd7bc03d046002f79f74b9b463ecb97db89f2230c1593af7acdaf6651fc51fed4aa92a459d07aabf18 SHA512 3fe8262ce6b971364162fbdbac3b02bf02f0a64896c8a2564e2a2998bd6e6bc74463bf9104e3f4ffaa9f5c1a16c877fc864b8a4f056ca0022f741799bc00f217
diff --git a/dev-python/lit/lit-16.0.0_pre20221016.ebuild b/dev-python/lit/lit-16.0.0_pre20221016.ebuild
deleted file mode 100644
index 8ace6ca8b915..000000000000
--- a/dev-python/lit/lit-16.0.0_pre20221016.ebuild
+++ /dev/null
@@ -1,42 +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 llvm.org
-
-DESCRIPTION="A stand-alone install of the LLVM suite testing tool"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-KEYWORDS=""
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# Tests require 'FileCheck' and 'not' utilities (from llvm)
-BDEPEND="
-	test? (
-		dev-python/psutil[${PYTHON_USEDEP}]
-		sys-devel/llvm
-	)
-"
-
-LLVM_COMPONENTS=( llvm/utils/lit )
-llvm.org_set_globals
-
-# TODO: move the manpage generation here (from sys-devel/llvm)
-
-src_prepare() {
-	cd "${WORKDIR}" || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local -x LIT_PRESERVES_TMP=1
-	local litflags=$(get_lit_flags)
-	./lit.py ${litflags//;/ } tests || die
-}
diff --git a/dev-python/mkdocs-material/Manifest b/dev-python/mkdocs-material/Manifest
index 151c029fe81a..0dba589e0371 100644
--- a/dev-python/mkdocs-material/Manifest
+++ b/dev-python/mkdocs-material/Manifest
@@ -1,6 +1,8 @@
 AUX mkdocs-material-8.5.7-simplify-build.patch 742 BLAKE2B b6ef8704ca360e2076f0855e39d1a8abd2a8ee0581375d9842ffaac0cf2077be228614cd2a85b281e0b8ae49c409e1262d9150239e119cbcec838dac8d8b91a5 SHA512 02e3e06442bd59e9921894bf24147211deb692d0989d96a2a858786c0d3800a2dd131530b98ee41dfddd0219263142007dfa0c2262f12c3275015a69946289e0
 DIST mkdocs-material-8.5.2.gh.tar.gz 10262607 BLAKE2B 16fe2e9d377cf8361ddcf5bdd1f5b461783ef03a26894abd9cfe8ba3c88e4d89e5ee8da3e566b996ea1595a6600933d4140ca698f3a303e6fc4c2b32e208af1e SHA512 74066b3b85be3dc5f4380ab73a98dd07fc8430a65b6ec9a51f1513fa3f0703f3eff4567344642710bf8e91e8cf9193b552a58f865b86367f397d0c884e1849f8
 DIST mkdocs-material-8.5.7.gh.tar.gz 10362881 BLAKE2B 833e05a67570f7c341681f6fcc0b54f145044ae60512aef4fc6c366022700c6f257418a502cf0fd7c8a25f4be4c37f9ca591b5063e424ab2f6ef17b3fce01129 SHA512 d47866faed2c993d3e8daca0213cf9052a2e31449c2aa968c6a4451eaf2528094fdebda1ee7c6a12f1a0c502ef1c16a2aceaf03e7ec195117391beda8535a127
+DIST mkdocs-material-8.5.8.gh.tar.gz 10372291 BLAKE2B 2b97f563133c78c22d6174e3ce50afec520d0fc3fecc2651ecc348c703f19ce1fa7f77f53955e8f023dfb9a75be6d20974b3f1e6a66407405a01529bd4014923 SHA512 f3f1b025525dd7f52aa7b0026cf4bf1943a91ee15b4dd9e63f7203704141a1301627aec7f5d38b8bbe38ec159b4cfc178716838487d96609278081ce5fbc7acf
 EBUILD mkdocs-material-8.5.2.ebuild 1043 BLAKE2B 64de41e9ee9ed57b3648e038b535deac4f1750fd0dacc4efeb2ad9a465cf47276a58eacf5681ad5d6f8aaff10e5697b795baa32d92bd9210da7e0cfb94db6075 SHA512 7b6f13f3af4a5d5df020a5b40534e2a711d073cf139469be47217eede03efca4645c5c28e89f72921be478da080af9a5cce42985b95093b7f362dfc06aeb1854
 EBUILD mkdocs-material-8.5.7.ebuild 1262 BLAKE2B b53e7383ae9694fc31aff1a223003b346ab54b6fdc0840b0ed8c8b57b5e2d49685f191ed85d89d6a16c91e4a26e9ade7610286146efb44a00d6be3098722e2dc SHA512 5e23a1076f90df7ffb7d531deb11442420e3a51b7fd5ba20c6d32fa9df71483add41448c7444ee85cc8ba24df3ce942e972954d7b032497c525ec976eeb5f0bf
+EBUILD mkdocs-material-8.5.8.ebuild 1262 BLAKE2B b53e7383ae9694fc31aff1a223003b346ab54b6fdc0840b0ed8c8b57b5e2d49685f191ed85d89d6a16c91e4a26e9ade7610286146efb44a00d6be3098722e2dc SHA512 5e23a1076f90df7ffb7d531deb11442420e3a51b7fd5ba20c6d32fa9df71483add41448c7444ee85cc8ba24df3ce942e972954d7b032497c525ec976eeb5f0bf
 MISC metadata.xml 1037 BLAKE2B 6997d0f85e31152c58092081b697d8934c54f933e188082eb55e5e9f252f57274f673e1d8e5b657907da2d1658f969cd67bdb32bdc05324746f211b718f3a4b2 SHA512 ccd4f4aa6e6e780d0aff5894b260eedb602d29cc25427c202561525d27de4a31d1e13f59267d8d732d0e12f3ca0485996bca6ef2a114e96b030259899e8ad47c
diff --git a/dev-python/mkdocs-material/mkdocs-material-8.5.8.ebuild b/dev-python/mkdocs-material/mkdocs-material-8.5.8.ebuild
new file mode 100644
index 000000000000..2071af80ea70
--- /dev/null
+++ b/dev-python/mkdocs-material/mkdocs-material-8.5.8.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{8..11} )
+
+DOCS_BUILDER="mkdocs"
+DOCS_DEPEND="
+	dev-python/mkdocs-material-extensions
+	dev-python/mkdocs-minify-plugin
+	dev-python/mkdocs-redirects
+"
+
+inherit distutils-r1 docs
+
+DESCRIPTION="A Material Design theme for MkDocs"
+HOMEPAGE="
+	https://github.com/squidfunk/mkdocs-material/
+	https://pypi.org/project/mkdocs-material/
+"
+SRC_URI="
+	https://github.com/squidfunk/${PN}/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/jinja-3.0.2[${PYTHON_USEDEP}]
+	>=dev-python/markdown-3.2[${PYTHON_USEDEP}]
+	>=dev-python/mkdocs-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.12[${PYTHON_USEDEP}]
+	>=dev-python/pymdown-extensions-9.4[${PYTHON_USEDEP}]
+"
+
+# mkdocs-material-extensions depends on mkdocs-material creating a circular dep
+PDEPEND=">=dev-python/mkdocs-material-extensions-1.0.3[${PYTHON_USEDEP}]"
+
+PATCHES=(
+	# simplify pyproject to remove extra deps for metadata
+	"${FILESDIR}/${PN}-8.5.7-simplify-build.patch"
+)
+
+src_prepare() {
+	echo "__version__ = '${PV}'"> gentoo_version.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/moto/Manifest b/dev-python/moto/Manifest
index 2be9114c18c5..8aed623444d9 100644
--- a/dev-python/moto/Manifest
+++ b/dev-python/moto/Manifest
@@ -1,12 +1,5 @@
-DIST moto-4.0.0.tar.gz 2404959 BLAKE2B a9969cb306937deaa15aca1ee76a447d0e416a7be160da9c81ce30e5147fd595cbe7b38f84ee26e795d055e3f62a6c1467e176d9b7ee58197c9d22a34f94918e SHA512 11bc093b6e89bad5340433daee0f9ba482a8534ab73a57a77556510f1dfef8186ee45b6c914bab291e861eb50d4bda7686d3d22d469db87a79e3247dbefd2e6d
-DIST moto-4.0.6.tar.gz 2465655 BLAKE2B e9ab47e910baf2b704c87a0d4583bdf02f2e4a1a23d08402c431012b18750ed229abdd96c98bb5dde5ba69837613853bb108b4d390b5c28afb3475b63d97bf95 SHA512 32def58317c2e76960f2db1d79a95a5468d110284540f9441e495b7d08109ab0933a2f5dc8673fdc71bd601cb5f6395f53aad7d1aef065c7ee3a1a318e5850a7
-DIST moto-4.0.7.tar.gz 2478859 BLAKE2B ba3df603fd1ea9e944037bc8abe3d9343fab483efe4446045cf81e16d9918e5291e4470e2b6d51faa99c64a581c2a7890eb9a558fd9b4e431b70b5c71393d2a2 SHA512 b0119cfa480d735ac255125c058c1026e0b32690fcedf64889845452bfc9e92dd2f64e3c413bdce24dd43a205b88a9df03896afe96149146a8690b7d6bb4437f
 DIST moto-4.0.8.tar.gz 2488253 BLAKE2B ae707de8f0917b62904f38f977eded8f3e995271da8a7d6be47f05a24e3cb8bb8121e5e52625deb6c8f836e5f328352a7e6ea0855a4278c32dc9363da0faa8cc SHA512 9d3d3164bb6a77901bb55b8c536bfc8822e5b5292d79fedfe89a4a7fefaeab24b740d9a898e9487152a45c5a3bfd15d8aaca042a485bea389e1a82bb0a90bdd0
 DIST moto-4.0.9.tar.gz 2496530 BLAKE2B 596dc00ce0c931d4405d1ad6fdfcff4acc5c7421b1f1d67f442e090249d3df81f89c570368b5e981ec49f14a35aed32621ff3dbedc7003e3c870f891e4eda20a SHA512 fedf2c97779a93b1ab3492122be5425f3d91219eb207cc21bf2822ffa52c6efe2c3c8ca233acafd02c725c46e77e883f8f941c29638bb3e32ffa774ed8a5ff69
-EBUILD moto-4.0.0.ebuild 4096 BLAKE2B 60d3dbe15f9c40b8cfa64fdccd57d1d24152a152449c24e0f5e5bd967471c0e1a181ef3d921ef04c299b2ea9dc13fddfe76c861b0f56f2522e64975850eac786 SHA512 a19ca0cf5b9b0db8a36705a39d84e8a67cc4e9153be8b4f5157736039457803ba51dbebbeca84c24e200c70584905118abce400c8211709bc08ae7e902bef432
-EBUILD moto-4.0.6.ebuild 4098 BLAKE2B 524e4925bec974fa3e5c31cfaadbdd7acb0f3638bf4198c48dba3e48f0f8d1185ba4652de7b1f24957ab1a57f61ce3e533af51ee3091b2652fec9ece03a8bf44 SHA512 c28daf0e0919d4b0bdf353d10275385ddd2e3bcf98bf241a33973d31010856b2a2a1437fccdf2cb70381ce8cc4412650b415feb37cdb4d28b6f0cbc8e32e8b8d
-EBUILD moto-4.0.7-r1.ebuild 4170 BLAKE2B 40f9e16c72e4d0e9f85f77a638010028bf8037ac5b35d936860a02b12975088991bfbe46a5ced21416001765594669e688c8d43fe5a1c1c146d2b34b82b8e774 SHA512 0e4a3523bd9c58bf304b847a31b637f53de466850e921513ca70eb2772fa26abf1132db4ff5b88c7fc557c9947dda3e54cb2d5d58a9d96678ec5860809641bc8
-EBUILD moto-4.0.7.ebuild 4098 BLAKE2B 524e4925bec974fa3e5c31cfaadbdd7acb0f3638bf4198c48dba3e48f0f8d1185ba4652de7b1f24957ab1a57f61ce3e533af51ee3091b2652fec9ece03a8bf44 SHA512 c28daf0e0919d4b0bdf353d10275385ddd2e3bcf98bf241a33973d31010856b2a2a1437fccdf2cb70381ce8cc4412650b415feb37cdb4d28b6f0cbc8e32e8b8d
-EBUILD moto-4.0.8.ebuild 4169 BLAKE2B 03530bf9791b4842f8a6edde666e1c94dea95df9f347c6b924e7d2117d7d2970f40843aa7df10812a90528050a278d4bd1f08499a98c4c72e77633bf159068ac SHA512 6fcfd7d35107735e1003491745d7f1c22e59da056d6a87c4eb41f81be1bd8a9e71c3c9224c4f976d922fade46f30f0f72f4a68ec93e78ed87b520dcb9a478b3c
+EBUILD moto-4.0.8.ebuild 4168 BLAKE2B f7b93227ed08d35d0576af80b74ddce6287abde1a8a53188e6d78a0e39950f8ff43f1597f621da68046d93eae09b53a16511411aba98988ea9062f9cbfe29295 SHA512 954133862dd6ce7ae667104e0650ec2696104a494c0d07772a58456d4c61844d63d6215dd613aa49a74c3b3eaa270e1736b12880799a531ca0ac0f7d9bba4851
 EBUILD moto-4.0.9.ebuild 4170 BLAKE2B 40f9e16c72e4d0e9f85f77a638010028bf8037ac5b35d936860a02b12975088991bfbe46a5ced21416001765594669e688c8d43fe5a1c1c146d2b34b82b8e774 SHA512 0e4a3523bd9c58bf304b847a31b637f53de466850e921513ca70eb2772fa26abf1132db4ff5b88c7fc557c9947dda3e54cb2d5d58a9d96678ec5860809641bc8
 MISC metadata.xml 552 BLAKE2B c0162cc80007c1fda211c105b3e7391e3596ef11deb9257bab489f4b112f79ed115ca3f250bdf1b87aee0af258aa59056c8d062acebca7dec631acf3ec9eb2bb SHA512 3f7b3c5709bca51588e58f9eeb9bb363e2657a7e6483519ec7782eb047a5311d434e2459ccd3b495340f85f72a92da2f7cc6eb3de617e979bade7b8fc7b3c01d
diff --git a/dev-python/moto/moto-4.0.0.ebuild b/dev-python/moto/moto-4.0.0.ebuild
deleted file mode 100644
index 91c9cc8b648b..000000000000
--- a/dev-python/moto/moto-4.0.0.ebuild
+++ /dev/null
@@ -1,92 +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
-
-DESCRIPTION="Mock library for boto"
-HOMEPAGE="https://github.com/spulec/moto"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/aws-xray-sdk-python-0.93[${PYTHON_USEDEP}]
-	dev-python/boto[${PYTHON_USEDEP}]
-	dev-python/cfn-lint[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-3.3.1[${PYTHON_USEDEP}]
-	dev-python/cookies[${PYTHON_USEDEP}]
-	>=dev-python/docker-py-2.5.1[${PYTHON_USEDEP}]
-	>=dev-python/idna-2.5[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
-	>=dev-python/jsondiff-1.1.2[${PYTHON_USEDEP}]
-	dev-python/boto3[${PYTHON_USEDEP}]
-	dev-python/botocore[${PYTHON_USEDEP}]
-	dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/flask-cors[${PYTHON_USEDEP}]
-	dev-python/more-itertools[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-3.0.7[${PYTHON_USEDEP}]
-	>=dev-python/openapi-spec-validator-0.2.8[${PYTHON_USEDEP}]
-	dev-python/pretty-yaml[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/python-jose[${PYTHON_USEDEP}]
-	dev-python/python-sshpubkeys[${PYTHON_USEDEP}]
-	>=dev-python/responses-0.9.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.5[${PYTHON_USEDEP}]
-	dev-python/xmltodict[${PYTHON_USEDEP}]
-	dev-python/werkzeug[${PYTHON_USEDEP}]
-	dev-python/zipp[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-		>=dev-python/sure-1.4.11[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		tests/test_firehose/test_firehose_put.py::test_put_record_http_destination
-		tests/test_firehose/test_firehose_put.py::test_put_record_batch_http_destination
-		tests/test_swf/responses/test_decision_tasks.py::test_respond_decision_task_completed_with_schedule_activity_task_boto3
-		tests/test_swf/responses/test_timeouts.py::test_activity_task_heartbeat_timeout_boto3
-		tests/test_swf/responses/test_timeouts.py::test_decision_task_start_to_close_timeout_boto3
-		tests/test_swf/responses/test_timeouts.py::test_workflow_execution_start_to_close_timeout_boto3
-		# broken code (local variable used referenced before definition)
-		tests/test_appsync/test_appsync_schema.py
-		tests/test_appsync/test_server.py::test_appsync_list_tags_for_resource
-		# Needs network (or docker?) but not marked as such, bug #807031
-		# TODO: report upstream
-		tests/test_batch/test_batch_jobs.py::test_terminate_job
-		tests/test_batch/test_batch_jobs.py::test_cancel_pending_job
-		tests/test_batch/test_batch_jobs.py::test_cancel_running_job
-		tests/test_batch/test_batch_jobs.py::test_dependencies
-		tests/test_batch/test_batch_jobs.py::test_container_overrides
-		tests/test_cloudformation/test_cloudformation_custom_resources.py::test_create_custom_lambda_resource__verify_cfnresponse_failed
-		tests/test_cloudformation/test_cloudformation_stack_integration.py::test_lambda_function
-		tests/test_events/test_events_lambdatriggers_integration.py::test_creating_bucket__invokes_lambda
-		tests/test_sqs/test_integration.py::test_invoke_function_from_sqs_exception
-		tests/test_sqs/test_sqs_integration.py::test_invoke_function_from_sqs_exception
-		tests/test_s3/test_server.py::test_s3_server_post_to_bucket_redirect
-		"tests/test_s3/test_s3_lambda_integration.py::test_objectcreated_put__invokes_lambda[match_events0-ObjectCreated:Put]"
-		"tests/test_s3/test_s3_lambda_integration.py::test_objectcreated_put__invokes_lambda[match_events1-ObjectCreated:Put]"
-		"tests/test_s3/test_s3_lambda_integration.py::test_objectcreated_put__invokes_lambda[match_events3-ObjectCreated:Put]"
-	)
-
-	# pytest-django causes freezegun try to mangle stuff inside django
-	# which fails when django is not really used
-	epytest -p no:django -m 'not network'
-}
diff --git a/dev-python/moto/moto-4.0.6.ebuild b/dev-python/moto/moto-4.0.6.ebuild
deleted file mode 100644
index deb2ce6bae60..000000000000
--- a/dev-python/moto/moto-4.0.6.ebuild
+++ /dev/null
@@ -1,92 +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
-
-DESCRIPTION="Mock library for boto"
-HOMEPAGE="https://github.com/spulec/moto"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-
-RDEPEND="
-	>=dev-python/aws-xray-sdk-python-0.93[${PYTHON_USEDEP}]
-	dev-python/boto[${PYTHON_USEDEP}]
-	dev-python/cfn-lint[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-3.3.1[${PYTHON_USEDEP}]
-	dev-python/cookies[${PYTHON_USEDEP}]
-	>=dev-python/docker-py-2.5.1[${PYTHON_USEDEP}]
-	>=dev-python/idna-2.5[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
-	>=dev-python/jsondiff-1.1.2[${PYTHON_USEDEP}]
-	dev-python/boto3[${PYTHON_USEDEP}]
-	dev-python/botocore[${PYTHON_USEDEP}]
-	dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/flask-cors[${PYTHON_USEDEP}]
-	dev-python/more-itertools[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-3.0.7[${PYTHON_USEDEP}]
-	>=dev-python/openapi-spec-validator-0.2.8[${PYTHON_USEDEP}]
-	dev-python/pretty-yaml[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/python-jose[${PYTHON_USEDEP}]
-	dev-python/python-sshpubkeys[${PYTHON_USEDEP}]
-	>=dev-python/responses-0.9.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.5[${PYTHON_USEDEP}]
-	dev-python/xmltodict[${PYTHON_USEDEP}]
-	dev-python/werkzeug[${PYTHON_USEDEP}]
-	dev-python/zipp[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-		>=dev-python/sure-1.4.11[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		tests/test_firehose/test_firehose_put.py::test_put_record_http_destination
-		tests/test_firehose/test_firehose_put.py::test_put_record_batch_http_destination
-		tests/test_swf/responses/test_decision_tasks.py::test_respond_decision_task_completed_with_schedule_activity_task_boto3
-		tests/test_swf/responses/test_timeouts.py::test_activity_task_heartbeat_timeout_boto3
-		tests/test_swf/responses/test_timeouts.py::test_decision_task_start_to_close_timeout_boto3
-		tests/test_swf/responses/test_timeouts.py::test_workflow_execution_start_to_close_timeout_boto3
-		# broken code (local variable used referenced before definition)
-		tests/test_appsync/test_appsync_schema.py
-		tests/test_appsync/test_server.py::test_appsync_list_tags_for_resource
-		# Needs network (or docker?) but not marked as such, bug #807031
-		# TODO: report upstream
-		tests/test_batch/test_batch_jobs.py::test_terminate_job
-		tests/test_batch/test_batch_jobs.py::test_cancel_pending_job
-		tests/test_batch/test_batch_jobs.py::test_cancel_running_job
-		tests/test_batch/test_batch_jobs.py::test_dependencies
-		tests/test_batch/test_batch_jobs.py::test_container_overrides
-		tests/test_cloudformation/test_cloudformation_custom_resources.py::test_create_custom_lambda_resource__verify_cfnresponse_failed
-		tests/test_cloudformation/test_cloudformation_stack_integration.py::test_lambda_function
-		tests/test_events/test_events_lambdatriggers_integration.py::test_creating_bucket__invokes_lambda
-		tests/test_sqs/test_integration.py::test_invoke_function_from_sqs_exception
-		tests/test_sqs/test_sqs_integration.py::test_invoke_function_from_sqs_exception
-		tests/test_s3/test_server.py::test_s3_server_post_to_bucket_redirect
-		"tests/test_s3/test_s3_lambda_integration.py::test_objectcreated_put__invokes_lambda[match_events0-ObjectCreated:Put]"
-		"tests/test_s3/test_s3_lambda_integration.py::test_objectcreated_put__invokes_lambda[match_events1-ObjectCreated:Put]"
-		"tests/test_s3/test_s3_lambda_integration.py::test_objectcreated_put__invokes_lambda[match_events3-ObjectCreated:Put]"
-	)
-
-	# pytest-django causes freezegun try to mangle stuff inside django
-	# which fails when django is not really used
-	epytest -p no:django -m 'not network'
-}
diff --git a/dev-python/moto/moto-4.0.7-r1.ebuild b/dev-python/moto/moto-4.0.7-r1.ebuild
deleted file mode 100644
index 6249184fce6a..000000000000
--- a/dev-python/moto/moto-4.0.7-r1.ebuild
+++ /dev/null
@@ -1,92 +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="Mock library for boto"
-HOMEPAGE="https://github.com/spulec/moto"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-
-RDEPEND="
-	>=dev-python/aws-xray-sdk-python-0.93[${PYTHON_USEDEP}]
-	dev-python/cfn-lint[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-3.3.1[${PYTHON_USEDEP}]
-	dev-python/cookies[${PYTHON_USEDEP}]
-	>=dev-python/docker-py-2.5.1[${PYTHON_USEDEP}]
-	>=dev-python/idna-2.5[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
-	>=dev-python/jsondiff-1.1.2[${PYTHON_USEDEP}]
-	dev-python/boto3[${PYTHON_USEDEP}]
-	dev-python/botocore[${PYTHON_USEDEP}]
-	dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/flask-cors[${PYTHON_USEDEP}]
-	dev-python/more-itertools[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-3.0.7[${PYTHON_USEDEP}]
-	>=dev-python/openapi-spec-validator-0.2.8[${PYTHON_USEDEP}]
-	dev-python/pretty-yaml[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/python-jose[${PYTHON_USEDEP}]
-	dev-python/python-sshpubkeys[${PYTHON_USEDEP}]
-	>=dev-python/responses-0.9.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.5[${PYTHON_USEDEP}]
-	dev-python/xmltodict[${PYTHON_USEDEP}]
-	dev-python/werkzeug[${PYTHON_USEDEP}]
-	dev-python/zipp[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-		>=dev-python/sure-1.4.11[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		tests/test_firehose/test_firehose_put.py::test_put_record_http_destination
-		tests/test_firehose/test_firehose_put.py::test_put_record_batch_http_destination
-		tests/test_swf/responses/test_decision_tasks.py::test_respond_decision_task_completed_with_schedule_activity_task_boto3
-		tests/test_swf/responses/test_timeouts.py::test_activity_task_heartbeat_timeout_boto3
-		tests/test_swf/responses/test_timeouts.py::test_decision_task_start_to_close_timeout_boto3
-		tests/test_swf/responses/test_timeouts.py::test_workflow_execution_start_to_close_timeout_boto3
-		# broken code (local variable used referenced before definition)
-		tests/test_appsync/test_appsync_schema.py
-		tests/test_appsync/test_server.py::test_appsync_list_tags_for_resource
-		# Needs network (or docker?) but not marked as such, bug #807031
-		# TODO: report upstream
-		tests/test_batch/test_batch_jobs.py::test_terminate_job
-		tests/test_batch/test_batch_jobs.py::test_cancel_pending_job
-		tests/test_batch/test_batch_jobs.py::test_cancel_running_job
-		tests/test_batch/test_batch_jobs.py::test_dependencies
-		tests/test_batch/test_batch_jobs.py::test_container_overrides
-		tests/test_cloudformation/test_cloudformation_custom_resources.py::test_create_custom_lambda_resource__verify_cfnresponse_failed
-		tests/test_cloudformation/test_cloudformation_stack_integration.py::test_lambda_function
-		tests/test_events/test_events_lambdatriggers_integration.py::test_creating_bucket__invokes_lambda
-		tests/test_sqs/test_integration.py::test_invoke_function_from_sqs_exception
-		tests/test_sqs/test_sqs_integration.py::test_invoke_function_from_sqs_exception
-		tests/test_s3/test_server.py::test_s3_server_post_to_bucket_redirect
-		tests/test_s3/test_multiple_accounts_server.py::TestAccountIdResolution::test_with_custom_request_header
-		"tests/test_s3/test_s3_lambda_integration.py::test_objectcreated_put__invokes_lambda[match_events0-ObjectCreated:Put]"
-		"tests/test_s3/test_s3_lambda_integration.py::test_objectcreated_put__invokes_lambda[match_events1-ObjectCreated:Put]"
-		"tests/test_s3/test_s3_lambda_integration.py::test_objectcreated_put__invokes_lambda[match_events3-ObjectCreated:Put]"
-	)
-
-	# pytest-django causes freezegun try to mangle stuff inside django
-	# which fails when django is not really used
-	epytest -p no:django -m 'not network'
-}
diff --git a/dev-python/moto/moto-4.0.7.ebuild b/dev-python/moto/moto-4.0.7.ebuild
deleted file mode 100644
index deb2ce6bae60..000000000000
--- a/dev-python/moto/moto-4.0.7.ebuild
+++ /dev/null
@@ -1,92 +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
-
-DESCRIPTION="Mock library for boto"
-HOMEPAGE="https://github.com/spulec/moto"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-
-RDEPEND="
-	>=dev-python/aws-xray-sdk-python-0.93[${PYTHON_USEDEP}]
-	dev-python/boto[${PYTHON_USEDEP}]
-	dev-python/cfn-lint[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-3.3.1[${PYTHON_USEDEP}]
-	dev-python/cookies[${PYTHON_USEDEP}]
-	>=dev-python/docker-py-2.5.1[${PYTHON_USEDEP}]
-	>=dev-python/idna-2.5[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
-	>=dev-python/jsondiff-1.1.2[${PYTHON_USEDEP}]
-	dev-python/boto3[${PYTHON_USEDEP}]
-	dev-python/botocore[${PYTHON_USEDEP}]
-	dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/flask-cors[${PYTHON_USEDEP}]
-	dev-python/more-itertools[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-3.0.7[${PYTHON_USEDEP}]
-	>=dev-python/openapi-spec-validator-0.2.8[${PYTHON_USEDEP}]
-	dev-python/pretty-yaml[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/python-jose[${PYTHON_USEDEP}]
-	dev-python/python-sshpubkeys[${PYTHON_USEDEP}]
-	>=dev-python/responses-0.9.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.5[${PYTHON_USEDEP}]
-	dev-python/xmltodict[${PYTHON_USEDEP}]
-	dev-python/werkzeug[${PYTHON_USEDEP}]
-	dev-python/zipp[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-		>=dev-python/sure-1.4.11[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		tests/test_firehose/test_firehose_put.py::test_put_record_http_destination
-		tests/test_firehose/test_firehose_put.py::test_put_record_batch_http_destination
-		tests/test_swf/responses/test_decision_tasks.py::test_respond_decision_task_completed_with_schedule_activity_task_boto3
-		tests/test_swf/responses/test_timeouts.py::test_activity_task_heartbeat_timeout_boto3
-		tests/test_swf/responses/test_timeouts.py::test_decision_task_start_to_close_timeout_boto3
-		tests/test_swf/responses/test_timeouts.py::test_workflow_execution_start_to_close_timeout_boto3
-		# broken code (local variable used referenced before definition)
-		tests/test_appsync/test_appsync_schema.py
-		tests/test_appsync/test_server.py::test_appsync_list_tags_for_resource
-		# Needs network (or docker?) but not marked as such, bug #807031
-		# TODO: report upstream
-		tests/test_batch/test_batch_jobs.py::test_terminate_job
-		tests/test_batch/test_batch_jobs.py::test_cancel_pending_job
-		tests/test_batch/test_batch_jobs.py::test_cancel_running_job
-		tests/test_batch/test_batch_jobs.py::test_dependencies
-		tests/test_batch/test_batch_jobs.py::test_container_overrides
-		tests/test_cloudformation/test_cloudformation_custom_resources.py::test_create_custom_lambda_resource__verify_cfnresponse_failed
-		tests/test_cloudformation/test_cloudformation_stack_integration.py::test_lambda_function
-		tests/test_events/test_events_lambdatriggers_integration.py::test_creating_bucket__invokes_lambda
-		tests/test_sqs/test_integration.py::test_invoke_function_from_sqs_exception
-		tests/test_sqs/test_sqs_integration.py::test_invoke_function_from_sqs_exception
-		tests/test_s3/test_server.py::test_s3_server_post_to_bucket_redirect
-		"tests/test_s3/test_s3_lambda_integration.py::test_objectcreated_put__invokes_lambda[match_events0-ObjectCreated:Put]"
-		"tests/test_s3/test_s3_lambda_integration.py::test_objectcreated_put__invokes_lambda[match_events1-ObjectCreated:Put]"
-		"tests/test_s3/test_s3_lambda_integration.py::test_objectcreated_put__invokes_lambda[match_events3-ObjectCreated:Put]"
-	)
-
-	# pytest-django causes freezegun try to mangle stuff inside django
-	# which fails when django is not really used
-	epytest -p no:django -m 'not network'
-}
diff --git a/dev-python/moto/moto-4.0.8.ebuild b/dev-python/moto/moto-4.0.8.ebuild
index 9ba8c0407e14..775ad55a60a1 100644
--- a/dev-python/moto/moto-4.0.8.ebuild
+++ b/dev-python/moto/moto-4.0.8.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/aws-xray-sdk-python-0.93[${PYTHON_USEDEP}]
diff --git a/dev-python/mypy/Manifest b/dev-python/mypy/Manifest
index 0e88514877f4..24676c67c6a7 100644
--- a/dev-python/mypy/Manifest
+++ b/dev-python/mypy/Manifest
@@ -3,5 +3,5 @@ DIST mypy-0.981.gh.tar.gz 2628442 BLAKE2B 484ba2da1e3c8988ce4bfa7681592b6ca4f409
 DIST mypy-0.982.gh.tar.gz 2629381 BLAKE2B 84429715255febd3fb9b2b313c7ba20ca54a73aa26fd908c1f4c7be40854052a2e40babf333bbb39fa30e7de14e0eaefd6f8d301cc2cb721b47acf034b268212 SHA512 524565f40a0c13fc640c26a345dccfbcb4d777ba8a96933771263d2fcb2f02b4405ca3afd02d886e2894dc06b9aa476ea8c3a35cbae856cabecdcfa43f3494f5
 EBUILD mypy-0.971.ebuild 1768 BLAKE2B c9adf0f3b1706821722be1c77370052585e7ee5aeabe44f0903c74e71163de44358ac985a0c251217bee8c657944370842c31a4e3042ce270cf12beacc0f2110 SHA512 fe5abaa26482495522c4c958d6ff71248a72edc7ac51b2fa2b4b3dd9ca4ef83d1f9e476120d7fda83a864117f0b4420eeece7bb505c87dd5f00b753c2790f945
 EBUILD mypy-0.981.ebuild 1776 BLAKE2B c4b1c7abb905623121763a2f44fbb8a422a9d1cb0c6c558e858ddaaa3b1d75aee0b947f74e003d1ada49a7611ae45e22832b4999e89f39ad39cb7957ac7ceab2 SHA512 dc244b629eb8f0aaa59a6e43a8b78850bc1d4e703dd672961a828c4cfbc03d93a5bcf5d6b2a455e8783d8fbb3fb9f626a694c70d1920445f393d90c9da805a27
-EBUILD mypy-0.982.ebuild 1769 BLAKE2B 817a23222b4494c31e11e25987fa9a117e417a3a9f225d0d91cd127872fe4e945a0561e89e9b539720c4e7dc909bbb76aa8dcf4570ba4827a8fb6d82c35195fe SHA512 e460f0b7567ab596beb49df9e29d5ef9c24b9a8e30ce3953fcbdd40c5770a427a3cd8a747cc76f3e860f3b5a0b8c6e0c997f81afea2aaecfc4a8ae3671954315
+EBUILD mypy-0.982.ebuild 1768 BLAKE2B c9adf0f3b1706821722be1c77370052585e7ee5aeabe44f0903c74e71163de44358ac985a0c251217bee8c657944370842c31a4e3042ce270cf12beacc0f2110 SHA512 fe5abaa26482495522c4c958d6ff71248a72edc7ac51b2fa2b4b3dd9ca4ef83d1f9e476120d7fda83a864117f0b4420eeece7bb505c87dd5f00b753c2790f945
 MISC metadata.xml 515 BLAKE2B 75827bbbeb70fd4b9295ab4689068d2d4b686b32d4059acde94fb0d08048e9e56ecaf3eec39dc5567b2753e2552353e273cdf2f4e27d077cc9b03320ee09c64b SHA512 c1c3c7a3651e61e0b63ab4462f0370cce9cbdce33e64c5e7a1fbefe8116d5d3d3b35bc4095d8a5ce28caf69b0644af3f13c9a27b683f2f981e52f8bfe4ac8615
diff --git a/dev-python/mypy/mypy-0.982.ebuild b/dev-python/mypy/mypy-0.982.ebuild
index 8ce7281abdea..f718220e2b03 100644
--- a/dev-python/mypy/mypy-0.982.ebuild
+++ b/dev-python/mypy/mypy-0.982.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 # stubgen collides with this package: https://bugs.gentoo.org/585594
 RDEPEND="
diff --git a/dev-python/myst_parser/Manifest b/dev-python/myst_parser/Manifest
index 5b940dbcee86..ad3bfd8220ec 100644
--- a/dev-python/myst_parser/Manifest
+++ b/dev-python/myst_parser/Manifest
@@ -1,5 +1,3 @@
-DIST MyST-Parser-0.18.0.gh.tar.gz 768448 BLAKE2B efb5d1907b5779b1816f1cc4fd5ede9543cf246e4029f4bf6d763a8aacdf54b5c8c5efa2fea61de4bf257f5979871409ee907b3349cdb4f099ac689131d0805a SHA512 919494467de3f0cd97c9c8062626b88c22fd0596e120b7ca117b8bce18d9fad9faf06a36e4c5bd8a4dad838c888524c780beceaf3e7acb42232bd3c903fabc3f
 DIST MyST-Parser-0.18.1.gh.tar.gz 769288 BLAKE2B 77f21ae4277ef4ed9020caad86ef3ea92a1efca35f7ab61203fe2125e4fab31a74a740db7a1f1d6ea0a576c24706b0997beea296d782eb5a07ba4e91a0a9e52d SHA512 4bc3a89480f175779da4f093aaa99a1516f76ab4107dcf8747b6614f347e91739f8596693f95529d76aedbb0c84b4efde4262517bc445aa7027d51e05e8b48bc
-EBUILD myst_parser-0.18.0.ebuild 1638 BLAKE2B 41484415538ea918208eec1368535a9a19a40bb893c307b3868b83ab8c8b1299e1abf15d115595ffc1627f8635287ae65157358d6bdec9a81d76a47715fd85e8 SHA512 d281d6a118b47bf44916090e980a0de12483a283b68f6294773482a035f47e8af3948203b69152c06ba3f3a129c406a7257de9dcd52a9d3f818993fe960b030e
-EBUILD myst_parser-0.18.1.ebuild 1663 BLAKE2B 5f861d9e2e21aca06b879932713e00370646d548f5e41467a3e17d305b5f69879df4908132bab0b87bcf47dd3b0e6ff17dd2569375af5b8b2aef2e31b603064f SHA512 db1317a12ad9756ffd3afaec8ba15c5e240a16f057b99b136325a5c938ac82d2b714018129bde904526e53e9bf6028978841c2d7414047f043fbcd777d3ba8ee
+EBUILD myst_parser-0.18.1.ebuild 1655 BLAKE2B b938764fcc6a5ac6619ca3f141fd8e8380ab8a7c0908407528b544d0e2f89cef482f5e2932c3030fdea2a49c1c78c4104be02f6f92b3db49c760796fc85012ce SHA512 644366535ea3c7602bacc8774dd176c87487cf2cfcc747cfa5dde52ca95b39667c4ff3fcaf4b0b504b55235b2e8d415e957312721d3ce8517444ccd1a627076d
 MISC metadata.xml 406 BLAKE2B d8a974be3dd4fef4800958dcb1eef3124dc8e3ec49e6678d0db7d6096ef290019aa025796c4f7c38bc11b750d1667ba97d4429b64e7271009da707cd945e113f SHA512 acdc27a39e068c487306002342b9c0c5910d61ed34a7b62878272054ea458d5aad46fe24095a52666ed77ffcb6e703687cc83de0c9e2cef395a1decf9003d918
diff --git a/dev-python/myst_parser/myst_parser-0.18.0.ebuild b/dev-python/myst_parser/myst_parser-0.18.0.ebuild
deleted file mode 100644
index 7217c0a65cc4..000000000000
--- a/dev-python/myst_parser/myst_parser-0.18.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{8..11} pypy3 )
-
-inherit distutils-r1
-
-MY_P=MyST-Parser-${PV}
-DESCRIPTION="Extended commonmark compliant parser, with bridges to sphinx"
-HOMEPAGE="
-	https://github.com/executablebooks/MyST-Parser/
-	https://pypi.org/project/myst-parser/
-"
-SRC_URI="
-	https://github.com/executablebooks/MyST-Parser/archive/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	<dev-python/docutils-0.19[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/markdown-it-py[${PYTHON_USEDEP}]
-	dev-python/mdit-py-plugins[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	<dev-python/sphinx-6[${PYTHON_USEDEP}]
-	>=dev-python/sphinx-4[${PYTHON_USEDEP}]
-	dev-python/typing-extensions[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
-		dev-python/pytest-regressions[${PYTHON_USEDEP}]
-		dev-python/pytest-param-files[${PYTHON_USEDEP}]
-		dev-python/sphinx-pytest[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# Unimportant tests needing a new dep linkify
-		tests/test_renderers/test_myst_config.py::test_cmdline
-		tests/test_sphinx/test_sphinx_builds.py::test_extended_syntaxes
-	)
-
-	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
-		# bad test relying on exact exception messages
-		"tests/test_renderers/test_include_directive.py::test_errors[9-Non-existent path:]"
-	)
-
-	epytest
-}
diff --git a/dev-python/myst_parser/myst_parser-0.18.1.ebuild b/dev-python/myst_parser/myst_parser-0.18.1.ebuild
index 7517360f01db..84101969e85f 100644
--- a/dev-python/myst_parser/myst_parser-0.18.1.ebuild
+++ b/dev-python/myst_parser/myst_parser-0.18.1.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	<dev-python/docutils-0.20[${PYTHON_USEDEP}]
diff --git a/dev-python/nbclassic/Manifest b/dev-python/nbclassic/Manifest
index 95937ca121cd..44d228e38959 100644
--- a/dev-python/nbclassic/Manifest
+++ b/dev-python/nbclassic/Manifest
@@ -1,5 +1,7 @@
 DIST nbclassic-0.4.6.tar.gz 19870837 BLAKE2B aba744557f6a87fd95669c0736c314714f2318abe65ed5ca0d5c4236245e27bfde52fe486e43a7369587103459598540e15738d002da859413f3f59d87f5358c SHA512 915265679194b8101ef7f11fd6a76cfa2c238d2b533f40bd3dd9f91b12488f9f5738a0f5ba06882a2898e231525a8b160506cb07f0c0837a64af6fdca1295065
 DIST nbclassic-0.4.7.tar.gz 19871431 BLAKE2B ea9b77c2676e4f70a6785b5cceaed6f233346cbc878c83e14faf23c50d4340106df0f84ee3a20bfab3f02daae5b10123ef6cc83e4d147f5d63017f02a463df1b SHA512 19ffff062fe24316e658af253210fd683b4a950b5913e978eeb98af42e76ce4c1d4dcf164c499d20814c2fe2bd9b1fcd7d09c513e71cc75615cc378f00308556
+DIST nbclassic-0.4.8.tar.gz 19875247 BLAKE2B f6a4ff226ebd7c39fa657e06c1854e24ef7e50e893cc1a0b52c0cef194f8638b26a3b4a74d6d4077c055470bf1a7895995e184f3678b1157813981223631f6a6 SHA512 a0b6cc7823da3e7bd3ae7627994fd6a0e79adcc201763e6597e41d0f2a1fe287edb38903e4240702a34e20bd5e3c32c5460ca3b3355f59585bd2aa8dc46276f2
 EBUILD nbclassic-0.4.6.ebuild 1365 BLAKE2B 6ce00344631b81b707e2f5a3b57b7a3ea5a3dfe17ef58375b6e7d272e45f29167da126539e1ded1742156d1921057c3e2874c340b487d7529b20adb011826867 SHA512 f22a877c92f36157ba56682a1d139685001f6c5b42d31ae8097b3fc7dc2905b2db7e6b0ebec5754879408f9ee6de06065e7cee02547cf476adbbee87ec8e27d3
 EBUILD nbclassic-0.4.7.ebuild 1365 BLAKE2B e090def58b1c10f998aa16049b0a9807bb6384182ed5e7e341c26b47bac73c6dacbf977a1add0865ea50fda0089eed085e9dfef4a4752d32a5a00d82b3faebe2 SHA512 332b7e6e8c6854e0dcf3818b7c2953fd12f797928b6eb80a0477211a7577575987b23cc85d1d6ea3b22f600f173eb989cfa7cfde0c2699a1edb0e9ed1e98151d
+EBUILD nbclassic-0.4.8.ebuild 1365 BLAKE2B e090def58b1c10f998aa16049b0a9807bb6384182ed5e7e341c26b47bac73c6dacbf977a1add0865ea50fda0089eed085e9dfef4a4752d32a5a00d82b3faebe2 SHA512 332b7e6e8c6854e0dcf3818b7c2953fd12f797928b6eb80a0477211a7577575987b23cc85d1d6ea3b22f600f173eb989cfa7cfde0c2699a1edb0e9ed1e98151d
 MISC metadata.xml 407 BLAKE2B 8be751d3f2e0e1e2952c39cd1846285ebb994d833022767dde609294ee9f98044b1189934e7d27c3134b1f06c95705687491dbf52739bdd0bc17f06cfdff53cf SHA512 6cc07376da4e55e5df153fdb0f43371ed415bed6db1bce2f67dd113d1e0f1994974dd6bee746021efb2d8c36ca2ca534109227c541d38b37b652a68b9642f2cb
diff --git a/dev-python/nbclassic/nbclassic-0.4.8.ebuild b/dev-python/nbclassic/nbclassic-0.4.8.ebuild
new file mode 100644
index 000000000000..941985dcdd52
--- /dev/null
+++ b/dev-python/nbclassic/nbclassic-0.4.8.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+DISTUTILS_USE_PEP517=jupyter
+
+inherit distutils-r1 xdg-utils
+
+DESCRIPTION="Jupyter Notebook as a Jupyter Server Extension"
+HOMEPAGE="
+	https://jupyter.org/
+	https://github.com/jupyter/nbclassic/
+	https://pypi.org/project/nbclassic/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/jupyter_server-1.17.0[${PYTHON_USEDEP}]
+	<dev-python/notebook-7[${PYTHON_USEDEP}]
+	>=dev-python/notebook_shim-0.1.0[${PYTHON_USEDEP}]
+"
+
+# pytest-console-scripts seem unused
+BDEPEND="
+	test? (
+		dev-python/pytest-tornasync[${PYTHON_USEDEP}]
+	)
+	doc? (
+		virtual/pandoc
+	)
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs/source \
+	dev-python/sphinx_rtd_theme \
+	dev-python/nbsphinx \
+	dev-python/sphinxcontrib-github-alt \
+	dev-python/myst_parser \
+	dev-python/ipython_genutils
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest -p pytest_tornasync.plugin
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	# move /usr/etc stuff to /etc
+	mv "${ED}/usr/etc" "${ED}/etc" || die
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/dev-python/prompt_toolkit/Manifest b/dev-python/prompt_toolkit/Manifest
index dff4abf7d31a..452159076ed2 100644
--- a/dev-python/prompt_toolkit/Manifest
+++ b/dev-python/prompt_toolkit/Manifest
@@ -1,3 +1,5 @@
 DIST prompt_toolkit-3.0.31.tar.gz 418926 BLAKE2B 881aabcdf2d944e5b198533b1ec597945ff90a9a83f13aeaac3cf8ba5632c38aff23405fd0b4e30426151824041c5e3dffd1f5331a4101a1054a6f2ebf7e4afd SHA512 dccb0df339a498befbc756b40d5140662f20bf594f7b6a9314a156a1d16704f329b43a329cf979f8317a800363875aebe95569be69727b598b6e3f2af86eb591
+DIST prompt_toolkit-3.0.32.tar.gz 419599 BLAKE2B ad0ae1708e66b278d47813dc7cf04f2f79cb244a8f4f90ff5f26a971be868e781c2152c60ca9fa63b278edf3b9be173cde5487ca75d6c5df8f991ceb667d3da4 SHA512 f219c3318616092b50a2d7cb18b2876fd6056bf22e2ab420e0f723a9d800bbbe301840839acc9139d7f13f6ef633a05fe598b52c2f5fbed3ed22e7cfb102eb5b
 EBUILD prompt_toolkit-3.0.31.ebuild 630 BLAKE2B a8139ccfa57df8ca76765c6eee2f8093886492f5af3f841c2bac4d1ddf6e13673b679998859cafd11a08be5b3e6038b13e3fffcbe092e8caea22462bfbe18eaf SHA512 9f7f2ac3970c34812959aa86f7eac752e22351142b10cc29a6a3f225bd62347fa38d8b65dcd6cb384c0be2655ff81dd9af1284b2007868ba9ec689a72f1d93d5
+EBUILD prompt_toolkit-3.0.32.ebuild 638 BLAKE2B cc734c5e775ea74626f44ef53b979a576942c2f05d74b733a167ba956f630c6742821176b29874ede930f37bb5a84911da49a4e0c43722c26be58dfa0d73cdab SHA512 1c49d3dd336d913a80e4e49d93acdd397c9a890729deffadf9367f7683b008b5724a8969e05e8574932062d92b807b5cedb151a7ad6a18dc0fddc4923e31863c
 MISC metadata.xml 431 BLAKE2B 534336484c65b57df5e672729ff722b67445948e0485c3a62c2f7081724cb951b5157c600dc6162a3bb857c2be0f378b18670786279ff8b5cff2858588f8ebc9 SHA512 a9bf68326839069c61e70d4ef3fe304706f2543b9b91eb291566dd66f36d1abec00382ae205549a35f10dfc730f4613c5cc5c0ee4d6858538d50c4145bd3b15e
diff --git a/dev-python/prompt_toolkit/prompt_toolkit-3.0.32.ebuild b/dev-python/prompt_toolkit/prompt_toolkit-3.0.32.ebuild
new file mode 100644
index 000000000000..3e2881b39eed
--- /dev/null
+++ b/dev-python/prompt_toolkit/prompt_toolkit-3.0.32.ebuild
@@ -0,0 +1,26 @@
+# 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="Building powerful interactive command lines in Python"
+HOMEPAGE="
+	https://pypi.org/project/prompt-toolkit/
+	https://github.com/prompt-toolkit/python-prompt-toolkit
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/wcwidth[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pudb/Manifest b/dev-python/pudb/Manifest
index fbfabe6c67a5..3e1e571dfaa3 100644
--- a/dev-python/pudb/Manifest
+++ b/dev-python/pudb/Manifest
@@ -1,5 +1,7 @@
 DIST pudb-2022.1.1.tar.gz 218514 BLAKE2B 860e7a176d48a3a5424f86ec6dfabea70173b7e73ff3bc512e17c00ac3d7ff7e4f0a3b021e5ce1f38546643d035f4c567003b9808982e0fc4e49428cb08ae7b6 SHA512 0d098b2dac3442913ecf0827ed272dd57d6d03d44d6c67c6ddb8ef61bfc06f153e17aad60e5a0c17a490a675aba610b768289acf13ce9bc2603791b3c4012e4b
 DIST pudb-2022.1.2.tar.gz 219735 BLAKE2B fc2007b2be3a362d1198230815fd1642557c455ee0501e75784402ab88252e34806af1dbec20bc18f743b04b7133bde8466f48583d306002b341f3dececa62ab SHA512 73b9259a2ade953389d13b4e7df7179c54244700ffb1475e2fc5e3bb4a73259afa7b2b09a316aacbe47476fb6da3cf5b952cb082de51d6a953cd96a1eaf9cc4f
+DIST pudb-2022.1.3.tar.gz 220833 BLAKE2B 9d028db6b10f412989ec263b09738afad24a4bf1e0b03c772ef2ec939e4f014f4eca8f04f495b0c3a516d0f3241eee65334a161e7aff072dff436bd54f0a8bfc SHA512 0f70ac5bef61403119c3023c72bcf37ebba16d106c51d4f14321caa2ef5d13a2ddbd923aa650e64b6a57842a444226cf9ce02eed0bb023315a166018b0163b5a
 EBUILD pudb-2022.1.1.ebuild 640 BLAKE2B d80c719373bb866243e84fee2541d1d5d5248261b68a2d3897556ab91de76b90f74bb09dc00f434d63578d578e5cff086126201520e6b290fa3ed9b69bb543d6 SHA512 c87b03379bdbccc95b90cad95ca100f8aefc6243c1b9f3bfccbe850b5177e81e852102e2c4e18c2a075ce79fdd3c4e18c41efd399b6fb27b20fc818ff9d5b611
 EBUILD pudb-2022.1.2.ebuild 640 BLAKE2B d80c719373bb866243e84fee2541d1d5d5248261b68a2d3897556ab91de76b90f74bb09dc00f434d63578d578e5cff086126201520e6b290fa3ed9b69bb543d6 SHA512 c87b03379bdbccc95b90cad95ca100f8aefc6243c1b9f3bfccbe850b5177e81e852102e2c4e18c2a075ce79fdd3c4e18c41efd399b6fb27b20fc818ff9d5b611
-MISC metadata.xml 415 BLAKE2B e36096d9569f60ef1e2f1c412a4e17007880c5b3433545f3f7486532968a7502532f0ae614368d8bbc62f3f6550f08a63890d81a5ccf509db2047c0cdd9e6b27 SHA512 1c1de7a23e74095aa20edc4fe5de9c8c88eb5f3537d0bb0fcce345287170d77bf1f1b13fe17d5f100d71782c34940836f27a1778530af58312f3e22f21460dd6
+EBUILD pudb-2022.1.3.ebuild 640 BLAKE2B d80c719373bb866243e84fee2541d1d5d5248261b68a2d3897556ab91de76b90f74bb09dc00f434d63578d578e5cff086126201520e6b290fa3ed9b69bb543d6 SHA512 c87b03379bdbccc95b90cad95ca100f8aefc6243c1b9f3bfccbe850b5177e81e852102e2c4e18c2a075ce79fdd3c4e18c41efd399b6fb27b20fc818ff9d5b611
+MISC metadata.xml 467 BLAKE2B 0d5572a2387c3e0cc5df3c69f7774850a2d47ba8087440d3e803a9955e600bd25bd7702660013b01acdbc6874344bc017bdec76288d3805123b5f397d3e641d4 SHA512 c36b974a6494acfc8ac69bb7333920310391a1b6c4bf797f605a181583b2e36595d99c10764f0a0bd474118012f5aaa90f14d9718804d07b2c408f62dd347dfc
diff --git a/dev-python/pudb/metadata.xml b/dev-python/pudb/metadata.xml
index b4ac2b7f8b08..e18ea117d7bc 100644
--- a/dev-python/pudb/metadata.xml
+++ b/dev-python/pudb/metadata.xml
@@ -11,5 +11,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="pypi">pudb</remote-id>
+		<remote-id type="github">inducer/pudb</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pudb/pudb-2022.1.3.ebuild b/dev-python/pudb/pudb-2022.1.3.ebuild
new file mode 100644
index 000000000000..f321e07c4f40
--- /dev/null
+++ b/dev-python/pudb/pudb-2022.1.3.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="A full-screen, console-based Python debugger"
+HOMEPAGE="https://pypi.org/project/pudb/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/urwid[${PYTHON_USEDEP}]
+	dev-python/urwid_readline[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pyatspi/Manifest b/dev-python/pyatspi/Manifest
index 15124b138454..f1c9f2837c3b 100644
--- a/dev-python/pyatspi/Manifest
+++ b/dev-python/pyatspi/Manifest
@@ -1,5 +1,3 @@
-DIST pyatspi-2.38.2.tar.xz 318596 BLAKE2B aba5d4fbbc9e0ce4793843270394712e675e6546c781f0523f7f17a79f018fcf4cf209257e9ef0dc03cbe92be7a17c774fd82f2d9997d9aa8c6b6be65a72ef8a SHA512 03e10af5f0eb2ab89518229f049f497635ec1ae85a948a02813a5eb00eef395a3934f578b56054f8e73ae3c5c28760ad1f2b93e8876b8724c64b622d966aa5d9
 DIST pyatspi-2.46.0.tar.xz 324112 BLAKE2B 653e80be2d17f3246bb6bb60c2135f158185374c995ca37d4f132c90d0bf02b79cfcbc4f64d555c557e9f7fd1cf0720de2c5d177b303e35a84d8e4490ae2e660 SHA512 4e9d177c930db3ccb5aa41280e33a58b6700d9c45f08b6a2f32fce0ecf5f1faa3f91c57281a5661bb9ccaafd0935e90b44f328a62988ae838b4a008916d2aa0f
-EBUILD pyatspi-2.38.2.ebuild 1308 BLAKE2B 1cc1211a2ab3988d8de5ab2e8a69f7589dd23c1f7047589ccdfabd04456083a950fe63ddcc508f86a542295100aea720262f451e839b579521b0f4ee4a424b04 SHA512 dd6208aba13ecd5044af792ed5a4a0713595fa84309d922a8c21e3e65c76ad0f9a05d81d05c91cdea1db6588ac6ae753f9c259826e2593c382e92e463331d65e
-EBUILD pyatspi-2.46.0.ebuild 1321 BLAKE2B c6a1398b2f73cb6664985fc47cc7d520728d5a3c26b692c6e62e935333afcfce653d53a7f4c59d5aa5f03a64bf928cbe99de76a2d78b60a49ff5973725ddd3df SHA512 c3ae164c348a4c7c94c64822c8f1103c52cdfd5f1ced14616a1f0180ec99715a603afc765a9194b9bd72d6c47549ab3218e752f26c3903c7c26fd5ee4eb334d6
+EBUILD pyatspi-2.46.0.ebuild 1320 BLAKE2B 79c82acd3010670c934861b53247d0059acccb87b8f7d1361fba49c804c495a62ea70708913a1c37ff3dc50bee1d0579dcd74ef133937f56c7a08172e8299703 SHA512 b32ef9724d827b54f6d5082eea58ba8b318c27e380d96596383bf100387cfdd372bb164d8c1aede43cd49e1bf7cb413b51ca5d069001fd72992a732c702410c3
 MISC metadata.xml 349 BLAKE2B af48f6da9752ad965ab10c2bf3322d4321f084fc392c78e2c0fa1b48728f6b0f9e391b97ee9df9880fbba4c47ec798e0218f3800bb044ac8d9609066dc883580 SHA512 629ee6df4926ec37c3811388921ec024f7b1a50a819b74715dfac905b7830da3d7d64ae1886703b694049d06422d36e551d4296b2892cc43d60d45291d287840
diff --git a/dev-python/pyatspi/pyatspi-2.38.2.ebuild b/dev-python/pyatspi/pyatspi-2.38.2.ebuild
deleted file mode 100644
index 394c05e7d059..000000000000
--- a/dev-python/pyatspi/pyatspi-2.38.2.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit gnome2 python-r1 virtualx
-
-DESCRIPTION="Python client bindings for D-Bus AT-SPI"
-HOMEPAGE="https://wiki.gnome.org/Accessibility"
-
-# Note: only some of the tests are GPL-licensed, everything else is LGPL
-LICENSE="LGPL-2 GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv sparc x86"
-
-IUSE="test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="
-	${PYTHON_DEPS}
-	>=dev-libs/atk-2.11.2
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	>=dev-python/pygobject-2.90.1:3[${PYTHON_USEDEP}]
-"
-RDEPEND="${DEPEND}
-	>=sys-apps/dbus-1
-	>=app-accessibility/at-spi2-core-2.34[introspection]
-"
-BDEPEND="virtual/pkgconfig
-	test? ( x11-libs/gtk+:3 )
-"
-
-src_prepare() {
-	gnome2_src_prepare
-	python_copy_sources
-}
-
-src_configure() {
-	python_foreach_impl run_in_build_dir gnome2_src_configure $(use_enable test tests)
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir gnome2_src_compile
-}
-
-src_test() {
-	python_foreach_impl run_in_build_dir virtx dbus-run-session emake check
-}
-
-src_install() {
-	installing() {
-		gnome2_src_install
-		python_optimize
-	}
-	python_foreach_impl run_in_build_dir installing
-
-	docinto examples
-	dodoc examples/*.py
-}
diff --git a/dev-python/pyatspi/pyatspi-2.46.0.ebuild b/dev-python/pyatspi/pyatspi-2.46.0.ebuild
index 42cbb58777de..11ad93a31dcc 100644
--- a/dev-python/pyatspi/pyatspi-2.46.0.ebuild
+++ b/dev-python/pyatspi/pyatspi-2.46.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Accessibility"
 # Note: only some of the tests are GPL-licensed, everything else is LGPL
 LICENSE="LGPL-2 GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv sparc x86"
 
 IUSE="test"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/pydevd/Manifest b/dev-python/pydevd/Manifest
index a6bc59edf7d5..1500614d7a47 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 2537 BLAKE2B cf43ecefe8131dc207aaee877d03bbcfeca107fea847a7417767e84b3fd3fbfacd42f755e40d7cf9649462fb31d5c28bf74c9b1cd2e9cbcfa418cc697e646a13 SHA512 8490535cfec5ddf143ea071db7a8b918208e7f3ac5daa7bf5625bdcd822982f8859946f8c8e34fff1740963e9ba900f4d3421197ece2a31e0a3be5c70a5f12a9
+EBUILD pydevd-2.9.1.ebuild 2536 BLAKE2B 71855b244952a3b34acdb715c472982d0bf5bdc9e9570da67f2d7b1d59f5d0ec6dfa3f53a5b4cd193d9405f56d9addb05f27b7cac1b8c8b855298c63cd121ca8 SHA512 52697d6a2e8d904d43f2749b76fad5490058e7a8a433a4e3b925a5cc2aee71dbd29e36ef15d9e7b15ea3aa88676124aa61408b0e08413c8554f41031d023b6f2
 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 b781a2edee09..c784fce3bf06 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/pyfuse3/Manifest b/dev-python/pyfuse3/Manifest
index 772bdeb84dba..a4c9068ab644 100644
--- a/dev-python/pyfuse3/Manifest
+++ b/dev-python/pyfuse3/Manifest
@@ -1,5 +1,3 @@
-DIST pyfuse3-3.2.1.tar.gz 509083 BLAKE2B 16ada8aec47d8049907ef2710e9bfdf7991a8127560e7264e4eb58f7062efde478d2914597333991be4a6ef67a2a83c470560456287c1298b2008454ac831fb0 SHA512 468ef4cf9e2caef346a108f481a4c6dca8909ff3ea5aed11187df4c70c72c6180af9004348d25648368598495e5a5d9be2ba95d37f4d6d8a8c982f4893471b04
 DIST pyfuse3-3.2.2.tar.gz 510868 BLAKE2B a6f11083a3ddec031fdfe5cb810be526cba26d7bc9599a64d28e9a45281aeb04fca8728ff3788e44f1736475c89e64c3c1fd7cb964ff81fc30ce441a5dda7fae SHA512 91787c4198592ff5f0c022141e6c3cb1701108a6635b4d26347c4f7efff2a83aec206e939b44879ad1fd5c6c85aa6731b7465c998ec55ec032a6db024ffee817
-EBUILD pyfuse3-3.2.1-r2.ebuild 809 BLAKE2B f8aafadf8bb2b7d878effce64315ed4ae9f325b3ae306f9413b89d2e7abeaade638bba1ab73764aa286e52ed3c5c2459f3a9b91282d56ea871b52b4b809ff434 SHA512 80eca650efa91feb083f50613f8df7e96623d03f07e1f6e35fad63234468e3266eb273b04d8eac1072af004d213ac074e4af6f513e9fabda18a6be0d6c5d82a6
-EBUILD pyfuse3-3.2.2.ebuild 767 BLAKE2B 1f22d02b6141c653bc03742829315ef0c888358e6697ddb4d1bec3a306a7bdddd78db5b545c57e72d079e5cdfdb823cf4e490f56b9e5438562559e2beb359f85 SHA512 82a18c9e08faa1fdf7fca942fa060ef6c5e5245cc2abdb62f28527820ca4a46e446cd613a4dd97ced087fcfec2925183849b4d07d275bb2241ffd4b3dbc012a6
+EBUILD pyfuse3-3.2.2.ebuild 766 BLAKE2B 9456ff03b1cb857a8b24ef9267c2fb52e6fa128086c1757b11fc38890a6e069779b67c84513a99debf5862bef81b9065245dbabde87a12c476176d98db5ec810 SHA512 302792b199b3b253c75997749449e8de3360bc93df894a22934e7cd51d39a030407d91bb41a901666aed27b397250e0b80ef607ab1012bdb8fd15f6f2786105a
 MISC metadata.xml 378 BLAKE2B 1eab581597bf836c57f06347fbe9f5abea4aabffef115536e20a7ffc598e0c124197bc6edaa79c92158f1b5339a465d584501705f1f4d26857b92b2cbd518778 SHA512 7893dc5830a0707d32e907d133cb5e2a6f86bb531c31f71926790d6ad9704c9dc85693ef91aa19a5c4ce755956400c8b5d97882ae4a9f52c2d19f64e06f3bcd9
diff --git a/dev-python/pyfuse3/pyfuse3-3.2.1-r2.ebuild b/dev-python/pyfuse3/pyfuse3-3.2.1-r2.ebuild
deleted file mode 100644
index 9e7085bab560..000000000000
--- a/dev-python/pyfuse3/pyfuse3-3.2.1-r2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Python 3 bindings for libfuse 3 with asynchronous API"
-HOMEPAGE="https://github.com/libfuse/pyfuse3"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
-
-CDEPEND="
-	sys-fs/fuse:3
-"
-
-RDEPEND="
-	dev-python/trio[${PYTHON_USEDEP}]
-	${CDEPEND}
-"
-
-DEPEND="
-	${CDEPEND}
-	dev-python/cython[${PYTHON_USEDEP}]
-"
-
-BDEPEND="test? (
-	dev-python/pytest-trio[${PYTHON_USEDEP}]
-)"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	python_setup
-	# Shipped pre-generated .pyx do not work with Python 3.10.
-	esetup.py build_cython
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/pyfuse3/pyfuse3-3.2.2.ebuild b/dev-python/pyfuse3/pyfuse3-3.2.2.ebuild
index 26f744ab47b3..f139c59f8553 100644
--- a/dev-python/pyfuse3/pyfuse3-3.2.2.ebuild
+++ b/dev-python/pyfuse3/pyfuse3-3.2.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 
 DEPEND="
 	sys-fs/fuse:3
diff --git a/dev-python/pyopenssl/Manifest b/dev-python/pyopenssl/Manifest
index 90b1d7a49d37..74b40ed6acfe 100644
--- a/dev-python/pyopenssl/Manifest
+++ b/dev-python/pyopenssl/Manifest
@@ -1,5 +1,3 @@
-DIST pyOpenSSL-22.0.0.tar.gz 178438 BLAKE2B d34c91a54aaf6b28d92ba83c26900fb308835512275267e11a5482ede4ab45177434559a53c64a116aa19c84d65dcdb459aecd3fc5587cb13e21cd2f196a0078 SHA512 3d7695f27b7909eb82f05527ab7551fe90a85a70f20ea980293b59672a62f9b015966180407fa0786e94b01ad1d1acfaa7d40426bb63410efd24a144e559e2f0
 DIST pyOpenSSL-22.1.0.tar.gz 181704 BLAKE2B b10a8db111726c5f6626cae670a04af73cc1856a3084d3ca683fcba942724e99e5bd4ab6eb7dc4eb02ea4c6f14aa21f7744020aae1532145e1db24dbe58976cd SHA512 7cccb48cbb1655414d21c5e66e7defee7ec370cb6b46294ae0307208f9a9bc13708345b2c088a43292262f5d5bb3d45241c18ae66d2ad6824046ffe30f0c707e
-EBUILD pyopenssl-22.0.0.ebuild 1528 BLAKE2B 1ee2fa81f0d398cc094bde03512dce68da3b4c8ae84954f46dd0edd4adb0a698640fcdb3e40d131793ccd5f0d7c29b41634a574b0c8cb9cb54cbe4422e57c8ac SHA512 d15a5002a68204ef0c32819fa2adea72157fc777b0c60ebd9f9a5c275843d74e2ddcfc10390eb3c3ff92fd054b36dd6156db13e9621a047ecebee1fd12a17ce3
-EBUILD pyopenssl-22.1.0.ebuild 1578 BLAKE2B 5c7d152b0d3ff5d2ca5fd4a1dbdc267f53f760300543806bedf13c07dd34ac986f594cc65b766dbe0935ee8085f3220bee6d7c6630374aca192574c75897451c SHA512 b037161a28d8621c2131f15b557e74d5336ab89539114880a38e3e04767c840dd9b74b5ec3e1efa25cd188119b07d3654376f951212112b3c6ca2708f98d986d
+EBUILD pyopenssl-22.1.0.ebuild 1577 BLAKE2B d2bf932efb8942de52324b517dc107a3a5d742748e2c74e0bd3143b336a86e3cb1e17b33c15f5e8715ced855ef08bf3c951a1a74726ac03c00db20eac169abfc SHA512 a62279db28bf988b9fe1e327b2c4def1c4ac8838c02a1ef82e6f9355a2af550306d43a1c7794a7e9dad72dca4dc24188620837396b118ff85f2c6229fff7207d
 MISC metadata.xml 536 BLAKE2B 86db822042b6fb3e965ece87b6b15dcabf76cdfbfa76ba285a491208ad5c6a2a196ca7144a1a73b152decc4df1641ad4c57a1cbde9f90d09d25eef1f6f4da39a SHA512 996d0e20291e744c6c20b38fd750d242920541aca7d92de63ca5b1dcc2f1c10308545797ccf499f38e50dfd04db2bb031e93b02c7c1705908f2363c813294ff1
diff --git a/dev-python/pyopenssl/pyopenssl-22.0.0.ebuild b/dev-python/pyopenssl/pyopenssl-22.0.0.ebuild
deleted file mode 100644
index 6da2c0e6e934..000000000000
--- a/dev-python/pyopenssl/pyopenssl-22.0.0.ebuild
+++ /dev/null
@@ -1,67 +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 toolchain-funcs
-
-MY_PN=pyOpenSSL
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Python interface to the OpenSSL library"
-HOMEPAGE="
-	https://www.pyopenssl.org/
-	https://pypi.org/project/pyOpenSSL/
-	https://github.com/pyca/pyopenssl/
-"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/cryptography-35.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/cffi[${PYTHON_USEDEP}]
-		' 'python*')
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/pretend[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx doc \
-	dev-python/sphinx_rtd_theme
-distutils_enable_tests pytest
-
-src_test() {
-	local -x TZ=UTC
-	local EPYTEST_DESELECT=(
-		tests/test_ssl.py::TestContext::test_set_default_verify_paths
-	)
-
-	# test for 32-bit time_t
-	"$(tc-getCC)" ${CFLAGS} ${CPPFLAGS} -c -x c - -o /dev/null <<-EOF &>/dev/null
-		#include <sys/types.h>
-		int test[sizeof(time_t) >= 8 ? 1 : -1];
-	EOF
-
-	if [[ ${?} -eq 0 ]]; then
-		einfo "time_t is at least 64-bit long"
-	else
-		einfo "time_t is smaller than 64 bits, will skip broken tests"
-		EPYTEST_DESELECT+=(
-			tests/test_crypto.py::TestX509StoreContext::test_verify_with_time
-		)
-	fi
-
-	distutils-r1_src_test
-}
diff --git a/dev-python/pyopenssl/pyopenssl-22.1.0.ebuild b/dev-python/pyopenssl/pyopenssl-22.1.0.ebuild
index f0ad0f011dfa..ed28d3d8ec5f 100644
--- a/dev-python/pyopenssl/pyopenssl-22.1.0.ebuild
+++ b/dev-python/pyopenssl/pyopenssl-22.1.0.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	<dev-python/cryptography-39[${PYTHON_USEDEP}]
diff --git a/dev-python/pyscard/Manifest b/dev-python/pyscard/Manifest
index 3911478c4229..0fed03ab348d 100644
--- a/dev-python/pyscard/Manifest
+++ b/dev-python/pyscard/Manifest
@@ -1,5 +1,3 @@
-DIST pyscard-2.0.4.tar.gz 150740 BLAKE2B 07849c265bfc764dd227bf041add7d24045f8f6669b596307d8a8644c847ee04a868b7df8e69139dc4d65f10b0406ef0083b833ed9e9dca5f11cb5d662d30801 SHA512 6eaae051f22079a73546c78f749dbeedaeee5f776e3f1718cf5ced3ed276d061e2210e2882f74bcaf75de9048fa8f512606a1b4ea0c0d4ecd0a5d6aeac482bc8
 DIST pyscard-2.0.5.tar.gz 150803 BLAKE2B c7d5ab17c3471b050a321c687e5faf33b5faad5a1afc60462b759280cff31bc55d86decdcb16dda9a4afe47848bc06f303c9697941dc212f01b28db6a8469a5e SHA512 bb2ef725e7dccefa640fe1568d1fee016bc5c639769d1b0d099067108e1369b8f7ccd3e48f985d657c5c7c33730eae891624f2c0ee2deaed491826b8c0eae2a5
-EBUILD pyscard-2.0.4.ebuild 789 BLAKE2B 52df9e501dbec8dbaf0fdb62e3ce2c185cc4dcb3d055112742cb0b1709991efbf75df91ca423b3a6818b9823381898296e100fbf601149e2b9ab912c112a521d SHA512 72ca54672141d40f36d734d31b1a878eda3ed7c1468055cc4d475566bada4b33248c9f66f1a4998ae90b65c21fa955559cc6f19ffbc5ec5134fcd82fb228a5ee
-EBUILD pyscard-2.0.5.ebuild 802 BLAKE2B c5c29d8ebca5482fe470c8e0227487248c351123fc4a854e36a9203239df1c571bb0fb7c5ec1be123ecda9a4802ff5807e884c3e4bad9f30746214e05fdb2936 SHA512 65efda4a87ddbbe8951d919247fce5f92d7fc4249742d6805fc1aefa2093f7973395f133ad119b9014b75f71aa98ea6f186782cd8133da1e7553584062487229
+EBUILD pyscard-2.0.5.ebuild 801 BLAKE2B 9ea961e76bf6200322d36bbe67e73c2db40509a2d7ac30c806d8fdc284da1bb80d43aba1728ed25913566be675036e76cf3f4fcc762df032665bc295f286a14e SHA512 4af599c62fd4313ee3e69d531b11c70025b619646378df4573ebc69aad6d4bc9a669223c596b54cd3ccb1d0df91bc5d67058c5cb34914170a081847a9f5872b1
 MISC metadata.xml 426 BLAKE2B a4819bd37d610cf785d4b0e5ba2a709c941000d5cea8e20c8d49e513e7167b55e8e149da9e318281dce7b4eb92cb61e355054c273e3758262c6c25a0757ffba3 SHA512 82e759791154362704f4d7a1a1c72d53710e405c21bf791d0ec609ddfee4b8c04e3490a3f33f8d0e6e295f3b8433520f328dd71bc91cde2926a89a76803fd63d
diff --git a/dev-python/pyscard/pyscard-2.0.4.ebuild b/dev-python/pyscard/pyscard-2.0.4.ebuild
deleted file mode 100644
index 4a3457a0eb60..000000000000
--- a/dev-python/pyscard/pyscard-2.0.4.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=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Smart card support in python"
-HOMEPAGE="https://pyscard.sourceforge.io/
-	https://github.com/LudovicRousseau/pyscard
-	https://pypi.org/project/pyscard/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
-
-RDEPEND="sys-apps/pcsc-lite"
-DEPEND="${RDEPEND}"
-BDEPEND="dev-lang/swig"
-
-distutils_enable_tests unittest
-
-pkg_postinst() {
-	optfeature "Gui support" dev-python/wxpython
-	optfeature "Support of remote readers with Pyro" dev-python/Pyro4
-}
-
-python_test() {
-	cd test || die
-	eunittest
-}
diff --git a/dev-python/pyscard/pyscard-2.0.5.ebuild b/dev-python/pyscard/pyscard-2.0.5.ebuild
index e37af30c2471..241e1734a2dc 100644
--- a/dev-python/pyscard/pyscard-2.0.5.ebuild
+++ b/dev-python/pyscard/pyscard-2.0.5.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 
 DEPEND="
 	sys-apps/pcsc-lite
diff --git a/dev-python/pyspnego/Manifest b/dev-python/pyspnego/Manifest
index d5d3c40e3d04..1b7b613dc6b2 100644
--- a/dev-python/pyspnego/Manifest
+++ b/dev-python/pyspnego/Manifest
@@ -1,7 +1,9 @@
 DIST pyspnego-0.6.0.tar.gz 200621 BLAKE2B cb6b44ccfb87600c480f67ddae686a424ad75a7f16c8f78d3539159c523069b71c534a3dfb8ec06ee26b75261d87d54e8b96aaa2d0f477f2488438075d6212a5 SHA512 65f877a2fcff4671606063223d1499be19368040a0f70d0d9363dd84c0b09a195a5e6bc7da1d3745fbf81af822f20f3d903ca2a9372898a2973ba93b6661a708
 DIST pyspnego-0.6.1.tar.gz 200508 BLAKE2B e284b42da97919a63a5ff51687cdd0d8891492ab2e296686b88242fb4db6326ac56c5b04488e47be04764c75fefdf2a9073cc8983150f6d0e5d4819bd49fa86d SHA512 eab37ad3691da06e91221107483c2ae4504d4e7f3b7d288843387dbe2c8611b3839b6cf378b2418b977f835fc5a4ea4b9a8b9995d9ee07d25069fea05bc4b876
 DIST pyspnego-0.6.2.tar.gz 200586 BLAKE2B 9579a240d1826311f87431e39483222c6e28f00545b692abf71edbb9af410ad7fda9f3a305fd3f5338c8e51c6b2333220ea3bf2857011400f09be1a713c2e1c7 SHA512 f5b554d89455c1f2551f0edd3716700374e73ae7542aa8dba403f9c48ea358916f98c706f4a47ee53f34d41ff545813a24196f75349d40b3b5677c7eb29182ce
+DIST pyspnego-0.6.3.tar.gz 200723 BLAKE2B d8a56681ab76d2d131f078af4cbb686636802bb3d4ffa87d2656d7ee5f3f685936bca3cd03d6801a144d9950c877f0f5717f3f9bb430c5223c89bbcc81eadf38 SHA512 a9a3bf898a77748b5caf2010fef0969397d3b9c9e2e12c7ec6cc8649b476dcaed310259c009a09c33517488ddc15b2daf63b6cf074071e0a6b922a2dbe2e6f60
 EBUILD pyspnego-0.6.0.ebuild 959 BLAKE2B 0e327cdd2fb3d9e16f09f374bf0002b3395a009cf558b2935841781f2e778677802acf9d3176345a8b445b2ebd617c4307d72b7f53dcadddb7c01347125718aa SHA512 99ce279a54ff8dc4ff6eaadcf0850de1e91d764d6dcf5da30024168d27fd4dc50db7f70f7e222ba0b56fcd7ae74c7be0ee355dca68975fd42035ab979922ca4b
 EBUILD pyspnego-0.6.1.ebuild 962 BLAKE2B 4485e98511dc8b04baf037b35d29bb09f498161a2ad0754737ae15f7791eac27efae62ed8d1049038726f296c284acfe138b27ad8a24f050acebfdc3c1739170 SHA512 c9f62764d03e6baeb4ed3d01a7f1d816a017cf81f270fa36f4e3b6eb1bbdeee2f9e0f78328f344dbda2a252df979f732b904d060b4805de285607d412f74601a
 EBUILD pyspnego-0.6.2.ebuild 962 BLAKE2B 4485e98511dc8b04baf037b35d29bb09f498161a2ad0754737ae15f7791eac27efae62ed8d1049038726f296c284acfe138b27ad8a24f050acebfdc3c1739170 SHA512 c9f62764d03e6baeb4ed3d01a7f1d816a017cf81f270fa36f4e3b6eb1bbdeee2f9e0f78328f344dbda2a252df979f732b904d060b4805de285607d412f74601a
+EBUILD pyspnego-0.6.3.ebuild 962 BLAKE2B 4485e98511dc8b04baf037b35d29bb09f498161a2ad0754737ae15f7791eac27efae62ed8d1049038726f296c284acfe138b27ad8a24f050acebfdc3c1739170 SHA512 c9f62764d03e6baeb4ed3d01a7f1d816a017cf81f270fa36f4e3b6eb1bbdeee2f9e0f78328f344dbda2a252df979f732b904d060b4805de285607d412f74601a
 MISC metadata.xml 445 BLAKE2B 2d30af32987aa7118331cb4c199b44069f6a6efc62d73eab62a31b29308848b7f7e56e026327af6c2197ee31c05fbe1885524bba7b6a84cdc0d97cc58c5fb43b SHA512 c7bbe6f161ce61409f6865f998fb4c8bd77c39011f5bbd148379912e31805773a41451163517cb7ebef99a57d6abe8f13dcdc568408ce182c0def6adf35afc9c
diff --git a/dev-python/pyspnego/pyspnego-0.6.3.ebuild b/dev-python/pyspnego/pyspnego-0.6.3.ebuild
new file mode 100644
index 000000000000..372520083949
--- /dev/null
+++ b/dev-python/pyspnego/pyspnego-0.6.3.ebuild
@@ -0,0 +1,40 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Library to handle SPNEGO and CredSSP authentication"
+HOMEPAGE="
+	https://github.com/jborean93/pyspnego/
+	https://pypi.org/project/pyspnego/
+"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	dev-python/cryptography[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	test? (
+		dev-python/gssapi[${PYTHON_USEDEP}]
+		>=dev-python/krb5-0.3.0[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/ruamel-yaml[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+pkg_postinst() {
+	optfeature "Kerberos authentication" "dev-python/gssapi >=dev-python/krb5-0.3.0"
+	optfeature "YAML output support" "dev-python/ruamel-yaml"
+}
diff --git a/dev-python/pytest-shell-utilities/Manifest b/dev-python/pytest-shell-utilities/Manifest
index 0cfecc41f16b..acdc859b5ace 100644
--- a/dev-python/pytest-shell-utilities/Manifest
+++ b/dev-python/pytest-shell-utilities/Manifest
@@ -1,5 +1,3 @@
-DIST pytest-shell-utilities-1.6.0.gh.tar.gz 92343 BLAKE2B 39239aff1d7d4970a706926ea9f4c7808f8c12760d8f1ccaff760d8320024bba7373a25bb2ad8db2e0a6fee1f8ef4dd5b85b4e7eb1fb6e2aab64711686acf25e SHA512 e979f5bbf34de99c1dac33b4cb27265a210852d39792cd7660b717e43de0baaf47785d57ade226f08de43ef9d83600b4e46f70ceed341c7fccde554f7a838b8e
 DIST pytest-shell-utilities-1.7.0.gh.tar.gz 93366 BLAKE2B 95a04ec484c43f48d7d3e120e8bfef0ce9d31b6d119cbb1f3cde0a7db540e6fd98da88a32af921e5748577a46a28c43f7c83c9d3a3d1a33b7277e3ac5cf0dc56 SHA512 d59c1f04106eb2de6cf9f7ffe873344cf69691bd336c1dee6b328c083090f52479bbe4990c36e024b9f2a9c0817ba711343477574ae3ee5620643d5de8c57cc6
-EBUILD pytest-shell-utilities-1.6.0.ebuild 1059 BLAKE2B 3773f293ae220cb02022b176a9b8ecb40db0882a24a83dafc3bb20127b9bee34d51ab852bec57a95dc0dee7cf535b5eca86627b3893a8cc6257040b434180180 SHA512 0d4156a4b0617307a36e8c03f298f1103f6298cf3db4cad2a3417825fb6c92cd6e1f52bce7d4cf9c19fe5ccdbeb0d4a4aa82b849a491559b777f148717216d30
-EBUILD pytest-shell-utilities-1.7.0.ebuild 1060 BLAKE2B dbf61f75ccca64dd3a17d5211a43a1b14baab8772c529a29d868740da56c96be3a4b2ed2eb59488dd39aeed4a8df121eb59d907a981dcf6336b9b5b6f491e161 SHA512 d940739294642b9091c4623d3e94eee0663f02cd894f4a58e78e508c693248e337455a94de7c0dac8d80d88eca1122e8a7ea3d0a28e4c1a7fdd56ed0ae41074c
+EBUILD pytest-shell-utilities-1.7.0.ebuild 1059 BLAKE2B 3773f293ae220cb02022b176a9b8ecb40db0882a24a83dafc3bb20127b9bee34d51ab852bec57a95dc0dee7cf535b5eca86627b3893a8cc6257040b434180180 SHA512 0d4156a4b0617307a36e8c03f298f1103f6298cf3db4cad2a3417825fb6c92cd6e1f52bce7d4cf9c19fe5ccdbeb0d4a4aa82b849a491559b777f148717216d30
 MISC metadata.xml 436 BLAKE2B 8cb927224ae6ac36a59818b60f8b4ef4a8d1cc4ca284934f50fbcc957ac25a417307c533d6d3728f38e98977ace3cdb106b9b62abe10a9b843a42ecdb30c97e4 SHA512 505a9f97a74581b9c7f59862186db14ab2f543cadbd05424e32541f31ff0c88295b4ed0b6dfbfa53dec1208d16275fcf99cc72c6a51c95e7f07e5392804a09cd
diff --git a/dev-python/pytest-shell-utilities/pytest-shell-utilities-1.6.0.ebuild b/dev-python/pytest-shell-utilities/pytest-shell-utilities-1.6.0.ebuild
deleted file mode 100644
index da59796fdb8c..000000000000
--- a/dev-python/pytest-shell-utilities/pytest-shell-utilities-1.6.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="pytest plugin: fixtures and code to help with running shell commands on tests"
-HOMEPAGE="
-	https://pypi.org/project/pytest-shell-utilities/
-	https://github.com/saltstack/pytest-shell-utilities/
-"
-SRC_URI="
-	https://github.com/saltstack/pytest-shell-utilities/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/pytest-6.0.0[${PYTHON_USEDEP}]
-	dev-python/attrs[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	dev-python/typing-extensions[${PYTHON_USEDEP}]
-	dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}]
-	dev-python/pytest-skip-markers[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-subtests[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/pytest-shell-utilities/pytest-shell-utilities-1.7.0.ebuild b/dev-python/pytest-shell-utilities/pytest-shell-utilities-1.7.0.ebuild
index adbc19aa9a09..da59796fdb8c 100644
--- a/dev-python/pytest-shell-utilities/pytest-shell-utilities-1.7.0.ebuild
+++ b/dev-python/pytest-shell-utilities/pytest-shell-utilities-1.7.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/pytest-6.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/pyzmq/Manifest b/dev-python/pyzmq/Manifest
index 1cd013380648..e6c3b0181788 100644
--- a/dev-python/pyzmq/Manifest
+++ b/dev-python/pyzmq/Manifest
@@ -2,5 +2,5 @@ AUX pyzmq-23.2.0-libdir.patch 510 BLAKE2B cb7884416d3e15f735412d69a7ae0decbbf8ec
 DIST pyzmq-23.2.1.gh.tar.gz 402170 BLAKE2B 4cedd065cecbabc0e18928423e853a38953cd1f360fc326573c60bf69ffefadf3bed556d9d71eedf824e646ae23640d14b6aa8938c397c367be32cc36d300e38 SHA512 4ba236b87db062b245a04530de5b1e8385491107ae8de465f6f664c75ab8a929d57491eb3f8dddf31ff1db7b1eee89a6892a9a844bc285096cc9960704b36c9c
 DIST pyzmq-24.0.1.gh.tar.gz 404000 BLAKE2B 01928ba3c64a5afce8e7a97821658da2067a5f6c36c0173ab2f818e83a729939f346ef67bb9a39251abf365f5772abdf7e9e62afb4cc434b5603f474485a7427 SHA512 d4b6346e780f356941a624321f1619771fb2f0ef9f65a3c0a03e837ef081ece7ed59c03f57e8647ab1cd38cfc7404d597dd294768f9e9b890115b9eebc085484
 EBUILD pyzmq-23.2.1.ebuild 1935 BLAKE2B 855ac5336b9944d944924bfaaca47880004a19e0a47e540601709716b8e3499a36c70e72846cf86830d44c0155793641d9c3f598269b7b09a87663e9e2ac37ab SHA512 69105432699471bf11dfd0c47459ec56c0cf797b10da5b147d4d428f9d14b6a8424c3252fb824e2f30cccab98744434e8e42f676bf5175471a28809a1c13e620
-EBUILD pyzmq-24.0.1.ebuild 1944 BLAKE2B 69fcc814b485408c2d0a6135b94737299bb978d672f83afcdb3126ca8dbf31c145197f2f313b90f99feb5070a9337456a6ec6c075977ca123803b9ceb9421e32 SHA512 cad796b4d7ee38c66125898ada280f837e955c73409365b712d24d72069bab8505727c5723c7dcfdafb6e9f77690a1a7cebd0008829ec6524833494a08f452e2
+EBUILD pyzmq-24.0.1.ebuild 1942 BLAKE2B 4341699c88467650b6f0dded26f02b6ab83f9f7b54eb6bf7edc4b796105ca4115a491968fb49cd675ebf6ab40d32bac8162c5512ec8d840553a04403b8c7f56c SHA512 5852f87720ef0f6ec512ac7930cc4cb95ed6e2784fb7e76690c2b8eafa58c549808a2af2b9ee1e227217848b59708a0feed6eabc0513277b73c276e49c350cd2
 MISC metadata.xml 548 BLAKE2B 0120b82c6a48537f80d08237f4184ff855c109a0a461adfe7921e25468928ea053cc7727c7b00ff96ea556d719e453ee27cf534b285f24f62f7d1ca4ab326770 SHA512 124145f71518d39daa57522eadc27ab4782c3fc1794543396a6b6c91dda29175c4c097d6be90d7d405823621ce66f62e169b97e086c983d7f08178e6d85cee40
diff --git a/dev-python/pyzmq/pyzmq-24.0.1.ebuild b/dev-python/pyzmq/pyzmq-24.0.1.ebuild
index dde6977bbcae..676c86ae003b 100644
--- a/dev-python/pyzmq/pyzmq-24.0.1.ebuild
+++ b/dev-python/pyzmq/pyzmq-24.0.1.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="+draft"
 
 DEPEND="
diff --git a/dev-python/shiboken2/Manifest b/dev-python/shiboken2/Manifest
index df0cdb889905..2b5fcb5727da 100644
--- a/dev-python/shiboken2/Manifest
+++ b/dev-python/shiboken2/Manifest
@@ -3,8 +3,6 @@ AUX shiboken2-5.15.5-python311-1.patch 3124 BLAKE2B 97e51ae8cc6866da7ac9cced4f19
 AUX shiboken2-5.15.5-python311-2.patch 2056 BLAKE2B c93be29e31b0fa6ce28a29de0dc4dba9635e86ba0103d77334e324a0d26f4c81c9ee6583bef146eb908fe290426eb462dd0a0f68e917ca5f3c4505742d673a0f SHA512 df6f185546180b3d27d8ed1ec1ccf90cdf3813f8928894717ad02e97f0c404b8dc00aed330e8b51aa7e04d5b3e621a15981fc911b2371542f9266c147fdf3828
 AUX shiboken2-5.15.5-python311-3.patch 2363 BLAKE2B 84521be2008dda0fc9398dac2c6e235d0d976c3219f7ecf50f28938a7cce6952ec41795c2c86d0f71ccd94210661dc22a471adb2f879a133e11a3148923fd708 SHA512 540ff5afbfebcc00f20c43993f67458013f4655c06505fdf23bc26085bd2c621863dd9c28be1a20dca299113aee828974f853b145818fdb11d59fc12d0bb8c14
 AUX shiboken2-5.15.6-fix-pyside2-compile.patch 422 BLAKE2B bdb66c4ef26fccf4b9f4bc4586fb7ffdd8dfed80bf6315a70c86882f98250e42235ff27265b6c3a4e65e8dd7b233b61201a33808985ffb50e929bc8b5deb864f SHA512 4f608eb93fb72f81a9327699b14d4451261831f5079fac12aa88ce17ac30fc846bd9b461b8f6a4780727507b388f675a116f55ef1c240ced33d941315af4d21c
-DIST pyside-setup-opensource-src-5.15.5.tar.xz 3577972 BLAKE2B ee16ce18ec4103add41ad89b658012cb2e8695bda51269d3cd1614c2b6d029c0eaba5e592d5e58b6267e1ddc020a938d3ccd2fbc9461cc5bf202f3bdbf6b5d62 SHA512 61b987ec823e9a89f2a07a1991d47f36eb45e3ce416aa6e0032a58ba3d623ac26224cb0f43a2db76850bce7290d12fae610de06405350362caac7860ba99f0c3
 DIST pyside-setup-opensource-src-5.15.6.tar.xz 3580388 BLAKE2B 8a3b15d073bcbb0c6734f500ca906e56387cb8fc4bfcfd996304d71b54edd5f4568976049519ed26aa718bee9e43f59a0c4ef53837d5a341219b991a8527a800 SHA512 99a0c1a05e722cbf33128cf25742e61b92e151fdc05b79db9bafe778e024a0c6fc2886ee3d0b923ff681c55916f5c0eea4197f174432587fd662fba4390b26f4
-EBUILD shiboken2-5.15.5.ebuild 6563 BLAKE2B 455dc6f82e4269b6cf3f22574fe0a11c67caaa053ecff26b6b3ab2d1288f578fdca91e2d7ddedcdce0182bf3efd637f6514fb991fcd8b6abc4d40df76b5bba56 SHA512 850fdf59276270cb14fba754c9b405d1c4e2615970b9826ed4542822dc80e0a711efa8728f87dbfac5b3a3855a204be1af31c8ad0dce8083bc680cfb15e0f12e
-EBUILD shiboken2-5.15.6.ebuild 6694 BLAKE2B b770a43dd19d01834a3eb6d19f6aa5e1db1c8590b40d8ba38c9c4712aa6ba277e4f64af063f6effdcb9473ba1326e5012cf74ce3942b700fb9d9a39ab931465c SHA512 3c08e8a0bdc89a28cab545dbf6cd790181d4d86d325b9648912be18662982c920e0af1f87e94358a0543570fc5ab37487a008ee13acb6bb27059aecc35adc4a8
+EBUILD shiboken2-5.15.6.ebuild 6693 BLAKE2B af9bbbe6711442a1526f4db11cd6660f6d93b1a4997a120dd55cbf2e3911c8c4b00de4961b609f4761d293568a47f63cf0a9f70a67c11c5e730c9d14762b2d5a SHA512 be0131579e928a32450636db2b49c370412f0c7652216a7db2e16697f00e3f2afb938540a82b51b8350c9853c30d0dc98314ba5f007503f364aaca7686680750
 MISC metadata.xml 730 BLAKE2B 803b825adb9fcd4379b1e3fba57d6b1916a81ced12f3b3c7d3ddcd68a0c03e85fcf31d5b07a70deebe073f267fe93a0529f7ffb4b1a9508a2223894883044f3b SHA512 5a462077fee2bd3ac87ab79274be0a718fd9b273fca4946d2d2734cefdf5817e6b4dc478a828b3bc783c63e64a62a6662b482d61eefe57386c15f9703a57fb24
diff --git a/dev-python/shiboken2/shiboken2-5.15.5.ebuild b/dev-python/shiboken2/shiboken2-5.15.5.ebuild
deleted file mode 100644
index da9a5ff38955..000000000000
--- a/dev-python/shiboken2/shiboken2-5.15.5.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# TODO: Split the "/usr/bin/shiboken2" binding generator from the
-# "/usr/lib64/libshiboken2-*.so" family of shared libraries. The former
-# requires everything (including Clang) at runtime; the latter only requires
-# Qt and Python at runtime. Note that "pip" separates these two as well. See:
-# https://doc.qt.io/qtforpython/shiboken2/faq.html#is-there-any-runtime-dependency-on-the-generated-binding
-# Once split, the PySide2 ebuild should be revised to require
-# "/usr/bin/shiboken2" at build time and "libshiboken2-*.so" at runtime.
-# TODO: Add PyPy once officially supported. See also:
-#     https://bugreports.qt.io/browse/PYSIDE-535
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit cmake llvm python-r1 toolchain-funcs
-
-MY_P=pyside-setup-opensource-src-${PV}
-
-DESCRIPTION="Python binding generator for C++ libraries"
-HOMEPAGE="https://wiki.qt.io/PySide2"
-SRC_URI="https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${PV}-src/${MY_P}.tar.xz"
-S="${WORKDIR}/${MY_P}/sources/shiboken2"
-
-# The "sources/shiboken2/libshiboken" directory is triple-licensed under the
-# GPL v2, v3+, and LGPL v3. All remaining files are licensed under the GPL v3
-# with version 1.0 of a Qt-specific exception enabling shiboken2 output to be
-# arbitrarily relicensed. (TODO)
-LICENSE="|| ( GPL-2 GPL-3+ LGPL-3 ) GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
-IUSE="+docstrings numpy test vulkan"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# Tests fail pretty bad and I'm not fixing them right now
-RESTRICT="test"
-
-# Minimal supported version of Qt.
-QT_PV="$(ver_cut 1-2):5"
-
-# Since Clang is required at both build- and runtime, BDEPEND is omitted here.
-RDEPEND="${PYTHON_DEPS}
-	>=dev-qt/qtcore-${QT_PV}
-	sys-devel/clang:=
-	sys-devel/clang-runtime:=
-	docstrings? (
-		>=dev-libs/libxml2-2.6.32
-		>=dev-libs/libxslt-1.1.19
-		>=dev-qt/qtxml-${QT_PV}
-		>=dev-qt/qtxmlpatterns-${QT_PV}
-	)
-	numpy? ( dev-python/numpy[${PYTHON_USEDEP}] )
-	vulkan? ( dev-util/vulkan-headers )
-"
-DEPEND="${RDEPEND}
-	test? ( >=dev-qt/qttest-${QT_PV} )
-"
-
-DOCS=( AUTHORS )
-
-PATCHES=(
-	"${FILESDIR}"/${P}-python311-1.patch
-	"${FILESDIR}"/${P}-python311-2.patch
-	"${FILESDIR}"/${P}-python311-3.patch
-	"${FILESDIR}"/${P}-add-numpy-1.23-compatibility.patch
-)
-
-# Ensure the path returned by get_llvm_prefix() contains clang as well.
-llvm_check_deps() {
-	has_version "sys-devel/clang:${LLVM_SLOT}"
-}
-
-src_prepare() {
-	# TODO: File upstream issue requesting a sane way to disable NumPy support.
-	if ! use numpy; then
-		sed -i -e '/\bprint(os\.path\.realpath(numpy))/d' \
-			libshiboken/CMakeLists.txt || die
-	fi
-
-	# Shiboken2 assumes Vulkan headers live under either "$VULKAN_SDK/include"
-	# or "$VK_SDK_PATH/include" rather than "${EPREFIX}/usr/include/vulkan".
-	if use vulkan; then
-		sed -i -e "s~\bdetectVulkan(&headerPaths);~headerPaths.append(HeaderPath{QByteArrayLiteral(\"${EPREFIX}/usr/include/vulkan\"), HeaderType::System});~" \
-			ApiExtractor/clangparser/compilersupport.cpp || die
-	fi
-
-	# Shiboken2 assumes the "/usr/lib/clang/${CLANG_NEWEST_VERSION}/include/"
-	# subdirectory provides Clang builtin includes (e.g., "stddef.h") for the
-	# currently installed version of Clang, where ${CLANG_NEWEST_VERSION} is
-	# the largest version specifier that exists under the "/usr/lib/clang/"
-	# subdirectory. This assumption is false in edge cases, including when
-	# users downgrade from newer Clang versions but fail to remove those
-	# versions with "emerge --depclean". See also:
-	#     https://github.com/leycec/raiagent/issues/85
-	#
-	# Sadly, the clang-* family of functions exported by the "toolchain-funcs"
-	# eclass are defective, returning nonsensical placeholder strings if the
-	# end user has *NOT* explicitly configured their C++ compiler to be Clang.
-	# PySide2 does *NOT* care whether the end user has done so or not, as
-	# PySide2 unconditionally requires Clang in either case. See also:
-	#     https://bugs.gentoo.org/619490
-	sed -i -e 's~(findClangBuiltInIncludesDir())~(QStringLiteral("'"${EPREFIX}"'/usr/lib/clang/'$(CPP=clang clang-fullversion)'/include"))~' \
-		ApiExtractor/clangparser/compilersupport.cpp || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	# Minimal tests for now, 2 failing with the extended version
-	# FIXME Subscripted generics cannot be used with class and instance checks
-	local mycmakeargs=(
-		-DBUILD_TESTS=$(usex test)
-		-DDISABLE_DOCSTRINGS=$(usex !docstrings)
-	)
-
-	shiboken2_configure() {
-		local mycmakeargs=(
-			"${mycmakeargs[@]}"
-			-DPYTHON_CONFIG_SUFFIX="-${EPYTHON}"
-			-DPYTHON_EXECUTABLE="${PYTHON}"
-			-DUSE_PYTHON_VERSION="${EPYTHON#python}"
-		)
-		# CMakeLists.txt expects LLVM_INSTALL_DIR as an environment variable.
-		local -x LLVM_INSTALL_DIR="$(get_llvm_prefix)"
-		cmake_src_configure
-	}
-	python_foreach_impl shiboken2_configure
-}
-
-src_compile() {
-	python_foreach_impl cmake_src_compile
-}
-
-src_test() {
-	python_foreach_impl cmake_src_test
-}
-
-src_install() {
-	shiboken2_install() {
-		cmake_src_install
-		python_optimize
-
-		# Uniquify the "shiboken2" executable for the current Python target,
-		# preserving an unversioned "shiboken2" file arbitrarily associated
-		# with the last Python target.
-		cp "${ED}"/usr/bin/${PN}{,-${EPYTHON}} || die
-
-		# Uniquify the Shiboken2 pkgconfig file for the current Python target,
-		# preserving an unversioned "shiboken2.pc" file arbitrarily associated
-		# with the last Python target. See also:
-		#     https://github.com/leycec/raiagent/issues/73
-		cp "${ED}/usr/$(get_libdir)"/pkgconfig/${PN}{,-${EPYTHON}}.pc || die
-	}
-	python_foreach_impl shiboken2_install
-
-	# CMakeLists.txt installs a "Shiboken2Targets-gentoo.cmake" file forcing
-	# downstream consumers (e.g., PySide2) to target one "libshiboken2-*.so"
-	# library and one "shiboken2" executable linked to one Python interpreter.
-	# See also:
-	#     https://bugreports.qt.io/browse/PYSIDE-1053
-	#     https://github.com/leycec/raiagent/issues/74
-	sed -i \
-		-e 's~shiboken2-python[[:digit:]]\+\.[[:digit:]]\+~shiboken2${PYTHON_CONFIG_SUFFIX}~g' \
-		-e 's~/bin/shiboken2~/bin/shiboken2${PYTHON_CONFIG_SUFFIX}~g' \
-		"${ED}/usr/$(get_libdir)"/cmake/Shiboken2-${PV}/Shiboken2Targets-${CMAKE_BUILD_TYPE,,}.cmake || die
-
-	# Remove the broken "shiboken_tool.py" script. By inspection, this script
-	# reduces to a noop. Moreover, this script raises the following exception:
-	#     FileNotFoundError: [Errno 2] No such file or directory: '/usr/bin/../shiboken_tool.py': '/usr/bin/../shiboken_tool.py'
-	rm "${ED}"/usr/bin/shiboken_tool.py || die
-}
diff --git a/dev-python/shiboken2/shiboken2-5.15.6.ebuild b/dev-python/shiboken2/shiboken2-5.15.6.ebuild
index 7ccf8737dd28..4aa4b0a17b96 100644
--- a/dev-python/shiboken2/shiboken2-5.15.6.ebuild
+++ b/dev-python/shiboken2/shiboken2-5.15.6.ebuild
@@ -29,7 +29,7 @@ S="${WORKDIR}/${MY_P}/sources/shiboken2"
 # arbitrarily relicensed. (TODO)
 LICENSE="|| ( GPL-2 GPL-3+ LGPL-3 ) GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="+docstrings numpy test vulkan"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/dev-python/statsmodels/Manifest b/dev-python/statsmodels/Manifest
index 5c3c4a819f3b..a11a415cd828 100644
--- a/dev-python/statsmodels/Manifest
+++ b/dev-python/statsmodels/Manifest
@@ -1,3 +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 2129 BLAKE2B ad14f47ab9dba692477cd1df8027a1e35e4a293c830472621380285f1ded8b98e4d0790de060b726546028d885ca9b4f3f9d36d3d1088385c4025d891ac1a386 SHA512 af124c216de340341fc1705dbe404e133d835afdb0ea4b2e45b7808967f5cc7083528c6a61962a5efef45bbd7f90dbd3e6c00ee829b891f137a5d9410d69d146
 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
new file mode 100644
index 000000000000..5caea8067c6e
--- /dev/null
+++ b/dev-python/statsmodels/statsmodels-0.13.5.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1 multiprocessing optfeature
+
+DESCRIPTION="Statistical computations and models for use with SciPy"
+HOMEPAGE="https://www.statsmodels.org/stable/index.html"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples"
+
+DEPEND="
+	>=dev-python/numpy-1.17[${PYTHON_USEDEP}]
+	>=dev-python/scipy-1.3[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}
+	>=dev-python/numpy-1.17[${PYTHON_USEDEP}]
+	>=dev-python/packaging-21.3[${PYTHON_USEDEP}]
+	>=dev-python/pandas-0.25[${PYTHON_USEDEP}]
+	>=dev-python/patsy-0.5.2[${PYTHON_USEDEP}]
+	>=dev-python/scipy-1.3[${PYTHON_USEDEP}]
+"
+BDEPEND="${DEPEND}
+	dev-python/cython[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs \
+	'dev-python/ipykernel' \
+	'dev-python/jupyter_client' \
+	'dev-python/matplotlib' \
+	'dev-python/nbconvert' \
+	'dev-python/numpydoc'
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# Prevent un-needed d'loading
+	export VARTEXFONTS="${T}"/fonts
+	export MPLCONFIGDIR="${T}"
+	printf -- 'backend : Agg\n' > "${MPLCONFIGDIR}"/matplotlibrc || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local -x MKL_NUM_THREADS=1
+	local -x OMP_NUM_THREADS=1
+	local EPYTEST_DESELECT=(
+		# note that test path should be without "statsmodels/" prefix
+		imputation/tests/test_mice.py::TestMICE::test_combine
+		stats/tests/test_mediation.py::test_mixedlm
+		"stats/tests/test_corrpsd.py::test_corrpsd_threshold[0]"
+	)
+
+	cd "${BUILD_DIR}/install$(python_get_sitedir)" || die
+	epytest ${PN} -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+	rm -r ${PN}/.pytest_cache || die
+}
+
+python_install_all() {
+	if use examples; then
+		docompress -x /usr/share/doc/${PF}/examples
+		dodoc -r examples
+	fi
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "Plotting functionality" "dev-python/matplotlib"
+}
diff --git a/dev-python/testfixtures/Manifest b/dev-python/testfixtures/Manifest
index 1f7c5af29218..f94a4800c982 100644
--- a/dev-python/testfixtures/Manifest
+++ b/dev-python/testfixtures/Manifest
@@ -1,3 +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
 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
new file mode 100644
index 000000000000..8d96b3520597
--- /dev/null
+++ b/dev-python/testfixtures/testfixtures-7.0.3.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..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="A collection of helpers and mock objects for unit tests and doc tests"
+HOMEPAGE="https://pypi.org/project/testfixtures/
+	https://github.com/Simplistix/testfixtures"
+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"
+
+BDEPEND="
+	test? (
+		$(python_gen_impl_dep sqlite)
+		dev-python/django[${PYTHON_USEDEP}]
+		dev-python/pytest-django[${PYTHON_USEDEP}]
+		dev-python/sybil[${PYTHON_USEDEP}]
+		>=dev-python/twisted-18[${PYTHON_USEDEP}]
+		dev-python/zope-component[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# kill weird way of declaring build deps
+	sed -e '/build=/d' -i setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local -x PYTHONPATH="."
+	local -x DJANGO_SETTINGS_MODULE=testfixtures.tests.test_django.settings
+
+	local EPYTEST_DESELECT=(
+		# TODO
+		testfixtures/tests/test_shouldwarn.py::ShouldWarnTests::test_filter_missing
+		testfixtures/tests/test_shouldwarn.py::ShouldWarnTests::test_filter_present
+	)
+
+	epytest
+}
diff --git a/dev-python/websocket-client/Manifest b/dev-python/websocket-client/Manifest
index c491b1fe08a3..7e9e633004ce 100644
--- a/dev-python/websocket-client/Manifest
+++ b/dev-python/websocket-client/Manifest
@@ -1,3 +1,5 @@
 DIST websocket-client-1.4.1.tar.gz 50883 BLAKE2B 4d80b5d5f407fdd81b5468f37b66759970cf96395738b67271388c55d13c30c36c9f7a5a89b10fb78bde4870e25bea5761c297b3fc85b0b8d62eda24443421d9 SHA512 a2804421e97ccbfb61cb2e8a2be6ecd5d5d60210971e27ca4e00a4854fb49df2e3c87ec87c0ec11565d7ce03f419dc3cbd8c2402843a8fced49d75d65d07b502
+DIST websocket-client-1.4.2.tar.gz 49113 BLAKE2B d1d25d7066512ae5a8fa189b22ad320331b3d34e6ae953a29b7b5644065a9d60ffd6743bae6e769f356b7294374690fba103ee42ed59f5f9b213dfeda7f038af SHA512 4003a6b387096a738e9b9f76129b954bbc208b8b75c6ba9d6f0dade82078645109f985164ce25c1a600e630833f7187d51d6236997d6c72315d206e91f1aae7a
 EBUILD websocket-client-1.4.1.ebuild 808 BLAKE2B 72dc35bcd75084c2d035de991deacc1a3047f0c8f3de23af9c725016b781876fc7ffcc2e46083a5f0dd74c4f5be7abe0185045eb2389c41c408b7c2e813a1871 SHA512 2dfca38ad3326b9ed47215cddf3f3fdbac9de0835c30095a67ef879119a0851794cc5d95ff6a9593a23eeddf088316de7742cd95e9dcea329c2775cadf7060cd
+EBUILD websocket-client-1.4.2.ebuild 816 BLAKE2B 52d55ac6237a6ce0b5de36c3e5d5cdae69b2ec5401c09c8b5512663c327655d269c87793e743d83d072bab4c65107ce248b1a41b7f430611f33e41dfd24097f4 SHA512 baba222bfc2b038fa835a4d636c736ef3e6c6800150bdf30b507f74eca3c25645ca4c9354d11792ad92fc78c387418829ea648022fcde66b9a687e5daf9fe6ec
 MISC metadata.xml 498 BLAKE2B de7c287e513c7e64b4bec29693e6eb9104ff963e0d4d942ed37402bf341739fb17b2ebdb1bf0aaa0081934bae34e16f025d0549f94c1a863be95d64a338eede4 SHA512 13dd8cf0f3e363a3fbf2b246bcc1ccd78a898d5ca830e30fb1606947ce129d99f2d8065c3668dc2c7749bbd4e24e39e5a7c483065737a580246a89dd4d41eaa7
diff --git a/dev-python/websocket-client/websocket-client-1.4.2.ebuild b/dev-python/websocket-client/websocket-client-1.4.2.ebuild
new file mode 100644
index 000000000000..78665da331ef
--- /dev/null
+++ b/dev-python/websocket-client/websocket-client-1.4.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="WebSocket client for python with hybi13 support"
+HOMEPAGE="
+	https://github.com/websocket-client/websocket-client/
+	https://pypi.org/project/websocket-client/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="examples"
+
+BDEPEND="
+	test? (
+		dev-python/python-socks[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
+
+python_install_all() {
+	if use examples; then
+		docompress -x "/usr/share/doc/${PF}/examples"
+		dodoc -r examples
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/xarray/Manifest b/dev-python/xarray/Manifest
index d41c8076ce93..efb4bd62afc3 100644
--- a/dev-python/xarray/Manifest
+++ b/dev-python/xarray/Manifest
@@ -1,8 +1,6 @@
 DIST xarray-2022.10.0.tar.gz 3035596 BLAKE2B f42df85bdfa66403826fc7d2fa811419898134723ee24afc6b77a320b23c9b5b95fcfd25520f74abf0a3b7bf009fdc33655eebf0ff9703753872072515deee58 SHA512 ecfc92c68ea7ba02b673c6c317e68daad23b6882b4ed316ad1dd733f179c643411d3ee5902954dbd62f2eb7ad591d8ba1a5f0c1b2c7f6873e733df2f22b6650c
-DIST xarray-2022.6.0.tar.gz 3013166 BLAKE2B 4f2c17595ec904508e5f9c1d6ffead45be527b7f2ab73383126d57c7894712e924b605a86f890b0fec4ff45d1a263ce27fa324febf83f703ad36079e68f69663 SHA512 415bd84246d6d2b8aebf316ac9ef82ca7afeacce718349b75479c0aa693e2866dfe236e6dcaf41cae68afd7a99408f5027c938e6b7f447f5323e076b804f5165
 DIST xarray-2022.9.0.tar.gz 3030815 BLAKE2B 71bea98d49fa9ce2e8e881bdcba7872293e1cd9fa4bd23e6cdce40220d87550fade52a7b7c25ff5d0b11b8a729c57ed219031b1f13d1f375c5278ecc611dfbc5 SHA512 57383cfc809b26d743c06eb5a158d318c65aedfa374e62b0a5fdc99708632a364b2efb6275fbc728e441effb7c695635a443cf141d69fa742216a677f4168b3b
 EBUILD xarray-2022.10.0-r1.ebuild 1100 BLAKE2B 94d3b2cbd5167a14f107d424c2a31ed2a3f8705c4a8d9d2f2c7b638265520dc2502df7436a66a760cb55a5ba5cad9016fa3cf8590ce980f4dc77cd7fb52a454e SHA512 cf1f2e42ea1c43af41b2d3408fd9624b45ad800d95b04bd8bbad004dbcc48cbf2fe22b0751614fc7f469e5746262e2660e260fde1580779c85b060838fe4a518
 EBUILD xarray-2022.10.0.ebuild 1113 BLAKE2B 7c6c9efa34384aea2c7bbcc0f263d2b5fd4eff771a5e3eeca5bced653384d635e22863da38011c6f3875e6eee169cb1e75e52d689b2a42b810e6ccc4b16b9709 SHA512 20a3143028e3c8d42e881cc9bf0c286df66f5a79e1f30b8d956b7579ffaef5a13064e9ec61737ea45689fc779ae51377bbf9e81692fa57182cece4a7c86aee8f
-EBUILD xarray-2022.6.0.ebuild 1100 BLAKE2B 69026f76a222a1c1f6f4a52dbadd28d70154c6355fa8b21541697a9859716b566264d44f9ff8819705251556337dbb84588859e4f18ceb474e72b0502ef11006 SHA512 5ad0633eff44291cacb14c40477944ddbcdbcee1ad7d618c5b677bbc409912b4be064c00814b2ce21f542dfd1056050b7f4384b38d45fa395f0d6c0ce42b40bd
-EBUILD xarray-2022.9.0.ebuild 1102 BLAKE2B 67bedcfeda3581c325c05eb464f2cefa3c5c1df1ad178392700e12521108c600396c8047ba4cf02b205f1629b11ed318374cf410a9a05b50cf4859b192d41d1a SHA512 8d4735e5f09dd9bec5c1549e73df36d2ae2c5eb7586dd796f25138335314897dba0546b205b8a9d9fe09e2c8896939d9fca30c8f1037fe511fee2de4c61142ee
+EBUILD xarray-2022.9.0.ebuild 1100 BLAKE2B 69026f76a222a1c1f6f4a52dbadd28d70154c6355fa8b21541697a9859716b566264d44f9ff8819705251556337dbb84588859e4f18ceb474e72b0502ef11006 SHA512 5ad0633eff44291cacb14c40477944ddbcdbcee1ad7d618c5b677bbc409912b4be064c00814b2ce21f542dfd1056050b7f4384b38d45fa395f0d6c0ce42b40bd
 MISC metadata.xml 509 BLAKE2B d470cc092eb055215a5868c22f9ec458057cfad600357fa1f658ed4537a6a6f68bda1422c4a665f1963ce0a6049e691befc3ca4baa60cc898364ad5f18164979 SHA512 602755896a3655295058afc8543a4bb64192d5c625f2edd86291c1f23d171f051a4238466163c2d469874aff3e68770fc76177e720870492266fb14e6faf6ce7
diff --git a/dev-python/xarray/xarray-2022.6.0.ebuild b/dev-python/xarray/xarray-2022.6.0.ebuild
deleted file mode 100644
index d29dce1b169d..000000000000
--- a/dev-python/xarray/xarray-2022.6.0.ebuild
+++ /dev/null
@@ -1,40 +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
-
-DESCRIPTION="N-D labeled arrays and datasets in Python"
-HOMEPAGE="https://xarray.pydata.org/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/numpy-1.19[${PYTHON_USEDEP}]
-	>=dev-python/pandas-1.2[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-"
-# note: most of the test dependencies are optional
-BDEPEND="
-	test? (
-		dev-python/bottleneck[${PYTHON_USEDEP}]
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		dev-python/toolz[${PYTHON_USEDEP}]
-		!hppa? ( >=dev-python/scipy-1.4[${PYTHON_USEDEP}] )
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# warning-targeted tests are fragile and not important to end users
-	xarray/tests/test_backends.py::test_no_warning_from_dask_effective_get
-)
diff --git a/dev-python/xarray/xarray-2022.9.0.ebuild b/dev-python/xarray/xarray-2022.9.0.ebuild
index b7d28e19e7fa..d29dce1b169d 100644
--- a/dev-python/xarray/xarray-2022.9.0.ebuild
+++ b/dev-python/xarray/xarray-2022.9.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/numpy-1.19[${PYTHON_USEDEP}]
diff --git a/dev-python/xcffib/Manifest b/dev-python/xcffib/Manifest
index 639b1b343911..157c802cc091 100644
--- a/dev-python/xcffib/Manifest
+++ b/dev-python/xcffib/Manifest
@@ -1,5 +1,3 @@
-DIST xcffib-0.11.1.tar.gz 84713 BLAKE2B 6ab1ad6e582d71214cd719fdfa898e561e29d5750f5befe5c71173cfe34f2dff7dbd52fe93e618aab695646850f7ef5420114e2b1e725150c643904cdaba560a SHA512 09f4e19b88258446af26628c3a8e694c1f938fe3b5456e797b06174602fa0e9ef6e4eab76daccfd169d98fb7e869c910e6216d1f71fa2853e62b82c62c667669
 DIST xcffib-0.12.1.tar.gz 85272 BLAKE2B 6db2f19caf13d406297198c3829456cb45b5195e2d068b1f5ad01c25d4ed75e3187854da24156c3c5396a559b11c2d6949711b793c5bf5c83e18e9aa54307983 SHA512 6530fb53fa18a3905d7c9e8dd5d05ea084de4a5f392e32953a9786998dd194b2db55b54fa44dbc3e6b68e68ae00431de7432d6884f777734409d660dae325d6e
-EBUILD xcffib-0.11.1-r1.ebuild 745 BLAKE2B a0e3c87ace0f3dad3d9759b8ec6ed0c5b288899a13447e031f97be66d744a8101f6d10b0d4995c1559c837664d6662eb3e0f3f992a7bd7d0dff2e91c25222168 SHA512 0790044af8566cad69538bd6c3044b64861b1a2610e40cf0fe3d30c2d2be4998c94fe777ac9cdb6dbc3fc8089d45b2334a80ecf02842f30e030870ffd228e3ca
-EBUILD xcffib-0.12.1.ebuild 790 BLAKE2B 5fffd06a3d8a2d9e48a92497e16eebfb72ca1ca36ddb13d9ee51daa63e9d29c2749d12ff04c9c5779ee2201f7008c76a5cb7823eb9051d3083227fbf4a57d2cf SHA512 618eba23328c8448c05690144f5e94737c7bc91408b7a053c48f592bd2b9292ba1ee395de833f9ecc6a2c21facf12c9b49bb2e48f6e856934c86cac2587f563c
+EBUILD xcffib-0.12.1.ebuild 789 BLAKE2B caddbe49e4e9a87b937b9e5e8fc27e92b3eef8a1d21880d74c0c770d42bb92f9c1ae3800c79d5c10b4f3ed9bbe6684e82a1c5c5c174aac55bc7d456f56128750 SHA512 5d12d27717cf7fbb60977f1a4ffd8187d3ca7055072e24b68190a40d93c4a2da450162f4271bb8918af66230136abab175caeff5f42d5cce07f197f5a766ab98
 MISC metadata.xml 374 BLAKE2B 7f2845d0839dff2568de08f86ce6b8387e76ff450467e14b5c291ad1f55256cb9eff1ff318973e54846ad394b56a3e1e6aa8574fcc0bc39a1c9f7d3b42a1109d SHA512 9403d3d706b5281d6abe2d2fca33b1a70983c7c205f8a5899ad0469fe9a1cd0ceb6c9b27916e1e152467d029d86fc9e6dc28f967bc108499ed901582ad1bbd00
diff --git a/dev-python/xcffib/xcffib-0.11.1-r1.ebuild b/dev-python/xcffib/xcffib-0.11.1-r1.ebuild
deleted file mode 100644
index 1cbeb6eeca07..000000000000
--- a/dev-python/xcffib/xcffib-0.11.1-r1.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
-
-PYTHON_COMPAT=( python3_{8..11} )
-DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1
-
-DESCRIPTION="A drop in replacement for xpyb, an XCB python binding"
-HOMEPAGE="https://github.com/tych0/xcffib"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
-
-DEPEND="x11-libs/libxcb"
-RDEPEND="
-	$(python_gen_cond_dep '
-		>=dev-python/cffi-1.1:=[${PYTHON_USEDEP}]
-	' 'python*')
-	dev-python/six[${PYTHON_USEDEP}]
-	${DEPEND}"
-BDEPEND="
-	test? (
-		x11-base/xorg-server[xvfb]
-		x11-apps/xeyes
-	)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/xcffib/xcffib-0.12.1.ebuild b/dev-python/xcffib/xcffib-0.12.1.ebuild
index 2b1564d33ed9..e933a36f975d 100644
--- a/dev-python/xcffib/xcffib-0.12.1.ebuild
+++ b/dev-python/xcffib/xcffib-0.12.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
 
 DEPEND="
 	x11-libs/libxcb
diff --git a/dev-python/zeep/Manifest b/dev-python/zeep/Manifest
index c51068dab81b..71c433a87b56 100644
--- a/dev-python/zeep/Manifest
+++ b/dev-python/zeep/Manifest
@@ -1,4 +1,6 @@
 AUX zeep-4.1.0-cached-prop.patch 3247 BLAKE2B 2ecbafe7bd1dae935dcb6dc0596e68a4d709b04e205cbc58c736fd235e7dc69f66ce5fad86893f1af1d3d77187de92f9f12a7055f8dbbc01c56b273ff500a56c SHA512 36971cc3ab540392cd702edc6cfb8c5db5812f05bcb9e28308c53514e18de2dfd1a29dbac3d6bd53f38f1d315f1a447d974e1a61fb59664bec18567879e080e0
 DIST zeep-4.1.0.tar.gz 160333 BLAKE2B d29db92efe048ba854ff14cde062993c3f334cab6cfc122f6db9aa7a1a490c82f93a50ca5028a5f86e316d9ecf567ac40aef10f3e7d8db89376c7d8dea2a2e23 SHA512 acc54f99d21fe401e06418223591bcf8e7f8819e225f892beb0f6e2a1ee359a0da6f9d0aa4212899197c084af37cc56126879b93a22cdad2458e57674bf66ed5
+DIST zeep-4.2.0.tar.gz 161102 BLAKE2B e6d25ec10c1e50d6d3e029d65e0ec28ca70524b82ba67c261099fa970cbb0af320e9085539316ae64736600acce0e69793c081314c01e2de34a026208d8a5bef SHA512 dd7ea6fb80e41ae0ed81ebc26b9d0498685c9801baf0c46c124b0341e78127f521e429c7b55a2056018f3229128294f2715f8794ae8c00f313435cd8663c63f6
 EBUILD zeep-4.1.0-r2.ebuild 1586 BLAKE2B 3570b2b277148998c037be5f6628c5a290160debca06e5c720dce824f5ca66658e6a70a02898b98371d157487b18989d26ecc86e59bbfa98bada41beaf948862 SHA512 17e2705d7204aa5adfed81382c5412b59c4207d398b3f693a8a2e769e394d555870e34f8503f86743071780dbf23a4a1b0e108702e0d08b99600c2ae762ecac5
+EBUILD zeep-4.2.0.ebuild 1537 BLAKE2B b936cd796682f65e71aa2fbc4a493788c54795a254b6295073ec47c8d4a796006d8b058e9a9ab32cb5f17d36f9df8e5da6820511eec2e8c0ed5017f9fb4b1aa6 SHA512 1fdef4c45834cde4d5399f4329b4a5867609829f85e3c14ff0bddf87a32f70a952733076399718430e5ce7aa084e6e32f8220c8bc6f9b25c945066f852c62bfb
 MISC metadata.xml 485 BLAKE2B 7bf7fe5fa8c3803d58acb9b572a9b8cf5250f5bb95c95eb385748bd87da46fed52a6c13c48c5c623c61256289b598873c05c7bd24aeac331651708c365974557 SHA512 e4af11481fdcdc75c3e5f31d457707c7ea8baacee3c0e912a93b2d224e60685d821347f6cb7f6f12483e2051043ea25f5560446ef11f210cdd41b13e1e4e1fcc
diff --git a/dev-python/zeep/zeep-4.2.0.ebuild b/dev-python/zeep/zeep-4.2.0.ebuild
new file mode 100644
index 000000000000..adcaf749a07b
--- /dev/null
+++ b/dev-python/zeep/zeep-4.2.0.ebuild
@@ -0,0 +1,53 @@
+# 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
+
+DESCRIPTION="A modern/fast Python SOAP client based on lxml / requests"
+HOMEPAGE="https://docs.python-zeep.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="async"
+
+RDEPEND="
+	>=dev-python/attrs-17.2.0[${PYTHON_USEDEP}]
+	>=dev-python/isodate-0.5.4[${PYTHON_USEDEP}]
+	>=dev-python/lxml-4.6.0[${PYTHON_USEDEP}]
+	>=dev-python/platformdirs-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-file-1.5.1[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.7.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-toolbelt-0.7.1[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	async? ( >=dev-python/aiohttp-1.0[${PYTHON_USEDEP}] )
+"
+BDEPEND="
+	test? (
+		dev-python/aiohttp[${PYTHON_USEDEP}]
+		dev-python/aioresponses[${PYTHON_USEDEP}]
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pretend[${PYTHON_USEDEP}]
+		dev-python/python-xmlsec[${PYTHON_USEDEP}]
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/pytest-httpx[${PYTHON_USEDEP}]
+		dev-python/requests-mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# broken by new pytest-httpx?
+	tests/test_async_transport.py::test_load
+	tests/test_async_transport.py::test_load_cache
+	tests/test_async_transport.py::test_post
+	tests/test_async_transport.py::test_http_error
+)
diff --git a/dev-python/zope-hookable/Manifest b/dev-python/zope-hookable/Manifest
index d53d470bd421..863eceb0700a 100644
--- a/dev-python/zope-hookable/Manifest
+++ b/dev-python/zope-hookable/Manifest
@@ -1,3 +1,5 @@
+DIST zope-hookable-5.3.gh.tar.gz 25302 BLAKE2B 56ab933338a9a3fcc8c8a090111896d0b483909aba2235f9dbbadc4556cdac23f8d2a8d29b7081fe460e7afebb675032d05d2c7e5d00a9a97e2a1d6e20e186c7 SHA512 76ec43866c89a97efcccc4e312a6c3c4471c32ddd19ce4cae94ffd0a8f97f66871194ffbf45316965748d0e606a04af0ae8f2787a00c2e5d102c2df4dac9d6ae
 DIST zope.hookable-5.2.tar.gz 24004 BLAKE2B f1b64a906a849442437a3829d509210280066b41bc97fbedcd02b462fa9c7761910a7a71ed00430679f7c3ec9648c8a9ab5e88d4e8143018e44194d56611353a SHA512 b04107acedcc245fa99a59de71ffeaabe270ec15eaac32df1f5433ca16ea568d60c272349c8c8d7e512dfadef4fc8fcebf63a62ee9c8607fc02505a4457e1ed3
 EBUILD zope-hookable-5.2.ebuild 973 BLAKE2B d1325d1ae489dd9c7c9f757eab994cf01a2bfcde734b841b5cb771d7970eb5086fd3144786ecd8db19a667ce54700acbccd4859369bbd279b08d8287eda2ec1b SHA512 13b12baf36909a19225011ffbea033a4de5fa4176649c41dfcbb57acd9dc38dc7083538e40bbe11def7051c3bd3b983c3287834029d46aea5d7a72c8d60e28dd
+EBUILD zope-hookable-5.3.ebuild 980 BLAKE2B 84d9130fe0655fdfa9ae2ad419373cd6e8ed977fef0dceb1bc28702391c87121468e30c702a13253fbbd9d67c0db43afdd3432fa0f71f0d606a82dcc2e57d1bc SHA512 799b0ad1d83d3d02f3a52fcd9cb3ba064a33b7606352931319526277ed9073d9c16cb28019c4c754a35210098d4ec228f1db53a74e04d99c48556289a066373c
 MISC metadata.xml 363 BLAKE2B 292afad5ddaa2ae9ea128a842934b751d16d84aebd617a9e5f6c2165245137f11089670fc78791ce46ccb260c5acbf0527030889d709725f6f89532f3972c0c2 SHA512 40afd7e868b05d352bc5f268d056f3550e924e22b07b1f0e41afd25429017cb28fd5b6caf565df04bfcecf5cc1c183d12a122a906affd813542ef32cbbc230a3
diff --git a/dev-python/zope-hookable/zope-hookable-5.3.ebuild b/dev-python/zope-hookable/zope-hookable-5.3.ebuild
new file mode 100644
index 000000000000..e6323fc9044f
--- /dev/null
+++ b/dev-python/zope-hookable/zope-hookable-5.3.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Efficient creation of 'hookable' objects"
+HOMEPAGE="
+	https://pypi.org/project/zope.hookable/
+	https://github.com/zopefoundation/zope.hookable/
+"
+SRC_URI="
+	https://github.com/zopefoundation/zope.hookable/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S=${WORKDIR}/${P/-/.}
+
+LICENSE="ZPL"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+BDEPEND="
+	test? (
+		dev-python/zope-testing[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	# strip rdep specific to namespaces
+	sed -i -e "/'setuptools'/d" setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_compile() {
+	distutils-r1_python_compile
+	find "${BUILD_DIR}" -name '*.pth' -delete || die
+}
+
+python_test() {
+	eunittest -s "${BUILD_DIR}/install$(python_get_sitedir)/zope/hookable/tests"
+}
diff --git a/dev-python/zope-interface/Manifest b/dev-python/zope-interface/Manifest
index ad03ea4d868f..c662a64016cd 100644
--- a/dev-python/zope-interface/Manifest
+++ b/dev-python/zope-interface/Manifest
@@ -1,6 +1,8 @@
 AUX 5.1.0-drop-coverage.patch 571 BLAKE2B d5f334b7f5ec5df710174f9a3768c2d7400cefec7c3bb7cb0e4a3fced701b812af738d601ced61df57b78212f1ec621c6a53b906be2bbdf0838c31dc8c6f9e29 SHA512 04b30a85357fd7d0e0a4c52913b0260cc437f7cde2344399d400c2fc0e10cc60261eb4a3201954a515dfd030cfa564c9a222424390af8a3e20349270c89272b6
 DIST zope.interface-5.4.0.tar.gz 249329 BLAKE2B 3a35ce6ff2a9984ed865cfb3bc3371e8069eb416d11bddbc56e27db4d76762fb1b87d295b51258ec006fddcbb38a8752b47a2d7874c0c8a959ca78101eae2750 SHA512 ef15d63397e05ad9fc44b2d5d786b0399b6973bb5f4866fab839ff612756f3157f2099d0f5c0469b574a5c8b5920a7c2a5c6eab8e8f84c24d5c43e816669bffe
 DIST zope.interface-5.5.0.tar.gz 253292 BLAKE2B 2c3e48aeff7124a50b834792774596bd3ed793146be7335a0b3abbaf0e1861d84668421b9098cf4f8986d17f8f148a7b30b929ea73b5d344e5d63d44270b2a99 SHA512 ab74a55a90c17b1aed55f1d6e24365321ebbca5943557be7731af99d7436f18f4d0a4c53c0c26c29c0379ce72ef0c2babccaa9cad5aec843bc533ff19fdbe6d9
+DIST zope.interface-5.5.1.tar.gz 300064 BLAKE2B a40de949efc269e3b942eaa6bd5006afc253487149ef22fd1d070eb15535ad755a34cd3e3ab053652cbd1117aef92fe79e8de683491c8e8eaa41e4da8b9b12bd SHA512 e5d73a78a8d9960cf8f24a7603175b0ebe0f2a3695536cdcecb5f78a6ee118aaa8fdf26c70d08a9d17f70e9b89024c260c732e2f9c9153ab960f3175fc10b9df
 EBUILD zope-interface-5.4.0-r2.ebuild 1272 BLAKE2B e8c6f9ce1a645d2b8e349bfcc98b93b324f6bc3346db0901f85db16159d819e53cce0a4a6b02b28b404cfe99e53ee0a002698da4e2c4cc7ca4a18045aae34a62 SHA512 cba7ae17d9a8cfda3b1479d58b3d0e2e5eaa7f513020f005be58bb1333b2c8fcdf3496de742eba0560201f0421b02a1eaa256ebca128b3321b865bcb3587407b
 EBUILD zope-interface-5.5.0.ebuild 1285 BLAKE2B 620d6434cf5f6c692eb5b4cab8f7b6de32a231c445b99793a43d632c9cfbdf4a6f5d7c070be0b08327ef91a3217e5734ca55eb5277e458781b01882b4bcaf6b1 SHA512 63de36431f314f9bad48a1a3ecb1ce2e965a663c7dfe8bb0b5dc42ec48f95f4c1c89e8a2e1d5bb09e4148ea9356587e80a99fe16558901ad6ef0da662807dcea
+EBUILD zope-interface-5.5.1.ebuild 1285 BLAKE2B 494bd885a8482163486f792389daddf7399f33c341740346cc5a26c6ed641a3e115f709d2103ff1b2de65055cb73202230590f9392d4b3dc92642e0f0dfdd7b7 SHA512 d4c853a2fb8372720ab87925d35885b47112d687e65ca96ec0e10a229414260872f60747ea10aa66ad1684a587266ef6106a9637ca0c81867625bc9f805e2d81
 MISC metadata.xml 387 BLAKE2B 1d5e2a8f2fcd2c8fcb423f8a123d2d17a0456cd4003489358abd8baf74d3ea9ddfa04af94b9ef67b329520b5ee9bc3084343e824f3fbf7420f14372d43581dbc SHA512 258f0bd291cd42f6374bd331c3b906f149ff455dd264716eefc63487710d95f8b388ecb34be5733dbd7a0e185f449cc18fce04b46521a2d19fd9766e7dc0ed82
diff --git a/dev-python/zope-interface/zope-interface-5.5.1.ebuild b/dev-python/zope-interface/zope-interface-5.5.1.ebuild
new file mode 100644
index 000000000000..6a87c71f939f
--- /dev/null
+++ b/dev-python/zope-interface/zope-interface-5.5.1.ebuild
@@ -0,0 +1,57 @@
+# 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_PN=${PN/-/.}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Interfaces for Python"
+HOMEPAGE="
+	https://github.com/zopefoundation/zope.interface/
+	https://pypi.org/project/zope.interface/
+"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="ZPL"
+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/namespace-zope
+"
+BDEPEND="
+	test? (
+		dev-python/zope-event[${PYTHON_USEDEP}]
+		dev-python/zope-testing[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/5.1.0-drop-coverage.patch
+)
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	# strip rdep specific to namespaces
+	sed -e "/'setuptools'/d" -i setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_compile() {
+	distutils-r1_python_compile
+	find "${BUILD_DIR}" -name '*.pth' -delete || die
+}
+
+python_test() {
+	cd "${BUILD_DIR}/install$(python_get_sitedir)" || die
+	distutils_write_namespace zope
+	eunittest
+}
author	V3n3RiX <venerix@koprulu.sector>	2022-11-04 15:14:18 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2022-11-04 15:14:18 +0000
commit	f5f1e7d30401ef31b8776c96a80cf5caae0a4e81 (patch)
tree	cf79465586b83d032475fad7f33894f6cf4efd1f /dev-python
parent	0bb8253b38dc8638a46b66ba909c1bfd1054e1ef (diff)