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

Diff of /eclass/eutils.eclass

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

Revision 1.207 Revision 1.279
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.207 2005/10/12 13:52:01 flameeyes Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.279 2007/04/25 09:14:35 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 }
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()
419 *) # Numeric 404 *) # Numeric
420 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 405 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
421 ;; 406 ;;
422 esac 407 esac
423 ;; 408 ;;
424 *-freebsd*) 409 *-freebsd*|*-dragonfly*)
425 local opts action="user" 410 local opts action="user"
426 [[ $1 == "passwd" ]] || action="group" 411 [[ $1 == "passwd" ]] || action="group"
427 412
428 # lookup by uid/gid 413 # lookup by uid/gid
429 if [[ $2 == [[:digit:]]* ]] ; then 414 if [[ $2 == [[:digit:]]* ]] ; then
430 [[ ${action} == "user" ]] && opts="-u" || opts="-g" 415 [[ ${action} == "user" ]] && opts="-u" || opts="-g"
431 fi 416 fi
432 417
433 pw show ${action} ${opts} "$2" -q 418 pw show ${action} ${opts} "$2" -q
434 ;; 419 ;;
435 *-netbsd*) 420 *-netbsd*|*-openbsd*)
436 grep "$2:\*:" /etc/$1 421 grep "$2:\*:" /etc/$1
437 ;; 422 ;;
438 *) 423 *)
439 type -p nscd >& /dev/null && nscd -i "$1" 424 type -p nscd >& /dev/null && nscd -i "$1"
440 getent "$1" "$2" 425 getent "$1" "$2"
454# shell: /bin/false 439# shell: /bin/false
455# homedir: /dev/null 440# homedir: /dev/null
456# groups: none 441# groups: none
457# extra: comment of 'added by portage for ${PN}' 442# extra: comment of 'added by portage for ${PN}'
458enewuser() { 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
459 # get the username 451 # get the username
460 local euser=$1; shift 452 local euser=$1; shift
461 if [[ -z ${euser} ]] ; then 453 if [[ -z ${euser} ]] ; then
462 eerror "No username specified !" 454 eerror "No username specified !"
463 die "Cannot call enewuser without a username" 455 die "Cannot call enewuser without a username"
464 fi 456 fi
465 457
466 # lets see if the username already exists 458 # lets see if the username already exists
467 if [[ ${euser} == $(egetent passwd "${euser}" | cut -d: -f1) ]] ; then 459 if [[ -n $(egetent passwd "${euser}") ]] ; then
468 return 0 460 return 0
469 fi 461 fi
470 einfo "Adding user '${euser}' to your system ..." 462 einfo "Adding user '${euser}' to your system ..."
471 463
472 # options to pass to useradd 464 # options to pass to useradd
473 local opts= 465 local opts=
474 466
475 # handle uid 467 # handle uid
476 local euid=$1; shift 468 local euid=$1; shift
477 if [[ ! -z ${euid} ]] && [[ ${euid} != "-1" ]] ; then 469 if [[ -n ${euid} && ${euid} != -1 ]] ; then
478 if [[ ${euid} -gt 0 ]] ; then 470 if [[ ${euid} -gt 0 ]] ; then
479 if [[ ! -z $(egetent passwd ${euid}) ]] ; then 471 if [[ -n $(egetent passwd ${euid}) ]] ; then
480 euid="next" 472 euid="next"
481 fi 473 fi
482 else 474 else
483 eerror "Userid given but is not greater than 0 !" 475 eerror "Userid given but is not greater than 0 !"
484 die "${euid} is not a valid UID" 476 die "${euid} is not a valid UID"
485 fi 477 fi
486 else 478 else
487 euid="next" 479 euid="next"
488 fi 480 fi
489 if [[ ${euid} == "next" ]] ; then 481 if [[ ${euid} == "next" ]] ; then
490 for euid in $(seq 101 999) ; do 482 for ((euid = 101; euid <= 999; euid++)); do
491 [[ -z $(egetent passwd ${euid}) ]] && break 483 [[ -z $(egetent passwd ${euid}) ]] && break
492 done 484 done
493 fi 485 fi
494 opts="${opts} -u ${euid}" 486 opts="${opts} -u ${euid}"
495 einfo " - Userid: ${euid}" 487 einfo " - Userid: ${euid}"
496 488
497 # handle shell 489 # handle shell
498 local eshell=$1; shift 490 local eshell=$1; shift
499 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then 491 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
500 if [[ ! -e ${eshell} ]] ; then 492 if [[ ! -e ${ROOT}${eshell} ]] ; then
501 eerror "A shell was specified but it does not exist !" 493 eerror "A shell was specified but it does not exist !"
502 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"
503 fi 499 fi
504 else 500 else
505 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
506 [[ -x ${ROOT}${shell} ]] && break 502 [[ -x ${ROOT}${shell} ]] && break
507 done 503 done
508 504
509 if [[ ${shell} == "/dev/null" ]] ; then 505 if [[ ${shell} == "/dev/null" ]] ; then
510 eerror "Unable to identify the shell to use" 506 eerror "Unable to identify the shell to use, proceeding with userland default."
511 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
512 fi 513 fi
513 514
514 eshell=${shell} 515 eshell=${shell}
515 fi 516 fi
516 einfo " - Shell: ${eshell}" 517 einfo " - Shell: ${eshell}"
578 einfo "Please report the ebuild along with the info below" 579 einfo "Please report the ebuild along with the info below"
579 einfo "eextra: $@" 580 einfo "eextra: $@"
580 die "Required function missing" 581 die "Required function missing"
581 fi 582 fi
582 ;; 583 ;;
583 *-freebsd*) 584 *-freebsd*|*-dragonfly*)
584 if [[ -z $@ ]] ; then 585 if [[ -z $@ ]] ; then
585 pw useradd ${euser} ${opts} \ 586 pw useradd ${euser} ${opts} \
586 -c "added by portage for ${PN}" \ 587 -c "added by portage for ${PN}" \
587 die "enewuser failed" 588 die "enewuser failed"
588 else 589 else
598 else 599 else
599 einfo " - Extra: $@" 600 einfo " - Extra: $@"
600 useradd ${opts} ${euser} "$@" || die "enewuser failed" 601 useradd ${opts} ${euser} "$@" || die "enewuser failed"
601 fi 602 fi
602 ;; 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
603 *) 618 *)
604 if [[ -z $@ ]] ; then 619 if [[ -z $@ ]] ; then
605 useradd ${opts} ${euser} \ 620 useradd ${opts} ${euser} \
606 -c "added by portage for ${PN}" \ 621 -c "added by portage for ${PN}" \
607 || die "enewuser failed" 622 || die "enewuser failed"
631# Default values if you do not specify any: 646# Default values if you do not specify any:
632# groupname: REQUIRED ! 647# groupname: REQUIRED !
633# gid: next available (see groupadd(8)) 648# gid: next available (see groupadd(8))
634# extra: none 649# extra: none
635enewgroup() { 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
636 # get the group 658 # get the group
637 local egroup="$1"; shift 659 local egroup="$1"; shift
638 if [ -z "${egroup}" ] 660 if [ -z "${egroup}" ]
639 then 661 then
640 eerror "No group specified !" 662 eerror "No group specified !"
641 die "Cannot call enewgroup without a group" 663 die "Cannot call enewgroup without a group"
642 fi 664 fi
643 665
644 # see if group already exists 666 # see if group already exists
645 if [ "${egroup}" == "`egetent group \"${egroup}\" | cut -d: -f1`" ] 667 if [[ -n $(egetent group "${egroup}") ]]; then
646 then
647 return 0 668 return 0
648 fi 669 fi
649 einfo "Adding group '${egroup}' to your system ..." 670 einfo "Adding group '${egroup}' to your system ..."
650 671
651 # options to pass to useradd 672 # options to pass to useradd
694 fi 715 fi
695 716
696 # If we need the next available 717 # If we need the next available
697 case ${egid} in 718 case ${egid} in
698 *[!0-9]*) # Non numeric 719 *[!0-9]*) # Non numeric
699 for egid in $(seq 101 999); do 720 for ((egid = 101; egid <= 999; egid++)); do
700 [ -z "`egetent group ${egid}`" ] && break 721 [[ -z $(egetent group ${egid}) ]] && break
701 done 722 done
702 esac 723 esac
703 dscl . create /groups/${egroup} gid ${egid} 724 dscl . create /groups/${egroup} gid ${egid}
704 dscl . create /groups/${egroup} passwd '*' 725 dscl . create /groups/${egroup} passwd '*'
705 ;; 726 ;;
706 727
707 *-freebsd*) 728 *-freebsd*|*-dragonfly*)
708 case ${egid} in 729 case ${egid} in
709 *[!0-9]*) # Non numeric 730 *[!0-9]*) # Non numeric
710 for egid in $(seq 101 999); do 731 for ((egid = 101; egid <= 999; egid++)); do
711 [ -z "`egetent group ${egid}`" ] && break 732 [[ -z $(egetent group ${egid}) ]] && break
712 done 733 done
713 esac 734 esac
714 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 735 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
715 ;; 736 ;;
716 737
717 *-netbsd*) 738 *-netbsd*)
718 case ${egid} in 739 case ${egid} in
719 *[!0-9]*) # Non numeric 740 *[!0-9]*) # Non numeric
720 for egid in $(seq 101 999); do 741 for ((egid = 101; egid <= 999; egid++)); do
721 [ -z "`egetent group ${egid}`" ] && break 742 [[ -z $(egetent group ${egid}) ]] && break
722 done 743 done
723 esac 744 esac
724 groupadd -g ${egid} ${egroup} || die "enewgroup failed" 745 groupadd -g ${egid} ${egroup} || die "enewgroup failed"
725 ;; 746 ;;
726 747
734# Simple script to replace 'dos2unix' binaries 755# Simple script to replace 'dos2unix' binaries
735# vapier@gentoo.org 756# vapier@gentoo.org
736# 757#
737# edos2unix(file, <more files> ...) 758# edos2unix(file, <more files> ...)
738edos2unix() { 759edos2unix() {
739 for f in "$@" 760 echo "$@" | xargs sed -i 's/\r$//'
740 do
741 cp "${f}" ${T}/edos2unix
742 sed 's/\r$//' ${T}/edos2unix > "${f}"
743 done
744} 761}
745 762
746 763
747############################################################## 764##############################################################
748# START: Handle .desktop files and menu entries # 765# START: Handle .desktop files and menu entries #
749# maybe this should be separated into a new eclass some time # 766# maybe this should be separated into a new eclass some time #
750# lanius@gentoo.org # 767# lanius@gentoo.org #
751############################################################## 768##############################################################
752 769
753# Make a desktop file ! 770# Make a desktop file !
754# Great for making those icons in kde/gnome startmenu ! 771# Great for making those icons in kde/gnome startmenu !
755# Amaze your friends ! Get the women ! Join today ! 772# Amaze your friends ! Get the women ! Join today !
756# 773#
757# make_desktop_entry(<binary>, [name], [icon], [type], [path]) 774# make_desktop_entry(<command>, [name], [icon], [type], [path])
758# 775#
759# binary: what binary does the app run with ? 776# binary: what command does the app run with ?
760# name: the name that will show up in the menu 777# name: the name that will show up in the menu
761# icon: give your little like a pretty little icon ... 778# icon: give your little like a pretty little icon ...
762# this can be relative (to /usr/share/pixmaps) or 779# this can be relative (to /usr/share/pixmaps) or
763# a full path to an icon 780# a full path to an icon
764# type: what kind of application is this ? for categories: 781# type: what kind of application is this ? for categories:
765# http://www.freedesktop.org/Standards/desktop-entry-spec 782# http://www.freedesktop.org/Standards/desktop-entry-spec
766# path: if your app needs to startup in a specific dir 783# path: if your app needs to startup in a specific dir
767make_desktop_entry() { 784make_desktop_entry() {
768 [[ -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
769 786
777 local catmaj=${CATEGORY%%-*} 794 local catmaj=${CATEGORY%%-*}
778 local catmin=${CATEGORY##*-} 795 local catmin=${CATEGORY##*-}
779 case ${catmaj} in 796 case ${catmaj} in
780 app) 797 app)
781 case ${catmin} in 798 case ${catmin} in
782 admin) type=System;; 799 admin) type=System;;
783 cdr) type=DiscBurning;; 800 cdr) type=DiscBurning;;
784 dicts) type=Dictionary;; 801 dicts) type=Dictionary;;
785 editors) type=TextEditor;; 802 editors) type=TextEditor;;
786 emacs) type=TextEditor;; 803 emacs) type=TextEditor;;
787 emulation) type=Emulator;; 804 emulation) type=Emulator;;
788 laptop) type=HardwareSettings;; 805 laptop) type=HardwareSettings;;
789 office) type=Office;; 806 office) type=Office;;
790 vim) type=TextEditor;; 807 vim) type=TextEditor;;
791 xemacs) type=TextEditor;; 808 xemacs) type=TextEditor;;
792 *) type=;; 809 *) type=;;
793 esac 810 esac
794 ;; 811 ;;
795 812
796 dev) 813 dev)
797 type="Development" 814 type="Development"
798 ;; 815 ;;
799 816
800 games) 817 games)
801 case ${catmin} in 818 case ${catmin} in
802 action) type=ActionGame;; 819 action|fps) type=ActionGame;;
803 arcade) type=ArcadeGame;; 820 arcade) type=ArcadeGame;;
804 board) type=BoardGame;; 821 board) type=BoardGame;;
805 kid) type=KidsGame;; 822 kids) type=KidsGame;;
806 emulation) type=Emulator;; 823 emulation) type=Emulator;;
807 puzzle) type=LogicGame;; 824 puzzle) type=LogicGame;;
808 rpg) type=RolePlaying;; 825 rpg) type=RolePlaying;;
809 roguelike) type=RolePlaying;; 826 roguelike) type=RolePlaying;;
810 simulation) type=Simulation;; 827 simulation) type=Simulation;;
811 sports) type=SportsGame;; 828 sports) type=SportsGame;;
812 strategy) type=StrategyGame;; 829 strategy) type=StrategyGame;;
813 *) type=;; 830 *) type=;;
814 esac 831 esac
815 type="Game;${type}" 832 type="Game;${type}"
816 ;; 833 ;;
817 834
818 mail) 835 mail)
822 media) 839 media)
823 case ${catmin} in 840 case ${catmin} in
824 gfx) type=Graphics;; 841 gfx) type=Graphics;;
825 radio) type=Tuner;; 842 radio) type=Tuner;;
826 sound) type=Audio;; 843 sound) type=Audio;;
827 tv) type=TV;; 844 tv) type=TV;;
828 video) type=Video;; 845 video) type=Video;;
829 *) type=;; 846 *) type=;;
830 esac 847 esac
831 type="AudioVideo;${type}" 848 type="AudioVideo;${type}"
832 ;; 849 ;;
833 850
834 net) 851 net)
835 case ${catmin} in 852 case ${catmin} in
836 dialup) type=Dialup;; 853 dialup) type=Dialup;;
837 ftp) type=FileTransfer;; 854 ftp) type=FileTransfer;;
838 im) type=InstantMessaging;; 855 im) type=InstantMessaging;;
839 irc) type=IRCClient;; 856 irc) type=IRCClient;;
840 mail) type=Email;; 857 mail) type=Email;;
841 news) type=News;; 858 news) type=News;;
842 nntp) type=News;; 859 nntp) type=News;;
843 p2p) type=FileTransfer;; 860 p2p) type=FileTransfer;;
844 *) type=;; 861 *) type=;;
845 esac 862 esac
846 type="Network;${type}" 863 type="Network;${type}"
847 ;; 864 ;;
848 865
849 sci) 866 sci)
850 case ${catmin} in 867 case ${catmin} in
851 astro*) type=Astronomoy;; 868 astro*) type=Astronomy;;
852 bio*) type=Biology;; 869 bio*) type=Biology;;
853 calc*) type=Calculator;; 870 calc*) type=Calculator;;
854 chem*) type=Chemistry;; 871 chem*) type=Chemistry;;
855 geo*) type=Geology;; 872 geo*) type=Geology;;
856 math*) type=Math;; 873 math*) type=Math;;
857 *) type=;; 874 *) type=;;
858 esac 875 esac
859 type="Science;${type}" 876 type="Science;${type}"
860 ;; 877 ;;
861 878
862 www) 879 www)
863 case ${catmin} in 880 case ${catmin} in
864 client) type=WebBrowser;; 881 client) type=WebBrowser;;
865 *) type=;; 882 *) type=;;
866 esac 883 esac
867 type="Network" 884 type="Network"
868 ;; 885 ;;
869 886
870 *) 887 *)
875 if [ "${SLOT}" == "0" ] ; then 892 if [ "${SLOT}" == "0" ] ; then
876 local desktop_name="${PN}" 893 local desktop_name="${PN}"
877 else 894 else
878 local desktop_name="${PN}-${SLOT}" 895 local desktop_name="${PN}-${SLOT}"
879 fi 896 fi
897 local desktop="${T}/$(echo ${exec} | sed 's:[[:space:]/:]:_:g')-${desktop_name}.desktop"
880 local desktop=${T}/${exec%% *}-${desktop_name}.desktop 898 #local desktop=${T}/${exec%% *:-${desktop_name}}.desktop
881 899
900 cat <<-EOF > "${desktop}"
882echo "[Desktop Entry] 901 [Desktop Entry]
883Encoding=UTF-8 902 Encoding=UTF-8
884Version=0.9.2 903 Version=0.9.2
885Name=${name} 904 Name=${name}
886Type=Application 905 Type=Application
887Comment=${DESCRIPTION} 906 Comment=${DESCRIPTION}
888Exec=${exec} 907 Exec=${exec}
908 TryExec=${exec%% *}
889Path=${path} 909 Path=${path}
890Icon=${icon} 910 Icon=${icon}
891Categories=Application;${type};" > "${desktop}" 911 Categories=Application;${type};
912 EOF
892 913
893 ( 914 (
894 # wrap the env here so that the 'insinto' call 915 # wrap the env here so that the 'insinto' call
895 # doesn't corrupt the env of the caller 916 # doesn't corrupt the env of the caller
896 insinto /usr/share/applications 917 insinto /usr/share/applications
897 doins "${desktop}" 918 doins "${desktop}"
898 ) 919 )
899} 920}
900 921
922
923# Validate desktop 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 /usr/share/applications $@ ; do
933 [[ -d ${D}${d} ]] && directories="${directories} ${D}${d}"
934 done
935 if [[ -n ${directories} ]] ; then
936 for FILE in $(find ${directories} -name "*\.desktop" \
937 -not -path '*.hidden*' | sort -u 2>/dev/null)
938 do
939 local temp=$(desktop-file-validate ${FILE} | grep -v "warning:" | \
940 sed -e "s|error: ||" -e "s|${FILE}:|--|g" )
941 [[ -n $temp ]] && elog ${temp/--/${FILE/${D}/}:}
942 done
943 fi
944 echo ""
945 else
946 einfo "Passing desktop entry validity check. Install dev-util/desktop-file-utils, if you want to help to improve Gentoo."
947 fi
948}
949
950
901# Make a GDM/KDM Session file 951# Make a GDM/KDM Session file
902# 952#
903# make_desktop_entry(<title>, <command>) 953# make_session_desktop(<title>, <command>)
904# title: File to execute to start the Window Manager 954# title: File to execute to start the Window Manager
905# command: Name of the Window Manager 955# command: Name of the Window Manager
906 956
907make_session_desktop() { 957make_session_desktop() {
908 [[ -z $1 ]] && eerror "make_session_desktop: You must specify the title" && return 1 958 [[ -z $1 ]] && eerror "make_session_desktop: You must specify the title" && return 1
910 960
911 local title=$1 961 local title=$1
912 local command=$2 962 local command=$2
913 local desktop=${T}/${wm}.desktop 963 local desktop=${T}/${wm}.desktop
914 964
965 cat <<-EOF > "${desktop}"
915echo "[Desktop Entry] 966 [Desktop Entry]
916Encoding=UTF-8 967 Encoding=UTF-8
917Name=${title} 968 Name=${title}
918Comment=This session logs you into ${title} 969 Comment=This session logs you into ${title}
919Exec=${command} 970 Exec=${command}
920TryExec=${command} 971 TryExec=${command}
921Type=Application" > "${desktop}" 972 Type=Application
973 EOF
922 974
975 (
976 # wrap the env here so that the 'insinto' call
977 # doesn't corrupt the env of the caller
923 insinto /usr/share/xsessions 978 insinto /usr/share/xsessions
924 doins "${desktop}" 979 doins "${desktop}"
980 )
925} 981}
926 982
927domenu() { 983domenu() {
984 (
985 # wrap the env here so that the 'insinto' call
986 # doesn't corrupt the env of the caller
928 local i j 987 local i j ret=0
929 insinto /usr/share/applications 988 insinto /usr/share/applications
930 for i in "$@" ; do 989 for i in "$@" ; do
931 if [[ -f ${i} ]] ; then 990 if [[ -f ${i} ]] ; then
932 doins "${i}" 991 doins "${i}"
992 ((ret+=$?))
933 elif [[ -d ${i} ]] ; then 993 elif [[ -d ${i} ]] ; then
934 for j in "${i}"/*.desktop ; do 994 for j in "${i}"/*.desktop ; do
935 doins "${j}" 995 doins "${j}"
996 ((ret+=$?))
936 done 997 done
937 fi 998 fi
938 done 999 done
1000 exit ${ret}
1001 )
939} 1002}
940newmenu() { 1003newmenu() {
1004 (
1005 # wrap the env here so that the 'insinto' call
1006 # doesn't corrupt the env of the caller
941 insinto /usr/share/applications 1007 insinto /usr/share/applications
942 newins "$1" "$2" 1008 newins "$@"
1009 )
943} 1010}
944 1011
945doicon() { 1012doicon() {
1013 (
1014 # wrap the env here so that the 'insinto' call
1015 # doesn't corrupt the env of the caller
946 local i j 1016 local i j ret
947 insinto /usr/share/pixmaps 1017 insinto /usr/share/pixmaps
948 for i in "$@" ; do 1018 for i in "$@" ; do
949 if [[ -f ${i} ]] ; then 1019 if [[ -f ${i} ]] ; then
950 doins "${i}" 1020 doins "${i}"
1021 ((ret+=$?))
951 elif [[ -d ${i} ]] ; then 1022 elif [[ -d ${i} ]] ; then
952 for j in "${i}"/*.png ; do 1023 for j in "${i}"/*.png ; do
953 doins "${j}" 1024 doins "${j}"
1025 ((ret+=$?))
954 done 1026 done
955 fi 1027 fi
956 done 1028 done
1029 exit ${ret}
1030 )
957} 1031}
958newicon() { 1032newicon() {
1033 (
1034 # wrap the env here so that the 'insinto' call
1035 # doesn't corrupt the env of the caller
959 insinto /usr/share/pixmaps 1036 insinto /usr/share/pixmaps
960 newins "$1" "$2" 1037 newins "$@"
1038 )
961} 1039}
962 1040
963############################################################## 1041##############################################################
964# END: Handle .desktop files and menu entries # 1042# END: Handle .desktop files and menu entries #
965############################################################## 1043##############################################################
966 1044
967 1045
968# for internal use only (unpack_pdv and unpack_makeself) 1046# for internal use only (unpack_pdv and unpack_makeself)
969find_unpackable_file() { 1047find_unpackable_file() {
988# the middle of the archive. Valve seems to use it a lot ... too bad 1066# the middle of the archive. Valve seems to use it a lot ... too bad
989# it seems to like to segfault a lot :(. So lets take it apart ourselves. 1067# it seems to like to segfault a lot :(. So lets take it apart ourselves.
990# 1068#
991# Usage: unpack_pdv [file to unpack] [size of off_t] 1069# Usage: unpack_pdv [file to unpack] [size of off_t]
992# - you have to specify the off_t size ... i have no idea how to extract that 1070# - you have to specify the off_t size ... i have no idea how to extract that
993# information out of the binary executable myself. basically you pass in 1071# information out of the binary executable myself. basically you pass in
994# the size of the off_t type (in bytes) on the machine that built the pdv 1072# the size of the off_t type (in bytes) on the machine that built the pdv
995# archive. one way to determine this is by running the following commands: 1073# archive. one way to determine this is by running the following commands:
996# strings <pdv archive> | grep lseek 1074# strings <pdv archive> | grep lseek
997# strace -elseek <pdv archive> 1075# strace -elseek <pdv archive>
998# basically look for the first lseek command (we do the strings/grep because 1076# basically look for the first lseek command (we do the strings/grep because
999# sometimes the function call is _llseek or something) and steal the 2nd 1077# sometimes the function call is _llseek or something) and steal the 2nd
1000# parameter. here is an example: 1078# parameter. here is an example:
1001# root@vapier 0 pdv_unpack # strings hldsupdatetool.bin | grep lseek 1079# root@vapier 0 pdv_unpack # strings hldsupdatetool.bin | grep lseek
1002# lseek 1080# lseek
1003# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 1081# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
1004# lseek(3, -4, SEEK_END) = 2981250 1082# lseek(3, -4, SEEK_END) = 2981250
1005# thus we would pass in the value of '4' as the second parameter. 1083# thus we would pass in the value of '4' as the second parameter.
1006unpack_pdv() { 1084unpack_pdv() {
1007 local src=$(find_unpackable_file $1) 1085 local src=$(find_unpackable_file "$1")
1008 local sizeoff_t=$2 1086 local sizeoff_t=$2
1009 1087
1010 [[ -z ${src} ]] && die "Could not locate source for '$1'" 1088 [[ -z ${src} ]] && die "Could not locate source for '$1'"
1011 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :(" 1089 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :("
1012 1090
1013 local shrtsrc="`basename ${src}`" 1091 local shrtsrc=$(basename "${src}")
1014 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1092 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1015 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1093 local metaskip=$(tail -c ${sizeoff_t} "${src}" | hexdump -e \"%i\")
1016 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"` 1094 local tailskip=$(tail -c $((${sizeoff_t}*2)) "${src}" | head -c ${sizeoff_t} | hexdump -e \"%i\")
1017 1095
1018 # grab metadata for debug reasons 1096 # grab metadata for debug reasons
1019 local metafile="$(emktemp)" 1097 local metafile=$(emktemp)
1020 tail -c +$((${metaskip}+1)) ${src} > ${metafile} 1098 tail -c +$((${metaskip}+1)) "${src}" > "${metafile}"
1021 1099
1022 # rip out the final file name from the metadata 1100 # rip out the final file name from the metadata
1023 local datafile="`tail -c +$((${metaskip}+1)) ${src} | strings | head -n 1`" 1101 local datafile=$(tail -c +$((${metaskip}+1)) "${src}" | strings | head -n 1)
1024 datafile="`basename ${datafile}`" 1102 datafile=$(basename "${datafile}")
1025 1103
1026 # now lets uncompress/untar the file if need be 1104 # now lets uncompress/untar the file if need be
1027 local tmpfile="$(emktemp)" 1105 local tmpfile=$(emktemp)
1028 tail -c +$((${tailskip}+1)) ${src} 2>/dev/null | head -c 512 > ${tmpfile} 1106 tail -c +$((${tailskip}+1)) ${src} 2>/dev/null | head -c 512 > ${tmpfile}
1029 1107
1030 local iscompressed="`file -b ${tmpfile}`" 1108 local iscompressed=$(file -b "${tmpfile}")
1031 if [ "${iscompressed:0:8}" == "compress" ] ; then 1109 if [[ ${iscompressed:0:8} == "compress" ]] ; then
1032 iscompressed=1 1110 iscompressed=1
1033 mv ${tmpfile}{,.Z} 1111 mv ${tmpfile}{,.Z}
1034 gunzip ${tmpfile} 1112 gunzip ${tmpfile}
1035 else 1113 else
1036 iscompressed=0 1114 iscompressed=0
1037 fi 1115 fi
1038 local istar="`file -b ${tmpfile}`" 1116 local istar=$(file -b "${tmpfile}")
1039 if [ "${istar:0:9}" == "POSIX tar" ] ; then 1117 if [[ ${istar:0:9} == "POSIX tar" ]] ; then
1040 istar=1 1118 istar=1
1041 else 1119 else
1042 istar=0 1120 istar=0
1043 fi 1121 fi
1044 1122
1080# many other game companies. 1158# many other game companies.
1081# 1159#
1082# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1160# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1083# - If the file is not specified then unpack will utilize ${A}. 1161# - If the file is not specified then unpack will utilize ${A}.
1084# - If the offset is not specified then we will attempt to extract 1162# - If the offset is not specified then we will attempt to extract
1085# the proper offset from the script itself. 1163# the proper offset from the script itself.
1086unpack_makeself() { 1164unpack_makeself() {
1165 local src_input=${1:-${A}}
1087 local src=$(find_unpackable_file "$1") 1166 local src=$(find_unpackable_file "${src_input}")
1088 local skip=$2 1167 local skip=$2
1089 local exe=$3 1168 local exe=$3
1090 1169
1091 [[ -z ${src} ]] && die "Could not locate source for '$1'" 1170 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
1092 1171
1093 local shrtsrc=$(basename "${src}") 1172 local shrtsrc=$(basename "${src}")
1094 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1173 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1095 if [ -z "${skip}" ] 1174 if [[ -z ${skip} ]] ; then
1096 then
1097 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1175 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}')
1098 local skip=0 1176 local skip=0
1099 exe=tail 1177 exe=tail
1100 case ${ver} in 1178 case ${ver} in
1101 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same 1179 1.5.*|1.6.0-nv) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same
1102 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1180 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1103 ;; 1181 ;;
1104 2.0|2.0.1) 1182 2.0|2.0.1)
1105 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-) 1183 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-)
1106 ;; 1184 ;;
1114 ;; 1192 ;;
1115 2.1.3) 1193 2.1.3)
1116 skip=`grep -a ^offset= "${src}" | awk '{print $3}'` 1194 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1117 let skip="skip + 1" 1195 let skip="skip + 1"
1118 ;; 1196 ;;
1119 2.1.4) 1197 2.1.4|2.1.5)
1120 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1) 1198 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1)
1121 skip=$(head -n ${skip} "${src}" | wc -c) 1199 skip=$(head -n ${skip} "${src}" | wc -c)
1122 exe="dd" 1200 exe="dd"
1123 ;; 1201 ;;
1124 *) 1202 *)
1136 dd) exe="dd ibs=${skip} skip=1 obs=1024 conv=sync if='${src}'";; 1214 dd) exe="dd ibs=${skip} skip=1 obs=1024 conv=sync if='${src}'";;
1137 *) die "makeself cant handle exe '${exe}'" 1215 *) die "makeself cant handle exe '${exe}'"
1138 esac 1216 esac
1139 1217
1140 # lets grab the first few bytes of the file to figure out what kind of archive it is 1218 # lets grab the first few bytes of the file to figure out what kind of archive it is
1141 local tmpfile="$(emktemp)" 1219 local tmpfile=$(emktemp)
1142 eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}" 1220 eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}"
1143 local filetype="$(file -b "${tmpfile}")" 1221 local filetype=$(file -b "${tmpfile}")
1144 case ${filetype} in 1222 case ${filetype} in
1145 *tar\ archive) 1223 *tar\ archive*)
1146 eval ${exe} | tar --no-same-owner -xf - 1224 eval ${exe} | tar --no-same-owner -xf -
1147 ;; 1225 ;;
1148 bzip2*) 1226 bzip2*)
1149 eval ${exe} | bzip2 -dc | tar --no-same-owner -xf - 1227 eval ${exe} | bzip2 -dc | tar --no-same-owner -xf -
1150 ;; 1228 ;;
1186 # accepted ... if we don't find a match, we make the user accept 1264 # accepted ... if we don't find a match, we make the user accept
1187 local shopts=$- 1265 local shopts=$-
1188 local alic 1266 local alic
1189 set -o noglob #so that bash doesn't expand "*" 1267 set -o noglob #so that bash doesn't expand "*"
1190 for alic in ${ACCEPT_LICENSE} ; do 1268 for alic in ${ACCEPT_LICENSE} ; do
1191 if [[ ${alic} == * || ${alic} == ${l} ]]; then 1269 if [[ ${alic} == ${l} ]]; then
1192 set +o noglob; set -${shopts} #reset old shell opts 1270 set +o noglob; set -${shopts} #reset old shell opts
1193 return 0 1271 return 0
1194 fi 1272 fi
1195 done 1273 done
1196 set +o noglob; set -$shopts #reset old shell opts 1274 set +o noglob; set -$shopts #reset old shell opts
1197 1275
1198 local licmsg="$(emktemp)" 1276 local licmsg=$(emktemp)
1199 cat << EOF > ${licmsg} 1277 cat <<-EOF > ${licmsg}
1200********************************************************** 1278 **********************************************************
1201The following license outlines the terms of use of this 1279 The following license outlines the terms of use of this
1202package. You MUST accept this license for installation to 1280 package. You MUST accept this license for installation to
1203continue. When you are done viewing, hit 'q'. If you 1281 continue. When you are done viewing, hit 'q'. If you
1204CTRL+C out of this, the install will not run! 1282 CTRL+C out of this, the install will not run!
1205********************************************************** 1283 **********************************************************
1206 1284
1207EOF 1285 EOF
1208 cat ${lic} >> ${licmsg} 1286 cat ${lic} >> ${licmsg}
1209 ${PAGER:-less} ${licmsg} || die "Could not execute pager (${PAGER}) to accept ${lic}" 1287 ${PAGER:-less} ${licmsg} || die "Could not execute pager (${PAGER}) to accept ${lic}"
1210 einfon "Do you accept the terms of this license (${l})? [yes/no] " 1288 einfon "Do you accept the terms of this license (${l})? [yes/no] "
1211 read alic 1289 read alic
1212 case ${alic} in 1290 case ${alic} in
1229# and when the function returns, you can assume that the cd has been 1307# and when the function returns, you can assume that the cd has been
1230# found at CDROM_ROOT. 1308# found at CDROM_ROOT.
1231# 1309#
1232# normally the cdrom functions will refer to the cds as 'cd #1', 'cd #2', 1310# normally the cdrom functions will refer to the cds as 'cd #1', 'cd #2',
1233# etc... if you want to give the cds better names, then just export 1311# etc... if you want to give the cds better names, then just export
1234# the CDROM_NAME_X variables before calling cdrom_get_cds(). 1312# the appropriate CDROM_NAME variable before calling cdrom_get_cds().
1313# - CDROM_NAME="fooie cd" - for when you only want 1 cd
1314# - CDROM_NAME_1="install cd" - for when you want more than 1 cd
1315# CDROM_NAME_2="data cd"
1316# - CDROM_NAME_SET=( "install cd" "data cd" ) - short hand for CDROM_NAME_#
1235# 1317#
1236# for those multi cd ebuilds, see the cdrom_load_next_cd() below. 1318# for those multi cd ebuilds, see the cdrom_load_next_cd() below.
1237# 1319#
1238# Usage: cdrom_get_cds <file on cd1> [file on cd2] [file on cd3] [...] 1320# Usage: cdrom_get_cds <file on cd1> [file on cd2] [file on cd3] [...]
1239# - this will attempt to locate a cd based upon a file that is on 1321# - this will attempt to locate a cd based upon a file that is on
1240# the cd ... the more files you give this function, the more cds 1322# the cd ... the more files you give this function, the more cds
1241# the cdrom functions will handle 1323# the cdrom functions will handle
1242cdrom_get_cds() { 1324cdrom_get_cds() {
1243 # first we figure out how many cds we're dealing with by 1325 # first we figure out how many cds we're dealing with by
1244 # the # of files they gave us 1326 # the # of files they gave us
1245 local cdcnt=0 1327 local cdcnt=0
1246 local f= 1328 local f=
1247 for f in "$@" ; do 1329 for f in "$@" ; do
1248 cdcnt=$((cdcnt + 1)) 1330 ((++cdcnt))
1249 export CDROM_CHECK_${cdcnt}="$f" 1331 export CDROM_CHECK_${cdcnt}="$f"
1250 done 1332 done
1251 export CDROM_TOTAL_CDS=${cdcnt} 1333 export CDROM_TOTAL_CDS=${cdcnt}
1252 export CDROM_CURRENT_CD=1 1334 export CDROM_CURRENT_CD=1
1253 1335
1254 # now we see if the user gave use CD_ROOT ... 1336 # now we see if the user gave use CD_ROOT ...
1255 # if they did, let's just believe them that it's correct 1337 # if they did, let's just believe them that it's correct
1256 if [[ ! -z ${CD_ROOT} ]] ; then
1257 export CDROM_ROOT=${CD_ROOT}
1258 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1259 return
1260 fi
1261 # do the same for CD_ROOT_X
1262 if [[ ! -z ${CD_ROOT_1} ]] ; then 1338 if [[ -n ${CD_ROOT}${CD_ROOT_1} ]] ; then
1263 local var= 1339 local var=
1264 cdcnt=0 1340 cdcnt=0
1265 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1341 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1266 cdcnt=$((cdcnt + 1)) 1342 ((++cdcnt))
1267 var="CD_ROOT_${cdcnt}" 1343 var="CD_ROOT_${cdcnt}"
1344 [[ -z ${!var} ]] && var="CD_ROOT"
1268 if [[ -z ${!var} ]] ; then 1345 if [[ -z ${!var} ]] ; then
1269 eerror "You must either use just the CD_ROOT" 1346 eerror "You must either use just the CD_ROOT"
1270 eerror "or specify ALL the CD_ROOT_X variables." 1347 eerror "or specify ALL the CD_ROOT_X variables."
1271 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables." 1348 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables."
1272 die "could not locate CD_ROOT_${cdcnt}" 1349 die "could not locate CD_ROOT_${cdcnt}"
1273 fi 1350 fi
1274 export CDROM_ROOTS_${cdcnt}="${!var}"
1275 done 1351 done
1276 export CDROM_ROOT=${CDROM_ROOTS_1} 1352 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}}
1277 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1353 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1354 export CDROM_SET=-1
1355 for f in ${CDROM_CHECK_1//:/ } ; do
1356 ((++CDROM_SET))
1357 [[ -e ${CD_ROOT}/${f} ]] && break
1358 done
1359 export CDROM_MATCH=${f}
1278 return 1360 return
1279 fi 1361 fi
1280 1362
1363 # User didn't help us out so lets make sure they know they can
1364 # simplify the whole process ...
1281 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1365 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1282 einfon "This ebuild will need the " 1366 einfo "This ebuild will need the ${CDROM_NAME:-cdrom for ${PN}}"
1283 if [[ -z ${CDROM_NAME} ]] ; then
1284 echo "cdrom for ${PN}."
1285 else
1286 echo "${CDROM_NAME}."
1287 fi
1288 echo 1367 echo
1289 einfo "If you do not have the CD, but have the data files" 1368 einfo "If you do not have the CD, but have the data files"
1290 einfo "mounted somewhere on your filesystem, just export" 1369 einfo "mounted somewhere on your filesystem, just export"
1291 einfo "the variable CD_ROOT so that it points to the" 1370 einfo "the variable CD_ROOT so that it points to the"
1292 einfo "directory containing the files." 1371 einfo "directory containing the files."
1293 echo 1372 echo
1294 einfo "For example:" 1373 einfo "For example:"
1295 einfo "export CD_ROOT=/mnt/cdrom" 1374 einfo "export CD_ROOT=/mnt/cdrom"
1296 echo 1375 echo
1297 else 1376 else
1377 if [[ -n ${CDROM_NAME_SET} ]] ; then
1378 # Translate the CDROM_NAME_SET array into CDROM_NAME_#
1379 cdcnt=0
1380 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1381 ((++cdcnt))
1382 export CDROM_NAME_${cdcnt}="${CDROM_NAME_SET[$((${cdcnt}-1))]}"
1383 done
1384 fi
1385
1298 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1386 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1299 cdcnt=0 1387 cdcnt=0
1300 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1388 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1301 cdcnt=$((cdcnt + 1)) 1389 ((++cdcnt))
1302 var="CDROM_NAME_${cdcnt}" 1390 var="CDROM_NAME_${cdcnt}"
1303 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}" 1391 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}"
1304 done 1392 done
1305 echo 1393 echo
1306 einfo "If you do not have the CDs, but have the data files" 1394 einfo "If you do not have the CDs, but have the data files"
1307 einfo "mounted somewhere on your filesystem, just export" 1395 einfo "mounted somewhere on your filesystem, just export"
1308 einfo "the following variables so they point to the right place:" 1396 einfo "the following variables so they point to the right place:"
1309 einfon "" 1397 einfon ""
1310 cdcnt=0 1398 cdcnt=0
1311 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1399 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1312 cdcnt=$((cdcnt + 1)) 1400 ((++cdcnt))
1313 echo -n " CD_ROOT_${cdcnt}" 1401 echo -n " CD_ROOT_${cdcnt}"
1314 done 1402 done
1315 echo 1403 echo
1316 einfo "Or, if you have all the files in the same place, or" 1404 einfo "Or, if you have all the files in the same place, or"
1317 einfo "you only have one cdrom, you can export CD_ROOT" 1405 einfo "you only have one cdrom, you can export CD_ROOT"
1320 echo 1408 echo
1321 einfo "For example:" 1409 einfo "For example:"
1322 einfo "export CD_ROOT_1=/mnt/cdrom" 1410 einfo "export CD_ROOT_1=/mnt/cdrom"
1323 echo 1411 echo
1324 fi 1412 fi
1413
1414 export CDROM_SET=""
1325 export CDROM_CURRENT_CD=0 1415 export CDROM_CURRENT_CD=0
1326 cdrom_load_next_cd 1416 cdrom_load_next_cd
1327} 1417}
1328 1418
1329# this is only used when you need access to more than one cd. 1419# this is only used when you need access to more than one cd.
1330# when you have finished using the first cd, just call this function. 1420# when you have finished using the first cd, just call this function.
1331# when it returns, CDROM_ROOT will be pointing to the second cd. 1421# when it returns, CDROM_ROOT will be pointing to the second cd.
1332# remember, you can only go forward in the cd chain, you can't go back. 1422# remember, you can only go forward in the cd chain, you can't go back.
1333cdrom_load_next_cd() { 1423cdrom_load_next_cd() {
1334 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1335 local var= 1424 local var
1336 1425 ((++CDROM_CURRENT_CD))
1337 if [[ ! -z ${CD_ROOT} ]] ; then
1338 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}"
1339 return
1340 fi
1341 1426
1342 unset CDROM_ROOT 1427 unset CDROM_ROOT
1343 var=CDROM_ROOTS_${CDROM_CURRENT_CD} 1428 var=CD_ROOT_${CDROM_CURRENT_CD}
1429 [[ -z ${!var} ]] && var="CD_ROOT"
1344 if [[ -z ${!var} ]] ; then 1430 if [[ -z ${!var} ]] ; then
1345 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1431 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1346 cdrom_locate_file_on_cd ${!var} 1432 _cdrom_locate_file_on_cd ${!var}
1347 else 1433 else
1348 export CDROM_ROOT=${!var} 1434 export CDROM_ROOT=${!var}
1349 fi 1435 fi
1350 1436
1351 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1437 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1356# all it does is try to locate a give file on a cd ... if the cd isn't 1442# all it does is try to locate a give file on a cd ... if the cd isn't
1357# found, then a message asking for the user to insert the cdrom will be 1443# found, then a message asking for the user to insert the cdrom will be
1358# displayed and we'll hang out here until: 1444# displayed and we'll hang out here until:
1359# (1) the file is found on a mounted cdrom 1445# (1) the file is found on a mounted cdrom
1360# (2) the user hits CTRL+C 1446# (2) the user hits CTRL+C
1361cdrom_locate_file_on_cd() { 1447_cdrom_locate_file_on_cd() {
1448 local mline=""
1449 local showedmsg=0
1450
1362 while [[ -z ${CDROM_ROOT} ]] ; do 1451 while [[ -z ${CDROM_ROOT} ]] ; do
1363 local dir=$(dirname "$*") 1452 local i=0
1453 local -a cdset=(${*//:/ })
1454 if [[ -n ${CDROM_SET} ]] ; then
1455 cdset=(${cdset[${CDROM_SET}]})
1456 fi
1457
1458 while [[ -n ${cdset[${i}]} ]] ; do
1459 local dir=$(dirname ${cdset[${i}]})
1364 local file=$(basename "$*") 1460 local file=$(basename ${cdset[${i}]})
1365 local mline=""
1366 local showedmsg=0
1367 1461
1368 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do 1462 local point= node= fs= foo=
1369 [[ -d ${mline}/${dir} ]] || continue 1463 while read point node fs foo ; do
1464 [[ " cd9660 iso9660 " != *" ${fs} "* ]] && \
1465 ! [[ ${fs} == "subfs" && ",${opts}," == *",fs=cdfss,"* ]] \
1466 && continue
1467 point=${point//\040/ }
1370 [[ ! -z $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] \ 1468 [[ -z $(find "${point}/${dir}" -maxdepth 1 -iname "${file}") ]] && continue
1371 && export CDROM_ROOT=${mline} 1469 export CDROM_ROOT=${point}
1470 export CDROM_SET=${i}
1471 export CDROM_MATCH=${cdset[${i}]}
1472 return
1473 done <<< "$(get_mounts)"
1474
1475 ((++i))
1372 done 1476 done
1373 1477
1374 if [[ -z ${CDROM_ROOT} ]] ; then
1375 echo 1478 echo
1376 if [[ ${showedmsg} -eq 0 ]] ; then 1479 if [[ ${showedmsg} -eq 0 ]] ; then
1377 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1480 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1378 if [[ -z ${CDROM_NAME} ]] ; then 1481 if [[ -z ${CDROM_NAME} ]] ; then
1379 einfo "Please insert the cdrom for ${PN} now !" 1482 einfo "Please insert+mount the cdrom for ${PN} now !"
1380 else
1381 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1382 fi
1383 else 1483 else
1384 if [[ -z ${CDROM_NAME_1} ]] ; then
1385 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !"
1386 else
1387 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1388 einfo "Please insert+mount the ${!var} cdrom now !" 1484 einfo "Please insert+mount the ${CDROM_NAME} cdrom now !"
1389 fi
1390 fi 1485 fi
1391 showedmsg=1 1486 else
1487 if [[ -z ${CDROM_NAME_1} ]] ; then
1488 einfo "Please insert+mount cd #${CDROM_CURRENT_CD} for ${PN} now !"
1489 else
1490 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1491 einfo "Please insert+mount the ${!var} cdrom now !"
1492 fi
1392 fi 1493 fi
1494 showedmsg=1
1495 fi
1393 einfo "Press return to scan for the cd again" 1496 einfo "Press return to scan for the cd again"
1394 einfo "or hit CTRL+C to abort the emerge." 1497 einfo "or hit CTRL+C to abort the emerge."
1395 echo 1498 echo
1396 einfo "If you are having trouble with the detection" 1499 einfo "If you are having trouble with the detection"
1397 einfo "of your CD, it is possible that you do not have" 1500 einfo "of your CD, it is possible that you do not have"
1398 einfo "Joliet support enabled in your kernel. Please" 1501 einfo "Joliet support enabled in your kernel. Please"
1399 einfo "check that CONFIG_JOLIET is enabled in your kernel." 1502 einfo "check that CONFIG_JOLIET is enabled in your kernel."
1400 read 1503 read || die "something is screwed with your system"
1401 fi
1402 done 1504 done
1403} 1505}
1404 1506
1405# Make sure that LINGUAS only contains languages that 1507# Make sure that LINGUAS only contains languages that
1406# a package can support 1508# a package can support
1407# 1509#
1408# usage: strip-linguas <allow LINGUAS> 1510# usage: strip-linguas <allow LINGUAS>
1409# strip-linguas -i <directories of .po files> 1511# strip-linguas -i <directories of .po files>
1410# strip-linguas -u <directories of .po files> 1512# strip-linguas -u <directories of .po files>
1411# 1513#
1412# The first form allows you to specify a list of LINGUAS. 1514# The first form allows you to specify a list of LINGUAS.
1413# The -i builds a list of po files found in all the 1515# The -i builds a list of po files found in all the
1414# directories and uses the intersection of the lists. 1516# directories and uses the intersection of the lists.
1415# The -u builds a list of po files found in all the 1517# The -u builds a list of po files found in all the
1416# directories and uses the union of the lists. 1518# directories and uses the union of the lists.
1417strip-linguas() { 1519strip-linguas() {
1418 local ls newls 1520 local ls newls nols
1419 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then 1521 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1420 local op=$1; shift 1522 local op=$1; shift
1421 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1523 ls=$(find "$1" -name '*.po' -exec basename {} .po \;); shift
1422 local d f 1524 local d f
1423 for d in "$@" ; do 1525 for d in "$@" ; do
1424 if [[ ${op} == "-u" ]] ; then 1526 if [[ ${op} == "-u" ]] ; then
1425 newls=${ls} 1527 newls=${ls}
1426 else 1528 else
1427 newls="" 1529 newls=""
1428 fi 1530 fi
1429 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1531 for f in $(find "$d" -name '*.po' -exec basename {} .po \;) ; do
1430 if [[ ${op} == "-i" ]] ; then 1532 if [[ ${op} == "-i" ]] ; then
1431 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}" 1533 hasq ${f} ${ls} && newls="${newls} ${f}"
1432 else 1534 else
1433 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}" 1535 hasq ${f} ${ls} || newls="${newls} ${f}"
1434 fi 1536 fi
1435 done 1537 done
1436 ls=${newls} 1538 ls=${newls}
1437 done 1539 done
1438 ls=${ls//.po}
1439 else 1540 else
1440 ls=$@ 1541 ls="$@"
1441 fi 1542 fi
1442 1543
1443 ls=" ${ls} " 1544 nols=""
1444 newls="" 1545 newls=""
1445 for f in ${LINGUAS} ; do 1546 for f in ${LINGUAS} ; do
1446 if [[ ${ls/ ${f} /} != ${ls} ]] ; then 1547 if hasq ${f} ${ls} ; then
1447 newls="${newls} ${f}" 1548 newls="${newls} ${f}"
1448 else 1549 else
1449 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1550 nols="${nols} ${f}"
1450 fi 1551 fi
1451 done 1552 done
1452 if [[ -z ${newls} ]] ; then 1553 [[ -n ${nols} ]] \
1453 export LINGUAS="" 1554 && ewarn "Sorry, but ${PN} does not support the LINGUAs:" ${nols}
1454 else
1455 export LINGUAS=${newls:1} 1555 export LINGUAS=${newls:1}
1456 fi
1457} 1556}
1458 1557
1459# moved from kernel.eclass since they are generally useful outside of 1558# moved from kernel.eclass since they are generally useful outside of
1460# kernel.eclass -iggy (20041002) 1559# kernel.eclass -iggy (20041002)
1461 1560
1468 while ((i--)) ; do 1567 while ((i--)) ; do
1469 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass" 1568 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1470 done 1569 done
1471 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}" 1570 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1472 case ${ARCH} in 1571 case ${ARCH} in
1473 x86) export ARCH="i386";; 1572 x86) export ARCH="i386";;
1474 amd64) export ARCH="x86_64";; 1573 amd64) export ARCH="x86_64";;
1475 hppa) export ARCH="parisc";; 1574 hppa) export ARCH="parisc";;
1476 mips) export ARCH="mips";; 1575 mips) export ARCH="mips";;
1477 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! 1576 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!
1478 *) export ARCH="${ARCH}";; 1577 *) export ARCH="${ARCH}";;
1479 esac 1578 esac
1480} 1579}
1481 1580
1482# set's ARCH back to what portage expects 1581# set's ARCH back to what portage expects
1483set_arch_to_portage() { 1582set_arch_to_portage() {
1490 1589
1491# Jeremy Huddleston <eradicator@gentoo.org>: 1590# Jeremy Huddleston <eradicator@gentoo.org>:
1492# preserve_old_lib /path/to/libblah.so.0 1591# preserve_old_lib /path/to/libblah.so.0
1493# preserve_old_lib_notify /path/to/libblah.so.0 1592# preserve_old_lib_notify /path/to/libblah.so.0
1494# 1593#
1495# These functions are useful when a lib in your package changes --soname. Such 1594# These functions are useful when a lib in your package changes --library. Such
1496# an example might be from libogg.so.0 to libogg.so.1. Removing libogg.so.0 1595# an example might be from libogg.so.0 to libogg.so.1. Removing libogg.so.0
1497# would break packages that link against it. Most people get around this 1596# would break packages that link against it. Most people get around this
1498# by using the portage SLOT mechanism, but that is not always a relevant 1597# by using the portage SLOT mechanism, but that is not always a relevant
1499# solution, so instead you can add the following to your ebuilds: 1598# solution, so instead you can add the following to your ebuilds:
1500# 1599#
1501# src_install() { 1600# pkg_preinst() {
1502# ... 1601# ...
1503# preserve_old_lib /usr/$(get_libdir)/libogg.so.0 1602# preserve_old_lib /usr/$(get_libdir)/libogg.so.0
1504# ... 1603# ...
1505# } 1604# }
1506# 1605#
1509# preserve_old_lib_notify /usr/$(get_libdir)/libogg.so.0 1608# preserve_old_lib_notify /usr/$(get_libdir)/libogg.so.0
1510# ... 1609# ...
1511# } 1610# }
1512 1611
1513preserve_old_lib() { 1612preserve_old_lib() {
1514 LIB=$1 1613 if [[ ${EBUILD_PHASE} != "preinst" ]] ; then
1614 eerror "preserve_old_lib() must be called from pkg_preinst() only"
1615 die "Invalid preserve_old_lib() usage"
1616 fi
1617 [[ -z $1 ]] && die "Usage: preserve_old_lib <library to preserve> [more libraries to preserve]"
1515 1618
1516 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1619 local lib dir
1517 SONAME=`basename ${LIB}` 1620 for lib in "$@" ; do
1518 DIRNAME=`dirname ${LIB}` 1621 [[ -e ${ROOT}/${lib} ]] || continue
1519 1622 dir=${lib%/*}
1520 dodir ${DIRNAME} 1623 dodir ${dir} || die "dodir ${dir} failed"
1521 cp ${ROOT}${LIB} ${D}${DIRNAME} 1624 cp "${ROOT}"/${lib} "${D}"/${lib} || die "cp ${lib} failed"
1522 touch ${D}${LIB} 1625 touch "${D}"/${lib}
1523 fi 1626 done
1524} 1627}
1525 1628
1526preserve_old_lib_notify() { 1629preserve_old_lib_notify() {
1527 LIB=$1 1630 if [[ ${EBUILD_PHASE} != "postinst" ]] ; then
1631 eerror "preserve_old_lib_notify() must be called from pkg_postinst() only"
1632 die "Invalid preserve_old_lib_notify() usage"
1633 fi
1528 1634
1529 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1635 local lib notice=0
1530 SONAME=`basename ${LIB}` 1636 for lib in "$@" ; do
1531 1637 [[ -e ${ROOT}/${lib} ]] || continue
1638 if [[ ${notice} -eq 0 ]] ; then
1639 notice=1
1532 ewarn "An old version of an installed library was detected on your system." 1640 ewarn "Old versions of installed libraries were detected on your system."
1533 ewarn "In order to avoid breaking packages that link against it, this older version" 1641 ewarn "In order to avoid breaking packages that depend on these old libs,"
1534 ewarn "is not being removed. In order to make full use of this newer version," 1642 ewarn "the libraries are not being removed. You need to run revdep-rebuild"
1535 ewarn "you will need to execute the following command:" 1643 ewarn "in order to remove these old dependencies. If you do not have this"
1536 ewarn " revdep-rebuild --soname ${SONAME}" 1644 ewarn "helper program, simply emerge the 'gentoolkit' package."
1537 ewarn 1645 ewarn
1538 ewarn "After doing that, you can safely remove ${LIB}"
1539 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1540 fi 1646 fi
1647 ewarn " # revdep-rebuild --library ${lib##*/}"
1648 done
1541} 1649}
1542 1650
1543# Hack for people to figure out if a package was built with 1651# Hack for people to figure out if a package was built with
1544# certain USE flags 1652# certain USE flags
1545# 1653#
1546# Usage: built_with_use [-a|-o] <DEPEND ATOM> <List of USE flags> 1654# Usage: built_with_use [--missing <action>] [-a|-o] <DEPEND ATOM> <List of USE flags>
1547# ex: built_with_use xchat gtk2 1655# ex: built_with_use xchat gtk2
1548# 1656#
1549# Flags: -a all USE flags should be utilized 1657# Flags: -a all USE flags should be utilized
1550# -o at least one USE flag should be utilized 1658# -o at least one USE flag should be utilized
1659# --missing peform the specified action if the flag is not in IUSE (true/false/die)
1660# --hidden USE flag we're checking is hidden expanded so it isnt in IUSE
1551# Note: the default flag is '-a' 1661# Note: the default flag is '-a'
1552built_with_use() { 1662built_with_use() {
1663 local hidden="no"
1664 if [[ $1 == "--hidden" ]] ; then
1665 hidden="yes"
1666 shift
1667 fi
1668
1669 local missing_action="die"
1670 if [[ $1 == "--missing" ]] ; then
1671 missing_action=$2
1672 shift ; shift
1673 case ${missing_action} in
1674 true|false|die) ;;
1675 *) die "unknown action '${missing_action}'";;
1676 esac
1677 fi
1678
1553 local opt=$1 1679 local opt=$1
1554 [[ ${opt:0:1} = "-" ]] && shift || opt="-a" 1680 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1555 1681
1556 local PKG=$(best_version $1) 1682 local PKG=$(best_version $1)
1683 [[ -z ${PKG} ]] && die "Unable to resolve $1 to an installed package"
1557 shift 1684 shift
1558 1685
1559 local USEFILE="${ROOT}/var/db/pkg/${PKG}/USE" 1686 local USEFILE=${ROOT}/var/db/pkg/${PKG}/USE
1560 [[ ! -e ${USEFILE} ]] && return 1 1687 local IUSEFILE=${ROOT}/var/db/pkg/${PKG}/IUSE
1688
1689 # if the IUSE file doesn't exist, the read will error out, we need to handle
1690 # this gracefully
1691 if [[ ! -e ${USEFILE} ]] || [[ ! -e ${IUSEFILE} && ${hidden} == "no" ]] ; then
1692 case ${missing_action} in
1693 true) return 0;;
1694 false) return 1;;
1695 die) die "Unable to determine what USE flags $PKG was built with";;
1696 esac
1697 fi
1698
1699 if [[ ${hidden} == "no" ]] ; then
1700 local IUSE_BUILT=$(<${IUSEFILE})
1701 # Don't check USE_EXPAND #147237
1702 local expand
1703 for expand in $(echo ${USE_EXPAND} | tr '[:upper:]' '[:lower:]') ; do
1704 if [[ $1 == ${expand}_* ]] ; then
1705 expand=""
1706 break
1707 fi
1708 done
1709 if [[ -n ${expand} ]] ; then
1710 if ! has $1 ${IUSE_BUILT} ; then
1711 case ${missing_action} in
1712 true) return 0;;
1713 false) return 1;;
1714 die) die "$PKG does not actually support the $1 USE flag!";;
1715 esac
1716 fi
1717 fi
1718 fi
1561 1719
1562 local USE_BUILT=$(<${USEFILE}) 1720 local USE_BUILT=$(<${USEFILE})
1563 while [[ $# -gt 0 ]] ; do 1721 while [[ $# -gt 0 ]] ; do
1564 if [[ ${opt} = "-o" ]] ; then 1722 if [[ ${opt} = "-o" ]] ; then
1565 has $1 ${USE_BUILT} && return 0 1723 has $1 ${USE_BUILT} && return 0
1580 local f 1738 local f
1581 for f in $(find ${dir} -name configure) ; do 1739 for f in $(find ${dir} -name configure) ; do
1582 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null 1740 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null
1583 done 1741 done
1584 eend 0 1742 eend 0
1585}
1586
1587# dopamd <file> [more files]
1588#
1589# Install pam auth config file in /etc/pam.d
1590dopamd() {
1591 [[ -z $1 ]] && die "dopamd requires at least one argument"
1592
1593 use pam || return 0
1594
1595 INSDESTTREE=/etc/pam.d \
1596 doins "$@" || die "failed to install $@"
1597}
1598# newpamd <old name> <new name>
1599#
1600# Install pam file <old name> as <new name> in /etc/pam.d
1601newpamd() {
1602 [[ $# -ne 2 ]] && die "newpamd requires two arguements"
1603
1604 use pam || return 0
1605
1606 INSDESTTREE=/etc/pam.d \
1607 newins "$1" "$2" || die "failed to install $1 as $2"
1608} 1743}
1609 1744
1610# make a wrapper script ... 1745# make a wrapper script ...
1611# NOTE: this was originally games_make_wrapper, but I noticed other places where 1746# NOTE: this was originally games_make_wrapper, but I noticed other places where
1612# this could be used, so I have moved it here and made it not games-specific 1747# this could be used, so I have moved it here and made it not games-specific
1622 # We don't want to quote ${bin} so that people can pass complex 1757 # We don't want to quote ${bin} so that people can pass complex
1623 # things as $bin ... "./someprog --args" 1758 # things as $bin ... "./someprog --args"
1624 cat << EOF > "${tmpwrapper}" 1759 cat << EOF > "${tmpwrapper}"
1625#!/bin/sh 1760#!/bin/sh
1626cd "${chdir:-.}" 1761cd "${chdir:-.}"
1762if [ -n "${libdir}" ] ; then
1627if [ "\${LD_LIBRARY_PATH+set}" = "set" ] && [ -n "${libdir}" ] ; then 1763 if [ "\${LD_LIBRARY_PATH+set}" = "set" ] ; then
1628 export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}" 1764 export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1765 else
1766 export LD_LIBRARY_PATH="${libdir}"
1767 fi
1629fi 1768fi
1630exec ${bin} "\$@" 1769exec ${bin} "\$@"
1631EOF 1770EOF
1632 chmod go+rx "${tmpwrapper}" 1771 chmod go+rx "${tmpwrapper}"
1633 if [[ -n ${path} ]] ; then 1772 if [[ -n ${path} ]] ; then

Legend:
Removed from v.1.207  
changed lines
  Added in v.1.279

  ViewVC Help
Powered by ViewVC 1.1.20