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

Diff of /eclass/eutils.eclass

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

Revision 1.179 Revision 1.256
1# Copyright 1999-2005 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.179 2005/05/28 05:50:29 vapier 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 15
20# 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
21# 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
22# 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
23# must be an integer greater than zero. 19# must be an integer greater than zero.
24# Bug 62950, Ciaran McCreesh <ciaranm@gentoo.org> (05 Sep 2004) 20# Bug 62950, Ciaran McCreesh <ciaranm@gentoo.org> (05 Sep 2004)
25epause() { 21epause() {
26 if [ -z "$EPAUSE_IGNORE" ] && [ -t 1 ] ; then 22 [[ -z ${EPAUSE_IGNORE} ]] && sleep ${1:-5}
27 sleep ${1:-5}
28 fi
29} 23}
30 24
31# 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
32# 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,
33# don't beep. 27# don't beep.
34# Bug 62950, Ciaran McCreesh <ciaranm@gentoo.org> (05 Sep 2004) 28# Bug 62950, Ciaran McCreesh <ciaranm@gentoo.org> (05 Sep 2004)
35ebeep() { 29ebeep() {
36 local n 30 local n
37 if [ -z "$EBEEP_IGNORE" ] && [ -t 1 ] ; then 31 if [[ -z ${EBEEP_IGNORE} ]] ; then
38 for ((n=1 ; n <= ${1:-5} ; n++)) ; do 32 for ((n=1 ; n <= ${1:-5} ; n++)) ; do
39 echo -ne "\a" 33 echo -ne "\a"
40 sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null 34 sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
41 echo -ne "\a" 35 echo -ne "\a"
42 sleep 1 36 sleep 1
61# to point to the latest version of the library present. 55# to point to the latest version of the library present.
62# 56#
63# <azarah@gentoo.org> (26 Oct 2002) 57# <azarah@gentoo.org> (26 Oct 2002)
64# 58#
65gen_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
66 local libdir="$(get_libdir)" 68 local lib libdir=$(get_libdir)
67 # Just make sure it exists 69 # Just make sure it exists
68 dodir /usr/${libdir} 70 dodir /usr/${libdir}
69 71
70 for lib in "${@}" ; do 72 for lib in "${@}" ; do
71 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT 73 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT
72 /* GNU ld script 74 /* GNU ld script
73 Since Gentoo has critical dynamic libraries 75 Since Gentoo has critical dynamic libraries
74 in /lib, and the static versions in /usr/lib, 76 in /lib, and the static versions in /usr/lib,
75 we need to have a "fake" dynamic lib in /usr/lib, 77 we need to have a "fake" dynamic lib in /usr/lib,
76 otherwise we run into linking problems. 78 otherwise we run into linking problems.
77 79
78 See bug http://bugs.gentoo.org/4411 for more info. 80 See bug http://bugs.gentoo.org/4411 for more info.
79 */ 81 */
80 GROUP ( /${libdir}/${lib} ) 82 GROUP ( /${libdir}/${lib} )
81 END_LDSCRIPT 83 END_LDSCRIPT
82 fperms a+x "/usr/${libdir}/${lib}" 84 fperms a+x "/usr/${libdir}/${lib}" || die "could not change perms on ${lib}"
83 done 85 done
84} 86}
85 87
86# Simple function to draw a line consisting of '=' the same length as $*
87# - only to be used by epatch()
88#
89# <azarah@gentoo.org> (11 Nov 2002)
90#
91draw_line() {
92 local i=0
93 local str_length=""
94
95 # Handle calls that do not have args, or wc not being installed ...
96 if [ -z "$1" -o ! -x "$(which wc 2>/dev/null)" ]
97 then
98 echo "==============================================================="
99 return 0
100 fi
101
102 # Get the length of $*
103 str_length="$(echo -n "$*" | wc -m)"
104
105 while [ "$i" -lt "${str_length}" ]
106 do
107 echo -n "="
108
109 i=$((i + 1))
110 done
111
112 echo
113
114 return 0
115}
116 88
117# Default directory where patches are located 89# Default directory where patches are located
118EPATCH_SOURCE="${WORKDIR}/patch" 90EPATCH_SOURCE="${WORKDIR}/patch"
119# Default extension for patches 91# Default extension for patches
120EPATCH_SUFFIX="patch.bz2" 92EPATCH_SUFFIX="patch.bz2"
121# Default options for patch 93# Default options for patch
122# 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
123# Set --no-backup-if-mismatch so we don't leave '.orig' files behind. 95# Set --no-backup-if-mismatch so we don't leave '.orig' files behind.
96# Set -E to automatically remove empty files.
124EPATCH_OPTS="-g0 --no-backup-if-mismatch" 97EPATCH_OPTS="-g0 -E --no-backup-if-mismatch"
125# 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,
126# and not the full path .. 99# and not the full path ..
127EPATCH_EXCLUDE="" 100EPATCH_EXCLUDE=""
128# Change the printed message for a single patch. 101# Change the printed message for a single patch.
129EPATCH_SINGLE_MSG="" 102EPATCH_SINGLE_MSG=""
167# hand its a directory, it will set EPATCH_SOURCE to this. 140# hand its a directory, it will set EPATCH_SOURCE to this.
168# 141#
169# <azarah@gentoo.org> (10 Nov 2002) 142# <azarah@gentoo.org> (10 Nov 2002)
170# 143#
171epatch() { 144epatch() {
145 _epatch_draw_line() {
146 [[ -z $1 ]] && set "$(printf "%65s" '')"
147 echo "${1//?/=}"
148 }
149 _epatch_assert() { local _pipestatus=${PIPESTATUS[*]}; [[ ${_pipestatus// /} -eq 0 ]] ; }
172 local PIPE_CMD="" 150 local PIPE_CMD=""
173 local STDERR_TARGET="${T}/$$.out" 151 local STDERR_TARGET="${T}/$$.out"
174 local PATCH_TARGET="${T}/$$.patch" 152 local PATCH_TARGET="${T}/$$.patch"
175 local PATCH_SUFFIX="" 153 local PATCH_SUFFIX=""
176 local SINGLE_PATCH="no" 154 local SINGLE_PATCH="no"
177 local x="" 155 local x=""
156
157 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402
178 158
179 if [ "$#" -gt 1 ] 159 if [ "$#" -gt 1 ]
180 then 160 then
181 local m="" 161 local m=""
182 for m in "$@" ; do 162 for m in "$@" ; do
283 263
284 # Allow for prefix to differ ... im lazy, so shoot me :/ 264 # Allow for prefix to differ ... im lazy, so shoot me :/
285 while [ "${count}" -lt 5 ] 265 while [ "${count}" -lt 5 ]
286 do 266 do
287 # Generate some useful debug info ... 267 # Generate some useful debug info ...
288 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 268 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
289 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 269 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
290 270
291 if [ "${PATCH_SUFFIX}" != "patch" ] 271 if [ "${PATCH_SUFFIX}" != "patch" ]
292 then 272 then
293 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 273 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
298 278
299 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 279 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
300 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 280 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
301 281
302 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 282 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
303 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 283 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
304 284
305 if [ "${PATCH_SUFFIX}" != "patch" ] 285 if [ "${PATCH_SUFFIX}" != "patch" ]
306 then 286 then
307 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1 287 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
308 then 288 then
312 count=5 292 count=5
313 break 293 break
314 fi 294 fi
315 fi 295 fi
316 296
317 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f) >> ${STDERR_TARGET%/*}/${patchname}-${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
318 then 298 then
319 draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 299 _epatch_draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
320 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 300 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
321 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 301 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
322 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 302 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
323 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 303 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
324 304
325 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1 305 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1
306 _epatch_assert
326 307
327 if [ "$?" -ne 0 ] 308 if [ "$?" -ne 0 ]
328 then 309 then
329 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 310 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
330 echo 311 echo
376# vapier@gentoo.org 357# vapier@gentoo.org
377# 358#
378# Takes just 1 optional parameter (the directory to create tmpfile in) 359# Takes just 1 optional parameter (the directory to create tmpfile in)
379emktemp() { 360emktemp() {
380 local exe="touch" 361 local exe="touch"
381 [ "$1" == "-d" ] && exe="mkdir" && shift 362 [[ $1 == -d ]] && exe="mkdir" && shift
382 local topdir="$1" 363 local topdir=$1
383 364
384 if [ -z "${topdir}" ] 365 if [[ -z ${topdir} ]] ; then
385 then
386 [ -z "${T}" ] \ 366 [[ -z ${T} ]] \
387 && topdir="/tmp" \ 367 && topdir="/tmp" \
388 || topdir="${T}" 368 || topdir=${T}
389 fi 369 fi
390 370
391 if [ -z "$(type -p mktemp)" ] 371 if [[ -z $(type -p mktemp) ]] ; then
392 then
393 local tmp=/ 372 local tmp=/
394 while [ -e "${tmp}" ] ; do 373 while [[ -e ${tmp} ]] ; do
395 tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}" 374 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}
396 done 375 done
397 ${exe} "${tmp}" 376 ${exe} "${tmp}" || ${exe} -p "${tmp}"
398 echo "${tmp}" 377 echo "${tmp}"
399 else 378 else
400 [ "${exe}" == "touch" ] \ 379 if [[ ${exe} == "touch" ]] ; then
401 && exe="-p" \ 380 [[ ${USERLAND} == "GNU" ]] \
402 || exe="-d" 381 && mktemp -p "${topdir}" \
403 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
404 fi 388 fi
405} 389}
406 390
407# Small wrapper for getent (Linux), nidump (Mac OS X), 391# Small wrapper for getent (Linux), nidump (Mac OS X),
408# and pw (FreeBSD) used in enewuser()/enewgroup() 392# and pw (FreeBSD) used in enewuser()/enewgroup()
409# Joe Jezak <josejx@gmail.com> and usata@gentoo.org 393# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
410# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org> 394# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
411# 395#
412# egetent(database, key) 396# egetent(database, key)
413egetent() { 397egetent() {
414 if [[ "${USERLAND}" == "Darwin" ]] ; then 398 case ${CHOST} in
399 *-darwin*)
415 case "$2" in 400 case "$2" in
416 *[!0-9]*) # Non numeric 401 *[!0-9]*) # Non numeric
417 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 402 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
418 ;; 403 ;;
419 *) # Numeric 404 *) # Numeric
420 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 405 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
421 ;; 406 ;;
422 esac 407 esac
423 elif [[ "${USERLAND}" == "BSD" ]] ; then 408 ;;
424 local action 409 *-freebsd*|*-dragonfly*)
425 if [ "$1" == "passwd" ] 410 local opts action="user"
426 then 411 [[ $1 == "passwd" ]] || action="group"
427 action="user" 412
428 else 413 # lookup by uid/gid
429 action="group" 414 if [[ $2 == [[:digit:]]* ]] ; then
415 [[ ${action} == "user" ]] && opts="-u" || opts="-g"
430 fi 416 fi
417
431 pw show "${action}" "$2" -q 418 pw show ${action} ${opts} "$2" -q
432 else 419 ;;
420 *-netbsd*|*-openbsd*)
421 grep "$2:\*:" /etc/$1
422 ;;
423 *)
433 which nscd >& /dev/null && nscd -i "$1" 424 type -p nscd >& /dev/null && nscd -i "$1"
434 getent "$1" "$2" 425 getent "$1" "$2"
435 fi 426 ;;
427 esac
436} 428}
437 429
438# Simplify/standardize adding users to the system 430# Simplify/standardize adding users to the system
439# vapier@gentoo.org 431# vapier@gentoo.org
440# 432#
447# shell: /bin/false 439# shell: /bin/false
448# homedir: /dev/null 440# homedir: /dev/null
449# groups: none 441# groups: none
450# extra: comment of 'added by portage for ${PN}' 442# extra: comment of 'added by portage for ${PN}'
451enewuser() { 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
452 # get the username 451 # get the username
453 local euser="$1"; shift 452 local euser=$1; shift
454 if [ -z "${euser}" ] 453 if [[ -z ${euser} ]] ; then
455 then
456 eerror "No username specified !" 454 eerror "No username specified !"
457 die "Cannot call enewuser without a username" 455 die "Cannot call enewuser without a username"
458 fi 456 fi
459 457
460 # lets see if the username already exists 458 # lets see if the username already exists
461 if [ "${euser}" == "`egetent passwd \"${euser}\" | cut -d: -f1`" ] 459 if [[ -n $(egetent passwd "${euser}") ]] ; then
462 then
463 return 0 460 return 0
464 fi 461 fi
465 einfo "Adding user '${euser}' to your system ..." 462 einfo "Adding user '${euser}' to your system ..."
466 463
467 # options to pass to useradd 464 # options to pass to useradd
468 local opts= 465 local opts=
469 466
470 # handle uid 467 # handle uid
471 local euid="$1"; shift 468 local euid=$1; shift
472 if [ ! -z "${euid}" ] && [ "${euid}" != "-1" ] 469 if [[ -n ${euid} && ${euid} != -1 ]] ; then
473 then
474 if [ "${euid}" -gt 0 ] 470 if [[ ${euid} -gt 0 ]] ; then
475 then
476 if [ ! -z "`egetent passwd ${euid}`" ] 471 if [[ -n $(egetent passwd ${euid}) ]] ; then
477 then
478 euid="next" 472 euid="next"
479 fi 473 fi
480 else 474 else
481 eerror "Userid given but is not greater than 0 !" 475 eerror "Userid given but is not greater than 0 !"
482 die "${euid} is not a valid UID" 476 die "${euid} is not a valid UID"
483 fi 477 fi
484 else 478 else
485 euid="next" 479 euid="next"
486 fi 480 fi
487 if [ "${euid}" == "next" ] 481 if [[ ${euid} == "next" ]] ; then
488 then 482 for ((euid = 101; euid <= 999; euid++)); do
489 local pwrange
490 if [ "${USERLAND}" == "BSD" ] ; then
491 pwrange="`jot 898 101`"
492 else
493 pwrange="`seq 101 999`"
494 fi
495 for euid in ${pwrange} ; do
496 [ -z "`egetent passwd ${euid}`" ] && break 483 [[ -z $(egetent passwd ${euid}) ]] && break
497 done 484 done
498 fi 485 fi
499 opts="${opts} -u ${euid}" 486 opts="${opts} -u ${euid}"
500 einfo " - Userid: ${euid}" 487 einfo " - Userid: ${euid}"
501 488
502 # handle shell 489 # handle shell
503 local eshell="$1"; shift 490 local eshell=$1; shift
504 if [ ! -z "${eshell}" ] && [ "${eshell}" != "-1" ] 491 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
505 then 492 if [[ ! -e ${ROOT}${eshell} ]] ; then
506 if [ ! -e "${eshell}" ]
507 then
508 eerror "A shell was specified but it does not exist !" 493 eerror "A shell was specified but it does not exist !"
509 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"
510 fi 499 fi
511 else 500 else
512 if [[ "${USERLAND}" == "Darwin" ]]; then 501 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do
502 [[ -x ${ROOT}${shell} ]] && break
503 done
504
505 if [[ ${shell} == "/dev/null" ]] ; then
506 eerror "Unable to identify the shell to use, proceeding with userland default."
507 case ${USERLAND} in
513 eshell="/usr/bin/false" 508 GNU) shell="/bin/false" ;;
514 elif [[ "${USERLAND}" == "BSD" ]]; then 509 BSD) shell="/sbin/nologin" ;;
515 eshell="/usr/sbin/nologin" 510 Darwin) shell="/usr/sbin/nologin" ;;
516 else 511 *) die "Unable to identify the default shell for userland ${USERLAND}"
517 eshell="/bin/false" 512 esac
518 fi 513 fi
514
515 eshell=${shell}
519 fi 516 fi
520 einfo " - Shell: ${eshell}" 517 einfo " - Shell: ${eshell}"
521 opts="${opts} -s ${eshell}" 518 opts="${opts} -s ${eshell}"
522 519
523 # handle homedir 520 # handle homedir
524 local ehome="$1"; shift 521 local ehome=$1; shift
525 if [ -z "${ehome}" ] || [ "${eshell}" == "-1" ] 522 if [[ -z ${ehome} ]] || [[ ${ehome} == "-1" ]] ; then
526 then
527 ehome="/dev/null" 523 ehome="/dev/null"
528 fi 524 fi
529 einfo " - Home: ${ehome}" 525 einfo " - Home: ${ehome}"
530 opts="${opts} -d ${ehome}" 526 opts="${opts} -d ${ehome}"
531 527
532 # handle groups 528 # handle groups
533 local egroups="$1"; shift 529 local egroups=$1; shift
534 if [ ! -z "${egroups}" ] 530 if [[ ! -z ${egroups} ]] ; then
535 then
536 local oldifs="${IFS}" 531 local oldifs=${IFS}
537 local defgroup="" exgroups="" 532 local defgroup="" exgroups=""
538 533
539 export IFS="," 534 export IFS=","
540 for g in ${egroups} 535 for g in ${egroups} ; do
541 do
542 export IFS="${oldifs}" 536 export IFS=${oldifs}
543 if [ -z "`egetent group \"${g}\"`" ] 537 if [[ -z $(egetent group "${g}") ]] ; then
544 then
545 eerror "You must add group ${g} to the system first" 538 eerror "You must add group ${g} to the system first"
546 die "${g} is not a valid GID" 539 die "${g} is not a valid GID"
547 fi 540 fi
548 if [ -z "${defgroup}" ] 541 if [[ -z ${defgroup} ]] ; then
549 then
550 defgroup="${g}" 542 defgroup=${g}
551 else 543 else
552 exgroups="${exgroups},${g}" 544 exgroups="${exgroups},${g}"
553 fi 545 fi
554 export IFS="," 546 export IFS=","
555 done 547 done
556 export IFS="${oldifs}" 548 export IFS=${oldifs}
557 549
558 opts="${opts} -g ${defgroup}" 550 opts="${opts} -g ${defgroup}"
559 if [ ! -z "${exgroups}" ] 551 if [[ ! -z ${exgroups} ]] ; then
560 then
561 opts="${opts} -G ${exgroups:1}" 552 opts="${opts} -G ${exgroups:1}"
562 fi 553 fi
563 else 554 else
564 egroups="(none)" 555 egroups="(none)"
565 fi 556 fi
566 einfo " - Groups: ${egroups}" 557 einfo " - Groups: ${egroups}"
567 558
568 # handle extra and add the user 559 # handle extra and add the user
569 local eextra="$@"
570 local oldsandbox="${SANDBOX_ON}" 560 local oldsandbox=${SANDBOX_ON}
571 export SANDBOX_ON="0" 561 export SANDBOX_ON="0"
572 if [[ "${USERLAND}" == "Darwin" ]] 562 case ${CHOST} in
573 then 563 *-darwin*)
574 ### Make the user 564 ### Make the user
575 if [ -z "${eextra}" ] 565 if [[ -z $@ ]] ; then
576 then
577 dscl . create /users/${euser} uid ${euid} 566 dscl . create /users/${euser} uid ${euid}
578 dscl . create /users/${euser} shell ${eshell} 567 dscl . create /users/${euser} shell ${eshell}
579 dscl . create /users/${euser} home ${ehome} 568 dscl . create /users/${euser} home ${ehome}
580 dscl . create /users/${euser} realname "added by portage for ${PN}" 569 dscl . create /users/${euser} realname "added by portage for ${PN}"
581 ### Add the user to the groups specified 570 ### Add the user to the groups specified
582 local oldifs="${IFS}" 571 local oldifs=${IFS}
583 export IFS="," 572 export IFS=","
584 for g in ${egroups} 573 for g in ${egroups} ; do
585 do
586 dscl . merge /groups/${g} users ${euser} 574 dscl . merge /groups/${g} users ${euser}
587 done 575 done
588 export IFS="${oldifs}" 576 export IFS=${oldifs}
589 else 577 else
590 einfo "Extra options are not supported on macos yet" 578 einfo "Extra options are not supported on Darwin yet"
591 einfo "Please report the ebuild along with the info below" 579 einfo "Please report the ebuild along with the info below"
592 einfo "eextra: ${eextra}" 580 einfo "eextra: $@"
593 die "Required function missing" 581 die "Required function missing"
594 fi 582 fi
595 elif [[ "${USERLAND}" == "BSD" ]] ; then 583 ;;
596 if [ -z "${eextra}" ] 584 *-freebsd*|*-dragonfly*)
597 then 585 if [[ -z $@ ]] ; then
598 pw useradd ${euser} ${opts} \ 586 pw useradd ${euser} ${opts} \
599 -c "added by portage for ${PN}" \ 587 -c "added by portage for ${PN}" \
600 die "enewuser failed" 588 die "enewuser failed"
601 else 589 else
602 einfo " - Extra: ${eextra}" 590 einfo " - Extra: $@"
603 pw useradd ${euser} ${opts} \ 591 pw useradd ${euser} ${opts} \
604 -c ${eextra} || die "enewuser failed" 592 "$@" || die "enewuser failed"
605 fi 593 fi
594 ;;
595
596 *-netbsd*)
597 if [[ -z $@ ]] ; then
598 useradd ${opts} ${euser} || die "enewuser failed"
606 else 599 else
607 if [ -z "${eextra}" ] 600 einfo " - Extra: $@"
608 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
609 useradd ${opts} ${euser} \ 620 useradd ${opts} ${euser} \
610 -c "added by portage for ${PN}" \ 621 -c "added by portage for ${PN}" \
611 || die "enewuser failed" 622 || die "enewuser failed"
612 else 623 else
613 einfo " - Extra: ${eextra}" 624 einfo " - Extra: $@"
614 useradd ${opts} ${euser} ${eextra} \ 625 useradd ${opts} ${euser} "$@" \
615 || die "enewuser failed" 626 || die "enewuser failed"
616 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}"
617 fi 636 fi
637
618 export SANDBOX_ON="${oldsandbox}" 638 export SANDBOX_ON=${oldsandbox}
619
620 if [ ! -e "${ehome}" ] && [ ! -e "${D}/${ehome}" ]
621 then
622 einfo " - Creating ${ehome} in ${D}"
623 dodir ${ehome}
624 fowners ${euser} ${ehome}
625 fperms 755 ${ehome}
626 fi
627} 639}
628 640
629# Simplify/standardize adding groups to the system 641# Simplify/standardize adding groups to the system
630# vapier@gentoo.org 642# vapier@gentoo.org
631# 643#
634# Default values if you do not specify any: 646# Default values if you do not specify any:
635# groupname: REQUIRED ! 647# groupname: REQUIRED !
636# gid: next available (see groupadd(8)) 648# gid: next available (see groupadd(8))
637# extra: none 649# extra: none
638enewgroup() { 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
639 # get the group 658 # get the group
640 local egroup="$1"; shift 659 local egroup="$1"; shift
641 if [ -z "${egroup}" ] 660 if [ -z "${egroup}" ]
642 then 661 then
643 eerror "No group specified !" 662 eerror "No group specified !"
644 die "Cannot call enewgroup without a group" 663 die "Cannot call enewgroup without a group"
645 fi 664 fi
646 665
647 # see if group already exists 666 # see if group already exists
648 if [ "${egroup}" == "`egetent group \"${egroup}\" | cut -d: -f1`" ] 667 if [[ -n $(egetent group "${egroup}") ]]; then
649 then
650 return 0 668 return 0
651 fi 669 fi
652 einfo "Adding group '${egroup}' to your system ..." 670 einfo "Adding group '${egroup}' to your system ..."
653 671
654 # options to pass to useradd 672 # options to pass to useradd
660 then 678 then
661 if [ "${egid}" -gt 0 ] 679 if [ "${egid}" -gt 0 ]
662 then 680 then
663 if [ -z "`egetent group ${egid}`" ] 681 if [ -z "`egetent group ${egid}`" ]
664 then 682 then
665 if [[ "${USERLAND}" == "Darwin" ]]; then 683 if [[ "${CHOST}" == *-darwin* ]]; then
666 opts="${opts} ${egid}" 684 opts="${opts} ${egid}"
667 else 685 else
668 opts="${opts} -g ${egid}" 686 opts="${opts} -g ${egid}"
669 fi 687 fi
670 else 688 else
684 opts="${opts} ${eextra}" 702 opts="${opts} ${eextra}"
685 703
686 # add the group 704 # add the group
687 local oldsandbox="${SANDBOX_ON}" 705 local oldsandbox="${SANDBOX_ON}"
688 export SANDBOX_ON="0" 706 export SANDBOX_ON="0"
689 if [[ "${USERLAND}" == "Darwin" ]]; then 707 case ${CHOST} in
708 *-darwin*)
690 if [ ! -z "${eextra}" ]; 709 if [ ! -z "${eextra}" ];
691 then 710 then
692 einfo "Extra options are not supported on Darwin/OS X yet" 711 einfo "Extra options are not supported on Darwin/OS X yet"
693 einfo "Please report the ebuild along with the info below" 712 einfo "Please report the ebuild along with the info below"
694 einfo "eextra: ${eextra}" 713 einfo "eextra: ${eextra}"
695 die "Required function missing" 714 die "Required function missing"
696 fi 715 fi
697 716
698 # If we need the next available 717 # If we need the next available
699 case ${egid} in 718 case ${egid} in
700 *[!0-9]*) # Non numeric 719 *[!0-9]*) # Non numeric
701 for egid in `jot 898 101`; do 720 for ((egid = 101; egid <= 999; egid++)); do
702 [ -z "`egetent group ${egid}`" ] && break 721 [[ -z $(egetent group ${egid}) ]] && break
703 done 722 done
704 esac 723 esac
705 dscl . create /groups/${egroup} gid ${egid} 724 dscl . create /groups/${egroup} gid ${egid}
706 dscl . create /groups/${egroup} passwd '*' 725 dscl . create /groups/${egroup} passwd '*'
707 elif [[ "${USERLAND}" == "BSD" ]] ; then 726 ;;
727
728 *-freebsd*|*-dragonfly*)
708 case ${egid} in 729 case ${egid} in
709 *[!0-9]*) # Non numeric 730 *[!0-9]*) # Non numeric
710 for egid in `jot 898 101`; do 731 for ((egid = 101; egid <= 999; egid++)); do
711 [ -z "`egetent group ${egid}`" ] && break 732 [[ -z $(egetent group ${egid}) ]] && break
712 done 733 done
713 esac 734 esac
714 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 735 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
715 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 *)
716 groupadd ${opts} ${egroup} || die "enewgroup failed" 749 groupadd ${opts} ${egroup} || die "enewgroup failed"
717 fi 750 ;;
751 esac
718 export SANDBOX_ON="${oldsandbox}" 752 export SANDBOX_ON="${oldsandbox}"
719} 753}
720 754
721# Simple script to replace 'dos2unix' binaries 755# Simple script to replace 'dos2unix' binaries
722# vapier@gentoo.org 756# vapier@gentoo.org
739 773
740# Make a desktop file ! 774# Make a desktop file !
741# Great for making those icons in kde/gnome startmenu ! 775# Great for making those icons in kde/gnome startmenu !
742# Amaze your friends ! Get the women ! Join today ! 776# Amaze your friends ! Get the women ! Join today !
743# 777#
744# make_desktop_entry(<binary>, [name], [icon], [type], [path]) 778# make_desktop_entry(<command>, [name], [icon], [type], [path])
745# 779#
746# binary: what binary does the app run with ? 780# binary: what command does the app run with ?
747# name: the name that will show up in the menu 781# name: the name that will show up in the menu
748# icon: give your little like a pretty little icon ... 782# icon: give your little like a pretty little icon ...
749# this can be relative (to /usr/share/pixmaps) or 783# this can be relative (to /usr/share/pixmaps) or
750# a full path to an icon 784# a full path to an icon
751# type: what kind of application is this ? for categories: 785# type: what kind of application is this ? for categories:
752# http://www.freedesktop.org/wiki/Standards_2fmenu_2dspec 786# http://www.freedesktop.org/Standards/desktop-entry-spec
753# path: if your app needs to startup in a specific dir 787# path: if your app needs to startup in a specific dir
754make_desktop_entry() { 788make_desktop_entry() {
755 [[ -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
756 790
757 local exec=${1} 791 local exec=${1}
783 dev) 817 dev)
784 type="Development" 818 type="Development"
785 ;; 819 ;;
786 820
787 games) 821 games)
788 [[ -z ${path} ]] && path=${GAMES_BINDIR}
789
790 case ${catmin} in 822 case ${catmin} in
791 action) type=ActionGame;; 823 action) type=ActionGame;;
792 arcade) type=ArcadeGame;; 824 arcade) type=ArcadeGame;;
793 board) type=BoardGame;; 825 board) type=BoardGame;;
794 kid) type=KidsGame;; 826 kids) type=KidsGame;;
795 emulation) type=Emulator;; 827 emulation) type=Emulator;;
796 puzzle) type=LogicGame;; 828 puzzle) type=LogicGame;;
797 rpg) type=RolePlaying;; 829 rpg) type=RolePlaying;;
798 roguelike) type=RolePlaying;; 830 roguelike) type=RolePlaying;;
799 simulation) type=Simulation;; 831 simulation) type=Simulation;;
835 type="Network;${type}" 867 type="Network;${type}"
836 ;; 868 ;;
837 869
838 sci) 870 sci)
839 case ${catmin} in 871 case ${catmin} in
840 astro*) type=Astronomoy;; 872 astro*) type=Astronomy;;
841 bio*) type=Biology;; 873 bio*) type=Biology;;
842 calc*) type=Calculator;; 874 calc*) type=Calculator;;
843 chem*) type=Chemistry;; 875 chem*) type=Chemistry;;
844 geo*) type=Geology;; 876 geo*) type=Geology;;
845 math*) type=Math;; 877 math*) type=Math;;
865 local desktop_name="${PN}" 897 local desktop_name="${PN}"
866 else 898 else
867 local desktop_name="${PN}-${SLOT}" 899 local desktop_name="${PN}-${SLOT}"
868 fi 900 fi
869 local desktop=${T}/${exec%% *}-${desktop_name}.desktop 901 local desktop=${T}/${exec%% *}-${desktop_name}.desktop
902# local desktop=${T}/${exec%% *:-${desktop_name}}.desktop
870 903
871echo "[Desktop Entry] 904echo "[Desktop Entry]
872Encoding=UTF-8 905Encoding=UTF-8
873Version=0.9.2 906Version=0.9.2
874Name=${name} 907Name=${name}
875Type=Application 908Type=Application
876Comment=${DESCRIPTION} 909Comment=${DESCRIPTION}
877Exec=${exec} 910Exec=${exec}
911TryExec=${exec%% *}
878Path=${path} 912Path=${path}
879Icon=${icon} 913Icon=${icon}
880Categories=Application;${type};" > "${desktop}" 914Categories=Application;${type};" > "${desktop}"
881 915
916 (
917 # wrap the env here so that the 'insinto' call
918 # doesn't corrupt the env of the caller
882 insinto /usr/share/applications 919 insinto /usr/share/applications
883 doins "${desktop}" 920 doins "${desktop}"
884 921 )
885 return 0
886} 922}
887 923
888# Make a GDM/KDM Session file 924# Make a GDM/KDM Session file
889# 925#
890# make_desktop_entry(<title>, <command>) 926# make_session_desktop(<title>, <command>)
891# title: File to execute to start the Window Manager 927# title: File to execute to start the Window Manager
892# command: Name of the Window Manager 928# command: Name of the Window Manager
893 929
894make_session_desktop() { 930make_session_desktop() {
895 [[ -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
919 doins "${i}" 955 doins "${i}"
920 elif [[ -d ${i} ]] ; then 956 elif [[ -d ${i} ]] ; then
921 for j in "${i}"/*.desktop ; do 957 for j in "${i}"/*.desktop ; do
922 doins "${j}" 958 doins "${j}"
923 done 959 done
924 fi 960 fi
925 done 961 done
926} 962}
927newmenu() { 963newmenu() {
928 insinto /usr/share/applications 964 insinto /usr/share/applications
929 newins "$1" "$2" 965 newins "$1" "$2"
937 doins "${i}" 973 doins "${i}"
938 elif [[ -d ${i} ]] ; then 974 elif [[ -d ${i} ]] ; then
939 for j in "${i}"/*.png ; do 975 for j in "${i}"/*.png ; do
940 doins "${j}" 976 doins "${j}"
941 done 977 done
942 fi 978 fi
943 done 979 done
944} 980}
945newicon() { 981newicon() {
946 insinto /usr/share/pixmaps 982 insinto /usr/share/pixmaps
947 newins "$1" "$2" 983 newins "$1" "$2"
952############################################################## 988##############################################################
953 989
954 990
955# for internal use only (unpack_pdv and unpack_makeself) 991# for internal use only (unpack_pdv and unpack_makeself)
956find_unpackable_file() { 992find_unpackable_file() {
957 local src="$1" 993 local src=$1
958 if [ -z "${src}" ] 994 if [[ -z ${src} ]] ; then
959 then
960 src="${DISTDIR}/${A}" 995 src=${DISTDIR}/${A}
961 else 996 else
962 if [ -e "${DISTDIR}/${src}" ] 997 if [[ -e ${DISTDIR}/${src} ]] ; then
963 then
964 src="${DISTDIR}/${src}" 998 src=${DISTDIR}/${src}
965 elif [ -e "${PWD}/${src}" ] 999 elif [[ -e ${PWD}/${src} ]] ; then
966 then
967 src="${PWD}/${src}" 1000 src=${PWD}/${src}
968 elif [ -e "${src}" ] 1001 elif [[ -e ${src} ]] ; then
969 then
970 src="${src}" 1002 src=${src}
971 fi
972 fi 1003 fi
973 [ ! -e "${src}" ] && die "Could not find requested archive ${src}" 1004 fi
1005 [[ ! -e ${src} ]] && return 1
974 echo "${src}" 1006 echo "${src}"
975} 1007}
976 1008
977# Unpack those pesky pdv generated files ... 1009# Unpack those pesky pdv generated files ...
978# They're self-unpacking programs with the binary package stuffed in 1010# They're self-unpacking programs with the binary package stuffed in
993# lseek 1025# lseek
994# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 1026# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
995# lseek(3, -4, SEEK_END) = 2981250 1027# lseek(3, -4, SEEK_END) = 2981250
996# 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.
997unpack_pdv() { 1029unpack_pdv() {
998 local src="`find_unpackable_file $1`" 1030 local src=$(find_unpackable_file $1)
999 local sizeoff_t="$2" 1031 local sizeoff_t=$2
1000 1032
1033 [[ -z ${src} ]] && die "Could not locate source for '$1'"
1001 [ -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 :("
1002 1035
1003 local shrtsrc="`basename ${src}`" 1036 local shrtsrc=$(basename "${src}")
1004 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1037 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1005 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1038 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"`
1006 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\"`
1007 1040
1008 # grab metadata for debug reasons 1041 # grab metadata for debug reasons
1072# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1105# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1073# - If the file is not specified then unpack will utilize ${A}. 1106# - If the file is not specified then unpack will utilize ${A}.
1074# - 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
1075# the proper offset from the script itself. 1108# the proper offset from the script itself.
1076unpack_makeself() { 1109unpack_makeself() {
1110 local src_input=${1:-${A}}
1077 local src="$(find_unpackable_file "$1")" 1111 local src=$(find_unpackable_file "${src_input}")
1078 local skip="$2" 1112 local skip=$2
1079 local exe="$3" 1113 local exe=$3
1080 1114
1115 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
1116
1081 local shrtsrc="$(basename "${src}")" 1117 local shrtsrc=$(basename "${src}")
1082 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1118 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1083 if [ -z "${skip}" ] 1119 if [[ -z ${skip} ]] ; then
1084 then
1085 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1120 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}')
1086 local skip=0 1121 local skip=0
1087 exe=tail 1122 exe=tail
1088 case ${ver} in 1123 case ${ver} in
1089 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
1090 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1125 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1091 ;; 1126 ;;
1092 2.0|2.0.1) 1127 2.0|2.0.1)
1093 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-) 1128 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-)
1094 ;; 1129 ;;
1102 ;; 1137 ;;
1103 2.1.3) 1138 2.1.3)
1104 skip=`grep -a ^offset= "${src}" | awk '{print $3}'` 1139 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1105 let skip="skip + 1" 1140 let skip="skip + 1"
1106 ;; 1141 ;;
1107 2.1.4) 1142 2.1.4|2.1.5)
1108 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)
1109 skip=$(head -n ${skip} "${src}" | wc -c) 1144 skip=$(head -n ${skip} "${src}" | wc -c)
1110 exe="dd" 1145 exe="dd"
1111 ;; 1146 ;;
1112 *) 1147 *)
1157check_license() { 1192check_license() {
1158 local lic=$1 1193 local lic=$1
1159 if [ -z "${lic}" ] ; then 1194 if [ -z "${lic}" ] ; then
1160 lic="${PORTDIR}/licenses/${LICENSE}" 1195 lic="${PORTDIR}/licenses/${LICENSE}"
1161 else 1196 else
1162 if [ -e "${PORTDIR}/licenses/${src}" ] ; then 1197 if [ -e "${PORTDIR}/licenses/${lic}" ] ; then
1163 lic="${PORTDIR}/licenses/${src}" 1198 lic="${PORTDIR}/licenses/${lic}"
1164 elif [ -e "${PWD}/${src}" ] ; then 1199 elif [ -e "${PWD}/${lic}" ] ; then
1165 lic="${PWD}/${src}" 1200 lic="${PWD}/${lic}"
1166 elif [ -e "${src}" ] ; then 1201 elif [ -e "${lic}" ] ; then
1167 lic="${src}" 1202 lic="${lic}"
1168 fi
1169 fi 1203 fi
1204 fi
1170 [ ! -f "${lic}" ] && die "Could not find requested license ${src}" 1205 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1171 local l="`basename ${lic}`" 1206 local l="`basename ${lic}`"
1172 1207
1173 # here is where we check for the licenses the user already 1208 # here is where we check for the licenses the user already
1174 # 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
1175 local shopts=$- 1210 local shopts=$-
1176 local alic 1211 local alic
1177 set -o noglob #so that bash doesn't expand "*" 1212 set -o noglob #so that bash doesn't expand "*"
1178 for alic in ${ACCEPT_LICENSE} ; do 1213 for alic in ${ACCEPT_LICENSE} ; do
1179 if [[ ${alic} == * || ${alic} == ${l} ]]; then 1214 if [[ ${alic} == ${l} ]]; then
1180 set +o noglob; set -${shopts} #reset old shell opts 1215 set +o noglob; set -${shopts} #reset old shell opts
1181 return 0 1216 return 0
1182 fi 1217 fi
1183 done 1218 done
1184 set +o noglob; set -$shopts #reset old shell opts 1219 set +o noglob; set -$shopts #reset old shell opts
1217# 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
1218# found at CDROM_ROOT. 1253# found at CDROM_ROOT.
1219# 1254#
1220# 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',
1221# 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
1222# 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_#
1223# 1262#
1224# 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.
1225# 1264#
1226# 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] [...]
1227# - 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
1231 # 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
1232 # the # of files they gave us 1271 # the # of files they gave us
1233 local cdcnt=0 1272 local cdcnt=0
1234 local f= 1273 local f=
1235 for f in "$@" ; do 1274 for f in "$@" ; do
1236 cdcnt=$((cdcnt + 1)) 1275 ((++cdcnt))
1237 export CDROM_CHECK_${cdcnt}="$f" 1276 export CDROM_CHECK_${cdcnt}="$f"
1238 done 1277 done
1239 export CDROM_TOTAL_CDS=${cdcnt} 1278 export CDROM_TOTAL_CDS=${cdcnt}
1240 export CDROM_CURRENT_CD=1 1279 export CDROM_CURRENT_CD=1
1241 1280
1242 # now we see if the user gave use CD_ROOT ... 1281 # now we see if the user gave use CD_ROOT ...
1243 # 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
1244 if [[ ! -z ${CD_ROOT} ]] ; then
1245 export CDROM_ROOT=${CD_ROOT}
1246 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1247 return
1248 fi
1249 # do the same for CD_ROOT_X
1250 if [[ ! -z ${CD_ROOT_1} ]] ; then 1283 if [[ -n ${CD_ROOT}${CD_ROOT_1} ]] ; then
1251 local var= 1284 local var=
1252 cdcnt=0 1285 cdcnt=0
1253 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1286 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1254 cdcnt=$((cdcnt + 1)) 1287 ((++cdcnt))
1255 var="CD_ROOT_${cdcnt}" 1288 var="CD_ROOT_${cdcnt}"
1289 [[ -z ${!var} ]] && var="CD_ROOT"
1256 if [[ -z ${!var} ]] ; then 1290 if [[ -z ${!var} ]] ; then
1257 eerror "You must either use just the CD_ROOT" 1291 eerror "You must either use just the CD_ROOT"
1258 eerror "or specify ALL the CD_ROOT_X variables." 1292 eerror "or specify ALL the CD_ROOT_X variables."
1259 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."
1260 die "could not locate CD_ROOT_${cdcnt}" 1294 die "could not locate CD_ROOT_${cdcnt}"
1261 fi 1295 fi
1262 export CDROM_ROOTS_${cdcnt}="${!var}"
1263 done 1296 done
1264 export CDROM_ROOT=${CDROM_ROOTS_1} 1297 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}}
1265 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}
1266 return 1305 return
1267 fi 1306 fi
1268 1307
1308 # User didn't help us out so lets make sure they know they can
1309 # simplify the whole process ...
1269 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1310 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1270 einfon "This ebuild will need the " 1311 einfo "This ebuild will need the ${CDROM_NAME:-cdrom for ${PN}}"
1271 if [[ -z ${CDROM_NAME} ]] ; then
1272 echo "cdrom for ${PN}."
1273 else
1274 echo "${CDROM_NAME}."
1275 fi
1276 echo 1312 echo
1277 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"
1278 einfo "mounted somewhere on your filesystem, just export" 1314 einfo "mounted somewhere on your filesystem, just export"
1279 einfo "the variable CD_ROOT so that it points to the" 1315 einfo "the variable CD_ROOT so that it points to the"
1280 einfo "directory containing the files." 1316 einfo "directory containing the files."
1281 echo 1317 echo
1282 einfo "For example:" 1318 einfo "For example:"
1283 einfo "export CD_ROOT=/mnt/cdrom" 1319 einfo "export CD_ROOT=/mnt/cdrom"
1284 echo 1320 echo
1285 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
1286 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1331 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1287 cdcnt=0 1332 cdcnt=0
1288 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1333 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1289 cdcnt=$((cdcnt + 1)) 1334 ((++cdcnt))
1290 var="CDROM_NAME_${cdcnt}" 1335 var="CDROM_NAME_${cdcnt}"
1291 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}" 1336 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}"
1292 done 1337 done
1293 echo 1338 echo
1294 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"
1295 einfo "mounted somewhere on your filesystem, just export" 1340 einfo "mounted somewhere on your filesystem, just export"
1296 einfo "the following variables so they point to the right place:" 1341 einfo "the following variables so they point to the right place:"
1297 einfon "" 1342 einfon ""
1298 cdcnt=0 1343 cdcnt=0
1299 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1344 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1300 cdcnt=$((cdcnt + 1)) 1345 ((++cdcnt))
1301 echo -n " CD_ROOT_${cdcnt}" 1346 echo -n " CD_ROOT_${cdcnt}"
1302 done 1347 done
1303 echo 1348 echo
1304 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"
1305 einfo "you only have one cdrom, you can export CD_ROOT" 1350 einfo "you only have one cdrom, you can export CD_ROOT"
1308 echo 1353 echo
1309 einfo "For example:" 1354 einfo "For example:"
1310 einfo "export CD_ROOT_1=/mnt/cdrom" 1355 einfo "export CD_ROOT_1=/mnt/cdrom"
1311 echo 1356 echo
1312 fi 1357 fi
1358
1359 export CDROM_SET=""
1313 export CDROM_CURRENT_CD=0 1360 export CDROM_CURRENT_CD=0
1314 cdrom_load_next_cd 1361 cdrom_load_next_cd
1315} 1362}
1316 1363
1317# 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.
1318# 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.
1319# 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.
1320# 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.
1321cdrom_load_next_cd() { 1368cdrom_load_next_cd() {
1322 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1323 local var= 1369 local var
1324 1370 ((++CDROM_CURRENT_CD))
1325 if [[ ! -z ${CD_ROOT} ]] ; then
1326 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}"
1327 return
1328 fi
1329 1371
1330 unset CDROM_ROOT 1372 unset CDROM_ROOT
1331 var=CDROM_ROOTS_${CDROM_CURRENT_CD} 1373 var=CD_ROOT_${CDROM_CURRENT_CD}
1374 [[ -z ${!var} ]] && var="CD_ROOT"
1332 if [[ -z ${!var} ]] ; then 1375 if [[ -z ${!var} ]] ; then
1333 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1376 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1334 cdrom_locate_file_on_cd ${!var} 1377 _cdrom_locate_file_on_cd ${!var}
1335 else 1378 else
1336 export CDROM_ROOT=${!var} 1379 export CDROM_ROOT=${!var}
1337 fi 1380 fi
1338 1381
1339 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1382 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1344# 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
1345# 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
1346# displayed and we'll hang out here until: 1389# displayed and we'll hang out here until:
1347# (1) the file is found on a mounted cdrom 1390# (1) the file is found on a mounted cdrom
1348# (2) the user hits CTRL+C 1391# (2) the user hits CTRL+C
1349cdrom_locate_file_on_cd() { 1392_cdrom_locate_file_on_cd() {
1393 local mline=""
1394 local showedmsg=0
1395
1350 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
1351 local dir="$(dirname ${@})" 1404 local dir=$(dirname ${cdset[${i}]})
1352 local file="$(basename ${@})" 1405 local file=$(basename ${cdset[${i}]})
1353 local mline=""
1354 local showedmsg=0
1355 1406
1356 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
1357 [[ -d ${mline}/${dir} ]] || continue 1408 [[ -d ${mline}/${dir} ]] || continue
1358 [[ ! -z $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] \ 1409 if [[ -n $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] ; then
1359 && 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))
1360 done 1418 done
1361 1419
1362 if [[ -z ${CDROM_ROOT} ]] ; then
1363 echo 1420 echo
1364 if [[ ${showedmsg} -eq 0 ]] ; then 1421 if [[ ${showedmsg} -eq 0 ]] ; then
1365 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1422 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1366 if [[ -z ${CDROM_NAME} ]] ; then 1423 if [[ -z ${CDROM_NAME} ]] ; then
1367 einfo "Please insert the cdrom for ${PN} now !" 1424 einfo "Please insert+mount the cdrom for ${PN} now !"
1368 else
1369 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1370 fi
1371 else 1425 else
1372 if [[ -z ${CDROM_NAME_1} ]] ; then
1373 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !"
1374 else
1375 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1376 einfo "Please insert+mount the ${!var} cdrom now !" 1426 einfo "Please insert+mount the ${CDROM_NAME} cdrom now !"
1377 fi
1378 fi 1427 fi
1379 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
1380 fi 1435 fi
1436 showedmsg=1
1437 fi
1381 einfo "Press return to scan for the cd again" 1438 einfo "Press return to scan for the cd again"
1382 einfo "or hit CTRL+C to abort the emerge." 1439 einfo "or hit CTRL+C to abort the emerge."
1383 read 1440 echo
1384 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"
1385 done 1446 done
1386} 1447}
1387 1448
1388# Make sure that LINGUAS only contains languages that 1449# Make sure that LINGUAS only contains languages that
1389# a package can support 1450# a package can support
1396# 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
1397# directories and uses the intersection of the lists. 1458# directories and uses the intersection of the lists.
1398# 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
1399# directories and uses the union of the lists. 1460# directories and uses the union of the lists.
1400strip-linguas() { 1461strip-linguas() {
1401 local ls newls 1462 local ls newls nols
1402 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then 1463 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1403 local op=$1; shift 1464 local op=$1; shift
1404 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1465 ls=$(find "$1" -name '*.po' -exec basename {} .po \;); shift
1405 local d f 1466 local d f
1406 for d in "$@" ; do 1467 for d in "$@" ; do
1407 if [[ ${op} == "-u" ]] ; then 1468 if [[ ${op} == "-u" ]] ; then
1408 newls=${ls} 1469 newls=${ls}
1409 else 1470 else
1410 newls="" 1471 newls=""
1411 fi 1472 fi
1412 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1473 for f in $(find "$d" -name '*.po' -exec basename {} .po \;) ; do
1413 if [[ ${op} == "-i" ]] ; then 1474 if [[ ${op} == "-i" ]] ; then
1414 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}" 1475 hasq ${f} ${ls} && newls="${newls} ${f}"
1415 else 1476 else
1416 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}" 1477 hasq ${f} ${ls} || newls="${newls} ${f}"
1417 fi 1478 fi
1418 done 1479 done
1419 ls=${newls} 1480 ls=${newls}
1420 done 1481 done
1421 ls=${ls//.po}
1422 else 1482 else
1423 ls=$@ 1483 ls="$@"
1424 fi 1484 fi
1425 1485
1426 ls=" ${ls} " 1486 nols=""
1427 newls="" 1487 newls=""
1428 for f in ${LINGUAS} ; do 1488 for f in ${LINGUAS} ; do
1429 if [[ ${ls/ ${f} /} != ${ls} ]] ; then 1489 if hasq ${f} ${ls} ; then
1430 newls="${newls} ${f}" 1490 newls="${newls} ${f}"
1431 else 1491 else
1432 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1492 nols="${nols} ${f}"
1433 fi 1493 fi
1434 done 1494 done
1435 if [[ -z ${newls} ]] ; then 1495 [[ -n ${nols} ]] \
1436 export LINGUAS="" 1496 && ewarn "Sorry, but ${PN} does not support the LINGUAs:" ${nols}
1437 else
1438 export LINGUAS=${newls:1} 1497 export LINGUAS=${newls:1}
1439 fi
1440} 1498}
1441 1499
1442# moved from kernel.eclass since they are generally useful outside of 1500# moved from kernel.eclass since they are generally useful outside of
1443# kernel.eclass -iggy (20041002) 1501# kernel.eclass -iggy (20041002)
1444 1502
1473 1531
1474# Jeremy Huddleston <eradicator@gentoo.org>: 1532# Jeremy Huddleston <eradicator@gentoo.org>:
1475# preserve_old_lib /path/to/libblah.so.0 1533# preserve_old_lib /path/to/libblah.so.0
1476# preserve_old_lib_notify /path/to/libblah.so.0 1534# preserve_old_lib_notify /path/to/libblah.so.0
1477# 1535#
1478# 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
1479# 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
1480# 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
1481# 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
1482# solution, so instead you can add the following to your ebuilds: 1540# solution, so instead you can add the following to your ebuilds:
1483# 1541#
1510 LIB=$1 1568 LIB=$1
1511 1569
1512 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1570 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1513 SONAME=`basename ${LIB}` 1571 SONAME=`basename ${LIB}`
1514 1572
1515 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."
1516 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"
1517 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,"
1518 einfo "you will need to execute the following command:" 1576 ewarn "you will need to execute the following command:"
1519 einfo " revdep-rebuild --soname ${SONAME}" 1577 ewarn " revdep-rebuild --library ${SONAME}"
1520 einfo 1578 ewarn
1521 einfo "After doing that, you can safely remove ${LIB}" 1579 ewarn "After doing that, you can safely remove ${LIB}"
1522 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild" 1580 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1523 fi 1581 fi
1524} 1582}
1525 1583
1526# 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
1527# certain USE flags 1585# certain USE flags
1535built_with_use() { 1593built_with_use() {
1536 local opt=$1 1594 local opt=$1
1537 [[ ${opt:0:1} = "-" ]] && shift || opt="-a" 1595 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1538 1596
1539 local PKG=$(best_version $1) 1597 local PKG=$(best_version $1)
1598 [[ -z ${PKG} ]] && die "Unable to resolve $1 to an installed package"
1540 shift 1599 shift
1541 1600
1542 local USEFILE="${ROOT}/var/db/pkg/${PKG}/USE" 1601 local USEFILE=${ROOT}/var/db/pkg/${PKG}/USE
1543 [[ ! -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
1544 1620
1545 local USE_BUILT=$(<${USEFILE}) 1621 local USE_BUILT=$(<${USEFILE})
1546 while [[ $# -gt 0 ]] ; do 1622 while [[ $# -gt 0 ]] ; do
1547 if [[ ${opt} = "-o" ]] ; then 1623 if [[ ${opt} = "-o" ]] ; then
1548 has $1 ${USE_BUILT} && return 0 1624 has $1 ${USE_BUILT} && return 0
1600# $4 == extra LD_LIBRARY_PATH's (make it : delimited) 1676# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1601# $5 == path for wrapper 1677# $5 == path for wrapper
1602make_wrapper() { 1678make_wrapper() {
1603 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5 1679 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1604 local tmpwrapper=$(emktemp) 1680 local tmpwrapper=$(emktemp)
1681 # We don't want to quote ${bin} so that people can pass complex
1682 # things as $bin ... "./someprog --args"
1605 cat << EOF > "${tmpwrapper}" 1683 cat << EOF > "${tmpwrapper}"
1606#!/bin/sh 1684#!/bin/sh
1607cd "${chdir}" 1685cd "${chdir:-.}"
1686if [ -n "${libdir}" ] ; then
1687 if [ "\${LD_LIBRARY_PATH+set}" = "set" ] ; then
1608export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}" 1688 export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1689 else
1690 export LD_LIBRARY_PATH="${libdir}"
1691 fi
1692fi
1609exec ${bin} "\$@" 1693exec ${bin} "\$@"
1610EOF 1694EOF
1611 chmod go+rx "${tmpwrapper}" 1695 chmod go+rx "${tmpwrapper}"
1612 if [ -n "${5}" ] 1696 if [[ -n ${path} ]] ; then
1613 then
1614 exeinto ${5} 1697 exeinto "${path}"
1615 newexe "${tmpwrapper}" "${wrapper}" 1698 newexe "${tmpwrapper}" "${wrapper}"
1616 else 1699 else
1617 newbin "${tmpwrapper}" "${wrapper}" 1700 newbin "${tmpwrapper}" "${wrapper}"
1618 fi 1701 fi
1619} 1702}

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

  ViewVC Help
Powered by ViewVC 1.1.20