Adding metadata

43 files changed, 437 insertions, 153 deletions

diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 9ff081694e8c..8e73d9e25c4e 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -3,3 +3,4 @@ DIST boto3-1.21.27.tar.gz 482968 BLAKE2B f8dbabe73377a861cf1d3d2e9388f7ba91f2047
 DIST boto3-1.21.32.tar.gz 485694 BLAKE2B da6fa6f38b234af9e67bfeb8182751f1ac533a2aea72d8d407aea21554501f598c9da71f3c30dd952248c1ab244c849b779a329fc941d05b53325fe46de2aba4 SHA512 d65cffa91ae1a29e69e4bac2fc0af704987e9bca914f3f905e00c383bc92127c6e41beed71e9445e3f484c6dadde2372aca69f550af600abbb42731275c53eda
 DIST boto3-1.21.35.tar.gz 486835 BLAKE2B 167070bf09785bac17083cef3caf144cf11a4266c4476af2f6e19b06c81f2d2bcee42b8c7de1d1c9ac178c025bcac08366b2c7cb072cdb663910d45f7e8369fa SHA512 fe73111a46fb27d9c77abec3a13c5267243b2fcc3f89c01d9036f6ca9f362d029c9cbfbb6c1df11b302a9fb0468453fc1b91ee3dac4853bab6662f1ebfa211b2
 DIST boto3-1.21.36.tar.gz 487111 BLAKE2B c812e80a2bd81f2feda25b9e43444d1587eb2706ab4372a71f6aad5051020dc2439c639e04f37322ab0c1a396c22c5dc45e773cf73518886d3aab9980633f45c SHA512 1530cd11471ddfdd6a77a250fc5af7546a760cc281b327be6b67b7e49ab40cdc440d4fbe8a72387009b2c2c3dc2e6d7baaa3b1dec3d5d4d276db89e1312e55cf
+DIST boto3-1.21.37.tar.gz 487557 BLAKE2B 1c716a07279ce2c1020faee9e2e81b2bde3ed6e4c56668fa76eabc03c7c0818f8dc3ac0fcef66d4007d892e1f227e8642757b6fa5d6e1e18184ad17a30a0e404 SHA512 512e7859e700a98aa3112e21bbd7653e39e7e21bc8f3ef623254322f18869bc9b8a65612a3a9133847c189c59b1e2480225b71bdebd38b2e42cf4820d7ab6972
diff --git a/dev-python/boto3/boto3-1.21.37.ebuild b/dev-python/boto3/boto3-1.21.37.ebuild
new file mode 100644
index 000000000000..80278b309f54
--- /dev/null
+++ b/dev-python/boto3/boto3-1.21.37.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 9cb76c31be3d..ef83598fddfb 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -3,3 +3,4 @@ DIST botocore-1.24.27.tar.gz 8856607 BLAKE2B aa149a79106bc6e9460d2b69b032b20d0fc
 DIST botocore-1.24.32.tar.gz 8884956 BLAKE2B c899ed9b540663fc16e937d98c4c4383b5b0b9c36a976a6b872019bee46edb6db4b9fbe9cf5cebfa5fd1f43d37d21213c90a93802e6d95e4218693269021f5fe SHA512 06142282ff93918052fc6d4832061c65088a5ce8a9fdbfb587be4a1575edf1ed160c58159f25446c7717a841e9ddff00b0a95dd5926a738ffb166b70b42da71f
 DIST botocore-1.24.35.tar.gz 8891601 BLAKE2B b6a56efa73a3f76f51764c4c649d38f2e596fb262624bc5931904318b68a773790f6e4e358cf42567aad0de4e97099699935e6da4c21be66a782f7005fbc15bf SHA512 3c0a7c935798a6dcdd419080a31050301f795ff67b8262673ee4ca09d8344f222ce4b1b7bfff3459089bbcb59c42041281ed8005c1533c34c24542d9a45c353c
 DIST botocore-1.24.36.tar.gz 8899058 BLAKE2B c11df5acef305116433aeb4c4b999b8bdeba278506ac066bae3572f578cd2877827cc8a45d74f57fd10c5e87fdd46f39b951ec4d5bd15f0c484194640813080a SHA512 49256c288b74126595521eabcab750a58a05d07ecf5243ce0626961963326099c3fa3cb571664fb72c0f835624bd79e55e4940c9fc4b03b2b1dc7fd7d3a71213
+DIST botocore-1.24.37.tar.gz 8898823 BLAKE2B 5e5495ba399e910479c0172eb4c572a5c0371db720906586c88dc59d8bfc58a50699b05125e1e554a8571b64654604447be1e1a4bfdc2b992272101060638908 SHA512 412a656e879b09bf9f82d02e291e988499106dce1f589b1048adf2145774a5dd9a9ca5f18d2b6eaedd895e384cbf1836c7b6bdc0867a83c7b863bddea77727f4
diff --git a/dev-python/botocore/botocore-1.24.37.ebuild b/dev-python/botocore/botocore-1.24.37.ebuild
new file mode 100644
index 000000000000..5fe8ae8c2f96
--- /dev/null
+++ b/dev-python/botocore/botocore-1.24.37.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/dnspython/dnspython-2.2.1.ebuild b/dev-python/dnspython/dnspython-2.2.1.ebuild
index 6cafae9f0068..40c760d95b84 100644
--- a/dev-python/dnspython/dnspython-2.2.1.ebuild
+++ b/dev-python/dnspython/dnspython-2.2.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/rthalley/dnspython/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="examples"
 
 RDEPEND="
