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

Diff of /eclass/eutils.eclass

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

Revision 1.187 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.187 2005/07/06 20:23:20 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
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
71 /* GNU ld script 71 /* GNU ld script
72 Since Gentoo has critical dynamic libraries 72 Since Gentoo has critical dynamic libraries
73 in /lib, and the static versions in /usr/lib, 73 in /lib, and the static versions in /usr/lib,
74 we need to have a "fake" dynamic lib in /usr/lib, 74 we need to have a "fake" dynamic lib in /usr/lib,
75 otherwise we run into linking problems. 75 otherwise we run into linking problems.
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 # 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 ]] ; }
171 local PIPE_CMD="" 164 local PIPE_CMD=""
172 local STDERR_TARGET="${T}/$$.out" 165 local STDERR_TARGET="${T}/$$.out"
173 local PATCH_TARGET="${T}/$$.patch" 166 local PATCH_TARGET="${T}/$$.patch"
174 local PATCH_SUFFIX="" 167 local PATCH_SUFFIX=""
175 local SINGLE_PATCH="no" 168 local SINGLE_PATCH="no"
176 local x="" 169 local x=""
170
171 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402
177 172
178 if [ "$#" -gt 1 ] 173 if [ "$#" -gt 1 ]
179 then 174 then
180 local m="" 175 local m=""
181 for m in "$@" ; do 176 for m in "$@" ; do
282 277
283 # Allow for prefix to differ ... im lazy, so shoot me :/ 278 # Allow for prefix to differ ... im lazy, so shoot me :/
284 while [ "${count}" -lt 5 ] 279 while [ "${count}" -lt 5 ]
285 do 280 do
286 # Generate some useful debug info ... 281 # Generate some useful debug info ...
287 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 282 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
288 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 283 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
289 284
290 if [ "${PATCH_SUFFIX}" != "patch" ] 285 if [ "${PATCH_SUFFIX}" != "patch" ]
291 then 286 then
292 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 287 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
297 292
298 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 293 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
299 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##*/}
300 295
301 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 296 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
302 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 297 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
303 298
304 if [ "${PATCH_SUFFIX}" != "patch" ] 299 if [ "${PATCH_SUFFIX}" != "patch" ]
305 then 300 then
306 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
307 then 302 then
311 count=5 306 count=5
312 break 307 break
313 fi 308 fi
314 fi 309 fi
315 310
316 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
317 then 312 then
318 draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 313 _epatch_draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
319 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 314 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
320 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 315 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
321 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 316 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
322 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 317 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
323 318
324 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
325 321
326 if [ "$?" -ne 0 ] 322 if [ "$?" -ne 0 ]
327 then 323 then
328 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##*/}
329 echo 325 echo
375# vapier@gentoo.org 371# vapier@gentoo.org
376# 372#
377# Takes just 1 optional parameter (the directory to create tmpfile in) 373# Takes just 1 optional parameter (the directory to create tmpfile in)
378emktemp() { 374emktemp() {
379 local exe="touch" 375 local exe="touch"
380 [ "$1" == "-d" ] && exe="mkdir" && shift 376 [[ $1 == -d ]] && exe="mkdir" && shift
381 local topdir="$1" 377 local topdir=$1
382 378
383 if [ -z "${topdir}" ] 379 if [[ -z ${topdir} ]] ; then
384 then
385 [ -z "${T}" ] \ 380 [[ -z ${T} ]] \
386 && topdir="/tmp" \ 381 && topdir="/tmp" \
387 || topdir="${T}" 382 || topdir=${T}
388 fi 383 fi
389 384
390 if [ -z "$(type -p mktemp)" ] 385 if [[ -z $(type -p mktemp) ]] ; then
391 then
392 local tmp=/ 386 local tmp=/
393 while [ -e "${tmp}" ] ; do 387 while [[ -e ${tmp} ]] ; do
394 tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}" 388 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}
395 done 389 done
396 ${exe} "${tmp}" 390 ${exe} "${tmp}" || ${exe} -p "${tmp}"
397 echo "${tmp}" 391 echo "${tmp}"
398 else 392 else
399 [ "${exe}" == "touch" ] \ 393 if [[ ${exe} == "touch" ]] ; then
400 && exe="-p" \ 394 [[ ${USERLAND} == "GNU" ]] \
401 || exe="-d" 395 && mktemp -p "${topdir}" \
402 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
403 fi 402 fi
404} 403}
405 404
406# Small wrapper for getent (Linux), nidump (Mac OS X), 405# Small wrapper for getent (Linux), nidump (Mac OS X),
407# and pw (FreeBSD) used in enewuser()/enewgroup() 406# and pw (FreeBSD) used in enewuser()/enewgroup()
408# Joe Jezak <josejx@gmail.com> and usata@gentoo.org 407# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
409# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org> 408# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
410# 409#
411# egetent(database, key) 410# egetent(database, key)
412egetent() { 411egetent() {
413 if [[ "${USERLAND}" == "Darwin" ]] ; then 412 case ${CHOST} in
413 *-darwin*)
414 case "$2" in 414 case "$2" in
415 *[!0-9]*) # Non numeric 415 *[!0-9]*) # Non numeric
416 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 416 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
417 ;; 417 ;;
418 *) # Numeric 418 *) # Numeric
419 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 419 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
420 ;; 420 ;;
421 esac 421 esac
422 elif [[ "${USERLAND}" == "BSD" ]] ; then 422 ;;
423 local action 423 *-freebsd*|*-dragonfly*)
424 if [ "$1" == "passwd" ] 424 local opts action="user"
425 then 425 [[ $1 == "passwd" ]] || action="group"
426 action="user" 426
427 else 427 # lookup by uid/gid
428 action="group" 428 if [[ $2 == [[:digit:]]* ]] ; then
429 [[ ${action} == "user" ]] && opts="-u" || opts="-g"
429 fi 430 fi
431
430 pw show "${action}" "$2" -q 432 pw show ${action} ${opts} "$2" -q
431 else 433 ;;
434 *-netbsd*|*-openbsd*)
435 grep "$2:\*:" /etc/$1
436 ;;
437 *)
432 which nscd >& /dev/null && nscd -i "$1" 438 type -p nscd >& /dev/null && nscd -i "$1"
433 getent "$1" "$2" 439 getent "$1" "$2"
434 fi 440 ;;
441 esac
435} 442}
436 443
437# Simplify/standardize adding users to the system 444# Simplify/standardize adding users to the system
438# vapier@gentoo.org 445# vapier@gentoo.org
439# 446#
477 fi 484 fi
478 else 485 else
479 euid="next" 486 euid="next"
480 fi 487 fi
481 if [[ ${euid} == "next" ]] ; then 488 if [[ ${euid} == "next" ]] ; then
482 local pwrange 489 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 490 [[ -z $(egetent passwd ${euid}) ]] && break
490 done 491 done
491 fi 492 fi
492 opts="${opts} -u ${euid}" 493 opts="${opts} -u ${euid}"
493 einfo " - Userid: ${euid}" 494 einfo " - Userid: ${euid}"
494 495
495 # handle shell 496 # handle shell
496 local eshell=$1; shift 497 local eshell=$1; shift
497 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then 498 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
498 if [[ ! -e ${eshell} ]] ; then 499 if [[ ! -e ${ROOT}${eshell} ]] ; then
499 eerror "A shell was specified but it does not exist !" 500 eerror "A shell was specified but it does not exist !"
500 die "${eshell} does not exist" 501 die "${eshell} does not exist in ${ROOT}"
501 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
502 else 507 else
503 case ${USERLAND} in 508 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do
504 Darwin) eshell="/usr/bin/false";; 509 [[ -x ${ROOT}${shell} ]] && break
505 BSD) eshell="/usr/sbin/nologin";; 510 done
506 *) eshell="/bin/false";; 511
507 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}
508 fi 518 fi
509 einfo " - Shell: ${eshell}" 519 einfo " - Shell: ${eshell}"
510 opts="${opts} -s ${eshell}" 520 opts="${opts} -s ${eshell}"
511 521
512 # handle homedir 522 # handle homedir
549 einfo " - Groups: ${egroups}" 559 einfo " - Groups: ${egroups}"
550 560
551 # handle extra and add the user 561 # handle extra and add the user
552 local oldsandbox=${SANDBOX_ON} 562 local oldsandbox=${SANDBOX_ON}
553 export SANDBOX_ON="0" 563 export SANDBOX_ON="0"
554 case ${USERLAND} in 564 case ${CHOST} in
555 Darwin) 565 *-darwin*)
556 ### Make the user 566 ### Make the user
557 if [[ -z $@ ]] ; then 567 if [[ -z $@ ]] ; then
558 dscl . create /users/${euser} uid ${euid} 568 dscl . create /users/${euser} uid ${euid}
559 dscl . create /users/${euser} shell ${eshell} 569 dscl . create /users/${euser} shell ${eshell}
560 dscl . create /users/${euser} home ${ehome} 570 dscl . create /users/${euser} home ${ehome}
571 einfo "Please report the ebuild along with the info below" 581 einfo "Please report the ebuild along with the info below"
572 einfo "eextra: $@" 582 einfo "eextra: $@"
573 die "Required function missing" 583 die "Required function missing"
574 fi 584 fi
575 ;; 585 ;;
576 BSD) 586 *-freebsd*|*-dragonfly*)
577 if [[ -z $@ ]] ; then 587 if [[ -z $@ ]] ; then
578 pw useradd ${euser} ${opts} \ 588 pw useradd ${euser} ${opts} \
579 -c "added by portage for ${PN}" \ 589 -c "added by portage for ${PN}" \
580 die "enewuser failed" 590 die "enewuser failed"
581 else 591 else
582 einfo " - Extra: $@" 592 einfo " - Extra: $@"
583 pw useradd ${euser} ${opts} \ 593 pw useradd ${euser} ${opts} \
584 "$@" || die "enewuser failed" 594 "$@" || die "enewuser failed"
585 fi 595 fi
586 ;; 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
587 *) 620 *)
588 if [[ -z $@ ]] ; then 621 if [[ -z $@ ]] ; then
589 useradd ${opts} ${euser} \ 622 useradd ${opts} ${euser} \
590 -c "added by portage for ${PN}" \ 623 -c "added by portage for ${PN}" \
591 || die "enewuser failed" 624 || die "enewuser failed"
594 useradd ${opts} ${euser} "$@" \ 627 useradd ${opts} ${euser} "$@" \
595 || die "enewuser failed" 628 || die "enewuser failed"
596 fi 629 fi
597 ;; 630 ;;
598 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
599 export SANDBOX_ON=${oldsandbox} 640 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} 641}
609 642
610# Simplify/standardize adding groups to the system 643# Simplify/standardize adding groups to the system
611# vapier@gentoo.org 644# vapier@gentoo.org
612# 645#
641 then 674 then
642 if [ "${egid}" -gt 0 ] 675 if [ "${egid}" -gt 0 ]
643 then 676 then
644 if [ -z "`egetent group ${egid}`" ] 677 if [ -z "`egetent group ${egid}`" ]
645 then 678 then
646 if [[ "${USERLAND}" == "Darwin" ]]; then 679 if [[ "${CHOST}" == *-darwin* ]]; then
647 opts="${opts} ${egid}" 680 opts="${opts} ${egid}"
648 else 681 else
649 opts="${opts} -g ${egid}" 682 opts="${opts} -g ${egid}"
650 fi 683 fi
651 else 684 else
665 opts="${opts} ${eextra}" 698 opts="${opts} ${eextra}"
666 699
667 # add the group 700 # add the group
668 local oldsandbox="${SANDBOX_ON}" 701 local oldsandbox="${SANDBOX_ON}"
669 export SANDBOX_ON="0" 702 export SANDBOX_ON="0"
670 if [[ "${USERLAND}" == "Darwin" ]]; then 703 case ${CHOST} in
704 *-darwin*)
671 if [ ! -z "${eextra}" ]; 705 if [ ! -z "${eextra}" ];
672 then 706 then
673 einfo "Extra options are not supported on Darwin/OS X yet" 707 einfo "Extra options are not supported on Darwin/OS X yet"
674 einfo "Please report the ebuild along with the info below" 708 einfo "Please report the ebuild along with the info below"
675 einfo "eextra: ${eextra}" 709 einfo "eextra: ${eextra}"
676 die "Required function missing" 710 die "Required function missing"
677 fi 711 fi
678 712
679 # If we need the next available 713 # If we need the next available
680 case ${egid} in 714 case ${egid} in
681 *[!0-9]*) # Non numeric 715 *[!0-9]*) # Non numeric
682 for egid in `jot 898 101`; do 716 for egid in $(seq 101 999); do
683 [ -z "`egetent group ${egid}`" ] && break 717 [ -z "`egetent group ${egid}`" ] && break
684 done 718 done
685 esac 719 esac
686 dscl . create /groups/${egroup} gid ${egid} 720 dscl . create /groups/${egroup} gid ${egid}
687 dscl . create /groups/${egroup} passwd '*' 721 dscl . create /groups/${egroup} passwd '*'
688 elif [[ "${USERLAND}" == "BSD" ]] ; then 722 ;;
723
724 *-freebsd*|*-dragonfly*)
689 case ${egid} in 725 case ${egid} in
690 *[!0-9]*) # Non numeric 726 *[!0-9]*) # Non numeric
691 for egid in `jot 898 101`; do 727 for egid in $(seq 101 999); do
692 [ -z "`egetent group ${egid}`" ] && break 728 [ -z "`egetent group ${egid}`" ] && break
693 done 729 done
694 esac 730 esac
695 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 731 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
696 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 *)
697 groupadd ${opts} ${egroup} || die "enewgroup failed" 745 groupadd ${opts} ${egroup} || die "enewgroup failed"
698 fi 746 ;;
747 esac
699 export SANDBOX_ON="${oldsandbox}" 748 export SANDBOX_ON="${oldsandbox}"
700} 749}
701 750
702# Simple script to replace 'dos2unix' binaries 751# Simple script to replace 'dos2unix' binaries
703# vapier@gentoo.org 752# vapier@gentoo.org
728# name: the name that will show up in the menu 777# name: the name that will show up in the menu
729# icon: give your little like a pretty little icon ... 778# icon: give your little like a pretty little icon ...
730# this can be relative (to /usr/share/pixmaps) or 779# this can be relative (to /usr/share/pixmaps) or
731# a full path to an icon 780# a full path to an icon
732# type: what kind of application is this ? for categories: 781# type: what kind of application is this ? for categories:
733# http://www.freedesktop.org/wiki/Standards_2fmenu_2dspec 782# http://www.freedesktop.org/Standards/desktop-entry-spec
734# path: if your app needs to startup in a specific dir 783# path: if your app needs to startup in a specific dir
735make_desktop_entry() { 784make_desktop_entry() {
736 [[ -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
737 786
738 local exec=${1} 787 local exec=${1}
764 dev) 813 dev)
765 type="Development" 814 type="Development"
766 ;; 815 ;;
767 816
768 games) 817 games)
769 [[ -z ${path} ]] && path=${GAMES_BINDIR}
770
771 case ${catmin} in 818 case ${catmin} in
772 action) type=ActionGame;; 819 action) type=ActionGame;;
773 arcade) type=ArcadeGame;; 820 arcade) type=ArcadeGame;;
774 board) type=BoardGame;; 821 board) type=BoardGame;;
775 kid) type=KidsGame;; 822 kid) type=KidsGame;;
816 type="Network;${type}" 863 type="Network;${type}"
817 ;; 864 ;;
818 865
819 sci) 866 sci)
820 case ${catmin} in 867 case ${catmin} in
821 astro*) type=Astronomoy;; 868 astro*) type=Astronomy;;
822 bio*) type=Biology;; 869 bio*) type=Biology;;
823 calc*) type=Calculator;; 870 calc*) type=Calculator;;
824 chem*) type=Chemistry;; 871 chem*) type=Chemistry;;
825 geo*) type=Geology;; 872 geo*) type=Geology;;
826 math*) type=Math;; 873 math*) type=Math;;
858Exec=${exec} 905Exec=${exec}
859Path=${path} 906Path=${path}
860Icon=${icon} 907Icon=${icon}
861Categories=Application;${type};" > "${desktop}" 908Categories=Application;${type};" > "${desktop}"
862 909
910 (
911 # wrap the env here so that the 'insinto' call
912 # doesn't corrupt the env of the caller
863 insinto /usr/share/applications 913 insinto /usr/share/applications
864 doins "${desktop}" 914 doins "${desktop}"
865 915 )
866 return 0
867} 916}
868 917
869# Make a GDM/KDM Session file 918# Make a GDM/KDM Session file
870# 919#
871# make_desktop_entry(<title>, <command>) 920# make_desktop_entry(<title>, <command>)
900 doins "${i}" 949 doins "${i}"
901 elif [[ -d ${i} ]] ; then 950 elif [[ -d ${i} ]] ; then
902 for j in "${i}"/*.desktop ; do 951 for j in "${i}"/*.desktop ; do
903 doins "${j}" 952 doins "${j}"
904 done 953 done
905 fi 954 fi
906 done 955 done
907} 956}
908newmenu() { 957newmenu() {
909 insinto /usr/share/applications 958 insinto /usr/share/applications
910 newins "$1" "$2" 959 newins "$1" "$2"
918 doins "${i}" 967 doins "${i}"
919 elif [[ -d ${i} ]] ; then 968 elif [[ -d ${i} ]] ; then
920 for j in "${i}"/*.png ; do 969 for j in "${i}"/*.png ; do
921 doins "${j}" 970 doins "${j}"
922 done 971 done
923 fi 972 fi
924 done 973 done
925} 974}
926newicon() { 975newicon() {
927 insinto /usr/share/pixmaps 976 insinto /usr/share/pixmaps
928 newins "$1" "$2" 977 newins "$1" "$2"
933############################################################## 982##############################################################
934 983
935 984
936# for internal use only (unpack_pdv and unpack_makeself) 985# for internal use only (unpack_pdv and unpack_makeself)
937find_unpackable_file() { 986find_unpackable_file() {
938 local src="$1" 987 local src=$1
939 if [ -z "${src}" ] 988 if [[ -z ${src} ]] ; then
940 then
941 src="${DISTDIR}/${A}" 989 src=${DISTDIR}/${A}
942 else 990 else
943 if [ -e "${DISTDIR}/${src}" ] 991 if [[ -e ${DISTDIR}/${src} ]] ; then
944 then
945 src="${DISTDIR}/${src}" 992 src=${DISTDIR}/${src}
946 elif [ -e "${PWD}/${src}" ] 993 elif [[ -e ${PWD}/${src} ]] ; then
947 then
948 src="${PWD}/${src}" 994 src=${PWD}/${src}
949 elif [ -e "${src}" ] 995 elif [[ -e ${src} ]] ; then
950 then
951 src="${src}" 996 src=${src}
952 fi
953 fi 997 fi
954 [ ! -e "${src}" ] && die "Could not find requested archive ${src}" 998 fi
999 [[ ! -e ${src} ]] && return 1
955 echo "${src}" 1000 echo "${src}"
956} 1001}
957 1002
958# Unpack those pesky pdv generated files ... 1003# Unpack those pesky pdv generated files ...
959# They're self-unpacking programs with the binary package stuffed in 1004# They're self-unpacking programs with the binary package stuffed in
974# lseek 1019# lseek
975# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 1020# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
976# lseek(3, -4, SEEK_END) = 2981250 1021# lseek(3, -4, SEEK_END) = 2981250
977# 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.
978unpack_pdv() { 1023unpack_pdv() {
979 local src="`find_unpackable_file $1`" 1024 local src=$(find_unpackable_file $1)
980 local sizeoff_t="$2" 1025 local sizeoff_t=$2
981 1026
1027 [[ -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 :(" 1028 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :("
983 1029
984 local shrtsrc="`basename ${src}`" 1030 local shrtsrc=$(basename "${src}")
985 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1031 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
986 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1032 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\"` 1033 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"`
988 1034
989 # grab metadata for debug reasons 1035 # grab metadata for debug reasons
1053# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1099# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1054# - If the file is not specified then unpack will utilize ${A}. 1100# - If the file is not specified then unpack will utilize ${A}.
1055# - 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
1056# the proper offset from the script itself. 1102# the proper offset from the script itself.
1057unpack_makeself() { 1103unpack_makeself() {
1104 local src_input=${1:-${A}}
1058 local src="$(find_unpackable_file "$1")" 1105 local src=$(find_unpackable_file "${src_input}")
1059 local skip="$2" 1106 local skip=$2
1060 local exe="$3" 1107 local exe=$3
1061 1108
1109 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
1110
1062 local shrtsrc="$(basename "${src}")" 1111 local shrtsrc=$(basename "${src}")
1063 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1112 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1064 if [ -z "${skip}" ] 1113 if [[ -z ${skip} ]] ; then
1065 then
1066 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1114 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}')
1067 local skip=0 1115 local skip=0
1068 exe=tail 1116 exe=tail
1069 case ${ver} in 1117 case ${ver} in
1070 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
1071 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1119 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1083 ;; 1131 ;;
1084 2.1.3) 1132 2.1.3)
1085 skip=`grep -a ^offset= "${src}" | awk '{print $3}'` 1133 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1086 let skip="skip + 1" 1134 let skip="skip + 1"
1087 ;; 1135 ;;
1088 2.1.4) 1136 2.1.4|2.1.5)
1089 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)
1090 skip=$(head -n ${skip} "${src}" | wc -c) 1138 skip=$(head -n ${skip} "${src}" | wc -c)
1091 exe="dd" 1139 exe="dd"
1092 ;; 1140 ;;
1093 *) 1141 *)
1138check_license() { 1186check_license() {
1139 local lic=$1 1187 local lic=$1
1140 if [ -z "${lic}" ] ; then 1188 if [ -z "${lic}" ] ; then
1141 lic="${PORTDIR}/licenses/${LICENSE}" 1189 lic="${PORTDIR}/licenses/${LICENSE}"
1142 else 1190 else
1143 if [ -e "${PORTDIR}/licenses/${src}" ] ; then 1191 if [ -e "${PORTDIR}/licenses/${lic}" ] ; then
1144 lic="${PORTDIR}/licenses/${src}" 1192 lic="${PORTDIR}/licenses/${lic}"
1145 elif [ -e "${PWD}/${src}" ] ; then 1193 elif [ -e "${PWD}/${lic}" ] ; then
1146 lic="${PWD}/${src}" 1194 lic="${PWD}/${lic}"
1147 elif [ -e "${src}" ] ; then 1195 elif [ -e "${lic}" ] ; then
1148 lic="${src}" 1196 lic="${lic}"
1149 fi
1150 fi 1197 fi
1198 fi
1151 [ ! -f "${lic}" ] && die "Could not find requested license ${src}" 1199 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1152 local l="`basename ${lic}`" 1200 local l="`basename ${lic}`"
1153 1201
1154 # here is where we check for the licenses the user already 1202 # 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 1203 # accepted ... if we don't find a match, we make the user accept
1156 local shopts=$- 1204 local shopts=$-
1212 # 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
1213 # the # of files they gave us 1261 # the # of files they gave us
1214 local cdcnt=0 1262 local cdcnt=0
1215 local f= 1263 local f=
1216 for f in "$@" ; do 1264 for f in "$@" ; do
1217 cdcnt=$((cdcnt + 1)) 1265 ((++cdcnt))
1218 export CDROM_CHECK_${cdcnt}="$f" 1266 export CDROM_CHECK_${cdcnt}="$f"
1219 done 1267 done
1220 export CDROM_TOTAL_CDS=${cdcnt} 1268 export CDROM_TOTAL_CDS=${cdcnt}
1221 export CDROM_CURRENT_CD=1 1269 export CDROM_CURRENT_CD=1
1222 1270
1223 # now we see if the user gave use CD_ROOT ... 1271 # now we see if the user gave use CD_ROOT ...
1224 # 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
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 1273 if [[ -n ${CD_ROOT}${CD_ROOT_1} ]] ; then
1232 local var= 1274 local var=
1233 cdcnt=0 1275 cdcnt=0
1234 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1276 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1235 cdcnt=$((cdcnt + 1)) 1277 ((++cdcnt))
1236 var="CD_ROOT_${cdcnt}" 1278 var="CD_ROOT_${cdcnt}"
1279 [[ -z ${!var} ]] && var="CD_ROOT"
1237 if [[ -z ${!var} ]] ; then 1280 if [[ -z ${!var} ]] ; then
1238 eerror "You must either use just the CD_ROOT" 1281 eerror "You must either use just the CD_ROOT"
1239 eerror "or specify ALL the CD_ROOT_X variables." 1282 eerror "or specify ALL the CD_ROOT_X variables."
1240 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."
1241 die "could not locate CD_ROOT_${cdcnt}" 1284 die "could not locate CD_ROOT_${cdcnt}"
1242 fi 1285 fi
1243 export CDROM_ROOTS_${cdcnt}="${!var}"
1244 done 1286 done
1245 export CDROM_ROOT=${CDROM_ROOTS_1} 1287 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}}
1246 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}
1247 return 1295 return
1248 fi 1296 fi
1249 1297
1298 # User didn't help us out so lets make sure they know they can
1299 # simplify the whole process ...
1250 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1300 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1251 einfon "This ebuild will need the " 1301 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 1302 echo
1258 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"
1259 einfo "mounted somewhere on your filesystem, just export" 1304 einfo "mounted somewhere on your filesystem, just export"
1260 einfo "the variable CD_ROOT so that it points to the" 1305 einfo "the variable CD_ROOT so that it points to the"
1261 einfo "directory containing the files." 1306 einfo "directory containing the files."
1265 echo 1310 echo
1266 else 1311 else
1267 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1312 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1268 cdcnt=0 1313 cdcnt=0
1269 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1314 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1270 cdcnt=$((cdcnt + 1)) 1315 ((++cdcnt))
1271 var="CDROM_NAME_${cdcnt}" 1316 var="CDROM_NAME_${cdcnt}"
1272 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}" 1317 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}"
1273 done 1318 done
1274 echo 1319 echo
1275 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"
1276 einfo "mounted somewhere on your filesystem, just export" 1321 einfo "mounted somewhere on your filesystem, just export"
1277 einfo "the following variables so they point to the right place:" 1322 einfo "the following variables so they point to the right place:"
1278 einfon "" 1323 einfon ""
1279 cdcnt=0 1324 cdcnt=0
1280 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1325 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1281 cdcnt=$((cdcnt + 1)) 1326 ((++cdcnt))
1282 echo -n " CD_ROOT_${cdcnt}" 1327 echo -n " CD_ROOT_${cdcnt}"
1283 done 1328 done
1284 echo 1329 echo
1285 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"
1286 einfo "you only have one cdrom, you can export CD_ROOT" 1331 einfo "you only have one cdrom, you can export CD_ROOT"
1289 echo 1334 echo
1290 einfo "For example:" 1335 einfo "For example:"
1291 einfo "export CD_ROOT_1=/mnt/cdrom" 1336 einfo "export CD_ROOT_1=/mnt/cdrom"
1292 echo 1337 echo
1293 fi 1338 fi
1339
1340 export CDROM_SET=""
1294 export CDROM_CURRENT_CD=0 1341 export CDROM_CURRENT_CD=0
1295 cdrom_load_next_cd 1342 cdrom_load_next_cd
1296} 1343}
1297 1344
1298# 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.
1299# 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.
1300# 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.
1301# 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.
1302cdrom_load_next_cd() { 1349cdrom_load_next_cd() {
1303 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1304 local var= 1350 local var
1305 1351 ((++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 1352
1311 unset CDROM_ROOT 1353 unset CDROM_ROOT
1312 var=CDROM_ROOTS_${CDROM_CURRENT_CD} 1354 var=CD_ROOT_${CDROM_CURRENT_CD}
1355 [[ -z ${!var} ]] && var="CD_ROOT"
1313 if [[ -z ${!var} ]] ; then 1356 if [[ -z ${!var} ]] ; then
1314 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1357 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1315 cdrom_locate_file_on_cd ${!var} 1358 _cdrom_locate_file_on_cd ${!var}
1316 else 1359 else
1317 export CDROM_ROOT=${!var} 1360 export CDROM_ROOT=${!var}
1318 fi 1361 fi
1319 1362
1320 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1363 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 1368# 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 1369# found, then a message asking for the user to insert the cdrom will be
1327# displayed and we'll hang out here until: 1370# displayed and we'll hang out here until:
1328# (1) the file is found on a mounted cdrom 1371# (1) the file is found on a mounted cdrom
1329# (2) the user hits CTRL+C 1372# (2) the user hits CTRL+C
1330cdrom_locate_file_on_cd() { 1373_cdrom_locate_file_on_cd() {
1374 local mline=""
1375 local showedmsg=0
1376
1331 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
1332 local dir="$(dirname ${@})" 1385 local dir=$(dirname ${cdset[${i}]})
1333 local file="$(basename ${@})" 1386 local file=$(basename ${cdset[${i}]})
1334 local mline=""
1335 local showedmsg=0
1336 1387
1337 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
1338 [[ -d ${mline}/${dir} ]] || continue 1389 [[ -d ${mline}/${dir} ]] || continue
1339 [[ ! -z $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] \ 1390 if [[ -n $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] ; then
1340 && 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))
1341 done 1399 done
1342 1400
1343 if [[ -z ${CDROM_ROOT} ]] ; then
1344 echo 1401 echo
1345 if [[ ${showedmsg} -eq 0 ]] ; then 1402 if [[ ${showedmsg} -eq 0 ]] ; then
1346 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1403 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1347 if [[ -z ${CDROM_NAME} ]] ; then 1404 if [[ -z ${CDROM_NAME} ]] ; then
1348 einfo "Please insert the cdrom for ${PN} now !" 1405 einfo "Please insert+mount the cdrom for ${PN} now !"
1349 else
1350 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1351 fi
1352 else 1406 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 !" 1407 einfo "Please insert+mount the ${CDROM_NAME} cdrom now !"
1358 fi
1359 fi 1408 fi
1360 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
1361 fi 1416 fi
1417 showedmsg=1
1418 fi
1362 einfo "Press return to scan for the cd again" 1419 einfo "Press return to scan for the cd again"
1363 einfo "or hit CTRL+C to abort the emerge." 1420 einfo "or hit CTRL+C to abort the emerge."
1364 echo 1421 echo
1365 einfo "If you are having trouble with the detection" 1422 einfo "If you are having trouble with the detection"
1366 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"
1367 einfo "Joliet support enabled in your kernel. Please" 1424 einfo "Joliet support enabled in your kernel. Please"
1368 einfo "check that CONFIG_JOLIET is enabled in your kernel." 1425 einfo "check that CONFIG_JOLIET is enabled in your kernel."
1369 read 1426 read || die "something is screwed with your system"
1370 fi
1371 done 1427 done
1372} 1428}
1373 1429
1374# Make sure that LINGUAS only contains languages that 1430# Make sure that LINGUAS only contains languages that
1375# a package can support 1431# a package can support
1385# directories and uses the union of the lists. 1441# directories and uses the union of the lists.
1386strip-linguas() { 1442strip-linguas() {
1387 local ls newls 1443 local ls newls
1388 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then 1444 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1389 local op=$1; shift 1445 local op=$1; shift
1390 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1446 ls=" $(find "$1" -name '*.po' -exec basename {} \;) "; shift
1391 local d f 1447 local d f
1392 for d in "$@" ; do 1448 for d in "$@" ; do
1393 if [[ ${op} == "-u" ]] ; then 1449 if [[ ${op} == "-u" ]] ; then
1394 newls=${ls} 1450 newls=${ls}
1395 else 1451 else
1396 newls="" 1452 newls=""
1397 fi 1453 fi
1398 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1454 for f in $(find "$d" -name '*.po' -exec basename {} \;) ; do
1399 if [[ ${op} == "-i" ]] ; then 1455 if [[ ${op} == "-i" ]] ; then
1400 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}" 1456 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}"
1401 else 1457 else
1402 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}" 1458 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}"
1403 fi 1459 fi
1459 1515
1460# Jeremy Huddleston <eradicator@gentoo.org>: 1516# Jeremy Huddleston <eradicator@gentoo.org>:
1461# preserve_old_lib /path/to/libblah.so.0 1517# preserve_old_lib /path/to/libblah.so.0
1462# preserve_old_lib_notify /path/to/libblah.so.0 1518# preserve_old_lib_notify /path/to/libblah.so.0
1463# 1519#
1464# 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
1465# 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
1466# 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
1467# 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
1468# solution, so instead you can add the following to your ebuilds: 1524# solution, so instead you can add the following to your ebuilds:
1469# 1525#
1496 LIB=$1 1552 LIB=$1
1497 1553
1498 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1554 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1499 SONAME=`basename ${LIB}` 1555 SONAME=`basename ${LIB}`
1500 1556
1501 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."
1502 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"
1503 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,"
1504 einfo "you will need to execute the following command:" 1560 ewarn "you will need to execute the following command:"
1505 einfo " revdep-rebuild --soname ${SONAME}" 1561 ewarn " revdep-rebuild --library ${SONAME}"
1506 einfo 1562 ewarn
1507 einfo "After doing that, you can safely remove ${LIB}" 1563 ewarn "After doing that, you can safely remove ${LIB}"
1508 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild" 1564 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1509 fi 1565 fi
1510} 1566}
1511 1567
1512# 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
1513# certain USE flags 1569# certain USE flags
1523 [[ ${opt:0:1} = "-" ]] && shift || opt="-a" 1579 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1524 1580
1525 local PKG=$(best_version $1) 1581 local PKG=$(best_version $1)
1526 shift 1582 shift
1527 1583
1528 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
1529 [[ ! -e ${USEFILE} ]] && return 1 1588 [[ ! -e ${USEFILE} ]] && return 0
1530 1589
1531 local USE_BUILT=$(<${USEFILE}) 1590 local USE_BUILT=$(<${USEFILE})
1532 while [[ $# -gt 0 ]] ; do 1591 while [[ $# -gt 0 ]] ; do
1533 if [[ ${opt} = "-o" ]] ; then 1592 if [[ ${opt} = "-o" ]] ; then
1534 has $1 ${USE_BUILT} && return 0 1593 has $1 ${USE_BUILT} && return 0
1586# $4 == extra LD_LIBRARY_PATH's (make it : delimited) 1645# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1587# $5 == path for wrapper 1646# $5 == path for wrapper
1588make_wrapper() { 1647make_wrapper() {
1589 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5 1648 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1590 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"
1591 cat << EOF > "${tmpwrapper}" 1652 cat << EOF > "${tmpwrapper}"
1592#!/bin/sh 1653#!/bin/sh
1593cd "${chdir}" 1654cd "${chdir:-.}"
1655if [ -n "${libdir}" ] ; then
1656 if [ "\${LD_LIBRARY_PATH+set}" = "set" ] ; then
1594export 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
1595exec ${bin} "\$@" 1662exec ${bin} "\$@"
1596EOF 1663EOF
1597 chmod go+rx "${tmpwrapper}" 1664 chmod go+rx "${tmpwrapper}"
1598 if [ -n "${5}" ] 1665 if [[ -n ${path} ]] ; then
1599 then
1600 exeinto ${5} 1666 exeinto "${path}"
1601 newexe "${tmpwrapper}" "${wrapper}" 1667 newexe "${tmpwrapper}" "${wrapper}"
1602 else 1668 else
1603 newbin "${tmpwrapper}" "${wrapper}" 1669 newbin "${tmpwrapper}" "${wrapper}"
1604 fi 1670 fi
1605} 1671}

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

  ViewVC Help
Powered by ViewVC 1.1.20