Adding metadata

40 files changed, 411 insertions, 829 deletions

diff --git a/dev-python/astroid/Manifest b/dev-python/astroid/Manifest
index 6a22cb614277..b165c8867461 100644
--- a/dev-python/astroid/Manifest
+++ b/dev-python/astroid/Manifest
@@ -2,3 +2,4 @@ DIST astroid-2.7.3.tar.gz 378876 BLAKE2B 016ab6e798f1a608c0e0ce0bd81865145349c70
 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
+DIST astroid-2.9.2.tar.gz 408664 BLAKE2B 918fcf1e90667a9f3c69689557026f282e5fbbb40a8e3c184569f53d9a005d9822538cd15401e984256f928731d44a04d1a618ca818eb1eeae57b32e94d06425 SHA512 e9523f5874dec8cc3f252efc2b2f6707999772cc9809cf982d92693182052e575eac31c7d759c9aea22068e90a9bb25d89a20bc8d89dfe2ba44ebcc04f78471e
diff --git a/dev-python/astroid/astroid-2.9.2.ebuild b/dev-python/astroid/astroid-2.9.2.ebuild
new file mode 100644
index 000000000000..20b93fd65346
--- /dev/null
+++ b/dev-python/astroid/astroid-2.9.2.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/cattrs/Manifest b/dev-python/cattrs/Manifest
index a9892b178bd0..3cab146b0e70 100644
--- a/dev-python/cattrs/Manifest
+++ b/dev-python/cattrs/Manifest
@@ -1,2 +1,3 @@
+DIST cattrs-1.10.0.gh.tar.gz 100657 BLAKE2B b0475644bdd31e12dabf7b969e1890932309497e66b45a311e97d56062e99837af11677c24e33c6d1bed6ec2c6373eab6535874115960ed450f52804a6e5d73e SHA512 51cda84d30627f9d0eb6842c45f7c91dd2f3d9a21b1a635ad21d0648d409b576f52e6127392d60bdd1b6a803f8f897f970706b9cc64b703c06387bc85cd3740e
 DIST cattrs-1.7.1.gh.tar.gz 85853 BLAKE2B 36c411ffa92eb263b85d48c81daeea1deea10d5779c6cd1f57988792ef5ec68bedc20b59620077e6500c2e41bb91e83f110467083f90219be7e2419c3880ed94 SHA512 a72370541cbec8928f9e1ae0c130c94e71d826ac522eb39062840d4b78a7f6aacd13395b677f6ff1453e327af31a71af0e5f81893f57ba33edbb53b7683835b2
 DIST cattrs-1.9.0.gh.tar.gz 102241 BLAKE2B 89cc71de97e1e63d3cfe3a4169c20e44d9fb8b85c6f939a0503d569dbf521d97ac325ead7c8bd58d4d32b6c6097a70effdf58553e334300639d6ef6c26b40bc7 SHA512 e1e4e59f802baf63cf931b3798bf39e4f18d5ab12a9aea000c2b649d34905d29ccb94f9ccdc5b2c52e48114fb9b292e59ab86da4c747243cae8a9d9ba25e768c
diff --git a/dev-python/cattrs/cattrs-1.10.0.ebuild b/dev-python/cattrs/cattrs-1.10.0.ebuild
new file mode 100644
index 000000000000..2bcde0acff19
--- /dev/null
+++ b/dev-python/cattrs/cattrs-1.10.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+inherit distutils-r1
+
+DESCRIPTION="Composable complex class support for attrs and dataclasses"
+HOMEPAGE="
+	https://pypi.org/project/cattrs/
+	https://github.com/python-attrs/cattrs/"
+SRC_URI="
+	https://github.com/python-attrs/cattrs/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/attrs-20.1.0[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		dev-python/immutables[${PYTHON_USEDEP}]
+	)"
+# test_preconf:
+#		dev-python/bson[${PYTHON_USEDEP}]
+#		dev-python/msgpack[${PYTHON_USEDEP}]
+#		dev-python/orjson[${PYTHON_USEDEP}]
+#		dev-python/pyyaml[${PYTHON_USEDEP}]
+#		dev-python/tomlkit[${PYTHON_USEDEP}]
+#		dev-python/ujson[${PYTHON_USEDEP}]
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -e 's:--benchmark.*::' -e '/addopts/d' -i pyproject.toml || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# unpackaged deps, see above
+	epytest tests --ignore tests/test_preconf.py
+}
diff --git a/dev-python/charset_normalizer/Manifest b/dev-python/charset_normalizer/Manifest
index a42349f5965f..0914f183bf25 100644
--- a/dev-python/charset_normalizer/Manifest
+++ b/dev-python/charset_normalizer/Manifest
@@ -1 +1,2 @@
+DIST charset_normalizer-2.0.10.gh.tar.gz 82368 BLAKE2B 935af7625c138f8751de60c4179ee6b0195e99366c7bbecd8e9dfdf09ea557e2eb7cb86830321f91b3b7aa3fc1b3cc376266a4c22d23aabc6dfa6b9db57beb45 SHA512 87c8cbadef8c57121f0f6e2ea9558a9d2124dc444789dd984beadae020349a4e48a484e8937399f0e99f8c87edc621d55d26a9f22fa738e468e70ed17564d7ae
 DIST charset_normalizer-2.0.9.gh.tar.gz 79757 BLAKE2B 9e4b3f65689791739f6b7509bcf9cce8f0a9c536251452b1130aa4476fa218c11087db719d8273087884a9e96b9daf32599d1386e95bda42ca31600b0b37299e SHA512 0957752c1083897193fbdfbeec453a2b279b0834c0074f9f1ae08faac51d3e281eeb0a6d8fb217885101fd04761296555364a9f957e89bf8103fdc569d249056
