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-476428-garchives=archives.gentoo.org@lists.gentoo.org>)
id 1Sh4ui-0005qR-41
for garchives@archives.gentoo.org; Tue, 19 Jun 2012 20:20:36 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 25405E0655;
Tue, 19 Jun 2012 20:20:22 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
by pigeon.gentoo.org (Postfix) with ESMTP id D6035E0655
for <gentoo-commits@lists.gentoo.org>; Tue, 19 Jun 2012 20:20:21 +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 082031B4039
for <gentoo-commits@lists.gentoo.org>; Tue, 19 Jun 2012 20:20:21 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by hornbill.gentoo.org (Postfix) with ESMTP id B6B0AE5432
for <gentoo-commits@lists.gentoo.org>; Tue, 19 Jun 2012 20:20:19 +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: <1339708229.3c83c3996ace8d596f5a69204ddcb7e027fc45b5.bircoph@gentoo>
Subject: [gentoo-commits] proj/sci:master commit in: sci-physics/root/files/, sci-physics/root/
X-VCS-Repository: proj/sci
X-VCS-Files: sci-physics/root/ChangeLog sci-physics/root/files/root-5.34-dotfont.patch sci-physics/root/metadata.xml sci-physics/root/root-9999.ebuild
X-VCS-Directories: sci-physics/root/files/ sci-physics/root/
X-VCS-Committer: bircoph
X-VCS-Committer-Name: Andrew Savchenko
X-VCS-Revision: 3c83c3996ace8d596f5a69204ddcb7e027fc45b5
X-VCS-Branch: master
Date: Tue, 19 Jun 2012 20:20:19 +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: a13119f9-acd7-4a30-bafc-da6bd08d7f8f
X-Archives-Hash: 25abc790f20d8e6fd12a994b9b175b9f
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=3Dproj/sci.git;a=3Dc=
ommit;h=3D3c83c399
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 201=
2/03/29 18:21:49 bicatali Exp $
=20
+ 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=C3=A9bastien 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 +040=
0
+@@ -625,7 +625,7 @@
+ << "size=3D\"8,10\";" << std::endl
+ << "ratio=3Dauto;" << std::endl
+ << "margin=3D0;" << std::endl
+- << "node [shape=3Dplaintext,fontsize=3D40,width=3D4,height=3D0.75=
];" << std::endl
++ << "node [shape=3Dplaintext,fontsize=3D40,width=3D4,height=3D0.75=
,fontname=3D\"DejaVu Serif\"];" << std::endl
+ << "\"" << fCurrentClass->GetName() << "\" [shape=3Dellipse];" <<=
std::endl;
+=20
+ std::stringstream ssDep;
+@@ -704,7 +704,7 @@
+ outdot << ";" << std::endl;
+ } else if (writeAndMoreFor) {
+ outdot << " \"...andmore" << writeAndMoreFor->GetName()
+- << "\" [label=3D\"...and more\",fontname=3D\"Time=
s-Italic\",fillcolor=3Dlightgrey,style=3Dfilled];" << std::endl;
++ << "\" [label=3D\"...and more\",fontname=3D\"Deja=
Vu Serif Italic\",fillcolor=3Dlightgrey,style=3Dfilled];" << std::endl;
+ }
+ }
+ if (!levelExists) break;
+@@ -733,7 +733,7 @@
+ << "ranksep=3D0.1;" << std::endl
+ << "nodesep=3D0;" << std::endl
+ << "margin=3D0;" << std::endl;
+- outdot << " node [style=3Dfilled,width=3D0.7,height=3D0.15,fixedsiz=
e=3Dtrue,shape=3Dplaintext,fontsize=3D10];" << std::endl;
++ outdot << " node [style=3Dfilled,width=3D0.7,height=3D0.15,fixedsiz=
e=3Dtrue,shape=3Dplaintext,fontsize=3D10,fontname=3D\"DejaVu Serif\"];" <=
< std::endl;
+=20
+ std::stringstream ssDep;
+ const int numColumns =3D 3;
+@@ -939,7 +939,7 @@
+ << "ranksep=3D0;" << std::endl
+ << "nodesep=3D0;" << std::endl
+ << "size=3D\"8,10\";" << std::endl
+- << "node [fontsize=3D20,shape=3Dplaintext];" << std::endl;
++ << "node [fontsize=3D20,shape=3Dplaintext,fontname=3D\"DejaVu Ser=
if\"];" << std::endl;
+=20
+ for (std::list<std::string>::iterator iFile =3D listFilesToParse.beg=
in();
+ iFile !=3D listFilesToParse.end(); ++iFile) {
+@@ -999,7 +999,8 @@
+ << "ranksep=3D0.7;" << std::endl
+ << "nodesep=3D0.3;" << std::endl
+ << "size=3D\"8,8\";" << std::endl
+- << "ratio=3Dcompress;" << std::endl;
++ << "ratio=3Dcompress;" << std::endl
++ << "node [fontname=3D\"DejaVu Serif\"];" << std::endl;
+=20
+ TString libs(fCurrentClass->GetSharedLibs());
+ outdot << "\"All Libraries\" [URL=3D\"LibraryDependencies.html\",sha=
pe=3Dbox,rank=3Dmax,fillcolor=3Dlightgray,style=3Dfilled];" << std::endl;
+@@ -1109,7 +1110,8 @@
+=20
+ dotout << "digraph G {" << std::endl
+ << "ratio=3Dauto;" << std::endl
+- << "rankdir=3DRL;" << std::endl;
++ << "rankdir=3DRL;" << std::endl
++ << "node [fontname=3D\"DejaVu Serif\"];" << std::endl;
+=20
+ // loop on all classes
+ TClassDocInfo* cdi =3D 0;
diff --git a/sci-physics/root/metadata.xml b/sci-physics/root/metadata.xm=
l
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=3D"c++0x"> Build ROOT using the C++11 standard. Not support=
ed, requires <pkg>sys-devel/gcc</pkg>>=3D4.7.0</flag>
<flag name=3D"clarens"> Build the Clarens and PEAC plug-ins, to use in=
a GRID enabled analysis</flag>
<flag name=3D"fits">Support for images and data from FITS files with <=
pkg>sci-libs/cfitsio</pkg></flag>
<flag name=3D"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-99=
99.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=3D"~amd64 ~x86 ~amd64-linux ~x86-linux"
fi
=20
-inherit elisp-common eutils fdo-mime fortran-2 python toolchain-funcs vi=
rtualx ${_SVN}
+inherit elisp-common eutils fdo-mime fortran-2 python toolchain-funcs us=
er virtualx ${_SVN}
=20
ROOFIT_DOC_PV=3D2.91-33
TMVA_DOC_PV=3D4.03
@@ -39,9 +39,9 @@ SRC_URI=3D"${SRC_URI}
=20
SLOT=3D"0"
LICENSE=3D"LGPL-2.1"
-IUSE=3D"+X afs avahi clarens doc emacs examples fits fftw graphviz htmld=
oc kerberos
- ldap llvm +math mpi mysql odbc +opengl openmp oracle postgres prefix py=
thia6
- pythia8 python qt4 +reflex ruby ssl xft xinetd xml xrootd"
+IUSE=3D"+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"
=20
CDEPEND=3D"
app-arch/xz-utils
@@ -78,6 +78,7 @@ CDEPEND=3D"
)
afs? ( net-fs/openafs )
avahi? ( net-dns/avahi )
+ c++0x? ( >=3Dsys-devel/gcc-4.7.0 )
clarens? ( dev-libs/xmlrpc-c[curl] )
emacs? ( virtual/emacs )
fits? ( sci-libs/cfitsio )
@@ -98,7 +99,7 @@ CDEPEND=3D"
dev-ruby/rubygems )
ssl? ( dev-libs/openssl )
xml? ( dev-libs/libxml2 )
- xrootd? ( net-libs/xrootd )"
+ xrootd? ( >=3Dnet-libs/xrootd-3.2.0 )"
=20
DEPEND=3D"${CDEPEND}
virtual/pkgconfig"
@@ -111,7 +112,9 @@ RDEPEND=3D"
=20
REQUIRED_USE=3D"
!X? ( !opengl !qt4 !xft )
- htmldoc? ( X doc graphviz )"
+ htmldoc? ( X doc graphviz )
+ mpi? ( math !openmp )
+ openmp? ( math !mpi )"
=20
VIRTUALX_REQUIRED=3D"htmldoc"
=20
@@ -132,12 +135,13 @@ pkg_setup() {
enewuser rootd -1 -1 /var/spool/rootd rootd
=20
if use math; then
- if use openmp && ! tc-has-openmp; then
- ewarn "You are using gcc and OpenMP is available with gcc >=3D 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=3D1 USE_PARALLEL_MINUIT2=3D1
+ if use openmp; then
+ if [[ $(tc-getCC)$ =3D=3D *gcc* ]] && ! tc-has-openmp; then
+ ewarn "You are using a gcc without OpenMP capabilities"
+ die "Need an OpenMP capable compiler"
+ else
+ export USE_OPENMP=3D1 USE_PARALLEL_MINUIT2=3D1
+ fi
elif use mpi; then
export USE_MPI=3D1 USE_PARALLEL_MINUIT2=3D1
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
=20
# make sure we use system libs and headers
rm montecarlo/eg/inc/cfortran.h README/cfortran.doc || die
@@ -279,13 +283,12 @@ src_configure() {
}
=20
src_compile() {
- emake OPT=3D"${CXXFLAGS}" F77OPT=3D"${FFLAGS}"
+ emake OPT=3D"${CXXFLAGS}" F77OPT=3D"${FFLAGS}" ROOTSYS=3D${S} LD_LIBRAR=
Y_PATH=3D${S}/lib
if use emacs; then
elisp-compile build/misc/*.el || die "elisp-compile failed"
fi
if use htmldoc; then
- LD_LIBRARY_PATH=3D${S}/lib:${S}/cint/cint/include:${S}/cint/cint/stl \
- ROOTSYS=3D${S} DISPLAY=3D":50" \
+ ROOTSYS=3D${S} LD_LIBRARY_PATH=3D${S}/lib DISPLAY=3D":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;