Updating liguros repo

64 files changed, 90 insertions, 92 deletions

diff --git a/dev-python/HeapDict/HeapDict-1.0.0.ebuild b/dev-python/HeapDict/HeapDict-1.0.0.ebuild
index f7cd069ae4d5..c54ef8a5e207 100644
--- a/dev-python/HeapDict/HeapDict-1.0.0.ebuild
+++ b/dev-python/HeapDict/HeapDict-1.0.0.ebuild
@@ -2,6 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=bdepend
 PYTHON_COMPAT=( python3_{5,6,7,8,9} )
 
 inherit distutils-r1
@@ -13,7 +15,3 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=""
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/PyContracts/PyContracts-1.8.14-r1.ebuild b/dev-python/PyContracts/PyContracts-1.8.14-r1.ebuild
index a5c1d5f14229..cc654136ca91 100644
--- a/dev-python/PyContracts/PyContracts-1.8.14-r1.ebuild
+++ b/dev-python/PyContracts/PyContracts-1.8.14-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-DISTUTILS_USE_SETUPTOOLS=rdepend
+DISTUTILS_USE_SETUPTOOLS=bdepend
 PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
 
 inherit distutils-r1
diff --git a/dev-python/PyUtilib/PyUtilib-5.7.2.ebuild b/dev-python/PyUtilib/PyUtilib-5.7.2.ebuild
index 6355b8a6163d..f7036e5b2420 100644
--- a/dev-python/PyUtilib/PyUtilib-5.7.2.ebuild
+++ b/dev-python/PyUtilib/PyUtilib-5.7.2.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python3_{5,6,7,8,9} )
 DISTUTILS_IN_SOURCE_BUILD=1
 
diff --git a/dev-python/alabaster/alabaster-0.7.12.ebuild b/dev-python/alabaster/alabaster-0.7.12.ebuild
index a0d93233af7e..0eaa907a72c6 100644
--- a/dev-python/alabaster/alabaster-0.7.12.ebuild
+++ b/dev-python/alabaster/alabaster-0.7.12.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
-DISTUTILS_USE_SETUPTOOLS=rdepend
+DISTUTILS_USE_SETUPTOOLS=bdepend
 
 inherit distutils-r1
 
diff --git a/dev-python/alembic/alembic-1.4.2.ebuild b/dev-python/alembic/alembic-1.4.2.ebuild
index 1339c39ced6c..affdccc65635 100644
--- a/dev-python/alembic/alembic-1.4.2.ebuild
+++ b/dev-python/alembic/alembic-1.4.2.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python3_{5,6,7,8,9} )
 inherit distutils-r1
 
@@ -20,7 +21,7 @@ RDEPEND=">=dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
 	dev-python/mako[${PYTHON_USEDEP}]
 	>=dev-python/python-editor-0.3[${PYTHON_USEDEP}]
 	dev-python/python-dateutil[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+DEPEND="
 	test? ( ${RDEPEND}
 		dev-python/pytest[${PYTHON_USEDEP}]
 		dev-python/nose[${PYTHON_USEDEP}]
diff --git a/dev-python/betamax/betamax-0.8.1.ebuild b/dev-python/betamax/betamax-0.8.1.ebuild
index 0c5b142be805..20375aca8738 100644
--- a/dev-python/betamax/betamax-0.8.1.ebuild
+++ b/dev-python/betamax/betamax-0.8.1.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-DISTUTILS_USE_SETUPTOOLS=rdepend
+
+DISTUTILS_USE_SETUPTOOLS=bdepend
 PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
 
 inherit distutils-r1
diff --git a/dev-python/blurb/blurb-1.0.7.ebuild b/dev-python/blurb/blurb-1.0.7.ebuild
index 415e3ed5e55f..8799f5751e69 100644
--- a/dev-python/blurb/blurb-1.0.7.ebuild
+++ b/dev-python/blurb/blurb-1.0.7.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python3_{5,6,7,8,9} )
 inherit distutils-r1
 
@@ -14,9 +15,6 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
 PATCHES=(
 	"${FILESDIR}/blurb-setuptools.patch"
 )
diff --git a/dev-python/celery/celery-4.3.0.ebuild b/dev-python/celery/celery-4.3.0.ebuild
index 3d341847d02a..a86dcc61bf36 100644
--- a/dev-python/celery/celery-4.3.0.ebuild
+++ b/dev-python/celery/celery-4.3.0.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python3_{5,6,7,8,9} )
 
 inherit bash-completion-r1 distutils-r1 optfeature
