Removed ifc use flag (see bug #97929).

(Portage version: 2.1.4.4)

3 files changed, 15 insertions, 29 deletions

diff --git a/sci-mathematics/octave/ChangeLog b/sci-mathematics/octave/ChangeLog
index c8af3c3bba26..81f829974837 100644
--- a/sci-mathematics/octave/ChangeLog
+++ b/sci-mathematics/octave/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-mathematics/octave
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/ChangeLog,v 1.55 2008/03/02 13:48:00 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/ChangeLog,v 1.56 2008/04/07 13:57:31 markusle Exp $
+
+  07 Apr 2008; Markus Dittrich <markusle@gentoo.org>
+  octave-2.1.57-r1.ebuild, octave-2.1.69.ebuild:
+  Removed ifc use flag (see bug #97929).
 
   02 Mar 2008; Markus Dittrich <markusle@gentoo.org> octave-2.1.73.ebuild,
   octave-2.1.73-r1.ebuild, octave-2.1.73-r2.ebuild:
diff --git a/sci-mathematics/octave/octave-2.1.57-r1.ebuild b/sci-mathematics/octave/octave-2.1.57-r1.ebuild
index 436607f1c5ee..8d5eabb10de0 100644
--- a/sci-mathematics/octave/octave-2.1.57-r1.ebuild
+++ b/sci-mathematics/octave/octave-2.1.57-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-2.1.57-r1.ebuild,v 1.10 2007/11/20 14:46:56 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-2.1.57-r1.ebuild,v 1.11 2008/04/07 13:57:31 markusle Exp $
 
-inherit flag-o-matic
+inherit flag-o-matic fortran
 
 DESCRIPTION="GNU Octave is a high-level language (MatLab compatible) intended for numerical computations"
 HOMEPAGE="http://www.octave.org/"
@@ -12,7 +12,7 @@ SRC_URI="ftp://ftp.octave.org/pub/octave/bleeding-edge/${P}.tar.bz2
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ppc alpha ~sparc amd64"
-IUSE="emacs static readline zlib latex hdf5 mpi ifc blas"
+IUSE="emacs static readline zlib latex hdf5 mpi blas"
 
 DEPEND="virtual/libc
 	>=sys-libs/ncurses-5.2-r3
@@ -22,22 +22,13 @@ DEPEND="virtual/libc
 	zlib? ( sys-libs/zlib )
 	hdf5? ( sci-libs/hdf5 )
 	latex? ( virtual/latex-base )
-	x86? ( ifc? ( dev-lang/ifc ) )
 	blas? ( virtual/blas )"
 
 # NOTE: octave supports blas/lapack from intel but this is not open
 # source nor is it free (as in beer OR speech) Check out...
 # http://developer.intel.com/software/products/mkl/mkl52/index.htm for
 # more information
-
-pkg_setup() {
-	use ifc || if [[ -z $(type -P g77) ]]; then
-		#if ifc is defined then the dep was already checked
-		eerror "No fortran compiler found on the system!"
-		eerror "Please add fortran to your USE flags and reemerge gcc!"
-		die
-	fi
-}
+FORTRAN="gfortran g77 ifc"
 
 src_compile() {
 	filter-flags -ffast-math
diff --git a/sci-mathematics/octave/octave-2.1.69.ebuild b/sci-mathematics/octave/octave-2.1.69.ebuild
index 0ddfbf53910f..a538f8f731cc 100644
--- a/sci-mathematics/octave/octave-2.1.69.ebuild
+++ b/sci-mathematics/octave/octave-2.1.69.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-2.1.69.ebuild,v 1.11 2007/11/20 14:46:56 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-2.1.69.ebuild,v 1.12 2008/04/07 13:57:31 markusle Exp $
 
-inherit flag-o-matic
+inherit flag-o-matic fortran
 
 DESCRIPTION="GNU Octave is a high-level language (MatLab compatible) intended for numerical computations"
 HOMEPAGE="http://www.octave.org/"
@@ -12,7 +12,7 @@ SRC_URI="ftp://ftp.octave.org/pub/octave/bleeding-edge/${P}.tar.bz2
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 ppc ~sparc x86"
-IUSE="emacs static readline zlib latex hdf5 mpi ifc blas"
+IUSE="emacs static readline zlib latex hdf5 mpi blas"
 
 DEPEND="virtual/libc
 	>=sys-libs/ncurses-5.2-r3
@@ -22,7 +22,6 @@ DEPEND="virtual/libc
 	zlib? ( sys-libs/zlib )
 	hdf5? ( sci-libs/hdf5 )
 	latex? ( virtual/latex-base )
-	x86? ( ifc? ( dev-lang/ifc ) )
 	blas? ( virtual/blas )
 	mpi? ( sys-cluster/lam-mpi )
 	!=app-text/texi2html-1.70"
@@ -31,15 +30,7 @@ DEPEND="virtual/libc
 # source nor is it free (as in beer OR speech) Check out...
 # http://developer.intel.com/software/products/mkl/mkl52/index.htm for
 # more information
-
-pkg_setup() {
-	use ifc || if [[ -z $(type -P g77) ]]; then
-		#if ifc is defined then the dep was already checked
-		eerror "No fortran compiler found on the system!"
-		eerror "Please add fortran to your USE flags and reemerge gcc!"
-		die
-	fi
-}
+FORTRAN="gfortran g77 ifc"
 
 src_compile() {
 	filter-flags -ffast-math