Adding metadata

56 files changed, 684 insertions, 422 deletions

diff --git a/dev-python/argon2-cffi-bindings/argon2-cffi-bindings-21.2.0.ebuild b/dev-python/argon2-cffi-bindings/argon2-cffi-bindings-21.2.0.ebuild
index c0fcd2776d91..5e33a2494d1a 100644
--- a/dev-python/argon2-cffi-bindings/argon2-cffi-bindings-21.2.0.ebuild
+++ b/dev-python/argon2-cffi-bindings/argon2-cffi-bindings-21.2.0.ebuild
@@ -16,7 +16,10 @@ KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="cpu_flags_x86_sse2"
 
 DEPEND="app-crypt/argon2:="
-BDEPEND="virtual/python-cffi[${PYTHON_USEDEP}]"
+BDEPEND="
+	>=dev-python/setuptools_scm-6.2[${PYTHON_USEDEP}]
+	virtual/python-cffi[${PYTHON_USEDEP}]
+"
 RDEPEND="
 	${DEPEND}
 	${BDEPEND}
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index ec8df2395a9b..a7a0d8e4cb1a 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -3,3 +3,4 @@ DIST boto3-1.20.31.tar.gz 458553 BLAKE2B 396acd8bbc47f76a0ba65da4b83f141f2536903
 DIST boto3-1.20.37.tar.gz 461197 BLAKE2B 4ae94815809401378bbd6c6b7774776c62436c3ae379be44b045105d00ffdebc6cfba1112ed6d4693662c6a00b5de53b4fcd1ea605a93cccb1406f3f983d8c9a SHA512 368abbe51e814b5a8080323f436d8e0b5ea660b31abd77a49299afd6363c3d10e51883a3237f06799be53472c3e24c76f5ba3ece8cc9721b87fe3fb40ad8911f
 DIST boto3-1.20.40.tar.gz 462565 BLAKE2B bd540636392678e83112e85cb6c078d657196a46ddabaa00bdd66d00d7d0aeabe525e8639bf35fa88b039226372bfa5385ea2e1eaea790ebee7f4732d2cdfae4 SHA512 5b28a2de946942c3bb68b1d073a2567bb3cbce9732f3f620ef41c4ffab7c7d6aa4f68ec1e5357f930819f3948d50ed3a58f0176206946a5eaaa42c096fd1e020
 DIST boto3-1.20.41.tar.gz 463009 BLAKE2B c60443611023dd03ddcd1cc5ca951d2efdf02c221c673a01fc056788d9ef7d1704a37c006c1706c012d11219cb6c75203518796155aa3ef144154a8a86d6620a SHA512 7bec4a384c42b238bd3f6b0f58884fab357edae2ab985142b76f6b906323c0f02568046c9bbb229bb040de336ea2cbf25fa5441cd09e7c56c94f9e7de2abc763
+DIST boto3-1.20.42.tar.gz 463092 BLAKE2B 5396f2c47db8aaec468a0e9cb3eebe8450dd3a91680ea3e87171186052222c14be40ceb637aa88149eb878cf9dc45a1f0ffe6f02388be3e7dfcc28e92cad032c SHA512 1ae9b70eb601c0445bd67a61681ad1d7765deace0f007320124d587be40d8761e4270ce590994c80313090d060e84080effd6f7c3e40ca01c868bbad2d1ff6c9
diff --git a/dev-python/boto3/boto3-1.20.42.ebuild b/dev-python/boto3/boto3-1.20.42.ebuild
new file mode 100644
index 000000000000..ed44d35fedd6
--- /dev/null
+++ b/dev-python/boto3/boto3-1.20.42.ebuild
@@ -0,0 +1,60 @@
+# 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_{6,7,8,9,10} )
+inherit distutils-r1
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="https://github.com/boto/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/${PN}/archive/${PV}.tar.gz -> ${P}.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.3.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${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}
+}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index 11354302914b..dfd4a180cf55 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -3,3 +3,4 @@ DIST botocore-1.23.31.tar.gz 8706949 BLAKE2B 2e31bc09173a93806fe045e5217defcf17b
 DIST botocore-1.23.37.tar.gz 8728451 BLAKE2B 039352d4c727433cc5aef435cd7527fa3bc6027c3db8b2a27219d4cab8f602f74995b09e5407c1df1c7a51e37830db7e8f351484485f6b822499933c35607472 SHA512 79004d38fbfc744d2fd91364a1cc99d8be1f2d03f25f2ba77df0da4b4d429a156ac5d52ca523ee4992ff99ac83b7a14e7f49e3b12b9b6f91e164fb720c41e10d
 DIST botocore-1.23.40.tar.gz 8730992 BLAKE2B 855742e6661e497c10cee6becbc9fc5eae39b1525b11008ecc27e35126d3c2ab9ce68d5d260a974d8359eeb056dad0d79dd866b6097458989989b6ae9924e49f SHA512 cbed5c316e3976594930ae1c274fdac9e25289c9818bc515e5a27c620431b05c010736f8e94d90fb935e22e5a1c50dbd4708c7674ef6e697c35475f8757df63d
 DIST botocore-1.23.41.tar.gz 8732416 BLAKE2B 2d1a3284521a608db2dbfdbb8c98fb3bd01e048fb3b4a34e3dc497b6476bcbf8cd37ea9273ae3d3b09a9356aca8d1063dafdf15ae9c7ab59bbf3cc841bcc7a24 SHA512 d3d12df8faced36a9c7a75fd01d63986cb12d56a259f31211c32cbf0f1eceb1d6708e90f6a6a43189e37b86e01ceef68fcd5dcbd1867c571ca3630cbcc7e94f5
+DIST botocore-1.23.42.tar.gz 8734201 BLAKE2B 009fd49716ce5a1453c83f279f36b8b174403ef7e403caa43a030126fde6e0e9bd414dc4369791aa090d7b10065906c6a97ada1d7796553af0cbbd4af8b78d95 SHA512 bc5ec5996fb139bc18975976bb8907978caf10399867cbcf8dc39bf47a5d61749c617c704cfbbe87074a6db5f4355f645fc88f06a71251c8bd3f65adacd1d9ba
diff --git a/dev-python/botocore/botocore-1.23.42.ebuild b/dev-python/botocore/botocore-1.23.42.ebuild
new file mode 100644
index 000000000000..c44cf37adbf0
--- /dev/null
+++ b/dev-python/botocore/botocore-1.23.42.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+inherit distutils-r1
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="https://github.com/boto/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="mirror://pypi/${PN:0:1}/${PN}/${P}.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[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
+)
+
+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
+	)
+
+	epytest tests/{functional,unit}
+}
diff --git a/dev-python/django-taggit/Manifest b/dev-python/django-taggit/Manifest
index 351560cf2e8d..8b87e1c85e82 100644
--- a/dev-python/django-taggit/Manifest
+++ b/dev-python/django-taggit/Manifest
@@ -1,2 +1,3 @@
 DIST django-taggit-1.5.1.tar.gz 52766 BLAKE2B 59892ba591ad5cbc40a7515a6427722d7cb58e2daadec579b1c08dcc3522e24e041cbe06c953c3717cdf3db50aef7ff9fb5b4eac00344e457b61797745638107 SHA512 8e7afefd8f0654340e234f7bd1cc3684b3e5d1f4d94d17c79ed8fb82096c21a809e7f8db2fea9509d45c3f2bdc5e8ed52fb0823779b0a039f87528642803725b
 DIST django-taggit-2.0.0.tar.gz 55042 BLAKE2B cb4d3c8b32ba524eb0c59b447155b818c30ed77ec95a76c7412bccf109d421f2628fb40c8bb65d2c845351c8e8ed77605c0e5d77ac1ddcff6cddd5248f2fcdc6 SHA512 9cffde5a0de170e08ff93b245873b02a4868e67ea946c6b9997b782fecb8f71418dddc702ca283d45e8c1685a4a45143aa6c726de187410b9a89afe2efadd190
