diff options
| -rw-r--r-- | dev-util/cmt/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-util/cmt/cmt-1.20.20080222.ebuild | 17 | ||||
| -rw-r--r-- | dev-util/cmt/files/80cmt-mode-gentoo.el | 8 |
3 files changed, 21 insertions, 11 deletions
diff --git a/dev-util/cmt/ChangeLog b/dev-util/cmt/ChangeLog index 6363dfb2f19b..f3b8257a4d62 100644 --- a/dev-util/cmt/ChangeLog +++ b/dev-util/cmt/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-util/cmt # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/cmt/ChangeLog,v 1.4 2008/09/09 00:06:01 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/cmt/ChangeLog,v 1.5 2008/10/13 22:09:40 bicatali Exp $ + + 13 Oct 2008; Sébastien Fabbro <bicatali@gentoo.org> + files/80cmt-mode-gentoo.el, cmt-1.20.20080222.ebuild: + Fixed emacs site file and emacs file installation, thanks to ulm, closing + bug #241588. 09 Sep 2008; Sébastien Fabbro <bicatali@gentoo.org> -cmt-1.20.20070720.ebuild: diff --git a/dev-util/cmt/cmt-1.20.20080222.ebuild b/dev-util/cmt/cmt-1.20.20080222.ebuild index ce331567694d..e7fd3decf81e 100644 --- a/dev-util/cmt/cmt-1.20.20080222.ebuild +++ b/dev-util/cmt/cmt-1.20.20080222.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/cmt/cmt-1.20.20080222.ebuild,v 1.1 2008/04/04 11:09:26 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/cmt/cmt-1.20.20080222.ebuild,v 1.2 2008/10/13 22:09:40 bicatali Exp $ inherit elisp-common toolchain-funcs versionator @@ -16,8 +16,8 @@ SLOT="0" 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 @@ src_compile() { 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 @@ src_install() { 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 () { diff --git a/dev-util/cmt/files/80cmt-mode-gentoo.el b/dev-util/cmt/files/80cmt-mode-gentoo.el index 20131f4a8d46..91be98ebc614 100644 --- a/dev-util/cmt/files/80cmt-mode-gentoo.el +++ b/dev-util/cmt/files/80cmt-mode-gentoo.el @@ -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)) |