Propagate compiler correctly, bug #296043

Package-Manager: portage-2.2_rc56/cvs/Linux x86_64

3 files changed, 32 insertions, 10 deletions

diff --git a/sci-physics/geant/ChangeLog b/sci-physics/geant/ChangeLog
index 220710bfca3a..6cbda13ee4d4 100644
--- a/sci-physics/geant/ChangeLog
+++ b/sci-physics/geant/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-physics/geant
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/geant/ChangeLog,v 1.35 2009/12/07 18:25:00 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/geant/ChangeLog,v 1.36 2009/12/10 17:14:10 bicatali Exp $
+
+  10 Dec 2009; Sébastien Fabbro <bicatali@gentoo.org>
+  geant-4.9.2_p02.ebuild:
+  Propagate compiler correctly, bug #296043
 
   07 Dec 2009; Jeroen Roovers <jer@gentoo.org> geant-3.21.14-r2.ebuild,
   geant-4.9.2_p02.ebuild:
diff --git a/sci-physics/geant/Manifest b/sci-physics/geant/Manifest
index 9ad9461ed05c..8db185935056 100644
--- a/sci-physics/geant/Manifest
+++ b/sci-physics/geant/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX geant-4.9.2-zlib.patch 239 RMD160 790953077b7fc59d1ce7c3ed98cdb3dcc3134705 SHA1 7a0552dab08873665b8668a21a8c52841c8e5ae2 SHA256 f5ceee577afeb719718cd23887f9c1eba322077dce1f3d89bc075bacd63e5573
 DIST G4ABLA.3.0.tar.gz 54909 RMD160 5a032ee8e90d00f39b67114fe257ec47001f347b SHA1 5f38676f1650a508e49d35f9405ac96984388135 SHA256 ff0b77be6b36204eeeba71099f6b7530edd80b79eb015994535bc4334bc821eb
 DIST G4EMLOW.6.2.tar.gz 8389172 RMD160 fa51dbb4f0e316b0e682a05c9db4c1dc29db7218 SHA1 627ca63927064f1846aa8d7e2e5c4783fe0b9610 SHA256 1affbc66d8809db0c8e450ca83a0da744e7f5b8e912ec52e93b1f24b47cbd781
@@ -10,6 +13,13 @@ DIST geant4.9.2.p02.tar.gz 18822956 RMD160 1b8923c4821ca627b56919b3c1eeb3b6a09dd
 DIST geant4.9.2.tar.gz 18752051 RMD160 d6ae7fb718e78fb9bb8fe2b8cfd21dca7ef3a293 SHA1 7e6fd6b254652bd50d534237678a2e2654300210 SHA256 28c9598ee38949e74d839bed5f822b3dcf353c2936d4403ab6a50c11dafac110
 EBUILD geant-3.21.14-r2.ebuild 1863 RMD160 a24572d55551dabe6aa3bb67244c73583e38e314 SHA1 9d3da57a8babf1ab23f03c477809bf6bf4fa1fce SHA256 b43857a4a7e68cc26260eaea8285f16f216dc47d70d61886cc71258cb91512fa
 EBUILD geant-4.9.2-r2.ebuild 7678 RMD160 cccf2d90969b7ef91d1aa919fc743c07783ac1b3 SHA1 59e6901c23707862fa4774070ea18e18a8723a4b SHA256 9059f6d3cf2f8da7d884e1d4fc6ae4ba17f1eb31ece405a92a3ff95da58995dd