+DIST django-taggit-2.1.0.tar.gz 55659 BLAKE2B 343176e910743924d7b84ef827b4a63e0bc4bc3db7d7c3ed8e7319b18713bc5cdb1e58f1a9f7356a01c1ae5c47daf561e9e68484f0bd40aaf03c780f8558b55c SHA512 64ac21574ba4b0e7dd8d52dee910350d7cfc2f821aaadf7767a4b74d4db7ab69d704558dac13dd68dc29e985ab593bc4189e1d064c0a0d4fe6fa7ab88038d353
diff --git a/dev-python/django-taggit/django-taggit-2.1.0.ebuild b/dev-python/django-taggit/django-taggit-2.1.0.ebuild
new file mode 100644
index 000000000000..de3f6440b4ef
--- /dev/null
+++ b/dev-python/django-taggit/django-taggit-2.1.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1
+
+DESCRIPTION="Simple tagging for Django"
+HOMEPAGE="https://github.com/jazzband/django-taggit"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/django-2.2[${PYTHON_USEDEP}]
+	dev-python/djangorestframework[${PYTHON_USEDEP}]"
+BDEPEND="test? ( ${RDEPEND} )"
+
+python_test() {
+	"${EPYTHON}" -m django test -v 2 --settings=tests.settings ||
+		die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/dulwich/Manifest b/dev-python/dulwich/Manifest
index 90d6d04db8a8..2f66260ae117 100644
--- a/dev-python/dulwich/Manifest
+++ b/dev-python/dulwich/Manifest
@@ -3,3 +3,4 @@ DIST dulwich-0.20.27.tar.gz 416618 BLAKE2B 73ed04d9fc871a82126e212bdac0eaf235e44
 DIST dulwich-0.20.28.tar.gz 416723 BLAKE2B ddbb36c65e1372e1c2fbab5d85ef26a77f40e4763eee8dc5d2ba249a6b4e37bd6e38197eaebbcb46f16df577c0ff4730ec69fff39a549adf2e5d147e7a3eabfc SHA512 5eb90dd888909f787ef5e9f0a79d7db9a31c5897e334a862c1d0593c4f115ff30047f108c7b315e0145e267f581ba0f4fd0fafb7b1b2316d3def4f70697f2e20
 DIST dulwich-0.20.30.tar.gz 417219 BLAKE2B 6b5b10a37f2901424b632dad081b9972da5af7475e11389c73f8a64a57ebf421700c6591bfddc5418b9c02d61916894aeeb2371a3ceb514532fd1b9e63dffb2c SHA512 1dd18c047e8bfe9f23a10c0c55b57be7b4d89d93af4a682265dac3bf495d1594057ed755e7caad926100d35e3603006377163dc6ae71bc51a500c744064f8bbc
 DIST dulwich-0.20.31.tar.gz 418063 BLAKE2B 7b914ce6509227b48fc716ed4ecabfead8b95fa17661564b3dc6b9abedb2c444d026d1261de9bb7195a14f5ffea9dfcb3103f32784f07731d2101a7c60f1abda SHA512 1f181aa62493fc8cdb2a18183f0aa2f5bb0963c1739423fc6790080bcec9d10368689934bfe8828b502bbe319ade4846428f3c4262666be01ccbce55a8803efa
+DIST dulwich-0.20.32.tar.gz 418100 BLAKE2B 21d41a7b1e491848a11ab3e3b1b63bfbe1798b38ef331136b07609f004e780672477e91a637dd3b1ccd3b26e359461e1a16d759ac2cb98d1091fbdb1968c00a9 SHA512 9af4cb4462ab9a69bea9074aace81eeb8d33087f2c53e64145991913ad132e076b62f7958551729c758cd6eeae029a278723872771ef36b046331c85ebf2fcf4
diff --git a/dev-python/dulwich/dulwich-0.20.32.ebuild b/dev-python/dulwich/dulwich-0.20.32.ebuild
new file mode 100644
index 000000000000..f6ff6d51d04c
--- /dev/null
+++ b/dev-python/dulwich/dulwich-0.20.32.ebuild
@@ -0,0 +1,56 @@
+# 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_{6,7,8,9,10} )
+inherit distutils-r1
+
+DESCRIPTION="Pure-Python implementation of the Git file formats and protocols"
+HOMEPAGE="
+	https://github.com/dulwich/dulwich/
+	https://pypi.org/project/dulwich/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2+ Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc examples test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/certifi[${PYTHON_USEDEP}]
+	dev-python/urllib3[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		!hppa? ( !ia64? (
+			dev-python/gevent[${PYTHON_USEDEP}]
+			dev-python/geventhttpclient[${PYTHON_USEDEP}]
+		) )
+		app-crypt/gpgme[python,${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/fastimport[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_sphinx docs
+
+python_test() {
+	# remove interference from the tests that do stuff like user.name
+	unset GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_AUTHOR_DATE \
+		GIT_COMMITTER_NAME GIT_COMMITTER_EMAIL GIT_COMMITTER_DATE EMAIL
+	# Do not use make check which rebuilds the extension and uses -Werror,
+	# causing unexpected failures.
+	"${EPYTHON}" -m unittest -v dulwich.tests.test_suite ||
+		die "tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	if use examples; then
+		docompress -x "/usr/share/doc/${PF}/examples"
+		dodoc -r examples
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/fonttools/Manifest b/dev-python/fonttools/Manifest
index 56b02a28dec3..714f7b8967e7 100644
--- a/dev-python/fonttools/Manifest
+++ b/dev-python/fonttools/Manifest
@@ -1,2 +1,2 @@
-DIST fonttools-4.28.4.tar.gz 2945369 BLAKE2B f178552aca7b41dcec1c03d2a7c3de17cdb5f4b2e057a75e196e78a098b9959a038a9a3b14ee8546d5ea12e3546c22d2a8d9b34a922c0822bf52f78bc03f4f54 SHA512 9ecdf4186e24a8a44c6010432d71f1689ebf8461a404dde71259eb4712c4987d94bbe31b33ad6943fb2e0105fc9f8e9032a94e6ccbb4ac01fe330bb700a39c63
 DIST fonttools-4.28.5.tar.gz 2948092 BLAKE2B b35f4be68cfc2be6afb209c2caee38f7088a1a17dea85fac0f40183b61a3eded59fab47f703587097669f8823a8dbc2e84b0df58305597784bed7f8c2e2b0f28 SHA512 5d87f4fadbcb447d1c1a1e97550f6a477d74bfe8647d14b35097e03e6a45a1a01632d2092483d675c523f97d4a04f39aa9b3175e535b1e1a4f19d619eb40ad5f
+DIST fonttools-4.29.0.tar.gz 2954211 BLAKE2B 47b7228b2f0f7332f54df58d8be8289b9bc3a737caa57ffafe9a8467e4d7e35db153f7e02caf8c6129af8dbb2bc18689af3f3122b0be7afee19bece83c846aad SHA512 0573970ceaf43e4987eee970aa93a6aba5af2b592b5d92a1aec36b102cb1967f380f8170f7a14bb80cd6348ef09737ac17a0f82eaa1ad73f9f5e246271d34b32
diff --git a/dev-python/fonttools/fonttools-4.28.5.ebuild b/dev-python/fonttools/fonttools-4.28.5.ebuild
index 535e01bdf88e..fe27761feed9 100644
--- a/dev-python/fonttools/fonttools-4.28.5.ebuild
+++ b/dev-python/fonttools/fonttools-4.28.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/fonttools/fonttools/archive/${PV}.tar.gz -> ${P}.tar
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~riscv sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv sparc x86 ~x64-macos"
 
 RDEPEND=">=dev-python/fs-2.4.9[${PYTHON_USEDEP}]"
 BDEPEND="
diff --git a/dev-python/fonttools/fonttools-4.28.4.ebuild b/dev-python/fonttools/fonttools-4.29.0.ebuild
index fe27761feed9..e247a223db08 100644
--- a/dev-python/fonttools/fonttools-4.28.4.ebuild
+++ b/dev-python/fonttools/fonttools-4.29.0.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=8
 
+DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{6,7,8,9,10} )
 PYTHON_REQ_USE="xml(+)"
 
@@ -14,7 +15,7 @@ SRC_URI="https://github.com/fonttools/fonttools/archive/${PV}.tar.gz -> ${P}.tar
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv sparc x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
 
 RDEPEND=">=dev-python/fs-2.4.9[${PYTHON_USEDEP}]"
 BDEPEND="
@@ -44,11 +45,10 @@ python_prepare_all() {
 }
 
 src_configure() {
-	DISTUTILS_ARGS=( --with-cython )
+	export FONTTOOLS_WITH_CYTHON=1
 }
 
 python_test() {
-	distutils_install_for_testing
 	# virtualx used when matplotlib is installed causing plot module tests to run
 	virtx epytest Tests fontTools
 }
diff --git a/dev-python/imageio/Manifest b/dev-python/imageio/Manifest
index 216166d5a1ff..f123b4e97afb 100644
--- a/dev-python/imageio/Manifest
+++ b/dev-python/imageio/Manifest
@@ -1,3 +1,4 @@
 DIST imageio-2.13.4.gh.tar.gz 340913 BLAKE2B 332d819633a52069265dd0c02163698085b8d0891ee84def78d99f6fb9888752d8f6384c9666dc66d99bc48673648f736eb6f545b67583cae7252caef6f9e499 SHA512 0329a1bfb6906d7f759fec8d5a500cae9a8edaa125d3e4cab7f0e87b2e5eef24655520aecab309de823f9bd8357a1461f772801bac437ed3489804e3c4b40855
 DIST imageio-2.13.5.gh.tar.gz 341447 BLAKE2B 8fd719533325647980355c0a5180a949d1f282ed11fcdb92a0c580f6aa76f799a60f8a3642c72424e557c84c5f1d5a0610cf679d37dcd8d157865c5d19ef94bf SHA512 52b431c3f41ea598d48f1d9c36cd9a5cdaa13365ce5391b832a3ef5dbdb6803435456bd653b509b75ee00452d07b47e43d87ac0c80598bb99f817ee8abe2e74c
 DIST imageio-2.14.0.gh.tar.gz 344226 BLAKE2B 88848591909ef247b7f13b033f545901f850fbc7218558781f1da6077f447d8afab5d9d290558e22bc1e94056049100e26d3a471faf1398dad2b8756747d6670 SHA512 51b005af2eac0988a2c2b2c629be5aff989a9251d60acc01bccbd9109fa7fe3101185dc657d24c8f1ede56cedf39d8815931385c50816f2a5e453fecfc02f967
+DIST imageio-2.14.1.gh.tar.gz 344533 BLAKE2B 769b1752fe7e61f2d1be563db8603afa9e0dda758cdd979413bc3235ae04f2fa6c788f031555cdd73e06d1e8cb89813a5ca6a2f45c0826cf402534a770f80884 SHA512 1e4769f0817f959208c4a2efa0f9b074e305385424c0297936a52bd9835e584f030166dee3de99d078a097b664f6db84f475045ec3e3b6e5b0fea146637b215c
diff --git a/dev-python/imageio/imageio-2.14.1.ebuild b/dev-python/imageio/imageio-2.14.1.ebuild
new file mode 100644
index 000000000000..c99abf1c8f5d
--- /dev/null
+++ b/dev-python/imageio/imageio-2.14.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1
+
+DESCRIPTION="Python library for reading and writing image data"
+HOMEPAGE="https://imageio.github.io/"
+SRC_URI="
+	https://github.com/imageio/imageio/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+PROPERTIES="test_network"
+RESTRICT="test"
+
+RDEPEND="
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	media-libs/freeimage
+"
+BDEPEND="
+	test? (
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/tifffile[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# Fails because of system installed freeimage
+	tests/test_core.py::test_findlib2
+)
+
+EPYTEST_IGNORE=(
+	# Needs unpackaged imageio_ffmpeg
+	tests/test_ffmpeg.py
+	tests/test_ffmpeg_info.py
+)
diff --git a/dev-python/installer/Manifest b/dev-python/installer/Manifest
index b18a2088dca8..9add80aee415 100644
--- a/dev-python/installer/Manifest
+++ b/dev-python/installer/Manifest
@@ -1,4 +1,2 @@
 DIST installer-0.4.0-py2.py3-none-any.whl.zip 451433 BLAKE2B 933b7e63b3d0306213789d493d4df112df26b432d63ecd1f8f21449520c34bd2ad542aac25069043fbb535c44f988dca927625eafd0a5a20489fc3ce2bcf84a2 SHA512 cf303bb422e329a36007b361034144a232ba021d4013bb8678dc7c326544e74ec9a3b3fe8b9d3696433dbbe90d2ce4a0ae8967fb054bd5ed49321d470be729a8
-DIST installer-0.4.0_p20220115-cli.patch 14552 BLAKE2B 6632c1472ae0a578f6c7ed0acf1bb0d89ece924626b68c0daa28d9a7d93826837adaf6b0d40f048c4f5c2986b4328ca565340137e7b7fa7f407f62ebddc70275 SHA512 f8c6369955e0bde2bff0b935c39748d02659bc6ca0341af405e2c1026cf145479ba0b908bd769cdc05f3cc920f881b894b6a5eb7ace643951e05250ec0486b80
-DIST installer-0.4.0_p20220115.gh.tar.gz 466532 BLAKE2B 6dea3f4bacb52c4983e111d420495ee157076342a823b7062c6e5b3e4d3b70e6b2e9cb024d0c7baba6f88ed70f4303ab071d1882bc9d8dd0726f82a3e406056f SHA512 fbb0d4c8642fa2cbe2fd3be2eef7044a0353f04c67ecce20aafed33a0d7877ff55872ca5ad51390ae7e02cdb7af5dbd57b662085b60d425be95da6643b061eaa
 DIST installer-0.4.0_p20220124.gh.tar.gz 468296 BLAKE2B 44763fd05b9e3cc665871817f3a6a417ddc12274ae42989e96ad432af98d42c23ab9f1c1cc37e17d4b9ce06ead7ef0c8227b2b10fe5744c899a9e3ea347e4e33 SHA512 b25fa910e8a7d9a2757af4694bf12a64c8731213a5682ab02bbe472229c99dd9190b1e7663a7632d61cbf0585006b2d4de62115c40f9b132be2c70672e23726d
diff --git a/dev-python/installer/installer-0.4.0_p20220115.ebuild b/dev-python/installer/installer-0.4.0_p20220115.ebuild
deleted file mode 100644
index 20c25f8e7661..000000000000
--- a/dev-python/installer/installer-0.4.0_p20220115.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_SETUPTOOLS=manual
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-inherit distutils-r1
-
-EGIT_COMMIT="bf68f7b045ffc08784af03cf2433548c9ee9e8ca"
-DESCRIPTION="A library for installing Python wheels"
-HOMEPAGE="
-	https://pypi.org/project/installer/
-	https://github.com/pradyunsg/installer/
-	https://installer.readthedocs.io/en/latest/
-"
-SRC_URI="
-	https://github.com/pradyunsg/installer/archive/${EGIT_COMMIT}.tar.gz
-		-> ${P}.gh.tar.gz
-	https://files.pythonhosted.org/packages/py2.py3/${PN::1}/${PN}/${P%_p*}-py2.py3-none-any.whl
-		-> ${P%_p*}-py2.py3-none-any.whl.zip
-	https://patch-diff.githubusercontent.com/raw/pradyunsg/installer/pull/94.diff
-		-> ${P}-cli.patch
-"
-S=${WORKDIR}/${PN}-${EGIT_COMMIT}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-# NB: newer git doesn't use mock anymore
-BDEPEND="
-	app-arch/unzip
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${DISTDIR}"/${P}-cli.patch
-)
-
-# do not use any build system to avoid circular deps
-python_compile() { :; }
-
-python_test() {
-	local -x PYTHONPATH=src
-	epytest
-}
-
-python_install() {
-	python_domodule src/installer "${WORKDIR}"/*.dist-info
-}
diff --git a/dev-python/jsondiff/Manifest b/dev-python/jsondiff/Manifest
index 2fc30e8ea083..6b8c544f7e1f 100644
--- a/dev-python/jsondiff/Manifest
+++ b/dev-python/jsondiff/Manifest
@@ -1 +1,2 @@
 DIST jsondiff-1.3.0.tar.gz 15283 BLAKE2B 408070816a4b21a3f11f5b039464ba276fb253f712f29930454167d3aff22f78b4d828aba5e28cf05587c8a296b908fd1945a65958244a1093279bff5e3a555c SHA512 512e34d1a0673ed785f066c284c09412a3590ad916913ae1885ac567795cc73e2adf30596b60b64b6b379954e6cb82d5174e80dd9cf40ed53f6968bec8a3d8f2
+DIST jsondiff-1.3.1.gh.tar.gz 15457 BLAKE2B f3896c85b601ac32859e59f2a5a29b51f124a1dd27fa2b0da40e44c4b776bbba933043fb7334e5ec20833eea25143d40cc7988a8308f56eff20510db982688b0 SHA512 cbbed17bf00f1757d81477e02435c3f5a9a3246774f3fd9a433be31de1617525acfe33d6790be33dcf9b5da5ef3d6910d13958fb7b8ea4fbd802c74485a9dc6f
diff --git a/dev-python/jsondiff/jsondiff-1.3.1.ebuild b/dev-python/jsondiff/jsondiff-1.3.1.ebuild
new file mode 100644
index 000000000000..4568a751c191
--- /dev/null
+++ b/dev-python/jsondiff/jsondiff-1.3.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1
+
+DESCRIPTION="Diff JSON and JSON-like structures in Python"
+HOMEPAGE="
+	https://github.com/xlwings/jsondiff/
+	https://pypi.org/project/jsondiff/"
+SRC_URI="
+	https://github.com/xlwings/${PN}/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+
+BDEPEND="
+	test? (
+		dev-python/nose-random[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests nose
+
+python_prepare_all() {
+	# Avoid file collision with jsonpatch's jsondiff cli.
+	sed -e "/'jsondiff=jsondiff.cli/ d" -i setup.py || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/lazy-object-proxy/Manifest b/dev-python/lazy-object-proxy/Manifest
index 00843ad6a6d2..f7e16316a63a 100644
--- a/dev-python/lazy-object-proxy/Manifest
+++ b/dev-python/lazy-object-proxy/Manifest
@@ -1,3 +1 @@
-DIST lazy-object-proxy-1.5.0.tar.gz 35938 BLAKE2B 11e091538f4bcddd5acb39963572e30535b01227481affcb160d55b39c5b4548fef2da316efe483d6b0450e204126b957884dfb7a96727b0a00209addd6097cc SHA512 8d594df743694f01b9710e55d8e88831d6ac2e81a925ad310f0c39d061f20115550c5adf1da40d0d7c4749eb3a7ffbbb6000ebbda3dbb445c9efa1d05ff37cc3
-DIST lazy-object-proxy-1.7.0.tar.gz 42441 BLAKE2B 8652697cf80f4fca6a4ad83daee2fafb203b7c1a1375fa504aba731e4717d40f3b130cbfeffd642a7d76ae35ab5532aaa819566d8706b37504863e7b433906c3 SHA512 462e04efccba1462a09bec66bdfa47f3cb4d8fa746f66d7dada0e9436416c6f7948363d11eac95f8d8734d3296794899f28f123cb289565af85d3bc29a635c61
 DIST lazy-object-proxy-1.7.1.tar.gz 41995 BLAKE2B f3945b3ddc8335be184542e23eb823effe83262a80f048e92441d60bee2ace2f0c9b09fc00a7d356e91a66676361979bc10555dc24ac65e2fdbdfa9ba0cf9e02 SHA512 cf80f2e43795cef09c0a6dde32276d54f5d66a2cf017d3e815868ec9925d989f7256bbf3e416c4445d13e0c9241733029d9a99f2556258f59c2c5267b3c35391
diff --git a/dev-python/lazy-object-proxy/lazy-object-proxy-1.5.0.ebuild b/dev-python/lazy-object-proxy/lazy-object-proxy-1.5.0.ebuild
deleted file mode 100644
index ea9fc0d3f91b..000000000000
--- a/dev-python/lazy-object-proxy/lazy-object-proxy-1.5.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A fast and thorough lazy object proxy"
-HOMEPAGE="
-	https://github.com/ionelmc/python-lazy-object-proxy
-	https://pypi.org/project/lazy-object-proxy/
-	https://python-lazy-object-proxy.readthedocs.org/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# No need to benchmark
-	sed \
-		-e '/benchmark/s:test_:_&:g' \
-		-e '/pytest.mark.benchmark/d' \
-		-i tests/test_lazy_object_proxy.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	pytest -v -v --ignore=src || die "Fails for ${EPYTHON}"
-}
diff --git a/dev-python/lazy-object-proxy/lazy-object-proxy-1.7.0.ebuild b/dev-python/lazy-object-proxy/lazy-object-proxy-1.7.0.ebuild
deleted file mode 100644
index 27a6ad6f5fd2..000000000000
--- a/dev-python/lazy-object-proxy/lazy-object-proxy-1.7.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="A fast and thorough lazy object proxy"
-HOMEPAGE="
-	https://github.com/ionelmc/python-lazy-object-proxy
-	https://pypi.org/project/lazy-object-proxy/
-	https://python-lazy-object-proxy.readthedocs.org/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# No need to benchmark
-	sed \
-		-e '/benchmark/s:test_:_&:g' \
-		-e '/pytest.mark.benchmark/d' \
-		-i tests/test_lazy_object_proxy.py || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/lazy-object-proxy/lazy-object-proxy-1.7.1.ebuild b/dev-python/lazy-object-proxy/lazy-object-proxy-1.7.1.ebuild
index 99af5b9dbfac..8626af5e5732 100644
--- a/dev-python/lazy-object-proxy/lazy-object-proxy-1.7.1.ebuild
+++ b/dev-python/lazy-object-proxy/lazy-object-proxy-1.7.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
diff --git a/dev-python/markdown-it-py/Manifest b/dev-python/markdown-it-py/Manifest
index f6fc23e4fb2c..04ffab946247 100644
--- a/dev-python/markdown-it-py/Manifest
+++ b/dev-python/markdown-it-py/Manifest
@@ -1 +1,2 @@
 DIST markdown-it-py-2.0.0.gh.tar.gz 265346 BLAKE2B f509c3fdc82a2665bb9bca862118c544cf203afbb8454cdbb5f58c58aeadcd1fbd66ef98615ac6501e4fe8ce83d2e668de29d2e67301ddda06d1cbbaf6cf7422 SHA512 226111a8d0e57d9def2076053abfba1b7533bb0cdee569b8e1c7ece2b61ebce49daa263aee673683b83974b7597df0e6d62c1723860af684fe306c55619357ca
+DIST markdown-it-py-2.0.1.gh.tar.gz 265850 BLAKE2B fe61608f14b22dffb81bb943df75967300e8366ff1b1c252b35974414efa6b2daac223b09f40ff6d7feab70c5b033b0eee35a4ee5f8523325f12311f4cbeef57 SHA512 fccf00de7e94986a29047da948d6ebb6304ae3645e79bbad480366c3aadbd417b95d96489d167a532eee3c2e17b67e22777224290564c7bcc17d72fec29b08df
diff --git a/dev-python/markdown-it-py/markdown-it-py-2.0.1.ebuild b/dev-python/markdown-it-py/markdown-it-py-2.0.1.ebuild
new file mode 100644
index 000000000000..97ad5be29096
--- /dev/null
+++ b/dev-python/markdown-it-py/markdown-it-py-2.0.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1
+
+DESCRIPTION="Python port of markdown-it, Markdown parser"
+HOMEPAGE="https://pypi.org/project/markdown-it-py/
+	https://github.com/executablebooks/markdown-it-py"
+SRC_URI="
+	https://github.com/executablebooks/markdown-it-py/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	<dev-python/attrs-22[${PYTHON_USEDEP}]
+	dev-python/mdurl[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-regressions[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# Unimportant tests needing a new dep linkify
+	tests/test_linkify.py::test_token_levels
+	tests/test_port/test_fixtures.py::test_linkify
+)
+
+EPYTEST_IGNORE=(
+	# No need to benchmark
+	benchmarking/
+)
diff --git a/dev-python/multidict/Manifest b/dev-python/multidict/Manifest
index d6a267671bf7..ceb7d7176242 100644
--- a/dev-python/multidict/Manifest
+++ b/dev-python/multidict/Manifest
@@ -1,2 +1,3 @@
 DIST multidict-5.2.0.tar.gz 56984 BLAKE2B 3580e3f53b3ec581d338676647f2e8dd78387fdad5730fe703c02b3cd4182d69e3b6896d71bd969413dd27974e07272cc541701a2145a517d9bacea45000e9c8 SHA512 508b6db9219c3dae76da5e89a398f4541beff2a875030c2f11da9aaa1e001324d069d7a291148c510fe555cb3a33288ef297c9baa863e42d3d09d60588bebd7e
 DIST multidict-6.0.1.tar.gz 56227 BLAKE2B f5038b2e11df1bd605837a66d64e0bb42a03274fc07a3a9b10772fba6e903e8543a9d6eff575f4f177edbd03f830113b0c3aeff10be3df2902efb429f3275b41 SHA512 ab90deeba36806223d1813dd4348833e5938eb46b807e921308e93eb6e48ddcd9af4a17e049ae448ae199d6e2c99c76aea52745b7bb8746cd1b47e5fab8f9279
+DIST multidict-6.0.2.tar.gz 56840 BLAKE2B 1fa9b0d92a94ed022849a851f925e132b629216ddd0d5d4772304fd3361a129692f8b49fca2765118ab1cbc306879924d0aa7c6b57b648158a093a9f311a8d30 SHA512 508f18c5f731e7438bc7cb84b29aff22422769a8ea4c0ba7c875361d1bb1da78bed2db8b4ca34b833effd03ca3e7f00dabaad64bfce54b3e8d208cdc808083c9
diff --git a/dev-python/multidict/multidict-6.0.2.ebuild b/dev-python/multidict/multidict-6.0.2.ebuild
new file mode 100644
index 000000000000..6d450186242d
--- /dev/null
+++ b/dev-python/multidict/multidict-6.0.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="multidict implementation"
+HOMEPAGE="https://github.com/aio-libs/multidict/"
+SRC_URI="https://github.com/aio-libs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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/numpydoc/Manifest b/dev-python/numpydoc/Manifest
index 73b5150901a4..ad77cba92360 100644
--- a/dev-python/numpydoc/Manifest
+++ b/dev-python/numpydoc/Manifest
@@ -1 +1,2 @@
 DIST numpydoc-1.1.0.tar.gz 609482 BLAKE2B 475be835a760dd148b7132a3149a1b79193425b70bbaa51b29a3909c73ed11a933181c917a0f0d0b56d8d30baced2142897e0a931b5eeb6449092d0a2a81632b SHA512 10dfc5e40ca851401be7d7cca3cbf24bf8ded8573c01344976321cd65fe351d985ee0bf48a92a485a43f8fb191c246e4822545a1583c87c1214d819a5fdfc106
+DIST numpydoc-1.2.tar.gz 69659 BLAKE2B e5483ad3d6d82e9ff51d2d7cdc36c75407361059a696047f1d0fb7d3307c36ee056e8c0b9eb45fc11e4d341350c1b1dd021d60252055154c6907942e549b9555 SHA512 b8ea82a947c7fca9d02c2083f6040f2a1a115400e43257fd6ce7ac9b1b174d22ed7723053b87893d6bff8f47a625932297c884e853be4e00d3ae2262ad0161cf
diff --git a/dev-python/numpydoc/numpydoc-1.2.ebuild b/dev-python/numpydoc/numpydoc-1.2.ebuild
new file mode 100644
index 000000000000..8c42731aaf2a
--- /dev/null
+++ b/dev-python/numpydoc/numpydoc-1.2.ebuild
@@ -0,0 +1,44 @@
+# 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_{6,7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Sphinx extension to support docstrings in Numpy format"
+HOMEPAGE="https://pypi.org/project/numpydoc/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	>=dev-python/jinja-2.10[${PYTHON_USEDEP}]
+	>=dev-python/sphinx-1.8[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		>=dev-python/matplotlib-3.2.1[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e 's:--cov-report= --cov=numpydoc::' setup.cfg || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# these require Internet (intersphinx)
+		numpydoc/tests/test_full.py::test_MyClass
+		numpydoc/tests/test_full.py::test_my_function
+	)
+	epytest --pyargs numpydoc
+}
diff --git a/dev-python/pdm-pep517/Manifest b/dev-python/pdm-pep517/Manifest
index f9273745987d..a2bfe9f63f76 100644
--- a/dev-python/pdm-pep517/Manifest
+++ b/dev-python/pdm-pep517/Manifest
@@ -1 +1,2 @@
 DIST pdm-pep517-0.10.0.gh.tar.gz 189457 BLAKE2B 5a51b62dbc828aec5bca6ada8c7ecb479dd7491f22251392198a3d8e183f2d3d86fd4264addd9a428c37a24041365f3eeecec0a33c3f1a39ea8a1a8e6827be91 SHA512 7eb76bdf3db99ec1cf76a467617ce15423eaa465800efa9ccb248efb3c3cb5644b8e6a9ce04d6181dc9f3b5287a167f62f25d5e3334929f3e947a62ca9633d01
+DIST pdm-pep517-0.10.1.gh.tar.gz 189525 BLAKE2B 10d80fee2ac45fd68c61baf9a8ee7365da19a5daa085fdecd3164b3271cf0c0ee8ad110b1f96a33a4eecdceace72c2d4ee1ce789331c208eb4a67e3b4e3fe56a SHA512 acdf36eeb2baf90c1c80b676901ac06946fbb32f2a5c2bfbdfd85d0889ae22a0851dede4f5898d109d20583504b311cbec6903deadfb77e3f1dd7ff6a1098e04
diff --git a/dev-python/pdm-pep517/pdm-pep517-0.10.1.ebuild b/dev-python/pdm-pep517/pdm-pep517-0.10.1.ebuild
new file mode 100644
index 000000000000..e8f39a3d29bf
--- /dev/null
+++ b/dev-python/pdm-pep517/pdm-pep517-0.10.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=standalone
+PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="A PEP 517 backend for PDM that supports PEP 621 metadata"
+HOMEPAGE="
+	https://pypi.org/project/pdm-pep517/
+	https://github.com/pdm-project/pdm-pep517/
+"
+SRC_URI="
+	https://github.com/pdm-project/pdm-pep517/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+# setuptools are used to build C extensions
+RDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-vcs/git
+	)
+"
+
+distutils_enable_tests pytest
+
+src_test() {
+	git config --global user.email "test@example.com" || die
+	git config --global user.name "Test User" || die
+	distutils-r1_src_test
+}
+
+python_test() {
+	local EPYTEST_DESELECT=()
+	if [[ ${EPYTHON} == pypy3 ]]; then
+		EPYTEST_DESELECT+=(
+			tests/test_wheel.py::test_override_tags_in_wheel_filename
+		)
+	fi
+	epytest
+}
diff --git a/dev-python/pooch/Manifest b/dev-python/pooch/Manifest
index e38f430514df..08ddb6d445b6 100644
--- a/dev-python/pooch/Manifest
+++ b/dev-python/pooch/Manifest
@@ -1 +1,2 @@
 DIST pooch-1.5.2.tar.gz 61167 BLAKE2B 36c3ac00ae1d05b688fabc31ae9eb88536d717a3dd179a02bf76f9c8066520bc165af0a71d5cd514e7c9f2422c4a3ee189cf93215bc9a9189bf9f20a77f95e61 SHA512 acb1a48e94a97f79503125f0cf1312d715719ec32817771d2e19d2bd89b2cfd34b50221d67d1854cd93818140d8536f6f5b3db1ae0bbb185fffa2cf9886f98da
+DIST pooch-1.6.0.tar.gz 52318 BLAKE2B c5cdf04a27a5754accee5a4522d5e6a51c4e71b7034cd570c6a2f30bc580ba9c15e0717be792e7cdd020ca745e6813a63681ce966ad61c0ed4aaa8b84829b920 SHA512 e1b6253b8879ef172bd6370139a7807355c7e1c03a1626ac46cb083b1f7d8beb5a8adb08c0828eb34e96a7164211d2dc7da214fd0176eb0606fe4ff47911257c
diff --git a/dev-python/pooch/pooch-1.6.0.ebuild b/dev-python/pooch/pooch-1.6.0.ebuild
new file mode 100644
index 000000000000..7ab735928f08
--- /dev/null
+++ b/dev-python/pooch/pooch-1.6.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1
+
+DESCRIPTION="Manage your Python library's sample data files"
+HOMEPAGE="https://github.com/fatiando/pooch"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+RESTRICT="test"
+PROPERTIES="test_network"
+
+RDEPEND="
+	dev-python/appdirs[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]"
+
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/paramiko[${PYTHON_USEDEP}]
+		dev-python/pytest-localftpserver[${PYTHON_USEDEP}]
+		dev-python/tqdm[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_sphinx doc dev-python/sphinx_rtd_theme
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/pure_eval/Manifest b/dev-python/pure_eval/Manifest
index fff84ca7e352..b017b8262d55 100644
--- a/dev-python/pure_eval/Manifest
+++ b/dev-python/pure_eval/Manifest
@@ -1 +1,2 @@
 DIST pure_eval-0.2.1.tar.gz 19430 BLAKE2B 6907cf2fc2a7118274a80dacdebeae163be57cc31086bc66f8ad9960f4624accde78149db9098bfba902774b367e2e0e9c5aac53c4e75119465d5f07cabbf17d SHA512 938d5bc5676ca39b728ab5a9c98d33a1eb7a2e8a66e61e3ae16e516a7c3bcc1b6d73c402faaec44581baeec6fee7297092c2473c257588948fabf786b14a7204
+DIST pure_eval-0.2.2.tar.gz 19395 BLAKE2B 19f86a1436e5f1a026a24f62c435e8970d84960f4cde1de80c58949b1aede6aa7562e8430e10e3f7171212c31d5699a3321fad5fb2ea1eed961a30d43a632a79 SHA512 35d20cbbfd513b7ac341759e619401a5f57b7b9df8abd09ce6414d4ee6bfa45dcadbad7529d067e81ad7ea2107c14fd03783a3a77f8074dad30d2e5161656804
diff --git a/dev-python/pure_eval/pure_eval-0.2.2.ebuild b/dev-python/pure_eval/pure_eval-0.2.2.ebuild
new file mode 100644
index 000000000000..0b6312e55059
--- /dev/null
+++ b/dev-python/pure_eval/pure_eval-0.2.2.ebuild
@@ -0,0 +1,20 @@
+# 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_{6,7,8,9,10} )
+inherit distutils-r1
+
+DESCRIPTION="Safely evaluate AST nodes without side effects"
+HOMEPAGE="https://github.com/alexmojaki/pure_eval"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~hppa ~ia64 ~riscv"
+
+BDEPEND="dev-python/wheel[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
diff --git a/dev-python/py-zabbix/Manifest b/dev-python/py-zabbix/Manifest
deleted file mode 100644
index 771920ad78c8..000000000000
--- a/dev-python/py-zabbix/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST py-zabbix-1.1.7.tar.gz 11447 BLAKE2B a61450f4d1783bbf6879b94300ae71fbecded5f232c234402d19c59af9bea5f1ef164c549a433a4b221032b6105d4ecd0f3515104ed8f02d3da8888ee3c45a90 SHA512 eaa8c5e5ad5604ad4ad41de439ab7856f6907346caa56bed67520df3316f313038e300cbf96f8389dca5be30079392406bcbb26f3ba40d2ef39ccd2fc99c11b6
diff --git a/dev-python/py-zabbix/metadata.xml b/dev-python/py-zabbix/metadata.xml
deleted file mode 100644
index dbd5b978b75a..000000000000
--- a/dev-python/py-zabbix/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
-  <email>alexxy@gentoo.org</email>
-  <name>Alexey Shvetsov</name>
- </maintainer>
- <maintainer type="project">
-  <email>python@gentoo.org</email>
-  <name>Python</name>
- </maintainer>
- <upstream>
-  <remote-id type="pypi">py-zabbix</remote-id>
- </upstream>
- <origin>gentoo-staging</origin>
- <stabilize-allarches/>
-</pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/py-zabbix/py-zabbix-1.1.7.ebuild b/dev-python/py-zabbix/py-zabbix-1.1.7.ebuild
deleted file mode 100644
index b77e3445deb7..000000000000
--- a/dev-python/py-zabbix/py-zabbix-1.1.7.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Zabbix module for Python"
-HOMEPAGE="https://pypi.org/project/py-zabbix https://github.com/adubkov/py-zabbix"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
diff --git a/dev-python/pydot/files/pydot-1.4.2-pyparsing-3.patch b/dev-python/pydot/files/pydot-1.4.2-pyparsing-3.patch
new file mode 100644
index 000000000000..09d4c654ac17
--- /dev/null
+++ b/dev-python/pydot/files/pydot-1.4.2-pyparsing-3.patch
@@ -0,0 +1,22 @@
+https://github.com/pydot/pydot/pull/281
+https://bugs.gentoo.org/830676
+
+(rebased)
+
+From 4ab2c033c0dd67cab87be9a9392c558359caf80c Mon Sep 17 00:00:00 2001
+From: Anton Bolshakov <blshkv@users.noreply.github.com>
+Date: Tue, 4 Jan 2022 16:05:51 +0800
+Subject: [PATCH] Update dot_parser.py
+
+https://github.com/pydot/pydot/issues/277
+--- a/dot_parser.py
++++ b/dot_parser.py
+@@ -439,6 +439,8 @@ def graph_definition():
+ 
+         noncomma = "".join([c for c in printables if c != ","])
+         alphastring_ = OneOrMore(CharsNotIn(noncomma + ' '))
++        # override pyparsing tightened whitespace-skipping logic
++        alphastring_.skipWhitespace = True
+ 
+         def parse_html(s, loc, toks):
+             return '<%s>' % ''.join(toks[0])
diff --git a/dev-python/pydot/pydot-1.4.2-r2.ebuild b/dev-python/pydot/pydot-1.4.2-r2.ebuild
new file mode 100644
index 000000000000..75e128faed7b
--- /dev/null
+++ b/dev-python/pydot/pydot-1.4.2-r2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+inherit distutils-r1
+
+DESCRIPTION="Python interface to Graphviz's Dot language"
+HOMEPAGE="https://github.com/pydot/pydot https://pypi.org/project/pydot/"
+# pypi releases don't include tests
+SRC_URI="https://github.com/pydot/pydot/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/pyparsing[${PYTHON_USEDEP}]
+	media-gfx/graphviz"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/chardet[${PYTHON_USEDEP}]
+	)"
+
+PATCHES=(
+#	"${FILESDIR}"/${PN}-1.4.2-pyparsing-3.patch
+)
+
+python_test() {
+	cd test || die
+	"${PYTHON}" pydot_unittest.py || die "Test failed with ${EPYTHON}"
+}
diff --git a/dev-python/pygobject/Manifest b/dev-python/pygobject/Manifest
index cccbe5e376b3..8f995e96196e 100644
--- a/dev-python/pygobject/Manifest
+++ b/dev-python/pygobject/Manifest
@@ -1,2 +1 @@
-DIST pygobject-3.40.1.tar.xz 556104 BLAKE2B e6a092bee68121d9ef82f41f21c9811f384b8578c48de445f707f1b0de124cf38d899d34b8f4269a154ebd4e323afdfa7afef5c0c5cc5dc451b2cd68b30da04b SHA512 a8350f43ea99c93aa66a23102d4ee2ca3c7f8ec2c8bcf5cd142dd097b4fb38167f1713efff3584aa323c34656c911fb940e462c83c02b107e4aad93d005022f7
 DIST pygobject-3.42.0.tar.xz 557060 BLAKE2B 25c0634dcb713f4059d19ff2efdd67004e1343f49982123686f4df71fc2678583244dab7a22160f42d5361c3e5c6e38bcd8ccaeeafb3e1d885e5d5febaa9dde1 SHA512 2f3e9187cb8dd7ccbf139a58ea348732fc7cb95dbf4bee2ba8f78003a7540d90c0b29153d93f50bf613c2d43f0de0ec8971c61c358d48552e42ce17775a178dd
diff --git a/dev-python/pygobject/files/pygobject-3.40.1-dynamicimporter-py310.patch b/dev-python/pygobject/files/pygobject-3.40.1-dynamicimporter-py310.patch
deleted file mode 100644
index 341a096767b6..000000000000
--- a/dev-python/pygobject/files/pygobject-3.40.1-dynamicimporter-py310.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 1ae65be0f7e621002e2e29921e0252c1b57a170c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Sun, 20 Jun 2021 17:54:52 +0200
-Subject: [PATCH] Implement PEP451 semantics for DynamicImporter
-
-Make DynamicImporter PEP451-compliant in order to silence ImportWarnings
-in Python 3.10.  This is mostly based on six._SixMetaPathImporter.
-
-Fixes #476
----
- gi/importer.py | 18 ++++++++++++++++++
- 1 file changed, 18 insertions(+)
-
-diff --git a/gi/importer.py b/gi/importer.py
-index 32967974..006cf464 100644
---- a/gi/importer.py
-+++ b/gi/importer.py
-@@ -24,6 +24,7 @@
- import sys
- import warnings
- import importlib
-+import importlib.util
- from contextlib import contextmanager
- 
- import gi
-@@ -103,6 +104,7 @@ def get_import_stacklevel(import_hook):
- class DynamicImporter(object):
- 
-     # Note: see PEP302 for the Importer Protocol implemented below.
-+    # PEP451 for A ModuleSpec Type for the Import System.
- 
-     def __init__(self, path):
-         self.path = path
-@@ -117,6 +119,16 @@ class DynamicImporter(object):
- 
-         return self
- 
-+    def find_spec(self, fullname, path, target=None):
-+        if not fullname.startswith(self.path):
-+            return None
-+
-+        path, namespace = fullname.rsplit('.', 1)
-+        if path != self.path:
-+            return None
-+
-+        return importlib.util.spec_from_loader(fullname, self)
-+
-     def load_module(self, fullname):
-         if fullname in sys.modules:
-             return sys.modules[fullname]
-@@ -149,3 +161,9 @@ class DynamicImporter(object):
-         sys.modules[fullname] = dynamic_module
- 
-         return dynamic_module
-+
-+    def create_module(self, spec):
-+        return self.load_module(spec.name)
-+
-+    def exec_module(self, module):
-+        pass
--- 
-2.32.0
-
diff --git a/dev-python/pygobject/pygobject-3.40.1-r1.ebuild b/dev-python/pygobject/pygobject-3.40.1-r1.ebuild
deleted file mode 100644
index 4b255cbb8d67..000000000000
--- a/dev-python/pygobject/pygobject-3.40.1-r1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-inherit gnome.org meson python-r1 virtualx xdg
-
-DESCRIPTION="Python bindings for GObject Introspection"
-HOMEPAGE="https://pygobject.readthedocs.io/"
-
-LICENSE="LGPL-2.1+"
-SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="+cairo examples test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-libs/glib-2.56:2
-	>=dev-libs/gobject-introspection-1.56:=
-	dev-libs/libffi:=
-	cairo? (
-		>=dev-python/pycairo-1.16.0[${PYTHON_USEDEP}]
-		x11-libs/cairo[glib] )
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-libs/atk[introspection]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		x11-libs/gdk-pixbuf:2[introspection,jpeg]
-		x11-libs/gtk+:3[introspection]
-		x11-libs/pango[introspection]
-	)
-"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-dynamicimporter-py310.patch
-)
-
-src_configure() {
-	configuring() {
-		meson_src_configure \
-			$(meson_feature cairo pycairo) \
-			$(meson_use test tests) \
-			-Dpython="${EPYTHON}"
-	}
-
-	python_foreach_impl configuring
-}
-
-src_compile() {
-	python_foreach_impl meson_src_compile
-}
-
-src_test() {
-	local -x GIO_USE_VFS="local" # prevents odd issues with deleting ${T}/.gvfs
-	local -x GIO_USE_VOLUME_MONITOR="unix" # prevent udisks-related failures in chroots, bug #449484
-
-	testing() {
-		local -x XDG_CACHE_HOME="${T}/${EPYTHON}"
-		meson_src_test || die "test failed for ${EPYTHON}"
-	}
-	virtx python_foreach_impl testing
-}
-
-src_install() {
-	installing() {
-		meson_src_install
-		python_optimize
-	}
-	python_foreach_impl installing
-	use examples && dodoc -r examples
-}
diff --git a/dev-python/pytest-flake8/pytest-flake8-1.0.7.ebuild b/dev-python/pytest-flake8/pytest-flake8-1.0.7.ebuild
index bde9d19f1670..3ec767dfa0d5 100644
--- a/dev-python/pytest-flake8/pytest-flake8-1.0.7.ebuild
+++ b/dev-python/pytest-flake8/pytest-flake8-1.0.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,8 +6,10 @@ EAPI=7
 PYTHON_COMPAT=( python3_{6,7,8,9,10} )
 inherit distutils-r1
 
-DESCRIPTION="py.test plugin for flake8"
-HOMEPAGE="https://github.com/tholo/pytest-flake8 https://pypi.org/project/pytest-flake8"
+DESCRIPTION="pytest plugin for flake8"
+HOMEPAGE="
+	https://github.com/tholo/pytest-flake8/
+	https://pypi.org/project/pytest-flake8/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
@@ -17,3 +19,7 @@ KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 x86"
 RDEPEND=">=dev-python/flake8-3.5.0[${PYTHON_USEDEP}]"
 
 distutils_enable_tests pytest
+
+python_test() {
+	epytest -p flake8
+}
diff --git a/dev-python/pytest-flakes/Manifest b/dev-python/pytest-flakes/Manifest
index 38db5f1fb820..545b526b2ef0 100644
--- a/dev-python/pytest-flakes/Manifest
+++ b/dev-python/pytest-flakes/Manifest
@@ -1,2 +1 @@
-DIST pytest-flakes-4.0.3.tar.gz 7312 BLAKE2B cf62d7e11a0521592325492c76e67cd51384b31d8a6191f10940230014c9a8797b3603e24664c022add5cec18ff7c3b558cd7507af47e8c90a9e90499f39e583 SHA512 ca63d68063cf48789d86dee3707b3ea7c5076fc1f636e17f408ad6f444303fb3a701af8d1e464d49af745e350272bffe8596853a52c01baa0bdb0b6b0c0bb303
 DIST pytest-flakes-4.0.4.tar.gz 7271 BLAKE2B aee9b573c1d4e173465d8547a568433eec3a6ab93a05c1a7655d7ecfd3dff2628f50b4f13f2aaa9a8f3ff365552f54cd1a5a3e4c7b347b056615e136fc5c5657 SHA512 f3bc82bef2dad4a1bf145179f1d25330adcb123cb6e2dd9802b0696be56ef66a8c705725a4e05a9fbbdc37d7482af7fe615735e0e94055f66b0893cc4cf15e53
diff --git a/dev-python/pytest-flakes/files/pytest-flakes-4.0.3-fix-py3.10.patch b/dev-python/pytest-flakes/files/pytest-flakes-4.0.3-fix-py3.10.patch
deleted file mode 100644
index 35b4809c865b..000000000000
--- a/dev-python/pytest-flakes/files/pytest-flakes-4.0.3-fix-py3.10.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-From: Arthur Zamarin <arthurzam@gentoo.org>
-Date: Fri, 27 Aug 2021 08:23:16 +0300
-Subject: [PATCH] test_syntax_error: fix for python 3.10
-
-Signed-off-by: Arthur Zamarin <arthurzam@gentoo.org>
---- a/test_flakes.py
-+++ b/test_flakes.py
-@@ -20,7 +20,8 @@ for x in []
-     pass
- """)
-     result = testdir.runpytest("--flakes", "--ignore", testdir.tmpdir)
--    assert "1: invalid syntax" in result.stdout.str()
-+    assert ("1: invalid syntax" in result.stdout.str() or
-+            "1: expected ':'" in result.stdout.str())
-     assert 'passed' not in result.stdout.str()
- 
- 
diff --git a/dev-python/pytest-flakes/pytest-flakes-4.0.3.ebuild b/dev-python/pytest-flakes/pytest-flakes-4.0.3.ebuild
deleted file mode 100644
index 51e72c6b6414..000000000000
--- a/dev-python/pytest-flakes/pytest-flakes-4.0.3.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Collection of small Python functions & classes"
-HOMEPAGE="https://pypi.org/project/pytest-flakes/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/pyflakes[${PYTHON_USEDEP}]
-	dev-python/pytest[${PYTHON_USEDEP}]"
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-py3.10.patch"
-)
-
-distutils_enable_tests pytest
diff --git a/dev-python/pytest-flakes/pytest-flakes-4.0.4.ebuild b/dev-python/pytest-flakes/pytest-flakes-4.0.4.ebuild
index f9639ecf5c6d..60d16cdfe320 100644
--- a/dev-python/pytest-flakes/pytest-flakes-4.0.4.ebuild
+++ b/dev-python/pytest-flakes/pytest-flakes-4.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -19,3 +19,7 @@ RDEPEND="
 	dev-python/pytest[${PYTHON_USEDEP}]"
 
 distutils_enable_tests pytest
+
+python_test() {
+	epytest -p flakes
+}
diff --git a/dev-python/pytest-param-files/Manifest b/dev-python/pytest-param-files/Manifest
index 1654e8c02308..5234361ee133 100644
--- a/dev-python/pytest-param-files/Manifest
+++ b/dev-python/pytest-param-files/Manifest
@@ -1 +1,2 @@
 DIST pytest-param-files-0.3.3.gh.tar.gz 6858 BLAKE2B 6614b00dcfab63241daee0951bea442afb885942c4ab1ce0b2f6b4c3fe1e0a6048955d79cb1bd703f31ffedaede19b36f40caded98e0c8dc014b64e847110a00 SHA512 d52d0aa44088879ee5cd55f8af56ed649a1a82420bed357be043fdcc0df4899002cae36d95c6864126eaaa97877a21aedabb00dd12a8730d6aee3bcaecdcee62
+DIST pytest-param-files-0.3.4.gh.tar.gz 6882 BLAKE2B e2e96bd2cf7b8676f92eeb7821ef76f1f82bb066210170ed4d04a16a7fb3ce346bcd63688ef9d46118c03fd74812fd821fff0414565befb8c558d03d15af2945 SHA512 2df6fe798aab743fdbf892b88ee1d09c554119429167e85bccb87e4ae9d487f8ab5a66c4157827500e8a5d2930277c7490348f6c38f23243e421d5449bde2df5
diff --git a/dev-python/pytest-param-files/pytest-param-files-0.3.4.ebuild b/dev-python/pytest-param-files/pytest-param-files-0.3.4.ebuild
new file mode 100644
index 000000000000..27f9ad437301
--- /dev/null
+++ b/dev-python/pytest-param-files/pytest-param-files-0.3.4.ebuild
@@ -0,0 +1,24 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+DISTUTILS_USE_PEP517=flit
+inherit distutils-r1
+
+DESCRIPTION="Pytest parametrize decorators from external files."
+HOMEPAGE="https://pypi.org/project/pytest_param_files/
+	https://github.com/chrisjsewell/pytest-param-files"
+SRC_URI="
+	https://github.com/chrisjsewell/pytest-param-files/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="dev-python/pytest[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
diff --git a/dev-python/spyder/files/spyder-4.1.5-doc-theme-renamed.patch b/dev-python/spyder/files/spyder-4.1.5-doc-theme-renamed.patch
deleted file mode 100644
index 8a93662950f0..000000000000
--- a/dev-python/spyder/files/spyder-4.1.5-doc-theme-renamed.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/docs/doc/conf.py b/docs/doc/conf.py
-index fd6d5ec..3de0bad 100644
---- a/docs/doc/conf.py
-+++ b/docs/doc/conf.py
-@@ -129,7 +129,7 @@ pygments_style = "sphinx"
- #
- # CI = True
- # TRAVIS_BRANCH = 'master'
--html_theme = "pandas_sphinx_theme"
-+html_theme = "pydata_sphinx_theme"
- html_logo = '_static/spyder_logo.png'
- html_theme_options = {
-     "external_links": [
diff --git a/dev-python/spyder/files/spyder-4.2.1-build.patch b/dev-python/spyder/files/spyder-4.2.1-build.patch
deleted file mode 100644
index 38d3356b0b3d..000000000000
--- a/dev-python/spyder/files/spyder-4.2.1-build.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git a/setup.py b/setup.py
-index 0c47210..20b95c0 100644
---- a/setup.py
-+++ b/setup.py
-@@ -97,21 +97,6 @@ def get_packages():
-     return packages
- 
- 
--#==============================================================================
--# Make Linux detect Spyder desktop file
--#==============================================================================
--class MyInstallData(install_data):
--    def run(self):
--        install_data.run(self)
--        if sys.platform.startswith('linux'):
--            try:
--                subprocess.call(['update-desktop-database'])
--            except:
--                print("ERROR: unable to update desktop database",
--                      file=sys.stderr)
--CMDCLASS = {'install_data': MyInstallData}
--
--
- #==============================================================================
- # Main scripts
- #==============================================================================
-@@ -177,8 +162,7 @@ def run(self):
-         'Intended Audience :: Developers',
-         'Topic :: Scientific/Engineering',
-         'Topic :: Software Development :: Widget Sets'
--    ],
--    cmdclass=CMDCLASS)
-+    ])
- 
- 
- #==============================================================================
diff --git a/dev-python/spyder/files/spyder-5.0.1-doc-theme-renamed.patch b/dev-python/spyder/files/spyder-5.0.1-doc-theme-renamed.patch
deleted file mode 100644
index 5edf7e854d0b..000000000000
--- a/dev-python/spyder/files/spyder-5.0.1-doc-theme-renamed.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/doc/conf.py b/doc/conf.py
-index a3dc817..f428860 100644
---- a/docs/doc/conf.py
-+++ b/docs/doc/conf.py
-@@ -143,7 +143,7 @@
- #
- # CI = True
- # TRAVIS_BRANCH = 'master'
--html_theme = "pandas_sphinx_theme"
-+html_theme = "pydata_sphinx_theme"
- html_logo = '_static/images/spyder_logo.png'
- html_theme_options = {
-     "external_links": [
diff --git a/dev-python/stack_data/Manifest b/dev-python/stack_data/Manifest
index 93736d786b3a..b812efd89f6d 100644
--- a/dev-python/stack_data/Manifest
+++ b/dev-python/stack_data/Manifest
@@ -1 +1,2 @@
 DIST stack_data-0.1.3.tar.gz 35593 BLAKE2B 8d60f7c589f75dc8362c25ce88c3d46935768033373fd22846e81cce26609c8137ff64d346904ed38181dc27d24e14ed4c4d0217a1229881b6f7373ea359161f SHA512 89f6fcc680b245747c505fac81780834280d3c67aa37f8ba5e782552d074566fe5d8645ccf1e0e47563593b842a4f4dbe50c0ee100773e1888475728ee0007bb
+DIST stack_data-0.1.4.tar.gz 36049 BLAKE2B 277d403a441ddd6e3d3019fa8e49e5703d140ee0df7ceac81b7a3b513241ed3759a105b8ada896c328804e35965a26527608477870435d4d6506e58651249d40 SHA512 0dc697513adde1f275eec96291f8ee937bd24b25ba2ee51707f973e8eb30c740159a3b0211ec8617a282ccc22c0db0bd6e75244e0778390d744d64950aaa9ba0
diff --git a/dev-python/stack_data/stack_data-0.1.4.ebuild b/dev-python/stack_data/stack_data-0.1.4.ebuild
new file mode 100644
index 000000000000..fbe1e847b22b
--- /dev/null
+++ b/dev-python/stack_data/stack_data-0.1.4.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+inherit distutils-r1
+
+DESCRIPTION="Extract data from Python tracebacks for informative displays"
+HOMEPAGE="https://github.com/alexmojaki/stack_data"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~hppa ~ia64 ~riscv"
+
+RDEPEND="
+	dev-python/asttokens[${PYTHON_USEDEP}]
+	dev-python/executing[${PYTHON_USEDEP}]
+	dev-python/pure_eval[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/typeguard[${PYTHON_USEDEP}]
+		dev-python/littleutils[${PYTHON_USEDEP}]
+		dev-python/pygments[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/typed-ast/Manifest b/dev-python/typed-ast/Manifest
index d21aa5d5e06d..fdc1d265e03b 100644
--- a/dev-python/typed-ast/Manifest
+++ b/dev-python/typed-ast/Manifest
@@ -1,2 +1,3 @@
 DIST typed_ast-1.4.3.tar.gz 210893 BLAKE2B 9e0bbaac73d97c13303c783d4e91b015570d9b9ad74361e1bcfe67259982459003ea6c24602ce004fe1447c4375090d5fa58006e18af28da256f6b25d9aa20b1 SHA512 7ac06e277c883afd1a7161601ffca0114aa63db257695a4bf4c64d819a7192fe52167edb57991aefc7accc6a9902b5faf2ba9e4032c4b9be31f1db7a091607c9
 DIST typed_ast-1.5.1.tar.gz 252316 BLAKE2B 4bb2987cc84277a595c8297563f257e495a4b298885f54b82ce177f5ce610809f462d0022a549e83c4c991e441720f36bd2451eef3487fc68ceda76b845a01d2 SHA512 9e1b1e5da242f29c52857a5a683be47d95b592c788a7c603fc38f637ee64f687253aa58994061681c703addd2405532dfdc0765dd1cadf16b339623901f61355
+DIST typed_ast-1.5.2.tar.gz 252310 BLAKE2B c36ab31e4c266de38a07935fc72ece62087bc52a6ebde401f9b2dcc641af064828572fa6e903dbdfb0c573ced10686b8dba995d316a5f7a7ee68efd3a4e9520c SHA512 7da72fc0c4fcb74cb41914765baea5c7f52b1e8a5c58883877e702765be59d3dd8c7f73bd5759a65781d04fdecbcf46160ff4402578a92685f25163e12b93558
diff --git a/dev-python/typed-ast/typed-ast-1.5.2.ebuild b/dev-python/typed-ast/typed-ast-1.5.2.ebuild
new file mode 100644
index 000000000000..bf488e75bf6d
--- /dev/null
+++ b/dev-python/typed-ast/typed-ast-1.5.2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1
+
+DESCRIPTION="Python typed-ast backported"
+HOMEPAGE="https://pypi.org/project/typed-ast/ https://github.com/python/typed_ast"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN/-/_}/${P/-/_}.tar.gz"
+S="${WORKDIR}/${P/-/_}"
+
+LICENSE="Apache-2.0 MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+
+distutils_enable_tests pytest
+
+python_test() {
+	cd "${BUILD_DIR}" || die
+	epytest
+}