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

Diff of /eclass/eutils.eclass

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

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

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

  ViewVC Help
Powered by ViewVC 1.1.20