Updating liguros repo

72 files changed, 243 insertions, 69 deletions

diff --git a/dev-python/black/black-19.10_beta0.ebuild b/dev-python/black/black-19.10_beta0.ebuild
index cb5200bb862e..45e9210cc43f 100644
--- a/dev-python/black/black-19.10_beta0.ebuild
+++ b/dev-python/black/black-19.10_beta0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{5,6,7,8,9} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit eutils distutils-r1
+inherit distutils-r1 optfeature
 
 MY_PV="${PV//_beta/b}"
 MY_P="${PN}-${MY_PV}"
diff --git a/dev-python/black/black-20.8_beta1.ebuild b/dev-python/black/black-20.8_beta1.ebuild
index 05c4c5365de9..a466a88a6b9c 100644
--- a/dev-python/black/black-20.8_beta1.ebuild
+++ b/dev-python/black/black-20.8_beta1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{5,6,7,8,9} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit eutils distutils-r1
+inherit distutils-r1 optfeature
 
 MY_PV="${PV//_beta/b}"
 MY_P="${PN}-${MY_PV}"
diff --git a/dev-python/bottle/bottle-0.12.18.ebuild b/dev-python/bottle/bottle-0.12.18.ebuild
index 2eaf77288369..147c6ef50425 100644
--- a/dev-python/bottle/bottle-0.12.18.ebuild
+++ b/dev-python/bottle/bottle-0.12.18.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python2_7 python3_{5,6,7,8,9} )
 
-inherit distutils-r1 eutils
+inherit distutils-r1 optfeature
 
 DESCRIPTION="A fast and simple micro-framework for small web-applications"
 HOMEPAGE="https://pypi.org/project/bottle/ https://bottlepy.org/"
diff --git a/dev-python/celery/celery-4.3.0.ebuild b/dev-python/celery/celery-4.3.0.ebuild
index 9a0cacc507cc..3d341847d02a 100644
--- a/dev-python/celery/celery-4.3.0.ebuild
+++ b/dev-python/celery/celery-4.3.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{5,6,7,8,9} )
 
-inherit bash-completion-r1 distutils-r1 eutils
+inherit bash-completion-r1 distutils-r1 optfeature
 
 DESCRIPTION="Asynchronous task queue/job queue based on distributed message passing"
 HOMEPAGE="https://celeryproject.org/ https://pypi.org/project/celery/"
diff --git a/dev-python/cfn-python-lint/Manifest b/dev-python/cfn-python-lint/Manifest
index 48a0f55dd0d2..ef3d8bea5d84 100644
--- a/dev-python/cfn-python-lint/Manifest
+++ b/dev-python/cfn-python-lint/Manifest
@@ -1 +1,2 @@
 DIST cfn-python-lint-0.30.1.tar.gz 4137425 BLAKE2B dd4f7d449236e567e7ea0fa662cbe983b6125a6cb557ee314de0e6647c5756b0be450deec7778ac69f1cec95b594c8c74a0a2f56ea229b7dc28ffb918983e6b3 SHA512 67b72973dc174e0de4980606b7886459233fca516a0587b91319127c4df0ce2647bbdc3302d68b63916654a76f4c9405c2f27cfd5e0ad737b00724e403815477
