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

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

commit:     3559225394510ae62148186032911bd555d48e3d
Author:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
AuthorDate: Fri Mar  9 02:19:12 2012 +0000
Commit:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
CommitDate: Fri Mar  9 02:19:12 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=35592253

sci-physics/root: fix llvm support

Fix ebuild to honor llvm properly.
Order USE flags alphabetically.

---
 sci-physics/root/ChangeLog                         |    9 +++++++++
 sci-physics/root/metadata.xml                      |    2 +-
 sci-physics/root/root-5.26.00g.ebuild              |    2 +-
 sci-physics/root/root-5.28.00h.ebuild              |    2 +-
 ...{root-5.32.01.ebuild => root-5.32.01-r1.ebuild} |    9 +++++----
 5 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index a78dfa4..f9b57f7 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -2,6 +2,15 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.93 2012/03/02 05:34:01 bicatali Exp $
 
+*root-5.32.01-r1 (09 Mar 2012)
+
+  09 Mar 2012; Andrew Savchenko <bircoph@gmail.com> root-5.26.00g.ebuild,
+  root-5.28.00h.ebuild, -root-5.32.01.ebuild, +root-5.32.01-r1.ebuild,
+  metadata.xml:
+  Fix llvm support per bug 407097. Patch by Marek Szuba with some
+  changes. cling atm depends on live llvm and clang, so it may fail
+  to build, disabled by default. Fix USE flags ordering in ebuilds.
+
 *root-5.28.00h (09 Mar 2012)
 *root-5.26.00g (09 Mar 2012)
 

diff --git a/sci-physics/root/metadata.xml b/sci-physics/root/metadata.xml
index c1f9fd7..6ce0ec4 100644
--- a/sci-physics/root/metadata.xml
+++ b/sci-physics/root/metadata.xml
@@ -19,7 +19,7 @@
   <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>
-  <flag name="llvm">Build the new experimental cling interactive interpreter based on <pkg>sys-devel/llvm</pkg></flag>
+  <flag name="llvm">Build the new EXPERIMENTAL cling interactive interpreter based on <pkg>sys-devel/llvm</pkg></flag>
   <flag name="math">Build all math related libraries plugins, needs <pkg>sci-libs/gsl</pkg> </flag>
   <flag name="pythia6">Build the interface for <pkg>sci-physics/pythia</pkg> version 6.x </flag>
   <flag name="pythia8">Build the interface for <pkg>sci-physics/pythia</pkg> version 8.x </flag>

diff --git a/sci-physics/root/root-5.26.00g.ebuild b/sci-physics/root/root-5.26.00g.ebuild
index 1674a15..472ff8f 100644
--- a/sci-physics/root/root-5.26.00g.ebuild
+++ b/sci-physics/root/root-5.26.00g.ebuild
@@ -28,7 +28,7 @@ LICENSE="LGPL-2.1"
 KEYWORDS="~amd64 ~x86"
 IUSE="afs clarens doc emacs examples fftw geant4 graphviz kerberos ldap
 	+math mysql	odbc +opengl openmp oracle postgres pythia6 pythia8 python
-	+reflex	ruby qt4 ssl xft xml xinetd xrootd"
+	qt4 +reflex	ruby ssl xft xinetd xml xrootd"
 
 # libafterimage ignored, to check every version
 # see https://savannah.cern.ch/bugs/?func=detailitem&item_id=30944

diff --git a/sci-physics/root/root-5.28.00h.ebuild b/sci-physics/root/root-5.28.00h.ebuild
index 75fb7dd..2e1e1d5 100644
--- a/sci-physics/root/root-5.28.00h.ebuild
+++ b/sci-physics/root/root-5.28.00h.ebuild
@@ -29,7 +29,7 @@ LICENSE="LGPL-2.1"
 KEYWORDS="~amd64 ~x86"
 IUSE="afs avahi clarens doc emacs examples fits fftw graphviz kerberos ldap
 	+math mpi mysql ncurses odbc +opengl openmp oracle postgres pythia6
-	pythia8	python +reflex ruby qt4 ssl xft xml xinetd xrootd"
+	pythia8	python qt4 +reflex ruby ssl xft xinetd xml xrootd"
 
 CDEPEND="
 	>=dev-lang/cfortran-4.4-r2

diff --git a/sci-physics/root/root-5.32.01.ebuild b/sci-physics/root/root-5.32.01-r1.ebuild
similarity index 97%
rename from sci-physics/root/root-5.32.01.ebuild
rename to sci-physics/root/root-5.32.01-r1.ebuild
index 6981501..6e13d71 100644
--- a/sci-physics/root/root-5.32.01.ebuild
+++ b/sci-physics/root/root-5.32.01-r1.ebuild
@@ -25,8 +25,8 @@ SLOT="0"
 LICENSE="LGPL-2.1"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="+X afs avahi clarens doc emacs examples fits fftw graphviz kerberos ldap
-	llvm +math mpi mysql ncurses odbc +opengl openmp oracle postgres prefix
-	pythia6	pythia8	python +reflex ruby qt4 ssl xft xml xinetd xrootd"
+	-llvm +math mpi mysql ncurses odbc +opengl openmp oracle postgres prefix
+	pythia6	pythia8	python qt4 +reflex ruby ssl xft xinetd xml xrootd"
 
 CDEPEND="
 	app-arch/xz-utils
@@ -65,7 +65,7 @@ CDEPEND="
 	graphviz? ( media-gfx/graphviz )
 	kerberos? ( virtual/krb5 )
 	ldap? ( net-nds/openldap )
-	llvm? ( sys-devel/llvm )
+	llvm? ( >=sys-devel/clang-3.1 >=sys-devel/llvm-3.1 )
 	math? ( sci-libs/gsl sci-mathematics/unuran mpi? ( virtual/mpi ) )
 	mysql? ( virtual/mysql )
 	ncurses? ( sys-libs/ncurses )
@@ -177,6 +177,8 @@ src_configure() {
 		--with-cc=$(tc-getCC) \
 		--with-cxx=$(tc-getCXX) \
 		--with-f77=$(tc-getFC) \
+		--with-afs-shared=yes \
+		--with-llvm-config="${EPREFIX}"/usr/bin/llvm-config \
 		--with-sys-iconpath="${EPREFIX}"/usr/share/pixmaps \
 		--disable-builtin-afterimage \
 		--disable-builtin-freetype \
@@ -195,7 +197,6 @@ src_configure() {
 		--enable-soversion \
 		--enable-table \
 		--fail-on-missing \
-		--with-afs-shared=yes \
 		$(use_enable X x11) \
 		$(use_enable X asimage) \
 		$(use_enable afs) \