Adding metadata

author: Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> 2021-11-18 13:48:55 +0000
committer: Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> 2021-11-18 13:48:55 +0000
commit: 073d48d4acaf695eb63fe7b2be1279548e0e796c (patch)
tree: c752d289b2178d2a8930b03455e9c7a0c00088c6 /dev-python
parent: 5ef47db015cbb9d95c77f346c19dcee2332c4f8e (diff)
download: baldeagleos-repo-073d48d4acaf695eb63fe7b2be1279548e0e796c.tar.gz
baldeagleos-repo-073d48d4acaf695eb63fe7b2be1279548e0e796c.tar.xz
baldeagleos-repo-073d48d4acaf695eb63fe7b2be1279548e0e796c.zip
113 files changed, 576 insertions, 291 deletions
diff --git a/dev-python/anyio/anyio-3.2.1.ebuild b/dev-python/anyio/anyio-3.2.1.ebuild
index d2614676d5d2..e710dddfefd9 100644
--- a/dev-python/anyio/anyio-3.2.1.ebuild
+++ b/dev-python/anyio/anyio-3.2.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 sparc x86"
+KEYWORDS="amd64 arm ~arm64 ppc ~ppc64 sparc x86"
 
 RDEPEND="
 	>=dev-python/idna-2.8[${PYTHON_USEDEP}]
diff --git a/dev-python/argon2-cffi/argon2-cffi-21.1.0-r1.ebuild b/dev-python/argon2-cffi/argon2-cffi-21.1.0-r1.ebuild
index b01f6819e017..aab1218b4942 100644
--- a/dev-python/argon2-cffi/argon2-cffi-21.1.0-r1.ebuild
+++ b/dev-python/argon2-cffi/argon2-cffi-21.1.0-r1.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 ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 
 DEPEND="
 	app-crypt/argon2:=
diff --git a/dev-python/arrow/arrow-1.1.1-r1.ebuild b/dev-python/arrow/arrow-1.1.1-r1.ebuild
index 054c6a3af79f..977c8219b7b3 100644
--- a/dev-python/arrow/arrow-1.1.1-r1.ebuild
+++ b/dev-python/arrow/arrow-1.1.1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 hppa ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/python-dateutil-2.7.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/astor/astor-0.8.1.ebuild b/dev-python/astor/astor-0.8.1.ebuild
index 248ea6a8d2e5..e52e51b090e2 100644
--- a/dev-python/astor/astor-0.8.1.ebuild
+++ b/dev-python/astor/astor-0.8.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://pypi.org/project/astor/"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv sparc x86"
+KEYWORDS="amd64 ~arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/backcall/backcall-0.2.0.ebuild b/dev-python/backcall/backcall-0.2.0.ebuild
index 7ad3c5574251..aa522e79f89c 100644
--- a/dev-python/backcall/backcall-0.2.0.ebuild
+++ b/dev-python/backcall/backcall-0.2.0.ebuild
@@ -13,6 +13,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 distutils_enable_tests pytest
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 5c51b11d31c5..16874eed0c1f 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -4,3 +4,4 @@ DIST boto3-1.19.5.tar.gz 433567 BLAKE2B 52c12a4dd18d6f02326f8002b345cc5df224455f
 DIST boto3-1.20.5.tar.gz 439166 BLAKE2B c140e15e497e6cdf6b4b77bb99e0a0f5ac01d5b5793f8bfb210b52bbc09e39e6fe06a957951375e0795210dc1c3b2a0afd2f498bc88e449d9e6846f2b357f016 SHA512 2823466e4851684253d4ce42a8c34e5cbdad6d04c823040fe2cebdf0cffb14d5d3f40e28d57ebec14533fab04ba74f27c25f078ddb8791b8f52d0424e11b39fc
 DIST boto3-1.20.6.tar.gz 440133 BLAKE2B b154714261372cebb8643d529b66fe3a42d30e056cf2a454092d598c51d0cdef723980834be6a36abb892d3022ae8ef67053b22bb176f540e67c3f37422155d8 SHA512 d8d66a761f03beeca10fea8446de1136d418a93b21065aebfefcafe2abfd9b5bbfa243594f54647ad80547e48348086e2be2de129b89f9ca71f308579f11a0b7
 DIST boto3-1.20.7.tar.gz 440428 BLAKE2B f1b2b36799e6c22a40c04226443f15f9174d68a02d2f731df84f6ff0962158e9d940ae5bc04d25fe99a74f105946026ccb66547838734294d649d661071c1e3b SHA512 85493a85789caa5453a4dafa1472c8ecd75c05a819227909092ae03690243eb103c1588cb10e5e5277ab9df49673b9b54fda064a412bdcf6b9e11238b277f450
+DIST boto3-1.20.8.tar.gz 441260 BLAKE2B 9a9e6620fecbcbb4cd28c7ed8d1c6a42c5325e8c44529fa1855c30e3b3a20ab5963e533cfbda1877204075ac2917e8bf3335fa56dcc146813554a33b52bc80af SHA512 6223def67826aaf98dbf5102755f2e6204558534fbbc34552e411ce64ebba4bd03d01f984246ee7c70d06fb5a19313a4da041aa31b33e75867d0591973037009
diff --git a/dev-python/boto3/boto3-1.20.8.ebuild b/dev-python/boto3/boto3-1.20.8.ebuild
new file mode 100644
index 000000000000..ace657bcbe4d
--- /dev/null
+++ b/dev-python/boto3/boto3-1.20.8.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+inherit distutils-r1
+
+DESCRIPTION="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 ~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}]
+	)
+"
+
+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}
+}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index 31e360609a83..46b202160613 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -4,3 +4,4 @@ DIST botocore-1.22.5.tar.gz 8301083 BLAKE2B 91f9d38e7c5bcb0b8f58c04547ad45489f58
 DIST botocore-1.23.5.tar.gz 8374467 BLAKE2B 467092e7d8aa5ccb756132669049865445a47205913964c1c944b20caaf100b1efdd1bf3af9c5416ff079b487e6d4d08ffe6208e2b352d09655cc5be21c88739 SHA512 6afca19b724f9019f21e5993ce970d605b95d31c1a4e969ec1b4080510a5a120b3fa0cfd5ade973a9203bd6b7983a3dbca2f7a03108a9167392efd60d5e2fe9b
 DIST botocore-1.23.6.tar.gz 8387968 BLAKE2B 415a177d591a0ef369f17b8f02563be0fb53bc4e65c2767f41ca11300939585a10146874b6ac5297cdd3dcb36cf6fd2065fd09f3c612c4ba1d954b03a5b15579 SHA512 a46e45b7bb67d7c4bcc5508f38448b9ed3778ed6b6080239459b22b7f753adaf12e8d64496f7d7c71b33bb17ae1744000e9269ea0f545286e56fabe39e7f0340
 DIST botocore-1.23.7.tar.gz 8391467 BLAKE2B dd6cad44c1b8109b76c44bfffa45e74da0fbeaa027429860640e33134dc5f6e5bb813b46d8b662d80b89af46d437c6fb962f0e0ab1edbeca3ee790f3b6d029bf SHA512 a3270da3b6d906bc2372af221400e14039868598ccd56f40f976bcc2638f300ae9990ff367f76e5b5cdf8d46a8a37716865f9a40ca7e79b73a5b8dbcb2b1af7f
+DIST botocore-1.23.8.tar.gz 8407591 BLAKE2B 3b25e56d2408190c3ca6005e902b75dc4e5e7f0909d0f5d79c633e897c0b8b161dde542ccdb02ed6a7e3220d14c1225051e79cc47c945948b750cb58dee65f69 SHA512 11fd831da6e08574d78e3e45b79957dc6c6055ac55955eca7112568a211974a8f985e583b5bbd5f9799117ccb17f71c528930b8b4cc6a113fdbdbf6f72bb1fde
diff --git a/dev-python/botocore/botocore-1.23.8.ebuild b/dev-python/botocore/botocore-1.23.8.ebuild
new file mode 100644
index 000000000000..43b65ed32e9b
--- /dev/null
+++ b/dev-python/botocore/botocore-1.23.8.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+inherit distutils-r1
+
+DESCRIPTION="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 ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/jsonschema[${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}
+}
diff --git a/dev-python/bottleneck/bottleneck-1.3.2.ebuild b/dev-python/bottleneck/bottleneck-1.3.2-r1.ebuild
index e8e34cc2e114..1c7ee284ddd1 100644
--- a/dev-python/bottleneck/bottleneck-1.3.2.ebuild
+++ b/dev-python/bottleneck/bottleneck-1.3.2-r1.ebuild
@@ -2,22 +2,20 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 PYTHON_COMPAT=( python3_{6,7,8,9,10} )
 
 inherit distutils-r1
 
-DESCRIPTION="Fast NumPy array functions written in Cython"
+DESCRIPTION="Fast NumPy array functions written in C"
 HOMEPAGE="https://pypi.org/project/Bottleneck/"
 SRC_URI="https://github.com/kwgoodman/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
-SLOT="0"
 LICENSE="BSD"
+SLOT="0"
 KEYWORDS="amd64 arm arm64 ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 
-RDEPEND="
-	>=dev-python/numpy-1.9.1[${PYTHON_USEDEP}]
-	dev-python/scipy[${PYTHON_USEDEP}]
-"
+RDEPEND=">=dev-python/numpy-1.9.1[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}"
 
 distutils_enable_tests pytest
diff --git a/dev-python/cppy/cppy-1.1.0.ebuild b/dev-python/cppy/cppy-1.1.0.ebuild
index aa676eb28563..a38c4fc97d2c 100644
--- a/dev-python/cppy/cppy-1.1.0.ebuild
+++ b/dev-python/cppy/cppy-1.1.0.ebuild
@@ -13,6 +13,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/cycler/cycler-0.10.0-r1.ebuild b/dev-python/cycler/cycler-0.10.0-r1.ebuild
index 6d3f7714d4e3..4030aab2b31b 100644
--- a/dev-python/cycler/cycler-0.10.0-r1.ebuild
+++ b/dev-python/cycler/cycler-0.10.0-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/defusedxml/defusedxml-0.7.1.ebuild b/dev-python/defusedxml/defusedxml-0.7.1.ebuild
index 24742dc59999..0009740b1c05 100644
--- a/dev-python/defusedxml/defusedxml-0.7.1.ebuild
+++ b/dev-python/defusedxml/defusedxml-0.7.1.ebuild
@@ -17,7 +17,7 @@ S=${WORKDIR}/${P/_/.}
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="examples"
 
 distutils_enable_tests setup.py
