[gentoo-commits] repo/gentoo:master commit in: dev-util/pkgcheck/

[Tim Harder]

commit:     45322ac2cac57a5cf4ee4c57a4c0069bedc91d27
Author:     Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Thu Dec  5 04:50:45 2019 +0000
Commit:     Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Thu Dec  5 04:59:27 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45322ac2

dev-util/pkgcheck: fix doc build deps

Signed-off-by: Tim Harder <radhermit <AT> gentoo.org>

 dev-util/pkgcheck/pkgcheck-0.7.1.ebuild | 15 +++++++++++----
 dev-util/pkgcheck/pkgcheck-9999.ebuild  | 15 +++++++++++----
 2 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/dev-util/pkgcheck/pkgcheck-0.7.1.ebuild 
b/dev-util/pkgcheck/pkgcheck-0.7.1.ebuild
index 67df54ec820..b812a50541d 100644
--- a/dev-util/pkgcheck/pkgcheck-0.7.1.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-0.7.1.ebuild
@@ -40,17 +40,24 @@ RDEPEND+="
 "
 DEPEND="${RDEPEND}
        dev-python/setuptools[${PYTHON_USEDEP}]
-       doc? ( $(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]') )
+       doc? ( $(python_gen_any_dep '
+               dev-python/setuptools[${PYTHON_USEDEP}]
+               dev-python/docutils[${PYTHON_USEDEP}]
+               dev-python/sphinx[${PYTHON_USEDEP}]
+       ') )
        test? ( dev-python/pytest[${PYTHON_USEDEP}] )
 "
 
 python_check_deps() {
-       use doc || return 0
-       has_version "dev-python/sphinx[${PYTHON_USEDEP}]"
+       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
 }
 
 python_compile_all() {
-       use doc && esetup.py build_man
+       use doc && esetup.py build_docs
 }
 
 python_test() {

diff --git a/dev-util/pkgcheck/pkgcheck-9999.ebuild 
b/dev-util/pkgcheck/pkgcheck-9999.ebuild
index 67df54ec820..b812a50541d 100644
--- a/dev-util/pkgcheck/pkgcheck-9999.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-9999.ebuild
@@ -40,17 +40,24 @@ RDEPEND+="
 "
 DEPEND="${RDEPEND}
        dev-python/setuptools[${PYTHON_USEDEP}]
-       doc? ( $(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]') )
+       doc? ( $(python_gen_any_dep '
+               dev-python/setuptools[${PYTHON_USEDEP}]
+               dev-python/docutils[${PYTHON_USEDEP}]
+               dev-python/sphinx[${PYTHON_USEDEP}]
+       ') )
        test? ( dev-python/pytest[${PYTHON_USEDEP}] )
 "
 
 python_check_deps() {
-       use doc || return 0
-       has_version "dev-python/sphinx[${PYTHON_USEDEP}]"
+       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
 }
 
 python_compile_all() {
-       use doc && esetup.py build_man
+       use doc && esetup.py build_docs
 }
 
 python_test() {