1 |
ulm 07/12/02 20:00:52 |
2 |
|
3 |
Modified: ChangeLog emacs-22.1-r3.ebuild |
4 |
emacs-18.59-r4.ebuild emacs-21.4-r14.ebuild |
5 |
emacs-21.4-r12.ebuild |
6 |
Log: |
7 |
Declare some variables as local, add some quotes. |
8 |
(Portage version: 2.1.4_rc4) |
9 |
|
10 |
Revision Changes Path |
11 |
1.220 app-editors/emacs/ChangeLog |
12 |
|
13 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs/ChangeLog?rev=1.220&view=markup |
14 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs/ChangeLog?rev=1.220&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs/ChangeLog?r1=1.219&r2=1.220 |
16 |
|
17 |
Index: ChangeLog |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v |
20 |
retrieving revision 1.219 |
21 |
retrieving revision 1.220 |
22 |
diff -u -r1.219 -r1.220 |
23 |
--- ChangeLog 1 Dec 2007 01:12:40 -0000 1.219 |
24 |
+++ ChangeLog 2 Dec 2007 20:00:52 -0000 1.220 |
25 |
@@ -1,6 +1,10 @@ |
26 |
# ChangeLog for app-editors/emacs |
27 |
# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.219 2007/12/01 01:12:40 ulm Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.220 2007/12/02 20:00:52 ulm Exp $ |
30 |
+ |
31 |
+ 02 Dec 2007; Ulrich Mueller <ulm@g.o> emacs-18.59-r4.ebuild, |
32 |
+ emacs-21.4-r12.ebuild, emacs-21.4-r14.ebuild, emacs-22.1-r3.ebuild: |
33 |
+ Declare some variables as local, add some quotes. |
34 |
|
35 |
01 Dec 2007; Ulrich Mueller <ulm@g.o> emacs-22.1-r3.ebuild: |
36 |
Rename site-init file for USE=source. |
37 |
|
38 |
|
39 |
|
40 |
1.10 app-editors/emacs/emacs-22.1-r3.ebuild |
41 |
|
42 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs/emacs-22.1-r3.ebuild?rev=1.10&view=markup |
43 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs/emacs-22.1-r3.ebuild?rev=1.10&content-type=text/plain |
44 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs/emacs-22.1-r3.ebuild?r1=1.9&r2=1.10 |
45 |
|
46 |
Index: emacs-22.1-r3.ebuild |
47 |
=================================================================== |
48 |
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-22.1-r3.ebuild,v |
49 |
retrieving revision 1.9 |
50 |
retrieving revision 1.10 |
51 |
diff -u -r1.9 -r1.10 |
52 |
--- emacs-22.1-r3.ebuild 1 Dec 2007 01:12:40 -0000 1.9 |
53 |
+++ emacs-22.1-r3.ebuild 2 Dec 2007 20:00:52 -0000 1.10 |
54 |
@@ -1,6 +1,6 @@ |
55 |
# Copyright 1999-2007 Gentoo Foundation |
56 |
# Distributed under the terms of the GNU General Public License v2 |
57 |
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-22.1-r3.ebuild,v 1.9 2007/12/01 01:12:40 ulm Exp $ |
58 |
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-22.1-r3.ebuild,v 1.10 2007/12/02 20:00:52 ulm Exp $ |
59 |
|
60 |
WANT_AUTOCONF="2.5" |
61 |
WANT_AUTOMAKE="latest" |
62 |
@@ -151,6 +151,8 @@ |
63 |
} |
64 |
|
65 |
src_install () { |
66 |
+ local i m |
67 |
+ |
68 |
emake install DESTDIR="${D}" || die "make install failed" |
69 |
|
70 |
rm "${D}"/usr/bin/emacs-${FULL_VERSION}-emacs-${SLOT} \ |
71 |
@@ -161,13 +163,13 @@ |
72 |
# move info documentation to the correct place |
73 |
einfo "Fixing info documentation ..." |
74 |
for i in "${D}"/usr/share/info/emacs-${SLOT}/*; do |
75 |
- mv ${i} ${i}.info || die "mv info failed" |
76 |
+ mv "${i}" "${i}.info" || die "mv info failed" |
77 |
done |
78 |
|
79 |
# move man pages to the correct place |
80 |
einfo "Fixing manpages ..." |
81 |
for m in "${D}"/usr/share/man/man1/* ; do |
82 |
- mv ${m} ${m%.1}-emacs-${SLOT}.1 || die "mv man failed" |
83 |
+ mv "${m}" "${m%.1}-emacs-${SLOT}.1" || die "mv man failed" |
84 |
done |
85 |
|
86 |
# avoid collision between slots, see bug #169033 e.g. |
87 |
@@ -204,7 +206,7 @@ |
88 |
rm -f "${ROOT}"${infodir}/dir{,.*} |
89 |
for f in "${ROOT}"${infodir}/*.info*; do |
90 |
[[ ${f##*/} == *[0-9].info* ]] \ |
91 |
- || install-info --info-dir="${ROOT}"${infodir} ${f} &>/dev/null |
92 |
+ || install-info --info-dir="${ROOT}"${infodir} "${f}" &>/dev/null |
93 |
done |
94 |
echo |
95 |
} |
96 |
@@ -215,7 +217,7 @@ |
97 |
|
98 |
local f |
99 |
for f in "${ROOT}"/var/lib/games/emacs/{snake,tetris}-scores; do |
100 |
- test -e ${f} || touch ${f} |
101 |
+ test -e "${f}" || touch "${f}" |
102 |
done |
103 |
|
104 |
elisp-site-regen |
105 |
|
106 |
|
107 |
|
108 |
1.7 app-editors/emacs/emacs-18.59-r4.ebuild |
109 |
|
110 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs/emacs-18.59-r4.ebuild?rev=1.7&view=markup |
111 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs/emacs-18.59-r4.ebuild?rev=1.7&content-type=text/plain |
112 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs/emacs-18.59-r4.ebuild?r1=1.6&r2=1.7 |
113 |
|
114 |
Index: emacs-18.59-r4.ebuild |
115 |
=================================================================== |
116 |
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-18.59-r4.ebuild,v |
117 |
retrieving revision 1.6 |
118 |
retrieving revision 1.7 |
119 |
diff -u -r1.6 -r1.7 |
120 |
--- emacs-18.59-r4.ebuild 3 Nov 2007 16:14:44 -0000 1.6 |
121 |
+++ emacs-18.59-r4.ebuild 2 Dec 2007 20:00:52 -0000 1.7 |
122 |
@@ -1,6 +1,6 @@ |
123 |
# Copyright 1999-2007 Gentoo Foundation |
124 |
# Distributed under the terms of the GNU General Public License v2 |
125 |
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-18.59-r4.ebuild,v 1.6 2007/11/03 16:14:44 ulm Exp $ |
126 |
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-18.59-r4.ebuild,v 1.7 2007/12/02 20:00:52 ulm Exp $ |
127 |
|
128 |
inherit eutils toolchain-funcs flag-o-matic |
129 |
|
130 |
@@ -60,6 +60,8 @@ |
131 |
} |
132 |
|
133 |
src_install() { |
134 |
+ local i |
135 |
+ |
136 |
dodir ${MY_BASEDIR} |
137 |
dodir /usr/share/man/man1 |
138 |
make install LIBDIR="${D}${MY_BASEDIR}" BINDIR="${D}/usr/bin" \ |
139 |
|
140 |
|
141 |
|
142 |
1.8 app-editors/emacs/emacs-21.4-r14.ebuild |
143 |
|
144 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs/emacs-21.4-r14.ebuild?rev=1.8&view=markup |
145 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs/emacs-21.4-r14.ebuild?rev=1.8&content-type=text/plain |
146 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs/emacs-21.4-r14.ebuild?r1=1.7&r2=1.8 |
147 |
|
148 |
Index: emacs-21.4-r14.ebuild |
149 |
=================================================================== |
150 |
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r14.ebuild,v |
151 |
retrieving revision 1.7 |
152 |
retrieving revision 1.8 |
153 |
diff -u -r1.7 -r1.8 |
154 |
--- emacs-21.4-r14.ebuild 28 Nov 2007 19:38:23 -0000 1.7 |
155 |
+++ emacs-21.4-r14.ebuild 2 Dec 2007 20:00:52 -0000 1.8 |
156 |
@@ -1,6 +1,6 @@ |
157 |
# Copyright 1999-2007 Gentoo Foundation |
158 |
# Distributed under the terms of the GNU General Public License v2 |
159 |
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r14.ebuild,v 1.7 2007/11/28 19:38:23 welp Exp $ |
160 |
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r14.ebuild,v 1.8 2007/12/02 20:00:52 ulm Exp $ |
161 |
|
162 |
WANT_AUTOCONF="2.1" |
163 |
|
164 |
@@ -112,9 +112,11 @@ |
165 |
} |
166 |
|
167 |
src_install() { |
168 |
+ local i m |
169 |
+ |
170 |
einstall || die "einstall failed" |
171 |
for i in "${D}"/usr/bin/* ; do |
172 |
- mv ${i} ${i}-emacs-${SLOT} || die "mv ${i} failed" |
173 |
+ mv "${i}" "${i}-emacs-${SLOT}" || die "mv ${i} failed" |
174 |
done |
175 |
mv "${D}"/usr/bin/emacs{-emacs,}-${SLOT} || die "mv emacs failed" |
176 |
rm "${D}"/usr/bin/emacs-${PV}-emacs-${SLOT} |
177 |
@@ -124,14 +126,14 @@ |
178 |
mv "${D}/usr/share/info/dir" "${T}" |
179 |
for i in "${D}"/usr/share/info/* |
180 |
do |
181 |
- mv ${i} "${T}"/emacs-${SLOT}/${i##*/}.info |
182 |
+ mv "${i}" "${T}/emacs-${SLOT}/${i##*/}.info" |
183 |
done |
184 |
mv "${T}/emacs-${SLOT}" "${D}/usr/share/info" |
185 |
mv "${T}/dir" "${D}/usr/share/info/emacs-${SLOT}" |
186 |
|
187 |
einfo "Fixing manpages..." |
188 |
for m in "${D}"/usr/share/man/man1/* ; do |
189 |
- mv ${m} ${m%.1}-emacs-${SLOT}.1 || die "mv ${m} failed" |
190 |
+ mv "${m}" "${m%.1}-emacs-${SLOT}.1" || die "mv ${m} failed" |
191 |
done |
192 |
|
193 |
# avoid collision between slots |
194 |
@@ -157,7 +159,7 @@ |
195 |
rm -f "${ROOT}"${infodir}/dir{,.*} |
196 |
for f in "${ROOT}"${infodir}/*.info*; do |
197 |
[[ ${f##*/} == *[0-9].info* ]] \ |
198 |
- || install-info --info-dir="${ROOT}"${infodir} ${f} &>/dev/null |
199 |
+ || install-info --info-dir="${ROOT}"${infodir} "${f}" &>/dev/null |
200 |
done |
201 |
echo |
202 |
} |
203 |
|
204 |
|
205 |
|
206 |
1.34 app-editors/emacs/emacs-21.4-r12.ebuild |
207 |
|
208 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs/emacs-21.4-r12.ebuild?rev=1.34&view=markup |
209 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs/emacs-21.4-r12.ebuild?rev=1.34&content-type=text/plain |
210 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs/emacs-21.4-r12.ebuild?r1=1.33&r2=1.34 |
211 |
|
212 |
Index: emacs-21.4-r12.ebuild |
213 |
=================================================================== |
214 |
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r12.ebuild,v |
215 |
retrieving revision 1.33 |
216 |
retrieving revision 1.34 |
217 |
diff -u -r1.33 -r1.34 |
218 |
--- emacs-21.4-r12.ebuild 14 Oct 2007 08:34:43 -0000 1.33 |
219 |
+++ emacs-21.4-r12.ebuild 2 Dec 2007 20:00:52 -0000 1.34 |
220 |
@@ -1,6 +1,6 @@ |
221 |
# Copyright 1999-2007 Gentoo Foundation |
222 |
# Distributed under the terms of the GNU General Public License v2 |
223 |
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r12.ebuild,v 1.33 2007/10/14 08:34:43 ulm Exp $ |
224 |
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r12.ebuild,v 1.34 2007/12/02 20:00:52 ulm Exp $ |
225 |
|
226 |
WANT_AUTOCONF="2.1" |
227 |
|
228 |
@@ -128,9 +128,11 @@ |
229 |
} |
230 |
|
231 |
src_install() { |
232 |
+ local i m |
233 |
+ |
234 |
einstall || die "einstall failed" |
235 |
for i in "${D}"/usr/bin/* ; do |
236 |
- mv ${i} ${i}-emacs-${SLOT} || die "mv ${i} failed" |
237 |
+ mv "${i}" "${i}-emacs-${SLOT}" || die "mv ${i} failed" |
238 |
done |
239 |
mv "${D}"/usr/bin/emacs{-emacs,}-${SLOT} || die "mv emacs failed" |
240 |
rm "${D}"/usr/bin/emacs-${PV}-emacs-${SLOT} |
241 |
@@ -140,14 +142,14 @@ |
242 |
mv "${D}/usr/share/info/dir" "${T}" |
243 |
for i in "${D}"/usr/share/info/* |
244 |
do |
245 |
- mv ${i} "${T}"/emacs-${SLOT}/${i##*/}.info |
246 |
+ mv "${i}" "${T}/emacs-${SLOT}/${i##*/}.info" |
247 |
done |
248 |
mv "${T}/emacs-${SLOT}" "${D}/usr/share/info" |
249 |
mv "${T}/dir" "${D}/usr/share/info/emacs-${SLOT}" |
250 |
|
251 |
einfo "Fixing manpages..." |
252 |
for m in "${D}"/usr/share/man/man1/* ; do |
253 |
- mv ${m} ${m%.1}-emacs-${SLOT}.1 || die "mv ${m} failed" |
254 |
+ mv "${m}" "${m%.1}-emacs-${SLOT}.1" || die "mv ${m} failed" |
255 |
done |
256 |
|
257 |
# avoid collision between slots |
258 |
@@ -173,7 +175,7 @@ |
259 |
rm -f "${ROOT}"${infodir}/dir{,.*} |
260 |
for f in "${ROOT}"${infodir}/*.info*; do |
261 |
[[ ${f##*/} == *[0-9].info* ]] \ |
262 |
- || install-info --info-dir="${ROOT}"${infodir} ${f} &>/dev/null |
263 |
+ || install-info --info-dir="${ROOT}"${infodir} "${f}" &>/dev/null |
264 |
done |
265 |
echo |
266 |
} |
267 |
|
268 |
|
269 |
|
270 |
-- |
271 |
gentoo-commits@g.o mailing list |