--- timidity++-2.13.2-r4.ebuild.orig	2007-03-25 23:47:48.000000000 +0200
+++ timidity++-2.13.2-r4.ebuild	2007-07-07 11:03:36.000000000 +0200
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/timidity++-2.13.2-r4.ebuild,v 1.1 2007/03/25 21:47:48 aballier Exp $
 
-inherit eutils
+inherit eutils elisp-common
 
 MY_PV=${PV/_/-}
 MY_P=TiMidity++-${MY_PV}
@@ -15,9 +15,10 @@
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="oss nas esd motif X gtk gtk vorbis tk slang alsa arts jack portaudio emacs ao speex flac ncurses"
+IUSE="oss nas esd motif X gtk vorbis tk slang alsa arts jack portaudio emacs ao speex flac ncurses"
 
 DEPEND="ncurses? ( >=sys-libs/ncurses-5.0 )
+	emacs? ( virtual/emacs )
 	gtk? ( >=x11-libs/gtk+-2.0 )
 	tk? ( >=dev-lang/tk-8.1 )
 	motif? ( virtual/motif )
@@ -33,12 +34,13 @@
 	speex? ( >=media-libs/speex-1.1.5 )
 	ao? ( >=media-libs/libao-0.8.5 )"
 
-RDEPEND="${RDEPEND}
-	app-admin/eselect-timidity
-	emacs? ( virtual/emacs )"
+RDEPEND="${DEPEND}
+	app-admin/eselect-timidity"
 
 PDEPEND="|| ( media-sound/timidity-eawpatches media-sound/timidity-shompatches media-sound/timidity-freepats )"
 
+SITEFILE=50${PN}-gentoo.el
+
 pkg_setup() {
 	if use alsa && ! built_with_use --missing true media-libs/alsa-lib midi; then
 		eerror ""
@@ -95,6 +97,7 @@
 
 	econf \
 		--localstatedir=/var/state/timidity++ \
+		--with-lispdir="${SITELISP}/${PN}" \
 		--with-elf \
 		--enable-audio=${audios} \
 		--enable-server \
@@ -137,13 +140,13 @@
 	dosym /etc/timidity.cfg /usr/share/timidity/timidity.cfg
 
 	if use emacs ; then
-		dosed 's:/usr/local/bin/timidity:/usr/bin/timidity:g' /usr/share/emacs/site-lisp/timidity.el
-	else
-		rm "${D}/timidity.el"
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
 	fi
 }
 
 pkg_postinst() {
+	use emacs && elisp-site-regen
+
 	elog "A timidity config file has been installed in /etc/timidity.cfg."
 	elog "Do not edit this file as it will interfere with the eselect timidity tool."
 	elog "The tool 'eselect timidity' can be used to switch between installed patchsets."
@@ -159,3 +162,7 @@
 		ewarn "-Ow (save to wave file) does..."
 	fi
 }
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}