--- cflow-1.2.ebuild~	2007-07-15 22:24:48.000000000 +0200
+++ cflow-1.2.ebuild	2007-12-14 23:39:37.000000000 +0100
@@ -17,14 +17,19 @@
 	emacs? ( virtual/emacs )"
 RDEPEND="${DEPEND}"
 
-SITEFILE=cflow-mode.el
+SITEFILE=50${PN}-gentoo.el
 
 src_compile() {
 	econf \
 		$(use_enable nls) \
 		$(use_enable debug) \
+		EMACS=no \
 		|| die "econf failed"
 	emake || die "emake failed"
+
+	if use emacs; then
+		elisp-compile elisp/cflow-mode.el || die "elisp-compile failed"
+	fi
 }
 
 src_install() {
@@ -32,9 +37,18 @@
 	doinfo doc/cflow.info
 	emake DESTDIR="${D}" install || die "emake install failed"
 
-	use emacs && elisp-site-file-install "${S}/elisp/${SITEFILE}"
+	if use emacs; then
+		elisp-install ${PN} elisp/cflow-mode.{el,elc} \
+			|| die "elisp-install failed"
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}" \
+			|| die "elisp-site-file-install failed"
+	fi
 }
 
 pkg_postinst() {
 	use emacs && elisp-site-regen
 }
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}