Adding metadata

29 files changed, 122 insertions, 265 deletions

diff --git a/dev-python/gast/Manifest b/dev-python/gast/Manifest
index 563893eb894f..89156d9adb0c 100644
--- a/dev-python/gast/Manifest
+++ b/dev-python/gast/Manifest
@@ -1,2 +1 @@
-DIST gast-0.5.2.tar.gz 14222 BLAKE2B b251f9aa54d8bdba318f0c8aa7fe97221615a22b7dec8da99b15078ce0f482ac8ec931b9c0acba3a405f2ab3c820a1c578ab93583f9f84740571dd85a3fcb45d SHA512 2a06245ba93f2c0715f662e32e0865732828deb672bc70c3d70a4969c8a2e4c518354a4a63760eddeba53932d4f8bf0ae0ffab64f1a1ad3b20d5b2d18285cd6a
 DIST gast-0.5.3.tar.gz 23455 BLAKE2B b7263e959178421a7ba1cdb41cb09edbe1c30680573e1ab3b4de114e0bd151d2278be799fcc1a01524bb5ee6f6d6764d9902dd0018e7cbe54ac7a3d1300bbeb1 SHA512 a836be76303591ca7c40596d98a29dbd53f281e277c8c23e3821b2003d4e8aaf4d806e7f532f27c0eadd4bdca5a28dc0a3902245505ab97497b9afbfee0c2e52
diff --git a/dev-python/gast/gast-0.5.2.ebuild b/dev-python/gast/gast-0.5.2.ebuild
deleted file mode 100644
index e594898e496c..000000000000
--- a/dev-python/gast/gast-0.5.2.ebuild
+++ /dev/null
@@ -1,20 +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 generic AST to represent Python2 and Python3's Abstract Syntax Tree (AST)"
-HOMEPAGE="https://pypi.org/project/gast/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc64 ~riscv ~sparc x86"
-
-BDEPEND="
-	test? ( dev-python/astunparse[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests unittest
diff --git a/dev-python/gast/gast-0.5.3.ebuild b/dev-python/gast/gast-0.5.3.ebuild
index 90249095ee2f..e933d6a02f1b 100644
--- a/dev-python/gast/gast-0.5.3.ebuild
+++ b/dev-python/gast/gast-0.5.3.ebuild
@@ -12,6 +12,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD PSF-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc64 ~riscv ~sparc x86"
 
 distutils_enable_tests unittest
diff --git a/dev-python/grpcio-testing/Manifest b/dev-python/grpcio-testing/Manifest
index 620a918aa92f..4bfac09d155e 100644
--- a/dev-python/grpcio-testing/Manifest
+++ b/dev-python/grpcio-testing/Manifest
@@ -1,2 +1 @@
-DIST grpcio-testing-1.41.0.tar.gz 16777 BLAKE2B 143b543f713c5d92d016cb428e06503fc92f33a9ae758eddae25b5d815222bff7d045d0330a148b072638adff3157b7accbc5fc0eb9c99c981499acd1916f37c SHA512 107bd368a10112cb9bfd0ea0cde8c245ac3131e7db4c14884ec9cd768cf510986dd06ed84b922df81542273951a8f25ef6b75954c3c6e5b42b3b80475508303b
 DIST grpcio-testing-1.41.1.tar.gz 16856 BLAKE2B 2aedcdb83800a144f52469fe8aa6d2fac63e8235c1804d9426bbece0d57cd01fce178bf6854b1743f77b95896aabd5831abef74438596e7d188a72ec388502a6 SHA512 9f55056d97bc7aa7f6ee59a94fee1e6ce92b5871da08a54f1e749a3d5bf1d4aec568c9855082a03dd5899ca19da91c9dfd5dda43c27b37347d99ee1615d4ff73
diff --git a/dev-python/grpcio-testing/grpcio-testing-1.41.0.ebuild b/dev-python/grpcio-testing/grpcio-testing-1.41.0.ebuild
deleted file mode 100644
index 81967cb8c8a6..000000000000
--- a/dev-python/grpcio-testing/grpcio-testing-1.41.0.ebuild
+++ /dev/null
@@ -1,22 +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} )
-
-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 99e25b99eb96..cefbb8ad8db2 100644
--- a/dev-python/grpcio-tools/Manifest
+++ b/dev-python/grpcio-tools/Manifest
@@ -1,2 +1 @@
-DIST grpcio-tools-1.41.0.tar.gz 2172949 BLAKE2B 42c4eee8a5b2f815681fb45fdc681bc713c113d9251acdc1f2fa897756e96a058d83fe75abdafd446d9fe61cec280b6db7e62cb15278882b964c0ed57dbb7beb SHA512 67b293fdbace63d3031372594d57a22194b6d257704279c12b227dabd8feb6de0acd5ba36f6296da7d82c8eac0ca4aa7cc3b12ea01ca9ffa0d15ed8181eb46ee
 DIST grpcio-tools-1.41.1.tar.gz 2173046 BLAKE2B 2edfda68c5e5eaa86a69f2061d1b13a6c7070ad4152a20ecea910d4685e0face957aa204c639e4e72b04c131bccca63549a83aa38f0e5201304b48352e4ae3ab SHA512 8f9ea6c2541670cb206059c378b33425fea3d63c3e890ba064581e780dcd3b0ce5f9c890731cac35d14281bfa49182857148fe2794a9373914493c4e0d4ce3b9
