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

Diff of /eclass/eutils.eclass

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

Revision 1.182 Revision 1.229
1# Copyright 1999-2005 Gentoo Foundation 1# Copyright 1999-2005 Gentoo Foundation
2# Distributed under the terms of the GNU General Public License v2 2# Distributed under the terms of the GNU General Public License v2
3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.182 2005/06/11 00:02:26 vapier Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.229 2006/03/16 03:44:54 agriffis Exp $
4# 4#
5# Author: Martin Schlemmer <azarah@gentoo.org> 5# Author: Martin Schlemmer <azarah@gentoo.org>
6# 6#
7# This eclass is for general purpose functions that most ebuilds 7# This eclass is for general purpose functions that most ebuilds
8# have to implement themselves. 8# have to implement themselves.
9# 9#
10# NB: If you add anything, please comment it! 10# NB: If you add anything, please comment it!
11 11
12inherit multilib 12inherit multilib portability
13ECLASS=eutils
14INHERITED="$INHERITED $ECLASS"
15 13
16DEPEND="!bootstrap? ( sys-devel/patch userland_GNU? ( sys-apps/shadow ) )" 14DEPEND="!bootstrap? ( sys-devel/patch )"
17# sys-apps/shadow is needed for useradd, etc, bug #94745. 15# sys-apps/shadow is needed for useradd, etc, bug #94745.
18 16
19DESCRIPTION="Based on the ${ECLASS} eclass" 17DESCRIPTION="Based on the ${ECLASS} eclass"
20 18
21# Wait for the supplied number of seconds. If no argument is supplied, defaults 19# Wait for the supplied number of seconds. If no argument is supplied, defaults
62# to point to the latest version of the library present. 60# to point to the latest version of the library present.
63# 61#
64# <azarah@gentoo.org> (26 Oct 2002) 62# <azarah@gentoo.org> (26 Oct 2002)
65# 63#
66gen_usr_ldscript() { 64gen_usr_ldscript() {
67 local libdir="$(get_libdir)" 65 local lib libdir=$(get_libdir)
68 # Just make sure it exists 66 # Just make sure it exists
69 dodir /usr/${libdir} 67 dodir /usr/${libdir}
70 68
71 for lib in "${@}" ; do 69 for lib in "${@}" ; do
72 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT 70 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT
73 /* GNU ld script 71 /* GNU ld script
74 Since Gentoo has critical dynamic libraries 72 Since Gentoo has critical dynamic libraries
75 in /lib, and the static versions in /usr/lib, 73 in /lib, and the static versions in /usr/lib,
76 we need to have a "fake" dynamic lib in /usr/lib, 74 we need to have a "fake" dynamic lib in /usr/lib,
77 otherwise we run into linking problems. 75 otherwise we run into linking problems.
78 76
79 See bug http://bugs.gentoo.org/4411 for more info. 77 See bug http://bugs.gentoo.org/4411 for more info.
80 */ 78 */
81 GROUP ( /${libdir}/${lib} ) 79 GROUP ( /${libdir}/${lib} )
82 END_LDSCRIPT 80 END_LDSCRIPT
83 fperms a+x "/usr/${libdir}/${lib}" 81 fperms a+x "/usr/${libdir}/${lib}" || die "could not change perms on ${lib}"
84 done 82 done
85} 83}
86 84
87# Simple function to draw a line consisting of '=' the same length as $*
88# - only to be used by epatch()
89#
90# <azarah@gentoo.org> (11 Nov 2002)
91#
92draw_line() {
93 local i=0
94 local str_length=""
95
96 # Handle calls that do not have args, or wc not being installed ...
97 if [ -z "$1" -o ! -x "$(which wc 2>/dev/null)" ]
98 then
99 echo "==============================================================="
100 return 0
101 fi
102
103 # Get the length of $*
104 str_length="$(echo -n "$*" | wc -m)"
105
106 while [ "$i" -lt "${str_length}" ]
107 do
108 echo -n "="
109
110 i=$((i + 1))
111 done
112
113 echo
114
115 return 0
116}
117 85
118# Default directory where patches are located 86# Default directory where patches are located
119EPATCH_SOURCE="${WORKDIR}/patch" 87EPATCH_SOURCE="${WORKDIR}/patch"
120# Default extension for patches 88# Default extension for patches
121EPATCH_SUFFIX="patch.bz2" 89EPATCH_SUFFIX="patch.bz2"
168# hand its a directory, it will set EPATCH_SOURCE to this. 136# hand its a directory, it will set EPATCH_SOURCE to this.
169# 137#
170# <azarah@gentoo.org> (10 Nov 2002) 138# <azarah@gentoo.org> (10 Nov 2002)
171# 139#
172epatch() { 140epatch() {
141 _epatch_draw_line() {
142 [[ -z $1 ]] && set "$(printf "%65s" '')"
143 echo "${1//?/=}"
144 }
145 _epatch_assert() { local _pipestatus=${PIPESTATUS[*]}; [[ ${_pipestatus// /} -eq 0 ]] ; }
173 local PIPE_CMD="" 146 local PIPE_CMD=""
174 local STDERR_TARGET="${T}/$$.out" 147 local STDERR_TARGET="${T}/$$.out"
175 local PATCH_TARGET="${T}/$$.patch" 148 local PATCH_TARGET="${T}/$$.patch"
176 local PATCH_SUFFIX="" 149 local PATCH_SUFFIX=""
177 local SINGLE_PATCH="no" 150 local SINGLE_PATCH="no"
178 local x="" 151 local x=""
152
153 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402
179 154
180 if [ "$#" -gt 1 ] 155 if [ "$#" -gt 1 ]
181 then 156 then
182 local m="" 157 local m=""
183 for m in "$@" ; do 158 for m in "$@" ; do
284 259
285 # Allow for prefix to differ ... im lazy, so shoot me :/ 260 # Allow for prefix to differ ... im lazy, so shoot me :/
286 while [ "${count}" -lt 5 ] 261 while [ "${count}" -lt 5 ]
287 do 262 do
288 # Generate some useful debug info ... 263 # Generate some useful debug info ...
289 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 264 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
290 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 265 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
291 266
292 if [ "${PATCH_SUFFIX}" != "patch" ] 267 if [ "${PATCH_SUFFIX}" != "patch" ]
293 then 268 then
294 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 269 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
299 274
300 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 275 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
301 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 276 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
302 277
303 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 278 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
304 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 279 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
305 280
306 if [ "${PATCH_SUFFIX}" != "patch" ] 281 if [ "${PATCH_SUFFIX}" != "patch" ]
307 then 282 then
308 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1 283 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
309 then 284 then
313 count=5 288 count=5
314 break 289 break
315 fi 290 fi
316 fi 291 fi
317 292
318 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1 293 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f ; _epatch_assert) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
319 then 294 then
320 draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 295 _epatch_draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
321 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 296 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
322 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 297 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
323 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 298 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
324 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 299 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
325 300
326 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1 301 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1
302 _epatch_assert
327 303
328 if [ "$?" -ne 0 ] 304 if [ "$?" -ne 0 ]
329 then 305 then
330 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 306 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
331 echo 307 echo
377# vapier@gentoo.org 353# vapier@gentoo.org
378# 354#
379# Takes just 1 optional parameter (the directory to create tmpfile in) 355# Takes just 1 optional parameter (the directory to create tmpfile in)
380emktemp() { 356emktemp() {
381 local exe="touch" 357 local exe="touch"
382 [ "$1" == "-d" ] && exe="mkdir" && shift 358 [[ $1 == -d ]] && exe="mkdir" && shift
383 local topdir="$1" 359 local topdir=$1
384 360
385 if [ -z "${topdir}" ] 361 if [[ -z ${topdir} ]] ; then
386 then
387 [ -z "${T}" ] \ 362 [[ -z ${T} ]] \
388 && topdir="/tmp" \ 363 && topdir="/tmp" \
389 || topdir="${T}" 364 || topdir=${T}
390 fi 365 fi
391 366
392 if [ -z "$(type -p mktemp)" ] 367 if [[ -z $(type -p mktemp) ]] ; then
393 then
394 local tmp=/ 368 local tmp=/
395 while [ -e "${tmp}" ] ; do 369 while [[ -e ${tmp} ]] ; do
396 tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}" 370 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}
397 done 371 done
398 ${exe} "${tmp}" 372 ${exe} "${tmp}" || ${exe} -p "${tmp}"
399 echo "${tmp}" 373 echo "${tmp}"
400 else 374 else
401 [ "${exe}" == "touch" ] \ 375 if [[ ${exe} == "touch" ]] ; then
402 && exe="-p" \ 376 [[ ${USERLAND} == "GNU" ]] \
403 || exe="-d" 377 && mktemp -p "${topdir}" \
404 mktemp ${exe} "${topdir}" 378 || TMPDIR="${topdir}" mktemp -t tmp
379 else
380 [[ ${USERLAND} == "GNU" ]] \
381 && mktemp -d "${topdir}" \
382 || TMPDIR="${topdir}" mktemp -dt tmp
383 fi
405 fi 384 fi
406} 385}
407 386
408# Small wrapper for getent (Linux), nidump (Mac OS X), 387# Small wrapper for getent (Linux), nidump (Mac OS X),
409# and pw (FreeBSD) used in enewuser()/enewgroup() 388# and pw (FreeBSD) used in enewuser()/enewgroup()
410# Joe Jezak <josejx@gmail.com> and usata@gentoo.org 389# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
411# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org> 390# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
412# 391#
413# egetent(database, key) 392# egetent(database, key)
414egetent() { 393egetent() {
415 if [[ "${USERLAND}" == "Darwin" ]] ; then 394 case ${CHOST} in
395 *-darwin*)
416 case "$2" in 396 case "$2" in
417 *[!0-9]*) # Non numeric 397 *[!0-9]*) # Non numeric
418 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 398 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
419 ;; 399 ;;
420 *) # Numeric 400 *) # Numeric
421 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 401 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
422 ;; 402 ;;
423 esac 403 esac
424 elif [[ "${USERLAND}" == "BSD" ]] ; then 404 ;;
425 local action 405 *-freebsd*|*-dragonfly*)
426 if [ "$1" == "passwd" ] 406 local opts action="user"
427 then 407 [[ $1 == "passwd" ]] || action="group"
428 action="user" 408
429 else 409 # lookup by uid/gid
430 action="group" 410 if [[ $2 == [[:digit:]]* ]] ; then
411 [[ ${action} == "user" ]] && opts="-u" || opts="-g"
431 fi 412 fi
413
432 pw show "${action}" "$2" -q 414 pw show ${action} ${opts} "$2" -q
433 else 415 ;;
416 *-netbsd*|*-openbsd*)
417 grep "$2:\*:" /etc/$1
418 ;;
419 *)
434 which nscd >& /dev/null && nscd -i "$1" 420 type -p nscd >& /dev/null && nscd -i "$1"
435 getent "$1" "$2" 421 getent "$1" "$2"
436 fi 422 ;;
423 esac
437} 424}
438 425
439# Simplify/standardize adding users to the system 426# Simplify/standardize adding users to the system
440# vapier@gentoo.org 427# vapier@gentoo.org
441# 428#
479 fi 466 fi
480 else 467 else
481 euid="next" 468 euid="next"
482 fi 469 fi
483 if [[ ${euid} == "next" ]] ; then 470 if [[ ${euid} == "next" ]] ; then
484 local pwrange 471 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 472 [[ -z $(egetent passwd ${euid}) ]] && break
492 done 473 done
493 fi 474 fi
494 opts="${opts} -u ${euid}" 475 opts="${opts} -u ${euid}"
495 einfo " - Userid: ${euid}" 476 einfo " - Userid: ${euid}"
496 477
497 # handle shell 478 # handle shell
498 local eshell=$1; shift 479 local eshell=$1; shift
499 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then 480 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
500 if [[ ! -e ${eshell} ]] ; then 481 if [[ ! -e ${ROOT}${eshell} ]] ; then
501 eerror "A shell was specified but it does not exist !" 482 eerror "A shell was specified but it does not exist !"
502 die "${eshell} does not exist" 483 die "${eshell} does not exist in ${ROOT}"
503 fi 484 fi
485 if [[ ${eshell} == */false || ${eshell} == */nologin ]] ; then
486 eerror "Do not specify ${eshell} yourself, use -1"
487 die "Pass '-1' as the shell parameter"
488 fi
504 else 489 else
505 case ${USERLAND} in 490 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do
506 Darwin) eshell="/usr/bin/false";; 491 [[ -x ${ROOT}${shell} ]] && break
507 BSD) eshell="/usr/sbin/nologin";; 492 done
508 *) eshell="/bin/false";; 493
509 esac 494 if [[ ${shell} == "/dev/null" ]] ; then
495 eerror "Unable to identify the shell to use"
496 die "Unable to identify the shell to use"
497 fi
498
499 eshell=${shell}
510 fi 500 fi
511 einfo " - Shell: ${eshell}" 501 einfo " - Shell: ${eshell}"
512 opts="${opts} -s ${eshell}" 502 opts="${opts} -s ${eshell}"
513 503
514 # handle homedir 504 # handle homedir
551 einfo " - Groups: ${egroups}" 541 einfo " - Groups: ${egroups}"
552 542
553 # handle extra and add the user 543 # handle extra and add the user
554 local oldsandbox=${SANDBOX_ON} 544 local oldsandbox=${SANDBOX_ON}
555 export SANDBOX_ON="0" 545 export SANDBOX_ON="0"
556 case ${USERLAND} in 546 case ${CHOST} in
557 Darwin) 547 *-darwin*)
558 ### Make the user 548 ### Make the user
559 if [[ -z $@ ]] ; then 549 if [[ -z $@ ]] ; then
560 dscl . create /users/${euser} uid ${euid} 550 dscl . create /users/${euser} uid ${euid}
561 dscl . create /users/${euser} shell ${eshell} 551 dscl . create /users/${euser} shell ${eshell}
562 dscl . create /users/${euser} home ${ehome} 552 dscl . create /users/${euser} home ${ehome}
573 einfo "Please report the ebuild along with the info below" 563 einfo "Please report the ebuild along with the info below"
574 einfo "eextra: $@" 564 einfo "eextra: $@"
575 die "Required function missing" 565 die "Required function missing"
576 fi 566 fi
577 ;; 567 ;;
578 BSD) 568 *-freebsd*|*-dragonfly*)
579 if [[ -z $@ ]] ; then 569 if [[ -z $@ ]] ; then
580 pw useradd ${euser} ${opts} \ 570 pw useradd ${euser} ${opts} \
581 -c "added by portage for ${PN}" \ 571 -c "added by portage for ${PN}" \
582 die "enewuser failed" 572 die "enewuser failed"
583 else 573 else
584 einfo " - Extra: $@" 574 einfo " - Extra: $@"
585 pw useradd ${euser} ${opts} \ 575 pw useradd ${euser} ${opts} \
586 "$@" || die "enewuser failed" 576 "$@" || die "enewuser failed"
587 fi 577 fi
588 ;; 578 ;;
579
580 *-netbsd*)
581 if [[ -z $@ ]] ; then
582 useradd ${opts} ${euser} || die "enewuser failed"
583 else
584 einfo " - Extra: $@"
585 useradd ${opts} ${euser} "$@" || die "enewuser failed"
586 fi
587 ;;
588
589 *-openbsd*)
590 if [[ -z $@ ]] ; then
591 useradd -u ${euid} -s ${eshell} \
592 -d ${ehome} -c "Added by portage for ${PN}" \
593 -g ${egroups} ${euser} || die "enewuser failed"
594 else
595 einfo " - Extra: $@"
596 useradd -u ${euid} -s ${eshell} \
597 -d ${ehome} -c "Added by portage for ${PN}" \
598 -g ${egroups} ${euser} "$@" || die "enewuser failed"
599 fi
600 ;;
601
589 *) 602 *)
590 if [[ -z $@ ]] ; then 603 if [[ -z $@ ]] ; then
591 useradd ${opts} ${euser} \ 604 useradd ${opts} ${euser} \
592 -c "added by portage for ${PN}" \ 605 -c "added by portage for ${PN}" \
593 || die "enewuser failed" 606 || die "enewuser failed"
596 useradd ${opts} ${euser} "$@" \ 609 useradd ${opts} ${euser} "$@" \
597 || die "enewuser failed" 610 || die "enewuser failed"
598 fi 611 fi
599 ;; 612 ;;
600 esac 613 esac
614
615 if [[ ! -e ${ROOT}/${ehome} ]] ; then
616 einfo " - Creating ${ehome} in ${ROOT}"
617 mkdir -p "${ROOT}/${ehome}"
618 chown ${euser} "${ROOT}/${ehome}"
619 chmod 755 "${ROOT}/${ehome}"
620 fi
621
601 export SANDBOX_ON=${oldsandbox} 622 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} 623}
611 624
612# Simplify/standardize adding groups to the system 625# Simplify/standardize adding groups to the system
613# vapier@gentoo.org 626# vapier@gentoo.org
614# 627#
643 then 656 then
644 if [ "${egid}" -gt 0 ] 657 if [ "${egid}" -gt 0 ]
645 then 658 then
646 if [ -z "`egetent group ${egid}`" ] 659 if [ -z "`egetent group ${egid}`" ]
647 then 660 then
648 if [[ "${USERLAND}" == "Darwin" ]]; then 661 if [[ "${CHOST}" == *-darwin* ]]; then
649 opts="${opts} ${egid}" 662 opts="${opts} ${egid}"
650 else 663 else
651 opts="${opts} -g ${egid}" 664 opts="${opts} -g ${egid}"
652 fi 665 fi
653 else 666 else
667 opts="${opts} ${eextra}" 680 opts="${opts} ${eextra}"
668 681
669 # add the group 682 # add the group
670 local oldsandbox="${SANDBOX_ON}" 683 local oldsandbox="${SANDBOX_ON}"
671 export SANDBOX_ON="0" 684 export SANDBOX_ON="0"
672 if [[ "${USERLAND}" == "Darwin" ]]; then 685 case ${CHOST} in
686 *-darwin*)
673 if [ ! -z "${eextra}" ]; 687 if [ ! -z "${eextra}" ];
674 then 688 then
675 einfo "Extra options are not supported on Darwin/OS X yet" 689 einfo "Extra options are not supported on Darwin/OS X yet"
676 einfo "Please report the ebuild along with the info below" 690 einfo "Please report the ebuild along with the info below"
677 einfo "eextra: ${eextra}" 691 einfo "eextra: ${eextra}"
678 die "Required function missing" 692 die "Required function missing"
679 fi 693 fi
680 694
681 # If we need the next available 695 # If we need the next available
682 case ${egid} in 696 case ${egid} in
683 *[!0-9]*) # Non numeric 697 *[!0-9]*) # Non numeric
684 for egid in `jot 898 101`; do 698 for egid in $(seq 101 999); do
685 [ -z "`egetent group ${egid}`" ] && break 699 [ -z "`egetent group ${egid}`" ] && break
686 done 700 done
687 esac 701 esac
688 dscl . create /groups/${egroup} gid ${egid} 702 dscl . create /groups/${egroup} gid ${egid}
689 dscl . create /groups/${egroup} passwd '*' 703 dscl . create /groups/${egroup} passwd '*'
690 elif [[ "${USERLAND}" == "BSD" ]] ; then 704 ;;
705
706 *-freebsd*|*-dragonfly*)
691 case ${egid} in 707 case ${egid} in
692 *[!0-9]*) # Non numeric 708 *[!0-9]*) # Non numeric
693 for egid in `jot 898 101`; do 709 for egid in $(seq 101 999); do
694 [ -z "`egetent group ${egid}`" ] && break 710 [ -z "`egetent group ${egid}`" ] && break
695 done 711 done
696 esac 712 esac
697 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 713 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
698 else 714 ;;
715
716 *-netbsd*)
717 case ${egid} in
718 *[!0-9]*) # Non numeric
719 for egid in $(seq 101 999); do
720 [ -z "`egetent group ${egid}`" ] && break
721 done
722 esac
723 groupadd -g ${egid} ${egroup} || die "enewgroup failed"
724 ;;
725
726 *)
699 groupadd ${opts} ${egroup} || die "enewgroup failed" 727 groupadd ${opts} ${egroup} || die "enewgroup failed"
700 fi 728 ;;
729 esac
701 export SANDBOX_ON="${oldsandbox}" 730 export SANDBOX_ON="${oldsandbox}"
702} 731}
703 732
704# Simple script to replace 'dos2unix' binaries 733# Simple script to replace 'dos2unix' binaries
705# vapier@gentoo.org 734# vapier@gentoo.org
730# name: the name that will show up in the menu 759# name: the name that will show up in the menu
731# icon: give your little like a pretty little icon ... 760# icon: give your little like a pretty little icon ...
732# this can be relative (to /usr/share/pixmaps) or 761# this can be relative (to /usr/share/pixmaps) or
733# a full path to an icon 762# a full path to an icon
734# type: what kind of application is this ? for categories: 763# type: what kind of application is this ? for categories:
735# http://www.freedesktop.org/wiki/Standards_2fmenu_2dspec 764# http://www.freedesktop.org/Standards/desktop-entry-spec
736# path: if your app needs to startup in a specific dir 765# path: if your app needs to startup in a specific dir
737make_desktop_entry() { 766make_desktop_entry() {
738 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1 767 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1
739 768
740 local exec=${1} 769 local exec=${1}
766 dev) 795 dev)
767 type="Development" 796 type="Development"
768 ;; 797 ;;
769 798
770 games) 799 games)
771 [[ -z ${path} ]] && path=${GAMES_BINDIR}
772
773 case ${catmin} in 800 case ${catmin} in
774 action) type=ActionGame;; 801 action) type=ActionGame;;
775 arcade) type=ArcadeGame;; 802 arcade) type=ArcadeGame;;
776 board) type=BoardGame;; 803 board) type=BoardGame;;
777 kid) type=KidsGame;; 804 kid) type=KidsGame;;
818 type="Network;${type}" 845 type="Network;${type}"
819 ;; 846 ;;
820 847
821 sci) 848 sci)
822 case ${catmin} in 849 case ${catmin} in
823 astro*) type=Astronomoy;; 850 astro*) type=Astronomy;;
824 bio*) type=Biology;; 851 bio*) type=Biology;;
825 calc*) type=Calculator;; 852 calc*) type=Calculator;;
826 chem*) type=Chemistry;; 853 chem*) type=Chemistry;;
827 geo*) type=Geology;; 854 geo*) type=Geology;;
828 math*) type=Math;; 855 math*) type=Math;;
860Exec=${exec} 887Exec=${exec}
861Path=${path} 888Path=${path}
862Icon=${icon} 889Icon=${icon}
863Categories=Application;${type};" > "${desktop}" 890Categories=Application;${type};" > "${desktop}"
864 891
892 (
893 # wrap the env here so that the 'insinto' call
894 # doesn't corrupt the env of the caller
865 insinto /usr/share/applications 895 insinto /usr/share/applications
866 doins "${desktop}" 896 doins "${desktop}"
867 897 )
868 return 0
869} 898}
870 899
871# Make a GDM/KDM Session file 900# Make a GDM/KDM Session file
872# 901#
873# make_desktop_entry(<title>, <command>) 902# make_desktop_entry(<title>, <command>)
902 doins "${i}" 931 doins "${i}"
903 elif [[ -d ${i} ]] ; then 932 elif [[ -d ${i} ]] ; then
904 for j in "${i}"/*.desktop ; do 933 for j in "${i}"/*.desktop ; do
905 doins "${j}" 934 doins "${j}"
906 done 935 done
907 fi 936 fi
908 done 937 done
909} 938}
910newmenu() { 939newmenu() {
911 insinto /usr/share/applications 940 insinto /usr/share/applications
912 newins "$1" "$2" 941 newins "$1" "$2"
920 doins "${i}" 949 doins "${i}"
921 elif [[ -d ${i} ]] ; then 950 elif [[ -d ${i} ]] ; then
922 for j in "${i}"/*.png ; do 951 for j in "${i}"/*.png ; do
923 doins "${j}" 952 doins "${j}"
924 done 953 done
925 fi 954 fi
926 done 955 done
927} 956}
928newicon() { 957newicon() {
929 insinto /usr/share/pixmaps 958 insinto /usr/share/pixmaps
930 newins "$1" "$2" 959 newins "$1" "$2"
935############################################################## 964##############################################################
936 965
937 966
938# for internal use only (unpack_pdv and unpack_makeself) 967# for internal use only (unpack_pdv and unpack_makeself)
939find_unpackable_file() { 968find_unpackable_file() {
940 local src="$1" 969 local src=$1
941 if [ -z "${src}" ] 970 if [[ -z ${src} ]] ; then
942 then
943 src="${DISTDIR}/${A}" 971 src=${DISTDIR}/${A}
944 else 972 else
945 if [ -e "${DISTDIR}/${src}" ] 973 if [[ -e ${DISTDIR}/${src} ]] ; then
946 then
947 src="${DISTDIR}/${src}" 974 src=${DISTDIR}/${src}
948 elif [ -e "${PWD}/${src}" ] 975 elif [[ -e ${PWD}/${src} ]] ; then
949 then
950 src="${PWD}/${src}" 976 src=${PWD}/${src}
951 elif [ -e "${src}" ] 977 elif [[ -e ${src} ]] ; then
952 then
953 src="${src}" 978 src=${src}
954 fi
955 fi 979 fi
956 [ ! -e "${src}" ] && die "Could not find requested archive ${src}" 980 fi
981 [[ ! -e ${src} ]] && return 1
957 echo "${src}" 982 echo "${src}"
958} 983}
959 984
960# Unpack those pesky pdv generated files ... 985# Unpack those pesky pdv generated files ...
961# They're self-unpacking programs with the binary package stuffed in 986# They're self-unpacking programs with the binary package stuffed in
976# lseek 1001# lseek
977# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 1002# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
978# lseek(3, -4, SEEK_END) = 2981250 1003# lseek(3, -4, SEEK_END) = 2981250
979# thus we would pass in the value of '4' as the second parameter. 1004# thus we would pass in the value of '4' as the second parameter.
980unpack_pdv() { 1005unpack_pdv() {
981 local src="`find_unpackable_file $1`" 1006 local src=$(find_unpackable_file $1)
982 local sizeoff_t="$2" 1007 local sizeoff_t=$2
983 1008
1009 [[ -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 :(" 1010 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :("
985 1011
986 local shrtsrc="`basename ${src}`" 1012 local shrtsrc=$(basename "${src}")
987 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1013 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
988 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1014 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\"` 1015 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"`
990 1016
991 # grab metadata for debug reasons 1017 # grab metadata for debug reasons
1055# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1081# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1056# - If the file is not specified then unpack will utilize ${A}. 1082# - If the file is not specified then unpack will utilize ${A}.
1057# - If the offset is not specified then we will attempt to extract 1083# - If the offset is not specified then we will attempt to extract
1058# the proper offset from the script itself. 1084# the proper offset from the script itself.
1059unpack_makeself() { 1085unpack_makeself() {
1086 local src_input=${1:-${A}}
1060 local src="$(find_unpackable_file "$1")" 1087 local src=$(find_unpackable_file "${src_input}")
1061 local skip="$2" 1088 local skip=$2
1062 local exe="$3" 1089 local exe=$3
1063 1090
1091 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
1092
1064 local shrtsrc="$(basename "${src}")" 1093 local shrtsrc=$(basename "${src}")
1065 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1094 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1066 if [ -z "${skip}" ] 1095 if [[ -z ${skip} ]] ; then
1067 then
1068 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1096 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}')
1069 local skip=0 1097 local skip=0
1070 exe=tail 1098 exe=tail
1071 case ${ver} in 1099 case ${ver} in
1072 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same 1100 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same
1073 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1101 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1085 ;; 1113 ;;
1086 2.1.3) 1114 2.1.3)
1087 skip=`grep -a ^offset= "${src}" | awk '{print $3}'` 1115 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1088 let skip="skip + 1" 1116 let skip="skip + 1"
1089 ;; 1117 ;;
1090 2.1.4) 1118 2.1.4|2.1.5)
1091 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1) 1119 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1)
1092 skip=$(head -n ${skip} "${src}" | wc -c) 1120 skip=$(head -n ${skip} "${src}" | wc -c)
1093 exe="dd" 1121 exe="dd"
1094 ;; 1122 ;;
1095 *) 1123 *)
1140check_license() { 1168check_license() {
1141 local lic=$1 1169 local lic=$1
1142 if [ -z "${lic}" ] ; then 1170 if [ -z "${lic}" ] ; then
1143 lic="${PORTDIR}/licenses/${LICENSE}" 1171 lic="${PORTDIR}/licenses/${LICENSE}"
1144 else 1172 else
1145 if [ -e "${PORTDIR}/licenses/${src}" ] ; then 1173 if [ -e "${PORTDIR}/licenses/${lic}" ] ; then
1146 lic="${PORTDIR}/licenses/${src}" 1174 lic="${PORTDIR}/licenses/${lic}"
1147 elif [ -e "${PWD}/${src}" ] ; then 1175 elif [ -e "${PWD}/${lic}" ] ; then
1148 lic="${PWD}/${src}" 1176 lic="${PWD}/${lic}"
1149 elif [ -e "${src}" ] ; then 1177 elif [ -e "${lic}" ] ; then
1150 lic="${src}" 1178 lic="${lic}"
1151 fi
1152 fi 1179 fi
1180 fi
1153 [ ! -f "${lic}" ] && die "Could not find requested license ${src}" 1181 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1154 local l="`basename ${lic}`" 1182 local l="`basename ${lic}`"
1155 1183
1156 # here is where we check for the licenses the user already 1184 # 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 1185 # accepted ... if we don't find a match, we make the user accept
1158 local shopts=$- 1186 local shopts=$-
1214 # first we figure out how many cds we're dealing with by 1242 # first we figure out how many cds we're dealing with by
1215 # the # of files they gave us 1243 # the # of files they gave us
1216 local cdcnt=0 1244 local cdcnt=0
1217 local f= 1245 local f=
1218 for f in "$@" ; do 1246 for f in "$@" ; do
1219 cdcnt=$((cdcnt + 1)) 1247 ((++cdcnt))
1220 export CDROM_CHECK_${cdcnt}="$f" 1248 export CDROM_CHECK_${cdcnt}="$f"
1221 done 1249 done
1222 export CDROM_TOTAL_CDS=${cdcnt} 1250 export CDROM_TOTAL_CDS=${cdcnt}
1223 export CDROM_CURRENT_CD=1 1251 export CDROM_CURRENT_CD=1
1224 1252
1225 # now we see if the user gave use CD_ROOT ... 1253 # now we see if the user gave use CD_ROOT ...
1226 # if they did, let's just believe them that it's correct 1254 # 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 1255 if [[ -n ${CD_ROOT}${CD_ROOT_1} ]] ; then
1234 local var= 1256 local var=
1235 cdcnt=0 1257 cdcnt=0
1236 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1258 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1237 cdcnt=$((cdcnt + 1)) 1259 ((++cdcnt))
1238 var="CD_ROOT_${cdcnt}" 1260 var="CD_ROOT_${cdcnt}"
1261 [[ -z ${!var} ]] && var="CD_ROOT"
1239 if [[ -z ${!var} ]] ; then 1262 if [[ -z ${!var} ]] ; then
1240 eerror "You must either use just the CD_ROOT" 1263 eerror "You must either use just the CD_ROOT"
1241 eerror "or specify ALL the CD_ROOT_X variables." 1264 eerror "or specify ALL the CD_ROOT_X variables."
1242 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables." 1265 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables."
1243 die "could not locate CD_ROOT_${cdcnt}" 1266 die "could not locate CD_ROOT_${cdcnt}"
1244 fi 1267 fi
1245 export CDROM_ROOTS_${cdcnt}="${!var}"
1246 done 1268 done
1247 export CDROM_ROOT=${CDROM_ROOTS_1} 1269 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}}
1248 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1270 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1271 export CDROM_SET=-1
1272 for f in ${CDROM_CHECK_1//:/ } ; do
1273 ((++CDROM_SET))
1274 [[ -e ${CD_ROOT}/${f} ]] && break
1275 done
1276 export CDROM_MATCH=${f}
1249 return 1277 return
1250 fi 1278 fi
1251 1279
1280 # User didn't help us out so lets make sure they know they can
1281 # simplify the whole process ...
1252 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1282 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1253 einfon "This ebuild will need the " 1283 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 1284 echo
1260 einfo "If you do not have the CD, but have the data files" 1285 einfo "If you do not have the CD, but have the data files"
1261 einfo "mounted somewhere on your filesystem, just export" 1286 einfo "mounted somewhere on your filesystem, just export"
1262 einfo "the variable CD_ROOT so that it points to the" 1287 einfo "the variable CD_ROOT so that it points to the"
1263 einfo "directory containing the files." 1288 einfo "directory containing the files."
1267 echo 1292 echo
1268 else 1293 else
1269 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1294 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1270 cdcnt=0 1295 cdcnt=0
1271 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1296 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1272 cdcnt=$((cdcnt + 1)) 1297 ((++cdcnt))
1273 var="CDROM_NAME_${cdcnt}" 1298 var="CDROM_NAME_${cdcnt}"
1274 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}" 1299 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}"
1275 done 1300 done
1276 echo 1301 echo
1277 einfo "If you do not have the CDs, but have the data files" 1302 einfo "If you do not have the CDs, but have the data files"
1278 einfo "mounted somewhere on your filesystem, just export" 1303 einfo "mounted somewhere on your filesystem, just export"
1279 einfo "the following variables so they point to the right place:" 1304 einfo "the following variables so they point to the right place:"
1280 einfon "" 1305 einfon ""
1281 cdcnt=0 1306 cdcnt=0
1282 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1307 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1283 cdcnt=$((cdcnt + 1)) 1308 ((++cdcnt))
1284 echo -n " CD_ROOT_${cdcnt}" 1309 echo -n " CD_ROOT_${cdcnt}"
1285 done 1310 done
1286 echo 1311 echo
1287 einfo "Or, if you have all the files in the same place, or" 1312 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" 1313 einfo "you only have one cdrom, you can export CD_ROOT"
1291 echo 1316 echo
1292 einfo "For example:" 1317 einfo "For example:"
1293 einfo "export CD_ROOT_1=/mnt/cdrom" 1318 einfo "export CD_ROOT_1=/mnt/cdrom"
1294 echo 1319 echo
1295 fi 1320 fi
1321
1322 export CDROM_SET=""
1296 export CDROM_CURRENT_CD=0 1323 export CDROM_CURRENT_CD=0
1297 cdrom_load_next_cd 1324 cdrom_load_next_cd
1298} 1325}
1299 1326
1300# this is only used when you need access to more than one cd. 1327# 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. 1328# 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. 1329# 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. 1330# remember, you can only go forward in the cd chain, you can't go back.
1304cdrom_load_next_cd() { 1331cdrom_load_next_cd() {
1305 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1306 local var= 1332 local var
1307 1333 ((++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 1334
1313 unset CDROM_ROOT 1335 unset CDROM_ROOT
1314 var=CDROM_ROOTS_${CDROM_CURRENT_CD} 1336 var=CD_ROOT_${CDROM_CURRENT_CD}
1337 [[ -z ${!var} ]] && var="CD_ROOT"
1315 if [[ -z ${!var} ]] ; then 1338 if [[ -z ${!var} ]] ; then
1316 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1339 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1317 cdrom_locate_file_on_cd ${!var} 1340 _cdrom_locate_file_on_cd ${!var}
1318 else 1341 else
1319 export CDROM_ROOT=${!var} 1342 export CDROM_ROOT=${!var}
1320 fi 1343 fi
1321 1344
1322 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1345 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 1350# 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 1351# found, then a message asking for the user to insert the cdrom will be
1329# displayed and we'll hang out here until: 1352# displayed and we'll hang out here until:
1330# (1) the file is found on a mounted cdrom 1353# (1) the file is found on a mounted cdrom
1331# (2) the user hits CTRL+C 1354# (2) the user hits CTRL+C
1332cdrom_locate_file_on_cd() { 1355_cdrom_locate_file_on_cd() {
1356 local mline=""
1357 local showedmsg=0
1358
1333 while [[ -z ${CDROM_ROOT} ]] ; do 1359 while [[ -z ${CDROM_ROOT} ]] ; do
1360 local i=0
1361 local -a cdset=(${*//:/ })
1362 if [[ -n ${CDROM_SET} ]] ; then
1363 cdset=(${cdset[${CDROM_SET}]})
1364 fi
1365
1366 while [[ -n ${cdset[${i}]} ]] ; do
1334 local dir="$(dirname ${@})" 1367 local dir=$(dirname ${cdset[${i}]})
1335 local file="$(basename ${@})" 1368 local file=$(basename ${cdset[${i}]})
1336 local mline=""
1337 local showedmsg=0
1338 1369
1339 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do 1370 for mline in $(mount | gawk '/(iso|cdrom|fs=cdfss)/ {print $3}') ; do
1340 [[ -d ${mline}/${dir} ]] || continue 1371 [[ -d ${mline}/${dir} ]] || continue
1341 [[ ! -z $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] \ 1372 if [[ -n $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] ; then
1342 && export CDROM_ROOT=${mline} 1373 export CDROM_ROOT=${mline}
1374 export CDROM_SET=${i}
1375 export CDROM_MATCH=${cdset[${i}]}
1376 return
1377 fi
1378 done
1379
1380 ((++i))
1343 done 1381 done
1344 1382
1345 if [[ -z ${CDROM_ROOT} ]] ; then
1346 echo 1383 echo
1347 if [[ ${showedmsg} -eq 0 ]] ; then 1384 if [[ ${showedmsg} -eq 0 ]] ; then
1348 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1385 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1349 if [[ -z ${CDROM_NAME} ]] ; then 1386 if [[ -z ${CDROM_NAME} ]] ; then
1350 einfo "Please insert the cdrom for ${PN} now !" 1387 einfo "Please insert+mount the cdrom for ${PN} now !"
1351 else
1352 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1353 fi
1354 else 1388 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 !" 1389 einfo "Please insert+mount the ${CDROM_NAME} cdrom now !"
1360 fi
1361 fi 1390 fi
1362 showedmsg=1 1391 else
1392 if [[ -z ${CDROM_NAME_1} ]] ; then
1393 einfo "Please insert+mount cd #${CDROM_CURRENT_CD} for ${PN} now !"
1394 else
1395 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1396 einfo "Please insert+mount the ${!var} cdrom now !"
1397 fi
1363 fi 1398 fi
1399 showedmsg=1
1400 fi
1364 einfo "Press return to scan for the cd again" 1401 einfo "Press return to scan for the cd again"
1365 einfo "or hit CTRL+C to abort the emerge." 1402 einfo "or hit CTRL+C to abort the emerge."
1366 read 1403 echo
1367 fi 1404 einfo "If you are having trouble with the detection"
1405 einfo "of your CD, it is possible that you do not have"
1406 einfo "Joliet support enabled in your kernel. Please"
1407 einfo "check that CONFIG_JOLIET is enabled in your kernel."
1408 read || die "something is screwed with your system"
1368 done 1409 done
1369} 1410}
1370 1411
1371# Make sure that LINGUAS only contains languages that 1412# Make sure that LINGUAS only contains languages that
1372# a package can support 1413# a package can support
1382# directories and uses the union of the lists. 1423# directories and uses the union of the lists.
1383strip-linguas() { 1424strip-linguas() {
1384 local ls newls 1425 local ls newls
1385 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then 1426 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1386 local op=$1; shift 1427 local op=$1; shift
1387 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1428 ls=" $(find "$1" -name '*.po' -exec basename {} \;) "; shift
1388 local d f 1429 local d f
1389 for d in "$@" ; do 1430 for d in "$@" ; do
1390 if [[ ${op} == "-u" ]] ; then 1431 if [[ ${op} == "-u" ]] ; then
1391 newls=${ls} 1432 newls=${ls}
1392 else 1433 else
1393 newls="" 1434 newls=""
1394 fi 1435 fi
1395 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1436 for f in $(find "$d" -name '*.po' -exec basename {} \;) ; do
1396 if [[ ${op} == "-i" ]] ; then 1437 if [[ ${op} == "-i" ]] ; then
1397 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}" 1438 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}"
1398 else 1439 else
1399 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}" 1440 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}"
1400 fi 1441 fi
1456 1497
1457# Jeremy Huddleston <eradicator@gentoo.org>: 1498# Jeremy Huddleston <eradicator@gentoo.org>:
1458# preserve_old_lib /path/to/libblah.so.0 1499# preserve_old_lib /path/to/libblah.so.0
1459# preserve_old_lib_notify /path/to/libblah.so.0 1500# preserve_old_lib_notify /path/to/libblah.so.0
1460# 1501#
1461# These functions are useful when a lib in your package changes --soname. Such 1502# These functions are useful when a lib in your package changes --library. Such
1462# an example might be from libogg.so.0 to libogg.so.1. Removing libogg.so.0 1503# an example might be from libogg.so.0 to libogg.so.1. Removing libogg.so.0
1463# would break packages that link against it. Most people get around this 1504# would break packages that link against it. Most people get around this
1464# by using the portage SLOT mechanism, but that is not always a relevant 1505# by using the portage SLOT mechanism, but that is not always a relevant
1465# solution, so instead you can add the following to your ebuilds: 1506# solution, so instead you can add the following to your ebuilds:
1466# 1507#
1493 LIB=$1 1534 LIB=$1
1494 1535
1495 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1536 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1496 SONAME=`basename ${LIB}` 1537 SONAME=`basename ${LIB}`
1497 1538
1498 einfo "An old version of an installed library was detected on your system." 1539 ewarn "An old version of an installed library was detected on your system."
1499 einfo "In order to avoid breaking packages that link against is, this older version" 1540 ewarn "In order to avoid breaking packages that link against it, this older version"
1500 einfo "is not being removed. In order to make full use of this newer version," 1541 ewarn "is not being removed. In order to make full use of this newer version,"
1501 einfo "you will need to execute the following command:" 1542 ewarn "you will need to execute the following command:"
1502 einfo " revdep-rebuild --soname ${SONAME}" 1543 ewarn " revdep-rebuild --library ${SONAME}"
1503 einfo 1544 ewarn
1504 einfo "After doing that, you can safely remove ${LIB}" 1545 ewarn "After doing that, you can safely remove ${LIB}"
1505 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild" 1546 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1506 fi 1547 fi
1507} 1548}
1508 1549
1509# Hack for people to figure out if a package was built with 1550# Hack for people to figure out if a package was built with
1510# certain USE flags 1551# certain USE flags
1520 [[ ${opt:0:1} = "-" ]] && shift || opt="-a" 1561 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1521 1562
1522 local PKG=$(best_version $1) 1563 local PKG=$(best_version $1)
1523 shift 1564 shift
1524 1565
1525 local USEFILE="${ROOT}/var/db/pkg/${PKG}/USE" 1566 local USEFILE=${ROOT}/var/db/pkg/${PKG}/USE
1567
1568 # if the USE file doesnt exist, assume the $PKG is either
1569 # injected or package.provided
1526 [[ ! -e ${USEFILE} ]] && return 1 1570 [[ ! -e ${USEFILE} ]] && return 0
1527 1571
1528 local USE_BUILT=$(<${USEFILE}) 1572 local USE_BUILT=$(<${USEFILE})
1529 while [[ $# -gt 0 ]] ; do 1573 while [[ $# -gt 0 ]] ; do
1530 if [[ ${opt} = "-o" ]] ; then 1574 if [[ ${opt} = "-o" ]] ; then
1531 has $1 ${USE_BUILT} && return 0 1575 has $1 ${USE_BUILT} && return 0
1583# $4 == extra LD_LIBRARY_PATH's (make it : delimited) 1627# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1584# $5 == path for wrapper 1628# $5 == path for wrapper
1585make_wrapper() { 1629make_wrapper() {
1586 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5 1630 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1587 local tmpwrapper=$(emktemp) 1631 local tmpwrapper=$(emktemp)
1632 # We don't want to quote ${bin} so that people can pass complex
1633 # things as $bin ... "./someprog --args"
1588 cat << EOF > "${tmpwrapper}" 1634 cat << EOF > "${tmpwrapper}"
1589#!/bin/sh 1635#!/bin/sh
1590cd "${chdir}" 1636cd "${chdir:-.}"
1637if [ -n "${libdir}" ] ; then
1638 if [ "\${LD_LIBRARY_PATH+set}" = "set" ] ; then
1591export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}" 1639 export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1640 else
1641 export LD_LIBRARY_PATH="${libdir}"
1642 fi
1643fi
1592exec ${bin} "\$@" 1644exec ${bin} "\$@"
1593EOF 1645EOF
1594 chmod go+rx "${tmpwrapper}" 1646 chmod go+rx "${tmpwrapper}"
1595 if [ -n "${5}" ] 1647 if [[ -n ${path} ]] ; then
1596 then
1597 exeinto ${5} 1648 exeinto "${path}"
1598 newexe "${tmpwrapper}" "${wrapper}" 1649 newexe "${tmpwrapper}" "${wrapper}"
1599 else 1650 else
1600 newbin "${tmpwrapper}" "${wrapper}" 1651 newbin "${tmpwrapper}" "${wrapper}"
1601 fi 1652 fi
1602} 1653}

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

  ViewVC Help
Powered by ViewVC 1.1.20