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

Diff of /eclass/eutils.eclass

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

Revision 1.199 Revision 1.275
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.199 2005/09/22 14:52:36 wolf31o2 Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.275 2007/02/17 00:17:39 vapier Exp $
4#
5# Author: Martin Schlemmer <azarah@gentoo.org>
6# 4#
7# This eclass is for general purpose functions that most ebuilds 5# This eclass is for general purpose functions that most ebuilds
8# have to implement themselves. 6# have to implement themselves.
9# 7#
10# NB: If you add anything, please comment it! 8# NB: If you add anything, please comment it!
9#
10# Maintainer: see each individual function, base-system@gentoo.org as default
11 11
12inherit multilib portability 12inherit multilib portability
13
14DEPEND="!bootstrap? ( sys-devel/patch )"
15# sys-apps/shadow is needed for useradd, etc, bug #94745.
16 13
17DESCRIPTION="Based on the ${ECLASS} eclass" 14DESCRIPTION="Based on the ${ECLASS} eclass"
18 15
19# Wait for the supplied number of seconds. If no argument is supplied, defaults 16# Wait for the supplied number of seconds. If no argument is supplied, defaults
20# to five seconds. If the EPAUSE_IGNORE env var is set, don't wait. If we're not 17# to five seconds. If the EPAUSE_IGNORE env var is set, don't wait. If we're not
21# outputting to a terminal, don't wait. For compatability purposes, the argument 18# outputting to a terminal, don't wait. For compatability purposes, the argument
22# must be an integer greater than zero. 19# must be an integer greater than zero.
23# Bug 62950, Ciaran McCreesh <ciaranm@gentoo.org> (05 Sep 2004) 20# Bug 62950, Ciaran McCreesh <ciaranm@gentoo.org> (05 Sep 2004)
24epause() { 21epause() {
25 if [ -z "$EPAUSE_IGNORE" ] && [ -t 1 ] ; then 22 [[ -z ${EPAUSE_IGNORE} ]] && sleep ${1:-5}
26 sleep ${1:-5}
27 fi
28} 23}
29 24
30# Beep the specified number of times (defaults to five). If our output 25# Beep the specified number of times (defaults to five). If our output
31# is not a terminal, don't beep. If the EBEEP_IGNORE env var is set, 26# is not a terminal, don't beep. If the EBEEP_IGNORE env var is set,
32# don't beep. 27# don't beep.
33# Bug 62950, Ciaran McCreesh <ciaranm@gentoo.org> (05 Sep 2004) 28# Bug 62950, Ciaran McCreesh <ciaranm@gentoo.org> (05 Sep 2004)
34ebeep() { 29ebeep() {
35 local n 30 local n
36 if [ -z "$EBEEP_IGNORE" ] && [ -t 1 ] ; then 31 if [[ -z ${EBEEP_IGNORE} ]] ; then
37 for ((n=1 ; n <= ${1:-5} ; n++)) ; do 32 for ((n=1 ; n <= ${1:-5} ; n++)) ; do
38 echo -ne "\a" 33 echo -ne "\a"
39 sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null 34 sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
40 echo -ne "\a" 35 echo -ne "\a"
41 sleep 1 36 sleep 1
42 done 37 done
43 fi 38 fi
44} 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 }
149 _epatch_assert() { local _pipestatus=${PIPESTATUS[*]}; [[ ${_pipestatus// /} -eq 0 ]] ; }
171 local PIPE_CMD="" 150 local PIPE_CMD=""
172 local STDERR_TARGET="${T}/$$.out" 151 local STDERR_TARGET="${T}/$$.out"
173 local PATCH_TARGET="${T}/$$.patch" 152 local PATCH_TARGET="${T}/$$.patch"
174 local PATCH_SUFFIX="" 153 local PATCH_SUFFIX=""
175 local SINGLE_PATCH="no" 154 local SINGLE_PATCH="no"
247 fi 226 fi
248 for x in ${EPATCH_SOURCE} 227 for x in ${EPATCH_SOURCE}
249 do 228 do
250 # New ARCH dependant patch naming scheme ... 229 # New ARCH dependant patch naming scheme ...
251 # 230 #
252 # ???_arch_foo.patch 231 # ???_arch_foo.patch
253 # 232 #
254 if [ -f ${x} ] && \ 233 if [ -f ${x} ] && \
255 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "${x/_${ARCH}_}" != "${x}" ] || \ 234 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "${x/_${ARCH}_}" != "${x}" ] || \
256 [ "${EPATCH_FORCE}" = "yes" ]) 235 [ "${EPATCH_FORCE}" = "yes" ])
257 then 236 then
258 local count=0 237 local count=0
259 local popts="${EPATCH_OPTS}" 238 local popts="${EPATCH_OPTS}"
260 local patchname=${x##*/} 239 local patchname=${x##*/}
261 240
284 263
285 # Allow for prefix to differ ... im lazy, so shoot me :/ 264 # Allow for prefix to differ ... im lazy, so shoot me :/
286 while [ "${count}" -lt 5 ] 265 while [ "${count}" -lt 5 ]
287 do 266 do
288 # Generate some useful debug info ... 267 # Generate some useful debug info ...
289 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 268 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
290 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 269 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
291 270
292 if [ "${PATCH_SUFFIX}" != "patch" ] 271 if [ "${PATCH_SUFFIX}" != "patch" ]
293 then 272 then
294 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 273 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
295 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 274 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
296 else 275 else
297 PATCH_TARGET="${x}" 276 PATCH_TARGET="${x}"
298 fi 277 fi
299 278
300 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 279 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
301 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##*/}
302 281
303 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 282 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
304 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 283 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
305 284
306 if [ "${PATCH_SUFFIX}" != "patch" ] 285 if [ "${PATCH_SUFFIX}" != "patch" ]
307 then 286 then
308 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
309 then 288 then
313 count=5 292 count=5
314 break 293 break
315 fi 294 fi
316 fi 295 fi
317 296
318 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f) >> ${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
319 then 298 then
320 draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 299 _epatch_draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
321 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 300 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
322 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 301 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
323 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 302 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
324 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 303 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
325 304
326 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
306 _epatch_assert
327 307
328 if [ "$?" -ne 0 ] 308 if [ "$?" -ne 0 ]
329 then 309 then
330 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 310 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
331 echo 311 echo
394 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM} 374 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}
395 done 375 done
396 ${exe} "${tmp}" || ${exe} -p "${tmp}" 376 ${exe} "${tmp}" || ${exe} -p "${tmp}"
397 echo "${tmp}" 377 echo "${tmp}"
398 else 378 else
399 [[ ${exe} == "touch" ]] \ 379 if [[ ${exe} == "touch" ]] ; then
400 && exe="-p" \ 380 [[ ${USERLAND} == "GNU" ]] \
401 || exe="-d" 381 && mktemp -p "${topdir}" \
402 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
403 fi 388 fi
404} 389}
405 390
406# Small wrapper for getent (Linux), nidump (Mac OS X), 391# Small wrapper for getent (Linux), nidump (Mac OS X),
407# and pw (FreeBSD) used in enewuser()/enewgroup() 392# and pw (FreeBSD) used in enewuser()/enewgroup()
408# Joe Jezak <josejx@gmail.com> and usata@gentoo.org 393# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
409# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org> 394# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
410# 395#
411# egetent(database, key) 396# egetent(database, key)
412egetent() { 397egetent() {
413 if [[ "${USERLAND}" == "Darwin" ]] ; then 398 case ${CHOST} in
399 *-darwin*)
414 case "$2" in 400 case "$2" in
415 *[!0-9]*) # Non numeric 401 *[!0-9]*) # Non numeric
416 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 402 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
417 ;; 403 ;;
418 *) # Numeric 404 *) # Numeric
419 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 405 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
420 ;; 406 ;;
421 esac 407 esac
422 elif [[ "${USERLAND}" == "BSD" ]] ; then 408 ;;
423 local action 409 *-freebsd*|*-dragonfly*)
424 if [ "$1" == "passwd" ] 410 local opts action="user"
425 then 411 [[ $1 == "passwd" ]] || action="group"
426 action="user" 412
427 else 413 # lookup by uid/gid
428 action="group" 414 if [[ $2 == [[:digit:]]* ]] ; then
415 [[ ${action} == "user" ]] && opts="-u" || opts="-g"
429 fi 416 fi
417
430 pw show "${action}" "$2" -q 418 pw show ${action} ${opts} "$2" -q
431 else 419 ;;
420 *-netbsd*|*-openbsd*)
421 grep "$2:\*:" /etc/$1
422 ;;
423 *)
432 which nscd >& /dev/null && nscd -i "$1" 424 type -p nscd >& /dev/null && nscd -i "$1"
433 getent "$1" "$2" 425 getent "$1" "$2"
434 fi 426 ;;
427 esac
435} 428}
436 429
437# Simplify/standardize adding users to the system 430# Simplify/standardize adding users to the system
438# vapier@gentoo.org 431# vapier@gentoo.org
439# 432#
446# shell: /bin/false 439# shell: /bin/false
447# homedir: /dev/null 440# homedir: /dev/null
448# groups: none 441# groups: none
449# extra: comment of 'added by portage for ${PN}' 442# extra: comment of 'added by portage for ${PN}'
450enewuser() { 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
451 # get the username 451 # get the username
452 local euser=$1; shift 452 local euser=$1; shift
453 if [[ -z ${euser} ]] ; then 453 if [[ -z ${euser} ]] ; then
454 eerror "No username specified !" 454 eerror "No username specified !"
455 die "Cannot call enewuser without a username" 455 die "Cannot call enewuser without a username"
456 fi 456 fi
457 457
458 # lets see if the username already exists 458 # lets see if the username already exists
459 if [[ ${euser} == $(egetent passwd "${euser}" | cut -d: -f1) ]] ; then 459 if [[ -n $(egetent passwd "${euser}") ]] ; then
460 return 0 460 return 0
461 fi 461 fi
462 einfo "Adding user '${euser}' to your system ..." 462 einfo "Adding user '${euser}' to your system ..."
463 463
464 # options to pass to useradd 464 # options to pass to useradd
465 local opts= 465 local opts=
466 466
467 # handle uid 467 # handle uid
468 local euid=$1; shift 468 local euid=$1; shift
469 if [[ ! -z ${euid} ]] && [[ ${euid} != "-1" ]] ; then 469 if [[ -n ${euid} && ${euid} != -1 ]] ; then
470 if [[ ${euid} -gt 0 ]] ; then 470 if [[ ${euid} -gt 0 ]] ; then
471 if [[ ! -z $(egetent passwd ${euid}) ]] ; then 471 if [[ -n $(egetent passwd ${euid}) ]] ; then
472 euid="next" 472 euid="next"
473 fi 473 fi
474 else 474 else
475 eerror "Userid given but is not greater than 0 !" 475 eerror "Userid given but is not greater than 0 !"
476 die "${euid} is not a valid UID" 476 die "${euid} is not a valid UID"
477 fi 477 fi
478 else 478 else
479 euid="next" 479 euid="next"
480 fi 480 fi
481 if [[ ${euid} == "next" ]] ; then 481 if [[ ${euid} == "next" ]] ; then
482 for euid in $(seq 101 999) ; do 482 for ((euid = 101; euid <= 999; euid++)); do
483 [[ -z $(egetent passwd ${euid}) ]] && break 483 [[ -z $(egetent passwd ${euid}) ]] && break
484 done 484 done
485 fi 485 fi
486 opts="${opts} -u ${euid}" 486 opts="${opts} -u ${euid}"
487 einfo " - Userid: ${euid}" 487 einfo " - Userid: ${euid}"
488 488
489 # handle shell 489 # handle shell
490 local eshell=$1; shift 490 local eshell=$1; shift
491 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then 491 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
492 if [[ ! -e ${eshell} ]] ; then 492 if [[ ! -e ${ROOT}${eshell} ]] ; then
493 eerror "A shell was specified but it does not exist !" 493 eerror "A shell was specified but it does not exist !"
494 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"
495 fi 499 fi
496 else 500 else
497 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
498 [[ -x ${ROOT}${shell} ]] && break; 502 [[ -x ${ROOT}${shell} ]] && break
499 done 503 done
500 504
501 if [[ ${shell} == "/dev/null" ]]; then 505 if [[ ${shell} == "/dev/null" ]] ; then
502 eerror "Unable to identify the shell to use" 506 eerror "Unable to identify the shell to use, proceeding with userland default."
503 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
504 fi 513 fi
505 514
506 eshell=${shell} 515 eshell=${shell}
507 fi 516 fi
508 einfo " - Shell: ${eshell}" 517 einfo " - Shell: ${eshell}"
548 einfo " - Groups: ${egroups}" 557 einfo " - Groups: ${egroups}"
549 558
550 # handle extra and add the user 559 # handle extra and add the user
551 local oldsandbox=${SANDBOX_ON} 560 local oldsandbox=${SANDBOX_ON}
552 export SANDBOX_ON="0" 561 export SANDBOX_ON="0"
553 case ${USERLAND} in 562 case ${CHOST} in
554 Darwin) 563 *-darwin*)
555 ### Make the user 564 ### Make the user
556 if [[ -z $@ ]] ; then 565 if [[ -z $@ ]] ; then
557 dscl . create /users/${euser} uid ${euid} 566 dscl . create /users/${euser} uid ${euid}
558 dscl . create /users/${euser} shell ${eshell} 567 dscl . create /users/${euser} shell ${eshell}
559 dscl . create /users/${euser} home ${ehome} 568 dscl . create /users/${euser} home ${ehome}
570 einfo "Please report the ebuild along with the info below" 579 einfo "Please report the ebuild along with the info below"
571 einfo "eextra: $@" 580 einfo "eextra: $@"
572 die "Required function missing" 581 die "Required function missing"
573 fi 582 fi
574 ;; 583 ;;
575 BSD) 584 *-freebsd*|*-dragonfly*)
576 if [[ -z $@ ]] ; then 585 if [[ -z $@ ]] ; then
577 pw useradd ${euser} ${opts} \ 586 pw useradd ${euser} ${opts} \
578 -c "added by portage for ${PN}" \ 587 -c "added by portage for ${PN}" \
579 die "enewuser failed" 588 die "enewuser failed"
580 else 589 else
581 einfo " - Extra: $@" 590 einfo " - Extra: $@"
582 pw useradd ${euser} ${opts} \ 591 pw useradd ${euser} ${opts} \
583 "$@" || die "enewuser failed" 592 "$@" || die "enewuser failed"
584 fi 593 fi
585 ;; 594 ;;
595
596 *-netbsd*)
597 if [[ -z $@ ]] ; then
598 useradd ${opts} ${euser} || die "enewuser failed"
599 else
600 einfo " - Extra: $@"
601 useradd ${opts} ${euser} "$@" || die "enewuser failed"
602 fi
603 ;;
604
605 *-openbsd*)
606 if [[ -z $@ ]] ; then
607 useradd -u ${euid} -s ${eshell} \
608 -d ${ehome} -c "Added by portage for ${PN}" \
609 -g ${egroups} ${euser} || die "enewuser failed"
610 else
611 einfo " - Extra: $@"
612 useradd -u ${euid} -s ${eshell} \
613 -d ${ehome} -c "Added by portage for ${PN}" \
614 -g ${egroups} ${euser} "$@" || die "enewuser failed"
615 fi
616 ;;
617
586 *) 618 *)
587 if [[ -z $@ ]] ; then 619 if [[ -z $@ ]] ; then
588 useradd ${opts} ${euser} \ 620 useradd ${opts} ${euser} \
589 -c "added by portage for ${PN}" \ 621 -c "added by portage for ${PN}" \
590 || die "enewuser failed" 622 || die "enewuser failed"
614# Default values if you do not specify any: 646# Default values if you do not specify any:
615# groupname: REQUIRED ! 647# groupname: REQUIRED !
616# gid: next available (see groupadd(8)) 648# gid: next available (see groupadd(8))
617# extra: none 649# extra: none
618enewgroup() { 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
619 # get the group 658 # get the group
620 local egroup="$1"; shift 659 local egroup="$1"; shift
621 if [ -z "${egroup}" ] 660 if [ -z "${egroup}" ]
622 then 661 then
623 eerror "No group specified !" 662 eerror "No group specified !"
624 die "Cannot call enewgroup without a group" 663 die "Cannot call enewgroup without a group"
625 fi 664 fi
626 665
627 # see if group already exists 666 # see if group already exists
628 if [ "${egroup}" == "`egetent group \"${egroup}\" | cut -d: -f1`" ] 667 if [[ -n $(egetent group "${egroup}") ]]; then
629 then
630 return 0 668 return 0
631 fi 669 fi
632 einfo "Adding group '${egroup}' to your system ..." 670 einfo "Adding group '${egroup}' to your system ..."
633 671
634 # options to pass to useradd 672 # options to pass to useradd
640 then 678 then
641 if [ "${egid}" -gt 0 ] 679 if [ "${egid}" -gt 0 ]
642 then 680 then
643 if [ -z "`egetent group ${egid}`" ] 681 if [ -z "`egetent group ${egid}`" ]
644 then 682 then
645 if [[ "${USERLAND}" == "Darwin" ]]; then 683 if [[ "${CHOST}" == *-darwin* ]]; then
646 opts="${opts} ${egid}" 684 opts="${opts} ${egid}"
647 else 685 else
648 opts="${opts} -g ${egid}" 686 opts="${opts} -g ${egid}"
649 fi 687 fi
650 else 688 else
664 opts="${opts} ${eextra}" 702 opts="${opts} ${eextra}"
665 703
666 # add the group 704 # add the group
667 local oldsandbox="${SANDBOX_ON}" 705 local oldsandbox="${SANDBOX_ON}"
668 export SANDBOX_ON="0" 706 export SANDBOX_ON="0"
669 if [[ "${USERLAND}" == "Darwin" ]]; then 707 case ${CHOST} in
708 *-darwin*)
670 if [ ! -z "${eextra}" ]; 709 if [ ! -z "${eextra}" ];
671 then 710 then
672 einfo "Extra options are not supported on Darwin/OS X yet" 711 einfo "Extra options are not supported on Darwin/OS X yet"
673 einfo "Please report the ebuild along with the info below" 712 einfo "Please report the ebuild along with the info below"
674 einfo "eextra: ${eextra}" 713 einfo "eextra: ${eextra}"
675 die "Required function missing" 714 die "Required function missing"
676 fi 715 fi
677 716
678 # If we need the next available 717 # If we need the next available
679 case ${egid} in 718 case ${egid} in
680 *[!0-9]*) # Non numeric 719 *[!0-9]*) # Non numeric
681 for egid in $(seq 101 999); do 720 for ((egid = 101; egid <= 999; egid++)); do
682 [ -z "`egetent group ${egid}`" ] && break 721 [[ -z $(egetent group ${egid}) ]] && break
683 done 722 done
684 esac 723 esac
685 dscl . create /groups/${egroup} gid ${egid} 724 dscl . create /groups/${egroup} gid ${egid}
686 dscl . create /groups/${egroup} passwd '*' 725 dscl . create /groups/${egroup} passwd '*'
687 elif [[ "${USERLAND}" == "BSD" ]] ; then 726 ;;
727
728 *-freebsd*|*-dragonfly*)
688 case ${egid} in 729 case ${egid} in
689 *[!0-9]*) # Non numeric 730 *[!0-9]*) # Non numeric
690 for egid in $(seq 101 999); do 731 for ((egid = 101; egid <= 999; egid++)); do
691 [ -z "`egetent group ${egid}`" ] && break 732 [[ -z $(egetent group ${egid}) ]] && break
692 done 733 done
693 esac 734 esac
694 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 735 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
695 else 736 ;;
737
738 *-netbsd*)
739 case ${egid} in
740 *[!0-9]*) # Non numeric
741 for ((egid = 101; egid <= 999; egid++)); do
742 [[ -z $(egetent group ${egid}) ]] && break
743 done
744 esac
745 groupadd -g ${egid} ${egroup} || die "enewgroup failed"
746 ;;
747
748 *)
696 groupadd ${opts} ${egroup} || die "enewgroup failed" 749 groupadd ${opts} ${egroup} || die "enewgroup failed"
697 fi 750 ;;
751 esac
698 export SANDBOX_ON="${oldsandbox}" 752 export SANDBOX_ON="${oldsandbox}"
699} 753}
700 754
701# Simple script to replace 'dos2unix' binaries 755# Simple script to replace 'dos2unix' binaries
702# vapier@gentoo.org 756# vapier@gentoo.org
703# 757#
704# edos2unix(file, <more files> ...) 758# edos2unix(file, <more files> ...)
705edos2unix() { 759edos2unix() {
706 for f in "$@" 760 echo "$@" | xargs sed -i 's/\r$//'
707 do
708 cp "${f}" ${T}/edos2unix
709 sed 's/\r$//' ${T}/edos2unix > "${f}"
710 done
711} 761}
712 762
713 763
714############################################################## 764##############################################################
715# START: Handle .desktop files and menu entries # 765# START: Handle .desktop files and menu entries #
716# maybe this should be separated into a new eclass some time # 766# maybe this should be separated into a new eclass some time #
717# lanius@gentoo.org # 767# lanius@gentoo.org #
718############################################################## 768##############################################################
719 769
720# Make a desktop file ! 770# Make a desktop file !
721# Great for making those icons in kde/gnome startmenu ! 771# Great for making those icons in kde/gnome startmenu !
722# Amaze your friends ! Get the women ! Join today ! 772# Amaze your friends ! Get the women ! Join today !
723# 773#
724# make_desktop_entry(<binary>, [name], [icon], [type], [path]) 774# make_desktop_entry(<command>, [name], [icon], [type], [path])
725# 775#
726# binary: what binary does the app run with ? 776# binary: what command does the app run with ?
727# name: the name that will show up in the menu 777# name: the name that will show up in the menu
728# icon: give your little like a pretty little icon ... 778# icon: give your little like a pretty little icon ...
729# this can be relative (to /usr/share/pixmaps) or 779# this can be relative (to /usr/share/pixmaps) or
730# a full path to an icon 780# a full path to an icon
731# type: what kind of application is this ? for categories: 781# type: what kind of application is this ? for categories:
732# http://www.freedesktop.org/Standards/desktop-entry-spec 782# http://www.freedesktop.org/Standards/desktop-entry-spec
733# path: if your app needs to startup in a specific dir 783# path: if your app needs to startup in a specific dir
734make_desktop_entry() { 784make_desktop_entry() {
735 [[ -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
736 786
744 local catmaj=${CATEGORY%%-*} 794 local catmaj=${CATEGORY%%-*}
745 local catmin=${CATEGORY##*-} 795 local catmin=${CATEGORY##*-}
746 case ${catmaj} in 796 case ${catmaj} in
747 app) 797 app)
748 case ${catmin} in 798 case ${catmin} in
749 admin) type=System;; 799 admin) type=System;;
750 cdr) type=DiscBurning;; 800 cdr) type=DiscBurning;;
751 dicts) type=Dictionary;; 801 dicts) type=Dictionary;;
752 editors) type=TextEditor;; 802 editors) type=TextEditor;;
753 emacs) type=TextEditor;; 803 emacs) type=TextEditor;;
754 emulation) type=Emulator;; 804 emulation) type=Emulator;;
755 laptop) type=HardwareSettings;; 805 laptop) type=HardwareSettings;;
756 office) type=Office;; 806 office) type=Office;;
757 vim) type=TextEditor;; 807 vim) type=TextEditor;;
758 xemacs) type=TextEditor;; 808 xemacs) type=TextEditor;;
759 *) type=;; 809 *) type=;;
760 esac 810 esac
761 ;; 811 ;;
762 812
763 dev) 813 dev)
764 type="Development" 814 type="Development"
765 ;; 815 ;;
766 816
767 games) 817 games)
768 case ${catmin} in 818 case ${catmin} in
769 action) type=ActionGame;; 819 action|fps) type=ActionGame;;
770 arcade) type=ArcadeGame;; 820 arcade) type=ArcadeGame;;
771 board) type=BoardGame;; 821 board) type=BoardGame;;
772 kid) type=KidsGame;; 822 kids) type=KidsGame;;
773 emulation) type=Emulator;; 823 emulation) type=Emulator;;
774 puzzle) type=LogicGame;; 824 puzzle) type=LogicGame;;
775 rpg) type=RolePlaying;; 825 rpg) type=RolePlaying;;
776 roguelike) type=RolePlaying;; 826 roguelike) type=RolePlaying;;
777 simulation) type=Simulation;; 827 simulation) type=Simulation;;
778 sports) type=SportsGame;; 828 sports) type=SportsGame;;
779 strategy) type=StrategyGame;; 829 strategy) type=StrategyGame;;
780 *) type=;; 830 *) type=;;
781 esac 831 esac
782 type="Game;${type}" 832 type="Game;${type}"
783 ;; 833 ;;
784 834
785 mail) 835 mail)
789 media) 839 media)
790 case ${catmin} in 840 case ${catmin} in
791 gfx) type=Graphics;; 841 gfx) type=Graphics;;
792 radio) type=Tuner;; 842 radio) type=Tuner;;
793 sound) type=Audio;; 843 sound) type=Audio;;
794 tv) type=TV;; 844 tv) type=TV;;
795 video) type=Video;; 845 video) type=Video;;
796 *) type=;; 846 *) type=;;
797 esac 847 esac
798 type="AudioVideo;${type}" 848 type="AudioVideo;${type}"
799 ;; 849 ;;
800 850
801 net) 851 net)
802 case ${catmin} in 852 case ${catmin} in
803 dialup) type=Dialup;; 853 dialup) type=Dialup;;
804 ftp) type=FileTransfer;; 854 ftp) type=FileTransfer;;
805 im) type=InstantMessaging;; 855 im) type=InstantMessaging;;
806 irc) type=IRCClient;; 856 irc) type=IRCClient;;
807 mail) type=Email;; 857 mail) type=Email;;
808 news) type=News;; 858 news) type=News;;
809 nntp) type=News;; 859 nntp) type=News;;
810 p2p) type=FileTransfer;; 860 p2p) type=FileTransfer;;
811 *) type=;; 861 *) type=;;
812 esac 862 esac
813 type="Network;${type}" 863 type="Network;${type}"
814 ;; 864 ;;
815 865
816 sci) 866 sci)
817 case ${catmin} in 867 case ${catmin} in
818 astro*) type=Astronomoy;; 868 astro*) type=Astronomy;;
819 bio*) type=Biology;; 869 bio*) type=Biology;;
820 calc*) type=Calculator;; 870 calc*) type=Calculator;;
821 chem*) type=Chemistry;; 871 chem*) type=Chemistry;;
822 geo*) type=Geology;; 872 geo*) type=Geology;;
823 math*) type=Math;; 873 math*) type=Math;;
824 *) type=;; 874 *) type=;;
825 esac 875 esac
826 type="Science;${type}" 876 type="Science;${type}"
827 ;; 877 ;;
828 878
829 www) 879 www)
830 case ${catmin} in 880 case ${catmin} in
831 client) type=WebBrowser;; 881 client) type=WebBrowser;;
832 *) type=;; 882 *) type=;;
833 esac 883 esac
834 type="Network" 884 type="Network"
835 ;; 885 ;;
836 886
837 *) 887 *)
842 if [ "${SLOT}" == "0" ] ; then 892 if [ "${SLOT}" == "0" ] ; then
843 local desktop_name="${PN}" 893 local desktop_name="${PN}"
844 else 894 else
845 local desktop_name="${PN}-${SLOT}" 895 local desktop_name="${PN}-${SLOT}"
846 fi 896 fi
897 local desktop="${T}/$(echo ${exec} | sed 's:[[:space:]/:]:_:g')-${desktop_name}.desktop"
847 local desktop=${T}/${exec%% *}-${desktop_name}.desktop 898 #local desktop=${T}/${exec%% *:-${desktop_name}}.desktop
848 899
900 cat <<-EOF > "${desktop}"
849echo "[Desktop Entry] 901 [Desktop Entry]
850Encoding=UTF-8 902 Encoding=UTF-8
851Version=0.9.2 903 Version=0.9.2
852Name=${name} 904 Name=${name}
853Type=Application 905 Type=Application
854Comment=${DESCRIPTION} 906 Comment=${DESCRIPTION}
855Exec=${exec} 907 Exec=${exec}
908 TryExec=${exec%% *}
856Path=${path} 909 Path=${path}
857Icon=${icon} 910 Icon=${icon}
858Categories=Application;${type};" > "${desktop}" 911 Categories=Application;${type};
912 EOF
859 913
914 (
915 # wrap the env here so that the 'insinto' call
916 # doesn't corrupt the env of the caller
860 insinto /usr/share/applications 917 insinto /usr/share/applications
861 doins "${desktop}" 918 doins "${desktop}"
862 919 )
863 return 0
864} 920}
865 921
866# Make a GDM/KDM Session file 922# Make a GDM/KDM Session file
867# 923#
868# make_desktop_entry(<title>, <command>) 924# make_session_desktop(<title>, <command>)
869# title: File to execute to start the Window Manager 925# title: File to execute to start the Window Manager
870# command: Name of the Window Manager 926# command: Name of the Window Manager
871 927
872make_session_desktop() { 928make_session_desktop() {
873 [[ -z $1 ]] && eerror "make_session_desktop: You must specify the title" && return 1 929 [[ -z $1 ]] && eerror "make_session_desktop: You must specify the title" && return 1
875 931
876 local title=$1 932 local title=$1
877 local command=$2 933 local command=$2
878 local desktop=${T}/${wm}.desktop 934 local desktop=${T}/${wm}.desktop
879 935
936 cat <<-EOF > "${desktop}"
880echo "[Desktop Entry] 937 [Desktop Entry]
881Encoding=UTF-8 938 Encoding=UTF-8
882Name=${title} 939 Name=${title}
883Comment=This session logs you into ${title} 940 Comment=This session logs you into ${title}
884Exec=${command} 941 Exec=${command}
885TryExec=${command} 942 TryExec=${command}
886Type=Application" > "${desktop}" 943 Type=Application
944 EOF
887 945
946 (
947 # wrap the env here so that the 'insinto' call
948 # doesn't corrupt the env of the caller
888 insinto /usr/share/xsessions 949 insinto /usr/share/xsessions
889 doins "${desktop}" 950 doins "${desktop}"
951 )
890} 952}
891 953
892domenu() { 954domenu() {
955 (
956 # wrap the env here so that the 'insinto' call
957 # doesn't corrupt the env of the caller
893 local i j 958 local i j ret=0
894 insinto /usr/share/applications 959 insinto /usr/share/applications
895 for i in "$@" ; do 960 for i in "$@" ; do
896 if [[ -f ${i} ]] ; then 961 if [[ -f ${i} ]] ; then
897 doins "${i}" 962 doins "${i}"
963 ((ret+=$?))
898 elif [[ -d ${i} ]] ; then 964 elif [[ -d ${i} ]] ; then
899 for j in "${i}"/*.desktop ; do 965 for j in "${i}"/*.desktop ; do
900 doins "${j}" 966 doins "${j}"
967 ((ret+=$?))
901 done 968 done
902 fi 969 fi
903 done 970 done
971 exit ${ret}
972 )
904} 973}
905newmenu() { 974newmenu() {
975 (
976 # wrap the env here so that the 'insinto' call
977 # doesn't corrupt the env of the caller
906 insinto /usr/share/applications 978 insinto /usr/share/applications
907 newins "$1" "$2" 979 newins "$@"
980 )
908} 981}
909 982
910doicon() { 983doicon() {
984 (
985 # wrap the env here so that the 'insinto' call
986 # doesn't corrupt the env of the caller
911 local i j 987 local i j ret
912 insinto /usr/share/pixmaps 988 insinto /usr/share/pixmaps
913 for i in "$@" ; do 989 for i in "$@" ; do
914 if [[ -f ${i} ]] ; then 990 if [[ -f ${i} ]] ; then
915 doins "${i}" 991 doins "${i}"
992 ((ret+=$?))
916 elif [[ -d ${i} ]] ; then 993 elif [[ -d ${i} ]] ; then
917 for j in "${i}"/*.png ; do 994 for j in "${i}"/*.png ; do
918 doins "${j}" 995 doins "${j}"
996 ((ret+=$?))
919 done 997 done
920 fi 998 fi
921 done 999 done
1000 exit ${ret}
1001 )
922} 1002}
923newicon() { 1003newicon() {
1004 (
1005 # wrap the env here so that the 'insinto' call
1006 # doesn't corrupt the env of the caller
924 insinto /usr/share/pixmaps 1007 insinto /usr/share/pixmaps
925 newins "$1" "$2" 1008 newins "$@"
1009 )
926} 1010}
927 1011
928############################################################## 1012##############################################################
929# END: Handle .desktop files and menu entries # 1013# END: Handle .desktop files and menu entries #
930############################################################## 1014##############################################################
931 1015
932 1016
933# for internal use only (unpack_pdv and unpack_makeself) 1017# for internal use only (unpack_pdv and unpack_makeself)
934find_unpackable_file() { 1018find_unpackable_file() {
953# the middle of the archive. Valve seems to use it a lot ... too bad 1037# the middle of the archive. Valve seems to use it a lot ... too bad
954# it seems to like to segfault a lot :(. So lets take it apart ourselves. 1038# it seems to like to segfault a lot :(. So lets take it apart ourselves.
955# 1039#
956# Usage: unpack_pdv [file to unpack] [size of off_t] 1040# Usage: unpack_pdv [file to unpack] [size of off_t]
957# - you have to specify the off_t size ... i have no idea how to extract that 1041# - you have to specify the off_t size ... i have no idea how to extract that
958# information out of the binary executable myself. basically you pass in 1042# information out of the binary executable myself. basically you pass in
959# the size of the off_t type (in bytes) on the machine that built the pdv 1043# the size of the off_t type (in bytes) on the machine that built the pdv
960# archive. one way to determine this is by running the following commands: 1044# archive. one way to determine this is by running the following commands:
961# strings <pdv archive> | grep lseek 1045# strings <pdv archive> | grep lseek
962# strace -elseek <pdv archive> 1046# strace -elseek <pdv archive>
963# basically look for the first lseek command (we do the strings/grep because 1047# basically look for the first lseek command (we do the strings/grep because
964# sometimes the function call is _llseek or something) and steal the 2nd 1048# sometimes the function call is _llseek or something) and steal the 2nd
965# parameter. here is an example: 1049# parameter. here is an example:
966# root@vapier 0 pdv_unpack # strings hldsupdatetool.bin | grep lseek 1050# root@vapier 0 pdv_unpack # strings hldsupdatetool.bin | grep lseek
967# lseek 1051# lseek
968# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 1052# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
969# lseek(3, -4, SEEK_END) = 2981250 1053# lseek(3, -4, SEEK_END) = 2981250
970# thus we would pass in the value of '4' as the second parameter. 1054# thus we would pass in the value of '4' as the second parameter.
971unpack_pdv() { 1055unpack_pdv() {
972 local src=$(find_unpackable_file $1) 1056 local src=$(find_unpackable_file "$1")
973 local sizeoff_t=$2 1057 local sizeoff_t=$2
974 1058
975 [[ -z ${src} ]] && die "Could not locate source for '$1'" 1059 [[ -z ${src} ]] && die "Could not locate source for '$1'"
976 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :(" 1060 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :("
977 1061
978 local shrtsrc="`basename ${src}`" 1062 local shrtsrc=$(basename "${src}")
979 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1063 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
980 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1064 local metaskip=$(tail -c ${sizeoff_t} "${src}" | hexdump -e \"%i\")
981 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"` 1065 local tailskip=$(tail -c $((${sizeoff_t}*2)) "${src}" | head -c ${sizeoff_t} | hexdump -e \"%i\")
982 1066
983 # grab metadata for debug reasons 1067 # grab metadata for debug reasons
984 local metafile="$(emktemp)" 1068 local metafile=$(emktemp)
985 tail -c +$((${metaskip}+1)) ${src} > ${metafile} 1069 tail -c +$((${metaskip}+1)) "${src}" > "${metafile}"
986 1070
987 # rip out the final file name from the metadata 1071 # rip out the final file name from the metadata
988 local datafile="`tail -c +$((${metaskip}+1)) ${src} | strings | head -n 1`" 1072 local datafile=$(tail -c +$((${metaskip}+1)) "${src}" | strings | head -n 1)
989 datafile="`basename ${datafile}`" 1073 datafile=$(basename "${datafile}")
990 1074
991 # now lets uncompress/untar the file if need be 1075 # now lets uncompress/untar the file if need be
992 local tmpfile="$(emktemp)" 1076 local tmpfile=$(emktemp)
993 tail -c +$((${tailskip}+1)) ${src} 2>/dev/null | head -c 512 > ${tmpfile} 1077 tail -c +$((${tailskip}+1)) ${src} 2>/dev/null | head -c 512 > ${tmpfile}
994 1078
995 local iscompressed="`file -b ${tmpfile}`" 1079 local iscompressed=$(file -b "${tmpfile}")
996 if [ "${iscompressed:0:8}" == "compress" ] ; then 1080 if [[ ${iscompressed:0:8} == "compress" ]] ; then
997 iscompressed=1 1081 iscompressed=1
998 mv ${tmpfile}{,.Z} 1082 mv ${tmpfile}{,.Z}
999 gunzip ${tmpfile} 1083 gunzip ${tmpfile}
1000 else 1084 else
1001 iscompressed=0 1085 iscompressed=0
1002 fi 1086 fi
1003 local istar="`file -b ${tmpfile}`" 1087 local istar=$(file -b "${tmpfile}")
1004 if [ "${istar:0:9}" == "POSIX tar" ] ; then 1088 if [[ ${istar:0:9} == "POSIX tar" ]] ; then
1005 istar=1 1089 istar=1
1006 else 1090 else
1007 istar=0 1091 istar=0
1008 fi 1092 fi
1009 1093
1045# many other game companies. 1129# many other game companies.
1046# 1130#
1047# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1131# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1048# - If the file is not specified then unpack will utilize ${A}. 1132# - If the file is not specified then unpack will utilize ${A}.
1049# - If the offset is not specified then we will attempt to extract 1133# - If the offset is not specified then we will attempt to extract
1050# the proper offset from the script itself. 1134# the proper offset from the script itself.
1051unpack_makeself() { 1135unpack_makeself() {
1136 local src_input=${1:-${A}}
1052 local src=$(find_unpackable_file "$1") 1137 local src=$(find_unpackable_file "${src_input}")
1053 local skip=$2 1138 local skip=$2
1054 local exe=$3 1139 local exe=$3
1055 1140
1056 [[ -z ${src} ]] && die "Could not locate source for '$1'" 1141 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
1057 1142
1058 local shrtsrc=$(basename "${src}") 1143 local shrtsrc=$(basename "${src}")
1059 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1144 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1060 if [ -z "${skip}" ] 1145 if [[ -z ${skip} ]] ; then
1061 then
1062 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1146 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}')
1063 local skip=0 1147 local skip=0
1064 exe=tail 1148 exe=tail
1065 case ${ver} in 1149 case ${ver} in
1066 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same 1150 1.5.*|1.6.0-nv) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same
1067 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1151 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1068 ;; 1152 ;;
1069 2.0|2.0.1) 1153 2.0|2.0.1)
1070 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-) 1154 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-)
1071 ;; 1155 ;;
1079 ;; 1163 ;;
1080 2.1.3) 1164 2.1.3)
1081 skip=`grep -a ^offset= "${src}" | awk '{print $3}'` 1165 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1082 let skip="skip + 1" 1166 let skip="skip + 1"
1083 ;; 1167 ;;
1084 2.1.4) 1168 2.1.4|2.1.5)
1085 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1) 1169 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1)
1086 skip=$(head -n ${skip} "${src}" | wc -c) 1170 skip=$(head -n ${skip} "${src}" | wc -c)
1087 exe="dd" 1171 exe="dd"
1088 ;; 1172 ;;
1089 *) 1173 *)
1101 dd) exe="dd ibs=${skip} skip=1 obs=1024 conv=sync if='${src}'";; 1185 dd) exe="dd ibs=${skip} skip=1 obs=1024 conv=sync if='${src}'";;
1102 *) die "makeself cant handle exe '${exe}'" 1186 *) die "makeself cant handle exe '${exe}'"
1103 esac 1187 esac
1104 1188
1105 # lets grab the first few bytes of the file to figure out what kind of archive it is 1189 # lets grab the first few bytes of the file to figure out what kind of archive it is
1106 local tmpfile="$(emktemp)" 1190 local tmpfile=$(emktemp)
1107 eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}" 1191 eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}"
1108 local filetype="$(file -b "${tmpfile}")" 1192 local filetype=$(file -b "${tmpfile}")
1109 case ${filetype} in 1193 case ${filetype} in
1110 *tar\ archive) 1194 *tar\ archive*)
1111 eval ${exe} | tar --no-same-owner -xf - 1195 eval ${exe} | tar --no-same-owner -xf -
1112 ;; 1196 ;;
1113 bzip2*) 1197 bzip2*)
1114 eval ${exe} | bzip2 -dc | tar --no-same-owner -xf - 1198 eval ${exe} | bzip2 -dc | tar --no-same-owner -xf -
1115 ;; 1199 ;;
1142 lic="${PWD}/${lic}" 1226 lic="${PWD}/${lic}"
1143 elif [ -e "${lic}" ] ; then 1227 elif [ -e "${lic}" ] ; then
1144 lic="${lic}" 1228 lic="${lic}"
1145 fi 1229 fi
1146 fi 1230 fi
1147 [ ! -f "${lic}" ] && die "Could not find requested license ${src}" 1231 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1148 local l="`basename ${lic}`" 1232 local l="`basename ${lic}`"
1149 1233
1150 # here is where we check for the licenses the user already 1234 # here is where we check for the licenses the user already
1151 # accepted ... if we don't find a match, we make the user accept 1235 # accepted ... if we don't find a match, we make the user accept
1152 local shopts=$- 1236 local shopts=$-
1153 local alic 1237 local alic
1154 set -o noglob #so that bash doesn't expand "*" 1238 set -o noglob #so that bash doesn't expand "*"
1155 for alic in ${ACCEPT_LICENSE} ; do 1239 for alic in ${ACCEPT_LICENSE} ; do
1156 if [[ ${alic} == * || ${alic} == ${l} ]]; then 1240 if [[ ${alic} == ${l} ]]; then
1157 set +o noglob; set -${shopts} #reset old shell opts 1241 set +o noglob; set -${shopts} #reset old shell opts
1158 return 0 1242 return 0
1159 fi 1243 fi
1160 done 1244 done
1161 set +o noglob; set -$shopts #reset old shell opts 1245 set +o noglob; set -$shopts #reset old shell opts
1162 1246
1163 local licmsg="$(emktemp)" 1247 local licmsg=$(emktemp)
1164 cat << EOF > ${licmsg} 1248 cat <<-EOF > ${licmsg}
1165********************************************************** 1249 **********************************************************
1166The following license outlines the terms of use of this 1250 The following license outlines the terms of use of this
1167package. You MUST accept this license for installation to 1251 package. You MUST accept this license for installation to
1168continue. When you are done viewing, hit 'q'. If you 1252 continue. When you are done viewing, hit 'q'. If you
1169CTRL+C out of this, the install will not run! 1253 CTRL+C out of this, the install will not run!
1170********************************************************** 1254 **********************************************************
1171 1255
1172EOF 1256 EOF
1173 cat ${lic} >> ${licmsg} 1257 cat ${lic} >> ${licmsg}
1174 ${PAGER:-less} ${licmsg} || die "Could not execute pager (${PAGER}) to accept ${lic}" 1258 ${PAGER:-less} ${licmsg} || die "Could not execute pager (${PAGER}) to accept ${lic}"
1175 einfon "Do you accept the terms of this license (${l})? [yes/no] " 1259 einfon "Do you accept the terms of this license (${l})? [yes/no] "
1176 read alic 1260 read alic
1177 case ${alic} in 1261 case ${alic} in
1194# and when the function returns, you can assume that the cd has been 1278# and when the function returns, you can assume that the cd has been
1195# found at CDROM_ROOT. 1279# found at CDROM_ROOT.
1196# 1280#
1197# normally the cdrom functions will refer to the cds as 'cd #1', 'cd #2', 1281# normally the cdrom functions will refer to the cds as 'cd #1', 'cd #2',
1198# etc... if you want to give the cds better names, then just export 1282# etc... if you want to give the cds better names, then just export
1199# the CDROM_NAME_X variables before calling cdrom_get_cds(). 1283# the appropriate CDROM_NAME variable before calling cdrom_get_cds().
1284# - CDROM_NAME="fooie cd" - for when you only want 1 cd
1285# - CDROM_NAME_1="install cd" - for when you want more than 1 cd
1286# CDROM_NAME_2="data cd"
1287# - CDROM_NAME_SET=( "install cd" "data cd" ) - short hand for CDROM_NAME_#
1200# 1288#
1201# for those multi cd ebuilds, see the cdrom_load_next_cd() below. 1289# for those multi cd ebuilds, see the cdrom_load_next_cd() below.
1202# 1290#
1203# Usage: cdrom_get_cds <file on cd1> [file on cd2] [file on cd3] [...] 1291# Usage: cdrom_get_cds <file on cd1> [file on cd2] [file on cd3] [...]
1204# - this will attempt to locate a cd based upon a file that is on 1292# - this will attempt to locate a cd based upon a file that is on
1205# the cd ... the more files you give this function, the more cds 1293# the cd ... the more files you give this function, the more cds
1206# the cdrom functions will handle 1294# the cdrom functions will handle
1207cdrom_get_cds() { 1295cdrom_get_cds() {
1208 # first we figure out how many cds we're dealing with by 1296 # first we figure out how many cds we're dealing with by
1209 # the # of files they gave us 1297 # the # of files they gave us
1210 local cdcnt=0 1298 local cdcnt=0
1211 local f= 1299 local f=
1212 for f in "$@" ; do 1300 for f in "$@" ; do
1213 cdcnt=$((cdcnt + 1)) 1301 ((++cdcnt))
1214 export CDROM_CHECK_${cdcnt}="$f" 1302 export CDROM_CHECK_${cdcnt}="$f"
1215 done 1303 done
1216 export CDROM_TOTAL_CDS=${cdcnt} 1304 export CDROM_TOTAL_CDS=${cdcnt}
1217 export CDROM_CURRENT_CD=1 1305 export CDROM_CURRENT_CD=1
1218 1306
1219 # now we see if the user gave use CD_ROOT ... 1307 # now we see if the user gave use CD_ROOT ...
1220 # if they did, let's just believe them that it's correct 1308 # if they did, let's just believe them that it's correct
1221 if [[ ! -z ${CD_ROOT} ]] ; then
1222 export CDROM_ROOT=${CD_ROOT}
1223 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1224 return
1225 fi
1226 # do the same for CD_ROOT_X
1227 if [[ ! -z ${CD_ROOT_1} ]] ; then 1309 if [[ -n ${CD_ROOT}${CD_ROOT_1} ]] ; then
1228 local var= 1310 local var=
1229 cdcnt=0 1311 cdcnt=0
1230 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1312 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1231 cdcnt=$((cdcnt + 1)) 1313 ((++cdcnt))
1232 var="CD_ROOT_${cdcnt}" 1314 var="CD_ROOT_${cdcnt}"
1315 [[ -z ${!var} ]] && var="CD_ROOT"
1233 if [[ -z ${!var} ]] ; then 1316 if [[ -z ${!var} ]] ; then
1234 eerror "You must either use just the CD_ROOT" 1317 eerror "You must either use just the CD_ROOT"
1235 eerror "or specify ALL the CD_ROOT_X variables." 1318 eerror "or specify ALL the CD_ROOT_X variables."
1236 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables." 1319 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables."
1237 die "could not locate CD_ROOT_${cdcnt}" 1320 die "could not locate CD_ROOT_${cdcnt}"
1238 fi 1321 fi
1239 export CDROM_ROOTS_${cdcnt}="${!var}"
1240 done 1322 done
1241 export CDROM_ROOT=${CDROM_ROOTS_1} 1323 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}}
1242 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1324 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1325 export CDROM_SET=-1
1326 for f in ${CDROM_CHECK_1//:/ } ; do
1327 ((++CDROM_SET))
1328 [[ -e ${CD_ROOT}/${f} ]] && break
1329 done
1330 export CDROM_MATCH=${f}
1243 return 1331 return
1244 fi 1332 fi
1245 1333
1334 # User didn't help us out so lets make sure they know they can
1335 # simplify the whole process ...
1246 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1336 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1247 einfon "This ebuild will need the " 1337 einfo "This ebuild will need the ${CDROM_NAME:-cdrom for ${PN}}"
1248 if [[ -z ${CDROM_NAME} ]] ; then
1249 echo "cdrom for ${PN}."
1250 else
1251 echo "${CDROM_NAME}."
1252 fi
1253 echo 1338 echo
1254 einfo "If you do not have the CD, but have the data files" 1339 einfo "If you do not have the CD, but have the data files"
1255 einfo "mounted somewhere on your filesystem, just export" 1340 einfo "mounted somewhere on your filesystem, just export"
1256 einfo "the variable CD_ROOT so that it points to the" 1341 einfo "the variable CD_ROOT so that it points to the"
1257 einfo "directory containing the files." 1342 einfo "directory containing the files."
1258 echo 1343 echo
1259 einfo "For example:" 1344 einfo "For example:"
1260 einfo "export CD_ROOT=/mnt/cdrom" 1345 einfo "export CD_ROOT=/mnt/cdrom"
1261 echo 1346 echo
1262 else 1347 else
1348 if [[ -n ${CDROM_NAME_SET} ]] ; then
1349 # Translate the CDROM_NAME_SET array into CDROM_NAME_#
1350 cdcnt=0
1351 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1352 ((++cdcnt))
1353 export CDROM_NAME_${cdcnt}="${CDROM_NAME_SET[$((${cdcnt}-1))]}"
1354 done
1355 fi
1356
1263 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1357 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1264 cdcnt=0 1358 cdcnt=0
1265 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1359 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1266 cdcnt=$((cdcnt + 1)) 1360 ((++cdcnt))
1267 var="CDROM_NAME_${cdcnt}" 1361 var="CDROM_NAME_${cdcnt}"
1268 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}" 1362 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}"
1269 done 1363 done
1270 echo 1364 echo
1271 einfo "If you do not have the CDs, but have the data files" 1365 einfo "If you do not have the CDs, but have the data files"
1272 einfo "mounted somewhere on your filesystem, just export" 1366 einfo "mounted somewhere on your filesystem, just export"
1273 einfo "the following variables so they point to the right place:" 1367 einfo "the following variables so they point to the right place:"
1274 einfon "" 1368 einfon ""
1275 cdcnt=0 1369 cdcnt=0
1276 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1370 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1277 cdcnt=$((cdcnt + 1)) 1371 ((++cdcnt))
1278 echo -n " CD_ROOT_${cdcnt}" 1372 echo -n " CD_ROOT_${cdcnt}"
1279 done 1373 done
1280 echo 1374 echo
1281 einfo "Or, if you have all the files in the same place, or" 1375 einfo "Or, if you have all the files in the same place, or"
1282 einfo "you only have one cdrom, you can export CD_ROOT" 1376 einfo "you only have one cdrom, you can export CD_ROOT"
1285 echo 1379 echo
1286 einfo "For example:" 1380 einfo "For example:"
1287 einfo "export CD_ROOT_1=/mnt/cdrom" 1381 einfo "export CD_ROOT_1=/mnt/cdrom"
1288 echo 1382 echo
1289 fi 1383 fi
1384
1385 export CDROM_SET=""
1290 export CDROM_CURRENT_CD=0 1386 export CDROM_CURRENT_CD=0
1291 cdrom_load_next_cd 1387 cdrom_load_next_cd
1292} 1388}
1293 1389
1294# this is only used when you need access to more than one cd. 1390# this is only used when you need access to more than one cd.
1295# when you have finished using the first cd, just call this function. 1391# when you have finished using the first cd, just call this function.
1296# when it returns, CDROM_ROOT will be pointing to the second cd. 1392# when it returns, CDROM_ROOT will be pointing to the second cd.
1297# remember, you can only go forward in the cd chain, you can't go back. 1393# remember, you can only go forward in the cd chain, you can't go back.
1298cdrom_load_next_cd() { 1394cdrom_load_next_cd() {
1299 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1300 local var= 1395 local var
1301 1396 ((++CDROM_CURRENT_CD))
1302 if [[ ! -z ${CD_ROOT} ]] ; then
1303 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}"
1304 return
1305 fi
1306 1397
1307 unset CDROM_ROOT 1398 unset CDROM_ROOT
1308 var=CDROM_ROOTS_${CDROM_CURRENT_CD} 1399 var=CD_ROOT_${CDROM_CURRENT_CD}
1400 [[ -z ${!var} ]] && var="CD_ROOT"
1309 if [[ -z ${!var} ]] ; then 1401 if [[ -z ${!var} ]] ; then
1310 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1402 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1311 cdrom_locate_file_on_cd ${!var} 1403 _cdrom_locate_file_on_cd ${!var}
1312 else 1404 else
1313 export CDROM_ROOT=${!var} 1405 export CDROM_ROOT=${!var}
1314 fi 1406 fi
1315 1407
1316 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1408 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1321# all it does is try to locate a give file on a cd ... if the cd isn't 1413# all it does is try to locate a give file on a cd ... if the cd isn't
1322# found, then a message asking for the user to insert the cdrom will be 1414# found, then a message asking for the user to insert the cdrom will be
1323# displayed and we'll hang out here until: 1415# displayed and we'll hang out here until:
1324# (1) the file is found on a mounted cdrom 1416# (1) the file is found on a mounted cdrom
1325# (2) the user hits CTRL+C 1417# (2) the user hits CTRL+C
1326cdrom_locate_file_on_cd() { 1418_cdrom_locate_file_on_cd() {
1419 local mline=""
1420 local showedmsg=0
1421
1327 while [[ -z ${CDROM_ROOT} ]] ; do 1422 while [[ -z ${CDROM_ROOT} ]] ; do
1328 local dir=$(dirname "$*") 1423 local i=0
1424 local -a cdset=(${*//:/ })
1425 if [[ -n ${CDROM_SET} ]] ; then
1426 cdset=(${cdset[${CDROM_SET}]})
1427 fi
1428
1429 while [[ -n ${cdset[${i}]} ]] ; do
1430 local dir=$(dirname ${cdset[${i}]})
1329 local file=$(basename "$*") 1431 local file=$(basename ${cdset[${i}]})
1330 local mline=""
1331 local showedmsg=0
1332 1432
1333 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do 1433 local point= node= fs= foo=
1334 [[ -d ${mline}/${dir} ]] || continue 1434 while read point node fs foo ; do
1435 [[ " cd9660 iso9660 " != *" ${fs} "* ]] && \
1436 ! [[ ${fs} == "subfs" && ",${opts}," == *",fs=cdfss,"* ]] \
1437 && continue
1438 point=${point//\040/ }
1335 [[ ! -z $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] \ 1439 [[ -z $(find "${point}/${dir}" -maxdepth 1 -iname "${file}") ]] && continue
1336 && export CDROM_ROOT=${mline} 1440 export CDROM_ROOT=${point}
1441 export CDROM_SET=${i}
1442 export CDROM_MATCH=${cdset[${i}]}
1443 return
1444 done <<< "$(get_mounts)"
1445
1446 ((++i))
1337 done 1447 done
1338 1448
1339 if [[ -z ${CDROM_ROOT} ]] ; then
1340 echo 1449 echo
1341 if [[ ${showedmsg} -eq 0 ]] ; then 1450 if [[ ${showedmsg} -eq 0 ]] ; then
1342 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1451 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1343 if [[ -z ${CDROM_NAME} ]] ; then 1452 if [[ -z ${CDROM_NAME} ]] ; then
1344 einfo "Please insert the cdrom for ${PN} now !" 1453 einfo "Please insert+mount the cdrom for ${PN} now !"
1345 else
1346 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1347 fi
1348 else 1454 else
1349 if [[ -z ${CDROM_NAME_1} ]] ; then
1350 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !"
1351 else
1352 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1353 einfo "Please insert+mount the ${!var} cdrom now !" 1455 einfo "Please insert+mount the ${CDROM_NAME} cdrom now !"
1354 fi
1355 fi 1456 fi
1356 showedmsg=1 1457 else
1458 if [[ -z ${CDROM_NAME_1} ]] ; then
1459 einfo "Please insert+mount cd #${CDROM_CURRENT_CD} for ${PN} now !"
1460 else
1461 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1462 einfo "Please insert+mount the ${!var} cdrom now !"
1463 fi
1357 fi 1464 fi
1465 showedmsg=1
1466 fi
1358 einfo "Press return to scan for the cd again" 1467 einfo "Press return to scan for the cd again"
1359 einfo "or hit CTRL+C to abort the emerge." 1468 einfo "or hit CTRL+C to abort the emerge."
1360 echo 1469 echo
1361 einfo "If you are having trouble with the detection" 1470 einfo "If you are having trouble with the detection"
1362 einfo "of your CD, it is possible that you do not have" 1471 einfo "of your CD, it is possible that you do not have"
1363 einfo "Joliet support enabled in your kernel. Please" 1472 einfo "Joliet support enabled in your kernel. Please"
1364 einfo "check that CONFIG_JOLIET is enabled in your kernel." 1473 einfo "check that CONFIG_JOLIET is enabled in your kernel."
1365 read 1474 read || die "something is screwed with your system"
1366 fi
1367 done 1475 done
1368} 1476}
1369 1477
1370# Make sure that LINGUAS only contains languages that 1478# Make sure that LINGUAS only contains languages that
1371# a package can support 1479# a package can support
1372# 1480#
1373# usage: strip-linguas <allow LINGUAS> 1481# usage: strip-linguas <allow LINGUAS>
1374# strip-linguas -i <directories of .po files> 1482# strip-linguas -i <directories of .po files>
1375# strip-linguas -u <directories of .po files> 1483# strip-linguas -u <directories of .po files>
1376# 1484#
1377# The first form allows you to specify a list of LINGUAS. 1485# The first form allows you to specify a list of LINGUAS.
1378# The -i builds a list of po files found in all the 1486# The -i builds a list of po files found in all the
1379# directories and uses the intersection of the lists. 1487# directories and uses the intersection of the lists.
1380# The -u builds a list of po files found in all the 1488# The -u builds a list of po files found in all the
1381# directories and uses the union of the lists. 1489# directories and uses the union of the lists.
1382strip-linguas() { 1490strip-linguas() {
1383 local ls newls 1491 local ls newls nols
1384 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then 1492 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1385 local op=$1; shift 1493 local op=$1; shift
1386 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1494 ls=$(find "$1" -name '*.po' -exec basename {} .po \;); shift
1387 local d f 1495 local d f
1388 for d in "$@" ; do 1496 for d in "$@" ; do
1389 if [[ ${op} == "-u" ]] ; then 1497 if [[ ${op} == "-u" ]] ; then
1390 newls=${ls} 1498 newls=${ls}
1391 else 1499 else
1392 newls="" 1500 newls=""
1393 fi 1501 fi
1394 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1502 for f in $(find "$d" -name '*.po' -exec basename {} .po \;) ; do
1395 if [[ ${op} == "-i" ]] ; then 1503 if [[ ${op} == "-i" ]] ; then
1396 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}" 1504 hasq ${f} ${ls} && newls="${newls} ${f}"
1397 else 1505 else
1398 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}" 1506 hasq ${f} ${ls} || newls="${newls} ${f}"
1399 fi 1507 fi
1400 done 1508 done
1401 ls=${newls} 1509 ls=${newls}
1402 done 1510 done
1403 ls=${ls//.po}
1404 else 1511 else
1405 ls=$@ 1512 ls="$@"
1406 fi 1513 fi
1407 1514
1408 ls=" ${ls} " 1515 nols=""
1409 newls="" 1516 newls=""
1410 for f in ${LINGUAS} ; do 1517 for f in ${LINGUAS} ; do
1411 if [[ ${ls/ ${f} /} != ${ls} ]] ; then 1518 if hasq ${f} ${ls} ; then
1412 newls="${newls} ${f}" 1519 newls="${newls} ${f}"
1413 else 1520 else
1414 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1521 nols="${nols} ${f}"
1415 fi 1522 fi
1416 done 1523 done
1417 if [[ -z ${newls} ]] ; then 1524 [[ -n ${nols} ]] \
1418 export LINGUAS="" 1525 && ewarn "Sorry, but ${PN} does not support the LINGUAs:" ${nols}
1419 else
1420 export LINGUAS=${newls:1} 1526 export LINGUAS=${newls:1}
1421 fi
1422} 1527}
1423 1528
1424# moved from kernel.eclass since they are generally useful outside of 1529# moved from kernel.eclass since they are generally useful outside of
1425# kernel.eclass -iggy (20041002) 1530# kernel.eclass -iggy (20041002)
1426 1531
1433 while ((i--)) ; do 1538 while ((i--)) ; do
1434 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass" 1539 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1435 done 1540 done
1436 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}" 1541 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1437 case ${ARCH} in 1542 case ${ARCH} in
1438 x86) export ARCH="i386";; 1543 x86) export ARCH="i386";;
1439 amd64) export ARCH="x86_64";; 1544 amd64) export ARCH="x86_64";;
1440 hppa) export ARCH="parisc";; 1545 hppa) export ARCH="parisc";;
1441 mips) export ARCH="mips";; 1546 mips) export ARCH="mips";;
1442 sparc) export ARCH="$(tc-arch-kernel)";; # Yeah this is ugly, but it's even WORSE if you don't do this. linux-info.eclass's set_arch_to_kernel is fixed, but won't get used over this one! 1547 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!
1443 *) export ARCH="${ARCH}";; 1548 *) export ARCH="${ARCH}";;
1444 esac 1549 esac
1445} 1550}
1446 1551
1447# set's ARCH back to what portage expects 1552# set's ARCH back to what portage expects
1448set_arch_to_portage() { 1553set_arch_to_portage() {
1455 1560
1456# Jeremy Huddleston <eradicator@gentoo.org>: 1561# Jeremy Huddleston <eradicator@gentoo.org>:
1457# preserve_old_lib /path/to/libblah.so.0 1562# preserve_old_lib /path/to/libblah.so.0
1458# preserve_old_lib_notify /path/to/libblah.so.0 1563# preserve_old_lib_notify /path/to/libblah.so.0
1459# 1564#
1460# These functions are useful when a lib in your package changes --soname. Such 1565# These functions are useful when a lib in your package changes --library. Such
1461# an example might be from libogg.so.0 to libogg.so.1. Removing libogg.so.0 1566# an example might be from libogg.so.0 to libogg.so.1. Removing libogg.so.0
1462# would break packages that link against it. Most people get around this 1567# would break packages that link against it. Most people get around this
1463# by using the portage SLOT mechanism, but that is not always a relevant 1568# by using the portage SLOT mechanism, but that is not always a relevant
1464# solution, so instead you can add the following to your ebuilds: 1569# solution, so instead you can add the following to your ebuilds:
1465# 1570#
1466# src_install() { 1571# pkg_preinst() {
1467# ... 1572# ...
1468# preserve_old_lib /usr/$(get_libdir)/libogg.so.0 1573# preserve_old_lib /usr/$(get_libdir)/libogg.so.0
1469# ... 1574# ...
1470# } 1575# }
1471# 1576#
1474# preserve_old_lib_notify /usr/$(get_libdir)/libogg.so.0 1579# preserve_old_lib_notify /usr/$(get_libdir)/libogg.so.0
1475# ... 1580# ...
1476# } 1581# }
1477 1582
1478preserve_old_lib() { 1583preserve_old_lib() {
1479 LIB=$1 1584 if [[ ${EBUILD_PHASE} != "preinst" ]] ; then
1585 eerror "preserve_old_lib() must be called from pkg_preinst() only"
1586# die "Invalid preserve_old_lib() usage"
1587 fi
1588 [[ -z $1 ]] && die "Usage: preserve_old_lib <library to preserve> [more libraries to preserve]"
1480 1589
1481 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1590 local lib dir
1482 SONAME=`basename ${LIB}` 1591 for lib in "$@" ; do
1483 DIRNAME=`dirname ${LIB}` 1592 [[ -e ${ROOT}/${lib} ]] || continue
1484 1593 dir=${lib%/*}
1485 dodir ${DIRNAME} 1594 dodir ${dir} || die "dodir ${dir} failed"
1486 cp ${ROOT}${LIB} ${D}${DIRNAME} 1595 cp "${ROOT}"/${lib} "${D}"/${lib} || die "cp ${lib} failed"
1487 touch ${D}${LIB} 1596 touch "${D}"/${lib}
1488 fi 1597 done
1489} 1598}
1490 1599
1491preserve_old_lib_notify() { 1600preserve_old_lib_notify() {
1492 LIB=$1 1601 if [[ ${EBUILD_PHASE} != "postinst" ]] ; then
1602 eerror "preserve_old_lib_notify() must be called from pkg_postinst() only"
1603# die "Invalid preserve_old_lib_notify() usage"
1604 fi
1493 1605
1494 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1606 local lib notice=0
1495 SONAME=`basename ${LIB}` 1607 for lib in "$@" ; do
1496 1608 [[ -e ${ROOT}/${lib} ]] || continue
1609 if [[ ${notice} -eq 0 ]] ; then
1610 notice=1
1497 ewarn "An old version of an installed library was detected on your system." 1611 ewarn "Old versions of installed libraries were detected on your system."
1498 ewarn "In order to avoid breaking packages that link against it, this older version" 1612 ewarn "In order to avoid breaking packages that depend on these old libs,"
1499 ewarn "is not being removed. In order to make full use of this newer version," 1613 ewarn "the libraries are not being removed. You need to run revdep-rebuild"
1500 ewarn "you will need to execute the following command:" 1614 ewarn "in order to remove these old dependencies. If you do not have this"
1501 ewarn " revdep-rebuild --soname ${SONAME}" 1615 ewarn "helper program, simply emerge the 'gentoolkit' package."
1502 ewarn 1616 ewarn
1503 ewarn "After doing that, you can safely remove ${LIB}"
1504 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1505 fi 1617 fi
1618 ewarn " # revdep-rebuild --library ${lib##*/}"
1619 done
1506} 1620}
1507 1621
1508# Hack for people to figure out if a package was built with 1622# Hack for people to figure out if a package was built with
1509# certain USE flags 1623# certain USE flags
1510# 1624#
1511# Usage: built_with_use [-a|-o] <DEPEND ATOM> <List of USE flags> 1625# Usage: built_with_use [--missing <action>] [-a|-o] <DEPEND ATOM> <List of USE flags>
1512# ex: built_with_use xchat gtk2 1626# ex: built_with_use xchat gtk2
1513# 1627#
1514# Flags: -a all USE flags should be utilized 1628# Flags: -a all USE flags should be utilized
1515# -o at least one USE flag should be utilized 1629# -o at least one USE flag should be utilized
1630# --missing peform the specified action if the flag is not in IUSE (true/false/die)
1631# --hidden USE flag we're checking is hidden expanded so it isnt in IUSE
1516# Note: the default flag is '-a' 1632# Note: the default flag is '-a'
1517built_with_use() { 1633built_with_use() {
1634 local hidden="no"
1635 if [[ $1 == "--hidden" ]] ; then
1636 hidden="yes"
1637 shift
1638 fi
1639
1640 local missing_action="die"
1641 if [[ $1 == "--missing" ]] ; then
1642 missing_action=$2
1643 shift ; shift
1644 case ${missing_action} in
1645 true|false|die) ;;
1646 *) die "unknown action '${missing_action}'";;
1647 esac
1648 fi
1649
1518 local opt=$1 1650 local opt=$1
1519 [[ ${opt:0:1} = "-" ]] && shift || opt="-a" 1651 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1520 1652
1521 local PKG=$(best_version $1) 1653 local PKG=$(best_version $1)
1654 [[ -z ${PKG} ]] && die "Unable to resolve $1 to an installed package"
1522 shift 1655 shift
1523 1656
1524 local USEFILE="${ROOT}/var/db/pkg/${PKG}/USE" 1657 local USEFILE=${ROOT}/var/db/pkg/${PKG}/USE
1525 [[ ! -e ${USEFILE} ]] && return 1 1658 local IUSEFILE=${ROOT}/var/db/pkg/${PKG}/IUSE
1659
1660 # if the IUSE file doesn't exist, the read will error out, we need to handle
1661 # this gracefully
1662 if [[ ! -e ${USEFILE} ]] || [[ ! -e ${IUSEFILE} && ${hidden} == "no" ]] ; then
1663 case ${missing_action} in
1664 true) return 0;;
1665 false) return 1;;
1666 die) die "Unable to determine what USE flags $PKG was built with";;
1667 esac
1668 fi
1669
1670 if [[ ${hidden} == "no" ]] ; then
1671 local IUSE_BUILT=$(<${IUSEFILE})
1672 # Don't check USE_EXPAND #147237
1673 local expand
1674 for expand in $(echo ${USE_EXPAND} | tr '[:upper:]' '[:lower:]') ; do
1675 if [[ $1 == ${expand}_* ]] ; then
1676 expand=""
1677 break
1678 fi
1679 done
1680 if [[ -n ${expand} ]] ; then
1681 if ! has $1 ${IUSE_BUILT} ; then
1682 case ${missing_action} in
1683 true) return 0;;
1684 false) return 1;;
1685 die) die "$PKG does not actually support the $1 USE flag!";;
1686 esac
1687 fi
1688 fi
1689 fi
1526 1690
1527 local USE_BUILT=$(<${USEFILE}) 1691 local USE_BUILT=$(<${USEFILE})
1528 while [[ $# -gt 0 ]] ; do 1692 while [[ $# -gt 0 ]] ; do
1529 if [[ ${opt} = "-o" ]] ; then 1693 if [[ ${opt} = "-o" ]] ; then
1530 has $1 ${USE_BUILT} && return 0 1694 has $1 ${USE_BUILT} && return 0
1545 local f 1709 local f
1546 for f in $(find ${dir} -name configure) ; do 1710 for f in $(find ${dir} -name configure) ; do
1547 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null 1711 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null
1548 done 1712 done
1549 eend 0 1713 eend 0
1550}
1551
1552# dopamd <file> [more files]
1553#
1554# Install pam auth config file in /etc/pam.d
1555dopamd() {
1556 [[ -z $1 ]] && die "dopamd requires at least one argument"
1557
1558 use pam || return 0
1559
1560 INSDESTTREE=/etc/pam.d \
1561 doins "$@" || die "failed to install $@"
1562}
1563# newpamd <old name> <new name>
1564#
1565# Install pam file <old name> as <new name> in /etc/pam.d
1566newpamd() {
1567 [[ $# -ne 2 ]] && die "newpamd requires two arguements"
1568
1569 use pam || return 0
1570
1571 INSDESTTREE=/etc/pam.d \
1572 newins "$1" "$2" || die "failed to install $1 as $2"
1573} 1714}
1574 1715
1575# make a wrapper script ... 1716# make a wrapper script ...
1576# NOTE: this was originally games_make_wrapper, but I noticed other places where 1717# NOTE: this was originally games_make_wrapper, but I noticed other places where
1577# this could be used, so I have moved it here and made it not games-specific 1718# this could be used, so I have moved it here and made it not games-specific
1582# $4 == extra LD_LIBRARY_PATH's (make it : delimited) 1723# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1583# $5 == path for wrapper 1724# $5 == path for wrapper
1584make_wrapper() { 1725make_wrapper() {
1585 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5 1726 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1586 local tmpwrapper=$(emktemp) 1727 local tmpwrapper=$(emktemp)
1728 # We don't want to quote ${bin} so that people can pass complex
1729 # things as $bin ... "./someprog --args"
1587 cat << EOF > "${tmpwrapper}" 1730 cat << EOF > "${tmpwrapper}"
1588#!/bin/sh 1731#!/bin/sh
1589cd "${chdir}" 1732cd "${chdir:-.}"
1733if [ -n "${libdir}" ] ; then
1734 if [ "\${LD_LIBRARY_PATH+set}" = "set" ] ; then
1590export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}" 1735 export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1736 else
1737 export LD_LIBRARY_PATH="${libdir}"
1738 fi
1739fi
1591exec ${bin} "\$@" 1740exec ${bin} "\$@"
1592EOF 1741EOF
1593 chmod go+rx "${tmpwrapper}" 1742 chmod go+rx "${tmpwrapper}"
1594 if [ -n "${5}" ] 1743 if [[ -n ${path} ]] ; then
1595 then
1596 exeinto ${5} 1744 exeinto "${path}"
1597 newexe "${tmpwrapper}" "${wrapper}" 1745 newexe "${tmpwrapper}" "${wrapper}"
1598 else 1746 else
1599 newbin "${tmpwrapper}" "${wrapper}" 1747 newbin "${tmpwrapper}" "${wrapper}"
1600 fi 1748 fi
1601} 1749}

Legend:
Removed from v.1.199  
changed lines
  Added in v.1.275

  ViewVC Help
Powered by ViewVC 1.1.20