Adding metadata

author: Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> 2022-04-17 16:54:46 +0000
committer: Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> 2022-04-17 16:54:46 +0000
commit: 396c20c42dac2600fdd3acb9ad6dfb2f92e14824 (patch)
tree: 46fda09911b3d0805b0203452a985cd94ff21d47 /dev-python
parent: d60fd1d181de0be2b207ca6c1c36db2feefb36e1 (diff)
download: baldeagleos-repo-396c20c42dac2600fdd3acb9ad6dfb2f92e14824.tar.gz
baldeagleos-repo-396c20c42dac2600fdd3acb9ad6dfb2f92e14824.tar.xz
baldeagleos-repo-396c20c42dac2600fdd3acb9ad6dfb2f92e14824.zip
91 files changed, 1057 insertions, 783 deletions
diff --git a/dev-python/PyPDF2/Manifest b/dev-python/PyPDF2/Manifest
index 04e4c16055f0..a749db122873 100644
--- a/dev-python/PyPDF2/Manifest
+++ b/dev-python/PyPDF2/Manifest
@@ -2,3 +2,4 @@ DIST PyPDF2-1.26.0.tar.gz 77556 BLAKE2B 8ce9b95165a3841154b6e38e24ca5a4db434ceef
 DIST PyPDF2-1.27.1.gh.tar.gz 1170252 BLAKE2B 81049707d4dd406405ec994228226edfe7cde4d57007146893c5fec14a4e82355c427cac64a2e338945f06c5bce1802e64bf9b042770a2d2ea7da6ed6982908d SHA512 3bd00e7057af8d0f7fdea378b8fae463ce93d37c68997511df10c53b139c0cb13329143bdac133a825404ab459ab3ead64c455ac3e58ddd5097c2985f86c2a46
 DIST PyPDF2-1.27.3.gh.tar.gz 2036376 BLAKE2B fdb35cc61a0fe4c16de9a3717b03c276478a1810ce99996c391d50ccf9ae2d3e048201e95cf9d51e120674aaea2b6435c648ee238d1c9a45de50406c0b3df196 SHA512 01ec6d2f51e6b0865a6d1b5f7cc0297783ee745336b0d8be295c0b1234e1904f2904d49ebbb0f471e65325a75428ed9904f8c565cb7b7001fce27b22521a7f04
 DIST PyPDF2-1.27.4.gh.tar.gz 2037899 BLAKE2B 6f9a71504303959bd8c84d75e0c695e73ffc1927aa664c5ae8b43c678a692ea9c0b1c852d01ace4aa502dc2bba99c7047e373c427a1d044608d0300f5dd647fa SHA512 c0153226e996166ca5f4fa1f04a496afdc5a465dd427df64422748bad907184d18336dbc929b64b479483cf6e435fdeb1dd79d444bc9f4b8cd5f184acb3236f1
+DIST PyPDF2-1.27.5.gh.tar.gz 2053469 BLAKE2B 1a01289145574a4551f1fa237e4c790dd866088787f5bc9afb529ea99424f4d211f1913737cf4a2c744ceae90568ca26612cc4956ff1eda5840624e41df76d78 SHA512 c1f77c7ea46e866da104cf05421ccf15870db07923ff5860a6b44c944d599b38e98d33d6042a155b0698ecd100d1c6f57aa7bb8904dd08e679f6560a578d4488
diff --git a/dev-python/PyPDF2/PyPDF2-1.27.5.ebuild b/dev-python/PyPDF2/PyPDF2-1.27.5.ebuild
new file mode 100644
index 000000000000..8a2c28b5da18
--- /dev/null
+++ b/dev-python/PyPDF2/PyPDF2-1.27.5.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} )
+
+inherit distutils-r1
+
+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
+"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="examples"
+
+BDEPEND="
+	dev-python/pillow[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+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/alembic/Manifest b/dev-python/alembic/Manifest
index cde968566651..1aff1af3d6e1 100644
--- a/dev-python/alembic/Manifest
+++ b/dev-python/alembic/Manifest
@@ -1,2 +1 @@
-DIST alembic-1.7.6.tar.gz 1235649 BLAKE2B 5e12cf09927c7851ad5c95b7047865eec6ca01d3ce94045be3601855370e1cce8371d16ee4141a953a8ea0ffaafaa68c08499416283c7996b086b7b5967c8790 SHA512 dca97722ac70654dfa23d673b776d064af13bf1e59219131d7716d7ce183508361bad713d7d0986c8a56dd66c58a59fafc1c3b3ef80507eaf6368e48f9c1a059
 DIST alembic-1.7.7.tar.gz 1247590 BLAKE2B 9906a266b71d658bd66b00b237bc21bb092646077584ddb5c245f73709087f0e476e86eb022bf041e57a68e16ee89e5a3a047dc7ec2d43ffa941b2e803aef0fe SHA512 dcb4ba2faafc3ee789981931e0548f7328c1118938150789218e720f39386fd5e7e2543ab241838bcc1faaf36db07900fd065963496e68ced0896a5f4795d63d
diff --git a/dev-python/alembic/alembic-1.7.6.ebuild b/dev-python/alembic/alembic-1.7.6.ebuild
deleted file mode 100644
index 62627b4bf739..000000000000
--- a/dev-python/alembic/alembic-1.7.6.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
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="database migrations tool, written by the author of SQLAlchemy"
-HOMEPAGE="https://github.com/sqlalchemy/alembic"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~riscv x86"
-IUSE="doc"
-
-RDEPEND="
-	>=dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
-	dev-python/mako[${PYTHON_USEDEP}]
-	>=dev-python/python-editor-0.3[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/importlib_metadata[${PYTHON_USEDEP}]
-		dev-python/importlib_resources[${PYTHON_USEDEP}]
-	' pypy3 python3_8)
-"
-
-distutils_enable_tests pytest
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 2233c6fcaad1..26e7e8553120 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -7,3 +7,4 @@ DIST boto3-1.21.37.tar.gz 487557 BLAKE2B 1c716a07279ce2c1020faee9e2e81b2bde3ed6e
 DIST boto3-1.21.38.tar.gz 487786 BLAKE2B c247f51e3a7a7f9c531ab18d0fa93b90881c869631bffe35be5482a463a6580e733915d4f966d5700cf6bd822676416e9431f261fd237cb9dd85440308399e2d SHA512 a1b09de7a1dbede4000d500d96028a9ae70c60aa0cc1fc74201d52bc76a83dc27937d422592985e22b3dd1b98359255e837f66f51bae59f2104b379bfa7e49b3
 DIST boto3-1.21.39.tar.gz 488120 BLAKE2B 7fc998ec59d19fd6ea0377443920e30bcacdce5f185200757a13758e5e5229a7bbd959cd6854d9520f8ca6737af9f1adba887f3caef50fb7bbc9a2a38df9b472 SHA512 7c949773e0791d170158f7a8cc47559dcd9b2b6fbe422325b12b7d90649244e0475a6c35cfa15e00f1a0f49d2e581ba27d78320514e4ab8e8533bfb8510b37eb
 DIST boto3-1.21.41.tar.gz 488529 BLAKE2B a07662e4499ea6e833ee7a207dbf84522369ae0609ee7ac305fb8afca572114a938a1c0a23d75404c86c6afc2a516148a565e9ff607898566beb9b552fa44c3e SHA512 620fea69e84de1c6e705a33b00ba137f8550e0590492e13ece24bdf8ba6439be58e31821404a6dded02873a69256568d5061bf9de19ab75c37630865dcf97373
+DIST boto3-1.21.42.tar.gz 488786 BLAKE2B eba75a62e2460aeb2ea66641fadb52448314e639af3d3ecb09f2ab48336bfdc78be868a5d710ba295732a65518eaef882a162df4d25cb8cb344aa27ab3f2ecbb SHA512 3ee8a299cad05e4317916286028608f3d289e6c2c3b04606dca8ede9ba7f3e8931321f33c91c40bd9c4aa15a2cab21245de5c26f6637139fa716149fbcac9c2c
diff --git a/dev-python/boto3/boto3-1.21.42.ebuild b/dev-python/boto3/boto3-1.21.42.ebuild
new file mode 100644
index 000000000000..80278b309f54
--- /dev/null
+++ b/dev-python/boto3/boto3-1.21.42.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 multiprocessing
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="https://github.com/boto/boto3"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/boto3"
+	inherit git-r3
+	BOTOCORE_PV=${PV}
+else
+	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	epytest tests/{functional,unit} \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index 8e121304d381..056735018668 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -7,3 +7,4 @@ DIST botocore-1.24.37.tar.gz 8898823 BLAKE2B 5e5495ba399e910479c0172eb4c572a5c03
 DIST botocore-1.24.38.tar.gz 8900705 BLAKE2B 1f1504856d5908df7d8af9f92847d1d7ac9d8ce0258a63bcea4b593aaae4d87e71da45becadb5873eab53ceea6916e4c6a4931efd797b0474e7bfe4f0b60eb46 SHA512 1cf7cf2acc7773ab9f5c4d01eca24191f6d27e3eddd98abd33348bf171bcaa2708e8c9a03ceb2676060a1f906d66e6982fe3bce3b78ed878abc30434812327c0
 DIST botocore-1.24.39.tar.gz 8901325 BLAKE2B ffdafe7b34c7114de12044d14dd9ba58f01b21455f51a527da55450840f7f74cfaee56babb105b18634b06293ef91427534ea08b47d223285046bd718cc6cc7a SHA512 13c24f4e305bc16441682f483b0478730f5487388d73e14fc3750e22fd3c4c1c958146264721f365b00d1cddd4222e7c0b5d0be26df171ba4e95091327a340c8
 DIST botocore-1.24.41.tar.gz 8906754 BLAKE2B ff2e19dca96137f7e6335ad41ce645d132989ddafecfe8be780166b697bd9fff18eaeddd7a88d4b76cf2aa95c1822f88590940d674ea82e97c14d7bdf6c1d5de SHA512 071fb09c50b3eacbb68ddc5831bb8fceef92e5cb8aad9e4b74b1ab65528edbefc83d0bc86271d87aea97d923813ab1613fe342be0815df7a350edf602dae49bd
+DIST botocore-1.24.42.tar.gz 8907476 BLAKE2B 11cdce9d9c69835b1e57757d67d561f24932698dcaf9fc20e1add319889992b9c57c91ab5e9495027b9b96b6782698b29801d3f3815e8bfb47a67197c91448b5 SHA512 c7339cf03b121289eccc8dfe24c16ab28cba121ec1cd1883eaf2b29cd57b5e84d4e4b3a0bfcb8b4cbd0d213976af30630b2bda22e336edbaf208f5edd7823571
diff --git a/dev-python/botocore/botocore-1.24.42.ebuild b/dev-python/botocore/botocore-1.24.42.ebuild
new file mode 100644
index 000000000000..5fe8ae8c2f96
--- /dev/null
+++ b/dev-python/botocore/botocore-1.24.42.ebuild
@@ -0,0 +1,68 @@
+# 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
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="https://github.com/boto/botocore"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	<dev-python/jmespath-2[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
+)
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests pytest
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+
+	# unbundle deps
+	rm -r botocore/vendored || die
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# rely on bundled six
+		tests/functional/test_six_imports.py::test_no_bare_six_imports
+		tests/functional/test_six_threading.py::test_six_thread_safety
+	)
+
+	epytest tests/{functional,unit} \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+}
diff --git a/dev-python/cppy/Manifest b/dev-python/cppy/Manifest
index 9c08b3698b72..17e0c27342f5 100644
--- a/dev-python/cppy/Manifest
+++ b/dev-python/cppy/Manifest
@@ -1,3 +1,2 @@
-DIST cppy-1.1.0.tar.gz 11777 BLAKE2B 3bdeba7ee9bb478b51090a52077abc44ee74f72439c3cf2bca898bfc84bd97993bf4dd20d641a1952e2738e3f6b89434f7435fe0a5a8302f91ebef9d02729686 SHA512 9ef4db580c963219a111ab10bc263cdf2c4386e27fce8ffe5c785fc7e8f6c6b60cb23ce918959c6f17194fd6977cc65fa64d167a0b62e6cff0cf662154bc734c
 DIST cppy-1.2.0.tar.gz 16701 BLAKE2B 0d77f742f5436145ef5923253c1e4949352b6dce904519d655943eb9e9293a47ef19471fde0aefd914309677db0aa5ca1ddb81a2b1e6541b2ff5724b734f8c5b SHA512 074496bc08b1e163610fcd8fc15225a6110ea874a1e1680ec85e449fb8de77dda548d170c631fc90c3cb81d8fa090d2e1d8f19c156e34b0fa1da2b1f20b531fa
 DIST cppy-1.2.1.tar.gz 18040 BLAKE2B f828fd6e7b401ea2f7672ade94acd8014e77890d68cf09c4f189f4c8776875130db185a7458016dd20f8b3eae536ad6794a79a0aab6894092b26ea341e73e309 SHA512 4215051ce848faccfabcfbd840a343bc81d1ef0321ff0837354560dc6208cc235a6a130bab96f8fe42d5f630d1dfc20795928c64f6204a49e8f04b3fda8f9c90
diff --git a/dev-python/cppy/cppy-1.1.0.ebuild b/dev-python/cppy/cppy-1.1.0.ebuild
deleted file mode 100644
index 5b620e01bfb2..000000000000
--- a/dev-python/cppy/cppy-1.1.0.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# 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} )
-
-inherit distutils-r1
-
-DESCRIPTION="C++ header library which makes it easier to write Python extension modules"
-HOMEPAGE="https://pypi.org/project/cppy"
-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"
-
-distutils_enable_tests pytest
diff --git a/dev-python/cppy/cppy-1.2.0.ebuild b/dev-python/cppy/cppy-1.2.0.ebuild
index 43e3fe3185b9..a6ecfaf32d71 100644
--- a/dev-python/cppy/cppy-1.2.0.ebuild
+++ b/dev-python/cppy/cppy-1.2.0.ebuild
@@ -14,6 +14,6 @@ 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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/cppy/cppy-1.2.1-r1.ebuild b/dev-python/cppy/cppy-1.2.1-r1.ebuild
index 82a2083ed737..837b0d9c5f73 100644
--- a/dev-python/cppy/cppy-1.2.1-r1.ebuild
+++ b/dev-python/cppy/cppy-1.2.1-r1.ebuild
@@ -9,7 +9,7 @@ PYTHON_COMPAT=( python3_{7,8,9,10} )
 inherit distutils-r1
 
 DESCRIPTION="C++ header library which makes it easier to write Python extension modules"
