diff options
author | Ulrich Müller <ulm@gentoo.org> | 2012-08-21 19:20:42 +0000 |
---|---|---|
committer | Ulrich Müller <ulm@gentoo.org> | 2012-08-21 19:20:42 +0000 |
commit | d262310458526d49e57161939307e32e1ed4d130 (patch) | |
tree | 5893a8c81652559cba0944d4cc4b1ea323953993 /app-editors | |
parent | make build output verbose, fix build wrt #432178, fix desktop file wrt #432222 (diff) | |
download | gentoo-2-d262310458526d49e57161939307e32e1ed4d130.tar.gz gentoo-2-d262310458526d49e57161939307e32e1ed4d130.tar.bz2 gentoo-2-d262310458526d49e57161939307e32e1ed4d130.zip |
Upstream changed hard link for emacs binary to symbolic link. Remove the symlink and rename the binary. Bug 432194.
(Portage version: 2.1.11.10/cvs/Linux x86_64)
Diffstat (limited to 'app-editors')
-rw-r--r-- | app-editors/emacs-vcs/ChangeLog | 6 | ||||
-rw-r--r-- | app-editors/emacs-vcs/emacs-vcs-24.2.9999.ebuild | 10 |
2 files changed, 10 insertions, 6 deletions
diff --git a/app-editors/emacs-vcs/ChangeLog b/app-editors/emacs-vcs/ChangeLog index 87c44314fbf2..418f49f4b768 100644 --- a/app-editors/emacs-vcs/ChangeLog +++ b/app-editors/emacs-vcs/ChangeLog @@ -1,6 +1,10 @@ # 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.109 2012/08/15 18:55:19 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.110 2012/08/21 19:20:42 ulm Exp $ + + 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 + symlink and rename the binary. Bug 432194. *emacs-vcs-24.2.9999 (15 Aug 2012) 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 c5923b936f5b..bafa94d80201 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.1 2012/08/15 18:55:19 ulm Exp $ +# $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 $ EAPI=4 @@ -240,10 +240,10 @@ src_compile() { src_install () { emake install DESTDIR="${D}" - rm "${ED}"/usr/bin/emacs-${FULL_VERSION}-${EMACS_SUFFIX} \ - || die "removing duplicate emacs executable failed" - mv "${ED}"/usr/bin/emacs-${EMACS_SUFFIX} "${ED}"/usr/bin/${EMACS_SUFFIX} \ - || die "moving Emacs executable failed" + 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" # move man pages to the correct place local m |