+DIST cfn-python-lint-0.35.1.tar.gz 4501826 BLAKE2B 84da0965fc198ce7b8f955a7d43f9a1c87c9688c301594abe6843509a832b4c9c5fadad1f75ac1c5b20ce2179244fd2b9681f5a92a1dbe38738a61c94f95982a SHA512 6d277048bbd7d8950ef7681c4a31cb82ccc231fb29f5083169caef69bfa4464cd87e473f40c775d798ff511a5db1dff9a17b0c08dcc800db0188e1e84990c9e4
diff --git a/dev-python/cfn-python-lint/cfn-python-lint-0.35.1.ebuild b/dev-python/cfn-python-lint/cfn-python-lint-0.35.1.ebuild
new file mode 100644
index 000000000000..ad7b4cc8cd65
--- /dev/null
+++ b/dev-python/cfn-python-lint/cfn-python-lint-0.35.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{5,6,7,8,9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1
+
+DESCRIPTION="CloudFormation Linter"
+HOMEPAGE="https://pypi.org/project/cfn-lint/ https://github.com/aws-cloudformation/cfn-python-lint"
+SRC_URI="https://github.com/aws-cloudformation/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/aws-sam-translator-1.25.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/importlib_resources[${PYTHON_USEDEP}]
+	' python3_6)
+	dev-python/jsonpatch[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
+	dev-python/junit-xml[${PYTHON_USEDEP}]
+	dev-python/networkx[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.15.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.11[${PYTHON_USEDEP}]
+"
+
+PATCHES=(
+	"${FILESDIR}/cfn-python-lint-0.30.1-tests.patch"
+)
+
+src_prepare() {
+	# unpin the deps
+	sed -e 's:~=[0-9.]*::' -i setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	distutils_install_for_testing
+	"${EPYTHON}" -m unittest discover -v ||
+		die "tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/cookies/cookies-2.2.1-r1.ebuild b/dev-python/cookies/cookies-2.2.1-r1.ebuild
index 22d757645c8b..6dedb189957a 100644
--- a/dev-python/cookies/cookies-2.2.1-r1.ebuild
+++ b/dev-python/cookies/cookies-2.2.1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 
 PATCHES=(
 	# https://gitlab.com/sashahart/cookies/merge_requests/2
diff --git a/dev-python/csv23/csv23-0.3.2.ebuild b/dev-python/csv23/csv23-0.3.2.ebuild
index c98bc504c8c7..a87fa4ea43a2 100644
--- a/dev-python/csv23/csv23-0.3.2.ebuild
+++ b/dev-python/csv23/csv23-0.3.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/xflr6/csv23/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 
 # note: upstream really uses mock at runtime
 RDEPEND="
diff --git a/dev-python/django/django-2.2.16.ebuild b/dev-python/django/django-2.2.16.ebuild
index fd30723a071c..93eb48b7df4d 100644
--- a/dev-python/django/django-2.2.16.ebuild
+++ b/dev-python/django/django-2.2.16.ebuild
@@ -7,7 +7,7 @@ DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python3_{5,6,7,8,9} )
 PYTHON_REQ_USE='sqlite?,threads(+)'
 
-inherit bash-completion-r1 distutils-r1 eutils
+inherit bash-completion-r1 distutils-r1 optfeature
 
 MY_PN="Django"
 MY_P="${MY_PN}-${PV}"
@@ -70,7 +70,7 @@ pkg_postinst() {
 	elog "Additional Backend support can be enabled via"
 	optfeature "MySQL backend support" dev-python/mysqlclient
 	optfeature "PostgreSQL backend support" dev-python/psycopg:2
-	echo ""
+	elog
 	elog "Other features can be enhanced by"
 	optfeature "GEO Django" "sci-libs/gdal[geos]"
 	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
diff --git a/dev-python/django/django-3.0.10.ebuild b/dev-python/django/django-3.0.10.ebuild
index 8312ae9a0388..44a2d330eb8e 100644
--- a/dev-python/django/django-3.0.10.ebuild
+++ b/dev-python/django/django-3.0.10.ebuild
@@ -7,7 +7,7 @@ DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python3_{5,6,7,8,9} )
 PYTHON_REQ_USE='sqlite?,threads(+)'
 
-inherit bash-completion-r1 distutils-r1 eutils
+inherit bash-completion-r1 distutils-r1 optfeature
 
 MY_PN="Django"
 MY_P="${MY_PN}-${PV}"
@@ -71,7 +71,7 @@ pkg_postinst() {
 	elog "Additional Backend support can be enabled via"
 	optfeature "MySQL backend support" dev-python/mysqlclient
 	optfeature "PostgreSQL backend support" dev-python/psycopg:2
-	echo ""
+	elog
 	elog "Other features can be enhanced by"
 	optfeature "GEO Django" "sci-libs/gdal[geos]"
 	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
diff --git a/dev-python/django/django-3.1.1.ebuild b/dev-python/django/django-3.1.1.ebuild
index 85403716fd79..4c83d0790cf6 100644
--- a/dev-python/django/django-3.1.1.ebuild
+++ b/dev-python/django/django-3.1.1.ebuild
@@ -7,7 +7,7 @@ DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python3_{5,6,7,8,9} )
 PYTHON_REQ_USE='sqlite?,threads(+)'
 
-inherit bash-completion-r1 distutils-r1 eutils
+inherit bash-completion-r1 distutils-r1 optfeature
 
 MY_PN="Django"
 MY_P="${MY_PN}-${PV}"
@@ -71,7 +71,7 @@ pkg_postinst() {
 	elog "Additional Backend support can be enabled via"
 	optfeature "MySQL backend support" dev-python/mysqlclient
 	optfeature "PostgreSQL backend support" dev-python/psycopg:2
-	echo ""
+	elog
 	elog "Other features can be enhanced by"
 	optfeature "GEO Django" "sci-libs/gdal[geos]"
 	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
diff --git a/dev-python/dkimpy/dkimpy-1.0.4.ebuild b/dev-python/dkimpy/dkimpy-1.0.4.ebuild
index 0cdf6add25e3..af3c9201395c 100644
--- a/dev-python/dkimpy/dkimpy-1.0.4.ebuild
+++ b/dev-python/dkimpy/dkimpy-1.0.4.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 PYTHON_COMPAT=( python3_{6,7,8,9} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
-inherit distutils-r1 eutils
+inherit distutils-r1 optfeature
 
 DESCRIPTION="DKIM and ARC email signing and verification library"
 HOMEPAGE="https://launchpad.net/dkimpy"
diff --git a/dev-python/dkimpy/dkimpy-1.0.5.ebuild b/dev-python/dkimpy/dkimpy-1.0.5.ebuild
index 92115472e0ca..c8f8c7e80310 100644
--- a/dev-python/dkimpy/dkimpy-1.0.5.ebuild
+++ b/dev-python/dkimpy/dkimpy-1.0.5.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 PYTHON_COMPAT=( python3_{6,7,8,9} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
-inherit distutils-r1 eutils
+inherit distutils-r1 optfeature
 
 DESCRIPTION="DKIM and ARC email signing and verification library"
 HOMEPAGE="https://launchpad.net/dkimpy"
diff --git a/dev-python/fs/fs-2.4.9-r1.ebuild b/dev-python/fs/fs-2.4.9-r1.ebuild
index 32a274cb0f55..18f4dbe04522 100644
--- a/dev-python/fs/fs-2.4.9-r1.ebuild
+++ b/dev-python/fs/fs-2.4.9-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{5,6,7,8,9} )
 
-inherit distutils-r1 eutils
+inherit distutils-r1 optfeature
 
 DESCRIPTION="Filesystem abstraction layer"
 HOMEPAGE="
diff --git a/dev-python/gevent/gevent-20.6.2.ebuild b/dev-python/gevent/gevent-20.6.2.ebuild
index 4185c6b72b94..d116dccacc5c 100644
--- a/dev-python/gevent/gevent-20.6.2.ebuild
+++ b/dev-python/gevent/gevent-20.6.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~mips ~ppc ppc64 s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~mips ppc ppc64 s390 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/geventhttpclient/geventhttpclient-1.4.4.ebuild b/dev-python/geventhttpclient/geventhttpclient-1.4.4.ebuild
index a5258ee4a3c7..15a80b51fa6c 100644
--- a/dev-python/geventhttpclient/geventhttpclient-1.4.4.ebuild
+++ b/dev-python/geventhttpclient/geventhttpclient-1.4.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/hypothesis/hypothesis-4.57.1.ebuild b/dev-python/hypothesis/hypothesis-4.57.1.ebuild
index d36e328b4692..e331cbc4872e 100644
--- a/dev-python/hypothesis/hypothesis-4.57.1.ebuild
+++ b/dev-python/hypothesis/hypothesis-4.57.1.ebuild
@@ -7,7 +7,7 @@ DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python2_7 python3_{5,6,7,8,9} )
 PYTHON_REQ_USE="threads(+),sqlite"
 
-inherit distutils-r1 eutils
+inherit distutils-r1 optfeature
 
 DESCRIPTION="A library for property based testing"
 HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
diff --git a/dev-python/hypothesis/hypothesis-5.21.0.ebuild b/dev-python/hypothesis/hypothesis-5.21.0.ebuild
index 6c97c2537da7..ed4be52d1eeb 100644
--- a/dev-python/hypothesis/hypothesis-5.21.0.ebuild
+++ b/dev-python/hypothesis/hypothesis-5.21.0.ebuild
@@ -7,7 +7,7 @@ DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
 PYTHON_REQ_USE="threads(+),sqlite"
 
-inherit distutils-r1 eutils
+inherit distutils-r1 optfeature
 
 DESCRIPTION="A library for property based testing"
 HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
diff --git a/dev-python/hypothesis/hypothesis-5.24.3.ebuild b/dev-python/hypothesis/hypothesis-5.24.3.ebuild
index 37f9e736953e..cbbb82602a59 100644
--- a/dev-python/hypothesis/hypothesis-5.24.3.ebuild
+++ b/dev-python/hypothesis/hypothesis-5.24.3.ebuild
@@ -7,7 +7,7 @@ DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
 PYTHON_REQ_USE="threads(+),sqlite"
 
-inherit distutils-r1 eutils
+inherit distutils-r1 optfeature
 
 DESCRIPTION="A library for property based testing"
 HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
diff --git a/dev-python/hypothesis/hypothesis-5.24.4.ebuild b/dev-python/hypothesis/hypothesis-5.24.4.ebuild
index 37f9e736953e..cbbb82602a59 100644
--- a/dev-python/hypothesis/hypothesis-5.24.4.ebuild
+++ b/dev-python/hypothesis/hypothesis-5.24.4.ebuild
@@ -7,7 +7,7 @@ DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
 PYTHON_REQ_USE="threads(+),sqlite"
 
-inherit distutils-r1 eutils
+inherit distutils-r1 optfeature
 
 DESCRIPTION="A library for property based testing"
 HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
diff --git a/dev-python/hypothesis/hypothesis-5.27.0.ebuild b/dev-python/hypothesis/hypothesis-5.27.0.ebuild
index 8ebc44305333..a3f7ab322f4a 100644
--- a/dev-python/hypothesis/hypothesis-5.27.0.ebuild
+++ b/dev-python/hypothesis/hypothesis-5.27.0.ebuild
@@ -7,7 +7,7 @@ DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
 PYTHON_REQ_USE="threads(+),sqlite"
 
-inherit distutils-r1 eutils
+inherit distutils-r1 optfeature
 
 DESCRIPTION="A library for property based testing"
 HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
diff --git a/dev-python/hypothesis/hypothesis-5.28.0.ebuild b/dev-python/hypothesis/hypothesis-5.28.0.ebuild
index ed83f45e4ad4..a8399109ada4 100644
--- a/dev-python/hypothesis/hypothesis-5.28.0.ebuild
+++ b/dev-python/hypothesis/hypothesis-5.28.0.ebuild
@@ -7,7 +7,7 @@ DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
 PYTHON_REQ_USE="threads(+),sqlite"
 
-inherit distutils-r1 eutils
+inherit distutils-r1 optfeature
 
 DESCRIPTION="A library for property based testing"
 HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
diff --git a/dev-python/hypothesis/hypothesis-5.29.0.ebuild b/dev-python/hypothesis/hypothesis-5.29.0.ebuild
index 03d54029dbe6..8f72b57714ba 100644
--- a/dev-python/hypothesis/hypothesis-5.29.0.ebuild
+++ b/dev-python/hypothesis/hypothesis-5.29.0.ebuild
@@ -7,7 +7,7 @@ DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
 PYTHON_REQ_USE="threads(+),sqlite"
 
-inherit distutils-r1 eutils multiprocessing
+inherit distutils-r1 multiprocessing optfeature
 
 DESCRIPTION="A library for property based testing"
 HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
diff --git a/dev-python/hypothesis/hypothesis-5.29.3.ebuild b/dev-python/hypothesis/hypothesis-5.29.3.ebuild
index b155f84c16fa..c3baa6c86326 100644
--- a/dev-python/hypothesis/hypothesis-5.29.3.ebuild
+++ b/dev-python/hypothesis/hypothesis-5.29.3.ebuild
@@ -7,7 +7,7 @@ DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
 PYTHON_REQ_USE="threads(+),sqlite"
 
-inherit distutils-r1 eutils multiprocessing
+inherit distutils-r1 multiprocessing optfeature
 
 DESCRIPTION="A library for property based testing"
 HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
diff --git a/dev-python/hypothesis/hypothesis-5.29.4.ebuild b/dev-python/hypothesis/hypothesis-5.29.4.ebuild
index bd78daca5ed4..c292980bf352 100644
--- a/dev-python/hypothesis/hypothesis-5.29.4.ebuild
+++ b/dev-python/hypothesis/hypothesis-5.29.4.ebuild
@@ -7,7 +7,7 @@ DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
 PYTHON_REQ_USE="threads(+),sqlite"
 
-inherit distutils-r1 eutils multiprocessing
+inherit distutils-r1 multiprocessing optfeature
 
 DESCRIPTION="A library for property based testing"
 HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
diff --git a/dev-python/hypothesis/hypothesis-5.30.0.ebuild b/dev-python/hypothesis/hypothesis-5.30.0.ebuild
index bd78daca5ed4..c292980bf352 100644
--- a/dev-python/hypothesis/hypothesis-5.30.0.ebuild
+++ b/dev-python/hypothesis/hypothesis-5.30.0.ebuild
@@ -7,7 +7,7 @@ DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
 PYTHON_REQ_USE="threads(+),sqlite"
 
-inherit distutils-r1 eutils multiprocessing
+inherit distutils-r1 multiprocessing optfeature
 
 DESCRIPTION="A library for property based testing"
 HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
diff --git a/dev-python/hypothesis/hypothesis-5.30.1.ebuild b/dev-python/hypothesis/hypothesis-5.30.1.ebuild
index d016eb0fc6a4..3977c631e30a 100644
--- a/dev-python/hypothesis/hypothesis-5.30.1.ebuild
+++ b/dev-python/hypothesis/hypothesis-5.30.1.ebuild
@@ -7,7 +7,7 @@ DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
 PYTHON_REQ_USE="threads(+),sqlite"
 
-inherit distutils-r1 eutils multiprocessing
+inherit distutils-r1 multiprocessing optfeature
 
 DESCRIPTION="A library for property based testing"
 HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
diff --git a/dev-python/hypothesis/hypothesis-5.32.0.ebuild b/dev-python/hypothesis/hypothesis-5.32.0.ebuild
index d016eb0fc6a4..3977c631e30a 100644
--- a/dev-python/hypothesis/hypothesis-5.32.0.ebuild
+++ b/dev-python/hypothesis/hypothesis-5.32.0.ebuild
@@ -7,7 +7,7 @@ DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
 PYTHON_REQ_USE="threads(+),sqlite"
 
-inherit distutils-r1 eutils multiprocessing
+inherit distutils-r1 multiprocessing optfeature
 
 DESCRIPTION="A library for property based testing"
 HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
diff --git a/dev-python/iniconfig/iniconfig-1.0.0.ebuild b/dev-python/iniconfig/iniconfig-1.0.0.ebuild
index 035f8dd502a9..ce1990e6898b 100644
--- a/dev-python/iniconfig/iniconfig-1.0.0.ebuild
+++ b/dev-python/iniconfig/iniconfig-1.0.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~sparc ~x86"
 
 BDEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/ipyparallel/ipyparallel-6.3.0-r1.ebuild b/dev-python/ipyparallel/ipyparallel-6.3.0-r1.ebuild
index 1bbe77a37d82..f82ab8cd3dc3 100644
--- a/dev-python/ipyparallel/ipyparallel-6.3.0-r1.ebuild
+++ b/dev-python/ipyparallel/ipyparallel-6.3.0-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{5,6,7,8,9} )
 PYTHON_REQ_USE="threads(+)"
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
-inherit distutils-r1 eutils
+inherit distutils-r1 optfeature
 
 DESCRIPTION="Interactive Parallel Computing with IPython"
 HOMEPAGE="https://ipyparallel.readthedocs.io/"
diff --git a/dev-python/ipyparallel/ipyparallel-6.3.0.ebuild b/dev-python/ipyparallel/ipyparallel-6.3.0.ebuild
index 1bbe77a37d82..f82ab8cd3dc3 100644
--- a/dev-python/ipyparallel/ipyparallel-6.3.0.ebuild
+++ b/dev-python/ipyparallel/ipyparallel-6.3.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{5,6,7,8,9} )
 PYTHON_REQ_USE="threads(+)"
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
-inherit distutils-r1 eutils
+inherit distutils-r1 optfeature
 
 DESCRIPTION="Interactive Parallel Computing with IPython"
 HOMEPAGE="https://ipyparallel.readthedocs.io/"
diff --git a/dev-python/ipython/ipython-7.16.1.ebuild b/dev-python/ipython/ipython-7.16.1.ebuild
index 11fe631756ef..5061aa450102 100644
--- a/dev-python/ipython/ipython-7.16.1.ebuild
+++ b/dev-python/ipython/ipython-7.16.1.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 PYTHON_COMPAT=( python3_{5,6,7,8,9} )
 PYTHON_REQ_USE='readline,sqlite,threads(+)'
 
-inherit distutils-r1 eutils virtualx
+inherit distutils-r1 optfeature virtualx
 
 DESCRIPTION="Advanced interactive shell for Python"
 HOMEPAGE="https://ipython.org/ https://github.com/ipython/ipython/"
diff --git a/dev-python/ipython/ipython-7.17.0.ebuild b/dev-python/ipython/ipython-7.17.0.ebuild
index 11fe631756ef..5061aa450102 100644
--- a/dev-python/ipython/ipython-7.17.0.ebuild
+++ b/dev-python/ipython/ipython-7.17.0.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 PYTHON_COMPAT=( python3_{5,6,7,8,9} )
 PYTHON_REQ_USE='readline,sqlite,threads(+)'
 
-inherit distutils-r1 eutils virtualx
+inherit distutils-r1 optfeature virtualx
 
 DESCRIPTION="Advanced interactive shell for Python"
 HOMEPAGE="https://ipython.org/ https://github.com/ipython/ipython/"
diff --git a/dev-python/ipython/ipython-7.18.0.ebuild b/dev-python/ipython/ipython-7.18.0.ebuild
index 4ffaf5e06e85..10ca02a75839 100644
--- a/dev-python/ipython/ipython-7.18.0.ebuild
+++ b/dev-python/ipython/ipython-7.18.0.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 PYTHON_COMPAT=( python3_{5,6,7,8,9} )
 PYTHON_REQ_USE='readline,sqlite,threads(+)'
 
-inherit distutils-r1 eutils virtualx
+inherit distutils-r1 optfeature virtualx
 
 DESCRIPTION="Advanced interactive shell for Python"
 HOMEPAGE="https://ipython.org/ https://github.com/ipython/ipython/"
diff --git a/dev-python/ipython/ipython-7.18.1.ebuild b/dev-python/ipython/ipython-7.18.1.ebuild
index e7674dfd18bb..d2ca6e3dbca7 100644
--- a/dev-python/ipython/ipython-7.18.1.ebuild
+++ b/dev-python/ipython/ipython-7.18.1.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 PYTHON_COMPAT=( python3_{5,6,7,8,9} )
 PYTHON_REQ_USE='readline,sqlite,threads(+)'
 
-inherit distutils-r1 eutils virtualx
+inherit distutils-r1 optfeature virtualx
 
 DESCRIPTION="Advanced interactive shell for Python"
 HOMEPAGE="https://ipython.org/ https://github.com/ipython/ipython/"
diff --git a/dev-python/junit-xml/Manifest b/dev-python/junit-xml/Manifest
new file mode 100644
index 000000000000..87a9856405ef
--- /dev/null
+++ b/dev-python/junit-xml/Manifest
@@ -0,0 +1 @@
+DIST junit-xml-1.9.tar.gz 11111 BLAKE2B e40914263421e7021d6bd697a03ae74b596d915479f24e8227d8b0b0bda51529df58f7aa54b27e981bb1df0aa36d7876f4f30fff8924188143bc4dd6b1d80b17 SHA512 73d5245f4a324485370e91d0d4d9a754133e0f90e5ad9ae7070bbb7aad29bee5fda4103548483358d536834c5fee9c8bd5fef79c4b66f905a2aeb0823ef02d22
diff --git a/dev-python/junit-xml/junit-xml-1.9.ebuild b/dev-python/junit-xml/junit-xml-1.9.ebuild
new file mode 100644
index 000000000000..caa74c5851e1
--- /dev/null
+++ b/dev-python/junit-xml/junit-xml-1.9.ebuild
@@ -0,0 +1,28 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6,7,8,9} )
+inherit distutils-r1
+
+DESCRIPTION="Create JUnit XML test result documents"
+HOMEPAGE="
+	https://pypi.org/project/junit-xml/
+	https://github.com/kyrus/python-junit-xml"
+# upstream fails both at uploading to pypi and making tags
+# https://github.com/kyrus/python-junit-xml/issues/69
+# https://github.com/kyrus/python-junit-xml/issues/31
+EGIT_COMMIT="19d3cc333d35dfd2d17d75c506336c15e5c6685a"
+SRC_URI="
+	https://github.com/kyrus/python-junit-xml/archive/${EGIT_COMMIT}.tar.gz
+		-> ${P}.tar.gz"
+S=${WORKDIR}/python-junit-xml-${EGIT_COMMIT}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
diff --git a/dev-python/junit-xml/metadata.xml b/dev-python/junit-xml/metadata.xml
new file mode 100644
index 000000000000..50567d15b867
--- /dev/null
+++ b/dev-python/junit-xml/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+	</maintainer>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/dev-python/lxml/lxml-4.5.1.ebuild b/dev-python/lxml/lxml-4.5.1.ebuild
index 249471a595d4..aa191833f285 100644
--- a/dev-python/lxml/lxml-4.5.1.ebuild
+++ b/dev-python/lxml/lxml-4.5.1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python2_7 python3_{5,6,7,8,9} )
 
