Gentoo Archives: gentoo-commits

From: "Ulrich Mueller (ulm)" <ulm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-editors/emacs-vcs: ChangeLog emacs-vcs-24.2.9999.ebuild
Date: Tue, 21 Aug 2012 19:20:58
Message-Id: 20120821192042.8D2DA2026D@flycatcher.gentoo.org
1 ulm 12/08/21 19:20:42
2
3 Modified: ChangeLog emacs-vcs-24.2.9999.ebuild
4 Log:
5 Upstream changed hard link for emacs binary to symbolic link. Remove the symlink and rename the binary. Bug 432194.
6
7 (Portage version: 2.1.11.10/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.110 app-editors/emacs-vcs/ChangeLog
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/ChangeLog?rev=1.110&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/ChangeLog?rev=1.110&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/ChangeLog?r1=1.109&r2=1.110
15
16 Index: ChangeLog
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v
19 retrieving revision 1.109
20 retrieving revision 1.110
21 diff -u -r1.109 -r1.110
22 --- ChangeLog 15 Aug 2012 18:55:19 -0000 1.109
23 +++ ChangeLog 21 Aug 2012 19:20:42 -0000 1.110
24 @@ -1,6 +1,10 @@
25 # ChangeLog for app-editors/emacs-vcs
26 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
27 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.109 2012/08/15 18:55:19 ulm Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.110 2012/08/21 19:20:42 ulm Exp $
29 +
30 + 21 Aug 2012; Ulrich Müller <ulm@g.o> emacs-vcs-24.2.9999.ebuild:
31 + Upstream changed hard link for emacs binary to symbolic link. Remove the
32 + symlink and rename the binary. Bug 432194.
33
34 *emacs-vcs-24.2.9999 (15 Aug 2012)
35
36
37
38
39 1.2 app-editors/emacs-vcs/emacs-vcs-24.2.9999.ebuild
40
41 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.2.9999.ebuild?rev=1.2&view=markup
42 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.2.9999.ebuild?rev=1.2&content-type=text/plain
43 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.2.9999.ebuild?r1=1.1&r2=1.2
44
45 Index: emacs-vcs-24.2.9999.ebuild
46 ===================================================================
47 RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.2.9999.ebuild,v
48 retrieving revision 1.1
49 retrieving revision 1.2
50 diff -u -r1.1 -r1.2
51 --- emacs-vcs-24.2.9999.ebuild 15 Aug 2012 18:55:19 -0000 1.1
52 +++ emacs-vcs-24.2.9999.ebuild 21 Aug 2012 19:20:42 -0000 1.2
53 @@ -1,6 +1,6 @@
54 # Copyright 1999-2012 Gentoo Foundation
55 # Distributed under the terms of the GNU General Public License v2
56 -# $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 $
57 +# $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 $
58
59 EAPI=4
60
61 @@ -240,10 +240,10 @@
62 src_install () {
63 emake install DESTDIR="${D}"
64
65 - rm "${ED}"/usr/bin/emacs-${FULL_VERSION}-${EMACS_SUFFIX} \
66 - || die "removing duplicate emacs executable failed"
67 - mv "${ED}"/usr/bin/emacs-${EMACS_SUFFIX} "${ED}"/usr/bin/${EMACS_SUFFIX} \
68 - || die "moving Emacs executable failed"
69 + rm "${ED}"/usr/bin/emacs-${EMACS_SUFFIX} \
70 + || die "Removing link to emacs executable failed"
71 + mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} \
72 + || die "Moving emacs executable failed"
73
74 # move man pages to the correct place
75 local m