Adding metadata

54 files changed, 654 insertions, 130 deletions

diff --git a/dev-python/appdirs/appdirs-1.4.4-r2.ebuild b/dev-python/appdirs/appdirs-1.4.4-r2.ebuild
index 01ca661b0b5c..f477d79ad32f 100644
--- a/dev-python/appdirs/appdirs-1.4.4-r2.ebuild
+++ b/dev-python/appdirs/appdirs-1.4.4-r2.ebuild
@@ -33,5 +33,5 @@ src_configure() {
 }
 
 python_test() {
-	"${PYTHON}" test/test_api.py -v || die "Tests fail with ${EPYTHON}"
+	"${EPYTHON}" test/test_api.py -v || die "Tests fail with ${EPYTHON}"
 }
diff --git a/dev-python/attrs/attrs-21.4.0-r1.ebuild b/dev-python/attrs/attrs-21.4.0-r1.ebuild
new file mode 100644
index 000000000000..fc5839c4f37e
--- /dev/null
+++ b/dev-python/attrs/attrs-21.4.0-r1.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_{7,8,9,10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Attributes without boilerplate"
+HOMEPAGE="
+	https://github.com/python-attrs/attrs/
+	https://attrs.readthedocs.io/
+	https://pypi.org/project/attrs/
+"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="
+	dev-python/zope-interface[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		$(python_gen_impl_dep sqlite)
+		$(python_gen_cond_dep '
+			dev-python/cloudpickle[${PYTHON_USEDEP}]
+		' python3_{8..10})
+		>=dev-python/hypothesis-3.6.0[${PYTHON_USEDEP}]
+		>=dev-python/pytest-4.3.0[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=()
+	[[ ${EPYTHON} == python3.11 ]] && EPYTEST_DESELECT+=(
+		# https://github.com/python-attrs/attrs/issues/907
+		tests/test_annotations.py::TestAnnotations::test_auto_attribs
+		tests/test_annotations.py::TestAnnotations::test_annotations_strings
+		'tests/test_init_subclass.py::test_init_subclass_vanilla[True]'
+		tests/test_make.py::TestAutoDetect::test_detects_setstate_getstate
+		tests/test_slots.py::TestClosureCellRewriting::test_closure_cell_rewriting
+		tests/test_slots.py::TestClosureCellRewriting::test_inheritance
+		'tests/test_slots.py::TestClosureCellRewriting::test_cls_static[True]'
+		tests/test_slots.py::TestPickle::test_no_getstate_setstate_for_dict_classes
+		tests/test_slots.py::TestPickle::test_no_getstate_setstate_if_option_false
+		tests/test_slots.py::test_slots_super_property_get_shurtcut
+	)
+
+	epytest
+}
diff --git a/dev-python/babelfont/babelfont-2.0.2.ebuild b/dev-python/babelfont/babelfont-2.0.2.ebuild
index 8a8c91887690..6ad44e80f1fc 100644
--- a/dev-python/babelfont/babelfont-2.0.2.ebuild
+++ b/dev-python/babelfont/babelfont-2.0.2.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
 DESCRIPTION="Interrogate and manipulate UFO, TTF and OTF fonts with a common interface"
 HOMEPAGE="https://github.com/simoncozens/babelfont"
 SRC_URI="https://github.com/simoncozens/babelfont/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64"
 LICENSE="MIT"
 SLOT="0"
 
diff --git a/dev-python/babelfont/babelfont-3.0.0_alpha8.ebuild b/dev-python/babelfont/babelfont-3.0.0_alpha8.ebuild
index 7df8864cbc9d..7dcb3ee34d86 100644
--- a/dev-python/babelfont/babelfont-3.0.0_alpha8.ebuild
+++ b/dev-python/babelfont/babelfont-3.0.0_alpha8.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MYP}.tar.gz"
 S="${WORKDIR}/${MYP}"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64"
 LICENSE="MIT"
 SLOT="0"
 
diff --git a/dev-python/celery/Manifest b/dev-python/celery/Manifest
index dd1ff1e6e13a..ef4f9c17e8cd 100644
--- a/dev-python/celery/Manifest
+++ b/dev-python/celery/Manifest
@@ -1 +1 @@
-DIST celery-5.1.1.tar.gz 1471516 BLAKE2B bfdabf255cffa19deb80607c3a2063b6dd8c56a803a991453b8b07914e75630fee9d189ccb8e6be1f7e88e43fb22d31353968ffea222d75a7b7765ec3a5148b5 SHA512 b50fe494ec8346b5a90236536dbc809341b4b2328c1a2b7485210fb88cd5d8142f3e53b40c6b49e9e495eecaca1abcec2000f2af6d2f2bd719265410802eb572
+DIST celery-5.2.6.tar.gz 1490948 BLAKE2B 1470b74b5d9345ddbb466ec83e684c71fd999fb9671be8a99c795d82ee53a45a5ec5e5c383104933ef2359b655043c408eef8de7dce7c5327a42b7d978a0b711 SHA512 80565cee3ac20a4a28e64582bd2a8cd807980447254d5cbad41c9954a012c025c402c5113d9610f879e74bf170ae7e3c70b5a3ace7228ae510feee380b9b48f9
diff --git a/dev-python/celery/celery-5.1.1.ebuild b/dev-python/celery/celery-5.2.6.ebuild
index 4116f9e929cc..0f58fd433542 100644
--- a/dev-python/celery/celery-5.1.1.ebuild
+++ b/dev-python/celery/celery-5.2.6.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI=8
 
-DISTUTILS_USE_SETUPTOOLS=rdepend
+DISTUTILS_USE_PEP517=setuptools
 MYPV="${PV/_beta/b}"
 PYTHON_COMPAT=( python3_{7,8,9,10} )
 
@@ -17,6 +17,7 @@ HOMEPAGE="
 "
 SRC_URI="https://github.com/celery/celery/archive/v${MYPV}.tar.gz -> ${P}.tar.gz"
 S="${WORKDIR}/${PN}-${MYPV}"
+
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64"
@@ -28,16 +29,9 @@ RESTRICT="test" # 'celery' not found in `markers` configuration option
 RDEPEND="
 	>=dev-python/billiard-3.6.4.0[${PYTHON_USEDEP}]
 	<dev-python/billiard-4.0.0[${PYTHON_USEDEP}]
-	>=dev-python/click-7[${PYTHON_USEDEP}]
-	<dev-python/click-8[${PYTHON_USEDEP}]
-	>=dev-python/click-didyoumean-0.0.3[${PYTHON_USEDEP}]
-	>=dev-python/click-plugins-1.1.1[${PYTHON_USEDEP}]
-	>=dev-python/click-repl-0.1.6[${PYTHON_USEDEP}]
-	<dev-python/kombu-6.0[${PYTHON_USEDEP}]
-	>=dev-python/kombu-5[${PYTHON_USEDEP}]
+	<dev-python/kombu-6.0.0[${PYTHON_USEDEP}]
+	>=dev-python/kombu-5.2.1[${PYTHON_USEDEP}]
 	dev-python/pytz[${PYTHON_USEDEP}]
-	>=dev-python/vine-5[${PYTHON_USEDEP}]
-	<dev-python/vine-6[${PYTHON_USEDEP}]
 "
 DEPEND="
 	${RDEPEND}
diff --git a/dev-python/etcd3gw/Manifest b/dev-python/etcd3gw/Manifest
index 03bc566fcf29..7218e6348255 100644
--- a/dev-python/etcd3gw/Manifest
+++ b/dev-python/etcd3gw/Manifest
@@ -1,2 +1,2 @@
-DIST etcd3gw-1.0.0.tar.gz 27035 BLAKE2B 5ad3dfb1b08388f4d73fc9e857d7e7610672cfde8aa0de55eb7bf6a50dd58a937fbabea19c31ebef5a9f7181f96447ad1d381e2724f6a10be589447fcedbaec1 SHA512 d1aac81ebd221277c03bbb0f5dd76bb7c99a52132113959cf397fd44a598ade77300d506e2e5cfa04864cfd6a16f40ea8ddd350a4763a30609d8d922224c78ac
 DIST etcd3gw-1.0.1.tar.gz 27309 BLAKE2B dbc2c4cc76b6602d5d631609fed49dd556c86f763d4d59f14d7d514f0e7fb43ea94e5841883b9eacfa599ec0c7bb09797496017b51b23b362dd3b1bfd42b447e SHA512 d90b69afd64f023cd16e5f9ac31c61e285887db9f364ebcf176dae56b02e4e9f7b05713d358cebde3a3d8769896a768499f99945e34d015a73634251c28b31fe
+DIST etcd3gw-1.0.2.tar.gz 27345 BLAKE2B e529525cbd60fffa1b0bf3ea83f14fcda6ba5a88a666b4f06a2ea66c76c809a00371b998477594f9bce5943047dfa6051efae6d75c2876046297015f2e43ee74 SHA512 dbdf61d0f19d730993fd61270fbe76838e3aa027ef1059f0083a1dd6071dd66eea99bbd4807884b91209c8eee262a5143e67aebf309175b43fd7aa1d94beca82
diff --git a/dev-python/etcd3gw/etcd3gw-1.0.0.ebuild b/dev-python/etcd3gw/etcd3gw-1.0.2.ebuild
index ee3687a4f3dc..33f57d35560b 100644
--- a/dev-python/etcd3gw/etcd3gw-1.0.0.ebuild
+++ b/dev-python/etcd3gw/etcd3gw-1.0.2.ebuild
@@ -8,7 +8,10 @@ PYTHON_COMPAT=( python3_{7,8,9,10} )
 inherit distutils-r1
 
 DESCRIPTION="A python client for etcd3 grpc-gateway v3 API"
-HOMEPAGE="https://pypi.org/project/etcd3gw/"
+HOMEPAGE="
+	https://opendev.org/openstack/etcd3gw
+	https://pypi.org/project/etcd3gw/
+"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
@@ -16,14 +19,12 @@ SLOT="0"
 KEYWORDS="~amd64"
 
 RDEPEND="
-	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/pbr-2.0[${PYTHON_USEDEP}]
 	>=dev-python/requests-2.20.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
 	>=dev-python/futurist-0.16.0[${PYTHON_USEDEP}]
 "
 DEPEND="
 	${RDEPEND}
-	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
 	test? (
 		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
 		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
diff --git a/dev-python/execnet/execnet-1.9.0-r1.ebuild b/dev-python/execnet/execnet-1.9.0-r1.ebuild
new file mode 100644
index 000000000000..7be2ea03bedf
--- /dev/null
+++ b/dev-python/execnet/execnet-1.9.0-r1.ebuild
@@ -0,0 +1,46 @@
+# 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} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Rapid multi-Python deployment"
+HOMEPAGE="
+	https://codespeak.net/execnet/
+	https://pypi.org/project/execnet/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+"
+
+distutils_enable_sphinx doc
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# needs python2.7 with apipkg?
+	'testing/test_termination.py::test_close_initiating_remote_no_error[python2.7]'
+	# tries to run python2
+	testing/test_channel.py::TestStringCoerce::test_3to2
+	testing/test_gateway.py::TestStringCoerce::test_3to2
+	# does not like Gentoo defaults
+	testing/test_gateway.py::TestPopenGateway::test_dont_write_bytecode
+	# almost all tests call py2, not worth filtering for the rest
+	testing/test_serializer.py
+)
+
+python_prepare_all() {
+	sed -i -r 's:(,[[:space:]]*|)"eventlet":: ; s:(,[[:space:]]*|)"gevent"(,|)::' \
+		testing/conftest.py || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/filelock/filelock-3.6.0.ebuild b/dev-python/filelock/filelock-3.6.0.ebuild
index b9012616a68d..f6bc26d1e8af 100644
--- a/dev-python/filelock/filelock-3.6.0.ebuild
+++ b/dev-python/filelock/filelock-3.6.0.ebuild
@@ -12,10 +12,12 @@ MY_P=py-filelock-${PV}
 DESCRIPTION="A platform independent file lock for Python"
 HOMEPAGE="
 	https://github.com/tox-dev/py-filelock/
-	https://pypi.org/project/filelock/"
+	https://pypi.org/project/filelock/
+"
 SRC_URI="
 	https://github.com/tox-dev/py-filelock/archive/${PV}.tar.gz
-		-> ${MY_P}.tar.gz"
+		-> ${MY_P}.tar.gz
+"
 S="${WORKDIR}/${MY_P}"
 
 LICENSE="Unlicense"
@@ -23,7 +25,10 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 BDEPEND="
-	test? ( dev-python/pytest-timeout[${PYTHON_USEDEP}] )"
+	test? (
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+	)
+"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/fontFeatures/Manifest b/dev-python/fontFeatures/Manifest
index 346796d56428..2b6429c494d3 100644
--- a/dev-python/fontFeatures/Manifest
+++ b/dev-python/fontFeatures/Manifest
@@ -1 +1,2 @@
 DIST fontFeatures-1.6.4.tar.gz 1236722 BLAKE2B 0efcda0175de36d5e3d78c02fc6e835f3f39a14e6d050340d23dbf391ecf6cee9385822e8a005ed45d783bb467f25b087c1b473f4af1186dff98d7d9502c6b4e SHA512 fef775845b1d6dbd2b81a7f44429586ba63bdbcc3f2a5124e4dda41e8af62ac81b143e6d7e1443c3bb90e12f7f592b512bcd90bcbdc18e5eb07de195956cc196
+DIST fontFeatures-1.7.0.tar.gz 1237478 BLAKE2B dadc4ce4b43cfbea246169f6df8f3d0d63382f1ffb65cf6c325581079b52053c0c2f419c4e153c1c9bbed06db598e94a61b0b06bc49298565918c77750296661 SHA512 80977f36d6b0ad4ed8fd320b7b2ecd1fc47ce2703300cf3b47071cb8e31f3d756a07270a5c34edff8d59a97c58e3ff45107fc19958a60a384041c106c68731f9
diff --git a/dev-python/fontFeatures/fontFeatures-1.7.0.ebuild b/dev-python/fontFeatures/fontFeatures-1.7.0.ebuild
new file mode 100644
index 000000000000..477de329b80d
--- /dev/null
+++ b/dev-python/fontFeatures/fontFeatures-1.7.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python library for manipulating OpenType font features"
+HOMEPAGE="https://github.com/simoncozens/fontFeatures"
+SRC_URI="https://github.com/simoncozens/fontFeatures/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND="
+	dev-python/fs[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	>=dev-python/fonttools-4.28.0[${PYTHON_USEDEP}]
+	>=dev-python/glyphtools-0.7.0[${PYTHON_USEDEP}]
+	>=dev-python/beziers-0.1.0[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	test? (
+		>=dev-python/youseedee-0.3.0[${PYTHON_USEDEP}]
+		>=dev-python/babelfont-3.0.0_alpha1[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/glyphsLib/Manifest b/dev-python/glyphsLib/Manifest
index 8e6df9be60d3..3903580d8519 100644
--- a/dev-python/glyphsLib/Manifest
+++ b/dev-python/glyphsLib/Manifest
@@ -1,2 +1,2 @@
-DIST glyphsLib-5.3.2.zip 960327 BLAKE2B 505d14a1e4e4a5cf8e3ea9edb1ed4fd384cc4e5d0bf6874904d45ba227f53202556076e84f3cc68a7b40354c128f71733233c1a95ea66040e0693779c5da38c7 SHA512 fbb09d666cda404a02908cf6b782a2fc986774bd490960bc71bc225260904ea284800018a4b7e326122cc226bdbe5aa9718072e8eeac019eb05c1195c535778a
 DIST glyphsLib-6.0.4.tar.gz 31130361 BLAKE2B c53cc57bc001e2a5c0cc229db36767cc240659325cbb0f471c91de54adc805d73a794bb91b8e73400261ccb5ccc79c939b77f5a2fd5fc50a8c30fdc6ea9eb053 SHA512 782dfcccfb29d44c492aed790d8f52d670f4ef36e2285390e47bc799c37aec8037b6c717c923234d2bc43e2132f16a27c70c0448b594b8f64ad1af91bcbc840e
+DIST glyphsLib-6.0.5.tar.gz 31132348 BLAKE2B 7c4dbaac9db5142421e9b9785f363f6a8af3923f62b2c635d22072ce7a60a3c775371d7c1f75410509bb072e81cb1922e4d294fa2eb4b68c5fd67859c949f058 SHA512 71c371fac446f313c373923d3fcd675e3007ab9ffddf7bb0540a305c6412fcfccc7be90208398e8238d4774b40488b819517cbf170b789ad276168ac416b9c06
diff --git a/dev-python/glyphsLib/glyphsLib-5.3.2-r1.ebuild b/dev-python/glyphsLib/glyphsLib-6.0.5.ebuild
index e6b40bb6d0bc..03a82d9072ad 100644
--- a/dev-python/glyphsLib/glyphsLib-5.3.2-r1.ebuild
+++ b/dev-python/glyphsLib/glyphsLib-6.0.5.ebuild
@@ -3,28 +3,34 @@
 
 EAPI=8
 
+DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{7,8,9,10} )
 
 inherit distutils-r1
 
 DESCRIPTION="A library to provide a bridge from Glyphs source files to UFOs"
 HOMEPAGE="https://github.com/googlefonts/glyphsLib"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
+SRC_URI="https://github.com/googlefonts/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0 MIT"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64"
 SLOT="0"
 
 RDEPEND="
-	>=dev-python/fonttools-4.14[${PYTHON_USEDEP}]
-	>=dev-python/ufoLib2-0.8[${PYTHON_USEDEP}]
+	>=dev-python/fonttools-4.27.1[${PYTHON_USEDEP}]
+	>=dev-python/ufoLib2-0.6.2[${PYTHON_USEDEP}]
+	>=dev-python/openstep-plist-0.3.0[${PYTHON_USEDEP}]
+"
+DEPEND="
+	${RDEPEND}
+	>=dev-python/setuptools_scm-6.0[${PYTHON_USEDEP}]
+	dev-python/wheel[${PYTHON_USEDEP}]
 "
 BDEPEND="
-	app-arch/unzip
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
 	test? (
 		dev-python/defcon[${PYTHON_USEDEP}]
 		dev-python/ufoNormalizer[${PYTHON_USEDEP}]
+		dev-python/ufo2ft[${PYTHON_USEDEP}]
 		>=app-text/xmldiff-2.2[${PYTHON_USEDEP}]
 	)
 "
@@ -32,6 +38,6 @@ BDEPEND="
 distutils_enable_tests pytest
 
 python_prepare_all() {
-	sed -e '/\<wheel\>/d' -i setup.cfg
+	export SETUPTOOLS_SCM_PRETEND_VERSION="${PV}"
 	distutils-r1_python_prepare_all
 }
diff --git a/dev-python/glyphsets/Manifest b/dev-python/glyphsets/Manifest
index 3c868bebf9dd..46a4c9ed474d 100644
--- a/dev-python/glyphsets/Manifest
+++ b/dev-python/glyphsets/Manifest
@@ -1,2 +1,2 @@
-DIST glyphsets-0.3.1.tar.gz 1619668 BLAKE2B d09b07e46a444c55ab5e91b59fa4410af9d1ed0549fe401f4b1c353ed761794e849bd3e3eb61effe80916c63a062af22cd915ecf9cc4df22ea4305465b64870a SHA512 333bcf4aec9c0a78e7c02d4ef9985b053d84a7d7bdbb37adb785003b03184cd94fbe2f19197c76521db53e2220c8e1041480f5ffbef2a7153d3463279ab936d6
 DIST glyphsets-0.4.0.tar.gz 1666642 BLAKE2B a2efc708ca29296015794c8f2867eb242ffc96fcfc04a79afd1ccb0a43faa5f3f539aca8f485f5c6b688ac42613db55af8b3eeb740fda5659256a8d91c722bc2 SHA512 d7c66fe8ff328e625b95202d07347cf9e532f4f98c340d329c9cd2c69382184074a1f53a569b9ab6fdede994d42016c3a6c08265e09fefc1081864f24964d376
+DIST glyphsets-0.5.0.tar.gz 1473150 BLAKE2B d745b7689c9eee7cd1a25035d13f19d6eb6db7c8e603ecf87ed689f0cb2e2d1a421b4d5a4f08c7d470def2d5d8db7636a01941f3445579a0712f2ab506a9571a SHA512 94d6ab956a5ab16f061b57e5210ea59733486a27bde3093e8af279ac8f5f1e2efce71d5135ac7182ec027916e31d86433939e743084c405653250893d9221a02
diff --git a/dev-python/glyphsets/glyphsets-0.3.1.ebuild b/dev-python/glyphsets/glyphsets-0.5.0.ebuild
index 521e9189693a..521e9189693a 100644
--- a/dev-python/glyphsets/glyphsets-0.3.1.ebuild
+++ b/dev-python/glyphsets/glyphsets-0.5.0.ebuild
diff --git a/dev-python/guidata/Manifest b/dev-python/guidata/Manifest
index 9f6e393ad247..d5dde77f7066 100644
--- a/dev-python/guidata/Manifest
+++ b/dev-python/guidata/Manifest
@@ -1 +1 @@
-DIST guidata-1.7.9.tar.gz 325254 BLAKE2B 875ffe654fa3fb7fbb7d778d16c35053f8b2da6a69b2e5fd4a44599baa0f4eb3075e10856d906a3c345a25ec7c9f354d36817e1f1e4bc29c16371939acfb1f45 SHA512 65ae8a6fea96261fea534fd0dc42fdfe8f78c73008ffe34bb2d521b88860357196f4dd5f76d1a07290d7d3240e0f230c3d09c8ec14656071c59c90124da892db
+DIST guidata-2.1.1.tar.gz 512496 BLAKE2B 195a776167dc906e6ded3d2e43625fd2728332a260a8ae32e30664b8692b2a578f57315cc5aef2804ec24644e6024eb579c7a7c0977d499e6f7d20b143365e27 SHA512 2e7e99c4d0ad2379cd852148c623c8907021b4ca4637d0bbc9fab517926b1e47c4a5bb0f2f5e5c88c1e9ebb7b92faf2d2931a08f035f1aae1790043d103066db
diff --git a/dev-python/guidata/guidata-1.7.9.ebuild b/dev-python/guidata/guidata-2.1.1.ebuild
index 0510fa452c88..263b3f1412ec 100644
--- a/dev-python/guidata/guidata-1.7.9.ebuild
+++ b/dev-python/guidata/guidata-2.1.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=( python3_{7,8,9,10} )
 
diff --git a/dev-python/hypothesis/hypothesis-6.46.2.ebuild b/dev-python/hypothesis/hypothesis-6.46.2.ebuild
index 3a09d0951e80..790178ad93ef 100644
--- a/dev-python/hypothesis/hypothesis-6.46.2.ebuild
+++ b/dev-python/hypothesis/hypothesis-6.46.2.ebuild
@@ -39,6 +39,12 @@ BDEPEND="
 
 distutils_enable_tests pytest
 
+src_prepare() {
+	# unblock py3.11 betas
+	sed -i -e '/release.*alpha/d' tests/conftest.py || die
+	distutils-r1_src_prepare
+}
+
 python_test() {
 	# subtests are broken by warnings from random plugins
 	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
diff --git a/dev-python/iniconfig/iniconfig-1.1.1-r1.ebuild b/dev-python/iniconfig/iniconfig-1.1.1-r1.ebuild
new file mode 100644
index 000000000000..d74022f1b7f4
--- /dev/null
+++ b/dev-python/iniconfig/iniconfig-1.1.1-r1.ebuild
@@ -0,0 +1,26 @@
+# 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="Brain-dead simple config-ini parsing"
+HOMEPAGE="
+	https://github.com/pytest-dev/iniconfig/
+	https://pypi.org/project/iniconfig/
+"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/jaraco-classes/jaraco-classes-3.2.1-r1.ebuild b/dev-python/jaraco-classes/jaraco-classes-3.2.1-r1.ebuild
new file mode 100644
index 000000000000..0eb3935f21ee
--- /dev/null
+++ b/dev-python/jaraco-classes/jaraco-classes-3.2.1-r1.ebuild
@@ -0,0 +1,31 @@
+# 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} pypy3 )
+
+inherit distutils-r1
+
+MY_P="${P/-/.}"
+DESCRIPTION="Classes used by other projects by developer jaraco"
+HOMEPAGE="
+	https://github.com/jaraco/jaraco.classes/
+	https://pypi.org/project/jaraco.classes/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN/-/.}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+"
+
+distutils_enable_sphinx docs \
+	">=dev-python/jaraco-packaging-3.2" \
+	">=dev-python/rst-linker-1.9"
+distutils_enable_tests pytest
diff --git a/dev-python/mock/mock-4.0.3-r1.ebuild b/dev-python/mock/mock-4.0.3-r1.ebuild
new file mode 100644
index 000000000000..61a3042e5684
--- /dev/null
+++ b/dev-python/mock/mock-4.0.3-r1.ebuild
@@ -0,0 +1,40 @@
+# 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} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Rolling backport of unittest.mock for all Pythons"
+HOMEPAGE="
+	https://github.com/testing-cabal/mock/
+	https://pypi.org/project/mock/
+"
+SRC_URI="
+	https://github.com/testing-cabal/mock/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+
+RDEPEND="
+	>=dev-python/six-1.9[${PYTHON_USEDEP}]
+"
+BDEPEND=${RDEPEND}
+
+PATCHES=(
+	"${FILESDIR}"/${P}-py310.patch
+)
+
+distutils_enable_tests pytest
+
+python_install_all() {
+	local DOCS=( CHANGELOG.rst README.rst )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/nspektr/nspektr-0.3.0.ebuild b/dev-python/nspektr/nspektr-0.3.0.ebuild
index 6f4fd814b979..af7a4a168ddc 100644
--- a/dev-python/nspektr/nspektr-0.3.0.ebuild
+++ b/dev-python/nspektr/nspektr-0.3.0.ebuild
@@ -32,14 +32,15 @@ RDEPEND="
 		>=dev-python/importlib_metadata-4.11.2[${PYTHON_USEDEP}]
 	' 3.8 3.9)
 "
-BDEPEND="
-	test? (
-		dev-python/pip[${PYTHON_USEDEP}]
-	)
-"
 
 distutils_enable_tests pytest
 
+src_prepare() {
+	# avoid unnecessary test dep on pip
+	sed -i -e 's:pip:pytest:' nspektr/__init__.py || die
+	distutils-r1_src_prepare
+}
+
 src_configure() {
 	grep -q 'build-backend = "setuptools' pyproject.toml ||
 		die "Upstream changed build-backend, recheck"
diff --git a/dev-python/ordered-set/ordered-set-4.1.0.ebuild b/dev-python/ordered-set/ordered-set-4.1.0.ebuild
index 388bbfcdd6ea..dfc0f7e97f73 100644
--- a/dev-python/ordered-set/ordered-set-4.1.0.ebuild
+++ b/dev-python/ordered-set/ordered-set-4.1.0.ebuild
@@ -6,6 +6,7 @@ EAPI=7
 
 DISTUTILS_USE_PEP517=flit
 PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
+
 inherit distutils-r1
 
 DESCRIPTION="A mutable set that remembers the order of its entries"
diff --git a/dev-python/osprofiler/Manifest b/dev-python/osprofiler/Manifest
index 17f011c1aef0..576cd88b33c0 100644
--- a/dev-python/osprofiler/Manifest
+++ b/dev-python/osprofiler/Manifest
@@ -1 +1 @@
-DIST osprofiler-3.4.2.tar.gz 90651 BLAKE2B ab7fdfd84126b877c3a1767166c6e80953b25e026427a7075bd83dd6272d966882ed3be83c176fce200d61a9bec88ef6d2772189842413bb250ace71e53ba639 SHA512 2127b867e2b731fe81efa3b8ea64d22426bbff04478aefe879203cfce86202fff0116d555dd100562a405edf5820a37e3afd97809968c213991c0d19bde41fbc
+DIST osprofiler-3.4.3.tar.gz 90967 BLAKE2B 1f6a00473797dee20c65000d2100845d3e02f5a4d8e4e3bfb135b684e5c2e0dfdde44e5c48e02d594e8486201181022ef17c70ec8dd42ce26615cc035120f463 SHA512 b34d3d22fa4c6077c50de9976dcd09b099385ba52ef873475f34ecf784b769533d066160afe3bc54cd99af99547bf3065a3bc01bce84e37998724377ccd30b0e
diff --git a/dev-python/osprofiler/osprofiler-3.4.2.ebuild b/dev-python/osprofiler/osprofiler-3.4.3.ebuild
index 5eaa2bfe8289..5eaa2bfe8289 100644
--- a/dev-python/osprofiler/osprofiler-3.4.2.ebuild
+++ b/dev-python/osprofiler/osprofiler-3.4.3.ebuild
diff --git a/dev-python/packaging/packaging-21.3-r2.ebuild b/dev-python/packaging/packaging-21.3-r2.ebuild
index d15293d757ea..0e25f4c169ab 100644
--- a/dev-python/packaging/packaging-21.3-r2.ebuild
+++ b/dev-python/packaging/packaging-21.3-r2.ebuild
@@ -6,6 +6,7 @@ EAPI=7
 
 DISTUTILS_USE_PEP517=flit
 PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
+
 inherit distutils-r1
 
 DESCRIPTION="Core utilities for Python packages"
diff --git a/dev-python/pexpect/files/pexpect-4.8.0-py311.patch b/dev-python/pexpect/files/pexpect-4.8.0-py311.patch
new file mode 100644
index 000000000000..b7de17a68785
--- /dev/null
+++ b/dev-python/pexpect/files/pexpect-4.8.0-py311.patch
@@ -0,0 +1,67 @@
+From 52af5b0ae0627139524448a3f2e83d9f40802bc2 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
+Date: Thu, 24 Mar 2022 15:15:33 +0100
+Subject: [PATCH] Convert @asyncio.coroutine to async def
+
+This is required for Python 3.11+ support.
+
+Fixes https://github.com/pexpect/pexpect/issues/677
+---
+ pexpect/_async.py | 16 +++++++---------
+ 1 file changed, 7 insertions(+), 9 deletions(-)
+
+diff --git a/pexpect/_async.py b/pexpect/_async.py
+index dfbfeef5..bc83261d 100644
+--- a/pexpect/_async.py
++++ b/pexpect/_async.py
+@@ -4,8 +4,7 @@
+ 
+ from pexpect import EOF
+ 
+-@asyncio.coroutine
+-def expect_async(expecter, timeout=None):
++async def expect_async(expecter, timeout=None):
+     # First process data that was previously read - if it maches, we don't need
+     # async stuff.
+     idx = expecter.existing_data()
+@@ -14,7 +13,7 @@ def expect_async(expecter, timeout=None):
+     if not expecter.spawn.async_pw_transport:
+         pw = PatternWaiter()
+         pw.set_expecter(expecter)
+-        transport, pw = yield from asyncio.get_event_loop()\
++        transport, pw = await asyncio.get_event_loop()\
+             .connect_read_pipe(lambda: pw, expecter.spawn)
+         expecter.spawn.async_pw_transport = pw, transport
+     else:
+@@ -22,26 +21,25 @@ def expect_async(expecter, timeout=None):
+         pw.set_expecter(expecter)
+         transport.resume_reading()
+     try:
+-        return (yield from asyncio.wait_for(pw.fut, timeout))
++        return (await asyncio.wait_for(pw.fut, timeout))
+     except asyncio.TimeoutError as e:
+         transport.pause_reading()
+         return expecter.timeout(e)
+ 
+-@asyncio.coroutine
+-def repl_run_command_async(repl, cmdlines, timeout=-1):
++async def repl_run_command_async(repl, cmdlines, timeout=-1):
+     res = []
+     repl.child.sendline(cmdlines[0])
+     for line in cmdlines[1:]:
+-        yield from repl._expect_prompt(timeout=timeout, async_=True)
++        await repl._expect_prompt(timeout=timeout, async_=True)
+         res.append(repl.child.before)
+         repl.child.sendline(line)
+ 
+     # Command was fully submitted, now wait for the next prompt
+-    prompt_idx = yield from repl._expect_prompt(timeout=timeout, async_=True)
++    prompt_idx = await repl._expect_prompt(timeout=timeout, async_=True)
+     if prompt_idx == 1:
+         # We got the continuation prompt - command was incomplete
+         repl.child.kill(signal.SIGINT)
+-        yield from repl._expect_prompt(timeout=1, async_=True)
++        await repl._expect_prompt(timeout=1, async_=True)
+         raise ValueError("Continuation prompt found - input was incomplete:")
+     return u''.join(res + [repl.child.before])
+ 
diff --git a/dev-python/pexpect/pexpect-4.8.0-r3.ebuild b/dev-python/pexpect/pexpect-4.8.0-r3.ebuild
index f13b4f9ce999..73fe4bd190e0 100644
--- a/dev-python/pexpect/pexpect-4.8.0-r3.ebuild
+++ b/dev-python/pexpect/pexpect-4.8.0-r3.ebuild
@@ -29,6 +29,7 @@ RDEPEND="
 PATCHES=(
 	"${FILESDIR}"/${P}-sphinx-3.patch
 	"${FILESDIR}"/${P}-fix-PS1.patch
+	"${FILESDIR}"/${P}-py311.patch
 )
 
 distutils_enable_tests pytest
diff --git a/dev-python/pluggy/Manifest b/dev-python/pluggy/Manifest
index 37992c1d2beb..8bceab03d73b 100644
--- a/dev-python/pluggy/Manifest
+++ b/dev-python/pluggy/Manifest
@@ -1,2 +1 @@
-DIST pluggy-0.13.1.tar.gz 57962 BLAKE2B aa0a3eec06c988a727bc15511313f12a08bde65da55bcc5e7547a654e3ca8a34c12dfa72166b6a37b524972730f08454b6a0446e071d2710396e868ae3a77151 SHA512 eb747ff341cedacbd90eb20e22ad3d1ddf5588056f14d069f56331f4141a15b7eccaee23ea196d2f4906964ddb77a79b156bbf3ef8c8083e9952c55d13d55f3e
 DIST pluggy-1.0.0.tar.gz 51510 BLAKE2B 8107df9a91a843166a602e7518dd1d4167304464a8cc80180b60b03a2ac803be9b1ba190df9189907addd34a92b93a6b271d3d6b7485aa563203ce733c6a656c SHA512 cf0bcbb4330c24ce473614befa19548f33fb39fa0ad094e1eae786202d7adadc28e16499f80ab96b630091765404ca5c5b6f9a55bc605e03514d8ab50cf9ae00
diff --git a/dev-python/pluggy/files/pluggy-0.12.0-strip-setuptools_scm.patch b/dev-python/pluggy/files/pluggy-0.12.0-strip-setuptools_scm.patch
deleted file mode 100644
index 6de5905f1103..000000000000
--- a/dev-python/pluggy/files/pluggy-0.12.0-strip-setuptools_scm.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From dc8f1f4371f20ce0f635b46ab0976d6d76ca0c26 Mon Sep 17 00:00:00 2001
-From: Georgy Yakovlev <gyakovlev@gentoo.org>
-Date: Thu, 25 Jul 2019 18:18:59 -0700
-Subject: [PATCH] strip setuptools_scm
-
----
- setup.py | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index 0f26fa0..9194143 100644
---- a/setup.py
-+++ b/setup.py
-@@ -1,4 +1,5 @@
- from setuptools import setup
-+import os
- 
- classifiers = [
-     "Development Status :: 4 - Beta",
-@@ -23,14 +24,16 @@ with open("README.rst", "rb") as fd:
- with open("CHANGELOG.rst", "rb") as fd:
-     long_description += "\n\n" + fd.read().decode("utf-8")
- 
-+with open("src/pluggy/_version.py", 'wt') as fp:
-+    fp.write('version = "{}"'.format(os.environ['PV']))
-+
- 
- def main():
-     setup(
-         name="pluggy",
-         description="plugin and hook calling mechanisms for python",
-         long_description=long_description,
--        use_scm_version={"write_to": "src/pluggy/_version.py"},
--        setup_requires=["setuptools-scm"],
-+        version=os.environ['PV'],
-         license="MIT license",
-         platforms=["unix", "linux", "osx", "win32"],
-         author="Holger Krekel",
--- 
-2.22.0
-
diff --git a/dev-python/pluggy/pluggy-0.13.1-r2.ebuild b/dev-python/pluggy/pluggy-0.13.1-r2.ebuild
deleted file mode 100644
index ac4203620748..000000000000
--- a/dev-python/pluggy/pluggy-0.13.1-r2.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="plugin and hook calling mechanisms for python"
-HOMEPAGE="https://pluggy.readthedocs.io/ https://github.com/pytest-dev/pluggy https://pypi.org/project/pluggy/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-PATCHES=( "${FILESDIR}/${PN}"-0.12.0-strip-setuptools_scm.patch )
-
-distutils_enable_tests pytest
diff --git a/dev-python/pluggy/pluggy-1.0.0-r2.ebuild b/dev-python/pluggy/pluggy-1.0.0-r2.ebuild
new file mode 100644
index 000000000000..e226dc2bf04e
--- /dev/null
+++ b/dev-python/pluggy/pluggy-1.0.0-r2.ebuild
@@ -0,0 +1,27 @@
+# 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} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Plugin and hook calling mechanisms for Python"
+HOMEPAGE="
+	https://pluggy.readthedocs.io/
+	https://github.com/pytest-dev/pluggy/
+	https://pypi.org/project/pluggy/
+"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pretend/pretend-1.0.9-r2.ebuild b/dev-python/pretend/pretend-1.0.9-r2.ebuild
new file mode 100644
index 000000000000..ab334af09dd7
--- /dev/null
+++ b/dev-python/pretend/pretend-1.0.9-r2.ebuild
@@ -0,0 +1,25 @@
+# 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} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A library for stubbing in Python"
+HOMEPAGE="
+	https://github.com/alex/pretend/
+	https://pypi.org/project/pretend/
+"
+SRC_URI="
+	https://github.com/alex/pretend/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+distutils_enable_tests pytest
diff --git a/dev-python/psutil/psutil-5.9.0.ebuild b/dev-python/psutil/psutil-5.9.0.ebuild
index 2a3c2cfe4f2d..668e660dded2 100644
--- a/dev-python/psutil/psutil-5.9.0.ebuild
+++ b/dev-python/psutil/psutil-5.9.0.ebuild
@@ -23,11 +23,6 @@ PATCHES=(
 )
 
 python_test() {
-	if [[ ${EPYTHON} == pypy* ]]; then
-		ewarn "Not running tests on ${EPYTHON} since they are broken"
-		return 0
-	fi
-
 	# since we are running in an environment a bit similar to CI,
 	# let's skip the tests that are disable for CI
 	local -x TRAVIS=1
diff --git a/dev-python/py/py-1.11.0-r1.ebuild b/dev-python/py/py-1.11.0-r1.ebuild
index 262e92140f5c..be6ca6bfce4b 100644
--- a/dev-python/py/py-1.11.0-r1.ebuild
+++ b/dev-python/py/py-1.11.0-r1.ebuild
@@ -5,10 +5,15 @@ EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
+
 inherit distutils-r1
 
 DESCRIPTION="library with cross-python path, ini-parsing, io, code, log facilities"
-HOMEPAGE="https://py.readthedocs.io/ https://pypi.org/project/py/"
+HOMEPAGE="
+	https://py.readthedocs.io/
+	https://github.com/pytest-dev/py/
+	https://pypi.org/project/py/
+"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/pymongo/pymongo-4.1.1.ebuild b/dev-python/pymongo/pymongo-4.1.1.ebuild
index 5c3aa7d6f052..c17ee83889d1 100644
--- a/dev-python/pymongo/pymongo-4.1.1.ebuild
+++ b/dev-python/pymongo/pymongo-4.1.1.ebuild
@@ -18,7 +18,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~hppa ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~hppa ~riscv x86"
 IUSE="doc kerberos"
 
 RDEPEND="
diff --git a/dev-python/pytest-forked/pytest-forked-1.4.0-r1.ebuild b/dev-python/pytest-forked/pytest-forked-1.4.0-r1.ebuild
new file mode 100644
index 000000000000..cdbb50ccd490
--- /dev/null
+++ b/dev-python/pytest-forked/pytest-forked-1.4.0-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="run tests in isolated forked subprocesses"
+HOMEPAGE="
+	https://pypi.org/project/pytest-forked/
+	https://github.com/pytest-dev/pytest-forked/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+# Please do not RDEPEND on pytest; this package won't do anything
+# without pytest installed, and there is no reason to force older
+# implementations on pytest.
+RDEPEND="
+	dev-python/py[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	epytest -p no:flaky
+}
diff --git a/dev-python/pytest-skip-markers/Manifest b/dev-python/pytest-skip-markers/Manifest
index 871b412ed285..2bc92351b980 100644
--- a/dev-python/pytest-skip-markers/Manifest
+++ b/dev-python/pytest-skip-markers/Manifest
@@ -1 +1,2 @@
 DIST pytest-skip-markers-1.2.0.tar.gz 79343 BLAKE2B 7f24b454fe19210d9ecadf10317a5a32830d722b64adbaf0fa6fad70a4c0cb598fa93b782a2b0f71bd23c4f91f2007d21383b488d725f61519d064e98ddd48f8 SHA512 76c1d0f0af7f7a56fa95d33bd5cb078792df3f054714d2ca1baa6d861e9404e2ec734a88a0768985388b1226c399ee6b54fe082ef7fcce6fc190fcae6201a416
+DIST pytest-skip-markers-1.3.0.tar.gz 79882 BLAKE2B 2c44711e6194aebf0a0299f8a50e6162a088023c2fff6bdb7c142060695a6977b1d4a5cc574199d8f11a5a94e413d7444f81d9e954327e8317ed1bcf3725a60f SHA512 bea602032a7796be7c2dad62ba750e987b77f04349c96f6f8e1f15f5d2b58c3ba1e549a775ce7e541f6041091a578def59900a726872c8aa8b31c585e3f0c3e0
diff --git a/dev-python/pytest-skip-markers/pytest-skip-markers-1.3.0.ebuild b/dev-python/pytest-skip-markers/pytest-skip-markers-1.3.0.ebuild
new file mode 100644
index 000000000000..aa0d897ab3a9
--- /dev/null
+++ b/dev-python/pytest-skip-markers/pytest-skip-markers-1.3.0.ebuild
@@ -0,0 +1,53 @@
+# 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="A Pytest plugin which implements a few useful skip markers"
+HOMEPAGE="
+	https://pytest-skip-markers.readthedocs.io/en/latest/
+	https://github.com/saltstack/pytest-skip-markers
+"
+SRC_URI="https://github.com/saltstack/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 x86"
+
+RDEPEND="
+	>=dev-python/pytest-6.0.0[${PYTHON_USEDEP}]
+	dev-python/attrs[${PYTHON_USEDEP}]
+	dev-python/pytest-tempdir[${PYTHON_USEDEP}]
+	dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}]
+	dev-python/pytest-system-statistics[${PYTHON_USEDEP}]
+	dev-python/pytest-shell-utilities[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	dev-python/pyzmq[${PYTHON_USEDEP}]
+	dev-python/msgpack[${PYTHON_USEDEP}]
+	dev-python/virtualenv[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/wheel[${PYTHON_USEDEP}]
+	dev-python/setuptools-declarative-requirements[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/pyfakefs[${PYTHON_USEDEP}]
+		dev-python/pytest-subtests[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	sed -e "s/use_scm_version=True/version='${PV}'/" -i setup.py || die
+	sed -e "/setuptools_scm/ d" -i setup.cfg || die
+	sed -e "s/tool.setuptools_scm/tool.disabled/" -i pyproject.toml || die
+
+	printf '__version__ = "${PV}"\n' > src/pytestskipmarkers/version.py || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/pytest-timeout/pytest-timeout-2.1.0.ebuild b/dev-python/pytest-timeout/pytest-timeout-2.1.0.ebuild
index 7271bcca6da9..acd90bfd9e1d 100644
--- a/dev-python/pytest-timeout/pytest-timeout-2.1.0.ebuild
+++ b/dev-python/pytest-timeout/pytest-timeout-2.1.0.ebuild
@@ -5,6 +5,7 @@ EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
+
 inherit distutils-r1
 
 DESCRIPTION="pytest plugin to abort hanging tests"
@@ -21,7 +22,9 @@ BDEPEND="
 	test? (
 		dev-python/pexpect[${PYTHON_USEDEP}]
 		!hppa? (
-			dev-python/pytest-cov[${PYTHON_USEDEP}]
+			$(python_gen_cond_dep '
+				dev-python/pytest-cov[${PYTHON_USEDEP}]
+			' python3_{8..10} pypy3)
 		)
 	)"
 
diff --git a/dev-python/pytest-xdist/pytest-xdist-2.5.0-r1.ebuild b/dev-python/pytest-xdist/pytest-xdist-2.5.0-r1.ebuild
new file mode 100644
index 000000000000..a13bed692773
--- /dev/null
+++ b/dev-python/pytest-xdist/pytest-xdist-2.5.0-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Distributed testing and loop-on-failing modes"
+HOMEPAGE="
+	https://pypi.org/project/pytest-xdist/
+	https://github.com/pytest-dev/pytest-xdist/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	dev-python/execnet[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	>=dev-python/pytest-6.2.0[${PYTHON_USEDEP}]
+	dev-python/pytest-forked[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/filelock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	# disable autoloading plugins in nested pytest calls
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	# since we disabled autoloading, force loading necessary plugins
+	local -x PYTEST_PLUGINS=xdist.plugin,xdist.looponfail,pytest_forked
+
+	epytest
+}
diff --git a/dev-python/pytest/pytest-7.1.2.ebuild b/dev-python/pytest/pytest-7.1.2.ebuild
index eda9eac18d04..93d4f1daeaaa 100644
--- a/dev-python/pytest/pytest-7.1.2.ebuild
+++ b/dev-python/pytest/pytest-7.1.2.ebuild
@@ -35,14 +35,16 @@ BDEPEND="
 	>=dev-python/setuptools_scm-6.2.3[${PYTHON_USEDEP}]
 	test? (
 		${RDEPEND}
-		dev-python/argcomplete[${PYTHON_USEDEP}]
-		>=dev-python/hypothesis-3.56[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		>=dev-python/pygments-2.7.2[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/xmlschema[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/argcomplete[${PYTHON_USEDEP}]
+			>=dev-python/hypothesis-3.56[${PYTHON_USEDEP}]
+			dev-python/mock[${PYTHON_USEDEP}]
+			dev-python/nose[${PYTHON_USEDEP}]
+			>=dev-python/pygments-2.7.2[${PYTHON_USEDEP}]
+			dev-python/pytest-xdist[${PYTHON_USEDEP}]
+			dev-python/requests[${PYTHON_USEDEP}]
+			dev-python/xmlschema[${PYTHON_USEDEP}]
+		' python3_{8..10} pypy3)
 	)
 "
 
@@ -54,6 +56,11 @@ src_test() {
 }
 
 python_test() {
+	if ! has "${EPYTHON}" python3.{8..10} pypy3; then
+		einfo "Skipping tests on ${EPYTHON}"
+		return
+	fi
+
 	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
 	local -x COLUMNS=80
 
diff --git a/dev-python/setuptools_scm/setuptools_scm-6.4.2.ebuild b/dev-python/setuptools_scm/setuptools_scm-6.4.2.ebuild
index bd1327678662..9f30d07d6ec2 100644
--- a/dev-python/setuptools_scm/setuptools_scm-6.4.2.ebuild
+++ b/dev-python/setuptools_scm/setuptools_scm-6.4.2.ebuild
@@ -27,7 +27,6 @@ RDEPEND="
 "
 BDEPEND="
 	test? (
-		>dev-python/virtualenv-20[${PYTHON_USEDEP}]
 		dev-vcs/git
 		!sparc? (
 			dev-vcs/mercurial
diff --git a/dev-python/six/six-1.16.0-r1.ebuild b/dev-python/six/six-1.16.0-r1.ebuild
new file mode 100644
index 000000000000..a4ec5472afc4
--- /dev/null
+++ b/dev-python/six/six-1.16.0-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python 2 and 3 compatibility library"
+HOMEPAGE="
+	https://github.com/benjaminp/six/
+	https://pypi.org/project/six/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+distutils_enable_sphinx documentation --no-autodoc
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=()
+	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
+		'test_six.py::test_move_items[dbm_ndbm]'
+	)
+
+	epytest
+}
diff --git a/dev-python/sortedcontainers/sortedcontainers-2.4.0-r1.ebuild b/dev-python/sortedcontainers/sortedcontainers-2.4.0-r1.ebuild
new file mode 100644
index 000000000000..aed19d74acb1
--- /dev/null
+++ b/dev-python/sortedcontainers/sortedcontainers-2.4.0-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
+
+inherit distutils-r1
+
+MY_P=python-${P}
+DESCRIPTION="Python library to sort collections and containers"
+HOMEPAGE="
+	https://www.grantjenks.com/docs/sortedcontainers/
+	https://github.com/grantjenks/python-sortedcontainers/
+	https://pypi.org/project/sortedcontainers/
+"
+SRC_URI="
+	https://github.com/grantjenks/python-sortedcontainers/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+distutils_enable_tests pytest
+
+python_test() {
+	epytest --ignore docs/conf.py
+}
diff --git a/dev-python/taskflow/Manifest b/dev-python/taskflow/Manifest
index 1dd355f22e3a..5731b781d910 100644
--- a/dev-python/taskflow/Manifest
+++ b/dev-python/taskflow/Manifest
@@ -1,2 +1,2 @@
-DIST taskflow-4.6.3.tar.gz 1076461 BLAKE2B 9a95bfb7f8ef7e06dbf90a29be202d7361f798e41af2700b8713d22e526612905471f4cf269f18f642d01a430f22d321cda981146b672a11ce8dc81b0479f849 SHA512 b024cccc04f8ad5f57515381d1175f4e1ad654fe8f345da1cf041035e40b0a91e0e81bf2203b4df33c5426276ea0b99afb83b6f0759f5fc7da469cc33e75d514
 DIST taskflow-4.6.4.tar.gz 1076719 BLAKE2B b202a6981deb9c9b6c86e9de740d44492a2028e0bd48ff9779e2db7f1ccb1076e5c4fa9195b0cdf5a8fb2af52a30e1ae8b6b3900a268f1b706b014f13df13cf8 SHA512 f8826e2d106123bc3d3c57826c2004c4aeaf17434931a660777ce2866dc659f82427c95bbf6e25459b2fb5ab303bb8ec11a898f53b4cb8b52f614965a56d298a
+DIST taskflow-4.7.0.tar.gz 1076831 BLAKE2B 5f0490ae2dbcea518ec00094a2f6c577734facf8f4e28cdddd52d10db52c1aa942dd9e86693b37444dfe5262b1fe298188966f040581b3c810186f31d9482c84 SHA512 2c57dc81b371ecaecbf8511ff91e4064fcb084a7f728a476a1b0270690844b7c46c006d2ac39583d5c081711900a07a3e90204232da71a5c329000cad1b3a186
diff --git a/dev-python/taskflow/taskflow-4.6.3.ebuild b/dev-python/taskflow/taskflow-4.7.0.ebuild
index 7b1ce783ffff..98d8359e1081 100644
--- a/dev-python/taskflow/taskflow-4.6.3.ebuild
+++ b/dev-python/taskflow/taskflow-4.7.0.ebuild
@@ -39,6 +39,8 @@ RDEPEND="${DEPEND}"
 BDEPEND="
 	test? (
 		>=dev-python/kazoo-2.6.0[${PYTHON_USEDEP}]
+		>=dev-python/zake-0.1.6[${PYTHON_USEDEP}]
+		>=dev-python/redis-py-2.10.0[${PYTHON_USEDEP}]
 		>=dev-python/kombu-4.3.0[${PYTHON_USEDEP}]
 		>=dev-python/eventlet-0.18.2[${PYTHON_USEDEP}]
 		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
diff --git a/dev-python/tomli/tomli-2.0.1.ebuild b/dev-python/tomli/tomli-2.0.1.ebuild
index eab9307f7d17..0b9cdc4e5993 100644
--- a/dev-python/tomli/tomli-2.0.1.ebuild
+++ b/dev-python/tomli/tomli-2.0.1.ebuild
@@ -12,12 +12,14 @@ inherit distutils-r1
 DESCRIPTION="A lil' TOML parser"
 HOMEPAGE="
 	https://pypi.org/project/tomli/
-	https://github.com/hukkin/tomli/"
+	https://github.com/hukkin/tomli/
+"
 SRC_URI="
 	https://github.com/hukkin/tomli/archive/${PV}.tar.gz
 		-> ${P}.gh.tar.gz
 	https://files.pythonhosted.org/packages/py3/${PN::1}/${PN}/${P}-py3-none-any.whl
-		-> ${P}-py3-none-any.whl.zip"
+		-> ${P}-py3-none-any.whl.zip
+"
 S=${WORKDIR}
 
 LICENSE="MIT"
@@ -25,7 +27,8 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-macos ~x64-macos ~x64-solaris"
 
 BDEPEND="
-	app-arch/unzip"
+	app-arch/unzip
+"
 
 distutils_enable_tests unittest
 
diff --git a/dev-python/tooz/Manifest b/dev-python/tooz/Manifest
index 08ee81f74b1c..023b35f152d5 100644
--- a/dev-python/tooz/Manifest
+++ b/dev-python/tooz/Manifest
@@ -1,2 +1,2 @@
-DIST tooz-2.10.1.tar.gz 95627 BLAKE2B 046ac561f235c54be4a7984fb8d4f9c55e59a19284c9a2565d4001e78c55bf79e0247669e544dd8f4d4d78a3874282da92fbec05f615b561740cf7246042ecd8 SHA512 c968561ea950e2da3be47c4bb1bdc2cb5e0de62ce7f9bf371f455185b0587085b8224a853a183a9b1a8d5221ed054fa0b80da29fb6bfb1ac88b9793476f9c87c
 DIST tooz-2.11.0.tar.gz 95997 BLAKE2B a61199586e58ec6bb63133137c91445df9c284a65b91125fa73e8c19efa37a5b5da039be94bc73b983f7a83dfa2b34d4d6cd7eb702823fa5eaca9429984fc323 SHA512 feb9217908bb986aeeffe92ae765b948edb1c1311eeb011b19b7bfdccb9b94dec82139e6056bbdbbffa79b208fc9ef22d1e100f75d6e9c61f7352dee3523ab8f
+DIST tooz-2.11.1.tar.gz 96028 BLAKE2B 638bddc4b06afc601b750f0da41fec9efde71ed6a36e7eb75a1d4e1d47efafa4d84975b686babb4f4bbe5e2bc3304c7db267b72fb1b16c41fcaf573bfc7e3039 SHA512 865a6bd944c949a3af63cd8f91641414c24e875bef89d8bacc3a4207109e605f3b1471ebc3192f2224c264773ea8e6d6229e5ce7a40b3c1ad2fc25a61ba14270
diff --git a/dev-python/tooz/tooz-2.10.1.ebuild b/dev-python/tooz/tooz-2.11.1.ebuild
index a683aadaaab0..d71469c658b5 100644
--- a/dev-python/tooz/tooz-2.10.1.ebuild
+++ b/dev-python/tooz/tooz-2.11.1.ebuild
@@ -25,7 +25,7 @@ RDEPEND="
 	>=dev-python/voluptuous-0.8.9[${PYTHON_USEDEP}]
 	>=dev-python/msgpack-0.4.0[${PYTHON_USEDEP}]
 	>=dev-python/fasteners-0.7[${PYTHON_USEDEP}]
-	>=dev-python/tenacity-3.2.1[${PYTHON_USEDEP}]
+	>=dev-python/tenacity-5.0.0[${PYTHON_USEDEP}]
 	>=dev-python/futurist-1.2.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-utils-4.7.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
diff --git a/dev-python/types-paramiko/Manifest b/dev-python/types-paramiko/Manifest
index d770210eee9a..f4a028a0047d 100644
--- a/dev-python/types-paramiko/Manifest
+++ b/dev-python/types-paramiko/Manifest
@@ -1,2 +1,2 @@
-DIST types-paramiko-2.8.19.tar.gz 20162 BLAKE2B f36d9971fad9379cb560202eca642ad5de0f15b41217ea7598ccea94e7405faa992a3a44552b77b0bd034fd2ce2e881472f7b1d2bff0fd2724d53f413490c68a SHA512 9053c2526fddcefc7e2bcbb7d33fc1204b91388bdf42a540a9732eec05a415b36bfbc9d44ea408b6b77e0806616b2e310aa10aecc5a7ee555b4703f66a132b07
+DIST types-paramiko-2.10.0.tar.gz 20325 BLAKE2B c918598110ada99b739579d9fd0b968b272e7cb654df2fd24f3fbfa96b9730fab27c6575220b62d2a6680c4cd5c6122594e1d710afcb5cdde2444fcfeb7a77ea SHA512 e376f8fd060f6667c610c53cf42b7dbb38ab19cbc3e8ad68f9a68f982b7498c7e06201e4ff35b662fb0d7a17b24d12a245cdc8f5731cf21cf5c0a14085853fb0
 DIST types-paramiko-2.8.21.tar.gz 20252 BLAKE2B 838563473a9a7e4277b373f6941d1b806f72715d2d6dc5a3da729d45e189837de0ed9a23181ae0b95c32b4682b9c83c93db4b8dc8a278d1ae85bfd79a4a99475 SHA512 5be63f293e5813b77696640e74275dab0d9d4c7de1e9adf13c5c2effb5b026ecae045937d09994ae3a096d75bcedc09fbdb9206cac86eef2d8c65d70e82974cf
diff --git a/dev-python/types-paramiko/types-paramiko-2.8.19.ebuild b/dev-python/types-paramiko/types-paramiko-2.10.0.ebuild
index fa6d3a658a07..fa6d3a658a07 100644
--- a/dev-python/types-paramiko/types-paramiko-2.8.19.ebuild
+++ b/dev-python/types-paramiko/types-paramiko-2.10.0.ebuild
diff --git a/dev-python/wheel/wheel-0.37.1-r1.ebuild b/dev-python/wheel/wheel-0.37.1-r1.ebuild
index 7c716d1688dd..c06c009876ae 100644
--- a/dev-python/wheel/wheel-0.37.1-r1.ebuild
+++ b/dev-python/wheel/wheel-0.37.1-r1.ebuild
@@ -6,10 +6,14 @@ EAPI=7
 
 DISTUTILS_USE_PEP517=flit
 PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
+
 inherit distutils-r1
 
 DESCRIPTION="A built-package format for Python"
-HOMEPAGE="https://pypi.org/project/wheel/"
+HOMEPAGE="
+	https://github.com/pypa/wheel/
+	https://pypi.org/project/wheel/
+"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 SRC_URI="https://github.com/pypa/wheel/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
 
@@ -18,11 +22,13 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
-	dev-python/packaging[${PYTHON_USEDEP}]"
+	dev-python/packaging[${PYTHON_USEDEP}]
+"
 BDEPEND="
 	test? (
 		dev-python/setuptools[${PYTHON_USEDEP}]
-	)"
+	)
+"
 
 distutils_enable_tests pytest