From a1d8b122e1b29fea6837c414dad73db3d915eafb Mon Sep 17 00:00:00 2001 From: =?utf8?q?Micha=C5=82=20G=C3=B3rny?= Date: Sat, 7 Dec 2019 21:25:32 +0100 Subject: [PATCH] dev-util/pkgcheck: Require setuptools for doc install too MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Górny --- dev-util/pkgcheck/pkgcheck-0.7.1.ebuild | 5 ++++- dev-util/pkgcheck/pkgcheck-9999.ebuild | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dev-util/pkgcheck/pkgcheck-0.7.1.ebuild b/dev-util/pkgcheck/pkgcheck-0.7.1.ebuild index 85632f39aa0f..8ab52c61b8ae 100644 --- a/dev-util/pkgcheck/pkgcheck-0.7.1.ebuild +++ b/dev-util/pkgcheck/pkgcheck-0.7.1.ebuild @@ -45,12 +45,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/dev-util/pkgcheck/pkgcheck-9999.ebuild b/dev-util/pkgcheck/pkgcheck-9999.ebuild index 85632f39aa0f..8ab52c61b8ae 100644 --- a/dev-util/pkgcheck/pkgcheck-9999.ebuild +++ b/dev-util/pkgcheck/pkgcheck-9999.ebuild @@ -45,12 +45,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