Adding metadata

35 files changed, 339 insertions, 153 deletions

diff --git a/dev-python/blockdiag/blockdiag-2.0.1.ebuild b/dev-python/blockdiag/blockdiag-2.0.1.ebuild
index bab78a751dd3..dbb4c6cd3c0b 100644
--- a/dev-python/blockdiag/blockdiag-2.0.1.ebuild
+++ b/dev-python/blockdiag/blockdiag-2.0.1.ebuild
@@ -51,8 +51,7 @@ python_prepare_all() {
 
 pkg_postinst() {
 	# TODO: Better descriptions!
-	einfo "For additional functionality, install the following optional packages:"
-	optfeature "for PDF format" dev-python/reportlab
+	optfeature "PDF format" dev-python/reportlab
 	optfeature "misc extra support" media-gfx/imagemagick
 	optfeature "Ctypes-based simple MagickWand API binding for Python" dev-python/wand
 }
diff --git a/dev-python/construct/Manifest b/dev-python/construct/Manifest
index 6402ea0661b3..0cb6e342af26 100644
--- a/dev-python/construct/Manifest
+++ b/dev-python/construct/Manifest
@@ -1,3 +1,4 @@
 DIST construct-2.10.61.tar.gz 1185872 BLAKE2B 03eb83b707f607f65f13f6430815af3f91f728e133cc1a889f4ff37e34b249cff8f8b13ffb764fbffbba2bec699ce94173e3b80498c42f8fc7628a125b659188 SHA512 dd25f9646d55c4914fbb506b795dced01a5a2d58a9d8378ceaa4d5ba666c9547e96f7a658e8d521ef9a3f53065e89b90e0c8560bc2eb4095b9ff8077b840eec4
 DIST construct-2.10.63.tar.gz 1186101 BLAKE2B c0996f1228f36679d58ca931b27abb0b62da989d1554763295cf56086c9e288b3a02a4de23cca78a726a84c6483581662b01c8eb516d59a165b38eca8cc150f7 SHA512 6d3202f4c98f9c14edaf0c3ea90875eb43c9e3ca454f54a2fe3c6d7810957781a0fe95c60cb6b28445ab80a9ad3ae52c4a397cf9b3531f42d1cb443564427a9c
 DIST construct-2.10.64.tar.gz 1186820 BLAKE2B f3b238060d9db1511effdb4c4374d5e8df0a90d9ea015793766ba29718c0ea2c43a2e8d892076b6b148574bb35e0813299b1c009149f9057d46c0a7f0cef63ec SHA512 00eee1d330457dffe854d5a709c21a8f6e71034695ea9aaffb886c198f2cf56b142f0d5d9edbeee480b77a13f8f8c1faaf6b84eed4161882d77623935502460a
+DIST construct-2.10.66.tar.gz 1189924 BLAKE2B 1c0eb91bd8391a8677a2af7b24ce471d961ba97c0e297969c956a4a6f7e8a35ac539882dfb15da94455e8c9c24e9411d11e981ee180bf54179e11735409718fa SHA512 66e23d1c92dd5472098ca1f971d781a0846a6bcfd797d9d71781f1ff7288f1e7d21b68176e8353409fc355979b1636f4f5a0ef86547d96860636296d19d340c2
diff --git a/dev-python/construct/construct-2.10.66.ebuild b/dev-python/construct/construct-2.10.66.ebuild
new file mode 100644
index 000000000000..51c132a92be2
--- /dev/null
+++ b/dev-python/construct/construct-2.10.66.ebuild
@@ -0,0 +1,37 @@
+# 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="A powerful declarative parser for binary data"
+HOMEPAGE="https://construct.readthedocs.io/en/latest/ https://pypi.org/project/construct/"
+SRC_URI="https://github.com/construct/construct/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	test? (
+		dev-python/arrow[${PYTHON_USEDEP}]
+		dev-python/cloudpickle[${PYTHON_USEDEP}]
+		dev-python/lz4[${PYTHON_USEDEP}]
+		>=dev-python/numpy-1.15.4[${PYTHON_USEDEP}]
+		dev-python/ruamel-yaml[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+python_test() {
+	epytest --ignore tests/test_benchmarks.py
+}
+
+pkg_postinst() {
+	ewarn "Version 2.10.x has significant API and implementation changes from"
+	ewarn "previous 2.9.x releases. Please read the documentation at"
+	ewarn "https://construct.readthedocs.io/en/latest/transition210.html"
+	ewarn "for more info."
+}
diff --git a/dev-python/decorator/Manifest b/dev-python/decorator/Manifest
index 3df5cfecc161..00b7d6bce129 100644
--- a/dev-python/decorator/Manifest
+++ b/dev-python/decorator/Manifest
@@ -1,3 +1,4 @@
 DIST decorator-4.4.2.tar.gz 33629 BLAKE2B 5b2c6a1b6aba293d4b93444d4613e3c9af16bd9d6d80ae9eb21112a4a16397ff67e1f648e8118beeb7d17755a2f1bd37b867f73129c42ef7f8654d1c1f609e5f SHA512 c068efd4e70764ac447b772c9c29625c2180dad256b2b4e46a50a8479fc1d7de09b114c2ba11bb37dd58774ed9460d2e0ea9fa76061833a2d3c2676ac91a0db1
 DIST decorator-5.0.0.tar.gz 33099 BLAKE2B c59a02c2a9c27342dcfdc96ecb89bb9d7f91add52a9e823963976d750b0197255e4c68f72b61f940f36fd09c504f7fa75a10c3cf0e17758fe707a79d332070ba SHA512 010e0ac6b8929b73afdfe57d41915cf56db3edcb2759ba6224bf589e5ff1780021ef9f65a628b530422665d3fc2f9b9b48e21db5e0f21053dbb5d0d20e8da194
 DIST decorator-5.0.3.tar.gz 33035 BLAKE2B 5d9f071422ca7135f6a72f731a56c39e7c790f329d749cb4100c8cfc08d19ae84955e22d0fa335601982fcf896437b107f48831469002f319ecd7f354f49b3a3 SHA512 04272791c7b645341a7bcba7bf63287a9741a9e306e02ef63efea2b6c0535b1b49e5a36ad521872450635d04874bbd180fbc76bf2d6a5fbe894b309fc7bf4376
+DIST decorator-5.0.5.tar.gz 33827 BLAKE2B c6155a2ad6eb1b0f08ea9aa5eaf165682915869a7cd9e465b792e15c8065763993fa0008e467fd3c11526d81f531107271aa795be00f7ae9b57a0a6e9b802fef SHA512 ba5269de8d7821547348902917dc503582ca4576482c149b42a8b3407d901cb14700996992dc9743a990a6bf347c80966bc82b92ffe95b7b0034736c3fbcaf83
diff --git a/dev-python/decorator/decorator-5.0.5.ebuild b/dev-python/decorator/decorator-5.0.5.ebuild
new file mode 100644
index 000000000000..9775a5587507
--- /dev/null
+++ b/dev-python/decorator/decorator-5.0.5.ebuild
@@ -0,0 +1,21 @@
+# 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="Simplifies the usage of decorators for the average programmer"
+HOMEPAGE="https://github.com/micheles/decorator https://pypi.org/project/decorator/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+DOCS=( CHANGES.md )
+
+python_test() {
+	"${EPYTHON}" src/tests/test.py -v || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/django-otp/Manifest b/dev-python/django-otp/Manifest
index b372ead0a013..1f6db995cf48 100644
--- a/dev-python/django-otp/Manifest
+++ b/dev-python/django-otp/Manifest
@@ -1 +1,2 @@
 DIST django-otp-1.0.2.gh.tar.gz 66885 BLAKE2B be98b68f0aa5df25835afa28a23d25e0353dc2d556e62bdf1610a44a409a8e48422e17f274b21eb7cbd421cc4a25a35d01e5d7b3bd99d9caec8c8060da26f57a SHA512 6fe7f79858bdf362dd35e1aeb87c086edd5daf17d4429fc4cb39f3d287ee4c7cf8fb2d6d8f6a7d1b4606104d6732a705b9285f9fec93e4e7c7ca3f3f52541ddd
+DIST django-otp-1.0.3.gh.tar.gz 67007 BLAKE2B 33aed04898afb6ad3940e06436a1d2b4b9349e8fcd55acba0719084939fb9b111e0c266f4964826491f91f832c16f2e4d505486016bfad416706e3e7ef6f3f37 SHA512 7b661228377fa57812a45888e415478cee49d1e343cbc814ba8631f4c354077901ec82f79e69abd00c6bad1dffa026d3e03f4cf0809b074ae1e02ab2cf878137
diff --git a/dev-python/django-otp/django-otp-1.0.3.ebuild b/dev-python/django-otp/django-otp-1.0.3.ebuild
new file mode 100644
index 000000000000..2ae5bc1de9dd
--- /dev/null
+++ b/dev-python/django-otp/django-otp-1.0.3.ebuild
@@ -0,0 +1,36 @@
+# 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="Django framework adding two-factor authentication using one-time passwords"
+HOMEPAGE="https://github.com/django-otp/django-otp/"
+SRC_URI="
+	https://github.com/django-otp/django-otp/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/django-2.2[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		$(python_gen_impl_dep sqlite)
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/qrcode[${PYTHON_USEDEP}]
+		${RDEPEND}
+	)"
+
+python_test() {
+	local -x PYTHONPATH=test:${PYTHONPATH}
+	local -x DJANGO_SETTINGS_MODULE=test_project.settings
+	django-admin test -v 2 django_otp || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/django/django-2.2.19.ebuild b/dev-python/django/django-2.2.19.ebuild
index 1a00b4c00f4d..79e58d63c9bc 100644
--- a/dev-python/django/django-2.2.19.ebuild
+++ b/dev-python/django/django-2.2.19.ebuild
@@ -81,11 +81,10 @@ python_install_all() {
 }
 
 pkg_postinst() {
-	elog "Additional Backend support can be enabled via"
+	optfeature_header "Additional Backend support can be enabled via:"
 	optfeature "MySQL backend support" dev-python/mysqlclient
 	optfeature "PostgreSQL backend support" dev-python/psycopg:2
-	elog
-	elog "Other features can be enhanced by"
+	optfeature_header
 	optfeature "GEO Django" "sci-libs/gdal[geos]"
 	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
 	optfeature "ImageField Support" dev-python/pillow
diff --git a/dev-python/django/django-3.0.13.ebuild b/dev-python/django/django-3.0.13.ebuild
index 2ad9b3f25842..4c0c9943f30e 100644
--- a/dev-python/django/django-3.0.13.ebuild
+++ b/dev-python/django/django-3.0.13.ebuild
@@ -89,11 +89,10 @@ python_install_all() {
 }
 
 pkg_postinst() {
-	elog "Additional Backend support can be enabled via"
+	optfeature_header "Additional Backend support can be enabled via:"
 	optfeature "MySQL backend support" dev-python/mysqlclient
 	optfeature "PostgreSQL backend support" dev-python/psycopg:2
-	elog
-	elog "Other features can be enhanced by"
+	optfeature_header
 	optfeature "GEO Django" "sci-libs/gdal[geos]"
 	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
 	optfeature "ImageField Support" dev-python/pillow
diff --git a/dev-python/django/django-3.1.7.ebuild b/dev-python/django/django-3.1.7.ebuild
index 70d9b1a26ac4..b344d5813a0b 100644
--- a/dev-python/django/django-3.1.7.ebuild
+++ b/dev-python/django/django-3.1.7.ebuild
@@ -82,11 +82,10 @@ python_install_all() {
 }
 
 pkg_postinst() {
-	elog "Additional Backend support can be enabled via"
+	optfeature_header "Additional Backend support can be enabled via:"
 	optfeature "MySQL backend support" dev-python/mysqlclient
 	optfeature "PostgreSQL backend support" dev-python/psycopg:2
-	elog
-	elog "Other features can be enhanced by"
+	optfeature_header
 	optfeature "GEO Django" "sci-libs/gdal[geos]"
 	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
 	optfeature "ImageField Support" dev-python/pillow
diff --git a/dev-python/dkimpy/dkimpy-1.0.5.ebuild b/dev-python/dkimpy/dkimpy-1.0.5.ebuild
index 965eca223e0d..e4e5092a5d30 100644
--- a/dev-python/dkimpy/dkimpy-1.0.5.ebuild
+++ b/dev-python/dkimpy/dkimpy-1.0.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -30,7 +30,6 @@ BDEPEND+="
 "
 
 pkg_postinst() {
-	elog "Optional dependencies:"
 	optfeature "ARC support" dev-python/authres
 	optfeature "ed25519 capability" dev-python/pynacl
 	optfeature "asyncio support" dev-python/aiodns
diff --git a/dev-python/docutils/Manifest b/dev-python/docutils/Manifest
index f9ba4276b0f3..2834bf3be7da 100644
--- a/dev-python/docutils/Manifest
+++ b/dev-python/docutils/Manifest
@@ -1 +1,2 @@
 DIST docutils-0.16.tar.gz 1962041 BLAKE2B 64d045d43433e944686b5d9077de0b544d49d041adf398f9b66612db432860853df4a84f4c4b44461789b3039f83e3847547062b2f5bc5d2bde3a0f1ffc9ffba SHA512 4e0c6662924cac6b8f28bb77a4f50eafd637c1083990a23dbd905d8a05362a18dae96e63408ed43b595b693ca755c7961d1282129d3215ed3774af0dddcc0466
+DIST docutils-0.17.tar.gz 2014148 BLAKE2B 56d03d755651e9c022eb7ff79dd83bab8f8bbb2c8b6528c673b04b69db2c11084599bf7cc294ded3a024c4c1a688f232ff0f3c9f7a1ecafe1f857513d35123fd SHA512 e99886dc6420f6325426ebbe0d1528249592e372fe2a052548c9cd9c2fd87506cc8b74384a3cf4afb97a1d936a906e157e084785639aad59c4abbc672c33b689
diff --git a/dev-python/docutils/docutils-0.17.ebuild b/dev-python/docutils/docutils-0.17.ebuild
new file mode 100644
index 000000000000..7153ad7f8d84
--- /dev/null
+++ b/dev-python/docutils/docutils-0.17.ebuild
@@ -0,0 +1,67 @@
+# 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 Documentation Utilities"
+HOMEPAGE="https://docutils.sourceforge.io/ https://pypi.org/project/docutils/"
+#SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2 GPL-3 public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="dev-python/pygments[${PYTHON_USEDEP}]"
+BDEPEND="${RDEPEND}"
+
+python_compile_all() {
+	# Generate html docs from reStructured text sources.
+
+	# Place html4css1.css in base directory to ensure that the generated reference to it is correct.
+	cp docutils/writers/html4css1/html4css1.css . || die
+
+	cd tools || die
+	"${EPYTHON}" buildhtml.py --input-encoding=utf-8 \
+		--stylesheet-path=../html4css1.css, --traceback ../docs || die
+}
+
+src_test() {
+	cd test || die
+	distutils-r1_src_test
+}
+
+python_test() {
+	"${EPYTHON}" alltests.py -v || die "Testing failed with ${EPYTHON}"
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	# Install tools.
+	python_doscript tools/{buildhtml,quicktest}.py
+}
+
+install_txt_doc() {
+	local doc="${1}"
+	local dir="txt/$(dirname ${doc})"
+	docinto "${dir}"
+	dodoc "${doc}"
+}
+
+python_install_all() {
+	local DOCS=( *.txt )
+	local HTML_DOCS=( docs tools docutils/writers/html4css1/html4css1.css )
+
+	distutils-r1_python_install_all
+
+	local doc
+	while IFS= read -r -d '' doc; do
+		install_txt_doc "${doc}"
+	done < <(find docs tools -name '*.txt' -print0)
+}
diff --git a/dev-python/libvirt-python/Manifest b/dev-python/libvirt-python/Manifest
index fd606c9761cd..874e2c699c10 100644
--- a/dev-python/libvirt-python/Manifest
+++ b/dev-python/libvirt-python/Manifest
@@ -1,3 +1,6 @@
-DIST libvirt-python-6.8.0.tar.gz 210034 BLAKE2B 667c2713bf9c0936f444c5b621f5af4e5273deda31496bc01c8834286a0ec0eb1c056006549cc5d129ef597264f8582acee62db3a2fd375daa4ebbceacb8fcc1 SHA512 6d2f82fafd414047cff16f0ad655fefd69c8c0da04be07d27da44e3ab17dd03e4e4ff102be1c30948c361268f57ea312978f9198fd128bfb54a3c1a07150e6af
 DIST libvirt-python-7.0.0.tar.gz 214945 BLAKE2B 9ab616fa6336a284dbb1dcebf0be6a06d9ca0c41e83ca403cb335c61ff217e1e9f0343fc915e20e16f3e59adc5c7b1c51e493143c45cd50f48f627ebe2e9c211 SHA512 c56bc53da06a81d330389f684df204d0ae8edb28127eccd81ac551342a0965341d20832f6e2b044e02e9217320349f6f5cb36098c5cc46508a4026fb1e59c4ac
+DIST libvirt-python-7.0.0.tar.gz.asc 833 BLAKE2B 54102c29a46900dc5439ca5b96d17d0f3923fb1cb5fa74ef7671a49645c5e5d7f43b608099f542410ca38d675a384e2ad3fdfd7494bda6e66b889ec3d9f04e9e SHA512 4ca5cf4e3687e3cbdb3bf9991076ef4d0427db4b7eb27738d4463c5645d684581dd20377339e6bdac66e790f10709df9f483dd9f360a1b978776fe5d3e2dcc64
 DIST libvirt-python-7.1.0.tar.gz 215468 BLAKE2B 5734f686760d118bc326c68d93714db31b65d0d2f8495c8fb7788aa59658680cc07b8c522e5854bafc6a75989cee4b7c817ec0f54ae5ebcb76ed74418fa1c0f0 SHA512 9c4adf0107b2b6d8ac3f84f4a201733b851b5c518e498b4bb8fe3531ec8923b2a96e5593ee0fe309b9501884a83e77a6a0347a6714293febf907c9a4dc742cd4
+DIST libvirt-python-7.1.0.tar.gz.asc 833 BLAKE2B be4101dcff4f95e36929dc70657a527e7b0b30fe9556c8d42f240459f86f7ba71980cf483f4d828d63cf94ce3c4521e7303d72f6df5e6c4c2a6de1b160970073 SHA512 db0213bb95d77c690ef8726ae559cae7970d31e633104993e715dd4e34e2f3c52bdcf7303e90419055d571d21417ac6375d78463143e20e94bf4aaf666684174
+DIST libvirt-python-7.2.0.tar.gz 215380 BLAKE2B e9c55a193c571b8fdf3f7f2545ae82470ff74e74e4f2fb58dda6278bc484eb26ae84f2991bc34adc6030973e7d53d364576247e1f8ab836edea06a5da0f8575e SHA512 6df5be4d98884751e4a098b54ec1d8827268993b6df5769c1a687420dd5889c629ca0bd286f5a0c22a9c81974fa02565b36628f8026c697ae414137f0c1d8441
+DIST libvirt-python-7.2.0.tar.gz.asc 833 BLAKE2B 3f93f4841da3d86c6a0ba073b70c44e3732eb0ca91fd80a7089c1731851173d163101428d07f82f688478a7967e71bd66b49cd70673157428d2c4802a5df3bae SHA512 fe4f7bf6a9ea6e008ed73fac588785281582dd5eaa738e5ca05b88534659096af137408e1222f791d5a13190358fcf5d30eaa8d8a24791e3b5a15622516fe05f
diff --git a/dev-python/libvirt-python/libvirt-python-7.0.0.ebuild b/dev-python/libvirt-python/libvirt-python-7.0.0.ebuild
index 2cfa9094ce71..5da37e585d32 100644
--- a/dev-python/libvirt-python/libvirt-python-7.0.0.ebuild
+++ b/dev-python/libvirt-python/libvirt-python-7.0.0.ebuild
@@ -9,14 +9,15 @@ DISTUTILS_USE_SETUPTOOLS=no
 
 MY_P="${P/_rc/-rc}"
 
-inherit distutils-r1
+inherit distutils-r1 verify-sig
 
 if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://libvirt.org/git/libvirt-python.git"
 	RDEPEND="app-emulation/libvirt:=[-python(-)]"
 else
-	SRC_URI="https://libvirt.org/sources/python/${MY_P}.tar.gz"
+	SRC_URI="https://libvirt.org/sources/python/${MY_P}.tar.gz
+		verify-sig? ( https://libvirt.org/sources/python/${MY_P}.tar.gz.asc )"
 	KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 	RDEPEND="app-emulation/libvirt:0/${PV}"
 fi
@@ -26,6 +27,7 @@ DESCRIPTION="libvirt Python bindings"
 HOMEPAGE="https://www.libvirt.org"
 LICENSE="LGPL-2"
 SLOT="0"
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/libvirt.org.asc
 IUSE="examples test"
 RESTRICT="!test? ( test )"
 
@@ -35,6 +37,7 @@ BDEPEND="
 		dev-python/lxml[${PYTHON_USEDEP}]
 		dev-python/nose[${PYTHON_USEDEP}]
 	)
+	verify-sig? ( app-crypt/openpgp-keys-libvirt )
 "
 
 distutils_enable_tests setup.py
diff --git a/dev-python/libvirt-python/libvirt-python-7.1.0.ebuild b/dev-python/libvirt-python/libvirt-python-7.1.0.ebuild
index 36d79238425a..5caf8eb7b163 100644
--- a/dev-python/libvirt-python/libvirt-python-7.1.0.ebuild
+++ b/dev-python/libvirt-python/libvirt-python-7.1.0.ebuild
@@ -9,14 +9,15 @@ DISTUTILS_USE_SETUPTOOLS=no
 
 MY_P="${P/_rc/-rc}"
 
-inherit distutils-r1
+inherit distutils-r1 verify-sig
 
 if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://libvirt.org/git/libvirt-python.git"
 	RDEPEND="app-emulation/libvirt:=[-python(-)]"
 else
-	SRC_URI="https://libvirt.org/sources/python/${MY_P}.tar.gz"
+	SRC_URI="https://libvirt.org/sources/python/${MY_P}.tar.gz
+		verify-sig? ( https://libvirt.org/sources/python/${MY_P}.tar.gz.asc )"
 	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 	RDEPEND="app-emulation/libvirt:0/${PV}"
 fi
@@ -26,6 +27,7 @@ DESCRIPTION="libvirt Python bindings"
 HOMEPAGE="https://www.libvirt.org"
 LICENSE="LGPL-2"
 SLOT="0"
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/libvirt.org.asc
 IUSE="examples test"
 RESTRICT="!test? ( test )"
 
@@ -35,6 +37,7 @@ BDEPEND="
 		dev-python/lxml[${PYTHON_USEDEP}]
 		dev-python/nose[${PYTHON_USEDEP}]
 	)
+	verify-sig? ( app-crypt/openpgp-keys-libvirt )
 "
 
 distutils_enable_tests setup.py
diff --git a/dev-python/libvirt-python/libvirt-python-6.8.0.ebuild b/dev-python/libvirt-python/libvirt-python-7.2.0.ebuild
index 76c134284dd0..5caf8eb7b163 100644
--- a/dev-python/libvirt-python/libvirt-python-6.8.0.ebuild
+++ b/dev-python/libvirt-python/libvirt-python-7.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,15 +9,16 @@ DISTUTILS_USE_SETUPTOOLS=no
 
 MY_P="${P/_rc/-rc}"
 
-inherit distutils-r1
+inherit distutils-r1 verify-sig
 
 if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://libvirt.org/git/libvirt-python.git"
 	RDEPEND="app-emulation/libvirt:=[-python(-)]"
 else
-	SRC_URI="https://libvirt.org/sources/python/${MY_P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 ~ppc64 x86"
+	SRC_URI="https://libvirt.org/sources/python/${MY_P}.tar.gz
+		verify-sig? ( https://libvirt.org/sources/python/${MY_P}.tar.gz.asc )"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 	RDEPEND="app-emulation/libvirt:0/${PV}"
 fi
 S="${WORKDIR}/${P%_rc*}"
@@ -26,14 +27,18 @@ DESCRIPTION="libvirt Python bindings"
 HOMEPAGE="https://www.libvirt.org"
 LICENSE="LGPL-2"
 SLOT="0"
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/libvirt.org.asc
 IUSE="examples test"
 RESTRICT="!test? ( test )"
 
-DEPEND="virtual/pkgconfig"
-BDEPEND="test? (
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/nose[${PYTHON_USEDEP}]
-)"
+BDEPEND="
+	virtual/pkgconfig
+	test? (
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+	)
+	verify-sig? ( app-crypt/openpgp-keys-libvirt )
+"
 
 distutils_enable_tests setup.py
 
diff --git a/dev-python/mako/mako-1.1.4.ebuild b/dev-python/mako/mako-1.1.4.ebuild
index fbcc35955767..37a6662eefdf 100644
--- a/dev-python/mako/mako-1.1.4.ebuild
+++ b/dev-python/mako/mako-1.1.4.ebuild
@@ -35,6 +35,5 @@ python_install_all() {
 }
 
 pkg_postinst() {
-	elog "Optional dependencies:"
 	optfeature "caching support" dev-python/beaker
 }
diff --git a/dev-python/pillow/pillow-8.2.0.ebuild b/dev-python/pillow/pillow-8.2.0.ebuild
index 3ab4293b70ed..07703519657e 100644
--- a/dev-python/pillow/pillow-8.2.0.ebuild
+++ b/dev-python/pillow/pillow-8.2.0.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="examples imagequant jpeg jpeg2k lcms test tiff tk truetype webp xcb zlib"
 REQUIRED_USE="test? ( jpeg jpeg2k tiff )"
 RESTRICT="!test? ( test )"
@@ -39,7 +39,10 @@ BDEPEND="
 	test? (
 		${RDEPEND}
 		dev-python/pytest[${PYTHON_USEDEP}]
-		media-gfx/imagemagick[png]
+		|| (
+			media-gfx/imagemagick[png]
+			media-gfx/graphicsmagick[png]
+		)
 	)
 "
 
@@ -73,14 +76,10 @@ python_configure_all() {
 	tc-export PKG_CONFIG
 }
 
-src_test() {
-	virtx distutils-r1_src_test
-}
-
 python_test() {
 	"${EPYTHON}" selftest.py --installed || die "selftest failed with ${EPYTHON}"
 	# no:relaxed: pytest-relaxed plugin make our tests fail. deactivate if installed
-	pytest -vv -p no:relaxed || die "Tests fail with ${EPYTHON}"
+	virtx epytest -p no:relaxed
 }
 
 python_install() {
diff --git a/dev-python/plumbum/plumbum-1.7.0-r1.ebuild b/dev-python/plumbum/plumbum-1.7.0-r1.ebuild
index 8a2d6fdb2a0e..e2b4ce76f9b8 100644
--- a/dev-python/plumbum/plumbum-1.7.0-r1.ebuild
+++ b/dev-python/plumbum/plumbum-1.7.0-r1.ebuild
@@ -32,10 +32,8 @@ src_prepare() {
 }
 
 pkg_postinst() {
-	elog "To get additional features, optional runtime dependencies may be installed:"
-		optfeature "Remote commands via ssh" dev-python/paramiko
-		optfeature "Progress bars in jupyter" dev-python/ipywidgets
-		optfeature "Colored output in jupyter" dev-python/ipython
-		optfeature "Images on the command line" dev-python/pillow
-	elog ""
+	optfeature "remote commands via ssh" dev-python/paramiko
+	optfeature "progress bars in jupyter" dev-python/ipywidgets
+	optfeature "colored output in jupyter" dev-python/ipython
+	optfeature "images on the command line" dev-python/pillow
 }
diff --git a/dev-python/pyjwt/pyjwt-1.7.1-r1.ebuild b/dev-python/pyjwt/pyjwt-1.7.1-r1.ebuild
index 02b1d84e4241..4b4a82b0e3ce 100644
--- a/dev-python/pyjwt/pyjwt-1.7.1-r1.ebuild
+++ b/dev-python/pyjwt/pyjwt-1.7.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -48,7 +48,6 @@ python_test() {
 }
 
 pkg_postinst() {
-	elog "Available optional features:"
 	optfeature "cryptography" dev-python/cryptography
 	optfeature "flake8" dev-python/flake8{,-import-order}
 
diff --git a/dev-python/pyjwt/pyjwt-2.0.1.ebuild b/dev-python/pyjwt/pyjwt-2.0.1.ebuild
index fdbd7c172d8c..65576da52a6b 100644
--- a/dev-python/pyjwt/pyjwt-2.0.1.ebuild
+++ b/dev-python/pyjwt/pyjwt-2.0.1.ebuild
@@ -26,6 +26,5 @@ DEPEND="
 distutils_enable_tests pytest
 
 pkg_postinst() {
-	elog "Available optional features:"
 	optfeature "cryptography" dev-python/cryptography
 }
diff --git a/dev-python/pylatex/pylatex-1.4.1.ebuild b/dev-python/pylatex/pylatex-1.4.1.ebuild
index eb62d2298bbe..53b7aa5d7b4e 100644
--- a/dev-python/pylatex/pylatex-1.4.1.ebuild
+++ b/dev-python/pylatex/pylatex-1.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -45,7 +45,6 @@ python_install_all() {
 }
 
 pkg_postinst() {
-	elog "Optional dependencies:"
 	optfeature "compiling generated files" "app-text/texlive dev-texlive/texlive-latexextra dev-texlive/texlive-mathscience"
 	optfeature "matplotlib support" dev-python/matplotlib
 	optfeature "numpy support" dev-python/numpy
diff --git a/dev-python/python-language-server/python-language-server-0.36.2.ebuild b/dev-python/python-language-server/python-language-server-0.36.2.ebuild
index ecaa0b5d9749..bd2872610bd5 100644
--- a/dev-python/python-language-server/python-language-server-0.36.2.ebuild
+++ b/dev-python/python-language-server/python-language-server-0.36.2.ebuild
@@ -56,7 +56,6 @@ python_prepare_all() {
 }
 
 pkg_postinst() {
-	elog "To get additional features, optional runtime dependencies may be installed:"
 	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
diff --git a/dev-python/rich/Manifest b/dev-python/rich/Manifest
index 6a5eeff9168c..0a186f23c9d1 100644
--- a/dev-python/rich/Manifest
+++ b/dev-python/rich/Manifest
@@ -1,5 +1,6 @@
 DIST rich-10.0.0.tar.gz 16217911 BLAKE2B 2604bf6a3bd57a9465fc2a001b497ff7f0afe83953d42fa8e5d9c0edfeadb0992503e2cf91cea30f177a641ebb3bb94d669945b601c88e5e796a107a08792e2f SHA512 5641df7d9ef1c1336077e357fb35c158b643afecfc3f2eb5023aa47042714d7c9fbbce7e52d0bce7c3b2c04b19e11985ca95807458dcf381fb2053becaf6ba1d
 DIST rich-10.0.1.tar.gz 16218107 BLAKE2B 3992282b72ea97a364df3ca67e10a90baadb36ff207f64edee7e11df957b078d4b2c67bf3485efb7dddd0b3e8c2d3ae87e1d9b4d063db91f30c1a9510f7da976 SHA512 14689486b8a647c17fe6cad0902f4ecbf2c09e95ad0d4ea33b88bd9f8a17164f9efed4baa09a4ad6e6a85a9ec9fdeeccacd58eaa628efccb48fef6112487926c
+DIST rich-10.1.0.tar.gz 16218332 BLAKE2B 880fe5354b41a8a2accf7dc0d2f80163b850a28d3f4bd10b9f06008f3059c6a46681b3a344289c031589eeaa6120c5cad4a03d2c25f7a440829ff21e3fe20d63 SHA512 53cf49df20887b1788edc32bb98706c9bb5facee29aac4cbde9180aba4d97433eab49a144ba9b83393e36072b5e010630b3c7d67f80e280e380559698f6254d4
 DIST rich-9.11.1.tar.gz 14050070 BLAKE2B 7dcae32743bfcbbab0af6896f72e865d2a72ab66545168544d065145cf10a2aab4785454e547f011219a85a8aa762f1ed5ebef2b9fb7f44225a2f776835b643d SHA512 2139cb6602d930e9bf1479456a8e6cee812237fb64073db3f23fd8eab64c1c2b3a83c6292f1f90652791100a93961d8ec8036e5d819f1e23159b6b9a75cd1f6c
 DIST rich-9.12.4.tar.gz 16204429 BLAKE2B b57d7dc7ad4463c85cbc43e0fd8afd9f0c5329cbe81eaac168895af3701091669e4b0b6fd0d2de2f5876405c5aae00ed77e77d1b317dbd20c7dd3e53deddf2ca SHA512 92feb4ceab4e10f33c0f4abec19a4ee5bdcf27139591b603aba98239483874089fbd33998a2f05f2b609799afa59cddbe1ee245a87c391d15f58887b21a138df
 DIST rich-9.13.0.tar.gz 16206916 BLAKE2B 27a058821f5bcdeaadf4ec9beadd0f2bb5357993a1c15cd72c6cac4def9c7c9d9d7705064853931bb868b7bf873a85469feb8a9c67daf88cdab8169f0d342b0c SHA512 bb93339f985c88b86897a9b21769877cb68f4a6f61a74b9e4a2a96aad0556502e6c848c4f769ee53c57bf03f0cfdfab97e004aa9d6572158a37037afee61f0ad
diff --git a/dev-python/rich/rich-10.1.0.ebuild b/dev-python/rich/rich-10.1.0.ebuild
new file mode 100644
index 000000000000..b6affb7238ee
--- /dev/null
+++ b/dev-python/rich/rich-10.1.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Python library for renrering rich text, tables, etc. to the terminal"
+HOMEPAGE="https://github.com/willmcgugan/rich"
+SRC_URI="https://github.com/willmcgugan/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/commonmark[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/typing-extensions[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+pkg_postinst() {
+	optfeature "integration with HTML widgets for Jupyter" dev-python/ipywidgets
+}
diff --git a/dev-python/spyder/spyder-4.2.0.ebuild b/dev-python/spyder/spyder-4.2.0.ebuild
index 185e46c750a5..8d38026256d8 100644
--- a/dev-python/spyder/spyder-4.2.0.ebuild
+++ b/dev-python/spyder/spyder-4.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -197,23 +197,22 @@ python_test() {
 pkg_postinst() {
 	xdg_pkg_postinst
 
-	elog "To get additional features, optional runtime dependencies may be installed:"
-		optfeature "2D/3D plotting in the Python and IPython consoles" dev-python/matplotlib
-		optfeature "View and edit DataFrames and Series in the Variable Explorer" dev-python/pandas
-		optfeature "View and edit two or three dimensional arrays in the Variable Explorer" dev-python/numpy
-		optfeature "Symbolic mathematics in the IPython console" dev-python/sympy
-		optfeature "Import Matlab workspace files in the Variable Explorer" dev-python/scipy
-		optfeature "Run Cython files in the IPython console" dev-python/cython
-		optfeature "The hdf5/h5py plugin" dev-python/h5py
-		optfeature "The line profiler plugin" dev-python/spyder-line-profiler
-		optfeature "The memory profiler plugin" dev-python/spyder-memory-profiler
-		# spyder-autopep8 does not have a release (yet)
-		# and are not compatible with >=spyder-4.0.0 at the moment
-		# optfeature "The autopep8 plugin" dev-python/spyder-autopep8
-		optfeature "Vim key bindings" dev-python/spyder-vim
-		optfeature "Unittest support" dev-python/spyder-unittest
-		optfeature "Jupyter notebook support" dev-python/spyder-notebook
-		optfeature "System terminal inside spyder" dev-python/spyder-terminal
-		# spyder-reports not yet updated to >=spyder-4.0.0
-		# optfeature "Markdown reports using Pweave" dev-python/spyder-reports
+	optfeature "2D/3D plotting in the Python and IPython consoles" dev-python/matplotlib
+	optfeature "View and edit DataFrames and Series in the Variable Explorer" dev-python/pandas
+	optfeature "View and edit two or three dimensional arrays in the Variable Explorer" dev-python/numpy
+	optfeature "Symbolic mathematics in the IPython console" dev-python/sympy
+	optfeature "Import Matlab workspace files in the Variable Explorer" dev-python/scipy
+	optfeature "Run Cython files in the IPython console" dev-python/cython
+	optfeature "The hdf5/h5py plugin" dev-python/h5py
+	optfeature "The line profiler plugin" dev-python/spyder-line-profiler
+	optfeature "The memory profiler plugin" dev-python/spyder-memory-profiler
+	# spyder-autopep8 does not have a release (yet)
+	# and are not compatible with >=spyder-4.0.0 at the moment
+	# optfeature "The autopep8 plugin" dev-python/spyder-autopep8
+	optfeature "Vim key bindings" dev-python/spyder-vim
+	optfeature "Unittest support" dev-python/spyder-unittest
+	optfeature "Jupyter notebook support" dev-python/spyder-notebook
+	optfeature "System terminal inside spyder" dev-python/spyder-terminal
+	# spyder-reports not yet updated to >=spyder-4.0.0
+	# optfeature "Markdown reports using Pweave" dev-python/spyder-reports
 }
diff --git a/dev-python/spyder/spyder-4.2.3.ebuild b/dev-python/spyder/spyder-4.2.3.ebuild
index f05b07a3be18..127298a02a68 100644
--- a/dev-python/spyder/spyder-4.2.3.ebuild
+++ b/dev-python/spyder/spyder-4.2.3.ebuild
@@ -225,28 +225,25 @@ python_test() {
 pkg_postinst() {
 	xdg_pkg_postinst
 
-	elog "To get additional features, optional runtime dependencies may be installed:"
-		optfeature "2D/3D plotting in the Python and IPython consoles" dev-python/matplotlib
-		optfeature "View and edit DataFrames and Series in the Variable Explorer" dev-python/pandas
-		optfeature "View and edit two or three dimensional arrays in the Variable Explorer" dev-python/numpy
-		optfeature "Symbolic mathematics in the IPython console" dev-python/sympy
-		optfeature "Import Matlab workspace files in the Variable Explorer" dev-python/scipy
-		optfeature "Run Cython files in the IPython console" dev-python/cython
-		optfeature "The hdf5/h5py plugin" dev-python/h5py
-		optfeature "The line profiler plugin" dev-python/spyder-line-profiler
-		optfeature "The memory profiler plugin" dev-python/spyder-memory-profiler
-		# spyder-autopep8 does not have a release (yet)
-		# and are not compatible with >=spyder-4.0.0 at the moment
-		# optfeature "The autopep8 plugin" dev-python/spyder-autopep8
-		optfeature "Vim key bindings" dev-python/spyder-vim
-		optfeature "Unittest support" dev-python/spyder-unittest
-		optfeature "Jupyter notebook support" dev-python/spyder-notebook
-		optfeature "System terminal inside spyder" dev-python/spyder-terminal
-		# spyder-reports not yet updated to >=spyder-4.0.0
-		# optfeature "Markdown reports using Pweave" dev-python/spyder-reports
-
-	elog ""
+	optfeature "2D/3D plotting in the Python and IPython consoles" dev-python/matplotlib
+	optfeature "View and edit DataFrames and Series in the Variable Explorer" dev-python/pandas
+	optfeature "View and edit two or three dimensional arrays in the Variable Explorer" dev-python/numpy
+	optfeature "Symbolic mathematics in the IPython console" dev-python/sympy
+	optfeature "Import Matlab workspace files in the Variable Explorer" dev-python/scipy
+	optfeature "Run Cython files in the IPython console" dev-python/cython
+	optfeature "The hdf5/h5py plugin" dev-python/h5py
+	optfeature "The line profiler plugin" dev-python/spyder-line-profiler
+	optfeature "The memory profiler plugin" dev-python/spyder-memory-profiler
+	# spyder-autopep8 does not have a release (yet)
+	# and are not compatible with >=spyder-4.0.0 at the moment
+	# optfeature "The autopep8 plugin" dev-python/spyder-autopep8
+	optfeature "Vim key bindings" dev-python/spyder-vim
+	optfeature "Unittest support" dev-python/spyder-unittest
+	optfeature "Jupyter notebook support" dev-python/spyder-notebook
+	optfeature "System terminal inside spyder" dev-python/spyder-terminal
+	# spyder-reports not yet updated to >=spyder-4.0.0
+	# optfeature "Markdown reports using Pweave" dev-python/spyder-reports
+	elog
 	elog "Spyder currently only works with PyQt5 as QtPy backend, PySide2 is not supported."
 	elog "Please ensure that 'eselect qtpy' is set to PyQt5."
-	elog ""
 }
diff --git a/dev-python/spyder/spyder-4.2.5.ebuild b/dev-python/spyder/spyder-4.2.5.ebuild
index af3abcf3acb0..f27bc0babdc3 100644
--- a/dev-python/spyder/spyder-4.2.5.ebuild
+++ b/dev-python/spyder/spyder-4.2.5.ebuild
@@ -226,28 +226,25 @@ python_test() {
 pkg_postinst() {
 	xdg_pkg_postinst
 
-	elog "To get additional features, optional runtime dependencies may be installed:"
-		optfeature "2D/3D plotting in the Python and IPython consoles" dev-python/matplotlib
-		optfeature "View and edit DataFrames and Series in the Variable Explorer" dev-python/pandas
-		optfeature "View and edit two or three dimensional arrays in the Variable Explorer" dev-python/numpy
-		optfeature "Symbolic mathematics in the IPython console" dev-python/sympy
-		optfeature "Import Matlab workspace files in the Variable Explorer" dev-python/scipy
-		optfeature "Run Cython files in the IPython console" dev-python/cython
-		optfeature "The hdf5/h5py plugin" dev-python/h5py
-		optfeature "The line profiler plugin" dev-python/spyder-line-profiler
-		optfeature "The memory profiler plugin" dev-python/spyder-memory-profiler
-		# spyder-autopep8 does not have a release (yet)
-		# and are not compatible with >=spyder-4.0.0 at the moment
-		# optfeature "The autopep8 plugin" dev-python/spyder-autopep8
-		optfeature "Vim key bindings" dev-python/spyder-vim
-		optfeature "Unittest support" dev-python/spyder-unittest
-		optfeature "Jupyter notebook support" dev-python/spyder-notebook
-		optfeature "System terminal inside spyder" dev-python/spyder-terminal
-		# spyder-reports not yet updated to >=spyder-4.0.0
-		# optfeature "Markdown reports using Pweave" dev-python/spyder-reports
-
-	elog ""
+	optfeature "2D/3D plotting in the Python and IPython consoles" dev-python/matplotlib
+	optfeature "View and edit DataFrames and Series in the Variable Explorer" dev-python/pandas
+	optfeature "View and edit two or three dimensional arrays in the Variable Explorer" dev-python/numpy
+	optfeature "Symbolic mathematics in the IPython console" dev-python/sympy
+	optfeature "Import Matlab workspace files in the Variable Explorer" dev-python/scipy
+	optfeature "Run Cython files in the IPython console" dev-python/cython
+	optfeature "The hdf5/h5py plugin" dev-python/h5py
+	optfeature "The line profiler plugin" dev-python/spyder-line-profiler
+	optfeature "The memory profiler plugin" dev-python/spyder-memory-profiler
+	# spyder-autopep8 does not have a release (yet)
+	# and are not compatible with >=spyder-4.0.0 at the moment
+	# optfeature "The autopep8 plugin" dev-python/spyder-autopep8
+	optfeature "Vim key bindings" dev-python/spyder-vim
+	optfeature "Unittest support" dev-python/spyder-unittest
+	optfeature "Jupyter notebook support" dev-python/spyder-notebook
+	optfeature "System terminal inside spyder" dev-python/spyder-terminal
+	# spyder-reports not yet updated to >=spyder-4.0.0
+	# optfeature "Markdown reports using Pweave" dev-python/spyder-reports
+	elog
 	elog "Spyder currently only works with PyQt5 as QtPy backend, PySide2 is not supported."
 	elog "Please ensure that 'eselect qtpy' is set to PyQt5."
-	elog ""
 }
diff --git a/dev-python/suds/Manifest b/dev-python/suds/Manifest
index 80f647cba466..5cdab4d0f7f4 100644
--- a/dev-python/suds/Manifest
+++ b/dev-python/suds/Manifest
@@ -1,2 +1 @@
-DIST suds-0.6.tar.bz2 143985 BLAKE2B 3d97d51b4e719102ab40a6a95a35eaaccda15a47e20bedb0297203576949883eea253ac6f382c8849a522e1720393ec517ec1ff3514329b504c83a928a260881 SHA512 ec078b159bd83c5799e293d9607138ee1da90fdc64da203999555a4324ce7be0235156d3c7ad28e46f84180a6e51e2f3f82228e5e77ae41c61ee20f3db2c916b
 DIST suds-community-0.8.4.tar.gz 279775 BLAKE2B 985dbe386219d7a5cf8b9edb5a30eea2bc974fce5158a1f6e9c7ad3b437efdf0e4d8ff2bddeaf5b5ebc7f0a594adaea3b2db3e47b6dab8143f6cefae248dd061 SHA512 316e67fb2b87ac31cb9397a1620b279e608dc0abead61fa548730fce5b5e29fb2da937c6213f3de6bd06f1e97031f27351938da686fa2f9ce9f4399b9944e0d2
diff --git a/dev-python/suds/suds-0.6-r1.ebuild b/dev-python/suds/suds-0.6-r1.ebuild
deleted file mode 100644
index a60e9de932a4..000000000000
--- a/dev-python/suds/suds-0.6-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-DISTUTILS_IN_SOURCE_BUILD=1
-
-inherit distutils-r1
-
-DESCRIPTION="Lightweight SOAP client (Jurko's fork) (py3 support) (active development)"
-HOMEPAGE="https://pypi.org/project/suds-jurko/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}-jurko/${PN}-jurko-${PV}.tar.bz2 -> ${P}.tar.bz2"
-S="${WORKDIR}/${PN}-jurko-${PV}"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-RDEPEND=""
-
-DOCS=( README.rst notes/{argument_parsing.rst,readme.txt,traversing_client_data.rst} )
-
-python_test() {
-	esetup.py test
-}
-
-python_install() {
-	# test folder makes for file collisions by the eclass
-	sed -i -e '/^tests/d' suds_jurko.egg-info/top_level.txt suds_jurko.egg-info/SOURCES.txt || die
-	cp -r suds_jurko.egg-info suds.egg-info || die
-	sed -i -e 's/Name\:\ suds-jurko/Name:\ suds/g' -e '/^Obsoletes/d' suds.egg-info/PKG-INFO || die
-	rm -rf ./{tests,build/lib/tests,lib/tests}/ || die
-	distutils-r1_python_install
-}
diff --git a/dev-python/tempora/Manifest b/dev-python/tempora/Manifest
index b18d5a91b958..5592cbb1c48f 100644
--- a/dev-python/tempora/Manifest
+++ b/dev-python/tempora/Manifest
@@ -1 +1,2 @@
 DIST tempora-4.0.1.tar.gz 20978 BLAKE2B 1216472a3e03fe0856f598478267647a2a9f8f6b6e28a0e48fc9f66877303da053d1a7e793b812fa8b0909b219a669cd8d82759dfd2c0793d43cc2d086993a8c SHA512 1ee954a7053db2dc0a94637453613851806cc4582f04019e303e13566a842c2710f3c364fd54d8832d4ce2a5eaac29121db9c474b407d5b92e4f8b8ff43b03df
+DIST tempora-4.0.2.tar.gz 21837 BLAKE2B 2d3a9e2fb09ce63e37beb8090eef0238a55c0daf8ddeec79da148af5a77ba0afbc1ae5cc9cbffe1fe04adee3fb0928005e30dfe69dd95ec746d5b003670926cb SHA512 6b4b4f78d1bd05518a1ac89900f927bff9164b57f9cf295045babb0a2b23216012226035d9a2e092e987ab9dc55e583975f9d2f8e62e526cd1a88e13858f9588
diff --git a/dev-python/tempora/tempora-4.0.2.ebuild b/dev-python/tempora/tempora-4.0.2.ebuild
new file mode 100644
index 000000000000..8eba49ed59fd
--- /dev/null
+++ b/dev-python/tempora/tempora-4.0.2.ebuild
@@ -0,0 +1,37 @@
+# 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 )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+MY_PN="${PN/-/.}"
+DESCRIPTION="Objects and routines pertaining to date and time"
+HOMEPAGE="https://github.com/jaraco/tempora"
+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 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	>=dev-python/jaraco-functools-1.20[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]
+	test? (
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/pytest-freezegun[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs \
+	">=dev-python/jaraco-packaging-3.2" \
+	">=dev-python/rst-linker-1.9"
diff --git a/dev-python/textdistance/textdistance-4.2.1.ebuild b/dev-python/textdistance/textdistance-4.2.1.ebuild
index 2259757c7395..2609df0345f0 100644
--- a/dev-python/textdistance/textdistance-4.2.1.ebuild
+++ b/dev-python/textdistance/textdistance-4.2.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/life4/textdistance/archive/v.${PV}.tar.gz -> ${P}.ta
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 
 BDEPEND="test? (
 	dev-python/abydos[${PYTHON_USEDEP}]
diff --git a/dev-python/texttable/texttable-1.6.3.ebuild b/dev-python/texttable/texttable-1.6.3.ebuild
index 178deac0ef75..4ebd4d5d09d7 100644
--- a/dev-python/texttable/texttable-1.6.3.ebuild
+++ b/dev-python/texttable/texttable-1.6.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -24,6 +24,5 @@ python_test() {
 }
 
 pkg_postinst() {
-	elog "Optional features: "
 	optfeature "better wrapping of CJK text" dev-python/cjkwrap
 }