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

Diff of /eclass/eutils.eclass

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

Revision 1.152 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.152 2005/02/18 18:04:42 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 return 0
465
466 if [ ! -r /proc/cpuinfo ]
467 then
468 return 1
469 fi
470
471 # This bit is from H?kan Wessberg <nacka-gentoo@refug.org>, bug #13565.
472 if [ "`egrep "^[[:space:]]*MAKEOPTS=" /etc/make.conf | wc -l`" -gt 0 ]
473 then
474 ADMINOPTS="`egrep "^[[:space:]]*MAKEOPTS=" /etc/make.conf | cut -d= -f2 | sed 's/\"//g'`"
475 ADMINPARAM="`echo ${ADMINOPTS} | gawk '{match($0, /-j *[0-9]*/, opt); print opt[0]}'`"
476 ADMINPARAM="${ADMINPARAM/-j}"
477 fi
478
479 export MAKEOPTS="`echo ${MAKEOPTS} | sed -e 's:-j *[0-9]*::g'`"
480
481 if [ "${ARCH}" = "amd64" -o "${ARCH}" = "x86" -o "${ARCH}" = "hppa" -o \
482 "${ARCH}" = "arm" -o "${ARCH}" = "mips" -o "${ARCH}" = "ia64" ]
483 then
484 # these archs will always have "[Pp]rocessor"
485 jobs="$((`grep -c ^[Pp]rocessor /proc/cpuinfo` * 2))"
486
487 elif [ "${ARCH}" = "sparc" -o "${ARCH}" = "sparc64" ]
488 then
489 # sparc always has "ncpus active"
490 jobs="$((`grep "^ncpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
491
492 elif [ "${ARCH}" = "alpha" ]
493 then
494 # alpha has "cpus active", but only when compiled with SMP
495 if [ "`grep -c "^cpus active" /proc/cpuinfo`" -eq 1 ]
496 then
497 jobs="$((`grep "^cpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
498 else
499 jobs=2
500 fi
501
502 elif [ "${ARCH}" = "ppc" -o "${ARCH}" = "ppc64" ]
503 then
504 # ppc has "processor", but only when compiled with SMP
505 if [ "`grep -c "^processor" /proc/cpuinfo`" -eq 1 ]
506 then
507 jobs="$((`grep -c ^processor /proc/cpuinfo` * 2))"
508 else
509 jobs=2
510 fi
511 elif [ "${ARCH}" = "s390" ]
512 then
513 # s390 has "# processors : "
514 jobs="$((`grep "^\# processors" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
515 else
516 jobs="$((`grep -c ^cpu /proc/cpuinfo` * 2))"
517 die "Unknown ARCH -- ${ARCH}!"
518 fi
519
520 # Make sure the number is valid ...
521 if [ "${jobs}" -lt 1 ]
522 then
523 jobs=1
524 fi
525
526 if [ -n "${ADMINPARAM}" ]
527 then
528 if [ "${jobs}" -gt "${ADMINPARAM}" ]
529 then
530 einfo "Setting make jobs to \"-j${ADMINPARAM}\" to ensure successful merge ..."
531 export MAKEOPTS="${MAKEOPTS} -j${ADMINPARAM}"
532 else
533 einfo "Setting make jobs to \"-j${jobs}\" to ensure successful merge ..."
534 export MAKEOPTS="${MAKEOPTS} -j${jobs}"
535 fi
536 fi 372 fi
537} 373}
538 374
539# Cheap replacement for when debianutils (and thus mktemp) 375# Cheap replacement for when debianutils (and thus mktemp)
540# does not exist on the users system 376# does not exist on the users system
574# Joe Jezak <josejx@gmail.com> and usata@gentoo.org 410# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
575# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org> 411# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
576# 412#
577# egetent(database, key) 413# egetent(database, key)
578egetent() { 414egetent() {
579 if useq ppc-macos ; then 415 if [[ "${USERLAND}" == "Darwin" ]] ; then
580 case "$2" in 416 case "$2" in
581 *[!0-9]*) # Non numeric 417 *[!0-9]*) # Non numeric
582 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 418 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
583 ;; 419 ;;
584 *) # Numeric 420 *) # Numeric
585 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 421 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
586 ;; 422 ;;
587 esac 423 esac
588 elif useq x86-fbsd ; then 424 elif [[ "${USERLAND}" == "BSD" ]] ; then
589 local action 425 local action
590 if [ "$1" == "passwd" ] 426 if [ "$1" == "passwd" ]
591 then 427 then
592 action="user" 428 action="user"
593 else 429 else
613# homedir: /dev/null 449# homedir: /dev/null
614# groups: none 450# groups: none
615# extra: comment of 'added by portage for ${PN}' 451# extra: comment of 'added by portage for ${PN}'
616enewuser() { 452enewuser() {
617 # get the username 453 # get the username
618 local euser="$1"; shift 454 local euser=$1; shift
619 if [ -z "${euser}" ] 455 if [[ -z ${euser} ]] ; then
620 then
621 eerror "No username specified !" 456 eerror "No username specified !"
622 die "Cannot call enewuser without a username" 457 die "Cannot call enewuser without a username"
623 fi 458 fi
624 459
625 # lets see if the username already exists 460 # lets see if the username already exists
626 if [ "${euser}" == "`egetent passwd \"${euser}\" | cut -d: -f1`" ] 461 if [[ ${euser} == $(egetent passwd "${euser}" | cut -d: -f1) ]] ; then
627 then
628 return 0 462 return 0
629 fi 463 fi
630 einfo "Adding user '${euser}' to your system ..." 464 einfo "Adding user '${euser}' to your system ..."
631 465
632 # options to pass to useradd 466 # options to pass to useradd
633 local opts= 467 local opts=
634 468
635 # handle uid 469 # handle uid
636 local euid="$1"; shift 470 local euid=$1; shift
637 if [ ! -z "${euid}" ] && [ "${euid}" != "-1" ] 471 if [[ ! -z ${euid} ]] && [[ ${euid} != "-1" ]] ; then
638 then
639 if [ "${euid}" -gt 0 ] 472 if [[ ${euid} -gt 0 ]] ; then
640 then
641 if [ ! -z "`egetent passwd ${euid}`" ] 473 if [[ ! -z $(egetent passwd ${euid}) ]] ; then
642 then
643 euid="next" 474 euid="next"
644 fi 475 fi
645 else 476 else
646 eerror "Userid given but is not greater than 0 !" 477 eerror "Userid given but is not greater than 0 !"
647 die "${euid} is not a valid UID" 478 die "${euid} is not a valid UID"
648 fi 479 fi
649 else 480 else
650 euid="next" 481 euid="next"
651 fi 482 fi
652 if [ "${euid}" == "next" ] 483 if [[ ${euid} == "next" ]] ; then
653 then
654 local pwrange 484 local pwrange
655 if [ "${USERLAND}" == "BSD" ] ; then 485 if [[ ${USERLAND} == "BSD" ]] ; then
656 pwrange="`jot 898 101`" 486 pwrange=$(jot 898 101)
657 else 487 else
658 pwrange="`seq 101 999`" 488 pwrange=$(seq 101 999)
659 fi 489 fi
660 for euid in ${pwrange} ; do 490 for euid in ${pwrange} ; do
661 [ -z "`egetent passwd ${euid}`" ] && break 491 [[ -z $(egetent passwd ${euid}) ]] && break
662 done 492 done
663 fi 493 fi
664 opts="${opts} -u ${euid}" 494 opts="${opts} -u ${euid}"
665 einfo " - Userid: ${euid}" 495 einfo " - Userid: ${euid}"
666 496
667 # handle shell 497 # handle shell
668 local eshell="$1"; shift 498 local eshell=$1; shift
669 if [ ! -z "${eshell}" ] && [ "${eshell}" != "-1" ] 499 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
670 then
671 if [ ! -e "${eshell}" ] 500 if [[ ! -e ${eshell} ]] ; then
672 then
673 eerror "A shell was specified but it does not exist !" 501 eerror "A shell was specified but it does not exist !"
674 die "${eshell} does not exist" 502 die "${eshell} does not exist"
675 fi 503 fi
676 else 504 else
677 if [ "${USERLAND}" == "BSD" ] 505 case ${USERLAND} in
678 then
679 eshell="/usr/bin/false" 506 Darwin) eshell="/usr/bin/false";;
680 else 507 BSD) eshell="/usr/sbin/nologin";;
681 eshell="/bin/false" 508 *) eshell="/bin/false";;
682 fi 509 esac
683 fi 510 fi
684 einfo " - Shell: ${eshell}" 511 einfo " - Shell: ${eshell}"
685 opts="${opts} -s ${eshell}" 512 opts="${opts} -s ${eshell}"
686 513
687 # handle homedir 514 # handle homedir
688 local ehome="$1"; shift 515 local ehome=$1; shift
689 if [ -z "${ehome}" ] && [ "${eshell}" != "-1" ] 516 if [[ -z ${ehome} ]] || [[ ${ehome} == "-1" ]] ; then
690 then
691 ehome="/dev/null" 517 ehome="/dev/null"
692 fi 518 fi
693 einfo " - Home: ${ehome}" 519 einfo " - Home: ${ehome}"
694 opts="${opts} -d ${ehome}" 520 opts="${opts} -d ${ehome}"
695 521
696 # handle groups 522 # handle groups
697 local egroups="$1"; shift 523 local egroups=$1; shift
698 if [ ! -z "${egroups}" ] 524 if [[ ! -z ${egroups} ]] ; then
699 then
700 local oldifs="${IFS}" 525 local oldifs=${IFS}
701 local defgroup="" exgroups="" 526 local defgroup="" exgroups=""
702 527
703 export IFS="," 528 export IFS=","
704 for g in ${egroups} 529 for g in ${egroups} ; do
705 do
706 export IFS="${oldifs}" 530 export IFS=${oldifs}
707 if [ -z "`egetent group \"${g}\"`" ] 531 if [[ -z $(egetent group "${g}") ]] ; then
708 then
709 eerror "You must add group ${g} to the system first" 532 eerror "You must add group ${g} to the system first"
710 die "${g} is not a valid GID" 533 die "${g} is not a valid GID"
711 fi 534 fi
712 if [ -z "${defgroup}" ] 535 if [[ -z ${defgroup} ]] ; then
713 then
714 defgroup="${g}" 536 defgroup=${g}
715 else 537 else
716 exgroups="${exgroups},${g}" 538 exgroups="${exgroups},${g}"
717 fi 539 fi
718 export IFS="," 540 export IFS=","
719 done 541 done
720 export IFS="${oldifs}" 542 export IFS=${oldifs}
721 543
722 opts="${opts} -g ${defgroup}" 544 opts="${opts} -g ${defgroup}"
723 if [ ! -z "${exgroups}" ] 545 if [[ ! -z ${exgroups} ]] ; then
724 then
725 opts="${opts} -G ${exgroups:1}" 546 opts="${opts} -G ${exgroups:1}"
726 fi 547 fi
727 else 548 else
728 egroups="(none)" 549 egroups="(none)"
729 fi 550 fi
730 einfo " - Groups: ${egroups}" 551 einfo " - Groups: ${egroups}"
731 552
732 # handle extra and add the user 553 # handle extra and add the user
733 local eextra="$@"
734 local oldsandbox="${SANDBOX_ON}" 554 local oldsandbox=${SANDBOX_ON}
735 export SANDBOX_ON="0" 555 export SANDBOX_ON="0"
736 if useq ppc-macos 556 case ${USERLAND} in
737 then 557 Darwin)
738 ### Make the user 558 ### Make the user
739 if [ -z "${eextra}" ] 559 if [[ -z $@ ]] ; then
740 then
741 dscl . create /users/${euser} uid ${euid} 560 dscl . create /users/${euser} uid ${euid}
742 dscl . create /users/${euser} shell ${eshell} 561 dscl . create /users/${euser} shell ${eshell}
743 dscl . create /users/${euser} home ${ehome} 562 dscl . create /users/${euser} home ${ehome}
744 dscl . create /users/${euser} realname "added by portage for ${PN}" 563 dscl . create /users/${euser} realname "added by portage for ${PN}"
745 ### Add the user to the groups specified 564 ### Add the user to the groups specified
746 local oldifs="${IFS}" 565 local oldifs=${IFS}
747 export IFS="," 566 export IFS=","
748 for g in ${egroups} 567 for g in ${egroups} ; do
749 do
750 dscl . merge /groups/${g} users ${euser} 568 dscl . merge /groups/${g} users ${euser}
751 done 569 done
752 export IFS="${oldifs}" 570 export IFS=${oldifs}
753 else 571 else
754 einfo "Extra options are not supported on macos yet" 572 einfo "Extra options are not supported on Darwin yet"
755 einfo "Please report the ebuild along with the info below" 573 einfo "Please report the ebuild along with the info below"
756 einfo "eextra: ${eextra}" 574 einfo "eextra: $@"
757 die "Required function missing" 575 die "Required function missing"
758 fi 576 fi
759 elif use x86-fbsd ; then 577 ;;
760 if [ -z "${eextra}" ] 578 BSD)
761 then 579 if [[ -z $@ ]] ; then
762 pw useradd ${euser} ${opts} \ 580 pw useradd ${euser} ${opts} \
763 -c "added by portage for ${PN}" \ 581 -c "added by portage for ${PN}" \
764 die "enewuser failed" 582 die "enewuser failed"
765 else 583 else
766 einfo " - Extra: ${eextra}" 584 einfo " - Extra: $@"
767 pw useradd ${euser} ${opts} \ 585 pw useradd ${euser} ${opts} \
768 -c ${eextra} || die "enewuser failed" 586 "$@" || die "enewuser failed"
769 fi 587 fi
770 else 588 ;;
771 if [ -z "${eextra}" ] 589 *)
772 then 590 if [[ -z $@ ]] ; then
773 useradd ${opts} ${euser} \ 591 useradd ${opts} ${euser} \
774 -c "added by portage for ${PN}" \ 592 -c "added by portage for ${PN}" \
775 || die "enewuser failed" 593 || die "enewuser failed"
776 else 594 else
777 einfo " - Extra: ${eextra}" 595 einfo " - Extra: $@"
778 useradd ${opts} ${euser} ${eextra} \ 596 useradd ${opts} ${euser} "$@" \
779 || die "enewuser failed" 597 || die "enewuser failed"
780 fi 598 fi
781 fi 599 ;;
600 esac
782 export SANDBOX_ON="${oldsandbox}" 601 export SANDBOX_ON=${oldsandbox}
783 602
784 if [ ! -e "${ehome}" ] && [ ! -e "${D}/${ehome}" ] 603 if [ ! -e "${ehome}" ] && [ ! -e "${D}/${ehome}" ]
785 then 604 then
786 einfo " - Creating ${ehome} in ${D}" 605 einfo " - Creating ${ehome} in ${D}"
787 dodir ${ehome} 606 dodir ${ehome}
824 then 643 then
825 if [ "${egid}" -gt 0 ] 644 if [ "${egid}" -gt 0 ]
826 then 645 then
827 if [ -z "`egetent group ${egid}`" ] 646 if [ -z "`egetent group ${egid}`" ]
828 then 647 then
829 if useq ppc-macos ; then 648 if [[ "${USERLAND}" == "Darwin" ]]; then
830 opts="${opts} ${egid}" 649 opts="${opts} ${egid}"
831 else 650 else
832 opts="${opts} -g ${egid}" 651 opts="${opts} -g ${egid}"
833 fi 652 fi
834 else 653 else
848 opts="${opts} ${eextra}" 667 opts="${opts} ${eextra}"
849 668
850 # add the group 669 # add the group
851 local oldsandbox="${SANDBOX_ON}" 670 local oldsandbox="${SANDBOX_ON}"
852 export SANDBOX_ON="0" 671 export SANDBOX_ON="0"
853 if useq ppc-macos ; then 672 if [[ "${USERLAND}" == "Darwin" ]]; then
854 if [ ! -z "${eextra}" ]; 673 if [ ! -z "${eextra}" ];
855 then 674 then
856 einfo "Extra options are not supported on macos yet" 675 einfo "Extra options are not supported on Darwin/OS X yet"
857 einfo "Please report the ebuild along with the info below" 676 einfo "Please report the ebuild along with the info below"
858 einfo "eextra: ${eextra}" 677 einfo "eextra: ${eextra}"
859 die "Required function missing" 678 die "Required function missing"
860 fi 679 fi
861 680
866 [ -z "`egetent group ${egid}`" ] && break 685 [ -z "`egetent group ${egid}`" ] && break
867 done 686 done
868 esac 687 esac
869 dscl . create /groups/${egroup} gid ${egid} 688 dscl . create /groups/${egroup} gid ${egid}
870 dscl . create /groups/${egroup} passwd '*' 689 dscl . create /groups/${egroup} passwd '*'
871 elif use x86-fbsd ; then 690 elif [[ "${USERLAND}" == "BSD" ]] ; then
872 case ${egid} in 691 case ${egid} in
873 *[!0-9]*) # Non numeric 692 *[!0-9]*) # Non numeric
874 for egid in `jot 898 101`; do 693 for egid in `jot 898 101`; do
875 [ -z "`egetent group ${egid}`" ] && break 694 [ -z "`egetent group ${egid}`" ] && break
876 done 695 done
911# name: the name that will show up in the menu 730# name: the name that will show up in the menu
912# icon: give your little like a pretty little icon ... 731# icon: give your little like a pretty little icon ...
913# this can be relative (to /usr/share/pixmaps) or 732# this can be relative (to /usr/share/pixmaps) or
914# a full path to an icon 733# a full path to an icon
915# type: what kind of application is this ? for categories: 734# type: what kind of application is this ? for categories:
916# http://www.freedesktop.org/standards/menu-spec/ 735# http://www.freedesktop.org/wiki/Standards_2fmenu_2dspec
917# path: if your app needs to startup in a specific dir 736# path: if your app needs to startup in a specific dir
918make_desktop_entry() { 737make_desktop_entry() {
919 [ -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
920 739
921 local exec="${1}" 740 local exec=${1}
922 local name="${2:-${PN}}" 741 local name=${2:-${PN}}
923 local icon="${3:-${PN}.png}" 742 local icon=${3:-${PN}.png}
924 local type="${4}" 743 local type=${4}
925 local subdir="${6}" 744 local path=${5}
926 local path="${5:-${GAMES_BINDIR}}" 745
927 if [ -z "${type}" ] 746 if [[ -z ${type} ]] ; then
928 then 747 local catmaj=${CATEGORY%%-*}
929 case ${CATEGORY} in 748 local catmin=${CATEGORY##*-}
930 "app-emulation") 749 case ${catmaj} in
931 type=Emulator 750 app)
932 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
933 ;; 764 ;;
934 "games-"*) 765
935 type=Game 766 dev)
936 subdir="Games" 767 type="Development"
937 ;; 768 ;;
938 "net-"*) 769
939 type=Network 770 games)
940 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}"
941 ;; 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
942 *) 842 *)
943 type= 843 type=
944 subdir=
945 ;; 844 ;;
946 esac 845 esac
947 fi 846 fi
847 if [ "${SLOT}" == "0" ] ; then
848 local desktop_name="${PN}"
849 else
850 local desktop_name="${PN}-${SLOT}"
851 fi
948 local desktop="${T}/${exec}.desktop" 852 local desktop=${T}/${exec%% *}-${desktop_name}.desktop
949 853
950echo "[Desktop Entry] 854echo "[Desktop Entry]
951Encoding=UTF-8 855Encoding=UTF-8
952Version=0.9.2 856Version=0.9.2
953Name=${name} 857Name=${name}
969# make_desktop_entry(<title>, <command>) 873# make_desktop_entry(<title>, <command>)
970# title: File to execute to start the Window Manager 874# title: File to execute to start the Window Manager
971# command: Name of the Window Manager 875# command: Name of the Window Manager
972 876
973make_session_desktop() { 877make_session_desktop() {
974
975 [ -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
976 [ -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
977 880
978 local title="${1}" 881 local title=$1
979 local command="${2}" 882 local command=$2
980 local desktop="${T}/${wm}.desktop" 883 local desktop=${T}/${wm}.desktop
981 884
982echo "[Desktop Entry] 885echo "[Desktop Entry]
983Encoding=UTF-8 886Encoding=UTF-8
984Name=${title} 887Name=${title}
985Comment=This session logs you into ${title} 888Comment=This session logs you into ${title}
987TryExec=${command} 890TryExec=${command}
988Type=Application" > "${desktop}" 891Type=Application" > "${desktop}"
989 892
990 insinto /usr/share/xsessions 893 insinto /usr/share/xsessions
991 doins "${desktop}" 894 doins "${desktop}"
992
993 return 0
994} 895}
995 896
996domenu() { 897domenu() {
997 local i 898 local i j
998 local j
999 insinto /usr/share/applications 899 insinto /usr/share/applications
1000 for i in ${@} 900 for i in "$@" ; do
1001 do
1002 if [ -f "${i}" ]; 901 if [[ -f ${i} ]] ; then
1003 then
1004 doins ${i} 902 doins "${i}"
1005 elif [ -d "${i}" ]; 903 elif [[ -d ${i} ]] ; then
1006 then
1007 for j in ${i}/*.desktop 904 for j in "${i}"/*.desktop ; do
1008 do
1009 doins ${j} 905 doins "${j}"
1010 done 906 done
1011 fi 907 fi
1012 done 908 done
1013} 909}
910newmenu() {
911 insinto /usr/share/applications
912 newins "$1" "$2"
913}
1014 914
1015doicon() { 915doicon() {
1016 local i 916 local i j
1017 local j
1018 insinto /usr/share/pixmaps 917 insinto /usr/share/pixmaps
1019 for i in ${@} 918 for i in "$@" ; do
1020 do
1021 if [ -f "${i}" ]; 919 if [[ -f ${i} ]] ; then
1022 then
1023 doins ${i} 920 doins "${i}"
1024 elif [ -d "${i}" ]; 921 elif [[ -d ${i} ]] ; then
1025 then
1026 for j in ${i}/*.png 922 for j in "${i}"/*.png ; do
1027 do
1028 doins ${j} 923 doins "${j}"
1029 done 924 done
1030 fi 925 fi
1031 done 926 done
927}
928newicon() {
929 insinto /usr/share/pixmaps
930 newins "$1" "$2"
1032} 931}
1033 932
1034############################################################## 933##############################################################
1035# END: Handle .desktop files and menu entries # 934# END: Handle .desktop files and menu entries #
1036############################################################## 935##############################################################
1437 local mline="" 1336 local mline=""
1438 local showedmsg=0 1337 local showedmsg=0
1439 1338
1440 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
1441 [[ -d ${mline}/${dir} ]] || continue 1340 [[ -d ${mline}/${dir} ]] || continue
1442 [[ ! -z $(find ${mline}/${dir} -iname ${file} -maxdepth 1) ]] \ 1341 [[ ! -z $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] \
1443 && export CDROM_ROOT=${mline} 1342 && export CDROM_ROOT=${mline}
1444 done 1343 done
1445 1344
1446 if [[ -z ${CDROM_ROOT} ]] ; then 1345 if [[ -z ${CDROM_ROOT} ]] ; then
1447 echo 1346 echo
1481# directories and uses the intersection of the lists. 1380# directories and uses the intersection of the lists.
1482# 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
1483# directories and uses the union of the lists. 1382# directories and uses the union of the lists.
1484strip-linguas() { 1383strip-linguas() {
1485 local ls newls 1384 local ls newls
1486 if [ "$1" == "-i" ] || [ "$1" == "-u" ] ; then 1385 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1487 local op="$1"; shift 1386 local op=$1; shift
1488 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1387 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift
1489 local d f 1388 local d f
1490 for d in "$@" ; do 1389 for d in "$@" ; do
1491 if [ "${op}" == "-u" ] ; then 1390 if [[ ${op} == "-u" ]] ; then
1492 newls="${ls}" 1391 newls=${ls}
1493 else 1392 else
1494 newls="" 1393 newls=""
1495 fi 1394 fi
1496 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1395 for f in $(find "$d" -name '*.po' -printf '%f ') ; do
1497 if [ "${op}" == "-i" ] ; then 1396 if [[ ${op} == "-i" ]] ; then
1498 [ "${ls/ ${f} /}" != "${ls}" ] && newls="${newls} ${f}" 1397 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}"
1499 else 1398 else
1500 [ "${ls/ ${f} /}" == "${ls}" ] && newls="${newls} ${f}" 1399 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}"
1501 fi 1400 fi
1502 done 1401 done
1503 ls="${newls}" 1402 ls=${newls}
1504 done 1403 done
1505 ls="${ls//.po}" 1404 ls=${ls//.po}
1506 else 1405 else
1507 ls="$@" 1406 ls=$@
1508 fi 1407 fi
1509 1408
1510 ls=" ${ls} " 1409 ls=" ${ls} "
1511 newls="" 1410 newls=""
1512 for f in ${LINGUAS} ; do 1411 for f in ${LINGUAS} ; do
1513 if [ "${ls/ ${f} /}" != "${ls}" ] ; then 1412 if [[ ${ls/ ${f} /} != ${ls} ]] ; then
1514 newls="${newls} ${f}" 1413 newls="${newls} ${f}"
1515 else 1414 else
1516 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1415 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA"
1517 fi 1416 fi
1518 done 1417 done
1519 if [ -z "${newls}" ] ; then 1418 if [[ -z ${newls} ]] ; then
1520 unset LINGUAS 1419 export LINGUAS=""
1521 else 1420 else
1522 export LINGUAS="${newls}" 1421 export LINGUAS=${newls:1}
1523 fi 1422 fi
1524} 1423}
1525 1424
1526# moved from kernel.eclass since they are generally useful outside of 1425# moved from kernel.eclass since they are generally useful outside of
1527# kernel.eclass -iggy (20041002) 1426# kernel.eclass -iggy (20041002)
1535 while ((i--)) ; do 1434 while ((i--)) ; do
1536 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass" 1435 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1537 done 1436 done
1538 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}" 1437 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1539 case ${ARCH} in 1438 case ${ARCH} in
1540 x86) export ARCH="i386";; 1439 x86) export ARCH="i386";;
1541 amd64) export ARCH="x86_64";; 1440 amd64) export ARCH="x86_64";;
1542 hppa) export ARCH="parisc";; 1441 hppa) export ARCH="parisc";;
1543 mips) export ARCH="mips";; 1442 mips) export ARCH="mips";;
1544 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!
1545 *) export ARCH="${ARCH}";; 1444 *) export ARCH="${ARCH}";;
1546 esac 1445 esac
1547} 1446}
1548 1447
1549# set's ARCH back to what portage expects 1448# set's ARCH back to what portage expects
1550set_arch_to_portage() { 1449set_arch_to_portage() {
1657dopamd() { 1556dopamd() {
1658 [[ -z $1 ]] && die "dopamd requires at least one argument" 1557 [[ -z $1 ]] && die "dopamd requires at least one argument"
1659 1558
1660 use pam || return 0 1559 use pam || return 0
1661 1560
1662 insinto /etc/pam.d 1561 INSDESTTREE=/etc/pam.d \
1663 # these are the default doins options, but be explicit just in case
1664 insopts -m 0644 -o root -g root
1665 doins "$@" || die "failed to install $@" 1562 doins "$@" || die "failed to install $@"
1666} 1563}
1667# newpamd <old name> <new name> 1564# newpamd <old name> <new name>
1668# 1565#
1669# 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
1670newpamd() { 1567newpamd() {
1671 [[ $# -ne 2 ]] && die "newpamd requires two arguements" 1568 [[ $# -ne 2 ]] && die "newpamd requires two arguements"
1672 1569
1673 use pam || return 0 1570 use pam || return 0
1674 1571
1675 insinto /etc/pam.d 1572 INSDESTTREE=/etc/pam.d \
1676 # these are the default doins options, but be explicit just in case
1677 insopts -m 0644 -o root -g root
1678 newins "$1" "$2" || die "failed to install $1 as $2" 1573 newins "$1" "$2" || die "failed to install $1 as $2"
1679} 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.152  
changed lines
  Added in v.1.182

  ViewVC Help
Powered by ViewVC 1.1.20