/[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.245
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.245 2006/07/15 19:26:55 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!
9#
10# Maintainer: see each individual function, base-system@gentoo.org as default
11 11
12inherit multilib 12inherit multilib portability
13INHERITED="$INHERITED $ECLASS"
14
15DEPEND="!bootstrap? ( sys-devel/patch )"
16# sys-apps/shadow is needed for useradd, etc, bug #94745.
17 13
18DESCRIPTION="Based on the ${ECLASS} eclass" 14DESCRIPTION="Based on the ${ECLASS} eclass"
19 15
20# Wait for the supplied number of seconds. If no argument is supplied, defaults 16# Wait for the supplied number of seconds. If no argument is supplied, defaults
21# to five seconds. If the EPAUSE_IGNORE env var is set, don't wait. If we're not 17# to five seconds. If the EPAUSE_IGNORE env var is set, don't wait. If we're not
22# outputting to a terminal, don't wait. For compatability purposes, the argument 18# outputting to a terminal, don't wait. For compatability purposes, the argument
23# must be an integer greater than zero. 19# must be an integer greater than zero.
24# Bug 62950, Ciaran McCreesh <ciaranm@gentoo.org> (05 Sep 2004) 20# Bug 62950, Ciaran McCreesh <ciaranm@gentoo.org> (05 Sep 2004)
25epause() { 21epause() {
26 if [ -z "$EPAUSE_IGNORE" ] && [ -t 1 ] ; then 22 [[ -z ${EPAUSE_IGNORE} ]] && sleep ${1:-5}
27 sleep ${1:-5}
28 fi
29} 23}
30 24
31# Beep the specified number of times (defaults to five). If our output 25# Beep the specified number of times (defaults to five). If our output
32# is not a terminal, don't beep. If the EBEEP_IGNORE env var is set, 26# is not a terminal, don't beep. If the EBEEP_IGNORE env var is set,
33# don't beep. 27# don't beep.
34# Bug 62950, Ciaran McCreesh <ciaranm@gentoo.org> (05 Sep 2004) 28# Bug 62950, Ciaran McCreesh <ciaranm@gentoo.org> (05 Sep 2004)
35ebeep() { 29ebeep() {
36 local n 30 local n
37 if [ -z "$EBEEP_IGNORE" ] && [ -t 1 ] ; then 31 if [[ -z ${EBEEP_IGNORE} ]] ; then
38 for ((n=1 ; n <= ${1:-5} ; n++)) ; do 32 for ((n=1 ; n <= ${1:-5} ; n++)) ; do
39 echo -ne "\a" 33 echo -ne "\a"
40 sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null 34 sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
41 echo -ne "\a" 35 echo -ne "\a"
42 sleep 1 36 sleep 1
61# to point to the latest version of the library present. 55# to point to the latest version of the library present.
62# 56#
63# <azarah@gentoo.org> (26 Oct 2002) 57# <azarah@gentoo.org> (26 Oct 2002)
64# 58#
65gen_usr_ldscript() { 59gen_usr_ldscript() {
66 local libdir="$(get_libdir)" 60 local lib libdir=$(get_libdir)
67 # Just make sure it exists 61 # Just make sure it exists
68 dodir /usr/${libdir} 62 dodir /usr/${libdir}
69 63
70 for lib in "${@}" ; do 64 for lib in "${@}" ; do
71 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT 65 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT
72 /* GNU ld script 66 /* GNU ld script
73 Since Gentoo has critical dynamic libraries 67 Since Gentoo has critical dynamic libraries
74 in /lib, and the static versions in /usr/lib, 68 in /lib, and the static versions in /usr/lib,
75 we need to have a "fake" dynamic lib in /usr/lib, 69 we need to have a "fake" dynamic lib in /usr/lib,
76 otherwise we run into linking problems. 70 otherwise we run into linking problems.
77 71
78 See bug http://bugs.gentoo.org/4411 for more info. 72 See bug http://bugs.gentoo.org/4411 for more info.
79 */ 73 */
80 GROUP ( /${libdir}/${lib} ) 74 GROUP ( /${libdir}/${lib} )
81 END_LDSCRIPT 75 END_LDSCRIPT
82 fperms a+x "/usr/${libdir}/${lib}" 76 fperms a+x "/usr/${libdir}/${lib}" || die "could not change perms on ${lib}"
83 done 77 done
84} 78}
85 79
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 80
117# Default directory where patches are located 81# Default directory where patches are located
118EPATCH_SOURCE="${WORKDIR}/patch" 82EPATCH_SOURCE="${WORKDIR}/patch"
119# Default extension for patches 83# Default extension for patches
120EPATCH_SUFFIX="patch.bz2" 84EPATCH_SUFFIX="patch.bz2"
121# Default options for patch 85# Default options for patch
122# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571 86# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571
123# Set --no-backup-if-mismatch so we don't leave '.orig' files behind. 87# Set --no-backup-if-mismatch so we don't leave '.orig' files behind.
88# Set -E to automatically remove empty files.
124EPATCH_OPTS="-g0 --no-backup-if-mismatch" 89EPATCH_OPTS="-g0 -E --no-backup-if-mismatch"
125# List of patches not to apply. Not this is only file names, 90# List of patches not to apply. Not this is only file names,
126# and not the full path .. 91# and not the full path ..
127EPATCH_EXCLUDE="" 92EPATCH_EXCLUDE=""
128# Change the printed message for a single patch. 93# Change the printed message for a single patch.
129EPATCH_SINGLE_MSG="" 94EPATCH_SINGLE_MSG=""
167# hand its a directory, it will set EPATCH_SOURCE to this. 132# hand its a directory, it will set EPATCH_SOURCE to this.
168# 133#
169# <azarah@gentoo.org> (10 Nov 2002) 134# <azarah@gentoo.org> (10 Nov 2002)
170# 135#
171epatch() { 136epatch() {
137 _epatch_draw_line() {
138 [[ -z $1 ]] && set "$(printf "%65s" '')"
139 echo "${1//?/=}"
140 }
141 _epatch_assert() { local _pipestatus=${PIPESTATUS[*]}; [[ ${_pipestatus// /} -eq 0 ]] ; }
172 local PIPE_CMD="" 142 local PIPE_CMD=""
173 local STDERR_TARGET="${T}/$$.out" 143 local STDERR_TARGET="${T}/$$.out"
174 local PATCH_TARGET="${T}/$$.patch" 144 local PATCH_TARGET="${T}/$$.patch"
175 local PATCH_SUFFIX="" 145 local PATCH_SUFFIX=""
176 local SINGLE_PATCH="no" 146 local SINGLE_PATCH="no"
177 local x="" 147 local x=""
148
149 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402
178 150
179 if [ "$#" -gt 1 ] 151 if [ "$#" -gt 1 ]
180 then 152 then
181 local m="" 153 local m=""
182 for m in "$@" ; do 154 for m in "$@" ; do
283 255
284 # Allow for prefix to differ ... im lazy, so shoot me :/ 256 # Allow for prefix to differ ... im lazy, so shoot me :/
285 while [ "${count}" -lt 5 ] 257 while [ "${count}" -lt 5 ]
286 do 258 do
287 # Generate some useful debug info ... 259 # Generate some useful debug info ...
288 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 260 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
289 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 261 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
290 262
291 if [ "${PATCH_SUFFIX}" != "patch" ] 263 if [ "${PATCH_SUFFIX}" != "patch" ]
292 then 264 then
293 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 265 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
298 270
299 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 271 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
300 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 272 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
301 273
302 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 274 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
303 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 275 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
304 276
305 if [ "${PATCH_SUFFIX}" != "patch" ] 277 if [ "${PATCH_SUFFIX}" != "patch" ]
306 then 278 then
307 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1 279 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
308 then 280 then
312 count=5 284 count=5
313 break 285 break
314 fi 286 fi
315 fi 287 fi
316 288
317 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1 289 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f ; _epatch_assert) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
318 then 290 then
319 draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 291 _epatch_draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
320 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 292 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
321 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 293 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
322 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 294 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
323 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 295 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
324 296
325 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1 297 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1
298 _epatch_assert
326 299
327 if [ "$?" -ne 0 ] 300 if [ "$?" -ne 0 ]
328 then 301 then
329 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 302 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
330 echo 303 echo
376# vapier@gentoo.org 349# vapier@gentoo.org
377# 350#
378# Takes just 1 optional parameter (the directory to create tmpfile in) 351# Takes just 1 optional parameter (the directory to create tmpfile in)
379emktemp() { 352emktemp() {
380 local exe="touch" 353 local exe="touch"
381 [ "$1" == "-d" ] && exe="mkdir" && shift 354 [[ $1 == -d ]] && exe="mkdir" && shift
382 local topdir="$1" 355 local topdir=$1
383 356
384 if [ -z "${topdir}" ] 357 if [[ -z ${topdir} ]] ; then
385 then
386 [ -z "${T}" ] \ 358 [[ -z ${T} ]] \
387 && topdir="/tmp" \ 359 && topdir="/tmp" \
388 || topdir="${T}" 360 || topdir=${T}
389 fi 361 fi
390 362
391 if [ -z "$(type -p mktemp)" ] 363 if [[ -z $(type -p mktemp) ]] ; then
392 then
393 local tmp=/ 364 local tmp=/
394 while [ -e "${tmp}" ] ; do 365 while [[ -e ${tmp} ]] ; do
395 tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}" 366 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}
396 done 367 done
397 ${exe} "${tmp}" 368 ${exe} "${tmp}" || ${exe} -p "${tmp}"
398 echo "${tmp}" 369 echo "${tmp}"
399 else 370 else
400 [ "${exe}" == "touch" ] \ 371 if [[ ${exe} == "touch" ]] ; then
401 && exe="-p" \ 372 [[ ${USERLAND} == "GNU" ]] \
402 || exe="-d" 373 && mktemp -p "${topdir}" \
403 mktemp ${exe} "${topdir}" 374 || TMPDIR="${topdir}" mktemp -t tmp
375 else
376 [[ ${USERLAND} == "GNU" ]] \
377 && mktemp -d "${topdir}" \
378 || TMPDIR="${topdir}" mktemp -dt tmp
379 fi
404 fi 380 fi
405} 381}
406 382
407# Small wrapper for getent (Linux), nidump (Mac OS X), 383# Small wrapper for getent (Linux), nidump (Mac OS X),
408# and pw (FreeBSD) used in enewuser()/enewgroup() 384# and pw (FreeBSD) used in enewuser()/enewgroup()
409# Joe Jezak <josejx@gmail.com> and usata@gentoo.org 385# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
410# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org> 386# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
411# 387#
412# egetent(database, key) 388# egetent(database, key)
413egetent() { 389egetent() {
414 if [[ "${USERLAND}" == "Darwin" ]] ; then 390 case ${CHOST} in
391 *-darwin*)
415 case "$2" in 392 case "$2" in
416 *[!0-9]*) # Non numeric 393 *[!0-9]*) # Non numeric
417 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 394 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
418 ;; 395 ;;
419 *) # Numeric 396 *) # Numeric
420 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 397 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
421 ;; 398 ;;
422 esac 399 esac
423 elif [[ "${USERLAND}" == "BSD" ]] ; then 400 ;;
424 local action 401 *-freebsd*|*-dragonfly*)
425 if [ "$1" == "passwd" ] 402 local opts action="user"
426 then 403 [[ $1 == "passwd" ]] || action="group"
427 action="user" 404
428 else 405 # lookup by uid/gid
429 action="group" 406 if [[ $2 == [[:digit:]]* ]] ; then
407 [[ ${action} == "user" ]] && opts="-u" || opts="-g"
430 fi 408 fi
409
431 pw show "${action}" "$2" -q 410 pw show ${action} ${opts} "$2" -q
432 else 411 ;;
412 *-netbsd*|*-openbsd*)
413 grep "$2:\*:" /etc/$1
414 ;;
415 *)
433 which nscd >& /dev/null && nscd -i "$1" 416 type -p nscd >& /dev/null && nscd -i "$1"
434 getent "$1" "$2" 417 getent "$1" "$2"
435 fi 418 ;;
419 esac
436} 420}
437 421
438# Simplify/standardize adding users to the system 422# Simplify/standardize adding users to the system
439# vapier@gentoo.org 423# vapier@gentoo.org
440# 424#
447# shell: /bin/false 431# shell: /bin/false
448# homedir: /dev/null 432# homedir: /dev/null
449# groups: none 433# groups: none
450# extra: comment of 'added by portage for ${PN}' 434# extra: comment of 'added by portage for ${PN}'
451enewuser() { 435enewuser() {
436 case ${EBUILD_PHASE} in
437 unpack|compile|test|install)
438 eerror "'enewuser()' called from '${EBUILD_PHASE}()' which is not a pkg_* function."
439 eerror "Package fails at QA and at life. Please file a bug."
440 die "Bad package! enewuser is only for use in pkg_* functions!"
441 esac
442
452 # get the username 443 # get the username
453 local euser=$1; shift 444 local euser=$1; shift
454 if [[ -z ${euser} ]] ; then 445 if [[ -z ${euser} ]] ; then
455 eerror "No username specified !" 446 eerror "No username specified !"
456 die "Cannot call enewuser without a username" 447 die "Cannot call enewuser without a username"
478 fi 469 fi
479 else 470 else
480 euid="next" 471 euid="next"
481 fi 472 fi
482 if [[ ${euid} == "next" ]] ; then 473 if [[ ${euid} == "next" ]] ; then
483 local pwrange 474 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 475 [[ -z $(egetent passwd ${euid}) ]] && break
491 done 476 done
492 fi 477 fi
493 opts="${opts} -u ${euid}" 478 opts="${opts} -u ${euid}"
494 einfo " - Userid: ${euid}" 479 einfo " - Userid: ${euid}"
495 480
496 # handle shell 481 # handle shell
497 local eshell=$1; shift 482 local eshell=$1; shift
498 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then 483 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
499 if [[ ! -e ${eshell} ]] ; then 484 if [[ ! -e ${ROOT}${eshell} ]] ; then
500 eerror "A shell was specified but it does not exist !" 485 eerror "A shell was specified but it does not exist !"
501 die "${eshell} does not exist" 486 die "${eshell} does not exist in ${ROOT}"
487 fi
488 if [[ ${eshell} == */false || ${eshell} == */nologin ]] ; then
489 eerror "Do not specify ${eshell} yourself, use -1"
490 die "Pass '-1' as the shell parameter"
502 fi 491 fi
503 else 492 else
504 case ${USERLAND} in 493 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do
505 Darwin) eshell="/usr/bin/false";; 494 [[ -x ${ROOT}${shell} ]] && break
506 BSD) eshell="/usr/sbin/nologin";; 495 done
507 *) eshell="/bin/false";; 496
508 esac 497 if [[ ${shell} == "/dev/null" ]] ; then
498 eerror "Unable to identify the shell to use"
499 die "Unable to identify the shell to use"
500 fi
501
502 eshell=${shell}
509 fi 503 fi
510 einfo " - Shell: ${eshell}" 504 einfo " - Shell: ${eshell}"
511 opts="${opts} -s ${eshell}" 505 opts="${opts} -s ${eshell}"
512 506
513 # handle homedir 507 # handle homedir
550 einfo " - Groups: ${egroups}" 544 einfo " - Groups: ${egroups}"
551 545
552 # handle extra and add the user 546 # handle extra and add the user
553 local oldsandbox=${SANDBOX_ON} 547 local oldsandbox=${SANDBOX_ON}
554 export SANDBOX_ON="0" 548 export SANDBOX_ON="0"
555 case ${USERLAND} in 549 case ${CHOST} in
556 Darwin) 550 *-darwin*)
557 ### Make the user 551 ### Make the user
558 if [[ -z $@ ]] ; then 552 if [[ -z $@ ]] ; then
559 dscl . create /users/${euser} uid ${euid} 553 dscl . create /users/${euser} uid ${euid}
560 dscl . create /users/${euser} shell ${eshell} 554 dscl . create /users/${euser} shell ${eshell}
561 dscl . create /users/${euser} home ${ehome} 555 dscl . create /users/${euser} home ${ehome}
572 einfo "Please report the ebuild along with the info below" 566 einfo "Please report the ebuild along with the info below"
573 einfo "eextra: $@" 567 einfo "eextra: $@"
574 die "Required function missing" 568 die "Required function missing"
575 fi 569 fi
576 ;; 570 ;;
577 BSD) 571 *-freebsd*|*-dragonfly*)
578 if [[ -z $@ ]] ; then 572 if [[ -z $@ ]] ; then
579 pw useradd ${euser} ${opts} \ 573 pw useradd ${euser} ${opts} \
580 -c "added by portage for ${PN}" \ 574 -c "added by portage for ${PN}" \
581 die "enewuser failed" 575 die "enewuser failed"
582 else 576 else
583 einfo " - Extra: $@" 577 einfo " - Extra: $@"
584 pw useradd ${euser} ${opts} \ 578 pw useradd ${euser} ${opts} \
585 "$@" || die "enewuser failed" 579 "$@" || die "enewuser failed"
586 fi 580 fi
587 ;; 581 ;;
582
583 *-netbsd*)
584 if [[ -z $@ ]] ; then
585 useradd ${opts} ${euser} || die "enewuser failed"
586 else
587 einfo " - Extra: $@"
588 useradd ${opts} ${euser} "$@" || die "enewuser failed"
589 fi
590 ;;
591
592 *-openbsd*)
593 if [[ -z $@ ]] ; then
594 useradd -u ${euid} -s ${eshell} \
595 -d ${ehome} -c "Added by portage for ${PN}" \
596 -g ${egroups} ${euser} || die "enewuser failed"
597 else
598 einfo " - Extra: $@"
599 useradd -u ${euid} -s ${eshell} \
600 -d ${ehome} -c "Added by portage for ${PN}" \
601 -g ${egroups} ${euser} "$@" || die "enewuser failed"
602 fi
603 ;;
604
588 *) 605 *)
589 if [[ -z $@ ]] ; then 606 if [[ -z $@ ]] ; then
590 useradd ${opts} ${euser} \ 607 useradd ${opts} ${euser} \
591 -c "added by portage for ${PN}" \ 608 -c "added by portage for ${PN}" \
592 || die "enewuser failed" 609 || die "enewuser failed"
595 useradd ${opts} ${euser} "$@" \ 612 useradd ${opts} ${euser} "$@" \
596 || die "enewuser failed" 613 || die "enewuser failed"
597 fi 614 fi
598 ;; 615 ;;
599 esac 616 esac
617
618 if [[ ! -e ${ROOT}/${ehome} ]] ; then
619 einfo " - Creating ${ehome} in ${ROOT}"
620 mkdir -p "${ROOT}/${ehome}"
621 chown ${euser} "${ROOT}/${ehome}"
622 chmod 755 "${ROOT}/${ehome}"
623 fi
624
600 export SANDBOX_ON=${oldsandbox} 625 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} 626}
610 627
611# Simplify/standardize adding groups to the system 628# Simplify/standardize adding groups to the system
612# vapier@gentoo.org 629# vapier@gentoo.org
613# 630#
616# Default values if you do not specify any: 633# Default values if you do not specify any:
617# groupname: REQUIRED ! 634# groupname: REQUIRED !
618# gid: next available (see groupadd(8)) 635# gid: next available (see groupadd(8))
619# extra: none 636# extra: none
620enewgroup() { 637enewgroup() {
638 case ${EBUILD_PHASE} in
639 unpack|compile|test|install)
640 eerror "'enewgroup()' called from '${EBUILD_PHASE}()' which is not a pkg_* function."
641 eerror "Package fails at QA and at life. Please file a bug."
642 die "Bad package! enewgroup is only for use in pkg_* functions!"
643 esac
644
621 # get the group 645 # get the group
622 local egroup="$1"; shift 646 local egroup="$1"; shift
623 if [ -z "${egroup}" ] 647 if [ -z "${egroup}" ]
624 then 648 then
625 eerror "No group specified !" 649 eerror "No group specified !"
642 then 666 then
643 if [ "${egid}" -gt 0 ] 667 if [ "${egid}" -gt 0 ]
644 then 668 then
645 if [ -z "`egetent group ${egid}`" ] 669 if [ -z "`egetent group ${egid}`" ]
646 then 670 then
647 if [[ "${USERLAND}" == "Darwin" ]]; then 671 if [[ "${CHOST}" == *-darwin* ]]; then
648 opts="${opts} ${egid}" 672 opts="${opts} ${egid}"
649 else 673 else
650 opts="${opts} -g ${egid}" 674 opts="${opts} -g ${egid}"
651 fi 675 fi
652 else 676 else
666 opts="${opts} ${eextra}" 690 opts="${opts} ${eextra}"
667 691
668 # add the group 692 # add the group
669 local oldsandbox="${SANDBOX_ON}" 693 local oldsandbox="${SANDBOX_ON}"
670 export SANDBOX_ON="0" 694 export SANDBOX_ON="0"
671 if [[ "${USERLAND}" == "Darwin" ]]; then 695 case ${CHOST} in
696 *-darwin*)
672 if [ ! -z "${eextra}" ]; 697 if [ ! -z "${eextra}" ];
673 then 698 then
674 einfo "Extra options are not supported on Darwin/OS X yet" 699 einfo "Extra options are not supported on Darwin/OS X yet"
675 einfo "Please report the ebuild along with the info below" 700 einfo "Please report the ebuild along with the info below"
676 einfo "eextra: ${eextra}" 701 einfo "eextra: ${eextra}"
677 die "Required function missing" 702 die "Required function missing"
678 fi 703 fi
679 704
680 # If we need the next available 705 # If we need the next available
681 case ${egid} in 706 case ${egid} in
682 *[!0-9]*) # Non numeric 707 *[!0-9]*) # Non numeric
683 for egid in `jot 898 101`; do 708 for egid in $(seq 101 999); do
684 [ -z "`egetent group ${egid}`" ] && break 709 [ -z "`egetent group ${egid}`" ] && break
685 done 710 done
686 esac 711 esac
687 dscl . create /groups/${egroup} gid ${egid} 712 dscl . create /groups/${egroup} gid ${egid}
688 dscl . create /groups/${egroup} passwd '*' 713 dscl . create /groups/${egroup} passwd '*'
689 elif [[ "${USERLAND}" == "BSD" ]] ; then 714 ;;
715
716 *-freebsd*|*-dragonfly*)
690 case ${egid} in 717 case ${egid} in
691 *[!0-9]*) # Non numeric 718 *[!0-9]*) # Non numeric
692 for egid in `jot 898 101`; do 719 for egid in $(seq 101 999); do
693 [ -z "`egetent group ${egid}`" ] && break 720 [ -z "`egetent group ${egid}`" ] && break
694 done 721 done
695 esac 722 esac
696 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 723 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
697 else 724 ;;
725
726 *-netbsd*)
727 case ${egid} in
728 *[!0-9]*) # Non numeric
729 for egid in $(seq 101 999); do
730 [ -z "`egetent group ${egid}`" ] && break
731 done
732 esac
733 groupadd -g ${egid} ${egroup} || die "enewgroup failed"
734 ;;
735
736 *)
698 groupadd ${opts} ${egroup} || die "enewgroup failed" 737 groupadd ${opts} ${egroup} || die "enewgroup failed"
699 fi 738 ;;
739 esac
700 export SANDBOX_ON="${oldsandbox}" 740 export SANDBOX_ON="${oldsandbox}"
701} 741}
702 742
703# Simple script to replace 'dos2unix' binaries 743# Simple script to replace 'dos2unix' binaries
704# vapier@gentoo.org 744# vapier@gentoo.org
721 761
722# Make a desktop file ! 762# Make a desktop file !
723# Great for making those icons in kde/gnome startmenu ! 763# Great for making those icons in kde/gnome startmenu !
724# Amaze your friends ! Get the women ! Join today ! 764# Amaze your friends ! Get the women ! Join today !
725# 765#
726# make_desktop_entry(<binary>, [name], [icon], [type], [path]) 766# make_desktop_entry(<command>, [name], [icon], [type], [path])
727# 767#
728# binary: what binary does the app run with ? 768# binary: what command does the app run with ?
729# name: the name that will show up in the menu 769# name: the name that will show up in the menu
730# icon: give your little like a pretty little icon ... 770# icon: give your little like a pretty little icon ...
731# this can be relative (to /usr/share/pixmaps) or 771# this can be relative (to /usr/share/pixmaps) or
732# a full path to an icon 772# a full path to an icon
733# type: what kind of application is this ? for categories: 773# type: what kind of application is this ? for categories:
734# http://www.freedesktop.org/wiki/Standards_2fmenu_2dspec 774# http://www.freedesktop.org/Standards/desktop-entry-spec
735# path: if your app needs to startup in a specific dir 775# path: if your app needs to startup in a specific dir
736make_desktop_entry() { 776make_desktop_entry() {
737 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1 777 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1
738 778
739 local exec=${1} 779 local exec=${1}
765 dev) 805 dev)
766 type="Development" 806 type="Development"
767 ;; 807 ;;
768 808
769 games) 809 games)
770 [[ -z ${path} ]] && path=${GAMES_BINDIR}
771
772 case ${catmin} in 810 case ${catmin} in
773 action) type=ActionGame;; 811 action) type=ActionGame;;
774 arcade) type=ArcadeGame;; 812 arcade) type=ArcadeGame;;
775 board) type=BoardGame;; 813 board) type=BoardGame;;
776 kid) type=KidsGame;; 814 kid) type=KidsGame;;
817 type="Network;${type}" 855 type="Network;${type}"
818 ;; 856 ;;
819 857
820 sci) 858 sci)
821 case ${catmin} in 859 case ${catmin} in
822 astro*) type=Astronomoy;; 860 astro*) type=Astronomy;;
823 bio*) type=Biology;; 861 bio*) type=Biology;;
824 calc*) type=Calculator;; 862 calc*) type=Calculator;;
825 chem*) type=Chemistry;; 863 chem*) type=Chemistry;;
826 geo*) type=Geology;; 864 geo*) type=Geology;;
827 math*) type=Math;; 865 math*) type=Math;;
847 local desktop_name="${PN}" 885 local desktop_name="${PN}"
848 else 886 else
849 local desktop_name="${PN}-${SLOT}" 887 local desktop_name="${PN}-${SLOT}"
850 fi 888 fi
851 local desktop=${T}/${exec%% *}-${desktop_name}.desktop 889 local desktop=${T}/${exec%% *}-${desktop_name}.desktop
890# local desktop=${T}/${exec%% *:-${desktop_name}}.desktop
852 891
853echo "[Desktop Entry] 892echo "[Desktop Entry]
854Encoding=UTF-8 893Encoding=UTF-8
855Version=0.9.2 894Version=0.9.2
856Name=${name} 895Name=${name}
857Type=Application 896Type=Application
858Comment=${DESCRIPTION} 897Comment=${DESCRIPTION}
859Exec=${exec} 898Exec=${exec}
899TryExec=${exec%% *}
860Path=${path} 900Path=${path}
861Icon=${icon} 901Icon=${icon}
862Categories=Application;${type};" > "${desktop}" 902Categories=Application;${type};" > "${desktop}"
863 903
904 (
905 # wrap the env here so that the 'insinto' call
906 # doesn't corrupt the env of the caller
864 insinto /usr/share/applications 907 insinto /usr/share/applications
865 doins "${desktop}" 908 doins "${desktop}"
866 909 )
867 return 0
868} 910}
869 911
870# Make a GDM/KDM Session file 912# Make a GDM/KDM Session file
871# 913#
872# make_desktop_entry(<title>, <command>) 914# make_desktop_entry(<title>, <command>)
901 doins "${i}" 943 doins "${i}"
902 elif [[ -d ${i} ]] ; then 944 elif [[ -d ${i} ]] ; then
903 for j in "${i}"/*.desktop ; do 945 for j in "${i}"/*.desktop ; do
904 doins "${j}" 946 doins "${j}"
905 done 947 done
906 fi 948 fi
907 done 949 done
908} 950}
909newmenu() { 951newmenu() {
910 insinto /usr/share/applications 952 insinto /usr/share/applications
911 newins "$1" "$2" 953 newins "$1" "$2"
919 doins "${i}" 961 doins "${i}"
920 elif [[ -d ${i} ]] ; then 962 elif [[ -d ${i} ]] ; then
921 for j in "${i}"/*.png ; do 963 for j in "${i}"/*.png ; do
922 doins "${j}" 964 doins "${j}"
923 done 965 done
924 fi 966 fi
925 done 967 done
926} 968}
927newicon() { 969newicon() {
928 insinto /usr/share/pixmaps 970 insinto /usr/share/pixmaps
929 newins "$1" "$2" 971 newins "$1" "$2"
934############################################################## 976##############################################################
935 977
936 978
937# for internal use only (unpack_pdv and unpack_makeself) 979# for internal use only (unpack_pdv and unpack_makeself)
938find_unpackable_file() { 980find_unpackable_file() {
939 local src="$1" 981 local src=$1
940 if [ -z "${src}" ] 982 if [[ -z ${src} ]] ; then
941 then
942 src="${DISTDIR}/${A}" 983 src=${DISTDIR}/${A}
943 else 984 else
944 if [ -e "${DISTDIR}/${src}" ] 985 if [[ -e ${DISTDIR}/${src} ]] ; then
945 then
946 src="${DISTDIR}/${src}" 986 src=${DISTDIR}/${src}
947 elif [ -e "${PWD}/${src}" ] 987 elif [[ -e ${PWD}/${src} ]] ; then
948 then
949 src="${PWD}/${src}" 988 src=${PWD}/${src}
950 elif [ -e "${src}" ] 989 elif [[ -e ${src} ]] ; then
951 then
952 src="${src}" 990 src=${src}
953 fi
954 fi 991 fi
955 [ ! -e "${src}" ] && die "Could not find requested archive ${src}" 992 fi
993 [[ ! -e ${src} ]] && return 1
956 echo "${src}" 994 echo "${src}"
957} 995}
958 996
959# Unpack those pesky pdv generated files ... 997# Unpack those pesky pdv generated files ...
960# They're self-unpacking programs with the binary package stuffed in 998# They're self-unpacking programs with the binary package stuffed in
975# lseek 1013# lseek
976# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 1014# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
977# lseek(3, -4, SEEK_END) = 2981250 1015# lseek(3, -4, SEEK_END) = 2981250
978# thus we would pass in the value of '4' as the second parameter. 1016# thus we would pass in the value of '4' as the second parameter.
979unpack_pdv() { 1017unpack_pdv() {
980 local src="`find_unpackable_file $1`" 1018 local src=$(find_unpackable_file $1)
981 local sizeoff_t="$2" 1019 local sizeoff_t=$2
982 1020
1021 [[ -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 :(" 1022 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :("
984 1023
985 local shrtsrc="`basename ${src}`" 1024 local shrtsrc=$(basename "${src}")
986 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1025 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
987 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1026 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\"` 1027 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"`
989 1028
990 # grab metadata for debug reasons 1029 # grab metadata for debug reasons
1054# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1093# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1055# - If the file is not specified then unpack will utilize ${A}. 1094# - If the file is not specified then unpack will utilize ${A}.
1056# - If the offset is not specified then we will attempt to extract 1095# - If the offset is not specified then we will attempt to extract
1057# the proper offset from the script itself. 1096# the proper offset from the script itself.
1058unpack_makeself() { 1097unpack_makeself() {
1098 local src_input=${1:-${A}}
1059 local src="$(find_unpackable_file "$1")" 1099 local src=$(find_unpackable_file "${src_input}")
1060 local skip="$2" 1100 local skip=$2
1061 local exe="$3" 1101 local exe=$3
1062 1102
1103 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
1104
1063 local shrtsrc="$(basename "${src}")" 1105 local shrtsrc=$(basename "${src}")
1064 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1106 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1065 if [ -z "${skip}" ] 1107 if [[ -z ${skip} ]] ; then
1066 then
1067 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1108 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}')
1068 local skip=0 1109 local skip=0
1069 exe=tail 1110 exe=tail
1070 case ${ver} in 1111 case ${ver} in
1071 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same 1112 1.5.*|1.6.0-nv) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same
1072 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1113 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1073 ;; 1114 ;;
1074 2.0|2.0.1) 1115 2.0|2.0.1)
1075 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-) 1116 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-)
1076 ;; 1117 ;;
1084 ;; 1125 ;;
1085 2.1.3) 1126 2.1.3)
1086 skip=`grep -a ^offset= "${src}" | awk '{print $3}'` 1127 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1087 let skip="skip + 1" 1128 let skip="skip + 1"
1088 ;; 1129 ;;
1089 2.1.4) 1130 2.1.4|2.1.5)
1090 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1) 1131 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1)
1091 skip=$(head -n ${skip} "${src}" | wc -c) 1132 skip=$(head -n ${skip} "${src}" | wc -c)
1092 exe="dd" 1133 exe="dd"
1093 ;; 1134 ;;
1094 *) 1135 *)
1139check_license() { 1180check_license() {
1140 local lic=$1 1181 local lic=$1
1141 if [ -z "${lic}" ] ; then 1182 if [ -z "${lic}" ] ; then
1142 lic="${PORTDIR}/licenses/${LICENSE}" 1183 lic="${PORTDIR}/licenses/${LICENSE}"
1143 else 1184 else
1144 if [ -e "${PORTDIR}/licenses/${src}" ] ; then 1185 if [ -e "${PORTDIR}/licenses/${lic}" ] ; then
1145 lic="${PORTDIR}/licenses/${src}" 1186 lic="${PORTDIR}/licenses/${lic}"
1146 elif [ -e "${PWD}/${src}" ] ; then 1187 elif [ -e "${PWD}/${lic}" ] ; then
1147 lic="${PWD}/${src}" 1188 lic="${PWD}/${lic}"
1148 elif [ -e "${src}" ] ; then 1189 elif [ -e "${lic}" ] ; then
1149 lic="${src}" 1190 lic="${lic}"
1150 fi
1151 fi 1191 fi
1192 fi
1152 [ ! -f "${lic}" ] && die "Could not find requested license ${src}" 1193 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1153 local l="`basename ${lic}`" 1194 local l="`basename ${lic}`"
1154 1195
1155 # here is where we check for the licenses the user already 1196 # 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 1197 # accepted ... if we don't find a match, we make the user accept
1157 local shopts=$- 1198 local shopts=$-
1199# and when the function returns, you can assume that the cd has been 1240# and when the function returns, you can assume that the cd has been
1200# found at CDROM_ROOT. 1241# found at CDROM_ROOT.
1201# 1242#
1202# normally the cdrom functions will refer to the cds as 'cd #1', 'cd #2', 1243# normally the cdrom functions will refer to the cds as 'cd #1', 'cd #2',
1203# etc... if you want to give the cds better names, then just export 1244# etc... if you want to give the cds better names, then just export
1204# the CDROM_NAME_X variables before calling cdrom_get_cds(). 1245# the appropriate CDROM_NAME variable before calling cdrom_get_cds().
1246# - CDROM_NAME="fooie cd" - for when you only want 1 cd
1247# - CDROM_NAME_1="install cd" - for when you want more than 1 cd
1248# CDROM_NAME_2="data cd"
1249# - CDROM_NAME_SET=( "install cd" "data cd" ) - short hand for CDROM_NAME_#
1205# 1250#
1206# for those multi cd ebuilds, see the cdrom_load_next_cd() below. 1251# for those multi cd ebuilds, see the cdrom_load_next_cd() below.
1207# 1252#
1208# Usage: cdrom_get_cds <file on cd1> [file on cd2] [file on cd3] [...] 1253# Usage: cdrom_get_cds <file on cd1> [file on cd2] [file on cd3] [...]
1209# - this will attempt to locate a cd based upon a file that is on 1254# - this will attempt to locate a cd based upon a file that is on
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."
1263 echo 1305 echo
1264 einfo "For example:" 1306 einfo "For example:"
1265 einfo "export CD_ROOT=/mnt/cdrom" 1307 einfo "export CD_ROOT=/mnt/cdrom"
1266 echo 1308 echo
1267 else 1309 else
1310 if [[ -n ${CDROM_NAME_SET} ]] ; then
1311 # Translate the CDROM_NAME_SET array into CDROM_NAME_#
1312 cdcnt=0
1313 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1314 ((++cdcnt))
1315 export CDROM_NAME_${cdcnt}="${CDROM_NAME_SET[$((${cdcnt}-1))]}"
1316 done
1317 fi
1318
1268 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1319 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1269 cdcnt=0 1320 cdcnt=0
1270 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1321 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1271 cdcnt=$((cdcnt + 1)) 1322 ((++cdcnt))
1272 var="CDROM_NAME_${cdcnt}" 1323 var="CDROM_NAME_${cdcnt}"
1273 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}" 1324 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}"
1274 done 1325 done
1275 echo 1326 echo
1276 einfo "If you do not have the CDs, but have the data files" 1327 einfo "If you do not have the CDs, but have the data files"
1277 einfo "mounted somewhere on your filesystem, just export" 1328 einfo "mounted somewhere on your filesystem, just export"
1278 einfo "the following variables so they point to the right place:" 1329 einfo "the following variables so they point to the right place:"
1279 einfon "" 1330 einfon ""
1280 cdcnt=0 1331 cdcnt=0
1281 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1332 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1282 cdcnt=$((cdcnt + 1)) 1333 ((++cdcnt))
1283 echo -n " CD_ROOT_${cdcnt}" 1334 echo -n " CD_ROOT_${cdcnt}"
1284 done 1335 done
1285 echo 1336 echo
1286 einfo "Or, if you have all the files in the same place, or" 1337 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" 1338 einfo "you only have one cdrom, you can export CD_ROOT"
1290 echo 1341 echo
1291 einfo "For example:" 1342 einfo "For example:"
1292 einfo "export CD_ROOT_1=/mnt/cdrom" 1343 einfo "export CD_ROOT_1=/mnt/cdrom"
1293 echo 1344 echo
1294 fi 1345 fi
1346
1347 export CDROM_SET=""
1295 export CDROM_CURRENT_CD=0 1348 export CDROM_CURRENT_CD=0
1296 cdrom_load_next_cd 1349 cdrom_load_next_cd
1297} 1350}
1298 1351
1299# this is only used when you need access to more than one cd. 1352# 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. 1353# 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. 1354# 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. 1355# remember, you can only go forward in the cd chain, you can't go back.
1303cdrom_load_next_cd() { 1356cdrom_load_next_cd() {
1304 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1305 local var= 1357 local var
1306 1358 ((++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 1359
1312 unset CDROM_ROOT 1360 unset CDROM_ROOT
1313 var=CDROM_ROOTS_${CDROM_CURRENT_CD} 1361 var=CD_ROOT_${CDROM_CURRENT_CD}
1362 [[ -z ${!var} ]] && var="CD_ROOT"
1314 if [[ -z ${!var} ]] ; then 1363 if [[ -z ${!var} ]] ; then
1315 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1364 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1316 cdrom_locate_file_on_cd ${!var} 1365 _cdrom_locate_file_on_cd ${!var}
1317 else 1366 else
1318 export CDROM_ROOT=${!var} 1367 export CDROM_ROOT=${!var}
1319 fi 1368 fi
1320 1369
1321 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1370 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 1375# 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 1376# found, then a message asking for the user to insert the cdrom will be
1328# displayed and we'll hang out here until: 1377# displayed and we'll hang out here until:
1329# (1) the file is found on a mounted cdrom 1378# (1) the file is found on a mounted cdrom
1330# (2) the user hits CTRL+C 1379# (2) the user hits CTRL+C
1331cdrom_locate_file_on_cd() { 1380_cdrom_locate_file_on_cd() {
1381 local mline=""
1382 local showedmsg=0
1383
1332 while [[ -z ${CDROM_ROOT} ]] ; do 1384 while [[ -z ${CDROM_ROOT} ]] ; do
1385 local i=0
1386 local -a cdset=(${*//:/ })
1387 if [[ -n ${CDROM_SET} ]] ; then
1388 cdset=(${cdset[${CDROM_SET}]})
1389 fi
1390
1391 while [[ -n ${cdset[${i}]} ]] ; do
1333 local dir="$(dirname ${@})" 1392 local dir=$(dirname ${cdset[${i}]})
1334 local file="$(basename ${@})" 1393 local file=$(basename ${cdset[${i}]})
1335 local mline=""
1336 local showedmsg=0
1337 1394
1338 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do 1395 for mline in $(mount | gawk '/(iso|cdrom|fs=cdfss)/ {print $3}') ; do
1339 [[ -d ${mline}/${dir} ]] || continue 1396 [[ -d ${mline}/${dir} ]] || continue
1340 [[ ! -z $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] \ 1397 if [[ -n $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] ; then
1341 && export CDROM_ROOT=${mline} 1398 export CDROM_ROOT=${mline}
1399 export CDROM_SET=${i}
1400 export CDROM_MATCH=${cdset[${i}]}
1401 return
1402 fi
1403 done
1404
1405 ((++i))
1342 done 1406 done
1343 1407
1344 if [[ -z ${CDROM_ROOT} ]] ; then
1345 echo 1408 echo
1346 if [[ ${showedmsg} -eq 0 ]] ; then 1409 if [[ ${showedmsg} -eq 0 ]] ; then
1347 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1410 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1348 if [[ -z ${CDROM_NAME} ]] ; then 1411 if [[ -z ${CDROM_NAME} ]] ; then
1349 einfo "Please insert the cdrom for ${PN} now !" 1412 einfo "Please insert+mount the cdrom for ${PN} now !"
1350 else
1351 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1352 fi
1353 else 1413 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 !" 1414 einfo "Please insert+mount the ${CDROM_NAME} cdrom now !"
1359 fi
1360 fi 1415 fi
1361 showedmsg=1 1416 else
1417 if [[ -z ${CDROM_NAME_1} ]] ; then
1418 einfo "Please insert+mount cd #${CDROM_CURRENT_CD} for ${PN} now !"
1419 else
1420 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1421 einfo "Please insert+mount the ${!var} cdrom now !"
1422 fi
1362 fi 1423 fi
1424 showedmsg=1
1425 fi
1363 einfo "Press return to scan for the cd again" 1426 einfo "Press return to scan for the cd again"
1364 einfo "or hit CTRL+C to abort the emerge." 1427 einfo "or hit CTRL+C to abort the emerge."
1365 echo 1428 echo
1366 einfo "If you are having trouble with the detection" 1429 einfo "If you are having trouble with the detection"
1367 einfo "of your CD, it is possible that you do not have" 1430 einfo "of your CD, it is possible that you do not have"
1368 einfo "Joliet support enabled in your kernel. Please" 1431 einfo "Joliet support enabled in your kernel. Please"
1369 einfo "check that CONFIG_JOLIET is enabled in your kernel." 1432 einfo "check that CONFIG_JOLIET is enabled in your kernel."
1370 read 1433 read || die "something is screwed with your system"
1371 fi
1372 done 1434 done
1373} 1435}
1374 1436
1375# Make sure that LINGUAS only contains languages that 1437# Make sure that LINGUAS only contains languages that
1376# a package can support 1438# a package can support
1383# The -i builds a list of po files found in all the 1445# The -i builds a list of po files found in all the
1384# directories and uses the intersection of the lists. 1446# directories and uses the intersection of the lists.
1385# The -u builds a list of po files found in all the 1447# The -u builds a list of po files found in all the
1386# directories and uses the union of the lists. 1448# directories and uses the union of the lists.
1387strip-linguas() { 1449strip-linguas() {
1388 local ls newls 1450 local ls newls nols
1389 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then 1451 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1390 local op=$1; shift 1452 local op=$1; shift
1391 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1453 ls=$(find "$1" -name '*.po' -exec basename {} .po \;); shift
1392 local d f 1454 local d f
1393 for d in "$@" ; do 1455 for d in "$@" ; do
1394 if [[ ${op} == "-u" ]] ; then 1456 if [[ ${op} == "-u" ]] ; then
1395 newls=${ls} 1457 newls=${ls}
1396 else 1458 else
1397 newls="" 1459 newls=""
1398 fi 1460 fi
1399 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1461 for f in $(find "$d" -name '*.po' -exec basename {} .po \;) ; do
1400 if [[ ${op} == "-i" ]] ; then 1462 if [[ ${op} == "-i" ]] ; then
1401 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}" 1463 hasq ${f} ${ls} && newls="${newls} ${f}"
1402 else 1464 else
1403 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}" 1465 hasq ${f} ${ls} || newls="${newls} ${f}"
1404 fi 1466 fi
1405 done 1467 done
1406 ls=${newls} 1468 ls=${newls}
1407 done 1469 done
1408 ls=${ls//.po}
1409 else 1470 else
1410 ls=$@ 1471 ls="$@"
1411 fi 1472 fi
1412 1473
1413 ls=" ${ls} " 1474 nols=""
1414 newls="" 1475 newls=""
1415 for f in ${LINGUAS} ; do 1476 for f in ${LINGUAS} ; do
1416 if [[ ${ls/ ${f} /} != ${ls} ]] ; then 1477 if hasq ${f} ${ls} ; then
1417 newls="${newls} ${f}" 1478 newls="${newls} ${f}"
1418 else 1479 else
1419 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1480 nols="${nols} ${f}"
1420 fi 1481 fi
1421 done 1482 done
1422 if [[ -z ${newls} ]] ; then 1483 [[ -n ${nols} ]] \
1423 export LINGUAS="" 1484 && ewarn "Sorry, but ${PN} does not support the LINGUAs:" ${nols}
1424 else
1425 export LINGUAS=${newls:1} 1485 export LINGUAS=${newls:1}
1426 fi
1427} 1486}
1428 1487
1429# moved from kernel.eclass since they are generally useful outside of 1488# moved from kernel.eclass since they are generally useful outside of
1430# kernel.eclass -iggy (20041002) 1489# kernel.eclass -iggy (20041002)
1431 1490
1460 1519
1461# Jeremy Huddleston <eradicator@gentoo.org>: 1520# Jeremy Huddleston <eradicator@gentoo.org>:
1462# preserve_old_lib /path/to/libblah.so.0 1521# preserve_old_lib /path/to/libblah.so.0
1463# preserve_old_lib_notify /path/to/libblah.so.0 1522# preserve_old_lib_notify /path/to/libblah.so.0
1464# 1523#
1465# These functions are useful when a lib in your package changes --soname. Such 1524# 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 1525# 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 1526# 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 1527# 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: 1528# solution, so instead you can add the following to your ebuilds:
1470# 1529#
1497 LIB=$1 1556 LIB=$1
1498 1557
1499 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1558 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1500 SONAME=`basename ${LIB}` 1559 SONAME=`basename ${LIB}`
1501 1560
1502 einfo "An old version of an installed library was detected on your system." 1561 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" 1562 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," 1563 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:" 1564 ewarn "you will need to execute the following command:"
1506 einfo " revdep-rebuild --soname ${SONAME}" 1565 ewarn " revdep-rebuild --library ${SONAME}"
1507 einfo 1566 ewarn
1508 einfo "After doing that, you can safely remove ${LIB}" 1567 ewarn "After doing that, you can safely remove ${LIB}"
1509 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild" 1568 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1510 fi 1569 fi
1511} 1570}
1512 1571
1513# Hack for people to figure out if a package was built with 1572# Hack for people to figure out if a package was built with
1514# certain USE flags 1573# certain USE flags
1524 [[ ${opt:0:1} = "-" ]] && shift || opt="-a" 1583 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1525 1584
1526 local PKG=$(best_version $1) 1585 local PKG=$(best_version $1)
1527 shift 1586 shift
1528 1587
1529 local USEFILE="${ROOT}/var/db/pkg/${PKG}/USE" 1588 local USEFILE=${ROOT}/var/db/pkg/${PKG}/USE
1589
1590 # if the USE file doesnt exist, assume the $PKG is either
1591 # injected or package.provided
1530 [[ ! -e ${USEFILE} ]] && return 1 1592 [[ ! -e ${USEFILE} ]] && return 0
1531 1593
1532 local USE_BUILT=$(<${USEFILE}) 1594 local USE_BUILT=$(<${USEFILE})
1533 while [[ $# -gt 0 ]] ; do 1595 while [[ $# -gt 0 ]] ; do
1534 if [[ ${opt} = "-o" ]] ; then 1596 if [[ ${opt} = "-o" ]] ; then
1535 has $1 ${USE_BUILT} && return 0 1597 has $1 ${USE_BUILT} && return 0
1587# $4 == extra LD_LIBRARY_PATH's (make it : delimited) 1649# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1588# $5 == path for wrapper 1650# $5 == path for wrapper
1589make_wrapper() { 1651make_wrapper() {
1590 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5 1652 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1591 local tmpwrapper=$(emktemp) 1653 local tmpwrapper=$(emktemp)
1654 # We don't want to quote ${bin} so that people can pass complex
1655 # things as $bin ... "./someprog --args"
1592 cat << EOF > "${tmpwrapper}" 1656 cat << EOF > "${tmpwrapper}"
1593#!/bin/sh 1657#!/bin/sh
1594cd "${chdir}" 1658cd "${chdir:-.}"
1659if [ -n "${libdir}" ] ; then
1660 if [ "\${LD_LIBRARY_PATH+set}" = "set" ] ; then
1595export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}" 1661 export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1662 else
1663 export LD_LIBRARY_PATH="${libdir}"
1664 fi
1665fi
1596exec ${bin} "\$@" 1666exec ${bin} "\$@"
1597EOF 1667EOF
1598 chmod go+rx "${tmpwrapper}" 1668 chmod go+rx "${tmpwrapper}"
1599 if [ -n "${5}" ] 1669 if [[ -n ${path} ]] ; then
1600 then
1601 exeinto ${5} 1670 exeinto "${path}"
1602 newexe "${tmpwrapper}" "${wrapper}" 1671 newexe "${tmpwrapper}" "${wrapper}"
1603 else 1672 else
1604 newbin "${tmpwrapper}" "${wrapper}" 1673 newbin "${tmpwrapper}" "${wrapper}"
1605 fi 1674 fi
1606} 1675}

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

  ViewVC Help
Powered by ViewVC 1.1.20