--- ledger-2.5-r1.ebuild	14 Feb 2007 12:46:12 -0000	1.3
+++ ledger-2.5-r1.ebuild	22 Sep 2007 22:49:30 -0000
@@ -21,7 +21,7 @@
 	emacs? ( virtual/emacs )
 	gnuplot? ( sci-visualization/gnuplot )"
 
-SITEFILE=50ledger-mode-gentoo.el
+SITEFILE=50${PN}-gentoo.el
 
 src_compile() {
 
@@ -29,7 +29,7 @@
 		$(use_enable xml) \
 		$(use_enable ofx) \
 		$(use_enable debug) \
-		$(use_with	 emacs lispdir ${D}/usr/share/emacs/site-lisp/${PN}) \
+		$(use_with	 emacs lispdir "${D}${SITELISP}/${PN}") \
 		|| die "Configure failed!"
 
 	emake || die "Make failed!"
@@ -44,10 +44,16 @@
 	insinto /usr/share/${P}
 	doins scripts/entry scripts/getquote scripts/bal scripts/bal-huquq
 
-	use emacs && elisp-site-file-install ${FILESDIR}/${SITEFILE}
-
 	einstall || die "Installation failed!"
 
+	# Remove timeclock since it is part of Emacs
+	rm -f "${D}${SITELISP}/${PN}"/timeclock.*
+
+	if use emacs; then
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}" \
+			|| die "elisp-site-file-install failed"
+	fi
+
 	if use gnuplot; then
 		mv scripts/report ledger-report
 		dobin ledger-report