Moved flag-o-matic functions from global scope to src_compile. Also removed filter-mfpmath since it didn't do anything. This fixes bug #123960.

(Portage version: 2.1_pre4-r1)

4 files changed, 28 insertions, 27 deletions

diff --git a/sci-libs/fftw/ChangeLog b/sci-libs/fftw/ChangeLog
index 1428d1e97bd3..d7dc25167548 100644
--- a/sci-libs/fftw/ChangeLog
+++ b/sci-libs/fftw/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-libs/fftw
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/ChangeLog,v 1.26 2006/02/11 20:19:56 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/ChangeLog,v 1.27 2006/02/26 23:27:19 markusle Exp $
+
+  26 Feb 2006; Markus Dittrich <markusle@gentoo.org> fftw-3.0.1.ebuild:
+  Moved flag-o-matic functions from global scope to src_compile. 
+  Also removed filter-mfpmath since it didn't do anything. 
+  This fixes bug #123960.
 
 *fftw-3.1 (11 Feb 2006)
 
diff --git a/sci-libs/fftw/Manifest b/sci-libs/fftw/Manifest
index 899fabc86618..74c42074d375 100644
--- a/sci-libs/fftw/Manifest
+++ b/sci-libs/fftw/Manifest
@@ -1,6 +1,6 @@
-MD5 7353a36b0f68cd56982e1b3a5b5b4dc1 ChangeLog 7238
-RMD160 2aa626959cd65b84888fbc8af26f763b300c16f7 ChangeLog 7238
-SHA256 6bc9e5c2ab42e2a38ff3a4ce3696b9d6ee45a897517b7b203c630b78d9989639 ChangeLog 7238
+MD5 92aaa65b49078278b46e704adf7498e0 ChangeLog 7463
+RMD160 b58456226bbb23accc6548c0372dbfa600a29019 ChangeLog 7463
+SHA256 2e28c137161999432242b3f9b6bd0d4f268697ab7aae0a554542559101b89d6f ChangeLog 7463
 MD5 b0b309c7dfe2c8566424e91792350f95 fftw-2.1.5-r1.ebuild 4141
 RMD160 72b227d25d9871b5d1d09cfd062d67cd636ddccf fftw-2.1.5-r1.ebuild 4141
 SHA256 6d354780d0c0e6b341842fc1941266db9dd3c90d867b77813b9e1c63d7aa069e fftw-2.1.5-r1.ebuild 4141
@@ -10,9 +10,9 @@ SHA256 d53c2fa4f8ecc2430588e6138a2c256eb6c9e4ffcd2314a73b9d8207ed0766b8 fftw-3.0
 MD5 7ba717c52d52fb424509a7046a52350a fftw-3.0.1-r2.ebuild 2790
 RMD160 03f593bd2961ea1520e8cb267a43d72cd83252ac fftw-3.0.1-r2.ebuild 2790
 SHA256 cce35d30515b257d3a97c06ad84391af23101a9ab142b3022ca0b0d0a103e501 fftw-3.0.1-r2.ebuild 2790
-MD5 7b8ca418c402f3091eeb2cefd710e739 fftw-3.0.1.ebuild 2363
-RMD160 dfb874adc905a8d302ae21f08e25fa72303b12d6 fftw-3.0.1.ebuild 2363
-SHA256 2faf09c55c721d55f0755453bad2eb3cd07c593df97312cc2e89e6b1a7c958c4 fftw-3.0.1.ebuild 2363
+MD5 600c592edc022dc0710a7689736d3ded fftw-3.0.1.ebuild 2101
+RMD160 111707434fad4634c9c3bcc71bce3c960994bfe1 fftw-3.0.1.ebuild 2101
+SHA256 44e54cf179d5f82b2e69b48762083e86bfe471ceb7eb338d496fc8ed7b67987b fftw-3.0.1.ebuild 2101
 MD5 e6aa8e2db6ce74302b379c3812eab87c fftw-3.1.ebuild 2008
 RMD160 84ad8f55f57828d2a3ec8d391509d08a4f134d47 fftw-3.1.ebuild 2008
 SHA256 1139e65e974436110fd07f26cf42c267fa9b585969cf2369c3e8898324988665 fftw-3.1.ebuild 2008
