Fixed BUG #50777.

3 files changed, 30 insertions, 9 deletions

diff --git a/app-sci/octave/ChangeLog b/app-sci/octave/ChangeLog
index fc08cf51b7a6..a568a1dc1143 100644
--- a/app-sci/octave/ChangeLog
+++ b/app-sci/octave/ChangeLog
@@ -1,12 +1,20 @@
 # 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.26 2004/05/10 12:34:14 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-sci/octave/ChangeLog,v 1.27 2004/05/12 12:27:26 kugelfang Exp $
+
+  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.
+  However, the compilation process proceeds, in case that a different compiler
+  than g77 shall be used. Fixes BUG #50777.
 
 *octave-2.1.57-r1 (10 May 2004)
 
   10 May 2004; Patrick Kursawe <phosphan@gentoo.org> octave-2.1.57-r1.ebuild:
   Installs emacs related files if emacs is in USE now
 
+  09 May 2004; Danny van Dyk <kugelfang@gentoo.org> octave-2.1.57.ebuild:
+  Added local useflag "blas" to make ebuild depend on virtual/blas.
+
   05 May 2004; Bryan Østergaard <kloeri@gentoo.org> octave-2.1.57.ebuild:
   Stable on alpha.
 
diff --git a/app-sci/octave/Manifest b/app-sci/octave/Manifest
index 4f0f53985161..899f9b66e626 100644
--- a/app-sci/octave/Manifest
+++ b/app-sci/octave/Manifest
@@ -1,12 +1,12 @@
+MD5 fc1b89049a22a7bcc6fbe852459a69e7 ChangeLog 5127
+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 7d1d66ff27a34986bf1ad072ba8b39ae octave-2.1.57.ebuild 2201
-MD5 2cd17888b6c97a8d5644d47b5116c47d octave-2.1.57-r1.ebuild 2424
-MD5 0c6d8e0842b5926285e3b20d396064f4 octave-2.1.36-r1.ebuild 1968
-MD5 e26ee8268f41ac4ec1128bcc58268361 ChangeLog 4704
-MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
-MD5 c93a44a52d46ca6e8fed8c3c23877c0d files/digest-octave-2.1.36-r1 67
 MD5 32c6cee1f5b42b8b20369c3722fb4db2 files/digest-octave-2.1.57-r1 67
-MD5 74d376b9c7367fe7b333cbc7e8ca37b3 files/kill-dvips.diff 2448
-MD5 045463e5ebb1615d834a8145b27a765d files/filebuf.diff 1275
+MD5 c93a44a52d46ca6e8fed8c3c23877c0d files/digest-octave-2.1.36-r1 67
 MD5 806a54605ad877d62105b2f58819c92d files/digest-octave-2.1.50 67
 MD5 32c6cee1f5b42b8b20369c3722fb4db2 files/digest-octave-2.1.57 67
+MD5 045463e5ebb1615d834a8145b27a765d files/filebuf.diff 1275
+MD5 74d376b9c7367fe7b333cbc7e8ca37b3 files/kill-dvips.diff 2448
diff --git a/app-sci/octave/octave-2.1.57-r1.ebuild b/app-sci/octave/octave-2.1.57-r1.ebuild
index 4e11d7fc5afa..240b0e37722c 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.1 2004/05/10 12:34:14 phosphan Exp $
+# $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 $
 
 inherit flag-o-matic
 
@@ -13,6 +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.
 
 DEPEND="virtual/glibc
 	>=sys-libs/ncurses-5.2-r3
@@ -22,6 +23,7 @@ DEPEND="virtual/glibc
 	zlib? ( sys-libs/zlib )
 	hdf5? ( dev-libs/hdf5 )
 	tetex? ( virtual/tetex )"
+#	blas? ( virtual/blas )" NOTE: Blas-* is not fully done.
 
 # NOTE: octave supports blas/lapack from intel but this is not open
 # source nor is it free (as in beer OR speech) Check out...
@@ -38,6 +40,17 @@ 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 \