gentoo auto-resync : 08:10:2022 - 13:29:57

22 files changed, 464 insertions, 10 deletions

diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 616dd0ea7e39..1914228e8958 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index d818eaf8f8e4..766e6d5a8fe0 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -6,6 +6,7 @@ DIST boto3-1.24.84.gh.tar.gz 542495 BLAKE2B dc120011d9e7b01beeb86d90a88f69cc232d
 DIST boto3-1.24.86.gh.tar.gz 543481 BLAKE2B 8b21852f75c4c548dc2389f5d95145b1781a7b19fe5d12fd6a352e298a3e8e4301c9b9b84c2700d8a5b1f58c4343341370c9c88ce2fcae90a3310729cd8bdf19 SHA512 a50bf8601fe479094e2868c6da43f5a6510dca6f99c74920bc7c6629cd083fbabc80e650a3baabe2f749f1dd906bc6aab73042cd269bcbb4bc8072d72707b26a
 DIST boto3-1.24.87.gh.tar.gz 543810 BLAKE2B 37713f39dcca01f9a718880fc410640b289ccc381069d5bdf5fdbef6f6b59b8d25932c5054311f1b46a90bc60ca7bbc54593ea8adcb72d156bc146a40cdc1e80 SHA512 72ba0f59b88775c40a65b59c579ba32eea3c5a8c348111b076f6f5f2dd5587b9c9b93c721fd48a8dcf8c6b419d67cec51f1b5e6a6cafe1553848db53cfaafc8b
 DIST boto3-1.24.88.gh.tar.gz 543896 BLAKE2B 9dd2a18e3fb8d0a9f3a3a1fd7d0cceb491765690f99c7bd4200f37c66cbdb1e86dcdcdd09669d3175b97e762e6faabac3a2e5cba49136f42cba459e45f3ab67f SHA512 676528ca180c23834d1666b69292754e551a339914362da2708ff3f937c2eb04fe3b3dd1d4c6960eb8f5f7f58b1e0bcf13b1f52cc16a7c8d3bd025e9ea4ee109
+DIST boto3-1.24.89.gh.tar.gz 544293 BLAKE2B 53854b91c1c4c677eee743776a67e552bd2e11947839c442d81c1983930d6ff16d6bc5483c29b9a14b99a7cef09f3b9cd74cea9edb1cb76ff5458be3c9743164 SHA512 ef3b503b1313b8b7d84f5e4afdbe4e3d9e95ce3fbba81d400191295c71d4237e764f87ab6ebf2b29536248a520ab1273bee43bedd746596224f7400ce04c2c02
 EBUILD boto3-1.24.74.ebuild 1579 BLAKE2B 394d8a1bb7a1036ab4821bc789c9eea285f8a6a7c21e751d60c94a53d5fdd37119eab54bfd19bfe0856b7557df04340f50c7cebbe631234e8f582e7d62af13ec SHA512 beee3b634e3b1d66365beb2e97b9d09188fa795e00d9d05f2101de423128741ee1f8ad8ae4b0c35f1e6c6473ce73cc3acf47d9141029b4435d39a9803a5fe1b2
 EBUILD boto3-1.24.80.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
 EBUILD boto3-1.24.81.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
@@ -14,5 +15,6 @@ EBUILD boto3-1.24.84.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd536
 EBUILD boto3-1.24.86.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
 EBUILD boto3-1.24.87.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
 EBUILD boto3-1.24.88.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
+EBUILD boto3-1.24.89.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.24.89.ebuild b/dev-python/boto3/boto3-1.24.89.ebuild
new file mode 100644
index 000000000000..6edcc751d54b
--- /dev/null
+++ b/dev-python/boto3/boto3-1.24.89.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 9339d823462e..9bed66f4d9bd 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -6,6 +6,7 @@ DIST botocore-1.27.84.gh.tar.gz 9689021 BLAKE2B 1f67ab89d0e181b3b4b8d335279efbe5
 DIST botocore-1.27.86.gh.tar.gz 9702116 BLAKE2B 6df00c34c2be77c8719126cef7df3de9c6e9e618d7309a3bf9a02246f28e819d04c7fc0dacb9cbb4c6814fd869728d51e0e349d8b2d9dcce4ac4aefb4f431ad7 SHA512 dd16a3d6593a7a6ef449fd7f3b6725e1843c77d210586f212c604d2c2f49a43c5a32f973161e43abb3ef8111ea544d1b9b45b09bca2daa7be16fa3931ed79899
 DIST botocore-1.27.87.gh.tar.gz 9703217 BLAKE2B 9e512e97fa79aa49f8b414b38e0fab14ffd6cd8f89877da66b6659851c2b73ee8058faa6a2cdd8925c8a189fbd701c85ed6c00ce8ffa61ff667078ce47495a5c SHA512 ae34a63cfd3a707b7888deaa9d08a186366f53b725da80095e4cc3e5533ea07074b631923fb6eaae970e12ae39648b3f2c7cbfde03754fffe75aa57eb9c18566
 DIST botocore-1.27.88.gh.tar.gz 9703393 BLAKE2B b7152546ffd44fccc3607ce4fb0df586e192a68431d68f40063d6397d6005507118c49197e3bb0215ccc4ce6b075a2e95919dc0b2352da3562ba8b5675274ca4 SHA512 0cca62a8e357c8c345afa2ebfa8fa931aa75e323b93ecd63857db05fac7fcd83118012ee7f93921a31895721189995af3179f6ae62ee61cef68eda84edc88132
