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

Diff of /eclass/eutils.eclass

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

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

Legend:
Removed from v.1.181  
changed lines
  Added in v.1.237

  ViewVC Help
Powered by ViewVC 1.1.20