sci-physics/root: Fix EAPI=4 usage, don't mix CFLAGS/CXXFLAGS, respect LD

(Portage version: 2.2.0_alpha99/git/Linux x86_64, unsigned Manifest commit)

6 files changed, 83 insertions, 102 deletions

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index d290f708e..0a1a61aa2 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 2012/03/29 18:21:49 bicatali Exp $
 
+  03 Apr 2012; Justin Lecher <jlec@gentoo.org> root-5.28.00h-r1.ebuild,
+  root-5.32.02-r1.ebuild, root-9999.ebuild, metadata.xml:
+  Fix EAPI=4 usage, don't mix CFLAGS/CXXFLAGS, respect LD
+
 *root-5.32.02-r1 (03 Apr 2012)
 *root-5.28.00h-r1 (03 Apr 2012)
 
diff --git a/sci-physics/root/Manifest b/sci-physics/root/Manifest
index bab59d5b4..f32c0cbc4 100644
--- a/sci-physics/root/Manifest
+++ b/sci-physics/root/Manifest
@@ -1,24 +1,3 @@
-AUX olbd.confd 197 RMD160 798de1808502f3e4ecfc5f024b56a419d9824057 SHA1 f2a4385fdf9849eafb1d5457727f6fbe80af1da3 SHA256 5a34da76bbe56cd3b8128f05c0d9900f9d7f7ffdcffc5deeb816c78ea46679ba
-AUX olbd.initd 714 RMD160 19a09e2264b984245f6a6b55c302a218bc41e452 SHA1 75e5d0764f00d5f9ef52966b597fa66c67bf7058 SHA256 a12efc3a4af4116558a6efd0964646b677d06879bb2114fc508324d9162bf815
-AUX proofd.confd 415 RMD160 3814aacb63d82b9d060086f9bef304d431a15b4e SHA1 31eb7af239a0042f887b5089a7c6c7ec5d6662e9 SHA256 261738817b4ba50fb07007741305d0a88e9067a45e3cbfd1d3fc8bebe70ece38
-AUX proofd.initd 717 RMD160 09157e82a659255d802a02466dca833135c7839a SHA1 47d139d8cb08e055674018b6b7f68522bf65b5ca SHA256 f60fa92173370e237e3e2cf5be7add5aa63752e3b7496cf3a0a5acc1dc927ebc
-AUX root-5.26.00e-libpng15.patch 1261 RMD160 6fa4b2a6c20f0a0eb7cca381045074c5f2d27ed7 SHA1 598abe303d20b1d3029080af8c60498211840b1c SHA256 94fd93a4e9081ef8070e2bcaeb09f169ae4475689fe4987c3a9acfec879a45f2
-AUX root-5.26.00g-explicit-functions.patch 410 RMD160 f3fb8458bb671f7f68cc74ca92363f708a083e4f SHA1 d1bbef441ed3f6fbd3e41ffaaf831f73e80abede SHA256 e1799d5c8ad4e8af3161c4b3ed8e457eee48fe94e092ef8f3fb73b13d72e0c92
-AUX root-5.28.00b-asneeded.patch 712 RMD160 0b3a3d41e309f13310fda607955ad88cc6bc176e SHA1 4fa704d2790e19933155da2587a9c6998d3c4e4f SHA256 17d1d41d8c7f78abbb7cd284af0a6aca544820db72fa72956b473c7c1817a96b
-AUX root-5.28.00b-glibc212.patch 276 RMD160 02901df4c8e5e3c7d50a78916f843fde83faf1f0 SHA1 842129d6247255b5fa72778a12f08e1383247cd8 SHA256 e51e127a80e2bf1afad41c2b7ca5233c362bce017057ca489bedb2a9442efb62
-AUX root-5.28.00b-nobyte-compile.patch 5483 RMD160 490801842ba9ca6c980e498224d48dc676fcf0fa SHA1 538ac62083b8b12c558b97d72235dd047a64b632 SHA256 81b015dd6c122176fbc3103c75f62b7b1c3db569ad6d461ca544248f4e017b5c
-AUX root-5.28.00b-prop-ldflags.patch 433 RMD160 fd1717af9210471d7de0f06a47011e03d3f76d9a SHA1 b5dac8b013219dcfe577f2972fcc1d548f153cc3 SHA256 04f4b65a91e28386c7a857fe361f091943f4bb6fc82a9473ac7605412c199191
-AUX root-5.28.00b-unuran.patch 1531 RMD160 8083784cc831fc304f2e94fdf3b8aa8379d0bd9a SHA1 5c4537ba1922775fb63d65340a18a3c2b1d2311b SHA256 09458c60c9d38af2d204939f752ec25364d04cf66810b7cae5e88368f84c31c8
-AUX root-5.28.00h-explicit-functions.patch 427 RMD160 3d62d982a35523249bc1ffbf9fee50056f007a36 SHA1 49479965e8116480d17efdb557a3c2844decbed6 SHA256 ef1a3bb5c89ebbd6baba2a27e6504822cca1b65893c910709974119a7e650ff8
-AUX root-5.32.00-afs.patch 1322 RMD160 208adb0105edbad04f74206363f582c0a4dbcf73 SHA1 e713c26f5481755ded620d50a6dffc63eb0cba9d SHA256 a8f8d551668299516e2e091fd29ae15ceb1ba034d9df95b76f99b1dabc94a8dc
-AUX root-5.32.00-cfitsio.patch 593 RMD160 c9fb2e0e57ad6c08bc26eb626772bc3ec901ac46 SHA1 9d07035b5ab27bede96033a777e3d21a26b3ae27 SHA256 9f4f244f272d75e115d8f139670fdcc0cdbcb68972689edbc78e467c3fad3e40
-AUX root-5.32.00-chklib64.patch 866 RMD160 9fada23b979e80dec76184e22895e47e689b55b4 SHA1 fde081f24090a3bb10473170a611384593072134 SHA256 5260cb5e7ab62bb19f6586cf4d9033597bcfd0132f178192be69ce515b2c7c35
-AUX root-5.32.00-explicit-functions.patch 610 RMD160 b8eb20aa9b6864fe138674c5991fe13aaa68981c SHA1 9f4faf15cf43cfa1e3ff4a394db5a4807bed713e SHA256 1afa92168b1f25ed457c08db85c85173613b82050b558765ba25e056f6f60abc
-AUX root-5.32.00-nobyte-compile.patch 5527 RMD160 61c3dfdd4b8f71f64772e20901f6ee11b8f53e12 SHA1 f914ccb7f7d88dd8d9ba4c1f4d940b14134f2c3b SHA256 82152c92efd5002f9c2b230f141cae6c8111b03bd18370030d62f0f7d7127420
-AUX rootd.confd 199 RMD160 9ca9864292e7301d3feb6c36d88ba16002b7d7fa SHA1 822983a24e219bd860124f363a1e4250a17026dd SHA256 7b69f646ce0b2546ce797ec4a05949b02302dc5f4e41d2e8896ed0bc6575ac8d
-AUX rootd.initd 732 RMD160 9cce585e528e27c0fbd791be1f90fa6a1bb3164b SHA1 c15e805b0397bc8513e1c7e5631f2337c3564bbc SHA256 42b9fe01aa41965359c16d4b23f874cea65806d8c7ec11215dbba95ab80e90f3
-AUX xrootd.confd 200 RMD160 2344c73ca3c27adeb70b092850cfd292af7d58bd SHA1 f2b895f43d3537e8614a907c7c94642f01c084e4 SHA256 03c1191168ddea3bc6621e26eb56e509e6c9a4d58756ffbbd07ff6657200e57d
-AUX xrootd.initd 720 RMD160 fb03f7410061e5340cb1f03c1659c553b62cb81f SHA1 a52eebc9bda2a92d0c5f3bbd20d7ea27cecc8cca SHA256 08c85596b8489fec0cea64e1fa9a092094fb05ea0f1151fd26775e4d5a024a8e
 DIST RooFit_Users_Manual_2.91-33.pdf 1330062 RMD160 650b616018a5493d5fd7da1dc06c6e54eaa419fb SHA1 f176782746542b00ff60320b4a41e1218db3d006 SHA256 101c4e4c41962238fcabf1caa86cafc51241a1800594491b2e62ef8b565a5646
 DIST TMVAUsersGuide-v4.03.pdf 3913533 RMD160 fbd62b90e7ad47ad69ec62d584417463ec13bf9c SHA1 84a63140cc3e01267d2cc7ffa374a7c24fbed37e SHA256 0cdbb4a2d19eb7a86e2911cfa73a905932e862d6c94be10b7662a9355b0241af
 DIST TMVAUsersGuide-v4.pdf 2355827 RMD160 0624a6ed7e006581eacdaa69e82bbdca91aa42a9 SHA1 98016f0ccfa6c54234e22b46032bb0b2f5d7ac20 SHA256 bbc6563fd14a6a4a88efca55fa75e74d9b5c2a9f5d3044239f3f83dc2967ad62
