Version bump. Added patch to allow more robust optional dependencies, fixed blas/lapack hangling

(Portage version: 2.1.4.4)

4 files changed, 172 insertions, 7 deletions

diff --git a/sci-mathematics/freemat/ChangeLog b/sci-mathematics/freemat/ChangeLog
index a0dd74a42322..b2741353b77d 100644
--- a/sci-mathematics/freemat/ChangeLog
+++ b/sci-mathematics/freemat/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-mathematics/freemat
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/freemat/ChangeLog,v 1.8 2008/01/13 14:52:50 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/freemat/ChangeLog,v 1.9 2008/03/24 09:48:10 bicatali Exp $
+
+*freemat-3.6 (24 Mar 2008)
+
+  24 Mar 2008; Sébastien Fabbro <bicatali@gentoo.org>
+  +files/freemat-3.6-optional-deps.patch, metadata.xml, +freemat-3.6.ebuild:
+  Version bump. Added patch to allow more robust optional dependencies,
+  fixed blas/lapack hangling
 
   13 Jan 2008; Sébastien Fabbro <bicatali@gentoo.org> -freemat-3.4.ebuild,
   freemat-3.5.ebuild:
diff --git a/sci-mathematics/freemat/files/freemat-3.6-optional-deps.patch b/sci-mathematics/freemat/files/freemat-3.6-optional-deps.patch
new file mode 100644
index 000000000000..b7b0020a46b3
--- /dev/null
+++ b/sci-mathematics/freemat/files/freemat-3.6-optional-deps.patch
@@ -0,0 +1,91 @@
+--- acinclude.m4.orig	2008-03-24 00:40:28.000000000 +0000
++++ acinclude.m4	2008-03-24 01:40:37.000000000 +0000
+@@ -304,6 +304,11 @@
+ need_extern="no"
+ LIBS="$LIBS $FLIBS"
+ 
++AC_ARG_ENABLE(portaudio,
++        [--enable-portaudio],
++	[enable_portaudio=$enableval])
++if test x"$enable_portaudio" = x"yes"; then
++
+ AC_CHECK_LIB(portaudio,Pa_GetDefaultInputDevice,found_portaudio19="yes",found_portaudio19="no")
+ AC_CHECK_HEADER(portaudio.h,[],found_portaudio19="no")
+ 
+@@ -330,6 +335,7 @@
+ else
+   found_portaudio="no";
+ fi
++fi
+ 
+ AC_CHECK_LIB(pcre,pcre_compile,found_pcre="yes",found_pcre="no")
+ AC_CHECK_HEADER(pcre.h,[],found_pcre="no")
+@@ -339,6 +345,11 @@
+   AC_DEFINE(HAVE_PCRE, 1, [Set to 1 if you have libpcre])
+ fi
+ 
++
++AC_ARG_ENABLE(ffcall,
++        [--enable-ffcall],
++	[enable_ffcall=$enableval])
++if test x"$enable_ffcall" = x"yes"; then
+ AC_CHECK_LIB(avcall,__structcpy,found_avcall="yes",found_avcall="no")
+ AC_CHECK_HEADER(avcall.h,[],found_avcall="no")
+ 
+@@ -346,7 +357,7 @@
+   LIBS="-lavcall $LIBS"
+   AC_DEFINE(HAVE_AVCALL, 1, [Set to 1 if you have libavcall])
+ fi    
+-
++fi
+ if test x"$is_osx" == xyes; then
+    LIBS="$LIBS -framework vecLib"
+    found_blas="yes"
+@@ -362,6 +373,10 @@
+    fi
+ fi
+ 
++AC_ARG_ENABLE(umfpack,
++        [--enable-umfpack],
++	[enable_umfpack=$enableval])
++if test x"$enable_umfpack" = x"yes"; then
+ AC_CHECK_LIB(amd,amd_postorder,found_amd="yes",found_amd="no")
+ AC_CHECK_HEADER(amd.h,found_amdh="yes",found_amdh="no")
+ if test x"$found_amdh" == xno; then
+@@ -405,10 +420,15 @@
+ if (test x"$found_amdh" == xyes) && (test x"$found_amd" == xyes) && (test x"$found_umfpackh" == xyes) && (test x"$found_umfpack" == xyes); then
+     AC_DEFINE(HAVE_UMFPACK, 1, [Set to 1 if you have UMFPACK])
+ fi
++fi
+ 
+ dnl PKG_CHECK_MODULES(fftw3, fftw3 >= 3.1.0, found_fftw3="yes", found_fftw3="no")
+ dnl PKG_CHECK_MODULES(fftw3f, fftw3f >= 3.1.0, found_fftw3f="yes", found_fftw3f="no")
+ 
++AC_ARG_ENABLE(fftw,
++        [--enable-fftw],
++	[enable_fftw=$enableval])
++if test x"$enable_fftw" = x"yes"; then
+ AC_CHECK_LIB(fftw3f,fftwf_malloc,found_fftw3f="yes",found_fftw3f="no")
+ AC_CHECK_LIB(fftw3,fftw_malloc,found_fftw3="yes",found_fftw3="no")
+ AC_CHECK_HEADER(fftw3.h,[],[found_fftw3="no";found_fftw3f="no"])
+@@ -422,6 +442,12 @@
+ 	LIBS="-lfftw3 $LIBS"
+   	AC_DEFINE(HAVE_FFTW, 1, [Set to 1 if you have the double precision version of FFTW installed])
+ fi
++fi
++
++AC_ARG_ENABLE(arpack,
++        [--enable-arpack],
++	[enable_arpack=$enableval])
++if test x"$enable_arpack" = x"yes"; then
+ 
+ AC_F77_FUNC(znaupd)
+ if test x"$znaupd" == x"unknown"; then
+@@ -441,6 +467,7 @@
+ 	   AC_DEFINE(HAVE_ARPACK, 1, [Set to 1 if you have ARPACK installed])
+    fi
+ fi
++fi
+ 
+ AC_CHECK_LIB(z,inflate,found_z="yes",found_z="no")
+ if test x"$found_z" == xyes; then
diff --git a/sci-mathematics/freemat/freemat-3.6.ebuild b/sci-mathematics/freemat/freemat-3.6.ebuild
new file mode 100644
index 000000000000..44c8178328b1
--- /dev/null
+++ b/sci-mathematics/freemat/freemat-3.6.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/freemat/freemat-3.6.ebuild,v 1.1 2008/03/24 09:48:10 bicatali Exp $
+
+inherit eutils qt4 autotools
+
+MY_PN=FreeMat
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Environment for rapid engineering and scientific processing"
+HOMEPAGE="http://freemat.sourceforge.net/"
+SRC_URI="mirror://sourceforge/freemat/${MY_P}.tar.gz"
+
+IUSE="arpack ffcall fftw ncurses portaudio umfpack"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="$(qt4_min_version 4.2)
+	dev-libs/libpcre
+	virtual/lapack
+	ncurses? ( >=sys-libs/ncurses-5.4 )
+	umfpack? ( sci-libs/umfpack )
+	arpack? ( sci-libs/arpack )
+	fftw? ( >=sci-libs/fftw-3 )
+	portaudio? ( media-libs/portaudio )
+	ffcall? ( dev-libs/ffcall )"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+QT4_BUILT_WITH_USE_CHECK="opengl"
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	# allow enable/disable for configure
+	epatch "${FILESDIR}"/${P}-optional-deps.patch
+	eautoreconf
+}
+
+src_compile() {
+	econf \
+		--with-blas="$(pkg-config --libs blas)" \
+		--with-lapack="$(pkg-config --libs lapack)" \
+		$(use_with ncurses) \
+		$(use_enable umfpack) \
+		$(use_enable arpack) \
+		$(use_enable fftw) \
+		$(use_enable portaudio) \
+		$(use_enable ffcall) \
+		|| die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc AUTHORS ChangeLog || die "dodoc failed"
+	newicon images/freemat_small_mod_64.png ${PN}.png
+	make_desktop_entry FreeMat FreeMat
+}
+
+pkg_postint() {
+	einfo "Initializing freemat data directory"
+	FreeMat -i "${ROOT}"/usr/share/${MY_P}
+}
diff --git a/sci-mathematics/freemat/metadata.xml b/sci-mathematics/freemat/metadata.xml
index 3360526e46db..699def2f9bae 100644
--- a/sci-mathematics/freemat/metadata.xml
+++ b/sci-mathematics/freemat/metadata.xml
@@ -3,11 +3,11 @@
 <pkgmetadata>
 <herd>sci-mathematics</herd>
 <longdescription lang="en">
-FreeMat is a free environment for rapid engineering and scientific prototyping
-and data processing. It is similar to commercial systems such as MATLAB from Mathworks,
-and IDL from Research Systems, but is Open Source. FreeMat includes several
-novel features such as a codeless interface to external C/C++/FORTRAN code,
-parallel/distributed algorithm development (via MPI), and plotting
-and visualization capabilities.
+  FreeMat is an open sources environment for rapid engineering and
+  scientific prototyping and data processing. It is similar to
+  commercial systems such as MATLAB from Mathworks. FreeMat includes a
+  codeless interface to external C/C++/FORTRAN code,
+  parallel/distributed algorithm development (via MPI), and plotting
+  and visualization capabilities.
 </longdescription>
 </pkgmetadata>