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

Diff of /eclass/eutils.eclass

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

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

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

  ViewVC Help
Powered by ViewVC 1.1.20