Adding metadata

32 files changed, 658 insertions, 41 deletions

diff --git a/dev-python/PyPDF2/Manifest b/dev-python/PyPDF2/Manifest
index 00170246eb93..bb54af954592 100644
--- a/dev-python/PyPDF2/Manifest
+++ b/dev-python/PyPDF2/Manifest
@@ -1 +1,2 @@
 DIST PyPDF2-1.26.0.tar.gz 77556 BLAKE2B 8ce9b95165a3841154b6e38e24ca5a4db434ceef9c55fbf2d146b379586160cb985948e0feb7aed135f601535d034ef79ddc1af58a670b07ff7d3621907022ec SHA512 7b427f1d099dcd687a718fb8d86e6f677ad45257414c6367e4dfacd8dfef7e3dbe3816027359868764981f36a30721f1731b4c23cbe2f35cfab1c64fb290b034
+DIST PyPDF2-1.27.1.gh.tar.gz 1170252 BLAKE2B 81049707d4dd406405ec994228226edfe7cde4d57007146893c5fec14a4e82355c427cac64a2e338945f06c5bce1802e64bf9b042770a2d2ea7da6ed6982908d SHA512 3bd00e7057af8d0f7fdea378b8fae463ce93d37c68997511df10c53b139c0cb13329143bdac133a825404ab459ab3ead64c455ac3e58ddd5097c2985f86c2a46
diff --git a/dev-python/PyPDF2/PyPDF2-1.27.1.ebuild b/dev-python/PyPDF2/PyPDF2-1.27.1.ebuild
new file mode 100644
index 000000000000..38300870b3a9
--- /dev/null
+++ b/dev-python/PyPDF2/PyPDF2-1.27.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python library to work with PDF files"
+HOMEPAGE="
+	https://pypi.org/project/PyPDF2/
+	https://github.com/py-pdf/PyPDF2/
+"
+SRC_URI="
+	https://github.com/py-pdf/PyPDF2/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="examples"
+
+BDEPEND="
+	dev-python/pillow[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+python_install_all() {
+	if use examples; then
+		docinto examples
+		dodoc -r Sample_Code/.
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index d98d16eea233..9ff081694e8c 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -2,3 +2,4 @@ DIST boto3-1.21.22.tar.gz 479768 BLAKE2B 3ae647a4c06cb9f7c4c32216dba439ce8bbf346
 DIST boto3-1.21.27.tar.gz 482968 BLAKE2B f8dbabe73377a861cf1d3d2e9388f7ba91f2047d8ce792b44a10693e5b0575924b3abbd8ec2b72d0c3b9a553bb088fc17dc4cd23b571f375db45737376931a46 SHA512 54bb43022ba12fc7b5c54872632cd46c07c6f167246917b5413cdd30de6c327bc625410cdfe62f4ff257ad7c42da762d2bcec5515367e214131259ddc69a9061
 DIST boto3-1.21.32.tar.gz 485694 BLAKE2B da6fa6f38b234af9e67bfeb8182751f1ac533a2aea72d8d407aea21554501f598c9da71f3c30dd952248c1ab244c849b779a329fc941d05b53325fe46de2aba4 SHA512 d65cffa91ae1a29e69e4bac2fc0af704987e9bca914f3f905e00c383bc92127c6e41beed71e9445e3f484c6dadde2372aca69f550af600abbb42731275c53eda
 DIST boto3-1.21.35.tar.gz 486835 BLAKE2B 167070bf09785bac17083cef3caf144cf11a4266c4476af2f6e19b06c81f2d2bcee42b8c7de1d1c9ac178c025bcac08366b2c7cb072cdb663910d45f7e8369fa SHA512 fe73111a46fb27d9c77abec3a13c5267243b2fcc3f89c01d9036f6ca9f362d029c9cbfbb6c1df11b302a9fb0468453fc1b91ee3dac4853bab6662f1ebfa211b2
+DIST boto3-1.21.36.tar.gz 487111 BLAKE2B c812e80a2bd81f2feda25b9e43444d1587eb2706ab4372a71f6aad5051020dc2439c639e04f37322ab0c1a396c22c5dc45e773cf73518886d3aab9980633f45c SHA512 1530cd11471ddfdd6a77a250fc5af7546a760cc281b327be6b67b7e49ab40cdc440d4fbe8a72387009b2c2c3dc2e6d7baaa3b1dec3d5d4d276db89e1312e55cf
diff --git a/dev-python/boto3/boto3-1.21.36.ebuild b/dev-python/boto3/boto3-1.21.36.ebuild
new file mode 100644
index 000000000000..80278b309f54
--- /dev/null
+++ b/dev-python/boto3/boto3-1.21.36.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+
+inherit distutils-r1 multiprocessing
+
+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}]
+		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 "${MAKEOPTS}" "$(get_nproc)")"
+}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index 72e6e41e059b..9cb76c31be3d 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -2,3 +2,4 @@ DIST botocore-1.24.22.tar.gz 8839717 BLAKE2B 7b3843900da913561ab2a99f7371139cd8f
 DIST botocore-1.24.27.tar.gz 8856607 BLAKE2B aa149a79106bc6e9460d2b69b032b20d0fcd9b0a4d7dda04ac656e0681aff378267f5c6bde4e64432f309ad4ed89ff8cae50b0dc92f01086f8fbe433e5347ad3 SHA512 1cdeb2926bfdd54eb6805295982891cb02005c01ee74e3394d8680e486fd924f73322fb9ae56730deaf360b0e60c9fd482759d597eadb3dc180cb099beff487c
 DIST botocore-1.24.32.tar.gz 8884956 BLAKE2B c899ed9b540663fc16e937d98c4c4383b5b0b9c36a976a6b872019bee46edb6db4b9fbe9cf5cebfa5fd1f43d37d21213c90a93802e6d95e4218693269021f5fe SHA512 06142282ff93918052fc6d4832061c65088a5ce8a9fdbfb587be4a1575edf1ed160c58159f25446c7717a841e9ddff00b0a95dd5926a738ffb166b70b42da71f
 DIST botocore-1.24.35.tar.gz 8891601 BLAKE2B b6a56efa73a3f76f51764c4c649d38f2e596fb262624bc5931904318b68a773790f6e4e358cf42567aad0de4e97099699935e6da4c21be66a782f7005fbc15bf SHA512 3c0a7c935798a6dcdd419080a31050301f795ff67b8262673ee4ca09d8344f222ce4b1b7bfff3459089bbcb59c42041281ed8005c1533c34c24542d9a45c353c
