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 ) id 1SF8A1-000157-EA for garchives@archives.gentoo.org; Tue, 03 Apr 2012 18:08:53 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9164FE07B2; Tue, 3 Apr 2012 18:07:56 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 4D5DCE07B2 for ; Tue, 3 Apr 2012 18:07:51 +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 8F15B1B400A for ; Tue, 3 Apr 2012 18:07:50 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 5C262E5430 for ; Tue, 3 Apr 2012 18:07:49 +0000 (UTC) From: "Justin Lecher" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" Message-ID: <1333476327.1cf3ca83bcef5eec20424599d0fc65f832b92fff.jlec@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-physics/root/ X-VCS-Repository: proj/sci X-VCS-Files: sci-physics/root/ChangeLog sci-physics/root/metadata.xml sci-physics/root/root-5.28.00h-r1.ebuild sci-physics/root/root-5.32.02-r1.ebuild sci-physics/root/root-9999.ebuild X-VCS-Directories: sci-physics/root/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: 1cf3ca83bcef5eec20424599d0fc65f832b92fff X-VCS-Branch: master Date: Tue, 3 Apr 2012 18:07:49 +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: 29004e53-0cfb-4bf4-8151-082ae2007cc1 X-Archives-Hash: 7c7dc547b5c258cc5772879f984cecb3 commit: 1cf3ca83bcef5eec20424599d0fc65f832b92fff Author: Justin Lecher gentoo org> AuthorDate: Tue Apr 3 18:05:27 2012 +0000 Commit: Justin Lecher gentoo org> CommitDate: Tue Apr 3 18:05:27 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/sci.git;a=3Dc= ommit;h=3D1cf3ca83 sci-physics/root: Fix EAPI=3D4 usage, don't mix CFLAGS/CXXFLAGS, respect = LD (Portage version: 2.2.0_alpha99/git/Linux x86_64, unsigned Manifest commi= t) --- sci-physics/root/ChangeLog | 4 ++ sci-physics/root/metadata.xml | 36 +++++++++--------- sci-physics/root/root-5.28.00h-r1.ebuild | 2 +- sci-physics/root/root-5.32.02-r1.ebuild | 58 +++++++++++++++---------= ----- sci-physics/root/root-9999.ebuild | 56 +++++++++++++++---------= ----- 5 files changed, 82 insertions(+), 74 deletions(-) diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog index d290f70..0a1a61a 100644 --- a/sci-physics/root/ChangeLog +++ b/sci-physics/root/ChangeLog @@ -2,6 +2,10 @@ # 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 + 03 Apr 2012; Justin Lecher root-5.28.00h-r1.ebuild, + root-5.32.02-r1.ebuild, root-9999.ebuild, metadata.xml: + Fix EAPI=3D4 usage, don't mix CFLAGS/CXXFLAGS, respect LD + *root-5.32.02-r1 (03 Apr 2012) *root-5.28.00h-r1 (03 Apr 2012) =20 diff --git a/sci-physics/root/metadata.xml b/sci-physics/root/metadata.xm= l index 6ce0ec4..0af5788 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,15 +15,15 @@ statistics, serialization, optimization, linear algebra, graphics, GUI toolkit, and a complete visualization framework. - - 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 - Build the new EXPERIMENTAL cling interactive inter= preter 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 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 + Build the new EXPERIMENTAL cling interactive inter= preter 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.28.00h-r1.ebuild b/sci-physics/root/= root-5.28.00h-r1.ebuild index 64b7966..2963ad3 100644 --- a/sci-physics/root/root-5.28.00h-r1.ebuild +++ b/sci-physics/root/root-5.28.00h-r1.ebuild @@ -45,7 +45,7 @@ CDEPEND=3D" x11-libs/libXft x11-libs/libXpm || ( - >=3Dmedia-libs/libafterimage-1.20[gif,jpeg,png,tiff]=20 + >=3Dmedia-libs/libafterimage-1.20[gif,jpeg,png,tiff] >=3Dx11-wm/afterstep-2.2.11[gif,jpeg,png,tiff] ) afs? ( net-fs/openafs ) diff --git a/sci-physics/root/root-5.32.02-r1.ebuild b/sci-physics/root/r= oot-5.32.02-r1.ebuild index 44ca400..12559d8 100644 --- a/sci-physics/root/root-5.32.02-r1.ebuild +++ b/sci-physics/root/root-5.32.02-r1.ebuild @@ -14,11 +14,12 @@ PATCH_PV2=3D5.32.00 =20 DESCRIPTION=3D"C++ data analysis framework and interpreter from CERN" HOMEPAGE=3D"http://root.cern.ch/" -SRC_URI=3D"ftp://root.cern.ch/${PN}/${PN}_v${PV}.source.tar.gz +SRC_URI=3D" + ftp://root.cern.ch/${PN}/${PN}_v${PV}.source.tar.gz doc? ( ftp://root.cern.ch/${PN}/doc/Users_Guide_${DOC_PV}.pdf - math? ( - ftp://root.cern.ch/${PN}/doc/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf - http://tmva.sourceforge.net/docu/TMVAUsersGuide.pdf -> TMVAUsersGuide-= v${TMVA_DOC_PV}.pdf ) )" + math? ( + ftp://root.cern.ch/${PN}/doc/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf + http://tmva.sourceforge.net/docu/TMVAUsersGuide.pdf -> TMVAUsersGuide= -v${TMVA_DOC_PV}.pdf ) )" =20 SLOT=3D"0" LICENSE=3D"LGPL-2.1" @@ -45,7 +46,7 @@ CDEPEND=3D" x11-libs/libXext x11-libs/libXpm || ( - >=3Dmedia-libs/libafterimage-1.20[gif,jpeg,png,tiff]=20 + >=3Dmedia-libs/libafterimage-1.20[gif,jpeg,png,tiff] >=3Dx11-wm/afterstep-2.2.11[gif,jpeg,png,tiff] ) opengl? ( virtual/opengl virtual/glu x11-libs/gl2ps ) @@ -109,7 +110,7 @@ pkg_setup() { enewuser rootd -1 -1 /var/spool/rootd rootd =20 if use math; then - if use openmp && [[ $(tc-getCC)$ =3D=3D *gcc* ]] && ! tc-has-openmp; t= hen + 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" @@ -134,17 +135,17 @@ src_prepare() { "${FILESDIR}"/${PN}-${PATCH_PV2}-explicit-functions.patch =20 # make sure we use system libs and headers - rm montecarlo/eg/inc/cfortran.h README/cfortran.doc - rm -rf graf2d/asimage/src/libAfterImage - rm -rf graf3d/ftgl/{inc,src} - rm -rf graf2d/freetype/src - rm -rf graf3d/glew/{inc,src} - rm -rf core/pcre/src - rm -rf math/unuran/src/unuran-*.tar.gz - LANG=3DC LC_ALL=3DC find core/zip -type f -name "[a-z]*" | xargs rm - rm -rf core/lzma/src/*.tar.gz - rm graf3d/gl/{inc,src}/gl2ps.* - sed -i -e 's/^GLLIBS *:=3D .* $(OPENGLLIB)/& -lgl2ps/' graf3d/gl/Module= .mk + rm montecarlo/eg/inc/cfortran.h README/cfortran.doc || die + rm -rf graf2d/asimage/src/libAfterImage || die + rm -rf graf3d/ftgl/{inc,src} || die + rm -rf graf2d/freetype/src || die + rm -rf graf3d/glew/{inc,src} || die + rm -rf core/pcre/src || die + rm -rf math/unuran/src/unuran-*.tar.gz || die + LANG=3DC LC_ALL=3DC find core/zip -type f -name "[a-z]*" -print0 | xarg= s -0 rm -f || die + rm -rf core/lzma/src/*.tar.gz || die + rm graf3d/gl/{inc,src}/gl2ps.* || die + sed -i -e 's/^GLLIBS *:=3D .* $(OPENGLLIB)/& -lgl2ps/' graf3d/gl/Module= .mk || die =20 # In Gentoo, libPythia6 is called libpythia6 # libungif is called libgif, @@ -178,6 +179,7 @@ src_configure() { --with-cc=3D$(tc-getCC) \ --with-cxx=3D$(tc-getCXX) \ --with-f77=3D$(tc-getFC) \ + --with-ld=3D$(tc-getCXX) \ --with-afs-shared=3Dyes \ --with-sys-iconpath=3D"${EPREFIX}"/usr/share/pixmaps \ --disable-builtin-afterimage \ @@ -238,7 +240,7 @@ src_configure() { } =20 src_compile() { - emake OPT=3D"${CFLAGS}" F77OPT=3D"${FFLAGS}" || die "emake failed" + emake OPT=3D"${CXXFLAGS}" F77OPT=3D"${FFLAGS}" if use emacs; then elisp-compile build/misc/*.el || die "elisp-compile failed" fi @@ -259,7 +261,7 @@ doc_install() { insinto /usr/share/doc/${PF}/examples/tutorials/tmva doins -r tmva/test else - rm -rf "${ED}"/usr/share/doc/${PF}/examples + rm -rf "${ED}"/usr/share/doc/${PF}/examples || die fi } =20 @@ -296,13 +298,13 @@ desktop_install() { } =20 src_install() { - emake DESTDIR=3D"${D}" install || die "emake install failed" + emake DESTDIR=3D"${D}" install =20 echo "LDPATH=3D${EPREFIX}/usr/$(get_libdir)/root" > 99root use pythia8 && echo "PYTHIA8=3D${EPREFIX}/usr" >> 99root use python && echo "PYTHONPATH=3D${EPREFIX}/usr/$(get_libdir)/root" >> = 99root use ruby && echo "RUBYLIB=3D${EPREFIX}/usr/$(get_libdir)/root" >> 99roo= t - doenvd 99root || die "doenvd failed" + doenvd 99root =20 # The build system installs Emacs support unconditionally and in the wr= ong # directory. Remove it and call elisp-install in case of USE=3Demacs. @@ -316,18 +318,18 @@ src_install() { desktop_install =20 # Cleanup of files either already distributed or unused on Gentoo - rm "${ED}"usr/share/doc/${PF}/{INSTALL,LICENSE,COPYING.CINT} - rm "${ED}"usr/share/root/fonts/LICENSE + rm "${ED}"usr/share/doc/${PF}/{INSTALL,LICENSE,COPYING.CINT} || die + rm "${ED}"usr/share/root/fonts/LICENSE || die pushd "${ED}"usr/$(get_libdir)/root/cint/cint/lib > /dev/null rm -f posix/mktypes dll_stl/setup \ - G__* dll_stl/G__* dll_stl/rootcint_* posix/exten.o - rm -f "${ED}"usr/$(get_libdir)/root/cint/cint/include/makehpib - rm -f "${ED}"/etc/root/proof/*.sample - rm -rf "${ED}"/etc/root/daemons + G__* dll_stl/G__* dll_stl/rootcint_* posix/exten.o || die + rm -f "${ED}"usr/$(get_libdir)/root/cint/cint/include/makehpib || die + rm -f "${ED}"/etc/root/proof/*.sample || die + rm -rf "${ED}"/etc/root/daemons || die popd > /dev/null # these should be in PATH mv "${ED}"etc/root/proof/utils/pq2/pq2* \ - "${ED}"usr/bin + "${ED}"usr/bin/ || die } =20 pkg_postinst() { diff --git a/sci-physics/root/root-9999.ebuild b/sci-physics/root/root-99= 99.ebuild index 3ffcc4f..6b3c224 100644 --- a/sci-physics/root/root-9999.ebuild +++ b/sci-physics/root/root-9999.ebuild @@ -27,12 +27,13 @@ DESCRIPTION=3D"C++ data analysis framework and interp= reter from CERN" HOMEPAGE=3D"http://root.cern.ch/" SRC_URI=3D"${SRC_URI} doc? ( ftp://root.cern.ch/${PN}/doc/Users_Guide_${DOC_PV}.pdf - math? ( - ftp://root.cern.ch/${PN}/doc/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf - http://tmva.sourceforge.net/docu/TMVAUsersGuide.pdf -> TMVAUsersGuide-= v${TMVA_DOC_PV}.pdf ) )" + math? ( + ftp://root.cern.ch/${PN}/doc/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf + http://tmva.sourceforge.net/docu/TMVAUsersGuide.pdf -> TMVAUsersGuide= -v${TMVA_DOC_PV}.pdf ) )" =20 SLOT=3D"0" LICENSE=3D"LGPL-2.1" +KEYWORDS=3D"" IUSE=3D"+X afs avahi clarens doc emacs examples fits fftw graphviz kerbe= ros ldap llvm +math mpi mysql odbc +opengl openmp oracle postgres prefix pythia6 pythia8 python qt4 +reflex ruby ssl xft xinetd xml xrootd" @@ -55,7 +56,7 @@ CDEPEND=3D" x11-libs/libXext x11-libs/libXpm || ( - >=3Dmedia-libs/libafterimage-1.20[gif,jpeg,png,tiff]=20 + >=3Dmedia-libs/libafterimage-1.20[gif,jpeg,png,tiff] >=3Dx11-wm/afterstep-2.2.11[gif,jpeg,png,tiff] ) opengl? ( virtual/opengl virtual/glu x11-libs/gl2ps ) @@ -120,7 +121,7 @@ pkg_setup() { enewuser rootd -1 -1 /var/spool/rootd rootd =20 if use math; then - if use openmp && [[ $(tc-getCC)$ =3D=3D *gcc* ]] && ! tc-has-openmp; t= hen + 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" @@ -144,17 +145,17 @@ src_prepare() { "${FILESDIR}"/${PN}-${PATCH_PV2}-chklib64.patch =20 # make sure we use system libs and headers - rm montecarlo/eg/inc/cfortran.h README/cfortran.doc - rm -rf graf2d/asimage/src/libAfterImage - rm -rf graf3d/ftgl/{inc,src} - rm -rf graf2d/freetype/src - rm -rf graf3d/glew/{inc,src} - rm -rf core/pcre/src - rm -rf math/unuran/src/unuran-*.tar.gz - LANG=3DC LC_ALL=3DC find core/zip -type f -name "[a-z]*" | xargs rm - rm -rf core/lzma/src/*.tar.gz - rm graf3d/gl/{inc,src}/gl2ps.* - sed -i -e 's/^GLLIBS *:=3D .* $(OPENGLLIB)/& -lgl2ps/' graf3d/gl/Module= .mk + rm montecarlo/eg/inc/cfortran.h README/cfortran.doc || die + rm -rf graf2d/asimage/src/libAfterImage || die + rm -rf graf3d/ftgl/{inc,src} || die + rm -rf graf2d/freetype/src || die + rm -rf graf3d/glew/{inc,src} || die + rm -rf core/pcre/src || die + rm -rf math/unuran/src/unuran-*.tar.gz || die + LANG=3DC LC_ALL=3DC find core/zip -type f -name "[a-z]*" -print0 | xarg= s -0 rm -f || die + rm -rf core/lzma/src/*.tar.gz || die + rm graf3d/gl/{inc,src}/gl2ps.* || die + sed -i -e 's/^GLLIBS *:=3D .* $(OPENGLLIB)/& -lgl2ps/' graf3d/gl/Module= .mk || die =20 # In Gentoo, libPythia6 is called libpythia6 # libungif is called libgif, @@ -188,6 +189,7 @@ src_configure() { --with-cc=3D$(tc-getCC) \ --with-cxx=3D$(tc-getCXX) \ --with-f77=3D$(tc-getFC) \ + --with-ld=3D$(tc-getCXX) \ --with-afs-shared=3Dyes \ --with-llvm-config=3D"${EPREFIX}"/usr/bin/llvm-config \ --with-sys-iconpath=3D"${EPREFIX}"/usr/share/pixmaps \ @@ -249,7 +251,7 @@ src_configure() { } =20 src_compile() { - emake OPT=3D"${CFLAGS}" F77OPT=3D"${FFLAGS}" || die "emake failed" + emake OPT=3D"${CXXFLAGS}" F77OPT=3D"${FFLAGS}" if use emacs; then elisp-compile build/misc/*.el || die "elisp-compile failed" fi @@ -270,7 +272,7 @@ doc_install() { insinto /usr/share/doc/${PF}/examples/tutorials/tmva doins -r tmva/test else - rm -rf "${ED}"/usr/share/doc/${PF}/examples + rm -rf "${ED}"/usr/share/doc/${PF}/examples || die fi } =20 @@ -307,13 +309,13 @@ desktop_install() { } =20 src_install() { - emake DESTDIR=3D"${D}" install || die "emake install failed" + emake DESTDIR=3D"${D}" install =20 echo "LDPATH=3D${EPREFIX}/usr/$(get_libdir)/root" > 99root use pythia8 && echo "PYTHIA8=3D${EPREFIX}/usr" >> 99root use python && echo "PYTHONPATH=3D${EPREFIX}/usr/$(get_libdir)/root" >> = 99root use ruby && echo "RUBYLIB=3D${EPREFIX}/usr/$(get_libdir)/root" >> 99roo= t - doenvd 99root || die "doenvd failed" + doenvd 99root =20 # The build system installs Emacs support unconditionally and in the wr= ong # directory. Remove it and call elisp-install in case of USE=3Demacs. @@ -327,18 +329,18 @@ src_install() { desktop_install =20 # Cleanup of files either already distributed or unused on Gentoo - rm "${ED}"usr/share/doc/${PF}/{INSTALL,LICENSE,COPYING.CINT} - rm "${ED}"usr/share/root/fonts/LICENSE + rm "${ED}"usr/share/doc/${PF}/{INSTALL,LICENSE,COPYING.CINT} || die + rm "${ED}"usr/share/root/fonts/LICENSE || die pushd "${ED}"usr/$(get_libdir)/root/cint/cint/lib > /dev/null rm -f posix/mktypes dll_stl/setup \ - G__* dll_stl/G__* dll_stl/rootcint_* posix/exten.o - rm -f "${ED}"usr/$(get_libdir)/root/cint/cint/include/makehpib - rm -f "${ED}"/etc/root/proof/*.sample - rm -rf "${ED}"/etc/root/daemons + G__* dll_stl/G__* dll_stl/rootcint_* posix/exten.o || die + rm -f "${ED}"usr/$(get_libdir)/root/cint/cint/include/makehpib || die + rm -f "${ED}"/etc/root/proof/*.sample || die + rm -rf "${ED}"/etc/root/daemons || die popd > /dev/null # these should be in PATH mv "${ED}"etc/root/proof/utils/pq2/pq2* \ - "${ED}"usr/bin + "${ED}"usr/bin/ || die } =20 pkg_postinst() {