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

Diff of /eclass/eutils.eclass

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

Revision 1.153 Revision 1.182
1# Copyright 1999-2004 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.153 2005/02/18 21:55:35 azarah 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##*/}
386 fi 349 fi
387 350
388 if [ "${count}" -eq 5 ] 351 if [ "${count}" -eq 5 ]
389 then 352 then
390 echo 353 echo
391 eerror "Failed Patch: ${patchname}!" 354 eerror "Failed Patch: ${patchname} !"
355 eerror " ( ${PATCH_TARGET} )"
392 eerror 356 eerror
393 eerror "Include in your bugreport the contents of:" 357 eerror "Include in your bugreport the contents of:"
394 eerror 358 eerror
395 eerror " ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}" 359 eerror " ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}"
396 echo 360 echo
403 fi 367 fi
404 done 368 done
405 if [ "${SINGLE_PATCH}" = "no" ] 369 if [ "${SINGLE_PATCH}" = "no" ]
406 then 370 then
407 einfo "Done with patching" 371 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 372 fi
535} 373}
536 374
537# Cheap replacement for when debianutils (and thus mktemp) 375# Cheap replacement for when debianutils (and thus mktemp)
538# does not exist on the users system 376# does not exist on the users system
572# Joe Jezak <josejx@gmail.com> and usata@gentoo.org 410# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
573# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org> 411# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
574# 412#
575# egetent(database, key) 413# egetent(database, key)
576egetent() { 414egetent() {
577 if useq ppc-macos ; then 415 if [[ "${USERLAND}" == "Darwin" ]] ; then
578 case "$2" in 416 case "$2" in
579 *[!0-9]*) # Non numeric 417 *[!0-9]*) # Non numeric
580 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 418 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
581 ;; 419 ;;
582 *) # Numeric 420 *) # Numeric
583 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 421 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
584 ;; 422 ;;
585 esac 423 esac
586 elif useq x86-fbsd ; then 424 elif [[ "${USERLAND}" == "BSD" ]] ; then
587 local action 425 local action
588 if [ "$1" == "passwd" ] 426 if [ "$1" == "passwd" ]
589 then 427 then
590 action="user" 428 action="user"
591 else 429 else
611# homedir: /dev/null 449# homedir: /dev/null
612# groups: none 450# groups: none
613# extra: comment of 'added by portage for ${PN}' 451# extra: comment of 'added by portage for ${PN}'
614enewuser() { 452enewuser() {
615 # get the username 453 # get the username
616 local euser="$1"; shift 454 local euser=$1; shift
617 if [ -z "${euser}" ] 455 if [[ -z ${euser} ]] ; then
618 then
619 eerror "No username specified !" 456 eerror "No username specified !"
620 die "Cannot call enewuser without a username" 457 die "Cannot call enewuser without a username"
621 fi 458 fi
622 459
623 # lets see if the username already exists 460 # lets see if the username already exists
624 if [ "${euser}" == "`egetent passwd \"${euser}\" | cut -d: -f1`" ] 461 if [[ ${euser} == $(egetent passwd "${euser}" | cut -d: -f1) ]] ; then
625 then
626 return 0 462 return 0
627 fi 463 fi
628 einfo "Adding user '${euser}' to your system ..." 464 einfo "Adding user '${euser}' to your system ..."
629 465
630 # options to pass to useradd 466 # options to pass to useradd
631 local opts= 467 local opts=
632 468
633 # handle uid 469 # handle uid
634 local euid="$1"; shift 470 local euid=$1; shift
635 if [ ! -z "${euid}" ] && [ "${euid}" != "-1" ] 471 if [[ ! -z ${euid} ]] && [[ ${euid} != "-1" ]] ; then
636 then
637 if [ "${euid}" -gt 0 ] 472 if [[ ${euid} -gt 0 ]] ; then
638 then
639 if [ ! -z "`egetent passwd ${euid}`" ] 473 if [[ ! -z $(egetent passwd ${euid}) ]] ; then
640 then
641 euid="next" 474 euid="next"
642 fi 475 fi
643 else 476 else
644 eerror "Userid given but is not greater than 0 !" 477 eerror "Userid given but is not greater than 0 !"
645 die "${euid} is not a valid UID" 478 die "${euid} is not a valid UID"
646 fi 479 fi
647 else 480 else
648 euid="next" 481 euid="next"
649 fi 482 fi
650 if [ "${euid}" == "next" ] 483 if [[ ${euid} == "next" ]] ; then
651 then
652 local pwrange 484 local pwrange
653 if [ "${USERLAND}" == "BSD" ] ; then 485 if [[ ${USERLAND} == "BSD" ]] ; then
654 pwrange="`jot 898 101`" 486 pwrange=$(jot 898 101)
655 else 487 else
656 pwrange="`seq 101 999`" 488 pwrange=$(seq 101 999)
657 fi 489 fi
658 for euid in ${pwrange} ; do 490 for euid in ${pwrange} ; do
659 [ -z "`egetent passwd ${euid}`" ] && break 491 [[ -z $(egetent passwd ${euid}) ]] && break
660 done 492 done
661 fi 493 fi
662 opts="${opts} -u ${euid}" 494 opts="${opts} -u ${euid}"
663 einfo " - Userid: ${euid}" 495 einfo " - Userid: ${euid}"
664 496
665 # handle shell 497 # handle shell
666 local eshell="$1"; shift 498 local eshell=$1; shift
667 if [ ! -z "${eshell}" ] && [ "${eshell}" != "-1" ] 499 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
668 then
669 if [ ! -e "${eshell}" ] 500 if [[ ! -e ${eshell} ]] ; then
670 then
671 eerror "A shell was specified but it does not exist !" 501 eerror "A shell was specified but it does not exist !"
672 die "${eshell} does not exist" 502 die "${eshell} does not exist"
673 fi 503 fi
674 else 504 else
675 if [ "${USERLAND}" == "BSD" ] 505 case ${USERLAND} in
676 then
677 eshell="/usr/bin/false" 506 Darwin) eshell="/usr/bin/false";;
678 else 507 BSD) eshell="/usr/sbin/nologin";;
679 eshell="/bin/false" 508 *) eshell="/bin/false";;
680 fi 509 esac
681 fi 510 fi
682 einfo " - Shell: ${eshell}" 511 einfo " - Shell: ${eshell}"
683 opts="${opts} -s ${eshell}" 512 opts="${opts} -s ${eshell}"
684 513
685 # handle homedir 514 # handle homedir
686 local ehome="$1"; shift 515 local ehome=$1; shift
687 if [ -z "${ehome}" ] && [ "${eshell}" != "-1" ] 516 if [[ -z ${ehome} ]] || [[ ${ehome} == "-1" ]] ; then
688 then
689 ehome="/dev/null" 517 ehome="/dev/null"
690 fi 518 fi
691 einfo " - Home: ${ehome}" 519 einfo " - Home: ${ehome}"
692 opts="${opts} -d ${ehome}" 520 opts="${opts} -d ${ehome}"
693 521
694 # handle groups 522 # handle groups
695 local egroups="$1"; shift 523 local egroups=$1; shift
696 if [ ! -z "${egroups}" ] 524 if [[ ! -z ${egroups} ]] ; then
697 then
698 local oldifs="${IFS}" 525 local oldifs=${IFS}
699 local defgroup="" exgroups="" 526 local defgroup="" exgroups=""
700 527
701 export IFS="," 528 export IFS=","
702 for g in ${egroups} 529 for g in ${egroups} ; do
703 do
704 export IFS="${oldifs}" 530 export IFS=${oldifs}
705 if [ -z "`egetent group \"${g}\"`" ] 531 if [[ -z $(egetent group "${g}") ]] ; then
706 then
707 eerror "You must add group ${g} to the system first" 532 eerror "You must add group ${g} to the system first"
708 die "${g} is not a valid GID" 533 die "${g} is not a valid GID"
709 fi 534 fi
710 if [ -z "${defgroup}" ] 535 if [[ -z ${defgroup} ]] ; then
711 then
712 defgroup="${g}" 536 defgroup=${g}
713 else 537 else
714 exgroups="${exgroups},${g}" 538 exgroups="${exgroups},${g}"
715 fi 539 fi
716 export IFS="," 540 export IFS=","
717 done 541 done
718 export IFS="${oldifs}" 542 export IFS=${oldifs}
719 543
720 opts="${opts} -g ${defgroup}" 544 opts="${opts} -g ${defgroup}"
721 if [ ! -z "${exgroups}" ] 545 if [[ ! -z ${exgroups} ]] ; then
722 then
723 opts="${opts} -G ${exgroups:1}" 546 opts="${opts} -G ${exgroups:1}"
724 fi 547 fi
725 else 548 else
726 egroups="(none)" 549 egroups="(none)"
727 fi 550 fi
728 einfo " - Groups: ${egroups}" 551 einfo " - Groups: ${egroups}"
729 552
730 # handle extra and add the user 553 # handle extra and add the user
731 local eextra="$@"
732 local oldsandbox="${SANDBOX_ON}" 554 local oldsandbox=${SANDBOX_ON}
733 export SANDBOX_ON="0" 555 export SANDBOX_ON="0"
734 if useq ppc-macos 556 case ${USERLAND} in
735 then 557 Darwin)
736 ### Make the user 558 ### Make the user
737 if [ -z "${eextra}" ] 559 if [[ -z $@ ]] ; then
738 then
739 dscl . create /users/${euser} uid ${euid} 560 dscl . create /users/${euser} uid ${euid}
740 dscl . create /users/${euser} shell ${eshell} 561 dscl . create /users/${euser} shell ${eshell}
741 dscl . create /users/${euser} home ${ehome} 562 dscl . create /users/${euser} home ${ehome}
742 dscl . create /users/${euser} realname "added by portage for ${PN}" 563 dscl . create /users/${euser} realname "added by portage for ${PN}"
743 ### Add the user to the groups specified 564 ### Add the user to the groups specified
744 local oldifs="${IFS}" 565 local oldifs=${IFS}
745 export IFS="," 566 export IFS=","
746 for g in ${egroups} 567 for g in ${egroups} ; do
747 do
748 dscl . merge /groups/${g} users ${euser} 568 dscl . merge /groups/${g} users ${euser}
749 done 569 done
750 export IFS="${oldifs}" 570 export IFS=${oldifs}
751 else 571 else
752 einfo "Extra options are not supported on macos yet" 572 einfo "Extra options are not supported on Darwin yet"
753 einfo "Please report the ebuild along with the info below" 573 einfo "Please report the ebuild along with the info below"
754 einfo "eextra: ${eextra}" 574 einfo "eextra: $@"
755 die "Required function missing" 575 die "Required function missing"
756 fi 576 fi
757 elif use x86-fbsd ; then 577 ;;
758 if [ -z "${eextra}" ] 578 BSD)
759 then 579 if [[ -z $@ ]] ; then
760 pw useradd ${euser} ${opts} \ 580 pw useradd ${euser} ${opts} \
761 -c "added by portage for ${PN}" \ 581 -c "added by portage for ${PN}" \
762 die "enewuser failed" 582 die "enewuser failed"
763 else 583 else
764 einfo " - Extra: ${eextra}" 584 einfo " - Extra: $@"
765 pw useradd ${euser} ${opts} \ 585 pw useradd ${euser} ${opts} \
766 -c ${eextra} || die "enewuser failed" 586 "$@" || die "enewuser failed"
767 fi 587 fi
768 else 588 ;;
769 if [ -z "${eextra}" ] 589 *)
770 then 590 if [[ -z $@ ]] ; then
771 useradd ${opts} ${euser} \ 591 useradd ${opts} ${euser} \
772 -c "added by portage for ${PN}" \ 592 -c "added by portage for ${PN}" \
773 || die "enewuser failed" 593 || die "enewuser failed"
774 else 594 else
775 einfo " - Extra: ${eextra}" 595 einfo " - Extra: $@"
776 useradd ${opts} ${euser} ${eextra} \ 596 useradd ${opts} ${euser} "$@" \
777 || die "enewuser failed" 597 || die "enewuser failed"
778 fi 598 fi
779 fi 599 ;;
600 esac
780 export SANDBOX_ON="${oldsandbox}" 601 export SANDBOX_ON=${oldsandbox}
781 602
782 if [ ! -e "${ehome}" ] && [ ! -e "${D}/${ehome}" ] 603 if [ ! -e "${ehome}" ] && [ ! -e "${D}/${ehome}" ]
783 then 604 then
784 einfo " - Creating ${ehome} in ${D}" 605 einfo " - Creating ${ehome} in ${D}"
785 dodir ${ehome} 606 dodir ${ehome}
822 then 643 then
823 if [ "${egid}" -gt 0 ] 644 if [ "${egid}" -gt 0 ]
824 then 645 then
825 if [ -z "`egetent group ${egid}`" ] 646 if [ -z "`egetent group ${egid}`" ]
826 then 647 then
827 if useq ppc-macos ; then 648 if [[ "${USERLAND}" == "Darwin" ]]; then
828 opts="${opts} ${egid}" 649 opts="${opts} ${egid}"
829 else 650 else
830 opts="${opts} -g ${egid}" 651 opts="${opts} -g ${egid}"
831 fi 652 fi
832 else 653 else
846 opts="${opts} ${eextra}" 667 opts="${opts} ${eextra}"
847 668
848 # add the group 669 # add the group
849 local oldsandbox="${SANDBOX_ON}" 670 local oldsandbox="${SANDBOX_ON}"
850 export SANDBOX_ON="0" 671 export SANDBOX_ON="0"
851 if useq ppc-macos ; then 672 if [[ "${USERLAND}" == "Darwin" ]]; then
852 if [ ! -z "${eextra}" ]; 673 if [ ! -z "${eextra}" ];
853 then 674 then
854 einfo "Extra options are not supported on macos yet" 675 einfo "Extra options are not supported on Darwin/OS X yet"
855 einfo "Please report the ebuild along with the info below" 676 einfo "Please report the ebuild along with the info below"
856 einfo "eextra: ${eextra}" 677 einfo "eextra: ${eextra}"
857 die "Required function missing" 678 die "Required function missing"
858 fi 679 fi
859 680
864 [ -z "`egetent group ${egid}`" ] && break 685 [ -z "`egetent group ${egid}`" ] && break
865 done 686 done
866 esac 687 esac
867 dscl . create /groups/${egroup} gid ${egid} 688 dscl . create /groups/${egroup} gid ${egid}
868 dscl . create /groups/${egroup} passwd '*' 689 dscl . create /groups/${egroup} passwd '*'
869 elif use x86-fbsd ; then 690 elif [[ "${USERLAND}" == "BSD" ]] ; then
870 case ${egid} in 691 case ${egid} in
871 *[!0-9]*) # Non numeric 692 *[!0-9]*) # Non numeric
872 for egid in `jot 898 101`; do 693 for egid in `jot 898 101`; do
873 [ -z "`egetent group ${egid}`" ] && break 694 [ -z "`egetent group ${egid}`" ] && break
874 done 695 done
909# name: the name that will show up in the menu 730# name: the name that will show up in the menu
910# icon: give your little like a pretty little icon ... 731# icon: give your little like a pretty little icon ...
911# this can be relative (to /usr/share/pixmaps) or 732# this can be relative (to /usr/share/pixmaps) or
912# a full path to an icon 733# a full path to an icon
913# type: what kind of application is this ? for categories: 734# type: what kind of application is this ? for categories:
914# http://www.freedesktop.org/standards/menu-spec/ 735# http://www.freedesktop.org/wiki/Standards_2fmenu_2dspec
915# path: if your app needs to startup in a specific dir 736# path: if your app needs to startup in a specific dir
916make_desktop_entry() { 737make_desktop_entry() {
917 [ -z "$1" ] && eerror "make_desktop_entry: You must specify the executable" && return 1 738 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1
918 739
919 local exec="${1}" 740 local exec=${1}
920 local name="${2:-${PN}}" 741 local name=${2:-${PN}}
921 local icon="${3:-${PN}.png}" 742 local icon=${3:-${PN}.png}
922 local type="${4}" 743 local type=${4}
923 local subdir="${6}" 744 local path=${5}
924 local path="${5:-${GAMES_BINDIR}}" 745
925 if [ -z "${type}" ] 746 if [[ -z ${type} ]] ; then
926 then 747 local catmaj=${CATEGORY%%-*}
927 case ${CATEGORY} in 748 local catmin=${CATEGORY##*-}
928 "app-emulation") 749 case ${catmaj} in
929 type=Emulator 750 app)
930 subdir="Emulation" 751 case ${catmin} in
752 admin) type=System;;
753 cdr) type=DiscBurning;;
754 dicts) type=Dictionary;;
755 editors) type=TextEditor;;
756 emacs) type=TextEditor;;
757 emulation) type=Emulator;;
758 laptop) type=HardwareSettings;;
759 office) type=Office;;
760 vim) type=TextEditor;;
761 xemacs) type=TextEditor;;
762 *) type=;;
763 esac
931 ;; 764 ;;
932 "games-"*) 765
933 type=Game 766 dev)
934 subdir="Games" 767 type="Development"
935 ;; 768 ;;
936 "net-"*) 769
937 type=Network 770 games)
938 subdir="${type}" 771 [[ -z ${path} ]] && path=${GAMES_BINDIR}
772
773 case ${catmin} in
774 action) type=ActionGame;;
775 arcade) type=ArcadeGame;;
776 board) type=BoardGame;;
777 kid) type=KidsGame;;
778 emulation) type=Emulator;;
779 puzzle) type=LogicGame;;
780 rpg) type=RolePlaying;;
781 roguelike) type=RolePlaying;;
782 simulation) type=Simulation;;
783 sports) type=SportsGame;;
784 strategy) type=StrategyGame;;
785 *) type=;;
786 esac
787 type="Game;${type}"
939 ;; 788 ;;
789
790 mail)
791 type="Network;Email"
792 ;;
793
794 media)
795 case ${catmin} in
796 gfx) type=Graphics;;
797 radio) type=Tuner;;
798 sound) type=Audio;;
799 tv) type=TV;;
800 video) type=Video;;
801 *) type=;;
802 esac
803 type="AudioVideo;${type}"
804 ;;
805
806 net)
807 case ${catmin} in
808 dialup) type=Dialup;;
809 ftp) type=FileTransfer;;
810 im) type=InstantMessaging;;
811 irc) type=IRCClient;;
812 mail) type=Email;;
813 news) type=News;;
814 nntp) type=News;;
815 p2p) type=FileTransfer;;
816 *) type=;;
817 esac
818 type="Network;${type}"
819 ;;
820
821 sci)
822 case ${catmin} in
823 astro*) type=Astronomoy;;
824 bio*) type=Biology;;
825 calc*) type=Calculator;;
826 chem*) type=Chemistry;;
827 geo*) type=Geology;;
828 math*) type=Math;;
829 *) type=;;
830 esac
831 type="Science;${type}"
832 ;;
833
834 www)
835 case ${catmin} in
836 client) type=WebBrowser;;
837 *) type=;;
838 esac
839 type="Network"
840 ;;
841
940 *) 842 *)
941 type= 843 type=
942 subdir=
943 ;; 844 ;;
944 esac 845 esac
945 fi 846 fi
847 if [ "${SLOT}" == "0" ] ; then
848 local desktop_name="${PN}"
849 else
850 local desktop_name="${PN}-${SLOT}"
851 fi
946 local desktop="${T}/${exec}.desktop" 852 local desktop=${T}/${exec%% *}-${desktop_name}.desktop
947 853
948echo "[Desktop Entry] 854echo "[Desktop Entry]
949Encoding=UTF-8 855Encoding=UTF-8
950Version=0.9.2 856Version=0.9.2
951Name=${name} 857Name=${name}
967# make_desktop_entry(<title>, <command>) 873# make_desktop_entry(<title>, <command>)
968# title: File to execute to start the Window Manager 874# title: File to execute to start the Window Manager
969# command: Name of the Window Manager 875# command: Name of the Window Manager
970 876
971make_session_desktop() { 877make_session_desktop() {
972
973 [ -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
974 [ -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
975 880
976 local title="${1}" 881 local title=$1
977 local command="${2}" 882 local command=$2
978 local desktop="${T}/${wm}.desktop" 883 local desktop=${T}/${wm}.desktop
979 884
980echo "[Desktop Entry] 885echo "[Desktop Entry]
981Encoding=UTF-8 886Encoding=UTF-8
982Name=${title} 887Name=${title}
983Comment=This session logs you into ${title} 888Comment=This session logs you into ${title}
985TryExec=${command} 890TryExec=${command}
986Type=Application" > "${desktop}" 891Type=Application" > "${desktop}"
987 892
988 insinto /usr/share/xsessions 893 insinto /usr/share/xsessions
989 doins "${desktop}" 894 doins "${desktop}"
990
991 return 0
992} 895}
993 896
994domenu() { 897domenu() {
995 local i 898 local i j
996 local j
997 insinto /usr/share/applications 899 insinto /usr/share/applications
998 for i in ${@} 900 for i in "$@" ; do
999 do
1000 if [ -f "${i}" ]; 901 if [[ -f ${i} ]] ; then
1001 then
1002 doins ${i} 902 doins "${i}"
1003 elif [ -d "${i}" ]; 903 elif [[ -d ${i} ]] ; then
1004 then
1005 for j in ${i}/*.desktop 904 for j in "${i}"/*.desktop ; do
1006 do
1007 doins ${j} 905 doins "${j}"
1008 done 906 done
1009 fi 907 fi
1010 done 908 done
1011} 909}
910newmenu() {
911 insinto /usr/share/applications
912 newins "$1" "$2"
913}
1012 914
1013doicon() { 915doicon() {
1014 local i 916 local i j
1015 local j
1016 insinto /usr/share/pixmaps 917 insinto /usr/share/pixmaps
1017 for i in ${@} 918 for i in "$@" ; do
1018 do
1019 if [ -f "${i}" ]; 919 if [[ -f ${i} ]] ; then
1020 then
1021 doins ${i} 920 doins "${i}"
1022 elif [ -d "${i}" ]; 921 elif [[ -d ${i} ]] ; then
1023 then
1024 for j in ${i}/*.png 922 for j in "${i}"/*.png ; do
1025 do
1026 doins ${j} 923 doins "${j}"
1027 done 924 done
1028 fi 925 fi
1029 done 926 done
927}
928newicon() {
929 insinto /usr/share/pixmaps
930 newins "$1" "$2"
1030} 931}
1031 932
1032############################################################## 933##############################################################
1033# END: Handle .desktop files and menu entries # 934# END: Handle .desktop files and menu entries #
1034############################################################## 935##############################################################
1435 local mline="" 1336 local mline=""
1436 local showedmsg=0 1337 local showedmsg=0
1437 1338
1438 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
1439 [[ -d ${mline}/${dir} ]] || continue 1340 [[ -d ${mline}/${dir} ]] || continue
1440 [[ ! -z $(find ${mline}/${dir} -iname ${file} -maxdepth 1) ]] \ 1341 [[ ! -z $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] \
1441 && export CDROM_ROOT=${mline} 1342 && export CDROM_ROOT=${mline}
1442 done 1343 done
1443 1344
1444 if [[ -z ${CDROM_ROOT} ]] ; then 1345 if [[ -z ${CDROM_ROOT} ]] ; then
1445 echo 1346 echo
1479# directories and uses the intersection of the lists. 1380# directories and uses the intersection of the lists.
1480# The -u builds a list of po files found in all the 1381# The -u builds a list of po files found in all the
1481# directories and uses the union of the lists. 1382# directories and uses the union of the lists.
1482strip-linguas() { 1383strip-linguas() {
1483 local ls newls 1384 local ls newls
1484 if [ "$1" == "-i" ] || [ "$1" == "-u" ] ; then 1385 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1485 local op="$1"; shift 1386 local op=$1; shift
1486 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1387 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift
1487 local d f 1388 local d f
1488 for d in "$@" ; do 1389 for d in "$@" ; do
1489 if [ "${op}" == "-u" ] ; then 1390 if [[ ${op} == "-u" ]] ; then
1490 newls="${ls}" 1391 newls=${ls}
1491 else 1392 else
1492 newls="" 1393 newls=""
1493 fi 1394 fi
1494 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1395 for f in $(find "$d" -name '*.po' -printf '%f ') ; do
1495 if [ "${op}" == "-i" ] ; then 1396 if [[ ${op} == "-i" ]] ; then
1496 [ "${ls/ ${f} /}" != "${ls}" ] && newls="${newls} ${f}" 1397 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}"
1497 else 1398 else
1498 [ "${ls/ ${f} /}" == "${ls}" ] && newls="${newls} ${f}" 1399 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}"
1499 fi 1400 fi
1500 done 1401 done
1501 ls="${newls}" 1402 ls=${newls}
1502 done 1403 done
1503 ls="${ls//.po}" 1404 ls=${ls//.po}
1504 else 1405 else
1505 ls="$@" 1406 ls=$@
1506 fi 1407 fi
1507 1408
1508 ls=" ${ls} " 1409 ls=" ${ls} "
1509 newls="" 1410 newls=""
1510 for f in ${LINGUAS} ; do 1411 for f in ${LINGUAS} ; do
1511 if [ "${ls/ ${f} /}" != "${ls}" ] ; then 1412 if [[ ${ls/ ${f} /} != ${ls} ]] ; then
1512 newls="${newls} ${f}" 1413 newls="${newls} ${f}"
1513 else 1414 else
1514 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1415 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA"
1515 fi 1416 fi
1516 done 1417 done
1517 if [ -z "${newls}" ] ; then 1418 if [[ -z ${newls} ]] ; then
1518 unset LINGUAS 1419 export LINGUAS=""
1519 else 1420 else
1520 export LINGUAS="${newls}" 1421 export LINGUAS=${newls:1}
1521 fi 1422 fi
1522} 1423}
1523 1424
1524# moved from kernel.eclass since they are generally useful outside of 1425# moved from kernel.eclass since they are generally useful outside of
1525# kernel.eclass -iggy (20041002) 1426# kernel.eclass -iggy (20041002)
1533 while ((i--)) ; do 1434 while ((i--)) ; do
1534 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass" 1435 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1535 done 1436 done
1536 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}" 1437 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1537 case ${ARCH} in 1438 case ${ARCH} in
1538 x86) export ARCH="i386";; 1439 x86) export ARCH="i386";;
1539 amd64) export ARCH="x86_64";; 1440 amd64) export ARCH="x86_64";;
1540 hppa) export ARCH="parisc";; 1441 hppa) export ARCH="parisc";;
1541 mips) export ARCH="mips";; 1442 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! 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!
1543 *) export ARCH="${ARCH}";; 1444 *) export ARCH="${ARCH}";;
1544 esac 1445 esac
1545} 1446}
1546 1447
1547# set's ARCH back to what portage expects 1448# set's ARCH back to what portage expects
1548set_arch_to_portage() { 1449set_arch_to_portage() {
1655dopamd() { 1556dopamd() {
1656 [[ -z $1 ]] && die "dopamd requires at least one argument" 1557 [[ -z $1 ]] && die "dopamd requires at least one argument"
1657 1558
1658 use pam || return 0 1559 use pam || return 0
1659 1560
1660 insinto /etc/pam.d 1561 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 $@" 1562 doins "$@" || die "failed to install $@"
1664} 1563}
1665# newpamd <old name> <new name> 1564# newpamd <old name> <new name>
1666# 1565#
1667# 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
1668newpamd() { 1567newpamd() {
1669 [[ $# -ne 2 ]] && die "newpamd requires two arguements" 1568 [[ $# -ne 2 ]] && die "newpamd requires two arguements"
1670 1569
1671 use pam || return 0 1570 use pam || return 0
1672 1571
1673 insinto /etc/pam.d 1572 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" 1573 newins "$1" "$2" || die "failed to install $1 as $2"
1677} 1574}
1575
1576# make a wrapper script ...
1577# NOTE: this was originally games_make_wrapper, but I noticed other places where
1578# this could be used, so I have moved it here and made it not games-specific
1579# -- wolf31o2
1580# $1 == wrapper name
1581# $2 == binary to run
1582# $3 == directory to chdir before running binary
1583# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1584# $5 == path for wrapper
1585make_wrapper() {
1586 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1587 local tmpwrapper=$(emktemp)
1588 cat << EOF > "${tmpwrapper}"
1589#!/bin/sh
1590cd "${chdir}"
1591export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1592exec ${bin} "\$@"
1593EOF
1594 chmod go+rx "${tmpwrapper}"
1595 if [ -n "${5}" ]
1596 then
1597 exeinto ${5}
1598 newexe "${tmpwrapper}" "${wrapper}"
1599 else
1600 newbin "${tmpwrapper}" "${wrapper}"
1601 fi
1602}

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

  ViewVC Help
Powered by ViewVC 1.1.20