@@ -27,10 +6,4 @@ DIST root-5.26.00e-patches.tar.bz2 7102 RMD160 d513c643ec8acdbe293e7ca159f59c765
 DIST root-5.28.00b-xrootd-prop-flags.patch.bz2 3894 RMD160 ef6b06d4783320ee7d6189dbe122ac49605bc6f4 SHA1 8026dda3cb74da40359ccc6d4ee787c01eee958b SHA256 093b1acd8336f5bb723802455296d8db884a2909a4e483cce637b8191039b4cd
 DIST root_v5.26.00g.source.tar.gz 29356003 RMD160 92d967cfa1859441da896bdaf58badb269b1747d SHA1 ce354c11d58beac567062c0f2036a0cfaf8936f3 SHA256 d8ae10f492239d58e49b09a6269b1fe9657d50afe3827246991df66a79e67c74
 DIST root_v5.28.00h.source.tar.gz 31654844 RMD160 b4ad8b71b833a1a1b7826b7b29c186504fb9a18c SHA1 5cd8c02ba2a1e84f11295c91b95a0f455ec016d8 SHA256 2adc46c70a01761215b5f685fb0ca4c62e03a3b53165a459ed72190627242651
-DIST root_v5.32.02.source.tar.gz 55519485 RMD160 0700dbb56adebd07c4e667fa9f78f7a75f59e511 SHA1 f0aa091d9544a0a4215eb085ffa720498ca73e54 SHA256 5f14f50e4489cd74b3c5bdfbfff8379c6aaaf83d3ace3318c62964be6fdc38a2
-EBUILD root-5.26.00g.ebuild 9478 RMD160 84b5c38f9b915ad402cb40802bd0e4d97ca86dba SHA1 9b3e82bcdd3c21689ab739738895e39a23245cf5 SHA256 5177cd8649a6152fa89592a032c7208a8074cc8613cc09a04635ba8dcbfd2342
-EBUILD root-5.28.00h-r1.ebuild 9978 RMD160 0b6a9338e1ea1d6008e01d23c3ad66f9c10ae212 SHA1 707668f7666fc259cded077803c88f1464573057 SHA256 97c1808af2986a3b7c2a773ff615f59cd25d50c19c270b6b0d7422b22fa144f7
-EBUILD root-5.32.02-r1.ebuild 10072 RMD160 0aead1e42f2601e976b034ae8d6c3595adacba47 SHA1 2e8c25e95c691128d89f7e8b268a3b0a4dfbecb9 SHA256 0de749d71510df425525beba0a3a33ab4bf48f17c9e1124ce4c6cbf6e4ab0b92
-EBUILD root-9999.ebuild 10350 RMD160 eb9ee3e0c44b66a72d33ada1a0b69d141126d9fb SHA1 a20a23bf11d0dc7b7d44816b86fc386c62a94670 SHA256 365c38eaf349dd177b1d0ef04f952766a4e14d0f736910773bba468b0af1db58
-MISC ChangeLog 28377 RMD160 9689fd4116f123fce5321814c6ad08214888fa7a SHA1 d960d4a5ef64e0108da390ef4dca89d7ea32fce6 SHA256 a8e48a4f9c548092668370569941498881506121d94b15292b3700aaf1ca31e6
-MISC metadata.xml 1627 RMD160 5478d04d172076f583e1d9f541d62e880e5be1fa SHA1 707468734b4d2db052f5d9a2f50cd487aafc0288 SHA256 09e5bb09c9bb3a412303b03fb3b3aa09e958e980874e26b0577e20b86164c5e5
+DIST root_v5.32.02.source.tar.gz 55519485 SHA256 5f14f50e4489cd74b3c5bdfbfff8379c6aaaf83d3ace3318c62964be6fdc38a2 SHA512 61c9439e9091eaef78d214776372a5f2eec1364c334fe26e5f7cc4816c956017e39e248e34247d848f1d587ada418940591b53f071a8441efef2d3102ac890e8 WHIRLPOOL ded431cc21891b0de6ff875b622f1c788cb38235eed29c7fdd391c86f56e3d55d9eb5dcd22f9620ecd34312236418e7be28a18f2a1e9ae655ead06813982eba8
diff --git a/sci-physics/root/metadata.xml b/sci-physics/root/metadata.xml
index 6ce0ec4c4..0af578824 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 EXPERIMENTAL 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 EXPERIMENTAL 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 64b796641..2963ad3d8 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="
 	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 44ca400fd..12559d878 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=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() {
diff --git a/sci-physics/root/root-9999.ebuild b/sci-physics/root/root-9999.ebuild
index 3ffcc4f6a..6b3c224b9 100644
--- a/sci-physics/root/root-9999.ebuild
+++ b/sci-physics/root/root-9999.ebuild
@@ -27,12 +27,13 @@ DESCRIPTION="C++ data analysis framework and interpreter from CERN"
 HOMEPAGE="http://root.cern.ch/"
 SRC_URI="${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 ) )"
 
 SLOT="0"
 LICENSE="LGPL-2.1"
+KEYWORDS=""
 IUSE="+X afs avahi clarens doc emacs examples fits fftw graphviz kerberos 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="
 		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 )
@@ -120,7 +121,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"
@@ -144,17 +145,17 @@ src_prepare() {
 		"${FILESDIR}"/${PN}-${PATCH_PV2}-chklib64.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,
@@ -188,6 +189,7 @@ src_configure() {
 		--with-cc=$(tc-getCC) \
 		--with-cxx=$(tc-getCXX) \
 		--with-f77=$(tc-getFC) \
+		--with-ld=$(tc-getCXX) \
 		--with-afs-shared=yes \
 		--with-llvm-config="${EPREFIX}"/usr/bin/llvm-config \
 		--with-sys-iconpath="${EPREFIX}"/usr/share/pixmaps \
@@ -249,7 +251,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
@@ -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
 }
 
@@ -307,13 +309,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.
@@ -327,18 +329,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() {