@@ -32,7 +33,6 @@ RDEPEND="
 "
 
 DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? ( ${RDEPEND}
 		>=dev-python/case-1.3.1[${PYTHON_USEDEP}]
 		>=dev-python/eventlet-0.24.1[${PYTHON_USEDEP}]
diff --git a/dev-python/cheetah3/cheetah3-3.2.4.ebuild b/dev-python/cheetah3/cheetah3-3.2.4.ebuild
index 962419b5793d..1d00a9fb98bf 100644
--- a/dev-python/cheetah3/cheetah3-3.2.4.ebuild
+++ b/dev-python/cheetah3/cheetah3-3.2.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 PYTHON_COMPAT=( python3_{5,6,7,8,9} )
-DISTUTILS_USE_SETUPTOOLS=no
+DISTUTILS_USE_SETUPTOOLS=bdepend
 inherit distutils-r1
 
 DESCRIPTION="Python-powered template engine and code generator"
@@ -11,7 +11,6 @@ HOMEPAGE="https://www.cheetahtemplate.org/ https://pypi.org/project/Cheetah3/"
 SRC_URI="https://github.com/CheetahTemplate3/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
-IUSE=""
 KEYWORDS="amd64 ~arm64 x86"
 SLOT="0"
 
diff --git a/dev-python/crcmod/crcmod-1.7-r4.ebuild b/dev-python/crcmod/crcmod-1.7-r4.ebuild
index 828b7c107901..1a4d9fad4ff2 100644
--- a/dev-python/crcmod/crcmod-1.7-r4.ebuild
+++ b/dev-python/crcmod/crcmod-1.7-r4.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+DISTUTILS_USE_SETUPTOOLS=no
 PYTHON_COMPAT=( python3_{5,6,7,8,9} )
 
 inherit distutils-r1
@@ -14,7 +15,6 @@ SRC_URI="mirror://sourceforge/crcmod/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 arm x86"
-IUSE=""
 
 DOCS=( changelog test/examples.py )
 
diff --git a/dev-python/ctypescrypto/ctypescrypto-0.5.ebuild b/dev-python/ctypescrypto/ctypescrypto-0.5.ebuild
index cc6872917a42..f2173299cda4 100644
--- a/dev-python/ctypescrypto/ctypescrypto-0.5.ebuild
+++ b/dev-python/ctypescrypto/ctypescrypto-0.5.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+DISTUTILS_USE_SETUPTOOLS=no
 PYTHON_COMPAT=( python3_{5,6,7,8,9} )
 
 inherit distutils-r1
@@ -24,7 +25,6 @@ RESTRICT="!test? ( test )"
 REQUIRED_USE="test? ( gost )"
 
 RDEPEND="gost? ( dev-libs/gost-engine:= )"
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 
 python_prepare_all() {
 	# Remove failed tests
diff --git a/dev-python/ctypescrypto/ctypescrypto-9999.ebuild b/dev-python/ctypescrypto/ctypescrypto-9999.ebuild
index cc6872917a42..f2173299cda4 100644
--- a/dev-python/ctypescrypto/ctypescrypto-9999.ebuild
+++ b/dev-python/ctypescrypto/ctypescrypto-9999.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+DISTUTILS_USE_SETUPTOOLS=no
 PYTHON_COMPAT=( python3_{5,6,7,8,9} )
 
 inherit distutils-r1
@@ -24,7 +25,6 @@ RESTRICT="!test? ( test )"
 REQUIRED_USE="test? ( gost )"
 
 RDEPEND="gost? ( dev-libs/gost-engine:= )"
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 
 python_prepare_all() {
 	# Remove failed tests
diff --git a/dev-python/cython/cython-0.29.20-r2.ebuild b/dev-python/cython/cython-0.29.20-r2.ebuild
index 6421cf82f09d..784530879337 100644
--- a/dev-python/cython/cython-0.29.20-r2.ebuild
+++ b/dev-python/cython/cython-0.29.20-r2.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python2_7 python3_{5,6,7,8,9} )
 PYTHON_REQ_USE="threads(+)"
 
@@ -23,7 +24,6 @@ RDEPEND="
 	emacs? ( >=app-editors/emacs-23.1:* )
 "
 BDEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
 		$(python_gen_cond_dep 'dev-python/numpy[${PYTHON_USEDEP}]' \
 			python3_{6,7,8})
diff --git a/dev-python/cython/cython-0.29.21-r1.ebuild b/dev-python/cython/cython-0.29.21-r1.ebuild
index d5d91f8ab04f..8f5014d8da18 100644
--- a/dev-python/cython/cython-0.29.21-r1.ebuild
+++ b/dev-python/cython/cython-0.29.21-r1.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
@@ -23,7 +24,6 @@ RDEPEND="
 	emacs? ( >=app-editors/emacs-23.1:* )
 "
 BDEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
 		$(python_gen_cond_dep 'dev-python/numpy[${PYTHON_USEDEP}]' \
 			'python3*')
diff --git a/dev-python/cython/cython-0.29.21.ebuild b/dev-python/cython/cython-0.29.21.ebuild
index e9adf36a561f..992837d48aaf 100644
--- a/dev-python/cython/cython-0.29.21.ebuild
+++ b/dev-python/cython/cython-0.29.21.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python2_7 python3_{5,6,7,8,9} )
 PYTHON_REQ_USE="threads(+)"
 
@@ -23,7 +24,6 @@ RDEPEND="
 	emacs? ( >=app-editors/emacs-23.1:* )
 "
 BDEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
 		$(python_gen_cond_dep 'dev-python/numpy[${PYTHON_USEDEP}]' \
 			python3_{6,7,8})
diff --git a/dev-python/docutils-glep/docutils-glep-1.2.ebuild b/dev-python/docutils-glep/docutils-glep-1.2.ebuild
index f5de4824e195..e935b17f535b 100644
--- a/dev-python/docutils-glep/docutils-glep-1.2.ebuild
+++ b/dev-python/docutils-glep/docutils-glep-1.2.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=6
 
+DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python3_{5,6,7,8,9} )
 
 inherit distutils-r1
