Added use flags in metadata.xml, removed pch use flag (buggy upstream), added libiodbc as a possible implementation for ODBC. Also fixed qt-xmlpatterns dependency.

Package-Manager: portage-2.1.4.4

5 files changed, 74 insertions, 12 deletions

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index d5f5260b15eb..73d63a5b7f1c 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-physics/root
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.32 2008/07/27 22:20:12 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.33 2008/07/29 10:43:53 bicatali Exp $
+
+  29 Jul 2008; Sébastien Fabbro <bicatali@gentoo.org> metadata.xml,
+  root-5.18.00d.ebuild, root-5.20.00.ebuild:
+  Added use flags in metadata.xml, removed pch use flag (buggy upstream),
+  added libiodbc as a possible implementation for ODBC. Also fixed
+  qt-xmlpatterns dependency.
 
   27 Jul 2008; Carsten Lohrke <carlo@gentoo.org> root-5.16.00.ebuild,
   root-5.18.00d.ebuild:
diff --git a/sci-physics/root/Manifest b/sci-physics/root/Manifest
index 2a322375ecf6..1a1458e2e6fa 100644
--- a/sci-physics/root/Manifest
+++ b/sci-physics/root/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX root-5.16.00-fortran.patch 5076 RMD160 2218584a3a5093a8d4171913a2b024bb759aae03 SHA1 4ed648d54260fd2593174154d8331c5d5afd5f09 SHA256 4ad7a3057528f30716d200c8f1462cf92da6f1ebef9bc3fee1874000bc10deec
 AUX root-5.16.00-xft.patch 687 RMD160 58efbc6efea7970ce267d05998deb8f849ecd5c5 SHA1 19ba24f17846a46d0ca10d0958587bd9166efd6d SHA256 e3540b4cecae6eb9e1c80e7edc923334056d63b4dedfc8bece34d29eec76d0a1
 AUX root-5.18.00d-gcc43.patch 22153 RMD160 33e93c0bb1cf78f963948aef2603b52b8159502e SHA1 679770eca8079c63f8816375212734794f4997af SHA256 94dc090797e2b8e972d5803d0bb94b61eb9581d559c0d91d489b1e893c343519
@@ -15,7 +18,14 @@ DIST root_v5.18.00d.source.tar.gz 23581098 RMD160 8fd731b271d542e73ba0c7982f344d
 DIST root_v5.20.00.source.tar.gz 25349138 RMD160 daa702dd8729d125f57a4ac3bf35ea1e84c15e22 SHA1 20ab6f3ad974449ad105c3e330a28f80ea310501 SHA256 8286c78d5c9ac10b0d0b93c8ef353f1399b1c034384f0ac4845a4df1efd09a87
 EBUILD root-3.05.04.ebuild 1654 RMD160 7f96255fd29b2fc2f2d30e41aa1e41ac57d24622 SHA1 ca10f01367a50aa1c867a4e48e435f4eb24e5151 SHA256 d74fbfd44a1da70c297196b56885128ca47297c9c349f8a083050ff346058dce
 EBUILD root-5.16.00.ebuild 5013 RMD160 596fa91d5aeb62aa1dff05c28506d7c5f5a3fca5 SHA1 6bd6d49c4a94c3ed66a2d080ec34dd7d0910b0a7 SHA256 7257fd10017f5ba8dbe55c61c17e6aa6fc341beafc981216dd09bebd3d55b147
