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

Diff of /eclass/eutils.eclass

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

Revision 1.212 Revision 1.263
1# Copyright 1999-2005 Gentoo Foundation 1# Copyright 1999-2006 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.212 2005/10/22 02:32:48 vapier Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.263 2006/11/13 20:58:41 vapier Exp $
4#
5# Author: Martin Schlemmer <azarah@gentoo.org>
6# 4#
7# This eclass is for general purpose functions that most ebuilds 5# This eclass is for general purpose functions that most ebuilds
8# have to implement themselves. 6# have to implement themselves.
9# 7#
10# NB: If you add anything, please comment it! 8# NB: If you add anything, please comment it!
9#
10# Maintainer: see each individual function, base-system@gentoo.org as default
11 11
12inherit multilib portability 12inherit multilib portability
13
14DEPEND="!bootstrap? ( sys-devel/patch )"
15# sys-apps/shadow is needed for useradd, etc, bug #94745.
16 13
17DESCRIPTION="Based on the ${ECLASS} eclass" 14DESCRIPTION="Based on the ${ECLASS} eclass"
18 15
19# Wait for the supplied number of seconds. If no argument is supplied, defaults 16# Wait for the supplied number of seconds. If no argument is supplied, defaults
20# to five seconds. If the EPAUSE_IGNORE env var is set, don't wait. If we're not 17# to five seconds. If the EPAUSE_IGNORE env var is set, don't wait. If we're not
21# outputting to a terminal, don't wait. For compatability purposes, the argument 18# outputting to a terminal, don't wait. For compatability purposes, the argument
22# must be an integer greater than zero. 19# must be an integer greater than zero.
23# Bug 62950, Ciaran McCreesh <ciaranm@gentoo.org> (05 Sep 2004) 20# Bug 62950, Ciaran McCreesh <ciaranm@gentoo.org> (05 Sep 2004)
24epause() { 21epause() {
25 if [ -z "$EPAUSE_IGNORE" ] && [ -t 1 ] ; then 22 [[ -z ${EPAUSE_IGNORE} ]] && sleep ${1:-5}
26 sleep ${1:-5}
27 fi
28} 23}
29 24
30# Beep the specified number of times (defaults to five). If our output 25# Beep the specified number of times (defaults to five). If our output
31# is not a terminal, don't beep. If the EBEEP_IGNORE env var is set, 26# is not a terminal, don't beep. If the EBEEP_IGNORE env var is set,
32# don't beep. 27# don't beep.
33# Bug 62950, Ciaran McCreesh <ciaranm@gentoo.org> (05 Sep 2004) 28# Bug 62950, Ciaran McCreesh <ciaranm@gentoo.org> (05 Sep 2004)
34ebeep() { 29ebeep() {
35 local n 30 local n
36 if [ -z "$EBEEP_IGNORE" ] && [ -t 1 ] ; then 31 if [[ -z ${EBEEP_IGNORE} ]] ; then
37 for ((n=1 ; n <= ${1:-5} ; n++)) ; do 32 for ((n=1 ; n <= ${1:-5} ; n++)) ; do
38 echo -ne "\a" 33 echo -ne "\a"
39 sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null 34 sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
40 echo -ne "\a" 35 echo -ne "\a"
41 sleep 1 36 sleep 1
60# to point to the latest version of the library present. 55# to point to the latest version of the library present.
61# 56#
62# <azarah@gentoo.org> (26 Oct 2002) 57# <azarah@gentoo.org> (26 Oct 2002)
63# 58#
64gen_usr_ldscript() { 59gen_usr_ldscript() {
60 if [[ $(type -t _tc_gen_usr_ldscript) == "function" ]] ; then
61 _tc_gen_usr_ldscript "$@"
62 return $?
63 fi
64
65 ewarn "QA Notice: Please upgrade your ebuild to use toolchain-funcs"
66 ewarn "QA Notice: rather than gen_usr_ldscript() from eutils"
67
65 local libdir="$(get_libdir)" 68 local lib libdir=$(get_libdir)
66 # Just make sure it exists 69 # Just make sure it exists
67 dodir /usr/${libdir} 70 dodir /usr/${libdir}
68 71
69 for lib in "${@}" ; do 72 for lib in "${@}" ; do
70 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT 73 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT
76 79
77 See bug http://bugs.gentoo.org/4411 for more info. 80 See bug http://bugs.gentoo.org/4411 for more info.
78 */ 81 */
79 GROUP ( /${libdir}/${lib} ) 82 GROUP ( /${libdir}/${lib} )
80 END_LDSCRIPT 83 END_LDSCRIPT
81 fperms a+x "/usr/${libdir}/${lib}" 84 fperms a+x "/usr/${libdir}/${lib}" || die "could not change perms on ${lib}"
82 done 85 done
83} 86}
84 87
85# Simple function to draw a line consisting of '=' the same length as $*
86# - only to be used by epatch()
87#
88# <azarah@gentoo.org> (11 Nov 2002)
89#
90draw_line() {
91 local i=0
92 local str_length=""
93
94 # Handle calls that do not have args, or wc not being installed ...
95 if [ -z "$1" -o ! -x "$(which wc 2>/dev/null)" ]
96 then
97 echo "==============================================================="
98 return 0
99 fi
100
101 # Get the length of $*
102 str_length="$(echo -n "$*" | wc -m)"
103
104 while [ "$i" -lt "${str_length}" ]
105 do
106 echo -n "="
107
108 i=$((i + 1))
109 done
110
111 echo
112
113 return 0
114}
115 88
116# Default directory where patches are located 89# Default directory where patches are located
117EPATCH_SOURCE="${WORKDIR}/patch" 90EPATCH_SOURCE="${WORKDIR}/patch"
118# Default extension for patches 91# Default extension for patches
119EPATCH_SUFFIX="patch.bz2" 92EPATCH_SUFFIX="patch.bz2"
120# Default options for patch 93# Default options for patch
121# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571 94# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571
122# Set --no-backup-if-mismatch so we don't leave '.orig' files behind. 95# Set --no-backup-if-mismatch so we don't leave '.orig' files behind.
96# Set -E to automatically remove empty files.
123EPATCH_OPTS="-g0 --no-backup-if-mismatch" 97EPATCH_OPTS="-g0 -E --no-backup-if-mismatch"
124# List of patches not to apply. Not this is only file names, 98# List of patches not to apply. Not this is only file names,
125# and not the full path .. 99# and not the full path ..
126EPATCH_EXCLUDE="" 100EPATCH_EXCLUDE=""
127# Change the printed message for a single patch. 101# Change the printed message for a single patch.
128EPATCH_SINGLE_MSG="" 102EPATCH_SINGLE_MSG=""
166# hand its a directory, it will set EPATCH_SOURCE to this. 140# hand its a directory, it will set EPATCH_SOURCE to this.
167# 141#
168# <azarah@gentoo.org> (10 Nov 2002) 142# <azarah@gentoo.org> (10 Nov 2002)
169# 143#
170epatch() { 144epatch() {
145 _epatch_draw_line() {
146 [[ -z $1 ]] && set "$(printf "%65s" '')"
147 echo "${1//?/=}"
148 }
171 _epatch_assert() { local _pipestatus=${PIPESTATUS[*]}; [[ ${_pipestatus// /} -eq 0 ]] ; } 149 _epatch_assert() { local _pipestatus=${PIPESTATUS[*]}; [[ ${_pipestatus// /} -eq 0 ]] ; }
172 local PIPE_CMD="" 150 local PIPE_CMD=""
173 local STDERR_TARGET="${T}/$$.out" 151 local STDERR_TARGET="${T}/$$.out"
174 local PATCH_TARGET="${T}/$$.patch" 152 local PATCH_TARGET="${T}/$$.patch"
175 local PATCH_SUFFIX="" 153 local PATCH_SUFFIX=""
285 263
286 # Allow for prefix to differ ... im lazy, so shoot me :/ 264 # Allow for prefix to differ ... im lazy, so shoot me :/
287 while [ "${count}" -lt 5 ] 265 while [ "${count}" -lt 5 ]
288 do 266 do
289 # Generate some useful debug info ... 267 # Generate some useful debug info ...
290 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 268 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
291 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 269 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
292 270
293 if [ "${PATCH_SUFFIX}" != "patch" ] 271 if [ "${PATCH_SUFFIX}" != "patch" ]
294 then 272 then
295 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 273 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
300 278
301 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 279 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
302 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 280 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
303 281
304 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 282 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
305 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 283 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
306 284
307 if [ "${PATCH_SUFFIX}" != "patch" ] 285 if [ "${PATCH_SUFFIX}" != "patch" ]
308 then 286 then
309 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1 287 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
310 then 288 then
316 fi 294 fi
317 fi 295 fi
318 296
319 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f ; _epatch_assert) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1 297 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f ; _epatch_assert) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
320 then 298 then
321 draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 299 _epatch_draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
322 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 300 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
323 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 301 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
324 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 302 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
325 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 303 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
326 304
327 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1 305 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1
328 _epatch_assert 306 _epatch_assert
329 307
330 if [ "$?" -ne 0 ] 308 if [ "$?" -ne 0 ]
396 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM} 374 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}
397 done 375 done
398 ${exe} "${tmp}" || ${exe} -p "${tmp}" 376 ${exe} "${tmp}" || ${exe} -p "${tmp}"
399 echo "${tmp}" 377 echo "${tmp}"
400 else 378 else
401 [[ ${exe} == "touch" ]] \ 379 if [[ ${exe} == "touch" ]] ; then
402 && exe="-p" \ 380 [[ ${USERLAND} == "GNU" ]] \
403 || exe="-d" 381 && mktemp -p "${topdir}" \
404 mktemp ${exe} "${topdir}" 382 || TMPDIR="${topdir}" mktemp -t tmp
383 else
384 [[ ${USERLAND} == "GNU" ]] \
385 && mktemp -d "${topdir}" \
386 || TMPDIR="${topdir}" mktemp -dt tmp
387 fi
405 fi 388 fi
406} 389}
407 390
408# Small wrapper for getent (Linux), nidump (Mac OS X), 391# Small wrapper for getent (Linux), nidump (Mac OS X),
409# and pw (FreeBSD) used in enewuser()/enewgroup() 392# and pw (FreeBSD) used in enewuser()/enewgroup()
421 *) # Numeric 404 *) # Numeric
422 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 405 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
423 ;; 406 ;;
424 esac 407 esac
425 ;; 408 ;;
426 *-freebsd*) 409 *-freebsd*|*-dragonfly*)
427 local opts action="user" 410 local opts action="user"
428 [[ $1 == "passwd" ]] || action="group" 411 [[ $1 == "passwd" ]] || action="group"
429 412
430 # lookup by uid/gid 413 # lookup by uid/gid
431 if [[ $2 == [[:digit:]]* ]] ; then 414 if [[ $2 == [[:digit:]]* ]] ; then
432 [[ ${action} == "user" ]] && opts="-u" || opts="-g" 415 [[ ${action} == "user" ]] && opts="-u" || opts="-g"
433 fi 416 fi
434 417
435 pw show ${action} ${opts} "$2" -q 418 pw show ${action} ${opts} "$2" -q
436 ;; 419 ;;
437 *-netbsd*) 420 *-netbsd*|*-openbsd*)
438 grep "$2:\*:" /etc/$1 421 grep "$2:\*:" /etc/$1
439 ;; 422 ;;
440 *) 423 *)
441 type -p nscd >& /dev/null && nscd -i "$1" 424 type -p nscd >& /dev/null && nscd -i "$1"
442 getent "$1" "$2" 425 getent "$1" "$2"
456# shell: /bin/false 439# shell: /bin/false
457# homedir: /dev/null 440# homedir: /dev/null
458# groups: none 441# groups: none
459# extra: comment of 'added by portage for ${PN}' 442# extra: comment of 'added by portage for ${PN}'
460enewuser() { 443enewuser() {
444 case ${EBUILD_PHASE} in
445 unpack|compile|test|install)
446 eerror "'enewuser()' called from '${EBUILD_PHASE}()' which is not a pkg_* function."
447 eerror "Package fails at QA and at life. Please file a bug."
448 die "Bad package! enewuser is only for use in pkg_* functions!"
449 esac
450
461 # get the username 451 # get the username
462 local euser=$1; shift 452 local euser=$1; shift
463 if [[ -z ${euser} ]] ; then 453 if [[ -z ${euser} ]] ; then
464 eerror "No username specified !" 454 eerror "No username specified !"
465 die "Cannot call enewuser without a username" 455 die "Cannot call enewuser without a username"
466 fi 456 fi
467 457
468 # lets see if the username already exists 458 # lets see if the username already exists
469 if [[ ${euser} == $(egetent passwd "${euser}" | cut -d: -f1) ]] ; then 459 if [[ -n $(egetent passwd "${euser}") ]] ; then
470 return 0 460 return 0
471 fi 461 fi
472 einfo "Adding user '${euser}' to your system ..." 462 einfo "Adding user '${euser}' to your system ..."
473 463
474 # options to pass to useradd 464 # options to pass to useradd
475 local opts= 465 local opts=
476 466
477 # handle uid 467 # handle uid
478 local euid=$1; shift 468 local euid=$1; shift
479 if [[ ! -z ${euid} ]] && [[ ${euid} != "-1" ]] ; then 469 if [[ -n ${euid} && ${euid} != -1 ]] ; then
480 if [[ ${euid} -gt 0 ]] ; then 470 if [[ ${euid} -gt 0 ]] ; then
481 if [[ ! -z $(egetent passwd ${euid}) ]] ; then 471 if [[ -n $(egetent passwd ${euid}) ]] ; then
482 euid="next" 472 euid="next"
483 fi 473 fi
484 else 474 else
485 eerror "Userid given but is not greater than 0 !" 475 eerror "Userid given but is not greater than 0 !"
486 die "${euid} is not a valid UID" 476 die "${euid} is not a valid UID"
487 fi 477 fi
488 else 478 else
489 euid="next" 479 euid="next"
490 fi 480 fi
491 if [[ ${euid} == "next" ]] ; then 481 if [[ ${euid} == "next" ]] ; then
492 for euid in $(seq 101 999) ; do 482 for ((euid = 101; euid <= 999; euid++)); do
493 [[ -z $(egetent passwd ${euid}) ]] && break 483 [[ -z $(egetent passwd ${euid}) ]] && break
494 done 484 done
495 fi 485 fi
496 opts="${opts} -u ${euid}" 486 opts="${opts} -u ${euid}"
497 einfo " - Userid: ${euid}" 487 einfo " - Userid: ${euid}"
498 488
499 # handle shell 489 # handle shell
500 local eshell=$1; shift 490 local eshell=$1; shift
501 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then 491 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
502 if [[ ! -e ${eshell} ]] ; then 492 if [[ ! -e ${ROOT}${eshell} ]] ; then
503 eerror "A shell was specified but it does not exist !" 493 eerror "A shell was specified but it does not exist !"
504 die "${eshell} does not exist" 494 die "${eshell} does not exist in ${ROOT}"
495 fi
496 if [[ ${eshell} == */false || ${eshell} == */nologin ]] ; then
497 eerror "Do not specify ${eshell} yourself, use -1"
498 die "Pass '-1' as the shell parameter"
505 fi 499 fi
506 else 500 else
507 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do 501 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do
508 [[ -x ${ROOT}${shell} ]] && break 502 [[ -x ${ROOT}${shell} ]] && break
509 done 503 done
510 504
511 if [[ ${shell} == "/dev/null" ]] ; then 505 if [[ ${shell} == "/dev/null" ]] ; then
512 eerror "Unable to identify the shell to use" 506 eerror "Unable to identify the shell to use, proceeding with userland default."
513 die "Unable to identify the shell to use" 507 case ${USERLAND} in
508 GNU) shell="/bin/false" ;;
509 BSD) shell="/sbin/nologin" ;;
510 Darwin) shell="/usr/sbin/nologin" ;;
511 *) die "Unable to identify the default shell for userland ${USERLAND}"
512 esac
514 fi 513 fi
515 514
516 eshell=${shell} 515 eshell=${shell}
517 fi 516 fi
518 einfo " - Shell: ${eshell}" 517 einfo " - Shell: ${eshell}"
580 einfo "Please report the ebuild along with the info below" 579 einfo "Please report the ebuild along with the info below"
581 einfo "eextra: $@" 580 einfo "eextra: $@"
582 die "Required function missing" 581 die "Required function missing"
583 fi 582 fi
584 ;; 583 ;;
585 *-freebsd*) 584 *-freebsd*|*-dragonfly*)
586 if [[ -z $@ ]] ; then 585 if [[ -z $@ ]] ; then
587 pw useradd ${euser} ${opts} \ 586 pw useradd ${euser} ${opts} \
588 -c "added by portage for ${PN}" \ 587 -c "added by portage for ${PN}" \
589 die "enewuser failed" 588 die "enewuser failed"
590 else 589 else
600 else 599 else
601 einfo " - Extra: $@" 600 einfo " - Extra: $@"
602 useradd ${opts} ${euser} "$@" || die "enewuser failed" 601 useradd ${opts} ${euser} "$@" || die "enewuser failed"
603 fi 602 fi
604 ;; 603 ;;
604
605 *-openbsd*)
606 if [[ -z $@ ]] ; then
607 useradd -u ${euid} -s ${eshell} \
608 -d ${ehome} -c "Added by portage for ${PN}" \
609 -g ${egroups} ${euser} || die "enewuser failed"
610 else
611 einfo " - Extra: $@"
612 useradd -u ${euid} -s ${eshell} \
613 -d ${ehome} -c "Added by portage for ${PN}" \
614 -g ${egroups} ${euser} "$@" || die "enewuser failed"
615 fi
616 ;;
617
605 *) 618 *)
606 if [[ -z $@ ]] ; then 619 if [[ -z $@ ]] ; then
607 useradd ${opts} ${euser} \ 620 useradd ${opts} ${euser} \
608 -c "added by portage for ${PN}" \ 621 -c "added by portage for ${PN}" \
609 || die "enewuser failed" 622 || die "enewuser failed"
633# Default values if you do not specify any: 646# Default values if you do not specify any:
634# groupname: REQUIRED ! 647# groupname: REQUIRED !
635# gid: next available (see groupadd(8)) 648# gid: next available (see groupadd(8))
636# extra: none 649# extra: none
637enewgroup() { 650enewgroup() {
651 case ${EBUILD_PHASE} in
652 unpack|compile|test|install)
653 eerror "'enewgroup()' called from '${EBUILD_PHASE}()' which is not a pkg_* function."
654 eerror "Package fails at QA and at life. Please file a bug."
655 die "Bad package! enewgroup is only for use in pkg_* functions!"
656 esac
657
638 # get the group 658 # get the group
639 local egroup="$1"; shift 659 local egroup="$1"; shift
640 if [ -z "${egroup}" ] 660 if [ -z "${egroup}" ]
641 then 661 then
642 eerror "No group specified !" 662 eerror "No group specified !"
643 die "Cannot call enewgroup without a group" 663 die "Cannot call enewgroup without a group"
644 fi 664 fi
645 665
646 # see if group already exists 666 # see if group already exists
647 if [ "${egroup}" == "`egetent group \"${egroup}\" | cut -d: -f1`" ] 667 if [[ -n $(egetent group "${egroup}") ]]; then
648 then
649 return 0 668 return 0
650 fi 669 fi
651 einfo "Adding group '${egroup}' to your system ..." 670 einfo "Adding group '${egroup}' to your system ..."
652 671
653 # options to pass to useradd 672 # options to pass to useradd
696 fi 715 fi
697 716
698 # If we need the next available 717 # If we need the next available
699 case ${egid} in 718 case ${egid} in
700 *[!0-9]*) # Non numeric 719 *[!0-9]*) # Non numeric
701 for egid in $(seq 101 999); do 720 for ((egid = 101; egid <= 999; egid++)); do
702 [ -z "`egetent group ${egid}`" ] && break 721 [[ -z $(egetent group ${egid}) ]] && break
703 done 722 done
704 esac 723 esac
705 dscl . create /groups/${egroup} gid ${egid} 724 dscl . create /groups/${egroup} gid ${egid}
706 dscl . create /groups/${egroup} passwd '*' 725 dscl . create /groups/${egroup} passwd '*'
707 ;; 726 ;;
708 727
709 *-freebsd*) 728 *-freebsd*|*-dragonfly*)
710 case ${egid} in 729 case ${egid} in
711 *[!0-9]*) # Non numeric 730 *[!0-9]*) # Non numeric
712 for egid in $(seq 101 999); do 731 for ((egid = 101; egid <= 999; egid++)); do
713 [ -z "`egetent group ${egid}`" ] && break 732 [[ -z $(egetent group ${egid}) ]] && break
714 done 733 done
715 esac 734 esac
716 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 735 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
717 ;; 736 ;;
718 737
719 *-netbsd*) 738 *-netbsd*)
720 case ${egid} in 739 case ${egid} in
721 *[!0-9]*) # Non numeric 740 *[!0-9]*) # Non numeric
722 for egid in $(seq 101 999); do 741 for ((egid = 101; egid <= 999; egid++)); do
723 [ -z "`egetent group ${egid}`" ] && break 742 [[ -z $(egetent group ${egid}) ]] && break
724 done 743 done
725 esac 744 esac
726 groupadd -g ${egid} ${egroup} || die "enewgroup failed" 745 groupadd -g ${egid} ${egroup} || die "enewgroup failed"
727 ;; 746 ;;
728 747
736# Simple script to replace 'dos2unix' binaries 755# Simple script to replace 'dos2unix' binaries
737# vapier@gentoo.org 756# vapier@gentoo.org
738# 757#
739# edos2unix(file, <more files> ...) 758# edos2unix(file, <more files> ...)
740edos2unix() { 759edos2unix() {
741 for f in "$@" 760 echo "$@" | xargs sed -i 's/\r$//'
742 do
743 cp "${f}" ${T}/edos2unix
744 sed 's/\r$//' ${T}/edos2unix > "${f}"
745 done
746} 761}
747 762
748 763
749############################################################## 764##############################################################
750# START: Handle .desktop files and menu entries # 765# START: Handle .desktop files and menu entries #
754 769
755# Make a desktop file ! 770# Make a desktop file !
756# Great for making those icons in kde/gnome startmenu ! 771# Great for making those icons in kde/gnome startmenu !
757# Amaze your friends ! Get the women ! Join today ! 772# Amaze your friends ! Get the women ! Join today !
758# 773#
759# make_desktop_entry(<binary>, [name], [icon], [type], [path]) 774# make_desktop_entry(<command>, [name], [icon], [type], [path])
760# 775#
761# binary: what binary does the app run with ? 776# binary: what command does the app run with ?
762# name: the name that will show up in the menu 777# name: the name that will show up in the menu
763# icon: give your little like a pretty little icon ... 778# icon: give your little like a pretty little icon ...
764# this can be relative (to /usr/share/pixmaps) or 779# this can be relative (to /usr/share/pixmaps) or
765# a full path to an icon 780# a full path to an icon
766# type: what kind of application is this ? for categories: 781# type: what kind of application is this ? for categories:
802 games) 817 games)
803 case ${catmin} in 818 case ${catmin} in
804 action) type=ActionGame;; 819 action) type=ActionGame;;
805 arcade) type=ArcadeGame;; 820 arcade) type=ArcadeGame;;
806 board) type=BoardGame;; 821 board) type=BoardGame;;
807 kid) type=KidsGame;; 822 kids) type=KidsGame;;
808 emulation) type=Emulator;; 823 emulation) type=Emulator;;
809 puzzle) type=LogicGame;; 824 puzzle) type=LogicGame;;
810 rpg) type=RolePlaying;; 825 rpg) type=RolePlaying;;
811 roguelike) type=RolePlaying;; 826 roguelike) type=RolePlaying;;
812 simulation) type=Simulation;; 827 simulation) type=Simulation;;
848 type="Network;${type}" 863 type="Network;${type}"
849 ;; 864 ;;
850 865
851 sci) 866 sci)
852 case ${catmin} in 867 case ${catmin} in
853 astro*) type=Astronomoy;; 868 astro*) type=Astronomy;;
854 bio*) type=Biology;; 869 bio*) type=Biology;;
855 calc*) type=Calculator;; 870 calc*) type=Calculator;;
856 chem*) type=Chemistry;; 871 chem*) type=Chemistry;;
857 geo*) type=Geology;; 872 geo*) type=Geology;;
858 math*) type=Math;; 873 math*) type=Math;;
878 local desktop_name="${PN}" 893 local desktop_name="${PN}"
879 else 894 else
880 local desktop_name="${PN}-${SLOT}" 895 local desktop_name="${PN}-${SLOT}"
881 fi 896 fi
882 local desktop=${T}/${exec%% *}-${desktop_name}.desktop 897 local desktop=${T}/${exec%% *}-${desktop_name}.desktop
898# local desktop=${T}/${exec%% *:-${desktop_name}}.desktop
883 899
884echo "[Desktop Entry] 900echo "[Desktop Entry]
885Encoding=UTF-8 901Encoding=UTF-8
886Version=0.9.2 902Version=0.9.2
887Name=${name} 903Name=${name}
888Type=Application 904Type=Application
889Comment=${DESCRIPTION} 905Comment=${DESCRIPTION}
890Exec=${exec} 906Exec=${exec}
907TryExec=${exec%% *}
891Path=${path} 908Path=${path}
892Icon=${icon} 909Icon=${icon}
893Categories=Application;${type};" > "${desktop}" 910Categories=Application;${type};" > "${desktop}"
894 911
895 ( 912 (
900 ) 917 )
901} 918}
902 919
903# Make a GDM/KDM Session file 920# Make a GDM/KDM Session file
904# 921#
905# make_desktop_entry(<title>, <command>) 922# make_session_desktop(<title>, <command>)
906# title: File to execute to start the Window Manager 923# title: File to execute to start the Window Manager
907# command: Name of the Window Manager 924# command: Name of the Window Manager
908 925
909make_session_desktop() { 926make_session_desktop() {
910 [[ -z $1 ]] && eerror "make_session_desktop: You must specify the title" && return 1 927 [[ -z $1 ]] && eerror "make_session_desktop: You must specify the title" && return 1
1084# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1101# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1085# - If the file is not specified then unpack will utilize ${A}. 1102# - If the file is not specified then unpack will utilize ${A}.
1086# - If the offset is not specified then we will attempt to extract 1103# - If the offset is not specified then we will attempt to extract
1087# the proper offset from the script itself. 1104# the proper offset from the script itself.
1088unpack_makeself() { 1105unpack_makeself() {
1106 local src_input=${1:-${A}}
1089 local src=$(find_unpackable_file "$1") 1107 local src=$(find_unpackable_file "${src_input}")
1090 local skip=$2 1108 local skip=$2
1091 local exe=$3 1109 local exe=$3
1092 1110
1093 [[ -z ${src} ]] && die "Could not locate source for '$1'" 1111 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
1094 1112
1095 local shrtsrc=$(basename "${src}") 1113 local shrtsrc=$(basename "${src}")
1096 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1114 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1097 if [[ -z ${skip} ]] ; then 1115 if [[ -z ${skip} ]] ; then
1098 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}') 1116 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}')
1099 local skip=0 1117 local skip=0
1100 exe=tail 1118 exe=tail
1101 case ${ver} in 1119 case ${ver} in
1102 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same 1120 1.5.*|1.6.0-nv) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same
1103 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1121 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1104 ;; 1122 ;;
1105 2.0|2.0.1) 1123 2.0|2.0.1)
1106 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-) 1124 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-)
1107 ;; 1125 ;;
1141 # lets grab the first few bytes of the file to figure out what kind of archive it is 1159 # lets grab the first few bytes of the file to figure out what kind of archive it is
1142 local tmpfile="$(emktemp)" 1160 local tmpfile="$(emktemp)"
1143 eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}" 1161 eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}"
1144 local filetype="$(file -b "${tmpfile}")" 1162 local filetype="$(file -b "${tmpfile}")"
1145 case ${filetype} in 1163 case ${filetype} in
1146 *tar\ archive) 1164 *tar\ archive*)
1147 eval ${exe} | tar --no-same-owner -xf - 1165 eval ${exe} | tar --no-same-owner -xf -
1148 ;; 1166 ;;
1149 bzip2*) 1167 bzip2*)
1150 eval ${exe} | bzip2 -dc | tar --no-same-owner -xf - 1168 eval ${exe} | bzip2 -dc | tar --no-same-owner -xf -
1151 ;; 1169 ;;
1187 # accepted ... if we don't find a match, we make the user accept 1205 # accepted ... if we don't find a match, we make the user accept
1188 local shopts=$- 1206 local shopts=$-
1189 local alic 1207 local alic
1190 set -o noglob #so that bash doesn't expand "*" 1208 set -o noglob #so that bash doesn't expand "*"
1191 for alic in ${ACCEPT_LICENSE} ; do 1209 for alic in ${ACCEPT_LICENSE} ; do
1192 if [[ ${alic} == * || ${alic} == ${l} ]]; then 1210 if [[ ${alic} == ${l} ]]; then
1193 set +o noglob; set -${shopts} #reset old shell opts 1211 set +o noglob; set -${shopts} #reset old shell opts
1194 return 0 1212 return 0
1195 fi 1213 fi
1196 done 1214 done
1197 set +o noglob; set -$shopts #reset old shell opts 1215 set +o noglob; set -$shopts #reset old shell opts
1230# and when the function returns, you can assume that the cd has been 1248# and when the function returns, you can assume that the cd has been
1231# found at CDROM_ROOT. 1249# found at CDROM_ROOT.
1232# 1250#
1233# normally the cdrom functions will refer to the cds as 'cd #1', 'cd #2', 1251# normally the cdrom functions will refer to the cds as 'cd #1', 'cd #2',
1234# etc... if you want to give the cds better names, then just export 1252# etc... if you want to give the cds better names, then just export
1235# the CDROM_NAME_X variables before calling cdrom_get_cds(). 1253# the appropriate CDROM_NAME variable before calling cdrom_get_cds().
1254# - CDROM_NAME="fooie cd" - for when you only want 1 cd
1255# - CDROM_NAME_1="install cd" - for when you want more than 1 cd
1256# CDROM_NAME_2="data cd"
1257# - CDROM_NAME_SET=( "install cd" "data cd" ) - short hand for CDROM_NAME_#
1236# 1258#
1237# for those multi cd ebuilds, see the cdrom_load_next_cd() below. 1259# for those multi cd ebuilds, see the cdrom_load_next_cd() below.
1238# 1260#
1239# Usage: cdrom_get_cds <file on cd1> [file on cd2] [file on cd3] [...] 1261# Usage: cdrom_get_cds <file on cd1> [file on cd2] [file on cd3] [...]
1240# - this will attempt to locate a cd based upon a file that is on 1262# - this will attempt to locate a cd based upon a file that is on
1244 # first we figure out how many cds we're dealing with by 1266 # first we figure out how many cds we're dealing with by
1245 # the # of files they gave us 1267 # the # of files they gave us
1246 local cdcnt=0 1268 local cdcnt=0
1247 local f= 1269 local f=
1248 for f in "$@" ; do 1270 for f in "$@" ; do
1249 cdcnt=$((cdcnt + 1)) 1271 ((++cdcnt))
1250 export CDROM_CHECK_${cdcnt}="$f" 1272 export CDROM_CHECK_${cdcnt}="$f"
1251 done 1273 done
1252 export CDROM_TOTAL_CDS=${cdcnt} 1274 export CDROM_TOTAL_CDS=${cdcnt}
1253 export CDROM_CURRENT_CD=1 1275 export CDROM_CURRENT_CD=1
1254 1276
1255 # now we see if the user gave use CD_ROOT ... 1277 # now we see if the user gave use CD_ROOT ...
1256 # if they did, let's just believe them that it's correct 1278 # if they did, let's just believe them that it's correct
1257 if [[ ! -z ${CD_ROOT} ]] ; then
1258 export CDROM_ROOT=${CD_ROOT}
1259 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1260 return
1261 fi
1262 # do the same for CD_ROOT_X
1263 if [[ ! -z ${CD_ROOT_1} ]] ; then 1279 if [[ -n ${CD_ROOT}${CD_ROOT_1} ]] ; then
1264 local var= 1280 local var=
1265 cdcnt=0 1281 cdcnt=0
1266 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1282 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1267 cdcnt=$((cdcnt + 1)) 1283 ((++cdcnt))
1268 var="CD_ROOT_${cdcnt}" 1284 var="CD_ROOT_${cdcnt}"
1285 [[ -z ${!var} ]] && var="CD_ROOT"
1269 if [[ -z ${!var} ]] ; then 1286 if [[ -z ${!var} ]] ; then
1270 eerror "You must either use just the CD_ROOT" 1287 eerror "You must either use just the CD_ROOT"
1271 eerror "or specify ALL the CD_ROOT_X variables." 1288 eerror "or specify ALL the CD_ROOT_X variables."
1272 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables." 1289 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables."
1273 die "could not locate CD_ROOT_${cdcnt}" 1290 die "could not locate CD_ROOT_${cdcnt}"
1274 fi 1291 fi
1275 export CDROM_ROOTS_${cdcnt}="${!var}"
1276 done 1292 done
1277 export CDROM_ROOT=${CDROM_ROOTS_1} 1293 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}}
1278 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1294 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1295 export CDROM_SET=-1
1296 for f in ${CDROM_CHECK_1//:/ } ; do
1297 ((++CDROM_SET))
1298 [[ -e ${CD_ROOT}/${f} ]] && break
1299 done
1300 export CDROM_MATCH=${f}
1279 return 1301 return
1280 fi 1302 fi
1281 1303
1304 # User didn't help us out so lets make sure they know they can
1305 # simplify the whole process ...
1282 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1306 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1283 einfon "This ebuild will need the " 1307 einfo "This ebuild will need the ${CDROM_NAME:-cdrom for ${PN}}"
1284 if [[ -z ${CDROM_NAME} ]] ; then
1285 echo "cdrom for ${PN}."
1286 else
1287 echo "${CDROM_NAME}."
1288 fi
1289 echo 1308 echo
1290 einfo "If you do not have the CD, but have the data files" 1309 einfo "If you do not have the CD, but have the data files"
1291 einfo "mounted somewhere on your filesystem, just export" 1310 einfo "mounted somewhere on your filesystem, just export"
1292 einfo "the variable CD_ROOT so that it points to the" 1311 einfo "the variable CD_ROOT so that it points to the"
1293 einfo "directory containing the files." 1312 einfo "directory containing the files."
1294 echo 1313 echo
1295 einfo "For example:" 1314 einfo "For example:"
1296 einfo "export CD_ROOT=/mnt/cdrom" 1315 einfo "export CD_ROOT=/mnt/cdrom"
1297 echo 1316 echo
1298 else 1317 else
1318 if [[ -n ${CDROM_NAME_SET} ]] ; then
1319 # Translate the CDROM_NAME_SET array into CDROM_NAME_#
1320 cdcnt=0
1321 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1322 ((++cdcnt))
1323 export CDROM_NAME_${cdcnt}="${CDROM_NAME_SET[$((${cdcnt}-1))]}"
1324 done
1325 fi
1326
1299 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1327 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1300 cdcnt=0 1328 cdcnt=0
1301 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1329 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1302 cdcnt=$((cdcnt + 1)) 1330 ((++cdcnt))
1303 var="CDROM_NAME_${cdcnt}" 1331 var="CDROM_NAME_${cdcnt}"
1304 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}" 1332 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}"
1305 done 1333 done
1306 echo 1334 echo
1307 einfo "If you do not have the CDs, but have the data files" 1335 einfo "If you do not have the CDs, but have the data files"
1308 einfo "mounted somewhere on your filesystem, just export" 1336 einfo "mounted somewhere on your filesystem, just export"
1309 einfo "the following variables so they point to the right place:" 1337 einfo "the following variables so they point to the right place:"
1310 einfon "" 1338 einfon ""
1311 cdcnt=0 1339 cdcnt=0
1312 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1340 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1313 cdcnt=$((cdcnt + 1)) 1341 ((++cdcnt))
1314 echo -n " CD_ROOT_${cdcnt}" 1342 echo -n " CD_ROOT_${cdcnt}"
1315 done 1343 done
1316 echo 1344 echo
1317 einfo "Or, if you have all the files in the same place, or" 1345 einfo "Or, if you have all the files in the same place, or"
1318 einfo "you only have one cdrom, you can export CD_ROOT" 1346 einfo "you only have one cdrom, you can export CD_ROOT"
1321 echo 1349 echo
1322 einfo "For example:" 1350 einfo "For example:"
1323 einfo "export CD_ROOT_1=/mnt/cdrom" 1351 einfo "export CD_ROOT_1=/mnt/cdrom"
1324 echo 1352 echo
1325 fi 1353 fi
1354
1355 export CDROM_SET=""
1326 export CDROM_CURRENT_CD=0 1356 export CDROM_CURRENT_CD=0
1327 cdrom_load_next_cd 1357 cdrom_load_next_cd
1328} 1358}
1329 1359
1330# this is only used when you need access to more than one cd. 1360# this is only used when you need access to more than one cd.
1331# when you have finished using the first cd, just call this function. 1361# when you have finished using the first cd, just call this function.
1332# when it returns, CDROM_ROOT will be pointing to the second cd. 1362# when it returns, CDROM_ROOT will be pointing to the second cd.
1333# remember, you can only go forward in the cd chain, you can't go back. 1363# remember, you can only go forward in the cd chain, you can't go back.
1334cdrom_load_next_cd() { 1364cdrom_load_next_cd() {
1335 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1336 local var= 1365 local var
1337 1366 ((++CDROM_CURRENT_CD))
1338 if [[ ! -z ${CD_ROOT} ]] ; then
1339 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}"
1340 return
1341 fi
1342 1367
1343 unset CDROM_ROOT 1368 unset CDROM_ROOT
1344 var=CDROM_ROOTS_${CDROM_CURRENT_CD} 1369 var=CD_ROOT_${CDROM_CURRENT_CD}
1370 [[ -z ${!var} ]] && var="CD_ROOT"
1345 if [[ -z ${!var} ]] ; then 1371 if [[ -z ${!var} ]] ; then
1346 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1372 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1347 cdrom_locate_file_on_cd ${!var} 1373 _cdrom_locate_file_on_cd ${!var}
1348 else 1374 else
1349 export CDROM_ROOT=${!var} 1375 export CDROM_ROOT=${!var}
1350 fi 1376 fi
1351 1377
1352 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1378 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1357# all it does is try to locate a give file on a cd ... if the cd isn't 1383# all it does is try to locate a give file on a cd ... if the cd isn't
1358# found, then a message asking for the user to insert the cdrom will be 1384# found, then a message asking for the user to insert the cdrom will be
1359# displayed and we'll hang out here until: 1385# displayed and we'll hang out here until:
1360# (1) the file is found on a mounted cdrom 1386# (1) the file is found on a mounted cdrom
1361# (2) the user hits CTRL+C 1387# (2) the user hits CTRL+C
1362cdrom_locate_file_on_cd() { 1388_cdrom_locate_file_on_cd() {
1389 local mline=""
1390 local showedmsg=0
1391
1363 while [[ -z ${CDROM_ROOT} ]] ; do 1392 while [[ -z ${CDROM_ROOT} ]] ; do
1364 local dir=$(dirname "$*") 1393 local i=0
1394 local -a cdset=(${*//:/ })
1395 if [[ -n ${CDROM_SET} ]] ; then
1396 cdset=(${cdset[${CDROM_SET}]})
1397 fi
1398
1399 while [[ -n ${cdset[${i}]} ]] ; do
1400 local dir=$(dirname ${cdset[${i}]})
1365 local file=$(basename "$*") 1401 local file=$(basename ${cdset[${i}]})
1366 local mline=""
1367 local showedmsg=0
1368 1402
1369 for mline in $(mount | egrep -e '(iso|cdrom|fs=cdfss)' | awk '{print $3}') ; do 1403 local point= node= fs= foo=
1370 [[ -d ${mline}/${dir} ]] || continue 1404 while read point node fs foo ; do
1405 [[ *" ${fs} "* != " cd9660 iso9660 " ]] && continue
1406 point=${point//\040/ }
1371 [[ ! -z $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] \ 1407 [[ -z $(find "${point}/${dir}" -maxdepth 1 -iname "${file}") ]] && continue
1372 && export CDROM_ROOT=${mline} 1408 export CDROM_ROOT=${point}
1409 export CDROM_SET=${i}
1410 export CDROM_MATCH=${cdset[${i}]}
1411 return
1412 done <<< "$(get_mounts)"
1413
1414 ((++i))
1373 done 1415 done
1374 1416
1375 if [[ -z ${CDROM_ROOT} ]] ; then
1376 echo 1417 echo
1377 if [[ ${showedmsg} -eq 0 ]] ; then 1418 if [[ ${showedmsg} -eq 0 ]] ; then
1378 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1419 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1379 if [[ -z ${CDROM_NAME} ]] ; then 1420 if [[ -z ${CDROM_NAME} ]] ; then
1380 einfo "Please insert the cdrom for ${PN} now !" 1421 einfo "Please insert+mount the cdrom for ${PN} now !"
1381 else
1382 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1383 fi
1384 else 1422 else
1385 if [[ -z ${CDROM_NAME_1} ]] ; then
1386 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !"
1387 else
1388 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1389 einfo "Please insert+mount the ${!var} cdrom now !" 1423 einfo "Please insert+mount the ${CDROM_NAME} cdrom now !"
1390 fi
1391 fi 1424 fi
1392 showedmsg=1 1425 else
1426 if [[ -z ${CDROM_NAME_1} ]] ; then
1427 einfo "Please insert+mount cd #${CDROM_CURRENT_CD} for ${PN} now !"
1428 else
1429 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1430 einfo "Please insert+mount the ${!var} cdrom now !"
1431 fi
1393 fi 1432 fi
1433 showedmsg=1
1434 fi
1394 einfo "Press return to scan for the cd again" 1435 einfo "Press return to scan for the cd again"
1395 einfo "or hit CTRL+C to abort the emerge." 1436 einfo "or hit CTRL+C to abort the emerge."
1396 echo 1437 echo
1397 einfo "If you are having trouble with the detection" 1438 einfo "If you are having trouble with the detection"
1398 einfo "of your CD, it is possible that you do not have" 1439 einfo "of your CD, it is possible that you do not have"
1399 einfo "Joliet support enabled in your kernel. Please" 1440 einfo "Joliet support enabled in your kernel. Please"
1400 einfo "check that CONFIG_JOLIET is enabled in your kernel." 1441 einfo "check that CONFIG_JOLIET is enabled in your kernel."
1401 read 1442 read || die "something is screwed with your system"
1402 fi
1403 done 1443 done
1404} 1444}
1405 1445
1406# Make sure that LINGUAS only contains languages that 1446# Make sure that LINGUAS only contains languages that
1407# a package can support 1447# a package can support
1414# The -i builds a list of po files found in all the 1454# The -i builds a list of po files found in all the
1415# directories and uses the intersection of the lists. 1455# directories and uses the intersection of the lists.
1416# The -u builds a list of po files found in all the 1456# The -u builds a list of po files found in all the
1417# directories and uses the union of the lists. 1457# directories and uses the union of the lists.
1418strip-linguas() { 1458strip-linguas() {
1419 local ls newls 1459 local ls newls nols
1420 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then 1460 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1421 local op=$1; shift 1461 local op=$1; shift
1422 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1462 ls=$(find "$1" -name '*.po' -exec basename {} .po \;); shift
1423 local d f 1463 local d f
1424 for d in "$@" ; do 1464 for d in "$@" ; do
1425 if [[ ${op} == "-u" ]] ; then 1465 if [[ ${op} == "-u" ]] ; then
1426 newls=${ls} 1466 newls=${ls}
1427 else 1467 else
1428 newls="" 1468 newls=""
1429 fi 1469 fi
1430 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1470 for f in $(find "$d" -name '*.po' -exec basename {} .po \;) ; do
1431 if [[ ${op} == "-i" ]] ; then 1471 if [[ ${op} == "-i" ]] ; then
1432 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}" 1472 hasq ${f} ${ls} && newls="${newls} ${f}"
1433 else 1473 else
1434 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}" 1474 hasq ${f} ${ls} || newls="${newls} ${f}"
1435 fi 1475 fi
1436 done 1476 done
1437 ls=${newls} 1477 ls=${newls}
1438 done 1478 done
1439 ls=${ls//.po}
1440 else 1479 else
1441 ls=$@ 1480 ls="$@"
1442 fi 1481 fi
1443 1482
1444 ls=" ${ls} " 1483 nols=""
1445 newls="" 1484 newls=""
1446 for f in ${LINGUAS} ; do 1485 for f in ${LINGUAS} ; do
1447 if [[ ${ls/ ${f} /} != ${ls} ]] ; then 1486 if hasq ${f} ${ls} ; then
1448 newls="${newls} ${f}" 1487 newls="${newls} ${f}"
1449 else 1488 else
1450 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1489 nols="${nols} ${f}"
1451 fi 1490 fi
1452 done 1491 done
1453 if [[ -z ${newls} ]] ; then 1492 [[ -n ${nols} ]] \
1454 export LINGUAS="" 1493 && ewarn "Sorry, but ${PN} does not support the LINGUAs:" ${nols}
1455 else
1456 export LINGUAS=${newls:1} 1494 export LINGUAS=${newls:1}
1457 fi
1458} 1495}
1459 1496
1460# moved from kernel.eclass since they are generally useful outside of 1497# moved from kernel.eclass since they are generally useful outside of
1461# kernel.eclass -iggy (20041002) 1498# kernel.eclass -iggy (20041002)
1462 1499
1491 1528
1492# Jeremy Huddleston <eradicator@gentoo.org>: 1529# Jeremy Huddleston <eradicator@gentoo.org>:
1493# preserve_old_lib /path/to/libblah.so.0 1530# preserve_old_lib /path/to/libblah.so.0
1494# preserve_old_lib_notify /path/to/libblah.so.0 1531# preserve_old_lib_notify /path/to/libblah.so.0
1495# 1532#
1496# These functions are useful when a lib in your package changes --soname. Such 1533# These functions are useful when a lib in your package changes --library. Such
1497# an example might be from libogg.so.0 to libogg.so.1. Removing libogg.so.0 1534# an example might be from libogg.so.0 to libogg.so.1. Removing libogg.so.0
1498# would break packages that link against it. Most people get around this 1535# would break packages that link against it. Most people get around this
1499# by using the portage SLOT mechanism, but that is not always a relevant 1536# by using the portage SLOT mechanism, but that is not always a relevant
1500# solution, so instead you can add the following to your ebuilds: 1537# solution, so instead you can add the following to your ebuilds:
1501# 1538#
1532 1569
1533 ewarn "An old version of an installed library was detected on your system." 1570 ewarn "An old version of an installed library was detected on your system."
1534 ewarn "In order to avoid breaking packages that link against it, this older version" 1571 ewarn "In order to avoid breaking packages that link against it, this older version"
1535 ewarn "is not being removed. In order to make full use of this newer version," 1572 ewarn "is not being removed. In order to make full use of this newer version,"
1536 ewarn "you will need to execute the following command:" 1573 ewarn "you will need to execute the following command:"
1537 ewarn " revdep-rebuild --soname ${SONAME}" 1574 ewarn " revdep-rebuild --library ${SONAME}"
1538 ewarn 1575 ewarn
1539 ewarn "After doing that, you can safely remove ${LIB}" 1576 ewarn "After doing that, you can safely remove ${LIB}"
1540 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild" 1577 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1541 fi 1578 fi
1542} 1579}
1553built_with_use() { 1590built_with_use() {
1554 local opt=$1 1591 local opt=$1
1555 [[ ${opt:0:1} = "-" ]] && shift || opt="-a" 1592 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1556 1593
1557 local PKG=$(best_version $1) 1594 local PKG=$(best_version $1)
1595 [[ -z ${PKG} ]] && die "Unable to resolve $1 to an installed package"
1558 shift 1596 shift
1559 1597
1560 local USEFILE="${ROOT}/var/db/pkg/${PKG}/USE" 1598 local USEFILE=${ROOT}/var/db/pkg/${PKG}/USE
1561 [[ ! -e ${USEFILE} ]] && return 1 1599 local IUSEFILE=${ROOT}/var/db/pkg/${PKG}/IUSE
1600
1601 # if the USE file doesnt exist, assume the $PKG is either
1602 # injected or package.provided
1603 [[ ! -e ${USEFILE} ]] && die "Unable to determine what USE flags $PKG was built with"
1604
1605 local IUSE_BUILT=$(<${IUSEFILE})
1606 # Don't check USE_EXPAND #147237
1607 local expand
1608 for expand in $(echo ${USE_EXPAND} | tr '[:upper:]' '[:lower:]') ; do
1609 if [[ $1 == ${expand}_* ]] ; then
1610 expand=""
1611 break
1612 fi
1613 done
1614 if [[ -n ${expand} ]] ; then
1615 has $1 ${IUSE_BUILT} || die "$PKG does not actually support the $1 USE flag!"
1616 fi
1562 1617
1563 local USE_BUILT=$(<${USEFILE}) 1618 local USE_BUILT=$(<${USEFILE})
1564 while [[ $# -gt 0 ]] ; do 1619 while [[ $# -gt 0 ]] ; do
1565 if [[ ${opt} = "-o" ]] ; then 1620 if [[ ${opt} = "-o" ]] ; then
1566 has $1 ${USE_BUILT} && return 0 1621 has $1 ${USE_BUILT} && return 0

Legend:
Removed from v.1.212  
changed lines
  Added in v.1.263

  ViewVC Help
Powered by ViewVC 1.1.20