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

Diff of /eclass/eutils.eclass

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

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

Legend:
Removed from v.1.188  
changed lines
  Added in v.1.248

  ViewVC Help
Powered by ViewVC 1.1.20