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

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

commit:     3c83c3996ace8d596f5a69204ddcb7e027fc45b5
Author:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
AuthorDate: Thu Jun 14 21:10:29 2012 +0000
Commit:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
CommitDate: Thu Jun 14 21:10:29 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=3c83c399

sci-physics/root: update live ebuild

---
 sci-physics/root/ChangeLog                     |    7 +++
 sci-physics/root/files/root-5.34-dotfont.patch |   58 ++++++++++++++++++++++++
 sci-physics/root/metadata.xml                  |    1 +
 sci-physics/root/root-9999.ebuild              |   35 ++++++++-------
 4 files changed, 85 insertions(+), 16 deletions(-)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index b583997..dad708f 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -2,6 +2,13 @@
 # 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 $
 
+  14 Jun 2012; Andrew Savchenko <bircoph@gmail.com>
+  +files/root-5.34-dotfont.patch, root-9999.ebuild, metadata.xml:
+  Update live ebuild to account 5.34 barnch changes.
+  This adds experimental support for C++0x startard, imroves chances
+  of llvm build and makes clear openmp and mpi relationship: they are
+  used only for math and are mutually exclusive.
+
   13 Jun 2012; Sébastien Fabbro <bicatali@gentoo.org> root-5.32.03-r2.ebuild,
   metadata.xml:
   sync with tree

diff --git a/sci-physics/root/files/root-5.34-dotfont.patch b/sci-physics/root/files/root-5.34-dotfont.patch
new file mode 100644
index 0000000..6c765f7
--- /dev/null
+++ b/sci-physics/root/files/root-5.34-dotfont.patch
@@ -0,0 +1,58 @@
+--- root/html/src/TClassDocOutput.cxx.orig	2012-06-08 02:13:51.000000000 +0400
++++ root/html/src/TClassDocOutput.cxx	2012-06-08 02:34:45.705436577 +0400
+@@ -625,7 +625,7 @@
+       << "size=\"8,10\";" << std::endl
+       << "ratio=auto;" << std::endl
+       << "margin=0;" << std::endl
+-      << "node [shape=plaintext,fontsize=40,width=4,height=0.75];" << std::endl
++      << "node [shape=plaintext,fontsize=40,width=4,height=0.75,fontname=\"DejaVu Serif\"];" << std::endl
+       << "\"" << fCurrentClass->GetName() << "\" [shape=ellipse];" << std::endl;
+ 
+    std::stringstream ssDep;
+@@ -704,7 +704,7 @@
+             outdot << ";" << std::endl;
+          } else if (writeAndMoreFor) {
+                outdot << "  \"...andmore" << writeAndMoreFor->GetName()
+-                      << "\" [label=\"...and more\",fontname=\"Times-Italic\",fillcolor=lightgrey,style=filled];" << std::endl;
++                      << "\" [label=\"...and more\",fontname=\"DejaVu Serif Italic\",fillcolor=lightgrey,style=filled];" << std::endl;
+          }
+       }
+       if (!levelExists) break;
+@@ -733,7 +733,7 @@
+       << "ranksep=0.1;" << std::endl
+       << "nodesep=0;" << std::endl
+       << "margin=0;" << std::endl;
+-   outdot << "  node [style=filled,width=0.7,height=0.15,fixedsize=true,shape=plaintext,fontsize=10];" << std::endl;
++   outdot << "  node [style=filled,width=0.7,height=0.15,fixedsize=true,shape=plaintext,fontsize=10,fontname=\"DejaVu Serif\"];" << std::endl;
+ 
+    std::stringstream ssDep;
+    const int numColumns = 3;
+@@ -939,7 +939,7 @@
+       << "ranksep=0;" << std::endl
+       << "nodesep=0;" << std::endl
+       << "size=\"8,10\";" << std::endl
+-      << "node [fontsize=20,shape=plaintext];" << std::endl;
++      << "node [fontsize=20,shape=plaintext,fontname=\"DejaVu Serif\"];" << std::endl;
+ 
+    for (std::list<std::string>::iterator iFile = listFilesToParse.begin();
+       iFile != listFilesToParse.end(); ++iFile) {
+@@ -999,7 +999,8 @@
+       << "ranksep=0.7;" << std::endl
+       << "nodesep=0.3;" << std::endl
+       << "size=\"8,8\";" << std::endl
+-      << "ratio=compress;" << std::endl;
++      << "ratio=compress;" << std::endl
++      << "node [fontname=\"DejaVu Serif\"];" << std::endl;
+ 
+    TString libs(fCurrentClass->GetSharedLibs());
+    outdot << "\"All Libraries\" [URL=\"LibraryDependencies.html\",shape=box,rank=max,fillcolor=lightgray,style=filled];" << std::endl;
+@@ -1109,7 +1110,8 @@
+ 
+    dotout << "digraph G {" << std::endl
+           << "ratio=auto;" << std::endl
+-          << "rankdir=RL;" << std::endl;
++          << "rankdir=RL;" << std::endl
++          << "node [fontname=\"DejaVu Serif\"];" << std::endl;
+ 
+    // loop on all classes
+    TClassDocInfo* cdi = 0;

diff --git a/sci-physics/root/metadata.xml b/sci-physics/root/metadata.xml
index bcbc04f..cb56d9f 100644
--- a/sci-physics/root/metadata.xml
+++ b/sci-physics/root/metadata.xml
@@ -16,6 +16,7 @@
   GUI toolkit, and a complete visualization framework.
 </longdescription>
 <use>
+  <flag name="c++0x"> Build ROOT using the C++11 standard. Not supported, requires <pkg>sys-devel/gcc</pkg>>=4.7.0</flag>
   <flag name="clarens"> Build the Clarens and PEAC plug-ins, to use in a GRID enabled analysis</flag>
   <flag name="fits">Support for images and data from FITS files with <pkg>sci-libs/cfitsio</pkg></flag>
   <flag name="geant4">Support for <pkg>sci-physics/geant</pkg> version 4</flag>

diff --git a/sci-physics/root/root-9999.ebuild b/sci-physics/root/root-9999.ebuild
index 9f55ad4..0ff75fe 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 virtualx ${_SVN}
+inherit elisp-common eutils fdo-mime fortran-2 python toolchain-funcs user virtualx ${_SVN}
 
 ROOFIT_DOC_PV=2.91-33
 TMVA_DOC_PV=4.03
@@ -39,9 +39,9 @@ SRC_URI="${SRC_URI}
 
 SLOT="0"
 LICENSE="LGPL-2.1"
-IUSE="+X afs avahi clarens doc emacs examples fits fftw graphviz htmldoc kerberos
-	ldap llvm +math mpi mysql odbc +opengl openmp oracle postgres prefix pythia6
-	pythia8 python qt4 +reflex ruby ssl xft xinetd xml xrootd"
+IUSE="+X afs avahi c++0x clarens doc emacs examples fits fftw graphviz htmldoc
+	kerberos ldap llvm +math mpi mysql odbc +opengl openmp oracle postgres prefix
+	pythia6 pythia8 python qt4 +reflex ruby ssl xft xinetd xml xrootd"
 
 CDEPEND="
 	app-arch/xz-utils
@@ -78,6 +78,7 @@ CDEPEND="
 		)
 	afs? ( net-fs/openafs )
 	avahi? ( net-dns/avahi )
