aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Savchenko <bircoph@gmail.com>2012-05-30 20:33:30 +0400
committerAndrew Savchenko <bircoph@gmail.com>2012-05-30 20:33:30 +0400
commit06f40d28b8cf5594ab1a85f8abc0cf6a7f5fc759 (patch)
tree92ca9dd7960819a18ebd2740fe448674a20707a6 /sci-physics/root/root-9999.ebuild
parent[sci-mathematics/scilab] force jgraphx version (diff)
downloadsci-06f40d28b8cf5594ab1a85f8abc0cf6a7f5fc759.tar.gz
sci-06f40d28b8cf5594ab1a85f8abc0cf6a7f5fc759.tar.bz2
sci-06f40d28b8cf5594ab1a85f8abc0cf6a7f5fc759.zip
sci-physics/root: use virtualx eclass for Xvfb
Diffstat (limited to 'sci-physics/root/root-9999.ebuild')
-rw-r--r--sci-physics/root/root-9999.ebuild16
1 files changed, 5 insertions, 11 deletions
diff --git a/sci-physics/root/root-9999.ebuild b/sci-physics/root/root-9999.ebuild
index 53e785360..9f55ad400 100644
--- a/sci-physics/root/root-9999.ebuild
+++ b/sci-physics/root/root-9999.ebuild
@@ -17,7 +17,7 @@ else
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
fi
-inherit elisp-common eutils fdo-mime fortran-2 python toolchain-funcs ${_SVN}
+inherit elisp-common eutils fdo-mime fortran-2 python toolchain-funcs virtualx ${_SVN}
ROOFIT_DOC_PV=2.91-33
TMVA_DOC_PV=4.03
@@ -101,8 +101,7 @@ CDEPEND="
xrootd? ( net-libs/xrootd )"
DEPEND="${CDEPEND}
- virtual/pkgconfig
- htmldoc? ( x11-base/xorg-server[xvfb] )"
+ virtual/pkgconfig"
RDEPEND="
virtual/fortran
@@ -114,6 +113,8 @@ REQUIRED_USE="
!X? ( !opengl !qt4 !xft )
htmldoc? ( X doc graphviz )"
+VIRTUALX_REQUIRED="htmldoc"
+
S="${WORKDIR}/${PN}"
pkg_setup() {
@@ -283,20 +284,13 @@ src_compile() {
elisp-compile build/misc/*.el || die "elisp-compile failed"
fi
if use htmldoc; then
- # we need X server running, THtml uses it for GUI snapshots
- Xvfb -screen 0 1280x1024x24 :50 >/dev/null 2>&1 &
- local xvfb_pid=$!
- ps h -C Xvfb | grep -q ${xvfb_pid} || die "Xvfb failed to start"
-
LD_LIBRARY_PATH=${S}/lib:${S}/cint/cint/include:${S}/cint/cint/stl \
ROOTSYS=${S} DISPLAY=":50" \
- emake html || die "html doc generation failed"
+ Xemake html || die "html doc generation failed"
# if root.exe crashes, return code will be 0 due to gdb attach,
# so we need to check if last html file was generated;
# this check is volatile and can't catch crash on the last file.
[[ -f htmldoc/timespec.html ]] || die "looks like html doc generation crashed"
-
- kill ${xvfb_pid}
fi
}