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

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

commit:     24c15d7d99615871d6fb2d36b17509f1d4af49cc
Author:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
AuthorDate: Sun Jul  1 06:58:08 2012 +0000
Commit:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
CommitDate: Sun Jul  1 06:58:08 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=24c15d7d

sci-physics/root: backport fixes from the portage

and remove old data

---
 sci-physics/root/ChangeLog           |    6 +++++
 sci-physics/root/files/olbd.confd    |    9 -------
 sci-physics/root/files/olbd.initd    |   26 ----------------------
 sci-physics/root/files/xrootd.confd  |    8 -------
 sci-physics/root/files/xrootd.initd  |   26 ----------------------
 sci-physics/root/metadata.xml        |   39 ++++++++++++++++-----------------
 sci-physics/root/root-5.34.00.ebuild |   16 ++++++++-----
 sci-physics/root/root-9999.ebuild    |   14 +++++++----
 8 files changed, 44 insertions(+), 100 deletions(-)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index 53f4413..1c0138f 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -2,6 +2,12 @@
 # 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 $
 
+  01 Jul 2012; Andrew Savchenko <bircoph@gmail.com> root-5.34.00.ebuild,
+  root-9999.ebuild, -files/olbd.confd, -files/olbd.initd, -files/xrootd.confd,
+  -files/xrootd.initd, metadata.xml:
+  Backport fixes from the portage.
+  Remove unused files and USE flag description.
+
 *root-5.32.03-r3 (20 Jun 2012)
 
   20 Jun 2012; Andrew Savchenko <bircoph@gmail.com> -root-5.32.03-r2.ebuild,

diff --git a/sci-physics/root/files/olbd.confd b/sci-physics/root/files/olbd.confd
deleted file mode 100644
index 848f4d7..0000000
--- a/sci-physics/root/files/olbd.confd
+++ /dev/null
@@ -1,9 +0,0 @@
-# conf.d file for olbd daemon
-
-# User to run as (default is `xrootd')
-OLBD_USER="root"
-
-#
-# Please refer to the olbd(1) man(1) page for more
-# information on command line parameters. 
-OLBD_OPTS=""

diff --git a/sci-physics/root/files/olbd.initd b/sci-physics/root/files/olbd.initd
deleted file mode 100644
index 1793300..0000000
--- a/sci-physics/root/files/olbd.initd
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/files/olbd.initd,v 1.1 2008/12/18 18:10:18 bicatali Exp $
-
-depend() {
-    need net
-    use dns logger
-    provide root-file-server
-}
-
-start() {
-    ebegin "Starting ROOT open load balancer server"
-    start-stop-daemon --start --quiet --user=${OLBD_USER} \
-	--make-pidfile --pidfile=/var/run/olbd.pid \
-	--exec /usr/bin/olbd --background -- ${OLBD_OPTS}
-    eend $?
-}
-
-stop() {
-    ebegin "Stopping ROOT open load balancer server"
-    start-stop-daemon --stop --quiet \
-	--pidfile=/var/run/olbd.pid \
-	--exec /usr/bin/olbd
-    eend $?
-}

diff --git a/sci-physics/root/files/xrootd.confd b/sci-physics/root/files/xrootd.confd
deleted file mode 100644
index e725cd1..0000000
--- a/sci-physics/root/files/xrootd.confd
+++ /dev/null
@@ -1,8 +0,0 @@
-# conf.d file for xroot daemon
-
-# User to run as (default is `root')
-XROOTD_USER="root"
-
-# Please refer to the xrootd(1) man(1) page for more
-# information on command line parameters. 
-XROOTD_OPTS=""

diff --git a/sci-physics/root/files/xrootd.initd b/sci-physics/root/files/xrootd.initd
deleted file mode 100644
index 28dd8a5..0000000
--- a/sci-physics/root/files/xrootd.initd
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/files/xrootd.initd,v 1.2 2009/01/20 18:04:09 bicatali Exp $
-
-depend() {
-    need net
-    use logger dns
-    provide root-file-server
-}
-
-start() {
-    ebegin "Starting extended ROOTD file server"
-    start-stop-daemon --start --quiet --user ${XROOTD_USER} \
-	--make-pidfile --pidfile /var/run/xrootd.pid \
-	--exec /usr/bin/xrootd --background -- ${XROOTD_OPTS}
-    eend $?
-}
-
-stop() {
-    ebegin "Stopping extended ROOTD file server"
-    start-stop-daemon --stop --quiet \
-	--pidfile /var/run/xrootd.pid \
-	--exec /usr/bin/xrootd
-    eend $?
-}

diff --git a/sci-physics/root/metadata.xml b/sci-physics/root/metadata.xml
index cb56d9f..e7da68b 100644
--- a/sci-physics/root/metadata.xml
+++ b/sci-physics/root/metadata.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-  <email>bircoph@gmail.com</email>
-  <name>Andrew Savchenko</name>
-  <description>Maintainer. Assign bugs to him</description>
-</maintainer>
-<herd>sci-physics</herd>
-<longdescription lang="en">
+	<maintainer>
+		<email>bircoph@gmail.com</email>
+		<name>Andrew Savchenko</name>
+		<description>Maintainer. Assign bugs to him</description>
+	</maintainer>
+	<herd>sci-physics</herd>
+	<longdescription lang="en">
   ROOT Object Oriented Technologies is an object oriented data
   analysis framework written in C++ by the CERN. Widely used in
   high energy physics, but also in other data analysis applications. It
