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

Diff of /eclass/eutils.eclass

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

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

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

  ViewVC Help
Powered by ViewVC 1.1.20