/[gentoo-x86]/eclass/eutils.eclass
Gentoo

Diff of /eclass/eutils.eclass

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 1.118 Revision 1.263
1# Copyright 1999-2004 Gentoo Foundation 1# Copyright 1999-2006 Gentoo Foundation
2# Distributed under the terms of the GNU General Public License v2 2# Distributed under the terms of the GNU General Public License v2
3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.118 2004/10/13 14:33:01 vapier Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.263 2006/11/13 20:58:41 vapier Exp $
4#
5# Author: Martin Schlemmer <azarah@gentoo.org>
6# 4#
7# This eclass is for general purpose functions that most ebuilds 5# This eclass is for general purpose functions that most ebuilds
8# have to implement themselves. 6# have to implement themselves.
9# 7#
10# NB: If you add anything, please comment it! 8# NB: If you add anything, please comment it!
9#
10# Maintainer: see each individual function, base-system@gentoo.org as default
11 11
12ECLASS=eutils 12inherit multilib portability
13INHERITED="$INHERITED $ECLASS"
14
15DEPEND="!bootstrap? ( sys-devel/patch )"
16 13
17DESCRIPTION="Based on the ${ECLASS} eclass" 14DESCRIPTION="Based on the ${ECLASS} eclass"
18 15
19# Wait for the supplied number of seconds. If no argument is supplied, defaults 16# Wait for the supplied number of seconds. If no argument is supplied, defaults
20# to five seconds. If the EPAUSE_IGNORE env var is set, don't wait. If we're not 17# to five seconds. If the EPAUSE_IGNORE env var is set, don't wait. If we're not
21# outputting to a terminal, don't wait. For compatability purposes, the argument 18# outputting to a terminal, don't wait. For compatability purposes, the argument
22# must be an integer greater than zero. 19# must be an integer greater than zero.
23# Bug 62950, Ciaran McCreesh <ciaranm@gentoo.org> (05 Sep 2004) 20# Bug 62950, Ciaran McCreesh <ciaranm@gentoo.org> (05 Sep 2004)
24epause() { 21epause() {
25 if [ -z "$EPAUSE_IGNORE" ] && [ -t 1 ] ; then 22 [[ -z ${EPAUSE_IGNORE} ]] && sleep ${1:-5}
26 sleep ${1:-5}
27 fi
28} 23}
29 24
30# Beep the specified number of times (defaults to five). If our output 25# Beep the specified number of times (defaults to five). If our output
31# is not a terminal, don't beep. If the EBEEP_IGNORE env var is set, 26# is not a terminal, don't beep. If the EBEEP_IGNORE env var is set,
32# don't beep. 27# don't beep.
33# Bug 62950, Ciaran McCreesh <ciaranm@gentoo.org> (05 Sep 2004) 28# Bug 62950, Ciaran McCreesh <ciaranm@gentoo.org> (05 Sep 2004)
34ebeep() { 29ebeep() {
35 local n 30 local n
36 if [ -z "$EBEEP_IGNORE" ] && [ -t 1 ] ; then 31 if [[ -z ${EBEEP_IGNORE} ]] ; then
37 for ((n=1 ; n <= ${1:-5} ; n++)) ; do 32 for ((n=1 ; n <= ${1:-5} ; n++)) ; do
38 echo -ne "\a" 33 echo -ne "\a"
39 sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null 34 sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
40 echo -ne "\a" 35 echo -ne "\a"
41 sleep 1 36 sleep 1
42 done 37 done
43 fi 38 fi
44}
45
46# This function simply returns the desired lib directory. With portage
47# 2.0.51, we now have support for installing libraries to lib32/lib64
48# to accomidate the needs of multilib systems. It's no longer a good idea
49# to assume all libraries will end up in lib. Replace any (sane) instances
50# where lib is named directly with $(get_libdir) if possible.
51#
52# Travis Tilley <lv@gentoo.org> (24 Aug 2004)
53get_libdir() {
54 LIBDIR_TEST=$(type econf)
55 if [ ! -z "${CONF_LIBDIR_OVERRIDE}" ] ; then
56 # if there is an override, we want to use that... always.
57 CONF_LIBDIR="${CONF_LIBDIR_OVERRIDE}"
58 # We don't need to know the verison of portage. We only need to know
59 # if there is support for CONF_LIBDIR in econf and co.
60 # Danny van Dyk <kugelfang@gentoo.org> 2004/17/09
61 #elif portageq has_version / '<sys-apps/portage-2.0.51_pre20' ; then
62 # # and if there isnt an override, and we're using a version of
63 # # portage without CONF_LIBDIR support, force the use of lib. dolib
64 # # and friends from portage 2.0.50 wont be too happy otherwise.
65 # CONF_LIBDIR="lib"
66 #fi
67 elif [ "${LIBDIR_TEST/CONF_LIBDIR}" == "${LIBDIR_TEST}" ]; then # we don't have CONF_LIBDIR support
68 # will be <portage-2.0.51_pre20
69 CONF_LIBDIR="lib"
70 fi
71 # and of course, default to lib if CONF_LIBDIR isnt set
72 echo ${CONF_LIBDIR:=lib}
73 unset LIBDIR_TEST
74}
75
76
77get_multilibdir() {
78 echo ${CONF_MULTILIBDIR:=lib32}
79}
80
81
82# Sometimes you need to override the value returned by get_libdir. A good
83# example of this is xorg-x11, where lib32 isnt a supported configuration,
84# and where lib64 -must- be used on amd64 (for applications that need lib
85# to be 32bit, such as adobe acrobat). Note that this override also bypasses
86# portage version sanity checking.
87# get_libdir_override expects one argument, the result get_libdir should
88# return:
89#
90# get_libdir_override lib64
91#
92# Travis Tilley <lv@gentoo.org> (31 Aug 2004)
93get_libdir_override() {
94 CONF_LIBDIR="$1"
95 CONF_LIBDIR_OVERRIDE="$1"
96} 39}
97 40
98# This function generate linker scripts in /usr/lib for dynamic 41# This function generate linker scripts in /usr/lib for dynamic
99# libs in /lib. This is to fix linking problems when you have 42# libs in /lib. This is to fix linking problems when you have
100# the .so in /lib, and the .a in /usr/lib. What happens is that 43# the .so in /lib, and the .a in /usr/lib. What happens is that
112# to point to the latest version of the library present. 55# to point to the latest version of the library present.
113# 56#
114# <azarah@gentoo.org> (26 Oct 2002) 57# <azarah@gentoo.org> (26 Oct 2002)
115# 58#
116gen_usr_ldscript() { 59gen_usr_ldscript() {
60 if [[ $(type -t _tc_gen_usr_ldscript) == "function" ]] ; then
61 _tc_gen_usr_ldscript "$@"
62 return $?
63 fi
64
65 ewarn "QA Notice: Please upgrade your ebuild to use toolchain-funcs"
66 ewarn "QA Notice: rather than gen_usr_ldscript() from eutils"
67
117 local libdir="$(get_libdir)" 68 local lib libdir=$(get_libdir)
118 # Just make sure it exists 69 # Just make sure it exists
119 dodir /usr/${libdir} 70 dodir /usr/${libdir}
120 71
72 for lib in "${@}" ; do
121 cat > "${D}/usr/${libdir}/${1}" << END_LDSCRIPT 73 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT
122/* GNU ld script 74 /* GNU ld script
123 Because Gentoo have critical dynamic libraries 75 Since Gentoo has critical dynamic libraries
124 in /lib, and the static versions in /usr/lib, we 76 in /lib, and the static versions in /usr/lib,
125 need to have a "fake" dynamic lib in /usr/lib, 77 we need to have a "fake" dynamic lib in /usr/lib,
126 otherwise we run into linking problems. 78 otherwise we run into linking problems.
127 See bug #4411 on http://bugs.gentoo.org/ for 79
128 more info. */ 80 See bug http://bugs.gentoo.org/4411 for more info.
81 */
129GROUP ( /${libdir}/${1} ) 82 GROUP ( /${libdir}/${lib} )
130END_LDSCRIPT 83 END_LDSCRIPT
131 fperms a+x "/usr/${libdir}/${1}" 84 fperms a+x "/usr/${libdir}/${lib}" || die "could not change perms on ${lib}"
132}
133
134# Simple function to draw a line consisting of '=' the same length as $*
135#
136# <azarah@gentoo.org> (11 Nov 2002)
137#
138draw_line() {
139 local i=0
140 local str_length=""
141
142 # Handle calls that do not have args, or wc not being installed ...
143 if [ -z "$1" -o ! -x "$(which wc 2>/dev/null)" ]
144 then
145 echo "==============================================================="
146 return 0
147 fi
148
149 # Get the length of $*
150 str_length="$(echo -n "$*" | wc -m)"
151
152 while [ "$i" -lt "${str_length}" ]
153 do
154 echo -n "="
155
156 i=$((i + 1))
157 done 85 done
158
159 echo
160
161 return 0
162} 86}
87
163 88
164# Default directory where patches are located 89# Default directory where patches are located
165EPATCH_SOURCE="${WORKDIR}/patch" 90EPATCH_SOURCE="${WORKDIR}/patch"
166# Default extension for patches 91# Default extension for patches
167EPATCH_SUFFIX="patch.bz2" 92EPATCH_SUFFIX="patch.bz2"
168# Default options for patch 93# Default options for patch
169# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571 94# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571
170EPATCH_OPTS="-g0" 95# Set --no-backup-if-mismatch so we don't leave '.orig' files behind.
96# Set -E to automatically remove empty files.
97EPATCH_OPTS="-g0 -E --no-backup-if-mismatch"
171# List of patches not to apply. Not this is only file names, 98# List of patches not to apply. Not this is only file names,
172# and not the full path .. 99# and not the full path ..
173EPATCH_EXCLUDE="" 100EPATCH_EXCLUDE=""
174# Change the printed message for a single patch. 101# Change the printed message for a single patch.
175EPATCH_SINGLE_MSG="" 102EPATCH_SINGLE_MSG=""
103# Change the printed message for multiple patches.
104EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..."
176# Force applying bulk patches even if not following the style: 105# Force applying bulk patches even if not following the style:
177# 106#
178# ??_${ARCH}_foo.${EPATCH_SUFFIX} 107# ??_${ARCH}_foo.${EPATCH_SUFFIX}
179# 108#
180EPATCH_FORCE="no" 109EPATCH_FORCE="no"
211# hand its a directory, it will set EPATCH_SOURCE to this. 140# hand its a directory, it will set EPATCH_SOURCE to this.
212# 141#
213# <azarah@gentoo.org> (10 Nov 2002) 142# <azarah@gentoo.org> (10 Nov 2002)
214# 143#
215epatch() { 144epatch() {
145 _epatch_draw_line() {
146 [[ -z $1 ]] && set "$(printf "%65s" '')"
147 echo "${1//?/=}"
148 }
149 _epatch_assert() { local _pipestatus=${PIPESTATUS[*]}; [[ ${_pipestatus// /} -eq 0 ]] ; }
216 local PIPE_CMD="" 150 local PIPE_CMD=""
217 local STDERR_TARGET="${T}/$$.out" 151 local STDERR_TARGET="${T}/$$.out"
218 local PATCH_TARGET="${T}/$$.patch" 152 local PATCH_TARGET="${T}/$$.patch"
219 local PATCH_SUFFIX="" 153 local PATCH_SUFFIX=""
220 local SINGLE_PATCH="no" 154 local SINGLE_PATCH="no"
221 local x="" 155 local x=""
222 156
157 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402
158
223 if [ "$#" -gt 1 ] 159 if [ "$#" -gt 1 ]
224 then 160 then
225 local m="" 161 local m=""
226 einfo "${#} patches to apply..."
227 for m in "$@" ; do 162 for m in "$@" ; do
228 epatch "${m}" 163 epatch "${m}"
229 done 164 done
230 return 0 165 return 0
231 fi 166 fi
245 local EPATCH_SOURCE="$1/*" 180 local EPATCH_SOURCE="$1/*"
246 else 181 else
247 local EPATCH_SOURCE="$1/*.${EPATCH_SUFFIX}" 182 local EPATCH_SOURCE="$1/*.${EPATCH_SUFFIX}"
248 fi 183 fi
249 else 184 else
250 if [ ! -d ${EPATCH_SOURCE} ] 185 if [ ! -d ${EPATCH_SOURCE} ] || [ -n "$1" ]
251 then 186 then
252 if [ -n "$1" -a "${EPATCH_SOURCE}" = "${WORKDIR}/patch" ] 187 if [ -n "$1" -a "${EPATCH_SOURCE}" = "${WORKDIR}/patch" ]
253 then 188 then
254 EPATCH_SOURCE="$1" 189 EPATCH_SOURCE="$1"
255 fi 190 fi
256 191
257 echo 192 echo
258 eerror "Cannot find \$EPATCH_SOURCE! Value for \$EPATCH_SOURCE is:" 193 eerror "Cannot find \$EPATCH_SOURCE! Value for \$EPATCH_SOURCE is:"
259 eerror 194 eerror
260 eerror " ${EPATCH_SOURCE}" 195 eerror " ${EPATCH_SOURCE}"
196 eerror " ( ${EPATCH_SOURCE##*/} )"
261 echo 197 echo
262 die "Cannot find \$EPATCH_SOURCE!" 198 die "Cannot find \$EPATCH_SOURCE!"
263 fi 199 fi
264 200
265 local EPATCH_SOURCE="${EPATCH_SOURCE}/*.${EPATCH_SUFFIX}" 201 local EPATCH_SOURCE="${EPATCH_SOURCE}/*.${EPATCH_SUFFIX}"
284 ;; 220 ;;
285 esac 221 esac
286 222
287 if [ "${SINGLE_PATCH}" = "no" ] 223 if [ "${SINGLE_PATCH}" = "no" ]
288 then 224 then
289 einfo "Applying various patches (bugfixes/updates)..." 225 einfo "${EPATCH_MULTI_MSG}"
290 fi 226 fi
291 for x in ${EPATCH_SOURCE} 227 for x in ${EPATCH_SOURCE}
292 do 228 do
293 # New ARCH dependant patch naming scheme... 229 # New ARCH dependant patch naming scheme ...
294 # 230 #
295 # ???_arch_foo.patch 231 # ???_arch_foo.patch
296 # 232 #
297 if [ -f ${x} ] && \ 233 if [ -f ${x} ] && \
298 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "`eval echo \$\{x/_${ARCH}_\}`" != "${x}" ] || \ 234 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "${x/_${ARCH}_}" != "${x}" ] || \
299 [ "${EPATCH_FORCE}" = "yes" ]) 235 [ "${EPATCH_FORCE}" = "yes" ])
300 then 236 then
301 local count=0 237 local count=0
302 local popts="${EPATCH_OPTS}" 238 local popts="${EPATCH_OPTS}"
239 local patchname=${x##*/}
303 240
304 if [ -n "${EPATCH_EXCLUDE}" ] 241 if [ -n "${EPATCH_EXCLUDE}" ]
305 then 242 then
306 if [ "`eval echo \$\{EPATCH_EXCLUDE/${x##*/}\}`" != "${EPATCH_EXCLUDE}" ] 243 if [ "${EPATCH_EXCLUDE/${patchname}}" != "${EPATCH_EXCLUDE}" ]
307 then 244 then
308 continue 245 continue
309 fi 246 fi
310 fi 247 fi
311 248
313 then 250 then
314 if [ -n "${EPATCH_SINGLE_MSG}" ] 251 if [ -n "${EPATCH_SINGLE_MSG}" ]
315 then 252 then
316 einfo "${EPATCH_SINGLE_MSG}" 253 einfo "${EPATCH_SINGLE_MSG}"
317 else 254 else
318 einfo "Applying ${x##*/}..." 255 einfo "Applying ${patchname} ..."
319 fi 256 fi
320 else 257 else
321 einfo " ${x##*/}..." 258 einfo " ${patchname} ..."
322 fi 259 fi
323 260
324 echo "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 261 echo "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
325 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 262 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
326 263
327 # Allow for prefix to differ ... im lazy, so shoot me :/ 264 # Allow for prefix to differ ... im lazy, so shoot me :/
328 while [ "${count}" -lt 5 ] 265 while [ "${count}" -lt 5 ]
329 do 266 do
330 # Generate some useful debug info ... 267 # Generate some useful debug info ...
331 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 268 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
332 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 269 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
333 270
334 if [ "${PATCH_SUFFIX}" != "patch" ] 271 if [ "${PATCH_SUFFIX}" != "patch" ]
335 then 272 then
336 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 273 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
337 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 274 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
338 else 275 else
339 PATCH_TARGET="${x}" 276 PATCH_TARGET="${x}"
340 fi 277 fi
341 278
342 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 279 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
343 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 280 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
344 281
345 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 282 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
346 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 283 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
347 284
348 if [ "${PATCH_SUFFIX}" != "patch" ] 285 if [ "${PATCH_SUFFIX}" != "patch" ]
349 then 286 then
350 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 2>&1 287 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
351 then 288 then
352 echo 289 echo
353 eerror "Could not extract patch!" 290 eerror "Could not extract patch!"
354 #die "Could not extract patch!" 291 #die "Could not extract patch!"
355 count=5 292 count=5
356 break 293 break
357 fi 294 fi
358 fi 295 fi
359 296
360 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f) >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 2>&1 297 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f ; _epatch_assert) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
361 then 298 then
362 draw_line "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 299 _epatch_draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
363 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 300 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
364 echo "ACTUALLY APPLYING ${x##*/}..." >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 301 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
365 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 302 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
366 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 303 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
367 304
368 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 2>&1 305 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1
306 _epatch_assert
369 307
370 if [ "$?" -ne 0 ] 308 if [ "$?" -ne 0 ]
371 then 309 then
372 cat ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 310 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
373 echo 311 echo
374 eerror "A dry-run of patch command succeeded, but actually" 312 eerror "A dry-run of patch command succeeded, but actually"
375 eerror "applying the patch failed!" 313 eerror "applying the patch failed!"
376 #die "Real world sux compared to the dreamworld!" 314 #die "Real world sux compared to the dreamworld!"
377 count=5 315 count=5
378 fi 316 fi
379 317
380 rm -f ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 318 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
381 319
382 break 320 break
383 fi 321 fi
384 322
385 count=$((count + 1)) 323 count=$((count + 1))
391 fi 329 fi
392 330
393 if [ "${count}" -eq 5 ] 331 if [ "${count}" -eq 5 ]
394 then 332 then
395 echo 333 echo
396 eerror "Failed Patch: ${x##*/}!" 334 eerror "Failed Patch: ${patchname} !"
335 eerror " ( ${PATCH_TARGET} )"
397 eerror 336 eerror
398 eerror "Include in your bugreport the contents of:" 337 eerror "Include in your bugreport the contents of:"
399 eerror 338 eerror
400 eerror " ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}" 339 eerror " ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}"
401 echo 340 echo
402 die "Failed Patch: ${x##*/}!" 341 die "Failed Patch: ${patchname}!"
403 fi 342 fi
404 343
405 rm -f ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 344 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
406 345
407 eend 0 346 eend 0
408 fi 347 fi
409 done 348 done
410 if [ "${SINGLE_PATCH}" = "no" ] 349 if [ "${SINGLE_PATCH}" = "no" ]
411 then 350 then
412 einfo "Done with patching" 351 einfo "Done with patching"
413 fi 352 fi
414} 353}
415 354
416# This function return true if we are using the NPTL pthreads
417# implementation.
418#
419# <azarah@gentoo.org> (06 March 2003)
420#
421have_NPTL() {
422 cat > ${T}/test-nptl.c <<-"END"
423 #define _XOPEN_SOURCE
424 #include <unistd.h>
425 #include <stdio.h>
426
427 int main()
428 {
429 char buf[255];
430 char *str = buf;
431
432 confstr(_CS_GNU_LIBPTHREAD_VERSION, str, 255);
433 if (NULL != str) {
434 printf("%s\n", str);
435 if (NULL != strstr(str, "NPTL"))
436 return 0;
437 }
438
439 return 1;
440 }
441 END
442
443 einfon "Checking for _CS_GNU_LIBPTHREAD_VERSION support in glibc ... "
444 if gcc -o ${T}/nptl ${T}/test-nptl.c &> /dev/null
445 then
446 echo "yes"
447 einfon "Checking what PTHREADS implementation we have ... "
448 if ${T}/nptl
449 then
450 return 0
451 else
452 return 1
453 fi
454 else
455 echo "no"
456 fi
457
458 return 1
459}
460
461# This function check how many cpu's are present, and then set
462# -j in MAKEOPTS accordingly.
463#
464# Thanks to nall <nall@gentoo.org> for this.
465#
466get_number_of_jobs() {
467 local jobs=0
468
469 if [ ! -r /proc/cpuinfo ]
470 then
471 return 1
472 fi
473
474 # This bit is from H?kan Wessberg <nacka-gentoo@refug.org>, bug #13565.
475 if [ "`egrep "^[[:space:]]*MAKEOPTS=" /etc/make.conf | wc -l`" -gt 0 ]
476 then
477 ADMINOPTS="`egrep "^[[:space:]]*MAKEOPTS=" /etc/make.conf | cut -d= -f2 | sed 's/\"//g'`"
478 ADMINPARAM="`echo ${ADMINOPTS} | gawk '{match($0, /-j *[0-9]*/, opt); print opt[0]}'`"
479 ADMINPARAM="${ADMINPARAM/-j}"
480 fi
481
482 export MAKEOPTS="`echo ${MAKEOPTS} | sed -e 's:-j *[0-9]*::g'`"
483
484 if [ "${ARCH}" = "amd64" -o "${ARCH}" = "x86" -o "${ARCH}" = "hppa" -o \
485 "${ARCH}" = "arm" -o "${ARCH}" = "mips" -o "${ARCH}" = "ia64" ]
486 then
487 # these archs will always have "[Pp]rocessor"
488 jobs="$((`grep -c ^[Pp]rocessor /proc/cpuinfo` * 2))"
489
490 elif [ "${ARCH}" = "sparc" -o "${ARCH}" = "sparc64" ]
491 then
492 # sparc always has "ncpus active"
493 jobs="$((`grep "^ncpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
494
495 elif [ "${ARCH}" = "alpha" ]
496 then
497 # alpha has "cpus active", but only when compiled with SMP
498 if [ "`grep -c "^cpus active" /proc/cpuinfo`" -eq 1 ]
499 then
500 jobs="$((`grep "^cpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
501 else
502 jobs=2
503 fi
504
505 elif [ "${ARCH}" = "ppc" -o "${ARCH}" = "ppc64" ]
506 then
507 # ppc has "processor", but only when compiled with SMP
508 if [ "`grep -c "^processor" /proc/cpuinfo`" -eq 1 ]
509 then
510 jobs="$((`grep -c ^processor /proc/cpuinfo` * 2))"
511 else
512 jobs=2
513 fi
514 elif [ "${ARCH}" = "s390" ]
515 then
516 # s390 has "# processors : "
517 jobs="$((`grep "^\# processors" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
518 else
519 jobs="$((`grep -c ^cpu /proc/cpuinfo` * 2))"
520 die "Unknown ARCH -- ${ARCH}!"
521 fi
522
523 # Make sure the number is valid ...
524 if [ "${jobs}" -lt 1 ]
525 then
526 jobs=1
527 fi
528
529 if [ -n "${ADMINPARAM}" ]
530 then
531 if [ "${jobs}" -gt "${ADMINPARAM}" ]
532 then
533 einfo "Setting make jobs to \"-j${ADMINPARAM}\" to ensure successful merge..."
534 export MAKEOPTS="${MAKEOPTS} -j${ADMINPARAM}"
535 else
536 einfo "Setting make jobs to \"-j${jobs}\" to ensure successful merge..."
537 export MAKEOPTS="${MAKEOPTS} -j${jobs}"
538 fi
539 fi
540}
541
542# Cheap replacement for when debianutils (and thus mktemp) 355# Cheap replacement for when debianutils (and thus mktemp)
543# does not exist on the users system 356# does not exist on the users system
544# vapier@gentoo.org 357# vapier@gentoo.org
545# 358#
546# Takes just 1 optional parameter (the directory to create tmpfile in) 359# Takes just 1 optional parameter (the directory to create tmpfile in)
547emktemp() { 360emktemp() {
361 local exe="touch"
362 [[ $1 == -d ]] && exe="mkdir" && shift
548 local topdir="$1" 363 local topdir=$1
549 364
550 if [ -z "${topdir}" ] 365 if [[ -z ${topdir} ]] ; then
551 then
552 [ -z "${T}" ] \ 366 [[ -z ${T} ]] \
553 && topdir="/tmp" \ 367 && topdir="/tmp" \
554 || topdir="${T}" 368 || topdir=${T}
555 fi 369 fi
556 370
557 if [ -z "$(type -p mktemp)" ] 371 if [[ -z $(type -p mktemp) ]] ; then
558 then
559 local tmp=/ 372 local tmp=/
560 while [ -e "${tmp}" ] ; do 373 while [[ -e ${tmp} ]] ; do
561 tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}" 374 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}
562 done 375 done
563 touch "${tmp}" 376 ${exe} "${tmp}" || ${exe} -p "${tmp}"
564 echo "${tmp}" 377 echo "${tmp}"
565 else 378 else
379 if [[ ${exe} == "touch" ]] ; then
380 [[ ${USERLAND} == "GNU" ]] \
566 mktemp -p "${topdir}" 381 && mktemp -p "${topdir}" \
382 || TMPDIR="${topdir}" mktemp -t tmp
383 else
384 [[ ${USERLAND} == "GNU" ]] \
385 && mktemp -d "${topdir}" \
386 || TMPDIR="${topdir}" mktemp -dt tmp
387 fi
567 fi 388 fi
568} 389}
569 390
570# Small wrapper for getent (Linux), nidump (Mac OS X), 391# Small wrapper for getent (Linux), nidump (Mac OS X),
571# and pw (FreeBSD) used in enewuser()/enewgroup() 392# and pw (FreeBSD) used in enewuser()/enewgroup()
572# Joe Jezak <josejx@gmail.com> and usata@gentoo.org 393# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
573# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org> 394# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
574# 395#
575# egetent(database, key) 396# egetent(database, key)
576egetent() { 397egetent() {
577 if useq macos || useq ppc-macos ; then 398 case ${CHOST} in
399 *-darwin*)
578 case "$2" in 400 case "$2" in
579 *[!0-9]*) # Non numeric 401 *[!0-9]*) # Non numeric
580 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 402 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
581 ;; 403 ;;
582 *) # Numeric 404 *) # Numeric
583 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 405 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
584 ;; 406 ;;
585 esac 407 esac
586 elif useq x86-fbsd ; then 408 ;;
587 local action 409 *-freebsd*|*-dragonfly*)
588 if [ "$1" == "passwd" ] 410 local opts action="user"
589 then 411 [[ $1 == "passwd" ]] || action="group"
590 action="user" 412
591 else 413 # lookup by uid/gid
592 action="group" 414 if [[ $2 == [[:digit:]]* ]] ; then
415 [[ ${action} == "user" ]] && opts="-u" || opts="-g"
593 fi 416 fi
417
594 pw show "${action}" "$2" -q 418 pw show ${action} ${opts} "$2" -q
595 else 419 ;;
420 *-netbsd*|*-openbsd*)
421 grep "$2:\*:" /etc/$1
422 ;;
423 *)
596 which nscd >& /dev/null && nscd -i "$1" 424 type -p nscd >& /dev/null && nscd -i "$1"
597 getent "$1" "$2" 425 getent "$1" "$2"
598 fi 426 ;;
427 esac
599} 428}
600 429
601# Simplify/standardize adding users to the system 430# Simplify/standardize adding users to the system
602# vapier@gentoo.org 431# vapier@gentoo.org
603# 432#
610# shell: /bin/false 439# shell: /bin/false
611# homedir: /dev/null 440# homedir: /dev/null
612# groups: none 441# groups: none
613# extra: comment of 'added by portage for ${PN}' 442# extra: comment of 'added by portage for ${PN}'
614enewuser() { 443enewuser() {
444 case ${EBUILD_PHASE} in
445 unpack|compile|test|install)
446 eerror "'enewuser()' called from '${EBUILD_PHASE}()' which is not a pkg_* function."
447 eerror "Package fails at QA and at life. Please file a bug."
448 die "Bad package! enewuser is only for use in pkg_* functions!"
449 esac
450
615 # get the username 451 # get the username
616 local euser="$1"; shift 452 local euser=$1; shift
617 if [ -z "${euser}" ] 453 if [[ -z ${euser} ]] ; then
618 then
619 eerror "No username specified !" 454 eerror "No username specified !"
620 die "Cannot call enewuser without a username" 455 die "Cannot call enewuser without a username"
621 fi 456 fi
622 457
623 # lets see if the username already exists 458 # lets see if the username already exists
624 if [ "${euser}" == "`egetent passwd \"${euser}\" | cut -d: -f1`" ] 459 if [[ -n $(egetent passwd "${euser}") ]] ; then
625 then
626 return 0 460 return 0
627 fi 461 fi
628 einfo "Adding user '${euser}' to your system ..." 462 einfo "Adding user '${euser}' to your system ..."
629 463
630 # options to pass to useradd 464 # options to pass to useradd
631 local opts= 465 local opts=
632 466
633 # handle uid 467 # handle uid
634 local euid="$1"; shift 468 local euid=$1; shift
635 if [ ! -z "${euid}" ] && [ "${euid}" != "-1" ] 469 if [[ -n ${euid} && ${euid} != -1 ]] ; then
636 then
637 if [ "${euid}" -gt 0 ] 470 if [[ ${euid} -gt 0 ]] ; then
638 then
639 if [ ! -z "`egetent passwd ${euid}`" ] 471 if [[ -n $(egetent passwd ${euid}) ]] ; then
640 then
641 euid="next" 472 euid="next"
642 fi 473 fi
643 else 474 else
644 eerror "Userid given but is not greater than 0 !" 475 eerror "Userid given but is not greater than 0 !"
645 die "${euid} is not a valid UID" 476 die "${euid} is not a valid UID"
646 fi 477 fi
647 else 478 else
648 euid="next" 479 euid="next"
649 fi 480 fi
650 if [ "${euid}" == "next" ] 481 if [[ ${euid} == "next" ]] ; then
651 then 482 for ((euid = 101; euid <= 999; euid++)); do
652 local pwrange
653 if [ "${USERLAND}" == "BSD" ] ; then
654 pwrange="`jot 898 101`"
655 else
656 pwrange="`seq 101 999`"
657 fi
658 for euid in ${pwrange} ; do
659 [ -z "`egetent passwd ${euid}`" ] && break 483 [[ -z $(egetent passwd ${euid}) ]] && break
660 done 484 done
661 fi 485 fi
662 opts="${opts} -u ${euid}" 486 opts="${opts} -u ${euid}"
663 einfo " - Userid: ${euid}" 487 einfo " - Userid: ${euid}"
664 488
665 # handle shell 489 # handle shell
666 local eshell="$1"; shift 490 local eshell=$1; shift
667 if [ ! -z "${eshell}" ] && [ "${eshell}" != "-1" ] 491 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
668 then 492 if [[ ! -e ${ROOT}${eshell} ]] ; then
669 if [ ! -e "${eshell}" ]
670 then
671 eerror "A shell was specified but it does not exist !" 493 eerror "A shell was specified but it does not exist !"
672 die "${eshell} does not exist" 494 die "${eshell} does not exist in ${ROOT}"
495 fi
496 if [[ ${eshell} == */false || ${eshell} == */nologin ]] ; then
497 eerror "Do not specify ${eshell} yourself, use -1"
498 die "Pass '-1' as the shell parameter"
673 fi 499 fi
674 else 500 else
675 if [ "${USERLAND}" == "BSD" ] 501 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do
676 then 502 [[ -x ${ROOT}${shell} ]] && break
677 eshell="/usr/bin/false" 503 done
678 else 504
505 if [[ ${shell} == "/dev/null" ]] ; then
506 eerror "Unable to identify the shell to use, proceeding with userland default."
507 case ${USERLAND} in
679 eshell="/bin/false" 508 GNU) shell="/bin/false" ;;
509 BSD) shell="/sbin/nologin" ;;
510 Darwin) shell="/usr/sbin/nologin" ;;
511 *) die "Unable to identify the default shell for userland ${USERLAND}"
512 esac
680 fi 513 fi
514
515 eshell=${shell}
681 fi 516 fi
682 einfo " - Shell: ${eshell}" 517 einfo " - Shell: ${eshell}"
683 opts="${opts} -s ${eshell}" 518 opts="${opts} -s ${eshell}"
684 519
685 # handle homedir 520 # handle homedir
686 local ehome="$1"; shift 521 local ehome=$1; shift
687 if [ -z "${ehome}" ] && [ "${eshell}" != "-1" ] 522 if [[ -z ${ehome} ]] || [[ ${ehome} == "-1" ]] ; then
688 then
689 ehome="/dev/null" 523 ehome="/dev/null"
690 fi 524 fi
691 einfo " - Home: ${ehome}" 525 einfo " - Home: ${ehome}"
692 opts="${opts} -d ${ehome}" 526 opts="${opts} -d ${ehome}"
693 527
694 # handle groups 528 # handle groups
695 local egroups="$1"; shift 529 local egroups=$1; shift
696 if [ ! -z "${egroups}" ] 530 if [[ ! -z ${egroups} ]] ; then
697 then
698 local oldifs="${IFS}" 531 local oldifs=${IFS}
699 local defgroup="" exgroups="" 532 local defgroup="" exgroups=""
700 533
701 export IFS="," 534 export IFS=","
702 for g in ${egroups} 535 for g in ${egroups} ; do
703 do
704 export IFS="${oldifs}" 536 export IFS=${oldifs}
705 if [ -z "`egetent group \"${g}\"`" ] 537 if [[ -z $(egetent group "${g}") ]] ; then
706 then
707 eerror "You must add group ${g} to the system first" 538 eerror "You must add group ${g} to the system first"
708 die "${g} is not a valid GID" 539 die "${g} is not a valid GID"
709 fi 540 fi
710 if [ -z "${defgroup}" ] 541 if [[ -z ${defgroup} ]] ; then
711 then
712 defgroup="${g}" 542 defgroup=${g}
713 else 543 else
714 exgroups="${exgroups},${g}" 544 exgroups="${exgroups},${g}"
715 fi 545 fi
716 export IFS="," 546 export IFS=","
717 done 547 done
718 export IFS="${oldifs}" 548 export IFS=${oldifs}
719 549
720 opts="${opts} -g ${defgroup}" 550 opts="${opts} -g ${defgroup}"
721 if [ ! -z "${exgroups}" ] 551 if [[ ! -z ${exgroups} ]] ; then
722 then
723 opts="${opts} -G ${exgroups:1}" 552 opts="${opts} -G ${exgroups:1}"
724 fi 553 fi
725 else 554 else
726 egroups="(none)" 555 egroups="(none)"
727 fi 556 fi
728 einfo " - Groups: ${egroups}" 557 einfo " - Groups: ${egroups}"
729 558
730 # handle extra and add the user 559 # handle extra and add the user
731 local eextra="$@"
732 local oldsandbox="${SANDBOX_ON}" 560 local oldsandbox=${SANDBOX_ON}
733 export SANDBOX_ON="0" 561 export SANDBOX_ON="0"
734 if useq macos || useq ppc-macos ; 562 case ${CHOST} in
735 then 563 *-darwin*)
736 ### Make the user 564 ### Make the user
737 if [ -z "${eextra}" ] 565 if [[ -z $@ ]] ; then
738 then
739 dscl . create /users/${euser} uid ${euid} 566 dscl . create /users/${euser} uid ${euid}
740 dscl . create /users/${euser} shell ${eshell} 567 dscl . create /users/${euser} shell ${eshell}
741 dscl . create /users/${euser} home ${ehome} 568 dscl . create /users/${euser} home ${ehome}
742 dscl . create /users/${euser} realname "added by portage for ${PN}" 569 dscl . create /users/${euser} realname "added by portage for ${PN}"
743 ### Add the user to the groups specified 570 ### Add the user to the groups specified
744 local oldifs="${IFS}" 571 local oldifs=${IFS}
745 export IFS="," 572 export IFS=","
746 for g in ${egroups} 573 for g in ${egroups} ; do
747 do
748 dscl . merge /groups/${g} users ${euser} 574 dscl . merge /groups/${g} users ${euser}
749 done 575 done
750 export IFS="${oldifs}" 576 export IFS=${oldifs}
751 else 577 else
752 einfo "Extra options are not supported on macos yet" 578 einfo "Extra options are not supported on Darwin yet"
753 einfo "Please report the ebuild along with the info below" 579 einfo "Please report the ebuild along with the info below"
754 einfo "eextra: ${eextra}" 580 einfo "eextra: $@"
755 die "Required function missing" 581 die "Required function missing"
756 fi 582 fi
757 elif use x86-fbsd ; then 583 ;;
758 if [ -z "${eextra}" ] 584 *-freebsd*|*-dragonfly*)
759 then 585 if [[ -z $@ ]] ; then
760 pw useradd ${euser} ${opts} \ 586 pw useradd ${euser} ${opts} \
761 -c "added by portage for ${PN}" \ 587 -c "added by portage for ${PN}" \
762 die "enewuser failed" 588 die "enewuser failed"
763 else 589 else
764 einfo " - Extra: ${eextra}" 590 einfo " - Extra: $@"
765 pw useradd ${euser} ${opts} \ 591 pw useradd ${euser} ${opts} \
766 -c ${eextra} || die "enewuser failed" 592 "$@" || die "enewuser failed"
767 fi 593 fi
594 ;;
595
596 *-netbsd*)
597 if [[ -z $@ ]] ; then
598 useradd ${opts} ${euser} || die "enewuser failed"
768 else 599 else
769 if [ -z "${eextra}" ] 600 einfo " - Extra: $@"
770 then 601 useradd ${opts} ${euser} "$@" || die "enewuser failed"
602 fi
603 ;;
604
605 *-openbsd*)
606 if [[ -z $@ ]] ; then
607 useradd -u ${euid} -s ${eshell} \
608 -d ${ehome} -c "Added by portage for ${PN}" \
609 -g ${egroups} ${euser} || die "enewuser failed"
610 else
611 einfo " - Extra: $@"
612 useradd -u ${euid} -s ${eshell} \
613 -d ${ehome} -c "Added by portage for ${PN}" \
614 -g ${egroups} ${euser} "$@" || die "enewuser failed"
615 fi
616 ;;
617
618 *)
619 if [[ -z $@ ]] ; then
771 useradd ${opts} ${euser} \ 620 useradd ${opts} ${euser} \
772 -c "added by portage for ${PN}" \ 621 -c "added by portage for ${PN}" \
773 || die "enewuser failed" 622 || die "enewuser failed"
774 else 623 else
775 einfo " - Extra: ${eextra}" 624 einfo " - Extra: $@"
776 useradd ${opts} ${euser} ${eextra} \ 625 useradd ${opts} ${euser} "$@" \
777 || die "enewuser failed" 626 || die "enewuser failed"
778 fi 627 fi
628 ;;
629 esac
630
631 if [[ ! -e ${ROOT}/${ehome} ]] ; then
632 einfo " - Creating ${ehome} in ${ROOT}"
633 mkdir -p "${ROOT}/${ehome}"
634 chown ${euser} "${ROOT}/${ehome}"
635 chmod 755 "${ROOT}/${ehome}"
779 fi 636 fi
637
780 export SANDBOX_ON="${oldsandbox}" 638 export SANDBOX_ON=${oldsandbox}
781
782 if [ ! -e "${ehome}" ] && [ ! -e "${D}/${ehome}" ]
783 then
784 einfo " - Creating ${ehome} in ${D}"
785 dodir ${ehome}
786 fowners ${euser} ${ehome}
787 fperms 755 ${ehome}
788 fi
789} 639}
790 640
791# Simplify/standardize adding groups to the system 641# Simplify/standardize adding groups to the system
792# vapier@gentoo.org 642# vapier@gentoo.org
793# 643#
796# Default values if you do not specify any: 646# Default values if you do not specify any:
797# groupname: REQUIRED ! 647# groupname: REQUIRED !
798# gid: next available (see groupadd(8)) 648# gid: next available (see groupadd(8))
799# extra: none 649# extra: none
800enewgroup() { 650enewgroup() {
651 case ${EBUILD_PHASE} in
652 unpack|compile|test|install)
653 eerror "'enewgroup()' called from '${EBUILD_PHASE}()' which is not a pkg_* function."
654 eerror "Package fails at QA and at life. Please file a bug."
655 die "Bad package! enewgroup is only for use in pkg_* functions!"
656 esac
657
801 # get the group 658 # get the group
802 local egroup="$1"; shift 659 local egroup="$1"; shift
803 if [ -z "${egroup}" ] 660 if [ -z "${egroup}" ]
804 then 661 then
805 eerror "No group specified !" 662 eerror "No group specified !"
806 die "Cannot call enewgroup without a group" 663 die "Cannot call enewgroup without a group"
807 fi 664 fi
808 665
809 # see if group already exists 666 # see if group already exists
810 if [ "${egroup}" == "`egetent group \"${egroup}\" | cut -d: -f1`" ] 667 if [[ -n $(egetent group "${egroup}") ]]; then
811 then
812 return 0 668 return 0
813 fi 669 fi
814 einfo "Adding group '${egroup}' to your system ..." 670 einfo "Adding group '${egroup}' to your system ..."
815 671
816 # options to pass to useradd 672 # options to pass to useradd
822 then 678 then
823 if [ "${egid}" -gt 0 ] 679 if [ "${egid}" -gt 0 ]
824 then 680 then
825 if [ -z "`egetent group ${egid}`" ] 681 if [ -z "`egetent group ${egid}`" ]
826 then 682 then
827 if useq macos || useq ppc-macos ; then 683 if [[ "${CHOST}" == *-darwin* ]]; then
828 opts="${opts} ${egid}" 684 opts="${opts} ${egid}"
829 else 685 else
830 opts="${opts} -g ${egid}" 686 opts="${opts} -g ${egid}"
831 fi 687 fi
832 else 688 else
846 opts="${opts} ${eextra}" 702 opts="${opts} ${eextra}"
847 703
848 # add the group 704 # add the group
849 local oldsandbox="${SANDBOX_ON}" 705 local oldsandbox="${SANDBOX_ON}"
850 export SANDBOX_ON="0" 706 export SANDBOX_ON="0"
851 if useq macos || useq ppc-macos ; 707 case ${CHOST} in
852 then 708 *-darwin*)
853 if [ ! -z "${eextra}" ]; 709 if [ ! -z "${eextra}" ];
854 then 710 then
855 einfo "Extra options are not supported on macos yet" 711 einfo "Extra options are not supported on Darwin/OS X yet"
856 einfo "Please report the ebuild along with the info below" 712 einfo "Please report the ebuild along with the info below"
857 einfo "eextra: ${eextra}" 713 einfo "eextra: ${eextra}"
858 die "Required function missing" 714 die "Required function missing"
859 fi 715 fi
860 716
861 # If we need the next available 717 # If we need the next available
862 case ${egid} in 718 case ${egid} in
863 *[!0-9]*) # Non numeric 719 *[!0-9]*) # Non numeric
864 for egid in `jot 898 101`; do 720 for ((egid = 101; egid <= 999; egid++)); do
865 [ -z "`egetent group ${egid}`" ] && break 721 [[ -z $(egetent group ${egid}) ]] && break
866 done 722 done
867 esac 723 esac
868 dscl . create /groups/${egroup} gid ${egid} 724 dscl . create /groups/${egroup} gid ${egid}
869 dscl . create /groups/${egroup} passwd '*' 725 dscl . create /groups/${egroup} passwd '*'
870 elif use x86-fbsd ; then 726 ;;
727
728 *-freebsd*|*-dragonfly*)
871 case ${egid} in 729 case ${egid} in
872 *[!0-9]*) # Non numeric 730 *[!0-9]*) # Non numeric
873 for egid in `jot 898 101`; do 731 for ((egid = 101; egid <= 999; egid++)); do
874 [ -z "`egetent group ${egid}`" ] && break 732 [[ -z $(egetent group ${egid}) ]] && break
875 done 733 done
876 esac 734 esac
877 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 735 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
878 else 736 ;;
737
738 *-netbsd*)
739 case ${egid} in
740 *[!0-9]*) # Non numeric
741 for ((egid = 101; egid <= 999; egid++)); do
742 [[ -z $(egetent group ${egid}) ]] && break
743 done
744 esac
745 groupadd -g ${egid} ${egroup} || die "enewgroup failed"
746 ;;
747
748 *)
879 groupadd ${opts} ${egroup} || die "enewgroup failed" 749 groupadd ${opts} ${egroup} || die "enewgroup failed"
880 fi 750 ;;
751 esac
881 export SANDBOX_ON="${oldsandbox}" 752 export SANDBOX_ON="${oldsandbox}"
882} 753}
883 754
884# Simple script to replace 'dos2unix' binaries 755# Simple script to replace 'dos2unix' binaries
885# vapier@gentoo.org 756# vapier@gentoo.org
886# 757#
887# edos2unix(file, <more files>...) 758# edos2unix(file, <more files> ...)
888edos2unix() { 759edos2unix() {
889 for f in "$@" 760 echo "$@" | xargs sed -i 's/\r$//'
890 do
891 cp "${f}" ${T}/edos2unix
892 sed 's/\r$//' ${T}/edos2unix > "${f}"
893 done
894} 761}
762
763
764##############################################################
765# START: Handle .desktop files and menu entries #
766# maybe this should be separated into a new eclass some time #
767# lanius@gentoo.org #
768##############################################################
895 769
896# Make a desktop file ! 770# Make a desktop file !
897# Great for making those icons in kde/gnome startmenu ! 771# Great for making those icons in kde/gnome startmenu !
898# Amaze your friends ! Get the women ! Join today ! 772# Amaze your friends ! Get the women ! Join today !
899# 773#
900# make_desktop_entry(<binary>, [name], [icon], [type], [path]) 774# make_desktop_entry(<command>, [name], [icon], [type], [path])
901# 775#
902# binary: what binary does the app run with ? 776# binary: what command does the app run with ?
903# name: the name that will show up in the menu 777# name: the name that will show up in the menu
904# icon: give your little like a pretty little icon ... 778# icon: give your little like a pretty little icon ...
905# this can be relative (to /usr/share/pixmaps) or 779# this can be relative (to /usr/share/pixmaps) or
906# a full path to an icon 780# a full path to an icon
907# type: what kind of application is this ? for categories: 781# type: what kind of application is this ? for categories:
908# http://www.freedesktop.org/standards/menu-spec/ 782# http://www.freedesktop.org/Standards/desktop-entry-spec
909# path: if your app needs to startup in a specific dir 783# path: if your app needs to startup in a specific dir
910make_desktop_entry() { 784make_desktop_entry() {
911 [ -z "$1" ] && eerror "make_desktop_entry: You must specify the executable" && return 1 785 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1
912 786
913 local exec="${1}" 787 local exec=${1}
914 local name="${2:-${PN}}" 788 local name=${2:-${PN}}
915 local icon="${3:-${PN}.png}" 789 local icon=${3:-${PN}.png}
916 local type="${4}" 790 local type=${4}
917 local subdir="${6}" 791 local path=${5}
918 local path="${5:-${GAMES_BINDIR}}" 792
919 if [ -z "${type}" ] 793 if [[ -z ${type} ]] ; then
920 then 794 local catmaj=${CATEGORY%%-*}
921 case ${CATEGORY} in 795 local catmin=${CATEGORY##*-}
922 "app-emulation") 796 case ${catmaj} in
923 type=Emulator 797 app)
924 subdir="Emulation" 798 case ${catmin} in
799 admin) type=System;;
800 cdr) type=DiscBurning;;
801 dicts) type=Dictionary;;
802 editors) type=TextEditor;;
803 emacs) type=TextEditor;;
804 emulation) type=Emulator;;
805 laptop) type=HardwareSettings;;
806 office) type=Office;;
807 vim) type=TextEditor;;
808 xemacs) type=TextEditor;;
809 *) type=;;
810 esac
925 ;; 811 ;;
926 "games-"*) 812
927 type=Game 813 dev)
928 subdir="Games" 814 type="Development"
929 ;; 815 ;;
930 "net-"*) 816
931 type=Network 817 games)
932 subdir="${type}" 818 case ${catmin} in
819 action) type=ActionGame;;
820 arcade) type=ArcadeGame;;
821 board) type=BoardGame;;
822 kids) type=KidsGame;;
823 emulation) type=Emulator;;
824 puzzle) type=LogicGame;;
825 rpg) type=RolePlaying;;
826 roguelike) type=RolePlaying;;
827 simulation) type=Simulation;;
828 sports) type=SportsGame;;
829 strategy) type=StrategyGame;;
830 *) type=;;
831 esac
832 type="Game;${type}"
933 ;; 833 ;;
834
835 mail)
836 type="Network;Email"
837 ;;
838
839 media)
840 case ${catmin} in
841 gfx) type=Graphics;;
842 radio) type=Tuner;;
843 sound) type=Audio;;
844 tv) type=TV;;
845 video) type=Video;;
846 *) type=;;
847 esac
848 type="AudioVideo;${type}"
849 ;;
850
851 net)
852 case ${catmin} in
853 dialup) type=Dialup;;
854 ftp) type=FileTransfer;;
855 im) type=InstantMessaging;;
856 irc) type=IRCClient;;
857 mail) type=Email;;
858 news) type=News;;
859 nntp) type=News;;
860 p2p) type=FileTransfer;;
861 *) type=;;
862 esac
863 type="Network;${type}"
864 ;;
865
866 sci)
867 case ${catmin} in
868 astro*) type=Astronomy;;
869 bio*) type=Biology;;
870 calc*) type=Calculator;;
871 chem*) type=Chemistry;;
872 geo*) type=Geology;;
873 math*) type=Math;;
874 *) type=;;
875 esac
876 type="Science;${type}"
877 ;;
878
879 www)
880 case ${catmin} in
881 client) type=WebBrowser;;
882 *) type=;;
883 esac
884 type="Network"
885 ;;
886
934 *) 887 *)
935 type= 888 type=
936 subdir=
937 ;; 889 ;;
938 esac 890 esac
939 fi 891 fi
892 if [ "${SLOT}" == "0" ] ; then
893 local desktop_name="${PN}"
894 else
895 local desktop_name="${PN}-${SLOT}"
896 fi
940 local desktop="${T}/${exec}.desktop" 897 local desktop=${T}/${exec%% *}-${desktop_name}.desktop
898# local desktop=${T}/${exec%% *:-${desktop_name}}.desktop
941 899
942echo "[Desktop Entry] 900echo "[Desktop Entry]
943Encoding=UTF-8 901Encoding=UTF-8
944Version=0.9.2 902Version=0.9.2
945Name=${name} 903Name=${name}
946Type=Application 904Type=Application
947Comment=${DESCRIPTION} 905Comment=${DESCRIPTION}
948Exec=${exec} 906Exec=${exec}
907TryExec=${exec%% *}
949Path=${path} 908Path=${path}
950Icon=${icon} 909Icon=${icon}
951Categories=Application;${type};" > "${desktop}" 910Categories=Application;${type};" > "${desktop}"
952 911
912 (
913 # wrap the env here so that the 'insinto' call
914 # doesn't corrupt the env of the caller
915 insinto /usr/share/applications
916 doins "${desktop}"
917 )
918}
919
920# Make a GDM/KDM Session file
921#
922# make_session_desktop(<title>, <command>)
923# title: File to execute to start the Window Manager
924# command: Name of the Window Manager
925
926make_session_desktop() {
927 [[ -z $1 ]] && eerror "make_session_desktop: You must specify the title" && return 1
928 [[ -z $2 ]] && eerror "make_session_desktop: You must specify the command" && return 1
929
930 local title=$1
931 local command=$2
932 local desktop=${T}/${wm}.desktop
933
934echo "[Desktop Entry]
935Encoding=UTF-8
936Name=${title}
937Comment=This session logs you into ${title}
938Exec=${command}
939TryExec=${command}
940Type=Application" > "${desktop}"
941
942 insinto /usr/share/xsessions
943 doins "${desktop}"
944}
945
946domenu() {
947 local i j
953 insinto /usr/share/applications 948 insinto /usr/share/applications
954 doins "${desktop}" 949 for i in "$@" ; do
955 950 if [[ -f ${i} ]] ; then
956 return 0 951 doins "${i}"
952 elif [[ -d ${i} ]] ; then
953 for j in "${i}"/*.desktop ; do
954 doins "${j}"
955 done
956 fi
957 done
957} 958}
959newmenu() {
960 insinto /usr/share/applications
961 newins "$1" "$2"
962}
963
964doicon() {
965 local i j
966 insinto /usr/share/pixmaps
967 for i in "$@" ; do
968 if [[ -f ${i} ]] ; then
969 doins "${i}"
970 elif [[ -d ${i} ]] ; then
971 for j in "${i}"/*.png ; do
972 doins "${j}"
973 done
974 fi
975 done
976}
977newicon() {
978 insinto /usr/share/pixmaps
979 newins "$1" "$2"
980}
981
982##############################################################
983# END: Handle .desktop files and menu entries #
984##############################################################
985
958 986
959# for internal use only (unpack_pdv and unpack_makeself) 987# for internal use only (unpack_pdv and unpack_makeself)
960find_unpackable_file() { 988find_unpackable_file() {
961 local src="$1" 989 local src=$1
962 if [ -z "${src}" ] 990 if [[ -z ${src} ]] ; then
963 then
964 src="${DISTDIR}/${A}" 991 src=${DISTDIR}/${A}
965 else 992 else
966 if [ -e "${DISTDIR}/${src}" ] 993 if [[ -e ${DISTDIR}/${src} ]] ; then
967 then
968 src="${DISTDIR}/${src}" 994 src=${DISTDIR}/${src}
969 elif [ -e "${PWD}/${src}" ] 995 elif [[ -e ${PWD}/${src} ]] ; then
970 then
971 src="${PWD}/${src}" 996 src=${PWD}/${src}
972 elif [ -e "${src}" ] 997 elif [[ -e ${src} ]] ; then
973 then
974 src="${src}" 998 src=${src}
975 fi
976 fi 999 fi
977 [ ! -e "${src}" ] && die "Could not find requested archive ${src}" 1000 fi
1001 [[ ! -e ${src} ]] && return 1
978 echo "${src}" 1002 echo "${src}"
979} 1003}
980 1004
981# Unpack those pesky pdv generated files ... 1005# Unpack those pesky pdv generated files ...
982# They're self-unpacking programs with the binary package stuffed in 1006# They're self-unpacking programs with the binary package stuffed in
997# lseek 1021# lseek
998# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 1022# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
999# lseek(3, -4, SEEK_END) = 2981250 1023# lseek(3, -4, SEEK_END) = 2981250
1000# thus we would pass in the value of '4' as the second parameter. 1024# thus we would pass in the value of '4' as the second parameter.
1001unpack_pdv() { 1025unpack_pdv() {
1002 local src="`find_unpackable_file $1`" 1026 local src=$(find_unpackable_file $1)
1003 local sizeoff_t="$2" 1027 local sizeoff_t=$2
1004 1028
1029 [[ -z ${src} ]] && die "Could not locate source for '$1'"
1005 [ -z "${sizeoff_t}" ] && die "No idea what off_t size was used for this pdv :(" 1030 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :("
1006 1031
1007 local shrtsrc="`basename ${src}`" 1032 local shrtsrc=$(basename "${src}")
1008 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1033 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1009 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1034 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"`
1010 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"` 1035 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"`
1011 1036
1012 # grab metadata for debug reasons 1037 # grab metadata for debug reasons
1076# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1101# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1077# - If the file is not specified then unpack will utilize ${A}. 1102# - If the file is not specified then unpack will utilize ${A}.
1078# - If the offset is not specified then we will attempt to extract 1103# - If the offset is not specified then we will attempt to extract
1079# the proper offset from the script itself. 1104# the proper offset from the script itself.
1080unpack_makeself() { 1105unpack_makeself() {
1106 local src_input=${1:-${A}}
1081 local src="$(find_unpackable_file "$1")" 1107 local src=$(find_unpackable_file "${src_input}")
1082 local skip="$2" 1108 local skip=$2
1083 local exe="$3" 1109 local exe=$3
1084 1110
1111 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
1112
1085 local shrtsrc="$(basename "${src}")" 1113 local shrtsrc=$(basename "${src}")
1086 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1114 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1087 if [ -z "${skip}" ] 1115 if [[ -z ${skip} ]] ; then
1088 then
1089 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1116 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}')
1090 local skip=0 1117 local skip=0
1091 exe=tail 1118 exe=tail
1092 case ${ver} in 1119 case ${ver} in
1093 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same 1120 1.5.*|1.6.0-nv) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same
1094 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1121 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1095 ;; 1122 ;;
1096 2.0|2.0.1) 1123 2.0|2.0.1)
1097 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-) 1124 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-)
1098 ;; 1125 ;;
1106 ;; 1133 ;;
1107 2.1.3) 1134 2.1.3)
1108 skip=`grep -a ^offset= "${src}" | awk '{print $3}'` 1135 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1109 let skip="skip + 1" 1136 let skip="skip + 1"
1110 ;; 1137 ;;
1111 2.1.4) 1138 2.1.4|2.1.5)
1112 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1) 1139 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1)
1113 skip=$(head -n ${skip} "${src}" | wc -c) 1140 skip=$(head -n ${skip} "${src}" | wc -c)
1114 exe="dd" 1141 exe="dd"
1115 ;; 1142 ;;
1116 *) 1143 *)
1132 # lets grab the first few bytes of the file to figure out what kind of archive it is 1159 # lets grab the first few bytes of the file to figure out what kind of archive it is
1133 local tmpfile="$(emktemp)" 1160 local tmpfile="$(emktemp)"
1134 eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}" 1161 eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}"
1135 local filetype="$(file -b "${tmpfile}")" 1162 local filetype="$(file -b "${tmpfile}")"
1136 case ${filetype} in 1163 case ${filetype} in
1137 *tar\ archive) 1164 *tar\ archive*)
1138 eval ${exe} | tar --no-same-owner -xf - 1165 eval ${exe} | tar --no-same-owner -xf -
1139 ;; 1166 ;;
1140 bzip2*) 1167 bzip2*)
1141 eval ${exe} | bzip2 -dc | tar --no-same-owner -xf - 1168 eval ${exe} | bzip2 -dc | tar --no-same-owner -xf -
1142 ;; 1169 ;;
1161check_license() { 1188check_license() {
1162 local lic=$1 1189 local lic=$1
1163 if [ -z "${lic}" ] ; then 1190 if [ -z "${lic}" ] ; then
1164 lic="${PORTDIR}/licenses/${LICENSE}" 1191 lic="${PORTDIR}/licenses/${LICENSE}"
1165 else 1192 else
1166 if [ -e "${PORTDIR}/licenses/${src}" ] ; then 1193 if [ -e "${PORTDIR}/licenses/${lic}" ] ; then
1167 lic="${PORTDIR}/licenses/${src}" 1194 lic="${PORTDIR}/licenses/${lic}"
1168 elif [ -e "${PWD}/${src}" ] ; then 1195 elif [ -e "${PWD}/${lic}" ] ; then
1169 lic="${PWD}/${src}" 1196 lic="${PWD}/${lic}"
1170 elif [ -e "${src}" ] ; then 1197 elif [ -e "${lic}" ] ; then
1171 lic="${src}" 1198 lic="${lic}"
1172 fi
1173 fi 1199 fi
1200 fi
1174 [ ! -f "${lic}" ] && die "Could not find requested license ${src}" 1201 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1175 local l="`basename ${lic}`" 1202 local l="`basename ${lic}`"
1176 1203
1177 # here is where we check for the licenses the user already 1204 # here is where we check for the licenses the user already
1178 # accepted ... if we don't find a match, we make the user accept 1205 # accepted ... if we don't find a match, we make the user accept
1179 local shopts=$- 1206 local shopts=$-
1180 local alic 1207 local alic
1181 set -o noglob #so that bash doesn't expand "*" 1208 set -o noglob #so that bash doesn't expand "*"
1182 for alic in ${ACCEPT_LICENSE} ; do 1209 for alic in ${ACCEPT_LICENSE} ; do
1183 if [[ ${alic} == * || ${alic} == ${l} ]]; then 1210 if [[ ${alic} == ${l} ]]; then
1184 set +o noglob; set -${shopts} #reset old shell opts 1211 set +o noglob; set -${shopts} #reset old shell opts
1185 return 0 1212 return 0
1186 fi 1213 fi
1187 done 1214 done
1188 set +o noglob; set -$shopts #reset old shell opts 1215 set +o noglob; set -$shopts #reset old shell opts
1221# and when the function returns, you can assume that the cd has been 1248# and when the function returns, you can assume that the cd has been
1222# found at CDROM_ROOT. 1249# found at CDROM_ROOT.
1223# 1250#
1224# normally the cdrom functions will refer to the cds as 'cd #1', 'cd #2', 1251# normally the cdrom functions will refer to the cds as 'cd #1', 'cd #2',
1225# etc... if you want to give the cds better names, then just export 1252# etc... if you want to give the cds better names, then just export
1226# the CDROM_NAME_X variables before calling cdrom_get_cds(). 1253# the appropriate CDROM_NAME variable before calling cdrom_get_cds().
1254# - CDROM_NAME="fooie cd" - for when you only want 1 cd
1255# - CDROM_NAME_1="install cd" - for when you want more than 1 cd
1256# CDROM_NAME_2="data cd"
1257# - CDROM_NAME_SET=( "install cd" "data cd" ) - short hand for CDROM_NAME_#
1227# 1258#
1228# for those multi cd ebuilds, see the cdrom_load_next_cd() below. 1259# for those multi cd ebuilds, see the cdrom_load_next_cd() below.
1229# 1260#
1230# Usage: cdrom_get_cds <file on cd1> [file on cd2] [file on cd3] [...] 1261# Usage: cdrom_get_cds <file on cd1> [file on cd2] [file on cd3] [...]
1231# - this will attempt to locate a cd based upon a file that is on 1262# - this will attempt to locate a cd based upon a file that is on
1235 # first we figure out how many cds we're dealing with by 1266 # first we figure out how many cds we're dealing with by
1236 # the # of files they gave us 1267 # the # of files they gave us
1237 local cdcnt=0 1268 local cdcnt=0
1238 local f= 1269 local f=
1239 for f in "$@" ; do 1270 for f in "$@" ; do
1240 cdcnt=$((cdcnt + 1)) 1271 ((++cdcnt))
1241 export CDROM_CHECK_${cdcnt}="$f" 1272 export CDROM_CHECK_${cdcnt}="$f"
1242 done 1273 done
1243 export CDROM_TOTAL_CDS=${cdcnt} 1274 export CDROM_TOTAL_CDS=${cdcnt}
1244 export CDROM_CURRENT_CD=1 1275 export CDROM_CURRENT_CD=1
1245 1276
1246 # now we see if the user gave use CD_ROOT ... 1277 # now we see if the user gave use CD_ROOT ...
1247 # if they did, let's just believe them that it's correct 1278 # if they did, let's just believe them that it's correct
1248 if [ ! -z "${CD_ROOT}" ] ; then 1279 if [[ -n ${CD_ROOT}${CD_ROOT_1} ]] ; then
1249 export CDROM_ROOT="${CD_ROOT}"
1250 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1251 return
1252 fi
1253 # do the same for CD_ROOT_X
1254 if [ ! -z "${CD_ROOT_1}" ] ; then
1255 local var= 1280 local var=
1256 cdcnt=0 1281 cdcnt=0
1257 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do 1282 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1258 cdcnt=$((cdcnt + 1)) 1283 ((++cdcnt))
1259 var="CD_ROOT_${cdcnt}" 1284 var="CD_ROOT_${cdcnt}"
1285 [[ -z ${!var} ]] && var="CD_ROOT"
1260 if [ -z "${!var}" ] ; then 1286 if [[ -z ${!var} ]] ; then
1261 eerror "You must either use just the CD_ROOT" 1287 eerror "You must either use just the CD_ROOT"
1262 eerror "or specify ALL the CD_ROOT_X variables." 1288 eerror "or specify ALL the CD_ROOT_X variables."
1263 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables." 1289 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables."
1264 die "could not locate CD_ROOT_${cdcnt}" 1290 die "could not locate CD_ROOT_${cdcnt}"
1265 fi 1291 fi
1266 export CDROM_ROOTS_${cdcnt}="${!var}"
1267 done 1292 done
1268 export CDROM_ROOT=${CDROM_ROOTS_1} 1293 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}}
1269 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1294 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1295 export CDROM_SET=-1
1296 for f in ${CDROM_CHECK_1//:/ } ; do
1297 ((++CDROM_SET))
1298 [[ -e ${CD_ROOT}/${f} ]] && break
1299 done
1300 export CDROM_MATCH=${f}
1270 return 1301 return
1271 fi 1302 fi
1272 1303
1304 # User didn't help us out so lets make sure they know they can
1305 # simplify the whole process ...
1273 if [ ${CDROM_TOTAL_CDS} -eq 1 ] ; then 1306 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1274 einfon "This ebuild will need the " 1307 einfo "This ebuild will need the ${CDROM_NAME:-cdrom for ${PN}}"
1275 if [ -z "${CDROM_NAME}" ] ; then
1276 echo "cdrom for ${PN}."
1277 else
1278 echo "${CDROM_NAME}."
1279 fi
1280 echo 1308 echo
1281 einfo "If you do not have the CD, but have the data files" 1309 einfo "If you do not have the CD, but have the data files"
1282 einfo "mounted somewhere on your filesystem, just export" 1310 einfo "mounted somewhere on your filesystem, just export"
1283 einfo "the variable CD_ROOT so that it points to the" 1311 einfo "the variable CD_ROOT so that it points to the"
1284 einfo "directory containing the files." 1312 einfo "directory containing the files."
1285 echo 1313 echo
1314 einfo "For example:"
1315 einfo "export CD_ROOT=/mnt/cdrom"
1316 echo
1286 else 1317 else
1318 if [[ -n ${CDROM_NAME_SET} ]] ; then
1319 # Translate the CDROM_NAME_SET array into CDROM_NAME_#
1320 cdcnt=0
1321 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1322 ((++cdcnt))
1323 export CDROM_NAME_${cdcnt}="${CDROM_NAME_SET[$((${cdcnt}-1))]}"
1324 done
1325 fi
1326
1287 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1327 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1288 cdcnt=0 1328 cdcnt=0
1289 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do 1329 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1290 cdcnt=$((cdcnt + 1)) 1330 ((++cdcnt))
1291 var="CDROM_NAME_${cdcnt}" 1331 var="CDROM_NAME_${cdcnt}"
1292 [ ! -z "${!var}" ] && einfo " CD ${cdcnt}: ${!var}" 1332 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}"
1293 done 1333 done
1294 echo 1334 echo
1295 einfo "If you do not have the CDs, but have the data files" 1335 einfo "If you do not have the CDs, but have the data files"
1296 einfo "mounted somewhere on your filesystem, just export" 1336 einfo "mounted somewhere on your filesystem, just export"
1297 einfo "the following variables so they point to the right place:" 1337 einfo "the following variables so they point to the right place:"
1298 einfon "" 1338 einfon ""
1299 cdcnt=0 1339 cdcnt=0
1300 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do 1340 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1301 cdcnt=$((cdcnt + 1)) 1341 ((++cdcnt))
1302 echo -n " CD_ROOT_${cdcnt}" 1342 echo -n " CD_ROOT_${cdcnt}"
1303 done 1343 done
1304 echo 1344 echo
1305 einfo "Or, if you have all the files in the same place, or" 1345 einfo "Or, if you have all the files in the same place, or"
1306 einfo "you only have one cdrom, you can export CD_ROOT" 1346 einfo "you only have one cdrom, you can export CD_ROOT"
1307 einfo "and that place will be used as the same data source" 1347 einfo "and that place will be used as the same data source"
1308 einfo "for all the CDs." 1348 einfo "for all the CDs."
1309 echo 1349 echo
1350 einfo "For example:"
1351 einfo "export CD_ROOT_1=/mnt/cdrom"
1352 echo
1310 fi 1353 fi
1354
1355 export CDROM_SET=""
1311 export CDROM_CURRENT_CD=0 1356 export CDROM_CURRENT_CD=0
1312 cdrom_load_next_cd 1357 cdrom_load_next_cd
1313} 1358}
1314 1359
1315# this is only used when you need access to more than one cd. 1360# this is only used when you need access to more than one cd.
1316# when you have finished using the first cd, just call this function. 1361# when you have finished using the first cd, just call this function.
1317# when it returns, CDROM_ROOT will be pointing to the second cd. 1362# when it returns, CDROM_ROOT will be pointing to the second cd.
1318# remember, you can only go forward in the cd chain, you can't go back. 1363# remember, you can only go forward in the cd chain, you can't go back.
1319cdrom_load_next_cd() { 1364cdrom_load_next_cd() {
1320 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1321 local var= 1365 local var
1322 1366 ((++CDROM_CURRENT_CD))
1323 if [ ! -z "${CD_ROOT}" ] ; then
1324 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}"
1325 return
1326 fi
1327 1367
1328 unset CDROM_ROOT 1368 unset CDROM_ROOT
1329 var=CDROM_ROOTS_${CDROM_CURRENT_CD} 1369 var=CD_ROOT_${CDROM_CURRENT_CD}
1370 [[ -z ${!var} ]] && var="CD_ROOT"
1330 if [ -z "${!var}" ] ; then 1371 if [[ -z ${!var} ]] ; then
1331 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1372 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1332 cdrom_locate_file_on_cd ${!var} 1373 _cdrom_locate_file_on_cd ${!var}
1333 else 1374 else
1334 export CDROM_ROOT="${!var}" 1375 export CDROM_ROOT=${!var}
1335 fi 1376 fi
1336 1377
1337 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1378 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1338} 1379}
1339 1380
1342# all it does is try to locate a give file on a cd ... if the cd isn't 1383# all it does is try to locate a give file on a cd ... if the cd isn't
1343# found, then a message asking for the user to insert the cdrom will be 1384# found, then a message asking for the user to insert the cdrom will be
1344# displayed and we'll hang out here until: 1385# displayed and we'll hang out here until:
1345# (1) the file is found on a mounted cdrom 1386# (1) the file is found on a mounted cdrom
1346# (2) the user hits CTRL+C 1387# (2) the user hits CTRL+C
1347cdrom_locate_file_on_cd() { 1388_cdrom_locate_file_on_cd() {
1348 while [ -z "${CDROM_ROOT}" ] ; do
1349 local dir="$(dirname ${@})"
1350 local file="$(basename ${@})"
1351 local mline="" 1389 local mline=""
1352 local showedmsg=0 1390 local showedmsg=0
1353 1391
1354 for mline in `mount | egrep -e '(iso|cdrom)' | awk '{print $3}'` ; do 1392 while [[ -z ${CDROM_ROOT} ]] ; do
1355 [ -d "${mline}/${dir}" ] || continue 1393 local i=0
1356 [ ! -z "$(find ${mline}/${dir} -iname ${file} -maxdepth 1)" ] \ 1394 local -a cdset=(${*//:/ })
1395 if [[ -n ${CDROM_SET} ]] ; then
1396 cdset=(${cdset[${CDROM_SET}]})
1397 fi
1398
1399 while [[ -n ${cdset[${i}]} ]] ; do
1400 local dir=$(dirname ${cdset[${i}]})
1401 local file=$(basename ${cdset[${i}]})
1402
1403 local point= node= fs= foo=
1404 while read point node fs foo ; do
1405 [[ *" ${fs} "* != " cd9660 iso9660 " ]] && continue
1406 point=${point//\040/ }
1407 [[ -z $(find "${point}/${dir}" -maxdepth 1 -iname "${file}") ]] && continue
1357 && export CDROM_ROOT=${mline} 1408 export CDROM_ROOT=${point}
1409 export CDROM_SET=${i}
1410 export CDROM_MATCH=${cdset[${i}]}
1411 return
1412 done <<< "$(get_mounts)"
1413
1414 ((++i))
1358 done 1415 done
1359 1416
1360 if [ -z "${CDROM_ROOT}" ] ; then
1361 echo 1417 echo
1362 if [ ${showedmsg} -eq 0 ] ; then 1418 if [[ ${showedmsg} -eq 0 ]] ; then
1363 if [ ${CDROM_TOTAL_CDS} -eq 1 ] ; then 1419 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1364 if [ -z "${CDROM_NAME}" ] ; then 1420 if [[ -z ${CDROM_NAME} ]] ; then
1365 einfo "Please insert the cdrom for ${PN} now !" 1421 einfo "Please insert+mount the cdrom for ${PN} now !"
1366 else
1367 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1368 fi
1369 else 1422 else
1370 if [ -z "${CDROM_NAME_1}" ] ; then
1371 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !"
1372 else
1373 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1374 einfo "Please insert+mount the ${!var} cdrom now !" 1423 einfo "Please insert+mount the ${CDROM_NAME} cdrom now !"
1375 fi
1376 fi 1424 fi
1377 showedmsg=1 1425 else
1426 if [[ -z ${CDROM_NAME_1} ]] ; then
1427 einfo "Please insert+mount cd #${CDROM_CURRENT_CD} for ${PN} now !"
1428 else
1429 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1430 einfo "Please insert+mount the ${!var} cdrom now !"
1431 fi
1378 fi 1432 fi
1433 showedmsg=1
1434 fi
1379 einfo "Press return to scan for the cd again" 1435 einfo "Press return to scan for the cd again"
1380 einfo "or hit CTRL+C to abort the emerge." 1436 einfo "or hit CTRL+C to abort the emerge."
1381 read 1437 echo
1382 fi 1438 einfo "If you are having trouble with the detection"
1439 einfo "of your CD, it is possible that you do not have"
1440 einfo "Joliet support enabled in your kernel. Please"
1441 einfo "check that CONFIG_JOLIET is enabled in your kernel."
1442 read || die "something is screwed with your system"
1383 done 1443 done
1384} 1444}
1385 1445
1386# Make sure that LINGUAS only contains languages that 1446# Make sure that LINGUAS only contains languages that
1387# a package can support 1447# a package can support
1394# The -i builds a list of po files found in all the 1454# The -i builds a list of po files found in all the
1395# directories and uses the intersection of the lists. 1455# directories and uses the intersection of the lists.
1396# The -u builds a list of po files found in all the 1456# The -u builds a list of po files found in all the
1397# directories and uses the union of the lists. 1457# directories and uses the union of the lists.
1398strip-linguas() { 1458strip-linguas() {
1399 local ls newls 1459 local ls newls nols
1400 if [ "$1" == "-i" ] || [ "$1" == "-u" ] ; then 1460 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1401 local op="$1"; shift 1461 local op=$1; shift
1402 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1462 ls=$(find "$1" -name '*.po' -exec basename {} .po \;); shift
1403 local d f 1463 local d f
1404 for d in "$@" ; do 1464 for d in "$@" ; do
1405 if [ "${op}" == "-u" ] ; then 1465 if [[ ${op} == "-u" ]] ; then
1406 newls="${ls}" 1466 newls=${ls}
1407 else 1467 else
1408 newls="" 1468 newls=""
1409 fi 1469 fi
1410 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1470 for f in $(find "$d" -name '*.po' -exec basename {} .po \;) ; do
1411 if [ "${op}" == "-i" ] ; then 1471 if [[ ${op} == "-i" ]] ; then
1412 [ "${ls/ ${f} /}" != "${ls}" ] && newls="${newls} ${f}" 1472 hasq ${f} ${ls} && newls="${newls} ${f}"
1413 else 1473 else
1414 [ "${ls/ ${f} /}" == "${ls}" ] && newls="${newls} ${f}" 1474 hasq ${f} ${ls} || newls="${newls} ${f}"
1415 fi 1475 fi
1416 done 1476 done
1417 ls="${newls}" 1477 ls=${newls}
1418 done 1478 done
1419 ls="${ls//.po}"
1420 else 1479 else
1421 ls="$@" 1480 ls="$@"
1422 fi 1481 fi
1423 1482
1424 ls=" ${ls} " 1483 nols=""
1425 newls="" 1484 newls=""
1426 for f in ${LINGUAS} ; do 1485 for f in ${LINGUAS} ; do
1427 if [ "${ls/ ${f} /}" != "${ls}" ] ; then 1486 if hasq ${f} ${ls} ; then
1428 nl="${newls} ${f}" 1487 newls="${newls} ${f}"
1429 else 1488 else
1430 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1489 nols="${nols} ${f}"
1431 fi 1490 fi
1432 done 1491 done
1433 if [ -z "${newls}" ] ; then 1492 [[ -n ${nols} ]] \
1434 unset LINGUAS 1493 && ewarn "Sorry, but ${PN} does not support the LINGUAs:" ${nols}
1435 else
1436 export LINGUAS="${newls}" 1494 export LINGUAS=${newls:1}
1437 fi
1438} 1495}
1439 1496
1440# moved from kernel.eclass since they are generally useful outside of 1497# moved from kernel.eclass since they are generally useful outside of
1441# kernel.eclass -iggy (20041002) 1498# kernel.eclass -iggy (20041002)
1442 1499
1443# the following functions are useful in kernel module ebuilds, etc. 1500# the following functions are useful in kernel module ebuilds, etc.
1444# for an example see ivtv or drbd ebuilds 1501# for an example see ivtv or drbd ebuilds
1445 1502
1446# set's ARCH to match what the kernel expects 1503# set's ARCH to match what the kernel expects
1447set_arch_to_kernel() { 1504set_arch_to_kernel() {
1505 i=10
1506 while ((i--)) ; do
1507 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1508 done
1448 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}" 1509 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1449 case ${ARCH} in 1510 case ${ARCH} in
1450 x86) export ARCH="i386";; 1511 x86) export ARCH="i386";;
1451 amd64) export ARCH="x86_64";; 1512 amd64) export ARCH="x86_64";;
1452 hppa) export ARCH="parisc";; 1513 hppa) export ARCH="parisc";;
1453 mips) export ARCH="mips";; 1514 mips) export ARCH="mips";;
1515 sparc) export ARCH="$(tc-arch-kernel)";; # Yeah this is ugly, but it's even WORSE if you don't do this. linux-info.eclass's set_arch_to_kernel is fixed, but won't get used over this one!
1454 *) export ARCH="${ARCH}";; 1516 *) export ARCH="${ARCH}";;
1455 esac 1517 esac
1456} 1518}
1457 1519
1458# set's ARCH back to what portage expects 1520# set's ARCH back to what portage expects
1459set_arch_to_portage() { 1521set_arch_to_portage() {
1522 i=10
1523 while ((i--)) ; do
1524 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1525 done
1460 export ARCH="${EUTILS_ECLASS_PORTAGE_ARCH}" 1526 export ARCH="${EUTILS_ECLASS_PORTAGE_ARCH}"
1461} 1527}
1462 1528
1463# Jeremy Huddleston <eradicator@gentoo.org>: 1529# Jeremy Huddleston <eradicator@gentoo.org>:
1464# preserve_old_lib /path/to/libblah.so.0 1530# preserve_old_lib /path/to/libblah.so.0
1465# preserve_old_lib_notify /path/to/libblah.so.0 1531# preserve_old_lib_notify /path/to/libblah.so.0
1466# 1532#
1467# These functions are useful when a lib in your package changes --soname. Such 1533# These functions are useful when a lib in your package changes --library. Such
1468# an example might be from libogg.so.0 to libogg.so.1. Removing libogg.so.0 1534# an example might be from libogg.so.0 to libogg.so.1. Removing libogg.so.0
1469# would break packages that link against it. Most people get around this 1535# would break packages that link against it. Most people get around this
1470# by using the portage SLOT mechanism, but that is not always a relevant 1536# by using the portage SLOT mechanism, but that is not always a relevant
1471# solution, so instead you can add the following to your ebuilds: 1537# solution, so instead you can add the following to your ebuilds:
1472# 1538#
1494 touch ${D}${LIB} 1560 touch ${D}${LIB}
1495 fi 1561 fi
1496} 1562}
1497 1563
1498preserve_old_lib_notify() { 1564preserve_old_lib_notify() {
1499 LIB=$1 1565 LIB=$1
1500 1566
1501 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1567 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1502 SONAME=`basename ${LIB}` 1568 SONAME=`basename ${LIB}`
1503 1569
1504 einfo "An old version of an installed library was detected on your system." 1570 ewarn "An old version of an installed library was detected on your system."
1505 einfo "In order to avoid breaking packages that link against is, this older version" 1571 ewarn "In order to avoid breaking packages that link against it, this older version"
1506 einfo "is not being removed. In order to make full use of this newer version," 1572 ewarn "is not being removed. In order to make full use of this newer version,"
1507 einfo "you will need to execute the following command:" 1573 ewarn "you will need to execute the following command:"
1508 einfo " revdep-rebuild --soname ${SONAME}" 1574 ewarn " revdep-rebuild --library ${SONAME}"
1509 einfo 1575 ewarn
1510 einfo "After doing that, you can safely remove ${LIB}" 1576 ewarn "After doing that, you can safely remove ${LIB}"
1511 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild" 1577 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1512 fi 1578 fi
1513} 1579}
1580
1581# Hack for people to figure out if a package was built with
1582# certain USE flags
1583#
1584# Usage: built_with_use [-a|-o] <DEPEND ATOM> <List of USE flags>
1585# ex: built_with_use xchat gtk2
1586#
1587# Flags: -a all USE flags should be utilized
1588# -o at least one USE flag should be utilized
1589# Note: the default flag is '-a'
1590built_with_use() {
1591 local opt=$1
1592 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1593
1594 local PKG=$(best_version $1)
1595 [[ -z ${PKG} ]] && die "Unable to resolve $1 to an installed package"
1596 shift
1597
1598 local USEFILE=${ROOT}/var/db/pkg/${PKG}/USE
1599 local IUSEFILE=${ROOT}/var/db/pkg/${PKG}/IUSE
1600
1601 # if the USE file doesnt exist, assume the $PKG is either
1602 # injected or package.provided
1603 [[ ! -e ${USEFILE} ]] && die "Unable to determine what USE flags $PKG was built with"
1604
1605 local IUSE_BUILT=$(<${IUSEFILE})
1606 # Don't check USE_EXPAND #147237
1607 local expand
1608 for expand in $(echo ${USE_EXPAND} | tr '[:upper:]' '[:lower:]') ; do
1609 if [[ $1 == ${expand}_* ]] ; then
1610 expand=""
1611 break
1612 fi
1613 done
1614 if [[ -n ${expand} ]] ; then
1615 has $1 ${IUSE_BUILT} || die "$PKG does not actually support the $1 USE flag!"
1616 fi
1617
1618 local USE_BUILT=$(<${USEFILE})
1619 while [[ $# -gt 0 ]] ; do
1620 if [[ ${opt} = "-o" ]] ; then
1621 has $1 ${USE_BUILT} && return 0
1622 else
1623 has $1 ${USE_BUILT} || return 1
1624 fi
1625 shift
1626 done
1627 [[ ${opt} = "-a" ]]
1628}
1629
1630# Many configure scripts wrongly bail when a C++ compiler
1631# could not be detected. #73450
1632epunt_cxx() {
1633 local dir=$1
1634 [[ -z ${dir} ]] && dir=${S}
1635 ebegin "Removing useless C++ checks"
1636 local f
1637 for f in $(find ${dir} -name configure) ; do
1638 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null
1639 done
1640 eend 0
1641}
1642
1643# dopamd <file> [more files]
1644#
1645# Install pam auth config file in /etc/pam.d
1646dopamd() {
1647 [[ -z $1 ]] && die "dopamd requires at least one argument"
1648
1649 use pam || return 0
1650
1651 INSDESTTREE=/etc/pam.d \
1652 doins "$@" || die "failed to install $@"
1653}
1654# newpamd <old name> <new name>
1655#
1656# Install pam file <old name> as <new name> in /etc/pam.d
1657newpamd() {
1658 [[ $# -ne 2 ]] && die "newpamd requires two arguements"
1659
1660 use pam || return 0
1661
1662 INSDESTTREE=/etc/pam.d \
1663 newins "$1" "$2" || die "failed to install $1 as $2"
1664}
1665
1666# make a wrapper script ...
1667# NOTE: this was originally games_make_wrapper, but I noticed other places where
1668# this could be used, so I have moved it here and made it not games-specific
1669# -- wolf31o2
1670# $1 == wrapper name
1671# $2 == binary to run
1672# $3 == directory to chdir before running binary
1673# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1674# $5 == path for wrapper
1675make_wrapper() {
1676 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1677 local tmpwrapper=$(emktemp)
1678 # We don't want to quote ${bin} so that people can pass complex
1679 # things as $bin ... "./someprog --args"
1680 cat << EOF > "${tmpwrapper}"
1681#!/bin/sh
1682cd "${chdir:-.}"
1683if [ -n "${libdir}" ] ; then
1684 if [ "\${LD_LIBRARY_PATH+set}" = "set" ] ; then
1685 export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1686 else
1687 export LD_LIBRARY_PATH="${libdir}"
1688 fi
1689fi
1690exec ${bin} "\$@"
1691EOF
1692 chmod go+rx "${tmpwrapper}"
1693 if [[ -n ${path} ]] ; then
1694 exeinto "${path}"
1695 newexe "${tmpwrapper}" "${wrapper}"
1696 else
1697 newbin "${tmpwrapper}" "${wrapper}"
1698 fi
1699}

Legend:
Removed from v.1.118  
changed lines
  Added in v.1.263

  ViewVC Help
Powered by ViewVC 1.1.20