--- octave-3.0.3.ebuild	2009-04-20 13:10:07.000000000 -0700
+++ octave-3.0.5.ebuild	2009-04-23 21:52:13.305636749 -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.6 2009/04/20 20:01:36 maekke 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"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE="emacs readline zlib doc hdf5 curl fftw xemacs sparse"
-KEYWORDS="alpha amd64 ~hppa ~ppc ~ppc64 sparc x86"
 
 RDEPEND="virtual/lapack
 	dev-libs/libpcre
@@ -43,16 +45,14 @@
 
 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.3-test-fix.patch
 	epatch "${FILESDIR}"/${PN}-3.0.1-fix_handle_for_plotyy.patch
 	epatch "${FILESDIR}"/${PN}-3.0.1-no_helvetica.patch
 }
 
-src_compile() {
+src_configure() {
 	econf \
 		--localstatedir=/var/state/octave \
 		--enable-shared \
@@ -68,7 +68,9 @@
 		$(use_with sparse cholmod) \
 		$(use_with sparse cxsparse) \
 		$(use_enable readline)
+}
 
+src_compile() {
 	emake || die "emake failed"
 
 	if use xemacs; then