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

Diff of /eclass/eutils.eclass

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

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

Legend:
Removed from v.1.161  
changed lines
  Added in v.1.200

  ViewVC Help
Powered by ViewVC 1.1.20