sci-physics/root: Imported latest fixes from sci overlay, including LD and CXXFLAGS respect and clean EAPI=4 usage

Package-Manager: portage-2.2.0_alpha99/cvs/Linux x86_64

5 files changed, 66 insertions, 59 deletions

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index 6fd6d4959309..32cf8db4a83b 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-physics/root
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.97 2012/04/03 16:02:52 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.98 2012/04/03 18:03:41 jlec Exp $
+
+  03 Apr 2012; Justin Lecher <jlec@gentoo.org> root-5.28.00h-r1.ebuild,
+  root-5.32.02-r1.ebuild, metadata.xml:
+  Imported latest fixes from sci overlay, including LD and CXXFLAGS respect and
+  clean EAPI=4 usage
 
   03 Apr 2012; Sébastien Fabbro <bicatali@gentoo.org> -root-5.28.00h.ebuild,
   +root-5.28.00h-r1.ebuild, -root-5.32.01-r2.ebuild, +root-5.32.02-r1.ebuild:
diff --git a/sci-physics/root/Manifest b/sci-physics/root/Manifest
index eaf32eb39fec..0f9232796f6e 100644
--- a/sci-physics/root/Manifest
+++ b/sci-physics/root/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX olbd.confd 197 RMD160 798de1808502f3e4ecfc5f024b56a419d9824057 SHA1 f2a4385fdf9849eafb1d5457727f6fbe80af1da3 SHA256 5a34da76bbe56cd3b8128f05c0d9900f9d7f7ffdcffc5deeb816c78ea46679ba
 AUX olbd.initd 714 RMD160 be3eb2d28a199cf5e4c460f8e7682c0a2aadbe43 SHA1 bfb096b8678da0a25054e1b1460dedda8758144b SHA256 7ddb98aebcd4ef0009b1fed7946ba5aaa8c806ee97df9e94ecb28e6b803e9300
@@ -35,14 +35,14 @@ DIST root_v5.28.00h.source.tar.gz 31654844 RMD160 b4ad8b71b833a1a1b7826b7b29c186
 DIST root_v5.32.02.source.tar.gz 55519485 RMD160 0700dbb56adebd07c4e667fa9f78f7a75f59e511 SHA1 f0aa091d9544a0a4215eb085ffa720498ca73e54 SHA256 5f14f50e4489cd74b3c5bdfbfff8379c6aaaf83d3ace3318c62964be6fdc38a2
 EBUILD root-5.26.00e-r1.ebuild 9310 RMD160 6319be990e48486f77acbb4c858c14e1a5802cee SHA1 981645ad29e0a501eb74b4af740af08fcecd7ee8 SHA256 0e3168da9ff9f7ab4d2e88f47b6c61ef836481ae7652c63aefd069557a760e2e
 EBUILD root-5.26.00g.ebuild 9478 RMD160 3b70f7d8393e0ec0af143405ead48e21f5a1d76b SHA1 1c3499025736efeb64126eb2ff6279743ed8ba43 SHA256 d884c4350ba64e0a220d6338ce724ebc56bea808ccb969147264aa3876fa3e02
-EBUILD root-5.28.00h-r1.ebuild 9985 RMD160 f8e313fdb6afdb79edc7a3970df8d16b510e8e0b SHA1 f667cf913822c497607b3f5438a397cd90f400bd SHA256 7e3be4ab5ce4cc748491054a0212e0ecfe5df75fa39db5d5288b56d168c8348d
-EBUILD root-5.32.02-r1.ebuild 10075 RMD160 3b7d26bee54fb8eeac09a3327b602bfec7340eb8 SHA1 d7c9b20eee07a72a3605fa46f7df2afa61e37876 SHA256 41fda338c695d11b4b8e89205c207ee80273c1d92a47439cb9383e20dda6be13
-MISC ChangeLog 28564 RMD160 f23dfb976e20c703f4b98a06246ea9fd694b3756 SHA1 e7aa7dc05fffd10cec8cbdf5b98a5056423ce7e3 SHA256 88fce85221fb4fe6466fa70a9532a568cb41e4be358117c81d73af64e7d4f701
-MISC metadata.xml 1614 RMD160 c52cb04fda6bd4e866dd15617cee749b4660e674 SHA1 ea3766d705da221c47ccd7f98a37fc62fe090e01 SHA256 e2b63f8b96a327d451634a4d8b41fc122de78f1f0a81b0d8d96e01ac08a5d2e7
+EBUILD root-5.28.00h-r1.ebuild 9980 RMD160 89537f5d66b426a5b5da53f3196f1c4452087246 SHA1 8b1705801dda5285b41ee92967eafbea9f08fce1 SHA256 e262ab87c6e90ec641bf0ca3c7f57abc0e4dad6fcdaa61df2b8106528589e023
+EBUILD root-5.32.02-r1.ebuild 10146 RMD160 71f99b830771ef3449f143d5e9fc6cbf70d662c8 SHA1 70a0c936ba7395f368dddf3e9d22ecf4792bbd39 SHA256 3816a0aa5a76652280b1d83d3f7d63598df77213da6116ca8b9b9764798a500b
+MISC ChangeLog 28774 RMD160 51084145725be9faa4e31ee47134a58b9e9167a4 SHA1 638388d39fe83a4c0d1a699f11ec9c5ad2dd8e5a SHA256 c4a827056361b0379bc5ea3a86aaa1f2c973fe9b4bad43ab5913ce732332e726
+MISC metadata.xml 1620 RMD160 157ded1782f932a5a3dd0cc183ff0fc574fe9c00 SHA1 7ec5a31a174373c2d2ecaaf9f8bf20f094a41ac8 SHA256 2194e8d3112ec7a6c45405263e6598a6b68ecc5ba05c8dd3103deb7ba8111bbc
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk97HzYACgkQ1ycZbhPLE2Bm5gCfQsiT6bPZvgDiGDTZqTAJqBxN
-CfcAoKCopChpbvWxXntRoKnRF48lPSkW
-=vUvB
+iEYEAREKAAYFAk97O4IACgkQgAnW8HDreRbAcgCglhhlhtUWmmpcNjQw7USzkmLy
+e7kAoJ9q+GznEWjPguy+N2JwMmlyB/BJ
+=CHWH
 -----END PGP SIGNATURE-----