-inherit distutils-r1 eutils toolchain-funcs
+inherit distutils-r1 optfeature toolchain-funcs
 
 DESCRIPTION="A Pythonic binding for the libxml2 and libxslt libraries"
 HOMEPAGE="https://lxml.de/ https://pypi.org/project/lxml/ https://github.com/lxml/lxml"
diff --git a/dev-python/lxml/lxml-4.5.2.ebuild b/dev-python/lxml/lxml-4.5.2.ebuild
index fe6c53edf6a1..f5aee0707f7d 100644
--- a/dev-python/lxml/lxml-4.5.2.ebuild
+++ b/dev-python/lxml/lxml-4.5.2.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python2_7 python3_{5,6,7,8,9} )
 
-inherit distutils-r1 eutils toolchain-funcs
+inherit distutils-r1 optfeature toolchain-funcs
 
 DESCRIPTION="A Pythonic binding for the libxml2 and libxslt libraries"
 HOMEPAGE="https://lxml.de/ https://pypi.org/project/lxml/ https://github.com/lxml/lxml"
@@ -14,7 +14,7 @@ S=${WORKDIR}/lxml-${P}
 
 LICENSE="BSD ElementTree GPL-2 PSF-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ~ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc examples +threads test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/mako/mako-1.1.3.ebuild b/dev-python/mako/mako-1.1.3.ebuild
