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: ChangeLog emacs-21.4-r21.ebuild
Date: Sun, 10 Oct 2010 16:03:58
Message-Id: 20101010151024.C95C12004C@flycatcher.gentoo.org
1 ulm 10/10/10 15:10:24
2
3 Modified: ChangeLog emacs-21.4-r21.ebuild
4 Log:
5 Fix path for installation of Info dir.
6
7 (Portage version: 2.1.9.14/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.386 app-editors/emacs/ChangeLog
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/ChangeLog?rev=1.386&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/ChangeLog?rev=1.386&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/ChangeLog?r1=1.385&r2=1.386
15
16 Index: ChangeLog
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v
19 retrieving revision 1.385
20 retrieving revision 1.386
21 diff -u -r1.385 -r1.386
22 --- ChangeLog 25 Sep 2010 13:55:47 -0000 1.385
23 +++ ChangeLog 10 Oct 2010 15:10:24 -0000 1.386
24 @@ -1,6 +1,9 @@
25 # ChangeLog for app-editors/emacs
26 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
27 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.385 2010/09/25 13:55:47 ulm Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.386 2010/10/10 15:10:24 ulm Exp $
29 +
30 + 10 Oct 2010; Ulrich Mueller <ulm@g.o> emacs-21.4-r21.ebuild:
31 + Fix path for installation of Info dir.
32
33 *emacs-23.2-r1 (25 Sep 2010)
34 *emacs-22.3-r5 (25 Sep 2010)
35
36
37
38 1.2 app-editors/emacs/emacs-21.4-r21.ebuild
39
40 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/emacs-21.4-r21.ebuild?rev=1.2&view=markup
41 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/emacs-21.4-r21.ebuild?rev=1.2&content-type=text/plain
42 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/emacs-21.4-r21.ebuild?r1=1.1&r2=1.2
43
44 Index: emacs-21.4-r21.ebuild
45 ===================================================================
46 RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r21.ebuild,v
47 retrieving revision 1.1
48 retrieving revision 1.2
49 diff -u -r1.1 -r1.2
50 --- emacs-21.4-r21.ebuild 25 Sep 2010 13:55:47 -0000 1.1
51 +++ emacs-21.4-r21.ebuild 10 Oct 2010 15:10:24 -0000 1.2
52 @@ -1,6 +1,6 @@
53 # Copyright 1999-2010 Gentoo Foundation
54 # Distributed under the terms of the GNU General Public License v2
55 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r21.ebuild,v 1.1 2010/09/25 13:55:47 ulm Exp $
56 +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r21.ebuild,v 1.2 2010/10/10 15:10:24 ulm Exp $
57
58 EAPI=2
59
60 @@ -111,7 +111,9 @@
61 src_install() {
62 local i m
63
64 - einstall || die "einstall failed"
65 + einstall infodir="${D}/usr/share/info/emacs-${SLOT}" \
66 + || die "einstall failed"
67 +
68 for i in "${D}"/usr/bin/* ; do
69 mv "${i}" "${i}-emacs-${SLOT}" || die "mv ${i} failed"
70 done
71 @@ -119,14 +121,9 @@
72 rm "${D}"/usr/bin/emacs-${PV}-emacs-${SLOT}
73
74 # move info documentation to the correct place
75 - mkdir "${T}/emacs-${SLOT}"
76 - mv "${D}/usr/share/info/dir" "${T}"
77 - for i in "${D}"/usr/share/info/*
78 - do
79 - mv "${i}" "${T}/emacs-${SLOT}/${i##*/}.info"
80 + for i in "${D}"/usr/share/info/emacs-${SLOT}/*; do
81 + mv "${i}" "${i}.info" || die "mv ${i} failed"
82 done
83 - mv "${T}/emacs-${SLOT}" "${D}/usr/share/info"
84 - mv "${T}/dir" "${D}/usr/share/info/emacs-${SLOT}"
85
86 # move man pages to the correct place
87 for m in "${D}"/usr/share/man/man1/* ; do