Adding metadata

45 files changed, 625 insertions, 192 deletions

diff --git a/dev-python/PyPDF2/Manifest b/dev-python/PyPDF2/Manifest
index 42847775933c..0740dbbba47b 100644
--- a/dev-python/PyPDF2/Manifest
+++ b/dev-python/PyPDF2/Manifest
@@ -2,5 +2,6 @@ DIST PyPDF2-1.27.12.gh.tar.gz 3430850 BLAKE2B a0cb344f616d628b7c39dc360234057ce6
 DIST PyPDF2-1.28.1.gh.tar.gz 4260569 BLAKE2B 69b925a463c262ab207dd768160ea9083b14eed6a25a234d09e472ce812039aeb899674a0216b20ead3a4814cc3ec83ee320c99b84d109d8a320b925b7654ffa SHA512 22dec520e256420b618d5611f44f52752ad3c7ccee325991f4817e88ba69d01bf705708877a0df450297c3231725f72e03c4d8b33ced29fd7445c0ac2701dc2b
 DIST PyPDF2-1.28.2.gh.tar.gz 4260541 BLAKE2B 16cf7358dbd201e54853022b341fa7501b691d258380ac02464ae410d045a454785e03507b48f05b2ed92dc7a437cdc7703ba2417ca0c6d3c43846d3daaa00fa SHA512 3f69e983fcd83485cb76a957ee5ae436468bb9d04db821271cbb1f37c1f796ea974dd8dd425e0b4f9867e19fe14861355f9f5f8349a52ef8f7f829832f0694ca
 DIST PyPDF2-1.28.3.gh.tar.gz 4261567 BLAKE2B 8f76d23d1c30c42e78585b6ced44726c9c6a701f52b08a7130e3923e63a058f69525442d06e85db4de4345b6c4a14ce97d5e7fbec4431b01d5ca86ba759482c4 SHA512 0a7b54759b0ce6a5383364ea1014e8c3bf80c180ab533b905dc676df8d0307ad6ae46007033b8c23f2c7986d45086d98485631f867d562e70cc09c52862142d9
+DIST PyPDF2-1.28.4.gh.tar.gz 4397029 BLAKE2B 2db9aacc55d06e961708ee455562e28f59bbc3fd973547feb1e596df52872fa2fb7a424e2159e7c0c2cacd3c6bdff987f72fec7db41422a0aae4aa33a60f1cb6 SHA512 a93406f9a0e177f0ad1d92430f212abbc7b7486b86f37b281e68595de125e0fcdfbf73fc7d66490698d8355875659633c3785e8c2725e52ef9d615441b5aa517
 DIST PyPDF2-sample-files-41b5cd4f774f8fbd8ac42d93b9962f0376352a15.gh.tar.gz 5406287 BLAKE2B 8ddad01235bdb55cee596d9114e5b6c3b153919bcff5203d229311243516f3595cb36dcca87cae27514a8231d72daa94782115795bff8c1c3d046236811c21e0 SHA512 6c38d5ee0e1c5c0ffdd78f7c2fe56dbf357a1e82d2af642a10264a6102ae8fb95cba6d2f76b26df6a33a5d84cfd5111885d39c1747cf95a5ce545f26bdb37263
 DIST PyPDF2-sample-files-41b5cd4f774f8fbd8ac42d93b9962f0376352a15.tar.gz 5406287 BLAKE2B 8ddad01235bdb55cee596d9114e5b6c3b153919bcff5203d229311243516f3595cb36dcca87cae27514a8231d72daa94782115795bff8c1c3d046236811c21e0 SHA512 6c38d5ee0e1c5c0ffdd78f7c2fe56dbf357a1e82d2af642a10264a6102ae8fb95cba6d2f76b26df6a33a5d84cfd5111885d39c1747cf95a5ce545f26bdb37263
