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

Diff of /eclass/eutils.eclass

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

Revision 1.182 Revision 1.221
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.182 2005/06/11 00:02:26 vapier Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.221 2005/12/31 14:11:39 vapier 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 [[ ${exe} == "touch" ]] \
402 && exe="-p" \ 389 && exe="-p" \
403 || exe="-d" 390 || exe="-d"
404 mktemp ${exe} "${topdir}" 391 mktemp ${exe} "${topdir}"
405 fi 392 fi
406} 393}
410# Joe Jezak <josejx@gmail.com> and usata@gentoo.org 397# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
411# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org> 398# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
412# 399#
413# egetent(database, key) 400# egetent(database, key)
414egetent() { 401egetent() {
415 if [[ "${USERLAND}" == "Darwin" ]] ; then 402 case ${CHOST} in
403 *-darwin*)
416 case "$2" in 404 case "$2" in
417 *[!0-9]*) # Non numeric 405 *[!0-9]*) # Non numeric
418 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 406 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
419 ;; 407 ;;
420 *) # Numeric 408 *) # Numeric
421 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 409 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
422 ;; 410 ;;
423 esac 411 esac
424 elif [[ "${USERLAND}" == "BSD" ]] ; then 412 ;;
425 local action 413 *-freebsd*|*-dragonfly*)
426 if [ "$1" == "passwd" ] 414 local opts action="user"
427 then 415 [[ $1 == "passwd" ]] || action="group"
428 action="user" 416
429 else 417 # lookup by uid/gid
430 action="group" 418 if [[ $2 == [[:digit:]]* ]] ; then
419 [[ ${action} == "user" ]] && opts="-u" || opts="-g"
431 fi 420 fi
421
432 pw show "${action}" "$2" -q 422 pw show ${action} ${opts} "$2" -q
433 else 423 ;;
424 *-netbsd*|*-openbsd*)
425 grep "$2:\*:" /etc/$1
426 ;;
427 *)
434 which nscd >& /dev/null && nscd -i "$1" 428 type -p nscd >& /dev/null && nscd -i "$1"
435 getent "$1" "$2" 429 getent "$1" "$2"
436 fi 430 ;;
431 esac
437} 432}
438 433
439# Simplify/standardize adding users to the system 434# Simplify/standardize adding users to the system
440# vapier@gentoo.org 435# vapier@gentoo.org
441# 436#
479 fi 474 fi
480 else 475 else
481 euid="next" 476 euid="next"
482 fi 477 fi
483 if [[ ${euid} == "next" ]] ; then 478 if [[ ${euid} == "next" ]] ; then
484 local pwrange 479 for euid in $(seq 101 999) ; do
485 if [[ ${USERLAND} == "BSD" ]] ; then
486 pwrange=$(jot 898 101)
487 else
488 pwrange=$(seq 101 999)
489 fi
490 for euid in ${pwrange} ; do
491 [[ -z $(egetent passwd ${euid}) ]] && break 480 [[ -z $(egetent passwd ${euid}) ]] && break
492 done 481 done
493 fi 482 fi
494 opts="${opts} -u ${euid}" 483 opts="${opts} -u ${euid}"
495 einfo " - Userid: ${euid}" 484 einfo " - Userid: ${euid}"
496 485
497 # handle shell 486 # handle shell
498 local eshell=$1; shift 487 local eshell=$1; shift
499 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then 488 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
500 if [[ ! -e ${eshell} ]] ; then 489 if [[ ! -e ${ROOT}${eshell} ]] ; then
501 eerror "A shell was specified but it does not exist !" 490 eerror "A shell was specified but it does not exist !"
502 die "${eshell} does not exist" 491 die "${eshell} does not exist in ${ROOT}"
503 fi 492 fi
493 if [[ ${eshell} == */false || ${eshell} == */nologin ]] ; then
494 eerror "Do not specify ${eshell} yourself, use -1"
495 die "Pass '-1' as the shell parameter"
496 fi
504 else 497 else
505 case ${USERLAND} in 498 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do
506 Darwin) eshell="/usr/bin/false";; 499 [[ -x ${ROOT}${shell} ]] && break
507 BSD) eshell="/usr/sbin/nologin";; 500 done
508 *) eshell="/bin/false";; 501
509 esac 502 if [[ ${shell} == "/dev/null" ]] ; then
503 eerror "Unable to identify the shell to use"
504 die "Unable to identify the shell to use"
505 fi
506
507 eshell=${shell}
510 fi 508 fi
511 einfo " - Shell: ${eshell}" 509 einfo " - Shell: ${eshell}"
512 opts="${opts} -s ${eshell}" 510 opts="${opts} -s ${eshell}"
513 511
514 # handle homedir 512 # handle homedir
551 einfo " - Groups: ${egroups}" 549 einfo " - Groups: ${egroups}"
552 550
553 # handle extra and add the user 551 # handle extra and add the user
554 local oldsandbox=${SANDBOX_ON} 552 local oldsandbox=${SANDBOX_ON}
555 export SANDBOX_ON="0" 553 export SANDBOX_ON="0"
556 case ${USERLAND} in 554 case ${CHOST} in
557 Darwin) 555 *-darwin*)
558 ### Make the user 556 ### Make the user
559 if [[ -z $@ ]] ; then 557 if [[ -z $@ ]] ; then
560 dscl . create /users/${euser} uid ${euid} 558 dscl . create /users/${euser} uid ${euid}
561 dscl . create /users/${euser} shell ${eshell} 559 dscl . create /users/${euser} shell ${eshell}
562 dscl . create /users/${euser} home ${ehome} 560 dscl . create /users/${euser} home ${ehome}
573 einfo "Please report the ebuild along with the info below" 571 einfo "Please report the ebuild along with the info below"
574 einfo "eextra: $@" 572 einfo "eextra: $@"
575 die "Required function missing" 573 die "Required function missing"
576 fi 574 fi
577 ;; 575 ;;
578 BSD) 576 *-freebsd*|*-dragonfly*)
579 if [[ -z $@ ]] ; then 577 if [[ -z $@ ]] ; then
580 pw useradd ${euser} ${opts} \ 578 pw useradd ${euser} ${opts} \
581 -c "added by portage for ${PN}" \ 579 -c "added by portage for ${PN}" \
582 die "enewuser failed" 580 die "enewuser failed"
583 else 581 else
584 einfo " - Extra: $@" 582 einfo " - Extra: $@"
585 pw useradd ${euser} ${opts} \ 583 pw useradd ${euser} ${opts} \
586 "$@" || die "enewuser failed" 584 "$@" || die "enewuser failed"
587 fi 585 fi
588 ;; 586 ;;
587
588 *-netbsd*)
589 if [[ -z $@ ]] ; then
590 useradd ${opts} ${euser} || die "enewuser failed"
591 else
592 einfo " - Extra: $@"
593 useradd ${opts} ${euser} "$@" || die "enewuser failed"
594 fi
595 ;;
596
597 *-openbsd*)
598 if [[ -z $@ ]] ; then
599 useradd -u ${euid} -s ${eshell} \
600 -d ${ehome} -c "Added by portage for ${PN}" \
601 -g ${egroups} ${euser} || die "enewuser failed"
602 else
603 einfo " - Extra: $@"
604 useradd -u ${euid} -s ${eshell} \
605 -d ${ehome} -c "Added by portage for ${PN}" \
606 -g ${egroups} ${euser} "$@" || die "enewuser failed"
607 fi
608 ;;
609
589 *) 610 *)
590 if [[ -z $@ ]] ; then 611 if [[ -z $@ ]] ; then
591 useradd ${opts} ${euser} \ 612 useradd ${opts} ${euser} \
592 -c "added by portage for ${PN}" \ 613 -c "added by portage for ${PN}" \
593 || die "enewuser failed" 614 || die "enewuser failed"
596 useradd ${opts} ${euser} "$@" \ 617 useradd ${opts} ${euser} "$@" \
597 || die "enewuser failed" 618 || die "enewuser failed"
598 fi 619 fi
599 ;; 620 ;;
600 esac 621 esac
622
623 if [[ ! -e ${ROOT}/${ehome} ]] ; then
624 einfo " - Creating ${ehome} in ${ROOT}"
625 mkdir -p "${ROOT}/${ehome}"
626 chown ${euser} "${ROOT}/${ehome}"
627 chmod 755 "${ROOT}/${ehome}"
628 fi
629
601 export SANDBOX_ON=${oldsandbox} 630 export SANDBOX_ON=${oldsandbox}
602
603 if [ ! -e "${ehome}" ] && [ ! -e "${D}/${ehome}" ]
604 then
605 einfo " - Creating ${ehome} in ${D}"
606 dodir ${ehome}
607 fowners ${euser} ${ehome}
608 fperms 755 ${ehome}
609 fi
610} 631}
611 632
612# Simplify/standardize adding groups to the system 633# Simplify/standardize adding groups to the system
613# vapier@gentoo.org 634# vapier@gentoo.org
614# 635#
643 then 664 then
644 if [ "${egid}" -gt 0 ] 665 if [ "${egid}" -gt 0 ]
645 then 666 then
646 if [ -z "`egetent group ${egid}`" ] 667 if [ -z "`egetent group ${egid}`" ]
647 then 668 then
648 if [[ "${USERLAND}" == "Darwin" ]]; then 669 if [[ "${CHOST}" == *-darwin* ]]; then
649 opts="${opts} ${egid}" 670 opts="${opts} ${egid}"
650 else 671 else
651 opts="${opts} -g ${egid}" 672 opts="${opts} -g ${egid}"
652 fi 673 fi
653 else 674 else
667 opts="${opts} ${eextra}" 688 opts="${opts} ${eextra}"
668 689
669 # add the group 690 # add the group
670 local oldsandbox="${SANDBOX_ON}" 691 local oldsandbox="${SANDBOX_ON}"
671 export SANDBOX_ON="0" 692 export SANDBOX_ON="0"
672 if [[ "${USERLAND}" == "Darwin" ]]; then 693 case ${CHOST} in
694 *-darwin*)
673 if [ ! -z "${eextra}" ]; 695 if [ ! -z "${eextra}" ];
674 then 696 then
675 einfo "Extra options are not supported on Darwin/OS X yet" 697 einfo "Extra options are not supported on Darwin/OS X yet"
676 einfo "Please report the ebuild along with the info below" 698 einfo "Please report the ebuild along with the info below"
677 einfo "eextra: ${eextra}" 699 einfo "eextra: ${eextra}"
678 die "Required function missing" 700 die "Required function missing"
679 fi 701 fi
680 702
681 # If we need the next available 703 # If we need the next available
682 case ${egid} in 704 case ${egid} in
683 *[!0-9]*) # Non numeric 705 *[!0-9]*) # Non numeric
684 for egid in `jot 898 101`; do 706 for egid in $(seq 101 999); do
685 [ -z "`egetent group ${egid}`" ] && break 707 [ -z "`egetent group ${egid}`" ] && break
686 done 708 done
687 esac 709 esac
688 dscl . create /groups/${egroup} gid ${egid} 710 dscl . create /groups/${egroup} gid ${egid}
689 dscl . create /groups/${egroup} passwd '*' 711 dscl . create /groups/${egroup} passwd '*'
690 elif [[ "${USERLAND}" == "BSD" ]] ; then 712 ;;
713
714 *-freebsd*|*-dragonfly*)
691 case ${egid} in 715 case ${egid} in
692 *[!0-9]*) # Non numeric 716 *[!0-9]*) # Non numeric
693 for egid in `jot 898 101`; do 717 for egid in $(seq 101 999); do
694 [ -z "`egetent group ${egid}`" ] && break 718 [ -z "`egetent group ${egid}`" ] && break
695 done 719 done
696 esac 720 esac
697 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 721 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
698 else 722 ;;
723
724 *-netbsd*)
725 case ${egid} in
726 *[!0-9]*) # Non numeric
727 for egid in $(seq 101 999); do
728 [ -z "`egetent group ${egid}`" ] && break
729 done
730 esac
731 groupadd -g ${egid} ${egroup} || die "enewgroup failed"
732 ;;
733
734 *)
699 groupadd ${opts} ${egroup} || die "enewgroup failed" 735 groupadd ${opts} ${egroup} || die "enewgroup failed"
700 fi 736 ;;
737 esac
701 export SANDBOX_ON="${oldsandbox}" 738 export SANDBOX_ON="${oldsandbox}"
702} 739}
703 740
704# Simple script to replace 'dos2unix' binaries 741# Simple script to replace 'dos2unix' binaries
705# vapier@gentoo.org 742# vapier@gentoo.org
730# name: the name that will show up in the menu 767# name: the name that will show up in the menu
731# icon: give your little like a pretty little icon ... 768# icon: give your little like a pretty little icon ...
732# this can be relative (to /usr/share/pixmaps) or 769# this can be relative (to /usr/share/pixmaps) or
733# a full path to an icon 770# a full path to an icon
734# type: what kind of application is this ? for categories: 771# type: what kind of application is this ? for categories:
735# http://www.freedesktop.org/wiki/Standards_2fmenu_2dspec 772# http://www.freedesktop.org/Standards/desktop-entry-spec
736# path: if your app needs to startup in a specific dir 773# path: if your app needs to startup in a specific dir
737make_desktop_entry() { 774make_desktop_entry() {
738 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1 775 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1
739 776
740 local exec=${1} 777 local exec=${1}
766 dev) 803 dev)
767 type="Development" 804 type="Development"
768 ;; 805 ;;
769 806
770 games) 807 games)
771 [[ -z ${path} ]] && path=${GAMES_BINDIR}
772
773 case ${catmin} in 808 case ${catmin} in
774 action) type=ActionGame;; 809 action) type=ActionGame;;
775 arcade) type=ArcadeGame;; 810 arcade) type=ArcadeGame;;
776 board) type=BoardGame;; 811 board) type=BoardGame;;
777 kid) type=KidsGame;; 812 kid) type=KidsGame;;
818 type="Network;${type}" 853 type="Network;${type}"
819 ;; 854 ;;
820 855
821 sci) 856 sci)
822 case ${catmin} in 857 case ${catmin} in
823 astro*) type=Astronomoy;; 858 astro*) type=Astronomy;;
824 bio*) type=Biology;; 859 bio*) type=Biology;;
825 calc*) type=Calculator;; 860 calc*) type=Calculator;;
826 chem*) type=Chemistry;; 861 chem*) type=Chemistry;;
827 geo*) type=Geology;; 862 geo*) type=Geology;;
828 math*) type=Math;; 863 math*) type=Math;;
860Exec=${exec} 895Exec=${exec}
861Path=${path} 896Path=${path}
862Icon=${icon} 897Icon=${icon}
863Categories=Application;${type};" > "${desktop}" 898Categories=Application;${type};" > "${desktop}"
864 899
900 (
901 # wrap the env here so that the 'insinto' call
902 # doesn't corrupt the env of the caller
865 insinto /usr/share/applications 903 insinto /usr/share/applications
866 doins "${desktop}" 904 doins "${desktop}"
867 905 )
868 return 0
869} 906}
870 907
871# Make a GDM/KDM Session file 908# Make a GDM/KDM Session file
872# 909#
873# make_desktop_entry(<title>, <command>) 910# make_desktop_entry(<title>, <command>)
902 doins "${i}" 939 doins "${i}"
903 elif [[ -d ${i} ]] ; then 940 elif [[ -d ${i} ]] ; then
904 for j in "${i}"/*.desktop ; do 941 for j in "${i}"/*.desktop ; do
905 doins "${j}" 942 doins "${j}"
906 done 943 done
907 fi 944 fi
908 done 945 done
909} 946}
910newmenu() { 947newmenu() {
911 insinto /usr/share/applications 948 insinto /usr/share/applications
912 newins "$1" "$2" 949 newins "$1" "$2"
920 doins "${i}" 957 doins "${i}"
921 elif [[ -d ${i} ]] ; then 958 elif [[ -d ${i} ]] ; then
922 for j in "${i}"/*.png ; do 959 for j in "${i}"/*.png ; do
923 doins "${j}" 960 doins "${j}"
924 done 961 done
925 fi 962 fi
926 done 963 done
927} 964}
928newicon() { 965newicon() {
929 insinto /usr/share/pixmaps 966 insinto /usr/share/pixmaps
930 newins "$1" "$2" 967 newins "$1" "$2"
935############################################################## 972##############################################################
936 973
937 974
938# for internal use only (unpack_pdv and unpack_makeself) 975# for internal use only (unpack_pdv and unpack_makeself)
939find_unpackable_file() { 976find_unpackable_file() {
940 local src="$1" 977 local src=$1
941 if [ -z "${src}" ] 978 if [[ -z ${src} ]] ; then
942 then
943 src="${DISTDIR}/${A}" 979 src=${DISTDIR}/${A}
944 else 980 else
945 if [ -e "${DISTDIR}/${src}" ] 981 if [[ -e ${DISTDIR}/${src} ]] ; then
946 then
947 src="${DISTDIR}/${src}" 982 src=${DISTDIR}/${src}
948 elif [ -e "${PWD}/${src}" ] 983 elif [[ -e ${PWD}/${src} ]] ; then
949 then
950 src="${PWD}/${src}" 984 src=${PWD}/${src}
951 elif [ -e "${src}" ] 985 elif [[ -e ${src} ]] ; then
952 then
953 src="${src}" 986 src=${src}
954 fi
955 fi 987 fi
956 [ ! -e "${src}" ] && die "Could not find requested archive ${src}" 988 fi
989 [[ ! -e ${src} ]] && return 1
957 echo "${src}" 990 echo "${src}"
958} 991}
959 992
960# Unpack those pesky pdv generated files ... 993# Unpack those pesky pdv generated files ...
961# They're self-unpacking programs with the binary package stuffed in 994# They're self-unpacking programs with the binary package stuffed in
976# lseek 1009# lseek
977# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 1010# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
978# lseek(3, -4, SEEK_END) = 2981250 1011# lseek(3, -4, SEEK_END) = 2981250
979# thus we would pass in the value of '4' as the second parameter. 1012# thus we would pass in the value of '4' as the second parameter.
980unpack_pdv() { 1013unpack_pdv() {
981 local src="`find_unpackable_file $1`" 1014 local src=$(find_unpackable_file $1)
982 local sizeoff_t="$2" 1015 local sizeoff_t=$2
983 1016
1017 [[ -z ${src} ]] && die "Could not locate source for '$1'"
984 [ -z "${sizeoff_t}" ] && die "No idea what off_t size was used for this pdv :(" 1018 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :("
985 1019
986 local shrtsrc="`basename ${src}`" 1020 local shrtsrc=$(basename "${src}")
987 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1021 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
988 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1022 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"`
989 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"` 1023 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"`
990 1024
991 # grab metadata for debug reasons 1025 # grab metadata for debug reasons
1055# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1089# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1056# - If the file is not specified then unpack will utilize ${A}. 1090# - If the file is not specified then unpack will utilize ${A}.
1057# - If the offset is not specified then we will attempt to extract 1091# - If the offset is not specified then we will attempt to extract
1058# the proper offset from the script itself. 1092# the proper offset from the script itself.
1059unpack_makeself() { 1093unpack_makeself() {
1094 local src_input=${1:-${A}}
1060 local src="$(find_unpackable_file "$1")" 1095 local src=$(find_unpackable_file "${src_input}")
1061 local skip="$2" 1096 local skip=$2
1062 local exe="$3" 1097 local exe=$3
1063 1098
1099 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
1100
1064 local shrtsrc="$(basename "${src}")" 1101 local shrtsrc=$(basename "${src}")
1065 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1102 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1066 if [ -z "${skip}" ] 1103 if [[ -z ${skip} ]] ; then
1067 then
1068 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1104 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}')
1069 local skip=0 1105 local skip=0
1070 exe=tail 1106 exe=tail
1071 case ${ver} in 1107 case ${ver} in
1072 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same 1108 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same
1073 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1109 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1085 ;; 1121 ;;
1086 2.1.3) 1122 2.1.3)
1087 skip=`grep -a ^offset= "${src}" | awk '{print $3}'` 1123 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1088 let skip="skip + 1" 1124 let skip="skip + 1"
1089 ;; 1125 ;;
1090 2.1.4) 1126 2.1.4|2.1.5)
1091 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1) 1127 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1)
1092 skip=$(head -n ${skip} "${src}" | wc -c) 1128 skip=$(head -n ${skip} "${src}" | wc -c)
1093 exe="dd" 1129 exe="dd"
1094 ;; 1130 ;;
1095 *) 1131 *)
1140check_license() { 1176check_license() {
1141 local lic=$1 1177 local lic=$1
1142 if [ -z "${lic}" ] ; then 1178 if [ -z "${lic}" ] ; then
1143 lic="${PORTDIR}/licenses/${LICENSE}" 1179 lic="${PORTDIR}/licenses/${LICENSE}"
1144 else 1180 else
1145 if [ -e "${PORTDIR}/licenses/${src}" ] ; then 1181 if [ -e "${PORTDIR}/licenses/${lic}" ] ; then
1146 lic="${PORTDIR}/licenses/${src}" 1182 lic="${PORTDIR}/licenses/${lic}"
1147 elif [ -e "${PWD}/${src}" ] ; then 1183 elif [ -e "${PWD}/${lic}" ] ; then
1148 lic="${PWD}/${src}" 1184 lic="${PWD}/${lic}"
1149 elif [ -e "${src}" ] ; then 1185 elif [ -e "${lic}" ] ; then
1150 lic="${src}" 1186 lic="${lic}"
1151 fi
1152 fi 1187 fi
1188 fi
1153 [ ! -f "${lic}" ] && die "Could not find requested license ${src}" 1189 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1154 local l="`basename ${lic}`" 1190 local l="`basename ${lic}`"
1155 1191
1156 # here is where we check for the licenses the user already 1192 # here is where we check for the licenses the user already
1157 # accepted ... if we don't find a match, we make the user accept 1193 # accepted ... if we don't find a match, we make the user accept
1158 local shopts=$- 1194 local shopts=$-
1214 # first we figure out how many cds we're dealing with by 1250 # first we figure out how many cds we're dealing with by
1215 # the # of files they gave us 1251 # the # of files they gave us
1216 local cdcnt=0 1252 local cdcnt=0
1217 local f= 1253 local f=
1218 for f in "$@" ; do 1254 for f in "$@" ; do
1219 cdcnt=$((cdcnt + 1)) 1255 ((++cdcnt))
1220 export CDROM_CHECK_${cdcnt}="$f" 1256 export CDROM_CHECK_${cdcnt}="$f"
1221 done 1257 done
1222 export CDROM_TOTAL_CDS=${cdcnt} 1258 export CDROM_TOTAL_CDS=${cdcnt}
1223 export CDROM_CURRENT_CD=1 1259 export CDROM_CURRENT_CD=1
1224 1260
1225 # now we see if the user gave use CD_ROOT ... 1261 # now we see if the user gave use CD_ROOT ...
1226 # if they did, let's just believe them that it's correct 1262 # if they did, let's just believe them that it's correct
1227 if [[ ! -z ${CD_ROOT} ]] ; then
1228 export CDROM_ROOT=${CD_ROOT}
1229 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1230 return
1231 fi
1232 # do the same for CD_ROOT_X
1233 if [[ ! -z ${CD_ROOT_1} ]] ; then 1263 if [[ -n ${CD_ROOT}${CD_ROOT_1} ]] ; then
1234 local var= 1264 local var=
1235 cdcnt=0 1265 cdcnt=0
1236 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1266 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1237 cdcnt=$((cdcnt + 1)) 1267 ((++cdcnt))
1238 var="CD_ROOT_${cdcnt}" 1268 var="CD_ROOT_${cdcnt}"
1269 [[ -z ${!var} ]] && var="CD_ROOT"
1239 if [[ -z ${!var} ]] ; then 1270 if [[ -z ${!var} ]] ; then
1240 eerror "You must either use just the CD_ROOT" 1271 eerror "You must either use just the CD_ROOT"
1241 eerror "or specify ALL the CD_ROOT_X variables." 1272 eerror "or specify ALL the CD_ROOT_X variables."
1242 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables." 1273 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables."
1243 die "could not locate CD_ROOT_${cdcnt}" 1274 die "could not locate CD_ROOT_${cdcnt}"
1244 fi 1275 fi
1245 export CDROM_ROOTS_${cdcnt}="${!var}"
1246 done 1276 done
1247 export CDROM_ROOT=${CDROM_ROOTS_1} 1277 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}}
1248 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1278 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1279 export CDROM_SET=-1
1280 for f in ${CDROM_CHECK_1//:/ } ; do
1281 ((++CDROM_SET))
1282 [[ -e ${CD_ROOT}/${f} ]] && break
1283 done
1284 export CDROM_MATCH=${f}
1249 return 1285 return
1250 fi 1286 fi
1251 1287
1288 # User didn't help us out so lets make sure they know they can
1289 # simplify the whole process ...
1252 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1290 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1253 einfon "This ebuild will need the " 1291 einfo "This ebuild will need the ${CDROM_NAME:-cdrom for ${PN}}"
1254 if [[ -z ${CDROM_NAME} ]] ; then
1255 echo "cdrom for ${PN}."
1256 else
1257 echo "${CDROM_NAME}."
1258 fi
1259 echo 1292 echo
1260 einfo "If you do not have the CD, but have the data files" 1293 einfo "If you do not have the CD, but have the data files"
1261 einfo "mounted somewhere on your filesystem, just export" 1294 einfo "mounted somewhere on your filesystem, just export"
1262 einfo "the variable CD_ROOT so that it points to the" 1295 einfo "the variable CD_ROOT so that it points to the"
1263 einfo "directory containing the files." 1296 einfo "directory containing the files."
1267 echo 1300 echo
1268 else 1301 else
1269 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1302 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1270 cdcnt=0 1303 cdcnt=0
1271 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1304 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1272 cdcnt=$((cdcnt + 1)) 1305 ((++cdcnt))
1273 var="CDROM_NAME_${cdcnt}" 1306 var="CDROM_NAME_${cdcnt}"
1274 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}" 1307 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}"
1275 done 1308 done
1276 echo 1309 echo
1277 einfo "If you do not have the CDs, but have the data files" 1310 einfo "If you do not have the CDs, but have the data files"
1278 einfo "mounted somewhere on your filesystem, just export" 1311 einfo "mounted somewhere on your filesystem, just export"
1279 einfo "the following variables so they point to the right place:" 1312 einfo "the following variables so they point to the right place:"
1280 einfon "" 1313 einfon ""
1281 cdcnt=0 1314 cdcnt=0
1282 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1315 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1283 cdcnt=$((cdcnt + 1)) 1316 ((++cdcnt))
1284 echo -n " CD_ROOT_${cdcnt}" 1317 echo -n " CD_ROOT_${cdcnt}"
1285 done 1318 done
1286 echo 1319 echo
1287 einfo "Or, if you have all the files in the same place, or" 1320 einfo "Or, if you have all the files in the same place, or"
1288 einfo "you only have one cdrom, you can export CD_ROOT" 1321 einfo "you only have one cdrom, you can export CD_ROOT"
1291 echo 1324 echo
1292 einfo "For example:" 1325 einfo "For example:"
1293 einfo "export CD_ROOT_1=/mnt/cdrom" 1326 einfo "export CD_ROOT_1=/mnt/cdrom"
1294 echo 1327 echo
1295 fi 1328 fi
1329
1330 export CDROM_SET=""
1296 export CDROM_CURRENT_CD=0 1331 export CDROM_CURRENT_CD=0
1297 cdrom_load_next_cd 1332 cdrom_load_next_cd
1298} 1333}
1299 1334
1300# this is only used when you need access to more than one cd. 1335# this is only used when you need access to more than one cd.
1301# when you have finished using the first cd, just call this function. 1336# when you have finished using the first cd, just call this function.
1302# when it returns, CDROM_ROOT will be pointing to the second cd. 1337# when it returns, CDROM_ROOT will be pointing to the second cd.
1303# remember, you can only go forward in the cd chain, you can't go back. 1338# remember, you can only go forward in the cd chain, you can't go back.
1304cdrom_load_next_cd() { 1339cdrom_load_next_cd() {
1305 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1306 local var= 1340 local var
1307 1341 ((++CDROM_CURRENT_CD))
1308 if [[ ! -z ${CD_ROOT} ]] ; then
1309 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}"
1310 return
1311 fi
1312 1342
1313 unset CDROM_ROOT 1343 unset CDROM_ROOT
1314 var=CDROM_ROOTS_${CDROM_CURRENT_CD} 1344 var=CD_ROOT_${CDROM_CURRENT_CD}
1345 [[ -z ${!var} ]] && var="CD_ROOT"
1315 if [[ -z ${!var} ]] ; then 1346 if [[ -z ${!var} ]] ; then
1316 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1347 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1317 cdrom_locate_file_on_cd ${!var} 1348 _cdrom_locate_file_on_cd ${!var}
1318 else 1349 else
1319 export CDROM_ROOT=${!var} 1350 export CDROM_ROOT=${!var}
1320 fi 1351 fi
1321 1352
1322 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1353 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1327# all it does is try to locate a give file on a cd ... if the cd isn't 1358# all it does is try to locate a give file on a cd ... if the cd isn't
1328# found, then a message asking for the user to insert the cdrom will be 1359# found, then a message asking for the user to insert the cdrom will be
1329# displayed and we'll hang out here until: 1360# displayed and we'll hang out here until:
1330# (1) the file is found on a mounted cdrom 1361# (1) the file is found on a mounted cdrom
1331# (2) the user hits CTRL+C 1362# (2) the user hits CTRL+C
1332cdrom_locate_file_on_cd() { 1363_cdrom_locate_file_on_cd() {
1364 local mline=""
1365 local showedmsg=0
1366
1333 while [[ -z ${CDROM_ROOT} ]] ; do 1367 while [[ -z ${CDROM_ROOT} ]] ; do
1368 local i=0
1369 local -a cdset=(${*//:/ })
1370 if [[ -n ${CDROM_SET} ]] ; then
1371 cdset=(${cdset[${CDROM_SET}]})
1372 fi
1373
1374 while [[ -n ${cdset[${i}]} ]] ; do
1334 local dir="$(dirname ${@})" 1375 local dir=$(dirname ${cdset[${i}]})
1335 local file="$(basename ${@})" 1376 local file=$(basename ${cdset[${i}]})
1336 local mline=""
1337 local showedmsg=0
1338 1377
1339 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do 1378 for mline in $(mount | gawk '/(iso|cdrom|fs=cdfss)/ {print $3}') ; do
1340 [[ -d ${mline}/${dir} ]] || continue 1379 [[ -d ${mline}/${dir} ]] || continue
1341 [[ ! -z $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] \ 1380 if [[ -n $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] ; then
1342 && export CDROM_ROOT=${mline} 1381 export CDROM_ROOT=${mline}
1382 export CDROM_SET=${i}
1383 export CDROM_MATCH=${cdset[${i}]}
1384 return
1385 fi
1386 done
1387
1388 ((++i))
1343 done 1389 done
1344 1390
1345 if [[ -z ${CDROM_ROOT} ]] ; then
1346 echo 1391 echo
1347 if [[ ${showedmsg} -eq 0 ]] ; then 1392 if [[ ${showedmsg} -eq 0 ]] ; then
1348 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1393 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1349 if [[ -z ${CDROM_NAME} ]] ; then 1394 if [[ -z ${CDROM_NAME} ]] ; then
1350 einfo "Please insert the cdrom for ${PN} now !" 1395 einfo "Please insert+mount the cdrom for ${PN} now !"
1351 else
1352 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1353 fi
1354 else 1396 else
1355 if [[ -z ${CDROM_NAME_1} ]] ; then
1356 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !"
1357 else
1358 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1359 einfo "Please insert+mount the ${!var} cdrom now !" 1397 einfo "Please insert+mount the ${CDROM_NAME} cdrom now !"
1360 fi
1361 fi 1398 fi
1362 showedmsg=1 1399 else
1400 if [[ -z ${CDROM_NAME_1} ]] ; then
1401 einfo "Please insert+mount cd #${CDROM_CURRENT_CD} for ${PN} now !"
1402 else
1403 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1404 einfo "Please insert+mount the ${!var} cdrom now !"
1405 fi
1363 fi 1406 fi
1407 showedmsg=1
1408 fi
1364 einfo "Press return to scan for the cd again" 1409 einfo "Press return to scan for the cd again"
1365 einfo "or hit CTRL+C to abort the emerge." 1410 einfo "or hit CTRL+C to abort the emerge."
1411 echo
1412 einfo "If you are having trouble with the detection"
1413 einfo "of your CD, it is possible that you do not have"
1414 einfo "Joliet support enabled in your kernel. Please"
1415 einfo "check that CONFIG_JOLIET is enabled in your kernel."
1366 read 1416 read
1367 fi
1368 done 1417 done
1369} 1418}
1370 1419
1371# Make sure that LINGUAS only contains languages that 1420# Make sure that LINGUAS only contains languages that
1372# a package can support 1421# a package can support
1493 LIB=$1 1542 LIB=$1
1494 1543
1495 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1544 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1496 SONAME=`basename ${LIB}` 1545 SONAME=`basename ${LIB}`
1497 1546
1498 einfo "An old version of an installed library was detected on your system." 1547 ewarn "An old version of an installed library was detected on your system."
1499 einfo "In order to avoid breaking packages that link against is, this older version" 1548 ewarn "In order to avoid breaking packages that link against it, this older version"
1500 einfo "is not being removed. In order to make full use of this newer version," 1549 ewarn "is not being removed. In order to make full use of this newer version,"
1501 einfo "you will need to execute the following command:" 1550 ewarn "you will need to execute the following command:"
1502 einfo " revdep-rebuild --soname ${SONAME}" 1551 ewarn " revdep-rebuild --soname ${SONAME}"
1503 einfo 1552 ewarn
1504 einfo "After doing that, you can safely remove ${LIB}" 1553 ewarn "After doing that, you can safely remove ${LIB}"
1505 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild" 1554 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1506 fi 1555 fi
1507} 1556}
1508 1557
1509# Hack for people to figure out if a package was built with 1558# Hack for people to figure out if a package was built with
1510# certain USE flags 1559# certain USE flags
1520 [[ ${opt:0:1} = "-" ]] && shift || opt="-a" 1569 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1521 1570
1522 local PKG=$(best_version $1) 1571 local PKG=$(best_version $1)
1523 shift 1572 shift
1524 1573
1525 local USEFILE="${ROOT}/var/db/pkg/${PKG}/USE" 1574 local USEFILE=${ROOT}/var/db/pkg/${PKG}/USE
1575
1576 # if the USE file doesnt exist, assume the $PKG is either
1577 # injected or package.provided
1526 [[ ! -e ${USEFILE} ]] && return 1 1578 [[ ! -e ${USEFILE} ]] && return 0
1527 1579
1528 local USE_BUILT=$(<${USEFILE}) 1580 local USE_BUILT=$(<${USEFILE})
1529 while [[ $# -gt 0 ]] ; do 1581 while [[ $# -gt 0 ]] ; do
1530 if [[ ${opt} = "-o" ]] ; then 1582 if [[ ${opt} = "-o" ]] ; then
1531 has $1 ${USE_BUILT} && return 0 1583 has $1 ${USE_BUILT} && return 0
1583# $4 == extra LD_LIBRARY_PATH's (make it : delimited) 1635# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1584# $5 == path for wrapper 1636# $5 == path for wrapper
1585make_wrapper() { 1637make_wrapper() {
1586 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5 1638 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1587 local tmpwrapper=$(emktemp) 1639 local tmpwrapper=$(emktemp)
1640 # We don't want to quote ${bin} so that people can pass complex
1641 # things as $bin ... "./someprog --args"
1588 cat << EOF > "${tmpwrapper}" 1642 cat << EOF > "${tmpwrapper}"
1589#!/bin/sh 1643#!/bin/sh
1590cd "${chdir}" 1644cd "${chdir:-.}"
1645if [ -n "${libdir}" ] ; then
1646 if [ "\${LD_LIBRARY_PATH+set}" = "set" ] ; then
1591export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}" 1647 export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1648 else
1649 export LD_LIBRARY_PATH="${libdir}"
1650 fi
1651fi
1592exec ${bin} "\$@" 1652exec ${bin} "\$@"
1593EOF 1653EOF
1594 chmod go+rx "${tmpwrapper}" 1654 chmod go+rx "${tmpwrapper}"
1595 if [ -n "${5}" ] 1655 if [[ -n ${path} ]] ; then
1596 then
1597 exeinto ${5} 1656 exeinto "${path}"
1598 newexe "${tmpwrapper}" "${wrapper}" 1657 newexe "${tmpwrapper}" "${wrapper}"
1599 else 1658 else
1600 newbin "${tmpwrapper}" "${wrapper}" 1659 newbin "${tmpwrapper}" "${wrapper}"
1601 fi 1660 fi
1602} 1661}

Legend:
Removed from v.1.182  
changed lines
  Added in v.1.221

  ViewVC Help
Powered by ViewVC 1.1.20