New revision allows f2c to be used as fortran compiler. This fixes bug #152727.

Package-Manager: portage-2.1.2_rc1-r1

5 files changed, 171 insertions, 15 deletions

diff --git a/sci-mathematics/octave/ChangeLog b/sci-mathematics/octave/ChangeLog
index 6d545313fcc3..4bd44140cbe3 100644
--- a/sci-mathematics/octave/ChangeLog
+++ b/sci-mathematics/octave/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-mathematics/octave
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/ChangeLog,v 1.39 2006/10/04 16:58:09 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/ChangeLog,v 1.40 2006/11/02 16:29:22 markusle Exp $
+
+*octave-2.1.73-r1 (02 Nov 2006)
+
+  02 Nov 2006; Markus Dittrich <markusle@gentoo.org>
+  +files/octave-2.1.73-f2c-fix.patch, +octave-2.1.73-r1.ebuild:
+  New revision allows f2c to be used as fortran compiler. This
+  fixes bug #152727.
 
   04 Oct 2006; Chris Gianelloni <wolf31o2@gentoo.org> octave-2.1.73.ebuild:
   Stable on x86 wrt bug #141446.
diff --git a/sci-mathematics/octave/Manifest b/sci-mathematics/octave/Manifest
index 9d9bbc686c55..1f408b6387b5 100644
--- a/sci-mathematics/octave/Manifest
+++ b/sci-mathematics/octave/Manifest
@@ -1,10 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX octave-2.1.72-gcc4.1-gentoo.patch 4224 RMD160 d179b48f2e47e0e9b2312b3b21cc625ecaeb2e9a SHA1 54da4d74cb5d172310de64fc6cc9e32d56823e82 SHA256 24f0ccb8c2aa4004bd251f0095b8a83417f320326ba99a0bba46f8b178722a66
 MD5 b515afd69ed0e0889ca5f2cea053e471 files/octave-2.1.72-gcc4.1-gentoo.patch 4224
 RMD160 d179b48f2e47e0e9b2312b3b21cc625ecaeb2e9a files/octave-2.1.72-gcc4.1-gentoo.patch 4224
 SHA256 24f0ccb8c2aa4004bd251f0095b8a83417f320326ba99a0bba46f8b178722a66 files/octave-2.1.72-gcc4.1-gentoo.patch 4224
+AUX octave-2.1.73-f2c-fix.patch 419 RMD160 3f8768b9073bcd2d93a5c6064d518299ad0b86a6 SHA1 3c4ee31b5d85d1d8c5f523f39ea25a4a2e577b0d SHA256 18c29afa2402e562cf11ac5a0c7718ed5c9713846dfd0245b2930aaa1939fa41
+MD5 3191c8e0135ebd988940f44437d38192 files/octave-2.1.73-f2c-fix.patch 419
+RMD160 3f8768b9073bcd2d93a5c6064d518299ad0b86a6 files/octave-2.1.73-f2c-fix.patch 419
+SHA256 18c29afa2402e562cf11ac5a0c7718ed5c9713846dfd0245b2930aaa1939fa41 files/octave-2.1.73-f2c-fix.patch 419
 AUX octave-2.1.73-gcc4.1-gentoo.patch 956 RMD160 f331768b814a213029014bf16021318706b084f5 SHA1 3f52c4cd9d74476d13250da9c9091f5e5d3389b1 SHA256 5526650682c4d50a10a04ebed218737246c55bceb0bb773a709a846e0adc2af5
 MD5 82a3d6b5e68e7a6996db0a51137de512 files/octave-2.1.73-gcc4.1-gentoo.patch 956
 RMD160 f331768b814a213029014bf16021318706b084f5 files/octave-2.1.73-gcc4.1-gentoo.patch 956
@@ -30,14 +31,18 @@ EBUILD octave-2.1.72.ebuild 3888 RMD160 04c76c5c072d43a06537ca1a38842020a66c1de7
 MD5 a7a157a1671bd3ccbc182d2e7f00b40b octave-2.1.72.ebuild 3888
 RMD160 04c76c5c072d43a06537ca1a38842020a66c1de7 octave-2.1.72.ebuild 3888
 SHA256 d60bd995f7a29bf9c43c39f961d1e40e493410a77c92a0f3d4da96744b9bb510 octave-2.1.72.ebuild 3888