+DIST botocore-1.24.36.tar.gz 8899058 BLAKE2B c11df5acef305116433aeb4c4b999b8bdeba278506ac066bae3572f578cd2877827cc8a45d74f57fd10c5e87fdd46f39b951ec4d5bd15f0c484194640813080a SHA512 49256c288b74126595521eabcab750a58a05d07ecf5243ce0626961963326099c3fa3cb571664fb72c0f835624bd79e55e4940c9fc4b03b2b1dc7fd7d3a71213
diff --git a/dev-python/botocore/botocore-1.24.36.ebuild b/dev-python/botocore/botocore-1.24.36.ebuild
new file mode 100644
index 000000000000..5fe8ae8c2f96
--- /dev/null
+++ b/dev-python/botocore/botocore-1.24.36.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} )
+
+inherit distutils-r1 multiprocessing
+
+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-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}]
+	)
+"
+
+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} \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+}
diff --git a/dev-python/google-auth/Manifest b/dev-python/google-auth/Manifest
index 9464b000e9b3..3e3c29564f14 100644
--- a/dev-python/google-auth/Manifest
+++ b/dev-python/google-auth/Manifest
@@ -3,3 +3,4 @@ DIST google-auth-2.4.0.tar.gz 188032 BLAKE2B 27cd5a9fec2a0f98e26e4c5cfada446f956
 DIST google-auth-2.5.0.tar.gz 189396 BLAKE2B 85b6cccf46acaa15ebc58b0cc4ea906c405e8f5e1f9d5c67c1790105689bba47e9f57355751a31a051ec6f20f828e2e2d0d9e792afc5d877791deab8a3e18503 SHA512 7323f253789364d14c1c1adf148cbfff2abceec06c539e93c8f5ae4a5ee978838480f9923e3d62988d903a239434257f980ec1095a8cedc678e263d0adff6cce
 DIST google-auth-2.6.0.tar.gz 188477 BLAKE2B 19baf9ec41e2b8667b8800687f4920d0e53df6cbfd17830e352f808b1438b21d952a4480f3b0fbc8e83dd215c0cd49b393f4798952eea1eb808b5417d578af85 SHA512 160fae0afcebd62dc0d46bf5e1102be34c6084cf188941105facd00b4a9b2bf6b36b58623e84595111849af0cb16b4f4a09b1e13ce095be025831fa4e7241b4c
 DIST google-auth-2.6.2.tar.gz 189490 BLAKE2B 5506b4d316a40274cd8ce0cea8c6a76b882e14f4f7e28f5a50e67c8828353d3078f713f874e36ba4c81537228325cf19c7ea1c3040b04d4b6338e456a8622024 SHA512 196bcec8f90ddc7ba95f03576f496aab38526c2305d729db806f07c0b44e578c6bfcb3a79224f4edaacb8760a3c7bb17a0af90cb2986aff3fdc5f767328fb247
