Fix fortran-2.eclass support

Package-Manager: portage-2.2.0_alpha41/cvs/Linux x86_64

6 files changed, 21 insertions, 17 deletions

diff --git a/sci-libs/fftw/ChangeLog b/sci-libs/fftw/ChangeLog
index 24e06ba86d44..991333c917ea 100644
--- a/sci-libs/fftw/ChangeLog
+++ b/sci-libs/fftw/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-libs/fftw
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/ChangeLog,v 1.114 2011/06/21 08:23:37 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/ChangeLog,v 1.115 2011/06/21 10:11:54 jlec Exp $
+
+  21 Jun 2011; Justin Lecher <jlec@gentoo.org> fftw-2.1.5-r5.ebuild,
+  fftw-2.1.5-r8.ebuild, fftw-3.2.2.ebuild, fftw-3.2.2-r1.ebuild:
+  Fix fortran-2.eclass support
 
   21 Jun 2011; Justin Lecher <jlec@gentoo.org> fftw-2.1.5-r5.ebuild,
   fftw-2.1.5-r8.ebuild, fftw-3.2.2.ebuild, fftw-3.2.2-r1.ebuild:
diff --git a/sci-libs/fftw/Manifest b/sci-libs/fftw/Manifest
index aa0a02252eaa..7737c5d6f8ff 100644
--- a/sci-libs/fftw/Manifest
+++ b/sci-libs/fftw/Manifest
@@ -9,16 +9,16 @@ AUX fftw-3.2.1-as-needed.patch 3184 RMD160 fe4e353851780d1520cfa95cd4403ec7045d9
 AUX fftw-3.2.2-pc-threads.patch 650 RMD160 3d0bb0caa62d29e2d0e8b5cff9c126276b537f81 SHA1 dd960030a8e49b87fc94c80cc541068c8b9466dd SHA256 26a442c168324623a60d1fc986f9c70ddf2d66d91e5d4a620ded1982bd22a593
 DIST fftw-2.1.5.tar.gz 1256888 RMD160 723308722d76c12710db6473979adf8d086b0909 SHA1 12020b58edc1b0490a83db4aa912fac5dfdfb26b SHA256 f8057fae1c7df8b99116783ef3e94a6a44518d49c72e2e630c24b689c6022630
 DIST fftw-3.2.2.tar.gz 3495117 RMD160 27af9b97072fa3a41b91b9430d093f671a1cd359 SHA1 d43b799eedfb9408f62f9f056f5e8a645618467b SHA256 6aa7ae65ee49eb99004f15899f9bb77f54759122f1a350041e81e096157d768f
-EBUILD fftw-2.1.5-r5.ebuild 3757 RMD160 a12090daf9e0845bc61a3d073dbeb9de2e290c06 SHA1 e9e370f8c0048cb949e8b2e2466d0add5e37f0ff SHA256 4d5bd816edc1c5b385ccc7b4a13903d57cd42a33e36752071bb8f12ba9a17612
-EBUILD fftw-2.1.5-r8.ebuild 3897 RMD160 7c77b620d5d7ceb11aa71e492d5afc86110f4307 SHA1 9a911e3ea70638775284b9dfab4f69a6908e2d01 SHA256 5297c58ac10e9ef00b207d30399eae440cfb4f6a2eb7390a3fb46203297e3294
-EBUILD fftw-3.2.2-r1.ebuild 3629 RMD160 18dea916ea4bc103e2b6ee397e3424eeca578d74 SHA1 76ebc0743fabb501cd6cd5651738898e969a96ea SHA256 e7059a78fb47aded7de754a31ae3d56d85e3ed5c4f83a1870ae5b7710829c2d7
-EBUILD fftw-3.2.2.ebuild 3712 RMD160 4b2067816157e458a6bb3d7bd39d171f1b6fbf03 SHA1 8da15e2d30c52ff3e6aef0b36d0e5f5a2496d675 SHA256 cdd020fb8bd44e17ececd7a4a82298b04f4014182af5443a3226a65544df1dcb
-MISC ChangeLog 21350 RMD160 49aa0f121be11025ecdceb86b16a99850b7bb6b4 SHA1 63dccf9baea33298afb67e64704e4f656c03521d SHA256 2e912253f64bf117e631995370877a846b6d56452b926cb9d1858fc5c08cb0dd
+EBUILD fftw-2.1.5-r5.ebuild 3772 RMD160 3d5514000a4a6520644f418d4b4166d40828176d SHA1 c77b9b3f1499f4eb4045067f0e938439a3b60e20 SHA256 65dc77f262a96a14dc26ec8b89b54cb1bfa7eae1b803b2a22aeee55241ca4944
+EBUILD fftw-2.1.5-r8.ebuild 3912 RMD160 672581382a9966b0723e1baa4f79266a18def11a SHA1 7322db39d2f912bf5243ec6a960668ff259dc5f2 SHA256 58352262f6de0e0597bbf96e3ceb9bfd881357d2acb7989695fe8c29a6082b2e
+EBUILD fftw-3.2.2-r1.ebuild 3644 RMD160 a8d4bc1d8ad50d39c368c51d5654e18a09ff5cb7 SHA1 facd9be3cf22894048e8821c7a87b2f551ff2a4d SHA256 97c576b4d4883e5ac34708b0f846a5b6d60ae3fe025ac2e7e0e07fa175612b96
+EBUILD fftw-3.2.2.ebuild 3727 RMD160 9217e3d58be206733935346cc341e52772fd9611 SHA1 95c6caef2d0a4bf1ce0b34c69bf0d7d5c3be4144 SHA256 08715c004a54b5690afdec9c092fc2cff3d137768aea36d8e292187786f72d95
+MISC ChangeLog 21516 RMD160 de0b0b9a4dad136477b341b657956b1f1cd03f96 SHA1 a85cf5fbdb07aafa04c43a6d89345a66a4bd2844 SHA256 a97af83c33ce616fb312a9c8b4cf0e07de884ea9772951a1492a31e17460c1cc
 MISC metadata.xml 770 RMD160 ca19408a763b8f3db20849456d67c3027cfdba5e SHA1 8c6d41e762d4cc86eaaeee10a2fc9c4743e0e828 SHA256 129a4af8bed71473f17cf323cb11763e09cf9b63eaa764643a1412c649a8c0bb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk4AVQ8ACgkQgAnW8HDreRZr3wCgqURnYI7p5qeLwV5UTPC/tKa6
