| 1 |
commit: c225f1b9c8379dd0c166a5a5acd471c0146b28b8 |
| 2 |
Author: Tomas Mozes <tmozes <AT> sygic <DOT> com> |
| 3 |
AuthorDate: Mon Oct 16 12:29:04 2017 +0000 |
| 4 |
Commit: Yixun Lan <dlan <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Oct 17 07:24:31 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c225f1b9 |
| 7 |
|
| 8 |
app-emulation/xen-tools: improve documentation building |
| 9 |
|
| 10 |
Closes: https://github.com/gentoo/gentoo/pull/5962 |
| 11 |
Signed-off-by: Yixun Lan <dlan <AT> gentoo.org> |
| 12 |
|
| 13 |
app-emulation/xen-tools/xen-tools-4.8.2-r2.ebuild | 33 +++++++---------------- |
| 14 |
1 file changed, 10 insertions(+), 23 deletions(-) |
| 15 |
|
| 16 |
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 |
| 17 |
index ed261704df2..235f97cb493 100644 |
| 18 |
--- a/app-emulation/xen-tools/xen-tools-4.8.2-r2.ebuild |
| 19 |
+++ b/app-emulation/xen-tools/xen-tools-4.8.2-r2.ebuild |
| 20 |
@@ -101,18 +101,10 @@ DEPEND="${COMMON_DEPEND} |
| 21 |
dev-lang/perl |
| 22 |
app-misc/pax-utils |
| 23 |
doc? ( |
| 24 |
- app-doc/doxygen |
| 25 |
+ app-text/pandoc |
| 26 |
dev-python/markdown[${PYTHON_USEDEP}] |
| 27 |
- dev-tex/latex2html[png,gif] |
| 28 |
- media-gfx/graphviz |
| 29 |
- dev-tex/xcolor |
| 30 |
- media-gfx/transfig |
| 31 |
dev-texlive/texlive-latexextra |
| 32 |
- virtual/latex-base |
| 33 |
- dev-tex/latexmk |
| 34 |
- dev-texlive/texlive-latex |
| 35 |
- dev-texlive/texlive-pictures |
| 36 |
- dev-texlive/texlive-latexrecommended |
| 37 |
+ media-gfx/transfig |
| 38 |
) |
| 39 |
hvm? ( x11-proto/xproto |
| 40 |
!net-libs/libiscsi ) |
| 41 |
@@ -383,8 +375,11 @@ src_compile() { |
| 42 |
|
| 43 |
emake V=1 CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" -C tools ${myopt} |
| 44 |
|
| 45 |
- use doc && emake -C docs txt html |
| 46 |
- emake -C docs man-pages |
| 47 |
+ if use doc; then |
| 48 |
+ emake -C docs build |
| 49 |
+ else |
| 50 |
+ emake -C docs man-pages |
| 51 |
+ fi |
| 52 |
} |
| 53 |
|
| 54 |
src_install() { |
| 55 |
@@ -408,17 +403,9 @@ src_install() { |
| 56 |
# Remove RedHat-specific stuff |
| 57 |
rm -rf "${D}"tmp || die |
| 58 |
|
| 59 |
- if use doc; then |
| 60 |
- emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs |
| 61 |
- |
| 62 |
- dohtml -r docs/ |
| 63 |
- docinto pdf |
| 64 |
- dodoc ${DOCS[@]} |
| 65 |
- [ -d "${D}"/usr/share/doc/xen ] && mv "${D}"/usr/share/doc/xen/* "${D}"/usr/share/doc/${PF}/html |
| 66 |
- fi |
| 67 |
- |
| 68 |
- rm -rf "${D}"/usr/share/doc/xen/ |
| 69 |
- doman docs/man?/* |
| 70 |
+ emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs |
| 71 |
+ use doc && dodoc -r docs/{pdf,txt} |
| 72 |
+ dodoc ${DOCS[@]} |
| 73 |
|
| 74 |
newconfd "${FILESDIR}"/xendomains.confd xendomains |
| 75 |
newconfd "${FILESDIR}"/xenstored.confd xenstored |
Archives