summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2012-08-23 20:13:25 +0000
committerUlrich Müller <ulm@gentoo.org>2012-08-23 20:13:25 +0000
commit32367d606adcc5fa3425c76c549038cad9e8d941 (patch)
tree2f5abbb0fb0597a79f60ec77d54611aaf9b3f566
parentversion bump wrt #396449 (diff)
downloadgentoo-2-32367d606adcc5fa3425c76c549038cad9e8d941.tar.gz
gentoo-2-32367d606adcc5fa3425c76c549038cad9e8d941.tar.bz2
gentoo-2-32367d606adcc5fa3425c76c549038cad9e8d941.zip
Set option to prevent installation of emacs symlink.
(Portage version: 2.1.11.10/cvs/Linux x86_64)
-rw-r--r--app-editors/emacs-vcs/ChangeLog5
-rw-r--r--app-editors/emacs-vcs/emacs-vcs-24.2.9999.ebuild6
2 files changed, 6 insertions, 5 deletions
diff --git a/app-editors/emacs-vcs/ChangeLog b/app-editors/emacs-vcs/ChangeLog
index 418f49f4b768..283c67c706c2 100644
--- a/app-editors/emacs-vcs/ChangeLog
+++ b/app-editors/emacs-vcs/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for app-editors/emacs-vcs
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.110 2012/08/21 19:20:42 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.111 2012/08/23 20:13:25 ulm Exp $
+
+ 23 Aug 2012; Ulrich Müller <ulm@gentoo.org> emacs-vcs-24.2.9999.ebuild:
+ Set option to prevent installation of emacs symlink.
21 Aug 2012; Ulrich Müller <ulm@gentoo.org> emacs-vcs-24.2.9999.ebuild:
Upstream changed hard link for emacs binary to symbolic link. Remove the
diff --git a/app-editors/emacs-vcs/emacs-vcs-24.2.9999.ebuild b/app-editors/emacs-vcs/emacs-vcs-24.2.9999.ebuild
index bafa94d80201..26dcb832aa09 100644
--- a/app-editors/emacs-vcs/emacs-vcs-24.2.9999.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-24.2.9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.2.9999.ebuild,v 1.2 2012/08/21 19:20:42 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.2.9999.ebuild,v 1.3 2012/08/23 20:13:25 ulm Exp $
EAPI=4
@@ -238,10 +238,8 @@ src_compile() {
}
src_install () {
- emake install DESTDIR="${D}"
+ emake install DESTDIR="${D}" NO_BIN_LINK=t
- rm "${ED}"/usr/bin/emacs-${EMACS_SUFFIX} \
- || die "Removing link to emacs executable failed"
mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} \
|| die "Moving emacs executable failed"