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.77) (envelope-from ) id 1SlE8S-0003d3-5D for garchives@archives.gentoo.org; Sun, 01 Jul 2012 06:59:56 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 33359E0534; Sun, 1 Jul 2012 06:59:47 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id E2F08E0534 for ; Sun, 1 Jul 2012 06:59:46 +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 0562A1B40B6 for ; Sun, 1 Jul 2012 06:59:46 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id B8E26E5436 for ; Sun, 1 Jul 2012 06:59:44 +0000 (UTC) From: "Andrew Savchenko" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andrew Savchenko" Message-ID: <1341125888.24c15d7d99615871d6fb2d36b17509f1d4af49cc.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/olbd.confd sci-physics/root/files/olbd.initd sci-physics/root/files/xrootd.confd sci-physics/root/files/xrootd.initd sci-physics/root/metadata.xml sci-physics/root/root-5.34.00.ebuild 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: 24c15d7d99615871d6fb2d36b17509f1d4af49cc X-VCS-Branch: master Date: Sun, 1 Jul 2012 06:59:44 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: c4e712b3-e672-450b-830c-df2c6e760ff0 X-Archives-Hash: 2d1a81bd3baf08164cd957a4c4948958 commit: 24c15d7d99615871d6fb2d36b17509f1d4af49cc Author: Andrew Savchenko gmail com> AuthorDate: Sun Jul 1 06:58:08 2012 +0000 Commit: Andrew Savchenko gmail com> CommitDate: Sun Jul 1 06:58:08 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/sci.git;a=3Dc= ommit;h=3D24c15d7d 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 201= 2/03/29 18:21:49 bicatali Exp $ =20 + 01 Jul 2012; Andrew Savchenko 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 20 Jun 2012; Andrew Savchenko -root-5.32.03-r2.ebu= ild, diff --git a/sci-physics/root/files/olbd.confd b/sci-physics/root/files/o= lbd.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=3D"root" - -# -# Please refer to the olbd(1) man(1) page for more -# information on command line parameters.=20 -OLBD_OPTS=3D"" diff --git a/sci-physics/root/files/olbd.initd b/sci-physics/root/files/o= lbd.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=3D${OLBD_USER} \ - --make-pidfile --pidfile=3D/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=3D/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=3D"root" - -# Please refer to the xrootd(1) man(1) page for more -# information on command line parameters.=20 -XROOTD_OPTS=3D"" 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.xm= l index cb56d9f..e7da68b 100644 --- a/sci-physics/root/metadata.xml +++ b/sci-physics/root/metadata.xml @@ -1,13 +1,13 @@ - - bircoph@gmail.com - Andrew Savchenko - Maintainer. Assign bugs to him - -sci-physics - + + bircoph@gmail.com + Andrew Savchenko + Maintainer. Assign bugs to him + + sci-physics + 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. - - Build ROOT using the C++11 standard. Not support= ed, requires sys-devel/gcc>=3D4.7.0 - Build the Clarens and PEAC plug-ins, to use in= a GRID enabled analysis - Support for images and data from FITS files with <= pkg>sci-libs/cfitsio - Support for sci-physics/geant version= 4 - Generate html documentation - Build the new cling interactive interpreter based = on sys-devel/llvm - Build all math related libraries plugins, needs sci-libs/gsl - Build the interface for sci-physics/pythia= version 6.x - Build the interface for sci-physics/pythia= version 8.x - Build the reflection database for the C++ interp= reter - Build the interface for net-libs/xrootd - + + Build ROOT using the C++11 standard. Not support= ed, requires sys-devel/gcc>=3D4.7.0 + Build the Clarens and PEAC plug-ins, to use in= a GRID enabled analysis + Support for images and data from FITS files with <= pkg>sci-libs/cfitsio + Generate html documentation + Build the new cling interactive interpreter based = on sys-devel/llvm + Build all math related libraries plugins, needs sci-libs/gsl + Build the interface for sci-physics/pythia= version 6.x + Build the interface for sci-physics/pythia= version 8.x + Build the reflection database for the C++ interp= reter + Build the interface for net-libs/xrootd + 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.ebui= ld,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 $ =20 EAPI=3D4 =20 @@ -16,7 +16,7 @@ else KEYWORDS=3D"~amd64 ~x86 ~amd64-linux ~x86-linux" fi =20 -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} t= oolchain-funcs user versionator =20 ROOFIT_DOC_PV=3D2.91-33 TMVA_DOC_PV=3D4.03 @@ -37,7 +37,7 @@ SRC_URI=3D"${SRC_URI} =20 SLOT=3D"0" LICENSE=3D"LGPL-2.1" -IUSE=3D"+X afs avahi c++0x clarens doc emacs examples fits fftw graphviz= htmldoc +IUSE=3D"+X afs avahi -c++0x clarens doc emacs examples fits fftw graphvi= z htmldoc kerberos ldap +math mpi mysql odbc +opengl openmp oracle postgres prefi= x pythia6 pythia8 python qt4 +reflex ruby ssl xft xinetd xml xrootd" =20 @@ -75,7 +75,6 @@ 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 ) @@ -131,8 +130,8 @@ pkg_setup() { =20 if use math; then if use openmp; then - if [[ $(tc-getCC)$ =3D=3D *gcc* ]] && ! tc-has-openmp; then - ewarn "You are using a gcc without OpenMP capabilities" + if [[ $(tc-getCXX)$ =3D=3D *g++* ]] && ! tc-has-openmp; then + ewarn "You are using a g++ without OpenMP capabilities" die "Need an OpenMP capable compiler" else export USE_OPENMP=3D1 USE_PARALLEL_MINUIT2=3D1 @@ -141,6 +140,11 @@ pkg_setup() { export USE_MPI=3D1 USE_PARALLEL_MINUIT2=3D1 fi fi + if use c++0x && [[ $(tc-getCXX) =3D=3D *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 } =20 src_prepare() { diff --git a/sci-physics/root/root-9999.ebuild b/sci-physics/root/root-99= 99.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=3D"~amd64 ~x86 ~amd64-linux ~x86-linux" fi =20 -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} t= oolchain-funcs user versionator =20 ROOFIT_DOC_PV=3D2.91-33 TMVA_DOC_PV=3D4.03 @@ -37,7 +37,7 @@ SRC_URI=3D"${SRC_URI} =20 SLOT=3D"0" LICENSE=3D"LGPL-2.1" -IUSE=3D"+X afs avahi c++0x clarens doc emacs examples fits fftw graphviz= htmldoc +IUSE=3D"+X afs avahi -c++0x clarens doc emacs examples fits fftw graphvi= z 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 @@ -75,7 +75,6 @@ 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 ) @@ -132,8 +131,8 @@ pkg_setup() { =20 if use math; then if use openmp; then - if [[ $(tc-getCC)$ =3D=3D *gcc* ]] && ! tc-has-openmp; then - ewarn "You are using a gcc without OpenMP capabilities" + if [[ $(tc-getCXX)$ =3D=3D *g++* ]] && ! tc-has-openmp; then + ewarn "You are using a g++ without OpenMP capabilities" die "Need an OpenMP capable compiler" else export USE_OPENMP=3D1 USE_PARALLEL_MINUIT2=3D1 @@ -142,6 +141,11 @@ pkg_setup() { export USE_MPI=3D1 USE_PARALLEL_MINUIT2=3D1 fi fi + if use c++0x && [[ $(tc-getCXX) =3D=3D *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 } =20 src_prepare() {