/[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.200
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.200 2005/09/23 20:44:26 wolf31o2 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}"
173 local STDERR_TARGET="${T}/$$.out" 172 local STDERR_TARGET="${T}/$$.out"
174 local PATCH_TARGET="${T}/$$.patch" 173 local PATCH_TARGET="${T}/$$.patch"
175 local PATCH_SUFFIX="" 174 local PATCH_SUFFIX=""
176 local SINGLE_PATCH="no" 175 local SINGLE_PATCH="no"
177 local x="" 176 local x=""
177
178 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402
178 179
179 if [ "$#" -gt 1 ] 180 if [ "$#" -gt 1 ]
180 then 181 then
181 local m="" 182 local m=""
182 for m in "$@" ; do 183 for m in "$@" ; do
249 # New ARCH dependant patch naming scheme ... 250 # New ARCH dependant patch naming scheme ...
250 # 251 #
251 # ???_arch_foo.patch 252 # ???_arch_foo.patch
252 # 253 #
253 if [ -f ${x} ] && \ 254 if [ -f ${x} ] && \
254 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "`eval echo \$\{x/_${ARCH}_\}`" != "${x}" ] || \ 255 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "${x/_${ARCH}_}" != "${x}" ] || \
255 [ "${EPATCH_FORCE}" = "yes" ]) 256 [ "${EPATCH_FORCE}" = "yes" ])
256 then 257 then
257 local count=0 258 local count=0
258 local popts="${EPATCH_OPTS}" 259 local popts="${EPATCH_OPTS}"
259 local patchname=${x##*/} 260 local patchname=${x##*/}
369 then 370 then
370 einfo "Done with patching" 371 einfo "Done with patching"
371 fi 372 fi
372} 373}
373 374
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) 375# Cheap replacement for when debianutils (and thus mktemp)
456# does not exist on the users system 376# does not exist on the users system
457# vapier@gentoo.org 377# vapier@gentoo.org
458# 378#
459# Takes just 1 optional parameter (the directory to create tmpfile in) 379# Takes just 1 optional parameter (the directory to create tmpfile in)
460emktemp() { 380emktemp() {
461 local exe="touch" 381 local exe="touch"
462 [ "$1" == "-d" ] && exe="mkdir" && shift 382 [[ $1 == -d ]] && exe="mkdir" && shift
463 local topdir="$1" 383 local topdir=$1
464 384
465 if [ -z "${topdir}" ] 385 if [[ -z ${topdir} ]] ; then
466 then
467 [ -z "${T}" ] \ 386 [[ -z ${T} ]] \
468 && topdir="/tmp" \ 387 && topdir="/tmp" \
469 || topdir="${T}" 388 || topdir=${T}
470 fi 389 fi
471 390
472 if [ -z "$(type -p mktemp)" ] 391 if [[ -z $(type -p mktemp) ]] ; then
473 then
474 local tmp=/ 392 local tmp=/
475 while [ -e "${tmp}" ] ; do 393 while [[ -e ${tmp} ]] ; do
476 tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}" 394 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}
477 done 395 done
478 ${exe} "${tmp}" 396 ${exe} "${tmp}" || ${exe} -p "${tmp}"
479 echo "${tmp}" 397 echo "${tmp}"
480 else 398 else
481 [ "${exe}" == "touch" ] \ 399 [[ ${exe} == "touch" ]] \
482 && exe="-p" \ 400 && exe="-p" \
483 || exe="-d" 401 || exe="-d"
484 mktemp ${exe} "${topdir}" 402 mktemp ${exe} "${topdir}"
485 fi 403 fi
486} 404}
490# Joe Jezak <josejx@gmail.com> and usata@gentoo.org 408# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
491# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org> 409# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
492# 410#
493# egetent(database, key) 411# egetent(database, key)
494egetent() { 412egetent() {
495 if useq ppc-macos ; then 413 if [[ "${USERLAND}" == "Darwin" ]] ; then
496 case "$2" in 414 case "$2" in
497 *[!0-9]*) # Non numeric 415 *[!0-9]*) # Non numeric
498 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 416 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
499 ;; 417 ;;
500 *) # Numeric 418 *) # Numeric
501 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 419 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
502 ;; 420 ;;
503 esac 421 esac
504 elif useq x86-fbsd ; then 422 elif [[ "${USERLAND}" == "BSD" ]] ; then
505 local action 423 local action
506 if [ "$1" == "passwd" ] 424 if [ "$1" == "passwd" ]
507 then 425 then
508 action="user" 426 action="user"
509 else 427 else
529# homedir: /dev/null 447# homedir: /dev/null
530# groups: none 448# groups: none
531# extra: comment of 'added by portage for ${PN}' 449# extra: comment of 'added by portage for ${PN}'
532enewuser() { 450enewuser() {
533 # get the username 451 # get the username
534 local euser="$1"; shift 452 local euser=$1; shift
535 if [ -z "${euser}" ] 453 if [[ -z ${euser} ]] ; then
536 then
537 eerror "No username specified !" 454 eerror "No username specified !"
538 die "Cannot call enewuser without a username" 455 die "Cannot call enewuser without a username"
539 fi 456 fi
540 457
541 # lets see if the username already exists 458 # lets see if the username already exists
542 if [ "${euser}" == "`egetent passwd \"${euser}\" | cut -d: -f1`" ] 459 if [[ ${euser} == $(egetent passwd "${euser}" | cut -d: -f1) ]] ; then
543 then
544 return 0 460 return 0
545 fi 461 fi
546 einfo "Adding user '${euser}' to your system ..." 462 einfo "Adding user '${euser}' to your system ..."
547 463
548 # options to pass to useradd 464 # options to pass to useradd
549 local opts= 465 local opts=
550 466
551 # handle uid 467 # handle uid
552 local euid="$1"; shift 468 local euid=$1; shift
553 if [ ! -z "${euid}" ] && [ "${euid}" != "-1" ] 469 if [[ ! -z ${euid} ]] && [[ ${euid} != "-1" ]] ; then
554 then
555 if [ "${euid}" -gt 0 ] 470 if [[ ${euid} -gt 0 ]] ; then
556 then
557 if [ ! -z "`egetent passwd ${euid}`" ] 471 if [[ ! -z $(egetent passwd ${euid}) ]] ; then
558 then
559 euid="next" 472 euid="next"
560 fi 473 fi
561 else 474 else
562 eerror "Userid given but is not greater than 0 !" 475 eerror "Userid given but is not greater than 0 !"
563 die "${euid} is not a valid UID" 476 die "${euid} is not a valid UID"
564 fi 477 fi
565 else 478 else
566 euid="next" 479 euid="next"
567 fi 480 fi
568 if [ "${euid}" == "next" ] 481 if [[ ${euid} == "next" ]] ; then
569 then 482 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 483 [[ -z $(egetent passwd ${euid}) ]] && break
578 done 484 done
579 fi 485 fi
580 opts="${opts} -u ${euid}" 486 opts="${opts} -u ${euid}"
581 einfo " - Userid: ${euid}" 487 einfo " - Userid: ${euid}"
582 488
583 # handle shell 489 # handle shell
584 local eshell="$1"; shift 490 local eshell=$1; shift
585 if [ ! -z "${eshell}" ] && [ "${eshell}" != "-1" ] 491 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
586 then
587 if [ ! -e "${eshell}" ] 492 if [[ ! -e ${eshell} ]] ; then
588 then
589 eerror "A shell was specified but it does not exist !" 493 eerror "A shell was specified but it does not exist !"
590 die "${eshell} does not exist" 494 die "${eshell} does not exist"
591 fi 495 fi
592 else 496 else
593 if [ "${USERLAND}" == "BSD" ] 497 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null; do
594 then 498 [[ -x ${ROOT}${shell} ]] && break;
595 eshell="/usr/bin/false" 499 done
596 else 500
597 eshell="/bin/false" 501 if [[ ${shell} == "/dev/null" ]]; then
502 eerror "Unable to identify the shell to use"
503 die "Unable to identify the shell to use"
598 fi 504 fi
505
506 eshell=${shell}
599 fi 507 fi
600 einfo " - Shell: ${eshell}" 508 einfo " - Shell: ${eshell}"
601 opts="${opts} -s ${eshell}" 509 opts="${opts} -s ${eshell}"
602 510
603 # handle homedir 511 # handle homedir
604 local ehome="$1"; shift 512 local ehome=$1; shift
605 if [ -z "${ehome}" ] && [ "${eshell}" != "-1" ] 513 if [[ -z ${ehome} ]] || [[ ${ehome} == "-1" ]] ; then
606 then
607 ehome="/dev/null" 514 ehome="/dev/null"
608 fi 515 fi
609 einfo " - Home: ${ehome}" 516 einfo " - Home: ${ehome}"
610 opts="${opts} -d ${ehome}" 517 opts="${opts} -d ${ehome}"
611 518
612 # handle groups 519 # handle groups
613 local egroups="$1"; shift 520 local egroups=$1; shift
614 if [ ! -z "${egroups}" ] 521 if [[ ! -z ${egroups} ]] ; then
615 then
616 local oldifs="${IFS}" 522 local oldifs=${IFS}
617 local defgroup="" exgroups="" 523 local defgroup="" exgroups=""
618 524
619 export IFS="," 525 export IFS=","
620 for g in ${egroups} 526 for g in ${egroups} ; do
621 do
622 export IFS="${oldifs}" 527 export IFS=${oldifs}
623 if [ -z "`egetent group \"${g}\"`" ] 528 if [[ -z $(egetent group "${g}") ]] ; then
624 then
625 eerror "You must add group ${g} to the system first" 529 eerror "You must add group ${g} to the system first"
626 die "${g} is not a valid GID" 530 die "${g} is not a valid GID"
627 fi 531 fi
628 if [ -z "${defgroup}" ] 532 if [[ -z ${defgroup} ]] ; then
629 then
630 defgroup="${g}" 533 defgroup=${g}
631 else 534 else
632 exgroups="${exgroups},${g}" 535 exgroups="${exgroups},${g}"
633 fi 536 fi
634 export IFS="," 537 export IFS=","
635 done 538 done
636 export IFS="${oldifs}" 539 export IFS=${oldifs}
637 540
638 opts="${opts} -g ${defgroup}" 541 opts="${opts} -g ${defgroup}"
639 if [ ! -z "${exgroups}" ] 542 if [[ ! -z ${exgroups} ]] ; then
640 then
641 opts="${opts} -G ${exgroups:1}" 543 opts="${opts} -G ${exgroups:1}"
642 fi 544 fi
643 else 545 else
644 egroups="(none)" 546 egroups="(none)"
645 fi 547 fi
646 einfo " - Groups: ${egroups}" 548 einfo " - Groups: ${egroups}"
647 549
648 # handle extra and add the user 550 # handle extra and add the user
649 local eextra="$@"
650 local oldsandbox="${SANDBOX_ON}" 551 local oldsandbox=${SANDBOX_ON}
651 export SANDBOX_ON="0" 552 export SANDBOX_ON="0"
652 if useq ppc-macos 553 case ${USERLAND} in
653 then 554 Darwin)
654 ### Make the user 555 ### Make the user
655 if [ -z "${eextra}" ] 556 if [[ -z $@ ]] ; then
656 then
657 dscl . create /users/${euser} uid ${euid} 557 dscl . create /users/${euser} uid ${euid}
658 dscl . create /users/${euser} shell ${eshell} 558 dscl . create /users/${euser} shell ${eshell}
659 dscl . create /users/${euser} home ${ehome} 559 dscl . create /users/${euser} home ${ehome}
660 dscl . create /users/${euser} realname "added by portage for ${PN}" 560 dscl . create /users/${euser} realname "added by portage for ${PN}"
661 ### Add the user to the groups specified 561 ### Add the user to the groups specified
662 local oldifs="${IFS}" 562 local oldifs=${IFS}
663 export IFS="," 563 export IFS=","
664 for g in ${egroups} 564 for g in ${egroups} ; do
665 do
666 dscl . merge /groups/${g} users ${euser} 565 dscl . merge /groups/${g} users ${euser}
667 done 566 done
668 export IFS="${oldifs}" 567 export IFS=${oldifs}
669 else 568 else
670 einfo "Extra options are not supported on macos yet" 569 einfo "Extra options are not supported on Darwin yet"
671 einfo "Please report the ebuild along with the info below" 570 einfo "Please report the ebuild along with the info below"
672 einfo "eextra: ${eextra}" 571 einfo "eextra: $@"
673 die "Required function missing" 572 die "Required function missing"
674 fi 573 fi
675 elif use x86-fbsd ; then 574 ;;
676 if [ -z "${eextra}" ] 575 BSD)
677 then 576 if [[ -z $@ ]] ; then
678 pw useradd ${euser} ${opts} \ 577 pw useradd ${euser} ${opts} \
679 -c "added by portage for ${PN}" \ 578 -c "added by portage for ${PN}" \
680 die "enewuser failed" 579 die "enewuser failed"
681 else 580 else
682 einfo " - Extra: ${eextra}" 581 einfo " - Extra: $@"
683 pw useradd ${euser} ${opts} \ 582 pw useradd ${euser} ${opts} \
684 -c ${eextra} || die "enewuser failed" 583 "$@" || die "enewuser failed"
685 fi 584 fi
686 else 585 ;;
687 if [ -z "${eextra}" ] 586 *)
688 then 587 if [[ -z $@ ]] ; then
689 useradd ${opts} ${euser} \ 588 useradd ${opts} ${euser} \
690 -c "added by portage for ${PN}" \ 589 -c "added by portage for ${PN}" \
691 || die "enewuser failed" 590 || die "enewuser failed"
692 else 591 else
693 einfo " - Extra: ${eextra}" 592 einfo " - Extra: $@"
694 useradd ${opts} ${euser} ${eextra} \ 593 useradd ${opts} ${euser} "$@" \
695 || die "enewuser failed" 594 || die "enewuser failed"
696 fi 595 fi
596 ;;
597 esac
598
599 if [[ ! -e ${ROOT}/${ehome} ]] ; then
600 einfo " - Creating ${ehome} in ${ROOT}"
601 mkdir -p "${ROOT}/${ehome}"
602 chown ${euser} "${ROOT}/${ehome}"
603 chmod 755 "${ROOT}/${ehome}"
697 fi 604 fi
605
698 export SANDBOX_ON="${oldsandbox}" 606 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} 607}
708 608
709# Simplify/standardize adding groups to the system 609# Simplify/standardize adding groups to the system
710# vapier@gentoo.org 610# vapier@gentoo.org
711# 611#
740 then 640 then
741 if [ "${egid}" -gt 0 ] 641 if [ "${egid}" -gt 0 ]
742 then 642 then
743 if [ -z "`egetent group ${egid}`" ] 643 if [ -z "`egetent group ${egid}`" ]
744 then 644 then
745 if useq ppc-macos ; then 645 if [[ "${USERLAND}" == "Darwin" ]]; then
746 opts="${opts} ${egid}" 646 opts="${opts} ${egid}"
747 else 647 else
748 opts="${opts} -g ${egid}" 648 opts="${opts} -g ${egid}"
749 fi 649 fi
750 else 650 else
764 opts="${opts} ${eextra}" 664 opts="${opts} ${eextra}"
765 665
766 # add the group 666 # add the group
767 local oldsandbox="${SANDBOX_ON}" 667 local oldsandbox="${SANDBOX_ON}"
768 export SANDBOX_ON="0" 668 export SANDBOX_ON="0"
769 if useq ppc-macos ; then 669 if [[ "${USERLAND}" == "Darwin" ]]; then
770 if [ ! -z "${eextra}" ]; 670 if [ ! -z "${eextra}" ];
771 then 671 then
772 einfo "Extra options are not supported on macos yet" 672 einfo "Extra options are not supported on Darwin/OS X yet"
773 einfo "Please report the ebuild along with the info below" 673 einfo "Please report the ebuild along with the info below"
774 einfo "eextra: ${eextra}" 674 einfo "eextra: ${eextra}"
775 die "Required function missing" 675 die "Required function missing"
776 fi 676 fi
777 677
778 # If we need the next available 678 # If we need the next available
779 case ${egid} in 679 case ${egid} in
780 *[!0-9]*) # Non numeric 680 *[!0-9]*) # Non numeric
781 for egid in `jot 898 101`; do 681 for egid in $(seq 101 999); do
782 [ -z "`egetent group ${egid}`" ] && break 682 [ -z "`egetent group ${egid}`" ] && break
783 done 683 done
784 esac 684 esac
785 dscl . create /groups/${egroup} gid ${egid} 685 dscl . create /groups/${egroup} gid ${egid}
786 dscl . create /groups/${egroup} passwd '*' 686 dscl . create /groups/${egroup} passwd '*'
787 elif use x86-fbsd ; then 687 elif [[ "${USERLAND}" == "BSD" ]] ; then
788 case ${egid} in 688 case ${egid} in
789 *[!0-9]*) # Non numeric 689 *[!0-9]*) # Non numeric
790 for egid in `jot 898 101`; do 690 for egid in $(seq 101 999); do
791 [ -z "`egetent group ${egid}`" ] && break 691 [ -z "`egetent group ${egid}`" ] && break
792 done 692 done
793 esac 693 esac
794 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 694 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
795 else 695 else
827# name: the name that will show up in the menu 727# name: the name that will show up in the menu
828# icon: give your little like a pretty little icon ... 728# icon: give your little like a pretty little icon ...
829# this can be relative (to /usr/share/pixmaps) or 729# this can be relative (to /usr/share/pixmaps) or
830# a full path to an icon 730# a full path to an icon
831# type: what kind of application is this ? for categories: 731# type: what kind of application is this ? for categories:
832# http://www.freedesktop.org/wiki/Standards_2fmenu_2dspec 732# http://www.freedesktop.org/Standards/desktop-entry-spec
833# path: if your app needs to startup in a specific dir 733# path: if your app needs to startup in a specific dir
834make_desktop_entry() { 734make_desktop_entry() {
835 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1 735 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1
836 736
837 local exec=${1} 737 local exec=${1}
863 dev) 763 dev)
864 type="Development" 764 type="Development"
865 ;; 765 ;;
866 766
867 games) 767 games)
868 [[ -z ${path} ]] && path=${GAMES_BINDIR}
869
870 case ${catmin} in 768 case ${catmin} in
871 action) type=ActionGame;; 769 action) type=ActionGame;;
872 arcade) type=ArcadeGame;; 770 arcade) type=ArcadeGame;;
873 board) type=BoardGame;; 771 board) type=BoardGame;;
874 kid) type=KidsGame;; 772 kid) type=KidsGame;;
939 *) 837 *)
940 type= 838 type=
941 ;; 839 ;;
942 esac 840 esac
943 fi 841 fi
944 842 if [ "${SLOT}" == "0" ] ; then
843 local desktop_name="${PN}"
844 else
845 local desktop_name="${PN}-${SLOT}"
846 fi
945 local desktop=${T}/${exec%% *}-${P}.desktop 847 local desktop=${T}/${exec%% *}-${desktop_name}.desktop
946 848
947echo "[Desktop Entry] 849echo "[Desktop Entry]
948Encoding=UTF-8 850Encoding=UTF-8
949Version=0.9.2 851Version=0.9.2
950Name=${name} 852Name=${name}
995 doins "${i}" 897 doins "${i}"
996 elif [[ -d ${i} ]] ; then 898 elif [[ -d ${i} ]] ; then
997 for j in "${i}"/*.desktop ; do 899 for j in "${i}"/*.desktop ; do
998 doins "${j}" 900 doins "${j}"
999 done 901 done
1000 fi 902 fi
1001 done 903 done
1002} 904}
1003newmenu() { 905newmenu() {
1004 insinto /usr/share/applications 906 insinto /usr/share/applications
1005 newins "$1" "$2" 907 newins "$1" "$2"
1013 doins "${i}" 915 doins "${i}"
1014 elif [[ -d ${i} ]] ; then 916 elif [[ -d ${i} ]] ; then
1015 for j in "${i}"/*.png ; do 917 for j in "${i}"/*.png ; do
1016 doins "${j}" 918 doins "${j}"
1017 done 919 done
1018 fi 920 fi
1019 done 921 done
1020} 922}
1021newicon() { 923newicon() {
1022 insinto /usr/share/pixmaps 924 insinto /usr/share/pixmaps
1023 newins "$1" "$2" 925 newins "$1" "$2"
1028############################################################## 930##############################################################
1029 931
1030 932
1031# for internal use only (unpack_pdv and unpack_makeself) 933# for internal use only (unpack_pdv and unpack_makeself)
1032find_unpackable_file() { 934find_unpackable_file() {
1033 local src="$1" 935 local src=$1
1034 if [ -z "${src}" ] 936 if [[ -z ${src} ]] ; then
1035 then
1036 src="${DISTDIR}/${A}" 937 src=${DISTDIR}/${A}
1037 else 938 else
1038 if [ -e "${DISTDIR}/${src}" ] 939 if [[ -e ${DISTDIR}/${src} ]] ; then
1039 then
1040 src="${DISTDIR}/${src}" 940 src=${DISTDIR}/${src}
1041 elif [ -e "${PWD}/${src}" ] 941 elif [[ -e ${PWD}/${src} ]] ; then
1042 then
1043 src="${PWD}/${src}" 942 src=${PWD}/${src}
1044 elif [ -e "${src}" ] 943 elif [[ -e ${src} ]] ; then
1045 then
1046 src="${src}" 944 src=${src}
1047 fi
1048 fi 945 fi
1049 [ ! -e "${src}" ] && die "Could not find requested archive ${src}" 946 fi
947 [[ ! -e ${src} ]] && return 1
1050 echo "${src}" 948 echo "${src}"
1051} 949}
1052 950
1053# Unpack those pesky pdv generated files ... 951# Unpack those pesky pdv generated files ...
1054# They're self-unpacking programs with the binary package stuffed in 952# They're self-unpacking programs with the binary package stuffed in
1069# lseek 967# lseek
1070# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 968# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
1071# lseek(3, -4, SEEK_END) = 2981250 969# lseek(3, -4, SEEK_END) = 2981250
1072# thus we would pass in the value of '4' as the second parameter. 970# thus we would pass in the value of '4' as the second parameter.
1073unpack_pdv() { 971unpack_pdv() {
1074 local src="`find_unpackable_file $1`" 972 local src=$(find_unpackable_file $1)
1075 local sizeoff_t="$2" 973 local sizeoff_t=$2
1076 974
975 [[ -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 :(" 976 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :("
1078 977
1079 local shrtsrc="`basename ${src}`" 978 local shrtsrc="`basename ${src}`"
1080 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 979 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1081 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 980 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\"` 981 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"`
1148# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1047# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1149# - If the file is not specified then unpack will utilize ${A}. 1048# - If the file is not specified then unpack will utilize ${A}.
1150# - If the offset is not specified then we will attempt to extract 1049# - If the offset is not specified then we will attempt to extract
1151# the proper offset from the script itself. 1050# the proper offset from the script itself.
1152unpack_makeself() { 1051unpack_makeself() {
1153 local src="$(find_unpackable_file "$1")" 1052 local src=$(find_unpackable_file "$1")
1154 local skip="$2" 1053 local skip=$2
1155 local exe="$3" 1054 local exe=$3
1156 1055
1056 [[ -z ${src} ]] && die "Could not locate source for '$1'"
1057
1157 local shrtsrc="$(basename "${src}")" 1058 local shrtsrc=$(basename "${src}")
1158 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1059 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1159 if [ -z "${skip}" ] 1060 if [ -z "${skip}" ]
1160 then 1061 then
1161 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1062 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`"
1162 local skip=0 1063 local skip=0
1233check_license() { 1134check_license() {
1234 local lic=$1 1135 local lic=$1
1235 if [ -z "${lic}" ] ; then 1136 if [ -z "${lic}" ] ; then
1236 lic="${PORTDIR}/licenses/${LICENSE}" 1137 lic="${PORTDIR}/licenses/${LICENSE}"
1237 else 1138 else
1238 if [ -e "${PORTDIR}/licenses/${src}" ] ; then 1139 if [ -e "${PORTDIR}/licenses/${lic}" ] ; then
1239 lic="${PORTDIR}/licenses/${src}" 1140 lic="${PORTDIR}/licenses/${lic}"
1240 elif [ -e "${PWD}/${src}" ] ; then 1141 elif [ -e "${PWD}/${lic}" ] ; then
1241 lic="${PWD}/${src}" 1142 lic="${PWD}/${lic}"
1242 elif [ -e "${src}" ] ; then 1143 elif [ -e "${lic}" ] ; then
1243 lic="${src}" 1144 lic="${lic}"
1244 fi
1245 fi 1145 fi
1146 fi
1246 [ ! -f "${lic}" ] && die "Could not find requested license ${src}" 1147 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1247 local l="`basename ${lic}`" 1148 local l="`basename ${lic}`"
1248 1149
1249 # here is where we check for the licenses the user already 1150 # 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 1151 # accepted ... if we don't find a match, we make the user accept
1251 local shopts=$- 1152 local shopts=$-
1422# displayed and we'll hang out here until: 1323# displayed and we'll hang out here until:
1423# (1) the file is found on a mounted cdrom 1324# (1) the file is found on a mounted cdrom
1424# (2) the user hits CTRL+C 1325# (2) the user hits CTRL+C
1425cdrom_locate_file_on_cd() { 1326cdrom_locate_file_on_cd() {
1426 while [[ -z ${CDROM_ROOT} ]] ; do 1327 while [[ -z ${CDROM_ROOT} ]] ; do
1427 local dir="$(dirname ${@})" 1328 local dir=$(dirname "$*")
1428 local file="$(basename ${@})" 1329 local file=$(basename "$*")
1429 local mline="" 1330 local mline=""
1430 local showedmsg=0 1331 local showedmsg=0
1431 1332
1432 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do 1333 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do
1433 [[ -d ${mline}/${dir} ]] || continue 1334 [[ -d ${mline}/${dir} ]] || continue
1454 fi 1355 fi
1455 showedmsg=1 1356 showedmsg=1
1456 fi 1357 fi
1457 einfo "Press return to scan for the cd again" 1358 einfo "Press return to scan for the cd again"
1458 einfo "or hit CTRL+C to abort the emerge." 1359 einfo "or hit CTRL+C to abort the emerge."
1360 echo
1361 einfo "If you are having trouble with the detection"
1362 einfo "of your CD, it is possible that you do not have"
1363 einfo "Joliet support enabled in your kernel. Please"
1364 einfo "check that CONFIG_JOLIET is enabled in your kernel."
1459 read 1365 read
1460 fi 1366 fi
1461 done 1367 done
1462} 1368}
1463 1369
1527 while ((i--)) ; do 1433 while ((i--)) ; do
1528 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass" 1434 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1529 done 1435 done
1530 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}" 1436 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1531 case ${ARCH} in 1437 case ${ARCH} in
1532 x86) export ARCH="i386";; 1438 x86) export ARCH="i386";;
1533 amd64) export ARCH="x86_64";; 1439 amd64) export ARCH="x86_64";;
1534 hppa) export ARCH="parisc";; 1440 hppa) export ARCH="parisc";;
1535 mips) export ARCH="mips";; 1441 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! 1442 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}";; 1443 *) export ARCH="${ARCH}";;
1538 esac 1444 esac
1539} 1445}
1540 1446
1541# set's ARCH back to what portage expects 1447# set's ARCH back to what portage expects
1542set_arch_to_portage() { 1448set_arch_to_portage() {
1586 LIB=$1 1492 LIB=$1
1587 1493
1588 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1494 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1589 SONAME=`basename ${LIB}` 1495 SONAME=`basename ${LIB}`
1590 1496
1591 einfo "An old version of an installed library was detected on your system." 1497 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" 1498 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," 1499 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:" 1500 ewarn "you will need to execute the following command:"
1595 einfo " revdep-rebuild --soname ${SONAME}" 1501 ewarn " revdep-rebuild --soname ${SONAME}"
1596 einfo 1502 ewarn
1597 einfo "After doing that, you can safely remove ${LIB}" 1503 ewarn "After doing that, you can safely remove ${LIB}"
1598 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild" 1504 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1599 fi 1505 fi
1600} 1506}
1601 1507
1602# Hack for people to figure out if a package was built with 1508# Hack for people to figure out if a package was built with
1603# certain USE flags 1509# certain USE flags

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

  ViewVC Help
Powered by ViewVC 1.1.20