Adding metadata

35 files changed, 392 insertions, 404 deletions

diff --git a/dev-python/astroid/Manifest b/dev-python/astroid/Manifest
index b879e0609bf3..6a22cb614277 100644
--- a/dev-python/astroid/Manifest
+++ b/dev-python/astroid/Manifest
@@ -1,3 +1,4 @@
 DIST astroid-2.7.3.tar.gz 378876 BLAKE2B 016ab6e798f1a608c0e0ce0bd81865145349c70497d09e336ec8b21eaf01ea365c204f42daf6d55d148f6873ef15e223adc9baf4a09dc8945158e4b5e24f1ebb SHA512 03a886c2daef640cf0a85f38e39b6e12080dc722862cb03386d1355f3f955ea46a7bb7b85c2887f52ba6d0ecb6243c653c7f1cd44d6c7429f2cd29c1dfd2297f
 DIST astroid-2.8.6.tar.gz 394852 BLAKE2B 400531227ce5a8b0f284f51ccb2d37aeb0463ee0fc7faceb3fd33b4bd727b7283421fb69c50eba3246217e06dca2cecfac49030d33c7e2a7cf252144860b50a3 SHA512 8fae723f0b7df34ba51d7f97634b09173956ae1eaa1543b81af8a80b5d9c9fcbdd96de709da2432a935dd5fc7369f9f1ea03cf2b7e3f0b09dac8485145d8f1d9
 DIST astroid-2.9.0.tar.gz 404906 BLAKE2B 2aefe21392289b95a4ea3bde047e6f33b6915f4feac722164b4c35cc97dedb83f7d2e7f277485c5a3a8c7abc7865ccd88923266aa675755eeb17b0bd22077931 SHA512 949520268303a257102c2348920df9ff779bf5736739be5985b0441fae664212bee476445dc5d52478e789e08bbd5826ef83cf8a730a73d4e2d6eb04251c3cee
