--- supercollider-20040903-r1.ebuild	2007-08-02 08:01:54.000000000 +0200
+++ supercollider-20040903-r2.ebuild	2007-08-02 09:07:39.000000000 +0200
@@ -1,8 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/supercollider/supercollider-20040903-r1.ebuild,v 1.3 2007/08/02 06:01:54 opfer Exp $
+# $Header: $
 
-inherit eutils flag-o-matic
+inherit elisp-common eutils flag-o-matic
 
 DESCRIPTION="A real time audio synthesis programming language"
 HOMEPAGE="http://www.audiosynth.com"
@@ -10,16 +10,18 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~ppc x86"
+KEYWORDS="~ppc ~x86"
 IUSE="emacs"
 
 RDEPEND="media-sound/jack-audio-connection-kit
 	 media-libs/alsa-lib
 	 media-libs/libsndfile"
 DEPEND="${RDEPEND}
-	sys-apps/sed"
+	sys-apps/sed
+	emacs? ( virtual/emacs )"
 
 S="${WORKDIR}"/SuperCollider3
+SITEFILE=50${PN}-gentoo.el
 
 src_unpack() {
 	unpack ${A}
@@ -46,7 +48,7 @@
 src_compile() {
 	local myconf
 	if use emacs; then
-		myconf="${myconf} --enable-scel"
+		myconf="${myconf} --enable-scel --with-lispdir="${SITELISP}/${PN}""
 	else
 		myconf="${myconf} --disable-scel"
 	fi
@@ -80,7 +82,7 @@
 
 	# Our documentation
 	sed -e "s:@DOCBASE@:/usr/share/doc/${PF}:" \
-		< ${FILESDIR}/README-gentoo.txt | gzip \
+		< "${FILESDIR}"/README-gentoo.txt | gzip \
 		> "${D}"/usr/share/doc/${PF}/README-gentoo.txt.gz
 
 	# RTFs (don't gzip)
@@ -97,7 +99,8 @@
 	# Emacs installation
 	if use emacs; then
 		cd "${S}"/linux/scel
-		einstall || die "einstall on scel failed"
+		einstall lispdir="${D}/${SITELISP}/${PN}" || die "einstall on scel failed"
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
 	fi
 
 }
@@ -109,4 +112,8 @@
 	elog "successful and get you started with using SuperCollider is to take"
 	elog "a look through /usr/share/doc/${PF}/README-gentoo.txt.gz"
 	elog
+	use emacs && elisp-site-regen
+}
+pkg_postrm() {
+	use emacs && elisp-site-regen
 }