-EBUILD root-5.18.00d.ebuild 5255 RMD160 586729d31c2f83dadb4f59a41c53eef2dad312ec SHA1 2aeb8671007f16862e549f0fc5146f2f8fbbfd9a SHA256 1ac225d1100bc621c6e10776f0ee10cc906458a91e5601ff3798140a37403267
-EBUILD root-5.20.00.ebuild 5181 RMD160 1284e512c1eeb9adccd9b08fb495c81b4c00e4a6 SHA1 d5a3dd8ed86a17a31802df1ab722c0c3b7601a04 SHA256 52347304601efa48852aad12d0593f4679ff9567a29064c73ce43ebc4f0e6b14
-MISC ChangeLog 10827 RMD160 dbd14e56cfba7628ce8e6e2159bd75dff3035f97 SHA1 7d08febe01e7e556479431cdfc478773c05d22d2 SHA256 be2fcf945e35aed9e3f525f821731c68f201e84e95726825e7b461b149adc2a2
-MISC metadata.xml 597 RMD160 d61e05bcfed3b0839b7daf4cf3fdac3fcdfd268d SHA1 8fd69478a8a90f6222b1e428961815e0e697905a SHA256 8ae8ab4051e8534ca2df70f81fb999c478b8f1223980c0b366dc0501fa987c6c
+EBUILD root-5.18.00d.ebuild 5266 RMD160 2ab1a463d8d30b57c9236617d12d6f7ea0054bb5 SHA1 fcb6e0bee17e5874ebc7d2fba88f0fc9ddae73a9 SHA256 d8852a6f5e8a63d7cef4b626aee69ef90df6025a3e94a741177843857c92a571
+EBUILD root-5.20.00.ebuild 5299 RMD160 9efff77c3f491c51b5ca241628748c9036d54445 SHA1 7153941edabc72671607d9c359380298862305d2 SHA256 9b170e6800dd3ef2181b0840fa5298cf654b2871e5e256b013b148159592f31d
+MISC ChangeLog 11115 RMD160 c81df49c4309007c96e17a2a4170babd456cc1d4 SHA1 13f5fedc750bd8662b14ecc45f8bcc3d52bddbda SHA256 de334dab87e44f727e39b36bddaf196ea4b4423d8f4b5c9bfc65013140667298
+MISC metadata.xml 2556 RMD160 0f3563de7d05028b044ea981e972a54b8e03d7f5 SHA1 7162c9600ec415bae73fd1010f520fb9d3c6f342 SHA256 3f1b6b88c6dfe10ebd5faf386913ec75cc81e70907464f69607b06e51ca9544e
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkiO9HYACgkQ1ycZbhPLE2CUeACcC+LQHMoI+RQWYKZOe3P4AybW
+pioAn08xcTQk4A77r2gPmyXJSxUvCP1W
+=3fqn
+-----END PGP SIGNATURE-----
diff --git a/sci-physics/root/metadata.xml b/sci-physics/root/metadata.xml
index d4425c08ae2e..856a1f21c636 100644
--- a/sci-physics/root/metadata.xml
+++ b/sci-physics/root/metadata.xml
@@ -10,4 +10,48 @@
   statistics, serialization, optimization, linear algebra, graphics,
   GUI toolkit, and a complete visualization framework.
 </longdescription>
+<use>
+  <flag name="cern">
+    Build the HBOOK input/ouput functionality. HBOOK is a histogram
+    library. On ROOT versions previous to 5.20.00, it will depend
+    on <pkg>sci-physics/cernlib</pkg>. On versions above, it only need
+    a FORTRAN compiler.
+  </flag>
+  <flag name="cint7">
+    Build the experimental C++ INTerpreter version 7. Use with caution to
+    test this newer interpreter. If not sure, stick with version 6
+    included by default.
+  </flag>
+  <flag name="clarens">
+    Buld the Clarens and PEAC plug-ins, to use in a GRID enabled
+    analysis. The Clarens Grid-Enabled Web Services Framework is an
+    open source portal for ubiquitous access to data and computational
+    resources provided by computing grids. PEAC is an interactive
+    distributed analysis framework that uses Clarens as a glue
+    protocol to advertise and communicate amongst SAM, Global Manager
+    (GM), Local Manager (LM), DCache, and PROOF services.
+    It doesn't need Clarens to build, however if you want to use it,
+    you will require to build Clarens and PEAC on your own, it is not
+    yet in the Gentoo Portage tree. 
+    See http://clarens.sourceforge.net/ for Clarens
+    and http://physics.ucsd.edu/~schsu/project/peac.html for
+    PEAC.
+  </flag>
+  <flag name="geant4">
+    Build the <pkg>sci-physics/geant</pkg> (GEANT4) navigator.    
+  </flag>
+  <flag name="math">
+    Build all math libraries plugins. It includes
+    the <pkg>sci-libs/gsl</pkg> bindings in MathMore, the GenVector
+    physical vectors package, the Minuit2 minimization library (same as
+    standalone <pkg>sci-libs/minuit</pkg>), the RooFit toolkit for
+    distribution modeling, and the Universal Non-Uniform RANdom number
+    generators (UNURAN) library.
+  </flag>
+  <flag name="xrootd">
+    Build the xrootd low latency file server. For more on the eXtended Request
+    Daemon (xrd) and associated software, please see
+    http://xrootd.slac.stanford.edu.
+  </flag>
+</use>
 </pkgmetadata>
