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

Diff of /eclass/eutils.eclass

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

Revision 1.179 Revision 1.223
1# Copyright 1999-2005 Gentoo Foundation 1# Copyright 1999-2005 Gentoo Foundation
2# Distributed under the terms of the GNU General Public License v2 2# Distributed under the terms of the GNU General Public License v2
3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.179 2005/05/28 05:50:29 vapier Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.223 2006/02/15 23:40:16 flameeyes Exp $
4# 4#
5# Author: Martin Schlemmer <azarah@gentoo.org> 5# Author: Martin Schlemmer <azarah@gentoo.org>
6# 6#
7# This eclass is for general purpose functions that most ebuilds 7# This eclass is for general purpose functions that most ebuilds
8# have to implement themselves. 8# have to implement themselves.
9# 9#
10# NB: If you add anything, please comment it! 10# NB: If you add anything, please comment it!
11 11
12inherit multilib 12inherit multilib portability
13ECLASS=eutils
14INHERITED="$INHERITED $ECLASS"
15 13
16DEPEND="!bootstrap? ( sys-devel/patch )" 14DEPEND="!bootstrap? ( sys-devel/patch )"
15# sys-apps/shadow is needed for useradd, etc, bug #94745.
17 16
18DESCRIPTION="Based on the ${ECLASS} eclass" 17DESCRIPTION="Based on the ${ECLASS} eclass"
19 18
20# Wait for the supplied number of seconds. If no argument is supplied, defaults 19# Wait for the supplied number of seconds. If no argument is supplied, defaults
21# to five seconds. If the EPAUSE_IGNORE env var is set, don't wait. If we're not 20# to five seconds. If the EPAUSE_IGNORE env var is set, don't wait. If we're not
61# to point to the latest version of the library present. 60# to point to the latest version of the library present.
62# 61#
63# <azarah@gentoo.org> (26 Oct 2002) 62# <azarah@gentoo.org> (26 Oct 2002)
64# 63#
65gen_usr_ldscript() { 64gen_usr_ldscript() {
66 local libdir="$(get_libdir)" 65 local lib libdir=$(get_libdir)
67 # Just make sure it exists 66 # Just make sure it exists
68 dodir /usr/${libdir} 67 dodir /usr/${libdir}
69 68
70 for lib in "${@}" ; do 69 for lib in "${@}" ; do
71 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT 70 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT
72 /* GNU ld script 71 /* GNU ld script
73 Since Gentoo has critical dynamic libraries 72 Since Gentoo has critical dynamic libraries
74 in /lib, and the static versions in /usr/lib, 73 in /lib, and the static versions in /usr/lib,
75 we need to have a "fake" dynamic lib in /usr/lib, 74 we need to have a "fake" dynamic lib in /usr/lib,
76 otherwise we run into linking problems. 75 otherwise we run into linking problems.
77 76
78 See bug http://bugs.gentoo.org/4411 for more info. 77 See bug http://bugs.gentoo.org/4411 for more info.
79 */ 78 */
80 GROUP ( /${libdir}/${lib} ) 79 GROUP ( /${libdir}/${lib} )
81 END_LDSCRIPT 80 END_LDSCRIPT
82 fperms a+x "/usr/${libdir}/${lib}" 81 fperms a+x "/usr/${libdir}/${lib}" || die "could not change perms on ${lib}"
83 done 82 done
84} 83}
85 84
86# Simple function to draw a line consisting of '=' the same length as $*
87# - only to be used by epatch()
88#
89# <azarah@gentoo.org> (11 Nov 2002)
90#
91draw_line() {
92 local i=0
93 local str_length=""
94
95 # Handle calls that do not have args, or wc not being installed ...
96 if [ -z "$1" -o ! -x "$(which wc 2>/dev/null)" ]
97 then
98 echo "==============================================================="
99 return 0
100 fi
101
102 # Get the length of $*
103 str_length="$(echo -n "$*" | wc -m)"
104
105 while [ "$i" -lt "${str_length}" ]
106 do
107 echo -n "="
108
109 i=$((i + 1))
110 done
111
112 echo
113
114 return 0
115}
116 85
117# Default directory where patches are located 86# Default directory where patches are located
118EPATCH_SOURCE="${WORKDIR}/patch" 87EPATCH_SOURCE="${WORKDIR}/patch"
119# Default extension for patches 88# Default extension for patches
120EPATCH_SUFFIX="patch.bz2" 89EPATCH_SUFFIX="patch.bz2"
167# hand its a directory, it will set EPATCH_SOURCE to this. 136# hand its a directory, it will set EPATCH_SOURCE to this.
168# 137#
169# <azarah@gentoo.org> (10 Nov 2002) 138# <azarah@gentoo.org> (10 Nov 2002)
170# 139#
171epatch() { 140epatch() {
141 _epatch_draw_line() {
142 local i=0 str_length="" str_out=""
143
144 # Handle calls that do not have args, or wc not being installed ...
145 if [[ -z $1 ]] || ! type -p wc >/dev/null ; then
146 str_length=65
147 else
148 str_length=$(echo -n "$*" | wc -m)
149 fi
150
151 while ((i++ < ${str_length})) ; do
152 str_out="${str_out}="
153 done
154 echo ${str_out}
155
156 return 0
157 }
158 _epatch_assert() { local _pipestatus=${PIPESTATUS[*]}; [[ ${_pipestatus// /} -eq 0 ]] ; }
172 local PIPE_CMD="" 159 local PIPE_CMD=""
173 local STDERR_TARGET="${T}/$$.out" 160 local STDERR_TARGET="${T}/$$.out"
174 local PATCH_TARGET="${T}/$$.patch" 161 local PATCH_TARGET="${T}/$$.patch"
175 local PATCH_SUFFIX="" 162 local PATCH_SUFFIX=""
176 local SINGLE_PATCH="no" 163 local SINGLE_PATCH="no"
177 local x="" 164 local x=""
165
166 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402
178 167
179 if [ "$#" -gt 1 ] 168 if [ "$#" -gt 1 ]
180 then 169 then
181 local m="" 170 local m=""
182 for m in "$@" ; do 171 for m in "$@" ; do
283 272
284 # Allow for prefix to differ ... im lazy, so shoot me :/ 273 # Allow for prefix to differ ... im lazy, so shoot me :/
285 while [ "${count}" -lt 5 ] 274 while [ "${count}" -lt 5 ]
286 do 275 do
287 # Generate some useful debug info ... 276 # Generate some useful debug info ...
288 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 277 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
289 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 278 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
290 279
291 if [ "${PATCH_SUFFIX}" != "patch" ] 280 if [ "${PATCH_SUFFIX}" != "patch" ]
292 then 281 then
293 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 282 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
298 287
299 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 288 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
300 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 289 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
301 290
302 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 291 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
303 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 292 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
304 293
305 if [ "${PATCH_SUFFIX}" != "patch" ] 294 if [ "${PATCH_SUFFIX}" != "patch" ]
306 then 295 then
307 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1 296 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
308 then 297 then
312 count=5 301 count=5
313 break 302 break
314 fi 303 fi
315 fi 304 fi
316 305
317 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1 306 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f ; _epatch_assert) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
318 then 307 then
319 draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 308 _epatch_draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
320 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 309 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
321 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 310 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
322 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 311 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
323 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 312 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
324 313
325 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1 314 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1
315 _epatch_assert
326 316
327 if [ "$?" -ne 0 ] 317 if [ "$?" -ne 0 ]
328 then 318 then
329 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 319 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
330 echo 320 echo
376# vapier@gentoo.org 366# vapier@gentoo.org
377# 367#
378# Takes just 1 optional parameter (the directory to create tmpfile in) 368# Takes just 1 optional parameter (the directory to create tmpfile in)
379emktemp() { 369emktemp() {
380 local exe="touch" 370 local exe="touch"
381 [ "$1" == "-d" ] && exe="mkdir" && shift 371 [[ $1 == -d ]] && exe="mkdir" && shift
382 local topdir="$1" 372 local topdir=$1
383 373
384 if [ -z "${topdir}" ] 374 if [[ -z ${topdir} ]] ; then
385 then
386 [ -z "${T}" ] \ 375 [[ -z ${T} ]] \
387 && topdir="/tmp" \ 376 && topdir="/tmp" \
388 || topdir="${T}" 377 || topdir=${T}
389 fi 378 fi
390 379
391 if [ -z "$(type -p mktemp)" ] 380 if [[ -z $(type -p mktemp) ]] ; then
392 then
393 local tmp=/ 381 local tmp=/
394 while [ -e "${tmp}" ] ; do 382 while [[ -e ${tmp} ]] ; do
395 tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}" 383 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}
396 done 384 done
397 ${exe} "${tmp}" 385 ${exe} "${tmp}" || ${exe} -p "${tmp}"
398 echo "${tmp}" 386 echo "${tmp}"
399 else 387 else
400 [ "${exe}" == "touch" ] \ 388 if [[ ${exe} == "touch" ]] ; then
389 [[ ${USERLAND} == "GNU" ]] \
401 && exe="-p" \ 390 && exe="-p" \
391 || exe="-t"
392 else
393 [[ ${USERLAND} == "GNU" ]] \
394 && exe="-d" \
402 || exe="-d" 395 || exe="-dt"
403 mktemp ${exe} "${topdir}" 396 fi
397 TMPDIR="${topdir}" mktemp ${exe} tmp
404 fi 398 fi
405} 399}
406 400
407# Small wrapper for getent (Linux), nidump (Mac OS X), 401# Small wrapper for getent (Linux), nidump (Mac OS X),
408# and pw (FreeBSD) used in enewuser()/enewgroup() 402# and pw (FreeBSD) used in enewuser()/enewgroup()
409# Joe Jezak <josejx@gmail.com> and usata@gentoo.org 403# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
410# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org> 404# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
411# 405#
412# egetent(database, key) 406# egetent(database, key)
413egetent() { 407egetent() {
414 if [[ "${USERLAND}" == "Darwin" ]] ; then 408 case ${CHOST} in
409 *-darwin*)
415 case "$2" in 410 case "$2" in
416 *[!0-9]*) # Non numeric 411 *[!0-9]*) # Non numeric
417 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 412 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
418 ;; 413 ;;
419 *) # Numeric 414 *) # Numeric
420 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 415 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
421 ;; 416 ;;
422 esac 417 esac
423 elif [[ "${USERLAND}" == "BSD" ]] ; then 418 ;;
424 local action 419 *-freebsd*|*-dragonfly*)
425 if [ "$1" == "passwd" ] 420 local opts action="user"
426 then 421 [[ $1 == "passwd" ]] || action="group"
427 action="user" 422
428 else 423 # lookup by uid/gid
429 action="group" 424 if [[ $2 == [[:digit:]]* ]] ; then
425 [[ ${action} == "user" ]] && opts="-u" || opts="-g"
430 fi 426 fi
427
431 pw show "${action}" "$2" -q 428 pw show ${action} ${opts} "$2" -q
432 else 429 ;;
430 *-netbsd*|*-openbsd*)
431 grep "$2:\*:" /etc/$1
432 ;;
433 *)
433 which nscd >& /dev/null && nscd -i "$1" 434 type -p nscd >& /dev/null && nscd -i "$1"
434 getent "$1" "$2" 435 getent "$1" "$2"
435 fi 436 ;;
437 esac
436} 438}
437 439
438# Simplify/standardize adding users to the system 440# Simplify/standardize adding users to the system
439# vapier@gentoo.org 441# vapier@gentoo.org
440# 442#
448# homedir: /dev/null 450# homedir: /dev/null
449# groups: none 451# groups: none
450# extra: comment of 'added by portage for ${PN}' 452# extra: comment of 'added by portage for ${PN}'
451enewuser() { 453enewuser() {
452 # get the username 454 # get the username
453 local euser="$1"; shift 455 local euser=$1; shift
454 if [ -z "${euser}" ] 456 if [[ -z ${euser} ]] ; then
455 then
456 eerror "No username specified !" 457 eerror "No username specified !"
457 die "Cannot call enewuser without a username" 458 die "Cannot call enewuser without a username"
458 fi 459 fi
459 460
460 # lets see if the username already exists 461 # lets see if the username already exists
461 if [ "${euser}" == "`egetent passwd \"${euser}\" | cut -d: -f1`" ] 462 if [[ ${euser} == $(egetent passwd "${euser}" | cut -d: -f1) ]] ; then
462 then
463 return 0 463 return 0
464 fi 464 fi
465 einfo "Adding user '${euser}' to your system ..." 465 einfo "Adding user '${euser}' to your system ..."
466 466
467 # options to pass to useradd 467 # options to pass to useradd
468 local opts= 468 local opts=
469 469
470 # handle uid 470 # handle uid
471 local euid="$1"; shift 471 local euid=$1; shift
472 if [ ! -z "${euid}" ] && [ "${euid}" != "-1" ] 472 if [[ ! -z ${euid} ]] && [[ ${euid} != "-1" ]] ; then
473 then
474 if [ "${euid}" -gt 0 ] 473 if [[ ${euid} -gt 0 ]] ; then
475 then
476 if [ ! -z "`egetent passwd ${euid}`" ] 474 if [[ ! -z $(egetent passwd ${euid}) ]] ; then
477 then
478 euid="next" 475 euid="next"
479 fi 476 fi
480 else 477 else
481 eerror "Userid given but is not greater than 0 !" 478 eerror "Userid given but is not greater than 0 !"
482 die "${euid} is not a valid UID" 479 die "${euid} is not a valid UID"
483 fi 480 fi
484 else 481 else
485 euid="next" 482 euid="next"
486 fi 483 fi
487 if [ "${euid}" == "next" ] 484 if [[ ${euid} == "next" ]] ; then
488 then 485 for euid in $(seq 101 999) ; do
489 local pwrange
490 if [ "${USERLAND}" == "BSD" ] ; then
491 pwrange="`jot 898 101`"
492 else
493 pwrange="`seq 101 999`"
494 fi
495 for euid in ${pwrange} ; do
496 [ -z "`egetent passwd ${euid}`" ] && break 486 [[ -z $(egetent passwd ${euid}) ]] && break
497 done 487 done
498 fi 488 fi
499 opts="${opts} -u ${euid}" 489 opts="${opts} -u ${euid}"
500 einfo " - Userid: ${euid}" 490 einfo " - Userid: ${euid}"
501 491
502 # handle shell 492 # handle shell
503 local eshell="$1"; shift 493 local eshell=$1; shift
504 if [ ! -z "${eshell}" ] && [ "${eshell}" != "-1" ] 494 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
505 then 495 if [[ ! -e ${ROOT}${eshell} ]] ; then
506 if [ ! -e "${eshell}" ]
507 then
508 eerror "A shell was specified but it does not exist !" 496 eerror "A shell was specified but it does not exist !"
509 die "${eshell} does not exist" 497 die "${eshell} does not exist in ${ROOT}"
510 fi 498 fi
511 else 499 if [[ ${eshell} == */false || ${eshell} == */nologin ]] ; then
512 if [[ "${USERLAND}" == "Darwin" ]]; then 500 eerror "Do not specify ${eshell} yourself, use -1"
513 eshell="/usr/bin/false" 501 die "Pass '-1' as the shell parameter"
514 elif [[ "${USERLAND}" == "BSD" ]]; then 502 fi
515 eshell="/usr/sbin/nologin"
516 else 503 else
517 eshell="/bin/false" 504 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do
505 [[ -x ${ROOT}${shell} ]] && break
506 done
507
508 if [[ ${shell} == "/dev/null" ]] ; then
509 eerror "Unable to identify the shell to use"
510 die "Unable to identify the shell to use"
518 fi 511 fi
512
513 eshell=${shell}
519 fi 514 fi
520 einfo " - Shell: ${eshell}" 515 einfo " - Shell: ${eshell}"
521 opts="${opts} -s ${eshell}" 516 opts="${opts} -s ${eshell}"
522 517
523 # handle homedir 518 # handle homedir
524 local ehome="$1"; shift 519 local ehome=$1; shift
525 if [ -z "${ehome}" ] || [ "${eshell}" == "-1" ] 520 if [[ -z ${ehome} ]] || [[ ${ehome} == "-1" ]] ; then
526 then
527 ehome="/dev/null" 521 ehome="/dev/null"
528 fi 522 fi
529 einfo " - Home: ${ehome}" 523 einfo " - Home: ${ehome}"
530 opts="${opts} -d ${ehome}" 524 opts="${opts} -d ${ehome}"
531 525
532 # handle groups 526 # handle groups
533 local egroups="$1"; shift 527 local egroups=$1; shift
534 if [ ! -z "${egroups}" ] 528 if [[ ! -z ${egroups} ]] ; then
535 then
536 local oldifs="${IFS}" 529 local oldifs=${IFS}
537 local defgroup="" exgroups="" 530 local defgroup="" exgroups=""
538 531
539 export IFS="," 532 export IFS=","
540 for g in ${egroups} 533 for g in ${egroups} ; do
541 do
542 export IFS="${oldifs}" 534 export IFS=${oldifs}
543 if [ -z "`egetent group \"${g}\"`" ] 535 if [[ -z $(egetent group "${g}") ]] ; then
544 then
545 eerror "You must add group ${g} to the system first" 536 eerror "You must add group ${g} to the system first"
546 die "${g} is not a valid GID" 537 die "${g} is not a valid GID"
547 fi 538 fi
548 if [ -z "${defgroup}" ] 539 if [[ -z ${defgroup} ]] ; then
549 then
550 defgroup="${g}" 540 defgroup=${g}
551 else 541 else
552 exgroups="${exgroups},${g}" 542 exgroups="${exgroups},${g}"
553 fi 543 fi
554 export IFS="," 544 export IFS=","
555 done 545 done
556 export IFS="${oldifs}" 546 export IFS=${oldifs}
557 547
558 opts="${opts} -g ${defgroup}" 548 opts="${opts} -g ${defgroup}"
559 if [ ! -z "${exgroups}" ] 549 if [[ ! -z ${exgroups} ]] ; then
560 then
561 opts="${opts} -G ${exgroups:1}" 550 opts="${opts} -G ${exgroups:1}"
562 fi 551 fi
563 else 552 else
564 egroups="(none)" 553 egroups="(none)"
565 fi 554 fi
566 einfo " - Groups: ${egroups}" 555 einfo " - Groups: ${egroups}"
567 556
568 # handle extra and add the user 557 # handle extra and add the user
569 local eextra="$@"
570 local oldsandbox="${SANDBOX_ON}" 558 local oldsandbox=${SANDBOX_ON}
571 export SANDBOX_ON="0" 559 export SANDBOX_ON="0"
572 if [[ "${USERLAND}" == "Darwin" ]] 560 case ${CHOST} in
573 then 561 *-darwin*)
574 ### Make the user 562 ### Make the user
575 if [ -z "${eextra}" ] 563 if [[ -z $@ ]] ; then
576 then
577 dscl . create /users/${euser} uid ${euid} 564 dscl . create /users/${euser} uid ${euid}
578 dscl . create /users/${euser} shell ${eshell} 565 dscl . create /users/${euser} shell ${eshell}
579 dscl . create /users/${euser} home ${ehome} 566 dscl . create /users/${euser} home ${ehome}
580 dscl . create /users/${euser} realname "added by portage for ${PN}" 567 dscl . create /users/${euser} realname "added by portage for ${PN}"
581 ### Add the user to the groups specified 568 ### Add the user to the groups specified
582 local oldifs="${IFS}" 569 local oldifs=${IFS}
583 export IFS="," 570 export IFS=","
584 for g in ${egroups} 571 for g in ${egroups} ; do
585 do
586 dscl . merge /groups/${g} users ${euser} 572 dscl . merge /groups/${g} users ${euser}
587 done 573 done
588 export IFS="${oldifs}" 574 export IFS=${oldifs}
589 else 575 else
590 einfo "Extra options are not supported on macos yet" 576 einfo "Extra options are not supported on Darwin yet"
591 einfo "Please report the ebuild along with the info below" 577 einfo "Please report the ebuild along with the info below"
592 einfo "eextra: ${eextra}" 578 einfo "eextra: $@"
593 die "Required function missing" 579 die "Required function missing"
594 fi 580 fi
595 elif [[ "${USERLAND}" == "BSD" ]] ; then 581 ;;
596 if [ -z "${eextra}" ] 582 *-freebsd*|*-dragonfly*)
597 then 583 if [[ -z $@ ]] ; then
598 pw useradd ${euser} ${opts} \ 584 pw useradd ${euser} ${opts} \
599 -c "added by portage for ${PN}" \ 585 -c "added by portage for ${PN}" \
600 die "enewuser failed" 586 die "enewuser failed"
601 else 587 else
602 einfo " - Extra: ${eextra}" 588 einfo " - Extra: $@"
603 pw useradd ${euser} ${opts} \ 589 pw useradd ${euser} ${opts} \
604 -c ${eextra} || die "enewuser failed" 590 "$@" || die "enewuser failed"
605 fi 591 fi
592 ;;
593
594 *-netbsd*)
595 if [[ -z $@ ]] ; then
596 useradd ${opts} ${euser} || die "enewuser failed"
606 else 597 else
607 if [ -z "${eextra}" ] 598 einfo " - Extra: $@"
608 then 599 useradd ${opts} ${euser} "$@" || die "enewuser failed"
600 fi
601 ;;
602
603 *-openbsd*)
604 if [[ -z $@ ]] ; then
605 useradd -u ${euid} -s ${eshell} \
606 -d ${ehome} -c "Added by portage for ${PN}" \
607 -g ${egroups} ${euser} || die "enewuser failed"
608 else
609 einfo " - Extra: $@"
610 useradd -u ${euid} -s ${eshell} \
611 -d ${ehome} -c "Added by portage for ${PN}" \
612 -g ${egroups} ${euser} "$@" || die "enewuser failed"
613 fi
614 ;;
615
616 *)
617 if [[ -z $@ ]] ; then
609 useradd ${opts} ${euser} \ 618 useradd ${opts} ${euser} \
610 -c "added by portage for ${PN}" \ 619 -c "added by portage for ${PN}" \
611 || die "enewuser failed" 620 || die "enewuser failed"
612 else 621 else
613 einfo " - Extra: ${eextra}" 622 einfo " - Extra: $@"
614 useradd ${opts} ${euser} ${eextra} \ 623 useradd ${opts} ${euser} "$@" \
615 || die "enewuser failed" 624 || die "enewuser failed"
616 fi 625 fi
626 ;;
627 esac
628
629 if [[ ! -e ${ROOT}/${ehome} ]] ; then
630 einfo " - Creating ${ehome} in ${ROOT}"
631 mkdir -p "${ROOT}/${ehome}"
632 chown ${euser} "${ROOT}/${ehome}"
633 chmod 755 "${ROOT}/${ehome}"
617 fi 634 fi
635
618 export SANDBOX_ON="${oldsandbox}" 636 export SANDBOX_ON=${oldsandbox}
619
620 if [ ! -e "${ehome}" ] && [ ! -e "${D}/${ehome}" ]
621 then
622 einfo " - Creating ${ehome} in ${D}"
623 dodir ${ehome}
624 fowners ${euser} ${ehome}
625 fperms 755 ${ehome}
626 fi
627} 637}
628 638
629# Simplify/standardize adding groups to the system 639# Simplify/standardize adding groups to the system
630# vapier@gentoo.org 640# vapier@gentoo.org
631# 641#
660 then 670 then
661 if [ "${egid}" -gt 0 ] 671 if [ "${egid}" -gt 0 ]
662 then 672 then
663 if [ -z "`egetent group ${egid}`" ] 673 if [ -z "`egetent group ${egid}`" ]
664 then 674 then
665 if [[ "${USERLAND}" == "Darwin" ]]; then 675 if [[ "${CHOST}" == *-darwin* ]]; then
666 opts="${opts} ${egid}" 676 opts="${opts} ${egid}"
667 else 677 else
668 opts="${opts} -g ${egid}" 678 opts="${opts} -g ${egid}"
669 fi 679 fi
670 else 680 else
684 opts="${opts} ${eextra}" 694 opts="${opts} ${eextra}"
685 695
686 # add the group 696 # add the group
687 local oldsandbox="${SANDBOX_ON}" 697 local oldsandbox="${SANDBOX_ON}"
688 export SANDBOX_ON="0" 698 export SANDBOX_ON="0"
689 if [[ "${USERLAND}" == "Darwin" ]]; then 699 case ${CHOST} in
700 *-darwin*)
690 if [ ! -z "${eextra}" ]; 701 if [ ! -z "${eextra}" ];
691 then 702 then
692 einfo "Extra options are not supported on Darwin/OS X yet" 703 einfo "Extra options are not supported on Darwin/OS X yet"
693 einfo "Please report the ebuild along with the info below" 704 einfo "Please report the ebuild along with the info below"
694 einfo "eextra: ${eextra}" 705 einfo "eextra: ${eextra}"
695 die "Required function missing" 706 die "Required function missing"
696 fi 707 fi
697 708
698 # If we need the next available 709 # If we need the next available
699 case ${egid} in 710 case ${egid} in
700 *[!0-9]*) # Non numeric 711 *[!0-9]*) # Non numeric
701 for egid in `jot 898 101`; do 712 for egid in $(seq 101 999); do
702 [ -z "`egetent group ${egid}`" ] && break 713 [ -z "`egetent group ${egid}`" ] && break
703 done 714 done
704 esac 715 esac
705 dscl . create /groups/${egroup} gid ${egid} 716 dscl . create /groups/${egroup} gid ${egid}
706 dscl . create /groups/${egroup} passwd '*' 717 dscl . create /groups/${egroup} passwd '*'
707 elif [[ "${USERLAND}" == "BSD" ]] ; then 718 ;;
719
720 *-freebsd*|*-dragonfly*)
708 case ${egid} in 721 case ${egid} in
709 *[!0-9]*) # Non numeric 722 *[!0-9]*) # Non numeric
710 for egid in `jot 898 101`; do 723 for egid in $(seq 101 999); do
711 [ -z "`egetent group ${egid}`" ] && break 724 [ -z "`egetent group ${egid}`" ] && break
712 done 725 done
713 esac 726 esac
714 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 727 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
715 else 728 ;;
729
730 *-netbsd*)
731 case ${egid} in
732 *[!0-9]*) # Non numeric
733 for egid in $(seq 101 999); do
734 [ -z "`egetent group ${egid}`" ] && break
735 done
736 esac
737 groupadd -g ${egid} ${egroup} || die "enewgroup failed"
738 ;;
739
740 *)
716 groupadd ${opts} ${egroup} || die "enewgroup failed" 741 groupadd ${opts} ${egroup} || die "enewgroup failed"
717 fi 742 ;;
743 esac
718 export SANDBOX_ON="${oldsandbox}" 744 export SANDBOX_ON="${oldsandbox}"
719} 745}
720 746
721# Simple script to replace 'dos2unix' binaries 747# Simple script to replace 'dos2unix' binaries
722# vapier@gentoo.org 748# vapier@gentoo.org
747# name: the name that will show up in the menu 773# name: the name that will show up in the menu
748# icon: give your little like a pretty little icon ... 774# icon: give your little like a pretty little icon ...
749# this can be relative (to /usr/share/pixmaps) or 775# this can be relative (to /usr/share/pixmaps) or
750# a full path to an icon 776# a full path to an icon
751# type: what kind of application is this ? for categories: 777# type: what kind of application is this ? for categories:
752# http://www.freedesktop.org/wiki/Standards_2fmenu_2dspec 778# http://www.freedesktop.org/Standards/desktop-entry-spec
753# path: if your app needs to startup in a specific dir 779# path: if your app needs to startup in a specific dir
754make_desktop_entry() { 780make_desktop_entry() {
755 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1 781 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1
756 782
757 local exec=${1} 783 local exec=${1}
783 dev) 809 dev)
784 type="Development" 810 type="Development"
785 ;; 811 ;;
786 812
787 games) 813 games)
788 [[ -z ${path} ]] && path=${GAMES_BINDIR}
789
790 case ${catmin} in 814 case ${catmin} in
791 action) type=ActionGame;; 815 action) type=ActionGame;;
792 arcade) type=ArcadeGame;; 816 arcade) type=ArcadeGame;;
793 board) type=BoardGame;; 817 board) type=BoardGame;;
794 kid) type=KidsGame;; 818 kid) type=KidsGame;;
835 type="Network;${type}" 859 type="Network;${type}"
836 ;; 860 ;;
837 861
838 sci) 862 sci)
839 case ${catmin} in 863 case ${catmin} in
840 astro*) type=Astronomoy;; 864 astro*) type=Astronomy;;
841 bio*) type=Biology;; 865 bio*) type=Biology;;
842 calc*) type=Calculator;; 866 calc*) type=Calculator;;
843 chem*) type=Chemistry;; 867 chem*) type=Chemistry;;
844 geo*) type=Geology;; 868 geo*) type=Geology;;
845 math*) type=Math;; 869 math*) type=Math;;
877Exec=${exec} 901Exec=${exec}
878Path=${path} 902Path=${path}
879Icon=${icon} 903Icon=${icon}
880Categories=Application;${type};" > "${desktop}" 904Categories=Application;${type};" > "${desktop}"
881 905
906 (
907 # wrap the env here so that the 'insinto' call
908 # doesn't corrupt the env of the caller
882 insinto /usr/share/applications 909 insinto /usr/share/applications
883 doins "${desktop}" 910 doins "${desktop}"
884 911 )
885 return 0
886} 912}
887 913
888# Make a GDM/KDM Session file 914# Make a GDM/KDM Session file
889# 915#
890# make_desktop_entry(<title>, <command>) 916# make_desktop_entry(<title>, <command>)
919 doins "${i}" 945 doins "${i}"
920 elif [[ -d ${i} ]] ; then 946 elif [[ -d ${i} ]] ; then
921 for j in "${i}"/*.desktop ; do 947 for j in "${i}"/*.desktop ; do
922 doins "${j}" 948 doins "${j}"
923 done 949 done
924 fi 950 fi
925 done 951 done
926} 952}
927newmenu() { 953newmenu() {
928 insinto /usr/share/applications 954 insinto /usr/share/applications
929 newins "$1" "$2" 955 newins "$1" "$2"
937 doins "${i}" 963 doins "${i}"
938 elif [[ -d ${i} ]] ; then 964 elif [[ -d ${i} ]] ; then
939 for j in "${i}"/*.png ; do 965 for j in "${i}"/*.png ; do
940 doins "${j}" 966 doins "${j}"
941 done 967 done
942 fi 968 fi
943 done 969 done
944} 970}
945newicon() { 971newicon() {
946 insinto /usr/share/pixmaps 972 insinto /usr/share/pixmaps
947 newins "$1" "$2" 973 newins "$1" "$2"
952############################################################## 978##############################################################
953 979
954 980
955# for internal use only (unpack_pdv and unpack_makeself) 981# for internal use only (unpack_pdv and unpack_makeself)
956find_unpackable_file() { 982find_unpackable_file() {
957 local src="$1" 983 local src=$1
958 if [ -z "${src}" ] 984 if [[ -z ${src} ]] ; then
959 then
960 src="${DISTDIR}/${A}" 985 src=${DISTDIR}/${A}
961 else 986 else
962 if [ -e "${DISTDIR}/${src}" ] 987 if [[ -e ${DISTDIR}/${src} ]] ; then
963 then
964 src="${DISTDIR}/${src}" 988 src=${DISTDIR}/${src}
965 elif [ -e "${PWD}/${src}" ] 989 elif [[ -e ${PWD}/${src} ]] ; then
966 then
967 src="${PWD}/${src}" 990 src=${PWD}/${src}
968 elif [ -e "${src}" ] 991 elif [[ -e ${src} ]] ; then
969 then
970 src="${src}" 992 src=${src}
971 fi
972 fi 993 fi
973 [ ! -e "${src}" ] && die "Could not find requested archive ${src}" 994 fi
995 [[ ! -e ${src} ]] && return 1
974 echo "${src}" 996 echo "${src}"
975} 997}
976 998
977# Unpack those pesky pdv generated files ... 999# Unpack those pesky pdv generated files ...
978# They're self-unpacking programs with the binary package stuffed in 1000# They're self-unpacking programs with the binary package stuffed in
993# lseek 1015# lseek
994# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 1016# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
995# lseek(3, -4, SEEK_END) = 2981250 1017# lseek(3, -4, SEEK_END) = 2981250
996# thus we would pass in the value of '4' as the second parameter. 1018# thus we would pass in the value of '4' as the second parameter.
997unpack_pdv() { 1019unpack_pdv() {
998 local src="`find_unpackable_file $1`" 1020 local src=$(find_unpackable_file $1)
999 local sizeoff_t="$2" 1021 local sizeoff_t=$2
1000 1022
1023 [[ -z ${src} ]] && die "Could not locate source for '$1'"
1001 [ -z "${sizeoff_t}" ] && die "No idea what off_t size was used for this pdv :(" 1024 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :("
1002 1025
1003 local shrtsrc="`basename ${src}`" 1026 local shrtsrc=$(basename "${src}")
1004 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1027 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1005 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1028 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"`
1006 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"` 1029 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"`
1007 1030
1008 # grab metadata for debug reasons 1031 # grab metadata for debug reasons
1072# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1095# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1073# - If the file is not specified then unpack will utilize ${A}. 1096# - If the file is not specified then unpack will utilize ${A}.
1074# - If the offset is not specified then we will attempt to extract 1097# - If the offset is not specified then we will attempt to extract
1075# the proper offset from the script itself. 1098# the proper offset from the script itself.
1076unpack_makeself() { 1099unpack_makeself() {
1100 local src_input=${1:-${A}}
1077 local src="$(find_unpackable_file "$1")" 1101 local src=$(find_unpackable_file "${src_input}")
1078 local skip="$2" 1102 local skip=$2
1079 local exe="$3" 1103 local exe=$3
1080 1104
1105 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
1106
1081 local shrtsrc="$(basename "${src}")" 1107 local shrtsrc=$(basename "${src}")
1082 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1108 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1083 if [ -z "${skip}" ] 1109 if [[ -z ${skip} ]] ; then
1084 then
1085 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1110 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}')
1086 local skip=0 1111 local skip=0
1087 exe=tail 1112 exe=tail
1088 case ${ver} in 1113 case ${ver} in
1089 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same 1114 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same
1090 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1115 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1102 ;; 1127 ;;
1103 2.1.3) 1128 2.1.3)
1104 skip=`grep -a ^offset= "${src}" | awk '{print $3}'` 1129 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1105 let skip="skip + 1" 1130 let skip="skip + 1"
1106 ;; 1131 ;;
1107 2.1.4) 1132 2.1.4|2.1.5)
1108 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1) 1133 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1)
1109 skip=$(head -n ${skip} "${src}" | wc -c) 1134 skip=$(head -n ${skip} "${src}" | wc -c)
1110 exe="dd" 1135 exe="dd"
1111 ;; 1136 ;;
1112 *) 1137 *)
1157check_license() { 1182check_license() {
1158 local lic=$1 1183 local lic=$1
1159 if [ -z "${lic}" ] ; then 1184 if [ -z "${lic}" ] ; then
1160 lic="${PORTDIR}/licenses/${LICENSE}" 1185 lic="${PORTDIR}/licenses/${LICENSE}"
1161 else 1186 else
1162 if [ -e "${PORTDIR}/licenses/${src}" ] ; then 1187 if [ -e "${PORTDIR}/licenses/${lic}" ] ; then
1163 lic="${PORTDIR}/licenses/${src}" 1188 lic="${PORTDIR}/licenses/${lic}"
1164 elif [ -e "${PWD}/${src}" ] ; then 1189 elif [ -e "${PWD}/${lic}" ] ; then
1165 lic="${PWD}/${src}" 1190 lic="${PWD}/${lic}"
1166 elif [ -e "${src}" ] ; then 1191 elif [ -e "${lic}" ] ; then
1167 lic="${src}" 1192 lic="${lic}"
1168 fi
1169 fi 1193 fi
1194 fi
1170 [ ! -f "${lic}" ] && die "Could not find requested license ${src}" 1195 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1171 local l="`basename ${lic}`" 1196 local l="`basename ${lic}`"
1172 1197
1173 # here is where we check for the licenses the user already 1198 # here is where we check for the licenses the user already
1174 # accepted ... if we don't find a match, we make the user accept 1199 # accepted ... if we don't find a match, we make the user accept
1175 local shopts=$- 1200 local shopts=$-
1231 # first we figure out how many cds we're dealing with by 1256 # first we figure out how many cds we're dealing with by
1232 # the # of files they gave us 1257 # the # of files they gave us
1233 local cdcnt=0 1258 local cdcnt=0
1234 local f= 1259 local f=
1235 for f in "$@" ; do 1260 for f in "$@" ; do
1236 cdcnt=$((cdcnt + 1)) 1261 ((++cdcnt))
1237 export CDROM_CHECK_${cdcnt}="$f" 1262 export CDROM_CHECK_${cdcnt}="$f"
1238 done 1263 done
1239 export CDROM_TOTAL_CDS=${cdcnt} 1264 export CDROM_TOTAL_CDS=${cdcnt}
1240 export CDROM_CURRENT_CD=1 1265 export CDROM_CURRENT_CD=1
1241 1266
1242 # now we see if the user gave use CD_ROOT ... 1267 # now we see if the user gave use CD_ROOT ...
1243 # if they did, let's just believe them that it's correct 1268 # if they did, let's just believe them that it's correct
1244 if [[ ! -z ${CD_ROOT} ]] ; then
1245 export CDROM_ROOT=${CD_ROOT}
1246 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1247 return
1248 fi
1249 # do the same for CD_ROOT_X
1250 if [[ ! -z ${CD_ROOT_1} ]] ; then 1269 if [[ -n ${CD_ROOT}${CD_ROOT_1} ]] ; then
1251 local var= 1270 local var=
1252 cdcnt=0 1271 cdcnt=0
1253 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1272 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1254 cdcnt=$((cdcnt + 1)) 1273 ((++cdcnt))
1255 var="CD_ROOT_${cdcnt}" 1274 var="CD_ROOT_${cdcnt}"
1275 [[ -z ${!var} ]] && var="CD_ROOT"
1256 if [[ -z ${!var} ]] ; then 1276 if [[ -z ${!var} ]] ; then
1257 eerror "You must either use just the CD_ROOT" 1277 eerror "You must either use just the CD_ROOT"
1258 eerror "or specify ALL the CD_ROOT_X variables." 1278 eerror "or specify ALL the CD_ROOT_X variables."
1259 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables." 1279 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables."
1260 die "could not locate CD_ROOT_${cdcnt}" 1280 die "could not locate CD_ROOT_${cdcnt}"
1261 fi 1281 fi
1262 export CDROM_ROOTS_${cdcnt}="${!var}"
1263 done 1282 done
1264 export CDROM_ROOT=${CDROM_ROOTS_1} 1283 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}}
1265 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1284 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1285 export CDROM_SET=-1
1286 for f in ${CDROM_CHECK_1//:/ } ; do
1287 ((++CDROM_SET))
1288 [[ -e ${CD_ROOT}/${f} ]] && break
1289 done
1290 export CDROM_MATCH=${f}
1266 return 1291 return
1267 fi 1292 fi
1268 1293
1294 # User didn't help us out so lets make sure they know they can
1295 # simplify the whole process ...
1269 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1296 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1270 einfon "This ebuild will need the " 1297 einfo "This ebuild will need the ${CDROM_NAME:-cdrom for ${PN}}"
1271 if [[ -z ${CDROM_NAME} ]] ; then
1272 echo "cdrom for ${PN}."
1273 else
1274 echo "${CDROM_NAME}."
1275 fi
1276 echo 1298 echo
1277 einfo "If you do not have the CD, but have the data files" 1299 einfo "If you do not have the CD, but have the data files"
1278 einfo "mounted somewhere on your filesystem, just export" 1300 einfo "mounted somewhere on your filesystem, just export"
1279 einfo "the variable CD_ROOT so that it points to the" 1301 einfo "the variable CD_ROOT so that it points to the"
1280 einfo "directory containing the files." 1302 einfo "directory containing the files."
1284 echo 1306 echo
1285 else 1307 else
1286 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1308 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1287 cdcnt=0 1309 cdcnt=0
1288 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1310 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1289 cdcnt=$((cdcnt + 1)) 1311 ((++cdcnt))
1290 var="CDROM_NAME_${cdcnt}" 1312 var="CDROM_NAME_${cdcnt}"
1291 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}" 1313 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}"
1292 done 1314 done
1293 echo 1315 echo
1294 einfo "If you do not have the CDs, but have the data files" 1316 einfo "If you do not have the CDs, but have the data files"
1295 einfo "mounted somewhere on your filesystem, just export" 1317 einfo "mounted somewhere on your filesystem, just export"
1296 einfo "the following variables so they point to the right place:" 1318 einfo "the following variables so they point to the right place:"
1297 einfon "" 1319 einfon ""
1298 cdcnt=0 1320 cdcnt=0
1299 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1321 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1300 cdcnt=$((cdcnt + 1)) 1322 ((++cdcnt))
1301 echo -n " CD_ROOT_${cdcnt}" 1323 echo -n " CD_ROOT_${cdcnt}"
1302 done 1324 done
1303 echo 1325 echo
1304 einfo "Or, if you have all the files in the same place, or" 1326 einfo "Or, if you have all the files in the same place, or"
1305 einfo "you only have one cdrom, you can export CD_ROOT" 1327 einfo "you only have one cdrom, you can export CD_ROOT"
1308 echo 1330 echo
1309 einfo "For example:" 1331 einfo "For example:"
1310 einfo "export CD_ROOT_1=/mnt/cdrom" 1332 einfo "export CD_ROOT_1=/mnt/cdrom"
1311 echo 1333 echo
1312 fi 1334 fi
1335
1336 export CDROM_SET=""
1313 export CDROM_CURRENT_CD=0 1337 export CDROM_CURRENT_CD=0
1314 cdrom_load_next_cd 1338 cdrom_load_next_cd
1315} 1339}
1316 1340
1317# this is only used when you need access to more than one cd. 1341# this is only used when you need access to more than one cd.
1318# when you have finished using the first cd, just call this function. 1342# when you have finished using the first cd, just call this function.
1319# when it returns, CDROM_ROOT will be pointing to the second cd. 1343# when it returns, CDROM_ROOT will be pointing to the second cd.
1320# remember, you can only go forward in the cd chain, you can't go back. 1344# remember, you can only go forward in the cd chain, you can't go back.
1321cdrom_load_next_cd() { 1345cdrom_load_next_cd() {
1322 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1323 local var= 1346 local var
1324 1347 ((++CDROM_CURRENT_CD))
1325 if [[ ! -z ${CD_ROOT} ]] ; then
1326 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}"
1327 return
1328 fi
1329 1348
1330 unset CDROM_ROOT 1349 unset CDROM_ROOT
1331 var=CDROM_ROOTS_${CDROM_CURRENT_CD} 1350 var=CD_ROOT_${CDROM_CURRENT_CD}
1351 [[ -z ${!var} ]] && var="CD_ROOT"
1332 if [[ -z ${!var} ]] ; then 1352 if [[ -z ${!var} ]] ; then
1333 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1353 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1334 cdrom_locate_file_on_cd ${!var} 1354 _cdrom_locate_file_on_cd ${!var}
1335 else 1355 else
1336 export CDROM_ROOT=${!var} 1356 export CDROM_ROOT=${!var}
1337 fi 1357 fi
1338 1358
1339 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1359 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1344# all it does is try to locate a give file on a cd ... if the cd isn't 1364# all it does is try to locate a give file on a cd ... if the cd isn't
1345# found, then a message asking for the user to insert the cdrom will be 1365# found, then a message asking for the user to insert the cdrom will be
1346# displayed and we'll hang out here until: 1366# displayed and we'll hang out here until:
1347# (1) the file is found on a mounted cdrom 1367# (1) the file is found on a mounted cdrom
1348# (2) the user hits CTRL+C 1368# (2) the user hits CTRL+C
1349cdrom_locate_file_on_cd() { 1369_cdrom_locate_file_on_cd() {
1370 local mline=""
1371 local showedmsg=0
1372
1350 while [[ -z ${CDROM_ROOT} ]] ; do 1373 while [[ -z ${CDROM_ROOT} ]] ; do
1374 local i=0
1375 local -a cdset=(${*//:/ })
1376 if [[ -n ${CDROM_SET} ]] ; then
1377 cdset=(${cdset[${CDROM_SET}]})
1378 fi
1379
1380 while [[ -n ${cdset[${i}]} ]] ; do
1351 local dir="$(dirname ${@})" 1381 local dir=$(dirname ${cdset[${i}]})
1352 local file="$(basename ${@})" 1382 local file=$(basename ${cdset[${i}]})
1353 local mline=""
1354 local showedmsg=0
1355 1383
1356 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do 1384 for mline in $(mount | gawk '/(iso|cdrom|fs=cdfss)/ {print $3}') ; do
1357 [[ -d ${mline}/${dir} ]] || continue 1385 [[ -d ${mline}/${dir} ]] || continue
1358 [[ ! -z $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] \ 1386 if [[ -n $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] ; then
1359 && export CDROM_ROOT=${mline} 1387 export CDROM_ROOT=${mline}
1388 export CDROM_SET=${i}
1389 export CDROM_MATCH=${cdset[${i}]}
1390 return
1391 fi
1392 done
1393
1394 ((++i))
1360 done 1395 done
1361 1396
1362 if [[ -z ${CDROM_ROOT} ]] ; then
1363 echo 1397 echo
1364 if [[ ${showedmsg} -eq 0 ]] ; then 1398 if [[ ${showedmsg} -eq 0 ]] ; then
1365 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1399 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1366 if [[ -z ${CDROM_NAME} ]] ; then 1400 if [[ -z ${CDROM_NAME} ]] ; then
1367 einfo "Please insert the cdrom for ${PN} now !" 1401 einfo "Please insert+mount the cdrom for ${PN} now !"
1368 else
1369 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1370 fi
1371 else 1402 else
1372 if [[ -z ${CDROM_NAME_1} ]] ; then
1373 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !"
1374 else
1375 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1376 einfo "Please insert+mount the ${!var} cdrom now !" 1403 einfo "Please insert+mount the ${CDROM_NAME} cdrom now !"
1377 fi
1378 fi 1404 fi
1379 showedmsg=1 1405 else
1406 if [[ -z ${CDROM_NAME_1} ]] ; then
1407 einfo "Please insert+mount cd #${CDROM_CURRENT_CD} for ${PN} now !"
1408 else
1409 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1410 einfo "Please insert+mount the ${!var} cdrom now !"
1411 fi
1380 fi 1412 fi
1413 showedmsg=1
1414 fi
1381 einfo "Press return to scan for the cd again" 1415 einfo "Press return to scan for the cd again"
1382 einfo "or hit CTRL+C to abort the emerge." 1416 einfo "or hit CTRL+C to abort the emerge."
1383 read 1417 echo
1384 fi 1418 einfo "If you are having trouble with the detection"
1419 einfo "of your CD, it is possible that you do not have"
1420 einfo "Joliet support enabled in your kernel. Please"
1421 einfo "check that CONFIG_JOLIET is enabled in your kernel."
1422 read || die "something is screwed with your system"
1385 done 1423 done
1386} 1424}
1387 1425
1388# Make sure that LINGUAS only contains languages that 1426# Make sure that LINGUAS only contains languages that
1389# a package can support 1427# a package can support
1510 LIB=$1 1548 LIB=$1
1511 1549
1512 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1550 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1513 SONAME=`basename ${LIB}` 1551 SONAME=`basename ${LIB}`
1514 1552
1515 einfo "An old version of an installed library was detected on your system." 1553 ewarn "An old version of an installed library was detected on your system."
1516 einfo "In order to avoid breaking packages that link against is, this older version" 1554 ewarn "In order to avoid breaking packages that link against it, this older version"
1517 einfo "is not being removed. In order to make full use of this newer version," 1555 ewarn "is not being removed. In order to make full use of this newer version,"
1518 einfo "you will need to execute the following command:" 1556 ewarn "you will need to execute the following command:"
1519 einfo " revdep-rebuild --soname ${SONAME}" 1557 ewarn " revdep-rebuild --soname ${SONAME}"
1520 einfo 1558 ewarn
1521 einfo "After doing that, you can safely remove ${LIB}" 1559 ewarn "After doing that, you can safely remove ${LIB}"
1522 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild" 1560 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1523 fi 1561 fi
1524} 1562}
1525 1563
1526# Hack for people to figure out if a package was built with 1564# Hack for people to figure out if a package was built with
1527# certain USE flags 1565# certain USE flags
1537 [[ ${opt:0:1} = "-" ]] && shift || opt="-a" 1575 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1538 1576
1539 local PKG=$(best_version $1) 1577 local PKG=$(best_version $1)
1540 shift 1578 shift
1541 1579
1542 local USEFILE="${ROOT}/var/db/pkg/${PKG}/USE" 1580 local USEFILE=${ROOT}/var/db/pkg/${PKG}/USE
1581
1582 # if the USE file doesnt exist, assume the $PKG is either
1583 # injected or package.provided
1543 [[ ! -e ${USEFILE} ]] && return 1 1584 [[ ! -e ${USEFILE} ]] && return 0
1544 1585
1545 local USE_BUILT=$(<${USEFILE}) 1586 local USE_BUILT=$(<${USEFILE})
1546 while [[ $# -gt 0 ]] ; do 1587 while [[ $# -gt 0 ]] ; do
1547 if [[ ${opt} = "-o" ]] ; then 1588 if [[ ${opt} = "-o" ]] ; then
1548 has $1 ${USE_BUILT} && return 0 1589 has $1 ${USE_BUILT} && return 0
1600# $4 == extra LD_LIBRARY_PATH's (make it : delimited) 1641# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1601# $5 == path for wrapper 1642# $5 == path for wrapper
1602make_wrapper() { 1643make_wrapper() {
1603 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5 1644 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1604 local tmpwrapper=$(emktemp) 1645 local tmpwrapper=$(emktemp)
1646 # We don't want to quote ${bin} so that people can pass complex
1647 # things as $bin ... "./someprog --args"
1605 cat << EOF > "${tmpwrapper}" 1648 cat << EOF > "${tmpwrapper}"
1606#!/bin/sh 1649#!/bin/sh
1607cd "${chdir}" 1650cd "${chdir:-.}"
1651if [ -n "${libdir}" ] ; then
1652 if [ "\${LD_LIBRARY_PATH+set}" = "set" ] ; then
1608export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}" 1653 export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1654 else
1655 export LD_LIBRARY_PATH="${libdir}"
1656 fi
1657fi
1609exec ${bin} "\$@" 1658exec ${bin} "\$@"
1610EOF 1659EOF
1611 chmod go+rx "${tmpwrapper}" 1660 chmod go+rx "${tmpwrapper}"
1612 if [ -n "${5}" ] 1661 if [[ -n ${path} ]] ; then
1613 then
1614 exeinto ${5} 1662 exeinto "${path}"
1615 newexe "${tmpwrapper}" "${wrapper}" 1663 newexe "${tmpwrapper}" "${wrapper}"
1616 else 1664 else
1617 newbin "${tmpwrapper}" "${wrapper}" 1665 newbin "${tmpwrapper}" "${wrapper}"
1618 fi 1666 fi
1619} 1667}

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

  ViewVC Help
Powered by ViewVC 1.1.20