index 199789379c6b..73019a54a254 100644
--- a/dev-python/mako/mako-1.1.3.ebuild
+++ b/dev-python/mako/mako-1.1.3.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python2_7 python3_{5,6,7,8,9} )
 
-inherit distutils-r1 eutils
+inherit distutils-r1 optfeature
 
 MY_P=${P^}
 DESCRIPTION="A Python templating language"
diff --git a/dev-python/nnpy/nnpy-1.4.2.ebuild b/dev-python/nnpy/nnpy-1.4.2.ebuild
index d90c1df43fa6..2f5fb5ec4614 100644
--- a/dev-python/nnpy/nnpy-1.4.2.ebuild
+++ b/dev-python/nnpy/nnpy-1.4.2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7,8,9} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 inherit distutils-r1
 
@@ -23,5 +23,5 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 python_test() {
-	PYTHONPATH="${S}:${PYTHONPATH}" "${PYTHON}" "${S}/nnpy/tests.py" || die
+	PYTHONPATH="${S}:${PYTHONPATH}" "${PYTHON}" -m nnpy.tests || die
 }
diff --git a/dev-python/nuitka/nuitka-0.6.8.ebuild b/dev-python/nuitka/nuitka-0.6.8.ebuild
index 6f7899fa54d8..1a16216e28fd 100644
--- a/dev-python/nuitka/nuitka-0.6.8.ebuild
+++ b/dev-python/nuitka/nuitka-0.6.8.ebuild
@@ -7,7 +7,7 @@ DISTUTILS_USE_SETUPTOOLS="rdepend"
 
 PYTHON_COMPAT=( python3_{5,6,7,8,9} )
 
