(#147275) Move some function calls out of global scope.

Package-Manager: portage-2.1.1_rc1-r7

3 files changed, 22 insertions, 19 deletions

diff --git a/sci-libs/fftw/ChangeLog b/sci-libs/fftw/ChangeLog
index 27c60343f267..bf8e97576d30 100644
--- a/sci-libs/fftw/ChangeLog
+++ b/sci-libs/fftw/ChangeLog
@@ -1,6 +1,9 @@
 # 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.38 2006/07/17 02:49:10 psi29a Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/ChangeLog,v 1.39 2006/09/12 20:48:12 dberkholz Exp $
+
+  12 Sep 2006; Donnie Berkholz <dberkholz@gentoo.org>; fftw-2.1.5-r1.ebuild:
+  (#147275) Move some function calls out of global scope.
 
   16 Jul 2006; <psi29a@gentoo.org> fftw-3.0.1-r2.ebuild:
   stable on mips
diff --git a/sci-libs/fftw/Manifest b/sci-libs/fftw/Manifest
index 65c326b0e97b..8ba3165fe8d6 100644
--- a/sci-libs/fftw/Manifest
+++ b/sci-libs/fftw/Manifest
@@ -23,10 +23,10 @@ DIST fftw-3.0.1.tar.gz 1946361 RMD160 075bbdf5da67bb29117f9f54864db26acd971034 S
 DIST fftw-3.1.1.tar.gz 2719997 RMD160 4236f43159a39e3bd9d34bda1b95ce82609d26b6 SHA1 4efa2482451a71ea0887997eee7ce7b168e8efea SHA256 1d3e90da1aab15928586ef814784e217ac91bbac878906d82392b0d2e64aff0c
 DIST fftw-3.1.2.tar.gz 2736360 RMD160 13069b3582eeaa1fba1614cdca2dfbc2e45ab585 SHA1 3e4c64009ffb48123a0f30f46c1d89da7810dc67 SHA256 e1b92e97fe27efcbd150212d0d287ac907bd2fef0af32e16284fef5d1c1c26bf
 DIST fftw-3.1.tar.gz 2692325 RMD160 af9f8a720daa60597416ca3ed3a54b8a789a6d44 SHA256 e961dd3f7df9ec11cebf3a9c80752caee22a00fd149b36c7680f8da708e76bf7
-EBUILD fftw-2.1.5-r1.ebuild 4141 RMD160 72b227d25d9871b5d1d09cfd062d67cd636ddccf SHA1 d93eaa802bd8800cf9dbcf5bf1b85a46b443480f SHA256 6d354780d0c0e6b341842fc1941266db9dd3c90d867b77813b9e1c63d7aa069e
-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
+EBUILD fftw-2.1.5-r1.ebuild 4150 RMD160 534fe1b3ab61db5bca091c60eab17ba9ca0c7ac6 SHA1 69a4aa6c2aee5fb3002f0e062cbf40441c8a9dc4 SHA256 744fb6a97fdb0948eb2baf4e9f7e297618a07fad9d202ad50f8357f19afdf0ac
+MD5 9a1858e26f3fc3451362ef5a5155beed fftw-2.1.5-r1.ebuild 4150
+RMD160 534fe1b3ab61db5bca091c60eab17ba9ca0c7ac6 fftw-2.1.5-r1.ebuild 4150
+SHA256 744fb6a97fdb0948eb2baf4e9f7e297618a07fad9d202ad50f8357f19afdf0ac fftw-2.1.5-r1.ebuild 4150
 EBUILD fftw-3.0.1-r1.ebuild 2759 RMD160 508aea7c5b721ef415fc4d5121cfb057aba7aaef SHA1 f6123e5e3501c6934d7c226988fb067b13f72bf3 SHA256 d53c2fa4f8ecc2430588e6138a2c256eb6c9e4ffcd2314a73b9d8207ed0766b8
 MD5 4a8f8342448809b69143f66d02e7f2d2 fftw-3.0.1-r1.ebuild 2759
 RMD160 508aea7c5b721ef415fc4d5121cfb057aba7aaef fftw-3.0.1-r1.ebuild 2759
@@ -51,10 +51,10 @@ EBUILD fftw-3.1.ebuild 2151 RMD160 3349ccfe88c06635e50bbc5fddc840bcdae2b5d3 SHA1
 MD5 23256637dd0ccf113b366717c812e44e fftw-3.1.ebuild 2151
 RMD160 3349ccfe88c06635e50bbc5fddc840bcdae2b5d3 fftw-3.1.ebuild 2151
 SHA256 24f733e442a086a4a4e473d5d6d4319302ba0abf1c40cefc0e9d7039635836ad fftw-3.1.ebuild 2151
-MISC ChangeLog 9812 RMD160 5336f8186d4d022df96bb54d4c48118f2b8a75fd SHA1 780a243ef3ff7672633e6a534fadaf15e6debe14 SHA256 dd68a1446ee4afed7e811af3580356081774e9da7bb85fa12a81a363d6d1b64a
-MD5 6792c12d91cf2dd0dc87b8305e7427ea ChangeLog 9812
-RMD160 5336f8186d4d022df96bb54d4c48118f2b8a75fd ChangeLog 9812
-SHA256 dd68a1446ee4afed7e811af3580356081774e9da7bb85fa12a81a363d6d1b64a ChangeLog 9812
+MISC ChangeLog 9951 RMD160 0507a9735fe105e59ba4bb722d9c85f4b531e415 SHA1 344dfd7e6a8791d0ba0ceeeddc14a955d665800b SHA256 383b6e8b311612a8e3a5d09edcdbaed1109598c64fe0acb704f4a76c17bd705c
+MD5 14532eda3e5d3cb8d1cd511560b77415 ChangeLog 9951
+RMD160 0507a9735fe105e59ba4bb722d9c85f4b531e415 ChangeLog 9951
+SHA256 383b6e8b311612a8e3a5d09edcdbaed1109598c64fe0acb704f4a76c17bd705c ChangeLog 9951
 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/fftw/fftw-2.1.5-r1.ebuild b/sci-libs/fftw/fftw-2.1.5-r1.ebuild
index 573df9e2cecd..bdedecbe6a57 100644
--- a/sci-libs/fftw/fftw-2.1.5-r1.ebuild
+++ b/sci-libs/fftw/fftw-2.1.5-r1.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-2.1.5-r1.ebuild,v 1.6 2005/05/29 16:16:49 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-2.1.5-r1.ebuild,v 1.7 2006/09/12 20:48:12 dberkholz Exp $
 
 inherit flag-o-matic multilib
 
@@ -16,16 +16,16 @@ LICENSE="GPL-2"
 
 KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
 
-#this one is reported to cause trouble on pentium4 m series
-filter-mfpmath "sse"
+pkg_setup() {
+	#this one is reported to cause trouble on pentium4 m series
+	filter-mfpmath "sse"
 
-#here I need (surprise) to increase optimization:
-#--enable-i386-hacks requires -fomit-frame-pointer to work properly
-if [ "${ARCH}" != "amd64" ]; then
-	is-flag "-fomit-frame-pointer" || append-flags "-fomit-frame-pointer"
-fi
+	#here I need (surprise) to increase optimization:
+	#--enable-i386-hacks requires -fomit-frame-pointer to work properly
+	if [ "${ARCH}" != "amd64" ]; then
+		is-flag "-fomit-frame-pointer" || append-flags "-fomit-frame-pointer"
+	fi
 
-pkg_setup() {
 	einfo ""
 	einfo "This ebuild installs double and single precision versions of library"
 	einfo "This involves some name mangling, as supported by package and required"