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

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

  ViewVC Help
Powered by ViewVC 1.1.20