Switched to George's Fortran check from app-sci/lapack-atlas.

3 files changed, 20 insertions, 17 deletions

diff --git a/app-sci/octave/ChangeLog b/app-sci/octave/ChangeLog
index a568a1dc1143..2655fd8b9372 100644
--- a/app-sci/octave/ChangeLog
+++ b/app-sci/octave/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-sci/octave
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-sci/octave/ChangeLog,v 1.27 2004/05/12 12:27:26 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-sci/octave/ChangeLog,v 1.28 2004/05/15 20:07:21 kugelfang Exp $
+
+  15 May 2004; Danny van Dyk <kugelfang@gentoo.org> octave-2.1.57-r1.ebuild:
+  Now checking on both g77 and ifc Fortran compilers. Moved check routine to
+  pkg_setup.
 
   12 May 2004; Danny van Dyk <kugelfang@gentoo.org> octave-2.1.57-r1.ebuild:
   The ebuild checks now if g77 has been compiled. If not, a warning is shown.
diff --git a/app-sci/octave/Manifest b/app-sci/octave/Manifest
index 899f9b66e626..f7ff8ef2bc41 100644
--- a/app-sci/octave/Manifest
+++ b/app-sci/octave/Manifest
@@ -1,8 +1,8 @@
-MD5 fc1b89049a22a7bcc6fbe852459a69e7 ChangeLog 5127
+MD5 7c54a3ec0f4278c9c2e712349daa9583 ChangeLog 5295
 MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
 MD5 0c6d8e0842b5926285e3b20d396064f4 octave-2.1.36-r1.ebuild 1968
 MD5 757343d9bb2d3825f8607c330045877f octave-2.1.50.ebuild 2134
-MD5 520c3bfb82b94b307075c0345f19efcd octave-2.1.57-r1.ebuild 3006
+MD5 f4958c12b7c2adaccb93e3d522e37c37 octave-2.1.57-r1.ebuild 2848
 MD5 7d1d66ff27a34986bf1ad072ba8b39ae octave-2.1.57.ebuild 2201
 MD5 32c6cee1f5b42b8b20369c3722fb4db2 files/digest-octave-2.1.57-r1 67
 MD5 c93a44a52d46ca6e8fed8c3c23877c0d files/digest-octave-2.1.36-r1 67
diff --git a/app-sci/octave/octave-2.1.57-r1.ebuild b/app-sci/octave/octave-2.1.57-r1.ebuild
index 240b0e37722c..e43272855f25 100644
--- a/app-sci/octave/octave-2.1.57-r1.ebuild
+++ b/app-sci/octave/octave-2.1.57-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-sci/octave/octave-2.1.57-r1.ebuild,v 1.2 2004/05/12 12:27:26 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-sci/octave/octave-2.1.57-r1.ebuild,v 1.3 2004/05/15 20:07:21 kugelfang Exp $
 
 inherit flag-o-matic
 
@@ -13,7 +13,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~ppc ~alpha ~sparc ~amd64"
 IUSE="emacs static readline zlib tetex hdf5 mpi"
-#IUSE="emacs static readline zlib tetex hdf5 mpi" NOTE: Already added to use.local.desc.
+#IUSE="emacs static readline zlib tetex hdf5 mpi ifc blas" NOTE: Already added to use.local.desc.
 
 DEPEND="virtual/glibc
 	>=sys-libs/ncurses-5.2-r3
@@ -22,7 +22,8 @@ DEPEND="virtual/glibc
 	>=dev-util/gperf-2.7.2
 	zlib? ( sys-libs/zlib )
 	hdf5? ( dev-libs/hdf5 )
-	tetex? ( virtual/tetex )"
+	tetex? ( virtual/tetex )
+	x86? ( ifc? ( dev-lang/ifc ) )"
 #	blas? ( virtual/blas )" NOTE: Blas-* is not fully done.
 
 # NOTE: octave supports blas/lapack from intel but this is not open
@@ -30,6 +31,15 @@ DEPEND="virtual/glibc
 # http://developer.intel.com/software/products/mkl/mkl52/index.htm for
 # more information
 
+pkg_setup() {
+	use ifc || if [ -z `which g77` ]; then
+		#if ifc is defined then the dep was already checked
+		eerror "No fortran compiler found on the system!"
+		eerror "Please add g77 to your USE flags and reemerge gcc!"
+		die
+	fi
+}
+
 src_compile() {
 	filter-flags -ffast-math
 
@@ -40,17 +50,6 @@ src_compile() {
 	use hdf5 || myconf="${myconf} --without-hdf5"
 	use mpi  || myconf="${myconf} --without-mpi"
 
-	# NOTE: We need gcc to be emerge with USE="f77"
-	/usr/bin/which g77 > /dev/null 2>&1
-	if [ $? != 0 ]; then
-		ewarn "GNU Fortran Compiler g77 is missing. This is no problem"
-		ewarn "as long as you have a Fortran Compiler that will be"
-		ewarn "detected by ./configure. If you have no other compiler"
-		ewarn "installed, ./configure _will_ fail. In this case, add"
-		ewarn "\"f77\" to your USE-flags and remerge gcc."
-		sleep 20
-	fi
-
 	# NOTE: This version actually works with gcc-3.x
 	./configure ${myconf} --prefix=/usr \
 		--sysconfdir=/etc \