-HOMEPAGE="https://pypi.org/project/cppy"
+HOMEPAGE="https://pypi.org/project/cppy/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/cssselect2/Manifest b/dev-python/cssselect2/Manifest
index 4e5486d7047e..5d7c14a4487c 100644
--- a/dev-python/cssselect2/Manifest
+++ b/dev-python/cssselect2/Manifest
@@ -1,2 +1,2 @@
-DIST cssselect2-0.4.1.tar.gz 32756 BLAKE2B 86915c39aa5b72ebcdba25b3ac23f59a0fb6c6109019d68e8ce8846572d9412a3cc76cdf9e8b2163605cb942183019eb9170df9a4e61476d703eaf612381a903 SHA512 feafeec3dbe3157ee452d94cd391a09cfcb48ca8bd1563c117c77c9ceb01102c4989611ede39e433ec25d3ddda98a94c4589ccb290b79c729683e673763b42ac
 DIST cssselect2-0.5.0.tar.gz 34918 BLAKE2B 12ec30d42caa916e487674ccb910def00acca3f47b3d9e69f376614b997e68f4dae1632a852efd0b9d47c321534935d029fd96028dce9b11e391402b203fbdbd SHA512 869dbce3915db87727b09016c094b908b0055693db238a24c89b0482fed64d7e1811ad2db407faee32638566fd4e47402f05155dc2d8887e98f2107f9b8633c2
+DIST cssselect2-0.6.0.tar.gz 35442 BLAKE2B eb42c6abed531d9ece07ae5aa442be0c0ca926f982987ede1c5ba3e391950fcf88b1c322da5933842993ad5d98488e2a29aa714d1ca65b672cecbe425bac9bd7 SHA512 10cb55ebaaa16b755d85f1e511ae0281fb017d6937750392ae1da7f32d51ff944fb14c6d1c9ea5f42734450b719157ded116dc14ef471a9a20fcc43fb6682308
diff --git a/dev-python/cssselect2/cssselect2-0.4.1-r1.ebuild b/dev-python/cssselect2/cssselect2-0.6.0.ebuild
index f6dffc014c27..ee5504436122 100644
--- a/dev-python/cssselect2/cssselect2-0.4.1-r1.ebuild
+++ b/dev-python/cssselect2/cssselect2-0.6.0.ebuild
@@ -5,27 +5,28 @@ EAPI=8
 
 DISTUTILS_USE_PEP517=flit
 PYTHON_COMPAT=( python3_{7,8,9,10} )
-
 inherit distutils-r1
 
 DESCRIPTION="Parses CSS3 Selectors and translates them to XPath 1.0"
-HOMEPAGE="https://cssselect2.readthedocs.io/en/latest/
+HOMEPAGE="
+	https://cssselect2.readthedocs.io/en/latest/
 	https://pypi.org/project/cssselect2/
-	https://github.com/Kozea/cssselect2"
+	https://github.com/Kozea/cssselect2/
+"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
 
 RDEPEND="
 	dev-python/tinycss2[${PYTHON_USEDEP}]
-	dev-python/webencodings[${PYTHON_USEDEP}]"
+	dev-python/webencodings[${PYTHON_USEDEP}]
+"
 
 distutils_enable_tests pytest
 
 src_prepare() {
 	sed -i -e '/addopts/d' pyproject.toml || die
-	sed -i -e '2,3s:flit:&_core:' pyproject.toml || die
 	distutils-r1_src_prepare
 }
diff --git a/dev-python/dask/Manifest b/dev-python/dask/Manifest
index b84215db35c4..37299a3435a9 100644
--- a/dev-python/dask/Manifest
+++ b/dev-python/dask/Manifest
@@ -1,2 +1,3 @@
 DIST dask-2022.03.0.gh.tar.gz 8192610 BLAKE2B 1099dac34487dc51b9010746920e64e4e7e4a07bb1f3b82ebe069afdd2f64feccc7c97291a1a4d1fc089cbc6f0b6f40a81fedc96be11f85920558ad305b63641 SHA512 e32b82d76d6b3d1494c32bcec171e3fc09e38b6cc94729b3f82bf0618445e58e4bd5361efb359e5894af2703bdb4f3f100916d4d7fc905faecc9a5262559754a
 DIST dask-2022.04.0.gh.tar.gz 8649475 BLAKE2B 92602e239be8c281ca450eb3fb1dbafea2f5caba12f83cd6d05670431b945dba861d92481f5ec1ec0834ccf35af6658d482b26d25cf16c8b784364adbe7e9ccf SHA512 2abc10a1140ad81a5f6bdc7ff697b899a5410da6dff976c98fb30d32fff625078ebf5ed23b2317c94d293973040b05bf650c02aef2b8c18230bf2841e54c71fa
