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

Diff of /eclass/eutils.eclass

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

Revision 1.163 Revision 1.182
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.163 2005/03/26 06:33:16 eradicator Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.182 2005/06/11 00:02:26 vapier Exp $
4# 4#
5# Author: Martin Schlemmer <azarah@gentoo.org> 5# Author: Martin Schlemmer <azarah@gentoo.org>
6# 6#
7# This eclass is for general purpose functions that most ebuilds 7# This eclass is for general purpose functions that most ebuilds
8# have to implement themselves. 8# have to implement themselves.
11 11
12inherit multilib 12inherit multilib
13ECLASS=eutils 13ECLASS=eutils
14INHERITED="$INHERITED $ECLASS" 14INHERITED="$INHERITED $ECLASS"
15 15
16DEPEND="!bootstrap? ( sys-devel/patch )" 16DEPEND="!bootstrap? ( sys-devel/patch userland_GNU? ( sys-apps/shadow ) )"
17# sys-apps/shadow is needed for useradd, etc, bug #94745.
17 18
18DESCRIPTION="Based on the ${ECLASS} eclass" 19DESCRIPTION="Based on the ${ECLASS} eclass"
19
20# ecpu_check
21# Usage:
22#
23# ecpu_check array_of_cpu_flags
24#
25# array_of_cpu_flags - An array of cpu flags to check against USE flags
26#
27# Checks user USE related cpu flags against /proc/cpuinfo. If user enables a
28# cpu flag that is not supported in their processor flags, it will warn the
29# user if CROSSCOMPILE is not set to 1 ( because cross compile users are
30# obviously using different cpu flags than their own cpu ). Examples:
31#
32# CPU_FLAGS=(mmx mmx2 sse sse2)
33# ecpu_check CPU_FLAGS
34# Chris White <chriswhite@gentoo.org> (03 Feb 2005)
35
36ecpu_check() {
37 # Think about changing below to: if [ "${CROSSCOMPILE}" -ne 1 -a -e "/proc/cpuinfo" ]
38 # and dropping the else if you do not plan on adding anything to that
39 # empty block ....
40 # PS: also try to add some quoting, and consider rather using ${foo} than $foo ...
41 if [ "${CROSSCOMPILE}" != "1" -a -e "/proc/cpuinfo" ]
42 then
43 CPU_FLAGS=${1}
44 USER_CPU=`grep "flags" /proc/cpuinfo`
45
46 for flags in `seq 1 ${#CPU_FLAGS[@]}`
47 do
48 if has ${CPU_FLAGS[${flags} - 1]} ${USER_CPU} && ! has ${CPU_FLAGS[${flags} - 1]} ${USE}
49 then
50 ewarn "Your system is ${CPU_FLAGS[${flags} - 1]} capable but you don't have it enabled!"
51 ewarn "You might be cross compiling (in this case set CROSSCOMPILE to 1 to disable this warning."
52 fi
53
54 if ! has ${CPU_FLAGS[${flags} - 1]} ${USER_CPU} && has ${CPU_FLAGS[${flags} -1]} ${USE}
55 then
56 ewarn "You have ${CPU_FLAGS[${flags} - 1]} support enabled but your processor doesn't"
57 ewarn "Seem to support it! You might be cross compiling or do not have /proc filesystem"
58 ewarn "enabled. If either is the case, set CROSSCOMPILE to 1 to disable this warning."
59 fi
60 done
61 fi
62}
63 20
64# Wait for the supplied number of seconds. If no argument is supplied, defaults 21# Wait for the supplied number of seconds. If no argument is supplied, defaults
65# to five seconds. If the EPAUSE_IGNORE env var is set, don't wait. If we're not 22# to five seconds. If the EPAUSE_IGNORE env var is set, don't wait. If we're not
66# outputting to a terminal, don't wait. For compatability purposes, the argument 23# outputting to a terminal, don't wait. For compatability purposes, the argument
67# must be an integer greater than zero. 24# must be an integer greater than zero.
126 fperms a+x "/usr/${libdir}/${lib}" 83 fperms a+x "/usr/${libdir}/${lib}"
127 done 84 done
128} 85}
129 86
130# Simple function to draw a line consisting of '=' the same length as $* 87# Simple function to draw a line consisting of '=' the same length as $*
88# - only to be used by epatch()
131# 89#
132# <azarah@gentoo.org> (11 Nov 2002) 90# <azarah@gentoo.org> (11 Nov 2002)
133# 91#
134draw_line() { 92draw_line() {
135 local i=0 93 local i=0
161EPATCH_SOURCE="${WORKDIR}/patch" 119EPATCH_SOURCE="${WORKDIR}/patch"
162# Default extension for patches 120# Default extension for patches
163EPATCH_SUFFIX="patch.bz2" 121EPATCH_SUFFIX="patch.bz2"
164# Default options for patch 122# Default options for patch
165# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571 123# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571
166EPATCH_OPTS="-g0" 124# Set --no-backup-if-mismatch so we don't leave '.orig' files behind.
125EPATCH_OPTS="-g0 --no-backup-if-mismatch"
167# List of patches not to apply. Not this is only file names, 126# List of patches not to apply. Not this is only file names,
168# and not the full path .. 127# and not the full path ..
169EPATCH_EXCLUDE="" 128EPATCH_EXCLUDE=""
170# Change the printed message for a single patch. 129# Change the printed message for a single patch.
171EPATCH_SINGLE_MSG="" 130EPATCH_SINGLE_MSG=""
131# Change the printed message for multiple patches.
132EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..."
172# Force applying bulk patches even if not following the style: 133# Force applying bulk patches even if not following the style:
173# 134#
174# ??_${ARCH}_foo.${EPATCH_SUFFIX} 135# ??_${ARCH}_foo.${EPATCH_SUFFIX}
175# 136#
176EPATCH_FORCE="no" 137EPATCH_FORCE="no"
217 local x="" 178 local x=""
218 179
219 if [ "$#" -gt 1 ] 180 if [ "$#" -gt 1 ]
220 then 181 then
221 local m="" 182 local m=""
222 einfo "${#} patches to apply ..."
223 for m in "$@" ; do 183 for m in "$@" ; do
224 epatch "${m}" 184 epatch "${m}"
225 done 185 done
226 return 0 186 return 0
227 fi 187 fi
281 ;; 241 ;;
282 esac 242 esac
283 243
284 if [ "${SINGLE_PATCH}" = "no" ] 244 if [ "${SINGLE_PATCH}" = "no" ]
285 then 245 then
286 einfo "Applying various patches (bugfixes/updates) ..." 246 einfo "${EPATCH_MULTI_MSG}"
287 fi 247 fi
288 for x in ${EPATCH_SOURCE} 248 for x in ${EPATCH_SOURCE}
289 do 249 do
290 # New ARCH dependant patch naming scheme ... 250 # New ARCH dependant patch naming scheme ...
291 # 251 #
292 # ???_arch_foo.patch 252 # ???_arch_foo.patch
293 # 253 #
294 if [ -f ${x} ] && \ 254 if [ -f ${x} ] && \
295 ([ "${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}" ] || \
296 [ "${EPATCH_FORCE}" = "yes" ]) 256 [ "${EPATCH_FORCE}" = "yes" ])
297 then 257 then
298 local count=0 258 local count=0
299 local popts="${EPATCH_OPTS}" 259 local popts="${EPATCH_OPTS}"
300 local patchname=${x##*/} 260 local patchname=${x##*/}
410 then 370 then
411 einfo "Done with patching" 371 einfo "Done with patching"
412 fi 372 fi
413} 373}
414 374
415# This function return true if we are using the NPTL pthreads
416# implementation.
417#
418# <azarah@gentoo.org> (06 March 2003)
419#
420have_NPTL() {
421 cat > ${T}/test-nptl.c <<-"END"
422 #define _XOPEN_SOURCE
423 #include <unistd.h>
424 #include <stdio.h>
425
426 int main()
427 {
428 char buf[255];
429 char *str = buf;
430
431 confstr(_CS_GNU_LIBPTHREAD_VERSION, str, 255);
432 if (NULL != str) {
433 printf("%s\n", str);
434 if (NULL != strstr(str, "NPTL"))
435 return 0;
436 }
437
438 return 1;
439 }
440 END
441
442 einfon "Checking for _CS_GNU_LIBPTHREAD_VERSION support in glibc ..."
443 if gcc -o ${T}/nptl ${T}/test-nptl.c &> /dev/null
444 then
445 echo "yes"
446 einfon "Checking what PTHREADS implementation we have ..."
447 if ${T}/nptl
448 then
449 return 0
450 else
451 return 1
452 fi
453 else
454 echo "no"
455 fi
456
457 return 1
458}
459
460# This function check how many cpu's are present, and then set
461# -j in MAKEOPTS accordingly.
462#
463# Thanks to nall <nall@gentoo.org> for this.
464#
465get_number_of_jobs() {
466 local jobs=0
467
468 if [ ! -r /proc/cpuinfo ]
469 then
470 return 1
471 fi
472
473 # This bit is from H?kan Wessberg <nacka-gentoo@refug.org>, bug #13565.
474 if [ "`egrep "^[[:space:]]*MAKEOPTS=" /etc/make.conf | wc -l`" -gt 0 ]
475 then
476 ADMINOPTS="`egrep "^[[:space:]]*MAKEOPTS=" /etc/make.conf | cut -d= -f2 | sed 's/\"//g'`"
477 ADMINPARAM="`echo ${ADMINOPTS} | gawk '{match($0, /-j *[0-9]*/, opt); print opt[0]}'`"
478 ADMINPARAM="${ADMINPARAM/-j}"
479 fi
480
481 export MAKEOPTS="`echo ${MAKEOPTS} | sed -e 's:-j *[0-9]*::g'`"
482
483 if [ "${ARCH}" = "amd64" -o "${ARCH}" = "x86" -o "${ARCH}" = "hppa" -o \
484 "${ARCH}" = "arm" -o "${ARCH}" = "mips" -o "${ARCH}" = "ia64" ]
485 then
486 # these archs will always have "[Pp]rocessor"
487 jobs="$((`grep -c ^[Pp]rocessor /proc/cpuinfo` * 2))"
488
489 elif [ "${ARCH}" = "sparc" -o "${ARCH}" = "sparc64" ]
490 then
491 # sparc always has "ncpus active"
492 jobs="$((`grep "^ncpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
493
494 elif [ "${ARCH}" = "alpha" ]
495 then
496 # alpha has "cpus active", but only when compiled with SMP
497 if [ "`grep -c "^cpus active" /proc/cpuinfo`" -eq 1 ]
498 then
499 jobs="$((`grep "^cpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
500 else
501 jobs=2
502 fi
503
504 elif [ "${ARCH}" = "ppc" -o "${ARCH}" = "ppc64" ]
505 then
506 # ppc has "processor", but only when compiled with SMP
507 if [ "`grep -c "^processor" /proc/cpuinfo`" -eq 1 ]
508 then
509 jobs="$((`grep -c ^processor /proc/cpuinfo` * 2))"
510 else
511 jobs=2
512 fi
513 elif [ "${ARCH}" = "s390" ]
514 then
515 # s390 has "# processors : "
516 jobs="$((`grep "^\# processors" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
517 else
518 jobs="$((`grep -c ^cpu /proc/cpuinfo` * 2))"
519 die "Unknown ARCH -- ${ARCH}!"
520 fi
521
522 # Make sure the number is valid ...
523 if [ "${jobs}" -lt 1 ]
524 then
525 jobs=1
526 fi
527
528 if [ -n "${ADMINPARAM}" ]
529 then
530 if [ "${jobs}" -gt "${ADMINPARAM}" ]
531 then
532 einfo "Setting make jobs to \"-j${ADMINPARAM}\" to ensure successful merge ..."
533 export MAKEOPTS="${MAKEOPTS} -j${ADMINPARAM}"
534 else
535 einfo "Setting make jobs to \"-j${jobs}\" to ensure successful merge ..."
536 export MAKEOPTS="${MAKEOPTS} -j${jobs}"
537 fi
538 fi
539}
540
541# Cheap replacement for when debianutils (and thus mktemp) 375# Cheap replacement for when debianutils (and thus mktemp)
542# does not exist on the users system 376# does not exist on the users system
543# vapier@gentoo.org 377# vapier@gentoo.org
544# 378#
545# Takes just 1 optional parameter (the directory to create tmpfile in) 379# Takes just 1 optional parameter (the directory to create tmpfile in)
576# Joe Jezak <josejx@gmail.com> and usata@gentoo.org 410# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
577# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org> 411# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
578# 412#
579# egetent(database, key) 413# egetent(database, key)
580egetent() { 414egetent() {
581 if useq ppc-macos ; then 415 if [[ "${USERLAND}" == "Darwin" ]] ; then
582 case "$2" in 416 case "$2" in
583 *[!0-9]*) # Non numeric 417 *[!0-9]*) # Non numeric
584 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 418 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
585 ;; 419 ;;
586 *) # Numeric 420 *) # Numeric
587 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 421 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
588 ;; 422 ;;
589 esac 423 esac
590 elif useq x86-fbsd ; then 424 elif [[ "${USERLAND}" == "BSD" ]] ; then
591 local action 425 local action
592 if [ "$1" == "passwd" ] 426 if [ "$1" == "passwd" ]
593 then 427 then
594 action="user" 428 action="user"
595 else 429 else
615# homedir: /dev/null 449# homedir: /dev/null
616# groups: none 450# groups: none
617# extra: comment of 'added by portage for ${PN}' 451# extra: comment of 'added by portage for ${PN}'
618enewuser() { 452enewuser() {
619 # get the username 453 # get the username
620 local euser="$1"; shift 454 local euser=$1; shift
621 if [ -z "${euser}" ] 455 if [[ -z ${euser} ]] ; then
622 then
623 eerror "No username specified !" 456 eerror "No username specified !"
624 die "Cannot call enewuser without a username" 457 die "Cannot call enewuser without a username"
625 fi 458 fi
626 459
627 # lets see if the username already exists 460 # lets see if the username already exists
628 if [ "${euser}" == "`egetent passwd \"${euser}\" | cut -d: -f1`" ] 461 if [[ ${euser} == $(egetent passwd "${euser}" | cut -d: -f1) ]] ; then
629 then
630 return 0 462 return 0
631 fi 463 fi
632 einfo "Adding user '${euser}' to your system ..." 464 einfo "Adding user '${euser}' to your system ..."
633 465
634 # options to pass to useradd 466 # options to pass to useradd
635 local opts= 467 local opts=
636 468
637 # handle uid 469 # handle uid
638 local euid="$1"; shift 470 local euid=$1; shift
639 if [ ! -z "${euid}" ] && [ "${euid}" != "-1" ] 471 if [[ ! -z ${euid} ]] && [[ ${euid} != "-1" ]] ; then
640 then
641 if [ "${euid}" -gt 0 ] 472 if [[ ${euid} -gt 0 ]] ; then
642 then
643 if [ ! -z "`egetent passwd ${euid}`" ] 473 if [[ ! -z $(egetent passwd ${euid}) ]] ; then
644 then
645 euid="next" 474 euid="next"
646 fi 475 fi
647 else 476 else
648 eerror "Userid given but is not greater than 0 !" 477 eerror "Userid given but is not greater than 0 !"
649 die "${euid} is not a valid UID" 478 die "${euid} is not a valid UID"
650 fi 479 fi
651 else 480 else
652 euid="next" 481 euid="next"
653 fi 482 fi
654 if [ "${euid}" == "next" ] 483 if [[ ${euid} == "next" ]] ; then
655 then
656 local pwrange 484 local pwrange
657 if [ "${USERLAND}" == "BSD" ] ; then 485 if [[ ${USERLAND} == "BSD" ]] ; then
658 pwrange="`jot 898 101`" 486 pwrange=$(jot 898 101)
659 else 487 else
660 pwrange="`seq 101 999`" 488 pwrange=$(seq 101 999)
661 fi 489 fi
662 for euid in ${pwrange} ; do 490 for euid in ${pwrange} ; do
663 [ -z "`egetent passwd ${euid}`" ] && break 491 [[ -z $(egetent passwd ${euid}) ]] && break
664 done 492 done
665 fi 493 fi
666 opts="${opts} -u ${euid}" 494 opts="${opts} -u ${euid}"
667 einfo " - Userid: ${euid}" 495 einfo " - Userid: ${euid}"
668 496
669 # handle shell 497 # handle shell
670 local eshell="$1"; shift 498 local eshell=$1; shift
671 if [ ! -z "${eshell}" ] && [ "${eshell}" != "-1" ] 499 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
672 then
673 if [ ! -e "${eshell}" ] 500 if [[ ! -e ${eshell} ]] ; then
674 then
675 eerror "A shell was specified but it does not exist !" 501 eerror "A shell was specified but it does not exist !"
676 die "${eshell} does not exist" 502 die "${eshell} does not exist"
677 fi 503 fi
678 else 504 else
679 if [ "${USERLAND}" == "BSD" ] 505 case ${USERLAND} in
680 then
681 eshell="/usr/bin/false" 506 Darwin) eshell="/usr/bin/false";;
682 else 507 BSD) eshell="/usr/sbin/nologin";;
683 eshell="/bin/false" 508 *) eshell="/bin/false";;
684 fi 509 esac
685 fi 510 fi
686 einfo " - Shell: ${eshell}" 511 einfo " - Shell: ${eshell}"
687 opts="${opts} -s ${eshell}" 512 opts="${opts} -s ${eshell}"
688 513
689 # handle homedir 514 # handle homedir
690 local ehome="$1"; shift 515 local ehome=$1; shift
691 if [ -z "${ehome}" ] && [ "${eshell}" != "-1" ] 516 if [[ -z ${ehome} ]] || [[ ${ehome} == "-1" ]] ; then
692 then
693 ehome="/dev/null" 517 ehome="/dev/null"
694 fi 518 fi
695 einfo " - Home: ${ehome}" 519 einfo " - Home: ${ehome}"
696 opts="${opts} -d ${ehome}" 520 opts="${opts} -d ${ehome}"
697 521
698 # handle groups 522 # handle groups
699 local egroups="$1"; shift 523 local egroups=$1; shift
700 if [ ! -z "${egroups}" ] 524 if [[ ! -z ${egroups} ]] ; then
701 then
702 local oldifs="${IFS}" 525 local oldifs=${IFS}
703 local defgroup="" exgroups="" 526 local defgroup="" exgroups=""
704 527
705 export IFS="," 528 export IFS=","
706 for g in ${egroups} 529 for g in ${egroups} ; do
707 do
708 export IFS="${oldifs}" 530 export IFS=${oldifs}
709 if [ -z "`egetent group \"${g}\"`" ] 531 if [[ -z $(egetent group "${g}") ]] ; then
710 then
711 eerror "You must add group ${g} to the system first" 532 eerror "You must add group ${g} to the system first"
712 die "${g} is not a valid GID" 533 die "${g} is not a valid GID"
713 fi 534 fi
714 if [ -z "${defgroup}" ] 535 if [[ -z ${defgroup} ]] ; then
715 then
716 defgroup="${g}" 536 defgroup=${g}
717 else 537 else
718 exgroups="${exgroups},${g}" 538 exgroups="${exgroups},${g}"
719 fi 539 fi
720 export IFS="," 540 export IFS=","
721 done 541 done
722 export IFS="${oldifs}" 542 export IFS=${oldifs}
723 543
724 opts="${opts} -g ${defgroup}" 544 opts="${opts} -g ${defgroup}"
725 if [ ! -z "${exgroups}" ] 545 if [[ ! -z ${exgroups} ]] ; then
726 then
727 opts="${opts} -G ${exgroups:1}" 546 opts="${opts} -G ${exgroups:1}"
728 fi 547 fi
729 else 548 else
730 egroups="(none)" 549 egroups="(none)"
731 fi 550 fi
732 einfo " - Groups: ${egroups}" 551 einfo " - Groups: ${egroups}"
733 552
734 # handle extra and add the user 553 # handle extra and add the user
735 local eextra="$@"
736 local oldsandbox="${SANDBOX_ON}" 554 local oldsandbox=${SANDBOX_ON}
737 export SANDBOX_ON="0" 555 export SANDBOX_ON="0"
738 if useq ppc-macos 556 case ${USERLAND} in
739 then 557 Darwin)
740 ### Make the user 558 ### Make the user
741 if [ -z "${eextra}" ] 559 if [[ -z $@ ]] ; then
742 then
743 dscl . create /users/${euser} uid ${euid} 560 dscl . create /users/${euser} uid ${euid}
744 dscl . create /users/${euser} shell ${eshell} 561 dscl . create /users/${euser} shell ${eshell}
745 dscl . create /users/${euser} home ${ehome} 562 dscl . create /users/${euser} home ${ehome}
746 dscl . create /users/${euser} realname "added by portage for ${PN}" 563 dscl . create /users/${euser} realname "added by portage for ${PN}"
747 ### Add the user to the groups specified 564 ### Add the user to the groups specified
748 local oldifs="${IFS}" 565 local oldifs=${IFS}
749 export IFS="," 566 export IFS=","
750 for g in ${egroups} 567 for g in ${egroups} ; do
751 do
752 dscl . merge /groups/${g} users ${euser} 568 dscl . merge /groups/${g} users ${euser}
753 done 569 done
754 export IFS="${oldifs}" 570 export IFS=${oldifs}
755 else 571 else
756 einfo "Extra options are not supported on macos yet" 572 einfo "Extra options are not supported on Darwin yet"
757 einfo "Please report the ebuild along with the info below" 573 einfo "Please report the ebuild along with the info below"
758 einfo "eextra: ${eextra}" 574 einfo "eextra: $@"
759 die "Required function missing" 575 die "Required function missing"
760 fi 576 fi
761 elif use x86-fbsd ; then 577 ;;
762 if [ -z "${eextra}" ] 578 BSD)
763 then 579 if [[ -z $@ ]] ; then
764 pw useradd ${euser} ${opts} \ 580 pw useradd ${euser} ${opts} \
765 -c "added by portage for ${PN}" \ 581 -c "added by portage for ${PN}" \
766 die "enewuser failed" 582 die "enewuser failed"
767 else 583 else
768 einfo " - Extra: ${eextra}" 584 einfo " - Extra: $@"
769 pw useradd ${euser} ${opts} \ 585 pw useradd ${euser} ${opts} \
770 -c ${eextra} || die "enewuser failed" 586 "$@" || die "enewuser failed"
771 fi 587 fi
772 else 588 ;;
773 if [ -z "${eextra}" ] 589 *)
774 then 590 if [[ -z $@ ]] ; then
775 useradd ${opts} ${euser} \ 591 useradd ${opts} ${euser} \
776 -c "added by portage for ${PN}" \ 592 -c "added by portage for ${PN}" \
777 || die "enewuser failed" 593 || die "enewuser failed"
778 else 594 else
779 einfo " - Extra: ${eextra}" 595 einfo " - Extra: $@"
780 useradd ${opts} ${euser} ${eextra} \ 596 useradd ${opts} ${euser} "$@" \
781 || die "enewuser failed" 597 || die "enewuser failed"
782 fi 598 fi
783 fi 599 ;;
600 esac
784 export SANDBOX_ON="${oldsandbox}" 601 export SANDBOX_ON=${oldsandbox}
785 602
786 if [ ! -e "${ehome}" ] && [ ! -e "${D}/${ehome}" ] 603 if [ ! -e "${ehome}" ] && [ ! -e "${D}/${ehome}" ]
787 then 604 then
788 einfo " - Creating ${ehome} in ${D}" 605 einfo " - Creating ${ehome} in ${D}"
789 dodir ${ehome} 606 dodir ${ehome}
826 then 643 then
827 if [ "${egid}" -gt 0 ] 644 if [ "${egid}" -gt 0 ]
828 then 645 then
829 if [ -z "`egetent group ${egid}`" ] 646 if [ -z "`egetent group ${egid}`" ]
830 then 647 then
831 if useq ppc-macos ; then 648 if [[ "${USERLAND}" == "Darwin" ]]; then
832 opts="${opts} ${egid}" 649 opts="${opts} ${egid}"
833 else 650 else
834 opts="${opts} -g ${egid}" 651 opts="${opts} -g ${egid}"
835 fi 652 fi
836 else 653 else
850 opts="${opts} ${eextra}" 667 opts="${opts} ${eextra}"
851 668
852 # add the group 669 # add the group
853 local oldsandbox="${SANDBOX_ON}" 670 local oldsandbox="${SANDBOX_ON}"
854 export SANDBOX_ON="0" 671 export SANDBOX_ON="0"
855 if useq ppc-macos ; then 672 if [[ "${USERLAND}" == "Darwin" ]]; then
856 if [ ! -z "${eextra}" ]; 673 if [ ! -z "${eextra}" ];
857 then 674 then
858 einfo "Extra options are not supported on macos yet" 675 einfo "Extra options are not supported on Darwin/OS X yet"
859 einfo "Please report the ebuild along with the info below" 676 einfo "Please report the ebuild along with the info below"
860 einfo "eextra: ${eextra}" 677 einfo "eextra: ${eextra}"
861 die "Required function missing" 678 die "Required function missing"
862 fi 679 fi
863 680
868 [ -z "`egetent group ${egid}`" ] && break 685 [ -z "`egetent group ${egid}`" ] && break
869 done 686 done
870 esac 687 esac
871 dscl . create /groups/${egroup} gid ${egid} 688 dscl . create /groups/${egroup} gid ${egid}
872 dscl . create /groups/${egroup} passwd '*' 689 dscl . create /groups/${egroup} passwd '*'
873 elif use x86-fbsd ; then 690 elif [[ "${USERLAND}" == "BSD" ]] ; then
874 case ${egid} in 691 case ${egid} in
875 *[!0-9]*) # Non numeric 692 *[!0-9]*) # Non numeric
876 for egid in `jot 898 101`; do 693 for egid in `jot 898 101`; do
877 [ -z "`egetent group ${egid}`" ] && break 694 [ -z "`egetent group ${egid}`" ] && break
878 done 695 done
1025 *) 842 *)
1026 type= 843 type=
1027 ;; 844 ;;
1028 esac 845 esac
1029 fi 846 fi
1030 847 if [ "${SLOT}" == "0" ] ; then
848 local desktop_name="${PN}"
849 else
850 local desktop_name="${PN}-${SLOT}"
851 fi
1031 local desktop=${T}/${exec%% *}-${P}.desktop 852 local desktop=${T}/${exec%% *}-${desktop_name}.desktop
1032 853
1033echo "[Desktop Entry] 854echo "[Desktop Entry]
1034Encoding=UTF-8 855Encoding=UTF-8
1035Version=0.9.2 856Version=0.9.2
1036Name=${name} 857Name=${name}
1052# make_desktop_entry(<title>, <command>) 873# make_desktop_entry(<title>, <command>)
1053# title: File to execute to start the Window Manager 874# title: File to execute to start the Window Manager
1054# command: Name of the Window Manager 875# command: Name of the Window Manager
1055 876
1056make_session_desktop() { 877make_session_desktop() {
1057
1058 [ -z "$1" ] && eerror "make_session_desktop: You must specify the title" && return 1 878 [[ -z $1 ]] && eerror "make_session_desktop: You must specify the title" && return 1
1059 [ -z "$2" ] && eerror "make_session_desktop: You must specify the command" && return 1 879 [[ -z $2 ]] && eerror "make_session_desktop: You must specify the command" && return 1
1060 880
1061 local title="${1}" 881 local title=$1
1062 local command="${2}" 882 local command=$2
1063 local desktop="${T}/${wm}.desktop" 883 local desktop=${T}/${wm}.desktop
1064 884
1065echo "[Desktop Entry] 885echo "[Desktop Entry]
1066Encoding=UTF-8 886Encoding=UTF-8
1067Name=${title} 887Name=${title}
1068Comment=This session logs you into ${title} 888Comment=This session logs you into ${title}
1070TryExec=${command} 890TryExec=${command}
1071Type=Application" > "${desktop}" 891Type=Application" > "${desktop}"
1072 892
1073 insinto /usr/share/xsessions 893 insinto /usr/share/xsessions
1074 doins "${desktop}" 894 doins "${desktop}"
1075
1076 return 0
1077} 895}
1078 896
1079domenu() { 897domenu() {
1080 local i 898 local i j
1081 local j
1082 insinto /usr/share/applications 899 insinto /usr/share/applications
1083 for i in ${@} 900 for i in "$@" ; do
1084 do
1085 if [ -f "${i}" ]; 901 if [[ -f ${i} ]] ; then
1086 then
1087 doins ${i} 902 doins "${i}"
1088 elif [ -d "${i}" ]; 903 elif [[ -d ${i} ]] ; then
1089 then
1090 for j in ${i}/*.desktop 904 for j in "${i}"/*.desktop ; do
1091 do
1092 doins ${j} 905 doins "${j}"
1093 done 906 done
1094 fi 907 fi
1095 done 908 done
1096} 909}
910newmenu() {
911 insinto /usr/share/applications
912 newins "$1" "$2"
913}
1097 914
1098doicon() { 915doicon() {
1099 local i 916 local i j
1100 local j
1101 insinto /usr/share/pixmaps 917 insinto /usr/share/pixmaps
1102 for i in ${@} 918 for i in "$@" ; do
1103 do
1104 if [ -f "${i}" ]; 919 if [[ -f ${i} ]] ; then
1105 then
1106 doins ${i} 920 doins "${i}"
1107 elif [ -d "${i}" ]; 921 elif [[ -d ${i} ]] ; then
1108 then
1109 for j in ${i}/*.png 922 for j in "${i}"/*.png ; do
1110 do
1111 doins ${j} 923 doins "${j}"
1112 done 924 done
1113 fi 925 fi
1114 done 926 done
927}
928newicon() {
929 insinto /usr/share/pixmaps
930 newins "$1" "$2"
1115} 931}
1116 932
1117############################################################## 933##############################################################
1118# END: Handle .desktop files and menu entries # 934# END: Handle .desktop files and menu entries #
1119############################################################## 935##############################################################
1520 local mline="" 1336 local mline=""
1521 local showedmsg=0 1337 local showedmsg=0
1522 1338
1523 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do 1339 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do
1524 [[ -d ${mline}/${dir} ]] || continue 1340 [[ -d ${mline}/${dir} ]] || continue
1525 [[ ! -z $(find ${mline}/${dir} -iname ${file} -maxdepth 1) ]] \ 1341 [[ ! -z $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] \
1526 && export CDROM_ROOT=${mline} 1342 && export CDROM_ROOT=${mline}
1527 done 1343 done
1528 1344
1529 if [[ -z ${CDROM_ROOT} ]] ; then 1345 if [[ -z ${CDROM_ROOT} ]] ; then
1530 echo 1346 echo
1598 else 1414 else
1599 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1415 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA"
1600 fi 1416 fi
1601 done 1417 done
1602 if [[ -z ${newls} ]] ; then 1418 if [[ -z ${newls} ]] ; then
1603 unset LINGUAS 1419 export LINGUAS=""
1604 else 1420 else
1605 export LINGUAS=${newls:1} 1421 export LINGUAS=${newls:1}
1606 fi 1422 fi
1607} 1423}
1608 1424
1618 while ((i--)) ; do 1434 while ((i--)) ; do
1619 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass" 1435 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1620 done 1436 done
1621 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}" 1437 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1622 case ${ARCH} in 1438 case ${ARCH} in
1623 x86) export ARCH="i386";; 1439 x86) export ARCH="i386";;
1624 amd64) export ARCH="x86_64";; 1440 amd64) export ARCH="x86_64";;
1625 hppa) export ARCH="parisc";; 1441 hppa) export ARCH="parisc";;
1626 mips) export ARCH="mips";; 1442 mips) export ARCH="mips";;
1627 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! 1443 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!
1628 *) export ARCH="${ARCH}";; 1444 *) export ARCH="${ARCH}";;
1629 esac 1445 esac
1630} 1446}
1631 1447
1632# set's ARCH back to what portage expects 1448# set's ARCH back to what portage expects
1633set_arch_to_portage() { 1449set_arch_to_portage() {
1740dopamd() { 1556dopamd() {
1741 [[ -z $1 ]] && die "dopamd requires at least one argument" 1557 [[ -z $1 ]] && die "dopamd requires at least one argument"
1742 1558
1743 use pam || return 0 1559 use pam || return 0
1744 1560
1745 insinto /etc/pam.d 1561 INSDESTTREE=/etc/pam.d \
1746 doins "$@" || die "failed to install $@" 1562 doins "$@" || die "failed to install $@"
1747} 1563}
1748# newpamd <old name> <new name> 1564# newpamd <old name> <new name>
1749# 1565#
1750# Install pam file <old name> as <new name> in /etc/pam.d 1566# Install pam file <old name> as <new name> in /etc/pam.d
1751newpamd() { 1567newpamd() {
1752 [[ $# -ne 2 ]] && die "newpamd requires two arguements" 1568 [[ $# -ne 2 ]] && die "newpamd requires two arguements"
1753 1569
1754 use pam || return 0 1570 use pam || return 0
1755 1571
1756 insinto /etc/pam.d 1572 INSDESTTREE=/etc/pam.d \
1757 newins "$1" "$2" || die "failed to install $1 as $2" 1573 newins "$1" "$2" || die "failed to install $1 as $2"
1758} 1574}
1759 1575
1760# make a wrapper script ... 1576# make a wrapper script ...
1761# NOTE: this was originally games_make_wrapper, but I noticed other places where 1577# NOTE: this was originally games_make_wrapper, but I noticed other places where
1763# -- wolf31o2 1579# -- wolf31o2
1764# $1 == wrapper name 1580# $1 == wrapper name
1765# $2 == binary to run 1581# $2 == binary to run
1766# $3 == directory to chdir before running binary 1582# $3 == directory to chdir before running binary
1767# $4 == extra LD_LIBRARY_PATH's (make it : delimited) 1583# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1584# $5 == path for wrapper
1768make_wrapper() { 1585make_wrapper() {
1769 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 1586 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1770 local tmpwrapper=$(emktemp) 1587 local tmpwrapper=$(emktemp)
1771 cat << EOF > "${tmpwrapper}" 1588 cat << EOF > "${tmpwrapper}"
1772#!/bin/sh 1589#!/bin/sh
1773cd "${chdir}" 1590cd "${chdir}"
1774export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}" 1591export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1775exec ${bin} "\$@" 1592exec ${bin} "\$@"
1776EOF 1593EOF
1777 chmod go+rx "${tmpwrapper}" 1594 chmod go+rx "${tmpwrapper}"
1595 if [ -n "${5}" ]
1596 then
1597 exeinto ${5}
1598 newexe "${tmpwrapper}" "${wrapper}"
1599 else
1778 newbin "${tmpwrapper}" "${wrapper}" 1600 newbin "${tmpwrapper}" "${wrapper}"
1601 fi
1779} 1602}

Legend:
Removed from v.1.163  
changed lines
  Added in v.1.182

  ViewVC Help
Powered by ViewVC 1.1.20