dev-util/buildbot: Fix dohtml usage, remove doc use flag

Docs are missing files for releases, so clean out the ebuild.
Update docs deps for 9999.ebuild, but not working yet.
Keep "doc" use flag masked for buildbot.

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Brian Dolbec <dolsen@gentoo.org>

diff --git a/dev-util/buildbot/buildbot-2.7.0.ebuild b/dev-util/buildbot/buildbot-2.7.0.ebuild
index 38c6ccf3ffdcec61a4575018c987c08ceb3123cc..1769ba6f1d19dfe980c191c0d21f95500d682748 100644 (file)
--- a/dev-util/buildbot/buildbot-2.7.0.ebuild
+++ b/dev-util/buildbot/buildbot-2.7.0.ebuild
@@ -27,7 +27,7 @@ else
        KEYWORDS="~amd64 ~amd64-linux ~x86-linux"
 fi
 
-IUSE="crypt doc docker examples irc test"
+IUSE="crypt docker examples irc test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
@@ -59,14 +59,6 @@ RDEPEND="
        )
 "
 DEPEND="${RDEPEND}
-       doc? (
-               >=dev-python/sphinx-1.4.3[${PYTHON_USEDEP}]
-               dev-python/sphinxcontrib-blockdiag[${PYTHON_USEDEP}]
-               dev-python/sphinxcontrib-spelling[${PYTHON_USEDEP}]
-               dev-python/pyenchant[${PYTHON_USEDEP}]
-               dev-python/docutils[${PYTHON_USEDEP}]
-               dev-python/sphinx-jinja[${PYTHON_USEDEP}]
-       )
        test? (
                >=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
                dev-python/moto[${PYTHON_USEDEP}]
@@ -87,7 +79,6 @@ DEPEND="${RDEPEND}
                        dev-python/service_identity[${PYTHON_USEDEP}]
                )
        )"
-#              >=dev-python/docker-py-2.2.0[${PYTHON_USEDEP}]
 
 S=${WORKDIR}/${MY_P}
 [[ ${PV} == *9999 ]] && S=${S}/master
@@ -108,28 +99,11 @@ pkg_setup() {
                The scripts can run as a different user if desired."
 }
 
-src_compile() {
-       distutils-r1_src_compile
-
-       if use doc; then
-               einfo "Generation of documentation"
-               pushd docs > /dev/null
-               #'man' target is currently broken
-               emake html
-               popd > /dev/null
-       fi
-}
-
 src_install() {
        distutils-r1_src_install
 
        doman docs/buildbot.1
 
-       if use doc; then
-               dohtml -r docs/_build/html/
-               # TODO: install man pages
-       fi
-
        if use examples; then
                insinto /usr/share/doc/${PF}
                doins -r docs/examples

diff --git a/dev-util/buildbot/buildbot-9999.ebuild b/dev-util/buildbot/buildbot-9999.ebuild
index 38c6ccf3ffdcec61a4575018c987c08ceb3123cc..cdce9bbe8ff4a544a2cfa5b0b5c1e8b273acf7bb 100644 (file)
--- a/dev-util/buildbot/buildbot-9999.ebuild
+++ b/dev-util/buildbot/buildbot-9999.ebuild
@@ -61,11 +61,13 @@ RDEPEND="
 DEPEND="${RDEPEND}
        doc? (
                >=dev-python/sphinx-1.4.3[${PYTHON_USEDEP}]
+               <dev-python/sphinx-2.1.0[${PYTHON_USEDEP}]
                dev-python/sphinxcontrib-blockdiag[${PYTHON_USEDEP}]
                dev-python/sphinxcontrib-spelling[${PYTHON_USEDEP}]
                dev-python/pyenchant[${PYTHON_USEDEP}]
                dev-python/docutils[${PYTHON_USEDEP}]
                dev-python/sphinx-jinja[${PYTHON_USEDEP}]
+               dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
        )
        test? (
                >=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
@@ -126,7 +128,7 @@ src_install() {
        doman docs/buildbot.1
 
        if use doc; then
-               dohtml -r docs/_build/html/
+               HTML_DOCS=( docs/_build/html/ )
                # TODO: install man pages
        fi