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

Diff of /eclass/eutils.eclass

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

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

Legend:
Removed from v.1.149  
changed lines
  Added in v.1.256

  ViewVC Help
Powered by ViewVC 1.1.20