Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

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: emacs-vcs-23.2.9999.ebuild ChangeLog emacs-vcs-24.0.9999.ebuild
Date: Sun, 10 Oct 2010 11:05:29
Message-Id: 20101010103930.A5DF72004C@flycatcher.gentoo.org
1 ulm 10/10/10 10:39:30
2
3 Modified: emacs-vcs-23.2.9999.ebuild ChangeLog
4 emacs-vcs-24.0.9999.ebuild
5 Log:
6 Don't rename GNU Info files, bug 306445.
7
8 (Portage version: 2.1.9.14/cvs/Linux x86_64)
9
10 Revision Changes Path
11 1.4 app-editors/emacs-vcs/emacs-vcs-23.2.9999.ebuild
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-23.2.9999.ebuild?rev=1.4&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-23.2.9999.ebuild?rev=1.4&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-23.2.9999.ebuild?r1=1.3&r2=1.4
16
17 Index: emacs-vcs-23.2.9999.ebuild
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-23.2.9999.ebuild,v
20 retrieving revision 1.3
21 retrieving revision 1.4
22 diff -u -r1.3 -r1.4
23 --- emacs-vcs-23.2.9999.ebuild 25 Sep 2010 11:32:26 -0000 1.3
24 +++ emacs-vcs-23.2.9999.ebuild 10 Oct 2010 10:39:30 -0000 1.4
25 @@ -1,6 +1,6 @@
26 # Copyright 1999-2010 Gentoo Foundation
27 # Distributed under the terms of the GNU General Public License v2
28 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-23.2.9999.ebuild,v 1.3 2010/09/25 11:32:26 ulm Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-23.2.9999.ebuild,v 1.4 2010/10/10 10:39:30 ulm Exp $
30
31 EAPI=2
32
33 @@ -212,16 +212,15 @@
34 mv "${D}"/usr/bin/emacs-${EMACS_SUFFIX} "${D}"/usr/bin/${EMACS_SUFFIX} \
35 || die "moving Emacs executable failed"
36
37 - # move info documentation to the correct place
38 - for i in "${D}"/usr/share/info/${EMACS_SUFFIX}/*; do
39 - mv "${i}" "${i}.info" || die "mv info failed"
40 - done
41 -
42 # move man pages to the correct place
43 for m in "${D}"/usr/share/man/man1/* ; do
44 mv "${m}" "${m%.1}-${EMACS_SUFFIX}.1" || die "mv man failed"
45 done
46
47 + # move info dir to avoid collisions with the dir file generated by portage
48 + mv "${D}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} \
49 + || die "moving info dir failed"
50 +
51 # avoid collision between slots, see bug #169033 e.g.
52 rm "${D}"/usr/share/emacs/site-lisp/subdirs.el
53 rm -rf "${D}"/usr/share/{applications,icons}
54 @@ -264,15 +263,17 @@
55 # Depending on Portage version and user's settings, the Info dir file
56 # may have been compressed or removed. We rebuild it in both cases.
57 local infodir=/usr/share/info/${EMACS_SUFFIX} f
58 - if [ -f "${D}"${infodir}/dir.info ]; then
59 + if [ -f "${D}"${infodir}/dir.orig ]; then
60 # prefer existing file if it has survived to here
61 - mv "${D}"${infodir}/dir{.info,} || die "mv dir.info failed"
62 + mv "${D}"${infodir}/dir{.orig,} || die "moving info dir failed"
63 else
64 einfo "Regenerating Info directory index in ${infodir} ..."
65 rm -f "${D}"${infodir}/dir{,.*}
66 - for f in "${D}"${infodir}/*.info*; do
67 - [[ ${f##*/} != *[0-9].info* && -e ${f} ]] \
68 - && install-info --info-dir="${D}"${infodir} "${f}" &>/dev/null
69 + for f in "${D}"${infodir}/*; do
70 + if [[ ${f##*/} != *-[0-9]* && -e ${f} ]]; then
71 + install-info --info-dir="${D}"${infodir} "${f}" \
72 + || die "install-info failed"
73 + fi
74 done
75 fi
76 }
77
78
79
80 1.27 app-editors/emacs-vcs/ChangeLog
81
82 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/ChangeLog?rev=1.27&view=markup
83 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/ChangeLog?rev=1.27&content-type=text/plain
84 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/ChangeLog?r1=1.26&r2=1.27
85
86 Index: ChangeLog
87 ===================================================================
88 RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v
89 retrieving revision 1.26
90 retrieving revision 1.27
91 diff -u -r1.26 -r1.27
92 --- ChangeLog 25 Sep 2010 11:32:26 -0000 1.26
93 +++ ChangeLog 10 Oct 2010 10:39:30 -0000 1.27
94 @@ -1,6 +1,10 @@
95 # ChangeLog for app-editors/emacs-vcs
96 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
97 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.26 2010/09/25 11:32:26 ulm Exp $
98 +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.27 2010/10/10 10:39:30 ulm Exp $
99 +
100 + 10 Oct 2010; Ulrich Mueller <ulm@g.o> emacs-vcs-23.2.9999.ebuild,
101 + emacs-vcs-24.0.9999.ebuild:
102 + Don't rename GNU Info files, bug 306445.
103
104 25 Sep 2010; Ulrich Mueller <ulm@g.o> emacs-vcs-23.2.9999.ebuild,
105 emacs-vcs-24.0.9999.ebuild:
106
107
108
109 1.13 app-editors/emacs-vcs/emacs-vcs-24.0.9999.ebuild
110
111 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999.ebuild?rev=1.13&view=markup
112 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999.ebuild?rev=1.13&content-type=text/plain
113 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999.ebuild?r1=1.12&r2=1.13
114
115 Index: emacs-vcs-24.0.9999.ebuild
116 ===================================================================
117 RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999.ebuild,v
118 retrieving revision 1.12
119 retrieving revision 1.13
120 diff -u -r1.12 -r1.13
121 --- emacs-vcs-24.0.9999.ebuild 25 Sep 2010 11:32:26 -0000 1.12
122 +++ emacs-vcs-24.0.9999.ebuild 10 Oct 2010 10:39:30 -0000 1.13
123 @@ -1,6 +1,6 @@
124 # Copyright 1999-2010 Gentoo Foundation
125 # Distributed under the terms of the GNU General Public License v2
126 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999.ebuild,v 1.12 2010/09/25 11:32:26 ulm Exp $
127 +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999.ebuild,v 1.13 2010/10/10 10:39:30 ulm Exp $
128
129 EAPI=2
130
131 @@ -225,16 +225,15 @@
132 mv "${D}"/usr/bin/emacs-${EMACS_SUFFIX} "${D}"/usr/bin/${EMACS_SUFFIX} \
133 || die "moving Emacs executable failed"
134
135 - # move info documentation to the correct place
136 - for i in "${D}"/usr/share/info/${EMACS_SUFFIX}/*; do
137 - mv "${i}" "${i}.info" || die "mv info failed"
138 - done
139 -
140 # move man pages to the correct place
141 for m in "${D}"/usr/share/man/man1/* ; do
142 mv "${m}" "${m%.1}-${EMACS_SUFFIX}.1" || die "mv man failed"
143 done
144
145 + # move info dir to avoid collisions with the dir file generated by portage
146 + mv "${D}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} \
147 + || die "moving info dir failed"
148 +
149 # avoid collision between slots, see bug #169033 e.g.
150 rm "${D}"/usr/share/emacs/site-lisp/subdirs.el
151 rm -rf "${D}"/usr/share/{applications,icons}
152 @@ -277,15 +276,17 @@
153 # Depending on Portage version and user's settings, the Info dir file
154 # may have been compressed or removed. We rebuild it in both cases.
155 local infodir=/usr/share/info/${EMACS_SUFFIX} f
156 - if [ -f "${D}"${infodir}/dir.info ]; then
157 + if [ -f "${D}"${infodir}/dir.orig ]; then
158 # prefer existing file if it has survived to here
159 - mv "${D}"${infodir}/dir{.info,} || die "mv dir.info failed"
160 + mv "${D}"${infodir}/dir{.orig,} || die "moving info dir failed"
161 else
162 einfo "Regenerating Info directory index in ${infodir} ..."
163 rm -f "${D}"${infodir}/dir{,.*}
164 - for f in "${D}"${infodir}/*.info*; do
165 - [[ ${f##*/} != *[0-9].info* && -e ${f} ]] \
166 - && install-info --info-dir="${D}"${infodir} "${f}" &>/dev/null
167 + for f in "${D}"${infodir}/*; do
168 + if [[ ${f##*/} != *-[0-9]* && -e ${f} ]]; then
169 + install-info --info-dir="${D}"${infodir} "${f}" \
170 + || die "install-info failed"
171 + fi
172 done
173 fi
174 }
Report Message
Find on MARC Find on Google Groups