diff --git a/dev-python/PyPDF2/PyPDF2-1.28.4.ebuild b/dev-python/PyPDF2/PyPDF2-1.28.4.ebuild
new file mode 100644
index 000000000000..aa3556217b44
--- /dev/null
+++ b/dev-python/PyPDF2/PyPDF2-1.28.4.ebuild
@@ -0,0 +1,51 @@
+# 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
+
+SAMPLE_COMMIT=41b5cd4f774f8fbd8ac42d93b9962f0376352a15
+DESCRIPTION="Python library to work with PDF files"
+HOMEPAGE="
+	https://pypi.org/project/PyPDF2/
+	https://github.com/py-pdf/PyPDF2/
+"
+SRC_URI="
+	https://github.com/py-pdf/PyPDF2/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+	test? (
+		https://github.com/py-pdf/sample-files/archive/${SAMPLE_COMMIT}.tar.gz
+			-> ${PN}-sample-files-${SAMPLE_COMMIT}.gh.tar.gz
+	)
+"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="examples"
+
+BDEPEND="
+	dev-python/pillow[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+src_unpack() {
+	default
+	if use test; then
+		mv "sample-files-${SAMPLE_COMMIT}"/* "${P}"/sample-files/ || die
+	fi
+}
+
+src_install() {
+	if use examples; then
+		docinto examples
+		dodoc -r Sample_Code/.
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+	distutils-r1_src_install
+}
diff --git a/dev-python/cachetools/Manifest b/dev-python/cachetools/Manifest
index 5182ea81114e..c739afcaca55 100644
--- a/dev-python/cachetools/Manifest
+++ b/dev-python/cachetools/Manifest
@@ -1,3 +1,4 @@
 DIST cachetools-4.2.4.tar.gz 25487 BLAKE2B 91979f72b8719f4fbc57421ded6edcca38106814997abd2a17c1147af55a1b64e11b347c8ef790cd8cdafbd83b8492d377540b872430d285584aa3d3228f6435 SHA512 29a6bb3a064e5603cd3e3882d8e5a6a6ef95ba3029716692c9a82d7186a0befcfb8ed4a0ee3ecb591fdff93a46836d5b25acca7ba5eab1ba837e86404aea8fcf
 DIST cachetools-5.0.0.tar.gz 26119 BLAKE2B 29d3c9d9859c4848d807dcf8d84614b23a125bdabd4188191e7ccb1536da249226ed4b21798b49c2eb764bfea4ba16b557440438a827b1bfd8d4c5b0984695e4 SHA512 3d311969a4fcc180767f4546f384e16d47bbeb5c1d97884006872317514ea2739560346d62d0afed1916def249d92f9ff14e4d964e9521de09132d3a83463a76
 DIST cachetools-5.1.0.tar.gz 26656 BLAKE2B 709b4e5ee7a0e86ccd0d947828f36b7c98765dddb0d628b28d17ed745633b747c16f17df7ffff79a87e8916702c4a513432b832a6d06f2ac57c1c9199e2adeef SHA512 6732c5a305c506843caa13cdacb210a83695a9cb65d065b95e1505530ffb6899200c1d89b66ede33b194b5af1a01ad99e79aa85ec754d854de476f243380bd53
+DIST cachetools-5.2.0.tar.gz 27342 BLAKE2B 905986bca98996fbc74c74bc5710b429ae63b4bf6283a3910e83a92cac461ef4a0271b1691a694fe8ecacf38eeeb921d7345c9e015f1400705662081d5e29dbd SHA512 e12766aef1725091edcdd0ef3687b891242f711de069c0d0642680d61dcca79e645e6ecb5f2e22470f189aba59daa2b5a830dc76791256517368f8912a065eef
diff --git a/dev-python/cachetools/cachetools-5.2.0.ebuild b/dev-python/cachetools/cachetools-5.2.0.ebuild
new file mode 100644
index 000000000000..4a6488144853
--- /dev/null
+++ b/dev-python/cachetools/cachetools-5.2.0.ebuild
@@ -0,0 +1,22 @@
+# 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="Extensible memoizing collections and decorators"
+HOMEPAGE="
+	https://github.com/tkem/cachetools/
+	https://pypi.org/project/cachetools/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+distutils_enable_tests pytest
diff --git a/dev-python/cfgv/cfgv-3.3.1.ebuild b/dev-python/cfgv/cfgv-3.3.1.ebuild
index 670c79c92638..bfa5f20e8183 100644
--- a/dev-python/cfgv/cfgv-3.3.1.ebuild
+++ b/dev-python/cfgv/cfgv-3.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/dev-python/click-didyoumean/Manifest b/dev-python/click-didyoumean/Manifest
index 1fee5236c01c..a49684cad772 100644
--- a/dev-python/click-didyoumean/Manifest
+++ b/dev-python/click-didyoumean/Manifest
@@ -1,2 +1 @@
-DIST click-didyoumean-0.0.3.tar.gz 4283 BLAKE2B 8af7cb4c0448a67f263c1c8939ff89e1429e4d98a8e41cd49f573c5e43458c5da72f81e78e4d72e071ce753998b2f4765de5f3aad9330cf29032decb8fff9a5f SHA512 6e832881817645eb8fa3a40acaab74a7f0dcc798aa984781a011b2ef78da2a4ae71ff2d58907bcbb35adbfc659727223c28c3622788eef05ecbdf758d6ac889d
 DIST click-didyoumean-0.3.0.tar.gz 309301 BLAKE2B 2b667b5e94dd690e5b7a2e96b83197f52e201b002a32fff4a8dbb4bd5497d5b816b40d9da98729821e1d17a795a3776c1553a746aa4c4144cf7fe6540768e1ca SHA512 4927ee392f27950c3f7ef5e0f1d5a5e2421172f3e9d34ec76986c9c7ea698cfa1981678a06fb8682577d6ed04c242c42bdd1d796d7623a1c99dfdbdb61c80fca
diff --git a/dev-python/click-didyoumean/click-didyoumean-0.0.3.ebuild b/dev-python/click-didyoumean/click-didyoumean-0.0.3.ebuild
deleted file mode 100644
index 50b6c6819d3d..000000000000
--- a/dev-python/click-didyoumean/click-didyoumean-0.0.3.ebuild
+++ /dev/null
@@ -1,25 +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="Enable git-like did-you-mean feature in click"
-HOMEPAGE="
-	https://github.com/click-contrib/click-didyoumean
-	https://pypi.org/project/click-didyoumean/
-"
-SRC_URI="https://github.com/click-contrib/click-didyoumean/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-RESTRICT="test"
-DEPEND="
-	dev-python/click
-"
-RDEPEND="${DEPEND}"
-
-distutils_enable_tests pytest
diff --git a/dev-python/click-repl/click-repl-0.2.0.ebuild b/dev-python/click-repl/click-repl-0.2.0-r1.ebuild
index e74dbe8e2287..2969e2c5fe1d 100644
--- a/dev-python/click-repl/click-repl-0.2.0.ebuild
+++ b/dev-python/click-repl/click-repl-0.2.0-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI=8
 
 PYTHON_COMPAT=( python3_{7,8,9,10} )
 
diff --git a/dev-python/cu2qu/cu2qu-1.6.7.ebuild b/dev-python/cu2qu/cu2qu-1.6.7-r1.ebuild
index 370716a77993..06a4508df69c 100644
--- a/dev-python/cu2qu/cu2qu-1.6.7.ebuild
+++ b/dev-python/cu2qu/cu2qu-1.6.7-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI=8
 
 PYTHON_COMPAT=( python3_{7,8,9,10} )
 
diff --git a/dev-python/flit_scm/Manifest b/dev-python/flit_scm/Manifest
index b0394997d589..539cccae922b 100644
--- a/dev-python/flit_scm/Manifest
+++ b/dev-python/flit_scm/Manifest
@@ -1 +1,2 @@
 DIST flit_scm-1.5.0.tar.bz2 3230 BLAKE2B f29f7c0cc341fe12d621d0a8f91b5d983f8f7e4259155a7119b07d8e159a12755ae60e007d1ace9054385104aa2a572454653ef9f92a3043777b1e631dfd5f20 SHA512 1b8d4a653dffb4685ad91843147ba6dc693b6d1d4f21e8766782d04edc1ec992e3ad4a3ce82d25e01a089816648f86228db75024e39a7a277b6fae9f8fc4567a
+DIST flit_scm-1.6.2.tar.bz2 3230 BLAKE2B 3977f1be820f2f590f4f781f065661adfc4a05427a87882093acad81f87eee2ba20d910ba3662b5b19997735f0356d262a4f150ba940310166b62a019b68ba05 SHA512 32690af4d24eb704338c78fdb0080d9f910a0741066d282e79eb88c473ada8d9a3daeba1a9aecfe830b2a6d0cea8da471bf6ef904b105fd8036994e4a0e12d12
diff --git a/dev-python/flit_scm/flit_scm-1.6.2.ebuild b/dev-python/flit_scm/flit_scm-1.6.2.ebuild
new file mode 100644
index 000000000000..97b77aad229d
--- /dev/null
+++ b/dev-python/flit_scm/flit_scm-1.6.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=standalone
+PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A PEP 518 build backend combining flit with setuptools_scm"
+HOMEPAGE="
+	https://gitlab.com/WillDaSilva/flit_scm/
+	https://pypi.org/project/flit-scm/
+"
+SRC_URI="
+	https://gitlab.com/WillDaSilva/flit_scm/-/archive/${PV}/${P}.tar.bz2
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/flit_core-3.5.0[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-6.4.2[${PYTHON_USEDEP}]
+	<dev-python/tomli-3[${PYTHON_USEDEP}]
+	>=dev-python/tomli-2[${PYTHON_USEDEP}]
+"
+
+src_prepare() {
+	# unpin deps
+	sed -i -e 's:~=[0-9.]*::' pyproject.toml || die
+	distutils-r1_src_prepare
+}
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/fsspec/fsspec-2022.5.0.ebuild b/dev-python/fsspec/fsspec-2022.5.0.ebuild
index 28b336438d70..e5c7ce55755b 100644
--- a/dev-python/fsspec/fsspec-2022.5.0.ebuild
+++ b/dev-python/fsspec/fsspec-2022.5.0.ebuild
@@ -22,7 +22,6 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 
 BDEPEND="
-	dev-python/versioneer[${PYTHON_USEDEP}]
 	test? (
 		dev-python/aiohttp[${PYTHON_USEDEP}]
 		dev-python/numpy[${PYTHON_USEDEP}]
diff --git a/dev-python/gabbi/Manifest b/dev-python/gabbi/Manifest
index a6f887e5250c..ec423cecad26 100644
--- a/dev-python/gabbi/Manifest
+++ b/dev-python/gabbi/Manifest
@@ -1,2 +1 @@
-DIST gabbi-2.4.0.tar.gz 221729 BLAKE2B 3b8e97aa50434d119a4e9465df5a946e19679e5b190b738bd8dad355c6a03801bdbb7d75cd82e268c0517843e9ccc42c3de2053c1e3ef90ddd55538589ddf97f SHA512 0485ac87f223f9ae95bb9a73cdc7e95ad49d8471f9e19625596e720ecc4dac358411dc9415409944855fa363db255479e5a623893063cc0967a3207321623306
 DIST gabbi-2.7.1.tar.gz 223087 BLAKE2B 4362cc2c5a66d56603e5a2c25d69064544d116c3a71ac3afdb050b28e45c318447a92ad0d0147d447cb9f3e6a4841a79b1642c4c89c9bc084ea5da4b0c828457 SHA512 f12171051179c3ca88c2a3924319c00a51e8eab761c50e291553b22d3925474e9de9e73181697907e3749e34b249034f6978311781af28f700ad49584bdeed95
diff --git a/dev-python/gabbi/gabbi-2.4.0.ebuild b/dev-python/gabbi/gabbi-2.4.0.ebuild
deleted file mode 100644
index b51785bf68ff..000000000000
--- a/dev-python/gabbi/gabbi-2.4.0.ebuild
+++ /dev/null
@@ -1,36 +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="Declarative HTTP testing library"
-HOMEPAGE="
-	https://github.com/cdent/gabbi
-	https://pypi.org/project/gabbi/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="Apache-2.0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-python/pbr[${PYTHON_USEDEP}]
-	dev-python/pytest[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.11.0[${PYTHON_USEDEP}]
-	dev-python/certifi[${PYTHON_USEDEP}]
-	>=dev-python/jsonpath-rw-ext-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/wsgi_intercept-1.8.1[${PYTHON_USEDEP}]
-	dev-python/colorama[${PYTHON_USEDEP}]
-"
-
-RESTRICT="test"
-PROPERTIES="test_network"
-
-distutils_enable_tests pytest
diff --git a/dev-python/glyphsets/Manifest b/dev-python/glyphsets/Manifest
index 46a4c9ed474d..a670b1a4eb85 100644
--- a/dev-python/glyphsets/Manifest
+++ b/dev-python/glyphsets/Manifest
@@ -1,2 +1 @@
-DIST glyphsets-0.4.0.tar.gz 1666642 BLAKE2B a2efc708ca29296015794c8f2867eb242ffc96fcfc04a79afd1ccb0a43faa5f3f539aca8f485f5c6b688ac42613db55af8b3eeb740fda5659256a8d91c722bc2 SHA512 d7c66fe8ff328e625b95202d07347cf9e532f4f98c340d329c9cd2c69382184074a1f53a569b9ab6fdede994d42016c3a6c08265e09fefc1081864f24964d376
 DIST glyphsets-0.5.0.tar.gz 1473150 BLAKE2B d745b7689c9eee7cd1a25035d13f19d6eb6db7c8e603ecf87ed689f0cb2e2d1a421b4d5a4f08c7d470def2d5d8db7636a01941f3445579a0712f2ab506a9571a SHA512 94d6ab956a5ab16f061b57e5210ea59733486a27bde3093e8af279ac8f5f1e2efce71d5135ac7182ec027916e31d86433939e743084c405653250893d9221a02
diff --git a/dev-python/glyphsets/glyphsets-0.4.0.ebuild b/dev-python/glyphsets/glyphsets-0.4.0.ebuild
deleted file mode 100644
index 521e9189693a..000000000000
--- a/dev-python/glyphsets/glyphsets-0.4.0.ebuild
+++ /dev/null
@@ -1,34 +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="A python API for evaluating coverage of glyph sets in font projects"
-HOMEPAGE="
-	https://github.com/googlefonts/glyphsets
-	https://pypi.org/project/glyphsets/
-"
-SRC_URI="https://github.com/googlefonts/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-KEYWORDS="~amd64"
-SLOT="0"
-
-#ufoLib2 is an indirect dependency
-RDEPEND="
-	dev-python/fonttools[${PYTHON_USEDEP}]
-	dev-python/ufoLib2[${PYTHON_USEDEP}]
-"
-DEPEND="
-	${RDEPEND}
-	>=dev-python/setuptools_scm-4[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	export SETUPTOOLS_SCM_PRETEND_VERSION="${PV}"
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/googletransx/googletransx-2.4.2-r1.ebuild b/dev-python/googletransx/googletransx-2.4.2-r2.ebuild
index 42ef8d7ddbc4..673ca3f81eb5 100644
--- a/dev-python/googletransx/googletransx-2.4.2-r1.ebuild
+++ b/dev-python/googletransx/googletransx-2.4.2-r2.ebuild
@@ -1,12 +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} )
 
-#DISTUTILS_USE_SETUPTOOLS=rdepend
-
 inherit distutils-r1
 
 DESCRIPTION="Free Google Translate API for Python. Translates totally free of charge."
@@ -17,7 +15,5 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
 
-RDEPEND="
-	dev-python/requests[${PYTHON_USEDEP}]
-"
+RDEPEND="dev-python/requests[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/dev-python/hstspreload/Manifest b/dev-python/hstspreload/Manifest
index 6d3bca1518ab..6c18a86437e2 100644
--- a/dev-python/hstspreload/Manifest
+++ b/dev-python/hstspreload/Manifest
@@ -1,2 +1 @@
-DIST hstspreload-2021.10.1.tar.gz 1247430 BLAKE2B fa6bb9fb5be874094afa5a5475846a3bfd7dd4d53dd9819be25f8cd91db3606624d3c5c0813fdc142fc56d33e98d98d49023f26384fd15dbbc5dac7f7b58d353 SHA512 6ca5cbdbe3799066598da7fc1703438b108fe2786d3e422a6d84dc74bf5f8f4854b77ff4443309dbc2294840b00973b5f064db0b0adbb9b7b55425707cead81e
 DIST hstspreload-2021.12.1.tar.gz 1270649 BLAKE2B 0bac4c3ff4320486af40e1775c1ace621ab4c42f30676734ecb77fe33716b560e2e6874bb0584b8540b368ad86deb57dfdbb362b94ff877176e3d8705d4b8d7d SHA512 80ccc403e87b4f288ba3f0e2ab2d145d987ce7c9ed67d57399dec1f0e84524676305c359b866fee328329019f76c18482f42d11dc0eb5fed64910b5085450850
diff --git a/dev-python/hstspreload/hstspreload-2021.10.1.ebuild b/dev-python/hstspreload/hstspreload-2021.10.1.ebuild
deleted file mode 100644
index 3e40b4e26db8..000000000000
--- a/dev-python/hstspreload/hstspreload-2021.10.1.ebuild
+++ /dev/null
@@ -1,25 +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="Chromium HSTS Preload list as a Python package"
-HOMEPAGE="
-	https://hstspreload.org
-	https://github.com/sethmlarson/hstspreload
-	https://pypi.org/project/hstspreload/
-"
-SRC_URI="https://github.com/sethmlarson/hstspreload/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-
-RESTRICT="test"
-PROPERTIES="test_network"
-
-distutils_enable_tests pytest
diff --git a/dev-python/imageio/Manifest b/dev-python/imageio/Manifest
index 50b3f4781f70..b48ca982990e 100644
--- a/dev-python/imageio/Manifest
+++ b/dev-python/imageio/Manifest
@@ -1 +1,2 @@
 DIST imageio-2.19.2.gh.tar.gz 388434 BLAKE2B 4f0ec3f2586cbce7c15ff0551b8b5389d9236333eecda0870880c6dbe93bb2de464e57af7bc20c0f63aec6d53040a5140195d09c4c8a3c50c391a42b7847cf49 SHA512 6711a3be92f840d821f6539636072654d000932a6a7688384ae6bc007af5de41c8f90ed9a29e6401fd13219f50082ba5b75a1b383f1ac9242d568f95859de9c4
+DIST imageio-2.19.3.gh.tar.gz 388949 BLAKE2B bf7f7b2cc036d6bc808cedeefe624dfe43b232518f78974fffe9c664f23c8e89da73e5b777ee6049aa0ec363400fe8d9df1388a91a4b0a01089609d7ce12eaf3 SHA512 5ad9f332ea723facd5d9295e463b12d2cc17dfef8a7349ce194a8d32fcc5d07a29550834c66dc6e5837f8440347387b46624243fa267750f986042910ff6cb90
diff --git a/dev-python/imageio/imageio-2.19.3.ebuild b/dev-python/imageio/imageio-2.19.3.ebuild
new file mode 100644
index 000000000000..65cad728e477
--- /dev/null
+++ b/dev-python/imageio/imageio-2.19.3.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python library for reading and writing image data"
+HOMEPAGE="
+	https://imageio.readthedocs.io/en/stable/
+	https://github.com/imageio/imageio/
+	https://pypi.org/project/imageio/
+"
+SRC_URI="
+	https://github.com/imageio/imageio/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+# over 50% of tests rely on Internet
+PROPERTIES="test_network"
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-python/numpy-1.20.0[${PYTHON_USEDEP}]
+	>=dev-python/pillow-8.3.2[${PYTHON_USEDEP}]
+	media-libs/freeimage
+"
+# requests for fsspec[github]
+BDEPEND="
+	test? (
+		dev-python/fsspec[${PYTHON_USEDEP}]
+		dev-python/imageio-ffmpeg[${PYTHON_USEDEP}]
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/tifffile[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# Fails because of system installed freeimage
+	tests/test_core.py::test_findlib2
+	# Tries to download ffmpeg binary ?!
+	tests/test_ffmpeg.py::test_get_exe_installed
+)
diff --git a/dev-python/marshmallow/Manifest b/dev-python/marshmallow/Manifest
index cab3ce6a18c2..8a91f74597f2 100644
--- a/dev-python/marshmallow/Manifest
+++ b/dev-python/marshmallow/Manifest
@@ -1 +1,2 @@
 DIST marshmallow-3.15.0.tar.gz 179483 BLAKE2B 5cd660f4b1bf3ffb775e06659adce2f0da8bf46bd5376eb4407793925de60fce48ac633baced399314d9cef1faaf00f2643e56404cdc2c44e51b5b0c42ab533d SHA512 9d688466b9dfce7cd3307538aadb68c8297d3ee026a7a61953d361a9e52acafd00da81f48ab26771dba74bf8024117d53292763ab98cb78e2bbd7b5604bee4f1
+DIST marshmallow-3.16.0.tar.gz 180106 BLAKE2B c3d9b9c1645e7df103940b8e637f3de027f23e5da4a6ebd25412fef9d2d61483ec934af5c37f781121928a7b2f98b44793a8671173a5c548936ce0bbd0d2290d SHA512 5d3c7babff9117261afb902090bffcdba4eee2984d13862f4974fc043c6e56420707a6d3aba4a6046d947ef9414386c24895fc9a2538e36e505692e76d70f409
diff --git a/dev-python/marshmallow/marshmallow-3.16.0.ebuild b/dev-python/marshmallow/marshmallow-3.16.0.ebuild
new file mode 100644
index 000000000000..c48ba876cde7
--- /dev/null
+++ b/dev-python/marshmallow/marshmallow-3.16.0.ebuild
@@ -0,0 +1,30 @@
+# 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="A library for converting to and from native Python datatypes"
+HOMEPAGE="https://github.com/marshmallow-code/marshmallow/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/packaging-0.17[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytz[${PYTHON_USEDEP}]
+		dev-python/simplejson[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/moto/Manifest b/dev-python/moto/Manifest
index 8719c7fe5fdf..5353a2c11d41 100644
--- a/dev-python/moto/Manifest
+++ b/dev-python/moto/Manifest
@@ -1,2 +1,3 @@
 DIST moto-3.1.10.tar.gz 2314423 BLAKE2B ad09f8cb70a1541dce640c870355c349f9a932beec1c98d3d4739bda89e773670fb0209b9ec7aca3a250472d425048d444b08edf2f1555c6777251de14c5a80a SHA512 138e5be59fffcfe4579b6cb292f4f8ec21c5d05723bcd66cae85bcc0f60991ac84310206d5a0fe8361135ff04573173f41b276021981d6f7844a726f18b54f83
+DIST moto-3.1.11.tar.gz 2320905 BLAKE2B 14cd572defd974e428a77f75be32f576d7cb222fa80a37b5f72bdb8f10fd36be3b456d7d660fe7943862824393b48b4d70687dde191ffc49a49db7ee05772994 SHA512 2e1a84beef161442f74dee95b1e5dc7b23c77d9b001c27b0d8ee3c429c5da13be9a6d0074bc26bacad72f5ea82b0eb85e88dd2adb585f7dfd688bd1e3d9cc5e9
 DIST moto-3.1.9.tar.gz 2308059 BLAKE2B 85f5c084fc81d74e8297ab0a78e3823bb6e98b1d4fdb70b802dabfa3ba11475670c3bfda27f48069e5298691a8ca71c98acf156c3b15ab79ff85555545c7596e SHA512 600ec2042e5e6df5e3bbc9fafcaa32255568c35a2a127e4f093ecc9332a799b568002cb414e5c086f24795c4f8f510517bf00c29a9b6a38dd667807d04a18954
diff --git a/dev-python/moto/moto-3.1.11.ebuild b/dev-python/moto/moto-3.1.11.ebuild
new file mode 100644
index 000000000000..60f4306b0f98
--- /dev/null
+++ b/dev-python/moto/moto-3.1.11.ebuild
@@ -0,0 +1,90 @@
+# 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="Mock library for boto"
+HOMEPAGE="https://github.com/spulec/moto"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/aws-xray-sdk-python-0.93[${PYTHON_USEDEP}]
+	dev-python/boto[${PYTHON_USEDEP}]
+	dev-python/cfn-lint[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-3.3.1[${PYTHON_USEDEP}]
+	dev-python/cookies[${PYTHON_USEDEP}]
+	>=dev-python/docker-py-2.5.1[${PYTHON_USEDEP}]
+	>=dev-python/idna-2.5[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
+	>=dev-python/jsondiff-1.1.2[${PYTHON_USEDEP}]
+	dev-python/boto3[${PYTHON_USEDEP}]
+	dev-python/botocore[${PYTHON_USEDEP}]
+	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/flask-cors[${PYTHON_USEDEP}]
+	dev-python/more-itertools[${PYTHON_USEDEP}]
+	>=dev-python/pyparsing-3.0.7[${PYTHON_USEDEP}]
+	>=dev-python/openapi-spec-validator-0.2.8[${PYTHON_USEDEP}]
+	dev-python/pretty-yaml[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/python-jose[${PYTHON_USEDEP}]
+	dev-python/python-sshpubkeys[${PYTHON_USEDEP}]
+	>=dev-python/responses-0.9.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.5[${PYTHON_USEDEP}]
+	dev-python/xmltodict[${PYTHON_USEDEP}]
+	dev-python/werkzeug[${PYTHON_USEDEP}]
+	dev-python/zipp[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/responses[${PYTHON_USEDEP}]
+		>=dev-python/sure-1.4.11[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# TODO
+		tests/test_firehose/test_firehose_put.py::test_put_record_http_destination
+		tests/test_firehose/test_firehose_put.py::test_put_record_batch_http_destination
+		tests/test_swf/responses/test_decision_tasks.py::test_respond_decision_task_completed_with_schedule_activity_task_boto3
+		tests/test_swf/responses/test_timeouts.py::test_activity_task_heartbeat_timeout_boto3
+		tests/test_swf/responses/test_timeouts.py::test_decision_task_start_to_close_timeout_boto3
+		tests/test_swf/responses/test_timeouts.py::test_workflow_execution_start_to_close_timeout_boto3
+		# broken code (local variable used referenced before definition)
+		tests/test_appsync/test_appsync_schema.py
+		# Needs network (or docker?) but not marked as such, bug #807031
+		# TODO: report upstream
+		tests/test_batch/test_batch_jobs.py::test_terminate_job
+		tests/test_batch/test_batch_jobs.py::test_cancel_pending_job
+		tests/test_batch/test_batch_jobs.py::test_cancel_running_job
+		tests/test_batch/test_batch_jobs.py::test_dependencies
+		tests/test_batch/test_batch_jobs.py::test_container_overrides
+		tests/test_cloudformation/test_cloudformation_custom_resources.py::test_create_custom_lambda_resource__verify_cfnresponse_failed
+		tests/test_cloudformation/test_cloudformation_stack_integration.py::test_lambda_function
+		tests/test_events/test_events_lambdatriggers_integration.py::test_creating_bucket__invokes_lambda
+		tests/test_sqs/test_integration.py::test_invoke_function_from_sqs_exception
+		tests/test_sqs/test_sqs_integration.py::test_invoke_function_from_sqs_exception
+		"tests/test_s3/test_s3_lambda_integration.py::test_objectcreated_put__invokes_lambda[match_events0-ObjectCreated:Put]"
+		"tests/test_s3/test_s3_lambda_integration.py::test_objectcreated_put__invokes_lambda[match_events1-ObjectCreated:Put]"
+		"tests/test_s3/test_s3_lambda_integration.py::test_objectcreated_put__invokes_lambda[match_events3-ObjectCreated:Put]"
+	)
+
+	# pytest-django causes freezegun try to mangle stuff inside django
+	# which fails when django is not really used
+	epytest -p no:django -m 'not network'
+}
diff --git a/dev-python/nuitka/Manifest b/dev-python/nuitka/Manifest
index 19933803f9ad..3b0b5e69cea6 100644
--- a/dev-python/nuitka/Manifest
+++ b/dev-python/nuitka/Manifest
@@ -1,4 +1,5 @@
 DIST Nuitka-0.7.7.tar.gz 3785340 BLAKE2B e856bcb3ecf69ecaa447ea73219f544bfceae8ee3a480fbd13b0a763efb8c8ec3c856a6142cff6a91273a88fc0aec15a6bb6c28fab1d9ca0c4dfeca229c11b68 SHA512 124e2d405b1104d0ba42a69b20a5c6168bb0643a13a4de789279401e09c30091853a8e464d9c4877a01f93a5a63934617cf52678994d0ae179560cd21d5b196e
 DIST Nuitka-0.8.1.tar.gz 3831036 BLAKE2B 3215344e0d46da8bee8a9c3246d2a6a8be86882a446f4e6d84ad924db821c051cd7d428f3e5372af69049e36ffc4a5b0e812f2ae3ea311b2759fbe42f87e2d6d SHA512 69c84d962ec03fb8dbd086c50076f656a99563985cc1750fcb0aebfde50ed68e6982ce2b0f2c3ce84151e9ea2d0cd679370a52c1f1dd0b8f943fc5f5938f9e15
 DIST Nuitka-0.8.2.tar.gz 3828013 BLAKE2B b5f3b59ea641714a9e437b29dc4b8db6b9f9c09d9b326b5eccc8e302bc5d205e561069c353c337ebd0d81434338244ae27caffb0e246ace0e809ebed0ae28e45 SHA512 7156745a83c9fd18a9564883e8ed7972002b19026d790b864a1383e8a131eb2adf271f403190909e2586ea3a7eb2d28bc3e469770fbae0d392617b26b3e63d25
+DIST Nuitka-0.8.3.tar.gz 3826774 BLAKE2B addc91ea87dfc2bc8cef5fe4f1285935c9f09cf8e3d88900fce004c4c5e83a0c3052c8848e61f2160ea12136860849c907d80930e0589a6ab5195c586102817a SHA512 0f0b648eaff3e7d8d2af5f554a7b2e7970aa01036e5299ee2b72e85529d70750bf54f78dc8fa5cd7dcfa77e15b578cefa2586b71401fb8b20331db418afdef24
 DIST Nuitka-0.8.tar.gz 3829530 BLAKE2B 051be63639e491fb26e7ef36b7e034715d0dd0e39417b59c30b0c5628e78d6c655978a2198d7192b431f176a24060fa899fb9c17ff6dc02fedb64865ad37af5a SHA512 f4eef21a32b68d52363ede1f68afa0247bf61a142fc86763f28805ca3a611195bb87bd1229a31a4d0ce47bbae7f70cc18580ebab528772f0908f122d8341bc6c
diff --git a/dev-python/nuitka/nuitka-0.8.3.ebuild b/dev-python/nuitka/nuitka-0.8.3.ebuild
new file mode 100644
index 000000000000..3574a8ce15f5
--- /dev/null
+++ b/dev-python/nuitka/nuitka-0.8.3.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+
+inherit distutils-r1 flag-o-matic optfeature
+
+DESCRIPTION="Python to native compiler"
+HOMEPAGE="https://www.nuitka.net"
+SRC_URI="https://nuitka.net/releases/${P^}.tar.gz"
+S="${WORKDIR}/${P^}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~loong ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-util/scons[${PYTHON_USEDEP}]"
+BDEPEND="
+	${RDEPEND}
+	test? ( dev-util/ccache )
+"
+
+DOCS=( Changelog.pdf Developer_Manual.pdf README.pdf )
+
+distutils-r1_src_prepare() {
+	# remove vendored version of SCons that is Python2 only
+	# this should be removed when upstream removes support for Python2
+	rm -vR "${PN}/build/inline_copy/lib/scons-2.3.2/SCons" || die
+	eapply_user
+}
+
+python_install() {
+	distutils-r1_python_install
+	doman doc/nuitka3.1 doc/nuitka3-run.1
+}
+
+python_test() {
+	append-ldflags -Wl,--no-warn-search-mismatch
+	./tests/basics/run_all.py search || die
+}
+
+pkg_postinst() {
+	optfeature "support for stand-alone executables" app-admin/chrpath
+}
diff --git a/dev-python/os-testr/Manifest b/dev-python/os-testr/Manifest
index c26f09507093..13864452e9fe 100644
--- a/dev-python/os-testr/Manifest
+++ b/dev-python/os-testr/Manifest
@@ -1,2 +1 @@
-DIST os-testr-2.0.1.tar.gz 50884 BLAKE2B f709b33b168fade7faf8e13d0dbf3309cb9aa8e543133138cf7a3ac1d642670cbf803ea5e3b19a4cb2db9b5237837ea89835133e30fa09565af11b52385366cd SHA512 d4c5b84a18d05c0da8a017c045e7304b8fe6a3afc3295a76fa3ba192873f0e507e2fa6c3da423f7d77a82eb3e141225b1abd6875acd56c5a2a9d77a32476deff
 DIST os-testr-3.0.0.tar.gz 38684 BLAKE2B 4089416f1abb78a90848a5bfbcf38f8f6ac404e1776d3eae2d178aa6afc60f5408bce8787d6540eb987d9922706e0e2ec84b1879265b9ab8f62cc36ffa5ef9c0 SHA512 707515153f73cb02df138bfc3211f5309b7e2ed0a283c6bf0bd62e4666250b91353a5ac1adaaac750f5c3970ca40531f65574900d2797004815a945504f8e5fc
diff --git a/dev-python/os-testr/os-testr-2.0.1.ebuild b/dev-python/os-testr/os-testr-2.0.1.ebuild
deleted file mode 100644
index 385548e36edc..000000000000
--- a/dev-python/os-testr/os-testr-2.0.1.ebuild
+++ /dev/null
@@ -1,37 +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="A testr wrapper to provide functionality for OpenStack projects"
-HOMEPAGE="
-	https://opendev.org/openstack/os-testr
-	https://pypi.org/project/os-testr/
-	https://launchpad.net/os-testr
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/os-testr-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/subunit-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-"
-DEPEND="
-	${RDEPEND}
-	test? (
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/ddt-1.0.1[${PYTHON_USEDEP}]
-		>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests --install pytest
diff --git a/dev-python/portio/portio-0.5.ebuild b/dev-python/portio/portio-0.5-r1.ebuild
index 78719ebd2aef..ca99d5601919 100644
--- a/dev-python/portio/portio-0.5.ebuild
+++ b/dev-python/portio/portio-0.5-r1.ebuild
@@ -1,9 +1,11 @@
-# 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
+
 DISTUTILS_USE_SETUPTOOLS=no
 PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
+
 inherit distutils-r1
 
 DESCRIPTION="Python low level port I/O for Linux x86"
diff --git a/dev-python/pydub/pydub-0.25.1.ebuild b/dev-python/pydub/pydub-0.25.1.ebuild
index 287be35c72fb..5a87e5c1a607 100644
--- a/dev-python/pydub/pydub-0.25.1.ebuild
+++ b/dev-python/pydub/pydub-0.25.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=( python3_{7,8,9,10} )
 
diff --git a/dev-python/pysimdjson/Manifest b/dev-python/pysimdjson/Manifest
index b08669c08034..88e725e6c218 100644
--- a/dev-python/pysimdjson/Manifest
+++ b/dev-python/pysimdjson/Manifest
@@ -1 +1,2 @@
 DIST pysimdjson-4.0.3.gh.tar.gz 3783913 BLAKE2B 74c186e87540c4806ec311e7a6ca05bf28b2a2060ba078919c68d92812a1bc34efd9f0deb30b85dba134af9ce99dbfa2b8fa33c1b14926915e284f262a7ac4f1 SHA512 eb2cd8b96eed8985674fbcfeafc21b58c9985c46c7f46b72ee78fbf91ef659acd5139fa56c251bae22418007b3da6ff7e5cdd2d28b2ba22cf19771f2f74880e3
+DIST pysimdjson-5.0.1.gh.tar.gz 3827732 BLAKE2B e42d3fd2ef857ab7c22a5afa6abc3313ff1ea0aabc8a6e8213df3eaef65eb3df501bbcdba2d0de501fdec310aba00c110a30814d548255401fa0b51ca7ee03d4 SHA512 4ace2feca976afdf113b92dd263918f88f7be32156ab6f3b6fe4b798d83bb7c66029bdd7e63fb1bb3bf6568e85b14ad227934114fa7e0da0961888cdfdca8943
diff --git a/dev-python/pysimdjson/pysimdjson-5.0.1.ebuild b/dev-python/pysimdjson/pysimdjson-5.0.1.ebuild
new file mode 100644
index 000000000000..7f18618d1f5f
--- /dev/null
+++ b/dev-python/pysimdjson/pysimdjson-5.0.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for simdjson"
+HOMEPAGE="
+	https://github.com/TkTech/pysimdjson/
+	https://pypi.org/project/pysimdjson/
+"
+SRC_URI="
+	https://github.com/TkTech/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	>=dev-libs/simdjson-2.0.1:=
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# benchmarks aren't run
+	sed -i -e 's:pytest-benchmark:: ; /license_file/ d' setup.cfg || die
+	# force regen
+	rm simdjson/csimdjson.cpp || die
+	# unbundle
+	> simdjson/simdjson.cpp || die
+	echo "#include_next <simdjson.h>" > simdjson/simdjson.h || die
+
+	distutils-r1_src_prepare
+
+	export BUILD_WITH_CYTHON=1
+}
+
+python_compile() {
+	distutils-r1_python_compile --libraries simdjson
+}
diff --git a/dev-python/python-libevdev/Manifest b/dev-python/python-libevdev/Manifest
index be2d5db9038a..dba8f1e16801 100644
--- a/dev-python/python-libevdev/Manifest
+++ b/dev-python/python-libevdev/Manifest
@@ -1 +1,2 @@
 DIST python-libevdev-0.10.tar.bz2 32385 BLAKE2B ae962d714168a3c035220dc9343ae5907e5de5a645b9d5857cfd884a847fb5b2b13cbdcc6204a66940ad406e92a3add332755c3adb5a10b7cc6a5ae62468c1ff SHA512 1ea54c5e335d348182fad71151ab37103a8c295c8efb73a60f40b41e399cc5fc48525006b15337e591147fc5385e8e56a12dcbcec2dd2e07652a7b60f85eaf1c
+DIST python-libevdev-0.11.tar.bz2 32406 BLAKE2B 0291a9008590a2900961d9e790c2946b67bc045a5b0df43f9f40d9c8838b332e1a839c21411ee88eddc92e9c59a038bc7ce8dd365bab71075fdd0a8c629c3a34 SHA512 6fb6181fc97cb1a7a087d298a933891cf05d0160d033c6d6300bcb6a904064b727a15e8e75665ee2933d0e8a0aeab2638f01bbd8d9f803f508157fd0e5ca41fc
diff --git a/dev-python/python-libevdev/python-libevdev-0.11.ebuild b/dev-python/python-libevdev/python-libevdev-0.11.ebuild
new file mode 100644
index 000000000000..b8bce84872a8
--- /dev/null
+++ b/dev-python/python-libevdev/python-libevdev-0.11.ebuild
@@ -0,0 +1,35 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python wrappers for the libevdev library"
+HOMEPAGE="
+	https://gitlab.freedesktop.org/libevdev/python-libevdev/
+	https://pypi.org/project/libevdev/
+"
+SRC_URI="
+	https://gitlab.freedesktop.org/libevdev/${PN}/-/archive/${PV}/${P}.tar.bz2
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+BDEPEND="
+	test? (
+		dev-libs/libevdev
+	)
+"
+RDEPEND="
+	dev-libs/libevdev
+"
+
+distutils_enable_tests unittest
+distutils_enable_sphinx doc/source \
+	dev-python/sphinx_rtd_theme
diff --git a/dev-python/python-pkcs11/python-pkcs11-0.7.0.ebuild b/dev-python/python-pkcs11/python-pkcs11-0.7.0-r1.ebuild
index e94f2b8b7fea..6b1ba5797baa 100644
--- a/dev-python/python-pkcs11/python-pkcs11-0.7.0.ebuild
+++ b/dev-python/python-pkcs11/python-pkcs11-0.7.0-r1.ebuild
@@ -1,13 +1,12 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
+EAPI=8
 
 DOCS_BUILDER="sphinx"
 DOCS_DIR="${S}/docs"
 DOCS_DEPEND="dev-python/sphinx_rtd_theme"
+PYTHON_COMPAT=( python3_{7,8,9,10} )
 
 inherit distutils-r1 docs
 
diff --git a/dev-python/python-utils/Manifest b/dev-python/python-utils/Manifest
index 8344566fa105..f8c869790a14 100644
--- a/dev-python/python-utils/Manifest
+++ b/dev-python/python-utils/Manifest
@@ -2,3 +2,4 @@ DIST python-utils-3.1.0.tar.gz 24251 BLAKE2B c00f4c45480f0948cddfa65d4f1ce17ac68
 DIST python-utils-3.2.2.tar.gz 25202 BLAKE2B ae36d918bfd125ed1c01a71f8b448390b70071eca8c404f2ce89312c0de8296b29026cd72baa1eeba940d84e2f0b5275ea0ee96735fdecd1b7fb8f5d42ac1b57 SHA512 cd3a9efbd71e33a343de4793c1b415129fbe280ea6b6bc40e84fc1ada7d409139d8bef6c7e2954ef6cd3b9407d817b07a61093d1a8b9de70f6af0b6aba3ebc8d
 DIST python-utils-3.2.3.tar.gz 25153 BLAKE2B b4e65b647b42288111edc7a90f7c1b1c3a222a999edacc2f0764e378f7c5f0b5c512842d73ea9f2e70052ba43ac48f9eb914a8a410b564bcd965c357672eda57 SHA512 85f1607faacf210c8e377a438c5d2f66e237cc870a91a9ed1ec7150aa8a7bb8f8fd5b3b0fb5e9585afb81801e7048f92b7ea46943205ddd9e271d6087b5e05d5
 DIST python-utils-3.3.0.tar.gz 27537 BLAKE2B 95570896c9a96161f0bcd2966ab8ffe8cf29ef29d50b8103ed6d0df4824aa3cbb6058d2b1d58b0ab98033775c5ea522c962bded2fd48b156bb57d686c8c872b0 SHA512 94a6ba6d303990cfd976d5676b5383df672d775385327e342b938483033fbd12fc75ce75afc6b66dd9fbf729d13e2a695246cc6a48073f579eeb7c0c82c7730e
+DIST python-utils-3.3.1.tar.gz 27565 BLAKE2B 79e865342d57ee1a841d9f17f26a26586ab477f5b7538ce514091f2c1f6d9054b34b8642ebc0f3555abdf696f74ce1473d80365844819829b9d8be37d1cc58f0 SHA512 d2c91f50999b3706696c161abd1f3bee5e39cb5078daa8d4604ad9c9905a02a221d0ffb7ae57bdb7c278b8d0c14c763d613305bf3371cb01adf4075ae55fd4f4
diff --git a/dev-python/python-utils/python-utils-3.3.1.ebuild b/dev-python/python-utils/python-utils-3.3.1.ebuild
new file mode 100644
index 000000000000..e51c7aa0ebd5
--- /dev/null
+++ b/dev-python/python-utils/python-utils-3.3.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Collection of small Python functions & classes"
+HOMEPAGE="
+	https://github.com/WoLpH/python-utils/
+	https://pypi.org/project/python-utils/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	test? (
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_IGNORE=(
+	docs
+	_python_utils_tests/test_logger.py
+	python_utils/loguru.py
+)
+
+python_prepare_all() {
+	sed -i -e '/--cov/d' -e '/--mypy/d' pytest.ini || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/schedule/Manifest b/dev-python/schedule/Manifest
index e7435225e9d8..91dc104171b5 100644
--- a/dev-python/schedule/Manifest
+++ b/dev-python/schedule/Manifest
@@ -1 +1 @@
-DIST schedule-1.1.0.tar.gz 31873 BLAKE2B 6e33e862f94c72f32ae3bba566ad4a64428cc90f80ed6ff8d577a29717b3cc5f3c91195742cedfedbcc4090d955f343097f53ed69e9922775969c854780798ce SHA512 3fe06e334ed532f013aeb806b7beacd9418c4dbbcb80d4b27090c08178f1874694ecfced24eeddc8450e99a80831d68b34a4a3b2638a870f30f53f570650795c
+DIST schedule-1.1.0.gh.tar.gz 31873 BLAKE2B 6e33e862f94c72f32ae3bba566ad4a64428cc90f80ed6ff8d577a29717b3cc5f3c91195742cedfedbcc4090d955f343097f53ed69e9922775969c854780798ce SHA512 3fe06e334ed532f013aeb806b7beacd9418c4dbbcb80d4b27090c08178f1874694ecfced24eeddc8450e99a80831d68b34a4a3b2638a870f30f53f570650795c
diff --git a/dev-python/schedule/schedule-1.1.0.ebuild b/dev-python/schedule/schedule-1.1.0-r1.ebuild
index 77798b182635..ba993cd15d5e 100644
--- a/dev-python/schedule/schedule-1.1.0.ebuild
+++ b/dev-python/schedule/schedule-1.1.0-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 #pypy3 fails tests
 PYTHON_COMPAT=( python3_{7,8,9,10} )
@@ -11,7 +11,7 @@ inherit distutils-r1
 DESCRIPTION="Python job scheduling for humans"
 HOMEPAGE="https://github.com/dbader/schedule"
 
-SRC_URI="https://github.com/dbader/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/dbader/${PN}/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 
 LICENSE="MIT"
diff --git a/dev-python/skills/skills-0.3.0.ebuild b/dev-python/skills/skills-0.3.0-r1.ebuild
index 02099e2a38aa..01460dbc8ed5 100644
--- a/dev-python/skills/skills-0.3.0.ebuild
+++ b/dev-python/skills/skills-0.3.0-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
 DISTUTILS_USE_SETUPTOOLS=bdepend
+PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/sphinx/Manifest b/dev-python/sphinx/Manifest
index 7184566ea1e6..8531236d67c4 100644
--- a/dev-python/sphinx/Manifest
+++ b/dev-python/sphinx/Manifest
@@ -1 +1,2 @@
 DIST Sphinx-4.5.0.tar.gz 6698212 BLAKE2B e6c46d35492c3d3068c4f97e497d33973ca86b40934578804fcec901fa89d2c52b45a7546b835b873846dd16936c1bd34a7b053aec8206c688d974671155fd56 SHA512 b44d2a81ed67adaefe16a07ae0cf053b5e6c775023aaa6c57d7b3950f171deac410e8004f787b151c3c2fc350650aa69a4dc2dc7239d1fd3d351e5194617cb2c
+DIST Sphinx-5.0.0.tar.gz 6726986 BLAKE2B 95f2b85c7de6d900922730c3e431259e2333b3fe27e25cbe35e9584ccf1ac3442ca0949018e64ca8481e60f2298b46f6a77523a7a67e6aafe7492b62ff97aa70 SHA512 6b58427aa8a4d9e159f5b84366ab2193df5a9e940c9cb11b440dabd2c32dcdbadbb7eddbd9f6f8c53e577bf7bfb7c11f979835b5df75139b5c5315f88794871f
diff --git a/dev-python/sphinx/sphinx-5.0.0.ebuild b/dev-python/sphinx/sphinx-5.0.0.ebuild
new file mode 100644
index 000000000000..af1230a3febb
--- /dev/null
+++ b/dev-python/sphinx/sphinx-5.0.0.ebuild
@@ -0,0 +1,130 @@
+# 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 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+MY_P=${P^}
+DESCRIPTION="Python documentation generator"
+HOMEPAGE="
+	https://www.sphinx-doc.org/
+	https://github.com/sphinx-doc/sphinx/
+	https://pypi.org/project/Sphinx/
+"
+SRC_URI="mirror://pypi/${MY_P::1}/${PN^}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="doc latex"
+
+RDEPEND="
+	<dev-python/alabaster-0.8[${PYTHON_USEDEP}]
+	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
+	<dev-python/docutils-0.19[${PYTHON_USEDEP}]
+	dev-python/imagesize[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.3[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.5.0[${PYTHON_USEDEP}]
+	>=dev-python/snowballstemmer-1.1[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-applehelp[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-devhelp[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-jsmath[${PYTHON_USEDEP}]
+	>=dev-python/sphinxcontrib-htmlhelp-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/sphinxcontrib-serializinghtml-1.1.5[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-qthelp[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_metadata-4.4[${PYTHON_USEDEP}]
+	' python3_{8,9} pypy3)
+	latex? (
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-luatex
+		app-text/dvipng
+	)
+	!dev-python/namespace-sphinxcontrib
+"
+BDEPEND="
+	doc? (
+		dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
+		media-gfx/graphviz
+	)
+	test? (
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		virtual/imagemagick-tools[jpeg,png,svg]
+		dev-texlive/texlive-fontsextra
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-luatex
+		app-text/dvipng
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/sphinx-3.2.1-doc-link.patch"
+	"${FILESDIR}/sphinx-4.3.2-doc-link.patch"
+)
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# disable internet access
+	sed -i -e 's:^intersphinx_mapping:disabled_&:' \
+		doc/conf.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		esetup.py build_sphinx
+		HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
+	fi
+}
+
+python_test() {
+	mkdir -p "${BUILD_DIR}/sphinx_tempdir" || die
+	local -x SPHINX_TEST_TEMPDIR="${BUILD_DIR}/sphinx_tempdir"
+
+	local EPYTEST_DESELECT=(
+		# these tests require Internet access
+		tests/test_build_latex.py::test_latex_images
+		tests/test_build_linkcheck.py::test_defaults
+		tests/test_build_linkcheck.py::test_defaults_json
+		tests/test_build_linkcheck.py::test_anchors_ignored
+		tests/test_build_linkcheck.py::test_linkcheck_exclude_documents
+		# TODO
+		tests/test_ext_autodoc_autoclass.py::test_classes
+		tests/test_ext_autodoc_autofunction.py::test_classes
+	)
+	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
+		tests/test_build_linkcheck.py::test_connect_to_selfsigned_fails
+		tests/test_ext_autodoc.py::test_autodoc_inherited_members_None
+		tests/test_ext_autodoc.py::test_autodoc_typed_inherited_instance_variables
+		tests/test_ext_autodoc.py::test_autodoc_typed_instance_variables
+		tests/test_ext_autodoc.py::test_automethod_for_builtin
+		tests/test_ext_autodoc.py::test_cython
+		tests/test_ext_autodoc.py::test_partialfunction
+		tests/test_ext_autodoc_autoclass.py::test_autodoc_process_bases
+		tests/test_ext_autodoc_autoclass.py::test_show_inheritance_for_decendants_of_generic_type
+		tests/test_ext_autodoc_autoclass.py::test_show_inheritance_for_subclass_of_generic_type
+		tests/test_ext_autodoc_autodata.py::test_autodata_type_comment
+		tests/test_ext_autodoc_autofunction.py::test_builtin_function
+		tests/test_ext_autodoc_autofunction.py::test_methoddescriptor
+		tests/test_ext_autodoc_automodule.py::test_automodule_inherited_members
+		tests/test_ext_autodoc_configs.py::test_autodoc_type_aliases
+		tests/test_ext_autodoc_configs.py::test_autodoc_typehints_signature
+		tests/test_ext_autosummary.py::test_autosummary_generate_content_for_module
+		tests/test_ext_autosummary.py::test_autosummary_generate_content_for_module_skipped
+		tests/test_pycode_parser.py::test_annotated_assignment
+		tests/test_util_inspect.py::test_isattributedescriptor
+		tests/test_util_typing.py::test_stringify_type_hints_pep_585
+	)
+
+	epytest
+}
diff --git a/dev-python/threadloop/threadloop-1.0.2.ebuild b/dev-python/threadloop/threadloop-1.0.2.ebuild
index ba9008d97af0..5e81f2962f6a 100644
--- a/dev-python/threadloop/threadloop-1.0.2.ebuild
+++ b/dev-python/threadloop/threadloop-1.0.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"
diff --git a/dev-python/webrtcvad/webrtcvad-2.0.10.ebuild b/dev-python/webrtcvad/webrtcvad-2.0.10.ebuild
index 551d1758ad98..6e08d0511e29 100644
--- a/dev-python/webrtcvad/webrtcvad-2.0.10.ebuild
+++ b/dev-python/webrtcvad/webrtcvad-2.0.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8