Adding metadata

45 files changed, 288 insertions, 166 deletions

diff --git a/dev-python/QtPy/Manifest b/dev-python/QtPy/Manifest
index 2f2e5c04e36c..34a411739e0e 100644
--- a/dev-python/QtPy/Manifest
+++ b/dev-python/QtPy/Manifest
@@ -1,3 +1,4 @@
 DIST QtPy-1.10.0.tar.gz 34339 BLAKE2B cbae5eb38bf8ee4ab1528bca0afa93c57b70f48eb44639eac04344f4bbef28a4277bd3727ed5ac25f8ef18cc5391fafd33bb8ea42037eabee10cd4d13d7d3d1c SHA512 5ca326ae64cc85b48b02daa344d23387a9165a0097d59c31d921c7f67141afe31dad8a46abd0b201b31446f97405d7dce4dacd936b24c5faf9484dc37665e974
 DIST QtPy-1.11.1.tar.gz 37068 BLAKE2B 5eef91a8aaad5d8354d123481e434a2b32b1aa1eddd4b6cc0205a40249533c2f6211b13ea049485243e510b0d820c35f0f5833df4c42276d15f3f8269cff3604 SHA512 467780e353b9658234cc164a11bc1526165a31a2021fd75efdd109ea516de5f279bb601130c98fd295aba99c40f20ab3d2c4758951180d4dc05e47bbc3e8408c
+DIST QtPy-1.11.2.tar.gz 37098 BLAKE2B 8806cce798c4c2d885dd340d0d077567353cf0f3f1c2b284fd788c190b28b6133d052d31dea861e7d2497d0db88ba7ce8be83074360c61823f7a78dc01c015a5 SHA512 e49beb3180789a8080a19406b0e122bc9fc2192ac89b59f0956d7c65ac957779b192062956a97a7526f32724000df18abf32ddd6bda52f9cdf440ddc551887f8
 DIST QtPy-1.9.0.tar.gz 35522 BLAKE2B 05b700c1f804cc535c3065c8f819d1d7fb0e02d43f199082d2e0d2c575ff8dbfdbf0053ddb3b155108cf55350ff4daf75166ab39a60374a35a86a1707724a4a1 SHA512 2492c531f0df3afc9e0f8875a2b2e39cc8b09542fb9f251900b8596c0db7767390bb85365cc39efd6cd37ae852a00655354e6f9f3d795023e4fd86dbf8bd5fa7