@@ -15,17 +15,16 @@
   statistics, serialization, optimization, linear algebra, graphics,
   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>
-  <flag name="htmldoc">Generate html documentation</flag>
-  <flag name="llvm">Build the new 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>
-  <flag name="reflex">Build the reflection database for the C++ interpreter</flag>
-  <flag name="xrootd">Build the interface for <pkg>net-libs/xrootd</pkg> </flag>
-</use>
+	<use>
+		<flag name="c++0x"> Build ROOT using the C++11 standard. Not supported, requires <pkg>sys-devel/gcc</pkg>&gt;=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="htmldoc">Generate html documentation</flag>
+		<flag name="llvm">Build the new 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>
+		<flag name="reflex">Build the reflection database for the C++ interpreter</flag>
+		<flag name="xrootd">Build the interface for <pkg>net-libs/xrootd</pkg> </flag>
+	</use>
 </pkgmetadata>

diff --git a/sci-physics/root/root-5.34.00.ebuild b/sci-physics/root/root-5.34.00.ebuild
index 2a75fd8..54afec9 100644
--- a/sci-physics/root/root-5.34.00.ebuild
+++ b/sci-physics/root/root-5.34.00.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.32.02-r1.ebuild,v 1.3 2012/05/04 07:55:34 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.34.00.ebuild,v 1.2 2012/06/28 17:02:39 jlec Exp $
 
 EAPI=4
 
@@ -16,7 +16,7 @@ else
 	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 fi
 
-inherit elisp-common eutils fdo-mime fortran-2 multilib python toolchain-funcs user ${_SVN}
+inherit elisp-common eutils fdo-mime fortran-2 multilib python ${_SVN} toolchain-funcs user versionator
 
 ROOFIT_DOC_PV=2.91-33
 TMVA_DOC_PV=4.03
@@ -37,7 +37,7 @@ SRC_URI="${SRC_URI}
 
 SLOT="0"
 LICENSE="LGPL-2.1"
-IUSE="+X afs avahi c++0x clarens doc emacs examples fits fftw graphviz htmldoc
+IUSE="+X afs avahi -c++0x clarens doc emacs examples fits fftw graphviz htmldoc
 	kerberos ldap +math mpi mysql odbc +opengl openmp oracle postgres prefix
 	pythia6 pythia8 python qt4 +reflex ruby ssl xft xinetd xml xrootd"
 
@@ -75,7 +75,6 @@ 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 )
@@ -131,8 +130,8 @@ pkg_setup() {
 
 	if use math; then
 		if use openmp; then
-			if [[ $(tc-getCC)$ == *gcc* ]] && ! tc-has-openmp; then
-				ewarn "You are using a gcc without OpenMP capabilities"
+			if [[ $(tc-getCXX)$ == *g++* ]] && ! tc-has-openmp; then
+				ewarn "You are using a g++ without OpenMP capabilities"
 				die "Need an OpenMP capable compiler"
 			else
 				export USE_OPENMP=1 USE_PARALLEL_MINUIT2=1
@@ -141,6 +140,11 @@ pkg_setup() {
 			export USE_MPI=1 USE_PARALLEL_MINUIT2=1
 		fi
 	fi
+	if use c++0x && [[ $(tc-getCXX) == *g++* ]] && \
+		! version_is_at_least "4.7" "$(gcc-version)"; then
+		eerror "You are using a g++ without C++0x capabilities"
+		die "Need an C++0x capable compiler"
+	fi
 }
 
 src_prepare() {

diff --git a/sci-physics/root/root-9999.ebuild b/sci-physics/root/root-9999.ebuild
index e9b5476..689046e 100644
--- a/sci-physics/root/root-9999.ebuild
+++ b/sci-physics/root/root-9999.ebuild
@@ -16,7 +16,7 @@ else
 	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 fi
 
-inherit elisp-common eutils fdo-mime fortran-2 multilib python toolchain-funcs user ${_SVN}
+inherit elisp-common eutils fdo-mime fortran-2 multilib python ${_SVN} toolchain-funcs user versionator
 
 ROOFIT_DOC_PV=2.91-33
 TMVA_DOC_PV=4.03
@@ -37,7 +37,7 @@ SRC_URI="${SRC_URI}
 
 SLOT="0"
 LICENSE="LGPL-2.1"
-IUSE="+X afs avahi c++0x clarens doc emacs examples fits fftw graphviz htmldoc
+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"
 
@@ -75,7 +75,6 @@ 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 )
@@ -132,8 +131,8 @@ pkg_setup() {
 
 	if use math; then
 		if use openmp; then
-			if [[ $(tc-getCC)$ == *gcc* ]] && ! tc-has-openmp; then
-				ewarn "You are using a gcc without OpenMP capabilities"
+			if [[ $(tc-getCXX)$ == *g++* ]] && ! tc-has-openmp; then
+				ewarn "You are using a g++ without OpenMP capabilities"
 				die "Need an OpenMP capable compiler"
 			else
 				export USE_OPENMP=1 USE_PARALLEL_MINUIT2=1
@@ -142,6 +141,11 @@ pkg_setup() {
 			export USE_MPI=1 USE_PARALLEL_MINUIT2=1
 		fi
 	fi
+	if use c++0x && [[ $(tc-getCXX) == *g++* ]] && \
+		! version_is_at_least "4.7" "$(gcc-version)"; then
+		eerror "You are using a g++ without C++0x capabilities"
+		die "Need an C++0x capable compiler"
+	fi
 }
 
 src_prepare() {