Adding metadata

98 files changed, 1286 insertions, 512 deletions

diff --git a/dev-python/basictracer/Manifest b/dev-python/basictracer/Manifest
deleted file mode 100644
index 6cba7aa4b847..000000000000
--- a/dev-python/basictracer/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST basictracer-3.2.0.tar.gz 21262 BLAKE2B 999949a14657807ba4186a95af31e24afe4e27a45c181c9e98380a2735483989f481ae40591798b5722847f2d2954ada60f7628865c30cedff1b85fc9ea65626 SHA512 9876de9df861a1de6d00f0aacf75da70460242ff616d35b39c8dc78812af97276cb0934d903ffba70724bd5c906a2b93f556905df8315238db18c543eb275ee9
diff --git a/dev-python/basictracer/basictracer-3.2.0.ebuild b/dev-python/basictracer/basictracer-3.2.0.ebuild
deleted file mode 100644
index d31c7fd36a15..000000000000
--- a/dev-python/basictracer/basictracer-3.2.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python implementation of the BasicTracer reference implementation"
-HOMEPAGE="https://github.com/opentracing/basictracer-python"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="Apache-2.0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	>=dev-python/protobuf-python-3.0.1[${PYTHON_USEDEP}]
-	>=dev-python/opentracing-2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-"
-DEPEND="
-	${RDEPEND}
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/basictracer/metadata.xml b/dev-python/basictracer/metadata.xml
deleted file mode 100644
index 0429ed724268..000000000000
--- a/dev-python/basictracer/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
-  <email>lssndrbarbieri@gmail.com</email>
-  <name>Alessandro Barbieri</name>
- </maintainer>
- <upstream>
-  <bugs-to>https://github.com/opentracing/basictracer-python/issues</bugs-to>
- </upstream>
- <origin>gentoo-guru-overlay</origin>
-</pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/csscompressor/csscompressor-0.9.5-r1.ebuild b/dev-python/csscompressor/csscompressor-0.9.5-r1.ebuild
new file mode 100644
index 000000000000..79513869d4ea
--- /dev/null
+++ b/dev-python/csscompressor/csscompressor-0.9.5-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="A python port of YUI CSS Compressor"
+HOMEPAGE="
+	https://github.com/sprymix/csscompressor
+	https://pypi.org/project/csscompressor/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+
+distutils_enable_tests pytest
diff --git a/dev-python/dbus-python/dbus-python-1.2.18.ebuild b/dev-python/dbus-python/dbus-python-1.2.18.ebuild
index d7740a0e6140..6f1686085aea 100644
--- a/dev-python/dbus-python/dbus-python-1.2.18.ebuild
+++ b/dev-python/dbus-python/dbus-python-1.2.18.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://dbus.freedesktop.org/releases/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 IUSE="doc examples test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-python/fastavro/Manifest b/dev-python/fastavro/Manifest
index f615bc18f8fc..30a14cfe77ce 100644
--- a/dev-python/fastavro/Manifest
+++ b/dev-python/fastavro/Manifest
@@ -1,2 +1,2 @@
-DIST fastavro-1.4.10.tar.gz 733839 BLAKE2B 90bd57d5da0575a4b321dd31a3152531cce2a36626c51261e390b4f5f32d82fe3b1ea41ddd5e5885618ec5cb849a9a3620a8caf745c7782ecc2b3496bdf88998 SHA512 f3a474a56ef79dd54b71f18961520489fa848548fbbaac2c18d87c933d6c263762f73c56d9540b18ceb221d0184398ae085bfecd1c4cdb7236fd9160be94003b
 DIST fastavro-1.4.11.tar.gz 733536 BLAKE2B 6a2ceea6d72f49c08ea655c4927967e492bbf70e34d4168b9a751b61778d1d488dbe3e80e7667ef8530142c61744f053c262cb89fbecd8e9ba947cc5d6e48cd9 SHA512 0376395bfb1cf53eaeca90cdefa99394bc0e3499858bd62a62acda841da5135c3d82ba7ff613c96a4b4f9f8058e2f933b1180b8bd34070c48c48473835212ea2
+DIST fastavro-1.4.12.tar.gz 760518 BLAKE2B 7422e6e664ff6ceface6b3d8d39e6437233b12d62f771d1516920e7e7c3a0c8d23ac2fc82ff2acdac5d21314c0f2978b97fce96bbe2fedb587001672e3984e10 SHA512 fe5de909081dfaa4fa8575355f03d533ebe628182bc9716529a7f6c668444a34e8975ae90bc4d588dac2271a0913a49ac6457db0d256c54637995e16cd98281d
diff --git a/dev-python/fastavro/fastavro-1.4.10.ebuild b/dev-python/fastavro/fastavro-1.4.12.ebuild
index e3ed603db01b..ad02cec95f46 100644
--- a/dev-python/fastavro/fastavro-1.4.10.ebuild
+++ b/dev-python/fastavro/fastavro-1.4.12.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=8
 