diff --git a/dev-python/QtPy/QtPy-1.11.2.ebuild b/dev-python/QtPy/QtPy-1.11.2.ebuild
new file mode 100644
index 000000000000..a5467ad15964
--- /dev/null
+++ b/dev-python/QtPy/QtPy-1.11.2.ebuild
@@ -0,0 +1,158 @@
+# 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 virtualx
+
+DESCRIPTION="Abstraction layer on top of PyQt5 and PySide2 and additional custom QWidgets"
+HOMEPAGE="https://github.com/spyder-ide/qtpy/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+_IUSE_QT_MODULES="
+	declarative designer gui help location multimedia network opengl
+	positioning printsupport sensors serialport speech sql svg testlib
+	webchannel webengine websockets widgets x11extras xml xmlpatterns
+"
+IUSE="+pyqt5 pyside2 ${_IUSE_QT_MODULES}"
+unset _IUSE_QT_MODULES
+
+# PySide2 does not support python3_10, nor is it likely that it will in the
+# future since upstream appears to be focussing on PySide6 for Qt6 instead
+# (which is compatible with python3_10). So if we want to use python3_10
+# we have to force disable pyside2.
+REQUIRED_USE="
+	|| ( pyqt5 pyside2 )
+	python_targets_python3_10? ( pyqt5 !pyside2 )
+"
+
+# These flags are currently *not* common to both the PySide2 and PyQt5 ebuild
+# Disable them for now, please check periodically if this is still up to date.
+# 	bluetooth? ( pyqt5 )
+# 	dbus? ( pyqt5 )
+#
+# 	3d? ( pyside2 )
+# 	charts? ( pyside2 )
+# 	concurrent? ( pyside2 )
+# 	datavis? ( pyside2 )
+# 	scxml? ( pyside2 )
+# 	script? ( pyside2 )
+# 	scripttools? ( pyside2 )
+
+# WARNING: the obvious solution of using || for PyQt5/pyside2 is not going
+# to work. The package only checks whether PyQt5/pyside2 is installed, it does
+# not verify whether they have the necessary modules (i.e. satisfy the USE dep).
+#
+# Webengine is a special case, because PyQt5 provides this in a separate package
+# while PySide2 ships it in the same package.
+#
+# declarative/qml/quick is a special case, because PyQt5 bundles the bindings
+# for qml and quick in one flag: declarative PySide2 does not.
+#
+# The PyQt5 ebuild currently enables xml support unconditionally, the flag is
+# added anyway with a (+) to make it future proof if the ebuild were to change
+# this behaviour in the future.
+#
+# The PySide2 ebuild currently enables opengl and serialport support
+# unconditionally, the flag is added anyway with a (+) to make it future proof
+# if the ebuild were to change this behaviour in the future.
+RDEPEND="
+	pyqt5? (
+		dev-python/PyQt5[${PYTHON_USEDEP}]
+		dev-python/PyQt5[declarative?,designer?,gui?,help?,location?]
+		dev-python/PyQt5[multimedia?,network?,opengl?,positioning?]
+		dev-python/PyQt5[printsupport?,sensors?,serialport?,speech(-)?,sql?,svg?]
+		dev-python/PyQt5[testlib?,webchannel?,websockets?,widgets?]
+		dev-python/PyQt5[x11extras?,xml(+)?,xmlpatterns?]
+		webengine? ( dev-python/PyQtWebEngine[${PYTHON_USEDEP}] )
+	)
+	pyside2? (
+		$(python_gen_cond_dep '
+			dev-python/pyside2[${PYTHON_USEDEP}]
+			dev-python/pyside2[designer?,gui?,help?,location?,multimedia?]
+			dev-python/pyside2[network?,opengl(+)?,positioning?,printsupport?]
+			dev-python/pyside2[sensors?,serialport(+)?,speech?,sql?,svg?]
+			dev-python/pyside2[testlib?,webchannel?,webengine?,websockets?]
+			dev-python/pyside2[widgets?,x11extras?,xml?,xmlpatterns?]
+			declarative? ( dev-python/pyside2[qml,quick] )
+			' python3_{7..9} )
+	)
+"
+
+# The QtPy testsuite skips tests for bindings that are not installed, so here we
+# ensure that everything is available and all tests are run. Note that not
+# all flags are available in PyQt5/PySide2, so some tests are still skipped.
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		pyqt5? (
+			dev-python/PyQt5[${PYTHON_USEDEP}]
+			dev-python/PyQt5[bluetooth,dbus,declarative,designer,gui,help,location]
+			dev-python/PyQt5[multimedia,network,opengl,positioning,printsupport]
+			dev-python/PyQt5[sensors,serialport,speech(-),sql,svg,testlib,webchannel]
+			dev-python/PyQt5[websockets,widgets,x11extras,xml(+),xmlpatterns]
+			dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
+		)
+		pyside2? (
+			$(python_gen_cond_dep '
+				dev-python/pyside2[${PYTHON_USEDEP}]
+				dev-python/pyside2[3d,charts,concurrent,datavis,designer,gui,help]
+				dev-python/pyside2[location,multimedia,network,opengl(+),positioning]
+				dev-python/pyside2[printsupport,qml,quick,script,scripttools,scxml]
+				dev-python/pyside2[sensors,serialport(+),speech,sql,svg,testlib]
+				dev-python/pyside2[webchannel,webengine,websockets,widgets,x11extras]
+				dev-python/pyside2[xml,xmlpatterns]
+				' python3_{7..9} )
+		)
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	default
+	# Disale Qt for Python implementations that are not selected
+	if ! use pyqt5; then
+		sed -i -e "s/from PyQt5.QtCore import/raise ImportError #/" qtpy/__init__.py || die
+	fi
+	if ! use pyside2; then
+		sed -i -e "s/from PySide2 import/raise ImportError #/" qtpy/__init__.py || die
+		sed -i -e "s/from PySide2.QtCore import/raise ImportError #/" qtpy/__init__.py || die
+	fi
+
+	# Disable outdated PyQt4 and PySide
+	sed -i -e "s/from PyQt4.Qt import/raise ImportError #/" qtpy/__init__.py || die
+	sed -i -e "s/from PyQt4.QtCore import/raise ImportError #/" qtpy/__init__.py || die
+	sed -i -e "s/from PySide import/raise ImportError #/" qtpy/__init__.py || die
+	sed -i -e "s/from PySide.QtCore import/raise ImportError #/" qtpy/__init__.py || die
+}
+
+src_test() {
+	virtx python_foreach_impl python_test
+}
+
+python_test() {
+	if use pyqt5; then
+		QT_API="pyqt5" epytest
+	fi
+	if use pyside2; then
+		if [[ "${EPYTHON}" == "python3.10" ]]; then
+			return
+		else
+			QT_API="pyside2" epytest
+		fi
+	fi
+}
+
+pkg_postinst() {
+	if use pyqt5 && use pyside2; then
+		ewarn "You have enabled both PyQt5 and PySide2, note that QtPy will default"
+		ewarn "to PyQt5 unless the QT_API environment variable overrides this."
+	fi
+}
diff --git a/dev-python/argon2-cffi/Manifest b/dev-python/argon2-cffi/Manifest
index 000c51bb9b63..1210172f4cb4 100644
--- a/dev-python/argon2-cffi/Manifest
+++ b/dev-python/argon2-cffi/Manifest
@@ -1,2 +1 @@
-DIST argon2-cffi-20.1.0.tar.gz 1814415 BLAKE2B c216349beffa263fd96df23f40a8102b56a88b8320e64ac062ecfea4582efa34b298ba223437bfbfc422b68a3d9b9ea769c384db078c633103f2aae3cd38bd5b SHA512 d1d798e3e51ed67c4f523a66081fea99479ee986b5cfc36b250954e757b9846625681445447f9347519d9988f8a2ace2e3c8ce5817c5c6b4767819cf56ee0af2
 DIST argon2-cffi-21.1.0.tar.gz 1807800 BLAKE2B 47b1e785b7eb173b671a44e9212af76a59f453c3c0d0e5f2c437e7a62132abf86ab6baa8bdd656ad28d00a151296a66211d365c0afe228821c8c1ff1a0a66c46 SHA512 bbfebd2c075f360a6c1c187c0789be2aae7480b9398f36db7bdfe74f288d9e00b44a788918c54f4cc8bb1947136ab0493f61975de408c482a5131e2bf1a8f4d0
diff --git a/dev-python/argon2-cffi/argon2-cffi-20.1.0.ebuild b/dev-python/argon2-cffi/argon2-cffi-20.1.0.ebuild
deleted file mode 100644
index e6c213f7c707..000000000000
--- a/dev-python/argon2-cffi/argon2-cffi-20.1.0.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} pypy3 )
-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 ~ppc ~ppc64 ~sparc x86"
-
-DEPEND="
-	app-crypt/argon2:=
-	dev-python/six[${PYTHON_USEDEP}]
-	virtual/python-cffi[${PYTHON_USEDEP}]
-"
-RDEPEND="${DEPEND}"
-BDEPEND="test? (
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-	)
-"
-
-DOCS=( AUTHORS.rst CHANGELOG.rst FAQ.rst README.rst )
-
-distutils_enable_sphinx docs
-distutils_enable_tests pytest
-
-python_configure_all() {
-	export ARGON2_CFFI_USE_SYSTEM=1
-}
-
-python_test() {
-	local deselect=()
-	[[ ${EPYTHON} == python3.10 ]] && deselect+=(
-		# fails due to changed Enum repr
-		tests/test_utils.py::TestParameters::test_repr
-	)
-	epytest ${deselect[@]/#/--deselect }
-}
diff --git a/dev-python/argon2-cffi/argon2-cffi-21.1.0.ebuild b/dev-python/argon2-cffi/argon2-cffi-21.1.0.ebuild
index 8cdf54c9093d..352b343c872b 100644
--- a/dev-python/argon2-cffi/argon2-cffi-21.1.0.ebuild
+++ b/dev-python/argon2-cffi/argon2-cffi-21.1.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 
 DEPEND="
 	app-crypt/argon2:=
diff --git a/dev-python/arrow/arrow-1.1.1.ebuild b/dev-python/arrow/arrow-1.1.1.ebuild
index 9f646a4a42fd..d473396deae4 100644
--- a/dev-python/arrow/arrow-1.1.1.ebuild
+++ b/dev-python/arrow/arrow-1.1.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~sparc x86"
 
 RDEPEND="
 	>=dev-python/python-dateutil-2.7.0[${PYTHON_USEDEP}]
diff --git a/dev-python/astunparse/astunparse-1.6.3.ebuild b/dev-python/astunparse/astunparse-1.6.3.ebuild
index ee0ce4267bb9..d30c82636b94 100644
--- a/dev-python/astunparse/astunparse-1.6.3.ebuild
+++ b/dev-python/astunparse/astunparse-1.6.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~sparc x86"
 
 RDEPEND="
 	>=dev-python/six-1.6.1[${PYTHON_USEDEP}]
diff --git a/dev-python/beniget/beniget-0.4.1.ebuild b/dev-python/beniget/beniget-0.4.1.ebuild
index 4cbe3ffed8f1..a58167f318a1 100644
--- a/dev-python/beniget/beniget-0.4.1.ebuild
+++ b/dev-python/beniget/beniget-0.4.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~sparc ~x86"
 
 RDEPEND="=dev-python/gast-0.5*[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/berkeleydb/berkeleydb-18.1.4.ebuild b/dev-python/berkeleydb/berkeleydb-18.1.4.ebuild
index 0e3ab819ca73..4e7033f99e74 100644
--- a/dev-python/berkeleydb/berkeleydb-18.1.4.ebuild
+++ b/dev-python/berkeleydb/berkeleydb-18.1.4.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://dev.gentoo.org/~arthurzam/distfiles/dev-python/${PN}/${P}.tar.x
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~riscv ~sparc ~x86"
 
 RDEPEND="
 	|| (
diff --git a/dev-python/enrich/metadata.xml b/dev-python/enrich/metadata.xml
index 3c707f8fbeea..b79b4e820417 100644
--- a/dev-python/enrich/metadata.xml
+++ b/dev-python/enrich/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
- <maintainer type="person">
-  <email>chainsaw@gentoo.org</email>
-  <name>Tony Vroon</name>
- </maintainer>
  <maintainer type="project">
   <email>python@gentoo.org</email>
   <name>Python</name>
diff --git a/dev-python/fqdn/fqdn-1.5.1.ebuild b/dev-python/fqdn/fqdn-1.5.1.ebuild
index c91c2df16be9..4e32bab2d70f 100644
--- a/dev-python/fqdn/fqdn-1.5.1.ebuild
+++ b/dev-python/fqdn/fqdn-1.5.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/ypcrts/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~ppc64 ~sparc ~x86"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-python/gast/gast-0.5.2.ebuild b/dev-python/gast/gast-0.5.2.ebuild
index f3d32487526b..f14fd72c5cb1 100644
--- a/dev-python/gast/gast-0.5.2.ebuild
+++ b/dev-python/gast/gast-0.5.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~sparc x86"
 
 BDEPEND="
 	test? ( dev-python/astunparse[${PYTHON_USEDEP}] )"
diff --git a/dev-python/isoduration/isoduration-20.11.0.ebuild b/dev-python/isoduration/isoduration-20.11.0.ebuild
index 8bedbd52a9f3..c799fff5737c 100644
--- a/dev-python/isoduration/isoduration-20.11.0.ebuild
+++ b/dev-python/isoduration/isoduration-20.11.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~sparc ~x86"
 
 RDEPEND=">=dev-python/arrow-0.15.0[${PYTHON_USEDEP}]"
 BDEPEND="
diff --git a/dev-python/jsonschema/Manifest b/dev-python/jsonschema/Manifest
index 5643cf9fcebe..108ca968b349 100644
--- a/dev-python/jsonschema/Manifest
+++ b/dev-python/jsonschema/Manifest
@@ -1,2 +1,2 @@
 DIST jsonschema-3.2.0.tar.gz 167226 BLAKE2B f89a8198f6b7b4dd56b0320ddecdd834423cbeaf49fbbd1563007da61004322b92e25856ecc17b4d02e2162b2359ec5d7601826fe42cfcb7683ae16cf2baeb39 SHA512 acbb4cec730a8cdab9f070593ed896064fbe082d464ec362adc952e4985e9eaa12ad0f2d55a04018ffdaf675e54037999a7219533dad6b84bf609f5dfe21bbab
-DIST jsonschema-4.0.0.tar.gz 290808 BLAKE2B 29b53fcdedd170d1ea8602dd706d671b78394b8d5e5f54ae3443269394bb7a4d8399a2d99a87dfbb4d27d6613b47e0d5a1c6caea9b679cfd1d21cb4ee0f4e45c SHA512 5decad39032a229f992bf25555473171a19ae076a0726b73fcc284cecf788bcd29e8662ad48405ee5a93df812b87e5846a640dafc32157c3742f2abf7f7a9c97
+DIST jsonschema-4.0.1.tar.gz 290999 BLAKE2B d693a33ef705a401187bdf603aacfd0336eab16afc0e38c5133ff6a74e4f0b323172d5abac0959163e40f546eedb75fe2b71f2ca53e7bbe1bf4f00ad977873b9 SHA512 50a2dd6423e8aca76e0a33e33a63bb7d1500abac891076426112c4577277d1f0322d06ec0ba5a9f47c65e5981f0cce768801e55e2f03ab6b0b6d2f884249b5fb
diff --git a/dev-python/jsonschema/jsonschema-4.0.0.ebuild b/dev-python/jsonschema/jsonschema-4.0.1.ebuild
index 804ac4e0e140..4b808f2e54b3 100644
--- a/dev-python/jsonschema/jsonschema-4.0.0.ebuild
+++ b/dev-python/jsonschema/jsonschema-4.0.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~sparc ~x86"
 
 RDEPEND="
 	dev-python/attrs[${PYTHON_USEDEP}]
@@ -42,4 +42,4 @@ BDEPEND="
 	)
 "
 
-distutils_enable_tests unittest
+distutils_enable_tests --install unittest
diff --git a/dev-python/oslo-concurrency/oslo-concurrency-4.4.1.ebuild b/dev-python/oslo-concurrency/oslo-concurrency-4.4.1.ebuild
index 6ed18b9e1bf4..ddc173159c64 100644
--- a/dev-python/oslo-concurrency/oslo-concurrency-4.4.1.ebuild
+++ b/dev-python/oslo-concurrency/oslo-concurrency-4.4.1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${PN/-/.}-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 
 RDEPEND="
 	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/pgzero/pgzero-1.2.1-r1.ebuild b/dev-python/pgzero/pgzero-1.2.1-r1.ebuild
index 9a4f8bba99e4..9330381a39f4 100644
--- a/dev-python/pgzero/pgzero-1.2.1-r1.ebuild
+++ b/dev-python/pgzero/pgzero-1.2.1-r1.ebuild
@@ -6,13 +6,15 @@ EAPI=8
 PYTHON_COMPAT=( python3_{6,7,8,9,10} )
 
 inherit distutils-r1
-distutils_enable_tests unittest
 
 MY_PV="${PV/_p/.post}"
 MY_P="${PN}-${MY_PV}"
+
 DESCRIPTION="A zero-boilerplate games programming framework based on Pygame"
 HOMEPAGE="https://pygame-zero.readthedocs.io/"
 SRC_URI="https://github.com/lordmauve/${PN}/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
 LICENSE="LGPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
@@ -22,15 +24,16 @@ RDEPEND="
 	dev-python/pygame[${PYTHON_USEDEP}]
 "
 
-DEPEND="
-	${RDEPEND}
+BDEPEND="
 	test? (
 		media-libs/sdl2-image[png]
 		media-libs/sdl2-mixer[vorbis]
 	)
 "
+distutils_enable_tests unittest
 
-S="${WORKDIR}/${MY_P}"
-
-# Allow the tests to pass without real audio or video.
-export SDL_AUDIODRIVER=dummy SDL_VIDEODRIVER=dummy
+python_test() {
+	# Allow the tests to pass without real audio or video.
+	local -x SDL_AUDIODRIVER=dummy SDL_VIDEODRIVER=dummy
+	eunittest
+}
diff --git a/dev-python/progressbar2/metadata.xml b/dev-python/progressbar2/metadata.xml
index 7c14a9bbcb28..5e33dc9c7691 100644
--- a/dev-python/progressbar2/metadata.xml
+++ b/dev-python/progressbar2/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
- <maintainer type="person">
-  <email>chainsaw@gentoo.org</email>
-  <name>Tony Vroon</name>
- </maintainer>
  <upstream>
   <remote-id type="pypi">progressbar2</remote-id>
  </upstream>
diff --git a/dev-python/pygame/pygame-2.0.1-r1.ebuild b/dev-python/pygame/pygame-2.0.1-r1.ebuild
index 11953f7e1f6e..d4e649c2571b 100644
--- a/dev-python/pygame/pygame-2.0.1-r1.ebuild
+++ b/dev-python/pygame/pygame-2.0.1-r1.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 PYTHON_COMPAT=( python3_{6,7,8,9,10} )
 
 inherit distutils-r1
@@ -51,6 +52,10 @@ src_prepare() {
 	if ! use midi; then
 		rm test/midi_test.py || die
 	fi
+	# Fixed in next release
+	sed -e 's/++Py_REFCNT/Py_INCREF/' \
+		-e 's/--Py_REFCNT/Py_DECREF/' \
+		-i src_c/_sdl2/*.c || die
 	distutils-r1_src_prepare
 }
 
diff --git a/dev-python/pygame/pygame-9999.ebuild b/dev-python/pygame/pygame-9999.ebuild
index f854a34ef220..d4d31f2b3b67 100644
--- a/dev-python/pygame/pygame-9999.ebuild
+++ b/dev-python/pygame/pygame-9999.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# 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 git-r3
diff --git a/dev-python/pyopengl/pyopengl-3.1.5.ebuild b/dev-python/pyopengl/pyopengl-3.1.5.ebuild
index 7e26101248b7..58bf5bbf43d6 100644
--- a/dev-python/pyopengl/pyopengl-3.1.5.ebuild
+++ b/dev-python/pyopengl/pyopengl-3.1.5.ebuild
@@ -39,7 +39,6 @@ BDEPEND="
 	test? (
 		dev-python/numpy[${PYTHON_USEDEP}]
 		dev-python/pygame[${PYTHON_USEDEP},opengl,X]
-		dev-python/pytest[${PYTHON_USEDEP}]
 		!prefix? (
 			media-libs/mesa[llvm]
 			x11-base/xorg-server[-minimal,xorg]
diff --git a/dev-python/pypng/Manifest b/dev-python/pypng/Manifest
index 9987a295acfc..bf24b244d0ea 100644
--- a/dev-python/pypng/Manifest
+++ b/dev-python/pypng/Manifest
@@ -1,2 +1 @@
-DIST pypng-0.0.20.tar.gz 649538 BLAKE2B 9a15923c7f4d06deb982dc0b70d7502d3a5189f06cd6cdd0b35e81fcba6ea6b8ef50a6ab1ea03d8ac69a5e4d712eb23d7e18a3f1641c5a51f6f4d287d2fb5e43 SHA512 4f84e9b9cc68c0ad7e4558f0f46c54b0f091561f1a3679ac0679d8a1f1ab9a06493d71bf9df4db5deb6bedbdfa53bb1775ee51204133309eba962077102fdcdd
 DIST pypng-0.0.21.tar.gz 111899 BLAKE2B b4b8f17b76918f415c02edc09a597af643615f46839fb4464f3116e4cefb0a251227f344ff2c1c51efb87933faf647bfa6a7c4d89bc91c8389a3dc71479e878d SHA512 b8f5f9be05aafe59aeb69462b7ccc9e5c4df8eb157731d888773f0ef223dc1c45db83daa51347b45dc3c59be5141c3fc4e031004ac28927b786d7e254ffff4fa
diff --git a/dev-python/pypng/files/pypng-0.0.20-py39.patch b/dev-python/pypng/files/pypng-0.0.20-py39.patch
deleted file mode 100644
index e4c738ee3137..000000000000
--- a/dev-python/pypng/files/pypng-0.0.20-py39.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From fe9c973c5e92f24746dfa1be8796c14a2befec4f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Wed, 15 Jul 2020 07:54:53 +0200
-Subject: [PATCH] test_png: Use array.tobytes to fix py3.9 compatibility
-
-The deprecated array.tostring() method has been removed in Python 3.9.
-Use .tobytes() instead.
----
- code/test_png.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/code/test_png.py b/code/test_png.py
-index c858d18..447c314 100644
---- a/code/test_png.py
-+++ b/code/test_png.py
-@@ -448,13 +448,13 @@ class Test(unittest.TestCase):
-     def test_interlaced_array(self):
-         """Reading an interlaced PNG yields each row as an array."""
-         r = png.Reader(bytes=pngsuite.basi0g08)
--        list(r.read()[2])[0].tostring
-+        list(r.read()[2])[0].tobytes
- 
-     def test_trns_array(self):
-         """A type 2 PNG with tRNS chunk yields each row
-         as an array (using asDirect)."""
-         r = png.Reader(bytes=pngsuite.tbrn2c08)
--        list(r.asDirect()[2])[0].tostring
-+        list(r.asDirect()[2])[0].tobytes
- 
-     def test_flat(self):
-         """Test read_flat."""
--- 
-2.27.0
-
diff --git a/dev-python/pypng/pypng-0.0.20.ebuild b/dev-python/pypng/pypng-0.0.20.ebuild
deleted file mode 100644
index 980e7c52f2fc..000000000000
--- a/dev-python/pypng/pypng-0.0.20.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Pure Python PNG image encoder/decoder"
-HOMEPAGE="https://github.com/drj11/pypng https://pypi.org/project/pypng/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 x86"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-py39.patch
-)
-
-python_test() {
-	"${EPYTHON}" code/test_png.py -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/pypng/pypng-0.0.21.ebuild b/dev-python/pypng/pypng-0.0.21.ebuild
index fa3f6aa0b2bd..b8104cf3aea1 100644
--- a/dev-python/pypng/pypng-0.0.21.ebuild
+++ b/dev-python/pypng/pypng-0.0.21.ebuild
@@ -17,7 +17,7 @@ S=${WORKDIR}/pypng-${P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 x86"
+KEYWORDS="amd64 arm arm64 x86"
 
 python_test() {
 	"${EPYTHON}" code/test_png.py -v || die "Tests fail with ${EPYTHON}"
diff --git a/dev-python/pysmi/metadata.xml b/dev-python/pysmi/metadata.xml
index 82c74350372b..1cb6f2cd1aa8 100644
--- a/dev-python/pysmi/metadata.xml
+++ b/dev-python/pysmi/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
- <maintainer type="person">
-  <email>chainsaw@gentoo.org</email>
-  <name>Tony Vroon</name>
- </maintainer>
  <maintainer type="project">
   <email>python@gentoo.org</email>
   <name>Python</name>
diff --git a/dev-python/pytest-flakes/metadata.xml b/dev-python/pytest-flakes/metadata.xml
index df378633699f..1739fd62ed1e 100644
--- a/dev-python/pytest-flakes/metadata.xml
+++ b/dev-python/pytest-flakes/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
- <maintainer type="person">
-  <email>chainsaw@gentoo.org</email>
-  <name>Tony Vroon</name>
- </maintainer>
  <upstream>
   <remote-id type="pypi">pytest-flakes</remote-id>
  </upstream>
diff --git a/dev-python/python-ironicclient/python-ironicclient-4.8.0.ebuild b/dev-python/python-ironicclient/python-ironicclient-4.8.0.ebuild
index 499f09c376e5..8a0140ccfdbf 100644
--- a/dev-python/python-ironicclient/python-ironicclient-4.8.0.ebuild
+++ b/dev-python/python-ironicclient/python-ironicclient-4.8.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 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 
 RDEPEND="
 	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/python-keystoneclient/python-keystoneclient-4.3.0.ebuild b/dev-python/python-keystoneclient/python-keystoneclient-4.3.0.ebuild
index 8f980352c580..6cd8b52a1520 100644
--- a/dev-python/python-keystoneclient/python-keystoneclient-4.3.0.ebuild
+++ b/dev-python/python-keystoneclient/python-keystoneclient-4.3.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 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 
 RDEPEND="
 	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/python-lsp-server/Manifest b/dev-python/python-lsp-server/Manifest
index b3f0c8c66035..0a12015b8f0a 100644
--- a/dev-python/python-lsp-server/Manifest
+++ b/dev-python/python-lsp-server/Manifest
@@ -1,2 +1,3 @@
 DIST python-lsp-server-1.2.1.tar.gz 61448 BLAKE2B 28294bf1f62a4fd0bf7b32b51a34b6206551614523130d7bb11f7f2e0175d4c061decada8c4f7713dc6c775f09f423d2c622d17354307faa557a48f5db2cdad3 SHA512 7a82af96508db943699ae63c90576205fca78e2ff47093934f26d9c5547199753acbc83ac0bdddb00d373761bebb31b5b869a9a02f734a5a4e033e7f024bf2d1
 DIST python-lsp-server-1.2.2.tar.gz 61742 BLAKE2B d0886549d9ebf79bf97be30abb361be1fdee243abf9ed4707e27857122e9721dcc59f968c4ad7d2904ba11f06e6e6dc34593e5255ce0c9c528defdab7b6e3b7e SHA512 afeb0798fef151ab7cb79b3a0b294a30111d4bb409a4a8ad5148f9cb3dfb9a56e0033541b44a2b683bf043fcb31a8d83a788b0c9c22587b6ae532abb288542a6
+DIST python-lsp-server-1.2.3.tar.gz 62072 BLAKE2B 3d84e2d1eb77a706eee2da0e02bfab5e075faec9a0279070e2e43bd9dbfb973c6e343c5c2e3826fd64b55987603f7b1b27762d598bd1b5689f2013e3f5d06e90 SHA512 48b9441962d9d00010cee9b482f141259ff4944f737626630ef5051cac82578c9a37f62eea238c6e9df1b90dae739db335195a9eff4f50d0120721763791dad1
diff --git a/dev-python/python-lsp-server/python-lsp-server-1.2.3.ebuild b/dev-python/python-lsp-server/python-lsp-server-1.2.3.ebuild
new file mode 100644
index 000000000000..be8da4f5ff42
--- /dev/null
+++ b/dev-python/python-lsp-server/python-lsp-server-1.2.3.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Python Language Server for the Language Server Protocol"
+HOMEPAGE="https://github.com/python-lsp/python-lsp-server"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+IUSE="all-plugins"
+
+BDEPEND="
+	test? (
+		dev-python/autopep8[${PYTHON_USEDEP}]
+		dev-python/flaky[${PYTHON_USEDEP}]
+		>=dev-python/flake8-3.8.0[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		>=dev-python/mccabe-0.6.0[${PYTHON_USEDEP}]
+		<dev-python/mccabe-0.7.0[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pandas[${PYTHON_USEDEP}]
+		>=dev-python/pycodestyle-2.7.0[${PYTHON_USEDEP}]
+		>=dev-python/pydocstyle-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/pyflakes-2.3.0[${PYTHON_USEDEP}]
+		<dev-python/pyflakes-2.4.0[${PYTHON_USEDEP}]
+		>=dev-python/pylint-2.5.0[${PYTHON_USEDEP}]
+		<dev-python/pylint-2.10.0[${PYTHON_USEDEP}]
+		dev-python/QtPy[gui,testlib,${PYTHON_USEDEP}]
+		>=dev-python/rope-0.10.5[${PYTHON_USEDEP}]
+		dev-python/yapf[${PYTHON_USEDEP}]
+	)"
+
+RDEPEND="
+	>=dev-python/jedi-0.17.2[${PYTHON_USEDEP}]
+	<dev-python/jedi-0.19.0[${PYTHON_USEDEP}]
+	>=dev-python/python-lsp-jsonrpc-1.0.0[${PYTHON_USEDEP}]
+	dev-python/pluggy[${PYTHON_USEDEP}]
+	all-plugins? (
+		dev-python/autopep8[${PYTHON_USEDEP}]
+		>=dev-python/flake8-3.8.0[${PYTHON_USEDEP}]
+		>=dev-python/mccabe-0.6.0[${PYTHON_USEDEP}]
+		<dev-python/mccabe-0.7.0[${PYTHON_USEDEP}]
+		>=dev-python/pycodestyle-2.7.0[${PYTHON_USEDEP}]
+		>=dev-python/pydocstyle-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/pyflakes-2.3.0[${PYTHON_USEDEP}]
+		<dev-python/pyflakes-2.4.0[${PYTHON_USEDEP}]
+		>=dev-python/pylint-2.5.0[${PYTHON_USEDEP}]
+		<dev-python/pylint-2.10.0[${PYTHON_USEDEP}]
+		>=dev-python/rope-0.10.5[${PYTHON_USEDEP}]
+		dev-python/yapf[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# remove pytest-cov dep
+	sed -i -e '0,/addopts/I!d' setup.cfg || die
+
+	# This test is continuously breaking
+	sed -i -e 's/test_folding/_&/' test/plugins/test_folding.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+pkg_postinst() {
+	optfeature "Automatically formats Python code to conform to the PEP 8 style guide" dev-python/autopep8
+	optfeature "A wrapper around PyFlakes, pep8 & mccabe" dev-python/flake8
+	optfeature "flake8 plugin: McCabe complexity checker" dev-python/mccabe
+	optfeature "Python style guide checker (fka pep8)" dev-python/pycodestyle
+	optfeature "Python docstring style checker" dev-python/pydocstyle
+	optfeature "Passive checker for Python programs" dev-python/pyflakes
+	optfeature "Python code static checker" dev-python/pylint
+	optfeature "Python refactoring library" dev-python/rope
+	optfeature "A formatter for Python files" dev-python/yapf
+}
diff --git a/dev-python/python-neutronclient/python-neutronclient-7.6.0.ebuild b/dev-python/python-neutronclient/python-neutronclient-7.6.0.ebuild
index 61c2b95cc11c..6735c90e9e98 100644
--- a/dev-python/python-neutronclient/python-neutronclient-7.6.0.ebuild
+++ b/dev-python/python-neutronclient/python-neutronclient-7.6.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 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 
 RDEPEND="
 	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/python-novaclient/python-novaclient-17.6.0.ebuild b/dev-python/python-novaclient/python-novaclient-17.6.0.ebuild
index 8ffb8bb1d27f..40b2c7a4200e 100644
--- a/dev-python/python-novaclient/python-novaclient-17.6.0.ebuild
+++ b/dev-python/python-novaclient/python-novaclient-17.6.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 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 
 RDEPEND="
 	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/python-openstackclient/python-openstackclient-5.6.0.ebuild b/dev-python/python-openstackclient/python-openstackclient-5.6.0.ebuild
index bff914ec3902..2c48ef04ff14 100644
--- a/dev-python/python-openstackclient/python-openstackclient-5.6.0.ebuild
+++ b/dev-python/python-openstackclient/python-openstackclient-5.6.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 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 
 RDEPEND="
 	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/python-utils/metadata.xml b/dev-python/python-utils/metadata.xml
index 32cfd7406c03..151532537ed7 100644
--- a/dev-python/python-utils/metadata.xml
+++ b/dev-python/python-utils/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
- <maintainer type="person">
-  <email>chainsaw@gentoo.org</email>
-  <name>Tony Vroon</name>
- </maintainer>
  <maintainer type="project">
   <email>python@gentoo.org</email>
   <name>Python</name>
diff --git a/dev-python/rdflib/rdflib-6.0.1.ebuild b/dev-python/rdflib/rdflib-6.0.1.ebuild
index 43bc0b24a99f..fe019c079bcd 100644
--- a/dev-python/rdflib/rdflib-6.0.1.ebuild
+++ b/dev-python/rdflib/rdflib-6.0.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~riscv ~x86"
 IUSE="examples sqlite"
 
 RDEPEND="
diff --git a/dev-python/regex/regex-2021.8.28.ebuild b/dev-python/regex/regex-2021.8.28.ebuild
index ffbdf66c5c2f..98d870fbc8fb 100644
--- a/dev-python/regex/regex-2021.8.28.ebuild
+++ b/dev-python/regex/regex-2021.8.28.ebuild
@@ -12,7 +12,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-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 IUSE="doc"
 
 PATCHES=(
diff --git a/dev-python/rencode/metadata.xml b/dev-python/rencode/metadata.xml
index 33ba42750b2a..ee0ec636e14c 100644
--- a/dev-python/rencode/metadata.xml
+++ b/dev-python/rencode/metadata.xml
@@ -10,6 +10,7 @@ pure Python module written by Petru Paler, Connelly Barnes et al.
 </longdescription>
  <upstream>
   <remote-id type="pypi">rencode</remote-id>
+  <remote-id type="cpe">cpe:/a:rencode_project:rencode</remote-id>
  </upstream>
  <origin>gentoo-staging</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/requests-credssp/metadata.xml b/dev-python/requests-credssp/metadata.xml
index cb614311fc2e..235c216d3316 100644
--- a/dev-python/requests-credssp/metadata.xml
+++ b/dev-python/requests-credssp/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
- <maintainer type="person">
-  <email>chainsaw@gentoo.org</email>
-  <name>Tony Vroon</name>
- </maintainer>
  <upstream>
   <remote-id type="pypi">requests-credssp</remote-id>
  </upstream>
diff --git a/dev-python/rich/metadata.xml b/dev-python/rich/metadata.xml
index ab29ff2dd106..9db6ab5d961b 100644
--- a/dev-python/rich/metadata.xml
+++ b/dev-python/rich/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
- <maintainer type="person">
-  <email>chainsaw@gentoo.org</email>
-  <name>Tony Vroon</name>
- </maintainer>
  <maintainer type="project">
   <email>python@gentoo.org</email>
   <name>Python</name>
diff --git a/dev-python/spyder-kernels/Manifest b/dev-python/spyder-kernels/Manifest
index 715dc3be2119..2a6b5ea2c491 100644
--- a/dev-python/spyder-kernels/Manifest
+++ b/dev-python/spyder-kernels/Manifest
@@ -1,3 +1,3 @@
 DIST spyder-kernels-1.10.2-gh.tar.gz 78924 BLAKE2B 47f0ec284f54590ee9c5a43caeeea61b644fccc6d6222dfbf85187beb9cc141504082dbf50d1d85f5315c8e8e46b9f810253d904b594bb4c52677271b0f7f12d SHA512 4bcbc2646493f384a3f5fad1cc2a42bbe1d06c5225362beb995a73e3c1abe482f3855d844c449b07631b4ffda99492ccbd3cbe69c515ed38d6a98913bea90e2d
 DIST spyder-kernels-2.0.5-gh.tar.gz 81123 BLAKE2B 390c3c5d8ceee787f6699dd41ecc9e015050db86d0e416e32be28ebe0a62b09c611707ac6427e8cc809303f41a77b7d9289f15d71d0b2a8ce17ff87af79ea5ad SHA512 b44702a0964bde69a9035839e3ca052a4ccc60340de83ccb9f1b0e6b93b73da5554e10b5eb61b8965416130d8f658f1a18fb1164c59cd27134298c16d3442dbe
-DIST spyder-kernels-2.1.1.tar.gz 82493 BLAKE2B 23c59b6709ba6b1f21a1cc48d20115fba593c44b8b99d8c6f5bd83adcfcc9faae9fb1fe0f86df59f52c922da3c5951308e1c151c53487d33e39b0ddda065f95b SHA512 d1c7f47b02f18095d8584e6f6b3605419af1e016105c4f20bd70cce5d917651e387779d5f36c3ec72bdedd3febd8f7d56739c0cfd48081d448728acf7e3e3114
+DIST spyder-kernels-2.1.3.tar.gz 82801 BLAKE2B fc5217621f5d46194c222b53455fd716d25e74c67f0dd1fbe0ec870ab2daaa5d8c31df6b17f86cac1e7553355c1aa1ca22fd2d42103a3868aa14051b2077b334 SHA512 1a3d432425e8fdb8f66bf7177c4e207ea5a12d774e0d29fa008910f0c945cb892500d578ba2ea48d7a24977db0007cf137bc02777282b4bc8969e0708a3f6b2a
diff --git a/dev-python/spyder-kernels/spyder-kernels-2.1.1.ebuild b/dev-python/spyder-kernels/spyder-kernels-2.1.3.ebuild
index 033adae2b1c3..e331f3aaaf1e 100644
--- a/dev-python/spyder-kernels/spyder-kernels-2.1.1.ebuild
+++ b/dev-python/spyder-kernels/spyder-kernels-2.1.3.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=( python3_{6,7,8,9,10} )
 
diff --git a/dev-python/sqlparse/metadata.xml b/dev-python/sqlparse/metadata.xml
index 77b59dab1f6d..3ebd55e66ad7 100644
--- a/dev-python/sqlparse/metadata.xml
+++ b/dev-python/sqlparse/metadata.xml
@@ -7,6 +7,7 @@
  </maintainer>
  <upstream>
   <remote-id type="pypi">sqlparse</remote-id>
+  <remote-id type="cpe">cpe:/a:sqlparse_project:sqlparse</remote-id>
  </upstream>
  <origin>gentoo-staging</origin>
  <stabilize-allarches/>
diff --git a/dev-python/tempest/tempest-29.0.0-r1.ebuild b/dev-python/tempest/tempest-29.0.0-r1.ebuild
index ba29f9e60d1d..3b9422c97c9f 100644
--- a/dev-python/tempest/tempest-29.0.0-r1.ebuild
+++ b/dev-python/tempest/tempest-29.0.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 
 RDEPEND="
 	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/uritemplate/uritemplate-3.0.1-r1.ebuild b/dev-python/uritemplate/uritemplate-3.0.1-r1.ebuild
index ae35ba7f74a8..fe69cbd2ea77 100644
--- a/dev-python/uritemplate/uritemplate-3.0.1-r1.ebuild
+++ b/dev-python/uritemplate/uritemplate-3.0.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="Apache-2.0"
-KEYWORDS="amd64 arm ~arm64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~arm64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"