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

Diff of /eclass/eutils.eclass

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

Revision 1.179 Revision 1.233
1# Copyright 1999-2005 Gentoo Foundation 1# Copyright 1999-2005 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.179 2005/05/28 05:50:29 vapier Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.233 2006/04/19 03:53:19 vapier Exp $
4# 4#
5# Author: Martin Schlemmer <azarah@gentoo.org> 5# Author: Martin Schlemmer <azarah@gentoo.org>
6# 6#
7# This eclass is for general purpose functions that most ebuilds 7# This eclass is for general purpose functions that most ebuilds
8# have to implement themselves. 8# have to implement themselves.
9# 9#
10# NB: If you add anything, please comment it! 10# NB: If you add anything, please comment it!
11 11
12inherit multilib 12inherit multilib portability
13ECLASS=eutils
14INHERITED="$INHERITED $ECLASS"
15 13
16DEPEND="!bootstrap? ( sys-devel/patch )" 14DEPEND="!bootstrap? ( sys-devel/patch )"
15RDEPEND=""
16# sys-apps/shadow is needed for useradd, etc, bug #94745.
17 17
18DESCRIPTION="Based on the ${ECLASS} eclass" 18DESCRIPTION="Based on the ${ECLASS} eclass"
19 19
20# Wait for the supplied number of seconds. If no argument is supplied, defaults 20# Wait for the supplied number of seconds. If no argument is supplied, defaults
21# to five seconds. If the EPAUSE_IGNORE env var is set, don't wait. If we're not 21# to five seconds. If the EPAUSE_IGNORE env var is set, don't wait. If we're not
61# to point to the latest version of the library present. 61# to point to the latest version of the library present.
62# 62#
63# <azarah@gentoo.org> (26 Oct 2002) 63# <azarah@gentoo.org> (26 Oct 2002)
64# 64#
65gen_usr_ldscript() { 65gen_usr_ldscript() {
66 local libdir="$(get_libdir)" 66 local lib libdir=$(get_libdir)
67 # Just make sure it exists 67 # Just make sure it exists
68 dodir /usr/${libdir} 68 dodir /usr/${libdir}
69 69
70 for lib in "${@}" ; do 70 for lib in "${@}" ; do
71 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT 71 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT
72 /* GNU ld script 72 /* GNU ld script
73 Since Gentoo has critical dynamic libraries 73 Since Gentoo has critical dynamic libraries
74 in /lib, and the static versions in /usr/lib, 74 in /lib, and the static versions in /usr/lib,
75 we need to have a "fake" dynamic lib in /usr/lib, 75 we need to have a "fake" dynamic lib in /usr/lib,
76 otherwise we run into linking problems. 76 otherwise we run into linking problems.
77 77
78 See bug http://bugs.gentoo.org/4411 for more info. 78 See bug http://bugs.gentoo.org/4411 for more info.
79 */ 79 */
80 GROUP ( /${libdir}/${lib} ) 80 GROUP ( /${libdir}/${lib} )
81 END_LDSCRIPT 81 END_LDSCRIPT
82 fperms a+x "/usr/${libdir}/${lib}" 82 fperms a+x "/usr/${libdir}/${lib}" || die "could not change perms on ${lib}"
83 done 83 done
84} 84}
85 85
86# Simple function to draw a line consisting of '=' the same length as $*
87# - only to be used by epatch()
88#
89# <azarah@gentoo.org> (11 Nov 2002)
90#
91draw_line() {
92 local i=0
93 local str_length=""
94
95 # Handle calls that do not have args, or wc not being installed ...
96 if [ -z "$1" -o ! -x "$(which wc 2>/dev/null)" ]
97 then
98 echo "==============================================================="
99 return 0
100 fi
101
102 # Get the length of $*
103 str_length="$(echo -n "$*" | wc -m)"
104
105 while [ "$i" -lt "${str_length}" ]
106 do
107 echo -n "="
108
109 i=$((i + 1))
110 done
111
112 echo
113
114 return 0
115}
116 86
117# Default directory where patches are located 87# Default directory where patches are located
118EPATCH_SOURCE="${WORKDIR}/patch" 88EPATCH_SOURCE="${WORKDIR}/patch"
119# Default extension for patches 89# Default extension for patches
120EPATCH_SUFFIX="patch.bz2" 90EPATCH_SUFFIX="patch.bz2"
121# Default options for patch 91# Default options for patch
122# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571 92# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571
123# Set --no-backup-if-mismatch so we don't leave '.orig' files behind. 93# Set --no-backup-if-mismatch so we don't leave '.orig' files behind.
94# Set -E to automatically remove empty files.
124EPATCH_OPTS="-g0 --no-backup-if-mismatch" 95EPATCH_OPTS="-g0 -E --no-backup-if-mismatch"
125# List of patches not to apply. Not this is only file names, 96# List of patches not to apply. Not this is only file names,
126# and not the full path .. 97# and not the full path ..
127EPATCH_EXCLUDE="" 98EPATCH_EXCLUDE=""
128# Change the printed message for a single patch. 99# Change the printed message for a single patch.
129EPATCH_SINGLE_MSG="" 100EPATCH_SINGLE_MSG=""
167# hand its a directory, it will set EPATCH_SOURCE to this. 138# hand its a directory, it will set EPATCH_SOURCE to this.
168# 139#
169# <azarah@gentoo.org> (10 Nov 2002) 140# <azarah@gentoo.org> (10 Nov 2002)
170# 141#
171epatch() { 142epatch() {
143 _epatch_draw_line() {
144 [[ -z $1 ]] && set "$(printf "%65s" '')"
145 echo "${1//?/=}"
146 }
147 _epatch_assert() { local _pipestatus=${PIPESTATUS[*]}; [[ ${_pipestatus// /} -eq 0 ]] ; }
172 local PIPE_CMD="" 148 local PIPE_CMD=""
173 local STDERR_TARGET="${T}/$$.out" 149 local STDERR_TARGET="${T}/$$.out"
174 local PATCH_TARGET="${T}/$$.patch" 150 local PATCH_TARGET="${T}/$$.patch"
175 local PATCH_SUFFIX="" 151 local PATCH_SUFFIX=""
176 local SINGLE_PATCH="no" 152 local SINGLE_PATCH="no"
177 local x="" 153 local x=""
154
155 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402
178 156
179 if [ "$#" -gt 1 ] 157 if [ "$#" -gt 1 ]
180 then 158 then
181 local m="" 159 local m=""
182 for m in "$@" ; do 160 for m in "$@" ; do
283 261
284 # Allow for prefix to differ ... im lazy, so shoot me :/ 262 # Allow for prefix to differ ... im lazy, so shoot me :/
285 while [ "${count}" -lt 5 ] 263 while [ "${count}" -lt 5 ]
286 do 264 do
287 # Generate some useful debug info ... 265 # Generate some useful debug info ...
288 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 266 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
289 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 267 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
290 268
291 if [ "${PATCH_SUFFIX}" != "patch" ] 269 if [ "${PATCH_SUFFIX}" != "patch" ]
292 then 270 then
293 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 271 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
298 276
299 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 277 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
300 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 278 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
301 279
302 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 280 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
303 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 281 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
304 282
305 if [ "${PATCH_SUFFIX}" != "patch" ] 283 if [ "${PATCH_SUFFIX}" != "patch" ]
306 then 284 then
307 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1 285 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
308 then 286 then
312 count=5 290 count=5
313 break 291 break
314 fi 292 fi
315 fi 293 fi
316 294
317 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1 295 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f ; _epatch_assert) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
318 then 296 then
319 draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 297 _epatch_draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
320 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 298 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
321 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 299 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
322 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 300 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
323 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 301 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
324 302
325 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1 303 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1
304 _epatch_assert
326 305
327 if [ "$?" -ne 0 ] 306 if [ "$?" -ne 0 ]
328 then 307 then
329 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 308 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
330 echo 309 echo
376# vapier@gentoo.org 355# vapier@gentoo.org
377# 356#
378# Takes just 1 optional parameter (the directory to create tmpfile in) 357# Takes just 1 optional parameter (the directory to create tmpfile in)
379emktemp() { 358emktemp() {
380 local exe="touch" 359 local exe="touch"
381 [ "$1" == "-d" ] && exe="mkdir" && shift 360 [[ $1 == -d ]] && exe="mkdir" && shift
382 local topdir="$1" 361 local topdir=$1
383 362
384 if [ -z "${topdir}" ] 363 if [[ -z ${topdir} ]] ; then
385 then
386 [ -z "${T}" ] \ 364 [[ -z ${T} ]] \
387 && topdir="/tmp" \ 365 && topdir="/tmp" \
388 || topdir="${T}" 366 || topdir=${T}
389 fi 367 fi
390 368
391 if [ -z "$(type -p mktemp)" ] 369 if [[ -z $(type -p mktemp) ]] ; then
392 then
393 local tmp=/ 370 local tmp=/
394 while [ -e "${tmp}" ] ; do 371 while [[ -e ${tmp} ]] ; do
395 tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}" 372 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}
396 done 373 done
397 ${exe} "${tmp}" 374 ${exe} "${tmp}" || ${exe} -p "${tmp}"
398 echo "${tmp}" 375 echo "${tmp}"
399 else 376 else
400 [ "${exe}" == "touch" ] \ 377 if [[ ${exe} == "touch" ]] ; then
401 && exe="-p" \ 378 [[ ${USERLAND} == "GNU" ]] \
402 || exe="-d" 379 && mktemp -p "${topdir}" \
403 mktemp ${exe} "${topdir}" 380 || TMPDIR="${topdir}" mktemp -t tmp
381 else
382 [[ ${USERLAND} == "GNU" ]] \
383 && mktemp -d "${topdir}" \
384 || TMPDIR="${topdir}" mktemp -dt tmp
385 fi
404 fi 386 fi
405} 387}
406 388
407# Small wrapper for getent (Linux), nidump (Mac OS X), 389# Small wrapper for getent (Linux), nidump (Mac OS X),
408# and pw (FreeBSD) used in enewuser()/enewgroup() 390# and pw (FreeBSD) used in enewuser()/enewgroup()
409# Joe Jezak <josejx@gmail.com> and usata@gentoo.org 391# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
410# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org> 392# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
411# 393#
412# egetent(database, key) 394# egetent(database, key)
413egetent() { 395egetent() {
414 if [[ "${USERLAND}" == "Darwin" ]] ; then 396 case ${CHOST} in
397 *-darwin*)
415 case "$2" in 398 case "$2" in
416 *[!0-9]*) # Non numeric 399 *[!0-9]*) # Non numeric
417 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 400 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
418 ;; 401 ;;
419 *) # Numeric 402 *) # Numeric
420 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 403 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
421 ;; 404 ;;
422 esac 405 esac
423 elif [[ "${USERLAND}" == "BSD" ]] ; then 406 ;;
424 local action 407 *-freebsd*|*-dragonfly*)
425 if [ "$1" == "passwd" ] 408 local opts action="user"
426 then 409 [[ $1 == "passwd" ]] || action="group"
427 action="user" 410
428 else 411 # lookup by uid/gid
429 action="group" 412 if [[ $2 == [[:digit:]]* ]] ; then
413 [[ ${action} == "user" ]] && opts="-u" || opts="-g"
430 fi 414 fi
415
431 pw show "${action}" "$2" -q 416 pw show ${action} ${opts} "$2" -q
432 else 417 ;;
418 *-netbsd*|*-openbsd*)
419 grep "$2:\*:" /etc/$1
420 ;;
421 *)
433 which nscd >& /dev/null && nscd -i "$1" 422 type -p nscd >& /dev/null && nscd -i "$1"
434 getent "$1" "$2" 423 getent "$1" "$2"
435 fi 424 ;;
425 esac
436} 426}
437 427
438# Simplify/standardize adding users to the system 428# Simplify/standardize adding users to the system
439# vapier@gentoo.org 429# vapier@gentoo.org
440# 430#
447# shell: /bin/false 437# shell: /bin/false
448# homedir: /dev/null 438# homedir: /dev/null
449# groups: none 439# groups: none
450# extra: comment of 'added by portage for ${PN}' 440# extra: comment of 'added by portage for ${PN}'
451enewuser() { 441enewuser() {
442 case ${EBUILD_PHASE} in
443 unpack|compile|test|install)
444 eerror "'enewuser()' called from '${EBUILD_PHASE}()' which is not a pkg_* function."
445 eerror "Package fails at QA and at life. Please file a bug."
446 die "Bad package! enewuser is only for use in pkg_* functions!"
447 esac
448
452 # get the username 449 # get the username
453 local euser="$1"; shift 450 local euser=$1; shift
454 if [ -z "${euser}" ] 451 if [[ -z ${euser} ]] ; then
455 then
456 eerror "No username specified !" 452 eerror "No username specified !"
457 die "Cannot call enewuser without a username" 453 die "Cannot call enewuser without a username"
458 fi 454 fi
459 455
460 # lets see if the username already exists 456 # lets see if the username already exists
461 if [ "${euser}" == "`egetent passwd \"${euser}\" | cut -d: -f1`" ] 457 if [[ ${euser} == $(egetent passwd "${euser}" | cut -d: -f1) ]] ; then
462 then
463 return 0 458 return 0
464 fi 459 fi
465 einfo "Adding user '${euser}' to your system ..." 460 einfo "Adding user '${euser}' to your system ..."
466 461
467 # options to pass to useradd 462 # options to pass to useradd
468 local opts= 463 local opts=
469 464
470 # handle uid 465 # handle uid
471 local euid="$1"; shift 466 local euid=$1; shift
472 if [ ! -z "${euid}" ] && [ "${euid}" != "-1" ] 467 if [[ ! -z ${euid} ]] && [[ ${euid} != "-1" ]] ; then
473 then
474 if [ "${euid}" -gt 0 ] 468 if [[ ${euid} -gt 0 ]] ; then
475 then
476 if [ ! -z "`egetent passwd ${euid}`" ] 469 if [[ ! -z $(egetent passwd ${euid}) ]] ; then
477 then
478 euid="next" 470 euid="next"
479 fi 471 fi
480 else 472 else
481 eerror "Userid given but is not greater than 0 !" 473 eerror "Userid given but is not greater than 0 !"
482 die "${euid} is not a valid UID" 474 die "${euid} is not a valid UID"
483 fi 475 fi
484 else 476 else
485 euid="next" 477 euid="next"
486 fi 478 fi
487 if [ "${euid}" == "next" ] 479 if [[ ${euid} == "next" ]] ; then
488 then 480 for euid in $(seq 101 999) ; do
489 local pwrange
490 if [ "${USERLAND}" == "BSD" ] ; then
491 pwrange="`jot 898 101`"
492 else
493 pwrange="`seq 101 999`"
494 fi
495 for euid in ${pwrange} ; do
496 [ -z "`egetent passwd ${euid}`" ] && break 481 [[ -z $(egetent passwd ${euid}) ]] && break
497 done 482 done
498 fi 483 fi
499 opts="${opts} -u ${euid}" 484 opts="${opts} -u ${euid}"
500 einfo " - Userid: ${euid}" 485 einfo " - Userid: ${euid}"
501 486
502 # handle shell 487 # handle shell
503 local eshell="$1"; shift 488 local eshell=$1; shift
504 if [ ! -z "${eshell}" ] && [ "${eshell}" != "-1" ] 489 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
505 then 490 if [[ ! -e ${ROOT}${eshell} ]] ; then
506 if [ ! -e "${eshell}" ]
507 then
508 eerror "A shell was specified but it does not exist !" 491 eerror "A shell was specified but it does not exist !"
509 die "${eshell} does not exist" 492 die "${eshell} does not exist in ${ROOT}"
510 fi 493 fi
511 else 494 if [[ ${eshell} == */false || ${eshell} == */nologin ]] ; then
512 if [[ "${USERLAND}" == "Darwin" ]]; then 495 eerror "Do not specify ${eshell} yourself, use -1"
513 eshell="/usr/bin/false" 496 die "Pass '-1' as the shell parameter"
514 elif [[ "${USERLAND}" == "BSD" ]]; then 497 fi
515 eshell="/usr/sbin/nologin"
516 else 498 else
517 eshell="/bin/false" 499 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do
500 [[ -x ${ROOT}${shell} ]] && break
501 done
502
503 if [[ ${shell} == "/dev/null" ]] ; then
504 eerror "Unable to identify the shell to use"
505 die "Unable to identify the shell to use"
518 fi 506 fi
507
508 eshell=${shell}
519 fi 509 fi
520 einfo " - Shell: ${eshell}" 510 einfo " - Shell: ${eshell}"
521 opts="${opts} -s ${eshell}" 511 opts="${opts} -s ${eshell}"
522 512
523 # handle homedir 513 # handle homedir
524 local ehome="$1"; shift 514 local ehome=$1; shift
525 if [ -z "${ehome}" ] || [ "${eshell}" == "-1" ] 515 if [[ -z ${ehome} ]] || [[ ${ehome} == "-1" ]] ; then
526 then
527 ehome="/dev/null" 516 ehome="/dev/null"
528 fi 517 fi
529 einfo " - Home: ${ehome}" 518 einfo " - Home: ${ehome}"
530 opts="${opts} -d ${ehome}" 519 opts="${opts} -d ${ehome}"
531 520
532 # handle groups 521 # handle groups
533 local egroups="$1"; shift 522 local egroups=$1; shift
534 if [ ! -z "${egroups}" ] 523 if [[ ! -z ${egroups} ]] ; then
535 then
536 local oldifs="${IFS}" 524 local oldifs=${IFS}
537 local defgroup="" exgroups="" 525 local defgroup="" exgroups=""
538 526
539 export IFS="," 527 export IFS=","
540 for g in ${egroups} 528 for g in ${egroups} ; do
541 do
542 export IFS="${oldifs}" 529 export IFS=${oldifs}
543 if [ -z "`egetent group \"${g}\"`" ] 530 if [[ -z $(egetent group "${g}") ]] ; then
544 then
545 eerror "You must add group ${g} to the system first" 531 eerror "You must add group ${g} to the system first"
546 die "${g} is not a valid GID" 532 die "${g} is not a valid GID"
547 fi 533 fi
548 if [ -z "${defgroup}" ] 534 if [[ -z ${defgroup} ]] ; then
549 then
550 defgroup="${g}" 535 defgroup=${g}
551 else 536 else
552 exgroups="${exgroups},${g}" 537 exgroups="${exgroups},${g}"
553 fi 538 fi
554 export IFS="," 539 export IFS=","
555 done 540 done
556 export IFS="${oldifs}" 541 export IFS=${oldifs}
557 542
558 opts="${opts} -g ${defgroup}" 543 opts="${opts} -g ${defgroup}"
559 if [ ! -z "${exgroups}" ] 544 if [[ ! -z ${exgroups} ]] ; then
560 then
561 opts="${opts} -G ${exgroups:1}" 545 opts="${opts} -G ${exgroups:1}"
562 fi 546 fi
563 else 547 else
564 egroups="(none)" 548 egroups="(none)"
565 fi 549 fi
566 einfo " - Groups: ${egroups}" 550 einfo " - Groups: ${egroups}"
567 551
568 # handle extra and add the user 552 # handle extra and add the user
569 local eextra="$@"
570 local oldsandbox="${SANDBOX_ON}" 553 local oldsandbox=${SANDBOX_ON}
571 export SANDBOX_ON="0" 554 export SANDBOX_ON="0"
572 if [[ "${USERLAND}" == "Darwin" ]] 555 case ${CHOST} in
573 then 556 *-darwin*)
574 ### Make the user 557 ### Make the user
575 if [ -z "${eextra}" ] 558 if [[ -z $@ ]] ; then
576 then
577 dscl . create /users/${euser} uid ${euid} 559 dscl . create /users/${euser} uid ${euid}
578 dscl . create /users/${euser} shell ${eshell} 560 dscl . create /users/${euser} shell ${eshell}
579 dscl . create /users/${euser} home ${ehome} 561 dscl . create /users/${euser} home ${ehome}
580 dscl . create /users/${euser} realname "added by portage for ${PN}" 562 dscl . create /users/${euser} realname "added by portage for ${PN}"
581 ### Add the user to the groups specified 563 ### Add the user to the groups specified
582 local oldifs="${IFS}" 564 local oldifs=${IFS}
583 export IFS="," 565 export IFS=","
584 for g in ${egroups} 566 for g in ${egroups} ; do
585 do
586 dscl . merge /groups/${g} users ${euser} 567 dscl . merge /groups/${g} users ${euser}
587 done 568 done
588 export IFS="${oldifs}" 569 export IFS=${oldifs}
589 else 570 else
590 einfo "Extra options are not supported on macos yet" 571 einfo "Extra options are not supported on Darwin yet"
591 einfo "Please report the ebuild along with the info below" 572 einfo "Please report the ebuild along with the info below"
592 einfo "eextra: ${eextra}" 573 einfo "eextra: $@"
593 die "Required function missing" 574 die "Required function missing"
594 fi 575 fi
595 elif [[ "${USERLAND}" == "BSD" ]] ; then 576 ;;
596 if [ -z "${eextra}" ] 577 *-freebsd*|*-dragonfly*)
597 then 578 if [[ -z $@ ]] ; then
598 pw useradd ${euser} ${opts} \ 579 pw useradd ${euser} ${opts} \
599 -c "added by portage for ${PN}" \ 580 -c "added by portage for ${PN}" \
600 die "enewuser failed" 581 die "enewuser failed"
601 else 582 else
602 einfo " - Extra: ${eextra}" 583 einfo " - Extra: $@"
603 pw useradd ${euser} ${opts} \ 584 pw useradd ${euser} ${opts} \
604 -c ${eextra} || die "enewuser failed" 585 "$@" || die "enewuser failed"
605 fi 586 fi
587 ;;
588
589 *-netbsd*)
590 if [[ -z $@ ]] ; then
591 useradd ${opts} ${euser} || die "enewuser failed"
606 else 592 else
607 if [ -z "${eextra}" ] 593 einfo " - Extra: $@"
608 then 594 useradd ${opts} ${euser} "$@" || die "enewuser failed"
595 fi
596 ;;
597
598 *-openbsd*)
599 if [[ -z $@ ]] ; then
600 useradd -u ${euid} -s ${eshell} \
601 -d ${ehome} -c "Added by portage for ${PN}" \
602 -g ${egroups} ${euser} || die "enewuser failed"
603 else
604 einfo " - Extra: $@"
605 useradd -u ${euid} -s ${eshell} \
606 -d ${ehome} -c "Added by portage for ${PN}" \
607 -g ${egroups} ${euser} "$@" || die "enewuser failed"
608 fi
609 ;;
610
611 *)
612 if [[ -z $@ ]] ; then
609 useradd ${opts} ${euser} \ 613 useradd ${opts} ${euser} \
610 -c "added by portage for ${PN}" \ 614 -c "added by portage for ${PN}" \
611 || die "enewuser failed" 615 || die "enewuser failed"
612 else 616 else
613 einfo " - Extra: ${eextra}" 617 einfo " - Extra: $@"
614 useradd ${opts} ${euser} ${eextra} \ 618 useradd ${opts} ${euser} "$@" \
615 || die "enewuser failed" 619 || die "enewuser failed"
616 fi 620 fi
621 ;;
622 esac
623
624 if [[ ! -e ${ROOT}/${ehome} ]] ; then
625 einfo " - Creating ${ehome} in ${ROOT}"
626 mkdir -p "${ROOT}/${ehome}"
627 chown ${euser} "${ROOT}/${ehome}"
628 chmod 755 "${ROOT}/${ehome}"
617 fi 629 fi
630
618 export SANDBOX_ON="${oldsandbox}" 631 export SANDBOX_ON=${oldsandbox}
619
620 if [ ! -e "${ehome}" ] && [ ! -e "${D}/${ehome}" ]
621 then
622 einfo " - Creating ${ehome} in ${D}"
623 dodir ${ehome}
624 fowners ${euser} ${ehome}
625 fperms 755 ${ehome}
626 fi
627} 632}
628 633
629# Simplify/standardize adding groups to the system 634# Simplify/standardize adding groups to the system
630# vapier@gentoo.org 635# vapier@gentoo.org
631# 636#
634# Default values if you do not specify any: 639# Default values if you do not specify any:
635# groupname: REQUIRED ! 640# groupname: REQUIRED !
636# gid: next available (see groupadd(8)) 641# gid: next available (see groupadd(8))
637# extra: none 642# extra: none
638enewgroup() { 643enewgroup() {
644 case ${EBUILD_PHASE} in
645 unpack|compile|test|install)
646 eerror "'enewgroup()' called from '${EBUILD_PHASE}()' which is not a pkg_* function."
647 eerror "Package fails at QA and at life. Please file a bug."
648 die "Bad package! enewgroup is only for use in pkg_* functions!"
649 esac
650
639 # get the group 651 # get the group
640 local egroup="$1"; shift 652 local egroup="$1"; shift
641 if [ -z "${egroup}" ] 653 if [ -z "${egroup}" ]
642 then 654 then
643 eerror "No group specified !" 655 eerror "No group specified !"
660 then 672 then
661 if [ "${egid}" -gt 0 ] 673 if [ "${egid}" -gt 0 ]
662 then 674 then
663 if [ -z "`egetent group ${egid}`" ] 675 if [ -z "`egetent group ${egid}`" ]
664 then 676 then
665 if [[ "${USERLAND}" == "Darwin" ]]; then 677 if [[ "${CHOST}" == *-darwin* ]]; then
666 opts="${opts} ${egid}" 678 opts="${opts} ${egid}"
667 else 679 else
668 opts="${opts} -g ${egid}" 680 opts="${opts} -g ${egid}"
669 fi 681 fi
670 else 682 else
684 opts="${opts} ${eextra}" 696 opts="${opts} ${eextra}"
685 697
686 # add the group 698 # add the group
687 local oldsandbox="${SANDBOX_ON}" 699 local oldsandbox="${SANDBOX_ON}"
688 export SANDBOX_ON="0" 700 export SANDBOX_ON="0"
689 if [[ "${USERLAND}" == "Darwin" ]]; then 701 case ${CHOST} in
702 *-darwin*)
690 if [ ! -z "${eextra}" ]; 703 if [ ! -z "${eextra}" ];
691 then 704 then
692 einfo "Extra options are not supported on Darwin/OS X yet" 705 einfo "Extra options are not supported on Darwin/OS X yet"
693 einfo "Please report the ebuild along with the info below" 706 einfo "Please report the ebuild along with the info below"
694 einfo "eextra: ${eextra}" 707 einfo "eextra: ${eextra}"
695 die "Required function missing" 708 die "Required function missing"
696 fi 709 fi
697 710
698 # If we need the next available 711 # If we need the next available
699 case ${egid} in 712 case ${egid} in
700 *[!0-9]*) # Non numeric 713 *[!0-9]*) # Non numeric
701 for egid in `jot 898 101`; do 714 for egid in $(seq 101 999); do
702 [ -z "`egetent group ${egid}`" ] && break 715 [ -z "`egetent group ${egid}`" ] && break
703 done 716 done
704 esac 717 esac
705 dscl . create /groups/${egroup} gid ${egid} 718 dscl . create /groups/${egroup} gid ${egid}
706 dscl . create /groups/${egroup} passwd '*' 719 dscl . create /groups/${egroup} passwd '*'
707 elif [[ "${USERLAND}" == "BSD" ]] ; then 720 ;;
721
722 *-freebsd*|*-dragonfly*)
708 case ${egid} in 723 case ${egid} in
709 *[!0-9]*) # Non numeric 724 *[!0-9]*) # Non numeric
710 for egid in `jot 898 101`; do 725 for egid in $(seq 101 999); do
711 [ -z "`egetent group ${egid}`" ] && break 726 [ -z "`egetent group ${egid}`" ] && break
712 done 727 done
713 esac 728 esac
714 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 729 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
715 else 730 ;;
731
732 *-netbsd*)
733 case ${egid} in
734 *[!0-9]*) # Non numeric
735 for egid in $(seq 101 999); do
736 [ -z "`egetent group ${egid}`" ] && break
737 done
738 esac
739 groupadd -g ${egid} ${egroup} || die "enewgroup failed"
740 ;;
741
742 *)
716 groupadd ${opts} ${egroup} || die "enewgroup failed" 743 groupadd ${opts} ${egroup} || die "enewgroup failed"
717 fi 744 ;;
745 esac
718 export SANDBOX_ON="${oldsandbox}" 746 export SANDBOX_ON="${oldsandbox}"
719} 747}
720 748
721# Simple script to replace 'dos2unix' binaries 749# Simple script to replace 'dos2unix' binaries
722# vapier@gentoo.org 750# vapier@gentoo.org
747# name: the name that will show up in the menu 775# name: the name that will show up in the menu
748# icon: give your little like a pretty little icon ... 776# icon: give your little like a pretty little icon ...
749# this can be relative (to /usr/share/pixmaps) or 777# this can be relative (to /usr/share/pixmaps) or
750# a full path to an icon 778# a full path to an icon
751# type: what kind of application is this ? for categories: 779# type: what kind of application is this ? for categories:
752# http://www.freedesktop.org/wiki/Standards_2fmenu_2dspec 780# http://www.freedesktop.org/Standards/desktop-entry-spec
753# path: if your app needs to startup in a specific dir 781# path: if your app needs to startup in a specific dir
754make_desktop_entry() { 782make_desktop_entry() {
755 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1 783 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1
756 784
757 local exec=${1} 785 local exec=${1}
783 dev) 811 dev)
784 type="Development" 812 type="Development"
785 ;; 813 ;;
786 814
787 games) 815 games)
788 [[ -z ${path} ]] && path=${GAMES_BINDIR}
789
790 case ${catmin} in 816 case ${catmin} in
791 action) type=ActionGame;; 817 action) type=ActionGame;;
792 arcade) type=ArcadeGame;; 818 arcade) type=ArcadeGame;;
793 board) type=BoardGame;; 819 board) type=BoardGame;;
794 kid) type=KidsGame;; 820 kid) type=KidsGame;;
835 type="Network;${type}" 861 type="Network;${type}"
836 ;; 862 ;;
837 863
838 sci) 864 sci)
839 case ${catmin} in 865 case ${catmin} in
840 astro*) type=Astronomoy;; 866 astro*) type=Astronomy;;
841 bio*) type=Biology;; 867 bio*) type=Biology;;
842 calc*) type=Calculator;; 868 calc*) type=Calculator;;
843 chem*) type=Chemistry;; 869 chem*) type=Chemistry;;
844 geo*) type=Geology;; 870 geo*) type=Geology;;
845 math*) type=Math;; 871 math*) type=Math;;
877Exec=${exec} 903Exec=${exec}
878Path=${path} 904Path=${path}
879Icon=${icon} 905Icon=${icon}
880Categories=Application;${type};" > "${desktop}" 906Categories=Application;${type};" > "${desktop}"
881 907
908 (
909 # wrap the env here so that the 'insinto' call
910 # doesn't corrupt the env of the caller
882 insinto /usr/share/applications 911 insinto /usr/share/applications
883 doins "${desktop}" 912 doins "${desktop}"
884 913 )
885 return 0
886} 914}
887 915
888# Make a GDM/KDM Session file 916# Make a GDM/KDM Session file
889# 917#
890# make_desktop_entry(<title>, <command>) 918# make_desktop_entry(<title>, <command>)
919 doins "${i}" 947 doins "${i}"
920 elif [[ -d ${i} ]] ; then 948 elif [[ -d ${i} ]] ; then
921 for j in "${i}"/*.desktop ; do 949 for j in "${i}"/*.desktop ; do
922 doins "${j}" 950 doins "${j}"
923 done 951 done
924 fi 952 fi
925 done 953 done
926} 954}
927newmenu() { 955newmenu() {
928 insinto /usr/share/applications 956 insinto /usr/share/applications
929 newins "$1" "$2" 957 newins "$1" "$2"
937 doins "${i}" 965 doins "${i}"
938 elif [[ -d ${i} ]] ; then 966 elif [[ -d ${i} ]] ; then
939 for j in "${i}"/*.png ; do 967 for j in "${i}"/*.png ; do
940 doins "${j}" 968 doins "${j}"
941 done 969 done
942 fi 970 fi
943 done 971 done
944} 972}
945newicon() { 973newicon() {
946 insinto /usr/share/pixmaps 974 insinto /usr/share/pixmaps
947 newins "$1" "$2" 975 newins "$1" "$2"
952############################################################## 980##############################################################
953 981
954 982
955# for internal use only (unpack_pdv and unpack_makeself) 983# for internal use only (unpack_pdv and unpack_makeself)
956find_unpackable_file() { 984find_unpackable_file() {
957 local src="$1" 985 local src=$1
958 if [ -z "${src}" ] 986 if [[ -z ${src} ]] ; then
959 then
960 src="${DISTDIR}/${A}" 987 src=${DISTDIR}/${A}
961 else 988 else
962 if [ -e "${DISTDIR}/${src}" ] 989 if [[ -e ${DISTDIR}/${src} ]] ; then
963 then
964 src="${DISTDIR}/${src}" 990 src=${DISTDIR}/${src}
965 elif [ -e "${PWD}/${src}" ] 991 elif [[ -e ${PWD}/${src} ]] ; then
966 then
967 src="${PWD}/${src}" 992 src=${PWD}/${src}
968 elif [ -e "${src}" ] 993 elif [[ -e ${src} ]] ; then
969 then
970 src="${src}" 994 src=${src}
971 fi
972 fi 995 fi
973 [ ! -e "${src}" ] && die "Could not find requested archive ${src}" 996 fi
997 [[ ! -e ${src} ]] && return 1
974 echo "${src}" 998 echo "${src}"
975} 999}
976 1000
977# Unpack those pesky pdv generated files ... 1001# Unpack those pesky pdv generated files ...
978# They're self-unpacking programs with the binary package stuffed in 1002# They're self-unpacking programs with the binary package stuffed in
993# lseek 1017# lseek
994# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 1018# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
995# lseek(3, -4, SEEK_END) = 2981250 1019# lseek(3, -4, SEEK_END) = 2981250
996# thus we would pass in the value of '4' as the second parameter. 1020# thus we would pass in the value of '4' as the second parameter.
997unpack_pdv() { 1021unpack_pdv() {
998 local src="`find_unpackable_file $1`" 1022 local src=$(find_unpackable_file $1)
999 local sizeoff_t="$2" 1023 local sizeoff_t=$2
1000 1024
1025 [[ -z ${src} ]] && die "Could not locate source for '$1'"
1001 [ -z "${sizeoff_t}" ] && die "No idea what off_t size was used for this pdv :(" 1026 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :("
1002 1027
1003 local shrtsrc="`basename ${src}`" 1028 local shrtsrc=$(basename "${src}")
1004 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1029 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1005 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1030 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"`
1006 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"` 1031 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"`
1007 1032
1008 # grab metadata for debug reasons 1033 # grab metadata for debug reasons
1072# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1097# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1073# - If the file is not specified then unpack will utilize ${A}. 1098# - If the file is not specified then unpack will utilize ${A}.
1074# - If the offset is not specified then we will attempt to extract 1099# - If the offset is not specified then we will attempt to extract
1075# the proper offset from the script itself. 1100# the proper offset from the script itself.
1076unpack_makeself() { 1101unpack_makeself() {
1102 local src_input=${1:-${A}}
1077 local src="$(find_unpackable_file "$1")" 1103 local src=$(find_unpackable_file "${src_input}")
1078 local skip="$2" 1104 local skip=$2
1079 local exe="$3" 1105 local exe=$3
1080 1106
1107 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
1108
1081 local shrtsrc="$(basename "${src}")" 1109 local shrtsrc=$(basename "${src}")
1082 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1110 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1083 if [ -z "${skip}" ] 1111 if [[ -z ${skip} ]] ; then
1084 then
1085 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1112 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}')
1086 local skip=0 1113 local skip=0
1087 exe=tail 1114 exe=tail
1088 case ${ver} in 1115 case ${ver} in
1089 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same 1116 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same
1090 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1117 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1102 ;; 1129 ;;
1103 2.1.3) 1130 2.1.3)
1104 skip=`grep -a ^offset= "${src}" | awk '{print $3}'` 1131 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1105 let skip="skip + 1" 1132 let skip="skip + 1"
1106 ;; 1133 ;;
1107 2.1.4) 1134 2.1.4|2.1.5)
1108 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1) 1135 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1)
1109 skip=$(head -n ${skip} "${src}" | wc -c) 1136 skip=$(head -n ${skip} "${src}" | wc -c)
1110 exe="dd" 1137 exe="dd"
1111 ;; 1138 ;;
1112 *) 1139 *)
1157check_license() { 1184check_license() {
1158 local lic=$1 1185 local lic=$1
1159 if [ -z "${lic}" ] ; then 1186 if [ -z "${lic}" ] ; then
1160 lic="${PORTDIR}/licenses/${LICENSE}" 1187 lic="${PORTDIR}/licenses/${LICENSE}"
1161 else 1188 else
1162 if [ -e "${PORTDIR}/licenses/${src}" ] ; then 1189 if [ -e "${PORTDIR}/licenses/${lic}" ] ; then
1163 lic="${PORTDIR}/licenses/${src}" 1190 lic="${PORTDIR}/licenses/${lic}"
1164 elif [ -e "${PWD}/${src}" ] ; then 1191 elif [ -e "${PWD}/${lic}" ] ; then
1165 lic="${PWD}/${src}" 1192 lic="${PWD}/${lic}"
1166 elif [ -e "${src}" ] ; then 1193 elif [ -e "${lic}" ] ; then
1167 lic="${src}" 1194 lic="${lic}"
1168 fi
1169 fi 1195 fi
1196 fi
1170 [ ! -f "${lic}" ] && die "Could not find requested license ${src}" 1197 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1171 local l="`basename ${lic}`" 1198 local l="`basename ${lic}`"
1172 1199
1173 # here is where we check for the licenses the user already 1200 # here is where we check for the licenses the user already
1174 # accepted ... if we don't find a match, we make the user accept 1201 # accepted ... if we don't find a match, we make the user accept
1175 local shopts=$- 1202 local shopts=$-
1231 # first we figure out how many cds we're dealing with by 1258 # first we figure out how many cds we're dealing with by
1232 # the # of files they gave us 1259 # the # of files they gave us
1233 local cdcnt=0 1260 local cdcnt=0
1234 local f= 1261 local f=
1235 for f in "$@" ; do 1262 for f in "$@" ; do
1236 cdcnt=$((cdcnt + 1)) 1263 ((++cdcnt))
1237 export CDROM_CHECK_${cdcnt}="$f" 1264 export CDROM_CHECK_${cdcnt}="$f"
1238 done 1265 done
1239 export CDROM_TOTAL_CDS=${cdcnt} 1266 export CDROM_TOTAL_CDS=${cdcnt}
1240 export CDROM_CURRENT_CD=1 1267 export CDROM_CURRENT_CD=1
1241 1268
1242 # now we see if the user gave use CD_ROOT ... 1269 # now we see if the user gave use CD_ROOT ...
1243 # if they did, let's just believe them that it's correct 1270 # if they did, let's just believe them that it's correct
1244 if [[ ! -z ${CD_ROOT} ]] ; then
1245 export CDROM_ROOT=${CD_ROOT}
1246 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1247 return
1248 fi
1249 # do the same for CD_ROOT_X
1250 if [[ ! -z ${CD_ROOT_1} ]] ; then 1271 if [[ -n ${CD_ROOT}${CD_ROOT_1} ]] ; then
1251 local var= 1272 local var=
1252 cdcnt=0 1273 cdcnt=0
1253 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1274 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1254 cdcnt=$((cdcnt + 1)) 1275 ((++cdcnt))
1255 var="CD_ROOT_${cdcnt}" 1276 var="CD_ROOT_${cdcnt}"
1277 [[ -z ${!var} ]] && var="CD_ROOT"
1256 if [[ -z ${!var} ]] ; then 1278 if [[ -z ${!var} ]] ; then
1257 eerror "You must either use just the CD_ROOT" 1279 eerror "You must either use just the CD_ROOT"
1258 eerror "or specify ALL the CD_ROOT_X variables." 1280 eerror "or specify ALL the CD_ROOT_X variables."
1259 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables." 1281 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables."
1260 die "could not locate CD_ROOT_${cdcnt}" 1282 die "could not locate CD_ROOT_${cdcnt}"
1261 fi 1283 fi
1262 export CDROM_ROOTS_${cdcnt}="${!var}"
1263 done 1284 done
1264 export CDROM_ROOT=${CDROM_ROOTS_1} 1285 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}}
1265 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1286 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1287 export CDROM_SET=-1
1288 for f in ${CDROM_CHECK_1//:/ } ; do
1289 ((++CDROM_SET))
1290 [[ -e ${CD_ROOT}/${f} ]] && break
1291 done
1292 export CDROM_MATCH=${f}
1266 return 1293 return
1267 fi 1294 fi
1268 1295
1296 # User didn't help us out so lets make sure they know they can
1297 # simplify the whole process ...
1269 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1298 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1270 einfon "This ebuild will need the " 1299 einfo "This ebuild will need the ${CDROM_NAME:-cdrom for ${PN}}"
1271 if [[ -z ${CDROM_NAME} ]] ; then
1272 echo "cdrom for ${PN}."
1273 else
1274 echo "${CDROM_NAME}."
1275 fi
1276 echo 1300 echo
1277 einfo "If you do not have the CD, but have the data files" 1301 einfo "If you do not have the CD, but have the data files"
1278 einfo "mounted somewhere on your filesystem, just export" 1302 einfo "mounted somewhere on your filesystem, just export"
1279 einfo "the variable CD_ROOT so that it points to the" 1303 einfo "the variable CD_ROOT so that it points to the"
1280 einfo "directory containing the files." 1304 einfo "directory containing the files."
1284 echo 1308 echo
1285 else 1309 else
1286 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1310 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1287 cdcnt=0 1311 cdcnt=0
1288 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1312 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1289 cdcnt=$((cdcnt + 1)) 1313 ((++cdcnt))
1290 var="CDROM_NAME_${cdcnt}" 1314 var="CDROM_NAME_${cdcnt}"
1291 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}" 1315 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}"
1292 done 1316 done
1293 echo 1317 echo
1294 einfo "If you do not have the CDs, but have the data files" 1318 einfo "If you do not have the CDs, but have the data files"
1295 einfo "mounted somewhere on your filesystem, just export" 1319 einfo "mounted somewhere on your filesystem, just export"
1296 einfo "the following variables so they point to the right place:" 1320 einfo "the following variables so they point to the right place:"
1297 einfon "" 1321 einfon ""
1298 cdcnt=0 1322 cdcnt=0
1299 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1323 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1300 cdcnt=$((cdcnt + 1)) 1324 ((++cdcnt))
1301 echo -n " CD_ROOT_${cdcnt}" 1325 echo -n " CD_ROOT_${cdcnt}"
1302 done 1326 done
1303 echo 1327 echo
1304 einfo "Or, if you have all the files in the same place, or" 1328 einfo "Or, if you have all the files in the same place, or"
1305 einfo "you only have one cdrom, you can export CD_ROOT" 1329 einfo "you only have one cdrom, you can export CD_ROOT"
1308 echo 1332 echo
1309 einfo "For example:" 1333 einfo "For example:"
1310 einfo "export CD_ROOT_1=/mnt/cdrom" 1334 einfo "export CD_ROOT_1=/mnt/cdrom"
1311 echo 1335 echo
1312 fi 1336 fi
1337
1338 export CDROM_SET=""
1313 export CDROM_CURRENT_CD=0 1339 export CDROM_CURRENT_CD=0
1314 cdrom_load_next_cd 1340 cdrom_load_next_cd
1315} 1341}
1316 1342
1317# this is only used when you need access to more than one cd. 1343# this is only used when you need access to more than one cd.
1318# when you have finished using the first cd, just call this function. 1344# when you have finished using the first cd, just call this function.
1319# when it returns, CDROM_ROOT will be pointing to the second cd. 1345# when it returns, CDROM_ROOT will be pointing to the second cd.
1320# remember, you can only go forward in the cd chain, you can't go back. 1346# remember, you can only go forward in the cd chain, you can't go back.
1321cdrom_load_next_cd() { 1347cdrom_load_next_cd() {
1322 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1323 local var= 1348 local var
1324 1349 ((++CDROM_CURRENT_CD))
1325 if [[ ! -z ${CD_ROOT} ]] ; then
1326 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}"
1327 return
1328 fi
1329 1350
1330 unset CDROM_ROOT 1351 unset CDROM_ROOT
1331 var=CDROM_ROOTS_${CDROM_CURRENT_CD} 1352 var=CD_ROOT_${CDROM_CURRENT_CD}
1353 [[ -z ${!var} ]] && var="CD_ROOT"
1332 if [[ -z ${!var} ]] ; then 1354 if [[ -z ${!var} ]] ; then
1333 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1355 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1334 cdrom_locate_file_on_cd ${!var} 1356 _cdrom_locate_file_on_cd ${!var}
1335 else 1357 else
1336 export CDROM_ROOT=${!var} 1358 export CDROM_ROOT=${!var}
1337 fi 1359 fi
1338 1360
1339 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1361 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1344# all it does is try to locate a give file on a cd ... if the cd isn't 1366# all it does is try to locate a give file on a cd ... if the cd isn't
1345# found, then a message asking for the user to insert the cdrom will be 1367# found, then a message asking for the user to insert the cdrom will be
1346# displayed and we'll hang out here until: 1368# displayed and we'll hang out here until:
1347# (1) the file is found on a mounted cdrom 1369# (1) the file is found on a mounted cdrom
1348# (2) the user hits CTRL+C 1370# (2) the user hits CTRL+C
1349cdrom_locate_file_on_cd() { 1371_cdrom_locate_file_on_cd() {
1372 local mline=""
1373 local showedmsg=0
1374
1350 while [[ -z ${CDROM_ROOT} ]] ; do 1375 while [[ -z ${CDROM_ROOT} ]] ; do
1376 local i=0
1377 local -a cdset=(${*//:/ })
1378 if [[ -n ${CDROM_SET} ]] ; then
1379 cdset=(${cdset[${CDROM_SET}]})
1380 fi
1381
1382 while [[ -n ${cdset[${i}]} ]] ; do
1351 local dir="$(dirname ${@})" 1383 local dir=$(dirname ${cdset[${i}]})
1352 local file="$(basename ${@})" 1384 local file=$(basename ${cdset[${i}]})
1353 local mline=""
1354 local showedmsg=0
1355 1385
1356 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do 1386 for mline in $(mount | gawk '/(iso|cdrom|fs=cdfss)/ {print $3}') ; do
1357 [[ -d ${mline}/${dir} ]] || continue 1387 [[ -d ${mline}/${dir} ]] || continue
1358 [[ ! -z $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] \ 1388 if [[ -n $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] ; then
1359 && export CDROM_ROOT=${mline} 1389 export CDROM_ROOT=${mline}
1390 export CDROM_SET=${i}
1391 export CDROM_MATCH=${cdset[${i}]}
1392 return
1393 fi
1394 done
1395
1396 ((++i))
1360 done 1397 done
1361 1398
1362 if [[ -z ${CDROM_ROOT} ]] ; then
1363 echo 1399 echo
1364 if [[ ${showedmsg} -eq 0 ]] ; then 1400 if [[ ${showedmsg} -eq 0 ]] ; then
1365 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1401 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1366 if [[ -z ${CDROM_NAME} ]] ; then 1402 if [[ -z ${CDROM_NAME} ]] ; then
1367 einfo "Please insert the cdrom for ${PN} now !" 1403 einfo "Please insert+mount the cdrom for ${PN} now !"
1368 else
1369 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1370 fi
1371 else 1404 else
1372 if [[ -z ${CDROM_NAME_1} ]] ; then
1373 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !"
1374 else
1375 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1376 einfo "Please insert+mount the ${!var} cdrom now !" 1405 einfo "Please insert+mount the ${CDROM_NAME} cdrom now !"
1377 fi
1378 fi 1406 fi
1379 showedmsg=1 1407 else
1408 if [[ -z ${CDROM_NAME_1} ]] ; then
1409 einfo "Please insert+mount cd #${CDROM_CURRENT_CD} for ${PN} now !"
1410 else
1411 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1412 einfo "Please insert+mount the ${!var} cdrom now !"
1413 fi
1380 fi 1414 fi
1415 showedmsg=1
1416 fi
1381 einfo "Press return to scan for the cd again" 1417 einfo "Press return to scan for the cd again"
1382 einfo "or hit CTRL+C to abort the emerge." 1418 einfo "or hit CTRL+C to abort the emerge."
1383 read 1419 echo
1384 fi 1420 einfo "If you are having trouble with the detection"
1421 einfo "of your CD, it is possible that you do not have"
1422 einfo "Joliet support enabled in your kernel. Please"
1423 einfo "check that CONFIG_JOLIET is enabled in your kernel."
1424 read || die "something is screwed with your system"
1385 done 1425 done
1386} 1426}
1387 1427
1388# Make sure that LINGUAS only contains languages that 1428# Make sure that LINGUAS only contains languages that
1389# a package can support 1429# a package can support
1399# directories and uses the union of the lists. 1439# directories and uses the union of the lists.
1400strip-linguas() { 1440strip-linguas() {
1401 local ls newls 1441 local ls newls
1402 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then 1442 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1403 local op=$1; shift 1443 local op=$1; shift
1404 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1444 ls=" $(find "$1" -name '*.po' -exec basename {} \;) "; shift
1405 local d f 1445 local d f
1406 for d in "$@" ; do 1446 for d in "$@" ; do
1407 if [[ ${op} == "-u" ]] ; then 1447 if [[ ${op} == "-u" ]] ; then
1408 newls=${ls} 1448 newls=${ls}
1409 else 1449 else
1410 newls="" 1450 newls=""
1411 fi 1451 fi
1412 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1452 for f in $(find "$d" -name '*.po' -exec basename {} \;) ; do
1413 if [[ ${op} == "-i" ]] ; then 1453 if [[ ${op} == "-i" ]] ; then
1414 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}" 1454 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}"
1415 else 1455 else
1416 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}" 1456 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}"
1417 fi 1457 fi
1473 1513
1474# Jeremy Huddleston <eradicator@gentoo.org>: 1514# Jeremy Huddleston <eradicator@gentoo.org>:
1475# preserve_old_lib /path/to/libblah.so.0 1515# preserve_old_lib /path/to/libblah.so.0
1476# preserve_old_lib_notify /path/to/libblah.so.0 1516# preserve_old_lib_notify /path/to/libblah.so.0
1477# 1517#
1478# These functions are useful when a lib in your package changes --soname. Such 1518# These functions are useful when a lib in your package changes --library. Such
1479# an example might be from libogg.so.0 to libogg.so.1. Removing libogg.so.0 1519# an example might be from libogg.so.0 to libogg.so.1. Removing libogg.so.0
1480# would break packages that link against it. Most people get around this 1520# would break packages that link against it. Most people get around this
1481# by using the portage SLOT mechanism, but that is not always a relevant 1521# by using the portage SLOT mechanism, but that is not always a relevant
1482# solution, so instead you can add the following to your ebuilds: 1522# solution, so instead you can add the following to your ebuilds:
1483# 1523#
1510 LIB=$1 1550 LIB=$1
1511 1551
1512 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1552 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1513 SONAME=`basename ${LIB}` 1553 SONAME=`basename ${LIB}`
1514 1554
1515 einfo "An old version of an installed library was detected on your system." 1555 ewarn "An old version of an installed library was detected on your system."
1516 einfo "In order to avoid breaking packages that link against is, this older version" 1556 ewarn "In order to avoid breaking packages that link against it, this older version"
1517 einfo "is not being removed. In order to make full use of this newer version," 1557 ewarn "is not being removed. In order to make full use of this newer version,"
1518 einfo "you will need to execute the following command:" 1558 ewarn "you will need to execute the following command:"
1519 einfo " revdep-rebuild --soname ${SONAME}" 1559 ewarn " revdep-rebuild --library ${SONAME}"
1520 einfo 1560 ewarn
1521 einfo "After doing that, you can safely remove ${LIB}" 1561 ewarn "After doing that, you can safely remove ${LIB}"
1522 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild" 1562 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1523 fi 1563 fi
1524} 1564}
1525 1565
1526# Hack for people to figure out if a package was built with 1566# Hack for people to figure out if a package was built with
1527# certain USE flags 1567# certain USE flags
1537 [[ ${opt:0:1} = "-" ]] && shift || opt="-a" 1577 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1538 1578
1539 local PKG=$(best_version $1) 1579 local PKG=$(best_version $1)
1540 shift 1580 shift
1541 1581
1542 local USEFILE="${ROOT}/var/db/pkg/${PKG}/USE" 1582 local USEFILE=${ROOT}/var/db/pkg/${PKG}/USE
1583
1584 # if the USE file doesnt exist, assume the $PKG is either
1585 # injected or package.provided
1543 [[ ! -e ${USEFILE} ]] && return 1 1586 [[ ! -e ${USEFILE} ]] && return 0
1544 1587
1545 local USE_BUILT=$(<${USEFILE}) 1588 local USE_BUILT=$(<${USEFILE})
1546 while [[ $# -gt 0 ]] ; do 1589 while [[ $# -gt 0 ]] ; do
1547 if [[ ${opt} = "-o" ]] ; then 1590 if [[ ${opt} = "-o" ]] ; then
1548 has $1 ${USE_BUILT} && return 0 1591 has $1 ${USE_BUILT} && return 0
1600# $4 == extra LD_LIBRARY_PATH's (make it : delimited) 1643# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1601# $5 == path for wrapper 1644# $5 == path for wrapper
1602make_wrapper() { 1645make_wrapper() {
1603 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5 1646 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1604 local tmpwrapper=$(emktemp) 1647 local tmpwrapper=$(emktemp)
1648 # We don't want to quote ${bin} so that people can pass complex
1649 # things as $bin ... "./someprog --args"
1605 cat << EOF > "${tmpwrapper}" 1650 cat << EOF > "${tmpwrapper}"
1606#!/bin/sh 1651#!/bin/sh
1607cd "${chdir}" 1652cd "${chdir:-.}"
1653if [ -n "${libdir}" ] ; then
1654 if [ "\${LD_LIBRARY_PATH+set}" = "set" ] ; then
1608export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}" 1655 export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1656 else
1657 export LD_LIBRARY_PATH="${libdir}"
1658 fi
1659fi
1609exec ${bin} "\$@" 1660exec ${bin} "\$@"
1610EOF 1661EOF
1611 chmod go+rx "${tmpwrapper}" 1662 chmod go+rx "${tmpwrapper}"
1612 if [ -n "${5}" ] 1663 if [[ -n ${path} ]] ; then
1613 then
1614 exeinto ${5} 1664 exeinto "${path}"
1615 newexe "${tmpwrapper}" "${wrapper}" 1665 newexe "${tmpwrapper}" "${wrapper}"
1616 else 1666 else
1617 newbin "${tmpwrapper}" "${wrapper}" 1667 newbin "${tmpwrapper}" "${wrapper}"
1618 fi 1668 fi
1619} 1669}

Legend:
Removed from v.1.179  
changed lines
  Added in v.1.233

  ViewVC Help
Powered by ViewVC 1.1.20