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

Diff of /eclass/eutils.eclass

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

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

Legend:
Removed from v.1.181  
changed lines
  Added in v.1.248

  ViewVC Help
Powered by ViewVC 1.1.20