@@ -16,11 +17,7 @@ SRC_URI="mirror://pypi/${MY_PN::1}/${MY_PN}/${MY_P}.tar.gz"
 LICENSE="public-domain"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
 
-COMMON_DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=">=dev-python/docutils-0.10[${PYTHON_USEDEP}]
-	${COMMON_DEPEND}"
-DEPEND="${COMMON_DEPEND}"
+RDEPEND=">=dev-python/docutils-0.10[${PYTHON_USEDEP}]"
 
 S=${WORKDIR}/${MY_P}
diff --git a/dev-python/docutils-glep/docutils-glep-9999.ebuild b/dev-python/docutils-glep/docutils-glep-9999.ebuild
index 6c11ab5fb948..9380e87e3d85 100644
--- a/dev-python/docutils-glep/docutils-glep-9999.ebuild
+++ b/dev-python/docutils-glep/docutils-glep-9999.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=6
 
+DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python3_{5,6,7,8,9} )
 EGIT_REPO_URI="https://github.com/mgorny/docutils-glep.git"
 
@@ -14,10 +15,5 @@ SRC_URI=""
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS=""
-IUSE=""
 
-COMMON_DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=">=dev-python/docutils-0.10[${PYTHON_USEDEP}]
-	${COMMON_DEPEND}"
-DEPEND="${COMMON_DEPEND}"
+RDEPEND=">=dev-python/docutils-0.10[${PYTHON_USEDEP}]"
diff --git a/dev-python/fields/fields-5.0.0-r2.ebuild b/dev-python/fields/fields-5.0.0-r2.ebuild
index 85ecaeabd5cc..2441c4a71795 100644
--- a/dev-python/fields/fields-5.0.0-r2.ebuild
+++ b/dev-python/fields/fields-5.0.0-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-DISTUTILS_USE_SETUPTOOLS=rdepend
+DISTUTILS_USE_SETUPTOOLS=bdepend
 PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
 
 inherit distutils-r1
diff --git a/dev-python/flaky/flaky-3.7.0-r1.ebuild b/dev-python/flaky/flaky-3.7.0-r1.ebuild
index 212fd9ad1899..5c5b10a53771 100644
--- a/dev-python/flaky/flaky-3.7.0-r1.ebuild
+++ b/dev-python/flaky/flaky-3.7.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-DISTUTILS_USE_SETUPTOOLS=rdepend
+DISTUTILS_USE_SETUPTOOLS=bdepend
 PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
 
 inherit distutils-r1
diff --git a/dev-python/google-auth-oauthlib/google-auth-oauthlib-0.4.1-r1.ebuild b/dev-python/google-auth-oauthlib/google-auth-oauthlib-0.4.1-r1.ebuild
index ca242f0ee0a2..ba2e15a58bfa 100644
--- a/dev-python/google-auth-oauthlib/google-auth-oauthlib-0.4.1-r1.ebuild
+++ b/dev-python/google-auth-oauthlib/google-auth-oauthlib-0.4.1-r1.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python3_{5,6,7,8,9} )
 inherit distutils-r1
 
@@ -18,5 +19,4 @@ RDEPEND="
 	dev-python/click[${PYTHON_USEDEP}]
 	dev-python/google-auth[${PYTHON_USEDEP}]
 	>=dev-python/requests-oauthlib-0.7.0[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
 "
diff --git a/dev-python/google-auth-oauthlib/google-auth-oauthlib-0.4.1.ebuild b/dev-python/google-auth-oauthlib/google-auth-oauthlib-0.4.1.ebuild
index ca242f0ee0a2..ba2e15a58bfa 100644
--- a/dev-python/google-auth-oauthlib/google-auth-oauthlib-0.4.1.ebuild
+++ b/dev-python/google-auth-oauthlib/google-auth-oauthlib-0.4.1.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python3_{5,6,7,8,9} )
 inherit distutils-r1
 
