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

Diff of /eclass/eutils.eclass

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

Revision 1.160 Revision 1.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.160 2005/03/22 17:33:13 wolf31o2 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##*/}
407 then 368 then
408 einfo "Done with patching" 369 einfo "Done with patching"
409 fi 370 fi
410} 371}
411 372
412# This function return true if we are using the NPTL pthreads
413# implementation.
414#
415# <azarah@gentoo.org> (06 March 2003)
416#
417have_NPTL() {
418 cat > ${T}/test-nptl.c <<-"END"
419 #define _XOPEN_SOURCE
420 #include <unistd.h>
421 #include <stdio.h>
422
423 int main()
424 {
425 char buf[255];
426 char *str = buf;
427
428 confstr(_CS_GNU_LIBPTHREAD_VERSION, str, 255);
429 if (NULL != str) {
430 printf("%s\n", str);
431 if (NULL != strstr(str, "NPTL"))
432 return 0;
433 }
434
435 return 1;
436 }
437 END
438
439 einfon "Checking for _CS_GNU_LIBPTHREAD_VERSION support in glibc ..."
440 if gcc -o ${T}/nptl ${T}/test-nptl.c &> /dev/null
441 then
442 echo "yes"
443 einfon "Checking what PTHREADS implementation we have ..."
444 if ${T}/nptl
445 then
446 return 0
447 else
448 return 1
449 fi
450 else
451 echo "no"
452 fi
453
454 return 1
455}
456
457# This function check how many cpu's are present, and then set
458# -j in MAKEOPTS accordingly.
459#
460# Thanks to nall <nall@gentoo.org> for this.
461#
462get_number_of_jobs() {
463 local jobs=0
464
465 if [ ! -r /proc/cpuinfo ]
466 then
467 return 1
468 fi
469
470 # This bit is from H?kan Wessberg <nacka-gentoo@refug.org>, bug #13565.
471 if [ "`egrep "^[[:space:]]*MAKEOPTS=" /etc/make.conf | wc -l`" -gt 0 ]
472 then
473 ADMINOPTS="`egrep "^[[:space:]]*MAKEOPTS=" /etc/make.conf | cut -d= -f2 | sed 's/\"//g'`"
474 ADMINPARAM="`echo ${ADMINOPTS} | gawk '{match($0, /-j *[0-9]*/, opt); print opt[0]}'`"
475 ADMINPARAM="${ADMINPARAM/-j}"
476 fi
477
478 export MAKEOPTS="`echo ${MAKEOPTS} | sed -e 's:-j *[0-9]*::g'`"
479
480 if [ "${ARCH}" = "amd64" -o "${ARCH}" = "x86" -o "${ARCH}" = "hppa" -o \
481 "${ARCH}" = "arm" -o "${ARCH}" = "mips" -o "${ARCH}" = "ia64" ]
482 then
483 # these archs will always have "[Pp]rocessor"
484 jobs="$((`grep -c ^[Pp]rocessor /proc/cpuinfo` * 2))"
485
486 elif [ "${ARCH}" = "sparc" -o "${ARCH}" = "sparc64" ]
487 then
488 # sparc always has "ncpus active"
489 jobs="$((`grep "^ncpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
490
491 elif [ "${ARCH}" = "alpha" ]
492 then
493 # alpha has "cpus active", but only when compiled with SMP
494 if [ "`grep -c "^cpus active" /proc/cpuinfo`" -eq 1 ]
495 then
496 jobs="$((`grep "^cpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
497 else
498 jobs=2
499 fi
500
501 elif [ "${ARCH}" = "ppc" -o "${ARCH}" = "ppc64" ]
502 then
503 # ppc has "processor", but only when compiled with SMP
504 if [ "`grep -c "^processor" /proc/cpuinfo`" -eq 1 ]
505 then
506 jobs="$((`grep -c ^processor /proc/cpuinfo` * 2))"
507 else
508 jobs=2
509 fi
510 elif [ "${ARCH}" = "s390" ]
511 then
512 # s390 has "# processors : "
513 jobs="$((`grep "^\# processors" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
514 else
515 jobs="$((`grep -c ^cpu /proc/cpuinfo` * 2))"
516 die "Unknown ARCH -- ${ARCH}!"
517 fi
518
519 # Make sure the number is valid ...
520 if [ "${jobs}" -lt 1 ]
521 then
522 jobs=1
523 fi
524
525 if [ -n "${ADMINPARAM}" ]
526 then
527 if [ "${jobs}" -gt "${ADMINPARAM}" ]
528 then
529 einfo "Setting make jobs to \"-j${ADMINPARAM}\" to ensure successful merge ..."
530 export MAKEOPTS="${MAKEOPTS} -j${ADMINPARAM}"
531 else
532 einfo "Setting make jobs to \"-j${jobs}\" to ensure successful merge ..."
533 export MAKEOPTS="${MAKEOPTS} -j${jobs}"
534 fi
535 fi
536}
537
538# Cheap replacement for when debianutils (and thus mktemp) 373# Cheap replacement for when debianutils (and thus mktemp)
539# does not exist on the users system 374# does not exist on the users system
540# vapier@gentoo.org 375# vapier@gentoo.org
541# 376#
542# Takes just 1 optional parameter (the directory to create tmpfile in) 377# Takes just 1 optional parameter (the directory to create tmpfile in)
573# Joe Jezak <josejx@gmail.com> and usata@gentoo.org 408# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
574# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org> 409# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
575# 410#
576# egetent(database, key) 411# egetent(database, key)
577egetent() { 412egetent() {
578 if useq ppc-macos ; then 413 if [[ "${USERLAND}" == "Darwin" ]] ; then
579 case "$2" in 414 case "$2" in
580 *[!0-9]*) # Non numeric 415 *[!0-9]*) # Non numeric
581 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 416 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
582 ;; 417 ;;
583 *) # Numeric 418 *) # Numeric
584 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 419 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
585 ;; 420 ;;
586 esac 421 esac
587 elif useq x86-fbsd ; then 422 elif [[ "${USERLAND}" == "BSD" ]] ; then
588 local action 423 local action
589 if [ "$1" == "passwd" ] 424 if [ "$1" == "passwd" ]
590 then 425 then
591 action="user" 426 action="user"
592 else 427 else
612# homedir: /dev/null 447# homedir: /dev/null
613# groups: none 448# groups: none
614# extra: comment of 'added by portage for ${PN}' 449# extra: comment of 'added by portage for ${PN}'
615enewuser() { 450enewuser() {
616 # get the username 451 # get the username
617 local euser="$1"; shift 452 local euser=$1; shift
618 if [ -z "${euser}" ] 453 if [[ -z ${euser} ]] ; then
619 then
620 eerror "No username specified !" 454 eerror "No username specified !"
621 die "Cannot call enewuser without a username" 455 die "Cannot call enewuser without a username"
622 fi 456 fi
623 457
624 # lets see if the username already exists 458 # lets see if the username already exists
625 if [ "${euser}" == "`egetent passwd \"${euser}\" | cut -d: -f1`" ] 459 if [[ ${euser} == $(egetent passwd "${euser}" | cut -d: -f1) ]] ; then
626 then
627 return 0 460 return 0
628 fi 461 fi
629 einfo "Adding user '${euser}' to your system ..." 462 einfo "Adding user '${euser}' to your system ..."
630 463
631 # options to pass to useradd 464 # options to pass to useradd
632 local opts= 465 local opts=
633 466
634 # handle uid 467 # handle uid
635 local euid="$1"; shift 468 local euid=$1; shift
636 if [ ! -z "${euid}" ] && [ "${euid}" != "-1" ] 469 if [[ ! -z ${euid} ]] && [[ ${euid} != "-1" ]] ; then
637 then
638 if [ "${euid}" -gt 0 ] 470 if [[ ${euid} -gt 0 ]] ; then
639 then
640 if [ ! -z "`egetent passwd ${euid}`" ] 471 if [[ ! -z $(egetent passwd ${euid}) ]] ; then
641 then
642 euid="next" 472 euid="next"
643 fi 473 fi
644 else 474 else
645 eerror "Userid given but is not greater than 0 !" 475 eerror "Userid given but is not greater than 0 !"
646 die "${euid} is not a valid UID" 476 die "${euid} is not a valid UID"
647 fi 477 fi
648 else 478 else
649 euid="next" 479 euid="next"
650 fi 480 fi
651 if [ "${euid}" == "next" ] 481 if [[ ${euid} == "next" ]] ; then
652 then
653 local pwrange 482 local pwrange
654 if [ "${USERLAND}" == "BSD" ] ; then 483 if [[ ${USERLAND} == "BSD" ]] ; then
655 pwrange="`jot 898 101`" 484 pwrange=$(jot 898 101)
656 else 485 else
657 pwrange="`seq 101 999`" 486 pwrange=$(seq 101 999)
658 fi 487 fi
659 for euid in ${pwrange} ; do 488 for euid in ${pwrange} ; do
660 [ -z "`egetent passwd ${euid}`" ] && break 489 [[ -z $(egetent passwd ${euid}) ]] && break
661 done 490 done
662 fi 491 fi
663 opts="${opts} -u ${euid}" 492 opts="${opts} -u ${euid}"
664 einfo " - Userid: ${euid}" 493 einfo " - Userid: ${euid}"
665 494
666 # handle shell 495 # handle shell
667 local eshell="$1"; shift 496 local eshell=$1; shift
668 if [ ! -z "${eshell}" ] && [ "${eshell}" != "-1" ] 497 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
669 then
670 if [ ! -e "${eshell}" ] 498 if [[ ! -e ${eshell} ]] ; then
671 then
672 eerror "A shell was specified but it does not exist !" 499 eerror "A shell was specified but it does not exist !"
673 die "${eshell} does not exist" 500 die "${eshell} does not exist"
674 fi 501 fi
675 else 502 else
676 if [ "${USERLAND}" == "BSD" ] 503 case ${USERLAND} in
677 then
678 eshell="/usr/bin/false" 504 Darwin) eshell="/usr/bin/false";;
679 else 505 BSD) eshell="/usr/sbin/nologin";;
680 eshell="/bin/false" 506 *) eshell="/bin/false";;
681 fi 507 esac
682 fi 508 fi
683 einfo " - Shell: ${eshell}" 509 einfo " - Shell: ${eshell}"
684 opts="${opts} -s ${eshell}" 510 opts="${opts} -s ${eshell}"
685 511
686 # handle homedir 512 # handle homedir
687 local ehome="$1"; shift 513 local ehome=$1; shift
688 if [ -z "${ehome}" ] && [ "${eshell}" != "-1" ] 514 if [[ -z ${ehome} ]] || [[ ${ehome} == "-1" ]] ; then
689 then
690 ehome="/dev/null" 515 ehome="/dev/null"
691 fi 516 fi
692 einfo " - Home: ${ehome}" 517 einfo " - Home: ${ehome}"
693 opts="${opts} -d ${ehome}" 518 opts="${opts} -d ${ehome}"
694 519
695 # handle groups 520 # handle groups
696 local egroups="$1"; shift 521 local egroups=$1; shift
697 if [ ! -z "${egroups}" ] 522 if [[ ! -z ${egroups} ]] ; then
698 then
699 local oldifs="${IFS}" 523 local oldifs=${IFS}
700 local defgroup="" exgroups="" 524 local defgroup="" exgroups=""
701 525
702 export IFS="," 526 export IFS=","
703 for g in ${egroups} 527 for g in ${egroups} ; do
704 do
705 export IFS="${oldifs}" 528 export IFS=${oldifs}
706 if [ -z "`egetent group \"${g}\"`" ] 529 if [[ -z $(egetent group "${g}") ]] ; then
707 then
708 eerror "You must add group ${g} to the system first" 530 eerror "You must add group ${g} to the system first"
709 die "${g} is not a valid GID" 531 die "${g} is not a valid GID"
710 fi 532 fi
711 if [ -z "${defgroup}" ] 533 if [[ -z ${defgroup} ]] ; then
712 then
713 defgroup="${g}" 534 defgroup=${g}
714 else 535 else
715 exgroups="${exgroups},${g}" 536 exgroups="${exgroups},${g}"
716 fi 537 fi
717 export IFS="," 538 export IFS=","
718 done 539 done
719 export IFS="${oldifs}" 540 export IFS=${oldifs}
720 541
721 opts="${opts} -g ${defgroup}" 542 opts="${opts} -g ${defgroup}"
722 if [ ! -z "${exgroups}" ] 543 if [[ ! -z ${exgroups} ]] ; then
723 then
724 opts="${opts} -G ${exgroups:1}" 544 opts="${opts} -G ${exgroups:1}"
725 fi 545 fi
726 else 546 else
727 egroups="(none)" 547 egroups="(none)"
728 fi 548 fi
729 einfo " - Groups: ${egroups}" 549 einfo " - Groups: ${egroups}"
730 550
731 # handle extra and add the user 551 # handle extra and add the user
732 local eextra="$@"
733 local oldsandbox="${SANDBOX_ON}" 552 local oldsandbox=${SANDBOX_ON}
734 export SANDBOX_ON="0" 553 export SANDBOX_ON="0"
735 if useq ppc-macos 554 case ${USERLAND} in
736 then 555 Darwin)
737 ### Make the user 556 ### Make the user
738 if [ -z "${eextra}" ] 557 if [[ -z $@ ]] ; then
739 then
740 dscl . create /users/${euser} uid ${euid} 558 dscl . create /users/${euser} uid ${euid}
741 dscl . create /users/${euser} shell ${eshell} 559 dscl . create /users/${euser} shell ${eshell}
742 dscl . create /users/${euser} home ${ehome} 560 dscl . create /users/${euser} home ${ehome}
743 dscl . create /users/${euser} realname "added by portage for ${PN}" 561 dscl . create /users/${euser} realname "added by portage for ${PN}"
744 ### Add the user to the groups specified 562 ### Add the user to the groups specified
745 local oldifs="${IFS}" 563 local oldifs=${IFS}
746 export IFS="," 564 export IFS=","
747 for g in ${egroups} 565 for g in ${egroups} ; do
748 do
749 dscl . merge /groups/${g} users ${euser} 566 dscl . merge /groups/${g} users ${euser}
750 done 567 done
751 export IFS="${oldifs}" 568 export IFS=${oldifs}
752 else 569 else
753 einfo "Extra options are not supported on macos yet" 570 einfo "Extra options are not supported on Darwin yet"
754 einfo "Please report the ebuild along with the info below" 571 einfo "Please report the ebuild along with the info below"
755 einfo "eextra: ${eextra}" 572 einfo "eextra: $@"
756 die "Required function missing" 573 die "Required function missing"
757 fi 574 fi
758 elif use x86-fbsd ; then 575 ;;
759 if [ -z "${eextra}" ] 576 BSD)
760 then 577 if [[ -z $@ ]] ; then
761 pw useradd ${euser} ${opts} \ 578 pw useradd ${euser} ${opts} \
762 -c "added by portage for ${PN}" \ 579 -c "added by portage for ${PN}" \
763 die "enewuser failed" 580 die "enewuser failed"
764 else 581 else
765 einfo " - Extra: ${eextra}" 582 einfo " - Extra: $@"
766 pw useradd ${euser} ${opts} \ 583 pw useradd ${euser} ${opts} \
767 -c ${eextra} || die "enewuser failed" 584 "$@" || die "enewuser failed"
768 fi 585 fi
769 else 586 ;;
770 if [ -z "${eextra}" ] 587 *)
771 then 588 if [[ -z $@ ]] ; then
772 useradd ${opts} ${euser} \ 589 useradd ${opts} ${euser} \
773 -c "added by portage for ${PN}" \ 590 -c "added by portage for ${PN}" \
774 || die "enewuser failed" 591 || die "enewuser failed"
775 else 592 else
776 einfo " - Extra: ${eextra}" 593 einfo " - Extra: $@"
777 useradd ${opts} ${euser} ${eextra} \ 594 useradd ${opts} ${euser} "$@" \
778 || die "enewuser failed" 595 || die "enewuser failed"
779 fi 596 fi
780 fi 597 ;;
598 esac
781 export SANDBOX_ON="${oldsandbox}" 599 export SANDBOX_ON=${oldsandbox}
782 600
783 if [ ! -e "${ehome}" ] && [ ! -e "${D}/${ehome}" ] 601 if [ ! -e "${ehome}" ] && [ ! -e "${D}/${ehome}" ]
784 then 602 then
785 einfo " - Creating ${ehome} in ${D}" 603 einfo " - Creating ${ehome} in ${D}"
786 dodir ${ehome} 604 dodir ${ehome}
823 then 641 then
824 if [ "${egid}" -gt 0 ] 642 if [ "${egid}" -gt 0 ]
825 then 643 then
826 if [ -z "`egetent group ${egid}`" ] 644 if [ -z "`egetent group ${egid}`" ]
827 then 645 then
828 if useq ppc-macos ; then 646 if [[ "${USERLAND}" == "Darwin" ]]; then
829 opts="${opts} ${egid}" 647 opts="${opts} ${egid}"
830 else 648 else
831 opts="${opts} -g ${egid}" 649 opts="${opts} -g ${egid}"
832 fi 650 fi
833 else 651 else
847 opts="${opts} ${eextra}" 665 opts="${opts} ${eextra}"
848 666
849 # add the group 667 # add the group
850 local oldsandbox="${SANDBOX_ON}" 668 local oldsandbox="${SANDBOX_ON}"
851 export SANDBOX_ON="0" 669 export SANDBOX_ON="0"
852 if useq ppc-macos ; then 670 if [[ "${USERLAND}" == "Darwin" ]]; then
853 if [ ! -z "${eextra}" ]; 671 if [ ! -z "${eextra}" ];
854 then 672 then
855 einfo "Extra options are not supported on macos yet" 673 einfo "Extra options are not supported on Darwin/OS X yet"
856 einfo "Please report the ebuild along with the info below" 674 einfo "Please report the ebuild along with the info below"
857 einfo "eextra: ${eextra}" 675 einfo "eextra: ${eextra}"
858 die "Required function missing" 676 die "Required function missing"
859 fi 677 fi
860 678
865 [ -z "`egetent group ${egid}`" ] && break 683 [ -z "`egetent group ${egid}`" ] && break
866 done 684 done
867 esac 685 esac
868 dscl . create /groups/${egroup} gid ${egid} 686 dscl . create /groups/${egroup} gid ${egid}
869 dscl . create /groups/${egroup} passwd '*' 687 dscl . create /groups/${egroup} passwd '*'
870 elif use x86-fbsd ; then 688 elif [[ "${USERLAND}" == "BSD" ]] ; then
871 case ${egid} in 689 case ${egid} in
872 *[!0-9]*) # Non numeric 690 *[!0-9]*) # Non numeric
873 for egid in `jot 898 101`; do 691 for egid in `jot 898 101`; do
874 [ -z "`egetent group ${egid}`" ] && break 692 [ -z "`egetent group ${egid}`" ] && break
875 done 693 done
1022 *) 840 *)
1023 type= 841 type=
1024 ;; 842 ;;
1025 esac 843 esac
1026 fi 844 fi
1027 845 if [ "${SLOT}" == "0" ] ; then
846 local desktop_name="${PN}"
847 else
848 local desktop_name="${PN}-${SLOT}"
849 fi
1028 local desktop=${T}/${exec%% *}-${P}.desktop 850 local desktop=${T}/${exec%% *}-${desktop_name}.desktop
1029 851
1030echo "[Desktop Entry] 852echo "[Desktop Entry]
1031Encoding=UTF-8 853Encoding=UTF-8
1032Version=0.9.2 854Version=0.9.2
1033Name=${name} 855Name=${name}
1049# make_desktop_entry(<title>, <command>) 871# make_desktop_entry(<title>, <command>)
1050# title: File to execute to start the Window Manager 872# title: File to execute to start the Window Manager
1051# command: Name of the Window Manager 873# command: Name of the Window Manager
1052 874
1053make_session_desktop() { 875make_session_desktop() {
1054
1055 [ -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
1056 [ -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
1057 878
1058 local title="${1}" 879 local title=$1
1059 local command="${2}" 880 local command=$2
1060 local desktop="${T}/${wm}.desktop" 881 local desktop=${T}/${wm}.desktop
1061 882
1062echo "[Desktop Entry] 883echo "[Desktop Entry]
1063Encoding=UTF-8 884Encoding=UTF-8
1064Name=${title} 885Name=${title}
1065Comment=This session logs you into ${title} 886Comment=This session logs you into ${title}
1067TryExec=${command} 888TryExec=${command}
1068Type=Application" > "${desktop}" 889Type=Application" > "${desktop}"
1069 890
1070 insinto /usr/share/xsessions 891 insinto /usr/share/xsessions
1071 doins "${desktop}" 892 doins "${desktop}"
1072
1073 return 0
1074} 893}
1075 894
1076domenu() { 895domenu() {
1077 local i 896 local i j
1078 local j
1079 insinto /usr/share/applications 897 insinto /usr/share/applications
1080 for i in ${@} 898 for i in "$@" ; do
1081 do
1082 if [ -f "${i}" ]; 899 if [[ -f ${i} ]] ; then
1083 then
1084 doins ${i} 900 doins "${i}"
1085 elif [ -d "${i}" ]; 901 elif [[ -d ${i} ]] ; then
1086 then
1087 for j in ${i}/*.desktop 902 for j in "${i}"/*.desktop ; do
1088 do
1089 doins ${j} 903 doins "${j}"
1090 done 904 done
1091 fi 905 fi
1092 done 906 done
1093} 907}
908newmenu() {
909 insinto /usr/share/applications
910 newins "$1" "$2"
911}
1094 912
1095doicon() { 913doicon() {
1096 local i 914 local i j
1097 local j
1098 insinto /usr/share/pixmaps 915 insinto /usr/share/pixmaps
1099 for i in ${@} 916 for i in "$@" ; do
1100 do
1101 if [ -f "${i}" ]; 917 if [[ -f ${i} ]] ; then
1102 then
1103 doins ${i} 918 doins "${i}"
1104 elif [ -d "${i}" ]; 919 elif [[ -d ${i} ]] ; then
1105 then
1106 for j in ${i}/*.png 920 for j in "${i}"/*.png ; do
1107 do
1108 doins ${j} 921 doins "${j}"
1109 done 922 done
1110 fi 923 fi
1111 done 924 done
925}
926newicon() {
927 insinto /usr/share/pixmaps
928 newins "$1" "$2"
1112} 929}
1113 930
1114############################################################## 931##############################################################
1115# END: Handle .desktop files and menu entries # 932# END: Handle .desktop files and menu entries #
1116############################################################## 933##############################################################
1517 local mline="" 1334 local mline=""
1518 local showedmsg=0 1335 local showedmsg=0
1519 1336
1520 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
1521 [[ -d ${mline}/${dir} ]] || continue 1338 [[ -d ${mline}/${dir} ]] || continue
1522 [[ ! -z $(find ${mline}/${dir} -iname ${file} -maxdepth 1) ]] \ 1339 [[ ! -z $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] \
1523 && export CDROM_ROOT=${mline} 1340 && export CDROM_ROOT=${mline}
1524 done 1341 done
1525 1342
1526 if [[ -z ${CDROM_ROOT} ]] ; then 1343 if [[ -z ${CDROM_ROOT} ]] ; then
1527 echo 1344 echo
1542 fi 1359 fi
1543 showedmsg=1 1360 showedmsg=1
1544 fi 1361 fi
1545 einfo "Press return to scan for the cd again" 1362 einfo "Press return to scan for the cd again"
1546 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."
1547 read 1369 read
1548 fi 1370 fi
1549 done 1371 done
1550} 1372}
1551 1373
1595 else 1417 else
1596 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1418 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA"
1597 fi 1419 fi
1598 done 1420 done
1599 if [[ -z ${newls} ]] ; then 1421 if [[ -z ${newls} ]] ; then
1600 unset LINGUAS 1422 export LINGUAS=""
1601 else 1423 else
1602 export LINGUAS=${newls:1} 1424 export LINGUAS=${newls:1}
1603 fi 1425 fi
1604} 1426}
1605 1427
1615 while ((i--)) ; do 1437 while ((i--)) ; do
1616 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass" 1438 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1617 done 1439 done
1618 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}" 1440 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1619 case ${ARCH} in 1441 case ${ARCH} in
1620 x86) export ARCH="i386";; 1442 x86) export ARCH="i386";;
1621 amd64) export ARCH="x86_64";; 1443 amd64) export ARCH="x86_64";;
1622 hppa) export ARCH="parisc";; 1444 hppa) export ARCH="parisc";;
1623 mips) export ARCH="mips";; 1445 mips) export ARCH="mips";;
1624 sparc) export ARCH="$(tc-arch-kernel)";; # Yeah this is ugly, but it's even WORSE if you don't do this. linux-info.eclass's set_arch_to_kernel is fixed, but won't get used over this one! 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!
1625 *) export ARCH="${ARCH}";; 1447 *) export ARCH="${ARCH}";;
1626 esac 1448 esac
1627} 1449}
1628 1450
1629# set's ARCH back to what portage expects 1451# set's ARCH back to what portage expects
1630set_arch_to_portage() { 1452set_arch_to_portage() {
1674 LIB=$1 1496 LIB=$1
1675 1497
1676 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1498 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1677 SONAME=`basename ${LIB}` 1499 SONAME=`basename ${LIB}`
1678 1500
1679 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."
1680 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"
1681 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,"
1682 einfo "you will need to execute the following command:" 1504 ewarn "you will need to execute the following command:"
1683 einfo " revdep-rebuild --soname ${SONAME}" 1505 ewarn " revdep-rebuild --soname ${SONAME}"
1684 einfo 1506 ewarn
1685 einfo "After doing that, you can safely remove ${LIB}" 1507 ewarn "After doing that, you can safely remove ${LIB}"
1686 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild" 1508 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1687 fi 1509 fi
1688} 1510}
1689 1511
1690# 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
1691# certain USE flags 1513# certain USE flags
1737dopamd() { 1559dopamd() {
1738 [[ -z $1 ]] && die "dopamd requires at least one argument" 1560 [[ -z $1 ]] && die "dopamd requires at least one argument"
1739 1561
1740 use pam || return 0 1562 use pam || return 0
1741 1563
1742 insinto /etc/pam.d 1564 INSDESTTREE=/etc/pam.d \
1743 # these are the default doins options, but be explicit just in case
1744 insopts -m 0644 -o root -g root
1745 doins "$@" || die "failed to install $@" 1565 doins "$@" || die "failed to install $@"
1746} 1566}
1747# newpamd <old name> <new name> 1567# newpamd <old name> <new name>
1748# 1568#
1749# 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
1750newpamd() { 1570newpamd() {
1751 [[ $# -ne 2 ]] && die "newpamd requires two arguements" 1571 [[ $# -ne 2 ]] && die "newpamd requires two arguements"
1752 1572
1753 use pam || return 0 1573 use pam || return 0
1754 1574
1755 insinto /etc/pam.d 1575 INSDESTTREE=/etc/pam.d \
1756 # these are the default doins options, but be explicit just in case
1757 insopts -m 0644 -o root -g root
1758 newins "$1" "$2" || die "failed to install $1 as $2" 1576 newins "$1" "$2" || die "failed to install $1 as $2"
1759} 1577}
1760 1578
1761# make a wrapper script ... 1579# make a wrapper script ...
1762# NOTE: this was originally games_make_wrapper, but I noticed other places where 1580# NOTE: this was originally games_make_wrapper, but I noticed other places where
1764# -- wolf31o2 1582# -- wolf31o2
1765# $1 == wrapper name 1583# $1 == wrapper name
1766# $2 == binary to run 1584# $2 == binary to run
1767# $3 == directory to chdir before running binary 1585# $3 == directory to chdir before running binary
1768# $4 == extra LD_LIBRARY_PATH's (make it : delimited) 1586# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1587# $5 == path for wrapper
1769make_wrapper() { 1588make_wrapper() {
1770 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 1589 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1771 local tmpwrapper=$(emktemp) 1590 local tmpwrapper=$(emktemp)
1772 cat << EOF > "${tmpwrapper}" 1591 cat << EOF > "${tmpwrapper}"
1773#!/bin/sh 1592#!/bin/sh
1774cd "${chdir}" 1593cd "${chdir}"
1775export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}" 1594export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1776exec ${bin} "\$@" 1595exec ${bin} "\$@"
1777EOF 1596EOF
1778 chmod go+rx "${tmpwrapper}" 1597 chmod go+rx "${tmpwrapper}"
1598 if [ -n "${5}" ]
1599 then
1600 exeinto ${5}
1601 newexe "${tmpwrapper}" "${wrapper}"
1602 else
1779 newbin "${tmpwrapper}" "${wrapper}" 1603 newbin "${tmpwrapper}" "${wrapper}"
1604 fi
1780} 1605}

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

  ViewVC Help
Powered by ViewVC 1.1.20