--- cmt-1.20.20080222.ebuild	4 Apr 2008 11:09:26 -0000	1.1
+++ cmt-1.20.20080222.ebuild	12 Oct 2008 17:18:02 -0000
@@ -16,8 +16,8 @@ 
 KEYWORDS="~amd64 ~x86"
 IUSE="emacs java doc"
 
-DEPEND=""
-RDEPEND="emacs? ( virtual/emacs )
+DEPEND="emacs? ( virtual/emacs )"
+RDEPEND="${DEPEND}
 	java? ( virtual/jdk )"
 
 S="${WORKDIR}/CMT/${CMT_PV}"
@@ -35,6 +35,10 @@ 
 	cd "${S}"
 	mv src/demo .
 	rm -f ${CMTBIN}/*.o
+
+	if use emacs; then
+		elisp-compile doc/cmt-mode.el || die
+	fi
 }
 
 src_install() {
@@ -72,9 +76,10 @@ 
 		doins -r demo || die "doins demo failed"
 	fi
 
-	use emacs && \
-		elisp-site-file-install \
-		doc/cmt-mode.el "${FILESDIR}"/80cmt-mode-gentoo.el
+	if use emacs; then
+		elisp-install ${PN} doc/cmt-mode.{el,elc} || die
+		elisp-site-file-install "${FILESDIR}"/80cmt-mode-gentoo.el || die
+	fi
 }
 
 pkg_postinst () {
--- files/80cmt-mode-gentoo.el	15 Sep 2007 13:14:48 -0000	1.1
+++ files/80cmt-mode-gentoo.el	12 Oct 2008 17:18:02 -0000
@@ -1,6 +1,6 @@ 
-;; Automatically load the CMT mode.
 
-(autoload 'cmt-mode "cmt-mode" "CMT requirements file editing mode." t)
-(setq auto-mode-alist 
-      (append (list (cons "requirements$" 'cmt-mode)) auto-mode-alist))
+;;; cmt site-lisp configuration
 
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'cmt-mode "cmt-mode" "CMT requirements file editing mode." t)
+(add-to-list 'auto-mode-alist '("requirements\\'" . cmt-mode))