| 1 |
commit: 06f40d28b8cf5594ab1a85f8abc0cf6a7f5fc759 |
| 2 |
Author: Andrew Savchenko <bircoph <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Wed May 30 16:33:30 2012 +0000 |
| 4 |
Commit: Andrew Savchenko <bircoph <AT> gmail <DOT> com> |
| 5 |
CommitDate: Wed May 30 16:33:30 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=06f40d28 |
| 7 |
|
| 8 |
sci-physics/root: use virtualx eclass for Xvfb |
| 9 |
|
| 10 |
--- |
| 11 |
sci-physics/root/ChangeLog | 4 ++++ |
| 12 |
sci-physics/root/root-5.32.03-r2.ebuild | 16 +++++----------- |
| 13 |
sci-physics/root/root-9999.ebuild | 16 +++++----------- |
| 14 |
3 files changed, 14 insertions(+), 22 deletions(-) |
| 15 |
|
| 16 |
diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog |
| 17 |
index b632101..45c3f58 100644 |
| 18 |
--- a/sci-physics/root/ChangeLog |
| 19 |
+++ b/sci-physics/root/ChangeLog |
| 20 |
@@ -2,6 +2,10 @@ |
| 21 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 22 |
# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.96 2012/03/29 18:21:49 bicatali Exp $ |
| 23 |
|
| 24 |
+ 30 May 2012; Andrew Savchenko <bircoph@×××××.com> root-5.32.03-r2.ebuild, |
| 25 |
+ root-9999.ebuild: |
| 26 |
+ Use virtualx eclass for Xvfb during htmldoc generation. |
| 27 |
+ |
| 28 |
*root-5.32.03-r2 (29 May 2012) |
| 29 |
|
| 30 |
29 May 2012; Andrew Savchenko <bircoph@×××××.com> |
| 31 |
|
| 32 |
diff --git a/sci-physics/root/root-5.32.03-r2.ebuild b/sci-physics/root/root-5.32.03-r2.ebuild |
| 33 |
index 27cad96..fa88aaa 100644 |
| 34 |
--- a/sci-physics/root/root-5.32.03-r2.ebuild |
| 35 |
+++ b/sci-physics/root/root-5.32.03-r2.ebuild |
| 36 |
@@ -17,7 +17,7 @@ else |
| 37 |
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
| 38 |
fi |
| 39 |
|
| 40 |
-inherit elisp-common eutils fdo-mime fortran-2 python toolchain-funcs ${_SVN} |
| 41 |
+inherit elisp-common eutils fdo-mime fortran-2 python toolchain-funcs virtualx ${_SVN} |
| 42 |
|
| 43 |
ROOFIT_DOC_PV=2.91-33 |
| 44 |
TMVA_DOC_PV=4.03 |
| 45 |
@@ -99,8 +99,7 @@ CDEPEND=" |
| 46 |
xrootd? ( net-libs/xrootd )" |
| 47 |
|
| 48 |
DEPEND="${CDEPEND} |
| 49 |
- virtual/pkgconfig |
| 50 |
- htmldoc? ( x11-base/xorg-server[xvfb] )" |
| 51 |
+ virtual/pkgconfig" |
| 52 |
|
| 53 |
RDEPEND=" |
| 54 |
virtual/fortran |
| 55 |
@@ -112,6 +111,8 @@ REQUIRED_USE=" |
| 56 |
!X? ( !opengl !qt4 !xft ) |
| 57 |
htmldoc? ( X doc graphviz )" |
| 58 |
|
| 59 |
+VIRTUALX_REQUIRED="htmldoc" |
| 60 |
+ |
| 61 |
S="${WORKDIR}/${PN}" |
| 62 |
|
| 63 |
pkg_setup() { |
| 64 |
@@ -283,20 +284,13 @@ src_compile() { |
| 65 |
elisp-compile build/misc/*.el || die "elisp-compile failed" |
| 66 |
fi |
| 67 |
if use htmldoc; then |
| 68 |
- # we need X server running, THtml uses it for GUI snapshots |
| 69 |
- Xvfb -screen 0 1280x1024x24 :50 >/dev/null 2>&1 & |
| 70 |
- local xvfb_pid=$! |
| 71 |
- ps h -C Xvfb | grep -q ${xvfb_pid} || die "Xvfb failed to start" |
| 72 |
- |
| 73 |
LD_LIBRARY_PATH=${S}/lib:${S}/cint/cint/include:${S}/cint/cint/stl \ |
| 74 |
ROOTSYS=${S} DISPLAY=":50" \ |
| 75 |
- emake html || die "html doc generation failed" |
| 76 |
+ Xemake html || die "html doc generation failed" |
| 77 |
# if root.exe crashes, return code will be 0 due to gdb attach, |
| 78 |
# so we need to check if last html file was generated; |
| 79 |
# this check is volatile and can't catch crash on the last file. |
| 80 |
[[ -f htmldoc/timespec.html ]] || die "looks like html doc generation crashed" |
| 81 |
- |
| 82 |
- kill ${xvfb_pid} |
| 83 |
fi |
| 84 |
} |
| 85 |
|
| 86 |
|
| 87 |
diff --git a/sci-physics/root/root-9999.ebuild b/sci-physics/root/root-9999.ebuild |
| 88 |
index 53e7853..9f55ad4 100644 |
| 89 |
--- a/sci-physics/root/root-9999.ebuild |
| 90 |
+++ b/sci-physics/root/root-9999.ebuild |
| 91 |
@@ -17,7 +17,7 @@ else |
| 92 |
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
| 93 |
fi |
| 94 |
|
| 95 |
-inherit elisp-common eutils fdo-mime fortran-2 python toolchain-funcs ${_SVN} |
| 96 |
+inherit elisp-common eutils fdo-mime fortran-2 python toolchain-funcs virtualx ${_SVN} |
| 97 |
|
| 98 |
ROOFIT_DOC_PV=2.91-33 |
| 99 |
TMVA_DOC_PV=4.03 |
| 100 |
@@ -101,8 +101,7 @@ CDEPEND=" |
| 101 |
xrootd? ( net-libs/xrootd )" |
| 102 |
|
| 103 |
DEPEND="${CDEPEND} |
| 104 |
- virtual/pkgconfig |
| 105 |
- htmldoc? ( x11-base/xorg-server[xvfb] )" |
| 106 |
+ virtual/pkgconfig" |
| 107 |
|
| 108 |
RDEPEND=" |
| 109 |
virtual/fortran |
| 110 |
@@ -114,6 +113,8 @@ REQUIRED_USE=" |
| 111 |
!X? ( !opengl !qt4 !xft ) |
| 112 |
htmldoc? ( X doc graphviz )" |
| 113 |
|
| 114 |
+VIRTUALX_REQUIRED="htmldoc" |
| 115 |
+ |
| 116 |
S="${WORKDIR}/${PN}" |
| 117 |
|
| 118 |
pkg_setup() { |
| 119 |
@@ -283,20 +284,13 @@ src_compile() { |
| 120 |
elisp-compile build/misc/*.el || die "elisp-compile failed" |
| 121 |
fi |
| 122 |
if use htmldoc; then |
| 123 |
- # we need X server running, THtml uses it for GUI snapshots |
| 124 |
- Xvfb -screen 0 1280x1024x24 :50 >/dev/null 2>&1 & |
| 125 |
- local xvfb_pid=$! |
| 126 |
- ps h -C Xvfb | grep -q ${xvfb_pid} || die "Xvfb failed to start" |
| 127 |
- |
| 128 |
LD_LIBRARY_PATH=${S}/lib:${S}/cint/cint/include:${S}/cint/cint/stl \ |
| 129 |
ROOTSYS=${S} DISPLAY=":50" \ |
| 130 |
- emake html || die "html doc generation failed" |
| 131 |
+ Xemake html || die "html doc generation failed" |
| 132 |
# if root.exe crashes, return code will be 0 due to gdb attach, |
| 133 |
# so we need to check if last html file was generated; |
| 134 |
# this check is volatile and can't catch crash on the last file. |
| 135 |
[[ -f htmldoc/timespec.html ]] || die "looks like html doc generation crashed" |
| 136 |
- |
| 137 |
- kill ${xvfb_pid} |
| 138 |
fi |
| 139 |
} |
Archives