summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Ross <aross@gentoo.org>2007-07-22 03:58:35 +0000
committerAndrew Ross <aross@gentoo.org>2007-07-22 03:58:35 +0000
commitd8afd692d5d57b6dad284d0c3f4efb8ad3ca4eee (patch)
treef78f5851dcd0f7c47961a2acabba96a0bba7f0ad /dev-util/mercurial
parentDrop virtual/x11 references. (diff)
downloadgentoo-2-d8afd692d5d57b6dad284d0c3f4efb8ad3ca4eee.tar.gz
gentoo-2-d8afd692d5d57b6dad284d0c3f4efb8ad3ca4eee.tar.bz2
gentoo-2-d8afd692d5d57b6dad284d0c3f4efb8ad3ca4eee.zip
Use canonical emacs support code, thanks to opfer in bug #184249
(Portage version: 2.1.2.9)
Diffstat (limited to 'dev-util/mercurial')
-rw-r--r--dev-util/mercurial/ChangeLog6
-rw-r--r--dev-util/mercurial/mercurial-0.9.4.ebuild10
2 files changed, 10 insertions, 6 deletions
diff --git a/dev-util/mercurial/ChangeLog b/dev-util/mercurial/ChangeLog
index 227985a87b8c..79df60e13da3 100644
--- a/dev-util/mercurial/ChangeLog
+++ b/dev-util/mercurial/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-util/mercurial
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/mercurial/ChangeLog,v 1.54 2007/07/05 06:12:29 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/mercurial/ChangeLog,v 1.55 2007/07/22 03:58:35 aross Exp $
+
+ 22 Jul 2007; Andrew Ross <aross@gentoo.org> mercurial-0.9.4.ebuild:
+ Use canonical emacs support code, thanks to Christian Faulhammer
+ <opfer@gentoo.org> in bug #184249
05 Jul 2007; Michael Sterrett <mr_bones_@gentoo.org>
+mercurial-0.9.1-r2.ebuild:
diff --git a/dev-util/mercurial/mercurial-0.9.4.ebuild b/dev-util/mercurial/mercurial-0.9.4.ebuild
index 12f127a9bee5..d72d5bb07de0 100644
--- a/dev-util/mercurial/mercurial-0.9.4.ebuild
+++ b/dev-util/mercurial/mercurial-0.9.4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/mercurial/mercurial-0.9.4.ebuild,v 1.1 2007/07/04 08:34:39 aross Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/mercurial/mercurial-0.9.4.ebuild,v 1.2 2007/07/22 03:58:35 aross Exp $
inherit bash-completion distutils elisp-common flag-o-matic
@@ -20,6 +20,7 @@ DEPEND="${RDEPEND}
test? ( app-arch/unzip )"
PYTHON_MODNAME="${PN} hgext"
+SITEFILE="70${PN}-gentoo.el"
src_compile() {
filter-flags -ftracer -ftree-vectorize
@@ -28,7 +29,7 @@ src_compile() {
if use emacs; then
cd "${S}"/contrib
- elisp-compile mercurial.el || die "Emacs modules failed!"
+ elisp-compile mercurial.el || die "elisp-compile failed!"
fi
rm -rf contrib/vim # app-vim/hgcommand app-vim/hgmenu
@@ -52,9 +53,8 @@ src_install() {
doman doc/*.?
if use emacs; then
- insinto ${SITELISP}/${PN}
- doins contrib/mercurial.el*
- elisp-site-file-install "${FILESDIR}"/70mercurial-gentoo.el
+ elisp-install ${PN} contrib/mercurial.el* || die "elisp-install failed!"
+ elisp-site-file-install "${FILESDIR}"/${SITEFILE}
fi
}