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

Diff of /eclass/eutils.eclass

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

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

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

  ViewVC Help
Powered by ViewVC 1.1.20