+DIST google-auth-2.6.3.tar.gz 189685 BLAKE2B 68718ce4031c4e764dcfec19361b034ed5e1efa602d5c734b61a853020f40aaa856f9d9a3b964470e148fbfcb081dbc7d2c8bf0a53fc843d9360dbc72623bcdf SHA512 cba3228dbc0887c127d50cc45eb134e3a0b2bea044b8a1e65807918a3808e550fd58217a236c07b6cb908e5a080d9c1c1a2e9ee1853968d8c0bd50b7228ea262
diff --git a/dev-python/google-auth/google-auth-2.6.3.ebuild b/dev-python/google-auth/google-auth-2.6.3.ebuild
new file mode 100644
index 000000000000..a6c94df7af64
--- /dev/null
+++ b/dev-python/google-auth/google-auth-2.6.3.ebuild
@@ -0,0 +1,58 @@
+# 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} )
+
+inherit distutils-r1
+
+DESCRIPTION="Google Authentication Library"
+HOMEPAGE="
+	https://github.com/googleapis/google-auth-library-python/
+	https://pypi.org/project/google-auth/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	<dev-python/cachetools-6.0.0[${PYTHON_USEDEP}]
+	dev-python/namespace-google[${PYTHON_USEDEP}]
+	>=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
+	>=dev-python/pyasn1-modules-0.2.1[${PYTHON_USEDEP}]
+	>=dev-python/rsa-3.1.4[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/cryptography[${PYTHON_USEDEP}]
+		dev-python/flask[${PYTHON_USEDEP}]
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/grpcio[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/moto[${PYTHON_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		dev-python/pytest-localserver[${PYTHON_USEDEP}]
+		dev-python/pyu2f[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/responses[${PYTHON_USEDEP}]
+		dev-python/urllib3[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_IGNORE=(
+	# these are compatibility tests with oauth2client
+	# disable them to unblock removal of that package
+	tests/test__oauth2client.py
+)
+
+python_install_all() {
+	distutils-r1_python_install_all
+	find "${ED}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/hatchling/hatchling-0.22.0.ebuild b/dev-python/hatchling/hatchling-0.22.0.ebuild
index 0e3eba506794..c3dc504de513 100644
--- a/dev-python/hatchling/hatchling-0.22.0.ebuild
+++ b/dev-python/hatchling/hatchling-0.22.0.ebuild
@@ -35,14 +35,13 @@ RDEPEND="
 BDEPEND="
 	${RDEPEND}
 	test? (
-		$(python_gen_cond_dep '
-			dev-python/atomicwrites[${PYTHON_USEDEP}]
-			dev-python/click[${PYTHON_USEDEP}]
-			dev-python/httpx[${PYTHON_USEDEP}]
-			dev-python/platformdirs[${PYTHON_USEDEP}]
-			dev-python/rich[${PYTHON_USEDEP}]
-			dev-python/tomli-w[${PYTHON_USEDEP}]
-		' 'python*')
+		dev-python/atomicwrites[${PYTHON_USEDEP}]
+		dev-python/click[${PYTHON_USEDEP}]
+		dev-python/httpx[${PYTHON_USEDEP}]
+		dev-python/platformdirs[${PYTHON_USEDEP}]
+		dev-python/rich[${PYTHON_USEDEP}]
+		dev-python/tomli-w[${PYTHON_USEDEP}]
+		dev-python/virtualenv[${PYTHON_USEDEP}]
 	)
 "
 
@@ -55,11 +54,6 @@ python_compile() {
 }
 
 python_test() {
-	if [[ ${EPYTHON} != python* ]]; then
-		einfo "Skipping tests on ${EPYTHON}"
-		return
-	fi
-
 	local -x EPYTEST_DESELECT=(
 		# these run pip to install stuff
 		tests/backend/dep/test_core.py::test_dependency_found
@@ -74,5 +68,5 @@ python_test() {
 	# and hatchling
 	cd "${WORKDIR}/${MY_P}" || die
 	local -x PYTHONPATH="src:${PYTHONPATH}"
-	epytest -x tests/backend
+	epytest tests/backend
 }
diff --git a/dev-python/httpx/httpx-0.22.0-r2.ebuild b/dev-python/httpx/httpx-0.22.0-r2.ebuild
index bca940a7de5c..6e19d30f2462 100644
--- a/dev-python/httpx/httpx-0.22.0-r2.ebuild
+++ b/dev-python/httpx/httpx-0.22.0-r2.ebuild
@@ -8,7 +8,7 @@ EAPI=8
 # DOCS_DEPEND="dev-python/mkdocs-material"
 # DOCS_AUTODOC=1
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} )
+PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
 inherit distutils-r1 optfeature # docs
 
 DESCRIPTION="Fully-featured HTTP client which provides sync and async APIs"
diff --git a/dev-python/nptyping/Manifest b/dev-python/nptyping/Manifest
index 6b621ad1f5d1..989348dbb461 100644
--- a/dev-python/nptyping/Manifest
+++ b/dev-python/nptyping/Manifest
@@ -1 +1,2 @@
 DIST nptyping-1.4.4.gh.tar.gz 48098 BLAKE2B e13e7d6189a1ac826e8ea66918c006a63f0ec584e6d61cc7e0393b9a10709b41f75b43548ac94ce762c5180dc716e0717316573d45e8bec8951188d5df9bc1ad SHA512 4dd124734fde7e19867af0efd0c3a79f220b20576cb2f34a1cfb5e47c4fde44e936dca708d68bef99eb554afe7576f7fee447d6dd73f3c136340c8f48770f7b8
+DIST nptyping-2.0.0.gh.tar.gz 54691 BLAKE2B 05343da5b1b36ea0b06267ce0c8108b2e236c8d4124872da2ae5858b3fe9c06875846fdd07960abcc9bc961e468e1883a5da6b50d12e74b7628aacec9c1c1e16 SHA512 e7de94e93896af34285117be61799ee971cb2fabe87e8f04473393a042b299765e91ad7cf2d07339d2d1b7cee117e42ecea28197adda6de54686154e21754dc0
diff --git a/dev-python/nptyping/nptyping-2.0.0.ebuild b/dev-python/nptyping/nptyping-2.0.0.ebuild
new file mode 100644
index 000000000000..de966c4c03ab
--- /dev/null
+++ b/dev-python/nptyping/nptyping-2.0.0.ebuild
@@ -0,0 +1,45 @@
+# 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} )
+
+inherit distutils-r1
+
+DESCRIPTION="Type hints for Numpy"
+HOMEPAGE="
+	https://pypi.org/project/nptyping/
+	https://github.com/ramonhagenaars/nptyping/
+"
+SRC_URI="
+	https://github.com/ramonhagenaars/nptyping/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/numpy[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	' 3.8 3.9)
+"
+BDEPEND="
+	test? (
+		dev-python/mypy[${PYTHON_USEDEP}]
+		dev-python/typeguard[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_IGNORE=(
+	# TODO: package beartype?
+	tests/test_beartype.py
+	# relies on Internet access to fetch packages for pip
+	tests/test_wheel.py
+)
+
+distutils_enable_tests pytest
diff --git a/dev-python/pydantic/pydantic-1.9.0.ebuild b/dev-python/pydantic/pydantic-1.9.0.ebuild
index 39950d4ec284..f0d689f57b9f 100644
--- a/dev-python/pydantic/pydantic-1.9.0.ebuild
+++ b/dev-python/pydantic/pydantic-1.9.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{7,8,9,10} )
+PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Data parsing and validation using Python type hints"
@@ -35,15 +35,31 @@ src_prepare() {
 }
 
 python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=pytest_mock
+
 	local EPYTEST_DESELECT=(
 		# flaky test, known upstream
 		tests/test_hypothesis_plugin.py::test_can_construct_models_with_all_fields
 	)
-	[[ ${EPYTHON} == "python3.8" ]] && EPYTEST_DESELECT+=(
-		# Those fail on python 3.8 as None changed typing semantic on >=3.9
-		"tests/test_types.py::test_none[value_type3]"
-		tests/test_typing.py::test_is_none_type
-	)
+	case ${EPYTHON} in
+		python3.8)
+			EPYTEST_DESELECT+=(
+				# Those fail on python 3.8 as None changed typing semantic on >=3.9
+				"tests/test_types.py::test_none[value_type3]"
+				tests/test_typing.py::test_is_none_type
+			)
+			;;
+		pypy3)
+			EPYTEST_DESELECT+=(
+				tests/test_private_attributes.py::test_private_attribute
+				tests/test_private_attributes.py::test_private_attribute_annotation
+				tests/test_private_attributes.py::test_private_attribute_factory
+				tests/test_private_attributes.py::test_private_attribute_multiple_inheritance
+				tests/test_private_attributes.py::test_underscore_attrs_are_private
+			)
+			;;
+	esac
 	distutils_install_for_testing
 	epytest
 }
diff --git a/dev-python/pylast/Manifest b/dev-python/pylast/Manifest
index c299db153428..9f35e7582c8a 100644
--- a/dev-python/pylast/Manifest
+++ b/dev-python/pylast/Manifest
@@ -1 +1,2 @@
 DIST pylast-4.5.0.tar.gz 40175 BLAKE2B 394a6329d0c7f03ae70cf7ee5e19e310d4fc4b70f86a6e8ed66ad93674465433ff7ab06cfbfa82fd33302a6d85b9fe582402c2166746e7853d1bada9de5f2449 SHA512 c885f0ea415c2a6b96454abdbcef0b61732a5253ddff45a03d85a2b7d733f6bff47d1806576e4acc6d07763e404985e5c35341e37b88d586d1cbec811d984551
+DIST pylast-5.0.0.tar.gz 39868 BLAKE2B 0cb6d96ac74a2e62325b8a91cc3601ab4ea7ea629ef40c02ce1afe13fd067abc48f24092138fc4584382c9c7f8c62eb070f1a3173b39768ac4ff8e3904c255d2 SHA512 ebad77e66d39b5625d0afae3bba346769159f39dfbbca0fea6aa0e6ad683fea6ea04093dd4738e378ac419edcc9970e8070d7ff912cc08110a5f41f7993489ce
diff --git a/dev-python/pylast/pylast-5.0.0.ebuild b/dev-python/pylast/pylast-5.0.0.ebuild
new file mode 100644
index 000000000000..3635d2b1f7b2
--- /dev/null
+++ b/dev-python/pylast/pylast-5.0.0.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} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python interface to last.fm and other api-compatible websites"
+HOMEPAGE="
+	https://pypi.org/project/pylast/
+	https://github.com/pylast/pylast/
+"
+SRC_URI="
+	https://github.com/pylast/pylast/archive/${PV}.tar.gz
+		-> ${P}.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	dev-python/httpx[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/flaky[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/pytest-freezegun/files/pytest-freezegun-0.4.2-distutils-depr.patch b/dev-python/pytest-freezegun/files/pytest-freezegun-0.4.2-distutils-depr.patch
new file mode 100644
index 000000000000..86b7e32a5c1f
--- /dev/null
+++ b/dev-python/pytest-freezegun/files/pytest-freezegun-0.4.2-distutils-depr.patch
@@ -0,0 +1,61 @@
+From 1ae2e18b8d71c45defe8f695a3dddd5762a611b2 Mon Sep 17 00:00:00 2001
+From: Hugo van Kemenade <hugovk@users.noreply.github.com>
+Date: Fri, 8 Apr 2022 13:30:42 +0300
+Subject: [PATCH] Require pytest 3.6 to drop dependency on deprecated distutils
+
+---
+ pytest_freezegun.py | 6 +-----
+ setup.cfg           | 2 +-
+ tox.ini             | 2 +-
+ 3 files changed, 3 insertions(+), 7 deletions(-)
+
+diff --git a/pytest_freezegun.py b/pytest_freezegun.py
+index a08133f..257c7ca 100644
+--- a/pytest_freezegun.py
++++ b/pytest_freezegun.py
+@@ -2,7 +2,6 @@
+ 
+ import pytest
+ 
+-from distutils.version import LooseVersion
+ from freezegun import freeze_time
+ 
+ 
+@@ -14,10 +13,7 @@ def get_closest_marker(node, name):
+     """
+     Get our marker, regardless of pytest version
+     """
+-    if LooseVersion(pytest.__version__) < LooseVersion('3.6.0'):
+-        return node.get_marker('freeze_time')
+-    else:
+-        return node.get_closest_marker('freeze_time')
++    return node.get_closest_marker('freeze_time')
+ 
+ 
+ @pytest.fixture(name=FIXTURE_NAME)
+diff --git a/setup.cfg b/setup.cfg
+index 069ddf7..da06223 100644
+--- a/setup.cfg
++++ b/setup.cfg
+@@ -31,7 +31,7 @@ py_modules =
+     pytest_freezegun
+ install_requires =
+     freezegun>0.3
+-    pytest>=3.0.0
++    pytest>=3.6
+ 
+ [options.entry_points]
+ pytest11 =
+diff --git a/tox.ini b/tox.ini
+index 3846fd9..07e916d 100644
+--- a/tox.ini
++++ b/tox.ini
+@@ -6,7 +6,7 @@ envlist = {py35,py36,py37,py38,pypy3}-{pt3,pt4,pt5},py38-ptNext-fgNext,flake8
+ deps =
+   coverage
+   pip >= 19
+-  pt3: pytest>=3,<4
++  pt3: pytest>=3.6,<4
+   pt4: pytest>=4,<5
+   pt5: pytest>=5,<6
+   ptNext: git+https://github.com/pytest-dev/pytest/
diff --git a/dev-python/pytest-freezegun/pytest-freezegun-0.4.2-r1.ebuild b/dev-python/pytest-freezegun/pytest-freezegun-0.4.2-r1.ebuild
new file mode 100644
index 000000000000..ca2b2975cb97
--- /dev/null
+++ b/dev-python/pytest-freezegun/pytest-freezegun-0.4.2-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Easily freeze time in pytest test + fixtures"
+HOMEPAGE="
+	https://pypi.org/project/pytest-freezegun/
+	https://github.com/ktosiek/pytest-freezegun/
+"
+SRC_URI="
+	https://github.com/ktosiek/pytest-freezegun/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	dev-python/freezegun[${PYTHON_USEDEP}]
+	dev-python/pytest[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+PATCHES=(
+	# https://github.com/ktosiek/pytest-freezegun/pull/38
+	"${FILESDIR}"/${P}-distutils-depr.patch
+)
diff --git a/dev-python/pytest-toolbox/pytest-toolbox-0.4-r1.ebuild b/dev-python/pytest-toolbox/pytest-toolbox-0.4-r1.ebuild
new file mode 100644
index 000000000000..8878f65ad3a4
--- /dev/null
+++ b/dev-python/pytest-toolbox/pytest-toolbox-0.4-r1.ebuild
@@ -0,0 +1,33 @@
+# 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} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Numerous useful plugins for pytest"
+HOMEPAGE="https://pypi.org/project/pytest-toolbox/ https://github.com/samuelcolvin/pytest-toolbox/"
+SRC_URI="
+	https://github.com/samuelcolvin/pytest-toolbox/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+BDEPEND="
+	test? (
+		dev-python/pydantic[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -e '/addopts/d' -i setup.cfg || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/pytest-toolbox/pytest-toolbox-0.4.ebuild b/dev-python/pytest-toolbox/pytest-toolbox-0.4.ebuild
index edee197e26eb..eaa326f9edbe 100644
--- a/dev-python/pytest-toolbox/pytest-toolbox-0.4.ebuild
+++ b/dev-python/pytest-toolbox/pytest-toolbox-0.4.ebuild
@@ -1,9 +1,10 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{7,8,9,10} )
+PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
+
 inherit distutils-r1
 
 DESCRIPTION="Numerous useful plugins for pytest"
diff --git a/dev-python/pytools/pytools-2022.1.3.ebuild b/dev-python/pytools/pytools-2022.1.3-r1.ebuild
index 21b36a6a0a02..47d674078b11 100644
--- a/dev-python/pytools/pytools-2022.1.3.ebuild
+++ b/dev-python/pytools/pytools-2022.1.3-r1.ebuild
@@ -21,6 +21,9 @@ KEYWORDS="~amd64"
 RDEPEND="
 	>=dev-python/numpy-1.6.0[${PYTHON_USEDEP}]
 	>=dev-python/platformdirs-2.2.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	' 3.8 3.9 3.10)
 "
 
 distutils_enable_tests pytest
diff --git a/dev-python/rope/Manifest b/dev-python/rope/Manifest
index 37502321faab..2bbee94bc5a1 100644
--- a/dev-python/rope/Manifest
+++ b/dev-python/rope/Manifest
@@ -1 +1,2 @@
 DIST rope-0.23.0.tar.gz 260990 BLAKE2B 34064f45f72d6c9c5613eb5d9480dde25aeb5426ab3ea9b56e7ba5e4da1d9930735bd87757e3e885d4504ddcb24b23aa96b0d5be7c23ca4969201aedbaa3aa24 SHA512 1ab0a36c792fdc4d0fd1e554deec0fb6d1e877d91164fb8ee2e5f99240087f8a8d4608d1975be100bca87be0321d672b91579cf36795acffc742aa021cdf5e1b
+DIST rope-1.0.0.tar.gz 263335 BLAKE2B 5a2ecb494c7ab7833a75e54887e863fc5b35c2564d9ebcabb055084f1aff189bbedd2de13b1f8e0c56736886687c25111a42e47ff5ea84c217bb81927495e1a1 SHA512 f4a011750dfe51f092f29d1a911e4ce6c0425a31839f6ebade834d57472beeee9bae49cbd1f46ebcb2f3fe5c6aaf16edd583fd3a701b51b0f80d221c5aa23aed
diff --git a/dev-python/rope/rope-1.0.0.ebuild b/dev-python/rope/rope-1.0.0.ebuild
new file mode 100644
index 000000000000..ab3c0ce9f7c0
--- /dev/null
+++ b/dev-python/rope/rope-1.0.0.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_{7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python refactoring library"
+HOMEPAGE="
+	https://pypi.org/project/rope/
+	https://github.com/python-rope/rope/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc"
+
+BDEPEND="
+	test? (
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/trimesh/Manifest b/dev-python/trimesh/Manifest
index 969ec6680882..c8bf90253c84 100644
--- a/dev-python/trimesh/Manifest
+++ b/dev-python/trimesh/Manifest
@@ -1,3 +1,4 @@
 DIST trimesh-3.10.2.gh.tar.gz 10738967 BLAKE2B 70aecc2d7524eec7eb5499f2926072139bab26cadd24a7f2200975ba1d15d7ee2a264efa124be69669f70c2a3026aa67ff3c6f56156dbf940027b48b57de4f9f SHA512 3fed75b26187dc8b682e7befd7c23c96a33cb3375255a26b3c80513d8ea9b2308f7570940a8c11da1455bd7acf5b89aead65a9743d76d2adf8e6faf5260a6b77
 DIST trimesh-3.10.3.gh.tar.gz 10739164 BLAKE2B 558e9b66b6398b10ffaa1117f07d1ea7464d5e230d201473cf24efbb2e88e534883cc33fc13a6e217f76d5d40dc5f507b5fdca73f4275a79e67ac8a654c8199d SHA512 0f20e77bb4c94a723aa50a15cb0c401d410d4112ef936e4340ad45ca2b88ee42881a02c280bc51635f443c4c38078db218b334405c3de9fc7236f6bc3cef3855
 DIST trimesh-3.10.7.gh.tar.gz 10741141 BLAKE2B 6ce46ee661a8fa44aa95e8a56d928a9146318d83b55027125177ab60283072bcad520ca5d8ac1a8bd92bf894a358f02b94eae9ac4644a2ac79a986a3ab150974 SHA512 d1c721af449f27d4820e8c831ae3da0cb4bfeeba94c7f689ff6505d36bb8b7f32cdacd1eb7bbff8d3a35fc6cd0b4e0d43b205cbfc7ef795baed6833015b62bf2
+DIST trimesh-3.10.8.gh.tar.gz 10741790 BLAKE2B 2cc8573e01395fb95f192cd64370b32d63b3ebd3505008c67fc9530641060b127ff42b8892634bf61fd91dbc37098e0da9fa169199d257a0345494cf9996a764 SHA512 c5cd6a6abcf8b8e6cc157a76607d4db090c574a86450956577d81fff310448bab140007eefc3b2c2cea6873a1ef46eccb18834c1593aca40f3d7868b3ce3992e
diff --git a/dev-python/trimesh/trimesh-3.10.8.ebuild b/dev-python/trimesh/trimesh-3.10.8.ebuild
new file mode 100644
index 000000000000..719b7b502e7b
--- /dev/null
+++ b/dev-python/trimesh/trimesh-3.10.8.ebuild
@@ -0,0 +1,62 @@
+# 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} )
+
+inherit distutils-r1 multiprocessing optfeature
+
+DESCRIPTION="Python library for loading and using triangular meshes"
+HOMEPAGE="https://trimsh.org/ https://github.com/mikedh/trimesh"
+# No tests in PyPI tarballs
+SRC_URI="
+	https://github.com/mikedh/${PN}/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/chardet[${PYTHON_USEDEP}]
+	dev-python/colorlog[${PYTHON_USEDEP}]
+	dev-python/jsonschema[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/msgpack[${PYTHON_USEDEP}]
+	dev-python/networkx[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/pycollada[${PYTHON_USEDEP}]
+	dev-python/pyglet[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/scipy[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/svg-path[${PYTHON_USEDEP}]
+	dev-python/sympy[${PYTHON_USEDEP}]
+	dev-python/xxhash[${PYTHON_USEDEP}]
+	sci-libs/rtree[${PYTHON_USEDEP}]
+	sci-libs/shapely[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	epytest -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+}
+
+pkg_postinst() {
+	optfeature_header "${PN} functionality can be extended by installing the following packages:"
+	optfeature "making GUI applications with 3D stuff" dev-python/glooey
+	optfeature "2D triangulations of polygons" dev-python/mapbox_earcut
+	optfeature "loading a number of additional mesh formats" dev-python/meshio
+	optfeature "figuring out how much memory we have" dev-python/psutil
+	optfeature "marching cubes and other nice stuff" sci-libs/scikit-image
+}
diff --git a/dev-python/uvicorn/uvicorn-0.17.6.ebuild b/dev-python/uvicorn/uvicorn-0.17.6.ebuild
index 9e77aa284793..2cf08118b9e4 100644
--- a/dev-python/uvicorn/uvicorn-0.17.6.ebuild
+++ b/dev-python/uvicorn/uvicorn-0.17.6.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} )
+PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/voluptuous/Manifest b/dev-python/voluptuous/Manifest
index 91a515837eae..c6fd7aba77f4 100644
--- a/dev-python/voluptuous/Manifest
+++ b/dev-python/voluptuous/Manifest
@@ -1,3 +1,3 @@
 DIST voluptuous-0.12.2.tar.gz 48477 BLAKE2B c1cc26b3ac87bcd357d522c8a5210397f1a16e68f812727f2e8ab18c6731d12a04c2e9a96735e25926854eb378feaaeb8bafc083f394b7e9c2dfa2a503abeeb9 SHA512 86193294c1c6a593f6556f23a9a2c093690a06cbdabb7e268db135e36af6a15c113e78f3e05d000276b6ff54b8e17a0a01d589e9232da9eb5320500fdb5757e1
 DIST voluptuous-0.13.0.tar.gz 47117 BLAKE2B 101cb8bb2e06cde87e1f19306188a9b7df9fa93cf940f69443b6730b678db09c93d2999b22cb22ad108b9f08c1096e4f9055330d77d31dded9bda1ae99a158d0 SHA512 a4b76a7d7e3f1f2697c09b025c2386b77c48e7f9d001e05ab0b93c91167e438352ac682d52527e2cc01d009787fedd4674cf7c926ed908022fe381c09d488f29
-DIST voluptuous-0.13.1.tar.gz 47706 BLAKE2B 1e4a83b6582a7880ea0d1a639a431150895f127860f347d4761f69e3b4c7338a553610844fa67155b7781ab70f73da5283c9cdc10f858e2e81ccdfb459ccf9c5 SHA512 c81867ee9f95d7104a5491b35d3fe050250f80b46b2633ce72996aba32b33d043ad5ca36b6c03cd12284db2962d551b1fb0fd82682f8740a01742b907bb692cf
+DIST voluptuous-0.13.1.gh.tar.gz 42466 BLAKE2B ee66abe131d5ed6f49fb6ecc0227c6108617cadc694132826c88abf33b83538db1c97d38451983d2fb1191d5e7066491194fb01399e920b21a9e75d54df2d3fa SHA512 874960bdd3fce213e46f8017fbc56ede02133de6f8cb439d810db38ca06d9c5fcf5496150ef4c73fd19d9e06489ba08a510fd96aa16b8825564a52fd01cc3f4f
diff --git a/dev-python/voluptuous/voluptuous-0.13.1.ebuild b/dev-python/voluptuous/voluptuous-0.13.1-r1.ebuild
index 49b48566e11c..0e29ab901fa4 100644
--- a/dev-python/voluptuous/voluptuous-0.13.1.ebuild
+++ b/dev-python/voluptuous/voluptuous-0.13.1-r1.ebuild
@@ -10,7 +10,10 @@ inherit distutils-r1
 
 DESCRIPTION="A Python data validation library"
 HOMEPAGE="https://github.com/alecthomas/voluptuous/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="
+	https://github.com/alecthomas/voluptuous/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
 
 LICENSE="BSD"
 SLOT="0"
@@ -20,4 +23,4 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-0.11.5-fix-doctest.patch
 )
 
-distutils_enable_tests nose
+distutils_enable_tests pytest
diff --git a/dev-python/watchgod/watchgod-0.8.1.ebuild b/dev-python/watchgod/watchgod-0.8.1.ebuild
index 403bf9102a1f..301f011f2091 100644
--- a/dev-python/watchgod/watchgod-0.8.1.ebuild
+++ b/dev-python/watchgod/watchgod-0.8.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} )
+PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Simple, modern file watching and code reload in Python"
@@ -35,10 +35,6 @@ BDEPEND="
 
 distutils_enable_tests pytest
 
-EPYTEST_DESELECT=(
-	# flaky test on slow systems, https://github.com/samuelcolvin/watchgod/issues/84
-	tests/test_watch.py::test_awatch_log
-)
 
 src_prepare() {
 	# increase timeout
@@ -46,3 +42,14 @@ src_prepare() {
 
 	distutils-r1_src_prepare
 }
+
+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/websockets/websockets-10.2.ebuild b/dev-python/websockets/websockets-10.2.ebuild
index 77dd02e0201c..ddc2c25e3282 100644
--- a/dev-python/websockets/websockets-10.2.ebuild
+++ b/dev-python/websockets/websockets-10.2.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} )
+PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
 
 inherit distutils-r1
 
@@ -18,12 +18,17 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86"
 
-distutils_enable_tests unittest
+distutils_enable_tests pytest
 
-src_prepare() {
-	# these fail due to timeouts on slower hardware
-	sed -e 's:test_keepalive_ping_with_no_ping_timeout:_&:' \
-		-e 's:test_keepalive_ping(:_&:' \
-		-i tests/legacy/test_protocol.py || die
-	distutils-r1_src_prepare
+python_test() {
+	local EPYTEST_DESELECT=(
+		# very fragile to speed
+		tests/legacy/test_protocol.py::ServerTests::test_local_close_receive_close_frame_timeout
+	)
+	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
+		tests/test_utils.py::SpeedupsTests::test_apply_mask_non_contiguous_memoryview
+		tests/legacy/test_client_server.py::SecureClientServerTests::test_http_request_ws_endpoint
+	)
+
+	epytest tests
 }
diff --git a/dev-python/wsproto/wsproto-1.1.0.ebuild b/dev-python/wsproto/wsproto-1.1.0.ebuild
index 2a74867a9657..d08d7e043f7a 100644
--- a/dev-python/wsproto/wsproto-1.1.0.ebuild
+++ b/dev-python/wsproto/wsproto-1.1.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} )
+PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/zope-configuration/Manifest b/dev-python/zope-configuration/Manifest
index 826baef5681f..fca899e8dd30 100644
--- a/dev-python/zope-configuration/Manifest
+++ b/dev-python/zope-configuration/Manifest
@@ -1 +1,2 @@
 DIST zope.configuration-4.4.0.tar.gz 83230 BLAKE2B c33dd8cc8192965e3555f8063dbd55b47376696964248583c7479098d00339ec0a7caec8c11e66b9ce133880ba6c04dc8b790f03e18864dc361d3b5d5ed0ddfe SHA512 6383c8e19ddbde098a545b6f22b21eadc860980e8248d05c2e29832971c2060fcde6f5092425d12198e97851f0b7b5edb0b83cc6725cda433867762778c896f9
+DIST zope.configuration-4.4.1.tar.gz 83825 BLAKE2B 9cf55417710c364611f0548cd1249dfb61d16c4f1a5f8f3918b2f9f38ba9904698317b922dccf736ab83f2b9cdd2bb4f7ca7330cd311d00e8d48afbd29f9cd86 SHA512 61e3e5cc6220c3ef86881d49c09b208d12491a5d7f5d82810ff1713f68ff1657dfb505b511e78e86b39d204c4ff8bc687695ad8b2ed816b457b52f913c70669b
diff --git a/dev-python/zope-configuration/zope-configuration-4.4.1.ebuild b/dev-python/zope-configuration/zope-configuration-4.4.1.ebuild
new file mode 100644
index 000000000000..51537c8cda44
--- /dev/null
+++ b/dev-python/zope-configuration/zope-configuration-4.4.1.ebuild
@@ -0,0 +1,49 @@
+# 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} )
+
+inherit distutils-r1
+
+MY_PN=${PN/-/.}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Zope Configuration Architecture"
+HOMEPAGE="
+	https://pypi.org/project/zope.configuration/
+	https://github.com/zopefoundation/zope.configuration/
+	https://zopeconfiguration.readthedocs.io/en/latest/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="ZPL"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	dev-python/zope-i18nmessageid[${PYTHON_USEDEP}]
+	dev-python/zope-interface[${PYTHON_USEDEP}]
+	>=dev-python/zope-schema-4.9[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/manuel[${PYTHON_USEDEP}]
+		dev-python/zope-testing[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
+
+python_test() {
+	eunittest src
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	# remove .pth files since dev-python/namespace-zope handles the ns
+	find "${D}" -name '*.pth' -delete || die
+}