+EBUILD octave-2.1.73-r1.ebuild 3975 RMD160 cba37f25194477e8b247c7a511f1d66845940225 SHA1 9ee9ac79fa249251c34e9813afb482c5e9091eb1 SHA256 772b51b68c5fcf7cf7c9ab637bcb16cc2961d34123a47fdb76f61a965981b4f9
+MD5 b9fb187c12c3e8083323464024e95d39 octave-2.1.73-r1.ebuild 3975
+RMD160 cba37f25194477e8b247c7a511f1d66845940225 octave-2.1.73-r1.ebuild 3975
+SHA256 772b51b68c5fcf7cf7c9ab637bcb16cc2961d34123a47fdb76f61a965981b4f9 octave-2.1.73-r1.ebuild 3975
 EBUILD octave-2.1.73.ebuild 3880 RMD160 f66a93a2a0bcae2bb409506e866a8e68831d4149 SHA1 a57f0cb1f3bc6a5abed33419a8a5fd3439f64915 SHA256 76a6bbaf964a47cec8c923f9300288d62bdfae2ed7bfd9f31f29357b9ed4ff4d
 MD5 7aeaca8146463d32581d6f7c4f170d24 octave-2.1.73.ebuild 3880
 RMD160 f66a93a2a0bcae2bb409506e866a8e68831d4149 octave-2.1.73.ebuild 3880
 SHA256 76a6bbaf964a47cec8c923f9300288d62bdfae2ed7bfd9f31f29357b9ed4ff4d octave-2.1.73.ebuild 3880
-MISC ChangeLog 12755 RMD160 17bac9caa6644ab37eae59ac7f58fdd40d817040 SHA1 c6c3a13eb92c0a96415655fb9faaa5b4480da463 SHA256 e6ccf54c02fcd72aa2ba101eda01ca1c4023d13f54f1db205937365abe199ab8
-MD5 093e253125e6c90abf87639d1b44a9c7 ChangeLog 12755
-RMD160 17bac9caa6644ab37eae59ac7f58fdd40d817040 ChangeLog 12755
-SHA256 e6ccf54c02fcd72aa2ba101eda01ca1c4023d13f54f1db205937365abe199ab8 ChangeLog 12755
+MISC ChangeLog 12990 RMD160 990e0e5b920c56f1661501cb6332b2e5992da243 SHA1 0efd111ca8f0aa8a1c4981d00d19c423d925970a SHA256 b7eafa0f7bfd09b20cfa7d9689d9dfc90b83e6830b1c99d5d8aebf3505d697fd
+MD5 b5801c4d0294c0a48bdf13c918dfe51c ChangeLog 12990
+RMD160 990e0e5b920c56f1661501cb6332b2e5992da243 ChangeLog 12990
+SHA256 b7eafa0f7bfd09b20cfa7d9689d9dfc90b83e6830b1c99d5d8aebf3505d697fd ChangeLog 12990
 MISC metadata.xml 304 RMD160 9bf8d3764f2f605704497eb920cf7d496ac77fa1 SHA1 f6b8d455b85f4b18b68d152c3e8179b7d6defe60 SHA256 7de312597cc9f943d78b63b27600b43a55cedc90557552f88dc0d73462c2921a
 MD5 235d4f760824f15143cfe730fc1710a8 metadata.xml 304
 RMD160 9bf8d3764f2f605704497eb920cf7d496ac77fa1 metadata.xml 304