diff --git a/dev-python/grpcio-tools/grpcio-tools-1.41.0.ebuild b/dev-python/grpcio-tools/grpcio-tools-1.41.0.ebuild
deleted file mode 100644
index 79d43be41993..000000000000
--- a/dev-python/grpcio-tools/grpcio-tools-1.41.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# 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 0230ea85f959..1e0aeb1f7f64 100644
--- a/dev-python/grpcio/Manifest
+++ b/dev-python/grpcio/Manifest
@@ -1,2 +1 @@
-DIST grpcio-1.41.0.tar.gz 21214188 BLAKE2B ac534e34cc5ccf810c1d2006d11d18dd067f0eff68724375f68710dcfe63f016adc467d2c1453e310ac531ec03f2dfd5b0dd8ccc14a6dab94b1c5815b6e3a0ee SHA512 714c1da865864df994540ccc48e73e709f63ceb8617119e67b463f647783d65222b8ef760e2ac1ebaab0fe43442382c2859d796c8a30d6e1eaf511b7dac515a7
 DIST grpcio-1.41.1.tar.gz 21241107 BLAKE2B 28600650352c92e215c9cfa150e73835b4dff3946628192bff7f5848c5e2600c37f563c7d1403fb119bebbdcaef4f5e36ac43c4f8609a8338983978501bc21f9 SHA512 555ab9e2524108efb60ec957d419e80e4abc07752bbd265cd1dee5ccd7c55141d9f2f88db6ba5c03d606e266cd72e4650d38316215da8d70358dad971be52fff
