Adding metadata

64 files changed, 851 insertions, 479 deletions

diff --git a/dev-python/argon2-cffi/argon2-cffi-21.2.0.ebuild b/dev-python/argon2-cffi/argon2-cffi-21.2.0.ebuild
index fa58eab35d36..b3010337e2ca 100644
--- a/dev-python/argon2-cffi/argon2-cffi-21.2.0.ebuild
+++ b/dev-python/argon2-cffi/argon2-cffi-21.2.0.ebuild
@@ -17,6 +17,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND=">=dev-python/argon2-cffi-bindings-21.2.0[${PYTHON_USEDEP}]"
 BDEPEND="
+	<dev-python/pyproject2setuppy-22[${PYTHON_USEDEP}]
 	test? (
 		dev-python/hypothesis[${PYTHON_USEDEP}]
 	)
diff --git a/dev-python/argon2-cffi/argon2-cffi-21.3.0-r1.ebuild b/dev-python/argon2-cffi/argon2-cffi-21.3.0-r1.ebuild
new file mode 100644
index 000000000000..b71029d10270
--- /dev/null
+++ b/dev-python/argon2-cffi/argon2-cffi-21.3.0-r1.ebuild
@@ -0,0 +1,40 @@
+# 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} pypy3 )
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+inherit distutils-r1
+
+DESCRIPTION="CFFI bindings to the Argon2 password hashing library"
+HOMEPAGE="https://github.com/hynek/argon2-cffi"
+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"
+
+RDEPEND=">=dev-python/argon2-cffi-bindings-21.2.0[${PYTHON_USEDEP}]"
+BDEPEND="
+	>=dev-python/pyproject2setuppy-22[${PYTHON_USEDEP}]
+	test? (
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+	)
+"
+
+DOCS=( AUTHORS.rst FAQ.rst README.rst )
+
+src_prepare() {
+	# Sphinx's conf.py uses importlib.metadata to determine the package
+	# version. However, argon2-cffi is not installed when we try to build
+	# the docs. Therefore, we patch the release version in conf.py.
+	sed -i -e "/^release/s:= .*:= \"${PV}\":" \
+		"docs/conf.py" || die "Unable to patch version in docs"
+	distutils-r1_src_prepare
+}
+
+distutils_enable_sphinx docs \
+	dev-python/furo \
+	dev-python/sphinx-notfound-page
+distutils_enable_tests pytest
diff --git a/dev-python/argon2-cffi/argon2-cffi-21.3.0.ebuild b/dev-python/argon2-cffi/argon2-cffi-21.3.0.ebuild
index 5c2dade9d0cf..e812b0f1b700 100644
--- a/dev-python/argon2-cffi/argon2-cffi-21.3.0.ebuild
+++ b/dev-python/argon2-cffi/argon2-cffi-21.3.0.ebuild
@@ -17,6 +17,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND=">=dev-python/argon2-cffi-bindings-21.2.0[${PYTHON_USEDEP}]"
 BDEPEND="
+	<dev-python/pyproject2setuppy-22[${PYTHON_USEDEP}]
 	test? (
 		dev-python/hypothesis[${PYTHON_USEDEP}]
 	)
diff --git a/dev-python/deepmerge/Manifest b/dev-python/deepmerge/Manifest
index 8cd32614929d..b8843e19e05e 100644
--- a/dev-python/deepmerge/Manifest
+++ b/dev-python/deepmerge/Manifest
@@ -1 +1,2 @@
 DIST deepmerge-0.3.0.gh.tar.gz 14872 BLAKE2B 33983eb14c00583c53efd34fc032a6ba16efba7663eb35a1b215a291484abfbf68f83bc23abf2c518b8ec3924da608caf82b5b8afd432b832e9a3f4f3d9dcd9e SHA512 2770f9d01d0a62034850d450c2646a5e4aaae418b8b278ec3d7e14c31813d2acd4ac06295f30884b7fa75258332270bbf179f6f174862a1e20fc0e35fba7fd47
+DIST deepmerge-1.0.0.gh.tar.gz 14789 BLAKE2B 0a3f7cb72b718995252361864a9208de4b57c32df6da6dc52e6491fa7871be2dcd19be3bcef3eba2d8793009945bfe8e412959da52f9fb1072898026a5ff8837 SHA512 687483ef47f385df345dca6e127897a346a48424eea51c6b8ff35c254517daae0e713f8e86ff2f140ede6ecde98517ddfd9edb5599956f4c716f1f8f2bfcf22a
diff --git a/dev-python/deepmerge/deepmerge-1.0.0.ebuild b/dev-python/deepmerge/deepmerge-1.0.0.ebuild
new file mode 100644
index 000000000000..6bc97e413c75
--- /dev/null
+++ b/dev-python/deepmerge/deepmerge-1.0.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+inherit distutils-r1
+
+DESCRIPTION="Tools to handle merging of nested data structures in python"
+HOMEPAGE="https://deepmerge.readthedocs.io/en/latest"
+SRC_URI="
+	https://github.com/toumorokoshi/deepmerge/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/django-prometheus/Manifest b/dev-python/django-prometheus/Manifest
index 21085c684db9..eb1086f1ce59 100644
--- a/dev-python/django-prometheus/Manifest
+++ b/dev-python/django-prometheus/Manifest
@@ -1 +1,2 @@
 DIST django-prometheus-2.1.0.tar.gz 24615 BLAKE2B 381aa345fac29e71e2b883fb485dce1d6ca3f13fc863d6ca9a62d5cd8f605f8cca727fbc3a3946e707d80f89d7fbaf544610cfb4857a45bc3dc13eeb22aeb4d6 SHA512 0c102467b99df409e31f99fb77d16558bd01c9c11f04ac0f80b59e486bc6e03979e16785083980c43ee3caad26b7a6bf618f9592fcca788ec2793a30d6b44241
