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

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

  ViewVC Help
Powered by ViewVC 1.1.20