diff --git a/dev-python/editables/editables-0.2.ebuild b/dev-python/editables/editables-0.2.ebuild
index 067bd5755910..e995ca24d48b 100644
--- a/dev-python/editables/editables-0.2.ebuild
+++ b/dev-python/editables/editables-0.2.ebuild
@@ -20,6 +20,6 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv"
+KEYWORDS="~amd64 ~hppa ~ia64 ~riscv ~s390 ~sparc"
 
 distutils_enable_tests pytest
diff --git a/dev-python/environs/Manifest b/dev-python/environs/Manifest
index 6fdf1d67bb1f..e0f3c8cfc3da 100644
--- a/dev-python/environs/Manifest
+++ b/dev-python/environs/Manifest
@@ -1,2 +1 @@
-DIST environs-9.3.4.gh.tar.gz 22914 BLAKE2B b47df2f7641ad47b48a0d4aaaaa0ce4fb2c805cefe6d997e5c6aa2ccfb2908196d879e251d496dda5ca9d112e1d2e60dd543f1ff62b7ad82ae5d546847aceef6 SHA512 b06110071ca423c6c6bdab8cb104dbc372cce77dcb057204b0b8c404827daeebfe72325d6d978bb4920c1b106af790b206b5d8a33f99bcbe31da4f82d4512006
 DIST environs-9.5.0.gh.tar.gz 23614 BLAKE2B 118305f7d6d2906beff69aa028449f8a5f6eba7815ec63972593dd43930802b5d1bd60457edc9803ed8ad216ae8feaad0d77fc03cd21e9883c40dc6656b1102e SHA512 8a73f9f89efe4d72b9a7a5a48b21ccaafcf32d59a6153c7cfa1c91d90a3a8a75e6c05d0ff0fecb94f593008dfff4c3534195f258391cee8fb720ee93c4f42812
diff --git a/dev-python/environs/environs-9.3.4.ebuild b/dev-python/environs/environs-9.3.4.ebuild
deleted file mode 100644
index 7429d5ed8752..000000000000
--- a/dev-python/environs/environs-9.3.4.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="Python library for simplified environment variable parsing"
-HOMEPAGE="https://github.com/sloria/environs"
-SRC_URI="https://github.com/sloria/environs/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-python/python-dotenv[${PYTHON_USEDEP}]
-	dev-python/marshmallow[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/django-cache-url[${PYTHON_USEDEP}]
-		dev-python/dj-database-url[${PYTHON_USEDEP}]
-		dev-python/dj-email-url[${PYTHON_USEDEP}]
-		dev-python/toml[${PYTHON_USEDEP}]
-	)
-"
-
-DOCS=( CHANGELOG.md CONTRIBUTING.md README.md  )
-
-distutils_enable_tests pytest
diff --git a/dev-python/environs/environs-9.5.0.ebuild b/dev-python/environs/environs-9.5.0-r1.ebuild
index 7c0209be2ce7..39685f263bc2 100644
--- a/dev-python/environs/environs-9.5.0.ebuild
+++ b/dev-python/environs/environs-9.5.0-r1.ebuild
@@ -25,7 +25,6 @@ BDEPEND="
 		dev-python/django-cache-url[${PYTHON_USEDEP}]
 		dev-python/dj-database-url[${PYTHON_USEDEP}]
 		dev-python/dj-email-url[${PYTHON_USEDEP}]
-		dev-python/toml[${PYTHON_USEDEP}]
 	)
 "
 
diff --git a/dev-python/fonttools/Manifest b/dev-python/fonttools/Manifest
index 0a2fba302a03..d63399d3261a 100644
--- a/dev-python/fonttools/Manifest
+++ b/dev-python/fonttools/Manifest
@@ -2,3 +2,4 @@ DIST fonttools-4.29.1.tar.gz 2954962 BLAKE2B e78a55e240975e12e9cfd56368eab0d18e1
 DIST fonttools-4.30.0.tar.gz 2961097 BLAKE2B 23b592daa16fd215688f149d99258209b819caa843d26c889fb4016aae6d6614a9f87dd13fa1d2aa254fadb5169cf7d57ba02b7b15af79611995148d698ca2ec SHA512 2b4e676f956c3456bf3ca435a7d80e1a0a9f36872ba3a820072d1e13ed5751a8546f424369731afd4ccddc298ec0658bb4384d2e18670b108dd1b3a99fc205f4
 DIST fonttools-4.31.1.tar.gz 2964489 BLAKE2B d1bb7059383785dd527f7276ef876042f81d3e2cc5acc1b69e111b540cf8d35273a0070e6f0602ca438f35e3b83d0a04736cd5c97b1b7669822d1a6b1ad1b487 SHA512 cdf70f376e690ab1edc5e761ba45d1ddd7760c3aefdb5e9b88cc97118edd4ff694789c8b79ece791b4b6a597dcac1abb0eec5f0634f1db0792e5e62a2137282d
 DIST fonttools-4.31.2.tar.gz 2965796 BLAKE2B d776073e7a9358e67b8753dd4557e2b1b4c44d9662c8c728abe42d970bca1db1789a655df8865fef39eed3a32271749d2cb772e306f34efc87e737b7384c0b5d SHA512 50cc8bca9136675a413ac947b583f694d512872127cee129a78505d0259fe1cf6922f806558761af982758f72c7d95e1245b8de55b6ebd6ddd3bd7506d41abcf
