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

Diff of /eclass/eutils.eclass

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

Revision 1.172 Revision 1.218
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.172 2005/05/20 02:09:19 vapier Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.218 2005/11/22 11:15:34 flameeyes 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
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}"
125# List of patches not to apply. Not this is only file names, 124# List of patches not to apply. Not this is only file names,
126# and not the full path .. 125# and not the full path ..
127EPATCH_EXCLUDE="" 126EPATCH_EXCLUDE=""
128# Change the printed message for a single patch. 127# Change the printed message for a single patch.
129EPATCH_SINGLE_MSG="" 128EPATCH_SINGLE_MSG=""
129# Change the printed message for multiple patches.
130EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..."
130# Force applying bulk patches even if not following the style: 131# Force applying bulk patches even if not following the style:
131# 132#
132# ??_${ARCH}_foo.${EPATCH_SUFFIX} 133# ??_${ARCH}_foo.${EPATCH_SUFFIX}
133# 134#
134EPATCH_FORCE="no" 135EPATCH_FORCE="no"
165# hand its a directory, it will set EPATCH_SOURCE to this. 166# hand its a directory, it will set EPATCH_SOURCE to this.
166# 167#
167# <azarah@gentoo.org> (10 Nov 2002) 168# <azarah@gentoo.org> (10 Nov 2002)
168# 169#
169epatch() { 170epatch() {
171 _epatch_assert() { local _pipestatus=${PIPESTATUS[*]}; [[ ${_pipestatus// /} -eq 0 ]] ; }
170 local PIPE_CMD="" 172 local PIPE_CMD=""
171 local STDERR_TARGET="${T}/$$.out" 173 local STDERR_TARGET="${T}/$$.out"
172 local PATCH_TARGET="${T}/$$.patch" 174 local PATCH_TARGET="${T}/$$.patch"
173 local PATCH_SUFFIX="" 175 local PATCH_SUFFIX=""
174 local SINGLE_PATCH="no" 176 local SINGLE_PATCH="no"
175 local x="" 177 local x=""
178
179 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402
176 180
177 if [ "$#" -gt 1 ] 181 if [ "$#" -gt 1 ]
178 then 182 then
179 local m="" 183 local m=""
180 for m in "$@" ; do 184 for m in "$@" ; do
238 ;; 242 ;;
239 esac 243 esac
240 244
241 if [ "${SINGLE_PATCH}" = "no" ] 245 if [ "${SINGLE_PATCH}" = "no" ]
242 then 246 then
243 einfo "Applying various patches (bugfixes/updates) ..." 247 einfo "${EPATCH_MULTI_MSG}"
244 fi 248 fi
245 for x in ${EPATCH_SOURCE} 249 for x in ${EPATCH_SOURCE}
246 do 250 do
247 # New ARCH dependant patch naming scheme ... 251 # New ARCH dependant patch naming scheme ...
248 # 252 #
249 # ???_arch_foo.patch 253 # ???_arch_foo.patch
250 # 254 #
251 if [ -f ${x} ] && \ 255 if [ -f ${x} ] && \
252 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "`eval echo \$\{x/_${ARCH}_\}`" != "${x}" ] || \ 256 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "${x/_${ARCH}_}" != "${x}" ] || \
253 [ "${EPATCH_FORCE}" = "yes" ]) 257 [ "${EPATCH_FORCE}" = "yes" ])
254 then 258 then
255 local count=0 259 local count=0
256 local popts="${EPATCH_OPTS}" 260 local popts="${EPATCH_OPTS}"
257 local patchname=${x##*/} 261 local patchname=${x##*/}
310 count=5 314 count=5
311 break 315 break
312 fi 316 fi
313 fi 317 fi
314 318
315 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1 319 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f ; _epatch_assert) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
316 then 320 then
317 draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 321 draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
318 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 322 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
319 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 323 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
320 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 324 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
321 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 325 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
322 326
323 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1 327 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1
328 _epatch_assert
324 329
325 if [ "$?" -ne 0 ] 330 if [ "$?" -ne 0 ]
326 then 331 then
327 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 332 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
328 echo 333 echo
367 then 372 then
368 einfo "Done with patching" 373 einfo "Done with patching"
369 fi 374 fi
370} 375}
371 376
372# This function check how many cpu's are present, and then set
373# -j in MAKEOPTS accordingly.
374#
375# Thanks to nall <nall@gentoo.org> for this.
376#
377get_number_of_jobs() {
378 local jobs=0
379
380 if [ ! -r /proc/cpuinfo ]
381 then
382 return 1
383 fi
384
385 # This bit is from H?kan Wessberg <nacka-gentoo@refug.org>, bug #13565.
386 if [ "`egrep "^[[:space:]]*MAKEOPTS=" /etc/make.conf | wc -l`" -gt 0 ]
387 then
388 ADMINOPTS="`egrep "^[[:space:]]*MAKEOPTS=" /etc/make.conf | cut -d= -f2 | sed 's/\"//g'`"
389 ADMINPARAM="`echo ${ADMINOPTS} | gawk '{match($0, /-j *[0-9]*/, opt); print opt[0]}'`"
390 ADMINPARAM="${ADMINPARAM/-j}"
391 fi
392
393 export MAKEOPTS="`echo ${MAKEOPTS} | sed -e 's:-j *[0-9]*::g'`"
394
395 if [ "${ARCH}" = "amd64" -o "${ARCH}" = "x86" -o "${ARCH}" = "hppa" -o \
396 "${ARCH}" = "arm" -o "${ARCH}" = "mips" -o "${ARCH}" = "ia64" ]
397 then
398 # these archs will always have "[Pp]rocessor"
399 jobs="$((`grep -c ^[Pp]rocessor /proc/cpuinfo` * 2))"
400
401 elif [ "${ARCH}" = "sparc" -o "${ARCH}" = "sparc64" ]
402 then
403 # sparc always has "ncpus active"
404 jobs="$((`grep "^ncpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
405
406 elif [ "${ARCH}" = "alpha" ]
407 then
408 # alpha has "cpus active", but only when compiled with SMP
409 if [ "`grep -c "^cpus active" /proc/cpuinfo`" -eq 1 ]
410 then
411 jobs="$((`grep "^cpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
412 else
413 jobs=2
414 fi
415
416 elif [ "${ARCH}" = "ppc" -o "${ARCH}" = "ppc64" ]
417 then
418 # ppc has "processor", but only when compiled with SMP
419 if [ "`grep -c "^processor" /proc/cpuinfo`" -eq 1 ]
420 then
421 jobs="$((`grep -c ^processor /proc/cpuinfo` * 2))"
422 else
423 jobs=2
424 fi
425 elif [ "${ARCH}" = "s390" ]
426 then
427 # s390 has "# processors : "
428 jobs="$((`grep "^\# processors" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
429 else
430 jobs="$((`grep -c ^cpu /proc/cpuinfo` * 2))"
431 die "Unknown ARCH -- ${ARCH}!"
432 fi
433
434 # Make sure the number is valid ...
435 if [ "${jobs}" -lt 1 ]
436 then
437 jobs=1
438 fi
439
440 if [ -n "${ADMINPARAM}" ]
441 then
442 if [ "${jobs}" -gt "${ADMINPARAM}" ]
443 then
444 einfo "Setting make jobs to \"-j${ADMINPARAM}\" to ensure successful merge ..."
445 export MAKEOPTS="${MAKEOPTS} -j${ADMINPARAM}"
446 else
447 einfo "Setting make jobs to \"-j${jobs}\" to ensure successful merge ..."
448 export MAKEOPTS="${MAKEOPTS} -j${jobs}"
449 fi
450 fi
451}
452
453# Cheap replacement for when debianutils (and thus mktemp) 377# Cheap replacement for when debianutils (and thus mktemp)
454# does not exist on the users system 378# does not exist on the users system
455# vapier@gentoo.org 379# vapier@gentoo.org
456# 380#
457# Takes just 1 optional parameter (the directory to create tmpfile in) 381# Takes just 1 optional parameter (the directory to create tmpfile in)
458emktemp() { 382emktemp() {
459 local exe="touch" 383 local exe="touch"
460 [ "$1" == "-d" ] && exe="mkdir" && shift 384 [[ $1 == -d ]] && exe="mkdir" && shift
461 local topdir="$1" 385 local topdir=$1
462 386
463 if [ -z "${topdir}" ] 387 if [[ -z ${topdir} ]] ; then
464 then
465 [ -z "${T}" ] \ 388 [[ -z ${T} ]] \
466 && topdir="/tmp" \ 389 && topdir="/tmp" \
467 || topdir="${T}" 390 || topdir=${T}
468 fi 391 fi
469 392
470 if [ -z "$(type -p mktemp)" ] 393 if [[ -z $(type -p mktemp) ]] ; then
471 then
472 local tmp=/ 394 local tmp=/
473 while [ -e "${tmp}" ] ; do 395 while [[ -e ${tmp} ]] ; do
474 tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}" 396 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}
475 done 397 done
476 ${exe} "${tmp}" 398 ${exe} "${tmp}" || ${exe} -p "${tmp}"
477 echo "${tmp}" 399 echo "${tmp}"
478 else 400 else
479 [ "${exe}" == "touch" ] \ 401 [[ ${exe} == "touch" ]] \
480 && exe="-p" \ 402 && exe="-p" \
481 || exe="-d" 403 || exe="-d"
482 mktemp ${exe} "${topdir}" 404 mktemp ${exe} "${topdir}"
483 fi 405 fi
484} 406}
488# Joe Jezak <josejx@gmail.com> and usata@gentoo.org 410# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
489# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org> 411# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
490# 412#
491# egetent(database, key) 413# egetent(database, key)
492egetent() { 414egetent() {
493 if useq ppc-macos ; then 415 case ${CHOST} in
416 *-darwin*)
494 case "$2" in 417 case "$2" in
495 *[!0-9]*) # Non numeric 418 *[!0-9]*) # Non numeric
496 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 419 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
497 ;; 420 ;;
498 *) # Numeric 421 *) # Numeric
499 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 422 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
500 ;; 423 ;;
501 esac 424 esac
502 elif useq x86-fbsd ; then 425 ;;
503 local action 426 *-freebsd*)
504 if [ "$1" == "passwd" ] 427 local opts action="user"
505 then 428 [[ $1 == "passwd" ]] || action="group"
506 action="user" 429
507 else 430 # lookup by uid/gid
508 action="group" 431 if [[ $2 == [[:digit:]]* ]] ; then
432 [[ ${action} == "user" ]] && opts="-u" || opts="-g"
509 fi 433 fi
434
510 pw show "${action}" "$2" -q 435 pw show ${action} ${opts} "$2" -q
511 else 436 ;;
437 *-netbsd*|*-openbsd*)
438 grep "$2:\*:" /etc/$1
439 ;;
440 *)
512 which nscd >& /dev/null && nscd -i "$1" 441 type -p nscd >& /dev/null && nscd -i "$1"
513 getent "$1" "$2" 442 getent "$1" "$2"
514 fi 443 ;;
444 esac
515} 445}
516 446
517# Simplify/standardize adding users to the system 447# Simplify/standardize adding users to the system
518# vapier@gentoo.org 448# vapier@gentoo.org
519# 449#
527# homedir: /dev/null 457# homedir: /dev/null
528# groups: none 458# groups: none
529# extra: comment of 'added by portage for ${PN}' 459# extra: comment of 'added by portage for ${PN}'
530enewuser() { 460enewuser() {
531 # get the username 461 # get the username
532 local euser="$1"; shift 462 local euser=$1; shift
533 if [ -z "${euser}" ] 463 if [[ -z ${euser} ]] ; then
534 then
535 eerror "No username specified !" 464 eerror "No username specified !"
536 die "Cannot call enewuser without a username" 465 die "Cannot call enewuser without a username"
537 fi 466 fi
538 467
539 # lets see if the username already exists 468 # lets see if the username already exists
540 if [ "${euser}" == "`egetent passwd \"${euser}\" | cut -d: -f1`" ] 469 if [[ ${euser} == $(egetent passwd "${euser}" | cut -d: -f1) ]] ; then
541 then
542 return 0 470 return 0
543 fi 471 fi
544 einfo "Adding user '${euser}' to your system ..." 472 einfo "Adding user '${euser}' to your system ..."
545 473
546 # options to pass to useradd 474 # options to pass to useradd
547 local opts= 475 local opts=
548 476
549 # handle uid 477 # handle uid
550 local euid="$1"; shift 478 local euid=$1; shift
551 if [ ! -z "${euid}" ] && [ "${euid}" != "-1" ] 479 if [[ ! -z ${euid} ]] && [[ ${euid} != "-1" ]] ; then
552 then
553 if [ "${euid}" -gt 0 ] 480 if [[ ${euid} -gt 0 ]] ; then
554 then
555 if [ ! -z "`egetent passwd ${euid}`" ] 481 if [[ ! -z $(egetent passwd ${euid}) ]] ; then
556 then
557 euid="next" 482 euid="next"
558 fi 483 fi
559 else 484 else
560 eerror "Userid given but is not greater than 0 !" 485 eerror "Userid given but is not greater than 0 !"
561 die "${euid} is not a valid UID" 486 die "${euid} is not a valid UID"
562 fi 487 fi
563 else 488 else
564 euid="next" 489 euid="next"
565 fi 490 fi
566 if [ "${euid}" == "next" ] 491 if [[ ${euid} == "next" ]] ; then
567 then 492 for euid in $(seq 101 999) ; do
568 local pwrange
569 if [ "${USERLAND}" == "BSD" ] ; then
570 pwrange="`jot 898 101`"
571 else
572 pwrange="`seq 101 999`"
573 fi
574 for euid in ${pwrange} ; do
575 [ -z "`egetent passwd ${euid}`" ] && break 493 [[ -z $(egetent passwd ${euid}) ]] && break
576 done 494 done
577 fi 495 fi
578 opts="${opts} -u ${euid}" 496 opts="${opts} -u ${euid}"
579 einfo " - Userid: ${euid}" 497 einfo " - Userid: ${euid}"
580 498
581 # handle shell 499 # handle shell
582 local eshell="$1"; shift 500 local eshell=$1; shift
583 if [ ! -z "${eshell}" ] && [ "${eshell}" != "-1" ] 501 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
584 then
585 if [ ! -e "${eshell}" ] 502 if [[ ! -e ${eshell} ]] ; then
586 then
587 eerror "A shell was specified but it does not exist !" 503 eerror "A shell was specified but it does not exist !"
588 die "${eshell} does not exist" 504 die "${eshell} does not exist"
589 fi 505 fi
590 else 506 else
591 if [ "${USERLAND}" == "BSD" ] 507 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do
592 then 508 [[ -x ${ROOT}${shell} ]] && break
593 eshell="/usr/bin/false" 509 done
594 else 510
595 eshell="/bin/false" 511 if [[ ${shell} == "/dev/null" ]] ; then
512 eerror "Unable to identify the shell to use"
513 die "Unable to identify the shell to use"
596 fi 514 fi
515
516 eshell=${shell}
597 fi 517 fi
598 einfo " - Shell: ${eshell}" 518 einfo " - Shell: ${eshell}"
599 opts="${opts} -s ${eshell}" 519 opts="${opts} -s ${eshell}"
600 520
601 # handle homedir 521 # handle homedir
602 local ehome="$1"; shift 522 local ehome=$1; shift
603 if [ -z "${ehome}" ] && [ "${eshell}" != "-1" ] 523 if [[ -z ${ehome} ]] || [[ ${ehome} == "-1" ]] ; then
604 then
605 ehome="/dev/null" 524 ehome="/dev/null"
606 fi 525 fi
607 einfo " - Home: ${ehome}" 526 einfo " - Home: ${ehome}"
608 opts="${opts} -d ${ehome}" 527 opts="${opts} -d ${ehome}"
609 528
610 # handle groups 529 # handle groups
611 local egroups="$1"; shift 530 local egroups=$1; shift
612 if [ ! -z "${egroups}" ] 531 if [[ ! -z ${egroups} ]] ; then
613 then
614 local oldifs="${IFS}" 532 local oldifs=${IFS}
615 local defgroup="" exgroups="" 533 local defgroup="" exgroups=""
616 534
617 export IFS="," 535 export IFS=","
618 for g in ${egroups} 536 for g in ${egroups} ; do
619 do
620 export IFS="${oldifs}" 537 export IFS=${oldifs}
621 if [ -z "`egetent group \"${g}\"`" ] 538 if [[ -z $(egetent group "${g}") ]] ; then
622 then
623 eerror "You must add group ${g} to the system first" 539 eerror "You must add group ${g} to the system first"
624 die "${g} is not a valid GID" 540 die "${g} is not a valid GID"
625 fi 541 fi
626 if [ -z "${defgroup}" ] 542 if [[ -z ${defgroup} ]] ; then
627 then
628 defgroup="${g}" 543 defgroup=${g}
629 else 544 else
630 exgroups="${exgroups},${g}" 545 exgroups="${exgroups},${g}"
631 fi 546 fi
632 export IFS="," 547 export IFS=","
633 done 548 done
634 export IFS="${oldifs}" 549 export IFS=${oldifs}
635 550
636 opts="${opts} -g ${defgroup}" 551 opts="${opts} -g ${defgroup}"
637 if [ ! -z "${exgroups}" ] 552 if [[ ! -z ${exgroups} ]] ; then
638 then
639 opts="${opts} -G ${exgroups:1}" 553 opts="${opts} -G ${exgroups:1}"
640 fi 554 fi
641 else 555 else
642 egroups="(none)" 556 egroups="(none)"
643 fi 557 fi
644 einfo " - Groups: ${egroups}" 558 einfo " - Groups: ${egroups}"
645 559
646 # handle extra and add the user 560 # handle extra and add the user
647 local eextra="$@"
648 local oldsandbox="${SANDBOX_ON}" 561 local oldsandbox=${SANDBOX_ON}
649 export SANDBOX_ON="0" 562 export SANDBOX_ON="0"
650 if useq ppc-macos 563 case ${CHOST} in
651 then 564 *-darwin*)
652 ### Make the user 565 ### Make the user
653 if [ -z "${eextra}" ] 566 if [[ -z $@ ]] ; then
654 then
655 dscl . create /users/${euser} uid ${euid} 567 dscl . create /users/${euser} uid ${euid}
656 dscl . create /users/${euser} shell ${eshell} 568 dscl . create /users/${euser} shell ${eshell}
657 dscl . create /users/${euser} home ${ehome} 569 dscl . create /users/${euser} home ${ehome}
658 dscl . create /users/${euser} realname "added by portage for ${PN}" 570 dscl . create /users/${euser} realname "added by portage for ${PN}"
659 ### Add the user to the groups specified 571 ### Add the user to the groups specified
660 local oldifs="${IFS}" 572 local oldifs=${IFS}
661 export IFS="," 573 export IFS=","
662 for g in ${egroups} 574 for g in ${egroups} ; do
663 do
664 dscl . merge /groups/${g} users ${euser} 575 dscl . merge /groups/${g} users ${euser}
665 done 576 done
666 export IFS="${oldifs}" 577 export IFS=${oldifs}
667 else 578 else
668 einfo "Extra options are not supported on macos yet" 579 einfo "Extra options are not supported on Darwin yet"
669 einfo "Please report the ebuild along with the info below" 580 einfo "Please report the ebuild along with the info below"
670 einfo "eextra: ${eextra}" 581 einfo "eextra: $@"
671 die "Required function missing" 582 die "Required function missing"
672 fi 583 fi
673 elif use x86-fbsd ; then 584 ;;
674 if [ -z "${eextra}" ] 585 *-freebsd*)
675 then 586 if [[ -z $@ ]] ; then
676 pw useradd ${euser} ${opts} \ 587 pw useradd ${euser} ${opts} \
677 -c "added by portage for ${PN}" \ 588 -c "added by portage for ${PN}" \
678 die "enewuser failed" 589 die "enewuser failed"
679 else 590 else
680 einfo " - Extra: ${eextra}" 591 einfo " - Extra: $@"
681 pw useradd ${euser} ${opts} \ 592 pw useradd ${euser} ${opts} \
682 -c ${eextra} || die "enewuser failed" 593 "$@" || die "enewuser failed"
683 fi 594 fi
595 ;;
596
597 *-netbsd*)
598 if [[ -z $@ ]] ; then
599 useradd ${opts} ${euser} || die "enewuser failed"
684 else 600 else
685 if [ -z "${eextra}" ] 601 einfo " - Extra: $@"
686 then 602 useradd ${opts} ${euser} "$@" || die "enewuser failed"
603 fi
604 ;;
605
606 *-openbsd*)
607 if [[ -z $@ ]] ; then
608 useradd -u ${euid} -s ${eshell} \
609 -d ${ehome} -c "Added by portage for ${PN}" \
610 -g ${egroups} ${euser} || die "enewuser failed"
611 else
612 einfo " - Extra: $@"
613 useradd -u ${euid} -s ${eshell} \
614 -d ${ehome} -c "Added by portage for ${PN}" \
615 -g ${egroups} ${euser} "$@" || die "enewuser failed"
616 fi
617 ;;
618
619 *)
620 if [[ -z $@ ]] ; then
687 useradd ${opts} ${euser} \ 621 useradd ${opts} ${euser} \
688 -c "added by portage for ${PN}" \ 622 -c "added by portage for ${PN}" \
689 || die "enewuser failed" 623 || die "enewuser failed"
690 else 624 else
691 einfo " - Extra: ${eextra}" 625 einfo " - Extra: $@"
692 useradd ${opts} ${euser} ${eextra} \ 626 useradd ${opts} ${euser} "$@" \
693 || die "enewuser failed" 627 || die "enewuser failed"
694 fi 628 fi
629 ;;
630 esac
631
632 if [[ ! -e ${ROOT}/${ehome} ]] ; then
633 einfo " - Creating ${ehome} in ${ROOT}"
634 mkdir -p "${ROOT}/${ehome}"
635 chown ${euser} "${ROOT}/${ehome}"
636 chmod 755 "${ROOT}/${ehome}"
695 fi 637 fi
638
696 export SANDBOX_ON="${oldsandbox}" 639 export SANDBOX_ON=${oldsandbox}
697
698 if [ ! -e "${ehome}" ] && [ ! -e "${D}/${ehome}" ]
699 then
700 einfo " - Creating ${ehome} in ${D}"
701 dodir ${ehome}
702 fowners ${euser} ${ehome}
703 fperms 755 ${ehome}
704 fi
705} 640}
706 641
707# Simplify/standardize adding groups to the system 642# Simplify/standardize adding groups to the system
708# vapier@gentoo.org 643# vapier@gentoo.org
709# 644#
738 then 673 then
739 if [ "${egid}" -gt 0 ] 674 if [ "${egid}" -gt 0 ]
740 then 675 then
741 if [ -z "`egetent group ${egid}`" ] 676 if [ -z "`egetent group ${egid}`" ]
742 then 677 then
743 if useq ppc-macos ; then 678 if [[ "${CHOST}" == *-darwin* ]]; then
744 opts="${opts} ${egid}" 679 opts="${opts} ${egid}"
745 else 680 else
746 opts="${opts} -g ${egid}" 681 opts="${opts} -g ${egid}"
747 fi 682 fi
748 else 683 else
762 opts="${opts} ${eextra}" 697 opts="${opts} ${eextra}"
763 698
764 # add the group 699 # add the group
765 local oldsandbox="${SANDBOX_ON}" 700 local oldsandbox="${SANDBOX_ON}"
766 export SANDBOX_ON="0" 701 export SANDBOX_ON="0"
767 if useq ppc-macos ; then 702 case ${CHOST} in
703 *-darwin*)
768 if [ ! -z "${eextra}" ]; 704 if [ ! -z "${eextra}" ];
769 then 705 then
770 einfo "Extra options are not supported on macos yet" 706 einfo "Extra options are not supported on Darwin/OS X yet"
771 einfo "Please report the ebuild along with the info below" 707 einfo "Please report the ebuild along with the info below"
772 einfo "eextra: ${eextra}" 708 einfo "eextra: ${eextra}"
773 die "Required function missing" 709 die "Required function missing"
774 fi 710 fi
775 711
776 # If we need the next available 712 # If we need the next available
777 case ${egid} in 713 case ${egid} in
778 *[!0-9]*) # Non numeric 714 *[!0-9]*) # Non numeric
779 for egid in `jot 898 101`; do 715 for egid in $(seq 101 999); do
780 [ -z "`egetent group ${egid}`" ] && break 716 [ -z "`egetent group ${egid}`" ] && break
781 done 717 done
782 esac 718 esac
783 dscl . create /groups/${egroup} gid ${egid} 719 dscl . create /groups/${egroup} gid ${egid}
784 dscl . create /groups/${egroup} passwd '*' 720 dscl . create /groups/${egroup} passwd '*'
785 elif use x86-fbsd ; then 721 ;;
722
723 *-freebsd*)
786 case ${egid} in 724 case ${egid} in
787 *[!0-9]*) # Non numeric 725 *[!0-9]*) # Non numeric
788 for egid in `jot 898 101`; do 726 for egid in $(seq 101 999); do
789 [ -z "`egetent group ${egid}`" ] && break 727 [ -z "`egetent group ${egid}`" ] && break
790 done 728 done
791 esac 729 esac
792 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 730 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
793 else 731 ;;
732
733 *-netbsd*)
734 case ${egid} in
735 *[!0-9]*) # Non numeric
736 for egid in $(seq 101 999); do
737 [ -z "`egetent group ${egid}`" ] && break
738 done
739 esac
740 groupadd -g ${egid} ${egroup} || die "enewgroup failed"
741 ;;
742
743 *)
794 groupadd ${opts} ${egroup} || die "enewgroup failed" 744 groupadd ${opts} ${egroup} || die "enewgroup failed"
795 fi 745 ;;
746 esac
796 export SANDBOX_ON="${oldsandbox}" 747 export SANDBOX_ON="${oldsandbox}"
797} 748}
798 749
799# Simple script to replace 'dos2unix' binaries 750# Simple script to replace 'dos2unix' binaries
800# vapier@gentoo.org 751# vapier@gentoo.org
825# name: the name that will show up in the menu 776# name: the name that will show up in the menu
826# icon: give your little like a pretty little icon ... 777# icon: give your little like a pretty little icon ...
827# this can be relative (to /usr/share/pixmaps) or 778# this can be relative (to /usr/share/pixmaps) or
828# a full path to an icon 779# a full path to an icon
829# type: what kind of application is this ? for categories: 780# type: what kind of application is this ? for categories:
830# http://www.freedesktop.org/wiki/Standards_2fmenu_2dspec 781# http://www.freedesktop.org/Standards/desktop-entry-spec
831# path: if your app needs to startup in a specific dir 782# path: if your app needs to startup in a specific dir
832make_desktop_entry() { 783make_desktop_entry() {
833 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1 784 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1
834 785
835 local exec=${1} 786 local exec=${1}
861 dev) 812 dev)
862 type="Development" 813 type="Development"
863 ;; 814 ;;
864 815
865 games) 816 games)
866 [[ -z ${path} ]] && path=${GAMES_BINDIR}
867
868 case ${catmin} in 817 case ${catmin} in
869 action) type=ActionGame;; 818 action) type=ActionGame;;
870 arcade) type=ArcadeGame;; 819 arcade) type=ArcadeGame;;
871 board) type=BoardGame;; 820 board) type=BoardGame;;
872 kid) type=KidsGame;; 821 kid) type=KidsGame;;
913 type="Network;${type}" 862 type="Network;${type}"
914 ;; 863 ;;
915 864
916 sci) 865 sci)
917 case ${catmin} in 866 case ${catmin} in
918 astro*) type=Astronomoy;; 867 astro*) type=Astronomy;;
919 bio*) type=Biology;; 868 bio*) type=Biology;;
920 calc*) type=Calculator;; 869 calc*) type=Calculator;;
921 chem*) type=Chemistry;; 870 chem*) type=Chemistry;;
922 geo*) type=Geology;; 871 geo*) type=Geology;;
923 math*) type=Math;; 872 math*) type=Math;;
937 *) 886 *)
938 type= 887 type=
939 ;; 888 ;;
940 esac 889 esac
941 fi 890 fi
942 891 if [ "${SLOT}" == "0" ] ; then
892 local desktop_name="${PN}"
893 else
894 local desktop_name="${PN}-${SLOT}"
895 fi
943 local desktop=${T}/${exec%% *}-${P}.desktop 896 local desktop=${T}/${exec%% *}-${desktop_name}.desktop
944 897
945echo "[Desktop Entry] 898echo "[Desktop Entry]
946Encoding=UTF-8 899Encoding=UTF-8
947Version=0.9.2 900Version=0.9.2
948Name=${name} 901Name=${name}
951Exec=${exec} 904Exec=${exec}
952Path=${path} 905Path=${path}
953Icon=${icon} 906Icon=${icon}
954Categories=Application;${type};" > "${desktop}" 907Categories=Application;${type};" > "${desktop}"
955 908
909 (
910 # wrap the env here so that the 'insinto' call
911 # doesn't corrupt the env of the caller
956 insinto /usr/share/applications 912 insinto /usr/share/applications
957 doins "${desktop}" 913 doins "${desktop}"
958 914 )
959 return 0
960} 915}
961 916
962# Make a GDM/KDM Session file 917# Make a GDM/KDM Session file
963# 918#
964# make_desktop_entry(<title>, <command>) 919# make_desktop_entry(<title>, <command>)
993 doins "${i}" 948 doins "${i}"
994 elif [[ -d ${i} ]] ; then 949 elif [[ -d ${i} ]] ; then
995 for j in "${i}"/*.desktop ; do 950 for j in "${i}"/*.desktop ; do
996 doins "${j}" 951 doins "${j}"
997 done 952 done
998 fi 953 fi
999 done 954 done
1000} 955}
1001newmenu() { 956newmenu() {
1002 insinto /usr/share/applications 957 insinto /usr/share/applications
1003 newins "$1" "$2" 958 newins "$1" "$2"
1011 doins "${i}" 966 doins "${i}"
1012 elif [[ -d ${i} ]] ; then 967 elif [[ -d ${i} ]] ; then
1013 for j in "${i}"/*.png ; do 968 for j in "${i}"/*.png ; do
1014 doins "${j}" 969 doins "${j}"
1015 done 970 done
1016 fi 971 fi
1017 done 972 done
1018} 973}
1019newicon() { 974newicon() {
1020 insinto /usr/share/pixmaps 975 insinto /usr/share/pixmaps
1021 newins "$1" "$2" 976 newins "$1" "$2"
1026############################################################## 981##############################################################
1027 982
1028 983
1029# for internal use only (unpack_pdv and unpack_makeself) 984# for internal use only (unpack_pdv and unpack_makeself)
1030find_unpackable_file() { 985find_unpackable_file() {
1031 local src="$1" 986 local src=$1
1032 if [ -z "${src}" ] 987 if [[ -z ${src} ]] ; then
1033 then
1034 src="${DISTDIR}/${A}" 988 src=${DISTDIR}/${A}
1035 else 989 else
1036 if [ -e "${DISTDIR}/${src}" ] 990 if [[ -e ${DISTDIR}/${src} ]] ; then
1037 then
1038 src="${DISTDIR}/${src}" 991 src=${DISTDIR}/${src}
1039 elif [ -e "${PWD}/${src}" ] 992 elif [[ -e ${PWD}/${src} ]] ; then
1040 then
1041 src="${PWD}/${src}" 993 src=${PWD}/${src}
1042 elif [ -e "${src}" ] 994 elif [[ -e ${src} ]] ; then
1043 then
1044 src="${src}" 995 src=${src}
1045 fi
1046 fi 996 fi
1047 [ ! -e "${src}" ] && die "Could not find requested archive ${src}" 997 fi
998 [[ ! -e ${src} ]] && return 1
1048 echo "${src}" 999 echo "${src}"
1049} 1000}
1050 1001
1051# Unpack those pesky pdv generated files ... 1002# Unpack those pesky pdv generated files ...
1052# They're self-unpacking programs with the binary package stuffed in 1003# They're self-unpacking programs with the binary package stuffed in
1067# lseek 1018# lseek
1068# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 1019# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
1069# lseek(3, -4, SEEK_END) = 2981250 1020# lseek(3, -4, SEEK_END) = 2981250
1070# thus we would pass in the value of '4' as the second parameter. 1021# thus we would pass in the value of '4' as the second parameter.
1071unpack_pdv() { 1022unpack_pdv() {
1072 local src="`find_unpackable_file $1`" 1023 local src=$(find_unpackable_file $1)
1073 local sizeoff_t="$2" 1024 local sizeoff_t=$2
1074 1025
1026 [[ -z ${src} ]] && die "Could not locate source for '$1'"
1075 [ -z "${sizeoff_t}" ] && die "No idea what off_t size was used for this pdv :(" 1027 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :("
1076 1028
1077 local shrtsrc="`basename ${src}`" 1029 local shrtsrc=$(basename "${src}")
1078 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1030 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1079 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1031 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"`
1080 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"` 1032 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"`
1081 1033
1082 # grab metadata for debug reasons 1034 # grab metadata for debug reasons
1146# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1098# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1147# - If the file is not specified then unpack will utilize ${A}. 1099# - If the file is not specified then unpack will utilize ${A}.
1148# - If the offset is not specified then we will attempt to extract 1100# - If the offset is not specified then we will attempt to extract
1149# the proper offset from the script itself. 1101# the proper offset from the script itself.
1150unpack_makeself() { 1102unpack_makeself() {
1103 local src_input=${1:-${A}}
1151 local src="$(find_unpackable_file "$1")" 1104 local src=$(find_unpackable_file "${src_input}")
1152 local skip="$2" 1105 local skip=$2
1153 local exe="$3" 1106 local exe=$3
1154 1107
1108 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
1109
1155 local shrtsrc="$(basename "${src}")" 1110 local shrtsrc=$(basename "${src}")
1156 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1111 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1157 if [ -z "${skip}" ] 1112 if [[ -z ${skip} ]] ; then
1158 then
1159 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1113 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}')
1160 local skip=0 1114 local skip=0
1161 exe=tail 1115 exe=tail
1162 case ${ver} in 1116 case ${ver} in
1163 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same 1117 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same
1164 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1118 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1176 ;; 1130 ;;
1177 2.1.3) 1131 2.1.3)
1178 skip=`grep -a ^offset= "${src}" | awk '{print $3}'` 1132 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1179 let skip="skip + 1" 1133 let skip="skip + 1"
1180 ;; 1134 ;;
1181 2.1.4) 1135 2.1.4|2.1.5)
1182 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1) 1136 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1)
1183 skip=$(head -n ${skip} "${src}" | wc -c) 1137 skip=$(head -n ${skip} "${src}" | wc -c)
1184 exe="dd" 1138 exe="dd"
1185 ;; 1139 ;;
1186 *) 1140 *)
1231check_license() { 1185check_license() {
1232 local lic=$1 1186 local lic=$1
1233 if [ -z "${lic}" ] ; then 1187 if [ -z "${lic}" ] ; then
1234 lic="${PORTDIR}/licenses/${LICENSE}" 1188 lic="${PORTDIR}/licenses/${LICENSE}"
1235 else 1189 else
1236 if [ -e "${PORTDIR}/licenses/${src}" ] ; then 1190 if [ -e "${PORTDIR}/licenses/${lic}" ] ; then
1237 lic="${PORTDIR}/licenses/${src}" 1191 lic="${PORTDIR}/licenses/${lic}"
1238 elif [ -e "${PWD}/${src}" ] ; then 1192 elif [ -e "${PWD}/${lic}" ] ; then
1239 lic="${PWD}/${src}" 1193 lic="${PWD}/${lic}"
1240 elif [ -e "${src}" ] ; then 1194 elif [ -e "${lic}" ] ; then
1241 lic="${src}" 1195 lic="${lic}"
1242 fi
1243 fi 1196 fi
1197 fi
1244 [ ! -f "${lic}" ] && die "Could not find requested license ${src}" 1198 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1245 local l="`basename ${lic}`" 1199 local l="`basename ${lic}`"
1246 1200
1247 # here is where we check for the licenses the user already 1201 # here is where we check for the licenses the user already
1248 # accepted ... if we don't find a match, we make the user accept 1202 # accepted ... if we don't find a match, we make the user accept
1249 local shopts=$- 1203 local shopts=$-
1305 # first we figure out how many cds we're dealing with by 1259 # first we figure out how many cds we're dealing with by
1306 # the # of files they gave us 1260 # the # of files they gave us
1307 local cdcnt=0 1261 local cdcnt=0
1308 local f= 1262 local f=
1309 for f in "$@" ; do 1263 for f in "$@" ; do
1310 cdcnt=$((cdcnt + 1)) 1264 ((++cdcnt))
1311 export CDROM_CHECK_${cdcnt}="$f" 1265 export CDROM_CHECK_${cdcnt}="$f"
1312 done 1266 done
1313 export CDROM_TOTAL_CDS=${cdcnt} 1267 export CDROM_TOTAL_CDS=${cdcnt}
1314 export CDROM_CURRENT_CD=1 1268 export CDROM_CURRENT_CD=1
1315 1269
1316 # now we see if the user gave use CD_ROOT ... 1270 # now we see if the user gave use CD_ROOT ...
1317 # if they did, let's just believe them that it's correct 1271 # if they did, let's just believe them that it's correct
1318 if [[ ! -z ${CD_ROOT} ]] ; then
1319 export CDROM_ROOT=${CD_ROOT}
1320 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1321 return
1322 fi
1323 # do the same for CD_ROOT_X
1324 if [[ ! -z ${CD_ROOT_1} ]] ; then 1272 if [[ -n ${CD_ROOT}${CD_ROOT_1} ]] ; then
1325 local var= 1273 local var=
1326 cdcnt=0 1274 cdcnt=0
1327 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1275 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1328 cdcnt=$((cdcnt + 1)) 1276 ((++cdcnt))
1329 var="CD_ROOT_${cdcnt}" 1277 var="CD_ROOT_${cdcnt}"
1278 [[ -z ${!var} ]] && var="CD_ROOT"
1330 if [[ -z ${!var} ]] ; then 1279 if [[ -z ${!var} ]] ; then
1331 eerror "You must either use just the CD_ROOT" 1280 eerror "You must either use just the CD_ROOT"
1332 eerror "or specify ALL the CD_ROOT_X variables." 1281 eerror "or specify ALL the CD_ROOT_X variables."
1333 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables." 1282 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables."
1334 die "could not locate CD_ROOT_${cdcnt}" 1283 die "could not locate CD_ROOT_${cdcnt}"
1335 fi 1284 fi
1336 export CDROM_ROOTS_${cdcnt}="${!var}"
1337 done 1285 done
1338 export CDROM_ROOT=${CDROM_ROOTS_1} 1286 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}}
1339 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1287 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1288 export CDROM_SET=-1
1289 for f in ${CDROM_CHECK_1//:/ } ; do
1290 ((++CDROM_SET))
1291 [[ -e ${CD_ROOT}/${f} ]] && break
1292 done
1293 export CDROM_MATCH=${f}
1340 return 1294 return
1341 fi 1295 fi
1342 1296
1297 # User didn't help us out so lets make sure they know they can
1298 # simplify the whole process ...
1343 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1299 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1344 einfon "This ebuild will need the " 1300 einfo "This ebuild will need the ${CDROM_NAME:-cdrom for ${PN}}"
1345 if [[ -z ${CDROM_NAME} ]] ; then
1346 echo "cdrom for ${PN}."
1347 else
1348 echo "${CDROM_NAME}."
1349 fi
1350 echo 1301 echo
1351 einfo "If you do not have the CD, but have the data files" 1302 einfo "If you do not have the CD, but have the data files"
1352 einfo "mounted somewhere on your filesystem, just export" 1303 einfo "mounted somewhere on your filesystem, just export"
1353 einfo "the variable CD_ROOT so that it points to the" 1304 einfo "the variable CD_ROOT so that it points to the"
1354 einfo "directory containing the files." 1305 einfo "directory containing the files."
1358 echo 1309 echo
1359 else 1310 else
1360 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1311 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1361 cdcnt=0 1312 cdcnt=0
1362 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1313 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1363 cdcnt=$((cdcnt + 1)) 1314 ((++cdcnt))
1364 var="CDROM_NAME_${cdcnt}" 1315 var="CDROM_NAME_${cdcnt}"
1365 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}" 1316 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}"
1366 done 1317 done
1367 echo 1318 echo
1368 einfo "If you do not have the CDs, but have the data files" 1319 einfo "If you do not have the CDs, but have the data files"
1369 einfo "mounted somewhere on your filesystem, just export" 1320 einfo "mounted somewhere on your filesystem, just export"
1370 einfo "the following variables so they point to the right place:" 1321 einfo "the following variables so they point to the right place:"
1371 einfon "" 1322 einfon ""
1372 cdcnt=0 1323 cdcnt=0
1373 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1324 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1374 cdcnt=$((cdcnt + 1)) 1325 ((++cdcnt))
1375 echo -n " CD_ROOT_${cdcnt}" 1326 echo -n " CD_ROOT_${cdcnt}"
1376 done 1327 done
1377 echo 1328 echo
1378 einfo "Or, if you have all the files in the same place, or" 1329 einfo "Or, if you have all the files in the same place, or"
1379 einfo "you only have one cdrom, you can export CD_ROOT" 1330 einfo "you only have one cdrom, you can export CD_ROOT"
1382 echo 1333 echo
1383 einfo "For example:" 1334 einfo "For example:"
1384 einfo "export CD_ROOT_1=/mnt/cdrom" 1335 einfo "export CD_ROOT_1=/mnt/cdrom"
1385 echo 1336 echo
1386 fi 1337 fi
1338
1339 export CDROM_SET=""
1387 export CDROM_CURRENT_CD=0 1340 export CDROM_CURRENT_CD=0
1388 cdrom_load_next_cd 1341 cdrom_load_next_cd
1389} 1342}
1390 1343
1391# this is only used when you need access to more than one cd. 1344# this is only used when you need access to more than one cd.
1392# when you have finished using the first cd, just call this function. 1345# when you have finished using the first cd, just call this function.
1393# when it returns, CDROM_ROOT will be pointing to the second cd. 1346# when it returns, CDROM_ROOT will be pointing to the second cd.
1394# remember, you can only go forward in the cd chain, you can't go back. 1347# remember, you can only go forward in the cd chain, you can't go back.
1395cdrom_load_next_cd() { 1348cdrom_load_next_cd() {
1396 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1397 local var= 1349 local var
1398 1350 ((++CDROM_CURRENT_CD))
1399 if [[ ! -z ${CD_ROOT} ]] ; then
1400 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}"
1401 return
1402 fi
1403 1351
1404 unset CDROM_ROOT 1352 unset CDROM_ROOT
1405 var=CDROM_ROOTS_${CDROM_CURRENT_CD} 1353 var=CD_ROOT_${CDROM_CURRENT_CD}
1354 [[ -z ${!var} ]] && var="CD_ROOT"
1406 if [[ -z ${!var} ]] ; then 1355 if [[ -z ${!var} ]] ; then
1407 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1356 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1408 cdrom_locate_file_on_cd ${!var} 1357 _cdrom_locate_file_on_cd ${!var}
1409 else 1358 else
1410 export CDROM_ROOT=${!var} 1359 export CDROM_ROOT=${!var}
1411 fi 1360 fi
1412 1361
1413 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1362 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1418# all it does is try to locate a give file on a cd ... if the cd isn't 1367# all it does is try to locate a give file on a cd ... if the cd isn't
1419# found, then a message asking for the user to insert the cdrom will be 1368# found, then a message asking for the user to insert the cdrom will be
1420# displayed and we'll hang out here until: 1369# displayed and we'll hang out here until:
1421# (1) the file is found on a mounted cdrom 1370# (1) the file is found on a mounted cdrom
1422# (2) the user hits CTRL+C 1371# (2) the user hits CTRL+C
1423cdrom_locate_file_on_cd() { 1372_cdrom_locate_file_on_cd() {
1373 local mline=""
1374 local showedmsg=0
1375
1424 while [[ -z ${CDROM_ROOT} ]] ; do 1376 while [[ -z ${CDROM_ROOT} ]] ; do
1377 local i=0
1378 local -a cdset=(${*//:/ })
1379 if [[ -n ${CDROM_SET} ]] ; then
1380 cdset=(${cdset[${CDROM_SET}]})
1381 fi
1382
1383 while [[ -n ${cdset[${i}]} ]] ; do
1425 local dir="$(dirname ${@})" 1384 local dir=$(dirname ${cdset[${i}]})
1426 local file="$(basename ${@})" 1385 local file=$(basename ${cdset[${i}]})
1427 local mline=""
1428 local showedmsg=0
1429 1386
1430 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do 1387 for mline in $(mount | gawk '/(iso|cdrom|fs=cdfss)/ {print $3}') ; do
1431 [[ -d ${mline}/${dir} ]] || continue 1388 [[ -d ${mline}/${dir} ]] || continue
1432 [[ ! -z $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] \ 1389 if [[ -n $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] ; then
1433 && export CDROM_ROOT=${mline} 1390 export CDROM_ROOT=${mline}
1391 export CDROM_SET=${i}
1392 export CDROM_MATCH=${cdset[${i}]}
1393 return
1394 fi
1395 done
1396
1397 ((++i))
1434 done 1398 done
1435 1399
1436 if [[ -z ${CDROM_ROOT} ]] ; then
1437 echo 1400 echo
1438 if [[ ${showedmsg} -eq 0 ]] ; then 1401 if [[ ${showedmsg} -eq 0 ]] ; then
1439 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1402 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1440 if [[ -z ${CDROM_NAME} ]] ; then 1403 if [[ -z ${CDROM_NAME} ]] ; then
1441 einfo "Please insert the cdrom for ${PN} now !" 1404 einfo "Please insert+mount the cdrom for ${PN} now !"
1442 else
1443 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1444 fi
1445 else 1405 else
1446 if [[ -z ${CDROM_NAME_1} ]] ; then
1447 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !"
1448 else
1449 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1450 einfo "Please insert+mount the ${!var} cdrom now !" 1406 einfo "Please insert+mount the ${CDROM_NAME} cdrom now !"
1451 fi
1452 fi 1407 fi
1453 showedmsg=1 1408 else
1409 if [[ -z ${CDROM_NAME_1} ]] ; then
1410 einfo "Please insert+mount cd #${CDROM_CURRENT_CD} for ${PN} now !"
1411 else
1412 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1413 einfo "Please insert+mount the ${!var} cdrom now !"
1414 fi
1454 fi 1415 fi
1416 showedmsg=1
1417 fi
1455 einfo "Press return to scan for the cd again" 1418 einfo "Press return to scan for the cd again"
1456 einfo "or hit CTRL+C to abort the emerge." 1419 einfo "or hit CTRL+C to abort the emerge."
1420 echo
1421 einfo "If you are having trouble with the detection"
1422 einfo "of your CD, it is possible that you do not have"
1423 einfo "Joliet support enabled in your kernel. Please"
1424 einfo "check that CONFIG_JOLIET is enabled in your kernel."
1457 read 1425 read
1458 fi
1459 done 1426 done
1460} 1427}
1461 1428
1462# Make sure that LINGUAS only contains languages that 1429# Make sure that LINGUAS only contains languages that
1463# a package can support 1430# a package can support
1525 while ((i--)) ; do 1492 while ((i--)) ; do
1526 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass" 1493 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1527 done 1494 done
1528 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}" 1495 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1529 case ${ARCH} in 1496 case ${ARCH} in
1530 x86) export ARCH="i386";; 1497 x86) export ARCH="i386";;
1531 amd64) export ARCH="x86_64";; 1498 amd64) export ARCH="x86_64";;
1532 hppa) export ARCH="parisc";; 1499 hppa) export ARCH="parisc";;
1533 mips) export ARCH="mips";; 1500 mips) export ARCH="mips";;
1534 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! 1501 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!
1535 *) export ARCH="${ARCH}";; 1502 *) export ARCH="${ARCH}";;
1536 esac 1503 esac
1537} 1504}
1538 1505
1539# set's ARCH back to what portage expects 1506# set's ARCH back to what portage expects
1540set_arch_to_portage() { 1507set_arch_to_portage() {
1584 LIB=$1 1551 LIB=$1
1585 1552
1586 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1553 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1587 SONAME=`basename ${LIB}` 1554 SONAME=`basename ${LIB}`
1588 1555
1589 einfo "An old version of an installed library was detected on your system." 1556 ewarn "An old version of an installed library was detected on your system."
1590 einfo "In order to avoid breaking packages that link against is, this older version" 1557 ewarn "In order to avoid breaking packages that link against it, this older version"
1591 einfo "is not being removed. In order to make full use of this newer version," 1558 ewarn "is not being removed. In order to make full use of this newer version,"
1592 einfo "you will need to execute the following command:" 1559 ewarn "you will need to execute the following command:"
1593 einfo " revdep-rebuild --soname ${SONAME}" 1560 ewarn " revdep-rebuild --soname ${SONAME}"
1594 einfo 1561 ewarn
1595 einfo "After doing that, you can safely remove ${LIB}" 1562 ewarn "After doing that, you can safely remove ${LIB}"
1596 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild" 1563 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1597 fi 1564 fi
1598} 1565}
1599 1566
1600# Hack for people to figure out if a package was built with 1567# Hack for people to figure out if a package was built with
1601# certain USE flags 1568# certain USE flags
1611 [[ ${opt:0:1} = "-" ]] && shift || opt="-a" 1578 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1612 1579
1613 local PKG=$(best_version $1) 1580 local PKG=$(best_version $1)
1614 shift 1581 shift
1615 1582
1616 local USEFILE="${ROOT}/var/db/pkg/${PKG}/USE" 1583 local USEFILE=${ROOT}/var/db/pkg/${PKG}/USE
1584
1585 # if the USE file doesnt exist, assume the $PKG is either
1586 # injected or package.provided
1617 [[ ! -e ${USEFILE} ]] && return 1 1587 [[ ! -e ${USEFILE} ]] && return 0
1618 1588
1619 local USE_BUILT=$(<${USEFILE}) 1589 local USE_BUILT=$(<${USEFILE})
1620 while [[ $# -gt 0 ]] ; do 1590 while [[ $# -gt 0 ]] ; do
1621 if [[ ${opt} = "-o" ]] ; then 1591 if [[ ${opt} = "-o" ]] ; then
1622 has $1 ${USE_BUILT} && return 0 1592 has $1 ${USE_BUILT} && return 0
1674# $4 == extra LD_LIBRARY_PATH's (make it : delimited) 1644# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1675# $5 == path for wrapper 1645# $5 == path for wrapper
1676make_wrapper() { 1646make_wrapper() {
1677 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5 1647 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1678 local tmpwrapper=$(emktemp) 1648 local tmpwrapper=$(emktemp)
1649 # We don't want to quote ${bin} so that people can pass complex
1650 # things as $bin ... "./someprog --args"
1679 cat << EOF > "${tmpwrapper}" 1651 cat << EOF > "${tmpwrapper}"
1680#!/bin/sh 1652#!/bin/sh
1681cd "${chdir}" 1653cd "${chdir:-.}"
1654if [ -n "${libdir}" ] ; then
1655 if [ "\${LD_LIBRARY_PATH+set}" = "set" ] ; then
1682export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}" 1656 export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1657 else
1658 export LD_LIBRARY_PATH="${libdir}"
1659 fi
1660fi
1683exec ${bin} "\$@" 1661exec ${bin} "\$@"
1684EOF 1662EOF
1685 chmod go+rx "${tmpwrapper}" 1663 chmod go+rx "${tmpwrapper}"
1686 if [ -n "${5}" ] 1664 if [[ -n ${path} ]] ; then
1687 then
1688 exeinto ${5} 1665 exeinto "${path}"
1689 newexe "${tmpwrapper}" "${wrapper}" 1666 newexe "${tmpwrapper}" "${wrapper}"
1690 else 1667 else
1691 newbin "${tmpwrapper}" "${wrapper}" 1668 newbin "${tmpwrapper}" "${wrapper}"
1692 fi 1669 fi
1693} 1670}

Legend:
Removed from v.1.172  
changed lines
  Added in v.1.218

  ViewVC Help
Powered by ViewVC 1.1.20