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

Diff of /eclass/eutils.eclass

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

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

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

  ViewVC Help
Powered by ViewVC 1.1.20