@@ -18,5 +19,4 @@ RDEPEND="
 	dev-python/click[${PYTHON_USEDEP}]
 	dev-python/google-auth[${PYTHON_USEDEP}]
 	>=dev-python/requests-oauthlib-0.7.0[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
 "
diff --git a/dev-python/ipdb/ipdb-0.10.3.ebuild b/dev-python/ipdb/ipdb-0.10.3.ebuild
index 080fc1f8c42e..790bc6246e03 100644
--- a/dev-python/ipdb/ipdb-0.10.3.ebuild
+++ b/dev-python/ipdb/ipdb-0.10.3.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=5
 
+DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python3_{5,6,7,8,9} )
 
 inherit distutils-r1
@@ -14,13 +15,10 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
-IUSE=""
 
 RDEPEND="dev-python/ipython[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
-	app-arch/unzip
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	"
+	app-arch/unzip"
 
 DOCS=( HISTORY.txt )
 
diff --git a/dev-python/isort/isort-5.6.3.ebuild b/dev-python/isort/isort-5.6.3.ebuild
index 6254cbb986f6..38a3fe650e3b 100644
--- a/dev-python/isort/isort-5.6.3.ebuild
+++ b/dev-python/isort/isort-5.6.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ia64 ~x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/jsonpickle/jsonpickle-1.4.1-r2.ebuild b/dev-python/jsonpickle/jsonpickle-1.4.1-r2.ebuild
index 2087ba8ded77..c689bd22ca36 100644
--- a/dev-python/jsonpickle/jsonpickle-1.4.1-r2.ebuild
+++ b/dev-python/jsonpickle/jsonpickle-1.4.1-r2.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{5,6,7,8,9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
+DISTUTILS_USE_SETUPTOOLS=bdepend
 inherit distutils-r1
 
 DESCRIPTION="Python library for serializing any arbitrary object graph into JSON"
diff --git a/dev-python/jsonref/jsonref-0.1.ebuild b/dev-python/jsonref/jsonref-0.1.ebuild
index 858d47ca766a..5959d9cddd02 100644
--- a/dev-python/jsonref/jsonref-0.1.ebuild
+++ b/dev-python/jsonref/jsonref-0.1.ebuild
@@ -2,6 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=no
 PYTHON_COMPAT=( python3_{5,6,7,8,9} )
 
 inherit eutils distutils-r1
diff --git a/dev-python/manuel/manuel-1.9.0.ebuild b/dev-python/manuel/manuel-1.9.0.ebuild
index b9ced50c217e..119cc792d54c 100644
--- a/dev-python/manuel/manuel-1.9.0.ebuild
+++ b/dev-python/manuel/manuel-1.9.0.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=6
 
+DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python3_{5,6,7,8,9} )
 
 inherit distutils-r1
@@ -18,10 +19,6 @@ KEYWORDS="amd64 x86"
 RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]"
 
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
 # Required to run tests
 DISTUTILS_IN_SOURCE_BUILD=1
 
diff --git a/dev-python/mypy/mypy-0.782.ebuild b/dev-python/mypy/mypy-0.782.ebuild
index ecd647af8be6..cc6b0ce82368 100644
--- a/dev-python/mypy/mypy-0.782.ebuild
+++ b/dev-python/mypy/mypy-0.782.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ia64 ~x86"
 
 # stubgen collides with this package: https://bugs.gentoo.org/585594
 RDEPEND="
diff --git a/dev-python/nose-random/nose-random-1.0.0.ebuild b/dev-python/nose-random/nose-random-1.0.0.ebuild
index e573f8094b96..5bb4ccf40d15 100644
--- a/dev-python/nose-random/nose-random-1.0.0.ebuild
+++ b/dev-python/nose-random/nose-random-1.0.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{5,6,7,8,9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
+DISTUTILS_USE_SETUPTOOLS=bdepend
 inherit distutils-r1
 
 DESCRIPTION="Nose plugin to facilitate randomized unit testing"
diff --git a/dev-python/nose_warnings_filters/nose_warnings_filters-0.1.5-r3.ebuild b/dev-python/nose_warnings_filters/nose_warnings_filters-0.1.5-r3.ebuild
index 4cde5ca781e0..61cb5f3845eb 100644
--- a/dev-python/nose_warnings_filters/nose_warnings_filters-0.1.5-r3.ebuild
+++ b/dev-python/nose_warnings_filters/nose_warnings_filters-0.1.5-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-DISTUTILS_USE_SETUPTOOLS=rdepend
+DISTUTILS_USE_SETUPTOOLS=bdepend
 PYTHON_COMPAT=( python3_{5,6,7,8,9} )
 
 inherit distutils-r1
diff --git a/dev-python/pew/pew-1.1.1.ebuild b/dev-python/pew/pew-1.1.1.ebuild
index 6996835bda15..12cb8acaa9ab 100644
--- a/dev-python/pew/pew-1.1.1.ebuild
+++ b/dev-python/pew/pew-1.1.1.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=6
 
+DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python3_{5,6,7,8,9} )
 
 inherit distutils-r1
