dev-util/pkgcheck: fix doc build deps

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

diff --git a/dev-util/pkgcheck/pkgcheck-0.7.1.ebuild b/dev-util/pkgcheck/pkgcheck-0.7.1.ebuild
index 67df54ec8209581ad0b9ad3e8952f23b3de5c69e..b812a50541dcc0276e3777971a82f621dcff479f 100644 (file)
--- 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 67df54ec8209581ad0b9ad3e8952f23b3de5c69e..b812a50541dcc0276e3777971a82f621dcff479f 100644 (file)
--- 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() {