diff --git a/dev-python/dictdiffer/dictdiffer-0.9.0.ebuild b/dev-python/dictdiffer/dictdiffer-0.9.0.ebuild
index d1d5bac1493e..9850696807bf 100644
--- a/dev-python/dictdiffer/dictdiffer-0.9.0.ebuild
+++ b/dev-python/dictdiffer/dictdiffer-0.9.0.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 sparc x86"
+KEYWORDS="amd64 arm ~arm64 ppc ~ppc64 sparc x86"
 SLOT="0"
 
 BDEPEND="
diff --git a/dev-python/diskcache/diskcache-5.2.1-r1.ebuild b/dev-python/diskcache/diskcache-5.2.1-r1.ebuild
index 0d6cb38ff6d7..5fb6074d6d27 100644
--- a/dev-python/diskcache/diskcache-5.2.1-r1.ebuild
+++ b/dev-python/diskcache/diskcache-5.2.1-r1.ebuild
@@ -18,7 +18,7 @@ S=${WORKDIR}/python-diskcache-${PV}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 
 distutils_enable_sphinx docs
 distutils_enable_tests pytest
diff --git a/dev-python/fasteners/fasteners-0.16.3.ebuild b/dev-python/fasteners/fasteners-0.16.3.ebuild
index b7ef2bccb45c..8f5d8754cb61 100644
--- a/dev-python/fasteners/fasteners-0.16.3.ebuild
+++ b/dev-python/fasteners/fasteners-0.16.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]"
diff --git a/dev-python/fastjsonschema/fastjsonschema-2.15.1.ebuild b/dev-python/fastjsonschema/fastjsonschema-2.15.1.ebuild
index 2af9416cfc1e..42d7feedf404 100644
--- a/dev-python/fastjsonschema/fastjsonschema-2.15.1.ebuild
+++ b/dev-python/fastjsonschema/fastjsonschema-2.15.1.ebuild
@@ -16,7 +16,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/flit_core/flit_core-3.4.0.ebuild b/dev-python/flit_core/flit_core-3.4.0.ebuild
index f129dffb9ed3..e66528a9487f 100644
--- a/dev-python/flit_core/flit_core-3.4.0.ebuild
+++ b/dev-python/flit_core/flit_core-3.4.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 sparc x86"
+KEYWORDS="amd64 arm ~arm64 ppc ~ppc64 sparc x86"
 
 RDEPEND="
 	dev-python/intreehooks[${PYTHON_USEDEP}]
diff --git a/dev-python/fqdn/fqdn-1.5.1-r1.ebuild b/dev-python/fqdn/fqdn-1.5.1-r1.ebuild
index 3e7cbd8158a8..418dec09b083 100644
--- a/dev-python/fqdn/fqdn-1.5.1-r1.ebuild
+++ b/dev-python/fqdn/fqdn-1.5.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/ypcrts/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 distutils_enable_tests pytest
 distutils_enable_sphinx docs
diff --git a/dev-python/fuzzywuzzy/fuzzywuzzy-0.18.0.ebuild b/dev-python/fuzzywuzzy/fuzzywuzzy-0.18.0.ebuild
index f007d66bd91b..63c580241df8 100644
--- a/dev-python/fuzzywuzzy/fuzzywuzzy-0.18.0.ebuild
+++ b/dev-python/fuzzywuzzy/fuzzywuzzy-0.18.0.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Fuzzy string matching in python"
 HOMEPAGE="https://github.com/seatgeek/fuzzywuzzy"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 sparc x86"
+KEYWORDS="amd64 arm ~arm64 ppc ~ppc64 sparc x86"
 LICENSE="GPL-2"
 SLOT="0"
 
diff --git a/dev-python/httpcore/httpcore-0.13.6.ebuild b/dev-python/httpcore/httpcore-0.13.6.ebuild
index 175d696a0f37..272937cbd9c9 100644
--- a/dev-python/httpcore/httpcore-0.13.6.ebuild
+++ b/dev-python/httpcore/httpcore-0.13.6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/encode/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 sparc x86"
+KEYWORDS="amd64 arm ~arm64 ppc ~ppc64 sparc x86"
 
 RDEPEND="
 	=dev-python/anyio-3*[${PYTHON_USEDEP}]
diff --git a/dev-python/httplib2/Manifest b/dev-python/httplib2/Manifest
index 2cee1e7e3ce7..f8fd61900192 100644
--- a/dev-python/httplib2/Manifest
+++ b/dev-python/httplib2/Manifest
@@ -1 +1,2 @@
 DIST httplib2-0.19.1.tar.gz 263971 BLAKE2B ec254249f5c8df2a0dc3fe4e2e9088f6ca14ba84516be77450beacab41cd295d4e741ac6026471fcf8bb8464ebd732a0a856901e5c09324a0f96ad2338b397e7 SHA512 0c87b3c9923e81c83df5257ce60f7248d86a64aea0a02d5a3f34be68c692c6abd896f95214899dc6e81b23677efc7684a3cba4c1a47261176dd26c3988054e55
+DIST httplib2-0.20.2.gh.tar.gz 407815 BLAKE2B ebb3a35b5842eff570c4d804e5dcffa5afde32841eaf1797afd47a58ff7e4d6f945b20c82ad10afe0abff1dd8c5fb405594dca0c6641f8a7a201a71258478c52 SHA512 cb1e0e365ec7872d20c1a8e3ddb150433dd01f4ec816ae2044be6aad6c21afd00ce00dfc57f1348dcc857a63e02e8ffbd39c78f35bb4bba2e283a48f07102159
diff --git a/dev-python/httplib2/httplib2-0.20.2.ebuild b/dev-python/httplib2/httplib2-0.20.2.ebuild
new file mode 100644
index 000000000000..2ca69ad73a3c
--- /dev/null
+++ b/dev-python/httplib2/httplib2-0.20.2.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A comprehensive HTTP client library"
+HOMEPAGE="https://pypi.org/project/httplib2/"
+SRC_URI="
+	https://github.com/httplib2/httplib2/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+RDEPEND="
+	app-misc/ca-certificates
+	dev-python/pyparsing[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-libs/openssl
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+PATCHES=( "${FILESDIR}"/${PN}-0.12.1-use-system-cacerts.patch )
+
+src_prepare() {
+	sed -i -e '/--cov/d' setup.cfg || die
+	distutils-r1_src_prepare
+}
+
+src_test() {
+	# the bundled certificates use weak MDs
+	pushd tests/tls >/dev/null || die
+	../../script/generate-tls || die
+	popd >/dev/null || die
+
+	# recerting increases serial numbers
+	sed -e 's:E2AA6A96D1BF1AEC:E2AA6A96D1BF1AEF:' \
+		-e 's:E2AA6A96D1BF1AED:E2AA6A96D1BF1AF0:' \
+		-i tests/test_https.py || die
+
+	distutils-r1_src_test
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# broken by using system certificates
+		tests/test_cacerts_from_env.py::test_certs_file_from_builtin
+		tests/test_cacerts_from_env.py::test_certs_file_from_environment
+		tests/test_cacerts_from_env.py::test_with_certifi_removed_from_modules
+
+		# broken by new PySocks, probably
+		tests/test_proxy.py::test_server_not_found_error_is_raised_for_invalid_hostname
+		tests/test_proxy.py::test_socks5_auth
+
+		# broken by recerting (TODO)
+		tests/test_https.py::test_min_tls_version
+		tests/test_https.py::test_max_tls_version
+	)
+
+	# tests in python* are replaced by tests/
+	# upstream fails at cleaning up stuff
+	epytest tests
+}
diff --git a/dev-python/imageio/Manifest b/dev-python/imageio/Manifest
index 1bf6c23dfbc2..b4377f0e146c 100644
--- a/dev-python/imageio/Manifest
+++ b/dev-python/imageio/Manifest
@@ -1,2 +1,3 @@
 DIST imageio-2.10.4.gh.tar.gz 335495 BLAKE2B 66f8662953d7023557d4fc98b9cf2cfa00346a14286b72dd1b3abf618ee6da36da341c4a57116197e0f138424ef01050cc9176c6afcf277796aa61199e5a1530 SHA512 562bb0d7c8e627e491910f997947a4ffe967ed6dcf3d281b07145f9c8148ca0f2d9775bc89c9024ebc9bfa54f03a60aadc30a84827c050f18dbb23286ac18b96
 DIST imageio-2.10.5.gh.tar.gz 335546 BLAKE2B 1bfd418bb59f217c2108be9aedf35d1b6326d29d476ac6648041b38efa44a2220212f170cae90005e027006adfe55178dee699a1e4b37b7e948863c61432afe8 SHA512 2a058e8ce7e2ad650bea05573d249c1c06326dd1ed0f47517c3a0095a2e03fa2b90ffa5f8aae535e937b8b9fd8153ccb13267773183e45639205faddab08348a