+DIST astroid-2.9.1.tar.gz 408617 BLAKE2B 921178fc6be9f3905c0e93c755fbf0ff70da4bf6242cb10a6881e78b66f9636fa39d7aef1ba9435ec69ae314968d33126a64d2d11a8da2aa2ee0dc9010d58ce3 SHA512 b6c69a316bd9f21be34b5e15505e38719721991c0b9a9162233c2c8c7b0fcef792027f6564fa58f083448d00bbae910f8dad1a2957aad5d3bf23c1bfb6727e31
diff --git a/dev-python/astroid/astroid-2.9.1.ebuild b/dev-python/astroid/astroid-2.9.1.ebuild
new file mode 100644
index 000000000000..20b93fd65346
--- /dev/null
+++ b/dev-python/astroid/astroid-2.9.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Abstract Syntax Tree for logilab packages"
+HOMEPAGE="
+	https://github.com/PyCQA/astroid/
+	https://pypi.org/project/astroid/"
+SRC_URI="
+	https://github.com/PyCQA/astroid/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+# Version specified in __pkginfo__.py.
+RDEPEND="
+	>=dev-python/lazy-object-proxy-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/typing-extensions-3.10[${PYTHON_USEDEP}]
+	<dev-python/wrapt-1.14[${PYTHON_USEDEP}]"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/python-dateutil[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+python_test() {
+	local deselect=(
+		# no clue why it's broken
+		tests/unittest_modutils.py::GetModulePartTest::test_known_values_get_builtin_module_part
+	)
+
+	# Faker causes sys.path_importer_cache keys to be overwritten
+	# with PosixPaths
+	epytest -p no:faker ${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/cachelib/Manifest b/dev-python/cachelib/Manifest
index 82013f93160d..77695239c4d0 100644
--- a/dev-python/cachelib/Manifest
+++ b/dev-python/cachelib/Manifest
@@ -1 +1,2 @@
 DIST cachelib-0.4.1.tar.gz 19762 BLAKE2B baadfe920fda339cd8f3241664ae91b2767423ed09bdb6204573b2679e37c2dd3157f3b4d0f16841b1ab859f7c777986c0c251bcbe4bdf1ade69c442ff8ec756 SHA512 051e6f31b6ee58836a1512de4c7eedc718c081389df92605ad065f4bc5e4c861971507af636686d8abf00273a379ff31730bf040a7633a143dc1492263e3a543
+DIST cachelib-0.5.0.tar.gz 21173 BLAKE2B cbd6bb5e0be27dd284893ebd3e469821806c5d3634195b6cacc4ba247da9f8f3d33d0ad3043e80409f836907c24c1a8226dd0333a51488b86a7cd0244d66fe2b SHA512 1b942e654cf334755fe130a913504d6b46dbb1e6aef3df33cb295ded7e47b1ed461b68653d8bc8ffe85cff6fc82a382df82b97302ff191e184e953d837a02cdd
diff --git a/dev-python/cachelib/cachelib-0.5.0.ebuild b/dev-python/cachelib/cachelib-0.5.0.ebuild
new file mode 100644
index 000000000000..33698a67779d
--- /dev/null
+++ b/dev-python/cachelib/cachelib-0.5.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_{6,7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Collection of cache libraries in the same API interface. Extracted from werkzeug"
+HOMEPAGE="https://pypi.org/project/cachelib/ https://github.com/pallets/cachelib"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+BDEPEND="
+	test? (
+		dev-python/pylibmc[${PYTHON_USEDEP}]
+		dev-python/pytest-xprocess[${PYTHON_USEDEP}]
+		dev-python/redis-py[${PYTHON_USEDEP}]
+		net-misc/memcached
+		www-servers/uwsgi[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+EPYTEST_IGNORE=(
+	# bug #818523
+	tests/test_redis_cache.py
+)
diff --git a/dev-python/diskcache/Manifest b/dev-python/diskcache/Manifest
index eeaacea48547..8a0c2a065fc0 100644
--- a/dev-python/diskcache/Manifest
+++ b/dev-python/diskcache/Manifest
@@ -1,3 +1,2 @@
-DIST diskcache-5.2.1.gh.tar.gz 652769 BLAKE2B 25fcdcf51c8be7a6e2a9de645258f776647789a7f06c70c8564ad28bd003a745167095b11a54d435e733d9f5181a1443be2510fe2d901cc208ea426d3359c0ba SHA512 6e55bada12145d931f4a465092decc3f2cfed2e618d1ea271ad6daa6caf7c3abfd6ae5de11072efdf898ebf272acd39136136b58d7b5e735092963bdd46af52e
 DIST diskcache-5.3.0.gh.tar.gz 653506 BLAKE2B 250420da434fa8a02cf58ed552072cb62a6d10dfa3801cf187db327a687763ab7f010c19f5e10b9ba71b2fd6830ba902750ca273c8be08c6f7987aa0923afcff SHA512 106c8eb8320153e42e076927d51fa75d30b92156e17a75756e0392028cb6b5054af9af66b93aa69b7a7105012f0b92fe942ee447a75e53e005b56eb0b067dc38
 DIST diskcache-5.4.0.gh.tar.gz 653968 BLAKE2B 765f0d8d9c4b3a8bf9e4c52b3b931867dc0b92aa7b891d6d64cbfe9e7ff491662a1fa2f0af776f9b3dcc4b441f50b68dc009a29e9b0d37f99add9033f4fb94d8 SHA512 cc15ff0b06b2a5708692f50e185699bd53e60408cef25053bcb5aaffec2795dd53c3bfe4b131a47f68c43388927ecc034c43233c38494cb2f6e40636344270fc
diff --git a/dev-python/diskcache/diskcache-5.2.1-r1.ebuild b/dev-python/diskcache/diskcache-5.2.1-r1.ebuild
deleted file mode 100644
index 118da8c0da1b..000000000000
--- a/dev-python/diskcache/diskcache-5.2.1-r1.ebuild
+++ /dev/null
@@ -1,42 +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} )
-PYTHON_REQ_USE="sqlite"
-
-inherit distutils-r1
-
-HOMEPAGE="http://www.grantjenks.com/docs/diskcache/
-	https://github.com/grantjenks/python-diskcache/"
-DESCRIPTION="Disk and file backed cache"
-SRC_URI="
-	https://github.com/grantjenks/python-diskcache/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-S=${WORKDIR}/python-diskcache-${PV}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-distutils_enable_sphinx docs
-distutils_enable_tests pytest
-
-src_prepare() {
-	# remove dep on pytest-xdist and pytest-cov
-	sed -i -e '/-n auto/d' -e '/--cov/d' tox.ini || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local ignore=(
-		# django tests don't work with django-3.2, and django-3.1
-		# doesn't work with py3.10
-		tests/test_djangocache.py
-		tests/test_doctest.py
-		README.rst
-	)
-	epytest ${ignore[@]/#/--ignore }
-}
diff --git a/dev-python/mako/mako-1.1.6.ebuild b/dev-python/mako/mako-1.1.6.ebuild
index c2e84d422dd5..4347c12a0b51 100644
--- a/dev-python/mako/mako-1.1.6.ebuild
+++ b/dev-python/mako/mako-1.1.6.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# 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} pypy3 )
-inherit distutils-r1 optfeature
+inherit distutils-r1
 
 MY_P=${P^}
 DESCRIPTION="A Python templating language"
@@ -31,7 +31,3 @@ python_install_all() {
 	use doc && local HTML_DOCS=( doc/. )
 	distutils-r1_python_install_all
 }
-
-pkg_postinst() {
-	optfeature "caching support" dev-python/beaker
-}
diff --git a/dev-python/nbsphinx/Manifest b/dev-python/nbsphinx/Manifest
index 4a12a4e1ad28..cc00a89c75d3 100644
--- a/dev-python/nbsphinx/Manifest
+++ b/dev-python/nbsphinx/Manifest
@@ -1 +1,2 @@
 DIST nbsphinx-0.8.7.tar.gz 146388 BLAKE2B 28149728b95403236bfe601aa2190f2262069466e6a82e688640b3e085e8f03800199e1f6c5f1a321594a1a6bbf73a2906b0f4cdf2bcf4b5e781fe7bb4fa917e SHA512 01b8d3095fefc32301ed608916bdeeb469bb180709d1512178f8ca2e29f4404f48607c1fc1ec0700ee2aa745cbdef350edda0f06f2dd464d10c020dc38774778
+DIST nbsphinx-0.8.8.tar.gz 146831 BLAKE2B 26687d74900e7667dff644a91d58eeed57e2b2e91391d4a8024d5ee2c858d5d8bb132db5b025357817004480bc161d8ad6f5c003240d6bbc23420e1633a63abd SHA512 8a791171d6fffc414e19224d29e323644e141c5c51522b7914549aa066f2757cb4e88318a1bf20e4abbd7130cf85c4e8c3fb5537802098342a32c896e3caf3bf
diff --git a/dev-python/nbsphinx/nbsphinx-0.8.8.ebuild b/dev-python/nbsphinx/nbsphinx-0.8.8.ebuild
new file mode 100644
index 000000000000..87c51a44952c
--- /dev/null
+++ b/dev-python/nbsphinx/nbsphinx-0.8.8.ebuild
@@ -0,0 +1,23 @@
+# 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} )
+inherit distutils-r1
+
+DESCRIPTION="Jupyter Notebook Tools for Sphinx"
+HOMEPAGE="https://github.com/spatialaudio/nbsphinx/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/nbconvert[${PYTHON_USEDEP}]
+	dev-python/nbformat[${PYTHON_USEDEP}]
+	>=dev-python/sphinx-1.8[${PYTHON_USEDEP}]
+	dev-python/traitlets[${PYTHON_USEDEP}]"
diff --git a/dev-python/parso/Manifest b/dev-python/parso/Manifest
index 1ff516e0eddc..91bdb40e9e69 100644
--- a/dev-python/parso/Manifest
+++ b/dev-python/parso/Manifest
@@ -1,3 +1,2 @@
 DIST parso-0.7.1.tar.gz 399842 BLAKE2B 1e47c1dd6846d01aa5820d7cedc3eafcf12ea0d4a2e95fa3f54429633b1c12dc39a4abe237fa46eb629408006777bd1f512cf878025b55119568ac19729b8c19 SHA512 318969a7a941c4a0948e58643b07b6f5c446ea166b3a8e44a556f0677ec9a36d7dc8c6d37ca7bce3f8276ee3d7144e22fbaaeac90c738fb90f7e94a0cf8abf7d
-DIST parso-0.8.2.tar.gz 394419 BLAKE2B f4e86ae55140adc9bbfdd34a8044e7fdfbf9d318a6385ac5feedc07127061943c2d690581af144f158846e3bf6f82124046c7e625369a4055ab92a54f9210c49 SHA512 a90810ad89301d804d215392ed77593b015f13bc7ef8512302a8893b314a9e74c15e2aaa77157c8595a134d3481e8115f306f9628835271478837ec6f19e645f
 DIST parso-0.8.3.tar.gz 397648 BLAKE2B 8942408e27198075c92ef51f7a191cc7781eb3a5110119b91fd95f86e13ebe2fbfee11022a2bfec794150f60b3af8c4d5f324cb011703cd581c17f92232ae5bf SHA512 7874460053662d40c2cfcf0015e330e1c8201eeb07682e2079a636db553a82dc25b70b14ad0f0c82fb817f655359d695101a17f616abf9a39f49c61ae5fd49b1
diff --git a/dev-python/parso/files/parso-0.8.2-py310-2.patch b/dev-python/parso/files/parso-0.8.2-py310-2.patch
deleted file mode 100644
index 7c6b1ad78286..000000000000
--- a/dev-python/parso/files/parso-0.8.2-py310-2.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From dc41958947770849c8b3b4d344db434e2c8548cc Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Thu, 5 Aug 2021 09:09:28 +0200
-Subject: [PATCH] Update expected exception line numbers for Python 3.10.0rc1
-
-It seems that upstream has fixed line numbers in some of the expections
-in Python 3.10.0rc1, so update the tests accordingly.  This means that
-test_non_async_in_async() gets the correct line again,
-and test_default_except_error_postition() no longer suffers from
-the apparent off-by-one problem.
-
-This doesn't fix tests entirely with Python 3.10 but it's a step
-forward.
----
- test/test_python_errors.py | 13 ++++++++-----
- 1 file changed, 8 insertions(+), 5 deletions(-)
-
-diff --git a/test/test_python_errors.py b/test/test_python_errors.py
-index cda9bd2..e847ebb 100644
---- a/test/test_python_errors.py
-+++ b/test/test_python_errors.py
-@@ -57,10 +57,10 @@ def test_non_async_in_async():
-         error, = errors
-         actual = error.message
-     assert actual in wanted
--    if sys.version_info[:2] < (3, 8):
-+    if sys.version_info[:2] not in ((3, 8), (3,9)):
-         assert line_nr == error.start_pos[0]
-     else:
--        assert line_nr == 0  # For whatever reason this is zero in Python 3.8+
-+        assert line_nr == 0  # For whatever reason this is zero in Python 3.8/3.9
- 
- 
- @pytest.mark.parametrize(
-@@ -140,13 +140,16 @@ def _get_actual_exception(code):
- 
- 
- def test_default_except_error_postition():
--    # For this error the position seemed to be one line off, but that doesn't
--    # really matter.
-+    # For this error the position seemed to be one line off in Python < 3.10,
-+    # but that doesn't really matter.
-     code = 'try: pass\nexcept: pass\nexcept X: pass'
-     wanted, line_nr = _get_actual_exception(code)
-     error, = _get_error_list(code)
-     assert error.message in wanted
--    assert line_nr != error.start_pos[0]
-+    if sys.version_info[:2] >= (3, 10):
-+        assert line_nr == error.start_pos[0]
-+    else:
-+        assert line_nr != error.start_pos[0]
-     # I think this is the better position.
-     assert error.start_pos[0] == 2
- 
--- 
-2.32.0
-
diff --git a/dev-python/parso/files/parso-0.8.2-py310.patch b/dev-python/parso/files/parso-0.8.2-py310.patch
deleted file mode 100644
index 2f3487dd2f61..000000000000
--- a/dev-python/parso/files/parso-0.8.2-py310.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From cbb61fb81955a8cdbb5cdeedc9bcfffa39a5f270 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
-Date: Thu, 22 Apr 2021 21:04:49 +0200
-Subject: [PATCH] Relax a test regex to match new enum repr in Python 3.10.0a7+
- (#186)
-
-bpo-40066: Enum: adjust repr() to show only enum and member name (not value,
-nor angle brackets) and str() to show only member name.
-https://bugs.python.org/issue40066
----
- test/test_pgen2.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/test/test_pgen2.py b/test/test_pgen2.py
-index 9b0dd34..85ccacf 100644
---- a/test/test_pgen2.py
-+++ b/test/test_pgen2.py
-@@ -339,7 +339,7 @@ def test_left_recursion():
- @pytest.mark.parametrize(
-     'grammar, error_match', [
-         ['foo: bar | baz\nbar: NAME\nbaz: NAME\n',
--         r"foo is ambiguous.*given a PythonTokenTypes\.NAME.*bar or baz"],
-+         r"foo is ambiguous.*given a (PythonTokenTypes\.)?NAME.*bar or baz"],
-         ['''foo: bar | baz\nbar: 'x'\nbaz: "x"\n''',
-          r"foo is ambiguous.*given a ReservedString\(x\).*bar or baz"],
-         ['''foo: bar | 'x'\nbar: 'x'\n''',
--- 
-2.32.0
-
diff --git a/dev-python/parso/parso-0.8.2.ebuild b/dev-python/parso/parso-0.8.2.ebuild
deleted file mode 100644
index b7f43f046ff6..000000000000
--- a/dev-python/parso/parso-0.8.2.ebuild
+++ /dev/null
@@ -1,34 +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 python parser that supports error recovery and round-trip parsing"
-HOMEPAGE="https://github.com/davidhalter/parso https://pypi.org/project/parso/"
-SRC_URI="https://github.com/davidhalter/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
-
-distutils_enable_sphinx docs
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}"/${P}-py310.patch
-	"${FILESDIR}"/${P}-py310-2.patch
-	"${FILESDIR}"/${P}-flaky-test.patch
-)
-
-python_test() {
-	local deselect=()
-	[[ ${EPYTHON} == python3.10 ]] && deselect+=(
-		# py3.10 changed exception messages
-		test/test_python_errors.py::test_python_exception_matches
-	)
-	epytest ${deselect[@]/#/--deselect }
-}
diff --git a/dev-python/pikepdf/Manifest b/dev-python/pikepdf/Manifest
index 11c645649e89..4531c41846b4 100644
--- a/dev-python/pikepdf/Manifest
+++ b/dev-python/pikepdf/Manifest
@@ -1,2 +1,2 @@
 DIST pikepdf-4.2.0.tar.gz 2337822 BLAKE2B ca966ae2c1be1805cc6ce99e34eb6692fe89bf29f1e6a3161eb04daa52e3890ae8d8859e4165801395efc5d3364d215ea5fc659fb344388a36bf32b638ad72bf SHA512 a01e2b0defbf6689b7d47346a85c07ae575ae57833d5be93e4099890ed5bb5b205595dc43ddd917ab4adc87ad591199c728c886358b8d4c03b1522193428e23d
-DIST pikepdf-4.3.0.tar.gz 2348313 BLAKE2B 8e3a98fae1406a1c704d0c2341eebf142ab5d774f861e85ee83605ea56a433d96b85ec501171d4c8f9b2e905b7d06b8075191efea7e58e80f86abf046c2c698d SHA512 c23866e2e9cc36916823d6740f63900d0d1bf3fa7fb226c7f3ae2e0f1bda2808f2ac469ec38a3c147cf124d7473d63cd13ee34a09d9bf74cef29b76589c93ff4
+DIST pikepdf-4.3.1.tar.gz 2348339 BLAKE2B 9b1f04a87e7e7d2dc2589eaa7db4a670e8ceda753191e473e1a5da9ead532121d0d7d4f734fa234d60a9b5a5931d022f46e252a8c69947e9553df67b81043a06 SHA512 0156ad57a9af2d39538f9f728231e931e1a44ecea74d26e850640fa062f2dc60d427deeea5fc25ab33037d11d7a403cefe5f930c7ed92be92a6d3432f87d8fa6
diff --git a/dev-python/pikepdf/pikepdf-4.3.0.ebuild b/dev-python/pikepdf/pikepdf-4.3.1.ebuild
index 5e40ef59ccec..f984a57f9a52 100644
--- a/dev-python/pikepdf/pikepdf-4.3.0.ebuild
+++ b/dev-python/pikepdf/pikepdf-4.3.1.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
diff --git a/dev-python/pip/pip-21.3.1-r1.ebuild b/dev-python/pip/pip-21.3.1-r1.ebuild
index 07984ebf660e..429e3a6a47e5 100644
--- a/dev-python/pip/pip-21.3.1-r1.ebuild
+++ b/dev-python/pip/pip-21.3.1-r1.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
@@ -32,7 +32,7 @@ SRC_URI="
 "
 
 LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86"
 SLOT="0"
 IUSE="test vanilla"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/pydantic/Manifest b/dev-python/pydantic/Manifest
index 52e9b8c45281..4fefdc7318ef 100644
--- a/dev-python/pydantic/Manifest
+++ b/dev-python/pydantic/Manifest
@@ -1 +1,2 @@
 DIST pydantic-1.8.2_p20210719.tar.gz 310729 BLAKE2B 1905ddd100e3a40b48eadc7beb75542f4a59ff8ef55115105041b0c06249ee67df1ca91003bc01f828c543c757ec8931ff2d31663d33ca16f356f62f71a61474 SHA512 c9d91788b3143b211755806e533ae0ccafa2ab101159f98eeba921ec9370956e8f8b0f210e6ddddcef2345ea391d2e1011ea5498d2f7985bd711f48d025e30d5
+DIST pydantic-1.9.0.tar.gz 299758 BLAKE2B f6c2b89e598fc94db74b8165c449c752f11166752b12bbd37c23902b74c1f895bbd49b8fc4dc8da86b10880ac2e37178275cc28a42964e1133397364ea268d02 SHA512 ace542ff12698d568f2bea6121afc889c51892042b1a1b98464a6da6f71e50ecd8aafff7abd7ffd16983769844f7c970099d1fee7aa788f2e78172c0d5c4f472
diff --git a/dev-python/pydantic/pydantic-1.9.0.ebuild b/dev-python/pydantic/pydantic-1.9.0.ebuild
new file mode 100644
index 000000000000..295acae16313
--- /dev/null
+++ b/dev-python/pydantic/pydantic-1.9.0.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_{6,7,8,9,10} )
+inherit distutils-r1
+
+DESCRIPTION="Data parsing and validation using Python type hints"
+HOMEPAGE="https://github.com/samuelcolvin/pydantic"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	dev-python/typing-extensions[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	test? (
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/python-dotenv[${PYTHON_USEDEP}]
+		dev-python/python-email-validator[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/CFLAGS/d' setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	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
+	)
+	distutils_install_for_testing
+	epytest
+}
diff --git a/dev-python/pygments/Manifest b/dev-python/pygments/Manifest
index 1a193655cf06..7a9394cedd0a 100644
--- a/dev-python/pygments/Manifest
+++ b/dev-python/pygments/Manifest
@@ -1,2 +1,3 @@
 DIST Pygments-2.10.0.tar.gz 4052321 BLAKE2B 003d13344a2c5fe448a23d7bb45a401dc839cac10be262f5831c9547444d395811c92b74d1b18663a11a2e6cedf29b5a74cbd75267157429d61375bd9df6eb49 SHA512 28fdf35e333717795f199e0ef936d6df16ac0752324839ac36cabd2f9f6759a57663527d37f1c2f470258d63c3cf190f6dd4b631b21c849fc76575036fbdae12
 DIST Pygments-2.11.0.tar.gz 4157814 BLAKE2B de70a1de48083a9a0f281e4eb7f164cb551bd2fa2e7682c26c4513e1ebadf9da4ba6b2ccb50cc16955df484d313dff2b0431d6de2f5590c59c775f9ebd3884db SHA512 761b722cdcbc41bc730843e8120ae3c0d634db9918c1c1870d89b79002b55f245c896ed9301c44b665e573a8584d5f8504623fe9d4c63820b57a2cfcae576b33
+DIST Pygments-2.11.1.tar.gz 4206490 BLAKE2B 116efe4eb71b276eb860a1de04191b8cb01abc0c879a764715d6d6290a523360c7b195e81a6f32516ad5830410534f2ad01498393c36959ce934e1ccf1520fb9 SHA512 77bc1c7fa10ce945591f6d0546f0e9da8d65df58954348fe3b5a4dd8628c9697bd500e74eec3e2a095c5cb3378b8dee1cb0396cd52d7c36c0f2ca719a6d023b9
diff --git a/dev-python/pygments/pygments-2.11.1.ebuild b/dev-python/pygments/pygments-2.11.1.ebuild
new file mode 100644
index 000000000000..302d23b3707b
--- /dev/null
+++ b/dev-python/pygments/pygments-2.11.1.ebuild
@@ -0,0 +1,37 @@
+# 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} pypy3 )
+inherit distutils-r1 bash-completion-r1
+
+MY_P=${P^}
+DESCRIPTION="Pygments is a syntax highlighting package written in Python"
+HOMEPAGE="
+	https://pygments.org/
+	https://github.com/pygments/pygments/
+	https://pypi.org/project/Pygments/"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${PN^}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc"
+
+BDEPEND="
+	test? (
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/wcag-contrast-ratio[${PYTHON_USEDEP}]
+		virtual/ttf-fonts
+	)"
+
+distutils_enable_sphinx doc \
+	dev-python/wcag-contrast-ratio
+distutils_enable_tests pytest
+
+python_install_all() {
+	distutils-r1_python_install_all
+	newbashcomp external/pygments.bashcomp pygmentize
+}
diff --git a/dev-python/pyopencl/Manifest b/dev-python/pyopencl/Manifest
index 8fe146384657..9bd9b76b8453 100644
--- a/dev-python/pyopencl/Manifest
+++ b/dev-python/pyopencl/Manifest
@@ -1 +1,2 @@
+DIST pyopencl-2021.2.11.tar.gz 452225 BLAKE2B 48ea9a96e23370f4a8b40b5c43f439bc0635764b577ee554f9b65e8a1a790b3a90c4c4c2167d8c32c6f926ca6fa77c035542d503a14ea7c12470cbb73c99d7ba SHA512 584419da05a06b94d2bbb89072ef37007176a978aebf42a5d46eb3c0daf90119a585c60ecef34108ec60f8f98a6ec6e54e00dcac474bc42ddb43211c2b21d161
 DIST pyopencl-2021.2.9.tar.gz 451109 BLAKE2B a4b9b1ee1bd4f42742aa2de3acb3f5fe54771905f15dc002327a6669bf460c825c81729403df0b98537deb91ca9d0fa8dd30dd8d7e718fcc23a256b6a797484b SHA512 557bdf20df97090557f441f47b31d5b2878341fe670a4e64a563d8a464fdd5915ece651103ed17396248ab174b1895f4841e5b7ac803b8bf6286266e2c4366d6
diff --git a/dev-python/pyopencl/pyopencl-2021.2.11.ebuild b/dev-python/pyopencl/pyopencl-2021.2.11.ebuild
new file mode 100644
index 000000000000..2b2b6f0c3edf
--- /dev/null
+++ b/dev-python/pyopencl/pyopencl-2021.2.11.ebuild
@@ -0,0 +1,56 @@
+# 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} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python wrapper for OpenCL"
+HOMEPAGE="https://mathema.tician.de/software/pyopencl/
+	https://pypi.org/project/pyopencl/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="examples opengl"
+
+DEPEND=">=virtual/opencl-2"
+RDEPEND="${DEPEND}
+	>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/mako-0.3.6[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	>=dev-python/pytools-2021.2.7[${PYTHON_USEDEP}]"
+# libglvnd is only needed for the headers
+BDEPEND="dev-python/numpy[${PYTHON_USEDEP}]
+	>=dev-python/pybind11-2.5.0[${PYTHON_USEDEP}]
+	opengl? ( media-libs/libglvnd )"
+
+# The test suite fails if there are no OpenCL platforms available, and
+# even if there is one (which requires the presence of both an OpenCL
+# runtime *and* hardware supported by it - simply emerging any runtime
+# is not enough) the vast majority of tests end up skipped because by
+# default the portage user hasn't got sufficient privileges to talk
+# to the GPU.
+RESTRICT="test"
+
+python_configure_all() {
+	local myconf=()
+	if use opengl; then
+		myconf+=(--cl-enable-gl)
+	fi
+
+	"${EPYTHON}" configure.py \
+		"${myconf[@]}"
+}
+
+python_install_all() {
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pyrqlite/Manifest b/dev-python/pyrqlite/Manifest
index ba4a64616039..0b40da3fa540 100644
--- a/dev-python/pyrqlite/Manifest
+++ b/dev-python/pyrqlite/Manifest
@@ -1,4 +1 @@
-DIST pyrqlite-2.1-python3.10-test_support.patch 1017 BLAKE2B 50353be2d15d1a468328c3f7f40c4d8512975b0c8e8e458aac219b4d207cd8819bcd98417585b81322eb9c241adb1d389b7b161c775734db396bcd16dce2886a SHA512 b88a220af27fbedc259f10d6d8af436f2b6d5533f17550c8f90b3bd4a64c81319b4922d748d3b0baa9ae1e1bd1390349fd8b21fc1f8e48b707ee074f93b830f4
-DIST pyrqlite-2.1-rqlite-6.7.0-ephemeral.py 3284 BLAKE2B 97029bf48fe8902909cd463718b64399f6736a09a463233d7a577c6c3afbc8709315364f6c7af90d3d40ebcb2cfcbb8ba7ec2b0589a80bfbc8e7ec130603c4aa SHA512 15c96c52c2528f9ecad8ddd6cff0a05a3684654aff5d99c86615d49279dc43cd0c1dee89b0fac33876e793f54bbb51a403b3678a278dbdd9329fe031156a4576
 DIST pyrqlite-2.1.1.tar.gz 19538 BLAKE2B fba6caa68eb6d806ea807d40f36edafb0872e724a087cdb7736f79699692d0d492e05a8a7407467f92ec8e30df4a6ea1ed44bc12bec35ffc4753878335fa4275 SHA512 9fc404a480f42592ebbedef82f748707741e28de199be9381680db506dac4e3ce757d1058874ca06cf8f0dd1ec0e7b6411a4585f332a9fe7d8977071e492bd31
-DIST pyrqlite-2.1.tar.gz 19069 BLAKE2B f5ce9c1201632e81ba6f7f41e3ef54bd5fff354c869e73879e8b324ad12aea6476eb197119a22ba15d58c9ab3503435b0110ce9bfe2c21d16fe10b44afbe486a SHA512 6a63860378021b29ec0e8d81cf2c3534c97cec2c65d60e8ac2ec9b0a7900efb9a9a63546da44d8be89570eae2fd47eca4004167d11438b2dd9eb6bc68e646bad
diff --git a/dev-python/pyrqlite/pyrqlite-2.1-r1.ebuild b/dev-python/pyrqlite/pyrqlite-2.1-r1.ebuild
deleted file mode 100644
index 13c06acac47a..000000000000
--- a/dev-python/pyrqlite/pyrqlite-2.1-r1.ebuild
+++ /dev/null
@@ -1,30 +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 distutils-r1
-
-DESCRIPTION="Python client for rqlite"
-HOMEPAGE="https://github.com/rqlite/pyrqlite"
-SRC_URI="https://github.com/rqlite/pyrqlite/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/rqlite/pyrqlite/pull/36.patch -> ${P}-python3.10-test_support.patch
-	https://github.com/rqlite/pyrqlite/raw/17a22221e4e796a04c28aa578a93821cc3349b41/src/pyrqlite/_ephemeral.py -> ${P}-rqlite-6.7.0-ephemeral.py"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-BDEPEND="test? ( >=dev-db/rqlite-6.7.0 )"
-RESTRICT+=" !test? ( test )"
-
-PATCHES=("${DISTDIR}/${P}-python3.10-test_support.patch")
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -e "s:^__version__ = .*:__version__ = '${PV}':" -i src/${PN}/constants.py || die
-	cp "${DISTDIR}/${P}-rqlite-6.7.0-ephemeral.py" src/pyrqlite/_ephemeral.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/pyrqlite/pyrqlite-2.1.ebuild b/dev-python/pyrqlite/pyrqlite-2.1.ebuild
deleted file mode 100644
index c7a4215a3d31..000000000000
--- a/dev-python/pyrqlite/pyrqlite-2.1.ebuild
+++ /dev/null
@@ -1,28 +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 distutils-r1
-
-DESCRIPTION="Python client for rqlite"
-HOMEPAGE="https://github.com/rqlite/pyrqlite"
-SRC_URI="https://github.com/rqlite/pyrqlite/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/rqlite/pyrqlite/pull/36.patch -> ${P}-python3.10-test_support.patch"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-# Pin test rqlite version due to https://github.com/rqlite/pyrqlite/issues/37.
-BDEPEND="test? ( <dev-db/rqlite-6.2 )"
-
-PATCHES=("${DISTDIR}/${P}-python3.10-test_support.patch")
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -e "s:^__version__ = .*:__version__ = '${PV}':" -i src/${PN}/constants.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/python-utils/Manifest b/dev-python/python-utils/Manifest
index c4faa5926ad1..d412cc4e6bc7 100644
--- a/dev-python/python-utils/Manifest
+++ b/dev-python/python-utils/Manifest
@@ -1,3 +1,4 @@
 DIST python-utils-2.5.6.tar.gz 14057 BLAKE2B 2f66ab26cd6cda25f73c9f40081048404cde819e3e3c2fd11d134244ab2b80a05ab2b943e56a45bd8656bf3ba231853e3bfa9efbab9cb70515daaec70f6e0715 SHA512 35299880afdecd4a44144b95e6b2073e51680dfd2b00f31fb333d578cfa2c2f8bf5f58128cab88a7b81e658e6d5dca303f1c9f5be3870160679e1defbf94859e
 DIST python-utils-2.6.0.tar.gz 14885 BLAKE2B 089d7a57a8469968bed147a01907f35d1430349130e0f7152bbd38dd65053cf3d6424942eee8cc9006baaec5f13bffcbef81bd8723cad7ee03b1358a5c2d3d27 SHA512 a582558e38342f54f7c1eda1f9038728dd5904729aaec4e5719e56bb447bc6fcb93bf5ea3af134ce245eda059b9be81d15b268165cbc10799ba112fc157f939b
 DIST python-utils-2.6.3.tar.gz 14914 BLAKE2B 6df19348feba000dccc516704db38af299613c70505cd7fa16a2e37c4a46b1cff7ee9bf164be13da33a3b4eb6b9577b76202bfbffdaed47b1b7b60e948d349ac SHA512 3c5834976408eae6b37aa07581960ee5511765f9ea1e6347523465a93ca801bc2d71f785a73a2050706dad2c09ffcfb5227715a9b4d0700904d31eb1295b30b6
+DIST python-utils-2.7.0.tar.gz 27743 BLAKE2B 5cd0671ad1e003932aed0bf0b69326d907013d3f739e833f218600ee056d76bc87dd2a424f5459654de30dacc3378c14f10af1664344ac66813410d261718c61 SHA512 3401c9ad2e4933d0d40d4bc90f1dbe212e672289e7239a4a46d79a04e80f85bb0def67324f0184ca397ec3708cb935839ffe922a202de9c911198ea86d88e2c5
diff --git a/dev-python/python-utils/python-utils-2.7.0.ebuild b/dev-python/python-utils/python-utils-2.7.0.ebuild
new file mode 100644
index 000000000000..5653dc13efd9
--- /dev/null
+++ b/dev-python/python-utils/python-utils-2.7.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} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="Collection of small Python functions & classes"
+HOMEPAGE="https://pypi.org/project/python-utils/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+EPYTEST_IGNORE=(
+	docs
+)
+
+python_prepare_all() {
+	sed -i -e '/--cov/d' -e '/--flake8/d' pytest.ini || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/pyudev/files/pyudev-0.22-fix-hypothesis.patch b/dev-python/pyudev/files/pyudev-0.22-fix-hypothesis.patch
deleted file mode 100644
index 5a6b27324d82..000000000000
--- a/dev-python/pyudev/files/pyudev-0.22-fix-hypothesis.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-diff --git a/tests/_device_tests/_attributes_tests.py b/tests/_device_tests/_attributes_tests.py
-index 23fa6da..7baf043 100644
---- a/tests/_device_tests/_attributes_tests.py
-+++ b/tests/_device_tests/_attributes_tests.py
-@@ -50,7 +50,7 @@ class TestAttributes(object):
-     """
- 
-     @given(_CONTEXT_STRATEGY, strategies.sampled_from(_DEVICE_DATA))
--    @settings(max_examples=5)
-+    @settings(max_examples=5, deadline=30000)
-     def test_getitem(self, a_context, device_datum):
-         """
-         Test that attribute value exists and is instance of bytes.
-@@ -60,7 +60,7 @@ def test_getitem(self, a_context, device_datum):
-            for key in device_datum.attributes.keys())
- 
-     @given(strategies.sampled_from(_DEVICES))
--    @settings(max_examples=5)
-+    @settings(max_examples=5, deadline=30000)
-     def test_getitem_nonexisting(self, a_device):
-         """
-         Test behavior when corresponding value is non-existant.
-@@ -87,7 +87,7 @@ def test_non_iterable(self, a_device):
-             a_device.attributes['key']
- 
-     @given(_CONTEXT_STRATEGY, strategies.sampled_from(_DEVICE_DATA))
--    @settings(max_examples=5)
-+    @settings(max_examples=5, deadline=30000)
-     def test_asstring(self, a_context, device_datum):
-         """
-         Test that attribute exists for actual device and is unicode.
-@@ -97,7 +97,7 @@ def test_asstring(self, a_context, device_datum):
-            for key in device_datum.attributes.keys())
- 
-     @given(_CONTEXT_STRATEGY, strategies.sampled_from(_DEVICE_DATA))
--    @settings(max_examples=10)
-+    @settings(max_examples=10, deadline=30000)
-     def test_asint(self, a_context, device_datum):
-         """
-         Test that integer result is an int or ValueError raised.
-@@ -111,7 +111,7 @@ def test_asint(self, a_context, device_datum):
-                     device.attributes.asint(key)
- 
-     @given(_CONTEXT_STRATEGY, strategies.sampled_from(_DEVICE_DATA))
--    @settings(max_examples=5)
-+    @settings(max_examples=5, deadline=30000)
-     def test_asbool(self, a_context, device_datum):
-         """
-         Test that bool result is a bool or ValueError raised.
-diff --git a/tests/_device_tests/_device_tests.py b/tests/_device_tests/_device_tests.py
-index b9a84c6..2ce6751 100644
---- a/tests/_device_tests/_device_tests.py
-+++ b/tests/_device_tests/_device_tests.py
-@@ -352,7 +352,7 @@ def test_key_subset(self, a_context, device_datum):
-            frozenset(device.properties.keys())
- 
-     @given(_CONTEXT_STRATEGY, strategies.sampled_from(_DEVICE_DATA))
--    @settings(max_examples=1)
-+    @settings(max_examples=1, deadline=30000)
-     def test_getitem(self, a_context, device_datum):
-         device = Devices.from_path(a_context, device_datum.device_path)
-         for prop in device_datum.properties:
-@@ -372,7 +372,7 @@ def test_getitem(self, a_context, device_datum):
-     @pytest.mark.skipif(
-         len(_device_data) == 0, reason='no device with a DEVNAME property')
-     @given(_CONTEXT_STRATEGY, strategies.sampled_from(_device_data))
--    @settings(max_examples=5)
-+    @settings(max_examples=5, deadline=30000)
-     def test_getitem_devname(self, a_context, device_datum):
-         device = Devices.from_path(a_context, device_datum.device_path)
-         data_devname = os.path.join(a_context.device_path,
-@@ -382,7 +382,7 @@ def test_getitem_devname(self, a_context, device_datum):
-         assert device_devname == data_devname
- 
-     @given(strategies.sampled_from(_DEVICES))
--    @settings(max_examples=5)
-+    @settings(max_examples=5, deadline=30000)
-     def test_getitem_nonexisting(self, a_device):
-         with pytest.raises(KeyError) as excinfo:
-             # pylint: disable=pointless-statement
-@@ -390,7 +390,7 @@ def test_getitem_nonexisting(self, a_device):
-         assert str(excinfo.value) == repr('a non-existing property')
- 
-     @given(_CONTEXT_STRATEGY, strategies.sampled_from(_DEVICE_DATA))
--    @settings(max_examples=5)
-+    @settings(max_examples=5, deadline=30000)
-     def test_asint(self, a_context, device_datum):
-         device = Devices.from_path(a_context, device_datum.device_path)
-         for prop, value in device_datum.properties.items():
-@@ -403,7 +403,7 @@ def test_asint(self, a_context, device_datum):
-                 assert device.properties.asint(prop) == value
- 
-     @given(_CONTEXT_STRATEGY, strategies.sampled_from(_DEVICE_DATA))
--    @settings(max_examples=5)
-+    @settings(max_examples=5, deadline=30000)
-     def test_asbool(self, a_context, device_datum):
-         """
-         Test that values of 1 and 0 get properly interpreted as bool
diff --git a/dev-python/pyudev/pyudev-0.22.0-r1.ebuild b/dev-python/pyudev/pyudev-0.22.0-r1.ebuild
index 01d11c296513..b32feef9f8f5 100644
--- a/dev-python/pyudev/pyudev-0.22.0-r1.ebuild
+++ b/dev-python/pyudev/pyudev-0.22.0-r1.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
@@ -30,10 +30,6 @@ DEPEND="${RDEPEND}
 
 DOCS=( CHANGES.rst README.rst )
 
-PATCHES=(
-	"${FILESDIR}/pyudev-0.22-fix-hypothesis.patch"
-)
-
 distutils_enable_tests pytest
 
 python_prepare_all() {
@@ -47,5 +43,8 @@ python_prepare_all() {
 	sed -i -e "s|== \('/run/udev'\)|in (\1,'/dev/.udev')|g" \
 		tests/test_core.py || die
 
+	# disable use hypothesis timeouts (too short)
+	sed -e '/@settings/s/(/(deadline=None,/' -i tests{,/_device_tests}/*.py || die
+
 	distutils-r1_python_prepare_all
 }
diff --git a/dev-python/tomli-w/tomli-w-1.0.0.ebuild b/dev-python/tomli-w/tomli-w-1.0.0.ebuild
index 2423198d4532..ad2acd4019fd 100644
--- a/dev-python/tomli-w/tomli-w-1.0.0.ebuild
+++ b/dev-python/tomli-w/tomli-w-1.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86"
 
 BDEPEND="
 	test? ( dev-python/tomli[${PYTHON_USEDEP}] )"
diff --git a/dev-python/virtualenv/Manifest b/dev-python/virtualenv/Manifest
index 1899cf67a8c6..9fdf8d5f7b5d 100644
--- a/dev-python/virtualenv/Manifest
+++ b/dev-python/virtualenv/Manifest
@@ -1,3 +1,4 @@
 DIST virtualenv-20.10.0.tar.gz 9007218 BLAKE2B 1fd37b38679b7375c1eb6e9644418b1653cb6a8dab194c8553fa113cf4a801a7c1d5e6490067767cfb198a0ef2b5ab9cf166783b9c6fac0b2c8b538949c11804 SHA512 df940aa29801a39d39be46d3518a99e93efb2113650abf81d00b4545183ec6806823ce8b754c5a3c951cb64e941944421046c709ed3de6a925489e5ac1988d48
 DIST virtualenv-20.11.1.tar.gz 9952979 BLAKE2B d8e44f5a8fedfca4eed79798be74ccfca86af2cacc076d797832028363c2d5269194e711d4511a415420285bc408373a641248a5a96cfaea326f60e023129d65 SHA512 c378bd088d9f2f6a07128d6d04b71554ad7c4de6227baea68ea486c8e10c99c40818eb9bf98cb4c950e64d0aeed4d2be40c101fbd6005d48d2eccaea0382d581
 DIST virtualenv-20.11.2.tar.gz 9953645 BLAKE2B 8bd0e5bee4fad2cdb13b1ce3e018191ef69993c9d1c66332c74908483802b2d1aff1ea1ef9acd4d94b17cacc9ae4c4014ded6ac0e7df4ea807d050d1243d5464 SHA512 18f9c6e50aa6d7b7060163b23332d7e9140199e525f7fb4efe99e84dfb298413889f4516b6e942d3e05a667774093ed521cc757a67a1698138cb793b9798a46f
+DIST virtualenv-20.12.0.tar.gz 9955140 BLAKE2B 3d01e6b08ce9002310b3659b1773bec850d23bf5bd79d414e8b8a36d7f675cfe5b16f8522758c64911d596a8c1e8994fe126037e38cfe59d42e62d4b9adad8f0 SHA512 235074d6f1edae7f350991d3774eb5b567d5fb53c86d3ec7f86b237fccd71256d0700d7ecaa6a82bc1b7611af743cc1fde2f083c43beadac5f317af69c7d1a14
diff --git a/dev-python/virtualenv/virtualenv-20.12.0.ebuild b/dev-python/virtualenv/virtualenv-20.12.0.ebuild
new file mode 100644
index 000000000000..ce207278ffde
--- /dev/null
+++ b/dev-python/virtualenv/virtualenv-20.12.0.ebuild
@@ -0,0 +1,98 @@
+# 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} pypy3 )
+DISTUTILS_USE_SETUPTOOLS=manual
+
+inherit distutils-r1
+
+DESCRIPTION="Virtual Python Environment builder"
+HOMEPAGE="
+	https://virtualenv.pypa.io/en/stable/
+	https://pypi.org/project/virtualenv/
+	https://github.com/pypa/virtualenv/
+"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+SLOT="0"
+
+RDEPEND="
+	>=dev-python/backports-entry_points_selectable-1.0.4[${PYTHON_USEDEP}]
+	>=dev-python/distlib-0.3.1[${PYTHON_USEDEP}]
+	>=dev-python/filelock-3[${PYTHON_USEDEP}]
+	>=dev-python/platformdirs-2[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-41[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]"
+# coverage is used somehow magically in virtualenv, maybe it actually
+# tests something useful
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/flaky[${PYTHON_USEDEP}]
+		>=dev-python/pip-20.0.2[${PYTHON_USEDEP}]
+		>=dev-python/pytest-freezegun-0.4.1[${PYTHON_USEDEP}]
+		>=dev-python/pytest-mock-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/pytest-timeout-1.3.4[${PYTHON_USEDEP}]
+		dev-python/wheel[${PYTHON_USEDEP}]
+		>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
+	)"
+
+# (unpackaged deps)
+#distutils_enable_sphinx docs \
+#	dev-python/sphinx-argparse \
+#	dev-python/sphinx_rtd_theme \
+#	dev-python/towncrier
+distutils_enable_tests pytest
+
+src_configure() {
+	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		tests/unit/activation/test_xonsh.py
+		tests/unit/seed/embed/test_bootstrap_link_via_app_data.py::test_seed_link_via_app_data
+		tests/unit/create/test_creator.py::test_cross_major
+	)
+	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
+		'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-isolated]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-global]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-isolated]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-global]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[root-venv-copies-isolated]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[root-venv-copies-global]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[venv-venv-copies-isolated]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[venv-venv-copies-global]'
+		'tests/unit/create/test_creator.py::test_zip_importer_can_import_setuptools'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.10-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.10--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.10-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.10--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3--bin-]'
+	)
+
+	distutils_install_for_testing
+	epytest
+}
+
+pkg_postinst() {
+	elog "Please note that while virtualenv package no longer supports"
+	elog "Python 2.7, you can still create py2.7 virtualenvs via:"
+	elog "  $ virtualenv -p 2.7 ..."
+}
diff --git a/dev-python/xmlschema/Manifest b/dev-python/xmlschema/Manifest
index 810417939fec..00196f7ae9c0 100644
--- a/dev-python/xmlschema/Manifest
+++ b/dev-python/xmlschema/Manifest
@@ -1,4 +1,2 @@
-DIST xmlschema-1.8.2.tar.gz 392045 BLAKE2B 05b63c069bc6f7052e84f7af20b789e2e9b9e54eccbc28971006b924d1eff4b23a43e2a85356214603f4c2263f2478f7cc4321c4ae93e8106f31940098ab7ae2 SHA512 3a03206c732b3d46a58bcfdeafdccb08c7f3334c78df63901352d2d2eaebaabbb663d70329bd9667530a1e8c2bf1b7087eb493f971c3fa914d8944064e12361c
-DIST xmlschema-1.9.0.tar.gz 394048 BLAKE2B 96060d971826263b3a52b3d8720c7d2421af0bf55f1603b68691a374a72d441238b790f3c7ce0e48ca436cd9939aa0f3563bd3862d5371bd57c44815777ec83a SHA512 c7763acefa6cd34a1edc5487f0c2257c871b7c5aed2466dfb1867a004e9f91603e20d458238a52da33225d9303a7262e347f20c41203dea0f0cb7400bed66838
 DIST xmlschema-1.9.1.tar.gz 394695 BLAKE2B 38cb0cbb1bb9f23ea4cd16440c175d509e57dce86bc4362facfb0c034895af7cd27b326be450def6e671320ce08d96eeabd33b2c81a682e33001d8b0e1951d13 SHA512 958052e5a3573c5e3ae08fe487cbbb219d361264920f7ffc4157faf53a4e260f256c0ad9a68575c16d2e6cc1bd75b94459ec088b08daa4a419f756f1a7044836
 DIST xmlschema-1.9.2.tar.gz 394954 BLAKE2B c8d932827f03962fcd6b1408d25cb4079b84d44984227c53922587d9c61dcf16e2b46c7df16a2795623017c1b844f3fca497e5856b6d6b2a475eabf1c49cc4cc SHA512 99abc53da52ba8f7f0f269c791b227d2b5c81d7ede847ccd98e18c5817ddd988ba26b88ad5afe0a0933e0c5af5425c0efdd4a1beb218d009e476de5b2931a0fb
diff --git a/dev-python/xmlschema/xmlschema-1.8.2.ebuild b/dev-python/xmlschema/xmlschema-1.8.2.ebuild
deleted file mode 100644
index 4c2e4712b712..000000000000
--- a/dev-python/xmlschema/xmlschema-1.8.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 2019-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="An XML Schema validator and decoder"
-HOMEPAGE="https://github.com/sissaschool/xmlschema https://pypi.org/project/xmlschema/"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/elementpath-2.3.2[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		${RDEPEND}
-		dev-python/jinja[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	"${EPYTHON}" tests/test_all.py -v ||
-		die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/xmlschema/xmlschema-1.9.0.ebuild b/dev-python/xmlschema/xmlschema-1.9.0.ebuild
deleted file mode 100644
index 4980f9b98bb3..000000000000
--- a/dev-python/xmlschema/xmlschema-1.9.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 2019-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="An XML Schema validator and decoder"
-HOMEPAGE="https://github.com/sissaschool/xmlschema https://pypi.org/project/xmlschema/"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/elementpath-2.3.2[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		${RDEPEND}
-		dev-python/jinja[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	"${EPYTHON}" tests/test_all.py -v ||
-		die "Tests fail with ${EPYTHON}"
-}