Removed emacs support from 3.4.0 (bug #354827 and http://hg.savannah.gnu.org/hgweb/octave/rev/dea165ff6d74). Fixed a typo.

(Portage version: 2.2.0_alpha23/cvs/Linux x86_64)

2 files changed, 10 insertions, 25 deletions

diff --git a/sci-mathematics/octave/ChangeLog b/sci-mathematics/octave/ChangeLog
index 47bd57ee7bef..7fb76cef7ea7 100644
--- a/sci-mathematics/octave/ChangeLog
+++ b/sci-mathematics/octave/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-mathematics/octave
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/ChangeLog,v 1.100 2011/02/12 19:05:07 rafaelmartins Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/ChangeLog,v 1.101 2011/02/15 20:20:29 rafaelmartins Exp $
+
+  15 Feb 2011; Rafael G. Martins <rafaelmartins@gentoo.org>
+  octave-3.4.0.ebuild:
+  Removed emacs support from 3.4.0 (bug #354827 and
+  http://hg.savannah.gnu.org/hgweb/octave/rev/dea165ff6d74). Fixed a typo.
 
 *octave-3.4.0 (12 Feb 2011)
 
diff --git a/sci-mathematics/octave/octave-3.4.0.ebuild b/sci-mathematics/octave/octave-3.4.0.ebuild
index 9c143267aae2..fb6188204a2b 100644
--- a/sci-mathematics/octave/octave-3.4.0.ebuild
+++ b/sci-mathematics/octave/octave-3.4.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-3.4.0.ebuild,v 1.1 2011/02/12 19:05:07 rafaelmartins Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-3.4.0.ebuild,v 1.2 2011/02/15 20:20:29 rafaelmartins Exp $
 
 EAPI="2"
-inherit flag-o-matic xemacs-elisp-common
+inherit multilib
 
 DESCRIPTION="High-level interactive language for numerical computations"
 LICENSE="GPL-3"
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.octave.org/"
 SRC_URI="ftp://ftp.gnu.org/pub/gnu/${PN}/${P}.tar.bz2"
 
 SLOT="0"
-IUSE="curl doc emacs fftw readline sparse test xemacs zlib"
+IUSE="curl doc fftw readline sparse test zlib"
 KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 
 RDEPEND="dev-libs/libpcre
@@ -35,7 +35,6 @@ RDEPEND="dev-libs/libpcre
 		sci-libs/colamd
 		sci-libs/cxsparse
 		sci-libs/umfpack )
-	xemacs? ( app-editors/xemacs )
 	zlib? ( sys-libs/zlib )
 	!sci-mathematics/octave-forge"
 
@@ -53,7 +52,7 @@ src_configure() {
 		--localstatedir=/var/state/octave \
 		--enable-shared \
 		--without-hdf5 \
-		--with-gplk \
+		--with-glpk \
 		--with-opengl \
 		--with-qrupdate \
 		--with-blas="$(pkg-config --libs blas)" \
@@ -62,7 +61,6 @@ src_configure() {
 		$(use_with curl) \
 		$(use_with fftw fftw3) \
 		$(use_with fftw fftw3f) \
-		$(use_with sparse arpack) \
 		$(use_with sparse umfpack) \
 		$(use_with sparse colamd) \
 		$(use_with sparse ccolamd) \
@@ -71,14 +69,6 @@ src_configure() {
 		$(use_with zlib z)
 }
 
-src_compile() {
-	emake || die "emake failed"
-	if use xemacs; then
-		cd "${S}/emacs"
-		xemacs-elisp-comp *.el
-	fi
-}
-
 src_install() {
 	emake install DESTDIR="${D}" || die "emake install failed"
 
@@ -88,16 +78,6 @@ src_install() {
 		doins $(find doc -name \*.pdf)
 	fi
 
-	if use emacs || use xemacs; then
-		cd emacs
-		exeinto /usr/bin
-		doexe octave-tags || die "Failed to install octave-tags"
-		doman octave-tags.1 || die "Failed to install octave-tags.1"
-		if use xemacs; then
-			xemacs-elisp-install ${PN} *.el *.elc
-		fi
-		cd ..
-	fi
 	use test && dodoc test/fntests.log
 	echo "LDPATH=/usr/$(get_libdir)/octave-${PV}" > 99octave
 	doenvd 99octave || die