-O8AAn0uu2kwvZK4Tcf27k9vvSJ5SKOJJ
-=AuSo
+iEYEARECAAYFAk4AbnAACgkQgAnW8HDreRbBcQCeNO/jA/ywV/RlpCJeICly9pMX
+GkEAniCbshxz0QCxADl5p2vj5dHEq7QM
+=GxtZ
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/fftw/fftw-2.1.5-r5.ebuild b/sci-libs/fftw/fftw-2.1.5-r5.ebuild
index 423409e93443..bbc0086f2817 100644
--- a/sci-libs/fftw/fftw-2.1.5-r5.ebuild
+++ b/sci-libs/fftw/fftw-2.1.5-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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-r5.ebuild,v 1.19 2011/06/21 08:23:37 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-2.1.5-r5.ebuild,v 1.20 2011/06/21 10:11:54 jlec Exp $
 
 inherit eutils fortran-2 flag-o-matic autotools toolchain-funcs
 
@@ -18,7 +18,7 @@ IUSE="doc float fortran mpi openmp threads"
 KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 s390 sparc x86"
 
 pkg_setup() {
-	fortran-2_pkg_setup
+	use fortran && fortran-2_pkg_setup
 	# this one is reported to cause trouble on pentium4 m series
 	filter-mfpmath "sse"
 
diff --git a/sci-libs/fftw/fftw-2.1.5-r8.ebuild b/sci-libs/fftw/fftw-2.1.5-r8.ebuild
index 32087bb23dbe..4c4a70e49288 100644
--- a/sci-libs/fftw/fftw-2.1.5-r8.ebuild
+++ b/sci-libs/fftw/fftw-2.1.5-r8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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-r8.ebuild,v 1.7 2011/06/21 08:23:37 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-2.1.5-r8.ebuild,v 1.8 2011/06/21 10:11:54 jlec Exp $
 
 EAPI="3"
 
@@ -20,7 +20,7 @@ IUSE="doc float fortran mpi openmp threads"
 KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 
 pkg_setup() {
-	fortran-2_pkg_setup
+	use fortran && fortran-2_pkg_setup
 	# this one is reported to cause trouble on pentium4 m series
 	filter-mfpmath "sse"
 
diff --git a/sci-libs/fftw/fftw-3.2.2-r1.ebuild b/sci-libs/fftw/fftw-3.2.2-r1.ebuild
index 45b3870338c8..f3ef8688971c 100644
--- a/sci-libs/fftw/fftw-3.2.2-r1.ebuild
+++ b/sci-libs/fftw/fftw-3.2.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-3.2.2-r1.ebuild,v 1.2 2011/06/21 08:23:37 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-3.2.2-r1.ebuild,v 1.3 2011/06/21 10:11:54 jlec Exp $
 
 EAPI=2
 
@@ -16,7 +16,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-li
 IUSE="altivec doc fortran openmp sse sse2 threads"
 
 pkg_setup() {
-	fortran-2_pkg_setup
+	use fortran && fortran-2_pkg_setup
 	FFTW_THREADS="--disable-threads --disable-openmp"
 	if use openmp; then
 		FFTW_THREADS="--disable-threads --enable-openmp"
diff --git a/sci-libs/fftw/fftw-3.2.2.ebuild b/sci-libs/fftw/fftw-3.2.2.ebuild
index 041690d546d0..764cb3fee3ca 100644
--- a/sci-libs/fftw/fftw-3.2.2.ebuild
+++ b/sci-libs/fftw/fftw-3.2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-3.2.2.ebuild,v 1.13 2011/06/21 08:23:37 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-3.2.2.ebuild,v 1.14 2011/06/21 10:11:54 jlec Exp $
 
 EAPI=2
 inherit flag-o-matic eutils fortran-2 toolchain-funcs autotools
@@ -15,7 +15,7 @@ KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-
 IUSE="altivec doc fortran openmp sse sse2 threads"
 
 pkg_setup() {
-	fortran-2_pkg_setup
+	use fortran && fortran-2_pkg_setup
 	FFTW_THREADS="--disable-threads --disable-openmp"
 	if use openmp; then
 		FFTW_THREADS="--disable-threads --enable-openmp"