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

Diff of /eclass/eutils.eclass

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

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

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

  ViewVC Help
Powered by ViewVC 1.1.20