From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 60950138239 for ; Thu, 5 Dec 2019 04:59:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 87FB7E0883; Thu, 5 Dec 2019 04:59:44 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 570EDE0883 for ; Thu, 5 Dec 2019 04:59:44 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1FDF834D5C0 for ; Thu, 5 Dec 2019 04:59:43 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 95B9FA8 for ; Thu, 5 Dec 2019 04:59:41 +0000 (UTC) From: "Tim Harder" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Tim Harder" Message-ID: <1575521966.1ac4149718657fccd9732c5d5266ca583cac7ff2.radhermit@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/pkgcore/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/pkgcore/pkgcore-0.10.8.ebuild sys-apps/pkgcore/pkgcore-9999.ebuild X-VCS-Directories: sys-apps/pkgcore/ X-VCS-Committer: radhermit X-VCS-Committer-Name: Tim Harder X-VCS-Revision: 1ac4149718657fccd9732c5d5266ca583cac7ff2 X-VCS-Branch: master Date: Thu, 5 Dec 2019 04:59:41 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 001bece7-d386-478a-89f4-12cd56ebc694 X-Archives-Hash: 0ff1a9e063629a80c846bb86f0358840 commit: 1ac4149718657fccd9732c5d5266ca583cac7ff2 Author: Tim Harder gentoo org> AuthorDate: Thu Dec 5 04:18:07 2019 +0000 Commit: Tim Harder gentoo 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 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"