[gentoo-commits] proj/sci:master commit in: sci-libs/fftw/

["Justin Lecher" <jlec@gentoo.org>]

commit:     b53ef5955af95fd7543f7b4ac691afff0b8b1504
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 24 12:19:37 2011 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Fri Jun 24 12:19:37 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=b53ef595

Streamlined fortran-2 eclass usage

(Portage version: 2.2.0_alpha41/git/Linux x86_64, RepoMan options: --force, signed Manifest commit with key 70EB7916)

---
 sci-libs/fftw/ChangeLog              |    3 +++
 sci-libs/fftw/fftw-3.3_alpha1.ebuild |   12 +++++-------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/sci-libs/fftw/ChangeLog b/sci-libs/fftw/ChangeLog
index d1d8a04..99038b1 100644
--- a/sci-libs/fftw/ChangeLog
+++ b/sci-libs/fftw/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  24 Jun 2011; Justin Lecher <jlec@gentoo.org> fftw-3.3_alpha1.ebuild:
+  Streamlined fortran-2 eclass usage
+
   21 Jun 2011; Justin Lecher <jlec@gentoo.org> fftw-3.3_alpha1.ebuild:
   Added fortran-2.eclass support
 

diff --git a/sci-libs/fftw/fftw-3.3_alpha1.ebuild b/sci-libs/fftw/fftw-3.3_alpha1.ebuild
index 700e8ab..3d9e309 100644
--- a/sci-libs/fftw/fftw-3.3_alpha1.ebuild
+++ b/sci-libs/fftw/fftw-3.3_alpha1.ebuild
@@ -15,12 +15,15 @@ SLOT="3.0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="altivec doc fortran mpi openmp sse sse2 static-libs threads"
 
-DEPEND="mpi? ( virtual/mpi )"
+DEPEND="
+	fortran? ( virtual/fortran )
+	mpi? ( virtual/mpi )"
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${P//_}"
 
 pkg_setup() {
+	use openmp && FORTRAN_NEED_OPENMP="1"
 	use fortran && fortran-2_pkg_setup
 	FFTW_THREADS="--disable-threads --disable-openmp"
 	if use openmp; then
@@ -28,12 +31,7 @@ pkg_setup() {
 	elif use threads; then
 		FFTW_THREADS="--enable-threads --disable-openmp"
 	fi
-	if use openmp &&
-		[[ $(tc-getCC)$ == *gcc* ]] &&
-		[[ $(tc-getCC)$ != *apple* ]] &&
-		( [[ $(gcc-major-version)$(gcc-minor-version) -lt 42 ]] ||
-			! has_version sys-devel/gcc[openmp] )
-	then
+	if use openmp && ! tc-has-openmp; then
 		ewarn "You are using gcc and OpenMP is only available with gcc >= 4.2 "
 		ewarn "If you want to build fftw with OpenMP, abort now,"
 		ewarn "and switch CC to an OpenMP capable compiler"