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

Diff of /eclass/eutils.eclass

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

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

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

  ViewVC Help
Powered by ViewVC 1.1.20