1 |
dberkholz 07/10/09 07:22:49 |
2 |
|
3 |
Modified: xorg-server-1.4-r1.ebuild ChangeLog |
4 |
xorg-server-1.3.0.0.ebuild |
5 |
xorg-server-1.2.0-r3.ebuild |
6 |
xorg-server-1.3.0.0-r1.ebuild |
7 |
Log: |
8 |
Fix quoting issues caught by latest repoman. |
9 |
(Portage version: 2.1.3.12) |
10 |
|
11 |
Revision Changes Path |
12 |
1.7 x11-base/xorg-server/xorg-server-1.4-r1.ebuild |
13 |
|
14 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-base/xorg-server/xorg-server-1.4-r1.ebuild?rev=1.7&view=markup |
15 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-base/xorg-server/xorg-server-1.4-r1.ebuild?rev=1.7&content-type=text/plain |
16 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-base/xorg-server/xorg-server-1.4-r1.ebuild?r1=1.6&r2=1.7 |
17 |
|
18 |
Index: xorg-server-1.4-r1.ebuild |
19 |
=================================================================== |
20 |
RCS file: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.4-r1.ebuild,v |
21 |
retrieving revision 1.6 |
22 |
retrieving revision 1.7 |
23 |
diff -u -r1.6 -r1.7 |
24 |
--- xorg-server-1.4-r1.ebuild 1 Oct 2007 14:32:34 -0000 1.6 |
25 |
+++ xorg-server-1.4-r1.ebuild 9 Oct 2007 07:22:49 -0000 1.7 |
26 |
@@ -1,6 +1,6 @@ |
27 |
# Copyright 1999-2007 Gentoo Foundation |
28 |
# Distributed under the terms of the GNU General Public License v2 |
29 |
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.4-r1.ebuild,v 1.6 2007/10/01 14:32:34 cardoe Exp $ |
30 |
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.4-r1.ebuild,v 1.7 2007/10/09 07:22:49 dberkholz Exp $ |
31 |
|
32 |
# Must be before x-modular eclass is inherited |
33 |
#SNAPSHOT="yes" |
34 |
@@ -410,8 +410,8 @@ |
35 |
pkg_postrm() { |
36 |
# Get rid of module dir to ensure opengl-update works properly |
37 |
if ! has_version x11-base/xorg-server; then |
38 |
- if [ -e ${ROOT}/usr/$(get_libdir)/xorg/modules ]; then |
39 |
- rm -rf ${ROOT}/usr/$(get_libdir)/xorg/modules |
40 |
+ if [[ -e ${ROOT}/usr/$(get_libdir)/xorg/modules ]]; then |
41 |
+ rm -rf "${ROOT}"/usr/$(get_libdir)/xorg/modules |
42 |
fi |
43 |
fi |
44 |
} |
45 |
@@ -440,7 +440,7 @@ |
46 |
|
47 |
# Check whether it's a valid kdrive server before we waste time |
48 |
# on the rest of this |
49 |
- if ! grep -q -o "\b${real_card}\b" ${S}/hw/kdrive/Makefile.am; then |
50 |
+ if ! grep -q -o "\b${real_card}\b" "${S}"/hw/kdrive/Makefile.am; then |
51 |
continue |
52 |
fi |
53 |
|
54 |
@@ -478,7 +478,7 @@ |
55 |
ebegin " ${real_card}" |
56 |
sed -i \ |
57 |
-e "s:\b${real_card}\b::g" \ |
58 |
- ${S}/hw/kdrive/Makefile.am \ |
59 |
+ "${S}"/hw/kdrive/Makefile.am \ |
60 |
|| die "sed of ${real_card} failed" |
61 |
eend |
62 |
fi |
63 |
@@ -490,7 +490,7 @@ |
64 |
if ! use video_cards_siliconmotion && ! use video_cards_via; then |
65 |
sed -i \ |
66 |
-e "s:^\(VESA_SUBDIRS.*\)\\\:\1:g" \ |
67 |
- ${S}/hw/kdrive/Makefile.am |
68 |
+ "${S}"/hw/kdrive/Makefile.am |
69 |
fi |
70 |
} |
71 |
|
72 |
@@ -499,9 +499,9 @@ |
73 |
ebegin "Moving GL files for dynamic switching" |
74 |
dodir /usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions |
75 |
local x="" |
76 |
- for x in ${D}/usr/$(get_libdir)/xorg/modules/extensions/libglx*; do |
77 |
+ for x in "${D}"/usr/$(get_libdir)/xorg/modules/extensions/libglx*; do |
78 |
if [ -f ${x} -o -L ${x} ]; then |
79 |
- mv -f ${x} ${D}/usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions |
80 |
+ mv -f ${x} "${D}"/usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions |
81 |
fi |
82 |
done |
83 |
eend 0 |
84 |
@@ -511,10 +511,10 @@ |
85 |
use xprint && xprint_src_install |
86 |
|
87 |
if ! use xorg; then |
88 |
- rm ${D}/usr/share/man/man1/Xserver.1x \ |
89 |
- ${D}/usr/$(get_libdir)/xserver/SecurityPolicy \ |
90 |
- ${D}/usr/$(get_libdir)/pkgconfig/xorg-server.pc \ |
91 |
- ${D}/usr/share/man/man1/Xserver.1x |
92 |
+ rm "${D}"/usr/share/man/man1/Xserver.1x \ |
93 |
+ "${D}"/usr/$(get_libdir)/xserver/SecurityPolicy \ |
94 |
+ "${D}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \ |
95 |
+ "${D}"/usr/share/man/man1/Xserver.1x |
96 |
fi |
97 |
} |
98 |
|
99 |
@@ -530,21 +530,21 @@ |
100 |
xprint_src_install() { |
101 |
# RH-style init script, we provide a wrapper |
102 |
exeinto /usr/$(get_libdir)/misc |
103 |
- doexe ${S}/hw/xprint/etc/init.d/xprint |
104 |
+ doexe "${S}"/hw/xprint/etc/init.d/xprint |
105 |
# Install the wrapper |
106 |
- newinitd ${FILESDIR}/xprint.init xprint |
107 |
+ newinitd "${FILESDIR}"/xprint.init xprint |
108 |
# Install profile scripts |
109 |
insinto /etc/profile.d |
110 |
- doins ${S}/hw/xprint/etc/profile.d/xprint* |
111 |
+ doins "${S}"/hw/xprint/etc/profile.d/xprint* |
112 |
insinto /etc/X11/xinit/xinitrc.d |
113 |
- doins ${S}/hw/xprint/etc/Xsession.d/92xprint-xpserverlist |
114 |
+ doins "${S}"/hw/xprint/etc/Xsession.d/92xprint-xpserverlist |
115 |
# Patch profile scripts |
116 |
sed -e "s:/bin/sh.*get_xpserverlist:/usr/$(get_libdir)/misc/xprint \ |
117 |
- get_xpserverlist:g" -i ${D}/etc/profile.d/xprint* \ |
118 |
- ${D}/etc/X11/xinit/xinitrc.d/92xprint-xpserverlist |
119 |
+ get_xpserverlist:g" -i "${D}"/etc/profile.d/xprint* \ |
120 |
+ "${D}"/etc/X11/xinit/xinitrc.d/92xprint-xpserverlist |
121 |
# Move profile scripts, we can't touch /etc/profile.d/ in Gentoo |
122 |
- dodoc ${D}/etc/profile.d/xprint* |
123 |
- rm -f ${D}/etc/profile.d/xprint* |
124 |
+ dodoc "${D}"/etc/profile.d/xprint* |
125 |
+ rm -f "${D}"/etc/profile.d/xprint* |
126 |
} |
127 |
|
128 |
ensure_a_server_is_building() { |
129 |
|
130 |
|
131 |
|
132 |
1.287 x11-base/xorg-server/ChangeLog |
133 |
|
134 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-base/xorg-server/ChangeLog?rev=1.287&view=markup |
135 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-base/xorg-server/ChangeLog?rev=1.287&content-type=text/plain |
136 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-base/xorg-server/ChangeLog?r1=1.286&r2=1.287 |
137 |
|
138 |
Index: ChangeLog |
139 |
=================================================================== |
140 |
RCS file: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v |
141 |
retrieving revision 1.286 |
142 |
retrieving revision 1.287 |
143 |
diff -u -r1.286 -r1.287 |
144 |
--- ChangeLog 2 Oct 2007 20:05:40 -0000 1.286 |
145 |
+++ ChangeLog 9 Oct 2007 07:22:49 -0000 1.287 |
146 |
@@ -1,6 +1,11 @@ |
147 |
# ChangeLog for x11-base/xorg-server |
148 |
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 |
149 |
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.286 2007/10/02 20:05:40 wolf31o2 Exp $ |
150 |
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.287 2007/10/09 07:22:49 dberkholz Exp $ |
151 |
+ |
152 |
+ 09 Oct 2007; Donnie Berkholz <dberkholz@g.o>; |
153 |
+ xorg-server-1.2.0-r3.ebuild, xorg-server-1.3.0.0.ebuild, |
154 |
+ xorg-server-1.3.0.0-r1.ebuild, xorg-server-1.4-r1.ebuild: |
155 |
+ Fix quoting issues caught by latest repoman. |
156 |
|
157 |
02 Oct 2007; Chris Gianelloni <wolf31o2@g.o> |
158 |
xorg-server-1.3.0.0-r1.ebuild: |
159 |
|
160 |
|
161 |
|
162 |
1.28 x11-base/xorg-server/xorg-server-1.3.0.0.ebuild |
163 |
|
164 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-base/xorg-server/xorg-server-1.3.0.0.ebuild?rev=1.28&view=markup |
165 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-base/xorg-server/xorg-server-1.3.0.0.ebuild?rev=1.28&content-type=text/plain |
166 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-base/xorg-server/xorg-server-1.3.0.0.ebuild?r1=1.27&r2=1.28 |
167 |
|
168 |
Index: xorg-server-1.3.0.0.ebuild |
169 |
=================================================================== |
170 |
RCS file: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.3.0.0.ebuild,v |
171 |
retrieving revision 1.27 |
172 |
retrieving revision 1.28 |
173 |
diff -u -r1.27 -r1.28 |
174 |
--- xorg-server-1.3.0.0.ebuild 28 Sep 2007 05:03:32 -0000 1.27 |
175 |
+++ xorg-server-1.3.0.0.ebuild 9 Oct 2007 07:22:49 -0000 1.28 |
176 |
@@ -1,6 +1,6 @@ |
177 |
# Copyright 1999-2007 Gentoo Foundation |
178 |
# Distributed under the terms of the GNU General Public License v2 |
179 |
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.3.0.0.ebuild,v 1.27 2007/09/28 05:03:32 kumba Exp $ |
180 |
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.3.0.0.ebuild,v 1.28 2007/10/09 07:22:49 dberkholz Exp $ |
181 |
|
182 |
# Must be before x-modular eclass is inherited |
183 |
SNAPSHOT="yes" |
184 |
@@ -385,8 +385,8 @@ |
185 |
pkg_postrm() { |
186 |
# Get rid of module dir to ensure opengl-update works properly |
187 |
if ! has_version x11-base/xorg-server; then |
188 |
- if [ -e ${ROOT}/usr/$(get_libdir)/xorg/modules ]; then |
189 |
- rm -rf ${ROOT}/usr/$(get_libdir)/xorg/modules |
190 |
+ if [[ -e ${ROOT}/usr/$(get_libdir)/xorg/modules ]]; then |
191 |
+ rm -rf "${ROOT}"/usr/$(get_libdir)/xorg/modules |
192 |
fi |
193 |
fi |
194 |
} |
195 |
@@ -415,7 +415,7 @@ |
196 |
|
197 |
# Check whether it's a valid kdrive server before we waste time |
198 |
# on the rest of this |
199 |
- if ! grep -q -o "\b${real_card}\b" ${S}/hw/kdrive/Makefile.am; then |
200 |
+ if ! grep -q -o "\b${real_card}\b" "${S}"/hw/kdrive/Makefile.am; then |
201 |
continue |
202 |
fi |
203 |
|
204 |
@@ -453,7 +453,7 @@ |
205 |
ebegin " ${real_card}" |
206 |
sed -i \ |
207 |
-e "s:\b${real_card}\b::g" \ |
208 |
- ${S}/hw/kdrive/Makefile.am \ |
209 |
+ "${S}"/hw/kdrive/Makefile.am \ |
210 |
|| die "sed of ${real_card} failed" |
211 |
eend |
212 |
fi |
213 |
@@ -465,7 +465,7 @@ |
214 |
if ! use video_cards_siliconmotion && ! use video_cards_via; then |
215 |
sed -i \ |
216 |
-e "s:^\(VESA_SUBDIRS.*\)\\\:\1:g" \ |
217 |
- ${S}/hw/kdrive/Makefile.am |
218 |
+ "${S}"/hw/kdrive/Makefile.am |
219 |
fi |
220 |
} |
221 |
|
222 |
@@ -474,9 +474,9 @@ |
223 |
ebegin "Moving GL files for dynamic switching" |
224 |
dodir /usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions |
225 |
local x="" |
226 |
- for x in ${D}/usr/$(get_libdir)/xorg/modules/extensions/libglx*; do |
227 |
+ for x in "${D}"/usr/$(get_libdir)/xorg/modules/extensions/libglx*; do |
228 |
if [ -f ${x} -o -L ${x} ]; then |
229 |
- mv -f ${x} ${D}/usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions |
230 |
+ mv -f ${x} "${D}"/usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions |
231 |
fi |
232 |
done |
233 |
eend 0 |
234 |
@@ -486,10 +486,10 @@ |
235 |
use xprint && xprint_src_install |
236 |
|
237 |
if ! use xorg; then |
238 |
- rm ${D}/usr/share/man/man1/Xserver.1x \ |
239 |
- ${D}/usr/$(get_libdir)/xserver/SecurityPolicy \ |
240 |
- ${D}/usr/$(get_libdir)/pkgconfig/xorg-server.pc \ |
241 |
- ${D}/usr/share/man/man1/Xserver.1x |
242 |
+ rm "${D}"/usr/share/man/man1/Xserver.1x \ |
243 |
+ "${D}"/usr/$(get_libdir)/xserver/SecurityPolicy \ |
244 |
+ "${D}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \ |
245 |
+ "${D}"/usr/share/man/man1/Xserver.1x |
246 |
fi |
247 |
} |
248 |
|
249 |
@@ -505,21 +505,21 @@ |
250 |
xprint_src_install() { |
251 |
# RH-style init script, we provide a wrapper |
252 |
exeinto /usr/$(get_libdir)/misc |
253 |
- doexe ${S}/hw/xprint/etc/init.d/xprint |
254 |
+ doexe "${S}"/hw/xprint/etc/init.d/xprint |
255 |
# Install the wrapper |
256 |
- newinitd ${FILESDIR}/xprint.init xprint |
257 |
+ newinitd "${FILESDIR}"/xprint.init xprint |
258 |
# Install profile scripts |
259 |
insinto /etc/profile.d |
260 |
- doins ${S}/hw/xprint/etc/profile.d/xprint* |
261 |
+ doins "${S}"/hw/xprint/etc/profile.d/xprint* |
262 |
insinto /etc/X11/xinit/xinitrc.d |
263 |
- doins ${S}/hw/xprint/etc/Xsession.d/92xprint-xpserverlist |
264 |
+ doins "${S}"/hw/xprint/etc/Xsession.d/92xprint-xpserverlist |
265 |
# Patch profile scripts |
266 |
sed -e "s:/bin/sh.*get_xpserverlist:/usr/$(get_libdir)/misc/xprint \ |
267 |
- get_xpserverlist:g" -i ${D}/etc/profile.d/xprint* \ |
268 |
- ${D}/etc/X11/xinit/xinitrc.d/92xprint-xpserverlist |
269 |
+ get_xpserverlist:g" -i "${D}"/etc/profile.d/xprint* \ |
270 |
+ "${D}"/etc/X11/xinit/xinitrc.d/92xprint-xpserverlist |
271 |
# Move profile scripts, we can't touch /etc/profile.d/ in Gentoo |
272 |
- dodoc ${D}/etc/profile.d/xprint* |
273 |
- rm -f ${D}/etc/profile.d/xprint* |
274 |
+ dodoc "${D}"/etc/profile.d/xprint* |
275 |
+ rm -f "${D}"/etc/profile.d/xprint* |
276 |
} |
277 |
|
278 |
ensure_a_server_is_building() { |
279 |
|
280 |
|
281 |
|
282 |
1.15 x11-base/xorg-server/xorg-server-1.2.0-r3.ebuild |
283 |
|
284 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-base/xorg-server/xorg-server-1.2.0-r3.ebuild?rev=1.15&view=markup |
285 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-base/xorg-server/xorg-server-1.2.0-r3.ebuild?rev=1.15&content-type=text/plain |
286 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-base/xorg-server/xorg-server-1.2.0-r3.ebuild?r1=1.14&r2=1.15 |
287 |
|
288 |
Index: xorg-server-1.2.0-r3.ebuild |
289 |
=================================================================== |
290 |
RCS file: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.2.0-r3.ebuild,v |
291 |
retrieving revision 1.14 |
292 |
retrieving revision 1.15 |
293 |
diff -u -r1.14 -r1.15 |
294 |
--- xorg-server-1.2.0-r3.ebuild 9 Sep 2007 19:49:42 -0000 1.14 |
295 |
+++ xorg-server-1.2.0-r3.ebuild 9 Oct 2007 07:22:49 -0000 1.15 |
296 |
@@ -1,6 +1,6 @@ |
297 |
# Copyright 1999-2007 Gentoo Foundation |
298 |
# Distributed under the terms of the GNU General Public License v2 |
299 |
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.2.0-r3.ebuild,v 1.14 2007/09/09 19:49:42 dberkholz Exp $ |
300 |
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.2.0-r3.ebuild,v 1.15 2007/10/09 07:22:49 dberkholz Exp $ |
301 |
|
302 |
# Must be before x-modular eclass is inherited |
303 |
#SNAPSHOT="yes" |
304 |
@@ -378,8 +378,8 @@ |
305 |
pkg_postrm() { |
306 |
# Get rid of module dir to ensure opengl-update works properly |
307 |
if ! has_version x11-base/xorg-server; then |
308 |
- if [ -e ${ROOT}/usr/$(get_libdir)/xorg/modules ]; then |
309 |
- rm -rf ${ROOT}/usr/$(get_libdir)/xorg/modules |
310 |
+ if [[ -e ${ROOT}/usr/$(get_libdir)/xorg/modules ]]; then |
311 |
+ rm -rf "${ROOT}"/usr/$(get_libdir)/xorg/modules |
312 |
fi |
313 |
fi |
314 |
} |
315 |
@@ -408,7 +408,7 @@ |
316 |
|
317 |
# Check whether it's a valid kdrive server before we waste time |
318 |
# on the rest of this |
319 |
- if ! grep -q -o "\b${real_card}\b" ${S}/hw/kdrive/Makefile.am; then |
320 |
+ if ! grep -q -o "\b${real_card}\b" "${S}"/hw/kdrive/Makefile.am; then |
321 |
continue |
322 |
fi |
323 |
|
324 |
@@ -446,7 +446,7 @@ |
325 |
ebegin " ${real_card}" |
326 |
sed -i \ |
327 |
-e "s:\b${real_card}\b::g" \ |
328 |
- ${S}/hw/kdrive/Makefile.am \ |
329 |
+ "${S}"/hw/kdrive/Makefile.am \ |
330 |
|| die "sed of ${real_card} failed" |
331 |
eend |
332 |
fi |
333 |
@@ -458,7 +458,7 @@ |
334 |
if ! use video_cards_siliconmotion && ! use video_cards_via; then |
335 |
sed -i \ |
336 |
-e "s:^\(VESA_SUBDIRS.*\)\\\:\1:g" \ |
337 |
- ${S}/hw/kdrive/Makefile.am |
338 |
+ "${S}"/hw/kdrive/Makefile.am |
339 |
fi |
340 |
} |
341 |
|
342 |
@@ -467,9 +467,9 @@ |
343 |
ebegin "Moving GL files for dynamic switching" |
344 |
dodir /usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions |
345 |
local x="" |
346 |
- for x in ${D}/usr/$(get_libdir)/xorg/modules/extensions/libglx*; do |
347 |
+ for x in "${D}"/usr/$(get_libdir)/xorg/modules/extensions/libglx*; do |
348 |
if [ -f ${x} -o -L ${x} ]; then |
349 |
- mv -f ${x} ${D}/usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions |
350 |
+ mv -f ${x} "${D}"/usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions |
351 |
fi |
352 |
done |
353 |
eend 0 |
354 |
@@ -479,10 +479,10 @@ |
355 |
use xprint && xprint_src_install |
356 |
|
357 |
if ! use xorg; then |
358 |
- rm ${D}/usr/share/man/man1/Xserver.1x \ |
359 |
- ${D}/usr/$(get_libdir)/xserver/SecurityPolicy \ |
360 |
- ${D}/usr/$(get_libdir)/pkgconfig/xorg-server.pc \ |
361 |
- ${D}/usr/share/man/man1/Xserver.1x |
362 |
+ rm "${D}"/usr/share/man/man1/Xserver.1x \ |
363 |
+ "${D}"/usr/$(get_libdir)/xserver/SecurityPolicy \ |
364 |
+ "${D}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \ |
365 |
+ "${D}"/usr/share/man/man1/Xserver.1x |
366 |
fi |
367 |
} |
368 |
|
369 |
@@ -498,21 +498,21 @@ |
370 |
xprint_src_install() { |
371 |
# RH-style init script, we provide a wrapper |
372 |
exeinto /usr/$(get_libdir)/misc |
373 |
- doexe ${S}/hw/xprint/etc/init.d/xprint |
374 |
+ doexe "${S}"/hw/xprint/etc/init.d/xprint |
375 |
# Install the wrapper |
376 |
- newinitd ${FILESDIR}/xprint.init xprint |
377 |
+ newinitd "${FILESDIR}"/xprint.init xprint |
378 |
# Install profile scripts |
379 |
insinto /etc/profile.d |
380 |
- doins ${S}/hw/xprint/etc/profile.d/xprint* |
381 |
+ doins "${S}"/hw/xprint/etc/profile.d/xprint* |
382 |
insinto /etc/X11/xinit/xinitrc.d |
383 |
- doins ${S}/hw/xprint/etc/Xsession.d/92xprint-xpserverlist |
384 |
+ doins "${S}"/hw/xprint/etc/Xsession.d/92xprint-xpserverlist |
385 |
# Patch profile scripts |
386 |
sed -e "s:/bin/sh.*get_xpserverlist:/usr/$(get_libdir)/misc/xprint \ |
387 |
- get_xpserverlist:g" -i ${D}/etc/profile.d/xprint* \ |
388 |
- ${D}/etc/X11/xinit/xinitrc.d/92xprint-xpserverlist |
389 |
+ get_xpserverlist:g" -i "${D}"/etc/profile.d/xprint* \ |
390 |
+ "${D}"/etc/X11/xinit/xinitrc.d/92xprint-xpserverlist |
391 |
# Move profile scripts, we can't touch /etc/profile.d/ in Gentoo |
392 |
- dodoc ${D}/etc/profile.d/xprint* |
393 |
- rm -f ${D}/etc/profile.d/xprint* |
394 |
+ dodoc "${D}"/etc/profile.d/xprint* |
395 |
+ rm -f "${D}"/etc/profile.d/xprint* |
396 |
} |
397 |
|
398 |
ensure_a_server_is_building() { |
399 |
|
400 |
|
401 |
|
402 |
1.9 x11-base/xorg-server/xorg-server-1.3.0.0-r1.ebuild |
403 |
|
404 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-base/xorg-server/xorg-server-1.3.0.0-r1.ebuild?rev=1.9&view=markup |
405 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-base/xorg-server/xorg-server-1.3.0.0-r1.ebuild?rev=1.9&content-type=text/plain |
406 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-base/xorg-server/xorg-server-1.3.0.0-r1.ebuild?r1=1.8&r2=1.9 |
407 |
|
408 |
Index: xorg-server-1.3.0.0-r1.ebuild |
409 |
=================================================================== |
410 |
RCS file: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.3.0.0-r1.ebuild,v |
411 |
retrieving revision 1.8 |
412 |
retrieving revision 1.9 |
413 |
diff -u -r1.8 -r1.9 |
414 |
--- xorg-server-1.3.0.0-r1.ebuild 2 Oct 2007 20:05:40 -0000 1.8 |
415 |
+++ xorg-server-1.3.0.0-r1.ebuild 9 Oct 2007 07:22:49 -0000 1.9 |
416 |
@@ -1,6 +1,6 @@ |
417 |
# Copyright 1999-2007 Gentoo Foundation |
418 |
# Distributed under the terms of the GNU General Public License v2 |
419 |
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.3.0.0-r1.ebuild,v 1.8 2007/10/02 20:05:40 wolf31o2 Exp $ |
420 |
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.3.0.0-r1.ebuild,v 1.9 2007/10/09 07:22:49 dberkholz Exp $ |
421 |
|
422 |
# Must be before x-modular eclass is inherited |
423 |
SNAPSHOT="yes" |
424 |
@@ -386,8 +386,8 @@ |
425 |
pkg_postrm() { |
426 |
# Get rid of module dir to ensure opengl-update works properly |
427 |
if ! has_version x11-base/xorg-server; then |
428 |
- if [ -e ${ROOT}/usr/$(get_libdir)/xorg/modules ]; then |
429 |
- rm -rf ${ROOT}/usr/$(get_libdir)/xorg/modules |
430 |
+ if [[ -e ${ROOT}/usr/$(get_libdir)/xorg/modules ]]; then |
431 |
+ rm -rf "${ROOT}"/usr/$(get_libdir)/xorg/modules |
432 |
fi |
433 |
fi |
434 |
} |
435 |
@@ -416,7 +416,7 @@ |
436 |
|
437 |
# Check whether it's a valid kdrive server before we waste time |
438 |
# on the rest of this |
439 |
- if ! grep -q -o "\b${real_card}\b" ${S}/hw/kdrive/Makefile.am; then |
440 |
+ if ! grep -q -o "\b${real_card}\b" "${S}"/hw/kdrive/Makefile.am; then |
441 |
continue |
442 |
fi |
443 |
|
444 |
@@ -454,7 +454,7 @@ |
445 |
ebegin " ${real_card}" |
446 |
sed -i \ |
447 |
-e "s:\b${real_card}\b::g" \ |
448 |
- ${S}/hw/kdrive/Makefile.am \ |
449 |
+ "${S}"/hw/kdrive/Makefile.am \ |
450 |
|| die "sed of ${real_card} failed" |
451 |
eend |
452 |
fi |
453 |
@@ -466,7 +466,7 @@ |
454 |
if ! use video_cards_siliconmotion && ! use video_cards_via; then |
455 |
sed -i \ |
456 |
-e "s:^\(VESA_SUBDIRS.*\)\\\:\1:g" \ |
457 |
- ${S}/hw/kdrive/Makefile.am |
458 |
+ "${S}"/hw/kdrive/Makefile.am |
459 |
fi |
460 |
} |
461 |
|
462 |
@@ -475,9 +475,9 @@ |
463 |
ebegin "Moving GL files for dynamic switching" |
464 |
dodir /usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions |
465 |
local x="" |
466 |
- for x in ${D}/usr/$(get_libdir)/xorg/modules/extensions/libglx*; do |
467 |
+ for x in "${D}"/usr/$(get_libdir)/xorg/modules/extensions/libglx*; do |
468 |
if [ -f ${x} -o -L ${x} ]; then |
469 |
- mv -f ${x} ${D}/usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions |
470 |
+ mv -f ${x} "${D}"/usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions |
471 |
fi |
472 |
done |
473 |
eend 0 |
474 |
@@ -487,10 +487,10 @@ |
475 |
use xprint && xprint_src_install |
476 |
|
477 |
if ! use xorg; then |
478 |
- rm ${D}/usr/share/man/man1/Xserver.1x \ |
479 |
- ${D}/usr/$(get_libdir)/xserver/SecurityPolicy \ |
480 |
- ${D}/usr/$(get_libdir)/pkgconfig/xorg-server.pc \ |
481 |
- ${D}/usr/share/man/man1/Xserver.1x |
482 |
+ rm "${D}"/usr/share/man/man1/Xserver.1x \ |
483 |
+ "${D}"/usr/$(get_libdir)/xserver/SecurityPolicy \ |
484 |
+ "${D}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \ |
485 |
+ "${D}"/usr/share/man/man1/Xserver.1x |
486 |
fi |
487 |
} |
488 |
|
489 |
@@ -506,21 +506,21 @@ |
490 |
xprint_src_install() { |
491 |
# RH-style init script, we provide a wrapper |
492 |
exeinto /usr/$(get_libdir)/misc |
493 |
- doexe ${S}/hw/xprint/etc/init.d/xprint |
494 |
+ doexe "${S}"/hw/xprint/etc/init.d/xprint |
495 |
# Install the wrapper |
496 |
- newinitd ${FILESDIR}/xprint.init xprint |
497 |
+ newinitd "${FILESDIR}"/xprint.init xprint |
498 |
# Install profile scripts |
499 |
insinto /etc/profile.d |
500 |
- doins ${S}/hw/xprint/etc/profile.d/xprint* |
501 |
+ doins "${S}"/hw/xprint/etc/profile.d/xprint* |
502 |
insinto /etc/X11/xinit/xinitrc.d |
503 |
- doins ${S}/hw/xprint/etc/Xsession.d/92xprint-xpserverlist |
504 |
+ doins "${S}"/hw/xprint/etc/Xsession.d/92xprint-xpserverlist |
505 |
# Patch profile scripts |
506 |
sed -e "s:/bin/sh.*get_xpserverlist:/usr/$(get_libdir)/misc/xprint \ |
507 |
- get_xpserverlist:g" -i ${D}/etc/profile.d/xprint* \ |
508 |
- ${D}/etc/X11/xinit/xinitrc.d/92xprint-xpserverlist |
509 |
+ get_xpserverlist:g" -i "${D}"/etc/profile.d/xprint* \ |
510 |
+ "${D}"/etc/X11/xinit/xinitrc.d/92xprint-xpserverlist |
511 |
# Move profile scripts, we can't touch /etc/profile.d/ in Gentoo |
512 |
- dodoc ${D}/etc/profile.d/xprint* |
513 |
- rm -f ${D}/etc/profile.d/xprint* |
514 |
+ dodoc "${D}"/etc/profile.d/xprint* |
515 |
+ rm -f "${D}"/etc/profile.d/xprint* |
516 |
} |
517 |
|
518 |
ensure_a_server_is_building() { |
519 |
|
520 |
|
521 |
|
522 |
-- |
523 |
gentoo-commits@g.o mailing list |