summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2011-06-21 10:11:54 +0000
committerJustin Lecher <jlec@gentoo.org>2011-06-21 10:11:54 +0000
commitccce5f140e281696c1d2aa09a102e8d2b484a9a2 (patch)
treeaa75a68a6714db4169e175c250790ac05d3868d4 /sci-libs/fftw
parentAdded fortran-2.eclass support (diff)
downloadgentoo-2-ccce5f140e281696c1d2aa09a102e8d2b484a9a2.tar.gz
gentoo-2-ccce5f140e281696c1d2aa09a102e8d2b484a9a2.tar.bz2
gentoo-2-ccce5f140e281696c1d2aa09a102e8d2b484a9a2.zip
Fix fortran-2.eclass support
(Portage version: 2.2.0_alpha41/cvs/Linux x86_64)
Diffstat (limited to 'sci-libs/fftw')
-rw-r--r--sci-libs/fftw/ChangeLog6
-rw-r--r--sci-libs/fftw/fftw-2.1.5-r5.ebuild4
-rw-r--r--sci-libs/fftw/fftw-2.1.5-r8.ebuild4
-rw-r--r--sci-libs/fftw/fftw-3.2.2-r1.ebuild4
-rw-r--r--sci-libs/fftw/fftw-3.2.2.ebuild4
5 files changed, 13 insertions, 9 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/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"