sci-libs/fftw: Remove virtual/fortran and always call fortran-2_pkg_setup as intend by the updated fortran-2.eclass

(Portage version: 2.2.0_alpha141/cvs/Linux x86_64, signed Manifest commit with key 8009D6F070EB7916)

5 files changed, 16 insertions, 21 deletions

diff --git a/sci-libs/fftw/ChangeLog b/sci-libs/fftw/ChangeLog
index 27d702077c8a..1eba9aac870f 100644
--- a/sci-libs/fftw/ChangeLog
+++ b/sci-libs/fftw/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-libs/fftw
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/ChangeLog,v 1.130 2012/10/16 18:08:04 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/ChangeLog,v 1.131 2012/10/18 21:42:09 jlec Exp $
+
+  18 Oct 2012; Justin Lecher <jlec@gentoo.org> fftw-2.1.5-r8.ebuild,
+  fftw-3.2.2.ebuild, fftw-3.2.2-r2.ebuild, fftw-3.3.2.ebuild:
+  Remove virtual/fortran and always call fortran-2_pkg_setup as intend by the
+  updated fortran-2.eclass
 
   16 Oct 2012; Justin Lecher <jlec@gentoo.org> fftw-3.3.2.ebuild:
   Use versionator.eclass, #438536
diff --git a/sci-libs/fftw/fftw-2.1.5-r8.ebuild b/sci-libs/fftw/fftw-2.1.5-r8.ebuild
index 39676943a705..bab7598b222e 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-2012 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.13 2012/10/14 19:00:22 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-2.1.5-r8.ebuild,v 1.14 2012/10/18 21:42:09 jlec Exp $
 
 EAPI=4
 
@@ -12,9 +12,7 @@ DESCRIPTION="Fast C library for the Discrete Fourier Transform"
 SRC_URI="http://www.fftw.org/${P}.tar.gz"
 HOMEPAGE="http://www.fftw.org"
 
-DEPEND="
-	fortran? ( virtual/fortran )
-	mpi? ( virtual/mpi )"
+DEPEND="mpi? ( virtual/mpi )"
 RDEPEND="${DEPEND}"
 
 SLOT="2.1"
@@ -25,7 +23,7 @@ KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-
 
 pkg_setup() {
 	use openmp && FORTRAN_NEED_OPENMP="1"
-	use fortran && fortran-2_pkg_setup
+	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-r2.ebuild b/sci-libs/fftw/fftw-3.2.2-r2.ebuild
index 9a8039ffeb4f..74909c5842bf 100644
--- a/sci-libs/fftw/fftw-3.2.2-r2.ebuild
+++ b/sci-libs/fftw/fftw-3.2.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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-r2.ebuild,v 1.2 2012/10/14 19:00:21 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-3.2.2-r2.ebuild,v 1.3 2012/10/18 21:42:09 jlec Exp $
 
 EAPI=2
 
@@ -17,12 +17,9 @@ 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 openmp paired-single sse sse2 threads zbus"
 
-DEPEND="fortran? ( virtual/fortran )"
-RDEPEND="${DEPEND}"
-
 pkg_setup() {
 	use openmp && FORTRAN_NEED_OPENMP="1"
-	use fortran && fortran-2_pkg_setup
+	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 751b74464411..5479d4bca26d 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-2012 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.17 2012/10/14 19:00:21 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-3.2.2.ebuild,v 1.18 2012/10/18 21:42:09 jlec Exp $
 
 EAPI=2
 
@@ -17,12 +17,9 @@ 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 openmp sse sse2 threads"
 
-DEPEND="fortran? ( virtual/fortran )"
-RDEPEND="${DEPEND}"
-
 pkg_setup() {
 	use openmp && FORTRAN_NEED_OPENMP="1"
-	use fortran && fortran-2_pkg_setup
+	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.3.2.ebuild b/sci-libs/fftw/fftw-3.3.2.ebuild
index 9eab1cc380b8..f899f83fd35f 100644
--- a/sci-libs/fftw/fftw-3.3.2.ebuild
+++ b/sci-libs/fftw/fftw-3.3.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-3.3.2.ebuild,v 1.6 2012/10/16 18:08:04 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-3.3.2.ebuild,v 1.7 2012/10/18 21:42:09 jlec Exp $
 
 EAPI=4
 
@@ -18,9 +18,7 @@ SLOT="3.0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="altivec avx doc fortran mpi neon openmp quad sse sse2 static-libs threads zbus"
 
-DEPEND="
-	fortran? ( virtual/fortran[openmp?] )
-	mpi? ( virtual/mpi )"
+DEPEND="mpi? ( virtual/mpi )"
 RDEPEND="${DEPEND}"
 
 pkg_setup() {
@@ -31,7 +29,7 @@ pkg_setup() {
 		fi
 		FORTRAN_NEED_OPENMP=1
 	fi
-	use fortran && fortran-2_pkg_setup
+	fortran-2_pkg_setup
 	FFTW_DIRS="single double longdouble"
 	if use quad; then
 		if [[ $(tc-getCC) == *gcc ]] && ! version_is_at_least 4.6 $(gcc-version); then