-inherit distutils-r1 eutils
+inherit distutils-r1 optfeature
 
 DESCRIPTION="Python to native compiler"
 HOMEPAGE="https://www.nuitka.net"
diff --git a/dev-python/pandas/pandas-1.0.5.ebuild b/dev-python/pandas/pandas-1.0.5.ebuild
index 4a39e9648c5f..f878cdd063a4 100644
--- a/dev-python/pandas/pandas-1.0.5.ebuild
+++ b/dev-python/pandas/pandas-1.0.5.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="threads(+)"
 VIRTUALX_REQUIRED="manual"
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
-inherit distutils-r1 eutils flag-o-matic virtualx
+inherit distutils-r1 flag-o-matic optfeature virtualx
 
 DESCRIPTION="Powerful data structures for data analysis and statistics"
 HOMEPAGE="https://pandas.pydata.org/"
diff --git a/dev-python/pandas/pandas-1.1.0.ebuild b/dev-python/pandas/pandas-1.1.0.ebuild
index 4a98a926c3f4..18ea29c3c49f 100644
--- a/dev-python/pandas/pandas-1.1.0.ebuild
+++ b/dev-python/pandas/pandas-1.1.0.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="threads(+)"
 VIRTUALX_REQUIRED="manual"
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
-inherit distutils-r1 eutils flag-o-matic virtualx
+inherit distutils-r1 flag-o-matic optfeature virtualx
 
 DESCRIPTION="Powerful data structures for data analysis and statistics"
 HOMEPAGE="https://pandas.pydata.org/"
diff --git a/dev-python/pandas/pandas-1.1.1.ebuild b/dev-python/pandas/pandas-1.1.1.ebuild
index d7a6a80e0150..91ad11b9ec63 100644
--- a/dev-python/pandas/pandas-1.1.1.ebuild
+++ b/dev-python/pandas/pandas-1.1.1.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="threads(+)"
 VIRTUALX_REQUIRED="manual"
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
-inherit distutils-r1 eutils flag-o-matic multiprocessing virtualx
+inherit distutils-r1 flag-o-matic multiprocessing optfeature virtualx
 
 DESCRIPTION="Powerful data structures for data analysis and statistics"
 HOMEPAGE="https://pandas.pydata.org/"