@@ -16,12 +17,8 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
 
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=dev-python/pythonz-bd-1.11.2[${PYTHON_USEDEP}]
-	>=dev-python/setuptools-17.1[${PYTHON_USEDEP}]
+DEPEND=">=dev-python/pythonz-bd-1.11.2[${PYTHON_USEDEP}]
 	>=dev-python/shutilwhich-1.1.0[${PYTHON_USEDEP}]
 	>=dev-python/virtualenv-1.11.6[${PYTHON_USEDEP}]
 	>=dev-python/virtualenv-clone-0.2.5[${PYTHON_USEDEP}]"
diff --git a/dev-python/pmw/pmw-2.0.1-r2.ebuild b/dev-python/pmw/pmw-2.0.1-r2.ebuild
index 713668c75299..f7b6bd5a8368 100644
--- a/dev-python/pmw/pmw-2.0.1-r2.ebuild
+++ b/dev-python/pmw/pmw-2.0.1-r2.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+DISTUTILS_USE_SETUPTOOLS=no
 PYTHON_COMPAT=( python3_{5,6,7,8,9} )
 PYTHON_REQ_USE="tk"
 
diff --git a/dev-python/ptpython/ptpython-2.0.6.ebuild b/dev-python/ptpython/ptpython-2.0.6.ebuild
index 521bf003154d..10fd4d41446d 100644
--- a/dev-python/ptpython/ptpython-2.0.6.ebuild
+++ b/dev-python/ptpython/ptpython-2.0.6.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python3_{5,6,7,8,9} )
 inherit distutils-r1
 
@@ -13,7 +14,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
 
 RDEPEND="
 	dev-python/docopt[${PYTHON_USEDEP}]
diff --git a/dev-python/pydocstyle/pydocstyle-5.1.1.ebuild b/dev-python/pydocstyle/pydocstyle-5.1.1.ebuild
index 165f5595fc0b..75936b562405 100644
--- a/dev-python/pydocstyle/pydocstyle-5.1.1.ebuild
+++ b/dev-python/pydocstyle/pydocstyle-5.1.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/PyCQA/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="amd64 arm64 ~ia64 x86"
 
 RDEPEND="dev-python/snowballstemmer[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/pylama/pylama-7.7.1-r1.ebuild b/dev-python/pylama/pylama-7.7.1-r1.ebuild
index ebeb1677c5bb..f5ef3a8888eb 100644
--- a/dev-python/pylama/pylama-7.7.1-r1.ebuild
+++ b/dev-python/pylama/pylama-7.7.1-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/klen/pylama/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ia64 ~x86"
 
 RDEPEND="
 	>=dev-python/mccabe-0.5.2[${PYTHON_USEDEP}]
diff --git a/dev-python/pytables/pytables-3.6.1.ebuild b/dev-python/pytables/pytables-3.6.1.ebuild
index 12493c1ce164..ceab830b1900 100644
--- a/dev-python/pytables/pytables-3.6.1.ebuild
+++ b/dev-python/pytables/pytables-3.6.1.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=6
 
+DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python3_{5,6,7,8,9} )
 PYTHON_REQ_USE="threads(+)"
 
diff --git a/dev-python/pytest-cov/pytest-cov-2.8.1.ebuild b/dev-python/pytest-cov/pytest-cov-2.8.1.ebuild
index ba8a2cae767b..5334f44f9a2d 100644
--- a/dev-python/pytest-cov/pytest-cov-2.8.1.ebuild
+++ b/dev-python/pytest-cov/pytest-cov-2.8.1.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
 
 inherit distutils-r1
diff --git a/dev-python/pytest-pylint/pytest-pylint-0.14.1.ebuild b/dev-python/pytest-pylint/pytest-pylint-0.14.1.ebuild
index 5ed31dc67ff7..94d162215d7e 100644
--- a/dev-python/pytest-pylint/pytest-pylint-0.14.1.ebuild
+++ b/dev-python/pytest-pylint/pytest-pylint-0.14.1.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python3_{5,6,7,8,9} )
 inherit distutils-r1
 
@@ -20,7 +21,6 @@ RDEPEND="dev-python/pytest[${PYTHON_USEDEP}]
 	dev-python/pylint[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
 		dev-python/pytest-pep8[${PYTHON_USEDEP}]
 	)"
diff --git a/dev-python/python-blazarclient/python-blazarclient-2.1.0.ebuild b/dev-python/python-blazarclient/python-blazarclient-2.1.0.ebuild
index 962b05d1097c..f4b1acc75758 100644
--- a/dev-python/python-blazarclient/python-blazarclient-2.1.0.ebuild
+++ b/dev-python/python-blazarclient/python-blazarclient-2.1.0.ebuild
@@ -2,6 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python3_{5,6,7,8,9} )
 
 inherit distutils-r1
@@ -17,8 +19,7 @@ IUSE=""
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
 	!~dev-python/pbr-2.1.0"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
