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

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

  ViewVC Help
Powered by ViewVC 1.1.20