+	c++0x? ( >=sys-devel/gcc-4.7.0 )
 	clarens? ( dev-libs/xmlrpc-c[curl] )
 	emacs? ( virtual/emacs )
 	fits? ( sci-libs/cfitsio )
@@ -98,7 +99,7 @@ CDEPEND="
 			dev-ruby/rubygems )
 	ssl? ( dev-libs/openssl )
 	xml? ( dev-libs/libxml2 )
-	xrootd? ( net-libs/xrootd )"
+	xrootd? ( >=net-libs/xrootd-3.2.0 )"
 
 DEPEND="${CDEPEND}
 	virtual/pkgconfig"
@@ -111,7 +112,9 @@ RDEPEND="
 
 REQUIRED_USE="
 	!X? ( !opengl !qt4 !xft )
-	htmldoc? ( X doc graphviz )"
+	htmldoc? ( X doc graphviz )
+	mpi? ( math !openmp )
+	openmp? ( math !mpi )"
 
 VIRTUALX_REQUIRED="htmldoc"
 
@@ -132,12 +135,13 @@ pkg_setup() {
 	enewuser rootd -1 -1 /var/spool/rootd rootd
 
 	if use math; then
-		if use openmp && ! tc-has-openmp; then
-			ewarn "You are using gcc and OpenMP is available with gcc >= 4.2"
-			ewarn "If you want to build this package with OpenMP, abort now,"
-			ewarn "and set CC to an OpenMP capable compiler"
-		elif use openmp; then
-			export USE_OPENMP=1 USE_PARALLEL_MINUIT2=1
+		if use openmp; then
+			if [[ $(tc-getCC)$ == *gcc* ]] && ! tc-has-openmp; then
+				ewarn "You are using a gcc without OpenMP capabilities"
+				die "Need an OpenMP capable compiler"
+			else
+				export USE_OPENMP=1 USE_PARALLEL_MINUIT2=1
+			fi
 		elif use mpi; then
 			export USE_MPI=1 USE_PARALLEL_MINUIT2=1
 		fi
@@ -153,7 +157,7 @@ src_prepare() {
 		"${FILESDIR}"/${PN}-${PATCH_PV2}-afs.patch \
 		"${FILESDIR}"/${PN}-${PATCH_PV2}-cfitsio.patch \
 		"${FILESDIR}"/${PN}-${PATCH_PV2}-chklib64.patch \
-		"${FILESDIR}"/${PN}-${PATCH_PV2}-dotfont.patch
+		"${FILESDIR}"/${PN}-${PATCH_PV3}-dotfont.patch
 
 	# make sure we use system libs and headers
 	rm montecarlo/eg/inc/cfortran.h README/cfortran.doc || die
@@ -279,13 +283,12 @@ src_configure() {
 }
 
 src_compile() {
-	emake OPT="${CXXFLAGS}" F77OPT="${FFLAGS}"
+	emake OPT="${CXXFLAGS}" F77OPT="${FFLAGS}" ROOTSYS=${S} LD_LIBRARY_PATH=${S}/lib
 	if use emacs; then
 		elisp-compile build/misc/*.el || die "elisp-compile failed"
 	fi
 	if use htmldoc; then
-		LD_LIBRARY_PATH=${S}/lib:${S}/cint/cint/include:${S}/cint/cint/stl \
-		ROOTSYS=${S} DISPLAY=":50" \
+		ROOTSYS=${S} LD_LIBRARY_PATH=${S}/lib DISPLAY=":50" \
 		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;