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

Diff of /eclass/eutils.eclass

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

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

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

  ViewVC Help
Powered by ViewVC 1.1.20