1 |
dberkholz 07/10/01 10:33:28 |
2 |
|
3 |
Modified: ChangeLog xorg-server-1.4-r2.ebuild |
4 |
Log: |
5 |
Fix variable quoting caught by my repoman patch. |
6 |
(Portage version: 2.1.3.9) |
7 |
|
8 |
Revision Changes Path |
9 |
1.282 x11-base/xorg-server/ChangeLog |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-base/xorg-server/ChangeLog?rev=1.282&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-base/xorg-server/ChangeLog?rev=1.282&content-type=text/plain |
13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-base/xorg-server/ChangeLog?r1=1.281&r2=1.282 |
14 |
|
15 |
Index: ChangeLog |
16 |
=================================================================== |
17 |
RCS file: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v |
18 |
retrieving revision 1.281 |
19 |
retrieving revision 1.282 |
20 |
diff -u -r1.281 -r1.282 |
21 |
--- ChangeLog 1 Oct 2007 10:31:56 -0000 1.281 |
22 |
+++ ChangeLog 1 Oct 2007 10:33:27 -0000 1.282 |
23 |
@@ -1,6 +1,10 @@ |
24 |
# ChangeLog for x11-base/xorg-server |
25 |
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 |
26 |
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.281 2007/10/01 10:31:56 dberkholz Exp $ |
27 |
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.282 2007/10/01 10:33:27 dberkholz Exp $ |
28 |
+ |
29 |
+ 01 Oct 2007; Donnie Berkholz <dberkholz@g.o>; |
30 |
+ xorg-server-1.4-r2.ebuild: |
31 |
+ Fix variable quoting caught by my repoman patch. |
32 |
|
33 |
*xorg-server-1.4-r2 (01 Oct 2007) |
34 |
|
35 |
|
36 |
|
37 |
|
38 |
1.2 x11-base/xorg-server/xorg-server-1.4-r2.ebuild |
39 |
|
40 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-base/xorg-server/xorg-server-1.4-r2.ebuild?rev=1.2&view=markup |
41 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-base/xorg-server/xorg-server-1.4-r2.ebuild?rev=1.2&content-type=text/plain |
42 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-base/xorg-server/xorg-server-1.4-r2.ebuild?r1=1.1&r2=1.2 |
43 |
|
44 |
Index: xorg-server-1.4-r2.ebuild |
45 |
=================================================================== |
46 |
RCS file: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.4-r2.ebuild,v |
47 |
retrieving revision 1.1 |
48 |
retrieving revision 1.2 |
49 |
diff -u -r1.1 -r1.2 |
50 |
--- xorg-server-1.4-r2.ebuild 1 Oct 2007 10:31:56 -0000 1.1 |
51 |
+++ xorg-server-1.4-r2.ebuild 1 Oct 2007 10:33:27 -0000 1.2 |
52 |
@@ -1,6 +1,6 @@ |
53 |
# Copyright 1999-2007 Gentoo Foundation |
54 |
# Distributed under the terms of the GNU General Public License v2 |
55 |
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.4-r2.ebuild,v 1.1 2007/10/01 10:31:56 dberkholz Exp $ |
56 |
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.4-r2.ebuild,v 1.2 2007/10/01 10:33:27 dberkholz Exp $ |
57 |
|
58 |
# Must be before x-modular eclass is inherited |
59 |
#SNAPSHOT="yes" |
60 |
@@ -412,8 +412,8 @@ |
61 |
pkg_postrm() { |
62 |
# Get rid of module dir to ensure opengl-update works properly |
63 |
if ! has_version x11-base/xorg-server; then |
64 |
- if [ -e ${ROOT}/usr/$(get_libdir)/xorg/modules ]; then |
65 |
- rm -rf ${ROOT}/usr/$(get_libdir)/xorg/modules |
66 |
+ if [[ -e ${ROOT}/usr/$(get_libdir)/xorg/modules ]]; then |
67 |
+ rm -rf "${ROOT}"/usr/$(get_libdir)/xorg/modules |
68 |
fi |
69 |
fi |
70 |
} |
71 |
@@ -442,7 +442,7 @@ |
72 |
|
73 |
# Check whether it's a valid kdrive server before we waste time |
74 |
# on the rest of this |
75 |
- if ! grep -q -o "\b${real_card}\b" ${S}/hw/kdrive/Makefile.am; then |
76 |
+ if ! grep -q -o "\b${real_card}\b" "${S}"/hw/kdrive/Makefile.am; then |
77 |
continue |
78 |
fi |
79 |
|
80 |
@@ -480,7 +480,7 @@ |
81 |
ebegin " ${real_card}" |
82 |
sed -i \ |
83 |
-e "s:\b${real_card}\b::g" \ |
84 |
- ${S}/hw/kdrive/Makefile.am \ |
85 |
+ "${S}"/hw/kdrive/Makefile.am \ |
86 |
|| die "sed of ${real_card} failed" |
87 |
eend |
88 |
fi |
89 |
@@ -492,7 +492,7 @@ |
90 |
if ! use video_cards_siliconmotion && ! use video_cards_via; then |
91 |
sed -i \ |
92 |
-e "s:^\(VESA_SUBDIRS.*\)\\\:\1:g" \ |
93 |
- ${S}/hw/kdrive/Makefile.am |
94 |
+ "${S}"/hw/kdrive/Makefile.am |
95 |
fi |
96 |
} |
97 |
|
98 |
@@ -501,9 +501,9 @@ |
99 |
ebegin "Moving GL files for dynamic switching" |
100 |
dodir /usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions |
101 |
local x="" |
102 |
- for x in ${D}/usr/$(get_libdir)/xorg/modules/extensions/libglx*; do |
103 |
+ for x in "${D}"/usr/$(get_libdir)/xorg/modules/extensions/libglx*; do |
104 |
if [ -f ${x} -o -L ${x} ]; then |
105 |
- mv -f ${x} ${D}/usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions |
106 |
+ mv -f ${x} "${D}"/usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions |
107 |
fi |
108 |
done |
109 |
eend 0 |
110 |
@@ -513,10 +513,10 @@ |
111 |
use xprint && xprint_src_install |
112 |
|
113 |
if ! use xorg; then |
114 |
- rm ${D}/usr/share/man/man1/Xserver.1x \ |
115 |
- ${D}/usr/$(get_libdir)/xserver/SecurityPolicy \ |
116 |
- ${D}/usr/$(get_libdir)/pkgconfig/xorg-server.pc \ |
117 |
- ${D}/usr/share/man/man1/Xserver.1x |
118 |
+ rm "${D}"/usr/share/man/man1/Xserver.1x \ |
119 |
+ "${D}"/usr/$(get_libdir)/xserver/SecurityPolicy \ |
120 |
+ "${D}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \ |
121 |
+ "${D}"/usr/share/man/man1/Xserver.1x |
122 |
fi |
123 |
} |
124 |
|
125 |
@@ -532,21 +532,21 @@ |
126 |
xprint_src_install() { |
127 |
# RH-style init script, we provide a wrapper |
128 |
exeinto /usr/$(get_libdir)/misc |
129 |
- doexe ${S}/hw/xprint/etc/init.d/xprint |
130 |
+ doexe "${S}"/hw/xprint/etc/init.d/xprint |
131 |
# Install the wrapper |
132 |
- newinitd ${FILESDIR}/xprint.init xprint |
133 |
+ newinitd "${FILESDIR}"/xprint.init xprint |
134 |
# Install profile scripts |
135 |
insinto /etc/profile.d |
136 |
- doins ${S}/hw/xprint/etc/profile.d/xprint* |
137 |
+ doins "${S}"/hw/xprint/etc/profile.d/xprint* |
138 |
exeinto /etc/X11/xinit/xinitrc.d |
139 |
- doexe ${S}/hw/xprint/etc/Xsession.d/92xprint-xpserverlist |
140 |
+ doexe "${S}"/hw/xprint/etc/Xsession.d/92xprint-xpserverlist |
141 |
# Patch profile scripts |
142 |
sed -e "s:/etc/init.*get_xpserverlist:/usr/$(get_libdir)/misc/xprint \ |
143 |
- get_xpserverlist:g" -i ${D}/etc/profile.d/xprint* \ |
144 |
- ${D}/etc/X11/xinit/xinitrc.d/92xprint-xpserverlist |
145 |
+ get_xpserverlist:g" -i "${D}"/etc/profile.d/xprint* \ |
146 |
+ "${D}"/etc/X11/xinit/xinitrc.d/92xprint-xpserverlist |
147 |
# Move profile scripts, we can't touch /etc/profile.d/ in Gentoo |
148 |
- dodoc ${D}/etc/profile.d/xprint* |
149 |
- rm -f ${D}/etc/profile.d/xprint* |
150 |
+ dodoc "${D}"/etc/profile.d/xprint* |
151 |
+ rm -f "${D}"/etc/profile.d/xprint* |
152 |
} |
153 |
|
154 |
ensure_a_server_is_building() { |
155 |
|
156 |
|
157 |
|
158 |
-- |
159 |
gentoo-commits@g.o mailing list |