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

Diff of /eclass/eutils.eclass

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

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

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

  ViewVC Help
Powered by ViewVC 1.1.20