Index: octave-2.1.73-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-2.1.73-r2.ebuild,v
retrieving revision 1.2
diff -u -B -r1.2 octave-2.1.73-r2.ebuild
--- octave-2.1.73-r2.ebuild	13 Jul 2007 05:28:09 -0000	1.2
+++ octave-2.1.73-r2.ebuild	22 Sep 2007 18:39:32 -0000
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-2.1.73-r2.ebuild,v 1.2 2007/07/13 05:28:09 mr_bones_ Exp $
 
-inherit flag-o-matic fortran autotools
+inherit flag-o-matic fortran autotools xemacs-elisp-common
 
 DESCRIPTION="GNU Octave is a high-level language (MatLab compatible) intended for numerical computations"
 LICENSE="GPL-2"
@@ -11,7 +11,7 @@
 		ftp://ftp.math.uni-hamburg.de/pub/soft/math/octave/${P}.tar.bz2"
 
 SLOT="0"
-IUSE="emacs static readline zlib doc hdf5 mpi"
+IUSE="emacs static readline zlib doc hdf5 mpi xemacs"
 KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 DEPEND="virtual/libc
@@ -26,7 +26,10 @@
 	hdf5? ( sci-libs/hdf5 )
 	doc? ( virtual/tetex )
 	mpi? ( virtual/mpi )
+	xemacs? ( virtual/xemacs )
 	!=app-text/texi2html-1.70"
+RDEPEND="${DEPEND}
+	emacs? ( virtual/emacs )"
 
 # NOTE: octave supports blas/lapack from intel but this is not open
 # source nor is it free (as in beer OR speech) Check out...
@@ -83,6 +86,11 @@
 		|| die "econf failed"
 
 	emake || die "emake failed"
+
+	if use xemacs; then
+		cd "${S}/emacs"
+		xemacs-elisp-comp *.el
+	fi
 }
 
 src_install() {
@@ -90,15 +98,14 @@
 	if use doc; then
 		octave-install-doc || die "Octave doc install failed"
 	fi
-	if use emacs; then
+	if use emacs || use xemacs; 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
+		if use xemacs; then
+			xemacs-elisp-install ${PN} *.el *.elc
+		fi
 		cd ..
 	fi
 	dodir /etc/env.d || die