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

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

  ViewVC Help
Powered by ViewVC 1.1.20