/[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.240
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.240 2006/06/09 15:36:40 wolf31o2 Exp $
4#
5# Author: Martin Schlemmer <azarah@gentoo.org>
6# 4#
7# This eclass is for general purpose functions that most ebuilds 5# This eclass is for general purpose functions that most ebuilds
8# have to implement themselves. 6# have to implement themselves.
9# 7#
10# NB: If you add anything, please comment it! 8# NB: If you add anything, please comment it!
11 9
12inherit multilib 10inherit multilib portability
13
14DEPEND="!bootstrap? ( sys-devel/patch )"
15# sys-apps/shadow is needed for useradd, etc, bug #94745.
16 11
17DESCRIPTION="Based on the ${ECLASS} eclass" 12DESCRIPTION="Based on the ${ECLASS} eclass"
18 13
19# Wait for the supplied number of seconds. If no argument is supplied, defaults 14# 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 15# to five seconds. If the EPAUSE_IGNORE env var is set, don't wait. If we're not
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"
176 local x="" 147 local x=""
148
149 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402
177 150
178 if [ "$#" -gt 1 ] 151 if [ "$#" -gt 1 ]
179 then 152 then
180 local m="" 153 local m=""
181 for m in "$@" ; do 154 for m in "$@" ; do
282 255
283 # Allow for prefix to differ ... im lazy, so shoot me :/ 256 # Allow for prefix to differ ... im lazy, so shoot me :/
284 while [ "${count}" -lt 5 ] 257 while [ "${count}" -lt 5 ]
285 do 258 do
286 # Generate some useful debug info ... 259 # Generate some useful debug info ...
287 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 260 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
288 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 261 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
289 262
290 if [ "${PATCH_SUFFIX}" != "patch" ] 263 if [ "${PATCH_SUFFIX}" != "patch" ]
291 then 264 then
292 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 265 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
297 270
298 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 271 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
299 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##*/}
300 273
301 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 274 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
302 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 275 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
303 276
304 if [ "${PATCH_SUFFIX}" != "patch" ] 277 if [ "${PATCH_SUFFIX}" != "patch" ]
305 then 278 then
306 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
307 then 280 then
311 count=5 284 count=5
312 break 285 break
313 fi 286 fi
314 fi 287 fi
315 288
316 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
317 then 290 then
318 draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 291 _epatch_draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
319 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 292 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
320 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 293 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
321 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 294 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
322 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 295 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
323 296
324 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
325 299
326 if [ "$?" -ne 0 ] 300 if [ "$?" -ne 0 ]
327 then 301 then
328 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##*/}
329 echo 303 echo
375# vapier@gentoo.org 349# vapier@gentoo.org
376# 350#
377# Takes just 1 optional parameter (the directory to create tmpfile in) 351# Takes just 1 optional parameter (the directory to create tmpfile in)
378emktemp() { 352emktemp() {
379 local exe="touch" 353 local exe="touch"
380 [ "$1" == "-d" ] && exe="mkdir" && shift 354 [[ $1 == -d ]] && exe="mkdir" && shift
381 local topdir="$1" 355 local topdir=$1
382 356
383 if [ -z "${topdir}" ] 357 if [[ -z ${topdir} ]] ; then
384 then
385 [ -z "${T}" ] \ 358 [[ -z ${T} ]] \
386 && topdir="/tmp" \ 359 && topdir="/tmp" \
387 || topdir="${T}" 360 || topdir=${T}
388 fi 361 fi
389 362
390 if [ -z "$(type -p mktemp)" ] 363 if [[ -z $(type -p mktemp) ]] ; then
391 then
392 local tmp=/ 364 local tmp=/
393 while [ -e "${tmp}" ] ; do 365 while [[ -e ${tmp} ]] ; do
394 tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}" 366 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}
395 done 367 done
396 ${exe} "${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"
477 fi 469 fi
478 else 470 else
479 euid="next" 471 euid="next"
480 fi 472 fi
481 if [[ ${euid} == "next" ]] ; then 473 if [[ ${euid} == "next" ]] ; then
482 local pwrange 474 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 475 [[ -z $(egetent passwd ${euid}) ]] && break
490 done 476 done
491 fi 477 fi
492 opts="${opts} -u ${euid}" 478 opts="${opts} -u ${euid}"
493 einfo " - Userid: ${euid}" 479 einfo " - Userid: ${euid}"
494 480
495 # handle shell 481 # handle shell
496 local eshell=$1; shift 482 local eshell=$1; shift
497 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then 483 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
498 if [[ ! -e ${eshell} ]] ; then 484 if [[ ! -e ${ROOT}${eshell} ]] ; then
499 eerror "A shell was specified but it does not exist !" 485 eerror "A shell was specified but it does not exist !"
500 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"
501 fi 491 fi
502 else 492 else
503 case ${USERLAND} in 493 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do
504 Darwin) eshell="/usr/bin/false";; 494 [[ -x ${ROOT}${shell} ]] && break
505 BSD) eshell="/usr/sbin/nologin";; 495 done
506 *) eshell="/bin/false";; 496
507 esac 497 if [[ ${shell} == "/dev/null" ]] ; then
498 eerror "Unable to identify the shell to use"
499 die "Unable to identify the shell to use"
500 fi
501
502 eshell=${shell}
508 fi 503 fi
509 einfo " - Shell: ${eshell}" 504 einfo " - Shell: ${eshell}"
510 opts="${opts} -s ${eshell}" 505 opts="${opts} -s ${eshell}"
511 506
512 # handle homedir 507 # handle homedir
549 einfo " - Groups: ${egroups}" 544 einfo " - Groups: ${egroups}"
550 545
551 # handle extra and add the user 546 # handle extra and add the user
552 local oldsandbox=${SANDBOX_ON} 547 local oldsandbox=${SANDBOX_ON}
553 export SANDBOX_ON="0" 548 export SANDBOX_ON="0"
554 case ${USERLAND} in 549 case ${CHOST} in
555 Darwin) 550 *-darwin*)
556 ### Make the user 551 ### Make the user
557 if [[ -z $@ ]] ; then 552 if [[ -z $@ ]] ; then
558 dscl . create /users/${euser} uid ${euid} 553 dscl . create /users/${euser} uid ${euid}
559 dscl . create /users/${euser} shell ${eshell} 554 dscl . create /users/${euser} shell ${eshell}
560 dscl . create /users/${euser} home ${ehome} 555 dscl . create /users/${euser} home ${ehome}
571 einfo "Please report the ebuild along with the info below" 566 einfo "Please report the ebuild along with the info below"
572 einfo "eextra: $@" 567 einfo "eextra: $@"
573 die "Required function missing" 568 die "Required function missing"
574 fi 569 fi
575 ;; 570 ;;
576 BSD) 571 *-freebsd*|*-dragonfly*)
577 if [[ -z $@ ]] ; then 572 if [[ -z $@ ]] ; then
578 pw useradd ${euser} ${opts} \ 573 pw useradd ${euser} ${opts} \
579 -c "added by portage for ${PN}" \ 574 -c "added by portage for ${PN}" \
580 die "enewuser failed" 575 die "enewuser failed"
581 else 576 else
582 einfo " - Extra: $@" 577 einfo " - Extra: $@"
583 pw useradd ${euser} ${opts} \ 578 pw useradd ${euser} ${opts} \
584 "$@" || die "enewuser failed" 579 "$@" || die "enewuser failed"
585 fi 580 fi
586 ;; 581 ;;
582
583 *-netbsd*)
584 if [[ -z $@ ]] ; then
585 useradd ${opts} ${euser} || die "enewuser failed"
586 else
587 einfo " - Extra: $@"
588 useradd ${opts} ${euser} "$@" || die "enewuser failed"
589 fi
590 ;;
591
592 *-openbsd*)
593 if [[ -z $@ ]] ; then
594 useradd -u ${euid} -s ${eshell} \
595 -d ${ehome} -c "Added by portage for ${PN}" \
596 -g ${egroups} ${euser} || die "enewuser failed"
597 else
598 einfo " - Extra: $@"
599 useradd -u ${euid} -s ${eshell} \
600 -d ${ehome} -c "Added by portage for ${PN}" \
601 -g ${egroups} ${euser} "$@" || die "enewuser failed"
602 fi
603 ;;
604
587 *) 605 *)
588 if [[ -z $@ ]] ; then 606 if [[ -z $@ ]] ; then
589 useradd ${opts} ${euser} \ 607 useradd ${opts} ${euser} \
590 -c "added by portage for ${PN}" \ 608 -c "added by portage for ${PN}" \
591 || die "enewuser failed" 609 || die "enewuser failed"
615# Default values if you do not specify any: 633# Default values if you do not specify any:
616# groupname: REQUIRED ! 634# groupname: REQUIRED !
617# gid: next available (see groupadd(8)) 635# gid: next available (see groupadd(8))
618# extra: none 636# extra: none
619enewgroup() { 637enewgroup() {
638 case ${EBUILD_PHASE} in
639 unpack|compile|test|install)
640 eerror "'enewgroup()' called from '${EBUILD_PHASE}()' which is not a pkg_* function."
641 eerror "Package fails at QA and at life. Please file a bug."
642 die "Bad package! enewgroup is only for use in pkg_* functions!"
643 esac
644
620 # get the group 645 # get the group
621 local egroup="$1"; shift 646 local egroup="$1"; shift
622 if [ -z "${egroup}" ] 647 if [ -z "${egroup}" ]
623 then 648 then
624 eerror "No group specified !" 649 eerror "No group specified !"
641 then 666 then
642 if [ "${egid}" -gt 0 ] 667 if [ "${egid}" -gt 0 ]
643 then 668 then
644 if [ -z "`egetent group ${egid}`" ] 669 if [ -z "`egetent group ${egid}`" ]
645 then 670 then
646 if [[ "${USERLAND}" == "Darwin" ]]; then 671 if [[ "${CHOST}" == *-darwin* ]]; then
647 opts="${opts} ${egid}" 672 opts="${opts} ${egid}"
648 else 673 else
649 opts="${opts} -g ${egid}" 674 opts="${opts} -g ${egid}"
650 fi 675 fi
651 else 676 else
665 opts="${opts} ${eextra}" 690 opts="${opts} ${eextra}"
666 691
667 # add the group 692 # add the group
668 local oldsandbox="${SANDBOX_ON}" 693 local oldsandbox="${SANDBOX_ON}"
669 export SANDBOX_ON="0" 694 export SANDBOX_ON="0"
670 if [[ "${USERLAND}" == "Darwin" ]]; then 695 case ${CHOST} in
696 *-darwin*)
671 if [ ! -z "${eextra}" ]; 697 if [ ! -z "${eextra}" ];
672 then 698 then
673 einfo "Extra options are not supported on Darwin/OS X yet" 699 einfo "Extra options are not supported on Darwin/OS X yet"
674 einfo "Please report the ebuild along with the info below" 700 einfo "Please report the ebuild along with the info below"
675 einfo "eextra: ${eextra}" 701 einfo "eextra: ${eextra}"
676 die "Required function missing" 702 die "Required function missing"
677 fi 703 fi
678 704
679 # If we need the next available 705 # If we need the next available
680 case ${egid} in 706 case ${egid} in
681 *[!0-9]*) # Non numeric 707 *[!0-9]*) # Non numeric
682 for egid in `jot 898 101`; do 708 for egid in $(seq 101 999); do
683 [ -z "`egetent group ${egid}`" ] && break 709 [ -z "`egetent group ${egid}`" ] && break
684 done 710 done
685 esac 711 esac
686 dscl . create /groups/${egroup} gid ${egid} 712 dscl . create /groups/${egroup} gid ${egid}
687 dscl . create /groups/${egroup} passwd '*' 713 dscl . create /groups/${egroup} passwd '*'
688 elif [[ "${USERLAND}" == "BSD" ]] ; then 714 ;;
715
716 *-freebsd*|*-dragonfly*)
689 case ${egid} in 717 case ${egid} in
690 *[!0-9]*) # Non numeric 718 *[!0-9]*) # Non numeric
691 for egid in `jot 898 101`; do 719 for egid in $(seq 101 999); do
692 [ -z "`egetent group ${egid}`" ] && break 720 [ -z "`egetent group ${egid}`" ] && break
693 done 721 done
694 esac 722 esac
695 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 723 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
696 else 724 ;;
725
726 *-netbsd*)
727 case ${egid} in
728 *[!0-9]*) # Non numeric
729 for egid in $(seq 101 999); do
730 [ -z "`egetent group ${egid}`" ] && break
731 done
732 esac
733 groupadd -g ${egid} ${egroup} || die "enewgroup failed"
734 ;;
735
736 *)
697 groupadd ${opts} ${egroup} || die "enewgroup failed" 737 groupadd ${opts} ${egroup} || die "enewgroup failed"
698 fi 738 ;;
739 esac
699 export SANDBOX_ON="${oldsandbox}" 740 export SANDBOX_ON="${oldsandbox}"
700} 741}
701 742
702# Simple script to replace 'dos2unix' binaries 743# Simple script to replace 'dos2unix' binaries
703# vapier@gentoo.org 744# vapier@gentoo.org
720 761
721# Make a desktop file ! 762# Make a desktop file !
722# Great for making those icons in kde/gnome startmenu ! 763# Great for making those icons in kde/gnome startmenu !
723# Amaze your friends ! Get the women ! Join today ! 764# Amaze your friends ! Get the women ! Join today !
724# 765#
725# make_desktop_entry(<binary>, [name], [icon], [type], [path]) 766# make_desktop_entry(<command>, [name], [icon], [type], [path])
726# 767#
727# binary: what binary does the app run with ? 768# binary: what command does the app run with ?
728# name: the name that will show up in the menu 769# name: the name that will show up in the menu
729# icon: give your little like a pretty little icon ... 770# icon: give your little like a pretty little icon ...
730# this can be relative (to /usr/share/pixmaps) or 771# this can be relative (to /usr/share/pixmaps) or
731# a full path to an icon 772# a full path to an icon
732# type: what kind of application is this ? for categories: 773# type: what kind of application is this ? for categories:
814 type="Network;${type}" 855 type="Network;${type}"
815 ;; 856 ;;
816 857
817 sci) 858 sci)
818 case ${catmin} in 859 case ${catmin} in
819 astro*) type=Astronomoy;; 860 astro*) type=Astronomy;;
820 bio*) type=Biology;; 861 bio*) type=Biology;;
821 calc*) type=Calculator;; 862 calc*) type=Calculator;;
822 chem*) type=Chemistry;; 863 chem*) type=Chemistry;;
823 geo*) type=Geology;; 864 geo*) type=Geology;;
824 math*) type=Math;; 865 math*) type=Math;;
844 local desktop_name="${PN}" 885 local desktop_name="${PN}"
845 else 886 else
846 local desktop_name="${PN}-${SLOT}" 887 local desktop_name="${PN}-${SLOT}"
847 fi 888 fi
848 local desktop=${T}/${exec%% *}-${desktop_name}.desktop 889 local desktop=${T}/${exec%% *}-${desktop_name}.desktop
890# local desktop=${T}/${exec%% *:-${desktop_name}}.desktop
849 891
850echo "[Desktop Entry] 892echo "[Desktop Entry]
851Encoding=UTF-8 893Encoding=UTF-8
852Version=0.9.2 894Version=0.9.2
853Name=${name} 895Name=${name}
854Type=Application 896Type=Application
855Comment=${DESCRIPTION} 897Comment=${DESCRIPTION}
856Exec=${exec} 898Exec=${exec}
899TryExec=${exec%% *}
857Path=${path} 900Path=${path}
858Icon=${icon} 901Icon=${icon}
859Categories=Application;${type};" > "${desktop}" 902Categories=Application;${type};" > "${desktop}"
860 903
904 (
905 # wrap the env here so that the 'insinto' call
906 # doesn't corrupt the env of the caller
861 insinto /usr/share/applications 907 insinto /usr/share/applications
862 doins "${desktop}" 908 doins "${desktop}"
863 909 )
864 return 0
865} 910}
866 911
867# Make a GDM/KDM Session file 912# Make a GDM/KDM Session file
868# 913#
869# make_desktop_entry(<title>, <command>) 914# make_desktop_entry(<title>, <command>)
931############################################################## 976##############################################################
932 977
933 978
934# for internal use only (unpack_pdv and unpack_makeself) 979# for internal use only (unpack_pdv and unpack_makeself)
935find_unpackable_file() { 980find_unpackable_file() {
936 local src="$1" 981 local src=$1
937 if [ -z "${src}" ] 982 if [[ -z ${src} ]] ; then
938 then
939 src="${DISTDIR}/${A}" 983 src=${DISTDIR}/${A}
940 else 984 else
941 if [ -e "${DISTDIR}/${src}" ] 985 if [[ -e ${DISTDIR}/${src} ]] ; then
942 then
943 src="${DISTDIR}/${src}" 986 src=${DISTDIR}/${src}
944 elif [ -e "${PWD}/${src}" ] 987 elif [[ -e ${PWD}/${src} ]] ; then
945 then
946 src="${PWD}/${src}" 988 src=${PWD}/${src}
947 elif [ -e "${src}" ] 989 elif [[ -e ${src} ]] ; then
948 then
949 src="${src}" 990 src=${src}
950 fi
951 fi 991 fi
952 [ ! -e "${src}" ] && die "Could not find requested archive ${src}" 992 fi
993 [[ ! -e ${src} ]] && return 1
953 echo "${src}" 994 echo "${src}"
954} 995}
955 996
956# Unpack those pesky pdv generated files ... 997# Unpack those pesky pdv generated files ...
957# They're self-unpacking programs with the binary package stuffed in 998# They're self-unpacking programs with the binary package stuffed in
972# lseek 1013# lseek
973# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 1014# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
974# lseek(3, -4, SEEK_END) = 2981250 1015# lseek(3, -4, SEEK_END) = 2981250
975# thus we would pass in the value of '4' as the second parameter. 1016# thus we would pass in the value of '4' as the second parameter.
976unpack_pdv() { 1017unpack_pdv() {
977 local src="`find_unpackable_file $1`" 1018 local src=$(find_unpackable_file $1)
978 local sizeoff_t="$2" 1019 local sizeoff_t=$2
979 1020
1021 [[ -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 :(" 1022 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :("
981 1023
982 local shrtsrc="`basename ${src}`" 1024 local shrtsrc=$(basename "${src}")
983 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1025 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
984 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1026 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\"` 1027 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"`
986 1028
987 # grab metadata for debug reasons 1029 # grab metadata for debug reasons
1051# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1093# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1052# - If the file is not specified then unpack will utilize ${A}. 1094# - If the file is not specified then unpack will utilize ${A}.
1053# - 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
1054# the proper offset from the script itself. 1096# the proper offset from the script itself.
1055unpack_makeself() { 1097unpack_makeself() {
1098 local src_input=${1:-${A}}
1056 local src="$(find_unpackable_file "$1")" 1099 local src=$(find_unpackable_file "${src_input}")
1057 local skip="$2" 1100 local skip=$2
1058 local exe="$3" 1101 local exe=$3
1059 1102
1103 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
1104
1060 local shrtsrc="$(basename "${src}")" 1105 local shrtsrc=$(basename "${src}")
1061 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1106 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1062 if [ -z "${skip}" ] 1107 if [[ -z ${skip} ]] ; then
1063 then
1064 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1108 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}')
1065 local skip=0 1109 local skip=0
1066 exe=tail 1110 exe=tail
1067 case ${ver} in 1111 case ${ver} in
1068 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
1069 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1113 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1070 ;; 1114 ;;
1071 2.0|2.0.1) 1115 2.0|2.0.1)
1072 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-) 1116 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-)
1073 ;; 1117 ;;
1081 ;; 1125 ;;
1082 2.1.3) 1126 2.1.3)
1083 skip=`grep -a ^offset= "${src}" | awk '{print $3}'` 1127 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1084 let skip="skip + 1" 1128 let skip="skip + 1"
1085 ;; 1129 ;;
1086 2.1.4) 1130 2.1.4|2.1.5)
1087 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)
1088 skip=$(head -n ${skip} "${src}" | wc -c) 1132 skip=$(head -n ${skip} "${src}" | wc -c)
1089 exe="dd" 1133 exe="dd"
1090 ;; 1134 ;;
1091 *) 1135 *)
1136check_license() { 1180check_license() {
1137 local lic=$1 1181 local lic=$1
1138 if [ -z "${lic}" ] ; then 1182 if [ -z "${lic}" ] ; then
1139 lic="${PORTDIR}/licenses/${LICENSE}" 1183 lic="${PORTDIR}/licenses/${LICENSE}"
1140 else 1184 else
1141 if [ -e "${PORTDIR}/licenses/${src}" ] ; then 1185 if [ -e "${PORTDIR}/licenses/${lic}" ] ; then
1142 lic="${PORTDIR}/licenses/${src}" 1186 lic="${PORTDIR}/licenses/${lic}"
1143 elif [ -e "${PWD}/${src}" ] ; then 1187 elif [ -e "${PWD}/${lic}" ] ; then
1144 lic="${PWD}/${src}" 1188 lic="${PWD}/${lic}"
1145 elif [ -e "${src}" ] ; then 1189 elif [ -e "${lic}" ] ; then
1146 lic="${src}" 1190 lic="${lic}"
1147 fi
1148 fi 1191 fi
1192 fi
1149 [ ! -f "${lic}" ] && die "Could not find requested license ${src}" 1193 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1150 local l="`basename ${lic}`" 1194 local l="`basename ${lic}`"
1151 1195
1152 # here is where we check for the licenses the user already 1196 # 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 1197 # accepted ... if we don't find a match, we make the user accept
1154 local shopts=$- 1198 local shopts=$-
1210 # first we figure out how many cds we're dealing with by 1254 # first we figure out how many cds we're dealing with by
1211 # the # of files they gave us 1255 # the # of files they gave us
1212 local cdcnt=0 1256 local cdcnt=0
1213 local f= 1257 local f=
1214 for f in "$@" ; do 1258 for f in "$@" ; do
1215 cdcnt=$((cdcnt + 1)) 1259 ((++cdcnt))
1216 export CDROM_CHECK_${cdcnt}="$f" 1260 export CDROM_CHECK_${cdcnt}="$f"
1217 done 1261 done
1218 export CDROM_TOTAL_CDS=${cdcnt} 1262 export CDROM_TOTAL_CDS=${cdcnt}
1219 export CDROM_CURRENT_CD=1 1263 export CDROM_CURRENT_CD=1
1220 1264
1221 # now we see if the user gave use CD_ROOT ... 1265 # now we see if the user gave use CD_ROOT ...
1222 # if they did, let's just believe them that it's correct 1266 # 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 1267 if [[ -n ${CD_ROOT}${CD_ROOT_1} ]] ; then
1230 local var= 1268 local var=
1231 cdcnt=0 1269 cdcnt=0
1232 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1270 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1233 cdcnt=$((cdcnt + 1)) 1271 ((++cdcnt))
1234 var="CD_ROOT_${cdcnt}" 1272 var="CD_ROOT_${cdcnt}"
1273 [[ -z ${!var} ]] && var="CD_ROOT"
1235 if [[ -z ${!var} ]] ; then 1274 if [[ -z ${!var} ]] ; then
1236 eerror "You must either use just the CD_ROOT" 1275 eerror "You must either use just the CD_ROOT"
1237 eerror "or specify ALL the CD_ROOT_X variables." 1276 eerror "or specify ALL the CD_ROOT_X variables."
1238 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables." 1277 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables."
1239 die "could not locate CD_ROOT_${cdcnt}" 1278 die "could not locate CD_ROOT_${cdcnt}"
1240 fi 1279 fi
1241 export CDROM_ROOTS_${cdcnt}="${!var}"
1242 done 1280 done
1243 export CDROM_ROOT=${CDROM_ROOTS_1} 1281 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}}
1244 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1282 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1283 export CDROM_SET=-1
1284 for f in ${CDROM_CHECK_1//:/ } ; do
1285 ((++CDROM_SET))
1286 [[ -e ${CD_ROOT}/${f} ]] && break
1287 done
1288 export CDROM_MATCH=${f}
1245 return 1289 return
1246 fi 1290 fi
1247 1291
1292 # User didn't help us out so lets make sure they know they can
1293 # simplify the whole process ...
1248 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1294 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1249 einfon "This ebuild will need the " 1295 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 1296 echo
1256 einfo "If you do not have the CD, but have the data files" 1297 einfo "If you do not have the CD, but have the data files"
1257 einfo "mounted somewhere on your filesystem, just export" 1298 einfo "mounted somewhere on your filesystem, just export"
1258 einfo "the variable CD_ROOT so that it points to the" 1299 einfo "the variable CD_ROOT so that it points to the"
1259 einfo "directory containing the files." 1300 einfo "directory containing the files."
1263 echo 1304 echo
1264 else 1305 else
1265 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1306 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1266 cdcnt=0 1307 cdcnt=0
1267 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1308 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1268 cdcnt=$((cdcnt + 1)) 1309 ((++cdcnt))
1269 var="CDROM_NAME_${cdcnt}" 1310 var="CDROM_NAME_${cdcnt}"
1270 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}" 1311 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}"
1271 done 1312 done
1272 echo 1313 echo
1273 einfo "If you do not have the CDs, but have the data files" 1314 einfo "If you do not have the CDs, but have the data files"
1274 einfo "mounted somewhere on your filesystem, just export" 1315 einfo "mounted somewhere on your filesystem, just export"
1275 einfo "the following variables so they point to the right place:" 1316 einfo "the following variables so they point to the right place:"
1276 einfon "" 1317 einfon ""
1277 cdcnt=0 1318 cdcnt=0
1278 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1319 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1279 cdcnt=$((cdcnt + 1)) 1320 ((++cdcnt))
1280 echo -n " CD_ROOT_${cdcnt}" 1321 echo -n " CD_ROOT_${cdcnt}"
1281 done 1322 done
1282 echo 1323 echo
1283 einfo "Or, if you have all the files in the same place, or" 1324 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" 1325 einfo "you only have one cdrom, you can export CD_ROOT"
1287 echo 1328 echo
1288 einfo "For example:" 1329 einfo "For example:"
1289 einfo "export CD_ROOT_1=/mnt/cdrom" 1330 einfo "export CD_ROOT_1=/mnt/cdrom"
1290 echo 1331 echo
1291 fi 1332 fi
1333
1334 export CDROM_SET=""
1292 export CDROM_CURRENT_CD=0 1335 export CDROM_CURRENT_CD=0
1293 cdrom_load_next_cd 1336 cdrom_load_next_cd
1294} 1337}
1295 1338
1296# this is only used when you need access to more than one cd. 1339# 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. 1340# 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. 1341# 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. 1342# remember, you can only go forward in the cd chain, you can't go back.
1300cdrom_load_next_cd() { 1343cdrom_load_next_cd() {
1301 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1302 local var= 1344 local var
1303 1345 ((++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 1346
1309 unset CDROM_ROOT 1347 unset CDROM_ROOT
1310 var=CDROM_ROOTS_${CDROM_CURRENT_CD} 1348 var=CD_ROOT_${CDROM_CURRENT_CD}
1349 [[ -z ${!var} ]] && var="CD_ROOT"
1311 if [[ -z ${!var} ]] ; then 1350 if [[ -z ${!var} ]] ; then
1312 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1351 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1313 cdrom_locate_file_on_cd ${!var} 1352 _cdrom_locate_file_on_cd ${!var}
1314 else 1353 else
1315 export CDROM_ROOT=${!var} 1354 export CDROM_ROOT=${!var}
1316 fi 1355 fi
1317 1356
1318 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1357 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 1362# 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 1363# found, then a message asking for the user to insert the cdrom will be
1325# displayed and we'll hang out here until: 1364# displayed and we'll hang out here until:
1326# (1) the file is found on a mounted cdrom 1365# (1) the file is found on a mounted cdrom
1327# (2) the user hits CTRL+C 1366# (2) the user hits CTRL+C
1328cdrom_locate_file_on_cd() { 1367_cdrom_locate_file_on_cd() {
1368 local mline=""
1369 local showedmsg=0
1370
1329 while [[ -z ${CDROM_ROOT} ]] ; do 1371 while [[ -z ${CDROM_ROOT} ]] ; do
1330 local dir=$(dirname "$*") 1372 local i=0
1373 local -a cdset=(${*//:/ })
1374 if [[ -n ${CDROM_SET} ]] ; then
1375 cdset=(${cdset[${CDROM_SET}]})
1376 fi
1377
1378 while [[ -n ${cdset[${i}]} ]] ; do
1379 local dir=$(dirname ${cdset[${i}]})
1331 local file=$(basename "$*") 1380 local file=$(basename ${cdset[${i}]})
1332 local mline=""
1333 local showedmsg=0
1334 1381
1335 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do 1382 for mline in $(mount | gawk '/(iso|cdrom|fs=cdfss)/ {print $3}') ; do
1336 [[ -d ${mline}/${dir} ]] || continue 1383 [[ -d ${mline}/${dir} ]] || continue
1337 [[ ! -z $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] \ 1384 if [[ -n $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] ; then
1338 && export CDROM_ROOT=${mline} 1385 export CDROM_ROOT=${mline}
1386 export CDROM_SET=${i}
1387 export CDROM_MATCH=${cdset[${i}]}
1388 return
1389 fi
1390 done
1391
1392 ((++i))
1339 done 1393 done
1340 1394
1341 if [[ -z ${CDROM_ROOT} ]] ; then
1342 echo 1395 echo
1343 if [[ ${showedmsg} -eq 0 ]] ; then 1396 if [[ ${showedmsg} -eq 0 ]] ; then
1344 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1397 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1345 if [[ -z ${CDROM_NAME} ]] ; then 1398 if [[ -z ${CDROM_NAME} ]] ; then
1346 einfo "Please insert the cdrom for ${PN} now !" 1399 einfo "Please insert+mount the cdrom for ${PN} now !"
1347 else
1348 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1349 fi
1350 else 1400 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 !" 1401 einfo "Please insert+mount the ${CDROM_NAME} cdrom now !"
1356 fi
1357 fi 1402 fi
1358 showedmsg=1 1403 else
1404 if [[ -z ${CDROM_NAME_1} ]] ; then
1405 einfo "Please insert+mount cd #${CDROM_CURRENT_CD} for ${PN} now !"
1406 else
1407 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1408 einfo "Please insert+mount the ${!var} cdrom now !"
1409 fi
1359 fi 1410 fi
1411 showedmsg=1
1412 fi
1360 einfo "Press return to scan for the cd again" 1413 einfo "Press return to scan for the cd again"
1361 einfo "or hit CTRL+C to abort the emerge." 1414 einfo "or hit CTRL+C to abort the emerge."
1362 echo 1415 echo
1363 einfo "If you are having trouble with the detection" 1416 einfo "If you are having trouble with the detection"
1364 einfo "of your CD, it is possible that you do not have" 1417 einfo "of your CD, it is possible that you do not have"
1365 einfo "Joliet support enabled in your kernel. Please" 1418 einfo "Joliet support enabled in your kernel. Please"
1366 einfo "check that CONFIG_JOLIET is enabled in your kernel." 1419 einfo "check that CONFIG_JOLIET is enabled in your kernel."
1367 read 1420 read || die "something is screwed with your system"
1368 fi
1369 done 1421 done
1370} 1422}
1371 1423
1372# Make sure that LINGUAS only contains languages that 1424# Make sure that LINGUAS only contains languages that
1373# a package can support 1425# a package can support
1383# directories and uses the union of the lists. 1435# directories and uses the union of the lists.
1384strip-linguas() { 1436strip-linguas() {
1385 local ls newls 1437 local ls newls
1386 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then 1438 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1387 local op=$1; shift 1439 local op=$1; shift
1388 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1440 ls=$(find "$1" -name '*.po' -exec basename {} .po \;); shift
1389 local d f 1441 local d f
1390 for d in "$@" ; do 1442 for d in "$@" ; do
1391 if [[ ${op} == "-u" ]] ; then 1443 if [[ ${op} == "-u" ]] ; then
1392 newls=${ls} 1444 newls=${ls}
1393 else 1445 else
1394 newls="" 1446 newls=""
1395 fi 1447 fi
1396 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1448 for f in $(find "$d" -name '*.po' -exec basename {} .po \;) ; do
1397 if [[ ${op} == "-i" ]] ; then 1449 if [[ ${op} == "-i" ]] ; then
1398 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}" 1450 hasq ${f} ${ls} && newls="${newls} ${f}"
1399 else 1451 else
1400 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}" 1452 hasq ${f} ${ls} || newls="${newls} ${f}"
1401 fi 1453 fi
1402 done 1454 done
1403 ls=${newls} 1455 ls=${newls}
1404 done 1456 done
1405 ls=${ls//.po}
1406 else 1457 else
1407 ls=$@ 1458 ls="$@"
1408 fi 1459 fi
1409 1460
1410 ls=" ${ls} "
1411 newls="" 1461 newls=""
1412 for f in ${LINGUAS} ; do 1462 for f in ${LINGUAS} ; do
1413 if [[ ${ls/ ${f} /} != ${ls} ]] ; then 1463 if hasq ${f} ${ls} ; then
1414 newls="${newls} ${f}" 1464 newls="${newls} ${f}"
1415 else 1465 else
1416 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1466 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA"
1417 fi 1467 fi
1418 done 1468 done
1419 if [[ -z ${newls} ]] ; then
1420 export LINGUAS=""
1421 else
1422 export LINGUAS=${newls:1} 1469 export LINGUAS=${newls:1}
1423 fi
1424} 1470}
1425 1471
1426# moved from kernel.eclass since they are generally useful outside of 1472# moved from kernel.eclass since they are generally useful outside of
1427# kernel.eclass -iggy (20041002) 1473# kernel.eclass -iggy (20041002)
1428 1474
1457 1503
1458# Jeremy Huddleston <eradicator@gentoo.org>: 1504# Jeremy Huddleston <eradicator@gentoo.org>:
1459# preserve_old_lib /path/to/libblah.so.0 1505# preserve_old_lib /path/to/libblah.so.0
1460# preserve_old_lib_notify /path/to/libblah.so.0 1506# preserve_old_lib_notify /path/to/libblah.so.0
1461# 1507#
1462# These functions are useful when a lib in your package changes --soname. Such 1508# 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 1509# 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 1510# 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 1511# 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: 1512# solution, so instead you can add the following to your ebuilds:
1467# 1513#
1498 1544
1499 ewarn "An old version of an installed library was detected on your system." 1545 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" 1546 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," 1547 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:" 1548 ewarn "you will need to execute the following command:"
1503 ewarn " revdep-rebuild --soname ${SONAME}" 1549 ewarn " revdep-rebuild --library ${SONAME}"
1504 ewarn 1550 ewarn
1505 ewarn "After doing that, you can safely remove ${LIB}" 1551 ewarn "After doing that, you can safely remove ${LIB}"
1506 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild" 1552 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1507 fi 1553 fi
1508} 1554}
1521 [[ ${opt:0:1} = "-" ]] && shift || opt="-a" 1567 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1522 1568
1523 local PKG=$(best_version $1) 1569 local PKG=$(best_version $1)
1524 shift 1570 shift
1525 1571
1526 local USEFILE="${ROOT}/var/db/pkg/${PKG}/USE" 1572 local USEFILE=${ROOT}/var/db/pkg/${PKG}/USE
1573
1574 # if the USE file doesnt exist, assume the $PKG is either
1575 # injected or package.provided
1527 [[ ! -e ${USEFILE} ]] && return 1 1576 [[ ! -e ${USEFILE} ]] && return 0
1528 1577
1529 local USE_BUILT=$(<${USEFILE}) 1578 local USE_BUILT=$(<${USEFILE})
1530 while [[ $# -gt 0 ]] ; do 1579 while [[ $# -gt 0 ]] ; do
1531 if [[ ${opt} = "-o" ]] ; then 1580 if [[ ${opt} = "-o" ]] ; then
1532 has $1 ${USE_BUILT} && return 0 1581 has $1 ${USE_BUILT} && return 0
1584# $4 == extra LD_LIBRARY_PATH's (make it : delimited) 1633# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1585# $5 == path for wrapper 1634# $5 == path for wrapper
1586make_wrapper() { 1635make_wrapper() {
1587 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5 1636 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1588 local tmpwrapper=$(emktemp) 1637 local tmpwrapper=$(emktemp)
1638 # We don't want to quote ${bin} so that people can pass complex
1639 # things as $bin ... "./someprog --args"
1589 cat << EOF > "${tmpwrapper}" 1640 cat << EOF > "${tmpwrapper}"
1590#!/bin/sh 1641#!/bin/sh
1591cd "${chdir}" 1642cd "${chdir:-.}"
1643if [ -n "${libdir}" ] ; then
1644 if [ "\${LD_LIBRARY_PATH+set}" = "set" ] ; then
1592export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}" 1645 export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1646 else
1647 export LD_LIBRARY_PATH="${libdir}"
1648 fi
1649fi
1593exec ${bin} "\$@" 1650exec ${bin} "\$@"
1594EOF 1651EOF
1595 chmod go+rx "${tmpwrapper}" 1652 chmod go+rx "${tmpwrapper}"
1596 if [ -n "${5}" ] 1653 if [[ -n ${path} ]] ; then
1597 then
1598 exeinto ${5} 1654 exeinto "${path}"
1599 newexe "${tmpwrapper}" "${wrapper}" 1655 newexe "${tmpwrapper}" "${wrapper}"
1600 else 1656 else
1601 newbin "${tmpwrapper}" "${wrapper}" 1657 newbin "${tmpwrapper}" "${wrapper}"
1602 fi 1658 fi
1603} 1659}

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

  ViewVC Help
Powered by ViewVC 1.1.20