Gentoo Archives: gentoo-commits

From: "Justin Lecher (jlec)" <jlec@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sci-physics/geant: geant-3.21.14-r2.ebuild geant-4.9.3_p02-r1.ebuild geant-4.9.2_p02.ebuild ChangeLog metadata.xml geant-4.9.4_p01.ebuild
Date: Tue, 28 Jun 2011 13:34:55
Message-Id: 20110628133444.DE44D20054@flycatcher.gentoo.org
1 jlec 11/06/28 13:34:44
2
3 Modified: geant-3.21.14-r2.ebuild geant-4.9.3_p02-r1.ebuild
4 geant-4.9.2_p02.ebuild ChangeLog metadata.xml
5 geant-4.9.4_p01.ebuild
6 Log:
7 Fix sed on *FLAGS from : to |, EAPI bump
8
9 (Portage version: 2.2.0_alpha41/cvs/Linux x86_64)
10
11 Revision Changes Path
12 1.20 sci-physics/geant/geant-3.21.14-r2.ebuild
13
14 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/geant/geant-3.21.14-r2.ebuild?rev=1.20&view=markup
15 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/geant/geant-3.21.14-r2.ebuild?rev=1.20&content-type=text/plain
16 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/geant/geant-3.21.14-r2.ebuild?r1=1.19&r2=1.20
17
18 Index: geant-3.21.14-r2.ebuild
19 ===================================================================
20 RCS file: /var/cvsroot/gentoo-x86/sci-physics/geant/geant-3.21.14-r2.ebuild,v
21 retrieving revision 1.19
22 retrieving revision 1.20
23 diff -u -r1.19 -r1.20
24 --- geant-3.21.14-r2.ebuild 21 Jun 2011 14:39:19 -0000 1.19
25 +++ geant-3.21.14-r2.ebuild 28 Jun 2011 13:34:44 -0000 1.20
26 @@ -1,8 +1,9 @@
27 # Copyright 1999-2011 Gentoo Foundation
28 # Distributed under the terms of the GNU General Public License v2
29 -# $Header: /var/cvsroot/gentoo-x86/sci-physics/geant/geant-3.21.14-r2.ebuild,v 1.19 2011/06/21 14:39:19 jlec Exp $
30 +# $Header: /var/cvsroot/gentoo-x86/sci-physics/geant/geant-3.21.14-r2.ebuild,v 1.20 2011/06/28 13:34:44 jlec Exp $
31
32 EAPI=2
33 +
34 inherit eutils fortran-2
35
36 DEB_PN=geant321
37 @@ -12,22 +13,21 @@
38
39 DESCRIPTION="CERN's detector description and simulation Tool"
40 HOMEPAGE="http://wwwasd.web.cern.ch/wwwasd/geant/index.html"
41 -
42 -LICENSE="GPL-2 LGPL-2 BSD"
43 -SRC_URI="mirror://debian/pool/main/${DEB_PN:0:1}/${DEB_PN}/${DEB_P}.orig.tar.gz
44 +SRC_URI="
45 + mirror://debian/pool/main/${DEB_PN:0:1}/${DEB_PN}/${DEB_P}.orig.tar.gz
46 mirror://debian/pool/main/${DEB_PN:0:1}/${DEB_PN}/${DEB_P}-${DEB_PR}.diff.gz"
47
48 -KEYWORDS="amd64 x86"
49 SLOT="3"
50 +LICENSE="GPL-2 LGPL-2 BSD"
51 +KEYWORDS="amd64 x86"
52 IUSE=""
53
54 RDEPEND="
55 - virtual/fortran
56 ->=x11-libs/openmotif-2.3:0
57 dev-lang/cfortran
58 sci-physics/cernlib
59 - sci-physics/paw"
60 -
61 + sci-physics/paw
62 + virtual/fortran
63 + x11-libs/openmotif:0"
64 DEPEND="${RDEPEND}
65 virtual/latex-base
66 x11-misc/imake
67 @@ -42,9 +42,9 @@
68 cd "${S}"
69 cp debian/add-ons/Makefile .
70 export DEB_BUILD_OPTIONS="$(tc-getFC) nostrip nocheck"
71 - sed -i \
72 + sed \
73 -e 's:/usr/local:/usr:g' \
74 - Makefile || die "sed'ing the Makefile failed"
75 + -i Makefile || die "sed'ing the Makefile failed"
76
77 einfo "Applying Debian patches"
78 emake -j1 patch || die "debian patch failed"
79
80
81
82 1.7 sci-physics/geant/geant-4.9.3_p02-r1.ebuild
83
84 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/geant/geant-4.9.3_p02-r1.ebuild?rev=1.7&view=markup
85 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/geant/geant-4.9.3_p02-r1.ebuild?rev=1.7&content-type=text/plain
86 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/geant/geant-4.9.3_p02-r1.ebuild?r1=1.6&r2=1.7
87
88 Index: geant-4.9.3_p02-r1.ebuild
89 ===================================================================
90 RCS file: /var/cvsroot/gentoo-x86/sci-physics/geant/geant-4.9.3_p02-r1.ebuild,v
91 retrieving revision 1.6
92 retrieving revision 1.7
93 diff -u -r1.6 -r1.7
94 --- geant-4.9.3_p02-r1.ebuild 21 Jun 2011 14:39:19 -0000 1.6
95 +++ geant-4.9.3_p02-r1.ebuild 28 Jun 2011 13:34:44 -0000 1.7
96 @@ -1,10 +1,10 @@
97 # Copyright 1999-2011 Gentoo Foundation
98 # Distributed under the terms of the GNU General Public License v2
99 -# $Header: /var/cvsroot/gentoo-x86/sci-physics/geant/geant-4.9.3_p02-r1.ebuild,v 1.6 2011/06/21 14:39:19 jlec Exp $
100 +# $Header: /var/cvsroot/gentoo-x86/sci-physics/geant/geant-4.9.3_p02-r1.ebuild,v 1.7 2011/06/28 13:34:44 jlec Exp $
101
102 -EAPI=3
103 +EAPI=4
104
105 -inherit eutils fortran-2 versionator toolchain-funcs
106 +inherit eutils fortran-2 toolchain-funcs versionator
107
108 PV1=$(get_version_component_range 1 ${PV})
109 PV2=$(get_version_component_range 2 ${PV})
110 @@ -13,10 +13,10 @@
111
112 DESCRIPTION="Toolkit for simulation of passage of particles through matter"
113 HOMEPAGE="http://geant4.cern.ch/"
114 -
115 SRC_COM="http://geant4.cern.ch/support/source"
116 SRC_URI="${SRC_COM}/${MY_P}.tar.gz"
117 -GEANT4_DATA="G4NDL.3.13
118 +GEANT4_DATA="
119 + G4NDL.3.13
120 G4EMLOW.6.9
121 G4RadioactiveDecay.3.2
122 PhotonEvaporation.2.0
123 @@ -34,8 +34,8 @@
124
125 RDEPEND="
126 virtual/fortran
127 -<sci-physics/clhep-2.1
128 - motif? ( >=x11-libs/openmotif-2.3:0 )
129 + <sci-physics/clhep-2.1
130 + motif? ( x11-libs/openmotif:0 )
131 athena? ( x11-libs/libXaw )
132 qt4? ( x11-libs/qt-gui:4 )
133 openinventor? ( >=media-libs/openinventor-2.1.5.10-r3 )
134 @@ -47,7 +47,6 @@
135 geant3? ( sci-physics/geant:3 )
136 dawn? ( media-gfx/dawn )
137 zlib? ( sys-libs/zlib )"
138 -
139 DEPEND="${RDEPEND}"
140
141 S="${WORKDIR}/${MY_P}"
142 @@ -151,20 +150,20 @@
143 src_compile() {
144 cd "${S}/source/"
145 einfo "Building shared library"
146 - emake || die "Building shared geant failed"
147 + emake
148
149 if use global; then
150 export G4LIB_USE_GRANULAR=y
151 einfo "Building granular libraries"
152 - emake global || die "Building global libraries failed"
153 - emake || die "Rebuilding shared geant failed"
154 + emake global
155 + emake
156 fi
157
158 if use static-libs; then
159 einfo "Building static libraries"
160 rm -rf tmp
161 export G4LIB_BUILD_STATIC=y ; unset G4LIB_BUILD_SHARED
162 - emake || die "Building static geant failed"
163 + emake
164 fi
165 }
166
167 @@ -199,34 +198,34 @@
168 printenv | uniq | \
169 sed -n -e '/^G4/s:BUILD\(.*\)_DRIVER:USE\1:gp' >> ${g4env}
170 sed -i -e '/G4WORKDIR/d' ${g4env}
171 - doenvd ${g4env} || die "Installing environment scripts failed "
172 + doenvd ${g4env}
173 }
174
175 src_install() {
176 # install headers via make since we want them in a single directory
177 cd "${S}/source/"
178 einfo "Installing Geant4 headers"
179 - emake includes || die 'Installing headers failed'
180 + emake includes
181 cd "${S}"
182
183 # but install libraries and Geant library tool manually
184 einfo "Installing Geant4 libraries"
185 insinto ${GEANT4_LIBDIR}
186 insopts -m0755
187 - doins tmp/*.so || die
188 - doins tmp/libname.map || die
189 + doins tmp/*.so
190 + doins tmp/libname.map
191 insopts -m0644
192 if use static-libs; then
193 - doins tmp/*.a || die
194 + doins tmp/*.a
195 fi
196 exeinto ${GEANT4_LIBDIR}
197 - doexe tmp/liblist || die
198 + doexe tmp/liblist
199
200 g4_create_env_script
201
202 # configs
203 insinto ${GEANT4_DIR}
204 - doins -r config || die
205 + doins -r config
206
207 # install data
208 if use data; then
209 @@ -235,7 +234,7 @@
210 pushd "${WORKDIR}" > /dev/null
211 for d in ${GEANT4_DATA}; do
212 local p=${d/.}
213 - doins -r *${p/G4} || die "installing data ${d} failed"
214 + doins -r *${p/G4}
215 done
216 popd > /dev/null
217 fi
218
219
220
221 1.15 sci-physics/geant/geant-4.9.2_p02.ebuild
222
223 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/geant/geant-4.9.2_p02.ebuild?rev=1.15&view=markup
224 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/geant/geant-4.9.2_p02.ebuild?rev=1.15&content-type=text/plain
225 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/geant/geant-4.9.2_p02.ebuild?r1=1.14&r2=1.15
226
227 Index: geant-4.9.2_p02.ebuild
228 ===================================================================
229 RCS file: /var/cvsroot/gentoo-x86/sci-physics/geant/geant-4.9.2_p02.ebuild,v
230 retrieving revision 1.14
231 retrieving revision 1.15
232 diff -u -r1.14 -r1.15
233 --- geant-4.9.2_p02.ebuild 21 Jun 2011 14:39:19 -0000 1.14
234 +++ geant-4.9.2_p02.ebuild 28 Jun 2011 13:34:44 -0000 1.15
235 @@ -1,10 +1,10 @@
236 # Copyright 1999-2011 Gentoo Foundation
237 # Distributed under the terms of the GNU General Public License v2
238 -# $Header: /var/cvsroot/gentoo-x86/sci-physics/geant/geant-4.9.2_p02.ebuild,v 1.14 2011/06/21 14:39:19 jlec Exp $
239 +# $Header: /var/cvsroot/gentoo-x86/sci-physics/geant/geant-4.9.2_p02.ebuild,v 1.15 2011/06/28 13:34:44 jlec Exp $
240
241 EAPI=2
242
243 -inherit eutils fortran-2 versionator toolchain-funcs
244 +inherit eutils fortran-2 toolchain-funcs versionator
245
246 PV1=$(get_version_component_range 1 ${PV})
247 PV2=$(get_version_component_range 2 ${PV})
248 @@ -13,10 +13,10 @@
249
250 DESCRIPTION="Toolkit for simulation of passage of particles through matter"
251 HOMEPAGE="http://geant4.cern.ch/"
252 -
253 SRC_COM="http://geant4.web.cern.ch/geant4/support/source"
254 SRC_URI="${SRC_COM}/${MY_P}.tar.gz"
255 -GEANT4_DATA="G4NDL.3.13
256 +GEANT4_DATA="
257 + G4NDL.3.13
258 G4EMLOW.6.2
259 G4RadioactiveDecay.3.2
260 PhotonEvaporation.2.0
261 @@ -33,20 +33,22 @@
262
263 RDEPEND="
264 virtual/fortran
265 -<sci-physics/clhep-2.1
266 - motif? ( >=x11-libs/openmotif-2.3:0 )
267 + <sci-physics/clhep-2.1
268 + motif? ( x11-libs/openmotif:0 )
269 athena? ( x11-libs/libXaw )
270 qt4? ( x11-libs/qt-gui:4 )
271 openinventor? ( >=media-libs/openinventor-2.1.5.10-r3 )
272 - raytracerx? ( x11-libs/libX11 x11-libs/libXmu )
273 - opengl? ( virtual/opengl
274 - athena? ( x11-libs/Xaw3d )
275 - qt4? ( x11-libs/qt-opengl:4 ) )
276 + raytracerx? (
277 + x11-libs/libX11
278 + x11-libs/libXmu )
279 + opengl? (
280 + virtual/opengl
281 + athena? ( x11-libs/Xaw3d )
282 + qt4? ( x11-libs/qt-opengl:4 ) )
283 gdml? ( dev-libs/xerces-c )
284 geant3? ( sci-physics/geant:3 )
285 dawn? ( media-gfx/dawn )
286 zlib? ( sys-libs/zlib )"
287 -
288 DEPEND="${RDEPEND}"
289
290 S="${WORKDIR}/${MY_P}"
291 @@ -67,10 +69,10 @@
292 -e '/FC.*:=.*gfortran/d' \
293 -e 's/\(CXXFLAGS.*:=\).*/\1 -ansi/' \
294 -e '/CXXFLAGS.*+=.*pipe/d' \
295 - -e "/CXXFLAGS.*=.*-O2/s:=.*:= ${CXXFLAGS}:" \
296 - -e "/FCFLAGS.*=.*-O2/s:=.*:= ${FCFLAGS}:" \
297 - -e "/CCFLAGS.*=.*-O2/s:=.*:= ${CFLAGS}:" \
298 - -e "s:-Wl,-soname:${LDFLAGS} -Wl,-soname:g" \
299 + -e "/CXXFLAGS.*=.*-O2/s|=.*|= ${CXXFLAGS}|" \
300 + -e "/FCFLAGS.*=.*-O2/s|=.*|= ${FCFLAGS}|" \
301 + -e "/CCFLAGS.*=.*-O2/s|=.*|= ${CFLAGS}|" \
302 + -e "s|-Wl,-soname|${LDFLAGS} -Wl,-soname|g" \
303 -e "s/libq\*/lib\[q,Q\]t*/g" \
304 config/sys/Linux*gmk || die "flag substitution failed"
305 sed -i \
306
307
308
309 1.52 sci-physics/geant/ChangeLog
310
311 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/geant/ChangeLog?rev=1.52&view=markup
312 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/geant/ChangeLog?rev=1.52&content-type=text/plain
313 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/geant/ChangeLog?r1=1.51&r2=1.52
314
315 Index: ChangeLog
316 ===================================================================
317 RCS file: /var/cvsroot/gentoo-x86/sci-physics/geant/ChangeLog,v
318 retrieving revision 1.51
319 retrieving revision 1.52
320 diff -u -r1.51 -r1.52
321 --- ChangeLog 21 Jun 2011 14:39:19 -0000 1.51
322 +++ ChangeLog 28 Jun 2011 13:34:44 -0000 1.52
323 @@ -1,6 +1,11 @@
324 # ChangeLog for sci-physics/geant
325 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
326 -# $Header: /var/cvsroot/gentoo-x86/sci-physics/geant/ChangeLog,v 1.51 2011/06/21 14:39:19 jlec Exp $
327 +# $Header: /var/cvsroot/gentoo-x86/sci-physics/geant/ChangeLog,v 1.52 2011/06/28 13:34:44 jlec Exp $
328 +
329 + 28 Jun 2011; Justin Lecher <jlec@g.o> geant-3.21.14-r2.ebuild,
330 + geant-4.9.2_p02.ebuild, geant-4.9.3_p02-r1.ebuild, geant-4.9.4_p01.ebuild,
331 + metadata.xml:
332 + Fix sed on *FLAGS from : to |, EAPI bump
333
334 21 Jun 2011; Justin Lecher <jlec@g.o> geant-3.21.14-r2.ebuild,
335 geant-4.9.2_p02.ebuild, geant-4.9.3_p02-r1.ebuild, geant-4.9.4_p01.ebuild:
336
337
338
339 1.7 sci-physics/geant/metadata.xml
340
341 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/geant/metadata.xml?rev=1.7&view=markup
342 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/geant/metadata.xml?rev=1.7&content-type=text/plain
343 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/geant/metadata.xml?r1=1.6&r2=1.7
344
345 Index: metadata.xml
346 ===================================================================
347 RCS file: /var/cvsroot/gentoo-x86/sci-physics/geant/metadata.xml,v
348 retrieving revision 1.6
349 retrieving revision 1.7
350 diff -u -r1.6 -r1.7
351 --- metadata.xml 22 Jan 2011 02:28:43 -0000 1.6
352 +++ metadata.xml 28 Jun 2011 13:34:44 -0000 1.7
353 @@ -1,8 +1,8 @@
354 <?xml version="1.0" encoding="UTF-8"?>
355 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
356 <pkgmetadata>
357 -<herd>sci-physics</herd>
358 -<longdescription lang="en">
359 + <herd>sci-physics</herd>
360 + <longdescription lang="en">
361 Geant simulates the passage of subatomic particles through matter, for
362 instance, particle detectors. Geant 3 simulations are performed by
363 linking Fortran code supplied by the user with the Geant libraries,
364 @@ -11,21 +11,21 @@
365 Geant 4 is a complete rewrite in C++ with addition of other modern
366 features and detectors.
367 </longdescription>
368 -<use>
369 - <flag name='athena'>Enable the MIT Athena (<pkg>x11-libs/libXaw</pkg>)
370 + <use>
371 + <flag name="athena">Enable the MIT Athena (<pkg>x11-libs/libXaw</pkg>)
372 widget set (default is Motif)</flag>
373 - <flag name='data'>Add a lot of standard physics data files for geant4</flag>
374 - <flag name='dawn'>Add support for <pkg>media-gfx/dawn</pkg> (3D postscript
375 + <flag name="data">Add a lot of standard physics data files for geant4</flag>
376 + <flag name="dawn">Add support for <pkg>media-gfx/dawn</pkg> (3D postscript
377 rendering)</flag>
378 - <flag name='gdml'>Enable geometry markup language for xml</flag>
379 - <flag name='geant3'>Add compatibility for geant321 to geant4</flag>
380 - <flag name='global'>Produce a huge global library instead of small
381 + <flag name="gdml">Enable geometry markup language for xml</flag>
382 + <flag name="geant3">Add compatibility for geant321 to geant4</flag>
383 + <flag name="global">Produce a huge global library instead of small
384 ones</flag>
385 - <flag name='granular'>Produce many small libraries instead of global ones</flag>
386 - <flag name='aida'>Add support for Abstract Interfaces for Data Analysis </flag>
387 - <flag name='openinventor'>Add support for <pkg>media-libs/openinventor</pkg>
388 + <flag name="granular">Produce many small libraries instead of global ones</flag>
389 + <flag name="aida">Add support for Abstract Interfaces for Data Analysis </flag>
390 + <flag name="openinventor">Add support for <pkg>media-libs/openinventor</pkg>
391 SGI toolkit</flag>
392 - <flag name='raytracerx'>Enable raytracing for physics events</flag>
393 - <flag name='vrml'>Enable output of geant4 in vrml formats</flag>
394 -</use>
395 + <flag name="raytracerx">Enable raytracing for physics events</flag>
396 + <flag name="vrml">Enable output of geant4 in vrml formats</flag>
397 + </use>
398 </pkgmetadata>
399
400
401
402 1.6 sci-physics/geant/geant-4.9.4_p01.ebuild
403
404 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/geant/geant-4.9.4_p01.ebuild?rev=1.6&view=markup
405 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/geant/geant-4.9.4_p01.ebuild?rev=1.6&content-type=text/plain
406 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/geant/geant-4.9.4_p01.ebuild?r1=1.5&r2=1.6
407
408 Index: geant-4.9.4_p01.ebuild
409 ===================================================================
410 RCS file: /var/cvsroot/gentoo-x86/sci-physics/geant/geant-4.9.4_p01.ebuild,v
411 retrieving revision 1.5
412 retrieving revision 1.6
413 diff -u -r1.5 -r1.6
414 --- geant-4.9.4_p01.ebuild 21 Jun 2011 14:39:19 -0000 1.5
415 +++ geant-4.9.4_p01.ebuild 28 Jun 2011 13:34:44 -0000 1.6
416 @@ -1,23 +1,22 @@
417 # Copyright 1999-2011 Gentoo Foundation
418 # Distributed under the terms of the GNU General Public License v2
419 -# $Header: /var/cvsroot/gentoo-x86/sci-physics/geant/geant-4.9.4_p01.ebuild,v 1.5 2011/06/21 14:39:19 jlec Exp $
420 +# $Header: /var/cvsroot/gentoo-x86/sci-physics/geant/geant-4.9.4_p01.ebuild,v 1.6 2011/06/28 13:34:44 jlec Exp $
421
422 -EAPI=3
423 +EAPI=4
424
425 -inherit cmake-utils fortran-2 versionator eutils fortran-2
426 +inherit cmake-utils eutils fortran-2 versionator
427
428 PV1=$(get_version_component_range 1 ${PV})
429 PV2=$(get_version_component_range 2 ${PV})
430 PV3=$(get_version_component_range 3 ${PV})
431 -
432 MYP=${PN}$(replace_version_separator 3 .)
433
434 DESCRIPTION="Toolkit for simulation of passage of particles through matter"
435 HOMEPAGE="http://geant4.cern.ch/"
436 -
437 SRC_COM="http://geant4.cern.ch/support/source"
438 SRC_URI="${SRC_COM}/${MYP}.tar.gz"
439 -GEANT4_DATA="G4NDL.3.14
440 +GEANT4_DATA="
441 + G4NDL.3.14
442 G4EMLOW.6.19
443 G4RadioactiveDecay.3.3
444 G4NEUTRONXS.1.0
445 @@ -36,13 +35,12 @@
446
447 RDEPEND="
448 virtual/fortran
449 ->=sci-physics/clhep-2.1
450 + >=sci-physics/clhep-2.1
451 qt4? ( x11-libs/qt-gui:4 x11-libs/qt-opengl:4 )
452 gdml? ( dev-libs/xerces-c )
453 geant3? ( sci-physics/geant:3 )
454 dawn? ( media-gfx/dawn )
455 zlib? ( sys-libs/zlib )"
456 -
457 DEPEND="${RDEPEND}"
458
459 S="${WORKDIR}/${MYP}"
460 @@ -71,7 +69,7 @@
461 pushd "${WORKDIR}" > /dev/null
462 for d in ${GEANT4_DATA}; do
463 local p=${d/.}
464 - doins -r *${p/G4} || die "installing data ${d} failed"
465 + doins -r *${p/G4}
466 done
467 popd > /dev/null
468 fi