commit: b83196eff9ea2a659440e704feac5a82cd6c327f Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Sat Dec 7 20:24:55 2019 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Sat Dec 7 20:31:31 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b83196ef
sys-apps/pkgcore: Require setuptools for doc install too Closes: https://bugs.gentoo.org/702236 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> 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 ca168a44e36..48263e63a06 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 ca168a44e36..48263e63a06 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