@@ -22,9 +22,9 @@ SHA256 c51956fc0ce2bb25cf84e4929ab76de27dca47efeef659d57d7513e0099f99d1 files/3-
 MD5 236dda9695005c9f306fb2c55f020686 files/digest-fftw-2.1.5-r1 63
 RMD160 993eb088f674d8b9822cee53d21b8ac1f73c417a files/digest-fftw-2.1.5-r1 63
 SHA256 86f53a934b5d8a5d7b3730f7ef7c30767f82a6df25490bf200f4aeb921c7e869 files/digest-fftw-2.1.5-r1 63
-MD5 cd32698a34d886267d48a8ccb99747b1 files/digest-fftw-3.0.1 63
-RMD160 bfe28400278296372a6b3e9650882603d033a91c files/digest-fftw-3.0.1 63
-SHA256 1b01f67cdbb46602819d54d78dc247067f9e742deebf041ee10187761535caf2 files/digest-fftw-3.0.1 63
+MD5 d79d7261a50d0b3c10659e5beacd0ab4 files/digest-fftw-3.0.1 235
+RMD160 583f42a9b329e5113a76834c8e94fd33d162faf6 files/digest-fftw-3.0.1 235
+SHA256 312aec81b01e5fc0f42721ef933f2f89347d8e3d27c07394ddbc717be7577368 files/digest-fftw-3.0.1 235
 MD5 cd32698a34d886267d48a8ccb99747b1 files/digest-fftw-3.0.1-r1 63
 RMD160 bfe28400278296372a6b3e9650882603d033a91c files/digest-fftw-3.0.1-r1 63
 SHA256 1b01f67cdbb46602819d54d78dc247067f9e742deebf041ee10187761535caf2 files/digest-fftw-3.0.1-r1 63
diff --git a/sci-libs/fftw/fftw-3.0.1.ebuild b/sci-libs/fftw/fftw-3.0.1.ebuild
index 355aa889055d..797235d37c31 100644
--- a/sci-libs/fftw/fftw-3.0.1.ebuild
+++ b/sci-libs/fftw/fftw-3.0.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-3.0.1.ebuild,v 1.3 2005/03/28 19:31:13 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-3.0.1.ebuild,v 1.4 2006/02/26 23:27:19 markusle Exp $
 
 IUSE="3dnow sse mpi"
 
@@ -16,21 +16,6 @@ DEPEND="virtual/libc"
 
 KEYWORDS="x86 ppc sparc alpha ~ia64 amd64"
 
-#-fpmath=xx is reported to cause trouble on pentium4 m series
-#(for 3.0.x: this sort of thing should be handled by the --enable-sse
-#style configure flags. these are set below using the use variables,
-#but under gcc-3.2.x, sse2 seems to cause trouble.)
-filter-mfpmath
-
-# in gcc 3.2.3 at least, using sse or sse2 causes trouble with -O3
-# according to the docs, -O0 can cause trouble too! So pending further
-# testing, ...
-
-if use sse; then
-	filter-flags -O3 -O1 -O -Os
-	append-flags -O2
-fi
-
 src_unpack() {
 	unpack "${P}.tar.gz"
 	cd "${WORKDIR}"
@@ -47,6 +32,15 @@ src_compile() {
 	local myconfsingle=""
 	local myconfdouble=""
 
+	# in gcc 3.2.3 at least, using sse or sse2 causes trouble with -O3
+	# according to the docs, -O0 can cause trouble too! So pending further
+	# testing, ...
+
+	if use sse; then
+		filter-flags -O3 -O1 -O -Os
+		append-flags -O2
+	fi
+
 	use mpi && myconf="${myconf} --enable-mpi"
 	#mpi is not a valid flag yet. In this revision it is used merely to block --enable-mpi option
 	#it might be needed if it is decided that lam is an optional dependence
diff --git a/sci-libs/fftw/files/digest-fftw-3.0.1 b/sci-libs/fftw/files/digest-fftw-3.0.1
index 0dcc37da443b..a837c11d9572 100644
--- a/sci-libs/fftw/files/digest-fftw-3.0.1
+++ b/sci-libs/fftw/files/digest-fftw-3.0.1
@@ -1 +1,3 @@
 MD5 76cd21ecc9a7bed6343566c473c36477 fftw-3.0.1.tar.gz 1946361
+RMD160 075bbdf5da67bb29117f9f54864db26acd971034 fftw-3.0.1.tar.gz 1946361
+SHA256 14f2cf295eed74369c622db005fe34f57e74a5efbd3fb66144b8d6d284ce0cb1 fftw-3.0.1.tar.gz 1946361