/[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.281
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.281 2007/06/05 15:59:26 nyhm 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} 39}
45 40
46# This function generate linker scripts in /usr/lib for dynamic 41# This function generate linker scripts in /usr/lib for dynamic
47# libs in /lib. This is to fix linking problems when you have 42# 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 43# 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 44# 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 45# instead of the .so in /lib due to gcc/libtool tweaking ld's
51# library search path. This cause many builds to fail. 46# library search path. This cause many builds to fail.
52# See bug #4411 for more info. 47# See bug #4411 for more info.
53# 48#
54# To use, simply call: 49# To use, simply call:
55# 50#
56# gen_usr_ldscript libfoo.so 51# gen_usr_ldscript libfoo.so
57# 52#
58# Note that you should in general use the unversioned name of 53# Note that you should in general use the unversioned name of
59# the library, as ldconfig should usually update it correctly 54# the library, as ldconfig should usually update it correctly
60# to point to the latest version of the library present. 55# to point to the latest version of the library present.
61# 56#
62# <azarah@gentoo.org> (26 Oct 2002) 57# <azarah@gentoo.org> (26 Oct 2002)
63# 58#
64gen_usr_ldscript() { 59gen_usr_ldscript() {
60 if [[ $(type -t _tc_gen_usr_ldscript) == "function" ]] ; then
61 _tc_gen_usr_ldscript "$@"
62 return $?
63 fi
64
65 ewarn "QA Notice: Please upgrade your ebuild to use toolchain-funcs"
66 ewarn "QA Notice: rather than gen_usr_ldscript() from eutils"
67
65 local libdir="$(get_libdir)" 68 local lib libdir=$(get_libdir)
66 # Just make sure it exists 69 # Just make sure it exists
67 dodir /usr/${libdir} 70 dodir /usr/${libdir}
68 71
69 for lib in "${@}" ; do 72 for lib in "${@}" ; do
70 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT 73 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT
76 79
77 See bug http://bugs.gentoo.org/4411 for more info. 80 See bug http://bugs.gentoo.org/4411 for more info.
78 */ 81 */
79 GROUP ( /${libdir}/${lib} ) 82 GROUP ( /${libdir}/${lib} )
80 END_LDSCRIPT 83 END_LDSCRIPT
81 fperms a+x "/usr/${libdir}/${lib}" 84 fperms a+x "/usr/${libdir}/${lib}" || die "could not change perms on ${lib}"
82 done 85 done
83} 86}
84 87
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}
115 88
116# Default directory where patches are located 89# Default directory where patches are located
117EPATCH_SOURCE="${WORKDIR}/patch" 90EPATCH_SOURCE="${WORKDIR}/patch"
118# Default extension for patches 91# Default extension for patches
119EPATCH_SUFFIX="patch.bz2" 92EPATCH_SUFFIX="patch.bz2"
120# Default options for patch 93# Default options for patch
121# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571 94# 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. 95# Set --no-backup-if-mismatch so we don't leave '.orig' files behind.
96# Set -E to automatically remove empty files.
123EPATCH_OPTS="-g0 --no-backup-if-mismatch" 97EPATCH_OPTS="-g0 -E --no-backup-if-mismatch"
124# List of patches not to apply. Not this is only file names, 98# List of patches not to apply. Not this is only file names,
125# and not the full path .. 99# and not the full path ..
126EPATCH_EXCLUDE="" 100EPATCH_EXCLUDE=""
127# Change the printed message for a single patch. 101# Change the printed message for a single patch.
128EPATCH_SINGLE_MSG="" 102EPATCH_SINGLE_MSG=""
129# Change the printed message for multiple patches. 103# Change the printed message for multiple patches.
130EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..." 104EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..."
131# Force applying bulk patches even if not following the style: 105# Force applying bulk patches even if not following the style:
132# 106#
133# ??_${ARCH}_foo.${EPATCH_SUFFIX} 107# ??_${ARCH}_foo.${EPATCH_SUFFIX}
134# 108#
135EPATCH_FORCE="no" 109EPATCH_FORCE="no"
136 110
137# This function is for bulk patching, or in theory for just one 111# This function is for bulk patching, or in theory for just one
138# or two patches. 112# or two patches.
149# 123#
150# Patches are applied in current directory. 124# Patches are applied in current directory.
151# 125#
152# Bulk Patches should preferibly have the form of: 126# Bulk Patches should preferibly have the form of:
153# 127#
154# ??_${ARCH}_foo.${EPATCH_SUFFIX} 128# ??_${ARCH}_foo.${EPATCH_SUFFIX}
155# 129#
156# For example: 130# For example:
157# 131#
158# 01_all_misc-fix.patch.bz2 132# 01_all_misc-fix.patch.bz2
159# 02_sparc_another-fix.patch.bz2 133# 02_sparc_another-fix.patch.bz2
160# 134#
161# This ensures that there are a set order, and you can have ARCH 135# This ensures that there are a set order, and you can have ARCH
162# specific patches. 136# specific patches.
163# 137#
164# If you however give an argument to epatch(), it will treat it as a 138# 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. 140# hand its a directory, it will set EPATCH_SOURCE to this.
167# 141#
168# <azarah@gentoo.org> (10 Nov 2002) 142# <azarah@gentoo.org> (10 Nov 2002)
169# 143#
170epatch() { 144epatch() {
145 _epatch_draw_line() {
146 [[ -z $1 ]] && set "$(printf "%65s" '')"
147 echo "${1//?/=}"
148 }
171 _epatch_assert() { local _pipestatus=${PIPESTATUS[*]}; [[ ${_pipestatus// /} -eq 0 ]] ; } 149 _epatch_assert() { local _pipestatus=${PIPESTATUS[*]}; [[ ${_pipestatus// /} -eq 0 ]] ; }
172 local PIPE_CMD="" 150 local PIPE_CMD=""
173 local STDERR_TARGET="${T}/$$.out" 151 local STDERR_TARGET="${T}/$$.out"
174 local PATCH_TARGET="${T}/$$.patch" 152 local PATCH_TARGET="${T}/$$.patch"
175 local PATCH_SUFFIX="" 153 local PATCH_SUFFIX=""
248 fi 226 fi
249 for x in ${EPATCH_SOURCE} 227 for x in ${EPATCH_SOURCE}
250 do 228 do
251 # New ARCH dependant patch naming scheme ... 229 # New ARCH dependant patch naming scheme ...
252 # 230 #
253 # ???_arch_foo.patch 231 # ???_arch_foo.patch
254 # 232 #
255 if [ -f ${x} ] && \ 233 if [ -f ${x} ] && \
256 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "${x/_${ARCH}_}" != "${x}" ] || \ 234 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "${x/_${ARCH}_}" != "${x}" ] || \
257 [ "${EPATCH_FORCE}" = "yes" ]) 235 [ "${EPATCH_FORCE}" = "yes" ])
258 then 236 then
259 local count=0 237 local count=0
260 local popts="${EPATCH_OPTS}" 238 local popts="${EPATCH_OPTS}"
261 local patchname=${x##*/} 239 local patchname=${x##*/}
262 240
285 263
286 # Allow for prefix to differ ... im lazy, so shoot me :/ 264 # Allow for prefix to differ ... im lazy, so shoot me :/
287 while [ "${count}" -lt 5 ] 265 while [ "${count}" -lt 5 ]
288 do 266 do
289 # Generate some useful debug info ... 267 # Generate some useful debug info ...
290 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 268 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
291 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 269 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
292 270
293 if [ "${PATCH_SUFFIX}" != "patch" ] 271 if [ "${PATCH_SUFFIX}" != "patch" ]
294 then 272 then
295 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 273 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
296 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 274 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
297 else 275 else
298 PATCH_TARGET="${x}" 276 PATCH_TARGET="${x}"
299 fi 277 fi
300 278
301 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 279 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
302 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 280 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
303 281
304 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 282 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
305 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 283 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
306 284
307 if [ "${PATCH_SUFFIX}" != "patch" ] 285 if [ "${PATCH_SUFFIX}" != "patch" ]
308 then 286 then
309 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1 287 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
310 then 288 then
316 fi 294 fi
317 fi 295 fi
318 296
319 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f ; _epatch_assert) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1 297 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f ; _epatch_assert) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
320 then 298 then
321 draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 299 _epatch_draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
322 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 300 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
323 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 301 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
324 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 302 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
325 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 303 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
326 304
327 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1 305 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1
328 _epatch_assert 306 _epatch_assert
329 307
330 if [ "$?" -ne 0 ] 308 if [ "$?" -ne 0 ]
388 [[ -z ${T} ]] \ 366 [[ -z ${T} ]] \
389 && topdir="/tmp" \ 367 && topdir="/tmp" \
390 || topdir=${T} 368 || topdir=${T}
391 fi 369 fi
392 370
393 if [[ -z $(type -p mktemp) ]] ; then 371 if ! type -P mktemp > /dev/null ; then
372 # system lacks `mktemp` so we have to fake it
394 local tmp=/ 373 local tmp=/
395 while [[ -e ${tmp} ]] ; do 374 while [[ -e ${tmp} ]] ; do
396 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM} 375 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}
397 done 376 done
398 ${exe} "${tmp}" || ${exe} -p "${tmp}" 377 ${exe} "${tmp}" || ${exe} -p "${tmp}"
399 echo "${tmp}" 378 echo "${tmp}"
400 else 379 else
380 # the args here will give slightly wierd names on BSD,
381 # but should produce a usable file on all userlands
401 [[ ${exe} == "touch" ]] \ 382 if [[ ${exe} == "touch" ]] ; then
402 && exe="-p" \ 383 TMPDIR="${topdir}" mktemp -t tmp.XXXXXXXXXX
403 || exe="-d" 384 else
404 mktemp ${exe} "${topdir}" 385 TMPDIR="${topdir}" mktemp -dt tmp.XXXXXXXXXX
386 fi
405 fi 387 fi
406} 388}
407 389
408# Small wrapper for getent (Linux), nidump (Mac OS X), 390# Small wrapper for getent (Linux), nidump (Mac OS X),
409# and pw (FreeBSD) used in enewuser()/enewgroup() 391# and pw (FreeBSD) used in enewuser()/enewgroup()
421 *) # Numeric 403 *) # Numeric
422 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 404 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
423 ;; 405 ;;
424 esac 406 esac
425 ;; 407 ;;
426 *-freebsd*) 408 *-freebsd*|*-dragonfly*)
427 local opts action="user" 409 local opts action="user"
428 [[ $1 == "passwd" ]] || action="group" 410 [[ $1 == "passwd" ]] || action="group"
429 411
430 # lookup by uid/gid 412 # lookup by uid/gid
431 if [[ $2 == [[:digit:]]* ]] ; then 413 if [[ $2 == [[:digit:]]* ]] ; then
456# shell: /bin/false 438# shell: /bin/false
457# homedir: /dev/null 439# homedir: /dev/null
458# groups: none 440# groups: none
459# extra: comment of 'added by portage for ${PN}' 441# extra: comment of 'added by portage for ${PN}'
460enewuser() { 442enewuser() {
443 case ${EBUILD_PHASE} in
444 unpack|compile|test|install)
445 eerror "'enewuser()' called from '${EBUILD_PHASE}()' which is not a pkg_* function."
446 eerror "Package fails at QA and at life. Please file a bug."
447 die "Bad package! enewuser is only for use in pkg_* functions!"
448 esac
449
461 # get the username 450 # get the username
462 local euser=$1; shift 451 local euser=$1; shift
463 if [[ -z ${euser} ]] ; then 452 if [[ -z ${euser} ]] ; then
464 eerror "No username specified !" 453 eerror "No username specified !"
465 die "Cannot call enewuser without a username" 454 die "Cannot call enewuser without a username"
466 fi 455 fi
467 456
468 # lets see if the username already exists 457 # lets see if the username already exists
469 if [[ ${euser} == $(egetent passwd "${euser}" | cut -d: -f1) ]] ; then 458 if [[ -n $(egetent passwd "${euser}") ]] ; then
470 return 0 459 return 0
471 fi 460 fi
472 einfo "Adding user '${euser}' to your system ..." 461 einfo "Adding user '${euser}' to your system ..."
473 462
474 # options to pass to useradd 463 # options to pass to useradd
475 local opts= 464 local opts=
476 465
477 # handle uid 466 # handle uid
478 local euid=$1; shift 467 local euid=$1; shift
479 if [[ ! -z ${euid} ]] && [[ ${euid} != "-1" ]] ; then 468 if [[ -n ${euid} && ${euid} != -1 ]] ; then
480 if [[ ${euid} -gt 0 ]] ; then 469 if [[ ${euid} -gt 0 ]] ; then
481 if [[ ! -z $(egetent passwd ${euid}) ]] ; then 470 if [[ -n $(egetent passwd ${euid}) ]] ; then
482 euid="next" 471 euid="next"
483 fi 472 fi
484 else 473 else
485 eerror "Userid given but is not greater than 0 !" 474 eerror "Userid given but is not greater than 0 !"
486 die "${euid} is not a valid UID" 475 die "${euid} is not a valid UID"
487 fi 476 fi
488 else 477 else
489 euid="next" 478 euid="next"
490 fi 479 fi
491 if [[ ${euid} == "next" ]] ; then 480 if [[ ${euid} == "next" ]] ; then
492 for euid in $(seq 101 999) ; do 481 for ((euid = 101; euid <= 999; euid++)); do
493 [[ -z $(egetent passwd ${euid}) ]] && break 482 [[ -z $(egetent passwd ${euid}) ]] && break
494 done 483 done
495 fi 484 fi
496 opts="${opts} -u ${euid}" 485 opts="${opts} -u ${euid}"
497 einfo " - Userid: ${euid}" 486 einfo " - Userid: ${euid}"
498 487
499 # handle shell 488 # handle shell
500 local eshell=$1; shift 489 local eshell=$1; shift
501 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then 490 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
502 if [[ ! -e ${eshell} ]] ; then 491 if [[ ! -e ${ROOT}${eshell} ]] ; then
503 eerror "A shell was specified but it does not exist !" 492 eerror "A shell was specified but it does not exist !"
504 die "${eshell} does not exist" 493 die "${eshell} does not exist in ${ROOT}"
494 fi
495 if [[ ${eshell} == */false || ${eshell} == */nologin ]] ; then
496 eerror "Do not specify ${eshell} yourself, use -1"
497 die "Pass '-1' as the shell parameter"
505 fi 498 fi
506 else 499 else
507 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do 500 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do
508 [[ -x ${ROOT}${shell} ]] && break 501 [[ -x ${ROOT}${shell} ]] && break
509 done 502 done
510 503
511 if [[ ${shell} == "/dev/null" ]] ; then 504 if [[ ${shell} == "/dev/null" ]] ; then
512 eerror "Unable to identify the shell to use" 505 eerror "Unable to identify the shell to use, proceeding with userland default."
513 die "Unable to identify the shell to use" 506 case ${USERLAND} in
507 GNU) shell="/bin/false" ;;
508 BSD) shell="/sbin/nologin" ;;
509 Darwin) shell="/usr/sbin/nologin" ;;
510 *) die "Unable to identify the default shell for userland ${USERLAND}"
511 esac
514 fi 512 fi
515 513
516 eshell=${shell} 514 eshell=${shell}
517 fi 515 fi
518 einfo " - Shell: ${eshell}" 516 einfo " - Shell: ${eshell}"
580 einfo "Please report the ebuild along with the info below" 578 einfo "Please report the ebuild along with the info below"
581 einfo "eextra: $@" 579 einfo "eextra: $@"
582 die "Required function missing" 580 die "Required function missing"
583 fi 581 fi
584 ;; 582 ;;
585 *-freebsd*) 583 *-freebsd*|*-dragonfly*)
586 if [[ -z $@ ]] ; then 584 if [[ -z $@ ]] ; then
587 pw useradd ${euser} ${opts} \ 585 pw useradd ${euser} ${opts} \
588 -c "added by portage for ${PN}" \ 586 -c "added by portage for ${PN}" \
589 die "enewuser failed" 587 die "enewuser failed"
590 else 588 else
647# Default values if you do not specify any: 645# Default values if you do not specify any:
648# groupname: REQUIRED ! 646# groupname: REQUIRED !
649# gid: next available (see groupadd(8)) 647# gid: next available (see groupadd(8))
650# extra: none 648# extra: none
651enewgroup() { 649enewgroup() {
650 case ${EBUILD_PHASE} in
651 unpack|compile|test|install)
652 eerror "'enewgroup()' called from '${EBUILD_PHASE}()' which is not a pkg_* function."
653 eerror "Package fails at QA and at life. Please file a bug."
654 die "Bad package! enewgroup is only for use in pkg_* functions!"
655 esac
656
652 # get the group 657 # get the group
653 local egroup="$1"; shift 658 local egroup="$1"; shift
654 if [ -z "${egroup}" ] 659 if [ -z "${egroup}" ]
655 then 660 then
656 eerror "No group specified !" 661 eerror "No group specified !"
657 die "Cannot call enewgroup without a group" 662 die "Cannot call enewgroup without a group"
658 fi 663 fi
659 664
660 # see if group already exists 665 # see if group already exists
661 if [ "${egroup}" == "`egetent group \"${egroup}\" | cut -d: -f1`" ] 666 if [[ -n $(egetent group "${egroup}") ]]; then
662 then
663 return 0 667 return 0
664 fi 668 fi
665 einfo "Adding group '${egroup}' to your system ..." 669 einfo "Adding group '${egroup}' to your system ..."
666 670
667 # options to pass to useradd 671 # options to pass to useradd
710 fi 714 fi
711 715
712 # If we need the next available 716 # If we need the next available
713 case ${egid} in 717 case ${egid} in
714 *[!0-9]*) # Non numeric 718 *[!0-9]*) # Non numeric
715 for egid in $(seq 101 999); do 719 for ((egid = 101; egid <= 999; egid++)); do
716 [ -z "`egetent group ${egid}`" ] && break 720 [[ -z $(egetent group ${egid}) ]] && break
717 done 721 done
718 esac 722 esac
719 dscl . create /groups/${egroup} gid ${egid} 723 dscl . create /groups/${egroup} gid ${egid}
720 dscl . create /groups/${egroup} passwd '*' 724 dscl . create /groups/${egroup} passwd '*'
721 ;; 725 ;;
722 726
723 *-freebsd*) 727 *-freebsd*|*-dragonfly*)
724 case ${egid} in 728 case ${egid} in
725 *[!0-9]*) # Non numeric 729 *[!0-9]*) # Non numeric
726 for egid in $(seq 101 999); do 730 for ((egid = 101; egid <= 999; egid++)); do
727 [ -z "`egetent group ${egid}`" ] && break 731 [[ -z $(egetent group ${egid}) ]] && break
728 done 732 done
729 esac 733 esac
730 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 734 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
731 ;; 735 ;;
732 736
733 *-netbsd*) 737 *-netbsd*)
734 case ${egid} in 738 case ${egid} in
735 *[!0-9]*) # Non numeric 739 *[!0-9]*) # Non numeric
736 for egid in $(seq 101 999); do 740 for ((egid = 101; egid <= 999; egid++)); do
737 [ -z "`egetent group ${egid}`" ] && break 741 [[ -z $(egetent group ${egid}) ]] && break
738 done 742 done
739 esac 743 esac
740 groupadd -g ${egid} ${egroup} || die "enewgroup failed" 744 groupadd -g ${egid} ${egroup} || die "enewgroup failed"
741 ;; 745 ;;
742 746
750# Simple script to replace 'dos2unix' binaries 754# Simple script to replace 'dos2unix' binaries
751# vapier@gentoo.org 755# vapier@gentoo.org
752# 756#
753# edos2unix(file, <more files> ...) 757# edos2unix(file, <more files> ...)
754edos2unix() { 758edos2unix() {
755 for f in "$@" 759 echo "$@" | xargs sed -i 's/\r$//'
756 do
757 cp "${f}" ${T}/edos2unix
758 sed 's/\r$//' ${T}/edos2unix > "${f}"
759 done
760} 760}
761 761
762 762
763############################################################## 763##############################################################
764# START: Handle .desktop files and menu entries # 764# START: Handle .desktop files and menu entries #
765# maybe this should be separated into a new eclass some time # 765# maybe this should be separated into a new eclass some time #
766# lanius@gentoo.org # 766# lanius@gentoo.org #
767############################################################## 767##############################################################
768 768
769# Make a desktop file ! 769# Make a desktop file !
770# Great for making those icons in kde/gnome startmenu ! 770# Great for making those icons in kde/gnome startmenu !
771# Amaze your friends ! Get the women ! Join today ! 771# Amaze your friends ! Get the women ! Join today !
772# 772#
773# make_desktop_entry(<binary>, [name], [icon], [type], [path]) 773# make_desktop_entry(<command>, [name], [icon], [type], [path])
774# 774#
775# binary: what binary does the app run with ? 775# binary: what command does the app run with ?
776# name: the name that will show up in the menu 776# name: the name that will show up in the menu
777# icon: give your little like a pretty little icon ... 777# icon: give your little like a pretty little icon ...
778# this can be relative (to /usr/share/pixmaps) or 778# this can be relative (to /usr/share/pixmaps) or
779# a full path to an icon 779# a full path to an icon
780# type: what kind of application is this ? for categories: 780# type: what kind of application is this ? for categories:
781# http://www.freedesktop.org/Standards/desktop-entry-spec 781# http://www.freedesktop.org/Standards/desktop-entry-spec
782# path: if your app needs to startup in a specific dir 782# path: if your app needs to startup in a specific dir
783make_desktop_entry() { 783make_desktop_entry() {
784 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1 784 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1
785 785
793 local catmaj=${CATEGORY%%-*} 793 local catmaj=${CATEGORY%%-*}
794 local catmin=${CATEGORY##*-} 794 local catmin=${CATEGORY##*-}
795 case ${catmaj} in 795 case ${catmaj} in
796 app) 796 app)
797 case ${catmin} in 797 case ${catmin} in
798 admin) type=System;; 798 admin) type=System;;
799 cdr) type=DiscBurning;; 799 cdr) type=DiscBurning;;
800 dicts) type=Dictionary;; 800 dicts) type=Dictionary;;
801 editors) type=TextEditor;; 801 editors) type=TextEditor;;
802 emacs) type=TextEditor;; 802 emacs) type=TextEditor;;
803 emulation) type=Emulator;; 803 emulation) type=Emulator;;
804 laptop) type=HardwareSettings;; 804 laptop) type=HardwareSettings;;
805 office) type=Office;; 805 office) type=Office;;
806 vim) type=TextEditor;; 806 vim) type=TextEditor;;
807 xemacs) type=TextEditor;; 807 xemacs) type=TextEditor;;
808 *) type=;; 808 *) type=;;
809 esac 809 esac
810 ;; 810 ;;
811 811
812 dev) 812 dev)
813 type="Development" 813 type="Development"
814 ;; 814 ;;
815 815
816 games) 816 games)
817 case ${catmin} in 817 case ${catmin} in
818 action) type=ActionGame;; 818 action|fps) type=ActionGame;;
819 arcade) type=ArcadeGame;; 819 arcade) type=ArcadeGame;;
820 board) type=BoardGame;; 820 board) type=BoardGame;;
821 kid) type=KidsGame;; 821 kids) type=KidsGame;;
822 emulation) type=Emulator;; 822 emulation) type=Emulator;;
823 puzzle) type=LogicGame;; 823 puzzle) type=LogicGame;;
824 rpg) type=RolePlaying;; 824 rpg) type=RolePlaying;;
825 roguelike) type=RolePlaying;; 825 roguelike) type=RolePlaying;;
826 simulation) type=Simulation;; 826 simulation) type=Simulation;;
827 sports) type=SportsGame;; 827 sports) type=SportsGame;;
828 strategy) type=StrategyGame;; 828 strategy) type=StrategyGame;;
829 *) type=;; 829 *) type=;;
830 esac 830 esac
831 type="Game;${type}" 831 type="Game;${type}"
832 ;; 832 ;;
833 833
834 mail) 834 mail)
838 media) 838 media)
839 case ${catmin} in 839 case ${catmin} in
840 gfx) type=Graphics;; 840 gfx) type=Graphics;;
841 radio) type=Tuner;; 841 radio) type=Tuner;;
842 sound) type=Audio;; 842 sound) type=Audio;;
843 tv) type=TV;; 843 tv) type=TV;;
844 video) type=Video;; 844 video) type=Video;;
845 *) type=;; 845 *) type=;;
846 esac 846 esac
847 type="AudioVideo;${type}" 847 type="AudioVideo;${type}"
848 ;; 848 ;;
849 849
850 net) 850 net)
851 case ${catmin} in 851 case ${catmin} in
852 dialup) type=Dialup;; 852 dialup) type=Dialup;;
853 ftp) type=FileTransfer;; 853 ftp) type=FileTransfer;;
854 im) type=InstantMessaging;; 854 im) type=InstantMessaging;;
855 irc) type=IRCClient;; 855 irc) type=IRCClient;;
856 mail) type=Email;; 856 mail) type=Email;;
857 news) type=News;; 857 news) type=News;;
858 nntp) type=News;; 858 nntp) type=News;;
859 p2p) type=FileTransfer;; 859 p2p) type=FileTransfer;;
860 *) type=;; 860 *) type=;;
861 esac 861 esac
862 type="Network;${type}" 862 type="Network;${type}"
863 ;; 863 ;;
864 864
865 sci) 865 sci)
866 case ${catmin} in 866 case ${catmin} in
867 astro*) type=Astronomy;; 867 astro*) type=Astronomy;;
868 bio*) type=Biology;; 868 bio*) type=Biology;;
869 calc*) type=Calculator;; 869 calc*) type=Calculator;;
870 chem*) type=Chemistry;; 870 chem*) type=Chemistry;;
871 geo*) type=Geology;; 871 geo*) type=Geology;;
872 math*) type=Math;; 872 math*) type=Math;;
873 *) type=;; 873 *) type=;;
874 esac 874 esac
875 type="Science;${type}" 875 type="Science;${type}"
876 ;; 876 ;;
877 877
878 www) 878 www)
879 case ${catmin} in 879 case ${catmin} in
880 client) type=WebBrowser;; 880 client) type=WebBrowser;;
881 *) type=;; 881 *) type=;;
882 esac 882 esac
883 type="Network" 883 type="Network"
884 ;; 884 ;;
885 885
886 *) 886 *)
891 if [ "${SLOT}" == "0" ] ; then 891 if [ "${SLOT}" == "0" ] ; then
892 local desktop_name="${PN}" 892 local desktop_name="${PN}"
893 else 893 else
894 local desktop_name="${PN}-${SLOT}" 894 local desktop_name="${PN}-${SLOT}"
895 fi 895 fi
896 local desktop="${T}/$(echo ${exec} | sed 's:[[:space:]/:]:_:g')-${desktop_name}.desktop"
896 local desktop=${T}/${exec%% *}-${desktop_name}.desktop 897 #local desktop=${T}/${exec%% *:-${desktop_name}}.desktop
897 898
899 cat <<-EOF > "${desktop}"
898echo "[Desktop Entry] 900 [Desktop Entry]
899Encoding=UTF-8 901 Encoding=UTF-8
900Version=0.9.2 902 Version=0.9.2
901Name=${name} 903 Name=${name}
902Type=Application 904 Type=Application
903Comment=${DESCRIPTION} 905 Comment=${DESCRIPTION}
904Exec=${exec} 906 Exec=${exec}
907 TryExec=${exec%% *}
905Path=${path} 908 Path=${path}
906Icon=${icon} 909 Icon=${icon}
907Categories=Application;${type};" > "${desktop}" 910 Categories=Application;${type};
911 EOF
908 912
909 ( 913 (
910 # wrap the env here so that the 'insinto' call 914 # wrap the env here so that the 'insinto' call
911 # doesn't corrupt the env of the caller 915 # doesn't corrupt the env of the caller
912 insinto /usr/share/applications 916 insinto /usr/share/applications
913 doins "${desktop}" 917 doins "${desktop}"
914 ) 918 )
915} 919}
916 920
921
922# Validate desktop entries using desktop-file-utils
923# Carsten Lohrke <carlo@gentoo.org>
924#
925# Usage: validate_desktop_entries [directory ...]
926
927validate_desktop_entries() {
928 if [[ -x /usr/bin/desktop-file-validate ]] ; then
929 einfo "Checking desktop entry validity"
930 local directories=""
931 for d in /usr/share/applications $@ ; do
932 [[ -d ${D}${d} ]] && directories="${directories} ${D}${d}"
933 done
934 if [[ -n ${directories} ]] ; then
935 for FILE in $(find ${directories} -name "*\.desktop" \
936 -not -path '*.hidden*' | sort -u 2>/dev/null)
937 do
938 local temp=$(desktop-file-validate ${FILE} | grep -v "warning:" | \
939 sed -e "s|error: ||" -e "s|${FILE}:|--|g" )
940 [[ -n $temp ]] && elog ${temp/--/${FILE/${D}/}:}
941 done
942 fi
943 echo ""
944 else
945 einfo "Passing desktop entry validity check. Install dev-util/desktop-file-utils, if you want to help to improve Gentoo."
946 fi
947}
948
949
917# Make a GDM/KDM Session file 950# Make a GDM/KDM Session file
918# 951#
919# make_desktop_entry(<title>, <command>) 952# make_session_desktop(<title>, <command>)
920# title: File to execute to start the Window Manager 953# title: File to execute to start the Window Manager
921# command: Name of the Window Manager 954# command: Name of the Window Manager
922 955
923make_session_desktop() { 956make_session_desktop() {
924 [[ -z $1 ]] && eerror "make_session_desktop: You must specify the title" && return 1 957 [[ -z $1 ]] && eerror "make_session_desktop: You must specify the title" && return 1
926 959
927 local title=$1 960 local title=$1
928 local command=$2 961 local command=$2
929 local desktop=${T}/${wm}.desktop 962 local desktop=${T}/${wm}.desktop
930 963
964 cat <<-EOF > "${desktop}"
931echo "[Desktop Entry] 965 [Desktop Entry]
932Encoding=UTF-8 966 Encoding=UTF-8
933Name=${title} 967 Name=${title}
934Comment=This session logs you into ${title} 968 Comment=This session logs you into ${title}
935Exec=${command} 969 Exec=${command}
936TryExec=${command} 970 TryExec=${command}
937Type=Application" > "${desktop}" 971 Type=Application
972 EOF
938 973
974 (
975 # wrap the env here so that the 'insinto' call
976 # doesn't corrupt the env of the caller
939 insinto /usr/share/xsessions 977 insinto /usr/share/xsessions
940 doins "${desktop}" 978 doins "${desktop}"
979 )
941} 980}
942 981
943domenu() { 982domenu() {
983 (
984 # wrap the env here so that the 'insinto' call
985 # doesn't corrupt the env of the caller
944 local i j 986 local i j ret=0
945 insinto /usr/share/applications 987 insinto /usr/share/applications
946 for i in "$@" ; do 988 for i in "$@" ; do
947 if [[ -f ${i} ]] ; then 989 if [[ -f ${i} ]] ; then
948 doins "${i}" 990 doins "${i}"
991 ((ret+=$?))
949 elif [[ -d ${i} ]] ; then 992 elif [[ -d ${i} ]] ; then
950 for j in "${i}"/*.desktop ; do 993 for j in "${i}"/*.desktop ; do
951 doins "${j}" 994 doins "${j}"
995 ((ret+=$?))
952 done 996 done
953 fi 997 fi
954 done 998 done
999 exit ${ret}
1000 )
955} 1001}
956newmenu() { 1002newmenu() {
1003 (
1004 # wrap the env here so that the 'insinto' call
1005 # doesn't corrupt the env of the caller
957 insinto /usr/share/applications 1006 insinto /usr/share/applications
958 newins "$1" "$2" 1007 newins "$@"
1008 )
959} 1009}
960 1010
961doicon() { 1011doicon() {
1012 (
1013 # wrap the env here so that the 'insinto' call
1014 # doesn't corrupt the env of the caller
962 local i j 1015 local i j ret
963 insinto /usr/share/pixmaps 1016 insinto /usr/share/pixmaps
964 for i in "$@" ; do 1017 for i in "$@" ; do
965 if [[ -f ${i} ]] ; then 1018 if [[ -f ${i} ]] ; then
966 doins "${i}" 1019 doins "${i}"
1020 ((ret+=$?))
967 elif [[ -d ${i} ]] ; then 1021 elif [[ -d ${i} ]] ; then
968 for j in "${i}"/*.png ; do 1022 for j in "${i}"/*.png ; do
969 doins "${j}" 1023 doins "${j}"
1024 ((ret+=$?))
970 done 1025 done
971 fi 1026 fi
972 done 1027 done
1028 exit ${ret}
1029 )
973} 1030}
974newicon() { 1031newicon() {
1032 (
1033 # wrap the env here so that the 'insinto' call
1034 # doesn't corrupt the env of the caller
975 insinto /usr/share/pixmaps 1035 insinto /usr/share/pixmaps
976 newins "$1" "$2" 1036 newins "$@"
1037 )
977} 1038}
978 1039
979############################################################## 1040##############################################################
980# END: Handle .desktop files and menu entries # 1041# END: Handle .desktop files and menu entries #
981############################################################## 1042##############################################################
982 1043
983 1044
984# for internal use only (unpack_pdv and unpack_makeself) 1045# for internal use only (unpack_pdv and unpack_makeself)
985find_unpackable_file() { 1046find_unpackable_file() {
1004# the middle of the archive. Valve seems to use it a lot ... too bad 1065# 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. 1066# it seems to like to segfault a lot :(. So lets take it apart ourselves.
1006# 1067#
1007# Usage: unpack_pdv [file to unpack] [size of off_t] 1068# 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 1069# - 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 1070# 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 1071# 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: 1072# archive. one way to determine this is by running the following commands:
1012# strings <pdv archive> | grep lseek 1073# strings <pdv archive> | grep lseek
1013# strace -elseek <pdv archive> 1074# strace -elseek <pdv archive>
1014# basically look for the first lseek command (we do the strings/grep because 1075# 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 1076# sometimes the function call is _llseek or something) and steal the 2nd
1016# parameter. here is an example: 1077# parameter. here is an example:
1017# root@vapier 0 pdv_unpack # strings hldsupdatetool.bin | grep lseek 1078# root@vapier 0 pdv_unpack # strings hldsupdatetool.bin | grep lseek
1018# lseek 1079# lseek
1019# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 1080# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
1020# lseek(3, -4, SEEK_END) = 2981250 1081# lseek(3, -4, SEEK_END) = 2981250
1021# thus we would pass in the value of '4' as the second parameter. 1082# thus we would pass in the value of '4' as the second parameter.
1022unpack_pdv() { 1083unpack_pdv() {
1023 local src=$(find_unpackable_file $1) 1084 local src=$(find_unpackable_file "$1")
1024 local sizeoff_t=$2 1085 local sizeoff_t=$2
1025 1086
1026 [[ -z ${src} ]] && die "Could not locate source for '$1'" 1087 [[ -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 :(" 1088 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :("
1028 1089
1029 local shrtsrc=$(basename "${src}") 1090 local shrtsrc=$(basename "${src}")
1030 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1091 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1031 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1092 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\"` 1093 local tailskip=$(tail -c $((${sizeoff_t}*2)) "${src}" | head -c ${sizeoff_t} | hexdump -e \"%i\")
1033 1094
1034 # grab metadata for debug reasons 1095 # grab metadata for debug reasons
1035 local metafile="$(emktemp)" 1096 local metafile=$(emktemp)
1036 tail -c +$((${metaskip}+1)) ${src} > ${metafile} 1097 tail -c +$((${metaskip}+1)) "${src}" > "${metafile}"
1037 1098
1038 # rip out the final file name from the metadata 1099 # rip out the final file name from the metadata
1039 local datafile="`tail -c +$((${metaskip}+1)) ${src} | strings | head -n 1`" 1100 local datafile=$(tail -c +$((${metaskip}+1)) "${src}" | strings | head -n 1)
1040 datafile="`basename ${datafile}`" 1101 datafile=$(basename "${datafile}")
1041 1102
1042 # now lets uncompress/untar the file if need be 1103 # now lets uncompress/untar the file if need be
1043 local tmpfile="$(emktemp)" 1104 local tmpfile=$(emktemp)
1044 tail -c +$((${tailskip}+1)) ${src} 2>/dev/null | head -c 512 > ${tmpfile} 1105 tail -c +$((${tailskip}+1)) ${src} 2>/dev/null | head -c 512 > ${tmpfile}
1045 1106
1046 local iscompressed="`file -b ${tmpfile}`" 1107 local iscompressed=$(file -b "${tmpfile}")
1047 if [ "${iscompressed:0:8}" == "compress" ] ; then 1108 if [[ ${iscompressed:0:8} == "compress" ]] ; then
1048 iscompressed=1 1109 iscompressed=1
1049 mv ${tmpfile}{,.Z} 1110 mv ${tmpfile}{,.Z}
1050 gunzip ${tmpfile} 1111 gunzip ${tmpfile}
1051 else 1112 else
1052 iscompressed=0 1113 iscompressed=0
1053 fi 1114 fi
1054 local istar="`file -b ${tmpfile}`" 1115 local istar=$(file -b "${tmpfile}")
1055 if [ "${istar:0:9}" == "POSIX tar" ] ; then 1116 if [[ ${istar:0:9} == "POSIX tar" ]] ; then
1056 istar=1 1117 istar=1
1057 else 1118 else
1058 istar=0 1119 istar=0
1059 fi 1120 fi
1060 1121
1096# many other game companies. 1157# many other game companies.
1097# 1158#
1098# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1159# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1099# - If the file is not specified then unpack will utilize ${A}. 1160# - If the file is not specified then unpack will utilize ${A}.
1100# - If the offset is not specified then we will attempt to extract 1161# - If the offset is not specified then we will attempt to extract
1101# the proper offset from the script itself. 1162# the proper offset from the script itself.
1102unpack_makeself() { 1163unpack_makeself() {
1103 local src_input=${1:-${A}} 1164 local src_input=${1:-${A}}
1104 local src=$(find_unpackable_file "${src_input}") 1165 local src=$(find_unpackable_file "${src_input}")
1105 local skip=$2 1166 local skip=$2
1106 local exe=$3 1167 local exe=$3
1112 if [[ -z ${skip} ]] ; then 1173 if [[ -z ${skip} ]] ; then
1113 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}') 1174 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}')
1114 local skip=0 1175 local skip=0
1115 exe=tail 1176 exe=tail
1116 case ${ver} in 1177 case ${ver} in
1117 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same 1178 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) 1179 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1119 ;; 1180 ;;
1120 2.0|2.0.1) 1181 2.0|2.0.1)
1121 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-) 1182 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-)
1122 ;; 1183 ;;
1152 dd) exe="dd ibs=${skip} skip=1 obs=1024 conv=sync if='${src}'";; 1213 dd) exe="dd ibs=${skip} skip=1 obs=1024 conv=sync if='${src}'";;
1153 *) die "makeself cant handle exe '${exe}'" 1214 *) die "makeself cant handle exe '${exe}'"
1154 esac 1215 esac
1155 1216
1156 # lets grab the first few bytes of the file to figure out what kind of archive it is 1217 # lets grab the first few bytes of the file to figure out what kind of archive it is
1157 local tmpfile="$(emktemp)" 1218 local tmpfile=$(emktemp)
1158 eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}" 1219 eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}"
1159 local filetype="$(file -b "${tmpfile}")" 1220 local filetype=$(file -b "${tmpfile}")
1160 case ${filetype} in 1221 case ${filetype} in
1161 *tar\ archive) 1222 *tar\ archive*)
1162 eval ${exe} | tar --no-same-owner -xf - 1223 eval ${exe} | tar --no-same-owner -xf -
1163 ;; 1224 ;;
1164 bzip2*) 1225 bzip2*)
1165 eval ${exe} | bzip2 -dc | tar --no-same-owner -xf - 1226 eval ${exe} | bzip2 -dc | tar --no-same-owner -xf -
1166 ;; 1227 ;;
1202 # accepted ... if we don't find a match, we make the user accept 1263 # accepted ... if we don't find a match, we make the user accept
1203 local shopts=$- 1264 local shopts=$-
1204 local alic 1265 local alic
1205 set -o noglob #so that bash doesn't expand "*" 1266 set -o noglob #so that bash doesn't expand "*"
1206 for alic in ${ACCEPT_LICENSE} ; do 1267 for alic in ${ACCEPT_LICENSE} ; do
1207 if [[ ${alic} == * || ${alic} == ${l} ]]; then 1268 if [[ ${alic} == ${l} ]]; then
1208 set +o noglob; set -${shopts} #reset old shell opts 1269 set +o noglob; set -${shopts} #reset old shell opts
1209 return 0 1270 return 0
1210 fi 1271 fi
1211 done 1272 done
1212 set +o noglob; set -$shopts #reset old shell opts 1273 set +o noglob; set -$shopts #reset old shell opts
1213 1274
1214 local licmsg="$(emktemp)" 1275 local licmsg=$(emktemp)
1215 cat << EOF > ${licmsg} 1276 cat <<-EOF > ${licmsg}
1216********************************************************** 1277 **********************************************************
1217The following license outlines the terms of use of this 1278 The following license outlines the terms of use of this
1218package. You MUST accept this license for installation to 1279 package. You MUST accept this license for installation to
1219continue. When you are done viewing, hit 'q'. If you 1280 continue. When you are done viewing, hit 'q'. If you
1220CTRL+C out of this, the install will not run! 1281 CTRL+C out of this, the install will not run!
1221********************************************************** 1282 **********************************************************
1222 1283
1223EOF 1284 EOF
1224 cat ${lic} >> ${licmsg} 1285 cat ${lic} >> ${licmsg}
1225 ${PAGER:-less} ${licmsg} || die "Could not execute pager (${PAGER}) to accept ${lic}" 1286 ${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] " 1287 einfon "Do you accept the terms of this license (${l})? [yes/no] "
1227 read alic 1288 read alic
1228 case ${alic} in 1289 case ${alic} in
1245# and when the function returns, you can assume that the cd has been 1306# and when the function returns, you can assume that the cd has been
1246# found at CDROM_ROOT. 1307# found at CDROM_ROOT.
1247# 1308#
1248# normally the cdrom functions will refer to the cds as 'cd #1', 'cd #2', 1309# 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 1310# etc... if you want to give the cds better names, then just export
1250# the CDROM_NAME_X variables before calling cdrom_get_cds(). 1311# the appropriate CDROM_NAME variable before calling cdrom_get_cds().
1312# - CDROM_NAME="fooie cd" - for when you only want 1 cd
1313# - CDROM_NAME_1="install cd" - for when you want more than 1 cd
1314# CDROM_NAME_2="data cd"
1315# - CDROM_NAME_SET=( "install cd" "data cd" ) - short hand for CDROM_NAME_#
1251# 1316#
1252# for those multi cd ebuilds, see the cdrom_load_next_cd() below. 1317# for those multi cd ebuilds, see the cdrom_load_next_cd() below.
1253# 1318#
1254# Usage: cdrom_get_cds <file on cd1> [file on cd2] [file on cd3] [...] 1319# 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 1320# - 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 1321# the cd ... the more files you give this function, the more cds
1257# the cdrom functions will handle 1322# the cdrom functions will handle
1258cdrom_get_cds() { 1323cdrom_get_cds() {
1259 # first we figure out how many cds we're dealing with by 1324 # first we figure out how many cds we're dealing with by
1260 # the # of files they gave us 1325 # the # of files they gave us
1261 local cdcnt=0 1326 local cdcnt=0
1262 local f= 1327 local f=
1306 echo 1371 echo
1307 einfo "For example:" 1372 einfo "For example:"
1308 einfo "export CD_ROOT=/mnt/cdrom" 1373 einfo "export CD_ROOT=/mnt/cdrom"
1309 echo 1374 echo
1310 else 1375 else
1376 if [[ -n ${CDROM_NAME_SET} ]] ; then
1377 # Translate the CDROM_NAME_SET array into CDROM_NAME_#
1378 cdcnt=0
1379 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1380 ((++cdcnt))
1381 export CDROM_NAME_${cdcnt}="${CDROM_NAME_SET[$((${cdcnt}-1))]}"
1382 done
1383 fi
1384
1311 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1385 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1312 cdcnt=0 1386 cdcnt=0
1313 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1387 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1314 ((++cdcnt)) 1388 ((++cdcnt))
1315 var="CDROM_NAME_${cdcnt}" 1389 var="CDROM_NAME_${cdcnt}"
1382 1456
1383 while [[ -n ${cdset[${i}]} ]] ; do 1457 while [[ -n ${cdset[${i}]} ]] ; do
1384 local dir=$(dirname ${cdset[${i}]}) 1458 local dir=$(dirname ${cdset[${i}]})
1385 local file=$(basename ${cdset[${i}]}) 1459 local file=$(basename ${cdset[${i}]})
1386 1460
1387 for mline in $(mount | gawk '/(iso|cdrom|fs=cdfss)/ {print $3}') ; do 1461 local point= node= fs= foo=
1388 [[ -d ${mline}/${dir} ]] || continue 1462 while read point node fs foo ; do
1463 [[ " cd9660 iso9660 udf " != *" ${fs} "* ]] && \
1464 ! [[ ${fs} == "subfs" && ",${opts}," == *",fs=cdfss,"* ]] \
1465 && continue
1466 point=${point//\040/ }
1389 if [[ -n $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] ; then 1467 [[ -z $(find "${point}/${dir}" -maxdepth 1 -iname "${file}") ]] && continue
1390 export CDROM_ROOT=${mline} 1468 export CDROM_ROOT=${point}
1391 export CDROM_SET=${i} 1469 export CDROM_SET=${i}
1392 export CDROM_MATCH=${cdset[${i}]} 1470 export CDROM_MATCH=${cdset[${i}]}
1393 return 1471 return
1394 fi 1472 done <<< "$(get_mounts)"
1395 done
1396 1473
1397 ((++i)) 1474 ((++i))
1398 done 1475 done
1399 1476
1400 echo 1477 echo
1420 echo 1497 echo
1421 einfo "If you are having trouble with the detection" 1498 einfo "If you are having trouble with the detection"
1422 einfo "of your CD, it is possible that you do not have" 1499 einfo "of your CD, it is possible that you do not have"
1423 einfo "Joliet support enabled in your kernel. Please" 1500 einfo "Joliet support enabled in your kernel. Please"
1424 einfo "check that CONFIG_JOLIET is enabled in your kernel." 1501 einfo "check that CONFIG_JOLIET is enabled in your kernel."
1425 read 1502 read || die "something is screwed with your system"
1426 done 1503 done
1427} 1504}
1428 1505
1429# Make sure that LINGUAS only contains languages that 1506# Make sure that LINGUAS only contains languages that
1430# a package can support 1507# a package can support
1431# 1508#
1432# usage: strip-linguas <allow LINGUAS> 1509# usage: strip-linguas <allow LINGUAS>
1433# strip-linguas -i <directories of .po files> 1510# strip-linguas -i <directories of .po files>
1434# strip-linguas -u <directories of .po files> 1511# strip-linguas -u <directories of .po files>
1435# 1512#
1436# The first form allows you to specify a list of LINGUAS. 1513# The first form allows you to specify a list of LINGUAS.
1437# The -i builds a list of po files found in all the 1514# The -i builds a list of po files found in all the
1438# directories and uses the intersection of the lists. 1515# directories and uses the intersection of the lists.
1439# The -u builds a list of po files found in all the 1516# The -u builds a list of po files found in all the
1440# directories and uses the union of the lists. 1517# directories and uses the union of the lists.
1441strip-linguas() { 1518strip-linguas() {
1442 local ls newls 1519 local ls newls nols
1443 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then 1520 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1444 local op=$1; shift 1521 local op=$1; shift
1445 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1522 ls=$(find "$1" -name '*.po' -exec basename {} .po \;); shift
1446 local d f 1523 local d f
1447 for d in "$@" ; do 1524 for d in "$@" ; do
1448 if [[ ${op} == "-u" ]] ; then 1525 if [[ ${op} == "-u" ]] ; then
1449 newls=${ls} 1526 newls=${ls}
1450 else 1527 else
1451 newls="" 1528 newls=""
1452 fi 1529 fi
1453 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1530 for f in $(find "$d" -name '*.po' -exec basename {} .po \;) ; do
1454 if [[ ${op} == "-i" ]] ; then 1531 if [[ ${op} == "-i" ]] ; then
1455 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}" 1532 hasq ${f} ${ls} && newls="${newls} ${f}"
1456 else 1533 else
1457 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}" 1534 hasq ${f} ${ls} || newls="${newls} ${f}"
1458 fi 1535 fi
1459 done 1536 done
1460 ls=${newls} 1537 ls=${newls}
1461 done 1538 done
1462 ls=${ls//.po}
1463 else 1539 else
1464 ls=$@ 1540 ls="$@"
1465 fi 1541 fi
1466 1542
1467 ls=" ${ls} " 1543 nols=""
1468 newls="" 1544 newls=""
1469 for f in ${LINGUAS} ; do 1545 for f in ${LINGUAS} ; do
1470 if [[ ${ls/ ${f} /} != ${ls} ]] ; then 1546 if hasq ${f} ${ls} ; then
1471 newls="${newls} ${f}" 1547 newls="${newls} ${f}"
1472 else 1548 else
1473 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1549 nols="${nols} ${f}"
1474 fi 1550 fi
1475 done 1551 done
1476 if [[ -z ${newls} ]] ; then 1552 [[ -n ${nols} ]] \
1477 export LINGUAS="" 1553 && ewarn "Sorry, but ${PN} does not support the LINGUAs:" ${nols}
1478 else
1479 export LINGUAS=${newls:1} 1554 export LINGUAS=${newls:1}
1480 fi
1481} 1555}
1482 1556
1483# moved from kernel.eclass since they are generally useful outside of 1557# moved from kernel.eclass since they are generally useful outside of
1484# kernel.eclass -iggy (20041002) 1558# kernel.eclass -iggy (20041002)
1485 1559
1492 while ((i--)) ; do 1566 while ((i--)) ; do
1493 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass" 1567 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1494 done 1568 done
1495 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}" 1569 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1496 case ${ARCH} in 1570 case ${ARCH} in
1497 x86) export ARCH="i386";; 1571 x86) export ARCH="i386";;
1498 amd64) export ARCH="x86_64";; 1572 amd64) export ARCH="x86_64";;
1499 hppa) export ARCH="parisc";; 1573 hppa) export ARCH="parisc";;
1500 mips) export ARCH="mips";; 1574 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! 1575 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}";; 1576 *) export ARCH="${ARCH}";;
1503 esac 1577 esac
1504} 1578}
1505 1579
1506# set's ARCH back to what portage expects 1580# set's ARCH back to what portage expects
1507set_arch_to_portage() { 1581set_arch_to_portage() {
1514 1588
1515# Jeremy Huddleston <eradicator@gentoo.org>: 1589# Jeremy Huddleston <eradicator@gentoo.org>:
1516# preserve_old_lib /path/to/libblah.so.0 1590# preserve_old_lib /path/to/libblah.so.0
1517# preserve_old_lib_notify /path/to/libblah.so.0 1591# preserve_old_lib_notify /path/to/libblah.so.0
1518# 1592#
1519# These functions are useful when a lib in your package changes --soname. Such 1593# 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 1594# 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 1595# 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 1596# 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: 1597# solution, so instead you can add the following to your ebuilds:
1524# 1598#
1525# src_install() { 1599# pkg_preinst() {
1526# ... 1600# ...
1527# preserve_old_lib /usr/$(get_libdir)/libogg.so.0 1601# preserve_old_lib /usr/$(get_libdir)/libogg.so.0
1528# ... 1602# ...
1529# } 1603# }
1530# 1604#
1533# preserve_old_lib_notify /usr/$(get_libdir)/libogg.so.0 1607# preserve_old_lib_notify /usr/$(get_libdir)/libogg.so.0
1534# ... 1608# ...
1535# } 1609# }
1536 1610
1537preserve_old_lib() { 1611preserve_old_lib() {
1538 LIB=$1 1612 if [[ ${EBUILD_PHASE} != "preinst" ]] ; then
1613 eerror "preserve_old_lib() must be called from pkg_preinst() only"
1614 die "Invalid preserve_old_lib() usage"
1615 fi
1616 [[ -z $1 ]] && die "Usage: preserve_old_lib <library to preserve> [more libraries to preserve]"
1539 1617
1540 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1618 local lib dir
1541 SONAME=`basename ${LIB}` 1619 for lib in "$@" ; do
1542 DIRNAME=`dirname ${LIB}` 1620 [[ -e ${ROOT}/${lib} ]] || continue
1543 1621 dir=${lib%/*}
1544 dodir ${DIRNAME} 1622 dodir ${dir} || die "dodir ${dir} failed"
1545 cp ${ROOT}${LIB} ${D}${DIRNAME} 1623 cp "${ROOT}"/${lib} "${D}"/${lib} || die "cp ${lib} failed"
1546 touch ${D}${LIB} 1624 touch "${D}"/${lib}
1547 fi 1625 done
1548} 1626}
1549 1627
1550preserve_old_lib_notify() { 1628preserve_old_lib_notify() {
1551 LIB=$1 1629 if [[ ${EBUILD_PHASE} != "postinst" ]] ; then
1630 eerror "preserve_old_lib_notify() must be called from pkg_postinst() only"
1631 die "Invalid preserve_old_lib_notify() usage"
1632 fi
1552 1633
1553 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1634 local lib notice=0
1554 SONAME=`basename ${LIB}` 1635 for lib in "$@" ; do
1555 1636 [[ -e ${ROOT}/${lib} ]] || continue
1637 if [[ ${notice} -eq 0 ]] ; then
1638 notice=1
1556 ewarn "An old version of an installed library was detected on your system." 1639 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" 1640 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," 1641 ewarn "the libraries are not being removed. You need to run revdep-rebuild"
1559 ewarn "you will need to execute the following command:" 1642 ewarn "in order to remove these old dependencies. If you do not have this"
1560 ewarn " revdep-rebuild --soname ${SONAME}" 1643 ewarn "helper program, simply emerge the 'gentoolkit' package."
1561 ewarn 1644 ewarn
1562 ewarn "After doing that, you can safely remove ${LIB}"
1563 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1564 fi 1645 fi
1646 ewarn " # revdep-rebuild --library ${lib##*/}"
1647 done
1565} 1648}
1566 1649
1567# Hack for people to figure out if a package was built with 1650# Hack for people to figure out if a package was built with
1568# certain USE flags 1651# certain USE flags
1569# 1652#
1570# Usage: built_with_use [-a|-o] <DEPEND ATOM> <List of USE flags> 1653# Usage: built_with_use [--missing <action>] [-a|-o] <DEPEND ATOM> <List of USE flags>
1571# ex: built_with_use xchat gtk2 1654# ex: built_with_use xchat gtk2
1572# 1655#
1573# Flags: -a all USE flags should be utilized 1656# Flags: -a all USE flags should be utilized
1574# -o at least one USE flag should be utilized 1657# -o at least one USE flag should be utilized
1658# --missing peform the specified action if the flag is not in IUSE (true/false/die)
1659# --hidden USE flag we're checking is hidden expanded so it isnt in IUSE
1575# Note: the default flag is '-a' 1660# Note: the default flag is '-a'
1576built_with_use() { 1661built_with_use() {
1662 local hidden="no"
1663 if [[ $1 == "--hidden" ]] ; then
1664 hidden="yes"
1665 shift
1666 fi
1667
1668 local missing_action="die"
1669 if [[ $1 == "--missing" ]] ; then
1670 missing_action=$2
1671 shift ; shift
1672 case ${missing_action} in
1673 true|false|die) ;;
1674 *) die "unknown action '${missing_action}'";;
1675 esac
1676 fi
1677
1577 local opt=$1 1678 local opt=$1
1578 [[ ${opt:0:1} = "-" ]] && shift || opt="-a" 1679 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1579 1680
1580 local PKG=$(best_version $1) 1681 local PKG=$(best_version $1)
1682 [[ -z ${PKG} ]] && die "Unable to resolve $1 to an installed package"
1581 shift 1683 shift
1582 1684
1583 local USEFILE=${ROOT}/var/db/pkg/${PKG}/USE 1685 local USEFILE=${ROOT}/var/db/pkg/${PKG}/USE
1686 local IUSEFILE=${ROOT}/var/db/pkg/${PKG}/IUSE
1584 1687
1585 # if the USE file doesnt exist, assume the $PKG is either 1688 # if the IUSE file doesn't exist, the read will error out, we need to handle
1586 # injected or package.provided 1689 # this gracefully
1587 [[ ! -e ${USEFILE} ]] && return 0 1690 if [[ ! -e ${USEFILE} ]] || [[ ! -e ${IUSEFILE} && ${hidden} == "no" ]] ; then
1691 case ${missing_action} in
1692 true) return 0;;
1693 false) return 1;;
1694 die) die "Unable to determine what USE flags $PKG was built with";;
1695 esac
1696 fi
1697
1698 if [[ ${hidden} == "no" ]] ; then
1699 local IUSE_BUILT=$(<${IUSEFILE})
1700 # Don't check USE_EXPAND #147237
1701 local expand
1702 for expand in $(echo ${USE_EXPAND} | tr '[:upper:]' '[:lower:]') ; do
1703 if [[ $1 == ${expand}_* ]] ; then
1704 expand=""
1705 break
1706 fi
1707 done
1708 if [[ -n ${expand} ]] ; then
1709 if ! has $1 ${IUSE_BUILT} ; then
1710 case ${missing_action} in
1711 true) return 0;;
1712 false) return 1;;
1713 die) die "$PKG does not actually support the $1 USE flag!";;
1714 esac
1715 fi
1716 fi
1717 fi
1588 1718
1589 local USE_BUILT=$(<${USEFILE}) 1719 local USE_BUILT=$(<${USEFILE})
1590 while [[ $# -gt 0 ]] ; do 1720 while [[ $# -gt 0 ]] ; do
1591 if [[ ${opt} = "-o" ]] ; then 1721 if [[ ${opt} = "-o" ]] ; then
1592 has $1 ${USE_BUILT} && return 0 1722 has $1 ${USE_BUILT} && return 0
1607 local f 1737 local f
1608 for f in $(find ${dir} -name configure) ; do 1738 for f in $(find ${dir} -name configure) ; do
1609 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null 1739 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null
1610 done 1740 done
1611 eend 0 1741 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} 1742}
1636 1743
1637# make a wrapper script ... 1744# make a wrapper script ...
1638# NOTE: this was originally games_make_wrapper, but I noticed other places where 1745# 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 1746# 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.281

  ViewVC Help
Powered by ViewVC 1.1.20