+DIST fonttools-4.32.0.tar.gz 2966840 BLAKE2B 67a79c8c2e26f9f72fcf6ea4ab5ee3712d3541b47528a209221f9fcf82a5b5db589561200e4b6911a32102a4f4dc4b4e34c8271eb97b1cee18a81b3039efdf03 SHA512 a71a44601c7ec9f709ddc14da1c26d1248909fba8a0bfb7104ebe5f9b85949fe479c5eabdd2c94086d9999756035291e68bb7e861488d4123ccf667ac3ac2e03
diff --git a/dev-python/fonttools/fonttools-4.32.0.ebuild b/dev-python/fonttools/fonttools-4.32.0.ebuild
new file mode 100644
index 000000000000..0597adaf64a8
--- /dev/null
+++ b/dev-python/fonttools/fonttools-4.32.0.ebuild
@@ -0,0 +1,58 @@
+# 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} )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Library for manipulating TrueType, OpenType, AFM and Type1 fonts"
+HOMEPAGE="https://github.com/fonttools/fonttools/"
+SRC_URI="https://github.com/fonttools/fonttools/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+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}
+	dev-python/cython[${PYTHON_USEDEP}]
+	test? (
+		app-arch/brotli[python,${PYTHON_USEDEP}]
+		app-arch/zopfli
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# When dev-python/pytest-shutil is installed, we get weird import errors.
+	# This is due to incomplete nesting in the Tests/ tree:
+	#
+	#   Tests/feaLib/__init__.py
+	#   Tests/ufoLib/__init__.py
+	#   Tests/svgLib/path/__init__.py
+	#   Tests/otlLib/__init__.py
+	#   Tests/varLib/__init__.py
+	#
+	# This tree requires an __init__.py in Tests/svgLib/ too, bug #701148.
+	touch Tests/svgLib/__init__.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+src_configure() {
+	export FONTTOOLS_WITH_CYTHON=1
+}
+
+src_test() {
+	# virtualx used when matplotlib is installed causing plot module tests to run
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	epytest Tests fontTools || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/graphviz/Manifest b/dev-python/graphviz/Manifest
index 889b66a36e2e..d3ca355b52cf 100644
--- a/dev-python/graphviz/Manifest
+++ b/dev-python/graphviz/Manifest
@@ -1 +1,2 @@
 DIST graphviz-0.19.1.zip 247779 BLAKE2B c0b226c2ae66f8b583a30cf2842b8cfdecd926f0e7f32fbbfb4dae17ce14792d0af8d8cf6de53cc9a7facdeb8b0a4a078b962eabf64460e1fd42dd995e069428 SHA512 3aa078887458d7bcd173c46ee6e4d8dbdae0c9103755e61e5a027c18e5d8913990aa16a595e80228607c17db1aa9dffdb93e264cafafc8b6318bc3a87547bc5d
+DIST graphviz-0.19.2.zip 248057 BLAKE2B 40fbbeea1f347f3843898c088f3c1ee81eee321aeaaa4bf42d97343d6527a4d43a207bd2e6a5833b04aa50c8be2e58ba77ec99147dfcf22a9eefed733afc0cc8 SHA512 a1dc396bc0b0572a952365d7b22df46fc99a5f081ec02e774d0efa9113c4aa5ca5005855221554cdc96d90997d9efff43b80e1dd858622889afd26d44fbc3671
diff --git a/dev-python/graphviz/graphviz-0.19.2.ebuild b/dev-python/graphviz/graphviz-0.19.2.ebuild
new file mode 100644
index 000000000000..2d5e626d1269
--- /dev/null
+++ b/dev-python/graphviz/graphviz-0.19.2.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/h11/h11-0.13.0-r1.ebuild b/dev-python/h11/h11-0.13.0-r1.ebuild
index 2cce1b86e153..ee237155ac09 100644
--- a/dev-python/h11/h11-0.13.0-r1.ebuild
+++ b/dev-python/h11/h11-0.13.0-r1.ebuild
@@ -14,6 +14,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/hatchling/hatchling-0.22.0.ebuild b/dev-python/hatchling/hatchling-0.22.0.ebuild
index c3dc504de513..33061cc60b9c 100644
--- a/dev-python/hatchling/hatchling-0.22.0.ebuild
+++ b/dev-python/hatchling/hatchling-0.22.0.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}/backend
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv"
+KEYWORDS="~amd64 ~hppa ~ia64 ~riscv ~s390 ~sparc"
 
 RDEPEND="
 	>=dev-python/editables-0.2[${PYTHON_USEDEP}]
diff --git a/dev-python/httpcore/httpcore-0.14.7-r1.ebuild b/dev-python/httpcore/httpcore-0.14.7-r1.ebuild
index f79f73a5f46d..2e1cd8b7caf5 100644
--- a/dev-python/httpcore/httpcore-0.14.7-r1.ebuild
+++ b/dev-python/httpcore/httpcore-0.14.7-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ppc ppc64 ~riscv sparc x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	=dev-python/anyio-3*[${PYTHON_USEDEP}]
diff --git a/dev-python/httpx/httpx-0.22.0-r2.ebuild b/dev-python/httpx/httpx-0.22.0-r2.ebuild
index 6e19d30f2462..7c45c76965a5 100644
--- a/dev-python/httpx/httpx-0.22.0-r2.ebuild
+++ b/dev-python/httpx/httpx-0.22.0-r2.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ppc ppc64 ~riscv sparc x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="cli"
 
 RDEPEND="
diff --git a/dev-python/jupyter_packaging/jupyter_packaging-0.12.0.ebuild b/dev-python/jupyter_packaging/jupyter_packaging-0.12.0-r1.ebuild
index b20039f26afa..1e49be7c7228 100644
--- a/dev-python/jupyter_packaging/jupyter_packaging-0.12.0.ebuild
+++ b/dev-python/jupyter_packaging/jupyter_packaging-0.12.0-r1.ebuild
@@ -18,6 +18,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND="
 	dev-python/packaging[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-60.2.0[${PYTHON_USEDEP}]
 	dev-python/tomlkit[${PYTHON_USEDEP}]
 	dev-python/wheel[${PYTHON_USEDEP}]
 	dev-python/deprecation[${PYTHON_USEDEP}]
diff --git a/dev-python/jupyterlab_pygments/Manifest b/dev-python/jupyterlab_pygments/Manifest
index 648bbbc968fa..149205024411 100644
--- a/dev-python/jupyterlab_pygments/Manifest
+++ b/dev-python/jupyterlab_pygments/Manifest
@@ -1 +1,2 @@
 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
diff --git a/dev-python/jupyterlab_pygments/jupyterlab_pygments-0.2.0.ebuild b/dev-python/jupyterlab_pygments/jupyterlab_pygments-0.2.0.ebuild
new file mode 100644
index 000000000000..fce3dd219c48
--- /dev/null
+++ b/dev-python/jupyterlab_pygments/jupyterlab_pygments-0.2.0.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/prometheus_client/Manifest b/dev-python/prometheus_client/Manifest
index c1268c0ab579..33fb685b2af2 100644
--- a/dev-python/prometheus_client/Manifest
+++ b/dev-python/prometheus_client/Manifest
@@ -1,2 +1,3 @@
 DIST prometheus_client-0.13.1.gh.tar.gz 73480 BLAKE2B 53b2572373024a452731c055fc115ddb3c029b905d455cf9dc6289af91866c13187e58008770aa20969b371cd0852ef20651603e153195fb4658d21a628df5a3 SHA512 8d5263ff00fc4797fa65a446bdab4dc3c717cc091f8cee571fdd2130febc480cc61e73e11145ac2bf9bc0eee132efc92d88a4d4facd61d515234748791a92255
 DIST prometheus_client-0.14.0.gh.tar.gz 76115 BLAKE2B 08cffa53fd97be8ee48e91b69f1091ac52179fb48f2001aea23755e0ffd2e09cb34d97f052b0f38762bbe1f6597aed9bc630cda393bf5cd2f723dcb939f2471a SHA512 6543756b7fcd4b4a1734397c3fc25b14e00c9910133afc89f9836591e554c73a4a9fa4f3bc14b4fca2c922b6c160c769a4da435b337d0709f1884bde67008f7e
+DIST prometheus_client-0.14.1.gh.tar.gz 76321 BLAKE2B fd924e80d32df9fceb8898530893148f3f1131a13e97a3bac56540ba2fe3846c5498bb78d3cdcb312827dd8a8db2624e831880c5c1f348da0522db96dd0ef29e SHA512 882e7193cb344d154df8a7b7fbdfb5c635363c1aea8bde1ea174a7614bc868fe337399db7a1fb90a94128d7bdfedbc741f5f6c44d514d1ca9ab684c7527e7317
diff --git a/dev-python/prometheus_client/prometheus_client-0.14.1.ebuild b/dev-python/prometheus_client/prometheus_client-0.14.1.ebuild
new file mode 100644
index 000000000000..36a4dcd4a61f
--- /dev/null
+++ b/dev-python/prometheus_client/prometheus_client-0.14.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python client for the Prometheus monitoring system"
+HOMEPAGE="
+	https://pypi.org/project/prometheus-client/
+	https://github.com/prometheus/client_python/
+"
+SRC_URI="
+	https://github.com/prometheus/client_python/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S="${WORKDIR}/client_python-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/twisted[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pydantic/pydantic-1.9.0.ebuild b/dev-python/pydantic/pydantic-1.9.0.ebuild
index f0d689f57b9f..6c72b757f6fd 100644
--- a/dev-python/pydantic/pydantic-1.9.0.ebuild
+++ b/dev-python/pydantic/pydantic-1.9.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ppc ppc64 ~riscv sparc x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/typing-extensions[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-toolbox/pytest-toolbox-0.4-r1.ebuild b/dev-python/pytest-toolbox/pytest-toolbox-0.4-r1.ebuild
index 8878f65ad3a4..672c5a146b73 100644
--- a/dev-python/pytest-toolbox/pytest-toolbox-0.4-r1.ebuild
+++ b/dev-python/pytest-toolbox/pytest-toolbox-0.4-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/python-dotenv/python-dotenv-0.20.0.ebuild b/dev-python/python-dotenv/python-dotenv-0.20.0.ebuild
index 9e9a0c759d36..400355f24075 100644
--- a/dev-python/python-dotenv/python-dotenv-0.20.0.ebuild
+++ b/dev-python/python-dotenv/python-dotenv-0.20.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 DEPEND="
 	test? (
diff --git a/dev-python/python-email-validator/python-email-validator-1.1.3.ebuild b/dev-python/python-email-validator/python-email-validator-1.1.3.ebuild
index 1a45f4a36166..d31ab9a3be0d 100644
--- a/dev-python/python-email-validator/python-email-validator-1.1.3.ebuild
+++ b/dev-python/python-email-validator/python-email-validator-1.1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ HOMEPAGE="https://github.com/JoshData/python-email-validator"
 SRC_URI="https://github.com/JoshData/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="CC0-1.0"
-KEYWORDS="amd64 arm arm64 hppa ppc ppc64 ~riscv sparc x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 SLOT="0"
 
 RDEPEND="
diff --git a/dev-python/repoze-lru/repoze-lru-0.7-r1.ebuild b/dev-python/repoze-lru/repoze-lru-0.7-r1.ebuild
index 383181874ad0..240c61b5e296 100644
--- a/dev-python/repoze-lru/repoze-lru-0.7-r1.ebuild
+++ b/dev-python/repoze-lru/repoze-lru-0.7-r1.ebuild
@@ -10,7 +10,7 @@ MY_PN=${PN/-/.}
 MY_P=${MY_PN}-${PV}
 
 DESCRIPTION="A tiny LRU cache implementation and decorator"
-HOMEPAGE="http://www.repoze.org"
+HOMEPAGE="https://pypi.org/project/repoze.lru/"
 SRC_URI="https://github.com/repoze/repoze.lru/archive/${PV}.tar.gz -> ${PN}-${PVR}.tar.gz"
 S="${WORKDIR}/${MY_P}"
 
diff --git a/dev-python/rich/rich-12.2.0.ebuild b/dev-python/rich/rich-12.2.0.ebuild
index cbce1bff92d9..d3b85e081a45 100644
--- a/dev-python/rich/rich-12.2.0.ebuild
+++ b/dev-python/rich/rich-12.2.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND="
 	dev-python/colorama[${PYTHON_USEDEP}]
diff --git a/dev-python/sh/sh-1.14.2.ebuild b/dev-python/sh/sh-1.14.2.ebuild
index 52d142db5169..b776157c2a9f 100644
--- a/dev-python/sh/sh-1.14.2.ebuild
+++ b/dev-python/sh/sh-1.14.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 PATCHES=(
 	"${FILESDIR}/sh-1.12.14-skip-unreliable-test.patch"
diff --git a/dev-python/socksio/socksio-1.0.0.ebuild b/dev-python/socksio/socksio-1.0.0.ebuild
index 23aa3ffb66a2..02500bd8a367 100644
--- a/dev-python/socksio/socksio-1.0.0.ebuild
+++ b/dev-python/socksio/socksio-1.0.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ppc ppc64 ~riscv sparc x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/soupsieve/soupsieve-2.3.2.ebuild b/dev-python/soupsieve/soupsieve-2.3.2.ebuild
index 7743ea5f86db..5fd0b929f012 100644
--- a/dev-python/soupsieve/soupsieve-2.3.2.ebuild
+++ b/dev-python/soupsieve/soupsieve-2.3.2.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv"
+KEYWORDS="~amd64 ~hppa ~ia64 ~riscv ~s390 ~sparc"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/stripe/Manifest b/dev-python/stripe/Manifest
index 39a672a23a21..80151106876e 100644
--- a/dev-python/stripe/Manifest
+++ b/dev-python/stripe/Manifest
@@ -1,3 +1,4 @@
 DIST stripe-2.66.0.tar.gz 234929 BLAKE2B 289c3464c3aa9ef5ebeccaffde383271ca23e704303d5b5499d1f5f1f197483088781d16878749bca03c8ea56209a22173c376ef00510f53d81c733f0a626af8 SHA512 d716e82580757ec0b187a74de1f8ef7bbe2f32468f13c551886bcbadf631eef001df9f4d249f091856b009545ca8b6d60f16c07e79345fee33651e7d27fb31c0
 DIST stripe-2.67.0.tar.gz 235426 BLAKE2B ee396b0b7d3991afdd81e6b051fad0168a7b3dcfaddccc7700292878fc437788dcc40480fea2131dd52e3b787dc6e7b420d6023079f55d9365f76076cc51070d SHA512 099208259c6ca8d69fd6f39f72b9f12f41eace2f0a2a08b017f6141ad06882df742749941326fb8d9898db7c59e32ed74a464ad372d6f7f0a929c9ae4e4d2475
 DIST stripe-2.70.0.tar.gz 239653 BLAKE2B d59d7b452e91169e83e4d4bc10b544fc94c48aa3a967c899136b1b9ea60e835d998c1a5a0c5e131989d9628c36b77e3fe133952dddbede69d0bcfa11dc9fc640 SHA512 62f40d82e4a5d37ce070a2457b8372d903993e209f6a042ab97a93f5ee98eb994c0cac070451e2b130df9a72f4a9ece65600266735b438aff3cc5cf09e217b27
+DIST stripe-2.71.0.tar.gz 239817 BLAKE2B c1b8fad45e7e9fee79f841502aaad1a849f345357d2facfab833bc50129c5d9eac6c2af128ef572f9d295da966b8a38b095786b44bf026eac6f6d001470ae60a SHA512 5acbaba1e2a5e063beafd0b67994a4a4c7d207f220a49e84b7ab3c0288a92150fd10048f7782e32c3033f4a920f5e81a0893610545e5d1f49ee6dbe62aa4b3a5
diff --git a/dev-python/stripe/stripe-2.71.0.ebuild b/dev-python/stripe/stripe-2.71.0.ebuild
new file mode 100644
index 000000000000..eefd4e50929a
--- /dev/null
+++ b/dev-python/stripe/stripe-2.71.0.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} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Stripe python bindings"
+HOMEPAGE="https://github.com/stripe/stripe-python"
+SRC_URI="mirror://pypi/s/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/requests-2.20[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		>=dev-util/stripe-mock-0.122.0
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		net-misc/curl
+	)
+"
+
+distutils_enable_tests pytest
+
+DOCS=( LONG_DESCRIPTION.rst CHANGELOG.md README.md )
+
+python_test() {
+	epytest tests
+}
+
+src_test() {
+	local stripe_mock_port=12111
+	local stripe_mock_max_port=12121
+	local stripe_mock_logfile="${T}/stripe_mock_${EPYTHON}.log"
+	# Try to start stripe-mock until we find a free port
+	while [[ "${stripe_mock_port}" -le "${stripe_mock_max_port}" ]]; do
+		ebegin "Trying to start stripe-mock on port ${stripe_mock_port}"
+		stripe-mock --http-port ${stripe_mock_port} &> "${stripe_mock_logfile}" &
+		local stripe_mock_pid=$!
+		sleep 2
+		# Did stripe-mock start?
+		curl --fail -u "sk_test_123:" \
+			http://127.0.0.1:${stripe_mock_port}/v1/customers &> /dev/null
+		eend $? "Port ${stripe_mock_port} unavailable"
+		if [[ $? -eq 0 ]]; then
+			einfo "stripe-mock running on port ${stripe_mock_port}"
+			break
+		fi
+		(( stripe_mock_port++ ))
+	done
+	if [[ "${stripe_mock_port}" -gt "${stripe_mock_max_port}" ]]; then
+		eerror "Unable to start stripe-mock for tests"
+		die "Please see the logfile located at: ${stripe_mock_logfile}"
+	fi
+
+	local -x STRIPE_MOCK_PORT=${stripe_mock_port}
+	distutils-r1_src_test
+
+	# Tear down stripe-mock
+	kill "${stripe_mock_pid}" || die "Unable to stop stripe-mock"
+}
diff --git a/dev-python/tifffile/Manifest b/dev-python/tifffile/Manifest
index a6d075151da1..394b532caf01 100644
--- a/dev-python/tifffile/Manifest
+++ b/dev-python/tifffile/Manifest
@@ -1,2 +1,3 @@
 DIST tifffile-2022.3.16.gh.tar.gz 263653 BLAKE2B fcd30e2fd38a12438332badb17e937ab095a8088f9c878b84166a67c7486f436a76d39832df22362f7a74de5da537602da82c982fb4dc0699fba1603adefdcef SHA512 8069a87b241cbb11b3efa8ff679106f2f11ff9045d790fb1612076a60b87791f30afffb55b57d19b70ab4441935f418ad91fb0956ab572890704023e63dea84a
 DIST tifffile-2022.3.25.gh.tar.gz 265082 BLAKE2B dd5f3705cb7203fe943b97a5ed5c000b44abf48ec748f38a1468e27e82bd980e4100dd14af5cfd6af5bdee9d0036c5dce37efca1e515f2eb283c0e221150915a SHA512 dc9018991989ca4b89be6f315aaa45ff2fb94c504dd4c1790af1ec68e05a1da85560f5098df2f460b726cea0d4b0e4fc3f12d493dc1a1db8e2cc35d86f547ddf
+DIST tifffile-2022.4.8.gh.tar.gz 266725 BLAKE2B 3ac30337c1c7f26e32335a6d7756b4bf2d961f1e96badbc4ca8e9e5ee344513c61900d507f4098e4f5181b2c95134d0a74b646ce611cf9d3d3b5cc644ed70809 SHA512 1d12ca48dcc9fd8de5f3aa28cdd64a7735493b957d174f8ae49cb8a918075e6b50d4034ad9507d3b9ddd8ed1c595ec9fdace0986421b1993371cfe045698d578
diff --git a/dev-python/tifffile/tifffile-2022.4.8.ebuild b/dev-python/tifffile/tifffile-2022.4.8.ebuild
new file mode 100644
index 000000000000..3afef0f99871
--- /dev/null
+++ b/dev-python/tifffile/tifffile-2022.4.8.ebuild
@@ -0,0 +1,53 @@
+# Copyright 2021-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="Read and write TIFF files"
+HOMEPAGE="
+	https://pypi.org/project/tifffile/
+	https://github.com/cgohlke/tifffile/
+	https://www.lfd.uci.edu/~gohlke/
+"
+SRC_URI="
+	https://github.com/cgohlke/tifffile/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/numpy-1.19.2[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/dask[${PYTHON_USEDEP}]
+		>=dev-python/fsspec-2021.5.0[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/xarray[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# Internet
+	tests/test_tifffile.py::test_class_omexml
+	tests/test_tifffile.py::test_class_omexml_fail
+	tests/test_tifffile.py::test_class_omexml_modulo
+	tests/test_tifffile.py::test_class_omexml_attributes
+	tests/test_tifffile.py::test_class_omexml_multiimage
+	tests/test_tifffile.py::test_write_ome
+	tests/test_tifffile.py::test_write_ome_manual
+	# requires tons of free space
+	tests/test_tifffile.py::test_write_3gb
+	tests/test_tifffile.py::test_write_bigtiff
+	'tests/test_tifffile.py::test_write_imagej_raw'
+)
diff --git a/dev-python/uvicorn/uvicorn-0.17.6.ebuild b/dev-python/uvicorn/uvicorn-0.17.6.ebuild
index 2cf08118b9e4..aa8b645d8a54 100644
--- a/dev-python/uvicorn/uvicorn-0.17.6.ebuild
+++ b/dev-python/uvicorn/uvicorn-0.17.6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/encode/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND="
 	>=dev-python/asgiref-3.4.0[${PYTHON_USEDEP}]
diff --git a/dev-python/watchgod/watchgod-0.8.1.ebuild b/dev-python/watchgod/watchgod-0.8.1.ebuild
index 301f011f2091..c6be653d28cb 100644
--- a/dev-python/watchgod/watchgod-0.8.1.ebuild
+++ b/dev-python/watchgod/watchgod-0.8.1.ebuild
@@ -5,6 +5,7 @@ EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
+
 inherit distutils-r1
 
 DESCRIPTION="Simple, modern file watching and code reload in Python"
@@ -19,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 RDEPEND="
 	=dev-python/anyio-3*[${PYTHON_USEDEP}]
@@ -35,7 +36,6 @@ BDEPEND="
 
 distutils_enable_tests pytest
 
-
 src_prepare() {
 	# increase timeout
 	sed -e '/sleep/s/0.01/1.0/' -i tests/test_watch.py || die
diff --git a/dev-python/websockets/Manifest b/dev-python/websockets/Manifest
index 71abe54223dd..8b086337648b 100644
--- a/dev-python/websockets/Manifest
+++ b/dev-python/websockets/Manifest
@@ -1,3 +1 @@
-DIST websockets-10.0-src.tar.gz 276231 BLAKE2B 6170f0540bc33be3d9a71f596ffee58e6e43c2173239a8fffe4f0c2a7555f8ce26849d85ed7865a5df6a4401f01bb0c928a341598916487cc79152a5031e9bbc SHA512 532289dc411d11cffc6e5aa07013cdad9655f124fbbd5dbdfe92985caf554644976a521466b1d3cbe124de11809e395b5e83195eac87495585779591b189c4d7
-DIST websockets-10.1-src.tar.gz 299315 BLAKE2B 425e7c8597f081874127ac75003aed11ebb2cf647ce9fed9e17c955e485a7a59c95d1112524d3f0d747b796b0cc41972258661c9fc9c7972f68aaebe3223b596 SHA512 c284ec92bc133c7083a72d4f364d9ace13d3eb6d7355ae46084d8097c137cdec3933cae9d5ab72d8a517af38328cea6c39877f747f5386df54a7362271cc7e7b
 DIST websockets-10.2-src.tar.gz 302766 BLAKE2B 2313bab904de3671f973191f1c43d275ede44c87811d82f22c6bd76145610ba5d4ba4d7a1b3a564bfc8c4a9b7921b2edc640af9304733e85deac1e728f0050f3 SHA512 b8c7fbe627e1c411112b0d66e561aa9bcf15d6de07a9cccd203211e0e6af49762774e09f8c5f4523fe214731ae7a96ed4b63639c7ed66fee062cdda3e5fba350
diff --git a/dev-python/websockets/files/websockets-10.0-py3.9-fix-deprecation.patch b/dev-python/websockets/files/websockets-10.0-py3.9-fix-deprecation.patch
deleted file mode 100644
index bbfb500b9094..000000000000
--- a/dev-python/websockets/files/websockets-10.0-py3.9-fix-deprecation.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- a/tests/legacy/test_client_server.py
-+++ b/tests/legacy/test_client_server.py
-@@ -229,7 +229,6 @@ class ClientServerTestsMixin:
-             and "remove loop argument" not in expected_warnings
-         ):  # pragma: no cover
-             expected_warnings += ["There is no current event loop"]
--        self.assertDeprecationWarnings(recorded_warnings, expected_warnings)
-
-     def start_client(
-         self, resource_name="/", user_info=None, deprecation_warnings=None, **kwargs
-@@ -255,7 +254,6 @@ class ClientServerTestsMixin:
-             and "remove loop argument" not in expected_warnings
-         ):  # pragma: no cover
-             expected_warnings += ["There is no current event loop"]
--        self.assertDeprecationWarnings(recorded_warnings, expected_warnings)
-
-     def stop_client(self):
-         try:
-@@ -457,16 +455,12 @@ class CommonClientServerTests:
-             with warnings.catch_warnings(record=True) as recorded_warnings:
-                 unix_server = unix_serve(default_handler, path, loop=self.loop)
-                 self.server = self.loop.run_until_complete(unix_server)
--            self.assertDeprecationWarnings(recorded_warnings, ["remove loop argument"])
-
-             try:
-                 # Like self.start_client() but with unix_connect()
-                 with warnings.catch_warnings(record=True) as recorded_warnings:
-                     unix_client = unix_connect(path, loop=self.loop)
-                     self.client = self.loop.run_until_complete(unix_client)
--                self.assertDeprecationWarnings(
--                    recorded_warnings, ["remove loop argument"]
--                )
-                 try:
-                     self.loop.run_until_complete(self.client.send("Hello!"))
-                     reply = self.loop.run_until_complete(self.client.recv())
diff --git a/dev-python/websockets/websockets-10.0.ebuild b/dev-python/websockets/websockets-10.0.ebuild
deleted file mode 100644
index 7160067a4034..000000000000
--- a/dev-python/websockets/websockets-10.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=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Library for building WebSocket servers and clients in Python"
-HOMEPAGE="https://websockets.readthedocs.io/"
-SRC_URI="
-	https://github.com/aaugustin/${PN}/archive/${PV}.tar.gz -> ${P}-src.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ppc ppc64 ~riscv sparc x86"
-
-distutils_enable_tests unittest
-
-PATCHES=(
-	# Fails checks for deprecations warnings on py3.9 for the loop argument
-	"${FILESDIR}/${P}-py3.9-fix-deprecation.patch"
-)
-
-src_prepare() {
-	# these fail due to timeouts on slower hardware
-	sed -e 's:test_keepalive_ping_with_no_ping_timeout:_&:' \
-		-e 's:test_keepalive_ping(:_&:' \
-		-i tests/legacy/test_protocol.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/websockets/websockets-10.1.ebuild b/dev-python/websockets/websockets-10.1.ebuild
deleted file mode 100644
index 31bf6fedfdc0..000000000000
--- a/dev-python/websockets/websockets-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=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="Library for building WebSocket servers and clients in Python"
-HOMEPAGE="https://websockets.readthedocs.io/"
-SRC_URI="
-	https://github.com/aaugustin/${PN}/archive/${PV}.tar.gz -> ${P}-src.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 hppa ppc ppc64 ~riscv sparc x86"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	# these fail due to timeouts on slower hardware
-	sed -e 's:test_keepalive_ping_with_no_ping_timeout:_&:' \
-		-e 's:test_keepalive_ping(:_&:' \
-		-i tests/legacy/test_protocol.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/websockets/websockets-10.2.ebuild b/dev-python/websockets/websockets-10.2.ebuild
index ddc2c25e3282..c945fb83e6d6 100644
--- a/dev-python/websockets/websockets-10.2.ebuild
+++ b/dev-python/websockets/websockets-10.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/wsproto/wsproto-1.1.0.ebuild b/dev-python/wsproto/wsproto-1.1.0.ebuild
index d08d7e043f7a..b53f8f9a297a 100644
--- a/dev-python/wsproto/wsproto-1.1.0.ebuild
+++ b/dev-python/wsproto/wsproto-1.1.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	>=dev-python/h11-0.9[${PYTHON_USEDEP}]