summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2011-12-15 07:22:59 +0000
committerUlrich Müller <ulm@gentoo.org>2011-12-15 07:22:59 +0000
commit55cc8a3886de9a75342bdc59c0bfe71c9cb2763c (patch)
tree37e304ed60b26c0235bfa0d661cc68a01fac5621 /app-emacs/emacs-common-gentoo
parentDrop ruby19 to create a stable candidate. (diff)
downloadgentoo-2-55cc8a3886de9a75342bdc59c0bfe71c9cb2763c.tar.gz
gentoo-2-55cc8a3886de9a75342bdc59c0bfe71c9cb2763c.tar.bz2
gentoo-2-55cc8a3886de9a75342bdc59c0bfe71c9cb2763c.zip
Don't (ab)use elisp-install for installing subdirs.el in the parent dir.
(Portage version: 2.1.10.40/cvs/Linux x86_64)
Diffstat (limited to 'app-emacs/emacs-common-gentoo')
-rw-r--r--app-emacs/emacs-common-gentoo/ChangeLog5
-rw-r--r--app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.3.ebuild8
2 files changed, 8 insertions, 5 deletions
diff --git a/app-emacs/emacs-common-gentoo/ChangeLog b/app-emacs/emacs-common-gentoo/ChangeLog
index 40e1f0569e03..9033a2880d52 100644
--- a/app-emacs/emacs-common-gentoo/ChangeLog
+++ b/app-emacs/emacs-common-gentoo/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for app-emacs/emacs-common-gentoo
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-common-gentoo/ChangeLog,v 1.46 2011/12/13 22:20:27 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-common-gentoo/ChangeLog,v 1.47 2011/12/15 07:22:59 ulm Exp $
+
+ 15 Dec 2011; Ulrich Mueller <ulm@gentoo.org> emacs-common-gentoo-1.3.ebuild:
+ Don't (ab)use elisp-install for installing subdirs.el in the parent dir.
*emacs-common-gentoo-1.3 (13 Dec 2011)
diff --git a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.3.ebuild b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.3.ebuild
index 1134d4a171f3..ace5e57e9862 100644
--- a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.3.ebuild
+++ b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.3.ebuild,v 1.1 2011/12/13 22:20:27 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.3.ebuild,v 1.2 2011/12/15 07:22:59 ulm Exp $
EAPI=4
@@ -18,7 +18,7 @@ IUSE="X emacs22icons"
PDEPEND="virtual/emacs"
pkg_setup() {
- if [ -e "${EROOT}${SITELISP}/subdirs.el" ] \
+ if [[ -e ${EROOT}${SITELISP}/subdirs.el ]] \
&& ! has_version ">=${CATEGORY}/${PN}-1"
then
ewarn "Removing orphan subdirs.el (installed by old Emacs ebuilds)"
@@ -27,8 +27,8 @@ pkg_setup() {
}
src_install() {
- keepdir "${SITELISP}"
- elisp-install . subdirs.el || die
+ insinto "${SITELISP}"
+ doins subdirs.el
keepdir /etc/emacs
insinto /etc/emacs