/[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.204
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.204 2005/10/07 04:15:20 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 portability
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"
211 local PATCH_TARGET="${T}/$$.patch" 173 local PATCH_TARGET="${T}/$$.patch"
212 local PATCH_SUFFIX="" 174 local PATCH_SUFFIX=""
213 local SINGLE_PATCH="no" 175 local SINGLE_PATCH="no"
214 local x="" 176 local x=""
215 177
178 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402
179
216 if [ "$#" -gt 1 ] 180 if [ "$#" -gt 1 ]
217 then 181 then
218 local m="" 182 local m=""
219 einfo "${#} patches to apply ..."
220 for m in "$@" ; do 183 for m in "$@" ; do
221 epatch "${m}" 184 epatch "${m}"
222 done 185 done
223 return 0 186 return 0
224 fi 187 fi
278 ;; 241 ;;
279 esac 242 esac
280 243
281 if [ "${SINGLE_PATCH}" = "no" ] 244 if [ "${SINGLE_PATCH}" = "no" ]
282 then 245 then
283 einfo "Applying various patches (bugfixes/updates) ..." 246 einfo "${EPATCH_MULTI_MSG}"
284 fi 247 fi
285 for x in ${EPATCH_SOURCE} 248 for x in ${EPATCH_SOURCE}
286 do 249 do
287 # New ARCH dependant patch naming scheme ... 250 # New ARCH dependant patch naming scheme ...
288 # 251 #
289 # ???_arch_foo.patch 252 # ???_arch_foo.patch
290 # 253 #
291 if [ -f ${x} ] && \ 254 if [ -f ${x} ] && \
292 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "`eval echo \$\{x/_${ARCH}_\}`" != "${x}" ] || \ 255 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "${x/_${ARCH}_}" != "${x}" ] || \
293 [ "${EPATCH_FORCE}" = "yes" ]) 256 [ "${EPATCH_FORCE}" = "yes" ])
294 then 257 then
295 local count=0 258 local count=0
296 local popts="${EPATCH_OPTS}" 259 local popts="${EPATCH_OPTS}"
297 local patchname=${x##*/} 260 local patchname=${x##*/}
386 fi 349 fi
387 350
388 if [ "${count}" -eq 5 ] 351 if [ "${count}" -eq 5 ]
389 then 352 then
390 echo 353 echo
391 eerror "Failed Patch: ${patchname}!" 354 eerror "Failed Patch: ${patchname} !"
355 eerror " ( ${PATCH_TARGET} )"
392 eerror 356 eerror
393 eerror "Include in your bugreport the contents of:" 357 eerror "Include in your bugreport the contents of:"
394 eerror 358 eerror
395 eerror " ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}" 359 eerror " ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}"
396 echo 360 echo
406 then 370 then
407 einfo "Done with patching" 371 einfo "Done with patching"
408 fi 372 fi
409} 373}
410 374
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) 375# Cheap replacement for when debianutils (and thus mktemp)
538# does not exist on the users system 376# does not exist on the users system
539# vapier@gentoo.org 377# vapier@gentoo.org
540# 378#
541# Takes just 1 optional parameter (the directory to create tmpfile in) 379# Takes just 1 optional parameter (the directory to create tmpfile in)
542emktemp() { 380emktemp() {
543 local exe="touch" 381 local exe="touch"
544 [ "$1" == "-d" ] && exe="mkdir" && shift 382 [[ $1 == -d ]] && exe="mkdir" && shift
545 local topdir="$1" 383 local topdir=$1
546 384
547 if [ -z "${topdir}" ] 385 if [[ -z ${topdir} ]] ; then
548 then
549 [ -z "${T}" ] \ 386 [[ -z ${T} ]] \
550 && topdir="/tmp" \ 387 && topdir="/tmp" \
551 || topdir="${T}" 388 || topdir=${T}
552 fi 389 fi
553 390
554 if [ -z "$(type -p mktemp)" ] 391 if [[ -z $(type -p mktemp) ]] ; then
555 then
556 local tmp=/ 392 local tmp=/
557 while [ -e "${tmp}" ] ; do 393 while [[ -e ${tmp} ]] ; do
558 tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}" 394 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}
559 done 395 done
560 ${exe} "${tmp}" 396 ${exe} "${tmp}" || ${exe} -p "${tmp}"
561 echo "${tmp}" 397 echo "${tmp}"
562 else 398 else
563 [ "${exe}" == "touch" ] \ 399 [[ ${exe} == "touch" ]] \
564 && exe="-p" \ 400 && exe="-p" \
565 || exe="-d" 401 || exe="-d"
566 mktemp ${exe} "${topdir}" 402 mktemp ${exe} "${topdir}"
567 fi 403 fi
568} 404}
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 opts action="user"
588 if [ "$1" == "passwd" ] 424 [[ $1 == "passwd" ]] || action="group"
589 then 425
590 action="user" 426 # lookup by uid/gid
591 else 427 if [[ $2 == [[:digit:]]* ]] ; then
592 action="group" 428 [[ ${action} == "user" ]] && opts="-u" || opts="-g"
593 fi 429 fi
430
594 pw show "${action}" "$2" -q 431 pw show ${action} ${opts} "$2" -q
595 else 432 else
596 which nscd >& /dev/null && nscd -i "$1" 433 which nscd >& /dev/null && nscd -i "$1"
597 getent "$1" "$2" 434 getent "$1" "$2"
598 fi 435 fi
599} 436}
611# homedir: /dev/null 448# homedir: /dev/null
612# groups: none 449# groups: none
613# extra: comment of 'added by portage for ${PN}' 450# extra: comment of 'added by portage for ${PN}'
614enewuser() { 451enewuser() {
615 # get the username 452 # get the username
616 local euser="$1"; shift 453 local euser=$1; shift
617 if [ -z "${euser}" ] 454 if [[ -z ${euser} ]] ; then
618 then
619 eerror "No username specified !" 455 eerror "No username specified !"
620 die "Cannot call enewuser without a username" 456 die "Cannot call enewuser without a username"
621 fi 457 fi
622 458
623 # lets see if the username already exists 459 # lets see if the username already exists
624 if [ "${euser}" == "`egetent passwd \"${euser}\" | cut -d: -f1`" ] 460 if [[ ${euser} == $(egetent passwd "${euser}" | cut -d: -f1) ]] ; then
625 then
626 return 0 461 return 0
627 fi 462 fi
628 einfo "Adding user '${euser}' to your system ..." 463 einfo "Adding user '${euser}' to your system ..."
629 464
630 # options to pass to useradd 465 # options to pass to useradd
631 local opts= 466 local opts=
632 467
633 # handle uid 468 # handle uid
634 local euid="$1"; shift 469 local euid=$1; shift
635 if [ ! -z "${euid}" ] && [ "${euid}" != "-1" ] 470 if [[ ! -z ${euid} ]] && [[ ${euid} != "-1" ]] ; then
636 then
637 if [ "${euid}" -gt 0 ] 471 if [[ ${euid} -gt 0 ]] ; then
638 then
639 if [ ! -z "`egetent passwd ${euid}`" ] 472 if [[ ! -z $(egetent passwd ${euid}) ]] ; then
640 then
641 euid="next" 473 euid="next"
642 fi 474 fi
643 else 475 else
644 eerror "Userid given but is not greater than 0 !" 476 eerror "Userid given but is not greater than 0 !"
645 die "${euid} is not a valid UID" 477 die "${euid} is not a valid UID"
646 fi 478 fi
647 else 479 else
648 euid="next" 480 euid="next"
649 fi 481 fi
650 if [ "${euid}" == "next" ] 482 if [[ ${euid} == "next" ]] ; then
651 then 483 for euid in $(seq 101 999) ; do
652 local pwrange
653 if [ "${USERLAND}" == "BSD" ] ; then
654 pwrange="`jot 898 101`"
655 else
656 pwrange="`seq 101 999`"
657 fi
658 for euid in ${pwrange} ; do
659 [ -z "`egetent passwd ${euid}`" ] && break 484 [[ -z $(egetent passwd ${euid}) ]] && break
660 done 485 done
661 fi 486 fi
662 opts="${opts} -u ${euid}" 487 opts="${opts} -u ${euid}"
663 einfo " - Userid: ${euid}" 488 einfo " - Userid: ${euid}"
664 489
665 # handle shell 490 # handle shell
666 local eshell="$1"; shift 491 local eshell=$1; shift
667 if [ ! -z "${eshell}" ] && [ "${eshell}" != "-1" ] 492 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
668 then
669 if [ ! -e "${eshell}" ] 493 if [[ ! -e ${eshell} ]] ; then
670 then
671 eerror "A shell was specified but it does not exist !" 494 eerror "A shell was specified but it does not exist !"
672 die "${eshell} does not exist" 495 die "${eshell} does not exist"
673 fi 496 fi
674 else 497 else
675 if [ "${USERLAND}" == "BSD" ] 498 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do
676 then 499 [[ -x ${ROOT}${shell} ]] && break
677 eshell="/usr/bin/false" 500 done
678 else 501
679 eshell="/bin/false" 502 if [[ ${shell} == "/dev/null" ]] ; then
503 eerror "Unable to identify the shell to use"
504 die "Unable to identify the shell to use"
680 fi 505 fi
506
507 eshell=${shell}
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
597 ;;
598 esac
599
600 if [[ ! -e ${ROOT}/${ehome} ]] ; then
601 einfo " - Creating ${ehome} in ${ROOT}"
602 mkdir -p "${ROOT}/${ehome}"
603 chown ${euser} "${ROOT}/${ehome}"
604 chmod 755 "${ROOT}/${ehome}"
779 fi 605 fi
606
780 export SANDBOX_ON="${oldsandbox}" 607 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} 608}
790 609
791# Simplify/standardize adding groups to the system 610# Simplify/standardize adding groups to the system
792# vapier@gentoo.org 611# vapier@gentoo.org
793# 612#
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
860 # If we need the next available 679 # If we need the next available
861 case ${egid} in 680 case ${egid} in
862 *[!0-9]*) # Non numeric 681 *[!0-9]*) # Non numeric
863 for egid in `jot 898 101`; do 682 for egid in $(seq 101 999); do
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 $(seq 101 999); do
873 [ -z "`egetent group ${egid}`" ] && break 692 [ -z "`egetent group ${egid}`" ] && break
874 done 693 done
875 esac 694 esac
876 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 695 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
877 else 696 else
909# name: the name that will show up in the menu 728# name: the name that will show up in the menu
910# icon: give your little like a pretty little icon ... 729# icon: give your little like a pretty little icon ...
911# this can be relative (to /usr/share/pixmaps) or 730# this can be relative (to /usr/share/pixmaps) or
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/Standards/desktop-entry-spec
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 case ${catmin} in
770 action) type=ActionGame;;
771 arcade) type=ArcadeGame;;
772 board) type=BoardGame;;
773 kid) type=KidsGame;;
774 emulation) type=Emulator;;
775 puzzle) type=LogicGame;;
776 rpg) type=RolePlaying;;
777 roguelike) type=RolePlaying;;
778 simulation) type=Simulation;;
779 sports) type=SportsGame;;
780 strategy) type=StrategyGame;;
781 *) type=;;
782 esac
783 type="Game;${type}"
939 ;; 784 ;;
785
786 mail)
787 type="Network;Email"
788 ;;
789
790 media)
791 case ${catmin} in
792 gfx) type=Graphics;;
793 radio) type=Tuner;;
794 sound) type=Audio;;
795 tv) type=TV;;
796 video) type=Video;;
797 *) type=;;
798 esac
799 type="AudioVideo;${type}"
800 ;;
801
802 net)
803 case ${catmin} in
804 dialup) type=Dialup;;
805 ftp) type=FileTransfer;;
806 im) type=InstantMessaging;;
807 irc) type=IRCClient;;
808 mail) type=Email;;
809 news) type=News;;
810 nntp) type=News;;
811 p2p) type=FileTransfer;;
812 *) type=;;
813 esac
814 type="Network;${type}"
815 ;;
816
817 sci)
818 case ${catmin} in
819 astro*) type=Astronomoy;;
820 bio*) type=Biology;;
821 calc*) type=Calculator;;
822 chem*) type=Chemistry;;
823 geo*) type=Geology;;
824 math*) type=Math;;
825 *) type=;;
826 esac
827 type="Science;${type}"
828 ;;
829
830 www)
831 case ${catmin} in
832 client) type=WebBrowser;;
833 *) type=;;
834 esac
835 type="Network"
836 ;;
837
940 *) 838 *)
941 type= 839 type=
942 subdir=
943 ;; 840 ;;
944 esac 841 esac
945 fi 842 fi
843 if [ "${SLOT}" == "0" ] ; then
844 local desktop_name="${PN}"
845 else
846 local desktop_name="${PN}-${SLOT}"
847 fi
946 local desktop="${T}/${exec%% *}-${P}.desktop" 848 local desktop=${T}/${exec%% *}-${desktop_name}.desktop
947 849
948echo "[Desktop Entry] 850echo "[Desktop Entry]
949Encoding=UTF-8 851Encoding=UTF-8
950Version=0.9.2 852Version=0.9.2
951Name=${name} 853Name=${name}
954Exec=${exec} 856Exec=${exec}
955Path=${path} 857Path=${path}
956Icon=${icon} 858Icon=${icon}
957Categories=Application;${type};" > "${desktop}" 859Categories=Application;${type};" > "${desktop}"
958 860
861 (
862 # wrap the env here so that the 'insinto' call
863 # doesn't corrupt the env of the caller
959 insinto /usr/share/applications 864 insinto /usr/share/applications
960 doins "${desktop}" 865 doins "${desktop}"
961 866 )
962 return 0
963} 867}
964 868
965# Make a GDM/KDM Session file 869# Make a GDM/KDM Session file
966# 870#
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##############################################################
1035 934
1036 935
1037# for internal use only (unpack_pdv and unpack_makeself) 936# for internal use only (unpack_pdv and unpack_makeself)
1038find_unpackable_file() { 937find_unpackable_file() {
1039 local src="$1" 938 local src=$1
1040 if [ -z "${src}" ] 939 if [[ -z ${src} ]] ; then
1041 then
1042 src="${DISTDIR}/${A}" 940 src=${DISTDIR}/${A}
1043 else 941 else
1044 if [ -e "${DISTDIR}/${src}" ] 942 if [[ -e ${DISTDIR}/${src} ]] ; then
1045 then
1046 src="${DISTDIR}/${src}" 943 src=${DISTDIR}/${src}
1047 elif [ -e "${PWD}/${src}" ] 944 elif [[ -e ${PWD}/${src} ]] ; then
1048 then
1049 src="${PWD}/${src}" 945 src=${PWD}/${src}
1050 elif [ -e "${src}" ] 946 elif [[ -e ${src} ]] ; then
1051 then
1052 src="${src}" 947 src=${src}
1053 fi
1054 fi 948 fi
1055 [ ! -e "${src}" ] && die "Could not find requested archive ${src}" 949 fi
950 [[ ! -e ${src} ]] && return 1
1056 echo "${src}" 951 echo "${src}"
1057} 952}
1058 953
1059# Unpack those pesky pdv generated files ... 954# Unpack those pesky pdv generated files ...
1060# They're self-unpacking programs with the binary package stuffed in 955# They're self-unpacking programs with the binary package stuffed in
1075# lseek 970# lseek
1076# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 971# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
1077# lseek(3, -4, SEEK_END) = 2981250 972# lseek(3, -4, SEEK_END) = 2981250
1078# thus we would pass in the value of '4' as the second parameter. 973# thus we would pass in the value of '4' as the second parameter.
1079unpack_pdv() { 974unpack_pdv() {
1080 local src="`find_unpackable_file $1`" 975 local src=$(find_unpackable_file $1)
1081 local sizeoff_t="$2" 976 local sizeoff_t=$2
1082 977
978 [[ -z ${src} ]] && die "Could not locate source for '$1'"
1083 [ -z "${sizeoff_t}" ] && die "No idea what off_t size was used for this pdv :(" 979 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :("
1084 980
1085 local shrtsrc="`basename ${src}`" 981 local shrtsrc="`basename ${src}`"
1086 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 982 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1087 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 983 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"`
1088 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"` 984 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"`
1154# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1050# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1155# - If the file is not specified then unpack will utilize ${A}. 1051# - If the file is not specified then unpack will utilize ${A}.
1156# - If the offset is not specified then we will attempt to extract 1052# - If the offset is not specified then we will attempt to extract
1157# the proper offset from the script itself. 1053# the proper offset from the script itself.
1158unpack_makeself() { 1054unpack_makeself() {
1159 local src="$(find_unpackable_file "$1")" 1055 local src=$(find_unpackable_file "$1")
1160 local skip="$2" 1056 local skip=$2
1161 local exe="$3" 1057 local exe=$3
1162 1058
1059 [[ -z ${src} ]] && die "Could not locate source for '$1'"
1060
1163 local shrtsrc="$(basename "${src}")" 1061 local shrtsrc=$(basename "${src}")
1164 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1062 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1165 if [ -z "${skip}" ] 1063 if [ -z "${skip}" ]
1166 then 1064 then
1167 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1065 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`"
1168 local skip=0 1066 local skip=0
1239check_license() { 1137check_license() {
1240 local lic=$1 1138 local lic=$1
1241 if [ -z "${lic}" ] ; then 1139 if [ -z "${lic}" ] ; then
1242 lic="${PORTDIR}/licenses/${LICENSE}" 1140 lic="${PORTDIR}/licenses/${LICENSE}"
1243 else 1141 else
1244 if [ -e "${PORTDIR}/licenses/${src}" ] ; then 1142 if [ -e "${PORTDIR}/licenses/${lic}" ] ; then
1245 lic="${PORTDIR}/licenses/${src}" 1143 lic="${PORTDIR}/licenses/${lic}"
1246 elif [ -e "${PWD}/${src}" ] ; then 1144 elif [ -e "${PWD}/${lic}" ] ; then
1247 lic="${PWD}/${src}" 1145 lic="${PWD}/${lic}"
1248 elif [ -e "${src}" ] ; then 1146 elif [ -e "${lic}" ] ; then
1249 lic="${src}" 1147 lic="${lic}"
1250 fi
1251 fi 1148 fi
1149 fi
1252 [ ! -f "${lic}" ] && die "Could not find requested license ${src}" 1150 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1253 local l="`basename ${lic}`" 1151 local l="`basename ${lic}`"
1254 1152
1255 # here is where we check for the licenses the user already 1153 # here is where we check for the licenses the user already
1256 # accepted ... if we don't find a match, we make the user accept 1154 # accepted ... if we don't find a match, we make the user accept
1257 local shopts=$- 1155 local shopts=$-
1428# displayed and we'll hang out here until: 1326# displayed and we'll hang out here until:
1429# (1) the file is found on a mounted cdrom 1327# (1) the file is found on a mounted cdrom
1430# (2) the user hits CTRL+C 1328# (2) the user hits CTRL+C
1431cdrom_locate_file_on_cd() { 1329cdrom_locate_file_on_cd() {
1432 while [[ -z ${CDROM_ROOT} ]] ; do 1330 while [[ -z ${CDROM_ROOT} ]] ; do
1433 local dir="$(dirname ${@})" 1331 local dir=$(dirname "$*")
1434 local file="$(basename ${@})" 1332 local file=$(basename "$*")
1435 local mline="" 1333 local mline=""
1436 local showedmsg=0 1334 local showedmsg=0
1437 1335
1438 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do 1336 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do
1439 [[ -d ${mline}/${dir} ]] || continue 1337 [[ -d ${mline}/${dir} ]] || continue
1440 [[ ! -z $(find ${mline}/${dir} -iname ${file} -maxdepth 1) ]] \ 1338 [[ ! -z $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] \
1441 && export CDROM_ROOT=${mline} 1339 && export CDROM_ROOT=${mline}
1442 done 1340 done
1443 1341
1444 if [[ -z ${CDROM_ROOT} ]] ; then 1342 if [[ -z ${CDROM_ROOT} ]] ; then
1445 echo 1343 echo
1460 fi 1358 fi
1461 showedmsg=1 1359 showedmsg=1
1462 fi 1360 fi
1463 einfo "Press return to scan for the cd again" 1361 einfo "Press return to scan for the cd again"
1464 einfo "or hit CTRL+C to abort the emerge." 1362 einfo "or hit CTRL+C to abort the emerge."
1363 echo
1364 einfo "If you are having trouble with the detection"
1365 einfo "of your CD, it is possible that you do not have"
1366 einfo "Joliet support enabled in your kernel. Please"
1367 einfo "check that CONFIG_JOLIET is enabled in your kernel."
1465 read 1368 read
1466 fi 1369 fi
1467 done 1370 done
1468} 1371}
1469 1372
1513 else 1416 else
1514 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1417 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA"
1515 fi 1418 fi
1516 done 1419 done
1517 if [[ -z ${newls} ]] ; then 1420 if [[ -z ${newls} ]] ; then
1518 unset LINGUAS 1421 export LINGUAS=""
1519 else 1422 else
1520 export LINGUAS=${newls:1} 1423 export LINGUAS=${newls:1}
1521 fi 1424 fi
1522} 1425}
1523 1426
1533 while ((i--)) ; do 1436 while ((i--)) ; do
1534 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass" 1437 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1535 done 1438 done
1536 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}" 1439 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1537 case ${ARCH} in 1440 case ${ARCH} in
1538 x86) export ARCH="i386";; 1441 x86) export ARCH="i386";;
1539 amd64) export ARCH="x86_64";; 1442 amd64) export ARCH="x86_64";;
1540 hppa) export ARCH="parisc";; 1443 hppa) export ARCH="parisc";;
1541 mips) export ARCH="mips";; 1444 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! 1445 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}";; 1446 *) export ARCH="${ARCH}";;
1544 esac 1447 esac
1545} 1448}
1546 1449
1547# set's ARCH back to what portage expects 1450# set's ARCH back to what portage expects
1548set_arch_to_portage() { 1451set_arch_to_portage() {
1592 LIB=$1 1495 LIB=$1
1593 1496
1594 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1497 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1595 SONAME=`basename ${LIB}` 1498 SONAME=`basename ${LIB}`
1596 1499
1597 einfo "An old version of an installed library was detected on your system." 1500 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" 1501 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," 1502 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:" 1503 ewarn "you will need to execute the following command:"
1601 einfo " revdep-rebuild --soname ${SONAME}" 1504 ewarn " revdep-rebuild --soname ${SONAME}"
1602 einfo 1505 ewarn
1603 einfo "After doing that, you can safely remove ${LIB}" 1506 ewarn "After doing that, you can safely remove ${LIB}"
1604 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild" 1507 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1605 fi 1508 fi
1606} 1509}
1607 1510
1608# Hack for people to figure out if a package was built with 1511# Hack for people to figure out if a package was built with
1609# certain USE flags 1512# certain USE flags
1655dopamd() { 1558dopamd() {
1656 [[ -z $1 ]] && die "dopamd requires at least one argument" 1559 [[ -z $1 ]] && die "dopamd requires at least one argument"
1657 1560
1658 use pam || return 0 1561 use pam || return 0
1659 1562
1660 insinto /etc/pam.d 1563 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 $@" 1564 doins "$@" || die "failed to install $@"
1664} 1565}
1665# newpamd <old name> <new name> 1566# newpamd <old name> <new name>
1666# 1567#
1667# Install pam file <old name> as <new name> in /etc/pam.d 1568# Install pam file <old name> as <new name> in /etc/pam.d
1668newpamd() { 1569newpamd() {
1669 [[ $# -ne 2 ]] && die "newpamd requires two arguements" 1570 [[ $# -ne 2 ]] && die "newpamd requires two arguements"
1670 1571
1671 use pam || return 0 1572 use pam || return 0
1672 1573
1673 insinto /etc/pam.d 1574 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" 1575 newins "$1" "$2" || die "failed to install $1 as $2"
1677} 1576}
1577
1578# make a wrapper script ...
1579# NOTE: this was originally games_make_wrapper, but I noticed other places where
1580# this could be used, so I have moved it here and made it not games-specific
1581# -- wolf31o2
1582# $1 == wrapper name
1583# $2 == binary to run
1584# $3 == directory to chdir before running binary
1585# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1586# $5 == path for wrapper
1587make_wrapper() {
1588 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1589 local tmpwrapper=$(emktemp)
1590 # We don't want to quote ${bin} so that people can pass complex
1591 # things as $bin ... "./someprog --args"
1592 cat << EOF > "${tmpwrapper}"
1593#!/bin/sh
1594cd "${chdir:-.}"
1595if [ "\${LD_LIBRARY_PATH+set}" = "set" ] && [ -n "${libdir}" ] ; then
1596 export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1597fi
1598exec ${bin} "\$@"
1599EOF
1600 chmod go+rx "${tmpwrapper}"
1601 if [[ -n ${path} ]] ; then
1602 exeinto "${path}"
1603 newexe "${tmpwrapper}" "${wrapper}"
1604 else
1605 newbin "${tmpwrapper}" "${wrapper}"
1606 fi
1607}

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

  ViewVC Help
Powered by ViewVC 1.1.20