+DIST dask-2022.04.1.gh.tar.gz 8647138 BLAKE2B 7b53a033e2128d7a9ab738b88b3df4b80526e4a6a9b67e4347d318d137a3d4c9b5ae587b5f73b80c4f8186d98de0877827c6ee2b4c42536ac0bca369ed1b765b SHA512 356a94fad6cf9878b0c1e35b39e0db08a66c0d4c77cfae9fd7542a16b8f86b40475ff466e0dce7228e8930e6c03dc13c4f9df036b3a35806c2bc19525ab2e23f
diff --git a/dev-python/dask/dask-2022.04.1.ebuild b/dev-python/dask/dask-2022.04.1.ebuild
new file mode 100644
index 000000000000..f4f4405ab50c
--- /dev/null
+++ b/dev-python/dask/dask-2022.04.1.ebuild
@@ -0,0 +1,54 @@
+# 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="Task scheduling and blocked algorithms for parallel processing"
+HOMEPAGE="https://dask.org/"
+SRC_URI="
+	https://github.com/dask/dask/archive/${PV}.tar.gz -> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/cloudpickle-0.2.2[${PYTHON_USEDEP}]
+	>=dev-python/fsspec-0.6.0[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.15.1[${PYTHON_USEDEP}]
+	>=dev-python/pandas-0.25.0[${PYTHON_USEDEP}]
+	>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
+	>=dev-python/partd-0.3.10[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-5.3.1[${PYTHON_USEDEP}]
+	>=dev-python/toolz-0.8.2[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/toolz[${PYTHON_USEDEP}]
+	test? (
+		dev-python/moto[${PYTHON_USEDEP}]
+		dev-python/numexpr[${PYTHON_USEDEP}]
+		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
+		dev-python/scipy[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# another test relying on -Werror
+	"dask/array/tests/test_overlap.py::test_map_overlap_no_depth[None]"
+	# TODO
+	dask/array/tests/test_reductions.py::test_mean_func_does_not_warn
+	dask/tests/test_config.py::test__get_paths
+)
+
+python_test() {
+	epytest -p no:flaky -m "not network"
+}
diff --git a/dev-python/flask-compress/Manifest b/dev-python/flask-compress/Manifest
index ac87dffd434a..f655e88ca6ec 100644
--- a/dev-python/flask-compress/Manifest
+++ b/dev-python/flask-compress/Manifest
@@ -1,2 +1 @@
-DIST Flask-Compress-1.10.1.tar.gz 12272 BLAKE2B 857319ea7fabece977429a810706314bc6a7984f2fb4c2ac3ed604fee0494fa60d45ab00a253bf4a3e9394d399f20f23d806744676597b2064bfbbd6f7b11c46 SHA512 fb94aef71f59e38a6058f5ef799c8973d258cf624b1d8bf0a991cac2e4eabb73e2836ce351faa73bc7640720396183212a6dc8d72428b53ceb3473f7b61f0d27
 DIST Flask-Compress-1.11.tar.gz 12322 BLAKE2B c8d1096273a977512eabc9fe642a0fe240c21f10b5828db168dfe952ac5858377fd6906fa93dc3bfd8d888bf8bf70f541b1e5789f1de5e2d0f46565c55e0f9df SHA512 dd2ceca37eee968527f2008e9356f0ab89f2df46e6d874eff38b93a2cf326c9d24433f0adc8dfe7a7b72599a33f8d173f330aefcd4eea8650923a0466959d7fb
diff --git a/dev-python/flask-compress/flask-compress-1.10.1.ebuild b/dev-python/flask-compress/flask-compress-1.10.1.ebuild
deleted file mode 100644
index 2304c70992f0..000000000000
--- a/dev-python/flask-compress/flask-compress-1.10.1.ebuild
+++ /dev/null
@@ -1,27 +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} )
-
-inherit distutils-r1
-
-MY_PN="Flask-Compress"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Compress responses in your Flask app with gzip"
-HOMEPAGE="https://pypi.org/project/Flask-Compress/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	app-arch/brotli[python,${PYTHON_USEDEP}]
-	dev-python/flask[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/flask-security/Manifest b/dev-python/flask-security/Manifest
index dc09a8a88117..89896a834bbe 100644
--- a/dev-python/flask-security/Manifest
+++ b/dev-python/flask-security/Manifest
@@ -1,3 +1,2 @@
 DIST flask-security-3.4.5.gh.tar.gz 348928 BLAKE2B 9890227e9775c4a28fc364affb0bf767407463d514f6dc3cd359dd8a026e8325d943a547f294f6363a276f9e7d97336c526dd45f4549c7cfaff2d6ef9ef0316a SHA512 f9ac7f46b2e1ab7dbb44ba925b01e16304e8f8d6d5d56f4e558d07b80dfffa59f04c2597e17c00a7d7ae11be3a97c78ccf8d79993b7451be4a7f75f85bc89f6f
-DIST flask-security-4.1.2.gh.tar.gz 408120 BLAKE2B a4ec9b0a58368b9c84ee2d5b8b7404adf4a985067fca79e574726efc7cd78f9b713360c7d9d53a29ef6dd2ec7d23b64e50893fd75259a00c2b549a4b2a821936 SHA512 8fd3a0561ccc8dd815483fc8d2863a13fa83dea4cf308972778f99c29f0f7496f95cfac483f1a4cf2f77cd2a728eb09a5f8e8b4147d2749aa0b75f98b752ba36
 DIST flask-security-4.1.3.gh.tar.gz 408609 BLAKE2B ef4b270d62de75fdcf51d1247960df85deca1699fdbfb73592a5711f9bb56f71a2f2de12a8d8c0eccdaccfef11a578cf9bd9abbf52bdacfe4bfc10f9adda0acc SHA512 92a0e7fce95eb4eb04baa9a11ee88ab3b8e88952aa6300bf8245cecfcc90657c83bbe93e1c3b19d62642a346b30f5912dd424e59a81023637f3183a61e8cf91c
diff --git a/dev-python/flask-security/flask-security-4.1.2.ebuild b/dev-python/flask-security/flask-security-4.1.2.ebuild
deleted file mode 100644
index 21d75d123a57..000000000000
--- a/dev-python/flask-security/flask-security-4.1.2.ebuild
+++ /dev/null
@@ -1,62 +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="Simple security for Flask apps"
-HOMEPAGE="
-	https://github.com/Flask-Middleware/flask-security/
-	https://pypi.org/project/Flask-Security-Too/"
-SRC_URI="
-	https://github.com/Flask-Middleware/flask-security/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	>=dev-python/blinker-1.4[${PYTHON_USEDEP}]
-	dev-python/cachetools[${PYTHON_USEDEP}]
-	>=dev-python/flask-1.1.1[${PYTHON_USEDEP}]
-	>=dev-python/flask-babelex-0.9.3[${PYTHON_USEDEP}]
-	>=dev-python/flask-login-0.4.1[${PYTHON_USEDEP}]
-	>=dev-python/flask-principal-0.4.0[${PYTHON_USEDEP}]
-	>=dev-python/flask-wtf-0.14.3[${PYTHON_USEDEP}]
-	>=dev-python/itsdangerous-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/passlib-1.7.2[${PYTHON_USEDEP}]
-	>=dev-python/python-email-validator-1.1.1[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	dev-python/Babel[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/argon2-cffi-19.1.0[${PYTHON_USEDEP}]
-		>=dev-python/bcrypt-3.1.5[${PYTHON_USEDEP}]
-		dev-python/bleach[${PYTHON_USEDEP}]
-		>=dev-python/cryptography-2.3.1[${PYTHON_USEDEP}]
-		>=dev-python/flask-mail-0.9.1[${PYTHON_USEDEP}]
-		>=dev-python/flask-sqlalchemy-2.3[${PYTHON_USEDEP}]
-		>=dev-python/mongomock-3.19.0[${PYTHON_USEDEP}]
-		>=dev-python/peewee-3.11.2[${PYTHON_USEDEP}]
-		>=dev-python/phonenumbers-8.11.1[${PYTHON_USEDEP}]
-		>=dev-python/psycopg-2.8.4:2[${PYTHON_USEDEP}]
-		>=dev-python/pymysql-0.9.3[${PYTHON_USEDEP}]
-		>=dev-python/pyqrcode-1.2[${PYTHON_USEDEP}]
-		>=dev-python/zxcvbn-4.4.28[${PYTHON_USEDEP}]
-		>=dev-python/pony-0.7.11[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e 's@--cache-clear@-p no:httpbin@' pytest.ini || die
-	distutils-r1_src_prepare
-}
-
-python_configure_all() {
-	esetup.py compile_catalog
-}
diff --git a/dev-python/fonttools/fonttools-4.30.0.ebuild b/dev-python/fonttools/fonttools-4.30.0.ebuild
index 8110c225d00f..80f99193ff2c 100644
--- a/dev-python/fonttools/fonttools-4.30.0.ebuild
+++ b/dev-python/fonttools/fonttools-4.30.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/fonttools/fonttools/archive/${PV}.tar.gz -> ${P}.tar
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~ppc ppc64 ~riscv sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~ppc ppc64 ~riscv sparc x86 ~x64-macos"
 
 RDEPEND=">=dev-python/fs-2.4.9[${PYTHON_USEDEP}]"
 BDEPEND="${RDEPEND}
diff --git a/dev-python/google-api-core/Manifest b/dev-python/google-api-core/Manifest
index e61c48d75451..c8ac6a809903 100644
--- a/dev-python/google-api-core/Manifest
+++ b/dev-python/google-api-core/Manifest
@@ -1,2 +1,2 @@
-DIST google-api-core-2.5.0.tar.gz 160336 BLAKE2B 5a3050dcb2e58c068c67cd6263b297ea84e4a47784c750e7ed87077bf46314730698eda2eaa8305a99a55b539b8886dfbbeeb9dc9838748fa941db6785212f36 SHA512 92b570195db21dded50b220e350e518c13101ab3e247bcbb3d3f5701e722c6dc81312443889360fdef1485edf1d5ef486bfeecf56092844cea81b61c7c527728
 DIST google-api-core-2.7.1.tar.gz 163942 BLAKE2B 0b28e8dd8607ed6a64a3715c14e321f74d18abc09bc2eee5c6d080936160ea9d6839f1acf9589667c86a688e4e02038cc204f25d0b7cab3e3ed3af2463f31abb SHA512 2264eec00309f272ecca278e8f310bca4be64cfcec94c05fa96a7a8ae350fce0ae9931fbb27aae71e89393289cdbef782631a6766e85d5aee449e903e70f0817
+DIST google-api-core-2.7.2.tar.gz 164017 BLAKE2B d2f1c690527c750a819718043542ce853be7f135660dfe661db2ba315213ef4a9756eeab6f1854275044d4f1fed50d119c2914eb00e043b7d5b085dad426a26f SHA512 1fb420a41d603d576030d2b324036de10831035ce1505ba94dedc9e58ce354d0f23e1d3df8a4f2f5082147a1be49d93e10c2209a1407f90ffedfa74815730e14
diff --git a/dev-python/google-api-core/google-api-core-2.7.1.ebuild b/dev-python/google-api-core/google-api-core-2.7.1.ebuild
index 6d31f1725649..8bb10f8baa8a 100644
--- a/dev-python/google-api-core/google-api-core-2.7.1.ebuild
+++ b/dev-python/google-api-core/google-api-core-2.7.1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${P//google/python}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 RDEPEND="
 	dev-python/namespace-google[${PYTHON_USEDEP}]
diff --git a/dev-python/google-api-core/google-api-core-2.5.0.ebuild b/dev-python/google-api-core/google-api-core-2.7.2.ebuild
index 8bb10f8baa8a..152433cc3df7 100644
--- a/dev-python/google-api-core/google-api-core-2.5.0.ebuild
+++ b/dev-python/google-api-core/google-api-core-2.7.2.ebuild
@@ -16,18 +16,15 @@ S="${WORKDIR}/${P//google/python}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 
 RDEPEND="
-	dev-python/namespace-google[${PYTHON_USEDEP}]
 	dev-python/protobuf-python[${PYTHON_USEDEP}]
 	dev-python/googleapis-common-protos[${PYTHON_USEDEP}]
 	>=dev-python/google-auth-1.25.0[${PYTHON_USEDEP}]
 	>=dev-python/requests-2.18.0[${PYTHON_USEDEP}]
 	<dev-python/requests-3[${PYTHON_USEDEP}]
 "
-# grpcio support is broken if grpcio-status is not installed,
-# and we do not package the latter
 BDEPEND="
 	test? (
 		dev-python/mock[${PYTHON_USEDEP}]
@@ -47,12 +44,9 @@ EPYTEST_DESELECT=(
 	tests/asyncio/test_grpc_helpers_async.py::test_wrap_stream_errors_aiter
 	tests/asyncio/test_grpc_helpers_async.py::test_wrap_stream_errors_write
 	tests/unit/test_grpc_helpers.py::test_wrap_unary_errors
-	tests/unit/test_grpc_helpers.py::Test_StreamingResponseIterator::test___next___w_rpc_error
 	tests/unit/test_grpc_helpers.py::test_wrap_stream_errors_invocation
 	tests/unit/test_grpc_helpers.py::test_wrap_stream_errors_iterator_initialization
 	tests/unit/test_grpc_helpers.py::test_wrap_stream_errors_during_iteration
-	# TODO
-	tests/unit/test_operation.py::test_exception_with_error_code
 )
 
 python_compile() {
@@ -60,6 +54,12 @@ python_compile() {
 	find "${BUILD_DIR}" -name '*.pth' -delete || die
 }
 
+src_test() {
+	rm -r google || die
+	distutils-r1_src_test
+}
+
 python_test() {
-	epytest -p no:aiohttp -p no:trio
+	distutils_write_namespace google
+	epytest -p no:aiohttp -p no:trio tests
 }
diff --git a/dev-python/google-api-python-client/Manifest b/dev-python/google-api-python-client/Manifest
index 512ee2e88b55..effffbfba768 100644
--- a/dev-python/google-api-python-client/Manifest
+++ b/dev-python/google-api-python-client/Manifest
@@ -1,4 +1,3 @@
-DIST google-api-python-client-2.38.0.tar.gz 29194978 BLAKE2B 741cf925256f0bd648e68c339233cfc13a9eaa12e123e202eab64b8389bc493755838c3da8ca4e7f4ffeecacec783c41f37df1847edf0fb54387d58163c112fc SHA512 b93f1f946ebab226b9fdd9012c3ae70563197a895d9069f09c7eb8926cd8fe5567535d3677a6824f66720b9ed1f0a732f02be9440dc800a13cb7e335728a3ce8
 DIST google-api-python-client-2.41.0.tar.gz 29608471 BLAKE2B 5a6f9eb414f02b9528d0ee8f8777da6596bd298f6aea8191966d1ebaa67219f8ea2e44a77bc667bfedab39c4ab0352a13ba04fd805f0df9a6936247cd4cf3481 SHA512 b9ee6a4374438d019d0efd09d02426c1c773fd2ca561e2bf91e426535fec2865a47a32cc5cf780e5e7da193ca3d8b5677339fee2a4983e7f4af9612d901c883d
 DIST google-api-python-client-2.42.0.tar.gz 29772877 BLAKE2B f478a719c3a6ef2f78d1fa16c231d47f2d72b55e67746612579f644b92dbd93ebd7f320f0684d85c1c1e253ed2f5163d7f6ce2904343bbe7a4f6746889663970 SHA512 e55cd75dec478a3410829a7eb7ee5478b52b44450d4ade69e3a7ee11b30e5ab5690c93ff6444f4b723db6cd1f26ac70553b3f1b9c77dc0b428db271b773faa9f
 DIST google-api-python-client-2.43.0.tar.gz 29820752 BLAKE2B d0f7337f2d63d9db2da3526670a5f034103cb1b2e3eefcc77fea6d15258d185c06c238662de6d304e73b4f9ea25f8b202386eae8b7b94d7c52ad2b6c15d2ea76 SHA512 0e59f22b0c03d1b29247219e39a83bf6b637afe3eddfa302ecd34acc30bebb850f771e4b7b5c24e5a607ddd74ef6833fe0597465776d00675ed868612ebd1d70
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.38.0-r1.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.38.0-r1.ebuild
deleted file mode 100644
index 2c521e961fcb..000000000000
--- a/dev-python/google-api-python-client/google-api-python-client-2.38.0-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# 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="Google API Client for Python"
-HOMEPAGE="https://github.com/googleapis/google-api-python-client"
-SRC_URI="https://github.com/googleapis/google-api-python-client/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-RDEPEND="
-	>=dev-python/httplib2-0.15[${PYTHON_USEDEP}]
-	<dev-python/httplib2-1[${PYTHON_USEDEP}]
-	dev-python/google-api-core[${PYTHON_USEDEP}]
-	>=dev-python/google-auth-1.35.0[${PYTHON_USEDEP}]
-	>=dev-python/google-auth-httplib2-0.1.0[${PYTHON_USEDEP}]
-	>=dev-python/uritemplate-3.0.0[${PYTHON_USEDEP}]
-	<dev-python/uritemplate-5[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/oauth2client[${PYTHON_USEDEP}]
-		dev-python/pandas[${PYTHON_USEDEP}]
-		dev-python/parameterized[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# require Internet access (and credentials)
-		tests/test_discovery.py::DiscoveryErrors::test_credentials_and_credentials_file_mutually_exclusive
-		tests/test_discovery.py::DiscoveryFromDocument::test_api_endpoint_override_from_client_options_mapping_object
-	)
-
-	epytest tests
-}
diff --git a/dev-python/google-auth/Manifest b/dev-python/google-auth/Manifest
index 4b5805f41fb9..5f9a4a40bb1d 100644
--- a/dev-python/google-auth/Manifest
+++ b/dev-python/google-auth/Manifest
@@ -2,3 +2,4 @@ DIST google-auth-2.6.0.tar.gz 188477 BLAKE2B 19baf9ec41e2b8667b8800687f4920d0e53
 DIST google-auth-2.6.2.tar.gz 189490 BLAKE2B 5506b4d316a40274cd8ce0cea8c6a76b882e14f4f7e28f5a50e67c8828353d3078f713f874e36ba4c81537228325cf19c7ea1c3040b04d4b6338e456a8622024 SHA512 196bcec8f90ddc7ba95f03576f496aab38526c2305d729db806f07c0b44e578c6bfcb3a79224f4edaacb8760a3c7bb17a0af90cb2986aff3fdc5f767328fb247
 DIST google-auth-2.6.3.tar.gz 189685 BLAKE2B 68718ce4031c4e764dcfec19361b034ed5e1efa602d5c734b61a853020f40aaa856f9d9a3b964470e148fbfcb081dbc7d2c8bf0a53fc843d9360dbc72623bcdf SHA512 cba3228dbc0887c127d50cc45eb134e3a0b2bea044b8a1e65807918a3808e550fd58217a236c07b6cb908e5a080d9c1c1a2e9ee1853968d8c0bd50b7228ea262
 DIST google-auth-2.6.4.tar.gz 189668 BLAKE2B fe1f660c80095bae4772c78e223f8ba2be1ee749f4571249236fee84abd9a165d08c1acb5dad4ee61accd86c5b60c66befb24c9cbc5665b95bc587dddf99ecb7 SHA512 616004ad945e88dd9561abfcb29c69a0ade5163d6175191bf9421a2d59620a042ae352d833fc20e5f31e20b929dda391a35aa2d391b17af221bc4044f82663f9
+DIST google-auth-2.6.5.tar.gz 189699 BLAKE2B 2a18c25e13a48562aaa5d7524857343928f35ecec4a11a85e50f022acc6d2e90bc1e604c7ed1a4141ace4af830ceb466ef71e4678d7fbb5fb0fe9407d9de544d SHA512 f5b63b879348d86b7d840a188435c444e2b35dd3e7421c284092bfd9421ed2ff1a7584ffc2359195a2e3f9e99903b8b59fe2833559a1c1ccc429f5c363142cc4
diff --git a/dev-python/google-auth/google-auth-2.6.5.ebuild b/dev-python/google-auth/google-auth-2.6.5.ebuild
new file mode 100644
index 000000000000..c685c7ed35a5
--- /dev/null
+++ b/dev-python/google-auth/google-auth-2.6.5.ebuild
@@ -0,0 +1,57 @@
+# 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="Google Authentication Library"
+HOMEPAGE="
+	https://github.com/googleapis/google-auth-library-python/
+	https://pypi.org/project/google-auth/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	<dev-python/cachetools-6.0.0[${PYTHON_USEDEP}]
+	>=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
+	>=dev-python/pyasn1-modules-0.2.1[${PYTHON_USEDEP}]
+	>=dev-python/rsa-3.1.4[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/cryptography[${PYTHON_USEDEP}]
+		dev-python/flask[${PYTHON_USEDEP}]
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/grpcio[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/moto[${PYTHON_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		dev-python/pytest-localserver[${PYTHON_USEDEP}]
+		dev-python/pyu2f[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/responses[${PYTHON_USEDEP}]
+		dev-python/urllib3[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_IGNORE=(
+	# these are compatibility tests with oauth2client
+	# disable them to unblock removal of that package
+	tests/test__oauth2client.py
+)
+
+python_compile() {
+	distutils-r1_python_compile
+	find "${BUILD_DIR}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/gpep517/gpep517-3.ebuild b/dev-python/gpep517/gpep517-3.ebuild
index 6af9bd079910..07049e1da34c 100644
--- a/dev-python/gpep517/gpep517-3.ebuild
+++ b/dev-python/gpep517/gpep517-3.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	>=dev-python/installer-0.5.0[${PYTHON_USEDEP}]
diff --git a/dev-python/graph-tool/graph-tool-2.44.ebuild b/dev-python/graph-tool/graph-tool-2.44-r1.ebuild
index 402d50ad2c42..e30e2dbde51b 100644
--- a/dev-python/graph-tool/graph-tool-2.44.ebuild
+++ b/dev-python/graph-tool/graph-tool-2.44-r1.ebuild
@@ -34,6 +34,7 @@ RDEPEND="
 	cairo? (
 		dev-cpp/cairomm:0
 		dev-python/pycairo[${PYTHON_USEDEP}]
+		x11-libs/cairo[X]
 	)"
 DEPEND="${RDEPEND}
 	dev-cpp/sparsehash"
diff --git a/dev-python/graph-tool/graph-tool-9999.ebuild b/dev-python/graph-tool/graph-tool-9999.ebuild
index 402d50ad2c42..e30e2dbde51b 100644
--- a/dev-python/graph-tool/graph-tool-9999.ebuild
+++ b/dev-python/graph-tool/graph-tool-9999.ebuild
@@ -34,6 +34,7 @@ RDEPEND="
 	cairo? (
 		dev-cpp/cairomm:0
 		dev-python/pycairo[${PYTHON_USEDEP}]
+		x11-libs/cairo[X]
 	)"
 DEPEND="${RDEPEND}
 	dev-cpp/sparsehash"
diff --git a/dev-python/graphviz/Manifest b/dev-python/graphviz/Manifest
index d3ca355b52cf..24f2c1e30ca1 100644
--- a/dev-python/graphviz/Manifest
+++ b/dev-python/graphviz/Manifest
@@ -1,2 +1,3 @@
 DIST graphviz-0.19.1.zip 247779 BLAKE2B c0b226c2ae66f8b583a30cf2842b8cfdecd926f0e7f32fbbfb4dae17ce14792d0af8d8cf6de53cc9a7facdeb8b0a4a078b962eabf64460e1fd42dd995e069428 SHA512 3aa078887458d7bcd173c46ee6e4d8dbdae0c9103755e61e5a027c18e5d8913990aa16a595e80228607c17db1aa9dffdb93e264cafafc8b6318bc3a87547bc5d
 DIST graphviz-0.19.2.zip 248057 BLAKE2B 40fbbeea1f347f3843898c088f3c1ee81eee321aeaaa4bf42d97343d6527a4d43a207bd2e6a5833b04aa50c8be2e58ba77ec99147dfcf22a9eefed733afc0cc8 SHA512 a1dc396bc0b0572a952365d7b22df46fc99a5f081ec02e774d0efa9113c4aa5ca5005855221554cdc96d90997d9efff43b80e1dd858622889afd26d44fbc3671
+DIST graphviz-0.20.zip 255452 BLAKE2B 0bafa3af9d712e30bd6777d55d54c5a8055f8ad4c6e6ee8c9f936a5abf6e025d7179b2b72e9e0926378ae30e9b655d08507e815c67944123c6c222ecbcd4939d SHA512 8b30ac09913ec5860cf26cfc9e008b0feeda8d61274e346ec305087468b655ace115ff28e0ab96eb47d97127410213729d1131dd635771dcaedfae0bae0ca178
diff --git a/dev-python/graphviz/graphviz-0.20.ebuild b/dev-python/graphviz/graphviz-0.20.ebuild
new file mode 100644
index 000000000000..2d5e626d1269
--- /dev/null
+++ b/dev-python/graphviz/graphviz-0.20.ebuild
@@ -0,0 +1,42 @@
+# 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="Simple Python interface for Graphviz"
+HOMEPAGE="https://graphviz.readthedocs.io/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+SLOT="0"
+
+RDEPEND="
+	media-gfx/graphviz
+"
+BDEPEND="
+	app-arch/unzip
+	test? (
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/pytest-mock-1.8[${PYTHON_USEDEP}]
+		media-gfx/graphviz[gts,pdf]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -e 's:--cov --cov-report=term --cov-report=html::' \
+		-i setup.cfg || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	"${EPYTHON}" run-tests.py -vv -ra -l -Wdefault -p no:xdoctest ||
+		die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/gsd/Manifest b/dev-python/gsd/Manifest
index dd4613acd102..7e943548d5fc 100644
--- a/dev-python/gsd/Manifest
+++ b/dev-python/gsd/Manifest
@@ -1 +1,2 @@
 DIST gsd-v2.5.0.tar.gz 105537 BLAKE2B dbd9cef142405bae4e99c180f6b7c65cb60240fe45e200643b8efd388c72830a70d97c649fdb686afeed4eb44386cbe68165ed105bd67424f1cbd3657159c16a SHA512 f5eda751bdfa4d3eae980029fe5594fc5698d68265784f089b0997441c18f58d70d71cf52a0b4fd208708aba0162164d1f640440964b6e211db856f10c7c0c67
+DIST gsd-v2.5.2.tar.gz 105448 BLAKE2B 408e66a91ea056e8c863e23dae439009e5f802f38d5e2a3b89bbb07c574ad61827fa9c2767729c37dcc8fa7ecb1fc3be922755da0ac0dc922ead2a365ce66a10 SHA512 2a2afb56b9f836608523b2946a0d2ca94511457506d02038d496b374ccb96dc0daad6435f9ee63b0937837b725d6288325c066d75d2ac0b0c6d9da4beb9eb082
diff --git a/dev-python/gsd/gsd-2.5.2.ebuild b/dev-python/gsd/gsd-2.5.2.ebuild
new file mode 100644
index 000000000000..dbb837a4a7cb
--- /dev/null
+++ b/dev-python/gsd/gsd-2.5.2.ebuild
@@ -0,0 +1,29 @@
+# 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
+
+MY_P=${P/-/-v}
+DESCRIPTION="GSD - file format specification and a library to read and write it"
+HOMEPAGE="https://github.com/glotzerlab/gsd"
+SRC_URI="https://github.com/glotzerlab/gsd/releases/download/v${PV}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-python/numpy[${PYTHON_USEDEP}]"
+RDEPEND=${DEPEND}
+BDEPEND="dev-python/cython[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+python_test() {
+	cd "${T}" || die
+	epytest --pyargs gsd
+}
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index caeab0c831cf..f29c979ad3f8 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -4,3 +4,4 @@ DIST hypothesis-python-6.42.2.tar.gz 9187457 BLAKE2B ee191bed48db8984a1adb14fb65
 DIST hypothesis-python-6.42.3.tar.gz 9187948 BLAKE2B 3303cea4e8f2776f14defd88dcc2578f11e30bd5842a2cddf96478e31505d38f801a92e031e76070684befb2a9d63713f44b73eea7152e0bdc6cc0d16e25c08c SHA512 869e81b46da7786cc4ca981da56c916922a73fd129dc1f156d062343e40a9b74888bdda17ef2c95e6c3102dc762f7cf587d1aad4ba3b8138060990d2987a0bd1
 DIST hypothesis-python-6.43.0.tar.gz 9188330 BLAKE2B db237962b3c16c223fb49fff4c0c2e175f1969ce01c4ded3be3bcad0ff78c928f109016da58a4e9512e0d8fc3ea5ce9836732d00c74acc3ecd185ca1030849c1 SHA512 c1c3bda72cbe4f29be957d21682be1d1973f74afdf4adf95f388f05e4230781b16fb0004720620368b9aec4aa0623c4f79b7f3df16c37fbe9e812bb70a065af1
 DIST hypothesis-python-6.43.1.tar.gz 9188557 BLAKE2B 4dd3108c6162fb5b2a8f283e5499468b6a7ba3edb45cf6886d15cde5b6ee2ca6402c372d65f0576c4bba488d1e99f501bd61e8c26c0d887f716542287fe80a32 SHA512 9d01d4fd14d44445cc88e7eac28b2ce4555488fc87eccbb7739d97e23c42f608891532c17ef15c399d515f4b1856541c84f205630b3f5ba30ba7427774fcf2c1
+DIST hypothesis-python-6.43.2.tar.gz 9189222 BLAKE2B 4af4dc59198878b08973366483e6be9d23c96942e83e8d19e1a77b26ba532bdc114224de1daf23b0162cef0844b240bb12da0ffdb4d86e13b448e768cdeb6485 SHA512 903857aa730615067309557e6d03ae083a05bf0d53285c6a48d8269239e88e0a261b711477a7de5349b2606e53ece8cf50679f0a0c58accdd64e18d1cd3f2b9d
diff --git a/dev-python/hypothesis/hypothesis-6.43.2.ebuild b/dev-python/hypothesis/hypothesis-6.43.2.ebuild
new file mode 100644
index 000000000000..d09b69112221
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-6.43.2.ebuild
@@ -0,0 +1,65 @@
+# 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(+),sqlite"
+
+inherit distutils-r1 multiprocessing optfeature
+
+DESCRIPTION="A library for property based testing"
+HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
+SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar.gz"
+S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+IUSE="cli"
+
+RDEPEND="
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
+	cli? (
+		$(python_gen_cond_dep '
+			dev-python/black[${PYTHON_USEDEP}]
+			dev-python/click[${PYTHON_USEDEP}]
+		' python3_{8..10})
+	)
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	# subtests are broken by warnings from random plugins
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=xdist.plugin,pytest_forked,_hypothesis_pytestplugin
+
+	epytest tests/cover tests/pytest tests/quality \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+}
+
+python_install() {
+	distutils-r1_python_install
+	if ! use cli || ! has "${EPYTHON}" python3.{8..10}; then
+		rm -r "${ED}/usr/bin" "${D}$(python_get_scriptdir)" || die
+	fi
+}
+
+pkg_postinst() {
+	optfeature "datetime support" dev-python/pytz
+	optfeature "dateutil support" dev-python/python-dateutil
+	optfeature "numpy support" dev-python/numpy
+	optfeature "django support" dev-python/django dev-python/pytz
+	optfeature "pandas support" dev-python/pandas
+	optfeature "pytest support" dev-python/pytest
+}
diff --git a/dev-python/importlib_resources/Manifest b/dev-python/importlib_resources/Manifest
index b602c8993aa7..aee4543e3e0e 100644
--- a/dev-python/importlib_resources/Manifest
+++ b/dev-python/importlib_resources/Manifest
@@ -1,3 +1,4 @@
 DIST importlib_resources-5.4.0.tar.gz 30554 BLAKE2B f5be47cb63813aea15f65d251115cf398f695041871fdf6e8885fee11d9a9d7a2fbfd07efd494bd7c91077f99ab871e06d45f49de9f7e501a1691601206bfb55 SHA512 9262c185bdf79fad0a11caabc5c5df836702a74e140a9f60ace857e3f6a60fdb091639b2fb7129b17bad5a46968f43dda7d176fe39af495370dd31f04891fb1b
 DIST importlib_resources-5.6.0.tar.gz 30846 BLAKE2B 9a83554cd65b7851c4a8c977509f3fc255de3c5927661764e702eeae142b7d0cc75f809fe2a438b6f3acdb2facbdc3dadbf3f9dfed5615643dc15e04545dcf8c SHA512 d3c88dd5f1877b205b4c53ab9c8d4180ae87be0ff9dd11483024de40c84fe7da359f70337aeacc5df3b6deca88b903bb01850da8a54fd057e4174806ae767deb
 DIST importlib_resources-5.7.0.tar.gz 31185 BLAKE2B eefdc2380b580c274391369eb7a0432f74987a140a9a2eab2c43756148c1982ffa6f91ddad69992b85f88efdb5d22a40f0f95abd4e12de06be7d3d9ecd237579 SHA512 671395701ab96b8a4985f33470cfe2eea58fb60ca04d9763307958f08c535cdfee62b6532c33e24aa851b872e61498d169b4882788b9b829ba9549c84554f6fb
+DIST importlib_resources-5.7.1.tar.gz 31272 BLAKE2B 3e30117ae4f18a9f2151b5435428f3853664ce291d2d4ce9490d1a3043ca5ce2e80cf04d7dcef71ebdaba8bbad17ee61bb47303637a8bee73a2263853b65293b SHA512 8fd89dfcea4112d26418bcfa522de36c2136a50d07470ac8de18f62bb7bb964a459534554802b1455996ae65796018bea806a592746c1d2717f1313608cf4918
diff --git a/dev-python/importlib_resources/importlib_resources-5.7.1.ebuild b/dev-python/importlib_resources/importlib_resources-5.7.1.ebuild
new file mode 100644
index 000000000000..c0d803e7589e
--- /dev/null
+++ b/dev-python/importlib_resources/importlib_resources-5.7.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
+EAPI=7
+
+DISTUTILS_USE_PEP517=flit
+# This is a backport of Python 3.9's importlib.resources
+PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Read resources from Python packages"
+HOMEPAGE="https://github.com/python/importlib_resources"
+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 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		>=dev-python/zipp-3.7.0-r1[${PYTHON_USEDEP}]
+	' 3.8 3.9)"
+
+distutils_enable_tests unittest
+distutils_enable_sphinx docs dev-python/rst-linker dev-python/jaraco-packaging
+
+src_configure() {
+	grep -q 'build-backend = "setuptools' pyproject.toml ||
+		die "Upstream changed build-backend, recheck"
+	# write a custom pyproject.toml to ease setuptools bootstrap
+	cat > pyproject.toml <<-EOF || die
+		[build-system]
+		requires = ["flit_core >=3.2,<4"]
+		build-backend = "flit_core.buildapi"
+
+		[project]
+		name = "importlib_resources"
+		version = "${PV}"
+		description = "Read resources from Python packages"
+	EOF
+}
diff --git a/dev-python/indexed_gzip/Manifest b/dev-python/indexed_gzip/Manifest
index 336034b66ccb..a9c5f0491a55 100644
--- a/dev-python/indexed_gzip/Manifest
+++ b/dev-python/indexed_gzip/Manifest
@@ -1 +1,2 @@
+DIST indexed_gzip-1.6.13.tar.gz 102730 BLAKE2B 8ab5490c3c830121ce3104c624fe36cb0064f6265b5e5f9ebd6efb0402c33e206b4d97c35803fa10fdbc25a7ccac61f19b2fd9bfb205e07acee40737d6404659 SHA512 de8a606f712a0bddf618cedac12d2b5613e14aaaacc93d1930352101bdeaca8bd5126dd67df36d691f31bc27d553a61901934bbb0b2514e4360c6cd49e395c41
 DIST indexed_gzip-1.6.4.tar.gz 101683 BLAKE2B 01d34b33f8d6a623f92bd3f6751303b32f3834e9fb7849b13b82080eeaa91bb29fa38e45287256b6946ecafae7fd000f0cd12f004662eb2e5ad9f31be7378505 SHA512 b7b804c99c560f939a165fdd6d4b881fab2dd2664cecf88f9d9dba46c389efa4839dfbffd19a1a30b801e2fde43580279ea2adab5fd0bbb379ad77c568f8d6b9
diff --git a/dev-python/indexed_gzip/indexed_gzip-1.6.13.ebuild b/dev-python/indexed_gzip/indexed_gzip-1.6.13.ebuild
new file mode 100644
index 000000000000..023f2d36b7dc
--- /dev/null
+++ b/dev-python/indexed_gzip/indexed_gzip-1.6.13.ebuild
@@ -0,0 +1,50 @@
+# 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="Fast random access of gzip files in Python"
+HOMEPAGE="
+	https://pypi.org/project/indexed-gzip/
+	https://github.com/pauldmccarthy/indexed_gzip/
+"
+SRC_URI="
+	https://github.com/pauldmccarthy/indexed_gzip/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz
+"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	sys-libs/zlib:=
+"
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	test? (
+		dev-python/numpy[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_compile() {
+	if use test; then
+		export INDEXED_GZIP_TESTING=1
+	fi
+	distutils-r1_src_compile
+}
+
+python_test() {
+	cd "${BUILD_DIR}/install$(python_get_sitedir)/indexed_gzip/tests" || die
+	epytest
+}
diff --git a/dev-python/josepy/Manifest b/dev-python/josepy/Manifest
index 2c23eee22357..b7d48b5be013 100644
--- a/dev-python/josepy/Manifest
+++ b/dev-python/josepy/Manifest
@@ -1,2 +1 @@
-DIST josepy-1.12.0.tar.gz 59205 BLAKE2B 3ead71c2eb60a9bcc45615f85435f616bf6fe16c75d7e34ae5bd0f418b5b71b6ea03388198a371765e497aa29419efd9fbb2615d4546a5a8a9704acf7c9a70dd SHA512 7a5257d4a75feed65ff3abfd472e8f1c9cc81b62e27365d776d0f25e1efd94ae46374060ea463b9f04fe5e9577672bf2ab8dc8d6371cb8d01a4765921930e01b
 DIST josepy-1.13.0.tar.gz 59045 BLAKE2B e4f3caed3be0775a49d6a9c38bf6e2b61ecc50b4e3804afa9e597b741821ab63a27fe95d1592531fee7152e2076760d838f4efa50ab8b3e2f1e129c9d7457f8c SHA512 fb91946ac4bbb2a81195d200e4fdf06d40865b345005ab4ee328fd72545da2345b44c5b9ffb3115b16ffed65ab3a0c01d5b20d0d2ff3c2c2af30537a6a4721df
diff --git a/dev-python/josepy/josepy-1.12.0.ebuild b/dev-python/josepy/josepy-1.12.0.ebuild
deleted file mode 100644
index a3e20e0b06bb..000000000000
--- a/dev-python/josepy/josepy-1.12.0.ebuild
+++ /dev/null
@@ -1,30 +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} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="JOSE protocol implementation in Python"
-HOMEPAGE="https://github.com/certbot/josepy"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/cryptography-0.8[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# Remove coverage/flake8 options
-	sed -i -e '/^addopts =/d' -e '/^flake8-ignore/d' pytest.ini || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/jupyter/jupyter-1.0.0-r3.ebuild b/dev-python/jupyter/jupyter-1.0.0-r3.ebuild
deleted file mode 100644
index c5ad9466408a..000000000000
--- a/dev-python/jupyter/jupyter-1.0.0-r3.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Jupyter metapackage. Install all the Jupyter components in one go"
-HOMEPAGE="https://jupyter.org"
-SRC_URI="
-	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
-	https://patch-diff.githubusercontent.com/raw/jupyter/jupyter/pull/198.patch -> ${P}-file-colision.patch
-	"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	dev-python/notebook[${PYTHON_USEDEP}]
-	dev-python/qtconsole[${PYTHON_USEDEP}]
-	dev-python/jupyter_console[${PYTHON_USEDEP}]
-	dev-python/nbconvert[${PYTHON_USEDEP}]
-	dev-python/ipykernel[${PYTHON_USEDEP}]
-	dev-python/ipywidgets[${PYTHON_USEDEP}]"
-PDEPEND=">=dev-python/jupyter_core-4.2.0[${PYTHON_USEDEP}]"
-
-distutils_enable_sphinx docs/source dev-python/sphinx_rtd_theme
-
-PATCHES=( "${DISTDIR}"/${P}-file-colision.patch )
-
-python_prepare_all() {
-	# Prevent un-needed download during build
-	if use doc; then
-		sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/source/conf.py || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/jupyter_console/Manifest b/dev-python/jupyter_console/Manifest
index 4eb8b25d81f8..a0d0b7e97004 100644
--- a/dev-python/jupyter_console/Manifest
+++ b/dev-python/jupyter_console/Manifest
@@ -1,2 +1 @@
-DIST jupyter_console-6.4.0.tar.gz 35765 BLAKE2B 48278110338184dbcae242a059c3ba7e0c642d24eaac828786ff9f3c588747f447727a8da1d366ed305eeb5d003d4fabd9b9eea063e8fd5178774108cbef77da SHA512 e2b301cfd3a56ee4cf33d5cfb297726d0f4478562167ed0f0a9320d389118fa661a85b6a5ef24db60673a76d84545bcdb9741bfdd9f8d13ccdbbc5c5e52d7227
 DIST jupyter_console-6.4.3.tar.gz 35432 BLAKE2B 57af0ccba4730e445972a937e9e103695dc33387c5aa15239416c280f79259963119a3485526d00beb92b7b11c579f68542dcbac39e0d625b3a592a82e8bdcbb SHA512 6b8f9be62efdac9d8a17367e169f8f73c3d7ee2783692ea380853a886d228957cad03095a2aa165a1ace3440c340e2939c1044c85fa3f5e1e2d1f48919e562da
diff --git a/dev-python/jupyter_console/jupyter_console-6.4.0.ebuild b/dev-python/jupyter_console/jupyter_console-6.4.0.ebuild
deleted file mode 100644
index cc830650bb42..000000000000
--- a/dev-python/jupyter_console/jupyter_console-6.4.0.ebuild
+++ /dev/null
@@ -1,33 +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} )
-
-inherit distutils-r1
-
-DESCRIPTION="A terminal-based console frontend for Jupyter kernels"
-HOMEPAGE="https://jupyter.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	dev-python/ipython[${PYTHON_USEDEP}]
-	dev-python/ipykernel[${PYTHON_USEDEP}]
-	dev-python/jupyter_client[${PYTHON_USEDEP}]
-	<dev-python/prompt_toolkit-3.1.0[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]"
-# util-linux provides script(1)
-BDEPEND="
-	test? (
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		sys-apps/util-linux
-	)"
-
-distutils_enable_sphinx docs \
-	dev-python/sphinxcontrib-github-alt dev-python/sphinx_rtd_theme
-distutils_enable_tests pytest
diff --git a/dev-python/jupyter_console/jupyter_console-6.4.3.ebuild b/dev-python/jupyter_console/jupyter_console-6.4.3.ebuild
index c9d6ae613713..8ac842ffdaa5 100644
--- a/dev-python/jupyter_console/jupyter_console-6.4.3.ebuild
+++ b/dev-python/jupyter_console/jupyter_console-6.4.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	dev-python/ipython[${PYTHON_USEDEP}]
diff --git a/dev-python/jupyterlab_pygments/Manifest b/dev-python/jupyterlab_pygments/Manifest
index ca067225840d..b675c068a17e 100644
--- a/dev-python/jupyterlab_pygments/Manifest
+++ b/dev-python/jupyterlab_pygments/Manifest
@@ -1,3 +1,4 @@
 DIST jupyterlab_pygments-0.1.2.tar.gz 561989 BLAKE2B 85d6b59b2c959f838746c7c6fed99ad5adda89a514a77327cc8e9ba7d6a91b1c0206d999c09149e6c5b9c67911ca16914f0b17a67b3505db73c23a7194fe4566 SHA512 0b4f4c13017f8afbd83e9fb575b3c4ee44272bc01421761ae7b140ecab743d825aa195432caa5f6153bda0ef84fe3ab92dad61ffd9b048927736a916dd267b5a
 DIST jupyterlab_pygments-0.2.0.tar.gz 132386 BLAKE2B db2b1677227fc1817769aaabd7f9e559871b13a9f937e76f5912a6e99fd186b19ce136712a01c8cd6db2b246fd2e7176b897164c9084781a59eb5f72c21577a1 SHA512 0ac05c3f31e554c51e889c4bf4af6ba3f787ef152a7a7e1862ff9dc46d89418bc3567c57e42b30f3134f1b56cc9c31a6d96ef76905fdb6ee39decfa8cf388ca6
 DIST jupyterlab_pygments-0.2.1.tar.gz 144325 BLAKE2B ee3f9d9789652ee7226cff550505113a7e5f779bbf58405d699bad44455e7448b16cdf607515528f7240dbb5008b0a3b8502c23caa842bf731b5e6a54bbcf7c7 SHA512 746b490cffba3fce133d09e209939f45d7080b778d9c78feeaeb4ca4e7ba34668499bdc7ab4c70a972caa1ed4b53e0e5d788802478c6047d93b577e618214027
+DIST jupyterlab_pygments-0.2.2.tar.gz 132378 BLAKE2B a9db4c3bfea9e8e6f357c90e9b1861cf2bcb796fe5d7ea9a0f02677773b18dd5a02966d8555cd17e8314b283056ac9423948077d6cdc127985f34a5faf892ec1 SHA512 59d328522b11ecae6ae67ef8f9eb7168b0e4241cc6a68765096bf0ad26a20489f302179d50e7e46efd5b9de711520e2c67ab1e634cc583416277a98a5f663daa
diff --git a/dev-python/jupyterlab_pygments/jupyterlab_pygments-0.2.2.ebuild b/dev-python/jupyterlab_pygments/jupyterlab_pygments-0.2.2.ebuild
new file mode 100644
index 000000000000..fce3dd219c48
--- /dev/null
+++ b/dev-python/jupyterlab_pygments/jupyterlab_pygments-0.2.2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=jupyter
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Pygments theme making use of JupyterLab CSS variables"
+HOMEPAGE="
+	https://pypi.org/project/jupyterlab-pygments/
+	https://github.com/jupyterlab/jupyterlab_pygments/
+"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/pygments[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/kiwisolver/kiwisolver-1.4.1.ebuild b/dev-python/kiwisolver/kiwisolver-1.4.1.ebuild
index c5e9bb1bd33f..a53e97418b3d 100644
--- a/dev-python/kiwisolver/kiwisolver-1.4.1.ebuild
+++ b/dev-python/kiwisolver/kiwisolver-1.4.1.ebuild
@@ -18,7 +18,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Clear-BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	>=dev-python/cppy-1.2.0[${PYTHON_USEDEP}]
diff --git a/dev-python/ldap3/Manifest b/dev-python/ldap3/Manifest
index b169435b6844..7d126e8b7f6a 100644
--- a/dev-python/ldap3/Manifest
+++ b/dev-python/ldap3/Manifest
@@ -1,2 +1 @@
-DIST ldap3-2.8.1.tar.gz 961648 BLAKE2B d6cbc52512efbe4f6fe5e7d19ee2ce1af3e03a8d6d08d2235eeff0f00c61fd12583c4b9fb452206ba161961c3438d109fa106a50a0edc858c24f5cd6261b2561 SHA512 f37e76e1008c990290285a757def6fe70e227393fbbdf84eb1130d5fdfd17db724c544848cc424ca7831f8cc9e8d25407fc139981ebd10818064f588adbafebf
 DIST ldap3-2.9.1.tar.gz 974013 BLAKE2B a75219403e68705b10c06e692f4f188575a4ae38c86f15ceb6d2c674e74ac44ce0f53e3ec6bf66e8413007589293e2db95497de7b0317066b36105940beb11bf SHA512 bf07ebca9a53a8c225bc3106d3bd45eb26557c6e5a3d6d45a7f8c149d938ad43825eed0d406a57b93e2e675ed7aa262828f022ab82eb683f0e3029e3ad823106
diff --git a/dev-python/ldap3/ldap3-2.8.1.ebuild b/dev-python/ldap3/ldap3-2.8.1.ebuild
deleted file mode 100644
index f9373ce3ac31..000000000000
--- a/dev-python/ldap3/ldap3-2.8.1.ebuild
+++ /dev/null
@@ -1,26 +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="A strictly RFC 4511 conforming LDAP V3 pure Python client"
-HOMEPAGE="
-	https://github.com/cannatag/ldap3/
-	https://pypi.org/project/ldap3/"
-SRC_URI="https://github.com/cannatag/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-RDEPEND="
-	>=dev-python/pyasn1-0.4.8[${PYTHON_USEDEP}]
-"
-# tests require a ldap server and extra configuration
-RESTRICT="test"
-
-distutils_enable_tests nose
diff --git a/dev-python/lunr/Manifest b/dev-python/lunr/Manifest
index 9141ce13f96c..1299ac30e9de 100644
--- a/dev-python/lunr/Manifest
+++ b/dev-python/lunr/Manifest
@@ -1,2 +1 @@
-DIST lunr-0.6.1.tar.gz 853421 BLAKE2B 7cc1624c91d07fa4e30ae789cbdffa1d98c011bd17a314bdb498ecfb7941fca7f0b6f36738377d10c17a7e400f8555be52fee8a1e03d3dfd8d931db88c4e25c9 SHA512 991569b6657c4cba653c999aa7610768303d1b184142c7f82a6c8ab44459b01cf7ae7db9f3bc45512161452b73e3b4cfbac3e8f7a0738e1f4b1429a8d8fe73e1
 DIST lunr-0.6.2.tar.gz 45968 BLAKE2B dd9328182f58ff623bf81c5cfdf31e7a8b004f5aa9e64934f09ffda3626143f5dc5ab92339208b886a91e00100cff65295b65d416faa3f38bbe4fe6c39299826 SHA512 6b7c29d30a8a64b71246ff884e473cceeef5e00e382ad54474e7855dcafcf3817dcc14c29c1bb2eb3371f1cb5ab1485a7840dbe41d345a4503294052aa9cd644
diff --git a/dev-python/lunr/lunr-0.6.1.ebuild b/dev-python/lunr/lunr-0.6.1.ebuild
deleted file mode 100644
index d2f7e6f4239f..000000000000
--- a/dev-python/lunr/lunr-0.6.1.ebuild
+++ /dev/null
@@ -1,32 +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} )
-
-DOCS_BUILDER="mkdocs"
-
-inherit distutils-r1 docs
-
-DESCRIPTION="A Python implementation of Lunr.js"
-HOMEPAGE="https://github.com/yeraydiazdiaz/lunr.py"
-SRC_URI="https://github.com/yeraydiazdiaz/lunr.py/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}.py-${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="dev-python/nltk[${PYTHON_USEDEP}]"
-
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	tests/acceptance_tests
-)
diff --git a/dev-python/markdown-it-py/Manifest b/dev-python/markdown-it-py/Manifest
index 0a35a924c3b1..c5792b27b36e 100644
--- a/dev-python/markdown-it-py/Manifest
+++ b/dev-python/markdown-it-py/Manifest
@@ -1 +1,2 @@
 DIST markdown-it-py-2.0.1.gh.tar.gz 265850 BLAKE2B fe61608f14b22dffb81bb943df75967300e8366ff1b1c252b35974414efa6b2daac223b09f40ff6d7feab70c5b033b0eee35a4ee5f8523325f12311f4cbeef57 SHA512 fccf00de7e94986a29047da948d6ebb6304ae3645e79bbad480366c3aadbd417b95d96489d167a532eee3c2e17b67e22777224290564c7bcc17d72fec29b08df
+DIST markdown-it-py-2.1.0.gh.tar.gz 265858 BLAKE2B 0d1bb789ed9a8d08b16c753f7ecc7cc6a6b1fd59fc39d303a0de15276a0a0f93dc8c8bc952de60450741f26770dd3955ae0e6aaa358bacf1003e5eb9124d3a54 SHA512 04e90538c8693f795aed2ed0a5bef4eaf0c12fac32cc0c2049c563e974b229940b9ceaea849ce86fa9804ccdd7be93145f3b6fc8d0774e96fafa0484368d0a88
diff --git a/dev-python/markdown-it-py/markdown-it-py-2.1.0.ebuild b/dev-python/markdown-it-py/markdown-it-py-2.1.0.ebuild
new file mode 100644
index 000000000000..3839d8275824
--- /dev/null
+++ b/dev-python/markdown-it-py/markdown-it-py-2.1.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 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=flit
+inherit distutils-r1
+
+DESCRIPTION="Python port of markdown-it, Markdown parser"
+HOMEPAGE="https://pypi.org/project/markdown-it-py/
+	https://github.com/executablebooks/markdown-it-py"
+SRC_URI="
+	https://github.com/executablebooks/markdown-it-py/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	<dev-python/attrs-22[${PYTHON_USEDEP}]
+	dev-python/mdurl[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-regressions[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# Unimportant tests needing a new dep linkify
+	tests/test_linkify.py::test_token_levels
+	tests/test_port/test_fixtures.py::test_linkify
+)
+
+EPYTEST_IGNORE=(
+	# No need to benchmark
+	benchmarking/
+)
diff --git a/dev-python/moto/Manifest b/dev-python/moto/Manifest
index b6ebdb194941..18d3d2f8b8cc 100644
--- a/dev-python/moto/Manifest
+++ b/dev-python/moto/Manifest
@@ -3,3 +3,4 @@ DIST moto-3.1.1.tar.gz 2236948 BLAKE2B 8ab52a59dc09f4819c1169d26fd198b13159635c2
 DIST moto-3.1.2.tar.gz 2245068 BLAKE2B f25a4476bfbbbd3cab77efc1ef2ceeb74b2b7ee9067aac4a02f90c6fd385c5ed0d66d3fd8171945e22dcd78555c9fdbec78656109b9f61fd15950c44b456d4ea SHA512 51dfef58069f09b4654aa59bef2ee0426c0e662af51d78013c19671b664ade78d2c664c20f19592236808ba7bcc50613700232e87be1ac8dcead4be2df36d39b
 DIST moto-3.1.3.tar.gz 2246198 BLAKE2B 935271da2b09b160c7ed8c8b1e2466b352d879c7b8bbe4406a410c301f9659fde3187ed76f2ad6695c79a667a44c698570dcb30206a0fe0b525a5e5bef72f40c SHA512 20963f9a1a99a2ac1654660284b3cb60439538da0d363baba92e813dd3c7bde815c125bc39cd1cf5c0cd883fba024dfda85b7e98a54141ad3e25311986c68c9a
 DIST moto-3.1.4.tar.gz 2256325 BLAKE2B d0b90eee9f77370ea48e95a5920b139825550850276760842e16ddbe340e09746a0ec6c4e4d9a57f8a68232d807b17920fff4bd88a9a75d0a72c8153cb5cbfb1 SHA512 3ec226dc19b46af50f4a266957e54292b65b9b198a5daf2f5eba6242cf2ab9a42ba743d0af1f30695de625e9fa222871890b497717ac2b9ed111b033f3804b25
+DIST moto-3.1.5.tar.gz 2282060 BLAKE2B f7b2cbf1de96b6d96b334e5b51bcdf69fb9645261564b28b290c19c37c27df5c25395ce54cc7d9c424f25cb381f4ddf13dc51456fb7baeec5e21b2da6abf725b SHA512 583c4e76a5acacdcce456cd953109b130dd53d6bf3e50d56d5ead6bfbdcd181109ce3df141686a4717687d3e1e8b33a73bdc7155c36aa5d064a4621e007ab17a
diff --git a/dev-python/moto/moto-3.1.5.ebuild b/dev-python/moto/moto-3.1.5.ebuild
new file mode 100644
index 000000000000..b64e57ada481
--- /dev/null
+++ b/dev-python/moto/moto-3.1.5.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
+
+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[${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_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/myst_parser/Manifest b/dev-python/myst_parser/Manifest
index 6a4cad0522e1..63198004cdd6 100644
--- a/dev-python/myst_parser/Manifest
+++ b/dev-python/myst_parser/Manifest
@@ -1 +1,2 @@
 DIST MyST-Parser-0.17.0.gh.tar.gz 877372 BLAKE2B 00dea98fa9cd8770480047a824e18a903098600dd52cea427e1cf3a4ff0a4930502967e136a3c6e9ccb4a7f6c54c8c4c8f9c5bfc701e1b24a0006b867f8ce74a SHA512 e9f4ea05ab55b0979b26f0211603aee0835a30fb37a0ca23f23b96e0b47670b6b8e443ee9759df5011d009e20d817eaffd4066c4be4920f96786c283aa206239
+DIST MyST-Parser-0.17.1.gh.tar.gz 877466 BLAKE2B 79f2e03f07ad0887318e4d38745b7bbcfba5ffcb8a56a689489e2202c151702c3b1200607c7f8a0bb29b276c6ab74c201dd819a93a5b1dcfce556bf2bc38ffe1 SHA512 8b149f35d83285d54ad5e6c530eded9c9c838e65f5971c0c0fd5c1be55f365eca9d2c2871fa3c176daa58a7d7498fe06df747818c46f9fefcf9641db3286817d
diff --git a/dev-python/myst_parser/myst_parser-0.17.1.ebuild b/dev-python/myst_parser/myst_parser-0.17.1.ebuild
new file mode 100644
index 000000000000..d6c1668bd616
--- /dev/null
+++ b/dev-python/myst_parser/myst_parser-0.17.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+inherit distutils-r1
+
+MY_P=MyST-Parser-${PV}
+DESCRIPTION="Extended commonmark compliant parser, with bridges to sphinx"
+HOMEPAGE="https://pypi.org/project/myst-parser/ https://github.com/executablebooks/MyST-Parser"
+SRC_URI="
+	https://github.com/executablebooks/MyST-Parser/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	<dev-python/docutils-0.18[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/markdown-it-py[${PYTHON_USEDEP}]
+	dev-python/mdit-py-plugins[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	<dev-python/sphinx-5[${PYTHON_USEDEP}]
+	dev-python/typing-extensions[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+		dev-python/pytest-regressions[${PYTHON_USEDEP}]
+		dev-python/pytest-param-files[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_DESELECT=(
+	# Unimportant tests needing a new dep linkify
+	tests/test_renderers/test_myst_config.py::test_cmdline
+	tests/test_sphinx/test_sphinx_builds.py::test_extended_syntaxes
+)
+
+distutils_enable_tests pytest
diff --git a/dev-python/openstackdocstheme/Manifest b/dev-python/openstackdocstheme/Manifest
index 43933e3ddd7c..9eac53cc3433 100644
--- a/dev-python/openstackdocstheme/Manifest
+++ b/dev-python/openstackdocstheme/Manifest
@@ -1,2 +1 @@
-DIST openstackdocstheme-2.3.1.tar.gz 1255622 BLAKE2B cbb03cbbdd2d22c019879b03be87d97fe52e4396cd45e7acf4e138bb50a99444a80a43c3c76f777ea74bd24ec92ca1e4a562dbc91159d1ddf3cf20c3ad86a957 SHA512 d3e190543e83d83b00d247fe79598f302684e2baece50a01c196231625fce9d7bdfe9716a7eea8cf0a9b59319f02b3c0d3cf35086e58c71cb0d958410fd560cb
 DIST openstackdocstheme-2.4.0.tar.gz 1255985 BLAKE2B 6066ef5b4fc50093dd7a55d4e7824be9495f8cc9af5f20e1ee7ee5bacea1deb5d1e1a08e408470ba5923de9ece2658dc187bef9c6d5cb767d4c492543bbdc3c1 SHA512 34bc69fc3455c013ba05e6662ea362f0b9ac4070a9e70b34987846eec84197069622fbddd295251d2a363f08303c5a2e9b998b01207bdf6891ca68aa33682c78
diff --git a/dev-python/openstackdocstheme/openstackdocstheme-2.3.1.ebuild b/dev-python/openstackdocstheme/openstackdocstheme-2.3.1.ebuild
deleted file mode 100644
index e6f1c4388a4e..000000000000
--- a/dev-python/openstackdocstheme/openstackdocstheme-2.3.1.ebuild
+++ /dev/null
@@ -1,19 +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} )
-inherit distutils-r1
-
-DESCRIPTION="Theme and extension support for Sphinx documentation"
-HOMEPAGE="https://docs.openstack.org/openstackdocstheme/latest/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc64 x86"
-
-BDEPEND=">dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
-RDEPEND="${BDEPEND}
-	>=dev-python/dulwich-0.15.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/peewee/Manifest b/dev-python/peewee/Manifest
index a53b7dc2ab27..e51343887c3d 100644
--- a/dev-python/peewee/Manifest
+++ b/dev-python/peewee/Manifest
@@ -1,2 +1 @@
 DIST peewee-3.14.10.tar.gz 896121 BLAKE2B c6d42dbca418475325e704e86dbf1d420426b1276a63ad1d49f3361478325b5a4b01bcbd875b32439bb497c4e18248efa6fe44c589c3247ee84043ca1bfc1a74 SHA512 1f423097c67c6a3976ed77586e3ea9db6db42e3c18e6f4c6046176a0e8942a9ce228cefd2a09e39fde359479e70a04e4c06030682442d96657d24984666b13d1
-DIST peewee-3.14.8.tar.gz 891123 BLAKE2B 67c64ad5c8ca52987c329592dc436e3c27db5b3baa7f7c68ee4fcb06e338e38a71bfce30dcd62b7562d85a3ab7fa554f1ba8093e9a59536ffb4289c186852853 SHA512 d736e5dfc139656cba7caf488d68907683893d5a2537f96269af9ed693ec79c089d2822d355be4a9c6136b5cd813b0cccf774afd585f9bd420d57a8700cabfbe
diff --git a/dev-python/peewee/peewee-3.14.8.ebuild b/dev-python/peewee/peewee-3.14.8.ebuild
deleted file mode 100644
index 79bc993b5420..000000000000
--- a/dev-python/peewee/peewee-3.14.8.ebuild
+++ /dev/null
@@ -1,35 +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} )
-PYTHON_REQ_USE="sqlite"
-
-inherit distutils-r1
-
-DESCRIPTION="Small Python ORM"
-HOMEPAGE="https://github.com/coleifer/peewee/"
-SRC_URI="https://github.com/coleifer/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="examples test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-	test? ( dev-python/psycopg[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_sphinx docs
-
-python_test() {
-	"${EPYTHON}" ./runtests.py -v 2 || die "tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use examples && DOCS=( examples/ )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pgspecial/pgspecial-1.13.1.ebuild b/dev-python/pgspecial/pgspecial-1.13.1.ebuild
index 99f68dcb4a84..9130ffab562a 100644
--- a/dev-python/pgspecial/pgspecial-1.13.1.ebuild
+++ b/dev-python/pgspecial/pgspecial-1.13.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/dbcli/pgspecial/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	>=dev-python/click-4.1[${PYTHON_USEDEP}]
diff --git a/dev-python/pip/pip-22.0.4.ebuild b/dev-python/pip/pip-22.0.4.ebuild
index 34273fc8b84c..f91ac88accda 100644
--- a/dev-python/pip/pip-22.0.4.ebuild
+++ b/dev-python/pip/pip-22.0.4.ebuild
@@ -32,7 +32,7 @@ SRC_URI="
 "
 
 LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86"
 SLOT="0"
 IUSE="test vanilla"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/pyamg/Manifest b/dev-python/pyamg/Manifest
index 70c507a67c10..48e0aaa3ffbc 100644
--- a/dev-python/pyamg/Manifest
+++ b/dev-python/pyamg/Manifest
@@ -1,3 +1,4 @@
 DIST pyamg-4.1.0.tar.gz 749906 BLAKE2B 31c05d64317b32cbdbd616e982557f0a94bc17b2fce3d982fe93e629d56ad526516603032b3cba9785bf5ebed038481ae641f55a5a1ad621442dde08791981cb SHA512 311642cbbe8dca621cb58bebb1bb05b7dc7b2364713886df96937ba56575137bcb4fb7006a232d2c14380cd41f4337f6f09a8a9794e279a155f27287497d2b08
 DIST pyamg-4.2.1.gh.tar.gz 3900395 BLAKE2B ad4427eb297f044b4782274ce55799bd9da4abec108267c4c0aaedab38e2fb4d89c4c365eca90e4045c411254640ead667fa0e511d9597ff00081c0ebacde9b2 SHA512 933f5f1da808cb02ff5fa91df54a48a971bb3b017582f5a829cf71c94f698469476b9f0306962140dc38f7265266c9b53f98dc7aaa99945b45bfa83003d26df9
 DIST pyamg-4.2.2.gh.tar.gz 3900331 BLAKE2B 34858026eb9e1eff20101e3ef810e7f3fed40e5b363c3a0858189276259576b8abe4d2a46fc386a1d759eff724bb8b7814944d08fd555783cf33e908a05812f0 SHA512 f9f18df8b34f240be7e738f1e0f74f348d718f63bb7a32bf0c78158e2ace985d60fc182beee5a9e75248aad3fafe0525a6f41b3acc356c52ce15b52730cbd970
+DIST pyamg-4.2.3.gh.tar.gz 4101959 BLAKE2B 190cce0bb06bbfc09e8c7a8d6d70498308e4d0e098c23a12d12ae8373b56ef183694430c1f85e287682f9733e3f85ff2bd94d8e10003f578af32f3c3f583a8f4 SHA512 ad11ed2870de41bb9596167a5a7fc3edd4c4bc898c2f5b5ffa3cfa862372d993fe1adfc5f3d199150ba69a4d2acbf75e5d99b3aa872273da0d05f1fd8d9f5c6d
diff --git a/dev-python/pyamg/pyamg-4.2.3.ebuild b/dev-python/pyamg/pyamg-4.2.3.ebuild
new file mode 100644
index 000000000000..316faf9618d2
--- /dev/null
+++ b/dev-python/pyamg/pyamg-4.2.3.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} )
+
+inherit distutils-r1
+
+DESCRIPTION="Algebraic multigrid solvers in Python"
+HOMEPAGE="https://github.com/pyamg/pyamg"
+SRC_URI="
+	https://github.com/pyamg/pyamg/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/scipy[${PYTHON_USEDEP}]"
+BDEPEND="
+	dev-python/pybind11[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	test? (
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+python_test() {
+	cd "${T}" || die
+	epytest --pyargs pyamg
+}
diff --git a/dev-python/pycairo/Manifest b/dev-python/pycairo/Manifest
index 1875f1cb5dec..d25ffabfd99b 100644
--- a/dev-python/pycairo/Manifest
+++ b/dev-python/pycairo/Manifest
@@ -1,2 +1 @@
-DIST pycairo-1.20.1.tar.gz 344639 BLAKE2B 7327a1b9aacc62eb7b2630ac2b9ce43ad7a44e60cb749b60a2973fb9036a84c1f3f4264da428d720158a5e32cd47f679d5956ebf3ce094e75d742584a68adda4 SHA512 bb2340170c1d39d50dd8ceeb1b6ceadd96ddbd27d78a8a5b7dadf7dc427558d766f65d62e1ceeae19ab200e7ffb5ad122b5e51daa8ef9bff08fcd97a44005697
 DIST pycairo-1.21.0.tar.gz 340712 BLAKE2B 6578c75b478c14c641b5c0be44c3c633d32ecc09c4ef22a079024dd12b539d37f88efa6ce8aadb5a88a48b3cc793e573afe00eaa4e3ba563c3133cad72dacfe4 SHA512 0de226b05d0a358f3546e4a0d5bf342f124373718d4900c891a09c1ede11e3ed1fb9bee163c00acfc215044683ddf0b29c8573b7454f9c39f957a47d63c34baf
diff --git a/dev-python/pycairo/pycairo-1.20.1.ebuild b/dev-python/pycairo/pycairo-1.20.1.ebuild
deleted file mode 100644
index c51ee078936a..000000000000
--- a/dev-python/pycairo/pycairo-1.20.1.ebuild
+++ /dev/null
@@ -1,46 +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 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for the cairo library"
-HOMEPAGE="https://www.cairographics.org/pycairo/ https://github.com/pygobject/pycairo"
-SRC_URI="https://github.com/pygobject/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="examples"
-
-BDEPEND="
-	test? (
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	>=x11-libs/cairo-1.15.10[svg]
-"
-DEPEND="${RDEPEND}"
-
-distutils_enable_sphinx docs \
-	dev-python/sphinx_rtd_theme
-distutils_enable_tests setup.py
-
-python_install() {
-	distutils-r1_python_install \
-		install_pkgconfig --pkgconfigdir="${EPREFIX}/usr/$(get_libdir)/pkgconfig"
-}
-
-python_install_all() {
-	if use examples; then
-		dodoc -r examples
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pydevd/Manifest b/dev-python/pydevd/Manifest
index 1698c91646fb..085e3921ed94 100644
--- a/dev-python/pydevd/Manifest
+++ b/dev-python/pydevd/Manifest
@@ -1,2 +1 @@
-DIST pydev_debugger_2_7_0.tar.gz 4154343 BLAKE2B 6504ffa5eee5548a6aa9e59712b6c0054b69c2e0f6ff48059ed8b2e3edb92ec92ea4e7f9ff084419b46310c4d08f11008571cbf70ccc4efddd0fae688e4110f5 SHA512 8f09b446eeaace1f9ecd3d331813e8bd7d8e09e1fe9dc9fa955ecc26a97ac6015f7becc4005a87405d1154280ec10eb7fa87914bcd41f27e51d90ad3eb99f643
 DIST pydev_debugger_2_8_0.tar.gz 4171117 BLAKE2B 4f0ea0eeb228cb66f71e2046438396ff5ce59b42e620a067bc515ff504fa2da151e05f8ea6cf2d1aaa0768122431ccb45708a88c0616fb2859e96671b172e822 SHA512 b0189f1824b52f8ad35d1d1cfba0bd734806541ae2ff4f410c110763201630d296d10c2b7eaac8c656dfb3ff0f3c31bfdf2de28323778000cc7821e123a877d3
diff --git a/dev-python/pydevd/pydevd-2.7.0.ebuild b/dev-python/pydevd/pydevd-2.7.0.ebuild
deleted file mode 100644
index 93a0f1c29eae..000000000000
--- a/dev-python/pydevd/pydevd-2.7.0.ebuild
+++ /dev/null
@@ -1,88 +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 toolchain-funcs
-
-MY_P="pydev_debugger_${PV//./_}"
-
-DESCRIPTION="PyDev.Debugger (used in PyDev, PyCharm and VSCode Python)"
-HOMEPAGE="https://github.com/fabioz/PyDev.Debugger/"
-SRC_URI="https://github.com/fabioz/PyDev.Debugger/archive/${MY_P}.tar.gz"
-S="${WORKDIR}/PyDev.Debugger-${MY_P}"
-
-LICENSE="EPL-1.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
-
-# After removing and recompiling the prebuilt lib the tests fail?
-# For some reason the test suite is executing a slightly different gdb command
-# then before, which is lacking the file name of the lib that was pre built:
-# gdb: No symbol table is loaded. Use the "file" command
-# This also happens outside of portage so it is not related to any *FLAGS
-RESTRICT="test"
-
-BDEPEND="
-	test? (
-		dev-python/untangle[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/psutil[${PYTHON_USEDEP}]
-	)
-"
-
-# Block against the version of debugpy that still bundles pydevd
-RDEPEND="
-	!<dev-python/debugpy-1.4.2
-	sys-devel/gdb
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	# Drop -O3 and -flto compiler args
-	sed -i \
-		-e 's/extra_link_args = extra_compile_args\[\:\]/pass/g' \
-		-e '/extra_compile_args/d' \
-		setup.py || die
-
-	# Clean up some prebuilt files
-	rm -r third_party || die
-	cd pydevd_attach_to_process || die
-
-	# Remove these Windows files
-	rm attach_{amd64,x86}.dll || die
-	rm inject_dll_{amd64,x86}.exe || die
-	rm run_code_on_dllmain_{amd64,x86}.dll || die
-	rm -r windows winappdbg || die
-
-	# Remove these MacOS files
-	rm attach_x86_64.dylib || die
-
-	# Remove these prebuilt linux files
-	rm attach_linux_{amd64,x86}.so || die
-
-	cd linux_and_mac || die
-	rm compile_mac.sh || die
-}
-
-src_compile() {
-	pushd pydevd_attach_to_process/linux_and_mac || die
-	# recompile removed file (extracted from compile_linux.sh)
-	$(tc-getBUILD_CXX) ${CXXFLAGS} ${CPPFLAGS} -o "attach_linux_${ARCH}.so" \
-		${LDFLAGS} -nostartfiles attach.cpp -ldl || die
-	mv "attach_linux_${ARCH}.so" ../ || die
-	popd || die
-	python_foreach_impl distutils-r1_python_compile
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	# Remove this duplicate that is installed directly to /usr/
-	# These files are also correctly installed to the python site-packages dir
-	rm -r "${ED}/usr/pydevd_attach_to_process" || die
-}
diff --git a/dev-python/pygal/pygal-3.0.0-r1.ebuild b/dev-python/pygal/pygal-3.0.0-r1.ebuild
deleted file mode 100644
index 9d34f4db221b..000000000000
--- a/dev-python/pygal/pygal-3.0.0-r1.ebuild
+++ /dev/null
@@ -1,43 +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} )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="A python SVG charts generator"
-HOMEPAGE="https://github.com/Kozea/pygal/"
-SRC_URI="https://github.com/Kozea/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-BDEPEND="
-	test? (
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/pyquery[${PYTHON_USEDEP}]
-		media-gfx/cairosvg[${PYTHON_USEDEP}]
-	)
-"
-
-# CHANGELOG is a symlink to docs/changelog.rst
-DOCS=( docs/changelog.rst README.md )
-
-distutils_enable_sphinx docs
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# Not actually required unless we want to do setup.py test
-	# https://github.com/Kozea/pygal/issues/430
-	sed -i -e "/setup_requires/d" setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-pkg_postinst() {
-	optfeature "improving rendering speed" "dev-python/lxml"
-	optfeature "png rendering" "dev-python/cairosvg"
-}
diff --git a/dev-python/pymongo/Manifest b/dev-python/pymongo/Manifest
index c3403015f705..7652cb1b0ff7 100644
--- a/dev-python/pymongo/Manifest
+++ b/dev-python/pymongo/Manifest
@@ -1,3 +1,4 @@
 DIST mongo-python-driver-4.0.1.tar.gz 1030722 BLAKE2B b820901a433ffa2e82db0ef3c014aaa1e7d53bbc3ab94a5432fcb713d9789cbbf411a4ad5085ef3896cbf2aeff6d0e79f3f7bd5936d3aa615080a0421d8818c2 SHA512 1aead66d21c032e6d42b3aa408b0193bcac6a5a293ecfc513fadb634c574dccdcd351c693352f23cfe577c73fec901cdc2aa635dfe9afe8d9108ed917f55b53b
 DIST mongo-python-driver-4.0.2.tar.gz 1027101 BLAKE2B d95eea08e09101f1db5df5dcbd5d843273ebd0c63b228420748a1663620ea18e05853372e876abc8b6480238de2b035c4e5a3c9f9b7c206228870a66e5d5f053 SHA512 eacb24d110de645a70b16b4d11f7a6b019f741fba2222f8ecee47d9f638fd71e579d3a46f5f539bc89d1ea53ddf0b72745b667a0f05479bb4b53ed72fb075b5b
 DIST mongo-python-driver-4.1.0.tar.gz 1069416 BLAKE2B ea7d81e405f4db4ec0e03591909541f5452f516d359e42fc6fde74435899353f4718b7dbfe3dc1802e79c9277fcfe6203ecd33a5e2ad2682c604b9de44c46c7c SHA512 558d321a335742fc3399e9f5cb4917605353f55a1912f9fa34ac46f6107ed6522f952dc9ef584f4cbe1ffcfc600b49963a4bdf606146c38b94379bbb6a382202
+DIST mongo-python-driver-4.1.1.tar.gz 1070349 BLAKE2B 9b792343a22c4b0c625376e6f3d10e9c1a88442b63ff2638c29588a26755006507189bf40a8dad96d7f8e4f997efc153c8616826b58114aba32442c05b80ca60 SHA512 b01eb6bc4c39a25cae8350bdc2f37dd5d78da38a6eddbd8a26f91cb6ee067f7b4b1d97eb603defca16e05abc992b8f11b2e3558f9697c99697b3e876838de737
diff --git a/dev-python/pymongo/pymongo-4.1.1.ebuild b/dev-python/pymongo/pymongo-4.1.1.ebuild
new file mode 100644
index 000000000000..565026d64ba7
--- /dev/null
+++ b/dev-python/pymongo/pymongo-4.1.1.ebuild
@@ -0,0 +1,117 @@
+# 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 check-reqs distutils-r1
+
+MY_P=mongo-python-driver-${PV}
+DESCRIPTION="Python driver for MongoDB"
+HOMEPAGE="https://github.com/mongodb/mongo-python-driver https://pypi.org/project/pymongo/"
+SRC_URI="
+	https://github.com/mongodb/mongo-python-driver/archive/${PV}.tar.gz
+		-> ${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~hppa ~riscv ~x86"
+IUSE="doc kerberos"
+
+RDEPEND="
+	kerberos? ( dev-python/pykerberos[${PYTHON_USEDEP}] )
+"
+BDEPEND="
+	test? (
+		>=dev-db/mongodb-2.6.0
+	)
+"
+
+distutils_enable_sphinx doc
+distutils_enable_tests unittest
+
+reqcheck() {
+	if use test; then
+		# During the tests, database size reaches 1.5G.
+		local CHECKREQS_DISK_BUILD=1536M
+
+		check-reqs_${1}
+	fi
+}
+
+pkg_pretend() {
+	reqcheck pkg_pretend
+}
+
+pkg_setup() {
+	reqcheck pkg_setup
+}
+
+src_prepare() {
+	# network-sandbox
+	rm test/test_srv_polling.py || die
+	sed -e 's:test_connection_timeout_ms_propagates_to_DNS_resolver:_&:' \
+		-e 's:test_service_name_from_kwargs:_&:' \
+		-e 's:test_srv_max_hosts_kwarg:_&:' \
+		-i test/test_client.py || die
+	sed -e '/SRV_SCHEME/s:_HAVE_DNSPYTHON:False:' \
+		-i test/test_uri_spec.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# Yes, we need TCP/IP for that...
+	local DB_IP=127.0.0.1
+	local DB_PORT=27000
+
+	export DB_IP DB_PORT
+
+	local dbpath=${TMPDIR}/mongo.db
+	local logpath=${TMPDIR}/mongod.log
+
+	# Now, the hard part: we need to find a free port for mongod.
+	# We're just trying to run it random port numbers and check the log
+	# for bind errors. It shall be noted that 'mongod --fork' does not
+	# return failure when it fails to bind.
+
+	mkdir -p "${dbpath}" || die
+	while true; do
+		ebegin "Trying to start mongod on port ${DB_PORT}"
+
+		LC_ALL=C \
+		mongod --dbpath "${dbpath}" --nojournal \
+			--bind_ip ${DB_IP} --port ${DB_PORT} \
+			--unixSocketPrefix "${TMPDIR}" \
+			--logpath "${logpath}" --fork \
+		&& sleep 2
+
+		# Now we need to check if the server actually started...
+		if [[ ${?} -eq 0 && -S "${TMPDIR}"/mongodb-${DB_PORT}.sock ]]; then
+			# yay!
+			eend 0
+			break
+		elif grep -q 'Address already in use' "${logpath}"; then
+			# ay, someone took our port!
+			eend 1
+			: $(( DB_PORT += 1 ))
+			continue
+		else
+			eend 1
+			eerror "Unable to start mongod for tests. See the server log:"
+			eerror "	${logpath}"
+			die "Unable to start mongod for tests."
+		fi
+	done
+
+	local failed
+	DB_PORT2=$(( DB_PORT + 1 )) DB_PORT3=$(( DB_PORT + 2 )) esetup.py test || failed=1
+
+	mongod --dbpath "${dbpath}" --shutdown || die
+
+	[[ ${failed} ]] && die "Tests fail with ${EPYTHON}"
+
+	rm -rf "${dbpath}" || die
+}
diff --git a/dev-python/pyocr/Manifest b/dev-python/pyocr/Manifest
index 202c86b8f88f..e45048d36310 100644
--- a/dev-python/pyocr/Manifest
+++ b/dev-python/pyocr/Manifest
@@ -1,2 +1,3 @@
 DIST pyocr-0.8.1.tar.gz 67150 BLAKE2B d7f06db3b27c7352365713640c2421e5b73f54869d46c684d6b96d26c3d4c719c5daa1650e023f0cc5a17c0e51b4fb387ef8583ed501ab8369fc70d1c78e77bf SHA512 8a38f8175bd96de152cb0c34640fe0ca0bee369ecc455a1730a47f64d619901e48491fe0cf333073962f28a478f01ec71593881995e956589f60511b8636a32e
+DIST pyocr-0.8.2.tar.gz 67598 BLAKE2B b5cc1338b73f1147195dd094c332836e49189c3fff051de7e634d99de1135b07b1343af3d7c2dcb302e583a0b307c20aa2aaea4e878d6b2325a5aade7e438b23 SHA512 85100aa236bb2c862b5b67137267a657ae88b06eeb9bd1a895c18bfd7318641fa01ea3966499ccdfcc21480522e4996f0e12f2e8931bb455ade3adea428af17d
 DIST pyocr-0.8.tar.gz 65454 BLAKE2B 881353eebce22cf316cd4375cc8971e740a9a463216a5b49c07c7813340cfa1a9bdd869b84b4c26566deab1551884179ae2fe0184dec73880b716118367803cd SHA512 c8d811001b460a9004a80fbf570df3fe9a6af11e8ca0e90f23e5f3be54f6a54d859f4ad3db126a5216ea557ecb38ebd5dbece91810df2bf3e95f514c39649bce
diff --git a/dev-python/pyocr/pyocr-0.8.2.ebuild b/dev-python/pyocr/pyocr-0.8.2.ebuild
new file mode 100644
index 000000000000..4fd37f854a56
--- /dev/null
+++ b/dev-python/pyocr/pyocr-0.8.2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+inherit distutils-r1
+
+DESCRIPTION="An optical character recognition (OCR) tool wrapper"
+HOMEPAGE="https://gitlab.gnome.org/World/OpenPaperwork/pyocr"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cuneiform +tesseract"
+REQUIRED_USE="|| ( cuneiform tesseract )"
+
+RDEPEND="
+	dev-python/pillow[${PYTHON_USEDEP}]"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]"
+
+# (tests apparently do not require any backend installed)
+distutils_enable_tests unittest
+
+RDEPEND+="
+	cuneiform? ( app-text/cuneiform )
+	tesseract? ( app-text/tesseract )"
diff --git a/dev-python/pypng/pypng-0.0.21.ebuild b/dev-python/pypng/pypng-0.0.21.ebuild
deleted file mode 100644
index 624f5262d85a..000000000000
--- a/dev-python/pypng/pypng-0.0.21.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Pure Python PNG image encoder/decoder"
-HOMEPAGE="
-	https://github.com/drj11/pypng/
-	https://pypi.org/project/pypng/"
-SRC_URI="https://github.com/drj11/pypng/archive/${P}.tar.gz"
-S=${WORKDIR}/pypng-${P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 x86"
-
-python_test() {
-	"${EPYTHON}" code/test_png.py -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/pystache/Manifest b/dev-python/pystache/Manifest
new file mode 100644
index 000000000000..f75fabc9293b
--- /dev/null
+++ b/dev-python/pystache/Manifest
@@ -0,0 +1 @@
+DIST pystache-0.6.0.tar.gz 78240 BLAKE2B b3ba14090f7969b7d3bd77f6e23bda8007fbf6f750e008585676f48bb1a4bfc520484b2205225477f2d2d625b0d6c1500d875685fa50f87c11b19589b0d45622 SHA512 802e12795c3ae08fbde37c9e266a60478d46d55a42e2fc339389b664edf3c5ebb2e34069546b820789ad48ed9921f4a2b89f82bb37e72e94846eec0a9ba1568c
diff --git a/dev-python/pystache/metadata.xml b/dev-python/pystache/metadata.xml
new file mode 100644
index 000000000000..584d48cb835d
--- /dev/null
+++ b/dev-python/pystache/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+  <email>nerdboy@gentoo.org</email>
+  <name>Steve Arnold</name>
+ </maintainer>
+ <longdescription lang="en">
+	Updated Python implementation of Mustache templating framework.
+</longdescription>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-python/pystache/pystache-0.6.0.ebuild b/dev-python/pystache/pystache-0.6.0.ebuild
new file mode 100644
index 000000000000..c0d692cde9f4
--- /dev/null
+++ b/dev-python/pystache/pystache-0.6.0.ebuild
@@ -0,0 +1,38 @@
+# 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} )
+DISTUTILS_USE_SETUPTOOLS="pyproject.toml"
+
+inherit distutils-r1
+
+DESCRIPTION="Python implementation of Mustache"
+HOMEPAGE="https://github.com/PennyDreadfulMTG/pystache"
+
+if [[ ${PV} = 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/PennyDreadfulMTG/pystache.git"
+	EGIT_BRANCH="master"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="test"
+
+BDEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pyyaml[${PYTHON_USEDEP}] )
+"
+
+RDEPEND="${PYTHON_DEPS}"
+
+RESTRICT="!test? ( test )"
+
+python_test() {
+	distutils_install_for_testing
+	pystache-test . || die "Test failed with ${EPYTHON}"
+}
diff --git a/dev-python/rich/files/rich-11.1.0-pypy3.patch b/dev-python/rich/files/rich-11.1.0-pypy3.patch
deleted file mode 100644
index e1ff1f3496d0..000000000000
--- a/dev-python/rich/files/rich-11.1.0-pypy3.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-From 8e3a0be6fbb9186fa45cc42ec833d0895d2313ba Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Tue, 1 Feb 2022 12:24:18 +0100
-Subject: [PATCH 1/2] Fix test_syntax not to use identity comparison on string
-
-Fix test_syntax to compare strings via "==" rather than "is", in order
-to fix test failure on PyPy3.
----
- CHANGELOG.md         | 4 ++++
- CONTRIBUTORS.md      | 1 +
- tests/test_syntax.py | 2 +-
- 3 files changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/tests/test_syntax.py b/tests/test_syntax.py
-index 46d0126..e5d904f 100644
---- a/tests/test_syntax.py
-+++ b/tests/test_syntax.py
-@@ -277,7 +277,7 @@ def test_from_path_lexer_override():
-     try:
-         os.write(fh, b"import this\n")
-         syntax = Syntax.from_path(path, lexer="rust")
--        assert syntax.lexer.name is "Rust"
-+        assert syntax.lexer.name == "Rust"
-         assert syntax.code == "import this\n"
-     finally:
-         os.remove(path)
--- 
-2.35.1
-
-From f15dc3ea0b59d5fc04341d3f634f0e61c05a84db Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Tue, 1 Feb 2022 15:10:32 +0100
-Subject: [PATCH 2/2] Fix test_inspect failures on PyPy3
-
-Mark the test_inspect tests failing on PyPy3 due to different output
-to be skipped appropriately.
----
- CHANGELOG.md          | 2 +-
- tests/test_inspect.py | 9 +++++++++
- 2 files changed, 10 insertions(+), 1 deletion(-)
-
-diff --git a/tests/test_inspect.py b/tests/test_inspect.py
-index 63c5f06..b4c1d2a 100644
---- a/tests/test_inspect.py
-+++ b/tests/test_inspect.py
-@@ -32,6 +32,11 @@ skip_py310 = pytest.mark.skipif(
-     reason="rendered differently on py3.10",
- )
- 
-+skip_pypy3 = pytest.mark.skipif(
-+    hasattr(sys, "pypy_version_info"),
-+    reason="rendered differently on pypy3",
-+)
-+
- 
- def render(obj, methods=False, value=False, width=50) -> str:
-     console = Console(file=io.StringIO(), width=width, legacy_windows=False)
-@@ -81,6 +86,7 @@ def test_render():
-     assert expected == result
- 
- 
-+@skip_pypy3
- def test_inspect_text():
-     expected = (
-         "╭──────────────── <class 'str'> ─────────────────╮\n"
-@@ -98,6 +104,7 @@ def test_inspect_text():
- 
- @skip_py36
- @skip_py37
-+@skip_pypy3
- def test_inspect_empty_dict():
-     expected = (
-         "╭──────────────── <class 'dict'> ────────────────╮\n"
-@@ -119,6 +126,7 @@ def test_inspect_empty_dict():
-     assert render({}).startswith(expected)
- 
- 
-+@skip_pypy3
- def test_inspect_builtin_function():
-     expected = (
-         "╭────────── <built-in function print> ───────────╮\n"
-@@ -237,6 +245,7 @@ def test_inspect_integer_with_methods():
- 
- @skip_py36
- @skip_py37
-+@skip_pypy3
- def test_broken_call_attr():
-     class NotCallable:
-         __call__ = 5  # Passes callable() but isn't really callable
--- 
-2.35.1
-
diff --git a/dev-python/stripe/stripe-2.67.0.ebuild b/dev-python/stripe/stripe-2.67.0.ebuild
index b93665ed3c64..09d439f0fa5f 100644
--- a/dev-python/stripe/stripe-2.67.0.ebuild
+++ b/dev-python/stripe/stripe-2.67.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/s/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND=">=dev-python/requests-2.20[${PYTHON_USEDEP}]"
 BDEPEND="
diff --git a/dev-python/suds/Manifest b/dev-python/suds/Manifest
index 312a5f79e570..c20f4d567495 100644
--- a/dev-python/suds/Manifest
+++ b/dev-python/suds/Manifest
@@ -1,2 +1 @@
-DIST suds-community-1.0.0.tar.gz 282894 BLAKE2B 06b1d96c13b0e7f3259b550718d653979e4d7cf5d094c881fb2a4c56f6fd47aa0d204c960d1ec617d3d85fe18b1a86f468e9bbeab6695cde73330e2e97462103 SHA512 77f26df229a93ac0efbc4245180f4eb630bd565624cd5e3e92e82af3545c7ce63802eacfe616cc138e8dfcceb8d9007a88c911c654ca7ba77c82d6e9bcf75d77
 DIST suds-community-1.1.0.tar.gz 284545 BLAKE2B b5f6f6f46a35df3263664c9893745a2e723f3eef543cb1a9e9fd061956b0c00c219e818228de9bf11b2730ad0a8fed90ad731199ffc7ca9fba9f22c5c0c8dd41 SHA512 2c8902e16c3513c99ce6d8bdf58ef4f5c4d704f1bf2480ea2b23ec2adbd9e8919928bfd5e3fd6859028b7fbc3788d067b9b71bad2a20c2f4907e6e56f3f15350
diff --git a/dev-python/suds/suds-1.0.0.ebuild b/dev-python/suds/suds-1.0.0.ebuild
deleted file mode 100644
index 8d1853cf1f9c..000000000000
--- a/dev-python/suds/suds-1.0.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_REQ_USE="xml(+)"
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1
-
-MY_PN="${PN}-community"
-DESCRIPTION="Lightweight SOAP client"
-HOMEPAGE="https://github.com/suds-community/suds"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-
-DOCS=( README.md notes/. )
-
-distutils_enable_tests pytest
diff --git a/dev-python/text-unidecode/text-unidecode-1.3.ebuild b/dev-python/text-unidecode/text-unidecode-1.3.ebuild
deleted file mode 100644
index 0f16b71d62c4..000000000000
--- a/dev-python/text-unidecode/text-unidecode-1.3.ebuild
+++ /dev/null
@@ -1,19 +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="The most basic port of the Text::Unidecode Perl library"
-HOMEPAGE="
-	https://pypi.org/project/text-unidecode/
-	https://github.com/kmike/text-unidecode/"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="|| ( Artistic GPL-2+ )"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
-
-distutils_enable_tests pytest
diff --git a/dev-python/typed-ast/Manifest b/dev-python/typed-ast/Manifest
index 7232d0585f5b..9e3fd536c1a3 100644
--- a/dev-python/typed-ast/Manifest
+++ b/dev-python/typed-ast/Manifest
@@ -1,2 +1,3 @@
 DIST typed_ast-1.4.3.tar.gz 210893 BLAKE2B 9e0bbaac73d97c13303c783d4e91b015570d9b9ad74361e1bcfe67259982459003ea6c24602ce004fe1447c4375090d5fa58006e18af28da256f6b25d9aa20b1 SHA512 7ac06e277c883afd1a7161601ffca0114aa63db257695a4bf4c64d819a7192fe52167edb57991aefc7accc6a9902b5faf2ba9e4032c4b9be31f1db7a091607c9
 DIST typed_ast-1.5.2.tar.gz 252310 BLAKE2B c36ab31e4c266de38a07935fc72ece62087bc52a6ebde401f9b2dcc641af064828572fa6e903dbdfb0c573ced10686b8dba995d316a5f7a7ee68efd3a4e9520c SHA512 7da72fc0c4fcb74cb41914765baea5c7f52b1e8a5c58883877e702765be59d3dd8c7f73bd5759a65781d04fdecbcf46160ff4402578a92685f25163e12b93558
+DIST typed_ast-1.5.3.tar.gz 252510 BLAKE2B e258b6c931d31a528091be2e5f7f9bf55f7fa48a14221a95e77924c18879480a34cd8293f9c1125810a43ab001195da2b36637aaee2c9b895b346cc94cab6577 SHA512 481fffc79d99f1f7c0009a9a4f9151745d17269827ea6306f35a015dc9e4cc3d85068948e157076fecff87d9301c18f637edfe7f26d63779ccfe38bf10105969
diff --git a/dev-python/typed-ast/typed-ast-1.5.3.ebuild b/dev-python/typed-ast/typed-ast-1.5.3.ebuild
new file mode 100644
index 000000000000..3cc3dfdcf623
--- /dev/null
+++ b/dev-python/typed-ast/typed-ast-1.5.3.ebuild
@@ -0,0 +1,24 @@
+# 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="Python typed-ast backported"
+HOMEPAGE="https://pypi.org/project/typed-ast/ https://github.com/python/typed_ast"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN/-/_}/${P/-/_}.tar.gz"
+S="${WORKDIR}/${P/-/_}"
+
+LICENSE="Apache-2.0 MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+
+distutils_enable_tests pytest
+
+python_test() {
+	cd "${BUILD_DIR}" || die
+	epytest
+}
diff --git a/dev-python/watchgod/watchgod-0.8.ebuild b/dev-python/watchgod/watchgod-0.8.ebuild
index c73456ab6347..2a3225a23913 100644
--- a/dev-python/watchgod/watchgod-0.8.ebuild
+++ b/dev-python/watchgod/watchgod-0.8.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86"
 
 RDEPEND="
 	=dev-python/anyio-3*[${PYTHON_USEDEP}]
diff --git a/dev-python/zstd/Manifest b/dev-python/zstd/Manifest
index 2957d3a467bc..4f70ec3b4e2f 100644
--- a/dev-python/zstd/Manifest
+++ b/dev-python/zstd/Manifest
@@ -1 +1,2 @@
 DIST zstd-1.5.1.0.tar.gz 604039 BLAKE2B 5f3e2f2848d67d2455bab721d011946fa8138729566243046e2b294e51c1144a0a0576f9e64e15472c8da4b45514a052a751b2ac3d87f17301ab634f560bf19a SHA512 4775f9db3b924116272060fd46885a601ec5153b350974ef5fe41878f10aad0fee428f053ce71aaf881eb73bfc11ae1d89148f65447fc6febe3f53a50ffa0a63
+DIST zstd-1.5.2.0.tar.gz 605453 BLAKE2B 1564bf6f5d37ca5c55a161373f10ff99ffc942abf3d177bf15943570bc30367f0d6aee88cbfd28f1a57483945e0d3de5fde0dfc78bc2b0066faef12de2684fbd SHA512 99df709b889732dc5d6e682e79c52731b918458ccf720431a6afc757dd4cd58bd3ffe1ad45158d28a87d7baaa883fd074cb94717e023ee80eef1561d651504e1
diff --git a/dev-python/zstd/zstd-1.5.2.0.ebuild b/dev-python/zstd/zstd-1.5.2.0.ebuild
new file mode 100644
index 000000000000..a01ed9930881
--- /dev/null
+++ b/dev-python/zstd/zstd-1.5.2.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2020-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="Simple python bindings to Yann Collet ZSTD compression library"
+HOMEPAGE="https://github.com/sergey-dryabzhinsky/python-zstd"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+DEPEND="
+	app-arch/zstd:=
+"
+RDEPEND="${DEPEND}
+	!<dev-python/zstandard-0.15.2-r1[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests unittest
+
+src_configure() {
+	DISTUTILS_ARGS=( --external )
+
+	# for tests
+	export ZSTD_EXTERNAL=1
+	export VERSION=${PV}
+	export PKG_VERSION=${PV}
+	export LEGACY=0
+}
author	Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net>	2022-04-17 16:54:46 +0000
committer	Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net>	2022-04-17 16:54:46 +0000
commit	396c20c42dac2600fdd3acb9ad6dfb2f92e14824 (patch)
tree	46fda09911b3d0805b0203452a985cd94ff21d47 /dev-python
parent	d60fd1d181de0be2b207ca6c1c36db2feefb36e1 (diff)
download	baldeagleos-repo-396c20c42dac2600fdd3acb9ad6dfb2f92e14824.tar.gz baldeagleos-repo-396c20c42dac2600fdd3acb9ad6dfb2f92e14824.tar.xz baldeagleos-repo-396c20c42dac2600fdd3acb9ad6dfb2f92e14824.zip