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

Diff of /eclass/eutils.eclass

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

Revision 1.157 Revision 1.186
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.157 2005/03/07 17:45:07 carlo Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.186 2005/07/06 20:20:03 agriffis Exp $
4# 4#
5# Author: Martin Schlemmer <azarah@gentoo.org> 5# Author: Martin Schlemmer <azarah@gentoo.org>
6# 6#
7# This eclass is for general purpose functions that most ebuilds 7# This eclass is for general purpose functions that most ebuilds
8# have to implement themselves. 8# have to implement themselves.
9# 9#
10# NB: If you add anything, please comment it! 10# NB: If you add anything, please comment it!
11 11
12inherit multilib 12inherit multilib
13ECLASS=eutils
14INHERITED="$INHERITED $ECLASS" 13INHERITED="$INHERITED $ECLASS"
15 14
16DEPEND="!bootstrap? ( sys-devel/patch )" 15DEPEND="!bootstrap? ( sys-devel/patch )"
16# sys-apps/shadow is needed for useradd, etc, bug #94745.
17 17
18DESCRIPTION="Based on the ${ECLASS} eclass" 18DESCRIPTION="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 19
64# Wait for the supplied number of seconds. If no argument is supplied, defaults 20# 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 21# 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 22# outputting to a terminal, don't wait. For compatability purposes, the argument
67# must be an integer greater than zero. 23# must be an integer greater than zero.
109gen_usr_ldscript() { 65gen_usr_ldscript() {
110 local libdir="$(get_libdir)" 66 local libdir="$(get_libdir)"
111 # Just make sure it exists 67 # Just make sure it exists
112 dodir /usr/${libdir} 68 dodir /usr/${libdir}
113 69
70 for lib in "${@}" ; do
114 cat > "${D}/usr/${libdir}/${1}" << END_LDSCRIPT 71 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT
115/* GNU ld script 72 /* GNU ld script
116 Because Gentoo have critical dynamic libraries 73 Since Gentoo has critical dynamic libraries
117 in /lib, and the static versions in /usr/lib, we 74 in /lib, and the static versions in /usr/lib,
118 need to have a "fake" dynamic lib in /usr/lib, 75 we need to have a "fake" dynamic lib in /usr/lib,
119 otherwise we run into linking problems. 76 otherwise we run into linking problems.
120 See bug #4411 on http://bugs.gentoo.org/ for 77
121 more info. */ 78 See bug http://bugs.gentoo.org/4411 for more info.
79 */
122GROUP ( /${libdir}/${1} ) 80 GROUP ( /${libdir}/${lib} )
123END_LDSCRIPT 81 END_LDSCRIPT
124 fperms a+x "/usr/${libdir}/${1}" 82 fperms a+x "/usr/${libdir}/${lib}"
83 done
125} 84}
126 85
127# Simple function to draw a line consisting of '=' the same length as $* 86# Simple function to draw a line consisting of '=' the same length as $*
87# - only to be used by epatch()
128# 88#
129# <azarah@gentoo.org> (11 Nov 2002) 89# <azarah@gentoo.org> (11 Nov 2002)
130# 90#
131draw_line() { 91draw_line() {
132 local i=0 92 local i=0
158EPATCH_SOURCE="${WORKDIR}/patch" 118EPATCH_SOURCE="${WORKDIR}/patch"
159# Default extension for patches 119# Default extension for patches
160EPATCH_SUFFIX="patch.bz2" 120EPATCH_SUFFIX="patch.bz2"
161# Default options for patch 121# Default options for patch
162# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571 122# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571
163EPATCH_OPTS="-g0" 123# Set --no-backup-if-mismatch so we don't leave '.orig' files behind.
124EPATCH_OPTS="-g0 --no-backup-if-mismatch"
164# List of patches not to apply. Not this is only file names, 125# List of patches not to apply. Not this is only file names,
165# and not the full path .. 126# and not the full path ..
166EPATCH_EXCLUDE="" 127EPATCH_EXCLUDE=""
167# Change the printed message for a single patch. 128# Change the printed message for a single patch.
168EPATCH_SINGLE_MSG="" 129EPATCH_SINGLE_MSG=""
130# Change the printed message for multiple patches.
131EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..."
169# Force applying bulk patches even if not following the style: 132# Force applying bulk patches even if not following the style:
170# 133#
171# ??_${ARCH}_foo.${EPATCH_SUFFIX} 134# ??_${ARCH}_foo.${EPATCH_SUFFIX}
172# 135#
173EPATCH_FORCE="no" 136EPATCH_FORCE="no"
214 local x="" 177 local x=""
215 178
216 if [ "$#" -gt 1 ] 179 if [ "$#" -gt 1 ]
217 then 180 then
218 local m="" 181 local m=""
219 einfo "${#} patches to apply ..."
220 for m in "$@" ; do 182 for m in "$@" ; do
221 epatch "${m}" 183 epatch "${m}"
222 done 184 done
223 return 0 185 return 0
224 fi 186 fi
278 ;; 240 ;;
279 esac 241 esac
280 242
281 if [ "${SINGLE_PATCH}" = "no" ] 243 if [ "${SINGLE_PATCH}" = "no" ]
282 then 244 then
283 einfo "Applying various patches (bugfixes/updates) ..." 245 einfo "${EPATCH_MULTI_MSG}"
284 fi 246 fi
285 for x in ${EPATCH_SOURCE} 247 for x in ${EPATCH_SOURCE}
286 do 248 do
287 # New ARCH dependant patch naming scheme ... 249 # New ARCH dependant patch naming scheme ...
288 # 250 #
289 # ???_arch_foo.patch 251 # ???_arch_foo.patch
290 # 252 #
291 if [ -f ${x} ] && \ 253 if [ -f ${x} ] && \
292 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "`eval echo \$\{x/_${ARCH}_\}`" != "${x}" ] || \ 254 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "${x/_${ARCH}_}" != "${x}" ] || \
293 [ "${EPATCH_FORCE}" = "yes" ]) 255 [ "${EPATCH_FORCE}" = "yes" ])
294 then 256 then
295 local count=0 257 local count=0
296 local popts="${EPATCH_OPTS}" 258 local popts="${EPATCH_OPTS}"
297 local patchname=${x##*/} 259 local patchname=${x##*/}
386 fi 348 fi
387 349
388 if [ "${count}" -eq 5 ] 350 if [ "${count}" -eq 5 ]
389 then 351 then
390 echo 352 echo
391 eerror "Failed Patch: ${patchname}!" 353 eerror "Failed Patch: ${patchname} !"
354 eerror " ( ${PATCH_TARGET} )"
392 eerror 355 eerror
393 eerror "Include in your bugreport the contents of:" 356 eerror "Include in your bugreport the contents of:"
394 eerror 357 eerror
395 eerror " ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}" 358 eerror " ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}"
396 echo 359 echo
403 fi 366 fi
404 done 367 done
405 if [ "${SINGLE_PATCH}" = "no" ] 368 if [ "${SINGLE_PATCH}" = "no" ]
406 then 369 then
407 einfo "Done with patching" 370 einfo "Done with patching"
408 fi
409}
410
411# This function return true if we are using the NPTL pthreads
412# implementation.
413#
414# <azarah@gentoo.org> (06 March 2003)
415#
416have_NPTL() {
417 cat > ${T}/test-nptl.c <<-"END"
418 #define _XOPEN_SOURCE
419 #include <unistd.h>
420 #include <stdio.h>
421
422 int main()
423 {
424 char buf[255];
425 char *str = buf;
426
427 confstr(_CS_GNU_LIBPTHREAD_VERSION, str, 255);
428 if (NULL != str) {
429 printf("%s\n", str);
430 if (NULL != strstr(str, "NPTL"))
431 return 0;
432 }
433
434 return 1;
435 }
436 END
437
438 einfon "Checking for _CS_GNU_LIBPTHREAD_VERSION support in glibc ..."
439 if gcc -o ${T}/nptl ${T}/test-nptl.c &> /dev/null
440 then
441 echo "yes"
442 einfon "Checking what PTHREADS implementation we have ..."
443 if ${T}/nptl
444 then
445 return 0
446 else
447 return 1
448 fi
449 else
450 echo "no"
451 fi
452
453 return 1
454}
455
456# This function check how many cpu's are present, and then set
457# -j in MAKEOPTS accordingly.
458#
459# Thanks to nall <nall@gentoo.org> for this.
460#
461get_number_of_jobs() {
462 local jobs=0
463
464 if [ ! -r /proc/cpuinfo ]
465 then
466 return 1
467 fi
468
469 # This bit is from H?kan Wessberg <nacka-gentoo@refug.org>, bug #13565.
470 if [ "`egrep "^[[:space:]]*MAKEOPTS=" /etc/make.conf | wc -l`" -gt 0 ]
471 then
472 ADMINOPTS="`egrep "^[[:space:]]*MAKEOPTS=" /etc/make.conf | cut -d= -f2 | sed 's/\"//g'`"
473 ADMINPARAM="`echo ${ADMINOPTS} | gawk '{match($0, /-j *[0-9]*/, opt); print opt[0]}'`"
474 ADMINPARAM="${ADMINPARAM/-j}"
475 fi
476
477 export MAKEOPTS="`echo ${MAKEOPTS} | sed -e 's:-j *[0-9]*::g'`"
478
479 if [ "${ARCH}" = "amd64" -o "${ARCH}" = "x86" -o "${ARCH}" = "hppa" -o \
480 "${ARCH}" = "arm" -o "${ARCH}" = "mips" -o "${ARCH}" = "ia64" ]
481 then
482 # these archs will always have "[Pp]rocessor"
483 jobs="$((`grep -c ^[Pp]rocessor /proc/cpuinfo` * 2))"
484
485 elif [ "${ARCH}" = "sparc" -o "${ARCH}" = "sparc64" ]
486 then
487 # sparc always has "ncpus active"
488 jobs="$((`grep "^ncpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
489
490 elif [ "${ARCH}" = "alpha" ]
491 then
492 # alpha has "cpus active", but only when compiled with SMP
493 if [ "`grep -c "^cpus active" /proc/cpuinfo`" -eq 1 ]
494 then
495 jobs="$((`grep "^cpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
496 else
497 jobs=2
498 fi
499
500 elif [ "${ARCH}" = "ppc" -o "${ARCH}" = "ppc64" ]
501 then
502 # ppc has "processor", but only when compiled with SMP
503 if [ "`grep -c "^processor" /proc/cpuinfo`" -eq 1 ]
504 then
505 jobs="$((`grep -c ^processor /proc/cpuinfo` * 2))"
506 else
507 jobs=2
508 fi
509 elif [ "${ARCH}" = "s390" ]
510 then
511 # s390 has "# processors : "
512 jobs="$((`grep "^\# processors" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
513 else
514 jobs="$((`grep -c ^cpu /proc/cpuinfo` * 2))"
515 die "Unknown ARCH -- ${ARCH}!"
516 fi
517
518 # Make sure the number is valid ...
519 if [ "${jobs}" -lt 1 ]
520 then
521 jobs=1
522 fi
523
524 if [ -n "${ADMINPARAM}" ]
525 then
526 if [ "${jobs}" -gt "${ADMINPARAM}" ]
527 then
528 einfo "Setting make jobs to \"-j${ADMINPARAM}\" to ensure successful merge ..."
529 export MAKEOPTS="${MAKEOPTS} -j${ADMINPARAM}"
530 else
531 einfo "Setting make jobs to \"-j${jobs}\" to ensure successful merge ..."
532 export MAKEOPTS="${MAKEOPTS} -j${jobs}"
533 fi
534 fi 371 fi
535} 372}
536 373
537# Cheap replacement for when debianutils (and thus mktemp) 374# Cheap replacement for when debianutils (and thus mktemp)
538# does not exist on the users system 375# does not exist on the users system
572# Joe Jezak <josejx@gmail.com> and usata@gentoo.org 409# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
573# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org> 410# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
574# 411#
575# egetent(database, key) 412# egetent(database, key)
576egetent() { 413egetent() {
577 if useq ppc-macos ; then 414 if [[ "${USERLAND}" == "Darwin" ]] ; then
578 case "$2" in 415 case "$2" in
579 *[!0-9]*) # Non numeric 416 *[!0-9]*) # Non numeric
580 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 417 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
581 ;; 418 ;;
582 *) # Numeric 419 *) # Numeric
583 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 420 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
584 ;; 421 ;;
585 esac 422 esac
586 elif useq x86-fbsd ; then 423 elif [[ "${USERLAND}" == "BSD" ]] ; then
587 local action 424 local action
588 if [ "$1" == "passwd" ] 425 if [ "$1" == "passwd" ]
589 then 426 then
590 action="user" 427 action="user"
591 else 428 else
611# homedir: /dev/null 448# homedir: /dev/null
612# groups: none 449# groups: none
613# extra: comment of 'added by portage for ${PN}' 450# extra: comment of 'added by portage for ${PN}'
614enewuser() { 451enewuser() {
615 # get the username 452 # get the username
616 local euser="$1"; shift 453 local euser=$1; shift
617 if [ -z "${euser}" ] 454 if [[ -z ${euser} ]] ; then
618 then
619 eerror "No username specified !" 455 eerror "No username specified !"
620 die "Cannot call enewuser without a username" 456 die "Cannot call enewuser without a username"
621 fi 457 fi
622 458
623 # lets see if the username already exists 459 # lets see if the username already exists
624 if [ "${euser}" == "`egetent passwd \"${euser}\" | cut -d: -f1`" ] 460 if [[ ${euser} == $(egetent passwd "${euser}" | cut -d: -f1) ]] ; then
625 then
626 return 0 461 return 0
627 fi 462 fi
628 einfo "Adding user '${euser}' to your system ..." 463 einfo "Adding user '${euser}' to your system ..."
629 464
630 # options to pass to useradd 465 # options to pass to useradd
631 local opts= 466 local opts=
632 467
633 # handle uid 468 # handle uid
634 local euid="$1"; shift 469 local euid=$1; shift
635 if [ ! -z "${euid}" ] && [ "${euid}" != "-1" ] 470 if [[ ! -z ${euid} ]] && [[ ${euid} != "-1" ]] ; then
636 then
637 if [ "${euid}" -gt 0 ] 471 if [[ ${euid} -gt 0 ]] ; then
638 then
639 if [ ! -z "`egetent passwd ${euid}`" ] 472 if [[ ! -z $(egetent passwd ${euid}) ]] ; then
640 then
641 euid="next" 473 euid="next"
642 fi 474 fi
643 else 475 else
644 eerror "Userid given but is not greater than 0 !" 476 eerror "Userid given but is not greater than 0 !"
645 die "${euid} is not a valid UID" 477 die "${euid} is not a valid UID"
646 fi 478 fi
647 else 479 else
648 euid="next" 480 euid="next"
649 fi 481 fi
650 if [ "${euid}" == "next" ] 482 if [[ ${euid} == "next" ]] ; then
651 then
652 local pwrange 483 local pwrange
653 if [ "${USERLAND}" == "BSD" ] ; then 484 if [[ ${USERLAND} == "BSD" ]] ; then
654 pwrange="`jot 898 101`" 485 pwrange=$(jot 898 101)
655 else 486 else
656 pwrange="`seq 101 999`" 487 pwrange=$(seq 101 999)
657 fi 488 fi
658 for euid in ${pwrange} ; do 489 for euid in ${pwrange} ; do
659 [ -z "`egetent passwd ${euid}`" ] && break 490 [[ -z $(egetent passwd ${euid}) ]] && break
660 done 491 done
661 fi 492 fi
662 opts="${opts} -u ${euid}" 493 opts="${opts} -u ${euid}"
663 einfo " - Userid: ${euid}" 494 einfo " - Userid: ${euid}"
664 495
665 # handle shell 496 # handle shell
666 local eshell="$1"; shift 497 local eshell=$1; shift
667 if [ ! -z "${eshell}" ] && [ "${eshell}" != "-1" ] 498 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
668 then
669 if [ ! -e "${eshell}" ] 499 if [[ ! -e ${eshell} ]] ; then
670 then
671 eerror "A shell was specified but it does not exist !" 500 eerror "A shell was specified but it does not exist !"
672 die "${eshell} does not exist" 501 die "${eshell} does not exist"
673 fi 502 fi
674 else 503 else
675 if [ "${USERLAND}" == "BSD" ] 504 case ${USERLAND} in
676 then
677 eshell="/usr/bin/false" 505 Darwin) eshell="/usr/bin/false";;
678 else 506 BSD) eshell="/usr/sbin/nologin";;
679 eshell="/bin/false" 507 *) eshell="/bin/false";;
680 fi 508 esac
681 fi 509 fi
682 einfo " - Shell: ${eshell}" 510 einfo " - Shell: ${eshell}"
683 opts="${opts} -s ${eshell}" 511 opts="${opts} -s ${eshell}"
684 512
685 # handle homedir 513 # handle homedir
686 local ehome="$1"; shift 514 local ehome=$1; shift
687 if [ -z "${ehome}" ] && [ "${eshell}" != "-1" ] 515 if [[ -z ${ehome} ]] || [[ ${ehome} == "-1" ]] ; then
688 then
689 ehome="/dev/null" 516 ehome="/dev/null"
690 fi 517 fi
691 einfo " - Home: ${ehome}" 518 einfo " - Home: ${ehome}"
692 opts="${opts} -d ${ehome}" 519 opts="${opts} -d ${ehome}"
693 520
694 # handle groups 521 # handle groups
695 local egroups="$1"; shift 522 local egroups=$1; shift
696 if [ ! -z "${egroups}" ] 523 if [[ ! -z ${egroups} ]] ; then
697 then
698 local oldifs="${IFS}" 524 local oldifs=${IFS}
699 local defgroup="" exgroups="" 525 local defgroup="" exgroups=""
700 526
701 export IFS="," 527 export IFS=","
702 for g in ${egroups} 528 for g in ${egroups} ; do
703 do
704 export IFS="${oldifs}" 529 export IFS=${oldifs}
705 if [ -z "`egetent group \"${g}\"`" ] 530 if [[ -z $(egetent group "${g}") ]] ; then
706 then
707 eerror "You must add group ${g} to the system first" 531 eerror "You must add group ${g} to the system first"
708 die "${g} is not a valid GID" 532 die "${g} is not a valid GID"
709 fi 533 fi
710 if [ -z "${defgroup}" ] 534 if [[ -z ${defgroup} ]] ; then
711 then
712 defgroup="${g}" 535 defgroup=${g}
713 else 536 else
714 exgroups="${exgroups},${g}" 537 exgroups="${exgroups},${g}"
715 fi 538 fi
716 export IFS="," 539 export IFS=","
717 done 540 done
718 export IFS="${oldifs}" 541 export IFS=${oldifs}
719 542
720 opts="${opts} -g ${defgroup}" 543 opts="${opts} -g ${defgroup}"
721 if [ ! -z "${exgroups}" ] 544 if [[ ! -z ${exgroups} ]] ; then
722 then
723 opts="${opts} -G ${exgroups:1}" 545 opts="${opts} -G ${exgroups:1}"
724 fi 546 fi
725 else 547 else
726 egroups="(none)" 548 egroups="(none)"
727 fi 549 fi
728 einfo " - Groups: ${egroups}" 550 einfo " - Groups: ${egroups}"
729 551
730 # handle extra and add the user 552 # handle extra and add the user
731 local eextra="$@"
732 local oldsandbox="${SANDBOX_ON}" 553 local oldsandbox=${SANDBOX_ON}
733 export SANDBOX_ON="0" 554 export SANDBOX_ON="0"
734 if useq ppc-macos 555 case ${USERLAND} in
735 then 556 Darwin)
736 ### Make the user 557 ### Make the user
737 if [ -z "${eextra}" ] 558 if [[ -z $@ ]] ; then
738 then
739 dscl . create /users/${euser} uid ${euid} 559 dscl . create /users/${euser} uid ${euid}
740 dscl . create /users/${euser} shell ${eshell} 560 dscl . create /users/${euser} shell ${eshell}
741 dscl . create /users/${euser} home ${ehome} 561 dscl . create /users/${euser} home ${ehome}
742 dscl . create /users/${euser} realname "added by portage for ${PN}" 562 dscl . create /users/${euser} realname "added by portage for ${PN}"
743 ### Add the user to the groups specified 563 ### Add the user to the groups specified
744 local oldifs="${IFS}" 564 local oldifs=${IFS}
745 export IFS="," 565 export IFS=","
746 for g in ${egroups} 566 for g in ${egroups} ; do
747 do
748 dscl . merge /groups/${g} users ${euser} 567 dscl . merge /groups/${g} users ${euser}
749 done 568 done
750 export IFS="${oldifs}" 569 export IFS=${oldifs}
751 else 570 else
752 einfo "Extra options are not supported on macos yet" 571 einfo "Extra options are not supported on Darwin yet"
753 einfo "Please report the ebuild along with the info below" 572 einfo "Please report the ebuild along with the info below"
754 einfo "eextra: ${eextra}" 573 einfo "eextra: $@"
755 die "Required function missing" 574 die "Required function missing"
756 fi 575 fi
757 elif use x86-fbsd ; then 576 ;;
758 if [ -z "${eextra}" ] 577 BSD)
759 then 578 if [[ -z $@ ]] ; then
760 pw useradd ${euser} ${opts} \ 579 pw useradd ${euser} ${opts} \
761 -c "added by portage for ${PN}" \ 580 -c "added by portage for ${PN}" \
762 die "enewuser failed" 581 die "enewuser failed"
763 else 582 else
764 einfo " - Extra: ${eextra}" 583 einfo " - Extra: $@"
765 pw useradd ${euser} ${opts} \ 584 pw useradd ${euser} ${opts} \
766 -c ${eextra} || die "enewuser failed" 585 "$@" || die "enewuser failed"
767 fi 586 fi
768 else 587 ;;
769 if [ -z "${eextra}" ] 588 *)
770 then 589 if [[ -z $@ ]] ; then
771 useradd ${opts} ${euser} \ 590 useradd ${opts} ${euser} \
772 -c "added by portage for ${PN}" \ 591 -c "added by portage for ${PN}" \
773 || die "enewuser failed" 592 || die "enewuser failed"
774 else 593 else
775 einfo " - Extra: ${eextra}" 594 einfo " - Extra: $@"
776 useradd ${opts} ${euser} ${eextra} \ 595 useradd ${opts} ${euser} "$@" \
777 || die "enewuser failed" 596 || die "enewuser failed"
778 fi 597 fi
779 fi 598 ;;
599 esac
780 export SANDBOX_ON="${oldsandbox}" 600 export SANDBOX_ON=${oldsandbox}
781 601
782 if [ ! -e "${ehome}" ] && [ ! -e "${D}/${ehome}" ] 602 if [ ! -e "${ehome}" ] && [ ! -e "${D}/${ehome}" ]
783 then 603 then
784 einfo " - Creating ${ehome} in ${D}" 604 einfo " - Creating ${ehome} in ${D}"
785 dodir ${ehome} 605 dodir ${ehome}
822 then 642 then
823 if [ "${egid}" -gt 0 ] 643 if [ "${egid}" -gt 0 ]
824 then 644 then
825 if [ -z "`egetent group ${egid}`" ] 645 if [ -z "`egetent group ${egid}`" ]
826 then 646 then
827 if useq ppc-macos ; then 647 if [[ "${USERLAND}" == "Darwin" ]]; then
828 opts="${opts} ${egid}" 648 opts="${opts} ${egid}"
829 else 649 else
830 opts="${opts} -g ${egid}" 650 opts="${opts} -g ${egid}"
831 fi 651 fi
832 else 652 else
846 opts="${opts} ${eextra}" 666 opts="${opts} ${eextra}"
847 667
848 # add the group 668 # add the group
849 local oldsandbox="${SANDBOX_ON}" 669 local oldsandbox="${SANDBOX_ON}"
850 export SANDBOX_ON="0" 670 export SANDBOX_ON="0"
851 if useq ppc-macos ; then 671 if [[ "${USERLAND}" == "Darwin" ]]; then
852 if [ ! -z "${eextra}" ]; 672 if [ ! -z "${eextra}" ];
853 then 673 then
854 einfo "Extra options are not supported on macos yet" 674 einfo "Extra options are not supported on Darwin/OS X yet"
855 einfo "Please report the ebuild along with the info below" 675 einfo "Please report the ebuild along with the info below"
856 einfo "eextra: ${eextra}" 676 einfo "eextra: ${eextra}"
857 die "Required function missing" 677 die "Required function missing"
858 fi 678 fi
859 679
864 [ -z "`egetent group ${egid}`" ] && break 684 [ -z "`egetent group ${egid}`" ] && break
865 done 685 done
866 esac 686 esac
867 dscl . create /groups/${egroup} gid ${egid} 687 dscl . create /groups/${egroup} gid ${egid}
868 dscl . create /groups/${egroup} passwd '*' 688 dscl . create /groups/${egroup} passwd '*'
869 elif use x86-fbsd ; then 689 elif [[ "${USERLAND}" == "BSD" ]] ; then
870 case ${egid} in 690 case ${egid} in
871 *[!0-9]*) # Non numeric 691 *[!0-9]*) # Non numeric
872 for egid in `jot 898 101`; do 692 for egid in `jot 898 101`; do
873 [ -z "`egetent group ${egid}`" ] && break 693 [ -z "`egetent group ${egid}`" ] && break
874 done 694 done
912# a full path to an icon 732# a full path to an icon
913# type: what kind of application is this ? for categories: 733# type: what kind of application is this ? for categories:
914# http://www.freedesktop.org/wiki/Standards_2fmenu_2dspec 734# http://www.freedesktop.org/wiki/Standards_2fmenu_2dspec
915# path: if your app needs to startup in a specific dir 735# path: if your app needs to startup in a specific dir
916make_desktop_entry() { 736make_desktop_entry() {
917 [ -z "$1" ] && eerror "make_desktop_entry: You must specify the executable" && return 1 737 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1
918 738
919 local exec="${1}" 739 local exec=${1}
920 local name="${2:-${PN}}" 740 local name=${2:-${PN}}
921 local icon="${3:-${PN}.png}" 741 local icon=${3:-${PN}.png}
922 local type="${4}" 742 local type=${4}
923 local subdir="${6}" 743 local path=${5}
924 local path="${5:-${GAMES_BINDIR}}" 744
925 if [ -z "${type}" ] 745 if [[ -z ${type} ]] ; then
926 then 746 local catmaj=${CATEGORY%%-*}
927 case ${CATEGORY} in 747 local catmin=${CATEGORY##*-}
928 "app-emulation") 748 case ${catmaj} in
929 type=Emulator 749 app)
930 subdir="Emulation" 750 case ${catmin} in
751 admin) type=System;;
752 cdr) type=DiscBurning;;
753 dicts) type=Dictionary;;
754 editors) type=TextEditor;;
755 emacs) type=TextEditor;;
756 emulation) type=Emulator;;
757 laptop) type=HardwareSettings;;
758 office) type=Office;;
759 vim) type=TextEditor;;
760 xemacs) type=TextEditor;;
761 *) type=;;
762 esac
931 ;; 763 ;;
932 "games-"*) 764
933 type=Game 765 dev)
934 subdir="Games" 766 type="Development"
935 ;; 767 ;;
936 "net-"*) 768
937 type=Network 769 games)
938 subdir="${type}" 770 [[ -z ${path} ]] && path=${GAMES_BINDIR}
771
772 case ${catmin} in
773 action) type=ActionGame;;
774 arcade) type=ArcadeGame;;
775 board) type=BoardGame;;
776 kid) type=KidsGame;;
777 emulation) type=Emulator;;
778 puzzle) type=LogicGame;;
779 rpg) type=RolePlaying;;
780 roguelike) type=RolePlaying;;
781 simulation) type=Simulation;;
782 sports) type=SportsGame;;
783 strategy) type=StrategyGame;;
784 *) type=;;
785 esac
786 type="Game;${type}"
939 ;; 787 ;;
788
789 mail)
790 type="Network;Email"
791 ;;
792
793 media)
794 case ${catmin} in
795 gfx) type=Graphics;;
796 radio) type=Tuner;;
797 sound) type=Audio;;
798 tv) type=TV;;
799 video) type=Video;;
800 *) type=;;
801 esac
802 type="AudioVideo;${type}"
803 ;;
804
805 net)
806 case ${catmin} in
807 dialup) type=Dialup;;
808 ftp) type=FileTransfer;;
809 im) type=InstantMessaging;;
810 irc) type=IRCClient;;
811 mail) type=Email;;
812 news) type=News;;
813 nntp) type=News;;
814 p2p) type=FileTransfer;;
815 *) type=;;
816 esac
817 type="Network;${type}"
818 ;;
819
820 sci)
821 case ${catmin} in
822 astro*) type=Astronomoy;;
823 bio*) type=Biology;;
824 calc*) type=Calculator;;
825 chem*) type=Chemistry;;
826 geo*) type=Geology;;
827 math*) type=Math;;
828 *) type=;;
829 esac
830 type="Science;${type}"
831 ;;
832
833 www)
834 case ${catmin} in
835 client) type=WebBrowser;;
836 *) type=;;
837 esac
838 type="Network"
839 ;;
840
940 *) 841 *)
941 type= 842 type=
942 subdir=
943 ;; 843 ;;
944 esac 844 esac
945 fi 845 fi
846 if [ "${SLOT}" == "0" ] ; then
847 local desktop_name="${PN}"
848 else
849 local desktop_name="${PN}-${SLOT}"
850 fi
946 local desktop="${T}/${exec%% *}-${P}.desktop" 851 local desktop=${T}/${exec%% *}-${desktop_name}.desktop
947 852
948echo "[Desktop Entry] 853echo "[Desktop Entry]
949Encoding=UTF-8 854Encoding=UTF-8
950Version=0.9.2 855Version=0.9.2
951Name=${name} 856Name=${name}
967# make_desktop_entry(<title>, <command>) 872# make_desktop_entry(<title>, <command>)
968# title: File to execute to start the Window Manager 873# title: File to execute to start the Window Manager
969# command: Name of the Window Manager 874# command: Name of the Window Manager
970 875
971make_session_desktop() { 876make_session_desktop() {
972
973 [ -z "$1" ] && eerror "make_session_desktop: You must specify the title" && return 1 877 [[ -z $1 ]] && eerror "make_session_desktop: You must specify the title" && return 1
974 [ -z "$2" ] && eerror "make_session_desktop: You must specify the command" && return 1 878 [[ -z $2 ]] && eerror "make_session_desktop: You must specify the command" && return 1
975 879
976 local title="${1}" 880 local title=$1
977 local command="${2}" 881 local command=$2
978 local desktop="${T}/${wm}.desktop" 882 local desktop=${T}/${wm}.desktop
979 883
980echo "[Desktop Entry] 884echo "[Desktop Entry]
981Encoding=UTF-8 885Encoding=UTF-8
982Name=${title} 886Name=${title}
983Comment=This session logs you into ${title} 887Comment=This session logs you into ${title}
985TryExec=${command} 889TryExec=${command}
986Type=Application" > "${desktop}" 890Type=Application" > "${desktop}"
987 891
988 insinto /usr/share/xsessions 892 insinto /usr/share/xsessions
989 doins "${desktop}" 893 doins "${desktop}"
990
991 return 0
992} 894}
993 895
994domenu() { 896domenu() {
995 local i 897 local i j
996 local j
997 insinto /usr/share/applications 898 insinto /usr/share/applications
998 for i in ${@} 899 for i in "$@" ; do
999 do
1000 if [ -f "${i}" ]; 900 if [[ -f ${i} ]] ; then
1001 then
1002 doins ${i} 901 doins "${i}"
1003 elif [ -d "${i}" ]; 902 elif [[ -d ${i} ]] ; then
1004 then
1005 for j in ${i}/*.desktop 903 for j in "${i}"/*.desktop ; do
1006 do
1007 doins ${j} 904 doins "${j}"
1008 done 905 done
1009 fi 906 fi
1010 done 907 done
1011} 908}
909newmenu() {
910 insinto /usr/share/applications
911 newins "$1" "$2"
912}
1012 913
1013doicon() { 914doicon() {
1014 local i 915 local i j
1015 local j
1016 insinto /usr/share/pixmaps 916 insinto /usr/share/pixmaps
1017 for i in ${@} 917 for i in "$@" ; do
1018 do
1019 if [ -f "${i}" ]; 918 if [[ -f ${i} ]] ; then
1020 then
1021 doins ${i} 919 doins "${i}"
1022 elif [ -d "${i}" ]; 920 elif [[ -d ${i} ]] ; then
1023 then
1024 for j in ${i}/*.png 921 for j in "${i}"/*.png ; do
1025 do
1026 doins ${j} 922 doins "${j}"
1027 done 923 done
1028 fi 924 fi
1029 done 925 done
926}
927newicon() {
928 insinto /usr/share/pixmaps
929 newins "$1" "$2"
1030} 930}
1031 931
1032############################################################## 932##############################################################
1033# END: Handle .desktop files and menu entries # 933# END: Handle .desktop files and menu entries #
1034############################################################## 934##############################################################
1435 local mline="" 1335 local mline=""
1436 local showedmsg=0 1336 local showedmsg=0
1437 1337
1438 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do 1338 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do
1439 [[ -d ${mline}/${dir} ]] || continue 1339 [[ -d ${mline}/${dir} ]] || continue
1440 [[ ! -z $(find ${mline}/${dir} -iname ${file} -maxdepth 1) ]] \ 1340 [[ ! -z $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] \
1441 && export CDROM_ROOT=${mline} 1341 && export CDROM_ROOT=${mline}
1442 done 1342 done
1443 1343
1444 if [[ -z ${CDROM_ROOT} ]] ; then 1344 if [[ -z ${CDROM_ROOT} ]] ; then
1445 echo 1345 echo
1460 fi 1360 fi
1461 showedmsg=1 1361 showedmsg=1
1462 fi 1362 fi
1463 einfo "Press return to scan for the cd again" 1363 einfo "Press return to scan for the cd again"
1464 einfo "or hit CTRL+C to abort the emerge." 1364 einfo "or hit CTRL+C to abort the emerge."
1365 echo
1366 einfo "If you are having trouble with the detection"
1367 einfo "of your CD, it is possible that you do not have"
1368 einfo "Joliet support enabled in your kernel. Please"
1369 einfo "check that CONFIG_JOLIET is enabled in your kernel."
1465 read 1370 read
1466 fi 1371 fi
1467 done 1372 done
1468} 1373}
1469 1374
1513 else 1418 else
1514 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1419 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA"
1515 fi 1420 fi
1516 done 1421 done
1517 if [[ -z ${newls} ]] ; then 1422 if [[ -z ${newls} ]] ; then
1518 unset LINGUAS 1423 export LINGUAS=""
1519 else 1424 else
1520 export LINGUAS=${newls:1} 1425 export LINGUAS=${newls:1}
1521 fi 1426 fi
1522} 1427}
1523 1428
1533 while ((i--)) ; do 1438 while ((i--)) ; do
1534 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass" 1439 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1535 done 1440 done
1536 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}" 1441 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1537 case ${ARCH} in 1442 case ${ARCH} in
1538 x86) export ARCH="i386";; 1443 x86) export ARCH="i386";;
1539 amd64) export ARCH="x86_64";; 1444 amd64) export ARCH="x86_64";;
1540 hppa) export ARCH="parisc";; 1445 hppa) export ARCH="parisc";;
1541 mips) export ARCH="mips";; 1446 mips) export ARCH="mips";;
1542 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! 1447 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!
1543 *) export ARCH="${ARCH}";; 1448 *) export ARCH="${ARCH}";;
1544 esac 1449 esac
1545} 1450}
1546 1451
1547# set's ARCH back to what portage expects 1452# set's ARCH back to what portage expects
1548set_arch_to_portage() { 1453set_arch_to_portage() {
1593 1498
1594 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1499 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1595 SONAME=`basename ${LIB}` 1500 SONAME=`basename ${LIB}`
1596 1501
1597 einfo "An old version of an installed library was detected on your system." 1502 einfo "An old version of an installed library was detected on your system."
1598 einfo "In order to avoid breaking packages that link against is, this older version" 1503 einfo "In order to avoid breaking packages that link against it, this older version"
1599 einfo "is not being removed. In order to make full use of this newer version," 1504 einfo "is not being removed. In order to make full use of this newer version,"
1600 einfo "you will need to execute the following command:" 1505 einfo "you will need to execute the following command:"
1601 einfo " revdep-rebuild --soname ${SONAME}" 1506 einfo " revdep-rebuild --soname ${SONAME}"
1602 einfo 1507 einfo
1603 einfo "After doing that, you can safely remove ${LIB}" 1508 einfo "After doing that, you can safely remove ${LIB}"
1655dopamd() { 1560dopamd() {
1656 [[ -z $1 ]] && die "dopamd requires at least one argument" 1561 [[ -z $1 ]] && die "dopamd requires at least one argument"
1657 1562
1658 use pam || return 0 1563 use pam || return 0
1659 1564
1660 insinto /etc/pam.d 1565 INSDESTTREE=/etc/pam.d \
1661 # these are the default doins options, but be explicit just in case
1662 insopts -m 0644 -o root -g root
1663 doins "$@" || die "failed to install $@" 1566 doins "$@" || die "failed to install $@"
1664} 1567}
1665# newpamd <old name> <new name> 1568# newpamd <old name> <new name>
1666# 1569#
1667# Install pam file <old name> as <new name> in /etc/pam.d 1570# Install pam file <old name> as <new name> in /etc/pam.d
1668newpamd() { 1571newpamd() {
1669 [[ $# -ne 2 ]] && die "newpamd requires two arguements" 1572 [[ $# -ne 2 ]] && die "newpamd requires two arguements"
1670 1573
1671 use pam || return 0 1574 use pam || return 0
1672 1575
1673 insinto /etc/pam.d 1576 INSDESTTREE=/etc/pam.d \
1674 # these are the default doins options, but be explicit just in case
1675 insopts -m 0644 -o root -g root
1676 newins "$1" "$2" || die "failed to install $1 as $2" 1577 newins "$1" "$2" || die "failed to install $1 as $2"
1677} 1578}
1579
1580# make a wrapper script ...
1581# NOTE: this was originally games_make_wrapper, but I noticed other places where
1582# this could be used, so I have moved it here and made it not games-specific
1583# -- wolf31o2
1584# $1 == wrapper name
1585# $2 == binary to run
1586# $3 == directory to chdir before running binary
1587# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1588# $5 == path for wrapper
1589make_wrapper() {
1590 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1591 local tmpwrapper=$(emktemp)
1592 cat << EOF > "${tmpwrapper}"
1593#!/bin/sh
1594cd "${chdir}"
1595export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1596exec ${bin} "\$@"
1597EOF
1598 chmod go+rx "${tmpwrapper}"
1599 if [ -n "${5}" ]
1600 then
1601 exeinto ${5}
1602 newexe "${tmpwrapper}" "${wrapper}"
1603 else
1604 newbin "${tmpwrapper}" "${wrapper}"
1605 fi
1606}

Legend:
Removed from v.1.157  
changed lines
  Added in v.1.186

  ViewVC Help
Powered by ViewVC 1.1.20