diff --git a/sci-physics/root/root-5.18.00d.ebuild b/sci-physics/root/root-5.18.00d.ebuild
index 6403f0deea37..e6375a97e063 100644
--- a/sci-physics/root/root-5.18.00d.ebuild
+++ b/sci-physics/root/root-5.18.00d.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.18.00d.ebuild,v 1.6 2008/07/27 22:20:12 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.18.00d.ebuild,v 1.7 2008/07/29 10:43:53 bicatali Exp $
 
 EAPI="1"
 inherit versionator flag-o-matic eutils toolchain-funcs qt3 qt4 fortran
@@ -39,7 +39,7 @@ RDEPEND="sys-apps/shadow
 	qt4? ( || ( ( x11-libs/qt-gui:4
 			x11-libs/qt-opengl:4
 			x11-libs/qt-qt3support:4
-			x11-libs/qt-xml:4 )
+			x11-libs/qt-xmlpatterns:4 )
 			=x11-libs/qt-4.3* ) )
 	fftw? ( >=sci-libs/fftw-3 )
 	python? ( dev-lang/python )
diff --git a/sci-physics/root/root-5.20.00.ebuild b/sci-physics/root/root-5.20.00.ebuild
index 5736e6e29d26..35b8a1c55864 100644
--- a/sci-physics/root/root-5.20.00.ebuild
+++ b/sci-physics/root/root-5.20.00.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.20.00.ebuild,v 1.3 2008/07/26 21:40:13 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.20.00.ebuild,v 1.4 2008/07/29 10:43:53 bicatali Exp $
 
 EAPI=1
 inherit versionator flag-o-matic eutils toolchain-funcs qt4 fortran
@@ -18,7 +18,7 @@ LICENSE="LGPL-2.1"
 KEYWORDS="~amd64 ~hppa ~sparc ~x86"
 
 IUSE="afs cern clarens doc fftw geant4 kerberos ldap +math mysql odbc
-	oracle pch postgres python ruby qt4 ssl xml xrootd"
+	oracle postgres python ruby qt4 ssl xml xrootd"
 
 # libafterimage ignored, may be re-install for >=5.20
 # see https://savannah.cern.ch/bugs/?func=detailitem&item_id=30944
@@ -43,7 +43,7 @@ RDEPEND="sys-apps/shadow
 	qt4? ( || ( ( x11-libs/qt-gui:4
 			x11-libs/qt-opengl:4
 			x11-libs/qt-qt3support:4
-			x11-libs/qt-xml:4 )
+			x11-libs/qt-xmlpatterns:4 )
 			=x11-libs/qt-4.3* ) )
 	fftw? ( sci-libs/fftw:3.0 )
 	python? ( dev-lang/python )
@@ -51,7 +51,7 @@ RDEPEND="sys-apps/shadow
 	ssl? ( dev-libs/openssl )
 	xml? ( dev-libs/libxml2 )
 	geant4? ( sci-physics/geant:4 )
-	odbc? ( dev-db/unixODBC )
+	odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) )
 	oracle? ( dev-db/oracle-instantclient-basic )
 	clarens? ( dev-libs/xmlrpc-c )"
 
@@ -118,6 +118,9 @@ src_compile() {
 		myconf="${myconf} --with-clhep-incdir=/usr/include" && \
 		myconf="${myconf} --with-g4-libdir=${G4LIB}"
 
+	use odbc && [[ -z $(type -P odbc-config) ]] && \
+		myconf="${myconf} --with-odbc-incdir=/usr/include/iodbc"
+
 	# the configure script is not the standard autotools
 	./configure \
 		${target} \
@@ -163,7 +166,6 @@ src_compile() {
 		$(use_enable math unuran) \
 		$(use_enable mysql) \
 		$(use_enable odbc) \
-		$(use_enable pch) \
 		$(use_enable postgres pgsql) \
 		$(use_enable python) \
 		$(use_enable qt4 qt) \