From: Michał Górny <mgorny@gentoo.org>
Date: Sat, 7 Dec 2019 20:24:55 +0000 (+0100)
Subject: sys-apps/pkgcore: Require setuptools for doc install too
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=b83196eff9ea2a659440e704feac5a82cd6c327f;p=gentoo.git

sys-apps/pkgcore: Require setuptools for doc install too

Closes: https://bugs.gentoo.org/702236
Signed-off-by: Michał Górny <mgorny@gentoo.org>
---

diff --git a/sys-apps/pkgcore/pkgcore-0.10.8.ebuild b/sys-apps/pkgcore/pkgcore-0.10.8.ebuild
index ca168a44e361..48263e63a067 100644
--- a/sys-apps/pkgcore/pkgcore-0.10.8.ebuild
+++ b/sys-apps/pkgcore/pkgcore-0.10.8.ebuild
@@ -35,12 +35,15 @@ DEPEND="${RDEPEND}
 		dev-python/docutils[${PYTHON_USEDEP}]
 		dev-python/sphinx[${PYTHON_USEDEP}]
 	') )
+	!doc? (
+		$(python_gen_any_dep 'dev-python/setuptools[${PYTHON_USEDEP}]')
+	)
 	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
 "
 
 python_check_deps() {
+	has_version "dev-python/setuptools[${PYTHON_USEDEP}]" || return 1
 	if use doc; then
-		has_version "dev-python/setuptools[${PYTHON_USEDEP}]" &&
 		has_version "dev-python/docutils[${PYTHON_USEDEP}]" &&
 		has_version "dev-python/sphinx[${PYTHON_USEDEP}]"
 	fi
diff --git a/sys-apps/pkgcore/pkgcore-9999.ebuild b/sys-apps/pkgcore/pkgcore-9999.ebuild
index ca168a44e361..48263e63a067 100644
--- a/sys-apps/pkgcore/pkgcore-9999.ebuild
+++ b/sys-apps/pkgcore/pkgcore-9999.ebuild
@@ -35,12 +35,15 @@ DEPEND="${RDEPEND}
 		dev-python/docutils[${PYTHON_USEDEP}]
 		dev-python/sphinx[${PYTHON_USEDEP}]
 	') )
+	!doc? (
+		$(python_gen_any_dep 'dev-python/setuptools[${PYTHON_USEDEP}]')
+	)
 	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
 "
 
 python_check_deps() {
+	has_version "dev-python/setuptools[${PYTHON_USEDEP}]" || return 1
 	if use doc; then
-		has_version "dev-python/setuptools[${PYTHON_USEDEP}]" &&
 		has_version "dev-python/docutils[${PYTHON_USEDEP}]" &&
 		has_version "dev-python/sphinx[${PYTHON_USEDEP}]"
 	fi