Updating liguros repo

70 files changed, 174 insertions, 68 deletions

diff --git a/dev-python/Rx/Rx-3.1.0.ebuild b/dev-python/Rx/Rx-3.1.0.ebuild
index 70845da4572e..09dbd6dea8ee 100644
--- a/dev-python/Rx/Rx-3.1.0.ebuild
+++ b/dev-python/Rx/Rx-3.1.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+PYTHON_COMPAT=( python3_7 python3_8 python3_9 )
 
 inherit distutils-r1 virtualx
 
diff --git a/dev-python/aniso8601/aniso8601-8.0.0.ebuild b/dev-python/aniso8601/aniso8601-8.0.0.ebuild
index 92e0454b343d..160d472e0c6d 100644
--- a/dev-python/aniso8601/aniso8601-8.0.0.ebuild
+++ b/dev-python/aniso8601/aniso8601-8.0.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+PYTHON_COMPAT=( python3_{7,8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/backports-zoneinfo/backports-zoneinfo-0.2.1-r1.ebuild b/dev-python/backports-zoneinfo/backports-zoneinfo-0.2.1-r1.ebuild
index b9500ef0a97f..786b76bcb95f 100644
--- a/dev-python/backports-zoneinfo/backports-zoneinfo-0.2.1-r1.ebuild
+++ b/dev-python/backports-zoneinfo/backports-zoneinfo-0.2.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+PYTHON_COMPAT=( python3_{7..8} pypy3 )
 inherit distutils-r1
 
 MY_P=${P#backports-}
diff --git a/dev-python/click/click-6.7-r2.ebuild b/dev-python/click/click-6.7-r2.ebuild
index 616368ddb7d1..e6afce4e9b40 100644
--- a/dev-python/click/click-6.7-r2.ebuild
+++ b/dev-python/click/click-6.7-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+PYTHON_COMPAT=( python3_7 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/confuse/confuse-1.0.0.ebuild b/dev-python/confuse/confuse-1.0.0.ebuild
index 24e66a161416..841b45c1474d 100644
--- a/dev-python/confuse/confuse-1.0.0.ebuild
+++ b/dev-python/confuse/confuse-1.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+PYTHON_COMPAT=( python3_7 pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Confuse is a configuration library for Python that uses YAML"
diff --git a/dev-python/cookies/cookies-2.2.1-r1.ebuild b/dev-python/cookies/cookies-2.2.1-r1.ebuild
index b62603c3b42e..fbbc6fcdcd2b 100644
--- a/dev-python/cookies/cookies-2.2.1-r1.ebuild
+++ b/dev-python/cookies/cookies-2.2.1-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+PYTHON_COMPAT=(python3_{7..9} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/django-mptt/django-mptt-0.11.0.ebuild b/dev-python/django-mptt/django-mptt-0.11.0.ebuild
index c289a261883c..ddc9ff0d783a 100644
--- a/dev-python/django-mptt/django-mptt-0.11.0.ebuild
+++ b/dev-python/django-mptt/django-mptt-0.11.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{3..9} )
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
 inherit distutils-r1
 
 DESCRIPTION="utilities for modified preorder tree traversal and trees of model instances"
diff --git a/dev-python/feedparser/feedparser-5.2.1.ebuild b/dev-python/feedparser/feedparser-5.2.1.ebuild
index 31a48074e7a0..96ba7d59bf02 100644
--- a/dev-python/feedparser/feedparser-5.2.1.ebuild
+++ b/dev-python/feedparser/feedparser-5.2.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+PYTHON_COMPAT=( python3_{7,8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/flask-sphinx-themes/flask-sphinx-themes-1.0.2.ebuild b/dev-python/flask-sphinx-themes/flask-sphinx-themes-1.0.2.ebuild
index 173c67d83c83..703da0f0d646 100644
--- a/dev-python/flask-sphinx-themes/flask-sphinx-themes-1.0.2.ebuild
+++ b/dev-python/flask-sphinx-themes/flask-sphinx-themes-1.0.2.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 MY_PN="Flask-Sphinx-Themes"
 MY_P="${MY_PN}-${PV}"
 
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+PYTHON_COMPAT=( pypy3 python3_{7,8} )
 inherit distutils-r1
 
 DESCRIPTION="Sphinx Themes for Flask related projects and Flask itself"
diff --git a/dev-python/flask/flask-9999.ebuild b/dev-python/flask/flask-9999.ebuild
index 5ae9e0a17250..caf60a91263f 100644
--- a/dev-python/flask/flask-9999.ebuild
+++ b/dev-python/flask/flask-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+PYTHON_COMPAT=( python3_{7,8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/flexmock/flexmock-0.10.4.ebuild b/dev-python/flexmock/flexmock-0.10.4.ebuild
index c48d74943bb1..b93e57f3ca2d 100644
--- a/dev-python/flexmock/flexmock-0.10.4.ebuild
+++ b/dev-python/flexmock/flexmock-0.10.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+PYTHON_COMPAT=( python3_{7,8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/flit/flit-2.1.0.ebuild b/dev-python/flit/flit-2.1.0.ebuild
index 4172e3dcd80f..2b61057002d7 100644
--- a/dev-python/flit/flit-2.1.0.ebuild
+++ b/dev-python/flit/flit-2.1.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+PYTHON_COMPAT=( python3_{7,8} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Simplified packaging of Python modules"
diff --git a/dev-python/flit_core/flit_core-2.1.0.ebuild b/dev-python/flit_core/flit_core-2.1.0.ebuild
index 5d78c2b853ec..4a9289a30439 100644
--- a/dev-python/flit_core/flit_core-2.1.0.ebuild
+++ b/dev-python/flit_core/flit_core-2.1.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+PYTHON_COMPAT=( python3_{7,8} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Simplified packaging of Python modules (core module)"
diff --git a/dev-python/frozen-flask/frozen-flask-0.15.ebuild b/dev-python/frozen-flask/frozen-flask-0.15.ebuild
index 7e68700374cb..5a8fc84b7cc4 100644
--- a/dev-python/frozen-flask/frozen-flask-0.15.ebuild
+++ b/dev-python/frozen-flask/frozen-flask-0.15.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+PYTHON_COMPAT=( pypy3 python3_{7,8} )
 
 inherit distutils-r1
 
diff --git a/dev-python/fuse-python/fuse-python-1.0.0.ebuild b/dev-python/fuse-python/fuse-python-1.0.0.ebuild
index 6315255f9600..a17648067701 100644
--- a/dev-python/fuse-python/fuse-python-1.0.0.ebuild
+++ b/dev-python/fuse-python/fuse-python-1.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+PYTHON_COMPAT=( python3_{7,8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/genshi/genshi-0.7.3-r1.ebuild b/dev-python/genshi/genshi-0.7.3-r1.ebuild
index 7d1bbad6d9ae..1fdfad175123 100644
--- a/dev-python/genshi/genshi-0.7.3-r1.ebuild
+++ b/dev-python/genshi/genshi-0.7.3-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+PYTHON_COMPAT=( python3_{7,8} pypy3 )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 inherit distutils-r1
 
diff --git a/dev-python/geoip-python/geoip-python-1.3.2-r1.ebuild b/dev-python/geoip-python/geoip-python-1.3.2-r1.ebuild
index cb3c41df42d9..04f3cb2e12c9 100644
--- a/dev-python/geoip-python/geoip-python-1.3.2-r1.ebuild
+++ b/dev-python/geoip-python/geoip-python-1.3.2-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+PYTHON_COMPAT=( python3_{7,8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/gitdb/gitdb-4.0.5.ebuild b/dev-python/gitdb/gitdb-4.0.5-r1.ebuild
index 76de7127cc46..ce250d332f5e 100644
--- a/dev-python/gitdb/gitdb-4.0.5.ebuild
+++ b/dev-python/gitdb/gitdb-4.0.5-r1.ebuild
@@ -26,6 +26,13 @@ BDEPEND="
 
 distutils_enable_tests nose
 
+src_prepare() {
+	# remove unnecessary version restriction
+	# https://github.com/gitpython-developers/gitdb/issues/67
+	sed -i -e '/smmap/s:,<4::' setup.py || die
+	distutils-r1_src_prepare
+}
+
 src_test() {
 	local i
 
diff --git a/dev-python/importlib_metadata/importlib_metadata-3.3.0.ebuild b/dev-python/importlib_metadata/importlib_metadata-3.3.0.ebuild
index d692c07b3f1b..b862beef9042 100644
--- a/dev-python/importlib_metadata/importlib_metadata-3.3.0.ebuild
+++ b/dev-python/importlib_metadata/importlib_metadata-3.3.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 # Included in Python >= 3.8
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+PYTHON_COMPAT=( pypy3 python3_{7,8} )
 
 inherit distutils-r1
 
diff --git a/dev-python/importlib_metadata/importlib_metadata-3.4.0.ebuild b/dev-python/importlib_metadata/importlib_metadata-3.4.0.ebuild
index 8b2843259c48..753f44d0b774 100644
--- a/dev-python/importlib_metadata/importlib_metadata-3.4.0.ebuild
+++ b/dev-python/importlib_metadata/importlib_metadata-3.4.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 # Included in Python >= 3.8
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+PYTHON_COMPAT=( pypy3 python3_{7,8} )
 
 inherit distutils-r1
 
diff --git a/dev-python/importlib_resources/importlib_resources-3.3.0.ebuild b/dev-python/importlib_resources/importlib_resources-3.3.0.ebuild
index ca933d3c5d24..e24612a4b344 100644
--- a/dev-python/importlib_resources/importlib_resources-3.3.0.ebuild
+++ b/dev-python/importlib_resources/importlib_resources-3.3.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 # This is a backport of Python 3.9's importlib.resources
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+PYTHON_COMPAT=( pypy3 python3_{7,8} )
 
 inherit distutils-r1
 
diff --git a/dev-python/importlib_resources/importlib_resources-4.1.1.ebuild b/dev-python/importlib_resources/importlib_resources-4.1.1.ebuild
index 0f342f744d6e..8edb5b33d3f0 100644
--- a/dev-python/importlib_resources/importlib_resources-4.1.1.ebuild
+++ b/dev-python/importlib_resources/importlib_resources-4.1.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 # This is a backport of Python 3.9's importlib.resources
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+PYTHON_COMPAT=( pypy3 python3_{7,8} )
 
 inherit distutils-r1
 
diff --git a/dev-python/importlib_resources/importlib_resources-5.0.0.ebuild b/dev-python/importlib_resources/importlib_resources-5.0.0.ebuild
index c96fbe4d7788..680eb6ca1ff1 100644
--- a/dev-python/importlib_resources/importlib_resources-5.0.0.ebuild
+++ b/dev-python/importlib_resources/importlib_resources-5.0.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 # This is a backport of Python 3.9's importlib.resources
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+PYTHON_COMPAT=( pypy3 python3_{7,8} )
 
 inherit distutils-r1
 
diff --git a/dev-python/importlib_resources/importlib_resources-5.1.0.ebuild b/dev-python/importlib_resources/importlib_resources-5.1.0.ebuild
index c96fbe4d7788..680eb6ca1ff1 100644
--- a/dev-python/importlib_resources/importlib_resources-5.1.0.ebuild
+++ b/dev-python/importlib_resources/importlib_resources-5.1.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 # This is a backport of Python 3.9's importlib.resources
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+PYTHON_COMPAT=( pypy3 python3_{7,8} )
 
 inherit distutils-r1
 
diff --git a/dev-python/intreehooks/intreehooks-1.0.ebuild b/dev-python/intreehooks/intreehooks-1.0.ebuild
index d58744ea19b3..b4757923117b 100644
--- a/dev-python/intreehooks/intreehooks-1.0.ebuild
+++ b/dev-python/intreehooks/intreehooks-1.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+PYTHON_COMPAT=( python3_{7,8} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Load a PEP 517 backend from inside the source tree"
diff --git a/dev-python/isort/isort-4.3.21_p2-r1.ebuild b/dev-python/isort/isort-4.3.21_p2-r1.ebuild
index b67b15bae157..c07bf368c128 100644
--- a/dev-python/isort/isort-4.3.21_p2-r1.ebuild
+++ b/dev-python/isort/isort-4.3.21_p2-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+PYTHON_COMPAT=( python3_{7,8} pypy3 )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
diff --git a/dev-python/jsonpickle/Manifest b/dev-python/jsonpickle/Manifest
index 4fc4056dcef2..72dea35f4f5e 100644
--- a/dev-python/jsonpickle/Manifest
+++ b/dev-python/jsonpickle/Manifest
@@ -1,2 +1,3 @@
 DIST jsonpickle-1.4.2.tar.gz 104745 BLAKE2B af12141c867cd3dbecace5b7bc637b554c51c245d4f584c4d94e73e694b74f66fc59a65a62b7a0af361a7a8010b9398a9b04ee838c4f76c168b21dba6f2c9542 SHA512 a6da661a69daefbc9393a4a4c88aa1da1b8bd687b6eeaed3d833ce1683bd1fa9d7943fdeecfe927e0492945ee2910b6f2d5e53ddb2b928b21f7b099ab79d45e9
 DIST jsonpickle-1.5.0.tar.gz 106088 BLAKE2B dcd35979a428180f10611638c831b083d9b8307729a0b19fe89b283c30ecac58477bd6a66e89c31e214dd2f100385d9933dc00d506e1f9bbb4b6ea9c3a0eaed3 SHA512 7828ded98173cb10908a9d60fa6b3f358add360d738cd85a90f012ca24b15c6bbb19c611027bdb0a4d25fe0649978ae59ff08fb7b717ef503a9916152aa6f849
+DIST jsonpickle-1.5.1.tar.gz 109560 BLAKE2B 07dd2a469f0bf6fe531d34b5f2d731c6aca863899ce804f44c14b38f93b8c8213b1bf4fc4cc19dc26dcb40d71bfded1115060e54570742afd393bd0d63f12d2d SHA512 ee3694e961bfbb6cc985691fb4821cf831dd6a2cbbdc8c6d1ba8e43fe7a4bba3d4b6868a02f76b88d9b036cebf51b217171504a6647f26b0e2d11727baee62f3
diff --git a/dev-python/jsonpickle/jsonpickle-1.5.1.ebuild b/dev-python/jsonpickle/jsonpickle-1.5.1.ebuild
new file mode 100644
index 000000000000..bd97bac2b6d5
--- /dev/null
+++ b/dev-python/jsonpickle/jsonpickle-1.5.1.ebuild
@@ -0,0 +1,49 @@
+# 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} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+inherit distutils-r1
+
+DESCRIPTION="Python library for serializing any arbitrary object graph into JSON"
+HOMEPAGE="https://github.com/jsonpickle/jsonpickle/ https://pypi.org/project/jsonpickle/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+# There are optional json backends serializer/deserializers in addition to those selected here
+# jsonlib, yajl.
+RDEPEND="
+	dev-python/simplejson[${PYTHON_USEDEP}]
+	dev-python/feedparser[${PYTHON_USEDEP}]
+	dev-python/ujson[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/importlib_metadata[${PYTHON_USEDEP}]
+	' python3_{6,7})
+"
+# toml via setuptools_scm[toml]
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]"
+
+distutils_enable_sphinx "docs/source"
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# too many dependencies
+	rm tests/pandas_test.py || die
+	# broken with gmpy
+	rm tests/ecdsa_test.py || die
+
+	sed -i -e 's:--flake8 --black --cov --cov-append::' pytest.ini || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	pytest -vv tests || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/kaptan/kaptan-0.5.12-r1.ebuild b/dev-python/kaptan/kaptan-0.5.12-r1.ebuild
index 002874667617..b3b88c26ac31 100644
--- a/dev-python/kaptan/kaptan-0.5.12-r1.ebuild
+++ b/dev-python/kaptan/kaptan-0.5.12-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+PYTHON_COMPAT=( python3_{7,8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/llfuse/llfuse-1.3.6.ebuild b/dev-python/llfuse/llfuse-1.3.6.ebuild
index 91170e085e5b..136a8c48f864 100644
--- a/dev-python/llfuse/llfuse-1.3.6.ebuild
+++ b/dev-python/llfuse/llfuse-1.3.6.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+PYTHON_COMPAT=( python3_{7,8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/markdown/markdown-2.6.11.ebuild b/dev-python/markdown/markdown-2.6.11.ebuild
index dd254d75d849..1879cab8d47b 100644
--- a/dev-python/markdown/markdown-2.6.11.ebuild
+++ b/dev-python/markdown/markdown-2.6.11.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+PYTHON_COMPAT=( python3_7 python3_8 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/mccabe/mccabe-0.6.1-r1.ebuild b/dev-python/mccabe/mccabe-0.6.1-r1.ebuild
index bdbbae5427fe..9bc59da97a58 100644
--- a/dev-python/mccabe/mccabe-0.6.1-r1.ebuild
+++ b/dev-python/mccabe/mccabe-0.6.1-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+PYTHON_COMPAT=( python3_{7,8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/ndg-httpsclient/ndg-httpsclient-0.5.1.ebuild b/dev-python/ndg-httpsclient/ndg-httpsclient-0.5.1.ebuild
index 66c4fe6e9c87..993e675f7783 100644
--- a/dev-python/ndg-httpsclient/ndg-httpsclient-0.5.1.ebuild
+++ b/dev-python/ndg-httpsclient/ndg-httpsclient-0.5.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+PYTHON_COMPAT=( python3_{7,8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/nose-exclude/nose-exclude-0.5.0-r1.ebuild b/dev-python/nose-exclude/nose-exclude-0.5.0-r1.ebuild
index 8fb949dd3483..7c1729f4a570 100644
--- a/dev-python/nose-exclude/nose-exclude-0.5.0-r1.ebuild
+++ b/dev-python/nose-exclude/nose-exclude-0.5.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+PYTHON_COMPAT=( python3_{7,8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/nose_fixes/nose_fixes-1.3.ebuild b/dev-python/nose_fixes/nose_fixes-1.3.ebuild
index e9238bb31c05..75ea4bb0fdbd 100644
--- a/dev-python/nose_fixes/nose_fixes-1.3.ebuild
+++ b/dev-python/nose_fixes/nose_fixes-1.3.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+PYTHON_COMPAT=( python3_{7,8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/packaging/packaging-20.7.ebuild b/dev-python/packaging/packaging-20.7.ebuild
index e5ff1a92ffc9..8b2f0a089a5c 100644
--- a/dev-python/packaging/packaging-20.7.ebuild
+++ b/dev-python/packaging/packaging-20.7.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+PYTHON_COMPAT=( python3_{7..9} pypy3  )
 
 inherit distutils-r1
 
diff --git a/dev-python/packaging/packaging-20.8.ebuild b/dev-python/packaging/packaging-20.8.ebuild
index 5bd4270ae15e..eddb0fab710f 100644
--- a/dev-python/packaging/packaging-20.8.ebuild
+++ b/dev-python/packaging/packaging-20.8.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+PYTHON_COMPAT=( python3_{7..9} pypy3  )
 
 inherit distutils-r1
 
diff --git a/dev-python/pep8/pep8-1.7.1.ebuild b/dev-python/pep8/pep8-1.7.1.ebuild
index c7ac8aaa79fa..638b86656ec8 100644
--- a/dev-python/pep8/pep8-1.7.1.ebuild
+++ b/dev-python/pep8/pep8-1.7.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+PYTHON_COMPAT=( python3_{7,8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pikepdf/Manifest b/dev-python/pikepdf/Manifest
index 2ad12cb43f55..730eae189ced 100644
--- a/dev-python/pikepdf/Manifest
+++ b/dev-python/pikepdf/Manifest
@@ -3,3 +3,4 @@ DIST pikepdf-2.2.0.tar.gz 2363761 BLAKE2B d1a8873a2c41e280dc2880609424742f4454ee
 DIST pikepdf-2.3.0.tar.gz 2366792 BLAKE2B 3e5d2f460702bbce8ddc22abfb67867b40f75bb59cd30966db9865c96240ef9ad990f295abcd8f5f325a9954500e587afab647da7de3909960859fa3825c4526 SHA512 056bd2e73a7915b42ea170061932e445fff614abd662d935c8735c5fb04fd95e196495bc11dcb3781270c966d94cb93cd972500e6ea4d3ea7333456be3b7dbb6
 DIST pikepdf-2.4.0.tar.gz 2367657 BLAKE2B c6b126f45baef8d3d4bea40851650f6ee2196e60618f490952f74491744b6536a01040de685c5114ec5aad2e8923092498594ae28b9e9f14f2da579816a198e0 SHA512 42af99ed5446171449d46d4dabf444623ce22b81819bbef992735e67a58ed82e343b46779f323b96b35e076014464e50ac0e4f5fd3553482c750488e091b6fd5
 DIST pikepdf-2.5.0.tar.gz 2368422 BLAKE2B c30fcd69dd5297b04c0b116355f14a8513ce0a0b8797f3d85672957302275bdb04b382a373d07d40ef3480dc395e51a899eda8e919a74070083fec0209dfaa3c SHA512 0c685985b17388a8d355486a5dc2ee5f4d855f1247977d96dd249744cea347f575770250b1a952fda7821a3f4c830d5e079e15642bc669b70f69f4f2c5bf4dae
+DIST pikepdf-2.5.1.tar.gz 2368435 BLAKE2B 19def787013c5ee027a1477fe77dc38d10f1b8f6678f92afe0a7b3fc8e696e12926a80b2034e780c1fd05033ecf2facd6caeefc9062548648f64b0774754f9d5 SHA512 ba514f9a713d1e322224d9e6cb81df3bb399ecf1d54449e7fa171e59ce39bae25564752cfff97a93e2c3674f540cf2143f5ab4ac9dff928c1dfe77415db9dcc1
diff --git a/dev-python/pikepdf/pikepdf-2.5.1.ebuild b/dev-python/pikepdf/pikepdf-2.5.1.ebuild
new file mode 100644
index 000000000000..6a19c07407cb
--- /dev/null
+++ b/dev-python/pikepdf/pikepdf-2.5.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+inherit distutils-r1
+
+DESCRIPTION="Python library to work with pdf files based on qpdf"
+HOMEPAGE="https://pypi.org/project/pikepdf/ https://github.com/pikepdf/pikepdf"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="app-text/qpdf:0="
+RDEPEND="${DEPEND}
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/pybind11[${PYTHON_USEDEP}]"
+BDEPEND="
+	>=dev-python/pybind11-2.6.0[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-4.1[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/attrs-20.2.0[${PYTHON_USEDEP}]
+		>=dev-python/hypothesis-5[${PYTHON_USEDEP}]
+		>=dev-python/pillow-5.0.0[${PYTHON_USEDEP},jpeg,lcms,tiff]
+		>=dev-python/psutil-5[${PYTHON_USEDEP}]
+		>=dev-python/pytest-6[${PYTHON_USEDEP}]
+		>=dev-python/pytest-timeout-1.4.2[${PYTHON_USEDEP}]
+		>=dev-python/python-dateutil-2.8.0[${PYTHON_USEDEP}]
+		>=dev-python/python-xmp-toolkit-2.0.1[${PYTHON_USEDEP}]
+	)"
+
+#distutils_enable_sphinx docs \
+#	dev-python/ipython \
+#	dev-python/matplotlib \
+#	dev-python/sphinx_rtd_theme
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/wheel/d' setup.py || die
+	sed -i -e '/-n auto/d' setup.cfg || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/pipfile/pipfile-0.0.2.ebuild b/dev-python/pipfile/pipfile-0.0.2.ebuild
index 7c914fc3c192..43b2d14b10c8 100644
--- a/dev-python/pipfile/pipfile-0.0.2.ebuild
+++ b/dev-python/pipfile/pipfile-0.0.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+PYTHON_COMPAT=( python3_{7,8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/progressbar2/progressbar2-3.39.3.ebuild b/dev-python/progressbar2/progressbar2-3.39.3.ebuild
index 2e6c209fc556..3a77ce10e11e 100644
--- a/dev-python/progressbar2/progressbar2-3.39.3.ebuild
+++ b/dev-python/progressbar2/progressbar2-3.39.3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+PYTHON_COMPAT=( python3_7 pypy3)
 
 inherit distutils-r1
 
diff --git a/dev-python/progressbar2/progressbar2-3.53.1.ebuild b/dev-python/progressbar2/progressbar2-3.53.1.ebuild
index d6a2b1f7023b..987ee7125a54 100644
--- a/dev-python/progressbar2/progressbar2-3.53.1.ebuild
+++ b/dev-python/progressbar2/progressbar2-3.53.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+PYTHON_COMPAT=( python3_{7,8,9} pypy3)
 
 inherit distutils-r1
 
diff --git a/dev-python/py-cpuinfo/py-cpuinfo-6.0.0.ebuild b/dev-python/py-cpuinfo/py-cpuinfo-6.0.0.ebuild
index bda8b9b12a6c..11b0f808436a 100644
--- a/dev-python/py-cpuinfo/py-cpuinfo-6.0.0.ebuild
+++ b/dev-python/py-cpuinfo/py-cpuinfo-6.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+PYTHON_COMPAT=( python3_{7,8} pypy3 )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
diff --git a/dev-python/pydns/pydns-3.2.1.ebuild b/dev-python/pydns/pydns-3.2.1.ebuild
index 9c2f8d8f42ff..1b8664d23900 100644
--- a/dev-python/pydns/pydns-3.2.1.ebuild
+++ b/dev-python/pydns/pydns-3.2.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+PYTHON_COMPAT=( python3_{7,8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pygments-github-lexers/pygments-github-lexers-0.0.5.ebuild b/dev-python/pygments-github-lexers/pygments-github-lexers-0.0.5.ebuild
index dae032be7aba..1bdbafc3b73b 100644
--- a/dev-python/pygments-github-lexers/pygments-github-lexers-0.0.5.ebuild
+++ b/dev-python/pygments-github-lexers/pygments-github-lexers-0.0.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+PYTHON_COMPAT=( python3_{7,8} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Pygments Github custom lexers"
diff --git a/dev-python/pymdstat/pymdstat-0.4.2-r1.ebuild b/dev-python/pymdstat/pymdstat-0.4.2-r1.ebuild
index 7ac9d5be4409..922b5a782c2e 100644
--- a/dev-python/pymdstat/pymdstat-0.4.2-r1.ebuild
+++ b/dev-python/pymdstat/pymdstat-0.4.2-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+PYTHON_COMPAT=( python3_{7,8} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Python library to parse Linux /proc/mdstat"
diff --git a/dev-python/pynput/pynput-1.6.8.ebuild b/dev-python/pynput/pynput-1.6.8.ebuild
index 29446f72b565..b3d5eec8d052 100644
--- a/dev-python/pynput/pynput-1.6.8.ebuild
+++ b/dev-python/pynput/pynput-1.6.8.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pynput/pynput-9999.ebuild b/dev-python/pynput/pynput-9999.ebuild
index 29446f72b565..b3d5eec8d052 100644
--- a/dev-python/pynput/pynput-9999.ebuild
+++ b/dev-python/pynput/pynput-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyroute2/pyroute2-0.5.14.ebuild b/dev-python/pyroute2/pyroute2-0.5.14.ebuild
index 41ff15adce53..f507fc5937e3 100644
--- a/dev-python/pyroute2/pyroute2-0.5.14.ebuild
+++ b/dev-python/pyroute2/pyroute2-0.5.14.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+PYTHON_COMPAT=( python3_{7,8} pypy3 )
 PYTHON_REQ_USE="sqlite"
 DISTUTILS_USE_SETUPTOOLS=bdepend
 
diff --git a/dev-python/pytest-flakes/pytest-flakes-4.0.0.ebuild b/dev-python/pytest-flakes/pytest-flakes-4.0.0.ebuild
index 8888bc8aab16..a52d77a892a1 100644
--- a/dev-python/pytest-flakes/pytest-flakes-4.0.0.ebuild
+++ b/dev-python/pytest-flakes/pytest-flakes-4.0.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+PYTHON_COMPAT=( python3_7 pypy3)
 
 inherit distutils-r1
 
diff --git a/dev-python/pytest-html/pytest-html-1.22.1.ebuild b/dev-python/pytest-html/pytest-html-1.22.1.ebuild
index 05fbf27923a2..ff9bd0ca538c 100644
--- a/dev-python/pytest-html/pytest-html-1.22.1.ebuild
+++ b/dev-python/pytest-html/pytest-html-1.22.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+PYTHON_COMPAT=( python3_{7,8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pytest-metadata/pytest-metadata-1.8.0.ebuild b/dev-python/pytest-metadata/pytest-metadata-1.8.0.ebuild
index ceeeff34e36b..827d83d29123 100644
--- a/dev-python/pytest-metadata/pytest-metadata-1.8.0.ebuild
+++ b/dev-python/pytest-metadata/pytest-metadata-1.8.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+PYTHON_COMPAT=( python3_{7,8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pytest-pep8/pytest-pep8-1.0.6-r1.ebuild b/dev-python/pytest-pep8/pytest-pep8-1.0.6-r1.ebuild
index c85be1d0ba15..77735214b848 100644
--- a/dev-python/pytest-pep8/pytest-pep8-1.0.6-r1.ebuild
+++ b/dev-python/pytest-pep8/pytest-pep8-1.0.6-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+PYTHON_COMPAT=( python3_{7,8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-engineio/python-engineio-3.12.1.ebuild b/dev-python/python-engineio/python-engineio-3.12.1.ebuild
index 2c42d2ef6c10..4a1a14896bc0 100644
--- a/dev-python/python-engineio/python-engineio-3.12.1.ebuild
+++ b/dev-python/python-engineio/python-engineio-3.12.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+PYTHON_COMPAT=( python3_{7,8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pythondialog/pythondialog-3.5.1.ebuild b/dev-python/pythondialog/pythondialog-3.5.1.ebuild
index 614e106d9970..e5dbb2e1349c 100644
--- a/dev-python/pythondialog/pythondialog-3.5.1.ebuild
+++ b/dev-python/pythondialog/pythondialog-3.5.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+PYTHON_COMPAT=( python3_{7,8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/requests_download/requests_download-0.1.2.ebuild b/dev-python/requests_download/requests_download-0.1.2.ebuild
index 970d4491eed9..abb6b24f1a7a 100644
--- a/dev-python/requests_download/requests_download-0.1.2.ebuild
+++ b/dev-python/requests_download/requests_download-0.1.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+PYTHON_COMPAT=( python3_{7,8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/slimit/slimit-0.8.1-r1.ebuild b/dev-python/slimit/slimit-0.8.1-r1.ebuild
index 2fe4b32618a5..adb879571797 100644
--- a/dev-python/slimit/slimit-0.8.1-r1.ebuild
+++ b/dev-python/slimit/slimit-0.8.1-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+PYTHON_COMPAT=( pypy3 python3_{7,8} )
 
 inherit distutils-r1
 
diff --git a/dev-python/sphinx/sphinx-2.4.4.ebuild b/dev-python/sphinx/sphinx-2.4.4.ebuild
index f1060a33d3cb..c2dcbe44b681 100644
--- a/dev-python/sphinx/sphinx-2.4.4.ebuild
+++ b/dev-python/sphinx/sphinx-2.4.4.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+PYTHON_COMPAT=( python3_{7,8} pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
diff --git a/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.2.4.ebuild b/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.2.4.ebuild
index f5c69e54461d..5796929cce7a 100644
--- a/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.2.4.ebuild
+++ b/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.2.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+PYTHON_COMPAT=( python3_{7,8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/statsd/statsd-3.3.0.ebuild b/dev-python/statsd/statsd-3.3.0.ebuild
index aedc567b7278..765b443d8dfb 100644
--- a/dev-python/statsd/statsd-3.3.0.ebuild
+++ b/dev-python/statsd/statsd-3.3.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+PYTHON_COMPAT=( python3_{7,8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/stestr/stestr-2.1.0-r1.ebuild b/dev-python/stestr/stestr-2.1.0-r1.ebuild
index 748a9c5c5d38..420e4cdb2d60 100644
--- a/dev-python/stestr/stestr-2.1.0-r1.ebuild
+++ b/dev-python/stestr/stestr-2.1.0-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+PYTHON_COMPAT=(  python3_7 python3_8 )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
diff --git a/dev-python/stripe/stripe-2.46.0.ebuild b/dev-python/stripe/stripe-2.46.0.ebuild
index b7d58578aba2..db8cfe23a401 100644
--- a/dev-python/stripe/stripe-2.46.0.ebuild
+++ b/dev-python/stripe/stripe-2.46.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+PYTHON_COMPAT=( python3_{7,8} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Stripe python bindings"
diff --git a/dev-python/sudsds/metadata.xml b/dev-python/sudsds/metadata.xml
index a56745df0223..c4e7a7e3d49d 100644
--- a/dev-python/sudsds/metadata.xml
+++ b/dev-python/sudsds/metadata.xml
@@ -8,5 +8,5 @@
 	<longdescription lang="en">
 		A lightweight SOAP python client for consuming Web Services. Czech NIC labs fork.
 	</longdescription>
-	<origin>kit-fixups</origin>
+	<origin>calculatelinux-overlay</origin>
 </pkgmetadata>
diff --git a/dev-python/sudsds/sudsds-1.0.1-r1.ebuild b/dev-python/sudsds/sudsds-1.0.1-r2.ebuild
index 054a9f5306c4..3f8cc35cdc97 100644
--- a/dev-python/sudsds/sudsds-1.0.1-r1.ebuild
+++ b/dev-python/sudsds/sudsds-1.0.1-r2.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 PYTHON_COMPAT=( python2_7 python3_{6,7,8,9,10} )
 
+DISTUTILS_USE_SETUPTOOLS=manual
 inherit distutils-r1
 
 DESCRIPTION="Lightweight SOAP client - Czech NIC labs fork"
@@ -16,5 +17,5 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="doc"
 
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
+DEPEND="dev-python/setuptools-python2[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
diff --git a/dev-python/test_server/test_server-0.0.31.ebuild b/dev-python/test_server/test_server-0.0.31.ebuild
index 441fa5621204..720653069947 100644
--- a/dev-python/test_server/test_server-0.0.31.ebuild
+++ b/dev-python/test_server/test_server-0.0.31.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+PYTHON_COMPAT=( python3_{7,8} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Server to test HTTP clients"
diff --git a/dev-python/testrepository/testrepository-0.0.20.ebuild b/dev-python/testrepository/testrepository-0.0.20.ebuild
index 8c7e4a941379..aa9c278a1339 100644
--- a/dev-python/testrepository/testrepository-0.0.20.ebuild
+++ b/dev-python/testrepository/testrepository-0.0.20.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+PYTHON_COMPAT=( python3_{7,8} pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
diff --git a/dev-python/whisper/whisper-1.1.5.ebuild b/dev-python/whisper/whisper-1.1.5.ebuild
index 405f0839824e..f069fad70b1b 100644
--- a/dev-python/whisper/whisper-1.1.5.ebuild
+++ b/dev-python/whisper/whisper-1.1.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+PYTHON_COMPAT=( pypy3 python3_{7,8} )
 
 inherit distutils-r1
 
diff --git a/dev-python/xmltodict/xmltodict-0.12.0-r1.ebuild b/dev-python/xmltodict/xmltodict-0.12.0-r1.ebuild
index ded1fd7c2e00..1e892b3469a8 100644
--- a/dev-python/xmltodict/xmltodict-0.12.0-r1.ebuild
+++ b/dev-python/xmltodict/xmltodict-0.12.0-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+PYTHON_COMPAT=( python3_{7..9} pypy3  )
 
 inherit distutils-r1
 
diff --git a/dev-python/zope-deprecation/zope-deprecation-4.4.0.ebuild b/dev-python/zope-deprecation/zope-deprecation-4.4.0.ebuild
index 693eaab6dafd..cf10756b9567 100644
--- a/dev-python/zope-deprecation/zope-deprecation-4.4.0.ebuild
+++ b/dev-python/zope-deprecation/zope-deprecation-4.4.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+PYTHON_COMPAT=( python3_{7..8} pypy3 )
 
 inherit distutils-r1