diff --git a/sci-physics/root/metadata.xml b/sci-physics/root/metadata.xml
index aaec26ab1563..f39c4478f679 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,15 +15,15 @@
   statistics, serialization, optimization, linear algebra, graphics,
   GUI toolkit, and a complete visualization framework.
 </longdescription>
-<use>
-  <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 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="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 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.28.00h-r1.ebuild b/sci-physics/root/root-5.28.00h-r1.ebuild
index 11be679eeff5..cef0d16ce32a 100644
--- a/sci-physics/root/root-5.28.00h-r1.ebuild
+++ b/sci-physics/root/root-5.28.00h-r1.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.28.00h-r1.ebuild,v 1.1 2012/04/03 16:02:52 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.28.00h-r1.ebuild,v 1.2 2012/04/03 18:03:41 jlec Exp $
 
 EAPI=3
 
@@ -45,7 +45,7 @@ CDEPEND="
 	x11-libs/libXft
 	x11-libs/libXpm
 	|| (
-		>=media-libs/libafterimage-1.20[gif,jpeg,png,tiff] 
+		>=media-libs/libafterimage-1.20[gif,jpeg,png,tiff]
 		>=x11-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/root-5.32.02-r1.ebuild
index 6b4c09b468c0..c8db84e897e6 100644
--- a/sci-physics/root/root-5.32.02-r1.ebuild
+++ b/sci-physics/root/root-5.32.02-r1.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.1 2012/04/03 16:02:52 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.32.02-r1.ebuild,v 1.2 2012/04/03 18:03:41 jlec Exp $
 
 EAPI=4
 PYTHON_DEPEND="python? 2"
@@ -14,11 +14,12 @@ PATCH_PV2=5.32.00
 
 DESCRIPTION="C++ data analysis framework and interpreter from CERN"
 HOMEPAGE="http://root.cern.ch/"
-SRC_URI="ftp://root.cern.ch/${PN}/${PN}_v${PV}.source.tar.gz
+SRC_URI="
+	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 ) )"
 
 SLOT="0"
 LICENSE="LGPL-2.1"
@@ -45,7 +46,7 @@ CDEPEND="
 		x11-libs/libXext
 		x11-libs/libXpm
 		|| (
-			>=media-libs/libafterimage-1.20[gif,jpeg,png,tiff] 
+			>=media-libs/libafterimage-1.20[gif,jpeg,png,tiff]
 			>=x11-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
 
 	if use math; then
-		if use openmp && [[ $(tc-getCC)$ == *gcc* ]] && ! tc-has-openmp; then
+		if use openmp && ! tc-has-openmp; then
 			ewarn "You are using gcc and OpenMP is available with gcc >= 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
 
 	# 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=C LC_ALL=C 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 *:= .* $(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=C LC_ALL=C find core/zip -type f -name "[a-z]*" -print0 | xargs -0 rm -f || die
+	rm -rf core/lzma/src/*.tar.gz || die
+	rm graf3d/gl/{inc,src}/gl2ps.* || die
+	sed -i -e 's/^GLLIBS *:= .* $(OPENGLLIB)/& -lgl2ps/' graf3d/gl/Module.mk || die
 
 	# In Gentoo, libPythia6 is called libpythia6
 	# libungif is called libgif,
@@ -178,6 +179,7 @@ src_configure() {
 		--with-cc=$(tc-getCC) \
 		--with-cxx=$(tc-getCXX) \
 		--with-f77=$(tc-getFC) \
+		--with-ld=$(tc-getCXX) \
 		--with-afs-shared=yes \
 		--with-sys-iconpath="${EPREFIX}"/usr/share/pixmaps \
 		--disable-builtin-afterimage \
@@ -238,7 +240,7 @@ src_configure() {
 }
 
 src_compile() {
-	emake OPT="${CFLAGS}" F77OPT="${FFLAGS}" || die "emake failed"
+	emake OPT="${CXXFLAGS}" F77OPT="${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
 }
 
@@ -296,13 +298,13 @@ desktop_install() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
+	emake DESTDIR="${D}" install
 
 	echo "LDPATH=${EPREFIX}/usr/$(get_libdir)/root" > 99root
 	use pythia8 && echo "PYTHIA8=${EPREFIX}/usr" >> 99root
 	use python && echo "PYTHONPATH=${EPREFIX}/usr/$(get_libdir)/root" >> 99root
 	use ruby && echo "RUBYLIB=${EPREFIX}/usr/$(get_libdir)/root" >> 99root
-	doenvd 99root || die "doenvd failed"
+	doenvd 99root
 
 	# The build system installs Emacs support unconditionally and in the wrong
 	# directory. Remove it and call elisp-install in case of USE=emacs.
@@ -316,18 +318,18 @@ src_install() {
 	desktop_install
 
 	# 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
 }
 
 pkg_postinst() {