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

Diff of /eclass/eutils.eclass

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

Revision 1.186 Revision 1.228
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.186 2005/07/06 20:20:03 agriffis Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.228 2006/03/10 23:24:21 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
13INHERITED="$INHERITED $ECLASS"
14 13
15DEPEND="!bootstrap? ( sys-devel/patch )" 14DEPEND="!bootstrap? ( sys-devel/patch )"
16# sys-apps/shadow is needed for useradd, etc, bug #94745. 15# sys-apps/shadow is needed for useradd, etc, bug #94745.
17 16
18DESCRIPTION="Based on the ${ECLASS} eclass" 17DESCRIPTION="Based on the ${ECLASS} eclass"
61# to point to the latest version of the library present. 60# to point to the latest version of the library present.
62# 61#
63# <azarah@gentoo.org> (26 Oct 2002) 62# <azarah@gentoo.org> (26 Oct 2002)
64# 63#
65gen_usr_ldscript() { 64gen_usr_ldscript() {
66 local libdir="$(get_libdir)" 65 local lib libdir=$(get_libdir)
67 # Just make sure it exists 66 # Just make sure it exists
68 dodir /usr/${libdir} 67 dodir /usr/${libdir}
69 68
70 for lib in "${@}" ; do 69 for lib in "${@}" ; do
71 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT 70 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT
72 /* GNU ld script 71 /* GNU ld script
73 Since Gentoo has critical dynamic libraries 72 Since Gentoo has critical dynamic libraries
74 in /lib, and the static versions in /usr/lib, 73 in /lib, and the static versions in /usr/lib,
75 we need to have a "fake" dynamic lib in /usr/lib, 74 we need to have a "fake" dynamic lib in /usr/lib,
76 otherwise we run into linking problems. 75 otherwise we run into linking problems.
77 76
78 See bug http://bugs.gentoo.org/4411 for more info. 77 See bug http://bugs.gentoo.org/4411 for more info.
79 */ 78 */
80 GROUP ( /${libdir}/${lib} ) 79 GROUP ( /${libdir}/${lib} )
81 END_LDSCRIPT 80 END_LDSCRIPT
82 fperms a+x "/usr/${libdir}/${lib}" 81 fperms a+x "/usr/${libdir}/${lib}" || die "could not change perms on ${lib}"
83 done 82 done
84} 83}
85 84
86# Simple function to draw a line consisting of '=' the same length as $*
87# - only to be used by epatch()
88#
89# <azarah@gentoo.org> (11 Nov 2002)
90#
91draw_line() {
92 local i=0
93 local str_length=""
94
95 # Handle calls that do not have args, or wc not being installed ...
96 if [ -z "$1" -o ! -x "$(which wc 2>/dev/null)" ]
97 then
98 echo "==============================================================="
99 return 0
100 fi
101
102 # Get the length of $*
103 str_length="$(echo -n "$*" | wc -m)"
104
105 while [ "$i" -lt "${str_length}" ]
106 do
107 echo -n "="
108
109 i=$((i + 1))
110 done
111
112 echo
113
114 return 0
115}
116 85
117# Default directory where patches are located 86# Default directory where patches are located
118EPATCH_SOURCE="${WORKDIR}/patch" 87EPATCH_SOURCE="${WORKDIR}/patch"
119# Default extension for patches 88# Default extension for patches
120EPATCH_SUFFIX="patch.bz2" 89EPATCH_SUFFIX="patch.bz2"
167# hand its a directory, it will set EPATCH_SOURCE to this. 136# hand its a directory, it will set EPATCH_SOURCE to this.
168# 137#
169# <azarah@gentoo.org> (10 Nov 2002) 138# <azarah@gentoo.org> (10 Nov 2002)
170# 139#
171epatch() { 140epatch() {
141 _epatch_draw_line() {
142 # this func produces a lot of pointless noise when debugging is turned on ...
143 local is_debug=0
144 [[ $- == *x* ]] && is_debug=1 && set +x
145
146 local i=0 str_length="" str_out=""
147
148 # Handle calls that do not have args, or wc not being installed ...
149 if [[ -z $1 ]] || ! type -p wc >/dev/null ; then
150 str_length=65
151 else
152 str_length=$(echo -n "$*" | wc -m)
153 fi
154
155 while ((i++ < ${str_length})) ; do
156 str_out="${str_out}="
157 done
158 echo ${str_out}
159
160 [[ ${is_debug} -eq 1 ]] && set -x
161 return 0
162 }
163 _epatch_assert() { local _pipestatus=${PIPESTATUS[*]}; [[ ${_pipestatus// /} -eq 0 ]] ; }
172 local PIPE_CMD="" 164 local PIPE_CMD=""
173 local STDERR_TARGET="${T}/$$.out" 165 local STDERR_TARGET="${T}/$$.out"
174 local PATCH_TARGET="${T}/$$.patch" 166 local PATCH_TARGET="${T}/$$.patch"
175 local PATCH_SUFFIX="" 167 local PATCH_SUFFIX=""
176 local SINGLE_PATCH="no" 168 local SINGLE_PATCH="no"
177 local x="" 169 local x=""
170
171 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402
178 172
179 if [ "$#" -gt 1 ] 173 if [ "$#" -gt 1 ]
180 then 174 then
181 local m="" 175 local m=""
182 for m in "$@" ; do 176 for m in "$@" ; do
283 277
284 # Allow for prefix to differ ... im lazy, so shoot me :/ 278 # Allow for prefix to differ ... im lazy, so shoot me :/
285 while [ "${count}" -lt 5 ] 279 while [ "${count}" -lt 5 ]
286 do 280 do
287 # Generate some useful debug info ... 281 # Generate some useful debug info ...
288 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 282 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
289 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 283 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
290 284
291 if [ "${PATCH_SUFFIX}" != "patch" ] 285 if [ "${PATCH_SUFFIX}" != "patch" ]
292 then 286 then
293 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 287 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
298 292
299 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 293 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
300 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 294 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
301 295
302 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 296 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
303 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 297 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
304 298
305 if [ "${PATCH_SUFFIX}" != "patch" ] 299 if [ "${PATCH_SUFFIX}" != "patch" ]
306 then 300 then
307 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1 301 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
308 then 302 then
312 count=5 306 count=5
313 break 307 break
314 fi 308 fi
315 fi 309 fi
316 310
317 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1 311 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f ; _epatch_assert) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
318 then 312 then
319 draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 313 _epatch_draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
320 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 314 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
321 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 315 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
322 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 316 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
323 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 317 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
324 318
325 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1 319 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1
320 _epatch_assert
326 321
327 if [ "$?" -ne 0 ] 322 if [ "$?" -ne 0 ]
328 then 323 then
329 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 324 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
330 echo 325 echo
376# vapier@gentoo.org 371# vapier@gentoo.org
377# 372#
378# Takes just 1 optional parameter (the directory to create tmpfile in) 373# Takes just 1 optional parameter (the directory to create tmpfile in)
379emktemp() { 374emktemp() {
380 local exe="touch" 375 local exe="touch"
381 [ "$1" == "-d" ] && exe="mkdir" && shift 376 [[ $1 == -d ]] && exe="mkdir" && shift
382 local topdir="$1" 377 local topdir=$1
383 378
384 if [ -z "${topdir}" ] 379 if [[ -z ${topdir} ]] ; then
385 then
386 [ -z "${T}" ] \ 380 [[ -z ${T} ]] \
387 && topdir="/tmp" \ 381 && topdir="/tmp" \
388 || topdir="${T}" 382 || topdir=${T}
389 fi 383 fi
390 384
391 if [ -z "$(type -p mktemp)" ] 385 if [[ -z $(type -p mktemp) ]] ; then
392 then
393 local tmp=/ 386 local tmp=/
394 while [ -e "${tmp}" ] ; do 387 while [[ -e ${tmp} ]] ; do
395 tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}" 388 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}
396 done 389 done
397 ${exe} "${tmp}" 390 ${exe} "${tmp}" || ${exe} -p "${tmp}"
398 echo "${tmp}" 391 echo "${tmp}"
399 else 392 else
400 [ "${exe}" == "touch" ] \ 393 if [[ ${exe} == "touch" ]] ; then
401 && exe="-p" \ 394 [[ ${USERLAND} == "GNU" ]] \
402 || exe="-d" 395 && mktemp -p "${topdir}" \
403 mktemp ${exe} "${topdir}" 396 || TMPDIR="${topdir}" mktemp -t tmp
397 else
398 [[ ${USERLAND} == "GNU" ]] \
399 && mktemp -d "${topdir}" \
400 || TMPDIR="${topdir}" mktemp -dt tmp
401 fi
404 fi 402 fi
405} 403}
406 404
407# Small wrapper for getent (Linux), nidump (Mac OS X), 405# Small wrapper for getent (Linux), nidump (Mac OS X),
408# and pw (FreeBSD) used in enewuser()/enewgroup() 406# and pw (FreeBSD) used in enewuser()/enewgroup()
409# Joe Jezak <josejx@gmail.com> and usata@gentoo.org 407# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
410# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org> 408# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
411# 409#
412# egetent(database, key) 410# egetent(database, key)
413egetent() { 411egetent() {
414 if [[ "${USERLAND}" == "Darwin" ]] ; then 412 case ${CHOST} in
413 *-darwin*)
415 case "$2" in 414 case "$2" in
416 *[!0-9]*) # Non numeric 415 *[!0-9]*) # Non numeric
417 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 416 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
418 ;; 417 ;;
419 *) # Numeric 418 *) # Numeric
420 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 419 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
421 ;; 420 ;;
422 esac 421 esac
423 elif [[ "${USERLAND}" == "BSD" ]] ; then 422 ;;
424 local action 423 *-freebsd*|*-dragonfly*)
425 if [ "$1" == "passwd" ] 424 local opts action="user"
426 then 425 [[ $1 == "passwd" ]] || action="group"
427 action="user" 426
428 else 427 # lookup by uid/gid
429 action="group" 428 if [[ $2 == [[:digit:]]* ]] ; then
429 [[ ${action} == "user" ]] && opts="-u" || opts="-g"
430 fi 430 fi
431
431 pw show "${action}" "$2" -q 432 pw show ${action} ${opts} "$2" -q
432 else 433 ;;
434 *-netbsd*|*-openbsd*)
435 grep "$2:\*:" /etc/$1
436 ;;
437 *)
433 which nscd >& /dev/null && nscd -i "$1" 438 type -p nscd >& /dev/null && nscd -i "$1"
434 getent "$1" "$2" 439 getent "$1" "$2"
435 fi 440 ;;
441 esac
436} 442}
437 443
438# Simplify/standardize adding users to the system 444# Simplify/standardize adding users to the system
439# vapier@gentoo.org 445# vapier@gentoo.org
440# 446#
478 fi 484 fi
479 else 485 else
480 euid="next" 486 euid="next"
481 fi 487 fi
482 if [[ ${euid} == "next" ]] ; then 488 if [[ ${euid} == "next" ]] ; then
483 local pwrange 489 for euid in $(seq 101 999) ; do
484 if [[ ${USERLAND} == "BSD" ]] ; then
485 pwrange=$(jot 898 101)
486 else
487 pwrange=$(seq 101 999)
488 fi
489 for euid in ${pwrange} ; do
490 [[ -z $(egetent passwd ${euid}) ]] && break 490 [[ -z $(egetent passwd ${euid}) ]] && break
491 done 491 done
492 fi 492 fi
493 opts="${opts} -u ${euid}" 493 opts="${opts} -u ${euid}"
494 einfo " - Userid: ${euid}" 494 einfo " - Userid: ${euid}"
495 495
496 # handle shell 496 # handle shell
497 local eshell=$1; shift 497 local eshell=$1; shift
498 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then 498 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
499 if [[ ! -e ${eshell} ]] ; then 499 if [[ ! -e ${ROOT}${eshell} ]] ; then
500 eerror "A shell was specified but it does not exist !" 500 eerror "A shell was specified but it does not exist !"
501 die "${eshell} does not exist" 501 die "${eshell} does not exist in ${ROOT}"
502 fi 502 fi
503 if [[ ${eshell} == */false || ${eshell} == */nologin ]] ; then
504 eerror "Do not specify ${eshell} yourself, use -1"
505 die "Pass '-1' as the shell parameter"
506 fi
503 else 507 else
504 case ${USERLAND} in 508 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do
505 Darwin) eshell="/usr/bin/false";; 509 [[ -x ${ROOT}${shell} ]] && break
506 BSD) eshell="/usr/sbin/nologin";; 510 done
507 *) eshell="/bin/false";; 511
508 esac 512 if [[ ${shell} == "/dev/null" ]] ; then
513 eerror "Unable to identify the shell to use"
514 die "Unable to identify the shell to use"
515 fi
516
517 eshell=${shell}
509 fi 518 fi
510 einfo " - Shell: ${eshell}" 519 einfo " - Shell: ${eshell}"
511 opts="${opts} -s ${eshell}" 520 opts="${opts} -s ${eshell}"
512 521
513 # handle homedir 522 # handle homedir
550 einfo " - Groups: ${egroups}" 559 einfo " - Groups: ${egroups}"
551 560
552 # handle extra and add the user 561 # handle extra and add the user
553 local oldsandbox=${SANDBOX_ON} 562 local oldsandbox=${SANDBOX_ON}
554 export SANDBOX_ON="0" 563 export SANDBOX_ON="0"
555 case ${USERLAND} in 564 case ${CHOST} in
556 Darwin) 565 *-darwin*)
557 ### Make the user 566 ### Make the user
558 if [[ -z $@ ]] ; then 567 if [[ -z $@ ]] ; then
559 dscl . create /users/${euser} uid ${euid} 568 dscl . create /users/${euser} uid ${euid}
560 dscl . create /users/${euser} shell ${eshell} 569 dscl . create /users/${euser} shell ${eshell}
561 dscl . create /users/${euser} home ${ehome} 570 dscl . create /users/${euser} home ${ehome}
572 einfo "Please report the ebuild along with the info below" 581 einfo "Please report the ebuild along with the info below"
573 einfo "eextra: $@" 582 einfo "eextra: $@"
574 die "Required function missing" 583 die "Required function missing"
575 fi 584 fi
576 ;; 585 ;;
577 BSD) 586 *-freebsd*|*-dragonfly*)
578 if [[ -z $@ ]] ; then 587 if [[ -z $@ ]] ; then
579 pw useradd ${euser} ${opts} \ 588 pw useradd ${euser} ${opts} \
580 -c "added by portage for ${PN}" \ 589 -c "added by portage for ${PN}" \
581 die "enewuser failed" 590 die "enewuser failed"
582 else 591 else
583 einfo " - Extra: $@" 592 einfo " - Extra: $@"
584 pw useradd ${euser} ${opts} \ 593 pw useradd ${euser} ${opts} \
585 "$@" || die "enewuser failed" 594 "$@" || die "enewuser failed"
586 fi 595 fi
587 ;; 596 ;;
597
598 *-netbsd*)
599 if [[ -z $@ ]] ; then
600 useradd ${opts} ${euser} || die "enewuser failed"
601 else
602 einfo " - Extra: $@"
603 useradd ${opts} ${euser} "$@" || die "enewuser failed"
604 fi
605 ;;
606
607 *-openbsd*)
608 if [[ -z $@ ]] ; then
609 useradd -u ${euid} -s ${eshell} \
610 -d ${ehome} -c "Added by portage for ${PN}" \
611 -g ${egroups} ${euser} || die "enewuser failed"
612 else
613 einfo " - Extra: $@"
614 useradd -u ${euid} -s ${eshell} \
615 -d ${ehome} -c "Added by portage for ${PN}" \
616 -g ${egroups} ${euser} "$@" || die "enewuser failed"
617 fi
618 ;;
619
588 *) 620 *)
589 if [[ -z $@ ]] ; then 621 if [[ -z $@ ]] ; then
590 useradd ${opts} ${euser} \ 622 useradd ${opts} ${euser} \
591 -c "added by portage for ${PN}" \ 623 -c "added by portage for ${PN}" \
592 || die "enewuser failed" 624 || die "enewuser failed"
595 useradd ${opts} ${euser} "$@" \ 627 useradd ${opts} ${euser} "$@" \
596 || die "enewuser failed" 628 || die "enewuser failed"
597 fi 629 fi
598 ;; 630 ;;
599 esac 631 esac
632
633 if [[ ! -e ${ROOT}/${ehome} ]] ; then
634 einfo " - Creating ${ehome} in ${ROOT}"
635 mkdir -p "${ROOT}/${ehome}"
636 chown ${euser} "${ROOT}/${ehome}"
637 chmod 755 "${ROOT}/${ehome}"
638 fi
639
600 export SANDBOX_ON=${oldsandbox} 640 export SANDBOX_ON=${oldsandbox}
601
602 if [ ! -e "${ehome}" ] && [ ! -e "${D}/${ehome}" ]
603 then
604 einfo " - Creating ${ehome} in ${D}"
605 dodir ${ehome}
606 fowners ${euser} ${ehome}
607 fperms 755 ${ehome}
608 fi
609} 641}
610 642
611# Simplify/standardize adding groups to the system 643# Simplify/standardize adding groups to the system
612# vapier@gentoo.org 644# vapier@gentoo.org
613# 645#
642 then 674 then
643 if [ "${egid}" -gt 0 ] 675 if [ "${egid}" -gt 0 ]
644 then 676 then
645 if [ -z "`egetent group ${egid}`" ] 677 if [ -z "`egetent group ${egid}`" ]
646 then 678 then
647 if [[ "${USERLAND}" == "Darwin" ]]; then 679 if [[ "${CHOST}" == *-darwin* ]]; then
648 opts="${opts} ${egid}" 680 opts="${opts} ${egid}"
649 else 681 else
650 opts="${opts} -g ${egid}" 682 opts="${opts} -g ${egid}"
651 fi 683 fi
652 else 684 else
666 opts="${opts} ${eextra}" 698 opts="${opts} ${eextra}"
667 699
668 # add the group 700 # add the group
669 local oldsandbox="${SANDBOX_ON}" 701 local oldsandbox="${SANDBOX_ON}"
670 export SANDBOX_ON="0" 702 export SANDBOX_ON="0"
671 if [[ "${USERLAND}" == "Darwin" ]]; then 703 case ${CHOST} in
704 *-darwin*)
672 if [ ! -z "${eextra}" ]; 705 if [ ! -z "${eextra}" ];
673 then 706 then
674 einfo "Extra options are not supported on Darwin/OS X yet" 707 einfo "Extra options are not supported on Darwin/OS X yet"
675 einfo "Please report the ebuild along with the info below" 708 einfo "Please report the ebuild along with the info below"
676 einfo "eextra: ${eextra}" 709 einfo "eextra: ${eextra}"
677 die "Required function missing" 710 die "Required function missing"
678 fi 711 fi
679 712
680 # If we need the next available 713 # If we need the next available
681 case ${egid} in 714 case ${egid} in
682 *[!0-9]*) # Non numeric 715 *[!0-9]*) # Non numeric
683 for egid in `jot 898 101`; do 716 for egid in $(seq 101 999); do
684 [ -z "`egetent group ${egid}`" ] && break 717 [ -z "`egetent group ${egid}`" ] && break
685 done 718 done
686 esac 719 esac
687 dscl . create /groups/${egroup} gid ${egid} 720 dscl . create /groups/${egroup} gid ${egid}
688 dscl . create /groups/${egroup} passwd '*' 721 dscl . create /groups/${egroup} passwd '*'
689 elif [[ "${USERLAND}" == "BSD" ]] ; then 722 ;;
723
724 *-freebsd*|*-dragonfly*)
690 case ${egid} in 725 case ${egid} in
691 *[!0-9]*) # Non numeric 726 *[!0-9]*) # Non numeric
692 for egid in `jot 898 101`; do 727 for egid in $(seq 101 999); do
693 [ -z "`egetent group ${egid}`" ] && break 728 [ -z "`egetent group ${egid}`" ] && break
694 done 729 done
695 esac 730 esac
696 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 731 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
697 else 732 ;;
733
734 *-netbsd*)
735 case ${egid} in
736 *[!0-9]*) # Non numeric
737 for egid in $(seq 101 999); do
738 [ -z "`egetent group ${egid}`" ] && break
739 done
740 esac
741 groupadd -g ${egid} ${egroup} || die "enewgroup failed"
742 ;;
743
744 *)
698 groupadd ${opts} ${egroup} || die "enewgroup failed" 745 groupadd ${opts} ${egroup} || die "enewgroup failed"
699 fi 746 ;;
747 esac
700 export SANDBOX_ON="${oldsandbox}" 748 export SANDBOX_ON="${oldsandbox}"
701} 749}
702 750
703# Simple script to replace 'dos2unix' binaries 751# Simple script to replace 'dos2unix' binaries
704# vapier@gentoo.org 752# vapier@gentoo.org
729# name: the name that will show up in the menu 777# name: the name that will show up in the menu
730# icon: give your little like a pretty little icon ... 778# icon: give your little like a pretty little icon ...
731# this can be relative (to /usr/share/pixmaps) or 779# this can be relative (to /usr/share/pixmaps) or
732# a full path to an icon 780# a full path to an icon
733# type: what kind of application is this ? for categories: 781# type: what kind of application is this ? for categories:
734# http://www.freedesktop.org/wiki/Standards_2fmenu_2dspec 782# http://www.freedesktop.org/Standards/desktop-entry-spec
735# path: if your app needs to startup in a specific dir 783# path: if your app needs to startup in a specific dir
736make_desktop_entry() { 784make_desktop_entry() {
737 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1 785 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1
738 786
739 local exec=${1} 787 local exec=${1}
765 dev) 813 dev)
766 type="Development" 814 type="Development"
767 ;; 815 ;;
768 816
769 games) 817 games)
770 [[ -z ${path} ]] && path=${GAMES_BINDIR}
771
772 case ${catmin} in 818 case ${catmin} in
773 action) type=ActionGame;; 819 action) type=ActionGame;;
774 arcade) type=ArcadeGame;; 820 arcade) type=ArcadeGame;;
775 board) type=BoardGame;; 821 board) type=BoardGame;;
776 kid) type=KidsGame;; 822 kid) type=KidsGame;;
817 type="Network;${type}" 863 type="Network;${type}"
818 ;; 864 ;;
819 865
820 sci) 866 sci)
821 case ${catmin} in 867 case ${catmin} in
822 astro*) type=Astronomoy;; 868 astro*) type=Astronomy;;
823 bio*) type=Biology;; 869 bio*) type=Biology;;
824 calc*) type=Calculator;; 870 calc*) type=Calculator;;
825 chem*) type=Chemistry;; 871 chem*) type=Chemistry;;
826 geo*) type=Geology;; 872 geo*) type=Geology;;
827 math*) type=Math;; 873 math*) type=Math;;
859Exec=${exec} 905Exec=${exec}
860Path=${path} 906Path=${path}
861Icon=${icon} 907Icon=${icon}
862Categories=Application;${type};" > "${desktop}" 908Categories=Application;${type};" > "${desktop}"
863 909
910 (
911 # wrap the env here so that the 'insinto' call
912 # doesn't corrupt the env of the caller
864 insinto /usr/share/applications 913 insinto /usr/share/applications
865 doins "${desktop}" 914 doins "${desktop}"
866 915 )
867 return 0
868} 916}
869 917
870# Make a GDM/KDM Session file 918# Make a GDM/KDM Session file
871# 919#
872# make_desktop_entry(<title>, <command>) 920# make_desktop_entry(<title>, <command>)
901 doins "${i}" 949 doins "${i}"
902 elif [[ -d ${i} ]] ; then 950 elif [[ -d ${i} ]] ; then
903 for j in "${i}"/*.desktop ; do 951 for j in "${i}"/*.desktop ; do
904 doins "${j}" 952 doins "${j}"
905 done 953 done
906 fi 954 fi
907 done 955 done
908} 956}
909newmenu() { 957newmenu() {
910 insinto /usr/share/applications 958 insinto /usr/share/applications
911 newins "$1" "$2" 959 newins "$1" "$2"
919 doins "${i}" 967 doins "${i}"
920 elif [[ -d ${i} ]] ; then 968 elif [[ -d ${i} ]] ; then
921 for j in "${i}"/*.png ; do 969 for j in "${i}"/*.png ; do
922 doins "${j}" 970 doins "${j}"
923 done 971 done
924 fi 972 fi
925 done 973 done
926} 974}
927newicon() { 975newicon() {
928 insinto /usr/share/pixmaps 976 insinto /usr/share/pixmaps
929 newins "$1" "$2" 977 newins "$1" "$2"
934############################################################## 982##############################################################
935 983
936 984
937# for internal use only (unpack_pdv and unpack_makeself) 985# for internal use only (unpack_pdv and unpack_makeself)
938find_unpackable_file() { 986find_unpackable_file() {
939 local src="$1" 987 local src=$1
940 if [ -z "${src}" ] 988 if [[ -z ${src} ]] ; then
941 then
942 src="${DISTDIR}/${A}" 989 src=${DISTDIR}/${A}
943 else 990 else
944 if [ -e "${DISTDIR}/${src}" ] 991 if [[ -e ${DISTDIR}/${src} ]] ; then
945 then
946 src="${DISTDIR}/${src}" 992 src=${DISTDIR}/${src}
947 elif [ -e "${PWD}/${src}" ] 993 elif [[ -e ${PWD}/${src} ]] ; then
948 then
949 src="${PWD}/${src}" 994 src=${PWD}/${src}
950 elif [ -e "${src}" ] 995 elif [[ -e ${src} ]] ; then
951 then
952 src="${src}" 996 src=${src}
953 fi
954 fi 997 fi
955 [ ! -e "${src}" ] && die "Could not find requested archive ${src}" 998 fi
999 [[ ! -e ${src} ]] && return 1
956 echo "${src}" 1000 echo "${src}"
957} 1001}
958 1002
959# Unpack those pesky pdv generated files ... 1003# Unpack those pesky pdv generated files ...
960# They're self-unpacking programs with the binary package stuffed in 1004# They're self-unpacking programs with the binary package stuffed in
975# lseek 1019# lseek
976# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 1020# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
977# lseek(3, -4, SEEK_END) = 2981250 1021# lseek(3, -4, SEEK_END) = 2981250
978# thus we would pass in the value of '4' as the second parameter. 1022# thus we would pass in the value of '4' as the second parameter.
979unpack_pdv() { 1023unpack_pdv() {
980 local src="`find_unpackable_file $1`" 1024 local src=$(find_unpackable_file $1)
981 local sizeoff_t="$2" 1025 local sizeoff_t=$2
982 1026
1027 [[ -z ${src} ]] && die "Could not locate source for '$1'"
983 [ -z "${sizeoff_t}" ] && die "No idea what off_t size was used for this pdv :(" 1028 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :("
984 1029
985 local shrtsrc="`basename ${src}`" 1030 local shrtsrc=$(basename "${src}")
986 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1031 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
987 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1032 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"`
988 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"` 1033 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"`
989 1034
990 # grab metadata for debug reasons 1035 # grab metadata for debug reasons
1054# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1099# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1055# - If the file is not specified then unpack will utilize ${A}. 1100# - If the file is not specified then unpack will utilize ${A}.
1056# - If the offset is not specified then we will attempt to extract 1101# - If the offset is not specified then we will attempt to extract
1057# the proper offset from the script itself. 1102# the proper offset from the script itself.
1058unpack_makeself() { 1103unpack_makeself() {
1104 local src_input=${1:-${A}}
1059 local src="$(find_unpackable_file "$1")" 1105 local src=$(find_unpackable_file "${src_input}")
1060 local skip="$2" 1106 local skip=$2
1061 local exe="$3" 1107 local exe=$3
1062 1108
1109 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
1110
1063 local shrtsrc="$(basename "${src}")" 1111 local shrtsrc=$(basename "${src}")
1064 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1112 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1065 if [ -z "${skip}" ] 1113 if [[ -z ${skip} ]] ; then
1066 then
1067 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1114 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}')
1068 local skip=0 1115 local skip=0
1069 exe=tail 1116 exe=tail
1070 case ${ver} in 1117 case ${ver} in
1071 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same 1118 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same
1072 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1119 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1084 ;; 1131 ;;
1085 2.1.3) 1132 2.1.3)
1086 skip=`grep -a ^offset= "${src}" | awk '{print $3}'` 1133 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1087 let skip="skip + 1" 1134 let skip="skip + 1"
1088 ;; 1135 ;;
1089 2.1.4) 1136 2.1.4|2.1.5)
1090 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1) 1137 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1)
1091 skip=$(head -n ${skip} "${src}" | wc -c) 1138 skip=$(head -n ${skip} "${src}" | wc -c)
1092 exe="dd" 1139 exe="dd"
1093 ;; 1140 ;;
1094 *) 1141 *)
1139check_license() { 1186check_license() {
1140 local lic=$1 1187 local lic=$1
1141 if [ -z "${lic}" ] ; then 1188 if [ -z "${lic}" ] ; then
1142 lic="${PORTDIR}/licenses/${LICENSE}" 1189 lic="${PORTDIR}/licenses/${LICENSE}"
1143 else 1190 else
1144 if [ -e "${PORTDIR}/licenses/${src}" ] ; then 1191 if [ -e "${PORTDIR}/licenses/${lic}" ] ; then
1145 lic="${PORTDIR}/licenses/${src}" 1192 lic="${PORTDIR}/licenses/${lic}"
1146 elif [ -e "${PWD}/${src}" ] ; then 1193 elif [ -e "${PWD}/${lic}" ] ; then
1147 lic="${PWD}/${src}" 1194 lic="${PWD}/${lic}"
1148 elif [ -e "${src}" ] ; then 1195 elif [ -e "${lic}" ] ; then
1149 lic="${src}" 1196 lic="${lic}"
1150 fi
1151 fi 1197 fi
1198 fi
1152 [ ! -f "${lic}" ] && die "Could not find requested license ${src}" 1199 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1153 local l="`basename ${lic}`" 1200 local l="`basename ${lic}`"
1154 1201
1155 # here is where we check for the licenses the user already 1202 # here is where we check for the licenses the user already
1156 # accepted ... if we don't find a match, we make the user accept 1203 # accepted ... if we don't find a match, we make the user accept
1157 local shopts=$- 1204 local shopts=$-
1213 # first we figure out how many cds we're dealing with by 1260 # first we figure out how many cds we're dealing with by
1214 # the # of files they gave us 1261 # the # of files they gave us
1215 local cdcnt=0 1262 local cdcnt=0
1216 local f= 1263 local f=
1217 for f in "$@" ; do 1264 for f in "$@" ; do
1218 cdcnt=$((cdcnt + 1)) 1265 ((++cdcnt))
1219 export CDROM_CHECK_${cdcnt}="$f" 1266 export CDROM_CHECK_${cdcnt}="$f"
1220 done 1267 done
1221 export CDROM_TOTAL_CDS=${cdcnt} 1268 export CDROM_TOTAL_CDS=${cdcnt}
1222 export CDROM_CURRENT_CD=1 1269 export CDROM_CURRENT_CD=1
1223 1270
1224 # now we see if the user gave use CD_ROOT ... 1271 # now we see if the user gave use CD_ROOT ...
1225 # if they did, let's just believe them that it's correct 1272 # if they did, let's just believe them that it's correct
1226 if [[ ! -z ${CD_ROOT} ]] ; then
1227 export CDROM_ROOT=${CD_ROOT}
1228 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1229 return
1230 fi
1231 # do the same for CD_ROOT_X
1232 if [[ ! -z ${CD_ROOT_1} ]] ; then 1273 if [[ -n ${CD_ROOT}${CD_ROOT_1} ]] ; then
1233 local var= 1274 local var=
1234 cdcnt=0 1275 cdcnt=0
1235 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1276 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1236 cdcnt=$((cdcnt + 1)) 1277 ((++cdcnt))
1237 var="CD_ROOT_${cdcnt}" 1278 var="CD_ROOT_${cdcnt}"
1279 [[ -z ${!var} ]] && var="CD_ROOT"
1238 if [[ -z ${!var} ]] ; then 1280 if [[ -z ${!var} ]] ; then
1239 eerror "You must either use just the CD_ROOT" 1281 eerror "You must either use just the CD_ROOT"
1240 eerror "or specify ALL the CD_ROOT_X variables." 1282 eerror "or specify ALL the CD_ROOT_X variables."
1241 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables." 1283 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables."
1242 die "could not locate CD_ROOT_${cdcnt}" 1284 die "could not locate CD_ROOT_${cdcnt}"
1243 fi 1285 fi
1244 export CDROM_ROOTS_${cdcnt}="${!var}"
1245 done 1286 done
1246 export CDROM_ROOT=${CDROM_ROOTS_1} 1287 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}}
1247 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1288 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1289 export CDROM_SET=-1
1290 for f in ${CDROM_CHECK_1//:/ } ; do
1291 ((++CDROM_SET))
1292 [[ -e ${CD_ROOT}/${f} ]] && break
1293 done
1294 export CDROM_MATCH=${f}
1248 return 1295 return
1249 fi 1296 fi
1250 1297
1298 # User didn't help us out so lets make sure they know they can
1299 # simplify the whole process ...
1251 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1300 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1252 einfon "This ebuild will need the " 1301 einfo "This ebuild will need the ${CDROM_NAME:-cdrom for ${PN}}"
1253 if [[ -z ${CDROM_NAME} ]] ; then
1254 echo "cdrom for ${PN}."
1255 else
1256 echo "${CDROM_NAME}."
1257 fi
1258 echo 1302 echo
1259 einfo "If you do not have the CD, but have the data files" 1303 einfo "If you do not have the CD, but have the data files"
1260 einfo "mounted somewhere on your filesystem, just export" 1304 einfo "mounted somewhere on your filesystem, just export"
1261 einfo "the variable CD_ROOT so that it points to the" 1305 einfo "the variable CD_ROOT so that it points to the"
1262 einfo "directory containing the files." 1306 einfo "directory containing the files."
1266 echo 1310 echo
1267 else 1311 else
1268 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1312 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1269 cdcnt=0 1313 cdcnt=0
1270 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1314 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1271 cdcnt=$((cdcnt + 1)) 1315 ((++cdcnt))
1272 var="CDROM_NAME_${cdcnt}" 1316 var="CDROM_NAME_${cdcnt}"
1273 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}" 1317 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}"
1274 done 1318 done
1275 echo 1319 echo
1276 einfo "If you do not have the CDs, but have the data files" 1320 einfo "If you do not have the CDs, but have the data files"
1277 einfo "mounted somewhere on your filesystem, just export" 1321 einfo "mounted somewhere on your filesystem, just export"
1278 einfo "the following variables so they point to the right place:" 1322 einfo "the following variables so they point to the right place:"
1279 einfon "" 1323 einfon ""
1280 cdcnt=0 1324 cdcnt=0
1281 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1325 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1282 cdcnt=$((cdcnt + 1)) 1326 ((++cdcnt))
1283 echo -n " CD_ROOT_${cdcnt}" 1327 echo -n " CD_ROOT_${cdcnt}"
1284 done 1328 done
1285 echo 1329 echo
1286 einfo "Or, if you have all the files in the same place, or" 1330 einfo "Or, if you have all the files in the same place, or"
1287 einfo "you only have one cdrom, you can export CD_ROOT" 1331 einfo "you only have one cdrom, you can export CD_ROOT"
1290 echo 1334 echo
1291 einfo "For example:" 1335 einfo "For example:"
1292 einfo "export CD_ROOT_1=/mnt/cdrom" 1336 einfo "export CD_ROOT_1=/mnt/cdrom"
1293 echo 1337 echo
1294 fi 1338 fi
1339
1340 export CDROM_SET=""
1295 export CDROM_CURRENT_CD=0 1341 export CDROM_CURRENT_CD=0
1296 cdrom_load_next_cd 1342 cdrom_load_next_cd
1297} 1343}
1298 1344
1299# this is only used when you need access to more than one cd. 1345# this is only used when you need access to more than one cd.
1300# when you have finished using the first cd, just call this function. 1346# when you have finished using the first cd, just call this function.
1301# when it returns, CDROM_ROOT will be pointing to the second cd. 1347# when it returns, CDROM_ROOT will be pointing to the second cd.
1302# remember, you can only go forward in the cd chain, you can't go back. 1348# remember, you can only go forward in the cd chain, you can't go back.
1303cdrom_load_next_cd() { 1349cdrom_load_next_cd() {
1304 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1305 local var= 1350 local var
1306 1351 ((++CDROM_CURRENT_CD))
1307 if [[ ! -z ${CD_ROOT} ]] ; then
1308 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}"
1309 return
1310 fi
1311 1352
1312 unset CDROM_ROOT 1353 unset CDROM_ROOT
1313 var=CDROM_ROOTS_${CDROM_CURRENT_CD} 1354 var=CD_ROOT_${CDROM_CURRENT_CD}
1355 [[ -z ${!var} ]] && var="CD_ROOT"
1314 if [[ -z ${!var} ]] ; then 1356 if [[ -z ${!var} ]] ; then
1315 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1357 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1316 cdrom_locate_file_on_cd ${!var} 1358 _cdrom_locate_file_on_cd ${!var}
1317 else 1359 else
1318 export CDROM_ROOT=${!var} 1360 export CDROM_ROOT=${!var}
1319 fi 1361 fi
1320 1362
1321 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1363 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1326# all it does is try to locate a give file on a cd ... if the cd isn't 1368# all it does is try to locate a give file on a cd ... if the cd isn't
1327# found, then a message asking for the user to insert the cdrom will be 1369# found, then a message asking for the user to insert the cdrom will be
1328# displayed and we'll hang out here until: 1370# displayed and we'll hang out here until:
1329# (1) the file is found on a mounted cdrom 1371# (1) the file is found on a mounted cdrom
1330# (2) the user hits CTRL+C 1372# (2) the user hits CTRL+C
1331cdrom_locate_file_on_cd() { 1373_cdrom_locate_file_on_cd() {
1374 local mline=""
1375 local showedmsg=0
1376
1332 while [[ -z ${CDROM_ROOT} ]] ; do 1377 while [[ -z ${CDROM_ROOT} ]] ; do
1378 local i=0
1379 local -a cdset=(${*//:/ })
1380 if [[ -n ${CDROM_SET} ]] ; then
1381 cdset=(${cdset[${CDROM_SET}]})
1382 fi
1383
1384 while [[ -n ${cdset[${i}]} ]] ; do
1333 local dir="$(dirname ${@})" 1385 local dir=$(dirname ${cdset[${i}]})
1334 local file="$(basename ${@})" 1386 local file=$(basename ${cdset[${i}]})
1335 local mline=""
1336 local showedmsg=0
1337 1387
1338 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do 1388 for mline in $(mount | gawk '/(iso|cdrom|fs=cdfss)/ {print $3}') ; do
1339 [[ -d ${mline}/${dir} ]] || continue 1389 [[ -d ${mline}/${dir} ]] || continue
1340 [[ ! -z $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] \ 1390 if [[ -n $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] ; then
1341 && export CDROM_ROOT=${mline} 1391 export CDROM_ROOT=${mline}
1392 export CDROM_SET=${i}
1393 export CDROM_MATCH=${cdset[${i}]}
1394 return
1395 fi
1396 done
1397
1398 ((++i))
1342 done 1399 done
1343 1400
1344 if [[ -z ${CDROM_ROOT} ]] ; then
1345 echo 1401 echo
1346 if [[ ${showedmsg} -eq 0 ]] ; then 1402 if [[ ${showedmsg} -eq 0 ]] ; then
1347 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1403 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1348 if [[ -z ${CDROM_NAME} ]] ; then 1404 if [[ -z ${CDROM_NAME} ]] ; then
1349 einfo "Please insert the cdrom for ${PN} now !" 1405 einfo "Please insert+mount the cdrom for ${PN} now !"
1350 else
1351 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1352 fi
1353 else 1406 else
1354 if [[ -z ${CDROM_NAME_1} ]] ; then
1355 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !"
1356 else
1357 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1358 einfo "Please insert+mount the ${!var} cdrom now !" 1407 einfo "Please insert+mount the ${CDROM_NAME} cdrom now !"
1359 fi
1360 fi 1408 fi
1361 showedmsg=1 1409 else
1410 if [[ -z ${CDROM_NAME_1} ]] ; then
1411 einfo "Please insert+mount cd #${CDROM_CURRENT_CD} for ${PN} now !"
1412 else
1413 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1414 einfo "Please insert+mount the ${!var} cdrom now !"
1415 fi
1362 fi 1416 fi
1417 showedmsg=1
1418 fi
1363 einfo "Press return to scan for the cd again" 1419 einfo "Press return to scan for the cd again"
1364 einfo "or hit CTRL+C to abort the emerge." 1420 einfo "or hit CTRL+C to abort the emerge."
1365 echo 1421 echo
1366 einfo "If you are having trouble with the detection" 1422 einfo "If you are having trouble with the detection"
1367 einfo "of your CD, it is possible that you do not have" 1423 einfo "of your CD, it is possible that you do not have"
1368 einfo "Joliet support enabled in your kernel. Please" 1424 einfo "Joliet support enabled in your kernel. Please"
1369 einfo "check that CONFIG_JOLIET is enabled in your kernel." 1425 einfo "check that CONFIG_JOLIET is enabled in your kernel."
1370 read 1426 read || die "something is screwed with your system"
1371 fi
1372 done 1427 done
1373} 1428}
1374 1429
1375# Make sure that LINGUAS only contains languages that 1430# Make sure that LINGUAS only contains languages that
1376# a package can support 1431# a package can support
1386# directories and uses the union of the lists. 1441# directories and uses the union of the lists.
1387strip-linguas() { 1442strip-linguas() {
1388 local ls newls 1443 local ls newls
1389 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then 1444 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1390 local op=$1; shift 1445 local op=$1; shift
1391 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1446 ls=" $(find "$1" -name '*.po' -exec basename {} \;) "; shift
1392 local d f 1447 local d f
1393 for d in "$@" ; do 1448 for d in "$@" ; do
1394 if [[ ${op} == "-u" ]] ; then 1449 if [[ ${op} == "-u" ]] ; then
1395 newls=${ls} 1450 newls=${ls}
1396 else 1451 else
1397 newls="" 1452 newls=""
1398 fi 1453 fi
1399 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1454 for f in $(find "$d" -name '*.po' -exec basename {} \;) ; do
1400 if [[ ${op} == "-i" ]] ; then 1455 if [[ ${op} == "-i" ]] ; then
1401 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}" 1456 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}"
1402 else 1457 else
1403 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}" 1458 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}"
1404 fi 1459 fi
1460 1515
1461# Jeremy Huddleston <eradicator@gentoo.org>: 1516# Jeremy Huddleston <eradicator@gentoo.org>:
1462# preserve_old_lib /path/to/libblah.so.0 1517# preserve_old_lib /path/to/libblah.so.0
1463# preserve_old_lib_notify /path/to/libblah.so.0 1518# preserve_old_lib_notify /path/to/libblah.so.0
1464# 1519#
1465# These functions are useful when a lib in your package changes --soname. Such 1520# These functions are useful when a lib in your package changes --library. Such
1466# an example might be from libogg.so.0 to libogg.so.1. Removing libogg.so.0 1521# an example might be from libogg.so.0 to libogg.so.1. Removing libogg.so.0
1467# would break packages that link against it. Most people get around this 1522# would break packages that link against it. Most people get around this
1468# by using the portage SLOT mechanism, but that is not always a relevant 1523# by using the portage SLOT mechanism, but that is not always a relevant
1469# solution, so instead you can add the following to your ebuilds: 1524# solution, so instead you can add the following to your ebuilds:
1470# 1525#
1497 LIB=$1 1552 LIB=$1
1498 1553
1499 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1554 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1500 SONAME=`basename ${LIB}` 1555 SONAME=`basename ${LIB}`
1501 1556
1502 einfo "An old version of an installed library was detected on your system." 1557 ewarn "An old version of an installed library was detected on your system."
1503 einfo "In order to avoid breaking packages that link against it, this older version" 1558 ewarn "In order to avoid breaking packages that link against it, this older version"
1504 einfo "is not being removed. In order to make full use of this newer version," 1559 ewarn "is not being removed. In order to make full use of this newer version,"
1505 einfo "you will need to execute the following command:" 1560 ewarn "you will need to execute the following command:"
1506 einfo " revdep-rebuild --soname ${SONAME}" 1561 ewarn " revdep-rebuild --library ${SONAME}"
1507 einfo 1562 ewarn
1508 einfo "After doing that, you can safely remove ${LIB}" 1563 ewarn "After doing that, you can safely remove ${LIB}"
1509 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild" 1564 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1510 fi 1565 fi
1511} 1566}
1512 1567
1513# Hack for people to figure out if a package was built with 1568# Hack for people to figure out if a package was built with
1514# certain USE flags 1569# certain USE flags
1524 [[ ${opt:0:1} = "-" ]] && shift || opt="-a" 1579 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1525 1580
1526 local PKG=$(best_version $1) 1581 local PKG=$(best_version $1)
1527 shift 1582 shift
1528 1583
1529 local USEFILE="${ROOT}/var/db/pkg/${PKG}/USE" 1584 local USEFILE=${ROOT}/var/db/pkg/${PKG}/USE
1585
1586 # if the USE file doesnt exist, assume the $PKG is either
1587 # injected or package.provided
1530 [[ ! -e ${USEFILE} ]] && return 1 1588 [[ ! -e ${USEFILE} ]] && return 0
1531 1589
1532 local USE_BUILT=$(<${USEFILE}) 1590 local USE_BUILT=$(<${USEFILE})
1533 while [[ $# -gt 0 ]] ; do 1591 while [[ $# -gt 0 ]] ; do
1534 if [[ ${opt} = "-o" ]] ; then 1592 if [[ ${opt} = "-o" ]] ; then
1535 has $1 ${USE_BUILT} && return 0 1593 has $1 ${USE_BUILT} && return 0
1587# $4 == extra LD_LIBRARY_PATH's (make it : delimited) 1645# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1588# $5 == path for wrapper 1646# $5 == path for wrapper
1589make_wrapper() { 1647make_wrapper() {
1590 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5 1648 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1591 local tmpwrapper=$(emktemp) 1649 local tmpwrapper=$(emktemp)
1650 # We don't want to quote ${bin} so that people can pass complex
1651 # things as $bin ... "./someprog --args"
1592 cat << EOF > "${tmpwrapper}" 1652 cat << EOF > "${tmpwrapper}"
1593#!/bin/sh 1653#!/bin/sh
1594cd "${chdir}" 1654cd "${chdir:-.}"
1655if [ -n "${libdir}" ] ; then
1656 if [ "\${LD_LIBRARY_PATH+set}" = "set" ] ; then
1595export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}" 1657 export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1658 else
1659 export LD_LIBRARY_PATH="${libdir}"
1660 fi
1661fi
1596exec ${bin} "\$@" 1662exec ${bin} "\$@"
1597EOF 1663EOF
1598 chmod go+rx "${tmpwrapper}" 1664 chmod go+rx "${tmpwrapper}"
1599 if [ -n "${5}" ] 1665 if [[ -n ${path} ]] ; then
1600 then
1601 exeinto ${5} 1666 exeinto "${path}"
1602 newexe "${tmpwrapper}" "${wrapper}" 1667 newexe "${tmpwrapper}" "${wrapper}"
1603 else 1668 else
1604 newbin "${tmpwrapper}" "${wrapper}" 1669 newbin "${tmpwrapper}" "${wrapper}"
1605 fi 1670 fi
1606} 1671}

Legend:
Removed from v.1.186  
changed lines
  Added in v.1.228

  ViewVC Help
Powered by ViewVC 1.1.20