+DIST imageio-2.11.0.gh.tar.gz 339057 BLAKE2B 6dd5661866135b472a062b57b424e8ff044510488b1ccd291552f979263f2f03d3feb00ad9ab035249a2966711e804a95ff7e8f174a1f0773445782365744b6c SHA512 b42f05eabcbee4fb4bb66793cca04137b4db2695269c204b2fec43527ab6a1d9e29c688061ee53c28454b64e09343d69cc931867c5aca01d47145bd734348629
diff --git a/dev-python/imageio/imageio-2.11.0.ebuild b/dev-python/imageio/imageio-2.11.0.ebuild
new file mode 100644
index 000000000000..b7c5f792ae7a
--- /dev/null
+++ b/dev-python/imageio/imageio-2.11.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+inherit distutils-r1
+
+DESCRIPTION="Python library for reading and writing image data"
+HOMEPAGE="https://imageio.github.io/"
+SRC_URI="
+	https://github.com/imageio/imageio/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+PROPERTIES="test_network"
+RESTRICT="test"
+
+RDEPEND="
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	media-libs/freeimage
+"
+BDEPEND="
+	test? (
+		dev-python/psutil[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# Fails because of system installed freeimage
+	tests/test_core.py::test_findlib2
+)
+
+EPYTEST_IGNORE=(
+	# Needs unpackaged imageio_ffmpeg
+	tests/test_ffmpeg.py
+	tests/test_ffmpeg_info.py
+	# Needs tifffile
+	tests/test_tifffile.py
+)
diff --git a/dev-python/immutables/immutables-0.16.ebuild b/dev-python/immutables/immutables-0.16.ebuild
index dc90bbcecb9b..38f00bcc731f 100644
--- a/dev-python/immutables/immutables-0.16.ebuild
+++ b/dev-python/immutables/immutables-0.16.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/MagicStack/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv sparc x86"
+KEYWORDS="amd64 ~arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/intreehooks/intreehooks-1.0.ebuild b/dev-python/intreehooks/intreehooks-1.0.ebuild
index 5389aaaabb65..dbeb34640f32 100644
--- a/dev-python/intreehooks/intreehooks-1.0.ebuild
+++ b/dev-python/intreehooks/intreehooks-1.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 ppc ~ppc64 sparc x86"
+KEYWORDS="amd64 arm ~arm64 ppc ~ppc64 sparc x86"
 IUSE="examples"
 
 RDEPEND="
diff --git a/dev-python/ipykernel/ipykernel-5.5.4-r2.ebuild b/dev-python/ipykernel/ipykernel-5.5.4-r2.ebuild
index 2de329e648a8..47a3bc4f5ddb 100644
--- a/dev-python/ipykernel/ipykernel-5.5.4-r2.ebuild
+++ b/dev-python/ipykernel/ipykernel-5.5.4-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/ipyparallel/ipyparallel-6.3.0-r1.ebuild b/dev-python/ipyparallel/ipyparallel-6.3.0-r1.ebuild
index 0742df1856c5..bd019742b981 100644
--- a/dev-python/ipyparallel/ipyparallel-6.3.0-r1.ebuild
+++ b/dev-python/ipyparallel/ipyparallel-6.3.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 hppa ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 
 # About tests and tornado
 # Upstreams claims to work fine with tornado 5, and it's indeed possible to
diff --git a/dev-python/ipyparallel/ipyparallel-7.1.0.ebuild b/dev-python/ipyparallel/ipyparallel-7.1.0.ebuild
index 4f75a9c00281..6a6a0b46eea6 100644
--- a/dev-python/ipyparallel/ipyparallel-7.1.0.ebuild
+++ b/dev-python/ipyparallel/ipyparallel-7.1.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ia64 sparc x86"
+KEYWORDS="amd64 ~arm ~hppa ~ia64 ~riscv sparc x86"
 
 RDEPEND="
 	dev-python/entrypoints[${PYTHON_USEDEP}]
@@ -57,6 +57,15 @@ python_test() {
 		ipyparallel/tests/test_view.py::TestView::test_unicode_apply_result
 		ipyparallel/tests/test_view.py::TestView::test_unicode_execute
 		ipyparallel/tests/test_view.py::TestView::test_sync_imports_quiet
+		# Gets upset that a timeout _doesn't_ occur, presumably because
+		# we're cranking up too many test timeouts. Oh well.
+		# bug #823458#c3
+		ipyparallel/tests/test_asyncresult.py::AsyncResultTest::test_wait_for_send
+		# We could patch the timeout for these too but they're going to be inherently
+		# fragile anyway based on what they do.
+		ipyparallel/tests/test_client.py::TestClient::test_activate
+		ipyparallel/tests/test_client.py::TestClient::test_lazy_all_targets
+		ipyparallel/tests/test_client.py::TestClient::test_wait_for_engines
 	)
 	[[ ${EPYTHON} == python3.10 ]] && deselect+=(
 		# failing due to irrelevant warnings
diff --git a/dev-python/ipython/ipython-7.28.0.ebuild b/dev-python/ipython/ipython-7.28.0.ebuild
index d3661053cb2a..d9d57b535644 100644
--- a/dev-python/ipython/ipython-7.28.0.ebuild
+++ b/dev-python/ipython/ipython-7.28.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 hppa ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="doc examples matplotlib notebook nbconvert qt5 +smp test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/ipython_genutils/ipython_genutils-0.2.0-r2.ebuild b/dev-python/ipython_genutils/ipython_genutils-0.2.0-r2.ebuild
index 66857939620f..eba05d1c1ec7 100644
--- a/dev-python/ipython_genutils/ipython_genutils-0.2.0-r2.ebuild
+++ b/dev-python/ipython_genutils/ipython_genutils-0.2.0-r2.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 ~ia64 ~ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 # Needed because package provides decorators which use nose
 RDEPEND="dev-python/nose[${PYTHON_USEDEP}]"
diff --git a/dev-python/ipywidgets/ipywidgets-7.6.5.ebuild b/dev-python/ipywidgets/ipywidgets-7.6.5.ebuild
index 0e25ddfe5dfb..832a7458ecb3 100644
--- a/dev-python/ipywidgets/ipywidgets-7.6.5.ebuild
+++ b/dev-python/ipywidgets/ipywidgets-7.6.5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 hppa ~ia64 ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/ipykernel-4.5.1[${PYTHON_USEDEP}]
diff --git a/dev-python/isodate/isodate-0.6.0-r2.ebuild b/dev-python/isodate/isodate-0.6.0-r2.ebuild
index ef66e459c89b..551d1095fc7d 100644
--- a/dev-python/isodate/isodate-0.6.0-r2.ebuild
+++ b/dev-python/isodate/isodate-0.6.0-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/isoduration/isoduration-20.11.0.ebuild b/dev-python/isoduration/isoduration-20.11.0.ebuild
index 2b6c89e96581..71fcb4424ae9 100644
--- a/dev-python/isoduration/isoduration-20.11.0.ebuild
+++ b/dev-python/isoduration/isoduration-20.11.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND=">=dev-python/arrow-0.15.0[${PYTHON_USEDEP}]"
 BDEPEND="
diff --git a/dev-python/jeepney/jeepney-0.7.1.ebuild b/dev-python/jeepney/jeepney-0.7.1.ebuild
index cb80c9ffbadf..22140ea1d882 100644
--- a/dev-python/jeepney/jeepney-0.7.1.ebuild
+++ b/dev-python/jeepney/jeepney-0.7.1.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 ~ia64 ~ppc ppc64 ~riscv sparc x86"
+KEYWORDS="amd64 ~arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 IUSE="examples"
 
 BDEPEND="
diff --git a/dev-python/josepy/Manifest b/dev-python/josepy/Manifest
index 4d63ec31c613..810cfffcbf53 100644
--- a/dev-python/josepy/Manifest
+++ b/dev-python/josepy/Manifest
@@ -1 +1,2 @@
 DIST josepy-1.10.0.tar.gz 58662 BLAKE2B 367d97a316c3adb33b9e3e2cc8400fc95fef09c5640c9747da852c0c1913dc6db3341e5b40bf1bd54d5f4619ee05642de1a72566f0d41c44aed731da8e341540 SHA512 517476c4b4df35b066f48e20e2c31bf458b998553a740dbfa4a682a94353db1cc9d706cee9429cb34b9347e8d78b97bf4a8f930334b86febfe56f5c9f779b42f
+DIST josepy-1.11.0.tar.gz 59198 BLAKE2B 862030d501f1c2316ef30800fda7dbf7dd36b9e49434605b3dc7c329d4ff2d405fc8483ae8a8a1346af60a1e80c018af4f0c17a3d5d00881da03c3eff561c81b SHA512 06aed9534434a94f7b922270221aaa85feb4ba9d836460303ecb7fea1c5679d557a6dad6d32bbd1a05ccc4855318fb56752ebea91498bb8c36884cf7b3d01859
diff --git a/dev-python/josepy/josepy-1.11.0.ebuild b/dev-python/josepy/josepy-1.11.0.ebuild
new file mode 100644
index 000000000000..346ff48a6419
--- /dev/null
+++ b/dev-python/josepy/josepy-1.11.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{6,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/jsonpointer/jsonpointer-2.1.ebuild b/dev-python/jsonpointer/jsonpointer-2.1.ebuild
index 51fa93b93fc4..8fc28b43ceaf 100644
--- a/dev-python/jsonpointer/jsonpointer-2.1.ebuild
+++ b/dev-python/jsonpointer/jsonpointer-2.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 python_test() {
 	"${EPYTHON}" tests.py || die "Tests fail with ${EPYTHON}"
diff --git a/dev-python/jsonschema/jsonschema-4.1.2-r1.ebuild b/dev-python/jsonschema/jsonschema-4.1.2-r1.ebuild
index 6aafb42b3232..2d3465b8e849 100644
--- a/dev-python/jsonschema/jsonschema-4.1.2-r1.ebuild
+++ b/dev-python/jsonschema/jsonschema-4.1.2-r1.ebuild
@@ -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 ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 hppa ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/attrs[${PYTHON_USEDEP}]
diff --git a/dev-python/jupyter_client/jupyter_client-6.1.12.ebuild b/dev-python/jupyter_client/jupyter_client-6.1.12.ebuild
index f2c008397d06..2a219603415e 100644
--- a/dev-python/jupyter_client/jupyter_client-6.1.12.ebuild
+++ b/dev-python/jupyter_client/jupyter_client-6.1.12.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/async_generator[${PYTHON_USEDEP}]
diff --git a/dev-python/jupyter_core/jupyter_core-4.8.1.ebuild b/dev-python/jupyter_core/jupyter_core-4.8.1.ebuild
index 997c7e94f69a..7568488b06ad 100644
--- a/dev-python/jupyter_core/jupyter_core-4.8.1.ebuild
+++ b/dev-python/jupyter_core/jupyter_core-4.8.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="dev-python/traitlets[${PYTHON_USEDEP}]"
 BDEPEND="
diff --git a/dev-python/jupyterlab_pygments/jupyterlab_pygments-0.1.2.ebuild b/dev-python/jupyterlab_pygments/jupyterlab_pygments-0.1.2.ebuild
index d421f7729879..fa632bd83117 100644
--- a/dev-python/jupyterlab_pygments/jupyterlab_pygments-0.1.2.ebuild
+++ b/dev-python/jupyterlab_pygments/jupyterlab_pygments-0.1.2.ebuild
@@ -12,6 +12,6 @@ SRC_URI="https://github.com/jupyterlab/jupyterlab_pygments/archive/${PV}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+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.3.2.ebuild b/dev-python/kiwisolver/kiwisolver-1.3.2.ebuild
index 15aeacf85e37..86dceb815c85 100644
--- a/dev-python/kiwisolver/kiwisolver-1.3.2.ebuild
+++ b/dev-python/kiwisolver/kiwisolver-1.3.2.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}"/kiwi-${MY_PV}
 
 LICENSE="Clear-BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/cppy-1.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/matplotlib-inline/matplotlib-inline-0.1.3.ebuild b/dev-python/matplotlib-inline/matplotlib-inline-0.1.3.ebuild
index e0bd740c9568..cd7ace2be3b3 100644
--- a/dev-python/matplotlib-inline/matplotlib-inline-0.1.3.ebuild
+++ b/dev-python/matplotlib-inline/matplotlib-inline-0.1.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/matplotlib[${PYTHON_USEDEP}]
diff --git a/dev-python/matplotlib/matplotlib-3.4.3-r1.ebuild b/dev-python/matplotlib/matplotlib-3.4.3-r1.ebuild
index 67613e0bdf33..aee9d8dcb270 100644
--- a/dev-python/matplotlib/matplotlib-3.4.3-r1.ebuild
+++ b/dev-python/matplotlib/matplotlib-3.4.3-r1.ebuild
@@ -22,7 +22,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
 # Fonts: BitstreamVera, OFL-1.1
 LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc ~x86"
 IUSE="cairo doc excel examples gtk3 latex qt5 tk webagg wxwidgets"
 
 # internal copy of pycxx highly patched
diff --git a/dev-python/mysqlclient/Manifest b/dev-python/mysqlclient/Manifest
index a37fee4192c5..f36427093892 100644
--- a/dev-python/mysqlclient/Manifest
+++ b/dev-python/mysqlclient/Manifest
@@ -1,2 +1,3 @@
 DIST mysqlclient-1.4.6.tar.gz 85517 BLAKE2B f5e604094b06b919b92ecadc8b3f0249dd038149d1182ba882fe6b0ecd34f0bcceeed21b310318ca3291d9483fd3d1ac385c29415e07a8fbabb6cd65ccee8a2d SHA512 11ecb8a0a6f78edb193cd07472579aec1626994a80a584ff74de18774e7db8896de595f3e4d280b78e8636f53323ebcce8aa294ec7b2a54a839742d9699650ab
 DIST mysqlclient-2.0.3.tar.gz 88886 BLAKE2B 2673f2ab46ddff241260b036b14bad84947a37d002cbacd7aa53127fa3dd4fad7a37c9e2f8704d43cab6a2e0289f2542cb36ccb3f1bd66c64d2440f79d26948e SHA512 49c234bc982b373a74d65361a697dfa4f87f06d193d86d7cc40a732f48c9b2494cea21ee3f95d4d6d2a55b3f7476a92eda0c2e294766cb0ff592e1c54353b9cb
+DIST mysqlclient-2.1.0.tar.gz 87635 BLAKE2B b92e138f6128873912e951087bc4f12b3c00a400521c7ee64da177c6f5a2dfb3a649d92f7a12f45c8716fd8b6b9682a0eff6d9bc111cffac38a27676f67d396a SHA512 a0b2645af225fd6f1f551cfd34c09309a859410e66287c32637901e15beb88632f9a3e87cf2b08a94867a9b2d4a048c56d63d55f523eafc82f1b1b93ce1c843c
diff --git a/dev-python/mysqlclient/mysqlclient-2.1.0.ebuild b/dev-python/mysqlclient/mysqlclient-2.1.0.ebuild
new file mode 100644
index 000000000000..9ffe2c2987f9
--- /dev/null
+++ b/dev-python/mysqlclient/mysqlclient-2.1.0.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+inherit distutils-r1
+
+DESCRIPTION="Python interface to MySQL"
+HOMEPAGE="https://pypi.org/project/mysqlclient/ https://github.com/PyMySQL/mysqlclient-python"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	dev-db/mysql-connector-c:0=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	test? (
+		dev-db/mariadb[server]
+	)
+"
+
+distutils_enable_sphinx doc
+distutils_enable_tests pytest
+
+src_test() {
+	local datadir="${T}/mysql" \
+		install_log="${T}/mysqld_install.log" \
+		pidfile="${T}/mysqld.pid" \
+		socket="${T}/mysqld.sock" \
+		log="${T}/mysqld.log"
+	einfo "Creating test MySQL instance ..."
+	if ! mysql_install_db \
+		--no-defaults \
+		--auth-root-authentication-method=normal \
+		--basedir="${EPREFIX}/usr" \
+		--datadir="${datadir}" >& "${install_log}"
+	then
+		cat "${install_log}"
+		die "Failed to create database"
+	fi
+
+	einfo "Starting test MySQL instance ..."
+	mysqld \
+		--no-defaults \
+		--character-set-server=utf8 \
+		--pid-file="${pidfile}" \
+		--socket="${socket}" \
+		--skip-networking \
+		--datadir="${datadir}" >& "${log}" &
+
+	local i timeout=10
+	einfo "Waiting for MySQL to start for up to ${timeout} seconds ..."
+	for i in seq 1 ${timeout}; do
+		[[ -S "${socket}" ]] && break
+		sleep 1
+	done
+	if [[ ! -S "${socket}" ]]; then
+		cat "${log}"
+		die "MySQL failed to start in ${timeout} seconds"
+	fi
+
+	cat > "${T}/mysql.cnf" <<- EOF
+		[MySQLdb-tests]
+		socket = ${socket}
+		user = root
+		database = test
+	EOF
+
+	distutils-r1_src_test
+
+	einfo "Stopping test MySQL instance ..."
+	pkill -F "${pidfile}" &>/dev/null
+}
+
+python_test() {
+	# The C extension ("_mysql") can't be imported from "${S}/MySQLdb"
+	# so we need to cd somewhere else to make sure "MySQLdb" is imported
+	# from ${BUILD_DIR}/lib (thanks to PYTHONPATH).
+	cd "${T}" || die
+	TESTDB="${T}/mysql.cnf" epytest "${S}"
+}
diff --git a/dev-python/nbclient/nbclient-0.5.4.ebuild b/dev-python/nbclient/nbclient-0.5.4.ebuild
index 87fa0530bd4c..d3bd02b9b9a5 100644
--- a/dev-python/nbclient/nbclient-0.5.4.ebuild
+++ b/dev-python/nbclient/nbclient-0.5.4.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 hppa ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	>=dev-python/jupyter_client-6.1.5[${PYTHON_USEDEP}]
diff --git a/dev-python/nbconvert/nbconvert-6.0.7.ebuild b/dev-python/nbconvert/nbconvert-6.0.7.ebuild
index 1adfed055eaa..2885cd5f0b6b 100644
--- a/dev-python/nbconvert/nbconvert-6.0.7.ebuild
+++ b/dev-python/nbconvert/nbconvert-6.0.7.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 hppa ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	dev-python/bleach[${PYTHON_USEDEP}]
diff --git a/dev-python/nbformat/nbformat-5.1.3.ebuild b/dev-python/nbformat/nbformat-5.1.3.ebuild
index bb025f09cfed..ef97cd7f7c53 100644
--- a/dev-python/nbformat/nbformat-5.1.3.ebuild
+++ b/dev-python/nbformat/nbformat-5.1.3.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/jsonschema-2.4.0[${PYTHON_USEDEP}]
diff --git a/dev-python/nest_asyncio/nest_asyncio-1.5.1.ebuild b/dev-python/nest_asyncio/nest_asyncio-1.5.1.ebuild
index 051dddf00952..adca97afee9b 100644
--- a/dev-python/nest_asyncio/nest_asyncio-1.5.1.ebuild
+++ b/dev-python/nest_asyncio/nest_asyncio-1.5.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ~ppc64 ~riscv ~s390 sparc x86"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/nose_warnings_filters/nose_warnings_filters-0.1.5-r3.ebuild b/dev-python/nose_warnings_filters/nose_warnings_filters-0.1.5-r3.ebuild
index 93f919e06c50..f9552b99d649 100644
--- a/dev-python/nose_warnings_filters/nose_warnings_filters-0.1.5-r3.ebuild
+++ b/dev-python/nose_warnings_filters/nose_warnings_filters-0.1.5-r3.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 ~ia64 ~ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="dev-python/nose[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/notebook/notebook-6.4.4.ebuild b/dev-python/notebook/notebook-6.4.4.ebuild
index a468462447a9..9c8233ad47d6 100644
--- a/dev-python/notebook/notebook-6.4.4.ebuild
+++ b/dev-python/notebook/notebook-6.4.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 hppa ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	>=dev-libs/mathjax-2.4
diff --git a/dev-python/numpydoc/numpydoc-1.1.0.ebuild b/dev-python/numpydoc/numpydoc-1.1.0.ebuild
index 74fb4b0b18a9..7574c9f87528 100644
--- a/dev-python/numpydoc/numpydoc-1.1.0.ebuild
+++ b/dev-python/numpydoc/numpydoc-1.1.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	dev-python/jinja[${PYTHON_USEDEP}]
diff --git a/dev-python/outcome/outcome-1.1.0.ebuild b/dev-python/outcome/outcome-1.1.0.ebuild
index c2c566b24271..d8a2ff45a77e 100644
--- a/dev-python/outcome/outcome-1.1.0.ebuild
+++ b/dev-python/outcome/outcome-1.1.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/python-trio/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="|| ( Apache-2.0 MIT )"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv sparc x86"
+KEYWORDS="amd64 ~arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 
 RDEPEND="dev-python/attrs[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/packaging/Manifest b/dev-python/packaging/Manifest
index 731bb0e9f3d6..5b1b36bc6fa5 100644
--- a/dev-python/packaging/Manifest
+++ b/dev-python/packaging/Manifest
@@ -1 +1,2 @@
 DIST packaging-21.0.gh.tar.gz 79977 BLAKE2B 4ddfa5069f463abeab09ed92650a174d58622927d24b22eed184506d36d9144520e90cd5ea6570e7c06af3c768eda608decc4befb402942e6d6cd1ba5cb10b42 SHA512 612744ad8d0b834709af5d4e2415679271e4cdc304a2e9297ec741e37e62241a041b678568130cd733828a1bf2e5885d62de706934f4018195566107989a6f6b
+DIST packaging-21.3.gh.tar.gz 80471 BLAKE2B a16ba1e74f0c868816131a7cb07b7aa0c14760cf3ad4c3d6737ac30ef99276c33b1f018d29e710f28e8d0cfb0e3e6b91e375d1d17e2b7ec6302164377cd503d0 SHA512 8960deacda26877b73d98a3b632e760e902a16ec7a04707f84044980e4d4fb33e4f584db115c9008066aa876079f28633bafe37fbd5ce9a23830b6b89eb4ae7a
diff --git a/dev-python/packaging/packaging-21.3.ebuild b/dev-python/packaging/packaging-21.3.ebuild
new file mode 100644
index 000000000000..c29896f9b353
--- /dev/null
+++ b/dev-python/packaging/packaging-21.3.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="Core utilities for Python packages"
+HOMEPAGE="
+	https://github.com/pypa/packaging/
+	https://pypi.org/project/packaging/"
+SRC_URI="
+	https://github.com/pypa/packaging/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+SLOT="0"
+LICENSE="|| ( Apache-2.0 BSD-2 )"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="
+	>=dev-python/pyparsing-3.0.6[${PYTHON_USEDEP}]
+"
+DEPEND="
+	test? (
+		dev-python/pretend[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	epytest --capture=no
+}
diff --git a/dev-python/pandas/Manifest b/dev-python/pandas/Manifest
index e581a9764d28..56aff3c70edd 100644
--- a/dev-python/pandas/Manifest
+++ b/dev-python/pandas/Manifest
@@ -1,3 +1,2 @@
-DIST pandas-1.2.3.tar.gz 5466356 BLAKE2B f392321915128769814b3a8b7673cd7b00c9c292f4cb8d8b2e8537f7cc513f92cb6b8ff74dffe3b167987e8fa387738264dbebfdf4019f9cd7afd4f78234212a SHA512 3108424253aa143a85ef166091829bbd8c9b6446b516f37252742146d184f722e1fb8af5b4d04937362a298068019a91392e40c818126df6a7459bab7f3077cb
 DIST pandas-1.3.3.tar.gz 4730758 BLAKE2B 0ef945b2181329265b93fbdb7f9c35497ef847508cc2166b6e2a12ad1a2faa3940d5c8f375754ec34db4e236934a1f903f1e58e6882c6de0018a16b38f50f136 SHA512 a3a871a9954c7249311b9904e588d85fba4d6aa07463308b08b789b93a1eb63e36dac1b0d4254a5379085c05c5633ef31b615d0c60963c796dd7a33d815a5534
 DIST pandas-1.3.4.tar.gz 4734599 BLAKE2B a71b5b57198defcf4f6d848f445c7112668994f089b62a6bce1028ab4ba8a9bf3adc3c393699332fb0c76818ed80164843114e68e57232c495cee03ec5e88009 SHA512 c821365b1f06d69c61b957c4768a5f86b39d97d74b0732ea0eaade9d21bca8f652e38f91f83adf2fc6488f227c75d4e5e64e8f131456e7f0a93ecfcf237190a6
diff --git a/dev-python/pandas/pandas-1.2.3-r1.ebuild b/dev-python/pandas/pandas-1.2.3-r1.ebuild
deleted file mode 100644
index 7e29589c0aa3..000000000000
--- a/dev-python/pandas/pandas-1.2.3-r1.ebuild
+++ /dev/null
@@ -1,190 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-PYTHON_REQ_USE="threads(+)"
-
-VIRTUALX_REQUIRED="manual"
-
-inherit distutils-r1 flag-o-matic multiprocessing optfeature virtualx
-
-DESCRIPTION="Powerful data structures for data analysis and statistics"
-HOMEPAGE="https://pandas.pydata.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P/_/}.tar.gz"
-S="${WORKDIR}/${P/_/}"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="doc full-support minimal test X"
-RESTRICT="!test? ( test )"
-
-RECOMMENDED_DEPEND="
-	>=dev-python/bottleneck-1.2.1[${PYTHON_USEDEP}]
-	>=dev-python/numexpr-2.1[${PYTHON_USEDEP}]
-"
-
-# TODO: add pandas-gbq to the tree
-OPTIONAL_DEPEND="
-	dev-python/beautifulsoup4[${PYTHON_USEDEP}]
-	dev-python/blosc[${PYTHON_USEDEP}]
-	|| (
-		dev-python/html5lib[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-	)
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/matplotlib[${PYTHON_USEDEP}]
-	|| (
-		dev-python/openpyxl[${PYTHON_USEDEP}]
-		dev-python/xlsxwriter[${PYTHON_USEDEP}]
-	)
-	>=dev-python/pytables-3.2.1[${PYTHON_USEDEP}]
-	dev-python/statsmodels[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/xarray-0.10.8[${PYTHON_USEDEP}]
-	' python3_{6,7})
-	>=dev-python/sqlalchemy-0.8.1[${PYTHON_USEDEP}]
-	>=dev-python/xlrd-1.0.0[${PYTHON_USEDEP}]
-	dev-python/xlwt[${PYTHON_USEDEP}]
-	>=dev-python/scipy-1.1[${PYTHON_USEDEP}]
-	X? (
-		|| (
-			dev-python/PyQt5[${PYTHON_USEDEP}]
-			x11-misc/xclip
-			x11-misc/xsel
-		)
-	)
-"
-COMMON_DEPEND="
-	>dev-python/numpy-1.15.4[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-python/cython-0.29.21[${PYTHON_USEDEP}]
-	doc? (
-		${VIRTUALX_DEPEND}
-		app-text/pandoc
-		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
-		dev-python/html5lib[${PYTHON_USEDEP}]
-		dev-python/ipython[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		dev-python/nbsphinx[${PYTHON_USEDEP}]
-		>=dev-python/numpydoc-0.9.1[${PYTHON_USEDEP}]
-		>=dev-python/openpyxl-1.6.1[${PYTHON_USEDEP}]
-		>=dev-python/pytables-3.0.0[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-		dev-python/rpy[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/xlrd[${PYTHON_USEDEP}]
-		dev-python/xlwt[${PYTHON_USEDEP}]
-		dev-python/scipy[${PYTHON_USEDEP}]
-		x11-misc/xclip
-	)
-	test? (
-		${VIRTUALX_DEPEND}
-		${RECOMMENDED_DEPEND}
-		${OPTIONAL_DEPEND}
-		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/openpyxl[${PYTHON_USEDEP}]
-		dev-python/pymysql[${PYTHON_USEDEP}]
-		>=dev-python/pytest-5.1[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		dev-python/psycopg:2[${PYTHON_USEDEP}]
-		dev-python/xlsxwriter[${PYTHON_USEDEP}]
-		x11-misc/xclip
-		x11-misc/xsel
-	)
-"
-# dev-python/statsmodels invokes a circular dep
-#  hence rm from doc? ( ), again
-RDEPEND="${COMMON_DEPEND}
-	!minimal? ( ${RECOMMENDED_DEPEND} )
-	full-support? ( ${OPTIONAL_DEPEND} )
-"
-
-python_prepare_all() {
-	# Prevent un-needed download during build
-	sed -e "/^              'sphinx.ext.intersphinx',/d" \
-		-i doc/source/conf.py || die
-
-	# requires package installed
-	sed -e '/extra_compile_args =/s:"-Werror"::' \
-		-i setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	distutils-r1_python_compile -j1
-}
-
-python_compile_all() {
-	# To build docs the need be located in $BUILD_DIR,
-	# else PYTHONPATH points to unusable modules.
-	if use doc; then
-		cd "${BUILD_DIR}"/lib || die
-		cp -ar "${S}"/doc . && cd doc || die
-		LANG=C PYTHONPATH=. virtx ${EPYTHON} make.py html
-	fi
-}
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	local deselect=(
-		# test for rounding errors, fails if we have better precision
-		# e.g. on amd64 with FMA or on arm64
-		# https://github.com/pandas-dev/pandas/issues/38921
-		pandas/tests/window/test_rolling.py::test_rolling_var_numerical_issues
-
-		# weird issue, doesn't seem very important
-		'pandas/tests/base/test_misc.py::test_memory_usage[series-with-empty-index]'
-	)
-
-	local -x LC_ALL=C.UTF-8
-	pushd "${BUILD_DIR}"/lib > /dev/null || die
-	"${EPYTHON}" -c "import pandas; pandas.show_versions()" || die
-	PYTHONPATH=. pytest pandas -vv --skip-slow --skip-network \
-		${deselect[@]/#/--deselect } \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" \
-		-m "not single" || die "Tests failed with ${EPYTHON}"
-	find . '(' -name .pytest_cache -o -name .hypothesis ')' \
-		-exec rm -r {} + || die
-	popd > /dev/null || die
-}
-
-python_install_all() {
-	if use doc; then
-		dodoc -r "${BUILD_DIR}"/lib/doc/build/html
-		einfo "An initial build of docs is absent of references to statsmodels"
-		einfo "due to circular dependency. To have them included, emerge"
-		einfo "statsmodels next and re-emerge pandas with USE doc"
-	fi
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature "accelerating certain types of NaN evaluations, using specialized cython routines to achieve large speedups." dev-python/bottleneck
-	optfeature "accelerating certain numerical operations, using multiple cores as well as smart chunking and caching to achieve large speedups" ">=dev-python/numexpr-2.1"
-	optfeature "needed for pandas.io.html.read_html" dev-python/beautifulsoup4 dev-python/html5lib dev-python/lxml
-	optfeature "for msgpack compression using blosc" dev-python/blosc
-	optfeature "Template engine for conditional HTML formatting" dev-python/jinja
-	optfeature "Plotting support" dev-python/matplotlib
-	optfeature "Needed for Excel I/O" ">=dev-python/openpyxl-1.6.1" dev-python/xlsxwriter dev-python/xlrd dev-python/xlwt
-	optfeature "necessary for HDF5-based storage" ">=dev-python/pytables-3.2.1"
-	optfeature "R I/O support" dev-python/rpy
-	optfeature "Needed for parts of pandas.stats" dev-python/statsmodels
-	optfeature "SQL database support" ">=dev-python/sqlalchemy-0.8.1"
-	optfeature "miscellaneous statistical functions" dev-python/scipy
-	optfeature "necessary to use pandas.io.clipboard.read_clipboard support" dev-python/PyQt5 dev-python/pygtk x11-misc/xclip x11-misc/xsel
-}
diff --git a/dev-python/pandas/pandas-1.3.3.ebuild b/dev-python/pandas/pandas-1.3.3.ebuild
index 60b02da31014..a510915c9933 100644
--- a/dev-python/pandas/pandas-1.3.3.ebuild
+++ b/dev-python/pandas/pandas-1.3.3.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${P/_/}"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~s390 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~s390 x86"
 IUSE="doc full-support minimal test X"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pandas/pandas-1.3.4.ebuild b/dev-python/pandas/pandas-1.3.4.ebuild
index 8db9ec6321b0..36bc48ca5e16 100644
--- a/dev-python/pandas/pandas-1.3.4.ebuild
+++ b/dev-python/pandas/pandas-1.3.4.ebuild
@@ -42,12 +42,14 @@ OPTIONAL_DEPEND="
 		dev-python/xlsxwriter[${PYTHON_USEDEP}]
 	)
 	>=dev-python/pytables-3.2.1[${PYTHON_USEDEP}]
-	dev-python/statsmodels[${PYTHON_USEDEP}]
 	>=dev-python/xarray-0.12.3[${PYTHON_USEDEP}]
 	>=dev-python/sqlalchemy-1.3.0[${PYTHON_USEDEP}]
 	>=dev-python/xlrd-1.2.0[${PYTHON_USEDEP}]
 	>=dev-python/xlwt-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/scipy-1.1[${PYTHON_USEDEP}]
+	!hppa? (
+		dev-python/statsmodels[${PYTHON_USEDEP}]
+		>=dev-python/scipy-1.1[${PYTHON_USEDEP}]
+	)
 	X? (
 		|| (
 			dev-python/PyQt5[${PYTHON_USEDEP}]
diff --git a/dev-python/pandocfilters/pandocfilters-1.5.0.ebuild b/dev-python/pandocfilters/pandocfilters-1.5.0.ebuild
index 0eb2d4038fc8..74a603dd6aeb 100644
--- a/dev-python/pandocfilters/pandocfilters-1.5.0.ebuild
+++ b/dev-python/pandocfilters/pandocfilters-1.5.0.ebuild
@@ -12,4 +12,4 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 hppa ~ia64 ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
diff --git a/dev-python/patsy/patsy-0.5.2.ebuild b/dev-python/patsy/patsy-0.5.2.ebuild
index 23c70ddb7b1f..aaae9f7dad66 100644
--- a/dev-python/patsy/patsy-0.5.2.ebuild
+++ b/dev-python/patsy/patsy-0.5.2.ebuild
@@ -17,7 +17,7 @@ KEYWORDS="amd64 arm arm64 ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~
 RDEPEND="
 	dev-python/numpy[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/scipy[${PYTHON_USEDEP}]
+	!hppa? ( dev-python/scipy[${PYTHON_USEDEP}] )
 "
 
 distutils_enable_tests pytest
diff --git a/dev-python/pebble/pebble-4.6.3.ebuild b/dev-python/pebble/pebble-4.6.3.ebuild
index 314d08fbfea9..c3510745777e 100644
--- a/dev-python/pebble/pebble-4.6.3.ebuild
+++ b/dev-python/pebble/pebble-4.6.3.ebuild
@@ -17,6 +17,6 @@ S=${WORKDIR}/${P^}
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 hppa ~ia64 ppc ~ppc64 ~s390 ~sparc x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/pickleshare/pickleshare-0.7.5.ebuild b/dev-python/pickleshare/pickleshare-0.7.5.ebuild
index 374c4c6c6392..e5d6daea34e1 100644
--- a/dev-python/pickleshare/pickleshare-0.7.5.ebuild
+++ b/dev-python/pickleshare/pickleshare-0.7.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/path-py-6.2[${PYTHON_USEDEP}]"
diff --git a/dev-python/prometheus_client/prometheus_client-0.11.0.ebuild b/dev-python/prometheus_client/prometheus_client-0.11.0.ebuild
index 9e21f5ce8e99..87ebf1bbe0e1 100644
--- a/dev-python/prometheus_client/prometheus_client-0.11.0.ebuild
+++ b/dev-python/prometheus_client/prometheus_client-0.11.0.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/client_python-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="amd64 ~arm arm64 hppa ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="dev-python/twisted[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/prompt_toolkit/prompt_toolkit-3.0.22.ebuild b/dev-python/prompt_toolkit/prompt_toolkit-3.0.22.ebuild
index 54dff282dde5..c424ad014590 100644
--- a/dev-python/prompt_toolkit/prompt_toolkit-3.0.22.ebuild
+++ b/dev-python/prompt_toolkit/prompt_toolkit-3.0.22.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-python/pydantic/pydantic-1.8.2_p20210719.ebuild b/dev-python/pydantic/pydantic-1.8.2_p20210719.ebuild
index eff223670676..c7f65c1c5540 100644
--- a/dev-python/pydantic/pydantic-1.8.2_p20210719.ebuild
+++ b/dev-python/pydantic/pydantic-1.8.2_p20210719.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${PN}-${COMMIT}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 arm ~arm64 ppc ppc64 sparc x86"
 
 RDEPEND="
 	dev-python/typing-extensions[${PYTHON_USEDEP}]
diff --git a/dev-python/pydecomp/pydecomp-0.3-r2.ebuild b/dev-python/pydecomp/pydecomp-0.3-r2.ebuild
index 2c860fb54a6c..660ba8de6555 100644
--- a/dev-python/pydecomp/pydecomp-0.3-r2.ebuild
+++ b/dev-python/pydecomp/pydecomp-0.3-r2.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://dev.gentoo.org/~dolsen/releases/${PN}/pyDeComp-${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86"
 	S="${WORKDIR}/pyDeComp-${PV}"
 fi
 
diff --git a/dev-python/pyproj/Manifest b/dev-python/pyproj/Manifest
index d7005c7cb28e..bfd6abf2b347 100644
--- a/dev-python/pyproj/Manifest
+++ b/dev-python/pyproj/Manifest
@@ -1 +1,2 @@
 DIST pyproj-3.2.1.tar.gz 213342 BLAKE2B 141f64f33f399e1089009f8047b2541516dc84f2b2133f5e0de5cbaf5d5bef30197f556f630076725a4d78c4244011bf1a7c9a54114d6e166cbb9c10c468da05 SHA512 4ba5bd2d2356c06b711e53581665bdcad3faeb420258c7d4bbb5639784948842a3a6ee0f1f0f50363878c183c38a27063071f25594576eccca146ceb33107761
+DIST pyproj-3.3.0.tar.gz 217539 BLAKE2B 14e2332ffdf3d67e531bb4809cd50fd4902828b0cc3d2427921624d56cf05bdc0f3d5b17ea0516b3f428ad82bc57df840e4bd2dde1232870c9b959c34998c254 SHA512 9e8429a4fbec1950bf72a8c582d4a944a6707ac54a107a7837bf7fe44f8c2e29f1f6d0dcd9f5ff3ef511f3d31016389745cc2dfc14e2089756e6e72fe6074c47
diff --git a/dev-python/pyproj/pyproj-3.3.0.ebuild b/dev-python/pyproj/pyproj-3.3.0.ebuild
new file mode 100644
index 000000000000..abd853670310
--- /dev/null
+++ b/dev-python/pyproj/pyproj-3.3.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+inherit distutils-r1
+
+DESCRIPTION="Python interface to the PROJ library"
+HOMEPAGE="https://github.com/pyproj4/pyproj"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
+
+RDEPEND=">=sci-libs/proj-8.0.0:="
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	test? (
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pandas[${PYTHON_USEDEP}]
+		dev-python/xarray[${PYTHON_USEDEP}]
+		sci-libs/shapely[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
+distutils_enable_tests pytest
+
+python_test() {
+	distutils_install_for_testing
+	cp -r test "${BUILD_DIR}" || die
+	cd "${BUILD_DIR}" || die
+	epytest --import-mode=append -m "not network" test
+}
diff --git a/dev-python/pyrsistent/pyrsistent-0.18.0.ebuild b/dev-python/pyrsistent/pyrsistent-0.18.0.ebuild
index d0c708d37c9e..a7f41a6e0104 100644
--- a/dev-python/pyrsistent/pyrsistent-0.18.0.ebuild
+++ b/dev-python/pyrsistent/pyrsistent-0.18.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/pytest-check/pytest-check-1.0.4.ebuild b/dev-python/pytest-check/pytest-check-1.0.4.ebuild
index 509a0ac56544..1dab3dfb345a 100644
--- a/dev-python/pytest-check/pytest-check-1.0.4.ebuild
+++ b/dev-python/pytest-check/pytest-check-1.0.4.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 sparc x86"
+KEYWORDS="amd64 arm ~arm64 ppc ~ppc64 sparc x86"
 
 RDEPEND=">=dev-python/pytest-6[${PYTHON_USEDEP}]"
 BDEPEND="dev-python/flit_core[${PYTHON_USEDEP}]"
diff --git a/dev-python/pytest-ordering/pytest-ordering-0.6.ebuild b/dev-python/pytest-ordering/pytest-ordering-0.6.ebuild
index d6899e253644..2b85bba44ba8 100644
--- a/dev-python/pytest-ordering/pytest-ordering-0.6.ebuild
+++ b/dev-python/pytest-ordering/pytest-ordering-0.6.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/ftobia/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 sparc x86"
+KEYWORDS="amd64 arm ~arm64 ppc ~ppc64 sparc x86"
 
 RDEPEND="dev-python/pytest[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/pytest-rerunfailures/pytest-rerunfailures-10.2.ebuild b/dev-python/pytest-rerunfailures/pytest-rerunfailures-10.2.ebuild
index a365288947fa..0dbde57f31f8 100644
--- a/dev-python/pytest-rerunfailures/pytest-rerunfailures-10.2.ebuild
+++ b/dev-python/pytest-rerunfailures/pytest-rerunfailures-10.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MPL-2.0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="
 	>=dev-python/pytest-5.0[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-toolbox/pytest-toolbox-0.4.ebuild b/dev-python/pytest-toolbox/pytest-toolbox-0.4.ebuild
index 4f83a4899e4e..54248b7c9b21 100644
--- a/dev-python/pytest-toolbox/pytest-toolbox-0.4.ebuild
+++ b/dev-python/pytest-toolbox/pytest-toolbox-0.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 arm ~arm64 ppc ppc64 sparc x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/pytest-trio/pytest-trio-0.7.0.ebuild b/dev-python/pytest-trio/pytest-trio-0.7.0.ebuild
index edd4233af0d4..9fad8b38849c 100644
--- a/dev-python/pytest-trio/pytest-trio-0.7.0.ebuild
+++ b/dev-python/pytest-trio/pytest-trio-0.7.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( MIT Apache-2.0 )"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv sparc x86"
+KEYWORDS="amd64 ~arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 
 RDEPEND="
 	>=dev-python/async_generator-1.9[${PYTHON_USEDEP}]
diff --git a/dev-python/python-dotenv/python-dotenv-0.19.2.ebuild b/dev-python/python-dotenv/python-dotenv-0.19.2.ebuild
index 2b037ef3ccb6..85ebf0837800 100644
--- a/dev-python/python-dotenv/python-dotenv-0.19.2.ebuild
+++ b/dev-python/python-dotenv/python-dotenv-0.19.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 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 7aba10d7b2b1..c551710082aa 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
@@ -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 ~ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 arm ~arm64 ppc ppc64 sparc x86"
 SLOT="0"
 
 RDEPEND="
diff --git a/dev-python/python-levenshtein/python-levenshtein-0.12.2.ebuild b/dev-python/python-levenshtein/python-levenshtein-0.12.2.ebuild
index 4b7ee88f1ffc..e129ab9aefa6 100644
--- a/dev-python/python-levenshtein/python-levenshtein-0.12.2.ebuild
+++ b/dev-python/python-levenshtein/python-levenshtein-0.12.2.ebuild
@@ -18,4 +18,4 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ia64 ppc ~ppc64 ~riscv sparc x86"
+KEYWORDS="amd64 arm arm64 ~ia64 ppc ~ppc64 ~riscv sparc x86"
diff --git a/dev-python/pyzmq/pyzmq-22.1.0.ebuild b/dev-python/pyzmq/pyzmq-22.1.0.ebuild
index 5d680fc95143..8d9f08265238 100644
--- a/dev-python/pyzmq/pyzmq-22.1.0.ebuild
+++ b/dev-python/pyzmq/pyzmq-22.1.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="+draft"
 
 DEPEND="
diff --git a/dev-python/rfc3339-validator/rfc3339-validator-0.1.4.ebuild b/dev-python/rfc3339-validator/rfc3339-validator-0.1.4.ebuild
index 77cabe2a5b05..ef6b06fd050c 100644
--- a/dev-python/rfc3339-validator/rfc3339-validator-0.1.4.ebuild
+++ b/dev-python/rfc3339-validator/rfc3339-validator-0.1.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="dev-python/six[${PYTHON_USEDEP}]
 	dev-python/strict-rfc3339[${PYTHON_USEDEP}]"
diff --git a/dev-python/rfc3986-validator/rfc3986-validator-0.1.1.ebuild b/dev-python/rfc3986-validator/rfc3986-validator-0.1.1.ebuild
index 194793a23593..83f90dd23aa2 100644
--- a/dev-python/rfc3986-validator/rfc3986-validator-0.1.1.ebuild
+++ b/dev-python/rfc3986-validator/rfc3986-validator-0.1.1.ebuild
@@ -18,7 +18,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="dev-python/rfc3987[${PYTHON_USEDEP}]"
 BDEPEND="test? ( dev-python/hypothesis[${PYTHON_USEDEP}] )"
diff --git a/dev-python/rfc3987/rfc3987-1.3.8-r1.ebuild b/dev-python/rfc3987/rfc3987-1.3.8-r1.ebuild
index d81072665501..e176aae01ca8 100644
--- a/dev-python/rfc3987/rfc3987-1.3.8-r1.ebuild
+++ b/dev-python/rfc3987/rfc3987-1.3.8-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="dev-python/regex[${PYTHON_USEDEP}]"
diff --git a/dev-python/scipy/scipy-1.6.3.ebuild b/dev-python/scipy/scipy-1.6.3.ebuild
index 69d2b6cd1916..e0630cc8fd45 100644
--- a/dev-python/scipy/scipy-1.6.3.ebuild
+++ b/dev-python/scipy/scipy-1.6.3.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="BSD LGPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="doc sparse"
 
 DEPEND="
diff --git a/dev-python/send2trash/send2trash-1.8.0.ebuild b/dev-python/send2trash/send2trash-1.8.0.ebuild
index 21ffb5cf63f2..0188e6bd6684 100644
--- a/dev-python/send2trash/send2trash-1.8.0.ebuild
+++ b/dev-python/send2trash/send2trash-1.8.0.ebuild
@@ -16,6 +16,6 @@ SRC_URI="
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 hppa ~ia64 ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/sh/sh-1.14.2.ebuild b/dev-python/sh/sh-1.14.2.ebuild
index 10a73028bf75..7ce21fd7e4d7 100644
--- a/dev-python/sh/sh-1.14.2.ebuild
+++ b/dev-python/sh/sh-1.14.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 
 PATCHES=(
 	"${FILESDIR}/sh-1.12.14-skip-unreliable-test.patch"
diff --git a/dev-python/sniffio/sniffio-1.2.0.ebuild b/dev-python/sniffio/sniffio-1.2.0.ebuild
index 56988fdbe0bd..4180e2355505 100644
--- a/dev-python/sniffio/sniffio-1.2.0.ebuild
+++ b/dev-python/sniffio/sniffio-1.2.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="|| ( Apache-2.0 MIT )"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.12.0.ebuild b/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.12.0.ebuild
index cf2324335a02..fe4e4d87d680 100644
--- a/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.12.0.ebuild
+++ b/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.12.0.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 sparc x86"
+KEYWORDS="amd64 arm ~arm64 ppc ~ppc64 sparc x86"
 SLOT="0"
 
 BDEPEND="
diff --git a/dev-python/sphinxcontrib-github-alt/sphinxcontrib-github-alt-1.2.ebuild b/dev-python/sphinxcontrib-github-alt/sphinxcontrib-github-alt-1.2.ebuild
index 9363d326f28d..28efd8dd8710 100644
--- a/dev-python/sphinxcontrib-github-alt/sphinxcontrib-github-alt-1.2.ebuild
+++ b/dev-python/sphinxcontrib-github-alt/sphinxcontrib-github-alt-1.2.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~m68k ~ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]"
 BDEPEND="${RDEPEND}"
diff --git a/dev-python/sphinxcontrib-programoutput/sphinxcontrib-programoutput-0.17.ebuild b/dev-python/sphinxcontrib-programoutput/sphinxcontrib-programoutput-0.17.ebuild
index cac63c43140f..c4af2b1c5995 100644
--- a/dev-python/sphinxcontrib-programoutput/sphinxcontrib-programoutput-0.17.ebuild
+++ b/dev-python/sphinxcontrib-programoutput/sphinxcontrib-programoutput-0.17.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~arm64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinxcontrib-trio/sphinxcontrib-trio-1.1.2.ebuild b/dev-python/sphinxcontrib-trio/sphinxcontrib-trio-1.1.2.ebuild
index 1eec03629388..adb077821796 100644
--- a/dev-python/sphinxcontrib-trio/sphinxcontrib-trio-1.1.2.ebuild
+++ b/dev-python/sphinxcontrib-trio/sphinxcontrib-trio-1.1.2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( Apache-2.0 MIT )"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv sparc x86"
+KEYWORDS="amd64 ~arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 SLOT="0"
 
 RDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]"
diff --git a/dev-python/sphobjinv/sphobjinv-2.1-r1.ebuild b/dev-python/sphobjinv/sphobjinv-2.1-r1.ebuild
index 6046e3c57db6..02ed1f0f9ee2 100644
--- a/dev-python/sphobjinv/sphobjinv-2.1-r1.ebuild
+++ b/dev-python/sphobjinv/sphobjinv-2.1-r1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="
 SRC_URI="https://github.com/bskinn/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 sparc x86"
+KEYWORDS="amd64 arm ~arm64 ppc ~ppc64 sparc x86"
 SLOT="0"
 
 RDEPEND="
diff --git a/dev-python/stdio-mgr/stdio-mgr-1.0.1.ebuild b/dev-python/stdio-mgr/stdio-mgr-1.0.1.ebuild
index 18a74fa19316..9081fcb693bd 100644
--- a/dev-python/stdio-mgr/stdio-mgr-1.0.1.ebuild
+++ b/dev-python/stdio-mgr/stdio-mgr-1.0.1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="
 SRC_URI="https://github.com/bskinn/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 sparc x86"
+KEYWORDS="amd64 arm ~arm64 ppc ~ppc64 sparc x86"
 SLOT="0"
 
 RDEPEND=">=dev-python/attrs-17.1[${PYTHON_USEDEP}]"
diff --git a/dev-python/strict-rfc3339/strict-rfc3339-0.7-r1.ebuild b/dev-python/strict-rfc3339/strict-rfc3339-0.7-r1.ebuild
index 1a4381073539..6dfcb0b55471 100644
--- a/dev-python/strict-rfc3339/strict-rfc3339-0.7-r1.ebuild
+++ b/dev-python/strict-rfc3339/strict-rfc3339-0.7-r1.ebuild
@@ -17,6 +17,6 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 distutils_enable_tests unittest
diff --git a/dev-python/terminado/terminado-0.12.1.ebuild b/dev-python/terminado/terminado-0.12.1.ebuild
index 4a34e5cc9320..db4f3728bfb2 100644
--- a/dev-python/terminado/terminado-0.12.1.ebuild
+++ b/dev-python/terminado/terminado-0.12.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD-2"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 hppa ~ia64 ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/ptyprocess[${PYTHON_USEDEP}]
diff --git a/dev-python/timeout-decorator/timeout-decorator-0.5.0.ebuild b/dev-python/timeout-decorator/timeout-decorator-0.5.0.ebuild
index 08dd4aa4c0ce..2698a1b51f5d 100644
--- a/dev-python/timeout-decorator/timeout-decorator-0.5.0.ebuild
+++ b/dev-python/timeout-decorator/timeout-decorator-0.5.0.ebuild
@@ -20,6 +20,6 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 sparc x86"
+KEYWORDS="amd64 arm ~arm64 ppc ~ppc64 sparc x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/traitlets/traitlets-5.1.0.ebuild b/dev-python/traitlets/traitlets-5.1.0.ebuild
index ca9c79afe0ec..609066d3cd27 100644
--- a/dev-python/traitlets/traitlets-5.1.0.ebuild
+++ b/dev-python/traitlets/traitlets-5.1.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 ~ppc ~ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="~amd64 arm ~arm64 hppa ppc ~ppc64 ~riscv ~s390 sparc ~x86"
 
 PATCHES=(
 	"${FILESDIR}/${P}-py310.patch"
diff --git a/dev-python/trio/files/trio-0.19.0-python3.10.patch b/dev-python/trio/files/trio-0.19.0-python3.10.patch
new file mode 100644
index 000000000000..45af8955df3e
--- /dev/null
+++ b/dev-python/trio/files/trio-0.19.0-python3.10.patch
@@ -0,0 +1,25 @@
+https://github.com/python-trio/trio/commit/0a0b75c914e63366f23790d72caa10bdfcc186f6
+https://github.com/python-trio/trio/pull/2061
+
+From a9c54747b90129776f6d2d384e0f64efaac324ee Mon Sep 17 00:00:00 2001
+From: "Nathaniel J. Smith" <njs@pobox.com>
+Date: Tue, 13 Jul 2021 17:34:26 -0700
+Subject: [PATCH] Export IP_RECVTOS, newly added in python 3.10
+
+---
+ trio/socket.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/trio/socket.py b/trio/socket.py
+index 5402f5bc7..afbcefa1d 100644
+--- a/trio/socket.py
++++ b/trio/socket.py
+@@ -117,7 +117,7 @@
+         J1939_PGN_MAX, J1939_PGN_PDU1_MAX, J1939_PGN_REQUEST,
+         SCM_J1939_DEST_ADDR, SCM_J1939_DEST_NAME, SCM_J1939_ERRQUEUE,
+         SCM_J1939_PRIO, SO_J1939_ERRQUEUE, SO_J1939_FILTER, SO_J1939_PROMISC,
+-        SO_J1939_SEND_PRIO, UDPLITE_RECV_CSCOV, UDPLITE_SEND_CSCOV
++        SO_J1939_SEND_PRIO, UDPLITE_RECV_CSCOV, UDPLITE_SEND_CSCOV, IP_RECVTOS
+     )
+     # fmt: on
+ except ImportError:
diff --git a/dev-python/trio/trio-0.19.0.ebuild b/dev-python/trio/trio-0.19.0.ebuild
index 3886d520c349..81769ed7434a 100644
--- a/dev-python/trio/trio-0.19.0.ebuild
+++ b/dev-python/trio/trio-0.19.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/python-trio/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="|| ( Apache-2.0 MIT )"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv sparc x86"
+KEYWORDS="amd64 ~arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 
 RDEPEND="
 	>=dev-python/async_generator-1.9[${PYTHON_USEDEP}]
@@ -38,10 +38,19 @@ BDEPEND="
 	)
 "
 
+PATCHES=(
+	"${FILESDIR}"/${P}-python3.10.patch
+)
+
 EPYTEST_DESELECT=(
 	# Times out on slower arches (ia64 in this case)
 	# https://github.com/python-trio/trio/issues/1753
 	trio/tests/test_unix_pipes.py::test_close_at_bad_time_for_send_all
+
+	# Fail with Python 3.10 on 'IPPROTO_MPTCP'
+	# Everything else passes and this is a simple check for exported symbols
+	# Let's try again with the next release (after 0.19.0).
+	trio/tests/test_exports.py::test_static_tool_sees_all_symbols
 )
 
 distutils_enable_tests --install pytest
diff --git a/dev-python/uritemplate/uritemplate-4.1.0.ebuild b/dev-python/uritemplate/uritemplate-4.1.0.ebuild
index 074931702c86..ec81f82cd404 100644
--- a/dev-python/uritemplate/uritemplate-4.1.0.ebuild
+++ b/dev-python/uritemplate/uritemplate-4.1.0.ebuild
@@ -12,6 +12,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="Apache-2.0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 distutils_enable_tests pytest
diff --git a/dev-python/uvicorn/uvicorn-0.15.0_p20210913.ebuild b/dev-python/uvicorn/uvicorn-0.15.0_p20210913.ebuild
index 4e7fea60101c..6eb6724aca0a 100644
--- a/dev-python/uvicorn/uvicorn-0.15.0_p20210913.ebuild
+++ b/dev-python/uvicorn/uvicorn-0.15.0_p20210913.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${PN}-${COMMIT}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 arm ~arm64 ppc ppc64 sparc x86"
 
 RDEPEND="
 	>=dev-python/asgiref-3.4.0[${PYTHON_USEDEP}]
diff --git a/dev-python/uvloop/uvloop-0.16.0.ebuild b/dev-python/uvloop/uvloop-0.16.0.ebuild
index 85fa26a81300..813f12390fcc 100644
--- a/dev-python/uvloop/uvloop-0.16.0.ebuild
+++ b/dev-python/uvloop/uvloop-0.16.0.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Ultra-fast implementation of asyncio event loop on top of libuv"
 HOMEPAGE="https://github.com/magicstack/uvloop"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ppc ~ppc64 -riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ppc ~ppc64 -riscv sparc ~x86"
 LICENSE="MIT"
 SLOT="0"
 IUSE="doc examples"
diff --git a/dev-python/versioneer/versioneer-0.20.ebuild b/dev-python/versioneer/versioneer-0.20.ebuild
index b1db34e53260..aac4ecc5eff5 100644
--- a/dev-python/versioneer/versioneer-0.20.ebuild
+++ b/dev-python/versioneer/versioneer-0.20.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="public-domain"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/watchgod/watchgod-0.7.ebuild b/dev-python/watchgod/watchgod-0.7.ebuild
index 8d72b4c36b59..35ff7d9f864a 100644
--- a/dev-python/watchgod/watchgod-0.7.ebuild
+++ b/dev-python/watchgod/watchgod-0.7.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 arm ~arm64 ppc ppc64 sparc x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/webcolors/webcolors-1.11.1.ebuild b/dev-python/webcolors/webcolors-1.11.1.ebuild
index ae02f34082da..a414a1cea628 100644
--- a/dev-python/webcolors/webcolors-1.11.1.ebuild
+++ b/dev-python/webcolors/webcolors-1.11.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="dev-python/six[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/websockets/websockets-10.0.ebuild b/dev-python/websockets/websockets-10.0.ebuild
index 493501bed307..4fdd85c4835a 100644
--- a/dev-python/websockets/websockets-10.0.ebuild
+++ b/dev-python/websockets/websockets-10.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ppc ppc64 ~riscv sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86"
 
 distutils_enable_tests unittest
 
diff --git a/dev-python/widgetsnbextension/widgetsnbextension-3.5.1-r1.ebuild b/dev-python/widgetsnbextension/widgetsnbextension-3.5.1-r1.ebuild
index 4a839cf34acb..cebb6cb42461 100644
--- a/dev-python/widgetsnbextension/widgetsnbextension-3.5.1-r1.ebuild
+++ b/dev-python/widgetsnbextension/widgetsnbextension-3.5.1-r1.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 ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 hppa ~ia64 ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="dev-python/notebook[${PYTHON_USEDEP}]"
diff --git a/dev-python/xarray/xarray-0.19.0.ebuild b/dev-python/xarray/xarray-0.19.0.ebuild
index c6bcc3083c6a..06879ff9f5b1 100644
--- a/dev-python/xarray/xarray-0.19.0.ebuild
+++ b/dev-python/xarray/xarray-0.19.0.ebuild
@@ -27,7 +27,7 @@ BDEPEND="
 		dev-python/hypothesis[${PYTHON_USEDEP}]
 		dev-python/matplotlib[${PYTHON_USEDEP}]
 		dev-python/toolz[${PYTHON_USEDEP}]
-		>=dev-python/scipy-1.4[${PYTHON_USEDEP}]
+		!hppa? ( >=dev-python/scipy-1.4[${PYTHON_USEDEP}] )
 	)"
 
 PATCHES=(
diff --git a/dev-python/xarray/xarray-0.20.1.ebuild b/dev-python/xarray/xarray-0.20.1.ebuild
index 5bbb38e7277c..7b8c717a0d9c 100644
--- a/dev-python/xarray/xarray-0.20.1.ebuild
+++ b/dev-python/xarray/xarray-0.20.1.ebuild
@@ -27,7 +27,7 @@ BDEPEND="
 		dev-python/hypothesis[${PYTHON_USEDEP}]
 		dev-python/matplotlib[${PYTHON_USEDEP}]
 		dev-python/toolz[${PYTHON_USEDEP}]
-		>=dev-python/scipy-1.4[${PYTHON_USEDEP}]
+		!hppa? ( >=dev-python/scipy-1.4[${PYTHON_USEDEP}] )
 	)"
 
 PATCHES=(
diff --git a/dev-python/xlwt/xlwt-1.3.0-r1.ebuild b/dev-python/xlwt/xlwt-1.3.0-r1.ebuild
index c8fde49ddd35..8cfbd8c9ea32 100644
--- a/dev-python/xlwt/xlwt-1.3.0-r1.ebuild
+++ b/dev-python/xlwt/xlwt-1.3.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="examples"
 
 distutils_enable_sphinx docs \
diff --git a/dev-python/xmltodict/xmltodict-0.12.0-r1.ebuild b/dev-python/xmltodict/xmltodict-0.12.0-r1.ebuild
index d2697caab367..220e6a7184f7 100644
--- a/dev-python/xmltodict/xmltodict-0.12.0-r1.ebuild
+++ b/dev-python/xmltodict/xmltodict-0.12.0-r1.ebuild
@@ -12,6 +12,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 hppa ~ia64 ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 
 distutils_enable_tests nose
author	Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net>	2021-11-18 13:48:55 +0000
committer	Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net>	2021-11-18 13:48:55 +0000
commit	073d48d4acaf695eb63fe7b2be1279548e0e796c (patch)
tree	c752d289b2178d2a8930b03455e9c7a0c00088c6 /dev-python
parent	5ef47db015cbb9d95c77f346c19dcee2332c4f8e (diff)
download	baldeagleos-repo-073d48d4acaf695eb63fe7b2be1279548e0e796c.tar.gz baldeagleos-repo-073d48d4acaf695eb63fe7b2be1279548e0e796c.tar.xz baldeagleos-repo-073d48d4acaf695eb63fe7b2be1279548e0e796c.zip