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

Diff of /eclass/eutils.eclass

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

Revision 1.200 Revision 1.255
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.200 2005/09/23 20:44:26 wolf31o2 Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.255 2006/10/24 17:27:31 wolf31o2 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 }
149 _epatch_assert() { local _pipestatus=${PIPESTATUS[*]}; [[ ${_pipestatus// /} -eq 0 ]] ; }
171 local PIPE_CMD="" 150 local PIPE_CMD=""
172 local STDERR_TARGET="${T}/$$.out" 151 local STDERR_TARGET="${T}/$$.out"
173 local PATCH_TARGET="${T}/$$.patch" 152 local PATCH_TARGET="${T}/$$.patch"
174 local PATCH_SUFFIX="" 153 local PATCH_SUFFIX=""
175 local SINGLE_PATCH="no" 154 local SINGLE_PATCH="no"
284 263
285 # Allow for prefix to differ ... im lazy, so shoot me :/ 264 # Allow for prefix to differ ... im lazy, so shoot me :/
286 while [ "${count}" -lt 5 ] 265 while [ "${count}" -lt 5 ]
287 do 266 do
288 # Generate some useful debug info ... 267 # Generate some useful debug info ...
289 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 268 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
290 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 269 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
291 270
292 if [ "${PATCH_SUFFIX}" != "patch" ] 271 if [ "${PATCH_SUFFIX}" != "patch" ]
293 then 272 then
294 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 273 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
299 278
300 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 279 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
301 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##*/}
302 281
303 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 282 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
304 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 283 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
305 284
306 if [ "${PATCH_SUFFIX}" != "patch" ] 285 if [ "${PATCH_SUFFIX}" != "patch" ]
307 then 286 then
308 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
309 then 288 then
313 count=5 292 count=5
314 break 293 break
315 fi 294 fi
316 fi 295 fi
317 296
318 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f) >> ${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
319 then 298 then
320 draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 299 _epatch_draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
321 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 300 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
322 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 301 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
323 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 302 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
324 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 303 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
325 304
326 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
306 _epatch_assert
327 307
328 if [ "$?" -ne 0 ] 308 if [ "$?" -ne 0 ]
329 then 309 then
330 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 310 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
331 echo 311 echo
394 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM} 374 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}
395 done 375 done
396 ${exe} "${tmp}" || ${exe} -p "${tmp}" 376 ${exe} "${tmp}" || ${exe} -p "${tmp}"
397 echo "${tmp}" 377 echo "${tmp}"
398 else 378 else
399 [[ ${exe} == "touch" ]] \ 379 if [[ ${exe} == "touch" ]] ; then
400 && exe="-p" \ 380 [[ ${USERLAND} == "GNU" ]] \
401 || exe="-d" 381 && mktemp -p "${topdir}" \
402 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
403 fi 388 fi
404} 389}
405 390
406# Small wrapper for getent (Linux), nidump (Mac OS X), 391# Small wrapper for getent (Linux), nidump (Mac OS X),
407# and pw (FreeBSD) used in enewuser()/enewgroup() 392# and pw (FreeBSD) used in enewuser()/enewgroup()
408# Joe Jezak <josejx@gmail.com> and usata@gentoo.org 393# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
409# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org> 394# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
410# 395#
411# egetent(database, key) 396# egetent(database, key)
412egetent() { 397egetent() {
413 if [[ "${USERLAND}" == "Darwin" ]] ; then 398 case ${CHOST} in
399 *-darwin*)
414 case "$2" in 400 case "$2" in
415 *[!0-9]*) # Non numeric 401 *[!0-9]*) # Non numeric
416 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 402 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
417 ;; 403 ;;
418 *) # Numeric 404 *) # Numeric
419 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 405 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
420 ;; 406 ;;
421 esac 407 esac
422 elif [[ "${USERLAND}" == "BSD" ]] ; then 408 ;;
423 local action 409 *-freebsd*|*-dragonfly*)
424 if [ "$1" == "passwd" ] 410 local opts action="user"
425 then 411 [[ $1 == "passwd" ]] || action="group"
426 action="user" 412
427 else 413 # lookup by uid/gid
428 action="group" 414 if [[ $2 == [[:digit:]]* ]] ; then
415 [[ ${action} == "user" ]] && opts="-u" || opts="-g"
429 fi 416 fi
417
430 pw show "${action}" "$2" -q 418 pw show ${action} ${opts} "$2" -q
431 else 419 ;;
420 *-netbsd*|*-openbsd*)
421 grep "$2:\*:" /etc/$1
422 ;;
423 *)
432 which nscd >& /dev/null && nscd -i "$1" 424 type -p nscd >& /dev/null && nscd -i "$1"
433 getent "$1" "$2" 425 getent "$1" "$2"
434 fi 426 ;;
427 esac
435} 428}
436 429
437# Simplify/standardize adding users to the system 430# Simplify/standardize adding users to the system
438# vapier@gentoo.org 431# vapier@gentoo.org
439# 432#
446# shell: /bin/false 439# shell: /bin/false
447# homedir: /dev/null 440# homedir: /dev/null
448# groups: none 441# groups: none
449# extra: comment of 'added by portage for ${PN}' 442# extra: comment of 'added by portage for ${PN}'
450enewuser() { 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
451 # get the username 451 # get the username
452 local euser=$1; shift 452 local euser=$1; shift
453 if [[ -z ${euser} ]] ; then 453 if [[ -z ${euser} ]] ; then
454 eerror "No username specified !" 454 eerror "No username specified !"
455 die "Cannot call enewuser without a username" 455 die "Cannot call enewuser without a username"
487 einfo " - Userid: ${euid}" 487 einfo " - Userid: ${euid}"
488 488
489 # handle shell 489 # handle shell
490 local eshell=$1; shift 490 local eshell=$1; shift
491 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then 491 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
492 if [[ ! -e ${eshell} ]] ; then 492 if [[ ! -e ${ROOT}${eshell} ]] ; then
493 eerror "A shell was specified but it does not exist !" 493 eerror "A shell was specified but it does not exist !"
494 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"
495 fi 499 fi
496 else 500 else
497 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
498 [[ -x ${ROOT}${shell} ]] && break; 502 [[ -x ${ROOT}${shell} ]] && break
499 done 503 done
500 504
501 if [[ ${shell} == "/dev/null" ]]; then 505 if [[ ${shell} == "/dev/null" ]] ; then
502 eerror "Unable to identify the shell to use" 506 eerror "Unable to identify the shell to use, proceeding with userland default."
503 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
504 fi 513 fi
505 514
506 eshell=${shell} 515 eshell=${shell}
507 fi 516 fi
508 einfo " - Shell: ${eshell}" 517 einfo " - Shell: ${eshell}"
548 einfo " - Groups: ${egroups}" 557 einfo " - Groups: ${egroups}"
549 558
550 # handle extra and add the user 559 # handle extra and add the user
551 local oldsandbox=${SANDBOX_ON} 560 local oldsandbox=${SANDBOX_ON}
552 export SANDBOX_ON="0" 561 export SANDBOX_ON="0"
553 case ${USERLAND} in 562 case ${CHOST} in
554 Darwin) 563 *-darwin*)
555 ### Make the user 564 ### Make the user
556 if [[ -z $@ ]] ; then 565 if [[ -z $@ ]] ; then
557 dscl . create /users/${euser} uid ${euid} 566 dscl . create /users/${euser} uid ${euid}
558 dscl . create /users/${euser} shell ${eshell} 567 dscl . create /users/${euser} shell ${eshell}
559 dscl . create /users/${euser} home ${ehome} 568 dscl . create /users/${euser} home ${ehome}
570 einfo "Please report the ebuild along with the info below" 579 einfo "Please report the ebuild along with the info below"
571 einfo "eextra: $@" 580 einfo "eextra: $@"
572 die "Required function missing" 581 die "Required function missing"
573 fi 582 fi
574 ;; 583 ;;
575 BSD) 584 *-freebsd*|*-dragonfly*)
576 if [[ -z $@ ]] ; then 585 if [[ -z $@ ]] ; then
577 pw useradd ${euser} ${opts} \ 586 pw useradd ${euser} ${opts} \
578 -c "added by portage for ${PN}" \ 587 -c "added by portage for ${PN}" \
579 die "enewuser failed" 588 die "enewuser failed"
580 else 589 else
581 einfo " - Extra: $@" 590 einfo " - Extra: $@"
582 pw useradd ${euser} ${opts} \ 591 pw useradd ${euser} ${opts} \
583 "$@" || die "enewuser failed" 592 "$@" || die "enewuser failed"
584 fi 593 fi
585 ;; 594 ;;
595
596 *-netbsd*)
597 if [[ -z $@ ]] ; then
598 useradd ${opts} ${euser} || die "enewuser failed"
599 else
600 einfo " - Extra: $@"
601 useradd ${opts} ${euser} "$@" || die "enewuser failed"
602 fi
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
586 *) 618 *)
587 if [[ -z $@ ]] ; then 619 if [[ -z $@ ]] ; then
588 useradd ${opts} ${euser} \ 620 useradd ${opts} ${euser} \
589 -c "added by portage for ${PN}" \ 621 -c "added by portage for ${PN}" \
590 || die "enewuser failed" 622 || die "enewuser failed"
614# Default values if you do not specify any: 646# Default values if you do not specify any:
615# groupname: REQUIRED ! 647# groupname: REQUIRED !
616# gid: next available (see groupadd(8)) 648# gid: next available (see groupadd(8))
617# extra: none 649# extra: none
618enewgroup() { 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
619 # get the group 658 # get the group
620 local egroup="$1"; shift 659 local egroup="$1"; shift
621 if [ -z "${egroup}" ] 660 if [ -z "${egroup}" ]
622 then 661 then
623 eerror "No group specified !" 662 eerror "No group specified !"
640 then 679 then
641 if [ "${egid}" -gt 0 ] 680 if [ "${egid}" -gt 0 ]
642 then 681 then
643 if [ -z "`egetent group ${egid}`" ] 682 if [ -z "`egetent group ${egid}`" ]
644 then 683 then
645 if [[ "${USERLAND}" == "Darwin" ]]; then 684 if [[ "${CHOST}" == *-darwin* ]]; then
646 opts="${opts} ${egid}" 685 opts="${opts} ${egid}"
647 else 686 else
648 opts="${opts} -g ${egid}" 687 opts="${opts} -g ${egid}"
649 fi 688 fi
650 else 689 else
664 opts="${opts} ${eextra}" 703 opts="${opts} ${eextra}"
665 704
666 # add the group 705 # add the group
667 local oldsandbox="${SANDBOX_ON}" 706 local oldsandbox="${SANDBOX_ON}"
668 export SANDBOX_ON="0" 707 export SANDBOX_ON="0"
669 if [[ "${USERLAND}" == "Darwin" ]]; then 708 case ${CHOST} in
709 *-darwin*)
670 if [ ! -z "${eextra}" ]; 710 if [ ! -z "${eextra}" ];
671 then 711 then
672 einfo "Extra options are not supported on Darwin/OS X yet" 712 einfo "Extra options are not supported on Darwin/OS X yet"
673 einfo "Please report the ebuild along with the info below" 713 einfo "Please report the ebuild along with the info below"
674 einfo "eextra: ${eextra}" 714 einfo "eextra: ${eextra}"
675 die "Required function missing" 715 die "Required function missing"
676 fi 716 fi
677 717
678 # If we need the next available 718 # If we need the next available
679 case ${egid} in 719 case ${egid} in
680 *[!0-9]*) # Non numeric 720 *[!0-9]*) # Non numeric
681 for egid in $(seq 101 999); do 721 for egid in $(seq 101 999); do
682 [ -z "`egetent group ${egid}`" ] && break 722 [ -z "`egetent group ${egid}`" ] && break
683 done 723 done
684 esac 724 esac
685 dscl . create /groups/${egroup} gid ${egid} 725 dscl . create /groups/${egroup} gid ${egid}
686 dscl . create /groups/${egroup} passwd '*' 726 dscl . create /groups/${egroup} passwd '*'
687 elif [[ "${USERLAND}" == "BSD" ]] ; then 727 ;;
728
729 *-freebsd*|*-dragonfly*)
688 case ${egid} in 730 case ${egid} in
689 *[!0-9]*) # Non numeric 731 *[!0-9]*) # Non numeric
690 for egid in $(seq 101 999); do 732 for egid in $(seq 101 999); do
691 [ -z "`egetent group ${egid}`" ] && break 733 [ -z "`egetent group ${egid}`" ] && break
692 done 734 done
693 esac 735 esac
694 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 736 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
695 else 737 ;;
738
739 *-netbsd*)
740 case ${egid} in
741 *[!0-9]*) # Non numeric
742 for egid in $(seq 101 999); do
743 [ -z "`egetent group ${egid}`" ] && break
744 done
745 esac
746 groupadd -g ${egid} ${egroup} || die "enewgroup failed"
747 ;;
748
749 *)
696 groupadd ${opts} ${egroup} || die "enewgroup failed" 750 groupadd ${opts} ${egroup} || die "enewgroup failed"
697 fi 751 ;;
752 esac
698 export SANDBOX_ON="${oldsandbox}" 753 export SANDBOX_ON="${oldsandbox}"
699} 754}
700 755
701# Simple script to replace 'dos2unix' binaries 756# Simple script to replace 'dos2unix' binaries
702# vapier@gentoo.org 757# vapier@gentoo.org
719 774
720# Make a desktop file ! 775# Make a desktop file !
721# Great for making those icons in kde/gnome startmenu ! 776# Great for making those icons in kde/gnome startmenu !
722# Amaze your friends ! Get the women ! Join today ! 777# Amaze your friends ! Get the women ! Join today !
723# 778#
724# make_desktop_entry(<binary>, [name], [icon], [type], [path]) 779# make_desktop_entry(<command>, [name], [icon], [type], [path])
725# 780#
726# binary: what binary does the app run with ? 781# binary: what command does the app run with ?
727# name: the name that will show up in the menu 782# name: the name that will show up in the menu
728# icon: give your little like a pretty little icon ... 783# icon: give your little like a pretty little icon ...
729# this can be relative (to /usr/share/pixmaps) or 784# this can be relative (to /usr/share/pixmaps) or
730# a full path to an icon 785# a full path to an icon
731# type: what kind of application is this ? for categories: 786# type: what kind of application is this ? for categories:
767 games) 822 games)
768 case ${catmin} in 823 case ${catmin} in
769 action) type=ActionGame;; 824 action) type=ActionGame;;
770 arcade) type=ArcadeGame;; 825 arcade) type=ArcadeGame;;
771 board) type=BoardGame;; 826 board) type=BoardGame;;
772 kid) type=KidsGame;; 827 kids) type=KidsGame;;
773 emulation) type=Emulator;; 828 emulation) type=Emulator;;
774 puzzle) type=LogicGame;; 829 puzzle) type=LogicGame;;
775 rpg) type=RolePlaying;; 830 rpg) type=RolePlaying;;
776 roguelike) type=RolePlaying;; 831 roguelike) type=RolePlaying;;
777 simulation) type=Simulation;; 832 simulation) type=Simulation;;
813 type="Network;${type}" 868 type="Network;${type}"
814 ;; 869 ;;
815 870
816 sci) 871 sci)
817 case ${catmin} in 872 case ${catmin} in
818 astro*) type=Astronomoy;; 873 astro*) type=Astronomy;;
819 bio*) type=Biology;; 874 bio*) type=Biology;;
820 calc*) type=Calculator;; 875 calc*) type=Calculator;;
821 chem*) type=Chemistry;; 876 chem*) type=Chemistry;;
822 geo*) type=Geology;; 877 geo*) type=Geology;;
823 math*) type=Math;; 878 math*) type=Math;;
843 local desktop_name="${PN}" 898 local desktop_name="${PN}"
844 else 899 else
845 local desktop_name="${PN}-${SLOT}" 900 local desktop_name="${PN}-${SLOT}"
846 fi 901 fi
847 local desktop=${T}/${exec%% *}-${desktop_name}.desktop 902 local desktop=${T}/${exec%% *}-${desktop_name}.desktop
903# local desktop=${T}/${exec%% *:-${desktop_name}}.desktop
848 904
849echo "[Desktop Entry] 905echo "[Desktop Entry]
850Encoding=UTF-8 906Encoding=UTF-8
851Version=0.9.2 907Version=0.9.2
852Name=${name} 908Name=${name}
853Type=Application 909Type=Application
854Comment=${DESCRIPTION} 910Comment=${DESCRIPTION}
855Exec=${exec} 911Exec=${exec}
912TryExec=${exec%% *}
856Path=${path} 913Path=${path}
857Icon=${icon} 914Icon=${icon}
858Categories=Application;${type};" > "${desktop}" 915Categories=Application;${type};" > "${desktop}"
859 916
917 (
918 # wrap the env here so that the 'insinto' call
919 # doesn't corrupt the env of the caller
860 insinto /usr/share/applications 920 insinto /usr/share/applications
861 doins "${desktop}" 921 doins "${desktop}"
862 922 )
863 return 0
864} 923}
865 924
866# Make a GDM/KDM Session file 925# Make a GDM/KDM Session file
867# 926#
868# make_desktop_entry(<title>, <command>) 927# make_session_desktop(<title>, <command>)
869# title: File to execute to start the Window Manager 928# title: File to execute to start the Window Manager
870# command: Name of the Window Manager 929# command: Name of the Window Manager
871 930
872make_session_desktop() { 931make_session_desktop() {
873 [[ -z $1 ]] && eerror "make_session_desktop: You must specify the title" && return 1 932 [[ -z $1 ]] && eerror "make_session_desktop: You must specify the title" && return 1
973 local sizeoff_t=$2 1032 local sizeoff_t=$2
974 1033
975 [[ -z ${src} ]] && die "Could not locate source for '$1'" 1034 [[ -z ${src} ]] && die "Could not locate source for '$1'"
976 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :(" 1035 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :("
977 1036
978 local shrtsrc="`basename ${src}`" 1037 local shrtsrc=$(basename "${src}")
979 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1038 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
980 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1039 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"`
981 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"` 1040 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"`
982 1041
983 # grab metadata for debug reasons 1042 # grab metadata for debug reasons
1047# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1106# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1048# - If the file is not specified then unpack will utilize ${A}. 1107# - If the file is not specified then unpack will utilize ${A}.
1049# - If the offset is not specified then we will attempt to extract 1108# - If the offset is not specified then we will attempt to extract
1050# the proper offset from the script itself. 1109# the proper offset from the script itself.
1051unpack_makeself() { 1110unpack_makeself() {
1111 local src_input=${1:-${A}}
1052 local src=$(find_unpackable_file "$1") 1112 local src=$(find_unpackable_file "${src_input}")
1053 local skip=$2 1113 local skip=$2
1054 local exe=$3 1114 local exe=$3
1055 1115
1056 [[ -z ${src} ]] && die "Could not locate source for '$1'" 1116 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
1057 1117
1058 local shrtsrc=$(basename "${src}") 1118 local shrtsrc=$(basename "${src}")
1059 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1119 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1060 if [ -z "${skip}" ] 1120 if [[ -z ${skip} ]] ; then
1061 then
1062 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1121 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}')
1063 local skip=0 1122 local skip=0
1064 exe=tail 1123 exe=tail
1065 case ${ver} in 1124 case ${ver} in
1066 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same 1125 1.5.*|1.6.0-nv) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same
1067 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1126 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1068 ;; 1127 ;;
1069 2.0|2.0.1) 1128 2.0|2.0.1)
1070 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-) 1129 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-)
1071 ;; 1130 ;;
1079 ;; 1138 ;;
1080 2.1.3) 1139 2.1.3)
1081 skip=`grep -a ^offset= "${src}" | awk '{print $3}'` 1140 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1082 let skip="skip + 1" 1141 let skip="skip + 1"
1083 ;; 1142 ;;
1084 2.1.4) 1143 2.1.4|2.1.5)
1085 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1) 1144 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1)
1086 skip=$(head -n ${skip} "${src}" | wc -c) 1145 skip=$(head -n ${skip} "${src}" | wc -c)
1087 exe="dd" 1146 exe="dd"
1088 ;; 1147 ;;
1089 *) 1148 *)
1151 # accepted ... if we don't find a match, we make the user accept 1210 # accepted ... if we don't find a match, we make the user accept
1152 local shopts=$- 1211 local shopts=$-
1153 local alic 1212 local alic
1154 set -o noglob #so that bash doesn't expand "*" 1213 set -o noglob #so that bash doesn't expand "*"
1155 for alic in ${ACCEPT_LICENSE} ; do 1214 for alic in ${ACCEPT_LICENSE} ; do
1156 if [[ ${alic} == * || ${alic} == ${l} ]]; then 1215 if [[ ${alic} == ${l} ]]; then
1157 set +o noglob; set -${shopts} #reset old shell opts 1216 set +o noglob; set -${shopts} #reset old shell opts
1158 return 0 1217 return 0
1159 fi 1218 fi
1160 done 1219 done
1161 set +o noglob; set -$shopts #reset old shell opts 1220 set +o noglob; set -$shopts #reset old shell opts
1194# and when the function returns, you can assume that the cd has been 1253# and when the function returns, you can assume that the cd has been
1195# found at CDROM_ROOT. 1254# found at CDROM_ROOT.
1196# 1255#
1197# normally the cdrom functions will refer to the cds as 'cd #1', 'cd #2', 1256# normally the cdrom functions will refer to the cds as 'cd #1', 'cd #2',
1198# etc... if you want to give the cds better names, then just export 1257# etc... if you want to give the cds better names, then just export
1199# the CDROM_NAME_X variables before calling cdrom_get_cds(). 1258# the appropriate CDROM_NAME variable before calling cdrom_get_cds().
1259# - CDROM_NAME="fooie cd" - for when you only want 1 cd
1260# - CDROM_NAME_1="install cd" - for when you want more than 1 cd
1261# CDROM_NAME_2="data cd"
1262# - CDROM_NAME_SET=( "install cd" "data cd" ) - short hand for CDROM_NAME_#
1200# 1263#
1201# for those multi cd ebuilds, see the cdrom_load_next_cd() below. 1264# for those multi cd ebuilds, see the cdrom_load_next_cd() below.
1202# 1265#
1203# Usage: cdrom_get_cds <file on cd1> [file on cd2] [file on cd3] [...] 1266# Usage: cdrom_get_cds <file on cd1> [file on cd2] [file on cd3] [...]
1204# - this will attempt to locate a cd based upon a file that is on 1267# - this will attempt to locate a cd based upon a file that is on
1208 # first we figure out how many cds we're dealing with by 1271 # first we figure out how many cds we're dealing with by
1209 # the # of files they gave us 1272 # the # of files they gave us
1210 local cdcnt=0 1273 local cdcnt=0
1211 local f= 1274 local f=
1212 for f in "$@" ; do 1275 for f in "$@" ; do
1213 cdcnt=$((cdcnt + 1)) 1276 ((++cdcnt))
1214 export CDROM_CHECK_${cdcnt}="$f" 1277 export CDROM_CHECK_${cdcnt}="$f"
1215 done 1278 done
1216 export CDROM_TOTAL_CDS=${cdcnt} 1279 export CDROM_TOTAL_CDS=${cdcnt}
1217 export CDROM_CURRENT_CD=1 1280 export CDROM_CURRENT_CD=1
1218 1281
1219 # now we see if the user gave use CD_ROOT ... 1282 # now we see if the user gave use CD_ROOT ...
1220 # if they did, let's just believe them that it's correct 1283 # if they did, let's just believe them that it's correct
1221 if [[ ! -z ${CD_ROOT} ]] ; then
1222 export CDROM_ROOT=${CD_ROOT}
1223 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1224 return
1225 fi
1226 # do the same for CD_ROOT_X
1227 if [[ ! -z ${CD_ROOT_1} ]] ; then 1284 if [[ -n ${CD_ROOT}${CD_ROOT_1} ]] ; then
1228 local var= 1285 local var=
1229 cdcnt=0 1286 cdcnt=0
1230 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1287 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1231 cdcnt=$((cdcnt + 1)) 1288 ((++cdcnt))
1232 var="CD_ROOT_${cdcnt}" 1289 var="CD_ROOT_${cdcnt}"
1290 [[ -z ${!var} ]] && var="CD_ROOT"
1233 if [[ -z ${!var} ]] ; then 1291 if [[ -z ${!var} ]] ; then
1234 eerror "You must either use just the CD_ROOT" 1292 eerror "You must either use just the CD_ROOT"
1235 eerror "or specify ALL the CD_ROOT_X variables." 1293 eerror "or specify ALL the CD_ROOT_X variables."
1236 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables." 1294 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables."
1237 die "could not locate CD_ROOT_${cdcnt}" 1295 die "could not locate CD_ROOT_${cdcnt}"
1238 fi 1296 fi
1239 export CDROM_ROOTS_${cdcnt}="${!var}"
1240 done 1297 done
1241 export CDROM_ROOT=${CDROM_ROOTS_1} 1298 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}}
1242 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1299 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1300 export CDROM_SET=-1
1301 for f in ${CDROM_CHECK_1//:/ } ; do
1302 ((++CDROM_SET))
1303 [[ -e ${CD_ROOT}/${f} ]] && break
1304 done
1305 export CDROM_MATCH=${f}
1243 return 1306 return
1244 fi 1307 fi
1245 1308
1309 # User didn't help us out so lets make sure they know they can
1310 # simplify the whole process ...
1246 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1311 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1247 einfon "This ebuild will need the " 1312 einfo "This ebuild will need the ${CDROM_NAME:-cdrom for ${PN}}"
1248 if [[ -z ${CDROM_NAME} ]] ; then
1249 echo "cdrom for ${PN}."
1250 else
1251 echo "${CDROM_NAME}."
1252 fi
1253 echo 1313 echo
1254 einfo "If you do not have the CD, but have the data files" 1314 einfo "If you do not have the CD, but have the data files"
1255 einfo "mounted somewhere on your filesystem, just export" 1315 einfo "mounted somewhere on your filesystem, just export"
1256 einfo "the variable CD_ROOT so that it points to the" 1316 einfo "the variable CD_ROOT so that it points to the"
1257 einfo "directory containing the files." 1317 einfo "directory containing the files."
1258 echo 1318 echo
1259 einfo "For example:" 1319 einfo "For example:"
1260 einfo "export CD_ROOT=/mnt/cdrom" 1320 einfo "export CD_ROOT=/mnt/cdrom"
1261 echo 1321 echo
1262 else 1322 else
1323 if [[ -n ${CDROM_NAME_SET} ]] ; then
1324 # Translate the CDROM_NAME_SET array into CDROM_NAME_#
1325 cdcnt=0
1326 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1327 ((++cdcnt))
1328 export CDROM_NAME_${cdcnt}="${CDROM_NAME_SET[$((${cdcnt}-1))]}"
1329 done
1330 fi
1331
1263 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1332 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1264 cdcnt=0 1333 cdcnt=0
1265 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1334 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1266 cdcnt=$((cdcnt + 1)) 1335 ((++cdcnt))
1267 var="CDROM_NAME_${cdcnt}" 1336 var="CDROM_NAME_${cdcnt}"
1268 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}" 1337 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}"
1269 done 1338 done
1270 echo 1339 echo
1271 einfo "If you do not have the CDs, but have the data files" 1340 einfo "If you do not have the CDs, but have the data files"
1272 einfo "mounted somewhere on your filesystem, just export" 1341 einfo "mounted somewhere on your filesystem, just export"
1273 einfo "the following variables so they point to the right place:" 1342 einfo "the following variables so they point to the right place:"
1274 einfon "" 1343 einfon ""
1275 cdcnt=0 1344 cdcnt=0
1276 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1345 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1277 cdcnt=$((cdcnt + 1)) 1346 ((++cdcnt))
1278 echo -n " CD_ROOT_${cdcnt}" 1347 echo -n " CD_ROOT_${cdcnt}"
1279 done 1348 done
1280 echo 1349 echo
1281 einfo "Or, if you have all the files in the same place, or" 1350 einfo "Or, if you have all the files in the same place, or"
1282 einfo "you only have one cdrom, you can export CD_ROOT" 1351 einfo "you only have one cdrom, you can export CD_ROOT"
1285 echo 1354 echo
1286 einfo "For example:" 1355 einfo "For example:"
1287 einfo "export CD_ROOT_1=/mnt/cdrom" 1356 einfo "export CD_ROOT_1=/mnt/cdrom"
1288 echo 1357 echo
1289 fi 1358 fi
1359
1360 export CDROM_SET=""
1290 export CDROM_CURRENT_CD=0 1361 export CDROM_CURRENT_CD=0
1291 cdrom_load_next_cd 1362 cdrom_load_next_cd
1292} 1363}
1293 1364
1294# this is only used when you need access to more than one cd. 1365# this is only used when you need access to more than one cd.
1295# when you have finished using the first cd, just call this function. 1366# when you have finished using the first cd, just call this function.
1296# when it returns, CDROM_ROOT will be pointing to the second cd. 1367# when it returns, CDROM_ROOT will be pointing to the second cd.
1297# remember, you can only go forward in the cd chain, you can't go back. 1368# remember, you can only go forward in the cd chain, you can't go back.
1298cdrom_load_next_cd() { 1369cdrom_load_next_cd() {
1299 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1300 local var= 1370 local var
1301 1371 ((++CDROM_CURRENT_CD))
1302 if [[ ! -z ${CD_ROOT} ]] ; then
1303 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}"
1304 return
1305 fi
1306 1372
1307 unset CDROM_ROOT 1373 unset CDROM_ROOT
1308 var=CDROM_ROOTS_${CDROM_CURRENT_CD} 1374 var=CD_ROOT_${CDROM_CURRENT_CD}
1375 [[ -z ${!var} ]] && var="CD_ROOT"
1309 if [[ -z ${!var} ]] ; then 1376 if [[ -z ${!var} ]] ; then
1310 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1377 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1311 cdrom_locate_file_on_cd ${!var} 1378 _cdrom_locate_file_on_cd ${!var}
1312 else 1379 else
1313 export CDROM_ROOT=${!var} 1380 export CDROM_ROOT=${!var}
1314 fi 1381 fi
1315 1382
1316 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1383 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1321# all it does is try to locate a give file on a cd ... if the cd isn't 1388# all it does is try to locate a give file on a cd ... if the cd isn't
1322# found, then a message asking for the user to insert the cdrom will be 1389# found, then a message asking for the user to insert the cdrom will be
1323# displayed and we'll hang out here until: 1390# displayed and we'll hang out here until:
1324# (1) the file is found on a mounted cdrom 1391# (1) the file is found on a mounted cdrom
1325# (2) the user hits CTRL+C 1392# (2) the user hits CTRL+C
1326cdrom_locate_file_on_cd() { 1393_cdrom_locate_file_on_cd() {
1394 local mline=""
1395 local showedmsg=0
1396
1327 while [[ -z ${CDROM_ROOT} ]] ; do 1397 while [[ -z ${CDROM_ROOT} ]] ; do
1328 local dir=$(dirname "$*") 1398 local i=0
1399 local -a cdset=(${*//:/ })
1400 if [[ -n ${CDROM_SET} ]] ; then
1401 cdset=(${cdset[${CDROM_SET}]})
1402 fi
1403
1404 while [[ -n ${cdset[${i}]} ]] ; do
1405 local dir=$(dirname ${cdset[${i}]})
1329 local file=$(basename "$*") 1406 local file=$(basename ${cdset[${i}]})
1330 local mline=""
1331 local showedmsg=0
1332 1407
1333 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do 1408 for mline in $(mount | gawk '/(iso|cdrom|fs=cdfss)/ {print $3}') ; do
1334 [[ -d ${mline}/${dir} ]] || continue 1409 [[ -d ${mline}/${dir} ]] || continue
1335 [[ ! -z $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] \ 1410 if [[ -n $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] ; then
1336 && export CDROM_ROOT=${mline} 1411 export CDROM_ROOT=${mline}
1412 export CDROM_SET=${i}
1413 export CDROM_MATCH=${cdset[${i}]}
1414 return
1415 fi
1416 done
1417
1418 ((++i))
1337 done 1419 done
1338 1420
1339 if [[ -z ${CDROM_ROOT} ]] ; then
1340 echo 1421 echo
1341 if [[ ${showedmsg} -eq 0 ]] ; then 1422 if [[ ${showedmsg} -eq 0 ]] ; then
1342 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1423 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1343 if [[ -z ${CDROM_NAME} ]] ; then 1424 if [[ -z ${CDROM_NAME} ]] ; then
1344 einfo "Please insert the cdrom for ${PN} now !" 1425 einfo "Please insert+mount the cdrom for ${PN} now !"
1345 else
1346 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1347 fi
1348 else 1426 else
1349 if [[ -z ${CDROM_NAME_1} ]] ; then
1350 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !"
1351 else
1352 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1353 einfo "Please insert+mount the ${!var} cdrom now !" 1427 einfo "Please insert+mount the ${CDROM_NAME} cdrom now !"
1354 fi
1355 fi 1428 fi
1356 showedmsg=1 1429 else
1430 if [[ -z ${CDROM_NAME_1} ]] ; then
1431 einfo "Please insert+mount cd #${CDROM_CURRENT_CD} for ${PN} now !"
1432 else
1433 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1434 einfo "Please insert+mount the ${!var} cdrom now !"
1435 fi
1357 fi 1436 fi
1437 showedmsg=1
1438 fi
1358 einfo "Press return to scan for the cd again" 1439 einfo "Press return to scan for the cd again"
1359 einfo "or hit CTRL+C to abort the emerge." 1440 einfo "or hit CTRL+C to abort the emerge."
1360 echo 1441 echo
1361 einfo "If you are having trouble with the detection" 1442 einfo "If you are having trouble with the detection"
1362 einfo "of your CD, it is possible that you do not have" 1443 einfo "of your CD, it is possible that you do not have"
1363 einfo "Joliet support enabled in your kernel. Please" 1444 einfo "Joliet support enabled in your kernel. Please"
1364 einfo "check that CONFIG_JOLIET is enabled in your kernel." 1445 einfo "check that CONFIG_JOLIET is enabled in your kernel."
1365 read 1446 read || die "something is screwed with your system"
1366 fi
1367 done 1447 done
1368} 1448}
1369 1449
1370# Make sure that LINGUAS only contains languages that 1450# Make sure that LINGUAS only contains languages that
1371# a package can support 1451# a package can support
1378# The -i builds a list of po files found in all the 1458# The -i builds a list of po files found in all the
1379# directories and uses the intersection of the lists. 1459# directories and uses the intersection of the lists.
1380# The -u builds a list of po files found in all the 1460# The -u builds a list of po files found in all the
1381# directories and uses the union of the lists. 1461# directories and uses the union of the lists.
1382strip-linguas() { 1462strip-linguas() {
1383 local ls newls 1463 local ls newls nols
1384 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then 1464 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1385 local op=$1; shift 1465 local op=$1; shift
1386 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1466 ls=$(find "$1" -name '*.po' -exec basename {} .po \;); shift
1387 local d f 1467 local d f
1388 for d in "$@" ; do 1468 for d in "$@" ; do
1389 if [[ ${op} == "-u" ]] ; then 1469 if [[ ${op} == "-u" ]] ; then
1390 newls=${ls} 1470 newls=${ls}
1391 else 1471 else
1392 newls="" 1472 newls=""
1393 fi 1473 fi
1394 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1474 for f in $(find "$d" -name '*.po' -exec basename {} .po \;) ; do
1395 if [[ ${op} == "-i" ]] ; then 1475 if [[ ${op} == "-i" ]] ; then
1396 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}" 1476 hasq ${f} ${ls} && newls="${newls} ${f}"
1397 else 1477 else
1398 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}" 1478 hasq ${f} ${ls} || newls="${newls} ${f}"
1399 fi 1479 fi
1400 done 1480 done
1401 ls=${newls} 1481 ls=${newls}
1402 done 1482 done
1403 ls=${ls//.po}
1404 else 1483 else
1405 ls=$@ 1484 ls="$@"
1406 fi 1485 fi
1407 1486
1408 ls=" ${ls} " 1487 nols=""
1409 newls="" 1488 newls=""
1410 for f in ${LINGUAS} ; do 1489 for f in ${LINGUAS} ; do
1411 if [[ ${ls/ ${f} /} != ${ls} ]] ; then 1490 if hasq ${f} ${ls} ; then
1412 newls="${newls} ${f}" 1491 newls="${newls} ${f}"
1413 else 1492 else
1414 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1493 nols="${nols} ${f}"
1415 fi 1494 fi
1416 done 1495 done
1417 if [[ -z ${newls} ]] ; then 1496 [[ -n ${nols} ]] \
1418 export LINGUAS="" 1497 && ewarn "Sorry, but ${PN} does not support the LINGUAs:" ${nols}
1419 else
1420 export LINGUAS=${newls:1} 1498 export LINGUAS=${newls:1}
1421 fi
1422} 1499}
1423 1500
1424# moved from kernel.eclass since they are generally useful outside of 1501# moved from kernel.eclass since they are generally useful outside of
1425# kernel.eclass -iggy (20041002) 1502# kernel.eclass -iggy (20041002)
1426 1503
1455 1532
1456# Jeremy Huddleston <eradicator@gentoo.org>: 1533# Jeremy Huddleston <eradicator@gentoo.org>:
1457# preserve_old_lib /path/to/libblah.so.0 1534# preserve_old_lib /path/to/libblah.so.0
1458# preserve_old_lib_notify /path/to/libblah.so.0 1535# preserve_old_lib_notify /path/to/libblah.so.0
1459# 1536#
1460# These functions are useful when a lib in your package changes --soname. Such 1537# These functions are useful when a lib in your package changes --library. Such
1461# an example might be from libogg.so.0 to libogg.so.1. Removing libogg.so.0 1538# an example might be from libogg.so.0 to libogg.so.1. Removing libogg.so.0
1462# would break packages that link against it. Most people get around this 1539# would break packages that link against it. Most people get around this
1463# by using the portage SLOT mechanism, but that is not always a relevant 1540# by using the portage SLOT mechanism, but that is not always a relevant
1464# solution, so instead you can add the following to your ebuilds: 1541# solution, so instead you can add the following to your ebuilds:
1465# 1542#
1496 1573
1497 ewarn "An old version of an installed library was detected on your system." 1574 ewarn "An old version of an installed library was detected on your system."
1498 ewarn "In order to avoid breaking packages that link against it, this older version" 1575 ewarn "In order to avoid breaking packages that link against it, this older version"
1499 ewarn "is not being removed. In order to make full use of this newer version," 1576 ewarn "is not being removed. In order to make full use of this newer version,"
1500 ewarn "you will need to execute the following command:" 1577 ewarn "you will need to execute the following command:"
1501 ewarn " revdep-rebuild --soname ${SONAME}" 1578 ewarn " revdep-rebuild --library ${SONAME}"
1502 ewarn 1579 ewarn
1503 ewarn "After doing that, you can safely remove ${LIB}" 1580 ewarn "After doing that, you can safely remove ${LIB}"
1504 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild" 1581 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1505 fi 1582 fi
1506} 1583}
1517built_with_use() { 1594built_with_use() {
1518 local opt=$1 1595 local opt=$1
1519 [[ ${opt:0:1} = "-" ]] && shift || opt="-a" 1596 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1520 1597
1521 local PKG=$(best_version $1) 1598 local PKG=$(best_version $1)
1599 [[ -z ${PKG} ]] && die "Unable to resolve $1 to an installed package"
1522 shift 1600 shift
1523 1601
1524 local USEFILE="${ROOT}/var/db/pkg/${PKG}/USE" 1602 local USEFILE=${ROOT}/var/db/pkg/${PKG}/USE
1525 [[ ! -e ${USEFILE} ]] && return 1 1603 local IUSEFILE=${ROOT}/var/db/pkg/${PKG}/IUSE
1604
1605 # if the USE file doesnt exist, assume the $PKG is either
1606 # injected or package.provided
1607 [[ ! -e ${USEFILE} ]] && die "Unable to determine what USE flags $PKG was built with"
1608
1609 local IUSE_BUILT=$(<${IUSEFILE})
1610 # Don't check USE_EXPAND #147237
1611 local expand
1612 for expand in $(echo ${USE_EXPAND} | tr '[:upper:]' '[:lower:]') ; do
1613 if [[ $1 == ${expand}_* ]] ; then
1614 expand=""
1615 break
1616 fi
1617 done
1618 if [[ -n ${expand} ]] ; then
1619 has $1 ${IUSE_BUILT} || die "$PKG does not actually support the $1 USE flag!"
1620 fi
1526 1621
1527 local USE_BUILT=$(<${USEFILE}) 1622 local USE_BUILT=$(<${USEFILE})
1528 while [[ $# -gt 0 ]] ; do 1623 while [[ $# -gt 0 ]] ; do
1529 if [[ ${opt} = "-o" ]] ; then 1624 if [[ ${opt} = "-o" ]] ; then
1530 has $1 ${USE_BUILT} && return 0 1625 has $1 ${USE_BUILT} && return 0
1582# $4 == extra LD_LIBRARY_PATH's (make it : delimited) 1677# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1583# $5 == path for wrapper 1678# $5 == path for wrapper
1584make_wrapper() { 1679make_wrapper() {
1585 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5 1680 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1586 local tmpwrapper=$(emktemp) 1681 local tmpwrapper=$(emktemp)
1682 # We don't want to quote ${bin} so that people can pass complex
1683 # things as $bin ... "./someprog --args"
1587 cat << EOF > "${tmpwrapper}" 1684 cat << EOF > "${tmpwrapper}"
1588#!/bin/sh 1685#!/bin/sh
1589cd "${chdir}" 1686cd "${chdir:-.}"
1687if [ -n "${libdir}" ] ; then
1688 if [ "\${LD_LIBRARY_PATH+set}" = "set" ] ; then
1590export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}" 1689 export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1690 else
1691 export LD_LIBRARY_PATH="${libdir}"
1692 fi
1693fi
1591exec ${bin} "\$@" 1694exec ${bin} "\$@"
1592EOF 1695EOF
1593 chmod go+rx "${tmpwrapper}" 1696 chmod go+rx "${tmpwrapper}"
1594 if [ -n "${5}" ] 1697 if [[ -n ${path} ]] ; then
1595 then
1596 exeinto ${5} 1698 exeinto "${path}"
1597 newexe "${tmpwrapper}" "${wrapper}" 1699 newexe "${tmpwrapper}" "${wrapper}"
1598 else 1700 else
1599 newbin "${tmpwrapper}" "${wrapper}" 1701 newbin "${tmpwrapper}" "${wrapper}"
1600 fi 1702 fi
1601} 1703}

Legend:
Removed from v.1.200  
changed lines
  Added in v.1.255

  ViewVC Help
Powered by ViewVC 1.1.20