/[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.205
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.205 2005/10/07 15:31:46 flameeyes 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 case ${CHOST} in
414 *-darwin*)
578 case "$2" in 415 case "$2" in
579 *[!0-9]*) # Non numeric 416 *[!0-9]*) # Non numeric
580 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 417 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
581 ;; 418 ;;
582 *) # Numeric 419 *) # Numeric
583 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 420 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
584 ;; 421 ;;
585 esac 422 esac
586 elif useq x86-fbsd ; then 423 ;;
587 local action 424 *-freebsd*)
588 if [ "$1" == "passwd" ] 425 local opts action="user"
589 then 426 [[ $1 == "passwd" ]] || action="group"
590 action="user" 427
591 else 428 # lookup by uid/gid
592 action="group" 429 if [[ $2 == [[:digit:]]* ]] ; then
430 [[ ${action} == "user" ]] && opts="-u" || opts="-g"
593 fi 431 fi
432
594 pw show "${action}" "$2" -q 433 pw show ${action} ${opts} "$2" -q
595 else 434 ;;
435 *)
596 which nscd >& /dev/null && nscd -i "$1" 436 type -p nscd >& /dev/null && nscd -i "$1"
597 getent "$1" "$2" 437 getent "$1" "$2"
598 fi 438 ;;
439 esac
599} 440}
600 441
601# Simplify/standardize adding users to the system 442# Simplify/standardize adding users to the system
602# vapier@gentoo.org 443# vapier@gentoo.org
603# 444#
611# homedir: /dev/null 452# homedir: /dev/null
612# groups: none 453# groups: none
613# extra: comment of 'added by portage for ${PN}' 454# extra: comment of 'added by portage for ${PN}'
614enewuser() { 455enewuser() {
615 # get the username 456 # get the username
616 local euser="$1"; shift 457 local euser=$1; shift
617 if [ -z "${euser}" ] 458 if [[ -z ${euser} ]] ; then
618 then
619 eerror "No username specified !" 459 eerror "No username specified !"
620 die "Cannot call enewuser without a username" 460 die "Cannot call enewuser without a username"
621 fi 461 fi
622 462
623 # lets see if the username already exists 463 # lets see if the username already exists
624 if [ "${euser}" == "`egetent passwd \"${euser}\" | cut -d: -f1`" ] 464 if [[ ${euser} == $(egetent passwd "${euser}" | cut -d: -f1) ]] ; then
625 then
626 return 0 465 return 0
627 fi 466 fi
628 einfo "Adding user '${euser}' to your system ..." 467 einfo "Adding user '${euser}' to your system ..."
629 468
630 # options to pass to useradd 469 # options to pass to useradd
631 local opts= 470 local opts=
632 471
633 # handle uid 472 # handle uid
634 local euid="$1"; shift 473 local euid=$1; shift
635 if [ ! -z "${euid}" ] && [ "${euid}" != "-1" ] 474 if [[ ! -z ${euid} ]] && [[ ${euid} != "-1" ]] ; then
636 then
637 if [ "${euid}" -gt 0 ] 475 if [[ ${euid} -gt 0 ]] ; then
638 then
639 if [ ! -z "`egetent passwd ${euid}`" ] 476 if [[ ! -z $(egetent passwd ${euid}) ]] ; then
640 then
641 euid="next" 477 euid="next"
642 fi 478 fi
643 else 479 else
644 eerror "Userid given but is not greater than 0 !" 480 eerror "Userid given but is not greater than 0 !"
645 die "${euid} is not a valid UID" 481 die "${euid} is not a valid UID"
646 fi 482 fi
647 else 483 else
648 euid="next" 484 euid="next"
649 fi 485 fi
650 if [ "${euid}" == "next" ] 486 if [[ ${euid} == "next" ]] ; then
651 then 487 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 488 [[ -z $(egetent passwd ${euid}) ]] && break
660 done 489 done
661 fi 490 fi
662 opts="${opts} -u ${euid}" 491 opts="${opts} -u ${euid}"
663 einfo " - Userid: ${euid}" 492 einfo " - Userid: ${euid}"
664 493
665 # handle shell 494 # handle shell
666 local eshell="$1"; shift 495 local eshell=$1; shift
667 if [ ! -z "${eshell}" ] && [ "${eshell}" != "-1" ] 496 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
668 then
669 if [ ! -e "${eshell}" ] 497 if [[ ! -e ${eshell} ]] ; then
670 then
671 eerror "A shell was specified but it does not exist !" 498 eerror "A shell was specified but it does not exist !"
672 die "${eshell} does not exist" 499 die "${eshell} does not exist"
673 fi 500 fi
674 else 501 else
675 if [ "${USERLAND}" == "BSD" ] 502 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do
676 then 503 [[ -x ${ROOT}${shell} ]] && break
677 eshell="/usr/bin/false" 504 done
678 else 505
679 eshell="/bin/false" 506 if [[ ${shell} == "/dev/null" ]] ; then
507 eerror "Unable to identify the shell to use"
508 die "Unable to identify the shell to use"
680 fi 509 fi
510
511 eshell=${shell}
681 fi 512 fi
682 einfo " - Shell: ${eshell}" 513 einfo " - Shell: ${eshell}"
683 opts="${opts} -s ${eshell}" 514 opts="${opts} -s ${eshell}"
684 515
685 # handle homedir 516 # handle homedir
686 local ehome="$1"; shift 517 local ehome=$1; shift
687 if [ -z "${ehome}" ] && [ "${eshell}" != "-1" ] 518 if [[ -z ${ehome} ]] || [[ ${ehome} == "-1" ]] ; then
688 then
689 ehome="/dev/null" 519 ehome="/dev/null"
690 fi 520 fi
691 einfo " - Home: ${ehome}" 521 einfo " - Home: ${ehome}"
692 opts="${opts} -d ${ehome}" 522 opts="${opts} -d ${ehome}"
693 523
694 # handle groups 524 # handle groups
695 local egroups="$1"; shift 525 local egroups=$1; shift
696 if [ ! -z "${egroups}" ] 526 if [[ ! -z ${egroups} ]] ; then
697 then
698 local oldifs="${IFS}" 527 local oldifs=${IFS}
699 local defgroup="" exgroups="" 528 local defgroup="" exgroups=""
700 529
701 export IFS="," 530 export IFS=","
702 for g in ${egroups} 531 for g in ${egroups} ; do
703 do
704 export IFS="${oldifs}" 532 export IFS=${oldifs}
705 if [ -z "`egetent group \"${g}\"`" ] 533 if [[ -z $(egetent group "${g}") ]] ; then
706 then
707 eerror "You must add group ${g} to the system first" 534 eerror "You must add group ${g} to the system first"
708 die "${g} is not a valid GID" 535 die "${g} is not a valid GID"
709 fi 536 fi
710 if [ -z "${defgroup}" ] 537 if [[ -z ${defgroup} ]] ; then
711 then
712 defgroup="${g}" 538 defgroup=${g}
713 else 539 else
714 exgroups="${exgroups},${g}" 540 exgroups="${exgroups},${g}"
715 fi 541 fi
716 export IFS="," 542 export IFS=","
717 done 543 done
718 export IFS="${oldifs}" 544 export IFS=${oldifs}
719 545
720 opts="${opts} -g ${defgroup}" 546 opts="${opts} -g ${defgroup}"
721 if [ ! -z "${exgroups}" ] 547 if [[ ! -z ${exgroups} ]] ; then
722 then
723 opts="${opts} -G ${exgroups:1}" 548 opts="${opts} -G ${exgroups:1}"
724 fi 549 fi
725 else 550 else
726 egroups="(none)" 551 egroups="(none)"
727 fi 552 fi
728 einfo " - Groups: ${egroups}" 553 einfo " - Groups: ${egroups}"
729 554
730 # handle extra and add the user 555 # handle extra and add the user
731 local eextra="$@"
732 local oldsandbox="${SANDBOX_ON}" 556 local oldsandbox=${SANDBOX_ON}
733 export SANDBOX_ON="0" 557 export SANDBOX_ON="0"
734 if useq ppc-macos 558 case ${CHOST} in
735 then 559 *-darwin*)
736 ### Make the user 560 ### Make the user
737 if [ -z "${eextra}" ] 561 if [[ -z $@ ]] ; then
738 then
739 dscl . create /users/${euser} uid ${euid} 562 dscl . create /users/${euser} uid ${euid}
740 dscl . create /users/${euser} shell ${eshell} 563 dscl . create /users/${euser} shell ${eshell}
741 dscl . create /users/${euser} home ${ehome} 564 dscl . create /users/${euser} home ${ehome}
742 dscl . create /users/${euser} realname "added by portage for ${PN}" 565 dscl . create /users/${euser} realname "added by portage for ${PN}"
743 ### Add the user to the groups specified 566 ### Add the user to the groups specified
744 local oldifs="${IFS}" 567 local oldifs=${IFS}
745 export IFS="," 568 export IFS=","
746 for g in ${egroups} 569 for g in ${egroups} ; do
747 do
748 dscl . merge /groups/${g} users ${euser} 570 dscl . merge /groups/${g} users ${euser}
749 done 571 done
750 export IFS="${oldifs}" 572 export IFS=${oldifs}
751 else 573 else
752 einfo "Extra options are not supported on macos yet" 574 einfo "Extra options are not supported on Darwin yet"
753 einfo "Please report the ebuild along with the info below" 575 einfo "Please report the ebuild along with the info below"
754 einfo "eextra: ${eextra}" 576 einfo "eextra: $@"
755 die "Required function missing" 577 die "Required function missing"
756 fi 578 fi
757 elif use x86-fbsd ; then 579 ;;
758 if [ -z "${eextra}" ] 580 *-freebsd*)
759 then 581 if [[ -z $@ ]] ; then
760 pw useradd ${euser} ${opts} \ 582 pw useradd ${euser} ${opts} \
761 -c "added by portage for ${PN}" \ 583 -c "added by portage for ${PN}" \
762 die "enewuser failed" 584 die "enewuser failed"
763 else 585 else
764 einfo " - Extra: ${eextra}" 586 einfo " - Extra: $@"
765 pw useradd ${euser} ${opts} \ 587 pw useradd ${euser} ${opts} \
766 -c ${eextra} || die "enewuser failed" 588 "$@" || die "enewuser failed"
767 fi 589 fi
768 else 590 ;;
769 if [ -z "${eextra}" ] 591 *)
770 then 592 if [[ -z $@ ]] ; then
771 useradd ${opts} ${euser} \ 593 useradd ${opts} ${euser} \
772 -c "added by portage for ${PN}" \ 594 -c "added by portage for ${PN}" \
773 || die "enewuser failed" 595 || die "enewuser failed"
774 else 596 else
775 einfo " - Extra: ${eextra}" 597 einfo " - Extra: $@"
776 useradd ${opts} ${euser} ${eextra} \ 598 useradd ${opts} ${euser} "$@" \
777 || die "enewuser failed" 599 || die "enewuser failed"
778 fi 600 fi
601 ;;
602 esac
603
604 if [[ ! -e ${ROOT}/${ehome} ]] ; then
605 einfo " - Creating ${ehome} in ${ROOT}"
606 mkdir -p "${ROOT}/${ehome}"
607 chown ${euser} "${ROOT}/${ehome}"
608 chmod 755 "${ROOT}/${ehome}"
779 fi 609 fi
610
780 export SANDBOX_ON="${oldsandbox}" 611 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} 612}
790 613
791# Simplify/standardize adding groups to the system 614# Simplify/standardize adding groups to the system
792# vapier@gentoo.org 615# vapier@gentoo.org
793# 616#
822 then 645 then
823 if [ "${egid}" -gt 0 ] 646 if [ "${egid}" -gt 0 ]
824 then 647 then
825 if [ -z "`egetent group ${egid}`" ] 648 if [ -z "`egetent group ${egid}`" ]
826 then 649 then
827 if useq ppc-macos ; then 650 if [[ "${CHOST}" == *-darwin* ]]; then
828 opts="${opts} ${egid}" 651 opts="${opts} ${egid}"
829 else 652 else
830 opts="${opts} -g ${egid}" 653 opts="${opts} -g ${egid}"
831 fi 654 fi
832 else 655 else
846 opts="${opts} ${eextra}" 669 opts="${opts} ${eextra}"
847 670
848 # add the group 671 # add the group
849 local oldsandbox="${SANDBOX_ON}" 672 local oldsandbox="${SANDBOX_ON}"
850 export SANDBOX_ON="0" 673 export SANDBOX_ON="0"
851 if useq ppc-macos ; then 674 case ${CHOST} in
675 *-darwin*)
852 if [ ! -z "${eextra}" ]; 676 if [ ! -z "${eextra}" ];
853 then 677 then
854 einfo "Extra options are not supported on macos yet" 678 einfo "Extra options are not supported on Darwin/OS X yet"
855 einfo "Please report the ebuild along with the info below" 679 einfo "Please report the ebuild along with the info below"
856 einfo "eextra: ${eextra}" 680 einfo "eextra: ${eextra}"
857 die "Required function missing" 681 die "Required function missing"
858 fi 682 fi
859 683
860 # If we need the next available 684 # If we need the next available
861 case ${egid} in 685 case ${egid} in
862 *[!0-9]*) # Non numeric 686 *[!0-9]*) # Non numeric
863 for egid in `jot 898 101`; do 687 for egid in $(seq 101 999); do
864 [ -z "`egetent group ${egid}`" ] && break 688 [ -z "`egetent group ${egid}`" ] && break
865 done 689 done
866 esac 690 esac
867 dscl . create /groups/${egroup} gid ${egid} 691 dscl . create /groups/${egroup} gid ${egid}
868 dscl . create /groups/${egroup} passwd '*' 692 dscl . create /groups/${egroup} passwd '*'
869 elif use x86-fbsd ; then 693 ;;
694
695 *-freebsd*)
870 case ${egid} in 696 case ${egid} in
871 *[!0-9]*) # Non numeric 697 *[!0-9]*) # Non numeric
872 for egid in `jot 898 101`; do 698 for egid in $(seq 101 999); do
873 [ -z "`egetent group ${egid}`" ] && break 699 [ -z "`egetent group ${egid}`" ] && break
874 done 700 done
875 esac 701 esac
876 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 702 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
877 else 703 ;;
704 *)
878 groupadd ${opts} ${egroup} || die "enewgroup failed" 705 groupadd ${opts} ${egroup} || die "enewgroup failed"
879 fi 706 ;;
707 esac
880 export SANDBOX_ON="${oldsandbox}" 708 export SANDBOX_ON="${oldsandbox}"
881} 709}
882 710
883# Simple script to replace 'dos2unix' binaries 711# Simple script to replace 'dos2unix' binaries
884# vapier@gentoo.org 712# vapier@gentoo.org
909# name: the name that will show up in the menu 737# name: the name that will show up in the menu
910# icon: give your little like a pretty little icon ... 738# icon: give your little like a pretty little icon ...
911# this can be relative (to /usr/share/pixmaps) or 739# this can be relative (to /usr/share/pixmaps) or
912# a full path to an icon 740# a full path to an icon
913# type: what kind of application is this ? for categories: 741# type: what kind of application is this ? for categories:
914# http://www.freedesktop.org/wiki/Standards_2fmenu_2dspec 742# http://www.freedesktop.org/Standards/desktop-entry-spec
915# path: if your app needs to startup in a specific dir 743# path: if your app needs to startup in a specific dir
916make_desktop_entry() { 744make_desktop_entry() {
917 [ -z "$1" ] && eerror "make_desktop_entry: You must specify the executable" && return 1 745 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1
918 746
919 local exec="${1}" 747 local exec=${1}
920 local name="${2:-${PN}}" 748 local name=${2:-${PN}}
921 local icon="${3:-${PN}.png}" 749 local icon=${3:-${PN}.png}
922 local type="${4}" 750 local type=${4}
923 local subdir="${6}" 751 local path=${5}
924 local path="${5:-${GAMES_BINDIR}}" 752
925 if [ -z "${type}" ] 753 if [[ -z ${type} ]] ; then
926 then 754 local catmaj=${CATEGORY%%-*}
927 case ${CATEGORY} in 755 local catmin=${CATEGORY##*-}
928 "app-emulation") 756 case ${catmaj} in
929 type=Emulator 757 app)
930 subdir="Emulation" 758 case ${catmin} in
759 admin) type=System;;
760 cdr) type=DiscBurning;;
761 dicts) type=Dictionary;;
762 editors) type=TextEditor;;
763 emacs) type=TextEditor;;
764 emulation) type=Emulator;;
765 laptop) type=HardwareSettings;;
766 office) type=Office;;
767 vim) type=TextEditor;;
768 xemacs) type=TextEditor;;
769 *) type=;;
770 esac
931 ;; 771 ;;
932 "games-"*) 772
933 type=Game 773 dev)
934 subdir="Games" 774 type="Development"
935 ;; 775 ;;
936 "net-"*) 776
937 type=Network 777 games)
938 subdir="${type}" 778 case ${catmin} in
779 action) type=ActionGame;;
780 arcade) type=ArcadeGame;;
781 board) type=BoardGame;;
782 kid) type=KidsGame;;
783 emulation) type=Emulator;;
784 puzzle) type=LogicGame;;
785 rpg) type=RolePlaying;;
786 roguelike) type=RolePlaying;;
787 simulation) type=Simulation;;
788 sports) type=SportsGame;;
789 strategy) type=StrategyGame;;
790 *) type=;;
791 esac
792 type="Game;${type}"
939 ;; 793 ;;
794
795 mail)
796 type="Network;Email"
797 ;;
798
799 media)
800 case ${catmin} in
801 gfx) type=Graphics;;
802 radio) type=Tuner;;
803 sound) type=Audio;;
804 tv) type=TV;;
805 video) type=Video;;
806 *) type=;;
807 esac
808 type="AudioVideo;${type}"
809 ;;
810
811 net)
812 case ${catmin} in
813 dialup) type=Dialup;;
814 ftp) type=FileTransfer;;
815 im) type=InstantMessaging;;
816 irc) type=IRCClient;;
817 mail) type=Email;;
818 news) type=News;;
819 nntp) type=News;;
820 p2p) type=FileTransfer;;
821 *) type=;;
822 esac
823 type="Network;${type}"
824 ;;
825
826 sci)
827 case ${catmin} in
828 astro*) type=Astronomoy;;
829 bio*) type=Biology;;
830 calc*) type=Calculator;;
831 chem*) type=Chemistry;;
832 geo*) type=Geology;;
833 math*) type=Math;;
834 *) type=;;
835 esac
836 type="Science;${type}"
837 ;;
838
839 www)
840 case ${catmin} in
841 client) type=WebBrowser;;
842 *) type=;;
843 esac
844 type="Network"
845 ;;
846
940 *) 847 *)
941 type= 848 type=
942 subdir=
943 ;; 849 ;;
944 esac 850 esac
945 fi 851 fi
852 if [ "${SLOT}" == "0" ] ; then
853 local desktop_name="${PN}"
854 else
855 local desktop_name="${PN}-${SLOT}"
856 fi
946 local desktop="${T}/${exec%% *}-${P}.desktop" 857 local desktop=${T}/${exec%% *}-${desktop_name}.desktop
947 858
948echo "[Desktop Entry] 859echo "[Desktop Entry]
949Encoding=UTF-8 860Encoding=UTF-8
950Version=0.9.2 861Version=0.9.2
951Name=${name} 862Name=${name}
954Exec=${exec} 865Exec=${exec}
955Path=${path} 866Path=${path}
956Icon=${icon} 867Icon=${icon}
957Categories=Application;${type};" > "${desktop}" 868Categories=Application;${type};" > "${desktop}"
958 869
870 (
871 # wrap the env here so that the 'insinto' call
872 # doesn't corrupt the env of the caller
959 insinto /usr/share/applications 873 insinto /usr/share/applications
960 doins "${desktop}" 874 doins "${desktop}"
961 875 )
962 return 0
963} 876}
964 877
965# Make a GDM/KDM Session file 878# Make a GDM/KDM Session file
966# 879#
967# make_desktop_entry(<title>, <command>) 880# make_desktop_entry(<title>, <command>)
968# title: File to execute to start the Window Manager 881# title: File to execute to start the Window Manager
969# command: Name of the Window Manager 882# command: Name of the Window Manager
970 883
971make_session_desktop() { 884make_session_desktop() {
972
973 [ -z "$1" ] && eerror "make_session_desktop: You must specify the title" && return 1 885 [[ -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 886 [[ -z $2 ]] && eerror "make_session_desktop: You must specify the command" && return 1
975 887
976 local title="${1}" 888 local title=$1
977 local command="${2}" 889 local command=$2
978 local desktop="${T}/${wm}.desktop" 890 local desktop=${T}/${wm}.desktop
979 891
980echo "[Desktop Entry] 892echo "[Desktop Entry]
981Encoding=UTF-8 893Encoding=UTF-8
982Name=${title} 894Name=${title}
983Comment=This session logs you into ${title} 895Comment=This session logs you into ${title}
985TryExec=${command} 897TryExec=${command}
986Type=Application" > "${desktop}" 898Type=Application" > "${desktop}"
987 899
988 insinto /usr/share/xsessions 900 insinto /usr/share/xsessions
989 doins "${desktop}" 901 doins "${desktop}"
990
991 return 0
992} 902}
993 903
994domenu() { 904domenu() {
995 local i 905 local i j
996 local j
997 insinto /usr/share/applications 906 insinto /usr/share/applications
998 for i in ${@} 907 for i in "$@" ; do
999 do
1000 if [ -f "${i}" ]; 908 if [[ -f ${i} ]] ; then
1001 then
1002 doins ${i} 909 doins "${i}"
1003 elif [ -d "${i}" ]; 910 elif [[ -d ${i} ]] ; then
1004 then
1005 for j in ${i}/*.desktop 911 for j in "${i}"/*.desktop ; do
1006 do
1007 doins ${j} 912 doins "${j}"
1008 done 913 done
1009 fi 914 fi
1010 done 915 done
1011} 916}
917newmenu() {
918 insinto /usr/share/applications
919 newins "$1" "$2"
920}
1012 921
1013doicon() { 922doicon() {
1014 local i 923 local i j
1015 local j
1016 insinto /usr/share/pixmaps 924 insinto /usr/share/pixmaps
1017 for i in ${@} 925 for i in "$@" ; do
1018 do
1019 if [ -f "${i}" ]; 926 if [[ -f ${i} ]] ; then
1020 then
1021 doins ${i} 927 doins "${i}"
1022 elif [ -d "${i}" ]; 928 elif [[ -d ${i} ]] ; then
1023 then
1024 for j in ${i}/*.png 929 for j in "${i}"/*.png ; do
1025 do
1026 doins ${j} 930 doins "${j}"
1027 done 931 done
1028 fi 932 fi
1029 done 933 done
934}
935newicon() {
936 insinto /usr/share/pixmaps
937 newins "$1" "$2"
1030} 938}
1031 939
1032############################################################## 940##############################################################
1033# END: Handle .desktop files and menu entries # 941# END: Handle .desktop files and menu entries #
1034############################################################## 942##############################################################
1035 943
1036 944
1037# for internal use only (unpack_pdv and unpack_makeself) 945# for internal use only (unpack_pdv and unpack_makeself)
1038find_unpackable_file() { 946find_unpackable_file() {
1039 local src="$1" 947 local src=$1
1040 if [ -z "${src}" ] 948 if [[ -z ${src} ]] ; then
1041 then
1042 src="${DISTDIR}/${A}" 949 src=${DISTDIR}/${A}
1043 else 950 else
1044 if [ -e "${DISTDIR}/${src}" ] 951 if [[ -e ${DISTDIR}/${src} ]] ; then
1045 then
1046 src="${DISTDIR}/${src}" 952 src=${DISTDIR}/${src}
1047 elif [ -e "${PWD}/${src}" ] 953 elif [[ -e ${PWD}/${src} ]] ; then
1048 then
1049 src="${PWD}/${src}" 954 src=${PWD}/${src}
1050 elif [ -e "${src}" ] 955 elif [[ -e ${src} ]] ; then
1051 then
1052 src="${src}" 956 src=${src}
1053 fi
1054 fi 957 fi
1055 [ ! -e "${src}" ] && die "Could not find requested archive ${src}" 958 fi
959 [[ ! -e ${src} ]] && return 1
1056 echo "${src}" 960 echo "${src}"
1057} 961}
1058 962
1059# Unpack those pesky pdv generated files ... 963# Unpack those pesky pdv generated files ...
1060# They're self-unpacking programs with the binary package stuffed in 964# They're self-unpacking programs with the binary package stuffed in
1075# lseek 979# lseek
1076# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 980# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
1077# lseek(3, -4, SEEK_END) = 2981250 981# lseek(3, -4, SEEK_END) = 2981250
1078# thus we would pass in the value of '4' as the second parameter. 982# thus we would pass in the value of '4' as the second parameter.
1079unpack_pdv() { 983unpack_pdv() {
1080 local src="`find_unpackable_file $1`" 984 local src=$(find_unpackable_file $1)
1081 local sizeoff_t="$2" 985 local sizeoff_t=$2
1082 986
987 [[ -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 :(" 988 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :("
1084 989
1085 local shrtsrc="`basename ${src}`" 990 local shrtsrc="`basename ${src}`"
1086 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 991 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1087 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 992 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\"` 993 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] 1059# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1155# - If the file is not specified then unpack will utilize ${A}. 1060# - If the file is not specified then unpack will utilize ${A}.
1156# - If the offset is not specified then we will attempt to extract 1061# - If the offset is not specified then we will attempt to extract
1157# the proper offset from the script itself. 1062# the proper offset from the script itself.
1158unpack_makeself() { 1063unpack_makeself() {
1159 local src="$(find_unpackable_file "$1")" 1064 local src=$(find_unpackable_file "$1")
1160 local skip="$2" 1065 local skip=$2
1161 local exe="$3" 1066 local exe=$3
1162 1067
1068 [[ -z ${src} ]] && die "Could not locate source for '$1'"
1069
1163 local shrtsrc="$(basename "${src}")" 1070 local shrtsrc=$(basename "${src}")
1164 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1071 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1165 if [ -z "${skip}" ] 1072 if [ -z "${skip}" ]
1166 then 1073 then
1167 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1074 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`"
1168 local skip=0 1075 local skip=0
1239check_license() { 1146check_license() {
1240 local lic=$1 1147 local lic=$1
1241 if [ -z "${lic}" ] ; then 1148 if [ -z "${lic}" ] ; then
1242 lic="${PORTDIR}/licenses/${LICENSE}" 1149 lic="${PORTDIR}/licenses/${LICENSE}"
1243 else 1150 else
1244 if [ -e "${PORTDIR}/licenses/${src}" ] ; then 1151 if [ -e "${PORTDIR}/licenses/${lic}" ] ; then
1245 lic="${PORTDIR}/licenses/${src}" 1152 lic="${PORTDIR}/licenses/${lic}"
1246 elif [ -e "${PWD}/${src}" ] ; then 1153 elif [ -e "${PWD}/${lic}" ] ; then
1247 lic="${PWD}/${src}" 1154 lic="${PWD}/${lic}"
1248 elif [ -e "${src}" ] ; then 1155 elif [ -e "${lic}" ] ; then
1249 lic="${src}" 1156 lic="${lic}"
1250 fi
1251 fi 1157 fi
1158 fi
1252 [ ! -f "${lic}" ] && die "Could not find requested license ${src}" 1159 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1253 local l="`basename ${lic}`" 1160 local l="`basename ${lic}`"
1254 1161
1255 # here is where we check for the licenses the user already 1162 # 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 1163 # accepted ... if we don't find a match, we make the user accept
1257 local shopts=$- 1164 local shopts=$-
1428# displayed and we'll hang out here until: 1335# displayed and we'll hang out here until:
1429# (1) the file is found on a mounted cdrom 1336# (1) the file is found on a mounted cdrom
1430# (2) the user hits CTRL+C 1337# (2) the user hits CTRL+C
1431cdrom_locate_file_on_cd() { 1338cdrom_locate_file_on_cd() {
1432 while [[ -z ${CDROM_ROOT} ]] ; do 1339 while [[ -z ${CDROM_ROOT} ]] ; do
1433 local dir="$(dirname ${@})" 1340 local dir=$(dirname "$*")
1434 local file="$(basename ${@})" 1341 local file=$(basename "$*")
1435 local mline="" 1342 local mline=""
1436 local showedmsg=0 1343 local showedmsg=0
1437 1344
1438 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do 1345 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do
1439 [[ -d ${mline}/${dir} ]] || continue 1346 [[ -d ${mline}/${dir} ]] || continue
1440 [[ ! -z $(find ${mline}/${dir} -iname ${file} -maxdepth 1) ]] \ 1347 [[ ! -z $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] \
1441 && export CDROM_ROOT=${mline} 1348 && export CDROM_ROOT=${mline}
1442 done 1349 done
1443 1350
1444 if [[ -z ${CDROM_ROOT} ]] ; then 1351 if [[ -z ${CDROM_ROOT} ]] ; then
1445 echo 1352 echo
1460 fi 1367 fi
1461 showedmsg=1 1368 showedmsg=1
1462 fi 1369 fi
1463 einfo "Press return to scan for the cd again" 1370 einfo "Press return to scan for the cd again"
1464 einfo "or hit CTRL+C to abort the emerge." 1371 einfo "or hit CTRL+C to abort the emerge."
1372 echo
1373 einfo "If you are having trouble with the detection"
1374 einfo "of your CD, it is possible that you do not have"
1375 einfo "Joliet support enabled in your kernel. Please"
1376 einfo "check that CONFIG_JOLIET is enabled in your kernel."
1465 read 1377 read
1466 fi 1378 fi
1467 done 1379 done
1468} 1380}
1469 1381
1513 else 1425 else
1514 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1426 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA"
1515 fi 1427 fi
1516 done 1428 done
1517 if [[ -z ${newls} ]] ; then 1429 if [[ -z ${newls} ]] ; then
1518 unset LINGUAS 1430 export LINGUAS=""
1519 else 1431 else
1520 export LINGUAS=${newls:1} 1432 export LINGUAS=${newls:1}
1521 fi 1433 fi
1522} 1434}
1523 1435
1533 while ((i--)) ; do 1445 while ((i--)) ; do
1534 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass" 1446 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1535 done 1447 done
1536 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}" 1448 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1537 case ${ARCH} in 1449 case ${ARCH} in
1538 x86) export ARCH="i386";; 1450 x86) export ARCH="i386";;
1539 amd64) export ARCH="x86_64";; 1451 amd64) export ARCH="x86_64";;
1540 hppa) export ARCH="parisc";; 1452 hppa) export ARCH="parisc";;
1541 mips) export ARCH="mips";; 1453 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! 1454 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}";; 1455 *) export ARCH="${ARCH}";;
1544 esac 1456 esac
1545} 1457}
1546 1458
1547# set's ARCH back to what portage expects 1459# set's ARCH back to what portage expects
1548set_arch_to_portage() { 1460set_arch_to_portage() {
1592 LIB=$1 1504 LIB=$1
1593 1505
1594 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1506 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1595 SONAME=`basename ${LIB}` 1507 SONAME=`basename ${LIB}`
1596 1508
1597 einfo "An old version of an installed library was detected on your system." 1509 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" 1510 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," 1511 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:" 1512 ewarn "you will need to execute the following command:"
1601 einfo " revdep-rebuild --soname ${SONAME}" 1513 ewarn " revdep-rebuild --soname ${SONAME}"
1602 einfo 1514 ewarn
1603 einfo "After doing that, you can safely remove ${LIB}" 1515 ewarn "After doing that, you can safely remove ${LIB}"
1604 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild" 1516 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1605 fi 1517 fi
1606} 1518}
1607 1519
1608# Hack for people to figure out if a package was built with 1520# Hack for people to figure out if a package was built with
1609# certain USE flags 1521# certain USE flags
1655dopamd() { 1567dopamd() {
1656 [[ -z $1 ]] && die "dopamd requires at least one argument" 1568 [[ -z $1 ]] && die "dopamd requires at least one argument"
1657 1569
1658 use pam || return 0 1570 use pam || return 0
1659 1571
1660 insinto /etc/pam.d 1572 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 $@" 1573 doins "$@" || die "failed to install $@"
1664} 1574}
1665# newpamd <old name> <new name> 1575# newpamd <old name> <new name>
1666# 1576#
1667# Install pam file <old name> as <new name> in /etc/pam.d 1577# Install pam file <old name> as <new name> in /etc/pam.d
1668newpamd() { 1578newpamd() {
1669 [[ $# -ne 2 ]] && die "newpamd requires two arguements" 1579 [[ $# -ne 2 ]] && die "newpamd requires two arguements"
1670 1580
1671 use pam || return 0 1581 use pam || return 0
1672 1582
1673 insinto /etc/pam.d 1583 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" 1584 newins "$1" "$2" || die "failed to install $1 as $2"
1677} 1585}
1586
1587# make a wrapper script ...
1588# NOTE: this was originally games_make_wrapper, but I noticed other places where
1589# this could be used, so I have moved it here and made it not games-specific
1590# -- wolf31o2
1591# $1 == wrapper name
1592# $2 == binary to run
1593# $3 == directory to chdir before running binary
1594# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1595# $5 == path for wrapper
1596make_wrapper() {
1597 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1598 local tmpwrapper=$(emktemp)
1599 # We don't want to quote ${bin} so that people can pass complex
1600 # things as $bin ... "./someprog --args"
1601 cat << EOF > "${tmpwrapper}"
1602#!/bin/sh
1603cd "${chdir:-.}"
1604if [ "\${LD_LIBRARY_PATH+set}" = "set" ] && [ -n "${libdir}" ] ; then
1605 export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1606fi
1607exec ${bin} "\$@"
1608EOF
1609 chmod go+rx "${tmpwrapper}"
1610 if [[ -n ${path} ]] ; then
1611 exeinto "${path}"
1612 newexe "${tmpwrapper}" "${wrapper}"
1613 else
1614 newbin "${tmpwrapper}" "${wrapper}"
1615 fi
1616}

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

  ViewVC Help
Powered by ViewVC 1.1.20