Adding metadata

47 files changed, 685 insertions, 473 deletions

diff --git a/dev-python/awxkit/Manifest b/dev-python/awxkit/Manifest
index 4e975bfdb858..330e18c3e772 100644
--- a/dev-python/awxkit/Manifest
+++ b/dev-python/awxkit/Manifest
@@ -1,2 +1,3 @@
+DIST awxkit-21.10.0.gh.tar.gz 16200617 BLAKE2B ea872f7690df74a5a5a6edae48e03dd6e36984837890b6d9a9b4e9c54bcec781c0f2f8956a2b2884025776faaeeb834952ad1291ae0462eb8ad63d55a1881fa0 SHA512 430599dd47afe8901a4e896da5b13fde05d9878c3b9d89f442ccc0a3081b9ef9c22dcd402cc75dfae9bf134b19cc4fb23626590c455b362289780a6ba3fc7b0e
 DIST awxkit-21.8.0.gh.tar.gz 17809968 BLAKE2B 9c8b22630886d131787c4d664baaa9078cb01125789d340b89aba04a6dae8319b4cbdccb1a2668ca0625e313ddb782c615a93fc7438ec4f5f884ae8d927c191e SHA512 cf7ce080c34bac3c9949e2093b83b7b96c734b1f1d093be31422c8a59b9768716ed20f1a5f96282dae43d433ea3848aae48a636b935ebc0d15ddcc6412a3a067
 DIST awxkit-21.9.0.gh.tar.gz 16155930 BLAKE2B 1e119a214d0587711d55b72cfa2dec48ec09e14f8d3266fcd6266451edc4a9311b9daff44db09b480199a767b4c940d7781a5b9c1eabf71522c9da62f1094838 SHA512 a63e575a0d00cc089e8f4121e2d9f99019c151f7b929e0c5ce843026d29b73adf2685c3b7a99f80bec89bf81821aaece4f15c20396632cb668a1e90e9440ae09
