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

Diff of /eclass/eutils.eclass

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

Revision 1.193 Revision 1.252
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.193 2005/07/21 02:16:45 vapier Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.252 2006/10/05 00:12:07 nyhm 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() {
60 if [[ $(type -t _tc_gen_usr_ldscript) == "function" ]] ; then
61 _tc_gen_usr_ldscript "$@"
62 return $?
63 fi
64
65 ewarn "QA Notice: Please upgrade your ebuild to use toolchain-funcs"
66 ewarn "QA Notice: rather than gen_usr_ldscript() from eutils"
67
65 local libdir="$(get_libdir)" 68 local lib libdir=$(get_libdir)
66 # Just make sure it exists 69 # Just make sure it exists
67 dodir /usr/${libdir} 70 dodir /usr/${libdir}
68 71
69 for lib in "${@}" ; do 72 for lib in "${@}" ; do
70 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT 73 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT
… …
76 79
77 See bug http://bugs.gentoo.org/4411 for more info. 80 See bug http://bugs.gentoo.org/4411 for more info.
78 */ 81 */
79 GROUP ( /${libdir}/${lib} ) 82 GROUP ( /${libdir}/${lib} )
80 END_LDSCRIPT 83 END_LDSCRIPT
81 fperms a+x "/usr/${libdir}/${lib}" 84 fperms a+x "/usr/${libdir}/${lib}" || die "could not change perms on ${lib}"
82 done 85 done
83} 86}
84 87
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 88
116# Default directory where patches are located 89# Default directory where patches are located
117EPATCH_SOURCE="${WORKDIR}/patch" 90EPATCH_SOURCE="${WORKDIR}/patch"
118# Default extension for patches 91# Default extension for patches
119EPATCH_SUFFIX="patch.bz2" 92EPATCH_SUFFIX="patch.bz2"
120# Default options for patch 93# Default options for patch
121# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571 94# 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. 95# Set --no-backup-if-mismatch so we don't leave '.orig' files behind.
96# Set -E to automatically remove empty files.
123EPATCH_OPTS="-g0 --no-backup-if-mismatch" 97EPATCH_OPTS="-g0 -E --no-backup-if-mismatch"
124# List of patches not to apply. Not this is only file names, 98# List of patches not to apply. Not this is only file names,
125# and not the full path .. 99# and not the full path ..
126EPATCH_EXCLUDE="" 100EPATCH_EXCLUDE=""
127# Change the printed message for a single patch. 101# Change the printed message for a single patch.
128EPATCH_SINGLE_MSG="" 102EPATCH_SINGLE_MSG=""
… …
166# hand its a directory, it will set EPATCH_SOURCE to this. 140# hand its a directory, it will set EPATCH_SOURCE to this.
167# 141#
168# <azarah@gentoo.org> (10 Nov 2002) 142# <azarah@gentoo.org> (10 Nov 2002)
169# 143#
170epatch() { 144epatch() {
145 _epatch_draw_line() {
146 [[ -z $1 ]] && set "$(printf "%65s" '')"
147 echo "${1//?/=}"
148 }
149 _epatch_assert() { local _pipestatus=${PIPESTATUS[*]}; [[ ${_pipestatus// /} -eq 0 ]] ; }
171 local PIPE_CMD="" 150 local PIPE_CMD=""
172 local STDERR_TARGET="${T}/$$.out" 151 local STDERR_TARGET="${T}/$$.out"
173 local PATCH_TARGET="${T}/$$.patch" 152 local PATCH_TARGET="${T}/$$.patch"
174 local PATCH_SUFFIX="" 153 local PATCH_SUFFIX=""
175 local SINGLE_PATCH="no" 154 local SINGLE_PATCH="no"
176 local x="" 155 local x=""
156
157 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402
177 158
178 if [ "$#" -gt 1 ] 159 if [ "$#" -gt 1 ]
179 then 160 then
180 local m="" 161 local m=""
181 for m in "$@" ; do 162 for m in "$@" ; do
… …
282 263
283 # Allow for prefix to differ ... im lazy, so shoot me :/ 264 # Allow for prefix to differ ... im lazy, so shoot me :/
284 while [ "${count}" -lt 5 ] 265 while [ "${count}" -lt 5 ]
285 do 266 do
286 # Generate some useful debug info ... 267 # Generate some useful debug info ...
287 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 268 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
288 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 269 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
289 270
290 if [ "${PATCH_SUFFIX}" != "patch" ] 271 if [ "${PATCH_SUFFIX}" != "patch" ]
291 then 272 then
292 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 273 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
… …
297 278
298 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 279 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
299 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 280 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
300 281
301 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 282 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
302 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 283 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
303 284
304 if [ "${PATCH_SUFFIX}" != "patch" ] 285 if [ "${PATCH_SUFFIX}" != "patch" ]
305 then 286 then
306 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1 287 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
307 then 288 then
… …
311 count=5 292 count=5
312 break 293 break
313 fi 294 fi
314 fi 295 fi
315 296
316 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1 297 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f ; _epatch_assert) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
317 then 298 then
318 draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 299 _epatch_draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
319 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 300 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
320 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 301 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
321 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 302 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
322 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 303 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
323 304
324 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1 305 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1
306 _epatch_assert
325 307
326 if [ "$?" -ne 0 ] 308 if [ "$?" -ne 0 ]
327 then 309 then
328 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 310 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
329 echo 311 echo
… …
375# vapier@gentoo.org 357# vapier@gentoo.org
376# 358#
377# Takes just 1 optional parameter (the directory to create tmpfile in) 359# Takes just 1 optional parameter (the directory to create tmpfile in)
378emktemp() { 360emktemp() {
379 local exe="touch" 361 local exe="touch"
380 [ "$1" == "-d" ] && exe="mkdir" && shift 362 [[ $1 == -d ]] && exe="mkdir" && shift
381 local topdir="$1" 363 local topdir=$1
382 364
383 if [ -z "${topdir}" ] 365 if [[ -z ${topdir} ]] ; then
384 then
385 [ -z "${T}" ] \ 366 [[ -z ${T} ]] \
386 && topdir="/tmp" \ 367 && topdir="/tmp" \
387 || topdir="${T}" 368 || topdir=${T}
388 fi 369 fi
389 370
390 if [ -z "$(type -p mktemp)" ] 371 if [[ -z $(type -p mktemp) ]] ; then
391 then
392 local tmp=/ 372 local tmp=/
393 while [ -e "${tmp}" ] ; do 373 while [[ -e ${tmp} ]] ; do
394 tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}" 374 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}
395 done 375 done
396 ${exe} "${tmp}" 376 ${exe} "${tmp}" || ${exe} -p "${tmp}"
397 echo "${tmp}" 377 echo "${tmp}"
398 else 378 else
399 [ "${exe}" == "touch" ] \ 379 if [[ ${exe} == "touch" ]] ; then
400 && exe="-p" \ 380 [[ ${USERLAND} == "GNU" ]] \
401 || exe="-d" 381 && mktemp -p "${topdir}" \
402 mktemp ${exe} "${topdir}" 382 || TMPDIR="${topdir}" mktemp -t tmp
383 else
384 [[ ${USERLAND} == "GNU" ]] \
385 && mktemp -d "${topdir}" \
386 || TMPDIR="${topdir}" mktemp -dt tmp
387 fi
403 fi 388 fi
404} 389}
405 390
406# Small wrapper for getent (Linux), nidump (Mac OS X), 391# Small wrapper for getent (Linux), nidump (Mac OS X),
407# and pw (FreeBSD) used in enewuser()/enewgroup() 392# and pw (FreeBSD) used in enewuser()/enewgroup()
408# Joe Jezak <josejx@gmail.com> and usata@gentoo.org 393# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
409# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org> 394# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
410# 395#
411# egetent(database, key) 396# egetent(database, key)
412egetent() { 397egetent() {
413 if [[ "${USERLAND}" == "Darwin" ]] ; then 398 case ${CHOST} in
399 *-darwin*)
414 case "$2" in 400 case "$2" in
415 *[!0-9]*) # Non numeric 401 *[!0-9]*) # Non numeric
416 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 402 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
417 ;; 403 ;;
418 *) # Numeric 404 *) # Numeric
419 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 405 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
420 ;; 406 ;;
421 esac 407 esac
422 elif [[ "${USERLAND}" == "BSD" ]] ; then 408 ;;
423 local action 409 *-freebsd*|*-dragonfly*)
424 if [ "$1" == "passwd" ] 410 local opts action="user"
425 then 411 [[ $1 == "passwd" ]] || action="group"
426 action="user" 412
427 else 413 # lookup by uid/gid
428 action="group" 414 if [[ $2 == [[:digit:]]* ]] ; then
415 [[ ${action} == "user" ]] && opts="-u" || opts="-g"
429 fi 416 fi
417
430 pw show "${action}" "$2" -q 418 pw show ${action} ${opts} "$2" -q
431 else 419 ;;
420 *-netbsd*|*-openbsd*)
421 grep "$2:\*:" /etc/$1
422 ;;
423 *)
432 which nscd >& /dev/null && nscd -i "$1" 424 type -p nscd >& /dev/null && nscd -i "$1"
433 getent "$1" "$2" 425 getent "$1" "$2"
434 fi 426 ;;
427 esac
435} 428}
436 429
437# Simplify/standardize adding users to the system 430# Simplify/standardize adding users to the system
438# vapier@gentoo.org 431# vapier@gentoo.org
439# 432#
… …
446# shell: /bin/false 439# shell: /bin/false
447# homedir: /dev/null 440# homedir: /dev/null
448# groups: none 441# groups: none
449# extra: comment of 'added by portage for ${PN}' 442# extra: comment of 'added by portage for ${PN}'
450enewuser() { 443enewuser() {
444 case ${EBUILD_PHASE} in
445 unpack|compile|test|install)
446 eerror "'enewuser()' called from '${EBUILD_PHASE}()' which is not a pkg_* function."
447 eerror "Package fails at QA and at life. Please file a bug."
448 die "Bad package! enewuser is only for use in pkg_* functions!"
449 esac
450
451 # get the username 451 # get the username
452 local euser=$1; shift 452 local euser=$1; shift
453 if [[ -z ${euser} ]] ; then 453 if [[ -z ${euser} ]] ; then
454 eerror "No username specified !" 454 eerror "No username specified !"
455 die "Cannot call enewuser without a username" 455 die "Cannot call enewuser without a username"
… …
477 fi 477 fi
478 else 478 else
479 euid="next" 479 euid="next"
480 fi 480 fi
481 if [[ ${euid} == "next" ]] ; then 481 if [[ ${euid} == "next" ]] ; then
482 local pwrange 482 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 483 [[ -z $(egetent passwd ${euid}) ]] && break
490 done 484 done
491 fi 485 fi
492 opts="${opts} -u ${euid}" 486 opts="${opts} -u ${euid}"
493 einfo " - Userid: ${euid}" 487 einfo " - Userid: ${euid}"
494 488
495 # handle shell 489 # handle shell
496 local eshell=$1; shift 490 local eshell=$1; shift
497 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then 491 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
498 if [[ ! -e ${eshell} ]] ; then 492 if [[ ! -e ${ROOT}${eshell} ]] ; then
499 eerror "A shell was specified but it does not exist !" 493 eerror "A shell was specified but it does not exist !"
500 die "${eshell} does not exist" 494 die "${eshell} does not exist in ${ROOT}"
495 fi
496 if [[ ${eshell} == */false || ${eshell} == */nologin ]] ; then
497 eerror "Do not specify ${eshell} yourself, use -1"
498 die "Pass '-1' as the shell parameter"
501 fi 499 fi
502 else 500 else
503 case ${USERLAND} in 501 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do
504 Darwin) eshell="/usr/bin/false";; 502 [[ -x ${ROOT}${shell} ]] && break
505 BSD) eshell="/usr/sbin/nologin";; 503 done
506 *) eshell="/bin/false";; 504
507 esac 505 if [[ ${shell} == "/dev/null" ]] ; then
506 eerror "Unable to identify the shell to use"
507 die "Unable to identify the shell to use"
508 fi
509
510 eshell=${shell}
508 fi 511 fi
509 einfo " - Shell: ${eshell}" 512 einfo " - Shell: ${eshell}"
510 opts="${opts} -s ${eshell}" 513 opts="${opts} -s ${eshell}"
511 514
512 # handle homedir 515 # handle homedir
… …
549 einfo " - Groups: ${egroups}" 552 einfo " - Groups: ${egroups}"
550 553
551 # handle extra and add the user 554 # handle extra and add the user
552 local oldsandbox=${SANDBOX_ON} 555 local oldsandbox=${SANDBOX_ON}
553 export SANDBOX_ON="0" 556 export SANDBOX_ON="0"
554 case ${USERLAND} in 557 case ${CHOST} in
555 Darwin) 558 *-darwin*)
556 ### Make the user 559 ### Make the user
557 if [[ -z $@ ]] ; then 560 if [[ -z $@ ]] ; then
558 dscl . create /users/${euser} uid ${euid} 561 dscl . create /users/${euser} uid ${euid}
559 dscl . create /users/${euser} shell ${eshell} 562 dscl . create /users/${euser} shell ${eshell}
560 dscl . create /users/${euser} home ${ehome} 563 dscl . create /users/${euser} home ${ehome}
… …
571 einfo "Please report the ebuild along with the info below" 574 einfo "Please report the ebuild along with the info below"
572 einfo "eextra: $@" 575 einfo "eextra: $@"
573 die "Required function missing" 576 die "Required function missing"
574 fi 577 fi
575 ;; 578 ;;
576 BSD) 579 *-freebsd*|*-dragonfly*)
577 if [[ -z $@ ]] ; then 580 if [[ -z $@ ]] ; then
578 pw useradd ${euser} ${opts} \ 581 pw useradd ${euser} ${opts} \
579 -c "added by portage for ${PN}" \ 582 -c "added by portage for ${PN}" \
580 die "enewuser failed" 583 die "enewuser failed"
581 else 584 else
582 einfo " - Extra: $@" 585 einfo " - Extra: $@"
583 pw useradd ${euser} ${opts} \ 586 pw useradd ${euser} ${opts} \
584 "$@" || die "enewuser failed" 587 "$@" || die "enewuser failed"
585 fi 588 fi
586 ;; 589 ;;
590
591 *-netbsd*)
592 if [[ -z $@ ]] ; then
593 useradd ${opts} ${euser} || die "enewuser failed"
594 else
595 einfo " - Extra: $@"
596 useradd ${opts} ${euser} "$@" || die "enewuser failed"
597 fi
598 ;;
599
600 *-openbsd*)
601 if [[ -z $@ ]] ; then
602 useradd -u ${euid} -s ${eshell} \
603 -d ${ehome} -c "Added by portage for ${PN}" \
604 -g ${egroups} ${euser} || die "enewuser failed"
605 else
606 einfo " - Extra: $@"
607 useradd -u ${euid} -s ${eshell} \
608 -d ${ehome} -c "Added by portage for ${PN}" \
609 -g ${egroups} ${euser} "$@" || die "enewuser failed"
610 fi
611 ;;
612
587 *) 613 *)
588 if [[ -z $@ ]] ; then 614 if [[ -z $@ ]] ; then
589 useradd ${opts} ${euser} \ 615 useradd ${opts} ${euser} \
590 -c "added by portage for ${PN}" \ 616 -c "added by portage for ${PN}" \
591 || die "enewuser failed" 617 || die "enewuser failed"
… …
615# Default values if you do not specify any: 641# Default values if you do not specify any:
616# groupname: REQUIRED ! 642# groupname: REQUIRED !
617# gid: next available (see groupadd(8)) 643# gid: next available (see groupadd(8))
618# extra: none 644# extra: none
619enewgroup() { 645enewgroup() {
646 case ${EBUILD_PHASE} in
647 unpack|compile|test|install)
648 eerror "'enewgroup()' called from '${EBUILD_PHASE}()' which is not a pkg_* function."
649 eerror "Package fails at QA and at life. Please file a bug."
650 die "Bad package! enewgroup is only for use in pkg_* functions!"
651 esac
652
620 # get the group 653 # get the group
621 local egroup="$1"; shift 654 local egroup="$1"; shift
622 if [ -z "${egroup}" ] 655 if [ -z "${egroup}" ]
623 then 656 then
624 eerror "No group specified !" 657 eerror "No group specified !"
… …
641 then 674 then
642 if [ "${egid}" -gt 0 ] 675 if [ "${egid}" -gt 0 ]
643 then 676 then
644 if [ -z "`egetent group ${egid}`" ] 677 if [ -z "`egetent group ${egid}`" ]
645 then 678 then
646 if [[ "${USERLAND}" == "Darwin" ]]; then 679 if [[ "${CHOST}" == *-darwin* ]]; then
647 opts="${opts} ${egid}" 680 opts="${opts} ${egid}"
648 else 681 else
649 opts="${opts} -g ${egid}" 682 opts="${opts} -g ${egid}"
650 fi 683 fi
651 else 684 else
… …
665 opts="${opts} ${eextra}" 698 opts="${opts} ${eextra}"
666 699
667 # add the group 700 # add the group
668 local oldsandbox="${SANDBOX_ON}" 701 local oldsandbox="${SANDBOX_ON}"
669 export SANDBOX_ON="0" 702 export SANDBOX_ON="0"
670 if [[ "${USERLAND}" == "Darwin" ]]; then 703 case ${CHOST} in
704 *-darwin*)
671 if [ ! -z "${eextra}" ]; 705 if [ ! -z "${eextra}" ];
672 then 706 then
673 einfo "Extra options are not supported on Darwin/OS X yet" 707 einfo "Extra options are not supported on Darwin/OS X yet"
674 einfo "Please report the ebuild along with the info below" 708 einfo "Please report the ebuild along with the info below"
675 einfo "eextra: ${eextra}" 709 einfo "eextra: ${eextra}"
676 die "Required function missing" 710 die "Required function missing"
677 fi 711 fi
678 712
679 # If we need the next available 713 # If we need the next available
680 case ${egid} in 714 case ${egid} in
681 *[!0-9]*) # Non numeric 715 *[!0-9]*) # Non numeric
682 for egid in `jot 898 101`; do 716 for egid in $(seq 101 999); do
683 [ -z "`egetent group ${egid}`" ] && break 717 [ -z "`egetent group ${egid}`" ] && break
684 done 718 done
685 esac 719 esac
686 dscl . create /groups/${egroup} gid ${egid} 720 dscl . create /groups/${egroup} gid ${egid}
687 dscl . create /groups/${egroup} passwd '*' 721 dscl . create /groups/${egroup} passwd '*'
688 elif [[ "${USERLAND}" == "BSD" ]] ; then 722 ;;
723
724 *-freebsd*|*-dragonfly*)
689 case ${egid} in 725 case ${egid} in
690 *[!0-9]*) # Non numeric 726 *[!0-9]*) # Non numeric
691 for egid in `jot 898 101`; do 727 for egid in $(seq 101 999); do
692 [ -z "`egetent group ${egid}`" ] && break 728 [ -z "`egetent group ${egid}`" ] && break
693 done 729 done
694 esac 730 esac
695 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 731 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
696 else 732 ;;
733
734 *-netbsd*)
735 case ${egid} in
736 *[!0-9]*) # Non numeric
737 for egid in $(seq 101 999); do
738 [ -z "`egetent group ${egid}`" ] && break
739 done
740 esac
741 groupadd -g ${egid} ${egroup} || die "enewgroup failed"
742 ;;
743
744 *)
697 groupadd ${opts} ${egroup} || die "enewgroup failed" 745 groupadd ${opts} ${egroup} || die "enewgroup failed"
698 fi 746 ;;
747 esac
699 export SANDBOX_ON="${oldsandbox}" 748 export SANDBOX_ON="${oldsandbox}"
700} 749}
701 750
702# Simple script to replace 'dos2unix' binaries 751# Simple script to replace 'dos2unix' binaries
703# vapier@gentoo.org 752# vapier@gentoo.org
… …
720 769
721# Make a desktop file ! 770# Make a desktop file !
722# Great for making those icons in kde/gnome startmenu ! 771# Great for making those icons in kde/gnome startmenu !
723# Amaze your friends ! Get the women ! Join today ! 772# Amaze your friends ! Get the women ! Join today !
724# 773#
725# make_desktop_entry(<binary>, [name], [icon], [type], [path]) 774# make_desktop_entry(<command>, [name], [icon], [type], [path])
726# 775#
727# binary: what binary does the app run with ? 776# binary: what command does the app run with ?
728# name: the name that will show up in the menu 777# name: the name that will show up in the menu
729# icon: give your little like a pretty little icon ... 778# icon: give your little like a pretty little icon ...
730# this can be relative (to /usr/share/pixmaps) or 779# this can be relative (to /usr/share/pixmaps) or
731# a full path to an icon 780# a full path to an icon
732# type: what kind of application is this ? for categories: 781# type: what kind of application is this ? for categories:
… …
768 games) 817 games)
769 case ${catmin} in 818 case ${catmin} in
770 action) type=ActionGame;; 819 action) type=ActionGame;;
771 arcade) type=ArcadeGame;; 820 arcade) type=ArcadeGame;;
772 board) type=BoardGame;; 821 board) type=BoardGame;;
773 kid) type=KidsGame;; 822 kids) type=KidsGame;;
774 emulation) type=Emulator;; 823 emulation) type=Emulator;;
775 puzzle) type=LogicGame;; 824 puzzle) type=LogicGame;;
776 rpg) type=RolePlaying;; 825 rpg) type=RolePlaying;;
777 roguelike) type=RolePlaying;; 826 roguelike) type=RolePlaying;;
778 simulation) type=Simulation;; 827 simulation) type=Simulation;;
… …
814 type="Network;${type}" 863 type="Network;${type}"
815 ;; 864 ;;
816 865
817 sci) 866 sci)
818 case ${catmin} in 867 case ${catmin} in
819 astro*) type=Astronomoy;; 868 astro*) type=Astronomy;;
820 bio*) type=Biology;; 869 bio*) type=Biology;;
821 calc*) type=Calculator;; 870 calc*) type=Calculator;;
822 chem*) type=Chemistry;; 871 chem*) type=Chemistry;;
823 geo*) type=Geology;; 872 geo*) type=Geology;;
824 math*) type=Math;; 873 math*) type=Math;;
… …
844 local desktop_name="${PN}" 893 local desktop_name="${PN}"
845 else 894 else
846 local desktop_name="${PN}-${SLOT}" 895 local desktop_name="${PN}-${SLOT}"
847 fi 896 fi
848 local desktop=${T}/${exec%% *}-${desktop_name}.desktop 897 local desktop=${T}/${exec%% *}-${desktop_name}.desktop
898# local desktop=${T}/${exec%% *:-${desktop_name}}.desktop
849 899
850echo "[Desktop Entry] 900echo "[Desktop Entry]
851Encoding=UTF-8 901Encoding=UTF-8
852Version=0.9.2 902Version=0.9.2
853Name=${name} 903Name=${name}
854Type=Application 904Type=Application
855Comment=${DESCRIPTION} 905Comment=${DESCRIPTION}
856Exec=${exec} 906Exec=${exec}
907TryExec=${exec%% *}
857Path=${path} 908Path=${path}
858Icon=${icon} 909Icon=${icon}
859Categories=Application;${type};" > "${desktop}" 910Categories=Application;${type};" > "${desktop}"
860 911
912 (
913 # wrap the env here so that the 'insinto' call
914 # doesn't corrupt the env of the caller
861 insinto /usr/share/applications 915 insinto /usr/share/applications
862 doins "${desktop}" 916 doins "${desktop}"
863 917 )
864 return 0
865} 918}
866 919
867# Make a GDM/KDM Session file 920# Make a GDM/KDM Session file
868# 921#
869# make_desktop_entry(<title>, <command>) 922# make_desktop_entry(<title>, <command>)
… …
931############################################################## 984##############################################################
932 985
933 986
934# for internal use only (unpack_pdv and unpack_makeself) 987# for internal use only (unpack_pdv and unpack_makeself)
935find_unpackable_file() { 988find_unpackable_file() {
936 local src="$1" 989 local src=$1
937 if [ -z "${src}" ] 990 if [[ -z ${src} ]] ; then
938 then
939 src="${DISTDIR}/${A}" 991 src=${DISTDIR}/${A}
940 else 992 else
941 if [ -e "${DISTDIR}/${src}" ] 993 if [[ -e ${DISTDIR}/${src} ]] ; then
942 then
943 src="${DISTDIR}/${src}" 994 src=${DISTDIR}/${src}
944 elif [ -e "${PWD}/${src}" ] 995 elif [[ -e ${PWD}/${src} ]] ; then
945 then
946 src="${PWD}/${src}" 996 src=${PWD}/${src}
947 elif [ -e "${src}" ] 997 elif [[ -e ${src} ]] ; then
948 then
949 src="${src}" 998 src=${src}
950 fi
951 fi 999 fi
952 [ ! -e "${src}" ] && die "Could not find requested archive ${src}" 1000 fi
1001 [[ ! -e ${src} ]] && return 1
953 echo "${src}" 1002 echo "${src}"
954} 1003}
955 1004
956# Unpack those pesky pdv generated files ... 1005# Unpack those pesky pdv generated files ...
957# They're self-unpacking programs with the binary package stuffed in 1006# They're self-unpacking programs with the binary package stuffed in
… …
972# lseek 1021# lseek
973# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 1022# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
974# lseek(3, -4, SEEK_END) = 2981250 1023# lseek(3, -4, SEEK_END) = 2981250
975# thus we would pass in the value of '4' as the second parameter. 1024# thus we would pass in the value of '4' as the second parameter.
976unpack_pdv() { 1025unpack_pdv() {
977 local src="`find_unpackable_file $1`" 1026 local src=$(find_unpackable_file $1)
978 local sizeoff_t="$2" 1027 local sizeoff_t=$2
979 1028
1029 [[ -z ${src} ]] && die "Could not locate source for '$1'"
980 [ -z "${sizeoff_t}" ] && die "No idea what off_t size was used for this pdv :(" 1030 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :("
981 1031
982 local shrtsrc="`basename ${src}`" 1032 local shrtsrc=$(basename "${src}")
983 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1033 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
984 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1034 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"`
985 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"` 1035 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"`
986 1036
987 # grab metadata for debug reasons 1037 # grab metadata for debug reasons
… …
1051# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1101# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1052# - If the file is not specified then unpack will utilize ${A}. 1102# - If the file is not specified then unpack will utilize ${A}.
1053# - If the offset is not specified then we will attempt to extract 1103# - If the offset is not specified then we will attempt to extract
1054# the proper offset from the script itself. 1104# the proper offset from the script itself.
1055unpack_makeself() { 1105unpack_makeself() {
1106 local src_input=${1:-${A}}
1056 local src="$(find_unpackable_file "$1")" 1107 local src=$(find_unpackable_file "${src_input}")
1057 local skip="$2" 1108 local skip=$2
1058 local exe="$3" 1109 local exe=$3
1059 1110
1111 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
1112
1060 local shrtsrc="$(basename "${src}")" 1113 local shrtsrc=$(basename "${src}")
1061 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1114 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1062 if [ -z "${skip}" ] 1115 if [[ -z ${skip} ]] ; then
1063 then
1064 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1116 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}')
1065 local skip=0 1117 local skip=0
1066 exe=tail 1118 exe=tail
1067 case ${ver} in 1119 case ${ver} in
1068 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same 1120 1.5.*|1.6.0-nv) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same
1069 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1121 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1070 ;; 1122 ;;
1071 2.0|2.0.1) 1123 2.0|2.0.1)
1072 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-) 1124 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-)
1073 ;; 1125 ;;
… …
1081 ;; 1133 ;;
1082 2.1.3) 1134 2.1.3)
1083 skip=`grep -a ^offset= "${src}" | awk '{print $3}'` 1135 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1084 let skip="skip + 1" 1136 let skip="skip + 1"
1085 ;; 1137 ;;
1086 2.1.4) 1138 2.1.4|2.1.5)
1087 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1) 1139 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1)
1088 skip=$(head -n ${skip} "${src}" | wc -c) 1140 skip=$(head -n ${skip} "${src}" | wc -c)
1089 exe="dd" 1141 exe="dd"
1090 ;; 1142 ;;
1091 *) 1143 *)
… …
1136check_license() { 1188check_license() {
1137 local lic=$1 1189 local lic=$1
1138 if [ -z "${lic}" ] ; then 1190 if [ -z "${lic}" ] ; then
1139 lic="${PORTDIR}/licenses/${LICENSE}" 1191 lic="${PORTDIR}/licenses/${LICENSE}"
1140 else 1192 else
1141 if [ -e "${PORTDIR}/licenses/${src}" ] ; then 1193 if [ -e "${PORTDIR}/licenses/${lic}" ] ; then
1142 lic="${PORTDIR}/licenses/${src}" 1194 lic="${PORTDIR}/licenses/${lic}"
1143 elif [ -e "${PWD}/${src}" ] ; then 1195 elif [ -e "${PWD}/${lic}" ] ; then
1144 lic="${PWD}/${src}" 1196 lic="${PWD}/${lic}"
1145 elif [ -e "${src}" ] ; then 1197 elif [ -e "${lic}" ] ; then
1146 lic="${src}" 1198 lic="${lic}"
1147 fi
1148 fi 1199 fi
1200 fi
1149 [ ! -f "${lic}" ] && die "Could not find requested license ${src}" 1201 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1150 local l="`basename ${lic}`" 1202 local l="`basename ${lic}`"
1151 1203
1152 # here is where we check for the licenses the user already 1204 # here is where we check for the licenses the user already
1153 # accepted ... if we don't find a match, we make the user accept 1205 # accepted ... if we don't find a match, we make the user accept
1154 local shopts=$- 1206 local shopts=$-
… …
1196# and when the function returns, you can assume that the cd has been 1248# and when the function returns, you can assume that the cd has been
1197# found at CDROM_ROOT. 1249# found at CDROM_ROOT.
1198# 1250#
1199# normally the cdrom functions will refer to the cds as 'cd #1', 'cd #2', 1251# normally the cdrom functions will refer to the cds as 'cd #1', 'cd #2',
1200# etc... if you want to give the cds better names, then just export 1252# etc... if you want to give the cds better names, then just export
1201# the CDROM_NAME_X variables before calling cdrom_get_cds(). 1253# the appropriate CDROM_NAME variable before calling cdrom_get_cds().
1254# - CDROM_NAME="fooie cd" - for when you only want 1 cd
1255# - CDROM_NAME_1="install cd" - for when you want more than 1 cd
1256# CDROM_NAME_2="data cd"
1257# - CDROM_NAME_SET=( "install cd" "data cd" ) - short hand for CDROM_NAME_#
1202# 1258#
1203# for those multi cd ebuilds, see the cdrom_load_next_cd() below. 1259# for those multi cd ebuilds, see the cdrom_load_next_cd() below.
1204# 1260#
1205# Usage: cdrom_get_cds <file on cd1> [file on cd2] [file on cd3] [...] 1261# Usage: cdrom_get_cds <file on cd1> [file on cd2] [file on cd3] [...]
1206# - this will attempt to locate a cd based upon a file that is on 1262# - this will attempt to locate a cd based upon a file that is on
… …
1210 # first we figure out how many cds we're dealing with by 1266 # first we figure out how many cds we're dealing with by
1211 # the # of files they gave us 1267 # the # of files they gave us
1212 local cdcnt=0 1268 local cdcnt=0
1213 local f= 1269 local f=
1214 for f in "$@" ; do 1270 for f in "$@" ; do
1215 cdcnt=$((cdcnt + 1)) 1271 ((++cdcnt))
1216 export CDROM_CHECK_${cdcnt}="$f" 1272 export CDROM_CHECK_${cdcnt}="$f"
1217 done 1273 done
1218 export CDROM_TOTAL_CDS=${cdcnt} 1274 export CDROM_TOTAL_CDS=${cdcnt}
1219 export CDROM_CURRENT_CD=1 1275 export CDROM_CURRENT_CD=1
1220 1276
1221 # now we see if the user gave use CD_ROOT ... 1277 # now we see if the user gave use CD_ROOT ...
1222 # if they did, let's just believe them that it's correct 1278 # if they did, let's just believe them that it's correct
1223 if [[ ! -z ${CD_ROOT} ]] ; then
1224 export CDROM_ROOT=${CD_ROOT}
1225 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1226 return
1227 fi
1228 # do the same for CD_ROOT_X
1229 if [[ ! -z ${CD_ROOT_1} ]] ; then 1279 if [[ -n ${CD_ROOT}${CD_ROOT_1} ]] ; then
1230 local var= 1280 local var=
1231 cdcnt=0 1281 cdcnt=0
1232 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1282 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1233 cdcnt=$((cdcnt + 1)) 1283 ((++cdcnt))
1234 var="CD_ROOT_${cdcnt}" 1284 var="CD_ROOT_${cdcnt}"
1285 [[ -z ${!var} ]] && var="CD_ROOT"
1235 if [[ -z ${!var} ]] ; then 1286 if [[ -z ${!var} ]] ; then
1236 eerror "You must either use just the CD_ROOT" 1287 eerror "You must either use just the CD_ROOT"
1237 eerror "or specify ALL the CD_ROOT_X variables." 1288 eerror "or specify ALL the CD_ROOT_X variables."
1238 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables." 1289 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables."
1239 die "could not locate CD_ROOT_${cdcnt}" 1290 die "could not locate CD_ROOT_${cdcnt}"
1240 fi 1291 fi
1241 export CDROM_ROOTS_${cdcnt}="${!var}"
1242 done 1292 done
1243 export CDROM_ROOT=${CDROM_ROOTS_1} 1293 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}}
1244 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1294 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1295 export CDROM_SET=-1
1296 for f in ${CDROM_CHECK_1//:/ } ; do
1297 ((++CDROM_SET))
1298 [[ -e ${CD_ROOT}/${f} ]] && break
1299 done
1300 export CDROM_MATCH=${f}
1245 return 1301 return
1246 fi 1302 fi
1247 1303
1304 # User didn't help us out so lets make sure they know they can
1305 # simplify the whole process ...
1248 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1306 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1249 einfon "This ebuild will need the " 1307 einfo "This ebuild will need the ${CDROM_NAME:-cdrom for ${PN}}"
1250 if [[ -z ${CDROM_NAME} ]] ; then
1251 echo "cdrom for ${PN}."
1252 else
1253 echo "${CDROM_NAME}."
1254 fi
1255 echo 1308 echo
1256 einfo "If you do not have the CD, but have the data files" 1309 einfo "If you do not have the CD, but have the data files"
1257 einfo "mounted somewhere on your filesystem, just export" 1310 einfo "mounted somewhere on your filesystem, just export"
1258 einfo "the variable CD_ROOT so that it points to the" 1311 einfo "the variable CD_ROOT so that it points to the"
1259 einfo "directory containing the files." 1312 einfo "directory containing the files."
1260 echo 1313 echo
1261 einfo "For example:" 1314 einfo "For example:"
1262 einfo "export CD_ROOT=/mnt/cdrom" 1315 einfo "export CD_ROOT=/mnt/cdrom"
1263 echo 1316 echo
1264 else 1317 else
1318 if [[ -n ${CDROM_NAME_SET} ]] ; then
1319 # Translate the CDROM_NAME_SET array into CDROM_NAME_#
1320 cdcnt=0
1321 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1322 ((++cdcnt))
1323 export CDROM_NAME_${cdcnt}="${CDROM_NAME_SET[$((${cdcnt}-1))]}"
1324 done
1325 fi
1326
1265 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1327 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1266 cdcnt=0 1328 cdcnt=0
1267 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1329 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1268 cdcnt=$((cdcnt + 1)) 1330 ((++cdcnt))
1269 var="CDROM_NAME_${cdcnt}" 1331 var="CDROM_NAME_${cdcnt}"
1270 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}" 1332 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}"
1271 done 1333 done
1272 echo 1334 echo
1273 einfo "If you do not have the CDs, but have the data files" 1335 einfo "If you do not have the CDs, but have the data files"
1274 einfo "mounted somewhere on your filesystem, just export" 1336 einfo "mounted somewhere on your filesystem, just export"
1275 einfo "the following variables so they point to the right place:" 1337 einfo "the following variables so they point to the right place:"
1276 einfon "" 1338 einfon ""
1277 cdcnt=0 1339 cdcnt=0
1278 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1340 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1279 cdcnt=$((cdcnt + 1)) 1341 ((++cdcnt))
1280 echo -n " CD_ROOT_${cdcnt}" 1342 echo -n " CD_ROOT_${cdcnt}"
1281 done 1343 done
1282 echo 1344 echo
1283 einfo "Or, if you have all the files in the same place, or" 1345 einfo "Or, if you have all the files in the same place, or"
1284 einfo "you only have one cdrom, you can export CD_ROOT" 1346 einfo "you only have one cdrom, you can export CD_ROOT"
… …
1287 echo 1349 echo
1288 einfo "For example:" 1350 einfo "For example:"
1289 einfo "export CD_ROOT_1=/mnt/cdrom" 1351 einfo "export CD_ROOT_1=/mnt/cdrom"
1290 echo 1352 echo
1291 fi 1353 fi
1354
1355 export CDROM_SET=""
1292 export CDROM_CURRENT_CD=0 1356 export CDROM_CURRENT_CD=0
1293 cdrom_load_next_cd 1357 cdrom_load_next_cd
1294} 1358}
1295 1359
1296# this is only used when you need access to more than one cd. 1360# this is only used when you need access to more than one cd.
1297# when you have finished using the first cd, just call this function. 1361# when you have finished using the first cd, just call this function.
1298# when it returns, CDROM_ROOT will be pointing to the second cd. 1362# when it returns, CDROM_ROOT will be pointing to the second cd.
1299# remember, you can only go forward in the cd chain, you can't go back. 1363# remember, you can only go forward in the cd chain, you can't go back.
1300cdrom_load_next_cd() { 1364cdrom_load_next_cd() {
1301 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1302 local var= 1365 local var
1303 1366 ((++CDROM_CURRENT_CD))
1304 if [[ ! -z ${CD_ROOT} ]] ; then
1305 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}"
1306 return
1307 fi
1308 1367
1309 unset CDROM_ROOT 1368 unset CDROM_ROOT
1310 var=CDROM_ROOTS_${CDROM_CURRENT_CD} 1369 var=CD_ROOT_${CDROM_CURRENT_CD}
1370 [[ -z ${!var} ]] && var="CD_ROOT"
1311 if [[ -z ${!var} ]] ; then 1371 if [[ -z ${!var} ]] ; then
1312 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1372 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1313 cdrom_locate_file_on_cd ${!var} 1373 _cdrom_locate_file_on_cd ${!var}
1314 else 1374 else
1315 export CDROM_ROOT=${!var} 1375 export CDROM_ROOT=${!var}
1316 fi 1376 fi
1317 1377
1318 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1378 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
… …
1323# all it does is try to locate a give file on a cd ... if the cd isn't 1383# all it does is try to locate a give file on a cd ... if the cd isn't
1324# found, then a message asking for the user to insert the cdrom will be 1384# found, then a message asking for the user to insert the cdrom will be
1325# displayed and we'll hang out here until: 1385# displayed and we'll hang out here until:
1326# (1) the file is found on a mounted cdrom 1386# (1) the file is found on a mounted cdrom
1327# (2) the user hits CTRL+C 1387# (2) the user hits CTRL+C
1328cdrom_locate_file_on_cd() { 1388_cdrom_locate_file_on_cd() {
1389 local mline=""
1390 local showedmsg=0
1391
1329 while [[ -z ${CDROM_ROOT} ]] ; do 1392 while [[ -z ${CDROM_ROOT} ]] ; do
1330 local dir=$(dirname "$*") 1393 local i=0
1394 local -a cdset=(${*//:/ })
1395 if [[ -n ${CDROM_SET} ]] ; then
1396 cdset=(${cdset[${CDROM_SET}]})
1397 fi
1398
1399 while [[ -n ${cdset[${i}]} ]] ; do
1400 local dir=$(dirname ${cdset[${i}]})
1331 local file=$(basename "$*") 1401 local file=$(basename ${cdset[${i}]})
1332 local mline=""
1333 local showedmsg=0
1334 1402
1335 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do 1403 for mline in $(mount | gawk '/(iso|cdrom|fs=cdfss)/ {print $3}') ; do
1336 [[ -d ${mline}/${dir} ]] || continue 1404 [[ -d ${mline}/${dir} ]] || continue
1337 [[ ! -z $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] \ 1405 if [[ -n $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] ; then
1338 && export CDROM_ROOT=${mline} 1406 export CDROM_ROOT=${mline}
1407 export CDROM_SET=${i}
1408 export CDROM_MATCH=${cdset[${i}]}
1409 return
1410 fi
1411 done
1412
1413 ((++i))
1339 done 1414 done
1340 1415
1341 if [[ -z ${CDROM_ROOT} ]] ; then
1342 echo 1416 echo
1343 if [[ ${showedmsg} -eq 0 ]] ; then 1417 if [[ ${showedmsg} -eq 0 ]] ; then
1344 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1418 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1345 if [[ -z ${CDROM_NAME} ]] ; then 1419 if [[ -z ${CDROM_NAME} ]] ; then
1346 einfo "Please insert the cdrom for ${PN} now !" 1420 einfo "Please insert+mount the cdrom for ${PN} now !"
1347 else
1348 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1349 fi
1350 else 1421 else
1351 if [[ -z ${CDROM_NAME_1} ]] ; then
1352 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !"
1353 else
1354 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1355 einfo "Please insert+mount the ${!var} cdrom now !" 1422 einfo "Please insert+mount the ${CDROM_NAME} cdrom now !"
1356 fi
1357 fi 1423 fi
1358 showedmsg=1 1424 else
1425 if [[ -z ${CDROM_NAME_1} ]] ; then
1426 einfo "Please insert+mount cd #${CDROM_CURRENT_CD} for ${PN} now !"
1427 else
1428 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1429 einfo "Please insert+mount the ${!var} cdrom now !"
1430 fi
1359 fi 1431 fi
1432 showedmsg=1
1433 fi
1360 einfo "Press return to scan for the cd again" 1434 einfo "Press return to scan for the cd again"
1361 einfo "or hit CTRL+C to abort the emerge." 1435 einfo "or hit CTRL+C to abort the emerge."
1362 echo 1436 echo
1363 einfo "If you are having trouble with the detection" 1437 einfo "If you are having trouble with the detection"
1364 einfo "of your CD, it is possible that you do not have" 1438 einfo "of your CD, it is possible that you do not have"
1365 einfo "Joliet support enabled in your kernel. Please" 1439 einfo "Joliet support enabled in your kernel. Please"
1366 einfo "check that CONFIG_JOLIET is enabled in your kernel." 1440 einfo "check that CONFIG_JOLIET is enabled in your kernel."
1367 read 1441 read || die "something is screwed with your system"
1368 fi
1369 done 1442 done
1370} 1443}
1371 1444
1372# Make sure that LINGUAS only contains languages that 1445# Make sure that LINGUAS only contains languages that
1373# a package can support 1446# a package can support
… …
1380# The -i builds a list of po files found in all the 1453# The -i builds a list of po files found in all the
1381# directories and uses the intersection of the lists. 1454# directories and uses the intersection of the lists.
1382# The -u builds a list of po files found in all the 1455# The -u builds a list of po files found in all the
1383# directories and uses the union of the lists. 1456# directories and uses the union of the lists.
1384strip-linguas() { 1457strip-linguas() {
1385 local ls newls 1458 local ls newls nols
1386 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then 1459 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1387 local op=$1; shift 1460 local op=$1; shift
1388 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1461 ls=$(find "$1" -name '*.po' -exec basename {} .po \;); shift
1389 local d f 1462 local d f
1390 for d in "$@" ; do 1463 for d in "$@" ; do
1391 if [[ ${op} == "-u" ]] ; then 1464 if [[ ${op} == "-u" ]] ; then
1392 newls=${ls} 1465 newls=${ls}
1393 else 1466 else
1394 newls="" 1467 newls=""
1395 fi 1468 fi
1396 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1469 for f in $(find "$d" -name '*.po' -exec basename {} .po \;) ; do
1397 if [[ ${op} == "-i" ]] ; then 1470 if [[ ${op} == "-i" ]] ; then
1398 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}" 1471 hasq ${f} ${ls} && newls="${newls} ${f}"
1399 else 1472 else
1400 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}" 1473 hasq ${f} ${ls} || newls="${newls} ${f}"
1401 fi 1474 fi
1402 done 1475 done
1403 ls=${newls} 1476 ls=${newls}
1404 done 1477 done
1405 ls=${ls//.po}
1406 else 1478 else
1407 ls=$@ 1479 ls="$@"
1408 fi 1480 fi
1409 1481
1410 ls=" ${ls} " 1482 nols=""
1411 newls="" 1483 newls=""
1412 for f in ${LINGUAS} ; do 1484 for f in ${LINGUAS} ; do
1413 if [[ ${ls/ ${f} /} != ${ls} ]] ; then 1485 if hasq ${f} ${ls} ; then
1414 newls="${newls} ${f}" 1486 newls="${newls} ${f}"
1415 else 1487 else
1416 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1488 nols="${nols} ${f}"
1417 fi 1489 fi
1418 done 1490 done
1419 if [[ -z ${newls} ]] ; then 1491 [[ -n ${nols} ]] \
1420 export LINGUAS="" 1492 && ewarn "Sorry, but ${PN} does not support the LINGUAs:" ${nols}
1421 else
1422 export LINGUAS=${newls:1} 1493 export LINGUAS=${newls:1}
1423 fi
1424} 1494}
1425 1495
1426# moved from kernel.eclass since they are generally useful outside of 1496# moved from kernel.eclass since they are generally useful outside of
1427# kernel.eclass -iggy (20041002) 1497# kernel.eclass -iggy (20041002)
1428 1498
… …
1457 1527
1458# Jeremy Huddleston <eradicator@gentoo.org>: 1528# Jeremy Huddleston <eradicator@gentoo.org>:
1459# preserve_old_lib /path/to/libblah.so.0 1529# preserve_old_lib /path/to/libblah.so.0
1460# preserve_old_lib_notify /path/to/libblah.so.0 1530# preserve_old_lib_notify /path/to/libblah.so.0
1461# 1531#
1462# These functions are useful when a lib in your package changes --soname. Such 1532# These functions are useful when a lib in your package changes --library. Such
1463# an example might be from libogg.so.0 to libogg.so.1. Removing libogg.so.0 1533# an example might be from libogg.so.0 to libogg.so.1. Removing libogg.so.0
1464# would break packages that link against it. Most people get around this 1534# would break packages that link against it. Most people get around this
1465# by using the portage SLOT mechanism, but that is not always a relevant 1535# by using the portage SLOT mechanism, but that is not always a relevant
1466# solution, so instead you can add the following to your ebuilds: 1536# solution, so instead you can add the following to your ebuilds:
1467# 1537#
… …
1498 1568
1499 ewarn "An old version of an installed library was detected on your system." 1569 ewarn "An old version of an installed library was detected on your system."
1500 ewarn "In order to avoid breaking packages that link against it, this older version" 1570 ewarn "In order to avoid breaking packages that link against it, this older version"
1501 ewarn "is not being removed. In order to make full use of this newer version," 1571 ewarn "is not being removed. In order to make full use of this newer version,"
1502 ewarn "you will need to execute the following command:" 1572 ewarn "you will need to execute the following command:"
1503 ewarn " revdep-rebuild --soname ${SONAME}" 1573 ewarn " revdep-rebuild --library ${SONAME}"
1504 ewarn 1574 ewarn
1505 ewarn "After doing that, you can safely remove ${LIB}" 1575 ewarn "After doing that, you can safely remove ${LIB}"
1506 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild" 1576 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1507 fi 1577 fi
1508} 1578}
… …
1519built_with_use() { 1589built_with_use() {
1520 local opt=$1 1590 local opt=$1
1521 [[ ${opt:0:1} = "-" ]] && shift || opt="-a" 1591 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1522 1592
1523 local PKG=$(best_version $1) 1593 local PKG=$(best_version $1)
1594 [[ -z ${PKG} ]] && die "Unable to resolve $1 to an installed package"
1524 shift 1595 shift
1525 1596
1526 local USEFILE="${ROOT}/var/db/pkg/${PKG}/USE" 1597 local USEFILE=${ROOT}/var/db/pkg/${PKG}/USE
1527 [[ ! -e ${USEFILE} ]] && return 1 1598 local IUSEFILE=${ROOT}/var/db/pkg/${PKG}/IUSE
1599
1600 # if the USE file doesnt exist, assume the $PKG is either
1601 # injected or package.provided
1602 [[ ! -e ${USEFILE} ]] && die "Unable to determine what USE flags $PKG was built with"
1603
1604 local IUSE_BUILT=$(<${IUSEFILE})
1605 # Don't check USE_EXPAND #147237
1606 local expand
1607 for expand in $(echo ${USE_EXPAND} | tr '[:upper:]' '[:lower:]') ; do
1608 if [[ $1 == ${expand}_* ]] ; then
1609 expand=""
1610 break
1611 fi
1612 done
1613 if [[ -n ${expand} ]] ; then
1614 has $1 ${IUSE_BUILT} || die "$PKG does not actually support the $1 USE flag!"
1615 fi
1528 1616
1529 local USE_BUILT=$(<${USEFILE}) 1617 local USE_BUILT=$(<${USEFILE})
1530 while [[ $# -gt 0 ]] ; do 1618 while [[ $# -gt 0 ]] ; do
1531 if [[ ${opt} = "-o" ]] ; then 1619 if [[ ${opt} = "-o" ]] ; then
1532 has $1 ${USE_BUILT} && return 0 1620 has $1 ${USE_BUILT} && return 0
… …
1584# $4 == extra LD_LIBRARY_PATH's (make it : delimited) 1672# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1585# $5 == path for wrapper 1673# $5 == path for wrapper
1586make_wrapper() { 1674make_wrapper() {
1587 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5 1675 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1588 local tmpwrapper=$(emktemp) 1676 local tmpwrapper=$(emktemp)
1677 # We don't want to quote ${bin} so that people can pass complex
1678 # things as $bin ... "./someprog --args"
1589 cat << EOF > "${tmpwrapper}" 1679 cat << EOF > "${tmpwrapper}"
1590#!/bin/sh 1680#!/bin/sh
1591cd "${chdir}" 1681cd "${chdir:-.}"
1682if [ -n "${libdir}" ] ; then
1683 if [ "\${LD_LIBRARY_PATH+set}" = "set" ] ; then
1592export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}" 1684 export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1685 else
1686 export LD_LIBRARY_PATH="${libdir}"
1687 fi
1688fi
1593exec ${bin} "\$@" 1689exec ${bin} "\$@"
1594EOF 1690EOF
1595 chmod go+rx "${tmpwrapper}" 1691 chmod go+rx "${tmpwrapper}"
1596 if [ -n "${5}" ] 1692 if [[ -n ${path} ]] ; then
1597 then
1598 exeinto ${5} 1693 exeinto "${path}"
1599 newexe "${tmpwrapper}" "${wrapper}" 1694 newexe "${tmpwrapper}" "${wrapper}"
1600 else 1695 else
1601 newbin "${tmpwrapper}" "${wrapper}" 1696 newbin "${tmpwrapper}" "${wrapper}"
1602 fi 1697 fi
1603} 1698}
Legend:
Removed from v.1.193  
changed lines
  Added in v.1.252
  ViewVC Help
Powered by ViewVC 1.1.13