From mboxrd@z Thu Jan 1 00:00:00 1970
Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org)
by finch.gentoo.org with esmtp (Exim 4.60)
(envelope-from <gentoo-commits+bounces-469824-garchives=archives.gentoo.org@lists.gentoo.org>)
id 1SZlqo-0001f0-VN
for garchives@archives.gentoo.org; Wed, 30 May 2012 16:34:23 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 22668E0738;
Wed, 30 May 2012 16:34:15 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
by pigeon.gentoo.org (Postfix) with ESMTP id CEFBFE0738
for <gentoo-commits@lists.gentoo.org>; Wed, 30 May 2012 16:34:14 +0000 (UTC)
Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163])
(using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id BE9CA1B4022
for <gentoo-commits@lists.gentoo.org>; Wed, 30 May 2012 16:34:13 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by hornbill.gentoo.org (Postfix) with ESMTP id 81373E5428
for <gentoo-commits@lists.gentoo.org>; Wed, 30 May 2012 16:34:12 +0000 (UTC)
From: "Andrew Savchenko" <bircoph@gmail.com>
To: gentoo-commits@lists.gentoo.org
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Andrew Savchenko" <bircoph@gmail.com>
Message-ID: <1338395610.06f40d28b8cf5594ab1a85f8abc0cf6a7f5fc759.bircoph@gentoo>
Subject: [gentoo-commits] proj/sci:master commit in: sci-physics/root/
X-VCS-Repository: proj/sci
X-VCS-Files: sci-physics/root/ChangeLog sci-physics/root/root-5.32.03-r2.ebuild sci-physics/root/root-9999.ebuild
X-VCS-Directories: sci-physics/root/
X-VCS-Committer: bircoph
X-VCS-Committer-Name: Andrew Savchenko
X-VCS-Revision: 06f40d28b8cf5594ab1a85f8abc0cf6a7f5fc759
X-VCS-Branch: master
Date: Wed, 30 May 2012 16:34:12 +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
Content-Transfer-Encoding: quoted-printable
X-Archives-Salt: 561e37ae-f108-414c-b267-ba0a9dac25c0
X-Archives-Hash: 4ada4ec70024e21bc60ecd3d26f2132e
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=3Dproj/sci.git;a=3Dc=
ommit;h=3D06f40d28
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 201=
2/03/29 18:21:49 bicatali Exp $
=20
+ 30 May 2012; Andrew Savchenko <bircoph@gmail.com> root-5.32.03-r2.ebui=
ld,
+ root-9999.ebuild:
+ Use virtualx eclass for Xvfb during htmldoc generation.
+
*root-5.32.03-r2 (29 May 2012)
=20
29 May 2012; Andrew Savchenko <bircoph@gmail.com>
diff --git a/sci-physics/root/root-5.32.03-r2.ebuild b/sci-physics/root/r=
oot-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=3D"~amd64 ~x86 ~amd64-linux ~x86-linux"
fi
=20
-inherit elisp-common eutils fdo-mime fortran-2 python toolchain-funcs ${=
_SVN}
+inherit elisp-common eutils fdo-mime fortran-2 python toolchain-funcs vi=
rtualx ${_SVN}
=20
ROOFIT_DOC_PV=3D2.91-33
TMVA_DOC_PV=3D4.03
@@ -99,8 +99,7 @@ CDEPEND=3D"
xrootd? ( net-libs/xrootd )"
=20
DEPEND=3D"${CDEPEND}
- virtual/pkgconfig
- htmldoc? ( x11-base/xorg-server[xvfb] )"
+ virtual/pkgconfig"
=20
RDEPEND=3D"
virtual/fortran
@@ -112,6 +111,8 @@ REQUIRED_USE=3D"
!X? ( !opengl !qt4 !xft )
htmldoc? ( X doc graphviz )"
=20
+VIRTUALX_REQUIRED=3D"htmldoc"
+
S=3D"${WORKDIR}/${PN}"
=20
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=3D$!
- ps h -C Xvfb | grep -q ${xvfb_pid} || die "Xvfb failed to start"
-
LD_LIBRARY_PATH=3D${S}/lib:${S}/cint/cint/include:${S}/cint/cint/stl \
ROOTSYS=3D${S} DISPLAY=3D":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
}
=20
diff --git a/sci-physics/root/root-9999.ebuild b/sci-physics/root/root-99=
99.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=3D"~amd64 ~x86 ~amd64-linux ~x86-linux"
fi
=20
-inherit elisp-common eutils fdo-mime fortran-2 python toolchain-funcs ${=
_SVN}
+inherit elisp-common eutils fdo-mime fortran-2 python toolchain-funcs vi=
rtualx ${_SVN}
=20
ROOFIT_DOC_PV=3D2.91-33
TMVA_DOC_PV=3D4.03
@@ -101,8 +101,7 @@ CDEPEND=3D"
xrootd? ( net-libs/xrootd )"
=20
DEPEND=3D"${CDEPEND}
- virtual/pkgconfig
- htmldoc? ( x11-base/xorg-server[xvfb] )"
+ virtual/pkgconfig"
=20
RDEPEND=3D"
virtual/fortran
@@ -114,6 +113,8 @@ REQUIRED_USE=3D"
!X? ( !opengl !qt4 !xft )
htmldoc? ( X doc graphviz )"
=20
+VIRTUALX_REQUIRED=3D"htmldoc"
+
S=3D"${WORKDIR}/${PN}"
=20
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=3D$!
- ps h -C Xvfb | grep -q ${xvfb_pid} || die "Xvfb failed to start"
-
LD_LIBRARY_PATH=3D${S}/lib:${S}/cint/cint/include:${S}/cint/cint/stl \
ROOTSYS=3D${S} DISPLAY=3D":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
}
=20