Gentoo Archives: gentoo-commits

From: "Jeffrey Gardner (je_fro)" <je_fro@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sci-misc/qcad: qcad-2.0.4.0-r3.ebuild ChangeLog qcad-2.0.4.0-r5.ebuild qcad-2.0.4.0-r1.ebuild qcad-2.0.4.0-r2.ebuild qcad-2.0.4.0-r4.ebuild
Date: Mon, 31 Dec 2007 19:25:03
Message-Id: E1J9QFs-0008R6-3D@stork.gentoo.org
1 je_fro 07/12/31 19:24:56
2
3 Modified: qcad-2.0.4.0-r3.ebuild ChangeLog
4 qcad-2.0.4.0-r5.ebuild qcad-2.0.4.0-r1.ebuild
5 qcad-2.0.4.0-r2.ebuild qcad-2.0.4.0-r4.ebuild
6 Log:
7 Fix tons of quoting errors
8 (Portage version: 2.1.4_rc12)
9
10 Revision Changes Path
11 1.12 sci-misc/qcad/qcad-2.0.4.0-r3.ebuild
12
13 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-misc/qcad/qcad-2.0.4.0-r3.ebuild?rev=1.12&view=markup
14 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-misc/qcad/qcad-2.0.4.0-r3.ebuild?rev=1.12&content-type=text/plain
15 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-misc/qcad/qcad-2.0.4.0-r3.ebuild?r1=1.11&r2=1.12
16
17 Index: qcad-2.0.4.0-r3.ebuild
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/sci-misc/qcad/qcad-2.0.4.0-r3.ebuild,v
20 retrieving revision 1.11
21 retrieving revision 1.12
22 diff -u -r1.11 -r1.12
23 --- qcad-2.0.4.0-r3.ebuild 10 Aug 2007 19:43:38 -0000 1.11
24 +++ qcad-2.0.4.0-r3.ebuild 31 Dec 2007 19:24:55 -0000 1.12
25 @@ -1,6 +1,6 @@
26 # Copyright 1999-2007 Gentoo Foundation
27 # Distributed under the terms of the GNU General Public License v2
28 -# $Header: /var/cvsroot/gentoo-x86/sci-misc/qcad/qcad-2.0.4.0-r3.ebuild,v 1.11 2007/08/10 19:43:38 je_fro Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/sci-misc/qcad/qcad-2.0.4.0-r3.ebuild,v 1.12 2007/12/31 19:24:55 je_fro Exp $
30
31 inherit kde-functions eutils
32
33 @@ -24,8 +24,8 @@
34 src_unpack() {
35 unpack ${A}
36 # Bug 112864 - fix dir unpack bug
37 - touch ${WORKDIR}
38 - cd ${S}
39 + touch "${WORKDIR}"
40 + cd "${S}"
41 echo >> defs.pro "DEFINES += _REENTRANT QT_THREAD_SUPPORT"
42 echo >> defs.pro "CONFIG += thread release"
43 echo >> defs.pro "QMAKE_CFLAGS_RELEASE += ${CFLAGS}"
44 @@ -34,15 +34,15 @@
45 sed -i -e 's~qmake~${QTDIR}/bin/qmake~g' $file || \
46 die "unable to correct path to qmake in $file"
47 done
48 - epatch ${FILESDIR}/${MY_P}-gentoo.patch
49 - epatch ${FILESDIR}/manual.patch-r1
50 - epatch ${FILESDIR}/${MY_P}-intptr.patch
51 - cd ${S}/scripts
52 + epatch "${FILESDIR}"/${MY_P}-gentoo.patch
53 + epatch "${FILESDIR}"/manual.patch-r1
54 + epatch "${FILESDIR}"/${MY_P}-intptr.patch
55 + cd "${S}"/scripts
56 sed -i -e 's/^make/make ${MAKEOPTS}/' build_qcad.sh || \
57 die "unable to add MAKEOPTS"
58 sed -i -e 's/^\.\/configure/.\/configure --host=${CHOST}/' build_qcad.sh \
59 || die "unable to set CHOST"
60 - cd ${S}/qcad/src
61 + cd "${S}"/qcad/src
62 sed -i -e "s:FULLASSISTANTPATH:${QTDIR}/bin:" qc_applicationwindow.cpp \
63 || die "sed failed on assistant path"
64 sed -i -e "s:QCADDOCPATH:/usr/share/doc/${PF}:" \
65 @@ -57,14 +57,14 @@
66 # this is a fake homedir that is writeable under the sandbox, so that the build process
67 # can do anything it wants with it.
68 REALHOME="$HOME"
69 - mkdir -p $T/fakehome/.kde
70 - mkdir -p $T/fakehome/.qt
71 + mkdir -p "${T}"/fakehome/.kde
72 + mkdir -p "${T}"/fakehome/.qt
73 export HOME="$T/fakehome"
74 # things that should access the real homedir
75 [ -d "$REALHOME/.ccache" ] && ln -sf "$REALHOME/.ccache" "$HOME/"
76 cd scripts
77 sh build_qcad.sh || die "build failed"
78 - if ! test -f ${S}/qcad/qcad; then
79 + if ! test -f "${S}"/qcad/qcad; then
80 die "no binary created, build failed"
81 fi
82 }
83 @@ -73,13 +73,13 @@
84 cd qcad
85 dobin qcad
86 dodir /usr/share/${P}
87 - cp -pPR patterns examples fonts qm ${D}/usr/share/${P}
88 + cp -pPR patterns examples fonts qm "${D}"/usr/share/${P}
89 cd ..
90 dodoc README
91 if use doc; then
92 insinto /usr/share/doc/${PF}/
93 - cd ${WORKDIR}
94 - cp -pPR qcaddoc.adp cad ${D}usr/share/doc/${PF}
95 + cd "${WORKDIR}"
96 + cp -pPR qcaddoc.adp cad "${D}"usr/share/doc/${PF}
97 fi
98 make_desktop_entry ${PN} ${PN} ${PN} Office
99 }
100
101
102
103 1.24 sci-misc/qcad/ChangeLog
104
105 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-misc/qcad/ChangeLog?rev=1.24&view=markup
106 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-misc/qcad/ChangeLog?rev=1.24&content-type=text/plain
107 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-misc/qcad/ChangeLog?r1=1.23&r2=1.24
108
109 Index: ChangeLog
110 ===================================================================
111 RCS file: /var/cvsroot/gentoo-x86/sci-misc/qcad/ChangeLog,v
112 retrieving revision 1.23
113 retrieving revision 1.24
114 diff -u -r1.23 -r1.24
115 --- ChangeLog 10 Aug 2007 19:43:38 -0000 1.23
116 +++ ChangeLog 31 Dec 2007 19:24:55 -0000 1.24
117 @@ -1,10 +1,18 @@
118 # ChangeLog for sci-misc/qcad
119 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
120 -# $Header: /var/cvsroot/gentoo-x86/sci-misc/qcad/ChangeLog,v 1.23 2007/08/10 19:43:38 je_fro Exp $
121 +# $Header: /var/cvsroot/gentoo-x86/sci-misc/qcad/ChangeLog,v 1.24 2007/12/31 19:24:55 je_fro Exp $
122 +
123 + 31 Dec 2007; Jeff Gardner <je_fro@g.o> qcad-2.0.4.0-r1.ebuild,
124 + qcad-2.0.4.0-r2.ebuild, qcad-2.0.4.0-r3.ebuild, qcad-2.0.4.0-r4.ebuild,
125 + qcad-2.0.4.0-r5.ebuild:
126 + Fix tons of quoting errors
127 +
128 + 31 Dec 2007; Jeff Gardner <je_fro@g.o> ChangeLog:
129 + Fix my email address
130
131 *qcad-2.0.4.0-r5 (10 Aug 2007)
132
133 - 10 Aug 2007; <jeff@g.o> +qcad-2.0.4.0-r5.ebuild:
134 + 10 Aug 2007; <je_fro@g.o> +qcad-2.0.4.0-r5.ebuild:
135 Fix make_desktop_entry.
136
137 15 Nov 2006; Markus Rothe <corsair@g.o> qcad-2.0.4.0-r3.ebuild:
138
139
140
141 1.2 sci-misc/qcad/qcad-2.0.4.0-r5.ebuild
142
143 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-misc/qcad/qcad-2.0.4.0-r5.ebuild?rev=1.2&view=markup
144 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-misc/qcad/qcad-2.0.4.0-r5.ebuild?rev=1.2&content-type=text/plain
145 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-misc/qcad/qcad-2.0.4.0-r5.ebuild?r1=1.1&r2=1.2
146
147 Index: qcad-2.0.4.0-r5.ebuild
148 ===================================================================
149 RCS file: /var/cvsroot/gentoo-x86/sci-misc/qcad/qcad-2.0.4.0-r5.ebuild,v
150 retrieving revision 1.1
151 retrieving revision 1.2
152 diff -u -r1.1 -r1.2
153 --- qcad-2.0.4.0-r5.ebuild 10 Aug 2007 19:43:38 -0000 1.1
154 +++ qcad-2.0.4.0-r5.ebuild 31 Dec 2007 19:24:55 -0000 1.2
155 @@ -1,6 +1,6 @@
156 # Copyright 1999-2007 Gentoo Foundation
157 # Distributed under the terms of the GNU General Public License v2
158 -# $Header: /var/cvsroot/gentoo-x86/sci-misc/qcad/qcad-2.0.4.0-r5.ebuild,v 1.1 2007/08/10 19:43:38 je_fro Exp $
159 +# $Header: /var/cvsroot/gentoo-x86/sci-misc/qcad/qcad-2.0.4.0-r5.ebuild,v 1.2 2007/12/31 19:24:55 je_fro Exp $
160
161 inherit kde-functions eutils
162
163 @@ -24,8 +24,8 @@
164 src_unpack() {
165 unpack ${A}
166 # Bug 112864 - fix dir unpack bug
167 - touch ${WORKDIR}
168 - cd ${S}
169 + touch "${WORKDIR}"
170 + cd "${S}"
171 echo >> defs.pro "DEFINES += _REENTRANT QT_THREAD_SUPPORT"
172 echo >> defs.pro "CONFIG += thread release"
173 echo >> defs.pro "QMAKE_CFLAGS_RELEASE += ${CFLAGS}"
174 @@ -34,15 +34,15 @@
175 sed -i -e 's~qmake~${QTDIR}/bin/qmake~g' $file || \
176 die "unable to correct path to qmake in $file"
177 done
178 - epatch ${FILESDIR}/${MY_P}-gentoo.patch
179 - epatch ${FILESDIR}/manual.patch-r1
180 - epatch ${FILESDIR}/${MY_P}-intptr.patch
181 - cd ${S}/scripts
182 + epatch "${FILESDIR}"/${MY_P}-gentoo.patch
183 + epatch "${FILESDIR}"/manual.patch-r1
184 + epatch "${FILESDIR}"/${MY_P}-intptr.patch
185 + cd "${S}"/scripts
186 sed -i -e 's/^make/make ${MAKEOPTS}/' build_qcad.sh || \
187 die "unable to add MAKEOPTS"
188 sed -i -e 's/^\.\/configure/.\/configure --host=${CHOST}/' build_qcad.sh \
189 || die "unable to set CHOST"
190 - cd ${S}/qcad/src
191 + cd "${S}"/qcad/src
192 sed -i -e "s:FULLASSISTANTPATH:${QTDIR}/bin:" qc_applicationwindow.cpp \
193 || die "sed failed on assistant path"
194 sed -i -e "s:QCADDOCPATH:/usr/share/doc/${PF}:" \
195 @@ -57,14 +57,14 @@
196 # this is a fake homedir that is writeable under the sandbox, so that the build process
197 # can do anything it wants with it.
198 REALHOME="$HOME"
199 - mkdir -p $T/fakehome/.kde
200 - mkdir -p $T/fakehome/.qt
201 + mkdir -p "${T}"/fakehome/.kde
202 + mkdir -p "${T}"/fakehome/.qt
203 export HOME="$T/fakehome"
204 # things that should access the real homedir
205 [ -d "$REALHOME/.ccache" ] && ln -sf "$REALHOME/.ccache" "$HOME/"
206 cd scripts
207 sh build_qcad.sh || die "build failed"
208 - if ! test -f ${S}/qcad/qcad; then
209 + if ! test -f "${S}"/qcad/qcad; then
210 die "no binary created, build failed"
211 fi
212 }
213 @@ -77,14 +77,14 @@
214 chmod ugo+rx qcad
215 dobin qcad
216 dodir /usr/share/${P}
217 - cp -pPR patterns examples fonts qm ${D}/usr/share/${P}
218 + cp -pPR patterns examples fonts qm "${D}"/usr/share/${P}
219 doicon src/xpm/${PN}.xpm
220 make_desktop_entry ${PN} QCad ${PN}.xpm Office
221 cd ..
222 dodoc README
223 if use doc; then
224 insinto /usr/share/doc/${PF}/
225 - cd ${WORKDIR}
226 - cp -pPR qcaddoc.adp cad ${D}usr/share/doc/${PF}
227 + cd "${WORKDIR}"
228 + cp -pPR qcaddoc.adp cad "${D}"usr/share/doc/${PF}
229 fi
230 }
231
232
233
234 1.11 sci-misc/qcad/qcad-2.0.4.0-r1.ebuild
235
236 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-misc/qcad/qcad-2.0.4.0-r1.ebuild?rev=1.11&view=markup
237 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-misc/qcad/qcad-2.0.4.0-r1.ebuild?rev=1.11&content-type=text/plain
238 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-misc/qcad/qcad-2.0.4.0-r1.ebuild?r1=1.10&r2=1.11
239
240 Index: qcad-2.0.4.0-r1.ebuild
241 ===================================================================
242 RCS file: /var/cvsroot/gentoo-x86/sci-misc/qcad/qcad-2.0.4.0-r1.ebuild,v
243 retrieving revision 1.10
244 retrieving revision 1.11
245 diff -u -r1.10 -r1.11
246 --- qcad-2.0.4.0-r1.ebuild 10 Aug 2007 19:43:38 -0000 1.10
247 +++ qcad-2.0.4.0-r1.ebuild 31 Dec 2007 19:24:55 -0000 1.11
248 @@ -1,6 +1,6 @@
249 # Copyright 1999-2007 Gentoo Foundation
250 # Distributed under the terms of the GNU General Public License v2
251 -# $Header: /var/cvsroot/gentoo-x86/sci-misc/qcad/qcad-2.0.4.0-r1.ebuild,v 1.10 2007/08/10 19:43:38 je_fro Exp $
252 +# $Header: /var/cvsroot/gentoo-x86/sci-misc/qcad/qcad-2.0.4.0-r1.ebuild,v 1.11 2007/12/31 19:24:55 je_fro Exp $
253
254 inherit kde-functions eutils
255
256 @@ -24,7 +24,7 @@
257 src_unpack() {
258 unpack ${A}
259 # mv doc ${S}/qcad/
260 - cd ${S}
261 + cd "${S}"
262 echo >> defs.pro "DEFINES += _REENTRANT QT_THREAD_SUPPORT"
263 echo >> defs.pro "CONFIG += thread release"
264 echo >> defs.pro "QMAKE_CFLAGS_RELEASE += ${CFLAGS}"
265 @@ -33,14 +33,14 @@
266 sed -i -e 's~qmake~${QTDIR}/bin/qmake~g' $file || \
267 die "unable to correct path to qmake in $file"
268 done
269 - epatch ${FILESDIR}/${MY_P}-gentoo.patch
270 - epatch ${FILESDIR}/manual.patch-r1
271 - cd ${S}/scripts
272 + epatch "${FILESDIR}"/${MY_P}-gentoo.patch
273 + epatch "${FILESDIR}"/manual.patch-r1
274 + cd "${S}"/scripts
275 sed -i -e 's/^make/make ${MAKEOPTS}/' build_qcad.sh || \
276 die "unable to add MAKEOPTS"
277 sed -i -e 's/^\.\/configure/.\/configure --host=${CHOST}/' build_qcad.sh \
278 || die "unable to set CHOST"
279 - cd ${S}/qcad/src
280 + cd "${S}"/qcad/src
281 sed -i -e "s:FULLASSISTANTPATH:${QTDIR}/bin:" qc_applicationwindow.cpp \
282 || die "sed failed on assistant path"
283 sed -i -e "s:QCADDOCPATH:/usr/share/doc/${PF}:" \
284 @@ -55,14 +55,14 @@
285 # this is a fake homedir that is writeable under the sandbox, so that the build process
286 # can do anything it wants with it.
287 REALHOME="$HOME"
288 - mkdir -p $T/fakehome/.kde
289 - mkdir -p $T/fakehome/.qt
290 + mkdir -p "$T"/fakehome/.kde
291 + mkdir -p "$T"/fakehome/.qt
292 export HOME="$T/fakehome"
293 # things that should access the real homedir
294 [ -d "$REALHOME/.ccache" ] && ln -sf "$REALHOME/.ccache" "$HOME/"
295 cd scripts
296 sh build_qcad.sh || die "build failed"
297 - if ! test -f ${S}/qcad/qcad; then
298 + if ! test -f "${S}"/qcad/qcad; then
299 die "no binary created, build failed"
300 fi
301 }
302 @@ -75,13 +75,13 @@
303 chmod ugo+rx qcad
304 dobin qcad
305 dodir /usr/share/${P}
306 - cp -pPR patterns examples fonts qm ${D}/usr/share/${P}
307 + cp -pPR patterns examples fonts qm "${D}"/usr/share/${P}
308 cd ..
309 dodoc README
310 if use doc; then
311 insinto /usr/share/doc/${PF}/
312 - cd ${WORKDIR}
313 - cp -pPR qcaddoc.adp cad ${D}usr/share/doc/${PF}
314 + cd "${WORKDIR}"
315 + cp -pPR qcaddoc.adp cad "${D}"usr/share/doc/${PF}
316 fi
317 make_desktop_entry ${PN} ${PN} ${PN} Office
318 }
319
320
321
322 1.6 sci-misc/qcad/qcad-2.0.4.0-r2.ebuild
323
324 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-misc/qcad/qcad-2.0.4.0-r2.ebuild?rev=1.6&view=markup
325 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-misc/qcad/qcad-2.0.4.0-r2.ebuild?rev=1.6&content-type=text/plain
326 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-misc/qcad/qcad-2.0.4.0-r2.ebuild?r1=1.5&r2=1.6
327
328 Index: qcad-2.0.4.0-r2.ebuild
329 ===================================================================
330 RCS file: /var/cvsroot/gentoo-x86/sci-misc/qcad/qcad-2.0.4.0-r2.ebuild,v
331 retrieving revision 1.5
332 retrieving revision 1.6
333 diff -u -r1.5 -r1.6
334 --- qcad-2.0.4.0-r2.ebuild 10 Aug 2007 19:43:38 -0000 1.5
335 +++ qcad-2.0.4.0-r2.ebuild 31 Dec 2007 19:24:55 -0000 1.6
336 @@ -1,6 +1,6 @@
337 # Copyright 1999-2007 Gentoo Foundation
338 # Distributed under the terms of the GNU General Public License v2
339 -# $Header: /var/cvsroot/gentoo-x86/sci-misc/qcad/qcad-2.0.4.0-r2.ebuild,v 1.5 2007/08/10 19:43:38 je_fro Exp $
340 +# $Header: /var/cvsroot/gentoo-x86/sci-misc/qcad/qcad-2.0.4.0-r2.ebuild,v 1.6 2007/12/31 19:24:55 je_fro Exp $
341
342 inherit kde-functions eutils
343
344 @@ -24,8 +24,8 @@
345 src_unpack() {
346 unpack ${A}
347 # Bug 112864 - fix dir unpack bug
348 - touch ${WORKDIR}
349 - cd ${S}
350 + touch "${WORKDIR}"
351 + cd "${S}"
352 echo >> defs.pro "DEFINES += _REENTRANT QT_THREAD_SUPPORT"
353 echo >> defs.pro "CONFIG += thread release"
354 echo >> defs.pro "QMAKE_CFLAGS_RELEASE += ${CFLAGS}"
355 @@ -34,14 +34,14 @@
356 sed -i -e 's~qmake~${QTDIR}/bin/qmake~g' $file || \
357 die "unable to correct path to qmake in $file"
358 done
359 - epatch ${FILESDIR}/${MY_P}-gentoo.patch
360 - epatch ${FILESDIR}/manual.patch-r1
361 - cd ${S}/scripts
362 + epatch "${FILESDIR}"/${MY_P}-gentoo.patch
363 + epatch "${FILESDIR}"/manual.patch-r1
364 + cd "${S}"/scripts
365 sed -i -e 's/^make/make ${MAKEOPTS}/' build_qcad.sh || \
366 die "unable to add MAKEOPTS"
367 sed -i -e 's/^\.\/configure/.\/configure --host=${CHOST}/' build_qcad.sh \
368 || die "unable to set CHOST"
369 - cd ${S}/qcad/src
370 + cd "${S}"/qcad/src
371 sed -i -e "s:FULLASSISTANTPATH:${QTDIR}/bin:" qc_applicationwindow.cpp \
372 || die "sed failed on assistant path"
373 sed -i -e "s:QCADDOCPATH:/usr/share/doc/${PF}:" \
374 @@ -56,14 +56,14 @@
375 # this is a fake homedir that is writeable under the sandbox, so that the build process
376 # can do anything it wants with it.
377 REALHOME="$HOME"
378 - mkdir -p $T/fakehome/.kde
379 - mkdir -p $T/fakehome/.qt
380 - export HOME="$T/fakehome"
381 + mkdir -p "${T}"/fakehome/.kde
382 + mkdir -p "${T}"fakehome/.qt
383 + export HOME="${T}/fakehome"
384 # things that should access the real homedir
385 [ -d "$REALHOME/.ccache" ] && ln -sf "$REALHOME/.ccache" "$HOME/"
386 cd scripts
387 sh build_qcad.sh || die "build failed"
388 - if ! test -f ${S}/qcad/qcad; then
389 + if ! test -f "${S}"/qcad/qcad; then
390 die "no binary created, build failed"
391 fi
392 }
393 @@ -76,13 +76,13 @@
394 chmod ugo+rx qcad
395 dobin qcad
396 dodir /usr/share/${P}
397 - cp -pPR patterns examples fonts qm ${D}/usr/share/${P}
398 + cp -pPR patterns examples fonts qm "${D}"/usr/share/${P}
399 cd ..
400 dodoc README
401 if use doc; then
402 insinto /usr/share/doc/${PF}/
403 - cd ${WORKDIR}
404 - cp -pPR qcaddoc.adp cad ${D}usr/share/doc/${PF}
405 + cd "${WORKDIR}"
406 + cp -pPR qcaddoc.adp cad "${D}"usr/share/doc/${PF}
407 fi
408 make_desktop_entry ${PN} ${PN} ${PN} Office
409 }
410
411
412
413 1.4 sci-misc/qcad/qcad-2.0.4.0-r4.ebuild
414
415 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-misc/qcad/qcad-2.0.4.0-r4.ebuild?rev=1.4&view=markup
416 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-misc/qcad/qcad-2.0.4.0-r4.ebuild?rev=1.4&content-type=text/plain
417 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-misc/qcad/qcad-2.0.4.0-r4.ebuild?r1=1.3&r2=1.4
418
419 Index: qcad-2.0.4.0-r4.ebuild
420 ===================================================================
421 RCS file: /var/cvsroot/gentoo-x86/sci-misc/qcad/qcad-2.0.4.0-r4.ebuild,v
422 retrieving revision 1.3
423 retrieving revision 1.4
424 diff -u -r1.3 -r1.4
425 --- qcad-2.0.4.0-r4.ebuild 10 Aug 2007 19:43:38 -0000 1.3
426 +++ qcad-2.0.4.0-r4.ebuild 31 Dec 2007 19:24:55 -0000 1.4
427 @@ -1,6 +1,6 @@
428 # Copyright 1999-2007 Gentoo Foundation
429 # Distributed under the terms of the GNU General Public License v2
430 -# $Header: /var/cvsroot/gentoo-x86/sci-misc/qcad/qcad-2.0.4.0-r4.ebuild,v 1.3 2007/08/10 19:43:38 je_fro Exp $
431 +# $Header: /var/cvsroot/gentoo-x86/sci-misc/qcad/qcad-2.0.4.0-r4.ebuild,v 1.4 2007/12/31 19:24:55 je_fro Exp $
432
433 inherit kde-functions eutils
434
435 @@ -24,8 +24,8 @@
436 src_unpack() {
437 unpack ${A}
438 # Bug 112864 - fix dir unpack bug
439 - touch ${WORKDIR}
440 - cd ${S}
441 + touch "${WORKDIR}"
442 + cd "${S}"
443 echo >> defs.pro "DEFINES += _REENTRANT QT_THREAD_SUPPORT"
444 echo >> defs.pro "CONFIG += thread release"
445 echo >> defs.pro "QMAKE_CFLAGS_RELEASE += ${CFLAGS}"
446 @@ -34,15 +34,15 @@
447 sed -i -e 's~qmake~${QTDIR}/bin/qmake~g' $file || \
448 die "unable to correct path to qmake in $file"
449 done
450 - epatch ${FILESDIR}/${MY_P}-gentoo.patch
451 - epatch ${FILESDIR}/manual.patch-r1
452 - epatch ${FILESDIR}/${MY_P}-intptr.patch
453 - cd ${S}/scripts
454 + epatch "${FILESDIR}"/${MY_P}-gentoo.patch
455 + epatch "${FILESDIR}"/manual.patch-r1
456 + epatch "${FILESDIR}"/${MY_P}-intptr.patch
457 + cd "${S}"/scripts
458 sed -i -e 's/^make/make ${MAKEOPTS}/' build_qcad.sh || \
459 die "unable to add MAKEOPTS"
460 sed -i -e 's/^\.\/configure/.\/configure --host=${CHOST}/' build_qcad.sh \
461 || die "unable to set CHOST"
462 - cd ${S}/qcad/src
463 + cd "${S}"/qcad/src
464 sed -i -e "s:FULLASSISTANTPATH:${QTDIR}/bin:" qc_applicationwindow.cpp \
465 || die "sed failed on assistant path"
466 sed -i -e "s:QCADDOCPATH:/usr/share/doc/${PF}:" \
467 @@ -57,14 +57,14 @@
468 # this is a fake homedir that is writeable under the sandbox, so that the build process
469 # can do anything it wants with it.
470 REALHOME="$HOME"
471 - mkdir -p $T/fakehome/.kde
472 - mkdir -p $T/fakehome/.qt
473 + mkdir -p "${T}"/fakehome/.kde
474 + mkdir -p "${T}"/fakehome/.qt
475 export HOME="$T/fakehome"
476 # things that should access the real homedir
477 [ -d "$REALHOME/.ccache" ] && ln -sf "$REALHOME/.ccache" "$HOME/"
478 cd scripts
479 sh build_qcad.sh || die "build failed"
480 - if ! test -f ${S}/qcad/qcad; then
481 + if ! test -f "${S}"/qcad/qcad; then
482 die "no binary created, build failed"
483 fi
484 }
485 @@ -77,13 +77,13 @@
486 chmod ugo+rx qcad
487 dobin qcad
488 dodir /usr/share/${P}
489 - cp -pPR patterns examples fonts qm ${D}/usr/share/${P}
490 + cp -pPR patterns examples fonts qm "${D}"/usr/share/${P}
491 cd ..
492 dodoc README
493 if use doc; then
494 insinto /usr/share/doc/${PF}/
495 - cd ${WORKDIR}
496 - cp -pPR qcaddoc.adp cad ${D}usr/share/doc/${PF}
497 + cd "${WORKDIR}"
498 + cp -pPR qcaddoc.adp cad "${D}"usr/share/doc/${PF}
499 fi
500 make_desktop_entry ${PN} ${PN} ${PN} Office
501 }
502
503
504
505 --
506 gentoo-commits@g.o mailing list