--- mozart-1.3.2.ebuild	17 Feb 2007 20:48:41 -0000	1.5
+++ mozart-1.3.2.ebuild	3 Oct 2007 12:51:57 -0000
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-lang/mozart/mozart-1.3.2.ebuild,v 1.5 2007/02/17 20:48:41 keri Exp $
 
-inherit eutils
+inherit elisp-common eutils
 
 MY_P="mozart-${PV}.20060615"
 
@@ -21,12 +21,15 @@
 	sys-devel/bison
 	sys-devel/flex
 	sys-libs/zlib
+	emacs? ( virtual/emacs )
 	gdbm? ( sys-libs/gdbm  )
 	tcl? ( tk? (
 			dev-lang/tk
 			dev-lang/tcl ) )"
 RDEPEND="${DEPEND}"
 
+SITEFILE=50${PN}-gentoo.el
+
 S="${WORKDIR}"/${MY_P}
 
 src_unpack() {
@@ -46,12 +49,6 @@
 			--without-global-oz \
 			--enable-opt=none"
 
-	if use emacs ; then
-		myconf="${myconf} --enable-compile-elisp"
-	else
-		myconf="${myconf} --disable-compile-elisp"
-	fi
-
 	if use tcl && use tk ; then
 		myconf="${myconf} --enable-wish"
 	else
@@ -76,6 +73,7 @@
 		--disable-doc \
 		$(use_enable doc contrib-doc) \
 		$(use_enable gdbm contrib-gdbm) \
+		$(use_enable emacs compile-elisp) \
 		$(use_enable static link-static) \
 		$(use_enable threads threaded) \
 		|| die "econf failed"
@@ -87,8 +85,12 @@
 	emake -j1 \
 		PREFIX="${D}"/usr/lib/mozart \
 		BINDIR="${D}"/usr/bin \
+		ELISPDIR="${D}${SITELISP}/${PN}" \
 		install || die "emake install failed"
 
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}" \
+		|| die "elisp-site-file-install failed"
+
 	if use doc ; then
 		dohtml -r "${WORKDIR}"/mozart/doc/*
 	fi