+DEPEND="${CDEPEND}"
 RDEPEND="
 	${CDEPEND}
 	>=dev-python/cliff-2.8.0[${PYTHON_USEDEP}]
diff --git a/dev-python/python-daemon/python-daemon-2.2.4.ebuild b/dev-python/python-daemon/python-daemon-2.2.4.ebuild
index 94805b78fb94..699c113e2022 100644
--- a/dev-python/python-daemon/python-daemon-2.2.4.ebuild
+++ b/dev-python/python-daemon/python-daemon-2.2.4.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
 
 inherit distutils-r1
diff --git a/dev-python/python-prctl/python-prctl-1.7.ebuild b/dev-python/python-prctl/python-prctl-1.7.ebuild
index b120311114ab..244d65e73310 100644
--- a/dev-python/python-prctl/python-prctl-1.7.ebuild
+++ b/dev-python/python-prctl/python-prctl-1.7.ebuild
@@ -2,6 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=no
 PYTHON_COMPAT=( python3_{5,6,7,8,9} )
 
 inherit distutils-r1
@@ -15,7 +17,4 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 RDEPEND="sys-libs/libcap"
-
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/dev-python/python-vitrageclient/python-vitrageclient-4.0.1.ebuild b/dev-python/python-vitrageclient/python-vitrageclient-4.0.1.ebuild
index c6aac710ebfe..627f7aae57c7 100644
--- a/dev-python/python-vitrageclient/python-vitrageclient-4.0.1.ebuild
+++ b/dev-python/python-vitrageclient/python-vitrageclient-4.0.1.ebuild
@@ -2,6 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python3_{5,6,7,8,9} )
 
 inherit distutils-r1
@@ -13,11 +15,8 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
 
-CDEPEND=">=dev-python/pbr-3.1.1[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
+DEPEND=">=dev-python/pbr-3.1.1[${PYTHON_USEDEP}]"
 RDEPEND="
 	>=dev-python/Babel-2.5.3[${PYTHON_USEDEP}]
 	>=dev-python/cliff-2.8.0[${PYTHON_USEDEP}]
diff --git a/dev-python/pythonz-bd/pythonz-bd-1.11.4.ebuild b/dev-python/pythonz-bd/pythonz-bd-1.11.4.ebuild
index 3d34af0972d7..14942790c4d1 100644
--- a/dev-python/pythonz-bd/pythonz-bd-1.11.4.ebuild
+++ b/dev-python/pythonz-bd/pythonz-bd-1.11.4.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=6
 
+DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
 
 inherit distutils-r1
@@ -16,9 +17,5 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
 
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/resumable-urlretrieve[${PYTHON_USEDEP}]' 'python3*')"
+DEPEND="$(python_gen_cond_dep 'dev-python/resumable-urlretrieve[${PYTHON_USEDEP}]' 'python3*')"
diff --git a/dev-python/pyzbar/pyzbar-0.1.8.ebuild b/dev-python/pyzbar/pyzbar-0.1.8.ebuild
index 0a7b771f0885..f935172cd4e7 100644
--- a/dev-python/pyzbar/pyzbar-0.1.8.ebuild
+++ b/dev-python/pyzbar/pyzbar-0.1.8.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python3_{5,6,7,8,9} )
 
 inherit distutils-r1
diff --git a/dev-python/readme_renderer/readme_renderer-26.0.ebuild b/dev-python/readme_renderer/readme_renderer-26.0.ebuild
index 54f63662d8a3..083f7c7cb3c2 100644
--- a/dev-python/readme_renderer/readme_renderer-26.0.ebuild
+++ b/dev-python/readme_renderer/readme_renderer-26.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-DISTUTILS_USE_SETUPTOOLS=rdepend
+DISTUTILS_USE_SETUPTOOLS=bdepend
 PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
 
 inherit distutils-r1
diff --git a/dev-python/readme_renderer/readme_renderer-27.0.ebuild b/dev-python/readme_renderer/readme_renderer-27.0.ebuild
index c53f62c67ce0..ddaaefab23f1 100644
--- a/dev-python/readme_renderer/readme_renderer-27.0.ebuild
+++ b/dev-python/readme_renderer/readme_renderer-27.0.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+DISTUTILS_USE_SETUPTOOLS=bdepend
 PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
 
 inherit distutils-r1
diff --git a/dev-python/requests-mock/requests-mock-1.8.0.ebuild b/dev-python/requests-mock/requests-mock-1.8.0.ebuild
index 9edce4f8fbfc..5a3665bd7f68 100644
--- a/dev-python/requests-mock/requests-mock-1.8.0.ebuild
+++ b/dev-python/requests-mock/requests-mock-1.8.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
-DISTUTILS_USE_SETUPTOOLS=rdepend
+DISTUTILS_USE_SETUPTOOLS=bdepend
 
 inherit distutils-r1
 
