diff options
| author |   Tim Harder <radhermit@gentoo.org> | 2019-12-04 21:18:07 -0700 |
|---|---|---|
| committer | Tim Harder <radhermit@gentoo.org> | 2019-12-04 21:59:26 -0700 |
| commit | 1ac4149718657fccd9732c5d5266ca583cac7ff2 (patch) | |
| tree | ba9a1e35ead4bb1c22d12b85ca6692a3cd3a965c /sys-apps/pkgcore | |
| parent | dev-python/freezegun-0.3.12-r1: Revbump, cleanup deps a bit (diff) | |
| download | gentoo-1ac4149718657fccd9732c5d5266ca583cac7ff2.tar.gz gentoo-1ac4149718657fccd9732c5d5266ca583cac7ff2.tar.bz2 gentoo-1ac4149718657fccd9732c5d5266ca583cac7ff2.zip | |
sys-apps/pkgcore: simplify building docs and fix doc build deps
Closes: https://bugs.gentoo.org/701960
Signed-off-by: Tim Harder <radhermit@gentoo.org>
Diffstat (limited to 'sys-apps/pkgcore')
| -rw-r--r-- | sys-apps/pkgcore/pkgcore-0.10.8.ebuild | 19 | ||||
| -rw-r--r-- | 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 b6a40d771d58..8f37e09e0805 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 b6a40d771d58..8f37e09e0805 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" |