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

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

  ViewVC Help
Powered by ViewVC 1.1.20