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

Diff of /eclass/eutils.eclass

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

Revision 1.159 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.159 2005/03/18 22:50:26 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
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##*/}
407 then 370 then
408 einfo "Done with patching" 371 einfo "Done with patching"
409 fi 372 fi
410} 373}
411 374
412# This function return true if we are using the NPTL pthreads
413# implementation.
414#
415# <azarah@gentoo.org> (06 March 2003)
416#
417have_NPTL() {
418 cat > ${T}/test-nptl.c <<-"END"
419 #define _XOPEN_SOURCE
420 #include <unistd.h>
421 #include <stdio.h>
422
423 int main()
424 {
425 char buf[255];
426 char *str = buf;
427
428 confstr(_CS_GNU_LIBPTHREAD_VERSION, str, 255);
429 if (NULL != str) {
430 printf("%s\n", str);
431 if (NULL != strstr(str, "NPTL"))
432 return 0;
433 }
434
435 return 1;
436 }
437 END
438
439 einfon "Checking for _CS_GNU_LIBPTHREAD_VERSION support in glibc ..."
440 if gcc -o ${T}/nptl ${T}/test-nptl.c &> /dev/null
441 then
442 echo "yes"
443 einfon "Checking what PTHREADS implementation we have ..."
444 if ${T}/nptl
445 then
446 return 0
447 else
448 return 1
449 fi
450 else
451 echo "no"
452 fi
453
454 return 1
455}
456
457# This function check how many cpu's are present, and then set
458# -j in MAKEOPTS accordingly.
459#
460# Thanks to nall <nall@gentoo.org> for this.
461#
462get_number_of_jobs() {
463 local jobs=0
464
465 if [ ! -r /proc/cpuinfo ]
466 then
467 return 1
468 fi
469
470 # This bit is from H?kan Wessberg <nacka-gentoo@refug.org>, bug #13565.
471 if [ "`egrep "^[[:space:]]*MAKEOPTS=" /etc/make.conf | wc -l`" -gt 0 ]
472 then
473 ADMINOPTS="`egrep "^[[:space:]]*MAKEOPTS=" /etc/make.conf | cut -d= -f2 | sed 's/\"//g'`"
474 ADMINPARAM="`echo ${ADMINOPTS} | gawk '{match($0, /-j *[0-9]*/, opt); print opt[0]}'`"
475 ADMINPARAM="${ADMINPARAM/-j}"
476 fi
477
478 export MAKEOPTS="`echo ${MAKEOPTS} | sed -e 's:-j *[0-9]*::g'`"
479
480 if [ "${ARCH}" = "amd64" -o "${ARCH}" = "x86" -o "${ARCH}" = "hppa" -o \
481 "${ARCH}" = "arm" -o "${ARCH}" = "mips" -o "${ARCH}" = "ia64" ]
482 then
483 # these archs will always have "[Pp]rocessor"
484 jobs="$((`grep -c ^[Pp]rocessor /proc/cpuinfo` * 2))"
485
486 elif [ "${ARCH}" = "sparc" -o "${ARCH}" = "sparc64" ]
487 then
488 # sparc always has "ncpus active"
489 jobs="$((`grep "^ncpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
490
491 elif [ "${ARCH}" = "alpha" ]
492 then
493 # alpha has "cpus active", but only when compiled with SMP
494 if [ "`grep -c "^cpus active" /proc/cpuinfo`" -eq 1 ]
495 then
496 jobs="$((`grep "^cpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
497 else
498 jobs=2
499 fi
500
501 elif [ "${ARCH}" = "ppc" -o "${ARCH}" = "ppc64" ]
502 then
503 # ppc has "processor", but only when compiled with SMP
504 if [ "`grep -c "^processor" /proc/cpuinfo`" -eq 1 ]
505 then
506 jobs="$((`grep -c ^processor /proc/cpuinfo` * 2))"
507 else
508 jobs=2
509 fi
510 elif [ "${ARCH}" = "s390" ]
511 then
512 # s390 has "# processors : "
513 jobs="$((`grep "^\# processors" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
514 else
515 jobs="$((`grep -c ^cpu /proc/cpuinfo` * 2))"
516 die "Unknown ARCH -- ${ARCH}!"
517 fi
518
519 # Make sure the number is valid ...
520 if [ "${jobs}" -lt 1 ]
521 then
522 jobs=1
523 fi
524
525 if [ -n "${ADMINPARAM}" ]
526 then
527 if [ "${jobs}" -gt "${ADMINPARAM}" ]
528 then
529 einfo "Setting make jobs to \"-j${ADMINPARAM}\" to ensure successful merge ..."
530 export MAKEOPTS="${MAKEOPTS} -j${ADMINPARAM}"
531 else
532 einfo "Setting make jobs to \"-j${jobs}\" to ensure successful merge ..."
533 export MAKEOPTS="${MAKEOPTS} -j${jobs}"
534 fi
535 fi
536}
537
538# Cheap replacement for when debianutils (and thus mktemp) 375# Cheap replacement for when debianutils (and thus mktemp)
539# does not exist on the users system 376# does not exist on the users system
540# vapier@gentoo.org 377# vapier@gentoo.org
541# 378#
542# Takes just 1 optional parameter (the directory to create tmpfile in) 379# Takes just 1 optional parameter (the directory to create tmpfile in)
543emktemp() { 380emktemp() {
544 local exe="touch" 381 local exe="touch"
545 [ "$1" == "-d" ] && exe="mkdir" && shift 382 [[ $1 == -d ]] && exe="mkdir" && shift
546 local topdir="$1" 383 local topdir=$1
547 384
548 if [ -z "${topdir}" ] 385 if [[ -z ${topdir} ]] ; then
549 then
550 [ -z "${T}" ] \ 386 [[ -z ${T} ]] \
551 && topdir="/tmp" \ 387 && topdir="/tmp" \
552 || topdir="${T}" 388 || topdir=${T}
553 fi 389 fi
554 390
555 if [ -z "$(type -p mktemp)" ] 391 if [[ -z $(type -p mktemp) ]] ; then
556 then
557 local tmp=/ 392 local tmp=/
558 while [ -e "${tmp}" ] ; do 393 while [[ -e ${tmp} ]] ; do
559 tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}" 394 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}
560 done 395 done
561 ${exe} "${tmp}" 396 ${exe} "${tmp}" || ${exe} -p "${tmp}"
562 echo "${tmp}" 397 echo "${tmp}"
563 else 398 else
564 [ "${exe}" == "touch" ] \ 399 [[ ${exe} == "touch" ]] \
565 && exe="-p" \ 400 && exe="-p" \
566 || exe="-d" 401 || exe="-d"
567 mktemp ${exe} "${topdir}" 402 mktemp ${exe} "${topdir}"
568 fi 403 fi
569} 404}
573# Joe Jezak <josejx@gmail.com> and usata@gentoo.org 408# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
574# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org> 409# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
575# 410#
576# egetent(database, key) 411# egetent(database, key)
577egetent() { 412egetent() {
578 if useq ppc-macos ; then 413 if [[ "${USERLAND}" == "Darwin" ]] ; then
579 case "$2" in 414 case "$2" in
580 *[!0-9]*) # Non numeric 415 *[!0-9]*) # Non numeric
581 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 416 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
582 ;; 417 ;;
583 *) # Numeric 418 *) # Numeric
584 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 419 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
585 ;; 420 ;;
586 esac 421 esac
587 elif useq x86-fbsd ; then 422 elif [[ "${USERLAND}" == "BSD" ]] ; then
588 local action 423 local action
589 if [ "$1" == "passwd" ] 424 if [ "$1" == "passwd" ]
590 then 425 then
591 action="user" 426 action="user"
592 else 427 else
612# homedir: /dev/null 447# homedir: /dev/null
613# groups: none 448# groups: none
614# extra: comment of 'added by portage for ${PN}' 449# extra: comment of 'added by portage for ${PN}'
615enewuser() { 450enewuser() {
616 # get the username 451 # get the username
617 local euser="$1"; shift 452 local euser=$1; shift
618 if [ -z "${euser}" ] 453 if [[ -z ${euser} ]] ; then
619 then
620 eerror "No username specified !" 454 eerror "No username specified !"
621 die "Cannot call enewuser without a username" 455 die "Cannot call enewuser without a username"
622 fi 456 fi
623 457
624 # lets see if the username already exists 458 # lets see if the username already exists
625 if [ "${euser}" == "`egetent passwd \"${euser}\" | cut -d: -f1`" ] 459 if [[ ${euser} == $(egetent passwd "${euser}" | cut -d: -f1) ]] ; then
626 then
627 return 0 460 return 0
628 fi 461 fi
629 einfo "Adding user '${euser}' to your system ..." 462 einfo "Adding user '${euser}' to your system ..."
630 463
631 # options to pass to useradd 464 # options to pass to useradd
632 local opts= 465 local opts=
633 466
634 # handle uid 467 # handle uid
635 local euid="$1"; shift 468 local euid=$1; shift
636 if [ ! -z "${euid}" ] && [ "${euid}" != "-1" ] 469 if [[ ! -z ${euid} ]] && [[ ${euid} != "-1" ]] ; then
637 then
638 if [ "${euid}" -gt 0 ] 470 if [[ ${euid} -gt 0 ]] ; then
639 then
640 if [ ! -z "`egetent passwd ${euid}`" ] 471 if [[ ! -z $(egetent passwd ${euid}) ]] ; then
641 then
642 euid="next" 472 euid="next"
643 fi 473 fi
644 else 474 else
645 eerror "Userid given but is not greater than 0 !" 475 eerror "Userid given but is not greater than 0 !"
646 die "${euid} is not a valid UID" 476 die "${euid} is not a valid UID"
647 fi 477 fi
648 else 478 else
649 euid="next" 479 euid="next"
650 fi 480 fi
651 if [ "${euid}" == "next" ] 481 if [[ ${euid} == "next" ]] ; then
652 then 482 for euid in $(seq 101 999) ; do
653 local pwrange
654 if [ "${USERLAND}" == "BSD" ] ; then
655 pwrange="`jot 898 101`"
656 else
657 pwrange="`seq 101 999`"
658 fi
659 for euid in ${pwrange} ; do
660 [ -z "`egetent passwd ${euid}`" ] && break 483 [[ -z $(egetent passwd ${euid}) ]] && break
661 done 484 done
662 fi 485 fi
663 opts="${opts} -u ${euid}" 486 opts="${opts} -u ${euid}"
664 einfo " - Userid: ${euid}" 487 einfo " - Userid: ${euid}"
665 488
666 # handle shell 489 # handle shell
667 local eshell="$1"; shift 490 local eshell=$1; shift
668 if [ ! -z "${eshell}" ] && [ "${eshell}" != "-1" ] 491 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
669 then
670 if [ ! -e "${eshell}" ] 492 if [[ ! -e ${eshell} ]] ; then
671 then
672 eerror "A shell was specified but it does not exist !" 493 eerror "A shell was specified but it does not exist !"
673 die "${eshell} does not exist" 494 die "${eshell} does not exist"
674 fi 495 fi
675 else 496 else
676 if [ "${USERLAND}" == "BSD" ] 497 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null; do
677 then 498 [[ -x ${ROOT}${shell} ]] && break;
678 eshell="/usr/bin/false" 499 done
679 else 500
680 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"
681 fi 504 fi
505
506 eshell=${shell}
682 fi 507 fi
683 einfo " - Shell: ${eshell}" 508 einfo " - Shell: ${eshell}"
684 opts="${opts} -s ${eshell}" 509 opts="${opts} -s ${eshell}"
685 510
686 # handle homedir 511 # handle homedir
687 local ehome="$1"; shift 512 local ehome=$1; shift
688 if [ -z "${ehome}" ] && [ "${eshell}" != "-1" ] 513 if [[ -z ${ehome} ]] || [[ ${ehome} == "-1" ]] ; then
689 then
690 ehome="/dev/null" 514 ehome="/dev/null"
691 fi 515 fi
692 einfo " - Home: ${ehome}" 516 einfo " - Home: ${ehome}"
693 opts="${opts} -d ${ehome}" 517 opts="${opts} -d ${ehome}"
694 518
695 # handle groups 519 # handle groups
696 local egroups="$1"; shift 520 local egroups=$1; shift
697 if [ ! -z "${egroups}" ] 521 if [[ ! -z ${egroups} ]] ; then
698 then
699 local oldifs="${IFS}" 522 local oldifs=${IFS}
700 local defgroup="" exgroups="" 523 local defgroup="" exgroups=""
701 524
702 export IFS="," 525 export IFS=","
703 for g in ${egroups} 526 for g in ${egroups} ; do
704 do
705 export IFS="${oldifs}" 527 export IFS=${oldifs}
706 if [ -z "`egetent group \"${g}\"`" ] 528 if [[ -z $(egetent group "${g}") ]] ; then
707 then
708 eerror "You must add group ${g} to the system first" 529 eerror "You must add group ${g} to the system first"
709 die "${g} is not a valid GID" 530 die "${g} is not a valid GID"
710 fi 531 fi
711 if [ -z "${defgroup}" ] 532 if [[ -z ${defgroup} ]] ; then
712 then
713 defgroup="${g}" 533 defgroup=${g}
714 else 534 else
715 exgroups="${exgroups},${g}" 535 exgroups="${exgroups},${g}"
716 fi 536 fi
717 export IFS="," 537 export IFS=","
718 done 538 done
719 export IFS="${oldifs}" 539 export IFS=${oldifs}
720 540
721 opts="${opts} -g ${defgroup}" 541 opts="${opts} -g ${defgroup}"
722 if [ ! -z "${exgroups}" ] 542 if [[ ! -z ${exgroups} ]] ; then
723 then
724 opts="${opts} -G ${exgroups:1}" 543 opts="${opts} -G ${exgroups:1}"
725 fi 544 fi
726 else 545 else
727 egroups="(none)" 546 egroups="(none)"
728 fi 547 fi
729 einfo " - Groups: ${egroups}" 548 einfo " - Groups: ${egroups}"
730 549
731 # handle extra and add the user 550 # handle extra and add the user
732 local eextra="$@"
733 local oldsandbox="${SANDBOX_ON}" 551 local oldsandbox=${SANDBOX_ON}
734 export SANDBOX_ON="0" 552 export SANDBOX_ON="0"
735 if useq ppc-macos 553 case ${USERLAND} in
736 then 554 Darwin)
737 ### Make the user 555 ### Make the user
738 if [ -z "${eextra}" ] 556 if [[ -z $@ ]] ; then
739 then
740 dscl . create /users/${euser} uid ${euid} 557 dscl . create /users/${euser} uid ${euid}
741 dscl . create /users/${euser} shell ${eshell} 558 dscl . create /users/${euser} shell ${eshell}
742 dscl . create /users/${euser} home ${ehome} 559 dscl . create /users/${euser} home ${ehome}
743 dscl . create /users/${euser} realname "added by portage for ${PN}" 560 dscl . create /users/${euser} realname "added by portage for ${PN}"
744 ### Add the user to the groups specified 561 ### Add the user to the groups specified
745 local oldifs="${IFS}" 562 local oldifs=${IFS}
746 export IFS="," 563 export IFS=","
747 for g in ${egroups} 564 for g in ${egroups} ; do
748 do
749 dscl . merge /groups/${g} users ${euser} 565 dscl . merge /groups/${g} users ${euser}
750 done 566 done
751 export IFS="${oldifs}" 567 export IFS=${oldifs}
752 else 568 else
753 einfo "Extra options are not supported on macos yet" 569 einfo "Extra options are not supported on Darwin yet"
754 einfo "Please report the ebuild along with the info below" 570 einfo "Please report the ebuild along with the info below"
755 einfo "eextra: ${eextra}" 571 einfo "eextra: $@"
756 die "Required function missing" 572 die "Required function missing"
757 fi 573 fi
758 elif use x86-fbsd ; then 574 ;;
759 if [ -z "${eextra}" ] 575 BSD)
760 then 576 if [[ -z $@ ]] ; then
761 pw useradd ${euser} ${opts} \ 577 pw useradd ${euser} ${opts} \
762 -c "added by portage for ${PN}" \ 578 -c "added by portage for ${PN}" \
763 die "enewuser failed" 579 die "enewuser failed"
764 else 580 else
765 einfo " - Extra: ${eextra}" 581 einfo " - Extra: $@"
766 pw useradd ${euser} ${opts} \ 582 pw useradd ${euser} ${opts} \
767 -c ${eextra} || die "enewuser failed" 583 "$@" || die "enewuser failed"
768 fi 584 fi
769 else 585 ;;
770 if [ -z "${eextra}" ] 586 *)
771 then 587 if [[ -z $@ ]] ; then
772 useradd ${opts} ${euser} \ 588 useradd ${opts} ${euser} \
773 -c "added by portage for ${PN}" \ 589 -c "added by portage for ${PN}" \
774 || die "enewuser failed" 590 || die "enewuser failed"
775 else 591 else
776 einfo " - Extra: ${eextra}" 592 einfo " - Extra: $@"
777 useradd ${opts} ${euser} ${eextra} \ 593 useradd ${opts} ${euser} "$@" \
778 || die "enewuser failed" 594 || die "enewuser failed"
779 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}"
780 fi 604 fi
605
781 export SANDBOX_ON="${oldsandbox}" 606 export SANDBOX_ON=${oldsandbox}
782
783 if [ ! -e "${ehome}" ] && [ ! -e "${D}/${ehome}" ]
784 then
785 einfo " - Creating ${ehome} in ${D}"
786 dodir ${ehome}
787 fowners ${euser} ${ehome}
788 fperms 755 ${ehome}
789 fi
790} 607}
791 608
792# Simplify/standardize adding groups to the system 609# Simplify/standardize adding groups to the system
793# vapier@gentoo.org 610# vapier@gentoo.org
794# 611#
823 then 640 then
824 if [ "${egid}" -gt 0 ] 641 if [ "${egid}" -gt 0 ]
825 then 642 then
826 if [ -z "`egetent group ${egid}`" ] 643 if [ -z "`egetent group ${egid}`" ]
827 then 644 then
828 if useq ppc-macos ; then 645 if [[ "${USERLAND}" == "Darwin" ]]; then
829 opts="${opts} ${egid}" 646 opts="${opts} ${egid}"
830 else 647 else
831 opts="${opts} -g ${egid}" 648 opts="${opts} -g ${egid}"
832 fi 649 fi
833 else 650 else
847 opts="${opts} ${eextra}" 664 opts="${opts} ${eextra}"
848 665
849 # add the group 666 # add the group
850 local oldsandbox="${SANDBOX_ON}" 667 local oldsandbox="${SANDBOX_ON}"
851 export SANDBOX_ON="0" 668 export SANDBOX_ON="0"
852 if useq ppc-macos ; then 669 if [[ "${USERLAND}" == "Darwin" ]]; then
853 if [ ! -z "${eextra}" ]; 670 if [ ! -z "${eextra}" ];
854 then 671 then
855 einfo "Extra options are not supported on macos yet" 672 einfo "Extra options are not supported on Darwin/OS X yet"
856 einfo "Please report the ebuild along with the info below" 673 einfo "Please report the ebuild along with the info below"
857 einfo "eextra: ${eextra}" 674 einfo "eextra: ${eextra}"
858 die "Required function missing" 675 die "Required function missing"
859 fi 676 fi
860 677
861 # If we need the next available 678 # If we need the next available
862 case ${egid} in 679 case ${egid} in
863 *[!0-9]*) # Non numeric 680 *[!0-9]*) # Non numeric
864 for egid in `jot 898 101`; do 681 for egid in $(seq 101 999); do
865 [ -z "`egetent group ${egid}`" ] && break 682 [ -z "`egetent group ${egid}`" ] && break
866 done 683 done
867 esac 684 esac
868 dscl . create /groups/${egroup} gid ${egid} 685 dscl . create /groups/${egroup} gid ${egid}
869 dscl . create /groups/${egroup} passwd '*' 686 dscl . create /groups/${egroup} passwd '*'
870 elif use x86-fbsd ; then 687 elif [[ "${USERLAND}" == "BSD" ]] ; then
871 case ${egid} in 688 case ${egid} in
872 *[!0-9]*) # Non numeric 689 *[!0-9]*) # Non numeric
873 for egid in `jot 898 101`; do 690 for egid in $(seq 101 999); do
874 [ -z "`egetent group ${egid}`" ] && break 691 [ -z "`egetent group ${egid}`" ] && break
875 done 692 done
876 esac 693 esac
877 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 694 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
878 else 695 else
910# name: the name that will show up in the menu 727# name: the name that will show up in the menu
911# icon: give your little like a pretty little icon ... 728# icon: give your little like a pretty little icon ...
912# this can be relative (to /usr/share/pixmaps) or 729# this can be relative (to /usr/share/pixmaps) or
913# a full path to an icon 730# a full path to an icon
914# type: what kind of application is this ? for categories: 731# type: what kind of application is this ? for categories:
915# http://www.freedesktop.org/wiki/Standards_2fmenu_2dspec 732# http://www.freedesktop.org/Standards/desktop-entry-spec
916# path: if your app needs to startup in a specific dir 733# path: if your app needs to startup in a specific dir
917make_desktop_entry() { 734make_desktop_entry() {
918 [[ -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
919 736
920 local exec=${1} 737 local exec=${1}
946 dev) 763 dev)
947 type="Development" 764 type="Development"
948 ;; 765 ;;
949 766
950 games) 767 games)
951 [[ -z ${path} ]] && path=${GAMES_BINDIR}
952
953 case ${catmin} in 768 case ${catmin} in
954 action) type=ActionGame;; 769 action) type=ActionGame;;
955 arcade) type=ArcadeGame;; 770 arcade) type=ArcadeGame;;
956 board) type=BoardGame;; 771 board) type=BoardGame;;
957 kid) type=KidsGame;; 772 kid) type=KidsGame;;
1022 *) 837 *)
1023 type= 838 type=
1024 ;; 839 ;;
1025 esac 840 esac
1026 fi 841 fi
1027 842 if [ "${SLOT}" == "0" ] ; then
843 local desktop_name="${PN}"
844 else
845 local desktop_name="${PN}-${SLOT}"
846 fi
1028 local desktop=${T}/${exec%% *}-${P}.desktop 847 local desktop=${T}/${exec%% *}-${desktop_name}.desktop
1029 848
1030echo "[Desktop Entry] 849echo "[Desktop Entry]
1031Encoding=UTF-8 850Encoding=UTF-8
1032Version=0.9.2 851Version=0.9.2
1033Name=${name} 852Name=${name}
1049# make_desktop_entry(<title>, <command>) 868# make_desktop_entry(<title>, <command>)
1050# title: File to execute to start the Window Manager 869# title: File to execute to start the Window Manager
1051# command: Name of the Window Manager 870# command: Name of the Window Manager
1052 871
1053make_session_desktop() { 872make_session_desktop() {
1054
1055 [ -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
1056 [ -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
1057 875
1058 local title="${1}" 876 local title=$1
1059 local command="${2}" 877 local command=$2
1060 local desktop="${T}/${wm}.desktop" 878 local desktop=${T}/${wm}.desktop
1061 879
1062echo "[Desktop Entry] 880echo "[Desktop Entry]
1063Encoding=UTF-8 881Encoding=UTF-8
1064Name=${title} 882Name=${title}
1065Comment=This session logs you into ${title} 883Comment=This session logs you into ${title}
1067TryExec=${command} 885TryExec=${command}
1068Type=Application" > "${desktop}" 886Type=Application" > "${desktop}"
1069 887
1070 insinto /usr/share/xsessions 888 insinto /usr/share/xsessions
1071 doins "${desktop}" 889 doins "${desktop}"
1072
1073 return 0
1074} 890}
1075 891
1076domenu() { 892domenu() {
1077 local i 893 local i j
1078 local j
1079 insinto /usr/share/applications 894 insinto /usr/share/applications
1080 for i in ${@} 895 for i in "$@" ; do
1081 do
1082 if [ -f "${i}" ]; 896 if [[ -f ${i} ]] ; then
1083 then
1084 doins ${i} 897 doins "${i}"
1085 elif [ -d "${i}" ]; 898 elif [[ -d ${i} ]] ; then
1086 then
1087 for j in ${i}/*.desktop 899 for j in "${i}"/*.desktop ; do
1088 do
1089 doins ${j} 900 doins "${j}"
1090 done 901 done
1091 fi 902 fi
1092 done 903 done
1093} 904}
905newmenu() {
906 insinto /usr/share/applications
907 newins "$1" "$2"
908}
1094 909
1095doicon() { 910doicon() {
1096 local i 911 local i j
1097 local j
1098 insinto /usr/share/pixmaps 912 insinto /usr/share/pixmaps
1099 for i in ${@} 913 for i in "$@" ; do
1100 do
1101 if [ -f "${i}" ]; 914 if [[ -f ${i} ]] ; then
1102 then
1103 doins ${i} 915 doins "${i}"
1104 elif [ -d "${i}" ]; 916 elif [[ -d ${i} ]] ; then
1105 then
1106 for j in ${i}/*.png 917 for j in "${i}"/*.png ; do
1107 do
1108 doins ${j} 918 doins "${j}"
1109 done 919 done
1110 fi 920 fi
1111 done 921 done
922}
923newicon() {
924 insinto /usr/share/pixmaps
925 newins "$1" "$2"
1112} 926}
1113 927
1114############################################################## 928##############################################################
1115# END: Handle .desktop files and menu entries # 929# END: Handle .desktop files and menu entries #
1116############################################################## 930##############################################################
1117 931
1118 932
1119# for internal use only (unpack_pdv and unpack_makeself) 933# for internal use only (unpack_pdv and unpack_makeself)
1120find_unpackable_file() { 934find_unpackable_file() {
1121 local src="$1" 935 local src=$1
1122 if [ -z "${src}" ] 936 if [[ -z ${src} ]] ; then
1123 then
1124 src="${DISTDIR}/${A}" 937 src=${DISTDIR}/${A}
1125 else 938 else
1126 if [ -e "${DISTDIR}/${src}" ] 939 if [[ -e ${DISTDIR}/${src} ]] ; then
1127 then
1128 src="${DISTDIR}/${src}" 940 src=${DISTDIR}/${src}
1129 elif [ -e "${PWD}/${src}" ] 941 elif [[ -e ${PWD}/${src} ]] ; then
1130 then
1131 src="${PWD}/${src}" 942 src=${PWD}/${src}
1132 elif [ -e "${src}" ] 943 elif [[ -e ${src} ]] ; then
1133 then
1134 src="${src}" 944 src=${src}
1135 fi
1136 fi 945 fi
1137 [ ! -e "${src}" ] && die "Could not find requested archive ${src}" 946 fi
947 [[ ! -e ${src} ]] && return 1
1138 echo "${src}" 948 echo "${src}"
1139} 949}
1140 950
1141# Unpack those pesky pdv generated files ... 951# Unpack those pesky pdv generated files ...
1142# They're self-unpacking programs with the binary package stuffed in 952# They're self-unpacking programs with the binary package stuffed in
1157# lseek 967# lseek
1158# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 968# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
1159# lseek(3, -4, SEEK_END) = 2981250 969# lseek(3, -4, SEEK_END) = 2981250
1160# 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.
1161unpack_pdv() { 971unpack_pdv() {
1162 local src="`find_unpackable_file $1`" 972 local src=$(find_unpackable_file $1)
1163 local sizeoff_t="$2" 973 local sizeoff_t=$2
1164 974
975 [[ -z ${src} ]] && die "Could not locate source for '$1'"
1165 [ -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 :("
1166 977
1167 local shrtsrc="`basename ${src}`" 978 local shrtsrc="`basename ${src}`"
1168 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 979 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1169 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 980 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"`
1170 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\"`
1236# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1047# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1237# - If the file is not specified then unpack will utilize ${A}. 1048# - If the file is not specified then unpack will utilize ${A}.
1238# - 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
1239# the proper offset from the script itself. 1050# the proper offset from the script itself.
1240unpack_makeself() { 1051unpack_makeself() {
1241 local src="$(find_unpackable_file "$1")" 1052 local src=$(find_unpackable_file "$1")
1242 local skip="$2" 1053 local skip=$2
1243 local exe="$3" 1054 local exe=$3
1244 1055
1056 [[ -z ${src} ]] && die "Could not locate source for '$1'"
1057
1245 local shrtsrc="$(basename "${src}")" 1058 local shrtsrc=$(basename "${src}")
1246 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1059 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1247 if [ -z "${skip}" ] 1060 if [ -z "${skip}" ]
1248 then 1061 then
1249 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1062 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`"
1250 local skip=0 1063 local skip=0
1321check_license() { 1134check_license() {
1322 local lic=$1 1135 local lic=$1
1323 if [ -z "${lic}" ] ; then 1136 if [ -z "${lic}" ] ; then
1324 lic="${PORTDIR}/licenses/${LICENSE}" 1137 lic="${PORTDIR}/licenses/${LICENSE}"
1325 else 1138 else
1326 if [ -e "${PORTDIR}/licenses/${src}" ] ; then 1139 if [ -e "${PORTDIR}/licenses/${lic}" ] ; then
1327 lic="${PORTDIR}/licenses/${src}" 1140 lic="${PORTDIR}/licenses/${lic}"
1328 elif [ -e "${PWD}/${src}" ] ; then 1141 elif [ -e "${PWD}/${lic}" ] ; then
1329 lic="${PWD}/${src}" 1142 lic="${PWD}/${lic}"
1330 elif [ -e "${src}" ] ; then 1143 elif [ -e "${lic}" ] ; then
1331 lic="${src}" 1144 lic="${lic}"
1332 fi
1333 fi 1145 fi
1146 fi
1334 [ ! -f "${lic}" ] && die "Could not find requested license ${src}" 1147 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1335 local l="`basename ${lic}`" 1148 local l="`basename ${lic}`"
1336 1149
1337 # here is where we check for the licenses the user already 1150 # here is where we check for the licenses the user already
1338 # 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
1339 local shopts=$- 1152 local shopts=$-
1510# displayed and we'll hang out here until: 1323# displayed and we'll hang out here until:
1511# (1) the file is found on a mounted cdrom 1324# (1) the file is found on a mounted cdrom
1512# (2) the user hits CTRL+C 1325# (2) the user hits CTRL+C
1513cdrom_locate_file_on_cd() { 1326cdrom_locate_file_on_cd() {
1514 while [[ -z ${CDROM_ROOT} ]] ; do 1327 while [[ -z ${CDROM_ROOT} ]] ; do
1515 local dir="$(dirname ${@})" 1328 local dir=$(dirname "$*")
1516 local file="$(basename ${@})" 1329 local file=$(basename "$*")
1517 local mline="" 1330 local mline=""
1518 local showedmsg=0 1331 local showedmsg=0
1519 1332
1520 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
1521 [[ -d ${mline}/${dir} ]] || continue 1334 [[ -d ${mline}/${dir} ]] || continue
1522 [[ ! -z $(find ${mline}/${dir} -iname ${file} -maxdepth 1) ]] \ 1335 [[ ! -z $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] \
1523 && export CDROM_ROOT=${mline} 1336 && export CDROM_ROOT=${mline}
1524 done 1337 done
1525 1338
1526 if [[ -z ${CDROM_ROOT} ]] ; then 1339 if [[ -z ${CDROM_ROOT} ]] ; then
1527 echo 1340 echo
1542 fi 1355 fi
1543 showedmsg=1 1356 showedmsg=1
1544 fi 1357 fi
1545 einfo "Press return to scan for the cd again" 1358 einfo "Press return to scan for the cd again"
1546 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."
1547 read 1365 read
1548 fi 1366 fi
1549 done 1367 done
1550} 1368}
1551 1369
1595 else 1413 else
1596 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1414 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA"
1597 fi 1415 fi
1598 done 1416 done
1599 if [[ -z ${newls} ]] ; then 1417 if [[ -z ${newls} ]] ; then
1600 unset LINGUAS 1418 export LINGUAS=""
1601 else 1419 else
1602 export LINGUAS=${newls:1} 1420 export LINGUAS=${newls:1}
1603 fi 1421 fi
1604} 1422}
1605 1423
1615 while ((i--)) ; do 1433 while ((i--)) ; do
1616 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass" 1434 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1617 done 1435 done
1618 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}" 1436 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1619 case ${ARCH} in 1437 case ${ARCH} in
1620 x86) export ARCH="i386";; 1438 x86) export ARCH="i386";;
1621 amd64) export ARCH="x86_64";; 1439 amd64) export ARCH="x86_64";;
1622 hppa) export ARCH="parisc";; 1440 hppa) export ARCH="parisc";;
1623 mips) export ARCH="mips";; 1441 mips) export ARCH="mips";;
1624 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!
1625 *) export ARCH="${ARCH}";; 1443 *) export ARCH="${ARCH}";;
1626 esac 1444 esac
1627} 1445}
1628 1446
1629# set's ARCH back to what portage expects 1447# set's ARCH back to what portage expects
1630set_arch_to_portage() { 1448set_arch_to_portage() {
1674 LIB=$1 1492 LIB=$1
1675 1493
1676 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1494 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1677 SONAME=`basename ${LIB}` 1495 SONAME=`basename ${LIB}`
1678 1496
1679 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."
1680 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"
1681 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,"
1682 einfo "you will need to execute the following command:" 1500 ewarn "you will need to execute the following command:"
1683 einfo " revdep-rebuild --soname ${SONAME}" 1501 ewarn " revdep-rebuild --soname ${SONAME}"
1684 einfo 1502 ewarn
1685 einfo "After doing that, you can safely remove ${LIB}" 1503 ewarn "After doing that, you can safely remove ${LIB}"
1686 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild" 1504 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1687 fi 1505 fi
1688} 1506}
1689 1507
1690# 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
1691# certain USE flags 1509# certain USE flags
1737dopamd() { 1555dopamd() {
1738 [[ -z $1 ]] && die "dopamd requires at least one argument" 1556 [[ -z $1 ]] && die "dopamd requires at least one argument"
1739 1557
1740 use pam || return 0 1558 use pam || return 0
1741 1559
1742 insinto /etc/pam.d 1560 INSDESTTREE=/etc/pam.d \
1743 # these are the default doins options, but be explicit just in case
1744 insopts -m 0644 -o root -g root
1745 doins "$@" || die "failed to install $@" 1561 doins "$@" || die "failed to install $@"
1746} 1562}
1747# newpamd <old name> <new name> 1563# newpamd <old name> <new name>
1748# 1564#
1749# 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
1750newpamd() { 1566newpamd() {
1751 [[ $# -ne 2 ]] && die "newpamd requires two arguements" 1567 [[ $# -ne 2 ]] && die "newpamd requires two arguements"
1752 1568
1753 use pam || return 0 1569 use pam || return 0
1754 1570
1755 insinto /etc/pam.d 1571 INSDESTTREE=/etc/pam.d \
1756 # these are the default doins options, but be explicit just in case
1757 insopts -m 0644 -o root -g root
1758 newins "$1" "$2" || die "failed to install $1 as $2" 1572 newins "$1" "$2" || die "failed to install $1 as $2"
1759} 1573}
1574
1575# make a wrapper script ...
1576# NOTE: this was originally games_make_wrapper, but I noticed other places where
1577# this could be used, so I have moved it here and made it not games-specific
1578# -- wolf31o2
1579# $1 == wrapper name
1580# $2 == binary to run
1581# $3 == directory to chdir before running binary
1582# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1583# $5 == path for wrapper
1584make_wrapper() {
1585 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1586 local tmpwrapper=$(emktemp)
1587 cat << EOF > "${tmpwrapper}"
1588#!/bin/sh
1589cd "${chdir}"
1590export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1591exec ${bin} "\$@"
1592EOF
1593 chmod go+rx "${tmpwrapper}"
1594 if [ -n "${5}" ]
1595 then
1596 exeinto ${5}
1597 newexe "${tmpwrapper}" "${wrapper}"
1598 else
1599 newbin "${tmpwrapper}" "${wrapper}"
1600 fi
1601}

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

  ViewVC Help
Powered by ViewVC 1.1.20