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

Diff of /eclass/eutils.eclass

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

Revision 1.191 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.191 2005/07/13 19:15:05 eradicator 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
13 13
14DEPEND="!bootstrap? ( sys-devel/patch )" 14DEPEND="!bootstrap? ( sys-devel/patch )"
15# sys-apps/shadow is needed for useradd, etc, bug #94745. 15# sys-apps/shadow is needed for useradd, etc, bug #94745.
16 16
17DESCRIPTION="Based on the ${ECLASS} eclass" 17DESCRIPTION="Based on the ${ECLASS} eclass"
60# to point to the latest version of the library present. 60# to point to the latest version of the library present.
61# 61#
62# <azarah@gentoo.org> (26 Oct 2002) 62# <azarah@gentoo.org> (26 Oct 2002)
63# 63#
64gen_usr_ldscript() { 64gen_usr_ldscript() {
65 local libdir="$(get_libdir)" 65 local lib libdir=$(get_libdir)
66 # Just make sure it exists 66 # Just make sure it exists
67 dodir /usr/${libdir} 67 dodir /usr/${libdir}
68 68
69 for lib in "${@}" ; do 69 for lib in "${@}" ; do
70 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT 70 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT
76 76
77 See bug http://bugs.gentoo.org/4411 for more info. 77 See bug http://bugs.gentoo.org/4411 for more info.
78 */ 78 */
79 GROUP ( /${libdir}/${lib} ) 79 GROUP ( /${libdir}/${lib} )
80 END_LDSCRIPT 80 END_LDSCRIPT
81 fperms a+x "/usr/${libdir}/${lib}" 81 fperms a+x "/usr/${libdir}/${lib}" || die "could not change perms on ${lib}"
82 done 82 done
83} 83}
84 84
85# Simple function to draw a line consisting of '=' the same length as $*
86# - only to be used by epatch()
87#
88# <azarah@gentoo.org> (11 Nov 2002)
89#
90draw_line() {
91 local i=0
92 local str_length=""
93
94 # Handle calls that do not have args, or wc not being installed ...
95 if [ -z "$1" -o ! -x "$(which wc 2>/dev/null)" ]
96 then
97 echo "==============================================================="
98 return 0
99 fi
100
101 # Get the length of $*
102 str_length="$(echo -n "$*" | wc -m)"
103
104 while [ "$i" -lt "${str_length}" ]
105 do
106 echo -n "="
107
108 i=$((i + 1))
109 done
110
111 echo
112
113 return 0
114}
115 85
116# Default directory where patches are located 86# Default directory where patches are located
117EPATCH_SOURCE="${WORKDIR}/patch" 87EPATCH_SOURCE="${WORKDIR}/patch"
118# Default extension for patches 88# Default extension for patches
119EPATCH_SUFFIX="patch.bz2" 89EPATCH_SUFFIX="patch.bz2"
166# hand its a directory, it will set EPATCH_SOURCE to this. 136# hand its a directory, it will set EPATCH_SOURCE to this.
167# 137#
168# <azarah@gentoo.org> (10 Nov 2002) 138# <azarah@gentoo.org> (10 Nov 2002)
169# 139#
170epatch() { 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 ]] ; }
171 local PIPE_CMD="" 159 local PIPE_CMD=""
172 local STDERR_TARGET="${T}/$$.out" 160 local STDERR_TARGET="${T}/$$.out"
173 local PATCH_TARGET="${T}/$$.patch" 161 local PATCH_TARGET="${T}/$$.patch"
174 local PATCH_SUFFIX="" 162 local PATCH_SUFFIX=""
175 local SINGLE_PATCH="no" 163 local SINGLE_PATCH="no"
176 local x="" 164 local x=""
165
166 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402
177 167
178 if [ "$#" -gt 1 ] 168 if [ "$#" -gt 1 ]
179 then 169 then
180 local m="" 170 local m=""
181 for m in "$@" ; do 171 for m in "$@" ; do
282 272
283 # Allow for prefix to differ ... im lazy, so shoot me :/ 273 # Allow for prefix to differ ... im lazy, so shoot me :/
284 while [ "${count}" -lt 5 ] 274 while [ "${count}" -lt 5 ]
285 do 275 do
286 # Generate some useful debug info ... 276 # Generate some useful debug info ...
287 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 277 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
288 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 278 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
289 279
290 if [ "${PATCH_SUFFIX}" != "patch" ] 280 if [ "${PATCH_SUFFIX}" != "patch" ]
291 then 281 then
292 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 282 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
297 287
298 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 288 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
299 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##*/}
300 290
301 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 291 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
302 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 292 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
303 293
304 if [ "${PATCH_SUFFIX}" != "patch" ] 294 if [ "${PATCH_SUFFIX}" != "patch" ]
305 then 295 then
306 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
307 then 297 then
311 count=5 301 count=5
312 break 302 break
313 fi 303 fi
314 fi 304 fi
315 305
316 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
317 then 307 then
318 draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 308 _epatch_draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
319 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 309 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
320 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 310 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
321 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 311 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
322 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 312 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
323 313
324 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
325 316
326 if [ "$?" -ne 0 ] 317 if [ "$?" -ne 0 ]
327 then 318 then
328 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##*/}
329 echo 320 echo
375# vapier@gentoo.org 366# vapier@gentoo.org
376# 367#
377# Takes just 1 optional parameter (the directory to create tmpfile in) 368# Takes just 1 optional parameter (the directory to create tmpfile in)
378emktemp() { 369emktemp() {
379 local exe="touch" 370 local exe="touch"
380 [ "$1" == "-d" ] && exe="mkdir" && shift 371 [[ $1 == -d ]] && exe="mkdir" && shift
381 local topdir="$1" 372 local topdir=$1
382 373
383 if [ -z "${topdir}" ] 374 if [[ -z ${topdir} ]] ; then
384 then
385 [ -z "${T}" ] \ 375 [[ -z ${T} ]] \
386 && topdir="/tmp" \ 376 && topdir="/tmp" \
387 || topdir="${T}" 377 || topdir=${T}
388 fi 378 fi
389 379
390 if [ -z "$(type -p mktemp)" ] 380 if [[ -z $(type -p mktemp) ]] ; then
391 then
392 local tmp=/ 381 local tmp=/
393 while [ -e "${tmp}" ] ; do 382 while [[ -e ${tmp} ]] ; do
394 tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}" 383 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}
395 done 384 done
396 ${exe} "${tmp}" 385 ${exe} "${tmp}" || ${exe} -p "${tmp}"
397 echo "${tmp}" 386 echo "${tmp}"
398 else 387 else
399 [ "${exe}" == "touch" ] \ 388 if [[ ${exe} == "touch" ]] ; then
389 [[ ${USERLAND} == "GNU" ]] \
400 && exe="-p" \ 390 && exe="-p" \
391 || exe="-t"
392 else
393 [[ ${USERLAND} == "GNU" ]] \
394 && exe="-d" \
401 || exe="-d" 395 || exe="-dt"
402 mktemp ${exe} "${topdir}" 396 fi
397 TMPDIR="${topdir}" mktemp ${exe} tmp
403 fi 398 fi
404} 399}
405 400
406# Small wrapper for getent (Linux), nidump (Mac OS X), 401# Small wrapper for getent (Linux), nidump (Mac OS X),
407# and pw (FreeBSD) used in enewuser()/enewgroup() 402# and pw (FreeBSD) used in enewuser()/enewgroup()
408# Joe Jezak <josejx@gmail.com> and usata@gentoo.org 403# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
409# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org> 404# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
410# 405#
411# egetent(database, key) 406# egetent(database, key)
412egetent() { 407egetent() {
413 if [[ "${USERLAND}" == "Darwin" ]] ; then 408 case ${CHOST} in
409 *-darwin*)
414 case "$2" in 410 case "$2" in
415 *[!0-9]*) # Non numeric 411 *[!0-9]*) # Non numeric
416 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 412 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
417 ;; 413 ;;
418 *) # Numeric 414 *) # Numeric
419 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 415 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
420 ;; 416 ;;
421 esac 417 esac
422 elif [[ "${USERLAND}" == "BSD" ]] ; then 418 ;;
423 local action 419 *-freebsd*|*-dragonfly*)
424 if [ "$1" == "passwd" ] 420 local opts action="user"
425 then 421 [[ $1 == "passwd" ]] || action="group"
426 action="user" 422
427 else 423 # lookup by uid/gid
428 action="group" 424 if [[ $2 == [[:digit:]]* ]] ; then
425 [[ ${action} == "user" ]] && opts="-u" || opts="-g"
429 fi 426 fi
427
430 pw show "${action}" "$2" -q 428 pw show ${action} ${opts} "$2" -q
431 else 429 ;;
430 *-netbsd*|*-openbsd*)
431 grep "$2:\*:" /etc/$1
432 ;;
433 *)
432 which nscd >& /dev/null && nscd -i "$1" 434 type -p nscd >& /dev/null && nscd -i "$1"
433 getent "$1" "$2" 435 getent "$1" "$2"
434 fi 436 ;;
437 esac
435} 438}
436 439
437# Simplify/standardize adding users to the system 440# Simplify/standardize adding users to the system
438# vapier@gentoo.org 441# vapier@gentoo.org
439# 442#
477 fi 480 fi
478 else 481 else
479 euid="next" 482 euid="next"
480 fi 483 fi
481 if [[ ${euid} == "next" ]] ; then 484 if [[ ${euid} == "next" ]] ; then
482 local pwrange 485 for euid in $(seq 101 999) ; do
483 if [[ ${USERLAND} == "BSD" ]] ; then
484 pwrange=$(jot 898 101)
485 else
486 pwrange=$(seq 101 999)
487 fi
488 for euid in ${pwrange} ; do
489 [[ -z $(egetent passwd ${euid}) ]] && break 486 [[ -z $(egetent passwd ${euid}) ]] && break
490 done 487 done
491 fi 488 fi
492 opts="${opts} -u ${euid}" 489 opts="${opts} -u ${euid}"
493 einfo " - Userid: ${euid}" 490 einfo " - Userid: ${euid}"
494 491
495 # handle shell 492 # handle shell
496 local eshell=$1; shift 493 local eshell=$1; shift
497 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then 494 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
498 if [[ ! -e ${eshell} ]] ; then 495 if [[ ! -e ${ROOT}${eshell} ]] ; then
499 eerror "A shell was specified but it does not exist !" 496 eerror "A shell was specified but it does not exist !"
500 die "${eshell} does not exist" 497 die "${eshell} does not exist in ${ROOT}"
501 fi 498 fi
499 if [[ ${eshell} == */false || ${eshell} == */nologin ]] ; then
500 eerror "Do not specify ${eshell} yourself, use -1"
501 die "Pass '-1' as the shell parameter"
502 fi
502 else 503 else
503 case ${USERLAND} in 504 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do
504 Darwin) eshell="/usr/bin/false";; 505 [[ -x ${ROOT}${shell} ]] && break
505 BSD) eshell="/usr/sbin/nologin";; 506 done
506 *) eshell="/bin/false";; 507
507 esac 508 if [[ ${shell} == "/dev/null" ]] ; then
509 eerror "Unable to identify the shell to use"
510 die "Unable to identify the shell to use"
511 fi
512
513 eshell=${shell}
508 fi 514 fi
509 einfo " - Shell: ${eshell}" 515 einfo " - Shell: ${eshell}"
510 opts="${opts} -s ${eshell}" 516 opts="${opts} -s ${eshell}"
511 517
512 # handle homedir 518 # handle homedir
549 einfo " - Groups: ${egroups}" 555 einfo " - Groups: ${egroups}"
550 556
551 # handle extra and add the user 557 # handle extra and add the user
552 local oldsandbox=${SANDBOX_ON} 558 local oldsandbox=${SANDBOX_ON}
553 export SANDBOX_ON="0" 559 export SANDBOX_ON="0"
554 case ${USERLAND} in 560 case ${CHOST} in
555 Darwin) 561 *-darwin*)
556 ### Make the user 562 ### Make the user
557 if [[ -z $@ ]] ; then 563 if [[ -z $@ ]] ; then
558 dscl . create /users/${euser} uid ${euid} 564 dscl . create /users/${euser} uid ${euid}
559 dscl . create /users/${euser} shell ${eshell} 565 dscl . create /users/${euser} shell ${eshell}
560 dscl . create /users/${euser} home ${ehome} 566 dscl . create /users/${euser} home ${ehome}
571 einfo "Please report the ebuild along with the info below" 577 einfo "Please report the ebuild along with the info below"
572 einfo "eextra: $@" 578 einfo "eextra: $@"
573 die "Required function missing" 579 die "Required function missing"
574 fi 580 fi
575 ;; 581 ;;
576 BSD) 582 *-freebsd*|*-dragonfly*)
577 if [[ -z $@ ]] ; then 583 if [[ -z $@ ]] ; then
578 pw useradd ${euser} ${opts} \ 584 pw useradd ${euser} ${opts} \
579 -c "added by portage for ${PN}" \ 585 -c "added by portage for ${PN}" \
580 die "enewuser failed" 586 die "enewuser failed"
581 else 587 else
582 einfo " - Extra: $@" 588 einfo " - Extra: $@"
583 pw useradd ${euser} ${opts} \ 589 pw useradd ${euser} ${opts} \
584 "$@" || die "enewuser failed" 590 "$@" || die "enewuser failed"
585 fi 591 fi
586 ;; 592 ;;
593
594 *-netbsd*)
595 if [[ -z $@ ]] ; then
596 useradd ${opts} ${euser} || die "enewuser failed"
597 else
598 einfo " - Extra: $@"
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
587 *) 616 *)
588 if [[ -z $@ ]] ; then 617 if [[ -z $@ ]] ; then
589 useradd ${opts} ${euser} \ 618 useradd ${opts} ${euser} \
590 -c "added by portage for ${PN}" \ 619 -c "added by portage for ${PN}" \
591 || die "enewuser failed" 620 || die "enewuser failed"
594 useradd ${opts} ${euser} "$@" \ 623 useradd ${opts} ${euser} "$@" \
595 || die "enewuser failed" 624 || die "enewuser failed"
596 fi 625 fi
597 ;; 626 ;;
598 esac 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}"
634 fi
635
599 export SANDBOX_ON=${oldsandbox} 636 export SANDBOX_ON=${oldsandbox}
600
601 if [ ! -e "${ehome}" ] && [ ! -e "${D}/${ehome}" ]
602 then
603 einfo " - Creating ${ehome} in ${D}"
604 dodir ${ehome}
605 fowners ${euser} ${ehome}
606 fperms 755 ${ehome}
607 fi
608} 637}
609 638
610# Simplify/standardize adding groups to the system 639# Simplify/standardize adding groups to the system
611# vapier@gentoo.org 640# vapier@gentoo.org
612# 641#
641 then 670 then
642 if [ "${egid}" -gt 0 ] 671 if [ "${egid}" -gt 0 ]
643 then 672 then
644 if [ -z "`egetent group ${egid}`" ] 673 if [ -z "`egetent group ${egid}`" ]
645 then 674 then
646 if [[ "${USERLAND}" == "Darwin" ]]; then 675 if [[ "${CHOST}" == *-darwin* ]]; then
647 opts="${opts} ${egid}" 676 opts="${opts} ${egid}"
648 else 677 else
649 opts="${opts} -g ${egid}" 678 opts="${opts} -g ${egid}"
650 fi 679 fi
651 else 680 else
665 opts="${opts} ${eextra}" 694 opts="${opts} ${eextra}"
666 695
667 # add the group 696 # add the group
668 local oldsandbox="${SANDBOX_ON}" 697 local oldsandbox="${SANDBOX_ON}"
669 export SANDBOX_ON="0" 698 export SANDBOX_ON="0"
670 if [[ "${USERLAND}" == "Darwin" ]]; then 699 case ${CHOST} in
700 *-darwin*)
671 if [ ! -z "${eextra}" ]; 701 if [ ! -z "${eextra}" ];
672 then 702 then
673 einfo "Extra options are not supported on Darwin/OS X yet" 703 einfo "Extra options are not supported on Darwin/OS X yet"
674 einfo "Please report the ebuild along with the info below" 704 einfo "Please report the ebuild along with the info below"
675 einfo "eextra: ${eextra}" 705 einfo "eextra: ${eextra}"
676 die "Required function missing" 706 die "Required function missing"
677 fi 707 fi
678 708
679 # If we need the next available 709 # If we need the next available
680 case ${egid} in 710 case ${egid} in
681 *[!0-9]*) # Non numeric 711 *[!0-9]*) # Non numeric
682 for egid in `jot 898 101`; do 712 for egid in $(seq 101 999); do
683 [ -z "`egetent group ${egid}`" ] && break 713 [ -z "`egetent group ${egid}`" ] && break
684 done 714 done
685 esac 715 esac
686 dscl . create /groups/${egroup} gid ${egid} 716 dscl . create /groups/${egroup} gid ${egid}
687 dscl . create /groups/${egroup} passwd '*' 717 dscl . create /groups/${egroup} passwd '*'
688 elif [[ "${USERLAND}" == "BSD" ]] ; then 718 ;;
719
720 *-freebsd*|*-dragonfly*)
689 case ${egid} in 721 case ${egid} in
690 *[!0-9]*) # Non numeric 722 *[!0-9]*) # Non numeric
691 for egid in `jot 898 101`; do 723 for egid in $(seq 101 999); do
692 [ -z "`egetent group ${egid}`" ] && break 724 [ -z "`egetent group ${egid}`" ] && break
693 done 725 done
694 esac 726 esac
695 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 727 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
696 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 *)
697 groupadd ${opts} ${egroup} || die "enewgroup failed" 741 groupadd ${opts} ${egroup} || die "enewgroup failed"
698 fi 742 ;;
743 esac
699 export SANDBOX_ON="${oldsandbox}" 744 export SANDBOX_ON="${oldsandbox}"
700} 745}
701 746
702# Simple script to replace 'dos2unix' binaries 747# Simple script to replace 'dos2unix' binaries
703# vapier@gentoo.org 748# vapier@gentoo.org
728# name: the name that will show up in the menu 773# name: the name that will show up in the menu
729# icon: give your little like a pretty little icon ... 774# icon: give your little like a pretty little icon ...
730# this can be relative (to /usr/share/pixmaps) or 775# this can be relative (to /usr/share/pixmaps) or
731# a full path to an icon 776# a full path to an icon
732# type: what kind of application is this ? for categories: 777# type: what kind of application is this ? for categories:
733# http://www.freedesktop.org/wiki/Standards_2fmenu_2dspec 778# http://www.freedesktop.org/Standards/desktop-entry-spec
734# path: if your app needs to startup in a specific dir 779# path: if your app needs to startup in a specific dir
735make_desktop_entry() { 780make_desktop_entry() {
736 [[ -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
737 782
738 local exec=${1} 783 local exec=${1}
764 dev) 809 dev)
765 type="Development" 810 type="Development"
766 ;; 811 ;;
767 812
768 games) 813 games)
769 [[ -z ${path} ]] && path=${GAMES_BINDIR}
770
771 case ${catmin} in 814 case ${catmin} in
772 action) type=ActionGame;; 815 action) type=ActionGame;;
773 arcade) type=ArcadeGame;; 816 arcade) type=ArcadeGame;;
774 board) type=BoardGame;; 817 board) type=BoardGame;;
775 kid) type=KidsGame;; 818 kid) type=KidsGame;;
816 type="Network;${type}" 859 type="Network;${type}"
817 ;; 860 ;;
818 861
819 sci) 862 sci)
820 case ${catmin} in 863 case ${catmin} in
821 astro*) type=Astronomoy;; 864 astro*) type=Astronomy;;
822 bio*) type=Biology;; 865 bio*) type=Biology;;
823 calc*) type=Calculator;; 866 calc*) type=Calculator;;
824 chem*) type=Chemistry;; 867 chem*) type=Chemistry;;
825 geo*) type=Geology;; 868 geo*) type=Geology;;
826 math*) type=Math;; 869 math*) type=Math;;
858Exec=${exec} 901Exec=${exec}
859Path=${path} 902Path=${path}
860Icon=${icon} 903Icon=${icon}
861Categories=Application;${type};" > "${desktop}" 904Categories=Application;${type};" > "${desktop}"
862 905
906 (
907 # wrap the env here so that the 'insinto' call
908 # doesn't corrupt the env of the caller
863 insinto /usr/share/applications 909 insinto /usr/share/applications
864 doins "${desktop}" 910 doins "${desktop}"
865 911 )
866 return 0
867} 912}
868 913
869# Make a GDM/KDM Session file 914# Make a GDM/KDM Session file
870# 915#
871# make_desktop_entry(<title>, <command>) 916# make_desktop_entry(<title>, <command>)
933############################################################## 978##############################################################
934 979
935 980
936# for internal use only (unpack_pdv and unpack_makeself) 981# for internal use only (unpack_pdv and unpack_makeself)
937find_unpackable_file() { 982find_unpackable_file() {
938 local src="$1" 983 local src=$1
939 if [ -z "${src}" ] 984 if [[ -z ${src} ]] ; then
940 then
941 src="${DISTDIR}/${A}" 985 src=${DISTDIR}/${A}
942 else 986 else
943 if [ -e "${DISTDIR}/${src}" ] 987 if [[ -e ${DISTDIR}/${src} ]] ; then
944 then
945 src="${DISTDIR}/${src}" 988 src=${DISTDIR}/${src}
946 elif [ -e "${PWD}/${src}" ] 989 elif [[ -e ${PWD}/${src} ]] ; then
947 then
948 src="${PWD}/${src}" 990 src=${PWD}/${src}
949 elif [ -e "${src}" ] 991 elif [[ -e ${src} ]] ; then
950 then
951 src="${src}" 992 src=${src}
952 fi
953 fi 993 fi
954 [ ! -e "${src}" ] && die "Could not find requested archive ${src}" 994 fi
995 [[ ! -e ${src} ]] && return 1
955 echo "${src}" 996 echo "${src}"
956} 997}
957 998
958# Unpack those pesky pdv generated files ... 999# Unpack those pesky pdv generated files ...
959# They're self-unpacking programs with the binary package stuffed in 1000# They're self-unpacking programs with the binary package stuffed in
974# lseek 1015# lseek
975# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 1016# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
976# lseek(3, -4, SEEK_END) = 2981250 1017# lseek(3, -4, SEEK_END) = 2981250
977# 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.
978unpack_pdv() { 1019unpack_pdv() {
979 local src="`find_unpackable_file $1`" 1020 local src=$(find_unpackable_file $1)
980 local sizeoff_t="$2" 1021 local sizeoff_t=$2
981 1022
1023 [[ -z ${src} ]] && die "Could not locate source for '$1'"
982 [ -z "${sizeoff_t}" ] && die "No idea what off_t size was used for this pdv :(" 1024 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :("
983 1025
984 local shrtsrc="`basename ${src}`" 1026 local shrtsrc=$(basename "${src}")
985 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1027 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
986 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1028 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"`
987 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"` 1029 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"`
988 1030
989 # grab metadata for debug reasons 1031 # grab metadata for debug reasons
1053# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1095# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1054# - If the file is not specified then unpack will utilize ${A}. 1096# - If the file is not specified then unpack will utilize ${A}.
1055# - 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
1056# the proper offset from the script itself. 1098# the proper offset from the script itself.
1057unpack_makeself() { 1099unpack_makeself() {
1100 local src_input=${1:-${A}}
1058 local src="$(find_unpackable_file "$1")" 1101 local src=$(find_unpackable_file "${src_input}")
1059 local skip="$2" 1102 local skip=$2
1060 local exe="$3" 1103 local exe=$3
1061 1104
1105 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
1106
1062 local shrtsrc="$(basename "${src}")" 1107 local shrtsrc=$(basename "${src}")
1063 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1108 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1064 if [ -z "${skip}" ] 1109 if [[ -z ${skip} ]] ; then
1065 then
1066 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1110 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}')
1067 local skip=0 1111 local skip=0
1068 exe=tail 1112 exe=tail
1069 case ${ver} in 1113 case ${ver} in
1070 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
1071 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1115 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1083 ;; 1127 ;;
1084 2.1.3) 1128 2.1.3)
1085 skip=`grep -a ^offset= "${src}" | awk '{print $3}'` 1129 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1086 let skip="skip + 1" 1130 let skip="skip + 1"
1087 ;; 1131 ;;
1088 2.1.4) 1132 2.1.4|2.1.5)
1089 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)
1090 skip=$(head -n ${skip} "${src}" | wc -c) 1134 skip=$(head -n ${skip} "${src}" | wc -c)
1091 exe="dd" 1135 exe="dd"
1092 ;; 1136 ;;
1093 *) 1137 *)
1138check_license() { 1182check_license() {
1139 local lic=$1 1183 local lic=$1
1140 if [ -z "${lic}" ] ; then 1184 if [ -z "${lic}" ] ; then
1141 lic="${PORTDIR}/licenses/${LICENSE}" 1185 lic="${PORTDIR}/licenses/${LICENSE}"
1142 else 1186 else
1143 if [ -e "${PORTDIR}/licenses/${src}" ] ; then 1187 if [ -e "${PORTDIR}/licenses/${lic}" ] ; then
1144 lic="${PORTDIR}/licenses/${src}" 1188 lic="${PORTDIR}/licenses/${lic}"
1145 elif [ -e "${PWD}/${src}" ] ; then 1189 elif [ -e "${PWD}/${lic}" ] ; then
1146 lic="${PWD}/${src}" 1190 lic="${PWD}/${lic}"
1147 elif [ -e "${src}" ] ; then 1191 elif [ -e "${lic}" ] ; then
1148 lic="${src}" 1192 lic="${lic}"
1149 fi
1150 fi 1193 fi
1194 fi
1151 [ ! -f "${lic}" ] && die "Could not find requested license ${src}" 1195 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1152 local l="`basename ${lic}`" 1196 local l="`basename ${lic}`"
1153 1197
1154 # here is where we check for the licenses the user already 1198 # here is where we check for the licenses the user already
1155 # accepted ... if we don't find a match, we make the user accept 1199 # accepted ... if we don't find a match, we make the user accept
1156 local shopts=$- 1200 local shopts=$-
1212 # 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
1213 # the # of files they gave us 1257 # the # of files they gave us
1214 local cdcnt=0 1258 local cdcnt=0
1215 local f= 1259 local f=
1216 for f in "$@" ; do 1260 for f in "$@" ; do
1217 cdcnt=$((cdcnt + 1)) 1261 ((++cdcnt))
1218 export CDROM_CHECK_${cdcnt}="$f" 1262 export CDROM_CHECK_${cdcnt}="$f"
1219 done 1263 done
1220 export CDROM_TOTAL_CDS=${cdcnt} 1264 export CDROM_TOTAL_CDS=${cdcnt}
1221 export CDROM_CURRENT_CD=1 1265 export CDROM_CURRENT_CD=1
1222 1266
1223 # now we see if the user gave use CD_ROOT ... 1267 # now we see if the user gave use CD_ROOT ...
1224 # 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
1225 if [[ ! -z ${CD_ROOT} ]] ; then
1226 export CDROM_ROOT=${CD_ROOT}
1227 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1228 return
1229 fi
1230 # do the same for CD_ROOT_X
1231 if [[ ! -z ${CD_ROOT_1} ]] ; then 1269 if [[ -n ${CD_ROOT}${CD_ROOT_1} ]] ; then
1232 local var= 1270 local var=
1233 cdcnt=0 1271 cdcnt=0
1234 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1272 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1235 cdcnt=$((cdcnt + 1)) 1273 ((++cdcnt))
1236 var="CD_ROOT_${cdcnt}" 1274 var="CD_ROOT_${cdcnt}"
1275 [[ -z ${!var} ]] && var="CD_ROOT"
1237 if [[ -z ${!var} ]] ; then 1276 if [[ -z ${!var} ]] ; then
1238 eerror "You must either use just the CD_ROOT" 1277 eerror "You must either use just the CD_ROOT"
1239 eerror "or specify ALL the CD_ROOT_X variables." 1278 eerror "or specify ALL the CD_ROOT_X variables."
1240 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."
1241 die "could not locate CD_ROOT_${cdcnt}" 1280 die "could not locate CD_ROOT_${cdcnt}"
1242 fi 1281 fi
1243 export CDROM_ROOTS_${cdcnt}="${!var}"
1244 done 1282 done
1245 export CDROM_ROOT=${CDROM_ROOTS_1} 1283 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}}
1246 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}
1247 return 1291 return
1248 fi 1292 fi
1249 1293
1294 # User didn't help us out so lets make sure they know they can
1295 # simplify the whole process ...
1250 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1296 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1251 einfon "This ebuild will need the " 1297 einfo "This ebuild will need the ${CDROM_NAME:-cdrom for ${PN}}"
1252 if [[ -z ${CDROM_NAME} ]] ; then
1253 echo "cdrom for ${PN}."
1254 else
1255 echo "${CDROM_NAME}."
1256 fi
1257 echo 1298 echo
1258 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"
1259 einfo "mounted somewhere on your filesystem, just export" 1300 einfo "mounted somewhere on your filesystem, just export"
1260 einfo "the variable CD_ROOT so that it points to the" 1301 einfo "the variable CD_ROOT so that it points to the"
1261 einfo "directory containing the files." 1302 einfo "directory containing the files."
1265 echo 1306 echo
1266 else 1307 else
1267 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1308 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1268 cdcnt=0 1309 cdcnt=0
1269 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1310 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1270 cdcnt=$((cdcnt + 1)) 1311 ((++cdcnt))
1271 var="CDROM_NAME_${cdcnt}" 1312 var="CDROM_NAME_${cdcnt}"
1272 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}" 1313 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}"
1273 done 1314 done
1274 echo 1315 echo
1275 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"
1276 einfo "mounted somewhere on your filesystem, just export" 1317 einfo "mounted somewhere on your filesystem, just export"
1277 einfo "the following variables so they point to the right place:" 1318 einfo "the following variables so they point to the right place:"
1278 einfon "" 1319 einfon ""
1279 cdcnt=0 1320 cdcnt=0
1280 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1321 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1281 cdcnt=$((cdcnt + 1)) 1322 ((++cdcnt))
1282 echo -n " CD_ROOT_${cdcnt}" 1323 echo -n " CD_ROOT_${cdcnt}"
1283 done 1324 done
1284 echo 1325 echo
1285 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"
1286 einfo "you only have one cdrom, you can export CD_ROOT" 1327 einfo "you only have one cdrom, you can export CD_ROOT"
1289 echo 1330 echo
1290 einfo "For example:" 1331 einfo "For example:"
1291 einfo "export CD_ROOT_1=/mnt/cdrom" 1332 einfo "export CD_ROOT_1=/mnt/cdrom"
1292 echo 1333 echo
1293 fi 1334 fi
1335
1336 export CDROM_SET=""
1294 export CDROM_CURRENT_CD=0 1337 export CDROM_CURRENT_CD=0
1295 cdrom_load_next_cd 1338 cdrom_load_next_cd
1296} 1339}
1297 1340
1298# 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.
1299# 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.
1300# 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.
1301# 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.
1302cdrom_load_next_cd() { 1345cdrom_load_next_cd() {
1303 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1304 local var= 1346 local var
1305 1347 ((++CDROM_CURRENT_CD))
1306 if [[ ! -z ${CD_ROOT} ]] ; then
1307 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}"
1308 return
1309 fi
1310 1348
1311 unset CDROM_ROOT 1349 unset CDROM_ROOT
1312 var=CDROM_ROOTS_${CDROM_CURRENT_CD} 1350 var=CD_ROOT_${CDROM_CURRENT_CD}
1351 [[ -z ${!var} ]] && var="CD_ROOT"
1313 if [[ -z ${!var} ]] ; then 1352 if [[ -z ${!var} ]] ; then
1314 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1353 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1315 cdrom_locate_file_on_cd ${!var} 1354 _cdrom_locate_file_on_cd ${!var}
1316 else 1355 else
1317 export CDROM_ROOT=${!var} 1356 export CDROM_ROOT=${!var}
1318 fi 1357 fi
1319 1358
1320 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1359 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1325# all it does is try to locate a give file on a cd ... if the cd isn't 1364# all it does is try to locate a give file on a cd ... if the cd isn't
1326# found, then a message asking for the user to insert the cdrom will be 1365# found, then a message asking for the user to insert the cdrom will be
1327# displayed and we'll hang out here until: 1366# displayed and we'll hang out here until:
1328# (1) the file is found on a mounted cdrom 1367# (1) the file is found on a mounted cdrom
1329# (2) the user hits CTRL+C 1368# (2) the user hits CTRL+C
1330cdrom_locate_file_on_cd() { 1369_cdrom_locate_file_on_cd() {
1370 local mline=""
1371 local showedmsg=0
1372
1331 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
1332 local dir="$(dirname ${@})" 1381 local dir=$(dirname ${cdset[${i}]})
1333 local file="$(basename ${@})" 1382 local file=$(basename ${cdset[${i}]})
1334 local mline=""
1335 local showedmsg=0
1336 1383
1337 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
1338 [[ -d ${mline}/${dir} ]] || continue 1385 [[ -d ${mline}/${dir} ]] || continue
1339 [[ ! -z $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] \ 1386 if [[ -n $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] ; then
1340 && 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))
1341 done 1395 done
1342 1396
1343 if [[ -z ${CDROM_ROOT} ]] ; then
1344 echo 1397 echo
1345 if [[ ${showedmsg} -eq 0 ]] ; then 1398 if [[ ${showedmsg} -eq 0 ]] ; then
1346 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1399 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1347 if [[ -z ${CDROM_NAME} ]] ; then 1400 if [[ -z ${CDROM_NAME} ]] ; then
1348 einfo "Please insert the cdrom for ${PN} now !" 1401 einfo "Please insert+mount the cdrom for ${PN} now !"
1349 else
1350 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1351 fi
1352 else 1402 else
1353 if [[ -z ${CDROM_NAME_1} ]] ; then
1354 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !"
1355 else
1356 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1357 einfo "Please insert+mount the ${!var} cdrom now !" 1403 einfo "Please insert+mount the ${CDROM_NAME} cdrom now !"
1358 fi
1359 fi 1404 fi
1360 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
1361 fi 1412 fi
1413 showedmsg=1
1414 fi
1362 einfo "Press return to scan for the cd again" 1415 einfo "Press return to scan for the cd again"
1363 einfo "or hit CTRL+C to abort the emerge." 1416 einfo "or hit CTRL+C to abort the emerge."
1364 echo 1417 echo
1365 einfo "If you are having trouble with the detection" 1418 einfo "If you are having trouble with the detection"
1366 einfo "of your CD, it is possible that you do not have" 1419 einfo "of your CD, it is possible that you do not have"
1367 einfo "Joliet support enabled in your kernel. Please" 1420 einfo "Joliet support enabled in your kernel. Please"
1368 einfo "check that CONFIG_JOLIET is enabled in your kernel." 1421 einfo "check that CONFIG_JOLIET is enabled in your kernel."
1369 read 1422 read || die "something is screwed with your system"
1370 fi
1371 done 1423 done
1372} 1424}
1373 1425
1374# Make sure that LINGUAS only contains languages that 1426# Make sure that LINGUAS only contains languages that
1375# a package can support 1427# a package can support
1523 [[ ${opt:0:1} = "-" ]] && shift || opt="-a" 1575 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1524 1576
1525 local PKG=$(best_version $1) 1577 local PKG=$(best_version $1)
1526 shift 1578 shift
1527 1579
1528 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
1529 [[ ! -e ${USEFILE} ]] && return 1 1584 [[ ! -e ${USEFILE} ]] && return 0
1530 1585
1531 local USE_BUILT=$(<${USEFILE}) 1586 local USE_BUILT=$(<${USEFILE})
1532 while [[ $# -gt 0 ]] ; do 1587 while [[ $# -gt 0 ]] ; do
1533 if [[ ${opt} = "-o" ]] ; then 1588 if [[ ${opt} = "-o" ]] ; then
1534 has $1 ${USE_BUILT} && return 0 1589 has $1 ${USE_BUILT} && return 0
1586# $4 == extra LD_LIBRARY_PATH's (make it : delimited) 1641# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1587# $5 == path for wrapper 1642# $5 == path for wrapper
1588make_wrapper() { 1643make_wrapper() {
1589 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5 1644 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1590 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"
1591 cat << EOF > "${tmpwrapper}" 1648 cat << EOF > "${tmpwrapper}"
1592#!/bin/sh 1649#!/bin/sh
1593cd "${chdir}" 1650cd "${chdir:-.}"
1651if [ -n "${libdir}" ] ; then
1652 if [ "\${LD_LIBRARY_PATH+set}" = "set" ] ; then
1594export 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
1595exec ${bin} "\$@" 1658exec ${bin} "\$@"
1596EOF 1659EOF
1597 chmod go+rx "${tmpwrapper}" 1660 chmod go+rx "${tmpwrapper}"
1598 if [ -n "${5}" ] 1661 if [[ -n ${path} ]] ; then
1599 then
1600 exeinto ${5} 1662 exeinto "${path}"
1601 newexe "${tmpwrapper}" "${wrapper}" 1663 newexe "${tmpwrapper}" "${wrapper}"
1602 else 1664 else
1603 newbin "${tmpwrapper}" "${wrapper}" 1665 newbin "${tmpwrapper}" "${wrapper}"
1604 fi 1666 fi
1605} 1667}

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

  ViewVC Help
Powered by ViewVC 1.1.20