+DISTUTILS_USE_PEP517=setuptools
 # https://github.com/fastavro/fastavro/issues/558
 EPYTEST_DESELECT=(
 	tests/test_fastavro.py::test_cython_python
diff --git a/dev-python/fontMath/Manifest b/dev-python/fontMath/Manifest
index e7080f555453..7f5699fc4e72 100644
--- a/dev-python/fontMath/Manifest
+++ b/dev-python/fontMath/Manifest
@@ -1,2 +1,2 @@
-DIST fontMath-0.8.1.tar.gz 29657 BLAKE2B b2a85d4fbce46b381488815df363c13c2d60f4527160bbdd0591c852df606bd1ada4945ec22935907b9b59a0f729a9c51fe2fa4f9531c3cf406bde11159193a2 SHA512 815f5521099dc55ceb215f0f7ea2dded7f8586a6b5ac8c7c99bd87f4f837feb21768c46473f21aa60ad8b0e85bbdabf2bf246f0c8fabab0b4a2d63b5d052f6a8
 DIST fontMath-0.9.1.tar.gz 30031 BLAKE2B 204ba6b7cd9e1b03030d8ad10106a8ff001b513bf8e253c661cd69ec71c63c513b404a2f9772c527b480c62cfd8c45db527481319e0fc6137281450341a19b8c SHA512 36d8db21b6bf1bb08a79297c97c85fe5bf019e4a4e051e6ee7b72fab26bcc1ce50b78d5b182f440eb800544c7c2263ffb673df6dd5edb5c255d5023e90af6838
+DIST fontMath-0.9.2.tar.gz 29835 BLAKE2B 0be37992c5009c5f0271da1cdfa464983e720f0b558b177b03abb5fa1f700f8171b40d39144e0976d815c33ba86e5bab90364502f3464cbab5cb18ad27cd88a8 SHA512 5305da4d688716a473b440114f37eb342eaf26d801c8c10361b8d98f84022f6da3afc112828b32a4286992d35b2f0075cad7a33086768f3e004b80fe59b0117e
diff --git a/dev-python/fontMath/fontMath-0.8.1.ebuild b/dev-python/fontMath/fontMath-0.9.2.ebuild
index 43ce57125835..b7d47b7adfc0 100644
--- a/dev-python/fontMath/fontMath-0.8.1.ebuild
+++ b/dev-python/fontMath/fontMath-0.9.2.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
@@ -7,10 +7,11 @@ PYTHON_COMPAT=( python3_{7,8,9,10} )
 
 inherit distutils-r1
 
-SRC_URI="https://github.com/robotools/fontMath/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
 DESCRIPTION="A collection of objects that implement fast font math"
 HOMEPAGE="https://github.com/robotools/fontMath"
+SRC_URI="https://github.com/robotools/fontMath/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
 LICENSE="MIT"
 SLOT="0"
 
diff --git a/dev-python/fontParts/Manifest b/dev-python/fontParts/Manifest
index d9ee857ce8ac..8d038490ce62 100644
--- a/dev-python/fontParts/Manifest
+++ b/dev-python/fontParts/Manifest
@@ -1,2 +1,2 @@
-DIST fontParts-0.10.3.tar.gz 428107 BLAKE2B 448f0b85b0cd311d77021322fce704496bdc1cb0392217dd1192035d7af7b3bba5ef91145a5ae684981cd4b4cef1eb0b53d37a4e1d298fb1ca7d48a34ed0bdb6 SHA512 f05b6d3fe9ab8c0a904944444d6308a2ac2c3287a686ab6fcb5831048384eb540836b1337de0c9b2ea6ab9ce38f0c27218bcbb335ef4dbaaa333d5207bea8f5e
 DIST fontParts-0.10.4.tar.gz 428116 BLAKE2B c3f7dcab8f8825a118373d0ba282bbbdf86073c5f0862a6ef04b88b35152370687c625933b41e1bd4da615af0325d971178186e74d2005fd12f85035d36e2979 SHA512 35bf88b80edeef3a52c46e7b8bb991e99ee93bf6a65909b81368a5a514898f7fe60354134200c176761787e8927170c064997a4d16979585d3b8ddf9962f3afe
+DIST fontParts-0.10.5.tar.gz 431282 BLAKE2B f0585b0220b35f9b6fc18ace6b517b69fecf87e2d0e1fda7ea5753512851e49b2fd122af628286a638d9c178212602e0ca467b38a94577d11ea3bb117d944a6b SHA512 961507c60de82da516f5cefbb3ca998533751234953c01c28e2ca534d47916e534c1cd6dc95add182e7da10ff57b1a0e0e5ad20fcbe4c385d5f2f58dde0be927
diff --git a/dev-python/fontParts/fontParts-0.10.3.ebuild b/dev-python/fontParts/fontParts-0.10.5.ebuild
index bec4e7b4d8d1..bec4e7b4d8d1 100644
--- a/dev-python/fontParts/fontParts-0.10.3.ebuild
+++ b/dev-python/fontParts/fontParts-0.10.5.ebuild
diff --git a/dev-python/ghp-import/ghp-import-2.1.0-r1.ebuild b/dev-python/ghp-import/ghp-import-2.1.0-r1.ebuild
new file mode 100644
index 000000000000..e436deeafdac
--- /dev/null
+++ b/dev-python/ghp-import/ghp-import-2.1.0-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+DISTUTILS_USE_PEP517=setuptools
+
+inherit distutils-r1
+
+DESCRIPTION="Copy your docs directly to the gh-pages branch"
+HOMEPAGE="https://github.com/c-w/ghp-import"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/python-dateutil-2.8.1[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/gitdb/files/gitdb-4.0.9-nose-to-pytest.patch b/dev-python/gitdb/files/gitdb-4.0.9-nose-to-pytest.patch
new file mode 100644
index 000000000000..fe38e8c613ee
--- /dev/null
+++ b/dev-python/gitdb/files/gitdb-4.0.9-nose-to-pytest.patch
@@ -0,0 +1,75 @@
+From a61910fde100fa1112ec57dd3e456719724997ef Mon Sep 17 00:00:00 2001
+From: Carl George <carl@george.computer>
+Date: Wed, 9 Feb 2022 17:15:39 -0600
+Subject: [PATCH] Switch from nose to pytest
+
+This is not a full rewrite to pytest style tests, it just changes the
+minimum to allow pytest to run the existing tests.
+
+Resolves #72
+---
+ .github/workflows/pythonpackage.yml | 6 +++---
+ Makefile                            | 3 +--
+ README.rst                          | 4 ++--
+ gitdb.pro.user                      | 3 +--
+ gitdb/test/db/test_pack.py          | 4 ++--
+ gitdb/test/lib.py                   | 4 ++--
+ gitdb/test/test_pack.py             | 4 ++--
+ 7 files changed, 13 insertions(+), 15 deletions(-)
+
+diff --git a/gitdb/test/db/test_pack.py b/gitdb/test/db/test_pack.py
+index ff96a58..4539f42 100644
+--- a/gitdb/test/db/test_pack.py
++++ b/gitdb/test/db/test_pack.py
+@@ -16,7 +16,7 @@
+ import random
+ import sys
+ 
+-from nose.plugins.skip import SkipTest
++import pytest
+ 
+ class TestPackDB(TestDBBase):
+ 
+@@ -24,7 +24,7 @@ class TestPackDB(TestDBBase):
+     @with_packs_rw
+     def test_writing(self, path):
+         if sys.platform == "win32":
+-            raise SkipTest("FIXME: Currently fail on windows")
++            pytest.skip("FIXME: Currently fail on windows")
+ 
+         pdb = PackedDB(path)
+ 
+diff --git a/gitdb/test/lib.py b/gitdb/test/lib.py
+index a04084f..abd4ad5 100644
+--- a/gitdb/test/lib.py
++++ b/gitdb/test/lib.py
+@@ -65,8 +65,8 @@ def skip_on_travis_ci(func):
+     @wraps(func)
+     def wrapper(self, *args, **kwargs):
+         if 'TRAVIS' in os.environ:
+-            import nose
+-            raise nose.SkipTest("Cannot run on travis-ci")
++            import pytest
++            pytest.skip("Cannot run on travis-ci")
+         # end check for travis ci
+         return func(self, *args, **kwargs)
+     # end wrapper
+diff --git a/gitdb/test/test_pack.py b/gitdb/test/test_pack.py
+index 4b01741..f946197 100644
+--- a/gitdb/test/test_pack.py
++++ b/gitdb/test/test_pack.py
+@@ -26,7 +26,7 @@
+ from gitdb.exc import UnsupportedOperation
+ from gitdb.util import to_bin_sha
+ 
+-from nose import SkipTest
++import pytest
+ 
+ import os
+ import tempfile
+@@ -246,4 +246,4 @@ def rewind_streams():
+     def test_pack_64(self):
+         # TODO: hex-edit a pack helping us to verify that we can handle 64 byte offsets
+         # of course without really needing such a huge pack
+-        raise SkipTest()
++        pytest.skip('not implemented')
diff --git a/dev-python/gitdb/gitdb-4.0.9-r1.ebuild b/dev-python/gitdb/gitdb-4.0.9-r1.ebuild
new file mode 100644
index 000000000000..451d2695b069
--- /dev/null
+++ b/dev-python/gitdb/gitdb-4.0.9-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="GitDB is a pure-Python git object database"
+HOMEPAGE="
+	https://github.com/gitpython-developers/gitdb/
+	https://pypi.org/project/gitdb/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/smmap-3.0.1[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-vcs/git
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-nose-to-pytest.patch"
+)
+
+distutils_enable_tests pytest
+
+src_test() {
+	local i
+
+	mkdir "${T}"/repo || die
+	cd "${T}"/repo || die
+
+	for (( i = 0; i < 2500; ++i )); do
+		echo "${i}" > file"${i}" || die
+	done
+
+	git init || die
+	git config user.email "you@example.com" || die
+	git config user.name "Your Name" || die
+	git add -A || die
+	git commit -q -m ".." || die
+	git clone --bare "${T}"/repo "${T}"/repo.git || die
+	cd "${S}" || die
+
+	distutils-r1_src_test
+}
+
+python_test() {
+	#TRAVIS=1 disables performance tests which rely on the gitdb repo
+	local -x TRAVIS=1
+	local -x GITDB_TEST_GIT_REPO_BASE="${T}"/repo.git
+	epytest
+}
diff --git a/dev-python/glance_store/Manifest b/dev-python/glance_store/Manifest
index 7e7b83111b4c..68b9883d560d 100644
--- a/dev-python/glance_store/Manifest
+++ b/dev-python/glance_store/Manifest
@@ -1 +1,2 @@
 DIST glance_store-3.0.0.tar.gz 234086 BLAKE2B 781b9aa0913c355d898b7c05ed8807bb92bf08b371380c1f308bd4a3f8749dc91e53f6c817cc56621ce3fd7be748eee1cc5f5b1764d4167606733e7ef9176abd SHA512 4bae5ed37031902e0c47c7fa0bae2703bf21ab41226df3b2786d4679497500caeed91507e55f83512afa5ad57b73a153f901577ffa33c9d103c45622f07494c3
+DIST glance_store-4.0.0.tar.gz 234413 BLAKE2B 76d01398626e2883f6557b1b59f6abf9a39c98c8269bc2dd9468b670706b33496f1f0a4ef961af26a6422645ea52768de4ad0e7ec114d5348f44cc5c6606d6f1 SHA512 6f3e9740a213636dc188afbc84247c80603f10729a35e56f719aa29aa5fa9bf6b2d94332aac323182992f3b786bbf47204fcfe32cbb9f6b3f5fbc16e385033af
diff --git a/dev-python/glance_store/glance_store-4.0.0.ebuild b/dev-python/glance_store/glance_store-4.0.0.ebuild
new file mode 100644
index 000000000000..024b2cef66ce
--- /dev/null
+++ b/dev-python/glance_store/glance_store-4.0.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_{7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="A library for glance"
+HOMEPAGE="
+	https://github.com/openstack/glance_store
+	https://opendev.org/openstack/glance_store
+	https://pypi.org/project/glance-store/
+	https://launchpad.net/glance-store
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="cinder swift vmware"
+
+RDEPEND="
+	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-2.18.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-4.7.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+	>=dev-python/eventlet-0.18.2[${PYTHON_USEDEP}]
+	>=dev-python/six-1.11.0[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-3.4.0[${PYTHON_USEDEP}]
+	>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+	cinder? (
+		>=dev-python/python-cinderclient-4.1.0[${PYTHON_USEDEP}]
+		>=dev-python/os-brick-2.6.0[${PYTHON_USEDEP}]
+		>=dev-python/oslo-rootwrap-5.8.0[${PYTHON_USEDEP}]
+		>=dev-python/oslo-privsep-1.23.0[${PYTHON_USEDEP}]
+	)
+	swift? (
+		>=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
+		>=dev-python/python-swiftclient-3.2.0[${PYTHON_USEDEP}]
+	)
+	vmware? ( >=dev-python/oslo-vmware-3.6.0[${PYTHON_USEDEP}] )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	test? (
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/subunit-1.0.0[${PYTHON_USEDEP}]
+		>=dev-python/requests-mock-1.2.0[${PYTHON_USEDEP}]
+		>=dev-python/retrying-1.3.3[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
+		>=dev-python/boto3-1.9.199[${PYTHON_USEDEP}]
+	)
+"
+
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	test? ( cinder swift vmware )
+"
+
+distutils_enable_tests pytest
+
+python_install_all() {
+	distutils-r1_python_install_all
+	mv "${ED}/usr/etc" "${ED}/etc" || die
+}
diff --git a/dev-python/gnocchi/Manifest b/dev-python/gnocchi/Manifest
index 50da4b62e5de..f377e2c73d4c 100644
--- a/dev-python/gnocchi/Manifest
+++ b/dev-python/gnocchi/Manifest
@@ -1 +1,2 @@
 DIST gnocchi-4.4.1.tar.gz 981822 BLAKE2B d47907e4cd76450f2264a681f5d6184929e7a0fc294d84d1d709aff57c4f8b667db3a3de7acb5d14dfc69c3d421dde31d0251de3242e992c1a8d4c204dd742b2 SHA512 24884f8f010ae38041d6a5d723e0dc02b195b356a1fa3a516a9a7e0c5425ad493c52a66420029041f26939c96009b3b0103e66eb070603697e3184dee2b42b96
+DIST gnocchi-4.4.2.tar.gz 984101 BLAKE2B 430e1acfbb7c46c4136032289954315a4e3ac197ad64854ad196b8259a2d4a4c838f2bac5fc016b742f5fa74ca551dbf71794bd6e4ba9ff782cb572efcec5778 SHA512 001127c2c8209c2faf656f0e3037d55779049ebf41d6a79fcb78c6e9a865226f40184eca2000684841b2bcbce8e5beca6bf1dabfcd89646c443d098a3613a4d0
diff --git a/dev-python/gnocchi/gnocchi-4.4.2.ebuild b/dev-python/gnocchi/gnocchi-4.4.2.ebuild
new file mode 100644
index 000000000000..261a53151163
--- /dev/null
+++ b/dev-python/gnocchi/gnocchi-4.4.2.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Timeseries database"
+HOMEPAGE="
+	https://gnocchi.osci.io
+	https://github.com/gnocchixyz/gnocchi
+	https://pypi.org/project/gnocchi/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64"
+IUSE="amqp ceph keystone mysql postgresql redis prometheus s3 swift"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	>=dev-python/numpy-1.9.0[${PYTHON_USEDEP}]
+	dev-python/iso8601[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-3.22.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-policy-1.7.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-middleware-3.22.0[${PYTHON_USEDEP}]
+	dev-python/pytimeparse[${PYTHON_USEDEP}]
+	>=dev-python/pecan-0.9[${PYTHON_USEDEP}]
+	dev-python/jsonpatch[${PYTHON_USEDEP}]
+	>=dev-python/cotyledon-1.5.0[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/stevedore[${PYTHON_USEDEP}]
+	dev-python/ujson[${PYTHON_USEDEP}]
+	>=dev-python/voluptuous-0.8.10[${PYTHON_USEDEP}]
+	dev-python/werkzeug[${PYTHON_USEDEP}]
+	>=dev-python/tenacity-4.6.0[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.4.1[${PYTHON_USEDEP}]
+	dev-python/paste[${PYTHON_USEDEP}]
+	dev-python/pastedeploy[${PYTHON_USEDEP}]
+	dev-python/monotonic[${PYTHON_USEDEP}]
+	dev-python/daiquiri[${PYTHON_USEDEP}]
+	>=dev-python/pyparsing-2.2.0[${PYTHON_USEDEP}]
+	>=dev-python/lz4-0.9.0[${PYTHON_USEDEP}]
+	>=dev-python/tooz-1.38[${PYTHON_USEDEP}]
+	dev-python/cachetools[${PYTHON_USEDEP}]
+
+	keystone? (
+		>=dev-python/keystonemiddleware-4.0.0[${PYTHON_USEDEP}]
+	)
+	mysql? (
+		dev-python/pymysql[${PYTHON_USEDEP}]
+		>=dev-python/oslo-db-4.29.0[${PYTHON_USEDEP}]
+		dev-python/sqlalchemy[${PYTHON_USEDEP}]
+		dev-python/SQLAlchemy-Utils[${PYTHON_USEDEP}]
+		>=dev-python/alembic-0.7.6[${PYTHON_USEDEP}]
+	)
+	postgresql? (
+		dev-python/psycopg:2[${PYTHON_USEDEP}]
+		>=dev-python/oslo-db-4.29.0[${PYTHON_USEDEP}]
+		dev-python/sqlalchemy[${PYTHON_USEDEP}]
+		dev-python/SQLAlchemy-Utils[${PYTHON_USEDEP}]
+		>=dev-python/alembic-0.7.6[${PYTHON_USEDEP}]
+	)
+	s3? (
+		dev-python/boto3[${PYTHON_USEDEP}]
+		>=dev-python/botocore-1.5[${PYTHON_USEDEP}]
+	)
+	redis? (
+		>=dev-python/redis-py-2.10.0[${PYTHON_USEDEP}]
+		dev-python/hiredis[${PYTHON_USEDEP}]
+	)
+	swift? (
+		>=dev-python/python-swiftclient-3.1.0[${PYTHON_USEDEP}]
+	)
+	ceph? (
+		sys-cluster/ceph[${PYTHON_USEDEP}]
+	)
+	prometheus? (
+		dev-python/snappy[${PYTHON_USEDEP}]
+		dev-python/protobuf-python[${PYTHON_USEDEP}]
+	)
+	amqp? (
+		>=dev-python/python-qpid-proton-0.17.0[${PYTHON_USEDEP}]
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	test? (
+		>=dev-python/pifpaf-1.0.1[${PYTHON_USEDEP}]
+		>=dev-python/gabbi-1.37.0[${PYTHON_USEDEP}]
+		dev-python/fixtures[${PYTHON_USEDEP}]
+		dev-python/subunit[${PYTHON_USEDEP}]
+		dev-python/testscenarios[${PYTHON_USEDEP}]
+		>=dev-python/testresources-0.2.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-0.9.38[${PYTHON_USEDEP}]
+		>=dev-python/webtest-2.0.16[${PYTHON_USEDEP}]
+		>=dev-python/keystonemiddleware-4.0.0[${PYTHON_USEDEP}]
+		>=dev-python/wsgi_intercept-1.4.1[${PYTHON_USEDEP}]
+		dev-python/xattr[${PYTHON_USEDEP}]
+		dev-python/python-swiftclient[${PYTHON_USEDEP}]
+	)
+"
+
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	test? ( amqp mysql )
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/hijri-converter/Manifest b/dev-python/hijri-converter/Manifest
index 352ca00e1822..c21a8cc048ea 100644
--- a/dev-python/hijri-converter/Manifest
+++ b/dev-python/hijri-converter/Manifest
@@ -1,2 +1,2 @@
-DIST hijri-converter-2.2.2.tar.gz 38541 BLAKE2B 4c032bbf5c88437457e343d9b602c9830c6e364d35ffeff60c06decf5dd7f17b2d018944e83ac292b93c5c6d32da9a7f5cb74511eedb35d37738c289011b620f SHA512 af2bc3a56fcb6f512dcc72b726f727cd7f9db883732fb0733107f4094586350fea0eba3bb8b7846eb4974170a9c9664303bc941846a951b192fea3172f0f9626
 DIST hijri-converter-2.2.3.tar.gz 42009 BLAKE2B c19caa6e8225406ca99a32fa1418890a1b380a4dfbe3b3c00d4ef99956b239e6313db619329c6becc8bf78f763060799693f664db8d4c7ed5139b4b629983cf2 SHA512 b038605ea020ded6f5eb555bfc159137cb29527693e258ca002a198932f1312ee5513ef4d1a4baa242b695337da959f203032cc6896dfce7b245b1befaddf6f1
+DIST hijri-converter-2.2.4.tar.gz 42179 BLAKE2B b8a935b87314e31a710eacfe49c9668684bf26deb678c6d7150e9b9c7c59ff07f03724395465f003b5cbdc0164cf1217816a8f0c8d62c1943c60596b4ac6ccb9 SHA512 4387e9bfcd23b1ac4a755070b45626a00ef71ad4bb82c48e23573dc95d90302571ffec0f9162b28c06054ae10c1b4da06859609db0106dada96a39bc279ad785
diff --git a/dev-python/hijri-converter/hijri-converter-2.2.2.ebuild b/dev-python/hijri-converter/hijri-converter-2.2.4.ebuild
index d082d192fb5b..a507e4879049 100644
--- a/dev-python/hijri-converter/hijri-converter-2.2.2.ebuild
+++ b/dev-python/hijri-converter/hijri-converter-2.2.4.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
+DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
 
 inherit distutils-r1
diff --git a/dev-python/jaeger-client/Manifest b/dev-python/jaeger-client/Manifest
deleted file mode 100644
index 7ea76f97a284..000000000000
--- a/dev-python/jaeger-client/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST jaeger-client-4.8.0.tar.gz 87365 BLAKE2B 11e688cd4b23c42d9fe34c9975534f59788c17e3c1057e24e8acc51b8907bbb50d0cbbdbd1754a9b7108c40f2c9c436edf31d2cdeb585c5f31f1a425e26ad071 SHA512 1b88700ebb2a81d213b425904edb431e676d6f52c5b300b780d0a4f59f5d300bf13f09d233a5ca0dee2bce54de743ec9632be99ef1820eddc563897c47eb3129
diff --git a/dev-python/jaeger-client/jaeger-client-4.8.0.ebuild b/dev-python/jaeger-client/jaeger-client-4.8.0.ebuild
deleted file mode 100644
index 1d29e2bf05ab..000000000000
--- a/dev-python/jaeger-client/jaeger-client-4.8.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Jaeger Bindings for Python OpenTracing API"
-HOMEPAGE="
-	https://github.com/jaegertracing/jaeger-client-python
-	https://pypi.org/project/jaeger-client/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	>=dev-python/threadloop-1[${PYTHON_USEDEP}]
-	dev-python/thrift[${PYTHON_USEDEP}]
-	>=www-servers/tornado-4.3[${PYTHON_USEDEP}]
-	>=dev-python/opentracing-2.1[${PYTHON_USEDEP}]
-"
-DEPEND="
-	${RDEPEND}
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pycurl[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		dev-python/pytest-tornado[${PYTHON_USEDEP}]
-		dev-python/pytest-benchmark[${PYTHON_USEDEP}]
-		dev-python/pytest-localserver[${PYTHON_USEDEP}]
-		>=dev-python/tchannel-2.1.0[${PYTHON_USEDEP}]
-		>=dev-python/opentracing_instrumentation-3[${PYTHON_USEDEP}]
-		>=dev-python/prometheus_client-0.11.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/jaeger-client/metadata.xml b/dev-python/jaeger-client/metadata.xml
deleted file mode 100644
index 94200988c26d..000000000000
--- a/dev-python/jaeger-client/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
-  <email>lssndrbarbieri@gmail.com</email>
-  <name>Alessandro Barbieri</name>
- </maintainer>
- 
- <origin>gentoo-guru-overlay</origin>
- <stabilize-allarches/>
-</pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/kaptan/kaptan-0.5.12-r2.ebuild b/dev-python/kaptan/kaptan-0.5.12-r2.ebuild
new file mode 100644
index 000000000000..ac6ef691b6bd
--- /dev/null
+++ b/dev-python/kaptan/kaptan-0.5.12-r2.ebuild
@@ -0,0 +1,19 @@
+# Copyright 2019-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Configuration manager in your pocket"
+HOMEPAGE="https://github.com/emre/kaptan"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+RDEPEND=">=dev-python/pyyaml-3.13[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
diff --git a/dev-python/keystonemiddleware/Manifest b/dev-python/keystonemiddleware/Manifest
index eb7236860209..206964665011 100644
--- a/dev-python/keystonemiddleware/Manifest
+++ b/dev-python/keystonemiddleware/Manifest
@@ -1 +1,2 @@
 DIST keystonemiddleware-9.4.0.tar.gz 184829 BLAKE2B 41bdb5af718e1160d6d7b04658b72f3a7e10f477d9b9aaeda7a926555f91963879c1aa9101ddb2a8179b86dd12f9d0501595fc82b383a41b4818807794272754 SHA512 bb44c68435e0ba7e58674731080cb9431dbfa72bbdbc25d6746466102620d896a5944367b55d3f3dc7418d46f15047f58f9479d7adb920f880e5e6bbe05c1e54
+DIST keystonemiddleware-9.5.0.tar.gz 184445 BLAKE2B c535aa99fd9ba360b7e7c580f11a7daf304d7a38ecd6962dc0e61adef96d7e7abadefec1473b20f24e7b24e2f0d7cbbb0ed592204c7ad520ff284580f26331af SHA512 0dc13ce850b3f2ca5c0e39da5258e177f94f7712007584fec8437072b5a9c7ef964b5bfc082341cbacfa9bc3e4ede94d94aec94e89cb0ae903a9d231eaa39487
diff --git a/dev-python/keystonemiddleware/keystonemiddleware-9.5.0.ebuild b/dev-python/keystonemiddleware/keystonemiddleware-9.5.0.ebuild
new file mode 100644
index 000000000000..fdb62f66c6b7
--- /dev/null
+++ b/dev-python/keystonemiddleware/keystonemiddleware-9.5.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_SETUPTOOLS=bdepend
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="A middleware for the OpenStack Keystone API"
+HOMEPAGE="
+	https://github.com/openstack/keystonemiddleware
+	https://opendev.org/openstack/keystonemiddleware
+	https://launchpad.net/keystonemiddleware
+	https://pypi.org/project/keystonemiddleware/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-python/keystoneauth-3.12.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-cache-1.26.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.18.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/pycadf-1.1.0[${PYTHON_USEDEP}]
+	>=dev-python/python-keystoneclient-3.20.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	test? (
+		>=dev-python/cryptography-3.0[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
+		>=dev-python/requests-mock-1.2.0[${PYTHON_USEDEP}]
+		>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+		>=dev-python/testresources-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+		>=dev-python/python-memcached-1.59[${PYTHON_USEDEP}]
+		>=dev-python/webtest-2.0.27[${PYTHON_USEDEP}]
+		>=dev-python/oslo-messaging-5.29.0[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/libtmux/Manifest b/dev-python/libtmux/Manifest
index df8f1c83392c..2345419df796 100644
--- a/dev-python/libtmux/Manifest
+++ b/dev-python/libtmux/Manifest
@@ -1,3 +1,2 @@
 DIST libtmux-v0.10.3.tar.gz 225258 BLAKE2B 40d591ee1f8a6068947b61416d6247b2475cc99031a67c167dc527631e50075f18c46fe6fc16193867d83a1a735b0a23fbfbc77f4539f788f05375f1f68b77d2 SHA512 2c8f28ce8c313404caffa42e5fd4a1dfa5d48bdc48203f8db595cb97b44886d63608771f23d62d76a56513b7e4578e48a31cacd224eca92425f110efd0a5db69
-DIST libtmux-v0.8.5.tar.gz 222445 BLAKE2B 5af148555eb89c66bdc66f3f214967f7e901d9b86ea85e02a9fba64f2eb3559828519ba8120eaee5eb86ec75bee2e599a08384dd096de8dc0969129c58172c1e SHA512 d456725c3ca41a672ee5239bfb5f42a262674638d308fa141627995be8b8fe348bb8713b735eb05c5a3cc73f35fe3f6fac12024f6254c950a3048b2e07606363
-DIST libtmux-v0.9.0.tar.gz 215649 BLAKE2B fdf6f424ce8eead5f0f19cb53bfd438e9cd7b5326e57e676281f74cedac6e1bcd7cded27e4ef226d2fc3bc09bbb57ff0e63aaa7d901ab910b6a890275c7fe63d SHA512 d47078300614b2a286eab6063c9492baa115787b917d2fb2e4188032ce580f495f0e7f4a14383407c61063a77d640092d117ba43974524f18da024dfc687c8a5
+DIST libtmux-v0.11.0.tar.gz 234278 BLAKE2B 4939d38894fd6a1492ff282c98243b2d5b3b6f787691031c74337629aed710d3caebeb3bfce571e8f38fe07ecc341b6b3f8aa0bc42979fa362f5f0679aabf21e SHA512 e09749ce4cf7cf7756e4e40e50c6eb0a00435f2b00c8436667b6b77a94078e9c380a811107f8129ea0d347355f3ce8bb213b8fb36de2becf3cf1a2dbebd97867
diff --git a/dev-python/libtmux/libtmux-0.8.5.ebuild b/dev-python/libtmux/libtmux-0.11.0.ebuild
index 62cfa214180b..6a1c1a59c03c 100644
--- a/dev-python/libtmux/libtmux-0.8.5.ebuild
+++ b/dev-python/libtmux/libtmux-0.11.0.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
+DISTUTILS_USE_PEP517=poetry
 inherit distutils-r1
 
 DESCRIPTION="python api for tmux"
@@ -14,11 +15,14 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 
-RDEPEND=">=app-misc/tmux-3.0a"
+RDEPEND="
+	>=app-misc/tmux-3.0a
+"
 BDEPEND="
 	test? (
 		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
 		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/twine[${PYTHON_USEDEP}]
 	)
 "
 
diff --git a/dev-python/libtmux/libtmux-0.9.0.ebuild b/dev-python/libtmux/libtmux-0.9.0.ebuild
deleted file mode 100644
index f850453c5f77..000000000000
--- a/dev-python/libtmux/libtmux-0.9.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="python api for tmux"
-HOMEPAGE="https://libtmux.git-pull.com/"
-SRC_URI="https://github.com/tmux-python/${PN}/archive/v${PV}.tar.gz -> ${PN}-v${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-
-RDEPEND=">=app-misc/tmux-3.0a"
-BDEPEND="
-	test? (
-		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/twine[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	local issues="https://github.com/tmux-python/libtmux/issues/"
-	sed -r -i "s|:issue:\`([[:digit:]]+)\`|\`issue \1 ${issues}\1\`|" CHANGES || die
-	rm requirements/doc.txt || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/mdx_gh_links/mdx_gh_links-0.2-r1.ebuild b/dev-python/mdx_gh_links/mdx_gh_links-0.2-r1.ebuild
new file mode 100644
index 000000000000..7aa9ab657b1c
--- /dev/null
+++ b/dev-python/mdx_gh_links/mdx_gh_links-0.2-r1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1
+
+DESCRIPTION="An extension which adds links to GitHub users, repositories, issues and commits"
+HOMEPAGE="https://github.com/Python-Markdown/github-links"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+
+RDEPEND="
+	dev-python/markdown[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/mkautodoc/mkautodoc-0.1.0-r1.ebuild b/dev-python/mkautodoc/mkautodoc-0.1.0-r1.ebuild
new file mode 100644
index 000000000000..f7648aa215e7
--- /dev/null
+++ b/dev-python/mkautodoc/mkautodoc-0.1.0-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1
+
+DESCRIPTION="Auto documentation for MkDocs"
+HOMEPAGE="
+	https://github.com/tomchristie/mkautodoc/
+	https://pypi.org/project/mkautodoc/
+"
+SRC_URI="https://github.com/tomchristie/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/markdown[${PYTHON_USEDEP}]"
+
+BDEPEND="test? (
+	dev-python/mock[${PYTHON_USEDEP}]
+)"
+
+distutils_enable_tests pytest
+
+python_test() {
+	PYTHONPATH="${WORKDIR}/${P}/tests/mocklib:${WORKDIR}/${P}" \
+	distutils-r1_python_test
+}
diff --git a/dev-python/mkdocs-bootstrap/mkdocs-bootstrap-1.1-r2.ebuild b/dev-python/mkdocs-bootstrap/mkdocs-bootstrap-1.1-r2.ebuild
new file mode 100644
index 000000000000..8f4c790c6034
--- /dev/null
+++ b/dev-python/mkdocs-bootstrap/mkdocs-bootstrap-1.1-r2.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+DISTUTILS_USE_PEP517=setuptools
+DOCS_BUILDER="mkdocs"
+
+inherit distutils-r1 docs
+
+DESCRIPTION="Bootstrap theme for MkDocs"
+HOMEPAGE="https://www.mkdocs.org https://github.com/mkdocs/mkdocs-bootstrap"
+SRC_URI="https://github.com/mkdocs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/mkdocs"
diff --git a/dev-python/mkdocs-bootswatch/mkdocs-bootswatch-1.1-r2.ebuild b/dev-python/mkdocs-bootswatch/mkdocs-bootswatch-1.1-r2.ebuild
new file mode 100644
index 000000000000..ae7feec1f4f9
--- /dev/null
+++ b/dev-python/mkdocs-bootswatch/mkdocs-bootswatch-1.1-r2.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+DISTUTILS_USE_PEP517=setuptools
+DOCS_BUILDER="mkdocs"
+
+inherit distutils-r1 docs
+
+DESCRIPTION="Bootswatch themes for MkDocs"
+HOMEPAGE="https://www.mkdocs.org https://github.com/mkdocs/mkdocs-bootswatch"
+SRC_URI="https://github.com/mkdocs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/mkdocs"
diff --git a/dev-python/mkdocs-material/Manifest b/dev-python/mkdocs-material/Manifest
index bcc87696583c..0b557600e63d 100644
--- a/dev-python/mkdocs-material/Manifest
+++ b/dev-python/mkdocs-material/Manifest
@@ -2,4 +2,5 @@ DIST mkdocs-material-8.2.10.gh.tar.gz 8324008 BLAKE2B 333c8cdcc09cb4b64cc1658849
 DIST mkdocs-material-8.2.11.gh.tar.gz 8333237 BLAKE2B 10b891f712a9df03a6e3cccb2e1df15c8dca138b18aed3f4ece33bdc5c81c545b3d5a8030f5a6346277150661586fce33888a4837cc7452c077362da7be9bfaf SHA512 02af540a966cc684d2dd014764b18f85ffe854c0093ac7b69ae147ba57c4d059d8a8ba83439ca9b31c9bdf4436c524467590de74e09f2bdbb070c1cfd464ff2a
 DIST mkdocs-material-8.2.13.gh.tar.gz 8333520 BLAKE2B f2ba716a43f2db823cc824e69b57b9ea2982cc8da73c61fa6b4984a04aab04df72bfa63b671c21e8db9648e2d6891d6e0c9e9294d3bf88b4f530ae22a7c8a6d7 SHA512 ffcde4b54e4ff0fb298ef9c818230209aaeae41d5489e735d6c3b25a0c0242b58e1d587cf791791ac6b1f19152e7f599898d5c3da44eb7888abbebb4e3e3ef63
 DIST mkdocs-material-8.2.14.gh.tar.gz 8335509 BLAKE2B 0fda8905763eb30fb96c96f7edb72735150fff564921ac9d07109e75c6481146c58149bf1a7afa1262dd650cdf8f08aef58ff1914e7ca428ed46f2c225c3cfe6 SHA512 24c142b326a72abd44cc42472062b86e90162cbb8d06f7ce62e5f8443de5af034dd7bbc5a1bb577f0bc157298c6f97d43d668a633d7da3610c0b623c42bbbc3f
+DIST mkdocs-material-8.2.15.gh.tar.gz 8337955 BLAKE2B 542871c9be9c67c83a0b62d3bb61c10628bf0fb4bd380b75e8263d566ff3cedb97e208993f3e8141d4a641f3afbf6d0db7b1962d407ab6162bfdb87065406db9 SHA512 fdc57e173678a7910d48fad94779864bbf65ce817700ca325eec9121c18f7cf2bf8e29ca64bc6f9a62f5bcd60a15cbe815edd320d2771f1a8d247099ed5d5ce3
 DIST mkdocs-material-8.2.8.gh.tar.gz 8304608 BLAKE2B ff44912e812a32c7bc99fb7a07178864a952ecfbe953fe8e4d06188e2cf79f87276a881aeba1b2e5b5c290b4e12afa72761b35988290b7039163c643ec51c154 SHA512 fd2308f78c2dfff81d917f958903fee44fdd214a209464c4279d399812a686a26084e40367b0809889f682adfe5d1fe3b4707dc206621f3aa216be59e13d5d0a
diff --git a/dev-python/mkdocs-material/mkdocs-material-8.2.15.ebuild b/dev-python/mkdocs-material/mkdocs-material-8.2.15.ebuild
new file mode 100644
index 000000000000..c6c3069f44ba
--- /dev/null
+++ b/dev-python/mkdocs-material/mkdocs-material-8.2.15.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+
+DOCS_BUILDER="mkdocs"
+DOCS_DEPEND="
+	dev-python/mkdocs-material-extensions
+	dev-python/mkdocs-minify-plugin
+	dev-python/mkdocs-redirects
+"
+
+inherit distutils-r1 docs
+
+DESCRIPTION="A Material Design theme for MkDocs"
+HOMEPAGE="
+	https://github.com/squidfunk/mkdocs-material/
+	https://pypi.org/project/mkdocs-material/
+"
+SRC_URI="
+	https://github.com/squidfunk/${PN}/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/jinja-2.11.1[${PYTHON_USEDEP}]
+	>=dev-python/markdown-3.2[${PYTHON_USEDEP}]
+	>=dev-python/mkdocs-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.12[${PYTHON_USEDEP}]
+	>=dev-python/pymdown-extensions-9.4[${PYTHON_USEDEP}]
+"
+
+# mkdocs-material-extensions depends on mkdocs-material creating a circular dep
+PDEPEND=">=dev-python/mkdocs-material-extensions-1.0.3[${PYTHON_USEDEP}]"
diff --git a/dev-python/mkdocs-minify-plugin/mkdocs-minify-plugin-0.5.0-r2.ebuild b/dev-python/mkdocs-minify-plugin/mkdocs-minify-plugin-0.5.0-r2.ebuild
new file mode 100644
index 000000000000..bf375c6dd026
--- /dev/null
+++ b/dev-python/mkdocs-minify-plugin/mkdocs-minify-plugin-0.5.0-r2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1
+
+DESCRIPTION="An MkDocs plugin to minify HTML and/or JS files prior to being written to disk"
+HOMEPAGE="
+	https://github.com/byrnereese/mkdocs-minify-plugin
+	https://pypi.org/project/mkdocs-minify-plugin/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/csscompressor-0.9.5[${PYTHON_USEDEP}]
+	>=dev-python/mkdocs-1.0.4[${PYTHON_USEDEP}]
+	>=app-text/htmlmin-0.1.4[${PYTHON_USEDEP}]
+	>=dev-python/jsmin-2.2.2[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/mkdocs-redirects/mkdocs-redirects-1.0.4-r1.ebuild b/dev-python/mkdocs-redirects/mkdocs-redirects-1.0.4-r1.ebuild
new file mode 100644
index 000000000000..8ad610f73857
--- /dev/null
+++ b/dev-python/mkdocs-redirects/mkdocs-redirects-1.0.4-r1.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_{7,8,9,10} )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1
+
+DESCRIPTION="Plugin for Mkdocs page redirects"
+HOMEPAGE="
+	https://github.com/mkdocs/mkdocs-redirects
+	https://pypi.org/project/mkdocs-redirects/
+"
+SRC_URI="https://github.com/mkdocs/mkdocs-redirects/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/mkdocs-1.0.4[${PYTHON_USEDEP}]
+	<dev-python/mkdocs-2[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/twine[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/mkdocs/mkdocs-1.3.0-r1.ebuild b/dev-python/mkdocs/mkdocs-1.3.0-r1.ebuild
new file mode 100644
index 000000000000..36c30f5ab07e
--- /dev/null
+++ b/dev-python/mkdocs/mkdocs-1.3.0-r1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1
+
+DESCRIPTION="Project documentation with Markdown"
+HOMEPAGE="https://www.mkdocs.org https://github.com/mkdocs/mkdocs"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+
+IUSE="doc"
+
+BDEPEND="
+	doc? (
+		$(python_gen_any_dep '
+			dev-python/mdx_gh_links[${PYTHON_USEDEP}]
+			dev-python/mkdocs-redirects[${PYTHON_USEDEP}]
+		')
+	)
+"
+
+RDEPEND="
+	>=dev-python/Babel-2.9.0[${PYTHON_USEDEP}]
+	>=dev-python/click-3.3[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.10.2[${PYTHON_USEDEP}]
+	>=dev-python/markdown-3.2.1[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
+	>=dev-python/watchdog-2.0[${PYTHON_USEDEP}]
+	>=dev-python/ghp-import-1.0[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml_env_tag-0.1[${PYTHON_USEDEP}]
+	>=dev-python/importlib_metadata-3.10[${PYTHON_USEDEP}]
+	>=dev-python/packaging-20.5[${PYTHON_USEDEP}]
+	>=dev-python/mergedeep-1.3.4[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# Tests fails if additional themes are installed
+	sed -i -e 's:test_get_themes:_&:' \
+		mkdocs/tests/utils/utils_tests.py || die
+
+	# Skip this network test, "does not appear to be an IPv4 or IPv6 address"
+	sed -i -e 's/test_IP_normalization/_&/' \
+		mkdocs/tests/config/config_options_tests.py || die
+
+	# livereload has been dropped in this release, this test is a remnant
+	rm mkdocs/tests/livereload_tests.py || die
+
+	# fix apparent typo in test (importing wrong thing)
+	sed -i -e 's/from localization import/from mkdocs.localization import/g' \
+		mkdocs/tests/theme_tests.py || die
+
+	# Does not work in emerge env
+	sed -i -e 's/test_paths_localized_to_config/_&/' \
+		mkdocs/tests/config/config_options_tests.py
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	default
+	if use doc; then
+		# cannot just do mkdocs build, because that fails if
+		# the package isn't already installed
+		python -m mkdocs build || die "Failed to make docs"
+		# Colliding files found by ecompress:
+		rm site/sitemap.xml.gz || die
+		HTML_DOCS=( "site/." )
+	fi
+}
+
+python_test() {
+	epytest mkdocs/tests/*
+}
diff --git a/dev-python/moto/moto-3.1.10.ebuild b/dev-python/moto/moto-3.1.10.ebuild
index 4f2efef7aa26..5697c86481f1 100644
--- a/dev-python/moto/moto-3.1.10.ebuild
+++ b/dev-python/moto/moto-3.1.10.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 
 RDEPEND="
 	>=dev-python/aws-xray-sdk-python-0.93[${PYTHON_USEDEP}]
diff --git a/dev-python/numexpr/numexpr-2.8.1-r1.ebuild b/dev-python/numexpr/numexpr-2.8.1-r1.ebuild
new file mode 100644
index 000000000000..56b05db1796e
--- /dev/null
+++ b/dev-python/numexpr/numexpr-2.8.1-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Fast numerical array expression evaluator for Python and NumPy"
+HOMEPAGE="https://github.com/pydata/numexpr"
+SRC_URI="https://github.com/pydata/numexpr/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 ~amd64-linux ~x86-linux"
+
+DEPEND="
+	>=dev-python/numpy-1.13.3[${PYTHON_USEDEP}]
+"
+RDEPEND="${DEPEND}
+	dev-python/packaging[${PYTHON_USEDEP}]
+"
+
+python_test() {
+	pushd "${BUILD_DIR}/install/usr/lib/${EPYTHON}/site-packages" >/dev/null || die
+	"${EPYTHON}" - <<-EOF || die "Tests failed with ${EPYTHON}"
+		import sys,numexpr
+		sys.exit(0 if numexpr.test().wasSuccessful() else 1)
+	EOF
+	pushd >/dev/null || die
+}
diff --git a/dev-python/openapi-schema-validator/openapi-schema-validator-0.2.3.ebuild b/dev-python/openapi-schema-validator/openapi-schema-validator-0.2.3.ebuild
index 0f66ab8247e1..e925b46608f3 100644
--- a/dev-python/openapi-schema-validator/openapi-schema-validator-0.2.3.ebuild
+++ b/dev-python/openapi-schema-validator/openapi-schema-validator-0.2.3.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 
 RDEPEND="
 	dev-python/isodate[${PYTHON_USEDEP}]
diff --git a/dev-python/openapi-spec-validator/openapi-spec-validator-0.4.0.ebuild b/dev-python/openapi-spec-validator/openapi-spec-validator-0.4.0.ebuild
index 14a48b29b926..d4897f1c8804 100644
--- a/dev-python/openapi-spec-validator/openapi-spec-validator-0.4.0.ebuild
+++ b/dev-python/openapi-spec-validator/openapi-spec-validator-0.4.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 
 RDEPEND="
 	>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
diff --git a/dev-python/opentracing_instrumentation/Manifest b/dev-python/opentracing_instrumentation/Manifest
deleted file mode 100644
index db3f35ac3267..000000000000
--- a/dev-python/opentracing_instrumentation/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST opentracing_instrumentation-3.3.1.tar.gz 41897 BLAKE2B ed5b79082160a34d4f97ba4a704291e43711a40d830b6df1449ea122b00ceb962e0348d5b5901e39e9c87f33220176c74375c07f297f907f0903a299d929c0d9 SHA512 414b9755c75ebeb66a58d323a82aad01b44b513355e3a548a564f5fbd4658c63cd397ea730811c311948a55ee51537cf864f55bf9fe50366236cad1b5bfc023e
diff --git a/dev-python/opentracing_instrumentation/files/opentracing_instrumentation-3.3.1-no-coverage.patch b/dev-python/opentracing_instrumentation/files/opentracing_instrumentation-3.3.1-no-coverage.patch
deleted file mode 100644
index cfb6d9ea8b73..000000000000
--- a/dev-python/opentracing_instrumentation/files/opentracing_instrumentation-3.3.1-no-coverage.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- a/setup.cfg
-+++ b/setup.cfg
-@@ -15,4 +15,4 @@
-     tests/*
- 
- [tool:pytest]
--addopts = --cov=opentracing_instrumentation --cov-append -rs
-+addopts = -rs
diff --git a/dev-python/opentracing_instrumentation/metadata.xml b/dev-python/opentracing_instrumentation/metadata.xml
deleted file mode 100644
index 7e4d0f56fd7d..000000000000
--- a/dev-python/opentracing_instrumentation/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
-  <email>lssndrbarbieri@gmail.com</email>
-  <name>Alessandro Barbieri</name>
- </maintainer>
- <upstream>
-  <bugs-to>https://github.com/uber-common/opentracing-python-instrumentation/issues</bugs-to>
- </upstream>
- <origin>gentoo-guru-overlay</origin>
-</pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/opentracing_instrumentation/opentracing_instrumentation-3.3.1.ebuild b/dev-python/opentracing_instrumentation/opentracing_instrumentation-3.3.1.ebuild
deleted file mode 100644
index ab18996a35b2..000000000000
--- a/dev-python/opentracing_instrumentation/opentracing_instrumentation-3.3.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MYPN="${PN/_/-python-}"
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="A collection of Python instrumentation tools for the OpenTracing API"
-HOMEPAGE="
-	https://github.com/uber-common/opentracing-python-instrumentation
-	https://pypi.org/project/opentracing-instrumentation/
-"
-SRC_URI="https://github.com/uber-common/${MYPN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MYPN}-${PV}"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-python/future[${PYTHON_USEDEP}]
-	dev-python/wrapt[${PYTHON_USEDEP}]
-	>=www-servers/tornado-4.1[${PYTHON_USEDEP}]
-	>=dev-python/opentracing-2[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	test? (
-		dev-python/boto3[${PYTHON_USEDEP}]
-		dev-python/botocore[${PYTHON_USEDEP}]
-		dev-python/celery[${PYTHON_USEDEP}]
-		dev-python/doubles[${PYTHON_USEDEP}]
-		dev-python/moto[${PYTHON_USEDEP}]
-		dev-python/psycopg:2[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-1.3.7[${PYTHON_USEDEP}]
-		dev-python/pytest-localserver[${PYTHON_USEDEP}]
-		dev-python/pytest-tornado[${PYTHON_USEDEP}]
-		>=dev-python/basictracer-3[${PYTHON_USEDEP}]
-		dev-python/redis-py[${PYTHON_USEDEP}]
-		dev-python/testfixtures[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=( "${FILESDIR}/${P}-no-coverage.patch" )
-
-distutils_enable_tests pytest
diff --git a/dev-python/orjson/orjson-3.6.8-r1.ebuild b/dev-python/orjson/orjson-3.6.8-r1.ebuild
index c4a41fc2944a..b4066b456db6 100644
--- a/dev-python/orjson/orjson-3.6.8-r1.ebuild
+++ b/dev-python/orjson/orjson-3.6.8-r1.ebuild
@@ -34,7 +34,7 @@ CRATES="
 "
 DISTUTILS_USE_PEP517=maturin
 PYTHON_COMPAT=( python3_{7,8,9,10} )
-QA_FLAGS_IGNORED="*"
+QA_FLAGS_IGNORED=".*"
 
 inherit cargo distutils-r1
 
diff --git a/dev-python/os-ken/Manifest b/dev-python/os-ken/Manifest
index e11eae9551ef..9f825dab94b9 100644
--- a/dev-python/os-ken/Manifest
+++ b/dev-python/os-ken/Manifest
@@ -1 +1,2 @@
 DIST os-ken-2.3.1.tar.gz 1374401 BLAKE2B 48d0bec58f911a708e0ff662162ea2163c0466176fa0618580733f55415e3681be545b30675ce0f2fa174a72e8dc4950ff5d5c1a4adba96f86540f9b1649e03b SHA512 5a2b916b1207595fc3c96e1e4cccfc9bed4a7be6859ca49892e50f98633fe18cbab6e59b11c3d024765b21a826d81031aec66d1016369b9887b1af9fb7952c9f
+DIST os-ken-2.4.0.tar.gz 1372860 BLAKE2B 0fb7fc334362a57795a29ad211ab142f6d8b864226abb850f28266369a2fbff71971b00c2225897c49adca768612966c965b25a34f0d988855776c6b164dc537 SHA512 4ff047edb2c87e8b650c62d7a0fdaa1a977b2378caa703925e089f5497aa2cb158384f9857254a4717df23e666f460ce57a1385cecfc43509c514ff2a8bb5188
diff --git a/dev-python/os-ken/os-ken-2.4.0.ebuild b/dev-python/os-ken/os-ken-2.4.0.ebuild
new file mode 100644
index 000000000000..5377907be816
--- /dev/null
+++ b/dev-python/os-ken/os-ken-2.4.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="OpenStack Cinder brick library for managing local volume attaches"
+HOMEPAGE="
+	https://github.com/openstack/os-ken
+	https://opendev.org/openstack/os-ken
+	https://pypi.org/project/os-ken/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/os-ken-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-python/eventlet-0.22.0[${PYTHON_USEDEP}]
+	>=dev-python/msgpack-0.5.0[${PYTHON_USEDEP}]
+	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-5.1.0[${PYTHON_USEDEP}]
+	>=dev-python/ovs-2.8.0[${PYTHON_USEDEP}]
+	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.8.2[${PYTHON_USEDEP}]
+"
+DEPEND="
+	${RDEPEND}
+	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		>=dev-python/subunit-1.0.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
+		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/ncclient[${PYTHON_USEDEP}]
+		dev-python/sqlalchemy[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests nose
+
+src_prepare() {
+	rm -r "${S}/os_ken/tests/integrated" || die
+	default
+}
diff --git a/dev-python/os-vif/Manifest b/dev-python/os-vif/Manifest
index 4ca880b71339..abb4a05a465c 100644
--- a/dev-python/os-vif/Manifest
+++ b/dev-python/os-vif/Manifest
@@ -1 +1,2 @@
 DIST os_vif-2.7.1.tar.gz 97094 BLAKE2B 46661eb674807035f4f6cdadc86fcffea9d37776f40eeeaadf8727ee678d8dd9237e3789708df9b6603824aaf64be0b9691c477020ed810b6fae2bb35ce04f2b SHA512 6ea31963e3f44a90b265d5b99035ac1a6e4c3effa60259a26809c25c4ac03ed5e6f171f9edc974606ba5ba4a183ad806ee6d40cc276e31e5deff715fcb70e21e
+DIST os_vif-2.8.0.tar.gz 97327 BLAKE2B edf6fa0f1b423417d8ce0ec8e17ff65ca308ab31739aeb1711928bba41de8092637e03b6f52497dcbe87881e2074b8539ec79454dffa1c66aabb2a32e4f067d8 SHA512 c5149857a3fd3326db2ca6319439f35403298f9f99954257c21aab10a7c4b29ca78bcee8ab0fb58598da681c8add603dcbaf8a73e3dbff18d91393ae4ab887a8
diff --git a/dev-python/os-vif/os-vif-2.8.0.ebuild b/dev-python/os-vif/os-vif-2.8.0.ebuild
new file mode 100644
index 000000000000..9a261eb116c6
--- /dev/null
+++ b/dev-python/os-vif/os-vif-2.8.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+EPYTEST_IGNORE=(
+	os_vif/tests/functional
+	vif_plug_ovs/tests/functional
+)
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="OpenStack Cinder brick library for managing local volume attaches"
+HOMEPAGE="
+	https://github.com/openstack/os-vif
+	https://opendev.org/openstack/os-vif
+	https://launchpad.net/os-vif
+	https://pypi.org/project/os-vif/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/os_vif-${PV}.tar.gz"
+S="${WORKDIR}/os_vif-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-3.20.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-5.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-3.30.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-privsep-1.23.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-versionedobjects-1.28.0[${PYTHON_USEDEP}]
+	>=dev-python/ovsdbapp-0.12.1[${PYTHON_USEDEP}]
+	>=dev-python/pyroute2-0.5.2[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-1.19.0[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	test? (
+		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
+		>=dev-python/ovs-2.9.2[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/os-win/Manifest b/dev-python/os-win/Manifest
index 6ba62c25510f..4483a252faf6 100644
--- a/dev-python/os-win/Manifest
+++ b/dev-python/os-win/Manifest
@@ -1 +1,2 @@
 DIST os-win-5.6.0.tar.gz 225948 BLAKE2B 64217d7bf625acad6a72d44f47887e5e1466f346ee6c1bd0685d9e1aa068222385654de8bf39403f2ebc90c14d651beb2978dcc1a48668d436b49bbedfbc34c7 SHA512 8856303c436ce6d9e9689993659905d4976511508d4e38ebc8fbc027a9c4a0ca26a7f38729f47af76a19ba1b1833ccef2ad4dd4277911b9d8c795e4f7dbce9ed
+DIST os-win-5.7.0.tar.gz 226181 BLAKE2B 0f8d584aaca402ebd2be8ee7f7046588553be5b176dd2cc99f68f3b2bb1c5271e404c5ed9b38701f921f8c6c025e8ae7fab91fc11a4d393196e59795c23ba3ec SHA512 d1958f1068d4a548647225dfee295626e719319ca3afbaf4e37f3d696862c1a16159492b1f0e1ba76924955c8501e903a7bd4c6fa8acbf22ec761ae09f8b39b1
diff --git a/dev-python/os-win/os-win-5.7.0.ebuild b/dev-python/os-win/os-win-5.7.0.ebuild
new file mode 100644
index 000000000000..c26143c76109
--- /dev/null
+++ b/dev-python/os-win/os-win-5.7.0.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+EPYTEST_DESELECT=(
+	os_win/tests/unit/utils/compute/test_livemigrationutils.py::LiveMigrationUtilsTestCase::test_check_live_migration_config
+	os_win/tests/unit/utils/compute/test_livemigrationutils.py::LiveMigrationUtilsTestCase::test_create_planned_vm
+	os_win/tests/unit/utils/compute/test_livemigrationutils.py::LiveMigrationUtilsTestCase::test_get_vhd_setting_data
+	os_win/tests/unit/utils/compute/test_livemigrationutils.py::LiveMigrationUtilsTestCase::test_live_migrate_single_planned_vm
+	os_win/tests/unit/utils/compute/test_livemigrationutils.py::LiveMigrationUtilsTestCase::test_update_planned_vm_disk_resources
+	os_win/tests/unit/utils/compute/test_vmutils.py::VMUtilsTestCase::test_check_admin_permissions
+	os_win/tests/unit/utils/compute/test_vmutils.py::VMUtilsTestCase::test_create_vm_1_True
+	os_win/tests/unit/utils/compute/test_vmutils.py::VMUtilsTestCase::test_create_vm_2_False
+	os_win/tests/unit/utils/compute/test_vmutils.py::VMUtilsTestCase::test_detach_vm_disk
+	os_win/tests/unit/utils/compute/test_vmutils.py::VMUtilsTestCase::test_disable_remotefx_video_adapter
+	os_win/tests/unit/utils/compute/test_vmutils.py::VMUtilsTestCase::test_disable_remotefx_video_adapter_not_found
+	os_win/tests/unit/utils/compute/test_vmutils.py::VMUtilsTestCase::test_enable_remotefx_video_adapter
+	os_win/tests/unit/utils/compute/test_vmutils.py::VMUtilsTestCase::test_get_mounted_disk_resource_from_path_1_None
+	os_win/tests/unit/utils/compute/test_vmutils.py::VMUtilsTestCase::test_get_mounted_disk_resource_from_path_2
+	os_win/tests/unit/utils/compute/test_vmutils.py::VMUtilsTestCase::test_get_vm_disks
+	os_win/tests/unit/utils/compute/test_vmutils.py::VMUtilsTestCase::test_get_vm_serial_ports
+	os_win/tests/unit/utils/compute/test_vmutils.py::VMUtilsTestCase::test_remove_vm_snapshot
+	os_win/tests/unit/utils/compute/test_vmutils.py::VMUtilsTestCase::test_set_vm_vcpus
+	os_win/tests/unit/utils/compute/test_vmutils.py::VMUtilsTestCase::test_set_vm_vcpus_per_vnuma_node
+	os_win/tests/unit/utils/compute/test_vmutils.py::VMUtilsTestCase::test_take_vm_snapshot_1_None
+	os_win/tests/unit/utils/compute/test_vmutils.py::VMUtilsTestCase::test_take_vm_snapshot_2
+	os_win/tests/unit/utils/network/test_networkutils.py::NetworkUtilsTestCase::test_create_default_setting_data
+	os_win/tests/unit/utils/network/test_networkutils.py::NetworkUtilsTestCase::test_is_port_vm_started_false
+	os_win/tests/unit/utils/network/test_networkutils.py::NetworkUtilsTestCase::test_is_port_vm_started_true
+)
+EPYTEST_IGNORE=( os_win/tests/unit/test_hacking.py )
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Windows / Hyper-V library for OpenStack projects"
+HOMEPAGE="
+	https://github.com/openstack/os-win
+	https://opendev.org/openstack/os-win
+	https://launchpad.net/os-win
+	https://pypi.org/project/os-win/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/eventlet-0.22.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-3.29.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-6.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-4.7.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	test? (
+		>=dev-python/ddt-1.2.1[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-3.8.0[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/oslo-db/Manifest b/dev-python/oslo-db/Manifest
index 8142a5596e39..dfecc186a2de 100644
--- a/dev-python/oslo-db/Manifest
+++ b/dev-python/oslo-db/Manifest
@@ -1 +1 @@
-DIST oslo.db-11.2.0.tar.gz 177589 BLAKE2B 8e0671e7021b40856a8a9e1ee9699abf9ba8eb9f549a15efc0e8ad03b8bf2a7f5f1438b22ffc545ae5c301f38687877877794bdd4b85c4d36cc8434fb7a6edd0 SHA512 5037d83bd45187055808190bb73681d56af6edd523df91f9edff06de1ae6694a018e0635e9e2e80bbc21f0690b8eb218e73c1be0f4a4ddcd93a97ffa5f093232
+DIST oslo.db-11.3.0.tar.gz 177703 BLAKE2B eddec44d16cee671643cad9fd8b0d068e0993d1e7da5facf2cded94d8d9e68a2c27bd8280bc98e9c8371f2fa7b327dccd2ad9ef7c26bf3600704fc6f81e3bf19 SHA512 4e03317e946b21590e7427ac14baa5264c107f97f8f2e2f5aa5641054ed614a0540bc19e6fee2767aad7b3a7554e2761bb7159adaa9d95add473f5514d2fb9e0
diff --git a/dev-python/oslo-db/oslo-db-11.2.0.ebuild b/dev-python/oslo-db/oslo-db-11.3.0.ebuild
index e58326fae939..e58326fae939 100644
--- a/dev-python/oslo-db/oslo-db-11.2.0.ebuild
+++ b/dev-python/oslo-db/oslo-db-11.3.0.ebuild
diff --git a/dev-python/osprofiler/osprofiler-3.4.3.ebuild b/dev-python/osprofiler/osprofiler-3.4.3.ebuild
index 5eaa2bfe8289..099a2564a718 100644
--- a/dev-python/osprofiler/osprofiler-3.4.3.ebuild
+++ b/dev-python/osprofiler/osprofiler-3.4.3.ebuild
@@ -47,7 +47,6 @@ DEPEND="
 		>=dev-python/elasticsearch-py-2.0.0[${PYTHON_USEDEP}]
 		>=dev-python/redis-py-2.10.0[${PYTHON_USEDEP}]
 		>=dev-python/reno-3.1.0[${PYTHON_USEDEP}]
-		>=dev-python/jaeger-client-3.8.0[${PYTHON_USEDEP}]
 	)
 "
 
diff --git a/dev-python/ovsdbapp/Manifest b/dev-python/ovsdbapp/Manifest
index cd0401a7ebcc..b802035dccf0 100644
--- a/dev-python/ovsdbapp/Manifest
+++ b/dev-python/ovsdbapp/Manifest
@@ -1 +1,2 @@
 DIST ovsdbapp-1.16.0.tar.gz 105855 BLAKE2B 4aad43209c9c51c526fd101b8dc34108cd331b455ba36564fd3d2c1907f7eded0b7811926fb1cbae692d53f878d8f058928a796d310ab222143cdb0aa181f8d0 SHA512 035db0ebb6677cd43c8943f027d61f09f7413fed42cc9e1d84bc71cdb87bab0a44660c0d8df9ab6239df118952e0a5ead0cca67dfc2bf28d5f4c50f4930ed672
+DIST ovsdbapp-1.16.1.tar.gz 105446 BLAKE2B 7b49485b30af6acc456f667388df1cf2770e951de8f17dd53c326de402517a372dd4a589a1c99e9d3bc872b3e13989c3ad07eb40e303e1dfd0c6752c3ac0c45d SHA512 9da2d1f6664b0a93a8e08d613389a3fa7c4455c7492fa9327438b8b121248aaf5debaa3569bfaae8a099eb67703947618c5a17f9ab91b404743348175da2a8c1
diff --git a/dev-python/ovsdbapp/ovsdbapp-1.16.1.ebuild b/dev-python/ovsdbapp/ovsdbapp-1.16.1.ebuild
new file mode 100644
index 000000000000..d8d6fdca0240
--- /dev/null
+++ b/dev-python/ovsdbapp/ovsdbapp-1.16.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+EPYTEST_IGNORE=( ovsdbapp/tests/functional )
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="A library for creating OVSDB applications"
+HOMEPAGE="
+	https://opendev.org/openstack/ovsdbapp
+	https://pypi.org/project/ovsdbapp/
+	https://launchpad.net/ovsdbapp
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
+	>=dev-python/ovs-2.10.0[${PYTHON_USEDEP}]
+	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	test? (
+		>=dev-python/subunit-1.0.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+		net-misc/openvswitch
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pg8000/Manifest b/dev-python/pg8000/Manifest
index b614193d979e..a938188920aa 100644
--- a/dev-python/pg8000/Manifest
+++ b/dev-python/pg8000/Manifest
@@ -1,2 +1,2 @@
-DIST pg8000-1.26.0.tar.gz 117659 BLAKE2B f4b418b4fed7a43d89369b1994683aa7ba4748d0ff98c78f0c1ddd2ebb262268e0f226a4b170e653d506fff0e061c40f39e3cbeadd8acdd4b3a47fc50775af5d SHA512 5c74d199fec8e93631c4359bc95332692ca6c4d5643e6034b558e67836d6250fc401d4c02141673d34347d9bfa3b0354004cb2d731eb1ab91e1a5e71e19ba55b
 DIST pg8000-1.26.1.tar.gz 116994 BLAKE2B 4db3186e72afb2e2fae441c1bbb974768e0064276f1ad571316a531cbc590edfcca4c3f4ef1fd493e80e7ebd1817bee354413ea158ec191434e8530007af0ee3 SHA512 d085d4992be18868da6b6f67efcb1e5f41cd05a13b0f4361685e5e8ada14af02ef4ee17558809b447a118cf8380fab13e8932d49fd14d2ee2472b191f8531289
+DIST pg8000-1.29.1.tar.gz 92221 BLAKE2B a1e43f445848283472b0aee84f05d3e1c0f8f2d6b8c619789f9e1d961dae240c9ebfb8a1fb22af55f4635bb89f036f8dd1ece477b3b68bff5c1b68ccac32b0b4 SHA512 27ced0ae82e522fabdf3a69b07927223695a7c5658f56f75dbfa43f6923b7a914ec54143421324839c07850e10f5f61ca9bc31155af3e4e600429a1889aedea7
diff --git a/dev-python/pg8000/pg8000-1.26.0.ebuild b/dev-python/pg8000/pg8000-1.29.1.ebuild
index a5ce66a854c8..27394e138c73 100644
--- a/dev-python/pg8000/pg8000-1.26.0.ebuild
+++ b/dev-python/pg8000/pg8000-1.29.1.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=8
 
+DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{7,8,9,10} )
 
 inherit distutils-r1
diff --git a/dev-python/pipenv/Manifest b/dev-python/pipenv/Manifest
index a96ecdd88fcd..6c77eca04a67 100644
--- a/dev-python/pipenv/Manifest
+++ b/dev-python/pipenv/Manifest
@@ -1 +1,2 @@
 DIST pipenv-2022.4.8.tar.gz 11822017 BLAKE2B b647bf5dbbdb6a38ace41bc58c3178199c0c7cada826f18d0f58c6f3cd60290fa714ca434d19cf468cf316d51ac0895460cb007d677b53462a7efc86f3d3bb2e SHA512 8c0ed65b9431b785f86bc4fa0a0a55d96228ed2f9483805536fa3056853dbfabeac02578f694e9a3f2e00be579183d10dcbb957fb834d475e1621de6a05ebd2e
+DIST pipenv-2022.5.2.tar.gz 12254831 BLAKE2B 36bbf7621be18a639a3460b46cb9522e611939c060fb215406b180d0e0ae8a6582e9cb98560b09b2c95f690dbd8cfd2d10eb7709955cf5f8bf52775dfae1f445 SHA512 0c0fcaf14046cb0d75cb9c260408683b53d6a5e5f2c20c4f73cc20c21af054ac2f18d3c616bfebf18dd6ad02731dadcc0efa85f861643c5ce7dc16d61e9d1983
diff --git a/dev-python/pipenv/pipenv-2022.5.2.ebuild b/dev-python/pipenv/pipenv-2022.5.2.ebuild
new file mode 100644
index 000000000000..d7aa6ebfebff
--- /dev/null
+++ b/dev-python/pipenv/pipenv-2022.5.2.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+
+inherit distutils-r1 multiprocessing
+
+MY_PV=${PV/_beta/b}
+DESCRIPTION="Python Development Workflow for Humans"
+HOMEPAGE="https://github.com/pypa/pipenv https://pypi.org/project/pipenv/"
+SRC_URI="https://github.com/pypa/pipenv/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}-${MY_PV}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+
+RDEPEND="
+	dev-python/attrs[${PYTHON_USEDEP}]
+	dev-python/cached-property[${PYTHON_USEDEP}]
+	>=dev-python/cerberus-1.3.2[${PYTHON_USEDEP}]
+	dev-python/click[${PYTHON_USEDEP}]
+	>=dev-python/colorama-0.4.4[${PYTHON_USEDEP}]
+	>=dev-python/idna-3.2[${PYTHON_USEDEP}]
+	dev-python/iso8601[${PYTHON_USEDEP}]
+	>=dev-python/pexpect-4.8.0[${PYTHON_USEDEP}]
+	dev-python/pip[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.8.2[${PYTHON_USEDEP}]
+	>=dev-python/virtualenv-20.0.35[${PYTHON_USEDEP}]
+	dev-python/virtualenv-clone[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.26.0[${PYTHON_USEDEP}]
+	>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.26.7[${PYTHON_USEDEP}]
+	>=dev-python/wheel-0.36.0[${PYTHON_USEDEP}]
+	>=dev-python/zipp-3.6.0[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	${RDEPEND}
+	test? (
+		dev-python/flaky[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+# IMPORTANT: The following sed command patches the vendor direcotry
+# in the pipenv source. Attempts to simply bump the version of the
+# package without checking that it works is likely to fail
+# The vendored packages should eventually all be removed
+# see: https://bugs.gentoo.org/717666
+src_prepare() {
+	local pkgName
+	local jobs=$(makeopts_jobs)
+	local packages=( attr cerberus cached_property click colorama idna iso8601 pexpect dateutil requests toml tomli urllib3 zipp )
+	for pkgName in ${packages[@]}; do
+		find ./ -type f -print0 | \
+			xargs --max-procs="${jobs}" --null \
+			sed --in-place \
+				-e "s/from pipenv.vendor import ${pkgName}/import ${pkgName}/g" \
+				-e "s/from pipenv.vendor.${pkgName}\(.*\) import \(\w*\)/from ${pkgName}\1 import \2/g"\
+				-e "s/import pipenv.vendor.${pkgName} as ${pkgName}/import ${pkgName}/g" \
+				-e "s/from .vendor import ${pkgName}/import ${pkgName}/g" || die "Failed to sed for ${pkgName}"
+	done
+
+	distutils-r1_src_prepare
+
+	# remove vendored versions
+	for pkgName in ${packages[@]}; do
+		find  ./pipenv/vendor -regextype posix-extended -regex ".*${pkgName}$" -prune -exec rm -rvf {} + || die
+		# package names can be foo-bar, their module will be however foo_bar
+		find  ./pipenv/vendor -regextype posix-extended -regex ".*${pkgName/_/-}" -prune -exec rm -rvf {} + || die
+	done
+
+	find  ./pipenv/vendor -regextype posix-extended -regex '.*cached[_-]property.*' -prune -exec rm -rvf {} + || die
+
+	# not actually used by pipenv, but included in pipenv
+	rm -vR "${S}/${PN}/vendor/wheel/" || die
+}
+
+python_test() {
+	epytest -m "not cli and not needs_internet" tests/unit/
+}
diff --git a/dev-python/pypandoc/Manifest b/dev-python/pypandoc/Manifest
index 59a93f827f55..ea8f70982da1 100644
--- a/dev-python/pypandoc/Manifest
+++ b/dev-python/pypandoc/Manifest
@@ -1,2 +1,2 @@
-DIST pypandoc-1.7.4.tar.gz 30526 BLAKE2B 44ea2083e014874e4fc5ce9ce8d2dcff64319e7d0d77baffc61fa0d0c2a7fd209642f706eaf4ad258b65a4f0ad8851a9ea02d38d0db4e71c136b972a5934cb79 SHA512 01a7165974ca844b55c387e8ed9b5278c43b5879ca6ea51e0aafab9f035667d37fc06a52a5c0820e18b321ddd5185e53a49561c84e157cb0ead76c7f84d0bcc1
-DIST pypandoc-1.7.5.tar.gz 23186705 BLAKE2B 2718e2c4485a10e2a1f78e59b893b8041fcbfd6fd3393c8fcf429625fb0fbe0a0f83229323579e58fb40b6fb85fe018ecc7b597de7774e20e2736f301761fc9f SHA512 bbd5e96a98b1030aa7dfbeaea12dc5c053e9b3182c0feca6d6cec6eba9c148662a628cbe12b1ddf8a4f2891df98fe8f60fc1bde0d5d2f60664dd3e412974655f
+DIST pypandoc-1.8.1.tar.gz 30374 BLAKE2B 864ab8d4db8857adcbd13fd72b1ef6d4d1857a5ff6e7511b5d8269c183d80e6c8f391f2982097e592e3a1417c2ee6a5b068956b76218ae13842f1a881ecb4047 SHA512 527de67fb4a329642a69422e6237a6f3b1df0d089fbeeb118c9fd2d54878d7d0565c161b0e8fd6aa864bd63498ed65b07d69f14c3976ffc079f31c12ebbe7c04
+DIST pypandoc-1.8.tar.gz 31218 BLAKE2B 8eabcfa76b3022f0f8ed03dc2bb351d159018f63aa4a656d2b44d20ee59c0c6863fdc5ac168a86a70bf099c5c82c97451de97057a3e40c74c9b8af3eedb3c71c SHA512 a8b0e3656788cdf43af214c75ecc4f4bd27620ead00a7ce4c32ca44b4f30d7e2196164162eb12470db25c17e9b2f26868149a7b29549b0b9ebbedfc8e470bdb1
diff --git a/dev-python/pypandoc/pypandoc-1.7.4.ebuild b/dev-python/pypandoc/pypandoc-1.8.1.ebuild
index a5876484e549..f7fcae0f5481 100644
--- a/dev-python/pypandoc/pypandoc-1.7.4.ebuild
+++ b/dev-python/pypandoc/pypandoc-1.8.1.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
 
 DESCRIPTION="Pypandoc provides a thin wrapper for pandoc, a universal document converter"
 HOMEPAGE="
-	https://github.com/bebraw/pypandoc
+	https://github.com/NicklasTegner/pypandoc
 	https://pypi.org/project/pypandoc/
 "
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
@@ -32,7 +32,6 @@ DEPEND="
 	dev-python/urllib3[${PYTHON_USEDEP}]
 "
 
-PATCHES=( "${FILESDIR}/${P}-dont-install-examples.patch" )
 PROPERTIES="test_network"
 RESTRICT="test"
 
diff --git a/dev-python/pypandoc/pypandoc-1.7.5.ebuild b/dev-python/pypandoc/pypandoc-1.8.ebuild
index 2ee3a4bb8f13..f7fcae0f5481 100644
--- a/dev-python/pypandoc/pypandoc-1.7.5.ebuild
+++ b/dev-python/pypandoc/pypandoc-1.8.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
 
 DESCRIPTION="Pypandoc provides a thin wrapper for pandoc, a universal document converter"
 HOMEPAGE="
-	https://github.com/bebraw/pypandoc
+	https://github.com/NicklasTegner/pypandoc
 	https://pypi.org/project/pypandoc/
 "
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
@@ -32,7 +32,6 @@ DEPEND="
 	dev-python/urllib3[${PYTHON_USEDEP}]
 "
 
-PATCHES=( "${FILESDIR}/${PN}-1.7.4-dont-install-examples.patch" )
 PROPERTIES="test_network"
 RESTRICT="test"
 
diff --git a/dev-python/pypiserver/pypiserver-1.5.0-r1.ebuild b/dev-python/pypiserver/pypiserver-1.5.0-r2.ebuild
index 4ea258dfe702..37cd3ca1563c 100644
--- a/dev-python/pypiserver/pypiserver-1.5.0-r1.ebuild
+++ b/dev-python/pypiserver/pypiserver-1.5.0-r2.ebuild
@@ -23,6 +23,7 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 
 RDEPEND="
+	dev-python/bottle[${PYTHON_USEDEP}]
 	dev-python/pip[${PYTHON_USEDEP}]
 	>=dev-python/wheel-0.25.0[${PYTHON_USEDEP}]
 "
@@ -30,7 +31,6 @@ RDEPEND="
 BDEPEND="
 	dev-python/setuptools-git[${PYTHON_USEDEP}]
 	test? (
-		dev-python/bottle[${PYTHON_USEDEP}]
 		>=dev-python/passlib-1.6[${PYTHON_USEDEP}]
 		dev-python/setuptools[${PYTHON_USEDEP}]
 		dev-python/twine[${PYTHON_USEDEP}]
diff --git a/dev-python/pysimdjson/Manifest b/dev-python/pysimdjson/Manifest
index 1009245d53eb..b08669c08034 100644
--- a/dev-python/pysimdjson/Manifest
+++ b/dev-python/pysimdjson/Manifest
@@ -1,2 +1 @@
-DIST pysimdjson-4.0.2.tar.gz 3740054 BLAKE2B 379c8637096074615f2045171e0950af0190e8485db6a1734f4fcd19d9eeeebd91cb79c18abd2fe6256287f15aa6a3c12c1283e4affa131db14f9948ab2f0d63 SHA512 537b7958dd3429831ee201b6a4fc5fa8fca50ad14def016b472d3f234f81175441152c1823eed0bcad06f59e274e2b6b036f26a3af8f6977ceea5807471de4a5
 DIST pysimdjson-4.0.3.gh.tar.gz 3783913 BLAKE2B 74c186e87540c4806ec311e7a6ca05bf28b2a2060ba078919c68d92812a1bc34efd9f0deb30b85dba134af9ce99dbfa2b8fa33c1b14926915e284f262a7ac4f1 SHA512 eb2cd8b96eed8985674fbcfeafc21b58c9985c46c7f46b72ee78fbf91ef659acd5139fa56c251bae22418007b3da6ff7e5cdd2d28b2ba22cf19771f2f74880e3
diff --git a/dev-python/pysimdjson/files/pysimdjson-4.0.0-unbundle.patch b/dev-python/pysimdjson/files/pysimdjson-4.0.0-unbundle.patch
deleted file mode 100644
index de52bc063a24..000000000000
--- a/dev-python/pysimdjson/files/pysimdjson-4.0.0-unbundle.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-diff --git a/setup.py b/setup.py
-index f1de675..4c23028 100644
---- a/setup.py
-+++ b/setup.py
-@@ -27,53 +27,59 @@ if system == 'Darwin':
-     os.environ.setdefault('MACOSX_DEPLOYMENT_TARGET', '10.14')
-     extra_compile_args.append('-std=c++11')
- 
--if os.getenv('BUILD_WITH_CYTHON') and not CYTHON_AVAILABLE:
-+build_with_cython = os.getenv('BUILD_WITH_CYTHON')
-+if build_with_cython and not CYTHON_AVAILABLE:
-     print(
-         'BUILD_WITH_CYTHON environment variable is set, but cython'
-         ' is not available. Falling back to pre-cythonized version if'
-         ' available.'
-     )
-+    build_with_cython = False
- 
--if os.getenv('BUILD_WITH_CYTHON') and CYTHON_AVAILABLE:
--    macros = []
--    compiler_directives = {
--        'embedsignature': True
--    }
-+build_with_system_lib = os.getenv('BUILD_WITH_SYSTEM_LIB')
-+
-+macros = []
-+compiler_directives = {}
-+libraries = []
-+sources = [
-+    'simdjson/errors.cpp',
-+]
-+
-+if build_with_system_lib:
-+    libraries.append('simdjson')
-+else:
-+    sources.append('simdjson/simdjson.cpp')
-+
-+if build_with_cython:
-+    compiler_directives['embedsignature'] = True
- 
-     if os.getenv('BUILD_FOR_DEBUG'):
-         # Enable line tracing, which also enables support for coverage
-         # reporting.
--        macros = [
-+        macros += [
-             ('CYTHON_TRACE', 1),
-             ('CYTHON_TRACE_NOGIL', 1)
-         ]
-         compiler_directives['linetrace'] = True
- 
--    extensions = cythonize([
--        Extension(
--            'csimdjson',
--            [
--                'simdjson/simdjson.cpp',
--                'simdjson/errors.cpp',
--                'simdjson/csimdjson.pyx'
--            ],
--            define_macros=macros,
--            extra_compile_args=extra_compile_args
--        )
--    ], compiler_directives=compiler_directives)
-+    sources.append('simdjson/csimdjson.pyx')
- else:
--    extensions = [
--        Extension(
--            'csimdjson',
--            [
--                'simdjson/simdjson.cpp',
--                'simdjson/errors.cpp',
--                'simdjson/csimdjson.cpp'
--            ],
--            extra_compile_args=extra_compile_args,
--            language='c++'
--        )
--    ]
-+    sources.append('simdjson/csimdjson.cpp')
-+
-+
-+extensions = [
-+    Extension(
-+        'csimdjson',
-+        sources,
-+        define_macros=macros,
-+        extra_compile_args=extra_compile_args,
-+        libraries=libraries,
-+        language='c++',
-+    )
-+]
-+
-+if build_with_cython:
-+    extensions = cythonize(extensions, compiler_directives=compiler_directives)
- 
- setup(
-     name='pysimdjson',
diff --git a/dev-python/pysimdjson/pysimdjson-4.0.2.ebuild b/dev-python/pysimdjson/pysimdjson-4.0.2.ebuild
deleted file mode 100644
index 58c5f1f1b8e4..000000000000
--- a/dev-python/pysimdjson/pysimdjson-4.0.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for simdjson"
-HOMEPAGE="https://github.com/TkTech/pysimdjson"
-SRC_URI="https://github.com/TkTech/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-
-RDEPEND="
-	dev-libs/simdjson:=
-"
-DEPEND=${RDEPEND}
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-"
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}"/pysimdjson-4.0.0-unbundle.patch
-)
-
-src_prepare() {
-	# benchmarks aren't run
-	sed -i -e 's:pytest-benchmark::' setup.cfg || die
-	# force regen
-	rm simdjson/csimdjson.cpp || die
-	# bundled lib :-(
-	rm simdjson/simdjson.{cpp,h} || die
-
-	distutils-r1_src_prepare
-
-	export BUILD_WITH_CYTHON=1
-	export BUILD_WITH_SYSTEM_LIB=1
-}
diff --git a/dev-python/pysimdjson/pysimdjson-4.0.3.ebuild b/dev-python/pysimdjson/pysimdjson-4.0.3-r1.ebuild
index 260b31abe1a2..0263c470f416 100644
--- a/dev-python/pysimdjson/pysimdjson-4.0.3.ebuild
+++ b/dev-python/pysimdjson/pysimdjson-4.0.3-r1.ebuild
@@ -23,7 +23,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 DEPEND="
-	dev-libs/simdjson:=
+	<dev-libs/simdjson-1.1:=
 "
 RDEPEND="
 	${DEPEND}
@@ -36,7 +36,7 @@ distutils_enable_tests pytest
 
 src_prepare() {
 	# benchmarks aren't run
-	sed -i -e 's:pytest-benchmark::' setup.cfg || die
+	sed -i -e 's:pytest-benchmark:: ; /license_file/ d' setup.cfg || die
 	# force regen
 	rm simdjson/csimdjson.cpp || die
 	# unbundle
diff --git a/dev-python/pytest-randomly/Manifest b/dev-python/pytest-randomly/Manifest
index e6374a38f1e4..e129eead2241 100644
--- a/dev-python/pytest-randomly/Manifest
+++ b/dev-python/pytest-randomly/Manifest
@@ -1,2 +1,2 @@
-DIST pytest-randomly-3.10.1.tar.gz 28000 BLAKE2B 662f28e34db5dace9d421d91bb8baf3775c7e5163fa93eeb12cbe3de251ea5425d995301e193253f55a602d98deeaf0dc2e676be9bdb7a97db93ba54fa9cfa5f SHA512 d93e017df706d7021ff3f4682b4ed65d474177a60e303455685266d47a0a214e4f30b2f7dd150768de711d602ca1d22e2cfeca2703a7139cfaab97e3424afa1c
 DIST pytest-randomly-3.11.0.tar.gz 30822 BLAKE2B 81411f8882f786c18ded69d42296117421498515ed0808064b4da418f94be5aa6e0dedf1dabf0e87f8f508b9cc886f8b645e4b5f845009cade4f20b8f437dd95 SHA512 6c2da071492d032b60782c17aee01751fe0728f921dfd192a17d9be95330ddf6dd0c960ef93a200dbe990c8457340008c556f28aea9cbc74677984fee0618ad7
+DIST pytest-randomly-3.12.0.tar.gz 30426 BLAKE2B 22e7ac58787a98b24a672f2fc2fdba8069213008f11c66eb05320be99662311b0273b0c32079d59792964075abe6fd2f224ce03eb0d3b2dcf0a79e180f1a067e SHA512 e2241c1304b9597f93cc57d6830808f85c59ea1b4815624dcd9d088f87eb4a34d6cb6394de9c31ebedcb8280fb6ff12b110fd5a559ab28c9e0381481fce52c4d
diff --git a/dev-python/pytest-randomly/pytest-randomly-3.10.1.ebuild b/dev-python/pytest-randomly/pytest-randomly-3.12.0.ebuild
index f2fc4f1d475a..f039621209ee 100644
--- a/dev-python/pytest-randomly/pytest-randomly-3.10.1.ebuild
+++ b/dev-python/pytest-randomly/pytest-randomly-3.12.0.ebuild
@@ -1,15 +1,16 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
+DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{7,8,9,10} )
 
 inherit distutils-r1
 
 DESCRIPTION="Pytest plugin to randomly order tests and control random.seed"
 HOMEPAGE="
-	https://pypi.python.org/pypi/pytest-randomly
+	https://pypi.python.org/pypi/pytest-randomly/
 	https://github.com/pytest-dev/pytest-randomly
 "
 SRC_URI="https://github.com/pytest-dev/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
@@ -21,10 +22,10 @@ KEYWORDS="~amd64"
 RDEPEND="
 	dev-python/factory_boy[${PYTHON_USEDEP}]
 	dev-python/Faker[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
 	dev-python/pytest[${PYTHON_USEDEP}]
 	dev-python/pytest-xdist[${PYTHON_USEDEP}]
 
+	$(python_gen_cond_dep 'dev-python/numpy[${PYTHON_USEDEP}]' python3_{8..10})
 	$(python_gen_cond_dep '>=dev-python/importlib_metadata-3.6.0[${PYTHON_USEDEP}]' python3_{8,9})
 "
 DEPEND="${RDEPEND}"
@@ -33,7 +34,5 @@ distutils_enable_tests pytest
 
 python_test() {
 	distutils_install_for_testing --via-root
-	pytest -vv \
-		--deselect tests/test_pytest_randomly.py::test_entrypoint_injection \
-		|| die "Testsuite failed under ${EPYTHON}"
+	pytest -vv || die "Testsuite failed under ${EPYTHON}"
 }
diff --git a/dev-python/python-manilaclient/Manifest b/dev-python/python-manilaclient/Manifest
index b540031b5459..a69d39bef28d 100644
--- a/dev-python/python-manilaclient/Manifest
+++ b/dev-python/python-manilaclient/Manifest
@@ -1 +1,2 @@
 DIST python-manilaclient-3.3.0.tar.gz 320475 BLAKE2B e83e30593d26e9ba26f9f487507f6c9a9b38be69b59af69dcdb85242abb81879e689efb70c937bb8afef74841adf54e5e7724f2173a6bc9c7d76c90535bf1b4c SHA512 084293115370a174678dd8bde3f144213f10ce4a3addf7058365b0bbde31b2a56643b0417ec97ced297bf99e141a1fd96503aea96795c36862548268d6f7ae31
+DIST python-manilaclient-3.4.0.tar.gz 320304 BLAKE2B 4bb9fc47816c1cf8dcc163bd3119932b14f6af6796486053175e91efd94434d485281e6ec74f79c9d054309a486c4590d379817015f78e0c29f5036f7583b8d9 SHA512 0b4852a2df90b1a1f0deaacc235aec47e9f4e95f0d3b75a0fbad7ef90569f438723e4b9df02e6a9dc9752ff77a0b2425f09add8f95d41c1db12c50fbfa3022b0
diff --git a/dev-python/python-manilaclient/python-manilaclient-3.4.0.ebuild b/dev-python/python-manilaclient/python-manilaclient-3.4.0.ebuild
new file mode 100644
index 000000000000..1b6a8a9439dd
--- /dev/null
+++ b/dev-python/python-manilaclient/python-manilaclient-3.4.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+EPYTEST_IGNORE=( manilaclient/tests/functional )
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="A client for the OpenStack Manila API"
+HOMEPAGE="
+	https://opendev.org/openstack/python-manilaclient
+	https://github.com/openstack/python-manilaclient
+	https://pypi.org/project/python-manilaclient/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-2.18.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+	>=dev-python/simplejson-3.5.1[${PYTHON_USEDEP}]
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+	>=dev-python/osc-lib-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	test? (
+		>=dev-python/ddt-1.0.1[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/tempest-17.1.0[${PYTHON_USEDEP}]
+		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+		>=dev-python/python-openstackclient-3.12.0[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/python-troveclient/Manifest b/dev-python/python-troveclient/Manifest
index 731ca03ee309..8bddde2b5795 100644
--- a/dev-python/python-troveclient/Manifest
+++ b/dev-python/python-troveclient/Manifest
@@ -1 +1,2 @@
 DIST python-troveclient-7.2.0.tar.gz 191972 BLAKE2B f3473856cd07b91e948392c52d307900cd79882d04b0e72c5e9a91938354be434a31e1f233432e650e7a808431025381ae9166af5117f23d6883f6f473eb522b SHA512 701d0e0be44f57f7798b91b90419e0ce26dda3d0f37532284cb0544b9a2f352a7b0ab816bdee4e63e210cf119e4c7e41dca0163c8ff5171958a57916cfc5a912
+DIST python-troveclient-7.3.0.tar.gz 192206 BLAKE2B 182d93a0247303d4ee119fbf98795b398b9b847123c783485973fc4e254ec3e0aca74460ed65f9addbd6f346237fce7874c8db9ffedaeb2d5ba6dabe9a88011b SHA512 13132826ecae633e8ffaf8842a7ee479832052cb19854c00ae0b157830f78ff35cd16eaccd239f6f145fd8b811455bea925318ea104e997bde429bbbe9f9f7af
diff --git a/dev-python/python-troveclient/python-troveclient-7.3.0.ebuild b/dev-python/python-troveclient/python-troveclient-7.3.0.ebuild
new file mode 100644
index 000000000000..572305d91b1b
--- /dev/null
+++ b/dev-python/python-troveclient/python-troveclient-7.3.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="A client for the OpenStack Trove API, a scalable relational database service"
+HOMEPAGE="
+	https://github.com/openstack/python-troveclient
+	https://opendev.org/openstack/python-troveclient
+	https://launchpad.net/python-troveclient
+	https://pypi.org/project/python-troveclient/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/prettytable-0.7.2[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+	>=dev-python/simplejson-3.5.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-3.4.0[${PYTHON_USEDEP}]
+	>=dev-python/python-swiftclient-3.2.0[${PYTHON_USEDEP}]
+	>=dev-python/python-mistralclient-3.1.0[${PYTHON_USEDEP}]
+	>=dev-python/osc-lib-1.8.0[${PYTHON_USEDEP}]
+	>=dev-python/python-openstackclient-3.12.0[${PYTHON_USEDEP}]
+"
+DEPEND="
+	${RDEPEND}
+	test? (
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
+		>=dev-python/requests-mock-1.2.0[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+		>=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/python-zunclient/Manifest b/dev-python/python-zunclient/Manifest
index 683d0bf06963..facd0369c998 100644
--- a/dev-python/python-zunclient/Manifest
+++ b/dev-python/python-zunclient/Manifest
@@ -1 +1 @@
-DIST python-zunclient-4.4.0.tar.gz 119253 BLAKE2B bb532e6ef916491b1663436a71918c69601cf7fd18aa69cf645662249d6ca5d18c673ae2c5c2e27801a1a2c7e4d0df20eb7f0d14a61939eb597197d256844981 SHA512 869da6f89cb52d70f77292ce841cd48369ac042ef3564bb1b00e810992edc4cb35fda518039bfa4df3bc2b6f1b07825e26c49953b0e67329138d45af3150a0ec
+DIST python-zunclient-4.5.0.tar.gz 119714 BLAKE2B 5492a3bf5205a511d201785a51bd46349c8c30f51fc359147228320551ae454d6efe69fb0b74ad9d7942f4f58a8fe7406337e5e758ccd7bb3846a9ce46780d70 SHA512 f2362af3065fc33e50c639b2bfcc11f318a94342a2f543a49f15495aa8eea5ede79e5a7e3898fd2e741cba82ad961bf72fbdee36bbcd3648dd927f13fe6e30e5
diff --git a/dev-python/python-zunclient/python-zunclient-4.4.0.ebuild b/dev-python/python-zunclient/python-zunclient-4.5.0.ebuild
index 6a0ddb2cdd28..6a0ddb2cdd28 100644
--- a/dev-python/python-zunclient/python-zunclient-4.4.0.ebuild
+++ b/dev-python/python-zunclient/python-zunclient-4.5.0.ebuild
diff --git a/dev-python/statmake/Manifest b/dev-python/statmake/Manifest
index 2a6d3790d140..f039602efa34 100644
--- a/dev-python/statmake/Manifest
+++ b/dev-python/statmake/Manifest
@@ -1,2 +1,2 @@
-DIST statmake-0.4.0.tar.gz 36803 BLAKE2B cae3f7070c00c6c9cb823b60e683aef4bd9e55ba8e2a98a19f87a1093682e52a0667b21245a888f4569b425c8ba6486870df1d83d66255583b2dd4b516add176 SHA512 7102dfd085674b008b4bbdb54ec8b405ab7e70d96fd54963f6dc40eb53bc4816b4977decd2439756727a887da86fc8917a0f2763cc197c2e437dc53dcde95c84
 DIST statmake-0.4.1.tar.gz 38631 BLAKE2B a13bdfe6ab255bb255315786dd23c3108a8549fe2ecc510699d9562647a9a5c0669c5d43c17252bf08e6052facbda81043226da876a71071107a4cbc9b8d872e SHA512 d0423427aa29982863eba80ac1f52e0e56589504a9b47d76c2145edd47f9cc49eb7a1efbb9dd08445efd39f61be71cea99076c328f77770b115190d31a4b5438
+DIST statmake-0.5.0.tar.gz 39835 BLAKE2B cad6a4c8a803666ce45d165c46ce6278cdcb56de7a90166315ba229f07ac1202d4bd2e4db678e644e0eaea445b97b81c2eb2c24cdb9ad7d7d4fbee3465fb4bf8 SHA512 c28c85e5fce6904b109858b156ab607204b3ff906bb3ec09ca75a170f5640eba83fbdd310f6a5b70f123cfbff1b1af72af1bea541cfdec8175e52be273f8ac00
diff --git a/dev-python/statmake/statmake-0.4.0.ebuild b/dev-python/statmake/statmake-0.5.0.ebuild
index c6cca3a01e51..b274ee0bbb6c 100644
--- a/dev-python/statmake/statmake-0.4.0.ebuild
+++ b/dev-python/statmake/statmake-0.5.0.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+DISTUTILS_USE_PEP517=poetry
 PYTHON_COMPAT=( python3_{7,8,9,10} )
 
 inherit distutils-r1
 
 DESCRIPTION="Generate STAT tables for variable fonts from .stylespace files"
 HOMEPAGE="https://github.com/daltonmaag/statmake"
-SRC_URI="https://github.com/daltonmaag/statmake/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/daltonmaag/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
 
 KEYWORDS="~amd64"
 LICENSE="MIT"
@@ -23,11 +23,8 @@ RDEPEND="
 		dev-python/fonttools[${PYTHON_USEDEP}]
 	')
 "
-DEPEND="${RDEPEND}"
 BDEPEND="
-	test? (
-		$(python_gen_cond_dep 'dev-python/ufo2ft[${PYTHON_USEDEP}]')
-	)
+	test? ( $(python_gen_cond_dep 'dev-python/ufo2ft[${PYTHON_USEDEP}]') )
 "
 
 distutils_enable_tests pytest
@@ -39,5 +36,5 @@ python_install() {
 
 python_test() {
 	local -x PYTHONPATH="${S}/src:${PYTHONPATH}"
-	epytest -vv || die "Tests fail with ${EPYTHON}"
+	epytest
 }
diff --git a/dev-python/tchannel/Manifest b/dev-python/tchannel/Manifest
deleted file mode 100644
index cff63b8da06c..000000000000
--- a/dev-python/tchannel/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST tchannel-2.1.0-gh.tar.gz 199413 BLAKE2B 20c25526440e9378acfba1dd9c05aaa5a5300bb19ec2c78c1997bfc7ce6be740bca7ef6d4fd49048c42e57f649f33b8c124955dc347bba81501fdf778ce4177e SHA512 651159cdbb83f59039d1c51ad5d5af7c0bf20e8a8fbb6c83c76bdc78cda809bea883d65947c5171c6dd2992ea499d543c4a2dad1102c6a7a4d631e24f005453c
diff --git a/dev-python/tchannel/metadata.xml b/dev-python/tchannel/metadata.xml
deleted file mode 100644
index b15826f3963e..000000000000
--- a/dev-python/tchannel/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
-  <email>lssndrbarbieri@gmail.com</email>
-  <name>Alessandro Barbieri</name>
- </maintainer>
- <upstream>
-  <bugs-to>https://github.com/uber/tchannel/issues</bugs-to>
- </upstream>
- <origin>gentoo-guru-overlay</origin>
-</pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/tchannel/tchannel-2.1.0.ebuild b/dev-python/tchannel/tchannel-2.1.0.ebuild
deleted file mode 100644
index b03fd9cd4245..000000000000
--- a/dev-python/tchannel/tchannel-2.1.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MYPN="${PN}-python"
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Network multiplexing and framing protocol for RPC"
-HOMEPAGE="https://github.com/uber/tchannel-python"
-SRC_URI="https://github.com/uber/${MYPN}/archive/refs/tags/${PV}.tar.gz -> ${P}-gh.tar.gz"
-S="${WORKDIR}/${MYPN}-${PV}"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	>=dev-python/crcmod-1[${PYTHON_USEDEP}]
-	>=dev-python/opentracing-2[${PYTHON_USEDEP}]
-	>=dev-python/opentracing_instrumentation-3[${PYTHON_USEDEP}]
-	>=dev-python/thriftrw-0.4[${PYTHON_USEDEP}]
-	>=dev-python/threadloop-1[${PYTHON_USEDEP}]
-	>=www-servers/tornado-4.3[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	test? (
-		>=dev-python/hypothesis-1.14[${PYTHON_USEDEP}]
-		dev-python/ipdb[${PYTHON_USEDEP}]
-		>=dev-python/jaeger-client-4[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pygal[${PYTHON_USEDEP}]
-		>=dev-python/pytest-benchmark-3[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		dev-python/pytest-tornado[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		>=dev-python/wrapt-1.10[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/tinyrpc/Manifest b/dev-python/tinyrpc/Manifest
index 1ae04e1e3286..200b7ae7f108 100644
--- a/dev-python/tinyrpc/Manifest
+++ b/dev-python/tinyrpc/Manifest
@@ -1,2 +1,2 @@
-DIST tinyrpc-1.1.2.tar.gz 77020 BLAKE2B 1b5fc9126288e8046adb0bb1fb97b94cbff655d4d4573e3b7b369e3739746ccd96a6db9ad2a6bdf7a935a96d6c808ca0891619693669b1d8cee30a7c231c6f9a SHA512 d2322f852bf320e4e27917bdb3aa0acd05f00c3ab242e367602df7e2db700e3b3556600a45d57b3a92abf00b54c184891f3b40c18fbb42ed97a0f1387aa97abd
 DIST tinyrpc-1.1.4.tar.gz 77281 BLAKE2B 880c9e53ba39e1a6e5992d91b3f2d2991117c6122e504f1b4cc2ff685f467ed1592bbd28cbca584ad104b1f5f340272cdffb86ea5ef28940b12dbc60e9a50d7e SHA512 423a76ae12dc7a46579574c12ea12168cf04f71b3988067e2889cacbf67f5575e946f4f6b854a63bac2fb56915f5659669ad7974730cdec5482434403143912e
+DIST tinyrpc-1.1.5.tar.gz 29134 BLAKE2B 6d0dd14bfcd9804bcc9b2517eaa41808b1018274471d0a82af384c000a9eba0b90f4fa815dc10b704db0331f77f67f765dbfcd486ba15ea3309979fb25acf055 SHA512 885aa07c67aca8071c48f2f3922fbfd59ca085651883dc791ca219afaea28eea76bdb514ba3ef113bbd5fb08c86c7b471518a3c8db0d6ffb05538586b0d97350
diff --git a/dev-python/tinyrpc/tinyrpc-1.1.2.ebuild b/dev-python/tinyrpc/tinyrpc-1.1.2.ebuild
deleted file mode 100644
index 5520257750f4..000000000000
--- a/dev-python/tinyrpc/tinyrpc-1.1.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-inherit distutils-r1 optfeature
-
-DESCRIPTION="A protocol neutral RPC library that supports JSON-RPC and zmq."
-HOMEPAGE="https://github.com/mbr/tinyrpc"
-SRC_URI="https://github.com/mbr/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-BDEPEND="test? (
-	dev-python/gevent-websocket[${PYTHON_USEDEP}]
-	dev-python/gevent[${PYTHON_USEDEP}]
-	dev-python/jsonext[${PYTHON_USEDEP}]
-	dev-python/msgpack[${PYTHON_USEDEP}]
-	dev-python/pika[${PYTHON_USEDEP}]
-	dev-python/pyzmq[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/websocket-client[${PYTHON_USEDEP}]
-	dev-python/werkzeug[${PYTHON_USEDEP}]
-)"
-
-distutils_enable_tests pytest
-
-distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
-
-pkg_postinst() {
-	optfeature "gevent support" dev-python/gevent
-	optfeature "httpclient support" \
-		"dev-python/requests dev-python/websocket-client dev-python/gevent-websocket"
-	optfeature "websocket support" dev-python/gevent-websocket
-	optfeature "wsgi support" dev-python/werkzeug
-	optfeature "zmq support" dev-python/pyzmq
-	optfeature "jsonext support" dev-python/jsonext
-}
diff --git a/dev-python/tinyrpc/tinyrpc-1.1.5.ebuild b/dev-python/tinyrpc/tinyrpc-1.1.5.ebuild
new file mode 100644
index 000000000000..407f1783396a
--- /dev/null
+++ b/dev-python/tinyrpc/tinyrpc-1.1.5.ebuild
@@ -0,0 +1,44 @@
+# Copyright 2019-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+
+inherit distutils-r1 optfeature
+
+DESCRIPTION="A protocol neutral RPC library that supports JSON-RPC and zmq"
+HOMEPAGE="https://github.com/mbr/tinyrpc"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND=">=dev-python/six-1.16.0[${PYTHON_USEDEP}]"
+DEPEND="
+	${RDEPEND}
+	test? (
+		>=dev-python/gevent-websocket-0.10.1[${PYTHON_USEDEP}]
+		>=dev-python/gevent-21.1.2[${PYTHON_USEDEP}]
+		dev-python/jsonext[${PYTHON_USEDEP}]
+		>=dev-python/msgpack-1.0.2[${PYTHON_USEDEP}]
+		>=dev-python/pika-1.2.0[${PYTHON_USEDEP}]
+		>=dev-python/pyzmq-22.0.3[${PYTHON_USEDEP}]
+		>=dev-python/requests-2.25.1[${PYTHON_USEDEP}]
+		dev-python/websocket-client[${PYTHON_USEDEP}]
+		>=dev-python/werkzeug-2.0.0[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
+
+pkg_postinst() {
+	optfeature "gevent support" dev-python/gevent
+	optfeature "httpclient support" "dev-python/requests dev-python/websocket-client dev-python/gevent-websocket"
+	optfeature "websocket support" dev-python/gevent-websocket
+	optfeature "wsgi support" dev-python/werkzeug
+	optfeature "zmq support" dev-python/pyzmq
+	optfeature "jsonext support" dev-python/jsonext
+}
diff --git a/dev-python/types-python-dateutil/Manifest b/dev-python/types-python-dateutil/Manifest
index 7495b0c3af53..a77e1cf0bc6b 100644
--- a/dev-python/types-python-dateutil/Manifest
+++ b/dev-python/types-python-dateutil/Manifest
@@ -1,2 +1,2 @@
-DIST types-python-dateutil-2.8.14.tar.gz 6833 BLAKE2B 5a0ac6d195219956e9416af735b14715ce9beefad02ae2f5898693b2d55f406c5a4039175616dd6f7637d8a22cefae6cb2d82737cb2da86b1e76e1c411df9f41 SHA512 07a392b00157d07f05c6332915c33a3595dcb623b92bf70ed4ad91cccc36334df2cb9f04701288ba42301149d4e78cfdd6ce527772f8261feb11b1ec588eb86d
 DIST types-python-dateutil-2.8.15.tar.gz 6923 BLAKE2B 53bfdff4ebb585d4b0d9c9a22c8e70aae87ce2b154748f54823713e68f8faa21ae3eb7165359e6763b2b0027e5128fedba4d66e6bd70232bd6650cf9bfe425dd SHA512 e2efd88dfc27b5a7ace8147b9a4d924dd32471fe59d65c7ff8bc9576d1d8b5b6bdc83e808cabb35c9a866614debd8fafdd779166efa2b51069056ae9330f9fcc
+DIST types-python-dateutil-2.8.16.tar.gz 6973 BLAKE2B 2e883f73af0e79faf57f8469733ec742b9881e974a253ddd40e80628302ea29a9046a319088d75b9bc47792b0e225fe2c2f376ea4a5d794d710cf7aea7af7af3 SHA512 1d2927c6bd85fa8222c7519d3ac8ae6179da746ebb29ca4e9002ca410131e10445b8ebc2b70bb6df1b3e8ed90098827884bf5f928039d1627ca760c86cdcc113
diff --git a/dev-python/types-python-dateutil/types-python-dateutil-2.8.14.ebuild b/dev-python/types-python-dateutil/types-python-dateutil-2.8.16.ebuild
index fcc908ef2fa8..fcc908ef2fa8 100644
--- a/dev-python/types-python-dateutil/types-python-dateutil-2.8.14.ebuild
+++ b/dev-python/types-python-dateutil/types-python-dateutil-2.8.16.ebuild
diff --git a/dev-python/types-requests/Manifest b/dev-python/types-requests/Manifest
index d395e3ec3c16..1713a86e7c36 100644
--- a/dev-python/types-requests/Manifest
+++ b/dev-python/types-requests/Manifest
@@ -1,2 +1,2 @@
-DIST types-requests-2.27.20.tar.gz 10692 BLAKE2B 3913536fbcde331f0177b362e9210b8f783f2c7a8ce2e0a2247d82fcc8ebc05c75f755d68f88a33cdcf18c4eead8e97b249d4329b3d931e44f947df9ef15d449 SHA512 810ccfe64812e124a624a41dae4499abfcbdae8e7cd914f02ccffc4a9193cdc79a45e19fdb500a49c1a2208c5b41bdb231479c08419373229c27bfc4bbed59ef
 DIST types-requests-2.27.25.tar.gz 11029 BLAKE2B 23d1c003dd556deaa8b5b747bf5fde3d494a7a7d355aca90856ade0985542ba4da2f5f952c08812e4a7136219deec8a3baeffb6cf43f6cbb609f826efd198668 SHA512 e4fcfc94254b5ef0bba89b6dee469cf2d32bcef3671f8bc3666dd1348615e100a1f0f4769f9f7625b18ba97d1d07757dc7dc223ba412bfdaad10d010cf48111e
+DIST types-requests-2.27.27.tar.gz 11345 BLAKE2B 41239c8c64af3cae256f28b518f5ef89b1b3743730d382a3de5f0aa0b332358b3cee6e2acc3db0ecd2f52412ea4fbc0f648cbd1d856bf2d524a747c9d57fc8b8 SHA512 68bd04b7c7c0a712dbadb3f92f28547a95ddf3b03c372f4dff0f7ce45bfabe0f3f896cad65694adec13f6bbb20a5104eef98939ba0a5f8141812a5c16eda3347
diff --git a/dev-python/types-requests/types-requests-2.27.20.ebuild b/dev-python/types-requests/types-requests-2.27.27.ebuild
index 116e2d39e19e..116e2d39e19e 100644
--- a/dev-python/types-requests/types-requests-2.27.20.ebuild
+++ b/dev-python/types-requests/types-requests-2.27.27.ebuild
diff --git a/dev-python/uharfbuzz/Manifest b/dev-python/uharfbuzz/Manifest
index acb005710221..2b97b51472cb 100644
--- a/dev-python/uharfbuzz/Manifest
+++ b/dev-python/uharfbuzz/Manifest
@@ -1,2 +1,2 @@
-DIST uharfbuzz-0.24.1.tar.gz 36603 BLAKE2B 3da4b1a7e3b2b3cc8928c06ad7a80c00ddc3f34807788d827c8e558d9a9b48e3688cb38e26e5ea2414b274d62328be4c5a4dbd6e627d45c49ff7d11c6573e643 SHA512 c1451f3aea7a6e076a621a8931e8de0222122f3788ac7ef7a0174f32a1a625c8f245d4ba0e9835387071ab8cfa7351d3e245afe6b94319c178cc6cc7fc337707
 DIST uharfbuzz-0.25.0.tar.gz 36602 BLAKE2B b359f5921f6fef9440d3640af235924d81f661d7582673cc54457f3da16fe2f7973aabe60375a341ee608a01f831971a87ffa5116680c90aaeaa24c75a008a7f SHA512 d57daff4eee023392fd444d1c2be199863422dd6b1097e974a816ddda47bf9fbf1d15509d314230b8abd61dde0b6b9078430a5572fac5e73aa3103675c100cc2
+DIST uharfbuzz-0.26.0.tar.gz 36596 BLAKE2B b57782f5de371e2062d6a764fde9d20ca4a47a388b22ac3d169cead66103d30af12888e9d8f0af0aea7c7dbb4a3b7e0f4411e049417efaf1d2e7562ef5a34875 SHA512 0b356ceaf1cc40c2318e495939d51db454852043ebac60cb7b2a7481c4de6540e66d7ccf47a9fe6c1d819bf8a54e572bdb5a0799c7818f61730b820bb210ac83
diff --git a/dev-python/uharfbuzz/uharfbuzz-0.24.1.ebuild b/dev-python/uharfbuzz/uharfbuzz-0.26.0.ebuild
index e208f17f9ba0..2cc233e84242 100644
--- a/dev-python/uharfbuzz/uharfbuzz-0.24.1.ebuild
+++ b/dev-python/uharfbuzz/uharfbuzz-0.26.0.ebuild
@@ -16,7 +16,7 @@ KEYWORDS="~amd64"
 LICENSE="Apache-2.0"
 SLOT="0"
 
-RDEPEND=">=media-libs/harfbuzz-4.0.0[experimental(-)]"
+RDEPEND=">=media-libs/harfbuzz-4.3.0[experimental(-)]"
 DEPEND="
 	${RDEPEND}
 	>=dev-python/cython-0.28.1[${PYTHON_USEDEP}]
diff --git a/dev-python/vharfbuzz/Manifest b/dev-python/vharfbuzz/Manifest
index 88b4333df1a1..7ee709c8b290 100644
--- a/dev-python/vharfbuzz/Manifest
+++ b/dev-python/vharfbuzz/Manifest
@@ -1,2 +1,2 @@
-DIST vharfbuzz-0.1.1.tar.gz 9036 BLAKE2B c22b1ef28612221b61a7f1565cb5ec37d0a8de852ad9899c1738eed58fc948c775248da460306a213cd39cfed3e180ba8440bfcda15428e2c071888be90657f7 SHA512 20579c380d15168c6635c7aa1a5d28a6c323e6bc25954a9ad2a03d172b414f2a4349f6d51ed2e8c737f8ae5331bc32c1cf1e02cc80544bbc5a265be4731feb01
 DIST vharfbuzz-0.1.2.tar.gz 9029 BLAKE2B 952956424ccb120b68f356086597bdb78c418ec3702517fe93483d25bc21b9de38d7f409d1f505467ff794880d90716f40bba252a0425a5bf6790d1516e7b2fc SHA512 12c3e18d27da6fbbf7cbc35c4f0c00e8669e521a1c46ae79e831f6b18710787d0ee8e551a52178e673d519231b3fd401e75453c420c6da6696f6443f6545ce8d
+DIST vharfbuzz-0.1.3.tar.gz 9359 BLAKE2B c4d7e2a1a939c59f63008f99cc6cf4ce622adebe493248c3536632051e32fe0e1ca9d48b91273ef3c157afefbfcc0062232d964cba954f1b867d91bbdc16ad41 SHA512 0b2e90da6ba613cbc24bf67d2815d6d2e857463e077410a6c86e4a4d77a734bc6b3ddaf3fbd564d06fcd2295eda13e095da55241cc31c38959703114b0cf56bf
diff --git a/dev-python/vharfbuzz/files/vharfbuzz-0.1.1-fix-package-dir.patch b/dev-python/vharfbuzz/files/vharfbuzz-0.1.1-fix-package-dir.patch
deleted file mode 100644
index 7a4693959ff7..000000000000
--- a/dev-python/vharfbuzz/files/vharfbuzz-0.1.1-fix-package-dir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/setup.py
-+++ b/setup.py
-@@ -29,7 +29,7 @@
-         "Development Status :: 4 - Beta"
- 
-     ],
--    'package_dir': {'':'Lib'},
-+    'package_dir': {'':'lib'},
-     'packages': ["vharfbuzz"]
- ,
- }
diff --git a/dev-python/vharfbuzz/vharfbuzz-0.1.1.ebuild b/dev-python/vharfbuzz/vharfbuzz-0.1.3.ebuild
index 65910bf6408a..9eefbe7655a9 100644
--- a/dev-python/vharfbuzz/vharfbuzz-0.1.1.ebuild
+++ b/dev-python/vharfbuzz/vharfbuzz-0.1.3.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
@@ -21,6 +21,4 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
-PATCHES=( "${FILESDIR}/${P}-fix-package-dir.patch" )
-
 distutils_enable_sphinx docs dev-python/sphinxcontrib-napoleon
diff --git a/dev-python/wsgi_intercept/Manifest b/dev-python/wsgi_intercept/Manifest
index 95c20a033c61..9a143bba9f58 100644
--- a/dev-python/wsgi_intercept/Manifest
+++ b/dev-python/wsgi_intercept/Manifest
@@ -1,2 +1,2 @@
-DIST wsgi_intercept-1.9.2.tar.gz 29083 BLAKE2B 97eda40f40f0ea00ff213f2222310ce6c77ee9c822e89330ed8a277f32851d06bdf1050629e69677cf7fb00d04128403c5a89aec1d03d796fdbb65e8f3e4e9b6 SHA512 a313fe6302c9f168bd050c83ded1d58ef74feb54870197eb85b3527c2cc77eb76b4ca61ff4b554e13cca10ec7106ad9ba35c9a41a00bbd82ef39a26df2af7769
+DIST wsgi_intercept-1.10.0.tar.gz 30252 BLAKE2B 43c2e9dcd98616132801721392b0150b49fe5e851f343f53d8eb42c2f7f8b84f5eb9bb41edec7b830908f122a80458752e1c97f6a68006088221bb3233e90951 SHA512 27848e52e77f1d7ca7a079eb24025bb38d31f4c6b0b82c2717c543a5ffa83a95fe0dd893c326135b29c465a89ffe149da6d5d9c8bfe9f181546862e4f42a3832
 DIST wsgi_intercept-1.9.3.tar.gz 30002 BLAKE2B 65b7b39543dc486d8ea394b093a3892bdbd7b8e8314a3b839af13ca7abc79f0397092b0d908a873821b1d42d713f5fdd64d2cd815498c7e4f77300725b8ab30c SHA512 b23cbbe20299dad413db0130bf9b055b58ad0a8349d18d9a3eb22cec4db6c9c570785c2ba29245ac52fa1c340a80cb7eb18c04b7bd75dd57961ae8c5142eabdc
diff --git a/dev-python/wsgi_intercept/wsgi_intercept-1.9.2.ebuild b/dev-python/wsgi_intercept/wsgi_intercept-1.10.0.ebuild
index 82b75815dc24..b71399f04352 100644
--- a/dev-python/wsgi_intercept/wsgi_intercept-1.9.2.ebuild
+++ b/dev-python/wsgi_intercept/wsgi_intercept-1.10.0.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
@@ -8,7 +8,10 @@ PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="wsgi_intercept installs a WSGI application in place of a real URI for testing"
-HOMEPAGE="https://pypi.org/project/wsgi-intercept/"
+HOMEPAGE="
+	https://pypi.org/project/wsgi-intercept/
+	https://github.com/cdent/wsgi-intercept
+"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
diff --git a/dev-python/xcffib/xcffib-0.11.1-r1.ebuild b/dev-python/xcffib/xcffib-0.11.1-r1.ebuild
new file mode 100644
index 000000000000..5a16510cfddb
--- /dev/null
+++ b/dev-python/xcffib/xcffib-0.11.1-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1
+
+DESCRIPTION="A drop in replacement for xpyb, an XCB python binding"
+HOMEPAGE="https://github.com/tych0/xcffib"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+DEPEND="x11-libs/libxcb"
+RDEPEND="
+	$(python_gen_cond_dep '
+		>=dev-python/cffi-1.1:=[${PYTHON_USEDEP}]
+	' 'python*')
+	dev-python/six[${PYTHON_USEDEP}]
+	${DEPEND}"
+BDEPEND="
+	test? (
+		x11-base/xorg-server[xvfb]
+		x11-apps/xeyes
+	)"
+
+distutils_enable_tests pytest