commit: 1ac4149718657fccd9732c5d5266ca583cac7ff2 Author: Tim Harder <radhermit <AT> gentoo <DOT> org> AuthorDate: Thu Dec 5 04:18:07 2019 +0000 Commit: Tim Harder <radhermit <AT> gentoo <DOT> org> CommitDate: Thu Dec 5 04:59:26 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ac41497
sys-apps/pkgcore: simplify building docs and fix doc build deps Closes: https://bugs.gentoo.org/701960 Signed-off-by: Tim Harder <radhermit <AT> gentoo.org> sys-apps/pkgcore/pkgcore-0.10.8.ebuild | 19 ++++++++++++------- sys-apps/pkgcore/pkgcore-9999.ebuild | 19 ++++++++++++------- 2 files changed, 24 insertions(+), 14 deletions(-) diff --git a/sys-apps/pkgcore/pkgcore-0.10.8.ebuild b/sys-apps/pkgcore/pkgcore-0.10.8.ebuild index b6a40d771d5..8f37e09e080 100644 --- a/sys-apps/pkgcore/pkgcore-0.10.8.ebuild +++ b/sys-apps/pkgcore/pkgcore-0.10.8.ebuild @@ -30,20 +30,24 @@ else fi 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() { - local esetup_args=( $(usex doc "--enable-html-docs" "") ) - # only build man pages for live ebuilds if doc USE flag is enabled - [[ ${PV} == *9999 ]] && esetup_args+=( $(usex doc "--enable-man-pages" "") ) - esetup.py build "${esetup_args[@]}" + use doc && esetup.py build_docs } python_test() { @@ -51,6 +55,7 @@ python_test() { } python_install_all() { + local DOCS=( AUTHORS NEWS.rst ) esetup.py install_docs \ --docdir="${ED%/}/usr/share/doc/${PF}" \ --mandir="${ED%/}/usr/share/man" diff --git a/sys-apps/pkgcore/pkgcore-9999.ebuild b/sys-apps/pkgcore/pkgcore-9999.ebuild index b6a40d771d5..8f37e09e080 100644 --- a/sys-apps/pkgcore/pkgcore-9999.ebuild +++ b/sys-apps/pkgcore/pkgcore-9999.ebuild @@ -30,20 +30,24 @@ else fi 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() { - local esetup_args=( $(usex doc "--enable-html-docs" "") ) - # only build man pages for live ebuilds if doc USE flag is enabled - [[ ${PV} == *9999 ]] && esetup_args+=( $(usex doc "--enable-man-pages" "") ) - esetup.py build "${esetup_args[@]}" + use doc && esetup.py build_docs } python_test() { @@ -51,6 +55,7 @@ python_test() { } python_install_all() { + local DOCS=( AUTHORS NEWS.rst ) esetup.py install_docs \ --docdir="${ED%/}/usr/share/doc/${PF}" \ --mandir="${ED%/}/usr/share/man"
