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

  ViewVC Help
Powered by ViewVC 1.1.20