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

Diff of /eclass/eutils.eclass

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

Revision 1.218 Revision 1.282
1# Copyright 1999-2005 Gentoo Foundation 1# Copyright 1999-2007 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.218 2005/11/22 11:15:34 flameeyes Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.282 2007/06/16 07:11:43 vapier Exp $
4#
5# Author: Martin Schlemmer <azarah@gentoo.org>
6# 4#
7# This eclass is for general purpose functions that most ebuilds 5# This eclass is for general purpose functions that most ebuilds
8# have to implement themselves. 6# have to implement themselves.
9# 7#
10# NB: If you add anything, please comment it! 8# NB: If you add anything, please comment it!
9#
10# Maintainer: see each individual function, base-system@gentoo.org as default
11 11
12inherit multilib portability 12inherit multilib portability
13
14DEPEND="!bootstrap? ( sys-devel/patch )"
15# sys-apps/shadow is needed for useradd, etc, bug #94745.
16 13
17DESCRIPTION="Based on the ${ECLASS} eclass" 14DESCRIPTION="Based on the ${ECLASS} eclass"
18 15
19# Wait for the supplied number of seconds. If no argument is supplied, defaults 16# 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 17# 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 18# outputting to a terminal, don't wait. For compatability purposes, the argument
22# must be an integer greater than zero. 19# must be an integer greater than zero.
23# Bug 62950, Ciaran McCreesh <ciaranm@gentoo.org> (05 Sep 2004) 20# Bug 62950, Ciaran McCreesh <ciaranm@gentoo.org> (05 Sep 2004)
24epause() { 21epause() {
25 if [ -z "$EPAUSE_IGNORE" ] && [ -t 1 ] ; then 22 [[ -z ${EPAUSE_IGNORE} ]] && sleep ${1:-5}
26 sleep ${1:-5}
27 fi
28} 23}
29 24
30# Beep the specified number of times (defaults to five). If our output 25# Beep the specified number of times (defaults to five). If our output
31# is not a terminal, don't beep. If the EBEEP_IGNORE env var is set, 26# is not a terminal, don't beep. If the EBEEP_IGNORE env var is set,
32# don't beep. 27# don't beep.
33# Bug 62950, Ciaran McCreesh <ciaranm@gentoo.org> (05 Sep 2004) 28# Bug 62950, Ciaran McCreesh <ciaranm@gentoo.org> (05 Sep 2004)
34ebeep() { 29ebeep() {
35 local n 30 local n
36 if [ -z "$EBEEP_IGNORE" ] && [ -t 1 ] ; then 31 if [[ -z ${EBEEP_IGNORE} ]] ; then
37 for ((n=1 ; n <= ${1:-5} ; n++)) ; do 32 for ((n=1 ; n <= ${1:-5} ; n++)) ; do
38 echo -ne "\a" 33 echo -ne "\a"
39 sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null 34 sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
40 echo -ne "\a" 35 echo -ne "\a"
41 sleep 1 36 sleep 1
42 done 37 done
43 fi 38 fi
44}
45
46# This function generate linker scripts in /usr/lib for dynamic
47# libs in /lib. This is to fix linking problems when you have
48# the .so in /lib, and the .a in /usr/lib. What happens is that
49# in some cases when linking dynamic, the .a in /usr/lib is used
50# instead of the .so in /lib due to gcc/libtool tweaking ld's
51# library search path. This cause many builds to fail.
52# See bug #4411 for more info.
53#
54# To use, simply call:
55#
56# gen_usr_ldscript libfoo.so
57#
58# Note that you should in general use the unversioned name of
59# the library, as ldconfig should usually update it correctly
60# to point to the latest version of the library present.
61#
62# <azarah@gentoo.org> (26 Oct 2002)
63#
64gen_usr_ldscript() {
65 local libdir="$(get_libdir)"
66 # Just make sure it exists
67 dodir /usr/${libdir}
68
69 for lib in "${@}" ; do
70 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT
71 /* GNU ld script
72 Since Gentoo has critical dynamic libraries
73 in /lib, and the static versions in /usr/lib,
74 we need to have a "fake" dynamic lib in /usr/lib,
75 otherwise we run into linking problems.
76
77 See bug http://bugs.gentoo.org/4411 for more info.
78 */
79 GROUP ( /${libdir}/${lib} )
80 END_LDSCRIPT
81 fperms a+x "/usr/${libdir}/${lib}"
82 done
83}
84
85# Simple function to draw a line consisting of '=' the same length as $*
86# - only to be used by epatch()
87#
88# <azarah@gentoo.org> (11 Nov 2002)
89#
90draw_line() {
91 local i=0
92 local str_length=""
93
94 # Handle calls that do not have args, or wc not being installed ...
95 if [ -z "$1" -o ! -x "$(which wc 2>/dev/null)" ]
96 then
97 echo "==============================================================="
98 return 0
99 fi
100
101 # Get the length of $*
102 str_length="$(echo -n "$*" | wc -m)"
103
104 while [ "$i" -lt "${str_length}" ]
105 do
106 echo -n "="
107
108 i=$((i + 1))
109 done
110
111 echo
112
113 return 0
114} 39}
115 40
116# Default directory where patches are located 41# Default directory where patches are located
117EPATCH_SOURCE="${WORKDIR}/patch" 42EPATCH_SOURCE="${WORKDIR}/patch"
118# Default extension for patches 43# Default extension for patches
119EPATCH_SUFFIX="patch.bz2" 44EPATCH_SUFFIX="patch.bz2"
120# Default options for patch 45# Default options for patch
121# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571 46# 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. 47# Set --no-backup-if-mismatch so we don't leave '.orig' files behind.
48# Set -E to automatically remove empty files.
123EPATCH_OPTS="-g0 --no-backup-if-mismatch" 49EPATCH_OPTS="-g0 -E --no-backup-if-mismatch"
124# List of patches not to apply. Not this is only file names, 50# List of patches not to apply. Not this is only file names,
125# and not the full path .. 51# and not the full path ..
126EPATCH_EXCLUDE="" 52EPATCH_EXCLUDE=""
127# Change the printed message for a single patch. 53# Change the printed message for a single patch.
128EPATCH_SINGLE_MSG="" 54EPATCH_SINGLE_MSG=""
129# Change the printed message for multiple patches. 55# Change the printed message for multiple patches.
130EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..." 56EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..."
131# Force applying bulk patches even if not following the style: 57# Force applying bulk patches even if not following the style:
132# 58#
133# ??_${ARCH}_foo.${EPATCH_SUFFIX} 59# ??_${ARCH}_foo.${EPATCH_SUFFIX}
134# 60#
135EPATCH_FORCE="no" 61EPATCH_FORCE="no"
136 62
137# This function is for bulk patching, or in theory for just one 63# This function is for bulk patching, or in theory for just one
138# or two patches. 64# or two patches.
… …
149# 75#
150# Patches are applied in current directory. 76# Patches are applied in current directory.
151# 77#
152# Bulk Patches should preferibly have the form of: 78# Bulk Patches should preferibly have the form of:
153# 79#
154# ??_${ARCH}_foo.${EPATCH_SUFFIX} 80# ??_${ARCH}_foo.${EPATCH_SUFFIX}
155# 81#
156# For example: 82# For example:
157# 83#
158# 01_all_misc-fix.patch.bz2 84# 01_all_misc-fix.patch.bz2
159# 02_sparc_another-fix.patch.bz2 85# 02_sparc_another-fix.patch.bz2
160# 86#
161# This ensures that there are a set order, and you can have ARCH 87# This ensures that there are a set order, and you can have ARCH
162# specific patches. 88# specific patches.
163# 89#
164# If you however give an argument to epatch(), it will treat it as a 90# If you however give an argument to epatch(), it will treat it as a
… …
166# hand its a directory, it will set EPATCH_SOURCE to this. 92# hand its a directory, it will set EPATCH_SOURCE to this.
167# 93#
168# <azarah@gentoo.org> (10 Nov 2002) 94# <azarah@gentoo.org> (10 Nov 2002)
169# 95#
170epatch() { 96epatch() {
97 _epatch_draw_line() {
98 [[ -z $1 ]] && set "$(printf "%65s" '')"
99 echo "${1//?/=}"
100 }
171 _epatch_assert() { local _pipestatus=${PIPESTATUS[*]}; [[ ${_pipestatus// /} -eq 0 ]] ; } 101 _epatch_assert() { local _pipestatus=${PIPESTATUS[*]}; [[ ${_pipestatus// /} -eq 0 ]] ; }
172 local PIPE_CMD="" 102 local PIPE_CMD=""
173 local STDERR_TARGET="${T}/$$.out" 103 local STDERR_TARGET="${T}/$$.out"
174 local PATCH_TARGET="${T}/$$.patch" 104 local PATCH_TARGET="${T}/$$.patch"
175 local PATCH_SUFFIX="" 105 local PATCH_SUFFIX=""
… …
248 fi 178 fi
249 for x in ${EPATCH_SOURCE} 179 for x in ${EPATCH_SOURCE}
250 do 180 do
251 # New ARCH dependant patch naming scheme ... 181 # New ARCH dependant patch naming scheme ...
252 # 182 #
253 # ???_arch_foo.patch 183 # ???_arch_foo.patch
254 # 184 #
255 if [ -f ${x} ] && \ 185 if [ -f ${x} ] && \
256 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "${x/_${ARCH}_}" != "${x}" ] || \ 186 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "${x/_${ARCH}_}" != "${x}" ] || \
257 [ "${EPATCH_FORCE}" = "yes" ]) 187 [ "${EPATCH_FORCE}" = "yes" ])
258 then 188 then
259 local count=0 189 local count=0
260 local popts="${EPATCH_OPTS}" 190 local popts="${EPATCH_OPTS}"
261 local patchname=${x##*/} 191 local patchname=${x##*/}
262 192
… …
285 215
286 # Allow for prefix to differ ... im lazy, so shoot me :/ 216 # Allow for prefix to differ ... im lazy, so shoot me :/
287 while [ "${count}" -lt 5 ] 217 while [ "${count}" -lt 5 ]
288 do 218 do
289 # Generate some useful debug info ... 219 # Generate some useful debug info ...
290 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 220 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
291 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 221 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
292 222
293 if [ "${PATCH_SUFFIX}" != "patch" ] 223 if [ "${PATCH_SUFFIX}" != "patch" ]
294 then 224 then
295 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 225 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
296 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 226 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
297 else 227 else
298 PATCH_TARGET="${x}" 228 PATCH_TARGET="${x}"
299 fi 229 fi
300 230
301 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 231 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
302 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 232 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
303 233
304 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 234 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
305 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 235 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
306 236
307 if [ "${PATCH_SUFFIX}" != "patch" ] 237 if [ "${PATCH_SUFFIX}" != "patch" ]
308 then 238 then
309 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1 239 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
310 then 240 then
… …
316 fi 246 fi
317 fi 247 fi
318 248
319 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f ; _epatch_assert) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1 249 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f ; _epatch_assert) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
320 then 250 then
321 draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 251 _epatch_draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
322 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 252 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
323 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 253 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
324 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 254 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
325 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 255 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
326 256
327 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1 257 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1
328 _epatch_assert 258 _epatch_assert
329 259
330 if [ "$?" -ne 0 ] 260 if [ "$?" -ne 0 ]
… …
388 [[ -z ${T} ]] \ 318 [[ -z ${T} ]] \
389 && topdir="/tmp" \ 319 && topdir="/tmp" \
390 || topdir=${T} 320 || topdir=${T}
391 fi 321 fi
392 322
393 if [[ -z $(type -p mktemp) ]] ; then 323 if ! type -P mktemp > /dev/null ; then
324 # system lacks `mktemp` so we have to fake it
394 local tmp=/ 325 local tmp=/
395 while [[ -e ${tmp} ]] ; do 326 while [[ -e ${tmp} ]] ; do
396 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM} 327 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}
397 done 328 done
398 ${exe} "${tmp}" || ${exe} -p "${tmp}" 329 ${exe} "${tmp}" || ${exe} -p "${tmp}"
399 echo "${tmp}" 330 echo "${tmp}"
400 else 331 else
332 # the args here will give slightly wierd names on BSD,
333 # but should produce a usable file on all userlands
401 [[ ${exe} == "touch" ]] \ 334 if [[ ${exe} == "touch" ]] ; then
402 && exe="-p" \ 335 TMPDIR="${topdir}" mktemp -t tmp.XXXXXXXXXX
403 || exe="-d" 336 else
404 mktemp ${exe} "${topdir}" 337 TMPDIR="${topdir}" mktemp -dt tmp.XXXXXXXXXX
338 fi
405 fi 339 fi
406} 340}
407 341
408# Small wrapper for getent (Linux), nidump (Mac OS X), 342# Small wrapper for getent (Linux), nidump (Mac OS X),
409# and pw (FreeBSD) used in enewuser()/enewgroup() 343# and pw (FreeBSD) used in enewuser()/enewgroup()
… …
421 *) # Numeric 355 *) # Numeric
422 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 356 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
423 ;; 357 ;;
424 esac 358 esac
425 ;; 359 ;;
426 *-freebsd*) 360 *-freebsd*|*-dragonfly*)
427 local opts action="user" 361 local opts action="user"
428 [[ $1 == "passwd" ]] || action="group" 362 [[ $1 == "passwd" ]] || action="group"
429 363
430 # lookup by uid/gid 364 # lookup by uid/gid
431 if [[ $2 == [[:digit:]]* ]] ; then 365 if [[ $2 == [[:digit:]]* ]] ; then
… …
456# shell: /bin/false 390# shell: /bin/false
457# homedir: /dev/null 391# homedir: /dev/null
458# groups: none 392# groups: none
459# extra: comment of 'added by portage for ${PN}' 393# extra: comment of 'added by portage for ${PN}'
460enewuser() { 394enewuser() {
395 case ${EBUILD_PHASE} in
396 unpack|compile|test|install)
397 eerror "'enewuser()' called from '${EBUILD_PHASE}()' which is not a pkg_* function."
398 eerror "Package fails at QA and at life. Please file a bug."
399 die "Bad package! enewuser is only for use in pkg_* functions!"
400 esac
401
461 # get the username 402 # get the username
462 local euser=$1; shift 403 local euser=$1; shift
463 if [[ -z ${euser} ]] ; then 404 if [[ -z ${euser} ]] ; then
464 eerror "No username specified !" 405 eerror "No username specified !"
465 die "Cannot call enewuser without a username" 406 die "Cannot call enewuser without a username"
466 fi 407 fi
467 408
468 # lets see if the username already exists 409 # lets see if the username already exists
469 if [[ ${euser} == $(egetent passwd "${euser}" | cut -d: -f1) ]] ; then 410 if [[ -n $(egetent passwd "${euser}") ]] ; then
470 return 0 411 return 0
471 fi 412 fi
472 einfo "Adding user '${euser}' to your system ..." 413 einfo "Adding user '${euser}' to your system ..."
473 414
474 # options to pass to useradd 415 # options to pass to useradd
475 local opts= 416 local opts=
476 417
477 # handle uid 418 # handle uid
478 local euid=$1; shift 419 local euid=$1; shift
479 if [[ ! -z ${euid} ]] && [[ ${euid} != "-1" ]] ; then 420 if [[ -n ${euid} && ${euid} != -1 ]] ; then
480 if [[ ${euid} -gt 0 ]] ; then 421 if [[ ${euid} -gt 0 ]] ; then
481 if [[ ! -z $(egetent passwd ${euid}) ]] ; then 422 if [[ -n $(egetent passwd ${euid}) ]] ; then
482 euid="next" 423 euid="next"
483 fi 424 fi
484 else 425 else
485 eerror "Userid given but is not greater than 0 !" 426 eerror "Userid given but is not greater than 0 !"
486 die "${euid} is not a valid UID" 427 die "${euid} is not a valid UID"
487 fi 428 fi
488 else 429 else
489 euid="next" 430 euid="next"
490 fi 431 fi
491 if [[ ${euid} == "next" ]] ; then 432 if [[ ${euid} == "next" ]] ; then
492 for euid in $(seq 101 999) ; do 433 for ((euid = 101; euid <= 999; euid++)); do
493 [[ -z $(egetent passwd ${euid}) ]] && break 434 [[ -z $(egetent passwd ${euid}) ]] && break
494 done 435 done
495 fi 436 fi
496 opts="${opts} -u ${euid}" 437 opts="${opts} -u ${euid}"
497 einfo " - Userid: ${euid}" 438 einfo " - Userid: ${euid}"
498 439
499 # handle shell 440 # handle shell
500 local eshell=$1; shift 441 local eshell=$1; shift
501 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then 442 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
502 if [[ ! -e ${eshell} ]] ; then 443 if [[ ! -e ${ROOT}${eshell} ]] ; then
503 eerror "A shell was specified but it does not exist !" 444 eerror "A shell was specified but it does not exist !"
504 die "${eshell} does not exist" 445 die "${eshell} does not exist in ${ROOT}"
446 fi
447 if [[ ${eshell} == */false || ${eshell} == */nologin ]] ; then
448 eerror "Do not specify ${eshell} yourself, use -1"
449 die "Pass '-1' as the shell parameter"
505 fi 450 fi
506 else 451 else
507 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do 452 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do
508 [[ -x ${ROOT}${shell} ]] && break 453 [[ -x ${ROOT}${shell} ]] && break
509 done 454 done
510 455
511 if [[ ${shell} == "/dev/null" ]] ; then 456 if [[ ${shell} == "/dev/null" ]] ; then
512 eerror "Unable to identify the shell to use" 457 eerror "Unable to identify the shell to use, proceeding with userland default."
513 die "Unable to identify the shell to use" 458 case ${USERLAND} in
459 GNU) shell="/bin/false" ;;
460 BSD) shell="/sbin/nologin" ;;
461 Darwin) shell="/usr/sbin/nologin" ;;
462 *) die "Unable to identify the default shell for userland ${USERLAND}"
463 esac
514 fi 464 fi
515 465
516 eshell=${shell} 466 eshell=${shell}
517 fi 467 fi
518 einfo " - Shell: ${eshell}" 468 einfo " - Shell: ${eshell}"
… …
580 einfo "Please report the ebuild along with the info below" 530 einfo "Please report the ebuild along with the info below"
581 einfo "eextra: $@" 531 einfo "eextra: $@"
582 die "Required function missing" 532 die "Required function missing"
583 fi 533 fi
584 ;; 534 ;;
585 *-freebsd*) 535 *-freebsd*|*-dragonfly*)
586 if [[ -z $@ ]] ; then 536 if [[ -z $@ ]] ; then
587 pw useradd ${euser} ${opts} \ 537 pw useradd ${euser} ${opts} \
588 -c "added by portage for ${PN}" \ 538 -c "added by portage for ${PN}" \
589 die "enewuser failed" 539 die "enewuser failed"
590 else 540 else
… …
647# Default values if you do not specify any: 597# Default values if you do not specify any:
648# groupname: REQUIRED ! 598# groupname: REQUIRED !
649# gid: next available (see groupadd(8)) 599# gid: next available (see groupadd(8))
650# extra: none 600# extra: none
651enewgroup() { 601enewgroup() {
602 case ${EBUILD_PHASE} in
603 unpack|compile|test|install)
604 eerror "'enewgroup()' called from '${EBUILD_PHASE}()' which is not a pkg_* function."
605 eerror "Package fails at QA and at life. Please file a bug."
606 die "Bad package! enewgroup is only for use in pkg_* functions!"
607 esac
608
652 # get the group 609 # get the group
653 local egroup="$1"; shift 610 local egroup="$1"; shift
654 if [ -z "${egroup}" ] 611 if [ -z "${egroup}" ]
655 then 612 then
656 eerror "No group specified !" 613 eerror "No group specified !"
657 die "Cannot call enewgroup without a group" 614 die "Cannot call enewgroup without a group"
658 fi 615 fi
659 616
660 # see if group already exists 617 # see if group already exists
661 if [ "${egroup}" == "`egetent group \"${egroup}\" | cut -d: -f1`" ] 618 if [[ -n $(egetent group "${egroup}") ]]; then
662 then
663 return 0 619 return 0
664 fi 620 fi
665 einfo "Adding group '${egroup}' to your system ..." 621 einfo "Adding group '${egroup}' to your system ..."
666 622
667 # options to pass to useradd 623 # options to pass to useradd
… …
710 fi 666 fi
711 667
712 # If we need the next available 668 # If we need the next available
713 case ${egid} in 669 case ${egid} in
714 *[!0-9]*) # Non numeric 670 *[!0-9]*) # Non numeric
715 for egid in $(seq 101 999); do 671 for ((egid = 101; egid <= 999; egid++)); do
716 [ -z "`egetent group ${egid}`" ] && break 672 [[ -z $(egetent group ${egid}) ]] && break
717 done 673 done
718 esac 674 esac
719 dscl . create /groups/${egroup} gid ${egid} 675 dscl . create /groups/${egroup} gid ${egid}
720 dscl . create /groups/${egroup} passwd '*' 676 dscl . create /groups/${egroup} passwd '*'
721 ;; 677 ;;
722 678
723 *-freebsd*) 679 *-freebsd*|*-dragonfly*)
724 case ${egid} in 680 case ${egid} in
725 *[!0-9]*) # Non numeric 681 *[!0-9]*) # Non numeric
726 for egid in $(seq 101 999); do 682 for ((egid = 101; egid <= 999; egid++)); do
727 [ -z "`egetent group ${egid}`" ] && break 683 [[ -z $(egetent group ${egid}) ]] && break
728 done 684 done
729 esac 685 esac
730 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 686 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
731 ;; 687 ;;
732 688
733 *-netbsd*) 689 *-netbsd*)
734 case ${egid} in 690 case ${egid} in
735 *[!0-9]*) # Non numeric 691 *[!0-9]*) # Non numeric
736 for egid in $(seq 101 999); do 692 for ((egid = 101; egid <= 999; egid++)); do
737 [ -z "`egetent group ${egid}`" ] && break 693 [[ -z $(egetent group ${egid}) ]] && break
738 done 694 done
739 esac 695 esac
740 groupadd -g ${egid} ${egroup} || die "enewgroup failed" 696 groupadd -g ${egid} ${egroup} || die "enewgroup failed"
741 ;; 697 ;;
742 698
… …
750# Simple script to replace 'dos2unix' binaries 706# Simple script to replace 'dos2unix' binaries
751# vapier@gentoo.org 707# vapier@gentoo.org
752# 708#
753# edos2unix(file, <more files> ...) 709# edos2unix(file, <more files> ...)
754edos2unix() { 710edos2unix() {
755 for f in "$@" 711 echo "$@" | xargs sed -i 's/\r$//'
756 do
757 cp "${f}" ${T}/edos2unix
758 sed 's/\r$//' ${T}/edos2unix > "${f}"
759 done
760} 712}
761 713
762 714
763############################################################## 715##############################################################
764# START: Handle .desktop files and menu entries # 716# START: Handle .desktop files and menu entries #
765# maybe this should be separated into a new eclass some time # 717# maybe this should be separated into a new eclass some time #
766# lanius@gentoo.org # 718# lanius@gentoo.org #
767############################################################## 719##############################################################
768 720
769# Make a desktop file ! 721# Make a desktop file !
770# Great for making those icons in kde/gnome startmenu ! 722# Great for making those icons in kde/gnome startmenu !
771# Amaze your friends ! Get the women ! Join today ! 723# Amaze your friends ! Get the women ! Join today !
772# 724#
773# make_desktop_entry(<binary>, [name], [icon], [type], [path]) 725# make_desktop_entry(<command>, [name], [icon], [type], [path])
774# 726#
775# binary: what binary does the app run with ? 727# binary: what command does the app run with ?
776# name: the name that will show up in the menu 728# name: the name that will show up in the menu
777# icon: give your little like a pretty little icon ... 729# icon: give your little like a pretty little icon ...
778# this can be relative (to /usr/share/pixmaps) or 730# this can be relative (to /usr/share/pixmaps) or
779# a full path to an icon 731# a full path to an icon
780# type: what kind of application is this ? for categories: 732# type: what kind of application is this ? for categories:
781# http://www.freedesktop.org/Standards/desktop-entry-spec 733# http://www.freedesktop.org/Standards/desktop-entry-spec
782# path: if your app needs to startup in a specific dir 734# path: if your app needs to startup in a specific dir
783make_desktop_entry() { 735make_desktop_entry() {
784 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1 736 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1
785 737
… …
793 local catmaj=${CATEGORY%%-*} 745 local catmaj=${CATEGORY%%-*}
794 local catmin=${CATEGORY##*-} 746 local catmin=${CATEGORY##*-}
795 case ${catmaj} in 747 case ${catmaj} in
796 app) 748 app)
797 case ${catmin} in 749 case ${catmin} in
798 admin) type=System;; 750 admin) type=System;;
799 cdr) type=DiscBurning;; 751 cdr) type=DiscBurning;;
800 dicts) type=Dictionary;; 752 dicts) type=Dictionary;;
801 editors) type=TextEditor;; 753 editors) type=TextEditor;;
802 emacs) type=TextEditor;; 754 emacs) type=TextEditor;;
803 emulation) type=Emulator;; 755 emulation) type=Emulator;;
804 laptop) type=HardwareSettings;; 756 laptop) type=HardwareSettings;;
805 office) type=Office;; 757 office) type=Office;;
806 vim) type=TextEditor;; 758 vim) type=TextEditor;;
807 xemacs) type=TextEditor;; 759 xemacs) type=TextEditor;;
808 *) type=;; 760 *) type=;;
809 esac 761 esac
810 ;; 762 ;;
811 763
812 dev) 764 dev)
813 type="Development" 765 type="Development"
814 ;; 766 ;;
815 767
816 games) 768 games)
817 case ${catmin} in 769 case ${catmin} in
818 action) type=ActionGame;; 770 action|fps) type=ActionGame;;
819 arcade) type=ArcadeGame;; 771 arcade) type=ArcadeGame;;
820 board) type=BoardGame;; 772 board) type=BoardGame;;
821 kid) type=KidsGame;; 773 kids) type=KidsGame;;
822 emulation) type=Emulator;; 774 emulation) type=Emulator;;
823 puzzle) type=LogicGame;; 775 puzzle) type=LogicGame;;
824 rpg) type=RolePlaying;; 776 rpg) type=RolePlaying;;
825 roguelike) type=RolePlaying;; 777 roguelike) type=RolePlaying;;
826 simulation) type=Simulation;; 778 simulation) type=Simulation;;
827 sports) type=SportsGame;; 779 sports) type=SportsGame;;
828 strategy) type=StrategyGame;; 780 strategy) type=StrategyGame;;
829 *) type=;; 781 *) type=;;
830 esac 782 esac
831 type="Game;${type}" 783 type="Game;${type}"
832 ;; 784 ;;
833 785
834 mail) 786 mail)
… …
838 media) 790 media)
839 case ${catmin} in 791 case ${catmin} in
840 gfx) type=Graphics;; 792 gfx) type=Graphics;;
841 radio) type=Tuner;; 793 radio) type=Tuner;;
842 sound) type=Audio;; 794 sound) type=Audio;;
843 tv) type=TV;; 795 tv) type=TV;;
844 video) type=Video;; 796 video) type=Video;;
845 *) type=;; 797 *) type=;;
846 esac 798 esac
847 type="AudioVideo;${type}" 799 type="AudioVideo;${type}"
848 ;; 800 ;;
849 801
850 net) 802 net)
851 case ${catmin} in 803 case ${catmin} in
852 dialup) type=Dialup;; 804 dialup) type=Dialup;;
853 ftp) type=FileTransfer;; 805 ftp) type=FileTransfer;;
854 im) type=InstantMessaging;; 806 im) type=InstantMessaging;;
855 irc) type=IRCClient;; 807 irc) type=IRCClient;;
856 mail) type=Email;; 808 mail) type=Email;;
857 news) type=News;; 809 news) type=News;;
858 nntp) type=News;; 810 nntp) type=News;;
859 p2p) type=FileTransfer;; 811 p2p) type=FileTransfer;;
860 *) type=;; 812 *) type=;;
861 esac 813 esac
862 type="Network;${type}" 814 type="Network;${type}"
863 ;; 815 ;;
864 816
865 sci) 817 sci)
866 case ${catmin} in 818 case ${catmin} in
867 astro*) type=Astronomy;; 819 astro*) type=Astronomy;;
868 bio*) type=Biology;; 820 bio*) type=Biology;;
869 calc*) type=Calculator;; 821 calc*) type=Calculator;;
870 chem*) type=Chemistry;; 822 chem*) type=Chemistry;;
871 geo*) type=Geology;; 823 geo*) type=Geology;;
872 math*) type=Math;; 824 math*) type=Math;;
873 *) type=;; 825 *) type=;;
874 esac 826 esac
875 type="Science;${type}" 827 type="Science;${type}"
876 ;; 828 ;;
877 829
878 www) 830 www)
879 case ${catmin} in 831 case ${catmin} in
880 client) type=WebBrowser;; 832 client) type=WebBrowser;;
881 *) type=;; 833 *) type=;;
882 esac 834 esac
883 type="Network" 835 type="Network"
884 ;; 836 ;;
885 837
886 *) 838 *)
… …
891 if [ "${SLOT}" == "0" ] ; then 843 if [ "${SLOT}" == "0" ] ; then
892 local desktop_name="${PN}" 844 local desktop_name="${PN}"
893 else 845 else
894 local desktop_name="${PN}-${SLOT}" 846 local desktop_name="${PN}-${SLOT}"
895 fi 847 fi
848 local desktop="${T}/$(echo ${exec} | sed 's:[[:space:]/:]:_:g')-${desktop_name}.desktop"
896 local desktop=${T}/${exec%% *}-${desktop_name}.desktop 849 #local desktop=${T}/${exec%% *:-${desktop_name}}.desktop
897 850
851 cat <<-EOF > "${desktop}"
898echo "[Desktop Entry] 852 [Desktop Entry]
899Encoding=UTF-8 853 Encoding=UTF-8
900Version=0.9.2 854 Version=0.9.2
901Name=${name} 855 Name=${name}
902Type=Application 856 Type=Application
903Comment=${DESCRIPTION} 857 Comment=${DESCRIPTION}
904Exec=${exec} 858 Exec=${exec}
859 TryExec=${exec%% *}
905Path=${path} 860 Path=${path}
906Icon=${icon} 861 Icon=${icon}
907Categories=Application;${type};" > "${desktop}" 862 Categories=Application;${type};
863 EOF
908 864
909 ( 865 (
910 # wrap the env here so that the 'insinto' call 866 # wrap the env here so that the 'insinto' call
911 # doesn't corrupt the env of the caller 867 # doesn't corrupt the env of the caller
912 insinto /usr/share/applications 868 insinto /usr/share/applications
913 doins "${desktop}" 869 doins "${desktop}"
914 ) 870 )
915} 871}
916 872
873
874# Validate desktop entries using desktop-file-utils
875# Carsten Lohrke <carlo@gentoo.org>
876#
877# Usage: validate_desktop_entries [directory ...]
878
879validate_desktop_entries() {
880 if [[ -x /usr/bin/desktop-file-validate ]] ; then
881 einfo "Checking desktop entry validity"
882 local directories=""
883 for d in /usr/share/applications $@ ; do
884 [[ -d ${D}${d} ]] && directories="${directories} ${D}${d}"
885 done
886 if [[ -n ${directories} ]] ; then
887 for FILE in $(find ${directories} -name "*\.desktop" \
888 -not -path '*.hidden*' | sort -u 2>/dev/null)
889 do
890 local temp=$(desktop-file-validate ${FILE} | grep -v "warning:" | \
891 sed -e "s|error: ||" -e "s|${FILE}:|--|g" )
892 [[ -n $temp ]] && elog ${temp/--/${FILE/${D}/}:}
893 done
894 fi
895 echo ""
896 else
897 einfo "Passing desktop entry validity check. Install dev-util/desktop-file-utils, if you want to help to improve Gentoo."
898 fi
899}
900
901
917# Make a GDM/KDM Session file 902# Make a GDM/KDM Session file
918# 903#
919# make_desktop_entry(<title>, <command>) 904# make_session_desktop(<title>, <command>)
920# title: File to execute to start the Window Manager 905# title: File to execute to start the Window Manager
921# command: Name of the Window Manager 906# command: Name of the Window Manager
922 907
923make_session_desktop() { 908make_session_desktop() {
924 [[ -z $1 ]] && eerror "make_session_desktop: You must specify the title" && return 1 909 [[ -z $1 ]] && eerror "make_session_desktop: You must specify the title" && return 1
… …
926 911
927 local title=$1 912 local title=$1
928 local command=$2 913 local command=$2
929 local desktop=${T}/${wm}.desktop 914 local desktop=${T}/${wm}.desktop
930 915
916 cat <<-EOF > "${desktop}"
931echo "[Desktop Entry] 917 [Desktop Entry]
932Encoding=UTF-8 918 Encoding=UTF-8
933Name=${title} 919 Name=${title}
934Comment=This session logs you into ${title} 920 Comment=This session logs you into ${title}
935Exec=${command} 921 Exec=${command}
936TryExec=${command} 922 TryExec=${command}
937Type=Application" > "${desktop}" 923 Type=Application
924 EOF
938 925
926 (
927 # wrap the env here so that the 'insinto' call
928 # doesn't corrupt the env of the caller
939 insinto /usr/share/xsessions 929 insinto /usr/share/xsessions
940 doins "${desktop}" 930 doins "${desktop}"
931 )
941} 932}
942 933
943domenu() { 934domenu() {
935 (
936 # wrap the env here so that the 'insinto' call
937 # doesn't corrupt the env of the caller
944 local i j 938 local i j ret=0
945 insinto /usr/share/applications 939 insinto /usr/share/applications
946 for i in "$@" ; do 940 for i in "$@" ; do
947 if [[ -f ${i} ]] ; then 941 if [[ -f ${i} ]] ; then
948 doins "${i}" 942 doins "${i}"
943 ((ret+=$?))
949 elif [[ -d ${i} ]] ; then 944 elif [[ -d ${i} ]] ; then
950 for j in "${i}"/*.desktop ; do 945 for j in "${i}"/*.desktop ; do
951 doins "${j}" 946 doins "${j}"
947 ((ret+=$?))
952 done 948 done
953 fi 949 fi
954 done 950 done
951 exit ${ret}
952 )
955} 953}
956newmenu() { 954newmenu() {
955 (
956 # wrap the env here so that the 'insinto' call
957 # doesn't corrupt the env of the caller
957 insinto /usr/share/applications 958 insinto /usr/share/applications
958 newins "$1" "$2" 959 newins "$@"
960 )
959} 961}
960 962
961doicon() { 963doicon() {
964 (
965 # wrap the env here so that the 'insinto' call
966 # doesn't corrupt the env of the caller
962 local i j 967 local i j ret
963 insinto /usr/share/pixmaps 968 insinto /usr/share/pixmaps
964 for i in "$@" ; do 969 for i in "$@" ; do
965 if [[ -f ${i} ]] ; then 970 if [[ -f ${i} ]] ; then
966 doins "${i}" 971 doins "${i}"
972 ((ret+=$?))
967 elif [[ -d ${i} ]] ; then 973 elif [[ -d ${i} ]] ; then
968 for j in "${i}"/*.png ; do 974 for j in "${i}"/*.png ; do
969 doins "${j}" 975 doins "${j}"
976 ((ret+=$?))
970 done 977 done
971 fi 978 fi
972 done 979 done
980 exit ${ret}
981 )
973} 982}
974newicon() { 983newicon() {
984 (
985 # wrap the env here so that the 'insinto' call
986 # doesn't corrupt the env of the caller
975 insinto /usr/share/pixmaps 987 insinto /usr/share/pixmaps
976 newins "$1" "$2" 988 newins "$@"
989 )
977} 990}
978 991
979############################################################## 992##############################################################
980# END: Handle .desktop files and menu entries # 993# END: Handle .desktop files and menu entries #
981############################################################## 994##############################################################
982 995
983 996
984# for internal use only (unpack_pdv and unpack_makeself) 997# for internal use only (unpack_pdv and unpack_makeself)
985find_unpackable_file() { 998find_unpackable_file() {
… …
1004# the middle of the archive. Valve seems to use it a lot ... too bad 1017# the middle of the archive. Valve seems to use it a lot ... too bad
1005# it seems to like to segfault a lot :(. So lets take it apart ourselves. 1018# it seems to like to segfault a lot :(. So lets take it apart ourselves.
1006# 1019#
1007# Usage: unpack_pdv [file to unpack] [size of off_t] 1020# Usage: unpack_pdv [file to unpack] [size of off_t]
1008# - you have to specify the off_t size ... i have no idea how to extract that 1021# - you have to specify the off_t size ... i have no idea how to extract that
1009# information out of the binary executable myself. basically you pass in 1022# information out of the binary executable myself. basically you pass in
1010# the size of the off_t type (in bytes) on the machine that built the pdv 1023# the size of the off_t type (in bytes) on the machine that built the pdv
1011# archive. one way to determine this is by running the following commands: 1024# archive. one way to determine this is by running the following commands:
1012# strings <pdv archive> | grep lseek 1025# strings <pdv archive> | grep lseek
1013# strace -elseek <pdv archive> 1026# strace -elseek <pdv archive>
1014# basically look for the first lseek command (we do the strings/grep because 1027# basically look for the first lseek command (we do the strings/grep because
1015# sometimes the function call is _llseek or something) and steal the 2nd 1028# sometimes the function call is _llseek or something) and steal the 2nd
1016# parameter. here is an example: 1029# parameter. here is an example:
1017# root@vapier 0 pdv_unpack # strings hldsupdatetool.bin | grep lseek 1030# root@vapier 0 pdv_unpack # strings hldsupdatetool.bin | grep lseek
1018# lseek 1031# lseek
1019# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 1032# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
1020# lseek(3, -4, SEEK_END) = 2981250 1033# lseek(3, -4, SEEK_END) = 2981250
1021# thus we would pass in the value of '4' as the second parameter. 1034# thus we would pass in the value of '4' as the second parameter.
1022unpack_pdv() { 1035unpack_pdv() {
1023 local src=$(find_unpackable_file $1) 1036 local src=$(find_unpackable_file "$1")
1024 local sizeoff_t=$2 1037 local sizeoff_t=$2
1025 1038
1026 [[ -z ${src} ]] && die "Could not locate source for '$1'" 1039 [[ -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 :(" 1040 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :("
1028 1041
1029 local shrtsrc=$(basename "${src}") 1042 local shrtsrc=$(basename "${src}")
1030 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1043 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1031 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1044 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\"` 1045 local tailskip=$(tail -c $((${sizeoff_t}*2)) "${src}" | head -c ${sizeoff_t} | hexdump -e \"%i\")
1033 1046
1034 # grab metadata for debug reasons 1047 # grab metadata for debug reasons
1035 local metafile="$(emktemp)" 1048 local metafile=$(emktemp)
1036 tail -c +$((${metaskip}+1)) ${src} > ${metafile} 1049 tail -c +$((${metaskip}+1)) "${src}" > "${metafile}"
1037 1050
1038 # rip out the final file name from the metadata 1051 # rip out the final file name from the metadata
1039 local datafile="`tail -c +$((${metaskip}+1)) ${src} | strings | head -n 1`" 1052 local datafile=$(tail -c +$((${metaskip}+1)) "${src}" | strings | head -n 1)
1040 datafile="`basename ${datafile}`" 1053 datafile=$(basename "${datafile}")
1041 1054
1042 # now lets uncompress/untar the file if need be 1055 # now lets uncompress/untar the file if need be
1043 local tmpfile="$(emktemp)" 1056 local tmpfile=$(emktemp)
1044 tail -c +$((${tailskip}+1)) ${src} 2>/dev/null | head -c 512 > ${tmpfile} 1057 tail -c +$((${tailskip}+1)) ${src} 2>/dev/null | head -c 512 > ${tmpfile}
1045 1058
1046 local iscompressed="`file -b ${tmpfile}`" 1059 local iscompressed=$(file -b "${tmpfile}")
1047 if [ "${iscompressed:0:8}" == "compress" ] ; then 1060 if [[ ${iscompressed:0:8} == "compress" ]] ; then
1048 iscompressed=1 1061 iscompressed=1
1049 mv ${tmpfile}{,.Z} 1062 mv ${tmpfile}{,.Z}
1050 gunzip ${tmpfile} 1063 gunzip ${tmpfile}
1051 else 1064 else
1052 iscompressed=0 1065 iscompressed=0
1053 fi 1066 fi
1054 local istar="`file -b ${tmpfile}`" 1067 local istar=$(file -b "${tmpfile}")
1055 if [ "${istar:0:9}" == "POSIX tar" ] ; then 1068 if [[ ${istar:0:9} == "POSIX tar" ]] ; then
1056 istar=1 1069 istar=1
1057 else 1070 else
1058 istar=0 1071 istar=0
1059 fi 1072 fi
1060 1073
… …
1096# many other game companies. 1109# many other game companies.
1097# 1110#
1098# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1111# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1099# - If the file is not specified then unpack will utilize ${A}. 1112# - If the file is not specified then unpack will utilize ${A}.
1100# - If the offset is not specified then we will attempt to extract 1113# - If the offset is not specified then we will attempt to extract
1101# the proper offset from the script itself. 1114# the proper offset from the script itself.
1102unpack_makeself() { 1115unpack_makeself() {
1103 local src_input=${1:-${A}} 1116 local src_input=${1:-${A}}
1104 local src=$(find_unpackable_file "${src_input}") 1117 local src=$(find_unpackable_file "${src_input}")
1105 local skip=$2 1118 local skip=$2
1106 local exe=$3 1119 local exe=$3
… …
1112 if [[ -z ${skip} ]] ; then 1125 if [[ -z ${skip} ]] ; then
1113 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}') 1126 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}')
1114 local skip=0 1127 local skip=0
1115 exe=tail 1128 exe=tail
1116 case ${ver} in 1129 case ${ver} in
1117 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same 1130 1.5.*|1.6.0-nv) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same
1118 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1131 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1119 ;; 1132 ;;
1120 2.0|2.0.1) 1133 2.0|2.0.1)
1121 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-) 1134 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-)
1122 ;; 1135 ;;
… …
1152 dd) exe="dd ibs=${skip} skip=1 obs=1024 conv=sync if='${src}'";; 1165 dd) exe="dd ibs=${skip} skip=1 obs=1024 conv=sync if='${src}'";;
1153 *) die "makeself cant handle exe '${exe}'" 1166 *) die "makeself cant handle exe '${exe}'"
1154 esac 1167 esac
1155 1168
1156 # lets grab the first few bytes of the file to figure out what kind of archive it is 1169 # lets grab the first few bytes of the file to figure out what kind of archive it is
1157 local tmpfile="$(emktemp)" 1170 local tmpfile=$(emktemp)
1158 eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}" 1171 eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}"
1159 local filetype="$(file -b "${tmpfile}")" 1172 local filetype=$(file -b "${tmpfile}")
1160 case ${filetype} in 1173 case ${filetype} in
1161 *tar\ archive) 1174 *tar\ archive*)
1162 eval ${exe} | tar --no-same-owner -xf - 1175 eval ${exe} | tar --no-same-owner -xf -
1163 ;; 1176 ;;
1164 bzip2*) 1177 bzip2*)
1165 eval ${exe} | bzip2 -dc | tar --no-same-owner -xf - 1178 eval ${exe} | bzip2 -dc | tar --no-same-owner -xf -
1166 ;; 1179 ;;
… …
1202 # accepted ... if we don't find a match, we make the user accept 1215 # accepted ... if we don't find a match, we make the user accept
1203 local shopts=$- 1216 local shopts=$-
1204 local alic 1217 local alic
1205 set -o noglob #so that bash doesn't expand "*" 1218 set -o noglob #so that bash doesn't expand "*"
1206 for alic in ${ACCEPT_LICENSE} ; do 1219 for alic in ${ACCEPT_LICENSE} ; do
1207 if [[ ${alic} == * || ${alic} == ${l} ]]; then 1220 if [[ ${alic} == ${l} ]]; then
1208 set +o noglob; set -${shopts} #reset old shell opts 1221 set +o noglob; set -${shopts} #reset old shell opts
1209 return 0 1222 return 0
1210 fi 1223 fi
1211 done 1224 done
1212 set +o noglob; set -$shopts #reset old shell opts 1225 set +o noglob; set -$shopts #reset old shell opts
1213 1226
1214 local licmsg="$(emktemp)" 1227 local licmsg=$(emktemp)
1215 cat << EOF > ${licmsg} 1228 cat <<-EOF > ${licmsg}
1216********************************************************** 1229 **********************************************************
1217The following license outlines the terms of use of this 1230 The following license outlines the terms of use of this
1218package. You MUST accept this license for installation to 1231 package. You MUST accept this license for installation to
1219continue. When you are done viewing, hit 'q'. If you 1232 continue. When you are done viewing, hit 'q'. If you
1220CTRL+C out of this, the install will not run! 1233 CTRL+C out of this, the install will not run!
1221********************************************************** 1234 **********************************************************
1222 1235
1223EOF 1236 EOF
1224 cat ${lic} >> ${licmsg} 1237 cat ${lic} >> ${licmsg}
1225 ${PAGER:-less} ${licmsg} || die "Could not execute pager (${PAGER}) to accept ${lic}" 1238 ${PAGER:-less} ${licmsg} || die "Could not execute pager (${PAGER}) to accept ${lic}"
1226 einfon "Do you accept the terms of this license (${l})? [yes/no] " 1239 einfon "Do you accept the terms of this license (${l})? [yes/no] "
1227 read alic 1240 read alic
1228 case ${alic} in 1241 case ${alic} in
… …
1245# and when the function returns, you can assume that the cd has been 1258# and when the function returns, you can assume that the cd has been
1246# found at CDROM_ROOT. 1259# found at CDROM_ROOT.
1247# 1260#
1248# normally the cdrom functions will refer to the cds as 'cd #1', 'cd #2', 1261# normally the cdrom functions will refer to the cds as 'cd #1', 'cd #2',
1249# etc... if you want to give the cds better names, then just export 1262# etc... if you want to give the cds better names, then just export
1250# the CDROM_NAME_X variables before calling cdrom_get_cds(). 1263# the appropriate CDROM_NAME variable before calling cdrom_get_cds().
1264# - CDROM_NAME="fooie cd" - for when you only want 1 cd
1265# - CDROM_NAME_1="install cd" - for when you want more than 1 cd
1266# CDROM_NAME_2="data cd"
1267# - CDROM_NAME_SET=( "install cd" "data cd" ) - short hand for CDROM_NAME_#
1251# 1268#
1252# for those multi cd ebuilds, see the cdrom_load_next_cd() below. 1269# for those multi cd ebuilds, see the cdrom_load_next_cd() below.
1253# 1270#
1254# Usage: cdrom_get_cds <file on cd1> [file on cd2] [file on cd3] [...] 1271# Usage: cdrom_get_cds <file on cd1> [file on cd2] [file on cd3] [...]
1255# - this will attempt to locate a cd based upon a file that is on 1272# - this will attempt to locate a cd based upon a file that is on
1256# the cd ... the more files you give this function, the more cds 1273# the cd ... the more files you give this function, the more cds
1257# the cdrom functions will handle 1274# the cdrom functions will handle
1258cdrom_get_cds() { 1275cdrom_get_cds() {
1259 # first we figure out how many cds we're dealing with by 1276 # first we figure out how many cds we're dealing with by
1260 # the # of files they gave us 1277 # the # of files they gave us
1261 local cdcnt=0 1278 local cdcnt=0
1262 local f= 1279 local f=
… …
1306 echo 1323 echo
1307 einfo "For example:" 1324 einfo "For example:"
1308 einfo "export CD_ROOT=/mnt/cdrom" 1325 einfo "export CD_ROOT=/mnt/cdrom"
1309 echo 1326 echo
1310 else 1327 else
1328 if [[ -n ${CDROM_NAME_SET} ]] ; then
1329 # Translate the CDROM_NAME_SET array into CDROM_NAME_#
1330 cdcnt=0
1331 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1332 ((++cdcnt))
1333 export CDROM_NAME_${cdcnt}="${CDROM_NAME_SET[$((${cdcnt}-1))]}"
1334 done
1335 fi
1336
1311 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1337 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1312 cdcnt=0 1338 cdcnt=0
1313 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1339 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1314 ((++cdcnt)) 1340 ((++cdcnt))
1315 var="CDROM_NAME_${cdcnt}" 1341 var="CDROM_NAME_${cdcnt}"
… …
1382 1408
1383 while [[ -n ${cdset[${i}]} ]] ; do 1409 while [[ -n ${cdset[${i}]} ]] ; do
1384 local dir=$(dirname ${cdset[${i}]}) 1410 local dir=$(dirname ${cdset[${i}]})
1385 local file=$(basename ${cdset[${i}]}) 1411 local file=$(basename ${cdset[${i}]})
1386 1412
1387 for mline in $(mount | gawk '/(iso|cdrom|fs=cdfss)/ {print $3}') ; do 1413 local point= node= fs= foo=
1388 [[ -d ${mline}/${dir} ]] || continue 1414 while read point node fs foo ; do
1415 [[ " cd9660 iso9660 udf " != *" ${fs} "* ]] && \
1416 ! [[ ${fs} == "subfs" && ",${opts}," == *",fs=cdfss,"* ]] \
1417 && continue
1418 point=${point//\040/ }
1389 if [[ -n $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] ; then 1419 [[ -z $(find "${point}/${dir}" -maxdepth 1 -iname "${file}") ]] && continue
1390 export CDROM_ROOT=${mline} 1420 export CDROM_ROOT=${point}
1391 export CDROM_SET=${i} 1421 export CDROM_SET=${i}
1392 export CDROM_MATCH=${cdset[${i}]} 1422 export CDROM_MATCH=${cdset[${i}]}
1393 return 1423 return
1394 fi 1424 done <<< "$(get_mounts)"
1395 done
1396 1425
1397 ((++i)) 1426 ((++i))
1398 done 1427 done
1399 1428
1400 echo 1429 echo
… …
1420 echo 1449 echo
1421 einfo "If you are having trouble with the detection" 1450 einfo "If you are having trouble with the detection"
1422 einfo "of your CD, it is possible that you do not have" 1451 einfo "of your CD, it is possible that you do not have"
1423 einfo "Joliet support enabled in your kernel. Please" 1452 einfo "Joliet support enabled in your kernel. Please"
1424 einfo "check that CONFIG_JOLIET is enabled in your kernel." 1453 einfo "check that CONFIG_JOLIET is enabled in your kernel."
1425 read 1454 read || die "something is screwed with your system"
1426 done 1455 done
1427} 1456}
1428 1457
1429# Make sure that LINGUAS only contains languages that 1458# Make sure that LINGUAS only contains languages that
1430# a package can support 1459# a package can support
1431# 1460#
1432# usage: strip-linguas <allow LINGUAS> 1461# usage: strip-linguas <allow LINGUAS>
1433# strip-linguas -i <directories of .po files> 1462# strip-linguas -i <directories of .po files>
1434# strip-linguas -u <directories of .po files> 1463# strip-linguas -u <directories of .po files>
1435# 1464#
1436# The first form allows you to specify a list of LINGUAS. 1465# The first form allows you to specify a list of LINGUAS.
1437# The -i builds a list of po files found in all the 1466# The -i builds a list of po files found in all the
1438# directories and uses the intersection of the lists. 1467# directories and uses the intersection of the lists.
1439# The -u builds a list of po files found in all the 1468# The -u builds a list of po files found in all the
1440# directories and uses the union of the lists. 1469# directories and uses the union of the lists.
1441strip-linguas() { 1470strip-linguas() {
1442 local ls newls 1471 local ls newls nols
1443 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then 1472 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1444 local op=$1; shift 1473 local op=$1; shift
1445 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1474 ls=$(find "$1" -name '*.po' -exec basename {} .po \;); shift
1446 local d f 1475 local d f
1447 for d in "$@" ; do 1476 for d in "$@" ; do
1448 if [[ ${op} == "-u" ]] ; then 1477 if [[ ${op} == "-u" ]] ; then
1449 newls=${ls} 1478 newls=${ls}
1450 else 1479 else
1451 newls="" 1480 newls=""
1452 fi 1481 fi
1453 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1482 for f in $(find "$d" -name '*.po' -exec basename {} .po \;) ; do
1454 if [[ ${op} == "-i" ]] ; then 1483 if [[ ${op} == "-i" ]] ; then
1455 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}" 1484 hasq ${f} ${ls} && newls="${newls} ${f}"
1456 else 1485 else
1457 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}" 1486 hasq ${f} ${ls} || newls="${newls} ${f}"
1458 fi 1487 fi
1459 done 1488 done
1460 ls=${newls} 1489 ls=${newls}
1461 done 1490 done
1462 ls=${ls//.po}
1463 else 1491 else
1464 ls=$@ 1492 ls="$@"
1465 fi 1493 fi
1466 1494
1467 ls=" ${ls} " 1495 nols=""
1468 newls="" 1496 newls=""
1469 for f in ${LINGUAS} ; do 1497 for f in ${LINGUAS} ; do
1470 if [[ ${ls/ ${f} /} != ${ls} ]] ; then 1498 if hasq ${f} ${ls} ; then
1471 newls="${newls} ${f}" 1499 newls="${newls} ${f}"
1472 else 1500 else
1473 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1501 nols="${nols} ${f}"
1474 fi 1502 fi
1475 done 1503 done
1476 if [[ -z ${newls} ]] ; then 1504 [[ -n ${nols} ]] \
1477 export LINGUAS="" 1505 && ewarn "Sorry, but ${PN} does not support the LINGUAs:" ${nols}
1478 else
1479 export LINGUAS=${newls:1} 1506 export LINGUAS=${newls:1}
1480 fi
1481} 1507}
1482 1508
1483# moved from kernel.eclass since they are generally useful outside of 1509# moved from kernel.eclass since they are generally useful outside of
1484# kernel.eclass -iggy (20041002) 1510# kernel.eclass -iggy (20041002)
1485 1511
… …
1492 while ((i--)) ; do 1518 while ((i--)) ; do
1493 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass" 1519 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1494 done 1520 done
1495 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}" 1521 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1496 case ${ARCH} in 1522 case ${ARCH} in
1497 x86) export ARCH="i386";; 1523 x86) export ARCH="i386";;
1498 amd64) export ARCH="x86_64";; 1524 amd64) export ARCH="x86_64";;
1499 hppa) export ARCH="parisc";; 1525 hppa) export ARCH="parisc";;
1500 mips) export ARCH="mips";; 1526 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! 1527 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}";; 1528 *) export ARCH="${ARCH}";;
1503 esac 1529 esac
1504} 1530}
1505 1531
1506# set's ARCH back to what portage expects 1532# set's ARCH back to what portage expects
1507set_arch_to_portage() { 1533set_arch_to_portage() {
… …
1514 1540
1515# Jeremy Huddleston <eradicator@gentoo.org>: 1541# Jeremy Huddleston <eradicator@gentoo.org>:
1516# preserve_old_lib /path/to/libblah.so.0 1542# preserve_old_lib /path/to/libblah.so.0
1517# preserve_old_lib_notify /path/to/libblah.so.0 1543# preserve_old_lib_notify /path/to/libblah.so.0
1518# 1544#
1519# These functions are useful when a lib in your package changes --soname. Such 1545# These functions are useful when a lib in your package changes --library. Such
1520# an example might be from libogg.so.0 to libogg.so.1. Removing libogg.so.0 1546# an example might be from libogg.so.0 to libogg.so.1. Removing libogg.so.0
1521# would break packages that link against it. Most people get around this 1547# would break packages that link against it. Most people get around this
1522# by using the portage SLOT mechanism, but that is not always a relevant 1548# by using the portage SLOT mechanism, but that is not always a relevant
1523# solution, so instead you can add the following to your ebuilds: 1549# solution, so instead you can add the following to your ebuilds:
1524# 1550#
1525# src_install() { 1551# pkg_preinst() {
1526# ... 1552# ...
1527# preserve_old_lib /usr/$(get_libdir)/libogg.so.0 1553# preserve_old_lib /usr/$(get_libdir)/libogg.so.0
1528# ... 1554# ...
1529# } 1555# }
1530# 1556#
… …
1533# preserve_old_lib_notify /usr/$(get_libdir)/libogg.so.0 1559# preserve_old_lib_notify /usr/$(get_libdir)/libogg.so.0
1534# ... 1560# ...
1535# } 1561# }
1536 1562
1537preserve_old_lib() { 1563preserve_old_lib() {
1538 LIB=$1 1564 if [[ ${EBUILD_PHASE} != "preinst" ]] ; then
1565 eerror "preserve_old_lib() must be called from pkg_preinst() only"
1566 die "Invalid preserve_old_lib() usage"
1567 fi
1568 [[ -z $1 ]] && die "Usage: preserve_old_lib <library to preserve> [more libraries to preserve]"
1539 1569
1540 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1570 local lib dir
1541 SONAME=`basename ${LIB}` 1571 for lib in "$@" ; do
1542 DIRNAME=`dirname ${LIB}` 1572 [[ -e ${ROOT}/${lib} ]] || continue
1543 1573 dir=${lib%/*}
1544 dodir ${DIRNAME} 1574 dodir ${dir} || die "dodir ${dir} failed"
1545 cp ${ROOT}${LIB} ${D}${DIRNAME} 1575 cp "${ROOT}"/${lib} "${D}"/${lib} || die "cp ${lib} failed"
1546 touch ${D}${LIB} 1576 touch "${D}"/${lib}
1547 fi 1577 done
1548} 1578}
1549 1579
1550preserve_old_lib_notify() { 1580preserve_old_lib_notify() {
1551 LIB=$1 1581 if [[ ${EBUILD_PHASE} != "postinst" ]] ; then
1582 eerror "preserve_old_lib_notify() must be called from pkg_postinst() only"
1583 die "Invalid preserve_old_lib_notify() usage"
1584 fi
1552 1585
1553 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1586 local lib notice=0
1554 SONAME=`basename ${LIB}` 1587 for lib in "$@" ; do
1555 1588 [[ -e ${ROOT}/${lib} ]] || continue
1589 if [[ ${notice} -eq 0 ]] ; then
1590 notice=1
1556 ewarn "An old version of an installed library was detected on your system." 1591 ewarn "Old versions of installed libraries were detected on your system."
1557 ewarn "In order to avoid breaking packages that link against it, this older version" 1592 ewarn "In order to avoid breaking packages that depend on these old libs,"
1558 ewarn "is not being removed. In order to make full use of this newer version," 1593 ewarn "the libraries are not being removed. You need to run revdep-rebuild"
1559 ewarn "you will need to execute the following command:" 1594 ewarn "in order to remove these old dependencies. If you do not have this"
1560 ewarn " revdep-rebuild --soname ${SONAME}" 1595 ewarn "helper program, simply emerge the 'gentoolkit' package."
1561 ewarn 1596 ewarn
1562 ewarn "After doing that, you can safely remove ${LIB}"
1563 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1564 fi 1597 fi
1598 ewarn " # revdep-rebuild --library ${lib##*/}"
1599 done
1565} 1600}
1566 1601
1567# Hack for people to figure out if a package was built with 1602# Hack for people to figure out if a package was built with
1568# certain USE flags 1603# certain USE flags
1569# 1604#
1570# Usage: built_with_use [-a|-o] <DEPEND ATOM> <List of USE flags> 1605# Usage: built_with_use [--missing <action>] [-a|-o] <DEPEND ATOM> <List of USE flags>
1571# ex: built_with_use xchat gtk2 1606# ex: built_with_use xchat gtk2
1572# 1607#
1573# Flags: -a all USE flags should be utilized 1608# Flags: -a all USE flags should be utilized
1574# -o at least one USE flag should be utilized 1609# -o at least one USE flag should be utilized
1610# --missing peform the specified action if the flag is not in IUSE (true/false/die)
1611# --hidden USE flag we're checking is hidden expanded so it isnt in IUSE
1575# Note: the default flag is '-a' 1612# Note: the default flag is '-a'
1576built_with_use() { 1613built_with_use() {
1614 local hidden="no"
1615 if [[ $1 == "--hidden" ]] ; then
1616 hidden="yes"
1617 shift
1618 fi
1619
1620 local missing_action="die"
1621 if [[ $1 == "--missing" ]] ; then
1622 missing_action=$2
1623 shift ; shift
1624 case ${missing_action} in
1625 true|false|die) ;;
1626 *) die "unknown action '${missing_action}'";;
1627 esac
1628 fi
1629
1577 local opt=$1 1630 local opt=$1
1578 [[ ${opt:0:1} = "-" ]] && shift || opt="-a" 1631 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1579 1632
1580 local PKG=$(best_version $1) 1633 local PKG=$(best_version $1)
1634 [[ -z ${PKG} ]] && die "Unable to resolve $1 to an installed package"
1581 shift 1635 shift
1582 1636
1583 local USEFILE=${ROOT}/var/db/pkg/${PKG}/USE 1637 local USEFILE=${ROOT}/var/db/pkg/${PKG}/USE
1638 local IUSEFILE=${ROOT}/var/db/pkg/${PKG}/IUSE
1584 1639
1585 # if the USE file doesnt exist, assume the $PKG is either 1640 # if the IUSE file doesn't exist, the read will error out, we need to handle
1586 # injected or package.provided 1641 # this gracefully
1587 [[ ! -e ${USEFILE} ]] && return 0 1642 if [[ ! -e ${USEFILE} ]] || [[ ! -e ${IUSEFILE} && ${hidden} == "no" ]] ; then
1643 case ${missing_action} in
1644 true) return 0;;
1645 false) return 1;;
1646 die) die "Unable to determine what USE flags $PKG was built with";;
1647 esac
1648 fi
1649
1650 if [[ ${hidden} == "no" ]] ; then
1651 local IUSE_BUILT=$(<${IUSEFILE})
1652 # Don't check USE_EXPAND #147237
1653 local expand
1654 for expand in $(echo ${USE_EXPAND} | tr '[:upper:]' '[:lower:]') ; do
1655 if [[ $1 == ${expand}_* ]] ; then
1656 expand=""
1657 break
1658 fi
1659 done
1660 if [[ -n ${expand} ]] ; then
1661 if ! has $1 ${IUSE_BUILT} ; then
1662 case ${missing_action} in
1663 true) return 0;;
1664 false) return 1;;
1665 die) die "$PKG does not actually support the $1 USE flag!";;
1666 esac
1667 fi
1668 fi
1669 fi
1588 1670
1589 local USE_BUILT=$(<${USEFILE}) 1671 local USE_BUILT=$(<${USEFILE})
1590 while [[ $# -gt 0 ]] ; do 1672 while [[ $# -gt 0 ]] ; do
1591 if [[ ${opt} = "-o" ]] ; then 1673 if [[ ${opt} = "-o" ]] ; then
1592 has $1 ${USE_BUILT} && return 0 1674 has $1 ${USE_BUILT} && return 0
… …
1607 local f 1689 local f
1608 for f in $(find ${dir} -name configure) ; do 1690 for f in $(find ${dir} -name configure) ; do
1609 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null 1691 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null
1610 done 1692 done
1611 eend 0 1693 eend 0
1612}
1613
1614# dopamd <file> [more files]
1615#
1616# Install pam auth config file in /etc/pam.d
1617dopamd() {
1618 [[ -z $1 ]] && die "dopamd requires at least one argument"
1619
1620 use pam || return 0
1621
1622 INSDESTTREE=/etc/pam.d \
1623 doins "$@" || die "failed to install $@"
1624}
1625# newpamd <old name> <new name>
1626#
1627# Install pam file <old name> as <new name> in /etc/pam.d
1628newpamd() {
1629 [[ $# -ne 2 ]] && die "newpamd requires two arguements"
1630
1631 use pam || return 0
1632
1633 INSDESTTREE=/etc/pam.d \
1634 newins "$1" "$2" || die "failed to install $1 as $2"
1635} 1694}
1636 1695
1637# make a wrapper script ... 1696# make a wrapper script ...
1638# NOTE: this was originally games_make_wrapper, but I noticed other places where 1697# 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 1698# this could be used, so I have moved it here and made it not games-specific
Legend:
Removed from v.1.218  
changed lines
  Added in v.1.282
  ViewVC Help
Powered by ViewVC 1.1.13