From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-978910-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 C0AEB1396DA
for <garchives@archives.gentoo.org>; Tue, 17 Oct 2017 07:25:01 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id CE5AEE0E4F;
Tue, 17 Oct 2017 07:25:00 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(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 A835CE0E56
for <gentoo-commits@lists.gentoo.org>; Tue, 17 Oct 2017 07:25:00 +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 4268933BF0F
for <gentoo-commits@lists.gentoo.org>; Tue, 17 Oct 2017 07:24:59 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 03366805
for <gentoo-commits@lists.gentoo.org>; Tue, 17 Oct 2017 07:24:58 +0000 (UTC)
From: "Yixun Lan" <dlan@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, "Yixun Lan" <dlan@gentoo.org>
Message-ID: <1508225071.c225f1b9c8379dd0c166a5a5acd471c0146b28b8.dlan@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/xen-tools/
X-VCS-Repository: repo/gentoo
X-VCS-Files: app-emulation/xen-tools/xen-tools-4.8.2-r2.ebuild
X-VCS-Directories: app-emulation/xen-tools/
X-VCS-Committer: dlan
X-VCS-Committer-Name: Yixun Lan
X-VCS-Revision: c225f1b9c8379dd0c166a5a5acd471c0146b28b8
X-VCS-Branch: master
Date: Tue, 17 Oct 2017 07:24:58 +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-Archives-Salt: a356a88d-4730-4ff5-9823-312af19e4e8d
X-Archives-Hash: ffd0487df8718e3ac84ad92005ea2999
commit: c225f1b9c8379dd0c166a5a5acd471c0146b28b8
Author: Tomas Mozes <tmozes <AT> sygic <DOT> com>
AuthorDate: Mon Oct 16 12:29:04 2017 +0000
Commit: Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Tue Oct 17 07:24:31 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c225f1b9
app-emulation/xen-tools: improve documentation building
Closes: https://github.com/gentoo/gentoo/pull/5962
Signed-off-by: Yixun Lan <dlan <AT> gentoo.org>
app-emulation/xen-tools/xen-tools-4.8.2-r2.ebuild | 33 +++++++----------------
1 file changed, 10 insertions(+), 23 deletions(-)
diff --git a/app-emulation/xen-tools/xen-tools-4.8.2-r2.ebuild b/app-emulation/xen-tools/xen-tools-4.8.2-r2.ebuild
index ed261704df2..235f97cb493 100644
--- a/app-emulation/xen-tools/xen-tools-4.8.2-r2.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.8.2-r2.ebuild
@@ -101,18 +101,10 @@ DEPEND="${COMMON_DEPEND}
dev-lang/perl
app-misc/pax-utils
doc? (
- app-doc/doxygen
+ app-text/pandoc
dev-python/markdown[${PYTHON_USEDEP}]
- dev-tex/latex2html[png,gif]
- media-gfx/graphviz
- dev-tex/xcolor
- media-gfx/transfig
dev-texlive/texlive-latexextra
- virtual/latex-base
- dev-tex/latexmk
- dev-texlive/texlive-latex
- dev-texlive/texlive-pictures
- dev-texlive/texlive-latexrecommended
+ media-gfx/transfig
)
hvm? ( x11-proto/xproto
!net-libs/libiscsi )
@@ -383,8 +375,11 @@ src_compile() {
emake V=1 CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" -C tools ${myopt}
- use doc && emake -C docs txt html
- emake -C docs man-pages
+ if use doc; then
+ emake -C docs build
+ else
+ emake -C docs man-pages
+ fi
}
src_install() {
@@ -408,17 +403,9 @@ src_install() {
# Remove RedHat-specific stuff
rm -rf "${D}"tmp || die
- if use doc; then
- emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs
-
- dohtml -r docs/
- docinto pdf
- dodoc ${DOCS[@]}
- [ -d "${D}"/usr/share/doc/xen ] && mv "${D}"/usr/share/doc/xen/* "${D}"/usr/share/doc/${PF}/html
- fi
-
- rm -rf "${D}"/usr/share/doc/xen/
- doman docs/man?/*
+ emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs
+ use doc && dodoc -r docs/{pdf,txt}
+ dodoc ${DOCS[@]}
newconfd "${FILESDIR}"/xendomains.confd xendomains
newconfd "${FILESDIR}"/xenstored.confd xenstored