Gentoo Archives: gentoo-commits

From: "Robin H. Johnson (robbat2)" <robbat2@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sys-boot/grub: grub-0.92-r1.ebuild grub-0.96-r2.ebuild grub-0.96-r1.ebuild grub-0.97.ebuild ChangeLog grub-0.96-r3.ebuild grub-0.97-r3.ebuild grub-0.97-r2.ebuild grub-0.97-r4.ebuild grub-0.94-r1.ebuild
Date: Mon, 25 Feb 2008 02:08:27
Message-Id: E1JTSlS-0001jY-Tn@stork.gentoo.org
1 robbat2 08/02/25 02:08:22
2
3 Modified: grub-0.92-r1.ebuild grub-0.96-r2.ebuild
4 grub-0.96-r1.ebuild grub-0.97.ebuild ChangeLog
5 grub-0.96-r3.ebuild grub-0.97-r3.ebuild
6 grub-0.97-r2.ebuild grub-0.97-r4.ebuild
7 grub-0.94-r1.ebuild
8 Log:
9 Fix up all quoting to make repoman happy.
10 (Portage version: 2.1.4.4)
11
12 Revision Changes Path
13 1.14 sys-boot/grub/grub-0.92-r1.ebuild
14
15 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/grub/grub-0.92-r1.ebuild?rev=1.14&view=markup
16 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/grub/grub-0.92-r1.ebuild?rev=1.14&content-type=text/plain
17 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/grub/grub-0.92-r1.ebuild?r1=1.13&r2=1.14
18
19 Index: grub-0.92-r1.ebuild
20 ===================================================================
21 RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.92-r1.ebuild,v
22 retrieving revision 1.13
23 retrieving revision 1.14
24 diff -p -w -b -B -u -u -r1.13 -r1.14
25 --- grub-0.92-r1.ebuild 28 Jul 2005 17:53:38 -0000 1.13
26 +++ grub-0.92-r1.ebuild 25 Feb 2008 02:08:22 -0000 1.14
27 @@ -1,6 +1,6 @@
28 -# Copyright 1999-2005 Gentoo Foundation
29 +# Copyright 1999-2008 Gentoo Foundation
30 # Distributed under the terms of the GNU General Public License v2
31 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.92-r1.ebuild,v 1.13 2005/07/28 17:53:38 seemant Exp $
32 +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.92-r1.ebuild,v 1.14 2008/02/25 02:08:22 robbat2 Exp $
33
34 inherit mount-boot eutils flag-o-matic toolchain-funcs
35
36 @@ -21,18 +21,18 @@ IUSE=""
37 DEPEND=">=sys-libs/ncurses-5.2-r5"
38 PROVIDE="virtual/bootloader"
39
40 -PATCHDIR=${WORKDIR}/gentoo
41 +PATCHDIR="${WORKDIR}/gentoo"
42
43 src_unpack() {
44 - unpack ${A} ; cd ${S}
45 + unpack ${A} ; cd "${S}"
46
47 EPATCH_SUFFIX="patch"
48
49 - epatch ${PATCHDIR}
50 + epatch "${PATCHDIR}"
51
52 if [ "`gcc-version`" = "3.3" ]
53 then
54 - epatch ${PATCHDIR}/gcc-3.3
55 + epatch "${PATCHDIR}"/gcc-3.3
56 fi
57 }
58
59 @@ -61,15 +61,15 @@ src_compile() {
60
61 src_install() {
62 make \
63 - prefix=${D}/usr \
64 - sbindir=${D}/sbin \
65 - mandir=${D}/usr/share/man \
66 - infodir=${D}/usr/share/info \
67 + prefix="${D}"/usr \
68 + sbindir="${D}"/sbin \
69 + mandir="${D}"/usr/share/man \
70 + infodir="${D}"/usr/share/info \
71 install || die "Installation failed."
72
73 insinto /boot/grub
74 - doins ${DISTDIR}/splash.xpm.gz
75 - dodoc AUTHORS BUGS COPYING ChangeLog NEWS README THANKS TODO
76 + doins "${DISTDIR}"/splash.xpm.gz
77 + dodoc AUTHORS BUGS ChangeLog NEWS README THANKS TODO
78 }
79
80 pkg_postinst() {
81
82
83
84 1.11 sys-boot/grub/grub-0.96-r2.ebuild
85
86 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/grub/grub-0.96-r2.ebuild?rev=1.11&view=markup
87 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/grub/grub-0.96-r2.ebuild?rev=1.11&content-type=text/plain
88 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/grub/grub-0.96-r2.ebuild?r1=1.10&r2=1.11
89
90 Index: grub-0.96-r2.ebuild
91 ===================================================================
92 RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.96-r2.ebuild,v
93 retrieving revision 1.10
94 retrieving revision 1.11
95 diff -p -w -b -B -u -u -r1.10 -r1.11
96 --- grub-0.96-r2.ebuild 5 Feb 2006 14:44:52 -0000 1.10
97 +++ grub-0.96-r2.ebuild 25 Feb 2008 02:08:22 -0000 1.11
98 @@ -1,6 +1,6 @@
99 -# Copyright 1999-2006 Gentoo Foundation
100 +# Copyright 1999-2008 Gentoo Foundation
101 # Distributed under the terms of the GNU General Public License v2
102 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.96-r2.ebuild,v 1.10 2006/02/05 14:44:52 blubb Exp $
103 +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.96-r2.ebuild,v 1.11 2008/02/25 02:08:22 robbat2 Exp $
104
105 inherit mount-boot eutils flag-o-matic toolchain-funcs
106
107 @@ -38,7 +38,7 @@ src_unpack() {
108 unpack ${A} ; cd "${S}"
109
110 EPATCH_SUFFIX="patch"
111 - epatch ${PATCHDIR}
112 + epatch "${PATCHDIR}"
113
114 # a bunch of patches apply to raw autotool files
115 autoconf || die "autoconf failed"
116 @@ -109,18 +109,18 @@ src_install() {
117 use netboot && doexe nbgrub pxegrub stage2/stage2.netboot
118
119 insinto /boot/grub
120 - doins ${DISTDIR}/splash.xpm.gz
121 + doins "${DISTDIR}"/splash.xpm.gz
122 newins docs/menu.lst grub.conf.sample
123
124 - dodoc AUTHORS BUGS COPYING ChangeLog NEWS README THANKS TODO
125 + dodoc AUTHORS BUGS ChangeLog NEWS README THANKS TODO
126 newdoc docs/menu.lst grub.conf.sample
127
128 docinto gentoo
129 - dodoc ${PATCHDIR}/README*
130 + dodoc "${PATCHDIR}"/README*
131 }
132
133 pkg_postinst() {
134 - [[ ${ROOT} != "/" ]] && return 0
135 + [[ "${ROOT}" != "/" ]] && return 0
136
137 # change menu.lst to grub.conf
138 if [[ ! -e /boot/grub/grub.conf && -e /boot/grub/menu.lst ]] ; then
139 @@ -136,7 +136,7 @@ pkg_postinst() {
140
141 einfo "Copying files from /lib/grub and /usr/lib/grub to /boot"
142 for x in /lib/grub/*/* /usr/lib/grub/*/* ; do
143 - [[ -f ${x} ]] && cp -p ${x} /boot/grub
144 + [[ -f "${x}" ]] && cp -p "${x}" /boot/grub
145 done
146
147 [[ -e /boot/grub/grub.conf ]] \
148
149
150
151 1.16 sys-boot/grub/grub-0.96-r1.ebuild
152
153 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/grub/grub-0.96-r1.ebuild?rev=1.16&view=markup
154 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/grub/grub-0.96-r1.ebuild?rev=1.16&content-type=text/plain
155 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/grub/grub-0.96-r1.ebuild?r1=1.15&r2=1.16
156
157 Index: grub-0.96-r1.ebuild
158 ===================================================================
159 RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.96-r1.ebuild,v
160 retrieving revision 1.15
161 retrieving revision 1.16
162 diff -p -w -b -B -u -u -r1.15 -r1.16
163 --- grub-0.96-r1.ebuild 21 Aug 2005 02:24:04 -0000 1.15
164 +++ grub-0.96-r1.ebuild 25 Feb 2008 02:08:22 -0000 1.16
165 @@ -1,6 +1,6 @@
166 -# Copyright 1999-2005 Gentoo Foundation
167 +# Copyright 1999-2008 Gentoo Foundation
168 # Distributed under the terms of the GNU General Public License v2
169 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.96-r1.ebuild,v 1.15 2005/08/21 02:24:04 vapier Exp $
170 +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.96-r1.ebuild,v 1.16 2008/02/25 02:08:22 robbat2 Exp $
171
172 inherit mount-boot eutils flag-o-matic toolchain-funcs
173
174 @@ -46,7 +46,7 @@ src_unpack() {
175 unpack ${A} ; cd "${S}"
176
177 EPATCH_SUFFIX="patch"
178 - epatch ${PATCHDIR}
179 + epatch "${PATCHDIR}"
180
181 # a bunch of patches apply to raw autotool files
182 autoconf || die "autoconf failed"
183 @@ -117,18 +117,18 @@ src_install() {
184 use netboot && doexe nbgrub pxegrub stage2/stage2.netboot
185
186 insinto /boot/grub
187 - doins ${DISTDIR}/splash.xpm.gz
188 + doins "${DISTDIR}"/splash.xpm.gz
189 newins docs/menu.lst grub.conf.sample
190
191 - dodoc AUTHORS BUGS COPYING ChangeLog NEWS README THANKS TODO
192 + dodoc AUTHORS BUGS ChangeLog NEWS README THANKS TODO
193 newdoc docs/menu.lst grub.conf.sample
194
195 docinto gentoo
196 - dodoc ${PATCHDIR}/README.Gentoo.patches
197 + dodoc "${PATCHDIR}"/README.Gentoo.patches
198 }
199
200 pkg_postinst() {
201 - [[ ${ROOT} != "/" ]] && return 0
202 + [[ "${ROOT}" != "/" ]] && return 0
203
204 # change menu.lst to grub.conf
205 if [[ ! -e /boot/grub/grub.conf && -e /boot/grub/menu.lst ]] ; then
206 @@ -144,7 +144,7 @@ pkg_postinst() {
207
208 einfo "Copying files from /lib/grub and /usr/lib/grub to /boot"
209 for x in /lib/grub/*/* /usr/lib/grub/*/* ; do
210 - [[ -f ${x} ]] && cp -p ${x} /boot/grub
211 + [[ -f "${x}" ]] && cp -p "${x}" /boot/grub
212 done
213
214 # hardened voodoo
215
216
217
218 1.3 sys-boot/grub/grub-0.97.ebuild
219
220 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/grub/grub-0.97.ebuild?rev=1.3&view=markup
221 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/grub/grub-0.97.ebuild?rev=1.3&content-type=text/plain
222 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/grub/grub-0.97.ebuild?r1=1.2&r2=1.3
223
224 Index: grub-0.97.ebuild
225 ===================================================================
226 RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.97.ebuild,v
227 retrieving revision 1.2
228 retrieving revision 1.3
229 diff -p -w -b -B -u -u -r1.2 -r1.3
230 --- grub-0.97.ebuild 21 Aug 2005 02:24:04 -0000 1.2
231 +++ grub-0.97.ebuild 25 Feb 2008 02:08:22 -0000 1.3
232 @@ -1,6 +1,6 @@
233 -# Copyright 1999-2005 Gentoo Foundation
234 +# Copyright 1999-2008 Gentoo Foundation
235 # Distributed under the terms of the GNU General Public License v2
236 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.97.ebuild,v 1.2 2005/08/21 02:24:04 vapier Exp $
237 +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.97.ebuild,v 1.3 2008/02/25 02:08:22 robbat2 Exp $
238
239 inherit mount-boot eutils flag-o-matic toolchain-funcs
240
241 @@ -125,11 +125,11 @@ src_install() {
242 newdoc docs/menu.lst grub.conf.sample
243
244 docinto gentoo
245 - dodoc ${PATCHDIR}/README*
246 + dodoc "${PATCHDIR}"/README*
247 }
248
249 pkg_postinst() {
250 - [[ ${ROOT} != "/" ]] && return 0
251 + [[ "${ROOT}" != "/" ]] && return 0
252
253 # change menu.lst to grub.conf
254 if [[ ! -e /boot/grub/grub.conf && -e /boot/grub/menu.lst ]] ; then
255 @@ -145,7 +145,7 @@ pkg_postinst() {
256
257 einfo "Copying files from /lib/grub and /usr/lib/grub to /boot"
258 for x in /lib/grub/*/* /usr/lib/grub/*/* ; do
259 - [[ -f ${x} ]] && cp -p ${x} /boot/grub
260 + [[ -f "${x}" ]] && cp -p "${x}" /boot/grub
261 done
262
263 [[ -e /boot/grub/grub.conf ]] \
264
265
266
267 1.76 sys-boot/grub/ChangeLog
268
269 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/grub/ChangeLog?rev=1.76&view=markup
270 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/grub/ChangeLog?rev=1.76&content-type=text/plain
271 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/grub/ChangeLog?r1=1.75&r2=1.76
272
273 Index: ChangeLog
274 ===================================================================
275 RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v
276 retrieving revision 1.75
277 retrieving revision 1.76
278 diff -p -w -b -B -u -u -r1.75 -r1.76
279 --- ChangeLog 16 Feb 2008 22:05:39 -0000 1.75
280 +++ ChangeLog 25 Feb 2008 02:08:22 -0000 1.76
281 @@ -1,6 +1,12 @@
282 # ChangeLog for sys-boot/grub
283 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
284 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.75 2008/02/16 22:05:39 vapier Exp $
285 +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.76 2008/02/25 02:08:22 robbat2 Exp $
286 +
287 + 25 Feb 2008; Robin H. Johnson <robbat2@g.o> grub-0.92-r1.ebuild,
288 + grub-0.94-r1.ebuild, grub-0.96-r1.ebuild, grub-0.96-r2.ebuild,
289 + grub-0.96-r3.ebuild, grub-0.97.ebuild, grub-0.97-r2.ebuild,
290 + grub-0.97-r3.ebuild, grub-0.97-r4.ebuild:
291 + Fix up all quoting to make repoman happy.
292
293 *grub-1.96 (16 Feb 2008)
294
295
296
297
298 1.4 sys-boot/grub/grub-0.96-r3.ebuild
299
300 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/grub/grub-0.96-r3.ebuild?rev=1.4&view=markup
301 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/grub/grub-0.96-r3.ebuild?rev=1.4&content-type=text/plain
302 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/grub/grub-0.96-r3.ebuild?r1=1.3&r2=1.4
303
304 Index: grub-0.96-r3.ebuild
305 ===================================================================
306 RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.96-r3.ebuild,v
307 retrieving revision 1.3
308 retrieving revision 1.4
309 diff -p -w -b -B -u -u -r1.3 -r1.4
310 --- grub-0.96-r3.ebuild 21 Aug 2005 02:24:04 -0000 1.3
311 +++ grub-0.96-r3.ebuild 25 Feb 2008 02:08:22 -0000 1.4
312 @@ -1,6 +1,6 @@
313 -# Copyright 1999-2005 Gentoo Foundation
314 +# Copyright 1999-2008 Gentoo Foundation
315 # Distributed under the terms of the GNU General Public License v2
316 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.96-r3.ebuild,v 1.3 2005/08/21 02:24:04 vapier Exp $
317 +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.96-r3.ebuild,v 1.4 2008/02/25 02:08:22 robbat2 Exp $
318
319 inherit mount-boot eutils flag-o-matic toolchain-funcs
320
321 @@ -116,18 +116,18 @@ src_install() {
322 use netboot && doexe nbgrub pxegrub stage2/stage2.netboot
323
324 insinto /boot/grub
325 - doins ${DISTDIR}/splash.xpm.gz
326 + doins "${DISTDIR}"/splash.xpm.gz
327 newins docs/menu.lst grub.conf.sample
328
329 - dodoc AUTHORS BUGS COPYING ChangeLog NEWS README THANKS TODO
330 + dodoc AUTHORS BUGS ChangeLog NEWS README THANKS TODO
331 newdoc docs/menu.lst grub.conf.sample
332
333 docinto gentoo
334 - dodoc ${PATCHDIR}/README*
335 + dodoc "${PATCHDIR}"/README*
336 }
337
338 pkg_postinst() {
339 - [[ ${ROOT} != "/" ]] && return 0
340 + [[ "${ROOT}" != "/" ]] && return 0
341
342 # change menu.lst to grub.conf
343 if [[ ! -e /boot/grub/grub.conf && -e /boot/grub/menu.lst ]] ; then
344 @@ -143,7 +143,7 @@ pkg_postinst() {
345
346 einfo "Copying files from /lib/grub and /usr/lib/grub to /boot"
347 for x in /lib/grub/*/* /usr/lib/grub/*/* ; do
348 - [[ -f ${x} ]] && cp -p ${x} /boot/grub
349 + [[ -f "${x}" ]] && cp -p "${x}" /boot/grub
350 done
351
352 [[ -e /boot/grub/grub.conf ]] \
353
354
355
356 1.11 sys-boot/grub/grub-0.97-r3.ebuild
357
358 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/grub/grub-0.97-r3.ebuild?rev=1.11&view=markup
359 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/grub/grub-0.97-r3.ebuild?rev=1.11&content-type=text/plain
360 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/grub/grub-0.97-r3.ebuild?r1=1.10&r2=1.11
361
362 Index: grub-0.97-r3.ebuild
363 ===================================================================
364 RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.97-r3.ebuild,v
365 retrieving revision 1.10
366 retrieving revision 1.11
367 diff -p -w -b -B -u -u -r1.10 -r1.11
368 --- grub-0.97-r3.ebuild 25 May 2007 05:05:11 -0000 1.10
369 +++ grub-0.97-r3.ebuild 25 Feb 2008 02:08:22 -0000 1.11
370 @@ -1,6 +1,6 @@
371 -# Copyright 1999-2007 Gentoo Foundation
372 +# Copyright 1999-2008 Gentoo Foundation
373 # Distributed under the terms of the GNU General Public License v2
374 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.97-r3.ebuild,v 1.10 2007/05/25 05:05:11 vapier Exp $
375 +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.97-r3.ebuild,v 1.11 2008/02/25 02:08:22 robbat2 Exp $
376
377 inherit mount-boot eutils flag-o-matic toolchain-funcs autotools
378
379 @@ -113,30 +113,30 @@ src_install() {
380 setup_boot_dir() {
381 local dir="${1}"
382
383 - [[ ! -e ${dir} ]] && die "${dir} does not exist!"
384 - [[ ! -e ${dir}/grub ]] && mkdir "${dir}/grub"
385 + [[ ! -e "${dir}" ]] && die "${dir} does not exist!"
386 + [[ ! -e "${dir}"/grub ]] && mkdir "${dir}/grub"
387
388 # change menu.lst to grub.conf
389 - if [[ ! -e ${dir}/grub/grub.conf ]] && [[ -e ${dir}/grub/menu.lst ]] ; then
390 + if [[ ! -e "${dir}"/grub/grub.conf ]] && [[ -e "${dir}"/grub/menu.lst ]] ; then
391 mv -f "${dir}"/grub/menu.lst "${dir}"/grub/grub.conf
392 ewarn
393 ewarn "*** IMPORTANT NOTE: menu.lst has been renamed to grub.conf"
394 ewarn
395 fi
396
397 - if [[ ! -e ${dir}/grub/menu.lst ]]; then
398 + if [[ ! -e "${dir}"/grub/menu.lst ]]; then
399 einfo "Linking from new grub.conf name to menu.lst"
400 ln -snf grub.conf "${dir}"/grub/menu.lst
401 fi
402
403 - [[ -e ${dir}/grub/stage2 ]] && mv "${dir}"/grub/stage2{,.old}
404 + [[ -e "${dir}"/grub/stage2 ]] && mv "${dir}"/grub/stage2{,.old}
405
406 - einfo "Copying files from /lib/grub and /usr/lib/grub to "${dir}""
407 + einfo "Copying files from /lib/grub and /usr/lib/grub to ${dir}"
408 for x in /lib*/grub/*/* /usr/lib*/grub/*/* ; do
409 - [[ -f ${x} ]] && cp -p ${x} "${dir}"/grub/
410 + [[ -f "${x}" ]] && cp -p "${x}" "${dir}"/grub/
411 done
412
413 - if [[ -e ${dir}/grub/grub.conf ]] ; then
414 + if [[ -e "${dir}"/grub/grub.conf ]] ; then
415 egrep \
416 -v '^[[:space:]]*(#|$|default|fallback|initrd|password|splashimage|timeout|title)' \
417 "${dir}"/grub/grub.conf | \
418 @@ -147,7 +147,7 @@ setup_boot_dir() {
419 }
420
421 pkg_postinst() {
422 - [[ ${ROOT} != "/" ]] && return 0
423 + [[ "${ROOT}" != "/" ]] && return 0
424 [[ -n ${DONT_MOUNT_BOOT} ]] && return 0
425 setup_boot_dir /boot
426 einfo "To install grub files to another device (like a usb stick), just run:"
427 @@ -158,5 +158,5 @@ pkg_config() {
428 local dir
429 einfo "Enter the directory where you want to setup grub:"
430 read dir
431 - setup_boot_dir ${dir}
432 + setup_boot_dir "${dir}"
433 }
434
435
436
437 1.11 sys-boot/grub/grub-0.97-r2.ebuild
438
439 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/grub/grub-0.97-r2.ebuild?rev=1.11&view=markup
440 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/grub/grub-0.97-r2.ebuild?rev=1.11&content-type=text/plain
441 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/grub/grub-0.97-r2.ebuild?r1=1.10&r2=1.11
442
443 Index: grub-0.97-r2.ebuild
444 ===================================================================
445 RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.97-r2.ebuild,v
446 retrieving revision 1.10
447 retrieving revision 1.11
448 diff -p -w -b -B -u -u -r1.10 -r1.11
449 --- grub-0.97-r2.ebuild 27 Nov 2006 00:35:21 -0000 1.10
450 +++ grub-0.97-r2.ebuild 25 Feb 2008 02:08:22 -0000 1.11
451 @@ -1,6 +1,6 @@
452 -# Copyright 1999-2006 Gentoo Foundation
453 +# Copyright 1999-2008 Gentoo Foundation
454 # Distributed under the terms of the GNU General Public License v2
455 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.97-r2.ebuild,v 1.10 2006/11/27 00:35:21 vapier Exp $
456 +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.97-r2.ebuild,v 1.11 2008/02/25 02:08:22 robbat2 Exp $
457
458 inherit mount-boot eutils flag-o-matic toolchain-funcs
459
460 @@ -123,11 +123,11 @@ src_install() {
461 setup_boot_dir() {
462 local dir="${1}"
463
464 - [[ ! -e ${dir} ]] && die "${dir} does not exist!"
465 - [[ ! -e ${dir}/grub ]] && mkdir "${dir}/grub"
466 + [[ ! -e "${dir}" ]] && die "${dir} does not exist!"
467 + [[ ! -e "${dir}"/grub ]] && mkdir "${dir}/grub"
468
469 # change menu.lst to grub.conf
470 - if [[ ! -e ${dir}/grub/grub.conf ]] && [[ -e ${dir}/grub/menu.lst ]] ; then
471 + if [[ ! -e "${dir}"/grub/grub.conf ]] && [[ -e "${dir}"/grub/menu.lst ]] ; then
472 mv -f "${dir}"/grub/menu.lst "${dir}"/grub/grub.conf
473 ewarn
474 ewarn "*** IMPORTANT NOTE: menu.lst has been renamed to grub.conf"
475 @@ -143,7 +143,7 @@ setup_boot_dir() {
476
477 einfo "Copying files from /lib/grub and /usr/lib/grub to "${dir}""
478 for x in /lib*/grub/*/* /usr/lib*/grub/*/* ; do
479 - [[ -f ${x} ]] && cp -p ${x} "${dir}"/grub/
480 + [[ -f "${x}" ]] && cp -p "${x}" "${dir}"/grub/
481 done
482
483 if [[ -e "${dir}"/grub/grub.conf ]] ; then
484 @@ -155,7 +155,7 @@ setup_boot_dir() {
485 }
486
487 pkg_postinst() {
488 - [[ ${ROOT} != "/" ]] && return 0
489 + [[ "${ROOT}" != "/" ]] && return 0
490 setup_boot_dir /boot
491 einfo "To install grub files to another device (like a usb stick), just run:"
492 einfo " emerge --config =${PF}"
493 @@ -165,5 +165,5 @@ pkg_config() {
494 local dir
495 einfo "Enter the directory where you want to setup grub:"
496 read dir
497 - setup_boot_dir ${dir}
498 + setup_boot_dir "${dir}"
499 }
500
501
502
503 1.2 sys-boot/grub/grub-0.97-r4.ebuild
504
505 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/grub/grub-0.97-r4.ebuild?rev=1.2&view=markup
506 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/grub/grub-0.97-r4.ebuild?rev=1.2&content-type=text/plain
507 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/grub/grub-0.97-r4.ebuild?r1=1.1&r2=1.2
508
509 Index: grub-0.97-r4.ebuild
510 ===================================================================
511 RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.97-r4.ebuild,v
512 retrieving revision 1.1
513 retrieving revision 1.2
514 diff -p -w -b -B -u -u -r1.1 -r1.2
515 --- grub-0.97-r4.ebuild 25 Feb 2008 01:44:37 -0000 1.1
516 +++ grub-0.97-r4.ebuild 25 Feb 2008 02:08:22 -0000 1.2
517 @@ -1,6 +1,6 @@
518 -# Copyright 1999-2007 Gentoo Foundation
519 +# Copyright 1999-2008 Gentoo Foundation
520 # Distributed under the terms of the GNU General Public License v2
521 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.97-r4.ebuild,v 1.1 2008/02/25 01:44:37 robbat2 Exp $
522 +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.97-r4.ebuild,v 1.2 2008/02/25 02:08:22 robbat2 Exp $
523
524 inherit mount-boot eutils flag-o-matic toolchain-funcs autotools
525
526 @@ -115,30 +115,30 @@ src_install() {
527 setup_boot_dir() {
528 local dir="${1}"
529
530 - [[ ! -e ${dir} ]] && die "${dir} does not exist!"
531 - [[ ! -e ${dir}/grub ]] && mkdir "${dir}/grub"
532 + [[ ! -e "${dir}" ]] && die "${dir} does not exist!"
533 + [[ ! -e "${dir}"/grub ]] && mkdir "${dir}/grub"
534
535 # change menu.lst to grub.conf
536 - if [[ ! -e ${dir}/grub/grub.conf ]] && [[ -e ${dir}/grub/menu.lst ]] ; then
537 + if [[ ! -e "${dir}"/grub/grub.conf ]] && [[ -e "${dir}"/grub/menu.lst ]] ; then
538 mv -f "${dir}"/grub/menu.lst "${dir}"/grub/grub.conf
539 ewarn
540 ewarn "*** IMPORTANT NOTE: menu.lst has been renamed to grub.conf"
541 ewarn
542 fi
543
544 - if [[ ! -e ${dir}/grub/menu.lst ]]; then
545 + if [[ ! -e "${dir}"/grub/menu.lst ]]; then
546 einfo "Linking from new grub.conf name to menu.lst"
547 ln -snf grub.conf "${dir}"/grub/menu.lst
548 fi
549
550 - [[ -e ${dir}/grub/stage2 ]] && mv "${dir}"/grub/stage2{,.old}
551 + [[ -e "${dir}"/grub/stage2 ]] && mv "${dir}"/grub/stage2{,.old}
552
553 - einfo "Copying files from /lib/grub and /usr/lib/grub to "${dir}""
554 + einfo "Copying files from /lib/grub and /usr/lib/grub to ${dir}"
555 for x in /lib*/grub/*/* /usr/lib*/grub/*/* ; do
556 - [[ -f ${x} ]] && cp -p ${x} "${dir}"/grub/
557 + [[ -f "${x}" ]] && cp -p "${x}" "${dir}"/grub/
558 done
559
560 - if [[ -e ${dir}/grub/grub.conf ]] ; then
561 + if [[ -e "${dir}"/grub/grub.conf ]] ; then
562 egrep \
563 -v '^[[:space:]]*(#|$|default|fallback|initrd|password|splashimage|timeout|title)' \
564 "${dir}"/grub/grub.conf | \
565 @@ -149,7 +149,7 @@ setup_boot_dir() {
566 }
567
568 pkg_postinst() {
569 - [[ ${ROOT} != "/" ]] && return 0
570 + [[ "${ROOT}" != "/" ]] && return 0
571 [[ -n ${DONT_MOUNT_BOOT} ]] && return 0
572 setup_boot_dir /boot
573 einfo "To install grub files to another device (like a usb stick), just run:"
574 @@ -160,5 +160,5 @@ pkg_config() {
575 local dir
576 einfo "Enter the directory where you want to setup grub:"
577 read dir
578 - setup_boot_dir ${dir}
579 + setup_boot_dir "${dir}"
580 }
581
582
583
584 1.25 sys-boot/grub/grub-0.94-r1.ebuild
585
586 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/grub/grub-0.94-r1.ebuild?rev=1.25&view=markup
587 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/grub/grub-0.94-r1.ebuild?rev=1.25&content-type=text/plain
588 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/grub/grub-0.94-r1.ebuild?r1=1.24&r2=1.25
589
590 Index: grub-0.94-r1.ebuild
591 ===================================================================
592 RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.94-r1.ebuild,v
593 retrieving revision 1.24
594 retrieving revision 1.25
595 diff -p -w -b -B -u -u -r1.24 -r1.25
596 --- grub-0.94-r1.ebuild 21 Aug 2005 02:24:04 -0000 1.24
597 +++ grub-0.94-r1.ebuild 25 Feb 2008 02:08:22 -0000 1.25
598 @@ -1,6 +1,6 @@
599 -# Copyright 1999-2005 Gentoo Foundation
600 +# Copyright 1999-2008 Gentoo Foundation
601 # Distributed under the terms of the GNU General Public License v2
602 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.94-r1.ebuild,v 1.24 2005/08/21 02:24:04 vapier Exp $
603 +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.94-r1.ebuild,v 1.25 2008/02/25 02:08:22 robbat2 Exp $
604
605 inherit mount-boot eutils flag-o-matic toolchain-funcs
606
607 @@ -36,11 +36,11 @@ pkg_setup() {
608 }
609
610 src_unpack() {
611 - unpack ${A}; cd ${S}
612 + unpack ${A}; cd "${S}"
613
614 EPATCH_SUFFIX="patch"
615
616 - epatch ${PATCHDIR}
617 + epatch "${PATCHDIR}"
618 }
619
620 src_compile() {
621 @@ -75,7 +75,7 @@ src_compile() {
622
623 emake w89c840_o_CFLAGS="-O" || die "making netboot stuff"
624
625 - mv stage2/{nbgrub,pxegrub} ${S}
626 + mv stage2/{nbgrub,pxegrub} "${S}"
627 mv stage2/stage2 stage2/stage2.netboot
628
629 make clean || die
630 @@ -91,19 +91,19 @@ src_compile() {
631 }
632
633 src_install() {
634 - make DESTDIR=${D} install || die
635 + make DESTDIR="${D}" install || die
636 exeinto /usr/lib/grub/${CHOST}
637 doexe nbgrub pxegrub stage2/stage2 stage2/stage2.netboot
638
639 insinto /boot/grub
640 - doins ${DISTDIR}/splash.xpm.gz
641 + doins "${DISTDIR}"/splash.xpm.gz
642 newins docs/menu.lst grub.conf.sample
643
644 - dodoc AUTHORS BUGS COPYING ChangeLog NEWS README THANKS TODO
645 + dodoc AUTHORS BUGS ChangeLog NEWS README THANKS TODO
646 newdoc docs/menu.lst grub.conf.sample
647
648 docinto gentoo
649 - dodoc ${PATCHDIR}/README*
650 + dodoc "${PATCHDIR}"/README*
651 }
652
653 pkg_postinst() {
654
655
656
657 --
658 gentoo-commits@l.g.o mailing list