diff --git a/dev-python/grpcio/grpcio-1.41.0.ebuild b/dev-python/grpcio/grpcio-1.41.0.ebuild
deleted file mode 100644
index f04061c05f90..000000000000
--- a/dev-python/grpcio/grpcio-1.41.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=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.0.2:0=[-bindist(-)]
-	>=dev-libs/re2-0.2021.04.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/grpcio/grpcio-1.41.1.ebuild b/dev-python/grpcio/grpcio-1.41.1.ebuild
index 6895238109d2..f04061c05f90 100644
--- a/dev-python/grpcio/grpcio-1.41.1.ebuild
+++ b/dev-python/grpcio/grpcio-1.41.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN::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-libs/openssl-1.0.2:0=[-bindist(-)]
diff --git a/dev-python/mako/Manifest b/dev-python/mako/Manifest
index 068ea61490eb..19363a6d6532 100644
--- a/dev-python/mako/Manifest
+++ b/dev-python/mako/Manifest
@@ -1,2 +1 @@
-DIST Mako-1.1.5.tar.gz 494647 BLAKE2B 5e4f3e111137820997eb39bbaa1af35ac97de101757b66b6efd097e0d35f6d020bfc8b5b98da8c03fc81a907f228526543f5bdaaf161c4f850418cbcaaf81770 SHA512 3eff75f1a94f8e01131ce118df73be1ade79306562ae2ca68079eb2b64ef82c48c09cfd7ed6eda42819bf50c70941cf4115f8918b4d8187f7489717c7d4a423b
 DIST Mako-1.1.6.tar.gz 495132 BLAKE2B bbdf0db9303f5d369b5c6c6644ee44d767630f51305ae259c44c65a3fba959a07d9833fdc69fc8168f7424cc0c3a05e991daae239bef8392c01396c1295967c7 SHA512 e87d883d7a549a902bb2e16d20306ccd3dd7b3bf855dfdaff20477dd182a782a5cecbdc447e4b1607f190a7b0febcca001333137f7cac6ffa674824c2a2fd1bb
diff --git a/dev-python/mako/mako-1.1.5.ebuild b/dev-python/mako/mako-1.1.5.ebuild
deleted file mode 100644
index c2e84d422dd5..000000000000
--- a/dev-python/mako/mako-1.1.5.ebuild
+++ /dev/null
@@ -1,37 +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 )
-inherit distutils-r1 optfeature
-
-MY_P=${P^}
-DESCRIPTION="A Python templating language"
-HOMEPAGE="https://www.makotemplates.org/ https://pypi.org/project/Mako/"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${PN^}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="doc"
-
-RDEPEND=">=dev-python/markupsafe-0.9.2[${PYTHON_USEDEP}]"
-
-PATCHES=(
-	"${FILESDIR}"/mako-1.1.1-pypy3-test.patch
-)
-
-distutils_enable_tests pytest
-
-python_install_all() {
-	rm -r doc/build || die
-
-	use doc && local HTML_DOCS=( doc/. )
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature "caching support" dev-python/beaker
-}
diff --git a/dev-python/mako/mako-1.1.6.ebuild b/dev-python/mako/mako-1.1.6.ebuild
index 29084017b981..c2e84d422dd5 100644
--- a/dev-python/mako/mako-1.1.6.ebuild
+++ b/dev-python/mako/mako-1.1.6.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="doc"
 
 RDEPEND=">=dev-python/markupsafe-0.9.2[${PYTHON_USEDEP}]"
diff --git a/dev-python/markdown/Manifest b/dev-python/markdown/Manifest
index 43131c37cf41..b5ae65a5f412 100644
--- a/dev-python/markdown/Manifest
+++ b/dev-python/markdown/Manifest
@@ -1,2 +1 @@
-DIST Markdown-3.3.4.tar.gz 322192 BLAKE2B 37122305112440b85d7f0e5e1bf90bafe15a8bcb84e8d8bdd9b4183dcb4be1010d287450062bab7dc9017d8e618f84a8245e6fd35f8204e5e2ece14d302fb13b SHA512 37422619dd8f542bfcf7975c92e76a39e4eeeb42386727d52037869cee1617f8efcb74a382a9c7cb903907ebf3643a27ba0de583bc0dbd327a36e72bbf8520af
 DIST Markdown-3.3.6.tar.gz 323584 BLAKE2B 5d21a6e8c52bd7dcc61c68ddf3f07527d234e15f711beed34ecbd424c7a5a650aba5f5ade7d793095b769c02d66c9c2e4ecc9e398730fbdc6e6aa920fbd0a243 SHA512 7c425470781becae981980a35ef6c609e0c2c76689ba81344607e94d362ae437ac33070c52d2818e90172dc09294185b9ca4eb5f0a50171b55dfac09d634ccb2
