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

Diff of /eclass/eutils.eclass

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

Revision 1.204 Revision 1.247
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.204 2005/10/07 04:15:20 vapier Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.247 2006/08/11 02:21:47 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() {
65 local libdir="$(get_libdir)" 60 local lib libdir=$(get_libdir)
66 # Just make sure it exists 61 # Just make sure it exists
67 dodir /usr/${libdir} 62 dodir /usr/${libdir}
68 63
69 for lib in "${@}" ; do 64 for lib in "${@}" ; do
70 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT 65 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT
76 71
77 See bug http://bugs.gentoo.org/4411 for more info. 72 See bug http://bugs.gentoo.org/4411 for more info.
78 */ 73 */
79 GROUP ( /${libdir}/${lib} ) 74 GROUP ( /${libdir}/${lib} )
80 END_LDSCRIPT 75 END_LDSCRIPT
81 fperms a+x "/usr/${libdir}/${lib}" 76 fperms a+x "/usr/${libdir}/${lib}" || die "could not change perms on ${lib}"
82 done 77 done
83} 78}
84 79
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 80
116# Default directory where patches are located 81# Default directory where patches are located
117EPATCH_SOURCE="${WORKDIR}/patch" 82EPATCH_SOURCE="${WORKDIR}/patch"
118# Default extension for patches 83# Default extension for patches
119EPATCH_SUFFIX="patch.bz2" 84EPATCH_SUFFIX="patch.bz2"
120# Default options for patch 85# Default options for patch
121# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571 86# 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. 87# Set --no-backup-if-mismatch so we don't leave '.orig' files behind.
88# Set -E to automatically remove empty files.
123EPATCH_OPTS="-g0 --no-backup-if-mismatch" 89EPATCH_OPTS="-g0 -E --no-backup-if-mismatch"
124# List of patches not to apply. Not this is only file names, 90# List of patches not to apply. Not this is only file names,
125# and not the full path .. 91# and not the full path ..
126EPATCH_EXCLUDE="" 92EPATCH_EXCLUDE=""
127# Change the printed message for a single patch. 93# Change the printed message for a single patch.
128EPATCH_SINGLE_MSG="" 94EPATCH_SINGLE_MSG=""
166# hand its a directory, it will set EPATCH_SOURCE to this. 132# hand its a directory, it will set EPATCH_SOURCE to this.
167# 133#
168# <azarah@gentoo.org> (10 Nov 2002) 134# <azarah@gentoo.org> (10 Nov 2002)
169# 135#
170epatch() { 136epatch() {
137 _epatch_draw_line() {
138 [[ -z $1 ]] && set "$(printf "%65s" '')"
139 echo "${1//?/=}"
140 }
141 _epatch_assert() { local _pipestatus=${PIPESTATUS[*]}; [[ ${_pipestatus// /} -eq 0 ]] ; }
171 local PIPE_CMD="" 142 local PIPE_CMD=""
172 local STDERR_TARGET="${T}/$$.out" 143 local STDERR_TARGET="${T}/$$.out"
173 local PATCH_TARGET="${T}/$$.patch" 144 local PATCH_TARGET="${T}/$$.patch"
174 local PATCH_SUFFIX="" 145 local PATCH_SUFFIX=""
175 local SINGLE_PATCH="no" 146 local SINGLE_PATCH="no"
284 255
285 # Allow for prefix to differ ... im lazy, so shoot me :/ 256 # Allow for prefix to differ ... im lazy, so shoot me :/
286 while [ "${count}" -lt 5 ] 257 while [ "${count}" -lt 5 ]
287 do 258 do
288 # Generate some useful debug info ... 259 # Generate some useful debug info ...
289 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 260 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
290 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 261 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
291 262
292 if [ "${PATCH_SUFFIX}" != "patch" ] 263 if [ "${PATCH_SUFFIX}" != "patch" ]
293 then 264 then
294 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 265 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
299 270
300 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 271 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
301 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 272 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
302 273
303 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 274 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
304 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 275 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
305 276
306 if [ "${PATCH_SUFFIX}" != "patch" ] 277 if [ "${PATCH_SUFFIX}" != "patch" ]
307 then 278 then
308 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1 279 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
309 then 280 then
313 count=5 284 count=5
314 break 285 break
315 fi 286 fi
316 fi 287 fi
317 288
318 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1 289 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f ; _epatch_assert) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
319 then 290 then
320 draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 291 _epatch_draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
321 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 292 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
322 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 293 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
323 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 294 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
324 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 295 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
325 296
326 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1 297 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1
298 _epatch_assert
327 299
328 if [ "$?" -ne 0 ] 300 if [ "$?" -ne 0 ]
329 then 301 then
330 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 302 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
331 echo 303 echo
394 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM} 366 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}
395 done 367 done
396 ${exe} "${tmp}" || ${exe} -p "${tmp}" 368 ${exe} "${tmp}" || ${exe} -p "${tmp}"
397 echo "${tmp}" 369 echo "${tmp}"
398 else 370 else
399 [[ ${exe} == "touch" ]] \ 371 if [[ ${exe} == "touch" ]] ; then
400 && exe="-p" \ 372 [[ ${USERLAND} == "GNU" ]] \
401 || exe="-d" 373 && mktemp -p "${topdir}" \
402 mktemp ${exe} "${topdir}" 374 || TMPDIR="${topdir}" mktemp -t tmp
375 else
376 [[ ${USERLAND} == "GNU" ]] \
377 && mktemp -d "${topdir}" \
378 || TMPDIR="${topdir}" mktemp -dt tmp
379 fi
403 fi 380 fi
404} 381}
405 382
406# Small wrapper for getent (Linux), nidump (Mac OS X), 383# Small wrapper for getent (Linux), nidump (Mac OS X),
407# and pw (FreeBSD) used in enewuser()/enewgroup() 384# and pw (FreeBSD) used in enewuser()/enewgroup()
408# Joe Jezak <josejx@gmail.com> and usata@gentoo.org 385# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
409# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org> 386# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
410# 387#
411# egetent(database, key) 388# egetent(database, key)
412egetent() { 389egetent() {
413 if [[ "${USERLAND}" == "Darwin" ]] ; then 390 case ${CHOST} in
391 *-darwin*)
414 case "$2" in 392 case "$2" in
415 *[!0-9]*) # Non numeric 393 *[!0-9]*) # Non numeric
416 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 394 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
417 ;; 395 ;;
418 *) # Numeric 396 *) # Numeric
419 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 397 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
420 ;; 398 ;;
421 esac 399 esac
422 elif [[ "${USERLAND}" == "BSD" ]] ; then 400 ;;
401 *-freebsd*|*-dragonfly*)
423 local opts action="user" 402 local opts action="user"
424 [[ $1 == "passwd" ]] || action="group" 403 [[ $1 == "passwd" ]] || action="group"
425 404
426 # lookup by uid/gid 405 # lookup by uid/gid
427 if [[ $2 == [[:digit:]]* ]] ; then 406 if [[ $2 == [[:digit:]]* ]] ; then
428 [[ ${action} == "user" ]] && opts="-u" || opts="-g" 407 [[ ${action} == "user" ]] && opts="-u" || opts="-g"
429 fi 408 fi
430 409
431 pw show ${action} ${opts} "$2" -q 410 pw show ${action} ${opts} "$2" -q
432 else 411 ;;
412 *-netbsd*|*-openbsd*)
413 grep "$2:\*:" /etc/$1
414 ;;
415 *)
433 which nscd >& /dev/null && nscd -i "$1" 416 type -p nscd >& /dev/null && nscd -i "$1"
434 getent "$1" "$2" 417 getent "$1" "$2"
435 fi 418 ;;
419 esac
436} 420}
437 421
438# Simplify/standardize adding users to the system 422# Simplify/standardize adding users to the system
439# vapier@gentoo.org 423# vapier@gentoo.org
440# 424#
447# shell: /bin/false 431# shell: /bin/false
448# homedir: /dev/null 432# homedir: /dev/null
449# groups: none 433# groups: none
450# extra: comment of 'added by portage for ${PN}' 434# extra: comment of 'added by portage for ${PN}'
451enewuser() { 435enewuser() {
436 case ${EBUILD_PHASE} in
437 unpack|compile|test|install)
438 eerror "'enewuser()' called from '${EBUILD_PHASE}()' which is not a pkg_* function."
439 eerror "Package fails at QA and at life. Please file a bug."
440 die "Bad package! enewuser is only for use in pkg_* functions!"
441 esac
442
452 # get the username 443 # get the username
453 local euser=$1; shift 444 local euser=$1; shift
454 if [[ -z ${euser} ]] ; then 445 if [[ -z ${euser} ]] ; then
455 eerror "No username specified !" 446 eerror "No username specified !"
456 die "Cannot call enewuser without a username" 447 die "Cannot call enewuser without a username"
488 einfo " - Userid: ${euid}" 479 einfo " - Userid: ${euid}"
489 480
490 # handle shell 481 # handle shell
491 local eshell=$1; shift 482 local eshell=$1; shift
492 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then 483 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
493 if [[ ! -e ${eshell} ]] ; then 484 if [[ ! -e ${ROOT}${eshell} ]] ; then
494 eerror "A shell was specified but it does not exist !" 485 eerror "A shell was specified but it does not exist !"
495 die "${eshell} does not exist" 486 die "${eshell} does not exist in ${ROOT}"
487 fi
488 if [[ ${eshell} == */false || ${eshell} == */nologin ]] ; then
489 eerror "Do not specify ${eshell} yourself, use -1"
490 die "Pass '-1' as the shell parameter"
496 fi 491 fi
497 else 492 else
498 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do 493 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do
499 [[ -x ${ROOT}${shell} ]] && break 494 [[ -x ${ROOT}${shell} ]] && break
500 done 495 done
549 einfo " - Groups: ${egroups}" 544 einfo " - Groups: ${egroups}"
550 545
551 # handle extra and add the user 546 # handle extra and add the user
552 local oldsandbox=${SANDBOX_ON} 547 local oldsandbox=${SANDBOX_ON}
553 export SANDBOX_ON="0" 548 export SANDBOX_ON="0"
554 case ${USERLAND} in 549 case ${CHOST} in
555 Darwin) 550 *-darwin*)
556 ### Make the user 551 ### Make the user
557 if [[ -z $@ ]] ; then 552 if [[ -z $@ ]] ; then
558 dscl . create /users/${euser} uid ${euid} 553 dscl . create /users/${euser} uid ${euid}
559 dscl . create /users/${euser} shell ${eshell} 554 dscl . create /users/${euser} shell ${eshell}
560 dscl . create /users/${euser} home ${ehome} 555 dscl . create /users/${euser} home ${ehome}
571 einfo "Please report the ebuild along with the info below" 566 einfo "Please report the ebuild along with the info below"
572 einfo "eextra: $@" 567 einfo "eextra: $@"
573 die "Required function missing" 568 die "Required function missing"
574 fi 569 fi
575 ;; 570 ;;
576 BSD) 571 *-freebsd*|*-dragonfly*)
577 if [[ -z $@ ]] ; then 572 if [[ -z $@ ]] ; then
578 pw useradd ${euser} ${opts} \ 573 pw useradd ${euser} ${opts} \
579 -c "added by portage for ${PN}" \ 574 -c "added by portage for ${PN}" \
580 die "enewuser failed" 575 die "enewuser failed"
581 else 576 else
582 einfo " - Extra: $@" 577 einfo " - Extra: $@"
583 pw useradd ${euser} ${opts} \ 578 pw useradd ${euser} ${opts} \
584 "$@" || die "enewuser failed" 579 "$@" || die "enewuser failed"
585 fi 580 fi
586 ;; 581 ;;
582
583 *-netbsd*)
584 if [[ -z $@ ]] ; then
585 useradd ${opts} ${euser} || die "enewuser failed"
586 else
587 einfo " - Extra: $@"
588 useradd ${opts} ${euser} "$@" || die "enewuser failed"
589 fi
590 ;;
591
592 *-openbsd*)
593 if [[ -z $@ ]] ; then
594 useradd -u ${euid} -s ${eshell} \
595 -d ${ehome} -c "Added by portage for ${PN}" \
596 -g ${egroups} ${euser} || die "enewuser failed"
597 else
598 einfo " - Extra: $@"
599 useradd -u ${euid} -s ${eshell} \
600 -d ${ehome} -c "Added by portage for ${PN}" \
601 -g ${egroups} ${euser} "$@" || die "enewuser failed"
602 fi
603 ;;
604
587 *) 605 *)
588 if [[ -z $@ ]] ; then 606 if [[ -z $@ ]] ; then
589 useradd ${opts} ${euser} \ 607 useradd ${opts} ${euser} \
590 -c "added by portage for ${PN}" \ 608 -c "added by portage for ${PN}" \
591 || die "enewuser failed" 609 || die "enewuser failed"
615# Default values if you do not specify any: 633# Default values if you do not specify any:
616# groupname: REQUIRED ! 634# groupname: REQUIRED !
617# gid: next available (see groupadd(8)) 635# gid: next available (see groupadd(8))
618# extra: none 636# extra: none
619enewgroup() { 637enewgroup() {
638 case ${EBUILD_PHASE} in
639 unpack|compile|test|install)
640 eerror "'enewgroup()' called from '${EBUILD_PHASE}()' which is not a pkg_* function."
641 eerror "Package fails at QA and at life. Please file a bug."
642 die "Bad package! enewgroup is only for use in pkg_* functions!"
643 esac
644
620 # get the group 645 # get the group
621 local egroup="$1"; shift 646 local egroup="$1"; shift
622 if [ -z "${egroup}" ] 647 if [ -z "${egroup}" ]
623 then 648 then
624 eerror "No group specified !" 649 eerror "No group specified !"
641 then 666 then
642 if [ "${egid}" -gt 0 ] 667 if [ "${egid}" -gt 0 ]
643 then 668 then
644 if [ -z "`egetent group ${egid}`" ] 669 if [ -z "`egetent group ${egid}`" ]
645 then 670 then
646 if [[ "${USERLAND}" == "Darwin" ]]; then 671 if [[ "${CHOST}" == *-darwin* ]]; then
647 opts="${opts} ${egid}" 672 opts="${opts} ${egid}"
648 else 673 else
649 opts="${opts} -g ${egid}" 674 opts="${opts} -g ${egid}"
650 fi 675 fi
651 else 676 else
665 opts="${opts} ${eextra}" 690 opts="${opts} ${eextra}"
666 691
667 # add the group 692 # add the group
668 local oldsandbox="${SANDBOX_ON}" 693 local oldsandbox="${SANDBOX_ON}"
669 export SANDBOX_ON="0" 694 export SANDBOX_ON="0"
670 if [[ "${USERLAND}" == "Darwin" ]]; then 695 case ${CHOST} in
696 *-darwin*)
671 if [ ! -z "${eextra}" ]; 697 if [ ! -z "${eextra}" ];
672 then 698 then
673 einfo "Extra options are not supported on Darwin/OS X yet" 699 einfo "Extra options are not supported on Darwin/OS X yet"
674 einfo "Please report the ebuild along with the info below" 700 einfo "Please report the ebuild along with the info below"
675 einfo "eextra: ${eextra}" 701 einfo "eextra: ${eextra}"
676 die "Required function missing" 702 die "Required function missing"
677 fi 703 fi
678 704
679 # If we need the next available 705 # If we need the next available
680 case ${egid} in 706 case ${egid} in
681 *[!0-9]*) # Non numeric 707 *[!0-9]*) # Non numeric
682 for egid in $(seq 101 999); do 708 for egid in $(seq 101 999); do
683 [ -z "`egetent group ${egid}`" ] && break 709 [ -z "`egetent group ${egid}`" ] && break
684 done 710 done
685 esac 711 esac
686 dscl . create /groups/${egroup} gid ${egid} 712 dscl . create /groups/${egroup} gid ${egid}
687 dscl . create /groups/${egroup} passwd '*' 713 dscl . create /groups/${egroup} passwd '*'
688 elif [[ "${USERLAND}" == "BSD" ]] ; then 714 ;;
715
716 *-freebsd*|*-dragonfly*)
689 case ${egid} in 717 case ${egid} in
690 *[!0-9]*) # Non numeric 718 *[!0-9]*) # Non numeric
691 for egid in $(seq 101 999); do 719 for egid in $(seq 101 999); do
692 [ -z "`egetent group ${egid}`" ] && break 720 [ -z "`egetent group ${egid}`" ] && break
693 done 721 done
694 esac 722 esac
695 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 723 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
696 else 724 ;;
725
726 *-netbsd*)
727 case ${egid} in
728 *[!0-9]*) # Non numeric
729 for egid in $(seq 101 999); do
730 [ -z "`egetent group ${egid}`" ] && break
731 done
732 esac
733 groupadd -g ${egid} ${egroup} || die "enewgroup failed"
734 ;;
735
736 *)
697 groupadd ${opts} ${egroup} || die "enewgroup failed" 737 groupadd ${opts} ${egroup} || die "enewgroup failed"
698 fi 738 ;;
739 esac
699 export SANDBOX_ON="${oldsandbox}" 740 export SANDBOX_ON="${oldsandbox}"
700} 741}
701 742
702# Simple script to replace 'dos2unix' binaries 743# Simple script to replace 'dos2unix' binaries
703# vapier@gentoo.org 744# vapier@gentoo.org
720 761
721# Make a desktop file ! 762# Make a desktop file !
722# Great for making those icons in kde/gnome startmenu ! 763# Great for making those icons in kde/gnome startmenu !
723# Amaze your friends ! Get the women ! Join today ! 764# Amaze your friends ! Get the women ! Join today !
724# 765#
725# make_desktop_entry(<binary>, [name], [icon], [type], [path]) 766# make_desktop_entry(<command>, [name], [icon], [type], [path])
726# 767#
727# binary: what binary does the app run with ? 768# binary: what command does the app run with ?
728# name: the name that will show up in the menu 769# name: the name that will show up in the menu
729# icon: give your little like a pretty little icon ... 770# icon: give your little like a pretty little icon ...
730# this can be relative (to /usr/share/pixmaps) or 771# this can be relative (to /usr/share/pixmaps) or
731# a full path to an icon 772# a full path to an icon
732# type: what kind of application is this ? for categories: 773# type: what kind of application is this ? for categories:
814 type="Network;${type}" 855 type="Network;${type}"
815 ;; 856 ;;
816 857
817 sci) 858 sci)
818 case ${catmin} in 859 case ${catmin} in
819 astro*) type=Astronomoy;; 860 astro*) type=Astronomy;;
820 bio*) type=Biology;; 861 bio*) type=Biology;;
821 calc*) type=Calculator;; 862 calc*) type=Calculator;;
822 chem*) type=Chemistry;; 863 chem*) type=Chemistry;;
823 geo*) type=Geology;; 864 geo*) type=Geology;;
824 math*) type=Math;; 865 math*) type=Math;;
844 local desktop_name="${PN}" 885 local desktop_name="${PN}"
845 else 886 else
846 local desktop_name="${PN}-${SLOT}" 887 local desktop_name="${PN}-${SLOT}"
847 fi 888 fi
848 local desktop=${T}/${exec%% *}-${desktop_name}.desktop 889 local desktop=${T}/${exec%% *}-${desktop_name}.desktop
890# local desktop=${T}/${exec%% *:-${desktop_name}}.desktop
849 891
850echo "[Desktop Entry] 892echo "[Desktop Entry]
851Encoding=UTF-8 893Encoding=UTF-8
852Version=0.9.2 894Version=0.9.2
853Name=${name} 895Name=${name}
854Type=Application 896Type=Application
855Comment=${DESCRIPTION} 897Comment=${DESCRIPTION}
856Exec=${exec} 898Exec=${exec}
899TryExec=${exec%% *}
857Path=${path} 900Path=${path}
858Icon=${icon} 901Icon=${icon}
859Categories=Application;${type};" > "${desktop}" 902Categories=Application;${type};" > "${desktop}"
860 903
861 ( 904 (
976 local sizeoff_t=$2 1019 local sizeoff_t=$2
977 1020
978 [[ -z ${src} ]] && die "Could not locate source for '$1'" 1021 [[ -z ${src} ]] && die "Could not locate source for '$1'"
979 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :(" 1022 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :("
980 1023
981 local shrtsrc="`basename ${src}`" 1024 local shrtsrc=$(basename "${src}")
982 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1025 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
983 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1026 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"`
984 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"` 1027 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"`
985 1028
986 # grab metadata for debug reasons 1029 # grab metadata for debug reasons
1050# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1093# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1051# - If the file is not specified then unpack will utilize ${A}. 1094# - If the file is not specified then unpack will utilize ${A}.
1052# - If the offset is not specified then we will attempt to extract 1095# - If the offset is not specified then we will attempt to extract
1053# the proper offset from the script itself. 1096# the proper offset from the script itself.
1054unpack_makeself() { 1097unpack_makeself() {
1098 local src_input=${1:-${A}}
1055 local src=$(find_unpackable_file "$1") 1099 local src=$(find_unpackable_file "${src_input}")
1056 local skip=$2 1100 local skip=$2
1057 local exe=$3 1101 local exe=$3
1058 1102
1059 [[ -z ${src} ]] && die "Could not locate source for '$1'" 1103 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
1060 1104
1061 local shrtsrc=$(basename "${src}") 1105 local shrtsrc=$(basename "${src}")
1062 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1106 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1063 if [ -z "${skip}" ] 1107 if [[ -z ${skip} ]] ; then
1064 then
1065 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1108 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}')
1066 local skip=0 1109 local skip=0
1067 exe=tail 1110 exe=tail
1068 case ${ver} in 1111 case ${ver} in
1069 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same 1112 1.5.*|1.6.0-nv) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same
1070 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1113 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1071 ;; 1114 ;;
1072 2.0|2.0.1) 1115 2.0|2.0.1)
1073 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-) 1116 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-)
1074 ;; 1117 ;;
1082 ;; 1125 ;;
1083 2.1.3) 1126 2.1.3)
1084 skip=`grep -a ^offset= "${src}" | awk '{print $3}'` 1127 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1085 let skip="skip + 1" 1128 let skip="skip + 1"
1086 ;; 1129 ;;
1087 2.1.4) 1130 2.1.4|2.1.5)
1088 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1) 1131 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1)
1089 skip=$(head -n ${skip} "${src}" | wc -c) 1132 skip=$(head -n ${skip} "${src}" | wc -c)
1090 exe="dd" 1133 exe="dd"
1091 ;; 1134 ;;
1092 *) 1135 *)
1197# and when the function returns, you can assume that the cd has been 1240# and when the function returns, you can assume that the cd has been
1198# found at CDROM_ROOT. 1241# found at CDROM_ROOT.
1199# 1242#
1200# normally the cdrom functions will refer to the cds as 'cd #1', 'cd #2', 1243# normally the cdrom functions will refer to the cds as 'cd #1', 'cd #2',
1201# etc... if you want to give the cds better names, then just export 1244# etc... if you want to give the cds better names, then just export
1202# the CDROM_NAME_X variables before calling cdrom_get_cds(). 1245# the appropriate CDROM_NAME variable before calling cdrom_get_cds().
1246# - CDROM_NAME="fooie cd" - for when you only want 1 cd
1247# - CDROM_NAME_1="install cd" - for when you want more than 1 cd
1248# CDROM_NAME_2="data cd"
1249# - CDROM_NAME_SET=( "install cd" "data cd" ) - short hand for CDROM_NAME_#
1203# 1250#
1204# for those multi cd ebuilds, see the cdrom_load_next_cd() below. 1251# for those multi cd ebuilds, see the cdrom_load_next_cd() below.
1205# 1252#
1206# Usage: cdrom_get_cds <file on cd1> [file on cd2] [file on cd3] [...] 1253# Usage: cdrom_get_cds <file on cd1> [file on cd2] [file on cd3] [...]
1207# - this will attempt to locate a cd based upon a file that is on 1254# - this will attempt to locate a cd based upon a file that is on
1211 # first we figure out how many cds we're dealing with by 1258 # first we figure out how many cds we're dealing with by
1212 # the # of files they gave us 1259 # the # of files they gave us
1213 local cdcnt=0 1260 local cdcnt=0
1214 local f= 1261 local f=
1215 for f in "$@" ; do 1262 for f in "$@" ; do
1216 cdcnt=$((cdcnt + 1)) 1263 ((++cdcnt))
1217 export CDROM_CHECK_${cdcnt}="$f" 1264 export CDROM_CHECK_${cdcnt}="$f"
1218 done 1265 done
1219 export CDROM_TOTAL_CDS=${cdcnt} 1266 export CDROM_TOTAL_CDS=${cdcnt}
1220 export CDROM_CURRENT_CD=1 1267 export CDROM_CURRENT_CD=1
1221 1268
1222 # now we see if the user gave use CD_ROOT ... 1269 # now we see if the user gave use CD_ROOT ...
1223 # if they did, let's just believe them that it's correct 1270 # if they did, let's just believe them that it's correct
1224 if [[ ! -z ${CD_ROOT} ]] ; then
1225 export CDROM_ROOT=${CD_ROOT}
1226 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1227 return
1228 fi
1229 # do the same for CD_ROOT_X
1230 if [[ ! -z ${CD_ROOT_1} ]] ; then 1271 if [[ -n ${CD_ROOT}${CD_ROOT_1} ]] ; then
1231 local var= 1272 local var=
1232 cdcnt=0 1273 cdcnt=0
1233 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1274 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1234 cdcnt=$((cdcnt + 1)) 1275 ((++cdcnt))
1235 var="CD_ROOT_${cdcnt}" 1276 var="CD_ROOT_${cdcnt}"
1277 [[ -z ${!var} ]] && var="CD_ROOT"
1236 if [[ -z ${!var} ]] ; then 1278 if [[ -z ${!var} ]] ; then
1237 eerror "You must either use just the CD_ROOT" 1279 eerror "You must either use just the CD_ROOT"
1238 eerror "or specify ALL the CD_ROOT_X variables." 1280 eerror "or specify ALL the CD_ROOT_X variables."
1239 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables." 1281 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables."
1240 die "could not locate CD_ROOT_${cdcnt}" 1282 die "could not locate CD_ROOT_${cdcnt}"
1241 fi 1283 fi
1242 export CDROM_ROOTS_${cdcnt}="${!var}"
1243 done 1284 done
1244 export CDROM_ROOT=${CDROM_ROOTS_1} 1285 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}}
1245 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1286 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1287 export CDROM_SET=-1
1288 for f in ${CDROM_CHECK_1//:/ } ; do
1289 ((++CDROM_SET))
1290 [[ -e ${CD_ROOT}/${f} ]] && break
1291 done
1292 export CDROM_MATCH=${f}
1246 return 1293 return
1247 fi 1294 fi
1248 1295
1296 # User didn't help us out so lets make sure they know they can
1297 # simplify the whole process ...
1249 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1298 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1250 einfon "This ebuild will need the " 1299 einfo "This ebuild will need the ${CDROM_NAME:-cdrom for ${PN}}"
1251 if [[ -z ${CDROM_NAME} ]] ; then
1252 echo "cdrom for ${PN}."
1253 else
1254 echo "${CDROM_NAME}."
1255 fi
1256 echo 1300 echo
1257 einfo "If you do not have the CD, but have the data files" 1301 einfo "If you do not have the CD, but have the data files"
1258 einfo "mounted somewhere on your filesystem, just export" 1302 einfo "mounted somewhere on your filesystem, just export"
1259 einfo "the variable CD_ROOT so that it points to the" 1303 einfo "the variable CD_ROOT so that it points to the"
1260 einfo "directory containing the files." 1304 einfo "directory containing the files."
1261 echo 1305 echo
1262 einfo "For example:" 1306 einfo "For example:"
1263 einfo "export CD_ROOT=/mnt/cdrom" 1307 einfo "export CD_ROOT=/mnt/cdrom"
1264 echo 1308 echo
1265 else 1309 else
1310 if [[ -n ${CDROM_NAME_SET} ]] ; then
1311 # Translate the CDROM_NAME_SET array into CDROM_NAME_#
1312 cdcnt=0
1313 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1314 ((++cdcnt))
1315 export CDROM_NAME_${cdcnt}="${CDROM_NAME_SET[$((${cdcnt}-1))]}"
1316 done
1317 fi
1318
1266 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1319 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1267 cdcnt=0 1320 cdcnt=0
1268 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1321 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1269 cdcnt=$((cdcnt + 1)) 1322 ((++cdcnt))
1270 var="CDROM_NAME_${cdcnt}" 1323 var="CDROM_NAME_${cdcnt}"
1271 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}" 1324 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}"
1272 done 1325 done
1273 echo 1326 echo
1274 einfo "If you do not have the CDs, but have the data files" 1327 einfo "If you do not have the CDs, but have the data files"
1275 einfo "mounted somewhere on your filesystem, just export" 1328 einfo "mounted somewhere on your filesystem, just export"
1276 einfo "the following variables so they point to the right place:" 1329 einfo "the following variables so they point to the right place:"
1277 einfon "" 1330 einfon ""
1278 cdcnt=0 1331 cdcnt=0
1279 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1332 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1280 cdcnt=$((cdcnt + 1)) 1333 ((++cdcnt))
1281 echo -n " CD_ROOT_${cdcnt}" 1334 echo -n " CD_ROOT_${cdcnt}"
1282 done 1335 done
1283 echo 1336 echo
1284 einfo "Or, if you have all the files in the same place, or" 1337 einfo "Or, if you have all the files in the same place, or"
1285 einfo "you only have one cdrom, you can export CD_ROOT" 1338 einfo "you only have one cdrom, you can export CD_ROOT"
1288 echo 1341 echo
1289 einfo "For example:" 1342 einfo "For example:"
1290 einfo "export CD_ROOT_1=/mnt/cdrom" 1343 einfo "export CD_ROOT_1=/mnt/cdrom"
1291 echo 1344 echo
1292 fi 1345 fi
1346
1347 export CDROM_SET=""
1293 export CDROM_CURRENT_CD=0 1348 export CDROM_CURRENT_CD=0
1294 cdrom_load_next_cd 1349 cdrom_load_next_cd
1295} 1350}
1296 1351
1297# this is only used when you need access to more than one cd. 1352# this is only used when you need access to more than one cd.
1298# when you have finished using the first cd, just call this function. 1353# when you have finished using the first cd, just call this function.
1299# when it returns, CDROM_ROOT will be pointing to the second cd. 1354# when it returns, CDROM_ROOT will be pointing to the second cd.
1300# remember, you can only go forward in the cd chain, you can't go back. 1355# remember, you can only go forward in the cd chain, you can't go back.
1301cdrom_load_next_cd() { 1356cdrom_load_next_cd() {
1302 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1303 local var= 1357 local var
1304 1358 ((++CDROM_CURRENT_CD))
1305 if [[ ! -z ${CD_ROOT} ]] ; then
1306 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}"
1307 return
1308 fi
1309 1359
1310 unset CDROM_ROOT 1360 unset CDROM_ROOT
1311 var=CDROM_ROOTS_${CDROM_CURRENT_CD} 1361 var=CD_ROOT_${CDROM_CURRENT_CD}
1362 [[ -z ${!var} ]] && var="CD_ROOT"
1312 if [[ -z ${!var} ]] ; then 1363 if [[ -z ${!var} ]] ; then
1313 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1364 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1314 cdrom_locate_file_on_cd ${!var} 1365 _cdrom_locate_file_on_cd ${!var}
1315 else 1366 else
1316 export CDROM_ROOT=${!var} 1367 export CDROM_ROOT=${!var}
1317 fi 1368 fi
1318 1369
1319 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1370 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1324# all it does is try to locate a give file on a cd ... if the cd isn't 1375# all it does is try to locate a give file on a cd ... if the cd isn't
1325# found, then a message asking for the user to insert the cdrom will be 1376# found, then a message asking for the user to insert the cdrom will be
1326# displayed and we'll hang out here until: 1377# displayed and we'll hang out here until:
1327# (1) the file is found on a mounted cdrom 1378# (1) the file is found on a mounted cdrom
1328# (2) the user hits CTRL+C 1379# (2) the user hits CTRL+C
1329cdrom_locate_file_on_cd() { 1380_cdrom_locate_file_on_cd() {
1381 local mline=""
1382 local showedmsg=0
1383
1330 while [[ -z ${CDROM_ROOT} ]] ; do 1384 while [[ -z ${CDROM_ROOT} ]] ; do
1331 local dir=$(dirname "$*") 1385 local i=0
1386 local -a cdset=(${*//:/ })
1387 if [[ -n ${CDROM_SET} ]] ; then
1388 cdset=(${cdset[${CDROM_SET}]})
1389 fi
1390
1391 while [[ -n ${cdset[${i}]} ]] ; do
1392 local dir=$(dirname ${cdset[${i}]})
1332 local file=$(basename "$*") 1393 local file=$(basename ${cdset[${i}]})
1333 local mline=""
1334 local showedmsg=0
1335 1394
1336 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do 1395 for mline in $(mount | gawk '/(iso|cdrom|fs=cdfss)/ {print $3}') ; do
1337 [[ -d ${mline}/${dir} ]] || continue 1396 [[ -d ${mline}/${dir} ]] || continue
1338 [[ ! -z $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] \ 1397 if [[ -n $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] ; then
1339 && export CDROM_ROOT=${mline} 1398 export CDROM_ROOT=${mline}
1399 export CDROM_SET=${i}
1400 export CDROM_MATCH=${cdset[${i}]}
1401 return
1402 fi
1403 done
1404
1405 ((++i))
1340 done 1406 done
1341 1407
1342 if [[ -z ${CDROM_ROOT} ]] ; then
1343 echo 1408 echo
1344 if [[ ${showedmsg} -eq 0 ]] ; then 1409 if [[ ${showedmsg} -eq 0 ]] ; then
1345 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1410 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1346 if [[ -z ${CDROM_NAME} ]] ; then 1411 if [[ -z ${CDROM_NAME} ]] ; then
1347 einfo "Please insert the cdrom for ${PN} now !" 1412 einfo "Please insert+mount the cdrom for ${PN} now !"
1348 else
1349 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1350 fi
1351 else 1413 else
1352 if [[ -z ${CDROM_NAME_1} ]] ; then
1353 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !"
1354 else
1355 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1356 einfo "Please insert+mount the ${!var} cdrom now !" 1414 einfo "Please insert+mount the ${CDROM_NAME} cdrom now !"
1357 fi
1358 fi 1415 fi
1359 showedmsg=1 1416 else
1417 if [[ -z ${CDROM_NAME_1} ]] ; then
1418 einfo "Please insert+mount cd #${CDROM_CURRENT_CD} for ${PN} now !"
1419 else
1420 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1421 einfo "Please insert+mount the ${!var} cdrom now !"
1422 fi
1360 fi 1423 fi
1424 showedmsg=1
1425 fi
1361 einfo "Press return to scan for the cd again" 1426 einfo "Press return to scan for the cd again"
1362 einfo "or hit CTRL+C to abort the emerge." 1427 einfo "or hit CTRL+C to abort the emerge."
1363 echo 1428 echo
1364 einfo "If you are having trouble with the detection" 1429 einfo "If you are having trouble with the detection"
1365 einfo "of your CD, it is possible that you do not have" 1430 einfo "of your CD, it is possible that you do not have"
1366 einfo "Joliet support enabled in your kernel. Please" 1431 einfo "Joliet support enabled in your kernel. Please"
1367 einfo "check that CONFIG_JOLIET is enabled in your kernel." 1432 einfo "check that CONFIG_JOLIET is enabled in your kernel."
1368 read 1433 read || die "something is screwed with your system"
1369 fi
1370 done 1434 done
1371} 1435}
1372 1436
1373# Make sure that LINGUAS only contains languages that 1437# Make sure that LINGUAS only contains languages that
1374# a package can support 1438# a package can support
1381# The -i builds a list of po files found in all the 1445# The -i builds a list of po files found in all the
1382# directories and uses the intersection of the lists. 1446# directories and uses the intersection of the lists.
1383# The -u builds a list of po files found in all the 1447# The -u builds a list of po files found in all the
1384# directories and uses the union of the lists. 1448# directories and uses the union of the lists.
1385strip-linguas() { 1449strip-linguas() {
1386 local ls newls 1450 local ls newls nols
1387 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then 1451 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1388 local op=$1; shift 1452 local op=$1; shift
1389 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1453 ls=$(find "$1" -name '*.po' -exec basename {} .po \;); shift
1390 local d f 1454 local d f
1391 for d in "$@" ; do 1455 for d in "$@" ; do
1392 if [[ ${op} == "-u" ]] ; then 1456 if [[ ${op} == "-u" ]] ; then
1393 newls=${ls} 1457 newls=${ls}
1394 else 1458 else
1395 newls="" 1459 newls=""
1396 fi 1460 fi
1397 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1461 for f in $(find "$d" -name '*.po' -exec basename {} .po \;) ; do
1398 if [[ ${op} == "-i" ]] ; then 1462 if [[ ${op} == "-i" ]] ; then
1399 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}" 1463 hasq ${f} ${ls} && newls="${newls} ${f}"
1400 else 1464 else
1401 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}" 1465 hasq ${f} ${ls} || newls="${newls} ${f}"
1402 fi 1466 fi
1403 done 1467 done
1404 ls=${newls} 1468 ls=${newls}
1405 done 1469 done
1406 ls=${ls//.po}
1407 else 1470 else
1408 ls=$@ 1471 ls="$@"
1409 fi 1472 fi
1410 1473
1411 ls=" ${ls} " 1474 nols=""
1412 newls="" 1475 newls=""
1413 for f in ${LINGUAS} ; do 1476 for f in ${LINGUAS} ; do
1414 if [[ ${ls/ ${f} /} != ${ls} ]] ; then 1477 if hasq ${f} ${ls} ; then
1415 newls="${newls} ${f}" 1478 newls="${newls} ${f}"
1416 else 1479 else
1417 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1480 nols="${nols} ${f}"
1418 fi 1481 fi
1419 done 1482 done
1420 if [[ -z ${newls} ]] ; then 1483 [[ -n ${nols} ]] \
1421 export LINGUAS="" 1484 && ewarn "Sorry, but ${PN} does not support the LINGUAs:" ${nols}
1422 else
1423 export LINGUAS=${newls:1} 1485 export LINGUAS=${newls:1}
1424 fi
1425} 1486}
1426 1487
1427# moved from kernel.eclass since they are generally useful outside of 1488# moved from kernel.eclass since they are generally useful outside of
1428# kernel.eclass -iggy (20041002) 1489# kernel.eclass -iggy (20041002)
1429 1490
1458 1519
1459# Jeremy Huddleston <eradicator@gentoo.org>: 1520# Jeremy Huddleston <eradicator@gentoo.org>:
1460# preserve_old_lib /path/to/libblah.so.0 1521# preserve_old_lib /path/to/libblah.so.0
1461# preserve_old_lib_notify /path/to/libblah.so.0 1522# preserve_old_lib_notify /path/to/libblah.so.0
1462# 1523#
1463# These functions are useful when a lib in your package changes --soname. Such 1524# These functions are useful when a lib in your package changes --library. Such
1464# an example might be from libogg.so.0 to libogg.so.1. Removing libogg.so.0 1525# an example might be from libogg.so.0 to libogg.so.1. Removing libogg.so.0
1465# would break packages that link against it. Most people get around this 1526# would break packages that link against it. Most people get around this
1466# by using the portage SLOT mechanism, but that is not always a relevant 1527# by using the portage SLOT mechanism, but that is not always a relevant
1467# solution, so instead you can add the following to your ebuilds: 1528# solution, so instead you can add the following to your ebuilds:
1468# 1529#
1499 1560
1500 ewarn "An old version of an installed library was detected on your system." 1561 ewarn "An old version of an installed library was detected on your system."
1501 ewarn "In order to avoid breaking packages that link against it, this older version" 1562 ewarn "In order to avoid breaking packages that link against it, this older version"
1502 ewarn "is not being removed. In order to make full use of this newer version," 1563 ewarn "is not being removed. In order to make full use of this newer version,"
1503 ewarn "you will need to execute the following command:" 1564 ewarn "you will need to execute the following command:"
1504 ewarn " revdep-rebuild --soname ${SONAME}" 1565 ewarn " revdep-rebuild --library ${SONAME}"
1505 ewarn 1566 ewarn
1506 ewarn "After doing that, you can safely remove ${LIB}" 1567 ewarn "After doing that, you can safely remove ${LIB}"
1507 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild" 1568 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1508 fi 1569 fi
1509} 1570}
1520built_with_use() { 1581built_with_use() {
1521 local opt=$1 1582 local opt=$1
1522 [[ ${opt:0:1} = "-" ]] && shift || opt="-a" 1583 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1523 1584
1524 local PKG=$(best_version $1) 1585 local PKG=$(best_version $1)
1586 [[ -z ${PKG} ]] && die "Unable to resolve $1 to an installed package"
1525 shift 1587 shift
1526 1588
1527 local USEFILE="${ROOT}/var/db/pkg/${PKG}/USE" 1589 local USEFILE=${ROOT}/var/db/pkg/${PKG}/USE
1528 [[ ! -e ${USEFILE} ]] && return 1 1590
1591 # if the USE file doesnt exist, assume the $PKG is either
1592 # injected or package.provided
1593 [[ ! -e ${USEFILE} ]] && die "Unable to determine what USE flags $PKG was built with"
1529 1594
1530 local USE_BUILT=$(<${USEFILE}) 1595 local USE_BUILT=$(<${USEFILE})
1531 while [[ $# -gt 0 ]] ; do 1596 while [[ $# -gt 0 ]] ; do
1532 if [[ ${opt} = "-o" ]] ; then 1597 if [[ ${opt} = "-o" ]] ; then
1533 has $1 ${USE_BUILT} && return 0 1598 has $1 ${USE_BUILT} && return 0
1590 # We don't want to quote ${bin} so that people can pass complex 1655 # We don't want to quote ${bin} so that people can pass complex
1591 # things as $bin ... "./someprog --args" 1656 # things as $bin ... "./someprog --args"
1592 cat << EOF > "${tmpwrapper}" 1657 cat << EOF > "${tmpwrapper}"
1593#!/bin/sh 1658#!/bin/sh
1594cd "${chdir:-.}" 1659cd "${chdir:-.}"
1660if [ -n "${libdir}" ] ; then
1595if [ "\${LD_LIBRARY_PATH+set}" = "set" ] && [ -n "${libdir}" ] ; then 1661 if [ "\${LD_LIBRARY_PATH+set}" = "set" ] ; then
1596 export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}" 1662 export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1663 else
1664 export LD_LIBRARY_PATH="${libdir}"
1665 fi
1597fi 1666fi
1598exec ${bin} "\$@" 1667exec ${bin} "\$@"
1599EOF 1668EOF
1600 chmod go+rx "${tmpwrapper}" 1669 chmod go+rx "${tmpwrapper}"
1601 if [[ -n ${path} ]] ; then 1670 if [[ -n ${path} ]] ; then

Legend:
Removed from v.1.204  
changed lines
  Added in v.1.247

  ViewVC Help
Powered by ViewVC 1.1.20