-EBUILD geant-4.9.2_p02.ebuild 7824 RMD160 fb1beacafb191d048b30edf7009812ffa6163da5 SHA1 ec98ddb77453c1c8143faa32847959cbfac45800 SHA256 05733b05f4f582f175af4475f38ce9e818cbf1060f38944f9812cbb69054747e
-MISC ChangeLog 6480 RMD160 64841dced425bd9c0de32dc76f0b4066e54e4220 SHA1 719e47a8d9b9e1d84aa028c0a9458c290ccc54a4 SHA256 ff12ce250d360fe8a4d84437905714be286af28f79fe7d8f90ccd7f44e742abc
+EBUILD geant-4.9.2_p02.ebuild 8106 RMD160 a84d723db4ce87c91b10de66809c1833e0b88820 SHA1 2110b56eeb86cc93d9c492ba0aa6639f0ca4ff61 SHA256 bafb99ec55e91115035335b0532387ebf4a02450297abf029279155f39580f0f
+MISC ChangeLog 6611 RMD160 c139934d147050a95e1bb96cf6c8e50655df726c SHA1 47b5706bf2d850a816d878166a011fe8f2307c00 SHA256 5301c51cd155ea1ce54ead1e3e82ab44649bf78e4f82cc84fb676c7d69d4bdbb
 MISC metadata.xml 1482 RMD160 ebd00b361cafb047cbdc56f837415621995ff330 SHA1 8962d8d1225fb4c5f1aaa5ee8b5cb089898544fe SHA256 14d3bba97c1ffb487c5f60340b1660f016f56efda9ccd185f06d12da44ef55f6
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.13 (GNU/Linux)
+
+iEYEARECAAYFAkshNasACgkQ1ycZbhPLE2B5EgCaAiNwfmMr9jfL7wWd0kixYxEi
+M9IAmwQL1IJze7qps65D6BgOnyFPGEcA
+=gSwH
+-----END PGP SIGNATURE-----
diff --git a/sci-physics/geant/geant-4.9.2_p02.ebuild b/sci-physics/geant/geant-4.9.2_p02.ebuild
index 2e8619fe5818..566d6e894627 100644
--- a/sci-physics/geant/geant-4.9.2_p02.ebuild
+++ b/sci-physics/geant/geant-4.9.2_p02.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/geant/geant-4.9.2_p02.ebuild,v 1.5 2009/12/07 18:25:00 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/geant/geant-4.9.2_p02.ebuild,v 1.6 2009/12/10 17:14:10 bicatali Exp $
 
 EAPI=2
 
@@ -57,15 +57,22 @@ src_prepare() {
 	# fix bad zlib dependency
 	epatch "${FILESDIR}"/${PN}-4.9.2-zlib.patch
 
-	# propagate user's flags.
+	# propagate user's flags and compiler settings
 	sed -i -e 's/-o/$(LDFLAGS) -o/g' source/GNUmakefile || die
 	sed -i \
+		-e '/CXX.*:=.*g++/d' \
+		-e '/FC.*:=.*gfortran/d' \
+		-e 's/\(CXXFLAGS.*:=\).*/\1 -ansi/' \
+		-e '/CXXFLAGS.*+=.*pipe/d' \
 		-e "/CXXFLAGS.*=.*-O2/s:=.*:= ${CXXFLAGS}:" \
-		-e "/FCFLAGS.*=.*-O2/s:=.*:= ${FFLAGS:--O2}:" \
+		-e "/FCFLAGS.*=.*-O2/s:=.*:= ${FCFLAGS}:" \
 		-e "/CCFLAGS.*=.*-O2/s:=.*:= ${CFLAGS}:" \
 		-e "s:-Wl,-soname:${LDFLAGS} -Wl,-soname:g" \
 		-e "s/libq\*/lib\[q,Q\]t*/g" \
 		config/sys/Linux*gmk || die "flag substitution failed"
+	sed -i \
+		-e 's:g++:$(CXX):g' \
+		config/*.gmk || die "sed for forced g++ failed"
 
 	# fix forced lib directory
 	sed -i \
@@ -88,6 +95,11 @@ src_prepare() {
 	sed -i \
 		-e 's:$(G4LIB)/$(G4SYSTEM):$(G4TMP):g' \
 		config/globlib.gmk || die "sed globlib.gmk failed"
+
+	# work around a non defined fortran compiler
+	use geant3 && export FC=$(tc-getFC)
+	# don't worry about the g++ name of the file, we remove all specific
+	export G4SYSTEM=Linux-g++
 }
 
 src_configure() {
@@ -96,10 +108,6 @@ src_configure() {
 	# we set env var G4LIB in src_install()
 	# to avoid confusing make
 	export GEANT4_LIBDIR=/usr/$(get_libdir)/${PN}${PV1}
-
-	# these should always to be set
-	[[ $(tc-getCXX) = ic*c ]] && export G4SYSTEM=Linux-icc \
-							  || export G4SYSTEM=Linux-g++
 	export G4INSTALL="${S}"
 	export G4WORKDIR="${S}"
 	export G4INCLUDE="${D}/usr/include/${PN}"