+DIST botocore-1.27.89.gh.tar.gz 9704257 BLAKE2B f7c0f34d93940aea72337c1cfb229ba79b06c15c99c7c1b719fcad9c2131cc98e084a14f8988e77e0627fac994bd4bfe539bcbcedd318b9bc861311772a5e99b SHA512 ddebfa73a4fee423ee7ead3e7d28ff9e8160f8459ea7cc341b1194759894aee24b07cec25030dedc4570416146d96159f532b7ec2e22d5279e4390bef3330a13
 EBUILD botocore-1.27.74.ebuild 1801 BLAKE2B 224b9b1ebd6786f36115c25699b06ef4ace30f13c8c97fbac20f37ec3dec7219e89fae3fdc70ef2b808342e7dab564755b758952cd565f06ef68b1e387c1ee7e SHA512 f26fd77fbbc424dc20e7844807bb7650e73e989e15fa5c20c9733e3bc322f4a2fffda47fcd29f82490be7262648582b162f86b4951c8d338d9ebbb1312df8294
 EBUILD botocore-1.27.80.ebuild 1808 BLAKE2B 720965dfc40c51389a8ca4ac210039f79bbe3047f583cb1bd4d52bdb9720cb2283a13a9f4337a62aca6869cd75d78dac6cc07436524e9720386177c733d686f3 SHA512 d3a3fbc0f957b58e8161ae3fffedb44462000077aa368dd2fb183bf6a084771bff4db46344a4d0b451833ea05d326b452155af92d190c313e1d982da7d72fc10
 EBUILD botocore-1.27.81.ebuild 1808 BLAKE2B 720965dfc40c51389a8ca4ac210039f79bbe3047f583cb1bd4d52bdb9720cb2283a13a9f4337a62aca6869cd75d78dac6cc07436524e9720386177c733d686f3 SHA512 d3a3fbc0f957b58e8161ae3fffedb44462000077aa368dd2fb183bf6a084771bff4db46344a4d0b451833ea05d326b452155af92d190c313e1d982da7d72fc10
@@ -14,5 +15,6 @@ EBUILD botocore-1.27.84.ebuild 1808 BLAKE2B 720965dfc40c51389a8ca4ac210039f79bbe
 EBUILD botocore-1.27.86.ebuild 1808 BLAKE2B 720965dfc40c51389a8ca4ac210039f79bbe3047f583cb1bd4d52bdb9720cb2283a13a9f4337a62aca6869cd75d78dac6cc07436524e9720386177c733d686f3 SHA512 d3a3fbc0f957b58e8161ae3fffedb44462000077aa368dd2fb183bf6a084771bff4db46344a4d0b451833ea05d326b452155af92d190c313e1d982da7d72fc10
 EBUILD botocore-1.27.87.ebuild 1808 BLAKE2B 720965dfc40c51389a8ca4ac210039f79bbe3047f583cb1bd4d52bdb9720cb2283a13a9f4337a62aca6869cd75d78dac6cc07436524e9720386177c733d686f3 SHA512 d3a3fbc0f957b58e8161ae3fffedb44462000077aa368dd2fb183bf6a084771bff4db46344a4d0b451833ea05d326b452155af92d190c313e1d982da7d72fc10
 EBUILD botocore-1.27.88.ebuild 1808 BLAKE2B 720965dfc40c51389a8ca4ac210039f79bbe3047f583cb1bd4d52bdb9720cb2283a13a9f4337a62aca6869cd75d78dac6cc07436524e9720386177c733d686f3 SHA512 d3a3fbc0f957b58e8161ae3fffedb44462000077aa368dd2fb183bf6a084771bff4db46344a4d0b451833ea05d326b452155af92d190c313e1d982da7d72fc10
+EBUILD botocore-1.27.89.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.27.89.ebuild b/dev-python/botocore/botocore-1.27.89.ebuild
new file mode 100644
index 000000000000..d1a6948e70e5
--- /dev/null
+++ b/dev-python/botocore/botocore-1.27.89.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/eyeD3/Manifest b/dev-python/eyeD3/Manifest
index 7bd5a866e412..6f21480789e5 100644
--- a/dev-python/eyeD3/Manifest
+++ b/dev-python/eyeD3/Manifest
@@ -1,4 +1,7 @@
 DIST eyeD3-0.9.6.tar.gz 250445 BLAKE2B 11f8bef4b17af07f08144e922634e4c6e467bd8856da9d445a70006b5bf32d442a52e234845a3f146129403fcc16047cc759102b93c433a0466bf0afd9576230 SHA512 0c993e9bf0a27ca41a8a2964a3347a6b0ffa472f833b3dada39ae09a5a2b40e0afb6bfd8c0ea5ed71d3dc2bf3cd062c1fb5fe79abe6ad867221b779786247173
+DIST eyeD3-0.9.7.gh.tar.gz 249705 BLAKE2B b015ab5f7269de8f32830153b848e9a862328515e29f5d1a9cd5739d57a1c0ee63efc93cd3849ceca51b8f67d8eaf1746ab145baf16cda7e7b19bbb8e1249982 SHA512 863ce609ea939588e246d48c6d31f9688049334f874a4c400c02777bbef7379b6403150e7459430c92cff8047d45e33cbaa406b3d6e5b2cf3f9d7d7201438c1f
+DIST eyeD3-test-data-r1.tgz 97336666 BLAKE2B e982f21ba29aaca15c6975a836bed322d5203bca57b93ab0c9343de13259d9e2f56b98e5e7402ccf9138a9dc79951e68c4b37cd2c891d2c9e94815256d49adc4 SHA512 4e6daca06380492c0048f1ffd94d92e511fc3695b3e5f64f805d3f3aa2d0fef05a3be1d67a459fb13ab6d9861b86146487f31321f979c464fc516047b66735ab
 DIST eyeD3-test-data.tgz 97281754 BLAKE2B 9b667a5f8be157ace06d773d575c08f4a8e8b7a7b81ba9cb39b1e2c924b2e3f98597607ed3076b13150e02ef7768e89d1ff8a9913021e5f4b9ac6b59344ed397 SHA512 937971dcefc53812c59adb97df27d200e92de04e12391c735ab85cd547e2a168aa1212d88c206ec71ac2fa85a504a9faa91dcc444b45149aca7c8f3a794e9a95
 EBUILD eyeD3-0.9.6-r1.ebuild 1259 BLAKE2B bf2bd70202050108801b87c3fa7f4e37de1edd1f71440a81a1f9b3f9d68a41cfdf6187ed07cfe90e02181eb829ceae984a815c7a5fdcc014e9dd907a7df94132 SHA512 47257122e9758aff6535cd4e881c9910fe82bb96d92cd52112de1e05cdf0375db1e6e406a312a11081af8d2c482d470a1819dc517883f280b704966558fa22d9
