/[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.245
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.245 2006/07/15 19:26:55 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 ;;
423 local action 401 *-freebsd*|*-dragonfly*)
424 if [ "$1" == "passwd" ] 402 local opts action="user"
425 then 403 [[ $1 == "passwd" ]] || action="group"
426 action="user" 404
427 else 405 # lookup by uid/gid
428 action="group" 406 if [[ $2 == [[:digit:]]* ]] ; then
407 [[ ${action} == "user" ]] && opts="-u" || opts="-g"
429 fi 408 fi
409
430 pw show "${action}" "$2" -q 410 pw show ${action} ${opts} "$2" -q
431 else 411 ;;
412 *-netbsd*|*-openbsd*)
413 grep "$2:\*:" /etc/$1
414 ;;
415 *)
432 which nscd >& /dev/null && nscd -i "$1" 416 type -p nscd >& /dev/null && nscd -i "$1"
433 getent "$1" "$2" 417 getent "$1" "$2"
434 fi 418 ;;
419 esac
435} 420}
436 421
437# Simplify/standardize adding users to the system 422# Simplify/standardize adding users to the system
438# vapier@gentoo.org 423# vapier@gentoo.org
439# 424#
446# shell: /bin/false 431# shell: /bin/false
447# homedir: /dev/null 432# homedir: /dev/null
448# groups: none 433# groups: none
449# extra: comment of 'added by portage for ${PN}' 434# extra: comment of 'added by portage for ${PN}'
450enewuser() { 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
451 # get the username 443 # get the username
452 local euser=$1; shift 444 local euser=$1; shift
453 if [[ -z ${euser} ]] ; then 445 if [[ -z ${euser} ]] ; then
454 eerror "No username specified !" 446 eerror "No username specified !"
455 die "Cannot call enewuser without a username" 447 die "Cannot call enewuser without a username"
487 einfo " - Userid: ${euid}" 479 einfo " - Userid: ${euid}"
488 480
489 # handle shell 481 # handle shell
490 local eshell=$1; shift 482 local eshell=$1; shift
491 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then 483 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
492 if [[ ! -e ${eshell} ]] ; then 484 if [[ ! -e ${ROOT}${eshell} ]] ; then
493 eerror "A shell was specified but it does not exist !" 485 eerror "A shell was specified but it does not exist !"
494 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"
495 fi 491 fi
496 else 492 else
497 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
498 [[ -x ${ROOT}${shell} ]] && break; 494 [[ -x ${ROOT}${shell} ]] && break
499 done 495 done
500 496
501 if [[ ${shell} == "/dev/null" ]]; then 497 if [[ ${shell} == "/dev/null" ]] ; then
502 eerror "Unable to identify the shell to use" 498 eerror "Unable to identify the shell to use"
503 die "Unable to identify the shell to use" 499 die "Unable to identify the shell to use"
504 fi 500 fi
505 501
506 eshell=${shell} 502 eshell=${shell}
548 einfo " - Groups: ${egroups}" 544 einfo " - Groups: ${egroups}"
549 545
550 # handle extra and add the user 546 # handle extra and add the user
551 local oldsandbox=${SANDBOX_ON} 547 local oldsandbox=${SANDBOX_ON}
552 export SANDBOX_ON="0" 548 export SANDBOX_ON="0"
553 case ${USERLAND} in 549 case ${CHOST} in
554 Darwin) 550 *-darwin*)
555 ### Make the user 551 ### Make the user
556 if [[ -z $@ ]] ; then 552 if [[ -z $@ ]] ; then
557 dscl . create /users/${euser} uid ${euid} 553 dscl . create /users/${euser} uid ${euid}
558 dscl . create /users/${euser} shell ${eshell} 554 dscl . create /users/${euser} shell ${eshell}
559 dscl . create /users/${euser} home ${ehome} 555 dscl . create /users/${euser} home ${ehome}
570 einfo "Please report the ebuild along with the info below" 566 einfo "Please report the ebuild along with the info below"
571 einfo "eextra: $@" 567 einfo "eextra: $@"
572 die "Required function missing" 568 die "Required function missing"
573 fi 569 fi
574 ;; 570 ;;
575 BSD) 571 *-freebsd*|*-dragonfly*)
576 if [[ -z $@ ]] ; then 572 if [[ -z $@ ]] ; then
577 pw useradd ${euser} ${opts} \ 573 pw useradd ${euser} ${opts} \
578 -c "added by portage for ${PN}" \ 574 -c "added by portage for ${PN}" \
579 die "enewuser failed" 575 die "enewuser failed"
580 else 576 else
581 einfo " - Extra: $@" 577 einfo " - Extra: $@"
582 pw useradd ${euser} ${opts} \ 578 pw useradd ${euser} ${opts} \
583 "$@" || die "enewuser failed" 579 "$@" || die "enewuser failed"
584 fi 580 fi
585 ;; 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
586 *) 605 *)
587 if [[ -z $@ ]] ; then 606 if [[ -z $@ ]] ; then
588 useradd ${opts} ${euser} \ 607 useradd ${opts} ${euser} \
589 -c "added by portage for ${PN}" \ 608 -c "added by portage for ${PN}" \
590 || die "enewuser failed" 609 || die "enewuser failed"
614# Default values if you do not specify any: 633# Default values if you do not specify any:
615# groupname: REQUIRED ! 634# groupname: REQUIRED !
616# gid: next available (see groupadd(8)) 635# gid: next available (see groupadd(8))
617# extra: none 636# extra: none
618enewgroup() { 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
619 # get the group 645 # get the group
620 local egroup="$1"; shift 646 local egroup="$1"; shift
621 if [ -z "${egroup}" ] 647 if [ -z "${egroup}" ]
622 then 648 then
623 eerror "No group specified !" 649 eerror "No group specified !"
640 then 666 then
641 if [ "${egid}" -gt 0 ] 667 if [ "${egid}" -gt 0 ]
642 then 668 then
643 if [ -z "`egetent group ${egid}`" ] 669 if [ -z "`egetent group ${egid}`" ]
644 then 670 then
645 if [[ "${USERLAND}" == "Darwin" ]]; then 671 if [[ "${CHOST}" == *-darwin* ]]; then
646 opts="${opts} ${egid}" 672 opts="${opts} ${egid}"
647 else 673 else
648 opts="${opts} -g ${egid}" 674 opts="${opts} -g ${egid}"
649 fi 675 fi
650 else 676 else
664 opts="${opts} ${eextra}" 690 opts="${opts} ${eextra}"
665 691
666 # add the group 692 # add the group
667 local oldsandbox="${SANDBOX_ON}" 693 local oldsandbox="${SANDBOX_ON}"
668 export SANDBOX_ON="0" 694 export SANDBOX_ON="0"
669 if [[ "${USERLAND}" == "Darwin" ]]; then 695 case ${CHOST} in
696 *-darwin*)
670 if [ ! -z "${eextra}" ]; 697 if [ ! -z "${eextra}" ];
671 then 698 then
672 einfo "Extra options are not supported on Darwin/OS X yet" 699 einfo "Extra options are not supported on Darwin/OS X yet"
673 einfo "Please report the ebuild along with the info below" 700 einfo "Please report the ebuild along with the info below"
674 einfo "eextra: ${eextra}" 701 einfo "eextra: ${eextra}"
675 die "Required function missing" 702 die "Required function missing"
676 fi 703 fi
677 704
678 # If we need the next available 705 # If we need the next available
679 case ${egid} in 706 case ${egid} in
680 *[!0-9]*) # Non numeric 707 *[!0-9]*) # Non numeric
681 for egid in $(seq 101 999); do 708 for egid in $(seq 101 999); do
682 [ -z "`egetent group ${egid}`" ] && break 709 [ -z "`egetent group ${egid}`" ] && break
683 done 710 done
684 esac 711 esac
685 dscl . create /groups/${egroup} gid ${egid} 712 dscl . create /groups/${egroup} gid ${egid}
686 dscl . create /groups/${egroup} passwd '*' 713 dscl . create /groups/${egroup} passwd '*'
687 elif [[ "${USERLAND}" == "BSD" ]] ; then 714 ;;
715
716 *-freebsd*|*-dragonfly*)
688 case ${egid} in 717 case ${egid} in
689 *[!0-9]*) # Non numeric 718 *[!0-9]*) # Non numeric
690 for egid in $(seq 101 999); do 719 for egid in $(seq 101 999); do
691 [ -z "`egetent group ${egid}`" ] && break 720 [ -z "`egetent group ${egid}`" ] && break
692 done 721 done
693 esac 722 esac
694 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 723 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
695 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 *)
696 groupadd ${opts} ${egroup} || die "enewgroup failed" 737 groupadd ${opts} ${egroup} || die "enewgroup failed"
697 fi 738 ;;
739 esac
698 export SANDBOX_ON="${oldsandbox}" 740 export SANDBOX_ON="${oldsandbox}"
699} 741}
700 742
701# Simple script to replace 'dos2unix' binaries 743# Simple script to replace 'dos2unix' binaries
702# vapier@gentoo.org 744# vapier@gentoo.org
719 761
720# Make a desktop file ! 762# Make a desktop file !
721# Great for making those icons in kde/gnome startmenu ! 763# Great for making those icons in kde/gnome startmenu !
722# Amaze your friends ! Get the women ! Join today ! 764# Amaze your friends ! Get the women ! Join today !
723# 765#
724# make_desktop_entry(<binary>, [name], [icon], [type], [path]) 766# make_desktop_entry(<command>, [name], [icon], [type], [path])
725# 767#
726# binary: what binary does the app run with ? 768# binary: what command does the app run with ?
727# name: the name that will show up in the menu 769# name: the name that will show up in the menu
728# icon: give your little like a pretty little icon ... 770# icon: give your little like a pretty little icon ...
729# this can be relative (to /usr/share/pixmaps) or 771# this can be relative (to /usr/share/pixmaps) or
730# a full path to an icon 772# a full path to an icon
731# type: what kind of application is this ? for categories: 773# type: what kind of application is this ? for categories:
813 type="Network;${type}" 855 type="Network;${type}"
814 ;; 856 ;;
815 857
816 sci) 858 sci)
817 case ${catmin} in 859 case ${catmin} in
818 astro*) type=Astronomoy;; 860 astro*) type=Astronomy;;
819 bio*) type=Biology;; 861 bio*) type=Biology;;
820 calc*) type=Calculator;; 862 calc*) type=Calculator;;
821 chem*) type=Chemistry;; 863 chem*) type=Chemistry;;
822 geo*) type=Geology;; 864 geo*) type=Geology;;
823 math*) type=Math;; 865 math*) type=Math;;
843 local desktop_name="${PN}" 885 local desktop_name="${PN}"
844 else 886 else
845 local desktop_name="${PN}-${SLOT}" 887 local desktop_name="${PN}-${SLOT}"
846 fi 888 fi
847 local desktop=${T}/${exec%% *}-${desktop_name}.desktop 889 local desktop=${T}/${exec%% *}-${desktop_name}.desktop
890# local desktop=${T}/${exec%% *:-${desktop_name}}.desktop
848 891
849echo "[Desktop Entry] 892echo "[Desktop Entry]
850Encoding=UTF-8 893Encoding=UTF-8
851Version=0.9.2 894Version=0.9.2
852Name=${name} 895Name=${name}
853Type=Application 896Type=Application
854Comment=${DESCRIPTION} 897Comment=${DESCRIPTION}
855Exec=${exec} 898Exec=${exec}
899TryExec=${exec%% *}
856Path=${path} 900Path=${path}
857Icon=${icon} 901Icon=${icon}
858Categories=Application;${type};" > "${desktop}" 902Categories=Application;${type};" > "${desktop}"
859 903
904 (
905 # wrap the env here so that the 'insinto' call
906 # doesn't corrupt the env of the caller
860 insinto /usr/share/applications 907 insinto /usr/share/applications
861 doins "${desktop}" 908 doins "${desktop}"
862 909 )
863 return 0
864} 910}
865 911
866# Make a GDM/KDM Session file 912# Make a GDM/KDM Session file
867# 913#
868# make_desktop_entry(<title>, <command>) 914# make_desktop_entry(<title>, <command>)
973 local sizeoff_t=$2 1019 local sizeoff_t=$2
974 1020
975 [[ -z ${src} ]] && die "Could not locate source for '$1'" 1021 [[ -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 :(" 1022 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :("
977 1023
978 local shrtsrc="`basename ${src}`" 1024 local shrtsrc=$(basename "${src}")
979 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1025 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
980 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1026 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\"` 1027 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"`
982 1028
983 # grab metadata for debug reasons 1029 # grab metadata for debug reasons
1047# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1093# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1048# - If the file is not specified then unpack will utilize ${A}. 1094# - If the file is not specified then unpack will utilize ${A}.
1049# - 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
1050# the proper offset from the script itself. 1096# the proper offset from the script itself.
1051unpack_makeself() { 1097unpack_makeself() {
1098 local src_input=${1:-${A}}
1052 local src=$(find_unpackable_file "$1") 1099 local src=$(find_unpackable_file "${src_input}")
1053 local skip=$2 1100 local skip=$2
1054 local exe=$3 1101 local exe=$3
1055 1102
1056 [[ -z ${src} ]] && die "Could not locate source for '$1'" 1103 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
1057 1104
1058 local shrtsrc=$(basename "${src}") 1105 local shrtsrc=$(basename "${src}")
1059 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1106 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1060 if [ -z "${skip}" ] 1107 if [[ -z ${skip} ]] ; then
1061 then
1062 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1108 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}')
1063 local skip=0 1109 local skip=0
1064 exe=tail 1110 exe=tail
1065 case ${ver} in 1111 case ${ver} in
1066 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
1067 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1113 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1068 ;; 1114 ;;
1069 2.0|2.0.1) 1115 2.0|2.0.1)
1070 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-) 1116 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-)
1071 ;; 1117 ;;
1079 ;; 1125 ;;
1080 2.1.3) 1126 2.1.3)
1081 skip=`grep -a ^offset= "${src}" | awk '{print $3}'` 1127 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1082 let skip="skip + 1" 1128 let skip="skip + 1"
1083 ;; 1129 ;;
1084 2.1.4) 1130 2.1.4|2.1.5)
1085 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)
1086 skip=$(head -n ${skip} "${src}" | wc -c) 1132 skip=$(head -n ${skip} "${src}" | wc -c)
1087 exe="dd" 1133 exe="dd"
1088 ;; 1134 ;;
1089 *) 1135 *)
1194# 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
1195# found at CDROM_ROOT. 1241# found at CDROM_ROOT.
1196# 1242#
1197# 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',
1198# 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
1199# 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_#
1200# 1250#
1201# 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.
1202# 1252#
1203# 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] [...]
1204# - 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
1208 # 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
1209 # the # of files they gave us 1259 # the # of files they gave us
1210 local cdcnt=0 1260 local cdcnt=0
1211 local f= 1261 local f=
1212 for f in "$@" ; do 1262 for f in "$@" ; do
1213 cdcnt=$((cdcnt + 1)) 1263 ((++cdcnt))
1214 export CDROM_CHECK_${cdcnt}="$f" 1264 export CDROM_CHECK_${cdcnt}="$f"
1215 done 1265 done
1216 export CDROM_TOTAL_CDS=${cdcnt} 1266 export CDROM_TOTAL_CDS=${cdcnt}
1217 export CDROM_CURRENT_CD=1 1267 export CDROM_CURRENT_CD=1
1218 1268
1219 # now we see if the user gave use CD_ROOT ... 1269 # now we see if the user gave use CD_ROOT ...
1220 # 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
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 1271 if [[ -n ${CD_ROOT}${CD_ROOT_1} ]] ; then
1228 local var= 1272 local var=
1229 cdcnt=0 1273 cdcnt=0
1230 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1274 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1231 cdcnt=$((cdcnt + 1)) 1275 ((++cdcnt))
1232 var="CD_ROOT_${cdcnt}" 1276 var="CD_ROOT_${cdcnt}"
1277 [[ -z ${!var} ]] && var="CD_ROOT"
1233 if [[ -z ${!var} ]] ; then 1278 if [[ -z ${!var} ]] ; then
1234 eerror "You must either use just the CD_ROOT" 1279 eerror "You must either use just the CD_ROOT"
1235 eerror "or specify ALL the CD_ROOT_X variables." 1280 eerror "or specify ALL the CD_ROOT_X variables."
1236 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."
1237 die "could not locate CD_ROOT_${cdcnt}" 1282 die "could not locate CD_ROOT_${cdcnt}"
1238 fi 1283 fi
1239 export CDROM_ROOTS_${cdcnt}="${!var}"
1240 done 1284 done
1241 export CDROM_ROOT=${CDROM_ROOTS_1} 1285 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}}
1242 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}
1243 return 1293 return
1244 fi 1294 fi
1245 1295
1296 # User didn't help us out so lets make sure they know they can
1297 # simplify the whole process ...
1246 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1298 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1247 einfon "This ebuild will need the " 1299 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 1300 echo
1254 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"
1255 einfo "mounted somewhere on your filesystem, just export" 1302 einfo "mounted somewhere on your filesystem, just export"
1256 einfo "the variable CD_ROOT so that it points to the" 1303 einfo "the variable CD_ROOT so that it points to the"
1257 einfo "directory containing the files." 1304 einfo "directory containing the files."
1258 echo 1305 echo
1259 einfo "For example:" 1306 einfo "For example:"
1260 einfo "export CD_ROOT=/mnt/cdrom" 1307 einfo "export CD_ROOT=/mnt/cdrom"
1261 echo 1308 echo
1262 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
1263 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1319 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1264 cdcnt=0 1320 cdcnt=0
1265 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1321 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1266 cdcnt=$((cdcnt + 1)) 1322 ((++cdcnt))
1267 var="CDROM_NAME_${cdcnt}" 1323 var="CDROM_NAME_${cdcnt}"
1268 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}" 1324 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}"
1269 done 1325 done
1270 echo 1326 echo
1271 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"
1272 einfo "mounted somewhere on your filesystem, just export" 1328 einfo "mounted somewhere on your filesystem, just export"
1273 einfo "the following variables so they point to the right place:" 1329 einfo "the following variables so they point to the right place:"
1274 einfon "" 1330 einfon ""
1275 cdcnt=0 1331 cdcnt=0
1276 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1332 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1277 cdcnt=$((cdcnt + 1)) 1333 ((++cdcnt))
1278 echo -n " CD_ROOT_${cdcnt}" 1334 echo -n " CD_ROOT_${cdcnt}"
1279 done 1335 done
1280 echo 1336 echo
1281 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"
1282 einfo "you only have one cdrom, you can export CD_ROOT" 1338 einfo "you only have one cdrom, you can export CD_ROOT"
1285 echo 1341 echo
1286 einfo "For example:" 1342 einfo "For example:"
1287 einfo "export CD_ROOT_1=/mnt/cdrom" 1343 einfo "export CD_ROOT_1=/mnt/cdrom"
1288 echo 1344 echo
1289 fi 1345 fi
1346
1347 export CDROM_SET=""
1290 export CDROM_CURRENT_CD=0 1348 export CDROM_CURRENT_CD=0
1291 cdrom_load_next_cd 1349 cdrom_load_next_cd
1292} 1350}
1293 1351
1294# 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.
1295# 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.
1296# 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.
1297# 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.
1298cdrom_load_next_cd() { 1356cdrom_load_next_cd() {
1299 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1300 local var= 1357 local var
1301 1358 ((++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 1359
1307 unset CDROM_ROOT 1360 unset CDROM_ROOT
1308 var=CDROM_ROOTS_${CDROM_CURRENT_CD} 1361 var=CD_ROOT_${CDROM_CURRENT_CD}
1362 [[ -z ${!var} ]] && var="CD_ROOT"
1309 if [[ -z ${!var} ]] ; then 1363 if [[ -z ${!var} ]] ; then
1310 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1364 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1311 cdrom_locate_file_on_cd ${!var} 1365 _cdrom_locate_file_on_cd ${!var}
1312 else 1366 else
1313 export CDROM_ROOT=${!var} 1367 export CDROM_ROOT=${!var}
1314 fi 1368 fi
1315 1369
1316 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1370 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 1375# 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 1376# found, then a message asking for the user to insert the cdrom will be
1323# displayed and we'll hang out here until: 1377# displayed and we'll hang out here until:
1324# (1) the file is found on a mounted cdrom 1378# (1) the file is found on a mounted cdrom
1325# (2) the user hits CTRL+C 1379# (2) the user hits CTRL+C
1326cdrom_locate_file_on_cd() { 1380_cdrom_locate_file_on_cd() {
1381 local mline=""
1382 local showedmsg=0
1383
1327 while [[ -z ${CDROM_ROOT} ]] ; do 1384 while [[ -z ${CDROM_ROOT} ]] ; do
1328 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}]})
1329 local file=$(basename "$*") 1393 local file=$(basename ${cdset[${i}]})
1330 local mline=""
1331 local showedmsg=0
1332 1394
1333 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
1334 [[ -d ${mline}/${dir} ]] || continue 1396 [[ -d ${mline}/${dir} ]] || continue
1335 [[ ! -z $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] \ 1397 if [[ -n $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] ; then
1336 && 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))
1337 done 1406 done
1338 1407
1339 if [[ -z ${CDROM_ROOT} ]] ; then
1340 echo 1408 echo
1341 if [[ ${showedmsg} -eq 0 ]] ; then 1409 if [[ ${showedmsg} -eq 0 ]] ; then
1342 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1410 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1343 if [[ -z ${CDROM_NAME} ]] ; then 1411 if [[ -z ${CDROM_NAME} ]] ; then
1344 einfo "Please insert the cdrom for ${PN} now !" 1412 einfo "Please insert+mount the cdrom for ${PN} now !"
1345 else
1346 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1347 fi
1348 else 1413 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 !" 1414 einfo "Please insert+mount the ${CDROM_NAME} cdrom now !"
1354 fi
1355 fi 1415 fi
1356 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
1357 fi 1423 fi
1424 showedmsg=1
1425 fi
1358 einfo "Press return to scan for the cd again" 1426 einfo "Press return to scan for the cd again"
1359 einfo "or hit CTRL+C to abort the emerge." 1427 einfo "or hit CTRL+C to abort the emerge."
1360 echo 1428 echo
1361 einfo "If you are having trouble with the detection" 1429 einfo "If you are having trouble with the detection"
1362 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"
1363 einfo "Joliet support enabled in your kernel. Please" 1431 einfo "Joliet support enabled in your kernel. Please"
1364 einfo "check that CONFIG_JOLIET is enabled in your kernel." 1432 einfo "check that CONFIG_JOLIET is enabled in your kernel."
1365 read 1433 read || die "something is screwed with your system"
1366 fi
1367 done 1434 done
1368} 1435}
1369 1436
1370# Make sure that LINGUAS only contains languages that 1437# Make sure that LINGUAS only contains languages that
1371# a package can support 1438# a package can support
1378# 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
1379# directories and uses the intersection of the lists. 1446# directories and uses the intersection of the lists.
1380# 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
1381# directories and uses the union of the lists. 1448# directories and uses the union of the lists.
1382strip-linguas() { 1449strip-linguas() {
1383 local ls newls 1450 local ls newls nols
1384 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then 1451 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1385 local op=$1; shift 1452 local op=$1; shift
1386 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1453 ls=$(find "$1" -name '*.po' -exec basename {} .po \;); shift
1387 local d f 1454 local d f
1388 for d in "$@" ; do 1455 for d in "$@" ; do
1389 if [[ ${op} == "-u" ]] ; then 1456 if [[ ${op} == "-u" ]] ; then
1390 newls=${ls} 1457 newls=${ls}
1391 else 1458 else
1392 newls="" 1459 newls=""
1393 fi 1460 fi
1394 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1461 for f in $(find "$d" -name '*.po' -exec basename {} .po \;) ; do
1395 if [[ ${op} == "-i" ]] ; then 1462 if [[ ${op} == "-i" ]] ; then
1396 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}" 1463 hasq ${f} ${ls} && newls="${newls} ${f}"
1397 else 1464 else
1398 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}" 1465 hasq ${f} ${ls} || newls="${newls} ${f}"
1399 fi 1466 fi
1400 done 1467 done
1401 ls=${newls} 1468 ls=${newls}
1402 done 1469 done
1403 ls=${ls//.po}
1404 else 1470 else
1405 ls=$@ 1471 ls="$@"
1406 fi 1472 fi
1407 1473
1408 ls=" ${ls} " 1474 nols=""
1409 newls="" 1475 newls=""
1410 for f in ${LINGUAS} ; do 1476 for f in ${LINGUAS} ; do
1411 if [[ ${ls/ ${f} /} != ${ls} ]] ; then 1477 if hasq ${f} ${ls} ; then
1412 newls="${newls} ${f}" 1478 newls="${newls} ${f}"
1413 else 1479 else
1414 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1480 nols="${nols} ${f}"
1415 fi 1481 fi
1416 done 1482 done
1417 if [[ -z ${newls} ]] ; then 1483 [[ -n ${nols} ]] \
1418 export LINGUAS="" 1484 && ewarn "Sorry, but ${PN} does not support the LINGUAs:" ${nols}
1419 else
1420 export LINGUAS=${newls:1} 1485 export LINGUAS=${newls:1}
1421 fi
1422} 1486}
1423 1487
1424# moved from kernel.eclass since they are generally useful outside of 1488# moved from kernel.eclass since they are generally useful outside of
1425# kernel.eclass -iggy (20041002) 1489# kernel.eclass -iggy (20041002)
1426 1490
1455 1519
1456# Jeremy Huddleston <eradicator@gentoo.org>: 1520# Jeremy Huddleston <eradicator@gentoo.org>:
1457# preserve_old_lib /path/to/libblah.so.0 1521# preserve_old_lib /path/to/libblah.so.0
1458# preserve_old_lib_notify /path/to/libblah.so.0 1522# preserve_old_lib_notify /path/to/libblah.so.0
1459# 1523#
1460# 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
1461# 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
1462# 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
1463# 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
1464# solution, so instead you can add the following to your ebuilds: 1528# solution, so instead you can add the following to your ebuilds:
1465# 1529#
1496 1560
1497 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."
1498 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"
1499 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,"
1500 ewarn "you will need to execute the following command:" 1564 ewarn "you will need to execute the following command:"
1501 ewarn " revdep-rebuild --soname ${SONAME}" 1565 ewarn " revdep-rebuild --library ${SONAME}"
1502 ewarn 1566 ewarn
1503 ewarn "After doing that, you can safely remove ${LIB}" 1567 ewarn "After doing that, you can safely remove ${LIB}"
1504 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild" 1568 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1505 fi 1569 fi
1506} 1570}
1519 [[ ${opt:0:1} = "-" ]] && shift || opt="-a" 1583 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1520 1584
1521 local PKG=$(best_version $1) 1585 local PKG=$(best_version $1)
1522 shift 1586 shift
1523 1587
1524 local USEFILE="${ROOT}/var/db/pkg/${PKG}/USE" 1588 local USEFILE=${ROOT}/var/db/pkg/${PKG}/USE
1589
1590 # if the USE file doesnt exist, assume the $PKG is either
1591 # injected or package.provided
1525 [[ ! -e ${USEFILE} ]] && return 1 1592 [[ ! -e ${USEFILE} ]] && return 0
1526 1593
1527 local USE_BUILT=$(<${USEFILE}) 1594 local USE_BUILT=$(<${USEFILE})
1528 while [[ $# -gt 0 ]] ; do 1595 while [[ $# -gt 0 ]] ; do
1529 if [[ ${opt} = "-o" ]] ; then 1596 if [[ ${opt} = "-o" ]] ; then
1530 has $1 ${USE_BUILT} && return 0 1597 has $1 ${USE_BUILT} && return 0
1582# $4 == extra LD_LIBRARY_PATH's (make it : delimited) 1649# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1583# $5 == path for wrapper 1650# $5 == path for wrapper
1584make_wrapper() { 1651make_wrapper() {
1585 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5 1652 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1586 local tmpwrapper=$(emktemp) 1653 local tmpwrapper=$(emktemp)
1654 # We don't want to quote ${bin} so that people can pass complex
1655 # things as $bin ... "./someprog --args"
1587 cat << EOF > "${tmpwrapper}" 1656 cat << EOF > "${tmpwrapper}"
1588#!/bin/sh 1657#!/bin/sh
1589cd "${chdir}" 1658cd "${chdir:-.}"
1659if [ -n "${libdir}" ] ; then
1660 if [ "\${LD_LIBRARY_PATH+set}" = "set" ] ; then
1590export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}" 1661 export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1662 else
1663 export LD_LIBRARY_PATH="${libdir}"
1664 fi
1665fi
1591exec ${bin} "\$@" 1666exec ${bin} "\$@"
1592EOF 1667EOF
1593 chmod go+rx "${tmpwrapper}" 1668 chmod go+rx "${tmpwrapper}"
1594 if [ -n "${5}" ] 1669 if [[ -n ${path} ]] ; then
1595 then
1596 exeinto ${5} 1670 exeinto "${path}"
1597 newexe "${tmpwrapper}" "${wrapper}" 1671 newexe "${tmpwrapper}" "${wrapper}"
1598 else 1672 else
1599 newbin "${tmpwrapper}" "${wrapper}" 1673 newbin "${tmpwrapper}" "${wrapper}"
1600 fi 1674 fi
1601} 1675}

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

  ViewVC Help
Powered by ViewVC 1.1.20