gentoo auto-resync : 30:10:2022 - 09:03:01

45 files changed, 719 insertions, 236 deletions

diff --git a/dev-python/Levenshtein/Levenshtein-0.20.5-r1.ebuild b/dev-python/Levenshtein/Levenshtein-0.20.5-r1.ebuild
deleted file mode 100644
index 8887977b011f..000000000000
--- a/dev-python/Levenshtein/Levenshtein-0.20.5-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# custom wrapper over setuptools
-DISTUTILS_USE_PEP517=standalone
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Functions for fast computation of Levenshtein distance, and edit operations"
-HOMEPAGE="
-	https://pypi.org/project/Levenshtein/
-	https://github.com/maxbachmann/Levenshtein/
-"
-SRC_URI="
-	https://github.com/maxbachmann/Levenshtein/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv"
-
-DEPEND="
-	>=dev-cpp/rapidfuzz-cpp-1.7.0
-"
-RDEPEND="
-	<dev-python/rapidfuzz-3.0.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-	>=dev-python/scikit-build-0.13.0[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# sterilize build flags
-	sed -i -e '/CMAKE_INTERPROCEDURAL_OPTIMIZATION/d' CMakeLists.txt || die
-
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/Levenshtein/Levenshtein-0.20.6.ebuild b/dev-python/Levenshtein/Levenshtein-0.20.6.ebuild
deleted file mode 100644
index 8887977b011f..000000000000
--- a/dev-python/Levenshtein/Levenshtein-0.20.6.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# custom wrapper over setuptools
-DISTUTILS_USE_PEP517=standalone
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Functions for fast computation of Levenshtein distance, and edit operations"
-HOMEPAGE="
-	https://pypi.org/project/Levenshtein/
-	https://github.com/maxbachmann/Levenshtein/
-"
-SRC_URI="
-	https://github.com/maxbachmann/Levenshtein/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv"
-
-DEPEND="
-	>=dev-cpp/rapidfuzz-cpp-1.7.0
-"
-RDEPEND="
-	<dev-python/rapidfuzz-3.0.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-	>=dev-python/scikit-build-0.13.0[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# sterilize build flags
-	sed -i -e '/CMAKE_INTERPROCEDURAL_OPTIMIZATION/d' CMakeLists.txt || die
-
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/Levenshtein/Levenshtein-0.20.7.ebuild b/dev-python/Levenshtein/Levenshtein-0.20.7.ebuild
deleted file mode 100644
index 8887977b011f..000000000000
--- a/dev-python/Levenshtein/Levenshtein-0.20.7.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# custom wrapper over setuptools
-DISTUTILS_USE_PEP517=standalone
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Functions for fast computation of Levenshtein distance, and edit operations"
-HOMEPAGE="
-	https://pypi.org/project/Levenshtein/
-	https://github.com/maxbachmann/Levenshtein/
-"
-SRC_URI="
-	https://github.com/maxbachmann/Levenshtein/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv"
-
-DEPEND="
-	>=dev-cpp/rapidfuzz-cpp-1.7.0
-"
-RDEPEND="
-	<dev-python/rapidfuzz-3.0.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-	>=dev-python/scikit-build-0.13.0[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# sterilize build flags
-	sed -i -e '/CMAKE_INTERPROCEDURAL_OPTIMIZATION/d' CMakeLists.txt || die
-
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/Levenshtein/Manifest b/dev-python/Levenshtein/Manifest
index 86c56e3ee15b..8a64b35f3436 100644
--- a/dev-python/Levenshtein/Manifest
+++ b/dev-python/Levenshtein/Manifest
@@ -1,11 +1,5 @@
-DIST Levenshtein-0.20.5.gh.tar.gz 35126 BLAKE2B b1322abdca5a4cd372bce74ce3f1d5e9f671783797830f0527282284fb1296be6ae9ef3fc68fe1f6867d1b1e9069c1c0c60106bd64f966f1333d087b52a9fe02 SHA512 d3afd384023537de5918e011e16395c7dc69ba61c4823eb64e938810dbf49cbf5379589a4cc13e7dd49f8a2e683498d3768717e52678ee01fb8d1dd55c304307
-DIST Levenshtein-0.20.6.gh.tar.gz 36525 BLAKE2B d0b26f4aec5a985c04c0366c7d36633f172ce0efdb73f75a863cd306403d2d721acff7b2a460a74d19efacb0fd01f3973b93cc6d59695b576f8b11e79752b31e SHA512 4e2d6d7f59e8e2190029d9f5f49ed8407997935076233b79a7c81470a84446851e14f5edbbb42d48a85dbdf0116b40186d896f172f2d740f769a7e7cb9350e7f
-DIST Levenshtein-0.20.7.gh.tar.gz 36561 BLAKE2B dceaab4c16e386c685707edeea766701234c07e4bc1216d801ba7f5e92751126b976f8918b31d48ae928750e8d20102245e40161446b78e91ff74a285edaf12a SHA512 bca69e91e056b4b86340860f4c4e91af291f535d38a756c9a4f9a377024c0491724b972fa5b014da1ad563333cb9b797c9d05359185fc0aecc9fc018fe5d258e
 DIST Levenshtein-0.20.8.gh.tar.gz 36607 BLAKE2B 8c35c47768a21651c7922151f9a4ba24782106fee1cc2eada2b81924b3e340aa929ec8b9944a7ea9cfaf8934da49cc377849e599fedebb6187afdfd486e8b9f4 SHA512 3a248b5d1a18c8afeffaa637c831b07266dd36a094b713c18b7182a49de7df9a3b7316d00e9329e2ae49f92c601e32a61590338e30a7e4f33ffe0d76c6219061
 DIST python-Levenshtein-0.12.2.tar.gz 50502 BLAKE2B d8992d30639e36aac1b85fada8f5273ed867aa3019208ffeb9972e999dad783d4ee16e1f6988c9306eb80f622b61fcf3a0a937b380c7a5acf50223268ed8de1d SHA512 97eac9d19121758af7620ad3963846e48434ceabb5376a83f28452015adf1a620620bfb53edb1c4f60b0fc8ec2b0faf35a105d7e2a0fc5df7a45fce81ba0dcdb
 EBUILD Levenshtein-0.12.2.ebuild 630 BLAKE2B a56ef0d6431d51516f69a6a00dabec4681aa3e999fecfd904d34fee2dc1d4e8fca5ef47af6d388b0dcb72a9a1664f4d8ccb4124496d6ddb1306c7194aba06d1a SHA512 12021fce00cc5bb951cdfaba190a14f512bab14cef53b430504400bfa99daa91faa04a819fef750c7e558b0a99698fc52c8f52294d4ce47069efdf30a2d9600a
-EBUILD Levenshtein-0.20.5-r1.ebuild 991 BLAKE2B 0f04ff79ebfd57e3f0615f086219560ab2b5c2aea834a11f46f78a9fe0697a3f8370eaeb9473b72c3c266ea9c9134b356e3770c73ca9cc897a8ec924e59fafd4 SHA512 fa296b0fa76d1adb457b0c1059a3db4a861952a0d59a0016e58d3a2a54677e8f53fdd452750238303ae3fd98e398c51682b65eba9b9e830e9a649bcd14de12af
-EBUILD Levenshtein-0.20.6.ebuild 991 BLAKE2B 0f04ff79ebfd57e3f0615f086219560ab2b5c2aea834a11f46f78a9fe0697a3f8370eaeb9473b72c3c266ea9c9134b356e3770c73ca9cc897a8ec924e59fafd4 SHA512 fa296b0fa76d1adb457b0c1059a3db4a861952a0d59a0016e58d3a2a54677e8f53fdd452750238303ae3fd98e398c51682b65eba9b9e830e9a649bcd14de12af
-EBUILD Levenshtein-0.20.7.ebuild 991 BLAKE2B 0f04ff79ebfd57e3f0615f086219560ab2b5c2aea834a11f46f78a9fe0697a3f8370eaeb9473b72c3c266ea9c9134b356e3770c73ca9cc897a8ec924e59fafd4 SHA512 fa296b0fa76d1adb457b0c1059a3db4a861952a0d59a0016e58d3a2a54677e8f53fdd452750238303ae3fd98e398c51682b65eba9b9e830e9a649bcd14de12af
 EBUILD Levenshtein-0.20.8.ebuild 996 BLAKE2B c3837b3b9ad001d2b5cd53f79c0d75667abc6844e37597b7ff94b7241315911577a03e3cac68ef49d553a0e469c32007b4ec5fb523c5180b918a1eed95c53916 SHA512 26e9bcfbd7b2948d9e5ec5316c3a372e8d06a0a036d6517be4600eec86926f8d780af9ecf724a24b65f52d1c9393f1f673bd1c8fd2a11b3b1965e90df048f187
 MISC metadata.xml 378 BLAKE2B 59900a9f2532c274a220466ff9bd5db4a4830b221119a95a0fdf82928b90c64b458b16c26257b69093ac08346bafbe54189bdb873bb8f119753a4f2243973eb9 SHA512 26b3ddc5d3843122a47941cb1e388e41f6a3f98e3f8d2f5108f50240b5c9005edb2b1e2df55c9046d48a8b4e07941f8ccd4fdee129f4ac948a47a6207b73c7ba
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 910e5989c085..da4831951a3e 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/asttokens/Manifest b/dev-python/asttokens/Manifest
index 8651cc3b8fd4..d65249fa10ce 100644
--- a/dev-python/asttokens/Manifest
+++ b/dev-python/asttokens/Manifest
@@ -1,3 +1,5 @@
 DIST asttokens-2.0.8.gh.tar.gz 50804 BLAKE2B 31b5fcf6c8c201279924da9297f16a1de087fe98e930dde341b54b29a54a23a462d44e1b2cc1c4695e7829b0dbb86c5a275ffac7c8430c191fd268026306c912 SHA512 e920aa50ba7f073f198182c053729e43c7cf3812a925cead258708ba88b82f6a7a32499810e67f346db79579607c07f211d924dc9e33b8bfdf44e5c9f171d53c
+DIST asttokens-2.1.0.gh.tar.gz 55584 BLAKE2B eb2a73a47fcbfe1b75e0058f7fcc650ebc3cac00e1f816d2b5b7d02b75aaa07445de854c624e3564455036e2d973bc841e9ad3c18232d88b9091cfc3a2f95c71 SHA512 f89fe2ef700c3c07f48a87e39805792d00abc1050e619a987b863f4befc186505749bde956a95eaf152c4d69e087e32f8fa997cfa5527bbeb87e0143da89a662
 EBUILD asttokens-2.0.8.ebuild 969 BLAKE2B 6b9b49fd5302742e776a749e00ae0b88bb7298a22f040a84702f63c33ee7569d00a4ee82668cf73ba16f3a4b4346efaefe278d2a20ba4ac6bcf37b7b51d5cd37 SHA512 97d7586f1f2bf7948e1e8d6f66021fbcce79e26d5b42510dd6a9fbc949185b876b55596fbdd18632ec633b2b228ae0708242378a354ba7e269a134cf9deb69e2
+EBUILD asttokens-2.1.0.ebuild 977 BLAKE2B 959cd5ea32e19d1ec47961f814a26edffad66f79bac906a64e8eb6ac39eb9992c0ef4923aabe87bb803208b7bf7ee75abc4c3bfb95cb53734ac450e9ea3fa134 SHA512 834be7aa087a7449f3183b1e05b7306b102d4332b81f5cffd57a5823decf4eb27e83b52dea6a4470c37304933c10f06ecf95fc934407b9472f742019113e2e98
 MISC metadata.xml 350 BLAKE2B c05dcff93454660cb741def5cb0ca82e56f0cba84bddb9604153b6d70625e4dfc9e15743c3448a0cb68d9b5ccf0778f8126390872bd8689df0e0ab2bed7e6582 SHA512 521762b1e8a542c5f3156014884c3d845b6fe882e819c924aa8023f8dff32a94490e64a1d1f700f5127bd867c60c4f0f7c4aed5c39f78e52bd8ebabd113403cf
diff --git a/dev-python/asttokens/asttokens-2.1.0.ebuild b/dev-python/asttokens/asttokens-2.1.0.ebuild
new file mode 100644
index 000000000000..839fb416705f
--- /dev/null
+++ b/dev-python/asttokens/asttokens-2.1.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Annotate Python AST trees with source text and token information"
+HOMEPAGE="
+	https://github.com/gristlabs/asttokens/
+	https://pypi.org/project/asttokens/
+"
+SRC_URI="
+	https://github.com/gristlabs/asttokens/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/astroid[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# test suite itself broken with new astroid versions, upstream less care
+	# https://github.com/gristlabs/asttokens/issues/79
+	tests/test_astroid.py
+)
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/automat/Manifest b/dev-python/automat/Manifest
index c7a112ae4d98..b022f7eea619 100644
--- a/dev-python/automat/Manifest
+++ b/dev-python/automat/Manifest
@@ -2,5 +2,7 @@ AUX automat-20.2.0-ignore-m2r.patch 835 BLAKE2B 5ea7ced5d5dc65c0439ef3ada8335917
 AUX automat-20.2.0-py311.patch 777 BLAKE2B fe26ab800644d6930a17690aa033c9b60ac9c50802c6fcab52bb13222dad34a356a1df03996e4b60c0b5af0d7a71668d8597c045bc7ea47129e25a1bef69b096 SHA512 0b06cee66e4193da7aed7caa007b2d89e1ab4bf6f29b22de5d85ada7e001f467847375a93a38a394d64d0dd716c696b403c5bafc4e84a1d7f0c75e4e8a7c8d6a
 AUX test_visualize-twisted-import-errors.patch 1999 BLAKE2B e551520aeb24b3df293eeda358fa3b9b3e33934af54ff6a7a205a0e1b5b7e916e34f8c81c103fa0fee93a22e7d0bc6ca3f7b8a17dedadeaccb02131ac23f94e4 SHA512 67f14d0b64333b872c0057eba32f77132a4bbf61c8867ec475c87552b3b553162c3e2a668ffeda0c75d85906273d50e4d80231213a3f46d1855316bb229fb6cb
 DIST Automat-20.2.0.tar.gz 61679 BLAKE2B 9dfb93a0bf0a348d8f7de0796b3e5715947eb84cc0aa507a453f438d2027ae877280ed6d7896192cee46f31c7d1c0eb6cb3dee36e1f13a315071513920c5b6d0 SHA512 715cb5dc087288492e6465a29e7d8502a84fadf451bc3d29da86335ea1c20f8efd9549f0c1eaac8800559dd8001dd73736c3bfacdc6321c83a35d2288d69632c
+DIST Automat-22.10.0.tar.gz 59099 BLAKE2B 509e64b1312f87f09a60243a00b832c8b3da4b09ef75151e82c8c406faabd24a56378baade87bd98685fa22922d1892ec20d81579eaf13e0315af68bb7909ac4 SHA512 5819cfe0687bf391949891562f3657f449cf9a8e8ea90c1537e89509dc618da1160856f92ab52dc450e0a7d51d0e4644bfe2db3d4108126a42ee1bea2f06bb7a
 EBUILD automat-20.2.0-r1.ebuild 1411 BLAKE2B f88e012d28b2f22c178002b406b7b06301d3bb6c4a11f8a90981c5a1a6821ca30f8018a119eb8d9a02885688b5aa67e7515bdab52aa7eb0290f53d59003eda9e SHA512 8b0b6c4e3c7bee28bddfa2dcc2e9bc5bca455eb2f9a48a0aab16f53de35c47ccabc9f567940fbd3d82bf2887e62886c7a4104b8f4ee65210066491e7eafb5a05
+EBUILD automat-22.10.0.ebuild 1176 BLAKE2B 781d18843bcaf109c500a9d19ce2493686369189dd4624d460209f22ac232b14433d2a2ffc9abadfc368a1819a494c1b0e4b4934e02a8caf55f7195807e69829 SHA512 2fa8f8b58332e5a364453772906bb748a006b1965485e53fc0ae8bccff08502befdd71878e8f9d92ded690f7a1b03b0f5a6a6160ec0a3a8cc3ad159ae0d231c5
 MISC metadata.xml 670 BLAKE2B a71e9da919b5a2d171c96df7f1de0f5ad0431fa6227d90fdf3a0ac47e5d0f9f56a4dbf7b247708c9f47a50756c5dfc78c90691ec38a6fbe543d4ce840c8c1ea6 SHA512 06362e4e337d503492b51d21164c858b071374cf8fe5a974bcf4b2f8bc870bfae21b1aa6e630f8b4c44ec5f900659b082b36a408e143e8d0e83916eb53f3ffd8
diff --git a/dev-python/automat/automat-22.10.0.ebuild b/dev-python/automat/automat-22.10.0.ebuild
new file mode 100644
index 000000000000..92b6538ddb0f
--- /dev/null
+++ b/dev-python/automat/automat-22.10.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+MY_P=${P^}
+DESCRIPTION="Self-service finite-state machines for the programmer on the go"
+HOMEPAGE="
+	https://github.com/glyph/automat/
+	https://pypi.org/project/Automat/
+"
+SRC_URI="mirror://pypi/${MY_P::1}/${PN^}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="examples"
+
+RDEPEND="
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_IGNORE=(
+	benchmark
+)
+
+python_install_all() {
+	if use examples; then
+		docinto examples
+		dodoc docs/examples/*.py
+	fi
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	einfo "For additional visualization functionality install both these optional dependencies"
+	einfo "    >=dev-python/twisted-16.1.1"
+	einfo "    media-gfx/graphviz[python]"
+}
diff --git a/dev-python/dulwich/Manifest b/dev-python/dulwich/Manifest
index d537eabb05e4..38e324f909e5 100644
--- a/dev-python/dulwich/Manifest
+++ b/dev-python/dulwich/Manifest
@@ -1,3 +1,5 @@
 DIST dulwich-0.20.46.tar.gz 426530 BLAKE2B 702564597a0367f454a396e4917d4fcd8b963d1847ddef688dccc7d7501f0073ae9a0ab422f31b8b0648210dafa953744ccf496b41fc75c7bea5090d75bf142c SHA512 4cc86afe90139d813d11ac2a8b96e84ca60ea28baab83a2af8da9a7cef2f3cdac647af858f5fc3806ae741a0b4fcf592d94f228adf8ab7b5b600be41f6acc356
+DIST dulwich-0.20.50.tar.gz 430389 BLAKE2B 1ea86fe00fa560311bdcff8c51904982a506fa670efb503f9103c5fb25036a792a87583fdf6435a6a6ec7bd6aaa2277c621359e1d99f55450c247fdc4be74e51 SHA512 506cc76f7deb8247b910fa4971e28eeda6ddd34703ac3c7a2f3b6525e6a9229bbec527b1965bebf7aa3da17b5adbd146916f247acacf9caf86d2494e60cc8626
 EBUILD dulwich-0.20.46.ebuild 1644 BLAKE2B c27c433faf91999c3a52391cde1bd690c19edaf77b12f5b7fbccb9c5c9c52f2cd7ff0bb1ee162991738ff46d8ab892b10d4590c3b2f6f0aa653b04a2dcbfdd0a SHA512 bd78b84c26d625706bffcecd4fa3cb187746392df0366f4107262628034dbbe7095ea9a54fc9d826acaa8ce315c7c5ec33d62a5b7c2e85d58c77d75504caeea6
+EBUILD dulwich-0.20.50.ebuild 1648 BLAKE2B a84255d92600ace910828a4db9c1ec73fc194f8cdf4e0ae4a73f60c41a090cc24c425345270f43b1a8cfb5463ad5733c43b6e044524b993373ae417e22baa9f6 SHA512 3ebe2c5e59d6e64cff08362840609579c6ab1e64d52ff8eb38edb8c3cad2cfb973ebcd33526fcc6d425acf57f3816a9079ca90e4b91bce0f2d2a1d0251d3a654
 MISC metadata.xml 556 BLAKE2B 240554ff522160e9508bf6debadafcc44b5ccc4074dd4c9d3ce82358963084c60a1afae9fafee6ab1e6e5d898940ccb4d1b524cebff155e61bf6707c9396b647 SHA512 a7cdca224a01d5bd26bf4a5adb0273977ddff61f75cd02f5642132656fd0c6608114617efcb068d834f107804666cf4fb3725967e804b73d2ddcb67342dc30de
diff --git a/dev-python/dulwich/dulwich-0.20.50.ebuild b/dev-python/dulwich/dulwich-0.20.50.ebuild
new file mode 100644
index 000000000000..afced5638714
--- /dev/null
+++ b/dev-python/dulwich/dulwich-0.20.50.ebuild
@@ -0,0 +1,59 @@
+# 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="Pure-Python implementation of the Git file formats and protocols"
+HOMEPAGE="
+	https://github.com/jelmer/dulwich/
+	https://pypi.org/project/dulwich/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2+ Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc examples test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/certifi[${PYTHON_USEDEP}]
+	dev-python/urllib3[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		!hppa? ( !ia64? ( !s390? (
+			dev-python/gevent[${PYTHON_USEDEP}]
+			dev-python/geventhttpclient[${PYTHON_USEDEP}]
+		) ) )
+		app-crypt/gpgme[python,${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/fastimport[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs
+
+python_test() {
+	# remove interference from the tests that do stuff like user.name
+	unset GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_AUTHOR_DATE \
+		GIT_COMMITTER_NAME GIT_COMMITTER_EMAIL GIT_COMMITTER_DATE EMAIL
+	# Do not use make check which rebuilds the extension and uses -Werror,
+	# causing unexpected failures.
+	"${EPYTHON}" -m unittest -v dulwich.tests.test_suite ||
+		die "tests failed with ${EPYTHON}"
+}
+
+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/executing/Manifest b/dev-python/executing/Manifest
index 7e3906509a46..868a24d6e1a6 100644
--- a/dev-python/executing/Manifest
+++ b/dev-python/executing/Manifest
@@ -2,8 +2,10 @@ DIST executing-0.10.0.gh.tar.gz 507523 BLAKE2B 5ab17adb1d40b83b0cf294aba350faf12
 DIST executing-1.0.0.gh.tar.gz 507720 BLAKE2B 601ddbd4c7dacd6b72317e9f07d8b8566d14b1c805bb7a2768449d51bf75818945f3b61b67dd0402d1d6171bd74165107ef98e835910529d82b8858bd016ac6d SHA512 912cea61ddb2ef12034432d68fa7239daad3c6365dbcbed72f08121b9fdc07e614b5c2233c53f5f7ee3472fca4f690af3db0944a0ed2c83623de8d682cff0a61
 DIST executing-1.1.0.gh.tar.gz 782214 BLAKE2B 56c97b1c0b6617db90a90f562409b406d0838e187fed4e45642506df85ae5e54824a393eb38982902bdb1c67fda2299bac282a5b260f3537cd06145b1c5b992e SHA512 090705c90051fdbf53310293fbb2e06bd2c2144cf83d3d02528768303c70871bd8b3a3d236705e29f8a9fc3132ca94bcb3375fe8834529a684b10b7c879faff0
 DIST executing-1.1.1.gh.tar.gz 661228 BLAKE2B 66ba8509a82d7c7354d70747d08e160423314718a2c1844260104eff474d39a244f880984e2388997f5620905a2f3fd90fcfa393f48e98cd5990e01a053012d6 SHA512 2b2277aa68d1abf2f1bbbf9010f7a27652f74e892e564a3c6269ea1110208b4c2fbf6a002b90423f5e9aa718cf698f996d21930b431241cf88012f20d244eeae
+DIST executing-1.2.0.gh.tar.gz 663650 BLAKE2B ba9420bfcf3805223e6b7e84d65499f3a73ef3156480586d2c5ffde4e438fcf8474f4f02c123953d04ee253de7a6a3a1b2587e57fcae546f3dae7af70a1aaa98 SHA512 c841958cc499b2d78c94570bf0556933d4a58ca5541f7a59e591be6036926ab79d5ae86bb95bbf649f3c3fb729109fe50cf04fbc72692e0cfe12edaa995ea0a6
 EBUILD executing-0.10.0.ebuild 992 BLAKE2B a52d276ea72ec7d34187b09af70d9480c5337927ce4a146ab08e396c0fd25901b2035bab4423ddaed7bcb898d5e43a005821168fbd5ee34f56ed75e4e5a8d000 SHA512 888739c7a6e7f8c656be8ea984bbde47ea8dae2e1469baf8657d2a266e1e34375dc53960da03ab11488f5ab73bc634ec4614770235e88e4f28802498a87d7c10
 EBUILD executing-1.0.0.ebuild 1062 BLAKE2B 098e9a6b7b41fbef780858a28d281b6701a05777a3e08103ce1b31d26cac09c0a3f916a095b0a1661284178b8e0fa5b2193e5168ccc48e4d21bca5e916f43ce3 SHA512 a398f67e9a23651577880eff68a84e209318f642db728008f5e945427c4cd246fcc08244075ffee65fb8afd0cd860c2e597c26e51386004cfc7d0a1bb5ae4bc6
 EBUILD executing-1.1.0.ebuild 1036 BLAKE2B 10df93fe68048fe963ab102c4940e9dfe94cf4afb816babc829c73ff5d2c5c8c284d90a1d2f256aa956727b5f5a0a58130982703b76e4e47828be570f2880bfc SHA512 2b04201dd014c747221f5167048a1041735ffc95dc8487afd102f354359134f3f84986a7d22e0c6babbaa46296ff874eee85fcb35c1b5ad1dc5cf66cd15ce6e1
 EBUILD executing-1.1.1.ebuild 1093 BLAKE2B 6e0030524ae316eecc5b836b425a41fe58ebbd44f399c398011b7e91d8e7cbfe8c92f0bbd9854ad110db96bf90a7b78bfe007e9ce65c91306c8dc59f35bd2aab SHA512 c040186ff206237af983264a18985b6c8fdebefe31878c22285d2f22c938a44d7b3129e2c20a9ecc811854cfbc174cccd6d249eebb61fc7cbf781be5aede1229
+EBUILD executing-1.2.0.ebuild 1093 BLAKE2B 6e0030524ae316eecc5b836b425a41fe58ebbd44f399c398011b7e91d8e7cbfe8c92f0bbd9854ad110db96bf90a7b78bfe007e9ce65c91306c8dc59f35bd2aab SHA512 c040186ff206237af983264a18985b6c8fdebefe31878c22285d2f22c938a44d7b3129e2c20a9ecc811854cfbc174cccd6d249eebb61fc7cbf781be5aede1229
 MISC metadata.xml 351 BLAKE2B 3e64042e3da09377bd27bcf09b9984eef77bbbc18e84f1e849571ff628cd15068fa680560cfc6c3650bf545e5869c6e3d6be0b4d2fc00f35c5fc58dcc3194eb1 SHA512 de199443767adf299da6c7d857c182071746b2ccf7b84015e9649675451ff336fdb7ac1df2d15951ae708ddf0529f2f1c9c19a2959f45c0dc30db1f341fb8d0f
diff --git a/dev-python/executing/executing-1.2.0.ebuild b/dev-python/executing/executing-1.2.0.ebuild
new file mode 100644
index 000000000000..eb688d352f1f
--- /dev/null
+++ b/dev-python/executing/executing-1.2.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Get information about what a Python frame is currently doing"
+HOMEPAGE="
+	https://github.com/alexmojaki/executing/
+	https://pypi.org/project/executing/
+"
+SRC_URI="
+	https://github.com/alexmojaki/executing/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/asttokens[${PYTHON_USEDEP}]
+		dev-python/littleutils[${PYTHON_USEDEP}]
+		dev-python/rich[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+python_test() {
+	# this test explodes when collected by pytest
+	"${EPYTHON}" tests/test_main.py || die "Tests failed with ${EPYTHON}"
+	epytest tests/test_pytest.py
+}
+
+pkg_postinst() {
+	optfeature "getting node's source code" dev-python/asttokens
+}
diff --git a/dev-python/httplib2/Manifest b/dev-python/httplib2/Manifest
index af114b65af89..a1bd380795df 100644
--- a/dev-python/httplib2/Manifest
+++ b/dev-python/httplib2/Manifest
@@ -1,4 +1,6 @@
 AUX httplib2-0.12.1-use-system-cacerts.patch 582 BLAKE2B ee2a407452ab557eec0934a175958ac7f1d1af3ad588b7f288b9e9f0a3d2b08146fdee05943e2681a1462986098256fa818d9561a4541ba0ed3b95984172271f SHA512 ff1b982e9f95f6efa53064b2a8d2748bf5a91a26fdaeb584f044d8e036b91034dbcf4719cb08855de412d6abcc33fe82e18fbd250c14d0ae2fea47b412fcafc3
 DIST httplib2-0.20.4.gh.tar.gz 371778 BLAKE2B 85e2dd0b6213cc5015d4f2f7f923209a61649f948f003eaf3c95c956cb08e6f5bf9dc4e40109c0ddea6a18ab47870a21c7d367ea1eeec2644507568f4e271005 SHA512 46396a9bb439e61939e481a2502567a6dc40686471267ea4c357f141ac138193107f90ac465db683e4ab71e5d92249b810657bff0cb74af7a37a9a23c8320741
+DIST httplib2-0.21.0.gh.tar.gz 373245 BLAKE2B d7194773c2b61cbf579da5aea7f52cb3481eed86896be215b942de7f9418a39c4a934868c9e01b6bfb050a32e4b7bc7ff775b28af5ba5db2827131e436bf0b04 SHA512 8269014f05f5e4b668c7dea8ae708b27a60b4216d712a93ab58b74f399ab5bc0dcdcd8c1411ccff587c7bdb6bc20917451ad969e5bef2d5c5262327cabe17bbb
 EBUILD httplib2-0.20.4.ebuild 1859 BLAKE2B 4283796260e559d3187cc44eeb7f7dcf5386154b63c361521a0bd71da7b03b6e57eeb15bb9dcc280de0db5e74280b932a490aac2baec50d9d473081343d4b774 SHA512 b74e27d7178ce8d364402db7ec7237d93d190dfa916ac07cae84bea3d9abd7b7b3aafb4944f8a7d72bbb78032650c0cf926955f2ed1b26c6c41a2fcd384bff08
+EBUILD httplib2-0.21.0.ebuild 1867 BLAKE2B e83721e037b795859955961f38673a52adcde04f4cd95c03c81f565876d87460a6761c3607515a3dd5ebadfffc1c421f8acd7702a47bb79da842e71c526c9698 SHA512 924696f46fa3f376a9e3f2e1f85f29c38e36f6a9e35b21e5408c2d97b67505a9af96e93761b23d1ce9082e68d3c15354a06b571c3050b12034c85e1283f43a5b
 MISC metadata.xml 406 BLAKE2B fcac2ef4d82fd109083a57097d0e8b99e1fbb3103a2e8ffa29cd77acc0300b0d91d30661a5721f25680b822a1e0f22e4e457fa05bd8948c68b0e3712146a3de6 SHA512 5a94811b95720f0bdb57c725e35313ecc5a15f12a8f75e39c9034440eed957cfb3dd9e86437c0c7b1df51f47602723a7e94ce2b62509dab4eaa4feac02e1558c
diff --git a/dev-python/httplib2/httplib2-0.21.0.ebuild b/dev-python/httplib2/httplib2-0.21.0.ebuild
new file mode 100644
index 000000000000..76ca9a5de17e
--- /dev/null
+++ b/dev-python/httplib2/httplib2-0.21.0.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A comprehensive HTTP client library"
+HOMEPAGE="
+	https://pypi.org/project/httplib2/
+	https://github.com/httplib2/httplib2/
+"
+SRC_URI="
+	https://github.com/httplib2/httplib2/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+RDEPEND="
+	app-misc/ca-certificates
+	dev-python/pyparsing[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-libs/openssl
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+PATCHES=( "${FILESDIR}"/${PN}-0.12.1-use-system-cacerts.patch )
+
+src_prepare() {
+	sed -i -e '/--cov/d' setup.cfg || die
+	# cryptography dep is entirely optional, and has a good fallback
+	sed -i -e 's:from cryptography.*:pass:' tests/__init__.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# broken by using system certificates
+		tests/test_cacerts_from_env.py::test_certs_file_from_builtin
+		tests/test_cacerts_from_env.py::test_certs_file_from_environment
+		tests/test_cacerts_from_env.py::test_with_certifi_removed_from_modules
+
+		# broken by new PySocks, probably
+		tests/test_proxy.py::test_server_not_found_error_is_raised_for_invalid_hostname
+		tests/test_proxy.py::test_socks5_auth
+
+		# broken by recerting (TODO)
+		tests/test_https.py::test_min_tls_version
+		tests/test_https.py::test_max_tls_version
+
+		# new cryptography or openssl-3?
+		tests/test_https.py::test_client_cert_password_verified
+	)
+
+	# tests in python* are replaced by tests/
+	# upstream fails at cleaning up stuff
+	epytest tests
+}
diff --git a/dev-python/jaraco-collections/Manifest b/dev-python/jaraco-collections/Manifest
index d0d55db2c28f..2156464e122b 100644
--- a/dev-python/jaraco-collections/Manifest
+++ b/dev-python/jaraco-collections/Manifest
@@ -1,5 +1,7 @@
 DIST jaraco.collections-3.5.2.tar.gz 16038 BLAKE2B 3f7f48f4c65e44aba621dd894a84711473ff42e37be8067e356cd6ca0f8740c667cb282bddad4315ddd7c8922c316c57b40984455f0af4bc8bbf4304a12a6779 SHA512 9567ee44fbc5010cc81ee24de792e53b5a225759b5f7d2e7dd932b0cae38e2035fddb5bd3dee5dc08fea9c61e2bf9087418cd192d81c72760f1e0d95a7b3788c
 DIST jaraco.collections-3.6.0.tar.gz 16720 BLAKE2B 283e9570729ded2b33b6fd1ab7a7b1414588a48455fc3a3103e4a3fe3e4eadae0d9e925a2f1e2de6ee8973121e1d01923c4c3ea72c618033f776c2e4b9add558 SHA512 a5cfa42e60d4a63463d159090086f9400f6faeeaedd9cba7d46bdfc9fc328b0056d6f2e428de93bfd59ea4f2bdc5d8b71158c5f1592a62e2ebd8e1ed7471e4ef
+DIST jaraco.collections-3.7.0.tar.gz 16874 BLAKE2B 6505856c1e3bb3fe55d84a5c8804481b2057b738cb37dc613f2dacc9fc19772eec3c9e4c310467ef7fcde09b3aff01b974a2ff8976988fb3802a7c77f35407bb SHA512 6ebf276b662bdd78622c345d64be8b919de8e10e248c78a6107e65a58f4b158ba788685f518d1590028c2bc9a13b1a48c30d5e30f964696a87330dba3b1432d7
 EBUILD jaraco-collections-3.5.2.ebuild 773 BLAKE2B 72cd4c3b4b219d3a82fa23071c599053b05f34fd4820e49539ef537c0a8c4c765ed7d2207d5b08dc90fe480dfdd72c3486f107328d9e0811bef69ee5e3aef7b6 SHA512 d2c62d8f9860fba5e2e0b2cb95cd4590e01776944061d4bbd1a56cacf2d66cae55da2afe7380634a2e2a792ae02f30ae0ff12a97adef0556fc2c750129d93669
 EBUILD jaraco-collections-3.6.0.ebuild 779 BLAKE2B e35b7a23bb44f4c0650a0327af153d107cecc8fc85894215fe8f60399f5e4e15f7b50cd68aaeb7ab3697ce28d391afb357a189eca090b24a4bad11365efe0561 SHA512 2b69af5396fe78fe8bc92f566c93f618bc3961dde8f52b25a0c5f44081a3f24dd7a0939d7aa035b71be28faba86a9273f85a68ed9daa2aafc676b803d6661d43
+EBUILD jaraco-collections-3.7.0.ebuild 779 BLAKE2B e35b7a23bb44f4c0650a0327af153d107cecc8fc85894215fe8f60399f5e4e15f7b50cd68aaeb7ab3697ce28d391afb357a189eca090b24a4bad11365efe0561 SHA512 2b69af5396fe78fe8bc92f566c93f618bc3961dde8f52b25a0c5f44081a3f24dd7a0939d7aa035b71be28faba86a9273f85a68ed9daa2aafc676b803d6661d43
 MISC metadata.xml 578 BLAKE2B c6ad7ecaee92099645bcbd75ed9eff9da2a83268e8a7f828b2dbaf5414228f26b40f09fa37fd156d128742b111cfcacb3e177970b217d4de890ca7262275b26f SHA512 b2602fb629500021bd8fad159ddfcdc76a11f15fe2a51d0d25d5d687ae09170f6cc8438c252e8cb2792ca43bec7be65e249a799582f17c882639e30a9222a0ec
diff --git a/dev-python/jaraco-collections/jaraco-collections-3.7.0.ebuild b/dev-python/jaraco-collections/jaraco-collections-3.7.0.ebuild
new file mode 100644
index 000000000000..93d208be4d8a
--- /dev/null
+++ b/dev-python/jaraco-collections/jaraco-collections-3.7.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+MY_P=${P/-/.}
+DESCRIPTION="Models and classes to supplement the stdlib collections module"
+HOMEPAGE="
+	https://github.com/jaraco/jaraco.collections/
+	https://pypi.org/project/jaraco.collections/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN/-/.}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	dev-python/jaraco-classes[${PYTHON_USEDEP}]
+	dev-python/jaraco-text[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/kafka-python/Manifest b/dev-python/kafka-python/Manifest
index b72a1405583c..5528bbece1a6 100644
--- a/dev-python/kafka-python/Manifest
+++ b/dev-python/kafka-python/Manifest
@@ -1,3 +1,3 @@
 DIST kafka-python-2.0.2.tar.gz 327238 BLAKE2B 9d8bdee1cedcc3c7c0bee9d900bb815552b29f50ec45b7db9d1052a26eb772c84d92648ccc0d498189fc44314f5c8c30529fa61cb983481f2e2480e009630f91 SHA512 e193a8fe5852d2134e854749115feba46a0b8ff748336989a27bf56acba1124dbb8a5d841670a67ee26eef030a686d931d03d329f978b2eef7904183e83d2594
-EBUILD kafka-python-2.0.2.ebuild 1239 BLAKE2B 98db7060b2cafd5bcb26b0314d571353a2a16a20fbee85c1accb98e88b1e859be9f364cff2d6c11542826f3963bbc2929e57aaf73af7ea9606c3f58de2de159e SHA512 9fb90063a8c25736450098eb40db2b67be3844536d9cdda5b78e769515d8a20ed3224ef36e1c0b243bc2af7cf9529851a3917313087068b9036a3e17b8e511c9
+EBUILD kafka-python-2.0.2.ebuild 1253 BLAKE2B e42b7cc985c6eafc66b2600f733f11c62f684faad7bf0aefd2e680cc66371b161abc77b89907d21c22462647db7a7ef6b67665dd9b15ed83fa1cb8b0b5479ed7 SHA512 28299e2cd8ded0d54f8a08f16ed6a3d45d9805ddaab90e5b08cdfb94074c7f4c3f685995bee364b1bbbcc6b43c595e7500f1b641fb6f60d064329280573b1c5a
 MISC metadata.xml 307 BLAKE2B d5a0188eb0aaf189135a021a211b30e2b641f31c83260999f8e0cc4cd12d78a9db90c5be3e5f958dd2f2ffef3177c1833c8e7d2c1b7624c3ccb0d2d5c7ddb868 SHA512 7452ad3874e6d102ebfe6ffa1a1c0ea37d477c100cfc434f9bc7259d04e08789bd2a926dca92f8e819de337028751b4738f24b9f8d2b9bcb59ef85053177b78a
diff --git a/dev-python/kafka-python/kafka-python-2.0.2.ebuild b/dev-python/kafka-python/kafka-python-2.0.2.ebuild
index d492752a2026..a3dcd721f51d 100644
--- a/dev-python/kafka-python/kafka-python-2.0.2.ebuild
+++ b/dev-python/kafka-python/kafka-python-2.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -21,8 +21,8 @@ BDEPEND="
 		dev-python/lz4[${PYTHON_USEDEP}]
 		dev-python/mock[${PYTHON_USEDEP}]
 		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/python-zstandard[${PYTHON_USEDEP}]
 		dev-python/snappy[${PYTHON_USEDEP}]
-		dev-python/zstandard[${PYTHON_USEDEP}]
 	)"
 
 distutils_enable_tests pytest
@@ -40,5 +40,5 @@ python_test() {
 pkg_postinst() {
 	optfeature "LZ4 compression/decompression support" dev-python/lz4
 	optfeature "Snappy compression support" dev-python/snappy
-	optfeature "ZSTD compression/decompression support" dev-python/zstandard
+	optfeature "ZSTD compression/decompression support" dev-python/python-zstandard
 }
diff --git a/dev-python/kombu/Manifest b/dev-python/kombu/Manifest
index 3ca6d209fa66..3968f34fda37 100644
--- a/dev-python/kombu/Manifest
+++ b/dev-python/kombu/Manifest
@@ -1,5 +1,5 @@
 DIST kombu-5.2.4.tar.gz 423450 BLAKE2B d0a180a4644876594eacea51706ca74fa4a95729ba965f69694da9694c2a91641ccf05aa1aec8a64f9d8c2260477d00bc2664d0a50143562b46524c98e4159b1 SHA512 695813bee71d627649e772b45b25494784a6a81bcad92331160705e34d8b2268fa90629983ebcfd04ec23208508d422f1834cc56895532911602d58ec0090a03
 DIST kombu-5.3.0b2.tar.gz 434341 BLAKE2B 6d5188f7682ccf2daa6ca4ed0fec7988cd4781954be0fdc847c18e47d5c425a657c3df0f5bda7999c764de293626e119a4645e92ff7bf23328f4fcb9d6f4cd4a SHA512 3000577cc3b2acfb378396640245f2bdf4c9e5e1d45252a27e4e168e22ff4070f480ad1fd70059b24cd710c452924bff1716f69bedcf020446f428f0967de832
-EBUILD kombu-5.2.4.ebuild 2287 BLAKE2B 5dcdca0bb5c9005e4feaa38c60b84f8039386b98abd57039c1efbdffdc99d41b081933720cef82d7b707b78aa1e6de98c6c95128a820ead538e7756a8128fd54 SHA512 eaa1b53420a8acd7b1eff84c08a9def67286d0739228956496b6bd987660f0c797f2a2c5e6fb853dd7703561cbee492dea283d20b91cff6ed917bda4788546e4
-EBUILD kombu-5.3.0_beta2.ebuild 2616 BLAKE2B a6210e0646d0de8da3c67397f46d9a7f9c3a8aed4b960c8480b9a90ac968af348500df19fb9bb7705003b62edf2004a8cf7e9b22529ddd9332dd1afd96aa0100 SHA512 9bacf11c9584a5d4e35a864c737fbf4792ba5db64608ab0ac6e1a0107226a8392ac33c620d8278e08c22c9b1802e97221d1f5b91989924474d58cebb38e2cb3f
+EBUILD kombu-5.2.4.ebuild 2301 BLAKE2B ab699ceb40cd06f5fbd0e42f48f765fea10ab037f6b6c1ff8eb7052149b388e70c834fbc998cced70e473fad33dae3b126e57a2585e25a5c2abc5b3ff0f995e9 SHA512 9b794326c97bd0c2aa5726853eee2ba4b019f6ca640c46f1982d7a091ca4300cf01b8ecb9150d85e13d6db0185a18ba8b52172886270b3d2db7133cfa14e6684
+EBUILD kombu-5.3.0_beta2.ebuild 2630 BLAKE2B dbd36cab78080d524e0b1820fc2ab1c6c91e4a47ecfb50d524320c4fd55b75e2b223fe204daa8216f1b5e0fc7233898ebd965c849c884aaee02d27f97eb9913a SHA512 bdaa62f0c3a8f62af990dc8d0f64101b27b38d8b78efbe7716560b834930e4c8fcacc08cd23f96c0b7e03f0362ce1afbea287c84f70e72d90b68f0857d4fa181
 MISC metadata.xml 385 BLAKE2B 174062695338558e56601db5b6ced5eff3f6e22c1b840f1fe3d9046d6bc5f810fe1d3c73a3e7f009dae9129050dcb6824aca48ca86c006ecbd53f069884e60ef SHA512 eba10417212f73894b7bf749962c055c44ca10afbbff80f57e36f74edd016097c4854625a94e5a3522b3adf638c2c150e357f163f1617a79dd7fb54c234a1435
diff --git a/dev-python/kombu/kombu-5.2.4.ebuild b/dev-python/kombu/kombu-5.2.4.ebuild
index ee3abf177c8a..566a2f02ed3f 100644
--- a/dev-python/kombu/kombu-5.2.4.ebuild
+++ b/dev-python/kombu/kombu-5.2.4.ebuild
@@ -33,11 +33,11 @@ BDEPEND="
 		dev-python/pycurl[${PYTHON_USEDEP}]
 		>=dev-python/pymongo-3.3.0[${PYTHON_USEDEP}]
 		dev-python/Pyro4[${PYTHON_USEDEP}]
+		dev-python/python-zstandard[${PYTHON_USEDEP}]
 		dev-python/pytz[${PYTHON_USEDEP}]
 		>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
 		>=dev-python/redis-py-3.3.11[${PYTHON_USEDEP}]
 		dev-python/sqlalchemy[${PYTHON_USEDEP}]
-		dev-python/zstandard[${PYTHON_USEDEP}]
 	)
 "
 
@@ -76,5 +76,5 @@ pkg_postinst() {
 	optfeature "Zookeeper backend" dev-python/kazoo
 	optfeature "MessagePack (de)serializer for Python" dev-python/msgpack
 	optfeature "brotli compression" "app-arch/brotli[python]"
-	optfeature "zstd compression" dev-python/zstandard
+	optfeature "zstd compression" dev-python/python-zstandard
 }
diff --git a/dev-python/kombu/kombu-5.3.0_beta2.ebuild b/dev-python/kombu/kombu-5.3.0_beta2.ebuild
index 2da90fe54985..9f7f2d69998c 100644
--- a/dev-python/kombu/kombu-5.3.0_beta2.ebuild
+++ b/dev-python/kombu/kombu-5.3.0_beta2.ebuild
@@ -38,11 +38,11 @@ BDEPEND="
 		>=dev-python/pymongo-4.1.1[${PYTHON_USEDEP}]
 		dev-python/Pyro4[${PYTHON_USEDEP}]
 		dev-python/pytest-freezegun[${PYTHON_USEDEP}]
+		dev-python/python-zstandard[${PYTHON_USEDEP}]
 		dev-python/pytz[${PYTHON_USEDEP}]
 		>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
 		>=dev-python/redis-py-4.2.2[${PYTHON_USEDEP}]
 		dev-python/sqlalchemy[${PYTHON_USEDEP}]
-		dev-python/zstandard[${PYTHON_USEDEP}]
 	)
 "
 
@@ -90,5 +90,5 @@ pkg_postinst() {
 	optfeature "yaml backend" dev-python/pyyaml
 	optfeature "MessagePack (de)serializer for Python" dev-python/msgpack
 	optfeature "brotli compression" "app-arch/brotli[python]"
-	optfeature "zstd compression" dev-python/zstandard
+	optfeature "zstd compression" dev-python/python-zstandard
 }
diff --git a/dev-python/pillow/Manifest b/dev-python/pillow/Manifest
index f544ae31ed10..2e45aeb503be 100644
--- a/dev-python/pillow/Manifest
+++ b/dev-python/pillow/Manifest
@@ -1,5 +1,7 @@
 DIST pillow-9.1.1.tar.gz 49753799 BLAKE2B 969a338f768951c340177d0590c50ba1213f48810870ac3fdbc2556c57344e356e0cf1ef080bde29bf89291adbf9f64b2dd1f950260d2ce5c0eb28d197f2dfe2 SHA512 8c05c0af6be992667d764046c6d7c189e1486d6ab987474c15e3bc8a64b9955d4c91d94b94ea46ef6d1c6f343ba424240dfa7d758c666bec40fa580728206a5f
 DIST pillow-9.2.0.gh.tar.gz 50018953 BLAKE2B 72dc1175c08276531c5949f0eb19bdce37afb25303614d489375c57aba19c5f708db7d149a033490f95848bdd6b4249dd36993205069e7f471a2efd602cb3ac4 SHA512 02926d6c88aa8bc0df05b0ecd04b9852821a6400a24c6e70b66d4092eb3174139dee116adfa94ba8b7f3df8f6725cc68b32705f308f4347153e0112d987fc5f2
+DIST pillow-9.3.0.gh.tar.gz 50370806 BLAKE2B d0d4775c8b60e40560328e4f1c14055743d1a826b0ab01353075f1f48a461bcd8bf5883f18713976399f9b0f688125f3a883ea5818a359db9e540aac8895f02a SHA512 60c529d8a222a521a0c3f4254917aa3f6c5a47c7cb8930b4b9a05ef442d1a7e776018dc4ac834a9effc1342f8457898cae79820531ff430728f6c39d6297b2d7
 EBUILD pillow-9.1.1.ebuild 3143 BLAKE2B fad8ba84632eb7c3629f29ffad6ab4446b867c406ef050beba384d11dd378f9fd6445d587dee4822c4c487dbc152ff49cefb0073199e614188af44e6244a00ce SHA512 2826d15d906f484a431629d69894da2a83dd6c966bcf0404d9c3bd4412e6504c8c94521efbdb1524d787c7ad2df91264611a94c47aff987b48ccd841f8393ee2
 EBUILD pillow-9.2.0.ebuild 3225 BLAKE2B 0498b5a0ac29bfa6f77f0bbc5819d7984fa4aa52226ac2fc74fabffd4fcbb052826902260b2a9cb7a132649494bdc9fd8149f42e78cbeef1bf8727194744a327 SHA512 1e1e23cef4f46dd655e214416d289eb7b53f8a6f89a82b65ae649532bbc934b1239b026f1decc15f1af7696c2d0fafc4a4f89e3cd8d9abdf2a3acee7b3c1d399
+EBUILD pillow-9.3.0.ebuild 3231 BLAKE2B b9099c8c2cb55798aed53d794c5a2ad6286bb48949aa165e644f8edfdb263cc368149db8438e9cf163869083a66ade9210fbd51f677ac7e7c5bf55e7d4f6d228 SHA512 9ee2b59677626a381b2ce5312db1414f957274f727d0bd7f580d3e4de4de2d8abbcbb17890fea0eb6ee6ed6b71ea2df4a4b26c2d2031b51f603f21b0823ee30a
 MISC metadata.xml 480 BLAKE2B b42e6b01b1572a0688ef93025a0baaa95b9fd0c3a5eabcddcea7145dd880a95f11859b255ae24a376ca792559ffcf940c67da1b19f2f579dbc6ef6de68903749 SHA512 b98a33136aef4498051370bce3295b000687ddb80b4d909b26b32af61b4e4638d07269f7924ae039420af63236aa74b51e23d2feae1c83349683073c69714582
diff --git a/dev-python/pillow/pillow-9.3.0.ebuild b/dev-python/pillow/pillow-9.3.0.ebuild
new file mode 100644
index 000000000000..351a6629aba3
--- /dev/null
+++ b/dev-python/pillow/pillow-9.3.0.ebuild
@@ -0,0 +1,125 @@
+# 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='tk?,threads(+)'
+
+inherit distutils-r1 toolchain-funcs virtualx
+
+MY_PN=Pillow
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Python Imaging Library (fork)"
+HOMEPAGE="
+	https://python-pillow.org/
+	https://github.com/python-pillow/
+	https://pypi.org/project/Pillow/
+"
+SRC_URI="
+	https://github.com/python-pillow/Pillow/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="HPND"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples imagequant +jpeg jpeg2k lcms test tiff tk truetype webp xcb zlib"
+REQUIRED_USE="test? ( jpeg jpeg2k tiff truetype )"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	imagequant? ( media-gfx/libimagequant:0 )
+	jpeg? ( media-libs/libjpeg-turbo )
+	jpeg2k? ( media-libs/openjpeg:2= )
+	lcms? ( media-libs/lcms:2= )
+	tiff? ( media-libs/tiff:0=[jpeg,zlib] )
+	truetype? ( media-libs/freetype:2= )
+	webp? ( media-libs/libwebp:0= )
+	xcb? ( x11-libs/libxcb )
+	zlib? ( sys-libs/zlib:0= )
+"
+RDEPEND="
+	${DEPEND}
+	dev-python/olefile[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	virtual/pkgconfig
+	test? (
+		${RDEPEND}
+		dev-python/defusedxml[${PYTHON_USEDEP}]
+		dev-python/packaging[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		|| (
+			media-gfx/imagemagick[png]
+			media-gfx/graphicsmagick[png]
+		)
+	)
+"
+
+EPYTEST_DESELECT=(
+	# TODO; incompatible Qt version?
+	Tests/test_qt_image_qapplication.py::test_sanity
+)
+
+usepil() {
+	usex "${1}" enable disable
+}
+
+python_configure_all() {
+	# It's important that these flags are also passed during the install phase
+	# as well. Make sure of that if you change the lines below. See bug 661308.
+	cat >> setup.cfg <<-EOF || die
+		[build_ext]
+		disable_platform_guessing = True
+		$(usepil truetype)_freetype = True
+		$(usepil jpeg)_jpeg = True
+		$(usepil jpeg2k)_jpeg2000 = True
+		$(usepil lcms)_lcms = True
+		$(usepil tiff)_tiff = True
+		$(usepil imagequant)_imagequant = True
+		$(usepil webp)_webp = True
+		$(usepil webp)_webpmux = True
+		$(usepil xcb)_xcb = True
+		$(usepil zlib)_zlib = True
+	EOF
+
+	# setup.py won't let us add the right toolchain paths but it does
+	# accept additional ones from INCLUDE and LIB so set these. You
+	# wouldn't normally need these at all as the toolchain should look
+	# here anyway but it doesn't for this setup.py.
+	export \
+		INCLUDE="${ESYSROOT}"/usr/include \
+		LIB="${ESYSROOT}"/usr/$(get_libdir)
+
+	# We have patched in this env var.
+	tc-export PKG_CONFIG
+}
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	"${EPYTHON}" selftest.py --installed || die "selftest failed with ${EPYTHON}"
+	# no:relaxed: pytest-relaxed plugin make our tests fail. deactivate if installed
+	epytest -p no:relaxed || die "Tests failed with ${EPYTHON}"
+}
+
+python_install() {
+	python_doheader src/libImaging/*.h
+	distutils-r1_python_install
+}
+
+python_install_all() {
+	if use examples ; then
+		docinto example
+		dodoc docs/example/*
+		docompress -x /usr/share/doc/${PF}/example
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/python-utils/Manifest b/dev-python/python-utils/Manifest
index 06c792299fe0..b33a19481fe5 100644
--- a/dev-python/python-utils/Manifest
+++ b/dev-python/python-utils/Manifest
@@ -1,3 +1,5 @@
 DIST python-utils-3.3.3.tar.gz 28031 BLAKE2B d491e5ba1c8e2ab8d7c7797757cb6163f5f4cff223b898b4a9502f85b740df3c128234fd0034fc422d17efb38cfc7056aa7fb3aee9441f1f763fc742930da5b3 SHA512 6becb1873da57f66aec26b98dab22c7917dacddd1a843a0c6e4f2939986a33888cb3b6addfa3b98660f9f35ca54763cf6da34e4099cd3e21987660f12a574b27
+DIST python-utils-3.4.5.tar.gz 28608 BLAKE2B c933bf358ad61563fc35bc87329367946a64216afaddb3cd5bff861e0e1fadcc4d18c7a8ff7820bfee5938bc7ede3cea9d450ecc5b7c0825f917c59576d7195c SHA512 35b4b49dfce56e9e530fe979c070889296079d3a1fd548186bf6dbd6fdbce5363818b52a5d7559b7af3bd32561d87639565298386883351168a267fa88e1ff7f
 EBUILD python-utils-3.3.3.ebuild 762 BLAKE2B 514736bc1166f789c5fa133adeffe37ebcb2eef44066d2932edfab1abca349c9454708722c0ba3fba167b657750cb189ab4997ddb3a27244200d76085da571f0 SHA512 3d3cb67467d01032b072314a34c838abad8ed817e37cbb76cdc2fe363679e4c27fb2aa90b9dd0c8115f9153d7e33c78f7370828732ad6838457e9f402a61de4a
+EBUILD python-utils-3.4.5.ebuild 763 BLAKE2B f5b8c60a98b1c46721314c73971bf8cb793c96304aa12ba9be47751146456f6f7664fad0261f5fd4f6a9b2b3f83831b5204658a287d643b95496c326e83d916f SHA512 119f736a64b9643b058c18bf6e2a159e8310e7968d75599c9b7b0e3cafaccfde922ea260423994d6085b97f6310101cbd38009c2819613b429c1db505c291bcf
 MISC metadata.xml 340 BLAKE2B dc9b0299a4b93a0e53cc8e8e5ab494a8bf04ea54da4c2f9a658ca485925f86b5a765299c6680ecbff1e29a4e94a88dcac1891e440c788ada76b2123e352ac6f2 SHA512 68222ff7625c88a73f918e1864b67a2a44ef128023668b2a8706e873b4a8703928f1961baa0b304fe8fa075261edcd183bae02a2416813b283aa57c16bf6e200
diff --git a/dev-python/python-utils/python-utils-3.4.5.ebuild b/dev-python/python-utils/python-utils-3.4.5.ebuild
new file mode 100644
index 000000000000..ce049eb48c18
--- /dev/null
+++ b/dev-python/python-utils/python-utils-3.4.5.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..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Collection of small Python functions & classes"
+HOMEPAGE="
+	https://github.com/WoLpH/python-utils/
+	https://pypi.org/project/python-utils/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	test? (
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_IGNORE=(
+	docs
+	_python_utils_tests/test_logger.py
+	python_utils/loguru.py
+)
+
+python_prepare_all() {
+	sed -i -e '/--cov/d' -e '/--mypy/d' pytest.ini || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/python-zstandard/Manifest b/dev-python/python-zstandard/Manifest
new file mode 100644
index 000000000000..3848d3661aa7
--- /dev/null
+++ b/dev-python/python-zstandard/Manifest
@@ -0,0 +1,5 @@
+DIST python-zstandard-0.18.0.gh.tar.gz 678765 BLAKE2B 7a297e76d65c6f5adbb87cc615f474d58c66bc9ee4050eb10277b596f7efda9109de815188b6efe55beb7aa637ec4779359a573c87094661ae28a080c9619576 SHA512 d573da893e3a372143271c7d9dec15cd4e9dd7355d2069e283df8b3feadbf999dddcc0aa37a2831a370526b2b045497f46326dcf13d3680dd8ee624bca1e7666
+DIST python-zstandard-0.19.0.gh.tar.gz 683942 BLAKE2B 5b28fb6360147f87fb658d28652e5e43b0e41ff3cc31e46d91b1dcdd5334869f9a10a598f3d1d15a8c0f02afc59d009a8088ba3e81066f1a5f1ad9c05ebd4a1d SHA512 56e7b43161940f182ff5a0745bb6bdb2710c9a61140c4a84b690e0abd18c8b862211ab2b1ba36cfd99fe75bb0ae00af7de798b010b2bd4c5a44d691d4fa0c63d
+EBUILD python-zstandard-0.18.0.ebuild 1610 BLAKE2B ef59f4cff1c527f06d41d773d61ce77295f33edf151761229802c94c9d4be7fc5fd7600627b01b5024a2d2349cb34005475015459ddfab2593475eb5b2fa3c1a SHA512 888f6e0437ef90e2945c01f324bd86ed9e18a340bc91e5a1c9c02469726317175e45a75ddca719f278b81594fa61f38501f3cdb6f4ea89e25319747483b0230a
+EBUILD python-zstandard-0.19.0.ebuild 1564 BLAKE2B 972326c59ed08022ae7080478ba11d1dc3ad8974332c1eb04a4ce4dba6f9336c69fc2fe0e329a0b909758802a11577764604c4094107fd1758536f3a2dfb5471 SHA512 fea083995ac33c6b86e3b02bf9cd0f545e6d6009e6a1df8ec3ba3ea6de9de429c1147d2869a0bfe3fee86b5688588aa32c21caec086c1db7b3236c5e8dde8604
+MISC metadata.xml 378 BLAKE2B dd5834c84bb375812b3a3cfcc00d29aa43ac8954b044e188e8f38bdca93fdf1ce98fe78b78dbeccd935c83ca10f3ce18f893e5720dd8991118b6c69149a4ac61 SHA512 06554d973b525d53c680c3e43041f33125dad222339e645294fbc22670a7eadb0e9bf8a3b0771d2b2fb8f136d958eadb32c295179d1547c50ae26754360609f3
diff --git a/dev-python/zstandard/metadata.xml b/dev-python/python-zstandard/metadata.xml
index 9bca3117a180..9bca3117a180 100644
--- a/dev-python/zstandard/metadata.xml
+++ b/dev-python/python-zstandard/metadata.xml
diff --git a/dev-python/zstandard/zstandard-0.18.0.ebuild b/dev-python/python-zstandard/python-zstandard-0.18.0.ebuild
index d09cefcdc730..d09cefcdc730 100644
--- a/dev-python/zstandard/zstandard-0.18.0.ebuild
+++ b/dev-python/python-zstandard/python-zstandard-0.18.0.ebuild
diff --git a/dev-python/python-zstandard/python-zstandard-0.19.0.ebuild b/dev-python/python-zstandard/python-zstandard-0.19.0.ebuild
new file mode 100644
index 000000000000..fefdae7a2d6f
--- /dev/null
+++ b/dev-python/python-zstandard/python-zstandard-0.19.0.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Zstandard Bindings for Python"
+HOMEPAGE="
+	https://github.com/indygreg/python-zstandard/
+	https://pypi.org/project/zstandard/
+"
+SRC_URI="
+	https://github.com/indygreg/python-zstandard/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+DEPEND="
+	app-arch/zstd:=
+"
+RDEPEND="
+	${DEPEND}
+	$(python_gen_cond_dep '
+		>=dev-python/cffi-1.14.0-r2:=[${PYTHON_USEDEP}]
+	' 'python*')
+"
+BDEPEND="
+	test? (
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	# the C backend is repeatedly broken, so force CFFI instead
+	sed -e '/PYTHON_ZSTANDARD_IMPORT_POLICY/s:default:cffi:' \
+		-i zstandard/__init__.py || die
+	# unreliable, fails on x86
+	sed -e 's:test_estimated_compression_context_size:_&:' \
+		-i tests/test_data_structures.py || die
+	# unbundle zstd
+	: > zstd/zstdlib.c || die
+	# it does random preprocessing on that, so we can't use #include
+	cp "${ESYSROOT}/usr/include/zstd.h" zstd/zstd.h || die
+	sed -i -e '/include_dirs/a    libraries=["zstd"],' make_cffi.py || die
+
+	distutils-r1_src_prepare
+
+	DISTUTILS_ARGS=(
+		--no-c-backend
+	)
+}
+
+src_test() {
+	rm -r zstandard || die
+	distutils-r1_src_test
+}
diff --git a/dev-python/pyupgrade/Manifest b/dev-python/pyupgrade/Manifest
index e3232ca713ba..cfd57ed01de4 100644
--- a/dev-python/pyupgrade/Manifest
+++ b/dev-python/pyupgrade/Manifest
@@ -1,7 +1,5 @@
-DIST pyupgrade-2.38.2.gh.tar.gz 64004 BLAKE2B 4d5456173d7202749e87726f5547f8f406ab226e2258d78393f10e1ee8129835a65272ee12c95d3d71139f57982c240c38d67353153af43dfa30a8dc7e4147e0 SHA512 e7184539f9e4c8090be02ba1fef1288564e7f8860457345b3305c06391962491af04497e5fe14297fb9c90a6e7e4de1f07a39235a5358188f5f5fa035ab7eb1b
-DIST pyupgrade-3.0.0.gh.tar.gz 61941 BLAKE2B b1760bfe86dabbb5b93bd2c741c7315ce6463df4fbf477ddc30a830e28044fdfc21328ff32589196c6383396b9550fea3711119ee8cd0c5e4468ec7907066d69 SHA512 ed6b8407e7f39e44d78215e4bb275c3b70426fc087ab9890964cc35133859568147bbdd0ea5731a214f397f58691b0f4c63de55201c38bbfa83cb99db1c6655d
 DIST pyupgrade-3.1.0.gh.tar.gz 62086 BLAKE2B 0a5eccb457591e719e132bfa2444c8587a81a731505f9f848755e72c25bf8addf152ea6f3845fa071fb836c521279934533f58717b261041c700b3b51305f7ec SHA512 b63ced8efe7d76fa40f6f8ccf0f922eec1967098b770ff3a5cdc67a3bf3a057900c592bb041500f8f78f2df782c7b90ab8c453591c8b45d3d2d073f00e8bdae1
-EBUILD pyupgrade-2.38.2.ebuild 595 BLAKE2B ae660b303683a5adf769998adb543c1626099cbd4220a3e4416ba3e7174b295e6e5714ac50107f364fbb3aa4c086cc9bfd81944463043fe9dabfefe269f60bbc SHA512 0bebd140dbe5c4cfcfafcada1a20a3edfc2d6349143ec4d523184dda0b8483dc2c1e5bb60121c5eeb9754d2a5a70c6988466e70fd78f64473065825a02a969f8
-EBUILD pyupgrade-3.0.0.ebuild 595 BLAKE2B ae660b303683a5adf769998adb543c1626099cbd4220a3e4416ba3e7174b295e6e5714ac50107f364fbb3aa4c086cc9bfd81944463043fe9dabfefe269f60bbc SHA512 0bebd140dbe5c4cfcfafcada1a20a3edfc2d6349143ec4d523184dda0b8483dc2c1e5bb60121c5eeb9754d2a5a70c6988466e70fd78f64473065825a02a969f8
+DIST pyupgrade-3.2.0.gh.tar.gz 62618 BLAKE2B 2cc9525947d745f04df4a68e61e639f6ac4fe055da43e0a6dcc028bd186d3e7b77ec349f1570f88b7e7460090f4dd5755c95fc9b97f74487404ed2106b65b0e4 SHA512 86dd5439d63bc767d7c3e9898fac0dd9e129d298b0f46632a462cd55044f291f57bdc2f1fd7336ab17e51cac293e5918bc1d18cbb439a1596d15d1f457e194a1
 EBUILD pyupgrade-3.1.0.ebuild 595 BLAKE2B ae660b303683a5adf769998adb543c1626099cbd4220a3e4416ba3e7174b295e6e5714ac50107f364fbb3aa4c086cc9bfd81944463043fe9dabfefe269f60bbc SHA512 0bebd140dbe5c4cfcfafcada1a20a3edfc2d6349143ec4d523184dda0b8483dc2c1e5bb60121c5eeb9754d2a5a70c6988466e70fd78f64473065825a02a969f8
+EBUILD pyupgrade-3.2.0.ebuild 595 BLAKE2B ae660b303683a5adf769998adb543c1626099cbd4220a3e4416ba3e7174b295e6e5714ac50107f364fbb3aa4c086cc9bfd81944463043fe9dabfefe269f60bbc SHA512 0bebd140dbe5c4cfcfafcada1a20a3edfc2d6349143ec4d523184dda0b8483dc2c1e5bb60121c5eeb9754d2a5a70c6988466e70fd78f64473065825a02a969f8
 MISC metadata.xml 603 BLAKE2B a9513a08115930ae37b1a3dc5bd2c0649e646bfdad961f10478b9575c597ffad2847b13642e9433ed7ffa41a2ffae0410616e7eb1cc2a00dfdc181f98639419a SHA512 f9da5ac513c1ee7e1411642119344abf4d409bffc2b1cac997bee625add8ceb5982931d9cddeee082d1943f405a70bea617b06b3bbc6f3787ea987b8e43554b1
diff --git a/dev-python/pyupgrade/pyupgrade-3.0.0.ebuild b/dev-python/pyupgrade/pyupgrade-3.0.0.ebuild
deleted file mode 100644
index 02368726bb1d..000000000000
--- a/dev-python/pyupgrade/pyupgrade-3.0.0.ebuild
+++ /dev/null
@@ -1,29 +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="Tool + pre-commit hook to automatically upgrade syntax for newer Pythons"
-HOMEPAGE="
-	https://github.com/asottile/pyupgrade/
-	https://pypi.org/project/pyupgrade/
-"
-SRC_URI="
-	https://github.com/asottile/pyupgrade/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-python/tokenize-rt[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pyupgrade/pyupgrade-2.38.2.ebuild b/dev-python/pyupgrade/pyupgrade-3.2.0.ebuild
index 02368726bb1d..02368726bb1d 100644
--- a/dev-python/pyupgrade/pyupgrade-2.38.2.ebuild
+++ b/dev-python/pyupgrade/pyupgrade-3.2.0.ebuild
diff --git a/dev-python/rapidfuzz/Manifest b/dev-python/rapidfuzz/Manifest
index 62b5176df019..40dfe70fa1d9 100644
--- a/dev-python/rapidfuzz/Manifest
+++ b/dev-python/rapidfuzz/Manifest
@@ -1,7 +1,5 @@
-DIST rapidfuzz-2.11.0.tar.gz 812669 BLAKE2B e7897b2770202d46cb70323d19a79c6f34c379cf43ab211e2ba4d05ef6f1630d49b3cef70ab52bba1ac0a9cc15cd934e86aab829ec84195a6b583a561efc8cb2 SHA512 df5e77248c2a005ff1e0fbd4b4ef15fbdb88a6738d66823ba9bf8c380943c59fe82ac317dab1e6279b33112d2484563d65c33e972d52ab82b083cd8a8aae7ce0
-DIST rapidfuzz-2.11.1.tar.gz 813221 BLAKE2B 1fab9b564396f820c9bd5c240df95a2e864b0e3efffb4239fa2ad719b92d2997d9519ccf906fe04c61a0fc1daf9ed0df734f95d4cdd19529e46716935182030b SHA512 19f6dbff31f11cc16f031f9bf53f7c60051a84f2f81dfc1c17fc83827a7d8551d708420b4116ab91e56b5d6de652b4d571f4055ebcb208e5dd57e8778050ca29
 DIST rapidfuzz-2.12.0.tar.gz 836008 BLAKE2B 7d8cb6637247711f2f6fed63c9f26e2d3b8871b9a4926b86e37f6d42fed0f5ac2af727a1b350f4b55787b6fd5a393c3b90ee91d122731bb3f64acb4edb5126f0 SHA512 06c5e46332c98ea8feb83a89b879efc12a737f58312a862ab426e899bdfd3661601d4a417f7bc518e1006a2f05fa31ce1003ae9dd67c1e7d58f903e65f9eb6e7
-EBUILD rapidfuzz-2.11.0.ebuild 918 BLAKE2B e0f99f5d8fcc95f2cfd4a29495f0aae2a2e18993a50fc6dfa39110ac0d3cb66cf369de990ed11e78e9104a91e35b12995e892c9140c76c2973fb31fcb4ff20fc SHA512 ed0a3809ffcc7f86b45f2f53c12cb24991ca3f99766381c5d2d08074fdee2928a3daafed49a12469710e8c5bb249c9188f24f910128e99ddac3bd0cd745accdf
-EBUILD rapidfuzz-2.11.1-r1.ebuild 1063 BLAKE2B 66f6e70028be5440193e8351136d0b274921c04f390e98aea20e0ba9bfcd705a8436d826d8e6504327ab09120c683855813ce725e31fdcad212fa470ffa38ab0 SHA512 714ddd5411bf8f1eb25117cfccdbe215baa7b0ac5e428414af456328d20bb48c47e63bb8c27c2e9bd6546f4b4b745aa6e014cd99fb1a9cd01120fe639b9a2f33
+DIST rapidfuzz-2.13.0.tar.gz 841650 BLAKE2B 53cdae975a46d68d6ec128a2633a1dd582643fe2564a6db1783c1b7d0917d1904238b9f67e68da788797f0c323b2c99df4fdf04615d8bd3d503cc3377876f197 SHA512 f700b5b926aa639434bb48df21d6320c9a289f7972a15cccb7020a2459eeea70476ed146866d13dce03b112c1512a8403d2d2ab729b91475d43eb775fab21560
 EBUILD rapidfuzz-2.12.0.ebuild 1068 BLAKE2B 20b04f50979d0abadafce16a42729b8ea26d411a5cce6794a25a48ff1f46e2ef667b585759d9375503ad6ab885b205b3ddef766ac3b9b65f8b949c6c2f10b5fe SHA512 fe66b3bd44f607b6d6df7b259a6c4ed901d717871a954bf7f47467e037d7ef1a946d2a85c1e54c1b61b0c233533017feebd7dc15bf447c0a53dfd3d3207357de
+EBUILD rapidfuzz-2.13.0.ebuild 1060 BLAKE2B 9b438f47dced8030c768d72b128cfade971cd409aa3f7fbd26b4844cf619592780d40c062f8a497dd2386fa5d34ac01e0a262084f76b86b514a3836fb62ff727 SHA512 4ed11eeb9ce38e4c7ef2dafba37a247cd72f4b9c6eca9c6f2676730eb45533d96151839bb510aa31d576351d7c6704cdfed5ff6373f3fe6da6f052e508044276
 MISC metadata.xml 374 BLAKE2B e6ee89a9850276b8c22c9bc851ebea2cde2ea696d122d70c6465e09a9371c59f81d1976b3253e8ee90afae5e3e30e993481b402058bac0c58ec01f71a0b7c3b4 SHA512 9a39c4bcf8e8de0a6d6a356a9aeb415f8f49667caf5716eee50bf251f1fd53bb076e817fac0b15bf64e65c1b9625c78810da61a5d96b273a20b2669a18084d6e
diff --git a/dev-python/rapidfuzz/rapidfuzz-2.11.0.ebuild b/dev-python/rapidfuzz/rapidfuzz-2.11.0.ebuild
deleted file mode 100644
index 208583661aa3..000000000000
--- a/dev-python/rapidfuzz/rapidfuzz-2.11.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# custom wrapper over setuptools
-DISTUTILS_USE_PEP517=standalone
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Rapid fuzzy string matching in Python using various string metrics"
-HOMEPAGE="
-	https://github.com/maxbachmann/RapidFuzz/
-	https://pypi.org/project/rapidfuzz/
-"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv"
-
-# all these are header-only libraries
-DEPEND="
-	>=dev-cpp/taskflow-3.0.0
-	>=dev-cpp/rapidfuzz-cpp-1.8.0
-	dev-python/numpy[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/rapidfuzz_capi[${PYTHON_USEDEP}]
-	>=dev-python/scikit-build-0.13.0[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-export RAPIDFUZZ_BUILD_EXTENSION=1
diff --git a/dev-python/rapidfuzz/rapidfuzz-2.11.1-r1.ebuild b/dev-python/rapidfuzz/rapidfuzz-2.13.0.ebuild
index 528eecec19b6..6ca8945bca09 100644
--- a/dev-python/rapidfuzz/rapidfuzz-2.11.1-r1.ebuild
+++ b/dev-python/rapidfuzz/rapidfuzz-2.13.0.ebuild
@@ -18,17 +18,17 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv"
+KEYWORDS="~amd64 ~arm ~riscv"
 
 # all these are header-only libraries
 DEPEND="
 	>=dev-cpp/taskflow-3.0.0
-	>=dev-cpp/rapidfuzz-cpp-1.8.0
+	>=dev-cpp/rapidfuzz-cpp-1.10.0
 	dev-python/numpy[${PYTHON_USEDEP}]
 "
 BDEPEND="
 	dev-python/rapidfuzz_capi[${PYTHON_USEDEP}]
-	>=dev-python/scikit-build-0.13.0[${PYTHON_USEDEP}]
+	dev-python/scikit-build[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
 		dev-python/hypothesis[${PYTHON_USEDEP}]
diff --git a/dev-python/scikit-build/Manifest b/dev-python/scikit-build/Manifest
index 516d6bbdfc39..f4cbfacd4ce1 100644
--- a/dev-python/scikit-build/Manifest
+++ b/dev-python/scikit-build/Manifest
@@ -1,3 +1,5 @@
 DIST scikit-build-0.15.0.tar.gz 268691 BLAKE2B f4cb51ee2367bd4ba6f6c1cada15e1e6be731998a914b28edcf703c5a92c409b78b17dddf04a29b24d40f249ffa06eb9d05d36dc30c0e62ee001519c3ca03f58 SHA512 4d9b1d06d48708ff4f2f5fa8c8f264c7ca85946d5842a1254930d9449d6b6386c17392473c3c85147f6573f7256c94c927962cb56fa23a90a5b442de8de8d727
+DIST scikit-build-0.16.1.tar.gz 269763 BLAKE2B b5c70c16a68dc8bae67f273c8ecb423d36fb5379e0dbbc55efffe33ab216162db687fc48004aed84b636ad6b99a79be4cef4838509a18b3a6a81375e1cfd544d SHA512 13b23014939b34096849ecdcd7ffcba0638efa19fbcc3c7348fbcf77a4943236b1009ed1ec07e68acd00b10fdd3d3e809e8a131efe0de17f43bcf794b35755e1
 EBUILD scikit-build-0.15.0.ebuild 2060 BLAKE2B a6c8c15666cca1158ccbeb6642a3a1f7714d74aa50765bad8f549ebb397c0ffb7347560b1930834a474f92be12b02197dc507acab0b034990162414574884a65 SHA512 9dce9170ceef5b29130fe7cf5ef3244d96a94fbbe0b11bec9023837e50f4c0a76c01e04934e7cb829f79de04a38ecbc1061ec1a82bc0cbbce1f043567d2638e4
+EBUILD scikit-build-0.16.1.ebuild 2122 BLAKE2B 61557bdaf82f4cc09ced5197f5e36f9754c5b96918448a962ca299b53d050d5fedd7286b7182c0de60ade4628e336ee3e7b562804397ab515a204e31c2b1242e SHA512 e02be683f2f425b533394d31ab41997cef3db0df46529546e370bd6898ef108204cedd66fd09afcb376c4fdd6c59d4f825cefa6a9b8b55dac3842bc9aebaac18
 MISC metadata.xml 408 BLAKE2B 4cdf98a2ac7e4bd6e1276e0ceadb3ac7849a81c5a9931b1ea5b3087cd7ced5072c390f1b77791732a3470f2cfba6a0537732f3632a156887d7c4046235062d3a SHA512 deb17b2d33bab0a1f713edd2e10b643b8801b3c04b142dd37530d5335bfde5be6e8ffb99177170a8c24380c2958164bec95db50538993fdb681aa1d0408ebf3e
diff --git a/dev-python/scikit-build/scikit-build-0.16.1.ebuild b/dev-python/scikit-build/scikit-build-0.16.1.ebuild
new file mode 100644
index 000000000000..38933b364960
--- /dev/null
+++ b/dev-python/scikit-build/scikit-build-0.16.1.ebuild
@@ -0,0 +1,72 @@
+# 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="Improved build system generator for Python C/C++/Fortran/Cython extensions"
+HOMEPAGE="
+	https://github.com/scikit-build/scikit-build/
+	https://pypi.org/project/scikit-build/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/distro[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/wheel[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		dev-python/cython[${PYTHON_USEDEP}]
+		dev-python/path[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+		dev-python/virtualenv[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs \
+	dev-python/sphinx_rtd_theme \
+	dev-python/sphinx-issues
+distutils_enable_tests pytest
+
+src_prepare() {
+	# not packaged
+	sed -i -e '/cmakedomain/d' docs/conf.py || die
+	# no pytest-cov
+	sed -i -e '/addopts =/d' setup.cfg || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# sandbox violations
+		tests/test_hello_cpp.py::test_hello_develop
+		tests/test_issue274_support_default_package_dir.py
+		tests/test_issue274_support_one_package_without_package_dir.py
+		tests/test_issue334_configure_cmakelists_non_cp1252_encoding.py
+		tests/test_pep518.py
+		# This fails because of additional item setup.py in sources
+		tests/test_include_exclude_data.py::test_hello_sdist
+		tests/test_include_exclude_data.py::test_hello_sdist_with_base
+		tests/test_issue401_sdist_with_symlinks.py::test_sdist_with_symlinks
+		tests/test_manifest_in.py::test_manifest_in_sdist
+		# Wants internet to install things with pip
+		tests/test_numpy.py::test_pep518_findpython
+		# TODO
+		"tests/test_command_line.py::test_hide_listing[True-bdist_wheel]"
+	)
+	epytest
+}
diff --git a/dev-python/stack_data/Manifest b/dev-python/stack_data/Manifest
index f9afc04990bf..b188ecd07dc5 100644
--- a/dev-python/stack_data/Manifest
+++ b/dev-python/stack_data/Manifest
@@ -1,5 +1,7 @@
 DIST stack_data-0.5.0.tar.gz 43332 BLAKE2B b9583717633902b4618981ceeb53eca7b817b7985fd5401cc79fe35b194e77fdb57e1c5c51adde0b4e604f6df5424d27056b2528c356a808a4b4c9e1dee1c56a SHA512 82573d9b115daf23a04921027878d55cf9de897a01cb0089b082ec0e7a7b42461afe47dddf4d16adfe186259280b57d651857884ceaf9673d8c983c48f479684
 DIST stack_data-0.5.1.tar.gz 43435 BLAKE2B eeebca4d2d8e3c8795e05d4a058c4a7421a2669e28b476400d541c79d5d7ebb66dde16cd39e2586eafa2f653341c041351c2684440d879ed71b2adf83ea1b4d9 SHA512 b33e3bfd31d285fcdb8f6db8f3e59b6e99fcbc0b912c7be01e52b164554a5914bc8f1a7fb7e665a18fa2d164b248afeb3c6a287f8e27ab7fa44f69b75d93d375
+DIST stack_data-0.6.0.tar.gz 43595 BLAKE2B 5485fbf5b332a52567d8f42dddb4ea5c01bdcab8c6f3a2ce451ac06ea165bb55fa730b0ad546b6ee04f0791c044ac240e8b840fa74644f2e90916e8b806ce31d SHA512 0fb3ab635977dfb5886efda6d9d55bea6c4bfb932528e93713fb3cf4cdb3557aa46e06bded2956e93ae2fb69c2d4bde31001f111e217db7cc1501fe9332824f2
 EBUILD stack_data-0.5.0.ebuild 825 BLAKE2B 575800f98c667835be726a01e4d2d0bdf0e7d6f26e4554bf33670fc7c6732fc147174ad15441bb6e3951a474478ad1b90aea7ba2184e02d9d5b53a58ded08a26 SHA512 b639c0422e76e42d661575378191eeba250e7f35ca96b5ae8c2b8ddecc0cfa530140c2336654e3d04344b45ebbb6875b9673733266df54e43ecd25149163d8a6
 EBUILD stack_data-0.5.1.ebuild 876 BLAKE2B f5bb2a12099ee1b20236148a4adb5b93f54971fc56e8ec6a7f8ee24f14735492a869f44760655b8a7f22404d6ef674b0e1903c425679313041467a9acf99104d SHA512 5740daa892dbccab5987211322d705fe8c944872eb150d04baeb17ca83d00fcde491597048b6e8827431f60466601b5160e5f4d7b36dac71f260f0ff92073d26
+EBUILD stack_data-0.6.0.ebuild 892 BLAKE2B 3984b9aeb5690ed9fd0fa4d894a1da5ae3754cdd63b92ce0c1df5d4ae492fc72edce709d855104672d591a80cd23d522a85de67d0e977dcaf9adc666d2e072d2 SHA512 ad166149b800dc32b654d9dcc196d9de047ea8dda79518afdd304973ad6b075e1f08ffff2c848139c4ba7553bcc4f7799b5f2f2748b71be93577afbfef53d88e
 MISC metadata.xml 399 BLAKE2B 6f2f1d18b8e574335af618995b745aa50ff1db8c58ea881b3596cbc9c22796dcf20b78ae52f370d308999a337233c6ab5a778a555876877851cdec20ac4e14b0 SHA512 474c2eae21a1617dbbd8002189fff802764bdf24bc854dd68b1feaf3e7ec4ba7831678b5facc9cf4587c784874cd530b11140ee345e831a9b7824e6752d2923e
diff --git a/dev-python/stack_data/stack_data-0.6.0.ebuild b/dev-python/stack_data/stack_data-0.6.0.ebuild
new file mode 100644
index 000000000000..f1c4badcd781
--- /dev/null
+++ b/dev-python/stack_data/stack_data-0.6.0.ebuild
@@ -0,0 +1,36 @@
+# 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="Extract data from Python tracebacks for informative displays"
+HOMEPAGE="
+	https://github.com/alexmojaki/stack_data/
+	https://pypi.org/project/stack-data/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/asttokens-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/executing-1.2.0[${PYTHON_USEDEP}]
+	dev-python/pure_eval[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/cython[${PYTHON_USEDEP}]
+		dev-python/typeguard[${PYTHON_USEDEP}]
+		dev-python/littleutils[${PYTHON_USEDEP}]
+		dev-python/pygments[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/wsaccel/Manifest b/dev-python/wsaccel/Manifest
index e1c271a25874..58f21b4935f4 100644
--- a/dev-python/wsaccel/Manifest
+++ b/dev-python/wsaccel/Manifest
@@ -1,3 +1,5 @@
 DIST wsaccel-0.6.3.tar.gz 9723 BLAKE2B 75da0f27e07b52ed730d239ef807da7ba9dd342144ca2e78c32dc09b20c1ebfc006aa9969b1f811d172ca18b75533a4560a29112e56d6dfd472117a0d072fc8e SHA512 0fe97c7fa94cec1b9cf019507f55ce633a9b4bda86329937cddcfa25ba94755010813688cda77ee4fea1c50918e45cd50770bb27e7583e630c46e84d27c155da
+DIST wsaccel-0.6.4.gh.tar.gz 9947 BLAKE2B 1c0b7b8b82154420f64fcbf3217938ff7e829573ada6b979ff73fe450c0985e368a47cccf2d124506c28479a98f0799977677e16ee26754611362f6b61eff902 SHA512 980364fab8a661c8a2b406f9eb6c99fb5f3a1308bbcf6267fa63f002d8dfbb4a3ad027d83a2088d69324cab05bdc56138d7e66e2602aeb8864dfe49ad9218d07
 EBUILD wsaccel-0.6.3-r1.ebuild 651 BLAKE2B d49489a50f84fc3ecfa00c1dc82a912c1cc11604b32030800598285865418aff20f176c123c811a27b346e7deb7db683a78afb4df1acee321e089eaa7a477e5c SHA512 2dd5d48d5ac9e8edb3d1a492506733eea8395e25a55996352280dc61d6ee53a03bf31a4e9874936a1d07a53a5760e98768d450ae2f76724504a3a296aef0e1c1
+EBUILD wsaccel-0.6.4.ebuild 658 BLAKE2B b95d21fc981041e81754ad9070944de068a0bcdb07eae549eac0583f4c6a5efc56fe14ea3a0bd26e423baa000833e5a7f98ddea923475e59e2d61d4753432723 SHA512 5ed12133e8412ab479d945461d20693cad85aed2a2971c64da6020b04bccd21cc479bafdc86fb2b983e2ad81f4a282ad80831212ac41967b24af4c56135d4e36
 MISC metadata.xml 378 BLAKE2B f92892d9a32a400a15444eecd45057abc95cc12b53277dc0c9336e9630422511ea4dbb27d73f61a7fa65adc76259154d383027c1b2cd0a2b18327976d953d053 SHA512 36f858807cbad0a4a4911b1bf2030946ec7c79b51165926996f72c63e468378b9663d19794b1842542f49e272f3d74d391acccc1e997884bed75f3ee587415c0
diff --git a/dev-python/wsaccel/wsaccel-0.6.4.ebuild b/dev-python/wsaccel/wsaccel-0.6.4.ebuild
new file mode 100644
index 000000000000..9ab10d76298f
--- /dev/null
+++ b/dev-python/wsaccel/wsaccel-0.6.4.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Accelerator for ws4py, autobahn and tornado"
+HOMEPAGE="
+	https://github.com/methane/wsaccel/
+	https://pypi.org/project/wsaccel/
+"
+SRC_URI="
+	https://github.com/methane/wsaccel/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+SLOT="0"
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	cd tests || die
+	epytest
+}
diff --git a/dev-python/zstandard/Manifest b/dev-python/zstandard/Manifest
deleted file mode 100644
index 63a5c6a598ba..000000000000
--- a/dev-python/zstandard/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST python-zstandard-0.18.0.gh.tar.gz 678765 BLAKE2B 7a297e76d65c6f5adbb87cc615f474d58c66bc9ee4050eb10277b596f7efda9109de815188b6efe55beb7aa637ec4779359a573c87094661ae28a080c9619576 SHA512 d573da893e3a372143271c7d9dec15cd4e9dd7355d2069e283df8b3feadbf999dddcc0aa37a2831a370526b2b045497f46326dcf13d3680dd8ee624bca1e7666
-EBUILD zstandard-0.18.0.ebuild 1610 BLAKE2B ef59f4cff1c527f06d41d773d61ce77295f33edf151761229802c94c9d4be7fc5fd7600627b01b5024a2d2349cb34005475015459ddfab2593475eb5b2fa3c1a SHA512 888f6e0437ef90e2945c01f324bd86ed9e18a340bc91e5a1c9c02469726317175e45a75ddca719f278b81594fa61f38501f3cdb6f4ea89e25319747483b0230a
-MISC metadata.xml 378 BLAKE2B dd5834c84bb375812b3a3cfcc00d29aa43ac8954b044e188e8f38bdca93fdf1ce98fe78b78dbeccd935c83ca10f3ce18f893e5720dd8991118b6c69149a4ac61 SHA512 06554d973b525d53c680c3e43041f33125dad222339e645294fbc22670a7eadb0e9bf8a3b0771d2b2fb8f136d958eadb32c295179d1547c50ae26754360609f3
diff --git a/dev-python/zstd/Manifest b/dev-python/zstd/Manifest
index 97f2a118438b..7fefcf22b130 100644
--- a/dev-python/zstd/Manifest
+++ b/dev-python/zstd/Manifest
@@ -1,3 +1,3 @@
 DIST zstd-1.5.2.6.tar.gz 606528 BLAKE2B 0d9b0937346e69a25eb834d2894ab74efdd3f35390afebc98a6cb255f18cdbe540433139d51f43bf0a9fb5d85bee588c7df8543842248e700652af3e3e721df2 SHA512 a692d87ffad4d148d56487fa740876653ccbd151ac8a897a35946a3899d4d3b3aaf6e9954a2050b4cee8137d5161481f3460a0e64ce339c624349bf030c9f975
-EBUILD zstd-1.5.2.6.ebuild 665 BLAKE2B 3f0d6189a14c8e793fd5133a24622588563b1a43626c05146d8bf24e9557843c2fbb0be76f012dfcbff83807255767c8ebd07e1b2b5de0e800d653c3170f93c8 SHA512 50e45d9917e741b935c3d334815756a8b4ec36670592596e5729d7686ab33ed6ad9c645e309b369df267a63808da1becd298e4343cf9aa2563f5eedbbb1e299f
+EBUILD zstd-1.5.2.6.ebuild 672 BLAKE2B e6244a0667b935ebfc38d9cf586d60cde47c75d7b79dfeb8051d5f8888918bd8bd99ff8144520cbbae4a5724b51fee894d6691d0876d654382ebdc45f08247c3 SHA512 eda5619a31712592a1e0fad01cd509c3369d88064f7f61d842cd0d8cb167d8859ef844e8c1e86596c901e5522a5f03aee950fb1ea5b2ea4ee878bd30c938ea2e
 MISC metadata.xml 472 BLAKE2B a4d69b294f26714e9f5211408f01222174c8dd9b0e990840c4603f70a7080fd41a6f3ec74987e40b330a19967f0b90447446b6d5fdb1179ec3be0406592f6b3e SHA512 0cb6b445a84c48dc909eca438bf3908bdc08309f27314692fc2a3fa5a21b3cd1af92e06a593fb2a2cb32c3f0f70db56b7177abcc1fa4348c664e779f0e277cda
diff --git a/dev-python/zstd/zstd-1.5.2.6.ebuild b/dev-python/zstd/zstd-1.5.2.6.ebuild
index 78b4bf5b67f7..58f7a87a118f 100644
--- a/dev-python/zstd/zstd-1.5.2.6.ebuild
+++ b/dev-python/zstd/zstd-1.5.2.6.ebuild
@@ -24,7 +24,7 @@ DEPEND="
 "
 RDEPEND="
 	${DEPEND}
-	!<dev-python/zstandard-0.15.2-r1[${PYTHON_USEDEP}]
+	!<dev-python/python-zstandard-0.15.2-r1[${PYTHON_USEDEP}]
 "
 
 distutils_enable_tests unittest