diff --git a/dev-python/snappy/snappy-0.5.1-r1.ebuild b/dev-python/snappy/snappy-0.5.1-r1.ebuild
index 41f7dc4da097..a48eaeadd267 100644
--- a/dev-python/snappy/snappy-0.5.1-r1.ebuild
+++ b/dev-python/snappy/snappy-0.5.1-r1.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=6
 
+DISTUTILS_USE_SETUPTOOLS=no
 PYTHON_COMPAT=( python3_{5,6,7,8,9} )
 
 inherit distutils-r1
@@ -19,9 +20,7 @@ KEYWORDS="amd64 arm arm64 x86 ~amd64-linux ~x86-linux"
 SLOT="0"
 
 RDEPEND=">=app-arch/snappy-1.0.2:="
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
+DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/dev-python/snapshottest/snapshottest-0.5.1.ebuild b/dev-python/snapshottest/snapshottest-0.5.1.ebuild
index 831a5e9bc1b7..036aafc3bd23 100644
--- a/dev-python/snapshottest/snapshottest-0.5.1.ebuild
+++ b/dev-python/snapshottest/snapshottest-0.5.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{5,6,7,8,9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
+DISTUTILS_USE_SETUPTOOLS=bdepend
 inherit distutils-r1
 
 # no tests on pypi, no tags on github
diff --git a/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.4.3-r1.ebuild b/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.4.3-r1.ebuild
index 174f996b1a0d..14d4ed9c0145 100644
--- a/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.4.3-r1.ebuild
+++ b/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.4.3-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-DISTUTILS_USE_SETUPTOOLS=rdepend
+DISTUTILS_USE_SETUPTOOLS=bdepend
 PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
 
 inherit distutils-r1
diff --git a/dev-python/towncrier/towncrier-19.2.0.ebuild b/dev-python/towncrier/towncrier-19.2.0.ebuild
index 144639db4e48..7038e62be4bd 100644
--- a/dev-python/towncrier/towncrier-19.2.0.ebuild
+++ b/dev-python/towncrier/towncrier-19.2.0.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python3_{5,6,7,8,9} )
 inherit distutils-r1
 
@@ -22,7 +23,7 @@ RDEPEND="
 	dev-python/incremental[${PYTHON_USEDEP}]
 	dev-python/toml[${PYTHON_USEDEP}]
 "
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+BDEPEND="
 	test? (
 		dev-vcs/git
 		>=dev-python/twisted-16.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/unittest2/unittest2-1.1.0-r1.ebuild b/dev-python/unittest2/unittest2-1.1.0-r1.ebuild
index eedb49e46b48..0a904d95028f 100644
--- a/dev-python/unittest2/unittest2-1.1.0-r1.ebuild
+++ b/dev-python/unittest2/unittest2-1.1.0-r1.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
 
 inherit distutils-r1
@@ -14,7 +15,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE=""
 
 RDEPEND="
 	dev-python/linecache2[${PYTHON_USEDEP}]
diff --git a/dev-python/weasyprint/weasyprint-51.ebuild b/dev-python/weasyprint/weasyprint-51.ebuild
index 0a03cc413cd3..5274c53952e4 100644
--- a/dev-python/weasyprint/weasyprint-51.ebuild
+++ b/dev-python/weasyprint/weasyprint-51.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI=7
 
+DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python3_{5,6,7,8,9} )
 
 inherit distutils-r1
@@ -34,7 +35,7 @@ RDEPEND="
 	x11-libs/pango:0/0
 "
 
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+DEPEND="
 	test? (
 		${RDEPEND}
 		dev-python/pytest[${PYTHON_USEDEP}]
diff --git a/dev-python/webtest/webtest-2.0.35.ebuild b/dev-python/webtest/webtest-2.0.35.ebuild
index 2e9a73336a00..aae6f21ca0db 100644
--- a/dev-python/webtest/webtest-2.0.35.ebuild
+++ b/dev-python/webtest/webtest-2.0.35.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-DISTUTILS_USE_SETUPTOOLS=rdepend
+DISTUTILS_USE_SETUPTOOLS=bdepend
 PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
 
 inherit distutils-r1
diff --git a/dev-python/xlutils/xlutils-2.0.0-r1.ebuild b/dev-python/xlutils/xlutils-2.0.0-r1.ebuild
index 3f4973222953..980810199fb6 100644
--- a/dev-python/xlutils/xlutils-2.0.0-r1.ebuild
+++ b/dev-python/xlutils/xlutils-2.0.0-r1.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python3_{5,6,7,8,9} )
 
 inherit distutils-r1
diff --git a/dev-python/zope-component/zope-component-4.4.1.ebuild b/dev-python/zope-component/zope-component-4.4.1.ebuild
index 067cc8dde89c..0b48e3a54c85 100644
--- a/dev-python/zope-component/zope-component-4.4.1.ebuild
+++ b/dev-python/zope-component/zope-component-4.4.1.ebuild
@@ -2,6 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python3_{5,6,7,8,9} )
 
 inherit distutils-r1
