From b83196eff9ea2a659440e704feac5a82cd6c327f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Micha=C5=82=20G=C3=B3rny?= Date: Sat, 7 Dec 2019 21:24:55 +0100 Subject: [PATCH] sys-apps/pkgcore: Require setuptools for doc install too MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Closes: https://bugs.gentoo.org/702236 Signed-off-by: Michał Górny --- sys-apps/pkgcore/pkgcore-0.10.8.ebuild | 5 ++++- sys-apps/pkgcore/pkgcore-9999.ebuild | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) 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 -- 2.26.2