+EBUILD eyeD3-0.9.7.ebuild 1356 BLAKE2B 29291d31eff302b74ff8c74bd5c33d90af3746e73fdbe8e58d190960c5a54373b3e85cb058d6221f4aa17d7053226b892dbdfebb31fbf6cdf74302b8757a3140 SHA512 ef6138b363e1b8c23c659a3d1289d7e87b320b4df799284ba4d7b34bd306b2cc6a2cf9926ad808e3270893f5d949a86984315c38cd2c1da4bda6e254bf2fb02c
 MISC metadata.xml 499 BLAKE2B 0bd6552d10ad9f18cc93c65439b61f6de2b0e24ce1321e2172262ddd361573fa1891192c83556341c1f25805759bdea36b8d524204272dcdaf27fadb571df24b SHA512 77df82bbf9c8f11537a3a3a49e16d05a7cf558711b60af65fc646aa9cb52c3f463b808e9cff45758b823a30abd96404e0856057d92cffbc2f72d81b6c74fc19b
diff --git a/dev-python/eyeD3/eyeD3-0.9.7.ebuild b/dev-python/eyeD3/eyeD3-0.9.7.ebuild
new file mode 100644
index 000000000000..536bbca9e8ea
--- /dev/null
+++ b/dev-python/eyeD3/eyeD3-0.9.7.ebuild
@@ -0,0 +1,63 @@
+# 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="Module for manipulating ID3 (v1 + v2) tags in Python"
+HOMEPAGE="
+	https://eyed3.nicfit.net/
+	https://github.com/nicfit/eyeD3/
+	https://pypi.org/project/eyed3/
+"
+SRC_URI="
+	https://github.com/nicfit/eyeD3/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+	test? (
+		https://eyed3.nicfit.net/releases/eyeD3-test-data.tgz
+			-> eyeD3-test-data-r1.tgz
+	)
+"
+
+LICENSE="GPL-2"
+SLOT="0.7"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	dev-python/deprecation[${PYTHON_USEDEP}]
+	dev-python/filetype[${PYTHON_USEDEP}]
+	|| (
+		dev-python/ruamel-yaml[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+	)
+"
+# note: most of the deps are optional runtime deps / plugin deps
+BDEPEND="
+	test? (
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/pylast[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_IGNORE=(
+	# unpackaged deps
+	tests/test_factory.py
+)
+
+src_prepare() {
+	if use test; then
+		mv "${WORKDIR}"/eyeD3-test-data tests/data || die
+	fi
+
+	# don't install everything to site-packages
+	sed -i -e '/^include = /,/\]/d' pyproject.toml || die
+
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/google-api-core/Manifest b/dev-python/google-api-core/Manifest
index 788a85bd9ff3..f1b1089f7238 100644
--- a/dev-python/google-api-core/Manifest
+++ b/dev-python/google-api-core/Manifest
@@ -1,7 +1,9 @@
 DIST python-api-core-2.10.0.gh.tar.gz 180767 BLAKE2B 1f8d86fbd39c6bed927b2354c7e734ef2de563e2583bc4d9bff8121ae45b5538c67472a723e6c6990d1c5aa165ea83e3c1184fae2fd79ce2ea985aa89e057c7a SHA512 e4719eee37e04719d6ce7d0fe99e106ffdc8fba08f73d02f94b597f7c6fa4e57a0e28876b1c5baa2a9ce77220422f17d234b0d802d63238217a902fab65d546c
 DIST python-api-core-2.10.1.gh.tar.gz 181127 BLAKE2B 5f900c48ed367cbee03079efd78f16f9c07c2bf976757496fe9cee1ebbed5a9fe52e6c4f9f2a8ea6b7739e82c2efe44f294a3fb2586e19240855737431508f94 SHA512 f66188cc154d39483dc23e15d3d8100e5b6851cf44fa52d6e1917016d295b5de37132627ef9044905ab4e28f7b2f2e5131ce00ed50631d83c66fa192b106904e
+DIST python-api-core-2.10.2.gh.tar.gz 181173 BLAKE2B 181aa7ed47c64a231ee30e7719f3e3c271de14408466cbb41653e2eea4617058fcb60da31c77d98d33b0026352e6a3d5e61fabf03b480c596eb8aebfd5b8bab0 SHA512 4f2f98aad9638516e6e96ade137a1f6bf877c8a9d03537c11cf85e4550d19fe166ba1a2963d1dfde9931cea4e98d581d8f734644c3b623b78aedc4e2711e0aa8
 DIST python-api-core-2.8.2.gh.tar.gz 164586 BLAKE2B bd62b20d1be52f0a2227d1663ee37ce31d991e0773ed793a3999b70c74e03a28ac188cc331027def0055a5b80e93378d9ec5baa389c65e7d2f183b37233be5ac SHA512 5844339cee71103650c446f002dcb13a632086d96dec1ed04a0ad5e4d3a61cc2a8e048da3e6445a50a0c009b0d25729f02865d28484bfee2a3427c829537e350
 EBUILD google-api-core-2.10.0.ebuild 2118 BLAKE2B 6a5f079686f99d6714db73d9061bf0ffbad66fa30101871663496018430b5e09db6405ef864ae79e5ff240d8d27d14f30ec9b5aa9969f6f7f8c54263d5aa31f7 SHA512 6e6ba79577c17242f63dc16bfd3f5bbcd976492411a8f170faf5d1ab81948897d71731d9b289f97d6c73942052288949d609e9f8657a7f67fa0d733c4701a311
 EBUILD google-api-core-2.10.1.ebuild 2118 BLAKE2B 6a5f079686f99d6714db73d9061bf0ffbad66fa30101871663496018430b5e09db6405ef864ae79e5ff240d8d27d14f30ec9b5aa9969f6f7f8c54263d5aa31f7 SHA512 6e6ba79577c17242f63dc16bfd3f5bbcd976492411a8f170faf5d1ab81948897d71731d9b289f97d6c73942052288949d609e9f8657a7f67fa0d733c4701a311
+EBUILD google-api-core-2.10.2.ebuild 2118 BLAKE2B 41b301d51305574ac03379643075989a9721c4e09fef9eac56304a4bbf86f11c3f429bcf7fb958e62fb7e4ba3474afb3d53012d75a68969f58ee38508b7fc395 SHA512 1b2050cf5604622ade0070a8ac93c3079ebea2441e2b2bf9b8a8629d28151326de82fec8a21ebd5b2b08ff712bcdb55b845a2264f40ef25eb7ab87fd356a3a84
 EBUILD google-api-core-2.8.2.ebuild 2116 BLAKE2B 2de96b01871de23ecede06ab214e606d22fae01fb2f4f57a1ac1568f2a6044e898022df1c0311dd3e5b7a23af6c8a917b713e45de399914c1bb1573b2a54c880 SHA512 e203f44aa72c910a49ab836c45aa2766f428f89563333401169e181d4f273853512608c8938f949855a0bbfebe576b3965af5cf985b43ab360202c3a1a6f7112
 MISC metadata.xml 453 BLAKE2B b53e834b3c423d8bdceaa2568f38173fc203f92f2340edd42899e4d4a93602118dbdb2283d492e34189155c336ec659d96f907f257b34cbe5557be331169a4f5 SHA512 d26c893b82fa946cab27669148b3dc2dea8b985636209ae49294cb14a7055f6c4a3884b38bce6e4923a54e9872af7e540b33a992eb727caae96e071a8ffe3237
diff --git a/dev-python/google-api-core/google-api-core-2.10.2.ebuild b/dev-python/google-api-core/google-api-core-2.10.2.ebuild
new file mode 100644
index 000000000000..49c9fdd9dd60
--- /dev/null
+++ b/dev-python/google-api-core/google-api-core-2.10.2.ebuild
@@ -0,0 +1,73 @@
+# 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..10} )
+
+inherit distutils-r1
+
+MY_P=python-api-core-${PV}
+DESCRIPTION="Core Library for Google Client Libraries"
+HOMEPAGE="
+	https://github.com/googleapis/python-api-core/
+	https://pypi.org/project/google-api-core/
+	https://googleapis.dev/python/google-api-core/latest/index.html
+"
+SRC_URI="
+	https://github.com/googleapis/python-api-core/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/googleapis-common-protos-1.56.2[${PYTHON_USEDEP}]
+	>=dev-python/google-auth-1.25.0[${PYTHON_USEDEP}]
+	>=dev-python/protobuf-python-3.19.5[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.18.0[${PYTHON_USEDEP}]
+	<dev-python/requests-3[${PYTHON_USEDEP}]
+	!dev-python/namespace-google
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/proto-plus[${PYTHON_USEDEP}]
+		dev-python/rsa[${PYTHON_USEDEP}]
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# failing due to missing grpcio-status
+	tests/asyncio/test_grpc_helpers_async.py::test_wrap_unary_errors
+	tests/asyncio/test_grpc_helpers_async.py::test_wrap_stream_errors_raised
+	tests/asyncio/test_grpc_helpers_async.py::test_wrap_stream_errors_read
+	tests/asyncio/test_grpc_helpers_async.py::test_wrap_stream_errors_aiter
+	tests/asyncio/test_grpc_helpers_async.py::test_wrap_stream_errors_write
+	tests/unit/test_grpc_helpers.py::test_wrap_unary_errors
+	tests/unit/test_grpc_helpers.py::test_wrap_stream_errors_invocation
+	tests/unit/test_grpc_helpers.py::test_wrap_stream_errors_iterator_initialization
+	tests/unit/test_grpc_helpers.py::test_wrap_stream_errors_during_iteration
+)
+
+python_compile() {
+	distutils-r1_python_compile
+	find "${BUILD_DIR}" -name '*.pth' -delete || die
+}
+
+src_test() {
+	rm -r google || die
+	distutils-r1_src_test
+}
+
+python_test() {
+	distutils_write_namespace google
+	epytest -p no:aiohttp -p no:trio tests
+}
diff --git a/dev-python/importlib_resources/Manifest b/dev-python/importlib_resources/Manifest
index 063d230f839e..ab85bcf47f79 100644
--- a/dev-python/importlib_resources/Manifest
+++ b/dev-python/importlib_resources/Manifest
@@ -1,3 +1,5 @@
+DIST importlib_resources-5.10.0.gh.tar.gz 34195 BLAKE2B 9b9fc1c33de8a0072edb28a0a67ae73b6830a4d0e16ebfa28bdeaff1409b2f9aeafc84e24f1187cc4ac1b36de78fdecc25acb4a1839ff5fd32f1c38124a98ff2 SHA512 3cf2bdea4fa4572402236ff71678376398d8cae4e87f08487100792275976047a5ee4f024308f1727758ba15ba2f03ed02d8cb95f2d9875c77842a5d24f7f384
 DIST importlib_resources-5.9.0.gh.tar.gz 32691 BLAKE2B bc922945d0577222e704ac3a5aa24cd6abb31c9b44f42c342e78f45fb035ee2b3843c437eba31bc8a73f609f6126390f4141c52b9eef15ff8bc7efc44233e81b SHA512 9054b633f3c9b3523ccfa2be93774d0aa4b0c2ab8bfb228f1e0bfbbc076362b416c9714409ff365aa5eae579554feedc8f2aeaa49c766db37ab669414eb22827
+EBUILD importlib_resources-5.10.0.ebuild 1301 BLAKE2B 6b22aff31454e6ddee4bb1ad24f2b09a0a01a3ad7b17e211abe3561ce671a07f900aec8ad8dc8f70cd1fd78926b5fe0c6eba4f33309eb07de95ff25d3306913a SHA512 9121bf2b4412c84a0a87ff116b4313a83a3bbd18932c576deb894cdb1e7c80276daeb6790214d99183e624e77869cd1b94a093725dd44da4a98b3e93a44f0253
 EBUILD importlib_resources-5.9.0.ebuild 1293 BLAKE2B 96d73479edc320ca0f2b1689535980d56773491287220d6660255b61688ea5828a4b17e6c381e32942dded7fa732bd13f5823ca01210734e5f1e99f7abc2e67d SHA512 ba3f9d137fb65cc8ac5077fd77fba18c7969de6ddf065294a2bca5c33db1e331523091a3a232512d5bdeacb96405d169ce8136ae44061b3b5633ed8cf420fd0f
 MISC metadata.xml 945 BLAKE2B 130dc56a13a8416168baf91e804e1fdef0d65978641c3fca5eb663b8accb5b1adc066bc4033751f03a9c729e27d0448925a7b623431922056fb7d282db052734 SHA512 ccb23df48a89f69133469722fb37acf516127b207b946cdea240cf82e2ba5422ee4e2166d1a9419031408a7624a52256e322fe7e478a9a7b8214ab4bc5c9b92b
diff --git a/dev-python/importlib_resources/importlib_resources-5.10.0.ebuild b/dev-python/importlib_resources/importlib_resources-5.10.0.ebuild
new file mode 100644
index 000000000000..7fbce509df31
--- /dev/null
+++ b/dev-python/importlib_resources/importlib_resources-5.10.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
+EAPI=7
+
+DISTUTILS_USE_PEP517=flit
+# This is a backport of Python 3.9's importlib.resources
+PYTHON_COMPAT=( pypy3 python3_8 )
+
+inherit distutils-r1
+
+DESCRIPTION="Read resources from Python packages"
+HOMEPAGE="
+	https://github.com/python/importlib_resources/
+	https://pypi.org/project/importlib-resources/
+"
+SRC_URI="
+	https://github.com/python/importlib_resources/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		>=dev-python/zipp-3.7.0-r1[${PYTHON_USEDEP}]
+	' 3.8 3.9)
+"
+
+distutils_enable_tests unittest
+
+src_configure() {
+	grep -q 'build-backend = "setuptools' pyproject.toml ||
+		die "Upstream changed build-backend, recheck"
+	# write a custom pyproject.toml to ease setuptools bootstrap
+	cat > pyproject.toml <<-EOF || die
+		[build-system]
+		requires = ["flit_core >=3.2,<4"]
+		build-backend = "flit_core.buildapi"
+
+		[project]
+		name = "importlib_resources"
+		version = "${PV}"
+		description = "Read resources from Python packages"
+	EOF
+}
diff --git a/dev-python/kombu/Manifest b/dev-python/kombu/Manifest
index a777dd838a16..7f2589d91acf 100644
--- a/dev-python/kombu/Manifest
+++ b/dev-python/kombu/Manifest
@@ -1,3 +1,3 @@
 DIST kombu-5.2.4.tar.gz 423450 BLAKE2B d0a180a4644876594eacea51706ca74fa4a95729ba965f69694da9694c2a91641ccf05aa1aec8a64f9d8c2260477d00bc2664d0a50143562b46524c98e4159b1 SHA512 695813bee71d627649e772b45b25494784a6a81bcad92331160705e34d8b2268fa90629983ebcfd04ec23208508d422f1834cc56895532911602d58ec0090a03
-EBUILD kombu-5.2.4.ebuild 2362 BLAKE2B 0328f6274c3d90c37e843120c26fedffffbe6d70b9442710f621d700d889c6f0320a000646bd4a35cef2bb304fe60a281255ed9cfe81b51f426b5f99c6881145 SHA512 3ed1ddeba6ba310ac628db4b51dea68d88459a61537027d3d6842d4c1db5f8948f65beffe84b0c02e6ee7ee6473fe30228e79b1b48c118c6f5a819c7538b49ce
+EBUILD kombu-5.2.4.ebuild 2331 BLAKE2B 1232f5baab9c3ada437ea17afe379b311812c475140b1fd8a4c782a01f9f98a0815422ae2d69c2d2ad2269225e5103ab159fc6d598cf4386142fab0a6c29c979 SHA512 d9805006824957fb7e0b1d62fc15dd61d461297f3131078d73e6154f2b4f6be33ca395dd8c3c6002a8760cbf5e6794d2822f25ccdd54a8243fa1ed2c8122a20f
 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 ccacd248459c..21bca2d94b90 100644
--- a/dev-python/kombu/kombu-5.2.4.ebuild
+++ b/dev-python/kombu/kombu-5.2.4.ebuild
@@ -4,12 +4,15 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1 optfeature
 
 DESCRIPTION="AMQP Messaging Framework for Python"
-HOMEPAGE="https://pypi.org/project/kombu/ https://github.com/celery/kombu"
+HOMEPAGE="
+	https://github.com/celery/kombu/
+	https://pypi.org/project/kombu/
+"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
@@ -27,7 +30,6 @@ BDEPEND="
 		app-arch/brotli[python,${PYTHON_USEDEP}]
 		>=dev-python/boto3-1.4.4[${PYTHON_USEDEP}]
 		>=dev-python/case-1.5.2[${PYTHON_USEDEP}]
-		dev-python/kazoo[${PYTHON_USEDEP}]
 		>=dev-python/msgpack-0.3.0[${PYTHON_USEDEP}]
 		dev-python/pycurl[${PYTHON_USEDEP}]
 		>=dev-python/pymongo-3.3.0[${PYTHON_USEDEP}]
diff --git a/dev-python/nbclassic/Manifest b/dev-python/nbclassic/Manifest
index 83010497230c..7cf3e7ec1082 100644
--- a/dev-python/nbclassic/Manifest
+++ b/dev-python/nbclassic/Manifest
@@ -1,5 +1,7 @@
 DIST nbclassic-0.3.7.tar.gz 15973 BLAKE2B a26a975fa8711c41a199e0b88b5ec83aefa4b812fce6ab4a765aa4920fae6b863519dbae556d663bf761a866a26ee6fe7c322c947312b89770a34f2a5b570455 SHA512 3ceaeeafa7e56d17cda29e4c86b4cb5f44517721b47e41ad1ac535704b8f460d88a5feb280ad8a9cef78366581e08c94837cab4ef2eae8dbce2ded183a787ea2
 DIST nbclassic-0.4.4.tar.gz 19873779 BLAKE2B ebdca5cb80de439f305406b0507f460a600c03a8fbb90b28d962974147d9e94f374282c02653019f2a519078812c2b25bbbcc9c12befbcdac72f305135437a70 SHA512 f7b425ea78f555d2d9d60e221fd3d3f551f7fa4ed4f6178a0596ff59ec0c1ead212f2102aeeaedf95ec3c5f7c2ea7536c21ff5df9f5b78b9718ab9bdf23159bf
+DIST nbclassic-0.4.5.tar.gz 19873691 BLAKE2B e7ebc2503bff405c18d1488391a9ab50c170bce9d3cf1b51944d24f4891a483b4c17c3dcb31c9021f8ab2ae5687fd800fd17d80b4872b9e5eeb4d9012081d724 SHA512 690ada48801ab4de94fea35460021c9692c97500e343312d0e229400fad5e404fdb3b0b1e32a8ce3fce1ba213c0ea9dcd3cb4fdf7dc3bde0fa3458397ae4020c
 EBUILD nbclassic-0.3.7.ebuild 875 BLAKE2B b120ddea33af8f4a3ea2192e94838b0c178584b927827769e50ac274289d585a79726ac1048217c9c374399dded66ad2aa7976a1cc2cc11b7fa9a106987ff60d SHA512 91afe190cf196bd823193f1f284bcd5769e0e23bedfc166065bda1878195f5ebe8995db0cdcb17f36e821588f70b95418cbe11e5600784b53d9d3f9e5dabbd61
 EBUILD nbclassic-0.4.4.ebuild 1047 BLAKE2B 9f084034b9d7617e6241177af9f9c2d95b6725d494102ce82fc1b2ffdb893b109ba1bf2fdfd75bcbcb49b8c43c78af3b8ca63bdcf8ac177aa9198e9cf89427c5 SHA512 a5d06e12597a1961fb9ba7d35f9b56d9731272bd6963b2492e8b4b734fa21b3619943e3e4c0b3717b10c38f0d11d186cc9e044dbf64335ac6c7e4a99d20945e2
-MISC metadata.xml 410 BLAKE2B 0b5a5047ac30e2bfc7f85fa8d5243dc4d90f21b3ba4cfa88e6dfa08d8a063a49fd962650424521a436963a40cd4d2b54ca15326f29aebd3df158c4985d94cd26 SHA512 3ce674ac4b73cd15fba38ea29f8064ce2a5c5b77ae58cb0b046a1b9b9263a3149674a5e24d96f3517d6a5fc2cfd13d5de15090ac40aec4865ec0626e91b28723
+EBUILD nbclassic-0.4.5.ebuild 1127 BLAKE2B 952af8a1667fb23a2ed4cbe4ffc6e5a7d738b230225f6f3c40a72b63802cc36bca4af8019ad8b5a861ec808f69c0b5b37f06c5d2e7f1d041b40a03650a06c54b SHA512 57473abaf42d52b42f938b2733eadf08940c8bbe64f40e255fbd3e17f7d8547423a8d56c810a071ecaaf407c17280a1142474f1c31cf3ca8a153366eef25fce1
+MISC metadata.xml 407 BLAKE2B 8be751d3f2e0e1e2952c39cd1846285ebb994d833022767dde609294ee9f98044b1189934e7d27c3134b1f06c95705687491dbf52739bdd0bc17f06cfdff53cf SHA512 6cc07376da4e55e5df153fdb0f43371ed415bed6db1bce2f67dd113d1e0f1994974dd6bee746021efb2d8c36ca2ca534109227c541d38b37b652a68b9642f2cb
diff --git a/dev-python/nbclassic/metadata.xml b/dev-python/nbclassic/metadata.xml
index 434ef7ba1288..4479f2c3a472 100644
--- a/dev-python/nbclassic/metadata.xml
+++ b/dev-python/nbclassic/metadata.xml
@@ -8,6 +8,6 @@
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">nbclassic</remote-id>
-		<remote-id type="github">jupyterlab/nbclassic</remote-id>
+		<remote-id type="github">jupyter/nbclassic</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/nbclassic/nbclassic-0.4.5.ebuild b/dev-python/nbclassic/nbclassic-0.4.5.ebuild
new file mode 100644
index 000000000000..b3849a53b10d
--- /dev/null
+++ b/dev-python/nbclassic/nbclassic-0.4.5.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_PEP517=jupyter
+
+inherit distutils-r1
+
+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"
+
+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}]
+"
+
+BDEPEND="
+	test? (
+		dev-python/pytest-console-scripts[${PYTHON_USEDEP}]
+		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_install_all() {
+	distutils-r1_python_install_all
+	# move /usr/etc stuff to /etc
+	mv "${ED}/usr/etc" "${ED}/etc" || die
+}
diff --git a/dev-python/poetry-core/Manifest b/dev-python/poetry-core/Manifest
index 80e04abad4be..9098d6862499 100644
--- a/dev-python/poetry-core/Manifest
+++ b/dev-python/poetry-core/Manifest
@@ -1,5 +1,7 @@
 DIST poetry-core-1.2.0.gh.tar.gz 536297 BLAKE2B 0ba82bfa320d65ce794a4f2346198d252139c03960298ede02f55d8b23367e05e9336b3d5030032b1feab4ffa327974af26ce2918d4d40889f68fbec79ccb490 SHA512 f6d79d7d66a25aa127b5decf46df861ecc101af0438b892196505b4ece5cc55f6ff8796eb603789b3259d213162236b7698305523b2eda414ad1f3a5b659eab9
 DIST poetry-core-1.3.1.gh.tar.gz 539214 BLAKE2B 12db16f06e5b7f94e0aa6edf6d5cc6c8c15c6389e3e1f517884c5532b211982d34682c035b69e53dfef60506c8be16ed36b0c8cc66651c88d83436d6cfc5182f SHA512 c61b7edeb0c821c0a1cd983965a3140cb8183147740e3b242d0cb0bfa375d6ee352314dd81e243d03c31e403c4a01353657cf771b84130ef058815068ecfdd5e
+DIST poetry-core-1.3.2.gh.tar.gz 539267 BLAKE2B 43845f344f8b492aa5dae5608b8d67b41efab33c60999cc61d8476e08a9ec9870328174b371d0735624c5f11dd2ce15e19e2c984653c7349dd0c3a687dec0123 SHA512 57fca4925889bfcff9335c0f76ea0cf8b48de1cb7bdc83bab8ceee452d6a6d64c4eaa169be17fb32ee59f453256fde1191e5c36382c4be27b74b5e3c8dce7703
 EBUILD poetry-core-1.2.0.ebuild 1620 BLAKE2B 41931afbcf5767a54fb5df962676cfbd0fda0274de861431ab0f343717f1d725ff42be41b5268f5aa760013163164a07bf5b417065607a2ceb3d230b5cd84534 SHA512 541c765d3e42be2192d490a2cc86d668ffc5940909d47197de21d95e0863bd37fdf2eb41c625f44d9611c2fe81bbf9f7008756dad00951cd49c0e9988fee6df0
 EBUILD poetry-core-1.3.1.ebuild 1628 BLAKE2B d21b2534abea4c369eeadde7fd2d2ff6a1b1baf557a44454fbbc5dbd8ba506656aae294a35b64efa5f33127a76ad9ec32b71c0105bd3a90e2e58bd9253e724e9 SHA512 fe519e3c99aa9daf15bc60f3074b492381cd54a86bf915399ee45f54b6765412a653a537ace5fe817f01bb3dcb6143618ee80f7a3714f8837b6ccb6440a44c0e
+EBUILD poetry-core-1.3.2.ebuild 1628 BLAKE2B d21b2534abea4c369eeadde7fd2d2ff6a1b1baf557a44454fbbc5dbd8ba506656aae294a35b64efa5f33127a76ad9ec32b71c0105bd3a90e2e58bd9253e724e9 SHA512 fe519e3c99aa9daf15bc60f3074b492381cd54a86bf915399ee45f54b6765412a653a537ace5fe817f01bb3dcb6143618ee80f7a3714f8837b6ccb6440a44c0e
 MISC metadata.xml 382 BLAKE2B 82dfc3f146cf3b669fed67ab2e21694b00d5473fdf855cae9fb3a0481785b32c4cf1ed9743a5d64cd055c1cb544377f936a9ec26c9d1dec2cf5fbef6749f5587 SHA512 032fd4dca8f8138c2b527e517f041889e15600ccca876fc3c9e53050196186ad2a9346168bce9c4bae7ffd8a77ff4dd19cc2559fd1da1fd4c7c181056fd49a13
diff --git a/dev-python/poetry-core/poetry-core-1.3.2.ebuild b/dev-python/poetry-core/poetry-core-1.3.2.ebuild
new file mode 100644
index 000000000000..c76206f1717a
--- /dev/null
+++ b/dev-python/poetry-core/poetry-core-1.3.2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=standalone
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Poetry PEP 517 Build Backend"
+HOMEPAGE="
+	https://github.com/python-poetry/poetry-core/
+	https://pypi.org/project/poetry-core/
+"
+SRC_URI="
+	https://github.com/python-poetry/poetry-core/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+# check inside src/poetry/core/_vendor/vendor.txt
+# (note that some are indirect deps)
+RDEPEND="
+	dev-python/jsonschema[${PYTHON_USEDEP}]
+	dev-python/lark[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/tomlkit[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/build[${PYTHON_USEDEP}]
+		dev-python/pep517[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/virtualenv[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# These "fail" bacause of glob file path resulting from newer versions
+	# in our tree than vendored. But those don't affect anything.
+	tests/masonry/builders/test_sdist.py::test_default_with_excluded_data
+	tests/masonry/builders/test_wheel.py::test_default_src_with_excluded_data
+)
+
+src_prepare() {
+	# remove vendoring of dependencies
+	rm -r src/poetry/core/_vendor || die
+	sed -e '/__vendor_site__/d' -i src/poetry/core/__init__.py || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# needed for migration from <1.1
+	distutils_write_namespace poetry
+	epytest
+}
diff --git a/dev-python/pytest-helpers-namespace/Manifest b/dev-python/pytest-helpers-namespace/Manifest
index 566635435fc6..6acc0b32c27b 100644
--- a/dev-python/pytest-helpers-namespace/Manifest
+++ b/dev-python/pytest-helpers-namespace/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-helpers-namespace-2021.12.29.gh.tar.gz 51376 BLAKE2B cbc79e6868a18f7174b96e73e3e902ea969d5a361c141e12bf5a67eeb7c93cead61629842f8b8744e58240cd8b85f9864ed95fec7ce048446963592b41bbd7e5 SHA512 82c231ff11a36fce7b16a0ceea51c9306f7e05ca3f9e8cc7cc1c77ac9822f974d1ac893d2bf9b7154bf9593a529193daa041ccaaced6fdd9e38ba4f794f161b0
-EBUILD pytest-helpers-namespace-2021.12.29.ebuild 1002 BLAKE2B 968f8a81e4ecd7feed1157f8c57107cc3a1dff2cd8044310ab4c63513f08dd7f111ffefe62ab51446087e48d7c153e8733f294789400b01d646c883826ec73f7 SHA512 8a18e7d72c12e0c28eee9bed39c5204a22905e9103fbf62068b89acfd507ef6373fef68be84c6b719a21cdec9b59eea4aae21e2533b3d9df88fcf8692679ec61
+EBUILD pytest-helpers-namespace-2021.12.29-r1.ebuild 936 BLAKE2B 1996ddee3d61e6e104f8081277e580424e93aaa2fb5bf656ad167a60a5715cb086994584b4fb7f34c5beba0c6d4b9b5591d0e4bb35b03776be23353535f756c7 SHA512 2ad916b3e86a4922abe9cda3ce8fb7f19e85ab41059bcd4c0624d7e33674b6885c091895418065dc02cbfe86ce61c592948f81acbff823956926289b28c29925
 MISC metadata.xml 514 BLAKE2B d2cf552d0b34b0556bffdb2afb6524b5c0ce81d503a6a1dc2b4957beea0c96c1eb3ea4f6e61bd4351a26fa2983d10b155a58bbf04fcfba1fe4e55f720a7db09a SHA512 9aa9a28164597c7a6bec22f6c07f269c5954b02a4a7523373866e60f2d6824c83dd4912ca2e05081a2257f7e01e135f2544a0732d3c2f51266b331c753314108
diff --git a/dev-python/pytest-helpers-namespace/pytest-helpers-namespace-2021.12.29.ebuild b/dev-python/pytest-helpers-namespace/pytest-helpers-namespace-2021.12.29-r1.ebuild
index 83122e6a1198..e9ad86f989fc 100644
--- a/dev-python/pytest-helpers-namespace/pytest-helpers-namespace-2021.12.29.ebuild
+++ b/dev-python/pytest-helpers-namespace/pytest-helpers-namespace-2021.12.29-r1.ebuild
@@ -26,7 +26,6 @@ RDEPEND="
 	>=dev-python/pytest-6.0.0[${PYTHON_USEDEP}]
 "
 BDEPEND="
-	dev-python/setuptools-declarative-requirements[${PYTHON_USEDEP}]
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
 	test? (
 		dev-python/pytest-forked[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-skip-markers/Manifest b/dev-python/pytest-skip-markers/Manifest
index db2ef6e544cc..298775f790d4 100644
--- a/dev-python/pytest-skip-markers/Manifest
+++ b/dev-python/pytest-skip-markers/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-skip-markers-1.3.0.tar.gz 79882 BLAKE2B 2c44711e6194aebf0a0299f8a50e6162a088023c2fff6bdb7c142060695a6977b1d4a5cc574199d8f11a5a94e413d7444f81d9e954327e8317ed1bcf3725a60f SHA512 bea602032a7796be7c2dad62ba750e987b77f04349c96f6f8e1f15f5d2b58c3ba1e549a775ce7e541f6041091a578def59900a726872c8aa8b31c585e3f0c3e0
-EBUILD pytest-skip-markers-1.3.0-r1.ebuild 1009 BLAKE2B 13d913d2577c5b605f7433680079e64078947d5b4a9e23b82ea1ae86febd939c80d15d0989686573ba6e28437cefa5919722a0cb62789b2d3a7ec8c2d9d3a638 SHA512 a6e5def5a19c2950dddbcdc2bc694b4af4a50877e0946a310bd5f2f7259370137a9e1397c9f738a3644cfa6fa8746bc38b4951a0d17b285fb9af7a47a167131e
+EBUILD pytest-skip-markers-1.3.0-r2.ebuild 943 BLAKE2B 6d783799f0b7ddad87ad817746fa7787e09c841880f91714d8a05fc3a8b0e05f8ff95fc355477c02af45c758e4b55bc5db5929d18e34ec90f457d2318f3987e0 SHA512 f064e8317341fdbee6e93c9146081218bda423028d5a571074267b3533314488a325d7f61defdb37cb14e1d1a1b029e3747a35dfd466b9c1f729a934502b6cf9
 MISC metadata.xml 433 BLAKE2B 07de1af137dd4f1644c069f92e73f7558023095fb0e965ae3e1fe04ecf80f65fe267aa66cb54bddfe4df70c65f1bbbd87ddcb018e4e6bc52e8a83347d0720220 SHA512 842b3fedb252ab2493f2bd349fe6d1dd475bfd4b2ac6422c5dc4eea0ee422dcaebc09bf57a87b3f52260408e56b1036961af3accfcf43cc8a10c2d957ea18573
diff --git a/dev-python/pytest-skip-markers/pytest-skip-markers-1.3.0-r1.ebuild b/dev-python/pytest-skip-markers/pytest-skip-markers-1.3.0-r2.ebuild
index ea590b0e73dd..864d4576d4f6 100644
--- a/dev-python/pytest-skip-markers/pytest-skip-markers-1.3.0-r1.ebuild
+++ b/dev-python/pytest-skip-markers/pytest-skip-markers-1.3.0-r2.ebuild
@@ -28,7 +28,6 @@ RDEPEND="
 	dev-python/distro[${PYTHON_USEDEP}]
 "
 BDEPEND="
-	dev-python/setuptools-declarative-requirements[${PYTHON_USEDEP}]
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
 	test? (
 		dev-python/pip[${PYTHON_USEDEP}]