diff --git a/dev-python/charset_normalizer/charset_normalizer-2.0.10.ebuild b/dev-python/charset_normalizer/charset_normalizer-2.0.10.ebuild
new file mode 100644
index 000000000000..f5a3ce6ca9c0
--- /dev/null
+++ b/dev-python/charset_normalizer/charset_normalizer-2.0.10.ebuild
@@ -0,0 +1,27 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="The Real First Universal Charset Detector"
+HOMEPAGE="
+	https://pypi.org/project/charset-normalizer/
+	https://github.com/ousret/charset_normalizer/"
+SRC_URI="
+	https://github.com/Ousret/charset_normalizer/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/addopts/d' setup.cfg || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/django/Manifest b/dev-python/django/Manifest
index 53143ba51c04..15b2ebb1a2e2 100644
--- a/dev-python/django/Manifest
+++ b/dev-python/django/Manifest
@@ -1,8 +1,6 @@
-DIST Django-2.2.25.checksum.txt 2556 BLAKE2B 81743dc51043d12af7dce1f70190a1e53a6be7a8ae6f34fe10fa713321f8d432119f6e4e58679866a8d61dbe640c8c18d97dfa9a3767bbafb5732b9619ecb475 SHA512 1cc2982c3ab83c4af47adad14a07badc301f1b03640c34ac043ca663ac0e8c3c0a9c4de8ebd01e29f2e2c8441ae29826c91faa8f1d4e6f6824e7c849a868ddf7
-DIST Django-2.2.25.tar.gz 9185326 BLAKE2B 54df79f3ee75d588cdf46c931a53331894bc113563d2e472cf5472ba66eac1ed62f9e54798dd726837be2ef9598ed20936dbe5e3ff395249e7011af3d551e672 SHA512 c3d377c8d1ce54c93477615cff1cc74fc21791bc9db6b059787e07d0bc25b4d0c1a5804bf781d45ebba1f5f5c280957cff2bba063fea4fc005a1e945b9a7fa8f
-DIST Django-3.1.14.checksum.txt 2556 BLAKE2B bb17e596d076489ac00b6b3eb98ab2949692a82fbc542537f3758c2a53ea4aaeca15bf00c49b363e00d32c2d6face05e6b6e07000219cb8e5ceea2f9d9918ec2 SHA512 a0dd1e9dd739e6891435a02ce4711560c7f0c869a04d540fdb1b90d2cedfdd7d9892e442fb991c4f4cb8ca1862fd8f3a55d88a10645ecf0178d1ea63e17e8e89
-DIST Django-3.1.14.tar.gz 9659386 BLAKE2B 5e9317e777e3879f2cea3eea98018884c073eed47c3da9aab09858bc0869f4f34f48d20860c32344446498879b6c9b5cb9d5ba12f0528b703436a2c37325d286 SHA512 5356f453e23a33092221137769a594608771c5832c0dc00453e571fee056438b5366eba720b1fefa33099356980ee56a9665fc6ed7c86f5412e45d6432940e64
-DIST Django-3.2.10.checksum.txt 2556 BLAKE2B cdc1b28f213e43b27b0534587b8475bd68979f3c179357a7978109fa85ee0a4bbd5d0bba4625e6850aca603f688483dbdcb102a7411e74394079d2b0c0ef767e SHA512 852f867a5a11f11f98710cf27fdba2774de537dbe1e5edc402214acb65a6e00bf05a7b4fe5eb663cc21aa6ee9da890d7c74172a17c1b084db89ada1ff1db3745
-DIST Django-3.2.10.tar.gz 9811341 BLAKE2B a2ed3dda0d88a884443cc07446921fcd9cc9f302b5f578910f2e4027f8d87b92717bb22a7bf73cdb44fb7ddf4c178349e31eee6b796a45727356cde24e41d318 SHA512 6b793a1e544ab988d909d9fc5152d9dbba864c4916bb1f703a07c72f1a945ba93ba53b2f8843b67a16d0e68a736c43faf2f3d8aaa0867de1668c3845c24da7da
-DIST Django-4.0.checksum.txt 2529 BLAKE2B 0488acaf4fe37c99e3bd2370d47c47db81ffcad961212a88e7d53349299fdb3cbdc4a10fea3729d6d2353405216b8073abe8fcb2596b845760f16f2539ba4417 SHA512 26ac6ce6118d60d7bd0f0ef4c24c590eef7a102f546c3163000ad392d8f64b1c24648b8a4110df81170d60e3528466ceae974d408a700cf238dfdb8f9386d1ce
-DIST Django-4.0.tar.gz 9980403 BLAKE2B fb3cdaa8beae6983930d1e2760d617f1a96e52d7f538269709b07cc31ef049511b0517c1538934cf9ede5e374cd466df05ebabe29f1f8fb8c4c3928e8a08a1fc SHA512 6fec0521ee7da209f3b0fb1487ef4e8ef16bf3bf4ea108efc7a2ee3a9d28c7c33e5e3b2bd92e231641b0be902b45d1fd8b712c48a33496ae2c865a3698b25e14
+DIST Django-2.2.26.checksum.txt 2561 BLAKE2B a974c7d5c8cef76e781e4fa1559725cc7d77de3d16b08ec20d034b38cb39a986b62397532bbc81d4414b3eae8a5487a9fef9615eed73946a54a2b43cdf34a6ad SHA512 7c1d3e04913237ed0dc9955eedd02cfb5113b9536ed0b471d873269ec82099561714a061b74bf212c2e99bbe47e6cf72e639358a2f9134f751fdd7cd53e6ce17
+DIST Django-2.2.26.tar.gz 9207984 BLAKE2B abd520bc5681b8450e51c4248eb97558daa6a87f74915bea8857843a5ea9be6bf3a04c9f5871c35d2076adb644da266c7b88ac39bb2837ff1eaa71f885bd08bf SHA512 2005b081e7347f6f8fd4837219043bd1728cd85aca00c62a16432f63272abec7d30b7461675708fa0f55e3273af5bbd67c26d31934f8a4a38f48e65ea721916f
+DIST Django-3.2.11.checksum.txt 2561 BLAKE2B ece4f40d4d368e2e5ad3cc3ed6072aa8d1693b47d68b76020059508bfc10a30f6291f5e84c68bb959fa973c4e060bf4fd408beefaedc13b68e81b721cb78aab3 SHA512 4f2c12088cfb69f547ba687e9cac34b68a9bd28c793482430bda078f51e780b1272de7ec7816dc31d2fa93bf1c68973f847d67c01414fc8bf07fa6f6ea09dc39
+DIST Django-3.2.11.tar.gz 9821958 BLAKE2B 8f83db578e31c3cbeca67bd826b4c639b346e449de83aba6ddf6bf4eef1fc58ebcbbddf91227012e592516d7796d9f3cc468ae4ce51d684b4aa0a417bb39ddb1 SHA512 ea1ca9a76afcd7e20d0ce518efc0497bbd11f4ab7ed20bd4490561bfcfc6c80db8922a22d8aca94c1dc2743e7366b28a0ae76c3d64f55afc142c38a744dd5120
+DIST Django-4.0.1.checksum.txt 2552 BLAKE2B 123a613af7ff1ccb423c11086501a4419d86cf07c0ae7a4751f12d32f1592916e72e3e47cee13192944a3fc05ce5ee7ac81038118e346545536f313a10783de6 SHA512 979a7c5efafd4d8923d6c769ddd7d73c67482c33fd1a76c64d75aee0a03399e35703e7cbde9f5ad25baab969c33ab53690400e39c879e54066a146944e5d0ee1
+DIST Django-4.0.1.tar.gz 9995484 BLAKE2B af05ec1ec1d079e383efc590de78413b7fd769e7f03c5d4bdcfd26f193a46f783b4c3428558f5d3281cab9a7fa8be4cfecdc4edaf1bea72f37e8e983b3c061f1 SHA512 7753c516b080c10673c3a95e8ec4af00984aeed5f288e4d6e7ab1efd461222a343701b21cfd27bc61ee4e63df5ce3f3be49398490a995f6839e63b40c3fe306c
diff --git a/dev-python/django/django-2.2.25.ebuild b/dev-python/django/django-2.2.26.ebuild
index fa078dfb1ec2..e45580009a2a 100644
--- a/dev-python/django/django-2.2.25.ebuild
+++ b/dev-python/django/django-2.2.26.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
diff --git a/dev-python/django/django-3.1.14.ebuild b/dev-python/django/django-3.1.14.ebuild
deleted file mode 100644
index 231020bd1955..000000000000
--- a/dev-python/django/django-3.1.14.ebuild
+++ /dev/null
@@ -1,95 +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?,threads(+)'
-
-inherit bash-completion-r1 distutils-r1 optfeature verify-sig
-
-MY_P=${P^}
-DESCRIPTION="High-level Python web framework"
-HOMEPAGE="https://www.djangoproject.com/ https://pypi.org/project/Django/"
-SRC_URI="
-	https://media.djangoproject.com/releases/$(ver_cut 1-2)/${MY_P}.tar.gz
-	verify-sig? ( https://media.djangoproject.com/pgp/${MY_P}.checksum.txt )"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="BSD"
-# admin fonts: Roboto (media-fonts/roboto)
-LICENSE+=" Apache-2.0"
-# admin icons, jquery, xregexp.js
-LICENSE+=" MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~sparc x86 ~x64-macos"
-IUSE="doc sqlite test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/asgiref-3.3.4[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	>=dev-python/sqlparse-0.2.2[${PYTHON_USEDEP}]"
-BDEPEND="
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		$(python_gen_impl_dep sqlite)
-		${RDEPEND}
-		dev-python/docutils[${PYTHON_USEDEP}]
-		dev-python/jinja[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pillow[webp,${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/selenium[${PYTHON_USEDEP}]
-		dev-python/tblib[${PYTHON_USEDEP}]
-		sys-devel/gettext
-		!!<dev-python/ipython-7.21.0-r1
-		!!=dev-python/ipython-7.22.0-r0
-	)
-	verify-sig? ( >=sec-keys/openpgp-keys-django-20201201 )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.1-bashcomp.patch
-)
-
-distutils_enable_sphinx docs --no-autodoc
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/django.asc
-
-src_unpack() {
-	if use verify-sig; then
-		cd "${DISTDIR}" || die
-		verify-sig_verify_signed_checksums \
-			"${MY_P}.checksum.txt" sha256 "${MY_P}.tar.gz"
-		cd "${WORKDIR}" || die
-	fi
-
-	default
-}
-
-python_test() {
-	# Tests have non-standard assumptions about PYTHONPATH,
-	# and don't work with ${BUILD_DIR}/lib.
-	PYTHONPATH=. "${EPYTHON}" tests/runtests.py --settings=test_sqlite -v2 ||
-		die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	newbashcomp extras/django_bash_completion ${PN}-admin
-	bashcomp_alias ${PN}-admin django-admin.py
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature_header "Additional Backend support can be enabled via:"
-	optfeature "MySQL backend support" dev-python/mysqlclient
-	optfeature "PostgreSQL backend support" dev-python/psycopg:2
-	optfeature_header
-	optfeature "GEO Django" "sci-libs/gdal[geos]"
-	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
-	optfeature "ImageField Support" dev-python/pillow
-	optfeature "Password encryption" dev-python/bcrypt
-	optfeature "High-level abstractions for Django forms" dev-python/django-formtools
-}
diff --git a/dev-python/django/django-3.2.10.ebuild b/dev-python/django/django-3.2.11.ebuild
index cb0818c55feb..6eadcef02ca5 100644
--- a/dev-python/django/django-3.2.10.ebuild
+++ b/dev-python/django/django-3.2.11.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/django/django-4.0.ebuild b/dev-python/django/django-4.0.1.ebuild
index 8caeaf98ea28..4adbc6132a0e 100644
--- a/dev-python/django/django-4.0.ebuild
+++ b/dev-python/django/django-4.0.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/jc/Manifest b/dev-python/jc/Manifest
index 1b84e0209f9a..7b340058ce67 100644
--- a/dev-python/jc/Manifest
+++ b/dev-python/jc/Manifest
@@ -2,3 +2,4 @@ DIST jc-1.16.0.tar.gz 2532019 BLAKE2B 583d52102a2e27a53171d300fb6e9ac094d5b09496
 DIST jc-1.17.3.tar.gz 3814789 BLAKE2B 09134b85c881b2701d7db68f0a16eb6f696aeb5e4fa8b6a0b1aff148adbad302fcc9019944acc45b5830966f0ffae90ff4c006895d559ca47595347442e72a5c SHA512 6cc36abcb9d57eb95b36968647a0923f3d6d39aed478df83e9d4437b0ea4aba49a5f08d9f61ba88f3a76ce3b57c2e019e7cec5b89e71ce7be8186e9e18ab4ad7
 DIST jc-1.17.4.tar.gz 3818285 BLAKE2B 0761e923916c61125967451f3b4806e3080184106c84e2c85f5de8b37d03106bde98d1b4d99f4d00308b7d935898e81cd5c7d112ed611dd4707074019becc968 SHA512 b5fc437be425d60c5e859ed9107be8a3190bc5e1eb157b01cd3b4cdcf27ccab51b6d0299f0c462b1e595d741bf905c11b25d49568159f04aa4443f51889027b6
 DIST jc-1.17.5.tar.gz 3851890 BLAKE2B 86b6c1b9786bbe30138cb7ba5171fd14682b420c3ff11716ab5d1bd4e4cc3d95067ca836c6217040799607933037b3cd6dc49e6395831140c10906e8be530685 SHA512 6e7207af158be41cf55ac7f9400c1a676075e85de0fecd63d9ddcffeed5d903a9619ac52b955d10e0db354f97e73fb9766b96e51c5648104907426000ecd1594
+DIST jc-1.17.6.tar.gz 3876556 BLAKE2B 97f84a6d1351102bc016e104c4f6d5aa8a7a47fa5ecbdad66df75253adee323259961d555d728b11090df9a05d74dfae0720655f8ea21864479b7e59f95dffa7 SHA512 a70dd9dc79a99c147aca8e647722820ba69f7668415eeea24be336e2c14728808938fa2d9e19122849ad0c1d89684f08d1ff0dc6361137eb9fbacba6546857ca
diff --git a/dev-python/jc/jc-1.17.6.ebuild b/dev-python/jc/jc-1.17.6.ebuild
new file mode 100644
index 000000000000..76ac2b8ddd0c
--- /dev/null
+++ b/dev-python/jc/jc-1.17.6.ebuild
@@ -0,0 +1,25 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Converts the output of popular command-line tools and file-types to JSON"
+HOMEPAGE="https://github.com/kellyjonbrazil/jc"
+SRC_URI="
+	https://github.com/kellyjonbrazil/jc/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/ruamel-yaml[${PYTHON_USEDEP}]
+	dev-python/xmltodict[${PYTHON_USEDEP}]"
+
+distutils_enable_tests unittest
diff --git a/dev-python/libarchive-c/Manifest b/dev-python/libarchive-c/Manifest
index 22e774256cb4..403767c9fef7 100644
--- a/dev-python/libarchive-c/Manifest
+++ b/dev-python/libarchive-c/Manifest
@@ -1,2 +1 @@
-DIST libarchive-c-3.1.tar.gz 11145 BLAKE2B 80d8918423ec23065cfd7dc391f458bdd44ade765c5e16c23f6cd1ff760e750551d1ff16ccd524a409f466512cb4caed9d25716d12021eafc915a9904bfd0f63 SHA512 1863e2981475839aebce50aa649f603dae7d54772fb864a83613e1d94ead48b64e0edfa0046fb91d1fc985a351911dcd13a24cddfefbb5b7403da1107dc3353c
 DIST libarchive-c-3.2.tar.gz 44896 BLAKE2B 9e984c8e23422ceb552d34d4560b2c8279e1c2d52ffedcc893af3a1a8420eb03b735058d2f8dbe542f3920d0f0bf53777f0679a238cc0368e8e680c44358a72c SHA512 d11a7da0e592b7fce5044b9ff2930e50004c15b166a76f7871b9d0d584cb6da5989c4ec79969439b00baffa564738af607cdf5e37141c6e879b8a76ae68c325c
diff --git a/dev-python/libarchive-c/libarchive-c-3.1.ebuild b/dev-python/libarchive-c/libarchive-c-3.1.ebuild
deleted file mode 100644
index b9c4b1eb1559..000000000000
--- a/dev-python/libarchive-c/libarchive-c-3.1.ebuild
+++ /dev/null
@@ -1,17 +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="A Python interface to libarchive"
-HOMEPAGE="https://github.com/Changaco/python-libarchive-c/ https://pypi.org/project/libarchive-c/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="CC0-1.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-
-RDEPEND="app-arch/libarchive"
diff --git a/dev-python/libvirt-python/Manifest b/dev-python/libvirt-python/Manifest
index 5eacddaa6177..f7f599c4ed66 100644
--- a/dev-python/libvirt-python/Manifest
+++ b/dev-python/libvirt-python/Manifest
@@ -1,20 +1,4 @@
-DIST libvirt-python-7.0.0.tar.gz 214945 BLAKE2B 9ab616fa6336a284dbb1dcebf0be6a06d9ca0c41e83ca403cb335c61ff217e1e9f0343fc915e20e16f3e59adc5c7b1c51e493143c45cd50f48f627ebe2e9c211 SHA512 c56bc53da06a81d330389f684df204d0ae8edb28127eccd81ac551342a0965341d20832f6e2b044e02e9217320349f6f5cb36098c5cc46508a4026fb1e59c4ac
-DIST libvirt-python-7.0.0.tar.gz.asc 833 BLAKE2B 54102c29a46900dc5439ca5b96d17d0f3923fb1cb5fa74ef7671a49645c5e5d7f43b608099f542410ca38d675a384e2ad3fdfd7494bda6e66b889ec3d9f04e9e SHA512 4ca5cf4e3687e3cbdb3bf9991076ef4d0427db4b7eb27738d4463c5645d684581dd20377339e6bdac66e790f10709df9f483dd9f360a1b978776fe5d3e2dcc64
-DIST libvirt-python-7.1.0.tar.gz 215468 BLAKE2B 5734f686760d118bc326c68d93714db31b65d0d2f8495c8fb7788aa59658680cc07b8c522e5854bafc6a75989cee4b7c817ec0f54ae5ebcb76ed74418fa1c0f0 SHA512 9c4adf0107b2b6d8ac3f84f4a201733b851b5c518e498b4bb8fe3531ec8923b2a96e5593ee0fe309b9501884a83e77a6a0347a6714293febf907c9a4dc742cd4
-DIST libvirt-python-7.1.0.tar.gz.asc 833 BLAKE2B be4101dcff4f95e36929dc70657a527e7b0b30fe9556c8d42f240459f86f7ba71980cf483f4d828d63cf94ce3c4521e7303d72f6df5e6c4c2a6de1b160970073 SHA512 db0213bb95d77c690ef8726ae559cae7970d31e633104993e715dd4e34e2f3c52bdcf7303e90419055d571d21417ac6375d78463143e20e94bf4aaf666684174
 DIST libvirt-python-7.10.0.tar.gz 218394 BLAKE2B be1b64489503ca2e8bcaafc516ab228052b4e3e486aef1ef5310a95051a9549fe262feb009356f3735a3656e7b445ef6943b1932373be3618c36445042da8565 SHA512 db3c6ccffa3c2f38b788964f7a9cedee3e8de64fb5ecb65ac859eeac1450bea1ade8a7259a6035d7ee25af7d861b2e87f6eba24c21cab3f483c1a97318181d7e
 DIST libvirt-python-7.10.0.tar.gz.asc 833 BLAKE2B cf9d661bafd7e2ee52e895d3b5aa7d569226f90b4924a95c4178fb724847bfdcd085b04ae33a315480b20115318604809bc4a7edce5c801fd1286581cd8989a5 SHA512 f36d47b4b78daa1e848954acb3032750fc9bec58723b9bd04c48ca1a9b45e1a0252b85adef239080f6aef199c836d04db283510b099c69792e1c4b403c7d3685
-DIST libvirt-python-7.2.0.tar.gz 215380 BLAKE2B e9c55a193c571b8fdf3f7f2545ae82470ff74e74e4f2fb58dda6278bc484eb26ae84f2991bc34adc6030973e7d53d364576247e1f8ab836edea06a5da0f8575e SHA512 6df5be4d98884751e4a098b54ec1d8827268993b6df5769c1a687420dd5889c629ca0bd286f5a0c22a9c81974fa02565b36628f8026c697ae414137f0c1d8441
-DIST libvirt-python-7.2.0.tar.gz.asc 833 BLAKE2B 3f93f4841da3d86c6a0ba073b70c44e3732eb0ca91fd80a7089c1731851173d163101428d07f82f688478a7967e71bd66b49cd70673157428d2c4802a5df3bae SHA512 fe4f7bf6a9ea6e008ed73fac588785281582dd5eaa738e5ca05b88534659096af137408e1222f791d5a13190358fcf5d30eaa8d8a24791e3b5a15622516fe05f
-DIST libvirt-python-7.3.0.tar.gz 216823 BLAKE2B 2f7ff569e1dc05ac013e21046eab26290d1977401cda063f9f60e27f09cbe7ab1f30e17c2d9dfb11b36930a7af8496f2d36b19760819c64836844ce8daf8da01 SHA512 a99c0d7258364464df6a68e5fee3137daab3e6ef0dc8924b95a2b7bb69bcaf221d6be17d004ec994e9fae223db920360352b5b32945586ecc1407cb6bd86682a
-DIST libvirt-python-7.3.0.tar.gz.asc 833 BLAKE2B b5c26dbf520570ab0b66f3b31a2570a6bab0e252970d0a952411b91d08141edb1a7b53a7404e29426558502dec3f9260bfc815209c524a761b87a70004acd008 SHA512 8467a0af37849b64aab33ff1083f6feb82c39f6c732f53f407037d3f7add5c5007e16d5906e268576239d61ab8d871356fd3e476b8a64fa7aeb51b018383dcf0
-DIST libvirt-python-7.4.0.tar.gz 217038 BLAKE2B a8cec1ab8652b2579daea23b746d01c58bff32cb59a0c3b18a93ff309dcfd2b60915c52cb907c3961289427da5e73c4cae973d4204c352b5892222255e05b576 SHA512 e266b04604a21c0c35cb6c080ca5279f3162dfc489fd5ed9542b9ff49567b02074bcac135897d1a8f2375a744c000dbd93b67831621744c2f596b16ca9116d1d
-DIST libvirt-python-7.4.0.tar.gz.asc 833 BLAKE2B c092743b62ed256267c129d253332322ffd1ee46b054938eb99404db81379cb8c6422e045f1855076f6420ce08e4482ab77db71e2ef6d38bc35136e95858684c SHA512 bca8a981517782e204f51eba465cf101aa0bcbf60e0e26a655c5fa2faaf1585b17988e627bd26b98bef2b95536ae852590773806365cff94860845acf2534d54
-DIST libvirt-python-7.5.0.tar.gz 217284 BLAKE2B 65bae31bc484da061e116c5fe0da68df07ec42160db852c9fb83a5c6f91762d762638fec918ea6164400622178e4cacc416ff343fd2df1bd94a62f1b1a6b93a7 SHA512 ae111e4b7db5662af5315642232e2308ebc349bf80a3f9fd372b0fa0ebcde8e25690368187c86d425faef397550caad3366e7b6a3e6a0c4b56fa58df5e8bc276
-DIST libvirt-python-7.5.0.tar.gz.asc 833 BLAKE2B a6963fe069985a3c4f24007f45dc04b26517dff38ff5f14b00816a65651d83ca5e68cc6e168a318240152da5e20d75176ece9108e50f1e1d3d074dc5d4942f5e SHA512 029ada81b25445df8107651b11299a9ad259c6f990ad5d1aad617e65af49493fe824989fd9ade2703c927c59f1a15ea50c4af2d90ddf3da41aabeccdd399730f
 DIST libvirt-python-7.7.0.tar.gz 217406 BLAKE2B 4e3e887f9778ca817028d9147913618dcbdc83d05ce01b05b80661bb4cc823de6dc0e9d9b0837bf344774e5a8cdbaec7d4a7e55ce902b2867159795b85800cdc SHA512 07aa75a19dc94f3bde49b1af50fa73a6c920059b3b9ca943354c59f174d756aa5d1dca1394844dc3197b6a22c440028d347480a17858bc18fe1b5b19cf7d797f
 DIST libvirt-python-7.7.0.tar.gz.asc 833 BLAKE2B 159f5b5ec60d3b7966f3f99c185eddb8d2d03480b203473ae47e6139b21f8a4ee8bb8ba28ccacb88ad42c7b47d45862ccb48c90151203fb4e2295f355984e538 SHA512 b58579e648b82ec51de5f15e30dee39f7c42edf47ade4ad6f580bef21191f649b03eb05906bf31baa19afb6fadb57662c5326edb53b056a7235308d9c3bd551d
-DIST libvirt-python-7.8.0.tar.gz 218185 BLAKE2B bc975dfacb73517a3c9771d8d692411a6ec1cdfc2e8605d6cae28e8b6e3b74e15e882cd45b8369802b07e4b583795377d2f005cf1462a76e9f98c33591b472fd SHA512 e50dacc8214849dc2fa752e21061826463753b912765c3186948c9d634c18f0be8b579acd7765878aea27b2cd6f65e7113a8f8b90791ad76c69834d4e947b6cd
-DIST libvirt-python-7.8.0.tar.gz.asc 833 BLAKE2B 47a4b7a582caf04a9cf805e530af507733102fc13d952a5107ca9b25e62dd4159fddd9325055b1f647eecb17dd311811325f421a31e76b86e401815e11c65196 SHA512 2b5464b982881bc2927ce3932bb73a7bec2204b549aa3068bdfcf52232bd40141b09064280864a4c1dbcfe7fe31041bbee070d5ce7ce33afccb3d431f7119d4f
-DIST libvirt-python-7.9.0.tar.gz 218332 BLAKE2B 421dfe2b3eb4103516ed124fc6a4b0d5d0c7c3d30e17a2a16eb3763433f53bb72ae0d95034fa41b01e331e9090c18618ee57493afae4757f8e864fa208cdcc42 SHA512 d147da38710853c1dcf93dc271b1d1ff32afb45e3eb5c24c931da4943827ecec0c3840b975fb40e240ec7038cc81cb7848d387e7550e4f4803f35e2d08cbedff
-DIST libvirt-python-7.9.0.tar.gz.asc 833 BLAKE2B 3037a0fd66ad0c0706b76c6b64552d69b5f93ef2377c5cb02dbf62f85e47ee7d76970fa5bf3aa5653751f022e4f44e081d009dedbdffe677b1b288e2e8f9c498 SHA512 4bbd38d27c5b4ccc5623425de8dc3c0e1bec2560a4e52bbf2ec7b0ea2984563501e77157d234ad03a988ddaa9ba20545b3086582c93cd51cf8e756c7c7e55ff5
diff --git a/dev-python/libvirt-python/libvirt-python-7.0.0.ebuild b/dev-python/libvirt-python/libvirt-python-7.0.0.ebuild
deleted file mode 100644
index e5ed3a021881..000000000000
--- a/dev-python/libvirt-python/libvirt-python-7.0.0.ebuild
+++ /dev/null
@@ -1,51 +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} )
-
-DISTUTILS_USE_SETUPTOOLS=no
-
-MY_P="${P/_rc/-rc}"
-
-inherit distutils-r1 verify-sig
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://libvirt.org/git/libvirt-python.git"
-	RDEPEND="app-emulation/libvirt:=[-python(-)]"
-else
-	SRC_URI="https://libvirt.org/sources/python/${MY_P}.tar.gz
-		verify-sig? ( https://libvirt.org/sources/python/${MY_P}.tar.gz.asc )"
-	KEYWORDS="amd64 ~arm64 ~ppc64 x86"
-	RDEPEND="app-emulation/libvirt:0/${PV}"
-fi
-S="${WORKDIR}/${P%_rc*}"
-
-DESCRIPTION="libvirt Python bindings"
-HOMEPAGE="https://www.libvirt.org"
-LICENSE="LGPL-2"
-SLOT="0"
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/libvirt.org.asc
-IUSE="examples test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	virtual/pkgconfig
-	test? (
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-	)
-	verify-sig? ( sec-keys/openpgp-keys-libvirt )
-"
-
-distutils_enable_tests setup.py
-
-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/libvirt-python/libvirt-python-7.1.0.ebuild b/dev-python/libvirt-python/libvirt-python-7.1.0.ebuild
deleted file mode 100644
index c1b72bb140cc..000000000000
--- a/dev-python/libvirt-python/libvirt-python-7.1.0.ebuild
+++ /dev/null
@@ -1,51 +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} )
-
-DISTUTILS_USE_SETUPTOOLS=no
-
-MY_P="${P/_rc/-rc}"
-
-inherit distutils-r1 verify-sig
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://libvirt.org/git/libvirt-python.git"
-	RDEPEND="app-emulation/libvirt:=[-python(-)]"
-else
-	SRC_URI="https://libvirt.org/sources/python/${MY_P}.tar.gz
-		verify-sig? ( https://libvirt.org/sources/python/${MY_P}.tar.gz.asc )"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-	RDEPEND="app-emulation/libvirt:0/${PV}"
-fi
-S="${WORKDIR}/${P%_rc*}"
-
-DESCRIPTION="libvirt Python bindings"
-HOMEPAGE="https://www.libvirt.org"
-LICENSE="LGPL-2"
-SLOT="0"
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/libvirt.org.asc
-IUSE="examples test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	virtual/pkgconfig
-	test? (
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-	)
-	verify-sig? ( sec-keys/openpgp-keys-libvirt )
-"
-
-distutils_enable_tests setup.py
-
-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/libvirt-python/libvirt-python-7.2.0.ebuild b/dev-python/libvirt-python/libvirt-python-7.2.0.ebuild
deleted file mode 100644
index c1b72bb140cc..000000000000
--- a/dev-python/libvirt-python/libvirt-python-7.2.0.ebuild
+++ /dev/null
@@ -1,51 +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} )
-
-DISTUTILS_USE_SETUPTOOLS=no
-
-MY_P="${P/_rc/-rc}"
-
-inherit distutils-r1 verify-sig
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://libvirt.org/git/libvirt-python.git"
-	RDEPEND="app-emulation/libvirt:=[-python(-)]"
-else
-	SRC_URI="https://libvirt.org/sources/python/${MY_P}.tar.gz
-		verify-sig? ( https://libvirt.org/sources/python/${MY_P}.tar.gz.asc )"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-	RDEPEND="app-emulation/libvirt:0/${PV}"
-fi
-S="${WORKDIR}/${P%_rc*}"
-
-DESCRIPTION="libvirt Python bindings"
-HOMEPAGE="https://www.libvirt.org"
-LICENSE="LGPL-2"
-SLOT="0"
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/libvirt.org.asc
-IUSE="examples test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	virtual/pkgconfig
-	test? (
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-	)
-	verify-sig? ( sec-keys/openpgp-keys-libvirt )
-"
-
-distutils_enable_tests setup.py
-
-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/libvirt-python/libvirt-python-7.3.0.ebuild b/dev-python/libvirt-python/libvirt-python-7.3.0.ebuild
deleted file mode 100644
index 09b75e996203..000000000000
--- a/dev-python/libvirt-python/libvirt-python-7.3.0.ebuild
+++ /dev/null
@@ -1,51 +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} )
-
-DISTUTILS_USE_SETUPTOOLS=no
-
-MY_P="${P/_rc/-rc}"
-
-inherit distutils-r1 verify-sig
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://libvirt.org/git/libvirt-python.git"
-	RDEPEND="app-emulation/libvirt:=[-python(-)]"
-else
-	SRC_URI="https://libvirt.org/sources/python/${MY_P}.tar.gz
-		verify-sig? ( https://libvirt.org/sources/python/${MY_P}.tar.gz.asc )"
-	KEYWORDS="amd64 ~arm64 ~ppc64 x86"
-	RDEPEND="app-emulation/libvirt:0/${PV}"
-fi
-S="${WORKDIR}/${P%_rc*}"
-
-DESCRIPTION="libvirt Python bindings"
-HOMEPAGE="https://www.libvirt.org"
-LICENSE="LGPL-2"
-SLOT="0"
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/libvirt.org.asc
-IUSE="examples test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	virtual/pkgconfig
-	test? (
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-	verify-sig? ( sec-keys/openpgp-keys-libvirt )
-"
-
-distutils_enable_tests setup.py
-
-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/libvirt-python/libvirt-python-7.4.0.ebuild b/dev-python/libvirt-python/libvirt-python-7.4.0.ebuild
deleted file mode 100644
index ed8314b57f73..000000000000
--- a/dev-python/libvirt-python/libvirt-python-7.4.0.ebuild
+++ /dev/null
@@ -1,51 +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} )
-
-DISTUTILS_USE_SETUPTOOLS=no
-
-MY_P="${P/_rc/-rc}"
-
-inherit distutils-r1 verify-sig
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://libvirt.org/git/libvirt-python.git"
-	RDEPEND="app-emulation/libvirt:=[-python(-)]"
-else
-	SRC_URI="https://libvirt.org/sources/python/${MY_P}.tar.gz
-		verify-sig? ( https://libvirt.org/sources/python/${MY_P}.tar.gz.asc )"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-	RDEPEND="app-emulation/libvirt:0/${PV}"
-fi
-S="${WORKDIR}/${P%_rc*}"
-
-DESCRIPTION="libvirt Python bindings"
-HOMEPAGE="https://www.libvirt.org"
-LICENSE="LGPL-2"
-SLOT="0"
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/libvirt.org.asc
-IUSE="examples test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	virtual/pkgconfig
-	test? (
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-	verify-sig? ( sec-keys/openpgp-keys-libvirt )
-"
-
-distutils_enable_tests setup.py
-
-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/libvirt-python/libvirt-python-7.5.0.ebuild b/dev-python/libvirt-python/libvirt-python-7.5.0.ebuild
deleted file mode 100644
index ed8314b57f73..000000000000
--- a/dev-python/libvirt-python/libvirt-python-7.5.0.ebuild
+++ /dev/null
@@ -1,51 +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} )
-
-DISTUTILS_USE_SETUPTOOLS=no
-
-MY_P="${P/_rc/-rc}"
-
-inherit distutils-r1 verify-sig
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://libvirt.org/git/libvirt-python.git"
-	RDEPEND="app-emulation/libvirt:=[-python(-)]"
-else
-	SRC_URI="https://libvirt.org/sources/python/${MY_P}.tar.gz
-		verify-sig? ( https://libvirt.org/sources/python/${MY_P}.tar.gz.asc )"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-	RDEPEND="app-emulation/libvirt:0/${PV}"
-fi
-S="${WORKDIR}/${P%_rc*}"
-
-DESCRIPTION="libvirt Python bindings"
-HOMEPAGE="https://www.libvirt.org"
-LICENSE="LGPL-2"
-SLOT="0"
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/libvirt.org.asc
-IUSE="examples test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	virtual/pkgconfig
-	test? (
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-	verify-sig? ( sec-keys/openpgp-keys-libvirt )
-"
-
-distutils_enable_tests setup.py
-
-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/libvirt-python/libvirt-python-7.8.0.ebuild b/dev-python/libvirt-python/libvirt-python-7.8.0.ebuild
deleted file mode 100644
index ed8314b57f73..000000000000
--- a/dev-python/libvirt-python/libvirt-python-7.8.0.ebuild
+++ /dev/null
@@ -1,51 +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} )
-
-DISTUTILS_USE_SETUPTOOLS=no
-
-MY_P="${P/_rc/-rc}"
-
-inherit distutils-r1 verify-sig
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://libvirt.org/git/libvirt-python.git"
-	RDEPEND="app-emulation/libvirt:=[-python(-)]"
-else
-	SRC_URI="https://libvirt.org/sources/python/${MY_P}.tar.gz
-		verify-sig? ( https://libvirt.org/sources/python/${MY_P}.tar.gz.asc )"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-	RDEPEND="app-emulation/libvirt:0/${PV}"
-fi
-S="${WORKDIR}/${P%_rc*}"
-
-DESCRIPTION="libvirt Python bindings"
-HOMEPAGE="https://www.libvirt.org"
-LICENSE="LGPL-2"
-SLOT="0"
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/libvirt.org.asc
-IUSE="examples test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	virtual/pkgconfig
-	test? (
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-	verify-sig? ( sec-keys/openpgp-keys-libvirt )
-"
-
-distutils_enable_tests setup.py
-
-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/libvirt-python/libvirt-python-7.9.0.ebuild b/dev-python/libvirt-python/libvirt-python-7.9.0.ebuild
deleted file mode 100644
index ed8314b57f73..000000000000
--- a/dev-python/libvirt-python/libvirt-python-7.9.0.ebuild
+++ /dev/null
@@ -1,51 +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} )
-
-DISTUTILS_USE_SETUPTOOLS=no
-
-MY_P="${P/_rc/-rc}"
-
-inherit distutils-r1 verify-sig
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://libvirt.org/git/libvirt-python.git"
-	RDEPEND="app-emulation/libvirt:=[-python(-)]"
-else
-	SRC_URI="https://libvirt.org/sources/python/${MY_P}.tar.gz
-		verify-sig? ( https://libvirt.org/sources/python/${MY_P}.tar.gz.asc )"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-	RDEPEND="app-emulation/libvirt:0/${PV}"
-fi
-S="${WORKDIR}/${P%_rc*}"
-
-DESCRIPTION="libvirt Python bindings"
-HOMEPAGE="https://www.libvirt.org"
-LICENSE="LGPL-2"
-SLOT="0"
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/libvirt.org.asc
-IUSE="examples test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	virtual/pkgconfig
-	test? (
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-	verify-sig? ( sec-keys/openpgp-keys-libvirt )
-"
-
-distutils_enable_tests setup.py
-
-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/nbconvert/Manifest b/dev-python/nbconvert/Manifest
index 089ca9e3bdc8..d0665ac6c8c4 100644
--- a/dev-python/nbconvert/Manifest
+++ b/dev-python/nbconvert/Manifest
@@ -1 +1,2 @@
 DIST nbconvert-6.3.0.tar.gz 900850 BLAKE2B 8ef7d3bfcb914bf4be064ef440faab283fcc71e53579a681deb343d307a8b39cca2d0b83828b9df7c45ee7e9e06164ba6daa234b678197bc8a3202cd7e560c06 SHA512 efbe18c50e408fcb7d920c5ee070d19e19f0347f7073cf86b45046f3e30bd30ab8174115c539020fbf404faf5fc6e55dc7df1ad27accb45f1b2acf2db1d325e6
+DIST nbconvert-6.4.0.tar.gz 901586 BLAKE2B 85087046fe9a211c077165f47c03e7b025c770e2d409278703ddeef3c84b3d60e1ad28650f67fb9d68b72ad077db5bbd99af5c81ddf94fd7bf67471701dbdc4a SHA512 12662cca240a4c57a41e3bc7fedebd51c6fb83a0740afa7acfcc25424ca544a44b4dbfecfb9edb396360866de0b8fafad124fbb87c46c6f796661a7f40e96f68
diff --git a/dev-python/nbconvert/nbconvert-6.4.0.ebuild b/dev-python/nbconvert/nbconvert-6.4.0.ebuild
new file mode 100644
index 000000000000..90e875f7bb2f
--- /dev/null
+++ b/dev-python/nbconvert/nbconvert-6.4.0.ebuild
@@ -0,0 +1,73 @@
+# 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="Converting Jupyter Notebooks"
+HOMEPAGE="https://nbconvert.readthedocs.io/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/bleach[${PYTHON_USEDEP}]
+	dev-python/defusedxml[${PYTHON_USEDEP}]
+	>=dev-python/entrypoints-0.2.2[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/jupyter_core[${PYTHON_USEDEP}]
+	dev-python/jupyterlab_pygments[${PYTHON_USEDEP}]
+	>=dev-python/mistune-0.7.4[${PYTHON_USEDEP}]
+	dev-python/nbclient[${PYTHON_USEDEP}]
+	dev-python/nbformat[${PYTHON_USEDEP}]
+	>=dev-python/pandocfilters-1.4.1[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-5.1.1[${PYTHON_USEDEP}]
+	dev-python/testpath[${PYTHON_USEDEP}]
+	www-servers/tornado[${PYTHON_USEDEP}]
+"
+# Skip inkscape on hppa b/c tests should skip it gracefully if not around
+# It's a heavy dependency.
+BDEPEND="
+	test? (
+		dev-python/pebble[${PYTHON_USEDEP}]
+		dev-python/ipykernel[${PYTHON_USEDEP}]
+		dev-python/ipywidgets[${PYTHON_USEDEP}]
+		>=dev-python/jupyter_client-4.2[${PYTHON_USEDEP}]
+		!hppa? ( media-gfx/inkscape )
+	)
+"
+
+distutils_enable_tests pytest
+
+src_test() {
+	mkdir -p "${HOME}/.local" || die
+	cp -r share "${HOME}/.local/" || die
+	distutils-r1_src_test
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# Missing pyppeteer for now
+		# TODO: Doesn't skip?
+		nbconvert/exporters/tests/test_webpdf.py
+		# Needs pyppeteer too
+		'nbconvert/tests/test_nbconvertapp.py::TestNbConvertApp::test_webpdf_with_chromium'
+	)
+
+	distutils_install_for_testing bdist_egg
+	cd "${TEST_DIR}"/lib || die
+	epytest --pyargs nbconvert
+}
+
+pkg_postinst() {
+	if ! has_version app-text/pandoc ; then
+		einfo "Pandoc is required for converting to formats other than Python,"
+		einfo "HTML, and Markdown. If you need this functionality, install"
+		einfo "app-text/pandoc."
+	fi
+}
diff --git a/dev-python/pyghmi/Manifest b/dev-python/pyghmi/Manifest
index 15bc3b9f46fb..f09b206131e0 100644
--- a/dev-python/pyghmi/Manifest
+++ b/dev-python/pyghmi/Manifest
@@ -1,2 +1,3 @@
 DIST pyghmi-1.5.22.tar.gz 221963 BLAKE2B 6705e904c481ddbb241fc8f8089e6bc9bcc142bfca9aaa518b2293b5dd387113fa4bbb418e748584f69fac5e8d1049d669eb73d24463adaaec3a891cae98f928 SHA512 cc665f8b9f4a0c9c127b9e895ba62e650cdb589f5c9edae6accaa5558f347d31725e8da446fcafb4f71ffadc17121d8b293160413f4a41055cb1720e9fa1ecde
 DIST pyghmi-1.5.31.tar.gz 236574 BLAKE2B 9ee7250bae2d87f552686845ae3056f0f646cd1a383587c195bfcc6dfa476b8582509c909f0008fc6751295e2e4e7d33bf822e8b529d67306fcc85412fc9af22 SHA512 d7c9c05b51780bef9d2b417c1a586f84ec87a9f1ff578ab019bfdc1a462decd907b2634fb1c830d0e369eb97122bfcba62ce79a4386c73c9854cde8f9fdeb65c
+DIST pyghmi-1.5.32.tar.gz 236662 BLAKE2B e2a58d1eb9c5000d1a7f6b795836fa617ac0847ff2e7c817a6bd65ffb9a1162546a25f890ba20400e4c8d5f72dda538f696c17a35542506cc171b80f99cb5a30 SHA512 b30ad1e200d23ed99280794e4e8e12c1a2412daa27e435183edbdcf57cb1d8ace8790845dd5ab0579f2a22b26eabc11e1d1f5845fb94fed019f461b9419d2763
diff --git a/dev-python/pyghmi/pyghmi-1.5.32.ebuild b/dev-python/pyghmi/pyghmi-1.5.32.ebuild
new file mode 100644
index 000000000000..7e0465916a8e
--- /dev/null
+++ b/dev-python/pyghmi/pyghmi-1.5.32.ebuild
@@ -0,0 +1,31 @@
+# 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="A pure python implementation of IPMI protocol"
+HOMEPAGE="https://github.com/openstack-archive/pyghmi/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=dev-python/cryptography-2.1[${PYTHON_USEDEP}]
+	dev-python/pbr[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.8.1[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.6.5[${PYTHON_USEDEP}]
+		>=dev-python/subunit-1.0.0[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests unittest
diff --git a/dev-python/pygments/pygments-2.11.1.ebuild b/dev-python/pygments/pygments-2.11.1.ebuild
index 053acf39a275..461918ee31f8 100644
--- a/dev-python/pygments/pygments-2.11.1.ebuild
+++ b/dev-python/pygments/pygments-2.11.1.ebuild
@@ -17,7 +17,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/pytest-regressions/Manifest b/dev-python/pytest-regressions/Manifest
index e9d8ef35a55f..acf371ff2dc5 100644
--- a/dev-python/pytest-regressions/Manifest
+++ b/dev-python/pytest-regressions/Manifest
@@ -1 +1,2 @@
 DIST pytest-regressions-2.2.0.tar.gz 98162 BLAKE2B d87b331a35a988e8da6a6c827b594eea6ac64adb17a5b4a054ff0e9526d8d0153d84e0f59ffc805f76a96c1b100961ae12d05849fe2dd35ff4c18f42e235b3b0 SHA512 a4c91590f6e3825eef97da4fb21c1b852b68b60d6dc61ca9e1581737c0cb02831b091ae215aa16a5c50d06d413dabf243de4e98ebd01ce2af7fd2ddbaedec3fb
+DIST pytest-regressions-2.3.0.tar.gz 109181 BLAKE2B 1b47d437c46c134b76b724859b6ebdca6aabee9932a7d63b64f3ee1561a2d84dca9c09b5d7fe7847af97814570cfa85a1eb26ef6c0e6bc14f9ce5684cca0874d SHA512 6013f468c522711eade949d814917ffcd77ef2f3505926d9529a8cfea6c8ee33b5520fa48369160767efdd70e6c54230fc8c77a4c5105c783339a3d7fca93bf7
diff --git a/dev-python/pytest-regressions/pytest-regressions-2.3.0.ebuild b/dev-python/pytest-regressions/pytest-regressions-2.3.0.ebuild
new file mode 100644
index 000000000000..38c977fdbb9e
--- /dev/null
+++ b/dev-python/pytest-regressions/pytest-regressions-2.3.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Easy to use fixtures to write regression tests"
+HOMEPAGE="https://github.com/ESSS/pytest-regressions"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~x86"
+
+RDEPEND="
+	dev-python/pytest[${PYTHON_USEDEP}]
+	dev-python/pytest-datadir[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pandas[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/tox[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests --install pytest
+distutils_enable_sphinx doc dev-python/sphinx_rtd_theme
+
+python_prepare_all() {
+	# Does not work with the panda's version in ::gentoo
+	sed -i -e 's:test_non_numeric_data:_&:' \
+		-e 's:test_non_pandas_dataframe:_&:' \
+		tests/test_dataframe_regression.py || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/pytest/files/pytest-4.5.0-strip-setuptools_scm.patch b/dev-python/pytest/files/pytest-4.5.0-strip-setuptools_scm.patch
deleted file mode 100644
index ae6be933bca6..000000000000
--- a/dev-python/pytest/files/pytest-4.5.0-strip-setuptools_scm.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/setup.py b/setup.py
-index 0fb5a58a..302b5dda 100644
---- a/setup.py
-+++ b/setup.py
-@@ -1,4 +1,5 @@
- from setuptools import setup
-+import os
- 
- # TODO: if py gets upgrade to >=1.6,
- #       remove _width_of_current_line in terminal.py
-@@ -18,10 +19,12 @@ INSTALL_REQUIRES = [
- ]
- 
- 
-+with open("src/_pytest/_version.py", 'wt') as fp:
-+    fp.write('version = "{}"'.format(os.environ['PV']))
-+
- def main():
-     setup(
--        use_scm_version={"write_to": "src/_pytest/_version.py"},
--        setup_requires=["setuptools-scm", "setuptools>=40.0"],
-+        version=os.environ['PV'],
-         package_dir={"": "src"},
-         # fmt: off
-         extras_require={
diff --git a/dev-python/python-lsp-server/files/python-lsp-server-1.2.4-unpin-pylint.patch b/dev-python/python-lsp-server/files/python-lsp-server-1.2.4-unpin-pylint.patch
deleted file mode 100644
index 8c849720447e..000000000000
--- a/dev-python/python-lsp-server/files/python-lsp-server-1.2.4-unpin-pylint.patch
+++ /dev/null
@@ -1,254 +0,0 @@
-diff --git a/.pylintrc b/.pylintrc
-index 4249ac5..326751f 100644
---- a/.pylintrc
-+++ b/.pylintrc
-@@ -16,7 +16,8 @@ disable =
-     too-few-public-methods,
-     too-many-arguments,
-     too-many-instance-attributes,
--    import-error
-+    import-error,
-+    consider-using-f-string,
- 
- [REPORTS]
- 
-diff --git a/pylsp/__main__.py b/pylsp/__main__.py
-index a480823..4698d5c 100644
---- a/pylsp/__main__.py
-+++ b/pylsp/__main__.py
-@@ -92,7 +92,7 @@ def _configure_logger(verbose=0, log_config=None, log_file=None):
-     root_logger = logging.root
- 
-     if log_config:
--        with open(log_config, 'r') as f:
-+        with open(log_config, 'r', encoding='utf-8') as f:
-             logging.config.dictConfig(json.load(f))
-     else:
-         formatter = logging.Formatter(LOG_FORMAT)
-diff --git a/pylsp/_utils.py b/pylsp/_utils.py
-index 92376f6..9ac30cf 100644
---- a/pylsp/_utils.py
-+++ b/pylsp/_utils.py
-@@ -144,8 +144,8 @@ def format_docstring(contents):
-     Until we can find a fast enough way of discovering and parsing each format,
-     we can do a little better by at least preserving indentation.
-     """
--    contents = contents.replace('\t', u'\u00A0' * 4)
--    contents = contents.replace('  ', u'\u00A0' * 2)
-+    contents = contents.replace('\t', '\u00A0' * 4)
-+    contents = contents.replace('  ', '\u00A0' * 2)
-     return contents
- 
- 
-diff --git a/pylsp/plugins/flake8_lint.py b/pylsp/plugins/flake8_lint.py
-index 7ac8c62..aefd09e 100644
---- a/pylsp/plugins/flake8_lint.py
-+++ b/pylsp/plugins/flake8_lint.py
-@@ -79,7 +79,7 @@ def run_flake8(flake8_executable, args, document):
-     try:
-         cmd = [flake8_executable]
-         cmd.extend(args)
--        p = Popen(cmd, stdin=PIPE, stdout=PIPE, stderr=PIPE)  # pylint: disable=consider-using-with
-+        p = Popen(cmd, stdin=PIPE, stdout=PIPE, stderr=PIPE)
-     except IOError:
-         log.debug("Can't execute %s. Trying with 'python -m flake8'", flake8_executable)
-         cmd = ['python', '-m', 'flake8']
-diff --git a/pylsp/plugins/pylint_lint.py b/pylsp/plugins/pylint_lint.py
-index bdb65fe..69bad1c 100644
---- a/pylsp/plugins/pylint_lint.py
-+++ b/pylsp/plugins/pylint_lint.py
-@@ -236,7 +236,7 @@ def _run_pylint_stdio(pylint_executable, document, flags):
-         cmd = [pylint_executable]
-         cmd.extend(flags)
-         cmd.extend(['--from-stdin', document.path])
--        p = Popen(cmd, stdin=PIPE, stdout=PIPE, stderr=PIPE)  # pylint: disable=consider-using-with
-+        p = Popen(cmd, stdin=PIPE, stdout=PIPE, stderr=PIPE)
-     except IOError:
-         log.debug("Can't execute %s. Trying with 'python -m pylint'", pylint_executable)
-         cmd = ['python', '-m', 'pylint']
-diff --git a/pylsp/workspace.py b/pylsp/workspace.py
-index ec031b6..bf312f6 100644
---- a/pylsp/workspace.py
-+++ b/pylsp/workspace.py
-@@ -76,7 +76,7 @@ def root_uri(self):
-         return self._root_uri
- 
-     def is_local(self):
--        return (self._root_uri_scheme == '' or self._root_uri_scheme == 'file') and os.path.exists(self._root_path)
-+        return (self._root_uri_scheme in ['', 'file']) and os.path.exists(self._root_path)
- 
-     def get_document(self, doc_uri):
-         """Return a managed document if-present, else create one pointing at disk.
-diff --git a/setup.py b/setup.py
-index 3f79774..14ade20 100755
---- a/setup.py
-+++ b/setup.py
-@@ -52,7 +52,7 @@ def get_version(module='pylsp'):
-             'pycodestyle>=2.7.0',
-             'pydocstyle>=2.0.0',
-             'pyflakes>=2.3.0,<2.4.0',
--            'pylint>=2.5.0,<2.10.0',
-+            'pylint>=2.5.0',
-             'rope>=0.10.5',
-             'yapf',
-         ],
-@@ -62,10 +62,10 @@ def get_version(module='pylsp'):
-         'pycodestyle': ['pycodestyle>=2.7.0'],
-         'pydocstyle': ['pydocstyle>=2.0.0'],
-         'pyflakes': ['pyflakes>=2.3.0,<2.4.0'],
--        'pylint': ['pylint>=2.5.0,<2.10.0'],
-+        'pylint': ['pylint>=2.5.0'],
-         'rope': ['rope>0.10.5'],
-         'yapf': ['yapf'],
--        'test': ['pylint>=2.5.0,<2.10.0', 'pytest', 'pytest-cov', 'coverage',
-+        'test': ['pylint>=2.5.0', 'pytest', 'pytest-cov', 'coverage',
-                  'numpy', 'pandas', 'matplotlib', 'pyqt5', 'flaky'],
-     },
-     entry_points={
-diff --git a/test/fixtures.py b/test/fixtures.py
-index 3ced0d5..e57bda6 100644
---- a/test/fixtures.py
-+++ b/test/fixtures.py
-@@ -101,7 +101,7 @@ def temp_workspace_factory(workspace):  # pylint: disable=redefined-outer-name
-     def fn(files):
-         def create_file(name, content):
-             fn = os.path.join(workspace.root_path, name)
--            with open(fn, 'w') as f:
-+            with open(fn, 'w', encoding='utf-8') as f:
-                 f.write(content)
-             workspace.put_document(uris.from_fs_path(fn), content)
- 
-diff --git a/test/plugins/test_flake8_lint.py b/test/plugins/test_flake8_lint.py
-index 046127c..e82a226 100644
---- a/test/plugins/test_flake8_lint.py
-+++ b/test/plugins/test_flake8_lint.py
-@@ -93,7 +93,7 @@ def get_flake8_cfg_settings(workspace, config_str):
-     This function creates a ``setup.cfg``; you'll have to delete it yourself.
-     """
- 
--    with open(os.path.join(workspace.root_path, "setup.cfg"), "w+") as f:
-+    with open(os.path.join(workspace.root_path, "setup.cfg"), "w+", encoding='utf-8') as f:
-         f.write(config_str)
- 
-     workspace.update_config({"pylsp": {"configurationSources": ["flake8"]}})
-diff --git a/test/plugins/test_pycodestyle_lint.py b/test/plugins/test_pycodestyle_lint.py
-index c0d1d7e..e238147 100644
---- a/test/plugins/test_pycodestyle_lint.py
-+++ b/test/plugins/test_pycodestyle_lint.py
-@@ -91,7 +91,7 @@ def test_pycodestyle_config(workspace):
- 
-     for conf_file, (content, working) in list(content.items()):
-         # Now we'll add config file to ignore it
--        with open(os.path.join(workspace.root_path, conf_file), 'w+') as f:
-+        with open(os.path.join(workspace.root_path, conf_file), 'w+', encoding='utf-8') as f:
-             f.write(content)
-         workspace._config.settings.cache_clear()
- 
-diff --git a/test/plugins/test_pyflakes_lint.py b/test/plugins/test_pyflakes_lint.py
-index 494cb63..d52ac63 100644
---- a/test/plugins/test_pyflakes_lint.py
-+++ b/test/plugins/test_pyflakes_lint.py
-@@ -21,7 +21,7 @@ def hello():
- DOC_UNDEFINED_NAME_ERR = "a = b"
- 
- 
--DOC_ENCODING = u"""# encoding=utf-8
-+DOC_ENCODING = """# encoding=utf-8
- import sys
- """
- 
-diff --git a/test/plugins/test_pylint_lint.py b/test/plugins/test_pylint_lint.py
-index cf7a7e4..5b5b99c 100644
---- a/test/plugins/test_pylint_lint.py
-+++ b/test/plugins/test_pylint_lint.py
-@@ -37,7 +37,7 @@ def temp_document(doc_text, workspace):
- 
- 
- def write_temp_doc(document, contents):
--    with open(document.path, 'w') as temp_file:
-+    with open(document.path, 'w', encoding='utf-8') as temp_file:
-         temp_file.write(contents)
- 
- 
-diff --git a/test/test_document.py b/test/test_document.py
-index b543a40..3dcabb6 100644
---- a/test/test_document.py
-+++ b/test/test_document.py
-@@ -16,7 +16,7 @@ def test_document_lines(doc):
- 
- 
- def test_document_source_unicode(workspace):
--    document_mem = Document(DOC_URI, workspace, u'my source')
-+    document_mem = Document(DOC_URI, workspace, 'my source')
-     document_disk = Document(DOC_URI, workspace)
-     assert isinstance(document_mem.source, type(document_disk.source))
- 
-@@ -44,27 +44,27 @@ def test_word_at_position(doc):
- 
- 
- def test_document_empty_edit(workspace):
--    doc = Document('file:///uri', workspace, u'')
-+    doc = Document('file:///uri', workspace, '')
-     doc.apply_change({
-         'range': {
-             'start': {'line': 0, 'character': 0},
-             'end': {'line': 0, 'character': 0}
-         },
--        'text': u'f'
-+        'text': 'f'
-     })
--    assert doc.source == u'f'
-+    assert doc.source == 'f'
- 
- 
- def test_document_line_edit(workspace):
--    doc = Document('file:///uri', workspace, u'itshelloworld')
-+    doc = Document('file:///uri', workspace, 'itshelloworld')
-     doc.apply_change({
--        'text': u'goodbye',
-+        'text': 'goodbye',
-         'range': {
-             'start': {'line': 0, 'character': 3},
-             'end': {'line': 0, 'character': 8}
-         }
-     })
--    assert doc.source == u'itsgoodbyeworld'
-+    assert doc.source == 'itsgoodbyeworld'
- 
- 
- def test_document_multiline_edit(workspace):
-@@ -73,8 +73,8 @@ def test_document_multiline_edit(workspace):
-         "    print a\n",
-         "    print b\n"
-     ]
--    doc = Document('file:///uri', workspace, u''.join(old))
--    doc.apply_change({'text': u'print a, b', 'range': {
-+    doc = Document('file:///uri', workspace, ''.join(old))
-+    doc.apply_change({'text': 'print a, b', 'range': {
-         'start': {'line': 1, 'character': 4},
-         'end': {'line': 2, 'character': 11}
-     }})
-@@ -89,8 +89,8 @@ def test_document_end_of_file_edit(workspace):
-         "print 'a'\n",
-         "print 'b'\n"
-     ]
--    doc = Document('file:///uri', workspace, u''.join(old))
--    doc.apply_change({'text': u'o', 'range': {
-+    doc = Document('file:///uri', workspace, ''.join(old))
-+    doc.apply_change({'text': 'o', 'range': {
-         'start': {'line': 2, 'character': 0},
-         'end': {'line': 2, 'character': 0}
-     }})
-diff --git a/test/test_workspace.py b/test/test_workspace.py
-index a008e7e..44d754b 100644
---- a/test/test_workspace.py
-+++ b/test/test_workspace.py
-@@ -51,7 +51,7 @@ def test_non_root_project(pylsp, metafiles):
-     os.mkdir(project_root)
- 
-     for metafile in metafiles:
--        with open(os.path.join(project_root, metafile), 'w+') as f:
-+        with open(os.path.join(project_root, metafile), 'w+', encoding='utf-8') as f:
-             f.write('# ' + metafile)
- 
-     test_uri = uris.from_fs_path(os.path.join(project_root, 'hello/test.py'))
diff --git a/dev-python/python-utils/Manifest b/dev-python/python-utils/Manifest
index 60c609ddd0e5..b27835398dd0 100644
--- a/dev-python/python-utils/Manifest
+++ b/dev-python/python-utils/Manifest
@@ -3,3 +3,4 @@ DIST python-utils-2.6.0.tar.gz 14885 BLAKE2B 089d7a57a8469968bed147a01907f35d143
 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
 DIST python-utils-2.7.1.tar.gz 28997 BLAKE2B 3da11dcb297cace3c2c48ae91e6011be2f484a83f264be375437775eb99d9bafe703626ab0d2217da79ec096f90648d387ec7b41611e915ef33fce152553a18c SHA512 9f74a33089886dcd28dfd45602c53a7c6cfc90b151a053dd7e49a5fd502479e889d08bd8b10fdd2ec3bc26e334ae66238740ff59291f4ac95fb486b64f925d4a
+DIST python-utils-3.0.0.tar.gz 23243 BLAKE2B 640ebc1b3e59a30be5a5c40291d121919b9f90a71476acf66741cb4b8af691c50c3826d9e8e6b30464f2be8e5ba0ac4683f79962c8833073b8a43a108ead281d SHA512 b03f97b66b71af8eb023ecfa1b671f2d566d139464f63cd512b129a5830651172843285fe7ef028047ca03f345221f5208eac8e1647361f173f1c7b3aed866a6
diff --git a/dev-python/python-utils/python-utils-3.0.0.ebuild b/dev-python/python-utils/python-utils-3.0.0.ebuild
new file mode 100644
index 000000000000..0888f4f0af2f
--- /dev/null
+++ b/dev-python/python-utils/python-utils-3.0.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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}]"
+BDEPEND="test? ( dev-python/pytest-asyncio[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
+
+EPYTEST_IGNORE=(
+	docs
+)
+
+python_prepare_all() {
+	sed -i -e '/--cov/d' -e '/--mypy/d' pytest.ini || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/sphinx-autodoc-typehints/Manifest b/dev-python/sphinx-autodoc-typehints/Manifest
index ab17792d41e8..a66eb24f1dc3 100644
--- a/dev-python/sphinx-autodoc-typehints/Manifest
+++ b/dev-python/sphinx-autodoc-typehints/Manifest
@@ -1,2 +1,3 @@
 DIST sphinx-autodoc-typehints-1.12.0.tar.gz 19494 BLAKE2B beacc4f8ab453612dfd5264f1c65fd6bdd957269a28ee5b71b762d0baf5a3d4be58398b32d4263f996648281c1139f47a7564e8fc6444a94095f6a970b4cc27a SHA512 92fa340495a48111fa3d600d8c46d83214505ac2a5c71cb1303e846ac439f1e0ff14f8ce8dfd5ffdb6a62a9fa15dde8a5227f946840d9377ad5f7fde25894b75
 DIST sphinx-autodoc-typehints-1.13.0.gh.tar.gz 19898 BLAKE2B a927802a9daec5a2755c06a974aaea30fa92dfd16712d705c9ecb1c9a7b15d5285ade1d8e83d20e9220823500e0257e278b7e48942d9ee6cafdbc36793e9698f SHA512 cc2f91da6b76eb4ccd7579ce27c4d8f2117707b253bd2246711a5179faecc61c4873b3a5e8c1346e03d1db4c59ae76bea0160f34c66f1a0c2dbba1ac2a8086a1
+DIST sphinx-autodoc-typehints-1.13.1.gh.tar.gz 19923 BLAKE2B d0f72b814c83dd8987b80bdbaffbab5c3a7c671d9e56e9bb62d3cf44dec1df7b5fb9c591928b89680427069ce8d5953f4dea52de9eb4a4add07a332be96c730a SHA512 50e2958aafaa661cb209da04bb456dadddc4782dd2168c3f6524fba26d906479c66e5b22b3f49fff0c4022acb4b5b99ff73b250cb3e4d5dd9f083c4a5ab12531
diff --git a/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.13.1.ebuild b/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.13.1.ebuild
new file mode 100644
index 000000000000..3925228515f3
--- /dev/null
+++ b/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.13.1.ebuild
@@ -0,0 +1,39 @@
+# 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="Type hints support for the Sphinx autodoc extension "
+HOMEPAGE="
+	https://github.com/tox-dev/sphinx-autodoc-typehints/
+	https://pypi.org/project/sphinx-autodoc-typehints/
+"
+SRC_URI="
+	https://github.com/tox-dev/sphinx-autodoc-typehints/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+SLOT="0"
+
+RDEPEND=">=dev-python/sphinx-4[${PYTHON_USEDEP}]"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/sphobjinv[${PYTHON_USEDEP}]
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# this package is addicted to Internet
+	tests/test_sphinx_autodoc_typehints.py::test_format_annotation
+)
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/ubelt/Manifest b/dev-python/ubelt/Manifest
index 116b3d811c43..5fb79ec89be9 100644
--- a/dev-python/ubelt/Manifest
+++ b/dev-python/ubelt/Manifest
@@ -1,2 +1,3 @@
 DIST ubelt-0.10.1.tar.gz 216033 BLAKE2B e481b2cf61788b50038ad69f0e2b637dfa0259d24ecca1a5587fe283d2270de205cb085112b9285cf57f664ce8a9d107f08b9b6735c8bea6fb97f6f48935dba9 SHA512 c15af249e6b94f69050703a4004307d91854e2ac7e25c5ac8d467b5b5f3363989f93bf2917eaf3c0f2485258b3530d7317f39449d5ac7ad5ed9b4615d916decb
 DIST ubelt-0.10.2.tar.gz 240069 BLAKE2B 34a24781264dd910e7a3afd87287f8ec9d1e4d1b4dd205f249fdc878861cd9c511121c61a5ca208b3f8ced785a0cec26c715b6a9ef3fee4a8f903e8557d3790f SHA512 8666a05f53d29d39ddd0fca213a9465948fd108bef9e95fc6160cb8331ae6876b9e7297d380cac37383c602d7ad4c248a4d7e03b4306dad5c6b26e0423720afb
+DIST ubelt-0.11.0.tar.gz 251931 BLAKE2B 628c62395b38da5fe70cf5c4eaef74f411cb431ca3837aadc0bfafd28d9ba15a75850d22b317d207e79d81c7e015a7adad28fb14804c25b3e9ef1a473d5af8c2 SHA512 ae95f719238e89ece2bd8ef525d7acc72058a770ff8c0be58e27d9fd0f50b1ae978d71589474133ce1065130562cae63282c4c97f69756ce1c64ce4330a5da1e
diff --git a/dev-python/ubelt/ubelt-0.11.0.ebuild b/dev-python/ubelt/ubelt-0.11.0.ebuild
new file mode 100644
index 000000000000..3bd313f60128
--- /dev/null
+++ b/dev-python/ubelt/ubelt-0.11.0.ebuild
@@ -0,0 +1,27 @@
+# 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="A stdlib like feel, and extra batteries. Hashing, Caching, Timing, Progress"
+HOMEPAGE="https://github.com/Erotemic/ubelt"
+SRC_URI="https://github.com/Erotemic/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]
+	dev-python/ordered-set[${PYTHON_USEDEP}]"
+
+DEPEND="test? ( dev-python/xdoctest[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# relies on passwd home being equal to ${HOME}
+	ubelt/util_path.py::userhome:0
+)
diff --git a/dev-python/wcag-contrast-ratio/wcag-contrast-ratio-0.9.ebuild b/dev-python/wcag-contrast-ratio/wcag-contrast-ratio-0.9.ebuild
index cdf0b4ff044d..e8b6e658ff47 100644
--- a/dev-python/wcag-contrast-ratio/wcag-contrast-ratio-0.9.ebuild
+++ b/dev-python/wcag-contrast-ratio/wcag-contrast-ratio-0.9.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc"
 
 BDEPEND="
 	test? (