(#134248) Fix for gcc4, and stop appending -O3 -funroll-loops at the end of our compiler flags by specifying --opt.

Package-Manager: portage-2.1

3 files changed, 52 insertions, 14 deletions

diff --git a/sci-libs/scipy/ChangeLog b/sci-libs/scipy/ChangeLog
index 974927837e32..3e4ea404dcd0 100644
--- a/sci-libs/scipy/ChangeLog
+++ b/sci-libs/scipy/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-libs/scipy
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/ChangeLog,v 1.4 2006/06/13 23:37:54 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/ChangeLog,v 1.5 2006/06/13 23:40:31 spyderous Exp $
+
+  13 Jun 2006; Donnie Berkholz <spyderous@gentoo.org>;
+  scipy-0.4.8-r1.ebuild:
+  (#134248) Fix for gcc4, and stop appending -O3 -funroll-loops at the end of
+  our compiler flags by specifying --opt.
 
   13 Jun 2006; Donnie Berkholz <spyderous@gentoo.org>;
   scipy-0.4.8-r1.ebuild:
diff --git a/sci-libs/scipy/Manifest b/sci-libs/scipy/Manifest
index 6f05d934c833..322b36ab88aa 100644
--- a/sci-libs/scipy/Manifest
+++ b/sci-libs/scipy/Manifest
@@ -8,18 +8,18 @@ EBUILD scipy-0.3.2.ebuild 1414 RMD160 e7fd43cd1417934fa3afc9e42c7ee60857dee7d5 S
 MD5 c48241d7cc7765759cf9eb54bbdff32f scipy-0.3.2.ebuild 1414
 RMD160 e7fd43cd1417934fa3afc9e42c7ee60857dee7d5 scipy-0.3.2.ebuild 1414
 SHA256 fbe8720d7d1cbf9260d6f0b0914ce53e630c7cb75a77ce79cee8007414e22f4c scipy-0.3.2.ebuild 1414
-EBUILD scipy-0.4.8-r1.ebuild 3199 RMD160 c0c6d5d6fb6f7916fcdb641d72c9c9728d6ae08d SHA1 2f1408458e72bc8f8c0ba2b22cdcb78fb96d9856 SHA256 3ef0cb49451a44db2fa6c0562ba768919f240714f78c79200685b509d17012e8
-MD5 18cfbee3588cca1e2496c43fc43db6a7 scipy-0.4.8-r1.ebuild 3199
-RMD160 c0c6d5d6fb6f7916fcdb641d72c9c9728d6ae08d scipy-0.4.8-r1.ebuild 3199
-SHA256 3ef0cb49451a44db2fa6c0562ba768919f240714f78c79200685b509d17012e8 scipy-0.4.8-r1.ebuild 3199
+EBUILD scipy-0.4.8-r1.ebuild 3633 RMD160 4ce765f647d6c45dc937303df5f257c3db0f1c5d SHA1 595e10c57741217ebd070c29cdb839805e12c118 SHA256 f738e282c1a1fd574970b11ce6a6a180850b7f4502e28770b50fe1422fd77758
+MD5 f1e298976870beb8c6b360a8dcd219f4 scipy-0.4.8-r1.ebuild 3633
+RMD160 4ce765f647d6c45dc937303df5f257c3db0f1c5d scipy-0.4.8-r1.ebuild 3633
+SHA256 f738e282c1a1fd574970b11ce6a6a180850b7f4502e28770b50fe1422fd77758 scipy-0.4.8-r1.ebuild 3633
 EBUILD scipy-0.4.8.ebuild 2033 RMD160 21fef90ef50cbe13cfa8dacf1dfcebcee5d37c11 SHA1 1d9bc9d4b8043ff2e6e7c552925de20c49dc495e SHA256 c9073fc47828b83d466e973149b29c95c76c474ceb9422edf7901c9c91114b3b
 MD5 a464eb04b95a4627c0e9f519a8e40b1d scipy-0.4.8.ebuild 2033
 RMD160 21fef90ef50cbe13cfa8dacf1dfcebcee5d37c11 scipy-0.4.8.ebuild 2033
 SHA256 c9073fc47828b83d466e973149b29c95c76c474ceb9422edf7901c9c91114b3b scipy-0.4.8.ebuild 2033
-MISC ChangeLog 975 RMD160 99f610746dada0e49af1403d9649eb68a542470a SHA1 ae93075937236a09f400af0e3f67c2597be77733 SHA256 bfd22f01f6fa38d7e2871ddafbcb42f021c718fa92acab22f5626aa1b7107f4c
-MD5 fa7d4c3e95c037bdd9879a62600cc53e ChangeLog 975
-RMD160 99f610746dada0e49af1403d9649eb68a542470a ChangeLog 975
-SHA256 bfd22f01f6fa38d7e2871ddafbcb42f021c718fa92acab22f5626aa1b7107f4c ChangeLog 975
+MISC ChangeLog 1176 RMD160 245d7dfd65744d68f332855923f8ec9b7aea1860 SHA1 ee815e3806e00c7bb4c3b6e8ebb1372a1aad10d6 SHA256 7de1ee227842d93cec7414746056b3d75a4e2a54b0031ea277686ba10a76c3ba
+MD5 c181762ed60c2d4c3ae07dbc249cc77a ChangeLog 1176
+RMD160 245d7dfd65744d68f332855923f8ec9b7aea1860 ChangeLog 1176
+SHA256 7de1ee227842d93cec7414746056b3d75a4e2a54b0031ea277686ba10a76c3ba ChangeLog 1176
 MISC metadata.xml 156 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 SHA1 da2b240a255820145b7c83a5c48e45b96b7e9ee6 SHA256 5d22100902db7507a5b5493dd4a66cdb08025faf80a2c0b75e6392315c47f900
 MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 metadata.xml 156
diff --git a/sci-libs/scipy/scipy-0.4.8-r1.ebuild b/sci-libs/scipy/scipy-0.4.8-r1.ebuild
index 81a0e06848e8..5a6f7fd10a38 100644
--- a/sci-libs/scipy/scipy-0.4.8-r1.ebuild
+++ b/sci-libs/scipy/scipy-0.4.8-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/scipy-0.4.8-r1.ebuild,v 1.3 2006/06/13 23:37:54 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/scipy-0.4.8-r1.ebuild,v 1.4 2006/06/13 23:40:31 spyderous Exp $
 
 inherit distutils fortran
 
@@ -16,7 +16,7 @@ KEYWORDS="~amd64 ~x86"
 # did not use virtual/blas and virtual/lapack
 # because doc says scipy needs to compile all libraries with the same compiler
 RDEPEND=">=dev-lang/python-2.3.3
-	>=dev-python/numpy-0.9.6
+	>=dev-python/numpy-0.9.6-r1
 	sci-libs/blas-atlas
 	sci-libs/lapack-atlas
 	fftw? ( =sci-libs/fftw-2.1* )"
@@ -25,14 +25,14 @@ DEPEND="${RDEPEND}
 	=sys-devel/gcc-3*"
 
 # install doc claims fftw-2 is faster for complex ffts.
-# install doc claims gcc-4 not fully tested and blas-atlas is compiled
-# with g77 only, so force use of g77 here as well.
 # wxwindows seems to have disapeared : ?
 # f2py seems to be in numpy.
 
-FORTRAN="g77"
+FORTRAN="g77 gfortran"
 
 pkg_setup() {
+	fortran_pkg_setup
+
 	if built_with_use sci-libs/lapack-atlas ifc; then
 		echo
 		ewarn  "${PN} needs consistency among Fortran compilers."
@@ -98,6 +98,39 @@ src_unpack() {
 	fi
 }
 
+src_compile() {
+	# Map compilers to what scipy calls them
+	local SCIPY_FC
+	case "${FORTRANC}" in
+		gfortran)
+			SCIPY_FC="gnu95"
+			;;
+		g77)
+			SCIPY_FC="gnu"
+			;;
+		g95)
+			SCIPY_FC="g95"
+			;;
+		ifc|ifort)
+			if use ia64; then
+				SCIPY_FC="intele"
+			else
+				SCIPY_FC="intel"
+			fi
+			;;
+		*)
+			local msg="Invalid Fortran compiler \'${FORTRANC}\'"
+			eerror "${msg}"
+			die "${msg}"
+			;;
+	esac
+	distutils_src_compile \
+		config_fc \
+		--fcompiler=${SCIPY_FC} \
+		--opt="${CFLAGS}" \
+		|| die "compilation failed"
+}
+
 src_install() {
 	distutils_src_install
 	dodoc `ls *.txt`