@@ -57,10 +62,6 @@ SHA256 973505544dd15aae6ac4c5da5d89a721b8bde793c04b903c3bf686600b905ea6 files/di
 MD5 13da45398b2ad0d71c6289ff6a97d651 files/digest-octave-2.1.73 247
 RMD160 f9d3dc093a685264e10f8550380e3882cd20714b files/digest-octave-2.1.73 247
 SHA256 f550c0e9363b790830b2eff525d52c4382e65eab89715973c7938df31c65da1f files/digest-octave-2.1.73 247
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-iD8DBQFFQjQbwUpWvClEHQoRAiCqAJ4qhTCxbfuA/VD56ITGsYIFbX5XUQCfWMfw
-rehGxvXZNcnJkFdo9BUJLM4=
-=NzDH
------END PGP SIGNATURE-----
+MD5 13da45398b2ad0d71c6289ff6a97d651 files/digest-octave-2.1.73-r1 247
+RMD160 f9d3dc093a685264e10f8550380e3882cd20714b files/digest-octave-2.1.73-r1 247
+SHA256 f550c0e9363b790830b2eff525d52c4382e65eab89715973c7938df31c65da1f files/digest-octave-2.1.73-r1 247
diff --git a/sci-mathematics/octave/files/digest-octave-2.1.73-r1 b/sci-mathematics/octave/files/digest-octave-2.1.73-r1
new file mode 100644
index 000000000000..c9d5dd4b570b
--- /dev/null
+++ b/sci-mathematics/octave/files/digest-octave-2.1.73-r1
@@ -0,0 +1,3 @@
+MD5 c356475aa06d81a10f8bf27f1a1d27a0 octave-2.1.73.tar.bz2 5790133
+RMD160 d34c6ecd8f84c728ad7687d9568b9d69ade6f5db octave-2.1.73.tar.bz2 5790133
+SHA256 8ccaee227c6cad3b5633a904414f17ce73de8eab2abd4d2e6a3972dd878ffbc3 octave-2.1.73.tar.bz2 5790133
diff --git a/sci-mathematics/octave/files/octave-2.1.73-f2c-fix.patch b/sci-mathematics/octave/files/octave-2.1.73-f2c-fix.patch
new file mode 100644
index 000000000000..b64ebd1a78f5
--- /dev/null
+++ b/sci-mathematics/octave/files/octave-2.1.73-f2c-fix.patch
@@ -0,0 +1,11 @@
+--- octave-2.1.73/configure.in	2006-03-20 16:10:52.000000000 -0500
++++ octave-2.1.73-new/configure.in	2006-10-31 21:12:46.000000000 -0500
+@@ -564,7 +564,7 @@
+     CONFLIB_ARG="-L. -lconflib"
+   fi
+   rm -f conftest*
+-  AC_CHECK_LIB(f2c, f_open, FLIBS=-lf2c, FLIBS=, $CONFLIB_ARG)
++  AC_CHECK_LIB(f2c, f_open, FLIBS="/usr/lib/libf2c.a", FLIBS=, $CONFLIB_ARG -static)
+   rm -f $oct_conflib
+ 
+   if test -z "$FLIBS"; then
diff --git a/sci-mathematics/octave/octave-2.1.73-r1.ebuild b/sci-mathematics/octave/octave-2.1.73-r1.ebuild
new file mode 100644
index 000000000000..fca3035313df
--- /dev/null
+++ b/sci-mathematics/octave/octave-2.1.73-r1.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-2.1.73-r1.ebuild,v 1.1 2006/11/02 16:29:22 markusle Exp $
+
+inherit flag-o-matic fortran autotools
+
+DESCRIPTION="GNU Octave is a high-level language (MatLab compatible) intended for numerical computations"
+LICENSE="GPL-2"
+HOMEPAGE="http://www.octave.org/"
+SRC_URI="ftp://ftp.octave.org/pub/octave/bleeding-edge/${P}.tar.bz2
+		ftp://ftp.math.uni-hamburg.de/pub/soft/math/octave/${P}.tar.bz2"
+
+SLOT="0"
+IUSE="emacs static readline zlib doc hdf5 mpi blas"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+DEPEND="virtual/libc
+	>=sys-libs/ncurses-5.2-r3
+	>=sci-visualization/gnuplot-3.7.1-r3
+	>=sci-libs/fftw-2.1.3
+	>=dev-util/gperf-2.7.2
+	zlib? ( sys-libs/zlib )
+	hdf5? ( sci-libs/hdf5 )
+	doc? ( virtual/tetex )
+	blas? ( virtual/blas )
+	mpi? ( virtual/mpi )
+	!=app-text/texi2html-1.70"
+
+# 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
+FORTRAN="gfortran g77 f2c"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${P}-gcc4.1-gentoo.patch
+	epatch "${FILESDIR}"/${P}-f2c-fix.patch
+	eautoconf
+}
+
+
+src_compile() {
+	filter-flags -ffast-math
+
+	local myconf="--localstatedir=/var/state/octave --enable-rpath"
+	myconf="${myconf} --enable-lite-kernel"
+	use static || myconf="${myconf} --disable-static --enable-shared --enable-dl"
+	# Only add -lz to LDFLAGS if we have zlib in USE !
+	# BUG #52604
+	# Danny van Dyk 2004/08/26
+	use zlib && append-ldflags -lz
+
+	# MPI requires the use of gcc/g++ wrappers
+	# mpicc/mpic++
+	# octave links agains -lmpi by default
+	# mpich needs -lmpich instead
+	if use mpi; then
+		CC="mpicc" && CXX="mpiCC"
+		if has_version 'sys-cluster/mpich'; then
+			myconf="${myconf} --with-mpi=mpich"
+		else
+			myconf="${myconf} --with-mpi=mpi"
+		fi
+	else
+		CC="$(tc-getCC)"
+		CXX="$(tc-getCXX)"
+		myconf="${myconf} --without-mpi"
+	fi
+
+	CC="${CC}" CXX="${CXX}" \
+	econf \
+		$(use_with hdf5) \
+		$(use_enable readline) \
+		${myconf} \
+		|| die "econf failed"
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	make install DESTDIR="${D}" || die "make install failed"
+	if use doc; then
+		octave-install-doc || die "Octave doc install failed"
+	fi
+	if use emacs; then
+		cd emacs
+		exeinto /usr/bin
+		doexe otags || die
+		doman otags.1 || die
+		for emacsdir in /usr/share/emacs/site-lisp /usr/lib/xemacs/site-lisp; do
+			insinto ${emacsdir}
+			doins *.el || die
+		done
+		cd ..
+	fi
+	dodir /etc/env.d || die
+	echo "LDPATH=/usr/lib/octave-${PV}" > "${D}"/etc/env.d/99octave || die
+
+	# Fixes ls-R files to remove /var/tmp/portage references.
+	sed -i -e "s:${D}::g" "${D}"/usr/libexec/${PN}/ls-R || die
+	sed -i -e "s:${D}::g" "${D}"/usr/share/${PN}/ls-R || die
+}
+
+pkg_postinst() {
+	echo
+	einfo "Some users have reported failures at running simple tests if"
+	einfo "octave was built with agressive optimisations. You can check if"
+	einfo "your setup is affected by this bug by running the following test"
+	einfo "(inside the octave interpreter):"
+	einfo
+	einfo "octave:1> y = [1 3 4 2 1 5 3 5 6 7 4 5 7 10 11 3];"
+	einfo "octave:2> g = [1 1 1 1 1 1 1 1 2 2 2 2 2 3 3 3];"
+	einfo "octave:3> anova(y, g)"
+	einfo
+	einfo "If these commands complete successfully with no error message,"
+	einfo "your installation should be ok. Otherwise, try recompiling"
+	einfo "octave using less agressive \"CFLAGS\" (combining \"-O3\" and"
+	einfo "\"-march=pentium4\" is known to cause problems)."
+	echo
+}
+
+octave-install-doc() {
+	echo "Installing documentation..."
+	insinto /usr/share/doc/${PF}
+	doins doc/faq/Octave-FAQ.dvi || die
+	doins doc/interpreter/octave.dvi || die
+	doins doc/liboctave/liboctave.dvi || die
+	doins doc/refcard/refcard-a4.dvi || die
+	doins doc/refcard/refcard-legal.dvi || die
+	doins doc/refcard/refcard-letter.dvi || die
+}