diff --git a/dev-python/pip/pip-20.1.1.ebuild b/dev-python/pip/pip-20.1.1.ebuild
index 7bf6951d9f59..9b6eab83d940 100644
--- a/dev-python/pip/pip-20.1.1.ebuild
+++ b/dev-python/pip/pip-20.1.1.ebuild
@@ -25,7 +25,7 @@ SRC_URI="
 # setuptools & wheel .whl files are required for testing, exact version is not very important.
 
 LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86"
 SLOT="0"
 IUSE="test -vanilla"
 
diff --git a/dev-python/psycopg/Manifest b/dev-python/psycopg/Manifest
index 4c2172a1c623..de875fad3b68 100644
--- a/dev-python/psycopg/Manifest
+++ b/dev-python/psycopg/Manifest
@@ -1,2 +1,3 @@
 DIST psycopg2-2.7.7.tar.gz 427474 BLAKE2B bc721b721693bc5f560a4829e84715d15e8c14523ada00109c7d7ba916c91928082fff286bd3c2ff5987c0436443128d1408ac9de073ad538b1e356fc73aaf8f SHA512 032344957c00bf659ca5e46f54f827a6d79809e370d661cd349e2ce935873359bcc4f440b74c6f14658bf1cd9598b6d884abae507fd33db9e07b01fc87967fb0
 DIST psycopg2-2.8.5.tar.gz 380874 BLAKE2B 843321175499bf00b080d3e58ce0d586e674585af4be5a08866b5dbb68256ff9232d3c25e2603a3a0920a6c91927eb9fbb5942acd429be5dab9177c65da0c32e SHA512 d4cf9b94573b90fe56555ea5cf841aa0c4c806770f92f35a7ef2531999bb50f98eb1276e56f1540b5f2695e443bac7e9cb8bbfbd24ed82164f99663259d2da3e
+DIST psycopg2-2.8.6.tar.gz 383797 BLAKE2B da0e3f1e143c51c940ba1f51d3e457b492d880ab71267dacd4747444bc767711ccd6c2f54d9e10ce5ad8fae0c3206fb4b6199f267e9bbaf12eb654227f59c2b0 SHA512 1e1d5d8755c6d1a153d84210bf29902afafe853659d709e13abc6bc5772def13779d2394690af1c544384c9c607edc0fe5cf2763244fb346febf9a9e0032b45f
diff --git a/dev-python/psycopg/psycopg-2.8.6.ebuild b/dev-python/psycopg/psycopg-2.8.6.ebuild
new file mode 100644
index 000000000000..fadc9f03ea1b
--- /dev/null
+++ b/dev-python/psycopg/psycopg-2.8.6.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7,8,9} )
+
+inherit distutils-r1 flag-o-matic
+
+MY_PN="${PN}2"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="PostgreSQL database adapter for Python"
+HOMEPAGE="https://www.psycopg.org https://pypi.org/project/psycopg2/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="LGPL-3+"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+IUSE="debug test"
+RESTRICT="!test? ( test )"
+
+# automagic dep on mxdatetime (from egenix-mx-base)
+# the package was removed, so let's just make sure it's gone
+RDEPEND=">=dev-db/postgresql-8.1:*"
+DEPEND="${RDEPEND}
+	test? ( >=dev-db/postgresql-8.1[server] )
+	!!dev-python/egenix-mx-base"
+
+python_compile() {
+	local CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS}
+
+	! python_is_python3 && append-flags -fno-strict-aliasing
+
+	distutils-r1_python_compile
+}
+
+python_prepare_all() {
+	if use debug; then
+		sed -i 's/^\(define=\)/\1PSYCOPG_DEBUG,/' setup.cfg || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+src_test() {
+	initdb -D "${T}"/pgsql || die
+	# TODO: random port
+	pg_ctl -w -D "${T}"/pgsql start \
+		-o "-h '' -k '${T}'" || die
+	createdb -h "${T}" psycopg2_test || die
+
+	local -x PSYCOPG2_TESTDB_HOST="${T}"
+	distutils-r1_src_test
+
+	pg_ctl -w -D "${T}"/pgsql stop || die
+}
+
+python_test() {
+	"${EPYTHON}" -c "
+import tests
+tests.unittest.main(defaultTest='tests.test_suite')
+" --verbose || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/pygresql/pygresql-5.2.ebuild b/dev-python/pygresql/pygresql-5.2.ebuild
index fba3e737e73f..06088c568fa1 100644
--- a/dev-python/pygresql/pygresql-5.2.ebuild
+++ b/dev-python/pygresql/pygresql-5.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/P/PyGreSQL/${MY_P}.tar.gz"
 
 LICENSE="POSTGRESQL"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ~sparc x86"
 
 DEPEND="${POSTGRES_DEP}"
 RDEPEND="${DEPEND}"
diff --git a/dev-python/pyjwt/pyjwt-1.7.1-r1.ebuild b/dev-python/pyjwt/pyjwt-1.7.1-r1.ebuild
index 8e8ebc872b81..54f3d2909401 100644
--- a/dev-python/pyjwt/pyjwt-1.7.1-r1.ebuild
+++ b/dev-python/pyjwt/pyjwt-1.7.1-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
 
-inherit distutils-r1 eutils
+inherit distutils-r1 optfeature
 
 MY_PN="PyJWT"
 DESCRIPTION="JSON Web Token implementation in Python"
diff --git a/dev-python/pylatex/pylatex-1.3.3.ebuild b/dev-python/pylatex/pylatex-1.3.3.ebuild
index 5f7c44167e4a..d755dbceb178 100644
--- a/dev-python/pylatex/pylatex-1.3.3.ebuild
+++ b/dev-python/pylatex/pylatex-1.3.3.ebuild
@@ -8,7 +8,7 @@ MY_P="${MY_PN}-${PV}"
 
 PYTHON_COMPAT=( python3_{6,7,8,9} )
 
-inherit distutils-r1 eutils
+inherit distutils-r1 optfeature
 
 DESCRIPTION="A Python library for creating LaTeX files and snippets"
 HOMEPAGE="https://github.com/JelteF/PyLaTeX"
diff --git a/dev-python/pylint/pylint-2.5.3.ebuild b/dev-python/pylint/pylint-2.5.3.ebuild
index 3f3c94a20f7d..4e171c678b72 100644
--- a/dev-python/pylint/pylint-2.5.3.ebuild
+++ b/dev-python/pylint/pylint-2.5.3.ebuild
@@ -9,7 +9,7 @@ DISTUTILS_USE_SETUPTOOLS=rdepend
 # entry_points is added via **kwargs in a dict
 _DISTUTILS_SETUPTOOLS_WARNED=1
 
-inherit distutils-r1 eutils
+inherit distutils-r1 optfeature
 
 DESCRIPTION="Python code static checker"
 HOMEPAGE="https://www.logilab.org/project/pylint
diff --git a/dev-python/pyquery/pyquery-1.4.1-r1.ebuild b/dev-python/pyquery/pyquery-1.4.1-r1.ebuild
index 1d2ae1a28597..0a5cee5f5e03 100644
--- a/dev-python/pyquery/pyquery-1.4.1-r1.ebuild
+++ b/dev-python/pyquery/pyquery-1.4.1-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
 
-inherit distutils-r1 eutils
+inherit distutils-r1 optfeature
 
 DESCRIPTION="A jQuery-like library for python"
 HOMEPAGE="https://github.com/gawel/pyquery"
diff --git a/dev-python/pyscard/pyscard-1.9.9.ebuild b/dev-python/pyscard/pyscard-1.9.9.ebuild
index 6a88a3afd44f..a5e6bcb85f1d 100644
--- a/dev-python/pyscard/pyscard-1.9.9.ebuild
+++ b/dev-python/pyscard/pyscard-1.9.9.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{5,6,7,8,9} )
 
-inherit distutils-r1 eutils
+inherit distutils-r1 optfeature
 
 DESCRIPTION="Smart cards support in python"
 HOMEPAGE="https://pyscard.sourceforge.io/
diff --git a/dev-python/pytest/pytest-6.0.1.ebuild b/dev-python/pytest/pytest-6.0.1.ebuild
index 364fca4585bb..687935e87fa0 100644
--- a/dev-python/pytest/pytest-6.0.1.ebuild
+++ b/dev-python/pytest/pytest-6.0.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~riscv ~sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/python-language-server/python-language-server-0.34.1.ebuild b/dev-python/python-language-server/python-language-server-0.34.1.ebuild
index 84b378da7721..0c92ffac8ce2 100644
--- a/dev-python/python-language-server/python-language-server-0.34.1.ebuild
+++ b/dev-python/python-language-server/python-language-server-0.34.1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{5,6,7,8,9} )
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
-inherit eutils distutils-r1
+inherit distutils-r1 optfeature
 
 DESCRIPTION="An implementation of the Language Server Protocol for Python"
 HOMEPAGE="https://github.com/palantir/python-language-server"
