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

Diff of /eclass/eutils.eclass

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

Revision 1.164 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.164 2005/03/30 14:12:25 wolf31o2 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.
112 dodir /usr/${libdir} 67 dodir /usr/${libdir}
113 68
114 for lib in "${@}" ; do 69 for lib in "${@}" ; do
115 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT 70 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT
116 /* GNU ld script 71 /* GNU ld script
117 Since Gentoo has critical dynamic libraries 72 Since Gentoo has critical dynamic libraries
118 in /lib, and the static versions in /usr/lib, 73 in /lib, and the static versions in /usr/lib,
119 we need to have a "fake" dynamic lib in /usr/lib, 74 we need to have a "fake" dynamic lib in /usr/lib,
120 otherwise we run into linking problems. 75 otherwise we run into linking problems.
121 76
122 See bug http://bugs.gentoo.org/4411 for more info. 77 See bug http://bugs.gentoo.org/4411 for more info.
123 */ 78 */
124 GROUP ( /${libdir}/${lib} ) 79 GROUP ( /${libdir}/${lib} )
125 END_LDSCRIPT 80 END_LDSCRIPT
126 fperms a+x "/usr/${libdir}/${lib}" 81 fperms a+x "/usr/${libdir}/${lib}"
127 done 82 done
128} 83}
129 84
130# 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()
131# 87#
132# <azarah@gentoo.org> (11 Nov 2002) 88# <azarah@gentoo.org> (11 Nov 2002)
133# 89#
134draw_line() { 90draw_line() {
135 local i=0 91 local i=0
161EPATCH_SOURCE="${WORKDIR}/patch" 117EPATCH_SOURCE="${WORKDIR}/patch"
162# Default extension for patches 118# Default extension for patches
163EPATCH_SUFFIX="patch.bz2" 119EPATCH_SUFFIX="patch.bz2"
164# Default options for patch 120# Default options for patch
165# 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
166EPATCH_OPTS="-g0" 122# Set --no-backup-if-mismatch so we don't leave '.orig' files behind.
123EPATCH_OPTS="-g0 --no-backup-if-mismatch"
167# 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,
168# and not the full path .. 125# and not the full path ..
169EPATCH_EXCLUDE="" 126EPATCH_EXCLUDE=""
170# Change the printed message for a single patch. 127# Change the printed message for a single patch.
171EPATCH_SINGLE_MSG="" 128EPATCH_SINGLE_MSG=""
129# Change the printed message for multiple patches.
130EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..."
172# Force applying bulk patches even if not following the style: 131# Force applying bulk patches even if not following the style:
173# 132#
174# ??_${ARCH}_foo.${EPATCH_SUFFIX} 133# ??_${ARCH}_foo.${EPATCH_SUFFIX}
175# 134#
176EPATCH_FORCE="no" 135EPATCH_FORCE="no"
214 local PATCH_TARGET="${T}/$$.patch" 173 local PATCH_TARGET="${T}/$$.patch"
215 local PATCH_SUFFIX="" 174 local PATCH_SUFFIX=""
216 local SINGLE_PATCH="no" 175 local SINGLE_PATCH="no"
217 local x="" 176 local x=""
218 177
178 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402
179
219 if [ "$#" -gt 1 ] 180 if [ "$#" -gt 1 ]
220 then 181 then
221 local m="" 182 local m=""
222 einfo "${#} patches to apply ..."
223 for m in "$@" ; do 183 for m in "$@" ; do
224 epatch "${m}" 184 epatch "${m}"
225 done 185 done
226 return 0 186 return 0
227 fi 187 fi
281 ;; 241 ;;
282 esac 242 esac
283 243
284 if [ "${SINGLE_PATCH}" = "no" ] 244 if [ "${SINGLE_PATCH}" = "no" ]
285 then 245 then
286 einfo "Applying various patches (bugfixes/updates) ..." 246 einfo "${EPATCH_MULTI_MSG}"
287 fi 247 fi
288 for x in ${EPATCH_SOURCE} 248 for x in ${EPATCH_SOURCE}
289 do 249 do
290 # New ARCH dependant patch naming scheme ... 250 # New ARCH dependant patch naming scheme ...
291 # 251 #
292 # ???_arch_foo.patch 252 # ???_arch_foo.patch
293 # 253 #
294 if [ -f ${x} ] && \ 254 if [ -f ${x} ] && \
295 ([ "${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}" ] || \
296 [ "${EPATCH_FORCE}" = "yes" ]) 256 [ "${EPATCH_FORCE}" = "yes" ])
297 then 257 then
298 local count=0 258 local count=0
299 local popts="${EPATCH_OPTS}" 259 local popts="${EPATCH_OPTS}"
300 local patchname=${x##*/} 260 local patchname=${x##*/}
410 then 370 then
411 einfo "Done with patching" 371 einfo "Done with patching"
412 fi 372 fi
413} 373}
414 374
415# This function return true if we are using the NPTL pthreads
416# implementation.
417#
418# <azarah@gentoo.org> (06 March 2003)
419#
420have_NPTL() {
421 cat > ${T}/test-nptl.c <<-"END"
422 #define _XOPEN_SOURCE
423 #include <unistd.h>
424 #include <stdio.h>
425
426 int main()
427 {
428 char buf[255];
429 char *str = buf;
430
431 confstr(_CS_GNU_LIBPTHREAD_VERSION, str, 255);
432 if (NULL != str) {
433 printf("%s\n", str);
434 if (NULL != strstr(str, "NPTL"))
435 return 0;
436 }
437
438 return 1;
439 }
440 END
441
442 einfon "Checking for _CS_GNU_LIBPTHREAD_VERSION support in glibc ..."
443 if gcc -o ${T}/nptl ${T}/test-nptl.c &> /dev/null
444 then
445 echo "yes"
446 einfon "Checking what PTHREADS implementation we have ..."
447 if ${T}/nptl
448 then
449 return 0
450 else
451 return 1
452 fi
453 else
454 echo "no"
455 fi
456
457 return 1
458}
459
460# This function check how many cpu's are present, and then set
461# -j in MAKEOPTS accordingly.
462#
463# Thanks to nall <nall@gentoo.org> for this.
464#
465get_number_of_jobs() {
466 local jobs=0
467
468 if [ ! -r /proc/cpuinfo ]
469 then
470 return 1
471 fi
472
473 # This bit is from H?kan Wessberg <nacka-gentoo@refug.org>, bug #13565.
474 if [ "`egrep "^[[:space:]]*MAKEOPTS=" /etc/make.conf | wc -l`" -gt 0 ]
475 then
476 ADMINOPTS="`egrep "^[[:space:]]*MAKEOPTS=" /etc/make.conf | cut -d= -f2 | sed 's/\"//g'`"
477 ADMINPARAM="`echo ${ADMINOPTS} | gawk '{match($0, /-j *[0-9]*/, opt); print opt[0]}'`"
478 ADMINPARAM="${ADMINPARAM/-j}"
479 fi
480
481 export MAKEOPTS="`echo ${MAKEOPTS} | sed -e 's:-j *[0-9]*::g'`"
482
483 if [ "${ARCH}" = "amd64" -o "${ARCH}" = "x86" -o "${ARCH}" = "hppa" -o \
484 "${ARCH}" = "arm" -o "${ARCH}" = "mips" -o "${ARCH}" = "ia64" ]
485 then
486 # these archs will always have "[Pp]rocessor"
487 jobs="$((`grep -c ^[Pp]rocessor /proc/cpuinfo` * 2))"
488
489 elif [ "${ARCH}" = "sparc" -o "${ARCH}" = "sparc64" ]
490 then
491 # sparc always has "ncpus active"
492 jobs="$((`grep "^ncpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
493
494 elif [ "${ARCH}" = "alpha" ]
495 then
496 # alpha has "cpus active", but only when compiled with SMP
497 if [ "`grep -c "^cpus active" /proc/cpuinfo`" -eq 1 ]
498 then
499 jobs="$((`grep "^cpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
500 else
501 jobs=2
502 fi
503
504 elif [ "${ARCH}" = "ppc" -o "${ARCH}" = "ppc64" ]
505 then
506 # ppc has "processor", but only when compiled with SMP
507 if [ "`grep -c "^processor" /proc/cpuinfo`" -eq 1 ]
508 then
509 jobs="$((`grep -c ^processor /proc/cpuinfo` * 2))"
510 else
511 jobs=2
512 fi
513 elif [ "${ARCH}" = "s390" ]
514 then
515 # s390 has "# processors : "
516 jobs="$((`grep "^\# processors" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
517 else
518 jobs="$((`grep -c ^cpu /proc/cpuinfo` * 2))"
519 die "Unknown ARCH -- ${ARCH}!"
520 fi
521
522 # Make sure the number is valid ...
523 if [ "${jobs}" -lt 1 ]
524 then
525 jobs=1
526 fi
527
528 if [ -n "${ADMINPARAM}" ]
529 then
530 if [ "${jobs}" -gt "${ADMINPARAM}" ]
531 then
532 einfo "Setting make jobs to \"-j${ADMINPARAM}\" to ensure successful merge ..."
533 export MAKEOPTS="${MAKEOPTS} -j${ADMINPARAM}"
534 else
535 einfo "Setting make jobs to \"-j${jobs}\" to ensure successful merge ..."
536 export MAKEOPTS="${MAKEOPTS} -j${jobs}"
537 fi
538 fi
539}
540
541# Cheap replacement for when debianutils (and thus mktemp) 375# Cheap replacement for when debianutils (and thus mktemp)
542# does not exist on the users system 376# does not exist on the users system
543# vapier@gentoo.org 377# vapier@gentoo.org
544# 378#
545# Takes just 1 optional parameter (the directory to create tmpfile in) 379# Takes just 1 optional parameter (the directory to create tmpfile in)
546emktemp() { 380emktemp() {
547 local exe="touch" 381 local exe="touch"
548 [ "$1" == "-d" ] && exe="mkdir" && shift 382 [[ $1 == -d ]] && exe="mkdir" && shift
549 local topdir="$1" 383 local topdir=$1
550 384
551 if [ -z "${topdir}" ] 385 if [[ -z ${topdir} ]] ; then
552 then
553 [ -z "${T}" ] \ 386 [[ -z ${T} ]] \
554 && topdir="/tmp" \ 387 && topdir="/tmp" \
555 || topdir="${T}" 388 || topdir=${T}
556 fi 389 fi
557 390
558 if [ -z "$(type -p mktemp)" ] 391 if [[ -z $(type -p mktemp) ]] ; then
559 then
560 local tmp=/ 392 local tmp=/
561 while [ -e "${tmp}" ] ; do 393 while [[ -e ${tmp} ]] ; do
562 tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}" 394 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}
563 done 395 done
564 ${exe} "${tmp}" 396 ${exe} "${tmp}" || ${exe} -p "${tmp}"
565 echo "${tmp}" 397 echo "${tmp}"
566 else 398 else
567 [ "${exe}" == "touch" ] \ 399 [[ ${exe} == "touch" ]] \
568 && exe="-p" \ 400 && exe="-p" \
569 || exe="-d" 401 || exe="-d"
570 mktemp ${exe} "${topdir}" 402 mktemp ${exe} "${topdir}"
571 fi 403 fi
572} 404}
576# Joe Jezak <josejx@gmail.com> and usata@gentoo.org 408# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
577# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org> 409# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
578# 410#
579# egetent(database, key) 411# egetent(database, key)
580egetent() { 412egetent() {
581 if useq ppc-macos ; then 413 if [[ "${USERLAND}" == "Darwin" ]] ; then
582 case "$2" in 414 case "$2" in
583 *[!0-9]*) # Non numeric 415 *[!0-9]*) # Non numeric
584 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 416 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
585 ;; 417 ;;
586 *) # Numeric 418 *) # Numeric
587 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 419 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
588 ;; 420 ;;
589 esac 421 esac
590 elif useq x86-fbsd ; then 422 elif [[ "${USERLAND}" == "BSD" ]] ; then
591 local action 423 local opts action="user"
592 if [ "$1" == "passwd" ] 424 [[ $1 == "passwd" ]] || action="group"
593 then 425
594 action="user" 426 # lookup by uid/gid
595 else 427 if [[ $2 == [[:digit:]]* ]] ; then
596 action="group" 428 [[ ${action} == "user" ]] && opts="-u" || opts="-g"
597 fi 429 fi
430
598 pw show "${action}" "$2" -q 431 pw show ${action} ${opts} "$2" -q
599 else 432 else
600 which nscd >& /dev/null && nscd -i "$1" 433 which nscd >& /dev/null && nscd -i "$1"
601 getent "$1" "$2" 434 getent "$1" "$2"
602 fi 435 fi
603} 436}
615# homedir: /dev/null 448# homedir: /dev/null
616# groups: none 449# groups: none
617# extra: comment of 'added by portage for ${PN}' 450# extra: comment of 'added by portage for ${PN}'
618enewuser() { 451enewuser() {
619 # get the username 452 # get the username
620 local euser="$1"; shift 453 local euser=$1; shift
621 if [ -z "${euser}" ] 454 if [[ -z ${euser} ]] ; then
622 then
623 eerror "No username specified !" 455 eerror "No username specified !"
624 die "Cannot call enewuser without a username" 456 die "Cannot call enewuser without a username"
625 fi 457 fi
626 458
627 # lets see if the username already exists 459 # lets see if the username already exists
628 if [ "${euser}" == "`egetent passwd \"${euser}\" | cut -d: -f1`" ] 460 if [[ ${euser} == $(egetent passwd "${euser}" | cut -d: -f1) ]] ; then
629 then
630 return 0 461 return 0
631 fi 462 fi
632 einfo "Adding user '${euser}' to your system ..." 463 einfo "Adding user '${euser}' to your system ..."
633 464
634 # options to pass to useradd 465 # options to pass to useradd
635 local opts= 466 local opts=
636 467
637 # handle uid 468 # handle uid
638 local euid="$1"; shift 469 local euid=$1; shift
639 if [ ! -z "${euid}" ] && [ "${euid}" != "-1" ] 470 if [[ ! -z ${euid} ]] && [[ ${euid} != "-1" ]] ; then
640 then
641 if [ "${euid}" -gt 0 ] 471 if [[ ${euid} -gt 0 ]] ; then
642 then
643 if [ ! -z "`egetent passwd ${euid}`" ] 472 if [[ ! -z $(egetent passwd ${euid}) ]] ; then
644 then
645 euid="next" 473 euid="next"
646 fi 474 fi
647 else 475 else
648 eerror "Userid given but is not greater than 0 !" 476 eerror "Userid given but is not greater than 0 !"
649 die "${euid} is not a valid UID" 477 die "${euid} is not a valid UID"
650 fi 478 fi
651 else 479 else
652 euid="next" 480 euid="next"
653 fi 481 fi
654 if [ "${euid}" == "next" ] 482 if [[ ${euid} == "next" ]] ; then
655 then 483 for euid in $(seq 101 999) ; do
656 local pwrange
657 if [ "${USERLAND}" == "BSD" ] ; then
658 pwrange="`jot 898 101`"
659 else
660 pwrange="`seq 101 999`"
661 fi
662 for euid in ${pwrange} ; do
663 [ -z "`egetent passwd ${euid}`" ] && break 484 [[ -z $(egetent passwd ${euid}) ]] && break
664 done 485 done
665 fi 486 fi
666 opts="${opts} -u ${euid}" 487 opts="${opts} -u ${euid}"
667 einfo " - Userid: ${euid}" 488 einfo " - Userid: ${euid}"
668 489
669 # handle shell 490 # handle shell
670 local eshell="$1"; shift 491 local eshell=$1; shift
671 if [ ! -z "${eshell}" ] && [ "${eshell}" != "-1" ] 492 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
672 then
673 if [ ! -e "${eshell}" ] 493 if [[ ! -e ${eshell} ]] ; then
674 then
675 eerror "A shell was specified but it does not exist !" 494 eerror "A shell was specified but it does not exist !"
676 die "${eshell} does not exist" 495 die "${eshell} does not exist"
677 fi 496 fi
678 else 497 else
679 if [ "${USERLAND}" == "BSD" ] 498 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do
680 then 499 [[ -x ${ROOT}${shell} ]] && break
681 eshell="/usr/bin/false" 500 done
682 else 501
683 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"
684 fi 505 fi
506
507 eshell=${shell}
685 fi 508 fi
686 einfo " - Shell: ${eshell}" 509 einfo " - Shell: ${eshell}"
687 opts="${opts} -s ${eshell}" 510 opts="${opts} -s ${eshell}"
688 511
689 # handle homedir 512 # handle homedir
690 local ehome="$1"; shift 513 local ehome=$1; shift
691 if [ -z "${ehome}" ] && [ "${eshell}" != "-1" ] 514 if [[ -z ${ehome} ]] || [[ ${ehome} == "-1" ]] ; then
692 then
693 ehome="/dev/null" 515 ehome="/dev/null"
694 fi 516 fi
695 einfo " - Home: ${ehome}" 517 einfo " - Home: ${ehome}"
696 opts="${opts} -d ${ehome}" 518 opts="${opts} -d ${ehome}"
697 519
698 # handle groups 520 # handle groups
699 local egroups="$1"; shift 521 local egroups=$1; shift
700 if [ ! -z "${egroups}" ] 522 if [[ ! -z ${egroups} ]] ; then
701 then
702 local oldifs="${IFS}" 523 local oldifs=${IFS}
703 local defgroup="" exgroups="" 524 local defgroup="" exgroups=""
704 525
705 export IFS="," 526 export IFS=","
706 for g in ${egroups} 527 for g in ${egroups} ; do
707 do
708 export IFS="${oldifs}" 528 export IFS=${oldifs}
709 if [ -z "`egetent group \"${g}\"`" ] 529 if [[ -z $(egetent group "${g}") ]] ; then
710 then
711 eerror "You must add group ${g} to the system first" 530 eerror "You must add group ${g} to the system first"
712 die "${g} is not a valid GID" 531 die "${g} is not a valid GID"
713 fi 532 fi
714 if [ -z "${defgroup}" ] 533 if [[ -z ${defgroup} ]] ; then
715 then
716 defgroup="${g}" 534 defgroup=${g}
717 else 535 else
718 exgroups="${exgroups},${g}" 536 exgroups="${exgroups},${g}"
719 fi 537 fi
720 export IFS="," 538 export IFS=","
721 done 539 done
722 export IFS="${oldifs}" 540 export IFS=${oldifs}
723 541
724 opts="${opts} -g ${defgroup}" 542 opts="${opts} -g ${defgroup}"
725 if [ ! -z "${exgroups}" ] 543 if [[ ! -z ${exgroups} ]] ; then
726 then
727 opts="${opts} -G ${exgroups:1}" 544 opts="${opts} -G ${exgroups:1}"
728 fi 545 fi
729 else 546 else
730 egroups="(none)" 547 egroups="(none)"
731 fi 548 fi
732 einfo " - Groups: ${egroups}" 549 einfo " - Groups: ${egroups}"
733 550
734 # handle extra and add the user 551 # handle extra and add the user
735 local eextra="$@"
736 local oldsandbox="${SANDBOX_ON}" 552 local oldsandbox=${SANDBOX_ON}
737 export SANDBOX_ON="0" 553 export SANDBOX_ON="0"
738 if useq ppc-macos 554 case ${USERLAND} in
739 then 555 Darwin)
740 ### Make the user 556 ### Make the user
741 if [ -z "${eextra}" ] 557 if [[ -z $@ ]] ; then
742 then
743 dscl . create /users/${euser} uid ${euid} 558 dscl . create /users/${euser} uid ${euid}
744 dscl . create /users/${euser} shell ${eshell} 559 dscl . create /users/${euser} shell ${eshell}
745 dscl . create /users/${euser} home ${ehome} 560 dscl . create /users/${euser} home ${ehome}
746 dscl . create /users/${euser} realname "added by portage for ${PN}" 561 dscl . create /users/${euser} realname "added by portage for ${PN}"
747 ### Add the user to the groups specified 562 ### Add the user to the groups specified
748 local oldifs="${IFS}" 563 local oldifs=${IFS}
749 export IFS="," 564 export IFS=","
750 for g in ${egroups} 565 for g in ${egroups} ; do
751 do
752 dscl . merge /groups/${g} users ${euser} 566 dscl . merge /groups/${g} users ${euser}
753 done 567 done
754 export IFS="${oldifs}" 568 export IFS=${oldifs}
755 else 569 else
756 einfo "Extra options are not supported on macos yet" 570 einfo "Extra options are not supported on Darwin yet"
757 einfo "Please report the ebuild along with the info below" 571 einfo "Please report the ebuild along with the info below"
758 einfo "eextra: ${eextra}" 572 einfo "eextra: $@"
759 die "Required function missing" 573 die "Required function missing"
760 fi 574 fi
761 elif use x86-fbsd ; then 575 ;;
762 if [ -z "${eextra}" ] 576 BSD)
763 then 577 if [[ -z $@ ]] ; then
764 pw useradd ${euser} ${opts} \ 578 pw useradd ${euser} ${opts} \
765 -c "added by portage for ${PN}" \ 579 -c "added by portage for ${PN}" \
766 die "enewuser failed" 580 die "enewuser failed"
767 else 581 else
768 einfo " - Extra: ${eextra}" 582 einfo " - Extra: $@"
769 pw useradd ${euser} ${opts} \ 583 pw useradd ${euser} ${opts} \
770 -c ${eextra} || die "enewuser failed" 584 "$@" || die "enewuser failed"
771 fi 585 fi
772 else 586 ;;
773 if [ -z "${eextra}" ] 587 *)
774 then 588 if [[ -z $@ ]] ; then
775 useradd ${opts} ${euser} \ 589 useradd ${opts} ${euser} \
776 -c "added by portage for ${PN}" \ 590 -c "added by portage for ${PN}" \
777 || die "enewuser failed" 591 || die "enewuser failed"
778 else 592 else
779 einfo " - Extra: ${eextra}" 593 einfo " - Extra: $@"
780 useradd ${opts} ${euser} ${eextra} \ 594 useradd ${opts} ${euser} "$@" \
781 || die "enewuser failed" 595 || die "enewuser failed"
782 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}"
783 fi 605 fi
606
784 export SANDBOX_ON="${oldsandbox}" 607 export SANDBOX_ON=${oldsandbox}
785
786 if [ ! -e "${ehome}" ] && [ ! -e "${D}/${ehome}" ]
787 then
788 einfo " - Creating ${ehome} in ${D}"
789 dodir ${ehome}
790 fowners ${euser} ${ehome}
791 fperms 755 ${ehome}
792 fi
793} 608}
794 609
795# Simplify/standardize adding groups to the system 610# Simplify/standardize adding groups to the system
796# vapier@gentoo.org 611# vapier@gentoo.org
797# 612#
826 then 641 then
827 if [ "${egid}" -gt 0 ] 642 if [ "${egid}" -gt 0 ]
828 then 643 then
829 if [ -z "`egetent group ${egid}`" ] 644 if [ -z "`egetent group ${egid}`" ]
830 then 645 then
831 if useq ppc-macos ; then 646 if [[ "${USERLAND}" == "Darwin" ]]; then
832 opts="${opts} ${egid}" 647 opts="${opts} ${egid}"
833 else 648 else
834 opts="${opts} -g ${egid}" 649 opts="${opts} -g ${egid}"
835 fi 650 fi
836 else 651 else
850 opts="${opts} ${eextra}" 665 opts="${opts} ${eextra}"
851 666
852 # add the group 667 # add the group
853 local oldsandbox="${SANDBOX_ON}" 668 local oldsandbox="${SANDBOX_ON}"
854 export SANDBOX_ON="0" 669 export SANDBOX_ON="0"
855 if useq ppc-macos ; then 670 if [[ "${USERLAND}" == "Darwin" ]]; then
856 if [ ! -z "${eextra}" ]; 671 if [ ! -z "${eextra}" ];
857 then 672 then
858 einfo "Extra options are not supported on macos yet" 673 einfo "Extra options are not supported on Darwin/OS X yet"
859 einfo "Please report the ebuild along with the info below" 674 einfo "Please report the ebuild along with the info below"
860 einfo "eextra: ${eextra}" 675 einfo "eextra: ${eextra}"
861 die "Required function missing" 676 die "Required function missing"
862 fi 677 fi
863 678
864 # If we need the next available 679 # If we need the next available
865 case ${egid} in 680 case ${egid} in
866 *[!0-9]*) # Non numeric 681 *[!0-9]*) # Non numeric
867 for egid in `jot 898 101`; do 682 for egid in $(seq 101 999); do
868 [ -z "`egetent group ${egid}`" ] && break 683 [ -z "`egetent group ${egid}`" ] && break
869 done 684 done
870 esac 685 esac
871 dscl . create /groups/${egroup} gid ${egid} 686 dscl . create /groups/${egroup} gid ${egid}
872 dscl . create /groups/${egroup} passwd '*' 687 dscl . create /groups/${egroup} passwd '*'
873 elif use x86-fbsd ; then 688 elif [[ "${USERLAND}" == "BSD" ]] ; then
874 case ${egid} in 689 case ${egid} in
875 *[!0-9]*) # Non numeric 690 *[!0-9]*) # Non numeric
876 for egid in `jot 898 101`; do 691 for egid in $(seq 101 999); do
877 [ -z "`egetent group ${egid}`" ] && break 692 [ -z "`egetent group ${egid}`" ] && break
878 done 693 done
879 esac 694 esac
880 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 695 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
881 else 696 else
913# name: the name that will show up in the menu 728# name: the name that will show up in the menu
914# icon: give your little like a pretty little icon ... 729# icon: give your little like a pretty little icon ...
915# this can be relative (to /usr/share/pixmaps) or 730# this can be relative (to /usr/share/pixmaps) or
916# a full path to an icon 731# a full path to an icon
917# type: what kind of application is this ? for categories: 732# type: what kind of application is this ? for categories:
918# http://www.freedesktop.org/wiki/Standards_2fmenu_2dspec 733# http://www.freedesktop.org/Standards/desktop-entry-spec
919# path: if your app needs to startup in a specific dir 734# path: if your app needs to startup in a specific dir
920make_desktop_entry() { 735make_desktop_entry() {
921 [[ -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
922 737
923 local exec=${1} 738 local exec=${1}
949 dev) 764 dev)
950 type="Development" 765 type="Development"
951 ;; 766 ;;
952 767
953 games) 768 games)
954 [[ -z ${path} ]] && path=${GAMES_BINDIR}
955
956 case ${catmin} in 769 case ${catmin} in
957 action) type=ActionGame;; 770 action) type=ActionGame;;
958 arcade) type=ArcadeGame;; 771 arcade) type=ArcadeGame;;
959 board) type=BoardGame;; 772 board) type=BoardGame;;
960 kid) type=KidsGame;; 773 kid) type=KidsGame;;
1025 *) 838 *)
1026 type= 839 type=
1027 ;; 840 ;;
1028 esac 841 esac
1029 fi 842 fi
1030 843 if [ "${SLOT}" == "0" ] ; then
844 local desktop_name="${PN}"
845 else
846 local desktop_name="${PN}-${SLOT}"
847 fi
1031 local desktop=${T}/${exec%% *}-${P}.desktop 848 local desktop=${T}/${exec%% *}-${desktop_name}.desktop
1032 849
1033echo "[Desktop Entry] 850echo "[Desktop Entry]
1034Encoding=UTF-8 851Encoding=UTF-8
1035Version=0.9.2 852Version=0.9.2
1036Name=${name} 853Name=${name}
1039Exec=${exec} 856Exec=${exec}
1040Path=${path} 857Path=${path}
1041Icon=${icon} 858Icon=${icon}
1042Categories=Application;${type};" > "${desktop}" 859Categories=Application;${type};" > "${desktop}"
1043 860
861 (
862 # wrap the env here so that the 'insinto' call
863 # doesn't corrupt the env of the caller
1044 insinto /usr/share/applications 864 insinto /usr/share/applications
1045 doins "${desktop}" 865 doins "${desktop}"
1046 866 )
1047 return 0
1048} 867}
1049 868
1050# Make a GDM/KDM Session file 869# Make a GDM/KDM Session file
1051# 870#
1052# make_desktop_entry(<title>, <command>) 871# make_desktop_entry(<title>, <command>)
1053# title: File to execute to start the Window Manager 872# title: File to execute to start the Window Manager
1054# command: Name of the Window Manager 873# command: Name of the Window Manager
1055 874
1056make_session_desktop() { 875make_session_desktop() {
1057
1058 [ -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
1059 [ -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
1060 878
1061 local title="${1}" 879 local title=$1
1062 local command="${2}" 880 local command=$2
1063 local desktop="${T}/${wm}.desktop" 881 local desktop=${T}/${wm}.desktop
1064 882
1065echo "[Desktop Entry] 883echo "[Desktop Entry]
1066Encoding=UTF-8 884Encoding=UTF-8
1067Name=${title} 885Name=${title}
1068Comment=This session logs you into ${title} 886Comment=This session logs you into ${title}
1070TryExec=${command} 888TryExec=${command}
1071Type=Application" > "${desktop}" 889Type=Application" > "${desktop}"
1072 890
1073 insinto /usr/share/xsessions 891 insinto /usr/share/xsessions
1074 doins "${desktop}" 892 doins "${desktop}"
1075
1076 return 0
1077} 893}
1078 894
1079domenu() { 895domenu() {
1080 local i 896 local i j
1081 local j
1082 insinto /usr/share/applications 897 insinto /usr/share/applications
1083 for i in ${@} 898 for i in "$@" ; do
1084 do
1085 if [ -f "${i}" ]; 899 if [[ -f ${i} ]] ; then
1086 then
1087 doins ${i} 900 doins "${i}"
1088 elif [ -d "${i}" ]; 901 elif [[ -d ${i} ]] ; then
1089 then
1090 for j in ${i}/*.desktop 902 for j in "${i}"/*.desktop ; do
1091 do
1092 doins ${j} 903 doins "${j}"
1093 done 904 done
1094 fi 905 fi
1095 done 906 done
1096} 907}
908newmenu() {
909 insinto /usr/share/applications
910 newins "$1" "$2"
911}
1097 912
1098doicon() { 913doicon() {
1099 local i 914 local i j
1100 local j
1101 insinto /usr/share/pixmaps 915 insinto /usr/share/pixmaps
1102 for i in ${@} 916 for i in "$@" ; do
1103 do
1104 if [ -f "${i}" ]; 917 if [[ -f ${i} ]] ; then
1105 then
1106 doins ${i} 918 doins "${i}"
1107 elif [ -d "${i}" ]; 919 elif [[ -d ${i} ]] ; then
1108 then
1109 for j in ${i}/*.png 920 for j in "${i}"/*.png ; do
1110 do
1111 doins ${j} 921 doins "${j}"
1112 done 922 done
1113 fi 923 fi
1114 done 924 done
925}
926newicon() {
927 insinto /usr/share/pixmaps
928 newins "$1" "$2"
1115} 929}
1116 930
1117############################################################## 931##############################################################
1118# END: Handle .desktop files and menu entries # 932# END: Handle .desktop files and menu entries #
1119############################################################## 933##############################################################
1120 934
1121 935
1122# for internal use only (unpack_pdv and unpack_makeself) 936# for internal use only (unpack_pdv and unpack_makeself)
1123find_unpackable_file() { 937find_unpackable_file() {
1124 local src="$1" 938 local src=$1
1125 if [ -z "${src}" ] 939 if [[ -z ${src} ]] ; then
1126 then
1127 src="${DISTDIR}/${A}" 940 src=${DISTDIR}/${A}
1128 else 941 else
1129 if [ -e "${DISTDIR}/${src}" ] 942 if [[ -e ${DISTDIR}/${src} ]] ; then
1130 then
1131 src="${DISTDIR}/${src}" 943 src=${DISTDIR}/${src}
1132 elif [ -e "${PWD}/${src}" ] 944 elif [[ -e ${PWD}/${src} ]] ; then
1133 then
1134 src="${PWD}/${src}" 945 src=${PWD}/${src}
1135 elif [ -e "${src}" ] 946 elif [[ -e ${src} ]] ; then
1136 then
1137 src="${src}" 947 src=${src}
1138 fi
1139 fi 948 fi
1140 [ ! -e "${src}" ] && die "Could not find requested archive ${src}" 949 fi
950 [[ ! -e ${src} ]] && return 1
1141 echo "${src}" 951 echo "${src}"
1142} 952}
1143 953
1144# Unpack those pesky pdv generated files ... 954# Unpack those pesky pdv generated files ...
1145# They're self-unpacking programs with the binary package stuffed in 955# They're self-unpacking programs with the binary package stuffed in
1160# lseek 970# lseek
1161# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 971# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
1162# lseek(3, -4, SEEK_END) = 2981250 972# lseek(3, -4, SEEK_END) = 2981250
1163# 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.
1164unpack_pdv() { 974unpack_pdv() {
1165 local src="`find_unpackable_file $1`" 975 local src=$(find_unpackable_file $1)
1166 local sizeoff_t="$2" 976 local sizeoff_t=$2
1167 977
978 [[ -z ${src} ]] && die "Could not locate source for '$1'"
1168 [ -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 :("
1169 980
1170 local shrtsrc="`basename ${src}`" 981 local shrtsrc="`basename ${src}`"
1171 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 982 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1172 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 983 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"`
1173 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\"`
1239# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1050# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1240# - If the file is not specified then unpack will utilize ${A}. 1051# - If the file is not specified then unpack will utilize ${A}.
1241# - 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
1242# the proper offset from the script itself. 1053# the proper offset from the script itself.
1243unpack_makeself() { 1054unpack_makeself() {
1244 local src="$(find_unpackable_file "$1")" 1055 local src=$(find_unpackable_file "$1")
1245 local skip="$2" 1056 local skip=$2
1246 local exe="$3" 1057 local exe=$3
1247 1058
1059 [[ -z ${src} ]] && die "Could not locate source for '$1'"
1060
1248 local shrtsrc="$(basename "${src}")" 1061 local shrtsrc=$(basename "${src}")
1249 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1062 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1250 if [ -z "${skip}" ] 1063 if [ -z "${skip}" ]
1251 then 1064 then
1252 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1065 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`"
1253 local skip=0 1066 local skip=0
1324check_license() { 1137check_license() {
1325 local lic=$1 1138 local lic=$1
1326 if [ -z "${lic}" ] ; then 1139 if [ -z "${lic}" ] ; then
1327 lic="${PORTDIR}/licenses/${LICENSE}" 1140 lic="${PORTDIR}/licenses/${LICENSE}"
1328 else 1141 else
1329 if [ -e "${PORTDIR}/licenses/${src}" ] ; then 1142 if [ -e "${PORTDIR}/licenses/${lic}" ] ; then
1330 lic="${PORTDIR}/licenses/${src}" 1143 lic="${PORTDIR}/licenses/${lic}"
1331 elif [ -e "${PWD}/${src}" ] ; then 1144 elif [ -e "${PWD}/${lic}" ] ; then
1332 lic="${PWD}/${src}" 1145 lic="${PWD}/${lic}"
1333 elif [ -e "${src}" ] ; then 1146 elif [ -e "${lic}" ] ; then
1334 lic="${src}" 1147 lic="${lic}"
1335 fi
1336 fi 1148 fi
1149 fi
1337 [ ! -f "${lic}" ] && die "Could not find requested license ${src}" 1150 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1338 local l="`basename ${lic}`" 1151 local l="`basename ${lic}`"
1339 1152
1340 # here is where we check for the licenses the user already 1153 # here is where we check for the licenses the user already
1341 # 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
1342 local shopts=$- 1155 local shopts=$-
1513# displayed and we'll hang out here until: 1326# displayed and we'll hang out here until:
1514# (1) the file is found on a mounted cdrom 1327# (1) the file is found on a mounted cdrom
1515# (2) the user hits CTRL+C 1328# (2) the user hits CTRL+C
1516cdrom_locate_file_on_cd() { 1329cdrom_locate_file_on_cd() {
1517 while [[ -z ${CDROM_ROOT} ]] ; do 1330 while [[ -z ${CDROM_ROOT} ]] ; do
1518 local dir="$(dirname ${@})" 1331 local dir=$(dirname "$*")
1519 local file="$(basename ${@})" 1332 local file=$(basename "$*")
1520 local mline="" 1333 local mline=""
1521 local showedmsg=0 1334 local showedmsg=0
1522 1335
1523 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
1524 [[ -d ${mline}/${dir} ]] || continue 1337 [[ -d ${mline}/${dir} ]] || continue
1525 [[ ! -z $(find ${mline}/${dir} -iname ${file} -maxdepth 1) ]] \ 1338 [[ ! -z $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] \
1526 && export CDROM_ROOT=${mline} 1339 && export CDROM_ROOT=${mline}
1527 done 1340 done
1528 1341
1529 if [[ -z ${CDROM_ROOT} ]] ; then 1342 if [[ -z ${CDROM_ROOT} ]] ; then
1530 echo 1343 echo
1545 fi 1358 fi
1546 showedmsg=1 1359 showedmsg=1
1547 fi 1360 fi
1548 einfo "Press return to scan for the cd again" 1361 einfo "Press return to scan for the cd again"
1549 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."
1550 read 1368 read
1551 fi 1369 fi
1552 done 1370 done
1553} 1371}
1554 1372
1598 else 1416 else
1599 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1417 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA"
1600 fi 1418 fi
1601 done 1419 done
1602 if [[ -z ${newls} ]] ; then 1420 if [[ -z ${newls} ]] ; then
1603 unset LINGUAS 1421 export LINGUAS=""
1604 else 1422 else
1605 export LINGUAS=${newls:1} 1423 export LINGUAS=${newls:1}
1606 fi 1424 fi
1607} 1425}
1608 1426
1618 while ((i--)) ; do 1436 while ((i--)) ; do
1619 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass" 1437 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1620 done 1438 done
1621 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}" 1439 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1622 case ${ARCH} in 1440 case ${ARCH} in
1623 x86) export ARCH="i386";; 1441 x86) export ARCH="i386";;
1624 amd64) export ARCH="x86_64";; 1442 amd64) export ARCH="x86_64";;
1625 hppa) export ARCH="parisc";; 1443 hppa) export ARCH="parisc";;
1626 mips) export ARCH="mips";; 1444 mips) export ARCH="mips";;
1627 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!
1628 *) export ARCH="${ARCH}";; 1446 *) export ARCH="${ARCH}";;
1629 esac 1447 esac
1630} 1448}
1631 1449
1632# set's ARCH back to what portage expects 1450# set's ARCH back to what portage expects
1633set_arch_to_portage() { 1451set_arch_to_portage() {
1677 LIB=$1 1495 LIB=$1
1678 1496
1679 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1497 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1680 SONAME=`basename ${LIB}` 1498 SONAME=`basename ${LIB}`
1681 1499
1682 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."
1683 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"
1684 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,"
1685 einfo "you will need to execute the following command:" 1503 ewarn "you will need to execute the following command:"
1686 einfo " revdep-rebuild --soname ${SONAME}" 1504 ewarn " revdep-rebuild --soname ${SONAME}"
1687 einfo 1505 ewarn
1688 einfo "After doing that, you can safely remove ${LIB}" 1506 ewarn "After doing that, you can safely remove ${LIB}"
1689 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild" 1507 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1690 fi 1508 fi
1691} 1509}
1692 1510
1693# 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
1694# certain USE flags 1512# certain USE flags
1740dopamd() { 1558dopamd() {
1741 [[ -z $1 ]] && die "dopamd requires at least one argument" 1559 [[ -z $1 ]] && die "dopamd requires at least one argument"
1742 1560
1743 use pam || return 0 1561 use pam || return 0
1744 1562
1745 insinto /etc/pam.d 1563 INSDESTTREE=/etc/pam.d \
1746 doins "$@" || die "failed to install $@" 1564 doins "$@" || die "failed to install $@"
1747} 1565}
1748# newpamd <old name> <new name> 1566# newpamd <old name> <new name>
1749# 1567#
1750# 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
1751newpamd() { 1569newpamd() {
1752 [[ $# -ne 2 ]] && die "newpamd requires two arguements" 1570 [[ $# -ne 2 ]] && die "newpamd requires two arguements"
1753 1571
1754 use pam || return 0 1572 use pam || return 0
1755 1573
1756 insinto /etc/pam.d 1574 INSDESTTREE=/etc/pam.d \
1757 newins "$1" "$2" || die "failed to install $1 as $2" 1575 newins "$1" "$2" || die "failed to install $1 as $2"
1758} 1576}
1759 1577
1760# make a wrapper script ... 1578# make a wrapper script ...
1761# NOTE: this was originally games_make_wrapper, but I noticed other places where 1579# NOTE: this was originally games_make_wrapper, but I noticed other places where
1767# $4 == extra LD_LIBRARY_PATH's (make it : delimited) 1585# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1768# $5 == path for wrapper 1586# $5 == path for wrapper
1769make_wrapper() { 1587make_wrapper() {
1770 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5 1588 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1771 local tmpwrapper=$(emktemp) 1589 local tmpwrapper=$(emktemp)
1590 # We don't want to quote ${bin} so that people can pass complex
1591 # things as $bin ... "./someprog --args"
1772 cat << EOF > "${tmpwrapper}" 1592 cat << EOF > "${tmpwrapper}"
1773#!/bin/sh 1593#!/bin/sh
1774cd "${chdir}" 1594cd "${chdir:-.}"
1595if [ "\${LD_LIBRARY_PATH+set}" = "set" ] && [ -n "${libdir}" ] ; then
1775export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}" 1596 export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1597fi
1776exec ${bin} "\$@" 1598exec ${bin} "\$@"
1777EOF 1599EOF
1778 chmod go+rx "${tmpwrapper}" 1600 chmod go+rx "${tmpwrapper}"
1779 if [ -n "${5}" ] 1601 if [[ -n ${path} ]] ; then
1780 then
1781 exeinto ${5} 1602 exeinto "${path}"
1782 newexe "${tmpwrapper}" "${wrapper}" 1603 newexe "${tmpwrapper}" "${wrapper}"
1783 else 1604 else
1784 newbin "${tmpwrapper}" "${wrapper}" 1605 newbin "${tmpwrapper}" "${wrapper}"
1785 fi 1606 fi
1786} 1607}

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

  ViewVC Help
Powered by ViewVC 1.1.20