[gentoo-commits] proj/sci:master commit in: sci-physics/root/

["Andrew Savchenko" <bircoph@gmail.com>]

commit:     06f40d28b8cf5594ab1a85f8abc0cf6a7f5fc759
Author:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
AuthorDate: Wed May 30 16:33:30 2012 +0000
Commit:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
CommitDate: Wed May 30 16:33:30 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=06f40d28

sci-physics/root: use virtualx eclass for Xvfb

---
 sci-physics/root/ChangeLog              |    4 ++++
 sci-physics/root/root-5.32.03-r2.ebuild |   16 +++++-----------
 sci-physics/root/root-9999.ebuild       |   16 +++++-----------
 3 files changed, 14 insertions(+), 22 deletions(-)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index b632101..45c3f58 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.96 2012/03/29 18:21:49 bicatali Exp $
 
+  30 May 2012; Andrew Savchenko <bircoph@gmail.com> root-5.32.03-r2.ebuild,
+  root-9999.ebuild:
+  Use virtualx eclass for Xvfb during htmldoc generation.
+
 *root-5.32.03-r2 (29 May 2012)
 
   29 May 2012; Andrew Savchenko <bircoph@gmail.com>

diff --git a/sci-physics/root/root-5.32.03-r2.ebuild b/sci-physics/root/root-5.32.03-r2.ebuild
index 27cad96..fa88aaa 100644
--- a/sci-physics/root/root-5.32.03-r2.ebuild
+++ b/sci-physics/root/root-5.32.03-r2.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
@@ -99,8 +99,7 @@ CDEPEND="
 	xrootd? ( net-libs/xrootd )"
 
 DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	htmldoc? ( x11-base/xorg-server[xvfb] )"
+	virtual/pkgconfig"
 
 RDEPEND="
 	virtual/fortran
@@ -112,6 +111,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
 }
 

diff --git a/sci-physics/root/root-9999.ebuild b/sci-physics/root/root-9999.ebuild
index 53e7853..9f55ad4 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
 }