diff --git a/dev-python/awxkit/awxkit-21.10.0.ebuild b/dev-python/awxkit/awxkit-21.10.0.ebuild
new file mode 100644
index 000000000000..8de770f1fe4f
--- /dev/null
+++ b/dev-python/awxkit/awxkit-21.10.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Command line interface for Ansible AWX"
+HOMEPAGE="
+	https://github.com/ansible/awx/
+	https://pypi.org/project/awxkit/
+"
+SRC_URI="
+	https://github.com/ansible/awx/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S="${WORKDIR}/awx-${PV}/awxkit"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/urllib3[${PYTHON_USEDEP}]
+	dev-python/websocket-client[${PYTHON_USEDEP}]
+	dev-python/pyjwt[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+	sed -e 's|websocket-client==[[:digit:]\.]*|websocket-client|' \
+		-e "/'clean'/d" \
+		-i setup.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 304d5e3aa12d..3abb182727fb 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -3,4 +3,5 @@ DIST boto3-1.26.16.gh.tar.gz 565753 BLAKE2B 7b30f4a3e15ca893cacca7ea58e18d654f38
 DIST boto3-1.26.18.gh.tar.gz 570818 BLAKE2B 2f77acbb6fa77c867cda0b1d7828c5aafdfc8b6e5d7cced4beda08f151c9ed889356ec32b4b0ad2724bffbaa20690f149caf69f89dfbf70761ca354893685cb7 SHA512 b67d62057c7c421eedbf8778c2bd10d9cad9a81678dfc68415cb5ca546182c418d1c8a6619d20be066d78891af7720ec29209fecd27628e1d456b04965edfb83
 DIST boto3-1.26.20.gh.tar.gz 572957 BLAKE2B 27286beaeabc0227376640fd3ee583656470ee324805ac716411a6c87fc2f301f6430c4f82e58c4a5371fe38a4cb3a6cebe32de39c0bae35f051fd340257c315 SHA512 4623e29b4396cd131e76ad44d24e32014e9f79642db471f64b5b06553ffbd0a0492883188e3658fe629e6af0a91b8274dbda3103a3ecf6d2dd6fe5b1a91b9503
 DIST boto3-1.26.21.gh.tar.gz 573776 BLAKE2B a608b875d052cb895cae4bc20924836284dd924bfc9939023d452fbb2af2ca32fe1503b32552d19cdde6a9347dce26991a70aa4a1b980fcb7f711ed246b8e63a SHA512 3fd3aba935950738c62d5c7d8249768c352a4106be0cac989d1f0635a45606022749b4d34cb3093d44b18501ff14c30545df76d7d1f9681886ff71ec62bff888
+DIST boto3-1.26.22.gh.tar.gz 574580 BLAKE2B 35027efcfaa0ec27ff7e8769af32c4ea621fea842a84b689f76ef412305318a16fd3fe3b139f00a66f91892455a14cbb9753ea4f3d07ac24e4e18725cb6c7fb7 SHA512 5035f8be58384b1c8634ab801dd3930043febfbcc5d23f1c4385ce7e4aac37fda61a04ca3adcf86010db21f8d26403b491990746c578d91fa173c9629bb501bb
 DIST boto3-1.26.8.gh.tar.gz 557012 BLAKE2B 211bb7441acc8b1f901ebf5251288dc7c9073fa6e34f5a34426424ef064efb0fb3031deaf48ef336ec43bb015f95f618598da43d12ec83cbf814e1b4097b28a0 SHA512 738190cedfb0b85d3a1e9558b03e7f2fb14e43b152bc9627fd95c8ecc4a0ddc17f4c87ccb6129c1fbf5f47db9eea4dbc5c2cfbb69b903bc6f3ff417ef86b6f6b
diff --git a/dev-python/boto3/boto3-1.26.22.ebuild b/dev-python/boto3/boto3-1.26.22.ebuild
new file mode 100644
index 000000000000..3d7d652a3b69
--- /dev/null
+++ b/dev-python/boto3/boto3-1.26.22.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_{7,8,9,10,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 bb8fd71686fb..224f2f055d10 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -3,4 +3,5 @@ DIST botocore-1.29.16.gh.tar.gz 10709321 BLAKE2B d9a8590b1685351f1167962fa45f979
 DIST botocore-1.29.18.gh.tar.gz 10837962 BLAKE2B c1d32b31ba687427f6c88e53dd4908d966b83d3d5d087b64e5370b7294d568a09dfe08e72e89acf8402dbf887369c509d1c7fcf77c5156ef9029319878e7311c SHA512 2e8e7108e343028cf6ff30fd9f6b66b8b49a2b3013656ee3fc912c67052a42eca49d93a57e322248dfce7cfa765c6bf4b78f364a71b843536853bc4f413e1930
 DIST botocore-1.29.20.gh.tar.gz 10956292 BLAKE2B 3453a1051056f8f6bc870c66b66d81b4f68dca97068ebb0beed286f3534798483254a0a3390e9b2ce07d25a01b35e81ceccc9c5f8cfd5bf18147931a9048e242 SHA512 c99e1cb4f0f55715d88ec8fe6602fef60254cacd9e2c1b309bfa1b8dfdc5c979c60f558b08f953afcc0985859091f4fad5c21e1906c177eaa8bc2dcd8216a3aa
 DIST botocore-1.29.21.gh.tar.gz 10994190 BLAKE2B 00a40dd701f659f63c0c0862e96922a341e8e13f2ede29c2153196810769f3c321ee66af5a4a9284ac999c5ff6bbd1b1484a1396fe97407726896b4d6860d1a1 SHA512 6743f2997221d9474f814e27ab1d6303062ed942e933619683c519a731883d1e5f06700f4730545e794cbc401ab8e20a19e08fdd06baf4cd7bac4e57bcd439c9
+DIST botocore-1.29.22.gh.tar.gz 10999477 BLAKE2B 90987611453768b9c7c00ea8f6b1645bb8e5bed8ecb8b75c95452a2f20208ffed22182f8ea24bedb03f213826c3d46963f393ffc3f1465ae99620ff7f35240b7 SHA512 23c6ed2d0a9fed97467d568773d886773a06f6e4efffabbfad3b285f4d8f1844e82025b73e7fadd8c29d304c4f27e5385f63896b6ce0250e2af8b950b9a3e014
 DIST botocore-1.29.8.gh.tar.gz 10636661 BLAKE2B 3ebd9e5cb6cc1a9d4ddb877e806e0a845e6a19a4604b4489dbdb9a0f35251201de5d7062f3b0193db3e28f5170d8c3315fdc0b2bec7668a61880ff3e9305d3bc SHA512 c4a1a3993576bd0340de4eeb25e10650219e9d74c21f7e51e5298120bc92a8359143c38d5a991b940316fc5eac483e4e838298881a5c068fa91dc3ebf92a7f5a
diff --git a/dev-python/botocore/botocore-1.29.22.ebuild b/dev-python/botocore/botocore-1.29.22.ebuild
new file mode 100644
index 000000000000..40131f66e350
--- /dev/null
+++ b/dev-python/botocore/botocore-1.29.22.ebuild
@@ -0,0 +1,74 @@
+# 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_{7,8,9,10,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
+		# TODO
+		tests/functional/test_credentials.py::SSOSessionTest::test_token_chosen_from_provider
+	)
+
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/cloudscraper/Manifest b/dev-python/cloudscraper/Manifest
index ad7868058338..da43c4fbd55f 100644
--- a/dev-python/cloudscraper/Manifest
+++ b/dev-python/cloudscraper/Manifest
@@ -1 +1 @@
-DIST cloudscraper-1.2.62.gh.tar.gz 111233 BLAKE2B ea8a9d5aca2187ee14ee2066b2a16d188ddac3457edd96f4e346791331299abce6554765db58374b58603dc937738ac29eaae7c57d3d2ebe3055fa27589e196e SHA512 40920e0023e5efcffd243edb7dfaf3a1b8b97a60d681ee7693e26e51d011442acd830b8d90f9a00f2902b836e9e06e272e262526cbf41d5b4cab3e4c884808ff
+DIST cloudscraper-1.2.65.gh.tar.gz 111946 BLAKE2B 7b53819ceb3349c9e8bc24cfd3138119b46bd88daa639d1c29b7e7477f0fc2cb323b3e485832236eadf48be76d16a2dde93cadffe594fc7b7d43b24651de45eb SHA512 e885e7e0b7e91318da4b6d65165961fbae27951be9b4f05af96e7eeaf1e28e1146af52c10bf0b769f07fc04016998eed9146ec92504a591d81434a101c6d6850
diff --git a/dev-python/cloudscraper/cloudscraper-1.2.62.ebuild b/dev-python/cloudscraper/cloudscraper-1.2.65.ebuild
index 8bd698f864e7..4cf7413dd881 100644
--- a/dev-python/cloudscraper/cloudscraper-1.2.62.ebuild
+++ b/dev-python/cloudscraper/cloudscraper-1.2.65.ebuild
@@ -4,6 +4,7 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+DISTUTILS_USE_PEP517=setuptools
 
 inherit distutils-r1 optfeature
 
diff --git a/dev-python/dask/Manifest b/dev-python/dask/Manifest
index cbf8640cf086..a7c66adf2eec 100644
--- a/dev-python/dask/Manifest
+++ b/dev-python/dask/Manifest
@@ -1,2 +1,3 @@
 DIST dask-2022.10.1.gh.tar.gz 8781108 BLAKE2B 2030cf0670d054a222123ef836573ae7f5e574a879089a57b9a7730ae5cc33e43da2af3b470ce24174169f9045415cf71543aa05fd368b4471111a01982c5b7c SHA512 58b5515be46086a02a895f97db7120423a51651dcefef6f14d631a719e4faa0315b7a32640e4cd823064ae754319b84cc7c74bb4d4e9d904177816115abc48e5
 DIST dask-2022.11.1.gh.tar.gz 8223813 BLAKE2B 1c7f4ed26022673ebb3a337520eee4cfb6c48449c06bfc1906431de6f03b4a4df313630326f96cf5ef8aefdc1306ded21158946997d9cf79153f7d83659575bd SHA512 c954de12d512e5be7d4891e9e702ae21c69e42be703e3859bb2d6893dd600fc7255ce25677bfdf9e119f84450510877ce018ac8ef425291fdf90c04af169e2e7
+DIST dask-2022.12.0.gh.tar.gz 8226972 BLAKE2B 56def762c1899df9b355f54484b77cfde125e85287db488388130c92b388f014b7ddf8ccd4614918a5c6a15513c7fab207b4c2231105880a893af32e768ed675 SHA512 bc29f3735fb977a5b523d7ffbf55a99fd7a386388f1ebec3c44196d3b6870393163e023a2c64f1f8e7b8aae5342b9b0041a6628df72d14a0127513acf7f6c529
diff --git a/dev-python/dask/dask-2022.12.0.ebuild b/dev-python/dask/dask-2022.12.0.ebuild
new file mode 100644
index 000000000000..1155624f33af
--- /dev/null
+++ b/dev-python/dask/dask-2022.12.0.ebuild
@@ -0,0 +1,61 @@
+# 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_{7,8,9,10,11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Task scheduling and blocked algorithms for parallel processing"
+HOMEPAGE="
+	https://www.dask.org/
+	https://github.com/dask/dask/
+	https://pypi.org/project/dask/
+"
+SRC_URI="
+	https://github.com/dask/dask/archive/${PV}.tar.gz -> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/cloudpickle-0.2.2[${PYTHON_USEDEP}]
+	>=dev-python/fsspec-0.6.0[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.15.1[${PYTHON_USEDEP}]
+	>=dev-python/pandas-0.25.0[${PYTHON_USEDEP}]
+	>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
+	>=dev-python/partd-0.3.10[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-5.3.1[${PYTHON_USEDEP}]
+	>=dev-python/toolz-0.8.2[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/toolz[${PYTHON_USEDEP}]
+	test? (
+		dev-python/moto[${PYTHON_USEDEP}]
+		dev-python/numexpr[${PYTHON_USEDEP}]
+		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
+		dev-python/scipy[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# another test relying on -Werror
+	"dask/array/tests/test_overlap.py::test_map_overlap_no_depth[None]"
+	# TODO
+	dask/array/tests/test_reductions.py::test_mean_func_does_not_warn
+	dask/tests/test_config.py::test__get_paths
+	dask/array/tests/test_linalg.py::test_solve_assume_a
+	"dask/dataframe/tests/test_dataframe.py::test_repartition_npartitions[<lambda>0-float-5-1-True]"
+	"dask/dataframe/tests/test_dataframe.py::test_repartition_npartitions[<lambda>1-float-5-1-True]"
+)
+
+python_test() {
+	epytest -p no:flaky -m "not network"
+}
diff --git a/dev-python/mapbox_earcut/Manifest b/dev-python/mapbox_earcut/Manifest
index 2e96eda8bf7e..2f35a2295175 100644
--- a/dev-python/mapbox_earcut/Manifest
+++ b/dev-python/mapbox_earcut/Manifest
@@ -1 +1,2 @@
 DIST mapbox_earcut_python-1.0.0.tar.gz 11418 BLAKE2B af1b2c34fe5807145de4b8db3f4b8803c3c03a89f6f3c9fa053ec256eaa5089867d570b9ff66d19a11808e1a452039cf6d194494fbe964cc18f233a528203293 SHA512 8f3687ac11497ad73c2a3dd1d1203dccf655da623d1638e638978a59388e0c057ca6f895782b609d59a2a4be478d6daf2294523a946c8a5d232dcfe718e4eec9
+DIST mapbox_earcut_python-1.0.1.gh.tar.gz 11794 BLAKE2B c54c2333ac08f551737ff6ba0e5179464c0330fefeb11e5cff9ad6d3927e8a5d5323cbceffd271a25103e75da44f2a4efa17b8c338f888f69f71ee7bc1e21682 SHA512 cdb32585cbaf74c15e59af0ae70d983dd2f9bc9cfe1b59b3eadc4d442f7d962241854b589a035deae67cacd9334833b911d0981f0d417fe587348fc7d24f0c0a
diff --git a/dev-python/mapbox_earcut/mapbox_earcut-1.0.1.ebuild b/dev-python/mapbox_earcut/mapbox_earcut-1.0.1.ebuild
new file mode 100644
index 000000000000..c455bb35ddaa
--- /dev/null
+++ b/dev-python/mapbox_earcut/mapbox_earcut-1.0.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+DISTUTILS_USE_PEP517=setuptools
+
+inherit distutils-r1
+
+MY_P="mapbox_earcut_python-${PV}"
+DESCRIPTION="Python bindings to the mapbox earcut C++ library"
+HOMEPAGE="https://github.com/skogler/mapbox_earcut_python"
+SRC_URI="
+	https://github.com/skogler/mapbox_earcut_python/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-python/numpy[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/pybind11[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+DOCS=( CHANGELOG.md README.md )
diff --git a/dev-python/mkdocs_pymdownx_material_extras/Manifest b/dev-python/mkdocs_pymdownx_material_extras/Manifest
index f82f0b70c6db..d5ee95b5a5c4 100644
--- a/dev-python/mkdocs_pymdownx_material_extras/Manifest
+++ b/dev-python/mkdocs_pymdownx_material_extras/Manifest
@@ -1,2 +1,3 @@
 DIST mkdocs_pymdownx_material_extras-2.2.1.tar.gz 24497 BLAKE2B af9c932a7f5686f3524d247cfee5e0d91681a0ae185f7f25405fd8355cd4c5a4de869f0f50de41a7cf7ab27275f532c0922bbfb84d7e7d74d25cfb292538fca1 SHA512 001f23d0b80fc082fc34e69903fb097fe67d4931cb2f02edd200f9c856f5e6393b2b6c6edd81e12ab609e7fefc27bceb494a6ad59bb7596b60200560dfb17465
+DIST mkdocs_pymdownx_material_extras-2.3.1.tar.gz 24640 BLAKE2B a6637991494a0042bdc65a65822b84066efa774890d13079c87667fdfeadafa439a92bddeebad1234be8d10d60a1e4bcb76c2ff693e305c6ae37e846958eb810 SHA512 bfc213de818d0a82786de2c55d35d90fa80f107efdff2aa12ef5a96ec77d2bfb7d1e0e9115e930a29440cfba49fbe3a3a429dba2fb5c993878268d8a85b6ceba
 DIST mkdocs_pymdownx_material_extras-2.3.tar.gz 24474 BLAKE2B 4da5451914b8f755f44bb65b6c4b06d1ef507f6b3be339a8faec21ee6d46d8c228ef0475f3b061eef5962a9738d999543ca25ba45c41b3797d3482d60e1fd9c5 SHA512 60c143f258e3cd5499aee383847447bf27a209e90146dfc97a1e643a46fe3af11943b078f49ab5ff14aeb15a52e070d9210f3a8ac770b73a3e03bda4859e7c9f
diff --git a/dev-python/mkdocs_pymdownx_material_extras/mkdocs_pymdownx_material_extras-2.3.1.ebuild b/dev-python/mkdocs_pymdownx_material_extras/mkdocs_pymdownx_material_extras-2.3.1.ebuild
new file mode 100644
index 000000000000..bd10b4732f53
--- /dev/null
+++ b/dev-python/mkdocs_pymdownx_material_extras/mkdocs_pymdownx_material_extras-2.3.1.ebuild
@@ -0,0 +1,24 @@
+# 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_{7,8,9,10,11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Custom alterations based on Mkdocs-Material"
+HOMEPAGE="
+	https://github.com/facelessuser/mkdocs_pymdownx_material_extras/
+	https://pypi.org/project/mkdocs-pymdownx-material-extras/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/mkdocs-material-8.3.3[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/multidict/Manifest b/dev-python/multidict/Manifest
index 8fee64a96967..635a6d7e5703 100644
--- a/dev-python/multidict/Manifest
+++ b/dev-python/multidict/Manifest
@@ -1 +1,2 @@
 DIST multidict-6.0.2.tar.gz 56840 BLAKE2B 1fa9b0d92a94ed022849a851f925e132b629216ddd0d5d4772304fd3361a129692f8b49fca2765118ab1cbc306879924d0aa7c6b57b648158a093a9f311a8d30 SHA512 508f18c5f731e7438bc7cb84b29aff22422769a8ea4c0ba7c875361d1bb1da78bed2db8b4ca34b833effd03ca3e7f00dabaad64bfce54b3e8d208cdc808083c9
+DIST multidict-6.0.3.gh.tar.gz 58568 BLAKE2B b89373a74c6fb4965bc794e7351d6e9563f810ecdb738000ae5573c8b4717f39c4866fd945c9de2afed4f48060ba675d449d7df512c58d5f34b55bc0d8d44ae9 SHA512 95aef45378c0af6ef6b05549d7419ff4ba272430edae37b2fc041a4742d58890ba9475648b8b5ac57d2bff3718519a0201819b274a65ac0b101cf41c8abad812
diff --git a/dev-python/multidict/multidict-6.0.3.ebuild b/dev-python/multidict/multidict-6.0.3.ebuild
new file mode 100644
index 000000000000..c218106ad3fb
--- /dev/null
+++ b/dev-python/multidict/multidict-6.0.3.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="multidict implementation"
+HOMEPAGE="
+	https://github.com/aio-libs/multidict/
+	https://pypi.org/project/multidict/
+"
+SRC_URI="
+	https://github.com/aio-libs/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+BDEPEND="
+	>=dev-python/cython-0.28.4[${PYTHON_USEDEP}]
+"
+
+distutils_enable_sphinx docs --no-autodoc
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# don't enable coverage or other pytest settings
+	sed -i -e 's:--cov.*::' setup.cfg || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/pathtools/Manifest b/dev-python/pathtools/Manifest
deleted file mode 100644
index 24d7f7f0fbc0..000000000000
--- a/dev-python/pathtools/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST pathtools-0.1.2.tar.gz 11006 BLAKE2B ad257edd9a62477a07343ecd6786c24ad2472da8844e3358980973c9daee9c52f3317976b2971f9afe33bfcd0dba1c1497230b105fd364a45c0d138abec41894 SHA512 e014cb17f3d61ce7979e36663f94a44d4f1116c35e3d2ec8c4ac207a81935dde246495ed06597e6edade1509f384b9e5729a97ffd3eec31b1d1c4a8372d1dfd7
diff --git a/dev-python/pathtools/metadata.xml b/dev-python/pathtools/metadata.xml
deleted file mode 100644
index 853174b8f2ab..000000000000
--- a/dev-python/pathtools/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
-  <email>python@gentoo.org</email>
-  <name>Python</name>
- </maintainer>
- 
- <origin>gentoo-staging</origin>
-</pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/pathtools/pathtools-0.1.2-r3.ebuild b/dev-python/pathtools/pathtools-0.1.2-r3.ebuild
deleted file mode 100644
index f0c27f67375e..000000000000
--- a/dev-python/pathtools/pathtools-0.1.2-r3.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Pattern matching and various utilities for file systems paths"
-HOMEPAGE="https://pypi.org/project/pathtools/ https://github.com/gorakhargosh/pathtools"
-SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc x86"
diff --git a/dev-python/plyr/plyr-1.0.6-r1.ebuild b/dev-python/plyr/plyr-1.0.6-r1.ebuild
index 5611676a939f..3905ef26aad2 100644
--- a/dev-python/plyr/plyr-1.0.6-r1.ebuild
+++ b/dev-python/plyr/plyr-1.0.6-r1.ebuild
@@ -12,21 +12,31 @@ MY_PN="python-glyr"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="A python wrapper for Glyr"
-HOMEPAGE="https://sahib.github.io/python-glyr/intro.html
-	https://github.com/sahib/python-glyr"
-SRC_URI="https://github.com/sahib/${MY_PN}/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
+HOMEPAGE="
+	https://sahib.github.io/python-glyr/intro.html
+	https://github.com/sahib/python-glyr/
+	https://pypi.org/project/plyr/
+"
+SRC_URI="
+	https://github.com/sahib/${MY_PN}/archive/${PV}.tar.gz -> ${MY_P}.tar.gz
+"
 S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-3+"
 KEYWORDS="amd64 x86"
 SLOT="0"
 
-RDEPEND="media-libs/glyr:="
-DEPEND="${RDEPEND}"
+DEPEND="
+	media-libs/glyr:=
+"
+RDEPEND="
+	${DEPEND}
+"
 BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]"
+	dev-python/cython[${PYTHON_USEDEP}]
+"
 
-distutils_enable_sphinx docs
+distutils_enable_sphinx docs/source
 distutils_enable_tests pytest
 
 EPYTEST_DESELECT=(
diff --git a/dev-python/psutil/Manifest b/dev-python/psutil/Manifest
index 0a4d14f0a4cf..08b18e83f97c 100644
--- a/dev-python/psutil/Manifest
+++ b/dev-python/psutil/Manifest
@@ -1,5 +1,3 @@
-DIST psutil-5.9.1-tests-r2.patch.xz 3516 BLAKE2B 6a16d6f89fdeb06c7aa0d9d986eba84deae5f8d2bb829c2509744f954f9b274d8a70a00f94127f1880cea71f8d7e7b85097517f8516ee6ef14f17522ee9297b2 SHA512 b69efb32cd0229056ff9fbbde963f0f01f6bf1d0820f028527f464e38a9bd4211a55bd725cc8962a20608c12c28edb24b2063f5f58b53fdb6b001fe2f95da103
-DIST psutil-5.9.1.tar.gz 479090 BLAKE2B 88f35a9134d942fa56b5fbc79753e82245c3bfdb1f640dbf3b56815b89d872517f9ee3a3945532ebd1a399c3307e160ac80394766c3b2cc7e3fb36ffdd555eef SHA512 1ddb119a10243d17d808417817ec8659d22447f12a4bbc0366c13f6587a4b0b59f4e74f6ac5d1e1a908bb5fd287be630466d32beabcb5008f6a19c24a1557c27
 DIST psutil-5.9.3-tests-r1.patch.xz 3648 BLAKE2B df56e3b11da307fdd4441284d1a7928c928b36c512ef05d313ac71e76545eabaca1f6a1ea9dab301c86005ef4c9af9622e0d1c6d7be858b92b0dce9d6031440d SHA512 0d8b35fe76b1caf1265ab4ecf182c92b71714be9612418c945f39c58f384979ed36e47bdf11b11a8cf2fc3925fed60abadf4f3eaea083f6bcd6d2cddb81fb5f9
 DIST psutil-5.9.3.tar.gz 483579 BLAKE2B c1b5c77483a1e280cc68aa3ae5ca39fcc3992f3c07a591bbe92278050e9517a9e9c0e17338f2932f5ec680a19c4f6958e21e4b9b02158041e76dd877b5311c21 SHA512 d226364b416823783058f19c06dae4ac1ea03f061646f01ea6953ded8fbb89aed92aa743c9e55181e4d57101f7dbbb78336043e1fc7a3bd62ff82b19f0a4efae
 DIST psutil-5.9.4.tar.gz 485825 BLAKE2B ce5257e653876fc0c4bb005c964f677c0b4010f853cc7b8ff3451aa1efd7fde6b7e5d2150fb936cd38b667d5c167f180d5cae0792bdf50a8aa2e528795ed9897 SHA512 ff8d6213b153b5a3428e4f65ddbc41cb1f37caae4acab02760632107d95a50a74d3ee563f0cb2d623b37cdddd16425d2084e7f841e4a46af8988a7676f6975e6
diff --git a/dev-python/psutil/psutil-5.9.1.ebuild b/dev-python/psutil/psutil-5.9.1.ebuild
deleted file mode 100644
index 15e609678b32..000000000000
--- a/dev-python/psutil/psutil-5.9.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-
-inherit distutils-r1
-
-TEST_PATCH=psutil-5.9.1-tests-r2.patch
-DESCRIPTION="Retrieve information on running processes and system utilization"
-HOMEPAGE="https://github.com/giampaolo/psutil https://pypi.org/project/psutil/"
-SRC_URI="
-	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
-	https://dev.gentoo.org/~mgorny/dist/${TEST_PATCH}.xz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${WORKDIR}/${TEST_PATCH}"
-)
-
-python_test() {
-	# Since we are running in an environment a bit similar to CI,
-	# let's skip the tests that are disabled for CI
-	local -x TRAVIS=1
-	local -x APPVEYOR=1
-	local -x GITHUB_ACTIONS=1
-	local -x GENTOO_TESTING=1
-	"${EPYTHON}" psutil/tests/runner.py ||
-		die "tests failed with ${EPYTHON}"
-}
-
-python_compile() {
-	# Force -j1 to avoid .o linking race conditions
-	local MAKEOPTS=-j1
-	distutils-r1_python_compile
-}
diff --git a/dev-python/psutil/psutil-5.9.3.ebuild b/dev-python/psutil/psutil-5.9.3.ebuild
index 98eb9826a87d..6b27289dd34a 100644
--- a/dev-python/psutil/psutil-5.9.3.ebuild
+++ b/dev-python/psutil/psutil-5.9.3.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pyghmi/Manifest b/dev-python/pyghmi/Manifest
index 12b2c4322279..d6a2421c51c0 100644
--- a/dev-python/pyghmi/Manifest
+++ b/dev-python/pyghmi/Manifest
@@ -1,2 +1,3 @@
 DIST pyghmi-1.5.53.tar.gz 245616 BLAKE2B f0dd3d84426c7d1b0e32ae6d666823f2c760b4b6022beb7224af242ab17540f02e47cb321d681ab0153b6cee67c5a35609d45b4af5f9b55896217da8eb089132 SHA512 0f598bcfbfb233ef6a9e7890b914b745c114c67a1c9a5daa6136f498af78c0f6e29e501d5e94a94d47651c11396d154925769d0d7509cc7058a0949545c7eb76
 DIST pyghmi-1.5.54.tar.gz 248634 BLAKE2B 82142cc00972db5e23c893c323d1012b701edeb9844e522b8c2adeeee5f9d96bfc6835a4461f14ae27b595cf4ccdf7c768a403194833f1c6311515c60c2fa9e9 SHA512 6182745a6560f207443042a6f7e56176aabffa32a98b2d20d808b80d8b61febd979281fc207871ec36b26a40c67e453f50e1fc9b2f1581c7a83a561a6e40a435
+DIST pyghmi-1.5.55.tar.gz 248976 BLAKE2B ccf76960a694d46e7669d164599abc731360c88e118d9cd3b724eb195f014d8cca2a3c58592fee99d455899472169057dabf62e8d57809e74adf8652e146a3e3 SHA512 9b3b8bdf0714e8567041415336d0ce9ba12fee61e41879185577288c4598ef42e837004682882589b832db5e9244bddfb2c63585dd5a097a945238b0f524dcaf
diff --git a/dev-python/pyghmi/pyghmi-1.5.55.ebuild b/dev-python/pyghmi/pyghmi-1.5.55.ebuild
new file mode 100644
index 000000000000..8d1d7490c4aa
--- /dev/null
+++ b/dev-python/pyghmi/pyghmi-1.5.55.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_{7,8,9,10,11} )
+
+inherit distutils-r1
+
+DESCRIPTION="A pure python implementation of IPMI protocol"
+HOMEPAGE="
+	https://opendev.org/x/pyghmi/
+	https://pypi.org/project/pyghmi/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/cryptography-2.1[${PYTHON_USEDEP}]
+	dev-python/pbr[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.8.1[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.6.5[${PYTHON_USEDEP}]
+		>=dev-python/subunit-1.0.0[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
diff --git a/dev-python/pytest-check/Manifest b/dev-python/pytest-check/Manifest
index cdd1a46e5282..10dbb0e30b75 100644
--- a/dev-python/pytest-check/Manifest
+++ b/dev-python/pytest-check/Manifest
@@ -3,3 +3,4 @@ DIST pytest-check-1.1.2.tar.gz 19090 BLAKE2B 25d483c29f7a357b26d6153582e9ca0a4b6
 DIST pytest-check-1.1.3.tar.gz 19461 BLAKE2B e6ba332f3326992842a50323c6062283c3227d15526cc0f33f51a90455e7a30f0f53e96907896eeecce4a13b8e6fafcc8112eecfc844310200e107e92150d3d0 SHA512 af89cc90de9a72600d79947d2f771fe878dc55add754dae447afe8c0df47745842c35867ebc104825189c119858a7ddde992e91b48dab4f9e74fd71e7b55f51e
 DIST pytest-check-1.2.0.tar.gz 20105 BLAKE2B c8f8a8ec38a3f6162fa43b90d757c3fd0867bb3ec2e04f4de2fe194aeb75041d925220f2b6fe222b3ae9d4dde8202680f9712b5b4c9a90224e9f0c0c81925b6d SHA512 585e727a817106f25dbd59aa6ee7f06565d0d216caa189001b18aee1f6e96aacb07e0886af6ca96fd36dacae1246a9acccee9b23341afc51981c7c496602d406
 DIST pytest-check-1.2.1.tar.gz 20677 BLAKE2B a6ead4a45db9f8d3cb8226be08559bdde4df5ff0b0015213a36b354257cc6995603e93e645367008ff08a85640121124029fa4d6616423c674e0aca1097b51c4 SHA512 dcdbf099e5cff63aa6ce3aa96a7aef9b59382baf051d3682a7775d90e6c14718dcdd540d1467073d3e747f6bf587e8e0f05f280ee52a4b1e56d2db1c4d982ea2
+DIST pytest-check-1.3.0.tar.gz 23763 BLAKE2B 95f98c679aed6bd1a16ffb72a4da0e0177d83c785343aa8c102c1e31f2a148fe78bf3aa49630bebf1b05a338dd9d2d075eb02ef1dff8e63175af22cf3f194ed7 SHA512 4c513f01d2f7a9302afdb3be7ff3f9da6f3b0af8469bab85bb103a6a16b4955c238251b2c46643d71d18c1476976cb5e49ee3c63d6752c8ac2591e14cda9db34
diff --git a/dev-python/pytest-check/pytest-check-1.3.0.ebuild b/dev-python/pytest-check/pytest-check-1.3.0.ebuild
new file mode 100644
index 000000000000..66f6721842a6
--- /dev/null
+++ b/dev-python/pytest-check/pytest-check-1.3.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+
+inherit distutils-r1
+
+DESCRIPTION="pytest plugin that allows multiple failures per test"
+HOMEPAGE="
+	https://github.com/okken/pytest-check/
+	https://pypi.org/project/pytest-check/
+"
+SRC_URI="mirror://pypi/${P::1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/colorama-0.4.6[${PYTHON_USEDEP}]
+	dev-python/pytest[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pytest-testinfra/Manifest b/dev-python/pytest-testinfra/Manifest
index 678fe70ff03e..94ade6e95fc2 100644
--- a/dev-python/pytest-testinfra/Manifest
+++ b/dev-python/pytest-testinfra/Manifest
@@ -1 +1,2 @@
 DIST pytest-testinfra-6.8.0.tar.gz 78611 BLAKE2B ab1f9732db6a5d88730f4989cc47dc2086844f9809754d9f7811a8f0f092cf3d1e6f48fac2596200bf8e354cfd4aa3dc767bc21139267813141c9522d2116453 SHA512 e0c044430ffae1772b937b405572ef05b6177a645aff7b96e1f779d4f68449241757efae137a03ea8aec28db5f91c0e71574ab52aebef0052ca99ea0ca08db23
+DIST pytest-testinfra-7.0.0.tar.gz 79296 BLAKE2B b0870cbf466627daff0ed6a3063c15c9b725fab4009fc24c3779b56765901e6b8d3a42fce429f1e42151b78d61f52c38955772e562c74d78c717a61a5fe74f04 SHA512 507d7a434c2eb159e2c36b1be3d447e386d3a4e614f2717ed8add456358f644c18f801db6774a4854e4ec7936643febd332aa4096ab26ae0080aceeff420c78e
diff --git a/dev-python/pytest-testinfra/pytest-testinfra-7.0.0.ebuild b/dev-python/pytest-testinfra/pytest-testinfra-7.0.0.ebuild
new file mode 100644
index 000000000000..9d7ee8511386
--- /dev/null
+++ b/dev-python/pytest-testinfra/pytest-testinfra-7.0.0.ebuild
@@ -0,0 +1,45 @@
+# 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_{7,8,9,10,11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Write unit tests in Python to test actual state of your servers"
+HOMEPAGE="
+	https://github.com/pytest-dev/pytest-testinfra/
+	https://pypi.org/project/pytest-testinfra/
+"
+SRC_URI="mirror://pypi/${P::1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
+
+RDEPEND="
+	dev-python/pytest[${PYTHON_USEDEP}]
+"
+# Ansible is called via its CLI
+# which(1) is used as fallback when `command -v ...` returns 127
+# (which e.g. happens when dash is used as /bin/sh)
+# https://github.com/pytest-dev/pytest-testinfra/issues/668
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		app-admin/ansible
+		app-admin/salt[${PYTHON_USEDEP}]
+		dev-python/paramiko[${PYTHON_USEDEP}]
+		dev-python/pywinrm[${PYTHON_USEDEP}]
+		sys-apps/which
+	)
+"
+
+distutils_enable_tests pytest
+
+pkg_postinst() {
+	elog "For the list of available connection back-ends and their dependencies,"
+	elog "please consult https://testinfra.readthedocs.io/en/latest/backends.html"
+}
diff --git a/dev-python/pyupgrade/Manifest b/dev-python/pyupgrade/Manifest
index f260a571ce50..f275e86744b7 100644
--- a/dev-python/pyupgrade/Manifest
+++ b/dev-python/pyupgrade/Manifest
@@ -1,2 +1,3 @@
 DIST pyupgrade-3.2.2.gh.tar.gz 62261 BLAKE2B 8a34b01c3eacb004c73a56f4437223ddbb4ddbaed7dcb03f532f877954abcf589739c1a4afadd7b14db6b120039bead6dba551b59cb03e94a99d18bb9f503f45 SHA512 1586dd38eff08ee0a0fb4d8db77593d965d5f675893a6cd23e6de7bf966d2f087013c1deeeab47e88af9162929d6ee110d29cf00041189c9715c2395c1b3798b
 DIST pyupgrade-3.2.3.gh.tar.gz 62349 BLAKE2B 5e698f25ad846503e562219a192841912c4581cdd3b663b3b982d7923b774b63cd2ab8666b25c6c2945bd3a823fb3138f795829cda2f2e3f8046a2f882061dde SHA512 14dc0856a035a14cca7250ee99b7c001ad39cfd648ea04900e266d611ab7fe89bff6f678c14df4f43dd264146116c5a4190167b6c74506bc82c46b80863372c9
+DIST pyupgrade-3.3.0.gh.tar.gz 62628 BLAKE2B 18af1a3efe49d78524f35762f35a6933876f0b21775b84eae8acb95b38681861a8a1a3009c76ade8364ead9e35cf592eb664f31f61e4af5014207460f90b5f0c SHA512 f6a37c8e35f44ddf0154714ca13ab7b322fe38d629234898faa2a435b4ce8eef0e18f7407af20f9c5fd6afe6a6392755cfc301714c1789cb55896fd2247cb7b4
diff --git a/dev-python/pyupgrade/pyupgrade-3.3.0.ebuild b/dev-python/pyupgrade/pyupgrade-3.3.0.ebuild
new file mode 100644
index 000000000000..9b4138bef815
--- /dev/null
+++ b/dev-python/pyupgrade/pyupgrade-3.3.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10,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/tempita/Manifest b/dev-python/tempita/Manifest
deleted file mode 100644
index 719389014bed..000000000000
--- a/dev-python/tempita/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST tempita-0.5.3-bitbucket.tar.gz 22756 BLAKE2B 59d273b1dc206eea452f7e5265d59b3ef1248b2d920eae559d74f4c569852b2a127e2a906f866cb748a12663dca944d9080413410edd5c69bd93b0d9574e3026 SHA512 cebe443bf0fc7705304fe127c796801acb6cdc54e79315c2afddb79ece1d04427852c1d0924ab9dd54520b584ae09a0644a20ff2dd6ed0408ee103f5b3fb9410
diff --git a/dev-python/tempita/files/tempita-0.5.3-2to3.patch b/dev-python/tempita/files/tempita-0.5.3-2to3.patch
deleted file mode 100644
index d2aaae6546c1..000000000000
--- a/dev-python/tempita/files/tempita-0.5.3-2to3.patch
+++ /dev/null
@@ -1,233 +0,0 @@
-commit d886499651add63bbb944c25fc56a276cc2a7884
-Author: Louis Sautier <sautier.louis@gmail.com>
-Date:   Thu Sep 9 23:35:03 2021 +0200
-
-    Stop using deprecated 2to3 option for setuptools
-
-diff --git a/setup.py b/setup.py
-index f575020..678b555 100644
---- a/setup.py
-+++ b/setup.py
-@@ -36,5 +36,4 @@ more to learn about it.
-       test_suite='nose.collector',
-       include_package_data=True,
-       zip_safe=True,
--      use_2to3=True,
-       )
-diff --git a/tempita/__init__.py b/tempita/__init__.py
-index acc2fd9..a3cb8a1 100755
---- a/tempita/__init__.py
-+++ b/tempita/__init__.py
-@@ -35,9 +35,9 @@ import os
- import re
- import sys
- import tokenize
--from cStringIO import StringIO
-+from io import StringIO
- from html import escape
--from urllib import quote as url_quote
-+from urllib.parse import quote as url_quote
- from tempita._looper import looper
- from tempita.compat3 import bytes, basestring_, next, is_unicode, coerce_text
- 
-@@ -103,7 +103,7 @@ class Template(object):
-             delimiters = (self.default_namespace['start_braces'],
-                           self.default_namespace['end_braces'])
-         else:
--            assert len(delimiters) == 2 and all([isinstance(delimeter, basestring)
-+            assert len(delimiters) == 2 and all([isinstance(delimeter, str)
-                                                  for delimeter in delimiters])
-             self.default_namespace = self.__class__.default_namespace.copy()
-             self.default_namespace['start_braces'] = delimiters[0]
-@@ -198,7 +198,7 @@ class Template(object):
-                 position=None, name=self.name)
-         templ = self.get_template(inherit_template, self)
-         self_ = TemplateObject(self.name)
--        for name, value in defs.iteritems():
-+        for name, value in defs.items():
-             setattr(self_, name, value)
-         self_.body = body
-         ns = ns.copy()
-@@ -294,7 +294,7 @@ class Template(object):
-         try:
-             try:
-                 value = eval(code, self.default_namespace, ns)
--            except SyntaxError, e:
-+            except SyntaxError as e:
-                 raise SyntaxError(
-                     'invalid syntax in expression: %s' % code)
-             return value
-@@ -306,12 +306,12 @@ class Template(object):
-             else:
-                 arg0 = coerce_text(e)
-             e.args = (self._add_line_info(arg0, pos),)
--            raise exc_info[0], e, exc_info[2]
-+            raise exc_info[0](e).with_traceback(exc_info[2])
- 
-     def _exec(self, code, ns, pos):
-         __traceback_hide__ = True
-         try:
--            exec code in self.default_namespace, ns
-+            exec(code, self.default_namespace, ns)
-         except:
-             exc_info = sys.exc_info()
-             e = exc_info[1]
-@@ -319,7 +319,7 @@ class Template(object):
-                 e.args = (self._add_line_info(e.args[0], pos),)
-             else:
-                 e.args = (self._add_line_info(None, pos),)
--            raise exc_info[0], e, exc_info[2]
-+            raise exc_info[0](e).with_traceback(exc_info[2])
- 
-     def _repr(self, value, pos):
-         __traceback_hide__ = True
-@@ -328,7 +328,7 @@ class Template(object):
-                 return ''
-             if self._unicode:
-                 try:
--                    value = unicode(value)
-+                    value = str(value)
-                 except UnicodeDecodeError:
-                     value = bytes(value)
-             else:
-@@ -341,7 +341,7 @@ class Template(object):
-             exc_info = sys.exc_info()
-             e = exc_info[1]
-             e.args = (self._add_line_info(e.args[0], pos),)
--            raise exc_info[0], e, exc_info[2]
-+            raise exc_info[0](e).with_traceback(exc_info[2])
-         else:
-             if self._unicode and isinstance(value, bytes):
-                 if not self.default_encoding:
-@@ -350,7 +350,7 @@ class Template(object):
-                         '(no default_encoding provided)' % value)
-                 try:
-                     value = value.decode(self.default_encoding)
--                except UnicodeDecodeError, e:
-+                except UnicodeDecodeError as e:
-                     raise UnicodeDecodeError(
-                         e.encoding,
-                         e.object,
-@@ -387,7 +387,7 @@ def paste_script_template_renderer(content, vars, filename=None):
- class bunch(dict):
- 
-     def __init__(self, **kw):
--        for name, value in kw.iteritems():
-+        for name, value in kw.items():
-             setattr(self, name, value)
- 
-     def __setattr__(self, name, value):
-@@ -410,7 +410,7 @@ class bunch(dict):
- 
-     def __repr__(self):
-         items = [
--            (k, v) for k, v in self.iteritems()]
-+            (k, v) for k, v in self.items()]
-         items.sort()
-         return '<%s %s>' % (
-             self.__class__.__name__,
-@@ -463,7 +463,7 @@ def url(v):
- 
- 
- def attr(**kw):
--    kw = list(kw.iteritems())
-+    kw = list(kw.items())
-     kw.sort()
-     parts = []
-     for name, value in kw:
-@@ -545,7 +545,7 @@ class TemplateDef(object):
-         values = {}
-         sig_args, var_args, var_kw, defaults = self._func_signature
-         extra_kw = {}
--        for name, value in kw.iteritems():
-+        for name, value in kw.items():
-             if not var_kw and name not in sig_args:
-                 raise TypeError(
-                     'Unexpected argument %s' % name)
-@@ -568,7 +568,7 @@ class TemplateDef(object):
-                 raise TypeError(
-                     'Extra position arguments: %s'
-                     % ', '.join(repr(v) for v in args))
--        for name, value_expr in defaults.iteritems():
-+        for name, value_expr in defaults.items():
-             if name not in values:
-                 values[name] = self._template._eval(
-                     value_expr, self._ns, self._pos)
-@@ -614,7 +614,7 @@ class _Empty(object):
-         return 'Empty'
- 
-     def __unicode__(self):
--        return u''
-+        return ''
- 
-     def __iter__(self):
-         return iter(())
-@@ -1164,7 +1164,7 @@ def fill_command(args=None):
-         vars.update(os.environ)
-     for value in args:
-         if '=' not in value:
--            print('Bad argument: %r' % value)
-+            print(('Bad argument: %r' % value))
-             sys.exit(2)
-         name, value = value.split('=', 1)
-         if name.startswith('py:'):
-diff --git a/tempita/_looper.py b/tempita/_looper.py
-index 6784c7c..70aded7 100644
---- a/tempita/_looper.py
-+++ b/tempita/_looper.py
-@@ -7,9 +7,9 @@ These can be awkward to manage in a normal Python loop, but using the
- looper you can get a better sense of the context.  Use like::
- 
-     >>> for loop, item in looper(['a', 'b', 'c']):
--    ...     print loop.number, item
-+    ...     print(loop.number, item)
-     ...     if not loop.last:
--    ...         print '---'
-+    ...         print('---')
-     1 a
-     ---
-     2 b
-@@ -161,3 +161,4 @@ class loop_pos(object):
-             return getter(item) != getter(other)
-         else:
-             return item[getter] != other[getter]
-+
-diff --git a/tempita/compat3.py b/tempita/compat3.py
-index 5e18fa0..f17f588 100644
---- a/tempita/compat3.py
-+++ b/tempita/compat3.py
-@@ -4,7 +4,7 @@ __all__ = ['b', 'basestring_', 'bytes', 'next', 'is_unicode']
- 
- if sys.version < "3":
-     b = bytes = str
--    basestring_ = basestring
-+    basestring_ = str
- else:
- 
-     def b(s):
-@@ -18,14 +18,14 @@ text = str
- if sys.version < "3":
- 
-     def next(obj):
--        return obj.next()
-+        return obj.__next__()
- else:
-     next = next
- 
- if sys.version < "3":
- 
-     def is_unicode(obj):
--        return isinstance(obj, unicode)
-+        return isinstance(obj, str)
- else:
- 
-     def is_unicode(obj):
-@@ -39,7 +39,7 @@ def coerce_text(v):
-         else:
-             attr = '__str__'
-         if hasattr(v, attr):
--            return unicode(v)
-+            return str(v)
-         else:
-             return bytes(v)
-     return v
diff --git a/dev-python/tempita/files/tempita-0.5.3-cgi-escape.patch b/dev-python/tempita/files/tempita-0.5.3-cgi-escape.patch
deleted file mode 100644
index d411d28ced48..000000000000
--- a/dev-python/tempita/files/tempita-0.5.3-cgi-escape.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/tempita/__init__.py b/tempita/__init__.py
-index 137ba2d..acc2fd9 100755
---- a/tempita/__init__.py
-+++ b/tempita/__init__.py
-@@ -31,12 +31,12 @@ can use ``__name='tmpl.html'`` to set the name of the template.
- If there are syntax errors ``TemplateError`` will be raised.
- """
- 
--import cgi
- import os
- import re
- import sys
- import tokenize
- from cStringIO import StringIO
-+from html import escape
- from urllib import quote as url_quote
- from tempita._looper import looper
- from tempita.compat3 import bytes, basestring_, next, is_unicode, coerce_text
-@@ -445,10 +445,10 @@ def html_quote(value, force=True):
-     if not isinstance(value, basestring_):
-         value = coerce_text(value)
-     if sys.version >= "3" and isinstance(value, bytes):
--        value = cgi.escape(value.decode('latin1'), 1)
-+        value = escape(value.decode('latin1'), 1)
-         value = value.encode('latin1')
-     else:
--        value = cgi.escape(value, 1)
-+        value = escape(value, 1)
-     if sys.version < "3":
-         if is_unicode(value):
-             value = value.encode('ascii', 'xmlcharrefreplace')
diff --git a/dev-python/tempita/metadata.xml b/dev-python/tempita/metadata.xml
deleted file mode 100644
index ea8988e8af6a..000000000000
--- a/dev-python/tempita/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
-  <email>python@gentoo.org</email>
-  <name>Python</name>
- </maintainer>
- 
- <origin>gentoo-staging</origin>
- <stabilize-allarches/>
-</pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/tempita/tempita-0.5.3-r3.ebuild b/dev-python/tempita/tempita-0.5.3-r3.ebuild
deleted file mode 100644
index 7249a825d49c..000000000000
--- a/dev-python/tempita/tempita-0.5.3-r3.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-# The package uses pkg_resources
-DISTUTILS_USE_SETUPTOOLS=manual
-
-inherit distutils-r1
-
-MY_COMMIT="97392d008cc8"
-
-DESCRIPTION="A very small text templating language"
-HOMEPAGE="https://pypi.org/project/Tempita/"
-# Tests are not published on PyPI
-SRC_URI="https://bitbucket.org/ianb/${PN}/get/${MY_COMMIT}.tar.gz -> ${P}-bitbucket.tar.gz"
-S="${WORKDIR}/ianb-${PN}-${MY_COMMIT}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-BDEPEND="${RDEPEND}"
-
-PATCHES=(
-	# cgi.escape has been removed in Python 3.9
-	"${FILESDIR}/${P}-cgi-escape.patch"
-	# The 2to3 option for setuptools is deprecated
-	"${FILESDIR}/${P}-2to3.patch"
-)
-
-distutils_enable_sphinx docs
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# Remove reference to a non-existent CSS file
-	# in order to make sphinx use its default theme.
-	sed -i '/^html_style =/d' docs/conf.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	epytest tests/test_template.txt docs/index.txt
-}
diff --git a/dev-python/trove-classifiers/Manifest b/dev-python/trove-classifiers/Manifest
index 137f2fe752f5..bbf5299ff0e3 100644
--- a/dev-python/trove-classifiers/Manifest
+++ b/dev-python/trove-classifiers/Manifest
@@ -1 +1,2 @@
 DIST trove-classifiers-2022.10.19.gh.tar.gz 15030 BLAKE2B c5841fd36070979577fe154559d7c578cbef0166bb933cef0b2945581a388602c65a0711320b610ac9acd4166784ec616f1e4d532453488ddf7b933f5fac124b SHA512 5e7319028d16f917c7ddbc997f2082f3e5816dd1f93038c2193aa70a74e2e47f5bf72d8d205453fb2e0ddae3fe56affc0c78930b11767d2d55db0910a454568d
+DIST trove-classifiers-2022.12.1.gh.tar.gz 15034 BLAKE2B 4a77c9ccacea2e9053601115eb04f96b26ca4897590a0fefe96bd4610a551cce76814e2045754ae1e30025b0d75fd6f45c37d89438215ab07b46fa4038024559 SHA512 94dac84ee6446b95f28acc9f665fdc93018a038debb0abac708c092ada890a9aff56b9f276f492d290749b563d3c2c1b854cf334e9b883a72c5030bc861d47fb
diff --git a/dev-python/trove-classifiers/trove-classifiers-2022.12.1.ebuild b/dev-python/trove-classifiers/trove-classifiers-2022.12.1.ebuild
new file mode 100644
index 000000000000..f14ebf0476fa
--- /dev/null
+++ b/dev-python/trove-classifiers/trove-classifiers-2022.12.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Canonical source for classifiers on PyPI (pypi.org)"
+HOMEPAGE="
+	https://github.com/pypa/trove-classifiers/
+	https://pypi.org/project/trove-classifiers/
+"
+SRC_URI="
+	https://github.com/pypa/trove-classifiers/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+BDEPEND="
+	dev-python/calver[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	epytest
+	"${EPYTHON}" -m tests.lib || die
+}
diff --git a/dev-python/ubelt/Manifest b/dev-python/ubelt/Manifest
index 4579b4c8bfbb..a78ff0115155 100644
--- a/dev-python/ubelt/Manifest
+++ b/dev-python/ubelt/Manifest
@@ -1 +1,2 @@
 DIST ubelt-1.2.2.gh.tar.gz 303629 BLAKE2B 624f56db069bb72ff3686db9d4ca47a1ac384ab9cb0810dd608fa8c12d00789b219d3d5a659e153cde87bb42a585f6176527c7b89fbef8afbf3f86433e456bbe SHA512 f0384cee3b8b474e2f3d893134cde6a7e96c73b98e4be6bb928dd410bdc763d9846409f867232c6b34840d0f77bcc95aa425b4a67dc3eeec3c634fd1c1311332
+DIST ubelt-1.2.3.gh.tar.gz 324632 BLAKE2B bafb67048a8a6525fc0aa1393fff22a3bf56d3843d195dc29125b8f452c4700dff77282349fbb44e0fc23a5495bcf48d6626879603f6c68a14ee04435d0f1831 SHA512 2a0a3e8b40ebaa5d2c7856cd197cdd8113ff58be6827ce57f394284f824e310078ef2a754247575c9eec2d3d1eecce2ec22239102eade025d556a79552e5f9d3
diff --git a/dev-python/ubelt/ubelt-1.2.3.ebuild b/dev-python/ubelt/ubelt-1.2.3.ebuild
new file mode 100644
index 000000000000..9a275aece61f
--- /dev/null
+++ b/dev-python/ubelt/ubelt-1.2.3.ebuild
@@ -0,0 +1,42 @@
+# 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_{7,8,9,10,11} )
+
+inherit distutils-r1
+
+DESCRIPTION="A stdlib like feel, and extra batteries. Hashing, Caching, Timing, Progress"
+HOMEPAGE="
+	https://github.com/Erotemic/ubelt/
+	https://pypi.org/project/ubelt/
+"
+SRC_URI="
+	https://github.com/Erotemic/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+SLOT="0"
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	test? (
+		>=dev-python/numpy-1.19.2[${PYTHON_USEDEP}]
+		>=dev-python/pygments-2.2.0[${PYTHON_USEDEP}]
+		>=dev-python/python-dateutil-2.8.1[${PYTHON_USEDEP}]
+		>=dev-python/requests-2.25.1[${PYTHON_USEDEP}]
+		dev-python/xdoctest[${PYTHON_USEDEP}]
+		>=dev-python/xxhash-1.0.1[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	tests/test_editable_modules.py::test_import_of_editable_install
+	# relies on passwd home being equal to ${HOME}
+	ubelt/util_path.py::userhome:0
+)
diff --git a/dev-python/watchgod/Manifest b/dev-python/watchgod/Manifest
deleted file mode 100644
index 5d3210f07978..000000000000
--- a/dev-python/watchgod/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST watchfiles-0.8.2.gh.tar.gz 15515 BLAKE2B 97c17737c6970c8b799707547cef760c307cd000d09cf3a338e47c0735d537e0321643066eab592f7f7e6ccc25272ea1e7e0bbc02f6274864f7cc39a177b83ba SHA512 a44b831352ace03c450781bc815b1813c44c386d666a9b724b562ff69228705651bfc23e81b7344d0f79c62577d4f910b323c734298e2a609f85bbc4a0f0498e
diff --git a/dev-python/watchgod/metadata.xml b/dev-python/watchgod/metadata.xml
deleted file mode 100644
index 7ad11570cc7d..000000000000
--- a/dev-python/watchgod/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
-  <email>python@gentoo.org</email>
- </maintainer>
- 
- <origin>gentoo-staging</origin>
-</pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/watchgod/watchgod-0.8.2-r1.ebuild b/dev-python/watchgod/watchgod-0.8.2-r1.ebuild
deleted file mode 100644
index e54126813464..000000000000
--- a/dev-python/watchgod/watchgod-0.8.2-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-
-inherit distutils-r1
-
-MY_P=watchfiles-${PV}
-DESCRIPTION="Simple, modern file watching and code reload in Python"
-HOMEPAGE="
-	https://pypi.org/project/watchgod/
-	https://github.com/samuelcolvin/watchfiles/
-"
-SRC_URI="
-	https://github.com/samuelcolvin/watchfiles/archive/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	=dev-python/anyio-3*[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytest-toolbox[${PYTHON_USEDEP}]
-		dev-python/trio[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	distutils-r1_src_prepare
-
-	# increase timeout
-	sed -i -e '/sleep/s/0.01/1.0/' tests/test_watch.py || die
-	# fix version number in metadata
-	sed -i -e "s:0\.0\.dev0:${PV}:" watchgod/version.py || die
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# flaky test on slow systems, https://github.com/samuelcolvin/watchgod/issues/84
-		tests/test_watch.py::test_awatch_log
-	)
-	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
-		tests/test_watch.py::test_does_not_exist
-	)
-	epytest
-}
diff --git a/dev-python/xarray/Manifest b/dev-python/xarray/Manifest
index a272a319f51f..033caeef25f7 100644
--- a/dev-python/xarray/Manifest
+++ b/dev-python/xarray/Manifest
@@ -1,2 +1,3 @@
 DIST xarray-2022.10.0.tar.gz 3035596 BLAKE2B f42df85bdfa66403826fc7d2fa811419898134723ee24afc6b77a320b23c9b5b95fcfd25520f74abf0a3b7bf009fdc33655eebf0ff9703753872072515deee58 SHA512 ecfc92c68ea7ba02b673c6c317e68daad23b6882b4ed316ad1dd733f179c643411d3ee5902954dbd62f2eb7ad591d8ba1a5f0c1b2c7f6873e733df2f22b6650c
 DIST xarray-2022.11.0.tar.gz 3053924 BLAKE2B 5e747aeda92ecb5a3ee2ce7a180cd8f3c2735b32d219f567fd254c733f98c62305829be166ddd76a3d2cd884f78aa3e6ceb2cf5aaac8539290c5863d5dea038d SHA512 6dc98746e3bea17a224926e7e1cf6a5f5ef01e8a848c63f5acd43f9da63b81093a7bdbebecb2afc06c9473d1b8fe735c67a847d05f25edd0a32bc0a5a2eda753
+DIST xarray-2022.12.0.tar.gz 3060755 BLAKE2B 449d21234436983b478a022cf5585236738014c6f783039442c3d51870b62a62c61eaada6eb9df5305ada3fd5cdc87bf0201ffae1c835ec7a731c06badb718a7 SHA512 9c5c692392b15711d57254006ebc92cdda08b92b663a577701f50c52253d736d78e2ad027777ad588ffa23d523394576f0cf226986b05b22816d3cec1ea8abb7
diff --git a/dev-python/xarray/xarray-2022.12.0.ebuild b/dev-python/xarray/xarray-2022.12.0.ebuild
new file mode 100644
index 000000000000..a608bf932c13
--- /dev/null
+++ b/dev-python/xarray/xarray-2022.12.0.ebuild
@@ -0,0 +1,45 @@
+# 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_{7,8,9,10,11} )
+
+inherit distutils-r1
+
+DESCRIPTION="N-D labeled arrays and datasets in Python"
+HOMEPAGE="
+	https://xarray.pydata.org/
+	https://github.com/pydata/xarray/
+	https://pypi.org/project/xarray/
+"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/numpy-1.22[${PYTHON_USEDEP}]
+	>=dev-python/pandas-1.3[${PYTHON_USEDEP}]
+	>=dev-python/packaging-21.3[${PYTHON_USEDEP}]
+"
+# note: most of the test dependencies are optional
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/bottleneck[${PYTHON_USEDEP}]
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		dev-python/toolz[${PYTHON_USEDEP}]
+		!hppa? ( >=dev-python/scipy-1.4[${PYTHON_USEDEP}] )
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# warning-targeted tests are fragile and not important to end users
+	xarray/tests/test_backends.py::test_no_warning_from_dask_effective_get
+)
diff --git a/dev-python/yarl/Manifest b/dev-python/yarl/Manifest
index 893e5f739c28..cf09d9dae448 100644
--- a/dev-python/yarl/Manifest
+++ b/dev-python/yarl/Manifest
@@ -1 +1,2 @@
 DIST yarl-1.8.1.gh.tar.gz 109912 BLAKE2B c7390b78abb5074dd29e96848a77fdb31f6224e99d2bcfd5a28a8bd08881f5ff82cf55b2f54c97324d005a0fb3823732a9ed6bd3f1d837e4ac2341b89e2adb30 SHA512 267523216832c2bc83d92a42e621ff519d427e20c1ee84ac657e13f696a2df2259c837486f192d87944f5ebb834beea60ace791eb4c9c632fd7e552eb5dadf1b
+DIST yarl-1.8.2.gh.tar.gz 109938 BLAKE2B 1f2cec38bb681f6a59f10253c75e74912d482cdbe0e639e3ba0a43b9d6ab7b7edc1558c9fffaffd7aad9fa905d884e856ff7f7b69dd103800ef62f7f05de90b5 SHA512 d5dcebcec06d520b48a1d879671a92371bd89eabb7be700c129fcc45e763ecc0370cbb5e88c7b9be05ecb3317370231293a8c076ed68d71a36fe953219dd27ea
diff --git a/dev-python/yarl/yarl-1.8.2.ebuild b/dev-python/yarl/yarl-1.8.2.ebuild
new file mode 100644
index 000000000000..158aa04e8a71
--- /dev/null
+++ b/dev-python/yarl/yarl-1.8.2.ebuild
@@ -0,0 +1,45 @@
+# 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_{7,8,9,10,11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Yet another URL library"
+HOMEPAGE="
+	https://github.com/aio-libs/yarl/
+	https://pypi.org/project/yarl/
+"
+SRC_URI="
+	https://github.com/aio-libs/yarl/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	>=dev-python/multidict-4.0[${PYTHON_USEDEP}]
+	>=dev-python/idna-2.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs \
+	dev-python/alabaster
+
+python_configure() {
+	> .install-cython || die
+	emake cythonize
+}
+
+python_test() {
+	cd tests || die
+	epytest --override-ini=addopts=
+}