diff --git a/dev-python/python-nbxmpp/python-nbxmpp-1.0.1.ebuild b/dev-python/python-nbxmpp/python-nbxmpp-1.0.1.ebuild
index c793ea10dc74..dce308874b22 100644
--- a/dev-python/python-nbxmpp/python-nbxmpp-1.0.1.ebuild
+++ b/dev-python/python-nbxmpp/python-nbxmpp-1.0.1.ebuild
@@ -13,5 +13,5 @@ SRC_URI="https://dev.gajim.org/gajim/python-nbxmpp/-/archive/nbxmpp-${PV}/python
 
 SLOT="0"
 LICENSE="GPL-3"
-KEYWORDS="~alpha amd64 arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
diff --git a/dev-python/qdarkstyle/qdarkstyle-2.8.1.ebuild b/dev-python/qdarkstyle/qdarkstyle-2.8.1.ebuild
index fd2c520e477f..637111a307f8 100644
--- a/dev-python/qdarkstyle/qdarkstyle-2.8.1.ebuild
+++ b/dev-python/qdarkstyle/qdarkstyle-2.8.1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
-inherit eutils distutils-r1
+inherit distutils-r1 optfeature
 
 MY_PN="QDarkStyleSheet"
 
diff --git a/dev-python/responses/responses-0.12.0.ebuild b/dev-python/responses/responses-0.12.0.ebuild
index 2ecc3826212e..46d19bc61ab9 100644
--- a/dev-python/responses/responses-0.12.0.ebuild
+++ b/dev-python/responses/responses-0.12.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/spyder/spyder-4.1.4.ebuild b/dev-python/spyder/spyder-4.1.4.ebuild
index 3db43692526c..820f352dcbbb 100644
--- a/dev-python/spyder/spyder-4.1.4.ebuild
+++ b/dev-python/spyder/spyder-4.1.4.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{5,6,7,8,9} )
 
-inherit eutils xdg distutils-r1 virtualx
+inherit optfeature xdg distutils-r1 virtualx
 
 # Commit of documentation to fetch
 DOCS_PV="0d5afe26b8e28f3eb9f36f4ec3828bf8375c339e"
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.3.11.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.3.11.ebuild
index 782793383ede..729c12d140b1 100644
--- a/dev-python/sqlalchemy/sqlalchemy-1.3.11.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-1.3.11.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
 PYTHON_REQ_USE="sqlite?"
 
-inherit distutils-r1 eutils flag-o-matic
+inherit distutils-r1 flag-o-matic optfeature
 
 MY_PN="SQLAlchemy"
 MY_P="${MY_PN}-${PV/_beta/b}"
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.3.17.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.3.17.ebuild
index f8ada5362968..400b3cc6dc3e 100644
--- a/dev-python/sqlalchemy/sqlalchemy-1.3.17.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-1.3.17.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
 PYTHON_REQ_USE="sqlite?"
 
-inherit distutils-r1 eutils flag-o-matic
+inherit distutils-r1 flag-o-matic optfeature
 
 MY_PN="SQLAlchemy"
 MY_P="${MY_PN}-${PV/_beta/b}"
diff --git a/dev-python/statsmodels/statsmodels-0.11.1.ebuild b/dev-python/statsmodels/statsmodels-0.11.1.ebuild
index 24cf03ac0fbb..8b5aafd0bf32 100644
--- a/dev-python/statsmodels/statsmodels-0.11.1.ebuild
+++ b/dev-python/statsmodels/statsmodels-0.11.1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{5,6,7,8,9} )
 
-inherit distutils-r1 eutils
+inherit distutils-r1 optfeature
 
 DESCRIPTION="Statistical computations and models for use with SciPy"
 HOMEPAGE="https://www.statsmodels.org/stable/index.html"
diff --git a/dev-python/statsmodels/statsmodels-0.12.0.ebuild b/dev-python/statsmodels/statsmodels-0.12.0.ebuild
index 28761b6def62..f9e40818da08 100644
--- a/dev-python/statsmodels/statsmodels-0.12.0.ebuild
+++ b/dev-python/statsmodels/statsmodels-0.12.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{5,6,7,8,9} )
 
