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

Diff of /eclass/eutils.eclass

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

Revision 1.193 Revision 1.237
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.193 2005/07/21 02:16:45 vapier Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.237 2006/06/04 15:18:12 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!
11 9
12inherit multilib 10inherit multilib portability
13 11
14DEPEND="!bootstrap? ( sys-devel/patch )" 12DEPEND="!bootstrap? ( sys-devel/patch )"
13RDEPEND=""
15# sys-apps/shadow is needed for useradd, etc, bug #94745. 14# sys-apps/shadow is needed for useradd, etc, bug #94745.
16 15
17DESCRIPTION="Based on the ${ECLASS} eclass" 16DESCRIPTION="Based on the ${ECLASS} eclass"
18 17
19# Wait for the supplied number of seconds. If no argument is supplied, defaults 18# Wait for the supplied number of seconds. If no argument is supplied, defaults
60# to point to the latest version of the library present. 59# to point to the latest version of the library present.
61# 60#
62# <azarah@gentoo.org> (26 Oct 2002) 61# <azarah@gentoo.org> (26 Oct 2002)
63# 62#
64gen_usr_ldscript() { 63gen_usr_ldscript() {
65 local libdir="$(get_libdir)" 64 local lib libdir=$(get_libdir)
66 # Just make sure it exists 65 # Just make sure it exists
67 dodir /usr/${libdir} 66 dodir /usr/${libdir}
68 67
69 for lib in "${@}" ; do 68 for lib in "${@}" ; do
70 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT 69 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT
76 75
77 See bug http://bugs.gentoo.org/4411 for more info. 76 See bug http://bugs.gentoo.org/4411 for more info.
78 */ 77 */
79 GROUP ( /${libdir}/${lib} ) 78 GROUP ( /${libdir}/${lib} )
80 END_LDSCRIPT 79 END_LDSCRIPT
81 fperms a+x "/usr/${libdir}/${lib}" 80 fperms a+x "/usr/${libdir}/${lib}" || die "could not change perms on ${lib}"
82 done 81 done
83} 82}
84 83
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 84
116# Default directory where patches are located 85# Default directory where patches are located
117EPATCH_SOURCE="${WORKDIR}/patch" 86EPATCH_SOURCE="${WORKDIR}/patch"
118# Default extension for patches 87# Default extension for patches
119EPATCH_SUFFIX="patch.bz2" 88EPATCH_SUFFIX="patch.bz2"
120# Default options for patch 89# Default options for patch
121# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571 90# 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. 91# Set --no-backup-if-mismatch so we don't leave '.orig' files behind.
92# Set -E to automatically remove empty files.
123EPATCH_OPTS="-g0 --no-backup-if-mismatch" 93EPATCH_OPTS="-g0 -E --no-backup-if-mismatch"
124# List of patches not to apply. Not this is only file names, 94# List of patches not to apply. Not this is only file names,
125# and not the full path .. 95# and not the full path ..
126EPATCH_EXCLUDE="" 96EPATCH_EXCLUDE=""
127# Change the printed message for a single patch. 97# Change the printed message for a single patch.
128EPATCH_SINGLE_MSG="" 98EPATCH_SINGLE_MSG=""
166# hand its a directory, it will set EPATCH_SOURCE to this. 136# hand its a directory, it will set EPATCH_SOURCE to this.
167# 137#
168# <azarah@gentoo.org> (10 Nov 2002) 138# <azarah@gentoo.org> (10 Nov 2002)
169# 139#
170epatch() { 140epatch() {
141 _epatch_draw_line() {
142 [[ -z $1 ]] && set "$(printf "%65s" '')"
143 echo "${1//?/=}"
144 }
145 _epatch_assert() { local _pipestatus=${PIPESTATUS[*]}; [[ ${_pipestatus// /} -eq 0 ]] ; }
171 local PIPE_CMD="" 146 local PIPE_CMD=""
172 local STDERR_TARGET="${T}/$$.out" 147 local STDERR_TARGET="${T}/$$.out"
173 local PATCH_TARGET="${T}/$$.patch" 148 local PATCH_TARGET="${T}/$$.patch"
174 local PATCH_SUFFIX="" 149 local PATCH_SUFFIX=""
175 local SINGLE_PATCH="no" 150 local SINGLE_PATCH="no"
176 local x="" 151 local x=""
152
153 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402
177 154
178 if [ "$#" -gt 1 ] 155 if [ "$#" -gt 1 ]
179 then 156 then
180 local m="" 157 local m=""
181 for m in "$@" ; do 158 for m in "$@" ; do
282 259
283 # Allow for prefix to differ ... im lazy, so shoot me :/ 260 # Allow for prefix to differ ... im lazy, so shoot me :/
284 while [ "${count}" -lt 5 ] 261 while [ "${count}" -lt 5 ]
285 do 262 do
286 # Generate some useful debug info ... 263 # Generate some useful debug info ...
287 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 264 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
288 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 265 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
289 266
290 if [ "${PATCH_SUFFIX}" != "patch" ] 267 if [ "${PATCH_SUFFIX}" != "patch" ]
291 then 268 then
292 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 269 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
297 274
298 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 275 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
299 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 276 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
300 277
301 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 278 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
302 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 279 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
303 280
304 if [ "${PATCH_SUFFIX}" != "patch" ] 281 if [ "${PATCH_SUFFIX}" != "patch" ]
305 then 282 then
306 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1 283 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
307 then 284 then
311 count=5 288 count=5
312 break 289 break
313 fi 290 fi
314 fi 291 fi
315 292
316 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1 293 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f ; _epatch_assert) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
317 then 294 then
318 draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 295 _epatch_draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
319 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 296 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
320 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 297 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
321 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 298 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
322 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 299 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
323 300
324 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1 301 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1
302 _epatch_assert
325 303
326 if [ "$?" -ne 0 ] 304 if [ "$?" -ne 0 ]
327 then 305 then
328 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 306 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
329 echo 307 echo
375# vapier@gentoo.org 353# vapier@gentoo.org
376# 354#
377# Takes just 1 optional parameter (the directory to create tmpfile in) 355# Takes just 1 optional parameter (the directory to create tmpfile in)
378emktemp() { 356emktemp() {
379 local exe="touch" 357 local exe="touch"
380 [ "$1" == "-d" ] && exe="mkdir" && shift 358 [[ $1 == -d ]] && exe="mkdir" && shift
381 local topdir="$1" 359 local topdir=$1
382 360
383 if [ -z "${topdir}" ] 361 if [[ -z ${topdir} ]] ; then
384 then
385 [ -z "${T}" ] \ 362 [[ -z ${T} ]] \
386 && topdir="/tmp" \ 363 && topdir="/tmp" \
387 || topdir="${T}" 364 || topdir=${T}
388 fi 365 fi
389 366
390 if [ -z "$(type -p mktemp)" ] 367 if [[ -z $(type -p mktemp) ]] ; then
391 then
392 local tmp=/ 368 local tmp=/
393 while [ -e "${tmp}" ] ; do 369 while [[ -e ${tmp} ]] ; do
394 tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}" 370 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}
395 done 371 done
396 ${exe} "${tmp}" 372 ${exe} "${tmp}" || ${exe} -p "${tmp}"
397 echo "${tmp}" 373 echo "${tmp}"
398 else 374 else
399 [ "${exe}" == "touch" ] \ 375 if [[ ${exe} == "touch" ]] ; then
400 && exe="-p" \ 376 [[ ${USERLAND} == "GNU" ]] \
401 || exe="-d" 377 && mktemp -p "${topdir}" \
402 mktemp ${exe} "${topdir}" 378 || TMPDIR="${topdir}" mktemp -t tmp
379 else
380 [[ ${USERLAND} == "GNU" ]] \
381 && mktemp -d "${topdir}" \
382 || TMPDIR="${topdir}" mktemp -dt tmp
383 fi
403 fi 384 fi
404} 385}
405 386
406# Small wrapper for getent (Linux), nidump (Mac OS X), 387# Small wrapper for getent (Linux), nidump (Mac OS X),
407# and pw (FreeBSD) used in enewuser()/enewgroup() 388# and pw (FreeBSD) used in enewuser()/enewgroup()
408# Joe Jezak <josejx@gmail.com> and usata@gentoo.org 389# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
409# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org> 390# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
410# 391#
411# egetent(database, key) 392# egetent(database, key)
412egetent() { 393egetent() {
413 if [[ "${USERLAND}" == "Darwin" ]] ; then 394 case ${CHOST} in
395 *-darwin*)
414 case "$2" in 396 case "$2" in
415 *[!0-9]*) # Non numeric 397 *[!0-9]*) # Non numeric
416 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 398 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
417 ;; 399 ;;
418 *) # Numeric 400 *) # Numeric
419 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 401 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
420 ;; 402 ;;
421 esac 403 esac
422 elif [[ "${USERLAND}" == "BSD" ]] ; then 404 ;;
423 local action 405 *-freebsd*|*-dragonfly*)
424 if [ "$1" == "passwd" ] 406 local opts action="user"
425 then 407 [[ $1 == "passwd" ]] || action="group"
426 action="user" 408
427 else 409 # lookup by uid/gid
428 action="group" 410 if [[ $2 == [[:digit:]]* ]] ; then
411 [[ ${action} == "user" ]] && opts="-u" || opts="-g"
429 fi 412 fi
413
430 pw show "${action}" "$2" -q 414 pw show ${action} ${opts} "$2" -q
431 else 415 ;;
416 *-netbsd*|*-openbsd*)
417 grep "$2:\*:" /etc/$1
418 ;;
419 *)
432 which nscd >& /dev/null && nscd -i "$1" 420 type -p nscd >& /dev/null && nscd -i "$1"
433 getent "$1" "$2" 421 getent "$1" "$2"
434 fi 422 ;;
423 esac
435} 424}
436 425
437# Simplify/standardize adding users to the system 426# Simplify/standardize adding users to the system
438# vapier@gentoo.org 427# vapier@gentoo.org
439# 428#
446# shell: /bin/false 435# shell: /bin/false
447# homedir: /dev/null 436# homedir: /dev/null
448# groups: none 437# groups: none
449# extra: comment of 'added by portage for ${PN}' 438# extra: comment of 'added by portage for ${PN}'
450enewuser() { 439enewuser() {
440 case ${EBUILD_PHASE} in
441 unpack|compile|test|install)
442 eerror "'enewuser()' called from '${EBUILD_PHASE}()' which is not a pkg_* function."
443 eerror "Package fails at QA and at life. Please file a bug."
444 die "Bad package! enewuser is only for use in pkg_* functions!"
445 esac
446
451 # get the username 447 # get the username
452 local euser=$1; shift 448 local euser=$1; shift
453 if [[ -z ${euser} ]] ; then 449 if [[ -z ${euser} ]] ; then
454 eerror "No username specified !" 450 eerror "No username specified !"
455 die "Cannot call enewuser without a username" 451 die "Cannot call enewuser without a username"
477 fi 473 fi
478 else 474 else
479 euid="next" 475 euid="next"
480 fi 476 fi
481 if [[ ${euid} == "next" ]] ; then 477 if [[ ${euid} == "next" ]] ; then
482 local pwrange 478 for euid in $(seq 101 999) ; do
483 if [[ ${USERLAND} == "BSD" ]] ; then
484 pwrange=$(jot 898 101)
485 else
486 pwrange=$(seq 101 999)
487 fi
488 for euid in ${pwrange} ; do
489 [[ -z $(egetent passwd ${euid}) ]] && break 479 [[ -z $(egetent passwd ${euid}) ]] && break
490 done 480 done
491 fi 481 fi
492 opts="${opts} -u ${euid}" 482 opts="${opts} -u ${euid}"
493 einfo " - Userid: ${euid}" 483 einfo " - Userid: ${euid}"
494 484
495 # handle shell 485 # handle shell
496 local eshell=$1; shift 486 local eshell=$1; shift
497 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then 487 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
498 if [[ ! -e ${eshell} ]] ; then 488 if [[ ! -e ${ROOT}${eshell} ]] ; then
499 eerror "A shell was specified but it does not exist !" 489 eerror "A shell was specified but it does not exist !"
500 die "${eshell} does not exist" 490 die "${eshell} does not exist in ${ROOT}"
491 fi
492 if [[ ${eshell} == */false || ${eshell} == */nologin ]] ; then
493 eerror "Do not specify ${eshell} yourself, use -1"
494 die "Pass '-1' as the shell parameter"
501 fi 495 fi
502 else 496 else
503 case ${USERLAND} in 497 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do
504 Darwin) eshell="/usr/bin/false";; 498 [[ -x ${ROOT}${shell} ]] && break
505 BSD) eshell="/usr/sbin/nologin";; 499 done
506 *) eshell="/bin/false";; 500
507 esac 501 if [[ ${shell} == "/dev/null" ]] ; then
502 eerror "Unable to identify the shell to use"
503 die "Unable to identify the shell to use"
504 fi
505
506 eshell=${shell}
508 fi 507 fi
509 einfo " - Shell: ${eshell}" 508 einfo " - Shell: ${eshell}"
510 opts="${opts} -s ${eshell}" 509 opts="${opts} -s ${eshell}"
511 510
512 # handle homedir 511 # handle homedir
549 einfo " - Groups: ${egroups}" 548 einfo " - Groups: ${egroups}"
550 549
551 # handle extra and add the user 550 # handle extra and add the user
552 local oldsandbox=${SANDBOX_ON} 551 local oldsandbox=${SANDBOX_ON}
553 export SANDBOX_ON="0" 552 export SANDBOX_ON="0"
554 case ${USERLAND} in 553 case ${CHOST} in
555 Darwin) 554 *-darwin*)
556 ### Make the user 555 ### Make the user
557 if [[ -z $@ ]] ; then 556 if [[ -z $@ ]] ; then
558 dscl . create /users/${euser} uid ${euid} 557 dscl . create /users/${euser} uid ${euid}
559 dscl . create /users/${euser} shell ${eshell} 558 dscl . create /users/${euser} shell ${eshell}
560 dscl . create /users/${euser} home ${ehome} 559 dscl . create /users/${euser} home ${ehome}
571 einfo "Please report the ebuild along with the info below" 570 einfo "Please report the ebuild along with the info below"
572 einfo "eextra: $@" 571 einfo "eextra: $@"
573 die "Required function missing" 572 die "Required function missing"
574 fi 573 fi
575 ;; 574 ;;
576 BSD) 575 *-freebsd*|*-dragonfly*)
577 if [[ -z $@ ]] ; then 576 if [[ -z $@ ]] ; then
578 pw useradd ${euser} ${opts} \ 577 pw useradd ${euser} ${opts} \
579 -c "added by portage for ${PN}" \ 578 -c "added by portage for ${PN}" \
580 die "enewuser failed" 579 die "enewuser failed"
581 else 580 else
582 einfo " - Extra: $@" 581 einfo " - Extra: $@"
583 pw useradd ${euser} ${opts} \ 582 pw useradd ${euser} ${opts} \
584 "$@" || die "enewuser failed" 583 "$@" || die "enewuser failed"
585 fi 584 fi
586 ;; 585 ;;
586
587 *-netbsd*)
588 if [[ -z $@ ]] ; then
589 useradd ${opts} ${euser} || die "enewuser failed"
590 else
591 einfo " - Extra: $@"
592 useradd ${opts} ${euser} "$@" || die "enewuser failed"
593 fi
594 ;;
595
596 *-openbsd*)
597 if [[ -z $@ ]] ; then
598 useradd -u ${euid} -s ${eshell} \
599 -d ${ehome} -c "Added by portage for ${PN}" \
600 -g ${egroups} ${euser} || die "enewuser failed"
601 else
602 einfo " - Extra: $@"
603 useradd -u ${euid} -s ${eshell} \
604 -d ${ehome} -c "Added by portage for ${PN}" \
605 -g ${egroups} ${euser} "$@" || die "enewuser failed"
606 fi
607 ;;
608
587 *) 609 *)
588 if [[ -z $@ ]] ; then 610 if [[ -z $@ ]] ; then
589 useradd ${opts} ${euser} \ 611 useradd ${opts} ${euser} \
590 -c "added by portage for ${PN}" \ 612 -c "added by portage for ${PN}" \
591 || die "enewuser failed" 613 || die "enewuser failed"
615# Default values if you do not specify any: 637# Default values if you do not specify any:
616# groupname: REQUIRED ! 638# groupname: REQUIRED !
617# gid: next available (see groupadd(8)) 639# gid: next available (see groupadd(8))
618# extra: none 640# extra: none
619enewgroup() { 641enewgroup() {
642 case ${EBUILD_PHASE} in
643 unpack|compile|test|install)
644 eerror "'enewgroup()' called from '${EBUILD_PHASE}()' which is not a pkg_* function."
645 eerror "Package fails at QA and at life. Please file a bug."
646 die "Bad package! enewgroup is only for use in pkg_* functions!"
647 esac
648
620 # get the group 649 # get the group
621 local egroup="$1"; shift 650 local egroup="$1"; shift
622 if [ -z "${egroup}" ] 651 if [ -z "${egroup}" ]
623 then 652 then
624 eerror "No group specified !" 653 eerror "No group specified !"
641 then 670 then
642 if [ "${egid}" -gt 0 ] 671 if [ "${egid}" -gt 0 ]
643 then 672 then
644 if [ -z "`egetent group ${egid}`" ] 673 if [ -z "`egetent group ${egid}`" ]
645 then 674 then
646 if [[ "${USERLAND}" == "Darwin" ]]; then 675 if [[ "${CHOST}" == *-darwin* ]]; then
647 opts="${opts} ${egid}" 676 opts="${opts} ${egid}"
648 else 677 else
649 opts="${opts} -g ${egid}" 678 opts="${opts} -g ${egid}"
650 fi 679 fi
651 else 680 else
665 opts="${opts} ${eextra}" 694 opts="${opts} ${eextra}"
666 695
667 # add the group 696 # add the group
668 local oldsandbox="${SANDBOX_ON}" 697 local oldsandbox="${SANDBOX_ON}"
669 export SANDBOX_ON="0" 698 export SANDBOX_ON="0"
670 if [[ "${USERLAND}" == "Darwin" ]]; then 699 case ${CHOST} in
700 *-darwin*)
671 if [ ! -z "${eextra}" ]; 701 if [ ! -z "${eextra}" ];
672 then 702 then
673 einfo "Extra options are not supported on Darwin/OS X yet" 703 einfo "Extra options are not supported on Darwin/OS X yet"
674 einfo "Please report the ebuild along with the info below" 704 einfo "Please report the ebuild along with the info below"
675 einfo "eextra: ${eextra}" 705 einfo "eextra: ${eextra}"
676 die "Required function missing" 706 die "Required function missing"
677 fi 707 fi
678 708
679 # If we need the next available 709 # If we need the next available
680 case ${egid} in 710 case ${egid} in
681 *[!0-9]*) # Non numeric 711 *[!0-9]*) # Non numeric
682 for egid in `jot 898 101`; do 712 for egid in $(seq 101 999); do
683 [ -z "`egetent group ${egid}`" ] && break 713 [ -z "`egetent group ${egid}`" ] && break
684 done 714 done
685 esac 715 esac
686 dscl . create /groups/${egroup} gid ${egid} 716 dscl . create /groups/${egroup} gid ${egid}
687 dscl . create /groups/${egroup} passwd '*' 717 dscl . create /groups/${egroup} passwd '*'
688 elif [[ "${USERLAND}" == "BSD" ]] ; then 718 ;;
719
720 *-freebsd*|*-dragonfly*)
689 case ${egid} in 721 case ${egid} in
690 *[!0-9]*) # Non numeric 722 *[!0-9]*) # Non numeric
691 for egid in `jot 898 101`; do 723 for egid in $(seq 101 999); do
692 [ -z "`egetent group ${egid}`" ] && break 724 [ -z "`egetent group ${egid}`" ] && break
693 done 725 done
694 esac 726 esac
695 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 727 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
696 else 728 ;;
729
730 *-netbsd*)
731 case ${egid} in
732 *[!0-9]*) # Non numeric
733 for egid in $(seq 101 999); do
734 [ -z "`egetent group ${egid}`" ] && break
735 done
736 esac
737 groupadd -g ${egid} ${egroup} || die "enewgroup failed"
738 ;;
739
740 *)
697 groupadd ${opts} ${egroup} || die "enewgroup failed" 741 groupadd ${opts} ${egroup} || die "enewgroup failed"
698 fi 742 ;;
743 esac
699 export SANDBOX_ON="${oldsandbox}" 744 export SANDBOX_ON="${oldsandbox}"
700} 745}
701 746
702# Simple script to replace 'dos2unix' binaries 747# Simple script to replace 'dos2unix' binaries
703# vapier@gentoo.org 748# vapier@gentoo.org
814 type="Network;${type}" 859 type="Network;${type}"
815 ;; 860 ;;
816 861
817 sci) 862 sci)
818 case ${catmin} in 863 case ${catmin} in
819 astro*) type=Astronomoy;; 864 astro*) type=Astronomy;;
820 bio*) type=Biology;; 865 bio*) type=Biology;;
821 calc*) type=Calculator;; 866 calc*) type=Calculator;;
822 chem*) type=Chemistry;; 867 chem*) type=Chemistry;;
823 geo*) type=Geology;; 868 geo*) type=Geology;;
824 math*) type=Math;; 869 math*) type=Math;;
844 local desktop_name="${PN}" 889 local desktop_name="${PN}"
845 else 890 else
846 local desktop_name="${PN}-${SLOT}" 891 local desktop_name="${PN}-${SLOT}"
847 fi 892 fi
848 local desktop=${T}/${exec%% *}-${desktop_name}.desktop 893 local desktop=${T}/${exec%% *}-${desktop_name}.desktop
894# local desktop=${T}/${exec%% *:-${desktop_name}}.desktop
849 895
850echo "[Desktop Entry] 896echo "[Desktop Entry]
851Encoding=UTF-8 897Encoding=UTF-8
852Version=0.9.2 898Version=0.9.2
853Name=${name} 899Name=${name}
854Type=Application 900Type=Application
855Comment=${DESCRIPTION} 901Comment=${DESCRIPTION}
856Exec=${exec} 902Exec=${exec}
903TryExec=${exec}
857Path=${path} 904Path=${path}
858Icon=${icon} 905Icon=${icon}
859Categories=Application;${type};" > "${desktop}" 906Categories=Application;${type};" > "${desktop}"
860 907
908 (
909 # wrap the env here so that the 'insinto' call
910 # doesn't corrupt the env of the caller
861 insinto /usr/share/applications 911 insinto /usr/share/applications
862 doins "${desktop}" 912 doins "${desktop}"
863 913 )
864 return 0
865} 914}
866 915
867# Make a GDM/KDM Session file 916# Make a GDM/KDM Session file
868# 917#
869# make_desktop_entry(<title>, <command>) 918# make_desktop_entry(<title>, <command>)
931############################################################## 980##############################################################
932 981
933 982
934# for internal use only (unpack_pdv and unpack_makeself) 983# for internal use only (unpack_pdv and unpack_makeself)
935find_unpackable_file() { 984find_unpackable_file() {
936 local src="$1" 985 local src=$1
937 if [ -z "${src}" ] 986 if [[ -z ${src} ]] ; then
938 then
939 src="${DISTDIR}/${A}" 987 src=${DISTDIR}/${A}
940 else 988 else
941 if [ -e "${DISTDIR}/${src}" ] 989 if [[ -e ${DISTDIR}/${src} ]] ; then
942 then
943 src="${DISTDIR}/${src}" 990 src=${DISTDIR}/${src}
944 elif [ -e "${PWD}/${src}" ] 991 elif [[ -e ${PWD}/${src} ]] ; then
945 then
946 src="${PWD}/${src}" 992 src=${PWD}/${src}
947 elif [ -e "${src}" ] 993 elif [[ -e ${src} ]] ; then
948 then
949 src="${src}" 994 src=${src}
950 fi
951 fi 995 fi
952 [ ! -e "${src}" ] && die "Could not find requested archive ${src}" 996 fi
997 [[ ! -e ${src} ]] && return 1
953 echo "${src}" 998 echo "${src}"
954} 999}
955 1000
956# Unpack those pesky pdv generated files ... 1001# Unpack those pesky pdv generated files ...
957# They're self-unpacking programs with the binary package stuffed in 1002# They're self-unpacking programs with the binary package stuffed in
972# lseek 1017# lseek
973# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 1018# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
974# lseek(3, -4, SEEK_END) = 2981250 1019# lseek(3, -4, SEEK_END) = 2981250
975# thus we would pass in the value of '4' as the second parameter. 1020# thus we would pass in the value of '4' as the second parameter.
976unpack_pdv() { 1021unpack_pdv() {
977 local src="`find_unpackable_file $1`" 1022 local src=$(find_unpackable_file $1)
978 local sizeoff_t="$2" 1023 local sizeoff_t=$2
979 1024
1025 [[ -z ${src} ]] && die "Could not locate source for '$1'"
980 [ -z "${sizeoff_t}" ] && die "No idea what off_t size was used for this pdv :(" 1026 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :("
981 1027
982 local shrtsrc="`basename ${src}`" 1028 local shrtsrc=$(basename "${src}")
983 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1029 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
984 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1030 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"`
985 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"` 1031 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"`
986 1032
987 # grab metadata for debug reasons 1033 # grab metadata for debug reasons
1051# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1097# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1052# - If the file is not specified then unpack will utilize ${A}. 1098# - If the file is not specified then unpack will utilize ${A}.
1053# - If the offset is not specified then we will attempt to extract 1099# - If the offset is not specified then we will attempt to extract
1054# the proper offset from the script itself. 1100# the proper offset from the script itself.
1055unpack_makeself() { 1101unpack_makeself() {
1102 local src_input=${1:-${A}}
1056 local src="$(find_unpackable_file "$1")" 1103 local src=$(find_unpackable_file "${src_input}")
1057 local skip="$2" 1104 local skip=$2
1058 local exe="$3" 1105 local exe=$3
1059 1106
1107 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
1108
1060 local shrtsrc="$(basename "${src}")" 1109 local shrtsrc=$(basename "${src}")
1061 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1110 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1062 if [ -z "${skip}" ] 1111 if [[ -z ${skip} ]] ; then
1063 then
1064 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1112 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}')
1065 local skip=0 1113 local skip=0
1066 exe=tail 1114 exe=tail
1067 case ${ver} in 1115 case ${ver} in
1068 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same 1116 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same
1069 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1117 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1081 ;; 1129 ;;
1082 2.1.3) 1130 2.1.3)
1083 skip=`grep -a ^offset= "${src}" | awk '{print $3}'` 1131 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1084 let skip="skip + 1" 1132 let skip="skip + 1"
1085 ;; 1133 ;;
1086 2.1.4) 1134 2.1.4|2.1.5)
1087 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1) 1135 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1)
1088 skip=$(head -n ${skip} "${src}" | wc -c) 1136 skip=$(head -n ${skip} "${src}" | wc -c)
1089 exe="dd" 1137 exe="dd"
1090 ;; 1138 ;;
1091 *) 1139 *)
1136check_license() { 1184check_license() {
1137 local lic=$1 1185 local lic=$1
1138 if [ -z "${lic}" ] ; then 1186 if [ -z "${lic}" ] ; then
1139 lic="${PORTDIR}/licenses/${LICENSE}" 1187 lic="${PORTDIR}/licenses/${LICENSE}"
1140 else 1188 else
1141 if [ -e "${PORTDIR}/licenses/${src}" ] ; then 1189 if [ -e "${PORTDIR}/licenses/${lic}" ] ; then
1142 lic="${PORTDIR}/licenses/${src}" 1190 lic="${PORTDIR}/licenses/${lic}"
1143 elif [ -e "${PWD}/${src}" ] ; then 1191 elif [ -e "${PWD}/${lic}" ] ; then
1144 lic="${PWD}/${src}" 1192 lic="${PWD}/${lic}"
1145 elif [ -e "${src}" ] ; then 1193 elif [ -e "${lic}" ] ; then
1146 lic="${src}" 1194 lic="${lic}"
1147 fi
1148 fi 1195 fi
1196 fi
1149 [ ! -f "${lic}" ] && die "Could not find requested license ${src}" 1197 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1150 local l="`basename ${lic}`" 1198 local l="`basename ${lic}`"
1151 1199
1152 # here is where we check for the licenses the user already 1200 # here is where we check for the licenses the user already
1153 # accepted ... if we don't find a match, we make the user accept 1201 # accepted ... if we don't find a match, we make the user accept
1154 local shopts=$- 1202 local shopts=$-
1210 # 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
1211 # the # of files they gave us 1259 # the # of files they gave us
1212 local cdcnt=0 1260 local cdcnt=0
1213 local f= 1261 local f=
1214 for f in "$@" ; do 1262 for f in "$@" ; do
1215 cdcnt=$((cdcnt + 1)) 1263 ((++cdcnt))
1216 export CDROM_CHECK_${cdcnt}="$f" 1264 export CDROM_CHECK_${cdcnt}="$f"
1217 done 1265 done
1218 export CDROM_TOTAL_CDS=${cdcnt} 1266 export CDROM_TOTAL_CDS=${cdcnt}
1219 export CDROM_CURRENT_CD=1 1267 export CDROM_CURRENT_CD=1
1220 1268
1221 # now we see if the user gave use CD_ROOT ... 1269 # now we see if the user gave use CD_ROOT ...
1222 # 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
1223 if [[ ! -z ${CD_ROOT} ]] ; then
1224 export CDROM_ROOT=${CD_ROOT}
1225 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1226 return
1227 fi
1228 # do the same for CD_ROOT_X
1229 if [[ ! -z ${CD_ROOT_1} ]] ; then 1271 if [[ -n ${CD_ROOT}${CD_ROOT_1} ]] ; then
1230 local var= 1272 local var=
1231 cdcnt=0 1273 cdcnt=0
1232 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1274 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1233 cdcnt=$((cdcnt + 1)) 1275 ((++cdcnt))
1234 var="CD_ROOT_${cdcnt}" 1276 var="CD_ROOT_${cdcnt}"
1277 [[ -z ${!var} ]] && var="CD_ROOT"
1235 if [[ -z ${!var} ]] ; then 1278 if [[ -z ${!var} ]] ; then
1236 eerror "You must either use just the CD_ROOT" 1279 eerror "You must either use just the CD_ROOT"
1237 eerror "or specify ALL the CD_ROOT_X variables." 1280 eerror "or specify ALL the CD_ROOT_X variables."
1238 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."
1239 die "could not locate CD_ROOT_${cdcnt}" 1282 die "could not locate CD_ROOT_${cdcnt}"
1240 fi 1283 fi
1241 export CDROM_ROOTS_${cdcnt}="${!var}"
1242 done 1284 done
1243 export CDROM_ROOT=${CDROM_ROOTS_1} 1285 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}}
1244 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}
1245 return 1293 return
1246 fi 1294 fi
1247 1295
1296 # User didn't help us out so lets make sure they know they can
1297 # simplify the whole process ...
1248 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1298 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1249 einfon "This ebuild will need the " 1299 einfo "This ebuild will need the ${CDROM_NAME:-cdrom for ${PN}}"
1250 if [[ -z ${CDROM_NAME} ]] ; then
1251 echo "cdrom for ${PN}."
1252 else
1253 echo "${CDROM_NAME}."
1254 fi
1255 echo 1300 echo
1256 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"
1257 einfo "mounted somewhere on your filesystem, just export" 1302 einfo "mounted somewhere on your filesystem, just export"
1258 einfo "the variable CD_ROOT so that it points to the" 1303 einfo "the variable CD_ROOT so that it points to the"
1259 einfo "directory containing the files." 1304 einfo "directory containing the files."
1263 echo 1308 echo
1264 else 1309 else
1265 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1310 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1266 cdcnt=0 1311 cdcnt=0
1267 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1312 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1268 cdcnt=$((cdcnt + 1)) 1313 ((++cdcnt))
1269 var="CDROM_NAME_${cdcnt}" 1314 var="CDROM_NAME_${cdcnt}"
1270 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}" 1315 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}"
1271 done 1316 done
1272 echo 1317 echo
1273 einfo "If you do not have the CDs, but have the data files" 1318 einfo "If you do not have the CDs, but have the data files"
1274 einfo "mounted somewhere on your filesystem, just export" 1319 einfo "mounted somewhere on your filesystem, just export"
1275 einfo "the following variables so they point to the right place:" 1320 einfo "the following variables so they point to the right place:"
1276 einfon "" 1321 einfon ""
1277 cdcnt=0 1322 cdcnt=0
1278 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1323 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1279 cdcnt=$((cdcnt + 1)) 1324 ((++cdcnt))
1280 echo -n " CD_ROOT_${cdcnt}" 1325 echo -n " CD_ROOT_${cdcnt}"
1281 done 1326 done
1282 echo 1327 echo
1283 einfo "Or, if you have all the files in the same place, or" 1328 einfo "Or, if you have all the files in the same place, or"
1284 einfo "you only have one cdrom, you can export CD_ROOT" 1329 einfo "you only have one cdrom, you can export CD_ROOT"
1287 echo 1332 echo
1288 einfo "For example:" 1333 einfo "For example:"
1289 einfo "export CD_ROOT_1=/mnt/cdrom" 1334 einfo "export CD_ROOT_1=/mnt/cdrom"
1290 echo 1335 echo
1291 fi 1336 fi
1337
1338 export CDROM_SET=""
1292 export CDROM_CURRENT_CD=0 1339 export CDROM_CURRENT_CD=0
1293 cdrom_load_next_cd 1340 cdrom_load_next_cd
1294} 1341}
1295 1342
1296# this is only used when you need access to more than one cd. 1343# this is only used when you need access to more than one cd.
1297# when you have finished using the first cd, just call this function. 1344# when you have finished using the first cd, just call this function.
1298# when it returns, CDROM_ROOT will be pointing to the second cd. 1345# when it returns, CDROM_ROOT will be pointing to the second cd.
1299# remember, you can only go forward in the cd chain, you can't go back. 1346# remember, you can only go forward in the cd chain, you can't go back.
1300cdrom_load_next_cd() { 1347cdrom_load_next_cd() {
1301 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1302 local var= 1348 local var
1303 1349 ((++CDROM_CURRENT_CD))
1304 if [[ ! -z ${CD_ROOT} ]] ; then
1305 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}"
1306 return
1307 fi
1308 1350
1309 unset CDROM_ROOT 1351 unset CDROM_ROOT
1310 var=CDROM_ROOTS_${CDROM_CURRENT_CD} 1352 var=CD_ROOT_${CDROM_CURRENT_CD}
1353 [[ -z ${!var} ]] && var="CD_ROOT"
1311 if [[ -z ${!var} ]] ; then 1354 if [[ -z ${!var} ]] ; then
1312 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1355 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1313 cdrom_locate_file_on_cd ${!var} 1356 _cdrom_locate_file_on_cd ${!var}
1314 else 1357 else
1315 export CDROM_ROOT=${!var} 1358 export CDROM_ROOT=${!var}
1316 fi 1359 fi
1317 1360
1318 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1361 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1323# all it does is try to locate a give file on a cd ... if the cd isn't 1366# all it does is try to locate a give file on a cd ... if the cd isn't
1324# found, then a message asking for the user to insert the cdrom will be 1367# found, then a message asking for the user to insert the cdrom will be
1325# displayed and we'll hang out here until: 1368# displayed and we'll hang out here until:
1326# (1) the file is found on a mounted cdrom 1369# (1) the file is found on a mounted cdrom
1327# (2) the user hits CTRL+C 1370# (2) the user hits CTRL+C
1328cdrom_locate_file_on_cd() { 1371_cdrom_locate_file_on_cd() {
1372 local mline=""
1373 local showedmsg=0
1374
1329 while [[ -z ${CDROM_ROOT} ]] ; do 1375 while [[ -z ${CDROM_ROOT} ]] ; do
1330 local dir=$(dirname "$*") 1376 local i=0
1377 local -a cdset=(${*//:/ })
1378 if [[ -n ${CDROM_SET} ]] ; then
1379 cdset=(${cdset[${CDROM_SET}]})
1380 fi
1381
1382 while [[ -n ${cdset[${i}]} ]] ; do
1383 local dir=$(dirname ${cdset[${i}]})
1331 local file=$(basename "$*") 1384 local file=$(basename ${cdset[${i}]})
1332 local mline=""
1333 local showedmsg=0
1334 1385
1335 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do 1386 for mline in $(mount | gawk '/(iso|cdrom|fs=cdfss)/ {print $3}') ; do
1336 [[ -d ${mline}/${dir} ]] || continue 1387 [[ -d ${mline}/${dir} ]] || continue
1337 [[ ! -z $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] \ 1388 if [[ -n $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] ; then
1338 && export CDROM_ROOT=${mline} 1389 export CDROM_ROOT=${mline}
1390 export CDROM_SET=${i}
1391 export CDROM_MATCH=${cdset[${i}]}
1392 return
1393 fi
1394 done
1395
1396 ((++i))
1339 done 1397 done
1340 1398
1341 if [[ -z ${CDROM_ROOT} ]] ; then
1342 echo 1399 echo
1343 if [[ ${showedmsg} -eq 0 ]] ; then 1400 if [[ ${showedmsg} -eq 0 ]] ; then
1344 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1401 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1345 if [[ -z ${CDROM_NAME} ]] ; then 1402 if [[ -z ${CDROM_NAME} ]] ; then
1346 einfo "Please insert the cdrom for ${PN} now !" 1403 einfo "Please insert+mount the cdrom for ${PN} now !"
1347 else
1348 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1349 fi
1350 else 1404 else
1351 if [[ -z ${CDROM_NAME_1} ]] ; then
1352 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !"
1353 else
1354 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1355 einfo "Please insert+mount the ${!var} cdrom now !" 1405 einfo "Please insert+mount the ${CDROM_NAME} cdrom now !"
1356 fi
1357 fi 1406 fi
1358 showedmsg=1 1407 else
1408 if [[ -z ${CDROM_NAME_1} ]] ; then
1409 einfo "Please insert+mount cd #${CDROM_CURRENT_CD} for ${PN} now !"
1410 else
1411 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1412 einfo "Please insert+mount the ${!var} cdrom now !"
1413 fi
1359 fi 1414 fi
1415 showedmsg=1
1416 fi
1360 einfo "Press return to scan for the cd again" 1417 einfo "Press return to scan for the cd again"
1361 einfo "or hit CTRL+C to abort the emerge." 1418 einfo "or hit CTRL+C to abort the emerge."
1362 echo 1419 echo
1363 einfo "If you are having trouble with the detection" 1420 einfo "If you are having trouble with the detection"
1364 einfo "of your CD, it is possible that you do not have" 1421 einfo "of your CD, it is possible that you do not have"
1365 einfo "Joliet support enabled in your kernel. Please" 1422 einfo "Joliet support enabled in your kernel. Please"
1366 einfo "check that CONFIG_JOLIET is enabled in your kernel." 1423 einfo "check that CONFIG_JOLIET is enabled in your kernel."
1367 read 1424 read || die "something is screwed with your system"
1368 fi
1369 done 1425 done
1370} 1426}
1371 1427
1372# Make sure that LINGUAS only contains languages that 1428# Make sure that LINGUAS only contains languages that
1373# a package can support 1429# a package can support
1383# directories and uses the union of the lists. 1439# directories and uses the union of the lists.
1384strip-linguas() { 1440strip-linguas() {
1385 local ls newls 1441 local ls newls
1386 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then 1442 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1387 local op=$1; shift 1443 local op=$1; shift
1388 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1444 ls=$(find "$1" -name '*.po' -exec basename {} .po \;); shift
1389 local d f 1445 local d f
1390 for d in "$@" ; do 1446 for d in "$@" ; do
1391 if [[ ${op} == "-u" ]] ; then 1447 if [[ ${op} == "-u" ]] ; then
1392 newls=${ls} 1448 newls=${ls}
1393 else 1449 else
1394 newls="" 1450 newls=""
1395 fi 1451 fi
1396 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1452 for f in $(find "$d" -name '*.po' -exec basename {} .po \;) ; do
1397 if [[ ${op} == "-i" ]] ; then 1453 if [[ ${op} == "-i" ]] ; then
1398 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}" 1454 hasq ${f} ${ls} && newls="${newls} ${f}"
1399 else 1455 else
1400 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}" 1456 hasq ${f} ${ls} || newls="${newls} ${f}"
1401 fi 1457 fi
1402 done 1458 done
1403 ls=${newls} 1459 ls=${newls}
1404 done 1460 done
1405 ls=${ls//.po}
1406 else 1461 else
1407 ls=$@ 1462 ls="$@"
1408 fi 1463 fi
1409 1464
1410 ls=" ${ls} "
1411 newls="" 1465 newls=""
1412 for f in ${LINGUAS} ; do 1466 for f in ${LINGUAS} ; do
1413 if [[ ${ls/ ${f} /} != ${ls} ]] ; then 1467 if hasq ${f} ${ls} ; then
1414 newls="${newls} ${f}" 1468 newls="${newls} ${f}"
1415 else 1469 else
1416 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1470 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA"
1417 fi 1471 fi
1418 done 1472 done
1419 if [[ -z ${newls} ]] ; then
1420 export LINGUAS=""
1421 else
1422 export LINGUAS=${newls:1} 1473 export LINGUAS=${newls:1}
1423 fi
1424} 1474}
1425 1475
1426# moved from kernel.eclass since they are generally useful outside of 1476# moved from kernel.eclass since they are generally useful outside of
1427# kernel.eclass -iggy (20041002) 1477# kernel.eclass -iggy (20041002)
1428 1478
1457 1507
1458# Jeremy Huddleston <eradicator@gentoo.org>: 1508# Jeremy Huddleston <eradicator@gentoo.org>:
1459# preserve_old_lib /path/to/libblah.so.0 1509# preserve_old_lib /path/to/libblah.so.0
1460# preserve_old_lib_notify /path/to/libblah.so.0 1510# preserve_old_lib_notify /path/to/libblah.so.0
1461# 1511#
1462# These functions are useful when a lib in your package changes --soname. Such 1512# These functions are useful when a lib in your package changes --library. Such
1463# an example might be from libogg.so.0 to libogg.so.1. Removing libogg.so.0 1513# an example might be from libogg.so.0 to libogg.so.1. Removing libogg.so.0
1464# would break packages that link against it. Most people get around this 1514# would break packages that link against it. Most people get around this
1465# by using the portage SLOT mechanism, but that is not always a relevant 1515# by using the portage SLOT mechanism, but that is not always a relevant
1466# solution, so instead you can add the following to your ebuilds: 1516# solution, so instead you can add the following to your ebuilds:
1467# 1517#
1498 1548
1499 ewarn "An old version of an installed library was detected on your system." 1549 ewarn "An old version of an installed library was detected on your system."
1500 ewarn "In order to avoid breaking packages that link against it, this older version" 1550 ewarn "In order to avoid breaking packages that link against it, this older version"
1501 ewarn "is not being removed. In order to make full use of this newer version," 1551 ewarn "is not being removed. In order to make full use of this newer version,"
1502 ewarn "you will need to execute the following command:" 1552 ewarn "you will need to execute the following command:"
1503 ewarn " revdep-rebuild --soname ${SONAME}" 1553 ewarn " revdep-rebuild --library ${SONAME}"
1504 ewarn 1554 ewarn
1505 ewarn "After doing that, you can safely remove ${LIB}" 1555 ewarn "After doing that, you can safely remove ${LIB}"
1506 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild" 1556 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1507 fi 1557 fi
1508} 1558}
1521 [[ ${opt:0:1} = "-" ]] && shift || opt="-a" 1571 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1522 1572
1523 local PKG=$(best_version $1) 1573 local PKG=$(best_version $1)
1524 shift 1574 shift
1525 1575
1526 local USEFILE="${ROOT}/var/db/pkg/${PKG}/USE" 1576 local USEFILE=${ROOT}/var/db/pkg/${PKG}/USE
1577
1578 # if the USE file doesnt exist, assume the $PKG is either
1579 # injected or package.provided
1527 [[ ! -e ${USEFILE} ]] && return 1 1580 [[ ! -e ${USEFILE} ]] && return 0
1528 1581
1529 local USE_BUILT=$(<${USEFILE}) 1582 local USE_BUILT=$(<${USEFILE})
1530 while [[ $# -gt 0 ]] ; do 1583 while [[ $# -gt 0 ]] ; do
1531 if [[ ${opt} = "-o" ]] ; then 1584 if [[ ${opt} = "-o" ]] ; then
1532 has $1 ${USE_BUILT} && return 0 1585 has $1 ${USE_BUILT} && return 0
1584# $4 == extra LD_LIBRARY_PATH's (make it : delimited) 1637# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1585# $5 == path for wrapper 1638# $5 == path for wrapper
1586make_wrapper() { 1639make_wrapper() {
1587 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5 1640 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1588 local tmpwrapper=$(emktemp) 1641 local tmpwrapper=$(emktemp)
1642 # We don't want to quote ${bin} so that people can pass complex
1643 # things as $bin ... "./someprog --args"
1589 cat << EOF > "${tmpwrapper}" 1644 cat << EOF > "${tmpwrapper}"
1590#!/bin/sh 1645#!/bin/sh
1591cd "${chdir}" 1646cd "${chdir:-.}"
1647if [ -n "${libdir}" ] ; then
1648 if [ "\${LD_LIBRARY_PATH+set}" = "set" ] ; then
1592export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}" 1649 export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1650 else
1651 export LD_LIBRARY_PATH="${libdir}"
1652 fi
1653fi
1593exec ${bin} "\$@" 1654exec ${bin} "\$@"
1594EOF 1655EOF
1595 chmod go+rx "${tmpwrapper}" 1656 chmod go+rx "${tmpwrapper}"
1596 if [ -n "${5}" ] 1657 if [[ -n ${path} ]] ; then
1597 then
1598 exeinto ${5} 1658 exeinto "${path}"
1599 newexe "${tmpwrapper}" "${wrapper}" 1659 newexe "${tmpwrapper}" "${wrapper}"
1600 else 1660 else
1601 newbin "${tmpwrapper}" "${wrapper}" 1661 newbin "${tmpwrapper}" "${wrapper}"
1602 fi 1662 fi
1603} 1663}

Legend:
Removed from v.1.193  
changed lines
  Added in v.1.237

  ViewVC Help
Powered by ViewVC 1.1.20