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

Diff of /eclass/eutils.eclass

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

Revision 1.1.1.1 Revision 1.157
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.1.1.1 2005/11/30 09:59:15 chriswhite Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.157 2005/03/07 17:45:07 carlo 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 portability 12inherit multilib
13ECLASS=eutils
14INHERITED="$INHERITED $ECLASS"
13 15
14DEPEND="!bootstrap? ( sys-devel/patch )" 16DEPEND="!bootstrap? ( sys-devel/patch )"
15# sys-apps/shadow is needed for useradd, etc, bug #94745.
16 17
17DESCRIPTION="Based on the ${ECLASS} eclass" 18DESCRIPTION="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}
18 63
19# Wait for the supplied number of seconds. If no argument is supplied, defaults 64# Wait for the supplied number of seconds. If no argument is supplied, defaults
20# to five seconds. If the EPAUSE_IGNORE env var is set, don't wait. If we're not 65# to five seconds. If the EPAUSE_IGNORE env var is set, don't wait. If we're not
21# outputting to a terminal, don't wait. For compatability purposes, the argument 66# outputting to a terminal, don't wait. For compatability purposes, the argument
22# must be an integer greater than zero. 67# must be an integer greater than zero.
64gen_usr_ldscript() { 109gen_usr_ldscript() {
65 local libdir="$(get_libdir)" 110 local libdir="$(get_libdir)"
66 # Just make sure it exists 111 # Just make sure it exists
67 dodir /usr/${libdir} 112 dodir /usr/${libdir}
68 113
69 for lib in "${@}" ; do
70 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT 114 cat > "${D}/usr/${libdir}/${1}" << END_LDSCRIPT
71 /* GNU ld script 115/* GNU ld script
72 Since Gentoo has critical dynamic libraries 116 Because Gentoo have critical dynamic libraries
73 in /lib, and the static versions in /usr/lib, 117 in /lib, and the static versions in /usr/lib, we
74 we need to have a "fake" dynamic lib in /usr/lib, 118 need to have a "fake" dynamic lib in /usr/lib,
75 otherwise we run into linking problems. 119 otherwise we run into linking problems.
76 120 See bug #4411 on http://bugs.gentoo.org/ for
77 See bug http://bugs.gentoo.org/4411 for more info. 121 more info. */
78 */
79 GROUP ( /${libdir}/${lib} ) 122GROUP ( /${libdir}/${1} )
80 END_LDSCRIPT 123END_LDSCRIPT
81 fperms a+x "/usr/${libdir}/${lib}" 124 fperms a+x "/usr/${libdir}/${1}"
82 done
83} 125}
84 126
85# Simple function to draw a line consisting of '=' the same length as $* 127# Simple function to draw a line consisting of '=' the same length as $*
86# - only to be used by epatch()
87# 128#
88# <azarah@gentoo.org> (11 Nov 2002) 129# <azarah@gentoo.org> (11 Nov 2002)
89# 130#
90draw_line() { 131draw_line() {
91 local i=0 132 local i=0
117EPATCH_SOURCE="${WORKDIR}/patch" 158EPATCH_SOURCE="${WORKDIR}/patch"
118# Default extension for patches 159# Default extension for patches
119EPATCH_SUFFIX="patch.bz2" 160EPATCH_SUFFIX="patch.bz2"
120# Default options for patch 161# Default options for patch
121# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571 162# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571
122# Set --no-backup-if-mismatch so we don't leave '.orig' files behind. 163EPATCH_OPTS="-g0"
123EPATCH_OPTS="-g0 --no-backup-if-mismatch"
124# List of patches not to apply. Not this is only file names, 164# List of patches not to apply. Not this is only file names,
125# and not the full path .. 165# and not the full path ..
126EPATCH_EXCLUDE="" 166EPATCH_EXCLUDE=""
127# Change the printed message for a single patch. 167# Change the printed message for a single patch.
128EPATCH_SINGLE_MSG="" 168EPATCH_SINGLE_MSG=""
129# Change the printed message for multiple patches.
130EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..."
131# Force applying bulk patches even if not following the style: 169# Force applying bulk patches even if not following the style:
132# 170#
133# ??_${ARCH}_foo.${EPATCH_SUFFIX} 171# ??_${ARCH}_foo.${EPATCH_SUFFIX}
134# 172#
135EPATCH_FORCE="no" 173EPATCH_FORCE="no"
166# hand its a directory, it will set EPATCH_SOURCE to this. 204# hand its a directory, it will set EPATCH_SOURCE to this.
167# 205#
168# <azarah@gentoo.org> (10 Nov 2002) 206# <azarah@gentoo.org> (10 Nov 2002)
169# 207#
170epatch() { 208epatch() {
171 _epatch_assert() { local _pipestatus=${PIPESTATUS[*]}; [[ ${_pipestatus// /} -eq 0 ]] ; }
172 local PIPE_CMD="" 209 local PIPE_CMD=""
173 local STDERR_TARGET="${T}/$$.out" 210 local STDERR_TARGET="${T}/$$.out"
174 local PATCH_TARGET="${T}/$$.patch" 211 local PATCH_TARGET="${T}/$$.patch"
175 local PATCH_SUFFIX="" 212 local PATCH_SUFFIX=""
176 local SINGLE_PATCH="no" 213 local SINGLE_PATCH="no"
177 local x="" 214 local x=""
178 215
179 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402
180
181 if [ "$#" -gt 1 ] 216 if [ "$#" -gt 1 ]
182 then 217 then
183 local m="" 218 local m=""
219 einfo "${#} patches to apply ..."
184 for m in "$@" ; do 220 for m in "$@" ; do
185 epatch "${m}" 221 epatch "${m}"
186 done 222 done
187 return 0 223 return 0
188 fi 224 fi
242 ;; 278 ;;
243 esac 279 esac
244 280
245 if [ "${SINGLE_PATCH}" = "no" ] 281 if [ "${SINGLE_PATCH}" = "no" ]
246 then 282 then
247 einfo "${EPATCH_MULTI_MSG}" 283 einfo "Applying various patches (bugfixes/updates) ..."
248 fi 284 fi
249 for x in ${EPATCH_SOURCE} 285 for x in ${EPATCH_SOURCE}
250 do 286 do
251 # New ARCH dependant patch naming scheme ... 287 # New ARCH dependant patch naming scheme ...
252 # 288 #
253 # ???_arch_foo.patch 289 # ???_arch_foo.patch
254 # 290 #
255 if [ -f ${x} ] && \ 291 if [ -f ${x} ] && \
256 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "${x/_${ARCH}_}" != "${x}" ] || \ 292 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "`eval echo \$\{x/_${ARCH}_\}`" != "${x}" ] || \
257 [ "${EPATCH_FORCE}" = "yes" ]) 293 [ "${EPATCH_FORCE}" = "yes" ])
258 then 294 then
259 local count=0 295 local count=0
260 local popts="${EPATCH_OPTS}" 296 local popts="${EPATCH_OPTS}"
261 local patchname=${x##*/} 297 local patchname=${x##*/}
314 count=5 350 count=5
315 break 351 break
316 fi 352 fi
317 fi 353 fi
318 354
319 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f ; _epatch_assert) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1 355 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
320 then 356 then
321 draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 357 draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
322 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 358 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
323 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 359 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
324 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 360 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
325 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 361 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
326 362
327 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1 363 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1
328 _epatch_assert
329 364
330 if [ "$?" -ne 0 ] 365 if [ "$?" -ne 0 ]
331 then 366 then
332 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 367 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
333 echo 368 echo
351 fi 386 fi
352 387
353 if [ "${count}" -eq 5 ] 388 if [ "${count}" -eq 5 ]
354 then 389 then
355 echo 390 echo
356 eerror "Failed Patch: ${patchname} !" 391 eerror "Failed Patch: ${patchname}!"
357 eerror " ( ${PATCH_TARGET} )"
358 eerror 392 eerror
359 eerror "Include in your bugreport the contents of:" 393 eerror "Include in your bugreport the contents of:"
360 eerror 394 eerror
361 eerror " ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}" 395 eerror " ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}"
362 echo 396 echo
372 then 406 then
373 einfo "Done with patching" 407 einfo "Done with patching"
374 fi 408 fi
375} 409}
376 410
411# This function return true if we are using the NPTL pthreads
412# implementation.
413#
414# <azarah@gentoo.org> (06 March 2003)
415#
416have_NPTL() {
417 cat > ${T}/test-nptl.c <<-"END"
418 #define _XOPEN_SOURCE
419 #include <unistd.h>
420 #include <stdio.h>
421
422 int main()
423 {
424 char buf[255];
425 char *str = buf;
426
427 confstr(_CS_GNU_LIBPTHREAD_VERSION, str, 255);
428 if (NULL != str) {
429 printf("%s\n", str);
430 if (NULL != strstr(str, "NPTL"))
431 return 0;
432 }
433
434 return 1;
435 }
436 END
437
438 einfon "Checking for _CS_GNU_LIBPTHREAD_VERSION support in glibc ..."
439 if gcc -o ${T}/nptl ${T}/test-nptl.c &> /dev/null
440 then
441 echo "yes"
442 einfon "Checking what PTHREADS implementation we have ..."
443 if ${T}/nptl
444 then
445 return 0
446 else
447 return 1
448 fi
449 else
450 echo "no"
451 fi
452
453 return 1
454}
455
456# This function check how many cpu's are present, and then set
457# -j in MAKEOPTS accordingly.
458#
459# Thanks to nall <nall@gentoo.org> for this.
460#
461get_number_of_jobs() {
462 local jobs=0
463
464 if [ ! -r /proc/cpuinfo ]
465 then
466 return 1
467 fi
468
469 # This bit is from H?kan Wessberg <nacka-gentoo@refug.org>, bug #13565.
470 if [ "`egrep "^[[:space:]]*MAKEOPTS=" /etc/make.conf | wc -l`" -gt 0 ]
471 then
472 ADMINOPTS="`egrep "^[[:space:]]*MAKEOPTS=" /etc/make.conf | cut -d= -f2 | sed 's/\"//g'`"
473 ADMINPARAM="`echo ${ADMINOPTS} | gawk '{match($0, /-j *[0-9]*/, opt); print opt[0]}'`"
474 ADMINPARAM="${ADMINPARAM/-j}"
475 fi
476
477 export MAKEOPTS="`echo ${MAKEOPTS} | sed -e 's:-j *[0-9]*::g'`"
478
479 if [ "${ARCH}" = "amd64" -o "${ARCH}" = "x86" -o "${ARCH}" = "hppa" -o \
480 "${ARCH}" = "arm" -o "${ARCH}" = "mips" -o "${ARCH}" = "ia64" ]
481 then
482 # these archs will always have "[Pp]rocessor"
483 jobs="$((`grep -c ^[Pp]rocessor /proc/cpuinfo` * 2))"
484
485 elif [ "${ARCH}" = "sparc" -o "${ARCH}" = "sparc64" ]
486 then
487 # sparc always has "ncpus active"
488 jobs="$((`grep "^ncpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
489
490 elif [ "${ARCH}" = "alpha" ]
491 then
492 # alpha has "cpus active", but only when compiled with SMP
493 if [ "`grep -c "^cpus active" /proc/cpuinfo`" -eq 1 ]
494 then
495 jobs="$((`grep "^cpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
496 else
497 jobs=2
498 fi
499
500 elif [ "${ARCH}" = "ppc" -o "${ARCH}" = "ppc64" ]
501 then
502 # ppc has "processor", but only when compiled with SMP
503 if [ "`grep -c "^processor" /proc/cpuinfo`" -eq 1 ]
504 then
505 jobs="$((`grep -c ^processor /proc/cpuinfo` * 2))"
506 else
507 jobs=2
508 fi
509 elif [ "${ARCH}" = "s390" ]
510 then
511 # s390 has "# processors : "
512 jobs="$((`grep "^\# processors" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
513 else
514 jobs="$((`grep -c ^cpu /proc/cpuinfo` * 2))"
515 die "Unknown ARCH -- ${ARCH}!"
516 fi
517
518 # Make sure the number is valid ...
519 if [ "${jobs}" -lt 1 ]
520 then
521 jobs=1
522 fi
523
524 if [ -n "${ADMINPARAM}" ]
525 then
526 if [ "${jobs}" -gt "${ADMINPARAM}" ]
527 then
528 einfo "Setting make jobs to \"-j${ADMINPARAM}\" to ensure successful merge ..."
529 export MAKEOPTS="${MAKEOPTS} -j${ADMINPARAM}"
530 else
531 einfo "Setting make jobs to \"-j${jobs}\" to ensure successful merge ..."
532 export MAKEOPTS="${MAKEOPTS} -j${jobs}"
533 fi
534 fi
535}
536
377# Cheap replacement for when debianutils (and thus mktemp) 537# Cheap replacement for when debianutils (and thus mktemp)
378# does not exist on the users system 538# does not exist on the users system
379# vapier@gentoo.org 539# vapier@gentoo.org
380# 540#
381# Takes just 1 optional parameter (the directory to create tmpfile in) 541# Takes just 1 optional parameter (the directory to create tmpfile in)
382emktemp() { 542emktemp() {
383 local exe="touch" 543 local exe="touch"
384 [[ $1 == -d ]] && exe="mkdir" && shift 544 [ "$1" == "-d" ] && exe="mkdir" && shift
385 local topdir=$1 545 local topdir="$1"
386 546
387 if [[ -z ${topdir} ]] ; then 547 if [ -z "${topdir}" ]
548 then
388 [[ -z ${T} ]] \ 549 [ -z "${T}" ] \
389 && topdir="/tmp" \ 550 && topdir="/tmp" \
390 || topdir=${T} 551 || topdir="${T}"
391 fi 552 fi
392 553
393 if [[ -z $(type -p mktemp) ]] ; then 554 if [ -z "$(type -p mktemp)" ]
555 then
394 local tmp=/ 556 local tmp=/
395 while [[ -e ${tmp} ]] ; do 557 while [ -e "${tmp}" ] ; do
396 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM} 558 tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}"
397 done 559 done
398 ${exe} "${tmp}" || ${exe} -p "${tmp}" 560 ${exe} "${tmp}"
399 echo "${tmp}" 561 echo "${tmp}"
400 else 562 else
401 [[ ${exe} == "touch" ]] \ 563 [ "${exe}" == "touch" ] \
402 && exe="-p" \ 564 && exe="-p" \
403 || exe="-d" 565 || exe="-d"
404 mktemp ${exe} "${topdir}" 566 mktemp ${exe} "${topdir}"
405 fi 567 fi
406} 568}
410# Joe Jezak <josejx@gmail.com> and usata@gentoo.org 572# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
411# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org> 573# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
412# 574#
413# egetent(database, key) 575# egetent(database, key)
414egetent() { 576egetent() {
415 case ${CHOST} in 577 if useq ppc-macos ; then
416 *-darwin*)
417 case "$2" in 578 case "$2" in
418 *[!0-9]*) # Non numeric 579 *[!0-9]*) # Non numeric
419 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 580 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
420 ;; 581 ;;
421 *) # Numeric 582 *) # Numeric
422 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 583 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
423 ;; 584 ;;
424 esac 585 esac
425 ;; 586 elif useq x86-fbsd ; then
426 *-freebsd*) 587 local action
427 local opts action="user" 588 if [ "$1" == "passwd" ]
428 [[ $1 == "passwd" ]] || action="group" 589 then
429 590 action="user"
430 # lookup by uid/gid 591 else
431 if [[ $2 == [[:digit:]]* ]] ; then 592 action="group"
432 [[ ${action} == "user" ]] && opts="-u" || opts="-g"
433 fi 593 fi
434
435 pw show ${action} ${opts} "$2" -q 594 pw show "${action}" "$2" -q
436 ;; 595 else
437 *-netbsd*|*-openbsd*)
438 grep "$2:\*:" /etc/$1
439 ;;
440 *)
441 type -p nscd >& /dev/null && nscd -i "$1" 596 which nscd >& /dev/null && nscd -i "$1"
442 getent "$1" "$2" 597 getent "$1" "$2"
443 ;; 598 fi
444 esac
445} 599}
446 600
447# Simplify/standardize adding users to the system 601# Simplify/standardize adding users to the system
448# vapier@gentoo.org 602# vapier@gentoo.org
449# 603#
457# homedir: /dev/null 611# homedir: /dev/null
458# groups: none 612# groups: none
459# extra: comment of 'added by portage for ${PN}' 613# extra: comment of 'added by portage for ${PN}'
460enewuser() { 614enewuser() {
461 # get the username 615 # get the username
462 local euser=$1; shift 616 local euser="$1"; shift
463 if [[ -z ${euser} ]] ; then 617 if [ -z "${euser}" ]
618 then
464 eerror "No username specified !" 619 eerror "No username specified !"
465 die "Cannot call enewuser without a username" 620 die "Cannot call enewuser without a username"
466 fi 621 fi
467 622
468 # lets see if the username already exists 623 # lets see if the username already exists
469 if [[ ${euser} == $(egetent passwd "${euser}" | cut -d: -f1) ]] ; then 624 if [ "${euser}" == "`egetent passwd \"${euser}\" | cut -d: -f1`" ]
625 then
470 return 0 626 return 0
471 fi 627 fi
472 einfo "Adding user '${euser}' to your system ..." 628 einfo "Adding user '${euser}' to your system ..."
473 629
474 # options to pass to useradd 630 # options to pass to useradd
475 local opts= 631 local opts=
476 632
477 # handle uid 633 # handle uid
478 local euid=$1; shift 634 local euid="$1"; shift
479 if [[ ! -z ${euid} ]] && [[ ${euid} != "-1" ]] ; then 635 if [ ! -z "${euid}" ] && [ "${euid}" != "-1" ]
636 then
480 if [[ ${euid} -gt 0 ]] ; then 637 if [ "${euid}" -gt 0 ]
638 then
481 if [[ ! -z $(egetent passwd ${euid}) ]] ; then 639 if [ ! -z "`egetent passwd ${euid}`" ]
640 then
482 euid="next" 641 euid="next"
483 fi 642 fi
484 else 643 else
485 eerror "Userid given but is not greater than 0 !" 644 eerror "Userid given but is not greater than 0 !"
486 die "${euid} is not a valid UID" 645 die "${euid} is not a valid UID"
487 fi 646 fi
488 else 647 else
489 euid="next" 648 euid="next"
490 fi 649 fi
491 if [[ ${euid} == "next" ]] ; then 650 if [ "${euid}" == "next" ]
492 for euid in $(seq 101 999) ; do 651 then
652 local pwrange
653 if [ "${USERLAND}" == "BSD" ] ; then
654 pwrange="`jot 898 101`"
655 else
656 pwrange="`seq 101 999`"
657 fi
658 for euid in ${pwrange} ; do
493 [[ -z $(egetent passwd ${euid}) ]] && break 659 [ -z "`egetent passwd ${euid}`" ] && break
494 done 660 done
495 fi 661 fi
496 opts="${opts} -u ${euid}" 662 opts="${opts} -u ${euid}"
497 einfo " - Userid: ${euid}" 663 einfo " - Userid: ${euid}"
498 664
499 # handle shell 665 # handle shell
500 local eshell=$1; shift 666 local eshell="$1"; shift
501 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then 667 if [ ! -z "${eshell}" ] && [ "${eshell}" != "-1" ]
668 then
502 if [[ ! -e ${eshell} ]] ; then 669 if [ ! -e "${eshell}" ]
670 then
503 eerror "A shell was specified but it does not exist !" 671 eerror "A shell was specified but it does not exist !"
504 die "${eshell} does not exist" 672 die "${eshell} does not exist"
505 fi 673 fi
506 else 674 else
507 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do 675 if [ "${USERLAND}" == "BSD" ]
508 [[ -x ${ROOT}${shell} ]] && break 676 then
509 done 677 eshell="/usr/bin/false"
510 678 else
511 if [[ ${shell} == "/dev/null" ]] ; then 679 eshell="/bin/false"
512 eerror "Unable to identify the shell to use"
513 die "Unable to identify the shell to use"
514 fi 680 fi
515
516 eshell=${shell}
517 fi 681 fi
518 einfo " - Shell: ${eshell}" 682 einfo " - Shell: ${eshell}"
519 opts="${opts} -s ${eshell}" 683 opts="${opts} -s ${eshell}"
520 684
521 # handle homedir 685 # handle homedir
522 local ehome=$1; shift 686 local ehome="$1"; shift
523 if [[ -z ${ehome} ]] || [[ ${ehome} == "-1" ]] ; then 687 if [ -z "${ehome}" ] && [ "${eshell}" != "-1" ]
688 then
524 ehome="/dev/null" 689 ehome="/dev/null"
525 fi 690 fi
526 einfo " - Home: ${ehome}" 691 einfo " - Home: ${ehome}"
527 opts="${opts} -d ${ehome}" 692 opts="${opts} -d ${ehome}"
528 693
529 # handle groups 694 # handle groups
530 local egroups=$1; shift 695 local egroups="$1"; shift
531 if [[ ! -z ${egroups} ]] ; then 696 if [ ! -z "${egroups}" ]
697 then
532 local oldifs=${IFS} 698 local oldifs="${IFS}"
533 local defgroup="" exgroups="" 699 local defgroup="" exgroups=""
534 700
535 export IFS="," 701 export IFS=","
536 for g in ${egroups} ; do 702 for g in ${egroups}
703 do
537 export IFS=${oldifs} 704 export IFS="${oldifs}"
538 if [[ -z $(egetent group "${g}") ]] ; then 705 if [ -z "`egetent group \"${g}\"`" ]
706 then
539 eerror "You must add group ${g} to the system first" 707 eerror "You must add group ${g} to the system first"
540 die "${g} is not a valid GID" 708 die "${g} is not a valid GID"
541 fi 709 fi
542 if [[ -z ${defgroup} ]] ; then 710 if [ -z "${defgroup}" ]
711 then
543 defgroup=${g} 712 defgroup="${g}"
544 else 713 else
545 exgroups="${exgroups},${g}" 714 exgroups="${exgroups},${g}"
546 fi 715 fi
547 export IFS="," 716 export IFS=","
548 done 717 done
549 export IFS=${oldifs} 718 export IFS="${oldifs}"
550 719
551 opts="${opts} -g ${defgroup}" 720 opts="${opts} -g ${defgroup}"
552 if [[ ! -z ${exgroups} ]] ; then 721 if [ ! -z "${exgroups}" ]
722 then
553 opts="${opts} -G ${exgroups:1}" 723 opts="${opts} -G ${exgroups:1}"
554 fi 724 fi
555 else 725 else
556 egroups="(none)" 726 egroups="(none)"
557 fi 727 fi
558 einfo " - Groups: ${egroups}" 728 einfo " - Groups: ${egroups}"
559 729
560 # handle extra and add the user 730 # handle extra and add the user
731 local eextra="$@"
561 local oldsandbox=${SANDBOX_ON} 732 local oldsandbox="${SANDBOX_ON}"
562 export SANDBOX_ON="0" 733 export SANDBOX_ON="0"
563 case ${CHOST} in 734 if useq ppc-macos
564 *-darwin*) 735 then
565 ### Make the user 736 ### Make the user
566 if [[ -z $@ ]] ; then 737 if [ -z "${eextra}" ]
738 then
567 dscl . create /users/${euser} uid ${euid} 739 dscl . create /users/${euser} uid ${euid}
568 dscl . create /users/${euser} shell ${eshell} 740 dscl . create /users/${euser} shell ${eshell}
569 dscl . create /users/${euser} home ${ehome} 741 dscl . create /users/${euser} home ${ehome}
570 dscl . create /users/${euser} realname "added by portage for ${PN}" 742 dscl . create /users/${euser} realname "added by portage for ${PN}"
571 ### Add the user to the groups specified 743 ### Add the user to the groups specified
572 local oldifs=${IFS} 744 local oldifs="${IFS}"
573 export IFS="," 745 export IFS=","
574 for g in ${egroups} ; do 746 for g in ${egroups}
747 do
575 dscl . merge /groups/${g} users ${euser} 748 dscl . merge /groups/${g} users ${euser}
576 done 749 done
577 export IFS=${oldifs} 750 export IFS="${oldifs}"
578 else 751 else
579 einfo "Extra options are not supported on Darwin yet" 752 einfo "Extra options are not supported on macos yet"
580 einfo "Please report the ebuild along with the info below" 753 einfo "Please report the ebuild along with the info below"
581 einfo "eextra: $@" 754 einfo "eextra: ${eextra}"
582 die "Required function missing" 755 die "Required function missing"
583 fi 756 fi
584 ;; 757 elif use x86-fbsd ; then
585 *-freebsd*) 758 if [ -z "${eextra}" ]
586 if [[ -z $@ ]] ; then 759 then
587 pw useradd ${euser} ${opts} \ 760 pw useradd ${euser} ${opts} \
588 -c "added by portage for ${PN}" \ 761 -c "added by portage for ${PN}" \
589 die "enewuser failed" 762 die "enewuser failed"
590 else 763 else
591 einfo " - Extra: $@" 764 einfo " - Extra: ${eextra}"
592 pw useradd ${euser} ${opts} \ 765 pw useradd ${euser} ${opts} \
593 "$@" || die "enewuser failed" 766 -c ${eextra} || die "enewuser failed"
594 fi 767 fi
595 ;;
596
597 *-netbsd*)
598 if [[ -z $@ ]] ; then
599 useradd ${opts} ${euser} || die "enewuser failed"
600 else 768 else
601 einfo " - Extra: $@" 769 if [ -z "${eextra}" ]
602 useradd ${opts} ${euser} "$@" || die "enewuser failed" 770 then
603 fi
604 ;;
605
606 *-openbsd*)
607 if [[ -z $@ ]] ; then
608 useradd -u ${euid} -s ${eshell} \
609 -d ${ehome} -c "Added by portage for ${PN}" \
610 -g ${egroups} ${euser} || die "enewuser failed"
611 else
612 einfo " - Extra: $@"
613 useradd -u ${euid} -s ${eshell} \
614 -d ${ehome} -c "Added by portage for ${PN}" \
615 -g ${egroups} ${euser} "$@" || die "enewuser failed"
616 fi
617 ;;
618
619 *)
620 if [[ -z $@ ]] ; then
621 useradd ${opts} ${euser} \ 771 useradd ${opts} ${euser} \
622 -c "added by portage for ${PN}" \ 772 -c "added by portage for ${PN}" \
623 || die "enewuser failed" 773 || die "enewuser failed"
624 else 774 else
625 einfo " - Extra: $@" 775 einfo " - Extra: ${eextra}"
626 useradd ${opts} ${euser} "$@" \ 776 useradd ${opts} ${euser} ${eextra} \
627 || die "enewuser failed" 777 || die "enewuser failed"
628 fi 778 fi
629 ;;
630 esac
631
632 if [[ ! -e ${ROOT}/${ehome} ]] ; then
633 einfo " - Creating ${ehome} in ${ROOT}"
634 mkdir -p "${ROOT}/${ehome}"
635 chown ${euser} "${ROOT}/${ehome}"
636 chmod 755 "${ROOT}/${ehome}"
637 fi 779 fi
638
639 export SANDBOX_ON=${oldsandbox} 780 export SANDBOX_ON="${oldsandbox}"
781
782 if [ ! -e "${ehome}" ] && [ ! -e "${D}/${ehome}" ]
783 then
784 einfo " - Creating ${ehome} in ${D}"
785 dodir ${ehome}
786 fowners ${euser} ${ehome}
787 fperms 755 ${ehome}
788 fi
640} 789}
641 790
642# Simplify/standardize adding groups to the system 791# Simplify/standardize adding groups to the system
643# vapier@gentoo.org 792# vapier@gentoo.org
644# 793#
673 then 822 then
674 if [ "${egid}" -gt 0 ] 823 if [ "${egid}" -gt 0 ]
675 then 824 then
676 if [ -z "`egetent group ${egid}`" ] 825 if [ -z "`egetent group ${egid}`" ]
677 then 826 then
678 if [[ "${CHOST}" == *-darwin* ]]; then 827 if useq ppc-macos ; then
679 opts="${opts} ${egid}" 828 opts="${opts} ${egid}"
680 else 829 else
681 opts="${opts} -g ${egid}" 830 opts="${opts} -g ${egid}"
682 fi 831 fi
683 else 832 else
697 opts="${opts} ${eextra}" 846 opts="${opts} ${eextra}"
698 847
699 # add the group 848 # add the group
700 local oldsandbox="${SANDBOX_ON}" 849 local oldsandbox="${SANDBOX_ON}"
701 export SANDBOX_ON="0" 850 export SANDBOX_ON="0"
702 case ${CHOST} in 851 if useq ppc-macos ; then
703 *-darwin*)
704 if [ ! -z "${eextra}" ]; 852 if [ ! -z "${eextra}" ];
705 then 853 then
706 einfo "Extra options are not supported on Darwin/OS X yet" 854 einfo "Extra options are not supported on macos yet"
707 einfo "Please report the ebuild along with the info below" 855 einfo "Please report the ebuild along with the info below"
708 einfo "eextra: ${eextra}" 856 einfo "eextra: ${eextra}"
709 die "Required function missing" 857 die "Required function missing"
710 fi 858 fi
711 859
712 # If we need the next available 860 # If we need the next available
713 case ${egid} in 861 case ${egid} in
714 *[!0-9]*) # Non numeric 862 *[!0-9]*) # Non numeric
715 for egid in $(seq 101 999); do 863 for egid in `jot 898 101`; do
716 [ -z "`egetent group ${egid}`" ] && break 864 [ -z "`egetent group ${egid}`" ] && break
717 done 865 done
718 esac 866 esac
719 dscl . create /groups/${egroup} gid ${egid} 867 dscl . create /groups/${egroup} gid ${egid}
720 dscl . create /groups/${egroup} passwd '*' 868 dscl . create /groups/${egroup} passwd '*'
721 ;; 869 elif use x86-fbsd ; then
722
723 *-freebsd*)
724 case ${egid} in 870 case ${egid} in
725 *[!0-9]*) # Non numeric 871 *[!0-9]*) # Non numeric
726 for egid in $(seq 101 999); do 872 for egid in `jot 898 101`; do
727 [ -z "`egetent group ${egid}`" ] && break 873 [ -z "`egetent group ${egid}`" ] && break
728 done 874 done
729 esac 875 esac
730 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 876 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
731 ;; 877 else
732
733 *-netbsd*)
734 case ${egid} in
735 *[!0-9]*) # Non numeric
736 for egid in $(seq 101 999); do
737 [ -z "`egetent group ${egid}`" ] && break
738 done
739 esac
740 groupadd -g ${egid} ${egroup} || die "enewgroup failed"
741 ;;
742
743 *)
744 groupadd ${opts} ${egroup} || die "enewgroup failed" 878 groupadd ${opts} ${egroup} || die "enewgroup failed"
745 ;; 879 fi
746 esac
747 export SANDBOX_ON="${oldsandbox}" 880 export SANDBOX_ON="${oldsandbox}"
748} 881}
749 882
750# Simple script to replace 'dos2unix' binaries 883# Simple script to replace 'dos2unix' binaries
751# vapier@gentoo.org 884# vapier@gentoo.org
776# name: the name that will show up in the menu 909# name: the name that will show up in the menu
777# icon: give your little like a pretty little icon ... 910# icon: give your little like a pretty little icon ...
778# this can be relative (to /usr/share/pixmaps) or 911# this can be relative (to /usr/share/pixmaps) or
779# a full path to an icon 912# a full path to an icon
780# type: what kind of application is this ? for categories: 913# type: what kind of application is this ? for categories:
781# http://www.freedesktop.org/Standards/desktop-entry-spec 914# http://www.freedesktop.org/wiki/Standards_2fmenu_2dspec
782# path: if your app needs to startup in a specific dir 915# path: if your app needs to startup in a specific dir
783make_desktop_entry() { 916make_desktop_entry() {
784 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1 917 [ -z "$1" ] && eerror "make_desktop_entry: You must specify the executable" && return 1
785 918
786 local exec=${1} 919 local exec="${1}"
787 local name=${2:-${PN}} 920 local name="${2:-${PN}}"
788 local icon=${3:-${PN}.png} 921 local icon="${3:-${PN}.png}"
789 local type=${4} 922 local type="${4}"
790 local path=${5} 923 local subdir="${6}"
791 924 local path="${5:-${GAMES_BINDIR}}"
792 if [[ -z ${type} ]] ; then 925 if [ -z "${type}" ]
793 local catmaj=${CATEGORY%%-*} 926 then
794 local catmin=${CATEGORY##*-} 927 case ${CATEGORY} in
795 case ${catmaj} in 928 "app-emulation")
796 app) 929 type=Emulator
797 case ${catmin} in 930 subdir="Emulation"
798 admin) type=System;;
799 cdr) type=DiscBurning;;
800 dicts) type=Dictionary;;
801 editors) type=TextEditor;;
802 emacs) type=TextEditor;;
803 emulation) type=Emulator;;
804 laptop) type=HardwareSettings;;
805 office) type=Office;;
806 vim) type=TextEditor;;
807 xemacs) type=TextEditor;;
808 *) type=;;
809 esac
810 ;; 931 ;;
811 932 "games-"*)
812 dev) 933 type=Game
813 type="Development" 934 subdir="Games"
814 ;; 935 ;;
815 936 "net-"*)
816 games) 937 type=Network
817 case ${catmin} in 938 subdir="${type}"
818 action) type=ActionGame;;
819 arcade) type=ArcadeGame;;
820 board) type=BoardGame;;
821 kid) type=KidsGame;;
822 emulation) type=Emulator;;
823 puzzle) type=LogicGame;;
824 rpg) type=RolePlaying;;
825 roguelike) type=RolePlaying;;
826 simulation) type=Simulation;;
827 sports) type=SportsGame;;
828 strategy) type=StrategyGame;;
829 *) type=;;
830 esac
831 type="Game;${type}"
832 ;; 939 ;;
833
834 mail)
835 type="Network;Email"
836 ;;
837
838 media)
839 case ${catmin} in
840 gfx) type=Graphics;;
841 radio) type=Tuner;;
842 sound) type=Audio;;
843 tv) type=TV;;
844 video) type=Video;;
845 *) type=;;
846 esac
847 type="AudioVideo;${type}"
848 ;;
849
850 net)
851 case ${catmin} in
852 dialup) type=Dialup;;
853 ftp) type=FileTransfer;;
854 im) type=InstantMessaging;;
855 irc) type=IRCClient;;
856 mail) type=Email;;
857 news) type=News;;
858 nntp) type=News;;
859 p2p) type=FileTransfer;;
860 *) type=;;
861 esac
862 type="Network;${type}"
863 ;;
864
865 sci)
866 case ${catmin} in
867 astro*) type=Astronomy;;
868 bio*) type=Biology;;
869 calc*) type=Calculator;;
870 chem*) type=Chemistry;;
871 geo*) type=Geology;;
872 math*) type=Math;;
873 *) type=;;
874 esac
875 type="Science;${type}"
876 ;;
877
878 www)
879 case ${catmin} in
880 client) type=WebBrowser;;
881 *) type=;;
882 esac
883 type="Network"
884 ;;
885
886 *) 940 *)
887 type= 941 type=
942 subdir=
888 ;; 943 ;;
889 esac 944 esac
890 fi 945 fi
891 if [ "${SLOT}" == "0" ] ; then
892 local desktop_name="${PN}"
893 else
894 local desktop_name="${PN}-${SLOT}"
895 fi
896 local desktop=${T}/${exec%% *}-${desktop_name}.desktop 946 local desktop="${T}/${exec%% *}-${P}.desktop"
897 947
898echo "[Desktop Entry] 948echo "[Desktop Entry]
899Encoding=UTF-8 949Encoding=UTF-8
900Version=0.9.2 950Version=0.9.2
901Name=${name} 951Name=${name}
904Exec=${exec} 954Exec=${exec}
905Path=${path} 955Path=${path}
906Icon=${icon} 956Icon=${icon}
907Categories=Application;${type};" > "${desktop}" 957Categories=Application;${type};" > "${desktop}"
908 958
909 (
910 # wrap the env here so that the 'insinto' call
911 # doesn't corrupt the env of the caller
912 insinto /usr/share/applications 959 insinto /usr/share/applications
913 doins "${desktop}" 960 doins "${desktop}"
914 ) 961
962 return 0
915} 963}
916 964
917# Make a GDM/KDM Session file 965# Make a GDM/KDM Session file
918# 966#
919# make_desktop_entry(<title>, <command>) 967# make_desktop_entry(<title>, <command>)
920# title: File to execute to start the Window Manager 968# title: File to execute to start the Window Manager
921# command: Name of the Window Manager 969# command: Name of the Window Manager
922 970
923make_session_desktop() { 971make_session_desktop() {
972
924 [[ -z $1 ]] && eerror "make_session_desktop: You must specify the title" && return 1 973 [ -z "$1" ] && eerror "make_session_desktop: You must specify the title" && return 1
925 [[ -z $2 ]] && eerror "make_session_desktop: You must specify the command" && return 1 974 [ -z "$2" ] && eerror "make_session_desktop: You must specify the command" && return 1
926 975
927 local title=$1 976 local title="${1}"
928 local command=$2 977 local command="${2}"
929 local desktop=${T}/${wm}.desktop 978 local desktop="${T}/${wm}.desktop"
930 979
931echo "[Desktop Entry] 980echo "[Desktop Entry]
932Encoding=UTF-8 981Encoding=UTF-8
933Name=${title} 982Name=${title}
934Comment=This session logs you into ${title} 983Comment=This session logs you into ${title}
936TryExec=${command} 985TryExec=${command}
937Type=Application" > "${desktop}" 986Type=Application" > "${desktop}"
938 987
939 insinto /usr/share/xsessions 988 insinto /usr/share/xsessions
940 doins "${desktop}" 989 doins "${desktop}"
990
991 return 0
941} 992}
942 993
943domenu() { 994domenu() {
944 local i j 995 local i
996 local j
945 insinto /usr/share/applications 997 insinto /usr/share/applications
946 for i in "$@" ; do 998 for i in ${@}
999 do
947 if [[ -f ${i} ]] ; then 1000 if [ -f "${i}" ];
1001 then
948 doins "${i}" 1002 doins ${i}
949 elif [[ -d ${i} ]] ; then 1003 elif [ -d "${i}" ];
1004 then
950 for j in "${i}"/*.desktop ; do 1005 for j in ${i}/*.desktop
1006 do
951 doins "${j}" 1007 doins ${j}
952 done 1008 done
953 fi 1009 fi
954 done 1010 done
955} 1011}
956newmenu() {
957 insinto /usr/share/applications
958 newins "$1" "$2"
959}
960 1012
961doicon() { 1013doicon() {
962 local i j 1014 local i
1015 local j
963 insinto /usr/share/pixmaps 1016 insinto /usr/share/pixmaps
964 for i in "$@" ; do 1017 for i in ${@}
1018 do
965 if [[ -f ${i} ]] ; then 1019 if [ -f "${i}" ];
1020 then
966 doins "${i}" 1021 doins ${i}
967 elif [[ -d ${i} ]] ; then 1022 elif [ -d "${i}" ];
1023 then
968 for j in "${i}"/*.png ; do 1024 for j in ${i}/*.png
1025 do
969 doins "${j}" 1026 doins ${j}
970 done 1027 done
971 fi 1028 fi
972 done 1029 done
973}
974newicon() {
975 insinto /usr/share/pixmaps
976 newins "$1" "$2"
977} 1030}
978 1031
979############################################################## 1032##############################################################
980# END: Handle .desktop files and menu entries # 1033# END: Handle .desktop files and menu entries #
981############################################################## 1034##############################################################
982 1035
983 1036
984# for internal use only (unpack_pdv and unpack_makeself) 1037# for internal use only (unpack_pdv and unpack_makeself)
985find_unpackable_file() { 1038find_unpackable_file() {
986 local src=$1 1039 local src="$1"
987 if [[ -z ${src} ]] ; then 1040 if [ -z "${src}" ]
1041 then
988 src=${DISTDIR}/${A} 1042 src="${DISTDIR}/${A}"
989 else 1043 else
990 if [[ -e ${DISTDIR}/${src} ]] ; then 1044 if [ -e "${DISTDIR}/${src}" ]
1045 then
991 src=${DISTDIR}/${src} 1046 src="${DISTDIR}/${src}"
992 elif [[ -e ${PWD}/${src} ]] ; then 1047 elif [ -e "${PWD}/${src}" ]
1048 then
993 src=${PWD}/${src} 1049 src="${PWD}/${src}"
994 elif [[ -e ${src} ]] ; then 1050 elif [ -e "${src}" ]
1051 then
995 src=${src} 1052 src="${src}"
996 fi
997 fi 1053 fi
998 [[ ! -e ${src} ]] && return 1 1054 fi
1055 [ ! -e "${src}" ] && die "Could not find requested archive ${src}"
999 echo "${src}" 1056 echo "${src}"
1000} 1057}
1001 1058
1002# Unpack those pesky pdv generated files ... 1059# Unpack those pesky pdv generated files ...
1003# They're self-unpacking programs with the binary package stuffed in 1060# They're self-unpacking programs with the binary package stuffed in
1018# lseek 1075# lseek
1019# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 1076# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
1020# lseek(3, -4, SEEK_END) = 2981250 1077# lseek(3, -4, SEEK_END) = 2981250
1021# thus we would pass in the value of '4' as the second parameter. 1078# thus we would pass in the value of '4' as the second parameter.
1022unpack_pdv() { 1079unpack_pdv() {
1023 local src=$(find_unpackable_file $1) 1080 local src="`find_unpackable_file $1`"
1024 local sizeoff_t=$2 1081 local sizeoff_t="$2"
1025 1082
1026 [[ -z ${src} ]] && die "Could not locate source for '$1'"
1027 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :(" 1083 [ -z "${sizeoff_t}" ] && die "No idea what off_t size was used for this pdv :("
1028 1084
1029 local shrtsrc=$(basename "${src}") 1085 local shrtsrc="`basename ${src}`"
1030 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1086 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1031 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1087 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"`
1032 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"` 1088 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"`
1033 1089
1034 # grab metadata for debug reasons 1090 # grab metadata for debug reasons
1098# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1154# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1099# - If the file is not specified then unpack will utilize ${A}. 1155# - If the file is not specified then unpack will utilize ${A}.
1100# - If the offset is not specified then we will attempt to extract 1156# - If the offset is not specified then we will attempt to extract
1101# the proper offset from the script itself. 1157# the proper offset from the script itself.
1102unpack_makeself() { 1158unpack_makeself() {
1103 local src_input=${1:-${A}}
1104 local src=$(find_unpackable_file "${src_input}") 1159 local src="$(find_unpackable_file "$1")"
1105 local skip=$2 1160 local skip="$2"
1106 local exe=$3 1161 local exe="$3"
1107 1162
1108 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
1109
1110 local shrtsrc=$(basename "${src}") 1163 local shrtsrc="$(basename "${src}")"
1111 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1164 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1112 if [[ -z ${skip} ]] ; then 1165 if [ -z "${skip}" ]
1166 then
1113 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}') 1167 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`"
1114 local skip=0 1168 local skip=0
1115 exe=tail 1169 exe=tail
1116 case ${ver} in 1170 case ${ver} in
1117 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same 1171 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same
1118 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1172 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1130 ;; 1184 ;;
1131 2.1.3) 1185 2.1.3)
1132 skip=`grep -a ^offset= "${src}" | awk '{print $3}'` 1186 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1133 let skip="skip + 1" 1187 let skip="skip + 1"
1134 ;; 1188 ;;
1135 2.1.4|2.1.5) 1189 2.1.4)
1136 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1) 1190 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1)
1137 skip=$(head -n ${skip} "${src}" | wc -c) 1191 skip=$(head -n ${skip} "${src}" | wc -c)
1138 exe="dd" 1192 exe="dd"
1139 ;; 1193 ;;
1140 *) 1194 *)
1185check_license() { 1239check_license() {
1186 local lic=$1 1240 local lic=$1
1187 if [ -z "${lic}" ] ; then 1241 if [ -z "${lic}" ] ; then
1188 lic="${PORTDIR}/licenses/${LICENSE}" 1242 lic="${PORTDIR}/licenses/${LICENSE}"
1189 else 1243 else
1190 if [ -e "${PORTDIR}/licenses/${lic}" ] ; then 1244 if [ -e "${PORTDIR}/licenses/${src}" ] ; then
1191 lic="${PORTDIR}/licenses/${lic}" 1245 lic="${PORTDIR}/licenses/${src}"
1192 elif [ -e "${PWD}/${lic}" ] ; then 1246 elif [ -e "${PWD}/${src}" ] ; then
1193 lic="${PWD}/${lic}" 1247 lic="${PWD}/${src}"
1194 elif [ -e "${lic}" ] ; then 1248 elif [ -e "${src}" ] ; then
1195 lic="${lic}" 1249 lic="${src}"
1196 fi
1197 fi 1250 fi
1251 fi
1198 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}" 1252 [ ! -f "${lic}" ] && die "Could not find requested license ${src}"
1199 local l="`basename ${lic}`" 1253 local l="`basename ${lic}`"
1200 1254
1201 # here is where we check for the licenses the user already 1255 # here is where we check for the licenses the user already
1202 # accepted ... if we don't find a match, we make the user accept 1256 # accepted ... if we don't find a match, we make the user accept
1203 local shopts=$- 1257 local shopts=$-
1259 # first we figure out how many cds we're dealing with by 1313 # first we figure out how many cds we're dealing with by
1260 # the # of files they gave us 1314 # the # of files they gave us
1261 local cdcnt=0 1315 local cdcnt=0
1262 local f= 1316 local f=
1263 for f in "$@" ; do 1317 for f in "$@" ; do
1264 ((++cdcnt)) 1318 cdcnt=$((cdcnt + 1))
1265 export CDROM_CHECK_${cdcnt}="$f" 1319 export CDROM_CHECK_${cdcnt}="$f"
1266 done 1320 done
1267 export CDROM_TOTAL_CDS=${cdcnt} 1321 export CDROM_TOTAL_CDS=${cdcnt}
1268 export CDROM_CURRENT_CD=1 1322 export CDROM_CURRENT_CD=1
1269 1323
1270 # now we see if the user gave use CD_ROOT ... 1324 # now we see if the user gave use CD_ROOT ...
1271 # if they did, let's just believe them that it's correct 1325 # if they did, let's just believe them that it's correct
1326 if [[ ! -z ${CD_ROOT} ]] ; then
1327 export CDROM_ROOT=${CD_ROOT}
1328 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1329 return
1330 fi
1331 # do the same for CD_ROOT_X
1272 if [[ -n ${CD_ROOT}${CD_ROOT_1} ]] ; then 1332 if [[ ! -z ${CD_ROOT_1} ]] ; then
1273 local var= 1333 local var=
1274 cdcnt=0 1334 cdcnt=0
1275 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1335 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1276 ((++cdcnt)) 1336 cdcnt=$((cdcnt + 1))
1277 var="CD_ROOT_${cdcnt}" 1337 var="CD_ROOT_${cdcnt}"
1278 [[ -z ${!var} ]] && var="CD_ROOT"
1279 if [[ -z ${!var} ]] ; then 1338 if [[ -z ${!var} ]] ; then
1280 eerror "You must either use just the CD_ROOT" 1339 eerror "You must either use just the CD_ROOT"
1281 eerror "or specify ALL the CD_ROOT_X variables." 1340 eerror "or specify ALL the CD_ROOT_X variables."
1282 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables." 1341 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables."
1283 die "could not locate CD_ROOT_${cdcnt}" 1342 die "could not locate CD_ROOT_${cdcnt}"
1284 fi 1343 fi
1344 export CDROM_ROOTS_${cdcnt}="${!var}"
1285 done 1345 done
1286 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}} 1346 export CDROM_ROOT=${CDROM_ROOTS_1}
1287 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1347 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1288 export CDROM_SET=-1
1289 for f in ${CDROM_CHECK_1//:/ } ; do
1290 ((++CDROM_SET))
1291 [[ -e ${CD_ROOT}/${f} ]] && break
1292 done
1293 export CDROM_MATCH=${f}
1294 return 1348 return
1295 fi 1349 fi
1296 1350
1297 # User didn't help us out so lets make sure they know they can
1298 # simplify the whole process ...
1299 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1351 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1300 einfo "This ebuild will need the ${CDROM_NAME:-cdrom for ${PN}}" 1352 einfon "This ebuild will need the "
1353 if [[ -z ${CDROM_NAME} ]] ; then
1354 echo "cdrom for ${PN}."
1355 else
1356 echo "${CDROM_NAME}."
1357 fi
1301 echo 1358 echo
1302 einfo "If you do not have the CD, but have the data files" 1359 einfo "If you do not have the CD, but have the data files"
1303 einfo "mounted somewhere on your filesystem, just export" 1360 einfo "mounted somewhere on your filesystem, just export"
1304 einfo "the variable CD_ROOT so that it points to the" 1361 einfo "the variable CD_ROOT so that it points to the"
1305 einfo "directory containing the files." 1362 einfo "directory containing the files."
1309 echo 1366 echo
1310 else 1367 else
1311 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1368 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1312 cdcnt=0 1369 cdcnt=0
1313 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1370 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1314 ((++cdcnt)) 1371 cdcnt=$((cdcnt + 1))
1315 var="CDROM_NAME_${cdcnt}" 1372 var="CDROM_NAME_${cdcnt}"
1316 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}" 1373 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}"
1317 done 1374 done
1318 echo 1375 echo
1319 einfo "If you do not have the CDs, but have the data files" 1376 einfo "If you do not have the CDs, but have the data files"
1320 einfo "mounted somewhere on your filesystem, just export" 1377 einfo "mounted somewhere on your filesystem, just export"
1321 einfo "the following variables so they point to the right place:" 1378 einfo "the following variables so they point to the right place:"
1322 einfon "" 1379 einfon ""
1323 cdcnt=0 1380 cdcnt=0
1324 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1381 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1325 ((++cdcnt)) 1382 cdcnt=$((cdcnt + 1))
1326 echo -n " CD_ROOT_${cdcnt}" 1383 echo -n " CD_ROOT_${cdcnt}"
1327 done 1384 done
1328 echo 1385 echo
1329 einfo "Or, if you have all the files in the same place, or" 1386 einfo "Or, if you have all the files in the same place, or"
1330 einfo "you only have one cdrom, you can export CD_ROOT" 1387 einfo "you only have one cdrom, you can export CD_ROOT"
1333 echo 1390 echo
1334 einfo "For example:" 1391 einfo "For example:"
1335 einfo "export CD_ROOT_1=/mnt/cdrom" 1392 einfo "export CD_ROOT_1=/mnt/cdrom"
1336 echo 1393 echo
1337 fi 1394 fi
1338
1339 export CDROM_SET=""
1340 export CDROM_CURRENT_CD=0 1395 export CDROM_CURRENT_CD=0
1341 cdrom_load_next_cd 1396 cdrom_load_next_cd
1342} 1397}
1343 1398
1344# this is only used when you need access to more than one cd. 1399# this is only used when you need access to more than one cd.
1345# when you have finished using the first cd, just call this function. 1400# when you have finished using the first cd, just call this function.
1346# when it returns, CDROM_ROOT will be pointing to the second cd. 1401# when it returns, CDROM_ROOT will be pointing to the second cd.
1347# remember, you can only go forward in the cd chain, you can't go back. 1402# remember, you can only go forward in the cd chain, you can't go back.
1348cdrom_load_next_cd() { 1403cdrom_load_next_cd() {
1404 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1349 local var 1405 local var=
1350 ((++CDROM_CURRENT_CD)) 1406
1407 if [[ ! -z ${CD_ROOT} ]] ; then
1408 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}"
1409 return
1410 fi
1351 1411
1352 unset CDROM_ROOT 1412 unset CDROM_ROOT
1353 var=CD_ROOT_${CDROM_CURRENT_CD} 1413 var=CDROM_ROOTS_${CDROM_CURRENT_CD}
1354 [[ -z ${!var} ]] && var="CD_ROOT"
1355 if [[ -z ${!var} ]] ; then 1414 if [[ -z ${!var} ]] ; then
1356 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1415 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1357 _cdrom_locate_file_on_cd ${!var} 1416 cdrom_locate_file_on_cd ${!var}
1358 else 1417 else
1359 export CDROM_ROOT=${!var} 1418 export CDROM_ROOT=${!var}
1360 fi 1419 fi
1361 1420
1362 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1421 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1367# all it does is try to locate a give file on a cd ... if the cd isn't 1426# all it does is try to locate a give file on a cd ... if the cd isn't
1368# found, then a message asking for the user to insert the cdrom will be 1427# found, then a message asking for the user to insert the cdrom will be
1369# displayed and we'll hang out here until: 1428# displayed and we'll hang out here until:
1370# (1) the file is found on a mounted cdrom 1429# (1) the file is found on a mounted cdrom
1371# (2) the user hits CTRL+C 1430# (2) the user hits CTRL+C
1372_cdrom_locate_file_on_cd() { 1431cdrom_locate_file_on_cd() {
1373 local mline=""
1374 local showedmsg=0
1375
1376 while [[ -z ${CDROM_ROOT} ]] ; do 1432 while [[ -z ${CDROM_ROOT} ]] ; do
1377 local i=0
1378 local -a cdset=(${*//:/ })
1379 if [[ -n ${CDROM_SET} ]] ; then
1380 cdset=(${cdset[${CDROM_SET}]})
1381 fi
1382
1383 while [[ -n ${cdset[${i}]} ]] ; do
1384 local dir=$(dirname ${cdset[${i}]}) 1433 local dir="$(dirname ${@})"
1385 local file=$(basename ${cdset[${i}]}) 1434 local file="$(basename ${@})"
1435 local mline=""
1436 local showedmsg=0
1386 1437
1387 for mline in $(mount | gawk '/(iso|cdrom|fs=cdfss)/ {print $3}') ; do 1438 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do
1388 [[ -d ${mline}/${dir} ]] || continue 1439 [[ -d ${mline}/${dir} ]] || continue
1389 if [[ -n $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] ; then 1440 [[ ! -z $(find ${mline}/${dir} -iname ${file} -maxdepth 1) ]] \
1390 export CDROM_ROOT=${mline} 1441 && export CDROM_ROOT=${mline}
1391 export CDROM_SET=${i} 1442 done
1392 export CDROM_MATCH=${cdset[${i}]} 1443
1393 return 1444 if [[ -z ${CDROM_ROOT} ]] ; then
1445 echo
1446 if [[ ${showedmsg} -eq 0 ]] ; then
1447 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1448 if [[ -z ${CDROM_NAME} ]] ; then
1449 einfo "Please insert the cdrom for ${PN} now !"
1450 else
1451 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1452 fi
1453 else
1454 if [[ -z ${CDROM_NAME_1} ]] ; then
1455 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !"
1456 else
1457 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1458 einfo "Please insert+mount the ${!var} cdrom now !"
1459 fi
1394 fi 1460 fi
1395 done 1461 showedmsg=1
1396
1397 ((++i))
1398 done
1399
1400 echo
1401 if [[ ${showedmsg} -eq 0 ]] ; then
1402 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1403 if [[ -z ${CDROM_NAME} ]] ; then
1404 einfo "Please insert+mount the cdrom for ${PN} now !"
1405 else
1406 einfo "Please insert+mount the ${CDROM_NAME} cdrom now !"
1407 fi
1408 else
1409 if [[ -z ${CDROM_NAME_1} ]] ; then
1410 einfo "Please insert+mount cd #${CDROM_CURRENT_CD} for ${PN} now !"
1411 else
1412 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1413 einfo "Please insert+mount the ${!var} cdrom now !"
1414 fi
1415 fi 1462 fi
1416 showedmsg=1
1417 fi
1418 einfo "Press return to scan for the cd again" 1463 einfo "Press return to scan for the cd again"
1419 einfo "or hit CTRL+C to abort the emerge." 1464 einfo "or hit CTRL+C to abort the emerge."
1420 echo
1421 einfo "If you are having trouble with the detection"
1422 einfo "of your CD, it is possible that you do not have"
1423 einfo "Joliet support enabled in your kernel. Please"
1424 einfo "check that CONFIG_JOLIET is enabled in your kernel."
1425 read 1465 read
1466 fi
1426 done 1467 done
1427} 1468}
1428 1469
1429# Make sure that LINGUAS only contains languages that 1470# Make sure that LINGUAS only contains languages that
1430# a package can support 1471# a package can support
1472 else 1513 else
1473 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1514 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA"
1474 fi 1515 fi
1475 done 1516 done
1476 if [[ -z ${newls} ]] ; then 1517 if [[ -z ${newls} ]] ; then
1477 export LINGUAS="" 1518 unset LINGUAS
1478 else 1519 else
1479 export LINGUAS=${newls:1} 1520 export LINGUAS=${newls:1}
1480 fi 1521 fi
1481} 1522}
1482 1523
1492 while ((i--)) ; do 1533 while ((i--)) ; do
1493 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass" 1534 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1494 done 1535 done
1495 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}" 1536 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1496 case ${ARCH} in 1537 case ${ARCH} in
1497 x86) export ARCH="i386";; 1538 x86) export ARCH="i386";;
1498 amd64) export ARCH="x86_64";; 1539 amd64) export ARCH="x86_64";;
1499 hppa) export ARCH="parisc";; 1540 hppa) export ARCH="parisc";;
1500 mips) export ARCH="mips";; 1541 mips) export ARCH="mips";;
1501 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! 1542 sparc) export ARCH="$(tc-arch-kernel)";; # Yeah this is ugly, but it's even WORSE if you don't do this. linux-info.eclass's set_arch_to_kernel is fixed, but won't get used over this one!
1502 *) export ARCH="${ARCH}";; 1543 *) export ARCH="${ARCH}";;
1503 esac 1544 esac
1504} 1545}
1505 1546
1506# set's ARCH back to what portage expects 1547# set's ARCH back to what portage expects
1507set_arch_to_portage() { 1548set_arch_to_portage() {
1551 LIB=$1 1592 LIB=$1
1552 1593
1553 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1594 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1554 SONAME=`basename ${LIB}` 1595 SONAME=`basename ${LIB}`
1555 1596
1556 ewarn "An old version of an installed library was detected on your system." 1597 einfo "An old version of an installed library was detected on your system."
1557 ewarn "In order to avoid breaking packages that link against it, this older version" 1598 einfo "In order to avoid breaking packages that link against is, this older version"
1558 ewarn "is not being removed. In order to make full use of this newer version," 1599 einfo "is not being removed. In order to make full use of this newer version,"
1559 ewarn "you will need to execute the following command:" 1600 einfo "you will need to execute the following command:"
1560 ewarn " revdep-rebuild --soname ${SONAME}" 1601 einfo " revdep-rebuild --soname ${SONAME}"
1561 ewarn 1602 einfo
1562 ewarn "After doing that, you can safely remove ${LIB}" 1603 einfo "After doing that, you can safely remove ${LIB}"
1563 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild" 1604 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild"
1564 fi 1605 fi
1565} 1606}
1566 1607
1567# Hack for people to figure out if a package was built with 1608# Hack for people to figure out if a package was built with
1568# certain USE flags 1609# certain USE flags
1578 [[ ${opt:0:1} = "-" ]] && shift || opt="-a" 1619 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1579 1620
1580 local PKG=$(best_version $1) 1621 local PKG=$(best_version $1)
1581 shift 1622 shift
1582 1623
1583 local USEFILE=${ROOT}/var/db/pkg/${PKG}/USE 1624 local USEFILE="${ROOT}/var/db/pkg/${PKG}/USE"
1584
1585 # if the USE file doesnt exist, assume the $PKG is either
1586 # injected or package.provided
1587 [[ ! -e ${USEFILE} ]] && return 0 1625 [[ ! -e ${USEFILE} ]] && return 1
1588 1626
1589 local USE_BUILT=$(<${USEFILE}) 1627 local USE_BUILT=$(<${USEFILE})
1590 while [[ $# -gt 0 ]] ; do 1628 while [[ $# -gt 0 ]] ; do
1591 if [[ ${opt} = "-o" ]] ; then 1629 if [[ ${opt} = "-o" ]] ; then
1592 has $1 ${USE_BUILT} && return 0 1630 has $1 ${USE_BUILT} && return 0
1617dopamd() { 1655dopamd() {
1618 [[ -z $1 ]] && die "dopamd requires at least one argument" 1656 [[ -z $1 ]] && die "dopamd requires at least one argument"
1619 1657
1620 use pam || return 0 1658 use pam || return 0
1621 1659
1622 INSDESTTREE=/etc/pam.d \ 1660 insinto /etc/pam.d
1661 # these are the default doins options, but be explicit just in case
1662 insopts -m 0644 -o root -g root
1623 doins "$@" || die "failed to install $@" 1663 doins "$@" || die "failed to install $@"
1624} 1664}
1625# newpamd <old name> <new name> 1665# newpamd <old name> <new name>
1626# 1666#
1627# Install pam file <old name> as <new name> in /etc/pam.d 1667# Install pam file <old name> as <new name> in /etc/pam.d
1628newpamd() { 1668newpamd() {
1629 [[ $# -ne 2 ]] && die "newpamd requires two arguements" 1669 [[ $# -ne 2 ]] && die "newpamd requires two arguements"
1630 1670
1631 use pam || return 0 1671 use pam || return 0
1632 1672
1633 INSDESTTREE=/etc/pam.d \ 1673 insinto /etc/pam.d
1674 # these are the default doins options, but be explicit just in case
1675 insopts -m 0644 -o root -g root
1634 newins "$1" "$2" || die "failed to install $1 as $2" 1676 newins "$1" "$2" || die "failed to install $1 as $2"
1635} 1677}
1636
1637# make a wrapper script ...
1638# NOTE: this was originally games_make_wrapper, but I noticed other places where
1639# this could be used, so I have moved it here and made it not games-specific
1640# -- wolf31o2
1641# $1 == wrapper name
1642# $2 == binary to run
1643# $3 == directory to chdir before running binary
1644# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1645# $5 == path for wrapper
1646make_wrapper() {
1647 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1648 local tmpwrapper=$(emktemp)
1649 # We don't want to quote ${bin} so that people can pass complex
1650 # things as $bin ... "./someprog --args"
1651 cat << EOF > "${tmpwrapper}"
1652#!/bin/sh
1653cd "${chdir:-.}"
1654if [ -n "${libdir}" ] ; then
1655 if [ "\${LD_LIBRARY_PATH+set}" = "set" ] ; then
1656 export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1657 else
1658 export LD_LIBRARY_PATH="${libdir}"
1659 fi
1660fi
1661exec ${bin} "\$@"
1662EOF
1663 chmod go+rx "${tmpwrapper}"
1664 if [[ -n ${path} ]] ; then
1665 exeinto "${path}"
1666 newexe "${tmpwrapper}" "${wrapper}"
1667 else
1668 newbin "${tmpwrapper}" "${wrapper}"
1669 fi
1670}

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

  ViewVC Help
Powered by ViewVC 1.1.20