Removed ifc use flag (see bug #97929).

Package-Manager: portage-2.1.4.4

4 files changed, 18 insertions, 32 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/Manifest b/sci-mathematics/octave/Manifest
index 54ae06eee5a6..a7a55379ae0f 100644
--- a/sci-mathematics/octave/Manifest
+++ b/sci-mathematics/octave/Manifest
@@ -7,12 +7,12 @@ DIST octave-2.1.69.tar.bz2 5818959 RMD160 88a59f0dfe4c343f011f78b07dbf069b03e29b
 DIST octave-2.1.71.tar.bz2 5784751 RMD160 6728c64c63ac356908922ef8477e117cf944a7b2 SHA1 0c15d86c155e00dbff1e21be859ff82e7331b311 SHA256 c3a47eada5132bef4043cc9730466c133e1f3793f2b7f8e0e6c9620553747337
 DIST octave-2.1.72.tar.bz2 5808544 RMD160 b9a1056a98a524591b0f497f3c11ccc436a18eec SHA1 a696c65667a4a99d55279103065d1d0af5a5fb09 SHA256 d8b2dec9eb979c35be435896105c1c31dd61aa2c0f27be8b8b2645fa5d60bb90
 DIST octave-2.1.73.tar.bz2 5790133 RMD160 d34c6ecd8f84c728ad7687d9568b9d69ade6f5db SHA1 58221aa15fcefd66b03531ac0ae9b1d2356e7555 SHA256 8ccaee227c6cad3b5633a904414f17ce73de8eab2abd4d2e6a3972dd878ffbc3
-EBUILD octave-2.1.57-r1.ebuild 3689 RMD160 2d80ca998be13a8d39c919517de01078709534d3 SHA1 0bb9cbb8f6862f36d7067dccc03097a7a1abc6ec SHA256 9145fedd0c78b395d62d755d01c2c04a38371cbe07860f3f1bac533e91f593bd
-EBUILD octave-2.1.69.ebuild 3660 RMD160 454abb94c9f7ca29e0db21f5ddbe65e22caba6cd SHA1 11e9c0b98c1a7e9ea9c442e6b2b20c68af92a05f SHA256 b162480a5da51ff6f368b91cd8f4e254559b3c2cfa820d05b8748facc9bfb489
+EBUILD octave-2.1.57-r1.ebuild 3444 RMD160 ac7d57c312e5c849ae0fd88c33333cc7138abb1a SHA1 fbfd690dd1d977c70bee8e1692e4ad2076462776 SHA256 fc1c1399a29309a99b9d880626df3c8850c4cfb81f5f1657855605e9945b7cee
+EBUILD octave-2.1.69.ebuild 3415 RMD160 06019164d467a1cfc3607e8c8002439ee7fbb71f SHA1 3dc821b03b02599e5d27dbb1573118ca0a5b9194 SHA256 202a628e36d5578c981e5832cfaad31cf90687ad1621c8ddee4186a6b0ddf848
 EBUILD octave-2.1.71-r2.ebuild 3787 RMD160 998f60668b889a9284d0af46a37b8c485579af9a SHA1 31a873858905ea59507fa7a9c5d2daae55717da7 SHA256 e04652c5c02e2cbd91d95f610f566b04fb5da147440a97c0077e1e48e825f4b4
 EBUILD octave-2.1.72.ebuild 3893 RMD160 571014ce76eac12e6ae21ff21f087fb7258535da SHA1 f3fd6fa783473c9912105ae0256a12448843f9c5 SHA256 a91ee175a3a4a161171d5525e549f184d8b362e6e8d94923335a1f20d334fe90
 EBUILD octave-2.1.73-r1.ebuild 4441 RMD160 f25103dde6a4a9dacac56ce15e0e59ce8f0c8330 SHA1 9ee52584713d62c218956854249f757ebd70ac16 SHA256 c6dd06da30f001d494fbf3730a6ffbd8aeb50e3bf1fac4dd9c33a54dbcc46d71
 EBUILD octave-2.1.73-r2.ebuild 4556 RMD160 13b8c286b6b25f1a076bf1d776a91dad19ec4059 SHA1 b0a6c03f459dbac877e7296c8927cb062e0315d7 SHA256 f6da5c0439aa70795bf5cafd7bff6394cbd39e08a5b32399303c7b3d8f33fd59
 EBUILD octave-2.1.73.ebuild 4283 RMD160 d3b65b88c6472b892ea2286c2200ccb1e383a08a SHA1 ef7f1ac3c41f433453ae5e492fe9cadd21ce2d27 SHA256 2b4f4660cd30f3acaeff313dbc5cc7e225a8eab87998edcedf85f5c2cacffcf0
-MISC ChangeLog 15903 RMD160 cb6a0ba430c4c2cfd1ab68e5e24cf5b52c75b530 SHA1 81078af8ca2ea725143fb091d72dc740cb52ff99 SHA256 2f153701c12463f169ff78e181419134ec53c74c4dffb696074ef10f81dfbe74
+MISC ChangeLog 16047 RMD160 6b6d15dee743bd28f3e5074008a09e8097d9834f SHA1 3ea1ced8b40f5674e7b1e65f4786b23c2c7e8abd SHA256 92041a9f80c60ff3cab917bd38f904172b43fff0f8145f617fd724a3f070820a
 MISC metadata.xml 169 RMD160 a8b2671842bbec7d36e587fbf53c4eb111498347 SHA1 604114857745acb6253b121cda619e3c35771cc7 SHA256 7a9f25879c1299572cfaf2a3efb47313412564a1ef12c828224194f4e96edcd0
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