From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1065920-garchives=archives.gentoo.org@lists.gentoo.org>
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 293AA138335
for <garchives@archives.gentoo.org>; Tue, 8 Jan 2019 09:42:59 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id D8390E0BF1;
Tue, 8 Jan 2019 09:42:56 +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 AAA1DE0BF1
for <gentoo-commits@lists.gentoo.org>; Tue, 8 Jan 2019 09:42:56 +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 A1BEF335CDB
for <gentoo-commits@lists.gentoo.org>; Tue, 8 Jan 2019 09:42:54 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id E4C0150C
for <gentoo-commits@lists.gentoo.org>; Tue, 8 Jan 2019 09:42:52 +0000 (UTC)
From: "Tim Harder" <radhermit@gentoo.org>
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" <radhermit@gentoo.org>
Message-ID: <1546940299.4ce423007b2ff323a55da040c7cb95ff9e0134d2.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-9999.ebuild
X-VCS-Directories: sys-apps/pkgcore/
X-VCS-Committer: radhermit
X-VCS-Committer-Name: Tim Harder
X-VCS-Revision: 4ce423007b2ff323a55da040c7cb95ff9e0134d2
X-VCS-Branch: master
Date: Tue, 8 Jan 2019 09:42:52 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: b320f45c-2d4e-4300-ad24-3e0845026ac5
X-Archives-Hash: 460c5ef5431ece440a6d6a382be10496
commit: 4ce423007b2ff323a55da040c7cb95ff9e0134d2
Author: Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 8 09:12:57 2019 +0000
Commit: Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Tue Jan 8 09:38:19 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ce42300
sys-apps/pkgcore: update live ebuild deps
And only build man pages for the live ebuild if the doc USE flags is
enabled.
Signed-off-by: Tim Harder <radhermit <AT> gentoo.org>
sys-apps/pkgcore/pkgcore-9999.ebuild | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/sys-apps/pkgcore/pkgcore-9999.ebuild b/sys-apps/pkgcore/pkgcore-9999.ebuild
index ae58325b3b8..34a210caba4 100644
--- a/sys-apps/pkgcore/pkgcore-9999.ebuild
+++ b/sys-apps/pkgcore/pkgcore-9999.ebuild
@@ -21,25 +21,24 @@ LICENSE="|| ( BSD GPL-2 )"
SLOT="0"
IUSE="doc test"
-if [[ ${PV} == *9999 ]] ; then
- SPHINX="dev-python/sphinx[${PYTHON_USEDEP}]"
-else
- SPHINX="doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-fi
+RDEPEND="dev-python/lxml[${PYTHON_USEDEP}]"
if [[ ${PV} == *9999 ]]; then
RDEPEND+=" ~dev-python/snakeoil-9999[${PYTHON_USEDEP}]"
else
RDEPEND+=" >=dev-python/snakeoil-0.8.0[${PYTHON_USEDEP}]"
fi
DEPEND="${RDEPEND}
- ${SPHINX}
dev-python/setuptools[${PYTHON_USEDEP}]
dev-python/pyparsing[${PYTHON_USEDEP}]
+ doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
test? ( dev-python/pytest[${PYTHON_USEDEP}] )
"
python_compile_all() {
- esetup.py build_man $(usex doc "build_docs" "")
+ 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[@]}"
}
python_test() {
@@ -47,8 +46,9 @@ python_test() {
}
python_install_all() {
- distutils-r1_python_install install_man \
- $(usex doc "install_docs --path="${ED%/}"/usr/share/doc/${PF}/html" "")
+ esetup.py install_docs \
+ --docdir="${ED%/}/usr/share/doc/${PF}" \
+ --mandir="${ED%/}/usr/share/man"
distutils-r1_python_install_all
}