--- cdargs-1.35.ebuild	28 Jan 2007 05:02:48 -0000	1.4
+++ cdargs-1.35.ebuild	22 Sep 2007 15:07:51 -0000
@@ -2,6 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/app-misc/cdargs/cdargs-1.35.ebuild,v 1.4 2007/01/28 05:02:48 genone Exp $
 
+inherit elisp-common
+
 DESCRIPTION="Bookmarks and browser for the shell builtin cd command"
 HOMEPAGE="http://www.skamphausen.de/software/cdargs"
 SRC_URI="http://www.skamphausen.de/software/${PN}/${P}.tar.gz"
@@ -11,7 +13,19 @@
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE="emacs"
 
-DEPEND="sys-libs/ncurses"
+DEPEND="sys-libs/ncurses
+	emacs? ( virtual/emacs )"
+
+SITEFILE=50${PN}-gentoo.el
+
+src_compile() {
+	econf || die "econf failed"
+	emake || die "emake failed"
+
+	if use emacs; then
+		elisp-compile contrib/cdargs.el || die "elisp-compile failed"
+	fi
+}
 
 src_install() {
 	make DESTDIR="${D}" install || die "make install failed"
@@ -22,11 +36,15 @@
 	doins cdargs-bash.sh cdargs-tcsh.csh \
 		|| die "failed to install contrib scripts"
 	if use emacs ; then
-		doins cdargs.el || die "failed to install cdargs.el"
+		elisp-install ${PN} cdargs.{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
+
 	echo
 	elog "Add the following line to your ~/.bashrc to enable cdargs helper"
 	elog "functions/aliases in your environment:"
@@ -36,15 +54,9 @@
 	elog "Users of tcshell will find cdargs-tcsh.csh there with a reduced"
 	elog "feature set.  See INSTALL file in the documentation directory for"
 	elog "more information."
-
-	if use emacs ; then
-		elog
-		elog "To get an interactive cv defun in (X)Emacs load cdargs.el:"
-		elog " (setq load-path"
-		elog "       (append (list "
-		elog "        \"/usr/share/cdargs/\")"
-		elog "        load-path))"
-		elog " (require 'cdargs)"
-	fi
 	echo
 }
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}