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

Diff of /eclass/eutils.eclass

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

Revision 1.168 Revision 1.191
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.168 2005/04/29 03:59:15 vapier Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.191 2005/07/13 19:15:05 eradicator 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
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}"
118EPATCH_SOURCE="${WORKDIR}/patch" 117EPATCH_SOURCE="${WORKDIR}/patch"
119# Default extension for patches 118# Default extension for patches
120EPATCH_SUFFIX="patch.bz2" 119EPATCH_SUFFIX="patch.bz2"
121# Default options for patch 120# Default options for patch
122# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571 121# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571
123EPATCH_OPTS="-g0" 122# Set --no-backup-if-mismatch so we don't leave '.orig' files behind.
123EPATCH_OPTS="-g0 --no-backup-if-mismatch"
124# 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,
125# and not the full path .. 125# and not the full path ..
126EPATCH_EXCLUDE="" 126EPATCH_EXCLUDE=""
127# Change the printed message for a single patch. 127# Change the printed message for a single patch.
128EPATCH_SINGLE_MSG="" 128EPATCH_SINGLE_MSG=""
129# Change the printed message for multiple patches.
130EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..."
129# Force applying bulk patches even if not following the style: 131# Force applying bulk patches even if not following the style:
130# 132#
131# ??_${ARCH}_foo.${EPATCH_SUFFIX} 133# ??_${ARCH}_foo.${EPATCH_SUFFIX}
132# 134#
133EPATCH_FORCE="no" 135EPATCH_FORCE="no"
237 ;; 239 ;;
238 esac 240 esac
239 241
240 if [ "${SINGLE_PATCH}" = "no" ] 242 if [ "${SINGLE_PATCH}" = "no" ]
241 then 243 then
242 einfo "Applying various patches (bugfixes/updates) ..." 244 einfo "${EPATCH_MULTI_MSG}"
243 fi 245 fi
244 for x in ${EPATCH_SOURCE} 246 for x in ${EPATCH_SOURCE}
245 do 247 do
246 # New ARCH dependant patch naming scheme ... 248 # New ARCH dependant patch naming scheme ...
247 # 249 #
248 # ???_arch_foo.patch 250 # ???_arch_foo.patch
249 # 251 #
250 if [ -f ${x} ] && \ 252 if [ -f ${x} ] && \
251 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "`eval echo \$\{x/_${ARCH}_\}`" != "${x}" ] || \ 253 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "${x/_${ARCH}_}" != "${x}" ] || \
252 [ "${EPATCH_FORCE}" = "yes" ]) 254 [ "${EPATCH_FORCE}" = "yes" ])
253 then 255 then
254 local count=0 256 local count=0
255 local popts="${EPATCH_OPTS}" 257 local popts="${EPATCH_OPTS}"
256 local patchname=${x##*/} 258 local patchname=${x##*/}
366 then 368 then
367 einfo "Done with patching" 369 einfo "Done with patching"
368 fi 370 fi
369} 371}
370 372
371# This function return true if we are using the NPTL pthreads
372# implementation.
373#
374# <azarah@gentoo.org> (06 March 2003)
375#
376have_NPTL() {
377 cat > ${T}/test-nptl.c <<-"END"
378 #define _XOPEN_SOURCE
379 #include <unistd.h>
380 #include <stdio.h>
381
382 int main()
383 {
384 char buf[255];
385 char *str = buf;
386
387 confstr(_CS_GNU_LIBPTHREAD_VERSION, str, 255);
388 if (NULL != str) {
389 printf("%s\n", str);
390 if (NULL != strstr(str, "NPTL"))
391 return 0;
392 }
393
394 return 1;
395 }
396 END
397
398 einfon "Checking for _CS_GNU_LIBPTHREAD_VERSION support in glibc ..."
399 if gcc -o ${T}/nptl ${T}/test-nptl.c &> /dev/null
400 then
401 echo "yes"
402 einfon "Checking what PTHREADS implementation we have ..."
403 if ${T}/nptl
404 then
405 return 0
406 else
407 return 1
408 fi
409 else
410 echo "no"
411 fi
412
413 return 1
414}
415
416# This function check how many cpu's are present, and then set
417# -j in MAKEOPTS accordingly.
418#
419# Thanks to nall <nall@gentoo.org> for this.
420#
421get_number_of_jobs() {
422 local jobs=0
423
424 if [ ! -r /proc/cpuinfo ]
425 then
426 return 1
427 fi
428
429 # This bit is from H?kan Wessberg <nacka-gentoo@refug.org>, bug #13565.
430 if [ "`egrep "^[[:space:]]*MAKEOPTS=" /etc/make.conf | wc -l`" -gt 0 ]
431 then
432 ADMINOPTS="`egrep "^[[:space:]]*MAKEOPTS=" /etc/make.conf | cut -d= -f2 | sed 's/\"//g'`"
433 ADMINPARAM="`echo ${ADMINOPTS} | gawk '{match($0, /-j *[0-9]*/, opt); print opt[0]}'`"
434 ADMINPARAM="${ADMINPARAM/-j}"
435 fi
436
437 export MAKEOPTS="`echo ${MAKEOPTS} | sed -e 's:-j *[0-9]*::g'`"
438
439 if [ "${ARCH}" = "amd64" -o "${ARCH}" = "x86" -o "${ARCH}" = "hppa" -o \
440 "${ARCH}" = "arm" -o "${ARCH}" = "mips" -o "${ARCH}" = "ia64" ]
441 then
442 # these archs will always have "[Pp]rocessor"
443 jobs="$((`grep -c ^[Pp]rocessor /proc/cpuinfo` * 2))"
444
445 elif [ "${ARCH}" = "sparc" -o "${ARCH}" = "sparc64" ]
446 then
447 # sparc always has "ncpus active"
448 jobs="$((`grep "^ncpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
449
450 elif [ "${ARCH}" = "alpha" ]
451 then
452 # alpha has "cpus active", but only when compiled with SMP
453 if [ "`grep -c "^cpus active" /proc/cpuinfo`" -eq 1 ]
454 then
455 jobs="$((`grep "^cpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
456 else
457 jobs=2
458 fi
459
460 elif [ "${ARCH}" = "ppc" -o "${ARCH}" = "ppc64" ]
461 then
462 # ppc has "processor", but only when compiled with SMP
463 if [ "`grep -c "^processor" /proc/cpuinfo`" -eq 1 ]
464 then
465 jobs="$((`grep -c ^processor /proc/cpuinfo` * 2))"
466 else
467 jobs=2
468 fi
469 elif [ "${ARCH}" = "s390" ]
470 then
471 # s390 has "# processors : "
472 jobs="$((`grep "^\# processors" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
473 else
474 jobs="$((`grep -c ^cpu /proc/cpuinfo` * 2))"
475 die "Unknown ARCH -- ${ARCH}!"
476 fi
477
478 # Make sure the number is valid ...
479 if [ "${jobs}" -lt 1 ]
480 then
481 jobs=1
482 fi
483
484 if [ -n "${ADMINPARAM}" ]
485 then
486 if [ "${jobs}" -gt "${ADMINPARAM}" ]
487 then
488 einfo "Setting make jobs to \"-j${ADMINPARAM}\" to ensure successful merge ..."
489 export MAKEOPTS="${MAKEOPTS} -j${ADMINPARAM}"
490 else
491 einfo "Setting make jobs to \"-j${jobs}\" to ensure successful merge ..."
492 export MAKEOPTS="${MAKEOPTS} -j${jobs}"
493 fi
494 fi
495}
496
497# Cheap replacement for when debianutils (and thus mktemp) 373# Cheap replacement for when debianutils (and thus mktemp)
498# does not exist on the users system 374# does not exist on the users system
499# vapier@gentoo.org 375# vapier@gentoo.org
500# 376#
501# Takes just 1 optional parameter (the directory to create tmpfile in) 377# Takes just 1 optional parameter (the directory to create tmpfile in)
532# Joe Jezak <josejx@gmail.com> and usata@gentoo.org 408# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
533# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org> 409# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
534# 410#
535# egetent(database, key) 411# egetent(database, key)
536egetent() { 412egetent() {
537 if useq ppc-macos ; then 413 if [[ "${USERLAND}" == "Darwin" ]] ; then
538 case "$2" in 414 case "$2" in
539 *[!0-9]*) # Non numeric 415 *[!0-9]*) # Non numeric
540 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 416 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
541 ;; 417 ;;
542 *) # Numeric 418 *) # Numeric
543 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 419 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
544 ;; 420 ;;
545 esac 421 esac
546 elif useq x86-fbsd ; then 422 elif [[ "${USERLAND}" == "BSD" ]] ; then
547 local action 423 local action
548 if [ "$1" == "passwd" ] 424 if [ "$1" == "passwd" ]
549 then 425 then
550 action="user" 426 action="user"
551 else 427 else
571# homedir: /dev/null 447# homedir: /dev/null
572# groups: none 448# groups: none
573# extra: comment of 'added by portage for ${PN}' 449# extra: comment of 'added by portage for ${PN}'
574enewuser() { 450enewuser() {
575 # get the username 451 # get the username
576 local euser="$1"; shift 452 local euser=$1; shift
577 if [ -z "${euser}" ] 453 if [[ -z ${euser} ]] ; then
578 then
579 eerror "No username specified !" 454 eerror "No username specified !"
580 die "Cannot call enewuser without a username" 455 die "Cannot call enewuser without a username"
581 fi 456 fi
582 457
583 # lets see if the username already exists 458 # lets see if the username already exists
584 if [ "${euser}" == "`egetent passwd \"${euser}\" | cut -d: -f1`" ] 459 if [[ ${euser} == $(egetent passwd "${euser}" | cut -d: -f1) ]] ; then
585 then
586 return 0 460 return 0
587 fi 461 fi
588 einfo "Adding user '${euser}' to your system ..." 462 einfo "Adding user '${euser}' to your system ..."
589 463
590 # options to pass to useradd 464 # options to pass to useradd
591 local opts= 465 local opts=
592 466
593 # handle uid 467 # handle uid
594 local euid="$1"; shift 468 local euid=$1; shift
595 if [ ! -z "${euid}" ] && [ "${euid}" != "-1" ] 469 if [[ ! -z ${euid} ]] && [[ ${euid} != "-1" ]] ; then
596 then
597 if [ "${euid}" -gt 0 ] 470 if [[ ${euid} -gt 0 ]] ; then
598 then
599 if [ ! -z "`egetent passwd ${euid}`" ] 471 if [[ ! -z $(egetent passwd ${euid}) ]] ; then
600 then
601 euid="next" 472 euid="next"
602 fi 473 fi
603 else 474 else
604 eerror "Userid given but is not greater than 0 !" 475 eerror "Userid given but is not greater than 0 !"
605 die "${euid} is not a valid UID" 476 die "${euid} is not a valid UID"
606 fi 477 fi
607 else 478 else
608 euid="next" 479 euid="next"
609 fi 480 fi
610 if [ "${euid}" == "next" ] 481 if [[ ${euid} == "next" ]] ; then
611 then
612 local pwrange 482 local pwrange
613 if [ "${USERLAND}" == "BSD" ] ; then 483 if [[ ${USERLAND} == "BSD" ]] ; then
614 pwrange="`jot 898 101`" 484 pwrange=$(jot 898 101)
615 else 485 else
616 pwrange="`seq 101 999`" 486 pwrange=$(seq 101 999)
617 fi 487 fi
618 for euid in ${pwrange} ; do 488 for euid in ${pwrange} ; do
619 [ -z "`egetent passwd ${euid}`" ] && break 489 [[ -z $(egetent passwd ${euid}) ]] && break
620 done 490 done
621 fi 491 fi
622 opts="${opts} -u ${euid}" 492 opts="${opts} -u ${euid}"
623 einfo " - Userid: ${euid}" 493 einfo " - Userid: ${euid}"
624 494
625 # handle shell 495 # handle shell
626 local eshell="$1"; shift 496 local eshell=$1; shift
627 if [ ! -z "${eshell}" ] && [ "${eshell}" != "-1" ] 497 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
628 then
629 if [ ! -e "${eshell}" ] 498 if [[ ! -e ${eshell} ]] ; then
630 then
631 eerror "A shell was specified but it does not exist !" 499 eerror "A shell was specified but it does not exist !"
632 die "${eshell} does not exist" 500 die "${eshell} does not exist"
633 fi 501 fi
634 else 502 else
635 if [ "${USERLAND}" == "BSD" ] 503 case ${USERLAND} in
636 then
637 eshell="/usr/bin/false" 504 Darwin) eshell="/usr/bin/false";;
638 else 505 BSD) eshell="/usr/sbin/nologin";;
639 eshell="/bin/false" 506 *) eshell="/bin/false";;
640 fi 507 esac
641 fi 508 fi
642 einfo " - Shell: ${eshell}" 509 einfo " - Shell: ${eshell}"
643 opts="${opts} -s ${eshell}" 510 opts="${opts} -s ${eshell}"
644 511
645 # handle homedir 512 # handle homedir
646 local ehome="$1"; shift 513 local ehome=$1; shift
647 if [ -z "${ehome}" ] && [ "${eshell}" != "-1" ] 514 if [[ -z ${ehome} ]] || [[ ${ehome} == "-1" ]] ; then
648 then
649 ehome="/dev/null" 515 ehome="/dev/null"
650 fi 516 fi
651 einfo " - Home: ${ehome}" 517 einfo " - Home: ${ehome}"
652 opts="${opts} -d ${ehome}" 518 opts="${opts} -d ${ehome}"
653 519
654 # handle groups 520 # handle groups
655 local egroups="$1"; shift 521 local egroups=$1; shift
656 if [ ! -z "${egroups}" ] 522 if [[ ! -z ${egroups} ]] ; then
657 then
658 local oldifs="${IFS}" 523 local oldifs=${IFS}
659 local defgroup="" exgroups="" 524 local defgroup="" exgroups=""
660 525
661 export IFS="," 526 export IFS=","
662 for g in ${egroups} 527 for g in ${egroups} ; do
663 do
664 export IFS="${oldifs}" 528 export IFS=${oldifs}
665 if [ -z "`egetent group \"${g}\"`" ] 529 if [[ -z $(egetent group "${g}") ]] ; then
666 then
667 eerror "You must add group ${g} to the system first" 530 eerror "You must add group ${g} to the system first"
668 die "${g} is not a valid GID" 531 die "${g} is not a valid GID"
669 fi 532 fi
670 if [ -z "${defgroup}" ] 533 if [[ -z ${defgroup} ]] ; then
671 then
672 defgroup="${g}" 534 defgroup=${g}
673 else 535 else
674 exgroups="${exgroups},${g}" 536 exgroups="${exgroups},${g}"
675 fi 537 fi
676 export IFS="," 538 export IFS=","
677 done 539 done
678 export IFS="${oldifs}" 540 export IFS=${oldifs}
679 541
680 opts="${opts} -g ${defgroup}" 542 opts="${opts} -g ${defgroup}"
681 if [ ! -z "${exgroups}" ] 543 if [[ ! -z ${exgroups} ]] ; then
682 then
683 opts="${opts} -G ${exgroups:1}" 544 opts="${opts} -G ${exgroups:1}"
684 fi 545 fi
685 else 546 else
686 egroups="(none)" 547 egroups="(none)"
687 fi 548 fi
688 einfo " - Groups: ${egroups}" 549 einfo " - Groups: ${egroups}"
689 550
690 # handle extra and add the user 551 # handle extra and add the user
691 local eextra="$@"
692 local oldsandbox="${SANDBOX_ON}" 552 local oldsandbox=${SANDBOX_ON}
693 export SANDBOX_ON="0" 553 export SANDBOX_ON="0"
694 if useq ppc-macos 554 case ${USERLAND} in
695 then 555 Darwin)
696 ### Make the user 556 ### Make the user
697 if [ -z "${eextra}" ] 557 if [[ -z $@ ]] ; then
698 then
699 dscl . create /users/${euser} uid ${euid} 558 dscl . create /users/${euser} uid ${euid}
700 dscl . create /users/${euser} shell ${eshell} 559 dscl . create /users/${euser} shell ${eshell}
701 dscl . create /users/${euser} home ${ehome} 560 dscl . create /users/${euser} home ${ehome}
702 dscl . create /users/${euser} realname "added by portage for ${PN}" 561 dscl . create /users/${euser} realname "added by portage for ${PN}"
703 ### Add the user to the groups specified 562 ### Add the user to the groups specified
704 local oldifs="${IFS}" 563 local oldifs=${IFS}
705 export IFS="," 564 export IFS=","
706 for g in ${egroups} 565 for g in ${egroups} ; do
707 do
708 dscl . merge /groups/${g} users ${euser} 566 dscl . merge /groups/${g} users ${euser}
709 done 567 done
710 export IFS="${oldifs}" 568 export IFS=${oldifs}
711 else 569 else
712 einfo "Extra options are not supported on macos yet" 570 einfo "Extra options are not supported on Darwin yet"
713 einfo "Please report the ebuild along with the info below" 571 einfo "Please report the ebuild along with the info below"
714 einfo "eextra: ${eextra}" 572 einfo "eextra: $@"
715 die "Required function missing" 573 die "Required function missing"
716 fi 574 fi
717 elif use x86-fbsd ; then 575 ;;
718 if [ -z "${eextra}" ] 576 BSD)
719 then 577 if [[ -z $@ ]] ; then
720 pw useradd ${euser} ${opts} \ 578 pw useradd ${euser} ${opts} \
721 -c "added by portage for ${PN}" \ 579 -c "added by portage for ${PN}" \
722 die "enewuser failed" 580 die "enewuser failed"
723 else 581 else
724 einfo " - Extra: ${eextra}" 582 einfo " - Extra: $@"
725 pw useradd ${euser} ${opts} \ 583 pw useradd ${euser} ${opts} \
726 -c ${eextra} || die "enewuser failed" 584 "$@" || die "enewuser failed"
727 fi 585 fi
728 else 586 ;;
729 if [ -z "${eextra}" ] 587 *)
730 then 588 if [[ -z $@ ]] ; then
731 useradd ${opts} ${euser} \ 589 useradd ${opts} ${euser} \
732 -c "added by portage for ${PN}" \ 590 -c "added by portage for ${PN}" \
733 || die "enewuser failed" 591 || die "enewuser failed"
734 else 592 else
735 einfo " - Extra: ${eextra}" 593 einfo " - Extra: $@"
736 useradd ${opts} ${euser} ${eextra} \ 594 useradd ${opts} ${euser} "$@" \
737 || die "enewuser failed" 595 || die "enewuser failed"
738 fi 596 fi
739 fi 597 ;;
598 esac
740 export SANDBOX_ON="${oldsandbox}" 599 export SANDBOX_ON=${oldsandbox}
741 600
742 if [ ! -e "${ehome}" ] && [ ! -e "${D}/${ehome}" ] 601 if [ ! -e "${ehome}" ] && [ ! -e "${D}/${ehome}" ]
743 then 602 then
744 einfo " - Creating ${ehome} in ${D}" 603 einfo " - Creating ${ehome} in ${D}"
745 dodir ${ehome} 604 dodir ${ehome}
782 then 641 then
783 if [ "${egid}" -gt 0 ] 642 if [ "${egid}" -gt 0 ]
784 then 643 then
785 if [ -z "`egetent group ${egid}`" ] 644 if [ -z "`egetent group ${egid}`" ]
786 then 645 then
787 if useq ppc-macos ; then 646 if [[ "${USERLAND}" == "Darwin" ]]; then
788 opts="${opts} ${egid}" 647 opts="${opts} ${egid}"
789 else 648 else
790 opts="${opts} -g ${egid}" 649 opts="${opts} -g ${egid}"
791 fi 650 fi
792 else 651 else
806 opts="${opts} ${eextra}" 665 opts="${opts} ${eextra}"
807 666
808 # add the group 667 # add the group
809 local oldsandbox="${SANDBOX_ON}" 668 local oldsandbox="${SANDBOX_ON}"
810 export SANDBOX_ON="0" 669 export SANDBOX_ON="0"
811 if useq ppc-macos ; then 670 if [[ "${USERLAND}" == "Darwin" ]]; then
812 if [ ! -z "${eextra}" ]; 671 if [ ! -z "${eextra}" ];
813 then 672 then
814 einfo "Extra options are not supported on macos yet" 673 einfo "Extra options are not supported on Darwin/OS X yet"
815 einfo "Please report the ebuild along with the info below" 674 einfo "Please report the ebuild along with the info below"
816 einfo "eextra: ${eextra}" 675 einfo "eextra: ${eextra}"
817 die "Required function missing" 676 die "Required function missing"
818 fi 677 fi
819 678
824 [ -z "`egetent group ${egid}`" ] && break 683 [ -z "`egetent group ${egid}`" ] && break
825 done 684 done
826 esac 685 esac
827 dscl . create /groups/${egroup} gid ${egid} 686 dscl . create /groups/${egroup} gid ${egid}
828 dscl . create /groups/${egroup} passwd '*' 687 dscl . create /groups/${egroup} passwd '*'
829 elif use x86-fbsd ; then 688 elif [[ "${USERLAND}" == "BSD" ]] ; then
830 case ${egid} in 689 case ${egid} in
831 *[!0-9]*) # Non numeric 690 *[!0-9]*) # Non numeric
832 for egid in `jot 898 101`; do 691 for egid in `jot 898 101`; do
833 [ -z "`egetent group ${egid}`" ] && break 692 [ -z "`egetent group ${egid}`" ] && break
834 done 693 done
981 *) 840 *)
982 type= 841 type=
983 ;; 842 ;;
984 esac 843 esac
985 fi 844 fi
986 845 if [ "${SLOT}" == "0" ] ; then
846 local desktop_name="${PN}"
847 else
848 local desktop_name="${PN}-${SLOT}"
849 fi
987 local desktop=${T}/${exec%% *}-${P}.desktop 850 local desktop=${T}/${exec%% *}-${desktop_name}.desktop
988 851
989echo "[Desktop Entry] 852echo "[Desktop Entry]
990Encoding=UTF-8 853Encoding=UTF-8
991Version=0.9.2 854Version=0.9.2
992Name=${name} 855Name=${name}
1037 doins "${i}" 900 doins "${i}"
1038 elif [[ -d ${i} ]] ; then 901 elif [[ -d ${i} ]] ; then
1039 for j in "${i}"/*.desktop ; do 902 for j in "${i}"/*.desktop ; do
1040 doins "${j}" 903 doins "${j}"
1041 done 904 done
1042 fi 905 fi
1043 done 906 done
1044} 907}
1045newmenu() { 908newmenu() {
1046 insinto /usr/share/applications 909 insinto /usr/share/applications
1047 newins "$1" "$2" 910 newins "$1" "$2"
1055 doins "${i}" 918 doins "${i}"
1056 elif [[ -d ${i} ]] ; then 919 elif [[ -d ${i} ]] ; then
1057 for j in "${i}"/*.png ; do 920 for j in "${i}"/*.png ; do
1058 doins "${j}" 921 doins "${j}"
1059 done 922 done
1060 fi 923 fi
1061 done 924 done
1062} 925}
1063newicon() { 926newicon() {
1064 insinto /usr/share/pixmaps 927 insinto /usr/share/pixmaps
1065 newins "$1" "$2" 928 newins "$1" "$2"
1471 local mline="" 1334 local mline=""
1472 local showedmsg=0 1335 local showedmsg=0
1473 1336
1474 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do 1337 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do
1475 [[ -d ${mline}/${dir} ]] || continue 1338 [[ -d ${mline}/${dir} ]] || continue
1476 [[ ! -z $(find ${mline}/${dir} -iname ${file} -maxdepth 1) ]] \ 1339 [[ ! -z $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] \
1477 && export CDROM_ROOT=${mline} 1340 && export CDROM_ROOT=${mline}
1478 done 1341 done
1479 1342
1480 if [[ -z ${CDROM_ROOT} ]] ; then 1343 if [[ -z ${CDROM_ROOT} ]] ; then
1481 echo 1344 echo
1496 fi 1359 fi
1497 showedmsg=1 1360 showedmsg=1
1498 fi 1361 fi
1499 einfo "Press return to scan for the cd again" 1362 einfo "Press return to scan for the cd again"
1500 einfo "or hit CTRL+C to abort the emerge." 1363 einfo "or hit CTRL+C to abort the emerge."
1364 echo
1365 einfo "If you are having trouble with the detection"
1366 einfo "of your CD, it is possible that you do not have"
1367 einfo "Joliet support enabled in your kernel. Please"
1368 einfo "check that CONFIG_JOLIET is enabled in your kernel."
1501 read 1369 read
1502 fi 1370 fi
1503 done 1371 done
1504} 1372}
1505 1373
1569 while ((i--)) ; do 1437 while ((i--)) ; do
1570 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass" 1438 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1571 done 1439 done
1572 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}" 1440 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1573 case ${ARCH} in 1441 case ${ARCH} in
1574 x86) export ARCH="i386";; 1442 x86) export ARCH="i386";;
1575 amd64) export ARCH="x86_64";; 1443 amd64) export ARCH="x86_64";;
1576 hppa) export ARCH="parisc";; 1444 hppa) export ARCH="parisc";;
1577 mips) export ARCH="mips";; 1445 mips) export ARCH="mips";;
1578 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! 1446 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!
1579 *) export ARCH="${ARCH}";; 1447 *) export ARCH="${ARCH}";;
1580 esac 1448 esac
1581} 1449}
1582 1450
1583# set's ARCH back to what portage expects 1451# set's ARCH back to what portage expects
1584set_arch_to_portage() { 1452set_arch_to_portage() {
1628 LIB=$1 1496 LIB=$1
1629 1497
1630 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1498 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1631 SONAME=`basename ${LIB}` 1499 SONAME=`basename ${LIB}`
1632 1500
1633 einfo "An old version of an installed library was detected on your system." 1501 ewarn "An old version of an installed library was detected on your system."
1634 einfo "In order to avoid breaking packages that link against is, this older version" 1502 ewarn "In order to avoid breaking packages that link against it, this older version"
1635 einfo "is not being removed. In order to make full use of this newer version," 1503 ewarn "is not being removed. In order to make full use of this newer version,"
1636 einfo "you will need to execute the following command:" 1504 ewarn "you will need to execute the following command:"
1637 einfo " revdep-rebuild --soname ${SONAME}" 1505 ewarn " revdep-rebuild --soname ${SONAME}"
1638 einfo 1506 ewarn
1639 einfo "After doing that, you can safely remove ${LIB}" 1507 ewarn "After doing that, you can safely remove ${LIB}"
1640 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild" 1508 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1641 fi 1509 fi
1642} 1510}
1643 1511
1644# Hack for people to figure out if a package was built with 1512# Hack for people to figure out if a package was built with
1645# certain USE flags 1513# certain USE flags
1691dopamd() { 1559dopamd() {
1692 [[ -z $1 ]] && die "dopamd requires at least one argument" 1560 [[ -z $1 ]] && die "dopamd requires at least one argument"
1693 1561
1694 use pam || return 0 1562 use pam || return 0
1695 1563
1696 insinto /etc/pam.d 1564 INSDESTTREE=/etc/pam.d \
1697 doins "$@" || die "failed to install $@" 1565 doins "$@" || die "failed to install $@"
1698} 1566}
1699# newpamd <old name> <new name> 1567# newpamd <old name> <new name>
1700# 1568#
1701# Install pam file <old name> as <new name> in /etc/pam.d 1569# Install pam file <old name> as <new name> in /etc/pam.d
1702newpamd() { 1570newpamd() {
1703 [[ $# -ne 2 ]] && die "newpamd requires two arguements" 1571 [[ $# -ne 2 ]] && die "newpamd requires two arguements"
1704 1572
1705 use pam || return 0 1573 use pam || return 0
1706 1574
1707 insinto /etc/pam.d 1575 INSDESTTREE=/etc/pam.d \
1708 newins "$1" "$2" || die "failed to install $1 as $2" 1576 newins "$1" "$2" || die "failed to install $1 as $2"
1709} 1577}
1710 1578
1711# make a wrapper script ... 1579# make a wrapper script ...
1712# NOTE: this was originally games_make_wrapper, but I noticed other places where 1580# NOTE: this was originally games_make_wrapper, but I noticed other places where

Legend:
Removed from v.1.168  
changed lines
  Added in v.1.191

  ViewVC Help
Powered by ViewVC 1.1.20