--- octave-3.0.3.ebuild	2009-06-21 12:07:17.000000000 -0700
+++ octave-3.2.0.ebuild	2009-06-27 02:07:55.421592077 -0700
@@ -1,17 +1,19 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-3.0.3.ebuild,v 1.8 2009/06/21 18:47:58 graaff Exp $
+# $Header: $
 
-inherit flag-o-matic fortran xemacs-elisp-common
+EAPI="2"
+
+inherit fortran xemacs-elisp-common
 
 DESCRIPTION="High-level interactive language for numerical computations"
-LICENSE="GPL-3"
 HOMEPAGE="http://www.octave.org/"
 SRC_URI="ftp://ftp.gnu.org/pub/gnu/${PN}/${P}.tar.bz2"
 
+LICENSE="GPL-3"
 SLOT="0"
-IUSE="emacs readline zlib doc hdf5 curl fftw xemacs sparse"
-KEYWORDS="alpha amd64 ~hppa ~ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="emacs readline zlib doc hdf5 curl fftw fltk xemacs sparse"
 
 RDEPEND="virtual/lapack
 	dev-libs/libpcre
@@ -19,17 +21,19 @@
 	sci-visualization/gnuplot
 	>=sci-mathematics/glpk-4.15
 	media-libs/qhull
+	curl? ( net-misc/curl )
 	fftw? ( >=sci-libs/fftw-3.1.2 )
-	zlib? ( sys-libs/zlib )
+	fltk? ( x11-libs/fltk[opengl] )
 	hdf5? ( sci-libs/hdf5 )
-	curl? ( net-misc/curl )
-	xemacs? ( app-editors/xemacs )
 	sparse? ( sci-libs/umfpack
-		sci-libs/colamd
+		sci-libs/arpack
 		sci-libs/camd
 		sci-libs/ccolamd
 		sci-libs/cholmod
+		sci-libs/colamd
 		sci-libs/cxsparse )
+	xemacs? ( app-editors/xemacs )
+	zlib? ( sys-libs/zlib )
 	!sci-mathematics/octave-forge"
 
 DEPEND="${RDEPEND}
@@ -42,16 +46,13 @@
 
 FORTRAN="gfortran ifc g77 f2c"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	epatch "${FILESDIR}"/${PN}-3.0.0-pkg.patch
 	epatch "${FILESDIR}"/${P}-test-fix.patch
-	epatch "${FILESDIR}"/${PN}-3.0.1-fix_handle_for_plotyy.patch
-	epatch "${FILESDIR}"/${PN}-3.0.1-no_helvetica.patch
+	epatch "${FILESDIR}"/${P}-no_helvetica.patch
 }
 
-src_compile() {
+src_configure() {
 	econf \
 		--localstatedir=/var/state/octave \
 		--enable-shared \
@@ -60,14 +61,18 @@
 		$(use_with hdf5) \
 		$(use_with curl) \
 		$(use_with zlib) \
+		$(use_with fltk) \
 		$(use_with fftw) \
+		$(use_with sparse arpack) \
 		$(use_with sparse umfpack) \
 		$(use_with sparse colamd) \
 		$(use_with sparse ccolamd) \
 		$(use_with sparse cholmod) \
 		$(use_with sparse cxsparse) \
 		$(use_enable readline)
+}
 
+src_compile() {
 	emake || die "emake failed"
 
 	if use xemacs; then
@@ -98,10 +103,4 @@
 
 	echo "LDPATH=/usr/$(get_libdir)/octave-${PV}" > 99octave
 	doenvd 99octave || die
-
-	# Fixes ls-R files to remove /var/tmp/portage references.
-	sed -i \
-		-e "s:${D}::g" \
-		"${D}"/usr/*/${PN}/ls-R \
-		|| die "Failed to fix ls-R files."
 }