@@ -22,8 +24,7 @@ RDEPEND="dev-python/namespace-zope[${PYTHON_USEDEP}]
 	dev-python/zope-event[${PYTHON_USEDEP}]
 	>=dev-python/zope-interface-4.1.0[${PYTHON_USEDEP}]"
 DEPEND="test? ( ${RDEPEND}
-	dev-python/nose[${PYTHON_USEDEP}] )
-	dev-python/setuptools[${PYTHON_USEDEP}]"
+	dev-python/nose[${PYTHON_USEDEP}] )"
 
 S=${WORKDIR}/${MY_P}
 
diff --git a/dev-python/zope-configuration/zope-configuration-4.4.0.ebuild b/dev-python/zope-configuration/zope-configuration-4.4.0.ebuild
index e9aa585b0c3f..62c64c11d0f5 100644
--- a/dev-python/zope-configuration/zope-configuration-4.4.0.ebuild
+++ b/dev-python/zope-configuration/zope-configuration-4.4.0.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8,9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{5,6,7,8,9} )
 
 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 e46188de14b2..391393c530b0 100644
--- a/dev-python/zope-deprecation/zope-deprecation-4.4.0.ebuild
+++ b/dev-python/zope-deprecation/zope-deprecation-4.4.0.ebuild
@@ -2,6 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
 
 inherit distutils-r1
@@ -18,7 +20,6 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 
 RDEPEND="dev-python/namespace-zope[${PYTHON_USEDEP}]"
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/dev-python/zope-event/zope-event-4.5.0-r1.ebuild b/dev-python/zope-event/zope-event-4.5.0-r1.ebuild
index 650531b82200..6dc47add330c 100644
--- a/dev-python/zope-event/zope-event-4.5.0-r1.ebuild
+++ b/dev-python/zope-event/zope-event-4.5.0-r1.ebuild
@@ -2,6 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
 
 inherit distutils-r1
diff --git a/dev-python/zope-exceptions/zope-exceptions-4.4.ebuild b/dev-python/zope-exceptions/zope-exceptions-4.4.ebuild
index d16247a45eee..15fb629d7735 100644
--- a/dev-python/zope-exceptions/zope-exceptions-4.4.ebuild
+++ b/dev-python/zope-exceptions/zope-exceptions-4.4.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
 
 inherit distutils-r1
diff --git a/dev-python/zope-i18nmessageid/zope-i18nmessageid-5.0.1.ebuild b/dev-python/zope-i18nmessageid/zope-i18nmessageid-5.0.1.ebuild
index 54aa179643c7..2bf0e09be14c 100644
--- a/dev-python/zope-i18nmessageid/zope-i18nmessageid-5.0.1.ebuild
+++ b/dev-python/zope-i18nmessageid/zope-i18nmessageid-5.0.1.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
 
 inherit distutils-r1
diff --git a/dev-python/zope-interface/zope-interface-5.1.0-r1.ebuild b/dev-python/zope-interface/zope-interface-5.1.0-r1.ebuild
index 2a18f18ffc79..5c00623cddd2 100644
--- a/dev-python/zope-interface/zope-interface-5.1.0-r1.ebuild
+++ b/dev-python/zope-interface/zope-interface-5.1.0-r1.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
 
 inherit distutils-r1 flag-o-matic
diff --git a/dev-python/zope-schema/zope-schema-6.0.0.ebuild b/dev-python/zope-schema/zope-schema-6.0.0.ebuild
index da814c0d4f77..5c7c67c2879a 100644
--- a/dev-python/zope-schema/zope-schema-6.0.0.ebuild
+++ b/dev-python/zope-schema/zope-schema-6.0.0.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
 
 inherit distutils-r1
diff --git a/dev-python/zope-testing/zope-testing-4.7-r2.ebuild b/dev-python/zope-testing/zope-testing-4.7-r2.ebuild
index cfc1855112a0..f0e55eeeb193 100644
--- a/dev-python/zope-testing/zope-testing-4.7-r2.ebuild
+++ b/dev-python/zope-testing/zope-testing-4.7-r2.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=6
 
+DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
 inherit distutils-r1
 
@@ -16,11 +17,9 @@ SRC_URI="mirror://pypi/${MY_PN::1}/${MY_PN}/${MY_P}.tar.gz"
 LICENSE="ZPL"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
 
-RDEPEND="dev-python/namespace-zope[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="dev-python/namespace-zope[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/dev-python/zope-testrunner/zope-testrunner-5.2.ebuild b/dev-python/zope-testrunner/zope-testrunner-5.2.ebuild
index 966a1c872281..bc01b0fb54d7 100644
--- a/dev-python/zope-testrunner/zope-testrunner-5.2.ebuild
+++ b/dev-python/zope-testrunner/zope-testrunner-5.2.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
 
 inherit distutils-r1