/[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.194
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.194 2005/08/09 22:40:39 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.
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
406 then 368 then
407 einfo "Done with patching" 369 einfo "Done with patching"
408 fi 370 fi
409} 371}
410 372
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
535}
536
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
539# vapier@gentoo.org 375# vapier@gentoo.org
540# 376#
541# Takes just 1 optional parameter (the directory to create tmpfile in) 377# Takes just 1 optional parameter (the directory to create tmpfile in)
542emktemp() { 378emktemp() {
543 local exe="touch" 379 local exe="touch"
544 [ "$1" == "-d" ] && exe="mkdir" && shift 380 [[ $1 == -d ]] && exe="mkdir" && shift
545 local topdir="$1" 381 local topdir=$1
546 382
547 if [ -z "${topdir}" ] 383 if [[ -z ${topdir} ]] ; then
548 then
549 [ -z "${T}" ] \ 384 [[ -z ${T} ]] \
550 && topdir="/tmp" \ 385 && topdir="/tmp" \
551 || topdir="${T}" 386 || topdir=${T}
552 fi 387 fi
553 388
554 if [ -z "$(type -p mktemp)" ] 389 if [[ -z $(type -p mktemp) ]] ; then
555 then
556 local tmp=/ 390 local tmp=/
557 while [ -e "${tmp}" ] ; do 391 while [[ -e ${tmp} ]] ; do
558 tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}" 392 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}
559 done 393 done
560 ${exe} "${tmp}" 394 ${exe} "${tmp}" || ${exe} -p "${tmp}"
561 echo "${tmp}" 395 echo "${tmp}"
562 else 396 else
563 [ "${exe}" == "touch" ] \ 397 [[ ${exe} == "touch" ]] \
564 && exe="-p" \ 398 && exe="-p" \
565 || exe="-d" 399 || exe="-d"
566 mktemp ${exe} "${topdir}" 400 mktemp ${exe} "${topdir}"
567 fi 401 fi
568} 402}
572# Joe Jezak <josejx@gmail.com> and usata@gentoo.org 406# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
573# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org> 407# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
574# 408#
575# egetent(database, key) 409# egetent(database, key)
576egetent() { 410egetent() {
577 if useq ppc-macos ; then 411 if [[ "${USERLAND}" == "Darwin" ]] ; then
578 case "$2" in 412 case "$2" in
579 *[!0-9]*) # Non numeric 413 *[!0-9]*) # Non numeric
580 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 414 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
581 ;; 415 ;;
582 *) # Numeric 416 *) # Numeric
583 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 417 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
584 ;; 418 ;;
585 esac 419 esac
586 elif useq x86-fbsd ; then 420 elif [[ "${USERLAND}" == "BSD" ]] ; then
587 local action 421 local action
588 if [ "$1" == "passwd" ] 422 if [ "$1" == "passwd" ]
589 then 423 then
590 action="user" 424 action="user"
591 else 425 else
611# homedir: /dev/null 445# homedir: /dev/null
612# groups: none 446# groups: none
613# extra: comment of 'added by portage for ${PN}' 447# extra: comment of 'added by portage for ${PN}'
614enewuser() { 448enewuser() {
615 # get the username 449 # get the username
616 local euser="$1"; shift 450 local euser=$1; shift
617 if [ -z "${euser}" ] 451 if [[ -z ${euser} ]] ; then
618 then
619 eerror "No username specified !" 452 eerror "No username specified !"
620 die "Cannot call enewuser without a username" 453 die "Cannot call enewuser without a username"
621 fi 454 fi
622 455
623 # lets see if the username already exists 456 # lets see if the username already exists
624 if [ "${euser}" == "`egetent passwd \"${euser}\" | cut -d: -f1`" ] 457 if [[ ${euser} == $(egetent passwd "${euser}" | cut -d: -f1) ]] ; then
625 then
626 return 0 458 return 0
627 fi 459 fi
628 einfo "Adding user '${euser}' to your system ..." 460 einfo "Adding user '${euser}' to your system ..."
629 461
630 # options to pass to useradd 462 # options to pass to useradd
631 local opts= 463 local opts=
632 464
633 # handle uid 465 # handle uid
634 local euid="$1"; shift 466 local euid=$1; shift
635 if [ ! -z "${euid}" ] && [ "${euid}" != "-1" ] 467 if [[ ! -z ${euid} ]] && [[ ${euid} != "-1" ]] ; then
636 then
637 if [ "${euid}" -gt 0 ] 468 if [[ ${euid} -gt 0 ]] ; then
638 then
639 if [ ! -z "`egetent passwd ${euid}`" ] 469 if [[ ! -z $(egetent passwd ${euid}) ]] ; then
640 then
641 euid="next" 470 euid="next"
642 fi 471 fi
643 else 472 else
644 eerror "Userid given but is not greater than 0 !" 473 eerror "Userid given but is not greater than 0 !"
645 die "${euid} is not a valid UID" 474 die "${euid} is not a valid UID"
646 fi 475 fi
647 else 476 else
648 euid="next" 477 euid="next"
649 fi 478 fi
650 if [ "${euid}" == "next" ] 479 if [[ ${euid} == "next" ]] ; then
651 then
652 local pwrange 480 local pwrange
653 if [ "${USERLAND}" == "BSD" ] ; then 481 if [[ ${USERLAND} == "BSD" ]] ; then
654 pwrange="`jot 898 101`" 482 pwrange=$(jot 898 101)
655 else 483 else
656 pwrange="`seq 101 999`" 484 pwrange=$(seq 101 999)
657 fi 485 fi
658 for euid in ${pwrange} ; do 486 for euid in ${pwrange} ; do
659 [ -z "`egetent passwd ${euid}`" ] && break 487 [[ -z $(egetent passwd ${euid}) ]] && break
660 done 488 done
661 fi 489 fi
662 opts="${opts} -u ${euid}" 490 opts="${opts} -u ${euid}"
663 einfo " - Userid: ${euid}" 491 einfo " - Userid: ${euid}"
664 492
665 # handle shell 493 # handle shell
666 local eshell="$1"; shift 494 local eshell=$1; shift
667 if [ ! -z "${eshell}" ] && [ "${eshell}" != "-1" ] 495 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
668 then
669 if [ ! -e "${eshell}" ] 496 if [[ ! -e ${eshell} ]] ; then
670 then
671 eerror "A shell was specified but it does not exist !" 497 eerror "A shell was specified but it does not exist !"
672 die "${eshell} does not exist" 498 die "${eshell} does not exist"
673 fi 499 fi
674 else 500 else
675 if [ "${USERLAND}" == "BSD" ] 501 case ${USERLAND} in
676 then
677 eshell="/usr/bin/false" 502 Darwin) eshell="/usr/bin/false";;
678 else 503 BSD) eshell="/usr/sbin/nologin";;
679 eshell="/bin/false" 504 *) eshell="/bin/false";;
680 fi 505 esac
681 fi 506 fi
682 einfo " - Shell: ${eshell}" 507 einfo " - Shell: ${eshell}"
683 opts="${opts} -s ${eshell}" 508 opts="${opts} -s ${eshell}"
684 509
685 # handle homedir 510 # handle homedir
686 local ehome="$1"; shift 511 local ehome=$1; shift
687 if [ -z "${ehome}" ] && [ "${eshell}" != "-1" ] 512 if [[ -z ${ehome} ]] || [[ ${ehome} == "-1" ]] ; then
688 then
689 ehome="/dev/null" 513 ehome="/dev/null"
690 fi 514 fi
691 einfo " - Home: ${ehome}" 515 einfo " - Home: ${ehome}"
692 opts="${opts} -d ${ehome}" 516 opts="${opts} -d ${ehome}"
693 517
694 # handle groups 518 # handle groups
695 local egroups="$1"; shift 519 local egroups=$1; shift
696 if [ ! -z "${egroups}" ] 520 if [[ ! -z ${egroups} ]] ; then
697 then
698 local oldifs="${IFS}" 521 local oldifs=${IFS}
699 local defgroup="" exgroups="" 522 local defgroup="" exgroups=""
700 523
701 export IFS="," 524 export IFS=","
702 for g in ${egroups} 525 for g in ${egroups} ; do
703 do
704 export IFS="${oldifs}" 526 export IFS=${oldifs}
705 if [ -z "`egetent group \"${g}\"`" ] 527 if [[ -z $(egetent group "${g}") ]] ; then
706 then
707 eerror "You must add group ${g} to the system first" 528 eerror "You must add group ${g} to the system first"
708 die "${g} is not a valid GID" 529 die "${g} is not a valid GID"
709 fi 530 fi
710 if [ -z "${defgroup}" ] 531 if [[ -z ${defgroup} ]] ; then
711 then
712 defgroup="${g}" 532 defgroup=${g}
713 else 533 else
714 exgroups="${exgroups},${g}" 534 exgroups="${exgroups},${g}"
715 fi 535 fi
716 export IFS="," 536 export IFS=","
717 done 537 done
718 export IFS="${oldifs}" 538 export IFS=${oldifs}
719 539
720 opts="${opts} -g ${defgroup}" 540 opts="${opts} -g ${defgroup}"
721 if [ ! -z "${exgroups}" ] 541 if [[ ! -z ${exgroups} ]] ; then
722 then
723 opts="${opts} -G ${exgroups:1}" 542 opts="${opts} -G ${exgroups:1}"
724 fi 543 fi
725 else 544 else
726 egroups="(none)" 545 egroups="(none)"
727 fi 546 fi
728 einfo " - Groups: ${egroups}" 547 einfo " - Groups: ${egroups}"
729 548
730 # handle extra and add the user 549 # handle extra and add the user
731 local eextra="$@"
732 local oldsandbox="${SANDBOX_ON}" 550 local oldsandbox=${SANDBOX_ON}
733 export SANDBOX_ON="0" 551 export SANDBOX_ON="0"
734 if useq ppc-macos 552 case ${USERLAND} in
735 then 553 Darwin)
736 ### Make the user 554 ### Make the user
737 if [ -z "${eextra}" ] 555 if [[ -z $@ ]] ; then
738 then
739 dscl . create /users/${euser} uid ${euid} 556 dscl . create /users/${euser} uid ${euid}
740 dscl . create /users/${euser} shell ${eshell} 557 dscl . create /users/${euser} shell ${eshell}
741 dscl . create /users/${euser} home ${ehome} 558 dscl . create /users/${euser} home ${ehome}
742 dscl . create /users/${euser} realname "added by portage for ${PN}" 559 dscl . create /users/${euser} realname "added by portage for ${PN}"
743 ### Add the user to the groups specified 560 ### Add the user to the groups specified
744 local oldifs="${IFS}" 561 local oldifs=${IFS}
745 export IFS="," 562 export IFS=","
746 for g in ${egroups} 563 for g in ${egroups} ; do
747 do
748 dscl . merge /groups/${g} users ${euser} 564 dscl . merge /groups/${g} users ${euser}
749 done 565 done
750 export IFS="${oldifs}" 566 export IFS=${oldifs}
751 else 567 else
752 einfo "Extra options are not supported on macos yet" 568 einfo "Extra options are not supported on Darwin yet"
753 einfo "Please report the ebuild along with the info below" 569 einfo "Please report the ebuild along with the info below"
754 einfo "eextra: ${eextra}" 570 einfo "eextra: $@"
755 die "Required function missing" 571 die "Required function missing"
756 fi 572 fi
757 elif use x86-fbsd ; then 573 ;;
758 if [ -z "${eextra}" ] 574 BSD)
759 then 575 if [[ -z $@ ]] ; then
760 pw useradd ${euser} ${opts} \ 576 pw useradd ${euser} ${opts} \
761 -c "added by portage for ${PN}" \ 577 -c "added by portage for ${PN}" \
762 die "enewuser failed" 578 die "enewuser failed"
763 else 579 else
764 einfo " - Extra: ${eextra}" 580 einfo " - Extra: $@"
765 pw useradd ${euser} ${opts} \ 581 pw useradd ${euser} ${opts} \
766 -c ${eextra} || die "enewuser failed" 582 "$@" || die "enewuser failed"
767 fi 583 fi
768 else 584 ;;
769 if [ -z "${eextra}" ] 585 *)
770 then 586 if [[ -z $@ ]] ; then
771 useradd ${opts} ${euser} \ 587 useradd ${opts} ${euser} \
772 -c "added by portage for ${PN}" \ 588 -c "added by portage for ${PN}" \
773 || die "enewuser failed" 589 || die "enewuser failed"
774 else 590 else
775 einfo " - Extra: ${eextra}" 591 einfo " - Extra: $@"
776 useradd ${opts} ${euser} ${eextra} \ 592 useradd ${opts} ${euser} "$@" \
777 || die "enewuser failed" 593 || die "enewuser failed"
778 fi 594 fi
595 ;;
596 esac
597
598 if [[ ! -e ${ROOT}/${ehome} ]] ; then
599 einfo " - Creating ${ehome} in ${ROOT}"
600 mkdir -p "${ROOT}/${ehome}"
601 chown ${euser} "${ROOT}/${ehome}"
602 chmod 755 "${ROOT}/${ehome}"
779 fi 603 fi
604
780 export SANDBOX_ON="${oldsandbox}" 605 export SANDBOX_ON=${oldsandbox}
781
782 if [ ! -e "${ehome}" ] && [ ! -e "${D}/${ehome}" ]
783 then
784 einfo " - Creating ${ehome} in ${D}"
785 dodir ${ehome}
786 fowners ${euser} ${ehome}
787 fperms 755 ${ehome}
788 fi
789} 606}
790 607
791# Simplify/standardize adding groups to the system 608# Simplify/standardize adding groups to the system
792# vapier@gentoo.org 609# vapier@gentoo.org
793# 610#
822 then 639 then
823 if [ "${egid}" -gt 0 ] 640 if [ "${egid}" -gt 0 ]
824 then 641 then
825 if [ -z "`egetent group ${egid}`" ] 642 if [ -z "`egetent group ${egid}`" ]
826 then 643 then
827 if useq ppc-macos ; then 644 if [[ "${USERLAND}" == "Darwin" ]]; then
828 opts="${opts} ${egid}" 645 opts="${opts} ${egid}"
829 else 646 else
830 opts="${opts} -g ${egid}" 647 opts="${opts} -g ${egid}"
831 fi 648 fi
832 else 649 else
846 opts="${opts} ${eextra}" 663 opts="${opts} ${eextra}"
847 664
848 # add the group 665 # add the group
849 local oldsandbox="${SANDBOX_ON}" 666 local oldsandbox="${SANDBOX_ON}"
850 export SANDBOX_ON="0" 667 export SANDBOX_ON="0"
851 if useq ppc-macos ; then 668 if [[ "${USERLAND}" == "Darwin" ]]; then
852 if [ ! -z "${eextra}" ]; 669 if [ ! -z "${eextra}" ];
853 then 670 then
854 einfo "Extra options are not supported on macos yet" 671 einfo "Extra options are not supported on Darwin/OS X yet"
855 einfo "Please report the ebuild along with the info below" 672 einfo "Please report the ebuild along with the info below"
856 einfo "eextra: ${eextra}" 673 einfo "eextra: ${eextra}"
857 die "Required function missing" 674 die "Required function missing"
858 fi 675 fi
859 676
864 [ -z "`egetent group ${egid}`" ] && break 681 [ -z "`egetent group ${egid}`" ] && break
865 done 682 done
866 esac 683 esac
867 dscl . create /groups/${egroup} gid ${egid} 684 dscl . create /groups/${egroup} gid ${egid}
868 dscl . create /groups/${egroup} passwd '*' 685 dscl . create /groups/${egroup} passwd '*'
869 elif use x86-fbsd ; then 686 elif [[ "${USERLAND}" == "BSD" ]] ; then
870 case ${egid} in 687 case ${egid} in
871 *[!0-9]*) # Non numeric 688 *[!0-9]*) # Non numeric
872 for egid in `jot 898 101`; do 689 for egid in `jot 898 101`; do
873 [ -z "`egetent group ${egid}`" ] && break 690 [ -z "`egetent group ${egid}`" ] && break
874 done 691 done
909# name: the name that will show up in the menu 726# name: the name that will show up in the menu
910# icon: give your little like a pretty little icon ... 727# icon: give your little like a pretty little icon ...
911# this can be relative (to /usr/share/pixmaps) or 728# this can be relative (to /usr/share/pixmaps) or
912# a full path to an icon 729# a full path to an icon
913# type: what kind of application is this ? for categories: 730# type: what kind of application is this ? for categories:
914# http://www.freedesktop.org/wiki/Standards_2fmenu_2dspec 731# http://www.freedesktop.org/Standards/desktop-entry-spec
915# path: if your app needs to startup in a specific dir 732# path: if your app needs to startup in a specific dir
916make_desktop_entry() { 733make_desktop_entry() {
917 [ -z "$1" ] && eerror "make_desktop_entry: You must specify the executable" && return 1 734 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1
918 735
919 local exec="${1}" 736 local exec=${1}
920 local name="${2:-${PN}}" 737 local name=${2:-${PN}}
921 local icon="${3:-${PN}.png}" 738 local icon=${3:-${PN}.png}
922 local type="${4}" 739 local type=${4}
923 local subdir="${6}" 740 local path=${5}
924 local path="${5:-${GAMES_BINDIR}}" 741
925 if [ -z "${type}" ] 742 if [[ -z ${type} ]] ; then
926 then 743 local catmaj=${CATEGORY%%-*}
927 case ${CATEGORY} in 744 local catmin=${CATEGORY##*-}
928 "app-emulation") 745 case ${catmaj} in
929 type=Emulator 746 app)
930 subdir="Emulation" 747 case ${catmin} in
748 admin) type=System;;
749 cdr) type=DiscBurning;;
750 dicts) type=Dictionary;;
751 editors) type=TextEditor;;
752 emacs) type=TextEditor;;
753 emulation) type=Emulator;;
754 laptop) type=HardwareSettings;;
755 office) type=Office;;
756 vim) type=TextEditor;;
757 xemacs) type=TextEditor;;
758 *) type=;;
759 esac
931 ;; 760 ;;
932 "games-"*) 761
933 type=Game 762 dev)
934 subdir="Games" 763 type="Development"
935 ;; 764 ;;
936 "net-"*) 765
937 type=Network 766 games)
938 subdir="${type}" 767 case ${catmin} in
768 action) type=ActionGame;;
769 arcade) type=ArcadeGame;;
770 board) type=BoardGame;;
771 kid) type=KidsGame;;
772 emulation) type=Emulator;;
773 puzzle) type=LogicGame;;
774 rpg) type=RolePlaying;;
775 roguelike) type=RolePlaying;;
776 simulation) type=Simulation;;
777 sports) type=SportsGame;;
778 strategy) type=StrategyGame;;
779 *) type=;;
780 esac
781 type="Game;${type}"
939 ;; 782 ;;
783
784 mail)
785 type="Network;Email"
786 ;;
787
788 media)
789 case ${catmin} in
790 gfx) type=Graphics;;
791 radio) type=Tuner;;
792 sound) type=Audio;;
793 tv) type=TV;;
794 video) type=Video;;
795 *) type=;;
796 esac
797 type="AudioVideo;${type}"
798 ;;
799
800 net)
801 case ${catmin} in
802 dialup) type=Dialup;;
803 ftp) type=FileTransfer;;
804 im) type=InstantMessaging;;
805 irc) type=IRCClient;;
806 mail) type=Email;;
807 news) type=News;;
808 nntp) type=News;;
809 p2p) type=FileTransfer;;
810 *) type=;;
811 esac
812 type="Network;${type}"
813 ;;
814
815 sci)
816 case ${catmin} in
817 astro*) type=Astronomoy;;
818 bio*) type=Biology;;
819 calc*) type=Calculator;;
820 chem*) type=Chemistry;;
821 geo*) type=Geology;;
822 math*) type=Math;;
823 *) type=;;
824 esac
825 type="Science;${type}"
826 ;;
827
828 www)
829 case ${catmin} in
830 client) type=WebBrowser;;
831 *) type=;;
832 esac
833 type="Network"
834 ;;
835
940 *) 836 *)
941 type= 837 type=
942 subdir=
943 ;; 838 ;;
944 esac 839 esac
945 fi 840 fi
841 if [ "${SLOT}" == "0" ] ; then
842 local desktop_name="${PN}"
843 else
844 local desktop_name="${PN}-${SLOT}"
845 fi
946 local desktop="${T}/${exec%% *}-${P}.desktop" 846 local desktop=${T}/${exec%% *}-${desktop_name}.desktop
947 847
948echo "[Desktop Entry] 848echo "[Desktop Entry]
949Encoding=UTF-8 849Encoding=UTF-8
950Version=0.9.2 850Version=0.9.2
951Name=${name} 851Name=${name}
967# make_desktop_entry(<title>, <command>) 867# make_desktop_entry(<title>, <command>)
968# title: File to execute to start the Window Manager 868# title: File to execute to start the Window Manager
969# command: Name of the Window Manager 869# command: Name of the Window Manager
970 870
971make_session_desktop() { 871make_session_desktop() {
972
973 [ -z "$1" ] && eerror "make_session_desktop: You must specify the title" && return 1 872 [[ -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 873 [[ -z $2 ]] && eerror "make_session_desktop: You must specify the command" && return 1
975 874
976 local title="${1}" 875 local title=$1
977 local command="${2}" 876 local command=$2
978 local desktop="${T}/${wm}.desktop" 877 local desktop=${T}/${wm}.desktop
979 878
980echo "[Desktop Entry] 879echo "[Desktop Entry]
981Encoding=UTF-8 880Encoding=UTF-8
982Name=${title} 881Name=${title}
983Comment=This session logs you into ${title} 882Comment=This session logs you into ${title}
985TryExec=${command} 884TryExec=${command}
986Type=Application" > "${desktop}" 885Type=Application" > "${desktop}"
987 886
988 insinto /usr/share/xsessions 887 insinto /usr/share/xsessions
989 doins "${desktop}" 888 doins "${desktop}"
990
991 return 0
992} 889}
993 890
994domenu() { 891domenu() {
995 local i 892 local i j
996 local j
997 insinto /usr/share/applications 893 insinto /usr/share/applications
998 for i in ${@} 894 for i in "$@" ; do
999 do
1000 if [ -f "${i}" ]; 895 if [[ -f ${i} ]] ; then
1001 then
1002 doins ${i} 896 doins "${i}"
1003 elif [ -d "${i}" ]; 897 elif [[ -d ${i} ]] ; then
1004 then
1005 for j in ${i}/*.desktop 898 for j in "${i}"/*.desktop ; do
1006 do
1007 doins ${j} 899 doins "${j}"
1008 done 900 done
1009 fi 901 fi
1010 done 902 done
1011} 903}
904newmenu() {
905 insinto /usr/share/applications
906 newins "$1" "$2"
907}
1012 908
1013doicon() { 909doicon() {
1014 local i 910 local i j
1015 local j
1016 insinto /usr/share/pixmaps 911 insinto /usr/share/pixmaps
1017 for i in ${@} 912 for i in "$@" ; do
1018 do
1019 if [ -f "${i}" ]; 913 if [[ -f ${i} ]] ; then
1020 then
1021 doins ${i} 914 doins "${i}"
1022 elif [ -d "${i}" ]; 915 elif [[ -d ${i} ]] ; then
1023 then
1024 for j in ${i}/*.png 916 for j in "${i}"/*.png ; do
1025 do
1026 doins ${j} 917 doins "${j}"
1027 done 918 done
1028 fi 919 fi
1029 done 920 done
921}
922newicon() {
923 insinto /usr/share/pixmaps
924 newins "$1" "$2"
1030} 925}
1031 926
1032############################################################## 927##############################################################
1033# END: Handle .desktop files and menu entries # 928# END: Handle .desktop files and menu entries #
1034############################################################## 929##############################################################
1428# displayed and we'll hang out here until: 1323# displayed and we'll hang out here until:
1429# (1) the file is found on a mounted cdrom 1324# (1) the file is found on a mounted cdrom
1430# (2) the user hits CTRL+C 1325# (2) the user hits CTRL+C
1431cdrom_locate_file_on_cd() { 1326cdrom_locate_file_on_cd() {
1432 while [[ -z ${CDROM_ROOT} ]] ; do 1327 while [[ -z ${CDROM_ROOT} ]] ; do
1433 local dir="$(dirname ${@})" 1328 local dir=$(dirname "$*")
1434 local file="$(basename ${@})" 1329 local file=$(basename "$*")
1435 local mline="" 1330 local mline=""
1436 local showedmsg=0 1331 local showedmsg=0
1437 1332
1438 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do 1333 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do
1439 [[ -d ${mline}/${dir} ]] || continue 1334 [[ -d ${mline}/${dir} ]] || continue
1440 [[ ! -z $(find ${mline}/${dir} -iname ${file} -maxdepth 1) ]] \ 1335 [[ ! -z $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] \
1441 && export CDROM_ROOT=${mline} 1336 && export CDROM_ROOT=${mline}
1442 done 1337 done
1443 1338
1444 if [[ -z ${CDROM_ROOT} ]] ; then 1339 if [[ -z ${CDROM_ROOT} ]] ; then
1445 echo 1340 echo
1460 fi 1355 fi
1461 showedmsg=1 1356 showedmsg=1
1462 fi 1357 fi
1463 einfo "Press return to scan for the cd again" 1358 einfo "Press return to scan for the cd again"
1464 einfo "or hit CTRL+C to abort the emerge." 1359 einfo "or hit CTRL+C to abort the emerge."
1360 echo
1361 einfo "If you are having trouble with the detection"
1362 einfo "of your CD, it is possible that you do not have"
1363 einfo "Joliet support enabled in your kernel. Please"
1364 einfo "check that CONFIG_JOLIET is enabled in your kernel."
1465 read 1365 read
1466 fi 1366 fi
1467 done 1367 done
1468} 1368}
1469 1369
1513 else 1413 else
1514 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1414 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA"
1515 fi 1415 fi
1516 done 1416 done
1517 if [[ -z ${newls} ]] ; then 1417 if [[ -z ${newls} ]] ; then
1518 unset LINGUAS 1418 export LINGUAS=""
1519 else 1419 else
1520 export LINGUAS=${newls:1} 1420 export LINGUAS=${newls:1}
1521 fi 1421 fi
1522} 1422}
1523 1423
1533 while ((i--)) ; do 1433 while ((i--)) ; do
1534 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass" 1434 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1535 done 1435 done
1536 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}" 1436 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1537 case ${ARCH} in 1437 case ${ARCH} in
1538 x86) export ARCH="i386";; 1438 x86) export ARCH="i386";;
1539 amd64) export ARCH="x86_64";; 1439 amd64) export ARCH="x86_64";;
1540 hppa) export ARCH="parisc";; 1440 hppa) export ARCH="parisc";;
1541 mips) export ARCH="mips";; 1441 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! 1442 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}";; 1443 *) export ARCH="${ARCH}";;
1544 esac 1444 esac
1545} 1445}
1546 1446
1547# set's ARCH back to what portage expects 1447# set's ARCH back to what portage expects
1548set_arch_to_portage() { 1448set_arch_to_portage() {
1592 LIB=$1 1492 LIB=$1
1593 1493
1594 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1494 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1595 SONAME=`basename ${LIB}` 1495 SONAME=`basename ${LIB}`
1596 1496
1597 einfo "An old version of an installed library was detected on your system." 1497 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" 1498 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," 1499 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:" 1500 ewarn "you will need to execute the following command:"
1601 einfo " revdep-rebuild --soname ${SONAME}" 1501 ewarn " revdep-rebuild --soname ${SONAME}"
1602 einfo 1502 ewarn
1603 einfo "After doing that, you can safely remove ${LIB}" 1503 ewarn "After doing that, you can safely remove ${LIB}"
1604 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild" 1504 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1605 fi 1505 fi
1606} 1506}
1607 1507
1608# Hack for people to figure out if a package was built with 1508# Hack for people to figure out if a package was built with
1609# certain USE flags 1509# certain USE flags
1655dopamd() { 1555dopamd() {
1656 [[ -z $1 ]] && die "dopamd requires at least one argument" 1556 [[ -z $1 ]] && die "dopamd requires at least one argument"
1657 1557
1658 use pam || return 0 1558 use pam || return 0
1659 1559
1660 insinto /etc/pam.d 1560 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 $@" 1561 doins "$@" || die "failed to install $@"
1664} 1562}
1665# newpamd <old name> <new name> 1563# newpamd <old name> <new name>
1666# 1564#
1667# Install pam file <old name> as <new name> in /etc/pam.d 1565# Install pam file <old name> as <new name> in /etc/pam.d
1668newpamd() { 1566newpamd() {
1669 [[ $# -ne 2 ]] && die "newpamd requires two arguements" 1567 [[ $# -ne 2 ]] && die "newpamd requires two arguements"
1670 1568
1671 use pam || return 0 1569 use pam || return 0
1672 1570
1673 insinto /etc/pam.d 1571 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" 1572 newins "$1" "$2" || die "failed to install $1 as $2"
1677} 1573}
1574
1575# make a wrapper script ...
1576# NOTE: this was originally games_make_wrapper, but I noticed other places where
1577# this could be used, so I have moved it here and made it not games-specific
1578# -- wolf31o2
1579# $1 == wrapper name
1580# $2 == binary to run
1581# $3 == directory to chdir before running binary
1582# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1583# $5 == path for wrapper
1584make_wrapper() {
1585 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1586 local tmpwrapper=$(emktemp)
1587 cat << EOF > "${tmpwrapper}"
1588#!/bin/sh
1589cd "${chdir}"
1590export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1591exec ${bin} "\$@"
1592EOF
1593 chmod go+rx "${tmpwrapper}"
1594 if [ -n "${5}" ]
1595 then
1596 exeinto ${5}
1597 newexe "${tmpwrapper}" "${wrapper}"
1598 else
1599 newbin "${tmpwrapper}" "${wrapper}"
1600 fi
1601}

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

  ViewVC Help
Powered by ViewVC 1.1.20