-inherit distutils-r1 eutils
+inherit distutils-r1 optfeature
 
 DESCRIPTION="Statistical computations and models for use with SciPy"
 HOMEPAGE="https://www.statsmodels.org/stable/index.html"
diff --git a/dev-python/statsmodels/statsmodels-9999.ebuild b/dev-python/statsmodels/statsmodels-9999.ebuild
index ac26b2f9c853..d50118e9610a 100644
--- a/dev-python/statsmodels/statsmodels-9999.ebuild
+++ b/dev-python/statsmodels/statsmodels-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 PYTHON_COMPAT=( python3_{5,6,7,8,9} )
 
-inherit distutils-r1 eutils git-r3 virtualx
+inherit distutils-r1 git-r3 optfeature virtualx
 
 DESCRIPTION="Statistical computations and models for use with SciPy"
 HOMEPAGE="https://www.statsmodels.org/stable/index.html"
diff --git a/dev-python/texttable/texttable-1.6.2-r1.ebuild b/dev-python/texttable/texttable-1.6.2-r1.ebuild
index 0eb8d566a632..029162595220 100644
--- a/dev-python/texttable/texttable-1.6.2-r1.ebuild
+++ b/dev-python/texttable/texttable-1.6.2-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{5,6,7,8,9} )
 
-inherit distutils-r1 eutils
+inherit distutils-r1 optfeature
 
 DESCRIPTION="Module for creating simple ASCII tables"
 HOMEPAGE="https://github.com/foutaise/texttable https://pypi.org/project/texttable/"
diff --git a/dev-python/theano/theano-1.0.5.ebuild b/dev-python/theano/theano-1.0.5.ebuild
index 31af359284b8..93a587b80f74 100644
--- a/dev-python/theano/theano-1.0.5.ebuild
+++ b/dev-python/theano/theano-1.0.5.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 PYTHON_COMPAT=( python3_{5,6,7,8,9} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
-inherit distutils-r1 eutils
+inherit distutils-r1 optfeature
 
 MY_P=${P^}
 
diff --git a/dev-python/traitlets/Manifest b/dev-python/traitlets/Manifest
index 52b4107fddaa..be49df6490c3 100644
--- a/dev-python/traitlets/Manifest
+++ b/dev-python/traitlets/Manifest
@@ -1,3 +1,4 @@
 DIST traitlets-4.3.3.tar.gz 89838 BLAKE2B 04b50fabdc312c427f0cff6d4e8be0a5afcafe6d5a7a5804fb37e6f92b867e6a9c6401c23b7cdd7b0a6372eadaf3e8350018db5d21c5cbc546390138932a2820 SHA512 a7ae0276e5234d6d428908e1ec74c0b92f2b1b73e37402ad154151c41ef6e4aaaad53e8990d4233d8023c31d919e4ea66f100a82324abcb0e6ffb92283fd3c9e
 DIST traitlets-5.0.2.tar.gz 120788 BLAKE2B 9cb4f7527f97329cefba2b4a581e9208dfeb80fa87d4950373da5b57193179dc94384631eae473c08c23e6631cdcddebcbff991fc2f36dd07eead53b09800c0b SHA512 f92ef784b213b7e29830a4948a6d1bd7eecc928b45ab1fa393e4da85f4603f2236bf27f7f6659f0778fec51f9d82a18cb0fdf5a283fd6edd5de21aec7e5b2579
 DIST traitlets-5.0.3.tar.gz 120885 BLAKE2B 53dfcddf8be609b1150c422f350aabda7056531055dd34c31bae9ee46aa6d16c9f269cfaf3c88c38cdf8e7f23bbb4a8933af3bfc8eeb869749070017fe005307 SHA512 c464fce509601d5ad71d9287f8c21f9386a1b826b141d45f605113c78aca06cd1f6d0adbd80b34dee41b9b8b64d7a020f1ecaeeb633231b1972c6a58aedd6824
+DIST traitlets-5.0.4.tar.gz 124409 BLAKE2B 32aeabb43f70b2d62212c0bbf8c61441890e253ac181a3568eb4c5552d7160f3f4b6b11dc856db731469b91fed0c1666bb7e1d27d66cba47c75c1e2184100f15 SHA512 91389f141d40331cf3c2a43ed8f7d546ed75e9d5fb0c20f64b1535a8ec7a112dce47db69367918b49f4e8527ad938dd67ae4b4657acc404371960c6bcdaef9eb
diff --git a/dev-python/traitlets/traitlets-5.0.4.ebuild b/dev-python/traitlets/traitlets-5.0.4.ebuild
new file mode 100644
index 000000000000..075423d0bfec
--- /dev/null
+++ b/dev-python/traitlets/traitlets-5.0.4.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6,7,8,9} )
+
+inherit distutils-r1
+
+DESCRIPTION="A configuration system for Python applications"
+HOMEPAGE="https://github.com/ipython/traitlets"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+RDEPEND="
+	dev-python/ipython_genutils[${PYTHON_USEDEP}]
+	"
+
+distutils_enable_sphinx docs \
+	dev-python/ipython_genutils
+distutils_enable_tests pytest
diff --git a/dev-python/watchdog/watchdog-0.10.3.ebuild b/dev-python/watchdog/watchdog-0.10.3.ebuild
index 433a07be2ad2..9de679666a6c 100644
--- a/dev-python/watchdog/watchdog-0.10.3.ebuild
+++ b/dev-python/watchdog/watchdog-0.10.3.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python3_{5,6,7,8,9} )
 
-inherit distutils-r1 eutils
+inherit distutils-r1 optfeature
 
 DESCRIPTION="Python API and shell utilities to monitor file system events"
 HOMEPAGE="https://github.com/gorakhargosh/watchdog"
diff --git a/dev-python/watchdog/watchdog-0.8.3-r2.ebuild b/dev-python/watchdog/watchdog-0.8.3-r2.ebuild
index 3442630993dd..06176c949ac8 100644
--- a/dev-python/watchdog/watchdog-0.8.3-r2.ebuild
+++ b/dev-python/watchdog/watchdog-0.8.3-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=5
 
 PYTHON_COMPAT=( python3_{5,6,7,8,9} )
 
-inherit distutils-r1 eutils
+inherit distutils-r1 optfeature
 
 DESCRIPTION="Python API and shell utilities to monitor file system events"
 HOMEPAGE="https://github.com/gorakhargosh/watchdog"