diff --git a/dev-python/markdown/markdown-3.3.4-r1.ebuild b/dev-python/markdown/markdown-3.3.4-r1.ebuild
deleted file mode 100644
index 65fb75a1458b..000000000000
--- a/dev-python/markdown/markdown-3.3.4-r1.ebuild
+++ /dev/null
@@ -1,35 +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="Python implementation of the markdown markup language"
-HOMEPAGE="
-	https://python-markdown.github.io/
-	https://pypi.org/project/Markdown/
-	https://github.com/Python-Markdown/markdown"
-SRC_URI="mirror://pypi/M/${PN^}/${P^}.tar.gz"
-S="${WORKDIR}/${P^}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="doc"
-
-BDEPEND="
-	test? (
-		dev-python/pygments[${PYTHON_USEDEP}]
-		dev-python/pytidylib[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests unittest
-
-python_install_all() {
-	use doc && dodoc -r docs/
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/markdown/markdown-3.3.6.ebuild b/dev-python/markdown/markdown-3.3.6.ebuild
index e1e4b3c63226..5e88f0c879fb 100644
--- a/dev-python/markdown/markdown-3.3.6.ebuild
+++ b/dev-python/markdown/markdown-3.3.6.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${P^}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="doc"
 
 RDEPEND="
diff --git a/dev-python/matplotlib/matplotlib-3.5.1.ebuild b/dev-python/matplotlib/matplotlib-3.5.1.ebuild
index d1925f2f4ba8..6ab1ce09d40c 100644
--- a/dev-python/matplotlib/matplotlib-3.5.1.ebuild
+++ b/dev-python/matplotlib/matplotlib-3.5.1.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/memory_profiler/Manifest b/dev-python/memory_profiler/Manifest
index c6271af5f80f..daa6aeffaf9c 100644
--- a/dev-python/memory_profiler/Manifest
+++ b/dev-python/memory_profiler/Manifest
@@ -1,2 +1,3 @@
 DIST memory_profiler-0.58.0.gh.tar.gz 140692 BLAKE2B 2f3917d833dfcc722b61871c7e704e869527a389b10a81b473989b8455630f5defa5f5b21a172708070b89468c7dd66682cd3b9c0bf435e9be49651b69b50137 SHA512 5c02933acffc05f42d2ae98a069d36563e1d26515d439d94ad3903960dd06cd378faae3000b26c022770e71e83db6f770ceaf63cabb92f4159bda0ff9cc4e849
 DIST memory_profiler-0.59.gh.tar.gz 142586 BLAKE2B b9c8cffbd03f980937d30626facf431e6effd9a86a21fbe629f4238a2f78f2d65242637105ad3a07b4158a6335a541701bba657941bb23c9da0f49a1113402ee SHA512 f70ad8f871bd5068e2817049231abee7e535cb352f0444dcb0d9d072b9f4dda944e85ec7854855307a9748257da80f53dd50fe17fefbd73045dce1306f51f88d
+DIST memory_profiler-0.60.gh.tar.gz 142585 BLAKE2B aa7fd9e547eecadc184d4da5830c582a9a9ab9565f3dc9c763caaa7e75698ed6b499d2555e4a93b39d2f80f85fad025b84043e0812cb25dd1511f4ebf8da5a85 SHA512 407e44a410cdb4c7c8cc5ff40198c28012f8b0c6bba88d2d1612681eb621a1b802ef137be62fc64ca9e3c362ca3814433bc12169d7c3827bf97293c5bbb8bfbc
diff --git a/dev-python/memory_profiler/memory_profiler-0.60.ebuild b/dev-python/memory_profiler/memory_profiler-0.60.ebuild
new file mode 100644
index 000000000000..bf625fa4b0a0
--- /dev/null
+++ b/dev-python/memory_profiler/memory_profiler-0.60.ebuild
@@ -0,0 +1,55 @@
+# 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 module for monitoring memory usage of a python program"
+HOMEPAGE="https://pypi.org/project/memory-profiler/ https://github.com/pythonprofilers/memory_profiler"
+SRC_URI="
+	https://github.com/pythonprofilers/memory_profiler/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+IUSE="examples"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+# dev-lang/mercury: collision on 'mprof'
+# https://bugs.gentoo.org/571176
+RDEPEND="dev-python/psutil[${PYTHON_USEDEP}]
+	!dev-lang/mercury"
+
+distutils_enable_tests pytest
+
+python_test() {
+	"${EPYTHON}" -m memory_profiler test/test_as.py || die
+	"${EPYTHON}" -m memory_profiler test/test_func.py || die
+	"${EPYTHON}" -m memory_profiler test/test_gen.py || die
+	"${EPYTHON}" -m memory_profiler test/test_loop.py || die
+	"${EPYTHON}" -m memory_profiler test/test_loop_decorated.py || die
+	"${EPYTHON}" -m memory_profiler test/test_mprofile.py || die
+	"${EPYTHON}" -m memory_profiler test/test_nested.py || die
+	"${EPYTHON}" -m memory_profiler test/test_precision_command_line.py || die
+	"${EPYTHON}" -m memory_profiler test/test_unicode.py || die
+
+	"${EPYTHON}" test/test_exception.py || die
+	"${EPYTHON}" test/test_exit_code.py || die
+	"${EPYTHON}" test/test_global.py || die
+	"${EPYTHON}" test/test_import.py || die
+	"${EPYTHON}" test/test_memory_usage.py || die
+	"${EPYTHON}" test/test_mprof.py || die
+	"${EPYTHON}" test/test_precision_import.py || die
+	"${EPYTHON}" test/test_stream_unicode.py || die
+	"${EPYTHON}" test/test_tracemalloc.py || die
+}
+
+python_install_all() {
+	use examples && dodoc -r examples
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/mysql-connector-python/Manifest b/dev-python/mysql-connector-python/Manifest
index 4741b1fa5ab5..4e385b662e1e 100644
--- a/dev-python/mysql-connector-python/Manifest
+++ b/dev-python/mysql-connector-python/Manifest
@@ -1,2 +1 @@
-DIST mysql-connector-python-8.0.26.tar.gz 15180658 BLAKE2B e964728d5f39b9ca5abc72ab84780b463708d1a1cf90507330e73be4837cd30befe245ddd70783490660c70da1b7c162803eee743a0e668cfa6b82773bea4fef SHA512 204021e08b21c5efe87c0f59a6ff3b949cc1d01005121dfe5dde7fea12852a3e28c35b68e06e04f2c0ac4f911bfc14893e6509c99d0c5bf2c30fa32d4131c630
 DIST mysql-connector-python-8.0.27.tar.gz 15202354 BLAKE2B dd9d3b931d88955af3e0d9ec1e12136dabc475ac45ed3d7d0fec42d6f966b38d69c1ee13a96f7173e4c8754656255279c5ab7e41cc5a31b3b7129b20cc617ba9 SHA512 3ba5beff16e743f7098e211cbde35bea7bc7451cf77c544b60beeebcb2c9724f3afd5ab6ff6f9d9809075f4cf29e42f40cd326be944408942d06d357f6a95a23
diff --git a/dev-python/mysql-connector-python/mysql-connector-python-8.0.26.ebuild b/dev-python/mysql-connector-python/mysql-connector-python-8.0.26.ebuild
deleted file mode 100644
index 3f872fc2b7eb..000000000000
--- a/dev-python/mysql-connector-python/mysql-connector-python-8.0.26.ebuild
+++ /dev/null
@@ -1,53 +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} )
-inherit distutils-r1
-
-DESCRIPTION="Python client library for MariaDB/MySQL"
-HOMEPAGE="https://dev.mysql.com/downloads/connector/python/"
-SRC_URI="https://github.com/mysql/mysql-connector-python/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-KEYWORDS="amd64 arm x86"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="examples test"
-
-BDEPEND=">=dev-libs/protobuf-3.6.1"
-
-RDEPEND="
-	>=dev-db/mysql-connector-c-8.0
-	>=dev-python/protobuf-python-3.6.1[${PYTHON_USEDEP}]
-	dev-python/dnspython[${PYTHON_USEDEP}]
-"
-# tests/mysqld.py does not like MariaDB version strings.
-# See the regex MySQLServerBase._get_version.
-DEPEND="${RDEPEND} test? ( dev-db/mysql[server(+)] )"
-
-# Tests currently fail.
-# mysql.connector.errors.DatabaseError: 1300 (HY000): Invalid utf8 character string: ''
-RESTRICT="test"
-
-DOCS=( README.txt CHANGES.txt README.rst )
-
-python_test() {
-	"${EPYTHON}" unittests.py --with-mysql="${EPREFIX}/usr" --unix-socket="${T}" --mysql-topdir="${T}"
-}
-
-# Yeah, this is really broken, but the extension will only build this way during "install"
-python_install() {
-	distutils-r1_python_install \
-		--with-mysql-capi="${EPREFIX}/usr" \
-		--with-protobuf-include-dir="${EPREFIX}/usr/include/google/protobuf/" \
-		--with-protobuf-lib-dir="${EPREFIX}/usr/$(get_libdir)" \
-		--with-protoc="${EPREFIX}/usr/bin/protoc"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if use examples ; then
-		dodoc -r examples
-	fi
-}
diff --git a/dev-python/mysql-connector-python/mysql-connector-python-8.0.27.ebuild b/dev-python/mysql-connector-python/mysql-connector-python-8.0.27.ebuild
index 717ef4f3ca5a..3f872fc2b7eb 100644
--- a/dev-python/mysql-connector-python/mysql-connector-python-8.0.27.ebuild
+++ b/dev-python/mysql-connector-python/mysql-connector-python-8.0.27.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Python client library for MariaDB/MySQL"
 HOMEPAGE="https://dev.mysql.com/downloads/connector/python/"
 SRC_URI="https://github.com/mysql/mysql-connector-python/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
 
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 arm x86"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="examples test"
diff --git a/dev-python/pyghmi/Manifest b/dev-python/pyghmi/Manifest
index 6008e3f6944f..15bc3b9f46fb 100644
--- a/dev-python/pyghmi/Manifest
+++ b/dev-python/pyghmi/Manifest
@@ -1 +1,2 @@
 DIST pyghmi-1.5.22.tar.gz 221963 BLAKE2B 6705e904c481ddbb241fc8f8089e6bc9bcc142bfca9aaa518b2293b5dd387113fa4bbb418e748584f69fac5e8d1049d669eb73d24463adaaec3a891cae98f928 SHA512 cc665f8b9f4a0c9c127b9e895ba62e650cdb589f5c9edae6accaa5558f347d31725e8da446fcafb4f71ffadc17121d8b293160413f4a41055cb1720e9fa1ecde
+DIST pyghmi-1.5.31.tar.gz 236574 BLAKE2B 9ee7250bae2d87f552686845ae3056f0f646cd1a383587c195bfcc6dfa476b8582509c909f0008fc6751295e2e4e7d33bf822e8b529d67306fcc85412fc9af22 SHA512 d7c9c05b51780bef9d2b417c1a586f84ec87a9f1ff578ab019bfdc1a462decd907b2634fb1c830d0e369eb97122bfcba62ce79a4386c73c9854cde8f9fdeb65c
diff --git a/dev-python/pyghmi/pyghmi-1.5.31.ebuild b/dev-python/pyghmi/pyghmi-1.5.31.ebuild
new file mode 100644
index 000000000000..b245f2f86490
--- /dev/null
+++ b/dev-python/pyghmi/pyghmi-1.5.31.ebuild
@@ -0,0 +1,31 @@
+# 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 pure python implementation of IPMI protocol"
+HOMEPAGE="https://github.com/openstack-archive/pyghmi/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=dev-python/cryptography-2.1[${PYTHON_USEDEP}]
+	dev-python/pbr[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.8.1[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.6.5[${PYTHON_USEDEP}]
+		>=dev-python/subunit-1.0.0[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests unittest
diff --git a/dev-python/python-utils/Manifest b/dev-python/python-utils/Manifest
index d583977eaf8c..c4faa5926ad1 100644
--- a/dev-python/python-utils/Manifest
+++ b/dev-python/python-utils/Manifest
@@ -1,2 +1,3 @@
 DIST python-utils-2.5.6.tar.gz 14057 BLAKE2B 2f66ab26cd6cda25f73c9f40081048404cde819e3e3c2fd11d134244ab2b80a05ab2b943e56a45bd8656bf3ba231853e3bfa9efbab9cb70515daaec70f6e0715 SHA512 35299880afdecd4a44144b95e6b2073e51680dfd2b00f31fb333d578cfa2c2f8bf5f58128cab88a7b81e658e6d5dca303f1c9f5be3870160679e1defbf94859e
 DIST python-utils-2.6.0.tar.gz 14885 BLAKE2B 089d7a57a8469968bed147a01907f35d1430349130e0f7152bbd38dd65053cf3d6424942eee8cc9006baaec5f13bffcbef81bd8723cad7ee03b1358a5c2d3d27 SHA512 a582558e38342f54f7c1eda1f9038728dd5904729aaec4e5719e56bb447bc6fcb93bf5ea3af134ce245eda059b9be81d15b268165cbc10799ba112fc157f939b
+DIST python-utils-2.6.3.tar.gz 14914 BLAKE2B 6df19348feba000dccc516704db38af299613c70505cd7fa16a2e37c4a46b1cff7ee9bf164be13da33a3b4eb6b9577b76202bfbffdaed47b1b7b60e948d349ac SHA512 3c5834976408eae6b37aa07581960ee5511765f9ea1e6347523465a93ca801bc2d71f785a73a2050706dad2c09ffcfb5227715a9b4d0700904d31eb1295b30b6
diff --git a/dev-python/python-utils/python-utils-2.6.3.ebuild b/dev-python/python-utils/python-utils-2.6.3.ebuild
new file mode 100644
index 000000000000..250306bd419a
--- /dev/null
+++ b/dev-python/python-utils/python-utils-2.6.3.ebuild
@@ -0,0 +1,24 @@
+# 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
+
+DESCRIPTION="Collection of small Python functions & classes"
+HOMEPAGE="https://pypi.org/project/python-utils/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	sed -i -e '/--cov/d' -e '/--flake8/d' pytest.ini || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/scipy/scipy-1.7.3.ebuild b/dev-python/scipy/scipy-1.7.3.ebuild
index b3b019013261..dfa3e82d75b5 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 ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm arm64 -hppa ~ia64 ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="doc +pythran sparse"
 
 DEPEND="
diff --git a/dev-python/setuptools_scm_git_archive/setuptools_scm_git_archive-1.1-r4.ebuild b/dev-python/setuptools_scm_git_archive/setuptools_scm_git_archive-1.1-r4.ebuild
index ffc645d74ed0..47e645e9ac30 100644
--- a/dev-python/setuptools_scm_git_archive/setuptools_scm_git_archive-1.1-r4.ebuild
+++ b/dev-python/setuptools_scm_git_archive/setuptools_scm_git_archive-1.1-r4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/Changaco/setuptools_scm_git_archive/archive/${PV}.ta
 
 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"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.4.27-r3.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.27-r3.ebuild
index 6696f8cd8c39..0ebc42b80db6 100644
--- a/dev-python/sqlalchemy/sqlalchemy-1.4.27-r3.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-1.4.27-r3.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="asyncio examples +sqlite test"
 
 # greenlet for bug #823794