+DIST django-prometheus-2.2.0.tar.gz 24995 BLAKE2B db79cbed99d4d5cb7d9ce22dfee69914a63373417b176b4311406f9a1fdcada16447d6ec8cb19ebd14789f520aa1d5755aace824e5462611f81a0cc688566f19 SHA512 a72c8345f220799ad0709e0e73912229267b5e01fc67ae7f647e53ccf7c7e170ad2456c81070a002dc411e840b1129d55719a7aa891b4dabe262837c8c7b3db5
diff --git a/dev-python/django-prometheus/django-prometheus-2.2.0.ebuild b/dev-python/django-prometheus/django-prometheus-2.2.0.ebuild
new file mode 100644
index 000000000000..df23e6aac52c
--- /dev/null
+++ b/dev-python/django-prometheus/django-prometheus-2.2.0.ebuild
@@ -0,0 +1,27 @@
+# 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="Library to export Django metrics for Prometheus"
+HOMEPAGE="https://github.com/korfuri/django-prometheus"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-1.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-python/django[${PYTHON_USEDEP}]
+	>=dev-python/prometheus_client-0.7[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	sed -i "/pytest-runner/d" setup.py || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/flit_core/Manifest b/dev-python/flit_core/Manifest
index b84ae3007093..4c5e33a1faf7 100644
--- a/dev-python/flit_core/Manifest
+++ b/dev-python/flit_core/Manifest
@@ -1,3 +1 @@
-DIST flit_core-3.4.0.tar.gz 27151 BLAKE2B cc31bec47974842d34f62532a9099204aa71c91146758742db111b3eadb395c74de4fc63da0c08b59902cad9130ef16894a680fbc44ecd12d764ad4ae3b388cd SHA512 e391c947b00e023e4ba16043468579c5a1a7f42316d60afeef2eb65d3d7c6980cac1f484f52fea926d8071959fe1cde80d35488f53eec7c3fc6bf54133aee717
-DIST flit_core-3.5.0.tar.gz 27474 BLAKE2B cbe9b2ad9b3b7b3fda90cbdbaedb6a7ebe167cd88ff31c1ca23fc87b5a70c7c486e910cf2dc76bbf4d3aa536b118cf6183ea7d0208a8d532c6f5fb80c218d53a SHA512 e9b1ec9845931fb52c2417a252a0e9ba37c86e7d5b3490a170015c12423e3c8b7adddd24bce62e53192e071d743e2de4cc292b3d6cfed692f3e574970eb23cbb
 DIST flit_core-3.5.1.tar.gz 27497 BLAKE2B 0e47576a05afa306a17e0fe64bd48e4a141fa51df225365495692aeae1c693635f1ea13ba23fdd93543c9b152dcfc2424bd8101a544ad25be2c4561964a8a8bb SHA512 c83b5bd54ffdf2d7dbea340939cb5f0210ffd36aa0f61b02519837843ebbab206a2456a007f76cbae45c2133ef3d21949d1834083c8dddb505ed5bb127a5fdba
diff --git a/dev-python/flit_core/flit_core-3.4.0.ebuild b/dev-python/flit_core/flit_core-3.4.0.ebuild
deleted file mode 100644
index 82e504544d4e..000000000000
--- a/dev-python/flit_core/flit_core-3.4.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Simplified packaging of Python modules (core module)"
-HOMEPAGE="https://pypi.org/project/flit-core/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 sparc x86"
-
-RDEPEND="
-	dev-python/intreehooks[${PYTHON_USEDEP}]
-	dev-python/tomli[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/pyproject2setuppy-11[${PYTHON_USEDEP}]
-	test? ( dev-python/testpath[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/flit_core/flit_core-3.5.0.ebuild b/dev-python/flit_core/flit_core-3.5.0.ebuild
deleted file mode 100644
index e188802475b2..000000000000
--- a/dev-python/flit_core/flit_core-3.5.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Simplified packaging of Python modules (core module)"
-HOMEPAGE="https://pypi.org/project/flit-core/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
-
-RDEPEND="
-	dev-python/intreehooks[${PYTHON_USEDEP}]
-	dev-python/tomli[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/pyproject2setuppy-11[${PYTHON_USEDEP}]
-	test? ( dev-python/testpath[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/flit_core/flit_core-3.5.1.ebuild b/dev-python/flit_core/flit_core-3.5.1.ebuild
index 16058202afec..5646ec8bd7be 100644
--- a/dev-python/flit_core/flit_core-3.5.1.ebuild
+++ b/dev-python/flit_core/flit_core-3.5.1.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 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86"
 
 RDEPEND="
 	dev-python/intreehooks[${PYTHON_USEDEP}]
diff --git a/dev-python/flit_core/metadata.xml b/dev-python/flit_core/metadata.xml
index 2ddfc0ef923d..a90b132540ac 100644
--- a/dev-python/flit_core/metadata.xml
+++ b/dev-python/flit_core/metadata.xml
@@ -13,4 +13,5 @@
   <remote-id type="pypi">flit-core</remote-id>
  </upstream>
  <origin>gentoo-staging</origin>
+ <stabilize-allarches/>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/fonttools/Manifest b/dev-python/fonttools/Manifest
index 1a70a6f6fdc3..edd7b8285a47 100644
--- a/dev-python/fonttools/Manifest
+++ b/dev-python/fonttools/Manifest
@@ -2,3 +2,4 @@ DIST fonttools-4.28.1.tar.gz 2654329 BLAKE2B 4d1f2f5caea6ee3ae73a7791ad34da0c493
 DIST fonttools-4.28.2.tar.gz 2940111 BLAKE2B 32f67f2c270520d9e2091052242e504b9a8e459a87f233e22f50bfe3d17309a09a3c7ad5da20a3411df1c7c58b790dd395535407fdeddb02e7391c28d8d08fa3 SHA512 0295c571e92e71f6467b06bd89afacae76861e374147a2051fe3f5323176c3f3458b977ba2ed25cadcdba9e55b325b6febc50bc9c539d8806471730a15faed47
 DIST fonttools-4.28.3.tar.gz 2944993 BLAKE2B bac7408759ae2854023d5e6f840eb34d431daf0e14ec9fd8d4ac2ecc4ea8e473456611c3531b9131035164f69ba2363a3835206d068b71d4a2ae6ec179d2a32d SHA512 b90d05cedbd06f476c210f2961ebd11c64043785ef43fda2b81fd22126b12642ab63e51363bc22524bb18ee781fa9a8a71edb187b6c69fbf838e0c20f3c9ba0b
 DIST fonttools-4.28.4.tar.gz 2945369 BLAKE2B f178552aca7b41dcec1c03d2a7c3de17cdb5f4b2e057a75e196e78a098b9959a038a9a3b14ee8546d5ea12e3546c22d2a8d9b34a922c0822bf52f78bc03f4f54 SHA512 9ecdf4186e24a8a44c6010432d71f1689ebf8461a404dde71259eb4712c4987d94bbe31b33ad6943fb2e0105fc9f8e9032a94e6ccbb4ac01fe330bb700a39c63
+DIST fonttools-4.28.5.tar.gz 2948092 BLAKE2B b35f4be68cfc2be6afb209c2caee38f7088a1a17dea85fac0f40183b61a3eded59fab47f703587097669f8823a8dbc2e84b0df58305597784bed7f8c2e2b0f28 SHA512 5d87f4fadbcb447d1c1a1e97550f6a477d74bfe8647d14b35097e03e6a45a1a01632d2092483d675c523f97d4a04f39aa9b3175e535b1e1a4f19d619eb40ad5f
diff --git a/dev-python/fonttools/fonttools-4.28.5.ebuild b/dev-python/fonttools/fonttools-4.28.5.ebuild
new file mode 100644
index 000000000000..280f5b4947c7
--- /dev/null
+++ b/dev-python/fonttools/fonttools-4.28.5.ebuild
@@ -0,0 +1,54 @@
+# 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} )
+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() {
+	DISTUTILS_ARGS=( --with-cython )
+}
+
+python_test() {
+	distutils_install_for_testing
+	# virtualx used when matplotlib is installed causing plot module tests to run
+	virtx epytest Tests fontTools
+}
diff --git a/dev-python/funcy/Manifest b/dev-python/funcy/Manifest
index ce164b749883..5e02c0d83cc4 100644
--- a/dev-python/funcy/Manifest
+++ b/dev-python/funcy/Manifest
@@ -1 +1,2 @@
 DIST funcy-1.16.tar.gz 619331 BLAKE2B 55773e12356af6c7fac441cae186cb476f2acbba3b22efd902c2be460f0d021f829c5bf4351ce359fd2062ad47ad576bb74413152c64f2540a6a1b5f869f238e SHA512 e08397c49d66e6d0257b4b140483a139ffdb086dd98a277d499e5777474dc0c6d49055ca121fdc5a17964256d4970da495c09c50fdd2aef2af8839a9328a87ae
+DIST funcy-1.17.tar.gz 112383 BLAKE2B 150133f72ed165bdc9adc3a9f4954dfd5b846dea7b1ee2cae0d6621ebaec3e2ba986cd6596fd86482036aad6476913caec0868db9cf55c067fdbf62ac10953e2 SHA512 d48ce3b7a7b8ee7512df109d651f40ca4dadf681acca6ab0a4857a2ea408f20f6345b9b416ca8b1e924050a842648192b8fe79381c202361bc4d2e25bd55ad05
diff --git a/dev-python/funcy/funcy-1.17.ebuild b/dev-python/funcy/funcy-1.17.ebuild
new file mode 100644
index 000000000000..39d2a500bd16
--- /dev/null
+++ b/dev-python/funcy/funcy-1.17.ebuild
@@ -0,0 +1,19 @@
+# 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="A collection of fancy functional tools focused on practicality"
+HOMEPAGE="https://github.com/Suor/funcy"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="test? ( dev-python/whatever[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests --install pytest
diff --git a/dev-python/grpcio-testing/Manifest b/dev-python/grpcio-testing/Manifest
index 4bfac09d155e..6402755205df 100644
--- a/dev-python/grpcio-testing/Manifest
+++ b/dev-python/grpcio-testing/Manifest
@@ -1 +1,2 @@
 DIST grpcio-testing-1.41.1.tar.gz 16856 BLAKE2B 2aedcdb83800a144f52469fe8aa6d2fac63e8235c1804d9426bbece0d57cd01fce178bf6854b1743f77b95896aabd5831abef74438596e7d188a72ec388502a6 SHA512 9f55056d97bc7aa7f6ee59a94fee1e6ce92b5871da08a54f1e749a3d5bf1d4aec568c9855082a03dd5899ca19da91c9dfd5dda43c27b37347d99ee1615d4ff73
+DIST grpcio-testing-1.43.0.tar.gz 17693 BLAKE2B f75158a870b63c48d19e849f87e4682c13a1d500690ff0f39d0d609c3de2f3086765dc7fe15acd590667fcc8ab8ce5d149517be5cbbb685bc222619b23e367a8 SHA512 4ad3da7805e85c0869c5a8c992d1512942334edeef10812665bdfb4a81b3d07efff08686b93c501f43d12e0c6181717ddbea392f1751a229d7a5fe26f162fae2
diff --git a/dev-python/grpcio-testing/grpcio-testing-1.43.0.ebuild b/dev-python/grpcio-testing/grpcio-testing-1.43.0.ebuild
new file mode 100644
index 000000000000..81967cb8c8a6
--- /dev/null
+++ b/dev-python/grpcio-testing/grpcio-testing-1.43.0.ebuild
@@ -0,0 +1,22 @@
+# 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} )
+
+inherit distutils-r1
+
+DESCRIPTION="Testing utilities for gRPC Python"
+HOMEPAGE="https://grpc.io"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	~dev-python/grpcio-${PV}[${PYTHON_USEDEP}]
+	dev-python/protobuf-python[${PYTHON_USEDEP}]
+"
+BDEPEND="${RDEPEND}"
diff --git a/dev-python/grpcio-tools/Manifest b/dev-python/grpcio-tools/Manifest
index cefbb8ad8db2..ee91d0cef1c9 100644
--- a/dev-python/grpcio-tools/Manifest
+++ b/dev-python/grpcio-tools/Manifest
@@ -1 +1,2 @@
 DIST grpcio-tools-1.41.1.tar.gz 2173046 BLAKE2B 2edfda68c5e5eaa86a69f2061d1b13a6c7070ad4152a20ecea910d4685e0face957aa204c639e4e72b04c131bccca63549a83aa38f0e5201304b48352e4ae3ab SHA512 8f9ea6c2541670cb206059c378b33425fea3d63c3e890ba064581e780dcd3b0ce5f9c890731cac35d14281bfa49182857148fe2794a9373914493c4e0d4ce3b9
+DIST grpcio-tools-1.43.0.tar.gz 2210483 BLAKE2B 5daab31940dc5a21fbfea0985f6056361375be1b45f1a00e9345dc25808050193e20c9316d2a2a18d9a5f503787506f6d76a3bdf95ac6b3b7525873076b9d1e0 SHA512 60a5fa62fc1a81b5a57b47aca212ed94913ca20c3c1055dac18101776177fc0b18cc480c7356332e3eb4cf7819634ddc53d2e77f7c4b582a0fa53e26053f3ed4
diff --git a/dev-python/grpcio-tools/grpcio-tools-1.43.0.ebuild b/dev-python/grpcio-tools/grpcio-tools-1.43.0.ebuild
new file mode 100644
index 000000000000..79d43be41993
--- /dev/null
+++ b/dev-python/grpcio-tools/grpcio-tools-1.43.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+inherit distutils-r1 multiprocessing prefix
+
+DESCRIPTION="Protobuf code generator for gRPC"
+HOMEPAGE="https://grpc.io"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	~dev-python/grpcio-${PV}[${PYTHON_USEDEP}]
+	dev-python/protobuf-python[${PYTHON_USEDEP}]
+"
+
+DEPEND="${RDEPEND}"
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+	hprefixify setup.py
+}
+
+python_configure_all() {
+	export GRPC_PYTHON_BUILD_WITH_CYTHON=1
+	export GRPC_PYTHON_BUILD_EXT_COMPILER_JOBS="$(makeopts_jobs)"
+}
diff --git a/dev-python/grpcio/Manifest b/dev-python/grpcio/Manifest
index 1e0aeb1f7f64..78a9fd483571 100644
--- a/dev-python/grpcio/Manifest
+++ b/dev-python/grpcio/Manifest
@@ -1 +1,2 @@
 DIST grpcio-1.41.1.tar.gz 21241107 BLAKE2B 28600650352c92e215c9cfa150e73835b4dff3946628192bff7f5848c5e2600c37f563c7d1403fb119bebbdcaef4f5e36ac43c4f8609a8338983978501bc21f9 SHA512 555ab9e2524108efb60ec957d419e80e4abc07752bbd265cd1dee5ccd7c55141d9f2f88db6ba5c03d606e266cd72e4650d38316215da8d70358dad971be52fff
+DIST grpcio-1.43.0.tar.gz 21461955 BLAKE2B 406a341d24bf418a006b3f86c25254f3bb3981fd20123fd2d99d53d73e04b8da5500b7d871d8e3d96d1167a1306fd66a05cff418d1af8ff3eba9bb3faa34a199 SHA512 c4e9c7d20e53653c014d3c301f572df26ae84beb8d04fc3d763afcb695d232416ed8e7822f93bed1f9d8aab44f08aaaf36bf2f05aaa6bc3607428efbc0775cb1
diff --git a/dev-python/grpcio/grpcio-1.43.0.ebuild b/dev-python/grpcio/grpcio-1.43.0.ebuild
new file mode 100644
index 000000000000..9f8689683aee
--- /dev/null
+++ b/dev-python/grpcio/grpcio-1.43.0.ebuild
@@ -0,0 +1,47 @@
+# 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} )
+
+inherit distutils-r1 multiprocessing prefix
+
+DESCRIPTION="High-performance RPC framework (python libraries)"
+HOMEPAGE="https://grpc.io"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-libs/openssl-1.1.1:0=[-bindist(-)]
+	>=dev-libs/re2-0.2021.11.01:=
+	>=dev-python/cython-0.28.3[${PYTHON_USEDEP}]
+	dev-python/protobuf-python[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	net-dns/c-ares:=
+	sys-libs/zlib:=
+"
+
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}/1.37.1-cc-flag-test-fix.patch" )
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+	hprefixify setup.py
+}
+
+python_configure_all() {
+	# os.environ.get('GRPC_BUILD_WITH_BORING_SSL_ASM', True)
+	export GRPC_BUILD_WITH_BORING_SSL_ASM=
+	export GRPC_PYTHON_DISABLE_LIBC_COMPATIBILITY=1
+	export GRPC_PYTHON_BUILD_SYSTEM_CARES=1
+	export GRPC_PYTHON_BUILD_SYSTEM_OPENSSL=1
+	export GRPC_PYTHON_BUILD_WITH_SYSTEM_RE2=1
+	export GRPC_PYTHON_BUILD_SYSTEM_ZLIB=1
+	export GRPC_PYTHON_BUILD_WITH_CYTHON=1
+	export GRPC_PYTHON_BUILD_EXT_COMPILER_JOBS="$(makeopts_jobs)"
+}
diff --git a/dev-python/httplib2/Manifest b/dev-python/httplib2/Manifest
index f8fd61900192..8fdc1b335caa 100644
--- a/dev-python/httplib2/Manifest
+++ b/dev-python/httplib2/Manifest
@@ -1,2 +1 @@
-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.19.1-r1.ebuild b/dev-python/httplib2/httplib2-0.19.1-r1.ebuild
deleted file mode 100644
index b2447a0f603b..000000000000
--- a/dev-python/httplib2/httplib2-0.19.1-r1.ebuild
+++ /dev/null
@@ -1,50 +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} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A comprehensive HTTP client library"
-HOMEPAGE="https://pypi.org/project/httplib2/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.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-3[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		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
-}
-
-python_test() {
-	local 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
-	)
-
-	# tests in python* are replaced by tests/
-	# upstream fails at cleaning up stuff
-	epytest ${deselect[@]/#/--deselect } tests
-}
diff --git a/dev-python/httplib2/httplib2-0.20.2.ebuild b/dev-python/httplib2/httplib2-0.20.2.ebuild
index 2ca69ad73a3c..166428a9f965 100644
--- a/dev-python/httplib2/httplib2-0.20.2.ebuild
+++ b/dev-python/httplib2/httplib2-0.20.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 RDEPEND="
 	app-misc/ca-certificates
diff --git a/dev-python/jaraco-functools/Manifest b/dev-python/jaraco-functools/Manifest
index eca5d3781878..e4571f756e61 100644
--- a/dev-python/jaraco-functools/Manifest
+++ b/dev-python/jaraco-functools/Manifest
@@ -1 +1,2 @@
 DIST jaraco.functools-3.4.0.tar.gz 13048 BLAKE2B 437d73c75326e0d94cf15b4dfe9e5c28e44e5016376371458505377b7420930ac880c1f02ab70d4e2d154b41273d108eec5727ccdf59aa19d5674f33aaa107c2 SHA512 ae15014e566b7f18e456d9da2d02b9508b9c5a00e24f24316c44ab65ad655b97942af0094c33d3be777cc5e743b975cde6e15e72f9a003365f9a0efaae4f6dac
+DIST jaraco.functools-3.5.0.tar.gz 13254 BLAKE2B 9165f901106278da562c6b59c3cc29e0b1c4689c5db7955f57a76fca3c12e90d30a80a7dde3420a719b093c41b889e54170bfa6f6f18b6f078e3f4291e59736f SHA512 7257f41506f90ca2fda1bd12fed58fa4d4ff5738547f8cdae8ccad1901e0c818afb701dd8e9050fc77ca1271bc2466d5a542990138bc3db2cf9b04d12850844c
diff --git a/dev-python/jaraco-functools/jaraco-functools-3.5.0.ebuild b/dev-python/jaraco-functools/jaraco-functools-3.5.0.ebuild
new file mode 100644
index 000000000000..5b095f7119cf
--- /dev/null
+++ b/dev-python/jaraco-functools/jaraco-functools-3.5.0.ebuild
@@ -0,0 +1,33 @@
+# 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} pypy3 )
+inherit distutils-r1
+
+MY_PN="${PN/-/.}"
+DESCRIPTION="Additional functions used by other projects by developer jaraco"
+HOMEPAGE="https://github.com/jaraco/jaraco.functools"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	dev-python/more-itertools[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/toml[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/jaraco-classes[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs \
+	">=dev-python/jaraco-packaging-3.2" \
+	">=dev-python/rst-linker-1.9"
+distutils_enable_tests pytest
diff --git a/dev-python/josepy/Manifest b/dev-python/josepy/Manifest
index 810cfffcbf53..722fd8a368ff 100644
--- a/dev-python/josepy/Manifest
+++ b/dev-python/josepy/Manifest
@@ -1,2 +1 @@
-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.10.0.ebuild b/dev-python/josepy/josepy-1.10.0.ebuild
deleted file mode 100644
index 54b8e7465b2d..000000000000
--- a/dev-python/josepy/josepy-1.10.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-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}]
-"
-BDEPEND="test? ( dev-python/mock[${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/josepy/josepy-1.11.0.ebuild b/dev-python/josepy/josepy-1.11.0.ebuild
index 346ff48a6419..65f13bb2a937 100644
--- a/dev-python/josepy/josepy-1.11.0.ebuild
+++ b/dev-python/josepy/josepy-1.11.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/cryptography-0.8[${PYTHON_USEDEP}]
diff --git a/dev-python/mkdocs-material/Manifest b/dev-python/mkdocs-material/Manifest
index 1488d47fba8e..38ce3e7c4f62 100644
--- a/dev-python/mkdocs-material/Manifest
+++ b/dev-python/mkdocs-material/Manifest
@@ -2,3 +2,4 @@ DIST mkdocs-material-7.3.4.tar.gz 7319409 BLAKE2B 5e3805bdb4186637795011436281d5
 DIST mkdocs-material-7.3.6.tar.gz 7391997 BLAKE2B 9ac47337287b724aa30da5c95b5fb54475fe96ac9c1b089f647430699b5393ea8859786214f47a4b32ed84bd509824d94cb876c1e3e40a3935e6669d24077490 SHA512 c29f30971e1e692dfca09408af3eda3b10211dba44f34aae42a61148008a0a3a020579c86bac8fc413a7938e866a9cf4630eab7a91a6e9a734a9ed52e327bceb
 DIST mkdocs-material-8.0.5.tar.gz 7523273 BLAKE2B 93b1f545e90784635a0f9b4c01a697310b18421540fd9563c5307806268af2e48e37c193979b8d86823bd5d875b1cc16d912aab52d108b12d6a796b08f8e7932 SHA512 6508b740ccc4ff7bd30c207cbe437d62c02140566cec047fdf0d98a23894825199b0928764f3fa1fe1314e9e95beaeff817d900dc5bf3d4b42b9b0e677eb3a47
 DIST mkdocs-material-8.1.0.tar.gz 7526249 BLAKE2B 6938ae4ff23ba450520f84630759ce408f1c11d75200281f6c454aa90d6af659d49c0d8f345a87b969e0169d4851a2510906b9e7243a0a93efbc99025dc9792a SHA512 2493edefbdbca0a3708950b62178c66ceefb5fb1868cafcb087bf727c404e3955abb2d45b14e944b4720b532e3cd049fbcae3e0d9b8f36295dede9dd2bdb3717
+DIST mkdocs-material-8.1.3.tar.gz 7654739 BLAKE2B 9b381e99ee2911d9d54a64b40538fb15bf568ba92171d6d42e1679143cf5729c5fabdb24de4d97509bdbdc05e5e282e310c03dc12c973449c935c77ea277dcc9 SHA512 65527fa1b5cd1f3a31cbc84d3bf52aa49844549dde042534f0d24e7bcf175f72ba1b21bda87d1fb4e25307b51f995d8de492b7c5c909f84d075e2b50fe97fc05
diff --git a/dev-python/mkdocs-material/mkdocs-material-8.1.3.ebuild b/dev-python/mkdocs-material/mkdocs-material-8.1.3.ebuild
new file mode 100644
index 000000000000..9b406b3eabe3
--- /dev/null
+++ b/dev-python/mkdocs-material/mkdocs-material-8.1.3.ebuild
@@ -0,0 +1,34 @@
+# 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} )
+
+DOCS_BUILDER="mkdocs"
+DOCS_DEPEND="
+	dev-python/mkdocs-minify-plugin
+	dev-python/mkdocs-redirects
+"
+
+inherit distutils-r1 docs
+
+DESCRIPTION="A Material Design theme for MkDocs"
+HOMEPAGE="
+	https://github.com/squidfunk/mkdocs-material
+	https://pypi.org/project/mkdocs-material
+"
+SRC_URI="https://github.com/squidfunk/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/jinja-2.11.1[${PYTHON_USEDEP}]
+	>=dev-python/markdown-3.2[${PYTHON_USEDEP}]
+	>=dev-python/mkdocs-1.2.3[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.10[${PYTHON_USEDEP}]
+	>=dev-python/pymdown-extensions-9.0[${PYTHON_USEDEP}]
+	>=dev-python/mkdocs-material-extensions-1.0[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/mysqlclient/mysqlclient-2.1.0.ebuild b/dev-python/mysqlclient/mysqlclient-2.1.0.ebuild
index 9ffe2c2987f9..a78dca394341 100644
--- a/dev-python/mysqlclient/mysqlclient-2.1.0.ebuild
+++ b/dev-python/mysqlclient/mysqlclient-2.1.0.ebuild
@@ -12,7 +12,7 @@ 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"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-db/mysql-connector-c:0=
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index 4e96b88ac135..9daedd30ee92 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -2,15 +2,19 @@ DIST numpy-1.21.1.zip 10259878 BLAKE2B ba5d8eb2d294e199c86d8e96026d148098f571639
 DIST numpy-1.21.2.zip 10264801 BLAKE2B 2d88506faa5bc767a16c000f201559917d800fd205c75f30c1e61d4b34e214b376da9876e96186914f9fe23bf033a305bf9212f593841407e3bf4e516b5982a6 SHA512 ad08110d9a73a73ef1a546de5fcd6dfe600c17b396f629c3a19ade7b3f226688cf7524fed78c035fd4ddda135e2bcf9facb5e061fb59640b424da2ed070c4184
 DIST numpy-1.21.3.zip 10269351 BLAKE2B 60fc96d91e2c4e0b1c6ee409e02640686fe257f5addbb17229568f591551ea3c415c4aac97b7cdb161b88ce436e42a766b161bd5a82f8cb66fff6771c0097bd3 SHA512 8fbe4e8543b72ad5203d5b122eb3d875e48965682945898e54f4ce82cf790713dfd9185b8b12439aefa86bf25209ea25d04ec3ca2aa2b8d2f32d69358421b792
 DIST numpy-1.21.4.zip 10646392 BLAKE2B 6e2953c6ca8e35c99f5de5faaacfb2b76b351a5c9521ba27449fcdeca5614978ff7d71fc52ce3787d1c7506c4e8eb81b1a92d3bf6825de1cb1d304ea4de83820 SHA512 85575a009bf40a8e5acaaa949d2669545968825df34273e367c42af36fa882ebb0830ff7953b5617d34d3061b3877238524937c42470fac9464479dc33ae60ce
+DIST numpy-1.21.5.zip 10652289 BLAKE2B c5bded91e5d06670ea3ace51560411c61985dd89ff0455b833838320f1714cf788a21a60aefd7a0ff30ad0abb93c9d296f60e637944000efa090b6c259c1f47c SHA512 03affa9d0bbf42a8d35f5454f1527df28539e306dc2b313fa775625201a5fe9eb7376f443bba5d50e08567546708811beb7201819eeb2af5a0653b7d91249f78
 DIST numpy-html-1.21.1.zip 24270531 BLAKE2B 8a7a531afa559aebeb7a7b7ef94b2248df60a60fdfc190ca002dda625003df8b432fed393d6dd0c0c00fafbeb5064a61e3d99bba1a6c41e1e6e34ce091a43c89 SHA512 a165b95729a13806a03464cf39c20a0e18cfcf7701f05cd7777cd115bfaf0972f7155d201c7bd8d4177c5761f8800c982b3e3c29729a5e9ed356059842a44dcc
 DIST numpy-html-1.21.2.zip 24270531 BLAKE2B 8a7a531afa559aebeb7a7b7ef94b2248df60a60fdfc190ca002dda625003df8b432fed393d6dd0c0c00fafbeb5064a61e3d99bba1a6c41e1e6e34ce091a43c89 SHA512 a165b95729a13806a03464cf39c20a0e18cfcf7701f05cd7777cd115bfaf0972f7155d201c7bd8d4177c5761f8800c982b3e3c29729a5e9ed356059842a44dcc
 DIST numpy-html-1.21.3.zip 24270531 BLAKE2B 8a7a531afa559aebeb7a7b7ef94b2248df60a60fdfc190ca002dda625003df8b432fed393d6dd0c0c00fafbeb5064a61e3d99bba1a6c41e1e6e34ce091a43c89 SHA512 a165b95729a13806a03464cf39c20a0e18cfcf7701f05cd7777cd115bfaf0972f7155d201c7bd8d4177c5761f8800c982b3e3c29729a5e9ed356059842a44dcc
 DIST numpy-html-1.21.4.zip 24270531 BLAKE2B 8a7a531afa559aebeb7a7b7ef94b2248df60a60fdfc190ca002dda625003df8b432fed393d6dd0c0c00fafbeb5064a61e3d99bba1a6c41e1e6e34ce091a43c89 SHA512 a165b95729a13806a03464cf39c20a0e18cfcf7701f05cd7777cd115bfaf0972f7155d201c7bd8d4177c5761f8800c982b3e3c29729a5e9ed356059842a44dcc
+DIST numpy-html-1.21.5.zip 24270531 BLAKE2B 8a7a531afa559aebeb7a7b7ef94b2248df60a60fdfc190ca002dda625003df8b432fed393d6dd0c0c00fafbeb5064a61e3d99bba1a6c41e1e6e34ce091a43c89 SHA512 a165b95729a13806a03464cf39c20a0e18cfcf7701f05cd7777cd115bfaf0972f7155d201c7bd8d4177c5761f8800c982b3e3c29729a5e9ed356059842a44dcc
 DIST numpy-ref-1.21.1.pdf 7326979 BLAKE2B 3c1130a576c46e0705ca1f12e7a3345beb1acdd23de2a81448e4e9755636dec313e277a0d3167dc3b211332b3fc415ac0d96e7c99e859b51a16a589426814182 SHA512 5dd37ca03f1f098fffce80aa6a1a6eb8ec66df4322da1c620bd1f507e89ee2ceb222de32c9b7974f085ddf146f0a789ea8eb27d792a13c1aa8a893c00f94f75f
 DIST numpy-ref-1.21.2.pdf 7326979 BLAKE2B 3c1130a576c46e0705ca1f12e7a3345beb1acdd23de2a81448e4e9755636dec313e277a0d3167dc3b211332b3fc415ac0d96e7c99e859b51a16a589426814182 SHA512 5dd37ca03f1f098fffce80aa6a1a6eb8ec66df4322da1c620bd1f507e89ee2ceb222de32c9b7974f085ddf146f0a789ea8eb27d792a13c1aa8a893c00f94f75f
 DIST numpy-ref-1.21.3.pdf 7326979 BLAKE2B 3c1130a576c46e0705ca1f12e7a3345beb1acdd23de2a81448e4e9755636dec313e277a0d3167dc3b211332b3fc415ac0d96e7c99e859b51a16a589426814182 SHA512 5dd37ca03f1f098fffce80aa6a1a6eb8ec66df4322da1c620bd1f507e89ee2ceb222de32c9b7974f085ddf146f0a789ea8eb27d792a13c1aa8a893c00f94f75f
 DIST numpy-ref-1.21.4.pdf 7326979 BLAKE2B 3c1130a576c46e0705ca1f12e7a3345beb1acdd23de2a81448e4e9755636dec313e277a0d3167dc3b211332b3fc415ac0d96e7c99e859b51a16a589426814182 SHA512 5dd37ca03f1f098fffce80aa6a1a6eb8ec66df4322da1c620bd1f507e89ee2ceb222de32c9b7974f085ddf146f0a789ea8eb27d792a13c1aa8a893c00f94f75f
+DIST numpy-ref-1.21.5.pdf 7326979 BLAKE2B 3c1130a576c46e0705ca1f12e7a3345beb1acdd23de2a81448e4e9755636dec313e277a0d3167dc3b211332b3fc415ac0d96e7c99e859b51a16a589426814182 SHA512 5dd37ca03f1f098fffce80aa6a1a6eb8ec66df4322da1c620bd1f507e89ee2ceb222de32c9b7974f085ddf146f0a789ea8eb27d792a13c1aa8a893c00f94f75f
 DIST numpy-user-1.21.1.pdf 5142404 BLAKE2B d670f1eb0f060599a640c52bdeba53b1758007fc2090a5b8fb6e135e71114149a0085811e4bc21396eabb1123ffb9edd39f8192d0165ab42dd066a9747eb3a3f SHA512 dde264abff1787efd50e913b6facf83522b3344ed88fd15d6fe73ecd44c6a3db1e4ce4251c9674bbcb122f72ab86c64142b2f4f992a6449405041f8e1f5f1ace
 DIST numpy-user-1.21.2.pdf 5142404 BLAKE2B d670f1eb0f060599a640c52bdeba53b1758007fc2090a5b8fb6e135e71114149a0085811e4bc21396eabb1123ffb9edd39f8192d0165ab42dd066a9747eb3a3f SHA512 dde264abff1787efd50e913b6facf83522b3344ed88fd15d6fe73ecd44c6a3db1e4ce4251c9674bbcb122f72ab86c64142b2f4f992a6449405041f8e1f5f1ace
 DIST numpy-user-1.21.3.pdf 5142404 BLAKE2B d670f1eb0f060599a640c52bdeba53b1758007fc2090a5b8fb6e135e71114149a0085811e4bc21396eabb1123ffb9edd39f8192d0165ab42dd066a9747eb3a3f SHA512 dde264abff1787efd50e913b6facf83522b3344ed88fd15d6fe73ecd44c6a3db1e4ce4251c9674bbcb122f72ab86c64142b2f4f992a6449405041f8e1f5f1ace
 DIST numpy-user-1.21.4.pdf 5142404 BLAKE2B d670f1eb0f060599a640c52bdeba53b1758007fc2090a5b8fb6e135e71114149a0085811e4bc21396eabb1123ffb9edd39f8192d0165ab42dd066a9747eb3a3f SHA512 dde264abff1787efd50e913b6facf83522b3344ed88fd15d6fe73ecd44c6a3db1e4ce4251c9674bbcb122f72ab86c64142b2f4f992a6449405041f8e1f5f1ace
+DIST numpy-user-1.21.5.pdf 5142404 BLAKE2B d670f1eb0f060599a640c52bdeba53b1758007fc2090a5b8fb6e135e71114149a0085811e4bc21396eabb1123ffb9edd39f8192d0165ab42dd066a9747eb3a3f SHA512 dde264abff1787efd50e913b6facf83522b3344ed88fd15d6fe73ecd44c6a3db1e4ce4251c9674bbcb122f72ab86c64142b2f4f992a6449405041f8e1f5f1ace
diff --git a/dev-python/numpy/numpy-1.21.5.ebuild b/dev-python/numpy/numpy-1.21.5.ebuild
new file mode 100644
index 000000000000..d6ffe0c6cd13
--- /dev/null
+++ b/dev-python/numpy/numpy-1.21.5.ebuild
@@ -0,0 +1,161 @@
+# 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(+)"
+
+FORTRAN_NEEDED=lapack
+
+inherit distutils-r1 flag-o-matic fortran-2 toolchain-funcs
+
+DOC_PV=${PV}
+DESCRIPTION="Fast array and numerical python library"
+HOMEPAGE="https://numpy.org/"
+SRC_URI="
+	mirror://pypi/${PN:0:1}/${PN}/${P}.zip
+	doc? (
+		https://numpy.org/doc/$(ver_cut 1-2 ${DOC_PV})/numpy-html.zip -> numpy-html-${DOC_PV}.zip
+		https://numpy.org/doc/$(ver_cut 1-2 ${DOC_PV})/numpy-ref.pdf -> numpy-ref-${DOC_PV}.pdf
+		https://numpy.org/doc/$(ver_cut 1-2 ${DOC_PV})/numpy-user.pdf -> numpy-user-${DOC_PV}.pdf
+	)"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc lapack"
+
+RDEPEND="
+	lapack? (
+		>=virtual/cblas-3.8
+		>=virtual/lapack-3.8
+	)
+"
+BDEPEND="
+	${RDEPEND}
+	app-arch/unzip
+	>=dev-python/cython-0.29.24[${PYTHON_USEDEP}]
+	lapack? ( virtual/pkgconfig )
+	test? (
+		>=dev-python/hypothesis-5.8.0[${PYTHON_USEDEP}]
+		>=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
+		>=dev-python/cffi-1.14.0[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/numpy-1.21.0-no-hardcode-blasv2.patch
+	"${FILESDIR}"/numpy-1.21.4-build-compiler-args-ceph.patch
+)
+
+distutils_enable_tests pytest
+
+src_unpack() {
+	default
+	if use doc; then
+		unzip -qo "${DISTDIR}"/numpy-html-${DOC_PV}.zip -d html || die
+	fi
+}
+
+python_prepare_all() {
+	if use lapack; then
+		local incdir="${EPREFIX}"/usr/include
+		local libdir="${EPREFIX}"/usr/$(get_libdir)
+		cat >> site.cfg <<-EOF || die
+			[blas]
+			include_dirs = ${incdir}
+			library_dirs = ${libdir}
+			blas_libs = cblas,blas
+			[lapack]
+			library_dirs = ${libdir}
+			lapack_libs = lapack
+		EOF
+	else
+		export {ATLAS,PTATLAS,BLAS,LAPACK,MKL}=None
+	fi
+
+	export CC="$(tc-getCC) ${CFLAGS}"
+
+	append-flags -fno-strict-aliasing
+
+	# See progress in http://projects.scipy.org/scipy/numpy/ticket/573
+	# with the subtle difference that we don't want to break Darwin where
+	# -shared is not a valid linker argument
+	if [[ ${CHOST} != *-darwin* ]]; then
+		append-ldflags -shared
+	fi
+
+	# only one fortran to link with:
+	# linking with cblas and lapack library will force
+	# autodetecting and linking to all available fortran compilers
+	append-fflags -fPIC
+	if use lapack; then
+		NUMPY_FCONFIG="config_fc --noopt --noarch"
+		# workaround bug 335908
+		[[ $(tc-getFC) == *gfortran* ]] && NUMPY_FCONFIG+=" --fcompiler=gnu95"
+	fi
+
+	# don't version f2py, we will handle it.
+	sed -i -e '/f2py_exe/s: + os\.path.*$::' numpy/f2py/setup.py || die
+
+	# disable fuzzed tests
+	find numpy/*/tests -name '*.py' -exec sed -i \
+		-e 's:def \(.*_fuzz\):def _\1:' {} + || die
+	# very memory- and disk-hungry
+	sed -i -e 's:test_large_zip:_&:' numpy/lib/tests/test_io.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	export MAKEOPTS=-j1 #660754
+
+	distutils-r1_python_compile ${NUMPY_FCONFIG}
+}
+
+python_test() {
+	local deselect=(
+		numpy/typing/tests/test_typing.py::test_reveal[arrayterator.py]
+	)
+
+	if use arm && [[ $(uname -m || echo "unknown") == "armv8l" ]] ; then
+		# Degenerate case. arm32 chroot on arm64.
+		# bug #774108
+		deselect+=(
+			numpy/core/tests/test_cpu_features.py::Test_ARM_Features::test_features
+		)
+	fi
+
+	if use x86 ; then
+		deselect+=(
+			# https://github.com/numpy/numpy/issues/18388
+			numpy/core/tests/test_umath.py::TestRemainder::test_float_remainder_overflow
+			# https://github.com/numpy/numpy/issues/18387
+			numpy/random/tests/test_generator_mt19937.py::TestRandomDist::test_pareto
+		)
+	fi
+
+	distutils_install_for_testing --single-version-externally-managed \
+		--record "${TMPDIR}/record.txt" ${NUMPY_FCONFIG}
+
+	cd "${TEST_DIR}/lib" || die
+	epytest ${deselect[@]/#/--deselect }
+}
+
+python_install() {
+	# https://github.com/numpy/numpy/issues/16005
+	local mydistutilsargs=( build_src )
+	distutils-r1_python_install ${NUMPY_FCONFIG}
+	python_optimize
+}
+
+python_install_all() {
+	local DOCS=( LICENSE.txt README.md THANKS.txt )
+
+	if use doc; then
+		local HTML_DOCS=( "${WORKDIR}"/html/. )
+		DOCS+=( "${DISTDIR}"/${PN}-{user,ref}-${DOC_PV}.pdf )
+	fi
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/oslo-utils/Manifest b/dev-python/oslo-utils/Manifest
index b28ac1c51368..94a881a619b1 100644
--- a/dev-python/oslo-utils/Manifest
+++ b/dev-python/oslo-utils/Manifest
@@ -1,2 +1 @@
-DIST oslo.utils-4.11.0.tar.gz 100897 BLAKE2B a020682e89ba86a4b8390c842ffabcfd3d923168c89071c380d50de289e91a5c0247ce47dea3f17675ac14fe7e8129744bf7f5aa8a4aad6ff90d1d01cbd2b589 SHA512 837d111bec78364501a4d92039f76cdfc761b9302eae4badf3700d983f2ff19ffa3497835fef81c28b28760b9aa0325aecafa559b00b3d7593c1d1b2ca916702
 DIST oslo.utils-4.12.0.tar.gz 100927 BLAKE2B 6f175d7c08a9084af083d1e2a339ef81c9d49f832f0c94b17fe652485f077d787731bbef61bb7b4cc30188b776b7494f53700b76a736be70cff0ce5b4da5b11d SHA512 a31d307199584d6aa891464e0d9ef218d0a2aa6b54337e081ac3d787d883dfa088484f894c421c4cbf428ce2a53b6547770d469299ec7b9d0159e5a38fde06e3
diff --git a/dev-python/oslo-utils/oslo-utils-4.11.0.ebuild b/dev-python/oslo-utils/oslo-utils-4.11.0.ebuild
deleted file mode 100644
index f0a613f174b9..000000000000
--- a/dev-python/oslo-utils/oslo-utils-4.11.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# 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
-
-MY_P=${P/-/.}
-DESCRIPTION="Oslo Utility library"
-HOMEPAGE="https://launchpad.net/oslo"
-SRC_URI="mirror://pypi/${PN::1}/${PN/-/.}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
-
-RDEPEND="
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
-	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/packaging-20.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/pbr-2.2.0[${PYTHON_USEDEP}]
-	>dev-python/eventlet-0.23.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/ddt-1.0.1[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	# spurious rdep
-	sed -i -e '/pbr/d' requirements.txt || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/oslo-utils/oslo-utils-4.12.0.ebuild b/dev-python/oslo-utils/oslo-utils-4.12.0.ebuild
index 8e1700c3447c..f0a613f174b9 100644
--- a/dev-python/oslo-utils/oslo-utils-4.12.0.ebuild
+++ b/dev-python/oslo-utils/oslo-utils-4.12.0.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 
 RDEPEND="
 	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
diff --git a/dev-python/pbr/Manifest b/dev-python/pbr/Manifest
index f1b95cd583db..e47a21a036c6 100644
--- a/dev-python/pbr/Manifest
+++ b/dev-python/pbr/Manifest
@@ -1,2 +1 @@
-DIST pbr-5.7.0.tar.gz 126776 BLAKE2B ff41c0b3d2354dff065bda4dc9278e42d06accc9fab96bdd734cb462682caf240d1e5d3a6e6c1f52c2986f92d4a1b11b74f5d563a9e8bd5e75aaafe7c3b30108 SHA512 076e6f918db46df74688e749242331161b858def6135d4c9695c24cdfe7db3185169787a6d5555a40a9d0e87ea54000be6419701f162283047bee41f36811535
 DIST pbr-5.8.0.tar.gz 127170 BLAKE2B 7fbd166f01617617c0dff568d1bb88a4be03d62f4f0c3ca1a7d16a7cefb20dcc924ffbb8df0d2d34516cfe3b60b8e380a0eb4a1071220bb4ab695d3d7c88d824 SHA512 61a8eb63bb76ce8515c4203d60df7c973e02ea61b603d155b611724efb2b15c42416bf8a0285451d3378056d390bbf63d991cec32cc4114ae5cc30ebae0a5a69
diff --git a/dev-python/pbr/pbr-5.7.0.ebuild b/dev-python/pbr/pbr-5.7.0.ebuild
deleted file mode 100644
index 30cd5f7ba964..000000000000
--- a/dev-python/pbr/pbr-5.7.0.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# 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} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-inherit distutils-r1
-
-DESCRIPTION="Inject some useful and sensible default behaviors into setuptools"
-HOMEPAGE="https://github.com/openstack/pbr/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux"
-
-# git is needed for tests, see https://bugs.launchpad.net/pbr/+bug/1326682 and https://bugs.gentoo.org/show_bug.cgi?id=561038
-# docutils is needed for sphinx exceptions... https://bugs.gentoo.org/show_bug.cgi?id=603848
-# stestr is run as external tool
-BDEPEND="
-	test? (
-		$(python_gen_cond_dep '
-			>=dev-python/wheel-0.32.0[${PYTHON_USEDEP}]
-			>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-			>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-			>=dev-python/six-1.12.0[${PYTHON_USEDEP}]
-			dev-python/sphinx[${PYTHON_USEDEP}]
-			>=dev-python/testresources-2.0.0[${PYTHON_USEDEP}]
-			>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-			>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-			>=dev-python/virtualenv-20.0.3[${PYTHON_USEDEP}]
-			dev-vcs/git
-		' 'python*')
-	)"
-
-distutils_enable_tests unittest
-
-# This normally actually belongs here.
-python_prepare_all() {
-	# TODO: investigate
-	sed -e s':test_console_script_develop:_&:' \
-		-e s':test_console_script_install:_&:' \
-		-i pbr/tests/test_core.py || die
-	# broken on pypy3
-	# https://bugs.launchpad.net/pbr/+bug/1881479
-	sed -e 's:test_generates_c_extensions:_&:' \
-		-i pbr/tests/test_packaging.py || die
-	rm pbr/tests/test_wsgi.py || die "couldn't remove wsgi network tests"
-	# installs random packages via pip from the Internet
-	sed -e 's:test_requirement_parsing:_&:' \
-		-e 's:test_pep_517_support:_&:' \
-		-i pbr/tests/test_packaging.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	if [[ ${EPYTHON} != python* ]]; then
-		einfo "Testing on ${EPYTHON} is not supported at the moment"
-		return
-	fi
-
-	distutils_install_for_testing
-	eunittest -b
-}
diff --git a/dev-python/pbr/pbr-5.8.0.ebuild b/dev-python/pbr/pbr-5.8.0.ebuild
index 6527b8b283a4..30cd5f7ba964 100644
--- a/dev-python/pbr/pbr-5.8.0.ebuild
+++ b/dev-python/pbr/pbr-5.8.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux"
 
 # git is needed for tests, see https://bugs.launchpad.net/pbr/+bug/1326682 and https://bugs.gentoo.org/show_bug.cgi?id=561038
 # docutils is needed for sphinx exceptions... https://bugs.gentoo.org/show_bug.cgi?id=603848
diff --git a/dev-python/py-amqp/Manifest b/dev-python/py-amqp/Manifest
index 013140e8695b..deefc6e7d329 100644
--- a/dev-python/py-amqp/Manifest
+++ b/dev-python/py-amqp/Manifest
@@ -1,3 +1,4 @@
 DIST amqp-5.0.6.tar.gz 126856 BLAKE2B 3eae4d0f97477dc7b72eba65ee95ab74afa051bf2d745f86944c4236b4a90ff6c2a38f18a5bdc8441215f4607ed4e8eb867144695619eb08e0f1065e7a624415 SHA512 bf15fad413bedb2f57dfaa03986f4abfc8fb169d5e324d5741b94a1e3776f2590e7686774c69dfdda848b484dbc1e6d0fa78a4a3125cf08ab20eaf7192885252
 DIST amqp-5.0.7.tar.gz 127139 BLAKE2B 51fe6448b61c0899ef49c212ddea5eea108812ad744ffe8ab7ba2392177ef1b6cd6481c424530fb9111899c425081ad96988d36e872c6d32ee72c44a28de51e0 SHA512 3c0d051ad677fa410e4301ab86478583affc1e42651ce5c9b34a07a179aa4fb15811a81884facbdc393b0646a23cab20ee7943b276b8ef770e9707b9bd23d06a
 DIST amqp-5.0.8.tar.gz 127472 BLAKE2B f158b19c3844302151f6683758a78ec28150eb5204ddcde344f2313b2ac76d1b683aa25f2a7088e4b91d0a83928b343490677f9d7f2a327f8384520e52ac1dc0 SHA512 c71fc506cd0f3269956cb3e10ca8a27bc9eae30a0e1f5b1bbbfff3c3d2fff1fd206554c027ae0cf22eda5f43b64c12df8c0b2b31df21b8e4962a8620ce5edc39
+DIST amqp-5.0.9.tar.gz 127478 BLAKE2B f4e23c43ad66cf88e076e9542d8825daac9ad3cf93ca954fe0f1baf3648bfc00afa0002b86d73a95936fad7c859b0a75ee2996cc0d19c6bfcd3ec556e0c1eab3 SHA512 b94bf176e816b1dad4bbc2891a5324f7eb8e27fd475c34a01e6f39d27caf66447cfceab6a3cb3538fd1b610a250eed1423682deef4a174fdd201e0b3a7368bc9
diff --git a/dev-python/py-amqp/py-amqp-5.0.9.ebuild b/dev-python/py-amqp/py-amqp-5.0.9.ebuild
new file mode 100644
index 000000000000..1aa33d19dafd
--- /dev/null
+++ b/dev-python/py-amqp/py-amqp-5.0.9.ebuild
@@ -0,0 +1,48 @@
+# 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
+
+MY_P="amqp-${PV}"
+DESCRIPTION="Low-level AMQP client for Python (fork of amqplib)"
+HOMEPAGE="https://github.com/celery/py-amqp https://pypi.org/project/amqp/"
+SRC_URI="mirror://pypi/${MY_P:0:1}/amqp/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="extras"
+
+BDEPEND="
+	>=dev-python/vine-5.0.0[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/case-1.3.1[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		>=dev-python/pytest-rerunfailures-6.0[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs dev-python/sphinx_celery
+distutils_enable_tests pytest
+
+EPYTEST_IGNORE=(
+	# rmq tests require a rabbitmq instance
+	t/integration/test_rmq.py
+)
+
+EPYTEST_DESELECT=(
+	# fails when gssapi is installed (how does that test make sense?!)
+	t/unit/test_sasl.py::test_SASL::test_gssapi_missing
+)
+
+python_install_all() {
+	if use extras; then
+		insinto /usr/share/${PF}/extras
+		doins -r extra
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pyatspi/Manifest b/dev-python/pyatspi/Manifest
index abf1bc5ff677..df7e467d27de 100644
--- a/dev-python/pyatspi/Manifest
+++ b/dev-python/pyatspi/Manifest
@@ -1 +1,2 @@
 DIST pyatspi-2.38.1.tar.xz 316724 BLAKE2B 59ca2569575f3d319d33972477ebc966670138df8cb6570ac260dd903f54df66fd12beeeee53e3380938e4571910b99ae2bf3f395776b16a73ac27f8fa023c49 SHA512 bf8f1ee9a6e00014a84e4329bb971bec8b4bc8f72c3905ca585ca20b1cf000b855965159fcc10871eb92e9808a6b41b5d793f3ab563ff0867f185279eedcd487
+DIST pyatspi-2.38.2.tar.xz 318596 BLAKE2B aba5d4fbbc9e0ce4793843270394712e675e6546c781f0523f7f17a79f018fcf4cf209257e9ef0dc03cbe92be7a17c774fd82f2d9997d9aa8c6b6be65a72ef8a SHA512 03e10af5f0eb2ab89518229f049f497635ec1ae85a948a02813a5eb00eef395a3934f578b56054f8e73ae3c5c28760ad1f2b93e8876b8724c64b622d966aa5d9
diff --git a/dev-python/pyatspi/pyatspi-2.38.2.ebuild b/dev-python/pyatspi/pyatspi-2.38.2.ebuild
new file mode 100644
index 000000000000..92e4e1725e16
--- /dev/null
+++ b/dev-python/pyatspi/pyatspi-2.38.2.ebuild
@@ -0,0 +1,60 @@
+# 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} )
+
+inherit gnome2 python-r1 virtualx
+
+DESCRIPTION="Python client bindings for D-Bus AT-SPI"
+HOMEPAGE="https://wiki.gnome.org/Accessibility"
+
+# Note: only some of the tests are GPL-licensed, everything else is LGPL
+LICENSE="LGPL-2 GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+IUSE="test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="
+	${PYTHON_DEPS}
+	>=dev-libs/atk-2.11.2
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	>=dev-python/pygobject-2.90.1:3[${PYTHON_USEDEP}]
+"
+RDEPEND="${DEPEND}
+	>=sys-apps/dbus-1
+	>=app-accessibility/at-spi2-core-2.34[introspection]
+"
+BDEPEND="virtual/pkgconfig
+	test? ( x11-libs/gtk+:3 )
+"
+
+src_prepare() {
+	gnome2_src_prepare
+	python_copy_sources
+}
+
+src_configure() {
+	python_foreach_impl run_in_build_dir gnome2_src_configure $(use_enable test tests)
+}
+
+src_compile() {
+	python_foreach_impl run_in_build_dir gnome2_src_compile
+}
+
+src_test() {
+	python_foreach_impl run_in_build_dir virtx dbus-run-session emake check
+}
+
+src_install() {
+	installing() {
+		gnome2_src_install
+		python_optimize
+	}
+	python_foreach_impl run_in_build_dir installing
+
+	docinto examples
+	dodoc examples/*.py
+}
diff --git a/dev-python/pyproj/Manifest b/dev-python/pyproj/Manifest
index bfd6abf2b347..b947ee1842f6 100644
--- a/dev-python/pyproj/Manifest
+++ b/dev-python/pyproj/Manifest
@@ -1,2 +1 @@
-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.2.1.ebuild b/dev-python/pyproj/pyproj-3.2.1.ebuild
deleted file mode 100644
index 02e72dcffa0a..000000000000
--- a/dev-python/pyproj/pyproj-3.2.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# 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-7.2.0:="
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		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() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		test/test_datum.py
-		test/test_transformer.py::test_transform_wgs84_to_alaska
-		test/test_transformer.py::test_repr__conditional
-		test/test_transformer.py::test_transformer_group__unavailable
-		test/test_transformer.py::test_transformer_group__network_disabled
-		test/test_transformer.py::test_transformer_group__download_grids__directory
-		test/crs/test_crs.py::test_coordinate_operation_grids__alternative_grid_name
-	)
-
-	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/pyproj/pyproj-3.3.0.ebuild b/dev-python/pyproj/pyproj-3.3.0.ebuild
index abd853670310..28d9ecee8f88 100644
--- a/dev-python/pyproj/pyproj-3.3.0.ebuild
+++ b/dev-python/pyproj/pyproj-3.3.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux"
 
 RDEPEND=">=sci-libs/proj-8.0.0:="
 BDEPEND="
diff --git a/dev-python/pyproject2setuppy/Manifest b/dev-python/pyproject2setuppy/Manifest
index 6e8c0c9e746e..49da47d27c7c 100644
--- a/dev-python/pyproject2setuppy/Manifest
+++ b/dev-python/pyproject2setuppy/Manifest
@@ -1 +1,2 @@
 DIST pyproject2setuppy-21.tar.gz 12938 BLAKE2B 09b030e882e7ec66c3d8ad76d486c08b991c7ba725d628101c07475348890a55bc6d6f4ef96f3a9b0f8d40382c026f075aac6dd2fa970fa409c4824b625ba3f1 SHA512 d899bc81f01283dd854fa2c0c5d15e5b77bd273f4269e2dea8612dd41bb4d5404e63e0fc6db5cbefe2a65a69848a3a5c9eae56e93face1736b2e8a0aa39f2193
+DIST pyproject2setuppy-22.tar.gz 13046 BLAKE2B 5f59a08294f3d6d9dcbd6d9cbf6769abb523e8a409944157e9e8dc8a03944d173c1656c18da9138e220ad1ead31cb6af70bea8628c0e7164357af32a86700ec7 SHA512 8fc2975c8b4384b6a79008e2fc1de6acd2bcb27c9232b45ae5bda0e40f5a0be330ef7c9ef4ab36ab8ab33e9faf587b19d8fb431d95c866ccce46afc975f3cf26
diff --git a/dev-python/pyproject2setuppy/pyproject2setuppy-22.ebuild b/dev-python/pyproject2setuppy/pyproject2setuppy-22.ebuild
new file mode 100644
index 000000000000..01b516520671
--- /dev/null
+++ b/dev-python/pyproject2setuppy/pyproject2setuppy-22.ebuild
@@ -0,0 +1,29 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_SETUPTOOLS=manual
+PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="Cheap setup.py hack to install flit & poetry-based projects"
+HOMEPAGE="https://github.com/mgorny/pyproject2setuppy"
+SRC_URI="
+	https://github.com/mgorny/pyproject2setuppy/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/tomli[${PYTHON_USEDEP}]"
+BDEPEND="${RDEPEND}
+	test? (
+		dev-python/pytest-forked[${PYTHON_USEDEP}]
+		dev-python/wheel[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pytest-localserver/Manifest b/dev-python/pytest-localserver/Manifest
index 2f5db7e104b7..475283bcdf74 100644
--- a/dev-python/pytest-localserver/Manifest
+++ b/dev-python/pytest-localserver/Manifest
@@ -1,2 +1 @@
-DIST pytest-localserver-0.5.0.tar.gz 20409 BLAKE2B 62376065ee1aeb698ea5e3bd2d5ea3d6b511cc6793142aad458423513b0e3b358a0d0269a78a0f5aeda44fc53757ff85da786627840ee48cbed8b78ee34c2227 SHA512 aedf1e1c9563396457070df13df228ad0ebdd19173fa2ac5a598288d3e1a1ac8b8a0c0288cba0d8478e43d2e1de4848f2393bf640705916957f12ab31171c6cc
 DIST pytest-localserver-0.5.1.tar.gz 19341 BLAKE2B 759a90552b6f950579088a7c41448ad0f000aab980c56361d0e1a40d98a00ee234bf542a6309eb096602536da3fa819b7227a962d0592a801131a019f1617cdc SHA512 dad8b21020cf2f08ad03398b82bad7b47e553a9c6b489b94186bdc61c22f57e7151f8dbeab38ef42d03658104ec42920ec363288a1bdbea34dab6aee1da03c48
diff --git a/dev-python/pytest-localserver/files/pytest-localserver-0.5.0-py310-tests.patch b/dev-python/pytest-localserver/files/pytest-localserver-0.5.0-py310-tests.patch
deleted file mode 100644
index c9a8fbf0f870..000000000000
--- a/dev-python/pytest-localserver/files/pytest-localserver-0.5.0-py310-tests.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- a/tests/test_https.py	2021-05-24 12:10:07.335676451 -0700
-+++ b/tests/test_https.py	2021-05-24 12:10:23.966572498 -0700
-@@ -11,17 +11,20 @@
- httpsserver = plugin.httpsserver
- 
- 
-+@pytest.mark.skipif(sys.hexversion >= 0x30a0000, reason="Example certs too weak for py310")
- def test_httpsserver_funcarg(httpsserver):
-     assert isinstance(httpsserver, https.SecureContentServer)
-     assert httpsserver.is_alive()
-     assert httpsserver.server_address
- 
- 
-+@pytest.mark.skipif(sys.hexversion >= 0x30a0000, reason="Example certs too weak for py310")
- def test_server_does_not_serve_file_at_startup(httpsserver):
-     assert httpsserver.code == 204
-     assert httpsserver.content == ''
- 
- 
-+@pytest.mark.skipif(sys.hexversion >= 0x30a0000, reason="Example certs too weak for py310")
- def test_some_content_retrieval(httpsserver):
-     httpsserver.serve_content('TEST!')
-     resp = requests.get(httpsserver.url, verify=False)
-@@ -29,6 +32,7 @@
-     assert resp.status_code == 200
- 
- 
-+@pytest.mark.skipif(sys.hexversion >= 0x30a0000, reason="Example certs too weak for py310")
- def test_GET_request(httpsserver):
-     httpsserver.serve_content('TEST!', headers={'Content-type': 'text/plain'})
-     resp = requests.get(httpsserver.url, headers={'User-Agent': 'Test method'}, verify=False)
-@@ -37,6 +41,7 @@
-     assert 'text/plain' in resp.headers['Content-type']
- 
- 
-+@pytest.mark.skipif(sys.hexversion >= 0x30a0000, reason="Example certs too weak for py310")
- def test_HEAD_request(httpsserver):
-     httpsserver.serve_content('TEST!', headers={'Content-type': 'text/plain'})
-     print(httpsserver.url)
diff --git a/dev-python/pytest-localserver/files/pytest-localserver-0.5.0-setup.patch b/dev-python/pytest-localserver/files/pytest-localserver-0.5.0-setup.patch
deleted file mode 100644
index 1cad7643973a..000000000000
--- a/dev-python/pytest-localserver/files/pytest-localserver-0.5.0-setup.patch
+++ /dev/null
@@ -1,5 +0,0 @@
---- a/setup.cfg	2021-05-24 12:19:38.163108453 -0700
-+++ b/setup.cfg	2021-05-24 12:19:58.714979990 -0700
-@@ -2 +2 @@
--description-file = README
-+description_file = README
diff --git a/dev-python/pytest-localserver/pytest-localserver-0.5.0.ebuild b/dev-python/pytest-localserver/pytest-localserver-0.5.0.ebuild
deleted file mode 100644
index 88d2d9aee857..000000000000
--- a/dev-python/pytest-localserver/pytest-localserver-0.5.0.ebuild
+++ /dev/null
@@ -1,32 +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} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Py.test plugin to test server connections locally"
-HOMEPAGE="https://pypi.org/project/pytest-localserver/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv sparc x86 ~x64-macos"
-
-RDEPEND=">=dev-python/werkzeug-0.10[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		${RDEPEND}
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=(
-	"${FILESDIR}/pytest-localserver-0.5.0-setup.patch"
-	"${FILESDIR}/pytest-localserver-0.5.0-py310-tests.patch"
-)
-
-distutils_enable_tests pytest
diff --git a/dev-python/pytest-localserver/pytest-localserver-0.5.1.ebuild b/dev-python/pytest-localserver/pytest-localserver-0.5.1.ebuild
index 9121b348c3f8..9f8bd7c8e41f 100644
--- a/dev-python/pytest-localserver/pytest-localserver-0.5.1.ebuild
+++ b/dev-python/pytest-localserver/pytest-localserver-0.5.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv sparc x86 ~x64-macos"
 
 RDEPEND=">=dev-python/werkzeug-0.10[${PYTHON_USEDEP}]"
 BDEPEND="
diff --git a/dev-python/python-cinderclient/Manifest b/dev-python/python-cinderclient/Manifest
index 200474203b0e..1d383eaa47df 100644
--- a/dev-python/python-cinderclient/Manifest
+++ b/dev-python/python-cinderclient/Manifest
@@ -1,3 +1,2 @@
-DIST python-cinderclient-8.0.0.tar.gz 236611 BLAKE2B 818279d06b597a00a66c34cf3b468e8293aaf1e90fd04c996e118ea206d475e598d7c8b9ca78542bd07ada1db5d7a2c7ea9a3748fe85ad787d283c8d8073ecc6 SHA512 ae0c5e1d6f0c173382f57f95ac05ec8872a8ed548b145c1f91d96ab7b9e4602cba11a7205c26c81027ca4ad07cbb69f675244e3606ae5dca00c22eeb8bedc126
 DIST python-cinderclient-8.1.0.tar.gz 235387 BLAKE2B 04b6d9c847ee2f56ccde1e9c953b919282dc45a078b4444cc88d00633d2158ec175d042ef988b1b97781de0de643c7703178dd847a792a8f3f5509b9ff331e68 SHA512 414e7334f84e84edc9a8eb6588be780899c408ce2d744e24622004759e0127f4a73167f78a6ce432d2ed44a745b721cf5c42439f19adbea009451573df5fdf14
 DIST python-cinderclient-8.2.0.tar.gz 233148 BLAKE2B 4ada4562ff1e51a284cf98e7ca4b324a05a4524951d6193bb4683a3986bc8a26a48373ef78613f3b94ed475992fb781b409fe58f9f3655f3f721b38f7eab770b SHA512 86e7a0c18d960f00448e20485d91443d185902db281014c99f35af463843be6d4bca80712edf44189b53e25853af064c14de18e943d9fdee29446180d9b91bbc
diff --git a/dev-python/python-cinderclient/python-cinderclient-8.0.0-r1.ebuild b/dev-python/python-cinderclient/python-cinderclient-8.0.0-r1.ebuild
deleted file mode 100644
index 6164f3fcea0c..000000000000
--- a/dev-python/python-cinderclient/python-cinderclient-8.0.0-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# 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="A client for the OpenStack Cinder API"
-HOMEPAGE="https://launchpad.net/python-cinderclient"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/keystoneauth-4.2.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-5.0.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-4.8.0[${PYTHON_USEDEP}]
-	>=dev-python/pbr-5.5.0[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7.2[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.25.1[${PYTHON_USEDEP}]
-	>=dev-python/simplejson-3.5.1[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-3.3.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/pbr[${PYTHON_USEDEP}]
-	test? (
-		dev-python/ddt[${PYTHON_USEDEP}]
-		dev-python/fixtures[${PYTHON_USEDEP}]
-		dev-python/oslo-serialization[${PYTHON_USEDEP}]
-		dev-python/requests-mock[${PYTHON_USEDEP}]
-		dev-python/stestr[${PYTHON_USEDEP}]
-		dev-python/testtools[${PYTHON_USEDEP}]
-	)
-"
-
-python_test() {
-	"${EPYTHON}" -m stestr run --debug || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/python-cinderclient/python-cinderclient-8.0.0-r2.ebuild b/dev-python/python-cinderclient/python-cinderclient-8.0.0-r2.ebuild
deleted file mode 100644
index fcf5f8c0803f..000000000000
--- a/dev-python/python-cinderclient/python-cinderclient-8.0.0-r2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# 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="A client for the OpenStack Cinder API"
-HOMEPAGE="https://launchpad.net/python-cinderclient"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-
-RDEPEND="
-	>=dev-python/keystoneauth-4.2.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-5.0.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-4.8.0[${PYTHON_USEDEP}]
-	>=dev-python/pbr-5.5.0[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7.2[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.25.1[${PYTHON_USEDEP}]
-	>=dev-python/simplejson-3.5.1[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-3.3.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/pbr[${PYTHON_USEDEP}]
-	test? (
-		dev-python/ddt[${PYTHON_USEDEP}]
-		dev-python/fixtures[${PYTHON_USEDEP}]
-		dev-python/oslo-serialization[${PYTHON_USEDEP}]
-		dev-python/requests-mock[${PYTHON_USEDEP}]
-		dev-python/testtools[${PYTHON_USEDEP}]
-		dev-python/tempest[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-python_test() {
-	# functional tests require cloud instance access
-	eunittest -b cinderclient/tests/unit
-}
diff --git a/dev-python/python-cinderclient/python-cinderclient-8.1.0.ebuild b/dev-python/python-cinderclient/python-cinderclient-8.1.0.ebuild
index 33a2ff280a23..fdac2e725d27 100644
--- a/dev-python/python-cinderclient/python-cinderclient-8.1.0.ebuild
+++ b/dev-python/python-cinderclient/python-cinderclient-8.1.0.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 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 RDEPEND="
 	>=dev-python/keystoneauth-4.2.1[${PYTHON_USEDEP}]
diff --git a/dev-python/rdflib/Manifest b/dev-python/rdflib/Manifest
index fabd8a6c45f3..7d6fac1730bc 100644
--- a/dev-python/rdflib/Manifest
+++ b/dev-python/rdflib/Manifest
@@ -1,2 +1,3 @@
 DIST rdflib-5.0.0.tar.gz 818586 BLAKE2B d0046590b00211ccb4f0f586dc829c061a5f426b1cefed44a63d21d46396354b9012dbe0a63c8f9de138b25ca7d73ba624c49da6fb305ececd983c62c917fd8a SHA512 ba98ab6a7bb9d993d11c559a739761f297282eb9307f3e333db8dd1c6b365b408a59b701d823bef9be774a59b3f44f64c9444e3bb0115c0c549cb00945385dab
 DIST rdflib-6.0.2.tar.gz 1273100 BLAKE2B aefd98c480710ece6fc5e621ebc0526eb24c61d36872280aa369baa2ce5bf90173190fa01d592861d2d6a9700fe9fc43a9ebe6d0b1f68851442e860ca702bf31 SHA512 0d14902d24582aad01289f5265feba3c533bbf5a0928b2e1032ba0af16d16cce46a92bde0f01ec2980351c1c13fe2cf4113445d2731e04400f0c20de73efa050
+DIST rdflib-6.1.1.tar.gz 1587670 BLAKE2B f13831124a8f292f0481f5ee9995b6b7ba82992cbe51abb0067703b2acee9f13ce5a62379636ac9f36823afa5b841799c1f26358efb6c12eca2df333611d5488 SHA512 049608dc37dba929eac1e40431885d319311f27be9fddc292d768e3703927e61a646a73137e4a1eaa16836cfba4606ea2cfd8fe3a86cfbf10e3271cee2ee251f
diff --git a/dev-python/rdflib/rdflib-6.1.1.ebuild b/dev-python/rdflib/rdflib-6.1.1.ebuild
new file mode 100644
index 000000000000..8fd5d4534306
--- /dev/null
+++ b/dev-python/rdflib/rdflib-6.1.1.ebuild
@@ -0,0 +1,58 @@
+# 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} )
+PYTHON_REQ_USE="sqlite?,threads(+)"
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1 optfeature
+
+DESCRIPTION="RDF library containing a triple store and parser/serializer"
+HOMEPAGE="https://github.com/RDFLib/rdflib https://pypi.org/project/rdflib/"
+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"
+IUSE="examples sqlite"
+
+RDEPEND="
+	dev-python/isodate[${PYTHON_USEDEP}]
+	dev-python/html5lib[${PYTHON_USEDEP}]
+	dev-python/pyparsing[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/berkeleydb[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests --install pytest
+
+EPYTEST_IGNORE=(
+	# Uses network
+	test/test_so_69984830.py
+)
+
+python_prepare_all() {
+	# these tests require internet access
+	sed -e '/doctest/d' -i setup.cfg || die
+	rm test/{test_sparql_service.py,test_graph.py,jsonld/test_onedotone.py} || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
+
+pkg_postinst() {
+	optfeature "support for sys-libs/db (Berkeley DB for MySQL)" dev-python/berkeleydb
+}
diff --git a/dev-python/scipy/scipy-1.7.3.ebuild b/dev-python/scipy/scipy-1.7.3.ebuild
index 48bd3a674cac..0ee2f04d426f 100644
--- a/dev-python/scipy/scipy-1.7.3.ebuild
+++ b/dev-python/scipy/scipy-1.7.3.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="BSD LGPL-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"
 IUSE="doc +pythran sparse"
 
 DEPEND="
diff --git a/dev-python/sphinx/Manifest b/dev-python/sphinx/Manifest
index 430cfdfe28c8..037a53dc0c0a 100644
--- a/dev-python/sphinx/Manifest
+++ b/dev-python/sphinx/Manifest
@@ -1,2 +1,3 @@
 DIST Sphinx-3.5.4.tar.gz 5911093 BLAKE2B 8740714dfaf3733bf57d0b277315b4e7b5cad86247ea30dcbc4f5dadf5f5169329050b7be43ec8625c47df9dcc19afcc6c4d782725c7007f8178b7eb7be7dc05 SHA512 853379f3b0496772846be9beb072c2c8a69ff899ffe4c6435b448ea639a32138c61403f9c14f62f4f78b2e526a2ee7c05b4196eabdeee37bcae6aa98df992125
 DIST Sphinx-4.3.1.tar.gz 6655951 BLAKE2B eacc9d39e1a108dba1f8d3bd96d7f78f1755f23233c8068dbe598f3d3539d9cf0ea9c12374e0ffc4f471004bbe7cbd6e80ebfa7bcfbf85e5d8c34ed4adfb2acb SHA512 0b7ceb369783d30685c10783fe10b58e92a2f5ae50dda1b6cfb021b0d33fb424a2c6cddc6b97018b63347127fc74ed4f7a442c312ce9e75ceb537f127a46bb9d
+DIST Sphinx-4.3.2.tar.gz 6657148 BLAKE2B 952cecc20e3f7e046c3ae2abc8524091af82f7947f889320deab3ec82947f793d4dab86ae47f117c84ecdb2e4e50fe531469dffca2806c45500a06c7322bb11b SHA512 2045e1964aef54826a2cde30e6c09b7ec35d49a45b7e449c07ee107c41304435eb51e2be307af77bed4ec50534e6e4009501d58187baa1a129134b69cdc56dff
diff --git a/dev-python/sphinx/sphinx-4.3.2.ebuild b/dev-python/sphinx/sphinx-4.3.2.ebuild
new file mode 100644
index 000000000000..513870e4836d
--- /dev/null
+++ b/dev-python/sphinx/sphinx-4.3.2.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Python documentation generator"
+HOMEPAGE="https://www.sphinx-doc.org/
+	https://github.com/sphinx-doc/sphinx"
+SRC_URI="mirror://pypi/S/${PN^}/${P^}.tar.gz"
+S=${WORKDIR}/${P^}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="doc latex"
+
+RDEPEND="
+	<dev-python/alabaster-0.8[${PYTHON_USEDEP}]
+	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
+	<dev-python/docutils-0.18[${PYTHON_USEDEP}]
+	dev-python/imagesize[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.3[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.5.0[${PYTHON_USEDEP}]
+	>=dev-python/snowballstemmer-1.1[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-applehelp[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-devhelp[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-jsmath[${PYTHON_USEDEP}]
+	>=dev-python/sphinxcontrib-htmlhelp-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/sphinxcontrib-serializinghtml-1.1.5[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-qthelp[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	latex? (
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-luatex
+		app-text/dvipng
+	)"
+BDEPEND="
+	doc? (
+		dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
+		media-gfx/graphviz
+	)
+	test? (
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		virtual/imagemagick-tools[jpeg,png,svg]
+		dev-texlive/texlive-fontsextra
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-luatex
+		app-text/dvipng
+	)"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.2.1-doc-link.patch"
+)
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# disable internet access
+	sed -i -e 's:^intersphinx_mapping:disabled_&:' \
+		doc/conf.py || die
+
+	# remove unnecessary upper bounds
+	sed -e '/Jinja2/s:,<3.0::' \
+		-e '/MarkupSafe/s:<2.0::' \
+		-i setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	distutils-r1_python_compile
+
+	# Generate the grammar. It will be caught by install somehow.
+	# Note that the tests usually do it for us. However, I don't want
+	# to trust USE=test really running all the tests, especially
+	# with FEATURES=test-fail-continue.
+	pushd "${BUILD_DIR}"/lib >/dev/null || die
+	"${EPYTHON}" -m sphinx.pycode.__init__ || die "Grammar generation failed."
+	popd >/dev/null || die
+}
+
+python_compile_all() {
+	if use doc; then
+		esetup.py build_sphinx
+		HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
+	fi
+}
+
+python_test() {
+	mkdir -p "${BUILD_DIR}/sphinx_tempdir" || die
+	local -x SPHINX_TEST_TEMPDIR="${BUILD_DIR}/sphinx_tempdir"
+
+	local deselect=(
+		# these tests require Internet access
+		tests/test_build_latex.py::test_latex_images
+		tests/test_build_linkcheck.py::test_defaults
+		tests/test_build_linkcheck.py::test_defaults_json
+		tests/test_build_linkcheck.py::test_anchors_ignored
+	)
+	[[ ${EPYTHON} == pypy3 ]] && deselect+=(
+		tests/test_build_linkcheck.py::test_connect_to_selfsigned_fails
+		tests/test_ext_autodoc.py::test_autodoc_inherited_members_None
+		tests/test_ext_autodoc.py::test_autodoc_typed_inherited_instance_variables
+		tests/test_ext_autodoc.py::test_autodoc_typed_instance_variables
+		tests/test_ext_autodoc.py::test_automethod_for_builtin
+		tests/test_ext_autodoc.py::test_cython
+		tests/test_ext_autodoc.py::test_partialfunction
+		tests/test_ext_autodoc_autoclass.py::test_autodoc_process_bases
+		tests/test_ext_autodoc_autoclass.py::test_show_inheritance_for_decendants_of_generic_type
+		tests/test_ext_autodoc_autoclass.py::test_show_inheritance_for_subclass_of_generic_type
+		tests/test_ext_autodoc_autodata.py::test_autodata_type_comment
+		tests/test_ext_autodoc_autofunction.py::test_builtin_function
+		tests/test_ext_autodoc_autofunction.py::test_methoddescriptor
+		tests/test_ext_autodoc_configs.py::test_autodoc_type_aliases
+		tests/test_ext_autodoc_configs.py::test_autodoc_typehints_signature
+		tests/test_ext_autosummary.py::test_autosummary_generate_content_for_module
+		tests/test_ext_autosummary.py::test_autosummary_generate_content_for_module_skipped
+		tests/test_pycode_parser.py::test_annotated_assignment
+	)
+
+	epytest ${deselect[@]/#/--deselect }
+}